diff --git a/.changeset/beige-horses-juggle.md b/.changeset/beige-horses-juggle.md
deleted file mode 100644
index 9c2f5c40e28..00000000000
--- a/.changeset/beige-horses-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Added experimental_devProcessCwdInBuildDir config option to opt-in to new process.cwd behavior when executing tasks in the dev CLI. Currently process.cwd maps to the "root" of your trigger.dev project (the directory that contains your trigger.config.ts file). Setting experimental_devProcessCwdInBuildDir to true changes process.cwd to instead be the temporary build directory inside of the .trigger directory.
diff --git a/.changeset/big-carrots-fail.md b/.changeset/big-carrots-fail.md
deleted file mode 100644
index 0dc095499b6..00000000000
--- a/.changeset/big-carrots-fail.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix dev runs
diff --git a/.changeset/blue-eyes-tickle.md b/.changeset/blue-eyes-tickle.md
deleted file mode 100644
index ab4ca8b92c6..00000000000
--- a/.changeset/blue-eyes-tickle.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-The dev command will now use the platform-provided engine URL
diff --git a/.changeset/breezy-turtles-talk.md b/.changeset/breezy-turtles-talk.md
deleted file mode 100644
index da208cb2c8f..00000000000
--- a/.changeset/breezy-turtles-talk.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-"@trigger.dev/react-hooks": patch
-"@trigger.dev/sdk": patch
-"trigger.dev": patch
-"@trigger.dev/build": patch
-"@trigger.dev/core": patch
-"@trigger.dev/rsc": patch
----
-
-Run Engine 2.0 (alpha)
diff --git a/.changeset/chatty-snakes-hope.md b/.changeset/chatty-snakes-hope.md
deleted file mode 100644
index e0d2083a5d3..00000000000
--- a/.changeset/chatty-snakes-hope.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-fix: Logging large objects is now much more performant and uses less memory
diff --git a/.changeset/chilled-weeks-switch.md b/.changeset/chilled-weeks-switch.md
deleted file mode 100644
index b49f9c57f4c..00000000000
--- a/.changeset/chilled-weeks-switch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix update command version mismatch detection
diff --git a/.changeset/clean-beans-compete.md b/.changeset/clean-beans-compete.md
deleted file mode 100644
index 520ca16c81e..00000000000
--- a/.changeset/clean-beans-compete.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-New internal idempotency implementation for trigger and batch trigger to prevent request retries from duplicating work
diff --git a/.changeset/cuddly-boats-press.md b/.changeset/cuddly-boats-press.md
deleted file mode 100644
index 7d442639363..00000000000
--- a/.changeset/cuddly-boats-press.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Add external log exporters and fix missing external trace exporters in deployed tasks
diff --git a/.changeset/curvy-dogs-share.md b/.changeset/curvy-dogs-share.md
deleted file mode 100644
index a0071042aab..00000000000
--- a/.changeset/curvy-dogs-share.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-When you create a Waitpoint token using `wait.createToken()` you get a URL back that can be used to complete it by making an HTTP POST request.
diff --git a/.changeset/eight-ligers-help.md b/.changeset/eight-ligers-help.md
deleted file mode 100644
index 57c832b0bec..00000000000
--- a/.changeset/eight-ligers-help.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Enhance deploy command output to better distinguish between local and remote builds
diff --git a/.changeset/eighty-rings-divide.md b/.changeset/eighty-rings-divide.md
deleted file mode 100644
index 193b46ca7bf..00000000000
--- a/.changeset/eighty-rings-divide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-Configurable queue consumer count in supervisor session
diff --git a/.changeset/fifty-beers-bake.md b/.changeset/fifty-beers-bake.md
deleted file mode 100644
index 63c431c480a..00000000000
--- a/.changeset/fifty-beers-bake.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fixes a bug that would allow processes that had OOM errors to be incorrectly reused when experimental_processKeepAlive was enabled
diff --git a/.changeset/flat-pianos-live.md b/.changeset/flat-pianos-live.md
deleted file mode 100644
index c1f915195cf..00000000000
--- a/.changeset/flat-pianos-live.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Runtime agnostic SDK config via env vars
diff --git a/.changeset/four-needles-add.md b/.changeset/four-needles-add.md
deleted file mode 100644
index 7dd18092dfb..00000000000
--- a/.changeset/four-needles-add.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-"@trigger.dev/redis-worker": major
-"@trigger.dev/react-hooks": major
-"@trigger.dev/sdk": major
-"trigger.dev": major
-"@trigger.dev/python": major
-"@trigger.dev/build": major
-"@trigger.dev/core": major
-"@trigger.dev/rsc": major
----
-
-Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4
diff --git a/.changeset/fuzzy-snakes-beg.md b/.changeset/fuzzy-snakes-beg.md
deleted file mode 100644
index f5bd55cdeb0..00000000000
--- a/.changeset/fuzzy-snakes-beg.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-Add supervisor http client option to disable debug logs
diff --git a/.changeset/gentle-waves-suffer.md b/.changeset/gentle-waves-suffer.md
deleted file mode 100644
index d96452b7757..00000000000
--- a/.changeset/gentle-waves-suffer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Fixed an issue with realtime streams that timeout and resume streaming dropping chunks
diff --git a/.changeset/gold-insects-invite.md b/.changeset/gold-insects-invite.md
deleted file mode 100644
index 7b260ed6076..00000000000
--- a/.changeset/gold-insects-invite.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Expose esbuild `keepNames` option (experimental)
diff --git a/.changeset/green-lions-relate.md b/.changeset/green-lions-relate.md
deleted file mode 100644
index da2a96b29d6..00000000000
--- a/.changeset/green-lions-relate.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-The envvars.list() and retrieve() functions receive isSecret for each value. Secret values are always redacted.
diff --git a/.changeset/grumpy-wasps-fold.md b/.changeset/grumpy-wasps-fold.md
deleted file mode 100644
index 78b74f73b74..00000000000
--- a/.changeset/grumpy-wasps-fold.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Add `experimental_autoDetectExternal` trigger config option
diff --git a/.changeset/healthy-apricots-drop.md b/.changeset/healthy-apricots-drop.md
deleted file mode 100644
index aae2b175e84..00000000000
--- a/.changeset/healthy-apricots-drop.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Add project details to the whoami command
diff --git a/.changeset/hip-cups-wave.md b/.changeset/hip-cups-wave.md
deleted file mode 100644
index c21b94e37bc..00000000000
--- a/.changeset/hip-cups-wave.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Fix issue where realtime streams would cut off after 5 minutes
diff --git a/.changeset/honest-files-decide.md b/.changeset/honest-files-decide.md
deleted file mode 100644
index 6bc65f34ccf..00000000000
--- a/.changeset/honest-files-decide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Deprecate toolTask and replace with `ai.tool(mySchemaTask)`
diff --git a/.changeset/itchy-frogs-care.md b/.changeset/itchy-frogs-care.md
deleted file mode 100644
index 72cb57c867d..00000000000
--- a/.changeset/itchy-frogs-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Log images sizes for self-hosted deploys
diff --git a/.changeset/itchy-games-sort.md b/.changeset/itchy-games-sort.md
deleted file mode 100644
index 3f04f68228e..00000000000
--- a/.changeset/itchy-games-sort.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@trigger.dev/sdk": patch
-"trigger.dev": patch
----
-
-Display clickable links in Cursor terminal
diff --git a/.changeset/late-chairs-ring.md b/.changeset/late-chairs-ring.md
deleted file mode 100644
index cd7c9f36202..00000000000
--- a/.changeset/late-chairs-ring.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix init.ts in custom trigger dirs
diff --git a/.changeset/late-dancers-smile.md b/.changeset/late-dancers-smile.md
deleted file mode 100644
index 58026740d8e..00000000000
--- a/.changeset/late-dancers-smile.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Add import timings and bundle size analysis, the dev command will now warn about slow imports
diff --git a/.changeset/lazy-panthers-shop.md b/.changeset/lazy-panthers-shop.md
deleted file mode 100644
index fa622e087ec..00000000000
--- a/.changeset/lazy-panthers-shop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-Improve structured logs
diff --git a/.changeset/lazy-plums-fetch.md b/.changeset/lazy-plums-fetch.md
deleted file mode 100644
index 515d6f85d03..00000000000
--- a/.changeset/lazy-plums-fetch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/build": patch
----
-
-syncVercelEnvVars() fix for syncing the wrong preview branch env vars
diff --git a/.changeset/light-peas-melt.md b/.changeset/light-peas-melt.md
deleted file mode 100644
index 52d184b6cce..00000000000
--- a/.changeset/light-peas-melt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix update command version range handling
diff --git a/.changeset/little-birds-appear.md b/.changeset/little-birds-appear.md
deleted file mode 100644
index 870f253b852..00000000000
--- a/.changeset/little-birds-appear.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Removes the `releaseConcurrencyOnWaitpoint` option on queues and the `releaseConcurrency` option on various wait functions. Replaced with the following default behavior:
-
-- Concurrency is never released when a run is first blocked via a waitpoint, at either the env or queue level.
-- Concurrency is always released when a run is checkpointed and shutdown, at both the env and queue level.
-
-Additionally, environment concurrency limits now have a new "Burst Factor", defaulting to 2.0x. The "Burst Factor" allows the environment-wide concurrency limit to be higher than any individual queue's concurrency limit. For example, if you have an environment concurrency limit of 100, and a Burst Factor of 2.0x, then you can execute up to 200 runs concurrently, but any one task/queue can still only execute 100 runs concurrently.
-
-We've done some work cleaning up the run statuses. The new statuses are:
-
-- `PENDING_VERSION`: Task is waiting for a version update because it cannot execute without additional information (task, queue, etc.)
-- `QUEUED`: Task is waiting to be executed by a worker
-- `DEQUEUED`: Task has been dequeued and is being sent to a worker to start executing.
-- `EXECUTING`: Task is currently being executed by a worker
-- `WAITING`: Task has been paused by the system, and will be resumed by the system
-- `COMPLETED`: Task has been completed successfully
-- `CANCELED`: Task has been canceled by the user
-- `FAILED`: Task has failed to complete, due to an error in the system
-- `CRASHED`: Task has crashed and won't be retried, most likely the worker ran out of resources, e.g. memory or storage
-- `SYSTEM_FAILURE`: Task has failed to complete, due to an error in the system
-- `DELAYED`: Task has been scheduled to run at a specific time
-- `EXPIRED`: Task has expired and won't be executed
-- `TIMED_OUT`: Task has reached it's maxDuration and has been stopped
-
-We've removed the following statuses:
-
-- `WAITING_FOR_DEPLOY`: This is no longer used, and is replaced by `PENDING_VERSION`
-- `FROZEN`: This is no longer used, and is replaced by `WAITING`
-- `INTERRUPTED`: This is no longer used
-- `REATTEMPTING`: This is no longer used, and is replaced by `EXECUTING`
-
-We've also added "boolean" helpers to runs returned via the API and from Realtime:
-
-- `isQueued`: Returns true when the status is `QUEUED`, `PENDING_VERSION`, or `DELAYED`
-- `isExecuting`: Returns true when the status is `EXECUTING`, `DEQUEUED`. These count against your concurrency limits.
-- `isWaiting`: Returns true when the status is `WAITING`. These do not count against your concurrency limits.
-- `isCompleted`: Returns true when the status is any of the completed statuses.
-- `isCanceled`: Returns true when the status is `CANCELED`
-- `isFailed`: Returns true when the status is any of the failed statuses.
-- `isSuccess`: Returns true when the status is `COMPLETED`
-
-This change adds the ability to easily detect which runs are being counted against your concurrency limit by filtering for both `EXECUTING` or `DEQUEUED`.
diff --git a/.changeset/moody-squids-count.md b/.changeset/moody-squids-count.md
deleted file mode 100644
index e475088102f..00000000000
--- a/.changeset/moody-squids-count.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Init command will now correctly install v4-beta packages
diff --git a/.changeset/nasty-cobras-wonder.md b/.changeset/nasty-cobras-wonder.md
deleted file mode 100644
index 0cd7c417d18..00000000000
--- a/.changeset/nasty-cobras-wonder.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix metadata collapsing correctness
diff --git a/.changeset/nice-colts-boil.md b/.changeset/nice-colts-boil.md
deleted file mode 100644
index bd395ae9dd9..00000000000
--- a/.changeset/nice-colts-boil.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Improve warm start times by eagerly creating the child TaskRunProcess when a previous run as completed
diff --git a/.changeset/ninety-games-grow.md b/.changeset/ninety-games-grow.md
deleted file mode 100644
index df22eff4ee8..00000000000
--- a/.changeset/ninety-games-grow.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-- Resolve issue where CLI could get stuck during deploy finalization
-- Unify local and remote build logic, with multi-platform build support
-- Improve switch command; now accepts profile name as an argument
-- Registry configuration is now fully managed by the webapp
-- The deploy `--self-hosted` flag is no longer required
-- Enhance deployment error reporting and image digest retrieval
diff --git a/.changeset/orange-pens-smile.md b/.changeset/orange-pens-smile.md
deleted file mode 100644
index 9a4948cda55..00000000000
--- a/.changeset/orange-pens-smile.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/redis-worker": patch
----
-
-Now each worker gets it's own pLimit concurrency limiter, and we will only ever dequeue items where there is concurrency capacity, preventing incorrectly retried jobs due to visibility timeout expiry
diff --git a/.changeset/orange-rocks-grow.md b/.changeset/orange-rocks-grow.md
deleted file mode 100644
index c8a6bdaa232..00000000000
--- a/.changeset/orange-rocks-grow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix init.ts detection when using the sentry esbuild plugin
diff --git a/.changeset/plenty-dolphins-act.md b/.changeset/plenty-dolphins-act.md
deleted file mode 100644
index 59d2c7fc44a..00000000000
--- a/.changeset/plenty-dolphins-act.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-- Correctly resolve waitpoints that come in early
-- Ensure correct state before requesting suspension
-- Fix race conditions in snapshot processing
diff --git a/.changeset/polite-badgers-suffer.md b/.changeset/polite-badgers-suffer.md
deleted file mode 100644
index bba234e21d9..00000000000
--- a/.changeset/polite-badgers-suffer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-experimental processKeepAlive
diff --git a/.changeset/polite-impalas-care.md b/.changeset/polite-impalas-care.md
deleted file mode 100644
index 134ff3dd4a1..00000000000
--- a/.changeset/polite-impalas-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fixes runLimiter check on #dequeueRuns
diff --git a/.changeset/polite-lies-fix.md b/.changeset/polite-lies-fix.md
deleted file mode 100644
index 6e60a776041..00000000000
--- a/.changeset/polite-lies-fix.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Update nypm package to support test-based bun.lock files
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index 01f1e73c963..00000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "mode": "pre",
-  "tag": "v4-beta",
-  "initialVersions": {
-    "coordinator": "0.0.1",
-    "docker-provider": "0.0.1",
-    "kubernetes-provider": "0.0.1",
-    "supervisor": "0.0.1",
-    "webapp": "1.0.0",
-    "@trigger.dev/build": "3.3.17",
-    "trigger.dev": "3.3.17",
-    "@trigger.dev/core": "3.3.17",
-    "@trigger.dev/python": "3.3.17",
-    "@trigger.dev/react-hooks": "3.3.17",
-    "@trigger.dev/redis-worker": "3.3.17",
-    "@trigger.dev/rsc": "3.3.17",
-    "@trigger.dev/sdk": "3.3.17"
-  },
-  "changesets": [
-    "beige-horses-juggle",
-    "big-carrots-fail",
-    "blue-eyes-tickle",
-    "breezy-turtles-talk",
-    "chatty-snakes-hope",
-    "chilled-weeks-switch",
-    "clean-beans-compete",
-    "cuddly-boats-press",
-    "curvy-dogs-share",
-    "eight-ligers-help",
-    "eighty-rings-divide",
-    "fifty-beers-bake",
-    "flat-pianos-live",
-    "four-needles-add",
-    "fuzzy-snakes-beg",
-    "gentle-waves-suffer",
-    "gold-insects-invite",
-    "green-lions-relate",
-    "grumpy-wasps-fold",
-    "healthy-apricots-drop",
-    "hip-cups-wave",
-    "honest-files-decide",
-    "itchy-frogs-care",
-    "itchy-games-sort",
-    "late-chairs-ring",
-    "late-dancers-smile",
-    "lazy-panthers-shop",
-    "lazy-plums-fetch",
-    "light-peas-melt",
-    "little-birds-appear",
-    "moody-squids-count",
-    "nasty-cobras-wonder",
-    "nice-colts-boil",
-    "ninety-games-grow",
-    "orange-pens-smile",
-    "orange-rocks-grow",
-    "plenty-dolphins-act",
-    "polite-badgers-suffer",
-    "polite-impalas-care",
-    "polite-lies-fix",
-    "rare-beds-accept",
-    "real-rats-drop",
-    "red-chairs-begin",
-    "red-rings-marry",
-    "red-wasps-cover",
-    "shiny-kiwis-beam",
-    "silly-cows-serve",
-    "silly-timers-repair",
-    "sixty-beers-share",
-    "small-birds-arrive",
-    "small-dancers-smell",
-    "smart-coins-hammer",
-    "smooth-planets-flow",
-    "soft-candles-do",
-    "sour-mirrors-accept",
-    "spotty-ducks-punch",
-    "spotty-pants-wink",
-    "strong-pianos-provide",
-    "sweet-dolphins-invent",
-    "tender-jobs-collect",
-    "thick-bikes-laugh",
-    "tidy-books-smell",
-    "tiny-buckets-teach",
-    "tricky-houses-invite",
-    "twelve-actors-hide",
-    "two-eagles-report",
-    "two-tigers-dream",
-    "weak-jobs-hide",
-    "weak-parents-sip",
-    "wet-deers-think",
-    "wet-dragons-boil",
-    "wet-steaks-reflect",
-    "wicked-ads-walk",
-    "wild-mirrors-return",
-    "witty-cherries-tan",
-    "witty-donkeys-unite",
-    "yellow-cars-tell"
-  ]
-}
diff --git a/.changeset/rare-beds-accept.md b/.changeset/rare-beds-accept.md
deleted file mode 100644
index dccd97a96a9..00000000000
--- a/.changeset/rare-beds-accept.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-Add verbose structured log level
diff --git a/.changeset/real-rats-drop.md b/.changeset/real-rats-drop.md
deleted file mode 100644
index 953794afd42..00000000000
--- a/.changeset/real-rats-drop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Add onCancel lifecycle hook
diff --git a/.changeset/red-chairs-begin.md b/.changeset/red-chairs-begin.md
deleted file mode 100644
index e54857e5529..00000000000
--- a/.changeset/red-chairs-begin.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Added AI assistance link when you have build errors
diff --git a/.changeset/red-rings-marry.md b/.changeset/red-rings-marry.md
deleted file mode 100644
index 87fb25647ad..00000000000
--- a/.changeset/red-rings-marry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Provide realtime skipColumns option via untamperable public access tokens
diff --git a/.changeset/red-wasps-cover.md b/.changeset/red-wasps-cover.md
deleted file mode 100644
index 035e7549fa7..00000000000
--- a/.changeset/red-wasps-cover.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-Suppress external instrumentation for fetch calls from ApiClient
diff --git a/.changeset/shiny-kiwis-beam.md b/.changeset/shiny-kiwis-beam.md
deleted file mode 100644
index c01b131162d..00000000000
--- a/.changeset/shiny-kiwis-beam.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Handle flush errors gracefully in dev
diff --git a/.changeset/silly-cows-serve.md b/.changeset/silly-cows-serve.md
deleted file mode 100644
index d655dbed805..00000000000
--- a/.changeset/silly-cows-serve.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Added support for Preview branches in v4 projects
diff --git a/.changeset/silly-timers-repair.md b/.changeset/silly-timers-repair.md
deleted file mode 100644
index 711fbc7f2b7..00000000000
--- a/.changeset/silly-timers-repair.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Can now set project ref using the TRIGGER_PROJECT_REF env var
diff --git a/.changeset/sixty-beers-share.md b/.changeset/sixty-beers-share.md
deleted file mode 100644
index 862628e2c13..00000000000
--- a/.changeset/sixty-beers-share.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Add runtime version detection for display in the dashboard
diff --git a/.changeset/small-birds-arrive.md b/.changeset/small-birds-arrive.md
deleted file mode 100644
index cf1039b83e7..00000000000
--- a/.changeset/small-birds-arrive.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-"@trigger.dev/react-hooks": patch
----
-
-Added the ability to specify a "createdAt" filter when subscribing to tags in our useRealtime hooks:
-
-```tsx
-// Only subscribe to runs created in the last 10 hours
-useRealtimeRunWithTags("my-tag", { createdAt: "10h" })
-```
-
-You can also now choose to skip subscribing to specific columns by specifying the `skipColumns` option:
-
-```tsx
-useRealtimeRun(run.id, { skipColumns: ["usageDurationMs"] });
-```
diff --git a/.changeset/small-dancers-smell.md b/.changeset/small-dancers-smell.md
deleted file mode 100644
index ff9b68c00fd..00000000000
--- a/.changeset/small-dancers-smell.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@trigger.dev/sdk": patch
-"@trigger.dev/core": patch
----
-
-Improve metadata flushing efficiency by collapsing operations
diff --git a/.changeset/smart-coins-hammer.md b/.changeset/smart-coins-hammer.md
deleted file mode 100644
index bea810c6cad..00000000000
--- a/.changeset/smart-coins-hammer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-fix: Realtime streams: prevent enqueuing into closed ReadableStream
diff --git a/.changeset/smooth-planets-flow.md b/.changeset/smooth-planets-flow.md
deleted file mode 100644
index 708932fccad..00000000000
--- a/.changeset/smooth-planets-flow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Update profile switcher
diff --git a/.changeset/soft-candles-do.md b/.changeset/soft-candles-do.md
deleted file mode 100644
index e423053d453..00000000000
--- a/.changeset/soft-candles-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Update base images to latest compatible versions. The `node-22` runtime now uses v22.16.0 and `bun` uses the latest v1.2.18 release. The default `node` runtime is unchanged and points at v21.7.3.
diff --git a/.changeset/sour-mirrors-accept.md b/.changeset/sour-mirrors-accept.md
deleted file mode 100644
index 34084228cae..00000000000
--- a/.changeset/sour-mirrors-accept.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Improve usage flushing
diff --git a/.changeset/spotty-ducks-punch.md b/.changeset/spotty-ducks-punch.md
deleted file mode 100644
index f6c02980119..00000000000
--- a/.changeset/spotty-ducks-punch.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-fix: default machine config indexing now works
diff --git a/.changeset/spotty-pants-wink.md b/.changeset/spotty-pants-wink.md
deleted file mode 100644
index 7021ecc8fab..00000000000
--- a/.changeset/spotty-pants-wink.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Prevent large outputs from overwriting each other
diff --git a/.changeset/strong-pianos-provide.md b/.changeset/strong-pianos-provide.md
deleted file mode 100644
index 728179393bc..00000000000
--- a/.changeset/strong-pianos-provide.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Fail fast in CI when running deploy with missing `TRIGGER_ACCESS_TOKEN` and add useful error message with link to docs
diff --git a/.changeset/sweet-dolphins-invent.md b/.changeset/sweet-dolphins-invent.md
deleted file mode 100644
index df758a89e9c..00000000000
--- a/.changeset/sweet-dolphins-invent.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Always print full deploy logs in CI
diff --git a/.changeset/tender-jobs-collect.md b/.changeset/tender-jobs-collect.md
deleted file mode 100644
index 829c628b6db..00000000000
--- a/.changeset/tender-jobs-collect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-TriggerApiError 4xx errors will no longer cause tasks to be retried
diff --git a/.changeset/thick-bikes-laugh.md b/.changeset/thick-bikes-laugh.md
deleted file mode 100644
index 7166bfca645..00000000000
--- a/.changeset/thick-bikes-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/build": patch
----
-
-Add ffmpeg v7 support to existing extension: `ffmpeg({ version: "7" })`
diff --git a/.changeset/tidy-books-smell.md b/.changeset/tidy-books-smell.md
deleted file mode 100644
index b8ecf87f55a..00000000000
--- a/.changeset/tidy-books-smell.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-- Fix polling interval reset bug that could create duplicate intervals
-- Protect against unexpected attempt number changes
-- Prevent run execution zombies after warm starts
\ No newline at end of file
diff --git a/.changeset/tiny-buckets-teach.md b/.changeset/tiny-buckets-teach.md
deleted file mode 100644
index fdf3ae3a946..00000000000
--- a/.changeset/tiny-buckets-teach.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix stalled run detection
diff --git a/.changeset/tricky-houses-invite.md b/.changeset/tricky-houses-invite.md
deleted file mode 100644
index e21e7b58185..00000000000
--- a/.changeset/tricky-houses-invite.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Managed run controller performance and reliability improvements
diff --git a/.changeset/twelve-actors-hide.md b/.changeset/twelve-actors-hide.md
deleted file mode 100644
index 7187b92ab0c..00000000000
--- a/.changeset/twelve-actors-hide.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix init.ts auto-import for deployed workers
diff --git a/.changeset/two-eagles-report.md b/.changeset/two-eagles-report.md
deleted file mode 100644
index 11f034ed3fa..00000000000
--- a/.changeset/two-eagles-report.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Added runs.list filtering for queue and machine
diff --git a/.changeset/two-tigers-dream.md b/.changeset/two-tigers-dream.md
deleted file mode 100644
index b4fee01cbea..00000000000
--- a/.changeset/two-tigers-dream.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-maintain proper context in metadata.root and parent getters
diff --git a/.changeset/weak-jobs-hide.md b/.changeset/weak-jobs-hide.md
deleted file mode 100644
index 0be1f49588c..00000000000
--- a/.changeset/weak-jobs-hide.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@trigger.dev/sdk": patch
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-v4: New lifecycle hooks
diff --git a/.changeset/weak-parents-sip.md b/.changeset/weak-parents-sip.md
deleted file mode 100644
index fb8589baeae..00000000000
--- a/.changeset/weak-parents-sip.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Output esbuild metafile, can be inspected after `deploy --dry run`
diff --git a/.changeset/wet-deers-think.md b/.changeset/wet-deers-think.md
deleted file mode 100644
index 9002d7b94f2..00000000000
--- a/.changeset/wet-deers-think.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Fix QUEUED status snapshot handler
diff --git a/.changeset/wet-dragons-boil.md b/.changeset/wet-dragons-boil.md
deleted file mode 100644
index becd48dd8c5..00000000000
--- a/.changeset/wet-dragons-boil.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Serialize metadata to prevent invalid metadata from breaking run completions
diff --git a/.changeset/wet-steaks-reflect.md b/.changeset/wet-steaks-reflect.md
deleted file mode 100644
index 3a777416896..00000000000
--- a/.changeset/wet-steaks-reflect.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-If you pass a directory when calling deploy we validate it exists and give helpful hints
diff --git a/.changeset/wicked-ads-walk.md b/.changeset/wicked-ads-walk.md
deleted file mode 100644
index c9190c709f1..00000000000
--- a/.changeset/wicked-ads-walk.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@trigger.dev/react-hooks": patch
-"@trigger.dev/core": patch
----
-
-Fixes an issue with realtime when re-subscribing to a run, that would temporarily display stale data and the changes. Now when re-subscribing to a run only the latest changes will be vended
diff --git a/.changeset/wild-mirrors-return.md b/.changeset/wild-mirrors-return.md
deleted file mode 100644
index baee7565a3b..00000000000
--- a/.changeset/wild-mirrors-return.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"trigger.dev": patch
-"@trigger.dev/core": patch
----
-
-Expose esbuild `minify` option (experimental)
diff --git a/.changeset/witty-cherries-tan.md b/.changeset/witty-cherries-tan.md
deleted file mode 100644
index 062f1c68de9..00000000000
--- a/.changeset/witty-cherries-tan.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"trigger.dev": patch
----
-
-Fix `syncEnvVars` for non-preview deployments
diff --git a/.changeset/witty-donkeys-unite.md b/.changeset/witty-donkeys-unite.md
deleted file mode 100644
index f1a17eb7ff5..00000000000
--- a/.changeset/witty-donkeys-unite.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/build": patch
----
-
-Add playwright extension
diff --git a/.changeset/yellow-cars-tell.md b/.changeset/yellow-cars-tell.md
deleted file mode 100644
index a27ce329c28..00000000000
--- a/.changeset/yellow-cars-tell.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@trigger.dev/core": patch
----
-
-Fix Bun runtime path resolution fallback
diff --git a/.claude/skills/trigger-dev-tasks/SKILL.md b/.claude/skills/trigger-dev-tasks/SKILL.md
new file mode 100644
index 00000000000..791c22c27ed
--- /dev/null
+++ b/.claude/skills/trigger-dev-tasks/SKILL.md
@@ -0,0 +1,200 @@
+---
+name: trigger-dev-tasks
+description: Use this skill when writing, designing, or optimizing Trigger.dev background tasks and workflows. This includes creating reliable async tasks, implementing AI workflows, setting up scheduled jobs, structuring complex task hierarchies with subtasks, configuring build extensions for tools like ffmpeg or Puppeteer/Playwright, and handling task schemas with Zod validation.
+allowed-tools: Read, Write, Edit, Glob, Grep, Bash
+---
+
+# Trigger.dev Task Expert
+
+You are an expert Trigger.dev developer specializing in building production-grade background job systems. Tasks deployed to Trigger.dev run in Node.js 21+ and use the `@trigger.dev/sdk` package.
+
+## Critical Rules
+
+1. **Always use `@trigger.dev/sdk`** - Never use `@trigger.dev/sdk/v3` or deprecated `client.defineJob` pattern
+2. **Never use `node-fetch`** - Use the built-in `fetch` function
+3. **Export all tasks** - Every task must be exported, including subtasks
+4. **Never wrap wait/trigger calls in Promise.all** - `triggerAndWait`, `batchTriggerAndWait`, and `wait.*` calls cannot be wrapped in `Promise.all` or `Promise.allSettled`
+
+## Basic Task Pattern
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const processData = task({
+  id: "process-data",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+  },
+  run: async (payload: { userId: string; data: any[] }) => {
+    console.log(`Processing ${payload.data.length} items`);
+    return { processed: payload.data.length };
+  },
+});
+```
+
+## Schema Task (with validation)
+
+```ts
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+
+export const validatedTask = schemaTask({
+  id: "validated-task",
+  schema: z.object({
+    name: z.string(),
+    email: z.string().email(),
+  }),
+  run: async (payload) => {
+    // Payload is automatically validated and typed
+    return { message: `Hello ${payload.name}` };
+  },
+});
+```
+
+## Triggering Tasks
+
+### From Backend Code (type-only import to prevent dependency leakage)
+
+```ts
+import { tasks } from "@trigger.dev/sdk";
+import type { processData } from "./trigger/tasks";
+
+const handle = await tasks.trigger<typeof processData>("process-data", {
+  userId: "123",
+  data: [{ id: 1 }],
+});
+```
+
+### From Inside Tasks
+
+```ts
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    // Trigger and wait - returns Result object, NOT direct output
+    const result = await childTask.triggerAndWait({ data: "value" });
+    if (result.ok) {
+      console.log("Output:", result.output);
+    } else {
+      console.error("Failed:", result.error);
+    }
+
+    // Or unwrap directly (throws on error)
+    const output = await childTask.triggerAndWait({ data: "value" }).unwrap();
+  },
+});
+```
+
+## Idempotency (Critical for Retries)
+
+Always use idempotency keys when triggering tasks from inside other tasks:
+
+```ts
+import { idempotencyKeys } from "@trigger.dev/sdk";
+
+export const paymentTask = task({
+  id: "process-payment",
+  run: async (payload: { orderId: string }) => {
+    // Scoped to current run - survives retries
+    const key = await idempotencyKeys.create(`payment-${payload.orderId}`);
+
+    await chargeCustomer.trigger(payload, {
+      idempotencyKey: key,
+      idempotencyKeyTTL: "24h",
+    });
+  },
+});
+```
+
+## Trigger Options
+
+```ts
+await myTask.trigger(payload, {
+  delay: "1h",           // Delay execution
+  ttl: "10m",            // Cancel if not started within TTL
+  idempotencyKey: key,
+  queue: "my-queue",
+  machine: "large-1x",   // micro, small-1x, small-2x, medium-1x, medium-2x, large-1x, large-2x
+  maxAttempts: 3,
+  tags: ["user_123"],    // Max 10 tags
+  debounce: {            // Consolidate rapid triggers
+    key: "unique-key",
+    delay: "5s",
+    mode: "trailing",    // "leading" (default) or "trailing"
+  },
+});
+```
+
+## Debouncing
+
+Consolidate multiple triggers into a single execution:
+
+```ts
+// Rapid triggers with same key = single execution
+await myTask.trigger({ userId: "123" }, {
+  debounce: {
+    key: "user-123-update",
+    delay: "5s",
+  },
+});
+
+// Trailing mode: use payload from LAST trigger
+await myTask.trigger({ data: "latest" }, {
+  debounce: {
+    key: "my-key",
+    delay: "10s",
+    mode: "trailing",
+  },
+});
+```
+
+Use cases: user activity updates, webhook deduplication, search indexing, notification batching.
+
+## Batch Triggering
+
+Up to 1,000 items per batch, 3MB per payload:
+
+```ts
+const results = await myTask.batchTriggerAndWait([
+  { payload: { userId: "1" } },
+  { payload: { userId: "2" } },
+]);
+
+for (const result of results) {
+  if (result.ok) console.log(result.output);
+}
+```
+
+## Machine Presets
+
+| Preset      | vCPU | Memory |
+|-------------|------|--------|
+| micro       | 0.25 | 0.25GB |
+| small-1x    | 0.5  | 0.5GB  |
+| small-2x    | 1    | 1GB    |
+| medium-1x   | 1    | 2GB    |
+| medium-2x   | 2    | 4GB    |
+| large-1x    | 4    | 8GB    |
+| large-2x    | 8    | 16GB   |
+
+## Design Principles
+
+1. **Break complex workflows into subtasks** that can be independently retried and made idempotent
+2. **Don't over-complicate** - Sometimes `Promise.allSettled` inside a single task is better than many subtasks (each task has dedicated process and is charged by millisecond)
+3. **Always configure retries** - Set appropriate `maxAttempts` based on the operation
+4. **Use idempotency keys** - Especially for payment/critical operations
+5. **Group related subtasks** - Keep subtasks only used by one parent in the same file, don't export them
+6. **Use logger** - Log at key execution points with `logger.info()`, `logger.error()`, etc.
+
+## Reference Documentation
+
+For detailed documentation on specific topics, read these files:
+
+- `basic-tasks.md` - Task basics, triggering, waits
+- `advanced-tasks.md` - Tags, queues, concurrency, metadata, error handling
+- `scheduled-tasks.md` - Cron schedules, declarative and imperative
+- `realtime.md` - Real-time subscriptions, streams, React hooks
+- `config.md` - trigger.config.ts, build extensions (Prisma, Playwright, FFmpeg, etc.)
diff --git a/.claude/skills/trigger-dev-tasks/advanced-tasks.md b/.claude/skills/trigger-dev-tasks/advanced-tasks.md
new file mode 100644
index 00000000000..32a00337f89
--- /dev/null
+++ b/.claude/skills/trigger-dev-tasks/advanced-tasks.md
@@ -0,0 +1,485 @@
+# Trigger.dev Advanced Tasks (v4)
+
+**Advanced patterns and features for writing tasks**
+
+## Tags & Organization
+
+```ts
+import { task, tags } from "@trigger.dev/sdk";
+
+export const processUser = task({
+  id: "process-user",
+  run: async (payload: { userId: string; orgId: string }, { ctx }) => {
+    // Add tags during execution
+    await tags.add(`user_${payload.userId}`);
+    await tags.add(`org_${payload.orgId}`);
+
+    return { processed: true };
+  },
+});
+
+// Trigger with tags
+await processUser.trigger(
+  { userId: "123", orgId: "abc" },
+  { tags: ["priority", "user_123", "org_abc"] } // Max 10 tags per run
+);
+
+// Subscribe to tagged runs
+for await (const run of runs.subscribeToRunsWithTag("user_123")) {
+  console.log(`User task ${run.id}: ${run.status}`);
+}
+```
+
+**Tag Best Practices:**
+
+- Use prefixes: `user_123`, `org_abc`, `video:456`
+- Max 10 tags per run, 1-64 characters each
+- Tags don't propagate to child tasks automatically
+
+## Batch Triggering v2
+
+Enhanced batch triggering with larger payloads and streaming ingestion.
+
+### Limits
+
+- **Maximum batch size**: 1,000 items (increased from 500)
+- **Payload per item**: 3MB each (increased from 1MB combined)
+- Payloads > 512KB automatically offload to object storage
+
+### Rate Limiting (per environment)
+
+| Tier | Bucket Size | Refill Rate |
+|------|-------------|-------------|
+| Free | 1,200 runs | 100 runs/10 sec |
+| Hobby | 5,000 runs | 500 runs/5 sec |
+| Pro | 5,000 runs | 500 runs/5 sec |
+
+### Concurrent Batch Processing
+
+| Tier | Concurrent Batches |
+|------|-------------------|
+| Free | 1 |
+| Hobby | 10 |
+| Pro | 10 |
+
+### Usage
+
+```ts
+import { myTask } from "./trigger/myTask";
+
+// Basic batch trigger (up to 1,000 items)
+const runs = await myTask.batchTrigger([
+  { payload: { userId: "user-1" } },
+  { payload: { userId: "user-2" } },
+  { payload: { userId: "user-3" } },
+]);
+
+// Batch trigger with wait
+const results = await myTask.batchTriggerAndWait([
+  { payload: { userId: "user-1" } },
+  { payload: { userId: "user-2" } },
+]);
+
+for (const result of results) {
+  if (result.ok) {
+    console.log("Result:", result.output);
+  }
+}
+
+// With per-item options
+const batchHandle = await myTask.batchTrigger([
+  {
+    payload: { userId: "123" },
+    options: {
+      idempotencyKey: "user-123-batch",
+      tags: ["priority"],
+    },
+  },
+  {
+    payload: { userId: "456" },
+    options: {
+      idempotencyKey: "user-456-batch",
+    },
+  },
+]);
+```
+
+## Debouncing
+
+Consolidate multiple triggers into a single execution by debouncing task runs with a unique key and delay window.
+
+### Use Cases
+
+- **User activity updates**: Batch rapid user actions into a single run
+- **Webhook deduplication**: Handle webhook bursts without redundant processing
+- **Search indexing**: Combine document updates instead of processing individually
+- **Notification batching**: Group notifications to prevent user spam
+
+### Basic Usage
+
+```ts
+await myTask.trigger(
+  { userId: "123" },
+  {
+    debounce: {
+      key: "user-123-update",  // Unique identifier for debounce group
+      delay: "5s",              // Wait duration ("5s", "1m", or milliseconds)
+    },
+  }
+);
+```
+
+### Execution Modes
+
+**Leading Mode** (default): Uses payload/options from the first trigger; subsequent triggers only reschedule execution time.
+
+```ts
+// First trigger sets the payload
+await myTask.trigger({ action: "first" }, {
+  debounce: { key: "my-key", delay: "10s" }
+});
+
+// Second trigger only reschedules - payload remains "first"
+await myTask.trigger({ action: "second" }, {
+  debounce: { key: "my-key", delay: "10s" }
+});
+// Task executes with { action: "first" }
+```
+
+**Trailing Mode**: Uses payload/options from the most recent trigger.
+
+```ts
+await myTask.trigger(
+  { data: "latest-value" },
+  {
+    debounce: {
+      key: "trailing-example",
+      delay: "10s",
+      mode: "trailing",
+    },
+  }
+);
+```
+
+In trailing mode, these options update with each trigger:
+- `payload` — task input data
+- `metadata` — run metadata
+- `tags` — run tags (replaces existing)
+- `maxAttempts` — retry attempts
+- `maxDuration` — maximum compute time
+- `machine` — machine preset
+
+### Important Notes
+
+- Idempotency keys take precedence over debounce settings
+- Compatible with `triggerAndWait()` — parent runs block correctly on debounced execution
+- Debounce key is scoped to the task
+
+## Concurrency & Queues
+
+```ts
+import { task, queue } from "@trigger.dev/sdk";
+
+// Shared queue for related tasks
+const emailQueue = queue({
+  name: "email-processing",
+  concurrencyLimit: 5, // Max 5 emails processing simultaneously
+});
+
+// Task-level concurrency
+export const oneAtATime = task({
+  id: "sequential-task",
+  queue: { concurrencyLimit: 1 }, // Process one at a time
+  run: async (payload) => {
+    // Critical section - only one instance runs
+  },
+});
+
+// Per-user concurrency
+export const processUserData = task({
+  id: "process-user-data",
+  run: async (payload: { userId: string }) => {
+    // Override queue with user-specific concurrency
+    await childTask.trigger(payload, {
+      queue: {
+        name: `user-${payload.userId}`,
+        concurrencyLimit: 2,
+      },
+    });
+  },
+});
+
+export const emailTask = task({
+  id: "send-email",
+  queue: emailQueue, // Use shared queue
+  run: async (payload: { to: string }) => {
+    // Send email logic
+  },
+});
+```
+
+## Error Handling & Retries
+
+```ts
+import { task, retry, AbortTaskRunError } from "@trigger.dev/sdk";
+
+export const resilientTask = task({
+  id: "resilient-task",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8, // Exponential backoff multiplier
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+    randomize: false,
+  },
+  catchError: async ({ error, ctx }) => {
+    // Custom error handling
+    if (error.code === "FATAL_ERROR") {
+      throw new AbortTaskRunError("Cannot retry this error");
+    }
+
+    // Log error details
+    console.error(`Task ${ctx.task.id} failed:`, error);
+
+    // Allow retry by returning nothing
+    return { retryAt: new Date(Date.now() + 60000) }; // Retry in 1 minute
+  },
+  run: async (payload) => {
+    // Retry specific operations
+    const result = await retry.onThrow(
+      async () => {
+        return await unstableApiCall(payload);
+      },
+      { maxAttempts: 3 }
+    );
+
+    // Conditional HTTP retries
+    const response = await retry.fetch("https://api.example.com", {
+      retry: {
+        maxAttempts: 5,
+        condition: (response, error) => {
+          return response?.status === 429 || response?.status >= 500;
+        },
+      },
+    });
+
+    return result;
+  },
+});
+```
+
+## Machines & Performance
+
+```ts
+export const heavyTask = task({
+  id: "heavy-computation",
+  machine: { preset: "large-2x" }, // 8 vCPU, 16 GB RAM
+  maxDuration: 1800, // 30 minutes timeout
+  run: async (payload, { ctx }) => {
+    // Resource-intensive computation
+    if (ctx.machine.preset === "large-2x") {
+      // Use all available cores
+      return await parallelProcessing(payload);
+    }
+
+    return await standardProcessing(payload);
+  },
+});
+
+// Override machine when triggering
+await heavyTask.trigger(payload, {
+  machine: { preset: "medium-1x" }, // Override for this run
+});
+```
+
+**Machine Presets:**
+
+- `micro`: 0.25 vCPU, 0.25 GB RAM
+- `small-1x`: 0.5 vCPU, 0.5 GB RAM (default)
+- `small-2x`: 1 vCPU, 1 GB RAM
+- `medium-1x`: 1 vCPU, 2 GB RAM
+- `medium-2x`: 2 vCPU, 4 GB RAM
+- `large-1x`: 4 vCPU, 8 GB RAM
+- `large-2x`: 8 vCPU, 16 GB RAM
+
+## Idempotency
+
+```ts
+import { task, idempotencyKeys } from "@trigger.dev/sdk";
+
+export const paymentTask = task({
+  id: "process-payment",
+  retry: {
+    maxAttempts: 3,
+  },
+  run: async (payload: { orderId: string; amount: number }) => {
+    // Automatically scoped to this task run, so if the task is retried, the idempotency key will be the same
+    const idempotencyKey = await idempotencyKeys.create(`payment-${payload.orderId}`);
+
+    // Ensure payment is processed only once
+    await chargeCustomer.trigger(payload, {
+      idempotencyKey,
+      idempotencyKeyTTL: "24h", // Key expires in 24 hours
+    });
+  },
+});
+
+// Payload-based idempotency
+import { createHash } from "node:crypto";
+
+function createPayloadHash(payload: any): string {
+  const hash = createHash("sha256");
+  hash.update(JSON.stringify(payload));
+  return hash.digest("hex");
+}
+
+export const deduplicatedTask = task({
+  id: "deduplicated-task",
+  run: async (payload) => {
+    const payloadHash = createPayloadHash(payload);
+    const idempotencyKey = await idempotencyKeys.create(payloadHash);
+
+    await processData.trigger(payload, { idempotencyKey });
+  },
+});
+```
+
+## Metadata & Progress Tracking
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const batchProcessor = task({
+  id: "batch-processor",
+  run: async (payload: { items: any[] }, { ctx }) => {
+    const totalItems = payload.items.length;
+
+    // Initialize progress metadata
+    metadata
+      .set("progress", 0)
+      .set("totalItems", totalItems)
+      .set("processedItems", 0)
+      .set("status", "starting");
+
+    const results = [];
+
+    for (let i = 0; i < payload.items.length; i++) {
+      const item = payload.items[i];
+
+      // Process item
+      const result = await processItem(item);
+      results.push(result);
+
+      // Update progress
+      const progress = ((i + 1) / totalItems) * 100;
+      metadata
+        .set("progress", progress)
+        .increment("processedItems", 1)
+        .append("logs", `Processed item ${i + 1}/${totalItems}`)
+        .set("currentItem", item.id);
+    }
+
+    // Final status
+    metadata.set("status", "completed");
+
+    return { results, totalProcessed: results.length };
+  },
+});
+
+// Update parent metadata from child task
+export const childTask = task({
+  id: "child-task",
+  run: async (payload, { ctx }) => {
+    // Update parent task metadata
+    metadata.parent.set("childStatus", "processing");
+    metadata.root.increment("childrenCompleted", 1);
+
+    return { processed: true };
+  },
+});
+```
+
+## Logging & Tracing
+
+```ts
+import { task, logger } from "@trigger.dev/sdk";
+
+export const tracedTask = task({
+  id: "traced-task",
+  run: async (payload, { ctx }) => {
+    logger.info("Task started", { userId: payload.userId });
+
+    // Custom trace with attributes
+    const user = await logger.trace(
+      "fetch-user",
+      async (span) => {
+        span.setAttribute("user.id", payload.userId);
+        span.setAttribute("operation", "database-fetch");
+
+        const userData = await database.findUser(payload.userId);
+        span.setAttribute("user.found", !!userData);
+
+        return userData;
+      },
+      { userId: payload.userId }
+    );
+
+    logger.debug("User fetched", { user: user.id });
+
+    try {
+      const result = await processUser(user);
+      logger.info("Processing completed", { result });
+      return result;
+    } catch (error) {
+      logger.error("Processing failed", {
+        error: error.message,
+        userId: payload.userId,
+      });
+      throw error;
+    }
+  },
+});
+```
+
+## Hidden Tasks
+
+```ts
+// Hidden task - not exported, only used internally
+const internalProcessor = task({
+  id: "internal-processor",
+  run: async (payload: { data: string }) => {
+    return { processed: payload.data.toUpperCase() };
+  },
+});
+
+// Public task that uses hidden task
+export const publicWorkflow = task({
+  id: "public-workflow",
+  run: async (payload: { input: string }) => {
+    // Use hidden task internally
+    const result = await internalProcessor.triggerAndWait({
+      data: payload.input,
+    });
+
+    if (result.ok) {
+      return { output: result.output.processed };
+    }
+
+    throw new Error("Internal processing failed");
+  },
+});
+```
+
+## Best Practices
+
+- **Concurrency**: Use queues to prevent overwhelming external services
+- **Retries**: Configure exponential backoff for transient failures
+- **Idempotency**: Always use for payment/critical operations
+- **Metadata**: Track progress for long-running tasks
+- **Machines**: Match machine size to computational requirements
+- **Tags**: Use consistent naming patterns for filtering
+- **Debouncing**: Use for user activity, webhooks, and notification batching
+- **Batch triggering**: Use for bulk operations up to 1,000 items
+- **Error Handling**: Distinguish between retryable and fatal errors
+
+Design tasks to be stateless, idempotent, and resilient to failures. Use metadata for state tracking and queues for resource management.
diff --git a/.claude/skills/trigger-dev-tasks/basic-tasks.md b/.claude/skills/trigger-dev-tasks/basic-tasks.md
new file mode 100644
index 00000000000..56bff340761
--- /dev/null
+++ b/.claude/skills/trigger-dev-tasks/basic-tasks.md
@@ -0,0 +1,199 @@
+# Trigger.dev Basic Tasks (v4)
+
+**MUST use `@trigger.dev/sdk`, NEVER `client.defineJob`**
+
+## Basic Task
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const processData = task({
+  id: "process-data",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+    randomize: false,
+  },
+  run: async (payload: { userId: string; data: any[] }) => {
+    // Task logic - runs for long time, no timeouts
+    console.log(`Processing ${payload.data.length} items for user ${payload.userId}`);
+    return { processed: payload.data.length };
+  },
+});
+```
+
+## Schema Task (with validation)
+
+```ts
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+
+export const validatedTask = schemaTask({
+  id: "validated-task",
+  schema: z.object({
+    name: z.string(),
+    age: z.number(),
+    email: z.string().email(),
+  }),
+  run: async (payload) => {
+    // Payload is automatically validated and typed
+    return { message: `Hello ${payload.name}, age ${payload.age}` };
+  },
+});
+```
+
+## Triggering Tasks
+
+### From Backend Code
+
+```ts
+import { tasks } from "@trigger.dev/sdk";
+import type { processData } from "./trigger/tasks";
+
+// Single trigger
+const handle = await tasks.trigger<typeof processData>("process-data", {
+  userId: "123",
+  data: [{ id: 1 }, { id: 2 }],
+});
+
+// Batch trigger (up to 1,000 items, 3MB per payload)
+const batchHandle = await tasks.batchTrigger<typeof processData>("process-data", [
+  { payload: { userId: "123", data: [{ id: 1 }] } },
+  { payload: { userId: "456", data: [{ id: 2 }] } },
+]);
+```
+
+### Debounced Triggering
+
+Consolidate multiple triggers into a single execution:
+
+```ts
+// Multiple rapid triggers with same key = single execution
+await myTask.trigger(
+  { userId: "123" },
+  {
+    debounce: {
+      key: "user-123-update",  // Unique key for debounce group
+      delay: "5s",              // Wait before executing
+    },
+  }
+);
+
+// Trailing mode: use payload from LAST trigger
+await myTask.trigger(
+  { data: "latest-value" },
+  {
+    debounce: {
+      key: "trailing-example",
+      delay: "10s",
+      mode: "trailing",  // Default is "leading" (first payload)
+    },
+  }
+);
+```
+
+**Debounce modes:**
+- `leading` (default): Uses payload from first trigger, subsequent triggers only reschedule
+- `trailing`: Uses payload from most recent trigger
+
+### From Inside Tasks (with Result handling)
+
+```ts
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    // Trigger and continue
+    const handle = await childTask.trigger({ data: "value" });
+
+    // Trigger and wait - returns Result object, NOT task output
+    const result = await childTask.triggerAndWait({ data: "value" });
+    if (result.ok) {
+      console.log("Task output:", result.output); // Actual task return value
+    } else {
+      console.error("Task failed:", result.error);
+    }
+
+    // Quick unwrap (throws on error)
+    const output = await childTask.triggerAndWait({ data: "value" }).unwrap();
+
+    // Batch trigger and wait
+    const results = await childTask.batchTriggerAndWait([
+      { payload: { data: "item1" } },
+      { payload: { data: "item2" } },
+    ]);
+
+    for (const run of results) {
+      if (run.ok) {
+        console.log("Success:", run.output);
+      } else {
+        console.log("Failed:", run.error);
+      }
+    }
+  },
+});
+
+export const childTask = task({
+  id: "child-task",
+  run: async (payload: { data: string }) => {
+    return { processed: payload.data };
+  },
+});
+```
+
+> Never wrap triggerAndWait or batchTriggerAndWait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Waits
+
+```ts
+import { task, wait } from "@trigger.dev/sdk";
+
+export const taskWithWaits = task({
+  id: "task-with-waits",
+  run: async (payload) => {
+    console.log("Starting task");
+
+    // Wait for specific duration
+    await wait.for({ seconds: 30 });
+    await wait.for({ minutes: 5 });
+    await wait.for({ hours: 1 });
+    await wait.for({ days: 1 });
+
+    // Wait until specific date
+    await wait.until({ date: new Date("2024-12-25") });
+
+    // Wait for token (from external system)
+    await wait.forToken({
+      token: "user-approval-token",
+      timeoutInSeconds: 3600, // 1 hour timeout
+    });
+
+    console.log("All waits completed");
+    return { status: "completed" };
+  },
+});
+```
+
+> Never wrap wait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Key Points
+
+- **Result vs Output**: `triggerAndWait()` returns a `Result` object with `ok`, `output`, `error` properties - NOT the direct task output
+- **Type safety**: Use `import type` for task references when triggering from backend
+- **Waits > 5 seconds**: Automatically checkpointed, don't count toward compute usage
+- **Debounce + idempotency**: Idempotency keys take precedence over debounce settings
+
+## NEVER Use (v2 deprecated)
+
+```ts
+// BREAKS APPLICATION
+client.defineJob({
+  id: "job-id",
+  run: async (payload, io) => {
+    /* ... */
+  },
+});
+```
+
+Use SDK (`@trigger.dev/sdk`), check `result.ok` before accessing `result.output`
diff --git a/.claude/skills/trigger-dev-tasks/config.md b/.claude/skills/trigger-dev-tasks/config.md
new file mode 100644
index 00000000000..f6a4db1c4b8
--- /dev/null
+++ b/.claude/skills/trigger-dev-tasks/config.md
@@ -0,0 +1,346 @@
+# Trigger.dev Configuration
+
+**Complete guide to configuring `trigger.config.ts` with build extensions**
+
+## Basic Configuration
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project-ref>", // Required: Your project reference
+  dirs: ["./trigger"], // Task directories
+  runtime: "node", // "node", "node-22", or "bun"
+  logLevel: "info", // "debug", "info", "warn", "error"
+
+  // Default retry settings
+  retries: {
+    enabledInDev: false,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+
+  // Build configuration
+  build: {
+    autoDetectExternal: true,
+    keepNames: true,
+    minify: false,
+    extensions: [], // Build extensions go here
+  },
+
+  // Global lifecycle hooks
+  onStartAttempt: async ({ payload, ctx }) => {
+    console.log("Global task start");
+  },
+  onSuccess: async ({ payload, output, ctx }) => {
+    console.log("Global task success");
+  },
+  onFailure: async ({ payload, error, ctx }) => {
+    console.log("Global task failure");
+  },
+});
+```
+
+## Build Extensions
+
+### Database & ORM
+
+#### Prisma
+
+```ts
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+extensions: [
+  prismaExtension({
+    schema: "prisma/schema.prisma",
+    version: "5.19.0", // Optional: specify version
+    migrate: true, // Run migrations during build
+    directUrlEnvVarName: "DIRECT_DATABASE_URL",
+    typedSql: true, // Enable TypedSQL support
+  }),
+];
+```
+
+#### TypeScript Decorators (for TypeORM)
+
+```ts
+import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
+
+extensions: [
+  emitDecoratorMetadata(), // Enables decorator metadata
+];
+```
+
+### Scripting Languages
+
+#### Python
+
+```ts
+import { pythonExtension } from "@trigger.dev/build/extensions/python";
+
+extensions: [
+  pythonExtension({
+    scripts: ["./python/**/*.py"], // Copy Python files
+    requirementsFile: "./requirements.txt", // Install packages
+    devPythonBinaryPath: ".venv/bin/python", // Dev mode binary
+  }),
+];
+
+// Usage in tasks
+const result = await python.runInline(`print("Hello, world!")`);
+const output = await python.runScript("./python/script.py", ["arg1"]);
+```
+
+### Browser Automation
+
+#### Playwright
+
+```ts
+import { playwright } from "@trigger.dev/build/extensions/playwright";
+
+extensions: [
+  playwright({
+    browsers: ["chromium", "firefox", "webkit"], // Default: ["chromium"]
+    headless: true, // Default: true
+  }),
+];
+```
+
+#### Puppeteer
+
+```ts
+import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
+
+extensions: [puppeteer()];
+
+// Environment variable needed:
+// PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
+```
+
+#### Lightpanda
+
+```ts
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+
+extensions: [
+  lightpanda({
+    version: "latest", // or "nightly"
+    disableTelemetry: false,
+  }),
+];
+```
+
+### Media Processing
+
+#### FFmpeg
+
+```ts
+import { ffmpeg } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  ffmpeg({ version: "7" }), // Static build, or omit for Debian version
+];
+
+// Automatically sets FFMPEG_PATH and FFPROBE_PATH
+// Add fluent-ffmpeg to external packages if using
+```
+
+#### Audio Waveform
+
+```ts
+import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
+
+extensions: [
+  audioWaveform(), // Installs Audio Waveform 1.1.0
+];
+```
+
+### System & Package Management
+
+#### System Packages (apt-get)
+
+```ts
+import { aptGet } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  aptGet({
+    packages: ["ffmpeg", "imagemagick", "curl=7.68.0-1"], // Can specify versions
+  }),
+];
+```
+
+#### Additional NPM Packages
+
+Only use this for installing CLI tools, NOT packages you import in your code.
+
+```ts
+import { additionalPackages } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  additionalPackages({
+    packages: ["wrangler"], // CLI tools and specific versions
+  }),
+];
+```
+
+#### Additional Files
+
+```ts
+import { additionalFiles } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  additionalFiles({
+    files: ["wrangler.toml", "./assets/**", "./fonts/**"], // Glob patterns supported
+  }),
+];
+```
+
+### Environment & Build Tools
+
+#### Environment Variable Sync
+
+```ts
+import { syncEnvVars } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  syncEnvVars(async (ctx) => {
+    // ctx contains: environment, projectRef, env
+    return [
+      { name: "SECRET_KEY", value: await getSecret(ctx.environment) },
+      { name: "API_URL", value: ctx.environment === "prod" ? "api.prod.com" : "api.dev.com" },
+    ];
+  }),
+];
+```
+
+#### ESBuild Plugins
+
+```ts
+import { esbuildPlugin } from "@trigger.dev/build/extensions";
+import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
+
+extensions: [
+  esbuildPlugin(
+    sentryEsbuildPlugin({
+      org: process.env.SENTRY_ORG,
+      project: process.env.SENTRY_PROJECT,
+      authToken: process.env.SENTRY_AUTH_TOKEN,
+    }),
+    { placement: "last", target: "deploy" } // Optional config
+  ),
+];
+```
+
+## Custom Build Extensions
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+const customExtension = {
+  name: "my-custom-extension",
+
+  externalsForTarget: (target) => {
+    return ["some-native-module"]; // Add external dependencies
+  },
+
+  onBuildStart: async (context) => {
+    console.log(`Build starting for ${context.target}`);
+    // Register esbuild plugins, modify build context
+  },
+
+  onBuildComplete: async (context, manifest) => {
+    console.log("Build complete, adding layers");
+    // Add build layers, modify deployment
+    context.addLayer({
+      id: "my-layer",
+      files: [{ source: "./custom-file", destination: "/app/custom" }],
+      commands: ["chmod +x /app/custom"],
+    });
+  },
+};
+
+export default defineConfig({
+  project: "my-project",
+  build: {
+    extensions: [customExtension],
+  },
+});
+```
+
+## Advanced Configuration
+
+### Telemetry
+
+```ts
+import { PrismaInstrumentation } from "@prisma/instrumentation";
+import { OpenAIInstrumentation } from "@langfuse/openai";
+
+export default defineConfig({
+  // ... other config
+  telemetry: {
+    instrumentations: [new PrismaInstrumentation(), new OpenAIInstrumentation()],
+    exporters: [customExporter], // Optional custom exporters
+  },
+});
+```
+
+### Machine & Performance
+
+```ts
+export default defineConfig({
+  // ... other config
+  defaultMachine: "large-1x", // Default machine for all tasks
+  maxDuration: 300, // Default max duration (seconds)
+  enableConsoleLogging: true, // Console logging in development
+});
+```
+
+## Common Extension Combinations
+
+### Full-Stack Web App
+
+```ts
+extensions: [
+  prismaExtension({ schema: "prisma/schema.prisma", migrate: true }),
+  additionalFiles({ files: ["./public/**", "./assets/**"] }),
+  syncEnvVars(async (ctx) => [...envVars]),
+];
+```
+
+### AI/ML Processing
+
+```ts
+extensions: [
+  pythonExtension({
+    scripts: ["./ai/**/*.py"],
+    requirementsFile: "./requirements.txt",
+  }),
+  ffmpeg({ version: "7" }),
+  additionalPackages({ packages: ["wrangler"] }),
+];
+```
+
+### Web Scraping
+
+```ts
+extensions: [
+  playwright({ browsers: ["chromium"] }),
+  puppeteer(),
+  additionalFiles({ files: ["./selectors.json", "./proxies.txt"] }),
+];
+```
+
+## Best Practices
+
+- **Use specific versions**: Pin extension versions for reproducible builds
+- **External packages**: Add modules with native addons to the `build.external` array
+- **Environment sync**: Use `syncEnvVars` for dynamic secrets
+- **File paths**: Use glob patterns for flexible file inclusion
+- **Debug builds**: Use `--log-level debug --dry-run` for troubleshooting
+
+Extensions only affect deployment, not local development. Use `external` array for packages that shouldn't be bundled.
diff --git a/.claude/skills/trigger-dev-tasks/realtime.md b/.claude/skills/trigger-dev-tasks/realtime.md
new file mode 100644
index 00000000000..c1c4c5821a9
--- /dev/null
+++ b/.claude/skills/trigger-dev-tasks/realtime.md
@@ -0,0 +1,244 @@
+# Trigger.dev Realtime
+
+**Real-time monitoring and updates for runs**
+
+## Core Concepts
+
+Realtime allows you to:
+
+- Subscribe to run status changes, metadata updates, and streams
+- Build real-time dashboards and UI updates
+- Monitor task progress from frontend and backend
+
+## Authentication
+
+### Public Access Tokens
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Read-only token for specific runs
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      runs: ["run_123", "run_456"],
+      tasks: ["my-task-1", "my-task-2"],
+    },
+  },
+  expirationTime: "1h", // Default: 15 minutes
+});
+```
+
+### Trigger Tokens (Frontend only)
+
+```ts
+// Single-use token for triggering tasks
+const triggerToken = await auth.createTriggerPublicToken("my-task", {
+  expirationTime: "30m",
+});
+```
+
+## Backend Usage
+
+### Subscribe to Runs
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+
+// Trigger and subscribe
+const handle = await tasks.trigger("my-task", { data: "value" });
+
+// Subscribe to specific run
+for await (const run of runs.subscribeToRun<typeof myTask>(handle.id)) {
+  console.log(`Status: ${run.status}, Progress: ${run.metadata?.progress}`);
+  if (run.status === "COMPLETED") break;
+}
+
+// Subscribe to runs with tag
+for await (const run of runs.subscribeToRunsWithTag("user-123")) {
+  console.log(`Tagged run ${run.id}: ${run.status}`);
+}
+
+// Subscribe to batch
+for await (const run of runs.subscribeToBatch(batchId)) {
+  console.log(`Batch run ${run.id}: ${run.status}`);
+}
+```
+
+### Realtime Streams v2
+
+```ts
+import { streams, InferStreamType } from "@trigger.dev/sdk";
+
+// 1. Define streams (shared location)
+export const aiStream = streams.define<string>({
+  id: "ai-output",
+});
+
+export type AIStreamPart = InferStreamType<typeof aiStream>;
+
+// 2. Pipe from task
+export const streamingTask = task({
+  id: "streaming-task",
+  run: async (payload) => {
+    const completion = await openai.chat.completions.create({
+      model: "gpt-4",
+      messages: [{ role: "user", content: payload.prompt }],
+      stream: true,
+    });
+
+    const { waitUntilComplete } = aiStream.pipe(completion);
+    await waitUntilComplete();
+  },
+});
+
+// 3. Read from backend
+const stream = await aiStream.read(runId, {
+  timeoutInSeconds: 300,
+  startIndex: 0, // Resume from specific chunk
+});
+
+for await (const chunk of stream) {
+  console.log("Chunk:", chunk); // Fully typed
+}
+```
+
+## React Frontend Usage
+
+### Installation
+
+```bash
+npm add @trigger.dev/react-hooks
+```
+
+### Triggering Tasks
+
+```tsx
+"use client";
+import { useTaskTrigger, useRealtimeTaskTrigger } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function TriggerComponent({ accessToken }: { accessToken: string }) {
+  // Basic trigger
+  const { submit, handle, isLoading } = useTaskTrigger<typeof myTask>("my-task", {
+    accessToken,
+  });
+
+  // Trigger with realtime updates
+  const {
+    submit: realtimeSubmit,
+    run,
+    isLoading: isRealtimeLoading,
+  } = useRealtimeTaskTrigger<typeof myTask>("my-task", { accessToken });
+
+  return (
+    <div>
+      <button onClick={() => submit({ data: "value" })} disabled={isLoading}>
+        Trigger Task
+      </button>
+
+      <button onClick={() => realtimeSubmit({ data: "realtime" })} disabled={isRealtimeLoading}>
+        Trigger with Realtime
+      </button>
+
+      {run && <div>Status: {run.status}</div>}
+    </div>
+  );
+}
+```
+
+### Subscribing to Runs
+
+```tsx
+"use client";
+import { useRealtimeRun, useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function SubscribeComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  // Subscribe to specific run
+  const { run, error } = useRealtimeRun<typeof myTask>(runId, {
+    accessToken,
+    onComplete: (run) => {
+      console.log("Task completed:", run.output);
+    },
+  });
+
+  // Subscribe to tagged runs
+  const { runs } = useRealtimeRunsWithTag("user-123", { accessToken });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!run) return <div>Loading...</div>;
+
+  return (
+    <div>
+      <div>Status: {run.status}</div>
+      <div>Progress: {run.metadata?.progress || 0}%</div>
+      {run.output && <div>Result: {JSON.stringify(run.output)}</div>}
+
+      <h3>Tagged Runs:</h3>
+      {runs.map((r) => (
+        <div key={r.id}>
+          {r.id}: {r.status}
+        </div>
+      ))}
+    </div>
+  );
+}
+```
+
+### Realtime Streams with React
+
+```tsx
+"use client";
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "../trigger/streams";
+
+function StreamComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  // Pass defined stream directly for type safety
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    timeoutInSeconds: 300,
+    throttleInMs: 50, // Control re-render frequency
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  const text = parts.join(""); // parts is typed as AIStreamPart[]
+
+  return <div>Streamed Text: {text}</div>;
+}
+```
+
+### Wait Tokens
+
+```tsx
+"use client";
+import { useWaitToken } from "@trigger.dev/react-hooks";
+
+function WaitTokenComponent({ tokenId, accessToken }: { tokenId: string; accessToken: string }) {
+  const { complete } = useWaitToken(tokenId, { accessToken });
+
+  return <button onClick={() => complete({ approved: true })}>Approve Task</button>;
+}
+```
+
+## Run Object Properties
+
+Key properties available in run subscriptions:
+
+- `id`: Unique run identifier
+- `status`: `QUEUED`, `EXECUTING`, `COMPLETED`, `FAILED`, `CANCELED`, etc.
+- `payload`: Task input data (typed)
+- `output`: Task result (typed, when completed)
+- `metadata`: Real-time updatable data
+- `createdAt`, `updatedAt`: Timestamps
+- `costInCents`: Execution cost
+
+## Best Practices
+
+- **Use Realtime over SWR**: Recommended for most use cases due to rate limits
+- **Scope tokens properly**: Only grant necessary read/trigger permissions
+- **Handle errors**: Always check for errors in hooks and subscriptions
+- **Type safety**: Use task types for proper payload/output typing
+- **Cleanup subscriptions**: Backend subscriptions auto-complete, frontend hooks auto-cleanup
diff --git a/.claude/skills/trigger-dev-tasks/scheduled-tasks.md b/.claude/skills/trigger-dev-tasks/scheduled-tasks.md
new file mode 100644
index 00000000000..b314753497f
--- /dev/null
+++ b/.claude/skills/trigger-dev-tasks/scheduled-tasks.md
@@ -0,0 +1,113 @@
+# Scheduled Tasks (Cron)
+
+Recurring tasks using cron. For one-off future runs, use the **delay** option.
+
+## Define a Scheduled Task
+
+```ts
+import { schedules } from "@trigger.dev/sdk";
+
+export const task = schedules.task({
+  id: "first-scheduled-task",
+  run: async (payload) => {
+    payload.timestamp; // Date (scheduled time, UTC)
+    payload.lastTimestamp; // Date | undefined
+    payload.timezone; // IANA, e.g. "America/New_York" (default "UTC")
+    payload.scheduleId; // string
+    payload.externalId; // string | undefined
+    payload.upcoming; // Date[]
+
+    payload.timestamp.toLocaleString("en-US", { timeZone: payload.timezone });
+  },
+});
+```
+
+> Scheduled tasks need at least one schedule attached to run.
+
+## Attach Schedules
+
+**Declarative (sync on dev/deploy):**
+
+```ts
+schedules.task({
+  id: "every-2h",
+  cron: "0 */2 * * *", // UTC
+  run: async () => {},
+});
+
+schedules.task({
+  id: "tokyo-5am",
+  cron: { pattern: "0 5 * * *", timezone: "Asia/Tokyo", environments: ["PRODUCTION", "STAGING"] },
+  run: async () => {},
+});
+```
+
+**Imperative (SDK or dashboard):**
+
+```ts
+await schedules.create({
+  task: task.id,
+  cron: "0 0 * * *",
+  timezone: "America/New_York", // DST-aware
+  externalId: "user_123",
+  deduplicationKey: "user_123-daily", // updates if reused
+});
+```
+
+### Dynamic / Multi-tenant Example
+
+```ts
+// /trigger/reminder.ts
+export const reminderTask = schedules.task({
+  id: "todo-reminder",
+  run: async (p) => {
+    if (!p.externalId) throw new Error("externalId is required");
+    const user = await db.getUser(p.externalId);
+    await sendReminderEmail(user);
+  },
+});
+```
+
+```ts
+// app/reminders/route.ts
+export async function POST(req: Request) {
+  const data = await req.json();
+  return Response.json(
+    await schedules.create({
+      task: reminderTask.id,
+      cron: "0 8 * * *",
+      timezone: data.timezone,
+      externalId: data.userId,
+      deduplicationKey: `${data.userId}-reminder`,
+    })
+  );
+}
+```
+
+## Cron Syntax (no seconds)
+
+```
+* * * * *
+| | | | └ day of week (0–7 or 1L–7L; 0/7=Sun; L=last)
+| | | └── month (1–12)
+| | └──── day of month (1–31 or L)
+| └────── hour (0–23)
+└──────── minute (0–59)
+```
+
+## When Schedules Won't Trigger
+
+- **Dev:** only when the dev CLI is running.
+- **Staging/Production:** only for tasks in the **latest deployment**.
+
+## SDK Management
+
+```ts
+await schedules.retrieve(id);
+await schedules.list();
+await schedules.update(id, { cron: "0 0 1 * *", externalId: "ext", deduplicationKey: "key" });
+await schedules.deactivate(id);
+await schedules.activate(id);
+await schedules.del(id);
+await schedules.timezones(); // list of IANA timezones
+```
diff --git a/.cursor/commands/deslop.md b/.cursor/commands/deslop.md
new file mode 100644
index 00000000000..d82835663f7
--- /dev/null
+++ b/.cursor/commands/deslop.md
@@ -0,0 +1,11 @@
+# Remove AI code slop
+
+Check the diff against main, and remove all AI generated slop introduced in this branch.
+
+This includes:
+- Extra comments that a human wouldn't add or is inconsistent with the rest of the file
+- Extra defensive checks or try/catch blocks that are abnormal for that area of the codebase (especially if called by trusted / validated codepaths)
+- Casts to any to get around type issues
+- Any other style that is inconsistent with the file
+
+Report at the end with only a 1-3 sentence summary of what you changed
\ No newline at end of file
diff --git a/.cursor/mcp.json b/.cursor/mcp.json
index 9b3221784d4..da39e4ffafe 100644
--- a/.cursor/mcp.json
+++ b/.cursor/mcp.json
@@ -1,7 +1,3 @@
 {
-  "mcpServers": {
-    "trigger.dev": {
-      "url": "http://localhost:3333/sse"
-    }
-  }
-}
\ No newline at end of file
+  "mcpServers": {}
+}
diff --git a/.cursor/plans/resolve_upstream_merge_conflicts_86e4a884.plan.md b/.cursor/plans/resolve_upstream_merge_conflicts_86e4a884.plan.md
new file mode 100644
index 00000000000..628b20ad126
--- /dev/null
+++ b/.cursor/plans/resolve_upstream_merge_conflicts_86e4a884.plan.md
@@ -0,0 +1,161 @@
+---
+name: Resolve upstream merge conflicts
+overview: Resolve 68 merge conflicts between the GovSignals fork (with two-phase deploy, custom images, and Kubernetes enhancements) and upstream/main, preserving all fork customizations on top of upstream's refactored code.
+todos:
+  - id: phase1-deletions
+    content: "Bulk-resolve: git rm deleted references, git add fork-only files, accept upstream lock file"
+    status: completed
+  - id: phase2-packagejson
+    content: "Resolve package.json: accept upstream pnpm@10.23.0 and overrides structure, re-add fork-specific overrides"
+    status: completed
+  - id: phase3-env
+    content: "Resolve env.server.ts: accept upstream refactored schema, add DEPLOY_VERSION_SUFFIX and DEPLOY_IMAGE_OVERRIDE"
+    status: completed
+  - id: phase4-kubernetes
+    content: "Resolve kubernetes.ts: combine fork's serviceAccountName/securityContext with upstream's schedulerName"
+    status: completed
+  - id: phase5-initdeploy
+    content: "Resolve initializeDeployment.server.ts: keep upstream's new API, integrate fork's DEPLOY_IMAGE_OVERRIDE with rewritten else branch"
+    status: completed
+  - id: phase6-buildworker
+    content: "Resolve buildWorker.ts: combine fork's baseImageNode/containerfileModule with upstream's plain option"
+    status: completed
+  - id: phase7-buildimage
+    content: "Resolve buildImage.ts: combine imports, keep both indexEnvVars and compression options, keep fork's --load and image tag"
+    status: completed
+  - id: phase8-deploy
+    content: "Resolve deploy.ts: combine imports/options from both sides, keep all new functions from both fork and upstream"
+    status: completed
+  - id: phase9-finalize
+    content: Run pnpm install, verify build compiles, complete merge commit
+    status: completed
+isProject: false
+---
+
+# Resolve Upstream Merge Conflicts
+
+The merge from `upstream/main` into the `update-trigger` branch has 68 conflicted files. The fork's custom features (two-phase deploy, custom images/containerfiles, Kubernetes service account) need to be preserved on top of upstream's refactored code.
+
+## Phase 1: Bulk-resolve trivial conflicts
+
+### 1a. Delete files removed by upstream
+
+55 files in `references/seed/src copy/` and 2 files in `references/v3-catalog/` were deleted upstream. Accept the deletions.
+
+```bash
+git rm -r "references/seed/src copy/"
+git rm references/v3-catalog/src/trigger/returnTypes.ts
+git rm references/v3-catalog/trigger.config.ts
+```
+
+### 1b. Keep fork-only files
+
+2 files in `references/seed/` exist only in the fork. Keep them.
+
+```bash
+git add references/seed/.triggerdeploy.json
+git add references/seed/src/trigger/testTasks.ts
+```
+
+### 1c. Accept upstream's lock file
+
+```bash
+git checkout --theirs pnpm-lock.yaml
+git add pnpm-lock.yaml
+```
+
+## Phase 2: package.json (root)
+
+Two conflicts in [package.json](package.json):
+
+- **packageManager** (line 69): Accept upstream's `pnpm@10.23.0`
+- **pnpm.overrides** (line 99): Accept upstream's version (includes granular `form-data` overrides, security fixes, and `onlyBuiltDependencies`). Re-add the fork's overrides that are still needed: `ws`, `semver`, `cross-spawn`, `@babel/runtime` -- insert them into the upstream overrides block
+
+## Phase 3: env.server.ts (webapp)
+
+One massive conflict spanning the entire file in [apps/webapp/app/env.server.ts](apps/webapp/app/env.server.ts).
+
+- **Accept upstream's refactored schema structure** (multi-schema composition with `GithubAppEnvSchema`, `S2EnvSchema`, `.and()` chain)
+- **Add the fork's 2 custom env vars** into the upstream `EnvironmentSchema` z.object, near the deployment registry section:
+  - `DEPLOY_VERSION_SUFFIX: z.string().optional()`
+  - `DEPLOY_IMAGE_OVERRIDE: z.string().optional()`
+
+## Phase 4: kubernetes.ts (supervisor)
+
+One conflict in [apps/supervisor/src/workloadManager/kubernetes.ts](apps/supervisor/src/workloadManager/kubernetes.ts) at line 323.
+
+Both sides add non-overlapping features to the pod spec. **Keep both**:
+
+- Fork's `serviceAccountName` spread + `securityContext` block
+- Upstream's `schedulerName` spread
+
+## Phase 5: initializeDeployment.server.ts (webapp)
+
+One conflict in [apps/webapp/app/v3/services/initializeDeployment.server.ts](apps/webapp/app/v3/services/initializeDeployment.server.ts) at line 122.
+
+This is the most nuanced conflict. The resolution must:
+
+1. **Keep upstream's new variables**: `isV4Deployment`, `registryConfig`, `deploymentShortCode`
+2. **Declare fork's variables**: `let imageRef: string; let isEcr = false; let repoCreated = false;`
+3. **Keep the fork's `DEPLOY_IMAGE_OVERRIDE` check** (lines 144-151) as-is
+4. **Rewrite the else branch** (lines 152-183): replace the old `getDeploymentImageRef` call with upstream's new API signature, then extract `imageRef`, `isEcr`, `repoCreated` from the result
+
+The else branch should become:
+
+```typescript
+} else {
+  const [imageRefError, imageRefResult] = await tryCatch(
+    getDeploymentImageRef({
+      registry: registryConfig,
+      projectRef: environment.project.externalRef,
+      nextVersion,
+      environmentType: environment.type,
+      deploymentShortCode,
+    })
+  );
+
+  if (imageRefError) {
+    logger.error("Failed to get deployment image ref", { ... });
+    throw new ServiceValidationError("Failed to get deployment image ref");
+  }
+
+  imageRef = imageRefResult.imageRef;
+  isEcr = imageRefResult.isEcr;
+  repoCreated = imageRefResult.repoCreated;
+}
+```
+
+## Phase 6: buildWorker.ts (cli-v3)
+
+Two conflicts in [packages/cli-v3/src/build/buildWorker.ts](packages/cli-v3/src/build/buildWorker.ts).
+
+- **Line 38**: Keep all three options in `BuildWorkerOptions`: fork's `baseImageNode` + `containerfileModule` AND upstream's `plain`
+- **Line 223**: Keep fork's `metafile.json` write and `writeContainerfile` with extra args; also accept upstream's simplified default call path
+
+## Phase 7: buildImage.ts (cli-v3)
+
+Five conflicts in [packages/cli-v3/src/deploy/buildImage.ts](packages/cli-v3/src/deploy/buildImage.ts).
+
+- **Line 8 (imports)**: Combine both -- fork's `cpSync, mkdirSync`, `pathToFileURL`, `ContainerfileTemplate` AND upstream's `tryCatch`, `CliApiClient`
+- **Line 161 (function params)**: Keep both `indexEnvVars` and `compression`/`compressionLevel`/`forceCompression`
+- **Line 192 (interface)**: Same -- keep both sets of fields
+- **Line 593 (`--load` flag)**: Keep fork's conditional `--load`
+- **Line 623 (image tag)**: Keep fork's `-t options.imageTag "."` instead of upstream's bare `"."`
+
+## Phase 8: deploy.ts (cli-v3) -- largest and most complex
+
+Six conflicts in [packages/cli-v3/src/commands/deploy.ts](packages/cli-v3/src/commands/deploy.ts).
+
+- **Line 3 (imports)**: Combine both -- fork's `CreateBackgroundWorkerRequestBody` AND upstream's `InitializeDeploymentRequestBody`, `GitMeta`, `DeploymentFinalizedEvent`, `DeploymentEventFromString`, `DeploymentTriggeredVia`, plus upstream's `relative` import
+- **Line 93 (DeployCommandOptions)**: Keep ALL options from both sides -- fork's `registry`, `repository`, `buildOnly`, `registerOnly`, `baseImageNode`, `containerfileModule`, `skipDigest` AND upstream's `nativeBuildServer`, `detach`, `plain`, `compression`, `cacheCompression`, `compressionLevel`, `forceCompression`
+- **Line 453 (buildWorker call)**: Keep all three: `baseImageNode`, `containerfileModule`, `plain`
+- **Line 464 (spinner text)**: Trivial -- use upstream's `"Successfully built code"` (no trailing period)
+- **Line 618 (build options)**: Keep both `indexEnvVars` and compression options
+- **Line 1080 (large block)**: Both sides add entirely new functions. **Keep both**: fork's `buildOnlyDeploy` + `registerOnlyDeploy` AND upstream's `initializeOrAttachDeployment` + `getTriggeredVia` + `handleNativeBuildServerDeploy`
+
+## Phase 9: Final steps
+
+1. Run `pnpm install` to regenerate `pnpm-lock.yaml`
+2. Verify the build compiles: `pnpm run build --filter webapp --filter trigger.dev --filter @trigger.dev/sdk`
+3. Complete the merge commit
+
diff --git a/.cursor/rules/migrations.mdc b/.cursor/rules/migrations.mdc
new file mode 100644
index 00000000000..370c87c051d
--- /dev/null
+++ b/.cursor/rules/migrations.mdc
@@ -0,0 +1,6 @@
+---
+description: how to create and apply database migrations
+alwaysApply: false
+---
+
+Follow our [migrations.md](mdc:ai/references/migrations.md) guide for how to create and apply database migrations.
diff --git a/.cursor/rules/otel-metrics.mdc b/.cursor/rules/otel-metrics.mdc
new file mode 100644
index 00000000000..218f07c41e2
--- /dev/null
+++ b/.cursor/rules/otel-metrics.mdc
@@ -0,0 +1,66 @@
+---
+description: Guidelines for creating OpenTelemetry metrics to avoid cardinality issues
+globs:
+  - "**/*.ts"
+---
+
+# OpenTelemetry Metrics Guidelines
+
+When creating or editing OTEL metrics (counters, histograms, gauges), always ensure metric attributes have **low cardinality**.
+
+## What is Cardinality?
+
+Cardinality refers to the number of unique values an attribute can have. Each unique combination of attribute values creates a new time series, which consumes memory and storage in your metrics backend.
+
+## Rules
+
+### DO use low-cardinality attributes:
+- **Enums**: `environment_type` (PRODUCTION, STAGING, DEVELOPMENT, PREVIEW)
+- **Booleans**: `hasFailures`, `streaming`, `success`
+- **Bounded error codes**: A finite, controlled set of error types
+- **Shard IDs**: When sharding is bounded (e.g., 0-15)
+
+### DO NOT use high-cardinality attributes:
+- **UUIDs/IDs**: `envId`, `userId`, `runId`, `projectId`, `organizationId`
+- **Unbounded integers**: `itemCount`, `batchSize`, `retryCount`
+- **Timestamps**: `createdAt`, `startTime`
+- **Free-form strings**: `errorMessage`, `taskName`, `queueName`
+
+## Example
+
+```typescript
+// BAD - High cardinality
+this.counter.add(1, {
+  envId: options.environmentId,        // UUID - unbounded
+  itemCount: options.runCount,         // Integer - unbounded
+});
+
+// GOOD - Low cardinality
+this.counter.add(1, {
+  environment_type: options.environmentType,  // Enum - 4 values
+  streaming: true,                            // Boolean - 2 values
+});
+```
+
+## Prometheus Metric Naming
+
+When metrics are exported via OTLP to Prometheus, the exporter automatically adds unit suffixes to metric names:
+
+| OTel Metric Name | Unit | Prometheus Name |
+|------------------|------|-----------------|
+| `my_duration_ms` | `ms` | `my_duration_ms_milliseconds` |
+| `my_counter` | counter | `my_counter_total` |
+| `items_inserted` | counter | `items_inserted_inserts_total` |
+| `batch_size` | histogram | `batch_size_items_bucket` |
+
+Keep this in mind when writing Grafana dashboards or Prometheus queries—the metric names in Prometheus will differ from the names defined in code.
+
+## Reference
+
+See the schedule engine (`internal-packages/schedule-engine/src/engine/index.ts`) for a good example of low-cardinality metric attributes.
+
+High cardinality metrics can cause:
+- Memory bloat in metrics backends (Axiom, Prometheus, etc.)
+- Slow queries and dashboard timeouts
+- Increased costs (many backends charge per time series)
+- Potential data loss or crashes at scale
diff --git a/.cursor/rules/webapp.mdc b/.cursor/rules/webapp.mdc
index 6cda9739514..a362f14fe12 100644
--- a/.cursor/rules/webapp.mdc
+++ b/.cursor/rules/webapp.mdc
@@ -6,7 +6,7 @@ alwaysApply: false
 
 The main trigger.dev webapp, which powers it's API and dashboard and makes up the docker image that is produced as an OSS image, is a Remix 2.1.0 app that uses an express server, written in TypeScript. The following subsystems are either included in the webapp or are used by the webapp in another part of the monorepo:
 
-- `@trigger.dev/database` exports a Prisma 5.4.1 client that is used extensively in the webapp to access a PostgreSQL instance. The schema file is [schema.prisma](mdc:internal-packages/database/prisma/schema.prisma)
+- `@trigger.dev/database` exports a Prisma 6.14.0 client that is used extensively in the webapp to access a PostgreSQL instance. The schema file is [schema.prisma](mdc:internal-packages/database/prisma/schema.prisma)
 - `@trigger.dev/core` is a published package and is used to share code between the `@trigger.dev/sdk` and the webapp. It includes functionality but also a load of Zod schemas for data validation. When importing from `@trigger.dev/core` in the webapp, we never import the root `@trigger.dev/core` path, instead we favor one of the subpath exports that you can find in [package.json](mdc:packages/core/package.json)
 - `@internal/run-engine` has all the code needed to trigger a run and take it through it's lifecycle to completion.
 - `@trigger.dev/redis-worker` is a custom redis based background job/worker system that's used in the webapp and also used inside the run engine.
@@ -31,7 +31,10 @@ We originally the Trigger.dev "Run Engine" not as a single system, but just spre
 - The batch trigger API endpoint is [api.v1.tasks.batch.ts](mdc:apps/webapp/app/routes/api.v1.tasks.batch.ts)
 - Setup code for the prisma client is in [db.server.ts](mdc:apps/webapp/app/db.server.ts)
 - The run engine is configured in [runEngine.server.ts](mdc:apps/webapp/app/v3/runEngine.server.ts)
-- All the "services" that are found in app/v3/services/**/*.server.ts
+- All the "services" that are found in app/v3/services/\*_/_.server.ts
 - The code for the TaskEvent data, which is the otel data sent from tasks to our servers, is in both the [eventRepository.server.ts](mdc:apps/webapp/app/v3/eventRepository.server.ts) and also the [otlpExporter.server.ts](mdc:apps/webapp/app/v3/otlpExporter.server.ts). The otel endpoints which are hit from production and development otel exporters is [otel.v1.logs.ts](mdc:apps/webapp/app/routes/otel.v1.logs.ts) and [otel.v1.traces.ts](mdc:apps/webapp/app/routes/otel.v1.traces.ts)
-- We use "presenters" to move more complex loader code into a class, and you can find those are app/v3/presenters/**/*.server.ts
+- We use "presenters" to move more complex loader code into a class, and you can find those are app/v3/presenters/\*_/_.server.ts
 
+- All the "services" that are found in app/v3/services/\*_/_.server.ts
+- The code for the TaskEvent data, which is the otel data sent from tasks to our servers, is in both the [eventRepository.server.ts](mdc:apps/webapp/app/v3/eventRepository.server.ts) and also the [otlpExporter.server.ts](mdc:apps/webapp/app/v3/otlpExporter.server.ts). The otel endpoints which are hit from production and development otel exporters is [otel.v1.logs.ts](mdc:apps/webapp/app/routes/otel.v1.logs.ts) and [otel.v1.traces.ts](mdc:apps/webapp/app/routes/otel.v1.traces.ts)
+- We use "presenters" to move more complex loader code into a class, and you can find those are app/v3/presenters/\*_/_.server.ts
diff --git a/.cursor/rules/writing-tasks.mdc b/.cursor/rules/writing-tasks.mdc
index 6090b85f090..5116d083e23 100644
--- a/.cursor/rules/writing-tasks.mdc
+++ b/.cursor/rules/writing-tasks.mdc
@@ -431,28 +431,6 @@ export async function POST(request: Request) {
 }
 ```
 
-### tasks.triggerAndPoll()
-
-Triggers a task and polls until completion. Not recommended for web requests as it blocks until the run completes. Consider using Realtime docs for better alternatives.
-
-```ts
-import { tasks } from "@trigger.dev/sdk/v3";
-import type { emailSequence } from "~/trigger/emails";
-
-export async function POST(request: Request) {
-  const data = await request.json();
-  const result = await tasks.triggerAndPoll<typeof emailSequence>(
-    "email-sequence",
-    {
-      to: data.email,
-      name: data.name,
-    },
-    { pollIntervalMs: 5000 }
-  );
-  return Response.json(result);
-}
-```
-
 ### batch.trigger()
 
 Triggers multiple runs of different tasks at once, useful when you need to execute multiple tasks simultaneously.
diff --git a/.dockerignore b/.dockerignore
index d3f8720a9ef..a3ea4db8eec 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -16,6 +16,8 @@
 **/dist
 **/node_modules
 
+**/generated/prisma
+
 apps/webapp/build
 apps/webapp/public/build
 
diff --git a/.env.example b/.env.example
index ae4a3672a5b..84228647d60 100644
--- a/.env.example
+++ b/.env.example
@@ -13,7 +13,10 @@ APP_ORIGIN=http://localhost:3030
 ELECTRIC_ORIGIN=http://localhost:3060
 NODE_ENV=development
 
+# Clickhouse
 CLICKHOUSE_URL=http://default:password@localhost:8123
+RUN_REPLICATION_CLICKHOUSE_URL=http://default:password@localhost:8123
+RUN_REPLICATION_ENABLED=1
 
 # Set this to UTC because Node.js uses the system timezone
 TZ="UTC"
@@ -31,9 +34,9 @@ DEPLOY_REGISTRY_HOST=localhost:5000
 
 # OPTIONAL VARIABLES
 # This is used for validating emails that are allowed to log in. Every email that do not match this regex will be rejected.
-# WHITELISTED_EMAILS="authorized@yahoo\.com|authorized@gmail\.com"
+# WHITELISTED_EMAILS="^(authorized@yahoo\.com|authorized@gmail\.com)$"
 # Accounts with these emails will get global admin rights. This grants access to the admin UI.
-# ADMIN_EMAILS="admin@example\.com|another-admin@example\.com"
+# ADMIN_EMAILS="^(admin@example\.com|another-admin@example\.com)$"
 # This is used for logging in via GitHub. You can leave these commented out if you don't want to use GitHub for authentication.
 # AUTH_GITHUB_CLIENT_ID=
 # AUTH_GITHUB_CLIENT_SECRET=
@@ -82,4 +85,10 @@ POSTHOG_PROJECT_KEY=
 # These control the server-side internal telemetry
 # INTERNAL_OTEL_TRACE_EXPORTER_URL=<URL to send traces to>
 # INTERNAL_OTEL_TRACE_LOGGING_ENABLED=1
-# INTERNAL_OTEL_TRACE_INSTRUMENT_PRISMA_ENABLED=0,
\ No newline at end of file
+# INTERNAL_OTEL_TRACE_INSTRUMENT_PRISMA_ENABLED=0
+
+# Enable local observability stack (requires `pnpm run docker` to start otel-collector)
+# Uncomment these to send metrics to the local Prometheus via OTEL Collector:
+# INTERNAL_OTEL_METRIC_EXPORTER_ENABLED=1
+# INTERNAL_OTEL_METRIC_EXPORTER_URL=http://localhost:4318/v1/metrics
+# INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS=15000
diff --git a/.github/ISSUE_TEMPLATE/vouch-request.yml b/.github/ISSUE_TEMPLATE/vouch-request.yml
new file mode 100644
index 00000000000..9ffe04a8984
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/vouch-request.yml
@@ -0,0 +1,28 @@
+name: Vouch Request
+description: Request to be vouched as a contributor
+labels: ["vouch-request"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Vouch Request
+
+        We use [vouch](https://github.com/mitchellh/vouch) to manage contributor trust. PRs from unvouched users are automatically closed.
+
+        To get vouched, fill out this form. A maintainer will review your request and vouch for you by commenting on this issue.
+  - type: textarea
+    id: context
+    attributes:
+      label: Why do you want to contribute?
+      description: Tell us a bit about yourself and what you'd like to work on.
+      placeholder: "I'd like to fix a bug I found in..."
+    validations:
+      required: true
+  - type: textarea
+    id: prior-work
+    attributes:
+      label: Prior contributions or relevant experience
+      description: Links to previous open source work, relevant projects, or anything that helps us understand your background.
+      placeholder: "https://github.com/..."
+    validations:
+      required: false
diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
new file mode 100644
index 00000000000..8e06c770ab8
--- /dev/null
+++ b/.github/VOUCHED.td
@@ -0,0 +1,16 @@
+# Vouched contributors for Trigger.dev
+# See: https://github.com/mitchellh/vouch
+#
+# Org members
+0ski
+D-K-P
+ericallam
+matt-aitken
+mpcgrid
+myftija
+nicktrn
+samejr
+isshaddad
+# Outside contributors
+gautamsi
+capaj
\ No newline at end of file
diff --git a/.github/workflows/changesets-pr.yml b/.github/workflows/changesets-pr.yml
new file mode 100644
index 00000000000..e2fdc187614
--- /dev/null
+++ b/.github/workflows/changesets-pr.yml
@@ -0,0 +1,102 @@
+name: 🦋 Changesets PR
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "packages/**"
+      - ".changeset/**"
+      - "package.json"
+      - "pnpm-lock.yaml"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  release-pr:
+    name: Create Release PR
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    if: github.repository == 'triggerdotdev/trigger.dev'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Create release PR
+        id: changesets
+        uses: changesets/action@v1
+        with:
+          version: pnpm run changeset:version
+          commit: "chore: release"
+          title: "chore: release"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update PR title with version
+        if: steps.changesets.outputs.published != 'true'
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER=$(gh pr list --head changeset-release/main --json number --jq '.[0].number')
+          if [ -n "$PR_NUMBER" ]; then
+            git fetch origin changeset-release/main
+            # we arbitrarily reference the version of the cli package here; it is the same for all package releases
+            VERSION=$(git show origin/changeset-release/main:packages/cli-v3/package.json | jq -r '.version')
+            gh pr edit "$PR_NUMBER" --title "chore: release v$VERSION"
+          fi
+
+  update-lockfile:
+    name: Update lockfile on release PR
+    runs-on: ubuntu-latest
+    needs: release-pr
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout release branch
+        uses: actions/checkout@v4
+        with:
+          ref: changeset-release/main
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+
+      - name: Install and update lockfile
+        run: pnpm install --no-frozen-lockfile
+
+      - name: Commit and push lockfile
+        run: |
+          set -e
+          if git diff --quiet pnpm-lock.yaml; then
+            echo "No lockfile changes"
+          else
+            git config user.name "github-actions[bot]"
+            git config user.email "github-actions[bot]@users.noreply.github.com"
+            git add pnpm-lock.yaml
+            git commit -m "chore: update lockfile for release"
+            git push origin changeset-release/main
+          fi
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
new file mode 100644
index 00000000000..cadbe31773f
--- /dev/null
+++ b/.github/workflows/claude.yml
@@ -0,0 +1,70 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+          cache: "pnpm"
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          claude_args: |
+            --model claude-opus-4-5-20251101
+            --allowedTools "Bash(pnpm:*),Bash(turbo:*),Bash(git:*),Bash(gh:*),Bash(npx:*),Bash(docker:*),Edit,MultiEdit,Read,Write,Glob,Grep,LS,Task"
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr:*)'
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index db78308a43f..9518ca6157c 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -31,12 +31,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
 
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile --filter trigger.dev...
diff --git a/.github/workflows/helm-pr-prerelease.yml b/.github/workflows/helm-pr-prerelease.yml
new file mode 100644
index 00000000000..8df045945e6
--- /dev/null
+++ b/.github/workflows/helm-pr-prerelease.yml
@@ -0,0 +1,138 @@
+name: 🧭 Helm Chart PR Prerelease
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - "hosting/k8s/helm/**"
+
+concurrency:
+  group: helm-prerelease-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+env:
+  REGISTRY: ghcr.io
+  CHART_NAME: trigger
+
+jobs:
+  lint-and-test:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: "3.18.3"
+
+      - name: Build dependencies
+        run: helm dependency build ./hosting/k8s/helm/
+
+      - name: Extract dependency charts
+        run: |
+          cd ./hosting/k8s/helm/
+          for file in ./charts/*.tgz; do echo "Extracting $file"; tar -xzf "$file" -C ./charts; done
+
+      - name: Lint Helm Chart
+        run: |
+          helm lint ./hosting/k8s/helm/
+
+      - name: Render templates
+        run: |
+          helm template test-release ./hosting/k8s/helm/ \
+            --values ./hosting/k8s/helm/values.yaml \
+            --output-dir ./helm-output
+
+      - name: Validate manifests
+        uses: docker://ghcr.io/yannh/kubeconform:v0.7.0
+        with:
+          entrypoint: "/kubeconform"
+          args: "-summary -output json ./helm-output"
+
+  prerelease:
+    needs: lint-and-test
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Helm
+        uses: azure/setup-helm@v4
+        with:
+          version: "3.18.3"
+
+      - name: Build dependencies
+        run: helm dependency build ./hosting/k8s/helm/
+
+      - name: Extract dependency charts
+        run: |
+          cd ./hosting/k8s/helm/
+          for file in ./charts/*.tgz; do echo "Extracting $file"; tar -xzf "$file" -C ./charts; done
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Generate prerelease version
+        id: version
+        run: |
+          BASE_VERSION=$(grep '^version:' ./hosting/k8s/helm/Chart.yaml | awk '{print $2}')
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          SHORT_SHA=$(echo "${{ github.event.pull_request.head.sha }}" | cut -c1-7)
+          PRERELEASE_VERSION="${BASE_VERSION}-pr${PR_NUMBER}.${SHORT_SHA}"
+          echo "version=$PRERELEASE_VERSION" >> $GITHUB_OUTPUT
+          echo "Prerelease version: $PRERELEASE_VERSION"
+
+      - name: Update Chart.yaml with prerelease version
+        run: |
+          sed -i "s/^version:.*/version: ${{ steps.version.outputs.version }}/" ./hosting/k8s/helm/Chart.yaml
+
+      - name: Package Helm Chart
+        run: |
+          helm package ./hosting/k8s/helm/ --destination /tmp/
+
+      - name: Push Helm Chart to GHCR
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          CHART_PACKAGE="/tmp/${{ env.CHART_NAME }}-${VERSION}.tgz"
+
+          # Push to GHCR OCI registry
+          helm push "$CHART_PACKAGE" "oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/charts"
+
+      - name: Find existing comment
+        uses: peter-evans/find-comment@v3
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: "github-actions[bot]"
+          body-includes: "Helm Chart Prerelease Published"
+
+      - name: Create or update PR comment
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            ### 🧭 Helm Chart Prerelease Published
+
+            **Version:** `${{ steps.version.outputs.version }}`
+
+            **Install:**
+            ```bash
+            helm upgrade --install trigger \
+              oci://ghcr.io/${{ github.repository_owner }}/charts/trigger \
+              --version "${{ steps.version.outputs.version }}"
+            ```
+
+            > ⚠️ This is a prerelease for testing. Do not use in production.
+          edit-mode: replace
diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
index b6be1eddfa1..dab18223e35 100644
--- a/.github/workflows/pr_checks.yml
+++ b/.github/workflows/pr_checks.yml
@@ -29,3 +29,7 @@ jobs:
     with:
       package: cli-v3
     secrets: inherit
+
+  sdk-compat:
+    uses: ./.github/workflows/sdk-compat.yml
+    secrets: inherit
diff --git a/.github/workflows/publish-webapp.yml b/.github/workflows/publish-webapp.yml
index ed5a259a853..6fcc30209ab 100644
--- a/.github/workflows/publish-webapp.yml
+++ b/.github/workflows/publish-webapp.yml
@@ -86,3 +86,8 @@ jobs:
             BUILD_GIT_SHA=${{ steps.set_build_info.outputs.BUILD_GIT_SHA }}
             BUILD_GIT_REF_NAME=${{ steps.set_build_info.outputs.BUILD_GIT_REF_NAME }}
             BUILD_TIMESTAMP_SECONDS=${{ steps.set_build_info.outputs.BUILD_TIMESTAMP_SECONDS }}
+            SENTRY_RELEASE=${{ steps.set_build_info.outputs.BUILD_GIT_SHA }}
+            SENTRY_ORG=triggerdev
+            SENTRY_PROJECT=trigger-cloud
+          secrets: |
+            sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 3acda8a7f03..6213499c5ad 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,6 +1,7 @@
 name: 🚀 Publish Trigger.dev Docker
 
 on:
+  workflow_dispatch:
   workflow_call:
     inputs:
       image_tag:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 686240aaef6..3b4135ec099 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,98 +1,195 @@
 name: 🦋 Changesets Release
 
-permissions:
-  contents: write
-
 on:
-  push:
+  pull_request:
+    types: [closed]
     branches:
       - main
-    paths-ignore:
-      - "docs/**"
-      - "**.md"
-      - ".github/CODEOWNERS"
-      - ".github/ISSUE_TEMPLATE/**"
+  workflow_dispatch:
+    inputs:
+      type:
+        description: "Select release type"
+        required: true
+        type: choice
+        options:
+          - release
+          - prerelease
+        default: "prerelease"
+      ref:
+        description: "The ref (branch, tag, or SHA) to checkout and release from"
+        required: true
+        type: string
+      prerelease_tag:
+        description: "The npm dist-tag for the prerelease (e.g., 'v4-prerelease')"
+        required: false
+        type: string
+        default: "prerelease"
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
+  show-release-summary:
+    name: 📋 Release Summary
+    runs-on: ubuntu-latest
+    if: |
+      github.repository == 'triggerdotdev/trigger.dev' &&
+      github.event_name == 'pull_request' &&
+      github.event.pull_request.merged == true &&
+      github.event.pull_request.head.ref == 'changeset-release/main'
+    steps:
+      - name: Show release summary
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
+        run: |
+          echo "$PR_BODY" | sed -n '/^# Releases/,$p' >> $GITHUB_STEP_SUMMARY
+
   release:
-    name: 🦋 Changesets Release
+    name: 🚀 Release npm packages
     runs-on: ubuntu-latest
+    environment: npm-publish
     permissions:
       contents: write
       packages: write
-      pull-requests: write
-    if: github.repository == 'triggerdotdev/trigger.dev'
+      id-token: write
+    if: |
+      github.repository == 'triggerdotdev/trigger.dev' &&
+      (
+        (github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'release') ||
+        (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'changeset-release/main')
+      )
     outputs:
       published: ${{ steps.changesets.outputs.published }}
       published_packages: ${{ steps.changesets.outputs.publishedPackages }}
       published_package_version: ${{ steps.get_version.outputs.package_version }}
     steps:
-      - name: ⬇️ Checkout repo
+      - name: Checkout repo
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.ref || github.sha }}
 
-      - name: ⎔ Setup pnpm
+      - name: Verify ref is on main
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          if ! git merge-base --is-ancestor ${{ github.event.inputs.ref }} origin/main; then
+            echo "Error: ref must be an ancestor of main (i.e., already merged)"
+            exit 1
+          fi
+
+      - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
-      - name: ⎔ Setup node
+      - name: Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           cache: "pnpm"
 
-      - name: 📥 Download deps
+      # npm v11.5.1 or newer is required for OIDC support
+      # https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/#whats-new
+      - name: Setup npm 11.x for OIDC
+        run: npm install -g npm@11.6.4
+
+      - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: 📀 Generate Prisma Client
+      - name: Generate Prisma client
         run: pnpm run generate
 
-      - name: 🏗️ Build
+      - name: Build
         run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
 
-      - name: 🔎 Type check
+      - name: Type check
         run: pnpm run typecheck --filter "@trigger.dev/*" --filter "trigger.dev"
 
-      - 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
-        if: ${{ !env.ACT }}
+      - name: 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: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      # - name: 🚀 PR / Publish (mock)
-      #   if: ${{ env.ACT }}
-      #   id: changesets
-      #   run: |
-      #     echo "published=true" >> "$GITHUB_OUTPUT"
-      #     echo "publishedPackages=[{\"name\": \"@xx/xx\", \"version\": \"1.2.0\"}, {\"name\": \"@xx/xy\", \"version\": \"0.8.9\"}]" >> "$GITHUB_OUTPUT"
 
-      - name: 📦 Get package version
+      - name: Show package version
         if: steps.changesets.outputs.published == 'true'
         id: get_version
         run: |
           package_version=$(echo '${{ steps.changesets.outputs.publishedPackages }}' | jq -r '.[0].version')
           echo "package_version=${package_version}" >> "$GITHUB_OUTPUT"
+
+      - name: Create and push Docker tag
+        if: steps.changesets.outputs.published == 'true'
+        run: |
+          set -e
+          git tag "v.docker.${{ steps.get_version.outputs.package_version }}"
+          git push origin "v.docker.${{ steps.get_version.outputs.package_version }}"
+
+  # Trigger Docker builds directly via workflow_call since tags pushed with
+  # GITHUB_TOKEN don't trigger other workflows (GitHub Actions limitation).
+  publish-docker:
+    name: 🐳 Publish Docker images
+    needs: release
+    if: needs.release.outputs.published == 'true'
+    uses: ./.github/workflows/publish.yml
+    secrets: inherit
+    with:
+      image_tag: v${{ needs.release.outputs.published_package_version }}
+
+  # The prerelease job needs to be on the same workflow file due to a limitation related to how npm verifies OIDC claims.
+  prerelease:
+    name: 🧪 Prerelease
+    runs-on: ubuntu-latest
+    environment: npm-publish
+    permissions:
+      contents: read
+      id-token: write
+    if: github.repository == 'triggerdotdev/trigger.dev' && github.event_name == 'workflow_dispatch' && github.event.inputs.type == 'prerelease'
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.ref }}
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+          cache: "pnpm"
+
+      # npm v11.5.1 or newer is required for OIDC support
+      # https://github.blog/changelog/2025-07-31-npm-trusted-publishing-with-oidc-is-generally-available/#whats-new
+      - name: Setup npm 11.x for OIDC
+        run: npm install -g npm@11.6.4
+
+      - name: Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: Generate Prisma Client
+        run: pnpm run generate
+
+      - name: Snapshot version
+        run: pnpm exec changeset version --snapshot ${{ github.event.inputs.prerelease_tag }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Clean
+        run: pnpm run clean --filter "@trigger.dev/*" --filter "trigger.dev"
+
+      - name: Build
+        run: pnpm run build --filter "@trigger.dev/*" --filter "trigger.dev"
+
+      - name: Publish prerelease
+        run: pnpm exec changeset publish --no-git-tag --snapshot --tag ${{ github.event.inputs.prerelease_tag }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/sdk-compat.yml b/.github/workflows/sdk-compat.yml
new file mode 100644
index 00000000000..eb347c0f771
--- /dev/null
+++ b/.github/workflows/sdk-compat.yml
@@ -0,0 +1,178 @@
+name: "🔌 SDK Compatibility Tests"
+
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+
+jobs:
+  node-compat:
+    name: "Node.js ${{ matrix.node }} (${{ matrix.os }})"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        node: ["20.20", "22.12"]
+
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: ${{ matrix.node }}
+          cache: "pnpm"
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: 🔨 Build SDK dependencies
+        shell: bash
+        run: pnpm run build --filter '@trigger.dev/sdk^...'
+
+      - name: 🔨 Build SDK
+        shell: bash
+        run: pnpm run build --filter '@trigger.dev/sdk'
+
+      - name: 🧪 Run SDK Compatibility Tests
+        shell: bash
+        run: pnpm --filter @internal/sdk-compat-tests test
+
+  bun-compat:
+    name: "Bun Runtime"
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+          cache: "pnpm"
+
+      - name: 🥟 Setup Bun
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: 🔨 Build SDK dependencies
+        run: pnpm run build --filter @trigger.dev/sdk^...
+
+      - name: 🔨 Build SDK
+        run: pnpm run build --filter @trigger.dev/sdk
+
+      - name: 🧪 Run Bun Compatibility Test
+        working-directory: internal-packages/sdk-compat-tests/src/fixtures/bun
+        run: bun run test.ts
+
+  deno-compat:
+    name: "Deno Runtime"
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+          cache: "pnpm"
+
+      - name: 🦕 Setup Deno
+        uses: denoland/setup-deno@v2
+        with:
+          deno-version: v2.x
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: 🔨 Build SDK dependencies
+        run: pnpm run build --filter @trigger.dev/sdk^...
+
+      - name: 🔨 Build SDK
+        run: pnpm run build --filter @trigger.dev/sdk
+
+      - name: 🔗 Link node_modules for Deno fixture
+        working-directory: internal-packages/sdk-compat-tests/src/fixtures/deno
+        run: ln -s ../../../../../node_modules node_modules
+
+      - name: 🧪 Run Deno Compatibility Test
+        working-directory: internal-packages/sdk-compat-tests/src/fixtures/deno
+        run: deno run --allow-read --allow-env --allow-sys test.ts
+
+  cloudflare-compat:
+    name: "Cloudflare Workers"
+    runs-on: ubuntu-latest
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: ⎔ Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10.23.0
+
+      - name: ⎔ Setup node
+        uses: buildjet/setup-node@v4
+        with:
+          node-version: 20.20.0
+          cache: "pnpm"
+
+      - name: 📥 Download deps
+        run: pnpm install --frozen-lockfile
+
+      - name: 📀 Generate Prisma Client
+        run: pnpm run generate
+
+      - name: 🔨 Build SDK dependencies
+        run: pnpm run build --filter @trigger.dev/sdk^...
+
+      - name: 🔨 Build SDK
+        run: pnpm run build --filter @trigger.dev/sdk
+
+      - name: 📥 Install Cloudflare fixture deps
+        working-directory: internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker
+        run: pnpm install
+
+      - name: 🧪 Run Cloudflare Workers Compatibility Test (dry-run)
+        working-directory: internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker
+        run: npx wrangler deploy --dry-run --outdir dist
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index acd1fb3d642..665d54b2563 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -19,12 +19,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           cache: "pnpm"
 
       - name: 📥 Download deps
@@ -35,6 +35,8 @@ jobs:
 
       - name: 🔎 Type check
         run: pnpm run typecheck
+        env:
+          NODE_OPTIONS: --max-old-space-size=8192
 
       - name: 🔎 Check exports
         run: pnpm run check-exports
diff --git a/.github/workflows/unit-tests-internal.yml b/.github/workflows/unit-tests-internal.yml
index 5acac054a66..92b951e8aa0 100644
--- a/.github/workflows/unit-tests-internal.yml
+++ b/.github/workflows/unit-tests-internal.yml
@@ -53,12 +53,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           cache: "pnpm"
 
       # ..to avoid rate limits when pulling images
@@ -72,6 +72,17 @@ jobs:
         if: ${{ !env.DOCKERHUB_USERNAME }}
         run: echo "DockerHub login skipped because secrets are not available."
 
+      - name: 🐳 Pre-pull testcontainer images
+        if: ${{ env.DOCKERHUB_USERNAME }}
+        run: |
+          echo "Pre-pulling Docker images with authenticated session..."
+          docker pull postgres:14
+          docker pull clickhouse/clickhouse-server:25.4-alpine
+          docker pull redis:7-alpine
+          docker pull testcontainers/ryuk:0.11.0
+          docker pull electricsql/electric:1.2.4
+          echo "Image pre-pull complete"
+
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile
 
@@ -111,12 +122,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           # no cache enabled, we're not installing deps
 
       - name: Download blob reports from GitHub Actions Artifacts
diff --git a/.github/workflows/unit-tests-packages.yml b/.github/workflows/unit-tests-packages.yml
index cfa5e88baa2..78474e03f27 100644
--- a/.github/workflows/unit-tests-packages.yml
+++ b/.github/workflows/unit-tests-packages.yml
@@ -53,12 +53,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           cache: "pnpm"
 
       # ..to avoid rate limits when pulling images
@@ -72,6 +72,17 @@ jobs:
         if: ${{ !env.DOCKERHUB_USERNAME }}
         run: echo "DockerHub login skipped because secrets are not available."
 
+      - name: 🐳 Pre-pull testcontainer images
+        if: ${{ env.DOCKERHUB_USERNAME }}
+        run: |
+          echo "Pre-pulling Docker images with authenticated session..."
+          docker pull postgres:14
+          docker pull clickhouse/clickhouse-server:25.4-alpine
+          docker pull redis:7-alpine
+          docker pull testcontainers/ryuk:0.11.0
+          docker pull electricsql/electric:1.2.4
+          echo "Image pre-pull complete"
+
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile
 
@@ -111,12 +122,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           # no cache enabled, we're not installing deps
 
       - name: Download blob reports from GitHub Actions Artifacts
diff --git a/.github/workflows/unit-tests-webapp.yml b/.github/workflows/unit-tests-webapp.yml
index 26599f43312..523a1887db8 100644
--- a/.github/workflows/unit-tests-webapp.yml
+++ b/.github/workflows/unit-tests-webapp.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        shardTotal: [10]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
     env:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       SHARD_INDEX: ${{ matrix.shardIndex }}
@@ -53,12 +53,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           cache: "pnpm"
 
       # ..to avoid rate limits when pulling images
@@ -72,6 +72,17 @@ jobs:
         if: ${{ !env.DOCKERHUB_USERNAME }}
         run: echo "DockerHub login skipped because secrets are not available."
 
+      - name: 🐳 Pre-pull testcontainer images
+        if: ${{ env.DOCKERHUB_USERNAME }}
+        run: |
+          echo "Pre-pulling Docker images with authenticated session..."
+          docker pull postgres:14
+          docker pull clickhouse/clickhouse-server:25.4-alpine
+          docker pull redis:7-alpine
+          docker pull testcontainers/ryuk:0.11.0
+          docker pull electricsql/electric:1.2.4
+          echo "Image pre-pull complete"
+
       - name: 📥 Download deps
         run: pnpm install --frozen-lockfile
 
@@ -85,7 +96,7 @@ jobs:
           DIRECT_URL: postgresql://postgres:postgres@localhost:5432/postgres
           SESSION_SECRET: "secret"
           MAGIC_LINK_SECRET: "secret"
-          ENCRYPTION_KEY: "secret"
+          ENCRYPTION_KEY: "dummy-encryption-keeeey-32-bytes"
           DEPLOY_REGISTRY_HOST: "docker.io"
           CLICKHOUSE_URL: "http://default:password@localhost:8123"
 
@@ -119,12 +130,12 @@ jobs:
       - name: ⎔ Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.5
+          version: 10.23.0
 
       - name: ⎔ Setup node
         uses: buildjet/setup-node@v4
         with:
-          node-version: 20.11.1
+          node-version: 20.20.0
           # no cache enabled, we're not installing deps
 
       - name: Download blob reports from GitHub Actions Artifacts
diff --git a/.github/workflows/vouch-check-pr.yml b/.github/workflows/vouch-check-pr.yml
new file mode 100644
index 00000000000..a2f4c6d1b6b
--- /dev/null
+++ b/.github/workflows/vouch-check-pr.yml
@@ -0,0 +1,23 @@
+name: Vouch - Check PR
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+
+permissions:
+  contents: read
+  pull-requests: write
+  issues: read
+
+jobs:
+  check-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: mitchellh/vouch/action/check-pr@main
+        with:
+          pr-number: ${{ github.event.pull_request.number }}
+          auto-close: true
+          require-vouch: true
+        env:
+          GH_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/vouch-manage-by-issue.yml b/.github/workflows/vouch-manage-by-issue.yml
new file mode 100644
index 00000000000..36de055752f
--- /dev/null
+++ b/.github/workflows/vouch-manage-by-issue.yml
@@ -0,0 +1,25 @@
+name: Vouch - Manage by Issue
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: write
+  issues: write
+
+jobs:
+  manage:
+    runs-on: ubuntu-latest
+    if: >-
+      contains(github.event.comment.body, 'vouch') ||
+      contains(github.event.comment.body, 'denounce') ||
+      contains(github.event.comment.body, 'unvouch')
+    steps:
+      - uses: actions/checkout@v4
+      - uses: mitchellh/vouch/action/manage-by-issue@main
+        with:
+          comment-id: ${{ github.event.comment.id }}
+          issue-id: ${{ github.event.issue.number }}
+        env:
+          GH_TOKEN: ${{ github.token }}
diff --git a/.gitignore b/.gitignore
index 9bee46fc278..071b9b59035 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ out/
 dist
 packages/**/dist
 
+# vendored bundles (generated during build)
+packages/**/src/**/vendor
+
 # Tailwind
 apps/**/styles/tailwind.css
 packages/**/styles/tailwind.css
@@ -29,12 +32,10 @@ yarn-debug.log*
 yarn-error.log*
 
 # local env files
-.env.docker
+.env
+.env.*
 .docker/*.env
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
+!.env.example
 
 # turbo
 .turbo
@@ -63,4 +64,7 @@ apps/**/public/build
 /packages/core/src/package.json
 /packages/trigger-sdk/src/package.json
 /packages/python/src/package.json
-.claude
\ No newline at end of file
+**/.claude/settings.local.json
+.mcp.log
+.mcp.json
+.cursor/debug.log
\ No newline at end of file
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index c83a08985cd..00000000000
--- a/.npmrc
+++ /dev/null
@@ -1,5 +0,0 @@
-link-workspace-packages=false
-public-hoist-pattern[]=*prisma*
-prefer-workspace-packages=true
-update-notifier=false
-side-effects-cache=false
\ No newline at end of file
diff --git a/.nvmrc b/.nvmrc
index 2efc7e111f7..7c663e0a0bd 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v20.11.1
\ No newline at end of file
+v20.20.0
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6d08392086c..71a76904a2b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -31,6 +31,15 @@
       "cwd": "${workspaceFolder}/apps/webapp",
       "sourceMaps": true
     },
+    {
+      "type": "node-terminal",
+      "request": "launch",
+      "name": "Debug opened test file",
+      "command": "pnpm run test -- ./${relativeFile}",
+      "envFile": "${workspaceFolder}/.env",
+      "cwd": "${workspaceFolder}",
+      "sourceMaps": true
+    },
     {
       "type": "chrome",
       "request": "launch",
@@ -59,7 +68,7 @@
       "request": "launch",
       "name": "Debug V3 Dev CLI",
       "command": "pnpm exec trigger dev",
-      "cwd": "${workspaceFolder}/references/v3-catalog",
+      "cwd": "${workspaceFolder}/references/hello-world",
       "sourceMaps": true
     },
     {
@@ -83,7 +92,7 @@
       "request": "launch",
       "name": "Debug V3 Deploy CLI",
       "command": "pnpm exec trigger deploy --self-hosted --load-image",
-      "cwd": "${workspaceFolder}/references/v3-catalog",
+      "cwd": "${workspaceFolder}/references/hello-world",
       "sourceMaps": true
     },
     {
@@ -91,7 +100,7 @@
       "request": "launch",
       "name": "Debug V3 list-profiles CLI",
       "command": "pnpm exec trigger list-profiles --log-level debug",
-      "cwd": "${workspaceFolder}/references/v3-catalog",
+      "cwd": "${workspaceFolder}/references/hello-world",
       "sourceMaps": true
     },
     {
@@ -99,7 +108,7 @@
       "request": "launch",
       "name": "Debug V3 update CLI",
       "command": "pnpm exec trigger update",
-      "cwd": "${workspaceFolder}/references/v3-catalog",
+      "cwd": "${workspaceFolder}/references/hello-world",
       "sourceMaps": true
     },
     {
@@ -107,7 +116,7 @@
       "request": "launch",
       "name": "Debug V3 Management",
       "command": "pnpm run management",
-      "cwd": "${workspaceFolder}/references/v3-catalog",
+      "cwd": "${workspaceFolder}/references/hello-world",
       "sourceMaps": true
     },
     {
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f8a7bd06977..fd9f3dcde0c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,5 +6,6 @@
     "**/node_modules/**": true,
     "packages/cli-v3/e2e": true
   },
-  "vitest.disableWorkspaceWarning": true
+  "vitest.disableWorkspaceWarning": true,
+  "chat.agent.maxRequests": 10000
 }
diff --git a/AGENTS.md b/AGENTS.md
index 11e926fe948..99496f91bde 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -13,7 +13,7 @@ This repository is a pnpm monorepo managed with Turbo. It contains multiple apps
 See `ai/references/repo.md` for a more complete explanation of the workspaces.
 
 ## Development setup
-1. Install dependencies with `pnpm i` (pnpm `8.15.5` and Node.js `20.11.1` are required).
+1. Install dependencies with `pnpm i` (pnpm `10.23.0` and Node.js `20.20.0` are required).
 2. Copy `.env.example` to `.env` and generate a random 16 byte hex string for `ENCRYPTION_KEY` (`openssl rand -hex 16`). Update other secrets if needed.
 3. Start the local services with Docker:
    ```bash
diff --git a/CHANGESETS.md b/CHANGESETS.md
index cf660076617..722fe64eb4c 100644
--- a/CHANGESETS.md
+++ b/CHANGESETS.md
@@ -30,14 +30,16 @@ Please follow the best-practice of adding changesets in the same commit as the c
 
 ## Snapshot instructions
 
-1. Delete the `.changeset/pre.json` file (if it exists)
+1. Update the `.changeset/config.json` file to set the `"changelog"` field to this:
 
-2. Do a temporary commit (do NOT push this, you should undo it after)
+```json
+"changelog": "@changesets/cli/changelog",
+```
 
-3. Copy the `GITHUB_TOKEN` line from the .env file
+2. Do a temporary commit (do NOT push this, you should undo it after)
 
-4. Run `GITHUB_TOKEN=github_pat_12345 ./scripts/publish-prerelease.sh re2`
+3. Run `./scripts/publish-prerelease.sh prerelease`
 
-Make sure to replace the token with yours. `re2` is the tag that will be used for the pre-release.
+You can choose a different tag if you want, but usually `prerelease` is fine.
 
-5. Undo the commit where you deleted the pre.json file.
+5. Undo the commit where you updated the config.json file.
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000000..acc59359707
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,303 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Build and Development Commands
+
+This is a pnpm 10.23.0 monorepo using Turborepo. Run commands from root with `pnpm run`.
+
+### Essential Commands
+
+```bash
+# Start Docker services (PostgreSQL, Redis, Electric)
+pnpm run docker
+
+# Run database migrations
+pnpm run db:migrate
+
+# Seed the database (required for reference projects)
+pnpm run db:seed
+
+# Build packages (required before running)
+pnpm run build --filter webapp && pnpm run build --filter trigger.dev && pnpm run build --filter @trigger.dev/sdk
+
+# Run webapp in development mode (http://localhost:3030)
+pnpm run dev --filter webapp
+
+# Build and watch for changes (CLI and packages)
+pnpm run dev --filter trigger.dev --filter "@trigger.dev/*"
+```
+
+### Testing
+
+We use vitest exclusively. **Never mock anything** - use testcontainers instead.
+
+```bash
+# Run all tests for a package
+pnpm run test --filter webapp
+
+# Run a single test file (preferred - cd into directory first)
+cd internal-packages/run-engine
+pnpm run test ./src/engine/tests/ttl.test.ts --run
+
+# May need to build dependencies first
+pnpm run build --filter @internal/run-engine
+```
+
+Test files go next to source files (e.g., `MyService.ts` → `MyService.test.ts`).
+
+#### Testcontainers for Redis/PostgreSQL
+
+```typescript
+import { redisTest, postgresTest, containerTest } from "@internal/testcontainers";
+
+// Redis only
+redisTest("should use redis", async ({ redisOptions }) => {
+  /* ... */
+});
+
+// PostgreSQL only
+postgresTest("should use postgres", async ({ prisma }) => {
+  /* ... */
+});
+
+// Both Redis and PostgreSQL
+containerTest("should use both", async ({ prisma, redisOptions }) => {
+  /* ... */
+});
+```
+
+### Changesets
+
+When modifying any public package (`packages/*` or `integrations/*`), add a changeset:
+
+```bash
+pnpm run changeset:add
+```
+
+- Default to **patch** for bug fixes and minor changes
+- Confirm with maintainers before selecting **minor** (new features)
+- **Never** select major (breaking changes) without explicit approval
+
+## Architecture Overview
+
+### Apps
+
+- **apps/webapp**: Remix 2.1.0 app - main API, dashboard, and Docker image. Uses Express server.
+- **apps/supervisor**: Node.js app handling task execution, interfacing with Docker/Kubernetes.
+
+### Public Packages
+
+- **packages/trigger-sdk** (`@trigger.dev/sdk`): Main SDK
+- **packages/cli-v3** (`trigger.dev`): CLI package
+- **packages/core** (`@trigger.dev/core`): Shared code between SDK and webapp. Import subpaths only (never root).
+- **packages/build**: Build extensions and types
+- **packages/react-hooks**: React hooks for realtime and triggering
+- **packages/redis-worker** (`@trigger.dev/redis-worker`): Custom Redis-based background job system
+
+### Internal Packages
+
+- **internal-packages/database** (`@trigger.dev/database`): Prisma 6.14.0 client and schema
+- **internal-packages/clickhouse** (`@internal/clickhouse`): ClickHouse client and schema migrations
+- **internal-packages/run-engine** (`@internal/run-engine`): "Run Engine 2.0" - run lifecycle management
+- **internal-packages/redis** (`@internal/redis`): Redis client creation utilities
+- **internal-packages/testcontainers** (`@internal/testcontainers`): Test helpers for Redis/PostgreSQL containers
+- **internal-packages/zodworker** (`@internal/zodworker`): Graphile-worker wrapper (being replaced by redis-worker)
+
+### Reference Projects
+
+The `references/` directory contains test workspaces for developing and testing new SDK and platform features. Use these projects (e.g., `references/hello-world`) to manually test changes to the CLI, SDK, core packages, and webapp before submitting PRs.
+
+## Webapp Development
+
+### Key Locations
+
+- Trigger API: `apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts`
+- Batch trigger: `apps/webapp/app/routes/api.v1.tasks.batch.ts`
+- Prisma setup: `apps/webapp/app/db.server.ts`
+- Run engine config: `apps/webapp/app/v3/runEngine.server.ts`
+- Services: `apps/webapp/app/v3/services/**/*.server.ts`
+- Presenters: `apps/webapp/app/v3/presenters/**/*.server.ts`
+- OTEL endpoints: `apps/webapp/app/routes/otel.v1.logs.ts`, `otel.v1.traces.ts`
+
+### Environment Variables
+
+Access via `env` export from `apps/webapp/app/env.server.ts`, never `process.env` directly.
+
+For testable code, **never import env.server.ts** in test files. Pass configuration as options instead. Example pattern:
+
+- `realtimeClient.server.ts` (testable service)
+- `realtimeClientGlobal.server.ts` (configuration)
+
+### Legacy vs Run Engine 2.0
+
+The codebase is transitioning from the "legacy run engine" (spread across codebase) to "Run Engine 2.0" (`@internal/run-engine`). Focus on Run Engine 2.0 for new work.
+
+## Docker Image Guidelines
+
+When updating Docker image references in `docker/Dockerfile` or other container files:
+
+- **Always use multiplatform/index digests**, not architecture-specific digests
+- Architecture-specific digests (e.g., for `linux/amd64` only) will cause CI failures on different build environments
+- On Docker Hub, the multiplatform digest is shown on the main image page, while architecture-specific digests are listed under "OS/ARCH"
+- Example: Use `node:20.20-bullseye-slim@sha256:abc123...` where the digest is from the multiplatform index, not from a specific OS/ARCH variant
+
+## Database Migrations (PostgreSQL)
+
+1. Edit `internal-packages/database/prisma/schema.prisma`
+2. Create migration:
+   ```bash
+   cd internal-packages/database
+   pnpm run db:migrate:dev:create --name "add_new_column"
+   ```
+3. **Important**: Generated migration includes extraneous changes. Remove lines related to:
+   - `_BackgroundWorkerToBackgroundWorkerFile`
+   - `_BackgroundWorkerToTaskQueue`
+   - `_TaskRunToTaskRunTag`
+   - `_WaitpointRunConnections`
+   - `_completedWaitpoints`
+   - `SecretStore_key_idx`
+   - Various `TaskRun` indexes unless you added them
+4. Apply migration:
+   ```bash
+   pnpm run db:migrate:deploy && pnpm run generate
+   ```
+
+### Index Migration Rules
+
+- Indexes **must use CONCURRENTLY** to avoid table locks
+- **CONCURRENTLY indexes must be in their own separate migration file** - they cannot be combined with other schema changes
+
+## ClickHouse Migrations
+
+ClickHouse migrations use Goose format and live in `internal-packages/clickhouse/schema/`.
+
+1. Create a new numbered SQL file (e.g., `010_add_new_column.sql`)
+2. Use Goose markers:
+
+   ```sql
+   -- +goose Up
+   ALTER TABLE trigger_dev.your_table
+   ADD COLUMN new_column String DEFAULT '';
+
+   -- +goose Down
+   ALTER TABLE trigger_dev.your_table
+   DROP COLUMN new_column;
+   ```
+
+Follow naming conventions in `internal-packages/clickhouse/README.md`:
+
+- `raw_` prefix for input tables
+- `_v1`, `_v2` suffixes for versioning
+- `_mv_v1` suffix for materialized views
+
+## Writing Trigger.dev Tasks
+
+Always import from `@trigger.dev/sdk`. Never use `@trigger.dev/sdk/v3` or deprecated `client.defineJob` pattern.
+
+```typescript
+import { task } from "@trigger.dev/sdk";
+
+// Every task must be exported
+export const myTask = task({
+  id: "my-task", // Unique ID
+  run: async (payload: { message: string }) => {
+    // Task logic - no timeouts
+  },
+});
+```
+
+### SDK Documentation Rules
+
+The `rules/` directory contains versioned documentation for writing Trigger.dev tasks, distributed to users via the SDK installer. Current version is defined in `rules/manifest.json`.
+
+- `rules/4.3.0/` - Latest: batch trigger v2 (1,000 items, 3MB payloads), debouncing
+- `rules/4.1.0/` - Realtime streams v2, updated config
+- `rules/4.0.0/` - Base v4 SDK documentation
+
+When adding new SDK features, create a new version directory with only the files that changed from the previous version. Update `manifest.json` to point unchanged files to previous versions.
+
+### Claude Code Skill
+
+The `.claude/skills/trigger-dev-tasks/` skill provides Claude Code with Trigger.dev task expertise. It includes:
+
+- `SKILL.md` - Core instructions and patterns
+- Reference files for basic tasks, advanced tasks, scheduled tasks, realtime, and config
+
+Keep the skill in sync with the latest rules version when SDK features change.
+
+## Testing with hello-world Reference Project
+
+First-time setup:
+
+1. Run `pnpm run db:seed` to seed the database (creates the hello-world project)
+2. Build CLI: `pnpm run build --filter trigger.dev && pnpm i`
+3. Authorize CLI: `cd references/hello-world && pnpm exec trigger login -a http://localhost:3030`
+
+Running:
+
+```bash
+cd references/hello-world
+pnpm exec trigger dev  # or with --log-level debug
+```
+
+## Local Task Testing Workflow
+
+This workflow enables Claude Code to run the webapp and trigger dev simultaneously, trigger tasks, and inspect results for testing code changes.
+
+### Step 1: Start Webapp in Background
+
+```bash
+# Run from repo root with run_in_background: true
+pnpm run dev --filter webapp
+```
+
+Verify webapp is running:
+
+```bash
+curl -s http://localhost:3030/healthcheck  # Should return 200
+```
+
+### Step 2: Start Trigger Dev in Background
+
+```bash
+# Run from hello-world directory with run_in_background: true
+cd references/hello-world && pnpm exec trigger dev
+```
+
+The worker will build and register tasks. Check output for "Local worker ready [node]" message.
+
+### Step 3: Trigger and Monitor Tasks via MCP
+
+Use the Trigger.dev MCP tools to interact with tasks:
+
+```
+# Get current worker and registered tasks
+mcp__trigger__get_current_worker(projectRef: "proj_rrkpdguyagvsoktglnod", environment: "dev")
+
+# Trigger a task
+mcp__trigger__trigger_task(
+  projectRef: "proj_rrkpdguyagvsoktglnod",
+  environment: "dev",
+  taskId: "hello-world",
+  payload: {"message": "Hello from Claude"}
+)
+
+# List runs to see status
+mcp__trigger__list_runs(
+  projectRef: "proj_rrkpdguyagvsoktglnod",
+  environment: "dev",
+  taskIdentifier: "hello-world",
+  limit: 5
+)
+```
+
+### Step 4: Monitor Execution
+
+- Check trigger dev output file for real-time execution logs
+- Successful runs show: `Task | Run ID | Success (Xms)`
+- Dashboard available at: http://localhost:3030/orgs/references-9dfd/projects/hello-world-97DT/env/dev/runs
+
+### Key Project Refs
+
+- hello-world: `proj_rrkpdguyagvsoktglnod`
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 709dcca47cc..b4b280bda06 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,10 +2,25 @@
 
 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.
+Please take some time to read this guide to understand contributing best practices for Trigger.dev. Note that we use [vouch](https://github.com/mitchellh/vouch) to manage contributor trust, so you'll need to be vouched before opening a PR.
 
 Thank you for helping us make Trigger.dev even better! 🤩
 
+> **Important:** We only accept PRs that address a single issue. Please do not submit PRs containing multiple unrelated fixes or features. If you have multiple contributions, open a separate PR for each one.
+
+## Getting vouched (required before opening a PR)
+
+We use [vouch](https://github.com/mitchellh/vouch) to manage contributor trust. **PRs from unvouched users are automatically closed.**
+
+Before you open your first pull request, you need to be vouched by a maintainer. Here's how:
+
+1. Open a [Vouch Request](https://github.com/triggerdotdev/trigger.dev/issues/new?template=vouch-request.yml) issue.
+2. Tell us what you'd like to work on and share any relevant background.
+3. A maintainer will review your request and vouch for you by commenting on the issue.
+4. Once vouched, your PRs will be accepted normally.
+
+If you're unsure whether you're already vouched, go ahead and open a PR — the check will tell you.
+
 ## Developing
 
 The development branch is `main`. This is the branch that all pull
@@ -14,8 +29,8 @@ branch are tagged into a release periodically.
 
 ### Prerequisites
 
-- [Node.js](https://nodejs.org/en) version 20.11.1
-- [pnpm package manager](https://pnpm.io/installation) version 8.15.5
+- [Node.js](https://nodejs.org/en) version 20.20.0
+- [pnpm package manager](https://pnpm.io/installation) version 10.23.0
 - [Docker](https://www.docker.com/get-started/)
 - [protobuf](https://github.com/protocolbuffers/protobuf)
 
@@ -34,9 +49,9 @@ branch are tagged into a release periodically.
    ```
    cd trigger.dev
    ```
-3. Ensure you are on the correct version of Node.js (20.11.1). If you are using `nvm`, there is an `.nvmrc` file that will automatically select the correct version of Node.js when you navigate to the repository.
+3. Ensure you are on the correct version of Node.js (20.20.0). If you are using `nvm`, there is an `.nvmrc` file that will automatically select the correct version of Node.js when you navigate to the repository.
 
-4. Run `corepack enable` to use the correct version of pnpm (`8.15.5`) as specified in the root `package.json` file.
+4. Run `corepack enable` to use the correct version of pnpm (`10.23.0`) as specified in the root `package.json` file.
 
 5. Install the required packages using pnpm.
    ```
@@ -84,17 +99,17 @@ branch are tagged into a release periodically.
 
 2. Once the app is running click the magic link button and enter your email. You will automatically be logged in, since you are running locally. Create an Org and your first project in the dashboard.
 
-## Manual testing using v3-catalog
+## Manual testing using hello-world
 
-We use the `<root>/references/v3-catalog` subdirectory as a staging ground for testing changes to the SDK (`@trigger.dev/sdk` at `<root>/packages/trigger-sdk`), the Core package (`@trigger.dev/core` at `<root>packages/core`), the CLI (`trigger.dev` at `<root>/packages/cli-v3`) and the platform (The remix app at `<root>/apps/webapp`). The instructions below will get you started on using the `v3-catalog` for local development of Trigger.dev (v3).
+We use the `<root>/references/hello-world` subdirectory as a staging ground for testing changes to the SDK (`@trigger.dev/sdk` at `<root>/packages/trigger-sdk`), the Core package (`@trigger.dev/core` at `<root>packages/core`), the CLI (`trigger.dev` at `<root>/packages/cli-v3`) and the platform (The remix app at `<root>/apps/webapp`). The instructions below will get you started on using the `hello-world` for local development of Trigger.dev.
 
 ### First-time setup
 
 First, make sure you are running the webapp according to the instructions above. Then:
 
-1. Visit http://localhost:3030 in your browser and create a new V3 project called "v3-catalog".
+1. Visit http://localhost:3030 in your browser and create a new project called "hello-world".
 
-2. In Postgres go to the "Projects" table and for the project you create change the `externalRef` to `yubjwjsfkxnylobaqvqz`.
+2. In Postgres go to the "Projects" table and for the project you create change the `externalRef` to `proj_rrkpdguyagvsoktglnod`.
 
 3. Build the CLI
 
@@ -105,10 +120,10 @@ pnpm run build --filter trigger.dev
 pnpm i
 ```
 
-4. Change into the `<root>/references/v3-catalog` directory and authorize the CLI to the local server:
+4. Change into the `<root>/references/hello-world` directory and authorize the CLI to the local server:
 
 ```sh
-cd references/v3-catalog
+cd references/hello-world
 cp .env.example .env
 pnpm exec trigger login -a http://localhost:3030
 ```
@@ -118,7 +133,7 @@ This will open a new browser window and authorize the CLI against your local use
 You can optionally pass a `--profile` flag to the `login` command, which will allow you to use the CLI with separate accounts/servers. We suggest using a profile called `local` for your local development:
 
 ```sh
-cd references/v3-catalog
+cd references/hello-world
 pnpm exec trigger login -a http://localhost:3030 --profile local
 # later when you run the dev or deploy command:
 pnpm exec trigger dev --profile local
@@ -127,7 +142,7 @@ pnpm exec trigger deploy --profile local
 
 ### Running
 
-The following steps should be followed any time you start working on a new feature you want to test in v3:
+The following steps should be followed any time you start working on a new feature you want to test:
 
 1. Make sure the webapp is running on localhost:3030
 
@@ -137,84 +152,29 @@ The following steps should be followed any time you start working on a new featu
 pnpm run dev --filter trigger.dev --filter "@trigger.dev/*"
 ```
 
-3. Open another terminal window, and change into the `<root>/references/v3-catalog` directory.
-
-4. You'll need to run the following commands to setup prisma and migrate the database:
-
-```sh
-pnpm exec prisma migrate deploy
-pnpm run generate:prisma
-```
+3. Open another terminal window, and change into the `<root>/references/hello-world` directory.
 
-5. Run the `dev` command, which will register all the local tasks with the platform and allow you to start testing task execution:
+4. Run the `dev` command, which will register all the local tasks with the platform and allow you to start testing task execution:
 
 ```sh
-# in <root>/references/v3-catalog
+# in <root>/references/hello-world
 pnpm exec trigger dev
 ```
 
 If you want additional debug logging, you can use the `--log-level debug` flag:
 
 ```sh
-# in <root>/references/v3-catalog
+# in <root>/references/hello-world
 pnpm exec trigger dev --log-level debug
 ```
 
-6. If you make any changes in the CLI/Core/SDK, you'll need to `CTRL+C` to exit the `dev` command and restart it to pickup changes. Any changes to the files inside of the `v3-catalog/src/trigger` dir will automatically be rebuilt by the `dev` command.
-
-7. Navigate to the `v3-catalog` project in your local dashboard at localhost:3030 and you should see the list of tasks.
-
-8. Go to the "Test" page in the sidebar and select a task. Then enter a payload and click "Run test". You can tell what the payloads should be by looking at the relevant task file inside the `/references/v3-catalog/src/trigger` folder. Many of them accept an empty payload.
-
-9. Feel free to add additional files in `v3-catalog/src/trigger` to test out specific aspects of the system, or add in edge cases.
-
-## Running end-to-end webapp tests (deprecated)
+6. If you make any changes in the CLI/Core/SDK, you'll need to `CTRL+C` to exit the `dev` command and restart it to pickup changes. Any changes to the files inside of the `hello-world/src/trigger` dir will automatically be rebuilt by the `dev` command.
 
-To run the end-to-end tests, follow the steps below:
-
-1. Set up environment variables (copy example envs into the correct place)
-
-```sh
-cp ./.env.example ./.env
-cp ./references/nextjs-test/.env.example ./references/nextjs-test/.env.local
-```
+7. Navigate to the `hello-world` project in your local dashboard at localhost:3030 and you should see the list of tasks.
 
-2. Set up dependencies
+8. Go to the "Test" page in the sidebar and select a task. Then enter a payload and click "Run test". You can tell what the payloads should be by looking at the relevant task file inside the `/references/hello-world/src/trigger` folder. Many of them accept an empty payload.
 
-```sh
-# Build packages
-pnpm run build --filter @references/nextjs-test^...
-pnpm --filter @trigger.dev/database generate
-
-# Move trigger-cli bin to correct place
-pnpm install --frozen-lockfile
-
-# Install playwrite browsers (ONE TIME ONLY)
-npx playwright install
-```
-
-3. Set up the database
-
-```sh
-pnpm run docker
-pnpm run db:migrate
-pnpm run db:seed
-```
-
-4. Run the end-to-end tests
-
-```sh
-pnpm run test:e2e
-```
-
-### Cleanup
-
-The end-to-end tests use a `setup` and `teardown` script to seed the database with test data. If the test runner doesn't exit cleanly, then the database can be left in a state where the tests can't run because the `setup` script will try to create data that already exists. If this happens, you can manually delete the `users` and `organizations` from the database using prisma studio:
-
-```sh
-# With the database running (i.e. pnpm run docker)
-pnpm run db:studio
-```
+9. Feel free to add additional files in `hello-world/src/trigger` to test out specific aspects of the system, or add in edge cases.
 
 ## Adding and running migrations
 
diff --git a/README.md b/README.md
index dab0551dc00..0d7f1ca2930 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,76 @@
 <div align="center">
-<picture>
-  <source media="(prefers-color-scheme: dark)" srcset="https://imagedelivery.net/3TbraffuDZ4aEf8KWOmI_w/a45d1fa2-0ae8-4a39-4409-f4f934bfae00/public">
-  <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>
-  
-### Open source background jobs and AI infrastructure
 
-[Discord](https://trigger.dev/discord) | [Website](https://trigger.dev) | [Issues](https://github.com/triggerdotdev/trigger.dev/issues) | [Docs](https://trigger.dev/docs)
+![Trigger.dev logo](https://content.trigger.dev/github-header-banner.jpg)
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/triggerdotdev.svg?style=social&label=Follow%20%40trigger.dev)](https://twitter.com/triggerdotdev)
+### Build and deploy fully‑managed AI agents and workflows
+
+[Website](https://trigger.dev) | [Docs](https://trigger.dev/docs) | [Issues](https://github.com/triggerdotdev/trigger.dev/issues) | [Example projects](https://github.com/triggerdotdev/examples) | [Feature requests](https://triggerdev.featurebase.app/) | [Public roadmap](https://triggerdev.featurebase.app/roadmap) | [Self-hosting](https://trigger.dev/docs/self-hosting/overview) 
+
+[![Open Source](https://img.shields.io/badge/Open%20Source-%E2%9D%A4-red.svg)](https://github.com/triggerdotdev/trigger.dev)
+[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/triggerdotdev/trigger.dev/blob/main/LICENSE)
+[![npm](https://img.shields.io/npm/v/@trigger.dev/sdk.svg?label=npm)](https://www.npmjs.com/package/@trigger.dev/sdk)
+[![SDK downloads](https://img.shields.io/npm/dm/@trigger.dev/sdk.svg?label=SDK%20downloads)](https://www.npmjs.com/package/@trigger.dev/sdk)
+
+[![Twitter Follow](https://img.shields.io/twitter/follow/triggerdotdev?style=social)](https://twitter.com/triggerdotdev)
+[![Discord](https://img.shields.io/discord/1066956501299777596?logo=discord&logoColor=white&color=7289da)](https://discord.gg/nkqV9xBYWy)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/triggerdotdev/trigger.dev)
+[![GitHub stars](https://img.shields.io/github/stars/triggerdotdev/trigger.dev?style=social)](https://github.com/triggerdotdev/trigger.dev)
 
 </div>
 
 ## About Trigger.dev
 
-Trigger.dev is an open source platform and SDK which allows you to create long-running background jobs. Write normal async code, deploy, and never hit a timeout.
+Trigger.dev is the open-source platform for building AI workflows in TypeScript. Long-running tasks with retries, queues, observability, and elastic scaling.
+
+## The platform designed for building AI agents
+
+Build [AI agents](https://trigger.dev/product/ai-agents) using all the frameworks, services and LLMs you're used to, deploy them to Trigger.dev and get durable, long-running tasks with retries, queues, observability, and elastic scaling out of the box.
+
+- **Long-running without timeouts**: Execute your tasks with absolutely no timeouts, unlike AWS Lambda, Vercel, and other serverless platforms.
+
+- **Durability, retries & queues**: Build rock solid agents and AI applications using our durable tasks, retries, queues and idempotency.
 
-### Key features:
+- **True runtime freedom**: Customize your deployed tasks with system packages – run browsers, Python scripts, FFmpeg and more.
 
-- JavaScript and TypeScript SDK
-- No timeouts
-- Retries (with exponential backoff)
-- Queues and concurrency controls
-- Schedules and crons
-- Full Observability; logs, live trace views, advanced filtering
-- React hooks to interact with the Trigger API from your React app
-- Pipe LLM streams straight to your users through the Realtime API
-- Trigger tasks and display the run status and metadata anywhere in your app
-- Custom alerts, get notified by email, Slack or webhooks
-- No infrastructure to manage
-- Elastic (scaling)
-- Works with your existing tech stack
+- **Human-in-the-loop**: Programmatically pause your tasks until a human can approve, reject or give feedback.
 
-## In your codebase
+- **Realtime apps & streaming**: Move your background jobs to the foreground by subscribing to runs or streaming AI responses to your app.
+
+- **Observability & monitoring**: Each run has full tracing and logs. Configure error alerts to catch bugs fast.
+
+## Key features:
+
+- **[JavaScript and TypeScript SDK](https://trigger.dev/docs/tasks/overview)** - Build background tasks using familiar programming models
+- **[Long-running tasks](https://trigger.dev/docs/runs/max-duration)** - Handle resource-heavy tasks without timeouts
+- **[Durable cron schedules](https://trigger.dev/docs/tasks/scheduled#scheduled-tasks-cron)** - Create and attach recurring schedules of up to a year
+- **[Trigger.dev Realtime](https://trigger.dev/docs/realtime/overview)** - Trigger, subscribe to, and get real-time updates for runs, with LLM streaming support
+- **[Build extensions](https://trigger.dev/docs/config/extensions/overview#build-extensions)** - Hook directly into the build system and customize the build process. Run Python scripts, FFmpeg, browsers, and more.
+- **[React hooks](https://trigger.dev/docs/frontend/react-hooks#react-hooks)** - Interact with the Trigger.dev API on your frontend using our React hooks package
+- **[Batch triggering](https://trigger.dev/docs/triggering#tasks-batchtrigger)** - Use batchTrigger() to initiate multiple runs of a task with custom payloads and options
+- **[Structured inputs / outputs](https://trigger.dev/docs/tasks/schemaTask#schematask)** - Define precise data schemas for your tasks with runtime payload validation
+- **[Waits](https://trigger.dev/docs/wait)** - Add waits to your tasks to pause execution for a specified duration
+- **[Preview branches](https://trigger.dev/docs/deployment/preview-branches)** - Create isolated environments for testing and development. Integrates with Vercel and git workflows
+- **[Waitpoints](https://trigger.dev/docs/wait-for-token#wait-for-token)** - Add human-in-the-loop judgment at critical decision points without disrupting workflow
+- **[Concurrency & queues](https://trigger.dev/docs/queue-concurrency#concurrency-and-queues)** - Set concurrency rules to manage how multiple tasks execute
+- **[Multiple environments](https://trigger.dev/docs/how-it-works#dev-mode)** - Support for DEV, PREVIEW, STAGING, and PROD environments
+- **[No infrastructure to manage](https://trigger.dev/docs/how-it-works#trigger-dev-architecture)** - Auto-scaling infrastructure that eliminates timeouts and server management
+- **[Automatic retries](https://trigger.dev/docs/errors-retrying)** - If your task encounters an uncaught error, we automatically attempt to run it again
+- **[Checkpointing](https://trigger.dev/docs/how-it-works#the-checkpoint-resume-system)** - Tasks are inherently durable, thanks to our checkpointing feature
+- **[Versioning](https://trigger.dev/docs/versioning)** - Atomic versioning allows you to deploy new versions without affecting running tasks
+- **[Machines](https://trigger.dev/docs/machines)** - Configure the number of vCPUs and GBs of RAM you want the task to use
+- **[Observability & monitoring](https://trigger.dev/product/observability-and-monitoring)** - Monitor every aspect of your tasks' performance with comprehensive logging and visualization tools
+- **[Logging & tracing](https://trigger.dev/docs/logging)** - Comprehensive logging and tracing for all your tasks
+- **[Tags](https://trigger.dev/docs/tags#tags)** - Attach up to ten tags to each run, allowing you to filter via the dashboard, realtime, and the SDK
+- **[Run metadata](https://trigger.dev/docs/runs/metadata#run-metadata)** - Attach metadata to runs which updates as the run progresses and is available to use in your frontend for live updates
+- **[Bulk actions](https://trigger.dev/docs/bulk-actions)** - Perform actions on multiple runs simultaneously, including replaying and cancelling
+- **[Real-time alerts](https://trigger.dev/docs/troubleshooting-alerts#alerts)** - Choose your preferred notification method for run failures and deployments
+
+## Write tasks in your codebase
 
 Create tasks where they belong: in your codebase. Version control, localhost, test and review like you're already used to.
 
 ```ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 //1. You need to export each task
 export const helloWorld = task({
@@ -58,13 +90,13 @@ Use our SDK to write tasks in your codebase. There's no infrastructure to manage
 
 ## Environments
 
-We support `Development`, `Staging`, and `Production` environments, allowing you to test your tasks before deploying them to production.
+We support `Development`, `Staging`, `Preview`, and `Production` environments, allowing you to test your tasks before deploying them to production.
 
 ## Full visibility of every job run
 
 View every task in every run so you can tell exactly what happened. We provide a full trace view of every task run so you can see what happened at every step.
 
-![Trace view image](https://imagedelivery.net/3TbraffuDZ4aEf8KWOmI_w/7c1b347f-004c-4482-38a7-3f6fa9c00d00/public)
+![Trace view image](https://content.trigger.dev/trace-view.png)
 
 # Getting started
 
@@ -73,14 +105,19 @@ The quickest way to get started is to create an account and project in our [web
 ### Useful links:
 
 - [Quick start](https://trigger.dev/docs/quick-start) - get up and running in minutes
-- [How it works](https://trigger.dev/docs/v3/how-it-works) - understand how Trigger.dev works under the hood
+- [How it works](https://trigger.dev/docs/how-it-works) - understand how Trigger.dev works under the hood
 - [Guides and examples](https://trigger.dev/docs/guides/introduction) - walk-through guides and code examples for popular frameworks and use cases
 
 ## Self-hosting
 
-If you prefer to self-host Trigger.dev, you can follow our [self-hosting guide](https://trigger.dev/docs/v3/open-source-self-hosting#overview).
+If you prefer to self-host Trigger.dev, you can follow our [self-hosting guides](https://trigger.dev/docs/self-hosting/overview):
+
+- [Docker self-hosting guide](https://trigger.dev/docs/self-hosting/docker) - use Docker Compose to spin up a Trigger.dev instance
+- [Kubernetes self-hosting guide](https://trigger.dev/docs/self-hosting/kubernetes) - use our official Helm chart to deploy Trigger.dev to your Kubernetes cluster
+
+## Support and community
 
-We also have a dedicated self-hosting channel in our [Discord server](https://trigger.dev/discord) for support.
+We have a large active community in our official [Discord server](https://trigger.dev/discord) for support, including a dedicated channel for self-hosting.
 
 ## Development
 
diff --git a/ai/references/migrations.md b/ai/references/migrations.md
new file mode 100644
index 00000000000..c6fbf79e9d7
--- /dev/null
+++ b/ai/references/migrations.md
@@ -0,0 +1,121 @@
+## Creating and applying migrations
+
+We use prisma migrations to manage the database schema. Please follow the following steps when editing the `internal-packages/database/prisma/schema.prisma` file:
+
+Edit the `schema.prisma` file to add or modify the schema.
+
+Create a new migration file but don't apply it yet:
+
+```bash
+cd internal-packages/database
+pnpm run db:migrate:dev:create --name "add_new_column_to_table"
+```
+
+The migration file will be created in the `prisma/migrations` directory, but it will have a bunch of edits to the schema that are not needed and will need to be removed before we can apply the migration. Here's an example of what the migration file might look like:
+
+```sql
+-- AlterEnum
+ALTER TYPE "public"."TaskRunExecutionStatus" ADD VALUE 'DELAYED';
+
+-- AlterTable
+ALTER TABLE "public"."TaskRun" ADD COLUMN     "debounce" JSONB;
+
+-- AlterTable
+ALTER TABLE "public"."_BackgroundWorkerToBackgroundWorkerFile" ADD CONSTRAINT "_BackgroundWorkerToBackgroundWorkerFile_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_BackgroundWorkerToBackgroundWorkerFile_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_BackgroundWorkerToTaskQueue" ADD CONSTRAINT "_BackgroundWorkerToTaskQueue_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_BackgroundWorkerToTaskQueue_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_TaskRunToTaskRunTag" ADD CONSTRAINT "_TaskRunToTaskRunTag_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_TaskRunToTaskRunTag_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_WaitpointRunConnections" ADD CONSTRAINT "_WaitpointRunConnections_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_WaitpointRunConnections_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_completedWaitpoints" ADD CONSTRAINT "_completedWaitpoints_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_completedWaitpoints_AB_unique";
+
+-- CreateIndex
+CREATE INDEX "SecretStore_key_idx" ON "public"."SecretStore"("key" text_pattern_ops);
+
+-- CreateIndex
+CREATE INDEX "TaskRun_runtimeEnvironmentId_id_idx" ON "public"."TaskRun"("runtimeEnvironmentId", "id" DESC);
+
+-- CreateIndex
+CREATE INDEX "TaskRun_runtimeEnvironmentId_createdAt_idx" ON "public"."TaskRun"("runtimeEnvironmentId", "createdAt" DESC);
+```
+
+All the following lines should be removed:
+
+```sql
+-- AlterTable
+ALTER TABLE "public"."_BackgroundWorkerToBackgroundWorkerFile" ADD CONSTRAINT "_BackgroundWorkerToBackgroundWorkerFile_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_BackgroundWorkerToBackgroundWorkerFile_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_BackgroundWorkerToTaskQueue" ADD CONSTRAINT "_BackgroundWorkerToTaskQueue_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_BackgroundWorkerToTaskQueue_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_TaskRunToTaskRunTag" ADD CONSTRAINT "_TaskRunToTaskRunTag_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_TaskRunToTaskRunTag_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_WaitpointRunConnections" ADD CONSTRAINT "_WaitpointRunConnections_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_WaitpointRunConnections_AB_unique";
+
+-- AlterTable
+ALTER TABLE "public"."_completedWaitpoints" ADD CONSTRAINT "_completedWaitpoints_AB_pkey" PRIMARY KEY ("A", "B");
+
+-- DropIndex
+DROP INDEX "public"."_completedWaitpoints_AB_unique";
+
+-- CreateIndex
+CREATE INDEX "SecretStore_key_idx" ON "public"."SecretStore"("key" text_pattern_ops);
+
+-- CreateIndex
+CREATE INDEX "TaskRun_runtimeEnvironmentId_id_idx" ON "public"."TaskRun"("runtimeEnvironmentId", "id" DESC);
+
+-- CreateIndex
+CREATE INDEX "TaskRun_runtimeEnvironmentId_createdAt_idx" ON "public"."TaskRun"("runtimeEnvironmentId", "createdAt" DESC);
+```
+
+Leaving only this:
+
+```sql
+-- AlterEnum
+ALTER TYPE "public"."TaskRunExecutionStatus" ADD VALUE 'DELAYED';
+
+-- AlterTable
+ALTER TABLE "public"."TaskRun" ADD COLUMN     "debounce" JSONB;
+```
+
+After editing the migration file, apply the migration:
+
+```bash
+cd internal-packages/database
+pnpm run db:migrate:deploy && pnpm run generate
+```
diff --git a/ai/references/repo.md b/ai/references/repo.md
index 0e9b49b4602..4f67bde2b4b 100644
--- a/ai/references/repo.md
+++ b/ai/references/repo.md
@@ -1,6 +1,6 @@
 ## Repo Overview
 
-This is a pnpm 8.15.5 monorepo that uses turborepo @turbo.json. The following workspaces are relevant
+This is a pnpm 10.23.0 monorepo that uses turborepo @turbo.json. The following workspaces are relevant
 
 ## Apps
 
diff --git a/apps/coordinator/Containerfile b/apps/coordinator/Containerfile
index 4e7b89e0af1..9e973675ab9 100644
--- a/apps/coordinator/Containerfile
+++ b/apps/coordinator/Containerfile
@@ -35,7 +35,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
 COPY --from=dev-deps --chown=node:node /app/ .
 COPY --chown=node:node turbo.json turbo.json
 
-RUN pnpm run -r --filter coordinator build:bundle
+RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter coordinator build:bundle
 
 FROM alpine AS cri-tools
 
diff --git a/apps/docker-provider/Containerfile b/apps/docker-provider/Containerfile
index bea730bda80..42a7ac23092 100644
--- a/apps/docker-provider/Containerfile
+++ b/apps/docker-provider/Containerfile
@@ -31,7 +31,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
 COPY --from=dev-deps --chown=node:node /app/ .
 COPY --chown=node:node turbo.json turbo.json
 
-RUN pnpm run -r --filter docker-provider build:bundle
+RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter docker-provider build:bundle
 
 FROM base AS runner
 
diff --git a/apps/kubernetes-provider/Containerfile b/apps/kubernetes-provider/Containerfile
index fb96304c26b..b46b9943275 100644
--- a/apps/kubernetes-provider/Containerfile
+++ b/apps/kubernetes-provider/Containerfile
@@ -31,7 +31,7 @@ COPY --from=pruner --chown=node:node /app/out/full/ .
 COPY --from=dev-deps --chown=node:node /app/ .
 COPY --chown=node:node turbo.json turbo.json
 
-RUN pnpm run -r --filter kubernetes-provider build:bundle
+RUN pnpm run -r --filter @trigger.dev/core bundle-vendor && pnpm run -r --filter kubernetes-provider build:bundle
 
 FROM base AS runner
 
diff --git a/apps/supervisor/Containerfile b/apps/supervisor/Containerfile
index 45a7bbcae5a..fc620a1d437 100644
--- a/apps/supervisor/Containerfile
+++ b/apps/supervisor/Containerfile
@@ -5,7 +5,7 @@ WORKDIR /app
 FROM node-22-alpine AS pruner
 
 COPY --chown=node:node . .
-RUN npx -q turbo@1.10.9 prune --scope=supervisor --docker
+RUN npx -q turbo@2.5.4 prune --scope=supervisor --docker
 
 FROM node-22-alpine AS base
 
@@ -16,7 +16,7 @@ COPY --from=pruner --chown=node:node /app/out/json/ .
 COPY --from=pruner --chown=node:node /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 COPY --from=pruner --chown=node:node /app/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
 
-RUN corepack enable && corepack prepare --activate
+RUN corepack enable && corepack prepare pnpm@10.23.0 --activate
 
 FROM base AS deps-fetcher
 RUN apk add --no-cache python3-dev py3-setuptools make g++ gcc linux-headers
@@ -38,7 +38,7 @@ COPY --chown=node:node scripts/updateVersion.ts scripts/updateVersion.ts
 
 RUN pnpm run generate && \
   pnpm run --filter supervisor... build&& \
-  pnpm deploy --filter=supervisor --prod /prod/supervisor
+  pnpm deploy --legacy --filter=supervisor --prod /prod/supervisor
 
 FROM base AS runner
 
diff --git a/apps/supervisor/package.json b/apps/supervisor/package.json
index ae365492721..e9609bf1541 100644
--- a/apps/supervisor/package.json
+++ b/apps/supervisor/package.json
@@ -13,13 +13,14 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
+    "@aws-sdk/client-ecr": "^3.839.0",
     "@kubernetes/client-node": "^1.0.0",
     "@trigger.dev/core": "workspace:*",
     "dockerode": "^4.0.6",
     "prom-client": "^15.1.0",
     "socket.io": "4.7.4",
     "std-env": "^3.8.0",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.33"
diff --git a/apps/supervisor/src/env.ts b/apps/supervisor/src/env.ts
index 8dd4fb58505..9ccc3f48236 100644
--- a/apps/supervisor/src/env.ts
+++ b/apps/supervisor/src/env.ts
@@ -15,7 +15,7 @@ const Env = z.object({
   OTEL_EXPORTER_OTLP_ENDPOINT: z.string().url(), // set on the runners
 
   // Workload API settings (coordinator mode) - the workload API is what the run controller connects to
-  TRIGGER_WORKLOAD_API_ENABLED: BoolEnv.default("true"),
+  TRIGGER_WORKLOAD_API_ENABLED: BoolEnv.default(true),
   TRIGGER_WORKLOAD_API_PROTOCOL: z
     .string()
     .transform((s) => z.enum(["http", "https"]).parse(s.toLowerCase()))
@@ -32,11 +32,19 @@ const Env = z.object({
   RUNNER_PRETTY_LOGS: BoolEnv.default(false),
 
   // Dequeue settings (provider mode)
-  TRIGGER_DEQUEUE_ENABLED: BoolEnv.default("true"),
+  TRIGGER_DEQUEUE_ENABLED: BoolEnv.default(true),
   TRIGGER_DEQUEUE_INTERVAL_MS: z.coerce.number().int().default(250),
   TRIGGER_DEQUEUE_IDLE_INTERVAL_MS: z.coerce.number().int().default(1000),
-  TRIGGER_DEQUEUE_MAX_RUN_COUNT: z.coerce.number().int().default(10),
-  TRIGGER_DEQUEUE_MAX_CONSUMER_COUNT: z.coerce.number().int().default(1),
+  TRIGGER_DEQUEUE_MAX_RUN_COUNT: z.coerce.number().int().default(1),
+  TRIGGER_DEQUEUE_MIN_CONSUMER_COUNT: z.coerce.number().int().default(1),
+  TRIGGER_DEQUEUE_MAX_CONSUMER_COUNT: z.coerce.number().int().default(10),
+  TRIGGER_DEQUEUE_SCALING_STRATEGY: z.enum(["none", "smooth", "aggressive"]).default("none"),
+  TRIGGER_DEQUEUE_SCALING_UP_COOLDOWN_MS: z.coerce.number().int().default(5000), // 5 seconds
+  TRIGGER_DEQUEUE_SCALING_DOWN_COOLDOWN_MS: z.coerce.number().int().default(30000), // 30 seconds
+  TRIGGER_DEQUEUE_SCALING_TARGET_RATIO: z.coerce.number().default(1.0), // Target ratio of queue items to consumers (1.0 = 1 item per consumer)
+  TRIGGER_DEQUEUE_SCALING_EWMA_ALPHA: z.coerce.number().min(0).max(1).default(0.3), // Smooths queue length measurements (0=historical, 1=current)
+  TRIGGER_DEQUEUE_SCALING_BATCH_WINDOW_MS: z.coerce.number().int().positive().default(1000), // Batch window for metrics processing (ms)
+  TRIGGER_DEQUEUE_SCALING_DAMPING_FACTOR: z.coerce.number().min(0).max(1).default(0.7), // Smooths consumer count changes after EWMA (0=no scaling, 1=immediate)
 
   // Optional services
   TRIGGER_WARM_START_URL: z.string().optional(),
@@ -49,7 +57,7 @@ const Env = z.object({
   RESOURCE_MONITOR_OVERRIDE_MEMORY_TOTAL_GB: z.coerce.number().optional(),
 
   // Docker settings
-  DOCKER_API_VERSION: z.string().default("v1.41"),
+  DOCKER_API_VERSION: z.string().optional(),
   DOCKER_PLATFORM: z.string().optional(), // e.g. linux/amd64, linux/arm64
   DOCKER_STRIP_IMAGE_DIGEST: BoolEnv.default(true),
   DOCKER_REGISTRY_USERNAME: z.string().optional(),
@@ -78,6 +86,42 @@ const Env = z.object({
   KUBERNETES_IMAGE_PULL_SECRETS: z.string().optional(), // csv
   KUBERNETES_EPHEMERAL_STORAGE_SIZE_LIMIT: z.string().default("10Gi"),
   KUBERNETES_EPHEMERAL_STORAGE_SIZE_REQUEST: z.string().default("2Gi"),
+  KUBERNETES_STRIP_IMAGE_DIGEST: BoolEnv.default(false),
+  KUBERNETES_CPU_REQUEST_MIN_CORES: z.coerce.number().min(0).default(0),
+  KUBERNETES_CPU_REQUEST_RATIO: z.coerce.number().min(0).max(1).default(0.75), // Ratio of CPU limit, so 0.75 = 75% of CPU limit
+  KUBERNETES_MEMORY_REQUEST_MIN_GB: z.coerce.number().min(0).default(0),
+  KUBERNETES_MEMORY_REQUEST_RATIO: z.coerce.number().min(0).max(1).default(1), // Ratio of memory limit, so 1 = 100% of memory limit
+
+  // Per-preset overrides of the global KUBERNETES_CPU_REQUEST_RATIO
+  KUBERNETES_CPU_REQUEST_RATIO_MICRO: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_CPU_REQUEST_RATIO_SMALL_1X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_CPU_REQUEST_RATIO_SMALL_2X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_CPU_REQUEST_RATIO_MEDIUM_1X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_CPU_REQUEST_RATIO_MEDIUM_2X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_CPU_REQUEST_RATIO_LARGE_1X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_CPU_REQUEST_RATIO_LARGE_2X: z.coerce.number().min(0).max(1).optional(),
+
+  // Per-preset overrides of the global KUBERNETES_MEMORY_REQUEST_RATIO
+  KUBERNETES_MEMORY_REQUEST_RATIO_MICRO: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_MEMORY_REQUEST_RATIO_SMALL_1X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_MEMORY_REQUEST_RATIO_SMALL_2X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_MEMORY_REQUEST_RATIO_MEDIUM_1X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_MEMORY_REQUEST_RATIO_MEDIUM_2X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_MEMORY_REQUEST_RATIO_LARGE_1X: z.coerce.number().min(0).max(1).optional(),
+  KUBERNETES_MEMORY_REQUEST_RATIO_LARGE_2X: z.coerce.number().min(0).max(1).optional(),
+
+  KUBERNETES_MEMORY_OVERHEAD_GB: z.coerce.number().min(0).optional(), // Optional memory overhead to add to the limit in GB
+  KUBERNETES_SCHEDULER_NAME: z.string().optional(), // Custom scheduler name for pods
+  KUBERNETES_LARGE_MACHINE_POOL_LABEL: z.string().optional(), // if set, large-* presets affinity for machinepool=<value>
+
+  // Project affinity settings - pods from the same project prefer the same node
+  KUBERNETES_PROJECT_AFFINITY_ENABLED: BoolEnv.default(false),
+  KUBERNETES_PROJECT_AFFINITY_WEIGHT: z.coerce.number().int().min(1).max(100).default(50),
+  KUBERNETES_PROJECT_AFFINITY_TOPOLOGY_KEY: z.string().trim().min(1).default("kubernetes.io/hostname"),
+
+  // Placement tags settings
+  PLACEMENT_TAGS_ENABLED: BoolEnv.default(false),
+  PLACEMENT_TAGS_PREFIX: z.string().default("node.cluster.x-k8s.io"),
 
   // Metrics
   METRICS_ENABLED: BoolEnv.default(true),
diff --git a/apps/supervisor/src/envUtil.ts b/apps/supervisor/src/envUtil.ts
index 95d44d6c450..917f984cc37 100644
--- a/apps/supervisor/src/envUtil.ts
+++ b/apps/supervisor/src/envUtil.ts
@@ -3,7 +3,7 @@ import { SimpleStructuredLogger } from "@trigger.dev/core/v3/utils/structuredLog
 
 const logger = new SimpleStructuredLogger("env-util");
 
-export const BoolEnv = z.preprocess((val) => {
+const baseBoolEnv = z.preprocess((val) => {
   if (typeof val !== "string") {
     return val;
   }
@@ -11,6 +11,11 @@ export const BoolEnv = z.preprocess((val) => {
   return ["true", "1"].includes(val.toLowerCase().trim());
 }, z.boolean());
 
+// Create a type-safe version that only accepts boolean defaults
+export const BoolEnv = baseBoolEnv as Omit<typeof baseBoolEnv, "default"> & {
+  default: (value: boolean) => z.ZodDefault<typeof baseBoolEnv>;
+};
+
 export const AdditionalEnvVars = z.preprocess((val) => {
   if (typeof val !== "string") {
     return val;
diff --git a/apps/supervisor/src/index.ts b/apps/supervisor/src/index.ts
index 83fe89c1ed0..0e274b30390 100644
--- a/apps/supervisor/src/index.ts
+++ b/apps/supervisor/src/index.ts
@@ -128,7 +128,18 @@ class ManagedSupervisor {
       dequeueIdleIntervalMs: env.TRIGGER_DEQUEUE_IDLE_INTERVAL_MS,
       queueConsumerEnabled: env.TRIGGER_DEQUEUE_ENABLED,
       maxRunCount: env.TRIGGER_DEQUEUE_MAX_RUN_COUNT,
-      maxConsumerCount: env.TRIGGER_DEQUEUE_MAX_CONSUMER_COUNT,
+      metricsRegistry: register,
+      scaling: {
+        strategy: env.TRIGGER_DEQUEUE_SCALING_STRATEGY,
+        minConsumerCount: env.TRIGGER_DEQUEUE_MIN_CONSUMER_COUNT,
+        maxConsumerCount: env.TRIGGER_DEQUEUE_MAX_CONSUMER_COUNT,
+        scaleUpCooldownMs: env.TRIGGER_DEQUEUE_SCALING_UP_COOLDOWN_MS,
+        scaleDownCooldownMs: env.TRIGGER_DEQUEUE_SCALING_DOWN_COOLDOWN_MS,
+        targetRatio: env.TRIGGER_DEQUEUE_SCALING_TARGET_RATIO,
+        ewmaAlpha: env.TRIGGER_DEQUEUE_SCALING_EWMA_ALPHA,
+        batchWindowMs: env.TRIGGER_DEQUEUE_SCALING_BATCH_WINDOW_MS,
+        dampingFactor: env.TRIGGER_DEQUEUE_SCALING_DAMPING_FACTOR,
+      },
       runNotificationsEnabled: env.TRIGGER_WORKLOAD_API_ENABLED,
       heartbeatIntervalSeconds: env.TRIGGER_WORKER_HEARTBEAT_INTERVAL_SECONDS,
       sendRunDebugLogs: env.SEND_RUN_DEBUG_LOGS,
@@ -233,6 +244,12 @@ class ManagedSupervisor {
       }
 
       try {
+        if (!message.deployment.friendlyId) {
+          // mostly a type guard, deployments always exists for deployed environments
+          // a proper fix would be to use a discriminated union schema to differentiate between dequeued runs in dev and in deployed environments.
+          throw new Error("Deployment is missing");
+        }
+
         await this.workloadManager.create({
           dequeuedAt: message.dequeuedAt,
           envId: message.environment.id,
@@ -241,12 +258,15 @@ class ManagedSupervisor {
           machine: message.run.machine,
           orgId: message.organization.id,
           projectId: message.project.id,
+          deploymentFriendlyId: message.deployment.friendlyId,
+          deploymentVersion: message.backgroundWorker.version,
           runId: message.run.id,
           runFriendlyId: message.run.friendlyId,
           version: message.version,
           nextAttemptNumber: message.run.attemptNumber,
           snapshotId: message.snapshot.id,
           snapshotFriendlyId: message.snapshot.friendlyId,
+          placementTags: message.placementTags,
         });
 
         // Disabled for now
diff --git a/apps/supervisor/src/services/failedPodHandler.ts b/apps/supervisor/src/services/failedPodHandler.ts
index 26a589e6776..07217243769 100644
--- a/apps/supervisor/src/services/failedPodHandler.ts
+++ b/apps/supervisor/src/services/failedPodHandler.ts
@@ -25,6 +25,7 @@ export class FailedPodHandler {
 
   private readonly informer: Informer<V1Pod>;
   private readonly reconnectIntervalMs: number;
+  private reconnecting = false;
 
   // Metrics
   private readonly register: Registry;
@@ -250,21 +251,48 @@ export class FailedPodHandler {
   }
 
   private makeOnError(informerName: string) {
-    return () => this.onError(informerName);
+    return (err?: unknown) => this.onError(informerName, err);
   }
 
-  private async onError(informerName: string) {
+  private async onError(informerName: string, err?: unknown) {
     if (!this.isRunning) {
       this.logger.warn("onError: informer not running");
       return;
     }
 
-    this.logger.error("error event fired", { informerName });
-    this.informerEventsTotal.inc({ namespace: this.namespace, verb: "error" });
+    // Guard against multiple simultaneous reconnections
+    if (this.reconnecting) {
+      this.logger.debug("onError: reconnection already in progress, skipping", {
+        informerName,
+      });
+      return;
+    }
 
-    // Reconnect on errors
-    await setTimeout(this.reconnectIntervalMs);
-    await this.informer.start();
+    this.reconnecting = true;
+
+    try {
+      const error = err instanceof Error ? err : undefined;
+      this.logger.error("error event fired", {
+        informerName,
+        error: error?.message,
+        errorType: error?.name,
+      });
+      this.informerEventsTotal.inc({ namespace: this.namespace, verb: "error" });
+
+      // Reconnect on errors
+      await setTimeout(this.reconnectIntervalMs);
+      await this.informer.start();
+    } catch (handlerError) {
+      const error = handlerError instanceof Error ? handlerError : undefined;
+      this.logger.error("onError: reconnection attempt failed", {
+        informerName,
+        error: error?.message,
+        errorType: error?.name,
+        errorStack: error?.stack,
+      });
+    } finally {
+      this.reconnecting = false;
+    }
   }
 
   private makeOnConnect(informerName: string) {
diff --git a/apps/supervisor/src/workloadManager/docker.ts b/apps/supervisor/src/workloadManager/docker.ts
index 6aa74a7eccb..d6651d325a2 100644
--- a/apps/supervisor/src/workloadManager/docker.ts
+++ b/apps/supervisor/src/workloadManager/docker.ts
@@ -8,14 +8,16 @@ import { env } from "../env.js";
 import { getDockerHostDomain, getRunnerId, normalizeDockerHostUrl } from "../util.js";
 import Docker from "dockerode";
 import { tryCatch } from "@trigger.dev/core";
+import { ECRAuthService } from "./ecrAuth.js";
 
 export class DockerWorkloadManager implements WorkloadManager {
   private readonly logger = new SimpleStructuredLogger("docker-workload-manager");
   private readonly docker: Docker;
 
   private readonly runnerNetworks: string[];
-  private readonly auth?: Docker.AuthConfig;
+  private readonly staticAuth?: Docker.AuthConfig;
   private readonly platformOverride?: string;
+  private readonly ecrAuthService?: ECRAuthService;
 
   constructor(private opts: WorkloadManagerOptions) {
     this.docker = new Docker({
@@ -44,13 +46,18 @@ export class DockerWorkloadManager implements WorkloadManager {
         url: env.DOCKER_REGISTRY_URL,
       });
 
-      this.auth = {
+      this.staticAuth = {
         username: env.DOCKER_REGISTRY_USERNAME,
         password: env.DOCKER_REGISTRY_PASSWORD,
         serveraddress: env.DOCKER_REGISTRY_URL,
       };
+    } else if (ECRAuthService.hasAWSCredentials()) {
+      this.logger.info("🐋 AWS credentials found, initializing ECR auth service");
+      this.ecrAuthService = new ECRAuthService();
     } else {
-      this.logger.warn("🐋 No Docker registry credentials provided, skipping auth");
+      this.logger.warn(
+        "🐋 No Docker registry credentials or AWS credentials provided, skipping auth"
+      );
     }
   }
 
@@ -65,6 +72,8 @@ export class DockerWorkloadManager implements WorkloadManager {
       `TRIGGER_DEQUEUED_AT_MS=${opts.dequeuedAt.getTime()}`,
       `TRIGGER_POD_SCHEDULED_AT_MS=${Date.now()}`,
       `TRIGGER_ENV_ID=${opts.envId}`,
+      `TRIGGER_DEPLOYMENT_ID=${opts.deploymentFriendlyId}`,
+      `TRIGGER_DEPLOYMENT_VERSION=${opts.deploymentVersion}`,
       `TRIGGER_RUN_ID=${opts.runFriendlyId}`,
       `TRIGGER_SNAPSHOT_ID=${opts.snapshotFriendlyId}`,
       `TRIGGER_SUPERVISOR_API_PROTOCOL=${this.opts.workloadApiProtocol}`,
@@ -160,9 +169,12 @@ export class DockerWorkloadManager implements WorkloadManager {
         imageArchitecture: inspectResult?.Architecture,
       });
 
+      // Get auth config (static or ECR)
+      const authConfig = await this.getAuthConfig();
+
       // Ensure the image is present
       const [createImageError, imageResponseReader] = await tryCatch(
-        this.docker.createImage(this.auth, {
+        this.docker.createImage(authConfig, {
           fromImage: imageRef,
           ...(this.platformOverride ? { platform: this.platformOverride } : {}),
         })
@@ -216,6 +228,26 @@ export class DockerWorkloadManager implements WorkloadManager {
     logger.debug("create succeeded", { startResult, containerId: container.id });
   }
 
+  /**
+   * Get authentication config for Docker operations
+   * Uses static credentials if available, otherwise attempts ECR auth
+   */
+  private async getAuthConfig(): Promise<Docker.AuthConfig | undefined> {
+    // Use static credentials if available
+    if (this.staticAuth) {
+      return this.staticAuth;
+    }
+
+    // Use ECR auth if service is available
+    if (this.ecrAuthService) {
+      const ecrAuth = await this.ecrAuthService.getAuthConfig();
+      return ecrAuth || undefined;
+    }
+
+    // No auth available
+    return undefined;
+  }
+
   private async attachContainerToNetworks({
     containerId,
     networkNames,
diff --git a/apps/supervisor/src/workloadManager/ecrAuth.ts b/apps/supervisor/src/workloadManager/ecrAuth.ts
new file mode 100644
index 00000000000..33e98f63195
--- /dev/null
+++ b/apps/supervisor/src/workloadManager/ecrAuth.ts
@@ -0,0 +1,144 @@
+import { ECRClient, GetAuthorizationTokenCommand } from "@aws-sdk/client-ecr";
+import { SimpleStructuredLogger } from "@trigger.dev/core/v3/utils/structuredLogger";
+import { tryCatch } from "@trigger.dev/core";
+import Docker from "dockerode";
+
+interface ECRTokenCache {
+  token: string;
+  username: string;
+  serverAddress: string;
+  expiresAt: Date;
+}
+
+export class ECRAuthService {
+  private readonly logger = new SimpleStructuredLogger("ecr-auth-service");
+  private readonly ecrClient: ECRClient;
+  private tokenCache: ECRTokenCache | null = null;
+
+  constructor() {
+    this.ecrClient = new ECRClient();
+
+    this.logger.info("🔐 ECR Auth Service initialized", {
+      region: this.ecrClient.config.region,
+    });
+  }
+
+  /**
+   * Check if we have AWS credentials configured
+   */
+  static hasAWSCredentials(): boolean {
+    if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
+      return true;
+    }
+
+    if (
+      process.env.AWS_PROFILE ||
+      process.env.AWS_ROLE_ARN ||
+      process.env.AWS_WEB_IDENTITY_TOKEN_FILE
+    ) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Check if the current token is still valid with a 10-minute buffer
+   */
+  private isTokenValid(): boolean {
+    if (!this.tokenCache) {
+      return false;
+    }
+
+    const now = new Date();
+    const bufferMs = 10 * 60 * 1000; // 10 minute buffer before expiration
+    return now < new Date(this.tokenCache.expiresAt.getTime() - bufferMs);
+  }
+
+  /**
+   * Get a fresh ECR authorization token from AWS
+   */
+  private async fetchNewToken(): Promise<ECRTokenCache | null> {
+    const [error, response] = await tryCatch(
+      this.ecrClient.send(new GetAuthorizationTokenCommand({}))
+    );
+
+    if (error) {
+      this.logger.error("Failed to get ECR authorization token", { error });
+      return null;
+    }
+
+    const authData = response.authorizationData?.[0];
+    if (!authData?.authorizationToken || !authData.proxyEndpoint) {
+      this.logger.error("Invalid ECR authorization response", { authData });
+      return null;
+    }
+
+    // Decode the base64 token to get username:password
+    const decoded = Buffer.from(authData.authorizationToken, "base64").toString("utf-8");
+    const [username, password] = decoded.split(":", 2);
+
+    if (!username || !password) {
+      this.logger.error("Failed to parse ECR authorization token");
+      return null;
+    }
+
+    const expiresAt = authData.expiresAt || new Date(Date.now() + 12 * 60 * 60 * 1000); // Default 12 hours
+
+    const tokenCache: ECRTokenCache = {
+      token: password,
+      username,
+      serverAddress: authData.proxyEndpoint,
+      expiresAt,
+    };
+
+    this.logger.info("🔐 Successfully fetched ECR token", {
+      username,
+      serverAddress: authData.proxyEndpoint,
+      expiresAt: expiresAt.toISOString(),
+    });
+
+    return tokenCache;
+  }
+
+  /**
+   * Get ECR auth config for Docker operations
+   * Returns cached token if valid, otherwise fetches a new one
+   */
+  async getAuthConfig(): Promise<Docker.AuthConfig | null> {
+    // Check if cached token is still valid
+    if (this.isTokenValid()) {
+      this.logger.debug("Using cached ECR token");
+      return {
+        username: this.tokenCache!.username,
+        password: this.tokenCache!.token,
+        serveraddress: this.tokenCache!.serverAddress,
+      };
+    }
+
+    // Fetch new token
+    this.logger.info("Fetching new ECR authorization token");
+    const newToken = await this.fetchNewToken();
+
+    if (!newToken) {
+      return null;
+    }
+
+    // Cache the new token
+    this.tokenCache = newToken;
+
+    return {
+      username: newToken.username,
+      password: newToken.token,
+      serveraddress: newToken.serverAddress,
+    };
+  }
+
+  /**
+   * Clear the cached token (useful for testing or forcing refresh)
+   */
+  clearCache(): void {
+    this.tokenCache = null;
+    this.logger.debug("ECR token cache cleared");
+  }
+}
diff --git a/apps/supervisor/src/workloadManager/kubernetes.ts b/apps/supervisor/src/workloadManager/kubernetes.ts
index bdbffb65b80..147a8bfc5a7 100644
--- a/apps/supervisor/src/workloadManager/kubernetes.ts
+++ b/apps/supervisor/src/workloadManager/kubernetes.ts
@@ -4,7 +4,13 @@ import {
   type WorkloadManagerCreateOptions,
   type WorkloadManagerOptions,
 } from "./types.js";
-import type { EnvironmentType, MachinePreset } from "@trigger.dev/core/v3";
+import type {
+  EnvironmentType,
+  MachinePreset,
+  MachinePresetName,
+  PlacementTag,
+} from "@trigger.dev/core/v3";
+import { PlacementTagProcessor } from "@trigger.dev/core/v3/serverOnly";
 import { env } from "../env.js";
 import { type K8sApi, createK8sApi, type k8s } from "../clients/kubernetes.js";
 import { getRunnerId } from "../util.js";
@@ -13,13 +19,45 @@ type ResourceQuantities = {
   [K in "cpu" | "memory" | "ephemeral-storage"]?: string;
 };
 
+const cpuRequestRatioByMachinePreset: Record<MachinePresetName, number | undefined> = {
+  micro: env.KUBERNETES_CPU_REQUEST_RATIO_MICRO,
+  "small-1x": env.KUBERNETES_CPU_REQUEST_RATIO_SMALL_1X,
+  "small-2x": env.KUBERNETES_CPU_REQUEST_RATIO_SMALL_2X,
+  "medium-1x": env.KUBERNETES_CPU_REQUEST_RATIO_MEDIUM_1X,
+  "medium-2x": env.KUBERNETES_CPU_REQUEST_RATIO_MEDIUM_2X,
+  "large-1x": env.KUBERNETES_CPU_REQUEST_RATIO_LARGE_1X,
+  "large-2x": env.KUBERNETES_CPU_REQUEST_RATIO_LARGE_2X,
+};
+
+const memoryRequestRatioByMachinePreset: Record<MachinePresetName, number | undefined> = {
+  micro: env.KUBERNETES_MEMORY_REQUEST_RATIO_MICRO,
+  "small-1x": env.KUBERNETES_MEMORY_REQUEST_RATIO_SMALL_1X,
+  "small-2x": env.KUBERNETES_MEMORY_REQUEST_RATIO_SMALL_2X,
+  "medium-1x": env.KUBERNETES_MEMORY_REQUEST_RATIO_MEDIUM_1X,
+  "medium-2x": env.KUBERNETES_MEMORY_REQUEST_RATIO_MEDIUM_2X,
+  "large-1x": env.KUBERNETES_MEMORY_REQUEST_RATIO_LARGE_1X,
+  "large-2x": env.KUBERNETES_MEMORY_REQUEST_RATIO_LARGE_2X,
+};
+
 export class KubernetesWorkloadManager implements WorkloadManager {
   private readonly logger = new SimpleStructuredLogger("kubernetes-workload-provider");
   private k8s: K8sApi;
   private namespace = env.KUBERNETES_NAMESPACE;
+  private placementTagProcessor: PlacementTagProcessor;
+
+  // Resource settings
+  private readonly cpuRequestMinCores = env.KUBERNETES_CPU_REQUEST_MIN_CORES;
+  private readonly cpuRequestRatio = env.KUBERNETES_CPU_REQUEST_RATIO;
+  private readonly memoryRequestMinGb = env.KUBERNETES_MEMORY_REQUEST_MIN_GB;
+  private readonly memoryRequestRatio = env.KUBERNETES_MEMORY_REQUEST_RATIO;
+  private readonly memoryOverheadGb = env.KUBERNETES_MEMORY_OVERHEAD_GB;
 
   constructor(private opts: WorkloadManagerOptions) {
     this.k8s = createK8sApi();
+    this.placementTagProcessor = new PlacementTagProcessor({
+      enabled: env.PLACEMENT_TAGS_ENABLED,
+      prefix: env.PLACEMENT_TAGS_PREFIX,
+    });
 
     if (opts.workloadApiDomain) {
       this.logger.warn("[KubernetesWorkloadManager] ⚠️ Custom workload API domain", {
@@ -28,6 +66,39 @@ export class KubernetesWorkloadManager implements WorkloadManager {
     }
   }
 
+  private addPlacementTags(
+    podSpec: Omit<k8s.V1PodSpec, "containers">,
+    placementTags?: PlacementTag[]
+  ): Omit<k8s.V1PodSpec, "containers"> {
+    const nodeSelector = this.placementTagProcessor.convertToNodeSelector(
+      placementTags,
+      podSpec.nodeSelector
+    );
+
+    return {
+      ...podSpec,
+      nodeSelector,
+    };
+  }
+
+  private stripImageDigest(imageRef: string): string {
+    if (!env.KUBERNETES_STRIP_IMAGE_DIGEST) {
+      return imageRef;
+    }
+
+    const atIndex = imageRef.lastIndexOf("@");
+
+    if (atIndex === -1) {
+      return imageRef;
+    }
+
+    return imageRef.substring(0, atIndex);
+  }
+
+  private clamp(value: number, min: number, max: number): number {
+    return Math.min(Math.max(value, min), max);
+  }
+
   async create(opts: WorkloadManagerCreateOptions) {
     this.logger.log("[KubernetesWorkloadManager] Creating container", { opts });
 
@@ -51,12 +122,13 @@ export class KubernetesWorkloadManager implements WorkloadManager {
             },
           },
           spec: {
-            ...this.#defaultPodSpec,
+            ...this.addPlacementTags(this.#defaultPodSpec, opts.placementTags),
+            affinity: this.#getAffinity(opts.machine, opts.projectId),
             terminationGracePeriodSeconds: 60 * 60,
             containers: [
               {
                 name: "run-controller",
-                image: opts.image,
+                image: this.stripImageDigest(opts.image),
                 ports: [
                   {
                     containerPort: 8000,
@@ -88,6 +160,14 @@ export class KubernetesWorkloadManager implements WorkloadManager {
                     name: "TRIGGER_ENV_ID",
                     value: opts.envId,
                   },
+                  {
+                    name: "TRIGGER_DEPLOYMENT_ID",
+                    value: opts.deploymentFriendlyId,
+                  },
+                  {
+                    name: "TRIGGER_DEPLOYMENT_VERSION",
+                    value: opts.deploymentVersion,
+                  },
                   {
                     name: "TRIGGER_SNAPSHOT_ID",
                     value: opts.snapshotFriendlyId,
@@ -240,10 +320,14 @@ export class KubernetesWorkloadManager implements WorkloadManager {
       // Explicit control over service account token mounting (defaults to false for security)
       automountServiceAccountToken: env.KUBERNETES_WORKER_AUTOMOUNT_SERVICE_ACCOUNT_TOKEN,
       imagePullSecrets: this.getImagePullSecrets(),
-      // Optionally specify a service account for the worker pods
       ...(env.KUBERNETES_WORKER_SERVICE_ACCOUNT
         ? { serviceAccountName: env.KUBERNETES_WORKER_SERVICE_ACCOUNT }
         : {}),
+      ...(env.KUBERNETES_SCHEDULER_NAME
+        ? {
+            schedulerName: env.KUBERNETES_SCHEDULER_NAME,
+          }
+        : {}),
       securityContext: {
         runAsNonRoot: true,
         runAsUser: 1000,
@@ -277,20 +361,35 @@ export class KubernetesWorkloadManager implements WorkloadManager {
       envtype: this.#envTypeToLabelValue(opts.envType),
       org: opts.orgId,
       project: opts.projectId,
+      machine: opts.machine.name,
     };
   }
 
   #getResourceRequestsForMachine(preset: MachinePreset): ResourceQuantities {
+    const cpuRatio = cpuRequestRatioByMachinePreset[preset.name] ?? this.cpuRequestRatio;
+    const memoryRatio = memoryRequestRatioByMachinePreset[preset.name] ?? this.memoryRequestRatio;
+
+    const cpuRequest = preset.cpu * cpuRatio;
+    const memoryRequest = preset.memory * memoryRatio;
+
+    // Clamp between min and max
+    const clampedCpu = this.clamp(cpuRequest, this.cpuRequestMinCores, preset.cpu);
+    const clampedMemory = this.clamp(memoryRequest, this.memoryRequestMinGb, preset.memory);
+
     return {
-      cpu: `${preset.cpu * 0.75}`,
-      memory: `${preset.memory}G`,
+      cpu: `${clampedCpu}`,
+      memory: `${clampedMemory}G`,
     };
   }
 
   #getResourceLimitsForMachine(preset: MachinePreset): ResourceQuantities {
+    const memoryLimit = this.memoryOverheadGb
+      ? preset.memory + this.memoryOverheadGb
+      : preset.memory;
+
     return {
       cpu: `${preset.cpu}`,
-      memory: `${preset.memory}G`,
+      memory: `${memoryLimit}G`,
     };
   }
 
@@ -306,4 +405,91 @@ export class KubernetesWorkloadManager implements WorkloadManager {
       },
     };
   }
+
+  #isLargeMachine(preset: MachinePreset): boolean {
+    return preset.name.startsWith("large-");
+  }
+
+  #getAffinity(preset: MachinePreset, projectId: string): k8s.V1Affinity | undefined {
+    const nodeAffinity = this.#getNodeAffinityRules(preset);
+    const podAffinity = this.#getProjectPodAffinity(projectId);
+
+    if (!nodeAffinity && !podAffinity) {
+      return undefined;
+    }
+
+    return {
+      ...(nodeAffinity && { nodeAffinity }),
+      ...(podAffinity && { podAffinity }),
+    };
+  }
+
+  #getNodeAffinityRules(preset: MachinePreset): k8s.V1NodeAffinity | undefined {
+    if (!env.KUBERNETES_LARGE_MACHINE_POOL_LABEL) {
+      return undefined;
+    }
+
+    if (this.#isLargeMachine(preset)) {
+      // soft preference for the large-machine pool, falls back to standard if unavailable
+      return {
+        preferredDuringSchedulingIgnoredDuringExecution: [
+          {
+            weight: 100,
+            preference: {
+              matchExpressions: [
+                {
+                  key: "node.cluster.x-k8s.io/machinepool",
+                  operator: "In",
+                  values: [env.KUBERNETES_LARGE_MACHINE_POOL_LABEL],
+                },
+              ],
+            },
+          },
+        ],
+      };
+    }
+
+    // not schedulable in the large-machine pool
+    return {
+      requiredDuringSchedulingIgnoredDuringExecution: {
+        nodeSelectorTerms: [
+          {
+            matchExpressions: [
+              {
+                key: "node.cluster.x-k8s.io/machinepool",
+                operator: "NotIn",
+                values: [env.KUBERNETES_LARGE_MACHINE_POOL_LABEL],
+              },
+            ],
+          },
+        ],
+      },
+    };
+  }
+
+  #getProjectPodAffinity(projectId: string): k8s.V1PodAffinity | undefined {
+    if (!env.KUBERNETES_PROJECT_AFFINITY_ENABLED) {
+      return undefined;
+    }
+
+    return {
+      preferredDuringSchedulingIgnoredDuringExecution: [
+        {
+          weight: env.KUBERNETES_PROJECT_AFFINITY_WEIGHT,
+          podAffinityTerm: {
+            labelSelector: {
+              matchExpressions: [
+                {
+                  key: "project",
+                  operator: "In",
+                  values: [projectId],
+                },
+              ],
+            },
+            topologyKey: env.KUBERNETES_PROJECT_AFFINITY_TOPOLOGY_KEY,
+          },
+        },
+      ],
+    };
+  }
 }
diff --git a/apps/supervisor/src/workloadManager/types.ts b/apps/supervisor/src/workloadManager/types.ts
index b3cd418f1e1..90b61957795 100644
--- a/apps/supervisor/src/workloadManager/types.ts
+++ b/apps/supervisor/src/workloadManager/types.ts
@@ -1,4 +1,4 @@
-import { type EnvironmentType, type MachinePreset } from "@trigger.dev/core/v3";
+import type { EnvironmentType, MachinePreset, PlacementTag } from "@trigger.dev/core/v3";
 
 export interface WorkloadManagerOptions {
   workloadApiProtocol: "http" | "https";
@@ -23,11 +23,14 @@ export interface WorkloadManagerCreateOptions {
   version: string;
   nextAttemptNumber?: number;
   dequeuedAt: Date;
+  placementTags?: PlacementTag[];
   // identifiers
   envId: string;
   envType: EnvironmentType;
   orgId: string;
   projectId: string;
+  deploymentFriendlyId: string;
+  deploymentVersion: string;
   runId: string;
   runFriendlyId: string;
   snapshotId: string;
diff --git a/apps/supervisor/src/workloadServer/index.ts b/apps/supervisor/src/workloadServer/index.ts
index e7e391bce38..35d53d36099 100644
--- a/apps/supervisor/src/workloadServer/index.ts
+++ b/apps/supervisor/src/workloadServer/index.ts
@@ -16,7 +16,6 @@ import {
   type WorkloadRunAttemptCompleteResponseBody,
   WorkloadRunAttemptStartRequestBody,
   type WorkloadRunAttemptStartResponseBody,
-  type WorkloadRunLatestSnapshotResponseBody,
   WorkloadRunSnapshotsSinceResponseBody,
   type WorkloadServerToClientEvents,
   type WorkloadSuspendRunResponseBody,
@@ -126,7 +125,7 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
   }
 
   private createHttpServer({ host, port }: { host: string; port: number }) {
-    return new HttpServer({
+    const httpServer = new HttpServer({
       port,
       host,
       metrics: {
@@ -322,28 +321,6 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           },
         }
       )
-      .route("/api/v1/workload-actions/runs/:runFriendlyId/snapshots/latest", "GET", {
-        paramsSchema: WorkloadActionParams.pick({ runFriendlyId: true }),
-        handler: async ({ req, reply, params }) => {
-          const latestSnapshotResponse = await this.workerClient.getLatestSnapshot(
-            params.runFriendlyId,
-            this.runnerIdFromRequest(req)
-          );
-
-          if (!latestSnapshotResponse.success) {
-            this.logger.error("Failed to get latest snapshot", {
-              runId: params.runFriendlyId,
-              error: latestSnapshotResponse.error,
-            });
-            reply.empty(500);
-            return;
-          }
-
-          reply.json({
-            execution: latestSnapshotResponse.data.execution,
-          } satisfies WorkloadRunLatestSnapshotResponseBody);
-        },
-      })
       .route(
         "/api/v1/workload-actions/runs/:runFriendlyId/snapshots/since/:snapshotFriendlyId",
         "GET",
@@ -369,23 +346,6 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           },
         }
       )
-      .route("/api/v1/workload-actions/runs/:runFriendlyId/logs/debug", "POST", {
-        paramsSchema: WorkloadActionParams.pick({ runFriendlyId: true }),
-        bodySchema: WorkloadDebugLogRequestBody,
-        handler: async ({ req, reply, params, body }) => {
-          reply.empty(204);
-
-          if (!env.SEND_RUN_DEBUG_LOGS) {
-            return;
-          }
-
-          await this.workerClient.sendDebugLog(
-            params.runFriendlyId,
-            body,
-            this.runnerIdFromRequest(req)
-          );
-        },
-      })
       .route("/api/v1/workload-actions/deployments/:deploymentId/dequeue", "GET", {
         paramsSchema: z.object({
           deploymentId: z.string(),
@@ -410,6 +370,31 @@ export class WorkloadServer extends EventEmitter<WorkloadServerEvents> {
           reply.json(dequeueResponse.data satisfies WorkloadDequeueFromVersionResponseBody);
         },
       });
+
+    if (env.SEND_RUN_DEBUG_LOGS) {
+      httpServer.route("/api/v1/workload-actions/runs/:runFriendlyId/logs/debug", "POST", {
+        paramsSchema: WorkloadActionParams.pick({ runFriendlyId: true }),
+        bodySchema: WorkloadDebugLogRequestBody,
+        handler: async ({ req, reply, params, body }) => {
+          reply.empty(204);
+
+          await this.workerClient.sendDebugLog(
+            params.runFriendlyId,
+            body,
+            this.runnerIdFromRequest(req)
+          );
+        },
+      });
+    } else {
+      // Lightweight mock route without schemas
+      httpServer.route("/api/v1/workload-actions/runs/:runFriendlyId/logs/debug", "POST", {
+        handler: async ({ reply }) => {
+          reply.empty(204);
+        },
+      });
+    }
+
+    return httpServer;
   }
 
   private createWebsocketServer() {
diff --git a/apps/webapp/.env b/apps/webapp/.env
new file mode 120000
index 00000000000..c7360fb82d2
--- /dev/null
+++ b/apps/webapp/.env
@@ -0,0 +1 @@
+../../.env
\ No newline at end of file
diff --git a/apps/webapp/.gitignore b/apps/webapp/.gitignore
index 8b81451eadb..595ab180e15 100644
--- a/apps/webapp/.gitignore
+++ b/apps/webapp/.gitignore
@@ -9,7 +9,8 @@ node_modules
 
 /app/styles/tailwind.css
 
-
+# Ensure the .env symlink is not removed by accident
+!.env
 
 # Storybook build outputs
 build-storybook.log
@@ -18,4 +19,5 @@ build-storybook.log
 storybook-static
 
 /prisma/seed.js
-/prisma/populate.js
\ No newline at end of file
+/prisma/populate.js
+.memory-snapshots
\ No newline at end of file
diff --git a/apps/webapp/app/assets/icons/AbacusIcon.tsx b/apps/webapp/app/assets/icons/AbacusIcon.tsx
new file mode 100644
index 00000000000..f0b7bfdf7be
--- /dev/null
+++ b/apps/webapp/app/assets/icons/AbacusIcon.tsx
@@ -0,0 +1,71 @@
+export function AbacusIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_16909_120578)">
+        <path
+          d="M4 3V21"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M20 21V3"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M8 5L8 6"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M14 5L14 6"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M15 10L15 11"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M9 10L9 11"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M12 15L12 16"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M8 15L8 16"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M3 21H21"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </g>
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/ArrowTopRightBottomLeftIcon.tsx b/apps/webapp/app/assets/icons/ArrowTopRightBottomLeftIcon.tsx
new file mode 100644
index 00000000000..c49aa8cb0c2
--- /dev/null
+++ b/apps/webapp/app/assets/icons/ArrowTopRightBottomLeftIcon.tsx
@@ -0,0 +1,22 @@
+export function ArrowTopRightBottomLeftIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M14.8258 10.5L20.125 5.20083V8.5625C20.125 9.08027 20.5447 9.5 21.0625 9.5C21.5803 9.5 22 9.08027 22 8.5625V2.9375C22 2.41973 21.5803 2 21.0625 2H15.4375C14.9197 2 14.5 2.41973 14.5 2.9375C14.5 3.45527 14.9197 3.875 15.4375 3.875H18.7992L13.5 9.17417C13.1339 9.54029 13.1339 10.1339 13.5 10.5C13.8661 10.8661 14.4597 10.8661 14.8258 10.5Z"
+        fill="currentColor"
+      />
+      <path
+        d="M2 21.0625V15.4375C2 14.9197 2.41973 14.5 2.9375 14.5C3.45527 14.5 3.875 14.9197 3.875 15.4375V18.7992L9.17417 13.5C9.54029 13.1339 10.1339 13.1339 10.5 13.5C10.8661 13.8661 10.8661 14.4597 10.5 14.8258L5.20083 20.125H8.5625C9.08027 20.125 9.5 20.5447 9.5 21.0625C9.5 21.5803 9.08027 22 8.5625 22H2.9375C2.69757 22 2.45765 21.9085 2.27459 21.7254C2.1847 21.6355 2.11689 21.5319 2.07114 21.4214C2.0253 21.3108 2 21.1896 2 21.0625Z"
+        fill="currentColor"
+      />
+      <path
+        d="M14.8258 10.5L20.125 5.20083V10C20.125 10.5178 20.5447 10.9375 21.0625 10.9375C21.5803 10.9375 22 10.5178 22 10V2.9375C22 2.41973 21.5803 2 21.0625 2H14C13.4822 2 13.0625 2.41973 13.0625 2.9375C13.0625 3.45527 13.4822 3.875 14 3.875H18.7992L13.5 9.17417C13.1339 9.54029 13.1339 10.1339 13.5 10.5C13.8661 10.8661 14.4597 10.8661 14.8258 10.5Z"
+        fill="currentColor"
+      />
+      <path
+        d="M2 21.0625V13.9375C2 13.4197 2.41973 13 2.9375 13C3.45527 13 3.875 13.4197 3.875 13.9375V18.7992L9.17417 13.5C9.54029 13.1339 10.1339 13.1339 10.5 13.5C10.8661 13.8661 10.8661 14.4597 10.5 14.8258L5.20083 20.125H10.0625C10.5803 20.125 11 20.5447 11 21.0625C11 21.5803 10.5803 22 10.0625 22H2.9375C2.69757 22 2.45765 21.9085 2.27459 21.7254C2.1847 21.6355 2.11689 21.5319 2.07114 21.4214C2.0253 21.3108 2 21.1896 2 21.0625Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/ChevronExtraSmallDown.tsx b/apps/webapp/app/assets/icons/ChevronExtraSmallDown.tsx
new file mode 100644
index 00000000000..134cbe4dfda
--- /dev/null
+++ b/apps/webapp/app/assets/icons/ChevronExtraSmallDown.tsx
@@ -0,0 +1,13 @@
+export function ChevronExtraSmallDown({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M15 6L9.75926 12.1142C9.36016 12.5798 8.63984 12.5798 8.24074 12.1142L3 6"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeMiterlimit="1.00244"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/ChevronExtraSmallUp.tsx b/apps/webapp/app/assets/icons/ChevronExtraSmallUp.tsx
new file mode 100644
index 00000000000..710eeccdf20
--- /dev/null
+++ b/apps/webapp/app/assets/icons/ChevronExtraSmallUp.tsx
@@ -0,0 +1,13 @@
+export function ChevronExtraSmallUp({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M3 12L8.24074 5.8858C8.63984 5.42019 9.36016 5.42019 9.75926 5.8858L15 12"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeMiterlimit="1.00244"
+        strokeLinecap="round"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/CloudProviderIcon.tsx b/apps/webapp/app/assets/icons/CloudProviderIcon.tsx
new file mode 100644
index 00000000000..6c162528247
--- /dev/null
+++ b/apps/webapp/app/assets/icons/CloudProviderIcon.tsx
@@ -0,0 +1,76 @@
+export function CloudProviderIcon({
+  provider,
+  className,
+}: {
+  provider: "aws" | "digitalocean" | (string & {});
+  className?: string;
+}) {
+  switch (provider) {
+    case "aws":
+      return <AWS className={className} />;
+    case "digitalocean":
+      return <DigitalOcean className={className} />;
+    default:
+      return null;
+  }
+}
+
+export function AWS({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M67.6343 100.132C67.5545 102.527 67.8738 104.921 68.5123 107.236C69.2307 109.232 70.1088 111.147 71.0666 112.983C71.3859 113.542 71.6254 114.181 71.6254 114.819C71.5455 115.777 70.9868 116.735 70.1088 117.214L65.08 120.566C64.4414 120.965 63.723 121.285 63.0046 121.285C62.1266 121.205 61.2486 120.806 60.61 120.167C59.5723 119.05 58.5346 117.773 57.7364 116.416C56.9382 115.059 56.14 113.542 55.2619 111.706C49.0359 119.05 41.2134 122.722 31.7944 122.722C25.0894 122.722 19.7414 120.806 15.8301 116.974C11.9189 113.143 9.92334 108.034 9.92334 101.649C9.92334 94.8638 12.318 89.3561 17.1871 85.2054C22.0562 81.0547 28.5217 78.9793 36.7434 78.9793C39.5371 78.9793 42.4107 79.2188 45.2044 79.6179C48.1578 80.017 51.1911 80.6556 54.3839 81.374V75.547C54.3839 69.4806 53.1068 65.25 50.6323 62.7756C48.1578 60.3011 43.7677 59.1038 37.6214 59.1038C34.7478 59.1038 31.7944 59.4231 29.0007 60.1415C26.0473 60.8598 23.1737 61.7379 20.38 62.8554C19.5019 63.2545 18.5441 63.5738 17.5862 63.8931C17.1871 64.0527 16.7082 64.1325 16.3091 64.1325C15.1916 64.1325 14.6328 63.3343 14.6328 61.6581V57.7468C14.553 56.7889 14.7925 55.8311 15.1916 54.9531C15.8301 54.2347 16.5485 53.6759 17.4266 53.2768C20.6194 51.6804 23.9719 50.483 27.4841 49.6848C31.555 48.6472 35.7855 48.1682 39.9362 48.1682C49.435 48.1682 56.3795 50.3234 60.8495 54.6338C65.3195 58.9441 67.4746 65.4895 67.4746 74.2699V100.132H67.6343ZM35.2268 112.265C38.0205 112.265 40.8143 111.786 43.4484 110.828C46.4018 109.79 48.9561 108.034 51.0314 105.72C52.3086 104.283 53.2664 102.527 53.7453 100.611C54.3041 98.376 54.5436 95.9813 54.5436 93.6665V90.314C52.1489 89.7552 49.6744 89.2763 47.2 88.957C44.7255 88.6377 42.1712 88.4781 39.6968 88.4781C34.3487 88.4781 30.4375 89.5158 27.8034 91.6709C25.1692 93.8261 23.8921 96.8593 23.8921 100.85C23.8921 104.602 24.85 107.396 26.8455 109.312C28.841 111.227 31.555 112.265 35.2268 112.265ZM99.3234 120.886C98.2857 120.965 97.1682 120.726 96.2902 120.087C95.492 119.209 94.8534 118.172 94.614 116.974L75.8559 55.2723C75.4568 54.2347 75.2173 53.197 75.1375 52.0795C75.0577 51.1216 75.6963 50.2436 76.6541 50.0839H84.9556C86.4722 50.0839 87.5098 50.3234 88.0686 50.8822C88.6273 51.4409 89.1861 52.4786 89.665 53.9952L102.995 106.837L115.447 53.9952C115.846 52.3988 116.325 51.3611 116.964 50.8822C117.922 50.3234 119.039 50.0041 120.157 50.0839H126.543C128.059 50.0839 129.097 50.3234 129.735 50.8822C130.534 51.7602 131.092 52.7979 131.252 53.9952L143.864 107.476L157.673 53.9952C157.912 52.7979 158.471 51.7602 159.269 50.8822C160.227 50.3234 161.265 50.0041 162.382 50.0839H169.806C170.764 49.9243 171.642 50.6427 171.801 51.6005V52.0795C171.801 52.4786 171.722 52.9575 171.642 53.3566C171.482 54.075 171.322 54.7136 171.083 55.3522L151.846 117.054C151.367 118.651 150.808 119.688 150.17 120.167C149.292 120.726 148.174 121.045 147.137 120.965H140.272C138.755 120.965 137.718 120.726 137.079 120.167C136.281 119.289 135.722 118.172 135.562 116.974L123.19 65.4895L110.898 116.895C110.738 118.092 110.179 119.209 109.381 120.087C108.423 120.726 107.306 120.965 106.188 120.886H99.3234ZM201.894 123.041C197.743 123.041 193.593 122.562 189.602 121.604C185.61 120.646 182.497 119.608 180.422 118.411C179.384 117.932 178.506 117.134 177.948 116.176C177.628 115.458 177.469 114.739 177.469 113.941V109.87C177.469 108.194 178.107 107.396 179.305 107.396C179.784 107.396 180.262 107.476 180.741 107.635C181.22 107.795 181.939 108.114 182.737 108.433C185.531 109.711 188.484 110.589 191.517 111.227C194.63 111.866 197.823 112.185 201.016 112.185C206.045 112.185 209.956 111.307 212.67 109.551C215.304 107.955 216.901 105.081 216.821 101.968C216.901 99.8926 216.102 97.897 214.665 96.3804C213.229 94.8638 210.515 93.5068 206.604 92.2297L195.029 88.6377C189.202 86.8018 184.892 84.0879 182.258 80.4959C179.704 77.1434 178.267 73.1524 178.267 68.9218C178.187 65.8088 178.905 62.7756 180.422 60.0616C181.859 57.5073 183.775 55.2723 186.169 53.5163C188.644 51.6005 191.437 50.2436 194.471 49.3655C197.743 48.4077 201.096 47.9288 204.528 48.0086C206.284 48.0086 208.12 48.0884 209.876 48.3279C211.712 48.5673 213.388 48.8866 215.065 49.2059C216.741 49.5252 218.178 50.0041 219.614 50.483C220.812 50.8822 221.929 51.3611 222.967 51.9198C223.925 52.3988 224.723 53.0373 225.362 53.9154C225.92 54.7136 226.16 55.5916 226.08 56.5495V60.3011C226.08 61.9773 225.441 62.8554 224.244 62.8554C223.206 62.6957 222.169 62.3765 221.211 61.8975C216.422 59.7423 211.153 58.7047 205.885 58.7845C201.335 58.7845 197.743 59.5029 195.269 61.0195C192.794 62.5361 191.517 64.8509 191.517 68.1236C191.437 70.2788 192.315 72.3541 193.912 73.7909C195.508 75.3075 198.462 76.8241 202.692 78.1811L214.027 81.7731C219.774 83.609 223.925 86.1633 226.399 89.4359C228.874 92.6288 230.151 96.6199 230.071 100.611C230.151 103.804 229.432 106.997 227.996 109.87C226.559 112.584 224.563 114.979 222.169 116.895C219.535 118.97 216.501 120.487 213.309 121.365C209.637 122.482 205.805 123.041 201.894 123.041Z"
+        fill="white"
+      />
+      <path
+        d="M216.98 161.834C190.719 181.231 152.564 191.528 119.758 191.528C73.7806 191.528 32.3533 174.526 1.06324 146.269C-1.41123 144.034 0.823772 141.001 3.77717 142.757C37.6215 162.393 79.3681 174.286 122.552 174.286C153.682 174.126 184.493 167.821 213.149 155.768C217.539 153.772 221.291 158.641 216.98 161.834Z"
+        fill="#FF9900"
+      />
+      <path
+        d="M227.916 149.382C224.563 145.072 205.726 147.307 197.185 148.344C194.63 148.664 194.231 146.428 196.546 144.752C211.553 134.216 236.217 137.249 239.091 140.761C241.965 144.273 238.293 169.018 224.244 180.832C222.089 182.667 220.014 181.71 220.971 179.315C224.164 171.413 231.268 153.612 227.916 149.382Z"
+        fill="#FF9900"
+      />
+    </svg>
+  );
+}
+
+export function DigitalOcean({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_18907_83670)">
+        <path
+          d="M120.001 218.82V180.552C160.62 180.552 192.015 140.347 176.514 97.6503C170.768 81.8384 158.157 69.2205 142.339 63.4808C99.6439 47.9862 59.4601 79.3824 59.4532 119.988L59.4463 120.002H21.1802C21.1802 55.292 83.6945 4.91045 151.493 26.0827C181.122 35.327 204.667 58.8724 213.918 88.5025C235.089 156.31 184.703 218.82 120.001 218.82Z"
+          fill="#0069FF"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M120.089 180.647H81.9333V142.497L81.9402 142.49H120.082L120.089 142.497V180.647Z"
+          fill="#0069FF"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M81.925 209.964H52.6132L52.6063 209.957V180.644H81.9319V209.957L81.925 209.964Z"
+          fill="#0069FF"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M52.6298 180.647H28.0573L28.0435 180.64V156.081L28.0573 156.06H52.616L52.6298 156.067V180.647Z"
+          fill="#0069FF"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_18907_83670">
+          <rect
+            width="197.64"
+            height="197.64"
+            fill="white"
+            transform="translate(21.1802 21.1802)"
+          />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/ConcurrencyIcon.tsx b/apps/webapp/app/assets/icons/ConcurrencyIcon.tsx
new file mode 100644
index 00000000000..710ba4e6fa9
--- /dev/null
+++ b/apps/webapp/app/assets/icons/ConcurrencyIcon.tsx
@@ -0,0 +1,13 @@
+export function ConcurrencyIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="3.75" cy="3.75" r="2.25" fill="currentColor" />
+      <circle cx="9" cy="3.75" r="2.25" fill="currentColor" />
+      <circle cx="14.25" cy="3.75" r="2.25" fill="currentColor" />
+      <circle cx="3.75" cy="9" r="2.25" fill="currentColor" />
+      <circle cx="9" cy="9" r="2.25" fill="currentColor" />
+      <circle cx="9" cy="14.25" r="1.75" stroke="currentColor" />
+      <circle cx="14.25" cy="9" r="2.25" fill="currentColor" />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/ListBulletIcon.tsx b/apps/webapp/app/assets/icons/ListBulletIcon.tsx
new file mode 100644
index 00000000000..3ca7636a900
--- /dev/null
+++ b/apps/webapp/app/assets/icons/ListBulletIcon.tsx
@@ -0,0 +1,30 @@
+export function ListBulletIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M9 5H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M9 12H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M9 19H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <circle cx="4" cy="5" r="1" fill="currentColor" />
+      <circle cx="4" cy="12" r="1" fill="currentColor" />
+      <circle cx="4" cy="19" r="1" fill="currentColor" />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/LogsIcon.tsx b/apps/webapp/app/assets/icons/LogsIcon.tsx
new file mode 100644
index 00000000000..3178da237e7
--- /dev/null
+++ b/apps/webapp/app/assets/icons/LogsIcon.tsx
@@ -0,0 +1,66 @@
+export function LogsIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <circle cx="4" cy="10" r="1" fill="currentColor" />
+      <circle cx="4" cy="5" r="1" fill="currentColor" />
+      <circle cx="4" cy="14" r="1" fill="currentColor" />
+      <circle cx="4" cy="19" r="1" fill="currentColor" />
+      <path
+        d="M7 9.75L10 9.75"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M7 5L10 5"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M7 14.25H10"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M7 19H10"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13 5H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13 9.75H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13 14.25H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M13 19H20"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/MoveToBottomIcon.tsx b/apps/webapp/app/assets/icons/MoveToBottomIcon.tsx
new file mode 100644
index 00000000000..997550e9265
--- /dev/null
+++ b/apps/webapp/app/assets/icons/MoveToBottomIcon.tsx
@@ -0,0 +1,27 @@
+export function MoveToBottomIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M12 15L12 3"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M3 21L21 21"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M7.5 12.5L12 17L16.5 12.5"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/MoveToTopIcon.tsx b/apps/webapp/app/assets/icons/MoveToTopIcon.tsx
new file mode 100644
index 00000000000..46938fd391a
--- /dev/null
+++ b/apps/webapp/app/assets/icons/MoveToTopIcon.tsx
@@ -0,0 +1,34 @@
+export function MoveToTopIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_17186_103975)">
+        <path
+          d="M12 21L12 9"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M3 3L21 3"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M16.5 11.5L12 7L7.5 11.5"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_17186_103975">
+          <rect width="24" height="24" fill="currentColor" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/MoveUpIcon.tsx b/apps/webapp/app/assets/icons/MoveUpIcon.tsx
new file mode 100644
index 00000000000..6e5d8a84ba9
--- /dev/null
+++ b/apps/webapp/app/assets/icons/MoveUpIcon.tsx
@@ -0,0 +1,41 @@
+export function MoveUpIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_17177_110851)">
+        <path
+          d="M12 21L12 13"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M3 3L21 3"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M3 7L21 7"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+        <path
+          d="M16.5 15.5L12 11L7.5 15.5"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_17177_110851">
+          <rect width="24" height="24" fill="currentColor" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/RegionIcons.tsx b/apps/webapp/app/assets/icons/RegionIcons.tsx
new file mode 100644
index 00000000000..098d5bc98ce
--- /dev/null
+++ b/apps/webapp/app/assets/icons/RegionIcons.tsx
@@ -0,0 +1,106 @@
+export function FlagIcon({
+  region,
+  className,
+}: {
+  region: "usa" | "europe" | (string & {});
+  className?: string;
+}) {
+  switch (region) {
+    case "usa":
+      return <FlagUSA className={className} />;
+    case "europe":
+      return <FlagEurope className={className} />;
+    default:
+      return null;
+  }
+}
+
+export function FlagUSA({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <g clipPath="url(#clip0_18908_83688)">
+        <rect x="0.09375" width="95.9062" height="71.9297" rx="5.99414" fill="white" />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M0.09375 0V8.0065H96.0937V0H0.09375Z"
+          fill="#E31D1C"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M0.09375 16.0131V24.0196H96.0937V16.0131H0.09375Z"
+          fill="#E31D1C"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M0.09375 31.9791V39.9856H96.0937V31.9791H0.09375Z"
+          fill="#E31D1C"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M0.09375 47.9921V55.9986H96.0937V47.9921H0.09375Z"
+          fill="#E31D1C"
+        />
+        <path
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d="M0.09375 63.9584V71.9649H96.0937V63.9584H0.09375Z"
+          fill="#E31D1C"
+        />
+        <rect x="0.09375" width="60" height="40" fill="#2E52B2" />
+        <path
+          d="M50.9424 29.8628H53.0938L51.4033 31.5835L52.0576 34.2974L49.9531 32.772L47.7773 34.2974L48.5117 31.5835L46.5791 29.8628H49.1035L49.9502 27.6479L50.9424 29.8628ZM11.3486 29.2515H13.5L11.8096 30.9712L12.4639 33.686L10.3594 32.1606L8.18359 33.686L8.91797 30.9712L6.98633 29.2515H9.50977L10.3564 27.0366L11.3486 29.2515ZM24.5469 29.2515H26.6982L25.0078 30.9712L25.6621 33.686L23.5566 32.1606L21.3818 33.686L22.1162 30.9712L20.1836 29.2515H22.708L23.5537 27.0366L24.5469 29.2515ZM37.7441 29.2515H39.8955L38.2051 30.9712L38.8604 33.686L36.7549 32.1606L34.5791 33.686L35.3135 30.9712L33.3818 29.2515H35.9053L36.752 27.0366L37.7441 29.2515ZM50.9424 18.9077H53.0938L51.4033 20.6284L52.0576 23.3423L49.9521 21.8169L47.7773 23.3423L48.5117 20.6284L46.5791 18.9077H49.1025L49.9492 16.6929L50.9424 18.9077ZM11.3486 18.6021H13.5L11.8096 20.3218L12.4639 23.0366L10.3594 21.5112L8.18359 23.0366L8.91797 20.3218L6.98535 18.6021H9.50977L10.3555 16.3872L11.3486 18.6021ZM24.5459 18.6021H26.6973L25.0068 20.3218L25.6621 23.0366L23.5566 21.5112L21.3809 23.0366L22.1152 20.3218L20.1836 18.6021H22.707L23.5537 16.3872L24.5459 18.6021ZM37.7441 18.6021H39.8955L38.2051 20.3218L38.8594 23.0366L36.7549 21.5112L34.5791 23.0366L35.3135 20.3218L33.3809 18.6021H35.9053L36.752 16.3872L37.7441 18.6021ZM11.3486 7.95264H13.5L11.8096 9.67334L12.4639 12.3872L10.3594 10.8618L8.18359 12.3872L8.91797 9.67334L6.98535 7.95264H9.50977L10.3555 5.73779L11.3486 7.95264ZM24.5459 7.95264H26.6973L25.0068 9.67334L25.6621 12.3872L23.5566 10.8618L21.3809 12.3872L22.1152 9.67334L20.1836 7.95264H22.707L23.5537 5.73779L24.5459 7.95264ZM37.7441 7.95264H39.8955L38.2051 9.67334L38.8594 12.3872L36.7549 10.8618L34.5791 12.3872L35.3135 9.67334L33.3809 7.95264H35.9053L36.752 5.73779L37.7441 7.95264ZM50.9424 7.95264H53.0938L51.4033 9.67334L52.0576 12.3872L49.9521 10.8618L47.7773 12.3872L48.5117 9.67334L46.5791 7.95264H49.1025L49.9492 5.73779L50.9424 7.95264Z"
+          fill="white"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0_18908_83688">
+          <rect x="0.09375" width="95.9062" height="71.9297" rx="5.99414" fill="white" />
+        </clipPath>
+      </defs>
+    </svg>
+  );
+}
+
+export function FlagEurope({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 96 72" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <rect x="0.09375" width="95.9062" height="71.9297" rx="5.99414" fill="#2E52B2" />
+      <path
+        d="M30.1359 9.60876L28.2171 15.508H22.017L27.0358 19.1573L25.1171 25.0565L30.1359 21.4072L35.1547 25.0565L33.236 19.1573L38.2548 15.508H32.0546L30.1359 9.60876Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M48.0469 2.29382L46.1282 8.19302H39.928L44.9468 11.8424L43.0281 17.7416L48.0469 14.0922L53.0657 17.7416L51.147 11.8424L56.1658 8.19302H49.9656L48.0469 2.29382Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M65.9577 10.0177L64.039 15.9169H57.8388L62.8576 19.5663L60.9389 25.4655L65.9577 21.8161L70.9766 25.4655L69.0578 19.5663L74.0766 15.9169H67.8765L65.9577 10.0177Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M73.5861 27.4231L71.6673 33.3223H65.4672L70.486 36.9717L68.5672 42.8709L73.5861 39.2215L78.6049 42.8709L76.6862 36.9717L81.705 33.3223H75.5048L73.5861 27.4231Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M65.9577 46.0563L64.039 51.9555H57.8388L62.8576 55.6048L60.9389 61.504L65.9577 57.8547L70.9766 61.504L69.0578 55.6048L74.0766 51.9555H67.8765L65.9577 46.0563Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M48.0469 53.7802L46.1282 59.6794H39.928L44.9468 63.3287L43.0281 69.2279L48.0469 65.5785L53.0657 69.2279L51.147 63.3287L56.1658 59.6794H49.9656L48.0469 53.7802Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M30.1359 46.0563L28.2171 51.9555H22.017L27.0358 55.6048L25.1171 61.504L30.1359 57.8547L35.1547 61.504L33.236 55.6048L38.2548 51.9555H32.0546L30.1359 46.0563Z"
+        fill="#F6CD46"
+      />
+      <path
+        d="M22.5077 27.4231L20.589 33.3223H14.3888L19.4076 36.9717L17.4889 42.8709L22.5077 39.2215L27.5266 42.8709L25.6078 36.9717L30.6266 33.3223H24.4265L22.5077 27.4231Z"
+        fill="#F6CD46"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/SnakedArrowIcon.tsx b/apps/webapp/app/assets/icons/SnakedArrowIcon.tsx
new file mode 100644
index 00000000000..0766cce1b46
--- /dev/null
+++ b/apps/webapp/app/assets/icons/SnakedArrowIcon.tsx
@@ -0,0 +1,20 @@
+export function SnakedArrowIcon({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M5 5H16C17.6569 5 19 6.34315 19 8L19 8.5C19 10.1569 17.6569 11.5 16 11.5H8C6.34314 11.5 5 12.8431 5 14.5L5 15C4.99999 16.6569 6.34314 18 8 18H18.634"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+      <path
+        d="M16 21L19 18L16 15"
+        stroke="currentColor"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/assets/icons/StreamsIcon.tsx b/apps/webapp/app/assets/icons/StreamsIcon.tsx
new file mode 100644
index 00000000000..73cc480f4d4
--- /dev/null
+++ b/apps/webapp/app/assets/icons/StreamsIcon.tsx
@@ -0,0 +1,10 @@
+export function StreamsIcon({ className }: { className?: string }) {
+  return (
+<svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 19C3 19 5.01155 17 8 17C10.9885 17 13 18.9973 16 18.9973C19 18.9973 21 17 21 17" stroke="currentColor" strokeWidth="2" strokeLinecap="round"/>
+<path d="M3 13.0001C3 13.0001 5.01155 11 8 11C10.9885 11 13 13 16 13C19 13 21 11.0001 21 11.0001" stroke="currentColor" strokeWidth="2" strokeLinecap="round"/>
+<path d="M3 7C3 7 5.01155 5 8 5C10.9885 5 13 6.9973 16 6.9973C19 6.9973 21 5 21 5" stroke="currentColor" strokeWidth="2" strokeLinecap="round"/>
+</svg>
+  );
+}
+
diff --git a/apps/webapp/app/assets/images/blurred-dashboard-background-menu-bottom.jpg b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-bottom.jpg
new file mode 100644
index 00000000000..2a993f82127
Binary files /dev/null and b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-bottom.jpg differ
diff --git a/apps/webapp/app/assets/images/blurred-dashboard-background-menu-top.jpg b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-top.jpg
new file mode 100644
index 00000000000..8aca8563cdc
Binary files /dev/null and b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-top.jpg differ
diff --git a/apps/webapp/app/assets/images/blurred-dashboard-background-table.jpg b/apps/webapp/app/assets/images/blurred-dashboard-background-table.jpg
new file mode 100644
index 00000000000..a2ae4029fe2
Binary files /dev/null and b/apps/webapp/app/assets/images/blurred-dashboard-background-table.jpg differ
diff --git a/apps/webapp/app/assets/logos/GoogleLogo.tsx b/apps/webapp/app/assets/logos/GoogleLogo.tsx
new file mode 100644
index 00000000000..e0ff9597f07
--- /dev/null
+++ b/apps/webapp/app/assets/logos/GoogleLogo.tsx
@@ -0,0 +1,22 @@
+export function GoogleLogo({ className }: { className?: string }) {
+  return (
+    <svg className={className} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M19.9075 21.0983C22.7427 18.4521 24.0028 14.0417 23.2468 9.82031H11.9688V14.4827H18.3953C18.1433 15.9949 17.2612 17.255 16.0011 18.0741L19.9075 21.0983Z"
+        fill="#4285F4"
+      />
+      <path
+        d="M1.25781 17.3802C2.08665 19.013 3.27532 20.4362 4.73421 21.5428C6.1931 22.6493 7.88415 23.4102 9.67988 23.7681C11.4756 24.1261 13.3292 24.0717 15.1008 23.6091C16.8725 23.1465 18.516 22.2877 19.9075 21.0976L16.0011 18.0733C12.6618 20.2785 7.11734 19.4594 5.22717 14.293L1.25781 17.3802Z"
+        fill="#34A853"
+      />
+      <path
+        d="M5.22701 14.2922C4.72297 12.717 4.72297 11.2679 5.22701 9.69275L1.25765 6.60547C-0.191479 9.50373 -0.632519 13.5991 1.25765 17.3794L5.22701 14.2922Z"
+        fill="#FBBC02"
+      />
+      <path
+        d="M5.22717 9.69209C6.6133 5.34469 12.5358 2.82446 16.5052 6.5418L19.9705 3.13949C15.0561 -1.58594 5.47919 -1.39692 1.25781 6.60481L5.22717 9.69209Z"
+        fill="#EA4335"
+      />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/components/AlphaBadge.tsx b/apps/webapp/app/components/AlphaBadge.tsx
new file mode 100644
index 00000000000..0a1c4a7fc9a
--- /dev/null
+++ b/apps/webapp/app/components/AlphaBadge.tsx
@@ -0,0 +1,61 @@
+import { cn } from "~/utils/cn";
+import { Badge } from "./primitives/Badge";
+import { SimpleTooltip } from "./primitives/Tooltip";
+
+export function AlphaBadge({
+  inline = false,
+  className,
+}: {
+  inline?: boolean;
+  className?: string;
+}) {
+  return (
+    <SimpleTooltip
+      button={
+        <Badge variant="extra-small" className={cn(inline ? "inline-grid" : "", className)}>
+          Alpha
+        </Badge>
+      }
+      content="This feature is in Alpha."
+      disableHoverableContent
+    />
+  );
+}
+
+export function AlphaTitle({ children }: { children: React.ReactNode }) {
+  return (
+    <>
+      <span>{children}</span>
+      <AlphaBadge />
+    </>
+  );
+}
+
+export function BetaBadge({
+  inline = false,
+  className,
+}: {
+  inline?: boolean;
+  className?: string;
+}) {
+  return (
+    <SimpleTooltip
+      button={
+        <Badge variant="extra-small" className={cn(inline ? "inline-grid" : "", className)}>
+          Beta
+        </Badge>
+      }
+      content="This feature is in Beta."
+      disableHoverableContent
+    />
+  );
+}
+
+export function BetaTitle({ children }: { children: React.ReactNode }) {
+  return (
+    <>
+      <span>{children}</span>
+      <BetaBadge />
+    </>
+  );
+}
diff --git a/apps/webapp/app/components/AskAI.tsx b/apps/webapp/app/components/AskAI.tsx
index 39cc4cdaaf3..814d4649c8f 100644
--- a/apps/webapp/app/components/AskAI.tsx
+++ b/apps/webapp/app/components/AskAI.tsx
@@ -5,6 +5,7 @@ import {
   HandThumbUpIcon,
   StopIcon,
 } from "@heroicons/react/20/solid";
+import { cn } from "~/utils/cn";
 import { type FeedbackComment, KapaProvider, type QA, useChat } from "@kapaai/react-sdk";
 import { useSearchParams } from "@remix-run/react";
 import DOMPurify from "dompurify";
@@ -37,7 +38,7 @@ function useKapaWebsiteId() {
   return routeMatch?.kapa.websiteId;
 }
 
-export function AskAI() {
+export function AskAI({ isCollapsed = false }: { isCollapsed?: boolean }) {
   const { isManagedCloud } = useFeatures();
   const websiteId = useKapaWebsiteId();
 
@@ -54,21 +55,23 @@ export function AskAI() {
           hideShortcutKey
           data-modal-override-open-class-ask-ai="true"
           disabled
+          className={isCollapsed ? "w-full justify-center" : ""}
         >
           <AISparkleIcon className="size-5" />
         </Button>
       }
     >
-      {() => <AskAIProvider websiteId={websiteId} />}
+      {() => <AskAIProvider websiteId={websiteId} isCollapsed={isCollapsed} />}
     </ClientOnly>
   );
 }
 
 type AskAIProviderProps = {
   websiteId: string;
+  isCollapsed?: boolean;
 };
 
-function AskAIProvider({ websiteId }: AskAIProviderProps) {
+function AskAIProvider({ websiteId, isCollapsed = false }: AskAIProviderProps) {
   const [isOpen, setIsOpen] = useState(false);
   const [initialQuery, setInitialQuery] = useState<string | undefined>();
   const [searchParams, setSearchParams] = useSearchParams();
@@ -112,28 +115,39 @@ function AskAIProvider({ websiteId }: AskAIProviderProps) {
       }}
       botProtectionMechanism="hcaptcha"
     >
-      <TooltipProvider disableHoverableContent>
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <div className="inline-flex">
-              <Button
-                variant="small-menu-item"
-                data-action="ask-ai"
-                shortcut={{ modifiers: ["mod"], key: "/", enabledOnInputElements: true }}
-                hideShortcutKey
-                data-modal-override-open-class-ask-ai="true"
-                onClick={() => openAskAI()}
-              >
-                <AISparkleIcon className="size-5" />
-              </Button>
-            </div>
-          </TooltipTrigger>
-          <TooltipContent side="top" className="flex items-center gap-1 py-1.5 pl-2.5 pr-2 text-xs">
-            Ask AI
-            <ShortcutKey shortcut={{ modifiers: ["mod"], key: "/" }} variant="medium/bright" />
-          </TooltipContent>
-        </Tooltip>
-      </TooltipProvider>
+      <motion.div layout="position" transition={{ duration: 0.2, ease: "easeInOut" }}>
+        <TooltipProvider disableHoverableContent>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <span className={cn("inline-flex h-8", isCollapsed && "w-full")}>
+                <Button
+                  variant="small-menu-item"
+                  data-action="ask-ai"
+                  shortcut={{ modifiers: ["mod"], key: "i", enabledOnInputElements: true }}
+                  hideShortcutKey
+                  data-modal-override-open-class-ask-ai="true"
+                  onClick={() => openAskAI()}
+                  fullWidth={isCollapsed}
+                  className={cn("h-full", isCollapsed && "justify-center")}
+                >
+                  <AISparkleIcon className="size-5" />
+                </Button>
+              </span>
+            </TooltipTrigger>
+            <TooltipContent
+              side="right"
+              sideOffset={8}
+              className="flex items-center gap-2 text-xs"
+            >
+              Ask AI
+              <span className="flex items-center">
+                <ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
+                <ShortcutKey shortcut={{ key: "i" }} variant="medium/bright" />
+              </span>
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      </motion.div>
       <AskAIDialog
         initialQuery={initialQuery}
         isOpen={isOpen}
diff --git a/apps/webapp/app/components/BackgroundWrapper.tsx b/apps/webapp/app/components/BackgroundWrapper.tsx
new file mode 100644
index 00000000000..ecff3af6dd4
--- /dev/null
+++ b/apps/webapp/app/components/BackgroundWrapper.tsx
@@ -0,0 +1,48 @@
+import { type ReactNode } from "react";
+import blurredDashboardBackgroundMenuTop from "~/assets/images/blurred-dashboard-background-menu-top.jpg";
+import blurredDashboardBackgroundMenuBottom from "~/assets/images/blurred-dashboard-background-menu-bottom.jpg";
+import blurredDashboardBackgroundTable from "~/assets/images/blurred-dashboard-background-table.jpg";
+
+export function BackgroundWrapper({ children }: { children: ReactNode }) {
+  return (
+    <div className="relative h-full w-full overflow-hidden">
+      {/* Left menu top background - fixed width 260px, maintains aspect ratio */}
+      <div
+        className="absolute left-0 top-0 w-[260px] bg-contain bg-left-top bg-no-repeat"
+        style={{
+          backgroundImage: `url(${blurredDashboardBackgroundMenuTop})`,
+          aspectRatio: "auto",
+          height: "100vh",
+          backgroundSize: "260px auto",
+        }}
+      />
+
+      {/* Left menu bottom background - fixed width 260px, maintains aspect ratio */}
+      <div
+        className="absolute bottom-0 left-0 w-[260px] bg-contain bg-left-bottom bg-no-repeat"
+        style={{
+          backgroundImage: `url(${blurredDashboardBackgroundMenuBottom})`,
+          aspectRatio: "auto",
+          height: "100vh",
+          backgroundSize: "260px auto",
+        }}
+      />
+
+      {/* Right table background - fixed width 2000px, positioned next to menu */}
+      <div
+        className="absolute top-0 bg-left-top bg-no-repeat"
+        style={{
+          left: "260px",
+          backgroundImage: `url(${blurredDashboardBackgroundTable})`,
+          width: "100%",
+          height: "100vh",
+          backgroundSize: "1200px auto",
+          backgroundColor: "#101214",
+        }}
+      />
+
+      {/* Content layer */}
+      <div className="relative z-10 h-full w-full">{children}</div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/BlankStatePanels.tsx b/apps/webapp/app/components/BlankStatePanels.tsx
index 03ebae66ee1..7423bd61ac8 100644
--- a/apps/webapp/app/components/BlankStatePanels.tsx
+++ b/apps/webapp/app/components/BlankStatePanels.tsx
@@ -5,6 +5,7 @@ import {
   ChatBubbleLeftRightIcon,
   ClockIcon,
   PlusIcon,
+  QuestionMarkCircleIcon,
   RectangleGroupIcon,
   RectangleStackIcon,
   ServerStackIcon,
@@ -12,7 +13,6 @@ import {
 } from "@heroicons/react/20/solid";
 import { useLocation } from "react-use";
 import { BranchEnvironmentIconSmall } from "~/assets/icons/EnvironmentIcons";
-import { TaskIcon } from "~/assets/icons/TaskIcon";
 import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
 import openBulkActionsPanel from "~/assets/images/open-bulk-actions-panel.png";
 import selectRunsIndividually from "~/assets/images/select-runs-individually.png";
@@ -32,8 +32,9 @@ import {
   v3NewProjectAlertPath,
   v3NewSchedulePath,
 } from "~/utils/pathBuilder";
+import { AskAI } from "./AskAI";
 import { InlineCode } from "./code/InlineCode";
-import { environmentFullTitle } from "./environments/EnvironmentLabel";
+import { environmentFullTitle, EnvironmentIcon } from "./environments/EnvironmentLabel";
 import { Feedback } from "./Feedback";
 import { EnvironmentSelector } from "./navigation/EnvironmentSelector";
 import { Button, LinkButton } from "./primitives/Buttons";
@@ -42,9 +43,22 @@ import { InfoPanel } from "./primitives/InfoPanel";
 import { Paragraph } from "./primitives/Paragraph";
 import { StepNumber } from "./primitives/StepNumber";
 import { TextLink } from "./primitives/TextLink";
-import { InitCommandV3, PackageManagerProvider, TriggerDevStepV3 } from "./SetupCommands";
+import { SimpleTooltip } from "./primitives/Tooltip";
+import {
+  InitCommandV3,
+  PackageManagerProvider,
+  TriggerDeployStep,
+  TriggerDevStepV3,
+} from "./SetupCommands";
 import { StepContentContainer } from "./StepContentContainer";
 import { V4Badge } from "./V4Badge";
+import {
+  ClientTabs,
+  ClientTabsContent,
+  ClientTabsList,
+  ClientTabsTrigger,
+} from "./primitives/ClientTabs";
+import { GitHubSettingsPanel } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github";
 
 export function HasNoTasksDev() {
   return (
@@ -86,28 +100,7 @@ export function HasNoTasksDev() {
 }
 
 export function HasNoTasksDeployed({ environment }: { environment: MinimumEnvironment }) {
-  return (
-    <InfoPanel
-      title={`You don't have any deployed tasks in ${environmentFullTitle(environment)}`}
-      icon={TaskIcon}
-      iconClassName="text-tasks"
-      panelClassName="max-w-full"
-      accessory={
-        <LinkButton
-          to={docsPath("deployment/overview")}
-          variant="docs/small"
-          LeadingIcon={BookOpenIcon}
-        >
-          How to deploy tasks
-        </LinkButton>
-      }
-    >
-      <Paragraph spacing variant="small">
-        Run the <TextLink to={docsPath("deployment/overview")}>CLI deploy command</TextLink> to
-        deploy your tasks to the {environmentFullTitle(environment)} environment.
-      </Paragraph>
-    </InfoPanel>
-  );
+  return <DeploymentOnboardingSteps />;
 }
 
 export function SchedulesNoPossibleTaskPanel() {
@@ -225,45 +218,7 @@ export function TestHasNoTasks() {
 }
 
 export function DeploymentsNone() {
-  const organization = useOrganization();
-  const project = useProject();
-  const environment = useEnvironment();
-
-  return (
-    <InfoPanel
-      icon={ServerStackIcon}
-      iconClassName="text-deployments"
-      title="Deploy for the first time"
-      panelClassName="max-w-full"
-    >
-      <Paragraph spacing variant="small">
-        There are several ways to deploy your tasks. You can use the CLI or a Continuous Integration
-        service like GitHub Actions. Make sure you{" "}
-        <TextLink href={v3EnvironmentVariablesPath(organization, project, environment)}>
-          set your environment variables
-        </TextLink>{" "}
-        first.
-      </Paragraph>
-      <div className="flex gap-3">
-        <LinkButton
-          to={docsPath("v3/cli-deploy")}
-          variant="docs/medium"
-          LeadingIcon={BookOpenIcon}
-          className="inline-flex"
-        >
-          Deploy with the CLI
-        </LinkButton>
-        <LinkButton
-          to={docsPath("v3/github-actions")}
-          variant="docs/medium"
-          LeadingIcon={BookOpenIcon}
-          className="inline-flex"
-        >
-          Deploy with GitHub actions
-        </LinkButton>
-      </div>
-    </InfoPanel>
-  );
+  return <DeploymentOnboardingSteps />;
 }
 
 export function DeploymentsNoneDev() {
@@ -272,46 +227,52 @@ export function DeploymentsNoneDev() {
   const environment = useEnvironment();
 
   return (
-    <div className="space-y-8">
-      <InfoPanel
-        icon={ServerStackIcon}
-        iconClassName="text-deployments"
-        title="Deploying tasks"
-        panelClassName="max-w-full"
-      >
-        <Paragraph spacing variant="small">
+    <>
+      <div className="mb-6 flex items-center justify-between border-b">
+        <div className="mb-2 flex items-center gap-2">
+          <EnvironmentIcon environment={environment} className="-ml-1 size-8" />
+          <Header1>Deploy your tasks</Header1>
+        </div>
+        <div className="flex items-center">
+          <SimpleTooltip
+            button={
+              <LinkButton
+                variant="small-menu-item"
+                LeadingIcon={BookOpenIcon}
+                leadingIconClassName="text-blue-500"
+                to={docsPath("deployment/overview")}
+              />
+            }
+            content="Deploy docs"
+          />
+          <SimpleTooltip
+            button={
+              <LinkButton
+                variant="small-menu-item"
+                LeadingIcon={QuestionMarkCircleIcon}
+                leadingIconClassName="text-blue-500"
+                to={docsPath("troubleshooting#deployment")}
+              />
+            }
+            content="Troubleshooting docs"
+          />
+          <AskAI />
+        </div>
+      </div>
+      <StepNumber stepNumber="→" title="Switch to a deployed environment" />
+      <StepContentContainer className="mb-4 flex flex-col gap-4">
+        <Paragraph>
           This is the Development environment. When you're ready to deploy your tasks, switch to a
           different environment.
         </Paragraph>
-        <Paragraph spacing variant="small">
-          There are several ways to deploy your tasks. You can use the CLI or a Continuous
-          Integration service like GitHub Actions. Make sure you{" "}
-          <TextLink href={v3EnvironmentVariablesPath(organization, project, environment)}>
-            set your environment variables
-          </TextLink>{" "}
-          first.
-        </Paragraph>
-        <div className="flex gap-3">
-          <LinkButton
-            to={docsPath("v3/cli-deploy")}
-            variant="docs/medium"
-            LeadingIcon={BookOpenIcon}
-            className="inline-flex"
-          >
-            Deploy with the CLI
-          </LinkButton>
-          <LinkButton
-            to={docsPath("v3/github-actions")}
-            variant="docs/medium"
-            LeadingIcon={BookOpenIcon}
-            className="inline-flex"
-          >
-            Deploy with GitHub actions
-          </LinkButton>
-        </div>
-      </InfoPanel>
-      <SwitcherPanel />
-    </div>
+        <EnvironmentSelector
+          organization={organization}
+          project={project}
+          environment={environment}
+          className="w-fit border border-charcoal-600 bg-secondary hover:border-charcoal-550 hover:bg-charcoal-600"
+        />
+      </StepContentContainer>
+    </>
   );
 }
 
@@ -477,6 +438,10 @@ export function BranchesNoBranchableEnvironment() {
         Preview branches in Trigger.dev create isolated environments for testing new features before
         production.
       </Paragraph>
+      <Paragraph variant="small">
+        You must be on <V4Badge inline /> to access preview branches. Read our{" "}
+        <TextLink to={docsPath("upgrade-to-v4")}>upgrade to v4 guide</TextLink> to learn more.
+      </Paragraph>
     </InfoPanel>
   );
 }
@@ -625,3 +590,99 @@ export function BulkActionsNone() {
     </div>
   );
 }
+
+function DeploymentOnboardingSteps() {
+  const environment = useEnvironment();
+  const organization = useOrganization();
+  const project = useProject();
+
+  return (
+    <PackageManagerProvider>
+      <div className="mb-2 flex items-center justify-between border-b">
+        <div className="mb-2 flex min-w-0 items-center gap-2">
+          <EnvironmentIcon environment={environment} className="-ml-1 size-8 shrink-0" />
+          <Header1 className="truncate">Deploy your tasks to {environmentFullTitle(environment)}</Header1>
+        </div>
+        <div className="flex items-center">
+          <SimpleTooltip
+            button={
+              <LinkButton
+                variant="small-menu-item"
+                LeadingIcon={BookOpenIcon}
+                leadingIconClassName="text-blue-500"
+                to={docsPath("deployment/overview")}
+              />
+            }
+            content="Deploy docs"
+          />
+          <SimpleTooltip
+            button={
+              <LinkButton
+                variant="small-menu-item"
+                LeadingIcon={QuestionMarkCircleIcon}
+                leadingIconClassName="text-blue-500"
+                to={docsPath("troubleshooting#deployment")}
+              />
+            }
+            content="Troubleshooting docs"
+          />
+          <AskAI />
+        </div>
+      </div>
+      <ClientTabs defaultValue="github">
+        <ClientTabsList variant="segmented" className="mb-6">
+          <ClientTabsTrigger value={"github"} variant="segmented" layoutId="deploy-tabs">
+            GitHub
+          </ClientTabsTrigger>
+          <ClientTabsTrigger value={"cli"} variant="segmented" layoutId="deploy-tabs">
+            Manual
+          </ClientTabsTrigger>
+          <ClientTabsTrigger value={"github-actions"} variant="segmented" layoutId="deploy-tabs">
+            GitHub Actions
+          </ClientTabsTrigger>
+        </ClientTabsList>
+        <ClientTabsContent value={"github"}>
+          <StepNumber stepNumber="1" title="Connect your GitHub repository" />
+          <StepContentContainer>
+            <Paragraph spacing>
+              Deploy automatically with every push. Read the{" "}
+              <TextLink to={docsPath("github-integration")}>full guide</TextLink>.
+            </Paragraph>
+            <div className="w-fit">
+              <GitHubSettingsPanel
+                organizationSlug={organization.slug}
+                projectSlug={project.slug}
+                environmentSlug={environment.slug}
+                billingPath={v3BillingPath({ slug: organization.slug })}              
+              />
+            </div>
+          </StepContentContainer>
+        </ClientTabsContent>
+        <ClientTabsContent value={"cli"}>
+          <StepNumber stepNumber="1" title="Run the CLI 'deploy' command" />
+          <StepContentContainer>
+            <Paragraph spacing>
+              This will deploy your tasks to the {environmentFullTitle(environment)} environment.
+              Read the <TextLink to={docsPath("deployment/overview")}>full guide</TextLink>.
+            </Paragraph>
+            <TriggerDeployStep environment={environment} />
+          </StepContentContainer>
+        </ClientTabsContent>
+        <ClientTabsContent value={"github-actions"}>
+          <StepNumber stepNumber="1" title="Deploy using GitHub Actions" />
+          <StepContentContainer>
+            <Paragraph spacing>
+              Read the <TextLink to={docsPath("github-actions")}>GitHub Actions guide</TextLink> to
+              get started.
+            </Paragraph>
+          </StepContentContainer>
+        </ClientTabsContent>
+      </ClientTabs>
+
+      <StepNumber stepNumber="2" title="Waiting for tasks to deploy" displaySpinner />
+      <StepContentContainer>
+        <Paragraph>This page will automatically refresh when your tasks are deployed.</Paragraph>
+      </StepContentContainer>
+    </PackageManagerProvider>
+  );
+}
diff --git a/apps/webapp/app/components/BulkActionFilterSummary.tsx b/apps/webapp/app/components/BulkActionFilterSummary.tsx
index b00d77d438c..073940d7d0a 100644
--- a/apps/webapp/app/components/BulkActionFilterSummary.tsx
+++ b/apps/webapp/app/components/BulkActionFilterSummary.tsx
@@ -11,10 +11,11 @@ import { appliedSummary, dateFromString, timeFilterRenderValues } from "./runs/v
 import { formatNumber } from "~/utils/numberFormatter";
 import { SpinnerWhite } from "./primitives/Spinner";
 import { ArrowPathIcon, CheckIcon, XCircleIcon } from "@heroicons/react/20/solid";
+import { XCircleIcon as XCircleIconOutline } from "@heroicons/react/24/outline";
 import assertNever from "assert-never";
 import { AppliedFilter } from "./primitives/AppliedFilter";
 import { runStatusTitle } from "./runs/v3/TaskRunStatus";
-import { type TaskRunStatus } from "@trigger.dev/database";
+import type { TaskRunStatus } from "@trigger.dev/database";
 
 export const BulkActionMode = z.union([z.literal("selected"), z.literal("filter")]);
 export type BulkActionMode = z.infer<typeof BulkActionMode>;
@@ -244,7 +245,7 @@ function Action({ action }: { action: BulkActionAction }) {
     case "cancel":
       return (
         <span>
-          <XCircleIcon className="mb-0.5 inline-block size-4 text-error" />
+          <XCircleIconOutline className="mb-0.5 inline-block size-4 text-error" />
           <span className="ml-0.5 text-text-bright">Canceled</span>
         </span>
       );
diff --git a/apps/webapp/app/components/CloudProvider.tsx b/apps/webapp/app/components/CloudProvider.tsx
new file mode 100644
index 00000000000..acf8cff5506
--- /dev/null
+++ b/apps/webapp/app/components/CloudProvider.tsx
@@ -0,0 +1,10 @@
+export function cloudProviderTitle(provider: "aws" | "digitalocean" | (string & {})) {
+  switch (provider) {
+    case "aws":
+      return "Amazon Web Services";
+    case "digitalocean":
+      return "Digital Ocean";
+    default:
+      return provider;
+  }
+}
diff --git a/apps/webapp/app/components/DefinitionTooltip.tsx b/apps/webapp/app/components/DefinitionTooltip.tsx
index 0e2d4d43637..5bb3a713997 100644
--- a/apps/webapp/app/components/DefinitionTooltip.tsx
+++ b/apps/webapp/app/components/DefinitionTooltip.tsx
@@ -14,7 +14,7 @@ export function DefinitionTip({
   return (
     <TooltipProvider>
       <Tooltip disableHoverableContent>
-        <TooltipTrigger>
+        <TooltipTrigger className="text-left">
           <span className="cursor-default underline decoration-charcoal-500 decoration-dashed underline-offset-4 transition hover:decoration-charcoal-400">
             {children}
           </span>
diff --git a/apps/webapp/app/components/ErrorDisplay.tsx b/apps/webapp/app/components/ErrorDisplay.tsx
index 1a8f4b2ad94..5787a2edbac 100644
--- a/apps/webapp/app/components/ErrorDisplay.tsx
+++ b/apps/webapp/app/components/ErrorDisplay.tsx
@@ -1,11 +1,10 @@
 import { HomeIcon } from "@heroicons/react/20/solid";
 import { isRouteErrorResponse, useRouteError } from "@remix-run/react";
-import { motion } from "framer-motion";
 import { friendlyErrorDisplay } from "~/utils/httpErrors";
 import { LinkButton } from "./primitives/Buttons";
 import { Header1 } from "./primitives/Headers";
 import { Paragraph } from "./primitives/Paragraph";
-import Spline from "@splinetool/react-spline";
+import { TriggerRotatingLogo } from "./TriggerRotatingLogo";
 import { type ReactNode } from "react";
 
 type ErrorDisplayOptions = {
@@ -57,14 +56,7 @@ export function ErrorDisplay({ title, message, button }: DisplayOptionsProps) {
           {button ? button.title : "Go to homepage"}
         </LinkButton>
       </div>
-      <motion.div
-        className="pointer-events-none absolute inset-0 overflow-hidden"
-        initial={{ opacity: 0 }}
-        animate={{ opacity: 1 }}
-        transition={{ delay: 0.5, duration: 2, ease: "easeOut" }}
-      >
-        <Spline scene="https://prod.spline.design/wRly8TZN-e0Twb8W/scene.splinecode" />
-      </motion.div>
+      <TriggerRotatingLogo />
     </div>
   );
 }
diff --git a/apps/webapp/app/components/Feedback.tsx b/apps/webapp/app/components/Feedback.tsx
index cba709aba42..ecfd4e88c9a 100644
--- a/apps/webapp/app/components/Feedback.tsx
+++ b/apps/webapp/app/components/Feedback.tsx
@@ -2,7 +2,7 @@ import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
 import { InformationCircleIcon, ArrowUpCircleIcon } from "@heroicons/react/20/solid";
 import { EnvelopeIcon } from "@heroicons/react/24/solid";
-import { Form, useActionData, useLocation, useNavigation } from "@remix-run/react";
+import { Form, useActionData, useLocation, useNavigation, useSearchParams } from "@remix-run/react";
 import { type ReactNode, useEffect, useState } from "react";
 import { type FeedbackType, feedbackTypeLabel, schema } from "~/routes/resources.feedback";
 import { Button } from "./primitives/Buttons";
@@ -23,10 +23,12 @@ import { DialogClose } from "@radix-ui/react-dialog";
 type FeedbackProps = {
   button: ReactNode;
   defaultValue?: FeedbackType;
+  onOpenChange?: (open: boolean) => void;
 };
 
-export function Feedback({ button, defaultValue = "bug" }: FeedbackProps) {
+export function Feedback({ button, defaultValue = "bug", onOpenChange }: FeedbackProps) {
   const [open, setOpen] = useState(false);
+  const [searchParams, setSearchParams] = useSearchParams();
   const location = useLocation();
   const lastSubmission = useActionData();
   const navigation = useNavigation();
@@ -52,8 +54,26 @@ export function Feedback({ button, defaultValue = "bug" }: FeedbackProps) {
     }
   }, [navigation, form]);
 
+  // Handle URL param functionality
+  useEffect(() => {
+    const open = searchParams.get("feedbackPanel");
+    if (open) {
+      setType(open as FeedbackType);
+      setOpen(true);
+      // Clone instead of mutating in place
+      const next = new URLSearchParams(searchParams);
+      next.delete("feedbackPanel");
+      setSearchParams(next);
+    }
+  }, [searchParams]);
+
+  const handleOpenChange = (value: boolean) => {
+    setOpen(value);
+    onOpenChange?.(value);
+  };
+
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogTrigger asChild>{button}</DialogTrigger>
       <DialogContent>
         <DialogHeader>Contact us</DialogHeader>
diff --git a/apps/webapp/app/components/GitHubLoginButton.tsx b/apps/webapp/app/components/GitHubLoginButton.tsx
index 87238db087e..76a494927cd 100644
--- a/apps/webapp/app/components/GitHubLoginButton.tsx
+++ b/apps/webapp/app/components/GitHubLoginButton.tsx
@@ -32,8 +32,6 @@ export function OctoKitty({ className }: { className?: string }) {
       baseProfile="tiny"
       id="Layer_1"
       xmlns="http://www.w3.org/2000/svg"
-      x="0px"
-      y="0px"
       viewBox="0 0 2350 2314.8"
       xmlSpace="preserve"
       fill="currentColor"
diff --git a/apps/webapp/app/components/LogLevelTooltipInfo.tsx b/apps/webapp/app/components/LogLevelTooltipInfo.tsx
new file mode 100644
index 00000000000..2a8093af066
--- /dev/null
+++ b/apps/webapp/app/components/LogLevelTooltipInfo.tsx
@@ -0,0 +1,56 @@
+import { Header3 } from "./primitives/Headers";
+import { Paragraph } from "./primitives/Paragraph";
+import { LogLevel } from "./logs/LogLevel";
+
+export function LogLevelTooltipInfo() {
+  return (
+    <div className="flex max-w-xs flex-col gap-4 p-1 pb-2">
+      <div>
+        <Header3>Log Levels</Header3>
+        <Paragraph variant="small" className="text-text-dimmed">
+          Structured logging helps you debug and monitor your tasks.
+        </Paragraph>
+      </div>
+      <div>
+        <div className="mb-1">
+          <LogLevel level="TRACE" />
+        </div>
+        <Paragraph variant="small" className="text-text-dimmed">
+          Traces and spans representing the execution flow of your tasks.
+        </Paragraph>
+      </div>
+      <div>
+        <div className="mb-1">
+          <LogLevel level="INFO" />
+        </div>
+        <Paragraph variant="small" className="text-text-dimmed">
+          General informational messages about task execution.
+        </Paragraph>
+      </div>
+      <div>
+        <div className="mb-1">
+          <LogLevel level="WARN" />
+        </div>
+        <Paragraph variant="small" className="text-text-dimmed">
+          Warning messages indicating potential issues that don't prevent execution.
+        </Paragraph>
+      </div>
+      <div>
+        <div className="mb-1">
+          <LogLevel level="ERROR" />
+        </div>
+        <Paragraph variant="small" className="text-text-dimmed">
+          Error messages for failures and exceptions during task execution.
+        </Paragraph>
+      </div>
+      <div>
+        <div className="mb-1">
+          <LogLevel level="DEBUG" />
+        </div>
+        <Paragraph variant="small" className="text-text-dimmed">
+          Detailed diagnostic information for development and debugging.
+        </Paragraph>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/SetupCommands.tsx b/apps/webapp/app/components/SetupCommands.tsx
index e68273a0dbf..accb2f65a8f 100644
--- a/apps/webapp/app/components/SetupCommands.tsx
+++ b/apps/webapp/app/components/SetupCommands.tsx
@@ -208,3 +208,64 @@ export function TriggerLoginStepV3({ title }: TabsProps) {
     </ClientTabs>
   );
 }
+
+export function TriggerDeployStep({ title, environment }: TabsProps & { environment: { type: string } }) {
+  const triggerCliTag = useTriggerCliTag();
+  const { activePackageManager, setActivePackageManager } = usePackageManager();
+
+  // Generate the environment flag based on environment type
+  const getEnvironmentFlag = () => {
+    switch (environment.type) {
+      case "STAGING":
+        return " --env staging";
+      case "PREVIEW":
+        return " --env preview";
+      case "PRODUCTION":
+      default:
+        return "";
+    }
+  };
+
+  const environmentFlag = getEnvironmentFlag();
+
+  return (
+    <ClientTabs
+      defaultValue="npm"
+      value={activePackageManager}
+      onValueChange={setActivePackageManager}
+    >
+      <div className="flex items-center gap-4">
+        {title && <Header3>{title}</Header3>}
+        <ClientTabsList className={title ? "ml-auto" : ""}>
+          <ClientTabsTrigger value={"npm"}>npm</ClientTabsTrigger>
+          <ClientTabsTrigger value={"pnpm"}>pnpm</ClientTabsTrigger>
+          <ClientTabsTrigger value={"yarn"}>yarn</ClientTabsTrigger>
+        </ClientTabsList>
+      </div>
+      <ClientTabsContent value={"npm"}>
+        <ClipboardField
+          variant="secondary/medium"
+          iconButton
+          className="mb-4"
+          value={`npx trigger.dev@${triggerCliTag} deploy${environmentFlag}`}
+        />
+      </ClientTabsContent>
+      <ClientTabsContent value={"pnpm"}>
+        <ClipboardField
+          variant="secondary/medium"
+          iconButton
+          className="mb-4"
+          value={`pnpm dlx trigger.dev@${triggerCliTag} deploy${environmentFlag}`}
+        />
+      </ClientTabsContent>
+      <ClientTabsContent value={"yarn"}>
+        <ClipboardField
+          variant="secondary/medium"
+          iconButton
+          className="mb-4"
+          value={`yarn dlx trigger.dev@${triggerCliTag} deploy${environmentFlag}`}
+        />
+      </ClientTabsContent>
+    </ClientTabs>
+  );
+}
diff --git a/apps/webapp/app/components/Shortcuts.tsx b/apps/webapp/app/components/Shortcuts.tsx
index 8349ed970fa..2decc82c914 100644
--- a/apps/webapp/app/components/Shortcuts.tsx
+++ b/apps/webapp/app/components/Shortcuts.tsx
@@ -1,18 +1,17 @@
 import { Keyboard } from "lucide-react";
+import { useState } from "react";
+import { useShortcutKeys } from "~/hooks/useShortcutKeys";
+import { Button } from "./primitives/Buttons";
 import { Header3 } from "./primitives/Headers";
 import { Paragraph } from "./primitives/Paragraph";
 import {
   Sheet,
   SheetContent,
-  SheetDescription,
   SheetHeader,
   SheetTitle,
-  SheetTrigger,
+  SheetTrigger
 } from "./primitives/SheetV3";
 import { ShortcutKey } from "./primitives/ShortcutKey";
-import { Button } from "./primitives/Buttons";
-import { useState } from "react";
-import { useShortcutKeys } from "~/hooks/useShortcutKeys";
 
 export function Shortcuts() {
   return (
@@ -26,8 +25,8 @@ export function Shortcuts() {
           fullWidth
           textAlignLeft
           shortcut={{ modifiers: ["shift"], key: "?", enabled: false }}
-          className="gap-x-0 pl-0.5"
-          iconSpacing="gap-x-0.5"
+          className="gap-x-0 pl-1.5"
+          iconSpacing="gap-x-1.5"
         >
           Shortcuts
         </Button>
@@ -77,11 +76,16 @@ function ShortcutContent() {
               <ShortcutKey shortcut={{ key: "enter" }} variant="medium/bright" />
             </Shortcut>
             <Shortcut name="Ask AI">
-              <ShortcutKey shortcut={{ modifiers: ["mod"], key: "/" }} variant="medium/bright" />
+              <ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
+              <ShortcutKey shortcut={{ key: "i" }} variant="medium/bright" />
             </Shortcut>
             <Shortcut name="Filter">
               <ShortcutKey shortcut={{ key: "f" }} variant="medium/bright" />
             </Shortcut>
+            <Shortcut name="Toggle side menu">
+              <ShortcutKey shortcut={{ modifiers: ["mod"]}} variant="medium/bright" />
+              <ShortcutKey shortcut={{ key: "b" }} variant="medium/bright" />
+            </Shortcut>
             <Shortcut name="Select filter">
               <ShortcutKey shortcut={{ key: "1" }} variant="medium/bright" />
               <Paragraph variant="small" className="ml-1.5">
@@ -123,7 +127,7 @@ function ShortcutContent() {
               <ShortcutKey shortcut={{ key: "d" }} variant="medium/bright" />
             </Shortcut>
             <Shortcut name="Context">
-              <ShortcutKey shortcut={{ key: "c" }} variant="medium/bright" />
+              <ShortcutKey shortcut={{ key: "x" }} variant="medium/bright" />
             </Shortcut>
             <Shortcut name="Metadata">
               <ShortcutKey shortcut={{ key: "m" }} variant="medium/bright" />
@@ -134,6 +138,10 @@ function ShortcutContent() {
               <ShortcutKey shortcut={{ key: "arrowleft" }} variant="medium/bright" />
               <ShortcutKey shortcut={{ key: "arrowright" }} variant="medium/bright" />
             </Shortcut>
+            <Shortcut name="Jump to next/previous run">
+              <ShortcutKey shortcut={{ key: "j" }} variant="medium/bright" />
+              <ShortcutKey shortcut={{ key: "k" }} variant="medium/bright" />
+            </Shortcut>
             <Shortcut name="Expand all">
               <ShortcutKey shortcut={{ key: "e" }} variant="medium/bright" />
             </Shortcut>
@@ -147,6 +155,49 @@ function ShortcutContent() {
               </Paragraph>
               <ShortcutKey shortcut={{ key: "9" }} variant="medium/bright" />
             </Shortcut>
+            <Shortcut name="Jump to root run">
+              <ShortcutKey shortcut={{ key: "t" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Jump to parent run">
+              <ShortcutKey shortcut={{ key: "p" }} variant="medium/bright" />
+            </Shortcut>
+          </div>
+          <div className="space-y-3">
+            <Header3>Logs page</Header3>
+            <Shortcut name="Filter by task">
+              <ShortcutKey shortcut={{ key: "t" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Filter by run ID">
+              <ShortcutKey shortcut={{ key: "i" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Filter by level">
+              <ShortcutKey shortcut={{ key: "l" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Select log level">
+              <ShortcutKey shortcut={{ key: "1" }} variant="medium/bright" />
+              <Paragraph variant="small" className="ml-1.5">
+                to
+              </Paragraph>
+              <ShortcutKey shortcut={{ key: "4" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Close detail panel">
+              <ShortcutKey shortcut={{ key: "esc" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Details tab">
+              <ShortcutKey shortcut={{ key: "d" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="Run tab">
+              <ShortcutKey shortcut={{ key: "r" }} variant="medium/bright" />
+            </Shortcut>
+            <Shortcut name="View full run">
+              <ShortcutKey shortcut={{ key: "v" }} variant="medium/bright" />
+            </Shortcut>
+          </div>
+          <div className="space-y-3">
+            <Header3>Metrics page</Header3>
+            <Shortcut name="Toggle fullscreen chart">
+              <ShortcutKey shortcut={{ key: "v" }} variant="medium/bright" />
+            </Shortcut>
           </div>
           <div className="space-y-3">
             <Header3>Schedules page</Header3>
diff --git a/apps/webapp/app/components/TimezoneSetter.tsx b/apps/webapp/app/components/TimezoneSetter.tsx
new file mode 100644
index 00000000000..3481af6571d
--- /dev/null
+++ b/apps/webapp/app/components/TimezoneSetter.tsx
@@ -0,0 +1,30 @@
+import { useFetcher } from "@remix-run/react";
+import { useEffect, useRef } from "react";
+import { useTypedLoaderData } from "remix-typedjson";
+import type { loader } from "~/root";
+
+export function TimezoneSetter() {
+  const { timezone: storedTimezone } = useTypedLoaderData<typeof loader>();
+  const fetcher = useFetcher();
+  const hasSetTimezone = useRef(false);
+
+  useEffect(() => {
+    if (hasSetTimezone.current) return;
+
+    const browserTimezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+
+    if (browserTimezone && browserTimezone !== storedTimezone) {
+      hasSetTimezone.current = true;
+      fetcher.submit(
+        { timezone: browserTimezone },
+        {
+          method: "POST",
+          action: "/resources/timezone",
+          encType: "application/json",
+        }
+      );
+    }
+  }, [storedTimezone, fetcher]);
+
+  return null;
+}
diff --git a/apps/webapp/app/components/TriggerRotatingLogo.tsx b/apps/webapp/app/components/TriggerRotatingLogo.tsx
new file mode 100644
index 00000000000..878c203a3ca
--- /dev/null
+++ b/apps/webapp/app/components/TriggerRotatingLogo.tsx
@@ -0,0 +1,75 @@
+import { motion } from "framer-motion";
+import { useEffect, useState } from "react";
+
+declare global {
+  namespace JSX {
+    interface IntrinsicElements {
+      "spline-viewer": React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLElement> & {
+          url?: string;
+          "loading-anim-type"?: string;
+        },
+        HTMLElement
+      >;
+    }
+  }
+
+  interface Window {
+    __splineLoader?: Promise<void>;
+  }
+}
+
+export function TriggerRotatingLogo() {
+  const [isSplineReady, setIsSplineReady] = useState(false);
+
+  useEffect(() => {
+    // Already registered from a previous render
+    if (customElements.get("spline-viewer")) {
+      setIsSplineReady(true);
+      return;
+    }
+
+    // Another mount already started loading - share the same promise
+    if (window.__splineLoader) {
+      window.__splineLoader.then(() => setIsSplineReady(true)).catch(() => setIsSplineReady(false));
+      return;
+    }
+
+    // First mount: create script and shared loader promise
+    const script = document.createElement("script");
+    script.type = "module";
+    // Version pinned; SRI hash omitted as unpkg doesn't guarantee hash stability across deploys
+    script.src = "https://unpkg.com/@splinetool/viewer@1.12.29/build/spline-viewer.js";
+
+    window.__splineLoader = new Promise<void>((resolve, reject) => {
+      script.onload = () => resolve();
+      script.onerror = () => reject();
+    });
+
+    window.__splineLoader.then(() => setIsSplineReady(true)).catch(() => setIsSplineReady(false));
+
+    document.head.appendChild(script);
+
+    // Intentionally no cleanup: once the custom element is registered globally,
+    // removing the script would break re-mounts while providing no benefit
+  }, []);
+
+  if (!isSplineReady) {
+    return null;
+  }
+
+  return (
+    <motion.div
+      className="pointer-events-none absolute inset-0 overflow-hidden"
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      transition={{ delay: 0.5, duration: 2, ease: "easeOut" }}
+    >
+      <spline-viewer
+        loading-anim-type="spinner-small-light"
+        url="https://prod.spline.design/wRly8TZN-e0Twb8W/scene.splinecode"
+        style={{ width: "100%", height: "100%" }}
+      />
+    </motion.div>
+  );
+}
diff --git a/apps/webapp/app/components/UserProfilePhoto.tsx b/apps/webapp/app/components/UserProfilePhoto.tsx
index 5903353d17a..99febd1c240 100644
--- a/apps/webapp/app/components/UserProfilePhoto.tsx
+++ b/apps/webapp/app/components/UserProfilePhoto.tsx
@@ -22,6 +22,7 @@ export function UserAvatar({
         className={cn("aspect-square rounded-full p-[7%]")}
         src={avatarUrl}
         alt={name ?? "User"}
+        referrerPolicy="no-referrer"
       />
     </div>
   ) : (
diff --git a/apps/webapp/app/components/billing/UpgradePrompt.tsx b/apps/webapp/app/components/billing/UpgradePrompt.tsx
index e9b0fc1c97d..8a3e098ba42 100644
--- a/apps/webapp/app/components/billing/UpgradePrompt.tsx
+++ b/apps/webapp/app/components/billing/UpgradePrompt.tsx
@@ -30,8 +30,8 @@ export function UpgradePrompt() {
         <Icon icon={ExclamationCircleIcon} className="h-5 w-5 text-error" />
         <Paragraph variant="small" className="text-error">
           You have exceeded the monthly $
-          {(plan.v3Subscription?.plan?.limits.includedUsage ?? 500) / 100} free credits. No runs
-          will execute in Prod until{" "}
+          {(plan.v3Subscription?.plan?.limits.includedUsage ?? 500) / 100} free credits. Existing
+          runs will be queued and new runs won't be created until{" "}
           <DateTime date={nextMonth} includeTime={false} timeZone="utc" />, or you upgrade.
         </Paragraph>
       </div>
diff --git a/apps/webapp/app/components/code/AIQueryInput.tsx b/apps/webapp/app/components/code/AIQueryInput.tsx
new file mode 100644
index 00000000000..0775ec2c2a0
--- /dev/null
+++ b/apps/webapp/app/components/code/AIQueryInput.tsx
@@ -0,0 +1,415 @@
+import { CheckIcon, PencilSquareIcon, PlusIcon, XMarkIcon } from "@heroicons/react/20/solid";
+import { AnimatePresence, motion } from "framer-motion";
+import { Suspense, lazy, useCallback, useEffect, useRef, useState } from "react";
+import { Button } from "~/components/primitives/Buttons";
+import { Spinner } from "~/components/primitives/Spinner";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import type { AITimeFilter } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types";
+import { cn } from "~/utils/cn";
+
+// Lazy load streamdown components to avoid SSR issues
+const StreamdownRenderer = lazy(() =>
+  import("streamdown").then((mod) => ({
+    default: ({ children, isAnimating }: { children: string; isAnimating: boolean }) => (
+      <mod.ShikiThemeContext.Provider value={["one-dark-pro", "one-dark-pro"]}>
+        <mod.Streamdown isAnimating={isAnimating}>{children}</mod.Streamdown>
+      </mod.ShikiThemeContext.Provider>
+    ),
+  }))
+);
+
+type StreamEventType =
+  | { type: "thinking"; content: string }
+  | { type: "tool_call"; tool: string; args: unknown }
+  | { type: "time_filter"; filter: AITimeFilter }
+  | { type: "result"; success: true; query: string; timeFilter?: AITimeFilter }
+  | { type: "result"; success: false; error: string };
+
+export type AIQueryMode = "new" | "edit";
+
+interface AIQueryInputProps {
+  onQueryGenerated: (query: string) => void;
+  /** Called when the AI sets a time filter - updates URL search params */
+  onTimeFilterChange?: (filter: AITimeFilter) => void;
+  /** Set this to a prompt to auto-populate and immediately submit */
+  autoSubmitPrompt?: string;
+  /** Change this to force re-submission even if prompt is the same */
+  autoSubmitKey?: number;
+  /** Get the current query in the editor (used for edit mode) */
+  getCurrentQuery?: () => string;
+}
+
+export function AIQueryInput({
+  onQueryGenerated,
+  onTimeFilterChange,
+  autoSubmitPrompt,
+  autoSubmitKey,
+  getCurrentQuery,
+}: AIQueryInputProps) {
+  const [prompt, setPrompt] = useState("");
+  const [mode, setMode] = useState<AIQueryMode>("new");
+  const [isLoading, setIsLoading] = useState(false);
+  const [thinking, setThinking] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [showThinking, setShowThinking] = useState(false);
+  const [lastResult, setLastResult] = useState<"success" | "error" | null>(null);
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+  const abortControllerRef = useRef<AbortController | null>(null);
+  const lastAutoSubmitRef = useRef<{ prompt: string; key?: number } | null>(null);
+
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  const resourcePath = `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/query/ai-generate`;
+
+  // Can only use edit mode if there's a current query
+  const canEdit = Boolean(getCurrentQuery?.()?.trim());
+
+  // If mode is edit but there's no current query, switch to new
+  useEffect(() => {
+    if (mode === "edit" && !canEdit) {
+      setMode("new");
+    }
+  }, [mode, canEdit]);
+
+  const submitQuery = useCallback(
+    async (queryPrompt: string, submitMode: AIQueryMode = mode) => {
+      if (!queryPrompt.trim() || isLoading) return;
+      const currentQuery = getCurrentQuery?.();
+      if (submitMode === "edit" && !currentQuery?.trim()) return;
+
+      setIsLoading(true);
+      setThinking("");
+      setError(null);
+      setShowThinking(true);
+      setLastResult(null);
+
+      // Abort any existing request
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+      abortControllerRef.current = new AbortController();
+
+      try {
+        const formData = new FormData();
+        formData.append("prompt", queryPrompt);
+        formData.append("mode", submitMode);
+        if (submitMode === "edit" && currentQuery) {
+          formData.append("currentQuery", currentQuery);
+        }
+
+        const response = await fetch(resourcePath, {
+          method: "POST",
+          body: formData,
+          signal: abortControllerRef.current.signal,
+        });
+
+        if (!response.ok) {
+          const errorData = (await response.json()) as { error?: string };
+          setError(errorData.error || "Failed to generate query");
+          setIsLoading(false);
+          setLastResult("error");
+          return;
+        }
+
+        const reader = response.body?.getReader();
+        if (!reader) {
+          setError("No response stream");
+          setIsLoading(false);
+          setLastResult("error");
+          return;
+        }
+
+        const decoder = new TextDecoder();
+        let buffer = "";
+
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+
+          buffer += decoder.decode(value, { stream: true });
+
+          // Process complete events from buffer
+          const lines = buffer.split("\n\n");
+          buffer = lines.pop() || ""; // Keep incomplete line in buffer
+
+          for (const line of lines) {
+            if (line.startsWith("data: ")) {
+              try {
+                const event = JSON.parse(line.slice(6)) as StreamEventType;
+                processStreamEvent(event);
+              } catch {
+                // Ignore parse errors
+              }
+            }
+          }
+        }
+
+        // Process any remaining data
+        if (buffer.startsWith("data: ")) {
+          try {
+            const event = JSON.parse(buffer.slice(6)) as StreamEventType;
+            processStreamEvent(event);
+          } catch {
+            // Ignore parse errors
+          }
+        }
+      } catch (err) {
+        if (err instanceof Error && err.name === "AbortError") {
+          // Request was aborted, ignore
+          return;
+        }
+        setError(err instanceof Error ? err.message : "An error occurred");
+        setLastResult("error");
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [isLoading, resourcePath, mode, getCurrentQuery]
+  );
+
+  const processStreamEvent = useCallback(
+    (event: StreamEventType) => {
+      switch (event.type) {
+        case "thinking":
+          setThinking((prev) => prev + event.content);
+          break;
+        case "tool_call":
+          // Tool calls are handled silently — no UI text needed
+          break;
+        case "time_filter":
+          // Apply time filter immediately when the AI sets it
+          onTimeFilterChange?.(event.filter);
+          break;
+        case "result":
+          if (event.success) {
+            // Apply time filter if included in result (backup in case time_filter event was missed)
+            if (event.timeFilter) {
+              onTimeFilterChange?.(event.timeFilter);
+            }
+            onQueryGenerated(event.query);
+            setPrompt("");
+            setLastResult("success");
+            // Keep thinking visible to show what happened
+          } else {
+            setError(event.error);
+            setLastResult("error");
+          }
+          break;
+      }
+    },
+    [onQueryGenerated, onTimeFilterChange]
+  );
+
+  const handleSubmit = useCallback(
+    (e?: React.FormEvent) => {
+      e?.preventDefault();
+      submitQuery(prompt);
+    },
+    [prompt, submitQuery]
+  );
+
+  // Auto-submit when autoSubmitPrompt or autoSubmitKey changes
+  useEffect(() => {
+    if (!autoSubmitPrompt || !autoSubmitPrompt.trim() || isLoading) {
+      return;
+    }
+
+    const last = lastAutoSubmitRef.current;
+    const isDifferent =
+      last === null || autoSubmitPrompt !== last.prompt || autoSubmitKey !== last.key;
+
+    if (isDifferent) {
+      lastAutoSubmitRef.current = { prompt: autoSubmitPrompt, key: autoSubmitKey };
+      setPrompt(autoSubmitPrompt);
+      submitQuery(autoSubmitPrompt);
+    }
+  }, [autoSubmitPrompt, autoSubmitKey, isLoading, submitQuery]);
+
+  // Cleanup on unmount
+  useEffect(() => {
+    return () => {
+      if (abortControllerRef.current) {
+        abortControllerRef.current.abort();
+      }
+    };
+  }, []);
+
+  // Auto-hide error after delay
+  useEffect(() => {
+    if (error) {
+      const timer = setTimeout(() => setError(null), 15000);
+      return () => clearTimeout(timer);
+    }
+  }, [error]);
+
+  return (
+    <div className="flex flex-col">
+      {/* Gradient border wrapper like the schedules AI input */}
+      <div
+        className="overflow-hidden rounded-md p-px"
+        style={{ background: "linear-gradient(to bottom right, #E543FF, #286399)" }}
+      >
+        <div className="overflow-hidden rounded-md bg-background-bright">
+          <form onSubmit={handleSubmit}>
+            <textarea
+              ref={textareaRef}
+              name="prompt"
+              placeholder={
+                mode === "edit"
+                  ? "e.g. add a filter for failed runs, change the limit to 50"
+                  : "e.g. show me failed runs from the last 7 days"
+              }
+              value={prompt}
+              onChange={(e) => setPrompt(e.target.value)}
+              disabled={isLoading}
+              rows={8}
+              className="m-0 min-h-10 w-full resize-none border-0 bg-background-bright px-3 py-2.5 text-sm text-text-bright scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600 file:border-0 file:bg-transparent file:text-base file:font-medium placeholder:text-text-dimmed focus:border-0 focus:outline-none focus:ring-0 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 disabled:cursor-not-allowed disabled:opacity-50"
+              onKeyDown={(e) => {
+                if (e.key === "Enter" && !e.shiftKey && prompt.trim() && !isLoading) {
+                  e.preventDefault();
+                  handleSubmit();
+                }
+              }}
+            />
+            <div className="flex justify-end gap-2 px-2 pb-2">
+              {isLoading ? (
+                <Button
+                  type="button"
+                  variant="tertiary/small"
+                  disabled={true}
+                  LeadingIcon={Spinner}
+                  className="pl-2"
+                  iconSpacing="gap-1.5"
+                >
+                  {mode === "edit" ? "Editing…" : "Generating…"}
+                </Button>
+              ) : (
+                <>
+                  <Button
+                    type="button"
+                    variant="tertiary/small"
+                    disabled={!prompt.trim()}
+                    LeadingIcon={PlusIcon}
+                    iconSpacing="gap-1.5"
+                    onClick={() => {
+                      setMode("new");
+                      submitQuery(prompt, "new");
+                    }}
+                  >
+                    New query
+                  </Button>
+                  <Button
+                    type="button"
+                    variant="tertiary/small"
+                    disabled={!prompt.trim() || !canEdit}
+                    LeadingIcon={PencilSquareIcon}
+                    className={cn(!canEdit && "opacity-50")}
+                    iconSpacing="gap-2"
+                    tooltip={!canEdit ? "Write a query first to enable editing" : undefined}
+                    onClick={() => {
+                      setMode("edit");
+                      submitQuery(prompt, "edit");
+                    }}
+                  >
+                    Edit query
+                  </Button>
+                </>
+              )}
+            </div>
+          </form>
+        </div>
+      </div>
+
+      {/* Error message */}
+      <AnimatePresence>
+        {error && (
+          <motion.div
+            initial={{ opacity: 0, height: 0 }}
+            animate={{ opacity: 1, height: "auto" }}
+            exit={{ opacity: 0, height: 0 }}
+            transition={{ duration: 0.2 }}
+            className="overflow-hidden"
+          >
+            <div className="rounded-md border border-error/30 bg-error/10 px-3 py-2 text-sm text-error">
+              {error}
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+
+      {/* Thinking panel - stays visible after completion */}
+      <AnimatePresence>
+        {showThinking && thinking && (
+          <motion.div
+            initial={{ opacity: 0, height: 0 }}
+            animate={{ opacity: 1, height: "auto" }}
+            exit={{ opacity: 0, height: 0 }}
+            transition={{ duration: 0.2 }}
+            className="overflow-hidden"
+          >
+            <div className="px-1">
+              <div className="rounded-b-lg border-x border-b border-grid-dimmed bg-charcoal-850 p-3 pb-1">
+                <div className="mb-1 flex items-center justify-between">
+                  <div className="flex items-center gap-1">
+                    {isLoading ? (
+                      <Spinner className="size-4" />
+                    ) : lastResult === "success" ? (
+                      <CheckIcon className="size-4 text-success" />
+                    ) : lastResult === "error" ? (
+                      <XMarkIcon className="size-4 text-error" />
+                    ) : null}
+                    <span className="text-xs font-medium text-text-dimmed">
+                      {isLoading
+                        ? "AI is thinking…"
+                        : lastResult === "success"
+                        ? "Query generated"
+                        : lastResult === "error"
+                        ? "Generation failed"
+                        : "AI response"}
+                    </span>
+                  </div>
+                  {isLoading ? (
+                    <Button
+                      variant="minimal/small"
+                      onClick={() => {
+                        if (abortControllerRef.current) {
+                          abortControllerRef.current.abort();
+                        }
+                        setIsLoading(false);
+                        setShowThinking(false);
+                        setThinking("");
+                      }}
+                      className="text-xs"
+                    >
+                      Cancel
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="minimal/small"
+                      onClick={() => {
+                        setShowThinking(false);
+                        setThinking("");
+                      }}
+                      className="text-xs"
+                    >
+                      Dismiss
+                    </Button>
+                  )}
+                </div>
+                <div className="streamdown-container max-h-96 overflow-y-auto text-xs text-text-dimmed scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
+                  <Suspense fallback={<p className="whitespace-pre-wrap">{thinking}</p>}>
+                    <StreamdownRenderer isAnimating={isLoading}>{thinking}</StreamdownRenderer>
+                  </Suspense>
+                </div>
+              </div>
+            </div>
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/code/ChartConfigPanel.tsx b/apps/webapp/app/components/code/ChartConfigPanel.tsx
new file mode 100644
index 00000000000..3032795c1bf
--- /dev/null
+++ b/apps/webapp/app/components/code/ChartConfigPanel.tsx
@@ -0,0 +1,624 @@
+import type { OutputColumnMetadata } from "@internal/clickhouse";
+import { IconSortAscending, IconSortDescending } from "@tabler/icons-react";
+import { BarChart, CheckIcon, LineChart, Plus, XIcon } from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { cn } from "~/utils/cn";
+import { Paragraph } from "../primitives/Paragraph";
+import { Popover, PopoverContent, PopoverTrigger } from "../primitives/Popover";
+import { Select, SelectItem } from "../primitives/Select";
+import { Switch } from "../primitives/Switch";
+import SegmentedControl from "../primitives/SegmentedControl";
+import { Button } from "../primitives/Buttons";
+import {
+  type AggregationType,
+  type ChartConfiguration,
+  type SortDirection,
+} from "../metrics/QueryWidget";
+import { CHART_COLORS_BY_HUE, getSeriesColor } from "./chartColors";
+
+export const defaultChartConfig: ChartConfiguration = {
+  chartType: "bar",
+  xAxisColumn: null,
+  yAxisColumns: [],
+  groupByColumn: null,
+  stacked: false,
+  sortByColumn: null,
+  sortDirection: "asc",
+  aggregation: "sum",
+  seriesColors: {},
+};
+
+interface ChartConfigPanelProps {
+  columns: OutputColumnMetadata[];
+  config: ChartConfiguration;
+  onChange: (config: ChartConfiguration) => void;
+  className?: string;
+}
+
+// Type detection helpers
+function isNumericType(type: string): boolean {
+  return (
+    type.startsWith("Int") ||
+    type.startsWith("UInt") ||
+    type.startsWith("Float") ||
+    type.startsWith("Decimal") ||
+    type.startsWith("Nullable(Int") ||
+    type.startsWith("Nullable(UInt") ||
+    type.startsWith("Nullable(Float") ||
+    type.startsWith("Nullable(Decimal")
+  );
+}
+
+function isDateTimeType(type: string): boolean {
+  return (
+    type === "DateTime" ||
+    type === "DateTime64" ||
+    type === "Date" ||
+    type === "Date32" ||
+    type.startsWith("DateTime64(") ||
+    type.startsWith("Nullable(DateTime") ||
+    type.startsWith("Nullable(Date")
+  );
+}
+
+function isStringType(type: string): boolean {
+  return (
+    type === "String" ||
+    type === "LowCardinality(String)" ||
+    type === "Nullable(String)" ||
+    type.startsWith("Enum") ||
+    type.startsWith("FixedString")
+  );
+}
+
+export function ChartConfigPanel({ columns, config, onChange, className }: ChartConfigPanelProps) {
+  // Categorize columns by type
+  const { numericColumns, dateTimeColumns, categoricalColumns, allColumns } = useMemo(() => {
+    const numeric: OutputColumnMetadata[] = [];
+    const dateTime: OutputColumnMetadata[] = [];
+    const categorical: OutputColumnMetadata[] = [];
+
+    for (const col of columns) {
+      if (isNumericType(col.type)) {
+        numeric.push(col);
+      }
+      if (isDateTimeType(col.type)) {
+        dateTime.push(col);
+      }
+      if (isStringType(col.type) || isDateTimeType(col.type)) {
+        categorical.push(col);
+      }
+    }
+
+    return {
+      numericColumns: numeric,
+      dateTimeColumns: dateTime,
+      categoricalColumns: categorical,
+      allColumns: columns,
+    };
+  }, [columns]);
+
+  // Create a stable key from column names and types to detect actual changes
+  const columnsKey = useMemo(() => columns.map((c) => `${c.name}:${c.type}`).join(","), [columns]);
+
+  // Use refs to access current config/onChange without adding them as dependencies
+  const configRef = useRef(config);
+  const onChangeRef = useRef(onChange);
+  useEffect(() => {
+    configRef.current = config;
+    onChangeRef.current = onChange;
+  });
+
+  // Auto-select defaults when columns change
+  useEffect(() => {
+    if (columns.length === 0) return;
+
+    const currentConfig = configRef.current;
+    let needsUpdate = false;
+    const updates: Partial<ChartConfiguration> = {};
+
+    // Auto-select X-axis (prefer datetime, then first categorical)
+    if (!currentConfig.xAxisColumn) {
+      const defaultX = dateTimeColumns[0] ?? categoricalColumns[0] ?? columns[0];
+      if (defaultX) {
+        updates.xAxisColumn = defaultX.name;
+        needsUpdate = true;
+      }
+    }
+
+    // Auto-select Y-axis (first numeric column)
+    if (currentConfig.yAxisColumns.length === 0 && numericColumns.length > 0) {
+      updates.yAxisColumns = [numericColumns[0].name];
+      needsUpdate = true;
+    }
+
+    // Determine the effective x-axis column (either existing or newly selected)
+    const effectiveXAxis = updates.xAxisColumn ?? currentConfig.xAxisColumn;
+
+    // Auto-set sort to x-axis ASC if it's a datetime column and no sort is configured
+    if (
+      effectiveXAxis &&
+      !currentConfig.sortByColumn &&
+      dateTimeColumns.some((col) => col.name === effectiveXAxis)
+    ) {
+      updates.sortByColumn = effectiveXAxis;
+      updates.sortDirection = "asc";
+      needsUpdate = true;
+    }
+
+    if (needsUpdate) {
+      onChangeRef.current({ ...currentConfig, ...updates });
+    }
+    // Only re-run when the actual column structure changes, not on every config change.
+    // columnsKey (a string) is stable when columns match, so this won't re-fire
+    // unnecessarily when the same query is re-run with identical columns.
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [columnsKey]);
+
+  const updateConfig = useCallback(
+    (updates: Partial<ChartConfiguration>) => {
+      onChange({ ...config, ...updates });
+    },
+    [config, onChange]
+  );
+
+  // X-axis options: prefer datetime and string columns at the top
+  const xAxisOptions = useMemo(() => {
+    const preferred = [
+      ...dateTimeColumns,
+      ...categoricalColumns.filter((c) => !isDateTimeType(c.type)),
+    ];
+    const preferredNames = new Set(preferred.map((c) => c.name));
+    const other = allColumns.filter((c) => !preferredNames.has(c.name));
+
+    const options: Array<{ value: string; label: string; type: string }> = [];
+
+    for (const col of preferred) {
+      options.push({ value: col.name, label: col.name, type: col.type });
+    }
+    for (const col of other) {
+      options.push({ value: col.name, label: col.name, type: col.type });
+    }
+
+    return options;
+  }, [allColumns, dateTimeColumns, categoricalColumns]);
+
+  // Y-axis options: numeric columns only
+  const yAxisOptions = useMemo(() => {
+    return numericColumns.map((col) => ({
+      value: col.name,
+      label: col.name,
+      type: col.type,
+    }));
+  }, [numericColumns]);
+
+  // Aggregation options
+  const aggregationOptions = [
+    { value: "sum", label: "Sum" },
+    { value: "avg", label: "Average" },
+    { value: "count", label: "Count" },
+    { value: "min", label: "Min" },
+    { value: "max", label: "Max" },
+  ];
+
+  // Group by options: categorical columns (excluding selected X axis)
+  const groupByOptions = useMemo(() => {
+    const options = categoricalColumns
+      .filter((col) => col.name !== config.xAxisColumn)
+      .map((col) => ({
+        value: col.name,
+        label: col.name,
+        type: col.type,
+      }));
+
+    return [{ value: "__none__", label: "None", type: "" }, ...options];
+  }, [categoricalColumns, config.xAxisColumn]);
+
+  // Sort by options: all columns
+  const sortByOptions = useMemo(() => {
+    const options = allColumns.map((col) => ({
+      value: col.name,
+      label: col.name,
+      type: col.type,
+    }));
+
+    return [{ value: "__none__", label: "None", type: "" }, ...options];
+  }, [allColumns]);
+
+  if (columns.length === 0) {
+    return (
+      <div className={cn("flex items-center justify-center p-4", className)}>
+        <Paragraph variant="small" className="text-text-dimmed">
+          Run a query to configure the chart
+        </Paragraph>
+      </div>
+    );
+  }
+
+  return (
+    <div className={cn("flex flex-col gap-3 p-2", className)}>
+      {/* Chart Type */}
+      <div className="flex flex-col gap-3">
+        <ConfigField label="Type">
+          <SegmentedControl
+            name="chartType"
+            value={config.chartType}
+            variant="secondary/small"
+            options={[
+              {
+                label: (
+                  <span className="flex items-center gap-1">
+                    <BarChart className="size-3" /> Bar
+                  </span>
+                ),
+                value: "bar",
+              },
+              {
+                label: (
+                  <span className="flex items-center gap-1">
+                    <LineChart className="size-3" /> Line
+                  </span>
+                ),
+                value: "line",
+              },
+            ]}
+            onChange={(value) => updateConfig({ chartType: value as "bar" | "line" })}
+          />
+        </ConfigField>
+      </div>
+
+      <div className="flex flex-col gap-3">
+        {/* X-Axis */}
+        <ConfigField label="X-Axis">
+          <Select
+            value={config.xAxisColumn ?? ""}
+            setValue={(value) => {
+              const updates: Partial<ChartConfiguration> = { xAxisColumn: value || null };
+              // Auto-set sort to x-axis ASC if selecting a datetime column
+              if (value) {
+                const selectedCol = columns.find((c) => c.name === value);
+                if (selectedCol && isDateTimeType(selectedCol.type)) {
+                  updates.sortByColumn = value;
+                  updates.sortDirection = "asc";
+                }
+              }
+              updateConfig(updates);
+            }}
+            variant="tertiary/small"
+            placeholder="Select column"
+            items={xAxisOptions}
+            dropdownIcon
+            className="min-w-[140px]"
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  <span className="flex items-center gap-2">
+                    <span>{item.label}</span>
+                    <TypeBadge type={item.type} />
+                  </span>
+                </SelectItem>
+              ))
+            }
+          </Select>
+        </ConfigField>
+
+        {/* Y-Axis / Series */}
+        <ConfigField label={config.yAxisColumns.length > 1 ? "Series" : "Y-Axis"}>
+          {yAxisOptions.length === 0 ? (
+            <span className="text-xs text-text-dimmed">No numeric columns</span>
+          ) : (
+            <div className="flex flex-col gap-1.5">
+              {/* Always show at least one dropdown, even if yAxisColumns is empty */}
+              {(config.yAxisColumns.length === 0 ? [""] : config.yAxisColumns).map((col, index) => (
+                <div key={index} className="flex items-center gap-1">
+                  {col && !config.groupByColumn && (
+                    <SeriesColorPicker
+                      color={config.seriesColors?.[col] ?? getSeriesColor(index)}
+                      onColorChange={(color) => {
+                        updateConfig({
+                          seriesColors: { ...config.seriesColors, [col]: color },
+                        });
+                      }}
+                    />
+                  )}
+                  <Select
+                    value={col}
+                    setValue={(value) => {
+                      const newColumns = [...config.yAxisColumns];
+                      const updates: Partial<ChartConfiguration> = {};
+                      if (value) {
+                        // If this is a new slot (empty string), add it
+                        if (index >= config.yAxisColumns.length) {
+                          newColumns.push(value);
+                        } else {
+                          // If the column name changed, migrate the color
+                          const oldCol = newColumns[index];
+                          if (oldCol && oldCol !== value && config.seriesColors?.[oldCol]) {
+                            const newSeriesColors = { ...config.seriesColors };
+                            newSeriesColors[value] = newSeriesColors[oldCol];
+                            delete newSeriesColors[oldCol];
+                            updates.seriesColors = newSeriesColors;
+                          }
+                          newColumns[index] = value;
+                        }
+                      } else if (index < config.yAxisColumns.length) {
+                        newColumns.splice(index, 1);
+                      }
+                      updateConfig({ ...updates, yAxisColumns: newColumns });
+                    }}
+                    variant="tertiary/small"
+                    placeholder="Select column"
+                    items={yAxisOptions.filter(
+                      (opt) => opt.value === col || !config.yAxisColumns.includes(opt.value)
+                    )}
+                    dropdownIcon
+                    className="min-w-[140px] flex-1"
+                  >
+                    {(items) =>
+                      items.map((item) => (
+                        <SelectItem key={item.value} value={item.value}>
+                          <span className="flex items-center gap-2">
+                            <span>{item.label}</span>
+                            <TypeBadge type={item.type} />
+                          </span>
+                        </SelectItem>
+                      ))
+                    }
+                  </Select>
+
+                  {index > 0 && (
+                    <button
+                      type="button"
+                      onClick={() => {
+                        const removedCol = config.yAxisColumns[index];
+                        const newColumns = config.yAxisColumns.filter((_, i) => i !== index);
+                        const updates: Partial<ChartConfiguration> = { yAxisColumns: newColumns };
+                        // Clean up the color entry for the removed series
+                        if (removedCol && config.seriesColors?.[removedCol]) {
+                          const newSeriesColors = { ...config.seriesColors };
+                          delete newSeriesColors[removedCol];
+                          updates.seriesColors = newSeriesColors;
+                        }
+                        updateConfig(updates);
+                      }}
+                      className="rounded p-1 text-text-dimmed hover:bg-charcoal-700 hover:text-text-bright"
+                      title="Remove series"
+                    >
+                      <XIcon className="h-3.5 w-3.5" />
+                    </button>
+                  )}
+                </div>
+              ))}
+
+              {/* Add another series button - only show when we have at least one series and not grouped */}
+              {config.yAxisColumns.length > 0 &&
+                config.yAxisColumns.length < yAxisOptions.length &&
+                !config.groupByColumn && (
+                  <button
+                    type="button"
+                    onClick={() => {
+                      const availableColumns = yAxisOptions.filter(
+                        (opt) => !config.yAxisColumns.includes(opt.value)
+                      );
+                      if (availableColumns.length > 0) {
+                        updateConfig({
+                          yAxisColumns: [...config.yAxisColumns, availableColumns[0].value],
+                        });
+                      }
+                    }}
+                    className="flex items-center gap-1 self-start rounded px-1 py-0.5 text-xs text-text-dimmed hover:bg-charcoal-700 hover:text-text-bright"
+                  >
+                    <Plus className="h-3 w-3" />
+                    Add series
+                  </button>
+                )}
+
+              {config.groupByColumn && config.yAxisColumns.length === 1 && (
+                <span className="text-xxs text-text-dimmed">
+                  Remove group by to add multiple series
+                </span>
+              )}
+            </div>
+          )}
+        </ConfigField>
+
+        {/* Aggregation */}
+        <ConfigField label="Aggregation">
+          <Select
+            value={config.aggregation}
+            setValue={(value) => updateConfig({ aggregation: value as AggregationType })}
+            variant="tertiary/small"
+            items={aggregationOptions}
+            dropdownIcon
+            className="min-w-[100px]"
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  {item.label}
+                </SelectItem>
+              ))
+            }
+          </Select>
+        </ConfigField>
+
+        {/* Group By - disabled when multiple series are selected */}
+        <ConfigField label="Group by">
+          {config.yAxisColumns.length > 1 ? (
+            <span className="text-xs text-text-dimmed">Not available with multiple series</span>
+          ) : (
+            <Select
+              value={config.groupByColumn ?? "__none__"}
+              setValue={(value) =>
+                updateConfig({ groupByColumn: value === "__none__" ? null : value })
+              }
+              variant="tertiary/small"
+              placeholder="None"
+              items={groupByOptions}
+              dropdownIcon
+              className="min-w-[140px]"
+              text={(t) => (t === "__none__" ? "None" : t)}
+            >
+              {(items) =>
+                items.map((item) => (
+                  <SelectItem key={item.value} value={item.value}>
+                    <span className="flex items-center gap-2">
+                      <span>{item.label}</span>
+                      {item.type && <TypeBadge type={item.type} />}
+                    </span>
+                  </SelectItem>
+                ))
+              }
+            </Select>
+          )}
+        </ConfigField>
+
+        {/* Stacked toggle (when grouped or multiple series) */}
+        {(config.groupByColumn || config.yAxisColumns.length > 1) && (
+          <ConfigField label={config.groupByColumn ? "Stack groups" : "Stack series"}>
+            <Switch
+              variant="medium"
+              checked={config.stacked}
+              onCheckedChange={(checked) => updateConfig({ stacked: checked })}
+            />
+          </ConfigField>
+        )}
+
+        {/* Order By */}
+        <ConfigField label="Order by">
+          <Select
+            value={config.sortByColumn ?? "__none__"}
+            setValue={(value) =>
+              updateConfig({ sortByColumn: value === "__none__" ? null : value })
+            }
+            variant="tertiary/small"
+            placeholder="None"
+            items={sortByOptions}
+            dropdownIcon
+            className="min-w-[140px]"
+            text={(t) => (t === "__none__" ? "None" : t)}
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  <span className="flex items-center gap-2">
+                    <span>{item.label}</span>
+                    {item.type && <TypeBadge type={item.type} />}
+                  </span>
+                </SelectItem>
+              ))
+            }
+          </Select>
+        </ConfigField>
+
+        {/* Sort Direction (only when sorting) */}
+        {config.sortByColumn && (
+          <ConfigField label="Sort direction">
+            <SegmentedControl
+              name="sortDirection"
+              value={config.sortDirection}
+              variant="secondary/small"
+              options={[
+                {
+                  label: (
+                    <span className="flex items-center gap-1">
+                      <IconSortAscending className="size-3" /> Asc
+                    </span>
+                  ),
+                  value: "asc",
+                },
+                {
+                  label: (
+                    <span className="flex items-center gap-1">
+                      <IconSortDescending className="size-3" /> Desc
+                    </span>
+                  ),
+                  value: "desc",
+                },
+              ]}
+              onChange={(value) => updateConfig({ sortDirection: value as SortDirection })}
+            />
+          </ConfigField>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function ConfigField({ label, children }: { label: string; children: React.ReactNode }) {
+  return (
+    <div className="flex flex-col gap-1">
+      {label && <span className="text-xs text-text-bright">{label}</span>}
+      {children}
+    </div>
+  );
+}
+
+function SeriesColorPicker({
+  color,
+  onColorChange,
+}: {
+  color: string;
+  onColorChange: (color: string) => void;
+}) {
+  const [open, setOpen] = useState(false);
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <button
+          type="button"
+          className="flex-shrink-0 rounded p-0.5 hover:bg-charcoal-700"
+          title="Change series color"
+        >
+          <span
+            className="block h-4 w-4 rounded-full border border-white/30"
+            style={{ backgroundColor: color }}
+          />
+        </button>
+      </PopoverTrigger>
+      <PopoverContent align="start" className="w-auto p-2">
+        <div className="grid grid-cols-6 gap-1.5">
+          {CHART_COLORS_BY_HUE.map((c) => (
+            <button
+              key={c}
+              type="button"
+              onClick={() => {
+                onColorChange(c);
+                setOpen(false);
+              }}
+              className="group/swatch flex h-6 w-6 items-center justify-center rounded-full border border-white/30"
+              style={{ backgroundColor: c }}
+              title={c}
+            >
+              {c === color && <CheckIcon className="h-3.5 w-3.5 text-white drop-shadow-md" />}
+            </button>
+          ))}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function TypeBadge({ type }: { type: string }) {
+  // Simplify type for display
+  let displayType = type;
+  if (type.startsWith("Nullable(")) {
+    displayType = type.slice(9, -1) + "?";
+  }
+  if (type.startsWith("LowCardinality(")) {
+    displayType = type.slice(15, -1);
+  }
+
+  // Shorten long type names
+  if (displayType.length > 12) {
+    displayType = displayType.slice(0, 10) + "…";
+  }
+
+  return (
+    <span className="rounded bg-charcoal-750 px-1 py-0.5 font-mono text-xxs text-text-dimmed">
+      {displayType}
+    </span>
+  );
+}
diff --git a/apps/webapp/app/components/code/CodeBlock.tsx b/apps/webapp/app/components/code/CodeBlock.tsx
index ca6200a18bb..8757acc324e 100644
--- a/apps/webapp/app/components/code/CodeBlock.tsx
+++ b/apps/webapp/app/components/code/CodeBlock.tsx
@@ -5,6 +5,7 @@ import { Highlight, Prism } from "prism-react-renderer";
 import { forwardRef, ReactNode, useCallback, useEffect, useState } from "react";
 import { TextWrapIcon } from "~/assets/icons/TextWrapIcon";
 import { cn } from "~/utils/cn";
+import { highlightSearchText } from "~/utils/logUtils";
 import { Button } from "../primitives/Buttons";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "../primitives/Dialog";
 import { Paragraph } from "../primitives/Paragraph";
@@ -20,6 +21,8 @@ async function setup() {
   await import("prismjs/components/prism-json");
   //@ts-ignore
   await import("prismjs/components/prism-typescript");
+  //@ts-ignore
+  await import("prismjs/components/prism-sql.js");
 }
 setup();
 
@@ -62,6 +65,12 @@ type CodeBlockProps = {
 
   /** Whether to show the open in modal button */
   showOpenInModal?: boolean;
+
+  /** Search term to highlight in the code */
+  searchTerm?: string;
+
+  /** Whether to wrap the code */
+  wrap?: boolean;
 };
 
 const dimAmount = 0.5;
@@ -86,11 +95,17 @@ const defaultTheme: PrismTheme = {
       },
     },
     {
-      types: ["property", "tag", "boolean", "number", "constant", "symbol", "deleted"],
+      types: ["property", "tag", "constant", "symbol", "deleted"],
       style: {
         color: "#9B99FF",
       },
     },
+    {
+      types: ["boolean", "number"],
+      style: {
+        color: "#E5C07B",
+      },
+    },
     {
       types: ["selector", "attr-name", "string", "char", "builtin", "inserted"],
       style: {
@@ -151,12 +166,6 @@ const defaultTheme: PrismTheme = {
         color: "#F85149",
       },
     },
-    {
-      types: ["boolean"],
-      style: {
-        color: "#9B99FF",
-      },
-    },
     {
       types: ["char"],
       style: {
@@ -200,6 +209,8 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
       showChrome = false,
       fileName,
       rowTitle,
+      searchTerm,
+      wrap = false,
       ...props
     }: CodeBlockProps,
     ref
@@ -208,7 +219,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
     const [copied, setCopied] = useState(false);
     const [modalCopied, setModalCopied] = useState(false);
     const [isModalOpen, setIsModalOpen] = useState(false);
-    const [isWrapped, setIsWrapped] = useState(false);
+    const [isWrapped, setIsWrapped] = useState(wrap);
 
     const onCopied = useCallback(
       (event: React.MouseEvent<HTMLButtonElement>) => {
@@ -236,7 +247,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
       [code]
     );
 
-    code = code.trim();
+    code = code?.trim() ?? "";
     const lineCount = code.split("\n").length;
     const maxLineWidth = lineCount.toString().length;
     let maxHeight: string | undefined = undefined;
@@ -338,6 +349,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
               className="px-2 py-3"
               preClassName="text-xs"
               isWrapped={isWrapped}
+              searchTerm={searchTerm}
             />
           ) : (
             <div
@@ -358,7 +370,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
                 )}
                 dir="ltr"
               >
-                {code}
+                {highlightSearchText(code, searchTerm)}
               </pre>
             </div>
           )}
@@ -400,7 +412,7 @@ export const CodeBlock = forwardRef<HTMLDivElement, CodeBlockProps>(
                 className="overflow-auto px-3 py-3 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
               >
                 <pre className="relative mr-2 p-2 font-mono text-base leading-relaxed" dir="ltr">
-                  {code}
+                  {highlightSearchText(code, searchTerm)}
                 </pre>
               </div>
             )}
@@ -449,6 +461,7 @@ type HighlightCodeProps = {
   className?: string;
   preClassName?: string;
   isWrapped: boolean;
+  searchTerm?: string;
 };
 
 function HighlightCode({
@@ -461,6 +474,7 @@ function HighlightCode({
   className,
   preClassName,
   isWrapped,
+  searchTerm,
 }: HighlightCodeProps) {
   const [isLoaded, setIsLoaded] = useState(false);
 
@@ -470,6 +484,8 @@ function HighlightCode({
       import("prismjs/components/prism-json"),
       //@ts-ignore
       import("prismjs/components/prism-typescript"),
+      //@ts-ignore
+      import("prismjs/components/prism-sql.js"),
     ]).then(() => setIsLoaded(true));
   }, []);
 
@@ -552,6 +568,10 @@ function HighlightCode({
                     <div className="flex-1">
                       {line.map((token, key) => {
                         const tokenProps = getTokenProps({ token, key });
+
+                        // Highlight search term matches in token
+                        const content = highlightSearchText(token.content, searchTerm);
+
                         return (
                           <span
                             key={key}
@@ -560,7 +580,9 @@ function HighlightCode({
                               color: tokenProps?.style?.color as string,
                               ...tokenProps.style,
                             }}
-                          />
+                          >
+                            {content}
+                          </span>
                         );
                       })}
                     </div>
diff --git a/apps/webapp/app/components/code/QueryResultsChart.tsx b/apps/webapp/app/components/code/QueryResultsChart.tsx
new file mode 100644
index 00000000000..2da90c9e006
--- /dev/null
+++ b/apps/webapp/app/components/code/QueryResultsChart.tsx
@@ -0,0 +1,1249 @@
+import type { ColumnFormatType, OutputColumnMetadata } from "@internal/clickhouse";
+import { formatDurationMilliseconds } from "@trigger.dev/core/v3";
+import { BarChart3, LineChart } from "lucide-react";
+import { memo, useMemo } from "react";
+import { createValueFormatter } from "~/utils/columnFormat";
+import { formatCurrencyAccurate } from "~/utils/numberFormatter";
+import type { ChartConfig } from "~/components/primitives/charts/Chart";
+import { Chart } from "~/components/primitives/charts/ChartCompound";
+import { ChartBlankState } from "../primitives/charts/ChartBlankState";
+import { Callout } from "../primitives/Callout";
+import type { AggregationType, ChartConfiguration } from "../metrics/QueryWidget";
+import { aggregateValues } from "../primitives/charts/aggregation";
+import { getRunStatusHexColor } from "~/components/runs/v3/TaskRunStatus";
+import { getSeriesColor } from "./chartColors";
+
+const MAX_SERIES = 50;
+const MAX_SVG_ELEMENT_BUDGET = 6_000;
+const MIN_DATA_POINTS = 100;
+const MAX_DATA_POINTS = 500;
+
+interface QueryResultsChartProps {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+  config: ChartConfiguration;
+  /** The effective time range from the query filter (used to show the full x-axis period) */
+  timeRange?: { from: string; to: string };
+  fullLegend?: boolean;
+  /** Callback when "View all" legend button is clicked */
+  onViewAllLegendItems?: () => void;
+  /** When true, constrains legend to max 50% height with scrolling */
+  legendScrollable?: boolean;
+  isLoading?: boolean;
+}
+
+interface TransformedData {
+  data: Record<string, unknown>[];
+  series: string[];
+  /** Total number of series before any truncation (equals series.length when no truncation) */
+  totalSeriesCount: number;
+  /** Raw date values for determining formatting granularity */
+  dateValues: Date[];
+  /** Whether the x-axis is date-based (continuous time scale) */
+  isDateBased: boolean;
+  /** The data key to use for x-axis (column name or '__timestamp' for dates) */
+  xDataKey: string;
+  /** Min/max timestamps for domain when date-based */
+  timeDomain: [number, number] | null;
+  /** Pre-calculated tick values for the time axis */
+  timeTicks: number[] | null;
+}
+
+/**
+ * Time granularity levels for date formatting
+ */
+type TimeGranularity = "seconds" | "minutes" | "hours" | "days" | "weeks" | "months" | "years";
+
+/**
+ * Determines the appropriate time granularity based on the date range
+ */
+function detectTimeGranularity(dates: Date[]): TimeGranularity {
+  if (dates.length < 2) return "days";
+
+  const sorted = [...dates].sort((a, b) => a.getTime() - b.getTime());
+  const minDate = sorted[0];
+  const maxDate = sorted[sorted.length - 1];
+  const rangeMs = maxDate.getTime() - minDate.getTime();
+
+  const SECOND = 1000;
+  const MINUTE = 60 * SECOND;
+  const HOUR = 60 * MINUTE;
+  const DAY = 24 * HOUR;
+  const WEEK = 7 * DAY;
+  const MONTH = 30 * DAY;
+  const YEAR = 365 * DAY;
+
+  // Choose granularity based on range
+  if (rangeMs <= 5 * MINUTE) return "seconds"; // < 5 minutes → show seconds
+  if (rangeMs <= 2 * HOUR) return "minutes"; // < 2 hours → show minutes
+  if (rangeMs <= 2 * DAY) return "hours"; // < 2 days → show hours
+  if (rangeMs <= 2 * WEEK) return "days"; // < 2 weeks → show days
+  if (rangeMs <= 3 * MONTH) return "weeks"; // < 3 months → show weeks
+  if (rangeMs <= 2 * YEAR) return "months"; // < 2 years → show months
+  return "years"; // >= 2 years → show years
+}
+
+/**
+ * Formats a date for the X-axis based on the detected granularity
+ */
+function formatDateByGranularity(date: Date, granularity: TimeGranularity): string {
+  switch (granularity) {
+    case "seconds":
+      // "10:30:45"
+      return date.toLocaleTimeString("en-US", {
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: false,
+      });
+    case "minutes":
+      // "10:30"
+      return date.toLocaleTimeString("en-US", {
+        hour: "2-digit",
+        minute: "2-digit",
+        hour12: false,
+      });
+    case "hours":
+      // "Jan 15 10:00"
+      return `${date.toLocaleDateString("en-US", {
+        month: "short",
+        day: "numeric",
+      })} ${date.toLocaleTimeString("en-US", {
+        hour: "2-digit",
+        minute: "2-digit",
+        hour12: false,
+      })}`;
+    case "days":
+      // "Jan 15"
+      return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+    case "weeks":
+      // "Jan 15"
+      return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+    case "months":
+      // "Jan 2024"
+      return date.toLocaleDateString("en-US", { month: "short", year: "numeric" });
+    case "years":
+      // "2024"
+      return date.toLocaleDateString("en-US", { year: "numeric" });
+    default:
+      return date.toLocaleDateString("en-US", { month: "short", day: "numeric" });
+  }
+}
+
+/**
+ * Snap a millisecond value up to the nearest "nice" interval
+ */
+function snapToNiceInterval(ms: number): number {
+  const SECOND = 1000;
+  const MINUTE = 60 * SECOND;
+  const HOUR = 60 * MINUTE;
+  const DAY = 24 * HOUR;
+
+  if (ms <= SECOND) return SECOND;
+  if (ms <= 5 * SECOND) return 5 * SECOND;
+  if (ms <= 10 * SECOND) return 10 * SECOND;
+  if (ms <= 15 * SECOND) return 15 * SECOND;
+  if (ms <= 30 * SECOND) return 30 * SECOND;
+  if (ms <= MINUTE) return MINUTE;
+  if (ms <= 5 * MINUTE) return 5 * MINUTE;
+  if (ms <= 10 * MINUTE) return 10 * MINUTE;
+  if (ms <= 15 * MINUTE) return 15 * MINUTE;
+  if (ms <= 30 * MINUTE) return 30 * MINUTE;
+  if (ms <= HOUR) return HOUR;
+  if (ms <= 2 * HOUR) return 2 * HOUR;
+  if (ms <= 4 * HOUR) return 4 * HOUR;
+  if (ms <= 6 * HOUR) return 6 * HOUR;
+  if (ms <= 12 * HOUR) return 12 * HOUR;
+  if (ms <= DAY) return DAY;
+
+  return ms;
+}
+
+/**
+ * Detect the most common interval between consecutive data points
+ * This helps us understand the natural granularity of the data
+ */
+function detectDataInterval(timestamps: number[]): number {
+  if (timestamps.length < 2) return 24 * 60 * 60 * 1000; // Default to 1 day
+
+  const sorted = [...timestamps].sort((a, b) => a - b);
+  const gaps: number[] = [];
+
+  for (let i = 1; i < sorted.length; i++) {
+    const gap = sorted[i] - sorted[i - 1];
+    if (gap > 0) {
+      gaps.push(gap);
+    }
+  }
+
+  if (gaps.length === 0) return 60 * 1000;
+
+  // Find the most common small gap (this is likely the data's natural interval)
+  // We use the minimum gap as a heuristic for the data interval
+  const minGap = Math.min(...gaps);
+
+  return snapToNiceInterval(minGap);
+}
+
+/**
+ * Fill in missing time slots with zero values
+ * This ensures the chart shows gaps as zeros rather than connecting distant points
+ */
+function fillTimeGaps(
+  data: Record<string, unknown>[],
+  xDataKey: string,
+  series: string[],
+  minTime: number,
+  maxTime: number,
+  interval: number,
+  granularity: TimeGranularity,
+  aggregation: AggregationType,
+  maxPoints = 1000
+): Record<string, unknown>[] {
+  const range = maxTime - minTime;
+  const estimatedPoints = Math.ceil(range / interval);
+
+  // If filling would create too many points, increase the interval to stay within limits
+  let effectiveInterval = interval;
+  if (estimatedPoints > maxPoints) {
+    effectiveInterval = snapToNiceInterval(Math.ceil(range / maxPoints));
+  }
+
+  // Create a map to collect values for each bucket (for aggregation)
+  const bucketData = new Map<
+    number,
+    { values: Record<string, number[]>; rawDate: Date; originalX: string }
+  >();
+
+  for (const point of data) {
+    const timestamp = point[xDataKey] as number;
+    // Bucket to the nearest interval
+    const bucketedTime = Math.floor(timestamp / effectiveInterval) * effectiveInterval;
+
+    if (!bucketData.has(bucketedTime)) {
+      bucketData.set(bucketedTime, {
+        values: Object.fromEntries(series.map((s) => [s, []])),
+        rawDate: new Date(bucketedTime),
+        originalX: new Date(bucketedTime).toISOString(),
+      });
+    }
+
+    const bucket = bucketData.get(bucketedTime)!;
+    for (const s of series) {
+      const val = point[s] as number;
+      if (typeof val === "number") {
+        bucket.values[s].push(val);
+      }
+    }
+  }
+
+  // Generate all time slots and fill with zeros where missing
+  const filledData: Record<string, unknown>[] = [];
+  const startTime = Math.floor(minTime / effectiveInterval) * effectiveInterval;
+
+  for (let t = startTime; t <= maxTime; t += effectiveInterval) {
+    const bucket = bucketData.get(t);
+    if (bucket) {
+      // Apply aggregation to collected values
+      const point: Record<string, unknown> = {
+        [xDataKey]: t,
+        __rawDate: bucket.rawDate,
+        __granularity: granularity,
+        __originalX: bucket.originalX,
+      };
+      for (const s of series) {
+        point[s] = aggregateValues(bucket.values[s], aggregation);
+      }
+      filledData.push(point);
+    } else {
+      // Create a null-filled data point so gaps appear in line/bar charts
+      // and legend aggregations (avg/min/max) skip these slots
+      const gapPoint: Record<string, unknown> = {
+        [xDataKey]: t,
+        __rawDate: new Date(t),
+        __granularity: granularity,
+        __originalX: new Date(t).toISOString(),
+      };
+      for (const s of series) {
+        gapPoint[s] = null;
+      }
+      filledData.push(gapPoint);
+    }
+  }
+
+  return filledData;
+}
+
+/**
+ * "Nice" intervals for time axes - these create human-friendly tick marks
+ */
+const NICE_TIME_INTERVALS = [
+  { value: 1000, label: "1s" }, // 1 second
+  { value: 5 * 1000, label: "5s" }, // 5 seconds
+  { value: 10 * 1000, label: "10s" }, // 10 seconds
+  { value: 30 * 1000, label: "30s" }, // 30 seconds
+  { value: 60 * 1000, label: "1m" }, // 1 minute
+  { value: 5 * 60 * 1000, label: "5m" }, // 5 minutes
+  { value: 10 * 60 * 1000, label: "10m" }, // 10 minutes
+  { value: 15 * 60 * 1000, label: "15m" }, // 15 minutes
+  { value: 30 * 60 * 1000, label: "30m" }, // 30 minutes
+  { value: 60 * 60 * 1000, label: "1h" }, // 1 hour
+  { value: 2 * 60 * 60 * 1000, label: "2h" }, // 2 hours
+  { value: 3 * 60 * 60 * 1000, label: "3h" }, // 3 hours
+  { value: 4 * 60 * 60 * 1000, label: "4h" }, // 4 hours
+  { value: 6 * 60 * 60 * 1000, label: "6h" }, // 6 hours
+  { value: 12 * 60 * 60 * 1000, label: "12h" }, // 12 hours
+  { value: 24 * 60 * 60 * 1000, label: "1d" }, // 1 day
+  { value: 2 * 24 * 60 * 60 * 1000, label: "2d" }, // 2 days
+  { value: 7 * 24 * 60 * 60 * 1000, label: "1w" }, // 1 week
+  { value: 14 * 24 * 60 * 60 * 1000, label: "2w" }, // 2 weeks
+  { value: 30 * 24 * 60 * 60 * 1000, label: "1mo" }, // ~1 month
+  { value: 90 * 24 * 60 * 60 * 1000, label: "3mo" }, // ~3 months
+  { value: 180 * 24 * 60 * 60 * 1000, label: "6mo" }, // ~6 months
+  { value: 365 * 24 * 60 * 60 * 1000, label: "1y" }, // 1 year
+];
+
+/**
+ * Generate evenly-spaced tick values for a time axis using "nice" intervals
+ * that align to natural time boundaries (midnight, noon, hour marks, etc.)
+ */
+function generateTimeTicks(minTime: number, maxTime: number, maxTicks = 8): number[] {
+  const range = maxTime - minTime;
+
+  if (range <= 0) {
+    return [minTime];
+  }
+
+  // Find the best "nice" interval that gives us a reasonable number of ticks
+  // Target: between 4 and maxTicks ticks
+  let chosenInterval = NICE_TIME_INTERVALS[NICE_TIME_INTERVALS.length - 1].value;
+
+  for (const { value: interval } of NICE_TIME_INTERVALS) {
+    const tickCount = Math.ceil(range / interval);
+    if (tickCount <= maxTicks && tickCount >= 2) {
+      chosenInterval = interval;
+      break;
+    }
+  }
+
+  // Align the start tick to a nice boundary
+  // For intervals >= 1 day, align to midnight
+  // For intervals >= 1 hour, align to hour boundary
+  // For intervals >= 1 minute, align to minute boundary
+  const DAY = 24 * 60 * 60 * 1000;
+  const HOUR = 60 * 60 * 1000;
+  const MINUTE = 60 * 1000;
+
+  let alignTo: number;
+  if (chosenInterval >= DAY) {
+    // Align to midnight UTC (or we could use local midnight)
+    alignTo = DAY;
+  } else if (chosenInterval >= HOUR) {
+    alignTo = chosenInterval; // Align to the interval itself for hours
+  } else if (chosenInterval >= MINUTE) {
+    alignTo = chosenInterval;
+  } else {
+    alignTo = chosenInterval;
+  }
+
+  // Round down to the alignment boundary, then find first tick at or before minTime
+  const startTick = Math.floor(minTime / alignTo) * alignTo;
+
+  // Generate ticks
+  const ticks: number[] = [];
+  for (let t = startTick; t <= maxTime + chosenInterval; t += chosenInterval) {
+    if (t >= minTime - chosenInterval * 0.1 && t <= maxTime + chosenInterval * 0.1) {
+      ticks.push(t);
+    }
+  }
+
+  // Ensure we have at least 2 ticks
+  if (ticks.length < 2) {
+    return [minTime, maxTime];
+  }
+
+  return ticks;
+}
+
+/**
+ * Formats a date for tooltips and legend headers.
+ * Always includes time when the data point has a non-midnight time,
+ * so hovering a specific bar at e.g. 14:00 shows the full timestamp
+ * even when the axis labels only show the day.
+ * Seconds are shown whenever the granularity is "seconds" or the
+ * specific data point has non-zero seconds.
+ */
+function formatDateForTooltip(date: Date, granularity: TimeGranularity): string {
+  const hasTime = date.getHours() !== 0 || date.getMinutes() !== 0 || date.getSeconds() !== 0;
+  const hasSeconds = date.getSeconds() !== 0;
+
+  if (
+    granularity === "seconds" ||
+    (hasTime && granularity !== "months" && granularity !== "years")
+  ) {
+    return date.toLocaleString("en-US", {
+      month: "short",
+      day: "numeric",
+      year: "numeric",
+      hour: "2-digit",
+      minute: "2-digit",
+      second: granularity === "seconds" || hasSeconds ? "2-digit" : undefined,
+      hour12: false,
+    });
+  }
+
+  return date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+  });
+}
+
+/**
+ * Try to parse a value as a Date
+ */
+function tryParseDate(value: unknown): Date | null {
+  if (value instanceof Date) {
+    return isNaN(value.getTime()) ? null : value;
+  }
+  if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}/.test(value)) {
+    const date = new Date(value);
+    return isNaN(date.getTime()) ? null : date;
+  }
+  if (typeof value === "number") {
+    // First, try treating the number as milliseconds
+    const dateAsMs = new Date(value);
+    if (
+      !isNaN(dateAsMs.getTime()) &&
+      dateAsMs.getFullYear() >= 1970 &&
+      dateAsMs.getFullYear() <= 2100
+    ) {
+      return dateAsMs;
+    }
+    // If that fails, try treating the number as seconds (Unix timestamp)
+    const dateAsSec = new Date(value * 1000);
+    if (
+      !isNaN(dateAsSec.getTime()) &&
+      dateAsSec.getFullYear() >= 1970 &&
+      dateAsSec.getFullYear() <= 2100
+    ) {
+      return dateAsSec;
+    }
+  }
+  return null;
+}
+
+/**
+ * Transform raw query results into chart-ready data
+ *
+ * When grouped:
+ * - Pivots data so each unique group value becomes a separate series
+ * - Each row in output has xAxis value + one key per group value
+ *
+ * When not grouped:
+ * - Uses Y-axis columns directly as series
+ *
+ * For date-based x-axes:
+ * - Uses numeric timestamps so the chart renders with a continuous time scale
+ * - This ensures gaps in data are visually apparent
+ */
+function transformDataForChart(
+  rows: Record<string, unknown>[],
+  config: ChartConfiguration,
+  timeRange?: { from: string; to: string }
+): TransformedData {
+  const { xAxisColumn, yAxisColumns, groupByColumn, aggregation } = config;
+
+  if (!xAxisColumn || yAxisColumns.length === 0) {
+    return {
+      data: [],
+      series: [],
+      totalSeriesCount: 0,
+      dateValues: [],
+      isDateBased: false,
+      xDataKey: xAxisColumn || "",
+      timeDomain: null,
+      timeTicks: null,
+    };
+  }
+
+  // Collect date values for granularity detection
+  const dateValues: Date[] = [];
+  for (const row of rows) {
+    const date = tryParseDate(row[xAxisColumn]);
+    if (date) {
+      dateValues.push(date);
+    }
+  }
+
+  // Determine if X-axis is date-based (most values should be parseable as dates)
+  // When there are no results but a timeRange is provided, treat as date-based
+  const isDateBased =
+    rows.length === 0 && timeRange ? true : dateValues.length >= rows.length * 0.8; // At least 80% are dates
+
+  // Detect granularity from the full time range when available, otherwise from data
+  const granularity = isDateBased
+    ? timeRange
+      ? detectTimeGranularity([new Date(timeRange.from), new Date(timeRange.to)])
+      : detectTimeGranularity(dateValues)
+    : "days";
+
+  // For date-based axes, use a special key for the timestamp
+  const xDataKey = isDateBased ? "__timestamp" : xAxisColumn;
+
+  // Calculate time domain and ticks for date-based axes
+  // When a timeRange is provided (from the query filter), use it so the chart
+  // shows the full requested period rather than just the range of returned data.
+  let timeDomain: [number, number] | null = null;
+  let timeTicks: number[] | null = null;
+  // Raw min/max used for gap filling (without padding)
+  let rawMinTime = 0;
+  let rawMaxTime = 0;
+  if (isDateBased && (dateValues.length > 0 || timeRange)) {
+    const dataTimestamps = dateValues.map((d) => d.getTime());
+    rawMinTime = timeRange ? new Date(timeRange.from).getTime() : Math.min(...dataTimestamps);
+    rawMaxTime = timeRange ? new Date(timeRange.to).getTime() : Math.max(...dataTimestamps);
+    // Add a small padding (2% on each side) so points aren't at the very edge
+    const padding = (rawMaxTime - rawMinTime) * 0.02;
+    timeDomain = [rawMinTime - padding, rawMaxTime + padding];
+    // Generate evenly-spaced ticks across the entire range using nice intervals
+    timeTicks = generateTimeTicks(rawMinTime, rawMaxTime);
+  }
+
+  // Helper to format X value for categorical axes (non-date)
+  const formatX = (value: unknown): string => {
+    if (value === null || value === undefined) return "N/A";
+    return String(value);
+  };
+
+  // No grouping: use Y columns directly as series
+  // Group rows by X value first, then aggregate
+  if (!groupByColumn) {
+    // Group rows by X-axis value to handle duplicates
+    const groupedByX = new Map<
+      string | number,
+      { yValues: Record<string, number[]>; rawDate: Date | null; originalX: unknown }
+    >();
+
+    for (const row of rows) {
+      const rawDate = tryParseDate(row[xAxisColumn]);
+
+      // Skip rows with invalid dates for date-based axes
+      if (isDateBased && !rawDate) continue;
+
+      const xKey = isDateBased && rawDate ? rawDate.getTime() : formatX(row[xAxisColumn]);
+
+      if (!groupedByX.has(xKey)) {
+        groupedByX.set(xKey, {
+          yValues: Object.fromEntries(yAxisColumns.map((col) => [col, []])),
+          rawDate,
+          originalX: row[xAxisColumn],
+        });
+      }
+
+      const existing = groupedByX.get(xKey)!;
+      for (const yCol of yAxisColumns) {
+        existing.yValues[yCol].push(toNumber(row[yCol]));
+      }
+    }
+
+    // Convert to array format with aggregation applied
+    let data = Array.from(groupedByX.entries()).map(([xKey, { yValues, rawDate, originalX }]) => {
+      const point: Record<string, unknown> = {
+        [xDataKey]: xKey,
+        __rawDate: rawDate,
+        __granularity: granularity,
+        __originalX: originalX,
+      };
+      for (const yCol of yAxisColumns) {
+        point[yCol] = aggregateValues(yValues[yCol], aggregation);
+      }
+      return point;
+    });
+
+    // Fill in gaps with zeros for date-based data
+    const seriesForBudget = Math.min(yAxisColumns.length, MAX_SERIES);
+    const effectiveMaxPoints = Math.max(
+      MIN_DATA_POINTS,
+      Math.min(MAX_DATA_POINTS, Math.floor(MAX_SVG_ELEMENT_BUDGET / seriesForBudget))
+    );
+
+    if (isDateBased && timeDomain) {
+      const timestamps = dateValues.map((d) => d.getTime());
+      const dataInterval = detectDataInterval(timestamps);
+      const rangeMs = rawMaxTime - rawMinTime;
+      const minRangeInterval = timeRange ? snapToNiceInterval(rangeMs / effectiveMaxPoints) : 0;
+      const maxRangeInterval =
+        timeRange && rangeMs > 0 ? snapToNiceInterval(rangeMs / 8) : Infinity;
+      const effectiveInterval = Math.min(
+        Math.max(dataInterval, minRangeInterval),
+        maxRangeInterval
+      );
+      data = fillTimeGaps(
+        data,
+        xDataKey,
+        yAxisColumns,
+        rawMinTime,
+        rawMaxTime,
+        effectiveInterval,
+        granularity,
+        aggregation,
+        effectiveMaxPoints
+      );
+    } else if (data.length > effectiveMaxPoints) {
+      data = data.slice(0, effectiveMaxPoints);
+    }
+
+    return {
+      data,
+      series: yAxisColumns,
+      totalSeriesCount: yAxisColumns.length,
+      dateValues,
+      isDateBased,
+      xDataKey,
+      timeDomain,
+      timeTicks,
+    };
+  }
+
+  // With grouping: pivot data so each group value becomes a series
+  const yCol = yAxisColumns[0]; // Use first Y column when grouping
+
+  // First pass: collect all values grouped by (xKey, groupValue) and accumulate
+  // per-group totals so we can pick the top-N groups before building heavy data
+  // objects with thousands of keys.
+  const groupTotals = new Map<string, number>();
+  const groupedByX = new Map<
+    string | number,
+    { values: Record<string, number[]>; rawDate: Date | null; originalX: unknown }
+  >();
+
+  for (const row of rows) {
+    const rawDate = tryParseDate(row[xAxisColumn]);
+
+    if (isDateBased && !rawDate) continue;
+
+    const xKey = isDateBased && rawDate ? rawDate.getTime() : formatX(row[xAxisColumn]);
+    const groupValue = String(row[groupByColumn] ?? "Unknown");
+    const yValue = toNumber(row[yCol]);
+
+    groupTotals.set(groupValue, (groupTotals.get(groupValue) ?? 0) + Math.abs(yValue));
+
+    if (!groupedByX.has(xKey)) {
+      groupedByX.set(xKey, { values: {}, rawDate, originalX: row[xAxisColumn] });
+    }
+
+    const existing = groupedByX.get(xKey)!;
+    if (!existing.values[groupValue]) {
+      existing.values[groupValue] = [];
+    }
+    existing.values[groupValue].push(yValue);
+  }
+
+  // Keep only the top MAX_SERIES groups by absolute total to avoid O(n) processing
+  // downstream (data objects, gap filling, legend totals, SVG rendering).
+  const totalSeriesCount = groupTotals.size;
+  let series: string[];
+  if (groupTotals.size <= MAX_SERIES) {
+    series = Array.from(groupTotals.keys()).sort();
+  } else {
+    series = Array.from(groupTotals.entries())
+      .sort((a, b) => b[1] - a[1])
+      .slice(0, MAX_SERIES)
+      .map(([key]) => key)
+      .sort();
+  }
+  // Convert to array format with aggregation applied (only for kept series)
+  let data = Array.from(groupedByX.entries()).map(([xKey, { values, rawDate, originalX }]) => {
+    const point: Record<string, unknown> = {
+      [xDataKey]: xKey,
+      __rawDate: rawDate,
+      __granularity: granularity,
+      __originalX: originalX,
+    };
+    for (const group of series) {
+      point[group] = values[group] ? aggregateValues(values[group], aggregation) : 0;
+    }
+    return point;
+  });
+
+  // Dynamic data-point budget based on the (already capped) series count
+  const effectiveMaxPoints = Math.max(
+    MIN_DATA_POINTS,
+    Math.min(MAX_DATA_POINTS, Math.floor(MAX_SVG_ELEMENT_BUDGET / series.length))
+  );
+
+  if (isDateBased && timeDomain) {
+    const timestamps = dateValues.map((d) => d.getTime());
+    const dataInterval = detectDataInterval(timestamps);
+    const rangeMs = rawMaxTime - rawMinTime;
+    const minRangeInterval = timeRange ? snapToNiceInterval(rangeMs / effectiveMaxPoints) : 0;
+    const maxRangeInterval = timeRange && rangeMs > 0 ? snapToNiceInterval(rangeMs / 8) : Infinity;
+    const effectiveInterval = Math.min(Math.max(dataInterval, minRangeInterval), maxRangeInterval);
+    data = fillTimeGaps(
+      data,
+      xDataKey,
+      series,
+      rawMinTime,
+      rawMaxTime,
+      effectiveInterval,
+      granularity,
+      aggregation,
+      effectiveMaxPoints
+    );
+  } else if (data.length > effectiveMaxPoints) {
+    data = data.slice(0, effectiveMaxPoints);
+  }
+
+  return {
+    data,
+    series,
+    totalSeriesCount,
+    dateValues,
+    isDateBased,
+    xDataKey,
+    timeDomain,
+    timeTicks,
+  };
+}
+
+function toNumber(value: unknown): number {
+  if (typeof value === "number") return value;
+  if (typeof value === "string") {
+    const parsed = parseFloat(value);
+    return isNaN(parsed) ? 0 : parsed;
+  }
+  return 0;
+}
+
+/**
+ * Sort data array by a specified column
+ */
+function sortData(
+  data: Record<string, unknown>[],
+  sortByColumn: string | null,
+  sortDirection: "asc" | "desc",
+  xAxisColumn?: string | null
+): Record<string, unknown>[] {
+  if (!sortByColumn) return data;
+
+  return [...data].sort((a, b) => {
+    const aVal = a[sortByColumn];
+    const bVal = b[sortByColumn];
+
+    // Handle null/undefined
+    if (aVal == null && bVal == null) return 0;
+    if (aVal == null) return sortDirection === "asc" ? -1 : 1;
+    if (bVal == null) return sortDirection === "asc" ? 1 : -1;
+
+    // Only use date comparison when sorting by the X-axis column
+    if (sortByColumn === xAxisColumn) {
+      const aDate = a.__rawDate as Date | null;
+      const bDate = b.__rawDate as Date | null;
+      if (aDate && bDate) {
+        const diff = aDate.getTime() - bDate.getTime();
+        return sortDirection === "asc" ? diff : -diff;
+      }
+    }
+
+    // Compare as numbers if possible
+    const aNum = typeof aVal === "number" ? aVal : parseFloat(String(aVal));
+    const bNum = typeof bVal === "number" ? bVal : parseFloat(String(bVal));
+    if (!isNaN(aNum) && !isNaN(bNum)) {
+      return sortDirection === "asc" ? aNum - bNum : bNum - aNum;
+    }
+
+    // Fall back to string comparison
+    const aStr = String(aVal);
+    const bStr = String(bVal);
+    const cmp = aStr.localeCompare(bStr);
+    return sortDirection === "asc" ? cmp : -cmp;
+  });
+}
+
+export const QueryResultsChart = memo(function QueryResultsChart({
+  rows,
+  columns,
+  config,
+  timeRange,
+  fullLegend = false,
+  onViewAllLegendItems,
+  isLoading = false,
+  legendScrollable = false,
+}: QueryResultsChartProps) {
+  const {
+    xAxisColumn,
+    yAxisColumns,
+    chartType,
+    groupByColumn,
+    stacked,
+    sortByColumn,
+    sortDirection,
+  } = config;
+
+  // Transform data for charting
+  const {
+    data: unsortedData,
+    series,
+    totalSeriesCount,
+    dateValues,
+    isDateBased,
+    xDataKey,
+    timeDomain,
+    timeTicks,
+  } = useMemo(() => transformDataForChart(rows, config, timeRange), [rows, config, timeRange]);
+
+  // Apply sorting (for date-based, sort by timestamp to ensure correct order)
+  const data = useMemo(() => {
+    if (isDateBased) {
+      // Always sort by timestamp for date-based axes
+      return sortData(unsortedData, xDataKey, "asc", xDataKey);
+    }
+    return sortData(unsortedData, sortByColumn, sortDirection, xDataKey);
+  }, [unsortedData, sortByColumn, sortDirection, isDateBased, xDataKey]);
+
+  // Sort series by descending total sum so largest appears at bottom of
+  // stacked charts and first in the legend
+  const sortedSeries = useMemo(() => {
+    if (series.length <= 1) return series;
+    const totals = new Map<string, number>();
+    for (const s of series) {
+      let total = 0;
+      for (const point of data) {
+        const val = point[s];
+        if (typeof val === "number" && isFinite(val)) {
+          total += Math.abs(val);
+        }
+      }
+      totals.set(s, total);
+    }
+    return [...series].sort((a, b) => (totals.get(b) ?? 0) - (totals.get(a) ?? 0));
+  }, [series, data]);
+
+  // Limit SVG-rendered series to MAX_SERIES (top N by total value)
+  const visibleSeries = useMemo(
+    () => (sortedSeries.length > MAX_SERIES ? sortedSeries.slice(0, MAX_SERIES) : sortedSeries),
+    [sortedSeries]
+  );
+
+  const seriesLimitCallout =
+    totalSeriesCount > series.length ? (
+      <div className="mt-1 px-2">
+        <Callout variant="warning">
+          {`Limited to the top ${
+            series.length
+          } of ${totalSeriesCount.toLocaleString()} series for performance reasons.`}
+        </Callout>
+      </div>
+    ) : null;
+
+  // Detect time granularity — use the full time range when available so tick
+  // labels are appropriate for the period (e.g. "Jan 5" for a 7-day range
+  // instead of just "16:00:00" when data is sparse)
+  const timeGranularity = useMemo(() => {
+    if (timeRange) {
+      return detectTimeGranularity([new Date(timeRange.from), new Date(timeRange.to)]);
+    }
+    return dateValues.length > 0 ? detectTimeGranularity(dateValues) : null;
+  }, [dateValues, timeRange]);
+
+  // X-axis tick formatter for date-based axes (pure – no deduplication).
+  // Label deduplication is handled inside dateAxisTick below so that the
+  // mutable "lastLabel" state is correctly reset on each Recharts render pass.
+  const xAxisTickFormatter = useMemo(() => {
+    if (!isDateBased || !timeGranularity) return undefined;
+    return (value: number) => {
+      const date = new Date(value);
+      return formatDateByGranularity(date, timeGranularity);
+    };
+  }, [isDateBased, timeGranularity]);
+
+  // Resolve the Y-axis column format for formatting
+  const yAxisFormat = useMemo(() => {
+    if (yAxisColumns.length === 0) return undefined;
+    const col = columns.find((c) => c.name === yAxisColumns[0]);
+    return (col?.format ?? col?.customRenderType) as ColumnFormatType | undefined;
+  }, [yAxisColumns, columns]);
+
+  // Create dynamic Y-axis formatter based on data range and format
+  const yAxisFormatter = useMemo(
+    () => createYAxisFormatter(data, series, yAxisFormat),
+    [data, series, yAxisFormat]
+  );
+
+  // Create value formatter for tooltips and legend based on column format
+  const tooltipValueFormatter = useMemo(
+    () => createValueFormatter(yAxisFormat),
+    [yAxisFormat]
+  );
+
+  // Check if the group-by column has a runStatus customRenderType
+  const groupByIsRunStatus = useMemo(() => {
+    if (!groupByColumn) return false;
+    const col = columns.find((c) => c.name === groupByColumn);
+    return col?.customRenderType === "runStatus";
+  }, [groupByColumn, columns]);
+
+  // Build chart config for colors/labels
+  const chartConfig = useMemo(() => {
+    const cfg: ChartConfig = {};
+    sortedSeries.forEach((s, i) => {
+      const statusColor = groupByIsRunStatus ? getRunStatusHexColor(s) : undefined;
+      cfg[s] = {
+        label: s,
+        color: statusColor ?? config.seriesColors?.[s] ?? getSeriesColor(i),
+      };
+    });
+    return cfg;
+  }, [sortedSeries, groupByIsRunStatus, config.seriesColors]);
+
+  // Custom tooltip label formatter for better date display
+  const tooltipLabelFormatter = useMemo(() => {
+    return (label: string, payload: Array<{ payload?: Record<string, unknown> }>) => {
+      // Try to get the raw date from the payload for better formatting
+      const rawDate = payload[0]?.payload?.__rawDate as Date | null | undefined;
+      const granularity = payload[0]?.payload?.__granularity as TimeGranularity | undefined;
+
+      if (rawDate && granularity) {
+        return formatDateForTooltip(rawDate, granularity);
+      }
+      return label;
+    };
+  }, []);
+
+  // Label formatter for the legend (formats x-axis values)
+  const legendLabelFormatter = useMemo(() => {
+    if (!isDateBased || !timeGranularity) return undefined;
+    return (value: string) => {
+      // For date-based axes, the value is a timestamp
+      const timestamp = Number(value);
+      if (!isNaN(timestamp)) {
+        const date = new Date(timestamp);
+        return formatDateForTooltip(date, timeGranularity);
+      }
+      return value;
+    };
+  }, [isDateBased, timeGranularity]);
+
+  // Y-axis domain calculation - must be before early returns to maintain consistent hook order
+  const yAxisDomain = useMemo(() => {
+    let min = 0;
+    for (const point of data) {
+      for (const s of series) {
+        const val = point[s];
+        if (typeof val === "number" && isFinite(val)) {
+          min = Math.min(min, val);
+        }
+      }
+    }
+    return [min, "auto"] as [number, string];
+  }, [data, series]);
+
+  // Angle all date-based labels for consistent appearance and to avoid overlap
+  const xAxisAngle = isDateBased ? -45 : 0;
+  const xAxisHeight = xAxisAngle !== 0 ? 65 : undefined;
+
+  // Check if the data would produce duplicate labels at the current granularity.
+  // Only use the custom tick renderer (with interval:0) when duplicates exist,
+  // otherwise let Recharts handle label spacing to avoid collisions.
+  const hasDuplicateLabels = useMemo(() => {
+    if (!isDateBased || !timeGranularity || data.length === 0) return false;
+    const labels = new Set<string>();
+    for (const point of data) {
+      const ts = point.__timestamp ?? point[xDataKey];
+      if (typeof ts === "number") {
+        labels.add(formatDateByGranularity(new Date(ts), timeGranularity));
+      }
+    }
+    return labels.size < data.length;
+  }, [isDateBased, timeGranularity, data, xDataKey]);
+
+  // Custom tick renderer for date-based axes: renders a tick mark alongside
+  // each label, and for unlabelled points (de-duplicated) just a subtle tick mark.
+  // De-duplication lives here (not in xAxisTickFormatter) so that the mutable
+  // lastLabel is reset when Recharts starts a new render pass (index === 0).
+  const dateAxisTick = useMemo(() => {
+    if (!isDateBased || !xAxisTickFormatter) return undefined;
+    let lastLabel = "";
+    return (props: Record<string, unknown>) => {
+      const { x, y, payload, index } = props as {
+        x: number;
+        y: number;
+        payload: { value: number };
+        index: number;
+      };
+
+      // Reset dedup state at the start of each Recharts render pass
+      if (index === 0) lastLabel = "";
+
+      const formatted = xAxisTickFormatter(payload.value);
+      const label = formatted === lastLabel ? "" : formatted;
+      lastLabel = formatted;
+      // y is the tick text position, offset from the axis by tickMargin + internal padding
+      const axisY = (y as number) - 12;
+      if (label) {
+        return (
+          <g>
+            <line
+              x1={x as number}
+              y1={axisY}
+              x2={x as number}
+              y2={axisY - 3}
+              stroke="#878C99"
+              strokeWidth={1}
+            />
+            <text
+              x={x}
+              y={axisY}
+              dy={10}
+              fill="#878C99"
+              fontSize={11}
+              textAnchor={xAxisAngle !== 0 ? "end" : "middle"}
+              style={{ fontVariantNumeric: "tabular-nums" }}
+              transform={
+                xAxisAngle !== 0 ? `rotate(${xAxisAngle}, ${x}, ${axisY + 10})` : undefined
+              }
+            >
+              {label}
+            </text>
+          </g>
+        );
+      }
+      // Small tick mark sitting on the axis baseline, pointing upward
+      return (
+        <line
+          x1={x as number}
+          y1={axisY}
+          x2={x as number}
+          y2={axisY - 3}
+          stroke="#272A2E"
+          strokeWidth={1}
+        />
+      );
+    };
+  }, [isDateBased, xAxisTickFormatter, xAxisAngle]);
+
+  // Validation — all hooks must be above this point
+  const chartIcon = chartType === "bar" ? BarChart3 : LineChart;
+
+  if (!xAxisColumn) {
+    return (
+      <ChartBlankState icon={chartIcon} message="Select an X-axis column to display the chart" />
+    );
+  }
+
+  if (yAxisColumns.length === 0) {
+    return (
+      <ChartBlankState icon={chartIcon} message="Select a Y-axis column to display the chart" />
+    );
+  }
+
+  if (rows.length === 0) {
+    return <ChartBlankState icon={chartIcon} message="No data to display" />;
+  }
+
+  if (data.length === 0) {
+    return <ChartBlankState icon={chartIcon} message="Unable to transform data for chart" />;
+  }
+
+  // Base x-axis props shared by all chart types
+  const baseXAxisProps = {
+    ...(dateAxisTick
+      ? {
+          tick: dateAxisTick,
+          tickLine: false,
+          tickFormatter: undefined,
+          // Only force every tick to render when there are duplicates to de-duplicate;
+          // otherwise let Recharts auto-space to avoid label collisions
+          ...(hasDuplicateLabels ? { interval: 0 } : {}),
+        }
+      : { tickFormatter: xAxisTickFormatter }),
+    angle: xAxisAngle,
+    textAnchor: xAxisAngle !== 0 ? ("end" as const) : ("middle" as const),
+    height: xAxisHeight,
+  };
+
+  // Line charts use continuous time scale for date-based data
+  // This properly represents time gaps between data points
+  const xAxisPropsForLine = isDateBased
+    ? {
+        type: "number" as const,
+        domain: timeDomain ?? (["auto", "auto"] as [string, string]),
+        scale: "time" as const,
+        // Explicitly specify tick positions so labels appear across the entire range
+        ticks: timeTicks ?? undefined,
+        ...baseXAxisProps,
+      }
+    : baseXAxisProps;
+
+  // Bar charts always use categorical axis positioning
+  // This ensures bars are evenly distributed regardless of data point count
+  // (prevents massive bars when there are only a few data points)
+  const xAxisPropsForBar = baseXAxisProps;
+
+  const yAxisProps = {
+    tickFormatter: yAxisFormatter,
+    domain: yAxisDomain,
+  };
+
+  const showLegend = sortedSeries.length > 0;
+
+  if (chartType === "bar") {
+    return (
+      <Chart.Root
+        config={chartConfig}
+        data={data}
+        dataKey={xDataKey}
+        series={sortedSeries}
+        visibleSeries={visibleSeries}
+        labelFormatter={legendLabelFormatter}
+        showLegend={showLegend}
+        maxLegendItems={fullLegend ? Infinity : 5}
+        legendAggregation={config.aggregation}
+        legendValueFormatter={tooltipValueFormatter}
+        minHeight="300px"
+        fillContainer
+        onViewAllLegendItems={onViewAllLegendItems}
+        legendScrollable={legendScrollable}
+        state={isLoading ? "loading" : "loaded"}
+        beforeLegend={seriesLimitCallout}
+      >
+        <Chart.Bar
+          xAxisProps={xAxisPropsForBar}
+          yAxisProps={yAxisProps}
+          stackId={stacked ? "stack" : undefined}
+          tooltipLabelFormatter={tooltipLabelFormatter}
+          tooltipValueFormatter={tooltipValueFormatter}
+        />
+      </Chart.Root>
+    );
+  }
+
+  // Line or stacked area chart
+  return (
+    <Chart.Root
+      config={chartConfig}
+      data={data}
+      dataKey={xDataKey}
+      series={sortedSeries}
+      visibleSeries={visibleSeries}
+      labelFormatter={legendLabelFormatter}
+      showLegend={showLegend}
+      maxLegendItems={fullLegend ? Infinity : 5}
+      legendAggregation={config.aggregation}
+      legendValueFormatter={tooltipValueFormatter}
+      minHeight="300px"
+      fillContainer
+      onViewAllLegendItems={onViewAllLegendItems}
+      legendScrollable={legendScrollable}
+      state={isLoading ? "loading" : "loaded"}
+      beforeLegend={seriesLimitCallout}
+    >
+      <Chart.Line
+        xAxisProps={xAxisPropsForLine}
+        yAxisProps={yAxisProps}
+        stacked={stacked && visibleSeries.length > 1}
+        tooltipLabelFormatter={tooltipLabelFormatter}
+        tooltipValueFormatter={tooltipValueFormatter}
+        lineType="linear"
+      />
+    </Chart.Root>
+  );
+});
+
+/**
+ * Creates a Y-axis value formatter based on the data range and optional format hint
+ */
+function createYAxisFormatter(
+  data: Record<string, unknown>[],
+  series: string[],
+  format?: ColumnFormatType
+) {
+  // Find min and max values across all series
+  let minVal = Infinity;
+  let maxVal = -Infinity;
+
+  for (const point of data) {
+    for (const s of series) {
+      const val = point[s];
+      if (typeof val === "number" && isFinite(val)) {
+        minVal = Math.min(minVal, val);
+        maxVal = Math.max(maxVal, val);
+      }
+    }
+  }
+
+  const range = maxVal - minVal;
+
+  // Format-aware formatters
+  if (format === "bytes" || format === "decimalBytes") {
+    const divisor = format === "bytes" ? 1024 : 1000;
+    const units =
+      format === "bytes"
+        ? ["B", "KiB", "MiB", "GiB", "TiB"]
+        : ["B", "KB", "MB", "GB", "TB"];
+    return (value: number): string => {
+      if (value === 0) return "0 B";
+      // Use consistent unit for all ticks based on max value
+      const i = Math.min(
+        Math.max(0, Math.floor(Math.log(Math.abs(maxVal || 1)) / Math.log(divisor))),
+        units.length - 1
+      );
+      const scaled = value / Math.pow(divisor, i);
+      return `${scaled.toFixed(scaled < 10 ? 1 : 0)} ${units[i]}`;
+    };
+  }
+
+  if (format === "percent") {
+    return (value: number): string => `${value.toFixed(range < 1 ? 2 : 1)}%`;
+  }
+
+  if (format === "duration") {
+    return (value: number): string => formatDurationMilliseconds(value, { style: "short" });
+  }
+
+  if (format === "durationSeconds") {
+    return (value: number): string =>
+      formatDurationMilliseconds(value * 1000, { style: "short" });
+  }
+
+  if (format === "costInDollars" || format === "cost") {
+    return (value: number): string => {
+      const dollars = format === "cost" ? value / 100 : value;
+      return formatCurrencyAccurate(dollars);
+    };
+  }
+
+  // Default formatter
+  return (value: number): string => {
+    // Use abbreviations for large numbers
+    if (Math.abs(value) >= 1_000_000) {
+      return `${(value / 1_000_000).toFixed(1)}M`;
+    }
+    if (Math.abs(value) >= 1_000) {
+      return `${(value / 1_000).toFixed(1)}K`;
+    }
+
+    // Determine decimal places based on range
+    if (range === 0 || !isFinite(range)) {
+      return Number.isInteger(value) ? value.toString() : value.toFixed(2);
+    }
+
+    // For small ranges, show more precision
+    if (range < 0.01) {
+      return value.toFixed(4);
+    }
+    if (range < 0.1) {
+      return value.toFixed(3);
+    }
+    if (range < 10) {
+      return value.toFixed(2);
+    }
+    if (range < 100) {
+      return value.toFixed(1);
+    }
+
+    // For large ranges, no decimals
+    return Math.round(value).toString();
+  };
+}
diff --git a/apps/webapp/app/components/code/TSQLEditor.tsx b/apps/webapp/app/components/code/TSQLEditor.tsx
new file mode 100644
index 00000000000..1fa56a2cea8
--- /dev/null
+++ b/apps/webapp/app/components/code/TSQLEditor.tsx
@@ -0,0 +1,387 @@
+import { sql, StandardSQL } from "@codemirror/lang-sql";
+import { autocompletion, startCompletion } from "@codemirror/autocomplete";
+import { linter, lintGutter } from "@codemirror/lint";
+import { EditorView, keymap } from "@codemirror/view";
+import type { ViewUpdate } from "@codemirror/view";
+import { CheckIcon, ClipboardIcon, SparklesIcon, TrashIcon } from "@heroicons/react/20/solid";
+import {
+  type ReactCodeMirrorProps,
+  type UseCodeMirror,
+  useCodeMirror,
+} from "@uiw/react-codemirror";
+import { useCallback, useEffect, useRef, useState, useMemo } from "react";
+import { cn } from "~/utils/cn";
+import { Button } from "../primitives/Buttons";
+import { getEditorSetup } from "./codeMirrorSetup";
+import { darkTheme } from "./codeMirrorTheme";
+import { createTSQLCompletion } from "./tsql/tsqlCompletion";
+import { createTSQLLinter } from "./tsql/tsqlLinter";
+import type { TableSchema } from "@internal/tsql";
+import { format as formatSQL } from "sql-formatter";
+
+export interface TSQLEditorProps extends Omit<ReactCodeMirrorProps, "onBlur"> {
+  /** Initial value for the editor */
+  defaultValue?: string;
+  /** Whether the editor is read-only */
+  readOnly?: boolean;
+  /** Called when the editor content changes */
+  onChange?: (value: string) => void;
+  /** Called when the editor state updates */
+  onUpdate?: (update: ViewUpdate) => void;
+  /** Called when the editor loses focus */
+  onBlur?: (code: string) => void;
+  /** Schema for table/column autocompletion */
+  schema?: TableSchema[];
+  /** Show copy button */
+  showCopyButton?: boolean;
+  /** Show clear button */
+  showClearButton?: boolean;
+  /** Show format button */
+  showFormatButton?: boolean;
+  /** Enable linting (syntax checking) */
+  linterEnabled?: boolean;
+  /** Placeholder text when empty */
+  placeholder?: string;
+  /** Additional actions to show in the toolbar */
+  additionalActions?: React.ReactNode;
+  /** Minimum height of the editor */
+  minHeight?: string;
+}
+
+type TSQLEditorDefaultProps = Partial<TSQLEditorProps>;
+
+const defaultProps: TSQLEditorDefaultProps = {
+  readOnly: false,
+  basicSetup: false,
+  linterEnabled: true,
+  showCopyButton: true,
+  showClearButton: false,
+  showFormatButton: true,
+  schema: [],
+};
+
+// Toggle comment on current line or selected lines with -- comment symbol
+const toggleLineComment = (view: EditorView): boolean => {
+  const { from, to } = view.state.selection.main;
+  const startLine = view.state.doc.lineAt(from);
+  // When `to` is exactly at the start of a line and there's an actual selection,
+  // the caret sits before that line — so exclude it by stepping back one position.
+  const adjustedTo = to > from && view.state.doc.lineAt(to).from === to ? to - 1 : to;
+  const endLine = view.state.doc.lineAt(adjustedTo);
+
+  // Collect all lines in the selection
+  const lines: { from: number; to: number; text: string }[] = [];
+  for (let i = startLine.number; i <= endLine.number; i++) {
+    const line = view.state.doc.line(i);
+    lines.push({ from: line.from, to: line.to, text: line.text });
+  }
+
+  // Determine action: if all non-empty lines are commented, uncomment; otherwise comment
+  const allCommented = lines.every((line) => {
+    const trimmed = line.text.trimStart();
+    return trimmed.length === 0 || trimmed.startsWith("--");
+  });
+
+  const changes = lines
+    .map((line) => {
+      const trimmed = line.text.trimStart();
+      if (trimmed.length === 0) return null; // skip empty lines
+      const indent = line.text.length - trimmed.length;
+
+      if (allCommented) {
+        // Remove comment: strip "-- " or just "--"
+        const afterComment = trimmed.slice(2);
+        const newText = line.text.slice(0, indent) + afterComment.replace(/^\s/, "");
+        return { from: line.from, to: line.to, insert: newText };
+      } else {
+        // Add comment: prepend "-- " to the line content
+        const newText = line.text.slice(0, indent) + "-- " + trimmed;
+        return { from: line.from, to: line.to, insert: newText };
+      }
+    })
+    .filter((c): c is { from: number; to: number; insert: string } => c !== null);
+
+  if (changes.length > 0) {
+    view.dispatch({ changes });
+  }
+
+  return true;
+};
+
+export function TSQLEditor(opts: TSQLEditorProps) {
+  const {
+    defaultValue = "",
+    readOnly = false,
+    onChange,
+    onUpdate,
+    onBlur,
+    basicSetup = false,
+    autoFocus,
+    showCopyButton = true,
+    showClearButton = false,
+    showFormatButton = true,
+    linterEnabled = true,
+    schema = [],
+    placeholder = "",
+    additionalActions,
+    minHeight = undefined,
+  } = {
+    ...defaultProps,
+    ...opts,
+  };
+
+  // Create extensions - memoize to avoid recreating on every render
+  const extensions = useMemo(() => {
+    const exts = getEditorSetup();
+
+    // Add SQL language support with StandardSQL dialect
+    // This provides syntax highlighting
+    exts.push(
+      sql({
+        dialect: StandardSQL,
+        upperCaseKeywords: true,
+      })
+    );
+
+    // Add custom TSQL completion
+    if (schema && schema.length > 0) {
+      exts.push(
+        autocompletion({
+          override: [createTSQLCompletion(schema)],
+          activateOnTyping: true,
+          maxRenderedOptions: 50,
+        })
+      );
+
+      // Trigger autocomplete when ' is typed in value context
+      // CodeMirror's activateOnTyping only triggers on alphanumeric characters,
+      // so we manually trigger for quotes after comparison operators
+      exts.push(
+        EditorView.domEventHandlers({
+          keyup: (event, view) => {
+            // Trigger on quote key (both ' and shift+' on some keyboards)
+            if (event.key === "'" || event.key === '"' || event.code === "Quote") {
+              setTimeout(() => {
+                startCompletion(view);
+              }, 50);
+            }
+            return false;
+          },
+        })
+      );
+    }
+
+    // Add TSQL linter
+    if (linterEnabled) {
+      exts.push(lintGutter());
+      exts.push(
+        linter(createTSQLLinter({ schema }), {
+          delay: 300, // Debounce linting for better performance
+        })
+      );
+    }
+
+    // Add keyboard shortcut for toggling comments
+    exts.push(
+      keymap.of([
+        { key: "Cmd-/", run: toggleLineComment },
+        { key: "Ctrl-/", run: toggleLineComment },
+      ])
+    );
+
+    return exts;
+  }, [schema, linterEnabled]);
+
+  const editor = useRef<HTMLDivElement>(null);
+
+  const settings: Omit<UseCodeMirror, "onBlur"> = {
+    ...opts,
+    container: editor.current,
+    extensions,
+    editable: !readOnly,
+    contentEditable: !readOnly,
+    value: defaultValue,
+    autoFocus,
+    theme: darkTheme(),
+    indentWithTab: false,
+    basicSetup,
+    onChange,
+    onUpdate,
+    placeholder,
+  };
+
+  const { setContainer, view } = useCodeMirror(settings);
+  const [copied, setCopied] = useState(false);
+
+  useEffect(() => {
+    if (editor.current) {
+      setContainer(editor.current);
+    }
+  }, [setContainer]);
+
+  // Update editor when defaultValue changes
+  useEffect(() => {
+    if (view !== undefined) {
+      if (view.state.doc.toString() === defaultValue) return;
+      view.dispatch({
+        changes: { from: 0, to: view.state.doc.length, insert: defaultValue },
+      });
+    }
+  }, [defaultValue, view]);
+
+  const clear = () => {
+    if (view === undefined) return;
+    view.dispatch({
+      changes: { from: 0, to: view.state.doc.length, insert: undefined },
+    });
+    onChange?.("");
+  };
+
+  const copy = useCallback(() => {
+    if (view === undefined) return;
+    navigator.clipboard.writeText(view.state.doc.toString());
+    setCopied(true);
+    setTimeout(() => {
+      setCopied(false);
+    }, 1500);
+  }, [view]);
+
+  const format = useCallback(() => {
+    if (view === undefined) return;
+    const currentContent = view.state.doc.toString();
+    if (!currentContent.trim()) return;
+
+    try {
+      const formatted = autoFormatSQL(currentContent);
+      view.dispatch({
+        changes: { from: 0, to: view.state.doc.length, insert: formatted },
+      });
+      onChange?.(formatted);
+    } catch {
+      // If formatting fails (e.g., invalid SQL), silently ignore
+    }
+  }, [view, onChange]);
+
+  const showButtons = showClearButton || showCopyButton || showFormatButton || additionalActions;
+
+  return (
+    <div
+      className={cn("relative flex h-full flex-col", opts.className)}
+      style={minHeight ? { minHeight } : undefined}
+    >
+      <div
+        className={cn(
+          "min-h-0 flex-1 overflow-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        )}
+        ref={editor}
+        onClick={() => {
+          view?.focus();
+        }}
+        onBlur={() => {
+          if (!onBlur) return;
+          if (!view) return;
+          onBlur(view.state.doc.toString());
+        }}
+      />
+      {showButtons && (
+        <div className="absolute right-0 top-0 z-10 flex items-center justify-end bg-charcoal-900/80 p-1.5">
+          {additionalActions && additionalActions}
+          {showFormatButton && (
+            <Button
+              type="button"
+              variant="minimal/small"
+              className="flex-none"
+              onClick={(event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                format();
+              }}
+              shortcut={{ key: "f", modifiers: ["shift", "alt"], enabledOnInputElements: true }}
+            >
+              Format
+            </Button>
+          )}
+          {showClearButton && (
+            <Button
+              type="button"
+              variant="minimal/small"
+              TrailingIcon={TrashIcon}
+              onClick={(event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                clear();
+              }}
+            >
+              Clear
+            </Button>
+          )}
+          {showCopyButton && (
+            <Button
+              type="button"
+              variant="minimal/small"
+              TrailingIcon={copied ? CheckIcon : ClipboardIcon}
+              trailingIconClassName={
+                copied ? "text-green-500 group-hover:text-green-500" : undefined
+              }
+              onClick={(event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                copy();
+              }}
+            >
+              Copy
+            </Button>
+          )}
+        </div>
+      )}
+    </div>
+  );
+}
+
+// SQL keywords that legitimately appear before parentheses with a space
+const SQL_KEYWORDS_BEFORE_PAREN = new Set([
+  "IN",
+  "NOT",
+  "EXISTS",
+  "OVER",
+  "USING",
+  "VALUES",
+  "BETWEEN",
+  "LIKE",
+  "AND",
+  "OR",
+  "ON",
+  "SET",
+  "INTO",
+  "TABLE",
+  "CASE",
+  "WHEN",
+  "THEN",
+  "ELSE",
+  "AS",
+  "FROM",
+  "WHERE",
+  "HAVING",
+  "JOIN",
+  "SELECT",
+]);
+
+export function autoFormatSQL(sql: string) {
+  let formatted = formatSQL(sql, {
+    language: "sql",
+    keywordCase: "upper",
+    indentStyle: "standard",
+    linesBetweenQueries: 2,
+  });
+
+  // sql-formatter adds a space before ( for unknown/custom functions (e.g. timeBucket ())
+  // Remove that space for anything that isn't a SQL keyword
+  formatted = formatted.replace(/(\b\w+)\s+\(/g, (match, name) => {
+    if (SQL_KEYWORDS_BEFORE_PAREN.has(name.toUpperCase())) {
+      return match;
+    }
+    return `${name}(`;
+  });
+
+  return formatted;
+}
diff --git a/apps/webapp/app/components/code/TSQLResultsTable.tsx b/apps/webapp/app/components/code/TSQLResultsTable.tsx
new file mode 100644
index 00000000000..dae045bc4b8
--- /dev/null
+++ b/apps/webapp/app/components/code/TSQLResultsTable.tsx
@@ -0,0 +1,1256 @@
+import { ChevronDownIcon, ChevronUpDownIcon, ChevronUpIcon } from "@heroicons/react/20/solid";
+import type { OutputColumnMetadata } from "@internal/clickhouse";
+import { IconFilter2, IconFilter2X, IconTable } from "@tabler/icons-react";
+import { rankItem } from "@tanstack/match-sorter-utils";
+import {
+  flexRender,
+  getCoreRowModel,
+  getFilteredRowModel,
+  getSortedRowModel,
+  useReactTable,
+  type CellContext,
+  type Column,
+  type ColumnDef,
+  type ColumnFiltersState,
+  type ColumnResizeMode,
+  type FilterFn,
+  type SortDirection,
+  type SortingState,
+} from "@tanstack/react-table";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { formatDurationMilliseconds, MachinePresetName } from "@trigger.dev/core/v3";
+import { AlertCircle, ClipboardCheckIcon, ClipboardIcon } from "lucide-react";
+import { forwardRef, memo, useEffect, useMemo, useRef, useState } from "react";
+import { EnvironmentLabel, EnvironmentSlug } from "~/components/environments/EnvironmentLabel";
+import { MachineLabelCombo } from "~/components/MachineLabelCombo";
+import { DateTimeAccurate } from "~/components/primitives/DateTime";
+import {
+  descriptionForTaskRunStatus,
+  isRunFriendlyStatus,
+  isTaskRunStatus,
+  runStatusFromFriendlyTitle,
+  TaskRunStatusCombo,
+} from "~/components/runs/v3/TaskRunStatus";
+import { useCopy } from "~/hooks/useCopy";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { cn } from "~/utils/cn";
+import { formatBytes, formatDecimalBytes, formatQuantity } from "~/utils/columnFormat";
+import { formatCurrencyAccurate, formatNumber } from "~/utils/numberFormatter";
+import { v3ProjectPath, v3RunPathFromFriendlyId } from "~/utils/pathBuilder";
+import { ChartBlankState } from "../primitives/charts/ChartBlankState";
+import { Paragraph } from "../primitives/Paragraph";
+
+import { TextLink } from "../primitives/TextLink";
+import { InfoIconTooltip, SimpleTooltip } from "../primitives/Tooltip";
+import { QueueName } from "../runs/v3/QueueName";
+
+const MAX_STRING_DISPLAY_LENGTH = 64;
+const ROW_HEIGHT = 33; // Estimated row height in pixels
+
+// Column width calculation constants
+const MIN_COLUMN_WIDTH = 60;
+const MAX_COLUMN_WIDTH = 400;
+const CHAR_WIDTH_PX = 7.5; // Approximate width of a monospace character at text-xs (12px)
+const CELL_PADDING_PX = 40; // px-2 (8px) on each side + buffer for copy button
+const HEADER_ICONS_WIDTH_PX = 80; // Sort icon (16px) + filter icon (12px) + info icon (16px) + gaps (12px) + header padding (24px)
+const SAMPLE_SIZE = 100; // Number of rows to sample for width calculation
+
+// Type for row data
+type RowData = Record<string, unknown>;
+
+/**
+ * Get the formatted display string for a value based on its column type
+ * This mirrors the formatting logic in CellValue component
+ */
+function getFormattedValue(value: unknown, column: OutputColumnMetadata): string {
+  if (value === null) return "NULL";
+  if (value === undefined) return "";
+
+  // Handle format hints (from prettyFormat() or auto-populated from customRenderType)
+  const formatType = column.format ?? column.customRenderType;
+  if (formatType) {
+    switch (formatType) {
+      case "duration":
+        if (typeof value === "number") {
+          return formatDurationMilliseconds(value, { style: "short" });
+        }
+        break;
+      case "durationSeconds":
+        if (typeof value === "number") {
+          return formatDurationMilliseconds(value * 1000, { style: "short" });
+        }
+        break;
+      case "cost":
+        if (typeof value === "number") {
+          return formatCurrencyAccurate(value / 100);
+        }
+        break;
+      case "costInDollars":
+        if (typeof value === "number") {
+          return formatCurrencyAccurate(value);
+        }
+        break;
+      case "runStatus":
+        // Include friendly status names for searching
+        if (typeof value === "string") {
+          return value;
+        }
+        break;
+      case "bytes":
+        if (typeof value === "number") {
+          return formatBytes(value);
+        }
+        break;
+      case "decimalBytes":
+        if (typeof value === "number") {
+          return formatDecimalBytes(value);
+        }
+        break;
+      case "percent":
+        if (typeof value === "number") {
+          return `${value.toFixed(2)}%`;
+        }
+        break;
+      case "quantity":
+        if (typeof value === "number") {
+          return formatQuantity(value);
+        }
+        break;
+    }
+  }
+
+  // Handle DateTime types - format for display
+  if (isDateTimeType(column.type)) {
+    if (typeof value === "string") {
+      try {
+        const date = new Date(value);
+        // Format as a searchable string: "15 Jan 2026 12:34:56"
+        return date.toLocaleString("en-GB", {
+          day: "numeric",
+          month: "short",
+          year: "numeric",
+          hour: "2-digit",
+          minute: "2-digit",
+          second: "2-digit",
+        });
+      } catch {
+        return String(value);
+      }
+    }
+  }
+
+  // Handle numeric types - format with separators
+  if (isNumericType(column.type) && typeof value === "number") {
+    return formatNumber(value);
+  }
+
+  // Handle booleans
+  if (isBooleanType(column.type)) {
+    if (typeof value === "boolean") {
+      return value ? "true" : "false";
+    }
+    if (typeof value === "number") {
+      return value === 1 ? "true" : "false";
+    }
+  }
+
+  // Handle objects/arrays
+  if (typeof value === "object") {
+    return JSON.stringify(value);
+  }
+
+  return String(value);
+}
+
+const fuzzyFilter: FilterFn<RowData> = (row, columnId, value, addMeta) => {
+  // Get the cell value
+  const cellValue = row.getValue(columnId);
+  const searchValue = String(value).toLowerCase();
+
+  // Handle empty search
+  if (!searchValue) return true;
+
+  // Get the column metadata from the cell
+  const cell = row.getAllCells().find((c) => c.column.id === columnId);
+  const meta = cell?.column.columnDef.meta as ColumnMeta | undefined;
+
+  // Build searchable strings - raw value
+  const rawValue =
+    cellValue === null
+      ? "NULL"
+      : cellValue === undefined
+      ? ""
+      : typeof cellValue === "object"
+      ? JSON.stringify(cellValue)
+      : String(cellValue);
+
+  // Build searchable strings - formatted value (if we have column metadata)
+  const formattedValue = meta?.outputColumn
+    ? getFormattedValue(cellValue, meta.outputColumn)
+    : rawValue;
+
+  // Combine both values for searching (separated by space to allow matching either)
+  const combinedSearchText = `${rawValue} ${formattedValue}`.toLowerCase();
+
+  // Rank against the combined text
+  const itemRank = rankItem(combinedSearchText, searchValue);
+
+  // Store the ranking info
+  addMeta({ itemRank });
+
+  // Return if the item should be filtered in/out
+  return itemRank.passed;
+};
+
+/**
+ * Debounced input component for filter inputs
+ */
+const DebouncedInput = forwardRef<
+  HTMLInputElement,
+  {
+    value: string;
+    onChange: (value: string) => void;
+    debounce?: number;
+  } & Omit<React.InputHTMLAttributes<HTMLInputElement>, "onChange">
+>(function DebouncedInput({ value: initialValue, onChange, debounce = 300, ...props }, ref) {
+  const [value, setValue] = useState(initialValue);
+
+  useEffect(() => {
+    setValue(initialValue);
+  }, [initialValue]);
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      onChange(value);
+    }, debounce);
+
+    return () => clearTimeout(timeout);
+  }, [value, debounce, onChange]);
+
+  return <input ref={ref} {...props} value={value} onChange={(e) => setValue(e.target.value)} />;
+});
+
+// Extended column meta to store OutputColumnMetadata
+interface ColumnMeta {
+  outputColumn: OutputColumnMetadata;
+  alignment: "left" | "right";
+}
+
+/**
+ * Get the approximate display length (in characters) of a value based on its type and formatting
+ */
+function getDisplayLength(value: unknown, column: OutputColumnMetadata): number {
+  if (value === null) return 4; // "NULL"
+  if (value === undefined) return 9; // "UNDEFINED"
+
+  // Handle format hint types - estimate their rendered width
+  const fmt = column.format;
+  if (fmt === "bytes" || fmt === "decimalBytes") {
+    // e.g., "1.50 GiB" or "256.00 MB"
+    return 12;
+  }
+  if (fmt === "percent") {
+    // e.g., "45.23%"
+    return 8;
+  }
+  if (fmt === "quantity") {
+    // e.g., "1.50M"
+    return 8;
+  }
+
+  // Handle custom render types - estimate their rendered width
+  if (column.customRenderType) {
+    switch (column.customRenderType) {
+      case "runId":
+        // Run IDs are typically like "run_abc123xyz"
+        return typeof value === "string" ? Math.min(value.length, MAX_STRING_DISPLAY_LENGTH) : 15;
+      case "runStatus":
+        // Status badges have icon + text, approximate width
+        return 12;
+      case "duration":
+        if (typeof value === "number") {
+          // Format and measure: "1h 23m 45s" style
+          const formatted = formatDurationMilliseconds(value, { style: "short" });
+          return formatted.length;
+        }
+        return 10;
+      case "durationSeconds":
+        if (typeof value === "number") {
+          const formatted = formatDurationMilliseconds(value * 1000, { style: "short" });
+          return formatted.length;
+        }
+        return 10;
+      case "cost":
+      case "costInDollars":
+        // Currency format: "$1,234.56"
+        if (typeof value === "number") {
+          const amount = column.customRenderType === "cost" ? value / 100 : value;
+          return formatCurrencyAccurate(amount).length;
+        }
+        return 12;
+      case "machine":
+        // Machine preset names like "small-1x"
+        return typeof value === "string" ? value.length : 10;
+      case "environmentType":
+        // Environment labels: "PRODUCTION", "STAGING", etc.
+        return 12;
+      case "project":
+      case "environment":
+        return typeof value === "string" ? Math.min(value.length, 20) : 12;
+      case "queue":
+        return typeof value === "string" ? Math.min(value.length, 25) : 15;
+      case "deploymentId":
+        return typeof value === "string" ? Math.min(value.length, 25) : 20;
+    }
+  }
+
+  // Handle by ClickHouse type
+  if (isDateTimeType(column.type)) {
+    // DateTime format: "Jan 15, 2026, 12:34:56 PM"
+    return 24;
+  }
+
+  if (column.type === "JSON" || column.type.startsWith("Array")) {
+    if (typeof value === "object") {
+      const jsonStr = JSON.stringify(value);
+      return Math.min(jsonStr.length, MAX_STRING_DISPLAY_LENGTH);
+    }
+  }
+
+  if (isBooleanType(column.type)) {
+    return 5; // "true" or "false"
+  }
+
+  if (isNumericType(column.type)) {
+    if (typeof value === "number") {
+      return formatNumber(value).length;
+    }
+  }
+
+  // Default: string length capped at max display length
+  const strValue = String(value);
+  return Math.min(strValue.length, MAX_STRING_DISPLAY_LENGTH);
+}
+
+/**
+ * Calculate the optimal width for a column based on its content
+ */
+function calculateColumnWidth(
+  columnName: string,
+  rows: RowData[],
+  column: OutputColumnMetadata
+): number {
+  // Calculate minimum width needed for the header (text + icons)
+  const headerWidth = Math.ceil(columnName.length * CHAR_WIDTH_PX + HEADER_ICONS_WIDTH_PX);
+
+  // Sample rows to find max content length
+  let maxContentLength = 0;
+  const sampleRows = rows.slice(0, SAMPLE_SIZE);
+  for (const row of sampleRows) {
+    const value = row[columnName];
+    const displayLength = getDisplayLength(value, column);
+    if (displayLength > maxContentLength) {
+      maxContentLength = displayLength;
+    }
+  }
+
+  // Calculate pixel width for content: characters * char width + padding
+  const contentWidth = Math.ceil(maxContentLength * CHAR_WIDTH_PX + CELL_PADDING_PX);
+
+  // Use the larger of header width or content width
+  const calculatedWidth = Math.max(headerWidth, contentWidth);
+
+  // Apply min/max bounds
+  return Math.min(MAX_COLUMN_WIDTH, Math.max(MIN_COLUMN_WIDTH, calculatedWidth));
+}
+
+/**
+ * Truncate a string for display, adding ellipsis if it exceeds max length
+ */
+function truncateString(value: string, maxLength: number = MAX_STRING_DISPLAY_LENGTH): string {
+  if (value.length <= maxLength) {
+    return value;
+  }
+  return value.slice(0, maxLength) + "…";
+}
+
+/**
+ * Convert any value to a string suitable for copying
+ * Objects and arrays are JSON stringified, primitives use String()
+ */
+function valueToString(value: unknown): string {
+  if (value === null) return "NULL";
+  if (value === undefined) return "UNDEFINED";
+  if (typeof value === "object") return JSON.stringify(value);
+  return String(value);
+}
+
+/**
+ * Check if a ClickHouse type is a DateTime type
+ */
+function isDateTimeType(type: string): boolean {
+  return (
+    type === "DateTime" ||
+    type === "DateTime64" ||
+    type === "Date" ||
+    type === "Date32" ||
+    type.startsWith("Nullable(DateTime") ||
+    type.startsWith("Nullable(Date")
+  );
+}
+
+/**
+ * Check if a ClickHouse type is a numeric type
+ */
+function isNumericType(type: string): boolean {
+  return (
+    type.startsWith("Int") ||
+    type.startsWith("UInt") ||
+    type.startsWith("Float") ||
+    type.startsWith("Nullable(Int") ||
+    type.startsWith("Nullable(UInt") ||
+    type.startsWith("Nullable(Float")
+  );
+}
+
+/**
+ * Check if a ClickHouse type is a boolean type
+ */
+function isBooleanType(type: string): boolean {
+  return type === "Bool" || type === "Nullable(Bool)";
+}
+
+/**
+ * Check if a column should be right-aligned (numeric columns, duration, cost)
+ */
+function isRightAlignedColumn(column: OutputColumnMetadata): boolean {
+  if (
+    column.customRenderType === "duration" ||
+    column.customRenderType === "durationSeconds" ||
+    column.customRenderType === "cost" ||
+    column.customRenderType === "costInDollars"
+  ) {
+    return true;
+  }
+  const fmt = column.format;
+  if (fmt === "bytes" || fmt === "decimalBytes" || fmt === "percent" || fmt === "quantity") {
+    return true;
+  }
+  return isNumericType(column.type);
+}
+
+/**
+ * Wrapper component that tracks hover state and passes it to CellValue
+ * This optimizes rendering by only enabling tooltips when the cell is hovered
+ */
+function CellValueWrapper({
+  value,
+  column,
+  prettyFormatting,
+}: {
+  value: unknown;
+  column: OutputColumnMetadata;
+  prettyFormatting: boolean;
+}) {
+  const [hovered, setHovered] = useState(false);
+
+  return (
+    <span
+      className="flex flex-1 items-center"
+      onMouseEnter={() => setHovered(true)}
+      onMouseLeave={() => setHovered(false)}
+    >
+      <CellValue
+        value={value}
+        column={column}
+        prettyFormatting={prettyFormatting}
+        hovered={hovered}
+      />
+    </span>
+  );
+}
+
+/**
+ * Render a cell value based on its type and optional customRenderType
+ */
+function CellValue({
+  value,
+  column,
+  prettyFormatting = true,
+  hovered = false,
+}: {
+  value: unknown;
+  column: OutputColumnMetadata;
+  prettyFormatting?: boolean;
+  hovered?: boolean;
+}) {
+  // Plain text mode - render everything as monospace text with truncation
+  if (!prettyFormatting) {
+    if (column.type === "JSON") {
+      return <JSONCellValue value={value} />;
+    }
+
+    const plainValue = value === null ? "NULL" : String(value);
+    const isTruncated = plainValue.length > MAX_STRING_DISPLAY_LENGTH;
+
+    if (isTruncated) {
+      return (
+        <SimpleTooltip
+          content={
+            <pre className="max-w-sm whitespace-pre-wrap break-all font-mono text-xs">
+              {plainValue}
+            </pre>
+          }
+          button={<pre className="font-mono text-xs">{truncateString(plainValue)}</pre>}
+          disableHoverableContent
+        />
+      );
+    }
+
+    return <pre className="font-mono text-xs">{plainValue}</pre>;
+  }
+
+  if (value === null) {
+    return <pre className="text-text-dimmed">NULL</pre>;
+  }
+
+  if (value === undefined) {
+    return <pre className="text-text-dimmed">UNDEFINED</pre>;
+  }
+
+  // Check format hint for new format types (from prettyFormat())
+  if (column.format && !column.customRenderType) {
+    switch (column.format) {
+      case "bytes":
+        if (typeof value === "number") {
+          return <span className="tabular-nums">{formatBytes(value)}</span>;
+        }
+        break;
+      case "decimalBytes":
+        if (typeof value === "number") {
+          return <span className="tabular-nums">{formatDecimalBytes(value)}</span>;
+        }
+        break;
+      case "percent":
+        if (typeof value === "number") {
+          return <span className="tabular-nums">{value.toFixed(2)}%</span>;
+        }
+        break;
+      case "quantity":
+        if (typeof value === "number") {
+          return <span className="tabular-nums">{formatQuantity(value)}</span>;
+        }
+        break;
+    }
+  }
+
+  // First check customRenderType for special rendering
+  if (column.customRenderType) {
+    switch (column.customRenderType) {
+      case "runId": {
+        if (typeof value === "string") {
+          return (
+            <SimpleTooltip
+              content="Jump to run"
+              disableHoverableContent
+              hidden={!hovered}
+              button={<TextLink to={v3RunPathFromFriendlyId(value)}>{value}</TextLink>}
+            />
+          );
+        }
+        break;
+      }
+      case "runStatus": {
+        const status = isTaskRunStatus(value)
+          ? value
+          : isRunFriendlyStatus(value)
+          ? runStatusFromFriendlyTitle(value)
+          : undefined;
+        if (status) {
+          return (
+            <SimpleTooltip
+              content={descriptionForTaskRunStatus(status)}
+              disableHoverableContent
+              hidden={!hovered}
+              button={<TaskRunStatusCombo status={status} />}
+            />
+          );
+        }
+        break;
+      }
+      case "duration":
+        if (typeof value === "number") {
+          return (
+            <span className="tabular-nums">
+              {formatDurationMilliseconds(value, { style: "short" })}
+            </span>
+          );
+        }
+        return <span>{String(value)}</span>;
+      case "durationSeconds":
+        if (typeof value === "number") {
+          return (
+            <span className="tabular-nums">
+              {formatDurationMilliseconds(value * 1000, { style: "short" })}
+            </span>
+          );
+        }
+        return <span>{String(value)}</span>;
+      case "cost":
+        if (typeof value === "number") {
+          return <span className="tabular-nums">{formatCurrencyAccurate(value / 100)}</span>;
+        }
+        return <span>{String(value)}</span>;
+      case "costInDollars":
+        if (typeof value === "number") {
+          return <span className="tabular-nums">{formatCurrencyAccurate(value)}</span>;
+        }
+        return <span>{String(value)}</span>;
+      case "machine": {
+        const preset = MachinePresetName.safeParse(value);
+        if (preset.success) {
+          return <MachineLabelCombo preset={preset.data} />;
+        }
+        return <span>{String(value)}</span>;
+      }
+      case "environmentType": {
+        if (
+          typeof value === "string" &&
+          ["PRODUCTION", "STAGING", "DEVELOPMENT", "PREVIEW"].includes(value)
+        ) {
+          return (
+            <EnvironmentLabel
+              environment={{ type: value as "PRODUCTION" | "STAGING" | "DEVELOPMENT" | "PREVIEW" }}
+            />
+          );
+        }
+        return <span>{String(value)}</span>;
+      }
+      case "project": {
+        if (typeof value === "string") {
+          return <ProjectCellValue value={value} />;
+        }
+        return <span>{String(value)}</span>;
+      }
+      case "environment": {
+        if (typeof value === "string") {
+          return <EnvironmentCellValue value={value} />;
+        }
+        return <span>{String(value)}</span>;
+      }
+      case "queue": {
+        if (typeof value === "string") {
+          const type = value.startsWith("task/") ? "task" : "custom";
+          return <QueueName type={type} name={value.replace("task/", "")} />;
+        }
+        return <span>{String(value)}</span>;
+      }
+      case "deploymentId": {
+        if (typeof value === "string" && value.startsWith("deployment_")) {
+          return (
+            <SimpleTooltip
+              content="Jump to deployment"
+              disableHoverableContent
+              hidden={!hovered}
+              button={<TextLink to={`/deployments/${value}`}>{value}</TextLink>}
+            />
+          );
+        }
+        return <span>{String(value)}</span>;
+      }
+    }
+  }
+
+  // Fall back to rendering based on ClickHouse type
+  const { type } = column;
+
+  if (isDateTimeType(type)) {
+    if (typeof value === "string") {
+      return <DateTimeAccurate date={value} showTooltip={hovered} />;
+    }
+    return <span>{String(value)}</span>;
+  }
+
+  if (type === "JSON") {
+    return <JSONCellValue value={value} />;
+  }
+
+  if (type.startsWith("Array")) {
+    const arrayString = JSON.stringify(value);
+    const isTruncated = arrayString.length > MAX_STRING_DISPLAY_LENGTH;
+
+    if (isTruncated) {
+      return (
+        <SimpleTooltip
+          content={
+            <pre className="max-w-sm whitespace-pre-wrap break-all font-mono text-xs">
+              {arrayString}
+            </pre>
+          }
+          button={
+            <span className="font-mono text-xs text-text-dimmed">
+              {truncateString(arrayString)}
+            </span>
+          }
+          disableHoverableContent
+        />
+      );
+    }
+    return <span className="font-mono text-xs text-text-dimmed">{arrayString}</span>;
+  }
+
+  if (isBooleanType(type)) {
+    if (typeof value === "boolean") {
+      return <span className="text-text-dimmed">{value ? "true" : "false"}</span>;
+    }
+    if (typeof value === "number") {
+      return <span className="text-text-dimmed">{value === 1 ? "true" : "false"}</span>;
+    }
+    return <span>{String(value)}</span>;
+  }
+
+  if (isNumericType(type)) {
+    if (typeof value === "number") {
+      return <span className="tabular-nums">{formatNumber(value)}</span>;
+    }
+    return <span>{String(value)}</span>;
+  }
+
+  const stringValue = String(value);
+  const isTruncated = stringValue.length > MAX_STRING_DISPLAY_LENGTH;
+
+  if (isTruncated) {
+    return (
+      <SimpleTooltip
+        content={
+          <pre className="max-w-sm whitespace-pre-wrap break-all font-mono text-xs">
+            {stringValue}
+          </pre>
+        }
+        button={<span>{truncateString(stringValue)}</span>}
+        disableHoverableContent
+      />
+    );
+  }
+
+  return <span>{stringValue}</span>;
+}
+
+function ProjectCellValue({ value }: { value: string }) {
+  const organization = useOrganization();
+  const project = organization.projects.find((p) => p.externalRef === value);
+
+  if (!project) {
+    return <span>{value}</span>;
+  }
+
+  return <TextLink to={v3ProjectPath(organization, project)}>{project.name}</TextLink>;
+}
+
+function EnvironmentCellValue({ value }: { value: string }) {
+  const project = useProject();
+  const environment = project.environments.find((e) => e.slug === value);
+
+  if (!environment) {
+    return <span>{value}</span>;
+  }
+
+  return <EnvironmentSlug environment={environment} />;
+}
+
+function JSONCellValue({ value }: { value: unknown }) {
+  // If the value is already a string (e.g., from a textColumn optimization),
+  // use it directly without double-stringifying
+  const jsonString = typeof value === "string" ? value : JSON.stringify(value);
+  const isTruncated = jsonString.length > MAX_STRING_DISPLAY_LENGTH;
+
+  if (isTruncated) {
+    return (
+      <SimpleTooltip
+        content={
+          <pre className="max-w-sm whitespace-pre-wrap break-all font-mono text-xs">
+            {jsonString}
+          </pre>
+        }
+        button={
+          <span className="font-mono text-xs text-text-dimmed">{truncateString(jsonString)}</span>
+        }
+        disableHoverableContent
+      />
+    );
+  }
+
+  return <span className="font-mono text-xs text-text-dimmed">{jsonString}</span>;
+}
+
+/**
+ * Copyable cell component for virtualized rows
+ */
+function CopyableCell({
+  value,
+  alignment,
+  children,
+}: {
+  value: string;
+  alignment: "left" | "right";
+  children: React.ReactNode;
+}) {
+  const [isHovered, setIsHovered] = useState(false);
+  const { copy, copied } = useCopy(value);
+
+  return (
+    <div
+      className={cn(
+        "relative flex h-full w-full items-center overflow-hidden px-2",
+        "bg-background-bright group-hover/row:bg-charcoal-750",
+        "font-mono text-xs text-text-dimmed group-hover/row:text-text-bright",
+        "[&_a:focus-visible]:underline [&_a:focus-visible]:underline-offset-[3px] [&_a:focus-visible]:outline-none",
+        alignment === "right" && "justify-end"
+      )}
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => setIsHovered(false)}
+    >
+      <span className="flex items-center truncate">{children}</span>
+      {isHovered && (
+        <span
+          onClick={(e) => {
+            e.stopPropagation();
+            e.preventDefault();
+            copy();
+          }}
+          className="absolute right-1 top-1/2 z-10 flex -translate-y-1/2 cursor-pointer"
+        >
+          <SimpleTooltip
+            button={
+              <span
+                className={cn(
+                  "flex size-6 items-center justify-center rounded border border-charcoal-650 bg-charcoal-750",
+                  copied
+                    ? "text-green-500"
+                    : "text-text-dimmed hover:border-charcoal-600 hover:bg-charcoal-700 hover:text-text-bright"
+                )}
+              >
+                {copied ? (
+                  <ClipboardCheckIcon className="size-3.5" />
+                ) : (
+                  <ClipboardIcon className="size-3.5" />
+                )}
+              </span>
+            }
+            content={copied ? "Copied!" : "Copy"}
+            disableHoverableContent
+          />
+        </span>
+      )}
+    </div>
+  );
+}
+
+/**
+ * Header cell component with tooltip support and filter toggle
+ */
+function HeaderCellContent({
+  alignment,
+  tooltip,
+  children,
+  onFilterClick,
+  showFilters,
+  hasActiveFilter,
+  sortDirection,
+  onSortClick,
+  canSort,
+}: {
+  alignment: "left" | "right";
+  tooltip?: React.ReactNode;
+  children: React.ReactNode;
+  onFilterClick?: () => void;
+  showFilters?: boolean;
+  hasActiveFilter?: boolean;
+  sortDirection?: SortDirection | false;
+  onSortClick?: (event: React.MouseEvent) => void;
+  canSort?: boolean;
+}) {
+  const [isCellHovered, setIsCellHovered] = useState(false);
+  const [isFilterHovered, setIsFilterHovered] = useState(false);
+
+  const sortHighlighted = isCellHovered && !isFilterHovered;
+
+  return (
+    <div
+      className={cn(
+        "flex w-full items-center gap-1 overflow-hidden bg-background-bright py-2 pl-2 pr-3",
+        "font-mono text-xs font-medium text-text-bright",
+        alignment === "right" && "justify-end",
+        canSort && "cursor-pointer select-none"
+      )}
+      onMouseEnter={() => setIsCellHovered(true)}
+      onMouseLeave={() => setIsCellHovered(false)}
+      onClick={onSortClick}
+    >
+      {tooltip ? (
+        <div
+          className={cn("flex min-w-0 flex-1 items-center gap-1 truncate", {
+            "justify-end": alignment === "right",
+          })}
+        >
+          <span className="truncate text-left">{children}</span>
+          <span className="flex flex-shrink-0">
+            <InfoIconTooltip
+              content={tooltip}
+              contentClassName="normal-case tracking-normal"
+              enabled={isCellHovered}
+              disableHoverableContent
+            />
+          </span>
+        </div>
+      ) : (
+        <span className="min-w-0 flex-1 truncate text-left">{children}</span>
+      )}
+      {/* Sort indicator */}
+      {canSort && (
+        <span
+          className={cn(
+            "flex-shrink-0 transition-colors",
+            sortHighlighted ? "text-text-bright" : "text-text-dimmed"
+          )}
+        >
+          {sortDirection === "asc" ? (
+            <ChevronUpIcon className="size-4" />
+          ) : sortDirection === "desc" ? (
+            <ChevronDownIcon className="size-4" />
+          ) : (
+            <ChevronUpDownIcon className="size-4" />
+          )}
+        </span>
+      )}
+      {onFilterClick && (
+        <button
+          onClick={(e) => {
+            e.stopPropagation();
+            onFilterClick();
+          }}
+          onMouseEnter={() => setIsFilterHovered(true)}
+          onMouseLeave={() => setIsFilterHovered(false)}
+          className="flex-shrink-0 rounded text-text-dimmed transition-colors focus-custom hover:text-text-bright"
+          title="Toggle column filters"
+        >
+          {showFilters ? <IconFilter2X className="size-4" /> : <IconFilter2 className="size-4" />}
+        </button>
+      )}
+    </div>
+  );
+}
+
+/**
+ * Filter input cell for the filter row
+ */
+function FilterCell({
+  column,
+  width,
+  shouldFocus,
+  onFocused,
+}: {
+  column: Column<RowData, unknown>;
+  width: number;
+  shouldFocus?: boolean;
+  onFocused?: () => void;
+}) {
+  const columnFilterValue = column.getFilterValue() as string;
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  useEffect(() => {
+    if (shouldFocus && inputRef.current) {
+      inputRef.current.focus();
+      onFocused?.();
+    }
+  }, [shouldFocus, onFocused]);
+
+  return (
+    <div className="flex items-center bg-background-bright px-1.5 pb-2" style={{ width }}>
+      <DebouncedInput
+        ref={inputRef}
+        value={columnFilterValue ?? ""}
+        onChange={(value) => column.setFilterValue(value)}
+        placeholder="Filter..."
+        className={cn(
+          "w-full rounded border border-charcoal-700 bg-charcoal-800 px-2 py-1",
+          "text-xs text-text-bright placeholder:text-text-dimmed",
+          "focus:border-indigo-500/50 focus:outline-none focus:ring-1 focus:ring-indigo-500/50"
+        )}
+      />
+    </div>
+  );
+}
+
+export const TSQLResultsTable = memo(function TSQLResultsTable({
+  rows,
+  columns,
+  prettyFormatting = true,
+  sorting: defaultSorting = [],
+  showHeaderOnEmpty = false,
+}: {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+  prettyFormatting?: boolean;
+  sorting?: SortingState;
+  /** When true, show column headers + "No results" on empty data. When false, show a blank state icon. */
+  showHeaderOnEmpty?: boolean;
+}) {
+  const tableContainerRef = useRef<HTMLDivElement>(null);
+
+  // State for column filters and filter row visibility
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
+  const [showFilters, setShowFilters] = useState(false);
+  // Track which column's filter should be focused
+  const [focusFilterColumn, setFocusFilterColumn] = useState<string | null>(null);
+  // State for column sorting
+  const [sorting, setSorting] = useState<SortingState>(defaultSorting);
+
+  // Create TanStack Table column definitions from OutputColumnMetadata
+  // Calculate column widths based on content
+  const columnDefs = useMemo<ColumnDef<RowData, unknown>[]>(
+    () =>
+      columns.map((col) => ({
+        id: col.name,
+        accessorKey: col.name,
+        header: () => col.name,
+        cell: (info: CellContext<RowData, unknown>) => (
+          <CellValueWrapper
+            value={info.getValue()}
+            column={col}
+            prettyFormatting={prettyFormatting}
+          />
+        ),
+        meta: {
+          outputColumn: col,
+          alignment: isRightAlignedColumn(col) ? "right" : "left",
+        } as ColumnMeta,
+        size: calculateColumnWidth(col.name, rows, col),
+        filterFn: fuzzyFilter,
+      })),
+    [columns, rows, prettyFormatting]
+  );
+
+  // Initialize TanStack Table
+  // Column resize mode: 'onChange' for real-time feedback, 'onEnd' for performance
+  const columnResizeMode: ColumnResizeMode = "onChange";
+
+  const table = useReactTable({
+    data: rows,
+    columns: columnDefs,
+    columnResizeMode,
+    state: {
+      columnFilters,
+      sorting,
+    },
+    onColumnFiltersChange: setColumnFilters,
+    onSortingChange: setSorting,
+    getCoreRowModel: getCoreRowModel(),
+    getFilteredRowModel: getFilteredRowModel(),
+    getSortedRowModel: getSortedRowModel(),
+  });
+
+  const { rows: tableRows } = table.getRowModel();
+
+  // Set up the virtualizer
+  const rowVirtualizer = useVirtualizer({
+    count: tableRows.length,
+    estimateSize: () => ROW_HEIGHT,
+    getScrollElement: () => tableContainerRef.current,
+    overscan: 20,
+  });
+
+  if (!columns.length) return null;
+
+  // Empty state
+  if (rows.length === 0) {
+    if (!showHeaderOnEmpty) {
+      return <ChartBlankState icon={IconTable} message="No data to display" />;
+    }
+
+    return (
+      <div
+        className="h-full min-h-0 w-full overflow-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        style={{ position: "relative" }}
+      >
+        <table style={{ display: "grid" }}>
+          <thead
+            className="border-t border-grid-bright bg-background-bright after:absolute after:bottom-0 after:left-0 after:right-0 after:h-px after:bg-grid-bright"
+            style={{
+              display: "grid",
+              position: "sticky",
+              top: 0,
+              zIndex: 1,
+            }}
+          >
+            {table.getHeaderGroups().map((headerGroup) => (
+              <tr key={headerGroup.id} style={{ display: "flex", width: "100%" }}>
+                {headerGroup.headers.map((header) => {
+                  const meta = header.column.columnDef.meta as ColumnMeta | undefined;
+                  return (
+                    <th
+                      key={header.id}
+                      className="group/header relative"
+                      style={{
+                        display: "flex",
+                        width: header.getSize(),
+                      }}
+                    >
+                      <HeaderCellContent alignment={meta?.alignment ?? "left"}>
+                        {flexRender(header.column.columnDef.header, header.getContext())}
+                      </HeaderCellContent>
+                    </th>
+                  );
+                })}
+              </tr>
+            ))}
+          </thead>
+          <tbody style={{ display: "grid" }}>
+            <tr style={{ display: "flex", width: "100%" }}>
+              <td className="w-full px-3 py-6" colSpan={columns.length}>
+                <div className="flex items-center justify-center gap-1.5">
+                  <AlertCircle className="size-5 text-text-dimmed/50" />
+                  <Paragraph variant="small" className="text-text-dimmed">
+                    This query returned no results
+                  </Paragraph>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      ref={tableContainerRef}
+      className="h-full min-h-0 w-full overflow-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+      style={{ position: "relative" }}
+    >
+      <table style={{ display: "grid" }}>
+        <thead
+          className="border-t border-grid-bright bg-background-bright after:absolute after:bottom-0 after:left-0 after:right-0 after:h-px after:bg-grid-bright"
+          style={{
+            display: "grid",
+            position: "sticky",
+            top: 0,
+            zIndex: 1,
+          }}
+        >
+          {/* Main header row */}
+          {table.getHeaderGroups().map((headerGroup) => (
+            <tr key={headerGroup.id} style={{ display: "flex", width: "100%" }}>
+              {headerGroup.headers.map((header) => {
+                const meta = header.column.columnDef.meta as ColumnMeta | undefined;
+                return (
+                  <th
+                    key={header.id}
+                    className="group/header relative"
+                    style={{
+                      display: "flex",
+                      width: header.getSize(),
+                    }}
+                  >
+                    <HeaderCellContent
+                      alignment={meta?.alignment ?? "left"}
+                      tooltip={meta?.outputColumn.description}
+                      onFilterClick={() => {
+                        if (!showFilters) {
+                          setFocusFilterColumn(header.id);
+                        } else {
+                          setColumnFilters([]);
+                        }
+                        setShowFilters(!showFilters);
+                      }}
+                      showFilters={showFilters}
+                      hasActiveFilter={!!header.column.getFilterValue()}
+                      sortDirection={header.column.getIsSorted()}
+                      onSortClick={header.column.getToggleSortingHandler()}
+                      canSort={header.column.getCanSort()}
+                    >
+                      {flexRender(header.column.columnDef.header, header.getContext())}
+                    </HeaderCellContent>
+                    {/* Column resizer */}
+                    <div
+                      onDoubleClick={() => header.column.resetSize()}
+                      onMouseDown={header.getResizeHandler()}
+                      onTouchStart={header.getResizeHandler()}
+                      className={cn(
+                        "absolute right-0 top-0 h-full w-0.5 cursor-col-resize touch-none select-none",
+                        "opacity-0 group-hover/header:opacity-100",
+                        "bg-charcoal-600 hover:bg-indigo-500",
+                        header.column.getIsResizing() && "bg-indigo-500 opacity-100"
+                      )}
+                    />
+                  </th>
+                );
+              })}
+            </tr>
+          ))}
+          {/* Filter row - shown when filters are toggled */}
+          {showFilters && (
+            <tr style={{ display: "flex", width: "100%" }}>
+              {table.getHeaderGroups()[0]?.headers.map((header) => (
+                <FilterCell
+                  key={`filter-${header.id}`}
+                  column={header.column}
+                  width={header.getSize()}
+                  shouldFocus={focusFilterColumn === header.id}
+                  onFocused={() => setFocusFilterColumn(null)}
+                />
+              ))}
+            </tr>
+          )}
+        </thead>
+        <tbody
+          style={{
+            display: "grid",
+            height: `${rowVirtualizer.getTotalSize()}px`,
+            position: "relative",
+          }}
+          className="divide-y divide-charcoal-700 bg-background-bright after:absolute after:bottom-0 after:left-0 after:right-0 after:z-[1] after:h-px after:bg-grid-bright"
+        >
+          {rowVirtualizer.getVirtualItems().map((virtualRow) => {
+            const row = tableRows[virtualRow.index];
+            return (
+              <tr
+                key={row.id}
+                data-index={virtualRow.index}
+                className="group/row hover:bg-charcoal-750"
+                style={{
+                  display: "flex",
+                  position: "absolute",
+                  transform: `translateY(${virtualRow.start}px)`,
+                  width: "100%",
+                  height: `${virtualRow.size}px`,
+                }}
+              >
+                {row.getVisibleCells().map((cell) => {
+                  const meta = cell.column.columnDef.meta as ColumnMeta | undefined;
+                  return (
+                    <td
+                      key={cell.id}
+                      style={{
+                        display: "flex",
+                        width: cell.column.getSize(),
+                      }}
+                    >
+                      <CopyableCell
+                        alignment={meta?.alignment ?? "left"}
+                        value={valueToString(cell.getValue())}
+                      >
+                        {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                      </CopyableCell>
+                    </td>
+                  );
+                })}
+              </tr>
+            );
+          })}
+        </tbody>
+      </table>
+    </div>
+  );
+});
diff --git a/apps/webapp/app/components/code/chartColors.ts b/apps/webapp/app/components/code/chartColors.ts
new file mode 100644
index 00000000000..26bcc487a2e
--- /dev/null
+++ b/apps/webapp/app/components/code/chartColors.ts
@@ -0,0 +1,183 @@
+/**
+ * Chart color palette defined in HSL (Hue, Saturation, Lightness).
+ *
+ * HSL is a human-friendly color model:
+ *   h: 0–360  (hue — position on the color wheel: 0=red, 120=green, 240=blue)
+ *   s: 0–100  (saturation — 0 is gray, 100 is full color)
+ *   l: 0–100  (lightness — 0 is black, 50 is pure color, 100 is white)
+ */
+
+interface HSLColor {
+  h: number;
+  s: number;
+  l: number;
+}
+
+interface ChartColorDef {
+  name: string;
+  hsl: HSLColor;
+}
+
+// ---------------------------------------------------------------------------
+// Palette — 30 distinct colors for chart series, defined in HSL
+// ---------------------------------------------------------------------------
+const CHART_COLOR_DEFS: ChartColorDef[] = [
+  // Primary colors (high contrast, spread across hue wheel)
+  { name: "Purple", hsl: { h: 252, s: 98, l: 66 } },
+  { name: "Green", hsl: { h: 142, s: 71, l: 45 } },
+  { name: "Amber", hsl: { h: 38, s: 92, l: 50 } },
+  { name: "Red", hsl: { h: 0, s: 84, l: 60 } },
+  { name: "Cyan", hsl: { h: 189, s: 95, l: 43 } },
+  { name: "Pink", hsl: { h: 330, s: 81, l: 60 } },
+  { name: "Violet", hsl: { h: 258, s: 90, l: 66 } },
+  { name: "Teal", hsl: { h: 173, s: 80, l: 40 } },
+  { name: "Orange", hsl: { h: 25, s: 95, l: 53 } },
+  { name: "Indigo", hsl: { h: 239, s: 84, l: 67 } },
+  // Extended palette
+  { name: "Lime", hsl: { h: 84, s: 81, l: 44 } },
+  { name: "Sky", hsl: { h: 199, s: 89, l: 48 } },
+  { name: "Rose", hsl: { h: 350, s: 89, l: 60 } },
+  { name: "Fuchsia", hsl: { h: 271, s: 91, l: 65 } },
+  { name: "Yellow", hsl: { h: 45, s: 93, l: 47 } },
+  { name: "Emerald", hsl: { h: 160, s: 84, l: 39 } },
+  { name: "Blue", hsl: { h: 217, s: 91, l: 60 } },
+  { name: "Magenta", hsl: { h: 292, s: 84, l: 61 } },
+  { name: "Stone", hsl: { h: 25, s: 5, l: 45 } },
+  { name: "Gold", hsl: { h: 48, s: 96, l: 53 } },
+  // Additional distinct colors (lighter variants)
+  { name: "Turquoise", hsl: { h: 173, s: 66, l: 50 } },
+  { name: "Light Orange", hsl: { h: 27, s: 96, l: 61 } },
+  { name: "Yellow-Green", hsl: { h: 83, s: 78, l: 55 } },
+  { name: "Light Blue", hsl: { h: 198, s: 93, l: 60 } },
+  { name: "Light Purple", hsl: { h: 270, s: 95, l: 75 } },
+  { name: "Light Green", hsl: { h: 142, s: 69, l: 58 } },
+  { name: "Light Amber", hsl: { h: 43, s: 96, l: 56 } },
+  { name: "Light Pink", hsl: { h: 329, s: 86, l: 70 } },
+  { name: "Light Cyan", hsl: { h: 187, s: 92, l: 69 } },
+  { name: "Light Indigo", hsl: { h: 235, s: 89, l: 74 } },
+];
+
+// ---------------------------------------------------------------------------
+// HSL ↔ Hex conversion
+// ---------------------------------------------------------------------------
+
+/** Convert an HSL color (h: 0–360, s: 0–100, l: 0–100) to a hex string */
+function hslToHex({ h, s, l }: HSLColor): string {
+  const sNorm = s / 100;
+  const lNorm = l / 100;
+
+  const c = (1 - Math.abs(2 * lNorm - 1)) * sNorm;
+  const hPrime = h / 60;
+  const x = c * (1 - Math.abs((hPrime % 2) - 1));
+  const m = lNorm - c / 2;
+
+  let r1: number, g1: number, b1: number;
+
+  if (hPrime < 1) {
+    r1 = c;
+    g1 = x;
+    b1 = 0;
+  } else if (hPrime < 2) {
+    r1 = x;
+    g1 = c;
+    b1 = 0;
+  } else if (hPrime < 3) {
+    r1 = 0;
+    g1 = c;
+    b1 = x;
+  } else if (hPrime < 4) {
+    r1 = 0;
+    g1 = x;
+    b1 = c;
+  } else if (hPrime < 5) {
+    r1 = x;
+    g1 = 0;
+    b1 = c;
+  } else {
+    r1 = c;
+    g1 = 0;
+    b1 = x;
+  }
+
+  const toHex = (v: number) =>
+    Math.round((v + m) * 255)
+      .toString(16)
+      .padStart(2, "0");
+
+  return `#${toHex(r1)}${toHex(g1)}${toHex(b1)}`;
+}
+
+/** Convert a hex string to HSL (h: 0–360, s: 0–100, l: 0–100) */
+function hexToHsl(hex: string): HSLColor {
+  const r = parseInt(hex.slice(1, 3), 16) / 255;
+  const g = parseInt(hex.slice(3, 5), 16) / 255;
+  const b = parseInt(hex.slice(5, 7), 16) / 255;
+
+  const max = Math.max(r, g, b);
+  const min = Math.min(r, g, b);
+  const delta = max - min;
+  const l = (max + min) / 2;
+
+  if (delta === 0) {
+    return { h: 0, s: 0, l: Math.round(l * 100) };
+  }
+
+  const s = delta / (1 - Math.abs(2 * l - 1));
+
+  let h: number;
+  if (max === r) {
+    h = 60 * (((g - b) / delta + 6) % 6);
+  } else if (max === g) {
+    h = 60 * ((b - r) / delta + 2);
+  } else {
+    h = 60 * ((r - g) / delta + 4);
+  }
+
+  return {
+    h: Math.round(h),
+    s: Math.round(s * 100),
+    l: Math.round(l * 100),
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Derived hex palette (for consumers that need plain hex strings)
+// ---------------------------------------------------------------------------
+
+/** Color palette for chart series — 30 distinct hex colors derived from HSL definitions */
+const CHART_COLORS: string[] = CHART_COLOR_DEFS.map((def) => hslToHex(def.hsl));
+
+/** Get the hex color for a series by its index (wraps around) */
+export function getSeriesColor(index: number): string {
+  return CHART_COLORS[index % CHART_COLORS.length];
+}
+
+// ---------------------------------------------------------------------------
+// Hue-sorted palette (rainbow order for color pickers)
+// ---------------------------------------------------------------------------
+
+const SATURATION_THRESHOLD = 10;
+
+/**
+ * Chart colors sorted by perceived hue — the natural rainbow order
+ * that humans expect: red -> orange -> yellow -> green -> cyan -> blue -> purple -> pink.
+ *
+ * Very desaturated colors (like grays) are placed at the end since they don't
+ * have a strong hue.
+ */
+export const CHART_COLORS_BY_HUE: string[] = [...CHART_COLOR_DEFS]
+  .sort((a, b) => {
+    const aIsGray = a.hsl.s < SATURATION_THRESHOLD;
+    const bIsGray = b.hsl.s < SATURATION_THRESHOLD;
+
+    // Push desaturated colors to the end
+    if (aIsGray && !bIsGray) return 1;
+    if (!aIsGray && bIsGray) return -1;
+    if (aIsGray && bIsGray) return a.hsl.l - b.hsl.l;
+
+    // Sort by hue, then by saturation (more vivid first), then by lightness
+    if (a.hsl.h !== b.hsl.h) return a.hsl.h - b.hsl.h;
+    if (a.hsl.s !== b.hsl.s) return b.hsl.s - a.hsl.s;
+    return a.hsl.l - b.hsl.l;
+  })
+  .map((def) => hslToHex(def.hsl));
diff --git a/apps/webapp/app/components/code/codeMirrorSetup.ts b/apps/webapp/app/components/code/codeMirrorSetup.ts
index 811a6ebc298..52a8e12a4d8 100644
--- a/apps/webapp/app/components/code/codeMirrorSetup.ts
+++ b/apps/webapp/app/components/code/codeMirrorSetup.ts
@@ -1,5 +1,5 @@
 import { closeBrackets } from "@codemirror/autocomplete";
-import { indentWithTab } from "@codemirror/commands";
+import { indentWithTab, history, historyKeymap, undo, redo } from "@codemirror/commands";
 import { bracketMatching } from "@codemirror/language";
 import { lintKeymap } from "@codemirror/lint";
 import { highlightSelectionMatches } from "@codemirror/search";
@@ -18,6 +18,7 @@ export function getEditorSetup(showLineNumbers = true, showHighlights = true): A
   const options = [
     drawSelection(),
     dropCursor(),
+    history(),
     bracketMatching(),
     closeBrackets(),
     Prec.highest(
@@ -31,7 +32,15 @@ export function getEditorSetup(showLineNumbers = true, showHighlights = true): A
         },
       ])
     ),
-    keymap.of([indentWithTab, ...lintKeymap]),
+    // Explicit undo/redo keybindings with high precedence
+    Prec.high(
+      keymap.of([
+        { key: "Mod-z", run: undo },
+        { key: "Mod-Shift-z", run: redo },
+        { key: "Mod-y", run: redo },
+      ])
+    ),
+    keymap.of([indentWithTab, ...historyKeymap, ...lintKeymap]),
   ];
 
   if (showLineNumbers) {
diff --git a/apps/webapp/app/components/code/codeMirrorTheme.ts b/apps/webapp/app/components/code/codeMirrorTheme.ts
index 25167051340..2faed6eaa54 100644
--- a/apps/webapp/app/components/code/codeMirrorTheme.ts
+++ b/apps/webapp/app/components/code/codeMirrorTheme.ts
@@ -11,9 +11,10 @@ export function darkTheme(): Extension {
     ivory = "#abb2bf",
     stone = "#7d8799",
     malibu = "#61afef",
-    sage = "#98c379",
+    sage = "#afec73",
     whiskey = "#d19a66",
     violet = "#c678dd",
+    lilac = "#9b99ff",
     darkBackground = "#21252b",
     highlightBackground = "rgba(71,85,105,0.2)",
     background = "#121317",
@@ -66,9 +67,10 @@ 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" },
@@ -86,8 +88,8 @@ export function darkTheme(): Extension {
       ".cm-selectionMatch": { backgroundColor: "#aafe661a" },
 
       "&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket": {
-        backgroundColor: "#bad0f847",
-        outline: "1px solid #515a6b",
+        backgroundColor: "rgba(18, 19, 23, 0.9)",
+        outline: "1px solid rgba(81, 90, 107, 0.5)",
       },
 
       ".cm-gutters": {
@@ -165,15 +167,21 @@ export function darkTheme(): Extension {
         backgroundColor: scrollbarBg,
       },
     },
-    { dark: true }
+    { dark: true },
   );
 
   /// The highlighting style for code in the JSON Hero theme.
   const jsonHeroHighlightStyle = HighlightStyle.define([
     { tag: tags.keyword, color: violet },
     {
-      tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
-      color: coral,
+      tag: [
+        tags.name,
+        tags.deleted,
+        tags.character,
+        tags.propertyName,
+        tags.macroName,
+      ],
+      color: lilac,
     },
     { tag: [tags.function(tags.variableName), tags.labelName], color: malibu },
     {
@@ -186,6 +194,7 @@ export function darkTheme(): Extension {
         tags.typeName,
         tags.className,
         tags.number,
+        tags.bool,
         tags.changed,
         tags.annotation,
         tags.modifier,
@@ -213,7 +222,7 @@ export function darkTheme(): Extension {
     { tag: tags.link, color: stone, textDecoration: "underline" },
     { tag: tags.heading, fontWeight: "bold", color: coral },
     {
-      tag: [tags.atom, tags.bool, tags.special(tags.variableName)],
+      tag: [tags.atom, tags.special(tags.variableName)],
       color: whiskey,
     },
     {
diff --git a/apps/webapp/app/components/code/tsql/index.ts b/apps/webapp/app/components/code/tsql/index.ts
new file mode 100644
index 00000000000..bda244e30fa
--- /dev/null
+++ b/apps/webapp/app/components/code/tsql/index.ts
@@ -0,0 +1,6 @@
+// TSQL CodeMirror support
+// Provides syntax highlighting, autocompletion, and linting for TSQL queries
+
+export { createTSQLCompletion } from "./tsqlCompletion";
+export { createTSQLLinter, isValidTSQLQuery, getTSQLError, type TSQLLinterConfig } from "./tsqlLinter";
+
diff --git a/apps/webapp/app/components/code/tsql/tsqlCompletion.ts b/apps/webapp/app/components/code/tsql/tsqlCompletion.ts
new file mode 100644
index 00000000000..b53c551a4d3
--- /dev/null
+++ b/apps/webapp/app/components/code/tsql/tsqlCompletion.ts
@@ -0,0 +1,490 @@
+import type { CompletionContext, CompletionResult, Completion } from "@codemirror/autocomplete";
+import {
+  type TableSchema,
+  type ColumnSchema,
+  TSQL_CLICKHOUSE_FUNCTIONS,
+  TSQL_AGGREGATIONS,
+} from "@internal/tsql";
+
+/**
+ * SQL keywords for autocomplete
+ */
+const SQL_KEYWORDS = [
+  "SELECT",
+  "FROM",
+  "WHERE",
+  "AND",
+  "OR",
+  "NOT",
+  "IN",
+  "LIKE",
+  "ILIKE",
+  "BETWEEN",
+  "IS",
+  "NULL",
+  "TRUE",
+  "FALSE",
+  "AS",
+  "ORDER",
+  "BY",
+  "ASC",
+  "DESC",
+  "LIMIT",
+  "OFFSET",
+  "GROUP",
+  "HAVING",
+  "DISTINCT",
+  "JOIN",
+  "LEFT",
+  "RIGHT",
+  "INNER",
+  "OUTER",
+  "FULL",
+  "CROSS",
+  "ON",
+  "UNION",
+  "INTERSECT",
+  "EXCEPT",
+  "ALL",
+  "WITH",
+  "CASE",
+  "WHEN",
+  "THEN",
+  "ELSE",
+  "END",
+  "OVER",
+  "PARTITION",
+  "ROWS",
+  "RANGE",
+  "UNBOUNDED",
+  "PRECEDING",
+  "FOLLOWING",
+  "CURRENT",
+  "ROW",
+  "NULLS",
+  "FIRST",
+  "LAST",
+];
+
+/**
+ * Create keyword completions from the SQL keywords list
+ */
+function createKeywordCompletions(): Completion[] {
+  return SQL_KEYWORDS.map((keyword) => ({
+    label: keyword,
+    type: "keyword",
+    boost: -1, // Keywords should have lower priority than schema items
+  }));
+}
+
+/**
+ * Create function completions from TSQL function definitions
+ */
+function createFunctionCompletions(): Completion[] {
+  const functions: Completion[] = [];
+
+  // Add regular functions
+  for (const [name, meta] of Object.entries(TSQL_CLICKHOUSE_FUNCTIONS)) {
+    // Skip internal functions starting with _
+    if (name.startsWith("_")) continue;
+
+    const argsHint =
+      meta.maxArgs === 0
+        ? "()"
+        : meta.minArgs === meta.maxArgs
+        ? `(${meta.minArgs} args)`
+        : `(${meta.minArgs}${meta.maxArgs ? `-${meta.maxArgs}` : "+"} args)`;
+
+    functions.push({
+      label: name,
+      type: "function",
+      detail: argsHint,
+      apply: `${name}()`,
+    });
+  }
+
+  // Add aggregate functions with slightly higher boost
+  for (const [name, meta] of Object.entries(TSQL_AGGREGATIONS)) {
+    if (name.startsWith("_")) continue;
+
+    const argsHint =
+      meta.maxArgs === 0
+        ? "()"
+        : meta.minArgs === meta.maxArgs
+        ? `(${meta.minArgs} args)`
+        : `(${meta.minArgs}${meta.maxArgs ? `-${meta.maxArgs}` : "+"} args)`;
+
+    functions.push({
+      label: name,
+      type: "function",
+      detail: `aggregate ${argsHint}`,
+      apply: `${name}()`,
+      boost: 0.5,
+    });
+  }
+
+  // Add special TSQL functions not in the ClickHouse function registry
+  functions.push({
+    label: "timeBucket",
+    type: "function",
+    detail: "auto time bucket (0 args)",
+    apply: "timeBucket()",
+    boost: 1.5,
+    info: "Automatically bucket by time using the table's time column. Interval is chosen based on the query's time range.",
+  });
+
+  return functions;
+}
+
+/**
+ * Create table completions from schema
+ */
+function createTableCompletions(schema: TableSchema[]): Completion[] {
+  return schema.map((table) => ({
+    label: table.name,
+    type: "class", // Using "class" type for tables gives them a nice icon
+    detail: table.description || "table",
+    boost: 1, // Tables should have higher priority
+  }));
+}
+
+/**
+ * Create column completions for a specific table
+ */
+function createColumnCompletions(table: TableSchema, prefix?: string): Completion[] {
+  const columns: Completion[] = [];
+
+  for (const [name, column] of Object.entries(table.columns)) {
+    columns.push({
+      label: prefix ? `${prefix}.${name}` : name,
+      type: "property", // Using "property" type for columns
+      detail: `${column.type}${column.description ? ` - ${column.description}` : ""}`,
+      boost: 2, // Columns should have highest priority
+    });
+  }
+
+  return columns;
+}
+
+/**
+ * Extract table names/aliases from the current query context
+ * This is a simplified parser that looks for FROM and JOIN clauses
+ */
+function extractTablesFromQuery(doc: string, schema: TableSchema[]): Map<string, TableSchema> {
+  const tableMap = new Map<string, TableSchema>();
+  const tableNames = schema.map((t) => t.name);
+
+  // Simple regex to find table references in FROM and JOIN clauses
+  // Handles: FROM table_name, FROM table_name AS alias, FROM table_name alias
+  const tablePattern = /(?:FROM|JOIN)\s+(\w+)(?:\s+(?:AS\s+)?(\w+))?/gi;
+
+  let match;
+  while ((match = tablePattern.exec(doc)) !== null) {
+    const tableName = match[1];
+    const alias = match[2] || tableName;
+
+    // Find the table schema if it exists
+    const tableSchema = schema.find((t) => t.name.toLowerCase() === tableName.toLowerCase());
+
+    if (tableSchema) {
+      tableMap.set(alias.toLowerCase(), tableSchema);
+    }
+  }
+
+  return tableMap;
+}
+
+/**
+ * Determine what context we're in based on cursor position
+ */
+type CompletionContextType =
+  | "table" // After FROM or JOIN
+  | "column" // After SELECT, WHERE, ORDER BY, GROUP BY, etc.
+  | "alias" // After table_name.
+  | "value" // After comparison operator (=, !=, IN, etc.)
+  | "general"; // Anywhere else
+
+/**
+ * Result of context detection
+ */
+interface ContextResult {
+  type: CompletionContextType;
+  tablePrefix?: string;
+  /** Column being compared (for value context) */
+  columnName?: string;
+  /** Table alias for the column (for value context) */
+  columnTableAlias?: string;
+}
+
+/**
+ * Extract column name from text before a comparison operator
+ * Handles: "column =", "table.column =", "column IN", "column = 'partial", etc.
+ */
+function extractColumnBeforeOperator(
+  textBefore: string
+): { columnName: string; tableAlias?: string } | null {
+  // Match patterns like: column =, column !=, column IN, table.column =, etc.
+  // We need to capture the column (and optional table prefix) before the operator
+  // Also match when user is typing a partial string value like: column = 'val
+  const patterns = [
+    // column = or column != or column <> (with optional whitespace and optional partial string value)
+    /(\w+)\.(\w+)\s*(?:=|!=|<>)\s*(?:'[^']*)?$/i,
+    /(\w+)\s*(?:=|!=|<>)\s*(?:'[^']*)?$/i,
+    // column IN ( or column NOT IN ( (with optional partial string value)
+    /(\w+)\.(\w+)\s+(?:NOT\s+)?IN\s*\(\s*(?:'[^']*)?$/i,
+    /(\w+)\s+(?:NOT\s+)?IN\s*\(\s*(?:'[^']*)?$/i,
+    // After a comma in IN clause (with optional partial string value)
+    /(\w+)\.(\w+)\s+(?:NOT\s+)?IN\s*\([^)]*,\s*(?:'[^']*)?$/i,
+    /(\w+)\s+(?:NOT\s+)?IN\s*\([^)]*,\s*(?:'[^']*)?$/i,
+  ];
+
+  for (const pattern of patterns) {
+    const match = textBefore.match(pattern);
+    if (match) {
+      if (match.length === 3) {
+        // table.column pattern
+        return { tableAlias: match[1], columnName: match[2] };
+      } else {
+        // just column pattern
+        return { columnName: match[1] };
+      }
+    }
+  }
+
+  return null;
+}
+
+function determineContext(doc: string, pos: number): ContextResult {
+  // Get text before cursor
+  const textBefore = doc.slice(0, pos);
+
+  // Check if we're in a value context (after comparison operator)
+  // This should be checked before other contexts
+  const columnInfo = extractColumnBeforeOperator(textBefore);
+  if (columnInfo) {
+    return {
+      type: "value",
+      columnName: columnInfo.columnName,
+      columnTableAlias: columnInfo.tableAlias,
+    };
+  }
+
+  // Check if we're completing after a dot (table.column)
+  const dotMatch = textBefore.match(/(\w+)\.\s*$/);
+  if (dotMatch) {
+    return { type: "alias", tablePrefix: dotMatch[1] };
+  }
+
+  // Find the LAST significant keyword before cursor
+  // We match all keywords and take the last one
+  const keywordPattern = /\b(SELECT|FROM|JOIN|WHERE|AND|OR|ORDER\s+BY|GROUP\s+BY|HAVING|ON)\b/gi;
+  let lastMatch: RegExpExecArray | null = null;
+  let match: RegExpExecArray | null;
+
+  while ((match = keywordPattern.exec(textBefore)) !== null) {
+    lastMatch = match;
+  }
+
+  if (lastMatch) {
+    const keyword = lastMatch[1].toUpperCase().replace(/\s+/g, " ");
+
+    if (keyword === "FROM" || keyword === "JOIN") {
+      return { type: "table" };
+    }
+
+    if (
+      keyword === "SELECT" ||
+      keyword === "WHERE" ||
+      keyword === "AND" ||
+      keyword === "OR" ||
+      keyword === "ORDER BY" ||
+      keyword === "GROUP BY" ||
+      keyword === "HAVING" ||
+      keyword === "ON"
+    ) {
+      return { type: "column" };
+    }
+  }
+
+  return { type: "general" };
+}
+
+/**
+ * Find a column schema by name in the tables map
+ */
+function findColumnSchema(
+  columnName: string,
+  tableAlias: string | undefined,
+  tables: Map<string, TableSchema>
+): ColumnSchema | null {
+  if (tableAlias) {
+    // Look in specific table
+    const tableSchema = tables.get(tableAlias.toLowerCase());
+    if (tableSchema) {
+      return tableSchema.columns[columnName] || null;
+    }
+  } else {
+    // Look in all tables
+    for (const tableSchema of tables.values()) {
+      const col = tableSchema.columns[columnName];
+      if (col) {
+        return col;
+      }
+    }
+  }
+  return null;
+}
+
+/**
+ * Create completions for enum values from allowedValues
+ */
+function createEnumValueCompletions(columnSchema: ColumnSchema): Completion[] {
+  if (!columnSchema.allowedValues || columnSchema.allowedValues.length === 0) {
+    return [];
+  }
+
+  return columnSchema.allowedValues.map((value) => ({
+    label: `'${value}'`,
+    type: "enum",
+    detail: columnSchema.description || "allowed value",
+    boost: 3, // Highest priority for enum values in value context
+  }));
+}
+
+/**
+ * Create a TSQL-aware autocompletion source
+ *
+ * @param schema - Array of table schemas to use for completions
+ * @returns A CodeMirror completion source function
+ */
+export function createTSQLCompletion(
+  schema: TableSchema[]
+): (context: CompletionContext) => CompletionResult | null {
+  // Pre-compute static completions
+  const keywordCompletions = createKeywordCompletions();
+  const functionCompletions = createFunctionCompletions();
+  const tableCompletions = createTableCompletions(schema);
+
+  return (context: CompletionContext): CompletionResult | null => {
+    // Get the word being typed - include single quotes for value completion
+    const word = context.matchBefore(/[\w.']+/);
+
+    // Don't show completions if no word is being typed and not explicitly triggered
+    if (!word && !context.explicit) {
+      return null;
+    }
+
+    const from = word ? word.from : context.pos;
+    const doc = context.state.doc.toString();
+    const queryContext = determineContext(doc, context.pos);
+
+    let options: Completion[] = [];
+    // Track if we need to extend replacement range (e.g., to consume auto-paired closing quote)
+    let to: number | undefined = undefined;
+
+    switch (queryContext.type) {
+      case "table":
+        // After FROM or JOIN, show only tables
+        options = tableCompletions;
+        break;
+
+      case "alias":
+        // After table., show columns for that table
+        if (queryContext.tablePrefix) {
+          const tables = extractTablesFromQuery(doc, schema);
+          const tableSchema = tables.get(queryContext.tablePrefix.toLowerCase());
+
+          if (tableSchema) {
+            options = createColumnCompletions(tableSchema);
+          }
+        }
+        break;
+
+      case "value":
+        // After comparison operator, show enum values if available
+        if (queryContext.columnName) {
+          const tables = extractTablesFromQuery(doc, schema);
+          const columnSchema = findColumnSchema(
+            queryContext.columnName,
+            queryContext.columnTableAlias,
+            tables
+          );
+
+          if (columnSchema) {
+            options = createEnumValueCompletions(columnSchema);
+            // Check if there's a closing quote right after cursor (from auto-pairing)
+            // If so, extend replacement range to include it to avoid 'Completed''
+            const charAfterCursor = context.state.doc.sliceString(context.pos, context.pos + 1);
+            if (charAfterCursor === "'") {
+              to = context.pos + 1;
+            }
+          }
+        }
+        break;
+
+      case "column":
+        // After SELECT, WHERE, etc., show columns, functions, and some keywords
+        {
+          const tables = extractTablesFromQuery(doc, schema);
+
+          // Add columns from all tables in the query
+          tables.forEach((tableSchema, alias) => {
+            // If multiple tables, prefix with alias
+            const prefix = tables.size > 1 ? alias : undefined;
+            options.push(...createColumnCompletions(tableSchema, prefix));
+          });
+
+          // Also add functions and relevant keywords
+          options.push(...functionCompletions);
+          options.push(
+            ...keywordCompletions.filter((k) =>
+              [
+                "AND",
+                "OR",
+                "NOT",
+                "IN",
+                "LIKE",
+                "ILIKE",
+                "BETWEEN",
+                "IS",
+                "NULL",
+                "AS",
+                "CASE",
+                "WHEN",
+                "THEN",
+                "ELSE",
+                "END",
+              ].includes(k.label as string)
+            )
+          );
+        }
+        break;
+
+      case "general":
+      default:
+        // Show everything
+        options = [...tableCompletions, ...functionCompletions, ...keywordCompletions];
+
+        // Also add columns from tables in query
+        {
+          const tables = extractTablesFromQuery(doc, schema);
+          tables.forEach((tableSchema, alias) => {
+            const prefix = tables.size > 1 ? alias : undefined;
+            options.push(...createColumnCompletions(tableSchema, prefix));
+          });
+        }
+        break;
+    }
+
+    const result: CompletionResult = {
+      from,
+      options,
+      validFor: /^[\w.']*$/,
+    };
+    // Only set 'to' if we need to extend the replacement range
+    if (to !== undefined) {
+      result.to = to;
+    }
+    return result;
+  };
+}
diff --git a/apps/webapp/app/components/code/tsql/tsqlLinter.test.ts b/apps/webapp/app/components/code/tsql/tsqlLinter.test.ts
new file mode 100644
index 00000000000..8acc81d66f0
--- /dev/null
+++ b/apps/webapp/app/components/code/tsql/tsqlLinter.test.ts
@@ -0,0 +1,79 @@
+import { describe, it, expect } from "vitest";
+import { isValidTSQLQuery, getTSQLError } from "./tsqlLinter";
+
+describe("tsqlLinter", () => {
+  describe("isValidTSQLQuery", () => {
+    it("should return true for empty queries", () => {
+      expect(isValidTSQLQuery("")).toBe(true);
+      expect(isValidTSQLQuery("   ")).toBe(true);
+    });
+
+    it("should return true for valid SELECT queries", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users")).toBe(true);
+      expect(isValidTSQLQuery("SELECT id, name FROM users WHERE status = 'active'")).toBe(true);
+      expect(isValidTSQLQuery("SELECT count(*) FROM users GROUP BY status")).toBe(true);
+    });
+
+    it("should return true for queries with ORDER BY", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users ORDER BY created_at DESC")).toBe(true);
+    });
+
+    it("should return true for queries with LIMIT", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users LIMIT 10")).toBe(true);
+      expect(isValidTSQLQuery("SELECT * FROM users LIMIT 10 OFFSET 20")).toBe(true);
+    });
+
+    it("should return true for queries with JOINs", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users JOIN orders ON users.id = orders.user_id")).toBe(
+        true
+      );
+      expect(
+        isValidTSQLQuery(
+          "SELECT * FROM users LEFT JOIN orders ON users.id = orders.user_id"
+        )
+      ).toBe(true);
+    });
+
+    it("should return false for invalid syntax", () => {
+      expect(isValidTSQLQuery("SELEC * FROM users")).toBe(false);
+      expect(isValidTSQLQuery("SELECT * FORM users")).toBe(false);
+      expect(isValidTSQLQuery("SELECT FROM users")).toBe(false);
+    });
+
+    it("should return false for incomplete queries", () => {
+      expect(isValidTSQLQuery("SELECT * FROM")).toBe(false);
+      expect(isValidTSQLQuery("SELECT")).toBe(false);
+    });
+  });
+
+  describe("getTSQLError", () => {
+    it("should return null for empty queries", () => {
+      expect(getTSQLError("")).toBeNull();
+      expect(getTSQLError("   ")).toBeNull();
+    });
+
+    it("should return null for valid queries", () => {
+      expect(getTSQLError("SELECT * FROM users")).toBeNull();
+      expect(getTSQLError("SELECT id, name FROM users WHERE id = 1")).toBeNull();
+    });
+
+    it("should return error message for invalid queries", () => {
+      const error = getTSQLError("SELEC * FROM users");
+      expect(error).not.toBeNull();
+      expect(typeof error).toBe("string");
+    });
+
+    it("should include position information in error", () => {
+      const error = getTSQLError("SELECT * FORM users");
+      expect(error).not.toBeNull();
+      // Error message should contain line/column info
+      expect(error).toContain("line");
+    });
+
+    it("should handle missing FROM clause", () => {
+      const error = getTSQLError("SELECT * WHERE id = 1");
+      expect(error).not.toBeNull();
+    });
+  });
+});
+
diff --git a/apps/webapp/app/components/code/tsql/tsqlLinter.ts b/apps/webapp/app/components/code/tsql/tsqlLinter.ts
new file mode 100644
index 00000000000..72794e3e9ab
--- /dev/null
+++ b/apps/webapp/app/components/code/tsql/tsqlLinter.ts
@@ -0,0 +1,213 @@
+import type { EditorView } from "@codemirror/view";
+import type { Diagnostic } from "@codemirror/lint";
+import type { TableSchema } from "@internal/tsql";
+import { parseTSQLSelect, SyntaxError, QueryError, validateQuery } from "@internal/tsql";
+
+/**
+ * Configuration for the TSQL linter
+ */
+export interface TSQLLinterConfig {
+  /** Optional schema for validating table/column names */
+  schema?: TableSchema[];
+  /** Delay in milliseconds before running the linter (debouncing) */
+  delay?: number;
+}
+
+/**
+ * Extract line and column from a TSQL error message
+ * Error format: "Syntax error at line X:Y: message"
+ */
+function parseErrorPosition(message: string): { line: number; column: number } | null {
+  const match = message.match(/at line (\d+):(\d+)/);
+  if (match) {
+    return {
+      line: parseInt(match[1], 10),
+      column: parseInt(match[2], 10),
+    };
+  }
+  return null;
+}
+
+/**
+ * Convert line/column to a document position
+ */
+function positionToOffset(
+  doc: string,
+  line: number,
+  column: number
+): number {
+  const lines = doc.split("\n");
+
+  // line is 1-indexed
+  let offset = 0;
+  for (let i = 0; i < line - 1 && i < lines.length; i++) {
+    offset += lines[i].length + 1; // +1 for newline
+  }
+
+  return offset + column;
+}
+
+/**
+ * Find the end of a word/token at the given position
+ */
+function findTokenEnd(doc: string, start: number): number {
+  let end = start;
+
+  // Scan forward until we hit whitespace or end of string
+  while (end < doc.length && /\S/.test(doc[end])) {
+    end++;
+  }
+
+  // If we didn't move, include at least one character
+  if (end === start) {
+    end = Math.min(start + 1, doc.length);
+  }
+
+  return end;
+}
+
+/**
+ * Create a TSQL linter function for CodeMirror
+ *
+ * This linter uses the TSQL ANTLR parser to detect syntax errors
+ * and optionally validates against a schema.
+ *
+ * @param config - Linter configuration
+ * @returns A linter function for use with CodeMirror's linter extension
+ */
+export function createTSQLLinter(
+  config: TSQLLinterConfig = {}
+): (view: EditorView) => Diagnostic[] {
+  const { schema = [] } = config;
+
+  return (view: EditorView): Diagnostic[] => {
+    const content = view.state.doc.toString().trim();
+
+    // Return no errors for empty content
+    if (!content) {
+      return [];
+    }
+
+    const diagnostics: Diagnostic[] = [];
+
+    try {
+      // Try to parse the query
+      const ast = parseTSQLSelect(content);
+
+      // If parsing succeeds and we have a schema, run schema validation
+      if (schema.length > 0) {
+        const validationResult = validateQuery(ast, schema);
+
+        for (const issue of validationResult.issues) {
+          // Map validation severity to CodeMirror diagnostic severity
+          const severity: "error" | "warning" | "info" =
+            issue.severity === "error"
+              ? "error"
+              : issue.severity === "warning"
+                ? "warning"
+                : "info";
+
+          diagnostics.push({
+            from: 0,
+            to: content.length,
+            severity,
+            message: issue.message,
+            source: "tsql",
+          });
+        }
+      }
+    } catch (error) {
+      if (error instanceof SyntaxError) {
+        const position = parseErrorPosition(error.message);
+
+        let from: number;
+        let to: number;
+
+        if (position) {
+          from = positionToOffset(content, position.line, position.column);
+          to = findTokenEnd(content, from);
+        } else {
+          // If we can't parse the position, highlight the whole query
+          from = 0;
+          to = content.length;
+        }
+
+        // Clean up the error message
+        let message = error.message;
+        // Remove the "Syntax error at line X:Y: " prefix if present
+        message = message.replace(/^Syntax error at line \d+:\d+:\s*/, "");
+
+        diagnostics.push({
+          from,
+          to,
+          severity: "error",
+          message: message,
+          source: "tsql",
+        });
+      } else if (error instanceof QueryError) {
+        // Schema validation errors don't have position info,
+        // so highlight the whole query
+        diagnostics.push({
+          from: 0,
+          to: content.length,
+          severity: "warning",
+          message: error.message,
+          source: "tsql",
+        });
+      } else if (error instanceof Error) {
+        // Unknown error
+        diagnostics.push({
+          from: 0,
+          to: content.length,
+          severity: "error",
+          message: error.message,
+          source: "tsql",
+        });
+      }
+    }
+
+    return diagnostics;
+  };
+}
+
+/**
+ * Check if a TSQL query is valid
+ *
+ * @param query - The query to validate
+ * @returns true if the query is valid, false otherwise
+ */
+export function isValidTSQLQuery(query: string): boolean {
+  if (!query.trim()) {
+    return true; // Empty queries are considered valid
+  }
+
+  try {
+    parseTSQLSelect(query);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Get error message for a TSQL query, if any
+ *
+ * @param query - The query to validate
+ * @returns Error message if invalid, null if valid
+ */
+export function getTSQLError(query: string): string | null {
+  if (!query.trim()) {
+    return null;
+  }
+
+  try {
+    parseTSQLSelect(query);
+    return null;
+  } catch (error) {
+    if (error instanceof Error) {
+      return error.message;
+    }
+    return "Unknown error";
+  }
+}
+
diff --git a/apps/webapp/app/components/environments/EnvironmentLabel.tsx b/apps/webapp/app/components/environments/EnvironmentLabel.tsx
index 33860b9c254..57d70406ccf 100644
--- a/apps/webapp/app/components/environments/EnvironmentLabel.tsx
+++ b/apps/webapp/app/components/environments/EnvironmentLabel.tsx
@@ -51,10 +51,14 @@ export function EnvironmentCombo({
   environment,
   className,
   iconClassName,
+  tooltipSideOffset,
+  tooltipSide,
 }: {
   environment: Environment;
   className?: string;
   iconClassName?: string;
+  tooltipSideOffset?: number;
+  tooltipSide?: "top" | "right" | "bottom" | "left";
 }) {
   return (
     <span className={cn("flex items-center gap-1.5 text-sm text-text-bright", className)}>
@@ -62,7 +66,11 @@ export function EnvironmentCombo({
         environment={environment}
         className={cn("size-4.5 shrink-0", iconClassName)}
       />
-      <EnvironmentLabel environment={environment} />
+      <EnvironmentLabel
+        environment={environment}
+        tooltipSideOffset={tooltipSideOffset}
+        tooltipSide={tooltipSide}
+      />
     </span>
   );
 }
@@ -70,9 +78,15 @@ export function EnvironmentCombo({
 export function EnvironmentLabel({
   environment,
   className,
+  tooltipSideOffset = 34,
+  tooltipSide = "right",
+  disableTooltip = false,
 }: {
   environment: Environment;
   className?: string;
+  tooltipSideOffset?: number;
+  tooltipSide?: "top" | "right" | "bottom" | "left";
+  disableTooltip?: boolean;
 }) {
   const spanRef = useRef<HTMLSpanElement>(null);
   const [isTruncated, setIsTruncated] = useState(false);
@@ -105,7 +119,7 @@ export function EnvironmentLabel({
     </span>
   );
 
-  if (isTruncated) {
+  if (isTruncated && !disableTooltip) {
     return (
       <SimpleTooltip
         asChild
@@ -115,9 +129,10 @@ export function EnvironmentLabel({
             {text}
           </span>
         }
-        side="right"
+        side={tooltipSide}
         variant="dark"
-        sideOffset={34}
+        sideOffset={tooltipSideOffset}
+        disableHoverableContent
       />
     );
   }
@@ -125,6 +140,10 @@ export function EnvironmentLabel({
   return content;
 }
 
+export function EnvironmentSlug({ environment }: { environment: Environment & { slug: string } }) {
+  return <span className={environmentTextClassName(environment)}>{environment.slug}</span>;
+}
+
 export function environmentTitle(environment: Environment, username?: string) {
   if (environment.branchName) {
     return environment.branchName;
diff --git a/apps/webapp/app/components/environments/RegenerateApiKeyModal.tsx b/apps/webapp/app/components/environments/RegenerateApiKeyModal.tsx
index 130c1c4acc3..439fd892f91 100644
--- a/apps/webapp/app/components/environments/RegenerateApiKeyModal.tsx
+++ b/apps/webapp/app/components/environments/RegenerateApiKeyModal.tsx
@@ -10,11 +10,14 @@ import { FormButtons } from "../primitives/FormButtons";
 import { Input } from "../primitives/Input";
 import { InputGroup } from "../primitives/InputGroup";
 import { Paragraph } from "../primitives/Paragraph";
+import { CheckboxWithLabel } from "../primitives/Checkbox";
 import { Spinner } from "../primitives/Spinner";
 
 type ModalProps = {
   id: string;
   title: string;
+  hasVercelIntegration: boolean;
+  isDevelopment: boolean;
 };
 
 type ModalContentProps = ModalProps & {
@@ -22,7 +25,12 @@ type ModalContentProps = ModalProps & {
   closeModal: () => void;
 };
 
-export function RegenerateApiKeyModal({ id, title }: ModalProps) {
+export function RegenerateApiKeyModal({
+  id,
+  title,
+  hasVercelIntegration,
+  isDevelopment,
+}: ModalProps) {
   const randomWord = generateTwoRandomWords();
   const [open, setOpen] = useState(false);
   return (
@@ -37,6 +45,8 @@ export function RegenerateApiKeyModal({ id, title }: ModalProps) {
         <RegenerateApiKeyModalContent
           id={id}
           title={title}
+          hasVercelIntegration={hasVercelIntegration}
+          isDevelopment={isDevelopment}
           randomWord={randomWord}
           closeModal={() => setOpen(false)}
         />
@@ -45,7 +55,14 @@ export function RegenerateApiKeyModal({ id, title }: ModalProps) {
   );
 }
 
-const RegenerateApiKeyModalContent = ({ id, randomWord, title, closeModal }: ModalContentProps) => {
+const RegenerateApiKeyModalContent = ({
+  id,
+  randomWord,
+  title,
+  hasVercelIntegration,
+  isDevelopment,
+  closeModal,
+}: ModalContentProps) => {
   const [confirmationText, setConfirmationText] = useState("");
   const fetcher = useFetcher();
   const isSubmitting = fetcher.state === "submitting";
@@ -83,6 +100,15 @@ const RegenerateApiKeyModalContent = ({ id, randomWord, title, closeModal }: Mod
               onChange={(e) => setConfirmationText(e.target.value)}
             />
           </InputGroup>
+          {hasVercelIntegration && !isDevelopment && (
+            <CheckboxWithLabel
+              name="syncToVercel"
+              variant="simple/small"
+              label="Also update TRIGGER_SECRET_KEY in Vercel"
+              defaultChecked={true}
+              value="on"
+            />
+          )}
           <FormButtons
             confirmButton={
               <Button
@@ -94,7 +120,11 @@ const RegenerateApiKeyModalContent = ({ id, randomWord, title, closeModal }: Mod
                 Regenerate
               </Button>
             }
-            cancelButton={<Button variant={"tertiary/medium"}>Cancel</Button>}
+            cancelButton={
+              <Button variant={"tertiary/medium"} type="button" onClick={closeModal}>
+                Cancel
+              </Button>
+            }
           />
         </Fieldset>
       </fetcher.Form>
diff --git a/apps/webapp/app/components/integrations/VercelBuildSettings.tsx b/apps/webapp/app/components/integrations/VercelBuildSettings.tsx
new file mode 100644
index 00000000000..0111168ccfa
--- /dev/null
+++ b/apps/webapp/app/components/integrations/VercelBuildSettings.tsx
@@ -0,0 +1,176 @@
+import { Switch } from "~/components/primitives/Switch";
+import { Label } from "~/components/primitives/Label";
+import { Hint } from "~/components/primitives/Hint";
+import { TextLink } from "~/components/primitives/TextLink";
+import {
+  EnvironmentIcon,
+  environmentFullTitle,
+  environmentTextClassName,
+} from "~/components/environments/EnvironmentLabel";
+import { envSlugToType, type EnvSlug } from "~/v3/vercel/vercelProjectIntegrationSchema";
+
+type BuildSettingsFieldsProps = {
+  availableEnvSlugs: EnvSlug[];
+  pullEnvVarsBeforeBuild: EnvSlug[];
+  onPullEnvVarsChange: (slugs: EnvSlug[]) => void;
+  discoverEnvVars: EnvSlug[];
+  onDiscoverEnvVarsChange: (slugs: EnvSlug[]) => void;
+  atomicBuilds: EnvSlug[];
+  onAtomicBuildsChange: (slugs: EnvSlug[]) => void;
+  envVarsConfigLink?: string;
+};
+
+export function BuildSettingsFields({
+  availableEnvSlugs,
+  pullEnvVarsBeforeBuild,
+  onPullEnvVarsChange,
+  discoverEnvVars,
+  onDiscoverEnvVarsChange,
+  atomicBuilds,
+  onAtomicBuildsChange,
+  envVarsConfigLink,
+}: BuildSettingsFieldsProps) {
+  return (
+    <>
+      {/* Pull env vars before build */}
+      <div>
+        <div className="mb-2 flex items-center justify-between">
+          <div>
+            <Label>Pull env vars before build</Label>
+            <Hint>
+              Select which environments should pull environment variables from Vercel before each
+              build.{" "}
+              {envVarsConfigLink && (
+                <>
+                  <TextLink to={envVarsConfigLink}>Configure which variables to pull</TextLink>.
+                </>
+              )}
+            </Hint>
+          </div>
+          {availableEnvSlugs.length > 1 && (
+            <Switch
+              variant="small"
+              checked={
+                availableEnvSlugs.length > 0 &&
+                availableEnvSlugs.every((s) => pullEnvVarsBeforeBuild.includes(s))
+              }
+              onCheckedChange={(checked) => {
+                onPullEnvVarsChange(checked ? [...availableEnvSlugs] : []);
+              }}
+            />
+          )}
+        </div>
+        <div className="flex flex-col gap-2 rounded border bg-charcoal-800 p-3">
+          {availableEnvSlugs.map((slug) => {
+            const envType = envSlugToType(slug);
+            return (
+              <div key={slug} className="flex items-center justify-between">
+                <div className="flex items-center gap-1.5">
+                  <EnvironmentIcon environment={{ type: envType }} className="size-4" />
+                  <span className={`text-sm ${environmentTextClassName({ type: envType })}`}>
+                    {environmentFullTitle({ type: envType })}
+                  </span>
+                </div>
+                <Switch
+                  variant="small"
+                  checked={pullEnvVarsBeforeBuild.includes(slug)}
+                  onCheckedChange={(checked) => {
+                    onPullEnvVarsChange(
+                      checked
+                        ? [...pullEnvVarsBeforeBuild, slug]
+                        : pullEnvVarsBeforeBuild.filter((s) => s !== slug)
+                    );
+                  }}
+                />
+              </div>
+            );
+          })}
+        </div>
+      </div>
+
+      {/* Discover new env vars */}
+      <div>
+        <div className="mb-2 flex items-center justify-between">
+          <div>
+            <Label>Discover new env vars</Label>
+            <Hint>
+              Select which environments should automatically discover and create new environment
+              variables from Vercel during builds.
+            </Hint>
+          </div>
+          {availableEnvSlugs.length > 1 && (
+            <Switch
+              variant="small"
+              checked={
+                availableEnvSlugs.length > 0 &&
+                availableEnvSlugs.every(
+                  (s) => discoverEnvVars.includes(s) || !pullEnvVarsBeforeBuild.includes(s)
+                ) &&
+                availableEnvSlugs.some((s) => discoverEnvVars.includes(s))
+              }
+              disabled={!availableEnvSlugs.some((s) => pullEnvVarsBeforeBuild.includes(s))}
+              onCheckedChange={(checked) => {
+                onDiscoverEnvVarsChange(
+                  checked
+                    ? availableEnvSlugs.filter((s) => pullEnvVarsBeforeBuild.includes(s))
+                    : []
+                );
+              }}
+            />
+          )}
+        </div>
+        <div className="flex flex-col gap-2 rounded border bg-charcoal-800 p-3">
+          {availableEnvSlugs.map((slug) => {
+            const envType = envSlugToType(slug);
+            const isPullDisabled = !pullEnvVarsBeforeBuild.includes(slug);
+            return (
+              <div
+                key={slug}
+                className={`flex items-center justify-between ${isPullDisabled ? "opacity-50" : ""}`}
+              >
+                <div className="flex items-center gap-1.5">
+                  <EnvironmentIcon environment={{ type: envType }} className="size-4" />
+                  <span className={`text-sm ${environmentTextClassName({ type: envType })}`}>
+                    {environmentFullTitle({ type: envType })}
+                  </span>
+                </div>
+                <Switch
+                  variant="small"
+                  checked={discoverEnvVars.includes(slug)}
+                  disabled={isPullDisabled}
+                  onCheckedChange={(checked) => {
+                    onDiscoverEnvVarsChange(
+                      checked
+                        ? [...discoverEnvVars, slug]
+                        : discoverEnvVars.filter((s) => s !== slug)
+                    );
+                  }}
+                />
+              </div>
+            );
+          })}
+        </div>
+      </div>
+
+      {/* Atomic deployments */}
+      <div>
+        <div className="flex items-center justify-between">
+          <div>
+            <Label>Atomic deployments</Label>
+            <Hint>
+              When enabled, production deployments wait for Vercel deployment to complete before
+              promoting the Trigger.dev deployment.
+            </Hint>
+          </div>
+          <Switch
+            variant="small"
+            checked={atomicBuilds.includes("prod")}
+            onCheckedChange={(checked) => {
+              onAtomicBuildsChange(checked ? ["prod"] : []);
+            }}
+          />
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/apps/webapp/app/components/integrations/VercelLogo.tsx b/apps/webapp/app/components/integrations/VercelLogo.tsx
new file mode 100644
index 00000000000..7ddf039abfd
--- /dev/null
+++ b/apps/webapp/app/components/integrations/VercelLogo.tsx
@@ -0,0 +1,12 @@
+export function VercelLogo({ className }: { className?: string }) {
+  return (
+    <svg
+      viewBox="0 0 76 65"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+    >
+      <path d="M37.5274 0L75.0548 65H0L37.5274 0Z" fill="currentColor" />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx b/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx
new file mode 100644
index 00000000000..dc6996dab14
--- /dev/null
+++ b/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx
@@ -0,0 +1,1158 @@
+import {
+  CheckCircleIcon,
+  ExclamationTriangleIcon,
+  ChevronDownIcon,
+  ChevronUpIcon,
+} from "@heroicons/react/20/solid";
+import {
+  useFetcher,
+  useNavigation,
+  useSearchParams,
+} from "@remix-run/react";
+import { useTypedFetcher } from "remix-typedjson";
+import { Dialog, DialogContent, DialogHeader } from "~/components/primitives/Dialog";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Callout } from "~/components/primitives/Callout";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { FormError } from "~/components/primitives/FormError";
+import { Header3 } from "~/components/primitives/Headers";
+import { Hint } from "~/components/primitives/Hint";
+import { Label } from "~/components/primitives/Label";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { Select, SelectItem } from "~/components/primitives/Select";
+import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { Switch } from "~/components/primitives/Switch";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+  TooltipProvider,
+} from "~/components/primitives/Tooltip";
+import { VercelLogo } from "~/components/integrations/VercelLogo";
+import { BuildSettingsFields } from "~/components/integrations/VercelBuildSettings";
+import { OctoKitty } from "~/components/GitHubLoginButton";
+import {
+  ConnectGitHubRepoModal,
+} from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github";
+import {
+  type SyncEnvVarsMapping,
+  type EnvSlug,
+  ALL_ENV_SLUGS,
+  shouldSyncEnvVarForAnyEnvironment,
+  getAvailableEnvSlugs,
+  getAvailableEnvSlugsForBuildSettings,
+} from "~/v3/vercel/vercelProjectIntegrationSchema";
+import { type VercelCustomEnvironment } from "~/models/vercelIntegration.server";
+import { type VercelOnboardingData } from "~/presenters/v3/VercelSettingsPresenter.server";
+import { vercelAppInstallPath, v3ProjectSettingsPath, githubAppInstallPath, vercelResourcePath } from "~/utils/pathBuilder";
+import type { loader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
+import { useEffect, useState, useCallback, useRef } from "react";
+import { usePostHogTracking } from "~/hooks/usePostHog";
+
+function safeRedirectUrl(url: string): string | null {
+  try {
+    const parsed = new URL(url, window.location.origin);
+    if (parsed.origin === window.location.origin) {
+      return parsed.toString();
+    }
+    if (parsed.protocol === "https:" && /^([a-z0-9-]+\.)*vercel\.com$/i.test(parsed.hostname)) {
+      return parsed.toString();
+    }
+  } catch {
+    // Invalid URL
+  }
+  return null;
+}
+
+function formatVercelTargets(targets: string[]): string {
+  const targetLabels: Record<string, string> = {
+    production: "Production",
+    preview: "Preview",
+    development: "Development",
+    staging: "Staging",
+  };
+
+  return targets
+    .map((t) => targetLabels[t.toLowerCase()] || t)
+    .join(", ");
+}
+
+type OnboardingState =
+  | "idle"
+  | "installing"
+  | "loading-projects"
+  | "project-selection"
+  | "loading-env-mapping"
+  | "env-mapping"
+  | "loading-env-vars"
+  | "env-var-sync"
+  | "build-settings"
+  | "github-connection"
+  | "completed";
+
+export function VercelOnboardingModal({
+  isOpen,
+  onClose,
+  onboardingData,
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  hasStagingEnvironment,
+  hasPreviewEnvironment,
+  hasOrgIntegration,
+  nextUrl,
+  onDataReload,
+}: {
+  isOpen: boolean;
+  onClose: () => void;
+  onboardingData: VercelOnboardingData | null;
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  hasStagingEnvironment: boolean;
+  hasPreviewEnvironment: boolean;
+  hasOrgIntegration: boolean;
+  nextUrl?: string;
+  onDataReload?: (vercelStagingEnvironment?: string) => void;
+}) {
+  const { capture, startSessionRecording } = usePostHogTracking();
+  const navigation = useNavigation();
+  const fetcher = useTypedFetcher<typeof loader>();
+  const envMappingFetcher = useFetcher();
+  const completeOnboardingFetcher = useFetcher();
+  const { Form: CompleteOnboardingForm } = completeOnboardingFetcher;
+  const [searchParams] = useSearchParams();
+  const fromMarketplaceContext = searchParams.get("origin") === "marketplace";
+
+  const availableProjects = onboardingData?.availableProjects || [];
+  const hasProjectSelected = onboardingData?.hasProjectSelected ?? false;
+  const customEnvironments = onboardingData?.customEnvironments || [];
+  const envVars = onboardingData?.environmentVariables || [];
+  const existingVars = onboardingData?.existingVariables || {};
+  const hasCustomEnvs = customEnvironments.length > 0 && hasStagingEnvironment;
+
+  const computeInitialState = useCallback((): OnboardingState => {
+    if (!hasOrgIntegration || onboardingData?.authInvalid) {
+      return "idle";
+    }
+    const projectSelected = onboardingData?.hasProjectSelected ?? false;
+    if (!projectSelected) {
+      if (!onboardingData?.availableProjects || onboardingData.availableProjects.length === 0) {
+        return "loading-projects";
+      }
+      return "project-selection";
+    }
+    // For marketplace origin, skip env-mapping step and go directly to env-var-sync
+    if (!fromMarketplaceContext) {
+      const customEnvs = (onboardingData?.customEnvironments?.length ?? 0) > 0 && hasStagingEnvironment;
+      if (customEnvs) {
+        return "env-mapping";
+      }
+    }
+    if (!onboardingData?.environmentVariables || onboardingData.environmentVariables.length === 0) {
+      return "loading-env-vars";
+    }
+    return "env-var-sync";
+  }, [hasOrgIntegration, onboardingData, hasStagingEnvironment, fromMarketplaceContext]);
+
+  const [state, setState] = useState<OnboardingState>(() => {
+    if (!isOpen) return "idle";
+    return computeInitialState();
+  });
+
+  const prevIsOpenRef = useRef(isOpen);
+  const hasSyncedStagingRef = useRef(false);
+  const hasSyncedPreviewRef = useRef(false);
+  useEffect(() => {
+    if (isOpen && !prevIsOpenRef.current) {
+      setState(computeInitialState());
+      hasSyncedStagingRef.current = false;
+      hasSyncedPreviewRef.current = false;
+    } else if (isOpen && state === "idle") {
+      setState(computeInitialState());
+    }
+    prevIsOpenRef.current = isOpen;
+  }, [isOpen, state, computeInitialState]);
+
+  const trackOnboarding = useCallback(
+    (eventName: string, extraProperties?: Record<string, unknown>) => {
+      capture(eventName, {
+        origin: fromMarketplaceContext ? "marketplace" : "dashboard",
+        step: state,
+        organization_slug: organizationSlug,
+        project_slug: projectSlug,
+        ...extraProperties,
+      });
+    },
+    [capture, fromMarketplaceContext, state, organizationSlug, projectSlug]
+  );
+
+  const hasTrackedStartRef = useRef(false);
+  const hasTrackedCompletionRef = useRef(false);
+  useEffect(() => {
+    if (isOpen && state === "project-selection" && !hasTrackedStartRef.current) {
+      hasTrackedStartRef.current = true;
+      startSessionRecording();
+      trackOnboarding("vercel onboarding started");
+    }
+    if (!isOpen) {
+      hasTrackedStartRef.current = false;
+      hasTrackedCompletionRef.current = false;
+    }
+  }, [isOpen, state, trackOnboarding, startSessionRecording]);
+
+  const [selectedVercelProject, setSelectedVercelProject] = useState<{
+    id: string;
+    name: string;
+  } | null>(null);
+  const [vercelStagingEnvironment, setVercelStagingEnvironment] = useState<{
+    environmentId: string;
+    displayName: string;
+  } | null>(null);
+  const availableEnvSlugsForOnboarding = getAvailableEnvSlugs(hasStagingEnvironment, hasPreviewEnvironment);
+  const availableEnvSlugsForOnboardingBuildSettings = getAvailableEnvSlugsForBuildSettings(hasStagingEnvironment, hasPreviewEnvironment);
+  const [pullEnvVarsBeforeBuild, setPullEnvVarsBeforeBuild] = useState<EnvSlug[]>(
+    () => availableEnvSlugsForOnboardingBuildSettings
+  );
+  const [atomicBuilds, setAtomicBuilds] = useState<EnvSlug[]>(
+    () => ["prod"]
+  );
+  const [discoverEnvVars, setDiscoverEnvVars] = useState<EnvSlug[]>(
+    () => availableEnvSlugsForOnboardingBuildSettings
+  );
+
+  // Sync pullEnvVarsBeforeBuild and discoverEnvVars when hasStagingEnvironment becomes true (once)
+  useEffect(() => {
+    if (hasStagingEnvironment && !hasSyncedStagingRef.current) {
+      hasSyncedStagingRef.current = true;
+      setPullEnvVarsBeforeBuild((prev) => {
+        if (!prev.includes("stg")) {
+          return [...prev, "stg"];
+        }
+        return prev;
+      });
+      setDiscoverEnvVars((prev) => {
+        if (!prev.includes("stg")) {
+          return [...prev, "stg"];
+        }
+        return prev;
+      });
+    }
+  }, [hasStagingEnvironment]);
+
+  // Sync pullEnvVarsBeforeBuild and discoverEnvVars when hasPreviewEnvironment becomes true (once)
+  useEffect(() => {
+    if (hasPreviewEnvironment && !hasSyncedPreviewRef.current) {
+      hasSyncedPreviewRef.current = true;
+      setPullEnvVarsBeforeBuild((prev) => {
+        if (!prev.includes("preview")) {
+          return [...prev, "preview"];
+        }
+        return prev;
+      });
+      setDiscoverEnvVars((prev) => {
+        if (!prev.includes("preview")) {
+          return [...prev, "preview"];
+        }
+        return prev;
+      });
+    }
+  }, [hasPreviewEnvironment]);
+  const [syncEnvVarsMapping, setSyncEnvVarsMapping] = useState<SyncEnvVarsMapping>({});
+  const [expandedEnvVars, setExpandedEnvVars] = useState(false);
+  const [expandedSecretEnvVars, setExpandedSecretEnvVars] = useState(false);
+  const [projectSelectionError, setProjectSelectionError] = useState<string | null>(null);
+  const [isRedirecting, setIsRedirecting] = useState(false);
+
+  const gitHubAppInstallations = onboardingData?.gitHubAppInstallations ?? [];
+  const isGitHubConnectedForOnboarding = onboardingData?.isGitHubConnected ?? false;
+  const isOnboardingComplete = onboardingData?.isOnboardingComplete ?? false;
+
+  const hasTriggeredMarketplaceRedirectRef = useRef(false);
+
+  // Auto-redirect for marketplace flow when returning from GitHub with everything complete
+  useEffect(() => {
+    if (hasTriggeredMarketplaceRedirectRef.current) {
+      return;
+    }
+
+    if (
+      isOpen &&
+      fromMarketplaceContext &&
+      nextUrl &&
+      isOnboardingComplete &&
+      isGitHubConnectedForOnboarding
+    ) {
+      hasTriggeredMarketplaceRedirectRef.current = true;
+      const validUrl = safeRedirectUrl(nextUrl);
+      if (validUrl) {
+        setTimeout(() => {
+          window.location.href = validUrl;
+        }, 100);
+      }
+    }
+  }, [isOpen, fromMarketplaceContext, nextUrl, isOnboardingComplete, isGitHubConnectedForOnboarding]);
+
+  useEffect(() => {
+    if (!isOpen) {
+      hasTriggeredMarketplaceRedirectRef.current = false;
+      setIsRedirecting(false);
+    }
+  }, [isOpen]);
+
+  const loadingStateRef = useRef<OnboardingState | null>(null);
+
+  useEffect(() => {
+    if (!isOpen || state === "idle") {
+      loadingStateRef.current = null;
+      return;
+    }
+
+    if (onboardingData?.authInvalid) {
+      onClose();
+      return;
+    }
+
+    if (loadingStateRef.current === state) {
+      return;
+    }
+
+    switch (state) {
+
+      case "loading-projects":
+        loadingStateRef.current = state;
+        if (onDataReload) {
+          onDataReload();
+        }
+        break;
+
+      case "loading-env-mapping":
+        loadingStateRef.current = state;
+        if (onDataReload) {
+          onDataReload();
+        }
+        break;
+
+      case "loading-env-vars":
+        loadingStateRef.current = state;
+        if (onDataReload) {
+          onDataReload(vercelStagingEnvironment?.environmentId || undefined);
+        }
+        break;
+
+      case "installing":
+      case "project-selection":
+      case "env-mapping":
+      case "env-var-sync":
+      case "completed":
+      case "build-settings":
+      case "github-connection":
+        loadingStateRef.current = null;
+        break;
+    }
+  }, [isOpen, state, onboardingData?.authInvalid, vercelStagingEnvironment, onDataReload, onClose]);
+
+  useEffect(() => {
+    if (!onboardingData?.authInvalid && state === "loading-projects" && onboardingData?.availableProjects !== undefined) {
+      setState("project-selection");
+    }
+  }, [state, onboardingData?.availableProjects, onboardingData?.authInvalid]);
+
+  useEffect(() => {
+    if (!onboardingData?.authInvalid && state === "loading-env-vars" && onboardingData?.environmentVariables) {
+      setState("env-var-sync");
+    }
+  }, [state, onboardingData?.environmentVariables, onboardingData?.authInvalid]);
+
+  useEffect(() => {
+    if (state === "project-selection" && fetcher.data && "success" in fetcher.data && fetcher.data.success && fetcher.state === "idle") {
+      trackOnboarding("vercel onboarding project selected", {
+        vercel_project_name: selectedVercelProject?.name,
+      });
+      setState("loading-env-mapping");
+      if (onDataReload) {
+        onDataReload();
+      }
+    } else if (fetcher.data && "error" in fetcher.data && typeof fetcher.data.error === "string") {
+      setProjectSelectionError(fetcher.data.error);
+    }
+  }, [state, fetcher.data, fetcher.state, onDataReload, trackOnboarding, selectedVercelProject?.name]);
+
+  // For marketplace origin, skip env-mapping step
+  useEffect(() => {
+    if (state === "loading-env-mapping" && onboardingData) {
+      const hasCustomEnvs = (onboardingData.customEnvironments?.length ?? 0) > 0 && hasStagingEnvironment;
+      if (hasCustomEnvs && !fromMarketplaceContext) {
+        setState("env-mapping");
+      } else {
+        setState("loading-env-vars");
+      }
+    }
+  }, [state, onboardingData, hasStagingEnvironment, fromMarketplaceContext]);
+
+  const secretEnvVars = envVars.filter((v) => v.isSecret);
+  const syncableEnvVars = envVars.filter((v) => !v.isSecret);
+  const enabledEnvVars = syncableEnvVars.filter(
+    (v) => shouldSyncEnvVarForAnyEnvironment(syncEnvVarsMapping, v.key)
+  );
+
+  const overlappingEnvVarsCount = enabledEnvVars.filter((v) => existingVars[v.key]).length;
+
+  const isSubmitting =
+    navigation.state === "submitting" || navigation.state === "loading";
+
+  const actionUrl = vercelResourcePath(organizationSlug, projectSlug, environmentSlug);
+
+  const handleToggleEnvVar = useCallback((key: string, enabled: boolean) => {
+    setSyncEnvVarsMapping((prev) => {
+      const newMapping = { ...prev };
+
+      if (enabled) {
+        for (const envSlug of ALL_ENV_SLUGS) {
+          if (newMapping[envSlug]) {
+            const { [key]: _, ...rest } = newMapping[envSlug];
+            if (Object.keys(rest).length === 0) {
+              delete newMapping[envSlug];
+            } else {
+              newMapping[envSlug] = rest;
+            }
+          }
+        }
+      } else {
+        for (const envSlug of ALL_ENV_SLUGS) {
+          newMapping[envSlug] = {
+            ...(newMapping[envSlug] || {}),
+            [key]: false,
+          };
+        }
+      }
+
+      return newMapping;
+    });
+  }, []);
+
+  const handleToggleAllEnvVars = useCallback(
+    (enabled: boolean, syncableVars: Array<{ key: string }>) => {
+      if (enabled) {
+        setSyncEnvVarsMapping({});
+      } else {
+        const newMapping: SyncEnvVarsMapping = {};
+        for (const envSlug of ALL_ENV_SLUGS) {
+          newMapping[envSlug] = {};
+          for (const v of syncableVars) {
+            newMapping[envSlug][v.key] = false;
+          }
+        }
+        setSyncEnvVarsMapping(newMapping);
+      }
+    },
+    []
+  );
+
+  const handleProjectSelection = useCallback(async () => {
+    if (!selectedVercelProject) {
+      setProjectSelectionError("Please select a Vercel project");
+      return;
+    }
+
+    setProjectSelectionError(null);
+
+    const formData = new FormData();
+    formData.append("action", "select-vercel-project");
+    formData.append("vercelProjectId", selectedVercelProject.id);
+    formData.append("vercelProjectName", selectedVercelProject.name);
+
+    fetcher.submit(formData, {
+      method: "post",
+      action: actionUrl,
+    });
+  }, [selectedVercelProject, fetcher, actionUrl]);
+
+  const handleSkipOnboarding = useCallback(() => {
+    onClose();
+
+    if (fromMarketplaceContext) {
+      return window.close();
+    }
+
+    const formData = new FormData();
+    formData.append("action", "skip-onboarding");
+    fetcher.submit(formData, {
+      method: "post",
+      action: actionUrl,
+    });
+  }, [actionUrl, fetcher, onClose, fromMarketplaceContext]);
+
+  const handleSkipEnvMapping = useCallback(() => {
+    trackOnboarding("vercel onboarding env mapping completed", {
+      skipped: true,
+      staging_environment: null,
+    });
+    setVercelStagingEnvironment(null);
+    setState("loading-env-vars");
+  }, [trackOnboarding]);
+
+  const handleUpdateEnvMapping = useCallback(() => {
+    trackOnboarding("vercel onboarding env mapping completed", {
+      skipped: false,
+      staging_environment: vercelStagingEnvironment?.displayName ?? null,
+    });
+
+    if (!vercelStagingEnvironment) {
+      setState("loading-env-vars");
+      return;
+    }
+
+    const formData = new FormData();
+    formData.append("action", "update-env-mapping");
+    formData.append("vercelStagingEnvironment", JSON.stringify(vercelStagingEnvironment));
+
+    envMappingFetcher.submit(formData, {
+      method: "post",
+      action: actionUrl,
+    });
+
+  }, [vercelStagingEnvironment, envMappingFetcher, actionUrl, trackOnboarding]);
+
+  const handleBuildSettingsNext = useCallback(() => {
+    trackOnboarding("vercel onboarding build settings completed");
+
+    if (nextUrl && fromMarketplaceContext && isGitHubConnectedForOnboarding) {
+      setIsRedirecting(true);
+    }
+
+    const formData = new FormData();
+    formData.append("action", "complete-onboarding");
+    formData.append("vercelStagingEnvironment", vercelStagingEnvironment ? JSON.stringify(vercelStagingEnvironment) : "");
+    formData.append("pullEnvVarsBeforeBuild", JSON.stringify(pullEnvVarsBeforeBuild));
+    formData.append("atomicBuilds", JSON.stringify(atomicBuilds));
+    formData.append("discoverEnvVars", JSON.stringify(discoverEnvVars));
+    formData.append("syncEnvVarsMapping", JSON.stringify(syncEnvVarsMapping));
+    if (nextUrl && fromMarketplaceContext && isGitHubConnectedForOnboarding) {
+      formData.append("next", nextUrl);
+    }
+
+    if (!isGitHubConnectedForOnboarding) {
+      formData.append("skipRedirect", "true");
+    }
+
+    completeOnboardingFetcher.submit(formData, {
+      method: "post",
+      action: actionUrl,
+    });
+
+    if (!isGitHubConnectedForOnboarding) {
+      setState("github-connection");
+    }
+  }, [vercelStagingEnvironment, pullEnvVarsBeforeBuild, atomicBuilds, discoverEnvVars, syncEnvVarsMapping, nextUrl, fromMarketplaceContext, isGitHubConnectedForOnboarding, completeOnboardingFetcher, actionUrl, trackOnboarding]);
+
+  const handleFinishOnboarding = useCallback((e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    const form = e.currentTarget;
+    const formData = new FormData(form);
+    completeOnboardingFetcher.submit(formData, {
+      method: "post",
+      action: actionUrl,
+    });
+  }, [completeOnboardingFetcher, actionUrl]);
+
+  useEffect(() => {
+    if (completeOnboardingFetcher.data && typeof completeOnboardingFetcher.data === "object" && "success" in completeOnboardingFetcher.data && completeOnboardingFetcher.data.success && completeOnboardingFetcher.state === "idle") {
+      if (state === "github-connection") {
+        return;
+      }
+      if ("redirectTo" in completeOnboardingFetcher.data && typeof completeOnboardingFetcher.data.redirectTo === "string") {
+        const validRedirect = safeRedirectUrl(completeOnboardingFetcher.data.redirectTo);
+        if (validRedirect) {
+          window.location.href = validRedirect;
+        }
+        return;
+      }
+      setState("completed");
+    }
+  }, [completeOnboardingFetcher.data, completeOnboardingFetcher.state, state]);
+
+  useEffect(() => {
+    if (state === "completed" && !hasTrackedCompletionRef.current) {
+      hasTrackedCompletionRef.current = true;
+      trackOnboarding("vercel onboarding completed", {
+        github_connected: isGitHubConnectedForOnboarding,
+      });
+      onClose();
+    }
+  }, [state, onClose, trackOnboarding, isGitHubConnectedForOnboarding]);
+
+  useEffect(() => {
+    if (state === "installing") {
+      const installUrl = vercelAppInstallPath(organizationSlug, projectSlug);
+      window.location.href = installUrl;
+    }
+  }, [state, organizationSlug, projectSlug]);
+
+  useEffect(() => {
+    if (envMappingFetcher.data && typeof envMappingFetcher.data === "object" && "success" in envMappingFetcher.data && envMappingFetcher.data.success && envMappingFetcher.state === "idle") {
+      setState("loading-env-vars");
+    }
+  }, [envMappingFetcher.data, envMappingFetcher.state]);
+
+  useEffect(() => {
+    if (state === "env-mapping" && customEnvironments.length > 0 && !vercelStagingEnvironment) {
+      let selectedEnv: VercelCustomEnvironment;
+
+      if (customEnvironments.length === 1) {
+        selectedEnv = customEnvironments[0];
+      } else {
+        const stagingEnv = customEnvironments.find(
+          (env) => env.slug.toLowerCase() === "staging"
+        );
+        selectedEnv = stagingEnv ?? customEnvironments[0];
+      }
+
+      setVercelStagingEnvironment({ environmentId: selectedEnv.id, displayName: selectedEnv.slug });
+    }
+  }, [state, customEnvironments, vercelStagingEnvironment]);
+
+  useEffect(() => {
+    if (state === "project-selection" && availableProjects.length > 0 && !selectedVercelProject) {
+      setSelectedVercelProject(availableProjects[0]);
+    }
+  }, [state, availableProjects, selectedVercelProject]);
+
+  if (!isOpen || onboardingData?.authInvalid) {
+    return null;
+  }
+
+  const isLoadingState =
+    state === "loading-projects" ||
+    state === "loading-env-mapping" ||
+    state === "loading-env-vars" ||
+    state === "installing" ||
+    (state === "idle" && !onboardingData);
+
+  if (isLoadingState) {
+    return (
+      <Dialog open={isOpen} onOpenChange={(open) => {
+        if (!open && !fromMarketplaceContext) {
+          if (state as string !== "completed") {
+            trackOnboarding("vercel onboarding abandoned");
+          }
+          onClose();
+        }
+      }}>
+        <DialogContent className="max-w-lg">
+          <DialogHeader>
+            <div className="flex items-center gap-2">
+              <VercelLogo className="size-5" />
+              <span>Set up Vercel Integration</span>
+            </div>
+          </DialogHeader>
+          <div className="flex items-center justify-center py-8">
+            <SpinnerWhite className="size-6" />
+          </div>
+        </DialogContent>
+      </Dialog>
+    );
+  }
+
+  const showProjectSelection = state === "project-selection";
+  const showEnvMapping = state === "env-mapping";
+  const showEnvVarSync = state === "env-var-sync";
+  const showBuildSettings = state === "build-settings";
+  const showGitHubConnection = state === "github-connection";
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => {
+      if (!open && !fromMarketplaceContext) {
+        if (state !== "completed") {
+          trackOnboarding("vercel onboarding abandoned");
+        }
+        onClose();
+      }
+    }}>
+      <DialogContent className="max-w-lg">
+        <DialogHeader>
+          <div className="flex items-center gap-2">
+            <VercelLogo className="size-5" />
+            <span>Set up Vercel Integration</span>
+          </div>
+        </DialogHeader>
+
+        <div className="mt-4">
+          {showProjectSelection && (
+            <div className="flex flex-col gap-4">
+              <Header3>Select Vercel Project</Header3>
+              <Paragraph className="text-sm">
+                Choose which Vercel project to connect with this Trigger.dev project.
+                Your API keys will be automatically synced to Vercel.
+              </Paragraph>
+
+              {availableProjects.length === 0 ? (
+                <Callout variant="warning">
+                  No Vercel projects found. Please create a project in Vercel first.
+                </Callout>
+              ) : (
+                <Select
+                  disabled={availableProjects.length === 1}
+                  value={selectedVercelProject?.id || ""}
+                  setValue={(value) => {
+                    if (!Array.isArray(value)) {
+                      const project = availableProjects.find((p) => p.id === value);
+                      setSelectedVercelProject(project || null);
+                      setProjectSelectionError(null);
+                    }
+                  }}
+                  items={availableProjects}
+                  filter={availableProjects.length > 5 ? { keys: ["name"] } : undefined}
+                  variant="tertiary/medium"
+                  placeholder="Select a Vercel project"
+                  dropdownIcon
+                  text={selectedVercelProject?.name || "Select a project"}
+                >
+                  {availableProjects.map((project) => (
+                    <SelectItem key={project.id} value={project.id}>
+                      {project.name}
+                    </SelectItem>
+                  ))}
+                </Select>
+              )}
+
+              {projectSelectionError && (
+                <FormError>{projectSelectionError}</FormError>
+              )}
+
+              <Hint>
+                Once connected, your <code className="text-xs">TRIGGER_SECRET_KEY</code> will be
+                automatically synced to Vercel for each environment.
+              </Hint>
+
+              <FormButtons
+                confirmButton={
+                  <Button
+                    variant="primary/medium"
+                    onClick={handleProjectSelection}
+                    disabled={!selectedVercelProject || fetcher.state !== "idle"}
+                    LeadingIcon={fetcher.state !== "idle" ? SpinnerWhite : undefined}
+                  >
+                    {fetcher.state !== "idle" ? "Connecting..." : "Connect Project"}
+                  </Button>
+                }
+                cancelButton={
+                  <Button
+                    variant="tertiary/medium"
+                    onClick={handleSkipOnboarding}
+                  >
+                    Cancel
+                  </Button>
+                }
+              />
+            </div>
+          )}
+
+          {showEnvMapping && (
+            <div className="flex flex-col gap-4">
+              <Header3>Map Vercel Environment to Staging</Header3>
+              <Paragraph className="text-sm">
+                Select which custom Vercel environment should map to Trigger.dev's Staging
+                environment. Production and Preview environments are mapped automatically.
+              </Paragraph>
+
+              <Select
+                value={vercelStagingEnvironment?.environmentId || ""}
+                setValue={(value) => {
+                  if (!Array.isArray(value)) {
+                    const env = customEnvironments.find((e) => e.id === value);
+                    setVercelStagingEnvironment(
+                      env ? { environmentId: env.id, displayName: env.slug } : null
+                    );
+                  }
+                }}
+                items={customEnvironments}
+                variant="tertiary/medium"
+                placeholder="Select environment"
+                dropdownIcon
+                text={vercelStagingEnvironment?.displayName || "Select environment"}
+              >
+                {customEnvironments.map((env) => (
+                  <SelectItem key={env.id} value={env.id}>
+                    {env.slug}
+                  </SelectItem>
+                ))}
+              </Select>
+
+              <div className="flex items-center justify-between gap-2">
+                <Button
+                  variant="tertiary/medium"
+                  onClick={handleSkipOnboarding}
+                >
+                  Cancel
+                </Button>
+                <div className="flex items-center gap-2">
+                  {!fromMarketplaceContext && (
+                    <Button
+                      variant="tertiary/medium"
+                      onClick={handleSkipEnvMapping}
+                    >
+                      Skip
+                    </Button>
+                  )}
+                  <Button
+                    variant="primary/medium"
+                    onClick={handleUpdateEnvMapping}
+                    disabled={envMappingFetcher.state !== "idle"}
+                    LeadingIcon={envMappingFetcher.state !== "idle" ? SpinnerWhite : undefined}
+                  >
+                    Next
+                  </Button>
+                </div>
+              </div>
+            </div>
+          )}
+
+          {showEnvVarSync && (
+            <div className="flex flex-col gap-4">
+              <Header3>Pull Environment Variables</Header3>
+              <Paragraph className="text-sm">
+                Select which environment variables to pull from Vercel now. This is a one-time pull.
+              </Paragraph>
+
+              <div className="flex gap-4 text-sm">
+                <div className="rounded border bg-charcoal-750 px-3 py-2">
+                  <span className="font-medium text-text-bright">{syncableEnvVars.length}</span>
+                  <span className="text-text-dimmed"> can be pulled</span>
+                </div>
+                {secretEnvVars.length > 0 && (
+                  <div className="rounded border bg-charcoal-750 px-3 py-2">
+                    <span className="font-medium text-amber-400">{secretEnvVars.length}</span>
+                    <span className="text-text-dimmed"> secret (cannot pull)</span>
+                  </div>
+                )}
+              </div>
+
+              <div className="flex items-center justify-between rounded border bg-charcoal-800 p-3">
+                <div>
+                  <Label>Pull all environment variables now</Label>
+                  <Hint>Select all variables to pull from Vercel.</Hint>
+                </div>
+                <Switch
+                  variant="small"
+                  checked={enabledEnvVars.length === syncableEnvVars.length}
+                  onCheckedChange={(checked) => handleToggleAllEnvVars(checked, syncableEnvVars)}
+                />
+              </div>
+
+              {syncableEnvVars.length > 0 && (
+                <div className="rounded border">
+                  <button
+                    type="button"
+                    className="flex w-full items-center justify-between p-3 text-left"
+                    onClick={() => setExpandedEnvVars(!expandedEnvVars)}
+                  >
+                    <span className="text-sm text-text-dimmed">
+                      {enabledEnvVars.length} of {syncableEnvVars.length} variables will be pulled
+                    </span>
+                    {expandedEnvVars ? (
+                      <ChevronUpIcon className="size-4" />
+                    ) : (
+                      <ChevronDownIcon className="size-4" />
+                    )}
+                  </button>
+
+                  {expandedEnvVars && (
+                    <div className="max-h-64 overflow-y-auto border-t">
+                      {syncableEnvVars.map((envVar) => (
+                        <div
+                          key={envVar.id}
+                          className="flex items-center justify-between gap-2 border-b px-3 py-2 last:border-b-0"
+                        >
+                          <div className="flex min-w-0 flex-1 flex-col gap-0.5">
+                            {existingVars[envVar.key] ? (
+                              <TooltipProvider>
+                                <Tooltip>
+                                  <TooltipTrigger asChild>
+                                    <div className="min-w-0 max-w-full cursor-default text-left truncate font-mono text-xs underline decoration-yellow-500 decoration-dotted underline-offset-2">
+                                      {envVar.key}
+                                    </div>
+                                  </TooltipTrigger>
+                                  <TooltipContent className="flex items-center gap-1 text-xs">
+                                    {`This variable is going to be replaced in: ${existingVars[
+                                      envVar.key
+                                    ].environments.join(", ")}`}
+                                  </TooltipContent>
+                                </Tooltip>
+                              </TooltipProvider>
+                            ) : (
+                              <span className="truncate font-mono text-xs">{envVar.key}</span>
+                            )}
+                            {envVar.target && envVar.target.length > 0 && (
+                              <span className="text-xs text-text-dimmed">
+                                {formatVercelTargets(envVar.target)}
+                                {envVar.isShared && " · Shared"}
+                              </span>
+                            )}
+                          </div>
+                          <Switch
+                            variant="small"
+                            checked={shouldSyncEnvVarForAnyEnvironment(syncEnvVarsMapping, envVar.key)}
+                            onCheckedChange={(checked) =>
+                              handleToggleEnvVar(envVar.key, checked)
+                            }
+                          />
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+
+              {secretEnvVars.length > 0 && (
+                <div className="rounded border">
+                  <button
+                    type="button"
+                    className="flex w-full items-center justify-between p-3 text-left"
+                    onClick={() => setExpandedSecretEnvVars(!expandedSecretEnvVars)}
+                  >
+                    <span className="text-sm text-text-dimmed">
+                      {secretEnvVars.length} secret {secretEnvVars.length === 1 ? "variable" : "variables"} (cannot be pulled)
+                    </span>
+                    {expandedSecretEnvVars ? (
+                      <ChevronUpIcon className="size-4" />
+                    ) : (
+                      <ChevronDownIcon className="size-4" />
+                    )}
+                  </button>
+
+                  {expandedSecretEnvVars && (
+                    <div className="max-h-64 overflow-y-auto border-t">
+                      {secretEnvVars.map((envVar) => (
+                        <div
+                          key={envVar.id}
+                          className="flex items-center justify-between gap-2 border-b px-3 py-2 last:border-b-0"
+                        >
+                          <div className="flex min-w-0 flex-1 flex-col gap-0.5">
+                            <span className="truncate font-mono text-xs">{envVar.key}</span>
+                            {envVar.target && envVar.target.length > 0 && (
+                              <span className="text-xs text-text-dimmed">
+                                {formatVercelTargets(envVar.target)}
+                                {envVar.isShared && " · Shared"}
+                              </span>
+                            )}
+                          </div>
+                          <span className="shrink-0 text-xs text-amber-400">Secret</span>
+                        </div>
+                      ))}
+                    </div>
+                  )}
+                </div>
+              )}
+
+              {overlappingEnvVarsCount > 0 && enabledEnvVars.length > 0 && (
+                <div className="flex items-center gap-2">
+                  <ExclamationTriangleIcon className="h-4 w-4 text-amber-500" />
+                  <span className="text-xs text-text-dimmed">
+                    {overlappingEnvVarsCount} env vars are going to be updated (marked with{" "}
+                    <span className="underline decoration-yellow-500 decoration-dotted underline-offset-2">
+                      underline
+                    </span>
+                    )
+                  </span>
+                </div>
+              )}
+
+              <FormButtons
+                confirmButton={
+                  <Button
+                    variant="primary/medium"
+                    onClick={() => {
+                      trackOnboarding("vercel onboarding env vars configured", {
+                        env_vars_enabled: enabledEnvVars.length,
+                        env_vars_total: syncableEnvVars.length,
+                      });
+                      if (fromMarketplaceContext) {
+                        handleBuildSettingsNext();
+                      } else {
+                        setState("build-settings");
+                      }
+                    }}
+                    disabled={fromMarketplaceContext && (completeOnboardingFetcher.state !== "idle" || isRedirecting)}
+                    LeadingIcon={fromMarketplaceContext && (completeOnboardingFetcher.state !== "idle" || isRedirecting) ? SpinnerWhite : undefined}
+                  >
+                    {fromMarketplaceContext ? (isGitHubConnectedForOnboarding ? "Finish" : "Next") : "Next"}
+                  </Button>
+                }
+                cancelButton={
+                  hasCustomEnvs && !fromMarketplaceContext ? (
+                    <Button
+                      variant="tertiary/medium"
+                      onClick={() => setState("env-mapping")}
+                    >
+                      Back
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="tertiary/medium"
+                      onClick={handleSkipOnboarding}
+                      disabled={fetcher.state !== "idle"}
+                    >
+                      Cancel
+                    </Button>
+                  )
+                }
+              />
+            </div>
+          )}
+
+          {showBuildSettings && (
+            <div className="flex flex-col gap-4">
+              <Header3>Build Settings</Header3>
+              <Paragraph className="text-sm">
+                Configure how environment variables are pulled during builds and atomic deployments.
+              </Paragraph>
+
+              <BuildSettingsFields
+                availableEnvSlugs={availableEnvSlugsForOnboardingBuildSettings}
+                pullEnvVarsBeforeBuild={pullEnvVarsBeforeBuild}
+                onPullEnvVarsChange={setPullEnvVarsBeforeBuild}
+                discoverEnvVars={discoverEnvVars}
+                onDiscoverEnvVarsChange={setDiscoverEnvVars}
+                atomicBuilds={atomicBuilds}
+                onAtomicBuildsChange={setAtomicBuilds}
+              />
+
+              <FormButtons
+                confirmButton={
+                  <Button
+                    variant="primary/medium"
+                    onClick={handleBuildSettingsNext}
+                    disabled={completeOnboardingFetcher.state !== "idle" || isRedirecting}
+                    LeadingIcon={completeOnboardingFetcher.state !== "idle" || isRedirecting ? SpinnerWhite : undefined}
+                  >
+                    {isGitHubConnectedForOnboarding ? "Finish" : "Next"}
+                  </Button>
+                }
+                cancelButton={
+                  <Button
+                    variant="tertiary/medium"
+                    onClick={() => setState("env-var-sync")}
+                  >
+                    Back
+                  </Button>
+                }
+              />
+            </div>
+          )}
+
+          {showGitHubConnection && (
+            <div className="flex flex-col gap-4">
+              <Header3>Connect GitHub Repository</Header3>
+              <Paragraph className="text-sm">
+                To fully integrate with Vercel, Trigger.dev needs access to your source code.
+                This allows automatic deployments and build synchronization.
+              </Paragraph>
+
+              <Callout variant="info">
+                <p className="text-xs">
+                  Connecting your GitHub repository enables Trigger.dev to read your source code
+                  and automatically create deployments when you push changes to Vercel.
+                </p>
+              </Callout>
+
+              {(() => {
+                const baseSettingsPath = v3ProjectSettingsPath(
+                  { slug: organizationSlug },
+                  { slug: projectSlug },
+                  { slug: environmentSlug }
+                );
+                const redirectParams = new URLSearchParams();
+                redirectParams.set("vercelOnboarding", "true");
+                if (fromMarketplaceContext) {
+                  redirectParams.set("origin", "marketplace");
+                }
+                if (nextUrl) {
+                  redirectParams.set("next", nextUrl);
+                }
+                const redirectUrlWithContext = `${baseSettingsPath}?${redirectParams.toString()}`;
+
+                return gitHubAppInstallations.length === 0 ? (
+                  <div className="flex flex-col gap-3">
+                    <LinkButton
+                      to={githubAppInstallPath(
+                        organizationSlug,
+                        `${redirectUrlWithContext}&openGithubRepoModal=1`
+                      )}
+                      variant="secondary/medium"
+                      LeadingIcon={OctoKitty}
+                    >
+                      Install GitHub app
+                    </LinkButton>
+                  </div>
+                ) : (
+                  <div className="flex flex-col gap-3">
+                    <div className="flex items-center gap-3">
+                      <ConnectGitHubRepoModal
+                        gitHubAppInstallations={gitHubAppInstallations}
+                        organizationSlug={organizationSlug}
+                        projectSlug={projectSlug}
+                        environmentSlug={environmentSlug}
+                        redirectUrl={redirectUrlWithContext}
+                        preventDismiss={fromMarketplaceContext}
+                      />
+                      <span className="flex items-center gap-1 text-xs text-text-dimmed">
+                        <CheckCircleIcon className="size-4 text-success" /> GitHub app is installed
+                      </span>
+                    </div>
+                  </div>
+                );
+              })()}
+
+              <FormButtons
+                confirmButton={
+                  isGitHubConnectedForOnboarding && fromMarketplaceContext && nextUrl ? (
+                    <Button
+                      variant="primary/medium"
+                      onClick={() => {
+                        setState("completed");
+                        const validUrl = safeRedirectUrl(nextUrl);
+                        if (validUrl) {
+                          window.location.href = validUrl;
+                        }
+                      }}
+                    >
+                      Complete
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="tertiary/medium"
+                      onClick={() => {
+                        setState("completed");
+                        if (fromMarketplaceContext && nextUrl) {
+                          const validUrl = safeRedirectUrl(nextUrl);
+                          if (validUrl) {
+                            window.location.href = validUrl;
+                          }
+                        }
+                      }}
+                    >
+                      Skip for now
+                    </Button>
+                  )
+                }
+                cancelButton={
+                  isGitHubConnectedForOnboarding && fromMarketplaceContext && nextUrl ? (
+                    <Button
+                      variant="tertiary/medium"
+                      onClick={() => {
+                        setState("completed");
+                      }}
+                    >
+                      Skip for now
+                    </Button>
+                  ) : undefined
+                }
+              />
+            </div>
+          )}
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/webapp/app/components/layout/AppLayout.tsx b/apps/webapp/app/components/layout/AppLayout.tsx
index e45836e496a..e0b58ed717c 100644
--- a/apps/webapp/app/components/layout/AppLayout.tsx
+++ b/apps/webapp/app/components/layout/AppLayout.tsx
@@ -1,8 +1,18 @@
 import { cn } from "~/utils/cn";
 
 /** This container is used to surround the entire app, it correctly places the nav bar */
-export function AppContainer({ children }: { children: React.ReactNode }) {
-  return <div className={cn("grid h-full w-full grid-rows-1 overflow-hidden")}>{children}</div>;
+export function AppContainer({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className?: string;
+}) {
+  return (
+    <div className={cn("grid h-full w-full grid-rows-1 overflow-hidden", className)}>
+      {children}
+    </div>
+  );
 }
 
 export function MainBody({ children }: { children: React.ReactNode }) {
@@ -11,7 +21,7 @@ export function MainBody({ children }: { children: React.ReactNode }) {
 
 /** This container should be placed around the content on a page */
 export function PageContainer({ children }: { children: React.ReactNode }) {
-  return <div className="grid grid-rows-[auto_1fr] overflow-hidden">{children}</div>;
+  return <div className="grid h-full grid-rows-[auto_1fr] overflow-hidden">{children}</div>;
 }
 
 export function PageBody({
diff --git a/apps/webapp/app/components/logs/LogDetailView.tsx b/apps/webapp/app/components/logs/LogDetailView.tsx
new file mode 100644
index 00000000000..a44d833054f
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogDetailView.tsx
@@ -0,0 +1,258 @@
+import { XMarkIcon } from "@heroicons/react/20/solid";
+import type { TaskRunStatus } from "@trigger.dev/database";
+import { useEffect, useState } from "react";
+import { useTypedFetcher } from "remix-typedjson";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { CopyableText } from "~/components/primitives/CopyableText";
+import { DateTimeAccurate } from "~/components/primitives/DateTime";
+import { Header2 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import * as Property from "~/components/primitives/PropertyTable";
+import { Spinner } from "~/components/primitives/Spinner";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
+import { PacketDisplay } from "~/components/runs/v3/PacketDisplay";
+import {
+  TaskRunStatusCombo,
+  descriptionForTaskRunStatus,
+} from "~/components/runs/v3/TaskRunStatus";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import type { LogEntry } from "~/presenters/v3/LogsListPresenter.server";
+import type { loader as logDetailLoader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.$logId";
+import { cn } from "~/utils/cn";
+import { getLevelColor } from "~/utils/logUtils";
+import { v3RunSpanPath } from "~/utils/pathBuilder";
+import { LogLevel } from "./LogLevel";
+import { ExitIcon } from "~/assets/icons/ExitIcon";
+type LogDetailViewProps = {
+  logId: string;
+  // If we have the log entry from the list, we can display it immediately
+  initialLog?: LogEntry;
+  onClose: () => void;
+  searchTerm?: string;
+};
+
+type LogAttributes = Record<string, unknown> & {
+  error?: {
+    message?: string;
+  };
+};
+
+function getDisplayMessage(log: {
+  message: string;
+  level: string;
+  attributes?: LogAttributes;
+}): string {
+  let message = log.message ?? "";
+  if (log.level === "ERROR") {
+    const maybeErrorMessage = log.attributes?.error?.message;
+    if (typeof maybeErrorMessage === "string" && maybeErrorMessage.length > 0) {
+      message = maybeErrorMessage;
+    }
+  }
+  return message;
+}
+
+function formatStringJSON(str: string): string {
+  return str
+    .replace(/\\n/g, "\n") // Converts literal "\n" to newline
+    .replace(/\\t/g, "\t"); // Converts literal "\t" to tab
+}
+
+export function LogDetailView({ logId, initialLog, onClose, searchTerm }: LogDetailViewProps) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+  const fetcher = useTypedFetcher<typeof logDetailLoader>();
+  const [error, setError] = useState<string | null>(null);
+
+  // Fetch full log details when logId changes
+  useEffect(() => {
+    if (!logId) return;
+
+    setError(null);
+    fetcher.load(
+      `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
+        environment.slug
+      }/logs/${encodeURIComponent(logId)}`
+    );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [organization.slug, project.slug, environment.slug, logId]);
+
+  // Handle fetch errors
+  useEffect(() => {
+    if (fetcher.data && typeof fetcher.data === "object" && "error" in fetcher.data) {
+      setError(fetcher.data.error as string);
+    } else if (fetcher.state === "idle" && fetcher.data === null && !initialLog) {
+      setError("Failed to load log details");
+    } else {
+      setError(null);
+    }
+  }, [fetcher.data, initialLog, fetcher.state]);
+
+  const isLoading = fetcher.state === "loading";
+  const log = fetcher.data ?? initialLog;
+  const runStatus = fetcher.data?.runStatus;
+
+  const runPath = v3RunSpanPath(
+    organization,
+    project,
+    environment,
+    { friendlyId: log?.runId ?? "" },
+    { spanId: log?.spanId ?? "" }
+  );
+
+  if (isLoading && !log) {
+    return (
+      <div className="flex h-full items-center justify-center">
+        <Spinner />
+      </div>
+    );
+  }
+
+  if (!log) {
+    return (
+      <div className="flex h-full flex-col">
+        <div className="flex items-center justify-between border-b border-grid-dimmed py-2 pl-3 pr-2">
+          <Header2>Log Details</Header2>
+          <Button
+            onClick={onClose}
+            variant="minimal/small"
+            TrailingIcon={ExitIcon}
+            shortcut={{ key: "esc" }}
+            shortcutPosition="before-trailing-icon"
+            className="pl-1"
+          />
+        </div>
+        <div className="flex flex-1 items-center justify-center">
+          <Paragraph className="text-text-dimmed">{error ?? "Log not found"}</Paragraph>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="grid h-full grid-rows-[auto_1fr] overflow-hidden">
+      {/* Header */}
+      <div className="flex items-center justify-between overflow-hidden border-b border-grid-dimmed py-2 pl-3 pr-2">
+        <Header2 className="truncate">{getDisplayMessage(log)}</Header2>
+        <Button
+          onClick={onClose}
+          variant="minimal/small"
+          TrailingIcon={ExitIcon}
+          shortcut={{ key: "esc" }}
+          shortcutPosition="before-trailing-icon"
+          className="pl-1"
+        />
+      </div>
+      <div className="overflow-y-auto px-3 py-3 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
+        <DetailsTab log={log} runPath={runPath} runStatus={runStatus} searchTerm={searchTerm} />
+      </div>
+    </div>
+  );
+}
+
+function DetailsTab({
+  log,
+  runPath,
+  runStatus,
+  searchTerm,
+}: {
+  log: LogEntry & {
+    attributes?: LogAttributes;
+  };
+  runPath: string;
+  runStatus?: TaskRunStatus;
+  searchTerm?: string;
+}) {
+  let beautifiedAttributes: string | null = null;
+
+  if (log.attributes) {
+    beautifiedAttributes = JSON.stringify(log.attributes, null, 2);
+    beautifiedAttributes = formatStringJSON(beautifiedAttributes);
+  }
+
+  const showAttributes = beautifiedAttributes && beautifiedAttributes !== "{}";
+
+  const message = getDisplayMessage(log);
+
+  return (
+    <>
+      <Property.Table>
+        <Property.Item>
+          <Property.Label>Run ID</Property.Label>
+          <Property.Value>
+            <CopyableText value={log.runId} copyValue={log.runId} asChild />
+            <LinkButton
+              to={runPath}
+              variant="secondary/small"
+              shortcut={{ key: "v" }}
+              className="mt-2"
+            >
+              View full run
+            </LinkButton>
+          </Property.Value>
+        </Property.Item>
+
+        {runStatus && (
+          <Property.Item>
+            <Property.Label>Status</Property.Label>
+            <Property.Value>
+              <SimpleTooltip
+                button={<TaskRunStatusCombo status={runStatus} />}
+                content={descriptionForTaskRunStatus(runStatus)}
+                disableHoverableContent
+                className="mt-1"
+              />
+            </Property.Value>
+          </Property.Item>
+        )}
+
+        <Property.Item>
+          <Property.Label>Task</Property.Label>
+          <Property.Value>
+            <CopyableText value={log.taskIdentifier} copyValue={log.taskIdentifier} asChild />
+          </Property.Value>
+        </Property.Item>
+
+        <Property.Item>
+          <Property.Label>Level</Property.Label>
+          <Property.Value>
+            <LogLevel level={log.level} />
+          </Property.Value>
+        </Property.Item>
+
+        <Property.Item>
+          <Property.Label>Timestamp</Property.Label>
+          <Property.Value>
+            <DateTimeAccurate date={log.triggeredTimestamp} />
+          </Property.Value>
+        </Property.Item>
+      </Property.Table>
+
+      {/* Message */}
+      <div className="mb-6 mt-3">
+        <PacketDisplay
+          data={message}
+          dataType="application/json"
+          title="Message"
+          searchTerm={searchTerm}
+          wrap={true}
+        />
+      </div>
+
+      {/* Attributes - only available in full log detail */}
+      {showAttributes && beautifiedAttributes && (
+        <div className="mb-6">
+          <PacketDisplay
+            data={beautifiedAttributes}
+            dataType="application/json"
+            title="Attributes"
+            searchTerm={searchTerm}
+          />
+        </div>
+      )}
+    </>
+  );
+}
diff --git a/apps/webapp/app/components/logs/LogLevel.tsx b/apps/webapp/app/components/logs/LogLevel.tsx
new file mode 100644
index 00000000000..3c2c38301ff
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogLevel.tsx
@@ -0,0 +1,16 @@
+import { cn } from "~/utils/cn";
+import { getLevelColor } from "~/utils/logUtils";
+import type { LogEntry } from "~/presenters/v3/LogsListPresenter.server";
+
+export function LogLevel({ level }: { level: LogEntry["level"] }) {
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center rounded border px-1 py-0.5 text-xxs font-medium uppercase tracking-wider",
+        getLevelColor(level)
+      )}
+    >
+      {level}
+    </span>
+  );
+}
diff --git a/apps/webapp/app/components/logs/LogsLevelFilter.tsx b/apps/webapp/app/components/logs/LogsLevelFilter.tsx
new file mode 100644
index 00000000000..947bef88fcc
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogsLevelFilter.tsx
@@ -0,0 +1,138 @@
+import * as Ariakit from "@ariakit/react";
+import { IconListTree } from "@tabler/icons-react";
+import { type ReactNode } from "react";
+import { AppliedFilter } from "~/components/primitives/AppliedFilter";
+import {
+  SelectItem,
+  SelectList,
+  SelectPopover,
+  SelectProvider,
+  SelectTrigger,
+  shortcutFromIndex,
+} from "~/components/primitives/Select";
+import { useSearchParams } from "~/hooks/useSearchParam";
+import { appliedSummary } from "~/components/runs/v3/SharedFilters";
+import type { LogLevel } from "~/presenters/v3/LogsListPresenter.server";
+import { cn } from "~/utils/cn";
+
+const allLogLevels: { level: LogLevel; label: string; color: string }[] = [
+  { level: "TRACE", label: "Trace", color: "text-purple-400" },
+  { level: "INFO", label: "Info", color: "text-blue-400" },
+  { level: "WARN", label: "Warning", color: "text-warning" },
+  { level: "ERROR", label: "Error", color: "text-error" },
+  { level: "DEBUG", label: "Debug", color: "text-charcoal-400" },
+];
+
+// In the future we might add other levels or change which are available
+function getAvailableLevels(): typeof allLogLevels {
+  return allLogLevels;
+}
+
+function getLevelBadgeColor(level: LogLevel): string {
+  switch (level) {
+    case "ERROR":
+      return "text-error bg-error/10 border-error/20";
+    case "WARN":
+      return "text-warning bg-warning/10 border-warning/20";
+    case "TRACE":
+      return "text-purple-400 bg-purple-500/10 border-purple-500/20";
+    case "DEBUG":
+      return "text-charcoal-400 bg-charcoal-700 border-charcoal-600";
+    case "INFO":
+      return "text-blue-400 bg-blue-500/10 border-blue-500/20";
+    default:
+      return "text-text-dimmed bg-charcoal-750 border-charcoal-700";
+  }
+}
+
+const shortcut = { key: "l" };
+
+export function LogsLevelFilter() {
+  const { values } = useSearchParams();
+  const selectedLevels = values("levels");
+  const hasLevels = selectedLevels.length > 0 && selectedLevels.some((v) => v !== "");
+
+  if (hasLevels) {
+    return <AppliedLevelFilter/>;
+  }
+
+  return (
+    <LevelDropdown
+      trigger={
+        <SelectTrigger
+          icon={<IconListTree className="size-4" />}
+          variant="secondary/small"
+          shortcut={shortcut}
+          tooltipTitle="Filter by level"
+        >
+          Level
+        </SelectTrigger>
+      }
+    />
+  );
+}
+
+function LevelDropdown({
+  trigger,
+}: {
+  trigger: ReactNode;
+}) {
+  const { values, replace } = useSearchParams();
+
+  const handleChange = (values: string[]) => {
+    replace({ levels: values, cursor: undefined, direction: undefined });
+  };
+
+  const availableLevels = getAvailableLevels();
+
+  return (
+    <SelectProvider value={values("levels")} setValue={handleChange} virtualFocus={true}>
+      {trigger}
+      <SelectPopover className="min-w-0 max-w-[min(240px,var(--popover-available-width))]">
+        <SelectList>
+          {availableLevels.map((item, index) => (
+            <SelectItem
+              key={item.level}
+              value={item.level}
+              shortcut={shortcutFromIndex(index, { shortcutsEnabled: true })}
+            >
+              <span
+                className={cn(
+                  "inline-flex items-center rounded border px-1.5 py-0.5 text-xs font-medium uppercase",
+                  getLevelBadgeColor(item.level)
+                )}
+              >
+                {item.level}
+              </span>
+            </SelectItem>
+          ))}
+        </SelectList>
+      </SelectPopover>
+    </SelectProvider>
+  );
+}
+
+function AppliedLevelFilter() {
+  const { values, del } = useSearchParams();
+  const levels = values("levels");
+
+  if (levels.length === 0 || levels.every((v) => v === "")) {
+    return null;
+  }
+
+  return (
+    <LevelDropdown
+      trigger={
+        <Ariakit.Select render={<div className="group cursor-pointer focus-custom" />}>
+          <AppliedFilter
+            label="Level"
+            icon={<IconListTree className="size-4" />}
+            value={appliedSummary(levels)}
+            onRemove={() => del(["levels", "cursor", "direction"])}
+            variant="secondary/small"
+          />
+        </Ariakit.Select>
+      }
+    />
+  );
+}
diff --git a/apps/webapp/app/components/logs/LogsRunIdFilter.tsx b/apps/webapp/app/components/logs/LogsRunIdFilter.tsx
new file mode 100644
index 00000000000..857e623d7c9
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogsRunIdFilter.tsx
@@ -0,0 +1,161 @@
+import * as Ariakit from "@ariakit/react";
+import { FingerPrintIcon } from "@heroicons/react/20/solid";
+import { useCallback, useState } from "react";
+import { AppliedFilter } from "~/components/primitives/AppliedFilter";
+import { Button } from "~/components/primitives/Buttons";
+import { FormError } from "~/components/primitives/FormError";
+import { Input } from "~/components/primitives/Input";
+import { Label } from "~/components/primitives/Label";
+import {
+  SelectPopover,
+  SelectProvider,
+  SelectTrigger,
+} from "~/components/primitives/Select";
+import { useSearchParams } from "~/hooks/useSearchParam";
+import { FilterMenuProvider } from "~/components/runs/v3/SharedFilters";
+
+const shortcut = { key: "i" };
+
+export function LogsRunIdFilter() {
+  const { value } = useSearchParams();
+  const runIdValue = value("runId");
+
+  if (runIdValue) {
+    return <AppliedRunIdFilter />;
+  }
+
+  return (
+    <FilterMenuProvider>
+      {(search, setSearch) => (
+        <RunIdDropdown
+          trigger={
+            <SelectTrigger
+              icon={<FingerPrintIcon className="size-4" />}
+              variant="secondary/small"
+              shortcut={shortcut}
+              tooltipTitle="Filter by run ID"
+            >
+              Run ID
+            </SelectTrigger>
+          }
+          clearSearchValue={() => setSearch("")}
+        />
+      )}
+    </FilterMenuProvider>
+  );
+}
+
+function RunIdDropdown({
+  trigger,
+  clearSearchValue,
+  onClose,
+}: {
+  trigger: React.ReactNode;
+  clearSearchValue: () => void;
+  onClose?: () => void;
+}) {
+  const [open, setOpen] = useState<boolean | undefined>();
+  const { value, replace } = useSearchParams();
+  const runIdValue = value("runId");
+
+  const [runId, setRunId] = useState(runIdValue);
+
+  const apply = useCallback(() => {
+    clearSearchValue();
+    replace({
+      cursor: undefined,
+      direction: undefined,
+      runId: runId === "" ? undefined : runId?.toString(),
+    });
+
+    setOpen(false);
+  }, [runId, replace, clearSearchValue]);
+
+  let error: string | undefined = undefined;
+  if (runId) {
+    if (!runId.startsWith("run_")) {
+      error = "Run IDs start with 'run_'";
+    } else if (runId.length !== 25 && runId.length !== 29) {
+      error = "Run IDs are 25 or 29 characters long";
+    }
+  }
+
+  return (
+    <SelectProvider virtualFocus={true} open={open} setOpen={setOpen}>
+      {trigger}
+      <SelectPopover
+        hideOnEnter={false}
+        hideOnEscape={() => {
+          if (onClose) {
+            onClose();
+            return false;
+          }
+          return true;
+        }}
+        className="max-w-[min(32ch,var(--popover-available-width))]"
+      >
+        <div className="flex flex-col gap-4 p-3">
+          <div className="flex flex-col gap-1">
+            <Label>Run ID</Label>
+            <Input
+              placeholder="run_"
+              value={runId ?? ""}
+              onChange={(e) => setRunId(e.target.value)}
+              variant="small"
+              className="w-[27ch] font-mono"
+              spellCheck={false}
+            />
+            {error ? <FormError>{error}</FormError> : null}
+          </div>
+          <div className="flex justify-between gap-1 border-t border-grid-dimmed pt-3">
+            <Button variant="tertiary/small" onClick={() => setOpen(false)}>
+              Cancel
+            </Button>
+            <Button
+              disabled={error !== undefined || !runId}
+              variant="secondary/small"
+              shortcut={{
+                modifiers: ["mod"],
+                key: "Enter",
+                enabledOnInputElements: true,
+              }}
+              onClick={() => apply()}
+            >
+              Apply
+            </Button>
+          </div>
+        </div>
+      </SelectPopover>
+    </SelectProvider>
+  );
+}
+
+function AppliedRunIdFilter() {
+  const { value, del } = useSearchParams();
+
+  const runId = value("runId");
+  if (!runId) {
+    return null;
+  }
+
+  return (
+    <FilterMenuProvider>
+      {(search, setSearch) => (
+        <RunIdDropdown
+          trigger={
+            <Ariakit.Select render={<div className="group cursor-pointer focus-custom" />}>
+              <AppliedFilter
+                label="Run ID"
+                icon={<FingerPrintIcon className="size-4" />}
+                value={runId}
+                onRemove={() => del(["runId", "cursor", "direction"])}
+                variant="secondary/small"
+              />
+            </Ariakit.Select>
+          }
+          clearSearchValue={() => setSearch("")}
+        />
+      )}
+    </FilterMenuProvider>
+  );
+}
diff --git a/apps/webapp/app/components/logs/LogsSearchInput.tsx b/apps/webapp/app/components/logs/LogsSearchInput.tsx
new file mode 100644
index 00000000000..58316cead88
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogsSearchInput.tsx
@@ -0,0 +1,100 @@
+import { MagnifyingGlassIcon, XMarkIcon } from "@heroicons/react/20/solid";
+import { motion } from "framer-motion";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { Input } from "~/components/primitives/Input";
+import { ShortcutKey } from "~/components/primitives/ShortcutKey";
+import { cn } from "~/utils/cn";
+import { useOptimisticLocation } from "~/hooks/useOptimisticLocation";
+import { useSearchParams } from "~/hooks/useSearchParam";
+
+export function LogsSearchInput() {
+  const location = useOptimisticLocation();
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const { value, replace, del } = useSearchParams();
+
+  // Get initial search value from URL
+  const initialSearch = value("search") ?? "";
+
+  const [text, setText] = useState(initialSearch);
+  const [isFocused, setIsFocused] = useState(false);
+
+  // Update text when URL search param changes (only when not focused to avoid overwriting user input)
+  useEffect(() => {
+    const urlSearch = value("search") ?? "";
+    if (urlSearch !== text && !isFocused) {
+      setText(urlSearch);
+    }
+  }, [value, text, isFocused]);
+
+  const handleSubmit = useCallback(() => {
+    if (text.trim()) {
+      replace({ search: text.trim() });
+    } else {
+      del("search");
+    }
+  }, [text, replace, del]);
+
+  const handleClear = useCallback(
+    (e: React.MouseEvent<HTMLButtonElement>) => {
+      e.preventDefault();
+      e.stopPropagation();
+      setText("");
+      del(["search", "cursor", "direction"]);
+    },
+    [del]
+  );
+
+  return (
+    <div className="flex items-center gap-1">
+      <motion.div
+        initial={{ width: "auto" }}
+        animate={{ width: isFocused && text.length > 0 ? "24rem" : "auto" }}
+        transition={{
+          type: "spring",
+          stiffness: 300,
+          damping: 30,
+        }}
+        className="relative h-6 min-w-52"
+      >
+        <Input
+          type="text"
+          ref={inputRef}
+          variant="secondary-small"
+          placeholder="Search logs…"
+          value={text}
+          onChange={(e) => setText(e.target.value)}
+          fullWidth
+          className={cn("", isFocused && "placeholder:text-text-dimmed/70")}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              e.preventDefault();
+              handleSubmit();
+            }
+            if (e.key === "Escape") {
+              e.currentTarget.blur();
+            }
+          }}
+          onFocus={() => setIsFocused(true)}
+          onBlur={() => setIsFocused(false)}
+          icon={<MagnifyingGlassIcon className="size-4" />}
+          accessory={
+            text.length > 0 ? (
+              <div className="-mr-1 flex items-center gap-1">
+                <ShortcutKey shortcut={{ key: "enter" }} variant="small" />
+                <button
+                  type="button"
+                  onClick={handleClear}
+                  className="flex size-4.5 items-center justify-center rounded-[2px] border border-text-dimmed/40 text-text-dimmed hover:bg-charcoal-700 hover:text-text-bright"
+                  title="Clear search"
+                >
+                  <XMarkIcon className="size-3" />
+                </button>
+              </div>
+            ) : undefined
+          }
+        />
+      </motion.div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/logs/LogsTable.tsx b/apps/webapp/app/components/logs/LogsTable.tsx
new file mode 100644
index 00000000000..dcbd2d6868f
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogsTable.tsx
@@ -0,0 +1,243 @@
+import { ArrowPathIcon, ArrowTopRightOnSquareIcon } from "@heroicons/react/20/solid";
+import { Link } from "@remix-run/react";
+import { useEffect, useRef, useState } from "react";
+import { cn } from "~/utils/cn";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import type { LogEntry } from "~/presenters/v3/LogsListPresenter.server";
+import { highlightSearchText } from "~/utils/logUtils";
+import { v3RunSpanPath } from "~/utils/pathBuilder";
+import { DateTimeAccurate } from "../primitives/DateTime";
+import { Paragraph } from "../primitives/Paragraph";
+import { Spinner } from "../primitives/Spinner";
+import { LogLevel } from "./LogLevel";
+import { TruncatedCopyableValue } from "../primitives/TruncatedCopyableValue";
+import { LogLevelTooltipInfo } from "~/components/LogLevelTooltipInfo";
+import {
+  Table,
+  TableBlankRow,
+  TableBody,
+  TableCell,
+  TableCellMenu,
+  TableHeader,
+  TableHeaderCell,
+  TableRow,
+  type TableVariant,
+} from "../primitives/Table";
+import { RunsIcon } from "~/assets/icons/RunsIcon";
+
+type LogsTableProps = {
+  logs: LogEntry[];
+  searchTerm?: string;
+  isLoading?: boolean;
+  isLoadingMore?: boolean;
+  hasMore?: boolean;
+  onLoadMore?: () => void;
+  onCheckForMore?: () => void;
+  variant?: TableVariant;
+  selectedLogId?: string;
+  onLogSelect?: (logId: string) => void;
+};
+
+// Inner shadow for level highlighting (better scroll performance than border-l)
+function getLevelBoxShadow(level: LogEntry["level"]): string {
+  switch (level) {
+    case "ERROR":
+      return "inset 2px 0 0 0 rgb(239, 68, 68)";
+    case "WARN":
+      return "inset 2px 0 0 0 rgb(234, 179, 8)";
+    case "INFO":
+      return "inset 2px 0 0 0 rgb(59, 130, 246)";
+    case "TRACE":
+      return "inset 2px 0 0 0 rgb(168, 85, 247)";
+    case "DEBUG":
+    default:
+      return "none";
+  }
+}
+
+export function LogsTable({
+  logs,
+  searchTerm,
+  isLoading = false,
+  isLoadingMore = false,
+  hasMore = false,
+  onLoadMore,
+  onCheckForMore,
+  selectedLogId,
+  onLogSelect,
+}: LogsTableProps) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+  const loadMoreRef = useRef<HTMLDivElement>(null);
+  const [showLoadMoreSpinner, setShowLoadMoreSpinner] = useState(false);
+
+  // Show load more spinner only after 0.2 seconds of loading time
+  useEffect(() => {
+    if (!isLoadingMore) {
+      setShowLoadMoreSpinner(false);
+      return;
+    }
+
+    const timer = setTimeout(() => {
+      setShowLoadMoreSpinner(true);
+    }, 200);
+
+    return () => clearTimeout(timer);
+  }, [isLoadingMore]);
+
+  // Intersection observer for infinite scroll
+  useEffect(() => {
+    if (!hasMore || isLoadingMore || !onLoadMore) return;
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0].isIntersecting) {
+          onLoadMore();
+        }
+      },
+      { threshold: 0.1 }
+    );
+
+    const currentRef = loadMoreRef.current;
+    if (currentRef) {
+      observer.observe(currentRef);
+    }
+
+    return () => {
+      if (currentRef) {
+        observer.unobserve(currentRef);
+      }
+    };
+  }, [hasMore, isLoadingMore, onLoadMore]);
+
+  return (
+    <div className="relative h-full overflow-auto border-t scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
+      <Table variant="compact/mono" containerClassName="overflow-visible" showTopBorder={false}>
+        <TableHeader className="sticky top-0 z-10">
+          <TableRow>
+            <TableHeaderCell className="min-w-48 whitespace-nowrap">Time</TableHeaderCell>
+            <TableHeaderCell className="min-w-24 whitespace-nowrap">Run</TableHeaderCell>
+            <TableHeaderCell className="min-w-32 whitespace-nowrap">Task</TableHeaderCell>
+            <TableHeaderCell
+              className="min-w-24 whitespace-nowrap"
+              tooltip={<LogLevelTooltipInfo />}
+              disableTooltipHoverableContent
+            >
+              Level
+            </TableHeaderCell>
+            <TableHeaderCell className="w-full min-w-0">Message</TableHeaderCell>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {logs.length === 0 ? (
+            <BlankState isLoading={isLoading} onRefresh={() => window.location.reload()} />
+          ) : (
+            logs.map((log) => {
+              const isSelected = selectedLogId === log.id;
+              const runPath = v3RunSpanPath(
+                organization,
+                project,
+                environment,
+                { friendlyId: log.runId },
+                { spanId: log.spanId }
+              );
+
+              const handleRowClick = () => onLogSelect?.(log.id);
+
+              return (
+                <TableRow
+                  key={log.id}
+                  className={cn(
+                    "cursor-pointer transition-colors",
+                    isSelected ? "bg-charcoal-750" : "hover:bg-charcoal-850"
+                  )}
+                  isSelected={isSelected}
+                >
+                  <TableCell
+                    className="whitespace-nowrap tabular-nums"
+                    onClick={handleRowClick}
+                    hasAction
+                    style={{
+                      boxShadow: getLevelBoxShadow(log.level),
+                    }}
+                  >
+                    <DateTimeAccurate date={log.triggeredTimestamp} hour12={false} />
+                  </TableCell>
+                  <TableCell className="min-w-24" onClick={handleRowClick} hasAction>
+                    <TruncatedCopyableValue value={log.runId} />
+                  </TableCell>
+                  <TableCell className="min-w-32" onClick={handleRowClick} hasAction>
+                    <span className="font-mono text-xs">{log.taskIdentifier}</span>
+                  </TableCell>
+                  <TableCell onClick={handleRowClick} hasAction>
+                    <LogLevel level={log.level} />
+                  </TableCell>
+                  <TableCell className="max-w-0 truncate" onClick={handleRowClick} hasAction>
+                    <span className="block truncate font-mono text-xs" title={log.message}>
+                      {highlightSearchText(log.message, searchTerm)}
+                    </span>
+                  </TableCell>
+                  <TableCellMenu
+                    className="pl-32"
+                    hiddenButtons={
+                      <LinkButton
+                        to={runPath}
+                        variant="minimal/small"
+                        TrailingIcon={RunsIcon}
+                        trailingIconClassName="text-text-bright"
+                        className="h-[1.375rem] pl-1.5 pr-2"
+                      >
+                        <span className="text-[0.6875rem] text-text-bright">View run</span>
+                      </LinkButton>
+                    }
+                  />
+                </TableRow>
+              );
+            })
+          )}
+        </TableBody>
+      </Table>
+      {/* Infinite scroll trigger */}
+      {hasMore && logs.length > 0 && (
+        <div ref={loadMoreRef} className="flex items-center justify-center py-12">
+          <div className={cn("flex items-center gap-2", !showLoadMoreSpinner && "invisible")}>
+            <Spinner /> <span className="text-text-dimmed">Loading more…</span>
+          </div>
+        </div>
+      )}
+      {/* Show all logs message with check for more button */}
+      {!hasMore && logs.length > 0 && (
+        <div className="flex items-center justify-center py-12">
+          <div className="flex flex-col items-center gap-3">
+            <span className="text-text-dimmed">Showing all {logs.length} logs</span>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
+function BlankState({ isLoading, onRefresh }: { isLoading?: boolean; onRefresh?: () => void }) {
+  if (isLoading) return <TableBlankRow colSpan={6}></TableBlankRow>;
+
+  const handleRefresh = onRefresh ?? (() => window.location.reload());
+
+  return (
+    <TableBlankRow colSpan={6}>
+      <div className="flex flex-col items-center justify-center gap-6">
+        <Paragraph className="w-auto" variant="base/bright">
+          No logs match your filters. Try refreshing or modifying your filters.
+        </Paragraph>
+        <div className="flex items-center gap-2">
+          <Button LeadingIcon={ArrowPathIcon} variant="tertiary/medium" onClick={handleRefresh}>
+            Refresh
+          </Button>
+        </div>
+      </div>
+    </TableBlankRow>
+  );
+}
diff --git a/apps/webapp/app/components/logs/LogsTaskFilter.tsx b/apps/webapp/app/components/logs/LogsTaskFilter.tsx
new file mode 100644
index 00000000000..fa64eff7bd3
--- /dev/null
+++ b/apps/webapp/app/components/logs/LogsTaskFilter.tsx
@@ -0,0 +1,144 @@
+import type { TaskTriggerSource } from "@trigger.dev/database";
+import type { ReactNode } from "react";
+import { useMemo } from "react";
+import * as Ariakit from "@ariakit/react";
+import {
+  ComboBox,
+  SelectItem,
+  SelectList,
+  SelectPopover,
+  SelectProvider,
+  SelectTrigger,
+} from "~/components/primitives/Select";
+import { useSearchParams } from "~/hooks/useSearchParam";
+import { TaskTriggerSourceIcon } from "~/components/runs/v3/TaskTriggerSource";
+import { TaskIcon } from "~/assets/icons/TaskIcon";
+import { appliedSummary, FilterMenuProvider } from "~/components/runs/v3/SharedFilters";
+import { AppliedFilter } from "~/components/primitives/AppliedFilter";
+
+const shortcut = { key: "t" };
+
+type TaskOption = {
+  slug: string;
+  triggerSource: TaskTriggerSource;
+};
+
+interface LogsTaskFilterProps {
+  possibleTasks: TaskOption[];
+}
+
+export function LogsTaskFilter({ possibleTasks }: LogsTaskFilterProps) {
+  const { values, replace, del } = useSearchParams();
+  const selectedTasks = values("tasks");
+
+  if (selectedTasks.length === 0 || selectedTasks.every((v) => v === "")) {
+    return (
+      <FilterMenuProvider>
+        {(search, setSearch) => (
+          <TasksDropdown
+            trigger={
+              <SelectTrigger
+                icon={<TaskIcon className="size-4" />}
+                variant="secondary/small"
+                shortcut={shortcut}
+                tooltipTitle="Filter by task"
+              >
+                <span className="ml-0.5">Tasks</span>
+              </SelectTrigger>
+            }
+            searchValue={search}
+            clearSearchValue={() => setSearch("")}
+            possibleTasks={possibleTasks}
+          />
+        )}
+      </FilterMenuProvider>
+    );
+  }
+
+  return (
+    <FilterMenuProvider>
+      {(search, setSearch) => (
+        <TasksDropdown
+          trigger={
+            <Ariakit.Select render={<div className="group cursor-pointer focus-custom" />}>
+              <AppliedFilter
+                label="Task"
+                icon={<TaskIcon className="size-4" />}
+                value={appliedSummary(
+                  selectedTasks.map((v) => {
+                    const task = possibleTasks.find((task) => task.slug === v);
+                    return task ? task.slug : v;
+                  })
+                )}
+                onRemove={() => del(["tasks", "cursor", "direction"])}
+                variant="secondary/small"
+              />
+            </Ariakit.Select>
+          }
+          searchValue={search}
+          clearSearchValue={() => setSearch("")}
+          possibleTasks={possibleTasks}
+        />
+      )}
+    </FilterMenuProvider>
+  );
+}
+
+function TasksDropdown({
+  trigger,
+  clearSearchValue,
+  searchValue,
+  onClose,
+  possibleTasks,
+}: {
+  trigger: ReactNode;
+  clearSearchValue: () => void;
+  searchValue: string;
+  onClose?: () => void;
+  possibleTasks: TaskOption[];
+}) {
+  const { values, replace } = useSearchParams();
+
+  const handleChange = (values: string[]) => {
+    clearSearchValue();
+    replace({ tasks: values, cursor: undefined, direction: undefined });
+  };
+
+  const filtered = useMemo(() => {
+    return possibleTasks.filter((item) => {
+      return item.slug.toLowerCase().includes(searchValue.toLowerCase());
+    });
+  }, [searchValue, possibleTasks]);
+
+  return (
+    <SelectProvider value={values("tasks")} setValue={handleChange} virtualFocus={true}>
+      {trigger}
+      <SelectPopover
+        className="min-w-0 max-w-[min(360px,var(--popover-available-width))]"
+        hideOnEscape={() => {
+          if (onClose) {
+            onClose();
+            return false;
+          }
+
+          return true;
+        }}
+      >
+        <ComboBox placeholder={"Filter by task..."} value={searchValue} />
+        <SelectList>
+          {filtered.map((item, index) => (
+            <SelectItem
+              key={`${item.triggerSource}-${item.slug}`}
+              value={item.slug}
+              icon={
+                <TaskTriggerSourceIcon source={item.triggerSource} className="size-4 flex-none" />
+              }
+            >
+              {item.slug}
+            </SelectItem>
+          ))}
+        </SelectList>
+      </SelectPopover>
+    </SelectProvider>
+  );
+}
diff --git a/apps/webapp/app/components/metrics/BigNumber.tsx b/apps/webapp/app/components/metrics/BigNumber.tsx
index 7c4441be345..df3fa9e0a43 100644
--- a/apps/webapp/app/components/metrics/BigNumber.tsx
+++ b/apps/webapp/app/components/metrics/BigNumber.tsx
@@ -14,7 +14,7 @@ interface BigNumberProps {
   valueClassName?: string;
   defaultValue?: number;
   accessory?: ReactNode;
-  suffix?: string;
+  suffix?: ReactNode;
   suffixClassName?: string;
   compactThreshold?: number;
 }
diff --git a/apps/webapp/app/components/metrics/QueryWidget.tsx b/apps/webapp/app/components/metrics/QueryWidget.tsx
new file mode 100644
index 00000000000..1dcf1703993
--- /dev/null
+++ b/apps/webapp/app/components/metrics/QueryWidget.tsx
@@ -0,0 +1,523 @@
+import { DocumentDuplicateIcon, PencilSquareIcon, TrashIcon } from "@heroicons/react/20/solid";
+import { ClipboardIcon } from "@heroicons/react/24/outline";
+import { ChartBarIcon } from "@heroicons/react/24/solid";
+import { type OutputColumnMetadata } from "@internal/tsql";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { IconBraces, IconChartHistogram, IconFileTypeCsv } from "@tabler/icons-react";
+import { assertNever } from "assert-never";
+import { Maximize2 } from "lucide-react";
+import { useCallback, useRef, useState, type ReactNode } from "react";
+import { z } from "zod";
+import { Card } from "~/components/primitives/charts/Card";
+import { ShortcutKey } from "~/components/primitives/ShortcutKey";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
+import { useShortcutKeys } from "~/hooks/useShortcutKeys";
+import { cn } from "~/utils/cn";
+import { rowsToCSV, rowsToJSON } from "~/utils/dataExport";
+import { QueryResultsChart } from "../code/QueryResultsChart";
+import { TSQLResultsTable } from "../code/TSQLResultsTable";
+import { Button } from "../primitives/Buttons";
+import { Callout } from "../primitives/Callout";
+import { BigNumberCard } from "../primitives/charts/BigNumberCard";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "../primitives/Dialog";
+import { Input } from "../primitives/Input";
+import { InputGroup } from "../primitives/InputGroup";
+import { Label } from "../primitives/Label";
+import { LoadingBarDivider } from "../primitives/LoadingBarDivider";
+import {
+  Popover,
+  PopoverContent,
+  PopoverMenuItem,
+  PopoverVerticalEllipseTrigger,
+} from "../primitives/Popover";
+
+const ChartType = z.union([z.literal("bar"), z.literal("line")]);
+export type ChartType = z.infer<typeof ChartType>;
+
+const SortDirection = z.union([z.literal("asc"), z.literal("desc")]);
+export type SortDirection = z.infer<typeof SortDirection>;
+
+const AggregationType = z.union([
+  z.literal("sum"),
+  z.literal("avg"),
+  z.literal("count"),
+  z.literal("min"),
+  z.literal("max"),
+]);
+export type AggregationType = z.infer<typeof AggregationType>;
+
+const chartConfigOptions = {
+  chartType: ChartType,
+  xAxisColumn: z.string().nullable(),
+  yAxisColumns: z.string().array(),
+  groupByColumn: z.string().nullable(),
+  stacked: z.boolean(),
+  sortByColumn: z.string().nullable(),
+  sortDirection: SortDirection,
+  aggregation: AggregationType,
+  seriesColors: z.record(z.string()).optional(),
+};
+
+const ChartConfiguration = z.object({ ...chartConfigOptions });
+export type ChartConfiguration = z.infer<typeof ChartConfiguration>;
+
+const BigNumberAggregationType = z.union([
+  z.literal("sum"),
+  z.literal("avg"),
+  z.literal("count"),
+  z.literal("min"),
+  z.literal("max"),
+  z.literal("first"),
+  z.literal("last"),
+]);
+export type BigNumberAggregationType = z.infer<typeof BigNumberAggregationType>;
+
+const BigNumberSortDirection = z.union([z.literal("asc"), z.literal("desc")]);
+
+const bigNumberConfigOptions = {
+  column: z.string(),
+  aggregation: BigNumberAggregationType,
+  sortDirection: BigNumberSortDirection.optional(),
+  abbreviate: z.boolean().default(false),
+  prefix: z.string().optional(),
+  suffix: z.string().optional(),
+};
+
+const BigNumberConfiguration = z.object({ ...bigNumberConfigOptions });
+export type BigNumberConfiguration = z.infer<typeof BigNumberConfiguration>;
+
+export const QueryWidgetConfig = z.discriminatedUnion("type", [
+  z.object({
+    type: z.literal("table"),
+    prettyFormatting: z.boolean().default(true),
+    sorting: z
+      .array(
+        z.object({
+          desc: z.boolean(),
+          id: z.string(),
+        })
+      )
+      .default([]),
+  }),
+  z.object({
+    type: z.literal("chart"),
+    ...chartConfigOptions,
+  }),
+  z.object({
+    type: z.literal("bignumber"),
+    ...bigNumberConfigOptions,
+  }),
+  z.object({
+    type: z.literal("title"),
+  }),
+]);
+
+export type QueryWidgetConfig = z.infer<typeof QueryWidgetConfig>;
+
+/** Result data containing rows and column metadata */
+export type QueryWidgetData = {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+};
+
+/** Widget configuration with optional result data (used for edit callbacks) */
+export type WidgetData = {
+  title: string;
+  query: string;
+  display: QueryWidgetConfig;
+  /** The current result data from the widget */
+  resultData?: QueryWidgetData;
+};
+
+export type QueryWidgetProps = {
+  title: ReactNode;
+  /** String title for rename dialog (optional - if not provided, rename won't be available) */
+  titleString?: string;
+  /** The TSQL query string (used for "Copy query" in the menu) */
+  query?: string;
+  isLoading?: boolean;
+  error?: string;
+  data: QueryWidgetData;
+  config: QueryWidgetConfig;
+  /** The effective time range for the query (used to show full x-axis on time-based charts) */
+  timeRange?: { from: string; to: string };
+  accessory?: ReactNode;
+  isResizing?: boolean;
+  isDraggable?: boolean;
+  /** Additional className applied to the Card wrapper */
+  className?: string;
+  /** Callback when edit is clicked. Receives the current data. */
+  onEdit?: (data: QueryWidgetData) => void;
+  /** Callback when rename is clicked. Receives the new title. */
+  onRename?: (newTitle: string) => void;
+  /** Callback when delete is clicked. */
+  onDelete?: () => void;
+  /** Callback when duplicate is clicked. Receives the current data. */
+  onDuplicate?: (data: QueryWidgetData) => void;
+  /** When true, show table column headers even when there are no rows */
+  showTableHeaderOnEmpty?: boolean;
+};
+
+export function QueryWidget({
+  title,
+  titleString,
+  query,
+  accessory,
+  isLoading,
+  error,
+  isResizing,
+  isDraggable,
+  className,
+  onEdit,
+  onRename,
+  onDelete,
+  onDuplicate,
+  ...props
+}: QueryWidgetProps) {
+  const [isFullscreen, setIsFullscreen] = useState(false);
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false);
+  const [renameValue, setRenameValue] = useState(titleString ?? "");
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const hasEditActions = onEdit || onRename || onDelete || onDuplicate;
+  const hasData = props.data.rows.length > 0;
+
+  // "v" to toggle fullscreen on hovered widget
+  useShortcutKeys({
+    shortcut: { key: "v" },
+    action: useCallback(() => {
+      const isHovered = containerRef.current?.matches(":hover");
+      if (!isFullscreen && !isHovered) return;
+      setIsFullscreen((prev) => !prev);
+    }, [isFullscreen]),
+  });
+
+  const copyToClipboard = useCallback((text: string) => {
+    navigator.clipboard.writeText(text);
+  }, []);
+
+  const copyQuery = useCallback(() => {
+    if (query) {
+      copyToClipboard(query);
+    }
+  }, [query, copyToClipboard]);
+
+  const copyJSON = useCallback(() => {
+    copyToClipboard(rowsToJSON(props.data.rows));
+  }, [props.data.rows, copyToClipboard]);
+
+  const copyCSV = useCallback(() => {
+    copyToClipboard(rowsToCSV(props.data.rows, props.data.columns));
+  }, [props.data, copyToClipboard]);
+
+  return (
+    <div ref={containerRef} className="group h-full">
+      <Card className={cn("h-full overflow-hidden px-0 pb-0", className)}>
+        <Card.Header draggable={isDraggable}>
+          <div className="flex items-center gap-1.5">{title}</div>
+          <Card.Accessory>
+            <SimpleTooltip
+              button={
+                <span className="opacity-0 transition-opacity group-hover:opacity-100">
+                  <Button
+                    variant="minimal/small"
+                    LeadingIcon={Maximize2}
+                    leadingIconClassName="text-text-dimmed group-hover/button:text-text-bright"
+                    onClick={() => setIsFullscreen(true)}
+                    className="!px-1"
+                  />
+                </span>
+              }
+              content={
+                <span className="flex items-center gap-1">
+                  Maximize
+                  <ShortcutKey shortcut={{ key: "v" }} variant="small/bright" />
+                </span>
+              }
+              asChild
+            />
+            <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+              <PopoverVerticalEllipseTrigger
+                isOpen={isMenuOpen}
+                className={cn(
+                  "transition-opacity",
+                  isMenuOpen ? "opacity-100" : "opacity-0 group-hover:opacity-100"
+                )}
+              />
+              <PopoverContent align="end" className="p-0">
+                <div className="flex flex-col gap-1 p-1">
+                  {hasEditActions && (
+                    <>
+                      {onEdit && (
+                        <PopoverMenuItem
+                          icon={IconChartHistogram}
+                          title="Edit chart"
+                          onClick={() => {
+                            onEdit(props.data);
+                            setIsMenuOpen(false);
+                          }}
+                          leadingIconClassName="-ml-0.5 -mr-1"
+                        />
+                      )}
+                      {onRename && (
+                        <PopoverMenuItem
+                          icon={PencilSquareIcon}
+                          title="Rename"
+                          onClick={() => {
+                            setRenameValue(titleString ?? "");
+                            setIsRenameDialogOpen(true);
+                            setIsMenuOpen(false);
+                          }}
+                        />
+                      )}
+                      {onDuplicate && (
+                        <PopoverMenuItem
+                          icon={DocumentDuplicateIcon}
+                          title="Duplicate chart"
+                          onClick={() => {
+                            onDuplicate(props.data);
+                            setIsMenuOpen(false);
+                          }}
+                          className="pr-4"
+                        />
+                      )}
+                    </>
+                  )}
+                  {query && (
+                    <PopoverMenuItem
+                      icon={ClipboardIcon}
+                      title="Copy query"
+                      onClick={() => {
+                        copyQuery();
+                        setIsMenuOpen(false);
+                      }}
+                    />
+                  )}
+                  <PopoverMenuItem
+                    icon={IconBraces}
+                    title="Copy JSON"
+                    disabled={!hasData}
+                    onClick={() => {
+                      copyJSON();
+                      setIsMenuOpen(false);
+                    }}
+                    leadingIconClassName="-ml-0.5 -mr-1"
+                  />
+                  <PopoverMenuItem
+                    icon={IconFileTypeCsv}
+                    title="Copy CSV"
+                    disabled={!hasData}
+                    onClick={() => {
+                      copyCSV();
+                      setIsMenuOpen(false);
+                    }}
+                    leadingIconClassName="-ml-0.5 -mr-1"
+                  />
+                  {onDelete && (
+                    <PopoverMenuItem
+                      icon={TrashIcon}
+                      title="Delete chart"
+                      leadingIconClassName="text-error"
+                      className="text-error hover:!bg-error/10"
+                      onClick={() => {
+                        onDelete();
+                        setIsMenuOpen(false);
+                      }}
+                    />
+                  )}
+                </div>
+              </PopoverContent>
+            </Popover>
+            {accessory}
+          </Card.Accessory>
+        </Card.Header>
+        <LoadingBarDivider isLoading={isLoading ?? false} className="bg-transparent" />
+        <Card.Content className="min-h-0 flex-1 overflow-hidden p-0">
+          {isResizing ? (
+            <div className="flex h-full flex-1 items-center justify-center p-3">
+              <div className="flex flex-col items-center gap-1 text-text-dimmed">
+                <ChartBarIcon className="size-10 text-text-dimmed" />{" "}
+                <span className="text-base font-medium">Resizing...</span>
+              </div>
+            </div>
+          ) : error ? (
+            <div className="p-3">
+              <Callout variant="error">{error}</Callout>
+            </div>
+          ) : (
+            <QueryWidgetBody
+              {...props}
+              title={title}
+              isFullscreen={isFullscreen}
+              setIsFullscreen={setIsFullscreen}
+              isLoading={isLoading ?? false}
+            />
+          )}
+        </Card.Content>
+      </Card>
+
+      {/* Rename Dialog */}
+      {onRename && (
+        <Dialog open={isRenameDialogOpen} onOpenChange={setIsRenameDialogOpen}>
+          <DialogContent className="sm:max-w-md">
+            <DialogHeader>Rename chart</DialogHeader>
+            <form
+              className="space-y-4 pt-3"
+              onSubmit={(e) => {
+                e.preventDefault();
+                if (renameValue.trim()) {
+                  onRename(renameValue.trim());
+                  setIsRenameDialogOpen(false);
+                }
+              }}
+            >
+              <InputGroup>
+                <Label>Title</Label>
+                <Input
+                  value={renameValue}
+                  onChange={(e) => setRenameValue(e.target.value)}
+                  placeholder="Chart title"
+                  autoFocus
+                />
+              </InputGroup>
+              <DialogFooter>
+                <DialogClose asChild>
+                  <Button variant="tertiary/medium">Cancel</Button>
+                </DialogClose>
+                <Button type="submit" variant="primary/medium" disabled={!renameValue.trim()}>
+                  Save
+                </Button>
+              </DialogFooter>
+            </form>
+          </DialogContent>
+        </Dialog>
+      )}
+    </div>
+  );
+}
+
+type QueryWidgetBodyProps = {
+  title: ReactNode;
+  data: QueryWidgetData;
+  config: QueryWidgetConfig;
+  timeRange?: { from: string; to: string };
+  isFullscreen: boolean;
+  setIsFullscreen: (open: boolean) => void;
+  isLoading: boolean;
+  showTableHeaderOnEmpty?: boolean;
+};
+
+function QueryWidgetBody({
+  title,
+  data,
+  config,
+  timeRange,
+  isFullscreen,
+  setIsFullscreen,
+  isLoading,
+  showTableHeaderOnEmpty,
+}: QueryWidgetBodyProps) {
+  const type = config.type;
+
+  // Only show the loading state if we have no data yet (initial load).
+  // During a reload with existing data, keep showing the current data
+  // while the loading bar in the header indicates a refresh is in progress.
+  const hasData = data.rows.length > 0;
+  const showLoading = isLoading && !hasData;
+
+  switch (type) {
+    case "table": {
+      return (
+        <>
+          <TSQLResultsTable
+            rows={data.rows}
+            columns={data.columns}
+            prettyFormatting={config.prettyFormatting}
+            sorting={config.sorting}
+            showHeaderOnEmpty={showTableHeaderOnEmpty}
+          />
+          <Dialog open={isFullscreen} onOpenChange={setIsFullscreen}>
+            <DialogContent
+              fullscreen
+              className="flex flex-col gap-0 bg-background-bright px-0 pb-0"
+            >
+              <DialogHeader className="px-4">{title}</DialogHeader>
+              <div className="min-h-0 w-full flex-1 pt-2.5">
+                <TSQLResultsTable
+                  rows={data.rows}
+                  columns={data.columns}
+                  prettyFormatting={config.prettyFormatting}
+                  sorting={config.sorting}
+                  showHeaderOnEmpty={showTableHeaderOnEmpty}
+                />
+              </div>
+            </DialogContent>
+          </Dialog>
+        </>
+      );
+    }
+    case "chart": {
+      return (
+        <>
+          <QueryResultsChart
+            rows={data.rows}
+            columns={data.columns}
+            config={config}
+            timeRange={timeRange}
+            onViewAllLegendItems={() => setIsFullscreen(true)}
+            isLoading={showLoading}
+          />
+          <Dialog open={isFullscreen} onOpenChange={setIsFullscreen}>
+            <DialogContent fullscreen className="flex flex-col bg-background-bright">
+              <DialogHeader>{title}</DialogHeader>
+              <div className="min-h-0 w-full flex-1 overflow-hidden pt-4">
+                <QueryResultsChart
+                  rows={data.rows}
+                  columns={data.columns}
+                  config={config}
+                  timeRange={timeRange}
+                  fullLegend
+                  legendScrollable
+                  isLoading={showLoading}
+                />
+              </div>
+            </DialogContent>
+          </Dialog>
+        </>
+      );
+    }
+    case "bignumber": {
+      return (
+        <>
+          <BigNumberCard
+            rows={data.rows}
+            columns={data.columns}
+            config={config}
+            isLoading={showLoading}
+          />
+          <Dialog open={isFullscreen} onOpenChange={setIsFullscreen}>
+            <DialogContent fullscreen className="flex flex-col bg-background-bright">
+              <DialogHeader>{title}</DialogHeader>
+              <div className="flex min-h-0 w-full flex-1 items-center justify-center pt-4">
+                <BigNumberCard
+                  rows={data.rows}
+                  columns={data.columns}
+                  config={config}
+                  isLoading={showLoading}
+                />
+              </div>
+            </DialogContent>
+          </Dialog>
+        </>
+      );
+    }
+    case "title": {
+      // Title widgets are rendered by TitleWidget, not QueryWidget
+      return null;
+    }
+    default: {
+      assertNever(type);
+    }
+  }
+}
diff --git a/apps/webapp/app/components/metrics/QueuesFilter.tsx b/apps/webapp/app/components/metrics/QueuesFilter.tsx
new file mode 100644
index 00000000000..87d7a612547
--- /dev/null
+++ b/apps/webapp/app/components/metrics/QueuesFilter.tsx
@@ -0,0 +1,212 @@
+import * as Ariakit from "@ariakit/react";
+import { RectangleStackIcon } from "@heroicons/react/20/solid";
+import { useFetcher } from "@remix-run/react";
+import { matchSorter } from "match-sorter";
+import { type ReactNode, useMemo } from "react";
+import { TaskIcon } from "~/assets/icons/TaskIcon";
+import { AppliedFilter } from "~/components/primitives/AppliedFilter";
+import {
+  ComboBox,
+  SelectItem,
+  SelectList,
+  SelectPopover,
+  SelectProvider,
+  SelectTrigger,
+} from "~/components/primitives/Select";
+import { Spinner } from "~/components/primitives/Spinner";
+import { useDebounceEffect } from "~/hooks/useDebounce";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { useSearchParams } from "~/hooks/useSearchParam";
+import { type loader as queuesLoader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues";
+import { appliedSummary, FilterMenuProvider } from "~/components/runs/v3/SharedFilters";
+
+const shortcut = { key: "q" };
+
+export function QueuesFilter() {
+  const { values, replace, del } = useSearchParams();
+  const selectedQueues = values("queues");
+
+  if (selectedQueues.length === 0 || selectedQueues.every((v) => v === "")) {
+    return (
+      <FilterMenuProvider>
+        {(search, setSearch) => (
+          <QueuesDropdown
+            trigger={
+              <SelectTrigger
+                icon={<RectangleStackIcon className="size-4" />}
+                variant="secondary/small"
+                shortcut={shortcut}
+                tooltipTitle="Filter by queue"
+              >
+                <span className="ml-1">Queues</span>
+              </SelectTrigger>
+            }
+            searchValue={search}
+            clearSearchValue={() => setSearch("")}
+          />
+        )}
+      </FilterMenuProvider>
+    );
+  }
+
+  return (
+    <FilterMenuProvider>
+      {(search, setSearch) => (
+        <QueuesDropdown
+          trigger={
+            <Ariakit.Select render={<div className="group cursor-pointer focus-custom" />}>
+              <AppliedFilter
+                label="Queues"
+                icon={<RectangleStackIcon className="size-4" />}
+                value={appliedSummary(selectedQueues.map((v) => v.replace("task/", "")))}
+                onRemove={() => del(["queues"])}
+                variant="secondary/small"
+              />
+            </Ariakit.Select>
+          }
+          searchValue={search}
+          clearSearchValue={() => setSearch("")}
+        />
+      )}
+    </FilterMenuProvider>
+  );
+}
+
+function QueuesDropdown({
+  trigger,
+  clearSearchValue,
+  searchValue,
+  onClose,
+}: {
+  trigger: ReactNode;
+  clearSearchValue: () => void;
+  searchValue: string;
+  onClose?: () => void;
+}) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+  const { values, replace } = useSearchParams();
+
+  const handleChange = (values: string[]) => {
+    clearSearchValue();
+    replace({
+      queues: values.length > 0 ? values : undefined,
+    });
+  };
+
+  const queueValues = values("queues").filter((v) => v !== "");
+  const selected = queueValues.length > 0 ? queueValues : undefined;
+
+  const fetcher = useFetcher<typeof queuesLoader>();
+
+  useDebounceEffect(
+    searchValue,
+    (s) => {
+      const searchParams = new URLSearchParams();
+      searchParams.set("per_page", "25");
+      if (searchValue) {
+        searchParams.set("query", s);
+      }
+      fetcher.load(
+        `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
+          environment.slug
+        }/queues?${searchParams.toString()}`
+      );
+    },
+    250
+  );
+
+  const filtered = useMemo(() => {
+    // Use a Map to deduplicate by value
+    const itemsMap = new Map<string, { name: string; type: "custom" | "task"; value: string }>();
+
+    // Add selected items first (for items not yet loaded from fetcher)
+    for (const queueName of selected ?? []) {
+      const queueItem = fetcher.data?.queues.find((q) => q.name === queueName);
+      if (!queueItem) {
+        if (queueName.startsWith("task/")) {
+          itemsMap.set(queueName, {
+            name: queueName.replace("task/", ""),
+            type: "task",
+            value: queueName,
+          });
+        } else {
+          itemsMap.set(queueName, {
+            name: queueName,
+            type: "custom",
+            value: queueName,
+          });
+        }
+      }
+    }
+
+    // Add items from fetcher data
+    if (fetcher.data !== undefined) {
+      for (const q of fetcher.data.queues) {
+        const value = q.type === "task" ? `task/${q.name}` : q.name;
+        itemsMap.set(value, {
+          name: q.name,
+          type: q.type,
+          value,
+        });
+      }
+    }
+
+    const items = Array.from(itemsMap.values());
+    return matchSorter(items, searchValue, {
+      keys: ["name"],
+    });
+  }, [searchValue, fetcher.data, selected]);
+
+  return (
+    <SelectProvider value={selected ?? []} setValue={handleChange} virtualFocus={true}>
+      {trigger}
+      <SelectPopover
+        className="min-w-0 max-w-[min(360px,var(--popover-available-width))]"
+        hideOnEscape={() => {
+          if (onClose) {
+            onClose();
+            return false;
+          }
+
+          return true;
+        }}
+      >
+        <ComboBox
+          value={searchValue}
+          render={(props) => (
+            <div className="flex items-center justify-stretch">
+              <input {...props} placeholder={"Filter by queues..."} />
+              {fetcher.state === "loading" && <Spinner color="muted" />}
+            </div>
+          )}
+        />
+        <SelectList>
+          {filtered.length > 0
+            ? filtered.map((queue) => (
+                <SelectItem
+                  key={queue.value}
+                  value={queue.value}
+                  icon={
+                    queue.type === "task" ? (
+                      <TaskIcon className="size-4 shrink-0 text-blue-500" />
+                    ) : (
+                      <RectangleStackIcon className="size-4 shrink-0 text-purple-500" />
+                    )
+                  }
+                >
+                  {queue.name}
+                </SelectItem>
+              ))
+            : null}
+          {filtered.length === 0 && fetcher.state !== "loading" && (
+            <SelectItem disabled>No queues found</SelectItem>
+          )}
+        </SelectList>
+      </SelectPopover>
+    </SelectProvider>
+  );
+}
diff --git a/apps/webapp/app/components/metrics/SaveToDashboardDialog.tsx b/apps/webapp/app/components/metrics/SaveToDashboardDialog.tsx
new file mode 100644
index 00000000000..828ff2b9113
--- /dev/null
+++ b/apps/webapp/app/components/metrics/SaveToDashboardDialog.tsx
@@ -0,0 +1,181 @@
+import { DialogClose } from "@radix-ui/react-dialog";
+import { useFetcher, useNavigate } from "@remix-run/react";
+import { IconCheck } from "@tabler/icons-react";
+import { useEffect, useState } from "react";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import {
+  useCustomDashboards,
+  useOrganization,
+  useWidgetLimitPerDashboard,
+} from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { cn } from "~/utils/cn";
+import { v3CustomDashboardPath } from "~/utils/pathBuilder";
+import { Button } from "../primitives/Buttons";
+import { Dialog, DialogContent, DialogHeader } from "../primitives/Dialog";
+import { FormButtons } from "../primitives/FormButtons";
+import { Paragraph } from "../primitives/Paragraph";
+import type { QueryWidgetConfig } from "./QueryWidget";
+
+export type SaveToDashboardDialogProps = {
+  title: string;
+  query: string;
+  config: QueryWidgetConfig;
+  isOpen: boolean;
+  onOpenChange: (open: boolean) => void;
+};
+
+export function SaveToDashboardDialog({
+  title,
+  query,
+  config,
+  isOpen,
+  onOpenChange,
+}: SaveToDashboardDialogProps) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+  const customDashboards = useCustomDashboards();
+  const widgetLimit = useWidgetLimitPerDashboard();
+  const fetcher = useFetcher<{ success: boolean }>();
+  const navigate = useNavigate();
+
+  // Find the first dashboard that isn't at the widget limit
+  const firstAvailableDashboard = customDashboards.find((d) => d.widgetCount < widgetLimit);
+
+  const [selectedDashboardId, setSelectedDashboardId] = useState<string | null>(
+    firstAvailableDashboard?.friendlyId ?? customDashboards[0]?.friendlyId ?? null
+  );
+
+  // Build the form action URL
+  const formAction = selectedDashboardId
+    ? `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/dashboards/${selectedDashboardId}/widgets`
+    : "";
+
+  const isLoading = fetcher.state === "submitting";
+
+  // Check if selected dashboard is at widget limit
+  const selectedDashboard = customDashboards.find((d) => d.friendlyId === selectedDashboardId);
+  const isSelectedAtLimit = selectedDashboard
+    ? selectedDashboard.widgetCount >= widgetLimit
+    : false;
+
+  // Navigate to the dashboard when the fetcher completes successfully
+  useEffect(() => {
+    if (fetcher.state === "idle" && fetcher.data?.success && selectedDashboardId) {
+      onOpenChange(false);
+      navigate(
+        v3CustomDashboardPath(
+          { slug: organization.slug },
+          { slug: project.slug },
+          { slug: environment.slug },
+          { friendlyId: selectedDashboardId }
+        )
+      );
+    }
+  }, [fetcher.state, fetcher.data, selectedDashboardId, onOpenChange, navigate, organization.slug, project.slug, environment.slug]);
+
+  // Update selection if dashboards change
+  useEffect(() => {
+    if (customDashboards.length > 0 && !selectedDashboardId) {
+      const available = customDashboards.find((d) => d.widgetCount < widgetLimit);
+      setSelectedDashboardId(available?.friendlyId ?? customDashboards[0].friendlyId);
+    }
+  }, [customDashboards, selectedDashboardId, widgetLimit]);
+
+  if (customDashboards.length === 0) {
+    return (
+      <Dialog open={isOpen} onOpenChange={onOpenChange}>
+        <DialogContent className="sm:max-w-sm">
+          <DialogHeader>Add to dashboard</DialogHeader>
+          <div className="!mt-1 space-y-4">
+            <Paragraph variant="small" className="text-text-dimmed">
+              You don't have any custom dashboards yet. Create one first from the sidebar menu.
+            </Paragraph>
+            <FormButtons
+              className="justify-end"
+              cancelButton={
+                <DialogClose asChild>
+                  <Button variant="secondary/medium">Close</Button>
+                </DialogClose>
+              }
+            />
+          </div>
+        </DialogContent>
+      </Dialog>
+    );
+  }
+
+  return (
+    <Dialog open={isOpen} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-sm">
+        <DialogHeader>Add to dashboard</DialogHeader>
+        <fetcher.Form method="post" action={formAction} className="space-y-4">
+          <input type="hidden" name="action" value="add" />
+          <input type="hidden" name="title" value={title} />
+          <input type="hidden" name="query" value={query} />
+          <input type="hidden" name="config" value={JSON.stringify(config)} />
+
+          <div className="!mt-1 space-y-2">
+            <Paragraph variant="small" className="text-text-dimmed">
+              Select a dashboard to add this chart to:
+            </Paragraph>
+            <div className="max-h-64 space-y-1 overflow-y-auto">
+              {customDashboards.map((dashboard) => {
+                const isAtLimit = dashboard.widgetCount >= widgetLimit;
+                return (
+                  <button
+                    key={dashboard.friendlyId}
+                    type="button"
+                    onClick={() => !isAtLimit && setSelectedDashboardId(dashboard.friendlyId)}
+                    disabled={isAtLimit}
+                    className={cn(
+                      "flex w-full items-center gap-2 rounded-md px-3 py-2 text-left text-sm transition",
+                      isAtLimit
+                        ? "cursor-not-allowed opacity-50"
+                        : selectedDashboardId === dashboard.friendlyId
+                        ? "bg-charcoal-700 text-text-bright"
+                        : "text-text-dimmed hover:bg-charcoal-750 hover:text-text-bright"
+                    )}
+                  >
+                    {selectedDashboardId === dashboard.friendlyId ? (
+                      <IconCheck className="size-4 shrink-0 text-green-500" />
+                    ) : (
+                      <span className="size-4 shrink-0" />
+                    )}
+                    <span className="flex-1 truncate">{dashboard.title}</span>
+                    <span
+                      className={cn(
+                        "shrink-0 text-xs",
+                        isAtLimit ? "text-error" : "text-text-dimmed"
+                      )}
+                    >
+                      {dashboard.widgetCount}/{widgetLimit}
+                    </span>
+                  </button>
+                );
+              })}
+            </div>
+          </div>
+
+          <FormButtons
+            confirmButton={
+              <Button
+                type="submit"
+                variant="primary/medium"
+                disabled={isLoading || !selectedDashboardId || isSelectedAtLimit}
+              >
+                {isLoading ? "Saving..." : "Save"}
+              </Button>
+            }
+            cancelButton={
+              <DialogClose asChild>
+                <Button variant="secondary/medium">Cancel</Button>
+              </DialogClose>
+            }
+          />
+        </fetcher.Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/webapp/app/components/metrics/ScopeFilter.tsx b/apps/webapp/app/components/metrics/ScopeFilter.tsx
new file mode 100644
index 00000000000..1bf6b685676
--- /dev/null
+++ b/apps/webapp/app/components/metrics/ScopeFilter.tsx
@@ -0,0 +1,64 @@
+import * as Ariakit from "@ariakit/react";
+import { EnvironmentLabel } from "~/components/environments/EnvironmentLabel";
+import { AppliedFilter } from "~/components/primitives/AppliedFilter";
+import { SelectItem, SelectPopover, SelectProvider } from "~/components/primitives/Select";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { useSearchParams } from "~/hooks/useSearchParam";
+import type { QueryScope } from "~/services/queryService.server";
+import { CubeTransparentIcon, GlobeAltIcon } from "@heroicons/react/20/solid";
+import { IconListLetters } from "@tabler/icons-react";
+
+const scopeOptions = [
+  { value: "environment", label: "Environment" },
+  { value: "project", label: "Project" },
+  { value: "organization", label: "Organization" },
+] as const;
+
+export function ScopeFilter() {
+  const { value, replace } = useSearchParams();
+  const scope = (value("scope") as QueryScope) ?? "environment";
+
+  const handleChange = (newScope: string) => {
+    replace({ scope: newScope === "environment" ? undefined : newScope });
+  };
+
+  return (
+    <SelectProvider value={scope} setValue={handleChange}>
+      <Ariakit.Select render={<div className="group cursor-pointer focus-custom" />}>
+        <AppliedFilter
+          label="Scope"
+          icon={<CubeTransparentIcon className="size-4" />}
+          value={<ScopeItem scope={scope} />}
+          removable={false}
+          variant="secondary/small"
+        />
+      </Ariakit.Select>
+      <SelectPopover className="min-w-0 max-w-[min(240px,var(--popover-available-width))]">
+        {scopeOptions.map((option) => (
+          <SelectItem key={option.value} value={option.value}>
+            <ScopeItem scope={option.value} />
+          </SelectItem>
+        ))}
+      </SelectPopover>
+    </SelectProvider>
+  );
+}
+
+function ScopeItem({ scope }: { scope: QueryScope }) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  switch (scope) {
+    case "organization":
+      return `Org: ${organization.title}`;
+    case "project":
+      return `Project: ${project.name}`;
+    case "environment":
+      return <EnvironmentLabel environment={environment} />;
+    default:
+      return scope;
+  }
+}
diff --git a/apps/webapp/app/components/metrics/TitleWidget.tsx b/apps/webapp/app/components/metrics/TitleWidget.tsx
new file mode 100644
index 00000000000..0a5a7590e4d
--- /dev/null
+++ b/apps/webapp/app/components/metrics/TitleWidget.tsx
@@ -0,0 +1,125 @@
+import { useState } from "react";
+import { PencilIcon, TrashIcon } from "@heroicons/react/20/solid";
+import { cn } from "~/utils/cn";
+import { Button } from "../primitives/Buttons";
+import {
+  Popover,
+  PopoverContent,
+  PopoverMenuItem,
+  PopoverVerticalEllipseTrigger,
+} from "../primitives/Popover";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "../primitives/Dialog";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { Input } from "../primitives/Input";
+import { InputGroup } from "../primitives/InputGroup";
+import { Label } from "../primitives/Label";
+
+export type TitleWidgetProps = {
+  title: string;
+  isDraggable?: boolean;
+  isResizing?: boolean;
+  /** Callback when rename is clicked. Receives the new title. */
+  onRename?: (newTitle: string) => void;
+  /** Callback when delete is clicked. */
+  onDelete?: () => void;
+};
+
+export function TitleWidget({
+  title,
+  isDraggable,
+  isResizing,
+  onRename,
+  onDelete,
+}: TitleWidgetProps) {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const [isRenameDialogOpen, setIsRenameDialogOpen] = useState(false);
+  const [renameValue, setRenameValue] = useState(title);
+
+  const hasMenu = onRename || onDelete;
+
+  return (
+    <div className="h-full">
+      <div
+        className={cn(
+          "group flex h-full items-center gap-2 rounded-lg border border-grid-bright bg-background-bright px-4",
+          isDraggable && "drag-handle cursor-grab active:cursor-grabbing"
+        )}
+      >
+        <span className="min-w-0 flex-1 truncate text-lg font-medium text-text-bright">
+          {title}
+        </span>
+        {hasMenu && (
+          <div className="flex-shrink-0 opacity-0 transition-opacity group-hover:opacity-100">
+            <Popover open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+              <PopoverVerticalEllipseTrigger isOpen={isMenuOpen} />
+              <PopoverContent align="end" className="p-0">
+                <div className="flex flex-col gap-1 p-1">
+                  {onRename && (
+                    <PopoverMenuItem
+                      icon={PencilIcon}
+                      title="Rename"
+                      onClick={() => {
+                        setRenameValue(title);
+                        setIsRenameDialogOpen(true);
+                        setIsMenuOpen(false);
+                      }}
+                    />
+                  )}
+                  {onDelete && (
+                    <PopoverMenuItem
+                      icon={TrashIcon}
+                      title="Delete"
+                      leadingIconClassName="text-error"
+                      className="text-error hover:!bg-error/10"
+                      onClick={() => {
+                        onDelete();
+                        setIsMenuOpen(false);
+                      }}
+                    />
+                  )}
+                </div>
+              </PopoverContent>
+            </Popover>
+          </div>
+        )}
+      </div>
+
+      {/* Rename Dialog */}
+      {onRename && (
+        <Dialog open={isRenameDialogOpen} onOpenChange={setIsRenameDialogOpen}>
+          <DialogContent className="sm:max-w-md">
+            <DialogHeader>Rename title</DialogHeader>
+            <form
+              className="space-y-4 pt-3"
+              onSubmit={(e) => {
+                e.preventDefault();
+                if (renameValue.trim()) {
+                  onRename(renameValue.trim());
+                  setIsRenameDialogOpen(false);
+                }
+              }}
+            >
+              <InputGroup>
+                <Label>Title</Label>
+                <Input
+                  value={renameValue}
+                  onChange={(e) => setRenameValue(e.target.value)}
+                  placeholder="Section title"
+                  autoFocus
+                />
+              </InputGroup>
+              <DialogFooter>
+                <DialogClose asChild>
+                  <Button variant="tertiary/medium">Cancel</Button>
+                </DialogClose>
+                <Button type="submit" variant="primary/medium" disabled={!renameValue.trim()}>
+                  Save
+                </Button>
+              </DialogFooter>
+            </form>
+          </DialogContent>
+        </Dialog>
+      )}
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/navigation/AccountSideMenu.tsx b/apps/webapp/app/components/navigation/AccountSideMenu.tsx
index 374b2f31618..5c74658f51d 100644
--- a/apps/webapp/app/components/navigation/AccountSideMenu.tsx
+++ b/apps/webapp/app/components/navigation/AccountSideMenu.tsx
@@ -1,6 +1,6 @@
 import { LockClosedIcon, ShieldCheckIcon, UserCircleIcon } from "@heroicons/react/20/solid";
 import { ArrowLeftIcon } from "@heroicons/react/24/solid";
-import { type User } from "@trigger.dev/database";
+import type { User } from "@trigger.dev/database";
 import { cn } from "~/utils/cn";
 import {
   accountPath,
@@ -8,10 +8,11 @@ import {
   personalAccessTokensPath,
   rootPath,
 } from "~/utils/pathBuilder";
+import { AskAI } from "../AskAI";
 import { LinkButton } from "../primitives/Buttons";
+import { HelpAndFeedback } from "./HelpAndFeedbackPopover";
 import { SideMenuHeader } from "./SideMenuHeader";
 import { SideMenuItem } from "./SideMenuItem";
-import { HelpAndFeedback } from "./HelpAndFeedbackPopover";
 
 export function AccountSideMenu({ user }: { user: User }) {
   return (
@@ -55,8 +56,9 @@ export function AccountSideMenu({ user }: { user: User }) {
           data-action="security"
         />
       </div>
-      <div className="flex flex-col gap-1 border-t border-grid-bright p-1">
+      <div className="flex w-full items-center justify-between border-t border-grid-bright p-1">
         <HelpAndFeedback />
+        <AskAI />
       </div>
     </div>
   );
diff --git a/apps/webapp/app/components/navigation/DashboardDialogs.tsx b/apps/webapp/app/components/navigation/DashboardDialogs.tsx
new file mode 100644
index 00000000000..a14681361b1
--- /dev/null
+++ b/apps/webapp/app/components/navigation/DashboardDialogs.tsx
@@ -0,0 +1,255 @@
+import { DialogClose } from "@radix-ui/react-dialog";
+import { Form, useNavigation } from "@remix-run/react";
+import { motion } from "framer-motion";
+import { ArrowUpCircleIcon } from "@heroicons/react/24/outline";
+import { PlusIcon } from "@heroicons/react/20/solid";
+import { useEffect, useState } from "react";
+import { type MatchedOrganization, useDashboardLimits } from "~/hooks/useOrganizations";
+import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route";
+import { Feedback } from "~/components/Feedback";
+import { Button, LinkButton } from "../primitives/Buttons";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTrigger,
+} from "../primitives/Dialog";
+import { FormButtons } from "../primitives/FormButtons";
+import { Input } from "../primitives/Input";
+import { InputGroup } from "../primitives/InputGroup";
+import { Label } from "../primitives/Label";
+import { Paragraph } from "../primitives/Paragraph";
+import { TextLink } from "../primitives/TextLink";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
+import { v3BillingPath } from "~/utils/pathBuilder";
+import { type SideMenuEnvironment, type SideMenuProject } from "./SideMenu";
+
+export function CreateDashboardButton({
+  organization,
+  project,
+  environment,
+  isCollapsed,
+}: {
+  organization: MatchedOrganization;
+  project: SideMenuProject;
+  environment: SideMenuEnvironment;
+  isCollapsed: boolean;
+}) {
+  const [isOpen, setIsOpen] = useState(false);
+  const navigation = useNavigation();
+  const limits = useDashboardLimits();
+  const plan = useCurrentPlan();
+
+  const isAtLimit = limits.used >= limits.limit;
+  const planLimits = (plan?.v3Subscription?.plan?.limits as any)?.metricDashboards;
+  const canExceed = typeof planLimits === "object" && planLimits.canExceed === true;
+  const canUpgrade = plan?.v3Subscription?.plan && !canExceed;
+
+  const formAction = `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/dashboards/create`;
+
+  // Close dialog when form submission starts (redirect is happening)
+  useEffect(() => {
+    if (navigation.formAction === formAction && navigation.state === "loading") {
+      setIsOpen(false);
+    }
+  }, [navigation.formAction, navigation.state, formAction]);
+
+  if (isCollapsed) return null;
+
+  return (
+    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+      <TooltipProvider disableHoverableContent>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <DialogTrigger asChild>
+              <button
+                type="button"
+                className="flex h-full w-full items-center justify-center rounded text-text-dimmed transition focus-custom hover:bg-charcoal-600 hover:text-text-bright"
+              >
+                <PlusIcon className="size-4" />
+              </button>
+            </DialogTrigger>
+          </TooltipTrigger>
+          <TooltipContent side="right" className="text-xs">
+            Create dashboard
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+      {isAtLimit ? (
+        <CreateDashboardUpgradeDialog
+          limits={limits}
+          canUpgrade={!!canUpgrade}
+          isFreePlan={plan?.v3Subscription?.isPaying === false}
+          organization={organization}
+        />
+      ) : (
+        <CreateDashboardDialog formAction={formAction} limits={limits} />
+      )}
+    </Dialog>
+  );
+}
+
+const PROGRESS_RING_R = 27.5;
+const PROGRESS_RING_CIRCUMFERENCE = 2 * Math.PI * PROGRESS_RING_R;
+const PROGRESS_COLOR_SUCCESS = "#28BF5C"; // mint-500 / success
+const PROGRESS_COLOR_ERROR = "#E11D48"; // rose-600 / error
+
+function CreateDashboardUpgradeDialog({
+  limits,
+  canUpgrade,
+  isFreePlan,
+  organization,
+}: {
+  limits: { used: number; limit: number };
+  canUpgrade: boolean;
+  isFreePlan: boolean;
+  organization: MatchedOrganization;
+}) {
+
+  if (isFreePlan) {
+    return (
+      <DialogContent>
+        <DialogHeader>Upgrade to unlock dashboards</DialogHeader>
+        <div className="flex items-center gap-4 pt-3">
+          <ArrowUpCircleIcon className="ml-1 size-14 shrink-0 text-indigo-500" />
+          <DialogDescription className="pt-0">
+            Custom metric dashboards are available on paid plans. Upgrade to create dashboards and
+            track your task metrics.
+          </DialogDescription>
+        </div>
+        <DialogFooter className="flex justify-between">
+          <DialogClose asChild>
+            <Button variant="secondary/medium">Cancel</Button>
+          </DialogClose>
+          <LinkButton variant="primary/medium" to={v3BillingPath(organization)}>
+            Upgrade plan
+          </LinkButton>
+        </DialogFooter>
+      </DialogContent>
+    );
+  }
+
+  const percentage = Math.min(limits.used / limits.limit, 1);
+  const filled = percentage * PROGRESS_RING_CIRCUMFERENCE;
+
+  return (
+    <DialogContent>
+      <DialogHeader>Dashboard limit reached</DialogHeader>
+      <div className="flex items-center gap-4 pt-3">
+        <div className="relative ml-1 mt-2 shrink-0" style={{ width: 60, height: 60 }}>
+          <svg className="h-full w-full -rotate-90 overflow-visible">
+            <circle
+              className="fill-none stroke-grid-bright"
+              strokeWidth="5"
+              r={PROGRESS_RING_R}
+              cx="30"
+              cy="30"
+            />
+            <motion.circle
+              className="fill-none"
+              strokeWidth="5"
+              r={PROGRESS_RING_R}
+              cx="30"
+              cy="30"
+              strokeLinecap="round"
+              initial={{
+                strokeDasharray: `0 ${PROGRESS_RING_CIRCUMFERENCE}`,
+                stroke: PROGRESS_COLOR_SUCCESS,
+              }}
+              animate={{
+                strokeDasharray: `${filled} ${PROGRESS_RING_CIRCUMFERENCE}`,
+                stroke: PROGRESS_COLOR_ERROR,
+              }}
+              transition={{ duration: 1.2, ease: "easeInOut" }}
+            />
+          </svg>
+          <span className="absolute inset-0 flex items-center justify-center text-lg text-text-dimmed">
+            {limits.limit}
+          </span>
+        </div>
+        <DialogDescription className="pt-0">
+          {canUpgrade ? (
+            <>
+              {limits.limit === 1
+                ? "Your plan includes 1 custom dashboard and it's already in use."
+                : `You've used all ${limits.limit} of your custom dashboards.`}{" "}
+              Upgrade your plan to create more.
+            </>
+          ) : (
+            <>
+              {limits.limit === 1
+                ? "Your plan includes 1 custom dashboard and it's already in use."
+                : `You've used all ${limits.limit} of your custom dashboards.`}{" "}
+              To create more, request a limit increase or visit the{" "}
+              <TextLink to={v3BillingPath(organization)}>billing page</TextLink> for pricing
+              details.
+            </>
+          )}
+        </DialogDescription>
+      </div>
+      <DialogFooter className="flex justify-between">
+        <DialogClose asChild>
+          <Button variant="secondary/medium">Cancel</Button>
+        </DialogClose>
+        {canUpgrade ? (
+          <LinkButton variant="primary/medium" to={v3BillingPath(organization)}>
+            Upgrade plan
+          </LinkButton>
+        ) : (
+          <Feedback
+            button={<Button variant="primary/medium">Request more…</Button>}
+            defaultValue="help"
+          />
+        )}
+      </DialogFooter>
+    </DialogContent>
+  );
+}
+
+function CreateDashboardDialog({
+  formAction,
+  limits,
+}: {
+  formAction: string;
+  limits: { used: number; limit: number };
+}) {
+  const navigation = useNavigation();
+  const [title, setTitle] = useState("");
+
+  const isLoading = navigation.formAction === formAction;
+
+  return (
+    <DialogContent className="sm:max-w-sm">
+      <DialogHeader>Create dashboard</DialogHeader>
+      <Form method="post" action={formAction} className="space-y-4 pt-3">
+        <InputGroup>
+          <Label>Title</Label>
+          <Input
+            name="title"
+            value={title}
+            onChange={(e) => setTitle(e.target.value)}
+            placeholder="My Dashboard"
+            required
+          />
+        </InputGroup>
+        <Paragraph variant="extra-small" className="text-text-dimmed">
+          {limits.used}/{limits.limit} dashboards used
+        </Paragraph>
+        <FormButtons
+          confirmButton={
+            <Button type="submit" variant="primary/medium" disabled={isLoading || !title.trim()}>
+              {isLoading ? "Creating..." : "Create"}
+            </Button>
+          }
+          cancelButton={
+            <DialogClose asChild>
+              <Button variant="secondary/medium">Cancel</Button>
+            </DialogClose>
+          }
+        />
+      </Form>
+    </DialogContent>
+  );
+}
diff --git a/apps/webapp/app/components/navigation/DashboardList.tsx b/apps/webapp/app/components/navigation/DashboardList.tsx
new file mode 100644
index 00000000000..132dc026896
--- /dev/null
+++ b/apps/webapp/app/components/navigation/DashboardList.tsx
@@ -0,0 +1,123 @@
+import { IconChartHistogram } from "@tabler/icons-react";
+import { GripVerticalIcon, LineChartIcon } from "lucide-react";
+import ReactGridLayout from "react-grid-layout";
+import { type MatchedOrganization, useCustomDashboards } from "~/hooks/useOrganizations";
+import { type UserWithDashboardPreferences } from "~/models/user.server";
+import { v3CustomDashboardPath } from "~/utils/pathBuilder";
+import { type SideMenuEnvironment, type SideMenuProject } from "./SideMenu";
+import { SideMenuItem } from "./SideMenuItem";
+import { TreeConnectorBranch, TreeConnectorEnd } from "./TreeConnectors";
+import { useReorderableList } from "./useReorderableList";
+
+type SideMenuUser = Pick<UserWithDashboardPreferences, "dashboardPreferences"> & {
+  isImpersonating: boolean;
+};
+
+export function DashboardList({
+  organization,
+  project,
+  environment,
+  isCollapsed,
+  user,
+}: {
+  organization: MatchedOrganization;
+  project: SideMenuProject;
+  environment: SideMenuEnvironment;
+  isCollapsed: boolean;
+  user: SideMenuUser;
+}) {
+  const customDashboards = useCustomDashboards();
+  const initialOrder =
+    user.dashboardPreferences.sideMenu?.organizations?.[organization.id]?.orderedItems?.[
+      "customDashboards"
+    ];
+
+  const {
+    orderedItems: orderedDashboards,
+    layout,
+    containerRef,
+    gridWidth,
+    canReorder,
+    handleDrag,
+    handleDragStop,
+    getIsLast,
+  } = useReorderableList({
+    organizationId: organization.id,
+    listId: "customDashboards",
+    items: customDashboards,
+    itemKey: (d) => d.friendlyId,
+    initialOrder,
+    isImpersonating: user.isImpersonating,
+  });
+
+  return (
+    <div ref={containerRef}>
+      {canReorder ? (
+        <ReactGridLayout
+          layout={layout}
+          width={gridWidth}
+          gridConfig={{
+            cols: 1,
+            rowHeight: 32,
+            margin: [0, 0] as const,
+            containerPadding: [0, 0] as const,
+          }}
+          resizeConfig={{ enabled: false }}
+          dragConfig={{ enabled: !isCollapsed, handle: ".sidebar-drag-handle" }}
+          onDrag={handleDrag}
+          onDragStop={handleDragStop}
+          className="sidebar-reorder-grid"
+          autoSize
+        >
+          {orderedDashboards.map((dashboard, index) => {
+            const isLast = getIsLast(dashboard.friendlyId, index);
+            return (
+              <div key={dashboard.friendlyId}>
+                <SideMenuItem
+                  name={dashboard.title}
+                  icon={
+                    isCollapsed
+                      ? IconChartHistogram
+                      : isLast
+                      ? TreeConnectorEnd
+                      : TreeConnectorBranch
+                  }
+                  activeIconColor={isCollapsed ? "text-customDashboards" : undefined}
+                  inactiveIconColor={isCollapsed ? "text-customDashboards" : undefined}
+                  to={v3CustomDashboardPath(organization, project, environment, dashboard)}
+                  isCollapsed={isCollapsed}
+                  action={
+                    <div className="sidebar-drag-handle flex h-full w-full cursor-grab items-center justify-center rounded text-text-dimmed opacity-0 transition group-hover/menuitem:opacity-100 hover:text-text-bright active:cursor-grabbing">
+                      <GripVerticalIcon className="size-3.5" />
+                    </div>
+                  }
+                />
+              </div>
+            );
+          })}
+        </ReactGridLayout>
+      ) : (
+        orderedDashboards.map((dashboard, index) => {
+          const isLast = index === orderedDashboards.length - 1;
+          return (
+            <SideMenuItem
+              key={dashboard.friendlyId}
+              name={dashboard.title}
+              icon={
+                isCollapsed
+                  ? LineChartIcon
+                  : isLast
+                  ? TreeConnectorEnd
+                  : TreeConnectorBranch
+              }
+              activeIconColor={isCollapsed ? "text-customDashboards" : "text-charcoal-700"}
+              inactiveIconColor={isCollapsed ? "text-customDashboards" : "text-charcoal-700"}
+              to={v3CustomDashboardPath(organization, project, environment, dashboard)}
+              isCollapsed={isCollapsed}
+            />
+          );
+        })
+      )}
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/navigation/EnvironmentSelector.tsx b/apps/webapp/app/components/navigation/EnvironmentSelector.tsx
index def3996f859..ba3cce82320 100644
--- a/apps/webapp/app/components/navigation/EnvironmentSelector.tsx
+++ b/apps/webapp/app/components/navigation/EnvironmentSelector.tsx
@@ -1,4 +1,5 @@
 import { ChevronRightIcon, Cog8ToothIcon } from "@heroicons/react/20/solid";
+import { DropdownIcon } from "~/assets/icons/DropdownIcon";
 import { useNavigation } from "@remix-run/react";
 import { useEffect, useRef, useState } from "react";
 import { BranchEnvironmentIconSmall } from "~/assets/icons/EnvironmentIcons";
@@ -9,19 +10,19 @@ import { useOrganization, type MatchedOrganization } from "~/hooks/useOrganizati
 import { useProject } from "~/hooks/useProject";
 import { cn } from "~/utils/cn";
 import { branchesPath, docsPath, v3BillingPath } from "~/utils/pathBuilder";
-import { EnvironmentCombo } from "../environments/EnvironmentLabel";
+import { EnvironmentCombo, EnvironmentIcon, EnvironmentLabel, environmentFullTitle } from "../environments/EnvironmentLabel";
 import { ButtonContent } from "../primitives/Buttons";
 import { Header2 } from "../primitives/Headers";
 import { Paragraph } from "../primitives/Paragraph";
 import {
   Popover,
-  PopoverArrowTrigger,
   PopoverContent,
   PopoverMenuItem,
   PopoverSectionHeader,
   PopoverTrigger,
 } from "../primitives/Popover";
 import { TextLink } from "../primitives/TextLink";
+import { SimpleTooltip } from "../primitives/Tooltip";
 import { V4Badge } from "../V4Badge";
 import { type SideMenuEnvironment, type SideMenuProject } from "./SideMenu";
 import { Badge } from "../primitives/Badge";
@@ -31,11 +32,13 @@ export function EnvironmentSelector({
   project,
   environment,
   className,
+  isCollapsed = false,
 }: {
   organization: MatchedOrganization;
   project: SideMenuProject;
   environment: SideMenuEnvironment;
   className?: string;
+  isCollapsed?: boolean;
 }) {
   const { isManagedCloud } = useFeatures();
   const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -50,16 +53,48 @@ export function EnvironmentSelector({
 
   return (
     <Popover onOpenChange={(open) => setIsMenuOpen(open)} open={isMenuOpen}>
-      <PopoverArrowTrigger
-        isOpen={isMenuOpen}
-        overflowHidden
-        fullWidth
-        className={cn("h-7 overflow-hidden py-1 pl-1.5", className)}
-      >
-        <EnvironmentCombo environment={environment} className="w-full text-2sm" />
-      </PopoverArrowTrigger>
+      <SimpleTooltip
+        button={
+          <PopoverTrigger
+            className={cn(
+              "group flex h-8 items-center rounded pl-[0.4375rem] transition-colors hover:bg-charcoal-750",
+              isCollapsed ? "justify-center pr-0.5" : "justify-between pr-1",
+              className
+            )}
+          >
+            <span className="flex min-w-0 flex-1 items-center gap-1.5 overflow-hidden">
+              <EnvironmentIcon environment={environment} className="size-5 shrink-0" />
+              <span
+                className={cn(
+                  "flex min-w-0 items-center overflow-hidden transition-all duration-200",
+                  isCollapsed ? "max-w-0 opacity-0" : "max-w-[200px] opacity-100"
+                )}
+              >
+                <EnvironmentLabel environment={environment} className="text-2sm" disableTooltip />
+              </span>
+            </span>
+            <span
+              className={cn(
+                "overflow-hidden transition-all duration-200",
+                isCollapsed ? "max-w-0 opacity-0" : "max-w-[16px] opacity-100"
+              )}
+            >
+              <DropdownIcon className="size-4 min-w-4 text-text-dimmed transition group-hover:text-text-bright" />
+            </span>
+          </PopoverTrigger>
+        }
+        content={environmentFullTitle(environment)}
+        side="right"
+        sideOffset={8}
+        hidden={!isCollapsed}
+        buttonClassName="!h-8"
+        asChild
+        disableHoverableContent
+      />
       <PopoverContent
         className="min-w-[14rem] overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        side={isCollapsed ? "right" : "bottom"}
+        sideOffset={isCollapsed ? 8 : 4}
         align="start"
         style={{ maxHeight: `calc(var(--radix-popover-content-available-height) - 10vh)` }}
       >
diff --git a/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx b/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
index 93f2843de50..1626ec9f910 100644
--- a/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
+++ b/apps/webapp/app/components/navigation/HelpAndFeedbackPopover.tsx
@@ -8,9 +8,12 @@ import {
   SignalIcon,
   StarIcon,
 } from "@heroicons/react/20/solid";
+import { cn } from "~/utils/cn";
 import { DiscordIcon, SlackIcon } from "@trigger.dev/companyicons";
 import { Fragment, useState } from "react";
+import { motion } from "framer-motion";
 import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route";
+import { useShortcutKeys } from "~/hooks/useShortcutKeys";
 import { Feedback } from "../Feedback";
 import { Shortcuts } from "../Shortcuts";
 import { StepContentContainer } from "../StepContentContainer";
@@ -19,30 +22,85 @@ import { ClipboardField } from "../primitives/ClipboardField";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "../primitives/Dialog";
 import { Icon } from "../primitives/Icon";
 import { Paragraph } from "../primitives/Paragraph";
-import { Popover, PopoverContent, PopoverSideMenuTrigger } from "../primitives/Popover";
+import { Popover, PopoverContent, PopoverTrigger } from "../primitives/Popover";
+import { SimpleTooltip } from "../primitives/Tooltip";
+import { ShortcutKey } from "../primitives/ShortcutKey";
 import { StepNumber } from "../primitives/StepNumber";
 import { SideMenuItem } from "./SideMenuItem";
 import { Badge } from "../primitives/Badge";
 
-export function HelpAndFeedback({ disableShortcut = false }: { disableShortcut?: boolean }) {
+export function HelpAndFeedback({
+  disableShortcut = false,
+  isCollapsed = false,
+}: {
+  disableShortcut?: boolean;
+  isCollapsed?: boolean;
+}) {
   const [isHelpMenuOpen, setHelpMenuOpen] = useState(false);
   const currentPlan = useCurrentPlan();
 
+  useShortcutKeys({
+    shortcut: disableShortcut ? undefined : { key: "h", enabledOnInputElements: false },
+    action: (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+      setHelpMenuOpen(true);
+    },
+  });
+
   return (
-    <Popover onOpenChange={(open) => setHelpMenuOpen(open)}>
-      <PopoverSideMenuTrigger
-        isOpen={isHelpMenuOpen}
-        shortcut={{ key: "h", enabledOnInputElements: false }}
-        className="grow pr-2"
-        disabled={disableShortcut}
-      >
-        <div className="flex items-center gap-1.5">
-          <QuestionMarkCircleIcon className="size-4 text-success" />
-          Help & Feedback
-        </div>
-      </PopoverSideMenuTrigger>
+    <motion.div
+      layout="position"
+      transition={{ duration: 0.2, ease: "easeInOut" }}
+      className={isCollapsed ? undefined : "flex-1"}
+    >
+      <Popover open={isHelpMenuOpen} onOpenChange={setHelpMenuOpen}>
+      <SimpleTooltip
+        button={
+          <PopoverTrigger
+            className={cn(
+              "group flex h-8 items-center gap-1.5 rounded pl-[0.4375rem] pr-2 transition-colors hover:bg-charcoal-750 focus-custom",
+              isCollapsed ? "w-full" : "w-full justify-between"
+            )}
+          >
+            <span className="flex items-center gap-1.5 overflow-hidden">
+              <QuestionMarkCircleIcon className="size-5 min-w-5 shrink-0 text-success" />
+              <span
+                className={cn(
+                  "overflow-hidden whitespace-nowrap text-2sm text-text-bright transition-all duration-150",
+                  isCollapsed ? "max-w-0 opacity-0" : "max-w-[150px] opacity-100"
+                )}
+              >
+                Help & Feedback
+              </span>
+            </span>
+            <ShortcutKey
+              className={cn(
+                "size-4 flex-none transition-all duration-150",
+                isCollapsed ? "hidden" : ""
+              )}
+              shortcut={{ key: "h" }}
+              variant="medium/bright"
+            />
+          </PopoverTrigger>
+        }
+        content={
+          <span className="flex items-center gap-1">
+            Help & Feedback
+            <ShortcutKey shortcut={{ key: "h" }} variant="medium/bright" />
+          </span>
+        }
+        side="right"
+        sideOffset={8}
+        hidden={!isCollapsed}
+        buttonClassName="!h-8 w-full"
+        asChild
+        disableHoverableContent
+      />
       <PopoverContent
         className="min-w-[14rem] divide-y divide-grid-bright overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        side={isCollapsed ? "right" : "top"}
+        sideOffset={isCollapsed ? 8 : 4}
         align="start"
       >
         <Fragment>
@@ -176,8 +234,9 @@ export function HelpAndFeedback({ disableShortcut = false }: { disableShortcut?:
               button={
                 <Button
                   variant="small-menu-item"
+                  className="pl-2"
                   LeadingIcon={EnvelopeIcon}
-                  leadingIconClassName="text-blue-500"
+                  leadingIconClassName="text-blue-500 pr-1"
                   data-action="contact-us"
                   fullWidth
                   textAlignLeft
@@ -189,6 +248,7 @@ export function HelpAndFeedback({ disableShortcut = false }: { disableShortcut?:
           </div>
         </Fragment>
       </PopoverContent>
-    </Popover>
+      </Popover>
+    </motion.div>
   );
 }
diff --git a/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx b/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
index ad6543756a0..9069620c92b 100644
--- a/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
+++ b/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
@@ -1,7 +1,9 @@
 import {
+  BellAlertIcon,
   ChartBarIcon,
   Cog8ToothIcon,
   CreditCardIcon,
+  PuzzlePieceIcon,
   UserGroupIcon,
 } from "@heroicons/react/20/solid";
 import { ArrowLeftIcon } from "@heroicons/react/24/solid";
@@ -11,7 +13,9 @@ import { cn } from "~/utils/cn";
 import {
   organizationSettingsPath,
   organizationTeamPath,
+  organizationVercelIntegrationPath,
   rootPath,
+  v3BillingAlertsPath,
   v3BillingPath,
   v3UsagePath,
 } from "~/utils/pathBuilder";
@@ -23,6 +27,7 @@ import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route";
 import { Paragraph } from "../primitives/Paragraph";
 import { Badge } from "../primitives/Badge";
 import { useHasAdminAccess } from "~/hooks/useUser";
+import { AskAI } from "../AskAI";
 
 export type BuildInfo = {
   appVersion: string | undefined;
@@ -67,27 +72,34 @@ export function OrganizationSettingsSideMenu({
             <SideMenuHeader title="Organization" />
           </div>
           {isManagedCloud && (
-            <SideMenuItem
-              name="Usage"
-              icon={ChartBarIcon}
-              activeIconColor="text-indigo-500"
-              to={v3UsagePath(organization)}
-              data-action="usage"
-            />
-          )}
-          {isManagedCloud && (
-            <SideMenuItem
-              name="Billing"
-              icon={CreditCardIcon}
-              activeIconColor="text-emerald-500"
-              to={v3BillingPath(organization)}
-              data-action="billing"
-              badge={
-                currentPlan?.v3Subscription?.isPaying ? (
-                  <Badge variant="extra-small">{currentPlan?.v3Subscription?.plan?.title}</Badge>
-                ) : undefined
-              }
-            />
+            <>
+              <SideMenuItem
+                name="Usage"
+                icon={ChartBarIcon}
+                activeIconColor="text-indigo-500"
+                to={v3UsagePath(organization)}
+                data-action="usage"
+              />
+              <SideMenuItem
+                name="Billing"
+                icon={CreditCardIcon}
+                activeIconColor="text-emerald-500"
+                to={v3BillingPath(organization)}
+                data-action="billing"
+                badge={
+                  currentPlan?.v3Subscription?.isPaying ? (
+                    <Badge variant="extra-small">{currentPlan?.v3Subscription?.plan?.title}</Badge>
+                  ) : undefined
+                }
+              />
+              <SideMenuItem
+                name="Billing alerts"
+                icon={BellAlertIcon}
+                activeIconColor="text-rose-500"
+                to={v3BillingAlertsPath(organization)}
+                data-action="billing-alerts"
+              />
+            </>
           )}
           <SideMenuItem
             name="Team"
@@ -103,6 +115,13 @@ export function OrganizationSettingsSideMenu({
             to={organizationSettingsPath(organization)}
             data-action="settings"
           />
+          <SideMenuItem
+            name="Integrations"
+            icon={PuzzlePieceIcon}
+            activeIconColor="text-blue-500"
+            to={organizationVercelIntegrationPath(organization)}
+            data-action="integrations"
+          />
         </div>
         <div className="flex flex-col gap-1">
           <SideMenuHeader title="App version" />
@@ -122,7 +141,14 @@ export function OrganizationSettingsSideMenu({
           <div className="flex flex-col gap-1">
             <SideMenuHeader title="Git ref" />
             <Paragraph variant="extra-small" className="px-2 text-text-dimmed">
-              {buildInfo.gitRefName}
+              <a
+                href={`https://github.com/triggerdotdev/trigger.dev/tree/${buildInfo.gitRefName}`}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="transition hover:text-text-bright"
+              >
+                {buildInfo.gitRefName}
+              </a>
             </Paragraph>
           </div>
         )}
@@ -130,13 +156,21 @@ export function OrganizationSettingsSideMenu({
           <div className="flex flex-col gap-1">
             <SideMenuHeader title="Git sha" />
             <Paragraph variant="extra-small" className="px-2 text-text-dimmed">
-              {buildInfo.gitSha.slice(0, 9)}
+              <a
+                href={`https://github.com/triggerdotdev/trigger.dev/commit/${buildInfo.gitSha}`}
+                target="_blank"
+                rel="noopener noreferrer"
+                className="transition hover:text-text-bright"
+              >
+                {buildInfo.gitSha.slice(0, 9)}
+              </a>
             </Paragraph>
           </div>
         )}
       </div>
-      <div className="flex flex-col gap-1 border-t border-grid-bright p-1">
+      <div className="flex w-full items-center justify-between border-t border-grid-bright p-1">
         <HelpAndFeedback />
+        <AskAI />
       </div>
     </div>
   );
diff --git a/apps/webapp/app/components/navigation/SideMenu.tsx b/apps/webapp/app/components/navigation/SideMenu.tsx
index de7c045ad14..db86425b67b 100644
--- a/apps/webapp/app/components/navigation/SideMenu.tsx
+++ b/apps/webapp/app/components/navigation/SideMenu.tsx
@@ -1,6 +1,8 @@
 import {
+  AdjustmentsHorizontalIcon,
   ArrowPathRoundedSquareIcon,
   ArrowRightOnRectangleIcon,
+  ArrowTopRightOnSquareIcon,
   BeakerIcon,
   BellAlertIcon,
   ChartBarIcon,
@@ -8,51 +10,68 @@ import {
   ClockIcon,
   Cog8ToothIcon,
   CogIcon,
+  ExclamationTriangleIcon,
   FolderIcon,
   FolderOpenIcon,
+  GlobeAmericasIcon,
   IdentificationIcon,
   KeyIcon,
+  PencilSquareIcon,
   PlusIcon,
   RectangleStackIcon,
   ServerStackIcon,
   Squares2X2Icon,
+  TableCellsIcon,
   UsersIcon,
 } from "@heroicons/react/20/solid";
-import { useNavigation } from "@remix-run/react";
-import { useEffect, useRef, useState, type ReactNode } from "react";
+import { Link, useFetcher, useNavigation } from "@remix-run/react";
+import { LayoutGroup, motion } from "framer-motion";
+import { type ReactNode, useCallback, useEffect, useRef, useState } from "react";
 import simplur from "simplur";
+import { ConcurrencyIcon } from "~/assets/icons/ConcurrencyIcon";
+import { DropdownIcon } from "~/assets/icons/DropdownIcon";
 import { BranchEnvironmentIconSmall } from "~/assets/icons/EnvironmentIcons";
+import { ListCheckedIcon } from "~/assets/icons/ListCheckedIcon";
+import { LogsIcon } from "~/assets/icons/LogsIcon";
 import { RunsIconExtraSmall } from "~/assets/icons/RunsIcon";
 import { TaskIconSmall } from "~/assets/icons/TaskIcon";
 import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
 import { Avatar } from "~/components/primitives/Avatar";
 import { type MatchedEnvironment } from "~/hooks/useEnvironment";
+import { useFeatureFlags } from "~/hooks/useFeatureFlags";
 import { useFeatures } from "~/hooks/useFeatures";
 import { type MatchedOrganization } from "~/hooks/useOrganizations";
 import { type MatchedProject } from "~/hooks/useProject";
+import { useShortcutKeys } from "~/hooks/useShortcutKeys";
 import { useHasAdminAccess } from "~/hooks/useUser";
-import { type User } from "~/models/user.server";
+import { type UserWithDashboardPreferences } from "~/models/user.server";
 import { useCurrentPlan } from "~/routes/_app.orgs.$organizationSlug/route";
 import { type FeedbackType } from "~/routes/resources.feedback";
-import { IncidentStatusPanel } from "~/routes/resources.incidents";
+import { IncidentStatusPanel, useIncidentStatus } from "~/routes/resources.incidents";
 import { cn } from "~/utils/cn";
 import {
   accountPath,
   adminPath,
   branchesPath,
+  concurrencyPath,
+  limitsPath,
   logoutPath,
   newOrganizationPath,
   newProjectPath,
   organizationPath,
   organizationSettingsPath,
   organizationTeamPath,
+  queryPath,
+  regionsPath,
   v3ApiKeysPath,
   v3BatchesPath,
   v3BillingPath,
+  v3BuiltInDashboardPath,
   v3BulkActionsPath,
   v3DeploymentsPath,
   v3EnvironmentPath,
   v3EnvironmentVariablesPath,
+  v3LogsPath,
   v3ProjectAlertsPath,
   v3ProjectPath,
   v3ProjectSettingsPath,
@@ -63,6 +82,7 @@ import {
   v3UsagePath,
   v3WaitpointTokensPath,
 } from "~/utils/pathBuilder";
+import { AlphaBadge } from "../AlphaBadge";
 import { AskAI } from "../AskAI";
 import { FreePlanUsage } from "../billing/FreePlanUsage";
 import { ConnectionIcon, DevPresencePanel, useDevPresence } from "../DevPresence";
@@ -70,27 +90,41 @@ import { ImpersonationBanner } from "../ImpersonationBanner";
 import { Button, ButtonContent, LinkButton } from "../primitives/Buttons";
 import { Dialog, DialogTrigger } from "../primitives/Dialog";
 import { Paragraph } from "../primitives/Paragraph";
-import {
-  Popover,
-  PopoverArrowTrigger,
-  PopoverContent,
-  PopoverMenuItem,
-  PopoverTrigger,
-} from "../primitives/Popover";
+import { Popover, PopoverContent, PopoverMenuItem, PopoverTrigger } from "../primitives/Popover";
+import { ShortcutKey } from "../primitives/ShortcutKey";
 import { TextLink } from "../primitives/TextLink";
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../primitives/Tooltip";
+import {
+  SimpleTooltip,
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "../primitives/Tooltip";
 import { ShortcutsAutoOpen } from "../Shortcuts";
 import { UserProfilePhoto } from "../UserProfilePhoto";
-import { V4Badge } from "../V4Badge";
+import { CreateDashboardButton } from "./DashboardDialogs";
+import { DashboardList } from "./DashboardList";
 import { EnvironmentSelector } from "./EnvironmentSelector";
 import { HelpAndFeedback } from "./HelpAndFeedbackPopover";
 import { SideMenuHeader } from "./SideMenuHeader";
 import { SideMenuItem } from "./SideMenuItem";
 import { SideMenuSection } from "./SideMenuSection";
-import { ListChecks } from "lucide-react";
-import { ListCheckedIcon } from "~/assets/icons/ListCheckedIcon";
+import { type SideMenuSectionId } from "./sideMenuTypes";
+
+/** Get the collapsed state for a specific side menu section from user preferences */
+function getSectionCollapsed(
+  sideMenu: { collapsedSections?: Record<string, boolean> } | undefined,
+  sectionId: SideMenuSectionId
+): boolean {
+  return sideMenu?.collapsedSections?.[sectionId] ?? false;
+}
 
-type SideMenuUser = Pick<User, "email" | "admin"> & { isImpersonating: boolean };
+type SideMenuUser = Pick<
+  UserWithDashboardPreferences,
+  "email" | "admin" | "dashboardPreferences"
+> & {
+  isImpersonating: boolean;
+};
 export type SideMenuProject = Pick<
   MatchedProject,
   "id" | "name" | "slug" | "version" | "environments" | "engine"
@@ -116,10 +150,113 @@ export function SideMenu({
 }: SideMenuProps) {
   const borderRef = useRef<HTMLDivElement>(null);
   const [showHeaderDivider, setShowHeaderDivider] = useState(false);
+  const [isCollapsed, setIsCollapsed] = useState(
+    user.dashboardPreferences.sideMenu?.isCollapsed ?? false
+  );
+  const preferencesFetcher = useFetcher();
+  const pendingPreferencesRef = useRef<{
+    isCollapsed?: boolean;
+    sectionId?: SideMenuSectionId;
+    sectionCollapsed?: boolean;
+  }>({});
+  const debounceTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const currentPlan = useCurrentPlan();
   const { isConnected } = useDevPresence();
   const isFreeUser = currentPlan?.v3Subscription?.isPaying === false;
   const isAdmin = useHasAdminAccess();
+  const { isManagedCloud } = useFeatures();
+  const featureFlags = useFeatureFlags();
+  const incidentStatus = useIncidentStatus();
+  const isV3Project = project.engine === "V1";
+
+  const persistSideMenuPreferences = useCallback(
+    (data: {
+      isCollapsed?: boolean;
+      sectionId?: SideMenuSectionId;
+      sectionCollapsed?: boolean;
+    }) => {
+      if (user.isImpersonating) return;
+
+      // Merge with any pending changes
+      pendingPreferencesRef.current = {
+        ...pendingPreferencesRef.current,
+        ...data,
+      };
+
+      // Clear existing timeout
+      if (debounceTimeoutRef.current) {
+        clearTimeout(debounceTimeoutRef.current);
+      }
+
+      // Debounce the actual submission by 500ms
+      debounceTimeoutRef.current = setTimeout(() => {
+        const pending = pendingPreferencesRef.current;
+        const formData = new FormData();
+        if (pending.isCollapsed !== undefined) {
+          formData.append("isCollapsed", String(pending.isCollapsed));
+        }
+        if (pending.sectionId !== undefined && pending.sectionCollapsed !== undefined) {
+          formData.append("sectionId", pending.sectionId);
+          formData.append("sectionCollapsed", String(pending.sectionCollapsed));
+        }
+        preferencesFetcher.submit(formData, {
+          method: "POST",
+          action: "/resources/preferences/sidemenu",
+        });
+        pendingPreferencesRef.current = {};
+      }, 500);
+    },
+    [user.isImpersonating, preferencesFetcher]
+  );
+
+  // Flush pending preferences on unmount to avoid losing the last toggle
+  useEffect(() => {
+    return () => {
+      if (debounceTimeoutRef.current) {
+        clearTimeout(debounceTimeoutRef.current);
+      }
+      if (user.isImpersonating) return;
+      const pending = pendingPreferencesRef.current;
+      const hasPendingChanges =
+        pending.isCollapsed !== undefined ||
+        (pending.sectionId !== undefined && pending.sectionCollapsed !== undefined);
+
+      if (hasPendingChanges) {
+        const formData = new FormData();
+        if (pending.isCollapsed !== undefined) {
+          formData.append("isCollapsed", String(pending.isCollapsed));
+        }
+        if (pending.sectionId !== undefined && pending.sectionCollapsed !== undefined) {
+          formData.append("sectionId", pending.sectionId);
+          formData.append("sectionCollapsed", String(pending.sectionCollapsed));
+        }
+        preferencesFetcher.submit(formData, {
+          method: "POST",
+          action: "/resources/preferences/sidemenu",
+        });
+        pendingPreferencesRef.current = {};
+      }
+    };
+  }, [preferencesFetcher, user.isImpersonating]);
+
+  const handleToggleCollapsed = () => {
+    const newIsCollapsed = !isCollapsed;
+    setIsCollapsed(newIsCollapsed);
+    persistSideMenuPreferences({ isCollapsed: newIsCollapsed });
+  };
+
+  /** Generic handler for any collapsible section - just pass the section ID */
+  const handleSectionToggle = useCallback(
+    (sectionId: SideMenuSectionId) => (collapsed: boolean) => {
+      persistSideMenuPreferences({ sectionId, sectionCollapsed: collapsed });
+    },
+    [persistSideMenuPreferences]
+  );
+
+  useShortcutKeys({
+    shortcut: { modifiers: ["mod"], key: "b", enabledOnInputElements: true },
+    action: handleToggleCollapsed,
+  });
 
   useEffect(() => {
     const handleScroll = () => {
@@ -138,201 +275,453 @@ export function SideMenu({
   return (
     <div
       className={cn(
-        "grid h-full grid-rows-[2.5rem_1fr_auto] overflow-hidden border-r border-grid-bright bg-background-bright transition"
+        "relative h-full border-r border-grid-bright bg-background-bright transition-all duration-200",
+        isCollapsed ? "w-[2.75rem]" : "w-56"
       )}
     >
-      <div
-        className={cn(
-          "flex items-center justify-between overflow-hidden border-b px-1 py-1 transition duration-300",
-          showHeaderDivider ? "border-grid-bright" : "border-transparent"
-        )}
-      >
-        <ProjectSelector
-          organizations={organizations}
-          organization={organization}
-          project={project}
-          user={user}
-        />
-        {isAdmin && !user.isImpersonating ? (
-          <TooltipProvider disableHoverableContent={true}>
-            <Tooltip>
-              <TooltipTrigger>
-                <LinkButton variant="minimal/medium" to={adminPath()} TrailingIcon={UsersIcon} />
-              </TooltipTrigger>
-              <TooltipContent side="bottom" className={"text-xs"}>
-                Admin dashboard
-              </TooltipContent>
-            </Tooltip>
-          </TooltipProvider>
-        ) : isAdmin && user.isImpersonating ? (
-          <ImpersonationBanner />
-        ) : null}
-      </div>
-      <div
-        className="overflow-hidden overflow-y-auto pt-2 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
-        ref={borderRef}
-      >
-        <div className="mb-6 flex flex-col gap-4 px-1">
-          <div className="space-y-1">
-            <SideMenuHeader title={"Environment"} />
-            <div className="flex items-center">
-              <EnvironmentSelector
-                organization={organization}
-                project={project}
-                environment={environment}
+      <CollapseToggle isCollapsed={isCollapsed} onToggle={handleToggleCollapsed} />
+      <div className="absolute inset-0 grid grid-cols-[100%] grid-rows-[2.5rem_1fr_auto] overflow-hidden">
+        <div
+          className={cn(
+            "flex min-w-0 items-center overflow-hidden border-b px-1 py-1 transition duration-300",
+            showHeaderDivider || isCollapsed ? "border-grid-bright" : "border-transparent"
+          )}
+        >
+          <div className={cn("min-w-0", !isCollapsed && "flex-1")}>
+            <ProjectSelector
+              organizations={organizations}
+              organization={organization}
+              project={project}
+              user={user}
+              isCollapsed={isCollapsed}
+            />
+          </div>
+          {isAdmin && !user.isImpersonating ? (
+            <CollapsibleElement isCollapsed={isCollapsed}>
+              <TooltipProvider disableHoverableContent={true}>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <LinkButton
+                      variant="minimal/medium"
+                      to={adminPath()}
+                      TrailingIcon={UsersIcon}
+                    />
+                  </TooltipTrigger>
+                  <TooltipContent side="bottom" className={"text-xs"}>
+                    Admin dashboard
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </CollapsibleElement>
+          ) : isAdmin && user.isImpersonating ? (
+            <CollapsibleElement isCollapsed={isCollapsed}>
+              <ImpersonationBanner />
+            </CollapsibleElement>
+          ) : null}
+        </div>
+        <div
+          className={cn(
+            "min-h-0 overflow-y-auto pt-2",
+            isCollapsed
+              ? "scrollbar-none"
+              : "scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+          )}
+          ref={borderRef}
+        >
+          <div className="mb-6 flex w-full flex-col gap-4 overflow-hidden px-1">
+            <div className="w-full space-y-1">
+              <SideMenuHeader
+                title={"Environment"}
+                isCollapsed={isCollapsed}
+                collapsedTitle="Env"
               />
-              {environment.type === "DEVELOPMENT" && project.engine === "V2" && (
-                <Dialog>
-                  <TooltipProvider disableHoverableContent={true}>
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <div className="inline-flex">
-                          <DialogTrigger asChild>
-                            <Button
-                              variant="minimal/small"
-                              className="aspect-square h-7 p-1"
-                              LeadingIcon={<ConnectionIcon isConnected={isConnected} />}
-                            />
-                          </DialogTrigger>
-                        </div>
-                      </TooltipTrigger>
-                      <TooltipContent side="right" className={"text-xs"}>
-                        {isConnected === undefined
-                          ? "Checking connection..."
-                          : isConnected
-                          ? "Your dev server is connected"
-                          : "Your dev server is not connected"}
-                      </TooltipContent>
-                    </Tooltip>
-                  </TooltipProvider>
-                  <DevPresencePanel isConnected={isConnected} />
-                </Dialog>
-              )}
+              <div className="flex items-center">
+                <EnvironmentSelector
+                  organization={organization}
+                  project={project}
+                  environment={environment}
+                  className="w-full"
+                  isCollapsed={isCollapsed}
+                />
+                {environment.type === "DEVELOPMENT" && project.engine === "V2" && (
+                  <CollapsibleElement isCollapsed={isCollapsed}>
+                    <Dialog>
+                      <TooltipProvider disableHoverableContent={true}>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <div className="inline-flex">
+                              <DialogTrigger asChild>
+                                <Button
+                                  variant="minimal/small"
+                                  className="aspect-square h-7 p-1"
+                                  LeadingIcon={<ConnectionIcon isConnected={isConnected} />}
+                                />
+                              </DialogTrigger>
+                            </div>
+                          </TooltipTrigger>
+                          <TooltipContent side="right" className={"text-xs"}>
+                            {isConnected === undefined
+                              ? "Checking connection..."
+                              : isConnected
+                              ? "Your dev server is connected"
+                              : "Your dev server is not connected"}
+                          </TooltipContent>
+                        </Tooltip>
+                      </TooltipProvider>
+                      <DevPresencePanel isConnected={isConnected} />
+                    </Dialog>
+                  </CollapsibleElement>
+                )}
+              </div>
             </div>
-          </div>
 
-          <div>
-            <SideMenuItem
-              name="Tasks"
-              icon={TaskIconSmall}
-              activeIconColor="text-tasks"
-              to={v3EnvironmentPath(organization, project, environment)}
-              data-action="tasks"
-            />
-            <SideMenuItem
-              name="Runs"
-              icon={RunsIconExtraSmall}
-              activeIconColor="text-runs"
-              to={v3RunsPath(organization, project, environment)}
-            />
-            <SideMenuItem
-              name="Batches"
-              icon={Squares2X2Icon}
-              activeIconColor="text-batches"
-              to={v3BatchesPath(organization, project, environment)}
-              data-action="batches"
-            />
-            <SideMenuItem
-              name="Schedules"
-              icon={ClockIcon}
-              activeIconColor="text-schedules"
-              to={v3SchedulesPath(organization, project, environment)}
-              data-action="schedules"
-            />
-            <SideMenuItem
-              name="Queues"
-              icon={RectangleStackIcon}
-              activeIconColor="text-queues"
-              to={v3QueuesPath(organization, project, environment)}
-              data-action="queues"
-            />
-            <SideMenuItem
-              name="Deployments"
-              icon={ServerStackIcon}
-              activeIconColor="text-deployments"
-              to={v3DeploymentsPath(organization, project, environment)}
-              data-action="deployments"
-            />
-            <SideMenuItem
-              name="Test"
-              icon={BeakerIcon}
-              activeIconColor="text-tests"
-              to={v3TestPath(organization, project, environment)}
-              data-action="test"
-            />
-          </div>
+            <div className="w-full">
+              <SideMenuItem
+                name="Tasks"
+                icon={TaskIconSmall}
+                activeIconColor="text-tasks"
+                inactiveIconColor="text-tasks"
+                to={v3EnvironmentPath(organization, project, environment)}
+                data-action="tasks"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Runs"
+                icon={RunsIconExtraSmall}
+                activeIconColor="text-runs"
+                inactiveIconColor="text-runs"
+                to={v3RunsPath(organization, project, environment)}
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Batches"
+                icon={Squares2X2Icon}
+                activeIconColor="text-batches"
+                inactiveIconColor="text-batches"
+                to={v3BatchesPath(organization, project, environment)}
+                data-action="batches"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Schedules"
+                icon={ClockIcon}
+                activeIconColor="text-schedules"
+                inactiveIconColor="text-schedules"
+                to={v3SchedulesPath(organization, project, environment)}
+                data-action="schedules"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Queues"
+                icon={RectangleStackIcon}
+                activeIconColor="text-queues"
+                inactiveIconColor="text-queues"
+                to={v3QueuesPath(organization, project, environment)}
+                data-action="queues"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Waitpoint tokens"
+                icon={WaitpointTokenIcon}
+                activeIconColor="text-sky-500"
+                inactiveIconColor="text-sky-500"
+                to={v3WaitpointTokensPath(organization, project, environment)}
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Deployments"
+                icon={ServerStackIcon}
+                activeIconColor="text-deployments"
+                inactiveIconColor="text-deployments"
+                to={v3DeploymentsPath(organization, project, environment)}
+                data-action="deployments"
+                isCollapsed={isCollapsed}
+              />
 
-          <SideMenuSection title="Waitpoints">
-            <SideMenuItem
-              name="Tokens"
-              icon={WaitpointTokenIcon}
-              activeIconColor="text-sky-500"
-              to={v3WaitpointTokensPath(organization, project, environment)}
-              badge={<V4Badge />}
-            />
-          </SideMenuSection>
-
-          <SideMenuSection title="Manage">
-            <SideMenuItem
-              name="Bulk actions"
-              icon={ListCheckedIcon}
-              activeIconColor="text-bulkActions"
-              to={v3BulkActionsPath(organization, project, environment)}
-              data-action="bulk actions"
-            />
-            <SideMenuItem
-              name="API keys"
-              icon={KeyIcon}
-              activeIconColor="text-apiKeys"
-              to={v3ApiKeysPath(organization, project, environment)}
-              data-action="api keys"
-            />
-            <SideMenuItem
-              name="Environment variables"
-              icon={IdentificationIcon}
-              activeIconColor="text-environmentVariables"
-              to={v3EnvironmentVariablesPath(organization, project, environment)}
-              data-action="environment variables"
-            />
-            <SideMenuItem
-              name="Alerts"
-              icon={BellAlertIcon}
-              activeIconColor="text-alerts"
-              to={v3ProjectAlertsPath(organization, project, environment)}
-              data-action="alerts"
-            />
-            <SideMenuItem
-              name="Preview branches"
-              icon={BranchEnvironmentIconSmall}
-              activeIconColor="text-preview"
-              to={branchesPath(organization, project, environment)}
-              data-action="preview-branches"
-              badge={<V4Badge />}
-            />
-            <SideMenuItem
-              name="Project settings"
-              icon={Cog8ToothIcon}
-              activeIconColor="text-projectSettings"
-              to={v3ProjectSettingsPath(organization, project, environment)}
-              data-action="project-settings"
-            />
-          </SideMenuSection>
-        </div>
-      </div>
-      <div>
-        <IncidentStatusPanel />
-        <div className="flex flex-col gap-1 border-t border-grid-bright p-1">
-          <div className="flex w-full items-center justify-between">
-            <HelpAndAI />
+              <SideMenuItem
+                name="Test"
+                icon={BeakerIcon}
+                activeIconColor="text-tests"
+                inactiveIconColor="text-tests"
+                to={v3TestPath(organization, project, environment)}
+                data-action="test"
+                isCollapsed={isCollapsed}
+              />
+            </div>
+
+            {(user.admin || user.isImpersonating || featureFlags.hasQueryAccess) && (
+              <SideMenuSection
+                title="Insights"
+                isSideMenuCollapsed={isCollapsed}
+                itemSpacingClassName="space-y-0"
+                initialCollapsed={getSectionCollapsed(
+                  user.dashboardPreferences.sideMenu,
+                  "metrics"
+                )}
+                onCollapseToggle={handleSectionToggle("metrics")}
+              >
+                {(user.admin || user.isImpersonating || featureFlags.hasLogsPageAccess) && (
+                  <SideMenuItem
+                    name="Logs"
+                    icon={LogsIcon}
+                    activeIconColor="text-logs"
+                    inactiveIconColor="text-logs"
+                    to={v3LogsPath(organization, project, environment)}
+                    data-action="logs"
+                    badge={<AlphaBadge />}
+                    isCollapsed={isCollapsed}
+                  />
+                )}
+                <SideMenuItem
+                  name="Query"
+                  icon={TableCellsIcon}
+                  activeIconColor="text-query"
+                  inactiveIconColor="text-query"
+                  to={queryPath(organization, project, environment)}
+                  data-action="query"
+                  isCollapsed={isCollapsed}
+                />
+                <SideMenuItem
+                  name="Metrics"
+                  icon={ChartBarIcon}
+                  activeIconColor="text-metrics"
+                  inactiveIconColor="text-metrics"
+                  to={v3BuiltInDashboardPath(organization, project, environment, "overview")}
+                  data-action="metrics-overview"
+                  isCollapsed={isCollapsed}
+                  action={
+                    <CreateDashboardButton
+                      organization={organization}
+                      project={project}
+                      environment={environment}
+                      isCollapsed={isCollapsed}
+                    />
+                  }
+                />
+                <DashboardList
+                  organization={organization}
+                  project={project}
+                  environment={environment}
+                  isCollapsed={isCollapsed}
+                  user={user}
+                />
+              </SideMenuSection>
+            )}
+
+            <SideMenuSection
+              title="Manage"
+              isSideMenuCollapsed={isCollapsed}
+              itemSpacingClassName="space-y-0"
+              initialCollapsed={getSectionCollapsed(user.dashboardPreferences.sideMenu, "manage")}
+              onCollapseToggle={handleSectionToggle("manage")}
+            >
+              <SideMenuItem
+                name="Bulk actions"
+                icon={ListCheckedIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={v3BulkActionsPath(organization, project, environment)}
+                data-action="bulk actions"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="API keys"
+                icon={KeyIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={v3ApiKeysPath(organization, project, environment)}
+                data-action="api keys"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Environment variables"
+                icon={IdentificationIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={v3EnvironmentVariablesPath(organization, project, environment)}
+                data-action="environment variables"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Alerts"
+                icon={BellAlertIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={v3ProjectAlertsPath(organization, project, environment)}
+                data-action="alerts"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Preview branches"
+                icon={BranchEnvironmentIconSmall}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={branchesPath(organization, project, environment)}
+                data-action="preview-branches"
+                isCollapsed={isCollapsed}
+              />
+              {isManagedCloud && (
+                <SideMenuItem
+                  name="Concurrency"
+                  icon={ConcurrencyIcon}
+                  activeIconColor="text-text-bright"
+                  inactiveIconColor="text-text-dimmed"
+                  to={concurrencyPath(organization, project, environment)}
+                  data-action="concurrency"
+                  isCollapsed={isCollapsed}
+                />
+              )}
+              <SideMenuItem
+                name="Regions"
+                icon={GlobeAmericasIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={regionsPath(organization, project, environment)}
+                data-action="regions"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Limits"
+                icon={AdjustmentsHorizontalIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={limitsPath(organization, project, environment)}
+                data-action="limits"
+                isCollapsed={isCollapsed}
+              />
+              <SideMenuItem
+                name="Project settings"
+                icon={Cog8ToothIcon}
+                activeIconColor="text-text-bright"
+                inactiveIconColor="text-text-dimmed"
+                to={v3ProjectSettingsPath(organization, project, environment)}
+                data-action="project-settings"
+                isCollapsed={isCollapsed}
+              />
+            </SideMenuSection>
           </div>
-          {isFreeUser && (
-            <FreePlanUsage
-              to={v3BillingPath(organization)}
-              percentage={currentPlan.v3Usage.usagePercentage}
-            />
-          )}
         </div>
+        <div>
+          <IncidentStatusPanel
+            isCollapsed={isCollapsed}
+            title={incidentStatus.title}
+            hasIncident={incidentStatus.hasIncident}
+            isManagedCloud={incidentStatus.isManagedCloud}
+          />
+          <V3DeprecationPanel
+            isCollapsed={isCollapsed}
+            isV3={isV3Project}
+            hasIncident={incidentStatus.hasIncident}
+            isManagedCloud={incidentStatus.isManagedCloud}
+          />
+          <motion.div
+            layout
+            transition={{ duration: 0.2, ease: "easeInOut" }}
+            className={cn(
+              "flex flex-col gap-1 border-t border-grid-bright p-1",
+              isCollapsed && "items-center"
+            )}
+          >
+            <HelpAndAI isCollapsed={isCollapsed} />
+            {isFreeUser && (
+              <CollapsibleHeight isCollapsed={isCollapsed}>
+                <FreePlanUsage
+                  to={v3BillingPath(organization)}
+                  percentage={currentPlan.v3Usage.usagePercentage}
+                />
+              </CollapsibleHeight>
+            )}
+          </motion.div>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function V3DeprecationPanel({
+  isCollapsed,
+  isV3,
+  hasIncident,
+  isManagedCloud,
+}: {
+  isCollapsed: boolean;
+  isV3: boolean;
+  hasIncident: boolean;
+  isManagedCloud: boolean;
+}) {
+  if (!isManagedCloud || !isV3 || hasIncident) {
+    return null;
+  }
+
+  return (
+    <Popover>
+      <div className="p-1">
+        <motion.div
+          initial={false}
+          animate={{
+            height: isCollapsed ? 0 : "auto",
+            opacity: isCollapsed ? 0 : 1,
+          }}
+          transition={{ duration: 0.15 }}
+          className="overflow-hidden"
+        >
+          <V3DeprecationContent />
+        </motion.div>
+
+        <motion.div
+          initial={false}
+          animate={{
+            height: isCollapsed ? "auto" : 0,
+            opacity: isCollapsed ? 1 : 0,
+          }}
+          transition={{ duration: 0.15 }}
+          className="overflow-hidden"
+        >
+          <SimpleTooltip
+            button={
+              <PopoverTrigger className="flex !h-8 w-full items-center justify-center rounded border border-amber-500/30 bg-amber-500/15 transition-colors hover:border-amber-500/50 hover:bg-amber-500/25">
+                <ExclamationTriangleIcon className="size-5 text-amber-400" />
+              </PopoverTrigger>
+            }
+            content="V3 deprecation warning"
+            side="right"
+            sideOffset={8}
+            disableHoverableContent
+            asChild
+          />
+        </motion.div>
+      </div>
+      <PopoverContent side="right" sideOffset={8} align="start" className="w-52 !min-w-0 p-0">
+        <V3DeprecationContent />
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function V3DeprecationContent() {
+  return (
+    <div className="flex flex-col gap-2 rounded border border-amber-500/30 bg-amber-500/10 p-2 pt-1.5">
+      <div className="flex items-center gap-1 border-b border-amber-500/30 pb-1">
+        <ExclamationTriangleIcon className="size-4 text-amber-400" />
+        <Paragraph variant="small/bright" className="text-amber-300">
+          V3 deprecation warning
+        </Paragraph>
       </div>
+      <Paragraph variant="extra-small/bright" className="text-amber-300">
+        This is a v3 project. V3 deploys will stop working on 1 April 2026. Full shutdown is 1 July
+        2026 where all v3 runs will stop executing. Migrate to v4 to avoid downtime.
+      </Paragraph>
+      <LinkButton
+        variant="secondary/small"
+        to="https://trigger.dev/docs/migrating-from-v3"
+        target="_blank"
+        fullWidth
+        TrailingIcon={ArrowTopRightOnSquareIcon}
+        trailingIconClassName="text-amber-300"
+        className="border-amber-500/30 bg-amber-500/15 hover:!border-amber-500/50 hover:!bg-amber-500/25"
+      >
+        <span className="text-amber-300">View migration guide</span>
+      </LinkButton>
     </div>
   );
 }
@@ -342,11 +731,13 @@ function ProjectSelector({
   organization,
   organizations,
   user,
+  isCollapsed = false,
 }: {
   project: SideMenuProject;
   organization: MatchedOrganization;
   organizations: MatchedOrganization[];
   user: SideMenuUser;
+  isCollapsed?: boolean;
 }) {
   const currentPlan = useCurrentPlan();
   const [isOrgMenuOpen, setOrgMenuOpen] = useState(false);
@@ -366,29 +757,64 @@ function ProjectSelector({
 
   return (
     <Popover onOpenChange={(open) => setOrgMenuOpen(open)} open={isOrgMenuOpen}>
-      <PopoverArrowTrigger
-        isOpen={isOrgMenuOpen}
-        overflowHidden
-        className="h-8 w-full justify-between py-1 pl-1.5"
-      >
-        <span className="flex items-center gap-1.5 overflow-hidden">
-          <Avatar avatar={organization.avatar} size={1.25} orgName={organization.title} />
-          <SelectorDivider />
-          <span className="truncate text-2sm font-normal text-text-bright">
-            {project.name ?? "Select a project"}
-          </span>
-        </span>
-      </PopoverArrowTrigger>
+      <SimpleTooltip
+        button={
+          <PopoverTrigger
+            className={cn(
+              "group flex h-8 items-center rounded pl-[0.4375rem] transition-colors hover:bg-charcoal-750",
+              isCollapsed ? "justify-center pr-0.5" : "w-full justify-between pr-1"
+            )}
+          >
+            <span className="flex min-w-0 flex-1 items-center gap-1.5 overflow-hidden">
+              <Avatar avatar={organization.avatar} size={1.25} orgName={organization.title} />
+              <span
+                className={cn(
+                  "flex min-w-0 items-center gap-1.5 overflow-hidden transition-all duration-200",
+                  isCollapsed ? "max-w-0 opacity-0" : "max-w-[200px] opacity-100"
+                )}
+              >
+                <SelectorDivider />
+                <span className="truncate text-2sm font-normal text-text-bright">
+                  {project.name ?? "Select a project"}
+                </span>
+              </span>
+            </span>
+            <span
+              className={cn(
+                "overflow-hidden transition-all duration-200",
+                isCollapsed ? "max-w-0 opacity-0" : "max-w-[16px] opacity-100"
+              )}
+            >
+              <DropdownIcon className="size-4 min-w-4 text-text-dimmed transition group-hover:text-text-bright" />
+            </span>
+          </PopoverTrigger>
+        }
+        content={`${organization.title} / ${project.name ?? "Select a project"}`}
+        side="right"
+        sideOffset={8}
+        hidden={!isCollapsed}
+        buttonClassName="!h-8"
+        asChild
+        disableHoverableContent
+      />
       <PopoverContent
         className="min-w-[16rem] overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        side={isCollapsed ? "right" : "bottom"}
+        sideOffset={isCollapsed ? 8 : 4}
         align="start"
         style={{ maxHeight: `calc(var(--radix-popover-content-available-height) - 10vh)` }}
       >
         <div className="flex flex-col gap-2 bg-charcoal-750 p-2">
           <div className="flex items-center gap-2.5">
-            <div className="box-content size-10 overflow-clip rounded-sm bg-charcoal-800">
+            <Link
+              to={organizationSettingsPath(organization)}
+              className="group relative box-content size-10 overflow-clip rounded-sm bg-charcoal-800"
+            >
               <Avatar avatar={organization.avatar} size={2.5} orgName={organization.title} />
-            </div>
+              <div className="absolute inset-0 z-10 grid h-full w-full place-items-center bg-black/50 opacity-0 transition group-hover:opacity-100">
+                <PencilSquareIcon className="size-5 text-text-bright" />
+              </div>
+            </Link>
             <div className="space-y-0.5">
               <Paragraph variant="small/bright">{organization.title}</Paragraph>
               <div className="flex items-baseline gap-2">
@@ -593,12 +1019,191 @@ function SelectorDivider() {
   );
 }
 
-function HelpAndAI() {
+/** Helper component that fades out but preserves width (collapses to 0 width) */
+function CollapsibleElement({
+  isCollapsed,
+  children,
+  className,
+}: {
+  isCollapsed: boolean;
+  children: ReactNode;
+  className?: string;
+}) {
   return (
-    <>
-      <ShortcutsAutoOpen />
-      <HelpAndFeedback />
-      <AskAI />
-    </>
+    <div
+      className={cn(
+        "overflow-hidden transition-all duration-200",
+        isCollapsed ? "max-w-0 opacity-0" : "max-w-[100px] opacity-100",
+        className
+      )}
+    >
+      {children}
+    </div>
+  );
+}
+
+/** Helper component that fades out and collapses height completely */
+function CollapsibleHeight({
+  isCollapsed,
+  children,
+  className,
+}: {
+  isCollapsed: boolean;
+  children: ReactNode;
+  className?: string;
+}) {
+  return (
+    <div
+      className={cn(
+        "grid transition-all duration-200 ease-in-out",
+        isCollapsed ? "grid-rows-[0fr] opacity-0" : "grid-rows-[1fr] opacity-100",
+        className
+      )}
+    >
+      <div className="overflow-hidden">{children}</div>
+    </div>
+  );
+}
+
+function HelpAndAI({ isCollapsed }: { isCollapsed: boolean }) {
+  return (
+    <LayoutGroup>
+      <div
+        className={cn(
+          "flex w-full",
+          isCollapsed ? "flex-col-reverse gap-1" : "items-center justify-between"
+        )}
+      >
+        <ShortcutsAutoOpen />
+        <HelpAndFeedback isCollapsed={isCollapsed} />
+        <AskAI isCollapsed={isCollapsed} />
+      </div>
+    </LayoutGroup>
+  );
+}
+
+function AnimatedChevron({
+  isHovering,
+  isCollapsed,
+}: {
+  isHovering: boolean;
+  isCollapsed: boolean;
+}) {
+  // When hovering and expanded: left chevron (pointing left to collapse)
+  // When hovering and collapsed: right chevron (pointing right to expand)
+  // When not hovering: straight vertical line
+
+  const getRotation = () => {
+    if (!isHovering) return { top: 0, bottom: 0 };
+    if (isCollapsed) {
+      // Right chevron
+      return { top: -17, bottom: 17 };
+    } else {
+      // Left chevron
+      return { top: 17, bottom: -17 };
+    }
+  };
+
+  const { top, bottom } = getRotation();
+
+  // Calculate horizontal offset to keep chevron centered when rotated
+  // Left chevron: translate left (-1.5px)
+  // Right chevron: translate right (+1.5px)
+  const getTranslateX = () => {
+    if (!isHovering) return 0;
+    return isCollapsed ? 1.5 : -1.5;
+  };
+
+  return (
+    <motion.svg
+      width="4"
+      height="30"
+      viewBox="0 0 4 30"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className="pointer-events-none relative z-10 overflow-visible text-charcoal-600 transition-colors group-hover:text-text-bright"
+      initial={false}
+      animate={{
+        x: getTranslateX(),
+      }}
+      transition={{ duration: 0.4, ease: "easeOut" }}
+    >
+      {/* Top segment */}
+      <motion.line
+        x1="2"
+        y1="1.5"
+        x2="2"
+        y2="15"
+        stroke="currentColor"
+        strokeWidth="3"
+        strokeLinecap="round"
+        initial={false}
+        animate={{
+          rotate: top,
+        }}
+        transition={{ duration: 0.2, ease: "easeOut" }}
+        style={{ transformOrigin: "2px 15px" }}
+      />
+      {/* Bottom segment */}
+      <motion.line
+        x1="2"
+        y1="15"
+        x2="2"
+        y2="28.5"
+        stroke="currentColor"
+        strokeWidth="3"
+        strokeLinecap="round"
+        initial={false}
+        animate={{
+          rotate: bottom,
+        }}
+        transition={{ duration: 0.2, ease: "easeOut" }}
+        style={{ transformOrigin: "2px 15px" }}
+      />
+    </motion.svg>
+  );
+}
+
+function CollapseToggle({ isCollapsed, onToggle }: { isCollapsed: boolean; onToggle: () => void }) {
+  const [isHovering, setIsHovering] = useState(false);
+
+  return (
+    <div className="absolute -right-3 top-1/2 z-10 -translate-y-1/2">
+      {/* Vertical line to mask the side menu border */}
+      <div
+        className={cn(
+          "pointer-events-none absolute left-1/2 top-1/2 h-10 w-px -translate-y-1/2 transition-colors duration-200",
+          isHovering ? "bg-charcoal-750" : "bg-background-bright"
+        )}
+      />
+      <TooltipProvider disableHoverableContent>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <button
+              type="button"
+              aria-label={isCollapsed ? "Expand side menu" : "Collapse side menu"}
+              onClick={onToggle}
+              onMouseEnter={() => setIsHovering(true)}
+              onMouseLeave={() => setIsHovering(false)}
+              className={cn(
+                "group flex h-12 w-6 items-center justify-center rounded-md text-text-dimmed transition-all duration-200 focus-custom",
+                isHovering
+                  ? "border border-grid-bright bg-background-bright shadow-md hover:bg-charcoal-750 hover:text-text-bright"
+                  : "border border-transparent bg-transparent"
+              )}
+            >
+              <AnimatedChevron isHovering={isHovering} isCollapsed={isCollapsed} />
+            </button>
+          </TooltipTrigger>
+          <TooltipContent side="right" className="flex items-center gap-2 text-xs">
+            {isCollapsed ? "Expand" : "Collapse"}
+            <span className="flex items-center">
+              <ShortcutKey shortcut={{ modifiers: ["mod"] }} variant="medium/bright" />
+              <ShortcutKey shortcut={{ key: "b" }} variant="medium/bright" />
+            </span>
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    </div>
   );
 }
diff --git a/apps/webapp/app/components/navigation/SideMenuHeader.tsx b/apps/webapp/app/components/navigation/SideMenuHeader.tsx
index 83741a6c7a4..8d975cba436 100644
--- a/apps/webapp/app/components/navigation/SideMenuHeader.tsx
+++ b/apps/webapp/app/components/navigation/SideMenuHeader.tsx
@@ -1,9 +1,21 @@
 import { useNavigation } from "@remix-run/react";
 import { useEffect, useState } from "react";
+import { motion } from "framer-motion";
 import { Popover, PopoverContent, PopoverCustomTrigger } from "../primitives/Popover";
 import { EllipsisHorizontalIcon } from "@heroicons/react/20/solid";
 
-export function SideMenuHeader({ title, children }: { title: string; children?: React.ReactNode }) {
+export function SideMenuHeader({
+  title,
+  children,
+  isCollapsed = false,
+  collapsedTitle,
+}: {
+  title: string;
+  children?: React.ReactNode;
+  isCollapsed?: boolean;
+  /** When provided, this text stays visible when collapsed and the rest fades out */
+  collapsedTitle?: string;
+}) {
   const [isHeaderMenuOpen, setHeaderMenuOpen] = useState(false);
   const navigation = useNavigation();
 
@@ -11,9 +23,34 @@ export function SideMenuHeader({ title, children }: { title: string; children?:
     setHeaderMenuOpen(false);
   }, [navigation.location?.pathname]);
 
+  // If collapsedTitle is provided and title starts with it, split the title
+  const hasCollapsedTitle = collapsedTitle && title.startsWith(collapsedTitle);
+  const visiblePart = hasCollapsedTitle ? collapsedTitle : title;
+  const fadingPart = hasCollapsedTitle ? title.slice(collapsedTitle.length) : "";
+
   return (
-    <div className="group flex items-center justify-between pl-1.5">
-      <h2 className="text-xs">{title}</h2>
+    <motion.div
+      className="group flex h-4 items-center justify-between overflow-hidden pl-1.5"
+      initial={false}
+      animate={{
+        opacity: hasCollapsedTitle ? 1 : isCollapsed ? 0 : 1,
+      }}
+      transition={{ duration: 0.15, ease: "easeOut" }}
+    >
+      <h2 className="text-xs whitespace-nowrap">
+        {visiblePart}
+        {fadingPart && (
+          <motion.span
+            initial={false}
+            animate={{
+              opacity: isCollapsed ? 0 : 1,
+            }}
+            transition={{ duration: 0.15, ease: "easeOut" }}
+          >
+            {fadingPart}
+          </motion.span>
+        )}
+      </h2>
       {children !== undefined ? (
         <Popover onOpenChange={(open) => setHeaderMenuOpen(open)} open={isHeaderMenuOpen}>
           <PopoverCustomTrigger className="p-1">
@@ -27,6 +64,6 @@ export function SideMenuHeader({ title, children }: { title: string; children?:
           </PopoverContent>
         </Popover>
       ) : null}
-    </div>
+    </motion.div>
   );
 }
diff --git a/apps/webapp/app/components/navigation/SideMenuItem.tsx b/apps/webapp/app/components/navigation/SideMenuItem.tsx
index 1f893688292..844782ed615 100644
--- a/apps/webapp/app/components/navigation/SideMenuItem.tsx
+++ b/apps/webapp/app/components/navigation/SideMenuItem.tsx
@@ -1,8 +1,10 @@
 import { type AnchorHTMLAttributes, type ReactNode } from "react";
+import { Link } from "@remix-run/react";
+import { motion } from "framer-motion";
 import { usePathName } from "~/hooks/usePathName";
 import { cn } from "~/utils/cn";
-import { LinkButton } from "../primitives/Buttons";
-import { type RenderIcon } from "../primitives/Icon";
+import { type RenderIcon, Icon } from "../primitives/Icon";
+import { SimpleTooltip } from "../primitives/Tooltip";
 
 export function SideMenuItem({
   icon,
@@ -14,6 +16,8 @@ export function SideMenuItem({
   to,
   badge,
   target,
+  isCollapsed = false,
+  action,
 }: {
   icon?: RenderIcon;
   activeIconColor?: string;
@@ -24,30 +28,92 @@ export function SideMenuItem({
   to: string;
   badge?: ReactNode;
   target?: AnchorHTMLAttributes<HTMLAnchorElement>["target"];
+  isCollapsed?: boolean;
+  action?: ReactNode;
 }) {
   const pathName = usePathName();
   const isActive = pathName === to;
 
-  return (
-    <LinkButton
-      variant="small-menu-item"
-      fullWidth
-      textAlignLeft
-      LeadingIcon={icon}
-      leadingIconClassName={isActive ? activeIconColor : inactiveIconColor ?? "text-text-dimmed"}
-      TrailingIcon={trailingIcon}
-      trailingIconClassName={trailingIconClassName}
+  const link = (
+    <Link
       to={to}
       target={target}
       className={cn(
-        "text-text-bright group-hover:bg-charcoal-750 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0",
-        isActive ? "bg-tertiary text-text-bright" : "group-hover:text-text-bright"
+        "flex h-8 w-full items-center gap-2 overflow-hidden rounded pr-2 pl-[0.4375rem] text-text-bright transition-colors hover:bg-charcoal-750 group-hover/menuitem:bg-charcoal-750",
+        isActive ? "bg-tertiary" : ""
       )}
     >
-      <div className="flex w-full items-center justify-between">
-        {name}
-        <div className="flex items-center gap-1">{badge !== undefined && badge}</div>
+      <Icon
+        icon={icon}
+        className={cn(
+          "size-5 shrink-0",
+          isActive ? activeIconColor : inactiveIconColor ?? "text-text-dimmed"
+        )}
+      />
+      <motion.div
+        className="flex min-w-0 flex-1 items-center justify-between overflow-hidden"
+        initial={false}
+        animate={{
+          width: isCollapsed ? 0 : "auto",
+          opacity: isCollapsed ? 0 : 1,
+        }}
+        transition={{ duration: 0.2, ease: "easeOut" }}
+      >
+        <span className="truncate select-none text-2sm">{name}</span>
+        {badge && !isCollapsed && (
+          <motion.div
+            className="ml-1 flex shrink-0 items-center gap-1"
+            initial={false}
+            animate={{
+              opacity: 1,
+            }}
+            transition={{ duration: 0.15, ease: "easeOut" }}
+          >
+            {badge}
+          </motion.div>
+        )}
+        {trailingIcon && !isCollapsed && (
+          <Icon
+            icon={trailingIcon}
+            className={cn("ml-1 size-4 shrink-0", trailingIconClassName)}
+          />
+        )}
+      </motion.div>
+    </Link>
+  );
+
+  if (action) {
+    return (
+      <div className="group/menuitem relative h-8 w-full">
+        <SimpleTooltip
+          button={link}
+          content={name}
+          side="right"
+          sideOffset={8}
+          buttonClassName="!h-8 block w-full"
+          hidden={!isCollapsed}
+          asChild
+          disableHoverableContent
+        />
+        {!isCollapsed && (
+          <div className="absolute top-1 right-1 bottom-1 flex aspect-square items-center justify-center rounded group-hover/menuitem:bg-charcoal-750">
+            {action}
+          </div>
+        )}
       </div>
-    </LinkButton>
+    );
+  }
+
+  return (
+    <SimpleTooltip
+      button={link}
+      content={name}
+      side="right"
+      sideOffset={8}
+      buttonClassName="!h-8 block w-full"
+      hidden={!isCollapsed}
+      asChild
+      disableHoverableContent
+    />
   );
 }
diff --git a/apps/webapp/app/components/navigation/SideMenuSection.tsx b/apps/webapp/app/components/navigation/SideMenuSection.tsx
index af370035753..1564716512d 100644
--- a/apps/webapp/app/components/navigation/SideMenuSection.tsx
+++ b/apps/webapp/app/components/navigation/SideMenuSection.tsx
@@ -7,6 +7,11 @@ type Props = {
   initialCollapsed?: boolean;
   onCollapseToggle?: (isCollapsed: boolean) => void;
   children: React.ReactNode;
+  /** When true, hides the section header and shows only children */
+  isSideMenuCollapsed?: boolean;
+  itemSpacingClassName?: string;
+  /** Optional action element (e.g., + button) to render on the right side of the header */
+  headerAction?: React.ReactNode;
 };
 
 /** A collapsible section for the side menu
@@ -17,6 +22,9 @@ export function SideMenuSection({
   initialCollapsed = false,
   onCollapseToggle,
   children,
+  isSideMenuCollapsed = false,
+  itemSpacingClassName = "space-y-px",
+  headerAction,
 }: Props) {
   const [isCollapsed, setIsCollapsed] = useState(initialCollapsed);
 
@@ -27,22 +35,45 @@ export function SideMenuSection({
   }, [isCollapsed, onCollapseToggle]);
 
   return (
-    <div>
-      <div
-        className="flex cursor-pointer items-center gap-1 rounded-sm py-1 pl-1.5 text-text-dimmed transition hover:bg-charcoal-750 hover:text-text-bright"
-        onClick={handleToggle}
-      >
-        <h2 className="text-xs">{title}</h2>
+    <div className="w-full overflow-hidden">
+      {/* Header container - stays in DOM to preserve height */}
+      <div className="relative w-full">
+        {/* Header - fades out when sidebar is collapsed */}
         <motion.div
-          initial={isCollapsed}
-          animate={{ rotate: isCollapsed ? -90 : 0 }}
-          transition={{ duration: 0.2 }}
+          className="group/section flex cursor-pointer items-center justify-between overflow-hidden rounded-sm py-1 pl-1.5 pr-1 transition hover:bg-charcoal-750"
+          initial={false}
+          animate={{
+            opacity: isSideMenuCollapsed ? 0 : 1,
+          }}
+          transition={{ duration: 0.15, ease: "easeOut" }}
+          onClick={isSideMenuCollapsed ? undefined : handleToggle}
+          style={{ cursor: isSideMenuCollapsed ? "default" : "pointer" }}
         >
-          <ToggleArrowIcon className="size-2" />
+          <div className="flex items-center gap-1 text-text-dimmed transition group-hover/section:text-text-bright">
+            <h2 className="whitespace-nowrap text-xs">{title}</h2>
+            <motion.div
+              initial={isCollapsed}
+              animate={{ rotate: isCollapsed ? -90 : 0 }}
+              transition={{ duration: 0.2 }}
+            >
+              <ToggleArrowIcon className="size-2" />
+            </motion.div>
+          </div>
+          {headerAction && <div className="flex items-center">{headerAction}</div>}
         </motion.div>
+        {/* Divider - absolutely positioned, visible when sidebar is collapsed but section is expanded */}
+        <motion.div
+          className="absolute left-2 right-2 top-1 h-px bg-charcoal-600"
+          initial={false}
+          animate={{
+            opacity: isSideMenuCollapsed && !isCollapsed ? 1 : 0,
+          }}
+          transition={{ duration: 0.15, ease: "easeOut" }}
+        />
       </div>
       <AnimatePresence initial={false}>
         <motion.div
+          className="w-full"
           initial={isCollapsed ? "collapsed" : "expanded"}
           animate={isCollapsed ? "collapsed" : "expanded"}
           exit="collapsed"
@@ -63,6 +94,7 @@ export function SideMenuSection({
           style={{ overflow: "hidden" }}
         >
           <motion.div
+            className={`w-full ${itemSpacingClassName}`}
             variants={{
               expanded: {
                 translateY: 0,
diff --git a/apps/webapp/app/components/navigation/TreeConnectors.tsx b/apps/webapp/app/components/navigation/TreeConnectors.tsx
new file mode 100644
index 00000000000..8479179a491
--- /dev/null
+++ b/apps/webapp/app/components/navigation/TreeConnectors.tsx
@@ -0,0 +1,29 @@
+import { cn } from "~/utils/cn";
+
+// Tree connector icons for sub-items. The SVG viewBox is 20x20 matching the size-5 icon area.
+// Lines extend to y=-6 and y=26 to fill the full 32px row height (6px gap above/below the 20px icon).
+export function TreeConnectorBranch({ className }: { className?: string }) {
+  return (
+    <svg
+      className={cn("overflow-visible", className, "text-charcoal-600")}
+      viewBox="0 0 20 20"
+      fill="none"
+    >
+      <line x1="10" y1="-6" x2="10" y2="26" stroke="currentColor" strokeWidth="1" />
+      <line x1="10" y1="10" x2="20" y2="10" stroke="currentColor" strokeWidth="1" />
+    </svg>
+  );
+}
+
+export function TreeConnectorEnd({ className }: { className?: string }) {
+  return (
+    <svg
+      className={cn("overflow-visible", className, "text-charcoal-600")}
+      viewBox="0 0 20 20"
+      fill="none"
+    >
+      <line x1="10" y1="-6" x2="10" y2="10" stroke="currentColor" strokeWidth="1" />
+      <line x1="10" y1="10" x2="20" y2="10" stroke="currentColor" strokeWidth="1" />
+    </svg>
+  );
+}
diff --git a/apps/webapp/app/components/navigation/sideMenuTypes.ts b/apps/webapp/app/components/navigation/sideMenuTypes.ts
new file mode 100644
index 00000000000..64afdf58e65
--- /dev/null
+++ b/apps/webapp/app/components/navigation/sideMenuTypes.ts
@@ -0,0 +1,7 @@
+import { z } from "zod";
+
+// Valid section IDs that can have their collapsed state toggled
+export const SideMenuSectionIdSchema = z.enum(["manage", "metrics"]);
+
+// Inferred type from the schema
+export type SideMenuSectionId = z.infer<typeof SideMenuSectionIdSchema>;
diff --git a/apps/webapp/app/components/navigation/useReorderableList.ts b/apps/webapp/app/components/navigation/useReorderableList.ts
new file mode 100644
index 00000000000..b73a054ae98
--- /dev/null
+++ b/apps/webapp/app/components/navigation/useReorderableList.ts
@@ -0,0 +1,129 @@
+import { useFetcher } from "@remix-run/react";
+import { type Ref, useCallback, useEffect, useMemo, useState } from "react";
+import { type Layout, useContainerWidth } from "react-grid-layout";
+
+/**
+ * Generic hook for managing a reorderable list in the side menu.
+ *
+ * Handles order state, sorting, grid layout, drag callbacks, and persistence
+ * via the `/resources/preferences/sidemenu` resource route.
+ *
+ * @param organizationId - Organization ID for scoping the persisted order
+ * @param listId - Identifier for this list (e.g. "customDashboards")
+ * @param items - The items to reorder
+ * @param itemKey - Extract a stable string key from each item
+ * @param initialOrder - Initial order from stored preferences (if any)
+ * @param isImpersonating - Skip persistence when impersonating
+ */
+export function useReorderableList<T>({
+  organizationId,
+  listId,
+  items,
+  itemKey,
+  initialOrder,
+  isImpersonating,
+}: {
+  organizationId: string;
+  listId: string;
+  items: T[];
+  itemKey: (item: T) => string;
+  initialOrder: string[] | undefined;
+  isImpersonating: boolean;
+}) {
+  const orderFetcher = useFetcher();
+
+  const [order, setOrder] = useState<string[]>(
+    () => initialOrder ?? items.map(itemKey)
+  );
+
+  // Sync order when organizationId changes (component may not remount)
+  useEffect(() => {
+    setOrder(initialOrder ?? items.map(itemKey));
+  }, [organizationId]);
+
+  // Sort items by stored order, new items go to end
+  const orderedItems = useMemo(() => {
+    const orderMap = new Map(order.map((id, i) => [id, i]));
+    return [...items].sort((a, b) => {
+      const aIdx = orderMap.get(itemKey(a)) ?? Infinity;
+      const bIdx = orderMap.get(itemKey(b)) ?? Infinity;
+      return aIdx - bIdx;
+    });
+  }, [items, order, itemKey]);
+
+  // Layout for ReactGridLayout (1-column vertical list, each item h=1 row)
+  const layout = useMemo(
+    () =>
+      orderedItems.map((item, i) => ({
+        i: itemKey(item),
+        x: 0,
+        y: i,
+        w: 1,
+        h: 1,
+      })),
+    [orderedItems, itemKey]
+  );
+
+  // Width measurement for ReactGridLayout
+  const {
+    width: gridWidth,
+    containerRef,
+    mounted: gridMounted,
+  } = useContainerWidth({ initialWidth: 216 });
+
+  const canReorder = orderedItems.length >= 2;
+
+  // Track layout during drag for real-time visual updates
+  const [dragLayout, setDragLayout] = useState<Layout | null>(null);
+
+  const handleDrag = useCallback((layout: Layout) => {
+    setDragLayout(layout);
+  }, []);
+
+  // Handle drag stop - extract new order from layout y-positions
+  const handleDragStop = useCallback(
+    (layout: Layout) => {
+      setDragLayout(null);
+      const sorted = [...layout].sort((a, b) => a.y - b.y);
+      const newOrder = sorted.map((item) => item.i);
+      if (JSON.stringify(newOrder) === JSON.stringify(order)) return;
+      setOrder(newOrder);
+      // Persist immediately
+      if (!isImpersonating) {
+        const formData = new FormData();
+        formData.append("organizationId", organizationId);
+        formData.append("listId", listId);
+        formData.append("itemOrder", JSON.stringify(newOrder));
+        orderFetcher.submit(formData, {
+          method: "POST",
+          action: "/resources/preferences/sidemenu",
+        });
+      }
+    },
+    [order, organizationId, listId, isImpersonating, orderFetcher]
+  );
+
+  // Compute which item is visually last (during drag or at rest)
+  const getIsLast = useCallback(
+    (key: string, index: number) => {
+      if (dragLayout) {
+        const maxY = Math.max(...dragLayout.map((l) => l.y));
+        return dragLayout.find((l) => l.i === key)?.y === maxY;
+      }
+      return index === orderedItems.length - 1;
+    },
+    [dragLayout, orderedItems.length]
+  );
+
+  return {
+    orderedItems,
+    layout,
+    containerRef: containerRef as Ref<HTMLDivElement>,
+    gridWidth,
+    gridMounted,
+    canReorder,
+    handleDrag,
+    handleDragStop,
+    getIsLast,
+  };
+}
diff --git a/apps/webapp/app/components/primitives/AnimatedNumber.tsx b/apps/webapp/app/components/primitives/AnimatedNumber.tsx
index f2f309a5264..fea0f9d8900 100644
--- a/apps/webapp/app/components/primitives/AnimatedNumber.tsx
+++ b/apps/webapp/app/components/primitives/AnimatedNumber.tsx
@@ -1,16 +1,71 @@
 import { animate, motion, useMotionValue, useTransform } from "framer-motion";
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 
-export function AnimatedNumber({ value }: { value: number }) {
+/**
+ * Determines the number of decimal places to display based on the value.
+ * - For integers or large numbers (>=100), no decimals
+ * - For numbers >= 10, 1 decimal place
+ * - For numbers >= 1, 2 decimal places
+ * - For smaller numbers, up to 4 decimal places
+ */
+function getDecimalPlaces(value: number): number {
+  if (Number.isInteger(value)) return 0;
+
+  const absValue = Math.abs(value);
+  if (absValue >= 100) return 0;
+  if (absValue >= 10) return 1;
+  if (absValue >= 1) return 2;
+  if (absValue >= 0.1) return 3;
+  return 4;
+}
+
+/**
+ * Sanitizes a decimal places value to ensure it's valid for toLocaleString.
+ * - Coerces to a finite number (handles NaN, Infinity, -Infinity)
+ * - Rounds to an integer
+ * - Clamps to the valid 0-20 range for toLocaleString options
+ */
+function sanitizeDecimals(decimals: number): number {
+  if (!Number.isFinite(decimals)) {
+    return 0;
+  }
+  return Math.min(20, Math.max(0, Math.round(decimals)));
+}
+
+export function AnimatedNumber({
+  value,
+  duration = 0.5,
+  decimalPlaces,
+}: {
+  value: number;
+  duration?: number;
+  /** Number of decimal places to display. If not provided, auto-detects based on value. */
+  decimalPlaces?: number;
+}) {
   const motionValue = useMotionValue(value);
-  let display = useTransform(motionValue, (current) => Math.round(current).toLocaleString());
+
+  // Determine decimal places - use provided value or auto-detect, then sanitize
+  const safeDecimals = useMemo(() => {
+    const rawDecimals = decimalPlaces !== undefined ? decimalPlaces : getDecimalPlaces(value);
+    return sanitizeDecimals(rawDecimals);
+  }, [decimalPlaces, value]);
+
+  const display = useTransform(motionValue, (current) => {
+    if (safeDecimals === 0) {
+      return Math.round(current).toLocaleString();
+    }
+    return current.toLocaleString(undefined, {
+      minimumFractionDigits: safeDecimals,
+      maximumFractionDigits: safeDecimals,
+    });
+  });
 
   useEffect(() => {
     animate(motionValue, value, {
-      duration: 0.5,
+      duration,
       ease: "easeInOut",
     });
-  }, [value]);
+  }, [value, duration]);
 
   return <motion.span>{display}</motion.span>;
 }
diff --git a/apps/webapp/app/components/primitives/AppliedFilter.tsx b/apps/webapp/app/components/primitives/AppliedFilter.tsx
index b1ba1cb81ec..a7a27f41077 100644
--- a/apps/webapp/app/components/primitives/AppliedFilter.tsx
+++ b/apps/webapp/app/components/primitives/AppliedFilter.tsx
@@ -21,12 +21,13 @@ type Variant = keyof typeof variants;
 
 type AppliedFilterProps = {
   icon?: ReactNode;
-  label: ReactNode;
+  label?: ReactNode;
   value: ReactNode;
   removable?: boolean;
   onRemove?: () => void;
   variant?: Variant;
   className?: string;
+  valueClassName?: string;
 };
 
 export function AppliedFilter({
@@ -37,6 +38,7 @@ export function AppliedFilter({
   onRemove,
   variant = "secondary/small",
   className,
+  valueClassName,
 }: AppliedFilterProps) {
   const variantClassName = variants[variant];
   return (
@@ -48,14 +50,18 @@ export function AppliedFilter({
         className
       )}
     >
-      <div className="flex items-start gap-0.5 leading-4">
+      <div
+        className={cn("flex items-start leading-4", label === undefined ? "gap-1.5" : "gap-0.5")}
+      >
         <div className="-mt-[0.5px] flex items-center gap-1">
           {icon}
-          <div className="text-text-bright">
-            <span>{label}</span>:
-          </div>
+          {label && (
+            <div className="text-text-bright">
+              <span>{label}</span>:
+            </div>
+          )}
         </div>
-        <div className="text-text-dimmed">
+        <div className={cn("text-text-dimmed", valueClassName)}>
           <div>{value}</div>
         </div>
       </div>
diff --git a/apps/webapp/app/components/primitives/Avatar.tsx b/apps/webapp/app/components/primitives/Avatar.tsx
index a774dd27f92..0cb74c2ba60 100644
--- a/apps/webapp/app/components/primitives/Avatar.tsx
+++ b/apps/webapp/app/components/primitives/Avatar.tsx
@@ -6,7 +6,7 @@ import {
   RocketLaunchIcon,
   StarIcon,
 } from "@heroicons/react/20/solid";
-import { type Prisma } from "@trigger.dev/database";
+import type { Prisma } from "@trigger.dev/database";
 import { z } from "zod";
 import { logger } from "~/services/logger.server";
 import { cn } from "~/utils/cn";
diff --git a/apps/webapp/app/components/primitives/Badge.tsx b/apps/webapp/app/components/primitives/Badge.tsx
index 861ce1ff040..a92957e268d 100644
--- a/apps/webapp/app/components/primitives/Badge.tsx
+++ b/apps/webapp/app/components/primitives/Badge.tsx
@@ -6,6 +6,8 @@ const variants = {
     "grid place-items-center rounded-full px-2 h-5 tracking-wider text-xxs bg-charcoal-750 text-text-bright uppercase whitespace-nowrap",
   "extra-small":
     "grid place-items-center border border-charcoal-650 rounded-sm px-1 h-4 text-xxs bg-background-bright text-blue-500 whitespace-nowrap",
+  small:
+    "grid place-items-center border border-charcoal-650 rounded-sm px-1 h-5 text-xs bg-background-bright text-blue-500 whitespace-nowrap",
   "outline-rounded":
     "grid place-items-center rounded-full px-1 h-4 tracking-wider text-xxs border border-blue-500 text-blue-500 uppercase whitespace-nowrap",
   rounded:
diff --git a/apps/webapp/app/components/primitives/Buttons.tsx b/apps/webapp/app/components/primitives/Buttons.tsx
index bafd772b0ae..5c52a5d95d1 100644
--- a/apps/webapp/app/components/primitives/Buttons.tsx
+++ b/apps/webapp/app/components/primitives/Buttons.tsx
@@ -163,6 +163,8 @@ const allVariants = {
   variant: variant,
 };
 
+export type ButtonVariant = keyof typeof variant;
+
 export type ButtonContentPropsType = {
   children?: React.ReactNode;
   LeadingIcon?: RenderIcon;
@@ -173,7 +175,7 @@ export type ButtonContentPropsType = {
   textAlignLeft?: boolean;
   className?: string;
   shortcut?: ShortcutDefinition;
-  variant: keyof typeof variant;
+  variant: ButtonVariant;
   shortcutPosition?: "before-trailing-icon" | "after-trailing-icon";
   tooltip?: ReactNode;
   iconSpacing?: string;
@@ -274,7 +276,7 @@ export function ButtonContent(props: ButtonContentPropsType) {
       <TooltipProvider>
         <Tooltip>
           <TooltipTrigger asChild>{buttonContent}</TooltipTrigger>
-          <TooltipContent className="text-dimmed flex items-center gap-3 py-1.5 pl-2.5 pr-3 text-xs">
+          <TooltipContent className="flex items-center gap-3 py-1.5 pl-2.5 pr-3 text-xs text-text-bright">
             {tooltip} {shortcut && renderShortcutKey()}
           </TooltipContent>
         </Tooltip>
@@ -296,19 +298,17 @@ export const Button = forwardRef<HTMLButtonElement, ButtonPropsType>(
     const innerRef = useRef<HTMLButtonElement>(null);
     useImperativeHandle(ref, () => innerRef.current as HTMLButtonElement);
 
-    if (props.shortcut) {
-      useShortcutKeys({
-        shortcut: props.shortcut,
-        action: (e) => {
-          if (innerRef.current) {
-            innerRef.current.click();
-            e.preventDefault();
-            e.stopPropagation();
-          }
-        },
-        disabled,
-      });
-    }
+    useShortcutKeys({
+      shortcut: props.shortcut,
+      action: (e) => {
+        if (innerRef.current) {
+          innerRef.current.click();
+          e.preventDefault();
+          e.stopPropagation();
+        }
+      },
+      disabled: disabled || !props.shortcut,
+    });
 
     return (
       <button
@@ -331,7 +331,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonPropsType>(
 type LinkPropsType = Pick<
   LinkProps,
   "to" | "target" | "onClick" | "onMouseDown" | "onMouseEnter" | "onMouseLeave" | "download"
-> & { disabled?: boolean } & React.ComponentProps<typeof ButtonContent>;
+> & { disabled?: boolean; replace?: boolean } & React.ComponentProps<typeof ButtonContent>;
 export const LinkButton = ({
   to,
   onClick,
@@ -340,19 +340,20 @@ export const LinkButton = ({
   onMouseLeave,
   download,
   disabled = false,
+  replace,
   ...props
 }: LinkPropsType) => {
   const innerRef = useRef<HTMLAnchorElement>(null);
-  if (props.shortcut) {
-    useShortcutKeys({
-      shortcut: props.shortcut,
-      action: () => {
-        if (innerRef.current) {
-          innerRef.current.click();
-        }
-      },
-    });
-  }
+  
+  useShortcutKeys({
+    shortcut: props.shortcut,
+    action: () => {
+      if (innerRef.current) {
+        innerRef.current.click();
+      }
+    },
+    disabled: disabled || !props.shortcut,
+  });
 
   if (disabled) {
     return (
@@ -372,7 +373,7 @@ export const LinkButton = ({
       <ExtLink
         href={to.toString()}
         ref={innerRef}
-        className={cn("group/button focus-custom", props.fullWidth ? "w-full" : "")}
+        className={cn("group/button block focus-custom", props.fullWidth ? "w-full" : "")}
         onClick={onClick}
         onMouseDown={onMouseDown}
         onMouseEnter={onMouseEnter}
@@ -387,7 +388,8 @@ export const LinkButton = ({
       <Link
         to={to}
         ref={innerRef}
-        className={cn("group/button focus-custom", props.fullWidth ? "w-full" : "")}
+        replace={replace}
+        className={cn("group/button block focus-custom", props.fullWidth ? "w-full" : "w-fit")}
         onClick={onClick}
         onMouseDown={onMouseDown}
         onMouseEnter={onMouseEnter}
@@ -408,7 +410,7 @@ export const NavLinkButton = ({ to, className, target, ...props }: NavLinkPropsT
   return (
     <NavLink
       to={to}
-      className={cn("group/button outline-none", props.fullWidth ? "w-full" : "")}
+      className={cn("group/button outline-none block", props.fullWidth ? "w-full" : "")}
       target={target}
     >
       {({ isActive, isPending }) => (
diff --git a/apps/webapp/app/components/primitives/Calendar.tsx b/apps/webapp/app/components/primitives/Calendar.tsx
new file mode 100644
index 00000000000..5b72bd1c97a
--- /dev/null
+++ b/apps/webapp/app/components/primitives/Calendar.tsx
@@ -0,0 +1,126 @@
+"use client";
+
+import * as React from "react";
+import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/20/solid";
+import { format } from "date-fns";
+import { DayPicker, useDayPicker } from "react-day-picker";
+import { cn } from "~/utils/cn";
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
+
+const navButtonClass =
+  "size-7 rounded-[3px] bg-secondary border border-charcoal-600 text-text-bright hover:bg-charcoal-600 hover:border-charcoal-550 transition inline-flex items-center justify-center";
+
+function CustomMonthCaption({ calendarMonth }: { calendarMonth: { date: Date } }) {
+  const { goToMonth, nextMonth, previousMonth } = useDayPicker();
+
+  return (
+    <div className="flex w-full items-center justify-between px-1">
+      <button
+        type="button"
+        className={navButtonClass}
+        disabled={!previousMonth}
+        onClick={() => previousMonth && goToMonth(previousMonth)}
+        aria-label="Go to previous month"
+      >
+        <ChevronLeftIcon className="size-4" />
+      </button>
+      <div className="flex items-center gap-2">
+        <select
+          className="rounded border border-charcoal-600 bg-charcoal-750 px-2 py-1 text-sm text-text-bright focus:border-charcoal-500 focus:outline-none"
+          value={calendarMonth.date.getMonth()}
+          onChange={(e) => {
+            const newDate = new Date(calendarMonth.date);
+            newDate.setMonth(parseInt(e.target.value));
+            goToMonth(newDate);
+          }}
+        >
+          {Array.from({ length: 12 }, (_, i) => (
+            <option key={i} value={i}>
+              {format(new Date(2000, i), "MMM")}
+            </option>
+          ))}
+        </select>
+        <select
+          className="rounded border border-charcoal-600 bg-charcoal-750 px-2 py-1 text-sm text-text-bright focus:border-charcoal-500 focus:outline-none"
+          value={calendarMonth.date.getFullYear()}
+          onChange={(e) => {
+            const newDate = new Date(calendarMonth.date);
+            newDate.setFullYear(parseInt(e.target.value));
+            goToMonth(newDate);
+          }}
+        >
+          {Array.from({ length: 100 }, (_, i) => {
+            const year = new Date().getFullYear() - 50 + i;
+            return (
+              <option key={year} value={year}>
+                {year}
+              </option>
+            );
+          })}
+        </select>
+      </div>
+      <button
+        type="button"
+        className={navButtonClass}
+        disabled={!nextMonth}
+        onClick={() => nextMonth && goToMonth(nextMonth)}
+        aria-label="Go to next month"
+      >
+        <ChevronRightIcon className="size-4" />
+      </button>
+    </div>
+  );
+}
+
+export function Calendar({
+  className,
+  classNames,
+  showOutsideDays = true,
+  ...props
+}: CalendarProps) {
+  return (
+    <DayPicker
+      showOutsideDays={showOutsideDays}
+      weekStartsOn={1}
+      className={cn("p-3", className)}
+      classNames={{
+        months: "flex flex-col sm:flex-row gap-2",
+        month: "flex flex-col gap-4",
+        month_caption: "flex justify-center pt-1 relative items-center w-full",
+        caption_label: "sr-only",
+        nav: "hidden",
+        month_grid: "w-full border-collapse",
+        weekdays: "flex",
+        weekday: "text-text-dimmed rounded-md w-8 font-normal text-[0.8rem]",
+        week: "flex w-full mt-2",
+        day: "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-charcoal-700 [&:has([aria-selected].day-outside)]:bg-charcoal-700/50 [&:has([aria-selected].day-range-end)]:rounded-r-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md",
+        day_button: cn(
+          "size-8 p-0 font-normal text-text-bright rounded-md",
+          "hover:bg-charcoal-700 hover:text-text-bright",
+          "focus:bg-charcoal-700 focus:text-text-bright focus:outline-none",
+          "aria-selected:opacity-100"
+        ),
+        range_start: "day-range-start rounded-l-md",
+        range_end: "day-range-end rounded-r-md",
+        selected:
+          "bg-indigo-600 text-text-bright hover:bg-indigo-600 hover:text-text-bright focus:bg-indigo-600 focus:text-text-bright rounded-md",
+        today: "bg-charcoal-700 text-text-bright rounded-md",
+        outside:
+          "day-outside text-text-dimmed opacity-50 aria-selected:bg-charcoal-700/50 aria-selected:text-text-dimmed aria-selected:opacity-30",
+        disabled: "text-text-dimmed opacity-50",
+        range_middle: "aria-selected:bg-charcoal-700 aria-selected:text-text-bright",
+        hidden: "invisible",
+        dropdowns: "flex gap-2 items-center justify-center",
+        dropdown:
+          "bg-charcoal-750 border border-charcoal-600 rounded px-2 py-1 text-sm text-text-bright focus:outline-none focus:border-charcoal-500",
+        ...classNames,
+      }}
+      components={{
+        MonthCaption: CustomMonthCaption,
+      }}
+      {...props}
+    />
+  );
+}
+Calendar.displayName = "Calendar";
diff --git a/apps/webapp/app/components/primitives/Callout.tsx b/apps/webapp/app/components/primitives/Callout.tsx
index 207ad134b64..da2d2ea760e 100644
--- a/apps/webapp/app/components/primitives/Callout.tsx
+++ b/apps/webapp/app/components/primitives/Callout.tsx
@@ -1,4 +1,5 @@
 import {
+  CreditCardIcon,
   ExclamationCircleIcon,
   ExclamationTriangleIcon,
   InformationCircleIcon,
@@ -60,10 +61,10 @@ export const variantClasses = {
     linkClassName: "transition hover:bg-blue-400/20",
   },
   pricing: {
-    className: "border-charcoal-700 bg-charcoal-800",
-    icon: <ChartBarIcon className="h-5 w-5 shrink-0 text-text-dimmed" />,
-    textColor: "text-text-bright",
-    linkClassName: "transition hover:bg-charcoal-750",
+    className: "border-indigo-400/20 bg-indigo-800/30",
+    icon: <CreditCardIcon className="h-5 w-5 shrink-0 text-indigo-400" />,
+    textColor: "text-indigo-300",
+    linkClassName: "transition hover:bg-indigo-400/20",
   },
 } as const;
 
diff --git a/apps/webapp/app/components/primitives/ClientTabs.tsx b/apps/webapp/app/components/primitives/ClientTabs.tsx
index 52d10b8cfec..aef45fe0cce 100644
--- a/apps/webapp/app/components/primitives/ClientTabs.tsx
+++ b/apps/webapp/app/components/primitives/ClientTabs.tsx
@@ -1,41 +1,189 @@
 "use client";
 
-import * as React from "react";
+import { motion } from "framer-motion";
 import * as TabsPrimitive from "@radix-ui/react-tabs";
+import * as React from "react";
 import { cn } from "~/utils/cn";
-import { motion } from "framer-motion";
+import { type Variants } from "./Tabs";
+
+type ClientTabsContextValue = {
+  value?: string;
+};
+
+const ClientTabsContext = React.createContext<ClientTabsContextValue | undefined>(undefined);
+
+function useClientTabsContext() {
+  return React.useContext(ClientTabsContext);
+}
 
 const ClientTabs = React.forwardRef<
   React.ElementRef<typeof TabsPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof TabsPrimitive.Root>
->((props, ref) => <TabsPrimitive.Root ref={ref} {...props} />);
+>(({ onValueChange, value: valueProp, defaultValue, ...props }, ref) => {
+  const [value, setValue] = React.useState<string | undefined>(valueProp ?? defaultValue);
+
+  React.useEffect(() => {
+    if (valueProp !== undefined) {
+      setValue(valueProp);
+    }
+  }, [valueProp]);
+
+  const handleValueChange = React.useCallback(
+    (nextValue: string) => {
+      if (valueProp === undefined) {
+        setValue(nextValue);
+      }
+      onValueChange?.(nextValue);
+    },
+    [onValueChange, valueProp]
+  );
+
+  const controlledProps =
+    valueProp !== undefined
+      ? { value: valueProp }
+      : defaultValue !== undefined
+      ? { defaultValue }
+      : {};
+
+  const contextValue = React.useMemo<ClientTabsContextValue>(() => ({ value }), [value]);
+
+  return (
+    <ClientTabsContext.Provider value={contextValue}>
+      <TabsPrimitive.Root
+        ref={ref}
+        activationMode="manual"
+        onValueChange={handleValueChange}
+        {...controlledProps}
+        {...props}
+      />
+    </ClientTabsContext.Provider>
+  );
+});
 ClientTabs.displayName = TabsPrimitive.Root.displayName;
 
 const ClientTabsList = React.forwardRef<
   React.ElementRef<typeof TabsPrimitive.List>,
-  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List>
->(({ className, ...props }, ref) => (
-  <TabsPrimitive.List
-    ref={ref}
-    className={cn("inline-flex items-center justify-center transition duration-100", className)}
-    {...props}
-  />
-));
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.List> & {
+    variant?: Variants;
+  }
+>(({ className, variant = "pipe-divider", ...props }, ref) => {
+  const variantClassName = (() => {
+    switch (variant) {
+      case "segmented":
+        return "relative flex h-10 w-full items-center rounded bg-charcoal-700/50 p-1";
+      case "underline":
+        return "flex gap-x-6 border-b border-grid-bright";
+      default:
+        return "inline-flex items-center justify-center transition duration-100";
+    }
+  })();
+
+  return <TabsPrimitive.List ref={ref} className={cn(variantClassName, className)} {...props} />;
+});
 ClientTabsList.displayName = TabsPrimitive.List.displayName;
 
 const ClientTabsTrigger = React.forwardRef<
   React.ElementRef<typeof TabsPrimitive.Trigger>,
-  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger>
->(({ className, ...props }, ref) => (
-  <TabsPrimitive.Trigger
-    ref={ref}
-    className={cn(
-      "ring-offset-background focus-visible:ring-ring inline-flex items-center justify-center whitespace-nowrap border-r border-charcoal-700 px-2 text-sm transition-all first:pl-0 last:border-none data-[state=active]:text-indigo-500 data-[state=inactive]:text-text-dimmed data-[state=inactive]:hover:text-text-bright focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
-      className
-    )}
-    {...props}
-  />
-));
+  React.ComponentPropsWithoutRef<typeof TabsPrimitive.Trigger> & {
+    variant?: Variants;
+    layoutId?: string;
+  }
+>(({ className, variant = "pipe-divider", layoutId, children, ...props }, ref) => {
+  const context = useClientTabsContext();
+  const activeValue = context?.value;
+  const isActive = activeValue === props.value;
+
+  if (variant === "segmented") {
+    return (
+      <TabsPrimitive.Trigger
+        ref={ref}
+        tabIndex={0}
+        className={cn(
+          "group relative flex h-full grow items-center justify-center focus-custom disabled:pointer-events-none disabled:opacity-50",
+          "flex-1 basis-0",
+          className
+        )}
+        {...props}
+      >
+        <div className="relative z-10 flex h-full w-full items-center justify-center px-3 py-[0.13rem]">
+          <span
+            className={cn(
+              "text-sm transition duration-200",
+              isActive
+                ? "text-text-bright"
+                : "text-text-dimmed transition group-hover:text-text-bright"
+            )}
+          >
+            {children}
+          </span>
+        </div>
+        {isActive ? (
+          layoutId ? (
+            <motion.div
+              layoutId={layoutId}
+              transition={{ duration: 0.4, type: "spring" }}
+              className="absolute inset-0 rounded-[2px] border border-charcoal-500/50 bg-charcoal-600"
+            />
+          ) : (
+            <div className="absolute inset-0 rounded-[2px] border border-charcoal-500/50 bg-charcoal-600" />
+          )
+        ) : null}
+      </TabsPrimitive.Trigger>
+    );
+  }
+
+  if (variant === "underline") {
+    return (
+      <TabsPrimitive.Trigger
+        ref={ref}
+        tabIndex={0}
+        className={cn(
+          "group flex flex-col items-center pt-1 focus-custom disabled:pointer-events-none disabled:opacity-50",
+          className
+        )}
+        {...props}
+      >
+        <span
+          className={cn(
+            "text-sm transition duration-200",
+            isActive ? "text-text-bright" : "text-text-dimmed group-hover:text-text-bright"
+          )}
+        >
+          {children}
+        </span>
+        {layoutId ? (
+          isActive ? (
+            <motion.div
+              layoutId={layoutId}
+              transition={{ type: "spring", stiffness: 500, damping: 30 }}
+              className="mt-1 h-0.5 w-full bg-indigo-500"
+            />
+          ) : (
+            <div className="mt-1 h-0.5 w-full bg-charcoal-500 opacity-0 transition duration-200 group-hover:opacity-100" />
+          )
+        ) : isActive ? (
+          <div className="mt-1 h-0.5 w-full bg-indigo-500" />
+        ) : (
+          <div className="mt-1 h-0.5 w-full bg-charcoal-500 opacity-0 transition duration-200 group-hover:opacity-100" />
+        )}
+      </TabsPrimitive.Trigger>
+    );
+  }
+
+  return (
+    <TabsPrimitive.Trigger
+      ref={ref}
+      tabIndex={0}
+      className={cn(
+        "inline-flex items-center justify-center whitespace-nowrap border-r border-charcoal-700 px-2 text-sm transition-all first:pl-0 last:border-none focus-custom data-[state=active]:text-indigo-500 data-[state=inactive]:text-text-dimmed data-[state=inactive]:hover:text-text-bright disabled:pointer-events-none disabled:opacity-50",
+        className
+      )}
+      {...props}
+    >
+      {children}
+    </TabsPrimitive.Trigger>
+  );
+});
 ClientTabsTrigger.displayName = TabsPrimitive.Trigger.displayName;
 
 const ClientTabsContent = React.forwardRef<
@@ -44,9 +192,11 @@ const ClientTabsContent = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <TabsPrimitive.Content
     ref={ref}
+    tabIndex={-1}
     className={cn(
-      "ring-offset-background focus-visible:ring-ring mt-1 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2",
-      className
+      "mt-1 outline-none",
+      className,
+      "data-[state=inactive]:hidden"
     )}
     {...props}
   />
@@ -61,39 +211,7 @@ export type TabsProps = {
   currentValue: string;
   className?: string;
   layoutId: string;
+  variant?: Variants;
 };
 
-export function ClientTabsWithUnderline({ className, tabs, currentValue, layoutId }: TabsProps) {
-  return (
-    <TabsPrimitive.List
-      className={cn(`flex flex-row gap-x-6 border-b border-charcoal-700`, className)}
-    >
-      {tabs.map((tab, index) => {
-        const isActive = currentValue === tab.value;
-        return (
-          <TabsPrimitive.Trigger
-            key={tab.value}
-            value={tab.value}
-            className={cn(`group flex flex-col items-center`, className)}
-          >
-            <span
-              className={cn(
-                "text-sm transition duration-200",
-                isActive ? "text-indigo-500" : "text-charcoal-200"
-              )}
-            >
-              {tab.label}
-            </span>
-            {isActive ? (
-              <motion.div layoutId={layoutId} className="mt-1 h-0.5 w-full bg-indigo-500" />
-            ) : (
-              <div className="mt-1 h-0.5 w-full bg-charcoal-500 opacity-0 transition duration-200 group-hover:opacity-100" />
-            )}
-          </TabsPrimitive.Trigger>
-        );
-      })}
-    </TabsPrimitive.List>
-  );
-}
-
-export { ClientTabs, ClientTabsList, ClientTabsTrigger, ClientTabsContent };
+export { ClientTabs, ClientTabsContent, ClientTabsList, ClientTabsTrigger };
diff --git a/apps/webapp/app/components/primitives/CopyableText.tsx b/apps/webapp/app/components/primitives/CopyableText.tsx
index 99664b3dc37..9be81d4d64e 100644
--- a/apps/webapp/app/components/primitives/CopyableText.tsx
+++ b/apps/webapp/app/components/primitives/CopyableText.tsx
@@ -3,55 +3,96 @@ import { useState } from "react";
 import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import { useCopy } from "~/hooks/useCopy";
 import { cn } from "~/utils/cn";
+import { Button } from "./Buttons";
 
 export function CopyableText({
   value,
   copyValue,
   className,
+  asChild,
+  variant,
 }: {
   value: string;
   copyValue?: string;
   className?: string;
+  asChild?: boolean;
+  variant?: "icon-right" | "text-below";
 }) {
   const [isHovered, setIsHovered] = useState(false);
   const { copy, copied } = useCopy(copyValue ?? value);
 
-  return (
-    <span
-      className={cn("group relative inline-flex h-6 items-center", className)}
-      onMouseLeave={() => setIsHovered(false)}
-    >
-      <span onMouseEnter={() => setIsHovered(true)}>{value}</span>
+  const resolvedVariant = variant ?? "icon-right";
+
+  if (resolvedVariant === "icon-right") {
+    return (
       <span
-        onClick={copy}
-        onMouseDown={(e) => e.stopPropagation()}
-        className={cn(
-          "absolute -right-6 top-0 z-10 size-6 font-sans",
-          isHovered ? "flex" : "hidden"
-        )}
+        className={cn("group relative inline-flex h-6 items-center", className)}
+        onMouseLeave={() => setIsHovered(false)}
       >
-        <SimpleTooltip
-          button={
-            <span
-              className={cn(
-                "ml-1 flex size-6 items-center justify-center rounded border border-charcoal-650 bg-charcoal-750",
-                copied
-                  ? "text-green-500"
-                  : "text-text-dimmed hover:border-charcoal-600 hover:bg-charcoal-700 hover:text-text-bright"
-              )}
-            >
-              {copied ? (
-                <ClipboardCheckIcon className="size-3.5" />
-              ) : (
-                <ClipboardIcon className="size-3.5" />
-              )}
-            </span>
-          }
-          content={copied ? "Copied!" : "Copy"}
-          className="font-sans"
-          disableHoverableContent
-        />
+        <span onMouseEnter={() => setIsHovered(true)}>{value}</span>
+        <span
+          onClick={copy}
+          onMouseDown={(e) => e.stopPropagation()}
+          className={cn(
+            "absolute -right-6 top-0 z-10 size-6 font-sans",
+            isHovered ? "flex" : "hidden"
+          )}
+        >
+          <SimpleTooltip
+            button={
+              <span
+                className={cn(
+                  "ml-1 flex size-6 items-center justify-center rounded border border-charcoal-650 bg-charcoal-750",
+                  asChild && "p-1",
+                  copied
+                    ? "text-green-500"
+                    : "text-text-dimmed hover:border-charcoal-600 hover:bg-charcoal-700 hover:text-text-bright"
+                )}
+              >
+                {copied ? (
+                  <ClipboardCheckIcon className="size-3.5" />
+                ) : (
+                  <ClipboardIcon className="size-3.5" />
+                )}
+              </span>
+            }
+            content={copied ? "Copied!" : "Copy"}
+            className="font-sans"
+            disableHoverableContent
+            asChild={asChild}
+          />
+        </span>
       </span>
-    </span>
-  );
+    );
+  }
+
+  if (resolvedVariant === "text-below") {
+    return (
+      <SimpleTooltip
+        button={
+          <Button
+            variant="minimal/small"
+            onClick={(e) => {
+              e.stopPropagation();
+              copy();
+            }}
+            className={cn(
+              "cursor-pointer bg-transparent px-1 py-0 text-left text-text-dimmed transition-colors hover:bg-transparent",
+              className
+            )}
+          >
+            <span className="transition-colors group-hover/button:text-text-bright">{value}</span>
+          </Button>
+        }
+        content={copied ? "Copied" : "Copy"}
+        className="px-2 py-1 font-sans"
+        disableHoverableContent
+        open={isHovered || copied}
+        onOpenChange={setIsHovered}
+        asChild
+      />
+    );
+  }
+
+  return null;
 }
diff --git a/apps/webapp/app/components/primitives/DateField.tsx b/apps/webapp/app/components/primitives/DateField.tsx
index dd53eb5d639..1fd6040f86a 100644
--- a/apps/webapp/app/components/primitives/DateField.tsx
+++ b/apps/webapp/app/components/primitives/DateField.tsx
@@ -1,9 +1,11 @@
-import { BellAlertIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import { CalendarDateTime, createCalendar } from "@internationalized/date";
 import { useDateField, useDateSegment } from "@react-aria/datepicker";
-import type { DateFieldState, DateSegment } from "@react-stately/datepicker";
-import { useDateFieldState } from "@react-stately/datepicker";
-import { Granularity } from "@react-types/datepicker";
+import {
+  useDateFieldState,
+  type DateFieldState,
+  type DateSegment,
+} from "@react-stately/datepicker";
+import { type Granularity } from "@react-types/datepicker";
 import { useEffect, useRef, useState } from "react";
 import { cn } from "~/utils/cn";
 import { Button } from "./Buttons";
diff --git a/apps/webapp/app/components/primitives/DateTime.tsx b/apps/webapp/app/components/primitives/DateTime.tsx
index 9ce1b7957cc..5241a976ee7 100644
--- a/apps/webapp/app/components/primitives/DateTime.tsx
+++ b/apps/webapp/app/components/primitives/DateTime.tsx
@@ -1,19 +1,68 @@
 import { GlobeAltIcon, GlobeAmericasIcon } from "@heroicons/react/20/solid";
+import { useRouteLoaderData } from "@remix-run/react";
 import { Laptop } from "lucide-react";
-import { Fragment, type ReactNode, useEffect, useState } from "react";
+import { memo, type ReactNode, useMemo, useSyncExternalStore } from "react";
 import { CopyButton } from "./CopyButton";
 import { useLocales } from "./LocaleProvider";
 import { Paragraph } from "./Paragraph";
 import { SimpleTooltip } from "./Tooltip";
 
+// Cache the browser's local timezone - resolved once and reused
+let cachedLocalTimeZone: string | null = null;
+
+function getLocalTimeZone(): string {
+  if (cachedLocalTimeZone === null) {
+    cachedLocalTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+  }
+  return cachedLocalTimeZone;
+}
+
+// For SSR compatibility: returns "UTC" on server, actual timezone on client
+function subscribeToTimeZone() {
+  // No-op - timezone doesn't change
+  return () => {};
+}
+
+function getTimeZoneSnapshot(): string {
+  return getLocalTimeZone();
+}
+
+function getServerTimeZoneSnapshot(): string {
+  return "UTC";
+}
+
+/**
+ * Hook to get the browser's local timezone.
+ * Uses useSyncExternalStore for SSR compatibility - returns "UTC" on server,
+ * actual timezone on client. The timezone is cached and only resolved once.
+ */
+export function useLocalTimeZone(): string {
+  return useSyncExternalStore(subscribeToTimeZone, getTimeZoneSnapshot, getServerTimeZoneSnapshot);
+}
+
+/**
+ * Hook to get the user's preferred timezone.
+ * Returns the timezone stored in the user's preferences cookie (from root loader),
+ * falling back to the browser's local timezone if not set.
+ */
+export function useUserTimeZone(): string {
+  const rootData = useRouteLoaderData("root") as { timezone?: string } | undefined;
+  const localTimeZone = useLocalTimeZone();
+  // Use stored timezone from cookie, or fall back to browser's local timezone
+  return rootData?.timezone && rootData.timezone !== "UTC" ? rootData.timezone : localTimeZone;
+}
+
 type DateTimeProps = {
   date: Date | string;
   timeZone?: string;
   includeSeconds?: boolean;
   includeTime?: boolean;
+  includeDate?: boolean;
   showTimezone?: boolean;
   showTooltip?: boolean;
+  hideDate?: boolean;
   previousDate?: Date | string | null; // Add optional previous date for comparison
+  hour12?: boolean;
 };
 
 export const DateTime = ({
@@ -21,44 +70,48 @@ export const DateTime = ({
   timeZone,
   includeSeconds = true,
   includeTime = true,
+  includeDate = true,
   showTimezone = false,
   showTooltip = true,
+  hour12 = true,
 }: DateTimeProps) => {
   const locales = useLocales();
-  const [localTimeZone, setLocalTimeZone] = useState<string>("UTC");
-
-  const realDate = typeof date === "string" ? new Date(date) : date;
+  const userTimeZone = useUserTimeZone();
 
-  useEffect(() => {
-    const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
-    setLocalTimeZone(resolvedOptions.timeZone);
-  }, []);
-
-  const tooltipContent = (
-    <TooltipContent
-      realDate={realDate}
-      timeZone={timeZone}
-      localTimeZone={localTimeZone}
-      locales={locales}
-    />
-  );
+  const realDate = useMemo(() => (typeof date === "string" ? new Date(date) : date), [date]);
 
   const formattedDateTime = (
-    <Fragment>
+    <span suppressHydrationWarning>
       {formatDateTime(
         realDate,
-        timeZone ?? localTimeZone,
+        timeZone ?? userTimeZone,
         locales,
         includeSeconds,
-        includeTime
+        includeTime,
+        includeDate,
+        hour12
       ).replace(/\s/g, String.fromCharCode(32))}
       {showTimezone ? ` (${timeZone ?? "UTC"})` : null}
-    </Fragment>
+    </span>
   );
 
   if (!showTooltip) return formattedDateTime;
 
-  return <SimpleTooltip button={formattedDateTime} content={tooltipContent} side="right" />;
+  return (
+    <SimpleTooltip
+      button={formattedDateTime}
+      content={
+        <TooltipContent
+          realDate={realDate}
+          timeZone={timeZone}
+          localTimeZone={userTimeZone}
+          locales={locales}
+        />
+      }
+      side="right"
+      asChild={true}
+    />
+  );
 };
 
 export function formatDateTime(
@@ -66,16 +119,19 @@ export function formatDateTime(
   timeZone: string,
   locales: string[],
   includeSeconds: boolean,
-  includeTime: boolean
+  includeTime: boolean,
+  includeDate: boolean = true,
+  hour12: boolean = true
 ): string {
   return new Intl.DateTimeFormat(locales, {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
+    year: includeDate ? "numeric" : undefined,
+    month: includeDate ? "short" : undefined,
+    day: includeDate ? "numeric" : undefined,
     hour: includeTime ? "numeric" : undefined,
     minute: includeTime ? "numeric" : undefined,
     second: includeTime && includeSeconds ? "numeric" : undefined,
     timeZone,
+    hour12,
   }).format(date);
 }
 
@@ -122,8 +178,9 @@ export function formatDateTimeISO(date: Date, timeZone: string): string {
 }
 
 // New component that only shows date when it changes
-export const SmartDateTime = ({ date, previousDate = null, timeZone = "UTC" }: DateTimeProps) => {
+export const SmartDateTime = ({ date, previousDate = null, hour12 = true }: DateTimeProps) => {
   const locales = useLocales();
+  const userTimeZone = useUserTimeZone();
   const realDate = typeof date === "string" ? new Date(date) : date;
   const realPrevDate = previousDate
     ? typeof previousDate === "string"
@@ -131,31 +188,19 @@ export const SmartDateTime = ({ date, previousDate = null, timeZone = "UTC" }: D
       : previousDate
     : null;
 
-  // Initial formatted values
-  const initialTimeOnly = formatTimeOnly(realDate, timeZone, locales);
-  const initialWithDate = formatSmartDateTime(realDate, timeZone, locales);
-
-  // State for the formatted time
-  const [formattedDateTime, setFormattedDateTime] = useState<string>(
-    realPrevDate && isSameDay(realDate, realPrevDate) ? initialTimeOnly : initialWithDate
-  );
+  // Check if we should show the date
+  const showDatePart = !realPrevDate || !isSameDay(realDate, realPrevDate);
 
-  useEffect(() => {
-    const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
-    const userTimeZone = resolvedOptions.timeZone;
+  // Format with appropriate function
+  const formattedDateTime = showDatePart
+    ? formatSmartDateTime(realDate, userTimeZone, locales, hour12)
+    : formatTimeOnly(realDate, userTimeZone, locales, hour12);
 
-    // Check if we should show the date
-    const showDatePart = !realPrevDate || !isSameDay(realDate, realPrevDate);
-
-    // Format with appropriate function
-    setFormattedDateTime(
-      showDatePart
-        ? formatSmartDateTime(realDate, userTimeZone, locales)
-        : formatTimeOnly(realDate, userTimeZone, locales)
-    );
-  }, [locales, realDate, realPrevDate]);
-
-  return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;
+  return (
+    <span suppressHydrationWarning>
+      {formattedDateTime.replace(/\s/g, String.fromCharCode(32))}
+    </span>
+  );
 };
 
 // Helper function to check if two dates are on the same day
@@ -168,7 +213,12 @@ function isSameDay(date1: Date, date2: Date): boolean {
 }
 
 // Format with date and time
-function formatSmartDateTime(date: Date, timeZone: string, locales: string[]): string {
+function formatSmartDateTime(
+  date: Date,
+  timeZone: string,
+  locales: string[],
+  hour12: boolean = true
+): string {
   return new Intl.DateTimeFormat(locales, {
     month: "short",
     day: "numeric",
@@ -178,29 +228,40 @@ function formatSmartDateTime(date: Date, timeZone: string, locales: string[]): s
     timeZone,
     // @ts-ignore fractionalSecondDigits works in most modern browsers
     fractionalSecondDigits: 3,
+    hour12,
   }).format(date);
 }
 
 // Format time only
-function formatTimeOnly(date: Date, timeZone: string, locales: string[]): string {
+function formatTimeOnly(
+  date: Date,
+  timeZone: string,
+  locales: string[],
+  hour12: boolean = true
+): string {
   return new Intl.DateTimeFormat(locales, {
-    hour: "numeric",
+    hour: "2-digit",
     minute: "numeric",
     second: "numeric",
     timeZone,
     // @ts-ignore fractionalSecondDigits works in most modern browsers
     fractionalSecondDigits: 3,
+    hour12,
   }).format(date);
 }
 
-export const DateTimeAccurate = ({
+const DateTimeAccurateInner = ({
   date,
-  timeZone = "UTC",
+  timeZone,
   previousDate = null,
   showTooltip = true,
+  hideDate = false,
+  hour12 = true,
 }: DateTimeProps) => {
   const locales = useLocales();
-  const [localTimeZone, setLocalTimeZone] = useState<string>("UTC");
+  const userTimeZone = useUserTimeZone();
+  // Use provided timeZone prop if available, otherwise fall back to user's preferred timezone
+  const displayTimeZone = timeZone ?? userTimeZone;
   const realDate = typeof date === "string" ? new Date(date) : date;
   const realPrevDate = previousDate
     ? typeof previousDate === "string"
@@ -208,69 +269,113 @@ export const DateTimeAccurate = ({
       : previousDate
     : null;
 
-  useEffect(() => {
-    const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
-    setLocalTimeZone(resolvedOptions.timeZone);
-  }, []);
-
   // Smart formatting based on whether date changed
-  const formattedDateTime = realPrevDate
-    ? isSameDay(realDate, realPrevDate)
-      ? formatTimeOnly(realDate, localTimeZone, locales)
-      : formatDateTimeAccurate(realDate, localTimeZone, locales)
-    : formatDateTimeAccurate(realDate, localTimeZone, locales);
+  const formattedDateTime = useMemo(() => {
+    return hideDate
+      ? formatTimeOnly(realDate, displayTimeZone, locales, hour12)
+      : realPrevDate
+      ? isSameDay(realDate, realPrevDate)
+        ? formatTimeOnly(realDate, displayTimeZone, locales, hour12)
+        : formatDateTimeAccurate(realDate, displayTimeZone, locales, hour12)
+      : formatDateTimeAccurate(realDate, displayTimeZone, locales, hour12);
+  }, [realDate, displayTimeZone, locales, hour12, hideDate, previousDate]);
 
   if (!showTooltip)
-    return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;
+    return (
+      <span suppressHydrationWarning>
+        {formattedDateTime.replace(/\s/g, String.fromCharCode(32))}
+      </span>
+    );
 
   const tooltipContent = (
     <TooltipContent
       realDate={realDate}
       timeZone={timeZone}
-      localTimeZone={localTimeZone}
+      localTimeZone={userTimeZone}
       locales={locales}
     />
   );
 
   return (
     <SimpleTooltip
-      button={<Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>}
+      button={
+        <span suppressHydrationWarning>
+          {formattedDateTime.replace(/\s/g, String.fromCharCode(32))}
+        </span>
+      }
       content={tooltipContent}
       side="right"
+      asChild={true}
     />
   );
 };
 
-function formatDateTimeAccurate(date: Date, timeZone: string, locales: string[]): string {
-  const formattedDateTime = new Intl.DateTimeFormat(locales, {
+function areDateTimePropsEqual(prev: DateTimeProps, next: DateTimeProps): boolean {
+  // Compare Date objects by timestamp value, not reference
+  const prevTime = prev.date instanceof Date ? prev.date.getTime() : prev.date;
+  const nextTime = next.date instanceof Date ? next.date.getTime() : next.date;
+  if (prevTime !== nextTime) return false;
+
+  const prevPrevTime =
+    prev.previousDate instanceof Date ? prev.previousDate.getTime() : prev.previousDate;
+  const nextPrevTime =
+    next.previousDate instanceof Date ? next.previousDate.getTime() : next.previousDate;
+  if (prevPrevTime !== nextPrevTime) return false;
+
+  return (
+    prev.timeZone === next.timeZone &&
+    prev.showTooltip === next.showTooltip &&
+    prev.hideDate === next.hideDate &&
+    prev.hour12 === next.hour12
+  );
+}
+
+export const DateTimeAccurate = memo(DateTimeAccurateInner, areDateTimePropsEqual);
+
+function formatDateTimeAccurate(
+  date: Date,
+  timeZone: string,
+  locales: string[],
+  hour12: boolean = true
+): string {
+  const datePart = new Intl.DateTimeFormat(locales, {
     month: "short",
     day: "numeric",
+    timeZone,
+  }).format(date);
+
+  const timePart = new Intl.DateTimeFormat(locales, {
     hour: "numeric",
     minute: "numeric",
     second: "numeric",
     timeZone,
     // @ts-ignore fractionalSecondDigits works in most modern browsers
     fractionalSecondDigits: 3,
+    hour12,
   }).format(date);
 
-  return formattedDateTime;
+  return `${datePart} ${timePart}`;
 }
 
-export const DateTimeShort = ({ date, timeZone = "UTC" }: DateTimeProps) => {
+export const DateTimeShort = ({ date, hour12 = true }: DateTimeProps) => {
   const locales = useLocales();
+  const userTimeZone = useUserTimeZone();
   const realDate = typeof date === "string" ? new Date(date) : date;
-  const initialFormattedDateTime = formatDateTimeShort(realDate, timeZone, locales);
-  const [formattedDateTime, setFormattedDateTime] = useState<string>(initialFormattedDateTime);
-
-  useEffect(() => {
-    const resolvedOptions = Intl.DateTimeFormat().resolvedOptions();
-    setFormattedDateTime(formatDateTimeShort(realDate, resolvedOptions.timeZone, locales));
-  }, [locales, realDate]);
+  const formattedDateTime = formatDateTimeShort(realDate, userTimeZone, locales, hour12);
 
-  return <Fragment>{formattedDateTime.replace(/\s/g, String.fromCharCode(32))}</Fragment>;
+  return (
+    <span suppressHydrationWarning>
+      {formattedDateTime.replace(/\s/g, String.fromCharCode(32))}
+    </span>
+  );
 };
 
-function formatDateTimeShort(date: Date, timeZone: string, locales: string[]): string {
+function formatDateTimeShort(
+  date: Date,
+  timeZone: string,
+  locales: string[],
+  hour12: boolean = true
+): string {
   const formattedDateTime = new Intl.DateTimeFormat(locales, {
     hour: "numeric",
     minute: "numeric",
@@ -278,6 +383,7 @@ function formatDateTimeShort(date: Date, timeZone: string, locales: string[]): s
     timeZone,
     // @ts-ignore fractionalSecondDigits works in most modern browsers
     fractionalSecondDigits: 3,
+    hour12,
   }).format(date);
 
   return formattedDateTime;
@@ -296,14 +402,17 @@ function DateTimeTooltipContent({
   isoDateTime,
   icon,
 }: DateTimeTooltipContentProps) {
-  const getUtcOffset = () => {
-    if (title !== "Local") return "";
-    const offset = -new Date().getTimezoneOffset();
-    const sign = offset >= 0 ? "+" : "-";
-    const hours = Math.abs(Math.floor(offset / 60));
-    const minutes = Math.abs(offset % 60);
-    return `(UTC ${sign}${hours}${minutes ? `:${minutes.toString().padStart(2, "0")}` : ""})`;
-  };
+  const getUtcOffset = useMemo(
+    () => () => {
+      if (title !== "Local") return "";
+      const offset = -new Date().getTimezoneOffset();
+      const sign = offset >= 0 ? "+" : "-";
+      const hours = Math.abs(Math.floor(offset / 60));
+      const minutes = Math.abs(offset % 60);
+      return `(UTC ${sign}${hours}${minutes ? `:${minutes.toString().padStart(2, "0")}` : ""})`;
+    },
+    [title]
+  );
 
   return (
     <div className="flex flex-col gap-1">
@@ -339,20 +448,20 @@ function TooltipContent({
         {timeZone && timeZone !== "UTC" && (
           <DateTimeTooltipContent
             title={timeZone}
-            dateTime={formatDateTime(realDate, timeZone, locales, true, true)}
+            dateTime={formatDateTime(realDate, timeZone, locales, true, true, true)}
             isoDateTime={formatDateTimeISO(realDate, timeZone)}
             icon={<GlobeAmericasIcon className="size-4 text-purple-500" />}
           />
         )}
         <DateTimeTooltipContent
           title="UTC"
-          dateTime={formatDateTime(realDate, "UTC", locales, true, true)}
+          dateTime={formatDateTime(realDate, "UTC", locales, true, true, true)}
           isoDateTime={formatDateTimeISO(realDate, "UTC")}
           icon={<GlobeAltIcon className="size-4 text-blue-500" />}
         />
         <DateTimeTooltipContent
           title="Local"
-          dateTime={formatDateTime(realDate, localTimeZone, locales, true, true)}
+          dateTime={formatDateTime(realDate, localTimeZone, locales, true, true, true)}
           isoDateTime={formatDateTimeISO(realDate, localTimeZone)}
           icon={<Laptop className="size-4 text-green-500" />}
         />
diff --git a/apps/webapp/app/components/primitives/DateTimePicker.tsx b/apps/webapp/app/components/primitives/DateTimePicker.tsx
new file mode 100644
index 00000000000..20e62caf0e1
--- /dev/null
+++ b/apps/webapp/app/components/primitives/DateTimePicker.tsx
@@ -0,0 +1,145 @@
+"use client";
+
+import * as React from "react";
+import { ChevronUpDownIcon } from "@heroicons/react/20/solid";
+import { format } from "date-fns";
+import { Calendar } from "./Calendar";
+import { Popover, PopoverContent, PopoverTrigger } from "./Popover";
+import { Button } from "./Buttons";
+import { cn } from "~/utils/cn";
+import { SimpleTooltip } from "./Tooltip";
+import { XIcon } from "lucide-react";
+
+type DateTimePickerProps = {
+  label: string;
+  value?: Date;
+  onChange?: (date: Date | undefined) => void;
+  showSeconds?: boolean;
+  showNowButton?: boolean;
+  showClearButton?: boolean;
+  showInlineLabel?: boolean;
+  className?: string;
+};
+
+export function DateTimePicker({
+  label,
+  value,
+  onChange,
+  showSeconds = true,
+  showNowButton = false,
+  showClearButton = false,
+  showInlineLabel = false,
+  className,
+}: DateTimePickerProps) {
+  const [open, setOpen] = React.useState(false);
+
+  // Extract time parts from value
+  const hours = value ? value.getHours().toString().padStart(2, "0") : "";
+  const minutes = value ? value.getMinutes().toString().padStart(2, "0") : "";
+  const seconds = value ? value.getSeconds().toString().padStart(2, "0") : "";
+  const timeValue = showSeconds ? `${hours}:${minutes}:${seconds}` : `${hours}:${minutes}`;
+
+  const handleDateSelect = (date: Date | undefined) => {
+    if (date) {
+      // Preserve the time from the current value if it exists
+      if (value) {
+        date.setHours(value.getHours());
+        date.setMinutes(value.getMinutes());
+        date.setSeconds(value.getSeconds());
+      }
+      onChange?.(date);
+    } else {
+      onChange?.(undefined);
+    }
+    setOpen(false);
+  };
+
+  const handleTimeChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const timeString = e.target.value;
+    if (!timeString) return;
+
+    const [h, m, s] = timeString.split(":").map(Number);
+    const newDate = value ? new Date(value) : new Date();
+    newDate.setHours(h || 0);
+    newDate.setMinutes(m || 0);
+    newDate.setSeconds(s || 0);
+    onChange?.(newDate);
+  };
+
+  const handleNowClick = () => {
+    onChange?.(new Date());
+  };
+
+  const handleClearClick = () => {
+    onChange?.(undefined);
+  };
+
+  return (
+    <div className={cn("flex items-center gap-2", className)}>
+      {showInlineLabel && (
+        <span className="w-6 shrink-0 text-right text-xxs text-charcoal-500">{label}</span>
+      )}
+      <Popover open={open} onOpenChange={setOpen}>
+        <PopoverTrigger asChild>
+          <button
+            type="button"
+            className={cn(
+              "flex h-[1.8rem] w-full items-center justify-between gap-2 whitespace-nowrap rounded border border-charcoal-650 bg-charcoal-750 px-2 text-xs tabular-nums transition hover:border-charcoal-600",
+              value ? "text-text-bright" : "text-text-dimmed"
+            )}
+          >
+            {value ? format(value, "yyyy/MM/dd") : "Select date"}
+            <ChevronUpDownIcon className="size-3.5 text-text-dimmed" />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent className="w-auto p-0" align="start">
+          <Calendar
+            mode="single"
+            selected={value}
+            onSelect={handleDateSelect}
+            captionLayout="dropdown"
+          />
+        </PopoverContent>
+      </Popover>
+      <input
+        type="time"
+        step={showSeconds ? "1" : "60"}
+        value={value ? timeValue : ""}
+        onChange={handleTimeChange}
+        className={cn(
+          "h-[1.8rem] rounded border border-charcoal-650 bg-charcoal-750 px-2 text-xs tabular-nums transition hover:border-charcoal-600",
+          value ? "text-text-bright" : "text-text-dimmed",
+          "focus:border-charcoal-500 focus:outline-none",
+          "[&::-webkit-calendar-picker-indicator]:hidden [&::-webkit-calendar-picker-indicator]:appearance-none"
+        )}
+        aria-label={`${label} time`}
+      />
+      {showNowButton && (
+        <Button
+          type="button"
+          variant="secondary/small"
+          className="h-[1.8rem]"
+          onClick={handleNowClick}
+        >
+          Now
+        </Button>
+      )}
+      {showClearButton && (
+        <SimpleTooltip
+          button={
+            <button
+              type="button"
+              className="flex h-[1.8rem] items-center justify-center px-1 text-text-dimmed transition hover:text-text-bright"
+              onClick={handleClearClick}
+            >
+              <XIcon className="size-3.5" />
+            </button>
+          }
+          content="Clear"
+          disableHoverableContent
+          asChild
+        />
+      )}
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/Dialog.tsx b/apps/webapp/app/components/primitives/Dialog.tsx
index 7c28193717b..48fc59cfa78 100644
--- a/apps/webapp/app/components/primitives/Dialog.tsx
+++ b/apps/webapp/app/components/primitives/Dialog.tsx
@@ -38,14 +38,18 @@ const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
   React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
     showCloseButton?: boolean;
+    fullscreen?: boolean;
   }
->(({ className, children, showCloseButton = true, ...props }, ref) => (
+>(({ className, children, showCloseButton = true, fullscreen = false, ...props }, ref) => (
   <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed z-50 grid w-full gap-4 rounded-b-lg border bg-background-dimmed px-4 pb-4 pt-2.5 shadow-lg animate-in data-[state=open]:fade-in-90 data-[state=open]:slide-in-from-bottom-10 sm:max-w-lg sm:rounded-lg sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0",
+        "fixed z-50 grid gap-4 border bg-background-dimmed shadow-lg animate-in data-[state=open]:fade-in-90",
+        fullscreen
+          ? "inset-6 rounded-lg pt-2.5 px-4 pb-4"
+          : "w-full rounded-b-lg px-4 pb-4 pt-2.5 data-[state=open]:slide-in-from-bottom-10 sm:max-w-lg sm:rounded-lg sm:zoom-in-90 data-[state=open]:sm:slide-in-from-bottom-0",
         className
       )}
       {...props}
@@ -117,4 +121,6 @@ export {
   DialogFooter,
   DialogTitle,
   DialogDescription,
+  DialogPortal,
+  DialogOverlay
 };
diff --git a/apps/webapp/app/components/primitives/FormButtons.tsx b/apps/webapp/app/components/primitives/FormButtons.tsx
index e7d6db75d2d..ab4e07df455 100644
--- a/apps/webapp/app/components/primitives/FormButtons.tsx
+++ b/apps/webapp/app/components/primitives/FormButtons.tsx
@@ -3,10 +3,12 @@ import { cn } from "~/utils/cn";
 export function FormButtons({
   cancelButton,
   confirmButton,
+  defaultAction,
   className,
 }: {
   cancelButton?: React.ReactNode;
-  confirmButton: React.ReactNode;
+  confirmButton?: React.ReactNode;
+  defaultAction?: { name: string; value: string; disabled?: boolean };
   className?: string;
 }) {
   return (
@@ -16,7 +18,18 @@ export function FormButtons({
         className
       )}
     >
-      {cancelButton ? cancelButton : <div />} {confirmButton}
+      {defaultAction && (
+        <button
+          type="submit"
+          name={defaultAction.name}
+          value={defaultAction.value}
+          disabled={defaultAction.disabled}
+          className="hidden"
+          tabIndex={-1}
+          aria-hidden="true"
+        />
+      )}
+      {cancelButton ? cancelButton : <div />} {confirmButton ?? null}
     </div>
   );
 }
diff --git a/apps/webapp/app/components/primitives/Input.tsx b/apps/webapp/app/components/primitives/Input.tsx
index 5b421fd3b9c..3364e48bed2 100644
--- a/apps/webapp/app/components/primitives/Input.tsx
+++ b/apps/webapp/app/components/primitives/Input.tsx
@@ -7,7 +7,7 @@ const containerBase =
   "has-[:focus-visible]:outline-none has-[:focus-visible]:ring-1 has-[:focus-visible]:ring-charcoal-650 has-[:focus-visible]:ring-offset-0 has-[:focus]:border-ring has-[:focus]:outline-none has-[:focus]:ring-1 has-[:focus]:ring-ring has-[:disabled]:cursor-not-allowed has-[:disabled]:opacity-50 ring-offset-background transition cursor-text";
 
 const inputBase =
-  "h-full w-full text-text-bright bg-transparent file:border-0 file:bg-transparent file:text-base file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-0 disabled:cursor-not-allowed outline-none ring-0 border-none";
+  "h-full w-full text-text-bright bg-transparent file:border-0 file:bg-transparent file:text-base file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-0 disabled:cursor-not-allowed outline-none ring-0 border-none [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:m-0 [&::-webkit-inner-spin-button]:m-0 [&]:[-moz-appearance:textfield]";
 
 const variants = {
   large: {
@@ -44,6 +44,24 @@ const variants = {
     iconSize: "size-3 ml-0.5",
     accessory: "pr-0.5",
   },
+  "outline/large": {
+    container: "px-1 h-10 w-full rounded border border-grid-bright hover:border-charcoal-550",
+    input: "px-2 rounded text-sm",
+    iconSize: "size-4 ml-1",
+    accessory: "pr-1",
+  },
+  "outline/medium": {
+    container: "px-1 h-8 w-full rounded border border-grid-bright hover:border-charcoal-550",
+    input: "px-1 rounded text-sm",
+    iconSize: "size-4 ml-0.5",
+    accessory: "pr-1",
+  },
+  "outline/small": {
+    container: "px-1 h-6 w-full rounded border border-grid-bright hover:border-charcoal-550",
+    input: "px-1 rounded text-xs",
+    iconSize: "size-3 ml-0.5",
+    accessory: "pr-0.5",
+  },
 };
 
 export type InputProps = React.InputHTMLAttributes<HTMLInputElement> & {
diff --git a/apps/webapp/app/components/primitives/InputNumberStepper.tsx b/apps/webapp/app/components/primitives/InputNumberStepper.tsx
new file mode 100644
index 00000000000..f4aafd5cae1
--- /dev/null
+++ b/apps/webapp/app/components/primitives/InputNumberStepper.tsx
@@ -0,0 +1,220 @@
+import { MinusIcon, PlusIcon } from "@heroicons/react/20/solid";
+import { type ChangeEvent, useRef } from "react";
+import { cn } from "~/utils/cn";
+
+type InputNumberStepperProps = Omit<JSX.IntrinsicElements["input"], "min" | "max" | "step"> & {
+  step?: number;
+  min?: number;
+  max?: number;
+  round?: boolean;
+  controlSize?: "base" | "large";
+};
+
+export function InputNumberStepper({
+  value,
+  onChange,
+  step = 50,
+  min,
+  max,
+  round = true,
+  controlSize = "base",
+  name,
+  id,
+  disabled = false,
+  readOnly = false,
+  className,
+  placeholder = "Type a number",
+  ...props
+}: InputNumberStepperProps) {
+  const inputRef = useRef<HTMLInputElement>(null);
+
+  const handleStepUp = () => {
+    if (!inputRef.current || disabled) return;
+
+    // If rounding is enabled, ensure we start from a rounded base before stepping
+    if (round) {
+      // If field is empty, treat as 0 (or min if provided) before stepping up
+      if (inputRef.current.value === "") {
+        inputRef.current.value = String(min ?? 0);
+      } else {
+        commitRoundedFromInput();
+      }
+    }
+    inputRef.current.stepUp();
+    const event = new Event("change", { bubbles: true });
+    inputRef.current.dispatchEvent(event);
+  };
+
+  const handleStepDown = () => {
+    if (!inputRef.current || disabled) return;
+
+    // If rounding is enabled, ensure we start from a rounded base before stepping
+    if (round) {
+      // If field is empty, treat as 0 (or min if provided) before stepping down
+      if (inputRef.current.value === "") {
+        inputRef.current.value = String(min ?? 0);
+      } else {
+        commitRoundedFromInput();
+      }
+    }
+    inputRef.current.stepDown();
+    const event = new Event("change", { bubbles: true });
+    inputRef.current.dispatchEvent(event);
+  };
+
+  const numericValue = value === "" ? NaN : (value as number);
+  const isMinDisabled = min !== undefined && !Number.isNaN(numericValue) && numericValue <= min;
+  const isMaxDisabled = max !== undefined && !Number.isNaN(numericValue) && numericValue >= max;
+
+  function clamp(val: number): number {
+    if (Number.isNaN(val)) return typeof value === "number" ? value : min ?? 0;
+    let next = val;
+    if (min !== undefined) next = Math.max(min, next);
+    if (max !== undefined) next = Math.min(max, next);
+    return next;
+  }
+
+  function roundToStep(val: number): number {
+    if (step <= 0) return val;
+    const base = min ?? 0;
+    const shifted = val - base;
+    const quotient = shifted / step;
+    const floored = Math.floor(quotient);
+    const ceiled = Math.ceil(quotient);
+    const down = base + floored * step;
+    const up = base + ceiled * step;
+    const distDown = Math.abs(val - down);
+    const distUp = Math.abs(up - val);
+    return distUp < distDown ? up : down;
+  }
+
+  function commitRoundedFromInput() {
+    if (!inputRef.current || disabled || readOnly) return;
+    const el = inputRef.current;
+    const raw = el.value;
+    if (raw === "") return; // do not coerce empty to 0; keep placeholder visible
+    const numeric = Number(raw);
+    if (Number.isNaN(numeric)) return; // ignore non-numeric
+    const rounded = clamp(roundToStep(numeric));
+    if (String(rounded) === String(value)) return;
+    // Update the real input's value for immediate UI feedback
+    el.value = String(rounded);
+    // Invoke consumer onChange with the real element as target/currentTarget
+    onChange?.({
+      target: el,
+      currentTarget: el,
+    } as unknown as ChangeEvent<HTMLInputElement>);
+  }
+
+  const sizeStyles = {
+    base: {
+      container: "h-9",
+      input: "text-sm px-3",
+      button: "size-6",
+      icon: "size-3.5",
+      gap: "gap-1 pr-1.5",
+    },
+    large: {
+      container: "h-11 rounded-md",
+      input: "text-base px-3.5",
+      button: "size-8",
+      icon: "size-5",
+      gap: "gap-[0.3125rem] pr-[0.3125rem]",
+    },
+  } as const;
+
+  const size = sizeStyles[controlSize];
+
+  return (
+    <div
+      className={cn(
+        "flex items-center rounded border border-charcoal-600 bg-tertiary transition hover:border-charcoal-550/80 hover:bg-charcoal-600/80",
+        size.container,
+        "has-[:focus-visible]:outline has-[:focus-visible]:outline-1 has-[:focus-visible]:outline-offset-0 has-[:focus-visible]:outline-text-link",
+        disabled && "cursor-not-allowed opacity-50",
+        className
+      )}
+    >
+      <input
+        ref={inputRef}
+        type="number"
+        id={id}
+        name={name}
+        value={value}
+        placeholder={placeholder}
+        onChange={(e) => {
+          // Allow empty string to pass through so user can clear the field
+          if (e.currentTarget.value === "") {
+            // reflect emptiness in the input and notify consumer as empty
+            if (inputRef.current) inputRef.current.value = "";
+            onChange?.({
+              target: e.currentTarget,
+              currentTarget: e.currentTarget,
+            } as ChangeEvent<HTMLInputElement>);
+            return;
+          }
+          onChange?.(e);
+        }}
+        onBlur={(e) => {
+          // If blur is caused by clicking our step buttons, we prevent pointerdown
+          // so blur shouldn't fire. This is for safety in case of keyboard focus move.
+          if (round) commitRoundedFromInput();
+        }}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" && round) {
+            e.preventDefault();
+            commitRoundedFromInput();
+          }
+        }}
+        step={step}
+        min={min}
+        max={max}
+        disabled={disabled}
+        readOnly={readOnly}
+        className={cn(
+          "placeholder:text-muted-foreground h-full grow border-0 bg-transparent text-left text-text-bright outline-none ring-0 focus:border-0 focus:outline-none focus:ring-0 disabled:cursor-not-allowed",
+          size.input,
+          // Hide number input arrows
+          "[type=number]:border-0 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+        )}
+        {...props}
+      />
+
+      <div className={cn("flex items-center", size.gap)}>
+        <button
+          type="button"
+          onClick={handleStepDown}
+          onPointerDown={(e) => e.preventDefault()}
+          disabled={disabled || isMinDisabled}
+          aria-label={`Decrease by ${step}`}
+          className={cn(
+            "flex items-center justify-center rounded border border-error/30 bg-error/20 transition",
+            size.button,
+            "hover:border-error/50 hover:bg-error/30",
+            "disabled:cursor-not-allowed disabled:opacity-40",
+            "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-link"
+          )}
+        >
+          <MinusIcon className={cn("text-error", size.icon)} />
+        </button>
+
+        <button
+          type="button"
+          onClick={handleStepUp}
+          onPointerDown={(e) => e.preventDefault()}
+          disabled={disabled || isMaxDisabled}
+          aria-label={`Increase by ${step}`}
+          className={cn(
+            "flex items-center justify-center rounded border border-success/30 bg-success/10 transition",
+            size.button,
+            "hover:border-success/40 hover:bg-success/20",
+            "disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent",
+            "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-text-link"
+          )}
+        >
+          <PlusIcon className={cn("text-success", size.icon)} />
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/LoadingBarDivider.tsx b/apps/webapp/app/components/primitives/LoadingBarDivider.tsx
index ee64ac4fc5a..52b4ff1da9c 100644
--- a/apps/webapp/app/components/primitives/LoadingBarDivider.tsx
+++ b/apps/webapp/app/components/primitives/LoadingBarDivider.tsx
@@ -1,13 +1,15 @@
 import { AnimatePresence, useAnimate, usePresence } from "framer-motion";
 import { useEffect } from "react";
+import { cn } from "~/utils/cn";
 
 type LoadingBarDividerProps = {
   isLoading: boolean;
+  className?: string;
 };
 
-export function LoadingBarDivider({ isLoading }: LoadingBarDividerProps) {
+export function LoadingBarDivider({ isLoading, className }: LoadingBarDividerProps) {
   return (
-    <div className="relative h-px w-full overflow-hidden bg-grid-bright">
+    <div className={cn("relative h-px w-full overflow-hidden bg-grid-bright", className)}>
       <AnimationDivider isLoading={isLoading} />
     </div>
   );
diff --git a/apps/webapp/app/components/primitives/MiddleTruncate.tsx b/apps/webapp/app/components/primitives/MiddleTruncate.tsx
new file mode 100644
index 00000000000..c116205aed9
--- /dev/null
+++ b/apps/webapp/app/components/primitives/MiddleTruncate.tsx
@@ -0,0 +1,168 @@
+import { useRef, useState, useLayoutEffect, useCallback } from "react";
+import { cn } from "~/utils/cn";
+import { SimpleTooltip } from "./Tooltip";
+
+type MiddleTruncateProps = {
+  text: string;
+  className?: string;
+};
+
+/**
+ * A component that truncates text in the middle, showing the beginning and end.
+ * Shows the full text in a tooltip on hover when truncated.
+ *
+ * Example: "namespace:category:subcategory:task-name" becomes "namespace:cat…task-name"
+ */
+export function MiddleTruncate({ text, className }: MiddleTruncateProps) {
+  const containerRef = useRef<HTMLSpanElement>(null);
+  const measureRef = useRef<HTMLSpanElement>(null);
+  const [displayText, setDisplayText] = useState(text);
+  const [isTruncated, setIsTruncated] = useState(false);
+
+  const calculateTruncation = useCallback(() => {
+    const container = containerRef.current;
+    const measure = measureRef.current;
+    if (!container || !measure) return;
+
+    const parent = container.parentElement;
+    if (!parent) return;
+
+    // Get the available width from the parent container
+    const parentStyle = getComputedStyle(parent);
+    const availableWidth =
+      parent.clientWidth -
+      parseFloat(parentStyle.paddingLeft) -
+      parseFloat(parentStyle.paddingRight);
+
+    // Measure full text width
+    measure.textContent = text;
+    const fullTextWidth = measure.offsetWidth;
+
+    // If text fits, no truncation needed
+    if (fullTextWidth <= availableWidth) {
+      setDisplayText(text);
+      setIsTruncated(false);
+      return;
+    }
+
+    // Text needs truncation - find optimal split
+    const ellipsis = "…";
+    measure.textContent = ellipsis;
+    const ellipsisWidth = measure.offsetWidth;
+
+    const targetWidth = availableWidth - ellipsisWidth - 4; // small buffer
+
+    if (targetWidth <= 0) {
+      setDisplayText(ellipsis);
+      setIsTruncated(true);
+      return;
+    }
+
+    // Incrementally find the optimal character counts
+    let startChars = 0;
+    let endChars = 0;
+
+    // Alternate adding characters from start and end
+    while (startChars + endChars < text.length) {
+      // Try adding to start
+      const testStart = text.slice(0, startChars + 1);
+      const testEnd = endChars > 0 ? text.slice(-endChars) : "";
+      measure.textContent = testStart + ellipsis + testEnd;
+
+      if (measure.offsetWidth > targetWidth) break;
+      startChars++;
+
+      if (startChars + endChars >= text.length) break;
+
+      // Try adding to end
+      const newTestEnd = text.slice(-(endChars + 1));
+      measure.textContent = text.slice(0, startChars) + ellipsis + newTestEnd;
+
+      if (measure.offsetWidth > targetWidth) break;
+      endChars++;
+    }
+
+    // Ensure minimum characters on each side for readability
+    const minChars = 4;
+    const prevStartChars = startChars;
+    const prevEndChars = endChars;
+
+    if (startChars < minChars && text.length > minChars * 2 + 1) {
+      startChars = minChars;
+    }
+    if (endChars < minChars && text.length > minChars * 2 + 1) {
+      endChars = minChars;
+    }
+
+    // Re-measure after enforcing minChars to prevent overflow
+    if (startChars !== prevStartChars || endChars !== prevEndChars) {
+      measure.textContent = text.slice(0, startChars) + ellipsis + text.slice(-endChars);
+      if (measure.offsetWidth > targetWidth) {
+        // Revert to previous values if minChars enforcement causes overflow
+        startChars = prevStartChars;
+        endChars = prevEndChars;
+      }
+    }
+
+    // If combined chars would exceed text length, show full text
+    if (startChars + endChars >= text.length) {
+      setDisplayText(text);
+      setIsTruncated(false);
+      return;
+    }
+
+    const result = text.slice(0, startChars) + ellipsis + text.slice(-endChars);
+    setDisplayText(result);
+    setIsTruncated(true);
+  }, [text]);
+
+  useLayoutEffect(() => {
+    calculateTruncation();
+
+    // Recalculate on resize (guard for jsdom/older browsers)
+    if (typeof ResizeObserver === "undefined") {
+      return;
+    }
+
+    const resizeObserver = new ResizeObserver(() => {
+      calculateTruncation();
+    });
+
+    const container = containerRef.current;
+    if (container?.parentElement) {
+      resizeObserver.observe(container.parentElement);
+    }
+
+    return () => {
+      resizeObserver.disconnect();
+    };
+  }, [calculateTruncation]);
+
+  const content = (
+    <span
+      ref={containerRef}
+      className={cn("block", isTruncated && "min-w-[360px]", className)}
+    >
+      {/* Hidden span for measuring text width */}
+      <span
+        ref={measureRef}
+        className="invisible absolute whitespace-nowrap"
+        aria-hidden="true"
+      />
+      {displayText}
+    </span>
+  );
+
+  if (isTruncated) {
+    return (
+      <SimpleTooltip
+        button={content}
+        content={<span className="max-w-xs break-all font-mono text-xs">{text}</span>}
+        side="top"
+        asChild
+      />
+    );
+  }
+
+  return content;
+}
diff --git a/apps/webapp/app/components/primitives/Paragraph.tsx b/apps/webapp/app/components/primitives/Paragraph.tsx
index 971ce3b4e5c..9d699cc4b95 100644
--- a/apps/webapp/app/components/primitives/Paragraph.tsx
+++ b/apps/webapp/app/components/primitives/Paragraph.tsx
@@ -17,6 +17,10 @@ const paragraphVariants = {
     text: "font-sans text-sm font-normal text-text-bright",
     spacing: "mb-2",
   },
+  "small/dimmed": {
+    text: "font-sans text-sm font-normal text-text-dimmed",
+    spacing: "mb-2",
+  },
   "extra-small": {
     text: "font-sans text-xs font-normal text-text-dimmed",
     spacing: "mb-1.5",
@@ -25,6 +29,14 @@ const paragraphVariants = {
     text: "font-sans text-xs font-normal text-text-bright",
     spacing: "mb-1.5",
   },
+  "extra-small/dimmed": {
+    text: "font-sans text-xs font-normal text-text-dimmed",
+    spacing: "mb-1.5",
+  },
+  "extra-small/dimmed/mono": {
+    text: "font-mono text-xs font-normal text-text-dimmed",
+    spacing: "mb-1.5",
+  },
   "extra-small/mono": {
     text: "font-mono text-xs font-normal text-text-dimmed",
     spacing: "mb-1.5",
diff --git a/apps/webapp/app/components/primitives/Popover.tsx b/apps/webapp/app/components/primitives/Popover.tsx
index 22156927f38..63ba99f6d7d 100644
--- a/apps/webapp/app/components/primitives/Popover.tsx
+++ b/apps/webapp/app/components/primitives/Popover.tsx
@@ -5,9 +5,10 @@ import { EllipsisVerticalIcon } from "@heroicons/react/24/solid";
 import * as PopoverPrimitive from "@radix-ui/react-popover";
 import * as React from "react";
 import { DropdownIcon } from "~/assets/icons/DropdownIcon";
+import { Link } from "@remix-run/react";
 import * as useShortcutKeys from "~/hooks/useShortcutKeys";
 import { cn } from "~/utils/cn";
-import { type ButtonContentPropsType, LinkButton } from "./Buttons";
+import { type ButtonContentPropsType, Button, ButtonContent } from "./Buttons";
 import { Paragraph, type ParagraphVariant } from "./Paragraph";
 import { ShortcutKey } from "./ShortcutKey";
 import { type RenderIcon } from "./Icon";
@@ -52,42 +53,82 @@ function PopoverSectionHeader({
   );
 }
 
-function PopoverMenuItem({
-  to,
-  icon,
-  title,
-  isSelected,
-  variant = { variant: "small-menu-item" },
-  leadingIconClassName,
-  className,
-}: {
-  to: string;
-  icon?: RenderIcon;
-  title: React.ReactNode;
-  isSelected?: boolean;
-  variant?: ButtonContentPropsType;
-  leadingIconClassName?: string;
-  className?: string;
-}) {
-  return (
-    <LinkButton
-      to={to}
-      variant={variant.variant}
-      LeadingIcon={icon}
-      leadingIconClassName={leadingIconClassName}
-      fullWidth
-      textAlignLeft
-      TrailingIcon={isSelected ? CheckIcon : undefined}
-      className={cn(
+const PopoverMenuItem = React.forwardRef<
+  HTMLButtonElement | HTMLAnchorElement,
+  {
+    to?: string;
+    icon?: RenderIcon;
+    title: React.ReactNode;
+    isSelected?: boolean;
+    variant?: ButtonContentPropsType;
+    leadingIconClassName?: string;
+    className?: string;
+    onClick?: React.MouseEventHandler;
+    disabled?: boolean;
+    openInNewTab?: boolean;
+  }
+>(
+  (
+    {
+      to,
+      icon,
+      title,
+      isSelected,
+      variant = { variant: "small-menu-item" },
+      leadingIconClassName,
+      className,
+      onClick,
+      disabled,
+      openInNewTab = false,
+    },
+    ref
+  ) => {
+    const contentProps = {
+      variant: variant.variant,
+      LeadingIcon: icon,
+      leadingIconClassName,
+      fullWidth: true,
+      textAlignLeft: true,
+      TrailingIcon: isSelected ? CheckIcon : undefined,
+      className: cn(
         "group-hover:bg-charcoal-700",
         isSelected ? "bg-charcoal-750 group-hover:bg-charcoal-600/50" : undefined,
         className
-      )}
-    >
-      {title}
-    </LinkButton>
-  );
-}
+      ),
+    } as const;
+
+    if (to) {
+      return (
+        <Link
+          to={to}
+          ref={ref as React.Ref<HTMLAnchorElement>}
+          className={cn("group/button focus-custom", contentProps.fullWidth ? "w-full" : "")}
+          onClick={onClick as any}
+          target={openInNewTab ? "_blank" : undefined}
+          rel={openInNewTab ? "noopener noreferrer" : undefined}
+        >
+          <ButtonContent {...contentProps}>{title}</ButtonContent>
+        </Link>
+      );
+    }
+
+    return (
+      <button
+        type="button"
+        ref={ref as React.Ref<HTMLButtonElement>}
+        onClick={onClick}
+        disabled={disabled}
+        className={cn(
+          "group/button outline-none focus-custom",
+          contentProps.fullWidth ? "w-full" : ""
+        )}
+      >
+        <ButtonContent {...contentProps}>{title}</ButtonContent>
+      </button>
+    );
+  }
+);
+PopoverMenuItem.displayName = "PopoverMenuItem";
 
 function PopoverCustomTrigger({
   isOpen,
@@ -113,10 +154,12 @@ function PopoverSideMenuTrigger({
   children,
   className,
   shortcut,
+  hideShortcutKey = false,
   ...props
 }: {
   isOpen?: boolean;
   shortcut?: useShortcutKeys.ShortcutDefinition;
+  hideShortcutKey?: boolean;
 } & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
   const ref = React.useRef<HTMLButtonElement>(null);
   useShortcutKeys.useShortcutKeys({
@@ -135,68 +178,106 @@ function PopoverSideMenuTrigger({
       {...props}
       ref={ref}
       className={cn(
-        "flex h-[1.8rem] shrink-0 select-none items-center gap-x-1.5 rounded-sm bg-transparent px-[0.4rem] text-center font-sans text-2sm font-normal text-text-bright transition duration-150 focus-custom hover:bg-charcoal-750",
-        shortcut ? "justify-between" : "",
+        "flex h-[1.8rem] shrink-0 select-none items-center rounded-sm bg-transparent pl-[0.4rem] pr-2.5 text-center font-sans text-2sm font-normal text-text-bright transition duration-150 focus-custom hover:bg-charcoal-750",
+        shortcut && !hideShortcutKey ? "justify-between gap-x-1.5" : "",
         className
       )}
     >
       {children}
-      {shortcut && (
-        <ShortcutKey className={cn("size-4 flex-none")} shortcut={shortcut} variant={"small"} />
+      {shortcut && !hideShortcutKey && (
+        <ShortcutKey className="size-4 flex-none" shortcut={shortcut} variant={"small"} />
       )}
     </PopoverTrigger>
   );
 }
 
+const popoverArrowTriggerVariants = {
+  minimal: {
+    trigger: "text-text-dimmed hover:bg-charcoal-700 hover:text-text-bright",
+    text: "group-hover:text-text-bright",
+    icon: "text-text-dimmed group-hover:text-text-bright",
+  },
+  tertiary: {
+    trigger: "bg-tertiary text-text-bright hover:bg-charcoal-600",
+    text: "text-text-bright",
+    icon: "text-text-bright",
+  },
+} as const;
+
+type PopoverArrowTriggerVariant = keyof typeof popoverArrowTriggerVariants;
+
 function PopoverArrowTrigger({
   isOpen,
   children,
   fullWidth = false,
   overflowHidden = false,
+  variant = "minimal",
   className,
   ...props
 }: {
   isOpen?: boolean;
   fullWidth?: boolean;
   overflowHidden?: boolean;
+  variant?: PopoverArrowTriggerVariant;
 } & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
+  const variantStyles = popoverArrowTriggerVariants[variant];
+
   return (
     <PopoverTrigger
       {...props}
       className={cn(
-        "group flex h-6 items-center gap-1 rounded pl-2 pr-1 text-text-dimmed transition focus-custom hover:bg-charcoal-700 hover:text-text-bright",
+        "group flex h-6 items-center gap-1 rounded pl-2 pr-1 transition focus-custom",
+        variantStyles.trigger,
         fullWidth && "w-full justify-between",
         className
       )}
     >
       <Paragraph
         variant="extra-small"
-        className={cn(
-          "flex transition group-hover:text-text-bright",
-          overflowHidden && "overflow-hidden"
-        )}
+        className={cn("flex transition", variantStyles.text, overflowHidden && "overflow-hidden")}
       >
         {children}
       </Paragraph>
-      <DropdownIcon className="size-4 min-w-4 text-text-dimmed transition group-hover:text-text-bright" />
+      <DropdownIcon className={cn("size-4 min-w-4 transition", variantStyles.icon)} />
     </PopoverTrigger>
   );
 }
 
+const popoverVerticalEllipseVariants = {
+  minimal: {
+    trigger:
+      "size-6 rounded-[3px] text-text-dimmed hover:bg-tertiary hover:text-text-bright",
+    icon: "size-5",
+  },
+  secondary: {
+    trigger:
+      "size-6 rounded border border-charcoal-600 bg-secondary text-text-bright hover:bg-charcoal-600 hover:border-charcoal-550",
+    icon: "size-4",
+  },
+} as const;
+
+type PopoverVerticalEllipseVariant = keyof typeof popoverVerticalEllipseVariants;
+
 function PopoverVerticalEllipseTrigger({
   isOpen,
+  variant = "minimal",
   className,
   ...props
-}: { isOpen?: boolean } & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
+}: {
+  isOpen?: boolean;
+  variant?: PopoverVerticalEllipseVariant;
+} & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
+  const styles = popoverVerticalEllipseVariants[variant];
   return (
     <PopoverTrigger
       {...props}
       className={cn(
-        "group flex items-center justify-end gap-1 rounded-[3px] p-0.5 text-text-dimmed transition focus-custom hover:bg-tertiary hover:text-text-bright",
+        "group flex items-center justify-center transition focus-custom",
+        styles.trigger,
         className
       )}
     >
-      <EllipsisVerticalIcon className={cn("size-5 transition group-hover:text-text-bright")} />
+      <EllipsisVerticalIcon className={cn(styles.icon, "transition")} />
     </PopoverTrigger>
   );
 }
@@ -212,3 +293,5 @@ export {
   PopoverTrigger,
   PopoverVerticalEllipseTrigger,
 };
+
+export type { PopoverArrowTriggerVariant };
diff --git a/apps/webapp/app/components/primitives/RadioButton.tsx b/apps/webapp/app/components/primitives/RadioButton.tsx
index 6ea04f3b56e..87fb7a59f17 100644
--- a/apps/webapp/app/components/primitives/RadioButton.tsx
+++ b/apps/webapp/app/components/primitives/RadioButton.tsx
@@ -39,7 +39,7 @@ const variants = {
   description: {
     button:
       "w-full p-2.5 hover:data-[state=checked]:bg-white/[4%] data-[state=checked]:bg-white/[4%] transition data-[disabled]:opacity-70 hover:border-charcoal-600 border-charcoal-650 hover:data-[state=checked]:border-charcoal-600 border rounded-md",
-    label: "text-text-bright font-semibold -mt-1 text-left text-sm",
+    label: "text-text-bright font-semibold -mt-0.5 text-left text-sm",
     description: "text-text-dimmed -mt-0 text-left",
     inputPosition: "mt-0",
     icon: "w-8 h-8 mb-2",
diff --git a/apps/webapp/app/components/primitives/Resizable.tsx b/apps/webapp/app/components/primitives/Resizable.tsx
index 22fb38d358a..df0bd88e05c 100644
--- a/apps/webapp/app/components/primitives/Resizable.tsx
+++ b/apps/webapp/app/components/primitives/Resizable.tsx
@@ -26,19 +26,40 @@ const ResizableHandle = ({
 }) => (
   <PanelResizer
     className={cn(
-      "group relative flex w-0.75 items-center justify-center focus-custom after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2 data-[panel-group-direction=vertical]:h-px data-[panel-group-direction=vertical]:w-full data-[panel-group-direction=vertical]:after:left-0 data-[panel-group-direction=vertical]:after:h-1 data-[panel-group-direction=vertical]:after:w-full data-[panel-group-direction=vertical]:after:-translate-y-1/2 data-[panel-group-direction=vertical]:after:translate-x-0 hover:w-0.75 [&[data-panel-group-direction=vertical]>div]:rotate-90",
+      // Base styles
+      "group relative flex items-center justify-center focus-custom",
+      // Horizontal orientation (default)
+      "w-0.75 after:absolute after:inset-y-0 after:left-1/2 after:w-1 after:-translate-x-1/2",
+      // Vertical orientation
+      "data-[handle-orientation=vertical]:h-0.75 data-[handle-orientation=vertical]:w-full",
+      "data-[handle-orientation=vertical]:after:inset-x-0 data-[handle-orientation=vertical]:after:inset-y-auto",
+      "data-[handle-orientation=vertical]:after:left-0 data-[handle-orientation=vertical]:after:top-1/2",
+      "data-[handle-orientation=vertical]:after:h-1 data-[handle-orientation=vertical]:after:w-full",
+      "data-[handle-orientation=vertical]:after:-translate-y-1/2 data-[handle-orientation=vertical]:after:translate-x-0",
       className
     )}
     size="3px"
     {...props}
   >
-    <div className="absolute left-[0.0625rem] top-0 h-full w-px bg-grid-bright transition group-hover:left-0 group-hover:w-0.75 group-hover:bg-lavender-500" />
+    {/* Horizontal orientation line indicator */}
+    <div className="absolute left-[0.0625rem] top-0 z-20 h-full w-px bg-grid-bright transition group-hover:left-0 group-hover:w-0.75 group-hover:bg-indigo-500 group-data-[handle-orientation=vertical]:hidden" />
+    {/* Vertical orientation line indicator */}
+    <div className="absolute left-0 top-[0.0625rem] z-20 hidden h-px w-full bg-grid-bright transition group-hover:top-0 group-hover:h-0.75 group-hover:bg-indigo-500 group-data-[handle-orientation=vertical]:block" />
     {withHandle && (
-      <div className="z-10 flex h-5 w-3 flex-col items-center justify-center gap-[0.1875rem] bg-background-dimmed group-hover:hidden">
-        {Array.from({ length: 3 }).map((_, index) => (
-          <div key={index} className="h-[0.1875rem] w-0.75 rounded-full bg-charcoal-600" />
-        ))}
-      </div>
+      <>
+        {/* Horizontal orientation dots (vertical arrangement) */}
+        <div className="z-10 flex h-5 w-0.75 flex-col items-center justify-center gap-[0.1875rem] bg-background-dimmed group-hover:hidden group-data-[handle-orientation=vertical]:hidden">
+          {Array.from({ length: 3 }).map((_, index) => (
+            <div key={index} className="h-[0.1875rem] w-0.75 rounded-full bg-charcoal-600" />
+          ))}
+        </div>
+        {/* Vertical orientation dots (horizontal arrangement) */}
+        <div className="z-10 hidden h-0.75 w-5 flex-row items-center justify-center gap-[0.1875rem] bg-background-dimmed group-hover:hidden group-data-[handle-orientation=vertical]:flex">
+          {Array.from({ length: 3 }).map((_, index) => (
+            <div key={index} className="h-0.75 w-[0.1875rem] rounded-full bg-charcoal-600" />
+          ))}
+        </div>
+      </>
     )}
   </PanelResizer>
 );
diff --git a/apps/webapp/app/components/primitives/SegmentedControl.tsx b/apps/webapp/app/components/primitives/SegmentedControl.tsx
index 51fc54e5af1..98561e41222 100644
--- a/apps/webapp/app/components/primitives/SegmentedControl.tsx
+++ b/apps/webapp/app/components/primitives/SegmentedControl.tsx
@@ -1,22 +1,70 @@
 import { RadioGroup } from "@headlessui/react";
 import { motion } from "framer-motion";
+import type { ReactNode } from "react";
 import { cn } from "~/utils/cn";
 
-const variants = {
+const sizes = {
+  small: {
+    control: "h-6",
+    option: "px-2 text-xs",
+    container: "gap-x-0.5",
+  },
+  medium: {
+    control: "h-10",
+    option: "px-3 py-[0.13rem] text-sm",
+    container: "p-1 gap-x-0.5",
+  },
+};
+
+const theme = {
   primary: {
     base: "bg-charcoal-700",
     active: "text-text-bright hover:bg-charcoal-750/50",
+    inactive: "text-text-dimmed transition hover:text-text-bright",
+    selected: "absolute inset-0 rounded-[2px] outline outline-3 outline-primary",
   },
   secondary: {
     base: "bg-charcoal-700/50",
-    active: "text-text-bright bg-charcoal-700 rounded-[2px] border border-charcoal-600/50",
+    active: "text-text-bright",
+    inactive: "text-text-dimmed transition hover:text-text-bright",
+    selected: "absolute inset-0 rounded bg-charcoal-700 border border-charcoal-600",
   },
 };
 
-type Variants = keyof typeof variants;
+type Size = keyof typeof sizes;
+type Theme = keyof typeof theme;
+
+type VariantStyle = {
+  base: string;
+  active: string;
+  inactive: string;
+  option: string;
+  container: string;
+  selected: string;
+};
+
+function createVariant(sizeName: Size, themeName: Theme): VariantStyle {
+  return {
+    base: cn(sizes[sizeName].control, theme[themeName].base),
+    active: theme[themeName].active,
+    inactive: theme[themeName].inactive,
+    option: sizes[sizeName].option,
+    container: sizes[sizeName].container,
+    selected: theme[themeName].selected,
+  };
+}
+
+const variants = {
+  "primary/small": createVariant("small", "primary"),
+  "primary/medium": createVariant("medium", "primary"),
+  "secondary/small": createVariant("small", "secondary"),
+  "secondary/medium": createVariant("medium", "secondary"),
+} as const;
+
+type VariantType = keyof typeof variants;
 
 type Options = {
-  label: string;
+  label: ReactNode;
   value: string;
 };
 
@@ -25,7 +73,7 @@ type SegmentedControlProps = {
   value?: string;
   defaultValue?: string;
   options: Options[];
-  variant?: Variants;
+  variant?: VariantType;
   fullWidth?: boolean;
   onChange?: (value: string) => void;
 };
@@ -35,15 +83,18 @@ export default function SegmentedControl({
   value,
   defaultValue,
   options,
-  variant = "secondary",
+  variant = "secondary/medium",
   fullWidth,
   onChange,
 }: SegmentedControlProps) {
+  const variantStyle = variants[variant];
+  const isPrimary = variant.startsWith("primary");
+
   return (
     <div
       className={cn(
-        "flex h-10 rounded text-text-bright",
-        variants[variant].base,
+        "flex rounded text-text-bright",
+        variantStyle.base,
         fullWidth ? "w-full" : "w-fit"
       )}
     >
@@ -58,31 +109,36 @@ export default function SegmentedControl({
         }}
         className="w-full"
       >
-        <div className="flex h-full w-full items-center justify-between gap-x-1 p-1">
+        <div
+          className={cn("flex h-full w-full items-center justify-between", variantStyle.container)}
+        >
           {options.map((option) => (
             <RadioGroup.Option
               key={option.value}
               value={option.value}
-              className={({ active, checked }) =>
+              className={({ checked }) =>
                 cn(
                   "relative flex h-full grow cursor-pointer text-center font-normal focus-custom",
-                  checked
-                    ? variants[variant].active
-                    : "text-text-dimmed transition hover:text-text-bright"
+                  checked ? variantStyle.active : variantStyle.inactive
                 )
               }
             >
               {({ checked }) => (
                 <>
-                  <div className="relative flex h-full w-full items-center justify-between px-3 py-[0.13rem]">
-                    <div className="z-10 flex h-full w-full items-center justify-center text-sm">
+                  <div
+                    className={cn(
+                      "relative flex h-full w-full items-center justify-between",
+                      variantStyle.option
+                    )}
+                  >
+                    <div className="z-10 flex h-full w-full items-center justify-center">
                       <RadioGroup.Label as="p">{option.label}</RadioGroup.Label>
                     </div>
-                    {checked && variant === "primary" && (
+                    {checked && (
                       <motion.div
                         layoutId={`segmented-control-${name}`}
                         transition={{ duration: 0.4, type: "spring" }}
-                        className="absolute inset-0 rounded-[2px] shadow-md outline outline-3 outline-primary"
+                        className={variantStyle.selected}
                       />
                     )}
                   </div>
diff --git a/apps/webapp/app/components/primitives/ShortcutKey.tsx b/apps/webapp/app/components/primitives/ShortcutKey.tsx
index 04b1f367370..72d77c70da2 100644
--- a/apps/webapp/app/components/primitives/ShortcutKey.tsx
+++ b/apps/webapp/app/components/primitives/ShortcutKey.tsx
@@ -8,12 +8,15 @@ import { cn } from "~/utils/cn";
 import { useOperatingSystem } from "./OperatingSystemProvider";
 import { KeyboardEnterIcon } from "~/assets/icons/KeyboardEnterIcon";
 
+const small =
+  "justify-center text-[0.6rem] font-mono font-medium min-w-[1rem] min-h-[1rem] rounded-[2px] tabular-nums px-1 ml-1 -mr-0.5 flex items-center gap-x-1 border transition uppercase";
+
 const medium =
-  "text-[0.75rem] font-medium min-w-[17px] rounded-[2px] tabular-nums px-1 ml-1 -mr-0.5 flex items-center gap-x-1.5 border border-dimmed/40 text-text-dimmed group-hover:text-text-bright/80 group-hover:border-dimmed/60 transition uppercase";
+  "justify-center min-w-[1.25rem] min-h-[1.25rem] text-[0.65rem] font-mono font-medium rounded-[2px] tabular-nums px-1 ml-1 -mr-0.5 flex items-center gap-x-1.5 border border-dimmed/40 text-text-dimmed group-hover:text-text-bright/80 group-hover:border-dimmed/60 transition uppercase";
 
 export const variants = {
-  small:
-    "text-[0.6rem] font-medium min-w-[17px] rounded-[2px] tabular-nums px-1 ml-1 -mr-0.5 flex items-center gap-x-1 border border-text-dimmed/40 text-text-dimmed group-hover:text-text-bright/80 group-hover:border-text-dimmed/60 transition uppercase",
+  small: cn(small, "border-text-dimmed/40 text-text-dimmed group-hover:text-text-bright/80 group-hover:border-text-dimmed/60"),
+  "small/bright": cn(small, "bg-charcoal-750 text-text-bright border-charcoal-650"),
   medium: cn(medium, "group-hover:border-charcoal-550"),
   "medium/bright": cn(medium, "bg-charcoal-750 text-text-bright border-charcoal-650"),
 };
@@ -54,10 +57,10 @@ export function ShortcutKey({ shortcut, variant, className }: ShortcutKeyProps)
   );
 }
 
-function keyString(key: string, isMac: boolean, variant: "small" | "medium" | "medium/bright") {
+function keyString(key: string, isMac: boolean, variant: ShortcutKeyVariant) {
   key = key.toLowerCase();
 
-  const className = variant === "small" ? "w-2.5 h-4" : "w-3 h-5";
+  const className = variant.startsWith("small") ? "w-2.5 h-4" : "w-2.5 h-4.5";
 
   switch (key) {
     case "enter":
@@ -86,9 +89,9 @@ function keyString(key: string, isMac: boolean, variant: "small" | "medium" | "m
 function modifierString(
   modifier: Modifier,
   isMac: boolean,
-  variant: "small" | "medium" | "medium/bright"
+  variant: ShortcutKeyVariant
 ): string | JSX.Element {
-  const className = variant === "small" ? "w-2.5 h-4" : "w-3.5 h-5";
+  const className = variant.startsWith("small") ? "w-2.5 h-4" : "w-3.5 h-5";
 
   switch (modifier) {
     case "alt":
diff --git a/apps/webapp/app/components/primitives/Spinner.tsx b/apps/webapp/app/components/primitives/Spinner.tsx
index a9182b46ce0..158ea2c9989 100644
--- a/apps/webapp/app/components/primitives/Spinner.tsx
+++ b/apps/webapp/app/components/primitives/Spinner.tsx
@@ -66,8 +66,8 @@ export function ButtonSpinner() {
     <Spinner
       className="size-3"
       color={{
-        foreground: "rgba(0, 0, 0, 1)",
-        background: "rgba(0, 0, 0, 0.25)",
+        background: "rgba(255, 255, 255, 0.4)",
+        foreground: "rgba(255, 255, 255)",
       }}
     />
   );
diff --git a/apps/webapp/app/components/primitives/Table.tsx b/apps/webapp/app/components/primitives/Table.tsx
index a51c78cc823..dfff784853d 100644
--- a/apps/webapp/app/components/primitives/Table.tsx
+++ b/apps/webapp/app/components/primitives/Table.tsx
@@ -1,23 +1,54 @@
 import { ChevronRightIcon } from "@heroicons/react/24/solid";
 import { Link } from "@remix-run/react";
-import React, { type ReactNode, forwardRef, useState, useContext, createContext } from "react";
+import { ClipboardCheckIcon, ClipboardIcon } from "lucide-react";
+import React, { type ReactNode, createContext, forwardRef, useContext, useState } from "react";
+import { useCopy } from "~/hooks/useCopy";
 import { cn } from "~/utils/cn";
 import { Popover, PopoverContent, PopoverVerticalEllipseTrigger } from "./Popover";
-import { InfoIconTooltip } from "./Tooltip";
+import { InfoIconTooltip, SimpleTooltip } from "./Tooltip";
 
 const variants = {
   bright: {
     header: "bg-background-bright",
+    headerCell: "px-3 py-2.5 pb-3 text-sm",
     cell: "group-hover/table-row:bg-charcoal-750 group-has-[[tabindex='0']:focus]/table-row:bg-charcoal-750",
+    cellSize: "px-3 py-3",
+    cellText: "text-xs group-hover/table-row:text-text-bright",
     stickyCell: "bg-background-bright group-hover/table-row:bg-charcoal-750",
     menuButton:
       "bg-background-bright group-hover/table-row:bg-charcoal-750 group-hover/table-row:ring-charcoal-600/70 group-has-[[tabindex='0']:focus]/table-row:bg-charcoal-750",
     menuButtonDivider: "group-hover/table-row:border-charcoal-600/70",
     rowSelected: "bg-charcoal-750 group-hover/table-row:bg-charcoal-750",
   },
+  "bright/no-hover": {
+    header: "bg-transparent",
+    headerCell: "px-3 py-2.5 pb-3 text-sm",
+    cell: "group-hover/table-row:bg-transparent",
+    cellSize: "px-3 py-3",
+    cellText: "text-xs",
+    stickyCell: "bg-background-bright",
+    menuButton: "bg-background-bright",
+    menuButtonDivider: "",
+    rowSelected: "bg-charcoal-750",
+  },
   dimmed: {
     header: "bg-background-dimmed",
+    headerCell: "px-3 py-2.5 pb-3 text-sm",
     cell: "group-hover/table-row:bg-charcoal-800 group-has-[[tabindex='0']:focus]/table-row:bg-background-bright",
+    cellSize: "px-3 py-3",
+    cellText: "text-xs group-hover/table-row:text-text-bright",
+    stickyCell: "group-hover/table-row:bg-charcoal-800",
+    menuButton:
+      "bg-background-dimmed group-hover/table-row:bg-charcoal-800 group-hover/table-row:ring-grid-bright group-has-[[tabindex='0']:focus]/table-row:bg-background-bright",
+    menuButtonDivider: "group-hover/table-row:border-grid-bright",
+    rowSelected: "bg-charcoal-750 group-hover/table-row:bg-charcoal-750",
+  },
+  "compact/mono": {
+    header: "bg-background-dimmed",
+    headerCell: "px-2 py-1.5 text-sm",
+    cell: "group-hover/table-row:bg-charcoal-800 group-has-[[tabindex='0']:focus]/table-row:bg-background-bright",
+    cellSize: "px-2 py-1.5",
+    cellText: "text-xs font-mono group-hover/table-row:text-text-bright",
     stickyCell: "group-hover/table-row:bg-charcoal-800",
     menuButton:
       "bg-background-dimmed group-hover/table-row:bg-charcoal-800 group-hover/table-row:ring-grid-bright group-has-[[tabindex='0']:focus]/table-row:bg-background-bright",
@@ -33,18 +64,30 @@ type TableProps = {
   className?: string;
   children: ReactNode;
   fullWidth?: boolean;
+  showTopBorder?: boolean;
 };
 
 // Add TableContext
 const TableContext = createContext<{ variant: TableVariant }>({ variant: "dimmed" });
 
 export const Table = forwardRef<HTMLTableElement, TableProps & { variant?: TableVariant }>(
-  ({ className, containerClassName, children, fullWidth, variant = "dimmed" }, ref) => {
+  (
+    {
+      className,
+      containerClassName,
+      children,
+      fullWidth,
+      variant = "dimmed",
+      showTopBorder = true,
+    },
+    ref
+  ) => {
     return (
       <TableContext.Provider value={{ variant }}>
         <div
           className={cn(
-            "overflow-x-auto whitespace-nowrap border-t scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600",
+            "overflow-x-auto whitespace-nowrap scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600",
+            showTopBorder && "border-t",
             containerClassName,
             fullWidth && "w-full"
           )}
@@ -70,7 +113,7 @@ export const TableHeader = forwardRef<HTMLTableSectionElement, TableHeaderProps>
       <thead
         ref={ref}
         className={cn(
-          "sticky top-0 z-10 after:absolute after:bottom-0 after:left-0 after:right-0 after:h-px after:bg-grid-bright",
+          "safari-only sticky top-0 z-10 after:absolute after:bottom-0 after:left-0 after:right-0 after:h-px after:bg-grid-bright supports-[(-webkit-hyphens:none)]:after:content-none",
           variants[variant].header,
           className
         )}
@@ -96,7 +139,7 @@ export const TableBody = forwardRef<HTMLTableSectionElement, TableBodyProps>(
   }
 );
 
-type TableRowProps = {
+type TableRowProps = JSX.IntrinsicElements["tr"] & {
   className?: string;
   children: ReactNode;
   disabled?: boolean;
@@ -104,11 +147,12 @@ type TableRowProps = {
 };
 
 export const TableRow = forwardRef<HTMLTableRowElement, TableRowProps>(
-  ({ className, disabled, isSelected, children }, ref) => {
+  ({ className, disabled, isSelected, children, ...props }, ref) => {
     const { variant } = useContext(TableContext);
     return (
       <tr
         ref={ref}
+        {...props}
         className={cn(
           "group/table-row relative w-full outline-none after:absolute after:bottom-0 after:left-3 after:right-0 after:h-px after:bg-grid-dimmed",
           isSelected && variants[variant].rowSelected,
@@ -132,10 +176,23 @@ type TableCellBasicProps = {
 type TableHeaderCellProps = TableCellBasicProps & {
   hiddenLabel?: boolean;
   tooltip?: ReactNode;
+  disableTooltipHoverableContent?: boolean;
 };
 
 export const TableHeaderCell = forwardRef<HTMLTableCellElement, TableHeaderCellProps>(
-  ({ className, alignment = "left", children, colSpan, hiddenLabel = false, tooltip }, ref) => {
+  (
+    {
+      className,
+      alignment = "left",
+      children,
+      colSpan,
+      hiddenLabel = false,
+      tooltip,
+      disableTooltipHoverableContent = false,
+    },
+    ref
+  ) => {
+    const { variant } = useContext(TableContext);
     let alignmentClassName = "text-left";
     switch (alignment) {
       case "center":
@@ -146,17 +203,22 @@ export const TableHeaderCell = forwardRef<HTMLTableCellElement, TableHeaderCellP
         break;
     }
 
+    const [isHovered, setIsHovered] = useState(false);
+
     return (
       <th
         ref={ref}
         scope="col"
         className={cn(
-          "px-3 py-2.5 pb-3 align-middle text-sm font-medium text-text-bright",
+          "align-middle font-medium text-text-bright",
+          variants[variant].headerCell,
           alignmentClassName,
           className
         )}
         colSpan={colSpan}
         tabIndex={-1}
+        onMouseEnter={() => setIsHovered(true)}
+        onMouseLeave={() => setIsHovered(false)}
       >
         {hiddenLabel ? (
           <span className="sr-only">{children}</span>
@@ -168,7 +230,12 @@ export const TableHeaderCell = forwardRef<HTMLTableCellElement, TableHeaderCellP
             })}
           >
             {children}
-            <InfoIconTooltip content={tooltip} contentClassName="normal-case tracking-normal" />
+            <InfoIconTooltip
+              content={tooltip}
+              contentClassName="normal-case tracking-normal"
+              enabled={isHovered}
+              disableHoverableContent={disableTooltipHoverableContent}
+            />
           </div>
         ) : (
           children
@@ -188,6 +255,7 @@ type TableCellProps = TableCellBasicProps & {
   isSelected?: boolean;
   isTabbableCell?: boolean;
   children?: ReactNode;
+  style?: React.CSSProperties;
 };
 
 export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
@@ -204,6 +272,7 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
       isSticky = false,
       isSelected,
       isTabbableCell = false,
+      style,
     },
     ref
   ) => {
@@ -217,23 +286,28 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
         break;
     }
 
+    const { variant } = useContext(TableContext);
     const flexClasses = cn(
-      "flex w-full whitespace-nowrap px-3 py-3 items-center text-xs text-text-dimmed",
+      "flex w-full whitespace-nowrap items-center text-text-dimmed",
+      variants[variant].cellSize,
+      variants[variant].cellText,
       alignment === "left"
         ? "justify-start text-left"
         : alignment === "center"
         ? "justify-center text-center"
         : "justify-end text-right"
     );
-    const { variant } = useContext(TableContext);
 
     return (
       <td
         ref={ref}
         className={cn(
-          "text-xs text-charcoal-400 has-[[tabindex='0']:focus]:before:absolute has-[[tabindex='0']:focus]:before:-top-px has-[[tabindex='0']:focus]:before:left-0 has-[[tabindex='0']:focus]:before:h-px has-[[tabindex='0']:focus]:before:w-3 has-[[tabindex='0']:focus]:before:bg-grid-dimmed has-[[tabindex='0']:focus]:after:absolute has-[[tabindex='0']:focus]:after:bottom-0 has-[[tabindex='0']:focus]:after:left-0 has-[[tabindex='0']:focus]:after:right-0 has-[[tabindex='0']:focus]:after:h-px has-[[tabindex='0']:focus]:after:bg-grid-dimmed",
+          "safari-only text-xs text-charcoal-400 has-[[tabindex='0']:focus]:before:absolute has-[[tabindex='0']:focus]:before:-top-px has-[[tabindex='0']:focus]:before:left-0 has-[[tabindex='0']:focus]:before:h-px has-[[tabindex='0']:focus]:before:w-3 has-[[tabindex='0']:focus]:before:bg-grid-dimmed has-[[tabindex='0']:focus]:after:absolute has-[[tabindex='0']:focus]:after:bottom-0 has-[[tabindex='0']:focus]:after:left-0 has-[[tabindex='0']:focus]:after:right-0 has-[[tabindex='0']:focus]:after:h-px has-[[tabindex='0']:focus]:after:bg-grid-dimmed",
+          variants[variant].cellText,
           variants[variant].cell,
-          to || onClick || hasAction ? "cursor-pointer" : "cursor-default px-3 py-3 align-middle",
+          to || onClick || hasAction
+            ? "cursor-pointer"
+            : cn("cursor-default align-middle", variants[variant].cellSize),
           !to && !onClick && alignmentClassName,
           isSticky &&
             "[&:has(.group-hover/table-row:block)]:w-auto sticky right-0 bg-background-dimmed",
@@ -244,6 +318,7 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
           className
         )}
         colSpan={colSpan}
+        style={style}
       >
         {to ? (
           <Link
@@ -269,6 +344,60 @@ export const TableCell = forwardRef<HTMLTableCellElement, TableCellProps>(
   }
 );
 
+type CopyableTableCellProps = TableCellProps & {
+  value: string;
+};
+
+export const CopyableTableCell = forwardRef<HTMLTableCellElement, CopyableTableCellProps>(
+  ({ value, children, className, ...props }, ref) => {
+    const [isHovered, setIsHovered] = useState(false);
+    const { copy, copied } = useCopy(value);
+
+    return (
+      <TableCell ref={ref} className={className} {...props}>
+        <div
+          className="relative flex items-center"
+          onMouseEnter={() => setIsHovered(true)}
+          onMouseLeave={() => setIsHovered(false)}
+        >
+          {children}
+          {isHovered && (
+            <span
+              onClick={(e) => {
+                e.stopPropagation();
+                e.preventDefault();
+                copy();
+              }}
+              className="absolute -right-2 top-1/2 z-10 flex -translate-y-1/2 cursor-pointer"
+            >
+              <SimpleTooltip
+                button={
+                  <span
+                    className={cn(
+                      "flex size-6 items-center justify-center rounded border border-charcoal-650 bg-charcoal-750",
+                      copied
+                        ? "text-green-500"
+                        : "text-text-dimmed hover:border-charcoal-600 hover:bg-charcoal-700 hover:text-text-bright"
+                    )}
+                  >
+                    {copied ? (
+                      <ClipboardCheckIcon className="size-3.5" />
+                    ) : (
+                      <ClipboardIcon className="size-3.5" />
+                    )}
+                  </span>
+                }
+                content={copied ? "Copied!" : "Copy"}
+                disableHoverableContent
+              />
+            </span>
+          )}
+        </div>
+      </TableCell>
+    );
+  }
+);
+
 export const TableCellChevron = forwardRef<
   HTMLTableCellElement,
   {
diff --git a/apps/webapp/app/components/primitives/Tabs.tsx b/apps/webapp/app/components/primitives/Tabs.tsx
index e3d3183d94b..cbc5cf42752 100644
--- a/apps/webapp/app/components/primitives/Tabs.tsx
+++ b/apps/webapp/app/components/primitives/Tabs.tsx
@@ -1,10 +1,12 @@
 import { NavLink } from "@remix-run/react";
 import { motion } from "framer-motion";
-import { ReactNode, useRef } from "react";
-import { ShortcutDefinition, useShortcutKeys } from "~/hooks/useShortcutKeys";
+import { type ReactNode, useRef } from "react";
+import { type ShortcutDefinition, useShortcutKeys } from "~/hooks/useShortcutKeys";
 import { cn } from "~/utils/cn";
 import { ShortcutKey } from "./ShortcutKey";
 
+export type Variants = "underline" | "pipe-divider" | "segmented";
+
 export type TabsProps = {
   tabs: {
     label: string;
@@ -12,13 +14,14 @@ export type TabsProps = {
   }[];
   className?: string;
   layoutId: string;
+  variant?: Variants;
 };
 
-export function Tabs({ tabs, className, layoutId }: TabsProps) {
+export function Tabs({ tabs, className, layoutId, variant = "underline" }: TabsProps) {
   return (
-    <TabContainer className={className}>
+    <TabContainer className={className} variant={variant}>
       {tabs.map((tab, index) => (
-        <TabLink key={index} to={tab.to} layoutId={layoutId}>
+        <TabLink key={index} to={tab.to} layoutId={layoutId} variant={variant}>
           {tab.label}
         </TabLink>
       ))}
@@ -26,23 +29,107 @@ export function Tabs({ tabs, className, layoutId }: TabsProps) {
   );
 }
 
-export function TabContainer({ children, className }: { children: ReactNode; className?: string }) {
-  return (
-    <div className={cn(`flex flex-row gap-x-6 border-b border-grid-bright`, className)}>
-      {children}
-    </div>
-  );
+export function TabContainer({
+  children,
+  className,
+  variant = "underline",
+}: {
+  children: ReactNode;
+  className?: string;
+  variant?: Variants;
+}) {
+  if (variant === "segmented") {
+    return (
+      <div
+        className={cn("relative flex h-10 items-center rounded bg-charcoal-700/50 p-1", className)}
+      >
+        {children}
+      </div>
+    );
+  }
+
+  if (variant === "underline") {
+    return (
+      <div className={cn(`flex gap-x-6 border-b border-grid-bright`, className)}>{children}</div>
+    );
+  }
+
+  return <div className={cn(`flex`, className)}>{children}</div>;
 }
 
 export function TabLink({
   to,
   children,
   layoutId,
+  variant = "underline",
 }: {
   to: string;
   children: ReactNode;
   layoutId: string;
+  variant?: Variants;
 }) {
+  if (variant === "segmented") {
+    return (
+      <NavLink
+        to={to}
+        className="group relative flex h-full grow items-center justify-center focus-custom"
+        end
+      >
+        {({ isActive, isPending }) => {
+          const active = isActive || isPending;
+          return (
+            <>
+              <div className="relative z-10 flex h-full w-full items-center justify-center px-3 py-[0.13rem]">
+                <span
+                  className={cn(
+                    "text-sm transition duration-200",
+                    active
+                      ? "text-text-bright"
+                      : "text-text-dimmed transition group-hover:text-text-bright"
+                  )}
+                >
+                  {children}
+                </span>
+              </div>
+              {active && (
+                <motion.div
+                  layoutId={layoutId}
+                  transition={{ duration: 0.4, type: "spring" }}
+                  className="absolute inset-0 rounded-[2px] border border-charcoal-500/50 bg-charcoal-600"
+                />
+              )}
+            </>
+          );
+        }}
+      </NavLink>
+    );
+  }
+
+  if (variant === "pipe-divider") {
+    return (
+      <NavLink
+        to={to}
+        className="group flex flex-col items-center border-r border-charcoal-700 px-2 pt-1 focus-custom first:pl-0 last:border-none"
+        end
+      >
+        {({ isActive, isPending }) => {
+          const active = isActive || isPending;
+          return (
+            <span
+              className={cn(
+                "text-sm transition duration-200",
+                active ? "text-text-link" : "text-text-dimmed transition hover:text-text-bright"
+              )}
+            >
+              {children}
+            </span>
+          );
+        }}
+      </NavLink>
+    );
+  }
+
+  // underline variant (default)
   return (
     <NavLink to={to} className="group flex flex-col items-center pt-1 focus-custom" end>
       {({ isActive, isPending }) => {
@@ -51,13 +138,19 @@ export function TabLink({
             <span
               className={cn(
                 "text-sm transition duration-200",
-                isActive || isPending ? "text-text-bright" : "text-text-bright"
+                isActive || isPending
+                  ? "text-text-bright"
+                  : "text-text-dimmed hover:text-text-bright"
               )}
             >
               {children}
             </span>
             {isActive || isPending ? (
-              <motion.div layoutId={layoutId} className="mt-1 h-0.5 w-full bg-indigo-500" />
+              <motion.div
+                layoutId={layoutId}
+                transition={{ type: "spring", stiffness: 500, damping: 30 }}
+                className="mt-1 h-0.5 w-full bg-indigo-500"
+              />
             ) : (
               <div className="mt-1 h-0.5 w-full bg-charcoal-500 opacity-0 transition duration-200 group-hover:opacity-100" />
             )}
@@ -106,17 +199,18 @@ export function TabButton({
       <>
         <div className="flex items-center gap-1">
           <span
-            className={cn(
-              "text-sm transition duration-200",
-              isActive ? "text-text-bright" : "text-text-bright"
-            )}
+            className={"text-sm transition duration-200 text-text-bright"}
           >
             {props.children}
           </span>
           {shortcut && <ShortcutKey className={cn("")} shortcut={shortcut} variant={"small"} />}
         </div>
         {isActive ? (
-          <motion.div layoutId={layoutId} className="mt-1 h-0.5 w-full bg-indigo-500" />
+          <motion.div
+            layoutId={layoutId}
+            transition={{ type: "spring", stiffness: 500, damping: 30 }}
+            className="mt-1 h-0.5 w-full bg-indigo-500"
+          />
         ) : (
           <div className="mt-1 h-0.5 w-full bg-charcoal-500 opacity-0 transition duration-200 group-hover:opacity-100" />
         )}
diff --git a/apps/webapp/app/components/primitives/TextLink.tsx b/apps/webapp/app/components/primitives/TextLink.tsx
index 38fd1525c56..d0186268c0c 100644
--- a/apps/webapp/app/components/primitives/TextLink.tsx
+++ b/apps/webapp/app/components/primitives/TextLink.tsx
@@ -1,6 +1,10 @@
 import { Link } from "@remix-run/react";
 import { cn } from "~/utils/cn";
 import { Icon, type RenderIcon } from "./Icon";
+import { useRef } from "react";
+import { type ShortcutDefinition, useShortcutKeys } from "~/hooks/useShortcutKeys";
+import { ShortcutKey } from "./ShortcutKey";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./Tooltip";
 
 const variations = {
   primary:
@@ -17,6 +21,9 @@ type TextLinkProps = {
   trailingIconClassName?: string;
   variant?: keyof typeof variations;
   children: React.ReactNode;
+  shortcut?: ShortcutDefinition;
+  hideShortcutKey?: boolean;
+  tooltip?: React.ReactNode;
 } & React.AnchorHTMLAttributes<HTMLAnchorElement>;
 
 export function TextLink({
@@ -27,20 +34,61 @@ export function TextLink({
   trailingIcon,
   trailingIconClassName,
   variant = "primary",
+  shortcut,
+  hideShortcutKey,
+  tooltip,
   ...props
 }: TextLinkProps) {
+  const innerRef = useRef<HTMLAnchorElement>(null);
   const classes = variations[variant];
-  return to ? (
-    <Link to={to} className={cn(classes, className)} {...props}>
+
+  if (shortcut) {
+    useShortcutKeys({
+      shortcut: shortcut,
+      action: () => {
+        if (innerRef.current) {
+          innerRef.current.click();
+        }
+      },
+    });
+  }
+
+  const renderShortcutKey = () =>
+    shortcut &&
+    !hideShortcutKey && <ShortcutKey className="ml-1.5" shortcut={shortcut} variant="small" />;
+
+  const linkContent = (
+    <>
       {children}{" "}
       {trailingIcon && <Icon icon={trailingIcon} className={cn("size-4", trailingIconClassName)} />}
+      {shortcut && !tooltip && renderShortcutKey()}
+    </>
+  );
+
+  const linkElement = to ? (
+    <Link ref={innerRef} to={to} className={cn(classes, className)} {...props}>
+      {linkContent}
     </Link>
   ) : href ? (
-    <a href={href} className={cn(classes, className)} {...props}>
-      {children}{" "}
-      {trailingIcon && <Icon icon={trailingIcon} className={cn("size-4", trailingIconClassName)} />}
+    <a ref={innerRef} href={href} className={cn(classes, className)} {...props}>
+      {linkContent}
     </a>
   ) : (
     <span>Need to define a path or href</span>
   );
+
+  if (tooltip) {
+    return (
+      <TooltipProvider>
+        <Tooltip>
+          <TooltipTrigger asChild>{linkElement}</TooltipTrigger>
+          <TooltipContent className="text-dimmed flex items-center gap-3 py-1.5 pl-2.5 pr-3 text-xs">
+            {tooltip} {shortcut && renderShortcutKey()}
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    );
+  }
+
+  return linkElement;
 }
diff --git a/apps/webapp/app/components/primitives/Toast.tsx b/apps/webapp/app/components/primitives/Toast.tsx
index 21256e89ce5..5d8b002c49c 100644
--- a/apps/webapp/app/components/primitives/Toast.tsx
+++ b/apps/webapp/app/components/primitives/Toast.tsx
@@ -1,12 +1,15 @@
-import { ExclamationCircleIcon, XMarkIcon } from "@heroicons/react/20/solid";
+import { EnvelopeIcon, ExclamationCircleIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import { CheckCircleIcon } from "@heroicons/react/24/solid";
-import { Toaster, toast } from "sonner";
-
-import { useTypedLoaderData } from "remix-typedjson";
-import { loader } from "~/root";
+import { useSearchParams } from "@remix-run/react";
 import { useEffect } from "react";
-import { Paragraph } from "./Paragraph";
+import { useTypedLoaderData } from "remix-typedjson";
+import { Toaster, toast } from "sonner";
+import { type ToastMessageAction } from "~/models/message.server";
+import { type loader } from "~/root";
 import { cn } from "~/utils/cn";
+import { Button, LinkButton } from "./Buttons";
+import { Header2 } from "./Headers";
+import { Paragraph } from "./Paragraph";
 
 const defaultToastDuration = 5000;
 const permanentToastDuration = 60 * 60 * 24 * 1000;
@@ -19,9 +22,22 @@ export function Toast() {
     }
     const { message, type, options } = toastMessage;
 
-    toast.custom((t) => <ToastUI variant={type} message={message} t={t as string} />, {
-      duration: options.ephemeral ? defaultToastDuration : permanentToastDuration,
-    });
+    const ephemeral = options.action ? false : options.ephemeral;
+
+    toast.custom(
+      (t) => (
+        <ToastUI
+          variant={type}
+          message={message}
+          t={t as string}
+          title={options.title}
+          action={options.action}
+        />
+      ),
+      {
+        duration: ephemeral ? defaultToastDuration : permanentToastDuration,
+      }
+    );
   }, [toastMessage]);
 
   return <Toaster />;
@@ -32,11 +48,15 @@ export function ToastUI({
   message,
   t,
   toastWidth = 356, // Default width, matches what sonner provides by default
+  title,
+  action,
 }: {
   variant: "error" | "success";
   message: string;
   t: string;
   toastWidth?: string | number;
+  title?: string;
+  action?: ToastMessageAction;
 }) {
   return (
     <div
@@ -51,13 +71,19 @@ export function ToastUI({
     >
       <div className="flex w-full items-start gap-2 rounded-lg p-3">
         {variant === "success" ? (
-          <CheckCircleIcon className="mt-1 size-6 min-w-6 text-success" />
+          <CheckCircleIcon className="mt-1 size-4 min-w-4 text-success" />
         ) : (
-          <ExclamationCircleIcon className="mt-1 size-6 min-w-6 text-error" />
+          <ExclamationCircleIcon className="mt-1 size-4 min-w-4 text-error" />
         )}
-        <Paragraph className="py-1 text-text-bright">{message}</Paragraph>
+        <div className="flex flex-col">
+          {title && <Header2 className="pt-0">{title}</Header2>}
+          <Paragraph variant="small/dimmed" className="pb-1 pt-0.5">
+            {message}
+          </Paragraph>
+          <Action action={action} toastId={t} className="my-2" />
+        </div>
         <button
-          className="hover:bg-midnight-800 ms-auto rounded p-2 text-text-dimmed transition hover:text-text-bright"
+          className="hover:bg-midnight-800 -mr-1 -mt-1 ms-auto rounded p-2 text-text-dimmed transition hover:text-text-bright"
           onClick={() => toast.dismiss(t)}
         >
           <XMarkIcon className="size-4" />
@@ -66,3 +92,49 @@ export function ToastUI({
     </div>
   );
 }
+
+function Action({
+  action,
+  toastId,
+  className,
+}: {
+  action?: ToastMessageAction;
+  toastId: string;
+  className?: string;
+}) {
+  const [_, setSearchParams] = useSearchParams();
+
+  if (!action) return null;
+
+  switch (action.action.type) {
+    case "link": {
+      return (
+        <LinkButton
+          className={className}
+          variant={action.variant ?? "secondary/small"}
+          to={action.action.path}
+        >
+          {action.label}
+        </LinkButton>
+      );
+    }
+    case "help": {
+      const feedbackType = action.action.feedbackType;
+      return (
+        <Button
+          className={className}
+          variant={action.variant ?? "secondary/small"}
+          LeadingIcon={EnvelopeIcon}
+          onClick={() => {
+            setSearchParams({
+              feedbackPanel: feedbackType,
+            });
+            toast.dismiss(toastId);
+          }}
+        >
+          {action.label}
+        </Button>
+      );
+    }
+  }
+}
diff --git a/apps/webapp/app/components/primitives/Tooltip.tsx b/apps/webapp/app/components/primitives/Tooltip.tsx
index 15dd72894a5..c03492abcfd 100644
--- a/apps/webapp/app/components/primitives/Tooltip.tsx
+++ b/apps/webapp/app/components/primitives/Tooltip.tsx
@@ -64,6 +64,8 @@ function SimpleTooltip({
   buttonStyle,
   asChild = false,
   sideOffset,
+  open,
+  onOpenChange,
 }: {
   button: React.ReactNode;
   content: React.ReactNode;
@@ -76,13 +78,16 @@ function SimpleTooltip({
   buttonStyle?: React.CSSProperties;
   asChild?: boolean;
   sideOffset?: number;
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
 }) {
   return (
     <TooltipProvider disableHoverableContent={disableHoverableContent}>
-      <Tooltip>
+      <Tooltip open={open} onOpenChange={onOpenChange}>
         <TooltipTrigger
+          type="button"
           tabIndex={-1}
-          className={cn("h-fit", buttonClassName)}
+          className={cn(!asChild && "h-fit", buttonClassName)}
           style={buttonStyle}
           asChild={asChild}
         >
@@ -107,20 +112,28 @@ export function InfoIconTooltip({
   buttonClassName,
   contentClassName,
   variant = "basic",
+  disableHoverableContent = false,
+  enabled = true,
 }: {
   content: React.ReactNode;
   buttonClassName?: string;
   contentClassName?: string;
   variant?: Variant;
+  disableHoverableContent?: boolean;
+  enabled?: boolean;
 }) {
+  const icon = (
+    <InformationCircleIcon className={cn("size-3.5 text-text-dimmed flex-0", buttonClassName)} />
+  );
+
+  if (!enabled) return icon;
   return (
     <SimpleTooltip
-      button={
-        <InformationCircleIcon className={cn("size-3.5 text-text-dimmed", buttonClassName)} />
-      }
+      button={icon}
       content={content}
       variant={variant}
       className={contentClassName}
+      disableHoverableContent={disableHoverableContent}
     />
   );
 }
diff --git a/apps/webapp/app/components/primitives/TreeView/TreeView.tsx b/apps/webapp/app/components/primitives/TreeView/TreeView.tsx
index 7a2e368bec2..d1e002abb58 100644
--- a/apps/webapp/app/components/primitives/TreeView/TreeView.tsx
+++ b/apps/webapp/app/components/primitives/TreeView/TreeView.tsx
@@ -423,6 +423,10 @@ export function useTree<TData, TFilterValue>({
           }
           case "Left":
           case "ArrowLeft": {
+            if (e.metaKey) {
+              return;
+            }
+
             e.preventDefault();
 
             const selected = selectedIdFromState(state.nodes);
@@ -523,6 +527,7 @@ export function useTree<TData, TFilterValue>({
 /** An actual tree structure with custom data */
 export type Tree<TData> = {
   id: string;
+  runId?: string;
   children?: Tree<TData>[];
   data: TData;
 };
@@ -531,6 +536,7 @@ export type Tree<TData> = {
 export type FlatTreeItem<TData> = {
   id: string;
   parentId?: string | undefined;
+  runId?: string;
   children: string[];
   hasChildren: boolean;
   /** The indentation level, the root is 0 */
@@ -548,6 +554,7 @@ export function flattenTree<TData>(tree: Tree<TData>): FlatTree<TData> {
     flatTree.push({
       id: node.id,
       parentId,
+      runId: node.runId,
       children,
       hasChildren: children.length > 0,
       level,
@@ -567,6 +574,7 @@ export function flattenTree<TData>(tree: Tree<TData>): FlatTree<TData> {
 type FlatTreeWithoutChildren<TData> = {
   id: string;
   parentId: string | undefined;
+  runId?: string;
   data: TData;
 };
 
@@ -576,7 +584,7 @@ export function createTreeFromFlatItems<TData>(
 ): Tree<TData> | undefined {
   // Index items by id
   const indexedItems: { [id: string]: Tree<TData> } = withoutChildren.reduce((acc, item) => {
-    acc[item.id] = { id: item.id, data: item.data, children: [] };
+    acc[item.id] = { id: item.id, runId: item.runId, data: item.data, children: [] };
     return acc;
   }, {} as { [id: string]: Tree<TData> });
 
diff --git a/apps/webapp/app/components/primitives/TreeView/utils.ts b/apps/webapp/app/components/primitives/TreeView/utils.ts
index fb9a02f73c9..0e17288bf6f 100644
--- a/apps/webapp/app/components/primitives/TreeView/utils.ts
+++ b/apps/webapp/app/components/primitives/TreeView/utils.ts
@@ -39,14 +39,14 @@ export function concreteStateFromInput({
   }
   const nodes = concreteStateFromPartialState(tree, state);
 
-  return {
+  return applyFilterToState({
     tree,
     nodes,
     changes: { selectedId },
     filter,
     filteredNodes: nodes,
-    visibleNodeIds: visibleNodes(tree, nodes).map((node) => node.id),
-  };
+    visibleNodeIds: [],
+  });
 }
 
 export function concreteStateFromPartialState<TData>(
diff --git a/apps/webapp/app/components/primitives/charts/BigNumberCard.tsx b/apps/webapp/app/components/primitives/charts/BigNumberCard.tsx
new file mode 100644
index 00000000000..7ea88b3fe96
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/BigNumberCard.tsx
@@ -0,0 +1,191 @@
+import type { ColumnFormatType, OutputColumnMetadata } from "@internal/tsql";
+import { Hash } from "lucide-react";
+import { useMemo } from "react";
+import type {
+  BigNumberAggregationType,
+  BigNumberConfiguration,
+} from "~/components/metrics/QueryWidget";
+import { createValueFormatter } from "~/utils/columnFormat";
+import { AnimatedNumber } from "../AnimatedNumber";
+import { ChartBlankState } from "./ChartBlankState";
+import { Spinner } from "../Spinner";
+
+interface BigNumberCardProps {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+  config: BigNumberConfiguration;
+  isLoading?: boolean;
+}
+
+/**
+ * Extracts numeric values from a specific column across all rows,
+ * optionally sorting them first.
+ */
+function extractColumnValues(
+  rows: Record<string, unknown>[],
+  column: string,
+  sortDirection?: "asc" | "desc"
+): number[] {
+  const values: number[] = [];
+  const sortedRows = sortDirection
+    ? [...rows].sort((a, b) => {
+        const aVal = toNumber(a[column]);
+        const bVal = toNumber(b[column]);
+        return sortDirection === "asc" ? aVal - bVal : bVal - aVal;
+      })
+    : rows;
+
+  for (const row of sortedRows) {
+    const val = row[column];
+    if (typeof val === "number") {
+      values.push(val);
+    } else if (typeof val === "string") {
+      const parsed = parseFloat(val);
+      if (!isNaN(parsed)) {
+        values.push(parsed);
+      }
+    }
+  }
+  return values;
+}
+
+function toNumber(value: unknown): number {
+  if (typeof value === "number") return value;
+  if (typeof value === "string") {
+    const parsed = parseFloat(value);
+    return isNaN(parsed) ? 0 : parsed;
+  }
+  return 0;
+}
+
+/**
+ * Aggregate an array of numbers using the specified aggregation function
+ */
+function aggregateValues(values: number[], aggregation: BigNumberAggregationType): number {
+  if (values.length === 0) return 0;
+  switch (aggregation) {
+    case "sum":
+      return values.reduce((a, b) => a + b, 0);
+    case "avg":
+      return values.reduce((a, b) => a + b, 0) / values.length;
+    case "count":
+      return values.length;
+    case "min":
+      return Math.min(...values);
+    case "max":
+      return Math.max(...values);
+    case "first":
+      return values[0];
+    case "last":
+      return values[values.length - 1];
+  }
+}
+
+/**
+ * Computes the display value and unit suffix for abbreviated display.
+ * Returns the divided-down number (e.g. 1.5 for 1500) and the suffix (e.g. "K"),
+ * along with the appropriate decimal places for formatting.
+ */
+function abbreviateValue(value: number): {
+  displayValue: number;
+  unitSuffix?: string;
+  decimalPlaces: number;
+} {
+  if (Math.abs(value) >= 1_000_000_000) {
+    const v = value / 1_000_000_000;
+    return { displayValue: v, unitSuffix: "B", decimalPlaces: v % 1 === 0 ? 0 : 1 };
+  }
+  if (Math.abs(value) >= 1_000_000) {
+    const v = value / 1_000_000;
+    return { displayValue: v, unitSuffix: "M", decimalPlaces: v % 1 === 0 ? 0 : 1 };
+  }
+  if (Math.abs(value) >= 1_000) {
+    const v = value / 1_000;
+    return { displayValue: v, unitSuffix: "K", decimalPlaces: v % 1 === 0 ? 0 : 1 };
+  }
+  return { displayValue: value, decimalPlaces: getDecimalPlaces(value) };
+}
+
+/**
+ * Determines decimal places for plain (non-abbreviated) display.
+ */
+function getDecimalPlaces(value: number): number {
+  if (Number.isInteger(value)) return 0;
+  const abs = Math.abs(value);
+  if (abs >= 100) return 0;
+  if (abs >= 10) return 1;
+  if (abs >= 1) return 2;
+  if (abs >= 0.01) return 3;
+  return 4;
+}
+
+export function BigNumberCard({ rows, columns, config, isLoading = false }: BigNumberCardProps) {
+  const { column, aggregation, sortDirection, abbreviate = true, prefix, suffix } = config;
+
+  const result = useMemo(() => {
+    if (rows.length === 0) return null;
+
+    const values = extractColumnValues(rows, column, sortDirection);
+    if (values.length === 0) return null;
+
+    return aggregateValues(values, aggregation);
+  }, [rows, column, aggregation, sortDirection]);
+
+  // Look up column format for format-aware display
+  const columnValueFormatter = useMemo(() => {
+    const columnMeta = columns.find((c) => c.name === column);
+    const formatType = (columnMeta?.format ?? columnMeta?.customRenderType) as
+      | ColumnFormatType
+      | undefined;
+    return createValueFormatter(formatType);
+  }, [columns, column]);
+
+  if (isLoading) {
+    return (
+      <div className="grid h-full place-items-center [container-type:size]">
+        <Spinner className="size-6" />
+      </div>
+    );
+  }
+
+  if (result === null) {
+    return <ChartBlankState icon={Hash} message="No data to display" />;
+  }
+
+  // Use format-aware formatter when available
+  if (columnValueFormatter) {
+    return (
+      <div className="h-full w-full [container-type:size]">
+        <div className="grid h-full w-full place-items-center">
+          <div className="flex items-baseline gap-[0.15em] whitespace-nowrap text-[clamp(24px,12cqw,96px)] font-normal tabular-nums leading-none text-text-bright">
+            {prefix && <span>{prefix}</span>}
+            <span>{columnValueFormatter(result)}</span>
+            {suffix && <span className="text-[0.4em] text-text-dimmed">{suffix}</span>}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  const { displayValue, unitSuffix, decimalPlaces } = abbreviate
+    ? abbreviateValue(result)
+    : { displayValue: result, unitSuffix: undefined, decimalPlaces: getDecimalPlaces(result) };
+
+  return (
+    <div className="h-full w-full [container-type:size]">
+      <div className="grid h-full w-full place-items-center">
+        <div className="flex items-baseline gap-[0.15em] whitespace-nowrap text-[clamp(24px,12cqw,96px)] font-normal tabular-nums leading-none text-text-bright">
+          {prefix && <span>{prefix}</span>}
+          <AnimatedNumber value={displayValue} decimalPlaces={decimalPlaces} />
+          {(unitSuffix || suffix) && (
+            <span className="text-[0.4em] text-text-dimmed">
+              {unitSuffix}
+              {unitSuffix && suffix ? " " : ""}
+              {suffix}
+            </span>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/Card.tsx b/apps/webapp/app/components/primitives/charts/Card.tsx
new file mode 100644
index 00000000000..f4fb13b51bc
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/Card.tsx
@@ -0,0 +1,41 @@
+import { type ReactNode } from "react";
+import { cn } from "~/utils/cn";
+import { Header3 } from "../Headers";
+
+export const Card = ({ children, className }: { children: ReactNode; className?: string }) => {
+  return (
+    <div
+      className={cn(
+        "flex flex-col rounded-lg border border-grid-bright bg-background-bright pb-1.5 pt-3",
+        className
+      )}
+    >
+      {children}
+    </div>
+  );
+};
+
+const CardHeader = ({ children, draggable }: { children: ReactNode; draggable?: boolean }) => {
+  return (
+    <Header3
+      className={cn(
+        "drag-handle mb-3 flex items-center justify-between gap-2 pl-4 pr-3",
+        draggable && "cursor-grab active:cursor-grabbing"
+      )}
+    >
+      {children}
+    </Header3>
+  );
+};
+
+const CardContent = ({ children, className }: { children: ReactNode; className?: string }) => {
+  return <div className={cn("px-2", className)}>{children}</div>;
+};
+
+const CardAccessory = ({ children }: { children: ReactNode }) => {
+  return <div className="flex items-center gap-2">{children}</div>;
+};
+
+Card.Header = CardHeader;
+Card.Content = CardContent;
+Card.Accessory = CardAccessory;
diff --git a/apps/webapp/app/components/primitives/Chart.tsx b/apps/webapp/app/components/primitives/charts/Chart.tsx
similarity index 57%
rename from apps/webapp/app/components/primitives/Chart.tsx
rename to apps/webapp/app/components/primitives/charts/Chart.tsx
index 1f1fec3bbe3..ffed1a2bc12 100644
--- a/apps/webapp/app/components/primitives/Chart.tsx
+++ b/apps/webapp/app/components/primitives/charts/Chart.tsx
@@ -1,16 +1,18 @@
-"use client";
-
 import * as React from "react";
 import * as RechartsPrimitive from "recharts";
 import { cn } from "~/utils/cn";
+import { AnimatedNumber } from "../AnimatedNumber";
 
 // Format: { THEME_NAME: CSS_SELECTOR }
 const THEMES = { light: "", dark: ".dark" } as const;
 
+export type ChartState = "loading" | "noData" | "invalid" | "loaded" | undefined;
+
 export type ChartConfig = {
   [k in string]: {
     label?: React.ReactNode;
     icon?: React.ComponentType;
+    value?: number;
   } & (
     | { color?: string; theme?: never }
     | { color?: never; theme: Record<keyof typeof THEMES, string> }
@@ -49,15 +51,13 @@ const ChartContainer = React.forwardRef<
         data-chart={chartId}
         ref={ref}
         className={cn(
-          "flex aspect-video justify-center text-xs [&_.recharts-cartesian-axis-tick_text]:fill-text-dimmed/50 [&_.recharts-cartesian-grid_line]:stroke-grid-bright/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-grid-dimmed [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-none [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-grid-dimmed [&_.recharts-radial-bar-background-sector]:fill-grid-dimmed [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-grid-dimmed [&_.recharts-reference-line-line]:stroke-grid-dimmed [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-sector]:outline-none [&_.recharts-surface]:outline-none",
+          "[&_.recharts-cartesian-axis-tick_text]:fill-muted-foreground [&_.recharts-cartesian-grid_line[stroke='#ccc']]:stroke-border/50 [&_.recharts-curve.recharts-tooltip-cursor]:stroke-border [&_.recharts-polar-grid_[stroke='#ccc']]:stroke-border [&_.recharts-radial-bar-background-sector]:fill-muted [&_.recharts-rectangle.recharts-tooltip-cursor]:fill-muted [&_.recharts-reference-line_[stroke='#ccc']]:stroke-border flex aspect-video justify-center text-xs [&_.recharts-dot[stroke='#fff']]:stroke-transparent [&_.recharts-layer]:outline-none [&_.recharts-sector[stroke='#fff']]:stroke-transparent [&_.recharts-sector]:outline-none [&_.recharts-surface]:outline-none",
           className
         )}
         {...props}
       >
         <ChartStyle id={chartId} config={config} />
-        <RechartsPrimitive.ResponsiveContainer className="!h-auto">
-          {children}
-        </RechartsPrimitive.ResponsiveContainer>
+        <RechartsPrimitive.ResponsiveContainer>{children}</RechartsPrimitive.ResponsiveContainer>
       </div>
     </ChartContext.Provider>
   );
@@ -65,7 +65,7 @@ const ChartContainer = React.forwardRef<
 ChartContainer.displayName = "Chart";
 
 const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
-  const colorConfig = Object.entries(config).filter(([_, config]) => config.theme || config.color);
+  const colorConfig = Object.entries(config).filter(([, config]) => config.theme || config.color);
 
   if (!colorConfig.length) {
     return null;
@@ -74,8 +74,9 @@ const ChartStyle = ({ id, config }: { id: string; config: ChartConfig }) => {
   return (
     <style
       dangerouslySetInnerHTML={{
-        __html: Object.entries(THEMES).map(
-          ([theme, prefix]) => `
+        __html: Object.entries(THEMES)
+          .map(
+            ([theme, prefix]) => `
 ${prefix} [data-chart=${id}] {
 ${colorConfig
   .map(([key, itemConfig]) => {
@@ -85,7 +86,8 @@ ${colorConfig
   .join("\n")}
 }
 `
-        ),
+          )
+          .join("\n"),
       }}
     />
   );
@@ -102,6 +104,8 @@ const ChartTooltipContent = React.forwardRef<
       indicator?: "line" | "dot" | "dashed";
       nameKey?: string;
       labelKey?: string;
+      /** Optional formatter for numeric values (e.g. bytes, duration) */
+      valueFormatter?: (value: number) => string;
     }
 >(
   (
@@ -119,6 +123,7 @@ const ChartTooltipContent = React.forwardRef<
       color,
       nameKey,
       labelKey,
+      valueFormatter,
     },
     ref
   ) => {
@@ -130,7 +135,7 @@ const ChartTooltipContent = React.forwardRef<
       }
 
       const [item] = payload;
-      const key = `${labelKey || item.dataKey || item.name || "value"}`;
+      const key = `${labelKey || item?.dataKey || item?.name || "value"}`;
       const itemConfig = getPayloadConfigFromPayload(config, item, key);
       const value =
         !labelKey && typeof label === "string"
@@ -160,7 +165,7 @@ const ChartTooltipContent = React.forwardRef<
       <div
         ref={ref}
         className={cn(
-          "grid min-w-[8rem] items-start gap-1.5 rounded-lg border border-grid-bright/50 bg-background-dimmed px-2.5 py-1.5 text-xs shadow-xl",
+          "grid min-w-[8rem] items-start gap-1.5 rounded-lg border border-grid-bright bg-background-bright px-2.5 py-1.5 text-xs shadow-xl",
           className
         )}
       >
@@ -175,11 +180,11 @@ const ChartTooltipContent = React.forwardRef<
               <div
                 key={item.dataKey}
                 className={cn(
-                  "flex w-full items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5 [&>svg]:text-text-dimmed",
+                  "[&>svg]:text-muted-foreground flex w-full flex-wrap items-stretch gap-2 [&>svg]:h-2.5 [&>svg]:w-2.5",
                   indicator === "dot" && "items-center"
                 )}
               >
-                {formatter && item.value && item.name ? (
+                {formatter && item?.value !== undefined && item.name ? (
                   formatter(item.value, item.name, item, index, item.payload)
                 ) : (
                   <>
@@ -209,17 +214,21 @@ const ChartTooltipContent = React.forwardRef<
                     )}
                     <div
                       className={cn(
-                        "flex flex-1 justify-between gap-1.5 leading-none",
+                        "flex flex-1 justify-between leading-none",
                         nestLabel ? "items-end" : "items-center"
                       )}
                     >
                       <div className="grid gap-1.5">
                         {nestLabel ? tooltipLabel : null}
-                        <span className="text-text-dimmed">{itemConfig?.label || item.name}</span>
+                        <span className="text-muted-foreground">
+                          {itemConfig?.label || item.name}
+                        </span>
                       </div>
-                      {item.value && (
-                        <span className="font-mono font-medium tabular-nums text-text-bright">
-                          {item.value.toLocaleString()}
+                      {item.value != null && (
+                        <span className="text-foreground font-mono font-medium tabular-nums">
+                          {valueFormatter && typeof item.value === "number"
+                            ? valueFormatter(item.value)
+                            : item.value.toLocaleString()}
                         </span>
                       )}
                     </div>
@@ -237,6 +246,12 @@ ChartTooltipContent.displayName = "ChartTooltip";
 
 const ChartLegend = RechartsPrimitive.Legend;
 
+type ExtendedLegendPayload = Parameters<
+  NonNullable<RechartsPrimitive.LegendProps["formatter"]>
+>[0] & {
+  payload?: { remainingCount?: number };
+};
+
 const ChartLegendContent = React.forwardRef<
   HTMLDivElement,
   React.ComponentProps<"div"> &
@@ -268,7 +283,7 @@ const ChartLegendContent = React.forwardRef<
           <div
             key={item.value}
             className={cn(
-              "flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-text-dimmed"
+              "[&>svg]:text-muted-foreground flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3"
             )}
           >
             {itemConfig?.icon && !hideIcon ? (
@@ -290,6 +305,125 @@ const ChartLegendContent = React.forwardRef<
 });
 ChartLegendContent.displayName = "ChartLegend";
 
+const ChartLegendContentRows = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> &
+    Omit<Pick<RechartsPrimitive.LegendProps, "payload" | "verticalAlign">, "payload"> & {
+      payload?: ExtendedLegendPayload[];
+      hideIcon?: boolean;
+      nameKey?: string;
+      onMouseEnter?: (e: any) => void;
+      onMouseLeave?: (e: any) => void;
+      data?: Record<string, number>;
+      activeKey?: string | null;
+      renderViewMore?: (remainingCount: number) => React.ReactNode;
+    }
+>(
+  (
+    {
+      className,
+      hideIcon = false,
+      payload,
+      verticalAlign = "bottom",
+      nameKey,
+      onMouseEnter,
+      onMouseLeave,
+      data,
+      activeKey,
+      renderViewMore,
+    },
+    ref
+  ) => {
+    const { config } = useChart();
+
+    if (!payload?.length) {
+      return null;
+    }
+
+    return (
+      <div
+        ref={ref}
+        className={cn(
+          "flex flex-col items-start justify-between",
+          verticalAlign === "top" ? "pb-4" : "pt-4",
+          className
+        )}
+      >
+        {payload.map((item) => {
+          const key = `${nameKey || item.dataKey || "value"}`;
+          const itemConfig = getPayloadConfigFromPayload(config, item, key);
+
+          // Handle view more button
+          if (item.dataKey === "view-more" && renderViewMore && item.payload?.remainingCount) {
+            return renderViewMore(item.payload.remainingCount);
+          }
+
+          const total = item.dataKey && data ? data[item.dataKey as string] : undefined;
+
+          return (
+            <div
+              key={key}
+              className={cn(
+                "relative flex w-full items-center justify-between gap-2 rounded px-2 py-1 transition",
+                total === 0 && "opacity-50"
+              )}
+              onMouseEnter={() => onMouseEnter?.(item)}
+              onMouseLeave={() => onMouseLeave?.(item)}
+            >
+              {activeKey === item.dataKey && item.color && (
+                <div
+                  className="absolute inset-0 rounded opacity-10"
+                  style={{ backgroundColor: item.color }}
+                />
+              )}
+              <div className="relative flex w-full items-center justify-between gap-2">
+                <div
+                  className={cn(
+                    "flex items-center gap-1.5 [&>svg]:h-3 [&>svg]:w-3 [&>svg]:text-text-dimmed"
+                  )}
+                >
+                  {itemConfig?.icon && !hideIcon ? (
+                    <itemConfig.icon />
+                  ) : (
+                    item.color && (
+                      <div
+                        className="h-3 w-1 shrink-0 rounded-[2px]"
+                        style={{
+                          backgroundColor: item.color,
+                        }}
+                      />
+                    )
+                  )}
+                  {itemConfig?.label && (
+                    <span
+                      className={
+                        activeKey === item.dataKey ? "text-text-bright" : "text-text-dimmed"
+                      }
+                    >
+                      {itemConfig.label}
+                    </span>
+                  )}
+                </div>
+                {total !== undefined && (
+                  <span
+                    className={cn(
+                      "tabular-nums",
+                      activeKey === item.dataKey ? "text-text-bright" : "text-text-dimmed"
+                    )}
+                  >
+                    <AnimatedNumber value={total} duration={0.25} />
+                  </span>
+                )}
+              </div>
+            </div>
+          );
+        })}
+      </div>
+    );
+  }
+);
+ChartLegendContentRows.displayName = "ChartLegendRows";
+
 // Helper to extract item config from a payload.
 function getPayloadConfigFromPayload(config: ChartConfig, payload: unknown, key: string) {
   if (typeof payload !== "object" || payload === null) {
@@ -322,5 +456,6 @@ export {
   ChartTooltipContent,
   ChartLegend,
   ChartLegendContent,
+  ChartLegendContentRows,
   ChartStyle,
 };
diff --git a/apps/webapp/app/components/primitives/charts/ChartBar.tsx b/apps/webapp/app/components/primitives/charts/ChartBar.tsx
new file mode 100644
index 00000000000..28493070c06
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartBar.tsx
@@ -0,0 +1,259 @@
+import React, { useCallback } from "react";
+import {
+  Bar,
+  BarChart,
+  CartesianGrid,
+  ReferenceArea,
+  ReferenceLine,
+  XAxis,
+  YAxis,
+  type XAxisProps,
+  type YAxisProps,
+} from "recharts";
+import { ChartTooltip, ChartTooltipContent } from "~/components/primitives/charts/Chart";
+import { useChartContext } from "./ChartContext";
+import { ChartBarInvalid, ChartBarLoading, ChartBarNoData } from "./ChartLoading";
+import { useHasNoData } from "./ChartRoot";
+import { ZoomTooltip, useZoomHandlers } from "./ChartZoom";
+
+//TODO: fix the first and last bars in a stack not having rounded corners
+
+type ReferenceLineProps = {
+  value: number;
+  label: string;
+};
+
+// ============================================================================
+// COMPOUND COMPONENT API
+// ============================================================================
+
+export type ChartBarRendererProps = {
+  /** Stack ID for stacked bar charts */
+  stackId?: string;
+  /** Custom X-axis props to merge with defaults */
+  xAxisProps?: Partial<XAxisProps>;
+  /** Custom Y-axis props to merge with defaults */
+  yAxisProps?: Partial<YAxisProps>;
+  /** Reference line (horizontal) */
+  referenceLine?: ReferenceLineProps;
+  /** Custom tooltip label formatter */
+  tooltipLabelFormatter?: (label: string, payload: any[]) => string;
+  /** Optional formatter for numeric tooltip values (e.g. bytes, duration) */
+  tooltipValueFormatter?: (value: number) => string;
+  /** Width injected by ResponsiveContainer */
+  width?: number;
+  /** Height injected by ResponsiveContainer */
+  height?: number;
+};
+
+/**
+ * Bar chart renderer for the compound component system.
+ * Must be used within a Chart.Root.
+ *
+ * @example
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day">
+ *   <Chart.Bar stackId="a" />
+ *   <Chart.Legend />
+ * </Chart.Root>
+ * ```
+ */
+export function ChartBarRenderer({
+  stackId,
+  xAxisProps: xAxisPropsProp,
+  yAxisProps: yAxisPropsProp,
+  referenceLine,
+  tooltipLabelFormatter,
+  tooltipValueFormatter,
+  width,
+  height,
+}: ChartBarRendererProps) {
+  const { config, data, dataKey, dataKeys, visibleSeries, state, highlight, setActivePayload, zoom, showLegend } = useChartContext();
+  const hasNoData = useHasNoData();
+  const zoomHandlers = useZoomHandlers();
+  const enableZoom = zoom !== null;
+
+  const handleBarClick = useCallback(
+    (barData: any, e: React.MouseEvent) => {
+      if (!enableZoom || !zoom) return;
+      e.stopPropagation();
+
+      if (!zoom.isSelecting) {
+        zoom.toggleInspectionLine(barData[dataKey]);
+      }
+    },
+    [enableZoom, zoom, dataKey]
+  );
+
+  // Handle mouse leave to also reset highlight
+  const handleMouseLeave = useCallback(() => {
+    zoomHandlers.onMouseLeave?.();
+    highlight.reset();
+  }, [zoomHandlers, highlight]);
+
+  // Render loading/error states
+  if (state === "loading") {
+    return <ChartBarLoading />;
+  } else if (state === "noData" || hasNoData) {
+    return <ChartBarNoData />;
+  } else if (state === "invalid") {
+    return <ChartBarInvalid />;
+  }
+
+  // Get the x-axis ticks based on tooltip state
+  // Only hide middle ticks when zoom is enabled (to make room for zoom instructions)
+  const xAxisTicks =
+    enableZoom && highlight.tooltipActive && data.length > 2
+      ? [data[0]?.[dataKey], data[data.length - 1]?.[dataKey]]
+      : undefined;
+
+  return (
+    <BarChart
+      data={data}
+      width={width}
+      height={height}
+      barCategoryGap={1}
+      onMouseDown={zoomHandlers.onMouseDown}
+      onMouseMove={(e: any) => {
+        zoomHandlers.onMouseMove?.(e);
+        if (e?.activePayload?.length) {
+          setActivePayload(e.activePayload, e.activeTooltipIndex);
+          highlight.setTooltipActive(true);
+        } else {
+          highlight.setTooltipActive(false);
+        }
+      }}
+      onMouseUp={zoomHandlers.onMouseUp}
+      onClick={zoomHandlers.onClick}
+      onMouseLeave={handleMouseLeave}
+    >
+      <CartesianGrid vertical={false} stroke="#272A2E" />
+      <XAxis
+        dataKey={dataKey}
+        tickLine={false}
+        tickMargin={10}
+        axisLine={false}
+        ticks={xAxisTicks}
+        interval="preserveStartEnd"
+        tick={{
+          fill: "#878C99",
+          fontSize: 11,
+          style: { fontVariantNumeric: "tabular-nums" },
+        }}
+        {...xAxisPropsProp}
+      />
+      <YAxis
+        axisLine={false}
+        tickLine={false}
+        tickMargin={8}
+        tick={{
+          fill: "#878C99",
+          fontSize: 11,
+          style: { fontVariantNumeric: "tabular-nums" },
+        }}
+        domain={["auto", (dataMax: number) => dataMax * 1.15]}
+        {...yAxisPropsProp}
+      />
+      {/* When legend is shown below the chart, render tooltip with cursor only (no content popup).
+          Otherwise render the full tooltip with zoom instructions. */}
+      <ChartTooltip
+        cursor={{ fill: "rgba(255, 255, 255, 0.06)" }}
+        content={
+          showLegend ? (
+            () => null
+          ) : tooltipLabelFormatter ? (
+            <ChartTooltipContent valueFormatter={tooltipValueFormatter} />
+          ) : (
+            <ZoomTooltip
+              isSelecting={zoom?.isSelecting}
+              refAreaLeft={zoom?.refAreaLeft}
+              refAreaRight={zoom?.refAreaRight}
+              invalidSelection={zoom?.invalidSelection}
+            />
+          )
+        }
+        labelFormatter={tooltipLabelFormatter}
+        allowEscapeViewBox={{ x: false, y: true }}
+      />
+
+      {/* Zoom selection area - rendered before bars to appear behind them */}
+      {enableZoom && zoom?.refAreaLeft !== null && zoom?.refAreaRight !== null && (
+        <ReferenceArea
+          x1={zoom.refAreaLeft}
+          x2={zoom.refAreaRight}
+          strokeOpacity={0.4}
+          fill="#3B82F6"
+          fillOpacity={0.3}
+        />
+      )}
+
+      {visibleSeries.map((key, index, array) => {
+        const dimmed =
+          !zoom?.isSelecting &&
+          highlight.activeBarKey !== null &&
+          highlight.activeBarKey !== key;
+
+        return (
+          <Bar
+            key={key}
+            dataKey={key}
+            stackId={stackId}
+            fill={config[key]?.color}
+            radius={
+              [
+                index === array.length - 1 ? 2 : 0,
+                index === array.length - 1 ? 2 : 0,
+                index === 0 ? 2 : 0,
+                index === 0 ? 2 : 0,
+              ] as [number, number, number, number]
+            }
+            activeBar={false}
+            fillOpacity={dimmed ? 0.2 : 1}
+            onClick={(data, index, e) => handleBarClick(data, e)}
+            onMouseEnter={(entry, index) => {
+              if (entry.tooltipPayload?.[0]) {
+                const { dataKey: hoveredKey } = entry.tooltipPayload[0];
+                highlight.setHoveredBar(hoveredKey, index);
+              }
+            }}
+            onMouseLeave={highlight.reset}
+            isAnimationActive={false}
+          />
+        );
+      })}
+
+      {/* Horizontal reference line */}
+      {referenceLine && (
+        <ReferenceLine
+          y={referenceLine.value}
+          label={{
+            position: "top",
+            value: referenceLine.label,
+            fill: "#878C99",
+            fontSize: 11,
+          }}
+          isFront={true}
+          stroke="#3B3E45"
+          strokeDasharray="4 4"
+          className="pointer-events-none"
+        />
+      )}
+
+      {/* Zoom inspection line - rendered after bars to appear on top */}
+      {enableZoom && zoom?.inspectionLine && (
+        <ReferenceLine
+          x={zoom.inspectionLine}
+          stroke="#D7D9DD"
+          strokeWidth={2}
+          isFront={true}
+          onClick={(e: any) => {
+            e?.stopPropagation?.();
+            zoom.clearInspectionLine();
+          }}
+        />
+      )}
+
+      {/* Note: Legend is now rendered by ChartRoot outside the chart container */}
+    </BarChart>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartBlankState.tsx b/apps/webapp/app/components/primitives/charts/ChartBlankState.tsx
new file mode 100644
index 00000000000..9a093254e00
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartBlankState.tsx
@@ -0,0 +1,23 @@
+import { cn } from "~/utils/cn";
+import { Paragraph } from "../Paragraph";
+
+export function ChartBlankState({
+  icon: Icon,
+  message,
+  className,
+}: {
+  icon?: React.ComponentType<{ className?: string }>;
+  message: string;
+  className?: string;
+}) {
+  return (
+    <div className={cn("flex h-full w-full items-center justify-center", className)}>
+      <div className="-mt-3 flex flex-col items-center gap-2">
+        {Icon && <Icon className="size-12 text-charcoal-700" />}
+        <Paragraph variant="small" className="text-text-dimmed/70">
+          {message}
+        </Paragraph>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartCompound.tsx b/apps/webapp/app/components/primitives/charts/ChartCompound.tsx
new file mode 100644
index 00000000000..bbd78fc1b32
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartCompound.tsx
@@ -0,0 +1,106 @@
+/**
+ * Compound Chart Component System
+ *
+ * This module exports a unified Chart compound component that can render
+ * different chart types (bar, line, etc.) with optional features like
+ * zoom and legends.
+ *
+ * Note: Due to recharts' component hierarchy requirements, the Legend must be
+ * rendered inside the chart component (BarChart, LineChart). Use the showLegend
+ * prop on Chart.Bar or Chart.Line instead of Chart.Legend as a sibling.
+ *
+ * @example Simple bar chart with legend
+ * ```tsx
+ * import { Chart } from "~/components/primitives/charts/ChartCompound";
+ *
+ * <Chart.Root config={config} data={data} dataKey="day">
+ *   <Chart.Bar stackId="a" showLegend maxLegendItems={5} />
+ * </Chart.Root>
+ * ```
+ *
+ * @example Line chart
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day">
+ *   <Chart.Line lineType="step" showLegend />
+ * </Chart.Root>
+ * ```
+ *
+ * @example Bar chart with zoom (callback-based)
+ * ```tsx
+ * function MyChart() {
+ *   const handleZoomChange = (range: ZoomRange) => {
+ *     // Fetch new data based on range, update state
+ *   };
+ *
+ *   return (
+ *     <Chart.Root
+ *       config={config}
+ *       data={data}
+ *       dataKey="day"
+ *       enableZoom
+ *       onZoomChange={handleZoomChange}
+ *     >
+ *       <Chart.Bar stackId="a" showLegend />
+ *     </Chart.Root>
+ *   );
+ * }
+ * ```
+ *
+ * @example Dashboard with synced charts (using DateRangeContext)
+ * ```tsx
+ * <DateRangeProvider defaultStartDate={start} defaultEndDate={end}>
+ *   <DashboardControls />
+ *
+ *   <Chart.Root config={config1} data={data1} dataKey="day" enableZoom onZoomChange={handleZoom1}>
+ *     <Chart.Bar showLegend />
+ *   </Chart.Root>
+ *
+ *   <Chart.Root config={config2} data={data2} dataKey="day" enableZoom onZoomChange={handleZoom2}>
+ *     <Chart.Line showLegend />
+ *   </Chart.Root>
+ * </DateRangeProvider>
+ * ```
+ */
+
+import { ChartRoot } from "./ChartRoot";
+import { ChartBarRenderer } from "./ChartBar";
+import { ChartLineRenderer } from "./ChartLine";
+import { ChartLegendCompound } from "./ChartLegendCompound";
+import { ChartZoom } from "./ChartZoom";
+
+// Re-export types
+export type { ChartConfig, ChartState } from "./Chart";
+export type { ZoomRange } from "./hooks/useZoomSelection";
+export type { ChartRootProps } from "./ChartRoot";
+export type { ChartBarRendererProps } from "./ChartBar";
+export type { ChartLineRendererProps } from "./ChartLine";
+export type { ChartLegendCompoundProps } from "./ChartLegendCompound";
+export type { ChartZoomProps } from "./ChartZoom";
+
+/**
+ * Chart compound component for building flexible, composable charts.
+ *
+ * Components:
+ * - `Chart.Root` - Main wrapper that provides context
+ * - `Chart.Bar` - Bar chart renderer (use showLegend prop for legend)
+ * - `Chart.Line` - Line/area chart renderer (use showLegend prop for legend)
+ * - `Chart.Zoom` - Optional zoom overlay (rendered internally when enableZoom is set)
+ *
+ * Note: Chart.Legend is exported for advanced use cases but should typically
+ * be enabled via the showLegend prop on Chart.Bar or Chart.Line.
+ */
+export const Chart = {
+  Root: ChartRoot,
+  Bar: ChartBarRenderer,
+  Line: ChartLineRenderer,
+  Legend: ChartLegendCompound,
+  Zoom: ChartZoom,
+};
+
+// Also export individual components for direct imports
+export { ChartRoot, ChartBarRenderer, ChartLineRenderer, ChartLegendCompound, ChartZoom };
+
+// Re-export context hook for advanced usage
+export { useChartContext } from "./ChartContext";
+export { useHasNoData, useSeriesTotal } from "./ChartRoot";
+export { useZoomHandlers, ZoomTooltip } from "./ChartZoom";
diff --git a/apps/webapp/app/components/primitives/charts/ChartContext.tsx b/apps/webapp/app/components/primitives/charts/ChartContext.tsx
new file mode 100644
index 00000000000..b26d431dd92
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartContext.tsx
@@ -0,0 +1,166 @@
+import React, { createContext, useCallback, useContext, useMemo, useRef, useState } from "react";
+import type { ChartConfig, ChartState } from "./Chart";
+import { useHighlightState, type UseHighlightStateReturn } from "./hooks/useHighlightState";
+import {
+  useZoomSelection,
+  type UseZoomSelectionReturn,
+  type ZoomRange,
+} from "./hooks/useZoomSelection";
+
+/** Function to format the x-axis label for display */
+export type LabelFormatter = (value: string) => string;
+
+export type ChartContextValue = {
+  // Core data
+  config: ChartConfig;
+  data: any[];
+  dataKey: string;
+  /** Computed series keys (all config keys except dataKey) */
+  dataKeys: string[];
+  /** Subset of dataKeys actually rendered as SVG elements (defaults to dataKeys) */
+  visibleSeries: string[];
+
+  // Display state
+  state?: ChartState;
+
+  // Formatters
+  /** Function to format the x-axis label (used in legend, tooltips, etc.) */
+  labelFormatter?: LabelFormatter;
+
+  // Highlight state (does NOT include activePayload — see PayloadContext)
+  highlight: UseHighlightStateReturn;
+
+  /** Update the active payload for the legend. Pass tooltipIndex to skip redundant updates. */
+  setActivePayload: (payload: any[] | null, tooltipIndex?: number | null) => void;
+
+  // Zoom state (only present when zoom is enabled)
+  zoom: UseZoomSelectionReturn | null;
+
+  // Zoom callback (only present when zoom is enabled)
+  onZoomChange?: (range: ZoomRange) => void;
+
+  // Whether the compound legend is shown (disables tooltip when true)
+  showLegend: boolean;
+};
+
+const ChartCompoundContext = createContext<ChartContextValue | null>(null);
+
+/**
+ * Separate context for activePayload so that frequent payload updates
+ * only re-render the legend, not the entire chart (bars, lines, etc.).
+ */
+const PayloadContext = createContext<any[] | null>(null);
+
+export function useChartContext(): ChartContextValue {
+  const context = useContext(ChartCompoundContext);
+  if (!context) {
+    throw new Error("useChartContext must be used within a Chart.Root component");
+  }
+  return context;
+}
+
+/** Read the active payload (only re-renders when payload changes). */
+export function useActivePayload(): any[] | null {
+  return useContext(PayloadContext);
+}
+
+export type ChartProviderProps = {
+  config: ChartConfig;
+  data: any[];
+  dataKey: string;
+  /** Series keys to render (if not provided, derived from config keys) */
+  series?: string[];
+  /** Subset of series to render as SVG elements on the chart (legend still shows all series) */
+  visibleSeries?: string[];
+  state?: ChartState;
+  /** Function to format the x-axis label (used in legend, tooltips, etc.) */
+  labelFormatter?: LabelFormatter;
+  /** Enable zoom functionality */
+  enableZoom?: boolean;
+  /** Callback when zoom range changes */
+  onZoomChange?: (range: ZoomRange) => void;
+  /** Whether the compound legend is shown (disables tooltip when true) */
+  showLegend?: boolean;
+  children: React.ReactNode;
+};
+
+export function ChartProvider({
+  config,
+  data,
+  dataKey,
+  series,
+  visibleSeries: visibleSeriesProp,
+  state,
+  labelFormatter,
+  enableZoom = false,
+  onZoomChange,
+  showLegend = false,
+  children,
+}: ChartProviderProps) {
+  const highlight = useHighlightState();
+  const zoomState = useZoomSelection();
+
+  // activePayload lives in its own state + context so updates don't re-render bars
+  const [activePayload, setActivePayloadRaw] = useState<any[] | null>(null);
+  const activeTooltipIndexRef = useRef<number | null>(null);
+
+  const setActivePayload = useCallback(
+    (payload: any[] | null, tooltipIndex?: number | null) => {
+      const idx = tooltipIndex ?? null;
+      if (idx !== null && idx === activeTooltipIndexRef.current) {
+        return;
+      }
+      activeTooltipIndexRef.current = idx;
+      setActivePayloadRaw(payload);
+    },
+    []
+  );
+
+  // Reset the tooltip index ref when highlight resets (mouse leaves chart)
+  const originalReset = highlight.reset;
+  const resetWithPayload = useCallback(() => {
+    activeTooltipIndexRef.current = null;
+    setActivePayloadRaw(null);
+    originalReset();
+  }, [originalReset]);
+
+  const highlightWithReset = useMemo(
+    () => ({ ...highlight, reset: resetWithPayload }),
+    [highlight, resetWithPayload]
+  );
+
+  // Compute series keys (use provided series or derive from config)
+  const dataKeys = useMemo(
+    () => series ?? Object.keys(config).filter((k) => k !== dataKey),
+    [series, config, dataKey]
+  );
+
+  const visibleSeries = useMemo(
+    () => visibleSeriesProp ?? dataKeys,
+    [visibleSeriesProp, dataKeys]
+  );
+
+  const value = useMemo<ChartContextValue>(
+    () => ({
+      config,
+      data,
+      dataKey,
+      dataKeys,
+      visibleSeries,
+      state,
+      labelFormatter,
+      highlight: highlightWithReset,
+      setActivePayload,
+      zoom: enableZoom ? zoomState : null,
+      onZoomChange: enableZoom ? onZoomChange : undefined,
+      showLegend,
+    }),
+    [config, data, dataKey, dataKeys, visibleSeries, state, labelFormatter, highlightWithReset, setActivePayload, zoomState, enableZoom, onZoomChange, showLegend]
+  );
+
+  return (
+    <ChartCompoundContext.Provider value={value}>
+      <PayloadContext.Provider value={activePayload}>{children}</PayloadContext.Provider>
+    </ChartCompoundContext.Provider>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartLegendCompound.tsx b/apps/webapp/app/components/primitives/charts/ChartLegendCompound.tsx
new file mode 100644
index 00000000000..40e23e0adac
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartLegendCompound.tsx
@@ -0,0 +1,368 @@
+import React, { useMemo } from "react";
+import type { AggregationType } from "~/components/metrics/QueryWidget";
+import { useActivePayload, useChartContext } from "./ChartContext";
+import { useSeriesTotal } from "./ChartRoot";
+import { aggregateValues } from "./aggregation";
+import { cn } from "~/utils/cn";
+import { AnimatedNumber } from "../AnimatedNumber";
+import { SimpleTooltip } from "../Tooltip";
+
+const aggregationLabels: Record<AggregationType, string> = {
+  sum: "Sum",
+  avg: "Average",
+  count: "Count",
+  min: "Min",
+  max: "Max",
+};
+
+export type ChartLegendCompoundProps = {
+  /** Maximum number of legend items to show before collapsing */
+  maxItems?: number;
+  /** Hide the legend entirely (useful for conditional rendering) */
+  hidden?: boolean;
+  /** Additional className */
+  className?: string;
+  /** Label for the total row (derived from aggregation when not provided) */
+  totalLabel?: string;
+  /** Aggregation method – controls the header label and how totals are computed */
+  aggregation?: AggregationType;
+  /** Optional formatter for numeric values (e.g. bytes, duration) */
+  valueFormatter?: (value: number) => string;
+  /** Callback when "View all" button is clicked */
+  onViewAllLegendItems?: () => void;
+  /** When true, constrains legend to max 50% height with scrolling */
+  scrollable?: boolean;
+};
+
+/**
+ * Legend component for the chart compound system.
+ * Renders as a permanent element below the chart (not inside recharts).
+ * Automatically connects to chart context for highlighting.
+ *
+ * @example Using via Chart.Root showLegend prop (recommended)
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day" showLegend maxLegendItems={5}>
+ *   <Chart.Bar />
+ * </Chart.Root>
+ * ```
+ */
+export function ChartLegendCompound({
+  maxItems = Infinity,
+  hidden = false,
+  className,
+  totalLabel,
+  aggregation,
+  valueFormatter,
+  onViewAllLegendItems,
+  scrollable = false,
+}: ChartLegendCompoundProps) {
+  const { config, dataKey, dataKeys, highlight, labelFormatter } = useChartContext();
+  const activePayload = useActivePayload();
+  const totals = useSeriesTotal(aggregation);
+
+  // Derive the effective label from the aggregation type when no explicit label is provided
+  const effectiveTotalLabel = totalLabel ?? (aggregation ? aggregationLabels[aggregation] : "Total");
+
+  // Calculate grand total by aggregating across all per-series values
+  const grandTotal = useMemo(() => {
+    const values = dataKeys.map((key) => totals[key] || 0);
+    if (!aggregation) {
+      // Default: sum
+      return values.reduce((a, b) => a + b, 0);
+    }
+    return aggregateValues(values, aggregation);
+  }, [totals, dataKeys, aggregation]);
+
+  // Calculate current total based on hover state (null when hovering a gap-filled point)
+  const currentTotal = useMemo((): number | null => {
+    if (!activePayload?.length) return grandTotal;
+
+    // Collect all series values from the hovered data point, preserving nulls
+    const rawValues = activePayload
+      .filter((item) => item.value !== undefined && dataKeys.includes(item.dataKey as string))
+      .map((item) => item.value);
+
+    // Filter to non-null values only
+    const values = rawValues
+      .filter((v): v is number => v != null)
+      .map((v) => Number(v) || 0);
+
+    // All null → gap-filled point, return null to show dash
+    if (values.length === 0) return null;
+
+    if (!aggregation) {
+      // Default: sum
+      return values.reduce((a, b) => a + b, 0);
+    }
+    return aggregateValues(values, aggregation);
+  }, [activePayload, grandTotal, dataKeys, aggregation]);
+
+  // Get the label for the total row - x-axis value when hovering, effectiveTotalLabel otherwise
+  const currentTotalLabel = useMemo(() => {
+    if (!activePayload?.length) return effectiveTotalLabel;
+
+    // Get the x-axis label from the payload's original data
+    const firstPayloadItem = activePayload[0];
+    const xAxisValue = firstPayloadItem?.payload?.[dataKey];
+
+    if (xAxisValue === undefined) return effectiveTotalLabel;
+
+    // Apply the formatter if provided, otherwise just stringify the value
+    const stringValue = String(xAxisValue);
+    return labelFormatter ? labelFormatter(stringValue) : stringValue;
+  }, [activePayload, dataKey, effectiveTotalLabel, labelFormatter]);
+
+  // Get current data for the legend based on hover state (values may be null for gap-filled points)
+  const currentData = useMemo((): Record<string, number | null> => {
+    if (!activePayload?.length) return totals;
+
+    // If we have activePayload data from hovering over a bar/line
+    const hoverData = activePayload.reduce(
+      (acc, item) => {
+        if (item.dataKey && item.value !== undefined) {
+          // Preserve null for gap-filled points instead of coercing to 0
+          acc[item.dataKey] = item.value != null ? Number(item.value) || 0 : null;
+        }
+        return acc;
+      },
+      {} as Record<string, number | null>
+    );
+
+    // Return a merged object - totals for keys not in the hover data
+    return {
+      ...totals,
+      ...hoverData,
+    };
+  }, [activePayload, totals]);
+
+  // Prepare legend items with capped display
+  const legendItems = useMemo(() => {
+    const allItems = dataKeys.map((key) => ({
+      dataKey: key,
+      color: config[key]?.color,
+      label: config[key]?.label ?? key,
+    }));
+
+    if (allItems.length <= maxItems) {
+      return { visible: allItems, remaining: 0, hoveredHiddenItem: undefined };
+    }
+
+    const visibleItems = allItems.slice(0, maxItems);
+    const remainingCount = allItems.length - maxItems;
+
+    // If we're hovering over an item that's not visible in the legend,
+    // pass it separately to replace the "view more" row
+    let hoveredHiddenItem: (typeof allItems)[0] | undefined;
+    if (
+      highlight.activeBarKey &&
+      !visibleItems.some((item) => item.dataKey === highlight.activeBarKey)
+    ) {
+      hoveredHiddenItem = allItems.find((item) => item.dataKey === highlight.activeBarKey);
+    }
+
+    return { visible: visibleItems, remaining: remainingCount, hoveredHiddenItem };
+  }, [config, dataKeys, maxItems, highlight.activeBarKey]);
+
+  if (hidden || dataKeys.length === 0) {
+    return null;
+  }
+
+  const isHovering = (activePayload?.length ?? 0) > 0;
+
+  return (
+    <div
+      className={cn("flex flex-col px-2 pb-2 pt-4 text-sm", scrollable && "max-h-[50%] min-h-0", className)}
+    >
+      {/* Total row */}
+      <div
+        className={cn(
+          "flex w-full shrink-0 items-center justify-between gap-2 rounded px-2 py-1 transition",
+          isHovering ? "text-text-bright" : "text-text-dimmed"
+        )}
+      >
+        <span className="font-medium">{currentTotalLabel}</span>
+        <span className="font-medium tabular-nums">
+          {currentTotal != null ? (
+            valueFormatter ? (
+              valueFormatter(currentTotal)
+            ) : (
+              <AnimatedNumber value={currentTotal} duration={0.25} />
+            )
+          ) : (
+            "\u2013"
+          )}
+        </span>
+      </div>
+
+      {/* Separator */}
+      <div className="mx-2 my-1 shrink-0 border-t border-charcoal-750" />
+
+      {/* Legend items - scrollable when scrollable prop is true */}
+      <div
+        className={cn(
+          "flex flex-col",
+          scrollable &&
+            "min-h-0 flex-1 overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        )}
+      >
+        {legendItems.visible.map((item) => {
+          const total = currentData[item.dataKey] ?? null;
+          const isActive = highlight.activeBarKey === item.dataKey;
+
+          return (
+            <div
+              key={item.dataKey}
+              className={cn(
+                "relative flex w-full cursor-default items-center justify-between gap-2 rounded px-2 py-1 transition",
+                (total == null || total === 0) && "opacity-50"
+              )}
+              onMouseEnter={() => highlight.setHoveredLegendItem(item.dataKey)}
+              onMouseLeave={() => highlight.reset()}
+            >
+              {/* Active highlight background */}
+              {isActive && item.color && (
+                <div
+                  className="absolute inset-0 rounded opacity-10"
+                  style={{ backgroundColor: item.color }}
+                />
+              )}
+              <div className="relative flex w-full items-center justify-between gap-3 overflow-hidden">
+                <SimpleTooltip
+                  button={
+                    <div className="flex min-w-0 items-center gap-1.5">
+                      {item.color && (
+                        <div
+                          className="w-1 shrink-0 self-stretch rounded-[2px]"
+                          style={{ backgroundColor: item.color }}
+                        />
+                      )}
+                      <span
+                        className={cn(
+                          "truncate",
+                          isActive ? "text-text-bright" : "text-text-dimmed"
+                        )}
+                      >
+                        {item.label}
+                      </span>
+                    </div>
+                  }
+                  content={item.label}
+                  side="top"
+                  disableHoverableContent
+                  className="max-w-xs break-words"
+                  buttonClassName="cursor-default min-w-0"
+                />
+                <span
+                  className={cn(
+                    "self-start tabular-nums",
+                    isActive ? "text-text-bright" : "text-text-dimmed"
+                  )}
+                >
+                  {total != null ? (
+                    valueFormatter ? (
+                      valueFormatter(total)
+                    ) : (
+                      <AnimatedNumber value={total} duration={0.25} />
+                    )
+                  ) : (
+                    "\u2013"
+                  )}
+                </span>
+              </div>
+            </div>
+          );
+        })}
+
+        {/* View more row - replaced by hovered hidden item when applicable */}
+        {legendItems.remaining > 0 &&
+          (legendItems.hoveredHiddenItem ? (
+            <HoveredHiddenItemRow
+              item={legendItems.hoveredHiddenItem}
+              value={currentData[legendItems.hoveredHiddenItem.dataKey] ?? null}
+              remainingCount={legendItems.remaining - 1}
+              valueFormatter={valueFormatter}
+            />
+          ) : (
+            <ViewAllDataRow
+              remainingCount={legendItems.remaining}
+              onViewAll={onViewAllLegendItems}
+            />
+          ))}
+      </div>
+    </div>
+  );
+}
+
+type ViewAllDataRowProps = {
+  remainingCount: number;
+  onViewAll?: () => void;
+};
+
+function ViewAllDataRow({ remainingCount, onViewAll }: ViewAllDataRowProps) {
+  return (
+    <div
+      className="relative flex w-full cursor-pointer items-center justify-between gap-2 rounded px-2 py-1 transition hover:bg-charcoal-850"
+      onClick={onViewAll}
+      role="button"
+      tabIndex={0}
+      onKeyDown={(e) => {
+        if (e.key === "Enter" || e.key === " ") {
+          e.preventDefault();
+          onViewAll?.();
+        }
+      }}
+    >
+      <div className="relative flex w-full items-center justify-between gap-3">
+        <div className="flex items-center gap-1.5">
+          <div className="w-1 shrink-0 self-stretch rounded-[2px] border border-charcoal-600" />
+          <span className="text-text-dimmed tabular-nums">{remainingCount} more…</span>
+        </div>
+        <span className="self-start text-indigo-500">View all</span>
+      </div>
+    </div>
+  );
+}
+
+type HoveredHiddenItemRowProps = {
+  item: { dataKey: string; color?: string; label: React.ReactNode };
+  value: number | null;
+  remainingCount: number;
+  valueFormatter?: (value: number) => string;
+};
+
+function HoveredHiddenItemRow({ item, value, remainingCount, valueFormatter }: HoveredHiddenItemRowProps) {
+  return (
+    <div className="relative flex w-full items-center justify-between gap-2 rounded px-2 py-1">
+      {/* Active highlight background */}
+      {item.color && (
+        <div
+          className="absolute inset-0 rounded opacity-10"
+          style={{ backgroundColor: item.color }}
+        />
+      )}
+      <div className="relative flex w-full items-center justify-between gap-3">
+        <div className="flex items-center gap-1.5">
+          {item.color && (
+            <div
+              className="w-1 shrink-0 self-stretch rounded-[2px]"
+              style={{ backgroundColor: item.color }}
+            />
+          )}
+          <span className="text-text-bright">{item.label}</span>
+          {remainingCount > 0 && <span className="text-text-dimmed">+{remainingCount} more</span>}
+        </div>
+        <span className="tabular-nums text-text-bright">
+          {value != null ? (
+            valueFormatter ? (
+              valueFormatter(value)
+            ) : (
+              <AnimatedNumber value={value} duration={0.25} />
+            )
+          ) : (
+            "\u2013"
+          )}
+        </span>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartLine.tsx b/apps/webapp/app/components/primitives/charts/ChartLine.tsx
new file mode 100644
index 00000000000..e52e6fa398f
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartLine.tsx
@@ -0,0 +1,241 @@
+import React from "react";
+import {
+  Area,
+  AreaChart,
+  CartesianGrid,
+  Line,
+  LineChart,
+  XAxis,
+  YAxis,
+  type XAxisProps,
+  type YAxisProps,
+} from "recharts";
+import {
+  type ChartConfig,
+  ChartTooltip,
+  ChartTooltipContent,
+  type ChartState,
+} from "~/components/primitives/charts/Chart";
+import { ChartLineLoading, ChartLineNoData, ChartLineInvalid } from "./ChartLoading";
+import { useChartContext } from "./ChartContext";
+import { ChartRoot, useHasNoData } from "./ChartRoot";
+// Legend is now rendered by ChartRoot outside the chart container
+import type { ZoomRange } from "./hooks/useZoomSelection";
+
+type CurveType =
+  | "basis"
+  | "basisClosed"
+  | "basisOpen"
+  | "linear"
+  | "linearClosed"
+  | "natural"
+  | "monotoneX"
+  | "monotoneY"
+  | "monotone"
+  | "step"
+  | "stepBefore"
+  | "stepAfter";
+
+// ============================================================================
+// COMPOUND COMPONENT API
+// ============================================================================
+
+export type ChartLineRendererProps = {
+  /** Line curve type */
+  lineType?: CurveType;
+  /** Custom X-axis props to merge with defaults */
+  xAxisProps?: Partial<XAxisProps>;
+  /** Custom Y-axis props to merge with defaults */
+  yAxisProps?: Partial<YAxisProps>;
+  /** Render as stacked area chart instead of line chart */
+  stacked?: boolean;
+  /** Custom tooltip label formatter */
+  tooltipLabelFormatter?: (label: string, payload: any[]) => string;
+  /** Optional formatter for numeric tooltip values (e.g. bytes, duration) */
+  tooltipValueFormatter?: (value: number) => string;
+  /** Width injected by ResponsiveContainer */
+  width?: number;
+  /** Height injected by ResponsiveContainer */
+  height?: number;
+};
+
+/**
+ * Line chart renderer for the compound component system.
+ * Must be used within a Chart.Root.
+ *
+ * @example
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day">
+ *   <Chart.Line type="step" />
+ *   <Chart.Legend simple />
+ * </Chart.Root>
+ * ```
+ */
+export function ChartLineRenderer({
+  lineType = "step",
+  xAxisProps: xAxisPropsProp,
+  yAxisProps: yAxisPropsProp,
+  stacked = false,
+  tooltipLabelFormatter,
+  tooltipValueFormatter,
+  width,
+  height,
+}: ChartLineRendererProps) {
+  const { config, data, dataKey, dataKeys, visibleSeries, state, highlight, setActivePayload, showLegend } = useChartContext();
+  const hasNoData = useHasNoData();
+
+  // Render loading/error states
+  if (state === "loading") {
+    return <ChartLineLoading />;
+  } else if (state === "noData" || hasNoData) {
+    return <ChartLineNoData />;
+  } else if (state === "invalid") {
+    return <ChartLineInvalid />;
+  }
+
+  // Get the x-axis ticks based on tooltip state
+  const xAxisTicks =
+    highlight.tooltipActive && data.length > 2
+      ? [data[0]?.[dataKey], data[data.length - 1]?.[dataKey]]
+      : undefined;
+
+  const xAxisConfig = {
+    dataKey,
+    tickLine: false,
+    axisLine: false,
+    tickMargin: 10,
+    ticks: xAxisTicks,
+    interval: "preserveStartEnd" as const,
+    tick: {
+      fill: "#878C99",
+      fontSize: 11,
+      style: { fontVariantNumeric: "tabular-nums" },
+    },
+    ...xAxisPropsProp,
+  };
+
+  const yAxisConfig = {
+    axisLine: false,
+    tickLine: false,
+    tickMargin: 8,
+    tick: {
+      fill: "#878C99",
+      fontSize: 11,
+      style: { fontVariantNumeric: "tabular-nums" },
+    },
+    ...yAxisPropsProp,
+  };
+
+  // Handle mouse leave to also reset highlight
+  const handleMouseLeave = () => {
+    highlight.setTooltipActive(false);
+    highlight.reset();
+  };
+
+  // Render stacked area chart if stacked prop is true
+  if (stacked && visibleSeries.length > 1) {
+    return (
+      <AreaChart
+        data={data}
+        width={width}
+        height={height}
+        stackOffset="none"
+        margin={{
+          left: 12,
+          right: 12,
+        }}
+        onMouseMove={(e: any) => {
+          if (e?.activePayload?.length) {
+            setActivePayload(e.activePayload, e.activeTooltipIndex);
+            highlight.setTooltipActive(true);
+          } else {
+            highlight.setTooltipActive(false);
+          }
+        }}
+        onMouseLeave={handleMouseLeave}
+      >
+        <CartesianGrid vertical={false} stroke="#272A2E" strokeDasharray="3 3" />
+        <XAxis {...xAxisConfig} />
+        <YAxis {...yAxisConfig} />
+        {/* When legend is shown below, render tooltip with cursor only (no content popup) */}
+        <ChartTooltip
+          cursor={{ stroke: "rgba(255, 255, 255, 0.1)", strokeWidth: 1 }}
+          content={
+            showLegend ? (
+              () => null
+            ) : (
+              <ChartTooltipContent indicator="line" valueFormatter={tooltipValueFormatter} />
+            )
+          }
+          labelFormatter={tooltipLabelFormatter}
+        />
+        {/* Note: Legend is now rendered by ChartRoot outside the chart container */}
+        {visibleSeries.map((key) => (
+          <Area
+            key={key}
+            type={lineType}
+            dataKey={key}
+            stroke={config[key]?.color}
+            fill={config[key]?.color}
+            fillOpacity={0.6}
+            strokeWidth={1}
+            stackId="stack"
+            isAnimationActive={false}
+          />
+        ))}
+      </AreaChart>
+    );
+  }
+
+  return (
+    <LineChart
+      accessibilityLayer
+      data={data}
+      width={width}
+      height={height}
+      margin={{
+        top: 5,
+        left: 12,
+        right: 12,
+      }}
+      onMouseMove={(e: any) => {
+        if (e?.activePayload?.length) {
+          setActivePayload(e.activePayload, e.activeTooltipIndex);
+          highlight.setTooltipActive(true);
+        } else {
+          highlight.setTooltipActive(false);
+        }
+      }}
+      onMouseLeave={handleMouseLeave}
+    >
+      <CartesianGrid vertical={false} stroke="#272A2E" strokeDasharray="3 3" />
+      <XAxis {...xAxisConfig} />
+      <YAxis {...yAxisConfig} />
+      {/* When legend is shown below, render tooltip with cursor only (no content popup) */}
+      <ChartTooltip
+        cursor={{ stroke: "rgba(255, 255, 255, 0.1)", strokeWidth: 1 }}
+        content={
+          showLegend ? (
+            () => null
+          ) : (
+            <ChartTooltipContent valueFormatter={tooltipValueFormatter} />
+          )
+        }
+        labelFormatter={tooltipLabelFormatter}
+      />
+      {/* Note: Legend is now rendered by ChartRoot outside the chart container */}
+      {visibleSeries.map((key) => (
+        <Line
+          key={key}
+          dataKey={key}
+          type={lineType}
+          stroke={config[key]?.color}
+          strokeWidth={1}
+          dot={{ r: 1.5, fill: config[key]?.color, strokeWidth: 0 }}
+          activeDot={{ r: 4 }}
+          isAnimationActive={false}
+        />
+      ))}
+    </LineChart>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartLoading.tsx b/apps/webapp/app/components/primitives/charts/ChartLoading.tsx
new file mode 100644
index 00000000000..8046f3045f7
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartLoading.tsx
@@ -0,0 +1,340 @@
+import { motion } from "framer-motion";
+import { Button } from "../Buttons";
+import { Paragraph } from "../Paragraph";
+import { Spinner } from "../Spinner";
+import { useDateRange } from "./DateRangeContext";
+import { useMemo } from "react";
+import { ClientOnly } from "remix-utils/client-only";
+
+export function ChartBarLoading() {
+  return (
+    <div className="relative grid h-full place-items-center p-2 pt-0">
+      <ChartBarLoadingBackground />
+      <div className="absolute z-10 mb-16 flex items-center gap-2">
+        <Spinner className="size-6" />
+        <Paragraph variant="base/bright">Loading data…</Paragraph>
+      </div>
+    </div>
+  );
+}
+
+export function ChartBarNoData() {
+  const dateRange = useDateRange();
+
+  return (
+    <div className="relative grid h-full place-items-center p-2 pt-0">
+      <ChartBarLoadingBackground />
+      <div className="absolute z-10 mb-16 flex flex-col items-center gap-2">
+        <Paragraph variant="small/bright">No data</Paragraph>
+        <Paragraph variant="small" spacing>
+          There's no data available for the filters you've set.
+        </Paragraph>
+        {dateRange && (
+          <Button variant="secondary/small" onClick={dateRange.resetDateRange}>
+            Clear filters
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export function ChartBarInvalid() {
+  const dateRange = useDateRange();
+
+  return (
+    <div className="relative grid h-full place-items-center p-2 pt-0">
+      <ChartBarLoadingBackground />
+      <div className="absolute z-10 mb-16 flex flex-col items-center gap-2">
+        <Paragraph variant="small/bright">Chart not applicable</Paragraph>
+        <Paragraph variant="small" spacing>
+          Your current filter settings don't apply to this chart's data type.
+        </Paragraph>
+        {dateRange && (
+          <Button variant="secondary/small" onClick={dateRange.resetDateRange}>
+            Clear filters
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export function ChartLineLoading() {
+  return (
+    <div className="relative mb-16 grid h-full place-items-center p-2 pt-0">
+      <ChartLineLoadingBackground />
+      <div className="absolute z-10 flex items-center gap-2">
+        <Spinner className="size-6" />
+        <Paragraph variant="base/bright">Loading data…</Paragraph>
+      </div>
+    </div>
+  );
+}
+
+export function ChartLineNoData() {
+  const dateRange = useDateRange();
+
+  return (
+    <div className="relative grid h-full place-items-center p-2 pt-0">
+      <ChartLineLoadingBackground />
+      <div className="absolute z-10 mb-16 flex flex-col items-center gap-2">
+        <Paragraph variant="small/bright">No data</Paragraph>
+        <Paragraph variant="small" spacing>
+          There's no data available for the filters you've set.
+        </Paragraph>
+        {dateRange && (
+          <Button variant="secondary/small" onClick={dateRange.resetDateRange}>
+            Clear filters
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export function ChartLineInvalid() {
+  const dateRange = useDateRange();
+
+  return (
+    <div className="relative grid h-full place-items-center p-2 pt-0">
+      <ChartLineLoadingBackground />
+      <div className="absolute z-10 mb-16 flex flex-col items-center gap-2">
+        <Paragraph variant="small/bright">Chart not applicable</Paragraph>
+        <Paragraph variant="small" spacing>
+          Your current filter settings don't apply to this chart's data type.
+        </Paragraph>
+        {dateRange && (
+          <Button variant="secondary/small" onClick={dateRange.resetDateRange}>
+            Clear filters
+          </Button>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function ChartBarLoadingBackground() {
+  return (
+    <motion.div
+      className="flex h-full w-full flex-col"
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      transition={{ duration: 0.5 }}
+    >
+      <ClientOnly fallback={<div />}>
+      {() => (<>
+        <motion.div
+        className="flex flex-1 items-end gap-1"
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 0.6, delay: 0.1 }}
+      >
+        {Array.from({ length: 30 }).map((_, i) => {
+          const height = Math.max(15, Math.floor(Math.random() * 100));
+          return (
+            <motion.div
+              key={i}
+              className="flex-1 rounded-sm bg-charcoal-750/50"
+              style={{ height: `${height}%` }}
+              initial={{ height: 0, opacity: 0 }}
+              animate={{ height: `${height}%`, opacity: 1 }}
+              transition={{
+                type: "spring",
+                stiffness: 120,
+                damping: 14,
+                mass: 1,
+                delay: 0.1 + i * 0.02,
+              }}
+            />
+          );
+        })}
+      </motion.div>
+      <motion.div
+        className="mt-2 flex flex-col justify-center gap-1"
+        initial={{ y: 10, opacity: 0 }}
+        animate={{ y: 0, opacity: 1 }}
+        transition={{
+          type: "spring",
+          stiffness: 100,
+          damping: 15,
+          delay: 0.2,
+        }}
+      >
+        {Array.from({ length: 5 }).map((_, i) => (
+          <motion.div
+            className="flex items-center gap-1"
+            key={i}
+            initial={{ x: -10, opacity: 0 }}
+            animate={{ x: 0, opacity: 1 }}
+            transition={{
+              type: "spring",
+              stiffness: 100,
+              damping: 12,
+              delay: 0.3 + i * 0.08,
+            }}
+          >
+            <div className="h-5 w-2 rounded-sm bg-charcoal-750/50" />
+            <div className="h-5 w-full rounded-sm bg-charcoal-750/50" />
+          </motion.div>
+        ))}
+      </motion.div>
+      </>)}
+    </ClientOnly>
+      
+    </motion.div>
+  );
+}
+
+function ChartLineLoadingBackground() {
+  // Generate line points with configurable starting position and constraints
+  const generateLinePoints = (startY: number, minY: number, maxY: number) => {
+    const numPoints = 10;
+    const points = [];
+    let lastY = startY;
+
+    for (let i = 0; i < numPoints; i++) {
+      // Calculate x value that spreads points across the full width
+      const x = i * (9 / (numPoints - 1));
+
+      // Create less extreme variations that move smoothly
+      const change = Math.random() * 6 - 3; // Range from -3 to +3
+      const y = Math.max(minY, Math.min(maxY, lastY + change)); // Apply constraints
+
+      points.push({ x, y });
+      lastY = y;
+    }
+
+    return points;
+  };
+
+  // Generate points for both lines
+  const points = useMemo(() => generateLinePoints(30, 10, 90), []);
+  const secondPoints = useMemo(() => generateLinePoints(40, 30, 90), []);
+
+  const generateSmoothPath = (points: Array<{ x: number; y: number }>) => {
+    if (points.length < 2) return "";
+
+    let path = `M0,${50 - points[0].y}`;
+
+    // Use curve command for smooth lines
+    for (let i = 0; i < points.length - 1; i++) {
+      const x1 = points[i].x;
+      const y1 = 50 - points[i].y;
+      const x2 = points[i + 1].x;
+      const y2 = 50 - points[i + 1].y;
+
+      // Bezier control points (create smooth curve)
+      const cx1 = (x1 + x2) / 2;
+      const cy1 = y1;
+      const cx2 = (x1 + x2) / 2;
+      const cy2 = y2;
+
+      path += ` C${cx1},${cy1} ${cx2},${cy2} ${x2},${y2}`;
+    }
+
+    return path;
+  };
+
+  const generateAreaPath = (points: Array<{ x: number; y: number }>) => {
+    const curvePath = generateSmoothPath(points);
+    const lastX = 9;
+    return `${curvePath} L${lastX},50 L0,50 Z`;
+  };
+
+  // Component to render a line with area fill and animation
+  const AnimatedLine = ({
+    points,
+    gradientId,
+    delay = 0,
+  }: {
+    points: Array<{ x: number; y: number }>;
+    gradientId: string;
+    delay?: number;
+  }) => (
+    <>
+      <motion.path
+        d={generateAreaPath(points)}
+        fill={`url(#${gradientId})`}
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1 }}
+        transition={{ duration: 1, ease: "easeInOut", delay }}
+      />
+      <motion.path
+        d={generateSmoothPath(points)}
+        stroke="#212327"
+        strokeWidth="1"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        fill="none"
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 0.8 }}
+        transition={{ duration: 1.5, ease: "easeInOut", delay }}
+        vectorEffect="non-scaling-stroke"
+      />
+    </>
+  );
+
+  return (
+    <motion.div
+      className="flex h-full w-full flex-col"
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      transition={{ duration: 0.5 }}
+    >
+      <div className="relative flex-1">
+        <svg
+          className="absolute inset-0 h-full w-full"
+          viewBox="0 0 9 50"
+          preserveAspectRatio="none"
+        >
+          <defs>
+            <linearGradient id="areaGradient" x1="0" y1="0" x2="0" y2="1">
+              <stop offset="0%" stopColor="#212327" stopOpacity={0.3} />
+              <stop offset="100%" stopColor="#212327" stopOpacity={0} />
+            </linearGradient>
+            <linearGradient id="secondAreaGradient" x1="0" y1="0" x2="0" y2="1">
+              <stop offset="0%" stopColor="#212327" stopOpacity={0.3} />
+              <stop offset="100%" stopColor="#212327" stopOpacity={0} />
+            </linearGradient>
+          </defs>
+
+          <g>
+            <AnimatedLine points={points} gradientId="areaGradient" />
+            <AnimatedLine points={secondPoints} gradientId="secondAreaGradient" delay={0.2} />
+          </g>
+        </svg>
+      </div>
+
+      <motion.div
+        className="mt-2 flex flex-col justify-center gap-1"
+        initial={{ y: 10, opacity: 0 }}
+        animate={{ y: 0, opacity: 1 }}
+        transition={{
+          type: "spring",
+          stiffness: 100,
+          damping: 15,
+          delay: 0.2,
+        }}
+      >
+        {Array.from({ length: 5 }).map((_, i) => (
+          <motion.div
+            className="flex items-center gap-1"
+            key={i}
+            initial={{ x: -10, opacity: 0 }}
+            animate={{ x: 0, opacity: 1 }}
+            transition={{
+              type: "spring",
+              stiffness: 100,
+              damping: 12,
+              delay: 0.3 + i * 0.08,
+            }}
+          >
+            <div className="h-5 w-2 rounded-sm bg-charcoal-750/50" />
+            <div className="h-5 w-full rounded-sm bg-charcoal-750/50" />
+          </motion.div>
+        ))}
+      </motion.div>
+    </motion.div>
+  );
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartRoot.tsx b/apps/webapp/app/components/primitives/charts/ChartRoot.tsx
new file mode 100644
index 00000000000..9a366c9789d
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartRoot.tsx
@@ -0,0 +1,298 @@
+import React, { useMemo } from "react";
+import type * as RechartsPrimitive from "recharts";
+import type { AggregationType } from "~/components/metrics/QueryWidget";
+import { ChartContainer, type ChartConfig, type ChartState } from "./Chart";
+import { ChartProvider, useChartContext, type LabelFormatter } from "./ChartContext";
+import { ChartLegendCompound } from "./ChartLegendCompound";
+import type { ZoomRange } from "./hooks/useZoomSelection";
+import { cn } from "~/utils/cn";
+
+export type ChartRootProps = {
+  config: ChartConfig;
+  data: any[];
+  dataKey: string;
+  /** Series keys to render (if not provided, derived from config keys) */
+  series?: string[];
+  /** Subset of series to render as SVG elements on the chart (legend still shows all series) */
+  visibleSeries?: string[];
+  state?: ChartState;
+  /** Function to format the x-axis label (used in legend, tooltips, etc.) */
+  labelFormatter?: LabelFormatter;
+  /** Enable zoom functionality */
+  enableZoom?: boolean;
+  /** Callback when zoom range changes */
+  onZoomChange?: (range: ZoomRange) => void;
+  /** Minimum height for the chart */
+  minHeight?: string;
+  /** Additional className for the container */
+  className?: string;
+  /** Show the compound legend below the chart */
+  showLegend?: boolean;
+  /** Maximum items in the legend before showing "view more" */
+  maxLegendItems?: number;
+  /** Label for the total row in the legend */
+  legendTotalLabel?: string;
+  /** Aggregation method used by the legend to compute totals (defaults to sum behavior) */
+  legendAggregation?: AggregationType;
+  /** Optional formatter for numeric legend values (e.g. bytes, duration) */
+  legendValueFormatter?: (value: number) => string;
+  /** Callback when "View all" legend button is clicked */
+  onViewAllLegendItems?: () => void;
+  /** When true, constrains legend to max 50% height with scrolling */
+  legendScrollable?: boolean;
+  /** When true, chart fills its parent container height and distributes space between chart and legend */
+  fillContainer?: boolean;
+  /** Content rendered between the chart and the legend */
+  beforeLegend?: React.ReactNode;
+  children: React.ComponentProps<typeof RechartsPrimitive.ResponsiveContainer>["children"];
+};
+
+/**
+ * Root component for the chart compound component system.
+ * Provides shared context for all child chart components.
+ *
+ * @example Simple bar chart
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day">
+ *   <Chart.Bar stackId="a" />
+ *   <Chart.Legend />
+ * </Chart.Root>
+ * ```
+ *
+ * @example Chart with zoom
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day" enableZoom onZoomChange={handleZoom}>
+ *   <Chart.Bar stackId="a" />
+ *   <Chart.Zoom />
+ *   <Chart.Legend />
+ * </Chart.Root>
+ * ```
+ */
+export function ChartRoot({
+  config,
+  data,
+  dataKey,
+  series,
+  visibleSeries,
+  state,
+  labelFormatter,
+  enableZoom = false,
+  onZoomChange,
+  minHeight,
+  className,
+  showLegend = false,
+  maxLegendItems = 5,
+  legendTotalLabel,
+  legendAggregation,
+  legendValueFormatter,
+  onViewAllLegendItems,
+  legendScrollable = false,
+  fillContainer = false,
+  beforeLegend,
+  children,
+}: ChartRootProps) {
+  return (
+    <ChartProvider
+      config={config}
+      data={data}
+      dataKey={dataKey}
+      series={series}
+      visibleSeries={visibleSeries}
+      state={state}
+      labelFormatter={labelFormatter}
+      enableZoom={enableZoom}
+      onZoomChange={onZoomChange}
+      showLegend={showLegend}
+    >
+      <ChartRootInner
+        minHeight={minHeight}
+        className={className}
+        showLegend={showLegend}
+        maxLegendItems={maxLegendItems}
+        legendTotalLabel={legendTotalLabel}
+        legendAggregation={legendAggregation}
+        legendValueFormatter={legendValueFormatter}
+        onViewAllLegendItems={onViewAllLegendItems}
+        legendScrollable={legendScrollable}
+        fillContainer={fillContainer}
+        beforeLegend={beforeLegend}
+      >
+        {children}
+      </ChartRootInner>
+    </ChartProvider>
+  );
+}
+
+type ChartRootInnerProps = {
+  minHeight?: string;
+  className?: string;
+  showLegend?: boolean;
+  maxLegendItems?: number;
+  legendTotalLabel?: string;
+  legendAggregation?: AggregationType;
+  legendValueFormatter?: (value: number) => string;
+  onViewAllLegendItems?: () => void;
+  legendScrollable?: boolean;
+  fillContainer?: boolean;
+  beforeLegend?: React.ReactNode;
+  children: React.ComponentProps<typeof RechartsPrimitive.ResponsiveContainer>["children"];
+};
+
+function ChartRootInner({
+  minHeight,
+  className,
+  showLegend = false,
+  maxLegendItems = 5,
+  legendTotalLabel,
+  legendAggregation,
+  legendValueFormatter,
+  onViewAllLegendItems,
+  legendScrollable = false,
+  fillContainer = false,
+  beforeLegend,
+  children,
+}: ChartRootInnerProps) {
+  const { config, zoom } = useChartContext();
+  const enableZoom = zoom !== null;
+
+  return (
+    <div
+      className={cn(
+        "relative flex w-full flex-col",
+        fillContainer && "h-full",
+        className
+      )}
+    >
+      <div
+        className={cn(
+          fillContainer ? "min-h-0 flex-1" : "h-full w-full",
+          enableZoom && "mt-8 cursor-crosshair"
+        )}
+        style={{ touchAction: "none", userSelect: "none" }}
+      >
+        <ChartContainer
+          config={config}
+          className={cn(
+            "h-full w-full",
+            fillContainer && "!aspect-auto",
+            enableZoom &&
+            "[&_.recharts-surface]:cursor-crosshair [&_.recharts-wrapper]:cursor-crosshair"
+          )}
+          style={fillContainer ? undefined : minHeight ? { minHeight } : undefined}
+        >
+          {children}
+        </ChartContainer>
+      </div>
+      {beforeLegend}
+      {/* Legend rendered outside the chart container */}
+      {showLegend && (
+        <ChartLegendCompound
+          maxItems={maxLegendItems}
+          totalLabel={legendTotalLabel}
+          aggregation={legendAggregation}
+          valueFormatter={legendValueFormatter}
+          onViewAllLegendItems={onViewAllLegendItems}
+          scrollable={legendScrollable}
+        />
+      )}
+    </div>
+  );
+}
+
+/**
+ * Hook to check if all data in the visible range is empty (null or undefined).
+ * Zero values are considered valid data and will render.
+ * Useful for rendering "no data" states.
+ */
+export function useHasNoData(): boolean {
+  const { data, dataKey, dataKeys } = useChartContext();
+
+  return useMemo(() => {
+    if (data.length === 0) return true;
+
+    return data.every((item) => {
+      return dataKeys.every((key) => {
+        const value = item[key];
+        return value === null || value === undefined;
+      });
+    });
+  }, [data, dataKeys]);
+}
+
+/**
+ * Hook to calculate aggregated values for each series across all data points.
+ * When no aggregation is provided, defaults to sum (original behavior).
+ * Useful for legend displays.
+ */
+export function useSeriesTotal(aggregation?: AggregationType): Record<string, number> {
+  const { data, dataKeys } = useChartContext();
+
+  return useMemo(() => {
+    // Sum (default) and count use additive accumulation
+    if (!aggregation || aggregation === "sum" || aggregation === "count") {
+      return data.reduce(
+        (acc, item) => {
+          for (const seriesKey of dataKeys) {
+            acc[seriesKey] = (acc[seriesKey] || 0) + Number(item[seriesKey] || 0);
+          }
+          return acc;
+        },
+        {} as Record<string, number>
+      );
+    }
+
+    if (aggregation === "avg") {
+      const sums: Record<string, number> = {};
+      const counts: Record<string, number> = {};
+      for (const item of data) {
+        for (const seriesKey of dataKeys) {
+          const rawVal = item[seriesKey];
+          if (rawVal == null) continue; // skip gap-filled nulls
+          const val = Number(rawVal);
+          sums[seriesKey] = (sums[seriesKey] || 0) + val;
+          counts[seriesKey] = (counts[seriesKey] || 0) + 1;
+        }
+      }
+      const result: Record<string, number> = {};
+      for (const key of dataKeys) {
+        result[key] = counts[key] ? sums[key]! / counts[key]! : 0;
+      }
+      return result;
+    }
+
+    if (aggregation === "min") {
+      const result: Record<string, number> = {};
+      for (const item of data) {
+        for (const seriesKey of dataKeys) {
+          if (item[seriesKey] == null) continue; // skip gap-filled nulls
+          const val = Number(item[seriesKey]);
+          if (result[seriesKey] === undefined || val < result[seriesKey]) {
+            result[seriesKey] = val;
+          }
+        }
+      }
+      // Default to 0 for series with no data
+      for (const key of dataKeys) {
+        if (result[key] === undefined) result[key] = 0;
+      }
+      return result;
+    }
+
+    // aggregation === "max"
+    const result: Record<string, number> = {};
+    for (const item of data) {
+      for (const seriesKey of dataKeys) {
+        if (item[seriesKey] == null) continue; // skip gap-filled nulls
+        const val = Number(item[seriesKey]);
+        if (result[seriesKey] === undefined || val > result[seriesKey]) {
+          result[seriesKey] = val;
+        }
+      }
+    }
+    // Default to 0 for series with no data
+    for (const key of dataKeys) {
+      if (result[key] === undefined) result[key] = 0;
+    }
+    return result;
+  }, [data, dataKeys, aggregation]);
+}
diff --git a/apps/webapp/app/components/primitives/charts/ChartZoom.tsx b/apps/webapp/app/components/primitives/charts/ChartZoom.tsx
new file mode 100644
index 00000000000..4b2e921630b
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/ChartZoom.tsx
@@ -0,0 +1,244 @@
+import React, { useCallback } from "react";
+import { ReferenceArea, ReferenceLine } from "recharts";
+import { useChartContext } from "./ChartContext";
+import { useDateRange } from "./DateRangeContext";
+import { cn } from "~/utils/cn";
+
+export type ChartZoomProps = {
+  /** Sync zoom with DateRangeContext (for dashboard-level syncing) */
+  syncWithDateRange?: boolean;
+  /** Minimum number of data points required for a valid zoom selection */
+  minDataPoints?: number;
+};
+
+/**
+ * Zoom overlay component for charts.
+ * Renders the zoom selection area and inspection line.
+ *
+ * Must be used within a Chart.Root with enableZoom={true}.
+ *
+ * @example Basic zoom
+ * ```tsx
+ * <Chart.Root config={config} data={data} dataKey="day" enableZoom onZoomChange={handleZoom}>
+ *   <Chart.Bar />
+ *   <Chart.Zoom />
+ * </Chart.Root>
+ * ```
+ *
+ * @example Synced with DateRangeContext
+ * ```tsx
+ * <DateRangeProvider>
+ *   <Chart.Root config={config} data={data} dataKey="day" enableZoom onZoomChange={handleZoom}>
+ *     <Chart.Bar />
+ *     <Chart.Zoom syncWithDateRange />
+ *   </Chart.Root>
+ * </DateRangeProvider>
+ * ```
+ */
+export function ChartZoom({ syncWithDateRange = false, minDataPoints = 3 }: ChartZoomProps) {
+  const { zoom, data, dataKey, onZoomChange } = useChartContext();
+  const globalDateRange = useDateRange();
+
+  if (!zoom) {
+    console.warn("ChartZoom: zoom is not enabled. Add enableZoom to Chart.Root.");
+    return null;
+  }
+
+  const { inspectionLine, refAreaLeft, refAreaRight } = zoom;
+
+  return (
+    <>
+      {/* Inspection line (click to inspect) */}
+      {inspectionLine && (
+        <ReferenceLine
+          x={inspectionLine}
+          stroke="#D7D9DD"
+          strokeWidth={2}
+          isFront={true}
+          onClick={(e: any) => {
+            e?.stopPropagation?.();
+            zoom.clearInspectionLine();
+          }}
+        />
+      )}
+
+      {/* Zoom selection area */}
+      {refAreaLeft && refAreaRight && (
+        <ReferenceArea
+          x1={refAreaLeft}
+          x2={refAreaRight}
+          strokeOpacity={0.4}
+          fill="#3B82F6"
+          fillOpacity={0.2}
+        />
+      )}
+    </>
+  );
+}
+
+/**
+ * Tooltip component for showing zoom selection feedback.
+ * Can be used inside ChartTooltip content prop.
+ *
+ * Note: This component receives zoom state as props because recharts
+ * may render tooltips outside the normal React tree where context isn't available.
+ */
+export type ZoomTooltipProps = {
+  active?: boolean;
+  payload?: any[];
+  label?: string;
+  viewBox?: {
+    height: number;
+    width: number;
+  };
+  coordinate?: {
+    x: number;
+    y: number;
+  };
+  // Zoom state passed as props (since context might not be available in tooltip)
+  isSelecting?: boolean;
+  refAreaLeft?: string | null;
+  refAreaRight?: string | null;
+  invalidSelection?: boolean;
+};
+
+export function ZoomTooltip({
+  active,
+  payload,
+  label,
+  viewBox,
+  coordinate,
+  isSelecting,
+  refAreaLeft,
+  refAreaRight,
+  invalidSelection,
+}: ZoomTooltipProps) {
+  if (!active) return null;
+
+  // Show zoom range when selecting
+  if (isSelecting && refAreaLeft && refAreaRight) {
+    const message = invalidSelection
+      ? "Zoom: Drag a wider range"
+      : `Zoom: ${refAreaLeft} to ${refAreaRight}`;
+
+    return (
+      <div
+        className={cn(
+          "absolute whitespace-nowrap rounded border px-2 py-1 text-xxs tabular-nums",
+          invalidSelection
+            ? "border-amber-800 bg-amber-950 text-amber-400"
+            : "border-blue-800 bg-[#1B2334] text-blue-400"
+        )}
+        style={{
+          left: coordinate?.x,
+          top: viewBox?.height ? viewBox.height + 14 : 0,
+          transform: "translateX(-50%)",
+        }}
+      >
+        {message}
+        <div
+          className={cn(
+            "absolute -top-[5px] left-1/2 h-2 w-2 -translate-x-1/2 rotate-45",
+            invalidSelection
+              ? "border-l border-t border-amber-800 bg-amber-950"
+              : "border-l border-t border-blue-800 bg-[#1B2334]"
+          )}
+        />
+      </div>
+    );
+  }
+
+  // Default tooltip behavior (show label)
+  if (!payload?.length) return null;
+
+  return (
+    <div
+      className="absolute whitespace-nowrap rounded border border-charcoal-600 bg-charcoal-700 px-2 py-1 text-xxs tabular-nums text-text-bright"
+      style={{
+        left: coordinate?.x,
+        top: viewBox?.height ? viewBox.height + 13 : 0,
+        transform: "translateX(-50%)",
+      }}
+    >
+      {label}
+      <div className="absolute -top-[5px] left-1/2 h-2 w-2 -translate-x-1/2 rotate-45 border-l border-t border-charcoal-600 bg-charcoal-700" />
+    </div>
+  );
+}
+
+/**
+ * Hook that returns event handlers for zoom interactions.
+ * Use these on your chart component (BarChart, LineChart, etc.).
+ */
+export function useZoomHandlers(
+  options: { minDataPoints?: number; syncWithDateRange?: boolean } = {}
+) {
+  const { minDataPoints = 3, syncWithDateRange = false } = options;
+  const { zoom, data, dataKey, onZoomChange } = useChartContext();
+  const globalDateRange = useDateRange();
+
+  const handleMouseDown = useCallback(
+    (e: any) => {
+      if (!zoom || !e?.activeLabel) return;
+      zoom.startSelection(e.activeLabel);
+    },
+    [zoom]
+  );
+
+  const handleMouseMove = useCallback(
+    (e: any) => {
+      if (!zoom || !e?.activeLabel) return;
+      if (zoom.isSelecting) {
+        zoom.updateSelection(e.activeLabel, data, dataKey, minDataPoints);
+      }
+    },
+    [zoom, data, dataKey, minDataPoints]
+  );
+
+  const handleMouseUp = useCallback(() => {
+    if (!zoom) return;
+
+    const range = zoom.finishSelection(data, dataKey, minDataPoints);
+
+    if (range) {
+      // If syncing with DateRangeContext, update it
+      if (syncWithDateRange && globalDateRange) {
+        globalDateRange.setDateRange(range.start, range.end);
+      }
+
+      // Call the onZoomChange callback
+      onZoomChange?.(range);
+    }
+  }, [zoom, data, dataKey, minDataPoints, syncWithDateRange, globalDateRange, onZoomChange]);
+
+  const handleClick = useCallback(
+    (e: any) => {
+      if (!zoom || zoom.isSelecting || !e?.activeLabel) return;
+      zoom.toggleInspectionLine(e.activeLabel);
+    },
+    [zoom]
+  );
+
+  const handleMouseLeave = useCallback(() => {
+    if (!zoom) return;
+    zoom.cancelSelection();
+  }, [zoom]);
+
+  if (!zoom) {
+    return {
+      onMouseDown: undefined,
+      onMouseMove: undefined,
+      onMouseUp: undefined,
+      onClick: undefined,
+      onMouseLeave: undefined,
+    };
+  }
+
+  return {
+    onMouseDown: handleMouseDown,
+    onMouseMove: handleMouseMove,
+    onMouseUp: handleMouseUp,
+    onClick: handleClick,
+    onMouseLeave: handleMouseLeave,
+  };
+}
diff --git a/apps/webapp/app/components/primitives/charts/DateRangeContext.tsx b/apps/webapp/app/components/primitives/charts/DateRangeContext.tsx
new file mode 100644
index 00000000000..4b6d8210596
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/DateRangeContext.tsx
@@ -0,0 +1,120 @@
+import React, { createContext, useState, useContext, type ReactNode } from "react";
+
+type DateRangeContextType = {
+  /** Start date as ISO string (YYYY-MM-DD) or custom format */
+  startDate: string;
+  /** End date as ISO string (YYYY-MM-DD) or custom format */
+  endDate: string;
+  setDateRange: (startDate: string, endDate: string) => void;
+  resetDateRange: () => void;
+};
+
+// Formatters for displaying dates
+const shortDateFormatter = new Intl.DateTimeFormat("en-US", {
+  month: "short",
+  day: "numeric",
+});
+
+const longDateFormatter = new Intl.DateTimeFormat("en-US", {
+  month: "short",
+  day: "numeric",
+  year: "numeric",
+});
+
+/**
+ * Format a Date object as a short date string (e.g., "Nov 1")
+ */
+export function formatChartDate(date: Date): string {
+  return shortDateFormatter.format(date);
+}
+
+/**
+ * Format a Date object as a long date string (e.g., "Nov 1, 2023")
+ */
+export function formatChartDateLong(date: Date): string {
+  return longDateFormatter.format(date);
+}
+
+/**
+ * Convert a Date to ISO date string (YYYY-MM-DD) using local date components
+ */
+export function toISODateString(date: Date): string {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+
+/**
+ * Parse an ISO date string (YYYY-MM-DD) to a local Date object
+ */
+export function parseISODateString(isoString: string): Date {
+  const [year, month, day] = isoString.split("-").map(Number);
+  return new Date(year, month - 1, day);
+}
+
+/**
+ * Format an ISO date string for display (e.g., "2023-11-01" -> "Nov 1")
+ */
+export function formatISODate(isoString: string): string {
+  const date = parseISODateString(isoString);
+  return formatChartDate(date);
+}
+
+/**
+ * Format an ISO date string for display with year (e.g., "2023-11-01" -> "Nov 1, 2023")
+ */
+export function formatISODateLong(isoString: string): string {
+  const date = parseISODateString(isoString);
+  return formatChartDateLong(date);
+}
+
+const DateRangeContext = createContext<DateRangeContextType | null>(null);
+
+export function DateRangeProvider({
+  children,
+  defaultStartDate,
+  defaultEndDate,
+}: {
+  children: ReactNode;
+  defaultStartDate: Date;
+  defaultEndDate: Date;
+}) {
+  // Store dates as ISO strings for consistent data matching
+  const defaultStartISO = toISODateString(defaultStartDate);
+  const defaultEndISO = toISODateString(defaultEndDate);
+
+  const [startDate, setStartDate] = useState<string>(defaultStartISO);
+  const [endDate, setEndDate] = useState<string>(defaultEndISO);
+
+  const setDateRange = (start: string, end: string) => {
+    setStartDate(start);
+    setEndDate(end);
+  };
+
+  const resetDateRange = () => {
+    setStartDate(defaultStartISO);
+    setEndDate(defaultEndISO);
+  };
+
+  return (
+    <DateRangeContext.Provider
+      value={{
+        startDate,
+        endDate,
+        setDateRange,
+        resetDateRange,
+      }}
+    >
+      {children}
+    </DateRangeContext.Provider>
+  );
+}
+
+export function useDateRange(): DateRangeContextType | null {
+  const context = useContext(DateRangeContext);
+  if (!context) {
+    return null;
+  }
+  return context;
+}
diff --git a/apps/webapp/app/components/primitives/charts/aggregation.ts b/apps/webapp/app/components/primitives/charts/aggregation.ts
new file mode 100644
index 00000000000..48269833d24
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/aggregation.ts
@@ -0,0 +1,23 @@
+import type { AggregationType } from "~/components/metrics/QueryWidget";
+
+/**
+ * Aggregate an array of numbers using the specified aggregation function.
+ *
+ * Shared utility so both QueryResultsChart (data transformation) and chart
+ * legend components can reuse the same logic without circular imports.
+ */
+export function aggregateValues(values: number[], aggregation: AggregationType): number {
+  if (values.length === 0) return 0;
+  switch (aggregation) {
+    case "sum":
+      return values.reduce((a, b) => a + b, 0);
+    case "avg":
+      return values.reduce((a, b) => a + b, 0) / values.length;
+    case "count":
+      return values.length;
+    case "min":
+      return Math.min(...values);
+    case "max":
+      return Math.max(...values);
+  }
+}
diff --git a/apps/webapp/app/components/primitives/charts/hooks/useHighlightState.ts b/apps/webapp/app/components/primitives/charts/hooks/useHighlightState.ts
new file mode 100644
index 00000000000..02baac0ca8f
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/hooks/useHighlightState.ts
@@ -0,0 +1,106 @@
+import { useCallback, useMemo, useState } from "react";
+
+export type HighlightState = {
+  /** The currently highlighted series key (e.g., "completed", "failed") */
+  activeBarKey: string | null;
+  /** The index of the specific data point being hovered (null when hovering legend) */
+  activeDataPointIndex: number | null;
+  /** Whether the tooltip is currently active */
+  tooltipActive: boolean;
+};
+
+export type HighlightActions = {
+  /** Set the hovered bar (specific data point) */
+  setHoveredBar: (key: string, index: number) => void;
+  /** Set the hovered legend item (highlights all bars of that type) */
+  setHoveredLegendItem: (key: string) => void;
+  /** Set tooltip active state */
+  setTooltipActive: (active: boolean) => void;
+  /** Reset all highlight state */
+  reset: () => void;
+};
+
+export type UseHighlightStateReturn = HighlightState & HighlightActions;
+
+const initialState: HighlightState = {
+  activeBarKey: null,
+  activeDataPointIndex: null,
+  tooltipActive: false,
+};
+
+/**
+ * Hook to manage highlight state for chart elements.
+ * Handles both bar hover (specific data point) and legend hover (all bars of a type).
+ *
+ * activePayload is intentionally NOT managed here — it lives in a separate context
+ * so that payload updates (frequent during mouse movement) don't cause bar re-renders.
+ */
+export function useHighlightState(): UseHighlightStateReturn {
+  const [state, setState] = useState<HighlightState>(initialState);
+
+  const setHoveredBar = useCallback((key: string, index: number) => {
+    setState({
+      activeBarKey: key,
+      activeDataPointIndex: index,
+      tooltipActive: true,
+    });
+  }, []);
+
+  const setHoveredLegendItem = useCallback((key: string) => {
+    setState((prev) => {
+      if (prev.activeBarKey === key && prev.activeDataPointIndex === null) return prev;
+      return { ...prev, activeBarKey: key, activeDataPointIndex: null };
+    });
+  }, []);
+
+  const setTooltipActive = useCallback((active: boolean) => {
+    setState((prev) => {
+      if (prev.tooltipActive === active) return prev;
+      return { ...prev, tooltipActive: active };
+    });
+  }, []);
+
+  const reset = useCallback(() => {
+    setState(initialState);
+  }, []);
+
+  return useMemo(
+    () => ({
+      ...state,
+      setHoveredBar,
+      setHoveredLegendItem,
+      setTooltipActive,
+      reset,
+    }),
+    [state, setHoveredBar, setHoveredLegendItem, setTooltipActive, reset]
+  );
+}
+
+/**
+ * Calculate the opacity for a bar based on highlight state.
+ * @param key - The series key of this bar
+ * @param dataIndex - The data point index of this bar
+ * @param highlight - The current highlight state
+ * @param dimmedOpacity - The opacity to use for dimmed bars (default 0.2)
+ */
+export function getBarOpacity(
+  key: string,
+  dataIndex: number,
+  highlight: HighlightState,
+  dimmedOpacity = 0.2
+): number {
+  const { activeBarKey, activeDataPointIndex } = highlight;
+
+  // No highlight active - full opacity
+  if (activeBarKey === null) {
+    return 1;
+  }
+
+  // Hovering a specific bar (from chart)
+  if (activeDataPointIndex !== null) {
+    return key === activeBarKey && dataIndex === activeDataPointIndex ? 1 : dimmedOpacity;
+  }
+
+  // Hovering a legend item (all bars of this type)
+  return key === activeBarKey ? 1 : dimmedOpacity;
+}
diff --git a/apps/webapp/app/components/primitives/charts/hooks/useZoomSelection.ts b/apps/webapp/app/components/primitives/charts/hooks/useZoomSelection.ts
new file mode 100644
index 00000000000..fda078f1183
--- /dev/null
+++ b/apps/webapp/app/components/primitives/charts/hooks/useZoomSelection.ts
@@ -0,0 +1,191 @@
+import { useCallback, useMemo, useRef, useState } from "react";
+
+export type ZoomRange = {
+  start: string;
+  end: string;
+};
+
+export type ZoomSelectionState = {
+  /** Starting point of drag selection (x-axis value) */
+  refAreaLeft: string | null;
+  /** Ending point of drag selection (x-axis value) */
+  refAreaRight: string | null;
+  /** Whether user is currently dragging to select */
+  isSelecting: boolean;
+  /** Whether the current selection is too small to be valid */
+  invalidSelection: boolean;
+  /** X-axis value for the inspection line (click to inspect) */
+  inspectionLine: string | null;
+};
+
+export type ZoomSelectionActions = {
+  /** Start a new selection at the given x-axis value */
+  startSelection: (label: string) => void;
+  /** Update the selection as the user drags */
+  updateSelection: (label: string, data: any[], dataKey: string, minDataPoints?: number) => void;
+  /** Finish the selection and return the range if valid */
+  finishSelection: (data: any[], dataKey: string, minDataPoints?: number) => ZoomRange | null;
+  /** Cancel the current selection */
+  cancelSelection: () => void;
+  /** Toggle the inspection line at the given x-axis value */
+  toggleInspectionLine: (label: string) => void;
+  /** Clear the inspection line */
+  clearInspectionLine: () => void;
+  /** Reset all zoom state */
+  reset: () => void;
+};
+
+export type UseZoomSelectionReturn = ZoomSelectionState & ZoomSelectionActions;
+
+const initialState: ZoomSelectionState = {
+  refAreaLeft: null,
+  refAreaRight: null,
+  isSelecting: false,
+  invalidSelection: false,
+  inspectionLine: null,
+};
+
+/**
+ * Hook to manage zoom selection state for charts.
+ * Handles drag-to-zoom and click-to-inspect functionality.
+ */
+export function useZoomSelection(): UseZoomSelectionReturn {
+  const [state, setState] = useState<ZoomSelectionState>(initialState);
+  // Ref to track current state synchronously (needed for finishSelection)
+  const stateRef = useRef<ZoomSelectionState>(state);
+
+  // Keep ref in sync with state
+  stateRef.current = state;
+
+  const startSelection = useCallback((label: string) => {
+    const next = {
+      ...stateRef.current,
+      refAreaLeft: label,
+      refAreaRight: null,
+      isSelecting: true,
+      invalidSelection: false,
+    };
+    // Update ref synchronously first
+    stateRef.current = next;
+    setState(next);
+  }, []);
+
+  const updateSelection = useCallback(
+    (label: string, data: any[], dataKey: string, minDataPoints = 3) => {
+      const prev = stateRef.current;
+      if (!prev.isSelecting || !prev.refAreaLeft) {
+        return;
+      }
+
+      // Check if selection is valid (has enough data points)
+      const allLabels = data.map((item) => item[dataKey] as string).filter(Boolean);
+      const leftIndex = allLabels.indexOf(prev.refAreaLeft);
+      const rightIndex = allLabels.indexOf(label);
+
+      let invalidSelection = false;
+      if (leftIndex !== -1 && rightIndex !== -1) {
+        const [start, end] = [leftIndex, rightIndex].sort((a, b) => a - b);
+        invalidSelection = end - start < minDataPoints - 1;
+      } else {
+        invalidSelection = true;
+      }
+
+      const next = {
+        ...prev,
+        refAreaRight: label,
+        invalidSelection,
+      };
+      // Update ref synchronously first
+      stateRef.current = next;
+      setState(next);
+    },
+    []
+  );
+
+  const finishSelection = useCallback(
+    (data: any[], dataKey: string, minDataPoints = 3): ZoomRange | null => {
+      // Get current state synchronously to calculate result
+      const currentState = stateRef.current;
+
+      if (!currentState.refAreaLeft || !currentState.refAreaRight) {
+        const next = { ...initialState, inspectionLine: currentState.inspectionLine };
+        stateRef.current = next;
+        setState(next);
+        return null;
+      }
+
+      const allLabels = data.map((item) => item[dataKey] as string).filter(Boolean);
+      const leftIndex = allLabels.indexOf(currentState.refAreaLeft);
+      const rightIndex = allLabels.indexOf(currentState.refAreaRight);
+
+      let result: ZoomRange | null = null;
+
+      if (leftIndex !== -1 && rightIndex !== -1) {
+        const [startIdx, endIdx] = [leftIndex, rightIndex].sort((a, b) => a - b);
+
+        // Only create a valid range if we have enough data points
+        if (endIdx - startIdx >= minDataPoints - 1) {
+          result = {
+            start: allLabels[startIdx],
+            end: allLabels[endIdx],
+          };
+        }
+      }
+
+      // Reset the state (preserve inspection line)
+      const next = { ...initialState, inspectionLine: currentState.inspectionLine };
+      stateRef.current = next;
+      setState(next);
+
+      return result;
+    },
+    []
+  );
+
+  const cancelSelection = useCallback(() => {
+    const next = {
+      ...initialState,
+      inspectionLine: stateRef.current.inspectionLine,
+    };
+    stateRef.current = next;
+    setState(next);
+  }, []);
+
+  const toggleInspectionLine = useCallback((label: string) => {
+    const prev = stateRef.current;
+    const next = {
+      ...prev,
+      inspectionLine: prev.inspectionLine === label ? null : label,
+    };
+    stateRef.current = next;
+    setState(next);
+  }, []);
+
+  const clearInspectionLine = useCallback(() => {
+    const next = {
+      ...stateRef.current,
+      inspectionLine: null,
+    };
+    stateRef.current = next;
+    setState(next);
+  }, []);
+
+  const reset = useCallback(() => {
+    stateRef.current = initialState;
+    setState(initialState);
+  }, []);
+
+  return useMemo(
+    () => ({
+      ...state,
+      startSelection,
+      updateSelection,
+      finishSelection,
+      cancelSelection,
+      toggleInspectionLine,
+      clearInspectionLine,
+      reset,
+    }),
+    [state, startSelection, updateSelection, finishSelection, cancelSelection, toggleInspectionLine, clearInspectionLine, reset]
+  );
+}
diff --git a/apps/webapp/app/components/query/QueryEditor.tsx b/apps/webapp/app/components/query/QueryEditor.tsx
new file mode 100644
index 00000000000..3960e3d9c84
--- /dev/null
+++ b/apps/webapp/app/components/query/QueryEditor.tsx
@@ -0,0 +1,1493 @@
+import {
+  ArrowDownTrayIcon,
+  BookmarkIcon,
+  CalendarIcon,
+  ClipboardIcon,
+  PencilIcon,
+  PencilSquareIcon,
+} from "@heroicons/react/20/solid";
+import type { OutputColumnMetadata } from "@internal/clickhouse";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { useFetcher } from "@remix-run/react";
+import { IconChartHistogram } from "@tabler/icons-react";
+import { formatDurationNanoseconds } from "@trigger.dev/core/v3";
+import { Clipboard } from "lucide-react";
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+  type ReactNode,
+} from "react";
+import { flushSync } from "react-dom";
+import { useTypedFetcher } from "remix-typedjson";
+import simplur from "simplur";
+import { AISparkleIcon } from "~/assets/icons/AISparkleIcon";
+import { ChartConfigPanel, defaultChartConfig } from "~/components/code/ChartConfigPanel";
+import { autoFormatSQL, TSQLEditor } from "~/components/code/TSQLEditor";
+import { EnvironmentLabel } from "~/components/environments/EnvironmentLabel";
+import { PageBody, PageContainer } from "~/components/layout/AppLayout";
+import {
+  QueryWidget,
+  type BigNumberConfiguration,
+  type ChartConfiguration,
+  type QueryWidgetConfig,
+  type QueryWidgetData,
+} from "~/components/metrics/QueryWidget";
+import { SaveToDashboardDialog } from "~/components/metrics/SaveToDashboardDialog";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Callout } from "~/components/primitives/Callout";
+import {
+  ClientTabs,
+  ClientTabsContent,
+  ClientTabsList,
+  ClientTabsTrigger,
+} from "~/components/primitives/ClientTabs";
+import { Dialog, DialogContent, DialogFooter, DialogHeader } from "~/components/primitives/Dialog";
+import { Header3 } from "~/components/primitives/Headers";
+import { Input } from "~/components/primitives/Input";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { Label } from "~/components/primitives/Label";
+import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import {
+  Popover,
+  PopoverArrowTrigger,
+  PopoverContent,
+  PopoverMenuItem,
+} from "~/components/primitives/Popover";
+import {
+  ResizableHandle,
+  ResizablePanel,
+  ResizablePanelGroup,
+} from "~/components/primitives/Resizable";
+import { Select, SelectItem } from "~/components/primitives/Select";
+import { Spinner } from "~/components/primitives/Spinner";
+import { Switch } from "~/components/primitives/Switch";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
+import { TimeFilter } from "~/components/runs/v3/SharedFilters";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import type { QueryHistoryItem } from "~/presenters/v3/QueryPresenter.server";
+import { QueryHelpSidebar } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHelpSidebar";
+import { QueryHistoryPopover } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHistoryPopover";
+import type { AITimeFilter } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types";
+import type { action as titleAction } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-title";
+import type { QueryScope } from "~/services/queryService.server";
+import { downloadFile, rowsToCSV, rowsToJSON } from "~/utils/dataExport";
+import { organizationBillingPath } from "~/utils/pathBuilder";
+import { querySchemas } from "~/v3/querySchemas";
+
+/** Convert a Date or ISO string to ISO string format */
+function toISOString(value: Date | string): string {
+  if (typeof value === "string") {
+    return value;
+  }
+  return value.toISOString();
+}
+
+const scopeOptions = [
+  { value: "environment", label: "Environment" },
+  { value: "project", label: "Project" },
+  { value: "organization", label: "Organization" },
+] as const;
+
+// Type for the query action response
+type QueryActionResponse = {
+  error: string | null;
+  rows: Record<string, unknown>[] | null;
+  columns: OutputColumnMetadata[] | null;
+  stats: { elapsed_ns: string } | null;
+  hiddenColumns: string[] | null;
+  reachedMaxRows: boolean | null;
+  explainOutput: string | null;
+  generatedSql: string | null;
+  queryId?: string | null;
+  periodClipped: number | null;
+  maxQueryPeriod?: number;
+};
+
+export type QueryEditorMode =
+  | { type: "standalone" }
+  | { type: "dashboard-add"; dashboardId: string; dashboardName: string }
+  | {
+      type: "dashboard-edit";
+      dashboardId: string;
+      dashboardName: string;
+      widgetId: string;
+      widgetName: string;
+    };
+
+/** Data passed to the save render prop */
+export type QueryEditorSaveData = {
+  title: string;
+  query: string;
+  config: QueryWidgetConfig;
+};
+
+export type QueryEditorProps = {
+  // Default values - used to initialize state
+  defaultQuery: string;
+  defaultScope: QueryScope;
+  defaultPeriod: string;
+  defaultTimeFilter?: { period?: string; from?: string; to?: string };
+  defaultResultsView?: "table" | "graph" | "bignumber";
+  defaultChartConfig?: ChartConfiguration;
+  defaultBigNumberConfig?: BigNumberConfiguration;
+  /** Initial result data to display (e.g., when editing an existing widget) */
+  defaultData?: QueryWidgetData;
+
+  // Other required data
+  history: QueryHistoryItem[];
+  isAdmin: boolean;
+  maxRows: number;
+
+  // The URL to post query execution requests to
+  queryActionUrl: string;
+
+  // Mode determines NavBar and save behavior
+  mode: QueryEditorMode;
+
+  // Max period days (from plan)
+  maxPeriodDays?: number;
+
+  // Render prop for save functionality - receives current data, returns ReactNode
+  save?: (data: QueryEditorSaveData) => ReactNode;
+  onClose?: () => void;
+};
+
+/** Handle for imperatively setting the query from outside */
+interface QueryEditorFormHandle {
+  setQuery: (query: string) => void;
+  setScope: (scope: QueryScope) => void;
+  getQuery: () => string;
+  setTimeFilter: (filter: { period?: string; from?: string; to?: string }) => void;
+}
+
+/** Self-contained query editor with form - isolates query state from parent */
+const QueryEditorForm = forwardRef<
+  QueryEditorFormHandle,
+  {
+    defaultPeriod: string;
+    defaultQuery: string;
+    defaultScope: QueryScope;
+    defaultTimeFilter?: { period?: string; from?: string; to?: string };
+    history: QueryHistoryItem[];
+    fetcher: ReturnType<typeof useTypedFetcher<QueryActionResponse>>;
+    isAdmin: boolean;
+    queryActionUrl: string;
+    maxPeriodDays?: number;
+    onQuerySubmit?: () => void;
+    onHistorySelected?: (item: QueryHistoryItem) => void;
+  }
+>(function QueryEditorForm(
+  {
+    defaultPeriod,
+    defaultQuery,
+    defaultScope,
+    defaultTimeFilter,
+    history,
+    fetcher,
+    isAdmin,
+    queryActionUrl,
+    maxPeriodDays,
+    onQuerySubmit,
+    onHistorySelected,
+  },
+  ref
+) {
+  const isLoading = fetcher.state === "submitting" || fetcher.state === "loading";
+  const [query, setQuery] = useState(defaultQuery);
+  const [scope, setScope] = useState<QueryScope>(defaultScope);
+  const formRef = useRef<HTMLFormElement>(null);
+  const prevFetcherState = useRef(fetcher.state);
+
+  // Notify parent when query is submitted (for title generation)
+  useEffect(() => {
+    if (prevFetcherState.current !== "submitting" && fetcher.state === "submitting") {
+      onQuerySubmit?.();
+    }
+    prevFetcherState.current = fetcher.state;
+  }, [fetcher.state, onQuerySubmit]);
+
+  // Get time filter values - initialize from props (which may come from history)
+  const [period, setPeriod] = useState<string | undefined>(defaultTimeFilter?.period);
+  const [from, setFrom] = useState<string | undefined>(defaultTimeFilter?.from);
+  const [to, setTo] = useState<string | undefined>(defaultTimeFilter?.to);
+
+  // Check if the query contains triggered_at in a WHERE clause
+  // This disables the time filter UI since the user is filtering in their query
+  const queryHasTriggeredAt = /\bWHERE\b[\s\S]*\btriggered_at\b/i.test(query);
+
+  // Expose methods to parent for external query setting (history, AI, examples)
+  useImperativeHandle(
+    ref,
+    () => ({
+      setQuery,
+      setScope,
+      getQuery: () => query,
+      setTimeFilter: (filter: { period?: string; from?: string; to?: string }) => {
+        setPeriod(filter.period);
+        setFrom(filter.from);
+        setTo(filter.to);
+      },
+    }),
+    [query]
+  );
+
+  const handleHistorySelected = useCallback(
+    (item: QueryHistoryItem) => {
+      setQuery(item.query);
+      setScope(item.scope);
+      // Apply time filter from history item
+      // Note: filterFrom/filterTo might be Date objects or ISO strings depending on serialization
+      setPeriod(item.filterPeriod ?? undefined);
+      setFrom(item.filterFrom ? toISOString(item.filterFrom) : undefined);
+      setTo(item.filterTo ? toISOString(item.filterTo) : undefined);
+      // Notify parent about history selection (for title)
+      onHistorySelected?.(item);
+    },
+    [onHistorySelected]
+  );
+
+  return (
+    <div className="flex h-full flex-col gap-2 bg-charcoal-900 pb-2">
+      <TSQLEditor
+        defaultValue={query}
+        onChange={setQuery}
+        schema={querySchemas}
+        linterEnabled={true}
+        showCopyButton={true}
+        showClearButton={true}
+        className="min-h-0 flex-1"
+      />
+      <fetcher.Form
+        ref={formRef}
+        method="post"
+        action={queryActionUrl}
+        className="flex items-center justify-between gap-2 px-2"
+      >
+        <input type="hidden" name="query" value={query} />
+        <input type="hidden" name="scope" value={scope} />
+        {/* Pass time filter values to action */}
+        <input type="hidden" name="period" value={period ?? ""} />
+        <input type="hidden" name="from" value={from ?? ""} />
+        <input type="hidden" name="to" value={to ?? ""} />
+        <QueryHistoryPopover history={history} onQuerySelected={handleHistorySelected} />
+        <div className="flex items-center gap-1">
+          {isAdmin && (
+            <Button
+              type="submit"
+              name="explain"
+              value="true"
+              variant="minimal/small"
+              disabled={isLoading || !query.trim()}
+            >
+              Explain
+            </Button>
+          )}
+          <Select
+            value={scope}
+            setValue={(value) => setScope(value as QueryScope)}
+            variant="secondary/small"
+            dropdownIcon={true}
+            items={[...scopeOptions]}
+            text={(value) => {
+              return <ScopeItem scope={value as QueryScope} />;
+            }}
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  <ScopeItem scope={item.value as QueryScope} />
+                </SelectItem>
+              ))
+            }
+          </Select>
+          {queryHasTriggeredAt ? (
+            <SimpleTooltip
+              asChild
+              button={
+                <span>
+                  <Button
+                    variant="secondary/small"
+                    disabled={true}
+                    type="button"
+                    LeadingIcon={CalendarIcon}
+                    leadingIconClassName="text-text-dimmed/70"
+                  >
+                    Set in query
+                  </Button>
+                </span>
+              }
+              className="max-w-48"
+              content="Your query includes a WHERE clause with triggered_at so this filter is disabled."
+            />
+          ) : (
+            <TimeFilter
+              defaultPeriod={defaultPeriod}
+              labelName="Triggered"
+              hideLabel
+              valueClassName="text-text-bright"
+              period={period}
+              from={from}
+              to={to}
+              applyShortcut={{ key: "enter", enabledOnInputElements: true }}
+              onValueChange={(values) => {
+                flushSync(() => {
+                  setPeriod(values.period);
+                  setFrom(values.from);
+                  setTo(values.to);
+                });
+                if (formRef.current) {
+                  fetcher.submit(formRef.current);
+                }
+              }}
+              maxPeriodDays={maxPeriodDays}
+            />
+          )}
+          <Button
+            type="submit"
+            variant="primary/small"
+            disabled={isLoading || !query.trim()}
+            shortcut={{ modifiers: ["mod"], key: "enter", enabledOnInputElements: true }}
+            className={
+              isLoading
+                ? "relative !text-transparent [&_*]:!border-transparent [&_*]:!text-transparent"
+                : undefined
+            }
+          >
+            {isLoading ? (
+              <>
+                Query
+                <span className="pointer-events-none absolute inset-0 flex items-center justify-center">
+                  <Spinner className="size-4 opacity-50" color="white" />
+                </span>
+              </>
+            ) : (
+              "Query"
+            )}
+          </Button>
+        </div>
+      </fetcher.Form>
+    </div>
+  );
+});
+
+export function QueryEditor({
+  defaultQuery,
+  defaultScope,
+  defaultPeriod,
+  defaultTimeFilter,
+  defaultResultsView = "table",
+  defaultChartConfig: initialChartConfig,
+  defaultBigNumberConfig: initialBigNumberConfig,
+  defaultData,
+  history,
+  isAdmin,
+  maxRows,
+  queryActionUrl,
+  mode,
+  maxPeriodDays,
+  save,
+  onClose,
+}: QueryEditorProps) {
+  const fetcher = useTypedFetcher<QueryActionResponse>();
+
+  // Use defaultData as initial results, then switch to fetcher data once a query is run
+  const fetcherResults = fetcher.data;
+  const results =
+    fetcherResults ??
+    (defaultData
+      ? {
+          error: null,
+          rows: defaultData.rows,
+          columns: defaultData.columns,
+          stats: null,
+          hiddenColumns: null,
+          reachedMaxRows: false,
+          explainOutput: null,
+          generatedSql: null,
+          queryId: null,
+          periodClipped: null,
+        }
+      : null);
+
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  const editorRef = useRef<QueryEditorFormHandle>(null);
+  const [prettyFormatting, setPrettyFormatting] = useState(true);
+  const [resultsView, setResultsView] = useState<"table" | "graph" | "bignumber">(
+    defaultResultsView
+  );
+  const [chartConfig, setChartConfig] = useState<ChartConfiguration>(
+    initialChartConfig ?? defaultChartConfig
+  );
+  const [bigNumberConfig, setBigNumberConfig] = useState<BigNumberConfiguration>(
+    initialBigNumberConfig ?? { column: "", aggregation: "sum", abbreviate: true }
+  );
+  const [sidebarTab, setSidebarTab] = useState<string>("ai");
+  const [aiFixRequest, setAiFixRequest] = useState<{ prompt: string; key: number } | null>(null);
+
+  // Save to dashboard dialog state (only for standalone mode)
+  const [isSaveDialogOpen, setIsSaveDialogOpen] = useState(false);
+
+  // Title generation state
+  const titleFetcher = useFetcher<typeof titleAction>();
+  const isTitleLoading = titleFetcher.state !== "idle";
+  const generatedTitle = titleFetcher.data?.title;
+  const [historyTitle, setHistoryTitle] = useState<string | null>(
+    history.length > 0 ? history[0].title ?? null : null
+  );
+
+  // For edit mode, use the widget name as initial title
+  const initialTitle = mode.type === "dashboard-edit" ? mode.widgetName : null;
+  const [editModeTitle, setEditModeTitle] = useState<string | null>(initialTitle);
+
+  // User-set title (takes priority, and disables AI regeneration)
+  const [userTitle, setUserTitle] = useState<string | null>(null);
+
+  // Effective title: user title > edit mode title > history title > generated title
+  const queryTitle =
+    userTitle ??
+    (mode.type === "dashboard-edit"
+      ? editModeTitle ?? historyTitle ?? generatedTitle ?? null
+      : historyTitle ?? generatedTitle ?? null);
+
+  // Track if user has manually set a title (disables AI regeneration)
+  const hasUserTitle = userTitle !== null;
+
+  // Track whether we should generate a title for the current results
+  const [shouldGenerateTitle, setShouldGenerateTitle] = useState(false);
+
+  // Trigger title generation when query succeeds (only for new queries, not history, not if user set title)
+  useEffect(() => {
+    if (
+      results?.rows &&
+      !results.error &&
+      results.queryId &&
+      shouldGenerateTitle &&
+      !historyTitle &&
+      !hasUserTitle &&
+      titleFetcher.state === "idle"
+    ) {
+      const currentQuery = editorRef.current?.getQuery();
+      if (currentQuery) {
+        titleFetcher.submit(
+          { query: currentQuery, queryId: results.queryId },
+          {
+            method: "POST",
+            action: `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/query/ai-title`,
+            encType: "application/json",
+          }
+        );
+        setShouldGenerateTitle(false);
+      }
+    }
+  }, [
+    results,
+    shouldGenerateTitle,
+    historyTitle,
+    hasUserTitle,
+    titleFetcher,
+    organization.slug,
+    project.slug,
+    environment.slug,
+  ]);
+
+  const handleTryFixError = useCallback((errorMessage: string) => {
+    setSidebarTab("ai");
+    setAiFixRequest((prev) => ({
+      prompt: `Fix this query error: ${errorMessage}`,
+      key: (prev?.key ?? 0) + 1,
+    }));
+  }, []);
+
+  // Handle time filter changes from AI
+  const handleTimeFilterChange = useCallback((filter: AITimeFilter) => {
+    editorRef.current?.setTimeFilter({
+      period: filter.period,
+      from: filter.from,
+      to: filter.to,
+    });
+  }, []);
+
+  const isLoading = fetcher.state === "submitting" || fetcher.state === "loading";
+
+  // Stable string key of result column names (types excluded — they can vary between runs)
+  const columnNamesKey = results?.columns ? results.columns.map((c) => c.name).join(",") : "";
+
+  // Use a ref so the effect can read chartConfig without re-firing on every config tweak
+  const chartConfigRef = useRef(chartConfig);
+  chartConfigRef.current = chartConfig;
+
+  // Reset chart config only when a column referenced by the current config is no
+  // longer present in the results. This means:
+  // - Re-running the same query preserves all settings
+  // - Adding new columns preserves settings (existing config columns still exist)
+  // - Removing/renaming a column used in the config triggers a reset
+  useEffect(() => {
+    if (!columnNamesKey || initialChartConfig) return;
+
+    const config = chartConfigRef.current;
+    const configColumns = [
+      config.xAxisColumn,
+      ...config.yAxisColumns,
+      config.groupByColumn,
+      config.sortByColumn,
+    ].filter((col): col is string => col != null);
+
+    // Nothing configured yet — ChartConfigPanel will auto-select defaults
+    if (configColumns.length === 0) return;
+
+    const availableColumns = new Set(columnNamesKey.split(","));
+    if (configColumns.some((col) => !availableColumns.has(col))) {
+      setChartConfig(defaultChartConfig);
+    }
+  }, [columnNamesKey, initialChartConfig]);
+
+  const handleChartConfigChange = useCallback((config: ChartConfiguration) => {
+    setChartConfig(config);
+  }, []);
+
+  // Handle query submission - prepare for title generation
+  const handleQuerySubmit = useCallback(() => {
+    setHistoryTitle(null); // Clear history title when running a new query
+    setEditModeTitle(null); // Clear edit mode title when running a new query
+    // Only enable title generation if user hasn't manually set a title
+    // userTitle persists across query edits once set
+    setShouldGenerateTitle(!hasUserTitle);
+  }, [hasUserTitle]);
+
+  // Handle history selection - use existing title if available
+  const handleHistorySelected = useCallback((item: QueryHistoryItem) => {
+    setHistoryTitle(item.title ?? null);
+    setEditModeTitle(null);
+    setUserTitle(null); // Clear user title when selecting from history
+    setShouldGenerateTitle(false); // Don't generate title for history items
+  }, []);
+
+  // Handle user renaming the title
+  const handleRenameTitle = useCallback((newTitle: string) => {
+    setUserTitle(newTitle);
+    // Clear other title sources since user has explicitly set the title
+    setHistoryTitle(null);
+    setEditModeTitle(null);
+  }, []);
+
+  // Compute current save data for the save render prop
+  const currentQuery = editorRef.current?.getQuery() ?? "";
+  const saveData: QueryEditorSaveData = {
+    title: queryTitle ?? "Untitled Query",
+    query: currentQuery,
+    config:
+      resultsView === "table"
+        ? { type: "table", prettyFormatting, sorting: [] }
+        : resultsView === "bignumber"
+        ? { type: "bignumber", ...bigNumberConfig }
+        : { type: "chart", ...chartConfig },
+  };
+
+  // Render NavBar based on mode
+  const renderNavBar = () => {
+    switch (mode.type) {
+      case "standalone":
+        return (
+          <NavBar>
+            <PageTitle title="Query" />
+          </NavBar>
+        );
+      case "dashboard-add":
+        return (
+          <NavBar>
+            <PageTitle title={`Add chart to ${mode.dashboardName}`} />
+            <PageAccessories>
+              <Button
+                variant="secondary/small"
+                onClick={onClose}
+                shortcut={{ key: "esc" }}
+                shortcutPosition="before-trailing-icon"
+                // className="pl-1"
+              >
+                Cancel
+              </Button>
+            </PageAccessories>
+          </NavBar>
+        );
+      case "dashboard-edit":
+        return (
+          <NavBar>
+            <PageTitle title={`Editing "${mode.widgetName}"`} />
+            <PageAccessories>
+              <Button
+                variant="secondary/small"
+                onClick={onClose}
+                shortcut={{ key: "esc" }}
+                shortcutPosition="before-trailing-icon"
+                // className="pl-1"
+              >
+                Cancel
+              </Button>
+            </PageAccessories>
+          </NavBar>
+        );
+    }
+  };
+
+  return (
+    <PageContainer>
+      {renderNavBar()}
+      <PageBody scrollable={false}>
+        <ResizablePanelGroup orientation="horizontal" className="h-full max-h-full bg-charcoal-800">
+          <ResizablePanel id="query-main" className="h-full">
+            <ResizablePanelGroup orientation="vertical" className="h-full overflow-hidden">
+              {/* Query editor - isolated component to prevent re-renders */}
+              <ResizablePanel
+                id="query-editor"
+                min="100px"
+                default="300px"
+                className="overflow-hidden"
+              >
+                <QueryEditorForm
+                  ref={editorRef}
+                  defaultPeriod={defaultPeriod}
+                  defaultQuery={defaultQuery}
+                  defaultScope={defaultScope}
+                  defaultTimeFilter={defaultTimeFilter}
+                  history={history}
+                  fetcher={fetcher}
+                  isAdmin={isAdmin}
+                  queryActionUrl={queryActionUrl}
+                  maxPeriodDays={maxPeriodDays}
+                  onQuerySubmit={handleQuerySubmit}
+                  onHistorySelected={handleHistorySelected}
+                />
+              </ResizablePanel>
+              <ResizableHandle id="query-editor-handle" />
+              {/* Results */}
+              <ResizablePanel
+                id="query-results"
+                min="200px"
+                className="overflow-hidden bg-charcoal-800"
+              >
+                <ClientTabs
+                  value={resultsView}
+                  onValueChange={(v) => setResultsView(v as "table" | "graph" | "bignumber")}
+                  className="grid h-full max-h-full min-h-0 grid-rows-[auto_1fr] overflow-hidden"
+                >
+                  <ClientTabsList
+                    variant="underline"
+                    className="shrink-0 overflow-hidden pl-3 pr-1"
+                  >
+                    <ClientTabsTrigger value="table" variant="underline" layoutId="results-tabs">
+                      Table
+                    </ClientTabsTrigger>
+                    <ClientTabsTrigger
+                      value="graph"
+                      variant="underline"
+                      layoutId="results-tabs"
+                      disabled={!results?.rows || results.rows.length === 0}
+                    >
+                      Graph
+                    </ClientTabsTrigger>
+                    <ClientTabsTrigger
+                      value="bignumber"
+                      variant="underline"
+                      layoutId="results-tabs"
+                      disabled={!results?.rows || results.rows.length === 0}
+                    >
+                      Big number
+                    </ClientTabsTrigger>
+                    {results?.rows ? (
+                      <div className="flex flex-1 items-center justify-end gap-2 overflow-hidden border-b border-grid-dimmed pl-3">
+                        <div className="flex items-center gap-2 overflow-hidden truncate">
+                          {results.reachedMaxRows ? (
+                            <SimpleTooltip
+                              buttonClassName="text-warning text-xs"
+                              button={`${results.rows.length.toLocaleString()} Results`}
+                              content={`Results are limited to ${maxRows.toLocaleString()} rows maximum.`}
+                            />
+                          ) : (
+                            <span className="text-xs text-text-dimmed">
+                              {results.rows.length > 0
+                                ? `${results.rows.length.toLocaleString()} Results`
+                                : "Results"}
+                            </span>
+                          )}
+                          {results?.stats && (
+                            <span className="text-xs text-text-dimmed">
+                              {formatDurationNanoseconds(parseInt(results.stats.elapsed_ns, 10))}
+                            </span>
+                          )}
+                        </div>
+                        <div className="flex items-center gap-1">
+                          {results?.rows && results?.columns && results.rows.length > 0 && (
+                            <ExportResultsButton rows={results.rows} columns={results.columns} />
+                          )}
+                          {resultsView === "table" && (
+                            <Switch
+                              variant="tertiary/small"
+                              label="Pretty formatting"
+                              checked={prettyFormatting}
+                              onCheckedChange={setPrettyFormatting}
+                            />
+                          )}
+                        </div>
+                      </div>
+                    ) : null}
+                  </ClientTabsList>
+                  <ClientTabsContent value="table" className="m-0 min-h-0 overflow-y-hidden">
+                    {isLoading ? (
+                      <div className="flex items-center gap-2 p-4 text-sm text-text-dimmed">
+                        <Spinner className="size-4" />
+                        <span>Executing query…</span>
+                      </div>
+                    ) : results?.error ? (
+                      <div className="p-4">
+                        <pre className="whitespace-pre-wrap text-sm text-red-400">
+                          {results.error}
+                        </pre>
+                        <Button
+                          variant="tertiary/small"
+                          className="mt-3"
+                          LeadingIcon={AISparkleIcon}
+                          onClick={() => handleTryFixError(results.error!)}
+                        >
+                          Try fix error
+                        </Button>
+                      </div>
+                    ) : results?.explainOutput ? (
+                      <div className="flex h-full flex-col gap-4 overflow-auto p-3">
+                        {results.generatedSql && (
+                          <div>
+                            <Header3 className="mb-2">Generated ClickHouse SQL</Header3>
+                            <div className="overflow-auto rounded border border-grid-dimmed bg-charcoal-900 p-3">
+                              <pre className="whitespace-pre font-mono text-xs text-text-bright">
+                                {results.generatedSql}
+                              </pre>
+                            </div>
+                          </div>
+                        )}
+                        <div className="flex min-h-0 flex-1 flex-col">
+                          <Header3 className="mb-2">Query Execution Plan</Header3>
+                          <div className="min-h-0 flex-1 overflow-auto rounded border border-grid-dimmed bg-charcoal-900 p-3">
+                            <pre className="whitespace-pre font-mono text-xs text-text-bright">
+                              {results.explainOutput}
+                            </pre>
+                          </div>
+                        </div>
+                      </div>
+                    ) : results?.rows && results?.columns ? (
+                      <div
+                        className={`grid h-full max-h-full overflow-hidden bg-background-bright ${
+                          hasQueryResultsCallouts(results.hiddenColumns, results.periodClipped)
+                            ? "grid-rows-[auto_1fr]"
+                            : "grid-rows-[1fr]"
+                        }`}
+                      >
+                        <QueryResultsCallouts
+                          hiddenColumns={results.hiddenColumns}
+                          periodClipped={results.periodClipped}
+                          organizationSlug={organization.slug}
+                        />
+                        <div className="overflow-hidden">
+                          <QueryWidget
+                            className="border-0"
+                            showTableHeaderOnEmpty
+                            title={
+                              <QueryTitle
+                                isTitleLoading={isTitleLoading}
+                                title={queryTitle}
+                                onRename={handleRenameTitle}
+                              />
+                            }
+                            query={editorRef.current?.getQuery() ?? defaultQuery}
+                            data={{
+                              rows: results.rows,
+                              columns: results.columns,
+                            }}
+                            config={{
+                              type: "table",
+                              prettyFormatting,
+                              sorting: [],
+                            }}
+                            accessory={
+                              mode.type === "standalone" ? (
+                                <Button
+                                  variant="primary/small"
+                                  onClick={() => setIsSaveDialogOpen(true)}
+                                >
+                                  Add to dashboard
+                                </Button>
+                              ) : save ? (
+                                save(saveData)
+                              ) : undefined
+                            }
+                          />
+                        </div>
+                      </div>
+                    ) : (
+                      <div className="flex h-full flex-col items-center justify-center gap-3">
+                        <IconChartHistogram className="size-16 text-charcoal-650" />
+                        <Paragraph className="max-w-48 text-center text-text-dimmed">
+                          Run a query to visualize the results.
+                        </Paragraph>
+                      </div>
+                    )}
+                  </ClientTabsContent>
+                  <ClientTabsContent
+                    value="graph"
+                    className={`m-0 grid h-full max-h-full min-h-0 overflow-hidden bg-background-bright ${
+                      results?.rows &&
+                      results.rows.length > 0 &&
+                      hasQueryResultsCallouts(results.hiddenColumns, results.periodClipped)
+                        ? "grid-rows-[auto_1fr]"
+                        : "grid-rows-[1fr]"
+                    }`}
+                  >
+                    {results?.rows && results?.columns && results.rows.length > 0 ? (
+                      <>
+                        <QueryResultsCallouts
+                          hiddenColumns={results.hiddenColumns}
+                          periodClipped={results.periodClipped}
+                          organizationSlug={organization.slug}
+                        />
+                        <ResultsChart
+                          rows={results.rows}
+                          columns={results.columns}
+                          query={editorRef.current?.getQuery() ?? defaultQuery}
+                          chartConfig={chartConfig}
+                          onChartConfigChange={handleChartConfigChange}
+                          queryTitle={queryTitle}
+                          isTitleLoading={isTitleLoading}
+                          onRenameTitle={handleRenameTitle}
+                          accessory={
+                            mode.type === "standalone" ? (
+                              <Button
+                                variant="primary/small"
+                                onClick={() => setIsSaveDialogOpen(true)}
+                              >
+                                Add to dashboard
+                              </Button>
+                            ) : save ? (
+                              save(saveData)
+                            ) : undefined
+                          }
+                        />
+                      </>
+                    ) : (
+                      <div className="flex h-full flex-col items-center justify-center gap-3">
+                        <IconChartHistogram className="size-16 text-charcoal-650" />
+                        <Paragraph className="max-w-48 text-center text-text-dimmed">
+                          Run a query to visualize the results.
+                        </Paragraph>
+                      </div>
+                    )}
+                  </ClientTabsContent>
+                  <ClientTabsContent
+                    value="bignumber"
+                    className={`m-0 grid h-full max-h-full min-h-0 overflow-hidden bg-background-bright ${
+                      results?.rows &&
+                      results.rows.length > 0 &&
+                      hasQueryResultsCallouts(results.hiddenColumns, results.periodClipped)
+                        ? "grid-rows-[auto_1fr]"
+                        : "grid-rows-[1fr]"
+                    }`}
+                  >
+                    {results?.rows && results?.columns && results.rows.length > 0 ? (
+                      <>
+                        <QueryResultsCallouts
+                          hiddenColumns={results.hiddenColumns}
+                          periodClipped={results.periodClipped}
+                          organizationSlug={organization.slug}
+                        />
+                        <ResultsBigNumber
+                          rows={results.rows}
+                          columns={results.columns}
+                          query={editorRef.current?.getQuery() ?? defaultQuery}
+                          bigNumberConfig={bigNumberConfig}
+                          onBigNumberConfigChange={setBigNumberConfig}
+                          queryTitle={queryTitle}
+                          isTitleLoading={isTitleLoading}
+                          onRenameTitle={handleRenameTitle}
+                          accessory={
+                            mode.type === "standalone" ? (
+                              <Button
+                                variant="primary/small"
+                                onClick={() => setIsSaveDialogOpen(true)}
+                              >
+                                Add to dashboard
+                              </Button>
+                            ) : save ? (
+                              save(saveData)
+                            ) : undefined
+                          }
+                        />
+                      </>
+                    ) : (
+                      <div className="flex h-full flex-col items-center justify-center gap-3">
+                        <IconChartHistogram className="size-16 text-charcoal-650" />
+                        <Paragraph className="max-w-48 text-center text-text-dimmed">
+                          Run a query to visualize the results.
+                        </Paragraph>
+                      </div>
+                    )}
+                  </ClientTabsContent>
+                </ClientTabs>
+              </ResizablePanel>
+            </ResizablePanelGroup>
+          </ResizablePanel>
+          <ResizableHandle id="query-handle" />
+          <ResizablePanel
+            id="query-help"
+            min="200px"
+            collapsible
+            collapsedSize="20px"
+            default="400px"
+            max="500px"
+            className="w-full"
+          >
+            <QueryHelpSidebar
+              onTryExample={(exampleQuery, exampleScope) => {
+                editorRef.current?.setQuery(exampleQuery);
+                editorRef.current?.setScope(exampleScope);
+              }}
+              onQueryGenerated={(query) => {
+                const formatted = autoFormatSQL(query);
+                editorRef.current?.setQuery(formatted);
+              }}
+              onTimeFilterChange={handleTimeFilterChange}
+              getCurrentQuery={() => editorRef.current?.getQuery() ?? ""}
+              activeTab={sidebarTab}
+              onTabChange={setSidebarTab}
+              aiFixRequest={aiFixRequest}
+            />
+          </ResizablePanel>
+        </ResizablePanelGroup>
+      </PageBody>
+      {mode.type === "standalone" && (
+        <SaveToDashboardDialog
+          title={queryTitle ?? "Untitled Query"}
+          query={editorRef.current?.getQuery() ?? ""}
+          config={
+            resultsView === "table"
+              ? { type: "table", prettyFormatting, sorting: [] }
+              : resultsView === "bignumber"
+              ? { type: "bignumber", ...bigNumberConfig }
+              : { type: "chart", ...chartConfig }
+          }
+          isOpen={isSaveDialogOpen}
+          onOpenChange={setIsSaveDialogOpen}
+        />
+      )}
+    </PageContainer>
+  );
+}
+
+function QueryTitle({
+  isTitleLoading,
+  title,
+  onRename,
+}: {
+  isTitleLoading: boolean;
+  title: string | null;
+  onRename?: (newTitle: string) => void;
+}) {
+  const [isDialogOpen, setIsDialogOpen] = useState(false);
+  const [renameValue, setRenameValue] = useState(title ?? "");
+
+  // Update rename value when title changes
+  useEffect(() => {
+    setRenameValue(title ?? "");
+  }, [title]);
+
+  if (isTitleLoading)
+    return (
+      <span className="flex items-center gap-2 text-text-dimmed">
+        <Spinner className="size-4" /> Generating title…
+      </span>
+    );
+
+  return (
+    <>
+      <span className="group flex items-center gap-1">
+        {title ?? "Results"}
+        {onRename && title && (
+          <Button
+            variant="minimal/small"
+            LeadingIcon={PencilSquareIcon}
+            leadingIconClassName="text-text-dimmed group-hover/button:text-text-bright"
+            className="opacity-0 transition-opacity group-hover:opacity-100"
+            onClick={() => {
+              setRenameValue(title);
+              setIsDialogOpen(true);
+            }}
+          />
+        )}
+      </span>
+      {onRename && (
+        <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
+          <DialogContent className="sm:max-w-md">
+            <DialogHeader>Rename chart</DialogHeader>
+            <form
+              className="space-y-4 pt-3"
+              onSubmit={(e) => {
+                e.preventDefault();
+                if (renameValue.trim()) {
+                  onRename(renameValue.trim());
+                  setIsDialogOpen(false);
+                }
+              }}
+            >
+              <InputGroup>
+                <Label>Title</Label>
+                <Input
+                  value={renameValue}
+                  onChange={(e) => setRenameValue(e.target.value)}
+                  placeholder="Chart title"
+                  autoFocus
+                />
+              </InputGroup>
+              <DialogFooter>
+                <DialogClose asChild>
+                  <Button variant="secondary/medium">Cancel</Button>
+                </DialogClose>
+                <Button type="submit" variant="primary/medium" disabled={!renameValue.trim()}>
+                  Save
+                </Button>
+              </DialogFooter>
+            </form>
+          </DialogContent>
+        </Dialog>
+      )}
+    </>
+  );
+}
+
+function ExportResultsButton({
+  rows,
+  columns,
+}: {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+}) {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const handleCopyCSV = () => {
+    const csv = rowsToCSV(rows, columns);
+    navigator.clipboard.writeText(csv);
+    setIsOpen(false);
+  };
+
+  const handleExportCSV = () => {
+    const csv = rowsToCSV(rows, columns);
+    const timestamp = new Date().toISOString().slice(0, 19).replace(/[:-]/g, "");
+    downloadFile(csv, `query-results-${timestamp}.csv`, "text/csv");
+    setIsOpen(false);
+  };
+
+  const handleCopyJSON = () => {
+    const json = rowsToJSON(rows);
+    navigator.clipboard.writeText(json);
+    setIsOpen(false);
+  };
+
+  const handleExportJSON = () => {
+    const json = rowsToJSON(rows);
+    const timestamp = new Date().toISOString().slice(0, 19).replace(/[:-]/g, "");
+    downloadFile(json, `query-results-${timestamp}.json`, "application/json");
+    setIsOpen(false);
+  };
+
+  return (
+    <Popover open={isOpen} onOpenChange={setIsOpen}>
+      <PopoverArrowTrigger variant="minimal" isOpen={isOpen}>
+        Export
+      </PopoverArrowTrigger>
+      <PopoverContent className="min-w-[10rem] p-1" align="end">
+        <div className="flex flex-col gap-1">
+          <PopoverMenuItem
+            icon={Clipboard}
+            title="Copy CSV"
+            onClick={handleCopyCSV}
+            className="pl-1"
+          />
+          <PopoverMenuItem icon={ArrowDownTrayIcon} title="Export CSV" onClick={handleExportCSV} />
+          <PopoverMenuItem
+            icon={Clipboard}
+            title="Copy JSON"
+            onClick={handleCopyJSON}
+            className="pl-1"
+          />
+          <PopoverMenuItem
+            icon={ArrowDownTrayIcon}
+            title="Export JSON"
+            onClick={handleExportJSON}
+          />
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function ScopeItem({ scope }: { scope: QueryScope }) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  switch (scope) {
+    case "organization":
+      return <span className="text-text-bright">{`Org: ${organization.title}`}</span>;
+    case "project":
+      return <span className="text-text-bright">{`Project: ${project.name}`}</span>;
+    case "environment":
+      return (
+        <span className="text-text-bright">
+          Env: <EnvironmentLabel environment={environment} />
+        </span>
+      );
+    default:
+      return <span className="text-text-bright">{scope}</span>;
+  }
+}
+
+function QueryResultsCallouts({
+  hiddenColumns,
+  periodClipped,
+  organizationSlug,
+}: {
+  hiddenColumns: string[] | null | undefined;
+  periodClipped: number | null;
+  organizationSlug: string;
+}) {
+  const hasCallouts = (hiddenColumns && hiddenColumns.length > 0) || periodClipped;
+
+  if (!hasCallouts) {
+    return null;
+  }
+
+  return (
+    <div className="flex flex-col gap-2 px-2 pt-2">
+      {hiddenColumns && hiddenColumns.length > 0 && (
+        <Callout variant="warning" className="shrink-0 text-sm">
+          <code>SELECT *</code> returns core columns only. To include{" "}
+          <span className="font-mono text-xs">{hiddenColumns.join(", ")}</span>, add them to your
+          SELECT explicitly.
+        </Callout>
+      )}
+      {periodClipped && (
+        <Callout
+          variant="pricing"
+          cta={
+            <LinkButton
+              variant="primary/small"
+              to={organizationBillingPath({ slug: organizationSlug })}
+            >
+              Upgrade
+            </LinkButton>
+          }
+          className="items-center"
+        >
+          {simplur`Results are limited to the last ${periodClipped} day[|s] based on your plan.`}
+        </Callout>
+      )}
+    </div>
+  );
+}
+
+function hasQueryResultsCallouts(
+  hiddenColumns: string[] | null | undefined,
+  periodClipped: number | null
+): boolean {
+  return (hiddenColumns && hiddenColumns.length > 0) || !!periodClipped;
+}
+
+function ResultsChart({
+  rows,
+  columns,
+  query,
+  chartConfig,
+  onChartConfigChange,
+  queryTitle,
+  isTitleLoading,
+  onRenameTitle,
+  accessory,
+}: {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+  query?: string;
+  chartConfig: ChartConfiguration;
+  onChartConfigChange: (config: ChartConfiguration) => void;
+  queryTitle: string | null;
+  isTitleLoading: boolean;
+  onRenameTitle?: (newTitle: string) => void;
+  accessory?: ReactNode;
+}) {
+  return (
+    <>
+      <ResizablePanelGroup className="overflow-hidden">
+        <ResizablePanel id="chart-results">
+          <div className="h-full overflow-hidden bg-background-bright">
+            <QueryWidget
+              className="border-0"
+              title={
+                <QueryTitle
+                  isTitleLoading={isTitleLoading}
+                  title={queryTitle}
+                  onRename={onRenameTitle}
+                />
+              }
+              query={query}
+              data={{
+                rows,
+                columns,
+              }}
+              config={{
+                type: "chart",
+                ...chartConfig,
+              }}
+              accessory={accessory}
+            />
+          </div>
+        </ResizablePanel>
+        <ResizableHandle id="chart-split" />
+        <ResizablePanel id="chart-config" min="50px" default="200px">
+          <ChartConfigPanel columns={columns} config={chartConfig} onChange={onChartConfigChange} />
+        </ResizablePanel>
+      </ResizablePanelGroup>
+    </>
+  );
+}
+
+function isNumericColumnType(type: string): boolean {
+  return (
+    type.startsWith("Int") ||
+    type.startsWith("UInt") ||
+    type.startsWith("Float") ||
+    type.startsWith("Decimal") ||
+    type.startsWith("Nullable(Int") ||
+    type.startsWith("Nullable(UInt") ||
+    type.startsWith("Nullable(Float") ||
+    type.startsWith("Nullable(Decimal")
+  );
+}
+
+function ResultsBigNumber({
+  rows,
+  columns,
+  query,
+  bigNumberConfig,
+  onBigNumberConfigChange,
+  queryTitle,
+  isTitleLoading,
+  onRenameTitle,
+  accessory,
+}: {
+  rows: Record<string, unknown>[];
+  columns: OutputColumnMetadata[];
+  query?: string;
+  bigNumberConfig: BigNumberConfiguration;
+  onBigNumberConfigChange: (config: BigNumberConfiguration) => void;
+  queryTitle: string | null;
+  isTitleLoading: boolean;
+  onRenameTitle?: (newTitle: string) => void;
+  accessory?: ReactNode;
+}) {
+  // Auto-select first numeric column if none selected
+  const numericColumns = columns.filter((c) => isNumericColumnType(c.type));
+
+  useEffect(() => {
+    if (!bigNumberConfig.column && numericColumns.length > 0) {
+      onBigNumberConfigChange({ ...bigNumberConfig, column: numericColumns[0].name });
+    }
+  }, [columns]);
+
+  return (
+    <>
+      <ResizablePanelGroup className="overflow-hidden">
+        <ResizablePanel id="bignumber-results">
+          <div className="h-full overflow-hidden bg-background-bright">
+            <QueryWidget
+              className="border-0"
+              title={
+                <QueryTitle
+                  isTitleLoading={isTitleLoading}
+                  title={queryTitle}
+                  onRename={onRenameTitle}
+                />
+              }
+              query={query}
+              data={{
+                rows,
+                columns,
+              }}
+              config={{
+                type: "bignumber",
+                ...bigNumberConfig,
+              }}
+              accessory={accessory}
+            />
+          </div>
+        </ResizablePanel>
+        <ResizableHandle id="bignumber-split" />
+        <ResizablePanel id="bignumber-config" min="50px" default="200px">
+          <BigNumberConfigPanel
+            columns={columns}
+            config={bigNumberConfig}
+            onChange={onBigNumberConfigChange}
+          />
+        </ResizablePanel>
+      </ResizablePanelGroup>
+    </>
+  );
+}
+
+const bigNumberAggregationOptions = [
+  { value: "sum", label: "Sum" },
+  { value: "avg", label: "Average" },
+  { value: "count", label: "Count" },
+  { value: "min", label: "Min" },
+  { value: "max", label: "Max" },
+  { value: "first", label: "First" },
+  { value: "last", label: "Last" },
+] as const;
+
+const bigNumberSortOptions = [
+  { value: "", label: "Unsorted" },
+  { value: "asc", label: "Ascending" },
+  { value: "desc", label: "Descending" },
+] as const;
+
+function BigNumberConfigPanel({
+  columns,
+  config,
+  onChange,
+}: {
+  columns: OutputColumnMetadata[];
+  config: BigNumberConfiguration;
+  onChange: (config: BigNumberConfiguration) => void;
+}) {
+  const numericColumns = columns.filter((c) => isNumericColumnType(c.type));
+  const allColumns = columns;
+
+  // For count aggregation, any column works; for others, prefer numeric
+  const availableColumns = config.aggregation === "count" ? allColumns : numericColumns;
+
+  return (
+    <div className="flex h-full flex-col gap-2 overflow-y-auto p-2">
+      <div className="flex flex-col gap-3">
+        <div className="flex flex-col gap-1">
+          <Paragraph variant="extra-small" className="text-text-bright">
+            Column
+          </Paragraph>
+          <Select
+            value={config.column || ""}
+            setValue={(value) => onChange({ ...config, column: value })}
+            variant="tertiary/small"
+            dropdownIcon={true}
+            items={availableColumns.map((c) => ({ value: c.name, label: c.name }))}
+            text={(value) => value || "Select column"}
+            placeholder="Select column"
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  {item.label}
+                </SelectItem>
+              ))
+            }
+          </Select>
+        </div>
+        <div className="flex flex-col gap-1">
+          <Paragraph variant="extra-small" className="text-text-bright">
+            Sort order
+          </Paragraph>
+          <Select
+            value={config.sortDirection ?? ""}
+            setValue={(value) =>
+              onChange({
+                ...config,
+                sortDirection: value === "" ? undefined : (value as "asc" | "desc"),
+              })
+            }
+            variant="tertiary/small"
+            dropdownIcon={true}
+            items={[...bigNumberSortOptions]}
+            text={(value) =>
+              bigNumberSortOptions.find((o) => o.value === value)?.label ?? "Unsorted"
+            }
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  {item.label}
+                </SelectItem>
+              ))
+            }
+          </Select>
+        </div>
+        <div className="flex flex-col gap-1">
+          <Paragraph variant="extra-small" className="text-text-bright">
+            Aggregation
+          </Paragraph>
+          <Select
+            value={config.aggregation}
+            setValue={(value) =>
+              onChange({ ...config, aggregation: value as BigNumberConfiguration["aggregation"] })
+            }
+            variant="tertiary/small"
+            dropdownIcon={true}
+            items={[...bigNumberAggregationOptions]}
+            text={(value) =>
+              bigNumberAggregationOptions.find((o) => o.value === value)?.label ?? value
+            }
+          >
+            {(items) =>
+              items.map((item) => (
+                <SelectItem key={item.value} value={item.value}>
+                  {item.label}
+                </SelectItem>
+              ))
+            }
+          </Select>
+        </div>
+        <div className="flex items-center justify-between">
+          <Switch
+            label="Abbreviate large values"
+            labelPosition="right"
+            variant="small"
+            checked={config.abbreviate ?? false}
+            onCheckedChange={(checked) => onChange({ ...config, abbreviate: checked })}
+          />
+        </div>
+        <div className="flex flex-col gap-1">
+          <Paragraph variant="extra-small" className="text-text-bright">
+            Prefix
+          </Paragraph>
+          <Input
+            value={config.prefix ?? ""}
+            onChange={(e) => onChange({ ...config, prefix: e.target.value || undefined })}
+            placeholder="e.g. $"
+            variant="small"
+          />
+        </div>
+        <div className="flex flex-col gap-1">
+          <Paragraph variant="extra-small" className="text-text-bright">
+            Suffix
+          </Paragraph>
+          <Input
+            value={config.suffix ?? ""}
+            onChange={(e) => onChange({ ...config, suffix: e.target.value || undefined })}
+            placeholder="e.g. ms"
+            variant="small"
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/components/runs/v3/BatchStatus.tsx b/apps/webapp/app/components/runs/v3/BatchStatus.tsx
index c67b1b4016e..2d6f83cc013 100644
--- a/apps/webapp/app/components/runs/v3/BatchStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/BatchStatus.tsx
@@ -1,17 +1,27 @@
-import { CheckCircleIcon, XCircleIcon } from "@heroicons/react/20/solid";
-import { BatchTaskRunStatus } from "@trigger.dev/database";
+import {
+  CheckCircleIcon,
+  ExclamationTriangleIcon,
+  XCircleIcon,
+} from "@heroicons/react/20/solid";
+import type { BatchTaskRunStatus } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { Spinner } from "~/components/primitives/Spinner";
 import { cn } from "~/utils/cn";
 
-export const allBatchStatuses = ["PENDING", "COMPLETED", "ABORTED"] as const satisfies Readonly<
-  Array<BatchTaskRunStatus>
->;
+export const allBatchStatuses = [
+  "PROCESSING",
+  "PENDING",
+  "COMPLETED",
+  "PARTIAL_FAILED",
+  "ABORTED",
+] as const satisfies Readonly<Array<BatchTaskRunStatus>>;
 
 const descriptions: Record<BatchTaskRunStatus, string> = {
+  PROCESSING: "The batch is being processed and runs are being created.",
   PENDING: "The batch has child runs that have not yet completed.",
   COMPLETED: "All the batch child runs have finished.",
-  ABORTED: "The batch was aborted because some child tasks could not be triggered.",
+  PARTIAL_FAILED: "Some runs failed to be created. Successfully created runs are still executing.",
+  ABORTED: "The batch was aborted because child tasks could not be triggered.",
 };
 
 export function descriptionForBatchStatus(status: BatchTaskRunStatus): string {
@@ -47,10 +57,14 @@ export function BatchStatusIcon({
   className: string;
 }) {
   switch (status) {
+    case "PROCESSING":
+      return <Spinner className={cn(batchStatusColor(status), className)} />;
     case "PENDING":
       return <Spinner className={cn(batchStatusColor(status), className)} />;
     case "COMPLETED":
       return <CheckCircleIcon className={cn(batchStatusColor(status), className)} />;
+    case "PARTIAL_FAILED":
+      return <ExclamationTriangleIcon className={cn(batchStatusColor(status), className)} />;
     case "ABORTED":
       return <XCircleIcon className={cn(batchStatusColor(status), className)} />;
     default: {
@@ -61,10 +75,14 @@ export function BatchStatusIcon({
 
 export function batchStatusColor(status: BatchTaskRunStatus): string {
   switch (status) {
+    case "PROCESSING":
+      return "text-blue-500";
     case "PENDING":
       return "text-pending";
     case "COMPLETED":
       return "text-success";
+    case "PARTIAL_FAILED":
+      return "text-warning";
     case "ABORTED":
       return "text-error";
     default: {
@@ -75,10 +93,14 @@ export function batchStatusColor(status: BatchTaskRunStatus): string {
 
 export function batchStatusTitle(status: BatchTaskRunStatus): string {
   switch (status) {
+    case "PROCESSING":
+      return "Processing";
     case "PENDING":
       return "In progress";
     case "COMPLETED":
       return "Completed";
+    case "PARTIAL_FAILED":
+      return "Partial failure";
     case "ABORTED":
       return "Aborted";
     default: {
diff --git a/apps/webapp/app/components/runs/v3/BulkAction.tsx b/apps/webapp/app/components/runs/v3/BulkAction.tsx
index d9f0a784417..3c25aa4409a 100644
--- a/apps/webapp/app/components/runs/v3/BulkAction.tsx
+++ b/apps/webapp/app/components/runs/v3/BulkAction.tsx
@@ -1,5 +1,5 @@
 import { ArrowPathIcon, CheckCircleIcon, NoSymbolIcon } from "@heroicons/react/20/solid";
-import { BulkActionStatus, type BulkActionType } from "@trigger.dev/database";
+import type { BulkActionStatus, BulkActionType } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { Spinner } from "~/components/primitives/Spinner";
 import { cn } from "~/utils/cn";
diff --git a/apps/webapp/app/components/runs/v3/DeploymentError.tsx b/apps/webapp/app/components/runs/v3/DeploymentError.tsx
index 517f91789b6..11ee62dfa3a 100644
--- a/apps/webapp/app/components/runs/v3/DeploymentError.tsx
+++ b/apps/webapp/app/components/runs/v3/DeploymentError.tsx
@@ -9,7 +9,7 @@ type DeploymentErrorProps = {
 
 export function DeploymentError({ errorData }: DeploymentErrorProps) {
   return (
-    <div className="flex flex-col gap-2 rounded-sm border border-rose-500/50 p-3">
+    <div className="mx-3 mb-3 flex flex-col gap-2 rounded-sm border border-rose-500/50 p-3">
       <DeploymentErrorHeader title={errorData.name ?? "Error"} titleClassName="text-rose-500" />
       {errorData.message && <Callout variant="error">{errorData.message}</Callout>}
       {errorData.stack && (
@@ -18,6 +18,7 @@ export function DeploymentError({ errorData }: DeploymentErrorProps) {
           showLineNumbers={false}
           code={errorData.stack}
           maxLines={20}
+          showTextWrapping
         />
       )}
       {errorData.stderr && (
@@ -28,6 +29,7 @@ export function DeploymentError({ errorData }: DeploymentErrorProps) {
             showLineNumbers={false}
             code={errorData.stderr}
             maxLines={20}
+            showTextWrapping
           />
         </>
       )}
diff --git a/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx b/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
index dbfaf12d0d9..a2a6d199ab7 100644
--- a/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
@@ -2,9 +2,10 @@ import {
   CheckCircleIcon,
   ExclamationTriangleIcon,
   NoSymbolIcon,
+  RectangleStackIcon,
   XCircleIcon,
 } from "@heroicons/react/20/solid";
-import { WorkerDeploymentStatus } from "@trigger.dev/database";
+import type { WorkerDeploymentStatus } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { Spinner } from "~/components/primitives/Spinner";
 import { cn } from "~/utils/cn";
@@ -49,6 +50,10 @@ export function DeploymentStatusIcon({
 }) {
   switch (status) {
     case "PENDING":
+      return (
+        <RectangleStackIcon className={cn(deploymentStatusClassNameColor(status), className)} />
+      );
+    case "INSTALLING":
     case "BUILDING":
     case "DEPLOYING":
       return <Spinner className={cn(deploymentStatusClassNameColor(status), className)} />;
@@ -73,6 +78,8 @@ export function DeploymentStatusIcon({
 export function deploymentStatusClassNameColor(status: WorkerDeploymentStatus): string {
   switch (status) {
     case "PENDING":
+      return "text-charcoal-500";
+    case "INSTALLING":
     case "BUILDING":
     case "DEPLOYING":
       return "text-pending";
@@ -92,7 +99,9 @@ export function deploymentStatusClassNameColor(status: WorkerDeploymentStatus):
 export function deploymentStatusTitle(status: WorkerDeploymentStatus, isBuilt: boolean): string {
   switch (status) {
     case "PENDING":
-      return "Pending…";
+      return "Queued…";
+    case "INSTALLING":
+      return "Installing…";
     case "BUILDING":
       return "Building…";
     case "DEPLOYING":
@@ -121,17 +130,22 @@ export function deploymentStatusTitle(status: WorkerDeploymentStatus, isBuilt: b
 
 // PENDING and CANCELED are not used so are ommited from the UI
 export const deploymentStatuses: WorkerDeploymentStatus[] = [
+  "PENDING",
+  "INSTALLING",
   "BUILDING",
   "DEPLOYING",
   "DEPLOYED",
   "FAILED",
   "TIMED_OUT",
+  "CANCELED",
 ];
 
 export function deploymentStatusDescription(status: WorkerDeploymentStatus): string {
   switch (status) {
     case "PENDING":
       return "The deployment is queued and waiting to be processed.";
+    case "INSTALLING":
+      return "The project dependencies are being installed.";
     case "BUILDING":
       return "The code is being built and prepared for deployment.";
     case "DEPLOYING":
diff --git a/apps/webapp/app/components/runs/v3/PacketDisplay.tsx b/apps/webapp/app/components/runs/v3/PacketDisplay.tsx
index 5d5878a93db..82deae8a1be 100644
--- a/apps/webapp/app/components/runs/v3/PacketDisplay.tsx
+++ b/apps/webapp/app/components/runs/v3/PacketDisplay.tsx
@@ -1,27 +1,48 @@
 import { CloudArrowDownIcon } from "@heroicons/react/20/solid";
 import { CodeBlock } from "~/components/code/CodeBlock";
+import { InlineCode } from "~/components/code/InlineCode";
 import { LinkButton } from "~/components/primitives/Buttons";
+import { Header3 } from "~/components/primitives/Headers";
 import { Paragraph } from "~/components/primitives/Paragraph";
+import { TextLink } from "~/components/primitives/TextLink";
+import { docsPath } from "~/utils/pathBuilder";
 
 export function PacketDisplay({
   data,
   dataType,
   title,
+  searchTerm,
+  wrap,
 }: {
   data: string;
   dataType: string;
   title: string;
+  searchTerm?: string;
+  wrap?: boolean;
 }) {
   switch (dataType) {
     case "application/store": {
       return (
-        <div className="flex flex-col">
-          <Paragraph variant="base/bright" className="w-full py-2.5 text-sm">
-            {title}
+        <div className="mt-2 flex flex-col">
+          <Header3>{title}</Header3>
+          <Paragraph variant="small" className="mb-2">
+            This {title.toLowerCase()} exceeded the size limit and was automatically offloaded to
+            object storage. You can retrieve it using{" "}
+            <InlineCode variant="extra-small">runs.retrieve</InlineCode> or download it directly
+            below. <TextLink to={docsPath("limits#task-payloads-and-outputs")}>Learn more</TextLink>
+            .
           </Paragraph>
-          <LinkButton LeadingIcon={CloudArrowDownIcon} to={data} variant="tertiary/medium" download>
-            Download
-          </LinkButton>
+          <div>
+            <LinkButton
+              LeadingIcon={CloudArrowDownIcon}
+              to={data}
+              variant="secondary/small"
+              download
+              className="inline-flex text-text-bright"
+            >
+              Download {title.toLowerCase()}
+            </LinkButton>
+          </div>
         </div>
       );
     }
@@ -33,6 +54,9 @@ export function PacketDisplay({
           code={data}
           maxLines={20}
           showLineNumbers={false}
+          showTextWrapping
+          searchTerm={searchTerm}
+          wrap={wrap}
         />
       );
     }
@@ -45,6 +69,8 @@ export function PacketDisplay({
           maxLines={20}
           showLineNumbers={false}
           showTextWrapping
+          searchTerm={searchTerm}
+          wrap={wrap}
         />
       );
     }
diff --git a/apps/webapp/app/components/runs/v3/QueueName.tsx b/apps/webapp/app/components/runs/v3/QueueName.tsx
new file mode 100644
index 00000000000..c5d8feeb46b
--- /dev/null
+++ b/apps/webapp/app/components/runs/v3/QueueName.tsx
@@ -0,0 +1,41 @@
+import { TaskIconSmall } from "~/assets/icons/TaskIcon";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
+import { cn } from "~/utils/cn";
+import { RectangleStackIcon } from "@heroicons/react/20/solid";
+
+export function QueueName({
+  name,
+  type,
+  paused,
+  className,
+}: {
+  name: string;
+  type: "task" | "custom";
+  paused?: boolean;
+  className?: string;
+}) {
+  return (
+    <span className={cn("flex items-center gap-1", className)}>
+      {type === "task" ? (
+        <SimpleTooltip
+          button={
+            <TaskIconSmall
+              className={cn("size-[1.125rem] text-blue-500", paused && "opacity-50")}
+            />
+          }
+          content={`This queue was automatically created from your "${name}" task`}
+        />
+      ) : (
+        <SimpleTooltip
+          button={
+            <RectangleStackIcon
+              className={cn("size-[1.125rem] text-purple-500", paused && "opacity-50")}
+            />
+          }
+          content={`This is a custom queue you added in your code.`}
+        />
+      )}
+      <span className={paused ? "opacity-50" : undefined}>{name}</span>
+    </span>
+  );
+}
diff --git a/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx b/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
index 83490aee11c..e42a2122abe 100644
--- a/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
+++ b/apps/webapp/app/components/runs/v3/ReplayRunDialog.tsx
@@ -201,6 +201,8 @@ function ReplayForm({
       tags,
       version,
       machine,
+      region,
+      prioritySeconds,
     },
   ] = useForm({
     id: "replay-task",
@@ -356,6 +358,35 @@ function ReplayForm({
                 )}
                 <FormError id={version.errorId}>{version.error}</FormError>
               </InputGroup>
+              {replayData.regions.length > 1 && (
+                <InputGroup>
+                  <Label htmlFor={region.id} variant="small">
+                    Region
+                  </Label>
+                  <Select
+                    {...conform.select(region)}
+                    variant="tertiary/small"
+                    placeholder={replayData.disableVersionSelection ? "–" : undefined}
+                    dropdownIcon
+                    items={replayData.regions}
+                    defaultValue={replayData.region ?? undefined}
+                    disabled={replayData.disableVersionSelection}
+                  >
+                    {replayData.regions.map((r) => (
+                      <SelectItem key={r.name} value={r.name}>
+                        {r.description ? `${r.name} — ${r.description}` : r.name}
+                        {r.isDefault ? " (default)" : ""}
+                      </SelectItem>
+                    ))}
+                  </Select>
+                  {replayData.disableVersionSelection ? (
+                    <Hint>Region is not available in the development environment.</Hint>
+                  ) : (
+                    <Hint>Overrides the region for this run.</Hint>
+                  )}
+                  <FormError id={region.errorId}>{region.error}</FormError>
+                </InputGroup>
+              )}
               <InputGroup>
                 <Label htmlFor={queue.id} variant="small">
                   Queue
@@ -499,6 +530,12 @@ function ReplayForm({
                 <Hint>Delays run by a specific duration.</Hint>
                 <FormError id={delaySeconds.errorId}>{delaySeconds.error}</FormError>
               </InputGroup>
+              <InputGroup>
+                <Label variant="small">Priority</Label>
+                <DurationPicker name={prioritySeconds.name} id={prioritySeconds.id} />
+                <Hint>Sets the priority of the run. Higher values mean higher priority.</Hint>
+                <FormError id={prioritySeconds.errorId}>{prioritySeconds.error}</FormError>
+              </InputGroup>
               <InputGroup>
                 <Label variant="small">TTL</Label>
                 <DurationPicker
diff --git a/apps/webapp/app/components/runs/v3/RollbackDeploymentDialog.tsx b/apps/webapp/app/components/runs/v3/RollbackDeploymentDialog.tsx
deleted file mode 100644
index 50df4780980..00000000000
--- a/apps/webapp/app/components/runs/v3/RollbackDeploymentDialog.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { ArrowPathIcon } from "@heroicons/react/20/solid";
-import { DialogClose } from "@radix-ui/react-dialog";
-import { Form, useNavigation } from "@remix-run/react";
-import { Button } from "~/components/primitives/Buttons";
-import {
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-} from "~/components/primitives/Dialog";
-import { SpinnerWhite } from "~/components/primitives/Spinner";
-
-type RollbackDeploymentDialogProps = {
-  projectId: string;
-  deploymentShortCode: string;
-  redirectPath: string;
-};
-
-export function RollbackDeploymentDialog({
-  projectId,
-  deploymentShortCode,
-  redirectPath,
-}: RollbackDeploymentDialogProps) {
-  const navigation = useNavigation();
-
-  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/rollback`;
-  const isLoading = navigation.formAction === formAction;
-
-  return (
-    <DialogContent key="rollback">
-      <DialogHeader>Rollback to this deployment?</DialogHeader>
-      <DialogDescription>
-        This deployment will become the default for all future runs. Tasks triggered but not
-        included in this deploy will remain queued until you roll back to or create a new deployment
-        with these tasks included.
-      </DialogDescription>
-      <DialogFooter>
-        <DialogClose asChild>
-          <Button variant="tertiary/medium">Cancel</Button>
-        </DialogClose>
-        <Form
-          action={`/resources/${projectId}/deployments/${deploymentShortCode}/rollback`}
-          method="post"
-        >
-          <Button
-            type="submit"
-            name="redirectUrl"
-            value={redirectPath}
-            variant="primary/medium"
-            LeadingIcon={isLoading ? SpinnerWhite : ArrowPathIcon}
-            disabled={isLoading}
-            shortcut={{ modifiers: ["mod"], key: "enter" }}
-          >
-            {isLoading ? "Rolling back..." : "Rollback deployment"}
-          </Button>
-        </Form>
-      </DialogFooter>
-    </DialogContent>
-  );
-}
-
-export function PromoteDeploymentDialog({
-  projectId,
-  deploymentShortCode,
-  redirectPath,
-}: RollbackDeploymentDialogProps) {
-  const navigation = useNavigation();
-
-  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/promote`;
-  const isLoading = navigation.formAction === formAction;
-
-  return (
-    <DialogContent key="promote">
-      <DialogHeader>Promote this deployment?</DialogHeader>
-      <DialogDescription>
-        This deployment will become the default for all future runs not explicitly tied to a
-        specific deployment.
-      </DialogDescription>
-      <DialogFooter>
-        <DialogClose asChild>
-          <Button variant="tertiary/medium">Cancel</Button>
-        </DialogClose>
-        <Form
-          action={`/resources/${projectId}/deployments/${deploymentShortCode}/promote`}
-          method="post"
-        >
-          <Button
-            type="submit"
-            name="redirectUrl"
-            value={redirectPath}
-            variant="primary/medium"
-            LeadingIcon={isLoading ? SpinnerWhite : ArrowPathIcon}
-            disabled={isLoading}
-            shortcut={{ modifiers: ["mod"], key: "enter" }}
-          >
-            {isLoading ? "Promoting..." : "Promote deployment"}
-          </Button>
-        </Form>
-      </DialogFooter>
-    </DialogContent>
-  );
-}
diff --git a/apps/webapp/app/components/runs/v3/RunFilters.tsx b/apps/webapp/app/components/runs/v3/RunFilters.tsx
index 9eae1e1eb51..cff56573ad7 100644
--- a/apps/webapp/app/components/runs/v3/RunFilters.tsx
+++ b/apps/webapp/app/components/runs/v3/RunFilters.tsx
@@ -31,6 +31,7 @@ import { DateTime } from "~/components/primitives/DateTime";
 import { FormError } from "~/components/primitives/FormError";
 import { Input } from "~/components/primitives/Input";
 import { Label } from "~/components/primitives/Label";
+import { MiddleTruncate } from "~/components/primitives/MiddleTruncate";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import {
   ComboBox,
@@ -58,10 +59,10 @@ import { useProject } from "~/hooks/useProject";
 import { useSearchParams } from "~/hooks/useSearchParam";
 import { type loader as queuesLoader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues";
 import { type loader as versionsLoader } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.versions";
-import { type loader as tagsLoader } from "~/routes/resources.projects.$projectParam.runs.tags";
+import { type loader as tagsLoader } from "~/routes/resources.environments.$envId.runs.tags";
 import { Button } from "../../primitives/Buttons";
 import { BulkActionTypeCombo } from "./BulkAction";
-import { appliedSummary, FilterMenuProvider, TimeFilter } from "./SharedFilters";
+import { appliedSummary, FilterMenuProvider, TimeFilter, timeFilters } from "./SharedFilters";
 import { AIFilterInput } from "./AIFilterInput";
 import {
   allTaskRunStatuses,
@@ -280,7 +281,7 @@ export function getRunFiltersFromSearchParams(
     bulkId: searchParams.get("bulkId") ?? undefined,
     tags:
       searchParams.getAll("tags").filter((v) => v.length > 0).length > 0
-        ? searchParams.getAll("tags").map((t) => decodeURIComponent(t))
+        ? searchParams.getAll("tags")
         : undefined,
     from: searchParams.get("from") ?? undefined,
     to: searchParams.get("to") ?? undefined,
@@ -324,6 +325,10 @@ type RunFiltersProps = {
   }[];
   rootOnlyDefault: boolean;
   hasFilters: boolean;
+  /** Hide the AI search input (useful when replacing with a custom search component) */
+  hideSearch?: boolean;
+  /** Custom default period for the time filter (e.g., "1h", "7d") */
+  defaultPeriod?: string;
 };
 
 export function RunsFilters(props: RunFiltersProps) {
@@ -344,9 +349,9 @@ export function RunsFilters(props: RunFiltersProps) {
   return (
     <div className="flex flex-row flex-wrap items-center gap-1">
       <FilterMenu {...props} />
-      <AIFilterInput />
+      {!props.hideSearch && <AIFilterInput />}
       <RootOnlyToggle defaultValue={props.rootOnlyDefault} />
-      <TimeFilter />
+      <TimeFilter defaultPeriod={props.defaultPeriod} />
       <AppliedFilters {...props} />
       {hasFilters && (
         <Form className="h-6">
@@ -630,7 +635,7 @@ function TasksDropdown({
     <SelectProvider value={values("tasks")} setValue={handleChange} virtualFocus={true}>
       {trigger}
       <SelectPopover
-        className="min-w-0 max-w-[min(240px,var(--popover-available-width))]"
+        className="min-w-0 max-w-[min(360px,var(--popover-available-width))]"
         hideOnEscape={() => {
           if (onClose) {
             onClose();
@@ -650,7 +655,7 @@ function TasksDropdown({
                 <TaskTriggerSourceIcon source={item.triggerSource} className="size-4 flex-none" />
               }
             >
-              {item.slug}
+              <MiddleTruncate text={item.slug}/>
             </SelectItem>
           ))}
         </SelectList>
@@ -810,8 +815,8 @@ function TagsDropdown({
   searchValue: string;
   onClose?: () => void;
 }) {
-  const project = useProject();
-  const { values, replace } = useSearchParams();
+  const environment = useEnvironment();
+  const { values, value, replace } = useSearchParams();
 
   const handleChange = (values: string[]) => {
     clearSearchValue();
@@ -822,6 +827,12 @@ function TagsDropdown({
     });
   };
 
+  const { period, from, to } = timeFilters({
+    period: value("period"),
+    from: value("from"),
+    to: value("to"),
+  });
+
   const tagValues = values("tags").filter((v) => v !== "");
   const selected = tagValues.length > 0 ? tagValues : undefined;
 
@@ -830,25 +841,34 @@ function TagsDropdown({
   useEffect(() => {
     const searchParams = new URLSearchParams();
     if (searchValue) {
-      searchParams.set("name", encodeURIComponent(searchValue));
+      searchParams.set("name", searchValue);
     }
-    fetcher.load(`/resources/projects/${project.slug}/runs/tags?${searchParams}`);
-  }, [searchValue]);
+    if (period) {
+      searchParams.set("period", period);
+    }
+    if (from) {
+      searchParams.set("from", from.getTime().toString());
+    }
+    if (to) {
+      searchParams.set("to", to.getTime().toString());
+    }
+    fetcher.load(`/resources/environments/${environment.id}/runs/tags?${searchParams}`);
+  }, [environment.id, searchValue, period, from?.getTime(), to?.getTime()]);
 
   const filtered = useMemo(() => {
     let items: string[] = [];
     if (searchValue === "") {
-      items = selected ?? [];
+      items = [...(selected ?? [])];
     }
 
     if (fetcher.data === undefined) {
       return matchSorter(items, searchValue);
     }
 
-    items.push(...fetcher.data.tags.map((t) => t.name));
+    items.push(...fetcher.data.tags);
 
     return matchSorter(Array.from(new Set(items)), searchValue);
-  }, [searchValue, fetcher.data]);
+  }, [searchValue, fetcher.data, selected]);
 
   return (
     <SelectProvider value={selected ?? []} setValue={handleChange} virtualFocus={true}>
@@ -958,7 +978,7 @@ function QueuesDropdown({
       const searchParams = new URLSearchParams();
       searchParams.set("per_page", "25");
       if (searchValue) {
-        searchParams.set("query", encodeURIComponent(s));
+        searchParams.set("query", s);
       }
       fetcher.load(
         `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
@@ -1220,7 +1240,7 @@ function VersionsDropdown({
     (s) => {
       const searchParams = new URLSearchParams();
       if (searchValue) {
-        searchParams.set("query", encodeURIComponent(s));
+        searchParams.set("query", s);
       }
       fetcher.load(
         `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
@@ -1286,8 +1306,10 @@ function VersionsDropdown({
           {filtered.length > 0
             ? filtered.map((version) => (
                 <SelectItem key={version.version} value={version.version}>
-                  {version.version}{" "}
-                  {version.isCurrent ? <Badge variant="extra-small">current</Badge> : null}
+                  <span className="flex items-center gap-2">
+                    <span className="grow truncate">{version.version}</span>
+                    {version.isCurrent ? <Badge variant="extra-small">Current</Badge> : null}
+                  </span>
                 </SelectItem>
               ))
             : null}
diff --git a/apps/webapp/app/components/runs/v3/RunIcon.tsx b/apps/webapp/app/components/runs/v3/RunIcon.tsx
index fd277997af9..846d7cae0a4 100644
--- a/apps/webapp/app/components/runs/v3/RunIcon.tsx
+++ b/apps/webapp/app/components/runs/v3/RunIcon.tsx
@@ -4,6 +4,7 @@ import {
   InformationCircleIcon,
   RectangleStackIcon,
   Squares2X2Icon,
+  TableCellsIcon,
   TagIcon,
 } from "@heroicons/react/20/solid";
 import { AttemptIcon } from "~/assets/icons/AttemptIcon";
@@ -20,6 +21,7 @@ import { TriggerIcon } from "~/assets/icons/TriggerIcon";
 import { PythonLogoIcon } from "~/assets/icons/PythonLogoIcon";
 import { TraceIcon } from "~/assets/icons/TraceIcon";
 import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
+import { StreamsIcon } from "~/assets/icons/StreamsIcon";
 
 type TaskIconProps = {
   name: string | undefined;
@@ -46,8 +48,6 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
     ) {
       return <TablerIcon name={spanNameIcon.iconName} className={className} />;
     }
-
-    <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
   }
 
   if (!name) return <Squares2X2Icon className={cn(className, "text-text-dimmed")} />;
@@ -80,6 +80,8 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
       return <WaitpointTokenIcon className={cn(className, "text-sky-500")} />;
     case "function":
       return <FunctionIcon className={cn(className, "text-text-dimmed")} />;
+    case "query":
+      return <TableCellsIcon className={cn(className, "text-query")} />;
     //log levels
     case "debug":
     case "log":
@@ -97,6 +99,7 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
       return <RunFunctionIcon className={cn(className, "text-text-dimmed")} />;
     case "task-hook-init":
     case "task-hook-onStart":
+    case "task-hook-onStartAttempt":
     case "task-hook-onSuccess":
     case "task-hook-onWait":
     case "task-hook-onResume":
@@ -107,6 +110,8 @@ export function RunIcon({ name, className, spanName }: TaskIconProps) {
     case "task-hook-onFailure":
     case "task-hook-catchError":
       return <FunctionIcon className={cn(className, "text-error")} />;
+    case "streams":
+      return <StreamsIcon className={cn(className, "text-text-dimmed")} />;
   }
 
   return <InformationCircleIcon className={cn(className, "text-text-dimmed")} />;
diff --git a/apps/webapp/app/components/runs/v3/ScheduleFilters.tsx b/apps/webapp/app/components/runs/v3/ScheduleFilters.tsx
index 4dd0e7f2ff0..3a30e0cb37e 100644
--- a/apps/webapp/app/components/runs/v3/ScheduleFilters.tsx
+++ b/apps/webapp/app/components/runs/v3/ScheduleFilters.tsx
@@ -1,6 +1,5 @@
 import { MagnifyingGlassIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import { useNavigate } from "@remix-run/react";
-import { type RuntimeEnvironment } from "@trigger.dev/database";
 import { useCallback } from "react";
 import { z } from "zod";
 import { Input } from "~/components/primitives/Input";
diff --git a/apps/webapp/app/components/runs/v3/SharedFilters.tsx b/apps/webapp/app/components/runs/v3/SharedFilters.tsx
index 14edfa3c7d6..5538c628178 100644
--- a/apps/webapp/app/components/runs/v3/SharedFilters.tsx
+++ b/apps/webapp/app/components/runs/v3/SharedFilters.tsx
@@ -1,21 +1,34 @@
 import * as Ariakit from "@ariakit/react";
 import type { RuntimeEnvironment } from "@trigger.dev/database";
+import {
+  endOfDay,
+  endOfMonth,
+  endOfWeek,
+  startOfDay,
+  startOfMonth,
+  startOfWeek,
+  subDays,
+  subWeeks,
+} from "date-fns";
 import parse from "parse-duration";
-import type { ReactNode } from "react";
-import { startTransition, useCallback, useState } from "react";
+import { startTransition, useCallback, useEffect, useState, type ReactNode } from "react";
+import simplur from "simplur";
 import { AppliedFilter } from "~/components/primitives/AppliedFilter";
-import { DateField } from "~/components/primitives/DateField";
+import { Callout } from "~/components/primitives/Callout";
 import { DateTime } from "~/components/primitives/DateTime";
+import { DateTimePicker } from "~/components/primitives/DateTimePicker";
 import { Label } from "~/components/primitives/Label";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { RadioButtonCircle } from "~/components/primitives/RadioButton";
 import { ComboboxProvider, SelectPopover, SelectProvider } from "~/components/primitives/Select";
+import { useOptionalOrganization } from "~/hooks/useOrganizations";
 import { useSearchParams } from "~/hooks/useSearchParam";
-import { Button } from "../../primitives/Buttons";
+import { type ShortcutDefinition } from "~/hooks/useShortcutKeys";
+import { cn } from "~/utils/cn";
+import { organizationBillingPath } from "~/utils/pathBuilder";
+import { Button, LinkButton } from "../../primitives/Buttons";
 import { filterIcon } from "./RunFilters";
 
-export type DisplayableEnvironment = Pick<RuntimeEnvironment, "type" | "id"> & {
-  userName?: string;
-};
-
 export function FilterMenuProvider({
   children,
   onClose,
@@ -77,6 +90,10 @@ const timePeriods = [
     label: "3 days",
     value: "3d",
   },
+  {
+    label: "5 days",
+    value: "5d",
+  },
   {
     label: "7 days",
     value: "7d",
@@ -89,14 +106,41 @@ const timePeriods = [
     label: "30 days",
     value: "30d",
   },
-  {
-    label: "1 year",
-    value: "365d",
-  },
 ];
 
-const defaultPeriod = "7d";
-const defaultPeriodMs = parse(defaultPeriod);
+const timeUnits = [
+  { label: "minutes", value: "m", singular: "minute", shortLabel: "mins" },
+  { label: "hours", value: "h", singular: "hour", shortLabel: "hours" },
+  { label: "days", value: "d", singular: "day", shortLabel: "days" },
+];
+
+// Parse a period string (e.g., "90m", "2h", "7d") into value and unit
+function parsePeriodString(period: string): { value: number; unit: string } | null {
+  const match = period.match(/^(\d+)([mhd])$/);
+  if (match) {
+    return { value: parseInt(match[1], 10), unit: match[2] };
+  }
+  return null;
+}
+
+const MS_PER_DAY = 1000 * 60 * 60 * 24;
+
+// Convert a period string to days using parse-duration
+function periodToDays(period: string): number {
+  const ms = parse(period);
+  if (!ms) return 0;
+  return ms / MS_PER_DAY;
+}
+
+// Calculate the number of days a date range spans from now
+function dateRangeToDays(from?: Date): number {
+  if (!from) return 0;
+  const now = new Date();
+  return Math.ceil((now.getTime() - from.getTime()) / MS_PER_DAY);
+}
+
+const DEFAULT_PERIOD = "7d";
+const defaultPeriodMs = parse(DEFAULT_PERIOD);
 if (!defaultPeriodMs) {
   throw new Error("Invalid default period");
 }
@@ -107,10 +151,14 @@ export const timeFilters = ({
   period,
   from,
   to,
+  defaultPeriod = DEFAULT_PERIOD,
+  labelName = "Created",
 }: {
   period?: string;
   from?: string | number;
   to?: string | number;
+  defaultPeriod?: string;
+  labelName?: string;
 }): {
   period?: string;
   from?: Date;
@@ -121,7 +169,11 @@ export const timeFilters = ({
   valueLabel: ReactNode;
 } => {
   if (period) {
-    return { period, isDefault: period === defaultPeriod, ...timeFilterRenderValues({ period }) };
+    return {
+      period,
+      isDefault: period === defaultPeriod,
+      ...timeFilterRenderValues({ period, labelName }),
+    };
   }
 
   if (from && to) {
@@ -131,7 +183,7 @@ export const timeFilters = ({
       from: fromDate,
       to: toDate,
       isDefault: false,
-      ...timeFilterRenderValues({ from: fromDate, to: toDate }),
+      ...timeFilterRenderValues({ from: fromDate, to: toDate, labelName }),
     };
   }
 
@@ -141,7 +193,7 @@ export const timeFilters = ({
     return {
       from: fromDate,
       isDefault: false,
-      ...timeFilterRenderValues({ from: fromDate }),
+      ...timeFilterRenderValues({ from: fromDate, labelName }),
     };
   }
 
@@ -151,40 +203,116 @@ export const timeFilters = ({
     return {
       to: toDate,
       isDefault: false,
-      ...timeFilterRenderValues({ to: toDate }),
+      ...timeFilterRenderValues({ to: toDate, labelName }),
     };
   }
 
   return {
     period: defaultPeriod,
     isDefault: true,
-    ...timeFilterRenderValues({ period: defaultPeriod }),
+    ...timeFilterRenderValues({ period: defaultPeriod, labelName }),
   };
 };
 
+export function timeFilterFromTo(props: {
+  period?: string;
+  from?: string | number;
+  to?: string | number;
+  defaultPeriod: string;
+}): { from: Date; to: Date; isDefault: boolean } {
+  const time = timeFilters(props);
+
+  const periodMs = time.period ? parse(time.period) : undefined;
+
+  if (periodMs) {
+    return {
+      from: new Date(Date.now() - periodMs),
+      to: new Date(),
+      isDefault: time.isDefault,
+    };
+  }
+
+  if (time.from && time.to) {
+    return {
+      from: time.from,
+      to: time.to,
+      isDefault: time.isDefault,
+    };
+  }
+
+  if (time.from) {
+    return {
+      from: time.from,
+      to: new Date(),
+      isDefault: time.isDefault,
+    };
+  }
+
+  const defaultPeriodMs = parse(props.defaultPeriod) ?? 24 * 60 * 60 * 1_000;
+  return {
+    from: new Date(Date.now() - defaultPeriodMs),
+    to: time.to ?? new Date(),
+    isDefault: time.isDefault,
+  };
+}
+
 export function timeFilterRenderValues({
   from,
   to,
   period,
+  defaultPeriod = DEFAULT_PERIOD,
+  labelName = "Created",
 }: {
   from?: Date;
   to?: Date;
   period?: string;
+  defaultPeriod?: string;
+  labelName?: string;
 }) {
   const rangeType: TimeRangeType = from && to ? "range" : from ? "from" : to ? "to" : "period";
 
   let valueLabel: ReactNode;
   switch (rangeType) {
-    case "period":
-      valueLabel = timePeriods.find((t) => t.value === period)?.label ?? period ?? defaultPeriod;
+    case "period": {
+      // First check if it's a preset period
+      const preset = timePeriods.find((t) => t.value === period);
+      if (preset) {
+        valueLabel = preset.label;
+      } else if (period) {
+        // Parse custom period and format nicely (e.g., "90m" -> "90 mins")
+        const parsed = parsePeriodString(period);
+        if (parsed) {
+          const unit = timeUnits.find((u) => u.value === parsed.unit);
+          if (unit) {
+            valueLabel = `${parsed.value} ${parsed.value === 1 ? unit.singular : unit.label}`;
+          } else {
+            valueLabel = period;
+          }
+        } else {
+          valueLabel = period;
+        }
+      } else {
+        valueLabel = defaultPeriod;
+      }
       break;
+    }
     case "range":
-      valueLabel = (
-        <span>
-          <DateTime date={from!} includeTime includeSeconds /> –{" "}
-          <DateTime date={to!} includeTime includeSeconds />
-        </span>
-      );
+      {
+        //If the day is the same, only show the time for the `to` date
+        const isSameDay =
+          from &&
+          to &&
+          from.getDate() === to.getDate() &&
+          from.getMonth() === to.getMonth() &&
+          from.getFullYear() === to.getFullYear();
+
+        valueLabel = (
+          <span>
+            <DateTime date={from!} includeTime includeSeconds /> –{" "}
+            <DateTime date={to!} includeTime includeSeconds includeDate={!isSameDay} />
+          </span>
+        );
+      }
       break;
     case "from":
       valueLabel = <DateTime date={from!} includeTime includeSeconds />;
@@ -196,21 +324,61 @@ export function timeFilterRenderValues({
 
   let label =
     rangeType === "range" || rangeType === "period"
-      ? "Created"
+      ? labelName
       : rangeType === "from"
-      ? "Created after"
-      : "Created before";
+      ? `${labelName} after`
+      : `${labelName} before`;
 
   return { label, valueLabel, rangeType };
 }
 
-export function TimeFilter() {
-  const { value, del } = useSearchParams();
+/** Values passed to onApply callback when a time filter is applied */
+export interface TimeFilterApplyValues {
+  period?: string;
+  from?: string;
+  to?: string;
+}
+
+export interface TimeFilterProps {
+  defaultPeriod?: string;
+  period?: string;
+  from?: string;
+  to?: string;
+  /** Label name used in the filter display, defaults to "Created" */
+  labelName?: string;
+  hideLabel?: boolean;
+  applyShortcut?: ShortcutDefinition | undefined;
+  /** Callback when the user applies a time filter selection, receives the applied values */
+  onValueChange?: (values: TimeFilterApplyValues) => void;
+  /** When set an upgrade message will be shown if you select a period further back than this number of days */
+  maxPeriodDays?: number;
+  /** Optional className override for the value text in the filter pill */
+  valueClassName?: string;
+}
 
-  const { period, from, to, label, valueLabel } = timeFilters({
-    period: value("period"),
-    from: value("from"),
-    to: value("to"),
+export function TimeFilter({
+  defaultPeriod,
+  period,
+  from,
+  to,
+  labelName = "Created",
+  hideLabel = false,
+  applyShortcut,
+  onValueChange,
+  maxPeriodDays,
+  valueClassName,
+}: TimeFilterProps = {}) {
+  const { value } = useSearchParams();
+  const periodValue = period ?? value("period");
+  const fromValue = from ?? value("from");
+  const toValue = to ?? value("to");
+
+  const constrained = timeFilters({
+    period: periodValue,
+    from: fromValue,
+    to: toValue,
+    defaultPeriod,
+    labelName,
   });
 
   return (
@@ -220,69 +388,229 @@ export function TimeFilter() {
           trigger={
             <Ariakit.Select render={<div className="group cursor-pointer focus-custom" />}>
               <AppliedFilter
-                label={label}
+                label={hideLabel ? undefined : constrained.label}
                 icon={filterIcon("period")}
-                value={valueLabel}
+                value={constrained.valueLabel}
                 removable={false}
                 variant="secondary/small"
+                valueClassName={valueClassName}
               />
             </Ariakit.Select>
           }
-          period={period}
-          from={from}
-          to={to}
+          period={constrained.period}
+          from={constrained.from}
+          to={constrained.to}
+          defaultPeriod={defaultPeriod}
+          labelName={labelName}
+          applyShortcut={applyShortcut}
+          onValueChange={onValueChange}
+          maxPeriodDays={maxPeriodDays}
         />
       )}
     </FilterMenuProvider>
   );
 }
 
+// Get initial custom duration state from a period string
+function getInitialCustomDuration(period?: string): { value: string; unit: string } {
+  if (period) {
+    const parsed = parsePeriodString(period);
+    if (parsed) {
+      return { value: parsed.value.toString(), unit: parsed.unit };
+    }
+  }
+  return { value: "", unit: "m" };
+}
+
+type SectionType = "duration" | "dateRange";
+
 export function TimeDropdown({
   trigger,
   period,
   from,
   to,
+  defaultPeriod = DEFAULT_PERIOD,
+  labelName = "Created",
+  applyShortcut,
+  onApply,
+  onValueChange,
+  maxPeriodDays,
 }: {
   trigger: ReactNode;
   period?: string;
   from?: Date;
   to?: Date;
+  defaultPeriod?: string;
+  labelName?: string;
+  applyShortcut?: ShortcutDefinition | undefined;
+  onApply?: (values: TimeFilterApplyValues) => void;
+  /** When provided, the component operates in controlled mode and skips URL navigation */
+  onValueChange?: (values: TimeFilterApplyValues) => void;
+  /** When set an upgrade message will be shown if you select a period further back than this number of days */
+  maxPeriodDays?: number;
 }) {
+  const organization = useOptionalOrganization();
   const [open, setOpen] = useState<boolean | undefined>();
   const { replace } = useSearchParams();
   const [fromValue, setFromValue] = useState(from);
   const [toValue, setToValue] = useState(to);
 
-  const apply = useCallback(() => {
-    replace({
-      period: undefined,
-      cursor: undefined,
-      direction: undefined,
-      from: fromValue?.getTime().toString(),
-      to: toValue?.getTime().toString(),
-    });
-
-    setOpen(false);
-  }, [fromValue, toValue, replace]);
-
-  const handlePeriodClick = useCallback(
-    (period: string) => {
-      replace({
-        period,
-        cursor: undefined,
-        direction: undefined,
+  // Section selection state: "duration" or "dateRange"
+  const initialSection: SectionType = from || to ? "dateRange" : "duration";
+  const [activeSection, setActiveSection] = useState<SectionType>(initialSection);
+  const [validationError, setValidationError] = useState<string | null>(null);
+  const [selectedQuickDate, setSelectedQuickDate] = useState<string | null>(null);
+
+  // Selection state: preset value or "custom"
+  const initialCustom = getInitialCustomDuration(period);
+  const isInitialCustom =
+    period && !timePeriods.some((p) => p.value === period) && initialCustom.value !== "";
+  const [selectedPeriod, setSelectedPeriod] = useState<string>(
+    isInitialCustom ? "custom" : period ?? defaultPeriod
+  );
+
+  // Custom duration state
+  const [customValue, setCustomValue] = useState(initialCustom.value);
+  const [customUnit, setCustomUnit] = useState(initialCustom.unit);
+
+  // Sync state when props change
+  useEffect(() => {
+    const parsed = getInitialCustomDuration(period);
+    setCustomValue(parsed.value);
+    setCustomUnit(parsed.unit);
+
+    const isCustom = period && !timePeriods.some((p) => p.value === period) && parsed.value !== "";
+    setSelectedPeriod(isCustom ? "custom" : period ?? defaultPeriod);
+    setActiveSection(from || to ? "dateRange" : "duration");
+  }, [period, from, to, defaultPeriod]);
+
+  const isCustomDurationValid = (() => {
+    const value = parseInt(customValue, 10);
+    return !isNaN(value) && value > 0;
+  })();
+
+  // Calculate if the current selection exceeds maxPeriodDays
+  const exceedsMaxPeriod = (() => {
+    if (!maxPeriodDays) return false;
+
+    if (activeSection === "duration") {
+      const periodToCheck =
+        selectedPeriod === "custom" ? `${customValue}${customUnit}` : selectedPeriod;
+      if (!periodToCheck) return false;
+      return periodToDays(periodToCheck) > maxPeriodDays;
+    } else {
+      // For date range, check if fromValue is further back than maxPeriodDays
+      return dateRangeToDays(fromValue) > maxPeriodDays;
+    }
+  })();
+
+  const applyPeriod = useCallback(
+    (periodToApply: string) => {
+      setValidationError(null);
+
+      if (maxPeriodDays && periodToDays(periodToApply) > maxPeriodDays) {
+        setValidationError(
+          `Your plan allows a maximum of ${maxPeriodDays} days. Upgrade for longer retention.`
+        );
+        return;
+      }
+
+      const values: TimeFilterApplyValues = {
+        period: periodToApply,
         from: undefined,
         to: undefined,
-      });
+      };
+
+      if (onValueChange) {
+        onValueChange(values);
+      } else {
+        replace({
+          period: periodToApply,
+          cursor: undefined,
+          direction: undefined,
+          from: undefined,
+          to: undefined,
+        });
+      }
 
       setFromValue(undefined);
       setToValue(undefined);
-
       setOpen(false);
+      onApply?.(values);
     },
-    [replace]
+    [maxPeriodDays, onValueChange, replace, onApply]
   );
 
+  const applySelection = useCallback(() => {
+    setValidationError(null);
+
+    if (exceedsMaxPeriod) {
+      setValidationError(
+        `Your plan allows a maximum of ${maxPeriodDays} days. Upgrade for longer retention.`
+      );
+      return;
+    }
+
+    if (activeSection === "duration") {
+      // Validate custom duration
+      if (selectedPeriod === "custom" && !isCustomDurationValid) {
+        setValidationError("Please enter a valid custom duration");
+        return;
+      }
+
+      const periodToApply =
+        selectedPeriod === "custom" ? `${customValue}${customUnit}` : selectedPeriod;
+      applyPeriod(periodToApply);
+    } else {
+      // Validate date range
+      if (!fromValue && !toValue) {
+        setValidationError("Please specify at least one date");
+        return;
+      }
+
+      if (fromValue && toValue && fromValue > toValue) {
+        setValidationError("From date must be before To date");
+        return;
+      }
+
+      const fromStr = fromValue?.getTime().toString();
+      const toStr = toValue?.getTime().toString();
+
+      const values: TimeFilterApplyValues = { period: undefined, from: fromStr, to: toStr };
+
+      if (onValueChange) {
+        // Controlled mode - just call the handler
+        onValueChange(values);
+      } else {
+        // URL mode - navigate
+        replace({
+          period: undefined,
+          cursor: undefined,
+          direction: undefined,
+          from: fromStr,
+          to: toStr,
+        });
+      }
+
+      setOpen(false);
+      onApply?.(values);
+    }
+  }, [
+    activeSection,
+    selectedPeriod,
+    isCustomDurationValid,
+    customValue,
+    customUnit,
+    fromValue,
+    toValue,
+    replace,
+    onApply,
+    onValueChange,
+    exceedsMaxPeriod,
+    maxPeriodDays,
+    applyPeriod,
+  ]);
+
   return (
     <SelectProvider virtualFocus={true} open={open} setOpen={setOpen}>
       {trigger}
@@ -292,92 +620,306 @@ export function TimeDropdown({
           return true;
         }}
       >
-        <div className="flex flex-col gap-6 p-3">
-          <div className="flex flex-col gap-1">
-            <Label>Runs created in the last</Label>
-            <div className="grid grid-cols-4 gap-2">
-              {timePeriods.map((p) => (
-                <Button
-                  key={p.value}
-                  variant="secondary/small"
-                  className={
-                    p.value === period
-                      ? "border-indigo-500 group-hover/button:border-indigo-500"
-                      : undefined
-                  }
-                  onClick={(e) => {
-                    e.preventDefault();
-                    handlePeriodClick(p.value);
-                  }}
-                  fullWidth
-                  type="button"
+        <div className="flex flex-col gap-4 p-3">
+          {/* Duration section */}
+          <div
+            onClick={() => {
+              setActiveSection("duration");
+              setValidationError(null);
+              setSelectedQuickDate(null);
+            }}
+            className="flex cursor-pointer gap-3 rounded-md pb-3"
+          >
+            <RadioButtonCircle checked={activeSection === "duration"} />
+            <div className="flex flex-1 flex-col gap-1">
+              <Label
+                className={cn(
+                  "mb-2 transition-colors",
+                  activeSection === "duration" && "text-indigo-500"
+                )}
+              >
+                {labelName} in the last
+              </Label>
+              <div className="grid grid-cols-4 gap-2">
+                {/* Custom duration row */}
+                <div
+                  className={cn(
+                    "col-span-4 flex h-[1.8rem] w-full items-center gap-2 rounded border bg-charcoal-750 py-0.5 pl-0 pr-2 transition-colors",
+                    activeSection === "duration" && selectedPeriod === "custom"
+                      ? "border-indigo-500 "
+                      : "border-charcoal-650 hover:border-charcoal-600",
+                    validationError &&
+                      activeSection === "duration" &&
+                      selectedPeriod === "custom" &&
+                      "border-error"
+                  )}
+                  onClick={(e) => e.stopPropagation()}
                 >
-                  {p.label}
-                </Button>
-              ))}
+                  <input
+                    type="number"
+                    min="1"
+                    step="1"
+                    placeholder="Custom"
+                    value={customValue}
+                    autoFocus
+                    onChange={(e) => {
+                      setCustomValue(e.target.value);
+                      setSelectedPeriod("custom");
+                      setActiveSection("duration");
+                      setValidationError(null);
+                    }}
+                    onFocus={() => {
+                      setSelectedPeriod("custom");
+                      setActiveSection("duration");
+                      setValidationError(null);
+                    }}
+                    className="h-full w-full translate-y-px border-none bg-transparent py-0 pl-2 pr-0 text-xs leading-none text-text-bright outline-none placeholder:text-text-dimmed focus:outline-none focus:ring-0 [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
+                  />
+                  <div className="flex items-center gap-2">
+                    {timeUnits.map((unit) => (
+                      <button
+                        key={unit.value}
+                        type="button"
+                        onClick={(e) => {
+                          e.stopPropagation();
+                          setCustomUnit(unit.value);
+                          setSelectedPeriod("custom");
+                          setActiveSection("duration");
+                          setValidationError(null);
+                        }}
+                        className={cn(
+                          "text-xs transition-colors",
+                          customUnit === unit.value
+                            ? "text-indigo-500"
+                            : "text-text-dimmed hover:text-text-bright"
+                        )}
+                      >
+                        {unit.shortLabel}
+                      </button>
+                    ))}
+                  </div>
+                </div>
+                {timePeriods.map((p) => {
+                  const parsed = parsePeriodString(p.value);
+                  return (
+                    <Button
+                      key={p.value}
+                      variant="secondary/small"
+                      className={
+                        activeSection === "duration" && p.value === selectedPeriod
+                          ? "border-indigo-500 group-hover/button:border-indigo-500"
+                          : undefined
+                      }
+                      onClick={(e) => {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        setActiveSection("duration");
+                        setSelectedPeriod(p.value);
+                        if (parsed) {
+                          setCustomValue(parsed.value.toString());
+                          setCustomUnit(parsed.unit);
+                        }
+                        applyPeriod(p.value);
+                      }}
+                      fullWidth
+                      type="button"
+                    >
+                      {p.label}
+                    </Button>
+                  );
+                })}
+              </div>
+              {validationError && activeSection === "duration" && selectedPeriod === "custom" && (
+                <p className="mt-1 text-xs text-error">{validationError}</p>
+              )}
             </div>
           </div>
 
-          <div className="flex flex-col gap-4">
-            <div className="flex flex-col gap-1">
-              <Label>
-                From <span className="text-text-dimmed">(local time)</span>
-              </Label>
-              <DateField
-                label="From time"
-                defaultValue={fromValue}
-                onValueChange={setFromValue}
-                granularity="second"
-                showNowButton
-                showClearButton
-                variant="small"
-              />
-            </div>
-            <div className="flex flex-col gap-1">
-              <Label>
-                To <span className="text-text-dimmed">(local time)</span>
-              </Label>
-              <DateField
-                label="To time"
-                defaultValue={toValue}
-                onValueChange={setToValue}
-                granularity="second"
-                showNowButton
-                showClearButton
-                variant="small"
-              />
-            </div>
-            <div className="flex justify-between gap-1 border-t border-grid-bright pt-3">
-              <Button
-                variant="tertiary/small"
-                onClick={(e) => {
-                  e.preventDefault();
-                  setFromValue(from);
-                  setToValue(to);
-                  setOpen(false);
-                }}
-                type="button"
-              >
-                Cancel
-              </Button>
-              <Button
-                variant="secondary/small"
-                shortcut={{
-                  modifiers: ["mod"],
-                  key: "Enter",
-                  enabledOnInputElements: true,
-                }}
-                disabled={!fromValue && !toValue}
-                onClick={(e) => {
-                  e.preventDefault();
-                  apply();
-                }}
-                type="button"
+          {/* Date range section */}
+          <div
+            onClick={() => {
+              setActiveSection("dateRange");
+              setValidationError(null);
+            }}
+            className="flex cursor-pointer gap-3"
+          >
+            <RadioButtonCircle checked={activeSection === "dateRange"} />
+            <div className="flex flex-1 flex-col">
+              <Label
+                className={cn(
+                  "mb-3 transition-colors",
+                  activeSection === "dateRange" && "text-indigo-500"
+                )}
               >
-                Apply
-              </Button>
+                Or specify exact time range{" "}
+                <span
+                  className={cn(
+                    "transition-colors",
+                    activeSection === "dateRange" ? "text-indigo-500" : "text-text-dimmed"
+                  )}
+                >
+                  (in local time)
+                </span>
+              </Label>
+              <div className="-ml-8 mb-2" onClick={(e) => e.stopPropagation()}>
+                <DateTimePicker
+                  label="From"
+                  value={fromValue}
+                  onChange={(value) => {
+                    setFromValue(value);
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate(null);
+                  }}
+                  showSeconds
+                  showNowButton
+                  showClearButton
+                  showInlineLabel
+                />
+              </div>
+              <div onClick={(e) => e.stopPropagation()} className="-ml-8">
+                <DateTimePicker
+                  label="To"
+                  value={toValue}
+                  onChange={(value) => {
+                    setToValue(value);
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate(null);
+                  }}
+                  showSeconds
+                  showNowButton
+                  showClearButton
+                  showInlineLabel
+                />
+              </div>
+              {/* Quick select date ranges */}
+              <div className="mt-2 grid grid-cols-2 gap-2" onClick={(e) => e.stopPropagation()}>
+                <QuickDateButton
+                  label="Yesterday"
+                  isActive={selectedQuickDate === "yesterday"}
+                  onClick={() => {
+                    const yesterday = subDays(new Date(), 1);
+                    setFromValue(startOfDay(yesterday));
+                    setToValue(endOfDay(yesterday));
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate("yesterday");
+                  }}
+                />
+                <QuickDateButton
+                  label="Today"
+                  isActive={selectedQuickDate === "today"}
+                  onClick={() => {
+                    const today = new Date();
+                    setFromValue(startOfDay(today));
+                    setToValue(endOfDay(today));
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate("today");
+                  }}
+                />
+              </div>
+              <div className="mt-2 grid grid-cols-3 gap-2" onClick={(e) => e.stopPropagation()}>
+                <QuickDateButton
+                  label="This week"
+                  isActive={selectedQuickDate === "thisWeek"}
+                  onClick={() => {
+                    const now = new Date();
+                    setFromValue(startOfWeek(now, { weekStartsOn: 1 }));
+                    setToValue(endOfWeek(now, { weekStartsOn: 1 }));
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate("thisWeek");
+                  }}
+                />
+                <QuickDateButton
+                  label="Last week"
+                  isActive={selectedQuickDate === "lastWeek"}
+                  onClick={() => {
+                    const lastWeek = subWeeks(new Date(), 1);
+                    setFromValue(startOfWeek(lastWeek, { weekStartsOn: 1 }));
+                    setToValue(endOfWeek(lastWeek, { weekStartsOn: 1 }));
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate("lastWeek");
+                  }}
+                />
+                <QuickDateButton
+                  label="This month"
+                  isActive={selectedQuickDate === "thisMonth"}
+                  onClick={() => {
+                    const now = new Date();
+                    setFromValue(startOfMonth(now));
+                    setToValue(endOfMonth(now));
+                    setActiveSection("dateRange");
+                    setValidationError(null);
+                    setSelectedQuickDate("thisMonth");
+                  }}
+                />
+              </div>
+              {validationError && activeSection === "dateRange" && (
+                <Paragraph variant="extra-small" className="mt-2 text-error">
+                  {validationError}
+                </Paragraph>
+              )}
             </div>
           </div>
+
+          {/* Upgrade callout when exceeding maxPeriodDays */}
+          {exceedsMaxPeriod && organization && (
+            <Callout
+              variant="pricing"
+              cta={
+                <LinkButton
+                  variant="primary/small"
+                  to={organizationBillingPath({ slug: organization.slug })}
+                >
+                  Upgrade
+                </LinkButton>
+              }
+              className="items-center"
+            >
+              {simplur`Your plan allows a maximum of ${maxPeriodDays} day[|s].`}
+            </Callout>
+          )}
+
+          {/* Action buttons */}
+          <div className="flex justify-between gap-1 border-t border-grid-bright px-0 pt-3">
+            <Button
+              variant="secondary/small"
+              onClick={(e) => {
+                e.preventDefault();
+                setFromValue(from);
+                setToValue(to);
+                setValidationError(null);
+                setOpen(false);
+              }}
+              type="button"
+            >
+              Cancel
+            </Button>
+            <Button
+              variant="primary/small"
+              shortcut={
+                applyShortcut
+                  ? applyShortcut
+                  : {
+                      modifiers: ["mod"],
+                      key: "Enter",
+                      enabledOnInputElements: true,
+                    }
+              }
+              onClick={(e) => {
+                e.preventDefault();
+                applySelection();
+              }}
+              type="button"
+              disabled={exceedsMaxPeriod}
+            >
+              Apply
+            </Button>
+          </div>
         </div>
       </SelectPopover>
     </SelectProvider>
@@ -399,11 +941,32 @@ export function appliedSummary(values: string[], maxValues = 3) {
 export function dateFromString(value: string | undefined | null): Date | undefined {
   if (!value) return;
 
-  //is it an int?
-  const int = parseInt(value);
-  if (!isNaN(int)) {
-    return new Date(int);
+  // Only treat as timestamp if the string is purely numeric
+  if (/^\d+$/.test(value)) {
+    return new Date(parseInt(value));
   }
 
   return new Date(value);
 }
+
+function QuickDateButton({
+  label,
+  onClick,
+  isActive,
+}: {
+  label: string;
+  onClick: () => void;
+  isActive?: boolean;
+}) {
+  return (
+    <Button
+      type="button"
+      variant="secondary/small"
+      onClick={onClick}
+      fullWidth
+      className={isActive ? "border-indigo-500 group-hover/button:border-indigo-500" : undefined}
+    >
+      {label}
+    </Button>
+  );
+}
diff --git a/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx b/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
index 20eb3901f82..73363e0daa6 100644
--- a/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
@@ -11,7 +11,8 @@ import {
   TrashIcon,
   XCircleIcon,
 } from "@heroicons/react/20/solid";
-import { type TaskRunStatus } from "@trigger.dev/database";
+import type { TaskRunStatus } from "@trigger.dev/database";
+import { runFriendlyStatus, type RunFriendlyStatus } from "@trigger.dev/core/v3";
 import assertNever from "assert-never";
 import { HourglassIcon } from "lucide-react";
 import { TimedOutIcon } from "~/assets/icons/TimedOutIcon";
@@ -236,43 +237,93 @@ export function runStatusClassNameColor(status: TaskRunStatus): string {
   }
 }
 
-export function runStatusTitle(status: TaskRunStatus): string {
-  switch (status) {
-    case "DELAYED":
-      return "Delayed";
-    case "PENDING":
-      return "Queued";
-    case "PENDING_VERSION":
-    case "WAITING_FOR_DEPLOY":
-      return "Pending version";
-    case "DEQUEUED":
-      return "Dequeued";
-    case "EXECUTING":
-      return "Executing";
-    case "WAITING_TO_RESUME":
-      return "Waiting";
-    case "RETRYING_AFTER_FAILURE":
-      return "Reattempting";
-    case "PAUSED":
-      return "Paused";
-    case "CANCELED":
-      return "Canceled";
-    case "INTERRUPTED":
-      return "Interrupted";
-    case "COMPLETED_SUCCESSFULLY":
-      return "Completed";
-    case "COMPLETED_WITH_ERRORS":
-      return "Failed";
-    case "SYSTEM_FAILURE":
-      return "System failure";
-    case "CRASHED":
-      return "Crashed";
-    case "EXPIRED":
-      return "Expired";
-    case "TIMED_OUT":
-      return "Timed out";
-    default: {
-      assertNever(status);
-    }
+export function runStatusTitle(status: TaskRunStatus): RunFriendlyStatus {
+  return runStatusTitleFromStatus[status];
+}
+
+export function runStatusFromFriendlyTitle(friendly: RunFriendlyStatus): TaskRunStatus {
+  const result = titlesStatusesArray.find(([_, f]) => f === friendly);
+  if (!result) {
+    throw new Error(`Unknown friendly status: ${friendly}`);
+  }
+  return result[0] as TaskRunStatus;
+}
+
+// runFriendlyStatus and RunFriendlyStatus are imported from @trigger.dev/core/v3
+// and re-exported here for backward compatibility.
+export { runFriendlyStatus, type RunFriendlyStatus } from "@trigger.dev/core/v3";
+
+/**
+ * Check if a value is a valid TaskRunStatus
+ */
+export function isTaskRunStatus(value: unknown): value is TaskRunStatus {
+  return typeof value === "string" && allTaskRunStatuses.includes(value as TaskRunStatus);
+}
+
+/**
+ * Check if a value is a valid RunFriendlyStatus
+ */
+export function isRunFriendlyStatus(value: unknown): value is RunFriendlyStatus {
+  return typeof value === "string" && runFriendlyStatus.includes(value as RunFriendlyStatus);
+}
+
+export const runStatusTitleFromStatus: Record<TaskRunStatus, RunFriendlyStatus> = {
+  DELAYED: "Delayed",
+  PENDING: "Queued",
+  PENDING_VERSION: "Pending version",
+  WAITING_FOR_DEPLOY: "Pending version",
+  DEQUEUED: "Dequeued",
+  EXECUTING: "Executing",
+  WAITING_TO_RESUME: "Waiting",
+  RETRYING_AFTER_FAILURE: "Reattempting",
+  PAUSED: "Paused",
+  CANCELED: "Canceled",
+  INTERRUPTED: "Interrupted",
+  COMPLETED_SUCCESSFULLY: "Completed",
+  COMPLETED_WITH_ERRORS: "Failed",
+  SYSTEM_FAILURE: "System failure",
+  CRASHED: "Crashed",
+  EXPIRED: "Expired",
+  TIMED_OUT: "Timed out",
+};
+
+const titlesStatusesArray = Object.entries(runStatusTitleFromStatus);
+
+/**
+ * Hex color for each TaskRunStatus, mirroring `runStatusClassNameColor` but as
+ * concrete hex values for non-CSS contexts (e.g. chart series colors).
+ */
+const RUN_STATUS_HEX_COLORS: Record<TaskRunStatus, string> = {
+  PENDING: "#5F6570", // charcoal-500
+  DELAYED: "#6B7580", // charcoal ~450
+  PENDING_VERSION: "#f59e0b", // amber-500
+  WAITING_FOR_DEPLOY: "#d97706", // amber-600
+  EXECUTING: "#3b82f6", // blue-500
+  RETRYING_AFTER_FAILURE: "#2f6fec", // blue ~550
+  DEQUEUED: "#4D8EF5", // blue ~475
+  WAITING_TO_RESUME: "#555D67", // charcoal ~550
+  PAUSED: "#fbbf24", // amber-400
+  CANCELED: "#78828C", // charcoal ~400
+  EXPIRED: "#848D96", // charcoal ~350
+  INTERRUPTED: "#D52C4D", // rose — evenly spaced (error)
+  COMPLETED_SUCCESSFULLY: "#28BF5C", // mint-500 (success)
+  COMPLETED_WITH_ERRORS: "#DE405C", // rose — evenly spaced (error)
+  SYSTEM_FAILURE: "#E7536C", // rose — evenly spaced (error)
+  CRASHED: "#cc193d", // rose — darkest (error)
+  TIMED_OUT: "#F0667B", // rose — lightest (error)
+};
+
+/**
+ * Get the hex color for a run status value. Accepts either a raw TaskRunStatus
+ * (e.g. "COMPLETED_SUCCESSFULLY") or a friendly name (e.g. "Completed").
+ * Returns `undefined` when the value is not a recognised status.
+ */
+export function getRunStatusHexColor(value: string): string | undefined {
+  if (isTaskRunStatus(value)) {
+    return RUN_STATUS_HEX_COLORS[value];
+  }
+  if (isRunFriendlyStatus(value)) {
+    return RUN_STATUS_HEX_COLORS[runStatusFromFriendlyTitle(value)];
   }
+  return undefined;
 }
diff --git a/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx b/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx
index 8abca02eeff..14cdf5a67b8 100644
--- a/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx
+++ b/apps/webapp/app/components/runs/v3/TaskRunsTable.tsx
@@ -31,7 +31,7 @@ import {
   type NextRunListItem,
 } from "~/presenters/v3/NextRunListPresenter.server";
 import { formatCurrencyAccurate } from "~/utils/numberFormatter";
-import { docsPath, v3RunSpanPath, v3TestPath } from "~/utils/pathBuilder";
+import { docsPath, v3RunSpanPath, v3TestPath,v3TestTaskPath } from "~/utils/pathBuilder";
 import { DateTime } from "../../primitives/DateTime";
 import { Paragraph } from "../../primitives/Paragraph";
 import { Spinner } from "../../primitives/Spinner";
@@ -55,6 +55,8 @@ import {
   filterableTaskRunStatuses,
   TaskRunStatusCombo,
 } from "./TaskRunStatus";
+import { useOptimisticLocation } from "~/hooks/useOptimisticLocation";
+import { useSearchParams } from "~/hooks/useSearchParam";
 
 type RunsTableProps = {
   total: number;
@@ -62,9 +64,11 @@ type RunsTableProps = {
   filters: NextRunListAppliedFilters;
   showJob?: boolean;
   runs: NextRunListItem[];
+  rootOnlyDefault?: boolean;
   isLoading?: boolean;
   allowSelection?: boolean;
   variant?: TableVariant;
+  disableAdjacentRows?: boolean;
 };
 
 export function TaskRunsTable({
@@ -72,6 +76,8 @@ export function TaskRunsTable({
   hasFilters,
   filters,
   runs,
+  rootOnlyDefault,
+  disableAdjacentRows = false,
   isLoading = false,
   allowSelection = false,
   variant = "dimmed",
@@ -81,6 +87,12 @@ export function TaskRunsTable({
   const checkboxes = useRef<(HTMLInputElement | null)[]>([]);
   const { has, hasAll, select, deselect, toggle } = useSelectedItems(allowSelection);
   const { isManagedCloud } = useFeatures();
+  const { value } = useSearchParams();
+  const location = useOptimisticLocation();
+  const rootOnly = value("rootOnly") ? `` : `rootOnly=${rootOnlyDefault}`;
+  const search = rootOnly ? `${rootOnly}&${location.search}` : location.search;
+  /** TableState has to be encoded as a separate URI component, so it's merged under one, 'tableState' param */
+  const tableStateParam = disableAdjacentRows ? '' : encodeURIComponent(search);
 
   const showCompute = isManagedCloud;
 
@@ -293,16 +305,20 @@ export function TaskRunsTable({
           <BlankState isLoading={isLoading} filters={filters} />
         ) : (
           runs.map((run, index) => {
+            const searchParams = new URLSearchParams();
+            if (tableStateParam) {
+              searchParams.set("tableState", tableStateParam);
+            }
             const path = v3RunSpanPath(organization, project, run.environment, run, {
               spanId: run.spanId,
-            });
+            }, searchParams);
             return (
               <TableRow key={run.id}>
                 {allowSelection && (
                   <TableCell className="pl-3 pr-0">
                     <Checkbox
                       checked={has(run.friendlyId)}
-                      onChange={(element) => {
+                      onChange={() => {
                         toggle(run.friendlyId);
                       }}
                       ref={(r) => {
@@ -565,6 +581,8 @@ function BlankState({ isLoading, filters }: Pick<RunsTableProps, "isLoading" | "
   if (isLoading) return <TableBlankRow colSpan={15}></TableBlankRow>;
 
   const { tasks, from, to, ...otherFilters } = filters;
+  const singleTaskFromFilters = filters.tasks.length === 1 ? filters.tasks[0] : null;
+  const testPath = singleTaskFromFilters ? v3TestTaskPath(organization, project, environment, {taskIdentifier: singleTaskFromFilters}) : v3TestPath(organization, project, environment);
 
   if (
     filters.tasks.length === 1 &&
@@ -579,7 +597,7 @@ function BlankState({ isLoading, filters }: Pick<RunsTableProps, "isLoading" | "
         </Paragraph>
         <div className="mt-6 flex items-center justify-center gap-2">
           <LinkButton
-            to={v3TestPath(organization, project, environment)}
+            to={testPath}
             variant="tertiary/medium"
             LeadingIcon={BeakerIcon}
             className="inline-flex"
@@ -620,7 +638,7 @@ function BlankState({ isLoading, filters }: Pick<RunsTableProps, "isLoading" | "
           <LinkButton
             LeadingIcon={BeakerIcon}
             variant="tertiary/medium"
-            to={v3TestPath(organization, project, environment)}
+            to={testPath}
           >
             Run a test
           </LinkButton>
diff --git a/apps/webapp/app/components/runs/v3/TaskTriggerSource.tsx b/apps/webapp/app/components/runs/v3/TaskTriggerSource.tsx
index 0dfc5f10e03..8d81e2f36c3 100644
--- a/apps/webapp/app/components/runs/v3/TaskTriggerSource.tsx
+++ b/apps/webapp/app/components/runs/v3/TaskTriggerSource.tsx
@@ -1,5 +1,5 @@
 import { ClockIcon } from "@heroicons/react/20/solid";
-import { type TaskTriggerSource } from "@trigger.dev/database";
+import type { TaskTriggerSource } from "@trigger.dev/database";
 import { TaskIconSmall } from "~/assets/icons/TaskIcon";
 import { cn } from "~/utils/cn";
 
diff --git a/apps/webapp/app/components/runs/v3/WaitpointTokenFilters.tsx b/apps/webapp/app/components/runs/v3/WaitpointTokenFilters.tsx
index 95f91a34db9..ae416394147 100644
--- a/apps/webapp/app/components/runs/v3/WaitpointTokenFilters.tsx
+++ b/apps/webapp/app/components/runs/v3/WaitpointTokenFilters.tsx
@@ -330,7 +330,7 @@ function TagsDropdown({
   useEffect(() => {
     const searchParams = new URLSearchParams();
     if (searchValue) {
-      searchParams.set("name", encodeURIComponent(searchValue));
+      searchParams.set("name", searchValue);
     }
     fetcher.load(
       `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/waitpoints/tags?${searchParams}`
diff --git a/apps/webapp/app/db.server.ts b/apps/webapp/app/db.server.ts
index 969f3f02765..47b67a1a406 100644
--- a/apps/webapp/app/db.server.ts
+++ b/apps/webapp/app/db.server.ts
@@ -1,10 +1,11 @@
 import {
   Prisma,
   PrismaClient,
-  PrismaClientOrTransaction,
-  PrismaReplicaClient,
-  PrismaTransactionClient,
-  PrismaTransactionOptions,
+  $transaction as transac,
+  type PrismaClientOrTransaction,
+  type PrismaReplicaClient,
+  type PrismaTransactionClient,
+  type PrismaTransactionOptions,
 } from "@trigger.dev/database";
 import invariant from "tiny-invariant";
 import { z } from "zod";
@@ -12,9 +13,9 @@ import { env } from "./env.server";
 import { logger } from "./services/logger.server";
 import { isValidDatabaseUrl } from "./utils/db";
 import { singleton } from "./utils/singleton";
-import { $transaction as transac } from "@trigger.dev/database";
 import { startActiveSpan } from "./v3/tracer.server";
 import { Span } from "@opentelemetry/api";
+import { queryPerformanceMonitor } from "./utils/queryPerformanceMonitor.server";
 
 export type {
   PrismaTransactionClient,
@@ -122,28 +123,99 @@ function getClient() {
         url: databaseUrl.href,
       },
     },
-    // @ts-expect-error
     log: [
+      // events
       {
-        emit: "stdout",
+        emit: "event",
         level: "error",
       },
       {
-        emit: "stdout",
+        emit: "event",
         level: "info",
       },
       {
-        emit: "stdout",
+        emit: "event",
         level: "warn",
       },
-    ].concat(
-      process.env.VERBOSE_PRISMA_LOGS === "1"
+      // stdout
+      ...((process.env.PRISMA_LOG_TO_STDOUT === "1"
         ? [
-            { emit: "event", level: "query" },
-            { emit: "stdout", level: "query" },
+            {
+              emit: "stdout",
+              level: "error",
+            },
+            {
+              emit: "stdout",
+              level: "info",
+            },
+            {
+              emit: "stdout",
+              level: "warn",
+            },
           ]
-        : []
-    ),
+        : []) satisfies Prisma.LogDefinition[]),
+      // Query performance monitoring
+      ...((process.env.VERBOSE_PRISMA_LOGS === "1" ||
+      process.env.VERY_SLOW_QUERY_THRESHOLD_MS !== undefined
+        ? [
+            {
+              emit: "event",
+              level: "query",
+            },
+          ]
+        : []) satisfies Prisma.LogDefinition[]),
+      // verbose
+      ...((process.env.VERBOSE_PRISMA_LOGS === "1"
+        ? [
+            {
+              emit: "stdout",
+              level: "query",
+            },
+          ]
+        : []) satisfies Prisma.LogDefinition[]),
+    ],
+  });
+
+  // Only use structured logging if we're not already logging to stdout
+  if (process.env.PRISMA_LOG_TO_STDOUT !== "1") {
+    client.$on("info", (log) => {
+      logger.info("PrismaClient info", {
+        clientType: "writer",
+        event: {
+          timestamp: log.timestamp,
+          message: log.message,
+          target: log.target,
+        },
+      });
+    });
+
+    client.$on("warn", (log) => {
+      logger.warn("PrismaClient warn", {
+        clientType: "writer",
+        event: {
+          timestamp: log.timestamp,
+          message: log.message,
+          target: log.target,
+        },
+      });
+    });
+
+    client.$on("error", (log) => {
+      logger.error("PrismaClient error", {
+        clientType: "writer",
+        event: {
+          timestamp: log.timestamp,
+          message: log.message,
+          target: log.target,
+        },
+        ignoreError: true,
+      });
+    });
+  }
+
+  // Add query performance monitoring
+  client.$on("query", (log) => {
+    queryPerformanceMonitor.onQuery("writer", log);
   });
 
   // connect eagerly
@@ -174,28 +246,98 @@ function getReplicaClient() {
         url: replicaUrl.href,
       },
     },
-    // @ts-expect-error
     log: [
+      // events
       {
-        emit: "stdout",
+        emit: "event",
         level: "error",
       },
       {
-        emit: "stdout",
+        emit: "event",
         level: "info",
       },
       {
-        emit: "stdout",
+        emit: "event",
         level: "warn",
       },
-    ].concat(
-      process.env.VERBOSE_PRISMA_LOGS === "1"
+      // stdout
+      ...((process.env.PRISMA_LOG_TO_STDOUT === "1"
         ? [
-            { emit: "event", level: "query" },
-            { emit: "stdout", level: "query" },
+            {
+              emit: "stdout",
+              level: "error",
+            },
+            {
+              emit: "stdout",
+              level: "info",
+            },
+            {
+              emit: "stdout",
+              level: "warn",
+            },
           ]
-        : []
-    ),
+        : []) satisfies Prisma.LogDefinition[]),
+      // Query performance monitoring
+      ...((process.env.VERBOSE_PRISMA_LOGS === "1" ||
+      process.env.VERY_SLOW_QUERY_THRESHOLD_MS !== undefined
+        ? [
+            {
+              emit: "event",
+              level: "query",
+            },
+          ]
+        : []) satisfies Prisma.LogDefinition[]),
+      // verbose
+      ...((process.env.VERBOSE_PRISMA_LOGS === "1"
+        ? [
+            {
+              emit: "stdout",
+              level: "query",
+            },
+          ]
+        : []) satisfies Prisma.LogDefinition[]),
+    ],
+  });
+
+  // Only use structured logging if we're not already logging to stdout
+  if (process.env.PRISMA_LOG_TO_STDOUT !== "1") {
+    replicaClient.$on("info", (log) => {
+      logger.info("PrismaClient info", {
+        clientType: "reader",
+        event: {
+          timestamp: log.timestamp,
+          message: log.message,
+          target: log.target,
+        },
+      });
+    });
+
+    replicaClient.$on("warn", (log) => {
+      logger.warn("PrismaClient warn", {
+        clientType: "reader",
+        event: {
+          timestamp: log.timestamp,
+          message: log.message,
+          target: log.target,
+        },
+      });
+    });
+
+    replicaClient.$on("error", (log) => {
+      logger.error("PrismaClient error", {
+        clientType: "reader",
+        event: {
+          timestamp: log.timestamp,
+          message: log.message,
+          target: log.target,
+        },
+      });
+    });
+  }
+
+  // Add query performance monitoring for replica client
+  replicaClient.$on("query", (log) => {
+    queryPerformanceMonitor.onQuery("replica", log);
   });
 
   // connect eagerly
diff --git a/apps/webapp/app/entry.server.tsx b/apps/webapp/app/entry.server.tsx
index d05fabd90bb..4ee4f252a32 100644
--- a/apps/webapp/app/entry.server.tsx
+++ b/apps/webapp/app/entry.server.tsx
@@ -1,21 +1,28 @@
-import {
-  createReadableStreamFromReadable,
-  type DataFunctionArgs,
-  type EntryContext,
-} from "@remix-run/node"; // or cloudflare/deno
+import { createReadableStreamFromReadable, type EntryContext } from "@remix-run/node"; // or cloudflare/deno
 import { RemixServer } from "@remix-run/react";
+import { wrapHandleErrorWithSentry } from "@sentry/remix";
 import { parseAcceptLanguage } from "intl-parse-accept-language";
 import isbot from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 import { PassThrough } from "stream";
 import * as Worker from "~/services/worker.server";
+import { bootstrap } from "./bootstrap";
 import { LocaleContextProvider } from "./components/primitives/LocaleProvider";
 import {
   OperatingSystemContextProvider,
   OperatingSystemPlatform,
 } from "./components/primitives/OperatingSystemProvider";
+import { Prisma } from "./db.server";
+import { env } from "./env.server";
+import { eventLoopMonitor } from "./eventLoopMonitor.server";
+import { logger } from "./services/logger.server";
+import { resourceMonitor } from "./services/resourceMonitor.server";
 import { singleton } from "./utils/singleton";
-import { bootstrap } from "./bootstrap";
+import { remoteBuildsEnabled } from "./v3/remoteImageBuilder.server";
+import {
+  registerRunEngineEventBusHandlers,
+  setupBatchQueueCallbacks,
+} from "./v3/runEngineHandlers.server";
 
 const ABORT_DELAY = 30000;
 
@@ -170,9 +177,21 @@ function handleBrowserRequest(
   });
 }
 
-export function handleError(error: unknown, { request, params, context }: DataFunctionArgs) {
-  logError(error, request);
-}
+export const handleError = wrapHandleErrorWithSentry((error, { request }) => {
+  if (request instanceof Request) {
+    logger.debug("Error in handleError", {
+      error,
+      request: {
+        url: request.url,
+        method: request.method,
+      },
+    });
+  } else {
+    logger.debug("Error in handleError", {
+      error,
+    });
+  }
+});
 
 Worker.init().catch((error) => {
   logError(error);
@@ -215,18 +234,13 @@ process.on("uncaughtException", (error, origin) => {
 });
 
 singleton("RunEngineEventBusHandlers", registerRunEngineEventBusHandlers);
+singleton("SetupBatchQueueCallbacks", setupBatchQueueCallbacks);
 
 export { apiRateLimiter } from "./services/apiRateLimit.server";
 export { engineRateLimiter } from "./services/engineRateLimit.server";
+export { runWithHttpContext } from "./services/httpAsyncStorage.server";
 export { socketIo } from "./v3/handleSocketIo.server";
 export { wss } from "./v3/handleWebsockets.server";
-export { runWithHttpContext } from "./services/httpAsyncStorage.server";
-import { eventLoopMonitor } from "./eventLoopMonitor.server";
-import { env } from "./env.server";
-import { logger } from "./services/logger.server";
-import { Prisma } from "./db.server";
-import { registerRunEngineEventBusHandlers } from "./v3/runEngineHandlers.server";
-import { remoteBuildsEnabled } from "./v3/remoteImageBuilder.server";
 
 if (env.EVENT_LOOP_MONITOR_ENABLED === "1") {
   eventLoopMonitor.enable();
@@ -237,3 +251,7 @@ if (remoteBuildsEnabled()) {
 } else {
   console.log("🏗️  Local builds enabled");
 }
+
+if (env.RESOURCE_MONITOR_ENABLED === "1") {
+  resourceMonitor.startMonitoring(1000);
+}
diff --git a/apps/webapp/app/env.server.ts b/apps/webapp/app/env.server.ts
index d7d786825b0..9832dda4189 100644
--- a/apps/webapp/app/env.server.ts
+++ b/apps/webapp/app/env.server.ts
@@ -3,987 +3,1347 @@ import { BoolEnv } from "./utils/boolEnv";
 import { isValidDatabaseUrl } from "./utils/db";
 import { isValidRegex } from "./utils/regex";
 
-const EnvironmentSchema = z.object({
-  NODE_ENV: z.union([z.literal("development"), z.literal("production"), z.literal("test")]),
-  DATABASE_URL: z
-    .string()
-    .refine(
-      isValidDatabaseUrl,
-      "DATABASE_URL is invalid, for details please check the additional output above this message."
-    ),
-  DATABASE_CONNECTION_LIMIT: z.coerce.number().int().default(10),
-  DATABASE_POOL_TIMEOUT: z.coerce.number().int().default(60),
-  DATABASE_CONNECTION_TIMEOUT: z.coerce.number().int().default(20),
-  DIRECT_URL: z
-    .string()
-    .refine(
-      isValidDatabaseUrl,
-      "DIRECT_URL is invalid, for details please check the additional output above this message."
-    ),
-  DATABASE_READ_REPLICA_URL: z.string().optional(),
-  SESSION_SECRET: z.string(),
-  MAGIC_LINK_SECRET: z.string(),
-  ENCRYPTION_KEY: z.string(),
-  WHITELISTED_EMAILS: z
-    .string()
-    .refine(isValidRegex, "WHITELISTED_EMAILS must be a valid regex.")
-    .optional(),
-  ADMIN_EMAILS: z.string().refine(isValidRegex, "ADMIN_EMAILS must be a valid regex.").optional(),
-  REMIX_APP_PORT: z.string().optional(),
-  LOGIN_ORIGIN: z.string().default("http://localhost:3030"),
-  APP_ORIGIN: z.string().default("http://localhost:3030"),
-  API_ORIGIN: z.string().optional(),
-  STREAM_ORIGIN: z.string().optional(),
-  ELECTRIC_ORIGIN: z.string().default("http://localhost:3060"),
-  // A comma separated list of electric origins to shard into different electric instances by environmentId
-  // example: "http://localhost:3060,http://localhost:3061,http://localhost:3062"
-  ELECTRIC_ORIGIN_SHARDS: z.string().optional(),
-  APP_ENV: z.string().default(process.env.NODE_ENV),
-  SERVICE_NAME: z.string().default("trigger.dev webapp"),
-  POSTHOG_PROJECT_KEY: z.string().default("phc_LFH7kJiGhdIlnO22hTAKgHpaKhpM8gkzWAFvHmf5vfS"),
-  TRIGGER_TELEMETRY_DISABLED: z.string().optional(),
-  AUTH_GITHUB_CLIENT_ID: z.string().optional(),
-  AUTH_GITHUB_CLIENT_SECRET: z.string().optional(),
-  EMAIL_TRANSPORT: z.enum(["resend", "smtp", "aws-ses"]).optional(),
-  FROM_EMAIL: z.string().optional(),
-  REPLY_TO_EMAIL: z.string().optional(),
-  RESEND_API_KEY: z.string().optional(),
-  SMTP_HOST: z.string().optional(),
-  SMTP_PORT: z.coerce.number().optional(),
-  SMTP_SECURE: BoolEnv.optional(),
-  SMTP_USER: z.string().optional(),
-  SMTP_PASSWORD: z.string().optional(),
-
-  PLAIN_API_KEY: z.string().optional(),
-  WORKER_SCHEMA: z.string().default("graphile_worker"),
-  WORKER_CONCURRENCY: z.coerce.number().int().default(10),
-  WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
-  WORKER_ENABLED: z.string().default("true"),
-  GRACEFUL_SHUTDOWN_TIMEOUT: z.coerce.number().int().default(60000),
-  DISABLE_SSE: z.string().optional(),
-  OPENAI_API_KEY: z.string().optional(),
-
-  // Redis options
-  REDIS_HOST: z.string().optional(),
-  REDIS_READER_HOST: z.string().optional(),
-  REDIS_READER_PORT: z.coerce.number().optional(),
-  REDIS_PORT: z.coerce.number().optional(),
-  REDIS_USERNAME: z.string().optional(),
-  REDIS_PASSWORD: z.string().optional(),
-  REDIS_TLS_DISABLED: z.string().optional(),
-
-  RATE_LIMIT_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  RATE_LIMIT_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  RATE_LIMIT_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  RATE_LIMIT_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  RATE_LIMIT_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  RATE_LIMIT_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  RATE_LIMIT_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  RATE_LIMIT_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  CACHE_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  CACHE_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  CACHE_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  CACHE_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  CACHE_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  CACHE_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  CACHE_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  CACHE_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  REALTIME_STREAMS_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  REALTIME_STREAMS_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  REALTIME_STREAMS_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  REALTIME_STREAMS_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  REALTIME_STREAMS_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  REALTIME_STREAMS_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  REALTIME_STREAMS_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  REALTIME_STREAMS_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  REALTIME_MAXIMUM_CREATED_AT_FILTER_AGE_IN_MS: z.coerce
-    .number()
-    .int()
-    .default(24 * 60 * 60 * 1000), // 1 day in milliseconds
-
-  PUBSUB_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  PUBSUB_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  PUBSUB_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  PUBSUB_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  PUBSUB_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  PUBSUB_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  PUBSUB_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  PUBSUB_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(100),
-  DEFAULT_ENV_EXECUTION_CONCURRENCY_BURST_FACTOR: z.coerce.number().default(1.0),
-  DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(300),
-  DEFAULT_DEV_ENV_EXECUTION_ATTEMPTS: z.coerce.number().int().positive().default(1),
-
-  //API Rate limiting
-  /**
-   * @example "60s"
-   * @example "1m"
-   * @example "1h"
-   * @example "1d"
-   * @example "1000ms"
-   * @example "1000s"
-   */
-  API_RATE_LIMIT_REFILL_INTERVAL: z.string().default("10s"), // refill 250 tokens every 10 seconds
-  API_RATE_LIMIT_MAX: z.coerce.number().int().default(750), // allow bursts of 750 requests
-  API_RATE_LIMIT_REFILL_RATE: z.coerce.number().int().default(250), // refix 250 tokens every 10 seconds
-  API_RATE_LIMIT_REQUEST_LOGS_ENABLED: z.string().default("0"),
-  API_RATE_LIMIT_REJECTION_LOGS_ENABLED: z.string().default("1"),
-  API_RATE_LIMIT_LIMITER_LOGS_ENABLED: z.string().default("0"),
-
-  API_RATE_LIMIT_JWT_WINDOW: z.string().default("1m"),
-  API_RATE_LIMIT_JWT_TOKENS: z.coerce.number().int().default(60),
-
-  //v3
-  PROVIDER_SECRET: z.string().default("provider-secret"),
-  COORDINATOR_SECRET: z.string().default("coordinator-secret"),
-  DEPOT_TOKEN: z.string().optional(),
-  DEPOT_ORG_ID: z.string().optional(),
-  DEPOT_REGION: z.string().default("us-east-1"),
-
-  // Deployment registry
-  DEPLOY_REGISTRY_HOST: z.string().min(1),
-  DEPLOY_REGISTRY_USERNAME: z.string().optional(),
-  DEPLOY_REGISTRY_PASSWORD: z.string().optional(),
-  DEPLOY_REGISTRY_NAMESPACE: z.string().min(1).default("trigger"),
-  DEPLOY_REGISTRY_ECR_TAGS: z.string().optional(), // csv, for example: "key1=value1,key2=value2"
-  DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: z.string().optional(),
-  DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: z.string().optional(),
-  DEPLOY_IMAGE_PLATFORM: z.string().default("linux/amd64"),
-  DEPLOY_VERSION_SUFFIX: z.string().optional(), // Optional suffix for deployment versions, e.g., "hardened"
-  // Full image reference override - bypasses auto-generation of image tags
-  // When set, all deployments will use this exact image reference
-  // Example: "myregistry.com/myorg/myapp:1.0.5"
-  DEPLOY_IMAGE_OVERRIDE: z.string().optional(),
-  DEPLOY_TIMEOUT_MS: z.coerce
-    .number()
-    .int()
-    .default(60 * 1000 * 8), // 8 minutes
-
-  OBJECT_STORE_BASE_URL: z.string().optional(),
-  OBJECT_STORE_ACCESS_KEY_ID: z.string().optional(),
-  OBJECT_STORE_SECRET_ACCESS_KEY: z.string().optional(),
-  OBJECT_STORE_REGION: z.string().optional(),
-  OBJECT_STORE_SERVICE: z.string().default("s3"),
-  EVENTS_BATCH_SIZE: z.coerce.number().int().default(100),
-  EVENTS_BATCH_INTERVAL: z.coerce.number().int().default(1000),
-  EVENTS_DEFAULT_LOG_RETENTION: z.coerce.number().int().default(7),
-  SHARED_QUEUE_CONSUMER_POOL_SIZE: z.coerce.number().int().default(10),
-  SHARED_QUEUE_CONSUMER_INTERVAL_MS: z.coerce.number().int().default(100),
-  SHARED_QUEUE_CONSUMER_NEXT_TICK_INTERVAL_MS: z.coerce.number().int().default(100),
-  SHARED_QUEUE_CONSUMER_EMIT_RESUME_DEPENDENCY_TIMEOUT_MS: z.coerce.number().int().default(1000),
-  SHARED_QUEUE_CONSUMER_RESOLVE_PAYLOADS_BATCH_SIZE: z.coerce.number().int().default(25),
-
-  MANAGED_WORKER_SECRET: z.string().default("managed-secret"),
-
-  // Development OTEL environment variables
-  DEV_OTEL_EXPORTER_OTLP_ENDPOINT: z.string().optional(),
-  // If this is set to 1, then the below variables are used to configure the batch processor for spans and logs
-  DEV_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
-  DEV_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
-  DEV_OTEL_SPAN_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
-  DEV_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
-  DEV_OTEL_SPAN_MAX_QUEUE_SIZE: z.string().default("512"),
-  DEV_OTEL_LOG_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
-  DEV_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
-  DEV_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
-  DEV_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
-
-  PROD_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
-  PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
-  PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
-  PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
-  PROD_OTEL_SPAN_MAX_QUEUE_SIZE: z.string().default("512"),
-  PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
-  PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
-  PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
-  PROD_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
-
-  TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: z.string().default("1024"),
-  TRIGGER_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT: z.string().default("1024"),
-  TRIGGER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT: z.string().default("131072"),
-  TRIGGER_OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT: z.string().default("131072"),
-  TRIGGER_OTEL_SPAN_EVENT_COUNT_LIMIT: z.string().default("10"),
-  TRIGGER_OTEL_LINK_COUNT_LIMIT: z.string().default("2"),
-  TRIGGER_OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT: z.string().default("10"),
-  TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT: z.string().default("10"),
-
-  CHECKPOINT_THRESHOLD_IN_MS: z.coerce.number().int().default(30000),
-
-  // Internal OTEL environment variables
-  INTERNAL_OTEL_TRACE_EXPORTER_URL: z.string().optional(),
-  INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS: z.string().optional(),
-  INTERNAL_OTEL_TRACE_LOGGING_ENABLED: z.string().default("1"),
-  // this means 1/20 traces or 5% of traces will be sampled (sampled = recorded)
-  INTERNAL_OTEL_TRACE_SAMPLING_RATE: z.string().default("20"),
-  INTERNAL_OTEL_TRACE_INSTRUMENT_PRISMA_ENABLED: z.string().default("0"),
-  INTERNAL_OTEL_TRACE_DISABLED: z.string().default("0"),
-
-  INTERNAL_OTEL_LOG_EXPORTER_URL: z.string().optional(),
-  INTERNAL_OTEL_METRIC_EXPORTER_URL: z.string().optional(),
-  INTERNAL_OTEL_METRIC_EXPORTER_AUTH_HEADERS: z.string().optional(),
-  INTERNAL_OTEL_METRIC_EXPORTER_ENABLED: z.string().default("0"),
-  INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS: z.coerce.number().int().default(30_000),
-
-  ORG_SLACK_INTEGRATION_CLIENT_ID: z.string().optional(),
-  ORG_SLACK_INTEGRATION_CLIENT_SECRET: z.string().optional(),
-
-  /** These enable the alerts feature in v3 */
-  ALERT_EMAIL_TRANSPORT: z.enum(["resend", "smtp", "aws-ses"]).optional(),
-  ALERT_FROM_EMAIL: z.string().optional(),
-  ALERT_REPLY_TO_EMAIL: z.string().optional(),
-  ALERT_RESEND_API_KEY: z.string().optional(),
-  ALERT_SMTP_HOST: z.string().optional(),
-  ALERT_SMTP_PORT: z.coerce.number().optional(),
-  ALERT_SMTP_SECURE: BoolEnv.optional(),
-  ALERT_SMTP_USER: z.string().optional(),
-  ALERT_SMTP_PASSWORD: z.string().optional(),
-  ALERT_RATE_LIMITER_EMISSION_INTERVAL: z.coerce.number().int().default(2_500),
-  ALERT_RATE_LIMITER_BURST_TOLERANCE: z.coerce.number().int().default(10_000),
-  ALERT_RATE_LIMITER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  ALERT_RATE_LIMITER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  ALERT_RATE_LIMITER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  ALERT_RATE_LIMITER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  ALERT_RATE_LIMITER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  ALERT_RATE_LIMITER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  ALERT_RATE_LIMITER_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  ALERT_RATE_LIMITER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  LOOPS_API_KEY: z.string().optional(),
-  MARQS_DISABLE_REBALANCING: BoolEnv.default(false),
-  MARQS_VISIBILITY_TIMEOUT_MS: z.coerce
-    .number()
-    .int()
-    .default(60 * 1000 * 15),
-  MARQS_SHARED_QUEUE_LIMIT: z.coerce.number().int().default(1000),
-  MARQS_MAXIMUM_QUEUE_PER_ENV_COUNT: z.coerce.number().int().default(50),
-  MARQS_DEV_QUEUE_LIMIT: z.coerce.number().int().default(1000),
-  MARQS_MAXIMUM_NACK_COUNT: z.coerce.number().int().default(64),
-  MARQS_CONCURRENCY_LIMIT_BIAS: z.coerce.number().default(0.75),
-  MARQS_AVAILABLE_CAPACITY_BIAS: z.coerce.number().default(0.3),
-  MARQS_QUEUE_AGE_RANDOMIZATION_BIAS: z.coerce.number().default(0.25),
-  MARQS_REUSE_SNAPSHOT_COUNT: z.coerce.number().int().default(0),
-  MARQS_MAXIMUM_ENV_COUNT: z.coerce.number().int().optional(),
-
-  PROD_TASK_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
-
-  VERBOSE_GRAPHILE_LOGGING: z.string().default("false"),
-  V2_MARQS_ENABLED: z.string().default("0"),
-  V2_MARQS_CONSUMER_POOL_ENABLED: z.string().default("0"),
-  V2_MARQS_CONSUMER_POOL_SIZE: z.coerce.number().int().default(10),
-  V2_MARQS_CONSUMER_POLL_INTERVAL_MS: z.coerce.number().int().default(1000),
-  V2_MARQS_QUEUE_SELECTION_COUNT: z.coerce.number().int().default(36),
-  V2_MARQS_VISIBILITY_TIMEOUT_MS: z.coerce
-    .number()
-    .int()
-    .default(60 * 1000 * 15),
-  V2_MARQS_DEFAULT_ENV_CONCURRENCY: z.coerce.number().int().default(100),
-  V2_MARQS_VERBOSE: z.string().default("0"),
-  V3_MARQS_CONCURRENCY_MONITOR_ENABLED: z.string().default("0"),
-  V2_MARQS_CONCURRENCY_MONITOR_ENABLED: z.string().default("0"),
-  /* Usage settings */
-  USAGE_EVENT_URL: z.string().optional(),
-  PROD_USAGE_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
-
-  CENTS_PER_RUN: z.coerce.number().default(0),
-
-  EVENT_LOOP_MONITOR_ENABLED: z.string().default("1"),
-  MAXIMUM_LIVE_RELOADING_EVENTS: z.coerce.number().int().default(1000),
-  MAXIMUM_TRACE_SUMMARY_VIEW_COUNT: z.coerce.number().int().default(25_000),
-  TASK_PAYLOAD_OFFLOAD_THRESHOLD: z.coerce.number().int().default(524_288), // 512KB
-  TASK_PAYLOAD_MAXIMUM_SIZE: z.coerce.number().int().default(3_145_728), // 3MB
-  BATCH_TASK_PAYLOAD_MAXIMUM_SIZE: z.coerce.number().int().default(1_000_000), // 1MB
-  TASK_RUN_METADATA_MAXIMUM_SIZE: z.coerce.number().int().default(262_144), // 256KB
-
-  MAXIMUM_DEV_QUEUE_SIZE: z.coerce.number().int().optional(),
-  MAXIMUM_DEPLOYED_QUEUE_SIZE: z.coerce.number().int().optional(),
-  MAX_BATCH_V2_TRIGGER_ITEMS: z.coerce.number().int().default(500),
-  MAX_BATCH_AND_WAIT_V2_TRIGGER_ITEMS: z.coerce.number().int().default(500),
-
-  REALTIME_STREAM_VERSION: z.enum(["v1", "v2"]).default("v1"),
-  REALTIME_STREAM_MAX_LENGTH: z.coerce.number().int().default(1000),
-  REALTIME_STREAM_TTL: z.coerce
-    .number()
-    .int()
-    .default(60 * 60 * 24), // 1 day in seconds
-  BATCH_METADATA_OPERATIONS_FLUSH_INTERVAL_MS: z.coerce.number().int().default(1000),
-  BATCH_METADATA_OPERATIONS_FLUSH_ENABLED: z.string().default("1"),
-  BATCH_METADATA_OPERATIONS_FLUSH_LOGGING_ENABLED: z.string().default("1"),
-
-  // Run Engine 2.0
-  RUN_ENGINE_WORKER_COUNT: z.coerce.number().int().default(4),
-  RUN_ENGINE_TASKS_PER_WORKER: z.coerce.number().int().default(10),
-  RUN_ENGINE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(10),
-  RUN_ENGINE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(100),
-  RUN_ENGINE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(100),
-  RUN_ENGINE_TIMEOUT_PENDING_EXECUTING: z.coerce.number().int().default(60_000),
-  RUN_ENGINE_TIMEOUT_PENDING_CANCEL: z.coerce.number().int().default(60_000),
-  RUN_ENGINE_TIMEOUT_EXECUTING: z.coerce.number().int().default(60_000),
-  RUN_ENGINE_TIMEOUT_EXECUTING_WITH_WAITPOINTS: z.coerce.number().int().default(60_000),
-  RUN_ENGINE_TIMEOUT_SUSPENDED: z.coerce
-    .number()
-    .int()
-    .default(60_000 * 10),
-  RUN_ENGINE_DEBUG_WORKER_NOTIFICATIONS: BoolEnv.default(false),
-  RUN_ENGINE_PARENT_QUEUE_LIMIT: z.coerce.number().int().default(1000),
-  RUN_ENGINE_CONCURRENCY_LIMIT_BIAS: z.coerce.number().default(0.75),
-  RUN_ENGINE_AVAILABLE_CAPACITY_BIAS: z.coerce.number().default(0.3),
-  RUN_ENGINE_QUEUE_AGE_RANDOMIZATION_BIAS: z.coerce.number().default(0.25),
-  RUN_ENGINE_REUSE_SNAPSHOT_COUNT: z.coerce.number().int().default(0),
-  RUN_ENGINE_MAXIMUM_ENV_COUNT: z.coerce.number().int().optional(),
-  RUN_ENGINE_RUN_QUEUE_SHARD_COUNT: z.coerce.number().int().default(4),
-  RUN_ENGINE_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
-  RUN_ENGINE_RETRY_WARM_START_THRESHOLD_MS: z.coerce.number().int().default(30_000),
-  RUN_ENGINE_PROCESS_WORKER_QUEUE_DEBOUNCE_MS: z.coerce.number().int().default(200),
-  RUN_ENGINE_DEQUEUE_BLOCKING_TIMEOUT_SECONDS: z.coerce.number().int().default(10),
-  RUN_ENGINE_MASTER_QUEUE_CONSUMERS_INTERVAL_MS: z.coerce.number().int().default(500),
-  RUN_ENGINE_CONCURRENCY_SWEEPER_SCAN_SCHEDULE: z.string().optional(),
-  RUN_ENGINE_CONCURRENCY_SWEEPER_PROCESS_MARKED_SCHEDULE: z.string().optional(),
-  RUN_ENGINE_CONCURRENCY_SWEEPER_SCAN_JITTER_IN_MS: z.coerce.number().int().optional(),
-  RUN_ENGINE_CONCURRENCY_SWEEPER_PROCESS_MARKED_JITTER_IN_MS: z.coerce.number().int().optional(),
-
-  RUN_ENGINE_RUN_LOCK_DURATION: z.coerce.number().int().default(5000),
-  RUN_ENGINE_RUN_LOCK_AUTOMATIC_EXTENSION_THRESHOLD: z.coerce.number().int().default(1000),
-  RUN_ENGINE_RUN_LOCK_MAX_RETRIES: z.coerce.number().int().default(10),
-  RUN_ENGINE_RUN_LOCK_BASE_DELAY: z.coerce.number().int().default(100),
-  RUN_ENGINE_RUN_LOCK_MAX_DELAY: z.coerce.number().int().default(3000),
-  RUN_ENGINE_RUN_LOCK_BACKOFF_MULTIPLIER: z.coerce.number().default(1.8),
-  RUN_ENGINE_RUN_LOCK_JITTER_FACTOR: z.coerce.number().default(0.15),
-  RUN_ENGINE_RUN_LOCK_MAX_TOTAL_WAIT_TIME: z.coerce.number().int().default(15000),
-
-  RUN_ENGINE_WORKER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  RUN_ENGINE_WORKER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  RUN_ENGINE_WORKER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  RUN_ENGINE_WORKER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  RUN_ENGINE_WORKER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  RUN_ENGINE_WORKER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  RUN_ENGINE_WORKER_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-
-  RUN_ENGINE_RUN_QUEUE_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  RUN_ENGINE_RUN_QUEUE_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  RUN_ENGINE_RUN_QUEUE_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  RUN_ENGINE_RUN_QUEUE_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  RUN_ENGINE_RUN_QUEUE_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  RUN_ENGINE_RUN_QUEUE_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  RUN_ENGINE_RUN_QUEUE_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-
-  RUN_ENGINE_RUN_LOCK_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  RUN_ENGINE_RUN_LOCK_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  RUN_ENGINE_RUN_LOCK_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  RUN_ENGINE_RUN_LOCK_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  RUN_ENGINE_RUN_LOCK_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  RUN_ENGINE_RUN_LOCK_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  RUN_ENGINE_RUN_LOCK_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-
-  RUN_ENGINE_DEV_PRESENCE_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  RUN_ENGINE_DEV_PRESENCE_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  RUN_ENGINE_DEV_PRESENCE_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  RUN_ENGINE_DEV_PRESENCE_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  RUN_ENGINE_DEV_PRESENCE_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  RUN_ENGINE_DEV_PRESENCE_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  RUN_ENGINE_DEV_PRESENCE_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-
-  //API Rate limiting
-  /**
-   * @example "60s"
-   * @example "1m"
-   * @example "1h"
-   * @example "1d"
-   * @example "1000ms"
-   * @example "1000s"
-   */
-  RUN_ENGINE_RATE_LIMIT_REFILL_INTERVAL: z.string().default("10s"), // refill 250 tokens every 10 seconds
-  RUN_ENGINE_RATE_LIMIT_MAX: z.coerce.number().int().default(1200), // allow bursts of 750 requests
-  RUN_ENGINE_RATE_LIMIT_REFILL_RATE: z.coerce.number().int().default(400), // refix 250 tokens every 10 seconds
-  RUN_ENGINE_RATE_LIMIT_REQUEST_LOGS_ENABLED: z.string().default("0"),
-  RUN_ENGINE_RATE_LIMIT_REJECTION_LOGS_ENABLED: z.string().default("1"),
-  RUN_ENGINE_RATE_LIMIT_LIMITER_LOGS_ENABLED: z.string().default("0"),
-
-  RUN_ENGINE_RELEASE_CONCURRENCY_ENABLED: z.string().default("0"),
-  RUN_ENGINE_RELEASE_CONCURRENCY_DISABLE_CONSUMERS: z.string().default("0"),
-  RUN_ENGINE_RELEASE_CONCURRENCY_MAX_TOKENS_RATIO: z.coerce.number().default(1),
-  RUN_ENGINE_RELEASE_CONCURRENCY_RELEASINGS_MAX_AGE: z.coerce
-    .number()
-    .int()
-    .default(60_000 * 30),
-  RUN_ENGINE_RELEASE_CONCURRENCY_RELEASINGS_POLL_INTERVAL: z.coerce.number().int().default(60_000),
-  RUN_ENGINE_RELEASE_CONCURRENCY_MAX_RETRIES: z.coerce.number().int().default(3),
-  RUN_ENGINE_RELEASE_CONCURRENCY_CONSUMERS_COUNT: z.coerce.number().int().default(1),
-  RUN_ENGINE_RELEASE_CONCURRENCY_POLL_INTERVAL: z.coerce.number().int().default(500),
-  RUN_ENGINE_RELEASE_CONCURRENCY_BATCH_SIZE: z.coerce.number().int().default(10),
-
-  RUN_ENGINE_WORKER_ENABLED: z.string().default("1"),
-  RUN_ENGINE_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-  RUN_ENGINE_RUN_QUEUE_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-
-  /** How long should the presence ttl last */
-  DEV_PRESENCE_SSE_TIMEOUT: z.coerce.number().int().default(30_000),
-  DEV_PRESENCE_TTL_MS: z.coerce.number().int().default(5_000),
-  DEV_PRESENCE_POLL_MS: z.coerce.number().int().default(1_000),
-  /** How many ms to wait until dequeuing again, if there was a run last time */
-  DEV_DEQUEUE_INTERVAL_WITH_RUN: z.coerce.number().int().default(250),
-  /** How many ms to wait until dequeuing again, if there was no run last time */
-  DEV_DEQUEUE_INTERVAL_WITHOUT_RUN: z.coerce.number().int().default(1_000),
-  /** The max number of runs per API call that we'll dequeue in DEV */
-  DEV_DEQUEUE_MAX_RUNS_PER_PULL: z.coerce.number().int().default(10),
-
-  /** The maximum concurrent local run processes executing at once in dev */
-  DEV_MAX_CONCURRENT_RUNS: z.coerce.number().int().default(25),
-
-  /** The CLI should connect to this for dev runs */
-  DEV_ENGINE_URL: z.string().default(process.env.APP_ORIGIN ?? "http://localhost:3030"),
-
-  LEGACY_RUN_ENGINE_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
-  LEGACY_RUN_ENGINE_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
-  LEGACY_RUN_ENGINE_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(1),
-  LEGACY_RUN_ENGINE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
-  LEGACY_RUN_ENGINE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
-  LEGACY_RUN_ENGINE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
-  LEGACY_RUN_ENGINE_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
-  LEGACY_RUN_ENGINE_WORKER_LOG_LEVEL: z
-    .enum(["log", "error", "warn", "info", "debug"])
-    .default("info"),
-
-  LEGACY_RUN_ENGINE_WORKER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  LEGACY_RUN_ENGINE_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE: z.coerce.number().int().default(100),
-  LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_STAGGER_MS: z.coerce.number().int().default(1_000),
-
-  COMMON_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
-  COMMON_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
-  COMMON_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
-  COMMON_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
-  COMMON_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
-  COMMON_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
-  COMMON_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
-  COMMON_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-
-  COMMON_WORKER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  COMMON_WORKER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  COMMON_WORKER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  COMMON_WORKER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  COMMON_WORKER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  COMMON_WORKER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  COMMON_WORKER_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  COMMON_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  BATCH_TRIGGER_PROCESS_JOB_VISIBILITY_TIMEOUT_MS: z.coerce
-    .number()
-    .int()
-    .default(60_000 * 5), // 5 minutes
-
-  BATCH_TRIGGER_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
-  BATCH_TRIGGER_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
-  BATCH_TRIGGER_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
-  BATCH_TRIGGER_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
-  BATCH_TRIGGER_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
-  BATCH_TRIGGER_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(20),
-  BATCH_TRIGGER_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
-  BATCH_TRIGGER_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-
-  BATCH_TRIGGER_WORKER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  BATCH_TRIGGER_WORKER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  BATCH_TRIGGER_WORKER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  BATCH_TRIGGER_WORKER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  BATCH_TRIGGER_WORKER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  BATCH_TRIGGER_WORKER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  BATCH_TRIGGER_WORKER_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  BATCH_TRIGGER_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  ALERTS_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
-  ALERTS_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
-  ALERTS_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
-  ALERTS_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
-  ALERTS_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(100),
-  ALERTS_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
-  ALERTS_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
-  ALERTS_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-
-  ALERTS_WORKER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  ALERTS_WORKER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  ALERTS_WORKER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  ALERTS_WORKER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  ALERTS_WORKER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  ALERTS_WORKER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  ALERTS_WORKER_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  ALERTS_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  SCHEDULE_ENGINE_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-  SCHEDULE_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
-  SCHEDULE_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
-  SCHEDULE_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
-  SCHEDULE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
-  SCHEDULE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
-  SCHEDULE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
-  SCHEDULE_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(30_000),
-  SCHEDULE_WORKER_DISTRIBUTION_WINDOW_SECONDS: z.coerce.number().int().default(30),
-
-  SCHEDULE_WORKER_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  SCHEDULE_WORKER_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  SCHEDULE_WORKER_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  SCHEDULE_WORKER_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  SCHEDULE_WORKER_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  SCHEDULE_WORKER_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  SCHEDULE_WORKER_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-  SCHEDULE_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
-
-  TASK_EVENT_PARTITIONING_ENABLED: z.string().default("0"),
-  TASK_EVENT_PARTITIONED_WINDOW_IN_SECONDS: z.coerce.number().int().default(60), // 1 minute
-
-  QUEUE_SSE_AUTORELOAD_INTERVAL_MS: z.coerce.number().int().default(5_000),
-  QUEUE_SSE_AUTORELOAD_TIMEOUT_MS: z.coerce.number().int().default(60_000),
-
-  SLACK_BOT_TOKEN: z.string().optional(),
-  SLACK_SIGNUP_REASON_CHANNEL_ID: z.string().optional(),
-
-  // kapa.ai
-  KAPA_AI_WEBSITE_ID: z.string().optional(),
-
-  // BetterStack
-  BETTERSTACK_API_KEY: z.string().optional(),
-  BETTERSTACK_STATUS_PAGE_ID: z.string().optional(),
-
-  RUN_REPLICATION_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  RUN_REPLICATION_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  RUN_REPLICATION_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  RUN_REPLICATION_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  RUN_REPLICATION_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  RUN_REPLICATION_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  RUN_REPLICATION_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
-
-  RUN_REPLICATION_CLICKHOUSE_URL: z.string().optional(),
-  RUN_REPLICATION_ENABLED: z.string().default("0"),
-  RUN_REPLICATION_SLOT_NAME: z.string().default("task_runs_to_clickhouse_v1"),
-  RUN_REPLICATION_PUBLICATION_NAME: z.string().default("task_runs_to_clickhouse_v1_publication"),
-  RUN_REPLICATION_MAX_FLUSH_CONCURRENCY: z.coerce.number().int().default(100),
-  RUN_REPLICATION_FLUSH_INTERVAL_MS: z.coerce.number().int().default(1000),
-  RUN_REPLICATION_FLUSH_BATCH_SIZE: z.coerce.number().int().default(100),
-  RUN_REPLICATION_LEADER_LOCK_TIMEOUT_MS: z.coerce.number().int().default(30_000),
-  RUN_REPLICATION_LEADER_LOCK_EXTEND_INTERVAL_MS: z.coerce.number().int().default(10_000),
-  RUN_REPLICATION_ACK_INTERVAL_SECONDS: z.coerce.number().int().default(10),
-  RUN_REPLICATION_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-  RUN_REPLICATION_CLICKHOUSE_LOG_LEVEL: z
-    .enum(["log", "error", "warn", "info", "debug"])
-    .default("info"),
-  RUN_REPLICATION_LEADER_LOCK_ADDITIONAL_TIME_MS: z.coerce.number().int().default(10_000),
-  RUN_REPLICATION_LEADER_LOCK_RETRY_INTERVAL_MS: z.coerce.number().int().default(500),
-  RUN_REPLICATION_WAIT_FOR_ASYNC_INSERT: z.string().default("0"),
-  RUN_REPLICATION_KEEP_ALIVE_ENABLED: z.string().default("0"),
-  RUN_REPLICATION_KEEP_ALIVE_IDLE_SOCKET_TTL_MS: z.coerce.number().int().optional(),
-  RUN_REPLICATION_MAX_OPEN_CONNECTIONS: z.coerce.number().int().default(10),
-  // Retry configuration for insert operations
-  RUN_REPLICATION_INSERT_MAX_RETRIES: z.coerce.number().int().default(3),
-  RUN_REPLICATION_INSERT_BASE_DELAY_MS: z.coerce.number().int().default(100),
-  RUN_REPLICATION_INSERT_MAX_DELAY_MS: z.coerce.number().int().default(2000),
-
-  // Clickhouse
-  CLICKHOUSE_URL: z.string(),
-  CLICKHOUSE_KEEP_ALIVE_ENABLED: z.string().default("1"),
-  CLICKHOUSE_KEEP_ALIVE_IDLE_SOCKET_TTL_MS: z.coerce.number().int().optional(),
-  CLICKHOUSE_MAX_OPEN_CONNECTIONS: z.coerce.number().int().default(10),
-  CLICKHOUSE_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-  CLICKHOUSE_COMPRESSION_REQUEST: z.string().default("1"),
-
-  // Bootstrap
-  TRIGGER_BOOTSTRAP_ENABLED: z.string().default("0"),
-  TRIGGER_BOOTSTRAP_WORKER_GROUP_NAME: z.string().optional(),
-  TRIGGER_BOOTSTRAP_WORKER_TOKEN_PATH: z.string().optional(),
-
-  // Machine presets
-  MACHINE_PRESETS_OVERRIDE_PATH: z.string().optional(),
-
-  // CLI package tag (e.g. "latest", "v4-beta", "4.0.0") - used for setup commands
-  TRIGGER_CLI_TAG: z.string().default("latest"),
-
-  HEALTHCHECK_DATABASE_DISABLED: z.string().default("0"),
-
-  REQUEST_IDEMPOTENCY_REDIS_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_HOST),
-  REQUEST_IDEMPOTENCY_REDIS_READER_HOST: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_READER_HOST),
-  REQUEST_IDEMPOTENCY_REDIS_READER_PORT: z.coerce
-    .number()
-    .optional()
-    .transform(
-      (v) =>
-        v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
-    ),
-  REQUEST_IDEMPOTENCY_REDIS_PORT: z.coerce
-    .number()
-    .optional()
-    .transform((v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)),
-  REQUEST_IDEMPOTENCY_REDIS_USERNAME: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_USERNAME),
-  REQUEST_IDEMPOTENCY_REDIS_PASSWORD: z
-    .string()
-    .optional()
-    .transform((v) => v ?? process.env.REDIS_PASSWORD),
-  REQUEST_IDEMPOTENCY_REDIS_TLS_DISABLED: z
-    .string()
-    .default(process.env.REDIS_TLS_DISABLED ?? "false"),
-
-  REQUEST_IDEMPOTENCY_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
-
-  REQUEST_IDEMPOTENCY_TTL_IN_MS: z.coerce
-    .number()
-    .int()
-    .default(60_000 * 60 * 24),
-
-  // Bulk action
-  BULK_ACTION_BATCH_SIZE: z.coerce.number().int().default(100),
-  BULK_ACTION_BATCH_DELAY_MS: z.coerce.number().int().default(200),
-  BULK_ACTION_SUBBATCH_CONCURRENCY: z.coerce.number().int().default(5),
-
-  // AI Run Filter
-  AI_RUN_FILTER_MODEL: z.string().optional(),
-});
+const GithubAppEnvSchema = z.preprocess(
+  (val) => {
+    const obj = val as any;
+    if (!obj || !obj.GITHUB_APP_ENABLED) {
+      return { ...obj, GITHUB_APP_ENABLED: "0" };
+    }
+    return obj;
+  },
+  z.discriminatedUnion("GITHUB_APP_ENABLED", [
+    z.object({
+      GITHUB_APP_ENABLED: z.literal("1"),
+      GITHUB_APP_ID: z.string(),
+      GITHUB_APP_PRIVATE_KEY: z.string(),
+      GITHUB_APP_WEBHOOK_SECRET: z.string(),
+      GITHUB_APP_SLUG: z.string(),
+    }),
+    z.object({
+      GITHUB_APP_ENABLED: z.literal("0"),
+    }),
+  ])
+);
+
+// eventually we can make all S2 env vars required once the S2 OSS version is out
+const S2EnvSchema = z.preprocess(
+  (val) => {
+    const obj = val as any;
+    if (!obj || !obj.S2_ENABLED) {
+      return { ...obj, S2_ENABLED: "0" };
+    }
+    return obj;
+  },
+  z.discriminatedUnion("S2_ENABLED", [
+    z.object({
+      S2_ENABLED: z.literal("1"),
+      S2_ACCESS_TOKEN: z.string(),
+      S2_DEPLOYMENT_LOGS_BASIN_NAME: z.string(),
+    }),
+    z.object({
+      S2_ENABLED: z.literal("0"),
+    }),
+  ])
+);
+
+const EnvironmentSchema = z
+  .object({
+    NODE_ENV: z.union([z.literal("development"), z.literal("production"), z.literal("test")]),
+    DATABASE_URL: z
+      .string()
+      .refine(
+        isValidDatabaseUrl,
+        "DATABASE_URL is invalid, for details please check the additional output above this message."
+      ),
+    DATABASE_CONNECTION_LIMIT: z.coerce.number().int().default(10),
+    DATABASE_POOL_TIMEOUT: z.coerce.number().int().default(60),
+    DATABASE_CONNECTION_TIMEOUT: z.coerce.number().int().default(20),
+    DIRECT_URL: z
+      .string()
+      .refine(
+        isValidDatabaseUrl,
+        "DIRECT_URL is invalid, for details please check the additional output above this message."
+      ),
+    DATABASE_READ_REPLICA_URL: z.string().optional(),
+    SESSION_SECRET: z.string(),
+    MAGIC_LINK_SECRET: z.string(),
+    ENCRYPTION_KEY: z
+      .string()
+      .refine(
+        (val) => Buffer.from(val, "utf8").length === 32,
+        "ENCRYPTION_KEY must be exactly 32 bytes"
+      ),
+    WHITELISTED_EMAILS: z
+      .string()
+      .refine(isValidRegex, "WHITELISTED_EMAILS must be a valid regex.")
+      .optional(),
+    ADMIN_EMAILS: z.string().refine(isValidRegex, "ADMIN_EMAILS must be a valid regex.").optional(),
+    REMIX_APP_PORT: z.string().optional(),
+    LOGIN_ORIGIN: z.string().default("http://localhost:3030"),
+    LOGIN_RATE_LIMITS_ENABLED: BoolEnv.default(true),
+    APP_ORIGIN: z.string().default("http://localhost:3030"),
+    API_ORIGIN: z.string().optional(),
+    STREAM_ORIGIN: z.string().optional(),
+    ELECTRIC_ORIGIN: z.string().default("http://localhost:3060"),
+    // A comma separated list of electric origins to shard into different electric instances by environmentId
+    // example: "http://localhost:3060,http://localhost:3061,http://localhost:3062"
+    ELECTRIC_ORIGIN_SHARDS: z.string().optional(),
+    APP_ENV: z.string().default(process.env.NODE_ENV),
+    SERVICE_NAME: z.string().default("trigger.dev webapp"),
+    POSTHOG_PROJECT_KEY: z.string().default("phc_LFH7kJiGhdIlnO22hTAKgHpaKhpM8gkzWAFvHmf5vfS"),
+    TRIGGER_TELEMETRY_DISABLED: z.string().optional(),
+    AUTH_GITHUB_CLIENT_ID: z.string().optional(),
+    AUTH_GITHUB_CLIENT_SECRET: z.string().optional(),
+    AUTH_GOOGLE_CLIENT_ID: z.string().optional(),
+    AUTH_GOOGLE_CLIENT_SECRET: z.string().optional(),
+    EMAIL_TRANSPORT: z.enum(["resend", "smtp", "aws-ses"]).optional(),
+    FROM_EMAIL: z.string().optional(),
+    REPLY_TO_EMAIL: z.string().optional(),
+    RESEND_API_KEY: z.string().optional(),
+    SMTP_HOST: z.string().optional(),
+    SMTP_PORT: z.coerce.number().optional(),
+    SMTP_SECURE: BoolEnv.optional(),
+    SMTP_USER: z.string().optional(),
+    SMTP_PASSWORD: z.string().optional(),
+
+    PLAIN_API_KEY: z.string().optional(),
+    WORKER_SCHEMA: z.string().default("graphile_worker"),
+    WORKER_CONCURRENCY: z.coerce.number().int().default(10),
+    WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    WORKER_ENABLED: z.string().default("true"),
+    GRACEFUL_SHUTDOWN_TIMEOUT: z.coerce.number().int().default(60000),
+    DISABLE_SSE: z.string().optional(),
+    OPENAI_API_KEY: z.string().optional(),
+
+    // Redis options
+    REDIS_HOST: z.string().optional(),
+    REDIS_READER_HOST: z.string().optional(),
+    REDIS_READER_PORT: z.coerce.number().optional(),
+    REDIS_PORT: z.coerce.number().optional(),
+    REDIS_USERNAME: z.string().optional(),
+    REDIS_PASSWORD: z.string().optional(),
+    REDIS_TLS_DISABLED: z.string().optional(),
+
+    RATE_LIMIT_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    RATE_LIMIT_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    RATE_LIMIT_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    RATE_LIMIT_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    RATE_LIMIT_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    RATE_LIMIT_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    RATE_LIMIT_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    RATE_LIMIT_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    CACHE_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    CACHE_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    CACHE_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    CACHE_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    CACHE_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    CACHE_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    CACHE_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    CACHE_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    REALTIME_STREAMS_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    REALTIME_STREAMS_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    REALTIME_STREAMS_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    REALTIME_STREAMS_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    REALTIME_STREAMS_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    REALTIME_STREAMS_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    REALTIME_STREAMS_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    REALTIME_STREAMS_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+    REALTIME_STREAMS_INACTIVITY_TIMEOUT_MS: z.coerce.number().int().default(60000), // 1 minute
+
+    REALTIME_MAXIMUM_CREATED_AT_FILTER_AGE_IN_MS: z.coerce
+      .number()
+      .int()
+      .default(24 * 60 * 60 * 1000), // 1 day in milliseconds
+
+    PUBSUB_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    PUBSUB_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    PUBSUB_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    PUBSUB_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    PUBSUB_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    PUBSUB_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    PUBSUB_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    PUBSUB_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    DEFAULT_ENV_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(100),
+    DEFAULT_ENV_EXECUTION_CONCURRENCY_BURST_FACTOR: z.coerce.number().default(1.0),
+    DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: z.coerce.number().int().default(300),
+    DEFAULT_DEV_ENV_EXECUTION_ATTEMPTS: z.coerce.number().int().positive().default(1),
+
+    //API Rate limiting
+    /**
+     * @example "60s"
+     * @example "1m"
+     * @example "1h"
+     * @example "1d"
+     * @example "1000ms"
+     * @example "1000s"
+     */
+    API_RATE_LIMIT_REFILL_INTERVAL: z.string().default("10s"), // refill 250 tokens every 10 seconds
+    API_RATE_LIMIT_MAX: z.coerce.number().int().default(750), // allow bursts of 750 requests
+    API_RATE_LIMIT_REFILL_RATE: z.coerce.number().int().default(250), // refix 250 tokens every 10 seconds
+    API_RATE_LIMIT_REQUEST_LOGS_ENABLED: z.string().default("0"),
+    API_RATE_LIMIT_REJECTION_LOGS_ENABLED: z.string().default("1"),
+    API_RATE_LIMIT_LIMITER_LOGS_ENABLED: z.string().default("0"),
+
+    API_RATE_LIMIT_JWT_WINDOW: z.string().default("1m"),
+    API_RATE_LIMIT_JWT_TOKENS: z.coerce.number().int().default(60),
+
+    //v3
+    PROVIDER_SECRET: z.string().default("provider-secret"),
+    COORDINATOR_SECRET: z.string().default("coordinator-secret"),
+    DEPOT_TOKEN: z.string().optional(),
+    DEPOT_ORG_ID: z.string().optional(),
+    DEPOT_REGION: z.string().default("us-east-1"),
+
+    // Deployment registry (v3)
+    DEPLOY_REGISTRY_HOST: z.string().min(1),
+    DEPLOY_REGISTRY_USERNAME: z.string().optional(),
+    DEPLOY_REGISTRY_PASSWORD: z.string().optional(),
+    DEPLOY_REGISTRY_NAMESPACE: z.string().min(1).default("trigger"),
+    DEPLOY_REGISTRY_ECR_TAGS: z.string().optional(), // csv, for example: "key1=value1,key2=value2"
+    DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: z.string().optional(),
+    DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: z.string().optional(),
+
+    // Deployment registry (v4) - falls back to v3 registry if not specified
+    V4_DEPLOY_REGISTRY_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_HOST)
+      .pipe(z.string().min(1)), // Ensure final type is required string
+    V4_DEPLOY_REGISTRY_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_USERNAME),
+    V4_DEPLOY_REGISTRY_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_PASSWORD),
+    V4_DEPLOY_REGISTRY_NAMESPACE: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_NAMESPACE)
+      .pipe(z.string().min(1).default("trigger")), // Ensure final type is required string
+    V4_DEPLOY_REGISTRY_ECR_TAGS: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_ECR_TAGS),
+    V4_DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN),
+    V4_DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID),
+
+    DEPLOY_IMAGE_PLATFORM: z.string().default("linux/amd64"),
+    DEPLOY_VERSION_SUFFIX: z.string().optional(),
+    DEPLOY_IMAGE_OVERRIDE: z.string().optional(),
+    DEPLOY_TIMEOUT_MS: z.coerce
+      .number()
+      .int()
+      .default(60 * 1000 * 8), // 8 minutes
+    DEPLOY_QUEUE_TIMEOUT_MS: z.coerce
+      .number()
+      .int()
+      .default(60 * 1000 * 15), // 15 minutes
+
+    OBJECT_STORE_BASE_URL: z.string().optional(),
+    OBJECT_STORE_ACCESS_KEY_ID: z.string().optional(),
+    OBJECT_STORE_SECRET_ACCESS_KEY: z.string().optional(),
+    OBJECT_STORE_REGION: z.string().optional(),
+    OBJECT_STORE_SERVICE: z.string().default("s3"),
+
+    ARTIFACTS_OBJECT_STORE_BUCKET: z.string().optional(),
+    ARTIFACTS_OBJECT_STORE_BASE_URL: z.string().optional(),
+    ARTIFACTS_OBJECT_STORE_ACCESS_KEY_ID: z.string().optional(),
+    ARTIFACTS_OBJECT_STORE_SECRET_ACCESS_KEY: z.string().optional(),
+    ARTIFACTS_OBJECT_STORE_REGION: z.string().optional(),
+    EVENTS_BATCH_SIZE: z.coerce.number().int().default(100),
+    EVENTS_BATCH_INTERVAL: z.coerce.number().int().default(1000),
+    EVENTS_DEFAULT_LOG_RETENTION: z.coerce.number().int().default(7),
+    EVENTS_MIN_CONCURRENCY: z.coerce.number().int().default(1),
+    EVENTS_MAX_CONCURRENCY: z.coerce.number().int().default(10),
+    EVENTS_MAX_BATCH_SIZE: z.coerce.number().int().default(500),
+    EVENTS_MEMORY_PRESSURE_THRESHOLD: z.coerce.number().int().default(5000),
+    EVENTS_LOAD_SHEDDING_THRESHOLD: z.coerce.number().int().default(100000),
+    EVENTS_LOAD_SHEDDING_ENABLED: z.string().default("1"),
+    SHARED_QUEUE_CONSUMER_POOL_SIZE: z.coerce.number().int().default(10),
+    SHARED_QUEUE_CONSUMER_INTERVAL_MS: z.coerce.number().int().default(100),
+    SHARED_QUEUE_CONSUMER_NEXT_TICK_INTERVAL_MS: z.coerce.number().int().default(100),
+    SHARED_QUEUE_CONSUMER_EMIT_RESUME_DEPENDENCY_TIMEOUT_MS: z.coerce.number().int().default(1000),
+    SHARED_QUEUE_CONSUMER_RESOLVE_PAYLOADS_BATCH_SIZE: z.coerce.number().int().default(25),
+
+    MANAGED_WORKER_SECRET: z.string().default("managed-secret"),
+
+    // Development OTEL environment variables
+    DEV_OTEL_EXPORTER_OTLP_ENDPOINT: z.string().optional(),
+    DEV_OTEL_METRICS_ENDPOINT: z.string().optional(),
+    // If this is set to 1, then the below variables are used to configure the batch processor for spans and logs
+    DEV_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
+    DEV_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
+    DEV_OTEL_SPAN_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
+    DEV_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
+    DEV_OTEL_SPAN_MAX_QUEUE_SIZE: z.string().default("512"),
+    DEV_OTEL_LOG_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
+    DEV_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
+    DEV_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
+    DEV_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
+    DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS: z.string().optional(),
+    DEV_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS: z.string().optional(),
+    DEV_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS: z.string().optional(),
+
+    PROD_OTEL_BATCH_PROCESSING_ENABLED: z.string().default("0"),
+    PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
+    PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
+    PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
+    PROD_OTEL_SPAN_MAX_QUEUE_SIZE: z.string().default("512"),
+    PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE: z.string().default("64"),
+    PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS: z.string().default("200"),
+    PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS: z.string().default("30000"),
+    PROD_OTEL_LOG_MAX_QUEUE_SIZE: z.string().default("512"),
+    PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS: z.string().optional(),
+    PROD_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS: z.string().optional(),
+    PROD_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS: z.string().optional(),
+
+    TRIGGER_OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: z.string().default("1024"),
+    TRIGGER_OTEL_LOG_ATTRIBUTE_COUNT_LIMIT: z.string().default("1024"),
+    TRIGGER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT: z.string().default("131072"),
+    TRIGGER_OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT: z.string().default("131072"),
+    TRIGGER_OTEL_SPAN_EVENT_COUNT_LIMIT: z.string().default("10"),
+    TRIGGER_OTEL_LINK_COUNT_LIMIT: z.string().default("2"),
+    TRIGGER_OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT: z.string().default("10"),
+    TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT: z.string().default("10"),
+
+    CHECKPOINT_THRESHOLD_IN_MS: z.coerce.number().int().default(30000),
+
+    // Internal OTEL environment variables
+    INTERNAL_OTEL_TRACE_EXPORTER_URL: z.string().optional(),
+    INTERNAL_OTEL_TRACE_EXPORTER_AUTH_HEADERS: z.string().optional(),
+    INTERNAL_OTEL_TRACE_LOGGING_ENABLED: z.string().default("1"),
+    // this means 1/20 traces or 5% of traces will be sampled (sampled = recorded)
+    INTERNAL_OTEL_TRACE_SAMPLING_RATE: z.string().default("20"),
+    INTERNAL_OTEL_TRACE_INSTRUMENT_PRISMA_ENABLED: z.string().default("0"),
+    INTERNAL_OTEL_TRACE_DISABLED: z.string().default("0"),
+
+    INTERNAL_OTEL_LOG_EXPORTER_URL: z.string().optional(),
+    INTERNAL_OTEL_METRIC_EXPORTER_URL: z.string().optional(),
+    INTERNAL_OTEL_METRIC_EXPORTER_AUTH_HEADERS: z.string().optional(),
+    INTERNAL_OTEL_METRIC_EXPORTER_ENABLED: z.string().default("0"),
+    INTERNAL_OTEL_METRIC_EXPORTER_INTERVAL_MS: z.coerce.number().int().default(30_000),
+    INTERNAL_OTEL_HOST_METRICS_ENABLED: BoolEnv.default(true),
+    INTERNAL_OTEL_NODEJS_METRICS_ENABLED: BoolEnv.default(true),
+    INTERNAL_OTEL_ADDITIONAL_DETECTORS_ENABLED: BoolEnv.default(true),
+
+    ORG_SLACK_INTEGRATION_CLIENT_ID: z.string().optional(),
+    ORG_SLACK_INTEGRATION_CLIENT_SECRET: z.string().optional(),
+
+    /** Vercel integration OAuth credentials */
+    VERCEL_INTEGRATION_CLIENT_ID: z.string().optional(),
+    VERCEL_INTEGRATION_CLIENT_SECRET: z.string().optional(),
+    VERCEL_INTEGRATION_APP_SLUG: z.string().optional(),
+
+    /** These enable the alerts feature in v3 */
+    ALERT_EMAIL_TRANSPORT: z.enum(["resend", "smtp", "aws-ses"]).optional(),
+    ALERT_FROM_EMAIL: z.string().optional(),
+    ALERT_REPLY_TO_EMAIL: z.string().optional(),
+    ALERT_RESEND_API_KEY: z.string().optional(),
+    ALERT_SMTP_HOST: z.string().optional(),
+    ALERT_SMTP_PORT: z.coerce.number().optional(),
+    ALERT_SMTP_SECURE: BoolEnv.optional(),
+    ALERT_SMTP_USER: z.string().optional(),
+    ALERT_SMTP_PASSWORD: z.string().optional(),
+    ALERT_RATE_LIMITER_EMISSION_INTERVAL: z.coerce.number().int().default(2_500),
+    ALERT_RATE_LIMITER_BURST_TOLERANCE: z.coerce.number().int().default(10_000),
+    ALERT_RATE_LIMITER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    ALERT_RATE_LIMITER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    ALERT_RATE_LIMITER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    ALERT_RATE_LIMITER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    ALERT_RATE_LIMITER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    ALERT_RATE_LIMITER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    ALERT_RATE_LIMITER_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    ALERT_RATE_LIMITER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    LOOPS_API_KEY: z.string().optional(),
+    MARQS_DISABLE_REBALANCING: BoolEnv.default(false),
+    MARQS_VISIBILITY_TIMEOUT_MS: z.coerce
+      .number()
+      .int()
+      .default(60 * 1000 * 15),
+    MARQS_SHARED_QUEUE_LIMIT: z.coerce.number().int().default(1000),
+    MARQS_MAXIMUM_QUEUE_PER_ENV_COUNT: z.coerce.number().int().default(50),
+    MARQS_DEV_QUEUE_LIMIT: z.coerce.number().int().default(1000),
+    MARQS_MAXIMUM_NACK_COUNT: z.coerce.number().int().default(64),
+    MARQS_CONCURRENCY_LIMIT_BIAS: z.coerce.number().default(0.75),
+    MARQS_AVAILABLE_CAPACITY_BIAS: z.coerce.number().default(0.3),
+    MARQS_QUEUE_AGE_RANDOMIZATION_BIAS: z.coerce.number().default(0.25),
+    MARQS_REUSE_SNAPSHOT_COUNT: z.coerce.number().int().default(0),
+    MARQS_MAXIMUM_ENV_COUNT: z.coerce.number().int().optional(),
+    MARQS_SHARED_WORKER_QUEUE_CONSUMER_INTERVAL_MS: z.coerce.number().int().default(250),
+    MARQS_SHARED_WORKER_QUEUE_MAX_MESSAGE_COUNT: z.coerce.number().int().default(10),
+
+    MARQS_SHARED_WORKER_QUEUE_EAGER_DEQUEUE_ENABLED: z.string().default("0"),
+    MARQS_WORKER_ENABLED: z.string().default("0"),
+    MARQS_WORKER_COUNT: z.coerce.number().int().default(2),
+    MARQS_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
+    MARQS_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(5),
+    MARQS_WORKER_POLL_INTERVAL_MS: z.coerce.number().int().default(100),
+    MARQS_WORKER_IMMEDIATE_POLL_INTERVAL_MS: z.coerce.number().int().default(100),
+    MARQS_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    MARQS_SHARED_WORKER_QUEUE_COOLOFF_COUNT_THRESHOLD: z.coerce.number().int().default(10),
+    MARQS_SHARED_WORKER_QUEUE_COOLOFF_PERIOD_MS: z.coerce.number().int().default(5_000),
+
+    PROD_TASK_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
+
+    VERBOSE_GRAPHILE_LOGGING: z.string().default("false"),
+    V2_MARQS_ENABLED: z.string().default("0"),
+    V2_MARQS_CONSUMER_POOL_ENABLED: z.string().default("0"),
+    V2_MARQS_CONSUMER_POOL_SIZE: z.coerce.number().int().default(10),
+    V2_MARQS_CONSUMER_POLL_INTERVAL_MS: z.coerce.number().int().default(1000),
+    V2_MARQS_QUEUE_SELECTION_COUNT: z.coerce.number().int().default(36),
+    V2_MARQS_VISIBILITY_TIMEOUT_MS: z.coerce
+      .number()
+      .int()
+      .default(60 * 1000 * 15),
+    V2_MARQS_DEFAULT_ENV_CONCURRENCY: z.coerce.number().int().default(100),
+    V2_MARQS_VERBOSE: z.string().default("0"),
+    V3_MARQS_CONCURRENCY_MONITOR_ENABLED: z.string().default("0"),
+    V2_MARQS_CONCURRENCY_MONITOR_ENABLED: z.string().default("0"),
+    /* Usage settings */
+    USAGE_EVENT_URL: z.string().optional(),
+    PROD_USAGE_HEARTBEAT_INTERVAL_MS: z.coerce.number().int().optional(),
+
+    CENTS_PER_RUN: z.coerce.number().default(0),
+
+    EVENT_LOOP_MONITOR_ENABLED: z.string().default("1"),
+    RESOURCE_MONITOR_ENABLED: z.string().default("0"),
+    MAXIMUM_LIVE_RELOADING_EVENTS: z.coerce.number().int().default(1000),
+    MAXIMUM_TRACE_SUMMARY_VIEW_COUNT: z.coerce.number().int().default(25_000),
+    MAXIMUM_TRACE_DETAILED_SUMMARY_VIEW_COUNT: z.coerce.number().int().default(10_000),
+    TASK_PAYLOAD_OFFLOAD_THRESHOLD: z.coerce.number().int().default(524_288), // 512KB
+    BATCH_PAYLOAD_OFFLOAD_THRESHOLD: z.coerce.number().int().optional(), // Defaults to TASK_PAYLOAD_OFFLOAD_THRESHOLD if not set
+    TASK_PAYLOAD_MAXIMUM_SIZE: z.coerce.number().int().default(3_145_728), // 3MB
+    BATCH_TASK_PAYLOAD_MAXIMUM_SIZE: z.coerce.number().int().default(1_000_000), // 1MB
+    TASK_RUN_METADATA_MAXIMUM_SIZE: z.coerce.number().int().default(262_144), // 256KB
+
+    MAXIMUM_DEV_QUEUE_SIZE: z.coerce.number().int().optional(),
+    MAXIMUM_DEPLOYED_QUEUE_SIZE: z.coerce.number().int().optional(),
+    MAX_BATCH_V2_TRIGGER_ITEMS: z.coerce.number().int().default(500),
+    MAX_BATCH_AND_WAIT_V2_TRIGGER_ITEMS: z.coerce.number().int().default(500),
+
+    // 2-phase batch API settings
+    STREAMING_BATCH_MAX_ITEMS: z.coerce.number().int().default(1_000), // Max items in streaming batch
+    STREAMING_BATCH_ITEM_MAXIMUM_SIZE: z.coerce.number().int().default(3_145_728),
+    BATCH_RATE_LIMIT_REFILL_RATE: z.coerce.number().int().default(100),
+    BATCH_RATE_LIMIT_MAX: z.coerce.number().int().default(1200),
+    BATCH_RATE_LIMIT_REFILL_INTERVAL: z.string().default("10s"),
+    BATCH_CONCURRENCY_LIMIT_DEFAULT: z.coerce.number().int().default(1),
+
+    REALTIME_STREAM_VERSION: z.enum(["v1", "v2"]).default("v1"),
+    REALTIME_STREAM_MAX_LENGTH: z.coerce.number().int().default(1000),
+    REALTIME_STREAM_TTL: z.coerce
+      .number()
+      .int()
+      .default(60 * 60 * 24), // 1 day in seconds
+    BATCH_METADATA_OPERATIONS_FLUSH_INTERVAL_MS: z.coerce.number().int().default(1000),
+    BATCH_METADATA_OPERATIONS_FLUSH_ENABLED: z.string().default("1"),
+    BATCH_METADATA_OPERATIONS_FLUSH_LOGGING_ENABLED: z.string().default("1"),
+
+    // Run Engine 2.0
+    RUN_ENGINE_WORKER_COUNT: z.coerce.number().int().default(4),
+    RUN_ENGINE_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+    RUN_ENGINE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(10),
+    RUN_ENGINE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(100),
+    RUN_ENGINE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(100),
+    RUN_ENGINE_TIMEOUT_PENDING_EXECUTING: z.coerce.number().int().default(60_000),
+    RUN_ENGINE_TIMEOUT_PENDING_CANCEL: z.coerce.number().int().default(60_000),
+    RUN_ENGINE_TIMEOUT_EXECUTING: z.coerce.number().int().default(300_000), // 5 minutes
+    RUN_ENGINE_TIMEOUT_EXECUTING_WITH_WAITPOINTS: z.coerce.number().int().default(300_000), // 5 minutes
+    RUN_ENGINE_TIMEOUT_SUSPENDED: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 10),
+    RUN_ENGINE_DEBUG_WORKER_NOTIFICATIONS: BoolEnv.default(false),
+    RUN_ENGINE_PARENT_QUEUE_LIMIT: z.coerce.number().int().default(1000),
+    RUN_ENGINE_CONCURRENCY_LIMIT_BIAS: z.coerce.number().default(0.75),
+    RUN_ENGINE_AVAILABLE_CAPACITY_BIAS: z.coerce.number().default(0.3),
+    RUN_ENGINE_QUEUE_AGE_RANDOMIZATION_BIAS: z.coerce.number().default(0.25),
+    RUN_ENGINE_REUSE_SNAPSHOT_COUNT: z.coerce.number().int().default(0),
+    RUN_ENGINE_MAXIMUM_ENV_COUNT: z.coerce.number().int().optional(),
+    RUN_ENGINE_RUN_QUEUE_SHARD_COUNT: z.coerce.number().int().default(4),
+    RUN_ENGINE_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    RUN_ENGINE_RETRY_WARM_START_THRESHOLD_MS: z.coerce.number().int().default(30_000),
+    RUN_ENGINE_PROCESS_WORKER_QUEUE_DEBOUNCE_MS: z.coerce.number().int().default(200),
+    RUN_ENGINE_DEQUEUE_BLOCKING_TIMEOUT_SECONDS: z.coerce.number().int().default(10),
+    RUN_ENGINE_MASTER_QUEUE_CONSUMERS_INTERVAL_MS: z.coerce.number().int().default(1000),
+    RUN_ENGINE_MASTER_QUEUE_COOLOFF_PERIOD_MS: z.coerce.number().int().default(10_000),
+    RUN_ENGINE_MASTER_QUEUE_COOLOFF_COUNT_THRESHOLD: z.coerce.number().int().default(10),
+    RUN_ENGINE_MASTER_QUEUE_CONSUMER_DEQUEUE_COUNT: z.coerce.number().int().default(10),
+    RUN_ENGINE_CONCURRENCY_SWEEPER_SCAN_SCHEDULE: z.string().optional(),
+    RUN_ENGINE_CONCURRENCY_SWEEPER_PROCESS_MARKED_SCHEDULE: z.string().optional(),
+    RUN_ENGINE_CONCURRENCY_SWEEPER_SCAN_JITTER_IN_MS: z.coerce.number().int().optional(),
+    RUN_ENGINE_CONCURRENCY_SWEEPER_PROCESS_MARKED_JITTER_IN_MS: z.coerce.number().int().optional(),
+
+    RUN_ENGINE_RUN_LOCK_DURATION: z.coerce.number().int().default(5000),
+    RUN_ENGINE_RUN_LOCK_AUTOMATIC_EXTENSION_THRESHOLD: z.coerce.number().int().default(1000),
+    RUN_ENGINE_RUN_LOCK_MAX_RETRIES: z.coerce.number().int().default(10),
+    RUN_ENGINE_RUN_LOCK_BASE_DELAY: z.coerce.number().int().default(100),
+    RUN_ENGINE_RUN_LOCK_MAX_DELAY: z.coerce.number().int().default(3000),
+    RUN_ENGINE_RUN_LOCK_BACKOFF_MULTIPLIER: z.coerce.number().default(1.8),
+    RUN_ENGINE_RUN_LOCK_JITTER_FACTOR: z.coerce.number().default(0.15),
+    RUN_ENGINE_RUN_LOCK_MAX_TOTAL_WAIT_TIME: z.coerce.number().int().default(15000),
+
+    RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_MAX_COUNT: z.coerce.number().int().default(12),
+    RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_MAX_DELAY_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 60 * 6),
+    RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_INITIAL_DELAY_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000),
+    RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_FACTOR: z.coerce.number().default(2),
+
+    /** Maximum duration in milliseconds that a run can be debounced. Default: 1 hour (3,600,000ms) */
+    RUN_ENGINE_MAXIMUM_DEBOUNCE_DURATION_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 60), // 1 hour
+
+    RUN_ENGINE_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    RUN_ENGINE_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    RUN_ENGINE_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    RUN_ENGINE_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    RUN_ENGINE_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    RUN_ENGINE_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    RUN_ENGINE_WORKER_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+
+    RUN_ENGINE_RUN_QUEUE_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    RUN_ENGINE_RUN_QUEUE_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    RUN_ENGINE_RUN_QUEUE_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    RUN_ENGINE_RUN_QUEUE_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    RUN_ENGINE_RUN_QUEUE_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    RUN_ENGINE_RUN_QUEUE_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    RUN_ENGINE_RUN_QUEUE_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+
+    RUN_ENGINE_RUN_LOCK_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    RUN_ENGINE_RUN_LOCK_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    RUN_ENGINE_RUN_LOCK_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    RUN_ENGINE_RUN_LOCK_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    RUN_ENGINE_RUN_LOCK_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    RUN_ENGINE_RUN_LOCK_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    RUN_ENGINE_RUN_LOCK_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+
+    RUN_ENGINE_DEV_PRESENCE_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    RUN_ENGINE_DEV_PRESENCE_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    RUN_ENGINE_DEV_PRESENCE_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    RUN_ENGINE_DEV_PRESENCE_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    RUN_ENGINE_DEV_PRESENCE_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    RUN_ENGINE_DEV_PRESENCE_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    RUN_ENGINE_DEV_PRESENCE_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+
+    //API Rate limiting
+    /**
+     * @example "60s"
+     * @example "1m"
+     * @example "1h"
+     * @example "1d"
+     * @example "1000ms"
+     * @example "1000s"
+     */
+    RUN_ENGINE_RATE_LIMIT_REFILL_INTERVAL: z.string().default("10s"), // refill 250 tokens every 10 seconds
+    RUN_ENGINE_RATE_LIMIT_MAX: z.coerce.number().int().default(1200), // allow bursts of 750 requests
+    RUN_ENGINE_RATE_LIMIT_REFILL_RATE: z.coerce.number().int().default(400), // refix 250 tokens every 10 seconds
+    RUN_ENGINE_RATE_LIMIT_REQUEST_LOGS_ENABLED: z.string().default("0"),
+    RUN_ENGINE_RATE_LIMIT_REJECTION_LOGS_ENABLED: z.string().default("1"),
+    RUN_ENGINE_RATE_LIMIT_LIMITER_LOGS_ENABLED: z.string().default("0"),
+
+    RUN_ENGINE_RELEASE_CONCURRENCY_ENABLED: z.string().default("0"),
+    RUN_ENGINE_RELEASE_CONCURRENCY_DISABLE_CONSUMERS: z.string().default("0"),
+    RUN_ENGINE_RELEASE_CONCURRENCY_MAX_TOKENS_RATIO: z.coerce.number().default(1),
+    RUN_ENGINE_RELEASE_CONCURRENCY_RELEASINGS_MAX_AGE: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 30),
+    RUN_ENGINE_RELEASE_CONCURRENCY_RELEASINGS_POLL_INTERVAL: z.coerce
+      .number()
+      .int()
+      .default(60_000),
+    RUN_ENGINE_RELEASE_CONCURRENCY_MAX_RETRIES: z.coerce.number().int().default(3),
+    RUN_ENGINE_RELEASE_CONCURRENCY_CONSUMERS_COUNT: z.coerce.number().int().default(1),
+    RUN_ENGINE_RELEASE_CONCURRENCY_POLL_INTERVAL: z.coerce.number().int().default(500),
+    RUN_ENGINE_RELEASE_CONCURRENCY_BATCH_SIZE: z.coerce.number().int().default(10),
+
+    RUN_ENGINE_WORKER_ENABLED: z.string().default("1"),
+    RUN_ENGINE_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+    RUN_ENGINE_RUN_QUEUE_LOG_LEVEL: z
+      .enum(["log", "error", "warn", "info", "debug"])
+      .default("info"),
+    RUN_ENGINE_TREAT_PRODUCTION_EXECUTION_STALLS_AS_OOM: z.string().default("0"),
+
+    /** How long should the presence ttl last */
+    DEV_PRESENCE_SSE_TIMEOUT: z.coerce.number().int().default(30_000),
+    DEV_PRESENCE_TTL_MS: z.coerce.number().int().default(5_000),
+    DEV_PRESENCE_POLL_MS: z.coerce.number().int().default(1_000),
+    /** How many ms to wait until dequeuing again, if there was a run last time */
+    DEV_DEQUEUE_INTERVAL_WITH_RUN: z.coerce.number().int().default(250),
+    /** How many ms to wait until dequeuing again, if there was no run last time */
+    DEV_DEQUEUE_INTERVAL_WITHOUT_RUN: z.coerce.number().int().default(1_000),
+    /** The max number of runs per API call that we'll dequeue in DEV */
+    DEV_DEQUEUE_MAX_RUNS_PER_PULL: z.coerce.number().int().default(10),
+
+    /** The maximum concurrent local run processes executing at once in dev. This is a hard limit */
+    DEV_MAX_CONCURRENT_RUNS: z.coerce.number().int().optional(),
+
+    /** The CLI should connect to this for dev runs */
+    DEV_ENGINE_URL: z.string().default(process.env.APP_ORIGIN ?? "http://localhost:3030"),
+
+    LEGACY_RUN_ENGINE_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
+    LEGACY_RUN_ENGINE_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
+    LEGACY_RUN_ENGINE_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(1),
+    LEGACY_RUN_ENGINE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    LEGACY_RUN_ENGINE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
+    LEGACY_RUN_ENGINE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
+    LEGACY_RUN_ENGINE_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    LEGACY_RUN_ENGINE_WORKER_LOG_LEVEL: z
+      .enum(["log", "error", "warn", "info", "debug"])
+      .default("info"),
+
+    LEGACY_RUN_ENGINE_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    LEGACY_RUN_ENGINE_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE: z.coerce.number().int().default(100),
+    LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_STAGGER_MS: z.coerce.number().int().default(1_000),
+
+    COMMON_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
+    COMMON_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
+    COMMON_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+    COMMON_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    COMMON_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
+    COMMON_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
+    COMMON_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    COMMON_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+
+    COMMON_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    COMMON_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    COMMON_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    COMMON_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    COMMON_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    COMMON_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    COMMON_WORKER_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    COMMON_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    BATCH_TRIGGER_PROCESS_JOB_VISIBILITY_TIMEOUT_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 5), // 5 minutes
+
+    BATCH_TRIGGER_CACHED_RUNS_CHECK_ENABLED: BoolEnv.default(false),
+
+    BATCH_TRIGGER_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
+    BATCH_TRIGGER_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
+    BATCH_TRIGGER_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+    BATCH_TRIGGER_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    BATCH_TRIGGER_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
+    BATCH_TRIGGER_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(20),
+    BATCH_TRIGGER_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    BATCH_TRIGGER_WORKER_LOG_LEVEL: z
+      .enum(["log", "error", "warn", "info", "debug"])
+      .default("info"),
+
+    BATCH_TRIGGER_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    BATCH_TRIGGER_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    BATCH_TRIGGER_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    BATCH_TRIGGER_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    BATCH_TRIGGER_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    BATCH_TRIGGER_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    BATCH_TRIGGER_WORKER_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    BATCH_TRIGGER_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    // BatchQueue DRR settings (Run Engine v2)
+    BATCH_QUEUE_DRR_QUANTUM: z.coerce.number().int().default(25),
+    BATCH_QUEUE_MAX_DEFICIT: z.coerce.number().int().default(100),
+    BATCH_QUEUE_CONSUMER_COUNT: z.coerce.number().int().default(3),
+    BATCH_QUEUE_CONSUMER_INTERVAL_MS: z.coerce.number().int().default(50),
+    BATCH_QUEUE_WORKER_ENABLED: BoolEnv.default(true),
+    // Number of master queue shards for horizontal scaling
+    BATCH_QUEUE_SHARD_COUNT: z.coerce.number().int().default(1),
+    // Maximum queues to fetch from master queue per iteration
+    BATCH_QUEUE_MASTER_QUEUE_LIMIT: z.coerce.number().int().default(1000),
+    // Enable worker queue for two-stage processing (claim messages, push to worker queue, process from worker queue)
+    BATCH_QUEUE_WORKER_QUEUE_ENABLED: BoolEnv.default(true),
+    // Worker queue blocking timeout in seconds (for two-stage processing, only used when BATCH_QUEUE_WORKER_QUEUE_ENABLED is true)
+    BATCH_QUEUE_WORKER_QUEUE_TIMEOUT_SECONDS: z.coerce.number().int().default(10),
+    // Global rate limit: max items processed per second across all consumers
+    // If not set, no global rate limiting is applied
+    BATCH_QUEUE_GLOBAL_RATE_LIMIT: z.coerce.number().int().positive().optional(),
+
+    ADMIN_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
+    ADMIN_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
+    ADMIN_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+    ADMIN_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    ADMIN_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
+    ADMIN_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(20),
+    ADMIN_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    ADMIN_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+
+    ADMIN_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    ADMIN_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    ADMIN_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    ADMIN_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    ADMIN_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    ADMIN_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    ADMIN_WORKER_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    ADMIN_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    ALERTS_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
+    ALERTS_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
+    ALERTS_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+    ALERTS_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    ALERTS_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(100),
+    ALERTS_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
+    ALERTS_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(60_000),
+    ALERTS_WORKER_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+
+    ALERTS_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    ALERTS_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    ALERTS_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    ALERTS_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    ALERTS_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    ALERTS_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    ALERTS_WORKER_REDIS_TLS_DISABLED: z.string().default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    ALERTS_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    SCHEDULE_ENGINE_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+    SCHEDULE_WORKER_ENABLED: z.string().default(process.env.WORKER_ENABLED ?? "true"),
+    SCHEDULE_WORKER_CONCURRENCY_WORKERS: z.coerce.number().int().default(2),
+    SCHEDULE_WORKER_CONCURRENCY_TASKS_PER_WORKER: z.coerce.number().int().default(10),
+    SCHEDULE_WORKER_POLL_INTERVAL: z.coerce.number().int().default(1000),
+    SCHEDULE_WORKER_IMMEDIATE_POLL_INTERVAL: z.coerce.number().int().default(50),
+    SCHEDULE_WORKER_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
+    SCHEDULE_WORKER_SHUTDOWN_TIMEOUT_MS: z.coerce.number().int().default(30_000),
+    SCHEDULE_WORKER_DISTRIBUTION_WINDOW_SECONDS: z.coerce.number().int().default(30),
+
+    SCHEDULE_WORKER_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    SCHEDULE_WORKER_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    SCHEDULE_WORKER_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    SCHEDULE_WORKER_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    SCHEDULE_WORKER_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    SCHEDULE_WORKER_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    SCHEDULE_WORKER_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+    SCHEDULE_WORKER_REDIS_CLUSTER_MODE_ENABLED: z.string().default("0"),
+
+    TASK_EVENT_PARTITIONING_ENABLED: z.string().default("0"),
+    TASK_EVENT_PARTITIONED_WINDOW_IN_SECONDS: z.coerce.number().int().default(60), // 1 minute
+
+    DEPLOYMENTS_AUTORELOAD_POLL_INTERVAL_MS: z.coerce.number().int().default(5_000),
+    BULK_ACTION_AUTORELOAD_POLL_INTERVAL_MS: z.coerce.number().int().default(1_000),
+    QUEUES_AUTORELOAD_POLL_INTERVAL_MS: z.coerce.number().int().default(5_000),
+
+    SLACK_BOT_TOKEN: z.string().optional(),
+    SLACK_SIGNUP_REASON_CHANNEL_ID: z.string().optional(),
+
+    // kapa.ai
+    KAPA_AI_WEBSITE_ID: z.string().optional(),
+
+    // BetterStack
+    BETTERSTACK_API_KEY: z.string().optional(),
+    BETTERSTACK_STATUS_PAGE_ID: z.string().optional(),
+
+    RUN_REPLICATION_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    RUN_REPLICATION_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    RUN_REPLICATION_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    RUN_REPLICATION_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    RUN_REPLICATION_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    RUN_REPLICATION_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    RUN_REPLICATION_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+
+    RUN_REPLICATION_CLICKHOUSE_URL: z.string().optional(),
+    RUN_REPLICATION_ENABLED: z.string().default("0"),
+    RUN_REPLICATION_SLOT_NAME: z.string().default("task_runs_to_clickhouse_v1"),
+    RUN_REPLICATION_PUBLICATION_NAME: z.string().default("task_runs_to_clickhouse_v1_publication"),
+    RUN_REPLICATION_MAX_FLUSH_CONCURRENCY: z.coerce.number().int().default(2),
+    RUN_REPLICATION_FLUSH_INTERVAL_MS: z.coerce.number().int().default(1000),
+    RUN_REPLICATION_FLUSH_BATCH_SIZE: z.coerce.number().int().default(100),
+    RUN_REPLICATION_LEADER_LOCK_TIMEOUT_MS: z.coerce.number().int().default(30_000),
+    RUN_REPLICATION_LEADER_LOCK_EXTEND_INTERVAL_MS: z.coerce.number().int().default(10_000),
+    RUN_REPLICATION_ACK_INTERVAL_SECONDS: z.coerce.number().int().default(10),
+    RUN_REPLICATION_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+    RUN_REPLICATION_CLICKHOUSE_LOG_LEVEL: z
+      .enum(["log", "error", "warn", "info", "debug"])
+      .default("info"),
+    RUN_REPLICATION_LEADER_LOCK_ADDITIONAL_TIME_MS: z.coerce.number().int().default(10_000),
+    RUN_REPLICATION_LEADER_LOCK_RETRY_INTERVAL_MS: z.coerce.number().int().default(500),
+    RUN_REPLICATION_WAIT_FOR_ASYNC_INSERT: z.string().default("0"),
+    RUN_REPLICATION_KEEP_ALIVE_ENABLED: z.string().default("0"),
+    RUN_REPLICATION_KEEP_ALIVE_IDLE_SOCKET_TTL_MS: z.coerce.number().int().optional(),
+    RUN_REPLICATION_MAX_OPEN_CONNECTIONS: z.coerce.number().int().default(10),
+    // Retry configuration for insert operations
+    RUN_REPLICATION_INSERT_MAX_RETRIES: z.coerce.number().int().default(3),
+    RUN_REPLICATION_INSERT_BASE_DELAY_MS: z.coerce.number().int().default(100),
+    RUN_REPLICATION_INSERT_MAX_DELAY_MS: z.coerce.number().int().default(2000),
+    RUN_REPLICATION_INSERT_STRATEGY: z.enum(["insert", "insert_async"]).default("insert"),
+    RUN_REPLICATION_DISABLE_PAYLOAD_INSERT: z.string().default("0"),
+
+    // Clickhouse
+    CLICKHOUSE_URL: z.string(),
+    CLICKHOUSE_KEEP_ALIVE_ENABLED: z.string().default("1"),
+    CLICKHOUSE_KEEP_ALIVE_IDLE_SOCKET_TTL_MS: z.coerce.number().int().optional(),
+    CLICKHOUSE_MAX_OPEN_CONNECTIONS: z.coerce.number().int().default(10),
+    CLICKHOUSE_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+    CLICKHOUSE_COMPRESSION_REQUEST: z.string().default("1"),
+
+    // Logs Query Settings
+    CLICKHOUSE_LOGS_LIST_MAX_MEMORY_USAGE: z.coerce.number().int().default(1_000_000_000),
+    CLICKHOUSE_LOGS_LIST_MAX_BYTES_BEFORE_EXTERNAL_SORT: z.coerce
+      .number()
+      .int()
+      .default(256_000_000),
+    CLICKHOUSE_LOGS_LIST_MAX_THREADS: z.coerce.number().int().default(2),
+    CLICKHOUSE_LOGS_LIST_MAX_ROWS_TO_READ: z.coerce.number().int().default(10_000_000),
+    CLICKHOUSE_LOGS_LIST_MAX_EXECUTION_TIME: z.coerce.number().int().default(120),
+
+    // Query feature flag
+    QUERY_FEATURE_ENABLED: z.string().default("1"),
+
+    // Logs page ClickHouse URL (for logs queries)
+    LOGS_CLICKHOUSE_URL: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.CLICKHOUSE_URL),
+
+    // Query page ClickHouse limits (for TSQL queries)
+    QUERY_CLICKHOUSE_URL: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.CLICKHOUSE_URL),
+    QUERY_CLICKHOUSE_MAX_EXECUTION_TIME: z.coerce.number().int().default(10),
+    QUERY_CLICKHOUSE_MAX_MEMORY_USAGE: z.coerce.number().int().default(1_073_741_824), // 1GB in bytes
+    QUERY_CLICKHOUSE_MAX_AST_ELEMENTS: z.coerce.number().int().default(4_000_000),
+    QUERY_CLICKHOUSE_MAX_EXPANDED_AST_ELEMENTS: z.coerce.number().int().default(4_000_000),
+    QUERY_CLICKHOUSE_MAX_BYTES_BEFORE_EXTERNAL_GROUP_BY: z.coerce.number().int().default(0),
+    QUERY_CLICKHOUSE_MAX_RETURNED_ROWS: z.coerce.number().int().default(10_000),
+
+    // Query page concurrency limits
+    QUERY_DEFAULT_ORG_CONCURRENCY_LIMIT: z.coerce.number().int().default(3),
+    QUERY_GLOBAL_CONCURRENCY_LIMIT: z.coerce.number().int().default(100),
+
+    // Metric widget concurrency limits
+    METRIC_WIDGET_DEFAULT_ORG_CONCURRENCY_LIMIT: z.coerce.number().int().default(30),
+
+    EVENTS_CLICKHOUSE_URL: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.CLICKHOUSE_URL),
+    EVENTS_CLICKHOUSE_KEEP_ALIVE_ENABLED: z.string().default("1"),
+    EVENTS_CLICKHOUSE_KEEP_ALIVE_IDLE_SOCKET_TTL_MS: z.coerce.number().int().optional(),
+    EVENTS_CLICKHOUSE_MAX_OPEN_CONNECTIONS: z.coerce.number().int().default(10),
+    EVENTS_CLICKHOUSE_LOG_LEVEL: z.enum(["log", "error", "warn", "info", "debug"]).default("info"),
+    EVENTS_CLICKHOUSE_COMPRESSION_REQUEST: z.string().default("1"),
+    EVENTS_CLICKHOUSE_BATCH_SIZE: z.coerce.number().int().default(1000),
+    EVENTS_CLICKHOUSE_FLUSH_INTERVAL_MS: z.coerce.number().int().default(1000),
+    METRICS_CLICKHOUSE_BATCH_SIZE: z.coerce.number().int().default(10000),
+    METRICS_CLICKHOUSE_FLUSH_INTERVAL_MS: z.coerce.number().int().default(1000),
+    METRICS_CLICKHOUSE_MAX_CONCURRENCY: z.coerce.number().int().default(3),
+    EVENTS_CLICKHOUSE_INSERT_STRATEGY: z.enum(["insert", "insert_async"]).default("insert"),
+    EVENTS_CLICKHOUSE_WAIT_FOR_ASYNC_INSERT: z.string().default("1"),
+    EVENTS_CLICKHOUSE_ASYNC_INSERT_MAX_DATA_SIZE: z.coerce.number().int().default(10485760),
+    EVENTS_CLICKHOUSE_ASYNC_INSERT_BUSY_TIMEOUT_MS: z.coerce.number().int().default(5000),
+    EVENTS_CLICKHOUSE_START_TIME_MAX_AGE_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 5), // 5 minutes
+    EVENT_REPOSITORY_DEFAULT_STORE: z
+      .enum(["postgres", "clickhouse", "clickhouse_v2"])
+      .default("postgres"),
+    EVENT_REPOSITORY_DEBUG_LOGS_DISABLED: BoolEnv.default(false),
+    EVENTS_CLICKHOUSE_MAX_TRACE_SUMMARY_VIEW_COUNT: z.coerce.number().int().default(25_000),
+    EVENTS_CLICKHOUSE_MAX_TRACE_DETAILED_SUMMARY_VIEW_COUNT: z.coerce.number().int().default(5_000),
+    EVENTS_CLICKHOUSE_MAX_LIVE_RELOADING_SETTING: z.coerce.number().int().default(2000),
+
+    // Bootstrap
+    TRIGGER_BOOTSTRAP_ENABLED: z.string().default("0"),
+    TRIGGER_BOOTSTRAP_WORKER_GROUP_NAME: z.string().optional(),
+    TRIGGER_BOOTSTRAP_WORKER_TOKEN_PATH: z.string().optional(),
+
+    // Machine presets
+    MACHINE_PRESETS_OVERRIDE_PATH: z.string().optional(),
+
+    // CLI package tag (e.g. "latest", "v4-beta", "4.0.0") - used for setup commands
+    TRIGGER_CLI_TAG: z.string().default("latest"),
+
+    HEALTHCHECK_DATABASE_DISABLED: z.string().default("0"),
+
+    REQUEST_IDEMPOTENCY_REDIS_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_HOST),
+    REQUEST_IDEMPOTENCY_REDIS_READER_HOST: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_READER_HOST),
+    REQUEST_IDEMPOTENCY_REDIS_READER_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) =>
+          v ?? (process.env.REDIS_READER_PORT ? parseInt(process.env.REDIS_READER_PORT) : undefined)
+      ),
+    REQUEST_IDEMPOTENCY_REDIS_PORT: z.coerce
+      .number()
+      .optional()
+      .transform(
+        (v) => v ?? (process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : undefined)
+      ),
+    REQUEST_IDEMPOTENCY_REDIS_USERNAME: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_USERNAME),
+    REQUEST_IDEMPOTENCY_REDIS_PASSWORD: z
+      .string()
+      .optional()
+      .transform((v) => v ?? process.env.REDIS_PASSWORD),
+    REQUEST_IDEMPOTENCY_REDIS_TLS_DISABLED: z
+      .string()
+      .default(process.env.REDIS_TLS_DISABLED ?? "false"),
+
+    REQUEST_IDEMPOTENCY_LOG_LEVEL: z
+      .enum(["log", "error", "warn", "info", "debug"])
+      .default("info"),
+
+    REQUEST_IDEMPOTENCY_TTL_IN_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 60 * 24),
+
+    // Bulk action
+    BULK_ACTION_BATCH_SIZE: z.coerce.number().int().default(100),
+    BULK_ACTION_BATCH_DELAY_MS: z.coerce.number().int().default(200),
+    BULK_ACTION_SUBBATCH_CONCURRENCY: z.coerce.number().int().default(5),
+
+    // AI Run Filter
+    AI_RUN_FILTER_MODEL: z.string().optional(),
+
+    EVENT_LOOP_MONITOR_THRESHOLD_MS: z.coerce.number().int().default(100),
+    EVENT_LOOP_MONITOR_UTILIZATION_INTERVAL_MS: z.coerce.number().int().default(1000),
+    EVENT_LOOP_MONITOR_UTILIZATION_SAMPLE_RATE: z.coerce.number().default(0.05),
+    EVENT_LOOP_MONITOR_NOTIFY_ENABLED: z.string().default("0"),
+
+    VERY_SLOW_QUERY_THRESHOLD_MS: z.coerce.number().int().optional(),
+
+    REALTIME_STREAMS_S2_BASIN: z.string().optional(),
+    REALTIME_STREAMS_S2_ACCESS_TOKEN: z.string().optional(),
+    REALTIME_STREAMS_S2_ACCESS_TOKEN_EXPIRATION_IN_MS: z.coerce
+      .number()
+      .int()
+      .default(60_000 * 60 * 24), // 1 day
+    REALTIME_STREAMS_S2_LOG_LEVEL: z
+      .enum(["log", "error", "warn", "info", "debug"])
+      .default("info"),
+    REALTIME_STREAMS_S2_FLUSH_INTERVAL_MS: z.coerce.number().int().default(100),
+    REALTIME_STREAMS_S2_MAX_RETRIES: z.coerce.number().int().default(10),
+    REALTIME_STREAMS_S2_WAIT_SECONDS: z.coerce.number().int().default(60),
+    REALTIME_STREAMS_DEFAULT_VERSION: z.enum(["v1", "v2"]).default("v1"),
+    WAIT_UNTIL_TIMEOUT_MS: z.coerce.number().int().default(600_000),
+  })
+  .and(GithubAppEnvSchema)
+  .and(S2EnvSchema);
 
 export type Environment = z.infer<typeof EnvironmentSchema>;
 export const env = EnvironmentSchema.parse(process.env);
diff --git a/apps/webapp/app/eventLoopMonitor.server.ts b/apps/webapp/app/eventLoopMonitor.server.ts
index db25a281379..0a1b33690bb 100644
--- a/apps/webapp/app/eventLoopMonitor.server.ts
+++ b/apps/webapp/app/eventLoopMonitor.server.ts
@@ -1,10 +1,32 @@
 import { createHook } from "node:async_hooks";
 import { singleton } from "./utils/singleton";
 import { tracer } from "./v3/tracer.server";
+import { env } from "./env.server";
+import { context, Context } from "@opentelemetry/api";
+import { performance } from "node:perf_hooks";
+import { logger } from "./services/logger.server";
+import { signalsEmitter } from "./services/signals.server";
 
-const THRESHOLD_NS = 1e8; // 100ms
+const THRESHOLD_NS = env.EVENT_LOOP_MONITOR_THRESHOLD_MS * 1e6;
 
-const cache = new Map<number, { type: string; start?: [number, number] }>();
+// ANSI color codes for terminal output
+const RED = "\x1b[31m";
+const YELLOW = "\x1b[33m";
+const RESET = "\x1b[0m";
+
+function notifyEventLoopBlocked(timeMs: number, asyncType: string): void {
+  if (env.EVENT_LOOP_MONITOR_NOTIFY_ENABLED !== "1") {
+    return;
+  }
+
+  console.warn(
+    `${RED}⚠️  Event loop blocked${RESET} for ${YELLOW}${timeMs.toFixed(
+      1
+    )}ms${RESET} (${asyncType})`
+  );
+}
+
+const cache = new Map<number, { type: string; start?: [number, number]; parentCtx?: Context }>();
 
 function init(asyncId: number, type: string, triggerAsyncId: number, resource: any) {
   cache.set(asyncId, {
@@ -26,6 +48,7 @@ function before(asyncId: number) {
   cache.set(asyncId, {
     ...cached,
     start: process.hrtime(),
+    parentCtx: context.active(),
   });
 }
 
@@ -47,31 +70,74 @@ function after(asyncId: number) {
   if (diffNs > THRESHOLD_NS) {
     const time = diffNs / 1e6; // in ms
 
-    const newSpan = tracer.startSpan("event-loop-blocked", {
-      startTime: new Date(new Date().getTime() - time),
-      attributes: {
-        asyncType: cached.type,
-        label: "EventLoopMonitor",
+    const newSpan = tracer.startSpan(
+      "event-loop-blocked",
+      {
+        startTime: new Date(new Date().getTime() - time),
+        attributes: {
+          asyncType: cached.type,
+          label: "EventLoopMonitor",
+        },
       },
-    });
+      cached.parentCtx
+    );
 
     newSpan.end();
+
+    notifyEventLoopBlocked(time, cached.type);
   }
 }
 
 export const eventLoopMonitor = singleton("eventLoopMonitor", () => {
   const hook = createHook({ init, before, after, destroy });
 
+  let stopEventLoopUtilizationMonitoring: () => void;
+
   return {
     enable: () => {
       console.log("🥸  Initializing event loop monitor");
 
       hook.enable();
+
+      stopEventLoopUtilizationMonitoring = startEventLoopUtilizationMonitoring();
     },
     disable: () => {
       console.log("🥸  Disabling event loop monitor");
 
       hook.disable();
+
+      stopEventLoopUtilizationMonitoring?.();
     },
   };
 });
+
+function startEventLoopUtilizationMonitoring() {
+  let lastEventLoopUtilization = performance.eventLoopUtilization();
+
+  const interval = setInterval(() => {
+    const currentEventLoopUtilization = performance.eventLoopUtilization();
+
+    const diff = performance.eventLoopUtilization(
+      currentEventLoopUtilization,
+      lastEventLoopUtilization
+    );
+    const utilization = Number.isFinite(diff.utilization) ? diff.utilization : 0;
+
+    if (Math.random() < env.EVENT_LOOP_MONITOR_UTILIZATION_SAMPLE_RATE) {
+      logger.info("nodejs.event_loop.utilization", { utilization });
+    }
+
+    lastEventLoopUtilization = currentEventLoopUtilization;
+  }, env.EVENT_LOOP_MONITOR_UTILIZATION_INTERVAL_MS);
+
+  signalsEmitter.on("SIGTERM", () => {
+    clearInterval(interval);
+  });
+  signalsEmitter.on("SIGINT", () => {
+    clearInterval(interval);
+  });
+
+  return () => {
+    clearInterval(interval);
+  };
+}
diff --git a/apps/webapp/app/hooks/useAutoRevalidate.ts b/apps/webapp/app/hooks/useAutoRevalidate.ts
new file mode 100644
index 00000000000..4205b03bcc0
--- /dev/null
+++ b/apps/webapp/app/hooks/useAutoRevalidate.ts
@@ -0,0 +1,48 @@
+import { useRevalidator } from "@remix-run/react";
+import { useEffect } from "react";
+
+type UseAutoRevalidateOptions = {
+  interval?: number; // in milliseconds
+  onFocus?: boolean;
+  disabled?: boolean;
+};
+
+export function useAutoRevalidate(options: UseAutoRevalidateOptions = {}) {
+  const { interval = 5000, onFocus = true, disabled = false } = options;
+  const revalidator = useRevalidator();
+
+  useEffect(() => {
+    if (!interval || interval <= 0 || disabled) return;
+
+    const intervalId = setInterval(() => {
+      if (revalidator.state === "loading") {
+        return;
+      }
+      revalidator.revalidate();
+    }, interval);
+
+    return () => clearInterval(intervalId);
+  }, [interval, disabled]);
+
+  useEffect(() => {
+    if (!onFocus || disabled) return;
+
+    const handleFocus = () => {
+      if (document.visibilityState === "visible" && revalidator.state !== "loading") {
+        revalidator.revalidate();
+      }
+    };
+
+    // Revalidate when the page becomes visible
+    document.addEventListener("visibilitychange", handleFocus);
+    // Revalidate when the window gains focus
+    window.addEventListener("focus", handleFocus);
+
+    return () => {
+      document.removeEventListener("visibilitychange", handleFocus);
+      window.removeEventListener("focus", handleFocus);
+    };
+  }, [onFocus, disabled]);
+
+  return revalidator;
+}
diff --git a/apps/webapp/app/hooks/useCanViewLogsPage.ts b/apps/webapp/app/hooks/useCanViewLogsPage.ts
new file mode 100644
index 00000000000..3eb36b0641b
--- /dev/null
+++ b/apps/webapp/app/hooks/useCanViewLogsPage.ts
@@ -0,0 +1,16 @@
+import { useEffect } from "react";
+import { useTypedFetcher } from "remix-typedjson";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { type loader as canViewLogsPageLoader } from "~/routes/resources.orgs.$organizationSlug.can-view-logs-page/route";
+
+export function useCanViewLogsPage(): boolean | undefined {
+  const organization = useOrganization();
+  const fetcher = useTypedFetcher<typeof canViewLogsPageLoader>();
+
+  useEffect(() => {
+    const url = `/resources/orgs/${organization.slug}/can-view-logs-page`;
+    fetcher.load(url);
+  }, [organization.slug]);
+
+  return fetcher.data?.canViewLogsPage;
+}
diff --git a/apps/webapp/app/hooks/useDashboardEditor.ts b/apps/webapp/app/hooks/useDashboardEditor.ts
new file mode 100644
index 00000000000..65b2ccca6bb
--- /dev/null
+++ b/apps/webapp/app/hooks/useDashboardEditor.ts
@@ -0,0 +1,515 @@
+import { useReducer, useCallback, useRef, useEffect } from "react";
+import { nanoid } from "nanoid";
+import type {
+  DashboardLayout,
+  LayoutItem,
+  Widget,
+} from "~/presenters/v3/MetricDashboardPresenter.server";
+import type { WidgetData, QueryWidgetConfig } from "~/components/metrics/QueryWidget";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+type EditorMode =
+  | null
+  | { type: "add" }
+  | { type: "edit"; widgetId: string; widget: WidgetData };
+
+type DashboardState = {
+  /** The layout items (positions/sizes) */
+  layout: LayoutItem[];
+  /** The widget configurations keyed by widget ID */
+  widgets: Record<string, Widget>;
+  /** Current editor mode (add/edit/closed) */
+  editorMode: EditorMode;
+};
+
+// ============================================================================
+// Actions
+// ============================================================================
+
+type DashboardAction =
+  | { type: "ADD_WIDGET"; payload: { id: string; widget: Widget; layoutItem: LayoutItem } }
+  | { type: "UPDATE_WIDGET"; payload: { id: string; widget: Widget } }
+  | { type: "RENAME_WIDGET"; payload: { id: string; title: string } }
+  | { type: "DELETE_WIDGET"; payload: { id: string } }
+  | { type: "DUPLICATE_WIDGET"; payload: { id: string; newId: string } }
+  | { type: "UPDATE_LAYOUT"; payload: { layout: LayoutItem[] } }
+  | { type: "RESET_STATE"; payload: { layout: LayoutItem[]; widgets: Record<string, Widget> } }
+  | { type: "OPEN_ADD_EDITOR" }
+  | { type: "OPEN_EDIT_EDITOR"; payload: { widgetId: string; widget: WidgetData } }
+  | { type: "CLOSE_EDITOR" };
+
+// ============================================================================
+// Reducer
+// ============================================================================
+
+function dashboardReducer(state: DashboardState, action: DashboardAction): DashboardState {
+  switch (action.type) {
+    case "ADD_WIDGET":
+      return {
+        ...state,
+        layout: [...state.layout, action.payload.layoutItem],
+        widgets: {
+          ...state.widgets,
+          [action.payload.id]: action.payload.widget,
+        },
+        editorMode: null,
+      };
+
+    case "UPDATE_WIDGET":
+      return {
+        ...state,
+        widgets: {
+          ...state.widgets,
+          [action.payload.id]: action.payload.widget,
+        },
+        editorMode: null,
+      };
+
+    case "RENAME_WIDGET": {
+      const existingWidget = state.widgets[action.payload.id];
+      if (!existingWidget) return state;
+      return {
+        ...state,
+        widgets: {
+          ...state.widgets,
+          [action.payload.id]: {
+            ...existingWidget,
+            title: action.payload.title,
+          },
+        },
+      };
+    }
+
+    case "DELETE_WIDGET": {
+      const { [action.payload.id]: _, ...remainingWidgets } = state.widgets;
+      return {
+        ...state,
+        layout: state.layout.filter((item) => item.i !== action.payload.id),
+        widgets: remainingWidgets,
+      };
+    }
+
+    case "DUPLICATE_WIDGET": {
+      const original = state.widgets[action.payload.id];
+      const originalLayout = state.layout.find((l) => l.i === action.payload.id);
+      if (!original || !originalLayout) return state;
+
+      const maxBottom = Math.max(0, ...state.layout.map((l) => l.y + l.h));
+
+      // Deep copy the widget to ensure no shared references
+      // This prevents edits to one widget from affecting the duplicate
+      const duplicatedWidget: Widget = {
+        title: `${original.title} (Copy)`,
+        query: original.query,
+        display: JSON.parse(JSON.stringify(original.display)) as QueryWidgetConfig,
+      };
+
+      return {
+        ...state,
+        layout: [
+          ...state.layout,
+          { ...originalLayout, i: action.payload.newId, y: maxBottom, x: 0 },
+        ],
+        widgets: {
+          ...state.widgets,
+          [action.payload.newId]: duplicatedWidget,
+        },
+      };
+    }
+
+    case "UPDATE_LAYOUT":
+      return { ...state, layout: action.payload.layout };
+
+    case "RESET_STATE":
+      return {
+        ...state,
+        layout: action.payload.layout,
+        widgets: action.payload.widgets,
+      };
+
+    case "OPEN_ADD_EDITOR":
+      return { ...state, editorMode: { type: "add" } };
+
+    case "OPEN_EDIT_EDITOR":
+      return {
+        ...state,
+        editorMode: { type: "edit", widgetId: action.payload.widgetId, widget: action.payload.widget },
+      };
+
+    case "CLOSE_EDITOR":
+      return { ...state, editorMode: null };
+
+    default:
+      return state;
+  }
+}
+
+// ============================================================================
+// Hook Options
+// ============================================================================
+
+export type UseDashboardEditorOptions = {
+  /** Initial dashboard layout data from the server */
+  initialData: DashboardLayout;
+  /** URL for widget actions (add, update, delete, duplicate) */
+  widgetActionUrl: string;
+  /** URL for layout updates. If empty or not provided, uses current page URL. */
+  layoutActionUrl?: string;
+  /** Maximum number of widgets allowed per dashboard. If not provided, no limit is enforced. */
+  widgetLimit?: number;
+  /** Callback when a sync error occurs */
+  onSyncError?: (error: Error, action: string) => void;
+  /** Callback when a widget action is blocked by the limit */
+  onWidgetLimitReached?: () => void;
+};
+
+// ============================================================================
+// Sync Queue Types
+// ============================================================================
+
+type WidgetSyncTask = {
+  type: "widget";
+  action: string;
+  data: Record<string, string>;
+};
+
+type LayoutSyncTask = {
+  type: "layout";
+  layout: LayoutItem[];
+};
+
+type SyncTask = WidgetSyncTask | LayoutSyncTask;
+
+// ============================================================================
+// Hook
+// ============================================================================
+
+export function useDashboardEditor({
+  initialData,
+  widgetActionUrl,
+  layoutActionUrl,
+  widgetLimit,
+  onSyncError,
+  onWidgetLimitReached,
+}: UseDashboardEditorOptions) {
+  const [state, dispatch] = useReducer(dashboardReducer, {
+    layout: initialData.layout,
+    widgets: initialData.widgets,
+    editorMode: null,
+  });
+
+  // Refs for debouncing and tracking initialization
+  const layoutDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const isInitializedRef = useRef(false);
+  const currentLayoutJsonRef = useRef<string>(JSON.stringify(initialData.layout));
+
+  // Sync queue to prevent race conditions
+  const syncQueueRef = useRef<SyncTask[]>([]);
+  const isSyncingRef = useRef(false);
+
+  // Reset state when initialData changes (e.g., navigating to different dashboard)
+  const initialDataJson = JSON.stringify({ layout: initialData.layout, widgets: initialData.widgets });
+  useEffect(() => {
+    // Cancel any pending layout save
+    if (layoutDebounceRef.current) {
+      clearTimeout(layoutDebounceRef.current);
+      layoutDebounceRef.current = null;
+    }
+
+    // Clear the sync queue when switching dashboards
+    syncQueueRef.current = [];
+
+    // Reset state to new initial data
+    dispatch({
+      type: "RESET_STATE",
+      payload: { layout: initialData.layout, widgets: initialData.widgets },
+    });
+
+    // Update refs
+    currentLayoutJsonRef.current = JSON.stringify(initialData.layout);
+    isInitializedRef.current = false;
+
+    // Allow saves after a short delay to skip initial mount callbacks
+    const initTimeout = setTimeout(() => {
+      isInitializedRef.current = true;
+    }, 100);
+
+    return () => {
+      clearTimeout(initTimeout);
+      if (layoutDebounceRef.current) {
+        clearTimeout(layoutDebounceRef.current);
+      }
+    };
+  }, [initialDataJson]);
+
+  // -------------------------------------------------------------------------
+  // Sync queue processor - ensures only one sync runs at a time
+  // -------------------------------------------------------------------------
+
+  const processNextSync = useCallback(async () => {
+    // If already syncing or queue is empty, do nothing
+    if (isSyncingRef.current || syncQueueRef.current.length === 0) {
+      return;
+    }
+
+    isSyncingRef.current = true;
+    const task = syncQueueRef.current.shift()!;
+
+    try {
+      if (task.type === "widget") {
+        const formData = new FormData();
+        formData.set("action", task.action);
+        Object.entries(task.data).forEach(([k, v]) => formData.set(k, v));
+
+        const response = await fetch(widgetActionUrl, {
+          method: "POST",
+          body: formData,
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error(`Failed to ${task.action} widget: ${errorText}`);
+        }
+      } else if (task.type === "layout") {
+        const formData = new FormData();
+        formData.set("action", "layout");
+        formData.set("layout", JSON.stringify(task.layout));
+
+        // Use current page URL if layoutActionUrl is not provided
+        const url = layoutActionUrl || window.location.pathname;
+
+        const response = await fetch(url, {
+          method: "POST",
+          body: formData,
+        });
+
+        if (!response.ok) {
+          const errorText = await response.text();
+          throw new Error("Failed to update layout: " + errorText);
+        }
+      }
+    } catch (error) {
+      console.error(`Dashboard sync error:`, error);
+      const actionName = task.type === "widget" ? task.action : "layout";
+      onSyncError?.(error instanceof Error ? error : new Error(String(error)), actionName);
+    } finally {
+      isSyncingRef.current = false;
+      // Process next item in queue
+      processNextSync();
+    }
+  }, [widgetActionUrl, layoutActionUrl, onSyncError]);
+
+  // -------------------------------------------------------------------------
+  // Queue helpers
+  // -------------------------------------------------------------------------
+
+  const queueWidgetSync = useCallback(
+    (action: string, data: Record<string, string>) => {
+      syncQueueRef.current.push({ type: "widget", action, data });
+      processNextSync();
+    },
+    [processNextSync]
+  );
+
+  const queueLayoutSync = useCallback(
+    (layout: LayoutItem[]) => {
+      // For layout syncs, we only care about the latest state
+      // Remove any pending layout syncs and add the new one
+      syncQueueRef.current = syncQueueRef.current.filter((task) => task.type !== "layout");
+      syncQueueRef.current.push({ type: "layout", layout });
+      processNextSync();
+    },
+    [processNextSync]
+  );
+
+  // -------------------------------------------------------------------------
+  // Action handlers
+  // -------------------------------------------------------------------------
+
+  // Count only non-title widgets for limit checks (title widgets are free)
+  const countedWidgets = Object.values(state.widgets).filter(
+    (w) => w.display.type !== "title"
+  ).length;
+
+  const addWidget = useCallback(
+    (title: string, query: string, config: QueryWidgetConfig) => {
+      // Guard: check widget limit (title widgets don't count)
+      if (widgetLimit !== undefined && countedWidgets >= widgetLimit) {
+        onWidgetLimitReached?.();
+        return;
+      }
+
+      const id = nanoid(8);
+      const maxBottom = Math.max(0, ...state.layout.map((l) => l.y + l.h));
+      const layoutItem: LayoutItem = { i: id, x: 0, y: maxBottom, w: 12, h: 15 };
+      const widget: Widget = { title, query, display: config };
+
+      // Update local state immediately
+      dispatch({ type: "ADD_WIDGET", payload: { id, widget, layoutItem } });
+
+      // Queue sync to server (processed sequentially)
+      // Send the client-generated ID so the server uses the same ID
+      queueWidgetSync("add", {
+        widgetId: id,
+        title,
+        query,
+        config: JSON.stringify(config),
+      });
+    },
+    [state.layout, countedWidgets, widgetLimit, onWidgetLimitReached, queueWidgetSync]
+  );
+
+  const addTitleWidget = useCallback(
+    (title: string) => {
+      const id = nanoid(8);
+      const maxBottom = Math.max(0, ...state.layout.map((l) => l.y + l.h));
+      // Title widgets are fixed at h=2 and full width
+      const layoutItem: LayoutItem = { i: id, x: 0, y: maxBottom, w: 12, h: 2 };
+      const config: QueryWidgetConfig = { type: "title" };
+      const widget: Widget = { title, query: "", display: config };
+
+      // Update local state immediately
+      dispatch({ type: "ADD_WIDGET", payload: { id, widget, layoutItem } });
+
+      // Queue sync to server (processed sequentially)
+      // Send the client-generated ID so the server uses the same ID
+      queueWidgetSync("add", {
+        widgetId: id,
+        title,
+        query: "",
+        config: JSON.stringify(config),
+      });
+    },
+    [state.layout, queueWidgetSync]
+  );
+
+  const updateWidget = useCallback(
+    (widgetId: string, title: string, query: string, config: QueryWidgetConfig) => {
+      const widget: Widget = { title, query, display: config };
+
+      // Update local state immediately
+      dispatch({ type: "UPDATE_WIDGET", payload: { id: widgetId, widget } });
+
+      // Queue sync to server (processed sequentially)
+      queueWidgetSync("update", {
+        widgetId,
+        title,
+        query,
+        config: JSON.stringify(config),
+      });
+    },
+    [queueWidgetSync]
+  );
+
+  const deleteWidget = useCallback(
+    (widgetId: string) => {
+      // Update local state immediately
+      dispatch({ type: "DELETE_WIDGET", payload: { id: widgetId } });
+
+      // Queue sync to server (processed sequentially)
+      queueWidgetSync("delete", { widgetId });
+    },
+    [queueWidgetSync]
+  );
+
+  const duplicateWidget = useCallback(
+    (widgetId: string) => {
+      // Guard: check widget limit (title widgets don't count)
+      if (widgetLimit !== undefined && countedWidgets >= widgetLimit) {
+        onWidgetLimitReached?.();
+        return;
+      }
+
+      const newId = nanoid(8);
+
+      // Update local state immediately
+      dispatch({ type: "DUPLICATE_WIDGET", payload: { id: widgetId, newId } });
+
+      // Queue sync to server (processed sequentially)
+      // Send the client-generated newId so the server uses the same ID for the duplicate
+      queueWidgetSync("duplicate", { widgetId, newId });
+    },
+    [countedWidgets, widgetLimit, onWidgetLimitReached, queueWidgetSync]
+  );
+
+  const renameWidget = useCallback(
+    (widgetId: string, title: string) => {
+      // Update local state immediately
+      dispatch({ type: "RENAME_WIDGET", payload: { id: widgetId, title } });
+
+      // Queue sync to server (processed sequentially)
+      queueWidgetSync("rename", { widgetId, title });
+    },
+    [queueWidgetSync]
+  );
+
+  const updateLayout = useCallback(
+    (newLayout: LayoutItem[]) => {
+      // Skip if not yet initialized (prevents saving during mount/navigation)
+      if (!isInitializedRef.current) {
+        return;
+      }
+
+      const newLayoutJson = JSON.stringify(newLayout);
+
+      // Skip if layout hasn't actually changed
+      if (newLayoutJson === currentLayoutJsonRef.current) {
+        return;
+      }
+
+      // Update local state immediately
+      dispatch({ type: "UPDATE_LAYOUT", payload: { layout: newLayout } });
+
+      // Clear existing debounce timeout
+      if (layoutDebounceRef.current) {
+        clearTimeout(layoutDebounceRef.current);
+      }
+
+      // Debounce before queueing - this ensures rapid layout changes
+      // (like dragging) don't queue up many requests
+      layoutDebounceRef.current = setTimeout(() => {
+        currentLayoutJsonRef.current = newLayoutJson;
+        // Queue layout sync (replaces any pending layout sync in queue)
+        queueLayoutSync(newLayout);
+      }, 500);
+    },
+    [queueLayoutSync]
+  );
+
+  const openAddEditor = useCallback(() => {
+    dispatch({ type: "OPEN_ADD_EDITOR" });
+  }, []);
+
+  const openEditEditor = useCallback((widgetId: string, widget: WidgetData) => {
+    dispatch({ type: "OPEN_EDIT_EDITOR", payload: { widgetId, widget } });
+  }, []);
+
+  const closeEditor = useCallback(() => {
+    dispatch({ type: "CLOSE_EDITOR" });
+  }, []);
+
+  // -------------------------------------------------------------------------
+  // Return value
+  // -------------------------------------------------------------------------
+
+  return {
+    /** Current dashboard state */
+    state,
+    /** Action dispatchers */
+    actions: {
+      addWidget,
+      addTitleWidget,
+      updateWidget,
+      renameWidget,
+      deleteWidget,
+      duplicateWidget,
+      updateLayout,
+      openAddEditor,
+      openEditEditor,
+      closeEditor,
+    },
+  };
+}
diff --git a/apps/webapp/app/hooks/useElementVisibility.ts b/apps/webapp/app/hooks/useElementVisibility.ts
new file mode 100644
index 00000000000..3e01cb99c26
--- /dev/null
+++ b/apps/webapp/app/hooks/useElementVisibility.ts
@@ -0,0 +1,35 @@
+import { useEffect, useRef } from "react";
+
+type UseElementVisibilityOptions = {
+  onVisibilityChange?: (isVisible: boolean) => void;
+};
+
+export function useElementVisibility({
+  onVisibilityChange,
+}: UseElementVisibilityOptions = {}) {
+  const ref = useRef<HTMLDivElement>(null);
+  const isVisibleRef = useRef(false);
+  const callbackRef = useRef(onVisibilityChange);
+  callbackRef.current = onVisibilityChange;
+
+  useEffect(() => {
+    const el = ref.current;
+    if (!el) return;
+
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        const nowVisible = entry.isIntersecting;
+        if (isVisibleRef.current !== nowVisible) {
+          isVisibleRef.current = nowVisible;
+          callbackRef.current?.(nowVisible);
+        }
+      },
+      { threshold: 0 }
+    );
+
+    observer.observe(el);
+    return () => observer.disconnect();
+  }, []);
+
+  return { ref, isVisibleRef };
+}
diff --git a/apps/webapp/app/hooks/useFeatureFlags.ts b/apps/webapp/app/hooks/useFeatureFlags.ts
new file mode 100644
index 00000000000..ea8bde1b26c
--- /dev/null
+++ b/apps/webapp/app/hooks/useFeatureFlags.ts
@@ -0,0 +1,11 @@
+import { type UIMatch } from "@remix-run/react";
+import { useOptionalOrganization } from "./useOrganizations";
+
+/**
+ * Hook to access organization-level feature flags.
+ * Returns the feature flags from the current organization, or an empty object if no organization is found.
+ */
+export function useFeatureFlags(matches?: UIMatch[]) {
+  const org = useOptionalOrganization(matches);
+  return org?.featureFlags ?? {};
+}
diff --git a/apps/webapp/app/hooks/useInterval.ts b/apps/webapp/app/hooks/useInterval.ts
new file mode 100644
index 00000000000..4d5413e977e
--- /dev/null
+++ b/apps/webapp/app/hooks/useInterval.ts
@@ -0,0 +1,63 @@
+import { useEffect, useRef } from "react";
+
+type UseIntervalOptions = {
+  /** If passed, will refresh every interval MS */
+  interval?: number;
+  onLoad?: boolean;
+  onFocus?: boolean;
+  disabled?: boolean;
+  callback: () => void;
+};
+
+export function useInterval({
+  interval,
+  onLoad = true,
+  onFocus = true,
+  disabled = false,
+  callback,
+}: UseIntervalOptions) {
+  // Always keep the latest callback in a ref so the effects below
+  // never close over a stale version.
+  const latestCallback = useRef(callback);
+  useEffect(() => {
+    latestCallback.current = callback;
+  }, [callback]);
+
+  // On interval
+  useEffect(() => {
+    if (!interval || interval <= 0 || disabled) return;
+
+    const intervalId = setInterval(() => {
+      latestCallback.current();
+    }, interval);
+
+    return () => clearInterval(intervalId);
+  }, [interval, disabled]);
+
+  // On focus
+  useEffect(() => {
+    if (!onFocus || disabled) return;
+
+    const handleFocus = () => {
+      if (document.visibilityState === "visible") {
+        latestCallback.current();
+      }
+    };
+
+    // Revalidate when the page becomes visible
+    document.addEventListener("visibilitychange", handleFocus);
+    // Revalidate when the window gains focus
+    window.addEventListener("focus", handleFocus);
+
+    return () => {
+      document.removeEventListener("visibilitychange", handleFocus);
+      window.removeEventListener("focus", handleFocus);
+    };
+  }, [onFocus, disabled]);
+
+  // On load
+  useEffect(() => {
+    if (disabled || !onLoad) return;
+    latestCallback.current();
+  }, [disabled, onLoad]);
+}
diff --git a/apps/webapp/app/hooks/useOrganizations.ts b/apps/webapp/app/hooks/useOrganizations.ts
index 877605b954b..1aa81b11048 100644
--- a/apps/webapp/app/hooks/useOrganizations.ts
+++ b/apps/webapp/app/hooks/useOrganizations.ts
@@ -61,3 +61,29 @@ export function useIsImpersonating(matches?: UIMatch[]) {
   });
   return data?.isImpersonating === true;
 }
+
+export type CustomDashboard = UseDataFunctionReturn<typeof orgLoader>["customDashboards"][number];
+
+export function useCustomDashboards(matches?: UIMatch[]) {
+  const data = useTypedMatchesData<typeof orgLoader>({
+    id: "routes/_app.orgs.$organizationSlug",
+    matches,
+  });
+  return data?.customDashboards ?? [];
+}
+
+export function useDashboardLimits(matches?: UIMatch[]) {
+  const data = useTypedMatchesData<typeof orgLoader>({
+    id: "routes/_app.orgs.$organizationSlug",
+    matches,
+  });
+  return data?.dashboardLimits ?? { used: 0, limit: 3 };
+}
+
+export function useWidgetLimitPerDashboard(matches?: UIMatch[]) {
+  const data = useTypedMatchesData<typeof orgLoader>({
+    id: "routes/_app.orgs.$organizationSlug",
+    matches,
+  });
+  return data?.widgetLimitPerDashboard ?? 16;
+}
diff --git a/apps/webapp/app/hooks/usePostHog.ts b/apps/webapp/app/hooks/usePostHog.ts
index 99e2597dfe4..f52663ec014 100644
--- a/apps/webapp/app/hooks/usePostHog.ts
+++ b/apps/webapp/app/hooks/usePostHog.ts
@@ -1,6 +1,6 @@
 import { useLocation } from "@remix-run/react";
 import posthog from "posthog-js";
-import { useEffect, useRef } from "react";
+import { useCallback, useEffect, useRef } from "react";
 import { useOrganizationChanged } from "./useOrganizations";
 import { useOptionalUser, useUserChanged } from "./useUser";
 import { useProjectChanged } from "./useProject";
@@ -68,3 +68,18 @@ export const usePostHog = (apiKey?: string, logging = false, debug = false): voi
     posthog.capture("$pageview");
   }, [location, logging]);
 };
+
+export function usePostHogTracking() {
+  const capture = useCallback(
+    (eventName: string, properties?: Record<string, unknown>) => {
+      posthog.capture(eventName, properties);
+    },
+    []
+  );
+
+  const startSessionRecording = useCallback(() => {
+    posthog.startSessionRecording();
+  }, []);
+
+  return { capture, startSessionRecording };
+}
diff --git a/apps/webapp/app/hooks/useRevalidateOnParam.ts b/apps/webapp/app/hooks/useRevalidateOnParam.ts
new file mode 100644
index 00000000000..de05141d95e
--- /dev/null
+++ b/apps/webapp/app/hooks/useRevalidateOnParam.ts
@@ -0,0 +1,57 @@
+import { useEffect } from "react";
+import { useRevalidator, useSearchParams } from "@remix-run/react";
+
+type UseRevalidateOnParamOptions = {
+  /** The query param(s) that trigger revalidation */
+  param: string | string[];
+  /** Callback fired when revalidation is triggered */
+  onRevalidate?: () => void;
+};
+
+/**
+ * Hook that triggers revalidation when specific query params are present,
+ * then removes those params from the URL.
+ *
+ * Usage:
+ * ```ts
+ * // Revalidate when ?_revalidate is present
+ * useRevalidateOnParam({ param: "_revalidate" });
+ *
+ * // With callback to close a modal
+ * useRevalidateOnParam({
+ *   param: "_revalidate",
+ *   onRevalidate: () => setEditorMode(null),
+ * });
+ * ```
+ *
+ * The redirect should include the param:
+ * ```ts
+ * return redirect(`${dashboardPath}?_revalidate=${Date.now()}`);
+ * ```
+ */
+export function useRevalidateOnParam({ param, onRevalidate }: UseRevalidateOnParamOptions) {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const revalidator = useRevalidator();
+
+  const paramArray = Array.isArray(param) ? param : [param];
+
+  useEffect(() => {
+    // Check if any of the trigger params are present
+    const hasParam = paramArray.some((p) => searchParams.has(p));
+
+    if (hasParam) {
+      // Trigger revalidation
+      revalidator.revalidate();
+
+      // Call the callback if provided
+      onRevalidate?.();
+
+      // Remove the trigger params from the URL
+      const newParams = new URLSearchParams(searchParams);
+      paramArray.forEach((p) => newParams.delete(p));
+
+      // Update URL without the params (replace to avoid adding to history)
+      setSearchParams(newParams, { replace: true });
+    }
+  }, [searchParams, setSearchParams, revalidator, paramArray, onRevalidate]);
+}
diff --git a/apps/webapp/app/hooks/useSearchParam.ts b/apps/webapp/app/hooks/useSearchParam.ts
index c619312428f..2c7e456bbbb 100644
--- a/apps/webapp/app/hooks/useSearchParam.ts
+++ b/apps/webapp/app/hooks/useSearchParam.ts
@@ -33,12 +33,7 @@ export function useSearchParams() {
   const value = useCallback(
     (param: string) => {
       const search = new URLSearchParams(location.search);
-      const val = search.get(param) ?? undefined;
-      if (val === undefined) {
-        return val;
-      }
-
-      return decodeURIComponent(val);
+      return search.get(param) ?? undefined;
     },
     [location]
   );
@@ -46,8 +41,7 @@ export function useSearchParams() {
   const values = useCallback(
     (param: string) => {
       const search = new URLSearchParams(location.search);
-      const all = search.getAll(param);
-      return all.map((v) => decodeURIComponent(v));
+      return search.getAll(param);
     },
     [location]
   );
diff --git a/apps/webapp/app/hooks/useShortcutKeys.tsx b/apps/webapp/app/hooks/useShortcutKeys.tsx
index 0674b5bc0b4..319a91cad84 100644
--- a/apps/webapp/app/hooks/useShortcutKeys.tsx
+++ b/apps/webapp/app/hooks/useShortcutKeys.tsx
@@ -43,8 +43,10 @@ export function useShortcutKeys({
 
   useHotkeys(
     keys,
-    (event, hotkeysEvent) => {
-      action(event);
+    (event) => {
+      if (!event.repeat) {
+        action(event);
+      }
     },
     {
       enabled: isEnabled,
diff --git a/apps/webapp/app/hooks/useUser.ts b/apps/webapp/app/hooks/useUser.ts
index e31455cf92a..fd9938fdb9a 100644
--- a/apps/webapp/app/hooks/useUser.ts
+++ b/apps/webapp/app/hooks/useUser.ts
@@ -1,10 +1,12 @@
-import { UIMatch } from "@remix-run/react";
-import type { User } from "~/models/user.server";
-import { loader } from "~/root";
+import { type UIMatch } from "@remix-run/react";
+import type { UserWithDashboardPreferences } from "~/models/user.server";
+import { type loader } from "~/root";
 import { useChanged } from "./useChanged";
 import { useTypedMatchesData } from "./useTypedMatchData";
 import { useIsImpersonating } from "./useOrganizations";
 
+export type User = UserWithDashboardPreferences;
+
 export function useOptionalUser(matches?: UIMatch[]): User | undefined {
   const routeMatch = useTypedMatchesData<typeof loader>({
     id: "root",
diff --git a/apps/webapp/app/models/admin.server.ts b/apps/webapp/app/models/admin.server.ts
index 434bcf8ffe5..35e68f89998 100644
--- a/apps/webapp/app/models/admin.server.ts
+++ b/apps/webapp/app/models/admin.server.ts
@@ -1,16 +1,22 @@
 import { redirect } from "@remix-run/server-runtime";
 import { prisma } from "~/db.server";
+import { logger } from "~/services/logger.server";
 import { SearchParams } from "~/routes/admin._index";
 import {
   clearImpersonationId,
   commitImpersonationSession,
+  getImpersonationId,
   setImpersonationId,
 } from "~/services/impersonation.server";
 import { requireUser } from "~/services/session.server";
+import { extractClientIp } from "~/utils/extractClientIp.server";
 
 const pageSize = 20;
 
-export async function adminGetUsers(userId: string, { page, search }: SearchParams) {
+export async function adminGetUsers(
+  userId: string,
+  { page, search }: SearchParams,
+) {
   page = page || 1;
 
   search = search ? decodeURIComponent(search) : undefined;
@@ -212,6 +218,22 @@ export async function redirectWithImpersonation(request: Request, userId: string
     throw new Error("Unauthorized");
   }
 
+  const xff = request.headers.get("x-forwarded-for");
+  const ipAddress = extractClientIp(xff);
+
+  try {
+    await prisma.impersonationAuditLog.create({
+      data: {
+        action: "START",
+        adminId: user.id,
+        targetId: userId,
+        ipAddress,
+      },
+    });
+  } catch (error) {
+    logger.error("Failed to create impersonation audit log", { error, adminId: user.id, targetId: userId });
+  }
+
   const session = await setImpersonationId(userId, request);
 
   return redirect(path, {
@@ -220,6 +242,27 @@ export async function redirectWithImpersonation(request: Request, userId: string
 }
 
 export async function clearImpersonation(request: Request, path: string) {
+  const user = await requireUser(request);
+  const targetId = await getImpersonationId(request);
+
+  if (targetId) {
+    const xff = request.headers.get("x-forwarded-for");
+    const ipAddress = extractClientIp(xff);
+
+    try {
+      await prisma.impersonationAuditLog.create({
+        data: {
+          action: "STOP",
+          adminId: user.id,
+          targetId,
+          ipAddress,
+        },
+      });
+    } catch (error) {
+      logger.error("Failed to create impersonation audit log", { error, adminId: user.id, targetId });
+    }
+  }
+
   const session = await clearImpersonationId(request);
 
   return redirect(path, {
diff --git a/apps/webapp/app/models/member.server.ts b/apps/webapp/app/models/member.server.ts
index 86ae5d371d3..04c1df1b41f 100644
--- a/apps/webapp/app/models/member.server.ts
+++ b/apps/webapp/app/models/member.server.ts
@@ -1,5 +1,9 @@
-import { prisma } from "~/db.server";
+import { type Prisma, prisma } from "~/db.server";
 import { createEnvironment } from "./organization.server";
+import { customAlphabet } from "nanoid";
+
+const tokenValueLength = 40;
+const tokenGenerator = customAlphabet("123456789abcdefghijkmnopqrstuvwxyz", tokenValueLength);
 
 export async function getTeamMembersAndInvites({
   userId,
@@ -95,14 +99,19 @@ export async function inviteMembers({
     throw new Error("User does not have access to this organization");
   }
 
-  const created = await prisma.orgMemberInvite.createMany({
-    data: emails.map((email) => ({
-      email,
-      organizationId: org.id,
-      inviterId: userId,
-      role: "MEMBER",
-    })),
-    skipDuplicates: true,
+  const invites = [...new Set(emails)].map(
+    (email) =>
+      ({
+        email,
+        token: tokenGenerator(),
+        organizationId: org.id,
+        inviterId: userId,
+        role: "MEMBER",
+      } satisfies Prisma.OrgMemberInviteCreateManyInput)
+  );
+
+  await prisma.orgMemberInvite.createMany({
+    data: invites,
   });
 
   return await prisma.orgMemberInvite.findMany({
@@ -147,12 +156,19 @@ export async function getUsersInvites({ email }: { email: string }) {
   });
 }
 
-export async function acceptInvite({ userId, inviteId }: { userId: string; inviteId: string }) {
+export async function acceptInvite({
+  user,
+  inviteId,
+}: {
+  user: { id: string; email: string };
+  inviteId: string;
+}) {
   return await prisma.$transaction(async (tx) => {
     // 1. Delete the invite and get the invite details
     const invite = await tx.orgMemberInvite.delete({
       where: {
         id: inviteId,
+        email: user.email,
       },
       include: {
         organization: {
@@ -167,7 +183,7 @@ export async function acceptInvite({ userId, inviteId }: { userId: string; invit
     const member = await tx.orgMember.create({
       data: {
         organizationId: invite.organizationId,
-        userId,
+        userId: user.id,
         role: invite.role,
       },
     });
@@ -187,7 +203,7 @@ export async function acceptInvite({ userId, inviteId }: { userId: string; invit
     // 4. Check for other invites
     const remainingInvites = await tx.orgMemberInvite.findMany({
       where: {
-        email: invite.email,
+        email: user.email,
       },
     });
 
@@ -195,28 +211,29 @@ export async function acceptInvite({ userId, inviteId }: { userId: string; invit
   });
 }
 
-export async function declineInvite({ userId, inviteId }: { userId: string; inviteId: string }) {
+export async function declineInvite({
+  user,
+  inviteId,
+}: {
+  user: { id: string; email: string };
+  inviteId: string;
+}) {
   return await prisma.$transaction(async (tx) => {
     //1. delete invite
     const declinedInvite = await prisma.orgMemberInvite.delete({
       where: {
         id: inviteId,
+        email: user.email,
       },
       include: {
         organization: true,
       },
     });
 
-    //2. get email
-    const user = await prisma.user.findUnique({
-      where: { id: userId },
-      select: { email: true },
-    });
-
-    //3. check for other invites
+    //2. check for other invites
     const remainingInvites = await prisma.orgMemberInvite.findMany({
       where: {
-        email: user!.email,
+        email: user.email,
       },
     });
 
@@ -224,10 +241,11 @@ export async function declineInvite({ userId, inviteId }: { userId: string; invi
   });
 }
 
-export async function resendInvite({ inviteId }: { inviteId: string }) {
+export async function resendInvite({ inviteId, userId }: { inviteId: string; userId: string }) {
   return await prisma.orgMemberInvite.update({
     where: {
       id: inviteId,
+      inviterId: userId,
     },
     data: {
       updatedAt: new Date(),
@@ -241,26 +259,27 @@ export async function resendInvite({ inviteId }: { inviteId: string }) {
 
 export async function revokeInvite({
   userId,
-  slug,
+  orgSlug,
   inviteId,
 }: {
   userId: string;
-  slug: string;
+  orgSlug: string;
   inviteId: string;
 }) {
-  const org = await prisma.organization.findFirst({
-    where: { slug, members: { some: { userId } } },
-  });
-
-  if (!org) {
-    throw new Error("User does not have access to this organization");
-  }
-  const invite = await prisma.orgMemberInvite.delete({
+  const invite = await prisma.orgMemberInvite.findFirst({
     where: {
       id: inviteId,
-      organizationId: org.id,
+      organization: {
+        slug: orgSlug,
+        members: {
+          some: {
+            userId,
+          },
+        },
+      },
     },
     select: {
+      id: true,
       email: true,
       organization: true,
     },
@@ -270,5 +289,11 @@ export async function revokeInvite({
     throw new Error("Invite not found");
   }
 
+  await prisma.orgMemberInvite.delete({
+    where: {
+      id: invite.id,
+    },
+  });
+
   return { email: invite.email, organization: invite.organization };
 }
diff --git a/apps/webapp/app/models/message.server.ts b/apps/webapp/app/models/message.server.ts
index cb6ca2963a9..f19995f61c9 100644
--- a/apps/webapp/app/models/message.server.ts
+++ b/apps/webapp/app/models/message.server.ts
@@ -1,7 +1,8 @@
-import { json, Session } from "@remix-run/node";
-import { createCookieSessionStorage } from "@remix-run/node";
+import { json, createCookieSessionStorage, type Session } from "@remix-run/node";
 import { redirect, typedjson } from "remix-typedjson";
+import { ButtonVariant } from "~/components/primitives/Buttons";
 import { env } from "~/env.server";
+import { type FeedbackType } from "~/routes/resources.feedback";
 
 export type ToastMessage = {
   message: string;
@@ -9,9 +10,26 @@ export type ToastMessage = {
   options: Required<ToastMessageOptions>;
 };
 
+export type ToastMessageAction = {
+  label: string;
+  variant?: ButtonVariant;
+  action:
+    | {
+        type: "link";
+        path: string;
+      }
+    | {
+        type: "help";
+        feedbackType: FeedbackType;
+      };
+};
+
 export type ToastMessageOptions = {
+  title?: string;
   /** Ephemeral means it disappears after a delay, defaults to true */
   ephemeral?: boolean;
+  /** This display a button and make it not ephemeral, unless ephemeral is explicitlyset to false */
+  action?: ToastMessageAction;
 };
 
 const ONE_YEAR = 1000 * 60 * 60 * 24 * 365;
@@ -36,6 +54,7 @@ export function setSuccessMessage(
     message,
     type: "success",
     options: {
+      ...options,
       ephemeral: options?.ephemeral ?? true,
     },
   } as ToastMessage);
@@ -46,6 +65,7 @@ export function setErrorMessage(session: Session, message: string, options?: Toa
     message,
     type: "error",
     options: {
+      ...options,
       ephemeral: options?.ephemeral ?? true,
     },
   } as ToastMessage);
diff --git a/apps/webapp/app/models/orgIntegration.server.ts b/apps/webapp/app/models/orgIntegration.server.ts
index 343da2701d9..a69aa917671 100644
--- a/apps/webapp/app/models/orgIntegration.server.ts
+++ b/apps/webapp/app/models/orgIntegration.server.ts
@@ -47,6 +47,13 @@ export type AuthenticatableIntegration = OrganizationIntegration & {
   tokenReference: SecretReference;
 };
 
+export function isIntegrationForService<TService extends IntegrationService>(
+  integration: AuthenticatableIntegration,
+  service: TService
+): integration is OrganizationIntegrationForService<TService> {
+  return (integration.service satisfies IntegrationService) === service;
+}
+
 export class OrgIntegrationRepository {
   static async getAuthenticatedClientForIntegration<TService extends IntegrationService>(
     integration: OrganizationIntegrationForService<TService>,
@@ -89,6 +96,23 @@ export class OrgIntegrationRepository {
   static isSlackSupported =
     !!env.ORG_SLACK_INTEGRATION_CLIENT_ID && !!env.ORG_SLACK_INTEGRATION_CLIENT_SECRET;
 
+  static isVercelSupported =
+    !!env.VERCEL_INTEGRATION_CLIENT_ID && !!env.VERCEL_INTEGRATION_CLIENT_SECRET && !!env.VERCEL_INTEGRATION_APP_SLUG;
+
+  /**
+   * Generate the URL to install the Vercel integration.
+   * Users are redirected to Vercel's marketplace to complete the installation.
+   *
+   * @param state - Base64-encoded state containing org/project info for the callback
+   */
+  static vercelInstallUrl(state: string): string {
+    // The user goes to Vercel's marketplace to install the integration
+    // After installation, Vercel redirects to our callback with the authorization code
+    const redirectUri = encodeURIComponent(`${env.APP_ORIGIN}/vercel/callback`);
+    const encodedState = encodeURIComponent(state);
+    return `https://vercel.com/integrations/${env.VERCEL_INTEGRATION_APP_SLUG}/new?state=${encodedState}&redirect_uri=${redirectUri}`;
+  }
+
   static slackAuthorizationUrl(
     state: string,
     scopes: string[] = [
diff --git a/apps/webapp/app/models/organization.server.ts b/apps/webapp/app/models/organization.server.ts
index 9309e661798..66b1d5c5b20 100644
--- a/apps/webapp/app/models/organization.server.ts
+++ b/apps/webapp/app/models/organization.server.ts
@@ -12,7 +12,7 @@ import { prisma, type PrismaClientOrTransaction } from "~/db.server";
 import { env } from "~/env.server";
 import { featuresForUrl } from "~/features.server";
 import { createApiKeyForEnv, createPkApiKeyForEnv, envSlug } from "./api-key.server";
-
+import { getDefaultEnvironmentConcurrencyLimit } from "~/services/platform.v3.server";
 export type { Organization };
 
 const nanoid = customAlphabet("1234567890abcdef", 4);
@@ -66,7 +66,7 @@ export async function createOrganization(
           role: "ADMIN",
         },
       },
-      v3Enabled: !features.isManagedCloud,
+      v3Enabled: true,
     },
     include: {
       members: true,
@@ -96,6 +96,8 @@ export async function createEnvironment({
   const pkApiKey = createPkApiKeyForEnv(type);
   const shortcode = createShortcode().join("-");
 
+  const limit = await getDefaultEnvironmentConcurrencyLimit(organization.id, type);
+
   return await prismaClient.runtimeEnvironment.create({
     data: {
       slug,
@@ -103,7 +105,7 @@ export async function createEnvironment({
       pkApiKey,
       shortcode,
       autoEnableInternalSources: type !== "DEVELOPMENT",
-      maximumConcurrencyLimit: organization.maximumConcurrencyLimit / 3,
+      maximumConcurrencyLimit: limit,
       organization: {
         connect: {
           id: organization.id,
diff --git a/apps/webapp/app/models/project.server.ts b/apps/webapp/app/models/project.server.ts
index 10a2f0c02a8..2b25ad77410 100644
--- a/apps/webapp/app/models/project.server.ts
+++ b/apps/webapp/app/models/project.server.ts
@@ -1,6 +1,6 @@
 import { nanoid, customAlphabet } from "nanoid";
 import slug from "slug";
-import { prisma } from "~/db.server";
+import { $replica, prisma } from "~/db.server";
 import type { Project } from "@trigger.dev/database";
 import { Organization, createEnvironment } from "./organization.server";
 import { env } from "~/env.server";
@@ -16,12 +16,26 @@ type Options = {
   version: "v2" | "v3";
 };
 
+export class ExceededProjectLimitError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "ExceededProjectLimitError";
+  }
+}
+
 export async function createProject(
   { organizationSlug, name, userId, version }: Options,
   attemptCount = 0
 ): Promise<Project & { organization: Organization }> {
   //check the user has permissions to do this
   const organization = await prisma.organization.findFirst({
+    select: {
+      id: true,
+      slug: true,
+      v3Enabled: true,
+      maximumConcurrencyLimit: true,
+      maximumProjectCount: true,
+    },
     where: {
       slug: organizationSlug,
       members: { some: { userId } },
@@ -40,6 +54,19 @@ export async function createProject(
     }
   }
 
+  const projectCount = await prisma.project.count({
+    where: {
+      organizationId: organization.id,
+      deletedAt: null,
+    },
+  });
+
+  if (projectCount >= organization.maximumProjectCount) {
+    throw new ExceededProjectLimitError(
+      `This organization has reached the maximum number of projects (${organization.maximumProjectCount}).`
+    );
+  }
+
   //ensure the slug is globally unique
   const uniqueProjectSlug = `${slug(name)}-${nanoid(4)}`;
   const projectWithSameSlug = await prisma.project.findFirst({
@@ -108,7 +135,7 @@ export async function createProject(
 
 export async function findProjectBySlug(orgSlug: string, projectSlug: string, userId: string) {
   // Find the project scoped to the organization, making sure the user belongs to that org
-  return await prisma.project.findFirst({
+  return await $replica.project.findFirst({
     where: {
       slug: projectSlug,
       organization: {
@@ -121,7 +148,7 @@ export async function findProjectBySlug(orgSlug: string, projectSlug: string, us
 
 export async function findProjectByRef(externalRef: string, userId: string) {
   // Find the project scoped to the organization, making sure the user belongs to that org
-  return await prisma.project.findFirst({
+  return await $replica.project.findFirst({
     where: {
       externalRef,
       organization: {
diff --git a/apps/webapp/app/models/runtimeEnvironment.server.ts b/apps/webapp/app/models/runtimeEnvironment.server.ts
index adde2db5ca9..f65112b71fc 100644
--- a/apps/webapp/app/models/runtimeEnvironment.server.ts
+++ b/apps/webapp/app/models/runtimeEnvironment.server.ts
@@ -1,6 +1,6 @@
 import type { AuthenticatedEnvironment } from "@internal/run-engine";
 import type { Prisma, PrismaClientOrTransaction, RuntimeEnvironment } from "@trigger.dev/database";
-import { prisma } from "~/db.server";
+import { $replica, prisma } from "~/db.server";
 import { logger } from "~/services/logger.server";
 import { getUsername } from "~/utils/username";
 import { sanitizeBranchName } from "~/v3/gitBranch";
@@ -11,7 +11,7 @@ export async function findEnvironmentByApiKey(
   apiKey: string,
   branchName: string | undefined
 ): Promise<AuthenticatedEnvironment | null> {
-  const environment = await prisma.runtimeEnvironment.findFirst({
+  const environment = await $replica.runtimeEnvironment.findFirst({
     where: {
       apiKey,
     },
@@ -37,7 +37,7 @@ export async function findEnvironmentByApiKey(
 
   if (environment.type === "PREVIEW") {
     if (!branchName) {
-      logger.error("findEnvironmentByApiKey(): Preview env with no branch name provided", {
+      logger.warn("findEnvironmentByApiKey(): Preview env with no branch name provided", {
         environmentId: environment.id,
       });
       return null;
@@ -67,7 +67,7 @@ export async function findEnvironmentByPublicApiKey(
   apiKey: string,
   branchName: string | undefined
 ): Promise<AuthenticatedEnvironment | null> {
-  const environment = await prisma.runtimeEnvironment.findFirst({
+  const environment = await $replica.runtimeEnvironment.findFirst({
     where: {
       pkApiKey: apiKey,
     },
@@ -89,7 +89,7 @@ export async function findEnvironmentByPublicApiKey(
 export async function findEnvironmentById(
   id: string
 ): Promise<(AuthenticatedEnvironment & { parentEnvironment: { apiKey: string } | null }) | null> {
-  const environment = await prisma.runtimeEnvironment.findFirst({
+  const environment = await $replica.runtimeEnvironment.findFirst({
     where: {
       id,
     },
@@ -118,7 +118,7 @@ export async function findEnvironmentBySlug(
   envSlug: string,
   userId: string
 ): Promise<AuthenticatedEnvironment | null> {
-  return prisma.runtimeEnvironment.findFirst({
+  return $replica.runtimeEnvironment.findFirst({
     where: {
       projectId: projectId,
       slug: envSlug,
@@ -148,7 +148,7 @@ export async function findEnvironmentFromRun(
   runId: string,
   tx?: PrismaClientOrTransaction
 ): Promise<AuthenticatedEnvironment | null> {
-  const taskRun = await (tx ?? prisma).taskRun.findFirst({
+  const taskRun = await (tx ?? $replica).taskRun.findFirst({
     where: {
       id: runId,
     },
@@ -223,7 +223,7 @@ export async function disconnectSession(environmentId: string) {
 }
 
 export async function findLatestSession(environmentId: string) {
-  const session = await prisma.runtimeEnvironmentSession.findFirst({
+  const session = await $replica.runtimeEnvironmentSession.findFirst({
     where: {
       environmentId,
     },
@@ -280,7 +280,7 @@ export async function findDisplayableEnvironment(
   environmentId: string,
   userId: string | undefined
 ) {
-  const environment = await prisma.runtimeEnvironment.findFirst({
+  const environment = await $replica.runtimeEnvironment.findFirst({
     where: {
       id: environmentId,
     },
@@ -308,3 +308,26 @@ export async function findDisplayableEnvironment(
 
   return displayableEnvironment(environment, userId);
 }
+
+export async function hasAccessToEnvironment({
+  environmentId,
+  projectId,
+  organizationId,
+  userId,
+}: {
+  environmentId: string;
+  projectId: string;
+  organizationId: string;
+  userId: string;
+}): Promise<boolean> {
+  const environment = await $replica.runtimeEnvironment.findFirst({
+    where: {
+      id: environmentId,
+      projectId: projectId,
+      organizationId: organizationId,
+      organization: { members: { some: { userId } } },
+    },
+  });
+
+  return environment !== null;
+}
diff --git a/apps/webapp/app/models/schedules.server.ts b/apps/webapp/app/models/schedules.server.ts
new file mode 100644
index 00000000000..58e4d9a870c
--- /dev/null
+++ b/apps/webapp/app/models/schedules.server.ts
@@ -0,0 +1,37 @@
+import { Prisma } from "~/db.server";
+
+export function scheduleUniqWhereClause(
+  projectId: string,
+  scheduleId: string
+): Prisma.TaskScheduleWhereUniqueInput {
+  if (scheduleId.startsWith("sched_")) {
+    return {
+      friendlyId: scheduleId,
+      projectId,
+    };
+  }
+
+  return {
+    projectId_deduplicationKey: {
+      projectId,
+      deduplicationKey: scheduleId,
+    },
+  };
+}
+
+export function scheduleWhereClause(
+  projectId: string,
+  scheduleId: string
+): Prisma.TaskScheduleWhereInput {
+  if (scheduleId.startsWith("sched_")) {
+    return {
+      friendlyId: scheduleId,
+      projectId,
+    };
+  }
+
+  return {
+    projectId,
+    deduplicationKey: scheduleId,
+  };
+}
diff --git a/apps/webapp/app/models/user.server.ts b/apps/webapp/app/models/user.server.ts
index 8a381a8394b..3c5fbe16883 100644
--- a/apps/webapp/app/models/user.server.ts
+++ b/apps/webapp/app/models/user.server.ts
@@ -1,5 +1,6 @@
 import type { Prisma, User } from "@trigger.dev/database";
 import type { GitHubProfile } from "remix-auth-github";
+import type { GoogleProfile } from "remix-auth-google";
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
 import {
@@ -8,6 +9,8 @@ import {
 } from "~/services/dashboardPreferences.server";
 export type { User } from "@trigger.dev/database";
 import { assertEmailAllowed } from "~/utils/email";
+import { logger } from "~/services/logger.server";
+
 type FindOrCreateMagicLink = {
   authenticationMethod: "MAGIC_LINK";
   email: string;
@@ -20,7 +23,14 @@ type FindOrCreateGithub = {
   authenticationExtraParams: Record<string, unknown>;
 };
 
-type FindOrCreateUser = FindOrCreateMagicLink | FindOrCreateGithub;
+type FindOrCreateGoogle = {
+  authenticationMethod: "GOOGLE";
+  email: User["email"];
+  authenticationProfile: GoogleProfile;
+  authenticationExtraParams: Record<string, unknown>;
+};
+
+type FindOrCreateUser = FindOrCreateMagicLink | FindOrCreateGithub | FindOrCreateGoogle;
 
 type LoggedInUser = {
   user: User;
@@ -35,6 +45,9 @@ export async function findOrCreateUser(input: FindOrCreateUser): Promise<LoggedI
     case "MAGIC_LINK": {
       return findOrCreateMagicLinkUser(input);
     }
+    case "GOOGLE": {
+      return findOrCreateGoogleUser(input);
+    }
   }
 }
 
@@ -162,6 +175,134 @@ export async function findOrCreateGithubUser({
   };
 }
 
+export async function findOrCreateGoogleUser({
+  email,
+  authenticationProfile,
+  authenticationExtraParams,
+}: FindOrCreateGoogle): Promise<LoggedInUser> {
+  assertEmailAllowed(email);
+
+  const name = authenticationProfile._json.name;
+  let avatarUrl: string | undefined = undefined;
+  if (authenticationProfile.photos[0]) {
+    avatarUrl = authenticationProfile.photos[0].value;
+  }
+  const displayName = authenticationProfile.displayName;
+  const authProfile = authenticationProfile
+    ? (authenticationProfile as unknown as Prisma.JsonObject)
+    : undefined;
+  const authExtraParams = authenticationExtraParams
+    ? (authenticationExtraParams as unknown as Prisma.JsonObject)
+    : undefined;
+
+  const authIdentifier = `google:${authenticationProfile.id}`;
+
+  const existingUser = await prisma.user.findUnique({
+    where: {
+      authIdentifier,
+    },
+  });
+
+  const existingEmailUser = await prisma.user.findUnique({
+    where: {
+      email,
+    },
+  });
+
+  if (existingEmailUser && !existingUser) {
+    // Link existing email account to Google auth, preserving original authenticationMethod
+    const user = await prisma.user.update({
+      where: {
+        email,
+      },
+      data: {
+        authenticationProfile: authProfile,
+        authenticationExtraParams: authExtraParams,
+        avatarUrl,
+        authIdentifier,
+      },
+    });
+
+    return {
+      user,
+      isNewUser: false,
+    };
+  }
+
+  if (existingEmailUser && existingUser) {
+    // Check if email user and auth user are the same
+    if (existingEmailUser.id !== existingUser.id) {
+      // Different users: email is taken by one user, Google auth belongs to another
+      logger.error(
+        `Google auth conflict: Google ID ${authenticationProfile.id} belongs to user ${existingUser.id} but email ${email} is taken by user ${existingEmailUser.id}`,
+        {
+          email,
+          existingEmailUserId: existingEmailUser.id,
+          existingAuthUserId: existingUser.id,
+          authIdentifier,
+        }
+      );
+
+      return {
+        user: existingUser,
+        isNewUser: false,
+      };
+    }
+
+    // Same user: update all profile fields
+    const user = await prisma.user.update({
+      where: {
+        id: existingUser.id,
+      },
+      data: {
+        email,
+        displayName,
+        name,
+        avatarUrl,
+        authenticationProfile: authProfile,
+        authenticationExtraParams: authExtraParams,
+      },
+    });
+
+    return {
+      user,
+      isNewUser: false,
+    };
+  }
+
+  // When the IDP user (Google) already exists, the "update" path will be taken and the email will be updated
+  // It's not possible that the email is already taken by a different user because that would have been handled
+  // by one of the if statements above.
+  const user = await prisma.user.upsert({
+    where: {
+      authIdentifier,
+    },
+    update: {
+      email,
+      displayName,
+      name,
+      avatarUrl,
+      authenticationProfile: authProfile,
+      authenticationExtraParams: authExtraParams,
+    },
+    create: {
+      authenticationProfile: authProfile,
+      authenticationExtraParams: authExtraParams,
+      name,
+      avatarUrl,
+      displayName,
+      authIdentifier,
+      email,
+      authenticationMethod: "GOOGLE",
+    },
+  });
+
+  return {
+    user,
+    isNewUser: !existingUser,
+  };
+}
+
 export type UserWithDashboardPreferences = User & {
   dashboardPreferences: DashboardPreferences;
 };
diff --git a/apps/webapp/app/models/vercelIntegration.server.ts b/apps/webapp/app/models/vercelIntegration.server.ts
new file mode 100644
index 00000000000..c31b8bde27a
--- /dev/null
+++ b/apps/webapp/app/models/vercelIntegration.server.ts
@@ -0,0 +1,1659 @@
+import pLimit from "p-limit";
+import { Vercel } from "@vercel/sdk";
+import type {
+  ResponseBodyEnvs,
+  FilterProjectEnvsResponseBody,
+} from "@vercel/sdk/models/filterprojectenvsop";
+import type {
+  GetV9ProjectsIdOrNameCustomEnvironmentsEnvironments,
+} from "@vercel/sdk/models/getv9projectsidornamecustomenvironmentsop";
+import type { ResponseBodyProjects } from "@vercel/sdk/models/getprojectsop";
+import {
+  Organization,
+  OrganizationIntegration,
+  SecretReference,
+} from "@trigger.dev/database";
+import { z } from "zod";
+import { ResultAsync, errAsync, okAsync } from "neverthrow";
+import { $transaction, prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { logger } from "~/services/logger.server";
+import { getSecretStore } from "~/services/secrets/secretStore.server";
+import { generateFriendlyId } from "~/v3/friendlyIdentifiers";
+import {
+  SyncEnvVarsMapping,
+  shouldSyncEnvVar,
+  TriggerEnvironmentType,
+  envTypeToVercelTarget,
+} from "~/v3/vercel/vercelProjectIntegrationSchema";
+import { EnvironmentVariablesRepository } from "~/v3/environmentVariables/environmentVariablesRepository.server";
+
+// ---------------------------------------------------------------------------
+// Pure helpers
+// ---------------------------------------------------------------------------
+
+function normalizeTarget(target: string[] | string | undefined): string[] {
+  if (Array.isArray(target)) return target.filter(Boolean);
+  if (typeof target === 'string') return [target];
+  return [];
+}
+
+function extractVercelEnvs(
+  response: FilterProjectEnvsResponseBody
+): ResponseBodyEnvs[] {
+  if ("envs" in response && Array.isArray(response.envs)) {
+    return response.envs;
+  }
+  return [];
+}
+
+function isVercelSecretType(type: string): boolean {
+  return type === "secret" || type === "sensitive";
+}
+
+// ---------------------------------------------------------------------------
+// Error handling
+// ---------------------------------------------------------------------------
+
+export type VercelApiError = {
+  message: string;
+  authInvalid: boolean;
+};
+
+const VercelErrorSchema = z.union([
+  z.object({ status: z.number() }),
+  z.object({ response: z.object({ status: z.number() }) }),
+  z.object({ statusCode: z.number() }),
+]);
+
+function extractVercelErrorStatus(error: unknown): number | null {
+  if (error && typeof error === 'object' && 'status' in error) {
+    const parsed = VercelErrorSchema.safeParse(error);
+    if (parsed.success && 'status' in parsed.data) {
+      return parsed.data.status;
+    }
+  }
+
+  if (error && typeof error === 'object' && 'response' in error) {
+    const parsed = VercelErrorSchema.safeParse(error);
+    if (parsed.success && 'response' in parsed.data) {
+      return parsed.data.response.status;
+    }
+  }
+
+  if (error && typeof error === 'object' && 'statusCode' in error) {
+    const parsed = VercelErrorSchema.safeParse(error);
+    if (parsed.success && 'statusCode' in parsed.data) {
+      return parsed.data.statusCode;
+    }
+  }
+
+  if (typeof error === 'string') {
+    if (error.includes('401')) return 401;
+    if (error.includes('403')) return 403;
+  }
+
+  return null;
+}
+
+function isVercelAuthError(error: unknown): boolean {
+  const status = extractVercelErrorStatus(error);
+  return status === 401 || status === 403;
+}
+
+function toVercelApiError(error: unknown): VercelApiError {
+  if (isVercelApiErrorShape(error)) return error;
+  return {
+    message: error instanceof Error ? error.message : "Unknown error",
+    authInvalid: isVercelAuthError(error),
+  };
+}
+
+function isVercelApiErrorShape(error: unknown): error is VercelApiError {
+  return (
+    error !== null &&
+    typeof error === "object" &&
+    "message" in error &&
+    "authInvalid" in error &&
+    typeof (error as VercelApiError).message === "string" &&
+    typeof (error as VercelApiError).authInvalid === "boolean"
+  );
+}
+
+/**
+ * Wrap a Vercel SDK call in ResultAsync with structured error logging.
+ */
+function wrapVercelCall<T>(
+  promise: Promise<T>,
+  message: string,
+  context: Record<string, unknown>
+): ResultAsync<T, VercelApiError> {
+  return ResultAsync.fromPromise(promise, (error) => {
+    const apiError = toVercelApiError(error);
+    logger.error(message, { ...context, error, authInvalid: apiError.authInvalid });
+    return apiError;
+  });
+}
+
+// ---------------------------------------------------------------------------
+// Schemas & token types
+// ---------------------------------------------------------------------------
+
+export const VercelSecretSchema = z.object({
+  accessToken: z.string(),
+  tokenType: z.string().optional(),
+  teamId: z.string().nullable().optional(),
+  userId: z.string().optional(),
+  installationId: z.string().optional(),
+  raw: z.record(z.any()).optional(),
+});
+
+export type VercelSecret = z.infer<typeof VercelSecretSchema>;
+
+export type TokenResponse = {
+  accessToken: string;
+  tokenType: string;
+  teamId?: string;
+  userId?: string;
+  raw: Record<string, unknown>;
+};
+
+// ---------------------------------------------------------------------------
+// Domain types narrowed from Vercel SDK response types.
+//
+// Using Pick and indexed-access types ties these definitions to the SDK so
+// that any upstream type change surfaces as a compile error here rather than
+// silently breaking at runtime.
+// ---------------------------------------------------------------------------
+
+/** Narrowed env-var type from the SDK's FilterProjectEnvs response. */
+export type VercelEnvironmentVariable = {
+  id: string; // narrowed from ResponseBodyEnvs["id"] (string | undefined)
+  key: ResponseBodyEnvs["key"];
+  type: ResponseBodyEnvs["type"];
+  isSecret: boolean;
+  target: string[];
+  isShared?: boolean;
+  customEnvironmentIds: string[];
+};
+
+/** Narrowed custom-environment type – only the fields we consume. */
+export type VercelCustomEnvironment = Pick<
+  GetV9ProjectsIdOrNameCustomEnvironmentsEnvironments,
+  "id" | "slug" | "description" | "branchMatcher"
+>;
+
+/** Narrowed env-var-with-value type from the SDK's FilterProjectEnvs response. */
+export type VercelEnvironmentVariableValue = {
+  key: ResponseBodyEnvs["key"];
+  value: string; // narrowed from ResponseBodyEnvs["value"] – only present after null-check
+  target: string[];
+  type: ResponseBodyEnvs["type"];
+  isSecret: boolean;
+};
+
+/** Narrowed Vercel project type – only id and name. */
+export type VercelProject = Pick<ResponseBodyProjects, "id" | "name">;
+
+// ---------------------------------------------------------------------------
+// Mapper functions – narrow wide SDK responses into our domain types.
+// ---------------------------------------------------------------------------
+
+function toVercelEnvironmentVariable(
+  env: ResponseBodyEnvs
+): VercelEnvironmentVariable {
+  return {
+    id: env.id ?? "",
+    key: env.key,
+    type: env.type,
+    isSecret: isVercelSecretType(env.type),
+    target: normalizeTarget(env.target),
+    customEnvironmentIds: env.customEnvironmentIds ?? [],
+  };
+}
+
+function toVercelCustomEnvironment({
+  id,
+  slug,
+  description,
+  branchMatcher,
+}: GetV9ProjectsIdOrNameCustomEnvironmentsEnvironments): VercelCustomEnvironment {
+  return { id, slug, description, branchMatcher };
+}
+
+function toVercelEnvironmentVariableValue(
+  env: ResponseBodyEnvs
+): VercelEnvironmentVariableValue | null {
+  if (!env.value) return null;
+  return {
+    key: env.key,
+    value: env.value,
+    target: normalizeTarget(env.target),
+    type: env.type,
+    isSecret: isVercelSecretType(env.type),
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Repository
+// ---------------------------------------------------------------------------
+
+export class VercelIntegrationRepository {
+  static exchangeCodeForToken(code: string): ResultAsync<TokenResponse, VercelApiError> {
+    const clientId = env.VERCEL_INTEGRATION_CLIENT_ID;
+    const clientSecret = env.VERCEL_INTEGRATION_CLIENT_SECRET;
+    const redirectUri = `${env.APP_ORIGIN}/vercel/callback`;
+
+    if (!clientId || !clientSecret) {
+      logger.error("Vercel integration not configured");
+      return errAsync({ message: "Vercel integration not configured", authInvalid: false });
+    }
+
+    return ResultAsync.fromPromise(
+      fetch("https://api.vercel.com/v2/oauth/access_token", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/x-www-form-urlencoded",
+        },
+        body: new URLSearchParams({
+          client_id: clientId,
+          client_secret: clientSecret,
+          code,
+          redirect_uri: redirectUri,
+        }),
+      }).then(async (response) => {
+        if (!response.ok) {
+          const errorText = await response.text();
+          logger.error("Failed to exchange Vercel OAuth code", {
+            status: response.status,
+            error: errorText,
+          });
+          throw new Error(`HTTP ${response.status}: ${errorText}`);
+        }
+        return response.json() as Promise<{
+          access_token: string;
+          token_type: string;
+          team_id?: string;
+          user_id?: string;
+        }>;
+      }),
+      (error) => {
+        logger.error("Error exchanging Vercel OAuth code", { error });
+        return toVercelApiError(error);
+      }
+    ).map((data): TokenResponse => ({
+      accessToken: data.access_token,
+      tokenType: data.token_type,
+      teamId: data.team_id,
+      userId: data.user_id,
+      raw: data as Record<string, unknown>,
+    }));
+  }
+
+  static getVercelClient(
+    integration: OrganizationIntegration & { tokenReference: SecretReference }
+  ): ResultAsync<Vercel, VercelApiError> {
+    return ResultAsync.fromPromise(
+      (async () => {
+        const secretStore = getSecretStore(integration.tokenReference.provider);
+        const secret = await secretStore.getSecret(
+          VercelSecretSchema,
+          integration.tokenReference.key
+        );
+        if (!secret) {
+          throw new Error("Failed to get Vercel access token");
+        }
+        return new Vercel({ bearerToken: secret.accessToken });
+      })(),
+      (error) => toVercelApiError(error)
+    );
+  }
+
+  static getTeamSlug(
+    client: Vercel,
+    teamId: string | null
+  ): ResultAsync<string, VercelApiError> {
+    if (teamId) {
+      return wrapVercelCall(
+        client.teams.getTeam({ teamId }),
+        "Failed to fetch Vercel team",
+        { teamId }
+      ).map((response) => response.slug);
+    }
+
+    return wrapVercelCall(
+      client.user.getAuthUser(),
+      "Failed to fetch Vercel user",
+      {}
+    ).map((response) => response?.user.username ?? "unknown");
+  }
+
+  static validateVercelToken(
+    integration: OrganizationIntegration & { tokenReference: SecretReference }
+  ): ResultAsync<{ isValid: boolean }, VercelApiError> {
+    return this.getVercelClient(integration)
+      .andThen((client) =>
+        ResultAsync.fromPromise(
+          client.user.getAuthUser(),
+          toVercelApiError
+        )
+      )
+      .map(() => ({ isValid: true }))
+      .orElse((error) =>
+        error.authInvalid
+          ? okAsync({ isValid: false })
+          : errAsync(error)
+      );
+  }
+
+  static async getTeamIdFromIntegration(
+    integration: OrganizationIntegration & { tokenReference: SecretReference }
+  ): Promise<string | null> {
+    const secretStore = getSecretStore(integration.tokenReference.provider);
+
+    const secret = await secretStore.getSecret(
+      VercelSecretSchema,
+      integration.tokenReference.key
+    );
+
+    if (!secret) {
+      return null;
+    }
+
+    return secret.teamId ?? null;
+  }
+
+  static getVercelIntegrationConfiguration(
+    accessToken: string,
+    configurationId: string,
+    teamId?: string | null
+  ): ResultAsync<{
+    id: string;
+    teamId: string | null;
+    projects: string[];
+  }, VercelApiError> {
+    return ResultAsync.fromPromise(
+      fetch(
+        `https://api.vercel.com/v1/integrations/configuration/${configurationId}${teamId ? `?teamId=${teamId}` : ""}`,
+        {
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+            "Content-Type": "application/json",
+          },
+        }
+      ).then(async (response) => {
+        if (!response.ok) {
+          const errorText = await response.text();
+          logger.error("Failed to fetch Vercel integration configuration", {
+            status: response.status,
+            error: errorText,
+            configurationId,
+            teamId,
+          });
+          throw new Error(`HTTP ${response.status}: ${errorText}`);
+        }
+        return response.json() as Promise<{
+          id: string;
+          teamId?: string | null;
+          projects?: string[];
+          [key: string]: any;
+        }>;
+      }),
+      (error) => {
+        logger.error("Error fetching Vercel integration configuration", {
+          configurationId,
+          teamId,
+          error,
+        });
+        return toVercelApiError(error);
+      }
+    ).map((data) => ({
+      id: data.id,
+      teamId: data.teamId ?? null,
+      projects: data.projects || [],
+    }));
+  }
+
+  static getVercelCustomEnvironments(
+    client: Vercel,
+    projectId: string,
+    teamId?: string | null
+  ): ResultAsync<VercelCustomEnvironment[], VercelApiError> {
+    return wrapVercelCall(
+      client.environment.getV9ProjectsIdOrNameCustomEnvironments({
+        idOrName: projectId,
+        ...(teamId && { teamId }),
+      }),
+      "Failed to fetch Vercel custom environments",
+      { projectId, teamId }
+    ).map((response) => (response.environments || []).map(toVercelCustomEnvironment));
+  }
+
+  static getVercelEnvironmentVariables(
+    client: Vercel,
+    projectId: string,
+    teamId?: string | null,
+  ): ResultAsync<VercelEnvironmentVariable[], VercelApiError> {
+    return wrapVercelCall(
+      client.projects.filterProjectEnvs({
+        idOrName: projectId,
+        ...(teamId && { teamId }),
+      }),
+      "Failed to fetch Vercel environment variables",
+      { projectId, teamId }
+    ).map((response) => {
+      // Warn if response is paginated (more data exists that we're not fetching)
+      if (
+        "pagination" in response &&
+        response.pagination &&
+        "next" in response.pagination &&
+        response.pagination.next !== null
+      ) {
+        logger.warn(
+          "Vercel filterProjectEnvs returned paginated response - some env vars may be missing",
+          { projectId, count: response.pagination.count }
+        );
+      }
+      return extractVercelEnvs(response).map(toVercelEnvironmentVariable);
+    });
+  }
+
+  static getVercelEnvironmentVariableValues(
+    client: Vercel,
+    projectId: string,
+    teamId?: string | null,
+    target?: string,
+    /** If provided, only include keys that pass this filter */
+    shouldIncludeKey?: (key: string) => boolean
+  ): ResultAsync<VercelEnvironmentVariableValue[], VercelApiError> {
+    return wrapVercelCall(
+      client.projects.filterProjectEnvs({
+        idOrName: projectId,
+        ...(teamId && { teamId }),
+      }),
+      "Failed to fetch Vercel environment variable values",
+      { projectId, teamId, target }
+    ).andThen((response) => {
+      // Apply all filters BEFORE decryption to avoid unnecessary API calls
+      const filteredEnvs = extractVercelEnvs(response).filter((env) => {
+        if (target && !normalizeTarget(env.target).includes(target)) return false;
+        if (shouldIncludeKey && !shouldIncludeKey(env.key)) return false;
+        if (isVercelSecretType(env.type)) return false;
+        return true;
+      });
+
+      // Fetch decrypted values for encrypted vars, use list values for others
+      const concurrencyLimit = pLimit(5);
+      return ResultAsync.fromPromise(
+        Promise.all(
+          filteredEnvs.map((env) =>
+            concurrencyLimit(() => this.#resolveEnvVarValue(client, projectId, teamId, env))
+          )
+        ),
+        (error) => toVercelApiError(error)
+      ).map((results) => results.filter((v): v is VercelEnvironmentVariableValue => v !== null));
+    });
+  }
+
+  static async #resolveEnvVarValue(
+    client: Vercel,
+    projectId: string,
+    teamId: string | null | undefined,
+    env: ResponseBodyEnvs
+  ): Promise<VercelEnvironmentVariableValue | null> {
+    // Non-encrypted vars: use value from list response if present
+    if (env.type !== "encrypted" || !env.id) {
+      if (env.value === undefined || env.value === null) return null;
+      return toVercelEnvironmentVariableValue(env);
+    }
+
+    // Encrypted vars: fetch decrypted value via individual endpoint
+    // (list endpoint's decrypt param is deprecated)
+    const result = await ResultAsync.fromPromise(
+      client.projects.getProjectEnv({
+        idOrName: projectId,
+        id: env.id,
+        ...(teamId && { teamId }),
+      }),
+      (error) => error
+    );
+
+    if (result.isErr()) {
+      logger.warn("Failed to decrypt Vercel env var", {
+        projectId,
+        envVarKey: env.key,
+        error: result.error instanceof Error ? result.error.message : String(result.error),
+      });
+      return null;
+    }
+
+    // API returns union: ResponseBody1 has no value, ResponseBody2/3 have value
+    const decryptedValue = (result.value as { value?: string }).value;
+    if (typeof decryptedValue !== "string") return null;
+
+    return {
+      key: env.key,
+      value: decryptedValue,
+      target: normalizeTarget(env.target),
+      type: env.type,
+      isSecret: false,
+    };
+  }
+
+  static getVercelSharedEnvironmentVariables(
+    client: Vercel,
+    teamId: string,
+    projectId?: string // Optional: filter by project
+  ): ResultAsync<Array<{
+      id: string;
+      key: string;
+      type: string;
+      isSecret: boolean;
+      target: string[];
+    }>, VercelApiError> {
+    return wrapVercelCall(
+      client.environment.listSharedEnvVariable({
+        teamId,
+        ...(projectId && { projectId }),
+      }),
+      "Failed to fetch Vercel shared environment variables",
+      { teamId, projectId }
+    ).map((response) => {
+      const envVars = response.data || [];
+      return envVars
+        .filter((env): env is typeof env & { id: string; key: string } =>
+          typeof env.id === "string" && typeof env.key === "string"
+        )
+        .map((env) => {
+          const type = env.type || "plain";
+          return {
+            id: env.id,
+            key: env.key,
+            type,
+            isSecret: isVercelSecretType(type),
+            target: normalizeTarget(env.target),
+          };
+        });
+    });
+  }
+
+  static getVercelSharedEnvironmentVariableValues(
+    client: Vercel,
+    teamId: string,
+    projectId?: string // Optional: filter by project
+  ): ResultAsync<
+    Array<{
+      key: string;
+      value: string;
+      target: string[];
+      type: string;
+      isSecret: boolean;
+      applyToAllCustomEnvironments?: boolean;
+    }>,
+    VercelApiError
+  > {
+    return wrapVercelCall(
+      client.environment.listSharedEnvVariable({
+        teamId,
+        ...(projectId && { projectId }),
+      }),
+      "Failed to fetch Vercel shared environment variable values",
+      { teamId, projectId }
+    ).andThen((listResponse) => {
+      const envVars = listResponse.data || [];
+      if (envVars.length === 0) {
+        return okAsync([]);
+      }
+
+      const concurrencyLimit = pLimit(5);
+      return ResultAsync.fromPromise(
+        Promise.all(
+          envVars.map((env) =>
+            concurrencyLimit(async () => {
+              if (!env.id || !env.key) return null;
+
+              const envId = env.id;
+              const envKey = env.key;
+              const type = env.type || "plain";
+              const isSecret = isVercelSecretType(type);
+
+              if (isSecret) return null;
+
+              const listValue = (env as any).value as string | undefined;
+              const applyToAllCustomEnvs = (env as any).applyToAllCustomEnvironments as boolean | undefined;
+
+              if (listValue) {
+                return {
+                  key: envKey,
+                  value: listValue,
+                  target: normalizeTarget(env.target),
+                  type,
+                  isSecret,
+                  applyToAllCustomEnvironments: applyToAllCustomEnvs,
+                };
+              }
+
+              // Try to get the decrypted value for this shared env var
+              const getResult = await ResultAsync.fromPromise(
+                client.environment.getSharedEnvVar({
+                  id: envId,
+                  teamId,
+                }),
+                (error) => error
+              );
+
+              if (getResult.isOk()) {
+                if (!getResult.value.value) return null;
+                return {
+                  key: envKey,
+                  value: getResult.value.value,
+                  target: normalizeTarget(env.target),
+                  type,
+                  isSecret,
+                  applyToAllCustomEnvironments: applyToAllCustomEnvs,
+                };
+              }
+
+              // Workaround: Vercel SDK may throw ResponseValidationError even when the API response
+              // is valid (e.g., deletedAt: null vs expected number). Extract value from rawValue.
+              const error = getResult.error;
+              let errorValue: string | undefined;
+              if (error && typeof error === "object" && "rawValue" in error) {
+                const rawValue = (error as any).rawValue;
+                if (rawValue && typeof rawValue === "object" && "value" in rawValue) {
+                  errorValue = rawValue.value as string | undefined;
+                }
+              }
+
+              const fallbackValue = errorValue || listValue;
+
+              if (fallbackValue) {
+                logger.warn("getSharedEnvVar failed validation, using value from error.rawValue or list response", {
+                  teamId,
+                  envId,
+                  envKey,
+                  error: error instanceof Error ? error.message : String(error),
+                  hasErrorRawValue: !!errorValue,
+                  hasListValue: !!listValue,
+                  valueLength: fallbackValue.length,
+                });
+                return {
+                  key: envKey,
+                  value: fallbackValue,
+                  target: normalizeTarget(env.target),
+                  type,
+                  isSecret,
+                  applyToAllCustomEnvironments: applyToAllCustomEnvs,
+                };
+              }
+
+              logger.warn("Failed to get decrypted value for shared env var, no fallback available", {
+                teamId,
+                projectId,
+                envId,
+                envKey,
+                error: error instanceof Error ? error.message : String(error),
+                errorStack: error instanceof Error ? error.stack : undefined,
+                hasRawValue: error && typeof error === "object" && "rawValue" in error,
+              });
+              return null;
+            })
+          )
+        ),
+        (error) => {
+          logger.error("Failed to process shared environment variable values", {
+            teamId,
+            projectId,
+            error: error instanceof Error ? error.message : String(error),
+          });
+          return toVercelApiError(error);
+        }
+      ).map((results) => results.filter((r): r is NonNullable<typeof r> => r !== null));
+    });
+  }
+
+  static getVercelProjects(
+    client: Vercel,
+    teamId?: string | null
+  ): ResultAsync<VercelProject[], VercelApiError> {
+    return ResultAsync.fromPromise(
+      (async () => {
+        const allProjects: VercelProject[] = [];
+        let from: string | undefined;
+
+        do {
+          const response = await client.projects.getProjects({
+            ...(teamId && { teamId }),
+            limit: "100",
+            ...(from && { from }),
+          });
+
+          const projects = Array.isArray(response)
+            ? response
+            : "projects" in response
+              ? response.projects
+              : [];
+          allProjects.push(...projects.map(({ id, name }): VercelProject => ({ id, name })));
+
+          // Get pagination token for next page
+          const pagination =
+            !Array.isArray(response) && "pagination" in response
+              ? response.pagination
+              : undefined;
+          from =
+            pagination && "next" in pagination && pagination.next !== null
+              ? String(pagination.next)
+              : undefined;
+        } while (from);
+
+        return allProjects;
+      })(),
+      (error) => {
+        logger.error("Failed to fetch Vercel projects", { teamId, error });
+        return toVercelApiError(error);
+      }
+    );
+  }
+
+  static async updateVercelOrgIntegrationToken(params: {
+    integrationId: string;
+    accessToken: string;
+    tokenType?: string;
+    teamId: string | null;
+    userId?: string;
+    installationId?: string;
+    raw?: Record<string, any>;
+  }): Promise<void> {
+    await $transaction(prisma, async (tx) => {
+      const integration = await tx.organizationIntegration.findUnique({
+        where: { id: params.integrationId },
+        include: { tokenReference: true },
+      });
+
+      if (!integration) {
+        throw new Error("Vercel integration not found");
+      }
+
+      const secretStore = getSecretStore(integration.tokenReference.provider, {
+        prismaClient: tx,
+      });
+
+      const secretValue: VercelSecret = {
+        accessToken: params.accessToken,
+        tokenType: params.tokenType,
+        teamId: params.teamId,
+        userId: params.userId,
+        installationId: params.installationId,
+        raw: params.raw,
+      };
+
+      await secretStore.setSecret(integration.tokenReference.key, secretValue);
+
+      await tx.organizationIntegration.update({
+        where: { id: params.integrationId },
+        data: {
+          integrationData: {
+            teamId: params.teamId,
+            userId: params.userId,
+            installationId: params.installationId,
+          } as any,
+        },
+      });
+    });
+  }
+
+  static async createVercelOrgIntegration(params: {
+    accessToken: string;
+    tokenType?: string;
+    teamId: string | null;
+    userId?: string;
+    installationId?: string;
+    organization: Pick<Organization, "id">;
+    raw?: Record<string, any>;
+    origin: 'marketplace' | 'dashboard';
+  }): Promise<OrganizationIntegration> {
+    const result = await $transaction(prisma, async (tx) => {
+      const secretStore = getSecretStore("DATABASE", {
+        prismaClient: tx,
+      });
+
+      const integrationFriendlyId = generateFriendlyId("org_integration");
+
+      const secretValue: VercelSecret = {
+        accessToken: params.accessToken,
+        tokenType: params.tokenType,
+        teamId: params.teamId,
+        userId: params.userId,
+        installationId: params.installationId,
+        raw: params.raw,
+      };
+
+      await secretStore.setSecret(integrationFriendlyId, secretValue);
+
+      const reference = await tx.secretReference.create({
+        data: {
+          provider: "DATABASE",
+          key: integrationFriendlyId,
+        },
+      });
+
+      return await tx.organizationIntegration.create({
+        data: {
+          friendlyId: integrationFriendlyId,
+          organizationId: params.organization.id,
+          service: "VERCEL",
+          externalOrganizationId: params.teamId,
+          tokenReferenceId: reference.id,
+          integrationData: {
+            teamId: params.teamId,
+            userId: params.userId,
+            installationId: params.installationId,
+            origin: params.origin,
+          } as any,
+        },
+      });
+    });
+
+    if (!result) {
+      throw new Error("Failed to create Vercel organization integration");
+    }
+
+    return result;
+  }
+
+  static async findVercelOrgIntegrationByTeamId(
+    organizationId: string,
+    teamId: string | null
+  ): Promise<(OrganizationIntegration & { tokenReference: SecretReference }) | null> {
+    return prisma.organizationIntegration.findFirst({
+      where: {
+        organizationId,
+        service: "VERCEL",
+        externalOrganizationId: teamId,
+        deletedAt: null,
+      },
+      include: {
+        tokenReference: true,
+      },
+    });
+  }
+
+  static async findVercelOrgIntegrationForProject(
+    projectId: string
+  ): Promise<(OrganizationIntegration & { tokenReference: SecretReference }) | null> {
+    const projectIntegration = await prisma.organizationProjectIntegration.findFirst({
+      where: {
+        projectId,
+        deletedAt: null,
+        organizationIntegration: {
+          service: "VERCEL",
+          deletedAt: null,
+        },
+      },
+      include: {
+        organizationIntegration: {
+          include: {
+            tokenReference: true,
+          },
+        },
+      },
+    });
+
+    return projectIntegration?.organizationIntegration ?? null;
+  }
+
+  static async findVercelOrgIntegrationByOrganization(
+    organizationId: string
+  ): Promise<(OrganizationIntegration & { tokenReference: SecretReference }) | null> {
+    return prisma.organizationIntegration.findFirst({
+      where: {
+        organizationId,
+        service: "VERCEL",
+        deletedAt: null,
+      },
+      include: {
+        tokenReference: true,
+      },
+    });
+  }
+
+  static syncApiKeysToVercel(params: {
+    projectId: string;
+    vercelProjectId: string;
+    teamId: string | null;
+    vercelStagingEnvironment?: { environmentId: string; displayName: string } | null;
+    orgIntegration: OrganizationIntegration & { tokenReference: SecretReference };
+  }): ResultAsync<{ created: number; updated: number; errors: string[] }, VercelApiError> {
+    return this.getVercelClient(params.orgIntegration).andThen((client) =>
+      ResultAsync.fromPromise(
+        (async () => {
+          // Get all environments for the project (exclude DEVELOPMENT — we don't push keys to Vercel's development target)
+          const environments = await prisma.runtimeEnvironment.findMany({
+            where: {
+              projectId: params.projectId,
+              type: {
+                in: ["PRODUCTION", "STAGING", "PREVIEW"],
+              },
+            },
+            select: {
+              id: true,
+              type: true,
+              apiKey: true,
+            },
+          });
+
+          // Build the list of env vars to sync
+          const envVarsToSync: Array<{
+            key: string;
+            value: string;
+            target: string[];
+            type: "sensitive" | "encrypted" | "plain";
+            environmentType: string;
+          }> = [];
+
+          for (const runtimeEnv of environments) {
+            const vercelTarget = envTypeToVercelTarget(
+              runtimeEnv.type as TriggerEnvironmentType,
+              params.vercelStagingEnvironment?.environmentId
+            );
+
+            if (!vercelTarget) {
+              continue;
+            }
+
+            envVarsToSync.push({
+              key: "TRIGGER_SECRET_KEY",
+              value: runtimeEnv.apiKey,
+              target: vercelTarget,
+              type: "encrypted",
+              environmentType: runtimeEnv.type,
+            });
+          }
+
+          if (envVarsToSync.length === 0) {
+            return { created: 0, updated: 0, errors: [] as string[] };
+          }
+
+          const result = await this.batchUpsertVercelEnvVars({
+            client,
+            vercelProjectId: params.vercelProjectId,
+            teamId: params.teamId,
+            envVars: envVarsToSync,
+          });
+
+          logger.info("Synced API keys to Vercel", {
+            projectId: params.projectId,
+            vercelProjectId: params.vercelProjectId,
+            syncedCount: result.created + result.updated,
+            created: result.created,
+            updated: result.updated,
+            errors: result.errors,
+          });
+
+          return result;
+        })(),
+        (error) => {
+          logger.error("Failed to sync API keys to Vercel", {
+            projectId: params.projectId,
+            vercelProjectId: params.vercelProjectId,
+            error,
+          });
+          return toVercelApiError(error);
+        }
+      )
+    );
+  }
+
+  static syncSingleApiKeyToVercel(params: {
+    projectId: string;
+    environmentType: "PRODUCTION" | "STAGING" | "PREVIEW" | "DEVELOPMENT";
+    apiKey: string;
+  }): ResultAsync<void, VercelApiError> {
+    return ResultAsync.fromPromise(
+      (async () => {
+        const projectIntegration = await prisma.organizationProjectIntegration.findFirst({
+          where: {
+            projectId: params.projectId,
+            deletedAt: null,
+            organizationIntegration: {
+              service: "VERCEL",
+              deletedAt: null,
+            },
+          },
+          include: {
+            organizationIntegration: {
+              include: {
+                tokenReference: true,
+              },
+            },
+          },
+        });
+
+        if (!projectIntegration) {
+          return; // No integration, nothing to sync
+        }
+
+        const orgIntegration = projectIntegration.organizationIntegration;
+        const clientResult = await this.getVercelClient(orgIntegration);
+        if (clientResult.isErr()) throw clientResult.error;
+        const client = clientResult.value;
+
+        const teamId = await this.getTeamIdFromIntegration(orgIntegration);
+
+        const integrationData = projectIntegration.integrationData as any;
+        const vercelStagingEnvironment = integrationData?.config?.vercelStagingEnvironment;
+
+        const vercelTarget = envTypeToVercelTarget(
+          params.environmentType,
+          vercelStagingEnvironment?.environmentId
+        );
+
+        if (!vercelTarget) {
+          return;
+        }
+
+        await this.upsertVercelEnvVar({
+          client,
+          vercelProjectId: projectIntegration.externalEntityId,
+          teamId,
+          key: "TRIGGER_SECRET_KEY",
+          value: params.apiKey,
+          target: vercelTarget,
+          type: "encrypted",
+        });
+
+        logger.info("Synced regenerated API key to Vercel", {
+          projectId: params.projectId,
+          vercelProjectId: projectIntegration.externalEntityId,
+          environmentType: params.environmentType,
+          target: vercelTarget,
+        });
+      })(),
+      (error) => {
+        logger.error("Failed to sync API key to Vercel", {
+          projectId: params.projectId,
+          environmentType: params.environmentType,
+          error,
+        });
+        return toVercelApiError(error);
+      }
+    );
+  }
+
+  static pullEnvVarsFromVercel(params: {
+    projectId: string;
+    vercelProjectId: string;
+    teamId: string | null;
+    vercelStagingEnvironment?: { environmentId: string; displayName: string } | null;
+    syncEnvVarsMapping: SyncEnvVarsMapping;
+    orgIntegration: OrganizationIntegration & { tokenReference: SecretReference };
+  }): ResultAsync<{ syncedCount: number; errors: string[] }, VercelApiError> {
+    logger.info("pullEnvVarsFromVercel: Starting", {
+      projectId: params.projectId,
+      vercelProjectId: params.vercelProjectId,
+      teamId: params.teamId,
+      vercelStagingEnvironment: params.vercelStagingEnvironment,
+      syncEnvVarsMappingKeys: Object.keys(params.syncEnvVarsMapping),
+    });
+
+    return this.getVercelClient(params.orgIntegration).andThen((client) =>
+      ResultAsync.fromPromise(
+        (async () => {
+          const errors: string[] = [];
+          let syncedCount = 0;
+
+          // Get all runtime environments for the project
+          const runtimeEnvironments = await prisma.runtimeEnvironment.findMany({
+            where: {
+              projectId: params.projectId,
+              type: {
+                in: ["PRODUCTION", "STAGING", "PREVIEW", "DEVELOPMENT"],
+              },
+            },
+            select: {
+              id: true,
+              type: true,
+            },
+          });
+
+          const envMapping: Array<{
+            triggerEnvType: "PRODUCTION" | "STAGING" | "PREVIEW" | "DEVELOPMENT";
+            vercelTarget: string;
+            runtimeEnvironmentId: string;
+          }> = [];
+
+          for (const runtimeEnv of runtimeEnvironments) {
+            const vercelTarget = envTypeToVercelTarget(
+              runtimeEnv.type as TriggerEnvironmentType,
+              params.vercelStagingEnvironment?.environmentId
+            );
+
+            if (!vercelTarget) {
+              continue;
+            }
+
+            envMapping.push({
+              triggerEnvType: runtimeEnv.type as "PRODUCTION" | "STAGING" | "PREVIEW" | "DEVELOPMENT",
+              vercelTarget: vercelTarget[0],
+              runtimeEnvironmentId: runtimeEnv.id,
+            });
+          }
+
+          if (envMapping.length === 0) {
+            logger.warn("No environments to sync for Vercel integration", {
+              projectId: params.projectId,
+              vercelProjectId: params.vercelProjectId,
+            });
+            return { syncedCount: 0, errors: [] as string[] };
+          }
+
+          const envVarRepository = new EnvironmentVariablesRepository();
+
+          // Fetch shared env vars once (they apply across all targets)
+          let sharedEnvVars: Array<{
+            key: string;
+            value: string;
+            target: string[];
+            type: string;
+            isSecret: boolean;
+            applyToAllCustomEnvironments?: boolean;
+          }> = [];
+
+          if (params.teamId) {
+            const sharedResult = await this.getVercelSharedEnvironmentVariableValues(
+              client,
+              params.teamId,
+              params.vercelProjectId
+            );
+            sharedEnvVars = sharedResult.unwrapOr([]);
+          }
+
+          // Process each environment mapping
+          for (const mapping of envMapping) {
+            const iterResult = await ResultAsync.fromPromise(
+              (async () => {
+                // Build filter to avoid decrypting vars that will be filtered out anyway
+                const excludeKeys = new Set(["TRIGGER_SECRET_KEY", "TRIGGER_VERSION"]);
+                const shouldIncludeKey = (key: string) =>
+                  !excludeKeys.has(key) &&
+                  shouldSyncEnvVar(params.syncEnvVarsMapping, key, mapping.triggerEnvType as TriggerEnvironmentType);
+
+                const envVarsResult = await this.getVercelEnvironmentVariableValues(
+                  client,
+                  params.vercelProjectId,
+                  params.teamId,
+                  mapping.vercelTarget,
+                  shouldIncludeKey
+                );
+
+                if (envVarsResult.isErr()) {
+                  logger.error("pullEnvVarsFromVercel: Failed to get env vars", {
+                    triggerEnvType: mapping.triggerEnvType,
+                    vercelTarget: mapping.vercelTarget,
+                    error: envVarsResult.error.message,
+                  });
+                  errors.push(`Failed to get env vars for ${mapping.triggerEnvType}: ${envVarsResult.error.message}`);
+                  return;
+                }
+
+                const projectEnvVars = envVarsResult.value;
+                const standardTargets = ["production", "preview", "development"];
+                const isCustomEnvironment = !standardTargets.includes(mapping.vercelTarget);
+
+                const filteredSharedEnvVars = sharedEnvVars.filter((envVar) => {
+                  const matchesTarget = envVar.target.includes(mapping.vercelTarget);
+                  const matchesCustomEnv = isCustomEnvironment && envVar.applyToAllCustomEnvironments === true;
+                  return matchesTarget || matchesCustomEnv;
+                });
+
+                const projectEnvVarKeys = new Set(projectEnvVars.map((v) => v.key));
+                const sharedEnvVarsToAdd = filteredSharedEnvVars.filter((v) => !projectEnvVarKeys.has(v.key));
+                const mergedEnvVars = [
+                  ...projectEnvVars,
+                  ...sharedEnvVarsToAdd,
+                ];
+
+                if (mergedEnvVars.length === 0) {
+                  return;
+                }
+
+                const varsToSync = mergedEnvVars.filter((envVar) => {
+                  if (envVar.isSecret) {
+                    return false;
+                  }
+                  if (envVar.key === "TRIGGER_SECRET_KEY" || envVar.key === "TRIGGER_VERSION") {
+                    return false;
+                  }
+                  return shouldSyncEnvVar(
+                    params.syncEnvVarsMapping,
+                    envVar.key,
+                    mapping.triggerEnvType as TriggerEnvironmentType
+                  );
+                });
+
+                if (varsToSync.length === 0) {
+                  return;
+                }
+
+                const existingSecretKeys = new Set<string>();
+                const existingValues = new Map<string, string>();
+
+                const existingVarValues = await prisma.environmentVariableValue.findMany({
+                  where: {
+                    environmentId: mapping.runtimeEnvironmentId,
+                    variable: {
+                      projectId: params.projectId,
+                      key: {
+                        in: varsToSync.map((v) => v.key),
+                      },
+                    },
+                  },
+                  select: {
+                    isSecret: true,
+                    valueReference: {
+                      select: {
+                        key: true,
+                      },
+                    },
+                    variable: {
+                      select: {
+                        key: true,
+                      },
+                    },
+                  },
+                });
+
+                if (existingVarValues.length > 0) {
+                  const secretStore = getSecretStore("DATABASE", { prismaClient: prisma });
+                  const SecretValue = z.object({ secret: z.string() });
+
+                  for (const varValue of existingVarValues) {
+                    if (varValue.isSecret) {
+                      existingSecretKeys.add(varValue.variable.key);
+                    }
+
+                    if (varValue.valueReference?.key) {
+                      const existingSecret = await ResultAsync.fromPromise(
+                        secretStore.getSecret(SecretValue, varValue.valueReference.key),
+                        () => null
+                      ).unwrapOr(null);
+                      if (existingSecret) {
+                        existingValues.set(varValue.variable.key, existingSecret.secret);
+                      }
+                    }
+                  }
+                }
+
+                const changedVars = varsToSync.filter((v) => {
+                  const existingValue = existingValues.get(v.key);
+                  return existingValue === undefined || existingValue !== v.value;
+                });
+
+                if (changedVars.length === 0) {
+                  return;
+                }
+
+                const secretVars = changedVars.filter((v) => existingSecretKeys.has(v.key));
+                const nonSecretVars = changedVars.filter((v) => !existingSecretKeys.has(v.key));
+
+                if (nonSecretVars.length > 0) {
+                  const result = await envVarRepository.create(params.projectId, {
+                    override: true,
+                    environmentIds: [mapping.runtimeEnvironmentId],
+                    isSecret: false,
+                    variables: nonSecretVars.map((v) => ({
+                      key: v.key,
+                      value: v.value,
+                    })),
+                    lastUpdatedBy: {
+                      type: "integration",
+                      integration: "vercel",
+                    },
+                  });
+
+                  if (result.success) {
+                    syncedCount += nonSecretVars.length;
+                  } else {
+                    const errorMsg = `Failed to sync env vars for ${mapping.triggerEnvType}: ${result.error}`;
+                    errors.push(errorMsg);
+                    logger.error(errorMsg, {
+                      projectId: params.projectId,
+                      vercelProjectId: params.vercelProjectId,
+                      vercelTarget: mapping.vercelTarget,
+                      error: result.error,
+                      variableErrors: result.variableErrors,
+                      attemptedKeys: nonSecretVars.map((v) => v.key),
+                    });
+                  }
+                }
+
+                if (secretVars.length > 0) {
+                  const result = await envVarRepository.create(params.projectId, {
+                    override: true,
+                    environmentIds: [mapping.runtimeEnvironmentId],
+                    isSecret: true,
+                    variables: secretVars.map((v) => ({
+                      key: v.key,
+                      value: v.value,
+                    })),
+                    lastUpdatedBy: {
+                      type: "integration",
+                      integration: "vercel",
+                    },
+                  });
+
+                  if (result.success) {
+                    syncedCount += secretVars.length;
+                  } else {
+                    const errorMsg = `Failed to sync secret env vars for ${mapping.triggerEnvType}: ${result.error}`;
+                    errors.push(errorMsg);
+                    logger.error(errorMsg, {
+                      projectId: params.projectId,
+                      vercelProjectId: params.vercelProjectId,
+                      vercelTarget: mapping.vercelTarget,
+                      error: result.error,
+                      variableErrors: result.variableErrors,
+                      attemptedKeys: secretVars.map((v) => v.key),
+                    });
+                  }
+                }
+              })(),
+              (error) => error
+            );
+
+            if (iterResult.isErr()) {
+              const errorMsg = `Failed to process env vars for ${mapping.triggerEnvType}: ${iterResult.error instanceof Error ? iterResult.error.message : "Unknown error"}`;
+              errors.push(errorMsg);
+              logger.error(errorMsg, {
+                projectId: params.projectId,
+                vercelProjectId: params.vercelProjectId,
+                vercelTarget: mapping.vercelTarget,
+                error: iterResult.error,
+              });
+            }
+          }
+
+          return { syncedCount, errors };
+        })(),
+        (error) => {
+          logger.error("Failed to pull env vars from Vercel", {
+            projectId: params.projectId,
+            vercelProjectId: params.vercelProjectId,
+            error,
+          });
+          return toVercelApiError(error);
+        }
+      )
+    );
+  }
+
+  static async batchUpsertVercelEnvVars(params: {
+    client: Vercel;
+    vercelProjectId: string;
+    teamId: string | null;
+    envVars: Array<{
+      key: string;
+      value: string;
+      target: string[];
+      type: "sensitive" | "encrypted" | "plain";
+      environmentType?: string; // For logging purposes
+    }>;
+  }): Promise<{ created: number; updated: number; errors: string[] }> {
+    const { client, vercelProjectId, teamId, envVars } = params;
+    const errors: string[] = [];
+    let created = 0;
+    let updated = 0;
+
+    if (envVars.length === 0) {
+      return { created: 0, updated: 0, errors: [] };
+    }
+
+    const existingEnvs = await client.projects.filterProjectEnvs({
+      idOrName: vercelProjectId,
+      ...(teamId && { teamId }),
+    });
+
+    const existingEnvsList = extractVercelEnvs(existingEnvs);
+
+    const toCreate: Array<{
+      key: string;
+      value: string;
+      target: string[];
+      type: "sensitive" | "encrypted" | "plain";
+    }> = [];
+
+    const toUpdate: Array<{
+      id: string;
+      key: string;
+      value: string;
+      target: string[];
+      type: "sensitive" | "encrypted" | "plain";
+      environmentType?: string;
+    }> = [];
+
+    for (const envVar of envVars) {
+      const existingEnv = existingEnvsList.find((existing) => {
+        if (existing.key !== envVar.key) {
+          return false;
+        }
+        const envTargets = normalizeTarget(existing.target);
+        return (
+          envVar.target.length === envTargets.length &&
+          envVar.target.every((t) => envTargets.includes(t))
+        );
+      });
+
+      if (existingEnv && existingEnv.id) {
+        toUpdate.push({
+          id: existingEnv.id,
+          key: envVar.key,
+          value: envVar.value,
+          target: envVar.target,
+          type: envVar.type,
+          environmentType: envVar.environmentType,
+        });
+      } else {
+        toCreate.push({
+          key: envVar.key,
+          value: envVar.value,
+          target: envVar.target,
+          type: envVar.type,
+        });
+      }
+    }
+
+    if (toCreate.length > 0) {
+      const createResult = await ResultAsync.fromPromise(
+        client.projects.createProjectEnv({
+          idOrName: vercelProjectId,
+          ...(teamId && { teamId }),
+          requestBody: toCreate.map((item) => ({
+            key: item.key,
+            value: item.value,
+            target: item.target as any,
+            type: item.type,
+          })) as any,
+        }),
+        (error) => error
+      );
+
+      if (createResult.isOk()) {
+        created = toCreate.length;
+      } else {
+        const errorMsg = `Failed to batch create env vars: ${createResult.error instanceof Error ? createResult.error.message : "Unknown error"}`;
+        errors.push(errorMsg);
+        logger.error(errorMsg, {
+          vercelProjectId,
+          teamId,
+          count: toCreate.length,
+          error: createResult.error,
+        });
+      }
+    }
+
+    // Update existing env vars (Vercel doesn't support batch updates)
+    for (const envVar of toUpdate) {
+      const updateResult = await ResultAsync.fromPromise(
+        client.projects.editProjectEnv({
+          idOrName: vercelProjectId,
+          id: envVar.id,
+          ...(teamId && { teamId }),
+          requestBody: {
+            value: envVar.value,
+            target: envVar.target as any,
+            type: envVar.type,
+          },
+        }),
+        (error) => error
+      );
+
+      if (updateResult.isOk()) {
+        updated++;
+      } else {
+        const errorMsg = `Failed to update ${envVar.environmentType || envVar.key} env var: ${updateResult.error instanceof Error ? updateResult.error.message : "Unknown error"}`;
+        errors.push(errorMsg);
+        logger.error(errorMsg, {
+          vercelProjectId,
+          teamId,
+          envVarId: envVar.id,
+          key: envVar.key,
+          error: updateResult.error,
+        });
+      }
+    }
+
+    return { created, updated, errors };
+  }
+
+  private static async upsertVercelEnvVar(params: {
+    client: Vercel;
+    vercelProjectId: string;
+    teamId: string | null;
+    key: string;
+    value: string;
+    target: string[];
+    type: "sensitive" | "encrypted" | "plain";
+  }): Promise<void> {
+    const { client, vercelProjectId, teamId, key, value, target, type } = params;
+
+    const existingEnvs = await client.projects.filterProjectEnvs({
+      idOrName: vercelProjectId,
+      ...(teamId && { teamId }),
+    });
+
+    const envs = extractVercelEnvs(existingEnvs);
+
+    // Vercel can have multiple env vars with the same key but different targets
+    const existingEnv = envs.find((existing) => {
+      if (existing.key !== key) {
+        return false;
+      }
+      const envTargets = normalizeTarget(existing.target);
+      return target.length === envTargets.length && target.every((t) => envTargets.includes(t));
+    });
+
+    if (existingEnv && existingEnv.id) {
+      await client.projects.editProjectEnv({
+        idOrName: vercelProjectId,
+        id: existingEnv.id,
+        ...(teamId && { teamId }),
+        requestBody: {
+          value,
+          target: target as any,
+          type,
+        },
+      });
+    } else {
+      await client.projects.createProjectEnv({
+        idOrName: vercelProjectId,
+        ...(teamId && { teamId }),
+        requestBody: {
+          key,
+          value,
+          target: target as any,
+          type,
+        },
+      });
+    }
+  }
+
+  static getAutoAssignCustomDomains(
+    client: Vercel,
+    vercelProjectId: string,
+    teamId?: string | null
+  ): ResultAsync<boolean | null, VercelApiError> {
+    // Vercel SDK lacks a getProject method — updateProject with empty body reads without modifying.
+    return wrapVercelCall(
+      client.projects.updateProject({
+        idOrName: vercelProjectId,
+        ...(teamId && { teamId }),
+        requestBody: {},
+      }),
+      "Failed to get Vercel project autoAssignCustomDomains",
+      { vercelProjectId, teamId }
+    ).map((project) => project.autoAssignCustomDomains ?? null);
+  }
+
+  /** Disable autoAssignCustomDomains — required for atomic deployments. */
+  static disableAutoAssignCustomDomains(
+    client: Vercel,
+    vercelProjectId: string,
+    teamId?: string | null
+  ): ResultAsync<void, VercelApiError> {
+    return wrapVercelCall(
+      client.projects.updateProject({
+        idOrName: vercelProjectId,
+        ...(teamId && { teamId }),
+        requestBody: {
+          autoAssignCustomDomains: false,
+        },
+      }),
+      "Failed to disable autoAssignCustomDomains",
+      { vercelProjectId, teamId }
+    ).map(() => undefined);
+  }
+
+  static uninstallVercelIntegration(
+    integration: OrganizationIntegration & { tokenReference: SecretReference }
+  ): ResultAsync<{ authInvalid: boolean }, VercelApiError> {
+    return this.getVercelClient(integration).andThen((client) =>
+      ResultAsync.fromPromise(
+        (async () => {
+          const secret = await getSecretStore(integration.tokenReference.provider).getSecret(
+            VercelSecretSchema,
+            integration.tokenReference.key
+          );
+
+          if (!secret?.installationId) {
+            throw new Error("Installation ID not found in Vercel integration");
+          }
+
+          return secret.installationId;
+        })(),
+        toVercelApiError
+      ).andThen((installationId) =>
+        ResultAsync.fromPromise(
+          client.integrations.deleteConfiguration({
+            id: installationId,
+          }),
+          (error) => error
+        )
+          .map(() => ({ authInvalid: false }))
+          .orElse((error) => {
+            const isAuthError = isVercelAuthError(error);
+            logger.error("Failed to uninstall Vercel integration", {
+              installationId,
+              error: error instanceof Error ? error.message : "Unknown error",
+              isAuthError,
+            });
+            // Auth errors (401/403): still clean up on our side, return flag for caller
+            if (isAuthError) {
+              return okAsync({ authInvalid: true });
+            }
+            return errAsync(toVercelApiError(error));
+          })
+      )
+    );
+  }
+}
diff --git a/apps/webapp/app/presenters/OrganizationsPresenter.server.ts b/apps/webapp/app/presenters/OrganizationsPresenter.server.ts
index 5949aebc5d6..c229a0d7f45 100644
--- a/apps/webapp/app/presenters/OrganizationsPresenter.server.ts
+++ b/apps/webapp/app/presenters/OrganizationsPresenter.server.ts
@@ -1,4 +1,4 @@
-import { RuntimeEnvironment, type PrismaClient } from "@trigger.dev/database";
+import type { RuntimeEnvironment, PrismaClient } from "@trigger.dev/database";
 import { redirect } from "remix-typedjson";
 import { prisma } from "~/db.server";
 import { logger } from "~/services/logger.server";
@@ -10,6 +10,7 @@ import {
 } from "./SelectBestEnvironmentPresenter.server";
 import { sortEnvironments } from "~/utils/environmentSort";
 import { defaultAvatar, parseAvatar } from "~/components/primitives/Avatar";
+import { flags, validatePartialFeatureFlags } from "~/v3/featureFlags.server";
 
 export class OrganizationsPresenter {
   #prismaClient: PrismaClient;
@@ -132,6 +133,7 @@ export class OrganizationsPresenter {
         slug: true,
         title: true,
         avatar: true,
+        featureFlags: true,
         projects: {
           where: { deletedAt: null, version: "V3" },
           select: {
@@ -139,6 +141,7 @@ export class OrganizationsPresenter {
             slug: true,
             name: true,
             updatedAt: true,
+            externalRef: true,
           },
           orderBy: { name: "asc" },
         },
@@ -150,17 +153,30 @@ export class OrganizationsPresenter {
       },
     });
 
+    // Get global feature flags (no overrides or defaults)
+    const globalFlags = await flags();
+
     return orgs.map((org) => {
+      const orgFlagsResult = org.featureFlags
+        ? validatePartialFeatureFlags(org.featureFlags as Record<string, unknown>)
+        : ({ success: false } as const);
+      const orgFlags = orgFlagsResult.success ? orgFlagsResult.data : {};
+
+      // Combine global flags with org flags (org flags win)
+      const combinedFlags = { ...globalFlags, ...orgFlags };
+
       return {
         id: org.id,
         slug: org.slug,
         title: org.title,
         avatar: parseAvatar(org.avatar, defaultAvatar),
+        featureFlags: combinedFlags,
         projects: org.projects.map((project) => ({
           id: project.id,
           slug: project.slug,
           name: project.name,
           updatedAt: project.updatedAt,
+          externalRef: project.externalRef,
         })),
         membersCount: org._count.members,
       };
diff --git a/apps/webapp/app/presenters/RunFilters.server.ts b/apps/webapp/app/presenters/RunFilters.server.ts
index db19e656565..ef428f6ca2a 100644
--- a/apps/webapp/app/presenters/RunFilters.server.ts
+++ b/apps/webapp/app/presenters/RunFilters.server.ts
@@ -1,9 +1,10 @@
+import { type TaskRunStatus } from "@trigger.dev/database";
 import {
   getRunFiltersFromSearchParams,
   TaskRunListSearchFilters,
 } from "~/components/runs/v3/RunFilters";
 import { getRootOnlyFilterPreference } from "~/services/preferences/uiPreferences.server";
-import { type ParsedRunFilters } from "~/services/runsRepository.server";
+import { type ParsedRunFilters } from "~/services/runsRepository/runsRepository.server";
 
 type FiltersFromRequest = ParsedRunFilters & Required<Pick<ParsedRunFilters, "rootOnly">>;
 
@@ -39,7 +40,7 @@ export async function getRunFiltersFromRequest(request: Request): Promise<Filter
   return {
     tasks,
     versions,
-    statuses,
+    statuses: statuses as TaskRunStatus[] | undefined,
     tags,
     period,
     bulkId,
diff --git a/apps/webapp/app/presenters/v3/ApiKeysPresenter.server.ts b/apps/webapp/app/presenters/v3/ApiKeysPresenter.server.ts
index 1ff560586a9..78e64403e74 100644
--- a/apps/webapp/app/presenters/v3/ApiKeysPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/ApiKeysPresenter.server.ts
@@ -38,6 +38,11 @@ export class ApiKeysPresenter {
             apiKey: true,
           },
         },
+        project: {
+          select: {
+            id: true,
+          },
+        },
       },
       where: {
         project: {
@@ -64,11 +69,22 @@ export class ApiKeysPresenter {
       throw new Error("Environment not found");
     }
 
+    const vercelIntegration =
+      await this.#prismaClient.organizationProjectIntegration.findFirst({
+        where: {
+          projectId: environment.project.id,
+          deletedAt: null,
+          organizationIntegration: { service: "VERCEL", deletedAt: null },
+        },
+        select: { id: true },
+      });
+
     return {
       environment: {
         ...environment,
         apiKey: environment?.parentEnvironment?.apiKey ?? environment?.apiKey,
       },
+      hasVercelIntegration: vercelIntegration !== null,
     };
   }
 }
diff --git a/apps/webapp/app/presenters/v3/ApiRetrieveRunPresenter.server.ts b/apps/webapp/app/presenters/v3/ApiRetrieveRunPresenter.server.ts
index 06f1a4c5383..8d1a312c5d7 100644
--- a/apps/webapp/app/presenters/v3/ApiRetrieveRunPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/ApiRetrieveRunPresenter.server.ts
@@ -7,8 +7,9 @@ import {
   conditionallyImportPacket,
   createJsonErrorObject,
   logger,
-  parsePacket,
 } from "@trigger.dev/core/v3";
+import { parsePacketAsJson } from "@trigger.dev/core/v3/utils/ioSerialization";
+import { getUserProvidedIdempotencyKey } from "@trigger.dev/core/v3/serverOnly";
 import { Prisma, TaskRunAttemptStatus, TaskRunStatus } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { API_VERSIONS, CURRENT_API_VERSION, RunStatusUnspecifiedApiVersion } from "~/api/versions";
@@ -38,6 +39,7 @@ const commonRunSelect = {
   baseCostInCents: true,
   usageDurationMs: true,
   idempotencyKey: true,
+  idempotencyKeyOptions: true,
   isTest: true,
   depth: true,
   scheduleId: true,
@@ -75,6 +77,7 @@ export class ApiRetrieveRunPresenter {
       },
       select: {
         ...commonRunSelect,
+        traceId: true,
         payload: true,
         payloadType: true,
         output: true,
@@ -133,7 +136,7 @@ export class ApiRetrieveRunPresenter {
           });
         }
       } else {
-        $payload = await parsePacket(payloadPacket);
+        $payload = await parsePacketAsJson(payloadPacket);
       }
 
       if (taskRun.status === "COMPLETED_SUCCESSFULLY") {
@@ -162,7 +165,7 @@ export class ApiRetrieveRunPresenter {
             });
           }
         } else {
-          $output = await parsePacket(outputPacket);
+          $output = await parsePacketAsJson(outputPacket);
         }
       }
 
@@ -433,7 +436,7 @@ async function resolveSchedule(run: CommonRelatedRun) {
 }
 
 async function createCommonRunStructure(run: CommonRelatedRun, apiVersion: API_VERSIONS) {
-  const metadata = await parsePacket({
+  const metadata = await parsePacketAsJson({
     data: run.metadata ?? undefined,
     dataType: run.metadataType,
   });
@@ -441,7 +444,7 @@ async function createCommonRunStructure(run: CommonRelatedRun, apiVersion: API_V
   return {
     id: run.friendlyId,
     taskIdentifier: run.taskIdentifier,
-    idempotencyKey: run.idempotencyKey ?? undefined,
+    idempotencyKey: getUserProvidedIdempotencyKey(run),
     version: run.lockedToVersion?.version,
     status: ApiRetrieveRunPresenter.apiStatusFromRunStatus(run.status, apiVersion),
     createdAt: run.createdAt,
diff --git a/apps/webapp/app/presenters/v3/BatchListPresenter.server.ts b/apps/webapp/app/presenters/v3/BatchListPresenter.server.ts
index a42f0aba077..83de5f36d1e 100644
--- a/apps/webapp/app/presenters/v3/BatchListPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/BatchListPresenter.server.ts
@@ -195,7 +195,7 @@ WHERE
           throw new Error(`Environment not found for Batch ${batch.id}`);
         }
 
-        const hasFinished = batch.status !== "PENDING";
+        const hasFinished = batch.status !== "PENDING" && batch.status !== "PROCESSING";
 
         return {
           id: batch.id,
diff --git a/apps/webapp/app/presenters/v3/BatchPresenter.server.ts b/apps/webapp/app/presenters/v3/BatchPresenter.server.ts
new file mode 100644
index 00000000000..bf4298508b5
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/BatchPresenter.server.ts
@@ -0,0 +1,122 @@
+import { type BatchTaskRunStatus } from "@trigger.dev/database";
+import { displayableEnvironment } from "~/models/runtimeEnvironment.server";
+import { engine } from "~/v3/runEngine.server";
+import { BasePresenter } from "./basePresenter.server";
+
+type BatchPresenterOptions = {
+  environmentId: string;
+  batchId: string;
+  userId?: string;
+};
+
+export type BatchPresenterData = Awaited<ReturnType<BatchPresenter["call"]>>;
+
+export class BatchPresenter extends BasePresenter {
+  public async call({ environmentId, batchId, userId }: BatchPresenterOptions) {
+    const batch = await this._replica.batchTaskRun.findFirst({
+      select: {
+        id: true,
+        friendlyId: true,
+        status: true,
+        runCount: true,
+        batchVersion: true,
+        createdAt: true,
+        updatedAt: true,
+        completedAt: true,
+        processingStartedAt: true,
+        processingCompletedAt: true,
+        successfulRunCount: true,
+        failedRunCount: true,
+        idempotencyKey: true,
+        runtimeEnvironment: {
+          select: {
+            id: true,
+            type: true,
+            slug: true,
+            orgMember: {
+              select: {
+                user: {
+                  select: {
+                    id: true,
+                    name: true,
+                    displayName: true,
+                  },
+                },
+              },
+            },
+          },
+        },
+        errors: {
+          select: {
+            id: true,
+            index: true,
+            taskIdentifier: true,
+            error: true,
+            errorCode: true,
+            createdAt: true,
+          },
+          orderBy: {
+            index: "asc",
+          },
+        },
+      },
+      where: {
+        runtimeEnvironmentId: environmentId,
+        friendlyId: batchId,
+      },
+    });
+
+    if (!batch) {
+      throw new Error("Batch not found");
+    }
+
+    const hasFinished = batch.status !== "PENDING" && batch.status !== "PROCESSING";
+    const isV2 = batch.batchVersion === "runengine:v2";
+
+    // For v2 batches in PROCESSING state, get live progress from Redis
+    // This provides real-time updates without waiting for the batch to complete
+    let liveSuccessCount = batch.successfulRunCount ?? 0;
+    let liveFailureCount = batch.failedRunCount ?? 0;
+
+    if (isV2 && batch.status === "PROCESSING") {
+      const liveProgress = await engine.getBatchQueueProgress(batch.id);
+      if (liveProgress) {
+        liveSuccessCount = liveProgress.successCount;
+        liveFailureCount = liveProgress.failureCount;
+      }
+    }
+
+    return {
+      id: batch.id,
+      friendlyId: batch.friendlyId,
+      status: batch.status as BatchTaskRunStatus,
+      runCount: batch.runCount,
+      batchVersion: batch.batchVersion,
+      isV2,
+      createdAt: batch.createdAt.toISOString(),
+      updatedAt: batch.updatedAt.toISOString(),
+      completedAt: batch.completedAt?.toISOString(),
+      processingStartedAt: batch.processingStartedAt?.toISOString(),
+      processingCompletedAt: batch.processingCompletedAt?.toISOString(),
+      finishedAt: batch.completedAt
+        ? batch.completedAt.toISOString()
+        : hasFinished
+          ? batch.updatedAt.toISOString()
+          : undefined,
+      hasFinished,
+      successfulRunCount: liveSuccessCount,
+      failedRunCount: liveFailureCount,
+      idempotencyKey: batch.idempotencyKey,
+      environment: displayableEnvironment(batch.runtimeEnvironment, userId),
+      errors: batch.errors.map((error) => ({
+        id: error.id,
+        index: error.index,
+        taskIdentifier: error.taskIdentifier,
+        error: error.error,
+        errorCode: error.errorCode,
+        createdAt: error.createdAt.toISOString(),
+      })),
+    };
+  }
+}
+
diff --git a/apps/webapp/app/presenters/v3/BranchesPresenter.server.ts b/apps/webapp/app/presenters/v3/BranchesPresenter.server.ts
index 9951fe4b404..4aafc1844b0 100644
--- a/apps/webapp/app/presenters/v3/BranchesPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/BranchesPresenter.server.ts
@@ -1,6 +1,6 @@
 import { GitMeta } from "@trigger.dev/core/v3";
 import { type z } from "zod";
-import { Prisma, type PrismaClient, prisma } from "~/db.server";
+import { type Prisma, type PrismaClient, prisma } from "~/db.server";
 import { type Project } from "~/models/project.server";
 import { type User } from "~/models/user.server";
 import { type BranchesOptions } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route";
@@ -38,6 +38,13 @@ export type GitMetaLinks = {
   commitMessage: string;
   /** The commit author */
   commitAuthor: string;
+
+  /** The git provider, e.g., `github` */
+  provider?: string;
+
+  source?: "trigger_github_app" | "github_actions" | "local";
+  ghUsername?: string;
+  ghUserAvatarUrl?: string;
 };
 
 export class BranchesPresenter {
@@ -239,5 +246,9 @@ export function processGitMetadata(data: Prisma.JsonValue): GitMetaLinks | null
     isDirty: parsed.data.dirty ?? false,
     commitMessage: parsed.data.commitMessage ?? "",
     commitAuthor: parsed.data.commitAuthorName ?? "",
+    provider: parsed.data.provider,
+    source: parsed.data.source,
+    ghUsername: parsed.data.ghUsername,
+    ghUserAvatarUrl: parsed.data.ghUserAvatarUrl,
   };
 }
diff --git a/apps/webapp/app/presenters/v3/BuiltInDashboards.server.ts b/apps/webapp/app/presenters/v3/BuiltInDashboards.server.ts
new file mode 100644
index 00000000000..da95eeacc00
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/BuiltInDashboards.server.ts
@@ -0,0 +1,225 @@
+import { type BuiltInDashboard } from "./MetricDashboardPresenter.server";
+import { z } from "zod";
+
+const overviewDashboard: BuiltInDashboard = {
+  key: "overview",
+  title: "Metrics",
+  layout: {
+    version: "1",
+    layout: [
+      { i: "9lDDdebQ", x: 3, y: 0, w: 3, h: 4 },
+      { i: "VhAgNlB0", x: 0, y: 0, w: 3, h: 4 },
+      { i: "iI5EnhJW", x: 6, y: 0, w: 3, h: 4 },
+      { i: "HtSgJEmp", x: 0, y: 17, w: 12, h: 2, minH: 2, maxH: 2 },
+      { i: "rRbzv-Aq", x: 6, y: 4, w: 6, h: 13 },
+      { i: "j3yFSxLM", x: 0, y: 33, w: 6, h: 11 },
+      { i: "IKB8cENo", x: 6, y: 33, w: 6, h: 11 },
+      { i: "-fHz3CyQ", x: 0, y: 56, w: 12, h: 2, minH: 2, maxH: 2 },
+      { i: "hnKsN482", x: 0, y: 58, w: 12, h: 15 },
+      { i: "if6dds8T", x: 0, y: 19, w: 12, h: 14 },
+      { i: "i3q1Awfz", x: 0, y: 4, w: 6, h: 13 },
+      { i: "Kh0w0fjy", x: 6, y: 44, w: 6, h: 12 },
+      { i: "zybRTAdz", x: 0, y: 44, w: 6, h: 12 },
+      { i: "ff2nVxxt", x: 0, y: 73, w: 12, h: 15 },
+      { i: "Dib0ywb4", x: 0, y: 88, w: 12, h: 2, minH: 2, maxH: 2 },
+      { i: "YsWiQENd", x: 0, y: 90, w: 12, h: 15 },
+      { i: "lc-guCvo", x: 0, y: 105, w: 12, h: 15 },
+      { i: "xyQl3FAd", x: 9, y: 0, w: 3, h: 4 },
+    ],
+    widgets: {
+      "9lDDdebQ": {
+        title: "Total runs",
+        query: "SELECT\r\n  count() AS total_runs\r\nFROM\r\n  runs",
+        display: { type: "bignumber", column: "total_runs", aggregation: "sum", abbreviate: false },
+      },
+      VhAgNlB0: {
+        title: "Success %",
+        query:
+          "SELECT\r\n  round(countIf (status = 'Completed') * 100.0 / countIf (is_finished = 1), 2) AS success_percentage\r\nFROM\r\n  runs",
+        display: {
+          type: "bignumber",
+          column: "success_percentage",
+          aggregation: "avg",
+          abbreviate: true,
+          suffix: "%",
+        },
+      },
+      iI5EnhJW: {
+        title: "Failed runs",
+        query:
+          "SELECT\r\n  count() AS total_runs\r\nFROM\r\n  runs\r\nWHERE status IN ('Failed', 'System failure', 'Crashed')",
+        display: { type: "bignumber", column: "total_runs", aggregation: "sum", abbreviate: false },
+      },
+      HtSgJEmp: { title: "Failed runs", query: "", display: { type: "title" } },
+      "rRbzv-Aq": {
+        title: "Runs by status",
+        query:
+          "SELECT\r\n  timeBucket (),\r\n  status,\r\n  count() AS run_count\r\nFROM\r\n  runs\r\nGROUP BY\r\n  timeBucket,\r\n  status\r\nORDER BY\r\n  timeBucket",
+        display: {
+          type: "chart",
+          chartType: "bar",
+          xAxisColumn: "timebucket",
+          yAxisColumns: ["run_count"],
+          groupByColumn: "status",
+          stacked: true,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "sum",
+        },
+      },
+      j3yFSxLM: {
+        title: "Top failing tasks",
+        query:
+          "SELECT\r\n  task_identifier AS task,\r\n  count() AS runs,\r\n  countIf (status IN ('Failed', 'Crashed', 'System failure')) AS failures,\r\n  concat(round((countIf (status IN ('Failed', 'Crashed', 'System failure')) / count()) * 100, 2), '%') AS failure_rate,\r\n  avg(attempt_count - 1) AS avg_retries\r\nFROM\r\n  runs\r\nGROUP BY\r\n  task_identifier\r\nORDER BY\r\n  (countIf (status IN ('Failed', 'Crashed', 'System failure')) / count()) DESC;",
+        display: { type: "table", prettyFormatting: true, sorting: [] },
+      },
+      IKB8cENo: {
+        title: "Top failing tags",
+        query:
+          "SELECT\r\n  arrayJoin(tags) AS tag,\r\n  count() AS runs,\r\n  countIf (status IN ('Failed', 'Crashed', 'System failure')) AS failures,\r\n  concat(round((countIf (status IN ('Failed', 'Crashed', 'System failure')) / count()) * 100, 2), '%') AS failure_rate,\r\n  avg(attempt_count - 1) AS avg_retries\r\nFROM\r\n  runs\r\nGROUP BY\r\n  tag\r\nORDER BY\r\n  (countIf (status IN ('Failed', 'Crashed', 'System failure')) / count()) DESC;",
+        display: { type: "table", prettyFormatting: true, sorting: [] },
+      },
+      "-fHz3CyQ": { title: "Usage and cost", query: "", display: { type: "title" } },
+      hnKsN482: {
+        title: "Cost by task",
+        query:
+          "SELECT\r\n  timeBucket() as time_period,\r\n  task_identifier,\r\n  sum(total_cost) AS total_cost\r\nFROM\r\n  runs\r\nGROUP BY\r\n  time_period,\r\n  task_identifier\r\nORDER BY\r\n  time_period",
+        display: {
+          type: "chart",
+          chartType: "line",
+          xAxisColumn: "time_period",
+          yAxisColumns: ["total_cost"],
+          groupByColumn: "task_identifier",
+          stacked: true,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "sum",
+        },
+      },
+      if6dds8T: {
+        title: "Failed runs by task",
+        query:
+          "SELECT\r\n  timeBucket () as time_period,\r\n  task_identifier,\r\n  count() AS run_count\r\nFROM\r\n  runs\r\nWHERE status IN ('Failed', 'Crashed', 'System failure')\r\nGROUP BY\r\n  time_period,\r\n  task_identifier\r\nORDER BY\r\n  time_period",
+        display: {
+          type: "chart",
+          chartType: "bar",
+          xAxisColumn: "time_period",
+          yAxisColumns: ["run_count"],
+          groupByColumn: "task_identifier",
+          stacked: true,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "sum",
+        },
+      },
+      i3q1Awfz: {
+        title: "Run success %",
+        query:
+          "SELECT\r\n  timeBucket (),\r\n  count() as total,\r\n  countIf (status = 'Completed') / total * 100 AS completed,\r\n  countIf (status IN ('Failed', 'Crashed', 'System failure')) / total * 100 AS failed,\r\nFROM\r\n  runs\r\nGROUP BY\r\n  timeBucket\r\nORDER BY\r\n  timeBucket",
+        display: {
+          type: "chart",
+          chartType: "line",
+          xAxisColumn: "timebucket",
+          yAxisColumns: ["failed", "completed"],
+          groupByColumn: null,
+          stacked: false,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "avg",
+          seriesColors: { failed: "#f43f5e" },
+        },
+      },
+      Kh0w0fjy: {
+        title: "Top errors",
+        query:
+          "SELECT\r\n  concat(error.name, '(\"', error.message, '\")') AS error,\r\n  count() AS count\r\nFROM\r\n  runs\r\nWHERE\r\n  runs.error != NULL\r\n  AND runs.error.name != NULL\r\nGROUP BY\r\n  error\r\nORDER BY\r\n  count DESC",
+        display: { type: "table", prettyFormatting: true, sorting: [] },
+      },
+      zybRTAdz: {
+        title: "Top errors over time",
+        query:
+          "SELECT\r\n  timeBucket(),\r\n  concat(error.name, '(\"', error.message, '\")') AS error,\r\n  count() AS count\r\nFROM\r\n  runs\r\nWHERE\r\n  runs.error != NULL\r\n  AND runs.error.name != NULL\r\nGROUP BY\r\n  timeBucket,\r\n  error\r\nORDER BY\r\n  count DESC",
+        display: {
+          type: "chart",
+          chartType: "bar",
+          xAxisColumn: "timebucket",
+          yAxisColumns: ["count"],
+          groupByColumn: "error",
+          stacked: true,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "sum",
+          seriesColors: { count: "#ef4343" },
+        },
+      },
+      ff2nVxxt: {
+        title: "Cost by machine",
+        query:
+          "SELECT\r\n  timeBucket() as time_period,\r\n  machine,\r\n  sum(total_cost) AS total_cost\r\nFROM\r\n  runs\r\nWHERE machine != ''\r\nGROUP BY\r\n  time_period,\r\n  machine\r\nORDER BY\r\n  time_period",
+        display: {
+          type: "chart",
+          chartType: "line",
+          xAxisColumn: "time_period",
+          yAxisColumns: ["total_cost"],
+          groupByColumn: "machine",
+          stacked: true,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "sum",
+        },
+      },
+      Dib0ywb4: { title: "Versions", query: "", display: { type: "title" } },
+      YsWiQENd: {
+        title: "Runs by version",
+        query:
+          "SELECT\r\n  timeBucket (),\r\n  task_version,\r\n  count() as runs\r\nFROM\r\n  runs\r\nWHERE task_version != ''\r\nGROUP BY\r\n  timeBucket,\r\n  task_version\r\nORDER BY\r\n  timeBucket",
+        display: {
+          type: "chart",
+          chartType: "line",
+          xAxisColumn: "timebucket",
+          yAxisColumns: ["runs"],
+          groupByColumn: "task_version",
+          stacked: false,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "sum",
+          seriesColors: {},
+        },
+      },
+      "lc-guCvo": {
+        title: "Version success %",
+        query:
+          "SELECT\r\n  timeBucket (),\r\n  task_version,\r\n  count() as total,\r\n  countIf (status = 'Completed') / total * 100 AS success\r\nFROM\r\n  runs\r\nWHERE task_version != ''\r\nGROUP BY\r\n  timeBucket,\r\n  task_version\r\nORDER BY\r\n  timeBucket",
+        display: {
+          type: "chart",
+          chartType: "line",
+          xAxisColumn: "timebucket",
+          yAxisColumns: ["success"],
+          groupByColumn: "task_version",
+          stacked: false,
+          sortByColumn: null,
+          sortDirection: "asc",
+          aggregation: "avg",
+          seriesColors: {},
+        },
+      },
+      xyQl3FAd: {
+        title: "Queued",
+        query:
+          "SELECT\r\n  count() AS queued\r\nFROM\r\n  runs\r\nWHERE status IN ('Dequeued', 'Queued')",
+        display: { type: "bignumber", column: "queued", aggregation: "sum", abbreviate: false },
+      },
+    },
+  },
+};
+
+const builtInDashboards: BuiltInDashboard[] = [overviewDashboard];
+
+export function builtInDashboard(key: string): BuiltInDashboard {
+  const dashboard = builtInDashboards.find((d) => d.key === key);
+  if (!dashboard) {
+    throw new Error(`No built-in dashboard "${key}"`);
+  }
+
+  return dashboard;
+}
diff --git a/apps/webapp/app/presenters/v3/BulkActionPresenter.server.ts b/apps/webapp/app/presenters/v3/BulkActionPresenter.server.ts
index 0434045ea49..f98d0819cba 100644
--- a/apps/webapp/app/presenters/v3/BulkActionPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/BulkActionPresenter.server.ts
@@ -1,7 +1,7 @@
 import { getUsername } from "~/utils/username";
 import { BasePresenter } from "./basePresenter.server";
 import { type BulkActionMode } from "~/components/BulkActionFilterSummary";
-import { parseRunListInputOptions } from "~/services/runsRepository.server";
+import { parseRunListInputOptions } from "~/services/runsRepository/runsRepository.server";
 import { TaskRunListSearchFilters } from "~/components/runs/v3/RunFilters";
 
 type BulkActionOptions = {
diff --git a/apps/webapp/app/presenters/v3/CreateBulkActionPresenter.server.ts b/apps/webapp/app/presenters/v3/CreateBulkActionPresenter.server.ts
index e80c7df42b2..acf511f0f5e 100644
--- a/apps/webapp/app/presenters/v3/CreateBulkActionPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/CreateBulkActionPresenter.server.ts
@@ -1,7 +1,7 @@
 import { type PrismaClient } from "@trigger.dev/database";
 import { CreateBulkActionSearchParams } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
-import { RunsRepository } from "~/services/runsRepository.server";
+import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
 import { getRunFiltersFromRequest } from "../RunFilters.server";
 import { BasePresenter } from "./basePresenter.server";
 
diff --git a/apps/webapp/app/presenters/v3/DeploymentListPresenter.server.ts b/apps/webapp/app/presenters/v3/DeploymentListPresenter.server.ts
index 8df832a0c52..80e3aa3ccd9 100644
--- a/apps/webapp/app/presenters/v3/DeploymentListPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/DeploymentListPresenter.server.ts
@@ -9,6 +9,8 @@ import { type Project } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { type User } from "~/models/user.server";
 import { processGitMetadata } from "./BranchesPresenter.server";
+import { BranchTrackingConfigSchema, getTrackedBranchForEnvironment } from "~/v3/github";
+import { VercelProjectIntegrationDataSchema } from "~/v3/vercel/vercelProjectIntegrationSchema";
 
 const pageSize = 20;
 
@@ -56,6 +58,18 @@ export class DeploymentListPresenter {
             },
           },
         },
+        connectedGithubRepository: {
+          select: {
+            branchTracking: true,
+            previewDeploymentsEnabled: true,
+            repository: {
+              select: {
+                htmlUrl: true,
+                fullName: true,
+              },
+            },
+          },
+        },
       },
       where: {
         slug: projectSlug,
@@ -92,6 +106,51 @@ export class DeploymentListPresenter {
       },
     });
 
+    // Check for Vercel integration before the main query so we can conditionally LEFT JOIN
+    let hasVercelIntegration = false;
+    let vercelTeamSlug: string | undefined;
+    let vercelProjectName: string | undefined;
+
+    const vercelProjectIntegration =
+      await this.#prismaClient.organizationProjectIntegration.findFirst({
+        where: {
+          projectId: project.id,
+          deletedAt: null,
+          organizationIntegration: {
+            service: "VERCEL",
+            deletedAt: null,
+          },
+        },
+        select: {
+          integrationData: true,
+        },
+      });
+
+    if (vercelProjectIntegration) {
+      const parsed = VercelProjectIntegrationDataSchema.safeParse(
+        vercelProjectIntegration.integrationData
+      );
+
+      if (parsed.success && parsed.data.vercelTeamSlug) {
+        hasVercelIntegration = true;
+        vercelTeamSlug = parsed.data.vercelTeamSlug;
+        vercelProjectName = parsed.data.vercelProjectName;
+      }
+    }
+
+    const vercelSelect = hasVercelIntegration
+      ? Prisma.sql`, id_dep."integrationDeploymentId"`
+      : Prisma.sql``;
+    const vercelJoin = hasVercelIntegration
+      ? Prisma.sql`LEFT JOIN LATERAL (
+        SELECT id_inner."integrationDeploymentId"
+        FROM ${sqlDatabaseSchema}."IntegrationDeployment" as id_inner
+        WHERE id_inner."deploymentId" = wd."id" AND id_inner."integrationName" = 'vercel'
+        ORDER BY id_inner."createdAt" DESC
+        LIMIT 1
+      ) id_dep ON true`
+      : Prisma.sql``;
+
     const deployments = await this.#prismaClient.$queryRaw<
       {
         id: string;
@@ -110,6 +169,7 @@ export class DeploymentListPresenter {
         userAvatarUrl: string | null;
         type: WorkerInstanceGroupType;
         git: Prisma.JsonValue | null;
+        integrationDeploymentId: string | null;
       }[]
     >`
     SELECT
@@ -129,10 +189,12 @@ export class DeploymentListPresenter {
   wd."deployedAt",
   wd."type",
   wd."git"
+  ${vercelSelect}
 FROM
   ${sqlDatabaseSchema}."WorkerDeployment" as wd
-INNER JOIN
+LEFT JOIN
   ${sqlDatabaseSchema}."User" as u ON wd."triggeredById" = u."id"
+${vercelJoin}
 WHERE
   wd."projectId" = ${project.id}
   AND wd."environmentId" = ${environment.id}
@@ -141,14 +203,40 @@ ORDER BY
   split_part(wd."version", '-', 2) DESC
 LIMIT ${pageSize} OFFSET ${pageSize * (page - 1)};`;
 
+    const { connectedGithubRepository } = project;
+
+    const branchTrackingOrError =
+      connectedGithubRepository &&
+      BranchTrackingConfigSchema.safeParse(connectedGithubRepository.branchTracking);
+    const environmentGitHubBranch =
+      branchTrackingOrError && branchTrackingOrError.success
+        ? getTrackedBranchForEnvironment(
+            branchTrackingOrError.data,
+            connectedGithubRepository.previewDeploymentsEnabled,
+            {
+              type: environment.type,
+              branchName: environment.branchName ?? undefined,
+            }
+          )
+        : undefined;
+
     return {
       currentPage: page,
       totalPages: Math.ceil(totalCount / pageSize),
+      hasVercelIntegration,
+      connectedGithubRepository: project.connectedGithubRepository ?? undefined,
+      environmentGitHubBranch,
       deployments: deployments.map((deployment, index) => {
         const label = labeledDeployments.find(
           (labeledDeployment) => labeledDeployment.deploymentId === deployment.id
         );
 
+        let vercelDeploymentUrl: string | null = null;
+        if (hasVercelIntegration && deployment.integrationDeploymentId && vercelTeamSlug && vercelProjectName) {
+          const vercelId = deployment.integrationDeploymentId.replace(/^dpl_/, "");
+          vercelDeploymentUrl = `https://vercel.com/${vercelTeamSlug}/${vercelProjectName}/${vercelId}`;
+        }
+
         return {
           id: deployment.id,
           shortCode: deployment.shortCode,
@@ -179,6 +267,7 @@ LIMIT ${pageSize} OFFSET ${pageSize * (page - 1)};`;
               }
             : undefined,
           git: processGitMetadata(deployment.git),
+          vercelDeploymentUrl,
         };
       }),
     };
diff --git a/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts b/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts
index 35e6e4184f7..bc494c118aa 100644
--- a/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/DeploymentPresenter.server.ts
@@ -1,9 +1,10 @@
 import {
+  BuildServerMetadata,
   DeploymentErrorData,
   ExternalBuildData,
   prepareDeploymentError,
 } from "@trigger.dev/core/v3";
-import { RuntimeEnvironment, type WorkerDeployment } from "@trigger.dev/database";
+import { type RuntimeEnvironment, type WorkerDeployment } from "@trigger.dev/database";
 import { type PrismaClient, prisma } from "~/db.server";
 import { type Organization } from "~/models/organization.server";
 import { type Project } from "~/models/project.server";
@@ -11,6 +12,24 @@ import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import { type User } from "~/models/user.server";
 import { getUsername } from "~/utils/username";
 import { processGitMetadata } from "./BranchesPresenter.server";
+import { S2 } from "@s2-dev/streamstore";
+import { env } from "~/env.server";
+import { createRedisClient } from "~/redis.server";
+import { tryCatch } from "@trigger.dev/core";
+import { logger } from "~/services/logger.server";
+
+const S2_TOKEN_KEY_PREFIX = "s2-token:project:";
+
+const s2TokenRedis = createRedisClient("s2-token-cache", {
+  host: env.CACHE_REDIS_HOST,
+  port: env.CACHE_REDIS_PORT,
+  username: env.CACHE_REDIS_USERNAME,
+  password: env.CACHE_REDIS_PASSWORD,
+  tlsDisabled: env.CACHE_REDIS_TLS_DISABLED === "true",
+  clusterMode: env.CACHE_REDIS_CLUSTER_MODE_ENABLED === "1",
+});
+
+const s2 = env.S2_ENABLED === "1" ? new S2({ accessToken: env.S2_ACCESS_TOKEN }) : undefined;
 
 export type ErrorData = {
   name: string;
@@ -43,6 +62,7 @@ export class DeploymentPresenter {
       select: {
         id: true,
         organizationId: true,
+        externalRef: true,
       },
       where: {
         slug: projectSlug,
@@ -102,6 +122,10 @@ export class DeploymentPresenter {
         builtAt: true,
         deployedAt: true,
         createdAt: true,
+        startedAt: true,
+        installedAt: true,
+        canceledAt: true,
+        canceledReason: true,
         git: true,
         promotions: {
           select: {
@@ -131,22 +155,53 @@ export class DeploymentPresenter {
             avatarUrl: true,
           },
         },
+        buildServerMetadata: true,
+        triggeredVia: true,
       },
     });
 
+    const gitMetadata = processGitMetadata(deployment.git);
     const externalBuildData = deployment.externalBuildData
       ? ExternalBuildData.safeParse(deployment.externalBuildData)
       : undefined;
+    const buildServerMetadata = deployment.buildServerMetadata
+      ? BuildServerMetadata.safeParse(deployment.buildServerMetadata)
+      : undefined;
+
+    let eventStream = undefined;
+    if (
+      env.S2_ENABLED === "1" &&
+      (buildServerMetadata || gitMetadata?.source === "trigger_github_app")
+    ) {
+      const [error, accessToken] = await tryCatch(this.getS2AccessToken(project.externalRef));
+
+      if (error) {
+        logger.error("Failed getting S2 access token", { error });
+      } else {
+        eventStream = {
+          s2: {
+            basin: env.S2_DEPLOYMENT_LOGS_BASIN_NAME,
+            stream: `projects/${project.externalRef}/deployments/${deployment.shortCode}`,
+            accessToken,
+          },
+        };
+      }
+    }
 
     return {
+      eventStream,
       deployment: {
         id: deployment.id,
         shortCode: deployment.shortCode,
         version: deployment.version,
         status: deployment.status,
         createdAt: deployment.createdAt,
+        startedAt: deployment.startedAt,
+        installedAt: deployment.installedAt,
         builtAt: deployment.builtAt,
         deployedAt: deployment.deployedAt,
+        canceledAt: deployment.canceledAt,
+        canceledReason: deployment.canceledReason,
         tasks: deployment.worker?.tasks,
         label: deployment.promotions?.[0]?.label,
         environment: {
@@ -170,11 +225,47 @@ export class DeploymentPresenter {
         errorData: DeploymentPresenter.prepareErrorData(deployment.errorData),
         isBuilt: !!deployment.builtAt,
         type: deployment.type,
-        git: processGitMetadata(deployment.git),
+        git: gitMetadata,
+        triggeredVia: deployment.triggeredVia,
       },
     };
   }
 
+  private async getS2AccessToken(projectRef: string): Promise<string> {
+    if (env.S2_ENABLED !== "1" || !s2) {
+      throw new Error("Failed getting S2 access token: S2 is not enabled");
+    }
+
+    const redisKey = `${S2_TOKEN_KEY_PREFIX}${projectRef}`;
+    const cachedToken = await s2TokenRedis.get(redisKey);
+
+    if (cachedToken) {
+      return cachedToken;
+    }
+
+    const { access_token: accessToken } = await s2.accessTokens.issue({
+      id: `${projectRef}-${new Date().getTime()}`,
+      expires_at: new Date(Date.now() + 60 * 60 * 1000).toISOString(), // 1 hour
+      scope: {
+        ops: ["read"],
+        basins: {
+          exact: env.S2_DEPLOYMENT_LOGS_BASIN_NAME,
+        },
+        streams: {
+          prefix: `projects/${projectRef}/deployments/`,
+        },
+      },
+    });
+
+    await s2TokenRedis.setex(
+      redisKey,
+      59 * 60, // slightly shorter than the token validity period
+      accessToken
+    );
+
+    return accessToken;
+  }
+
   public static prepareErrorData(errorData: WorkerDeployment["errorData"]): ErrorData | undefined {
     if (!errorData) {
       return;
diff --git a/apps/webapp/app/presenters/v3/EnvironmentQueuePresenter.server.ts b/apps/webapp/app/presenters/v3/EnvironmentQueuePresenter.server.ts
index 7469a2c0b1b..f408511a832 100644
--- a/apps/webapp/app/presenters/v3/EnvironmentQueuePresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/EnvironmentQueuePresenter.server.ts
@@ -7,6 +7,8 @@ export type Environment = {
   running: number;
   queued: number;
   concurrencyLimit: number;
+  burstFactor: number;
+  runsEnabled: boolean;
 };
 
 export class EnvironmentQueuePresenter extends BasePresenter {
@@ -22,10 +24,25 @@ export class EnvironmentQueuePresenter extends BasePresenter {
     const running = (engineV1Executing ?? 0) + (engineV2Executing ?? 0);
     const queued = (engineV1Queued ?? 0) + (engineV2Queued ?? 0);
 
+    const organization = await this._replica.organization.findFirst({
+      where: {
+        id: environment.organizationId,
+      },
+      select: {
+        runsEnabled: true,
+      },
+    });
+
+    if (!organization) {
+      throw new Error("Organization not found");
+    }
+
     return {
       running,
       queued,
       concurrencyLimit: environment.maximumConcurrencyLimit,
+      burstFactor: environment.concurrencyLimitBurstFactor.toNumber(),
+      runsEnabled: environment.type === "DEVELOPMENT" || organization.runsEnabled,
     };
   }
 }
diff --git a/apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts b/apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts
index 730591f4ebc..aff55263fec 100644
--- a/apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/EnvironmentVariablesPresenter.server.ts
@@ -1,9 +1,14 @@
-import { flipCauseOption } from "effect/Cause";
 import { PrismaClient, prisma } from "~/db.server";
 import { Project } from "~/models/project.server";
 import { User } from "~/models/user.server";
 import { filterOrphanedEnvironments, sortEnvironments } from "~/utils/environmentSort";
 import { EnvironmentVariablesRepository } from "~/v3/environmentVariables/environmentVariablesRepository.server";
+import type { EnvironmentVariableUpdater } from "~/v3/environmentVariables/repository";
+import {
+  SyncEnvVarsMapping,
+  EnvSlug,
+} from "~/v3/vercel/vercelProjectIntegrationSchema";
+import { VercelIntegrationService } from "~/services/vercelIntegration.server";
 
 type Result = Awaited<ReturnType<EnvironmentVariablesPresenter["call"]>>;
 export type EnvironmentVariableWithSetValues = Result["environmentVariables"][number];
@@ -44,6 +49,9 @@ export class EnvironmentVariablesPresenter {
           select: {
             id: true,
             environmentId: true,
+            version: true,
+            lastUpdatedBy: true,
+            updatedAt: true,
             valueReference: {
               select: {
                 key: true,
@@ -67,6 +75,42 @@ export class EnvironmentVariablesPresenter {
       },
     });
 
+    const userIds = new Set(
+      environmentVariables
+        .flatMap((envVar) => envVar.values)
+        .map((value) => value.lastUpdatedBy)
+        .filter(
+          (lastUpdatedBy): lastUpdatedBy is { type: "user"; userId: string } =>
+            lastUpdatedBy !== null &&
+            typeof lastUpdatedBy === "object" &&
+            "type" in lastUpdatedBy &&
+            lastUpdatedBy.type === "user" &&
+            "userId" in lastUpdatedBy &&
+            typeof lastUpdatedBy.userId === "string"
+        )
+        .map((lastUpdatedBy) => lastUpdatedBy.userId)
+    );
+
+    const users =
+      userIds.size > 0
+        ? await this.#prismaClient.user.findMany({
+            where: {
+              id: {
+                in: Array.from(userIds),
+              },
+            },
+            select: {
+              id: true,
+              name: true,
+              displayName: true,
+              avatarUrl: true,
+            },
+          })
+        : [];
+
+    const usersRecord: Record<string, { id: string; name: string | null; displayName: string | null; avatarUrl: string | null }> =
+      Object.fromEntries(users.map((u) => [u.id, u]));
+
     const environments = await this.#prismaClient.runtimeEnvironment.findMany({
       select: {
         id: true,
@@ -94,6 +138,18 @@ export class EnvironmentVariablesPresenter {
     const repository = new EnvironmentVariablesRepository(this.#prismaClient);
     const variables = await repository.getProject(project.id);
 
+    // Get Vercel integration data if it exists
+    const vercelService = new VercelIntegrationService(this.#prismaClient);
+    const vercelIntegration = await vercelService.getVercelProjectIntegration(project.id);
+
+    let vercelSyncEnvVarsMapping: SyncEnvVarsMapping = {};
+    let vercelPullEnvVarsBeforeBuild: EnvSlug[] | null = null;
+
+    if (vercelIntegration) {
+      vercelSyncEnvVarsMapping = vercelIntegration.parsedIntegrationData.syncEnvVarsMapping;
+      vercelPullEnvVarsBeforeBuild = vercelIntegration.parsedIntegrationData.config.pullEnvVarsBeforeBuild ?? null;
+    }
+
     return {
       environmentVariables: environmentVariables
         .flatMap((environmentVariable) => {
@@ -101,13 +157,29 @@ export class EnvironmentVariablesPresenter {
 
           return sortedEnvironments.flatMap((env) => {
             const val = variable?.values.find((v) => v.environment.id === env.id);
-            const isSecret =
-              environmentVariable.values.find((v) => v.environmentId === env.id)?.isSecret ?? false;
+            const valueRecord = environmentVariable.values.find((v) => v.environmentId === env.id);
+            const isSecret = valueRecord?.isSecret ?? false;
 
-            if (!val) {
+            if (!val || !valueRecord) {
               return [];
             }
 
+            const lastUpdatedBy = valueRecord.lastUpdatedBy as EnvironmentVariableUpdater | null;
+
+            const updatedByUser =
+              lastUpdatedBy?.type === "user"
+                ? (() => {
+                    const user = usersRecord[lastUpdatedBy.userId];
+                    return user
+                      ? {
+                          id: user.id,
+                          name: user.displayName || user.name || "Unknown",
+                          avatarUrl: user.avatarUrl,
+                        }
+                      : null;
+                  })()
+                : null;
+
             return [
               {
                 id: environmentVariable.id,
@@ -115,6 +187,10 @@ export class EnvironmentVariablesPresenter {
                 environment: { type: env.type, id: env.id, branchName: env.branchName },
                 value: isSecret ? "" : val.value,
                 isSecret,
+                version: valueRecord.version,
+                lastUpdatedBy,
+                updatedByUser,
+                updatedAt: valueRecord.updatedAt,
               },
             ];
           });
@@ -127,6 +203,14 @@ export class EnvironmentVariablesPresenter {
         branchName: environment.branchName,
       })),
       hasStaging: environments.some((environment) => environment.type === "STAGING"),
+      // Vercel integration data
+      vercelIntegration: vercelIntegration
+        ? {
+            enabled: true,
+            pullEnvVarsBeforeBuild: vercelPullEnvVarsBeforeBuild,
+            syncEnvVarsMapping: vercelSyncEnvVarsMapping,
+          }
+        : null,
     };
   }
 }
diff --git a/apps/webapp/app/presenters/v3/GitHubSettingsPresenter.server.ts b/apps/webapp/app/presenters/v3/GitHubSettingsPresenter.server.ts
new file mode 100644
index 00000000000..c3f715deff2
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/GitHubSettingsPresenter.server.ts
@@ -0,0 +1,137 @@
+import { type PrismaClient } from "@trigger.dev/database";
+import { err, fromPromise, ok, ResultAsync } from "neverthrow";
+import { env } from "~/env.server";
+import { BranchTrackingConfigSchema } from "~/v3/github";
+import { BasePresenter } from "./basePresenter.server";
+
+type GitHubSettingsOptions = {
+  projectId: string;
+  organizationId: string;
+};
+
+export class GitHubSettingsPresenter extends BasePresenter {
+  public call({ projectId, organizationId }: GitHubSettingsOptions) {
+    const githubAppEnabled = env.GITHUB_APP_ENABLED === "1";
+
+    if (!githubAppEnabled) {
+      return ok({
+        enabled: false,
+        connectedRepository: undefined,
+        installations: undefined,
+        isPreviewEnvironmentEnabled: undefined,
+      });
+    }
+
+    const findConnectedGithubRepository = () =>
+      fromPromise(
+        (this._replica as PrismaClient).connectedGithubRepository.findFirst({
+          where: {
+            projectId,
+            repository: {
+              installation: {
+                deletedAt: null,
+                suspendedAt: null,
+              },
+            },
+          },
+          select: {
+            branchTracking: true,
+            previewDeploymentsEnabled: true,
+            createdAt: true,
+            repository: {
+              select: {
+                id: true,
+                name: true,
+                fullName: true,
+                htmlUrl: true,
+                private: true,
+              },
+            },
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((connectedGithubRepository) => {
+        if (!connectedGithubRepository) {
+          return undefined;
+        }
+
+        const branchTrackingOrFailure = BranchTrackingConfigSchema.safeParse(
+          connectedGithubRepository.branchTracking
+        );
+        const branchTracking = branchTrackingOrFailure.success
+          ? branchTrackingOrFailure.data
+          : undefined;
+
+        return {
+          ...connectedGithubRepository,
+          branchTracking,
+        };
+      });
+
+    const listGithubAppInstallations = () =>
+      fromPromise(
+        (this._replica as PrismaClient).githubAppInstallation.findMany({
+          where: {
+            organizationId,
+            deletedAt: null,
+            suspendedAt: null,
+          },
+          select: {
+            id: true,
+            accountHandle: true,
+            targetType: true,
+            appInstallationId: true,
+            repositories: {
+              select: {
+                id: true,
+                name: true,
+                fullName: true,
+                htmlUrl: true,
+                private: true,
+              },
+              take: 200,
+            },
+          },
+          take: 20,
+          orderBy: {
+            createdAt: "desc",
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      );
+
+    const isPreviewEnvironmentEnabled = () =>
+      fromPromise(
+        (this._replica as PrismaClient).runtimeEnvironment.findFirst({
+          select: {
+            id: true,
+          },
+          where: {
+            projectId: projectId,
+            slug: "preview",
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((previewEnvironment) => previewEnvironment !== null);
+
+    return ResultAsync.combine([
+      isPreviewEnvironmentEnabled(),
+      findConnectedGithubRepository(),
+      listGithubAppInstallations(),
+    ]).map(([isPreviewEnvironmentEnabled, connectedGithubRepository, githubAppInstallations]) => ({
+      enabled: true,
+      connectedRepository: connectedGithubRepository,
+      installations: githubAppInstallations,
+      isPreviewEnvironmentEnabled,
+    }));
+  }
+}
diff --git a/apps/webapp/app/presenters/v3/LimitsPresenter.server.ts b/apps/webapp/app/presenters/v3/LimitsPresenter.server.ts
new file mode 100644
index 00000000000..f7ece24e71a
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/LimitsPresenter.server.ts
@@ -0,0 +1,501 @@
+import { Ratelimit } from "@upstash/ratelimit";
+import { createHash } from "node:crypto";
+import { env } from "~/env.server";
+import { getCurrentPlan } from "~/services/platform.v3.server";
+import {
+  RateLimiterConfig,
+  createLimiterFromConfig,
+  type RateLimitTokenBucketConfig,
+} from "~/services/authorizationRateLimitMiddleware.server";
+import { createRedisRateLimitClient, type Duration } from "~/services/rateLimiter.server";
+import { BasePresenter } from "./basePresenter.server";
+import { singleton } from "~/utils/singleton";
+import { logger } from "~/services/logger.server";
+import { CheckScheduleService } from "~/v3/services/checkSchedule.server";
+
+// Create a singleton Redis client for rate limit queries
+const rateLimitRedisClient = singleton("rateLimitQueryRedisClient", () =>
+  createRedisRateLimitClient({
+    port: env.RATE_LIMIT_REDIS_PORT,
+    host: env.RATE_LIMIT_REDIS_HOST,
+    username: env.RATE_LIMIT_REDIS_USERNAME,
+    password: env.RATE_LIMIT_REDIS_PASSWORD,
+    tlsDisabled: env.RATE_LIMIT_REDIS_TLS_DISABLED === "true",
+    clusterMode: env.RATE_LIMIT_REDIS_CLUSTER_MODE_ENABLED === "1",
+  })
+);
+
+// Types for rate limit display
+export type RateLimitInfo = {
+  name: string;
+  description: string;
+  config: RateLimiterConfig;
+  currentTokens: number | null;
+};
+
+// Types for quota display
+export type QuotaInfo = {
+  name: string;
+  description: string;
+  limit: number | null;
+  currentUsage: number;
+  source: "default" | "plan" | "override";
+  canExceed?: boolean;
+  isUpgradable?: boolean;
+};
+
+// Types for feature flags
+export type FeatureInfo = {
+  name: string;
+  description: string;
+  enabled: boolean;
+  value?: string | number;
+};
+
+export type LimitsResult = {
+  rateLimits: {
+    api: RateLimitInfo;
+    batch: RateLimitInfo;
+  };
+  quotas: {
+    projects: QuotaInfo;
+    schedules: QuotaInfo | null;
+    teamMembers: QuotaInfo | null;
+    alerts: QuotaInfo | null;
+    branches: QuotaInfo | null;
+    logRetentionDays: QuotaInfo | null;
+    realtimeConnections: QuotaInfo | null;
+    batchProcessingConcurrency: QuotaInfo;
+    devQueueSize: QuotaInfo;
+    deployedQueueSize: QuotaInfo;
+    metricDashboards: QuotaInfo | null;
+    metricWidgetsPerDashboard: QuotaInfo | null;
+    queryPeriodDays: QuotaInfo | null;
+  };
+  features: {
+    hasStagingEnvironment: FeatureInfo;
+    support: FeatureInfo;
+    includedUsage: FeatureInfo;
+  };
+  planName: string | null;
+  organizationId: string;
+  isOnTopPlan: boolean;
+};
+
+export class LimitsPresenter extends BasePresenter {
+  public async call({
+    organizationId,
+    projectId,
+    environmentId,
+    environmentApiKey,
+  }: {
+    organizationId: string;
+    projectId: string;
+    environmentId: string;
+    environmentApiKey: string;
+  }): Promise<LimitsResult> {
+    // Get organization with all limit-related fields
+    const organization = await this._replica.organization.findFirstOrThrow({
+      where: { id: organizationId },
+      select: {
+        id: true,
+        maximumConcurrencyLimit: true,
+        maximumProjectCount: true,
+        maximumDevQueueSize: true,
+        maximumDeployedQueueSize: true,
+        apiRateLimiterConfig: true,
+        batchRateLimitConfig: true,
+        batchQueueConcurrencyConfig: true,
+        _count: {
+          select: {
+            projects: {
+              where: { deletedAt: null },
+            },
+            members: true,
+          },
+        },
+      },
+    });
+
+    // Get current plan from billing service
+    const currentPlan = await getCurrentPlan(organizationId);
+    const limits = currentPlan?.v3Subscription?.plan?.limits;
+    const isOnTopPlan = currentPlan?.v3Subscription?.plan?.code === "v3_pro_1";
+
+    // Resolve rate limit configs (org override or default)
+    const apiRateLimitConfig = resolveApiRateLimitConfig(organization.apiRateLimiterConfig);
+    const batchRateLimitConfig = resolveBatchRateLimitConfig(organization.batchRateLimitConfig);
+
+    // Resolve batch concurrency config
+    const batchConcurrencyConfig = resolveBatchConcurrencyConfig(
+      organization.batchQueueConcurrencyConfig
+    );
+    const batchConcurrencySource = organization.batchQueueConcurrencyConfig
+      ? "override"
+      : "default";
+
+    // Get schedule count for this org
+    const scheduleCount = await CheckScheduleService.getUsedSchedulesCount({
+      prisma: this._replica,
+      projectId,
+    });
+
+    // Get alert channel count for this org
+    const alertChannelCount = await this._replica.projectAlertChannel.count({
+      where: {
+        projectId,
+      },
+    });
+
+    // Get active branches count for this org (uses @@index([organizationId]))
+    const activeBranchCount = await this._replica.runtimeEnvironment.count({
+      where: {
+        projectId,
+        branchName: {
+          not: null,
+        },
+        archivedAt: null,
+      },
+    });
+
+    // Get metric dashboard count for this org
+    const metricDashboardCount = await this._replica.metricsDashboard.count({
+      where: { organizationId },
+    });
+
+    // Get current rate limit tokens for this environment's API key
+    const apiRateLimitTokens = await getRateLimitRemainingTokens(
+      "api",
+      environmentApiKey,
+      apiRateLimitConfig
+    );
+    // Batch rate limiter uses environment ID directly (not hashed) with a different key prefix
+    const batchRateLimitTokens = await getBatchRateLimitRemainingTokens(
+      environmentId,
+      batchRateLimitConfig
+    );
+
+    // Get plan-level limits
+    const schedulesLimit = limits?.schedules?.number ?? null;
+    const teamMembersLimit = limits?.teamMembers?.number ?? null;
+    const alertsLimit = limits?.alerts?.number ?? null;
+    const branchesLimit = limits?.branches?.number ?? null;
+    const logRetentionDaysLimit = limits?.logRetentionDays?.number ?? null;
+    const realtimeConnectionsLimit = limits?.realtimeConcurrentConnections?.number ?? null;
+    const metricDashboardsLimit = limits?.metricDashboards?.number ?? null;
+    const metricWidgetsPerDashboardLimit = limits?.metricWidgetsPerDashboard?.number ?? null;
+    const queryPeriodDaysLimit = limits?.queryPeriodDays?.number ?? null;
+    const includedUsage = limits?.includedUsage ?? null;
+    const hasStagingEnvironment = limits?.hasStagingEnvironment ?? false;
+    const supportLevel = limits?.support ?? "community";
+
+    return {
+      isOnTopPlan,
+      rateLimits: {
+        api: {
+          name: "API rate limit",
+          description: "Rate limit for API requests (trigger, batch, etc.)",
+          config: apiRateLimitConfig,
+          currentTokens: apiRateLimitTokens,
+        },
+        batch: {
+          name: "Batch rate limit",
+          description: "Rate limit for batch trigger operations",
+          config: batchRateLimitConfig,
+          currentTokens: batchRateLimitTokens,
+        },
+      },
+      quotas: {
+        projects: {
+          name: "Projects",
+          description: "Maximum number of projects in this organization",
+          limit: organization.maximumProjectCount,
+          currentUsage: organization._count.projects,
+          source: "default",
+          isUpgradable: true,
+        },
+        schedules:
+          schedulesLimit !== null
+            ? {
+                name: "Schedules",
+                description: "Maximum number of schedules per project",
+                limit: schedulesLimit,
+                currentUsage: scheduleCount,
+                source: "plan",
+                canExceed: limits?.schedules?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        teamMembers:
+          teamMembersLimit !== null
+            ? {
+                name: "Team members",
+                description: "Maximum number of team members in this organization",
+                limit: teamMembersLimit,
+                currentUsage: organization._count.members,
+                source: "plan",
+                canExceed: limits?.teamMembers?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        alerts:
+          alertsLimit !== null
+            ? {
+                name: "Alert channels",
+                description: "Maximum number of alert channels per project",
+                limit: alertsLimit,
+                currentUsage: alertChannelCount,
+                source: "plan",
+                canExceed: limits?.alerts?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        branches:
+          branchesLimit !== null
+            ? {
+                name: "Preview branches",
+                description: "Maximum number of active preview branches per project",
+                limit: branchesLimit,
+                currentUsage: activeBranchCount,
+                source: "plan",
+                canExceed: limits?.branches?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        logRetentionDays:
+          logRetentionDaysLimit !== null
+            ? {
+                name: "Log retention",
+                description: "Number of days logs are retained",
+                limit: logRetentionDaysLimit,
+                currentUsage: 0, // Not applicable - this is a duration, not a count
+                source: "plan",
+              }
+            : null,
+        realtimeConnections:
+          realtimeConnectionsLimit !== null
+            ? {
+                name: "Realtime connections",
+                description: "Maximum concurrent Realtime connections",
+                limit: realtimeConnectionsLimit,
+                currentUsage: 0, // Would need to query realtime service for this
+                source: "plan",
+                canExceed: limits?.realtimeConcurrentConnections?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        batchProcessingConcurrency: {
+          name: "Batch processing concurrency",
+          description: "Controls how many batch items can be processed simultaneously.",
+          limit: batchConcurrencyConfig.processingConcurrency,
+          currentUsage: 0,
+          source: batchConcurrencySource,
+          canExceed: true,
+          isUpgradable: true,
+        },
+        devQueueSize: {
+          name: "Dev queue size",
+          description: "Maximum pending runs in development environments",
+          limit: organization.maximumDevQueueSize ?? null,
+          currentUsage: 0, // Would need to query Redis for this
+          source: organization.maximumDevQueueSize ? "override" : "default",
+        },
+        deployedQueueSize: {
+          name: "Deployed queue size",
+          description: "Maximum pending runs in deployed environments",
+          limit: organization.maximumDeployedQueueSize ?? null,
+          currentUsage: 0, // Would need to query Redis for this
+          source: organization.maximumDeployedQueueSize ? "override" : "default",
+        },
+        metricDashboards:
+          metricDashboardsLimit !== null
+            ? {
+                name: "Metric dashboards",
+                description: "Maximum number of custom metric dashboards per organization",
+                limit: metricDashboardsLimit,
+                currentUsage: metricDashboardCount,
+                source: "plan",
+                canExceed: limits?.metricDashboards?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        metricWidgetsPerDashboard:
+          metricWidgetsPerDashboardLimit !== null
+            ? {
+                name: "Charts per dashboard",
+                description: "Maximum number of charts per metrics dashboard",
+                limit: metricWidgetsPerDashboardLimit,
+                currentUsage: 0, // Varies per dashboard
+                source: "plan",
+                canExceed: limits?.metricWidgetsPerDashboard?.canExceed,
+                isUpgradable: true,
+              }
+            : null,
+        queryPeriodDays:
+          queryPeriodDaysLimit !== null
+            ? {
+                name: "Query period",
+                description: "Maximum number of days a query can look back",
+                limit: queryPeriodDaysLimit,
+                currentUsage: 0, // Not applicable - this is a duration, not a count
+                source: "plan",
+              }
+            : null,
+      },
+      features: {
+        hasStagingEnvironment: {
+          name: "Staging/Preview environments",
+          description: "Access to staging/preview environments for testing before production",
+          enabled: hasStagingEnvironment,
+        },
+        support: {
+          name: "Support level",
+          description: "Type of support available for your plan",
+          enabled: true,
+          value: supportLevel === "slack" ? "Slack" : "Community",
+        },
+        includedUsage: {
+          name: "Included compute",
+          description: "Monthly included compute credits",
+          enabled: includedUsage !== null && includedUsage > 0,
+          value: includedUsage ?? 0,
+        },
+      },
+      planName: currentPlan?.v3Subscription?.plan?.title ?? null,
+      organizationId,
+    };
+  }
+}
+
+function resolveApiRateLimitConfig(apiRateLimiterConfig?: unknown): RateLimiterConfig {
+  const defaultConfig: RateLimitTokenBucketConfig = {
+    type: "tokenBucket",
+    refillRate: env.API_RATE_LIMIT_REFILL_RATE,
+    interval: env.API_RATE_LIMIT_REFILL_INTERVAL as Duration,
+    maxTokens: env.API_RATE_LIMIT_MAX,
+  };
+
+  if (!apiRateLimiterConfig) {
+    return defaultConfig;
+  }
+
+  const parsed = RateLimiterConfig.safeParse(apiRateLimiterConfig);
+  if (!parsed.success) {
+    return defaultConfig;
+  }
+
+  return parsed.data;
+}
+
+function resolveBatchRateLimitConfig(batchRateLimitConfig?: unknown): RateLimiterConfig {
+  const defaultConfig: RateLimitTokenBucketConfig = {
+    type: "tokenBucket",
+    refillRate: env.BATCH_RATE_LIMIT_REFILL_RATE,
+    interval: env.BATCH_RATE_LIMIT_REFILL_INTERVAL as Duration,
+    maxTokens: env.BATCH_RATE_LIMIT_MAX,
+  };
+
+  if (!batchRateLimitConfig) {
+    return defaultConfig;
+  }
+
+  const parsed = RateLimiterConfig.safeParse(batchRateLimitConfig);
+  if (!parsed.success) {
+    return defaultConfig;
+  }
+
+  return parsed.data;
+}
+
+function resolveBatchConcurrencyConfig(batchConcurrencyConfig?: unknown): {
+  processingConcurrency: number;
+} {
+  const defaultConfig = {
+    processingConcurrency: env.BATCH_CONCURRENCY_LIMIT_DEFAULT,
+  };
+
+  if (!batchConcurrencyConfig) {
+    return defaultConfig;
+  }
+
+  if (typeof batchConcurrencyConfig === "object" && batchConcurrencyConfig !== null) {
+    const config = batchConcurrencyConfig as Record<string, unknown>;
+    if (typeof config.processingConcurrency === "number") {
+      return { processingConcurrency: config.processingConcurrency };
+    }
+  }
+
+  return defaultConfig;
+}
+
+/**
+ * Query the current remaining tokens for a rate limiter using the Upstash getRemaining method.
+ * This uses the same configuration and hashing logic as the rate limit middleware.
+ */
+async function getRateLimitRemainingTokens(
+  keyPrefix: string,
+  apiKey: string,
+  config: RateLimiterConfig
+): Promise<number | null> {
+  try {
+    // Hash the authorization header the same way the rate limiter does
+    const authorizationValue = `Bearer ${apiKey}`;
+    const hash = createHash("sha256");
+    hash.update(authorizationValue);
+    const hashedKey = hash.digest("hex");
+
+    // Create a Ratelimit instance with the same configuration
+    const limiter = createLimiterFromConfig(config);
+    const ratelimit = new Ratelimit({
+      redis: rateLimitRedisClient,
+      limiter,
+      ephemeralCache: new Map(),
+      analytics: false,
+      prefix: `ratelimit:${keyPrefix}`,
+    });
+
+    // Use the getRemaining method to get the current remaining tokens
+    // getRemaining returns a Promise<number>
+    const remaining = await ratelimit.getRemaining(hashedKey);
+    return remaining;
+  } catch (error) {
+    logger.warn("Failed to get rate limit remaining tokens", {
+      keyPrefix,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    return null;
+  }
+}
+
+/**
+ * Query the current remaining tokens for the batch rate limiter.
+ * The batch rate limiter uses environment ID directly (not hashed) and has a different key prefix.
+ */
+async function getBatchRateLimitRemainingTokens(
+  environmentId: string,
+  config: RateLimiterConfig
+): Promise<number | null> {
+  try {
+    // Create a Ratelimit instance with the same configuration as the batch rate limiter
+    const limiter = createLimiterFromConfig(config);
+    const ratelimit = new Ratelimit({
+      redis: rateLimitRedisClient,
+      limiter,
+      ephemeralCache: new Map(),
+      analytics: false,
+      // The batch rate limiter uses "ratelimit:batch" as keyPrefix in RateLimiter,
+      // which adds another "ratelimit:" prefix, resulting in "ratelimit:ratelimit:batch"
+      prefix: `ratelimit:ratelimit:batch`,
+    });
+
+    // Batch rate limiter uses environment ID directly (not hashed)
+    const remaining = await ratelimit.getRemaining(environmentId);
+    return remaining;
+  } catch (error) {
+    logger.warn("Failed to get batch rate limit remaining tokens", {
+      environmentId,
+      error: error instanceof Error ? error.message : String(error),
+    });
+    return null;
+  }
+}
diff --git a/apps/webapp/app/presenters/v3/LogDetailPresenter.server.ts b/apps/webapp/app/presenters/v3/LogDetailPresenter.server.ts
new file mode 100644
index 00000000000..d354018b82e
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/LogDetailPresenter.server.ts
@@ -0,0 +1,108 @@
+import { type ClickHouse } from "@internal/clickhouse";
+import { type PrismaClientOrTransaction } from "@trigger.dev/database";
+import { convertClickhouseDateTime64ToJsDate } from "~/v3/eventRepository/clickhouseEventRepository.server";
+import { kindToLevel } from "~/utils/logUtils";
+import { getConfiguredEventRepository } from "~/v3/eventRepository/index.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+
+export type LogDetailOptions = {
+  environmentId: string;
+  organizationId: string;
+  projectId: string;
+  spanId: string;
+  traceId: string;
+  // The exact start_time from the log id - used to uniquely identify the event
+  startTime: string;
+};
+
+export type LogDetail = Awaited<ReturnType<LogDetailPresenter["call"]>>;
+
+export class LogDetailPresenter {
+  constructor(
+    private readonly replica: PrismaClientOrTransaction,
+    private readonly clickhouse: ClickHouse
+  ) {}
+
+  public async call(options: LogDetailOptions) {
+    const { environmentId, organizationId, projectId, spanId, traceId, startTime } = options;
+
+    // Determine which store to use based on organization configuration
+    const { store } = await getConfiguredEventRepository(organizationId);
+
+    // Throw error if postgres is detected
+    if (store === "postgres") {
+      throw new ServiceValidationError(
+        "Log details are not available for PostgreSQL event store. Please contact support."
+      );
+    }
+
+    const queryBuilder = this.clickhouse.taskEventsV2.logDetailQueryBuilder();
+
+    // Required filters - spanId, traceId, and startTime uniquely identify the log
+    // Multiple events can share the same spanId (span, span events, logs), so startTime is needed
+    queryBuilder.where("environment_id = {environmentId: String}", {
+      environmentId,
+    });
+    queryBuilder.where("organization_id = {organizationId: String}", {
+      organizationId,
+    });
+    queryBuilder.where("project_id = {projectId: String}", { projectId });
+    queryBuilder.where("span_id = {spanId: String}", { spanId });
+    queryBuilder.where("trace_id = {traceId: String}", { traceId });
+    queryBuilder.where("start_time = {startTime: String}", { startTime });
+
+    queryBuilder.limit(1);
+
+    // Execute query
+    const [queryError, records] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
+    }
+
+    if (!records || records.length === 0) {
+      return null;
+    }
+
+    const log = records[0];
+
+
+    let parsedAttributes: Record<string, unknown> = {};
+    let rawAttributesString = "";
+
+
+    try {
+      // Handle attributes_text which is a string
+      if (log.attributes_text) {
+        parsedAttributes = JSON.parse(log.attributes_text) as Record<string, unknown>;
+        rawAttributesString = log.attributes_text;
+      }
+    } catch {
+      // Ignore parse errors
+    }
+
+    const durationMs = (typeof log.duration === "number" ? log.duration : Number(log.duration)) / 1_000_000;
+
+    return {
+      // Use :: separator to match LogsListPresenter format
+      id: `${log.trace_id}::${log.span_id}::${log.run_id}::${log.start_time}`,
+      runId: log.run_id,
+      taskIdentifier: log.task_identifier,
+      startTime: convertClickhouseDateTime64ToJsDate(log.start_time).toISOString(),
+      triggeredTimestamp: new Date(
+        convertClickhouseDateTime64ToJsDate(log.start_time).getTime() + durationMs
+      ).toISOString(),
+      traceId: log.trace_id,
+      spanId: log.span_id,
+      parentSpanId: log.parent_span_id || null,
+      message: log.message,
+      kind: log.kind,
+      status: log.status,
+      duration: typeof log.duration === "number" ? log.duration : Number(log.duration),
+      level: kindToLevel(log.kind, log.status),
+      attributes: parsedAttributes,
+      // Raw strings for display
+      rawAttributes: rawAttributesString,
+    };
+  }
+}
diff --git a/apps/webapp/app/presenters/v3/LogsListPresenter.server.ts b/apps/webapp/app/presenters/v3/LogsListPresenter.server.ts
new file mode 100644
index 00000000000..8a3bf692b5b
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/LogsListPresenter.server.ts
@@ -0,0 +1,419 @@
+import { z } from "zod";
+import { type ClickHouse, type WhereCondition } from "@internal/clickhouse";
+import { type PrismaClientOrTransaction } from "@trigger.dev/database";
+import { EVENT_STORE_TYPES, getConfiguredEventRepository } from "~/v3/eventRepository/index.server";
+
+import parseDuration from "parse-duration";
+import { type Direction } from "~/components/ListPagination";
+import { timeFilterFromTo, timeFilters } from "~/components/runs/v3/SharedFilters";
+import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
+import { getAllTaskIdentifiers } from "~/models/task.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+import { kindToLevel, type LogLevel, LogLevelSchema } from "~/utils/logUtils";
+import { BasePresenter } from "~/presenters/v3/basePresenter.server";
+import {
+  convertDateToClickhouseDateTime,
+  convertClickhouseDateTime64ToJsDate,
+} from "~/v3/eventRepository/clickhouseEventRepository.server";
+
+export type { LogLevel };
+
+type ErrorAttributes = {
+  error?: {
+    message?: unknown;
+  };
+  [key: string]: unknown;
+};
+
+function escapeClickHouseString(val: string): string {
+  return val.replace(/\\/g, "\\\\").replace(/\//g, "\\/").replace(/%/g, "\\%").replace(/_/g, "\\_");
+}
+
+export type LogsListOptions = {
+  userId?: string;
+  projectId: string;
+  // filters
+  tasks?: string[];
+  runId?: string;
+  period?: string;
+  from?: number;
+  to?: number;
+  levels?: LogLevel[];
+  defaultPeriod?: string;
+  retentionLimitDays?: number;
+  // search
+  search?: string;
+  // pagination
+  direction?: Direction;
+  cursor?: string;
+  pageSize?: number;
+};
+
+export const LogsListOptionsSchema = z.object({
+  userId: z.string().optional(),
+  projectId: z.string(),
+  tasks: z.array(z.string()).optional(),
+  runId: z.string().optional(),
+  period: z.string().optional(),
+  from: z.number().int().nonnegative().optional(),
+  to: z.number().int().nonnegative().optional(),
+  levels: z.array(LogLevelSchema).optional(),
+  defaultPeriod: z.string().optional(),
+  retentionLimitDays: z.number().int().positive().optional(),
+  search: z.string().max(1000).optional(),
+  direction: z.enum(["forward", "backward"]).optional(),
+  cursor: z.string().optional(),
+  pageSize: z.number().int().positive().max(1000).optional(),
+});
+
+const DEFAULT_PAGE_SIZE = 50;
+
+export type LogsList = Awaited<ReturnType<LogsListPresenter["call"]>>;
+export type LogEntry = LogsList["logs"][0];
+export type LogsListAppliedFilters = LogsList["filters"];
+
+// Cursor is a base64 encoded JSON of the pagination keys
+type LogCursor = {
+  organizationId: string;
+  environmentId: string;
+  triggeredTimestamp: string; // DateTime64(9) string
+  traceId: string;
+};
+
+const LogCursorSchema = z.object({
+  organizationId: z.string(),
+  environmentId: z.string(),
+  triggeredTimestamp: z.string(),
+  traceId: z.string(),
+});
+
+function encodeCursor(cursor: LogCursor): string {
+  return Buffer.from(JSON.stringify(cursor)).toString("base64");
+}
+
+function decodeCursor(cursor: string): LogCursor | null {
+  try {
+    const decoded = Buffer.from(cursor, "base64").toString("utf-8");
+    const parsed = JSON.parse(decoded);
+    const validated = LogCursorSchema.safeParse(parsed);
+    if (!validated.success) {
+      return null;
+    }
+    return validated.data;
+  } catch {
+    return null;
+  }
+}
+
+// Convert display level to ClickHouse kinds and statuses
+function levelToKindsAndStatuses(level: LogLevel): { kinds?: string[]; statuses?: string[] } {
+  switch (level) {
+    case "TRACE":
+      return { kinds: ["SPAN"] };
+    case "DEBUG":
+      return { kinds: ["LOG_DEBUG"] };
+    case "INFO":
+      return { kinds: ["LOG_INFO", "LOG_LOG"] };
+    case "WARN":
+      return { kinds: ["LOG_WARN"] };
+    case "ERROR":
+      return { kinds: ["LOG_ERROR", "SPAN_EVENT"], statuses: ["ERROR"] };
+  }
+}
+
+export class LogsListPresenter extends BasePresenter {
+  constructor(
+    private readonly replica: PrismaClientOrTransaction,
+    private readonly clickhouse: ClickHouse
+  ) {
+    super(undefined, replica);
+  }
+
+  public async call(
+    organizationId: string,
+    environmentId: string,
+    {
+      userId,
+      projectId,
+      tasks,
+      runId,
+      period,
+      levels,
+      search,
+      from,
+      to,
+      cursor,
+      pageSize = DEFAULT_PAGE_SIZE,
+      defaultPeriod,
+      retentionLimitDays,
+    }: LogsListOptions
+  ) {
+    const time = timeFilterFromTo({
+      period,
+      from,
+      to,
+      defaultPeriod: defaultPeriod ?? "1h",
+    });
+
+    let effectiveFrom = time.from;
+    let effectiveTo = time.to;
+
+    // Apply retention limit if provided
+    let wasClampedByRetention = false;
+    if (retentionLimitDays !== undefined && effectiveFrom) {
+      const retentionCutoffDate = new Date(Date.now() - retentionLimitDays * 24 * 60 * 60 * 1000);
+
+      if (effectiveFrom < retentionCutoffDate) {
+        effectiveFrom = retentionCutoffDate;
+        wasClampedByRetention = true;
+      }
+    }
+
+    const hasFilters =
+      (tasks !== undefined && tasks.length > 0) ||
+      (runId !== undefined && runId !== "") ||
+      (levels !== undefined && levels.length > 0) ||
+      (search !== undefined && search !== "") ||
+      !time.isDefault;
+
+    const possibleTasksAsync = getAllTaskIdentifiers(this.replica, environmentId);
+
+    const bulkActionsAsync = this.replica.bulkActionGroup.findMany({
+      select: {
+        friendlyId: true,
+        type: true,
+        createdAt: true,
+        name: true,
+      },
+      where: {
+        projectId: projectId,
+        environmentId,
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+      take: 20,
+    });
+
+    const [possibleTasks, bulkActions, displayableEnvironment] = await Promise.all([
+      possibleTasksAsync,
+      bulkActionsAsync,
+      findDisplayableEnvironment(environmentId, userId),
+    ]);
+
+    if (!displayableEnvironment) {
+      throw new ServiceValidationError("No environment found");
+    }
+
+    // Determine which store to use based on organization configuration
+    const { store } = await getConfiguredEventRepository(organizationId);
+
+    // Throw error if postgres is detected
+    if (store === EVENT_STORE_TYPES.POSTGRES) {
+      throw new ServiceValidationError(
+        "Logs are not available for PostgreSQL event store. Please contact support."
+      );
+    }
+
+    if (store === EVENT_STORE_TYPES.CLICKHOUSE) {
+      throw new ServiceValidationError(
+        "Logs are not available for ClickHouse event store. Please contact support."
+      );
+    }
+
+    const queryBuilder = this.clickhouse.taskEventsSearch.logsListQueryBuilder();
+
+    // This should be removed once we clear the old inserts, 30 DAYS, the materialized view excludes events without trace_id)
+    queryBuilder.where("trace_id != ''", {
+      environmentId,
+    });
+
+    queryBuilder.where("environment_id = {environmentId: String}", {
+      environmentId,
+    });
+
+    queryBuilder.where("organization_id = {organizationId: String}", {
+      organizationId,
+    });
+    queryBuilder.where("project_id = {projectId: String}", { projectId });
+
+    if (effectiveFrom) {
+      queryBuilder.where("triggered_timestamp >= {triggeredAtStart: DateTime64(3)}", {
+        triggeredAtStart: convertDateToClickhouseDateTime(effectiveFrom),
+      });
+    }
+
+    if (effectiveTo) {
+      const clampedTo = effectiveTo > new Date() ? new Date() : effectiveTo;
+
+      queryBuilder.where("triggered_timestamp <= {triggeredAtEnd: DateTime64(3)}", {
+        triggeredAtEnd: convertDateToClickhouseDateTime(clampedTo),
+      });
+    }
+
+    // Task filter (applies directly to ClickHouse)
+    if (tasks && tasks.length > 0) {
+      queryBuilder.where("task_identifier IN {tasks: Array(String)}", {
+        tasks,
+      });
+    }
+
+    // Run ID filter
+    if (runId && runId !== "") {
+      queryBuilder.where("run_id = {runId: String}", { runId });
+    }
+
+    // Case-insensitive search in message, attributes, and status fields
+    if (search && search.trim() !== "") {
+      const searchTerm = escapeClickHouseString(search.trim()).toLowerCase();
+      queryBuilder.where(
+        "(lower(message) like {searchPattern: String} OR lower(attributes_text) like {searchPattern: String})",
+        {
+          searchPattern: `%${searchTerm}%`,
+        }
+      );
+    }
+
+    if (levels && levels.length > 0) {
+      const conditions: WhereCondition[] = [];
+
+      for (let i = 0; i < levels.length; i++) {
+        const filter = levelToKindsAndStatuses(levels[i]);
+
+        if (filter.kinds && filter.kinds.length > 0) {
+          conditions.push({
+            clause: `kind IN {kinds_${i}: Array(String)} AND status NOT IN {excluded_statuses: Array(String)}`,
+            params: {
+              [`kinds_${i}`]: filter.kinds,
+              excluded_statuses: ["ERROR", "CANCELLED"],
+            },
+          });
+        }
+
+        if (filter.statuses && filter.statuses.length > 0) {
+          conditions.push({
+            clause: `status IN {statuses_${i}: Array(String)}`,
+            params: { [`statuses_${i}`]: filter.statuses },
+          });
+        }
+      }
+
+      queryBuilder.whereOr(conditions);
+    }
+
+    // Cursor-based pagination using lexicographic comparison on (triggered_timestamp, trace_id).
+    // Since ORDER BY is DESC, "next page" means rows that sort *after* the cursor, i.e. less-than.
+    // The OR handles the tiebreaker: rows with an earlier timestamp always qualify, and rows
+    // with the *same* timestamp only qualify if their trace_id is also smaller.
+    // Equivalent to: WHERE (triggered_timestamp, trace_id) < (cursor.triggered_timestamp, cursor.trace_id)
+    const decodedCursor = cursor ? decodeCursor(cursor) : null;
+    if (decodedCursor) {
+      queryBuilder.where(
+        `(triggered_timestamp < {cursorTriggeredTimestamp: String} OR (triggered_timestamp = {cursorTriggeredTimestamp: String} AND trace_id < {cursorTraceId: String}))`,
+        {
+          cursorTriggeredTimestamp: decodedCursor.triggeredTimestamp,
+          cursorTraceId: decodedCursor.traceId,
+        }
+      );
+    }
+
+    queryBuilder.orderBy("triggered_timestamp DESC, trace_id DESC");
+    // Limit + 1 to check if there are more results
+    queryBuilder.limit(pageSize + 1);
+
+    const [queryError, records] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
+    }
+
+    const results = records || [];
+    const hasMore = results.length > pageSize;
+    const logs = results.slice(0, pageSize);
+
+    // Build next cursor from the last item
+    let nextCursor: string | undefined;
+    if (hasMore && logs.length > 0) {
+      const lastLog = logs[logs.length - 1];
+      nextCursor = encodeCursor({
+        organizationId,
+        environmentId,
+        triggeredTimestamp: lastLog.triggered_timestamp,
+        traceId: lastLog.trace_id,
+      });
+    }
+
+    // Transform results
+    // Use :: as separator since dash conflicts with date format in start_time
+    const transformedLogs = logs.map((log) => {
+      let displayMessage = log.message;
+
+      // For error logs with status ERROR, try to extract error message from attributes
+      if (log.status === "ERROR" && log.attributes_text) {
+        try {
+          const attributes = JSON.parse(log.attributes_text) as ErrorAttributes;
+
+          if (attributes?.error?.message && typeof attributes.error.message === "string") {
+            displayMessage = attributes.error.message;
+          }
+        } catch {
+          // If attributes parsing fails, use the regular message
+        }
+      }
+
+      return {
+        id: `${log.trace_id}::${log.span_id}::${log.run_id}::${log.start_time}`,
+        runId: log.run_id,
+        taskIdentifier: log.task_identifier,
+        startTime: convertClickhouseDateTime64ToJsDate(log.start_time).toISOString(),
+        triggeredTimestamp: convertClickhouseDateTime64ToJsDate(
+          log.triggered_timestamp
+        ).toISOString(),
+        traceId: log.trace_id,
+        spanId: log.span_id,
+        parentSpanId: log.parent_span_id || null,
+        message: displayMessage,
+        kind: log.kind,
+        status: log.status,
+        duration: typeof log.duration === "number" ? log.duration : Number(log.duration),
+        level: kindToLevel(log.kind, log.status),
+      };
+    });
+
+    return {
+      logs: transformedLogs,
+      pagination: {
+        next: nextCursor,
+        previous: undefined, // For now, only support forward pagination
+      },
+      possibleTasks: possibleTasks
+        .map((task) => ({
+          slug: task.slug,
+          triggerSource: task.triggerSource,
+        }))
+        .sort((a, b) => a.slug.localeCompare(b.slug)),
+      bulkActions: bulkActions.map((bulkAction) => ({
+        id: bulkAction.friendlyId,
+        type: bulkAction.type,
+        createdAt: bulkAction.createdAt,
+        name: bulkAction.name || bulkAction.friendlyId,
+      })),
+      filters: {
+        tasks: tasks || [],
+        levels: levels || [],
+        from: effectiveFrom,
+        to: effectiveTo,
+      },
+      hasFilters,
+      hasAnyLogs: transformedLogs.length > 0,
+      searchTerm: search,
+      retention:
+        retentionLimitDays !== undefined
+          ? {
+              limitDays: retentionLimitDays,
+              wasClamped: wasClampedByRetention,
+            }
+          : undefined,
+    };
+  }
+}
diff --git a/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts b/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts
new file mode 100644
index 00000000000..2b9af8dce5f
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/ManageConcurrencyPresenter.server.ts
@@ -0,0 +1,141 @@
+import { type RuntimeEnvironmentType } from "@trigger.dev/database";
+import {
+  getCurrentPlan,
+  getDefaultEnvironmentLimitFromPlan,
+  getPlans,
+} from "~/services/platform.v3.server";
+import { BasePresenter } from "./basePresenter.server";
+import { sortEnvironments } from "~/utils/environmentSort";
+
+export type ConcurrencyResult = {
+  canAddConcurrency: boolean;
+  environments: EnvironmentWithConcurrency[];
+  extraConcurrency: number;
+  extraAllocatedConcurrency: number;
+  extraUnallocatedConcurrency: number;
+  maxQuota: number;
+  concurrencyPricing: {
+    stepSize: number;
+    centsPerStep: number;
+  };
+};
+
+export type EnvironmentWithConcurrency = {
+  id: string;
+  type: RuntimeEnvironmentType;
+  isBranchableEnvironment: boolean;
+  branchName: string | null;
+  parentEnvironmentId: string | null;
+  maximumConcurrencyLimit: number;
+  planConcurrencyLimit: number;
+};
+
+export class ManageConcurrencyPresenter extends BasePresenter {
+  public async call({
+    userId,
+    projectId,
+    organizationId,
+  }: {
+    userId: string;
+    projectId: string;
+    organizationId: string;
+  }): Promise<ConcurrencyResult> {
+    // Get plan
+    const currentPlan = await getCurrentPlan(organizationId);
+    if (!currentPlan) {
+      throw new Error("No plan found");
+    }
+
+    const canAddConcurrency =
+      currentPlan.v3Subscription.plan?.limits.concurrentRuns.canExceed === true;
+
+    const environments = await this._replica.runtimeEnvironment.findMany({
+      select: {
+        id: true,
+        projectId: true,
+        type: true,
+        branchName: true,
+        parentEnvironmentId: true,
+        isBranchableEnvironment: true,
+        maximumConcurrencyLimit: true,
+        orgMember: {
+          select: {
+            userId: true,
+          },
+        },
+        project: {
+          select: {
+            deletedAt: true,
+          },
+        },
+      },
+      where: {
+        organizationId,
+        archivedAt: null,
+      },
+    });
+
+    const extraConcurrency = currentPlan?.v3Subscription.addOns?.concurrentRuns?.purchased ?? 0;
+
+    // Go through all environments and add up extra concurrency above their allowed allocation
+    let extraAllocatedConcurrency = 0;
+    const projectEnvironments: EnvironmentWithConcurrency[] = [];
+    for (const environment of environments) {
+      // Don't count parent environments
+      if (environment.isBranchableEnvironment) continue;
+
+      // Don't count deleted projects
+      if (environment.project.deletedAt) continue;
+
+      const limit = currentPlan
+        ? getDefaultEnvironmentLimitFromPlan(environment.type, currentPlan)
+        : 0;
+      if (!limit) continue;
+
+      // If it's not DEV and they've increased, track that
+      // You can't spend money to increase DEV concurrency
+      if (environment.type !== "DEVELOPMENT" && environment.maximumConcurrencyLimit > limit) {
+        extraAllocatedConcurrency += environment.maximumConcurrencyLimit - limit;
+      }
+
+      // We only want to show this project's environments
+      if (environment.projectId === projectId) {
+        if (environment.type === "DEVELOPMENT" && environment.orgMember?.userId !== userId) {
+          continue;
+        }
+
+        projectEnvironments.push({
+          id: environment.id,
+          type: environment.type,
+          isBranchableEnvironment: environment.isBranchableEnvironment,
+          branchName: environment.branchName,
+          parentEnvironmentId: environment.parentEnvironmentId,
+          maximumConcurrencyLimit: environment.maximumConcurrencyLimit,
+          planConcurrencyLimit: limit,
+        });
+      }
+    }
+
+    const extraAllocated = Math.min(extraConcurrency, extraAllocatedConcurrency);
+
+    const plans = await getPlans();
+    if (!plans) {
+      throw new Error("Couldn't retrieve add on pricing");
+    }
+
+    return {
+      canAddConcurrency,
+      extraConcurrency,
+      extraAllocatedConcurrency: extraAllocated,
+      extraUnallocatedConcurrency: extraConcurrency - extraAllocated,
+      maxQuota: currentPlan.v3Subscription.addOns?.concurrentRuns?.quota ?? 0,
+      environments: sortEnvironments(projectEnvironments, [
+        "PRODUCTION",
+        "STAGING",
+        "PREVIEW",
+        "DEVELOPMENT",
+      ]),
+      concurrencyPricing: plans.addOnPricing.concurrency,
+    };
+  }
+}
diff --git a/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts b/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts
new file mode 100644
index 00000000000..d5363ddb9af
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/MetricDashboardPresenter.server.ts
@@ -0,0 +1,123 @@
+import { BasePresenter } from "./basePresenter.server";
+import { type QueryScope } from "~/services/queryService.server";
+import { getLimit } from "~/services/platform.v3.server";
+import { z } from "zod";
+import { fromZodError } from "zod-validation-error";
+import { builtInDashboard } from "./BuiltInDashboards.server";
+import { QueryWidgetConfig } from "~/components/metrics/QueryWidget";
+
+export type MetricFilters = {
+  /** Org, project, environment */
+  scope: QueryScope;
+  /** Time filter settings */
+  filterPeriod: string | null;
+  filterFrom: Date | null;
+  filterTo: Date | null;
+  /** Tasks */
+  taskIdentifiers?: string[];
+  /** Queues */
+  queues?: string[];
+  /** Tags */
+  tags?: string[];
+};
+
+export const LayoutItem = z.object({
+  i: z.string(),
+  x: z.number(),
+  y: z.number(),
+  w: z.number(),
+  h: z.number(),
+  minH: z.number().optional(),
+  maxH: z.number().optional(),
+});
+
+export type LayoutItem = z.infer<typeof LayoutItem>;
+
+export const Widget = z.object({
+  title: z.string(),
+  query: z.string().default(""),
+  display: QueryWidgetConfig,
+});
+
+export type Widget = z.infer<typeof Widget>;
+
+export const DashboardLayout = z.discriminatedUnion("version", [
+  z.object({
+    version: z.literal("1"),
+    layout: z.array(LayoutItem),
+    widgets: z.record(Widget),
+  }),
+]);
+
+export type DashboardLayout = z.infer<typeof DashboardLayout>;
+
+export type CustomDashboard = {
+  friendlyId: string;
+  title: string;
+  layout: DashboardLayout;
+  defaultPeriod: string;
+};
+
+export type BuiltInDashboard = {
+  key: string;
+  title: string;
+  layout: DashboardLayout;
+};
+
+/** Returns the dashboard layout */
+export class MetricDashboardPresenter extends BasePresenter {
+  public async customDashboard({
+    friendlyId,
+    organizationId,
+  }: {
+    friendlyId: string;
+    organizationId: string;
+  }): Promise<CustomDashboard> {
+    const dashboard = await this._replica.metricsDashboard.findFirst({
+      where: { friendlyId, organizationId },
+    });
+    if (!dashboard) {
+      throw new Error("No dashboard found");
+    }
+
+    const layout = this.#getLayout(dashboard.layout);
+
+    const defaultPeriod = await getDashboardDefaultPeriod(organizationId);
+
+    return {
+      friendlyId: dashboard.friendlyId,
+      title: dashboard.title,
+      layout,
+      defaultPeriod,
+    };
+  }
+
+  public async builtInDashboard({ organizationId, key }: { organizationId: string; key: string }) {
+    const defaultPeriod = await getDashboardDefaultPeriod(organizationId);
+    const dashboard = builtInDashboard(key);
+    return {
+      ...dashboard,
+      defaultPeriod,
+    };
+  }
+
+  #getLayout(layoutData: string): DashboardLayout {
+    const json = JSON.parse(layoutData);
+    const parsedLayout = DashboardLayout.safeParse(json);
+    if (!parsedLayout.success) {
+      throw fromZodError(parsedLayout.error);
+    }
+
+    return parsedLayout.data;
+  }
+}
+
+/** Dashboard-specific default period (1 day), capped to the org's max query period */
+async function getDashboardDefaultPeriod(organizationId: string): Promise<string> {
+  const idealDefaultPeriodDays = 1;
+  const maxQueryPeriod = await getLimit(organizationId, "queryPeriodDays", 30);
+  if (maxQueryPeriod < idealDefaultPeriodDays) {
+    return `${maxQueryPeriod}d`;
+  }
+  return `${idealDefaultPeriodDays}d`;
+}
diff --git a/apps/webapp/app/presenters/v3/NextRunListPresenter.server.ts b/apps/webapp/app/presenters/v3/NextRunListPresenter.server.ts
index 960bdfc10a6..2375ea161a9 100644
--- a/apps/webapp/app/presenters/v3/NextRunListPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/NextRunListPresenter.server.ts
@@ -9,7 +9,7 @@ import { type Direction } from "~/components/ListPagination";
 import { timeFilters } from "~/components/runs/v3/SharedFilters";
 import { findDisplayableEnvironment } from "~/models/runtimeEnvironment.server";
 import { getAllTaskIdentifiers } from "~/models/task.server";
-import { RunsRepository } from "~/services/runsRepository.server";
+import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
 import { machinePresetFromRun } from "~/v3/machinePresets.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { isCancellableRunStatus, isFinalRunStatus, isPendingRunStatus } from "~/v3/taskStatus";
diff --git a/apps/webapp/app/presenters/v3/QueryPresenter.server.ts b/apps/webapp/app/presenters/v3/QueryPresenter.server.ts
new file mode 100644
index 00000000000..53ebb3ccdff
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/QueryPresenter.server.ts
@@ -0,0 +1,58 @@
+import { defaultQuery } from "~/v3/querySchemas";
+import { BasePresenter } from "./basePresenter.server";
+import type { QueryScope } from "~/services/queryService.server";
+
+export type QueryHistoryItem = {
+  id: string;
+  query: string;
+  scope: QueryScope;
+  createdAt: Date;
+  userName: string | null;
+  /** AI-generated title summarizing the query */
+  title: string | null;
+  /** Time filter settings */
+  filterPeriod: string | null;
+  filterFrom: Date | null;
+  filterTo: Date | null;
+};
+
+export class QueryPresenter extends BasePresenter {
+  public async call({ organizationId }: { organizationId: string }) {
+    const history = await this._replica.customerQuery.findMany({
+      where: { organizationId },
+      orderBy: { createdAt: "desc" },
+      take: 20,
+      select: {
+        id: true,
+        query: true,
+        scope: true,
+        title: true,
+        createdAt: true,
+        filterPeriod: true,
+        filterFrom: true,
+        filterTo: true,
+        user: {
+          select: { name: true, displayName: true },
+        },
+      },
+    });
+
+    return {
+      defaultQuery,
+      history: history.map(
+        (q): QueryHistoryItem => ({
+          id: q.id,
+          query: q.query,
+          scope: q.scope.toLowerCase() as QueryScope,
+          createdAt: q.createdAt,
+          userName: q.user?.displayName ?? q.user?.name ?? null,
+          title: q.title,
+          filterPeriod: q.filterPeriod,
+          filterFrom: q.filterFrom,
+          filterTo: q.filterTo,
+        })
+      ),
+    };
+  }
+}
+
diff --git a/apps/webapp/app/presenters/v3/QueueListPresenter.server.ts b/apps/webapp/app/presenters/v3/QueueListPresenter.server.ts
index ec60db8b92b..0fe9e3f3652 100644
--- a/apps/webapp/app/presenters/v3/QueueListPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/QueueListPresenter.server.ts
@@ -114,6 +114,9 @@ export class QueueListPresenter extends BasePresenter {
         name: true,
         orderableName: true,
         concurrencyLimit: true,
+        concurrencyLimitBase: true,
+        concurrencyLimitOverriddenAt: true,
+        concurrencyLimitOverriddenBy: true,
         type: true,
         paused: true,
       },
@@ -135,6 +138,17 @@ export class QueueListPresenter extends BasePresenter {
       ),
     ]);
 
+    // Manually "join" the overridden users because there is no way to implement the relationship
+    // in prisma without adding a foreign key constraint
+    const overriddenByIds = queues.map((q) => q.concurrencyLimitOverriddenBy).filter(Boolean);
+    const overriddenByUsers = await this._replica.user.findMany({
+      where: {
+        id: { in: overriddenByIds },
+      },
+    });
+
+    const overriddenByMap = new Map(overriddenByUsers.map((u) => [u.id, u]));
+
     // Transform queues to include running and queued counts
     return queues.map((queue) =>
       toQueueItem({
@@ -144,6 +158,11 @@ export class QueueListPresenter extends BasePresenter {
         running: results[1][queue.name] ?? 0,
         queued: results[0][queue.name] ?? 0,
         concurrencyLimit: queue.concurrencyLimit ?? null,
+        concurrencyLimitBase: queue.concurrencyLimitBase ?? null,
+        concurrencyLimitOverriddenAt: queue.concurrencyLimitOverriddenAt ?? null,
+        concurrencyLimitOverriddenBy: queue.concurrencyLimitOverriddenBy
+          ? overriddenByMap.get(queue.concurrencyLimitOverriddenBy) ?? null
+          : null,
         paused: queue.paused,
       })
     );
diff --git a/apps/webapp/app/presenters/v3/QueueRetrievePresenter.server.ts b/apps/webapp/app/presenters/v3/QueueRetrievePresenter.server.ts
index 409c14d5457..bd885ea738b 100644
--- a/apps/webapp/app/presenters/v3/QueueRetrievePresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/QueueRetrievePresenter.server.ts
@@ -1,12 +1,18 @@
 import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { engine } from "~/v3/runEngine.server";
 import { BasePresenter } from "./basePresenter.server";
-import { type TaskQueueType } from "@trigger.dev/database";
+import { TaskQueue, User, type TaskQueueType } from "@trigger.dev/database";
 import { assertExhaustive } from "@trigger.dev/core";
 import { determineEngineVersion } from "~/v3/engineVersion.server";
-import { type QueueItem, type RetrieveQueueParam } from "@trigger.dev/core/v3";
+import { type Prettify, type QueueItem, type RetrieveQueueParam } from "@trigger.dev/core/v3";
 import { PrismaClientOrTransaction } from "@trigger.dev/database";
 
+export type FoundQueue = Prettify<
+  Omit<TaskQueue, "concurrencyLimitOverriddenBy"> & {
+    concurrencyLimitOverriddenBy?: User | null;
+  }
+>;
+
 /**
  * Shared queue lookup logic used by both QueueRetrievePresenter and PauseQueueService
  */
@@ -16,22 +22,50 @@ export async function getQueue(
   queue: RetrieveQueueParam
 ) {
   if (typeof queue === "string") {
-    return prismaClient.taskQueue.findFirst({
+    return joinQueueWithUser(
+      prismaClient,
+      await prismaClient.taskQueue.findFirst({
+        where: {
+          friendlyId: queue,
+          runtimeEnvironmentId: environment.id,
+        },
+      })
+    );
+  }
+
+  const queueName =
+    queue.type === "task" ? `task/${queue.name.replace(/^task\//, "")}` : queue.name;
+  return joinQueueWithUser(
+    prismaClient,
+    await prismaClient.taskQueue.findFirst({
       where: {
-        friendlyId: queue,
+        name: queueName,
         runtimeEnvironmentId: environment.id,
       },
-    });
+    })
+  );
+}
+
+async function joinQueueWithUser(
+  prismaClient: PrismaClientOrTransaction,
+  queue?: TaskQueue | null
+): Promise<FoundQueue | undefined> {
+  if (!queue) return undefined;
+  if (!queue.concurrencyLimitOverriddenBy) {
+    return {
+      ...queue,
+      concurrencyLimitOverriddenBy: undefined,
+    };
   }
 
-  const queueName =
-    queue.type === "task" ? `task/${queue.name.replace(/^task\//, "")}` : queue.name;
-  return prismaClient.taskQueue.findFirst({
-    where: {
-      name: queueName,
-      runtimeEnvironmentId: environment.id,
-    },
+  const user = await prismaClient.user.findFirst({
+    where: { id: queue.concurrencyLimitOverriddenBy },
   });
+
+  return {
+    ...queue,
+    concurrencyLimitOverriddenBy: user,
+  };
 }
 
 export class QueueRetrievePresenter extends BasePresenter {
@@ -75,6 +109,9 @@ export class QueueRetrievePresenter extends BasePresenter {
         running: results[1]?.[queue.name] ?? 0,
         queued: results[0]?.[queue.name] ?? 0,
         concurrencyLimit: queue.concurrencyLimit ?? null,
+        concurrencyLimitBase: queue.concurrencyLimitBase ?? null,
+        concurrencyLimitOverriddenAt: queue.concurrencyLimitOverriddenAt ?? null,
+        concurrencyLimitOverriddenBy: queue.concurrencyLimitOverriddenBy ?? null,
         paused: queue.paused,
       }),
     };
@@ -104,6 +141,9 @@ export function toQueueItem(data: {
   running: number;
   queued: number;
   concurrencyLimit: number | null;
+  concurrencyLimitBase: number | null;
+  concurrencyLimitOverriddenAt: Date | null;
+  concurrencyLimitOverriddenBy: User | null;
   paused: boolean;
 }): QueueItem & { releaseConcurrencyOnWaitpoint: boolean } {
   return {
@@ -113,9 +153,22 @@ export function toQueueItem(data: {
     type: queueTypeFromType(data.type),
     running: data.running,
     queued: data.queued,
-    concurrencyLimit: data.concurrencyLimit,
     paused: data.paused,
+    concurrencyLimit: data.concurrencyLimit,
+    concurrency: {
+      current: data.concurrencyLimit,
+      base: data.concurrencyLimitBase,
+      override: data.concurrencyLimitOverriddenAt ? data.concurrencyLimit : null,
+      overriddenBy: toQueueConcurrencyOverriddenBy(data.concurrencyLimitOverriddenBy),
+      overriddenAt: data.concurrencyLimitOverriddenAt,
+    },
     // TODO: This needs to be removed but keeping this here for now to avoid breaking existing clients
     releaseConcurrencyOnWaitpoint: true,
   };
 }
+
+function toQueueConcurrencyOverriddenBy(user: User | null) {
+  if (!user) return null;
+
+  return user.displayName ?? user.name ?? null;
+}
diff --git a/apps/webapp/app/presenters/v3/RegionsPresenter.server.ts b/apps/webapp/app/presenters/v3/RegionsPresenter.server.ts
new file mode 100644
index 00000000000..7a35fb6fb9b
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/RegionsPresenter.server.ts
@@ -0,0 +1,159 @@
+import { type Project } from "~/models/project.server";
+import { type User } from "~/models/user.server";
+import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { BasePresenter } from "./basePresenter.server";
+import { getCurrentPlan } from "~/services/platform.v3.server";
+
+export type Region = {
+  id: string;
+  name: string;
+  description?: string;
+  cloudProvider?: string;
+  location?: string;
+  staticIPs?: string | null;
+  isDefault: boolean;
+  isHidden: boolean;
+};
+
+export class RegionsPresenter extends BasePresenter {
+  public async call({
+    userId,
+    projectSlug,
+    isAdmin = false,
+  }: {
+    userId: User["id"];
+    projectSlug: Project["slug"];
+    isAdmin?: boolean;
+  }) {
+    const project = await this._replica.project.findFirst({
+      select: {
+        id: true,
+        organizationId: true,
+        defaultWorkerGroupId: true,
+        allowedWorkerQueues: true,
+      },
+      where: {
+        slug: projectSlug,
+        organization: {
+          members: {
+            some: {
+              userId,
+            },
+          },
+        },
+      },
+    });
+
+    if (!project) {
+      throw new Error("Project not found");
+    }
+
+    const getFlag = makeFlag(this._replica);
+    const defaultWorkerInstanceGroupId = await getFlag({
+      key: FEATURE_FLAG.defaultWorkerInstanceGroupId,
+    });
+
+    if (!defaultWorkerInstanceGroupId) {
+      throw new Error("Default worker instance group not found");
+    }
+
+    const visibleRegions = await this._replica.workerInstanceGroup.findMany({
+      select: {
+        id: true,
+        name: true,
+        description: true,
+        cloudProvider: true,
+        location: true,
+        staticIPs: true,
+        hidden: true,
+      },
+      where: isAdmin
+        ? undefined
+        : // Hide hidden unless they're allowed to use them
+        project.allowedWorkerQueues.length > 0
+        ? {
+            masterQueue: { in: project.allowedWorkerQueues },
+          }
+        : {
+            hidden: false,
+          },
+      orderBy: {
+        name: "asc",
+      },
+    });
+
+    const regions: Region[] = visibleRegions.map((region) => ({
+      id: region.id,
+      name: region.name,
+      description: region.description ?? undefined,
+      cloudProvider: region.cloudProvider ?? undefined,
+      location: region.location ?? undefined,
+      staticIPs: region.staticIPs ?? undefined,
+      isDefault: region.id === defaultWorkerInstanceGroupId,
+      isHidden: region.hidden,
+    }));
+
+    if (project.defaultWorkerGroupId) {
+      const defaultWorkerGroup = await this._replica.workerInstanceGroup.findFirst({
+        select: {
+          id: true,
+          name: true,
+          description: true,
+          cloudProvider: true,
+          location: true,
+          staticIPs: true,
+          hidden: true,
+        },
+        where: { id: project.defaultWorkerGroupId },
+      });
+
+      if (defaultWorkerGroup) {
+        // Unset the default region
+        const defaultRegion = regions.find((region) => region.isDefault);
+        if (defaultRegion) {
+          defaultRegion.isDefault = false;
+        }
+
+        regions.push({
+          id: defaultWorkerGroup.id,
+          name: defaultWorkerGroup.name,
+          description: defaultWorkerGroup.description ?? undefined,
+          cloudProvider: defaultWorkerGroup.cloudProvider ?? undefined,
+          location: defaultWorkerGroup.location ?? undefined,
+          staticIPs: defaultWorkerGroup.staticIPs ?? undefined,
+          isDefault: true,
+          isHidden: defaultWorkerGroup.hidden,
+        });
+      }
+    }
+
+    // Default first
+    const sorted = regions.sort((a, b) => {
+      if (a.isDefault) return -1;
+      if (b.isDefault) return 1;
+      return a.name.localeCompare(b.name);
+    });
+
+    // Remove later duplicates
+    let unique = sorted.filter((region, index, self) => {
+      const firstIndex = self.findIndex((t) => t.id === region.id);
+      return index === firstIndex;
+    });
+
+    // Don't show static IPs for free users
+    // Even if they had the IPs they wouldn't work, but this makes it less confusing
+    const currentPlan = await getCurrentPlan(project.organizationId);
+    const isPaying = currentPlan?.v3Subscription.isPaying === true;
+    if (!isPaying) {
+      unique = unique.map((region) => ({
+        ...region,
+        staticIPs: region.staticIPs ? null : undefined,
+      }));
+    }
+
+    return {
+      regions: unique.sort((a, b) => a.name.localeCompare(b.name)),
+      isPaying,
+    };
+  }
+}
diff --git a/apps/webapp/app/presenters/v3/RunPresenter.server.ts b/apps/webapp/app/presenters/v3/RunPresenter.server.ts
index d3ea2099245..5e8dab2d0b6 100644
--- a/apps/webapp/app/presenters/v3/RunPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/RunPresenter.server.ts
@@ -1,11 +1,13 @@
 import { millisecondsToNanoseconds } from "@trigger.dev/core/v3";
 import { createTreeFromFlatItems, flattenTree } from "~/components/primitives/TreeView/TreeView";
-import { prisma, PrismaClient } from "~/db.server";
+import { prisma, type PrismaClient } from "~/db.server";
 import { createTimelineSpanEventsFromSpanEvents } from "~/utils/timelineSpanEvents";
 import { getUsername } from "~/utils/username";
-import { eventRepository } from "~/v3/eventRepository.server";
+import { resolveEventRepositoryForStore } from "~/v3/eventRepository/index.server";
+import { SpanSummary } from "~/v3/eventRepository/eventRepository.types";
 import { getTaskEventStoreTableForRun } from "~/v3/taskEventStore.server";
 import { isFinalRunStatus } from "~/v3/taskStatus";
+import { env } from "~/env.server";
 
 type Result = Awaited<ReturnType<RunPresenter["call"]>>;
 export type Run = Result["run"];
@@ -28,7 +30,6 @@ export class RunPresenter {
   public async call({
     userId,
     projectSlug,
-    organizationSlug,
     environmentSlug,
     runFriendlyId,
     showDeletedLogs,
@@ -36,7 +37,6 @@ export class RunPresenter {
   }: {
     userId: string;
     projectSlug: string;
-    organizationSlug: string;
     environmentSlug: string;
     runFriendlyId: string;
     showDeletedLogs: boolean;
@@ -47,9 +47,11 @@ export class RunPresenter {
         id: true,
         createdAt: true,
         taskEventStore: true,
+        taskIdentifier: true,
         number: true,
         traceId: true,
         spanId: true,
+        parentSpanId: true,
         friendlyId: true,
         status: true,
         startedAt: true,
@@ -58,7 +60,13 @@ export class RunPresenter {
         rootTaskRun: {
           select: {
             friendlyId: true,
-            taskIdentifier: true,
+            spanId: true,
+            createdAt: true,
+          },
+        },
+        parentTaskRun: {
+          select: {
+            friendlyId: true,
             spanId: true,
             createdAt: true,
           },
@@ -87,6 +95,13 @@ export class RunPresenter {
         friendlyId: runFriendlyId,
         project: {
           slug: projectSlug,
+          organization: {
+            members: {
+              some: {
+                userId,
+              },
+            },
+          },
         },
       },
     });
@@ -111,6 +126,7 @@ export class RunPresenter {
       completedAt: run.completedAt,
       logsDeletedAt: showDeletedLogs ? null : run.logsDeletedAt,
       rootTaskRun: run.rootTaskRun,
+      parentTaskRun: run.parentTaskRun,
       environment: {
         id: run.runtimeEnvironment.id,
         organizationId: run.runtimeEnvironment.organizationId,
@@ -125,21 +141,56 @@ export class RunPresenter {
       return {
         run: runData,
         trace: undefined,
+        maximumLiveReloadingSetting: env.MAXIMUM_LIVE_RELOADING_EVENTS,
       };
     }
 
+    const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
     // get the events
-    const traceSummary = await eventRepository.getTraceSummary(
+    let traceSummary = await eventRepository.getTraceSummary(
       getTaskEventStoreTableForRun(run),
+      run.runtimeEnvironment.id,
       run.traceId,
       run.rootTaskRun?.createdAt ?? run.createdAt,
       run.completedAt ?? undefined,
       { includeDebugLogs: showDebug }
     );
+
     if (!traceSummary) {
-      return {
-        run: runData,
-        trace: undefined,
+      const spanSummary: SpanSummary = {
+        id: run.spanId,
+        parentId: run.parentSpanId ?? undefined,
+        runId: run.friendlyId,
+        data: {
+          message: run.taskIdentifier,
+          style: { icon: "task", variant: "primary" },
+          events: [],
+          startTime: run.createdAt,
+          duration: 0,
+          isError:
+            run.status === "COMPLETED_WITH_ERRORS" ||
+            run.status === "CRASHED" ||
+            run.status === "EXPIRED" ||
+            run.status === "SYSTEM_FAILURE" ||
+            run.status === "TIMED_OUT",
+          isPartial:
+            run.status === "DELAYED" ||
+            run.status === "PENDING" ||
+            run.status === "PAUSED" ||
+            run.status === "RETRYING_AFTER_FAILURE" ||
+            run.status === "DEQUEUED" ||
+            run.status === "EXECUTING" ||
+            run.status === "WAITING_TO_RESUME",
+          isCancelled: run.status === "CANCELED",
+          isDebug: false,
+          level: "TRACE",
+        },
+      };
+
+      traceSummary = {
+        rootSpan: spanSummary,
+        spans: [spanSummary],
       };
     }
 
@@ -158,6 +209,10 @@ export class RunPresenter {
     //we need the start offset for each item, and the total duration of the entire tree
     const treeRootStartTimeMs = tree ? tree?.data.startTime.getTime() : 0;
     let totalDuration = tree?.data.duration ?? 0;
+
+    // Build the linkedRunIdBySpanId map during the same walk
+    const linkedRunIdBySpanId: Record<string, string> = {};
+
     const events = tree
       ? flattenTree(tree).map((n) => {
           const offset = millisecondsToNanoseconds(
@@ -167,6 +222,12 @@ export class RunPresenter {
           if (!n.data.isDebug) {
             totalDuration = Math.max(totalDuration, offset + n.data.duration);
           }
+
+          // For cached spans, store the mapping from spanId to the linked run's ID
+          if (n.data.style?.icon === "task-cached" && n.runId) {
+            linkedRunIdBySpanId[n.id] = n.runId;
+          }
+
           return {
             ...n,
             data: {
@@ -202,15 +263,16 @@ export class RunPresenter {
       trace: {
         rootSpanStatus,
         events: events,
-        parentRunFriendlyId:
-          tree?.id === traceSummary.rootSpan.id ? undefined : traceSummary.rootSpan.runId,
         duration: totalDuration,
         rootStartedAt: tree?.data.startTime,
         startedAt: run.startedAt,
         queuedDuration: run.startedAt
           ? millisecondsToNanoseconds(run.startedAt.getTime() - run.createdAt.getTime())
           : undefined,
+        overridesBySpanId: traceSummary.overridesBySpanId,
+        linkedRunIdBySpanId,
       },
+      maximumLiveReloadingSetting: eventRepository.maximumLiveReloadingSetting,
     };
   }
 }
diff --git a/apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts b/apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts
index 6624048e8ce..1dd4edc6233 100644
--- a/apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/RunStreamPresenter.server.ts
@@ -1,11 +1,12 @@
-import { TaskRun } from "@trigger.dev/database";
-import { eventStream } from "remix-utils/sse/server";
-import { PrismaClient, prisma } from "~/db.server";
+import { type PrismaClient, prisma } from "~/db.server";
 import { logger } from "~/services/logger.server";
+import { singleton } from "~/utils/singleton";
+import { createSSELoader, SendFunction } from "~/utils/sse";
 import { throttle } from "~/utils/throttle";
-import { eventRepository } from "~/v3/eventRepository.server";
+import { tracePubSub } from "~/v3/services/tracePubSub.server";
 
-const pingInterval = 1000;
+const PING_INTERVAL = 5_000;
+const STREAM_TIMEOUT = 30_000;
 
 export class RunStreamPresenter {
   #prismaClient: PrismaClient;
@@ -14,105 +15,131 @@ export class RunStreamPresenter {
     this.#prismaClient = prismaClient;
   }
 
-  public async call({
-    request,
-    runFriendlyId,
-  }: {
-    request: Request;
-    runFriendlyId: TaskRun["friendlyId"];
-  }) {
-    const run = await this.#prismaClient.taskRun.findFirst({
-      where: {
-        friendlyId: runFriendlyId,
-      },
-      select: {
-        traceId: true,
-      },
-    });
-
-    if (!run) {
-      return new Response("Not found", { status: 404 });
-    }
-
-    logger.info("RunStreamPresenter.call", {
-      runFriendlyId,
-      traceId: run.traceId,
-    });
+  public createLoader() {
+    const prismaClient = this.#prismaClient;
 
-    let pinger: NodeJS.Timeout | undefined = undefined;
-
-    const { unsubscribe, eventEmitter } = await eventRepository.subscribeToTrace(run.traceId);
-
-    return eventStream(request.signal, (send, close) => {
-      const safeSend = (args: { event?: string; data: string }) => {
-        try {
-          send(args);
-        } catch (error) {
-          if (error instanceof Error) {
-            if (error.name !== "TypeError") {
-              logger.debug("Error sending SSE, aborting", {
-                error: {
-                  name: error.name,
-                  message: error.message,
-                  stack: error.stack,
-                },
-                args,
-              });
-            }
-          } else {
-            logger.debug("Unknown error sending SSE, aborting", {
-              error,
-              args,
-            });
-          }
+    return createSSELoader({
+      timeout: STREAM_TIMEOUT,
+      interval: PING_INTERVAL,
+      handler: async (context) => {
+        const runFriendlyId = context.params.runParam;
 
-          close();
+        if (!runFriendlyId) {
+          throw new Response("Missing runParam", { status: 400 });
         }
-      };
 
-      const throttledSend = throttle(safeSend, 1000);
-
-      eventEmitter.addListener("message", (event) => {
-        throttledSend({ data: event });
-      });
+        const run = await prismaClient.taskRun.findFirst({
+          where: {
+            friendlyId: runFriendlyId,
+          },
+          select: {
+            traceId: true,
+          },
+        });
 
-      pinger = setInterval(() => {
-        if (request.signal.aborted) {
-          return close();
+        if (!run) {
+          throw new Response("Not found", { status: 404 });
         }
 
-        safeSend({ event: "ping", data: new Date().toISOString() });
-      }, pingInterval);
-
-      return function clear() {
-        logger.info("RunStreamPresenter.abort", {
+        logger.info("RunStreamPresenter.start", {
           runFriendlyId,
           traceId: run.traceId,
         });
 
-        clearInterval(pinger);
-
-        eventEmitter.removeAllListeners();
+        // Subscribe to trace updates
+        const { unsubscribe, eventEmitter } = await tracePubSub.subscribeToTrace(run.traceId);
+
+        // Only send max every 1 second
+        const throttledSend = throttle(
+          (args: { send: SendFunction; event?: string; data: string }) => {
+            try {
+              args.send({ event: args.event, data: args.data });
+            } catch (error) {
+              if (error instanceof Error) {
+                if (error.name !== "TypeError") {
+                  logger.debug("Error sending SSE in RunStreamPresenter", {
+                    error: {
+                      name: error.name,
+                      message: error.message,
+                      stack: error.stack,
+                    },
+                  });
+                }
+              }
+              // Abort the stream on send error
+              context.controller.abort("Send error");
+            }
+          },
+          1000
+        );
+
+        let messageListener: ((event: string) => void) | undefined;
+
+        return {
+          initStream: ({ send }) => {
+            // Create throttled send function
+            throttledSend({ send, event: "message", data: new Date().toISOString() });
+
+            // Set up message listener for pub/sub events
+            messageListener = (event: string) => {
+              throttledSend({ send, event: "message", data: event });
+            };
+            eventEmitter.addListener("message", messageListener);
+
+            context.debug("Subscribed to trace pub/sub");
+          },
+
+          iterator: ({ send }) => {
+            // Send ping to keep connection alive
+            try {
+              // Send an actual message so the client refreshes
+              throttledSend({ send, event: "message", data: new Date().toISOString() });
+            } catch (error) {
+              // If we can't send a ping, the connection is likely dead
+              return false;
+            }
+          },
 
-        unsubscribe()
-          .then(() => {
-            logger.info("RunStreamPresenter.abort.unsubscribe succeeded", {
-              runFriendlyId,
-              traceId: run.traceId,
-            });
-          })
-          .catch((error) => {
-            logger.error("RunStreamPresenter.abort.unsubscribe failed", {
+          cleanup: () => {
+            logger.info("RunStreamPresenter.cleanup", {
               runFriendlyId,
               traceId: run.traceId,
-              error: {
-                name: error.name,
-                message: error.message,
-                stack: error.stack,
-              },
             });
-          });
-      };
+
+            // Remove message listener
+            if (messageListener) {
+              eventEmitter.removeListener("message", messageListener);
+            }
+            eventEmitter.removeAllListeners();
+
+            // Unsubscribe from Redis pub/sub
+            unsubscribe()
+              .then(() => {
+                logger.info("RunStreamPresenter.cleanup.unsubscribe succeeded", {
+                  runFriendlyId,
+                  traceId: run.traceId,
+                });
+              })
+              .catch((error) => {
+                logger.error("RunStreamPresenter.cleanup.unsubscribe failed", {
+                  runFriendlyId,
+                  traceId: run.traceId,
+                  error: {
+                    name: error.name,
+                    message: error.message,
+                    stack: error.stack,
+                  },
+                });
+              });
+          },
+        };
+      },
     });
   }
 }
+
+// Export a singleton loader for the route to use
+export const runStreamLoader = singleton("runStreamLoader", () => {
+  const presenter = new RunStreamPresenter();
+  return presenter.createLoader();
+});
diff --git a/apps/webapp/app/presenters/v3/RunTagListPresenter.server.ts b/apps/webapp/app/presenters/v3/RunTagListPresenter.server.ts
index f159d3928e8..e9de368eceb 100644
--- a/apps/webapp/app/presenters/v3/RunTagListPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/RunTagListPresenter.server.ts
@@ -1,8 +1,16 @@
+import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
 import { BasePresenter } from "./basePresenter.server";
+import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { type PrismaClient } from "@trigger.dev/database";
+import { timeFilters } from "~/components/runs/v3/SharedFilters";
 
 export type TagListOptions = {
-  userId?: string;
+  organizationId: string;
+  environmentId: string;
   projectId: string;
+  period?: string;
+  from?: Date;
+  to?: Date;
   //filters
   name?: string;
   //pagination
@@ -17,40 +25,39 @@ export type TagListItem = TagList["tags"][number];
 
 export class RunTagListPresenter extends BasePresenter {
   public async call({
-    userId,
+    organizationId,
+    environmentId,
     projectId,
     name,
+    period,
+    from,
+    to,
     page = 1,
     pageSize = DEFAULT_PAGE_SIZE,
   }: TagListOptions) {
     const hasFilters = Boolean(name?.trim());
 
-    const tags = await this._replica.taskRunTag.findMany({
-      where: {
-        projectId,
-        name: name
-          ? {
-              startsWith: name,
-              mode: "insensitive",
-            }
-          : undefined,
-      },
-      orderBy: {
-        id: "desc",
-      },
-      take: pageSize + 1,
-      skip: (page - 1) * pageSize,
+    const runsRepository = new RunsRepository({
+      clickhouse: clickhouseClient,
+      prisma: this._replica as PrismaClient,
+    });
+
+    const tags = await runsRepository.listTags({
+      organizationId,
+      projectId,
+      environmentId,
+      query: name,
+      period,
+      from: from ? from.getTime() : undefined,
+      to: to ? to.getTime() : undefined,
+      offset: (page - 1) * pageSize,
+      limit: pageSize + 1,
     });
 
     return {
-      tags: tags
-        .map((tag) => ({
-          id: tag.friendlyId,
-          name: tag.name,
-        }))
-        .slice(0, pageSize),
+      tags: tags.tags,
       currentPage: page,
-      hasMore: tags.length > pageSize,
+      hasMore: tags.tags.length > pageSize,
       hasFilters,
     };
   }
diff --git a/apps/webapp/app/presenters/v3/ScheduleListPresenter.server.ts b/apps/webapp/app/presenters/v3/ScheduleListPresenter.server.ts
index 929e1e40ba9..053414dcfc7 100644
--- a/apps/webapp/app/presenters/v3/ScheduleListPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/ScheduleListPresenter.server.ts
@@ -96,7 +96,7 @@ export class ScheduleListPresenter extends BasePresenter {
 
     const schedulesCount = await CheckScheduleService.getUsedSchedulesCount({
       prisma: this._replica,
-      environments: project.environments,
+      projectId,
     });
 
     const limit = await getLimit(project.organizationId, "schedules", 100_000_000);
diff --git a/apps/webapp/app/presenters/v3/SpanPresenter.server.ts b/apps/webapp/app/presenters/v3/SpanPresenter.server.ts
index 7d3c219beea..59e717f7cd8 100644
--- a/apps/webapp/app/presenters/v3/SpanPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/SpanPresenter.server.ts
@@ -1,36 +1,62 @@
 import {
-  type MachinePresetName,
+  type MachinePreset,
   prettyPrintPacket,
   SemanticInternalAttributes,
+  type TaskRunContext,
   TaskRunError,
+  TriggerTraceContext,
+  type V3TaskRunContext,
 } from "@trigger.dev/core/v3";
-import { getMaxDuration } from "@trigger.dev/core/v3/isomorphic";
+import { AttemptId, getMaxDuration, parseTraceparent } from "@trigger.dev/core/v3/isomorphic";
+import {
+  extractIdempotencyKeyScope,
+  getUserProvidedIdempotencyKey,
+} from "@trigger.dev/core/v3/serverOnly";
 import { RUNNING_STATUSES } from "~/components/runs/v3/TaskRunStatus";
 import { logger } from "~/services/logger.server";
-import { eventRepository, rehydrateAttribute } from "~/v3/eventRepository.server";
-import { machinePresetFromName, machinePresetFromRun } from "~/v3/machinePresets.server";
+import { rehydrateAttribute } from "~/v3/eventRepository/eventRepository.server";
+import { machinePresetFromRun } from "~/v3/machinePresets.server";
 import { getTaskEventStoreTableForRun, type TaskEventStoreTable } from "~/v3/taskEventStore.server";
 import { isFailedRunStatus, isFinalRunStatus } from "~/v3/taskStatus";
 import { BasePresenter } from "./basePresenter.server";
 import { WaitpointPresenter } from "./WaitpointPresenter.server";
+import { engine } from "~/v3/runEngine.server";
+import { resolveEventRepositoryForStore } from "~/v3/eventRepository/index.server";
+import { IEventRepository, SpanDetail } from "~/v3/eventRepository/eventRepository.types";
+import { safeJsonParse } from "~/utils/json";
 
 type Result = Awaited<ReturnType<SpanPresenter["call"]>>;
 export type Span = NonNullable<NonNullable<Result>["span"]>;
 export type SpanRun = NonNullable<NonNullable<Result>["run"]>;
+type FindRunResult = NonNullable<
+  Awaited<ReturnType<InstanceType<typeof SpanPresenter>["findRun"]>>
+>;
+type GetSpanResult = SpanDetail;
 
 export class SpanPresenter extends BasePresenter {
   public async call({
+    userId,
     projectSlug,
     spanId,
     runFriendlyId,
+    linkedRunId,
   }: {
+    userId: string;
     projectSlug: string;
     spanId: string;
     runFriendlyId: string;
+    linkedRunId?: string;
   }) {
     const project = await this._replica.project.findFirst({
       where: {
         slug: projectSlug,
+        organization: {
+          members: {
+            some: {
+              userId,
+            },
+          },
+        },
       },
     });
 
@@ -49,6 +75,7 @@ export class SpanPresenter extends BasePresenter {
       },
       where: {
         friendlyId: runFriendlyId,
+        projectId: project.id,
       },
     });
 
@@ -58,14 +85,19 @@ export class SpanPresenter extends BasePresenter {
 
     const { traceId } = parentRun;
 
+    const eventRepository = resolveEventRepositoryForStore(parentRun.taskEventStore);
+
     const eventStore = getTaskEventStoreTableForRun(parentRun);
 
-    const run = await this.#getRun({
+    const run = await this.getRun({
       eventStore,
       traceId,
+      eventRepository,
       spanId,
+      linkedRunId,
       createdAt: parentRun.createdAt,
       completedAt: parentRun.completedAt,
+      environmentId: parentRun.runtimeEnvironmentId,
     });
     if (run) {
       return {
@@ -74,15 +106,15 @@ export class SpanPresenter extends BasePresenter {
       };
     }
 
-    //get the run
     const span = await this.#getSpan({
       eventStore,
-      traceId,
       spanId,
+      traceId,
       environmentId: parentRun.runtimeEnvironmentId,
       projectId: parentRun.projectId,
       createdAt: parentRun.createdAt,
       completedAt: parentRun.completedAt,
+      eventRepository,
     });
 
     if (!span) {
@@ -95,139 +127,27 @@ export class SpanPresenter extends BasePresenter {
     };
   }
 
-  async #getRun({
+  async getRun({
     eventStore,
+    environmentId,
     traceId,
+    eventRepository,
     spanId,
+    linkedRunId,
     createdAt,
     completedAt,
   }: {
     eventStore: TaskEventStoreTable;
+    environmentId: string;
     traceId: string;
+    eventRepository: IEventRepository;
     spanId: string;
+    linkedRunId?: string;
     createdAt: Date;
     completedAt: Date | null;
   }) {
-    const span = await eventRepository.getSpan(
-      eventStore,
-      spanId,
-      traceId,
-      createdAt,
-      completedAt ?? undefined
-    );
-
-    if (!span) {
-      return;
-    }
-
-    const run = await this._replica.taskRun.findFirst({
-      select: {
-        id: true,
-        spanId: true,
-        traceId: true,
-        //metadata
-        number: true,
-        taskIdentifier: true,
-        friendlyId: true,
-        isTest: true,
-        maxDurationInSeconds: true,
-        taskEventStore: true,
-        tags: {
-          select: {
-            name: true,
-          },
-        },
-        machinePreset: true,
-        lockedToVersion: {
-          select: {
-            version: true,
-            sdkVersion: true,
-            runtime: true,
-            runtimeVersion: true,
-          },
-        },
-        engine: true,
-        workerQueue: true,
-        error: true,
-        output: true,
-        outputType: true,
-        //status + duration
-        status: true,
-        statusReason: true,
-        startedAt: true,
-        executedAt: true,
-        createdAt: true,
-        updatedAt: true,
-        queuedAt: true,
-        completedAt: true,
-        logsDeletedAt: true,
-        //idempotency
-        idempotencyKey: true,
-        idempotencyKeyExpiresAt: true,
-        //delayed
-        delayUntil: true,
-        //ttl
-        ttl: true,
-        expiredAt: true,
-        //queue
-        queue: true,
-        concurrencyKey: true,
-        //schedule
-        scheduleId: true,
-        //usage
-        baseCostInCents: true,
-        costInCents: true,
-        usageDurationMs: true,
-        //env
-        runtimeEnvironment: {
-          select: { id: true, slug: true, type: true },
-        },
-        payload: true,
-        payloadType: true,
-        metadata: true,
-        metadataType: true,
-        maxAttempts: true,
-        project: {
-          include: {
-            organization: true,
-          },
-        },
-        lockedBy: {
-          select: {
-            filePath: true,
-          },
-        },
-        //relationships
-        rootTaskRun: {
-          select: {
-            taskIdentifier: true,
-            friendlyId: true,
-            spanId: true,
-            createdAt: true,
-          },
-        },
-        parentTaskRun: {
-          select: {
-            taskIdentifier: true,
-            friendlyId: true,
-            spanId: true,
-          },
-        },
-        batch: {
-          select: {
-            friendlyId: true,
-          },
-        },
-        replayedFromTaskRunFriendlyId: true,
-      },
-      where: span.originalRun
-        ? {
-            friendlyId: span.originalRun,
-          }
-        : {
-            spanId,
-          },
-    });
+    // Use linkedRunId if provided (for cached spans), otherwise look up by spanId
+    const run = await this.findRun({ originalRunId: linkedRunId, spanId, environmentId });
 
     if (!run) {
       return;
@@ -271,46 +191,25 @@ export class SpanPresenter extends BasePresenter {
 
     const machine = run.machinePreset ? machinePresetFromRun(run) : undefined;
 
-    const context = {
-      task: {
-        id: run.taskIdentifier,
-        filePath: run.lockedBy?.filePath,
-      },
-      run: {
-        id: run.friendlyId,
-        createdAt: run.createdAt,
-        tags: run.tags.map((tag) => tag.name),
-        isTest: run.isTest,
-        idempotencyKey: run.idempotencyKey ?? undefined,
-        startedAt: run.startedAt ?? run.createdAt,
-        durationMs: run.usageDurationMs,
-        costInCents: run.costInCents,
-        baseCostInCents: run.baseCostInCents,
-        maxAttempts: run.maxAttempts ?? undefined,
-        version: run.lockedToVersion?.version,
-        maxDuration: run.maxDurationInSeconds ?? undefined,
-      },
-      queue: {
-        name: run.queue,
-      },
-      environment: {
-        id: run.runtimeEnvironment.id,
-        slug: run.runtimeEnvironment.slug,
-        type: run.runtimeEnvironment.type,
-      },
-      organization: {
-        id: run.project.organization.id,
-        slug: run.project.organization.slug,
-        name: run.project.organization.title,
-      },
-      project: {
-        id: run.project.id,
-        ref: run.project.externalRef,
-        slug: run.project.slug,
-        name: run.project.name,
-      },
-      machine,
-    };
+    const context = await this.#getTaskRunContext({ run, machine: machine ?? undefined });
+
+    const externalTraceId = this.#getExternalTraceId(run.traceContext);
+
+    let region: { name: string; location: string | null } | null = null;
+
+    if (run.runtimeEnvironment.type !== "DEVELOPMENT" && run.engine !== "V1") {
+      const workerGroup = await this._replica.workerInstanceGroup.findFirst({
+        select: {
+          name: true,
+          location: true,
+        },
+        where: {
+          masterQueue: run.workerQueue,
+        },
+      });
+
+      region = workerGroup ?? null;
+    }
 
     return {
       id: run.id,
@@ -334,15 +233,18 @@ export class SpanPresenter extends BasePresenter {
       isTest: run.isTest,
       replayedFromTaskRunFriendlyId: run.replayedFromTaskRunFriendlyId,
       environmentId: run.runtimeEnvironment.id,
-      idempotencyKey: run.idempotencyKey,
+      idempotencyKey: getUserProvidedIdempotencyKey(run),
       idempotencyKeyExpiresAt: run.idempotencyKeyExpiresAt,
+      idempotencyKeyScope: extractIdempotencyKeyScope(run),
+      idempotencyKeyStatus: this.getIdempotencyKeyStatus(run),
+      debounce: run.debounce as { key: string; delay: string; createdAt: Date } | null,
       schedule: await this.resolveSchedule(run.scheduleId ?? undefined),
       queue: {
         name: run.queue,
         isCustomQueue: !run.queue.startsWith("task/"),
         concurrencyKey: run.concurrencyKey,
       },
-      tags: run.tags.map((tag) => tag.name),
+      tags: run.runTags,
       baseCostInCents: run.baseCostInCents,
       costInCents: run.costInCents,
       totalCostInCents: run.costInCents + run.baseCostInCents,
@@ -369,13 +271,41 @@ export class SpanPresenter extends BasePresenter {
       maxDurationInSeconds: getMaxDuration(run.maxDurationInSeconds),
       batch: run.batch ? { friendlyId: run.batch.friendlyId } : undefined,
       engine: run.engine,
+      region,
       workerQueue: run.workerQueue,
+      traceId: run.traceId,
       spanId: run.spanId,
-      isCached: !!span.originalRun,
+      isCached: !!linkedRunId,
       machinePreset: machine?.name,
+      taskEventStore: run.taskEventStore,
+      externalTraceId,
     };
   }
 
+  private getIdempotencyKeyStatus(run: {
+    idempotencyKey: string | null;
+    idempotencyKeyExpiresAt: Date | null;
+    idempotencyKeyOptions: unknown;
+  }): "active" | "inactive" | "expired" | undefined {
+    // No idempotency configured if no scope exists
+    const scope = extractIdempotencyKeyScope(run);
+    if (!scope) {
+      return undefined;
+    }
+
+    // Check if expired first (takes precedence)
+    if (run.idempotencyKeyExpiresAt && run.idempotencyKeyExpiresAt < new Date()) {
+      return "expired";
+    }
+
+    // Check if reset (hash is null but options exist)
+    if (run.idempotencyKey === null) {
+      return "inactive";
+    }
+
+    return "active";
+  }
+
   async resolveSchedule(scheduleId?: string) {
     if (!scheduleId) {
       return;
@@ -405,8 +335,144 @@ export class SpanPresenter extends BasePresenter {
     };
   }
 
+  async findRun({
+    originalRunId,
+    spanId,
+    environmentId,
+  }: {
+    originalRunId?: string;
+    spanId: string;
+    environmentId: string;
+  }) {
+    const run = await this._replica.taskRun.findFirst({
+      select: {
+        id: true,
+        spanId: true,
+        traceId: true,
+        traceContext: true,
+        //metadata
+        number: true,
+        taskIdentifier: true,
+        friendlyId: true,
+        isTest: true,
+        maxDurationInSeconds: true,
+        taskEventStore: true,
+        runTags: true,
+        machinePreset: true,
+        lockedToVersion: {
+          select: {
+            version: true,
+            sdkVersion: true,
+            runtime: true,
+            runtimeVersion: true,
+          },
+        },
+        engine: true,
+        workerQueue: true,
+        error: true,
+        output: true,
+        outputType: true,
+        //status + duration
+        status: true,
+        statusReason: true,
+        startedAt: true,
+        executedAt: true,
+        createdAt: true,
+        updatedAt: true,
+        queuedAt: true,
+        completedAt: true,
+        logsDeletedAt: true,
+        //idempotency
+        idempotencyKey: true,
+        idempotencyKeyExpiresAt: true,
+        idempotencyKeyOptions: true,
+        //debounce
+        debounce: true,
+        //delayed
+        delayUntil: true,
+        //ttl
+        ttl: true,
+        expiredAt: true,
+        //queue
+        queue: true,
+        concurrencyKey: true,
+        //schedule
+        scheduleId: true,
+        //usage
+        baseCostInCents: true,
+        costInCents: true,
+        usageDurationMs: true,
+        //env
+        runtimeEnvironment: {
+          select: { id: true, slug: true, type: true },
+        },
+        payload: true,
+        payloadType: true,
+        metadata: true,
+        metadataType: true,
+        maxAttempts: true,
+        project: {
+          include: {
+            organization: true,
+          },
+        },
+        lockedBy: {
+          select: {
+            filePath: true,
+          },
+        },
+        //relationships
+        rootTaskRun: {
+          select: {
+            taskIdentifier: true,
+            friendlyId: true,
+            spanId: true,
+            createdAt: true,
+          },
+        },
+        parentTaskRun: {
+          select: {
+            taskIdentifier: true,
+            friendlyId: true,
+            spanId: true,
+          },
+        },
+        batch: {
+          select: {
+            friendlyId: true,
+          },
+        },
+        replayedFromTaskRunFriendlyId: true,
+        attempts: {
+          take: 1,
+          orderBy: {
+            createdAt: "desc",
+          },
+          select: {
+            number: true,
+            status: true,
+            createdAt: true,
+            friendlyId: true,
+          },
+        },
+      },
+      where: originalRunId
+        ? {
+            friendlyId: originalRunId,
+            runtimeEnvironmentId: environmentId,
+          }
+        : {
+            spanId,
+            runtimeEnvironmentId: environmentId,
+          },
+    });
+
+    return run;
+  }
+
   async #getSpan({
     eventStore,
+    eventRepository,
     traceId,
     spanId,
     environmentId,
@@ -414,6 +480,7 @@ export class SpanPresenter extends BasePresenter {
     createdAt,
     completedAt,
   }: {
+    eventRepository: IEventRepository;
     traceId: string;
     spanId: string;
     environmentId: string;
@@ -424,12 +491,14 @@ export class SpanPresenter extends BasePresenter {
   }) {
     const span = await eventRepository.getSpan(
       eventStore,
+      environmentId,
       spanId,
       traceId,
       createdAt,
       completedAt ?? undefined,
       { includeDebugLogs: true }
     );
+
     if (!span) {
       return;
     }
@@ -441,11 +510,7 @@ export class SpanPresenter extends BasePresenter {
         spanId: true,
         createdAt: true,
         number: true,
-        lockedToVersion: {
-          select: {
-            version: true,
-          },
-        },
+        taskVersion: true,
       },
       where: {
         parentSpanId: spanId,
@@ -453,11 +518,32 @@ export class SpanPresenter extends BasePresenter {
     });
 
     const data = {
-      ...span,
+      spanId: span.spanId,
+      parentId: span.parentId,
+      message: span.message,
+      isError: span.isError,
+      isPartial: span.isPartial,
+      isCancelled: span.isCancelled,
+      level: span.level,
+      startTime: span.startTime,
+      duration: span.duration,
       events: span.events,
-      properties: span.properties ? JSON.stringify(span.properties, null, 2) : undefined,
+      style: span.style,
+      properties:
+        span.properties &&
+        typeof span.properties === "object" &&
+        Object.keys(span.properties).length > 0
+          ? JSON.stringify(span.properties, null, 2)
+          : undefined,
+      resourceProperties:
+        span.resourceProperties &&
+        typeof span.resourceProperties === "object" &&
+        Object.keys(span.resourceProperties).length > 0
+          ? JSON.stringify(span.resourceProperties, null, 2)
+          : undefined,
+      entity: span.entity,
+      metadata: span.metadata,
       triggeredRuns,
-      showActionBar: span.show?.actions === true,
     };
 
     switch (span.entity.type) {
@@ -509,8 +595,144 @@ export class SpanPresenter extends BasePresenter {
           },
         };
       }
+      case "realtime-stream": {
+        if (!span.entity.id) {
+          logger.error(`SpanPresenter: No realtime stream id`, {
+            spanId,
+            realtimeStreamId: span.entity.id,
+          });
+          return { ...data, entity: null };
+        }
+
+        const [runId, streamKey] = span.entity.id.split(":");
+
+        if (!runId || !streamKey) {
+          logger.error(`SpanPresenter: Invalid realtime stream id`, {
+            spanId,
+            realtimeStreamId: span.entity.id,
+          });
+          return { ...data, entity: null };
+        }
+
+        const metadata = span.entity.metadata
+          ? (safeJsonParse(span.entity.metadata) as Record<string, unknown> | undefined)
+          : undefined;
+
+        return {
+          ...data,
+          entity: {
+            type: "realtime-stream" as const,
+            object: {
+              runId,
+              streamKey,
+              metadata,
+            },
+          },
+        };
+      }
       default:
         return { ...data, entity: null };
     }
   }
+
+  async #getTaskRunContext({ run, machine }: { run: FindRunResult; machine?: MachinePreset }) {
+    if (run.engine === "V1") {
+      return this.#getV3TaskRunContext({ run, machine });
+    } else {
+      return this.#getV4TaskRunContext({ run });
+    }
+  }
+
+  async #getV3TaskRunContext({
+    run,
+    machine,
+  }: {
+    run: FindRunResult;
+    machine?: MachinePreset;
+  }): Promise<V3TaskRunContext> {
+    const attempt = run.attempts[0];
+
+    const context = {
+      attempt: attempt
+        ? {
+            id: attempt.friendlyId,
+            number: attempt.number,
+            status: attempt.status,
+            startedAt: attempt.createdAt,
+          }
+        : {
+            id: AttemptId.generate().friendlyId,
+            number: 1,
+            status: "PENDING" as const,
+            startedAt: run.updatedAt,
+          },
+      task: {
+        id: run.taskIdentifier,
+        filePath: run.lockedBy?.filePath ?? "",
+      },
+      run: {
+        id: run.friendlyId,
+        createdAt: run.createdAt,
+        tags: run.runTags,
+        isTest: run.isTest,
+        idempotencyKey: getUserProvidedIdempotencyKey(run) ?? undefined,
+        startedAt: run.startedAt ?? run.createdAt,
+        durationMs: run.usageDurationMs,
+        costInCents: run.costInCents,
+        baseCostInCents: run.baseCostInCents,
+        maxAttempts: run.maxAttempts ?? undefined,
+        version: run.lockedToVersion?.version,
+        maxDuration: run.maxDurationInSeconds ?? undefined,
+      },
+      queue: {
+        name: run.queue,
+        id: run.queue,
+      },
+      environment: {
+        id: run.runtimeEnvironment.id,
+        slug: run.runtimeEnvironment.slug,
+        type: run.runtimeEnvironment.type,
+      },
+      organization: {
+        id: run.project.organization.id,
+        slug: run.project.organization.slug,
+        name: run.project.organization.title,
+      },
+      project: {
+        id: run.project.id,
+        ref: run.project.externalRef,
+        slug: run.project.slug,
+        name: run.project.name,
+      },
+      machine,
+    } satisfies V3TaskRunContext;
+
+    return context;
+  }
+
+  async #getV4TaskRunContext({ run }: { run: FindRunResult }): Promise<TaskRunContext> {
+    return engine.resolveTaskRunContext(run.id);
+  }
+
+  #getExternalTraceId(traceContext: unknown) {
+    if (!traceContext) {
+      return;
+    }
+
+    const parsedTraceContext = TriggerTraceContext.safeParse(traceContext);
+
+    if (!parsedTraceContext.success) {
+      return;
+    }
+
+    const externalTraceparent = parsedTraceContext.data.external?.traceparent;
+
+    if (!externalTraceparent) {
+      return;
+    }
+
+    const parsedTraceparent = parseTraceparent(externalTraceparent);
+
+    return parsedTraceparent?.traceId;
+  }
 }
diff --git a/apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts b/apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts
index 23fe6bca94e..2817b7c8b8f 100644
--- a/apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/TestTaskPresenter.server.ts
@@ -1,14 +1,17 @@
+import { ClickHouse } from "@internal/clickhouse";
 import { ScheduledTaskPayload, parsePacket, prettyPrintPacket } from "@trigger.dev/core/v3";
 import {
-  type TaskRunTemplate,
   type RuntimeEnvironmentType,
   type TaskRunStatus,
+  type TaskRunTemplate,
+  PrismaClientOrTransaction,
 } from "@trigger.dev/database";
-import { type PrismaClient, prisma, sqlDatabaseSchema } from "~/db.server";
+import parse from "parse-duration";
+import { type PrismaClient } from "~/db.server";
+import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
 import { getTimezones } from "~/utils/timezones.server";
 import { findCurrentWorkerDeployment } from "~/v3/models/workerDeployment.server";
 import { queueTypeFromType } from "./QueueRetrievePresenter.server";
-import parse from "parse-duration";
 
 export type RunTemplate = TaskRunTemplate & {
   scheduledTaskPayload?: ScheduledRun["payload"];
@@ -20,6 +23,8 @@ type TestTaskOptions = {
   environment: {
     id: string;
     type: RuntimeEnvironmentType;
+    projectId: string;
+    organizationId: string;
   };
   taskIdentifier: string;
 };
@@ -111,11 +116,10 @@ export type ScheduledRun = Omit<RawRun, "payload" | "ttl"> & {
 };
 
 export class TestTaskPresenter {
-  #prismaClient: PrismaClient;
-
-  constructor(prismaClient: PrismaClient = prisma) {
-    this.#prismaClient = prismaClient;
-  }
+  constructor(
+    private readonly replica: PrismaClientOrTransaction,
+    private readonly clickhouse: ClickHouse
+  ) {}
 
   public async call({
     userId,
@@ -128,7 +132,7 @@ export class TestTaskPresenter {
         ? (
             await findCurrentWorkerDeployment({ environmentId: environment.id })
           )?.worker?.tasks.find((t) => t.slug === taskIdentifier)
-        : await this.#prismaClient.backgroundWorkerTask.findFirst({
+        : await this.replica.backgroundWorkerTask.findFirst({
             where: {
               slug: taskIdentifier,
               runtimeEnvironmentId: environment.id,
@@ -145,7 +149,7 @@ export class TestTaskPresenter {
     }
 
     const taskQueue = task.queueId
-      ? await this.#prismaClient.taskQueue.findFirst({
+      ? await this.replica.taskQueue.findFirst({
           where: {
             runtimeEnvironmentId: environment.id,
             id: task.queueId,
@@ -159,7 +163,7 @@ export class TestTaskPresenter {
         })
       : undefined;
 
-    const backgroundWorkers = await this.#prismaClient.backgroundWorker.findMany({
+    const backgroundWorkers = await this.replica.backgroundWorker.findMany({
       where: {
         runtimeEnvironmentId: environment.id,
       },
@@ -173,7 +177,7 @@ export class TestTaskPresenter {
       take: 20, // last 20 versions should suffice
     });
 
-    const taskRunTemplates = await this.#prismaClient.taskRunTemplate.findMany({
+    const taskRunTemplates = await this.replica.taskRunTemplate.findMany({
       where: {
         projectId,
         taskSlug: task.slug,
@@ -190,47 +194,55 @@ export class TestTaskPresenter {
     const disableVersionSelection = environment.type === "DEVELOPMENT";
     const allowArbitraryQueues = backgroundWorkers[0]?.engine === "V1";
 
-    const latestRuns = await this.#prismaClient.$queryRaw<RawRun[]>`
-    WITH taskruns AS (
-      SELECT
-          tr.*
-      FROM
-          ${sqlDatabaseSchema}."TaskRun" as tr
-      JOIN
-          ${sqlDatabaseSchema}."BackgroundWorkerTask" as bwt
-      ON
-          tr."taskIdentifier" = bwt.slug
-      WHERE
-          bwt."friendlyId" = ${task.friendlyId} AND
-          tr."runtimeEnvironmentId" = ${environment.id}
-      ORDER BY
-          tr."createdAt" DESC
-      LIMIT 10
-    )
-    SELECT
-        taskr.id,
-        taskr."queue",
-        taskr."friendlyId",
-        taskr."taskIdentifier",
-        taskr."createdAt",
-        taskr.status,
-        taskr.payload,
-        taskr."payloadType",
-        taskr."seedMetadata",
-        taskr."seedMetadataType",
-        taskr."runtimeEnvironmentId",
-        taskr."concurrencyKey",
-        taskr."maxAttempts",
-        taskr."maxDurationInSeconds",
-        taskr."machinePreset",
-        taskr."ttl",
-        taskr."runTags"
-    FROM
-        taskruns AS taskr
-    WHERE
-        taskr."payloadType" = 'application/json' OR taskr."payloadType" = 'application/super+json'
-    ORDER BY
-        taskr."createdAt" DESC;`;
+    // Get the latest runs, for the payloads
+    const runsRepository = new RunsRepository({
+      clickhouse: this.clickhouse,
+      prisma: this.replica as PrismaClient,
+    });
+
+    const runIds = await runsRepository.listRunIds({
+      organizationId: environment.organizationId,
+      environmentId: environment.id,
+      projectId: environment.projectId,
+      tasks: [task.slug],
+      period: "30d",
+      page: {
+        size: 10,
+      },
+    });
+
+    const latestRuns = await this.replica.taskRun.findMany({
+      select: {
+        id: true,
+        queue: true,
+        friendlyId: true,
+        taskIdentifier: true,
+        createdAt: true,
+        status: true,
+        payload: true,
+        payloadType: true,
+        seedMetadata: true,
+        seedMetadataType: true,
+        runtimeEnvironmentId: true,
+        concurrencyKey: true,
+        maxAttempts: true,
+        maxDurationInSeconds: true,
+        machinePreset: true,
+        ttl: true,
+        runTags: true,
+      },
+      where: {
+        id: {
+          in: runIds,
+        },
+        payloadType: {
+          in: ["application/json", "application/super+json"],
+        },
+      },
+      orderBy: {
+        createdAt: "desc",
+      },
+    });
 
     const taskWithEnvironment = {
       id: task.id,
@@ -258,6 +270,12 @@ export class TestTaskPresenter {
               async (r) =>
                 ({
                   ...r,
+                  seedMetadata: r.seedMetadata ?? undefined,
+                  seedMetadataType: r.seedMetadataType ?? undefined,
+                  concurrencyKey: r.concurrencyKey ?? undefined,
+                  maxAttempts: r.maxAttempts ?? undefined,
+                  maxDurationInSeconds: r.maxDurationInSeconds ?? undefined,
+                  machinePreset: r.machinePreset ?? undefined,
                   payload: await prettyPrintPacket(r.payload, r.payloadType),
                   metadata: r.seedMetadata
                     ? await prettyPrintPacket(r.seedMetadata, r.seedMetadataType)
@@ -300,6 +318,12 @@ export class TestTaskPresenter {
                 if (payload.success) {
                   return {
                     ...r,
+                    seedMetadata: r.seedMetadata ?? undefined,
+                    seedMetadataType: r.seedMetadataType ?? undefined,
+                    concurrencyKey: r.concurrencyKey ?? undefined,
+                    maxAttempts: r.maxAttempts ?? undefined,
+                    maxDurationInSeconds: r.maxDurationInSeconds ?? undefined,
+                    machinePreset: r.machinePreset ?? undefined,
                     payload: payload.data,
                     ttlSeconds: r.ttl ? parse(r.ttl, "s") ?? undefined : undefined,
                   } satisfies ScheduledRun;
diff --git a/apps/webapp/app/presenters/v3/VercelSettingsPresenter.server.ts b/apps/webapp/app/presenters/v3/VercelSettingsPresenter.server.ts
new file mode 100644
index 00000000000..26688d41fdd
--- /dev/null
+++ b/apps/webapp/app/presenters/v3/VercelSettingsPresenter.server.ts
@@ -0,0 +1,599 @@
+import { type PrismaClient } from "@trigger.dev/database";
+import { type Result, fromPromise, ok, okAsync, ResultAsync } from "neverthrow";
+import { env } from "~/env.server";
+import { logger } from "~/services/logger.server";
+import { OrgIntegrationRepository } from "~/models/orgIntegration.server";
+import {
+  VercelIntegrationRepository,
+  VercelCustomEnvironment,
+  VercelEnvironmentVariable,
+} from "~/models/vercelIntegration.server";
+import { type GitHubAppInstallation } from "~/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github";
+import { EnvironmentVariablesRepository } from "~/v3/environmentVariables/environmentVariablesRepository.server";
+import {
+  VercelProjectIntegrationDataSchema,
+  VercelProjectIntegrationData,
+} from "~/v3/vercel/vercelProjectIntegrationSchema";
+import { BasePresenter } from "./basePresenter.server";
+
+type VercelSettingsOptions = {
+  projectId: string;
+  organizationId: string;
+};
+
+export type VercelSettingsResult = {
+  enabled: boolean;
+  hasOrgIntegration: boolean;
+  authInvalid?: boolean;
+  authError?: string;
+  connectedProject?: {
+    id: string;
+    vercelProjectId: string;
+    vercelProjectName: string;
+    vercelTeamId: string | null;
+    integrationData: VercelProjectIntegrationData;
+    createdAt: Date;
+  };
+  isGitHubConnected: boolean;
+  hasStagingEnvironment: boolean;
+  hasPreviewEnvironment: boolean;
+  customEnvironments: VercelCustomEnvironment[];
+  /** Whether autoAssignCustomDomains is enabled on the Vercel project. null if unknown. */
+  autoAssignCustomDomains?: boolean | null;
+};
+
+export type VercelAvailableProject = {
+  id: string;
+  name: string;
+};
+
+export type VercelOnboardingData = {
+  customEnvironments: VercelCustomEnvironment[];
+  environmentVariables: VercelEnvironmentVariable[];
+  availableProjects: VercelAvailableProject[];
+  hasProjectSelected: boolean;
+  authInvalid?: boolean;
+  authError?: string;
+  existingVariables: Record<string, { environments: string[] }>; // Environment slugs (non-archived only)
+  gitHubAppInstallations: GitHubAppInstallation[];
+  isGitHubConnected: boolean;
+  isOnboardingComplete: boolean;
+};
+
+export class VercelSettingsPresenter extends BasePresenter {
+  /**
+   * Get Vercel integration settings for the settings page
+   */
+  public async call({ projectId, organizationId }: VercelSettingsOptions): Promise<Result<VercelSettingsResult, unknown>> {
+    const vercelIntegrationEnabled = OrgIntegrationRepository.isVercelSupported;
+
+    if (!vercelIntegrationEnabled) {
+      return ok({
+        enabled: false,
+        hasOrgIntegration: false,
+        authInvalid: false,
+        connectedProject: undefined,
+        isGitHubConnected: false,
+        hasStagingEnvironment: false,
+        hasPreviewEnvironment: false,
+        customEnvironments: [],
+      } as VercelSettingsResult);
+    }
+
+    const orgIntegrationResult = await fromPromise(
+      (this._replica as PrismaClient).organizationIntegration.findFirst({
+        where: {
+          organizationId,
+          service: "VERCEL",
+          deletedAt: null,
+        },
+        include: {
+          tokenReference: true,
+        },
+      }),
+      (error) => error
+    );
+
+    if (orgIntegrationResult.isErr()) {
+      logger.error("Unexpected error in VercelSettingsPresenter.call", { error: orgIntegrationResult.error });
+      return ok({
+        enabled: true,
+        hasOrgIntegration: false,
+        authInvalid: true,
+        authError: orgIntegrationResult.error instanceof Error ? orgIntegrationResult.error.message : "Failed to fetch organization integration",
+        connectedProject: undefined,
+        isGitHubConnected: false,
+        hasStagingEnvironment: false,
+        hasPreviewEnvironment: false,
+        customEnvironments: [],
+      } as VercelSettingsResult);
+    }
+
+    const orgIntegration = orgIntegrationResult.value;
+    const hasOrgIntegration = orgIntegration !== null;
+
+    if (hasOrgIntegration) {
+      const tokenResult = await VercelIntegrationRepository.validateVercelToken(orgIntegration);
+      if (tokenResult.isErr() || !tokenResult.value.isValid) {
+        return ok({
+          enabled: true,
+          hasOrgIntegration: true,
+          authInvalid: true,
+          authError: tokenResult.isErr() ? tokenResult.error.message : "Vercel token is invalid",
+          connectedProject: undefined,
+          isGitHubConnected: false,
+          hasStagingEnvironment: false,
+          hasPreviewEnvironment: false,
+          customEnvironments: [],
+        } as VercelSettingsResult);
+      }
+    }
+
+    const checkOrgIntegration = () => fromPromise(
+      Promise.resolve(hasOrgIntegration),
+      (error) => ({
+        type: "other" as const,
+        cause: error,
+      })
+    );
+
+    const checkGitHubConnection = () =>
+      fromPromise(
+        (this._replica as PrismaClient).connectedGithubRepository.findFirst({
+          where: {
+            projectId,
+            repository: {
+              installation: {
+                deletedAt: null,
+                suspendedAt: null,
+              },
+            },
+          },
+          select: {
+            id: true,
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((repo) => repo !== null);
+
+    const checkStagingEnvironment = () =>
+      fromPromise(
+        (this._replica as PrismaClient).runtimeEnvironment.findFirst({
+          select: {
+            id: true,
+          },
+          where: {
+            projectId,
+            type: "STAGING",
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((env) => env !== null);
+
+    const checkPreviewEnvironment = () =>
+      fromPromise(
+        (this._replica as PrismaClient).runtimeEnvironment.findFirst({
+          select: {
+            id: true,
+          },
+          where: {
+            projectId,
+            type: "PREVIEW",
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((env) => env !== null);
+
+    const getVercelProjectIntegration = () =>
+      fromPromise(
+        (this._replica as PrismaClient).organizationProjectIntegration.findFirst({
+          where: {
+            projectId,
+            deletedAt: null,
+            organizationIntegration: {
+              service: "VERCEL",
+              deletedAt: null,
+            },
+          },
+          include: {
+            organizationIntegration: true,
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((integration) => {
+        if (!integration) {
+          return undefined;
+        }
+
+        const parsedData = VercelProjectIntegrationDataSchema.safeParse(
+          integration.integrationData
+        );
+
+        if (!parsedData.success) {
+          return undefined;
+        }
+
+        return {
+          id: integration.id,
+          vercelProjectId: integration.externalEntityId,
+          vercelProjectName: parsedData.data.vercelProjectName,
+          vercelTeamId: parsedData.data.vercelTeamId,
+          integrationData: parsedData.data,
+          createdAt: integration.createdAt,
+        };
+      });
+
+    return ResultAsync.combine([
+      checkOrgIntegration(),
+      checkGitHubConnection(),
+      checkStagingEnvironment(),
+      checkPreviewEnvironment(),
+      getVercelProjectIntegration(),
+    ]).andThen(([hasOrgIntegration, isGitHubConnected, hasStagingEnvironment, hasPreviewEnvironment, connectedProject]) => {
+        const fetchCustomEnvsAndProjectSettings = async (): Promise<{
+          customEnvironments: VercelCustomEnvironment[];
+          autoAssignCustomDomains: boolean | null;
+        }> => {
+          if (!connectedProject || !orgIntegration) {
+            return { customEnvironments: [], autoAssignCustomDomains: null };
+          }
+          const clientResult = await VercelIntegrationRepository.getVercelClient(orgIntegration);
+          if (clientResult.isErr()) {
+            return { customEnvironments: [], autoAssignCustomDomains: null };
+          }
+          const client = clientResult.value;
+          const teamId = await VercelIntegrationRepository.getTeamIdFromIntegration(orgIntegration);
+          const [customEnvsResult, autoAssignResult] = await Promise.all([
+            VercelIntegrationRepository.getVercelCustomEnvironments(
+              client,
+              connectedProject.vercelProjectId,
+              teamId
+            ),
+            VercelIntegrationRepository.getAutoAssignCustomDomains(
+              client,
+              connectedProject.vercelProjectId,
+              teamId
+            ),
+          ]);
+          return {
+            customEnvironments: customEnvsResult.isOk() ? customEnvsResult.value : [],
+            autoAssignCustomDomains: autoAssignResult.isOk() ? autoAssignResult.value : null,
+          };
+        };
+
+        return fromPromise(
+          fetchCustomEnvsAndProjectSettings(),
+          (error) => ({ type: "other" as const, cause: error })
+        ).map(({ customEnvironments, autoAssignCustomDomains }) => ({
+          enabled: true,
+          hasOrgIntegration,
+          authInvalid: false,
+          connectedProject,
+          isGitHubConnected,
+          hasStagingEnvironment,
+          hasPreviewEnvironment,
+          customEnvironments,
+          autoAssignCustomDomains,
+        } as VercelSettingsResult));
+      }).mapErr((error) => {
+        // Log the error and return a safe fallback
+        logger.error("Error in VercelSettingsPresenter.call", { error });
+        return error;
+      });
+  }
+
+  /**
+   * Get data needed for the onboarding modal (custom environments and env vars)
+   */
+  public async getOnboardingData(
+    projectId: string,
+    organizationId: string,
+    vercelEnvironmentId?: string
+  ): Promise<VercelOnboardingData | null> {
+    const result = await ResultAsync.fromPromise(
+      (async (): Promise<VercelOnboardingData | null> => {
+        const [gitHubInstallations, connectedGitHubRepo] = await Promise.all([
+          (this._replica as PrismaClient).githubAppInstallation.findMany({
+            where: {
+              organizationId,
+              deletedAt: null,
+              suspendedAt: null,
+            },
+            select: {
+              id: true,
+              accountHandle: true,
+              targetType: true,
+              appInstallationId: true,
+              repositories: {
+                select: {
+                  id: true,
+                  name: true,
+                  fullName: true,
+                  htmlUrl: true,
+                  private: true,
+                },
+                take: 200,
+              },
+            },
+            take: 20,
+            orderBy: {
+              createdAt: "desc",
+            },
+          }),
+          (this._replica as PrismaClient).connectedGithubRepository.findFirst({
+            where: {
+              projectId,
+              repository: {
+                installation: {
+                  deletedAt: null,
+                  suspendedAt: null,
+                },
+              },
+            },
+            select: {
+              id: true,
+            },
+          }),
+        ]);
+
+        const isGitHubConnected = connectedGitHubRepo !== null;
+        const gitHubAppInstallations: GitHubAppInstallation[] = gitHubInstallations.map((installation) => ({
+          id: installation.id,
+          appInstallationId: installation.appInstallationId,
+          targetType: installation.targetType,
+          accountHandle: installation.accountHandle,
+          repositories: installation.repositories.map((repo) => ({
+            id: repo.id,
+            name: repo.name,
+            fullName: repo.fullName,
+            private: repo.private,
+            htmlUrl: repo.htmlUrl,
+          })),
+        }));
+
+        const orgIntegration = await (this._replica as PrismaClient).organizationIntegration.findFirst({
+          where: {
+            organizationId,
+            service: "VERCEL",
+            deletedAt: null,
+          },
+          include: {
+            tokenReference: true,
+          },
+        });
+
+        if (!orgIntegration) {
+          return null;
+        }
+
+        const tokenResult = await VercelIntegrationRepository.validateVercelToken(orgIntegration);
+        if (tokenResult.isErr() || !tokenResult.value.isValid) {
+          return {
+            customEnvironments: [],
+            environmentVariables: [],
+            availableProjects: [],
+            hasProjectSelected: false,
+            authInvalid: true,
+            authError: tokenResult.isErr() ? tokenResult.error.message : "Vercel token is invalid",
+            existingVariables: {},
+            gitHubAppInstallations,
+            isGitHubConnected,
+            isOnboardingComplete: false,
+          };
+        }
+
+        const clientResult = await VercelIntegrationRepository.getVercelClient(orgIntegration);
+        if (clientResult.isErr()) {
+          return {
+            customEnvironments: [],
+            environmentVariables: [],
+            availableProjects: [],
+            hasProjectSelected: false,
+            authInvalid: clientResult.error.authInvalid,
+            authError: clientResult.error.authInvalid ? clientResult.error.message : undefined,
+            existingVariables: {},
+            gitHubAppInstallations,
+            isGitHubConnected,
+            isOnboardingComplete: false,
+          };
+        }
+        const client = clientResult.value;
+        const teamId = await VercelIntegrationRepository.getTeamIdFromIntegration(orgIntegration);
+
+        const projectIntegration = await (this._replica as PrismaClient).organizationProjectIntegration.findFirst({
+          where: {
+            projectId,
+            deletedAt: null,
+            organizationIntegration: {
+              service: "VERCEL",
+              deletedAt: null,
+            },
+          },
+        });
+
+        const availableProjectsResult = await VercelIntegrationRepository.getVercelProjects(client, teamId);
+
+        if (availableProjectsResult.isErr()) {
+          return {
+            customEnvironments: [],
+            environmentVariables: [],
+            availableProjects: [],
+            hasProjectSelected: false,
+            authInvalid: availableProjectsResult.error.authInvalid,
+            authError: availableProjectsResult.error.authInvalid ? availableProjectsResult.error.message : undefined,
+            existingVariables: {},
+            gitHubAppInstallations,
+            isGitHubConnected,
+            isOnboardingComplete: false,
+          };
+        }
+
+        if (!projectIntegration) {
+          return {
+            customEnvironments: [],
+            environmentVariables: [],
+            availableProjects: availableProjectsResult.value,
+            hasProjectSelected: false,
+            existingVariables: {},
+            gitHubAppInstallations,
+            isGitHubConnected,
+            isOnboardingComplete: false,
+          };
+        }
+
+        const [customEnvironmentsResult, projectEnvVarsResult, sharedEnvVarsResult] = await Promise.all([
+          VercelIntegrationRepository.getVercelCustomEnvironments(
+            client,
+            projectIntegration.externalEntityId,
+            teamId
+          ),
+          VercelIntegrationRepository.getVercelEnvironmentVariables(
+            client,
+            projectIntegration.externalEntityId,
+            teamId
+          ),
+        // Only fetch shared env vars if teamId is available
+          teamId
+            ? VercelIntegrationRepository.getVercelSharedEnvironmentVariables(
+                client,
+                teamId,
+                projectIntegration.externalEntityId
+              )
+            : okAsync([] as Array<{ id: string; key: string; type: string; isSecret: boolean; target: string[] }>),
+        ]);
+        const authInvalid =
+          (customEnvironmentsResult.isErr() && customEnvironmentsResult.error.authInvalid) ||
+          (projectEnvVarsResult.isErr() && projectEnvVarsResult.error.authInvalid) ||
+          (sharedEnvVarsResult.isErr() && sharedEnvVarsResult.error.authInvalid);
+
+        if (authInvalid) {
+          const authError =
+            (customEnvironmentsResult.isErr() && customEnvironmentsResult.error.authInvalid && customEnvironmentsResult.error.message) ||
+            (projectEnvVarsResult.isErr() && projectEnvVarsResult.error.authInvalid && projectEnvVarsResult.error.message) ||
+            (sharedEnvVarsResult.isErr() && sharedEnvVarsResult.error.authInvalid && sharedEnvVarsResult.error.message) ||
+            undefined;
+
+          return {
+            customEnvironments: [],
+            environmentVariables: [],
+            availableProjects: availableProjectsResult.value,
+            hasProjectSelected: true,
+            authInvalid: true,
+            authError: authError || undefined,
+            existingVariables: {},
+            gitHubAppInstallations,
+            isGitHubConnected,
+            isOnboardingComplete: false,
+          };
+        }
+
+        const customEnvironments = customEnvironmentsResult.isOk() ? customEnvironmentsResult.value : [];
+        const projectEnvVars = projectEnvVarsResult.isOk() ? projectEnvVarsResult.value : [];
+        const sharedEnvVars = sharedEnvVarsResult.isOk() ? sharedEnvVarsResult.value : [];
+
+        // Filter out TRIGGER_SECRET_KEY and TRIGGER_VERSION (managed by Trigger.dev) and merge project + shared env vars
+        const excludedKeys = new Set(["TRIGGER_SECRET_KEY", "TRIGGER_VERSION"]);
+        const projectEnvVarKeys = new Set(projectEnvVars.map((v) => v.key));
+        const mergedEnvVars: VercelEnvironmentVariable[] = [
+          ...projectEnvVars
+            .filter((v) => !excludedKeys.has(v.key))
+            .map((v) => {
+              const envVar = { ...v };
+              if (vercelEnvironmentId && (v as any).customEnvironmentIds?.includes(vercelEnvironmentId)) {
+                envVar.target = [...v.target, 'staging'];
+              }
+              return envVar;
+            }),
+          ...sharedEnvVars
+            .filter((v) => !projectEnvVarKeys.has(v.key) && !excludedKeys.has(v.key))
+            .map((v) => {
+              const envVar = {
+                id: v.id,
+                key: v.key,
+                type: v.type as VercelEnvironmentVariable["type"],
+                isSecret: v.isSecret,
+                target: v.target,
+                isShared: true,
+                customEnvironmentIds: [] as string[],
+              };
+              if (vercelEnvironmentId && (v as any).customEnvironmentIds?.includes(vercelEnvironmentId)) {
+                envVar.target = [...v.target, 'staging'];
+              }
+              return envVar;
+            }),
+        ];
+
+        const sortedEnvVars = [...mergedEnvVars].sort((a, b) =>
+          a.key.localeCompare(b.key)
+        );
+
+        const projectEnvs = await (this._replica as PrismaClient).runtimeEnvironment.findMany({
+          where: {
+            projectId,
+            archivedAt: null, // Filter out archived environments
+          },
+          select: {
+            id: true,
+            slug: true,
+            type: true,
+          },
+        });
+        const envIdToSlug = new Map(projectEnvs.map((e) => [e.id, e.slug]));
+        const activeEnvIds = new Set(projectEnvs.map((e) => e.id));
+
+        const envVarRepository = new EnvironmentVariablesRepository(this._replica as PrismaClient);
+        const existingVariables = await envVarRepository.getProject(projectId);
+        const existingVariablesRecord: Record<string, { environments: string[] }> = {};
+        for (const v of existingVariables) {
+          // Filter out archived environments and map to slugs
+          const activeEnvSlugs = v.values
+            .filter((val) => activeEnvIds.has(val.environment.id))
+            .map((val) => envIdToSlug.get(val.environment.id) || val.environment.type.toLowerCase());
+          if (activeEnvSlugs.length > 0) {
+            existingVariablesRecord[v.key] = {
+              environments: activeEnvSlugs,
+            };
+          }
+        }
+
+        const parsedIntegrationData = VercelProjectIntegrationDataSchema.safeParse(
+          projectIntegration.integrationData
+        );
+
+        return {
+          customEnvironments,
+          environmentVariables: sortedEnvVars,
+          availableProjects: availableProjectsResult.value,
+          hasProjectSelected: true,
+          existingVariables: existingVariablesRecord,
+          gitHubAppInstallations,
+          isGitHubConnected,
+          isOnboardingComplete: parsedIntegrationData.success
+            ? (parsedIntegrationData.data.onboardingCompleted ?? false)
+            : false,
+        };
+      })(),
+      (error) => error
+    );
+
+    if (result.isErr()) {
+      logger.error("Error in getOnboardingData", { error: result.error });
+      return null;
+    }
+
+    return result.value;
+  }
+
+}
\ No newline at end of file
diff --git a/apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts b/apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts
index 3bc1a2b457a..f0e955fd04d 100644
--- a/apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts
+++ b/apps/webapp/app/presenters/v3/ViewSchedulePresenter.server.ts
@@ -4,6 +4,7 @@ import { displayableEnvironment } from "~/models/runtimeEnvironment.server";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
 import { nextScheduledTimestamps } from "~/v3/utils/calculateNextSchedule.server";
 import { NextRunListPresenter } from "./NextRunListPresenter.server";
+import { scheduleWhereClause } from "~/models/schedules.server";
 
 type ViewScheduleOptions = {
   userId?: string;
@@ -63,10 +64,7 @@ export class ViewSchedulePresenter {
         },
         active: true,
       },
-      where: {
-        friendlyId,
-        projectId,
-      },
+      where: scheduleWhereClause(projectId, friendlyId),
     });
 
     if (!schedule) {
diff --git a/apps/webapp/app/root.tsx b/apps/webapp/app/root.tsx
index f46d3a65ff6..c6027b1a6d3 100644
--- a/apps/webapp/app/root.tsx
+++ b/apps/webapp/app/root.tsx
@@ -10,20 +10,29 @@ import { RouteErrorDisplay } from "./components/ErrorDisplay";
 import { AppContainer, MainCenteredContainer } from "./components/layout/AppLayout";
 import { ShortcutsProvider } from "./components/primitives/ShortcutsProvider";
 import { Toast } from "./components/primitives/Toast";
+import { TimezoneSetter } from "./components/TimezoneSetter";
 import { env } from "./env.server";
 import { featuresForRequest } from "./features.server";
 import { usePostHog } from "./hooks/usePostHog";
 import { getUser } from "./services/session.server";
+import { getTimezonePreference } from "./services/preferences/uiPreferences.server";
 import { appEnvTitleTag } from "./utils";
 
 export const links: LinksFunction = () => {
   return [{ rel: "stylesheet", href: tailwindStylesheetUrl }];
 };
 
+export const headers = () => ({
+  "Referrer-Policy": "strict-origin-when-cross-origin",
+  "X-Content-Type-Options": "nosniff",
+  "Permissions-Policy":
+    "geolocation=(), microphone=(), camera=(), accelerometer=(), gyroscope=(), magnetometer=(), payment=(), usb=()",
+});
+
 export const meta: MetaFunction = ({ data }) => {
   const typedData = data as UseDataFunctionReturn<typeof loader>;
   return [
-    { title: `Trigger.dev${appEnvTitleTag(typedData.appEnv)}` },
+    { title: typedData?.appEnv ? `Trigger.dev${appEnvTitleTag(typedData.appEnv)}` : "Trigger.dev" },
     {
       name: "viewport",
       content: "width=1024, initial-scale=1",
@@ -43,6 +52,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
   const toastMessage = session.get("toastMessage") as ToastMessage;
   const posthogProjectKey = env.POSTHOG_PROJECT_KEY;
   const features = featuresForRequest(request);
+  const timezone = await getTimezonePreference(request);
 
   const kapa = {
     websiteId: env.KAPA_AI_WEBSITE_ID,
@@ -58,6 +68,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       appOrigin: env.APP_ORIGIN,
       triggerCliTag: env.TRIGGER_CLI_TAG,
       kapa,
+      timezone,
     },
     { headers: { "Set-Cookie": await commitSession(session) } }
   );
@@ -84,11 +95,13 @@ export function ErrorBoundary() {
           <Links />
         </head>
         <body className="h-full overflow-hidden bg-background-dimmed">
-          <AppContainer>
-            <MainCenteredContainer>
-              <RouteErrorDisplay />
-            </MainCenteredContainer>
-          </AppContainer>
+          <ShortcutsProvider>
+            <AppContainer>
+              <MainCenteredContainer>
+                <RouteErrorDisplay />
+              </MainCenteredContainer>
+            </AppContainer>
+          </ShortcutsProvider>
           <Scripts />
         </body>
       </html>
@@ -109,6 +122,7 @@ export default function App() {
         </head>
         <body className="h-full overflow-hidden bg-background-dimmed">
           <ShortcutsProvider>
+            <TimezoneSetter />
             <Outlet />
             <Toast />
           </ShortcutsProvider>
diff --git a/apps/webapp/app/routes/_app.github.callback/route.tsx b/apps/webapp/app/routes/_app.github.callback/route.tsx
new file mode 100644
index 00000000000..cd67f27f54c
--- /dev/null
+++ b/apps/webapp/app/routes/_app.github.callback/route.tsx
@@ -0,0 +1,121 @@
+import { type LoaderFunctionArgs } from "@remix-run/node";
+import { z } from "zod";
+import { validateGitHubAppInstallSession } from "~/services/gitHubSession.server";
+import { linkGitHubAppInstallation, updateGitHubAppInstallation } from "~/services/gitHub.server";
+import { logger } from "~/services/logger.server";
+import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
+import { tryCatch } from "@trigger.dev/core";
+import { $replica } from "~/db.server";
+import { requireUser } from "~/services/session.server";
+import { sanitizeRedirectPath } from "~/utils";
+
+const QuerySchema = z.discriminatedUnion("setup_action", [
+  z.object({
+    setup_action: z.literal("install"),
+    installation_id: z.coerce.number(),
+    state: z.string(),
+  }),
+  z.object({
+    setup_action: z.literal("update"),
+    installation_id: z.coerce.number(),
+    state: z.string(),
+  }),
+  z.object({
+    setup_action: z.literal("request"),
+    state: z.string(),
+  }),
+]);
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  const url = new URL(request.url);
+  const queryParams = Object.fromEntries(url.searchParams);
+  const cookieHeader = request.headers.get("Cookie");
+
+  const result = QuerySchema.safeParse(queryParams);
+
+  if (!result.success) {
+    logger.warn("GitHub App callback with invalid params", {
+      queryParams,
+    });
+    return redirectWithErrorMessage("/", request, "Failed to install GitHub app");
+  }
+
+  const callbackData = result.data;
+
+  const sessionResult = await validateGitHubAppInstallSession(cookieHeader, callbackData.state);
+
+  if (!sessionResult.valid) {
+    logger.error("GitHub App callback with invalid session", {
+      callbackData,
+      error: sessionResult.error,
+    });
+
+    return redirectWithErrorMessage("/", request, "Failed to install GitHub app");
+  }
+
+  const { organizationId, redirectTo: unsafeRedirectTo } = sessionResult;
+  const redirectTo = sanitizeRedirectPath(unsafeRedirectTo);
+
+  const user = await requireUser(request);
+  const org = await $replica.organization.findFirst({
+    where: { id: organizationId, members: { some: { userId: user.id } }, deletedAt: null },
+    orderBy: { createdAt: "desc" },
+    select: {
+      id: true,
+    },
+  });
+
+  if (!org) {
+    // the secure cookie approach should already protect against this
+    // just an additional check
+    logger.error("GitHub app installation attempt on unauthenticated org", {
+      userId: user.id,
+      organizationId,
+    });
+    return redirectWithErrorMessage(redirectTo, request, "Failed to install GitHub app");
+  }
+
+  switch (callbackData.setup_action) {
+    case "install": {
+      const [error] = await tryCatch(
+        linkGitHubAppInstallation(callbackData.installation_id, organizationId)
+      );
+
+      if (error) {
+        logger.error("Failed to link GitHub App installation", {
+          error,
+        });
+        return redirectWithErrorMessage(redirectTo, request, "Failed to install GitHub app");
+      }
+
+      return redirectWithSuccessMessage(redirectTo, request, "GitHub App installed successfully");
+    }
+
+    case "update": {
+      const [error] = await tryCatch(updateGitHubAppInstallation(callbackData.installation_id));
+
+      if (error) {
+        logger.error("Failed to update GitHub App installation", {
+          error,
+        });
+        return redirectWithErrorMessage(redirectTo, request, "Failed to update GitHub App");
+      }
+
+      return redirectWithSuccessMessage(redirectTo, request, "GitHub App updated successfully");
+    }
+
+    case "request": {
+      // This happens when a non-admin user requests installation
+      // The installation_id won't be available until an admin approves
+      logger.info("GitHub App installation requested, awaiting approval", {
+        callbackData,
+      });
+
+      return redirectWithSuccessMessage(redirectTo, request, "GitHub App installation requested");
+    }
+
+    default:
+      callbackData satisfies never;
+      return redirectWithErrorMessage(redirectTo, request, "Failed to install GitHub app");
+  }
+}
diff --git a/apps/webapp/app/routes/_app.github.install/route.tsx b/apps/webapp/app/routes/_app.github.install/route.tsx
new file mode 100644
index 00000000000..42d68e5bec1
--- /dev/null
+++ b/apps/webapp/app/routes/_app.github.install/route.tsx
@@ -0,0 +1,52 @@
+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { redirect } from "remix-typedjson";
+import { z } from "zod";
+import { $replica } from "~/db.server";
+import { createGitHubAppInstallSession } from "~/services/gitHubSession.server";
+import { requireUser } from "~/services/session.server";
+import { newOrganizationPath } from "~/utils/pathBuilder";
+import { logger } from "~/services/logger.server";
+import { sanitizeRedirectPath } from "~/utils";
+
+const QuerySchema = z.object({
+  org_slug: z.string(),
+  redirect_to: z.string().refine((value) => value === sanitizeRedirectPath(value), {
+    message: "Invalid redirect path",
+  }),
+});
+
+export const loader = async ({ request }: LoaderFunctionArgs) => {
+  const searchParams = new URL(request.url).searchParams;
+  const parsed = QuerySchema.safeParse(Object.fromEntries(searchParams));
+
+  if (!parsed.success) {
+    logger.warn("GitHub App installation redirect with invalid params", {
+      searchParams,
+      error: parsed.error,
+    });
+    throw redirect("/");
+  }
+
+  const { org_slug, redirect_to } = parsed.data;
+  const user = await requireUser(request);
+
+  const org = await $replica.organization.findFirst({
+    where: { slug: org_slug, members: { some: { userId: user.id } }, deletedAt: null },
+    orderBy: { createdAt: "desc" },
+    select: {
+      id: true,
+    },
+  });
+
+  if (!org) {
+    throw redirect(newOrganizationPath());
+  }
+
+  const { url, cookieHeader } = await createGitHubAppInstallSession(org.id, redirect_to);
+
+  return redirect(url, {
+    headers: {
+      "Set-Cookie": cookieHeader,
+    },
+  });
+};
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
index f3bf509b0fb..8f82153052d 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.invite/route.tsx
@@ -143,7 +143,7 @@ export default function Page() {
   const emailFields = useFieldList(form.ref, emails);
 
   return (
-    <MainCenteredContainer>
+    <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
       <div>
         <FormTitle
           LeadingIcon={<UserPlusIcon className="size-6 text-indigo-500" />}
@@ -203,7 +203,7 @@ export default function Page() {
                 </Button>
               }
               cancelButton={
-                <LinkButton to={organizationTeamPath(organization)} variant={"tertiary/small"}>
+                <LinkButton to={organizationTeamPath(organization)} variant={"secondary/small"}>
                   Cancel
                 </LinkButton>
               }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
index 449ef16dcb3..5d6a947a424 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
@@ -3,6 +3,7 @@ import {
   BookOpenIcon,
   ChevronDownIcon,
   ChevronUpIcon,
+  ExclamationTriangleIcon,
   LightBulbIcon,
   MagnifyingGlassIcon,
   UserPlusIcon,
@@ -13,7 +14,7 @@ import { Link, useRevalidator, useSubmit } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { DiscordIcon } from "@trigger.dev/companyicons";
 import { formatDurationMilliseconds } from "@trigger.dev/core/v3";
-import { type TaskRunStatus } from "@trigger.dev/database";
+import type { TaskRunStatus } from "@trigger.dev/database";
 import { Fragment, Suspense, useEffect, useState } from "react";
 import { Bar, BarChart, ResponsiveContainer, Tooltip, type TooltipProps } from "recharts";
 import { TypedAwait, typeddefer, useTypedLoaderData } from "remix-typedjson";
@@ -76,7 +77,6 @@ import {
   type TaskActivity,
   type TaskListItem,
   taskListPresenter,
-  TaskListPresenter,
 } from "~/presenters/v3/TaskListPresenter.server";
 import {
   getUsefulLinksPreference,
@@ -299,7 +299,10 @@ export default function Page() {
                                       </>
                                     }
                                   >
-                                    <TypedAwait resolve={runningStats}>
+                                    <TypedAwait
+                                      resolve={runningStats}
+                                      errorElement={<FailedToLoadStats />}
+                                    >
                                       {(data) => {
                                         const taskData = data[task.slug];
                                         return taskData?.running ?? "0";
@@ -309,7 +312,10 @@ export default function Page() {
                                 </TableCell>
                                 <TableCell to={path}>
                                   <Suspense fallback={<></>}>
-                                    <TypedAwait resolve={runningStats}>
+                                    <TypedAwait
+                                      resolve={runningStats}
+                                      errorElement={<FailedToLoadStats />}
+                                    >
                                       {(data) => {
                                         const taskData = data[task.slug];
                                         return taskData?.queued ?? "0";
@@ -319,7 +325,10 @@ export default function Page() {
                                 </TableCell>
                                 <TableCell to={path} actionClassName="py-1.5">
                                   <Suspense fallback={<TaskActivityBlankState />}>
-                                    <TypedAwait resolve={activity}>
+                                    <TypedAwait
+                                      resolve={activity}
+                                      errorElement={<FailedToLoadStats />}
+                                    >
                                       {(data) => {
                                         const taskData = data[task.slug];
                                         return (
@@ -339,7 +348,10 @@ export default function Page() {
                                 </TableCell>
                                 <TableCell to={path}>
                                   <Suspense fallback={<></>}>
-                                    <TypedAwait resolve={durations}>
+                                    <TypedAwait
+                                      resolve={durations}
+                                      errorElement={<FailedToLoadStats />}
+                                    >
                                       {(data) => {
                                         const taskData = data[task.slug];
                                         return taskData
@@ -359,12 +371,13 @@ export default function Page() {
                                         icon={RunsIcon}
                                         to={path}
                                         title="View runs"
-                                        leadingIconClassName="text-teal-500"
+                                        leadingIconClassName="text-runs"
                                       />
                                       <PopoverMenuItem
                                         icon={BeakerIcon}
                                         to={testPath}
                                         title="Test task"
+                                        leadingIconClassName="text-tests"
                                       />
                                     </>
                                   }
@@ -398,7 +411,7 @@ export default function Page() {
                   <HasNoTasksDev />
                 </MainCenteredContainer>
               ) : (
-                <MainCenteredContainer className="max-w-md">
+                <MainCenteredContainer className="max-w-prose">
                   <HasNoTasksDeployed environment={environment} />
                 </MainCenteredContainer>
               )}
@@ -828,3 +841,12 @@ function LinkWithIcon({
     </Link>
   );
 }
+
+function FailedToLoadStats() {
+  return (
+    <SimpleTooltip
+      button={<ExclamationTriangleIcon className="size-4 text-warning" />}
+      content="We were unable to load the task stats, please try again later."
+    />
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
index a4debb83298..1bedd30d0f9 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
@@ -13,7 +13,7 @@ import {
 import { Form, type MetaFunction, Outlet, useActionData, useNavigation } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { SlackIcon } from "@trigger.dev/companyicons";
-import { type ProjectAlertChannelType, type ProjectAlertType } from "@trigger.dev/database";
+import type { ProjectAlertChannelType, ProjectAlertType } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx
index acbf29c4f3f..897687f4ec9 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx
@@ -51,7 +51,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   try {
     const presenter = new ApiKeysPresenter();
-    const { environment } = await presenter.call({
+    const { environment, hasVercelIntegration } = await presenter.call({
       userId,
       projectSlug: projectParam,
       environmentSlug: envParam,
@@ -59,6 +59,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
     return typedjson({
       environment,
+      hasVercelIntegration,
     });
   } catch (error) {
     console.error(error);
@@ -70,7 +71,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 };
 
 export default function Page() {
-  const { environment } = useTypedLoaderData<typeof loader>();
+  const { environment, hasVercelIntegration } = useTypedLoaderData<typeof loader>();
   const organization = useOrganization();
 
   if (!environment) {
@@ -132,6 +133,8 @@ export default function Page() {
                 <RegenerateApiKeyModal
                   id={environment.parentEnvironment?.id ?? environment.id}
                   title={environmentFullTitle(environment)}
+                  hasVercelIntegration={hasVercelIntegration}
+                  isDevelopment={environment.type === "DEVELOPMENT"}
                 />
               </div>
               <ClipboardField
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches.$batchParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches.$batchParam/route.tsx
new file mode 100644
index 00000000000..91403f4597d
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches.$batchParam/route.tsx
@@ -0,0 +1,307 @@
+import { ArrowRightIcon, ExclamationTriangleIcon } from "@heroicons/react/20/solid";
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { tryCatch } from "@trigger.dev/core";
+import { motion } from "framer-motion";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { ExitIcon } from "~/assets/icons/ExitIcon";
+import { RunsIcon } from "~/assets/icons/RunsIcon";
+import { LinkButton } from "~/components/primitives/Buttons";
+import { CopyableText } from "~/components/primitives/CopyableText";
+import { DateTime } from "~/components/primitives/DateTime";
+import { Header2, Header3 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import * as Property from "~/components/primitives/PropertyTable";
+import {
+  BatchStatusCombo,
+  descriptionForBatchStatus,
+} from "~/components/runs/v3/BatchStatus";
+import { useAutoRevalidate } from "~/hooks/useAutoRevalidate";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { BatchPresenter, type BatchPresenterData } from "~/presenters/v3/BatchPresenter.server";
+import { requireUserId } from "~/services/session.server";
+import { cn } from "~/utils/cn";
+import { formatNumber } from "~/utils/numberFormatter";
+import { EnvironmentParamSchema, v3BatchesPath, v3BatchRunsPath } from "~/utils/pathBuilder";
+
+const BatchParamSchema = EnvironmentParamSchema.extend({
+  batchParam: z.string(),
+});
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
+
+  const { organizationSlug, projectParam, envParam, batchParam } =
+    BatchParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  try {
+    const presenter = new BatchPresenter();
+    const [error, data] = await tryCatch(
+      presenter.call({
+        environmentId: environment.id,
+        batchId: batchParam,
+        userId,
+      })
+    );
+
+    if (error) {
+      throw new Error(error.message);
+    }
+
+    return typedjson({ batch: data });
+  } catch (error) {
+    console.error(error);
+    throw new Response(undefined, {
+      status: 400,
+      statusText: "Something went wrong, if this problem persists please contact support.",
+    });
+  }
+};
+
+export default function Page() {
+  const { batch } = useTypedLoaderData<typeof loader>();
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  // Auto-reload when batch is still in progress
+  useAutoRevalidate({
+    interval: 1000,
+    onFocus: true,
+    disabled: batch.hasFinished,
+  });
+
+  const showProgressMeter = batch.isV2 && (batch.status === "PROCESSING" || batch.status === "PARTIAL_FAILED");
+
+  return (
+    <div className="grid h-full max-h-full grid-rows-[2.5rem_2.5rem_1fr_3.25rem] overflow-hidden bg-background-bright">
+      {/* Header */}
+      <div className="mx-3 flex items-center justify-between gap-2 overflow-x-hidden border-b border-grid-dimmed">
+        <Header2 className={cn("truncate whitespace-nowrap")}>{batch.friendlyId}</Header2>
+        <LinkButton
+          to={v3BatchesPath(organization, project, environment)}
+          variant="minimal/small"
+          TrailingIcon={ExitIcon}
+          shortcut={{ key: "esc" }}
+          shortcutPosition="before-trailing-icon"
+          className="pl-1"
+        />
+      </div>
+
+      {/* Status bar */}
+      <div className="flex items-center justify-between gap-2 border-b border-grid-dimmed px-3 text-sm">
+        <BatchStatusCombo status={batch.status} />
+        <Paragraph variant="extra-small" className="text-text-dimmed">
+          {descriptionForBatchStatus(batch.status)}
+        </Paragraph>
+      </div>
+
+      {/* Scrollable content */}
+      <div className="overflow-y-scroll scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
+        <div className="space-y-3">
+          {/* Progress meter for v2 batches */}
+          {showProgressMeter && (
+            <div className="px-3 pt-3">
+              <BatchProgressMeter
+                successCount={batch.successfulRunCount}
+                failureCount={batch.failedRunCount}
+                totalCount={batch.runCount}
+              />
+            </div>
+          )}
+
+          {/* Properties */}
+          <div className="px-3 py-3">
+            <Property.Table>
+              <Property.Item>
+                <Property.Label>ID</Property.Label>
+                <Property.Value>
+                  <CopyableText value={batch.friendlyId} />
+                </Property.Value>
+              </Property.Item>
+              <Property.Item>
+                <Property.Label>Status</Property.Label>
+                <Property.Value>
+                  <BatchStatusCombo status={batch.status} />
+                </Property.Value>
+              </Property.Item>
+              <Property.Item>
+                <Property.Label>Version</Property.Label>
+                <Property.Value>
+                  {batch.isV2 ? "v2 (Run Engine)" : "v1 (Legacy)"}
+                </Property.Value>
+              </Property.Item>
+              <Property.Item>
+                <Property.Label>Total runs</Property.Label>
+                <Property.Value>{formatNumber(batch.runCount)}</Property.Value>
+              </Property.Item>
+              {batch.isV2 && (
+                <>
+                  <Property.Item>
+                    <Property.Label>Successfully created</Property.Label>
+                    <Property.Value className="text-success">
+                      {formatNumber(batch.successfulRunCount)}
+                    </Property.Value>
+                  </Property.Item>
+                  {batch.failedRunCount > 0 && (
+                    <Property.Item>
+                      <Property.Label>Failed to create</Property.Label>
+                      <Property.Value className="text-error">
+                        {formatNumber(batch.failedRunCount)}
+                      </Property.Value>
+                    </Property.Item>
+                  )}
+                </>
+              )}
+              {batch.idempotencyKey && (
+                <Property.Item>
+                  <Property.Label>Idempotency key</Property.Label>
+                  <Property.Value>
+                    <CopyableText value={batch.idempotencyKey} className="font-mono text-xs" />
+                  </Property.Value>
+                </Property.Item>
+              )}
+              <Property.Item>
+                <Property.Label>Created</Property.Label>
+                <Property.Value>
+                  <DateTime date={batch.createdAt} />
+                </Property.Value>
+              </Property.Item>
+              {batch.processingStartedAt && (
+                <Property.Item>
+                  <Property.Label>Processing started</Property.Label>
+                  <Property.Value>
+                    <DateTime date={batch.processingStartedAt} />
+                  </Property.Value>
+                </Property.Item>
+              )}
+              {batch.processingCompletedAt && (
+                <Property.Item>
+                  <Property.Label>Processing completed</Property.Label>
+                  <Property.Value>
+                    <DateTime date={batch.processingCompletedAt} />
+                  </Property.Value>
+                </Property.Item>
+              )}
+              <Property.Item>
+                <Property.Label>Finished</Property.Label>
+                <Property.Value>
+                  {batch.finishedAt ? <DateTime date={batch.finishedAt} /> : "–"}
+                </Property.Value>
+              </Property.Item>
+            </Property.Table>
+          </div>
+
+          {/* Errors section */}
+          {batch.errors.length > 0 && (
+            <div className="px-3 pb-3">
+              <Header3 className="mb-2 flex items-center gap-1.5 text-warning">
+                <ExclamationTriangleIcon className="size-4" />
+                Run creation errors ({batch.errors.length})
+              </Header3>
+              <div className="divide-y divide-grid-dimmed rounded-md border border-grid-dimmed bg-charcoal-900">
+                {batch.errors.map((error) => (
+                  <div key={error.id} className="px-3 py-2">
+                    <div className="flex items-center justify-between">
+                      <div className="flex items-center gap-2">
+                        <span className="font-mono text-xs text-text-dimmed">
+                          Item #{error.index}
+                        </span>
+                        <span className="text-sm text-text-bright">{error.taskIdentifier}</span>
+                      </div>
+                      {error.errorCode && (
+                        <span className="rounded bg-charcoal-750 px-1.5 py-0.5 font-mono text-xs text-text-dimmed">
+                          {error.errorCode}
+                        </span>
+                      )}
+                    </div>
+                    <Paragraph variant="small" className="mt-1 text-error">
+                      {error.error}
+                    </Paragraph>
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+
+      {/* Footer */}
+      <div className="flex items-center justify-end gap-2 border-t border-grid-dimmed px-2">
+        <LinkButton
+          variant="tertiary/medium"
+          to={v3BatchRunsPath(organization, project, environment, batch)}
+          LeadingIcon={RunsIcon}
+          leadingIconClassName="text-indigo-500"
+          TrailingIcon={ArrowRightIcon}
+        >
+          View runs
+        </LinkButton>
+      </div>
+    </div>
+  );
+}
+
+type BatchProgressMeterProps = {
+  successCount: number;
+  failureCount: number;
+  totalCount: number;
+};
+
+function BatchProgressMeter({ successCount, failureCount, totalCount }: BatchProgressMeterProps) {
+  const processedCount = successCount + failureCount;
+  const successPercentage = totalCount === 0 ? 0 : (successCount / totalCount) * 100;
+  const failurePercentage = totalCount === 0 ? 0 : (failureCount / totalCount) * 100;
+
+  return (
+    <div className="space-y-1">
+      <div className="flex items-center justify-between">
+        <Paragraph variant="small/bright">Run creation progress</Paragraph>
+        <Paragraph variant="extra-small">
+          {formatNumber(processedCount)}/{formatNumber(totalCount)}
+        </Paragraph>
+      </div>
+      <div className="relative h-4 w-full overflow-hidden rounded-sm bg-charcoal-900">
+        <motion.div
+          className="absolute left-0 top-0 h-full bg-success"
+          initial={{ width: `${successPercentage}%` }}
+          animate={{ width: `${successPercentage}%` }}
+          transition={{ duration: 0.3, ease: "easeOut" }}
+        />
+        <motion.div
+          className="absolute top-0 h-full bg-error"
+          initial={{ width: `${failurePercentage}%`, left: `${successPercentage}%` }}
+          animate={{ width: `${failurePercentage}%`, left: `${successPercentage}%` }}
+          transition={{ duration: 0.3, ease: "easeOut" }}
+        />
+      </div>
+      <div className="flex items-center gap-2">
+        <div className="flex items-center gap-1">
+          <div className="h-2 w-2 rounded-[1px] bg-success" />
+          <Paragraph variant="extra-small">{formatNumber(successCount)} created</Paragraph>
+        </div>
+        {failureCount > 0 && (
+          <div className="flex items-center gap-1">
+            <div className="h-2 w-2 rounded-[1px] bg-error" />
+            <Paragraph variant="extra-small">{formatNumber(failureCount)} failed</Paragraph>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches/route.tsx
index a78f3d2affc..a66e85c0f86 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.batches/route.tsx
@@ -1,10 +1,6 @@
-import {
-  ArrowPathRoundedSquareIcon,
-  ArrowRightIcon,
-  ExclamationCircleIcon,
-} from "@heroicons/react/20/solid";
+import { ArrowRightIcon, ExclamationCircleIcon } from "@heroicons/react/20/solid";
 import { BookOpenIcon } from "@heroicons/react/24/solid";
-import { type MetaFunction, useLocation, useNavigation } from "@remix-run/react";
+import { type MetaFunction, Outlet, useNavigation, useParams, useLocation } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { formatDuration } from "@trigger.dev/core/v3/utils/durations";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
@@ -12,12 +8,15 @@ import { BatchesNone } from "~/components/BlankStatePanels";
 import { ListPagination } from "~/components/ListPagination";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { MainCenteredContainer, PageBody, PageContainer } from "~/components/layout/AppLayout";
-import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { LinkButton } from "~/components/primitives/Buttons";
 import { DateTime } from "~/components/primitives/DateTime";
-import { Dialog, DialogTrigger } from "~/components/primitives/Dialog";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
 import { Paragraph } from "~/components/primitives/Paragraph";
-import { PopoverMenuItem } from "~/components/primitives/Popover";
+import {
+  ResizableHandle,
+  ResizablePanel,
+  ResizablePanelGroup,
+} from "~/components/primitives/Resizable";
 import { Spinner } from "~/components/primitives/Spinner";
 import {
   Table,
@@ -36,7 +35,6 @@ import {
   BatchStatusCombo,
   descriptionForBatchStatus,
 } from "~/components/runs/v3/BatchStatus";
-import { CheckBatchCompletionDialog } from "~/components/runs/v3/CheckBatchCompletionDialog";
 import { LiveTimer } from "~/components/runs/v3/LiveTimer";
 import { useEnvironment } from "~/hooks/useEnvironment";
 import { useOrganization } from "~/hooks/useOrganizations";
@@ -44,13 +42,14 @@ import { useProject } from "~/hooks/useProject";
 import { redirectWithErrorMessage } from "~/models/message.server";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
-import {
-  type BatchList,
-  type BatchListItem,
-  BatchListPresenter,
-} from "~/presenters/v3/BatchListPresenter.server";
+import { type BatchList, BatchListPresenter } from "~/presenters/v3/BatchListPresenter.server";
 import { requireUserId } from "~/services/session.server";
-import { docsPath, EnvironmentParamSchema, v3BatchRunsPath } from "~/utils/pathBuilder";
+import {
+  docsPath,
+  EnvironmentParamSchema,
+  v3BatchPath,
+  v3BatchRunsPath,
+} from "~/utils/pathBuilder";
 
 export const meta: MetaFunction = () => {
   return [
@@ -101,6 +100,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 export default function Page() {
   const { batches, hasFilters, hasAnyBatches, filters, pagination } =
     useTypedLoaderData<typeof loader>();
+  const { batchParam } = useParams();
+  const isShowingInspector = batchParam !== undefined;
 
   return (
     <PageContainer>
@@ -123,22 +124,34 @@ export default function Page() {
             <BatchesNone />
           </MainCenteredContainer>
         ) : (
-          <div className="grid h-full max-h-full grid-rows-[auto_1fr] overflow-hidden">
-            <div className="flex items-start justify-between gap-x-2 p-2">
-              <BatchFilters hasFilters={hasFilters} />
-              <div className="flex items-center justify-end gap-x-2">
-                <ListPagination list={{ pagination }} />
-              </div>
-            </div>
+          <ResizablePanelGroup orientation="horizontal" className="max-h-full">
+            <ResizablePanel id="batches-main" min={"100px"}>
+              <div className="grid h-full max-h-full grid-rows-[auto_1fr] overflow-hidden">
+                <div className="flex items-start justify-between gap-x-2 p-2">
+                  <BatchFilters hasFilters={hasFilters} />
+                  <div className="flex items-center justify-end gap-x-2">
+                    <ListPagination list={{ pagination }} />
+                  </div>
+                </div>
 
-            <BatchesTable
-              batches={batches}
-              filters={filters}
-              hasFilters={hasFilters}
-              pagination={pagination}
-              hasAnyBatches={hasAnyBatches}
-            />
-          </div>
+                <BatchesTable
+                  batches={batches}
+                  filters={filters}
+                  hasFilters={hasFilters}
+                  pagination={pagination}
+                  hasAnyBatches={hasAnyBatches}
+                />
+              </div>
+            </ResizablePanel>
+            {isShowingInspector && (
+              <>
+                <ResizableHandle id="batches-handle" />
+                <ResizablePanel id="batches-inspector" min="100px" default="500px">
+                  <Outlet />
+                </ResizablePanel>
+              </>
+            )}
+          </ResizablePanelGroup>
         )}
       </PageBody>
     </PageContainer>
@@ -147,10 +160,14 @@ export default function Page() {
 
 function BatchesTable({ batches, hasFilters, filters }: BatchList) {
   const navigation = useNavigation();
-  const isLoading = navigation.state !== "idle";
+  const location = useLocation();
+  const isLoading =
+    navigation.state !== "idle" && navigation.location?.pathname === location.pathname;
+
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
+  const { batchParam } = useParams();
 
   return (
     <Table className="max-h-full overflow-y-auto">
@@ -195,15 +212,19 @@ function BatchesTable({ batches, hasFilters, filters }: BatchList) {
             </div>
           </TableBlankRow>
         ) : (
-          batches.map((batch, index) => {
-            const path = v3BatchRunsPath(organization, project, environment, batch);
+          batches.map((batch) => {
+            const basePath = v3BatchPath(organization, project, environment, batch);
+            const inspectorPath = `${basePath}${location.search}`;
+            const runsPath = v3BatchRunsPath(organization, project, environment, batch);
+            const isSelected = batchParam === batch.friendlyId;
+
             return (
-              <TableRow key={batch.id}>
-                <TableCell to={path} isTabbableCell>
+              <TableRow key={batch.id} className={isSelected ? "bg-grid-dimmed" : undefined}>
+                <TableCell to={inspectorPath} isTabbableCell>
                   {batch.friendlyId}
                 </TableCell>
 
-                <TableCell to={path}>
+                <TableCell to={inspectorPath}>
                   {batch.batchVersion === "v1" ? (
                     <SimpleTooltip
                       content="Upgrade to the latest SDK for batch statuses to appear."
@@ -223,8 +244,12 @@ function BatchesTable({ batches, hasFilters, filters }: BatchList) {
                     />
                   )}
                 </TableCell>
-                <TableCell to={path}>{batch.runCount}</TableCell>
-                <TableCell to={path} className="w-[1%]" actionClassName="pr-0 tabular-nums">
+                <TableCell to={inspectorPath}>{batch.runCount}</TableCell>
+                <TableCell
+                  to={inspectorPath}
+                  className="w-[1%]"
+                  actionClassName="pr-0 tabular-nums"
+                >
                   {batch.finishedAt ? (
                     formatDuration(new Date(batch.createdAt), new Date(batch.finishedAt), {
                       style: "short",
@@ -233,13 +258,13 @@ function BatchesTable({ batches, hasFilters, filters }: BatchList) {
                     <LiveTimer startTime={new Date(batch.createdAt)} />
                   )}
                 </TableCell>
-                <TableCell to={path}>
+                <TableCell to={inspectorPath}>
                   <DateTime date={batch.createdAt} />
                 </TableCell>
-                <TableCell to={path}>
+                <TableCell to={inspectorPath}>
                   {batch.finishedAt ? <DateTime date={batch.finishedAt} /> : "–"}
                 </TableCell>
-                <BatchActionsCell batch={batch} path={path} />
+                <BatchActionsCell runsPath={runsPath} />
               </TableRow>
             );
           })
@@ -257,48 +282,14 @@ function BatchesTable({ batches, hasFilters, filters }: BatchList) {
   );
 }
 
-function BatchActionsCell({ batch, path }: { batch: BatchListItem; path: string }) {
-  const location = useLocation();
-
-  if (batch.hasFinished || batch.environment.type === "DEVELOPMENT") {
-    return <TableCell to={path}>{""}</TableCell>;
-  }
-
+function BatchActionsCell({ runsPath }: { runsPath: string }) {
   return (
     <TableCellMenu
       isSticky
-      popoverContent={
-        <>
-          <PopoverMenuItem
-            to={path}
-            icon={ArrowRightIcon}
-            leadingIconClassName="text-blue-500"
-            title="View batch"
-          />
-          {!batch.hasFinished && (
-            <Dialog>
-              <DialogTrigger
-                asChild
-                className="size-6 rounded-sm p-1 text-text-dimmed transition hover:bg-charcoal-700 hover:text-text-bright"
-              >
-                <Button
-                  variant="small-menu-item"
-                  LeadingIcon={ArrowPathRoundedSquareIcon}
-                  leadingIconClassName="text-success"
-                  fullWidth
-                  textAlignLeft
-                  className="w-full px-1.5 py-[0.9rem]"
-                >
-                  Try and resume
-                </Button>
-              </DialogTrigger>
-              <CheckBatchCompletionDialog
-                batchId={batch.id}
-                redirectPath={`${location.pathname}${location.search}`}
-              />
-            </Dialog>
-          )}
-        </>
+      hiddenButtons={
+        <LinkButton to={runsPath} variant="minimal/small" LeadingIcon={ArrowRightIcon}>
+          View runs
+        </LinkButton>
       }
     />
   );
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
index 7726e6a9b1b..f356ee6c81a 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
@@ -130,7 +130,10 @@ export async function action({ request }: ActionFunctionArgs) {
   }
 
   const upsertBranchService = new UpsertBranchService();
-  const result = await upsertBranchService.call(userId, submission.value);
+  const result = await upsertBranchService.call(
+    { type: "userMembership", userId },
+    submission.value
+  );
 
   if (result.success) {
     if (result.alreadyExisted) {
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.bulk-actions.$bulkActionParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.bulk-actions.$bulkActionParam/route.tsx
index 8aa34624d08..0bd53caac30 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.bulk-actions.$bulkActionParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.bulk-actions.$bulkActionParam/route.tsx
@@ -1,10 +1,9 @@
 import { ArrowPathIcon } from "@heroicons/react/20/solid";
-import { Form, useRevalidator } from "@remix-run/react";
+import { Form } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core";
-import { BulkActionStatus, BulkActionType } from "@trigger.dev/database";
+import type { BulkActionType } from "@trigger.dev/database";
 import { motion } from "framer-motion";
-import { useEffect } from "react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { ExitIcon } from "~/assets/icons/ExitIcon";
@@ -18,8 +17,9 @@ import { Paragraph } from "~/components/primitives/Paragraph";
 import * as Property from "~/components/primitives/PropertyTable";
 import { BulkActionStatusCombo, BulkActionTypeCombo } from "~/components/runs/v3/BulkAction";
 import { UserAvatar } from "~/components/UserProfilePhoto";
+import { env } from "~/env.server";
+import { useAutoRevalidate } from "~/hooks/useAutoRevalidate";
 import { useEnvironment } from "~/hooks/useEnvironment";
-import { useEventSource } from "~/hooks/useEventSource";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
@@ -72,7 +72,9 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       throw new Error(error.message);
     }
 
-    return typedjson({ bulkAction: data });
+    const autoReloadPollIntervalMs = env.BULK_ACTION_AUTORELOAD_POLL_INTERVAL_MS;
+
+    return typedjson({ bulkAction: data, autoReloadPollIntervalMs });
   } catch (error) {
     console.error(error);
     throw new Response(undefined, {
@@ -130,30 +132,16 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
 };
 
 export default function Page() {
-  const { bulkAction } = useTypedLoaderData<typeof loader>();
+  const { bulkAction, autoReloadPollIntervalMs } = useTypedLoaderData<typeof loader>();
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
 
-  const disabled = bulkAction.status !== BulkActionStatus.PENDING;
-
-  const streamedEvents = useEventSource(
-    `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.id}/runs/bulkaction/${bulkAction.friendlyId}/stream`,
-    {
-      event: "progress",
-      disabled,
-    }
-  );
-
-  const revalidation = useRevalidator();
-
-  useEffect(() => {
-    if (disabled || streamedEvents === null) {
-      return;
-    }
-
-    revalidation.revalidate();
-  }, [streamedEvents, disabled]);
+  useAutoRevalidate({
+    interval: autoReloadPollIntervalMs,
+    onFocus: true,
+    disabled: bulkAction.status !== "PENDING",
+  });
 
   return (
     <div className="grid h-full max-h-full grid-rows-[2.5rem_2.5rem_1fr_3.25rem] overflow-hidden bg-background-bright">
@@ -239,7 +227,7 @@ export default function Page() {
                   <BulkActionFilterSummary
                     selected={bulkAction.totalCount}
                     mode={bulkAction.mode}
-                    action={bulkAction.type === BulkActionType.REPLAY ? "replay" : "cancel"}
+                    action={bulkAction.type === "REPLAY" ? "replay" : "cancel"}
                     filters={bulkAction.filters}
                     final={true}
                   />
@@ -327,7 +315,7 @@ function Meter({ type, successCount, failureCount, totalCount }: MeterProps) {
           <div className="h-2 w-2 rounded-[1px] bg-charcoal-550" />
           <Paragraph variant="extra-small">
             {formatNumber(failureCount)} {typeText(type)} failed{" "}
-            {type === BulkActionType.CANCEL ? " (already finished)" : ""}
+            {type === "CANCEL" ? " (already finished)" : ""}
           </Paragraph>
         </div>
       </div>
@@ -337,9 +325,9 @@ function Meter({ type, successCount, failureCount, totalCount }: MeterProps) {
 
 function typeText(type: BulkActionType) {
   switch (type) {
-    case BulkActionType.CANCEL:
+    case "CANCEL":
       return "canceled";
-    case BulkActionType.REPLAY:
+    case "REPLAY":
       return "replayed";
   }
 }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
new file mode 100644
index 00000000000..1c96b8c6422
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
@@ -0,0 +1,839 @@
+import { conform, useFieldList, useForm } from "@conform-to/react";
+import { parse } from "@conform-to/zod";
+import {
+  ArrowDownIcon,
+  EnvelopeIcon,
+  ExclamationTriangleIcon,
+  InformationCircleIcon,
+  PlusIcon,
+} from "@heroicons/react/20/solid";
+import { DialogClose } from "@radix-ui/react-dialog";
+import {
+  Form,
+  useActionData,
+  useNavigate,
+  useNavigation,
+  useSearchParams,
+  type MetaFunction,
+} from "@remix-run/react";
+import { json, type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { tryCatch } from "@trigger.dev/core";
+import { useEffect, useState } from "react";
+import simplur from "simplur";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
+import {
+  MainHorizontallyCenteredContainer,
+  PageBody,
+  PageContainer,
+} from "~/components/layout/AppLayout";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
+import { Fieldset } from "~/components/primitives/Fieldset";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { FormError } from "~/components/primitives/FormError";
+import { Header2, Header3 } from "~/components/primitives/Headers";
+import { Input } from "~/components/primitives/Input";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { InputNumberStepper } from "~/components/primitives/InputNumberStepper";
+import { Label } from "~/components/primitives/Label";
+import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import * as Property from "~/components/primitives/PropertyTable";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHeader,
+  TableHeaderCell,
+  TableRow,
+} from "~/components/primitives/Table";
+import { InfoIconTooltip } from "~/components/primitives/Tooltip";
+import { useFeatures } from "~/hooks/useFeatures";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
+import { findProjectBySlug } from "~/models/project.server";
+import {
+  ManageConcurrencyPresenter,
+  type ConcurrencyResult,
+  type EnvironmentWithConcurrency,
+} from "~/presenters/v3/ManageConcurrencyPresenter.server";
+import { getPlans } from "~/services/platform.v3.server";
+import { requireUserId } from "~/services/session.server";
+import { formatCurrency, formatNumber } from "~/utils/numberFormatter";
+import { concurrencyPath, EnvironmentParamSchema, v3BillingPath } from "~/utils/pathBuilder";
+import { SetConcurrencyAddOnService } from "~/v3/services/setConcurrencyAddOn.server";
+import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
+import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { cn } from "~/utils/cn";
+import { logger } from "~/services/logger.server";
+import { AllocateConcurrencyService } from "~/v3/services/allocateConcurrency.server";
+
+export const meta: MetaFunction = () => {
+  return [
+    {
+      title: `Manage concurrency | Trigger.dev`,
+    },
+  ];
+};
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Project not found",
+    });
+  }
+
+  const presenter = new ManageConcurrencyPresenter();
+  const [error, result] = await tryCatch(
+    presenter.call({
+      userId: userId,
+      projectId: project.id,
+      organizationId: project.organizationId,
+    })
+  );
+
+  if (error) {
+    throw new Response(undefined, {
+      status: 400,
+      statusText: error.message,
+    });
+  }
+
+  const plans = await tryCatch(getPlans());
+  if (!plans) {
+    throw new Response(null, { status: 404, statusText: "Plans not found" });
+  }
+
+  return typedjson(result);
+};
+
+const FormSchema = z.discriminatedUnion("action", [
+  z.object({
+    action: z.enum(["purchase"]),
+    amount: z.coerce.number().min(0, "Amount must be 0 or more"),
+  }),
+  z.object({
+    action: z.enum(["quota-increase"]),
+    amount: z.coerce.number().min(1, "Amount must be greater than 0"),
+  }),
+  z.object({
+    action: z.enum(["allocate"]),
+    // It will only update environments that are passed in
+    environments: z.array(
+      z.object({
+        id: z.string(),
+        amount: z.coerce.number().min(0, "Amount must be 0 or more"),
+      })
+    ),
+  }),
+]);
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  const redirectPath = concurrencyPath(
+    { slug: organizationSlug },
+    { slug: projectParam },
+    { slug: envParam }
+  );
+
+  if (!project) {
+    throw redirectWithErrorMessage(redirectPath, request, "Project not found");
+  }
+
+  const formData = await request.formData();
+  const submission = parse(formData, { schema: FormSchema });
+
+  if (!submission.value || submission.intent !== "submit") {
+    return json(submission);
+  }
+
+  if (submission.value.action === "allocate") {
+    const allocate = new AllocateConcurrencyService();
+    const [error, result] = await tryCatch(
+      allocate.call({
+        userId,
+        projectId: project.id,
+        organizationId: project.organizationId,
+        environments: submission.value.environments,
+      })
+    );
+
+    if (error) {
+      submission.error.environments = [error instanceof Error ? error.message : "Unknown error"];
+      return json(submission);
+    }
+
+    if (!result.success) {
+      submission.error.environments = [result.error];
+      return json(submission);
+    }
+
+    return redirectWithSuccessMessage(
+      `${redirectPath}?success=true`,
+      request,
+      "Concurrency allocated successfully"
+    );
+  }
+
+  const service = new SetConcurrencyAddOnService();
+  const [error, result] = await tryCatch(
+    service.call({
+      userId,
+      projectId: project.id,
+      organizationId: project.organizationId,
+      action: submission.value.action,
+      amount: submission.value.amount,
+    })
+  );
+
+  if (error) {
+    submission.error.amount = [error instanceof Error ? error.message : "Unknown error"];
+    return json(submission);
+  }
+
+  if (!result.success) {
+    submission.error.amount = [result.error];
+    return json(submission);
+  }
+
+  return redirectWithSuccessMessage(
+    `${redirectPath}?success=true`,
+    request,
+    submission.value.action === "purchase"
+      ? "Concurrency updated successfully"
+      : "Requested extra concurrency, we'll get back to you soon."
+  );
+};
+
+export default function Page() {
+  const {
+    canAddConcurrency,
+    extraConcurrency,
+    extraAllocatedConcurrency,
+    extraUnallocatedConcurrency,
+    environments,
+    concurrencyPricing,
+    maxQuota,
+  } = useTypedLoaderData<typeof loader>();
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title="Concurrency" />
+        <PageAccessories>
+          <AdminDebugTooltip>
+            <Property.Table>
+              {environments.map((environment) => (
+                <Property.Item key={environment.id}>
+                  <Property.Label>
+                    {environment.type}{" "}
+                    {environment.branchName ? ` (${environment.branchName})` : ""}
+                  </Property.Label>
+                  <Property.Value>{environment.id}</Property.Value>
+                </Property.Item>
+              ))}
+            </Property.Table>
+          </AdminDebugTooltip>
+        </PageAccessories>
+      </NavBar>
+      <PageBody scrollable={true}>
+        <MainHorizontallyCenteredContainer>
+          {canAddConcurrency ? (
+            <Upgradable
+              canAddConcurrency={canAddConcurrency}
+              extraConcurrency={extraConcurrency}
+              extraAllocatedConcurrency={extraAllocatedConcurrency}
+              extraUnallocatedConcurrency={extraUnallocatedConcurrency}
+              environments={environments}
+              concurrencyPricing={concurrencyPricing}
+              maxQuota={maxQuota}
+            />
+          ) : (
+            <NotUpgradable environments={environments} />
+          )}
+        </MainHorizontallyCenteredContainer>
+      </PageBody>
+    </PageContainer>
+  );
+}
+
+function initialAllocation(environments: ConcurrencyResult["environments"]) {
+  return new Map<string, number>(
+    environments
+      .filter((e) => e.type !== "DEVELOPMENT")
+      .map((e) => [e.id, Math.max(0, e.maximumConcurrencyLimit - e.planConcurrencyLimit)])
+  );
+}
+
+function allocationTotal(environments: ConcurrencyResult["environments"]) {
+  const allocation = initialAllocation(environments);
+  return Array.from(allocation.values()).reduce((e, acc) => e + acc, 0);
+}
+
+function Upgradable({
+  extraConcurrency,
+  extraAllocatedConcurrency,
+  extraUnallocatedConcurrency,
+  environments,
+  concurrencyPricing,
+  maxQuota,
+}: ConcurrencyResult) {
+  const lastSubmission = useActionData();
+  const [form, { environments: formEnvironments }] = useForm({
+    id: "allocate-concurrency",
+    // TODO: type this
+    lastSubmission: lastSubmission as any,
+    onValidate({ formData }) {
+      return parse(formData, { schema: FormSchema });
+    },
+    shouldRevalidate: "onSubmit",
+  });
+
+  const navigation = useNavigation();
+  const isLoading = navigation.state !== "idle" && navigation.formMethod === "POST";
+
+  const [allocation, setAllocation] = useState(initialAllocation(environments));
+
+  const allocatedInProject = Array.from(allocation.values()).reduce((e, acc) => e + acc, 0);
+  const initialAllocationInProject = allocationTotal(environments);
+  const changeInAllocation = allocatedInProject - initialAllocationInProject;
+  const unallocated = extraUnallocatedConcurrency - changeInAllocation;
+  const allocationModified = changeInAllocation !== 0;
+
+  return (
+    <div className="flex flex-col gap-3">
+      <div className="border-b border-grid-dimmed pb-1">
+        <Header2>Manage your concurrency</Header2>
+      </div>
+      <Paragraph variant="small">
+        Concurrency limits determine how many runs you can execute at the same time. You can add
+        extra concurrency to your organization which you can allocate to environments in your
+        projects.
+      </Paragraph>
+      <div className="mt-3 flex flex-col gap-6">
+        <div className="flex flex-col gap-2">
+          <div className="flex items-center first-letter:pb-1">
+            <Header3 className="grow">Extra concurrency</Header3>
+            <PurchaseConcurrencyModal
+              concurrencyPricing={concurrencyPricing}
+              extraConcurrency={extraConcurrency}
+              extraUnallocatedConcurrency={extraUnallocatedConcurrency}
+              maxQuota={maxQuota}
+              disabled={unallocated < 0 ? false : allocationModified}
+            />
+          </div>
+          <Table variant="bright/no-hover">
+            <TableBody>
+              <TableRow>
+                <TableCell className="pl-0 text-text-bright">Extra concurrency purchased</TableCell>
+                <TableCell alignment="right" className="tabular-nums text-text-bright">
+                  {extraConcurrency}
+                </TableCell>
+              </TableRow>
+              <TableRow>
+                <TableCell>Allocated concurrency</TableCell>
+                <TableCell alignment="right" className={"tabular-nums text-text-bright"}>
+                  {allocationModified ? (
+                    <>
+                      <span className="text-text-dimmed line-through">
+                        {extraAllocatedConcurrency}
+                      </span>{" "}
+                      {extraAllocatedConcurrency + changeInAllocation}
+                    </>
+                  ) : (
+                    extraAllocatedConcurrency
+                  )}
+                </TableCell>
+              </TableRow>
+              <TableRow>
+                <TableCell>Unallocated concurrency</TableCell>
+                <TableCell
+                  alignment="right"
+                  className={cn(
+                    "tabular-nums",
+                    unallocated > 0
+                      ? "text-success"
+                      : unallocated < 0
+                      ? "text-error"
+                      : "text-text-bright"
+                  )}
+                >
+                  {allocationModified ? (
+                    <>
+                      <span className="text-text-dimmed line-through">
+                        {extraUnallocatedConcurrency}
+                      </span>{" "}
+                      {extraUnallocatedConcurrency - changeInAllocation}
+                    </>
+                  ) : (
+                    extraUnallocatedConcurrency
+                  )}
+                </TableCell>
+              </TableRow>
+              <TableRow
+                className={
+                  allocationModified || unallocated > 0 ? undefined : "after:bg-transparent"
+                }
+              >
+                <TableCell
+                  colSpan={2}
+                  className={cn("py-0", (unallocated > 0 || allocationModified) && "pr-0")}
+                >
+                  <div className="flex h-10 items-center">
+                    {allocationModified ? (
+                      unallocated < 0 ? (
+                        <div className="flex items-center gap-1">
+                          <ExclamationTriangleIcon className="size-4 text-error" />
+                          <span className="text-error">
+                            You're trying to allocate more concurrency than your total purchased
+                            amount.
+                          </span>
+                        </div>
+                      ) : (
+                        <div className="flex w-full items-center justify-between gap-3">
+                          <div className="flex items-center gap-1">
+                            <InformationCircleIcon className="size-4 text-text-dimmed" />
+                            <span>
+                              Save your changes or{" "}
+                              <button
+                                className="inline text-indigo-500 hover:text-indigo-300"
+                                onClick={() => {
+                                  setAllocation(initialAllocation(environments));
+                                }}
+                              >
+                                reset
+                              </button>
+                              .
+                            </span>
+                          </div>
+                          <Button
+                            variant="primary/small"
+                            type="submit"
+                            form="allocate"
+                            disabled={unallocated < 0 || isLoading}
+                            LeadingIcon={isLoading ? SpinnerWhite : undefined}
+                          >
+                            Save
+                          </Button>
+                        </div>
+                      )
+                    ) : unallocated > 0 ? (
+                      <div className="flex h-full w-full items-center justify-between bg-success/10 px-2.5">
+                        <div className="flex items-center justify-start gap-1">
+                          <InformationCircleIcon className="size-4 text-success" />
+                          <span className="text-success">
+                            You have {unallocated} extra concurrency available to allocate below.
+                          </span>
+                        </div>
+                        <ArrowDownIcon className="size-4 animate-bounce text-success" />
+                      </div>
+                    ) : (
+                      <></>
+                    )}
+                  </div>
+                </TableCell>
+              </TableRow>
+            </TableBody>
+          </Table>
+          <FormError id={formEnvironments.id}>
+            {formEnvironments.error ?? formEnvironments.initialError?.[""]?.[0]}
+          </FormError>
+        </div>
+        <Form className="flex flex-col gap-2" method="post" {...form.props} id="allocate">
+          <input type="hidden" name="action" value="allocate" />
+          <div className="flex items-center pb-1">
+            <Header3 className="grow">Concurrency allocation</Header3>
+          </div>
+          <Table variant="bright/no-hover">
+            <TableHeader>
+              <TableRow>
+                <TableHeaderCell className="pl-0">Environment</TableHeaderCell>
+                <TableHeaderCell alignment="right">
+                  <span className="flex items-center justify-end gap-x-1">
+                    Included{" "}
+                    <InfoIconTooltip content="This is the included concurrency based on your plan." />
+                  </span>
+                </TableHeaderCell>
+                <TableHeaderCell alignment="right">Extra concurrency</TableHeaderCell>
+                <TableHeaderCell alignment="right">Total</TableHeaderCell>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {environments.map((environment, index) => (
+                <TableRow key={environment.id}>
+                  <TableCell>
+                    <EnvironmentCombo
+                      environment={environment}
+                      className="max-w-[18ch]"
+                      tooltipSideOffset={6}
+                      tooltipSide="top"
+                    />
+                  </TableCell>
+                  <TableCell alignment="right">{environment.planConcurrencyLimit}</TableCell>
+                  <TableCell alignment="right">
+                    <div className="flex items-center justify-end">
+                      {environment.type === "DEVELOPMENT" ? (
+                        Math.max(
+                          0,
+                          environment.maximumConcurrencyLimit - environment.planConcurrencyLimit
+                        )
+                      ) : (
+                        <>
+                          <input
+                            type="hidden"
+                            name={`environments[${index}].id`}
+                            value={environment.id}
+                          />
+                          <Input
+                            name={`environments[${index}].amount`}
+                            type="number"
+                            variant="outline/small"
+                            className="text-right"
+                            containerClassName="w-16"
+                            fullWidth={false}
+                            value={allocation.get(environment.id)}
+                            onChange={(e) => {
+                              const value = e.target.value === "" ? 0 : Number(e.target.value);
+                              setAllocation(new Map(allocation).set(environment.id, value));
+                            }}
+                            min={0}
+                          />
+                        </>
+                      )}
+                    </div>
+                  </TableCell>
+                  <TableCell alignment="right">
+                    {environment.planConcurrencyLimit + (allocation.get(environment.id) ?? 0)}
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </Form>
+      </div>
+    </div>
+  );
+}
+
+function NotUpgradable({ environments }: { environments: EnvironmentWithConcurrency[] }) {
+  const { isManagedCloud } = useFeatures();
+  const plan = useCurrentPlan();
+  const organization = useOrganization();
+
+  return (
+    <div className="flex flex-col gap-3">
+      <div className="border-b border-grid-dimmed pb-1">
+        <Header2>Your concurrency</Header2>
+      </div>
+      {isManagedCloud ? (
+        <>
+          <Paragraph variant="small">
+            Concurrency limits determine how many runs you can execute at the same time. You can
+            upgrade your plan to get more concurrency. You are currently on the{" "}
+            {plan?.v3Subscription?.plan?.title ?? "Free"} plan.
+          </Paragraph>
+          <LinkButton variant="primary/small" to={v3BillingPath(organization)}>
+            Upgrade for more concurrency
+          </LinkButton>
+        </>
+      ) : null}
+      <div className="mt-3 flex flex-col gap-3">
+        <Table variant="bright/no-hover">
+          <TableHeader>
+            <TableRow>
+              <TableHeaderCell className="pl-0">Environment</TableHeaderCell>
+              <TableHeaderCell alignment="right">Concurrency limit</TableHeaderCell>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {environments.map((environment) => (
+              <TableRow key={environment.id}>
+                <TableCell className="pl-0">
+                  <EnvironmentCombo environment={environment} />
+                </TableCell>
+                <TableCell alignment="right">{environment.maximumConcurrencyLimit}</TableCell>
+              </TableRow>
+            ))}
+          </TableBody>
+        </Table>
+      </div>
+    </div>
+  );
+}
+
+function PurchaseConcurrencyModal({
+  concurrencyPricing,
+  extraConcurrency,
+  extraUnallocatedConcurrency,
+  maxQuota,
+  disabled,
+}: {
+  concurrencyPricing: {
+    stepSize: number;
+    centsPerStep: number;
+  };
+  extraConcurrency: number;
+  extraUnallocatedConcurrency: number;
+  maxQuota: number;
+  disabled: boolean;
+}) {
+  const lastSubmission = useActionData();
+  const [form, { amount }] = useForm({
+    id: "purchase-concurrency",
+    // TODO: type this
+    lastSubmission: lastSubmission as any,
+    onValidate({ formData }) {
+      return parse(formData, { schema: FormSchema });
+    },
+    shouldRevalidate: "onSubmit",
+  });
+
+  const [amountValue, setAmountValue] = useState(extraConcurrency);
+  const navigation = useNavigation();
+  const isLoading = navigation.state !== "idle" && navigation.formMethod === "POST";
+
+  // Close the panel, when we've succeeded
+  // This is required because a redirect to the same path doesn't clear state
+  const [searchParams, setSearchParams] = useSearchParams();
+  const [open, setOpen] = useState(false);
+  useEffect(() => {
+    const success = searchParams.get("success");
+    if (success) {
+      setOpen(false);
+      setSearchParams((s) => {
+        s.delete("success");
+        return s;
+      });
+    }
+  }, [searchParams.get("success")]);
+
+  const state = updateState({
+    value: amountValue,
+    existingValue: extraConcurrency,
+    quota: maxQuota,
+    extraUnallocatedConcurrency,
+  });
+  const changeClassName =
+    state === "decrease" ? "text-error" : state === "increase" ? "text-success" : undefined;
+
+  const title = extraConcurrency === 0 ? "Purchase extra concurrency" : "Add/remove concurrency";
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <Button
+          variant="primary/small"
+          disabled={disabled}
+          onClick={() => {
+            setOpen(true);
+          }}
+        >
+          {title}
+        </Button>
+      </DialogTrigger>
+      <DialogContent>
+        <DialogHeader>{title}</DialogHeader>
+        <Form method="post" {...form.props}>
+          <div className="flex flex-col gap-4 pt-2">
+            <Paragraph variant="base/bright" spacing>
+              You can purchase bundles of {concurrencyPricing.stepSize} concurrency for{" "}
+              {formatCurrency(concurrencyPricing.centsPerStep / 100, false)}/month. Or you can
+              remove any extra concurrency after you have unallocated it from your environments
+              first.
+            </Paragraph>
+            <Fieldset>
+              <InputGroup fullWidth>
+                <Label htmlFor="amount" className="text-text-dimmed">
+                  Total extra concurrency
+                </Label>
+                <InputNumberStepper
+                  {...conform.input(amount, { type: "number" })}
+                  step={concurrencyPricing.stepSize}
+                  min={0}
+                  max={undefined}
+                  value={amountValue}
+                  onChange={(e) => setAmountValue(Number(e.target.value))}
+                  disabled={isLoading}
+                />
+                <FormError id={amount.errorId}>
+                  {amount.error ?? amount.initialError?.[""]?.[0]}
+                </FormError>
+                <FormError>{form.error}</FormError>
+              </InputGroup>
+            </Fieldset>
+            {state === "need_to_increase_unallocated" ? (
+              <div className="flex flex-col pb-3">
+                <Paragraph variant="small" className="text-warning" spacing>
+                  You need to unallocate{" "}
+                  {formatNumber(extraConcurrency - amountValue - extraUnallocatedConcurrency)} more
+                  concurrency from your environments in order to remove{" "}
+                  {formatNumber(extraConcurrency - amountValue)} concurrency from your account.
+                </Paragraph>
+              </div>
+            ) : state === "above_quota" ? (
+              <div className="flex flex-col pb-3">
+                <Paragraph variant="small" className="text-warning" spacing>
+                  Currently you can only have up to {maxQuota} extra concurrency. Send a request
+                  below to lift your current limit. We'll get back to you soon.
+                </Paragraph>
+              </div>
+            ) : (
+              <div className="flex flex-col pb-3 tabular-nums">
+                <div className="grid grid-cols-2 border-b border-grid-dimmed pb-1">
+                  <Header3 className="font-normal text-text-dimmed">Summary</Header3>
+                  <Header3 className="justify-self-end font-normal text-text-dimmed">Total</Header3>
+                </div>
+                <div className="grid grid-cols-2 pt-2">
+                  <Header3 className="pb-0 font-normal text-text-dimmed">
+                    <span className="text-text-bright">{formatNumber(extraConcurrency)}</span>{" "}
+                    current total
+                  </Header3>
+                  <Header3 className="justify-self-end font-normal text-text-bright">
+                    {formatCurrency(
+                      (extraConcurrency * concurrencyPricing.centsPerStep) /
+                        concurrencyPricing.stepSize /
+                        100,
+                      true
+                    )}
+                  </Header3>
+                </div>
+                <div className="grid grid-cols-2 text-xs">
+                  <span className="text-text-dimmed">
+                    ({simplur`${extraConcurrency / concurrencyPricing.stepSize} bundle[|s]`})
+                  </span>
+                  <span className="justify-self-end text-text-dimmed">/mth</span>
+                </div>
+                <div className="grid grid-cols-2 pt-2">
+                  <Header3 className={cn("pb-0 font-normal", changeClassName)}>
+                    {state === "increase" ? "+" : null}
+                    {formatNumber(amountValue - extraConcurrency)}
+                  </Header3>
+                  <Header3 className={cn("justify-self-end font-normal", changeClassName)}>
+                    {state === "increase" ? "+" : null}
+                    {formatCurrency(
+                      ((amountValue - extraConcurrency) * concurrencyPricing.centsPerStep) /
+                        concurrencyPricing.stepSize /
+                        100,
+                      true
+                    )}
+                  </Header3>
+                </div>
+                <div className="grid grid-cols-2 text-xs">
+                  <span className="text-text-dimmed">
+                    (
+                    {simplur`${
+                      (amountValue - extraConcurrency) / concurrencyPricing.stepSize
+                    } bundle[|s]`}{" "}
+                    @ {formatCurrency(concurrencyPricing.centsPerStep / 100, true)}/mth)
+                  </span>
+                  <span className="justify-self-end text-text-dimmed">/mth</span>
+                </div>
+                <div className="grid grid-cols-2 pt-2">
+                  <Header3 className="pb-0 font-normal text-text-dimmed">
+                    <span className="text-text-bright">{formatNumber(amountValue)}</span> new total
+                  </Header3>
+                  <Header3 className="justify-self-end font-normal text-text-bright">
+                    {formatCurrency(
+                      (amountValue * concurrencyPricing.centsPerStep) /
+                        concurrencyPricing.stepSize /
+                        100,
+                      true
+                    )}
+                  </Header3>
+                </div>
+                <div className="grid grid-cols-2 text-xs">
+                  <span className="text-text-dimmed">
+                    ({simplur`${amountValue / concurrencyPricing.stepSize} bundle[|s]`})
+                  </span>
+                  <span className="justify-self-end text-text-dimmed">/mth</span>
+                </div>
+              </div>
+            )}
+          </div>
+          <FormButtons
+            confirmButton={
+              state === "above_quota" ? (
+                <>
+                  <input type="hidden" name="action" value="quota-increase" />
+                  <Button
+                    LeadingIcon={isLoading ? SpinnerWhite : EnvelopeIcon}
+                    variant="primary/medium"
+                    type="submit"
+                    disabled={isLoading}
+                  >
+                    {`Send request for ${formatNumber(amountValue)}`}
+                  </Button>
+                </>
+              ) : state === "decrease" || state === "need_to_increase_unallocated" ? (
+                <>
+                  <input type="hidden" name="action" value="purchase" />
+                  <Button
+                    variant="danger/medium"
+                    type="submit"
+                    disabled={isLoading || state === "need_to_increase_unallocated"}
+                    LeadingIcon={isLoading ? SpinnerWhite : undefined}
+                  >
+                    {`Remove ${formatNumber(extraConcurrency - amountValue)} concurrency`}
+                  </Button>
+                </>
+              ) : (
+                <>
+                  <input type="hidden" name="action" value="purchase" />
+                  <Button
+                    variant="primary/medium"
+                    type="submit"
+                    disabled={isLoading || state === "no_change"}
+                    LeadingIcon={isLoading ? SpinnerWhite : undefined}
+                  >
+                    {`Purchase ${formatNumber(amountValue - extraConcurrency)} concurrency`}
+                  </Button>
+                </>
+              )
+            }
+            cancelButton={
+              <DialogClose asChild>
+                <Button variant="tertiary/medium" disabled={isLoading}>
+                  Cancel
+                </Button>
+              </DialogClose>
+            }
+          />
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function updateState({
+  value,
+  existingValue,
+  quota,
+  extraUnallocatedConcurrency,
+}: {
+  value: number;
+  existingValue: number;
+  quota: number;
+  extraUnallocatedConcurrency: number;
+}): "no_change" | "increase" | "decrease" | "above_quota" | "need_to_increase_unallocated" {
+  if (value === existingValue) return "no_change";
+  if (value < existingValue) {
+    const difference = existingValue - value;
+    if (difference > extraUnallocatedConcurrency) {
+      return "need_to_increase_unallocated";
+    }
+    return "decrease";
+  }
+  if (value > quota) return "above_quota";
+  return "increase";
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx
index 0575d7e758c..9d32d89fd56 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx
@@ -1,10 +1,21 @@
 import { Link, useLocation } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { useEffect, useState, useRef, useCallback } from "react";
+import { S2, S2Error } from "@s2-dev/streamstore";
+import {
+  Clipboard,
+  ClipboardCheck,
+  ChevronDown,
+  ChevronUp,
+  TerminalSquareIcon,
+  LayoutDashboardIcon,
+  GitBranchIcon,
+  ServerIcon,
+} from "lucide-react";
 import { ExitIcon } from "~/assets/icons/ExitIcon";
 import { GitMetadata } from "~/components/GitMetadata";
 import { RuntimeIcon } from "~/components/RuntimeIcon";
-import { UserAvatar } from "~/components/UserProfilePhoto";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
 import { Badge } from "~/components/primitives/Badge";
@@ -23,15 +34,22 @@ import {
 } from "~/components/primitives/Table";
 import { DeploymentError } from "~/components/runs/v3/DeploymentError";
 import { DeploymentStatus } from "~/components/runs/v3/DeploymentStatus";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "~/components/primitives/Tooltip";
 import { useEnvironment } from "~/hooks/useEnvironment";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
-import { useUser } from "~/hooks/useUser";
 import { DeploymentPresenter } from "~/presenters/v3/DeploymentPresenter.server";
 import { requireUserId } from "~/services/session.server";
 import { cn } from "~/utils/cn";
 import { v3DeploymentParams, v3DeploymentsPath, v3RunsPath } from "~/utils/pathBuilder";
 import { capitalizeWord } from "~/utils/string";
+import { UserTag } from "../_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route";
+import { DeploymentEventFromString } from "@trigger.dev/core/v3/schemas";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const userId = await requireUserId(request);
@@ -40,7 +58,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   try {
     const presenter = new DeploymentPresenter();
-    const { deployment } = await presenter.call({
+    const { deployment, eventStream } = await presenter.call({
       userId,
       organizationSlug,
       projectSlug: projectParam,
@@ -48,7 +66,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       deploymentShortCode: deploymentParam,
     });
 
-    return typedjson({ deployment });
+    return typedjson({ deployment, eventStream });
   } catch (error) {
     console.error(error);
     throw new Response(undefined, {
@@ -58,15 +76,206 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   }
 };
 
+type LogEntry = {
+  message: string;
+  timestamp: Date;
+  level: "info" | "error" | "warn" | "debug";
+};
+
+function getTriggeredViaDisplay(triggeredVia: string | null | undefined): {
+  icon: React.ReactNode;
+  label: string;
+} | null {
+  if (!triggeredVia) return null;
+
+  const iconClass = "size-4 text-text-dimmed";
+
+  switch (triggeredVia) {
+    case "cli:manual":
+      return {
+        icon: <TerminalSquareIcon className={iconClass} />,
+        label: "CLI (Manual)",
+      };
+    case "cli:github_actions":
+      return {
+        icon: <GitBranchIcon className={iconClass} />,
+        label: "CLI (GitHub Actions)",
+      };
+    case "cli:gitlab_ci":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (GitLab CI)",
+      };
+    case "cli:circleci":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (CircleCI)",
+      };
+    case "cli:jenkins":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (Jenkins)",
+      };
+    case "cli:azure_pipelines":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (Azure Pipelines)",
+      };
+    case "cli:bitbucket_pipelines":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (Bitbucket Pipelines)",
+      };
+    case "cli:travis_ci":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (Travis CI)",
+      };
+    case "cli:buildkite":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (Buildkite)",
+      };
+    case "cli:ci_other":
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: "CLI (CI)",
+      };
+    case "git_integration:github":
+      return {
+        icon: <GitBranchIcon className={iconClass} />,
+        label: "GitHub Integration",
+      };
+    case "dashboard":
+      return {
+        icon: <LayoutDashboardIcon className={iconClass} />,
+        label: "Dashboard",
+      };
+    default:
+      // Handle any unknown values gracefully
+      if (triggeredVia.startsWith("cli:")) {
+        return {
+          icon: <TerminalSquareIcon className={iconClass} />,
+          label: `CLI (${triggeredVia.replace("cli:", "")})`,
+        };
+      }
+      return {
+        icon: <ServerIcon className={iconClass} />,
+        label: triggeredVia,
+      };
+  }
+}
+
 export default function Page() {
-  const { deployment } = useTypedLoaderData<typeof loader>();
+  const { deployment, eventStream } = useTypedLoaderData<typeof loader>();
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
   const location = useLocation();
-  const user = useUser();
   const page = new URLSearchParams(location.search).get("page");
 
+  const logsDisabled = eventStream === undefined;
+  const [logs, setLogs] = useState<LogEntry[]>([]);
+  const [isStreaming, setIsStreaming] = useState(true);
+  const [streamError, setStreamError] = useState<string | null>(null);
+  const isPending = deployment.status === "PENDING";
+
+  useEffect(() => {
+    if (logsDisabled) return;
+
+    const abortController = new AbortController();
+
+    setLogs([]);
+    setStreamError(null);
+    setIsStreaming(true);
+
+    const streamLogs = async () => {
+      try {
+        const s2 = new S2({ accessToken: eventStream.s2.accessToken });
+        const basin = s2.basin(eventStream.s2.basin);
+        const stream = basin.stream(eventStream.s2.stream);
+
+        const readSession = await stream.readSession(
+          {
+            seq_num: 0,
+            wait: 60,
+            as: "bytes",
+          },
+          { signal: abortController.signal }
+        );
+
+        const decoder = new TextDecoder();
+
+        for await (const record of readSession) {
+          const decoded = decoder.decode(record.body);
+          const result = DeploymentEventFromString.safeParse(decoded);
+
+          if (!result.success) {
+            // fallback to the previous format in s2 logs for compatibility
+            try {
+              const headers: Record<string, string> = {};
+
+              if (record.headers) {
+                for (const [nameBytes, valueBytes] of record.headers) {
+                  headers[decoder.decode(nameBytes)] = decoder.decode(valueBytes);
+                }
+              }
+              const level = (headers["level"]?.toLowerCase() as LogEntry["level"]) ?? "info";
+
+              setLogs((prevLogs) => [
+                ...prevLogs,
+                {
+                  timestamp: new Date(record.timestamp),
+                  message: decoded,
+                  level,
+                },
+              ]);
+            } catch (err) {
+              console.error("Failed to parse log record:", err);
+            }
+
+            continue;
+          }
+
+          const event = result.data;
+          if (event.type !== "log") {
+            continue;
+          }
+
+          setLogs((prevLogs) => [
+            ...prevLogs,
+            {
+              timestamp: new Date(record.timestamp),
+              message: event.data.message,
+              level: event.data.level,
+            },
+          ]);
+        }
+      } catch (error) {
+        if (abortController.signal.aborted) return;
+
+        const isNotFoundError =
+          error instanceof S2Error &&
+          error.code &&
+          ["permission_denied", "stream_not_found"].includes(error.code);
+        if (isNotFoundError) return;
+
+        console.error("Failed to stream logs:", error);
+        setStreamError("Failed to stream logs");
+      } finally {
+        if (!abortController.signal.aborted) {
+          setIsStreaming(false);
+        }
+      }
+    };
+
+    streamLogs();
+
+    return () => {
+      abortController.abort();
+    };
+  }, [eventStream?.s2?.basin, eventStream?.s2?.stream, eventStream?.s2?.accessToken, isPending]);
+
   return (
     <div className="grid h-full max-h-full grid-rows-[2.5rem_1fr] overflow-hidden bg-background-bright">
       <div className="mx-3 flex items-center justify-between gap-2 border-b border-grid-dimmed">
@@ -131,7 +340,11 @@ export default function Page() {
                 <Property.Label>Deploy</Property.Label>
                 <Property.Value className="flex items-center gap-2">
                   <span>{deployment.shortCode}</span>
-                  {deployment.label && <Badge variant="outline-rounded">{deployment.label}</Badge>}
+                  {deployment.label && (
+                    <Badge variant="extra-small" className="capitalize">
+                      {deployment.label}
+                    </Badge>
+                  )}
                 </Property.Value>
               </Property.Item>
               <Property.Item>
@@ -154,6 +367,35 @@ export default function Page() {
                   />
                 </Property.Value>
               </Property.Item>
+              {!logsDisabled && (
+                <Property.Item>
+                  <Property.Label>Logs</Property.Label>
+                  <LogsDisplay
+                    logs={logs}
+                    isStreaming={isStreaming}
+                    streamError={streamError}
+                    initialCollapsed={(
+                      ["PENDING", "DEPLOYED", "TIMED_OUT"] satisfies (typeof deployment.status)[]
+                    ).includes(deployment.status)}
+                  />
+                </Property.Item>
+              )}
+              {deployment.canceledAt && (
+                <Property.Item>
+                  <Property.Label>Canceled at</Property.Label>
+                  <Property.Value>
+                    <>
+                      <DateTimeAccurate date={deployment.canceledAt} /> UTC
+                    </>
+                  </Property.Value>
+                </Property.Item>
+              )}
+              {deployment.canceledReason && (
+                <Property.Item>
+                  <Property.Label>Cancelation reason</Property.Label>
+                  <Property.Value>{deployment.canceledReason}</Property.Value>
+                </Property.Item>
+              )}
               <Property.Item>
                 <Property.Label>Tasks</Property.Label>
                 <Property.Value>{deployment.tasks ? deployment.tasks.length : "–"}</Property.Value>
@@ -187,7 +429,25 @@ export default function Page() {
               <Property.Item>
                 <Property.Label>Started at</Property.Label>
                 <Property.Value>
-                  <DateTimeAccurate date={deployment.createdAt} /> UTC
+                  {deployment.startedAt ? (
+                    <>
+                      <DateTimeAccurate date={deployment.startedAt} /> UTC
+                    </>
+                  ) : (
+                    "–"
+                  )}
+                </Property.Value>
+              </Property.Item>
+              <Property.Item>
+                <Property.Label>Installed at</Property.Label>
+                <Property.Value>
+                  {deployment.installedAt ? (
+                    <>
+                      <DateTimeAccurate date={deployment.installedAt} /> UTC
+                    </>
+                  ) : (
+                    "–"
+                  )}
                 </Property.Value>
               </Property.Item>
               <Property.Item>
@@ -226,22 +486,36 @@ export default function Page() {
               <Property.Item>
                 <Property.Label>Deployed by</Property.Label>
                 <Property.Value>
-                  {deployment.deployedBy ? (
-                    <div className="flex items-center gap-1">
-                      <UserAvatar
-                        avatarUrl={deployment.deployedBy.avatarUrl}
-                        name={deployment.deployedBy.name ?? deployment.deployedBy.displayName}
-                        className="h-4 w-4"
-                      />
-                      <Paragraph variant="small">
-                        {deployment.deployedBy.name ?? deployment.deployedBy.displayName}
-                      </Paragraph>
-                    </div>
+                  {deployment.git?.source === "trigger_github_app" ? (
+                    <UserTag
+                      name={deployment.git.ghUsername ?? "GitHub Integration"}
+                      avatarUrl={deployment.git.ghUserAvatarUrl}
+                    />
+                  ) : deployment.deployedBy ? (
+                    <UserTag
+                      name={deployment.deployedBy.name ?? deployment.deployedBy.displayName ?? ""}
+                      avatarUrl={deployment.deployedBy.avatarUrl ?? undefined}
+                    />
                   ) : (
                     "–"
                   )}
                 </Property.Value>
               </Property.Item>
+              <Property.Item>
+                <Property.Label>Triggered via</Property.Label>
+                <Property.Value>
+                  {(() => {
+                    const display = getTriggeredViaDisplay(deployment.triggeredVia);
+                    if (!display) return "–";
+                    return (
+                      <span className="flex items-center gap-1.5">
+                        {display.icon}
+                        {display.label}
+                      </span>
+                    );
+                  })()}
+                </Property.Value>
+              </Property.Item>
             </Property.Table>
           </div>
 
@@ -283,3 +557,189 @@ export default function Page() {
     </div>
   );
 }
+
+function LogsDisplay({
+  logs,
+  isStreaming,
+  streamError,
+  initialCollapsed = false,
+}: {
+  logs: LogEntry[];
+  isStreaming: boolean;
+  streamError: string | null;
+  initialCollapsed?: boolean;
+}) {
+  const [copied, setCopied] = useState(false);
+  const [mouseOver, setMouseOver] = useState(false);
+  const [collapsed, setCollapsed] = useState(initialCollapsed);
+  const logsContainerRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    setCollapsed(initialCollapsed);
+  }, [initialCollapsed]);
+
+  // auto-scroll log container to bottom when new logs arrive
+  useEffect(() => {
+    if (logsContainerRef.current) {
+      logsContainerRef.current.scrollTop = logsContainerRef.current.scrollHeight;
+    }
+  }, [logs]);
+
+  const onCopyLogs = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+      const logsText = logs.map((log) => log.message).join("\n");
+      navigator.clipboard.writeText(logsText);
+      setCopied(true);
+      setTimeout(() => {
+        setCopied(false);
+      }, 1500);
+    },
+    [logs]
+  );
+
+  const errorCount = logs.filter((log) => log.level === "error").length;
+  const warningCount = logs.filter((log) => log.level === "warn").length;
+
+  return (
+    <div className="mt-1.5 overflow-hidden rounded-md border border-grid-bright">
+      <div className="flex items-center justify-between border-b border-grid-dimmed px-3 py-2">
+        <div className="flex items-center gap-4">
+          <div className="flex items-center gap-1.5">
+            <div
+              className={cn(
+                "h-2 w-2 rounded-full",
+                errorCount > 0 ? "bg-error/80" : "bg-charcoal-600"
+              )}
+            />
+            <Paragraph variant="extra-small/dimmed/mono" className="w-[ch-10]">
+              {`${errorCount} ${errorCount === 1 ? "error" : "errors"}`}
+            </Paragraph>
+          </div>
+          <div className="flex items-center gap-1.5">
+            <div
+              className={cn(
+                "h-2 w-2 rounded-full",
+                warningCount > 0 ? "bg-warning/80" : "bg-charcoal-600"
+              )}
+            />
+            <Paragraph variant="extra-small/dimmed/mono">
+              {`${warningCount} ${warningCount === 1 ? "warning" : "warnings"}`}
+            </Paragraph>
+          </div>
+        </div>
+        {logs.length > 0 && (
+          <div className="flex items-center gap-3">
+            <TooltipProvider>
+              <Tooltip open={copied || mouseOver} disableHoverableContent>
+                <TooltipTrigger
+                  onClick={onCopyLogs}
+                  onMouseEnter={() => setMouseOver(true)}
+                  onMouseLeave={() => setMouseOver(false)}
+                  className={cn(
+                    "transition-colors duration-100 focus-custom hover:cursor-pointer",
+                    copied ? "text-success" : "text-text-dimmed hover:text-text-bright"
+                  )}
+                >
+                  <div className="size-4 shrink-0">
+                    {copied ? (
+                      <ClipboardCheck className="size-full" />
+                    ) : (
+                      <Clipboard className="size-full" />
+                    )}
+                  </div>
+                </TooltipTrigger>
+                <TooltipContent side="left" className="text-xs">
+                  {copied ? "Copied" : "Copy"}
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+
+            <TooltipProvider>
+              <Tooltip disableHoverableContent>
+                <TooltipTrigger
+                  onClick={() => setCollapsed(!collapsed)}
+                  className={cn(
+                    "transition-colors duration-100 focus-custom hover:cursor-pointer",
+                    "text-text-dimmed hover:text-text-bright"
+                  )}
+                >
+                  {collapsed ? (
+                    <ChevronDown className="size-4" />
+                  ) : (
+                    <ChevronUp className="size-4" />
+                  )}
+                </TooltipTrigger>
+                <TooltipContent side="left" className="text-xs">
+                  {collapsed ? "Expand" : "Collapse"}
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+          </div>
+        )}
+      </div>
+
+      <div className="relative">
+        <div
+          ref={logsContainerRef}
+          className={cn(
+            "grow overflow-x-auto overflow-y-scroll font-mono text-xs transition-all duration-200 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600",
+            collapsed ? "h-16" : "h-64"
+          )}
+        >
+          <div className="flex w-fit min-w-full flex-col">
+            {logs.length === 0 && (
+              <div className="flex gap-x-2.5 border-l-2 border-transparent px-2.5 py-1">
+                {streamError ? (
+                  <span className="text-error">Failed fetching logs</span>
+                ) : (
+                  <span className="text-text-dimmed">
+                    {isStreaming ? "Waiting for logs..." : "No logs yet"}
+                  </span>
+                )}
+              </div>
+            )}
+            {logs.map((log, index) => {
+              return (
+                <div
+                  key={index}
+                  className={cn(
+                    "flex w-full gap-x-2.5 border-l-2 px-2.5 py-1",
+                    log.level === "error" && "border-error/60 bg-error/15 hover:bg-error/25",
+                    log.level === "warn" && "border-warning/60 bg-warning/20 hover:bg-warning/30",
+                    log.level === "info" && "border-transparent hover:bg-charcoal-750"
+                  )}
+                >
+                  <span
+                    className={cn(
+                      "select-none whitespace-nowrap py-px",
+                      log.level === "error" && "text-error/80",
+                      log.level === "warn" && "text-warning/70",
+                      log.level === "info" && "text-text-dimmed"
+                    )}
+                  >
+                    <DateTimeAccurate date={log.timestamp} hideDate hour12={false} />
+                  </span>
+                  <span
+                    className={cn(
+                      "whitespace-nowrap",
+                      log.level === "error" && "text-error",
+                      log.level === "warn" && "text-warning",
+                      log.level === "info" && "text-text-bright"
+                    )}
+                  >
+                    {log.message}
+                  </span>
+                </div>
+              );
+            })}
+          </div>
+        </div>
+        {collapsed && (
+          <div className="pointer-events-none absolute bottom-0 left-0 right-0 h-8 bg-gradient-to-t from-charcoal-800/90 to-transparent" />
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route.tsx
index dbb0ede67c1..61e789e138b 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments/route.tsx
@@ -1,11 +1,27 @@
-import { ArrowUturnLeftIcon, BookOpenIcon } from "@heroicons/react/20/solid";
-import { type MetaFunction, Outlet, useLocation, useNavigate, useParams } from "@remix-run/react";
+import {
+  ArrowPathIcon,
+  ArrowUturnLeftIcon,
+  BookOpenIcon,
+  NoSymbolIcon,
+} from "@heroicons/react/20/solid";
+import {
+  Form,
+  type MetaFunction,
+  Outlet,
+  useLocation,
+  useNavigate,
+  useNavigation,
+  useParams,
+} from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { CogIcon, GitBranchIcon } from "lucide-react";
 import { useEffect } from "react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { PromoteIcon } from "~/assets/icons/PromoteIcon";
+import { VercelLogo } from "~/components/integrations/VercelLogo";
 import { DeploymentsNone, DeploymentsNoneDev } from "~/components/BlankStatePanels";
+import { OctoKitty } from "~/components/GitHubLoginButton";
 import { GitMetadata } from "~/components/GitMetadata";
 import { RuntimeIcon } from "~/components/RuntimeIcon";
 import { UserAvatar } from "~/components/UserProfilePhoto";
@@ -13,7 +29,15 @@ import { MainCenteredContainer, PageBody, PageContainer } from "~/components/lay
 import { Badge } from "~/components/primitives/Badge";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { DateTime } from "~/components/primitives/DateTime";
-import { Dialog, DialogTrigger } from "~/components/primitives/Dialog";
+import { SpinnerWhite } from "~/components/primitives/Spinner";
+import {
+  Dialog,
+  DialogDescription,
+  DialogContent,
+  DialogHeader,
+  DialogTrigger,
+  DialogFooter,
+} from "~/components/primitives/Dialog";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
 import { PaginationControls } from "~/components/primitives/Pagination";
 import { Paragraph } from "~/components/primitives/Paragraph";
@@ -32,15 +56,12 @@ import {
   TableHeaderCell,
   TableRow,
 } from "~/components/primitives/Table";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import {
   DeploymentStatus,
   deploymentStatusDescription,
   deploymentStatuses,
 } from "~/components/runs/v3/DeploymentStatus";
-import {
-  PromoteDeploymentDialog,
-  RollbackDeploymentDialog,
-} from "~/components/runs/v3/RollbackDeploymentDialog";
 import { useEnvironment } from "~/hooks/useEnvironment";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
@@ -50,9 +71,18 @@ import {
 } from "~/presenters/v3/DeploymentListPresenter.server";
 import { requireUserId } from "~/services/session.server";
 import { titleCase } from "~/utils";
-import { EnvironmentParamSchema, docsPath, v3DeploymentPath } from "~/utils/pathBuilder";
+import { cn } from "~/utils/cn";
+import {
+  EnvironmentParamSchema,
+  docsPath,
+  v3DeploymentPath,
+  v3ProjectSettingsPath,
+} from "~/utils/pathBuilder";
 import { createSearchParams } from "~/utils/searchParams";
 import { compareDeploymentVersions } from "~/v3/utils/deploymentVersions";
+import { useAutoRevalidate } from "~/hooks/useAutoRevalidate";
+import { env } from "~/env.server";
+import { DialogClose } from "@radix-ui/react-dialog";
 
 export const meta: MetaFunction = () => {
   return [
@@ -108,7 +138,9 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       ? result.deployments.find((d) => d.version === version)
       : undefined;
 
-    return typedjson({ ...result, selectedDeployment });
+    const autoReloadPollIntervalMs = env.DEPLOYMENTS_AUTORELOAD_POLL_INTERVAL_MS;
+
+    return typedjson({ ...result, selectedDeployment, autoReloadPollIntervalMs });
   } catch (error) {
     console.error(error);
     throw new Response(undefined, {
@@ -122,14 +154,24 @@ export default function Page() {
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
-  const { deployments, currentPage, totalPages, selectedDeployment } =
-    useTypedLoaderData<typeof loader>();
+  const {
+    deployments,
+    currentPage,
+    totalPages,
+    selectedDeployment,
+    connectedGithubRepository,
+    environmentGitHubBranch,
+    autoReloadPollIntervalMs,
+    hasVercelIntegration,
+  } = useTypedLoaderData<typeof loader>();
   const hasDeployments = totalPages > 0;
 
   const { deploymentParam } = useParams();
   const location = useLocation();
   const navigate = useNavigate();
 
+  useAutoRevalidate({ interval: autoReloadPollIntervalMs, onFocus: true });
+
   // If we have a selected deployment from the version param, show it
   useEffect(() => {
     if (selectedDeployment && !deploymentParam) {
@@ -160,8 +202,8 @@ export default function Page() {
         <ResizablePanelGroup orientation="horizontal" className="h-full max-h-full">
           <ResizablePanel id="deployments-main" min="100px" className="max-h-full">
             {hasDeployments ? (
-              <div className="grid max-h-full grid-rows-[1fr_auto]">
-                <Table containerClassName="border-t-0">
+              <div className="flex h-full max-h-full flex-col">
+                <Table containerClassName="border-t-0 grow">
                   <TableHeader>
                     <TableRow>
                       <TableHeaderCell>Deploy</TableHeaderCell>
@@ -195,6 +237,7 @@ export default function Page() {
                       <TableHeaderCell>Deployed at</TableHeaderCell>
                       <TableHeaderCell>Deployed by</TableHeaderCell>
                       <TableHeaderCell>Git</TableHeaderCell>
+                      {hasVercelIntegration && <TableHeaderCell>Linked</TableHeaderCell>}
                       <TableHeaderCell hiddenLabel>Go to page</TableHeaderCell>
                     </TableRow>
                   </TableHeader>
@@ -245,21 +288,20 @@ export default function Page() {
                               )}
                             </TableCell>
                             <TableCell to={path} isSelected={isSelected}>
-                              {deployment.deployedBy ? (
-                                <div className="flex items-center gap-1">
-                                  <UserAvatar
-                                    avatarUrl={deployment.deployedBy.avatarUrl}
-                                    name={
-                                      deployment.deployedBy.name ??
-                                      deployment.deployedBy.displayName
-                                    }
-                                    className="h-4 w-4"
-                                  />
-                                  <Paragraph variant="extra-small">
-                                    {deployment.deployedBy.name ??
-                                      deployment.deployedBy.displayName}
-                                  </Paragraph>
-                                </div>
+                              {deployment.git?.source === "trigger_github_app" ? (
+                                <UserTag
+                                  name={deployment.git.ghUsername ?? "GitHub Integration"}
+                                  avatarUrl={deployment.git.ghUserAvatarUrl}
+                                />
+                              ) : deployment.deployedBy ? (
+                                <UserTag
+                                  name={
+                                    deployment.deployedBy.name ??
+                                    deployment.deployedBy.displayName ??
+                                    ""
+                                  }
+                                  avatarUrl={deployment.deployedBy.avatarUrl ?? undefined}
+                                />
                               ) : (
                                 "–"
                               )}
@@ -269,6 +311,28 @@ export default function Page() {
                                 <GitMetadata git={deployment.git} />
                               </div>
                             </TableCell>
+                            {hasVercelIntegration && (
+                              <TableCell isSelected={isSelected}>
+                                {deployment.vercelDeploymentUrl ? (
+                                  <SimpleTooltip
+                                    button={
+                                      <a
+                                        href={deployment.vercelDeploymentUrl}
+                                        target="_blank"
+                                        rel="noreferrer noopener"
+                                        className="flex items-center text-text-dimmed transition-colors hover:text-text-bright"
+                                        onClick={(e) => e.stopPropagation()}
+                                      >
+                                        <VercelLogo className="size-3.5" />
+                                      </a>
+                                    }
+                                    content="View on Vercel"
+                                  />
+                                ) : (
+                                  "–"
+                                )}
+                              </TableCell>
+                            )}
                             <DeploymentActionsCell
                               deployment={deployment}
                               path={path}
@@ -279,7 +343,7 @@ export default function Page() {
                         );
                       })
                     ) : (
-                      <TableBlankRow colSpan={8}>
+                      <TableBlankRow colSpan={hasVercelIntegration ? 9 : 8}>
                         <Paragraph className="flex items-center justify-center">
                           No deploys match your filters
                         </Paragraph>
@@ -287,18 +351,45 @@ export default function Page() {
                     )}
                   </TableBody>
                 </Table>
-                {totalPages > 1 && (
-                  <div className="-mt-px flex justify-end border-t border-grid-dimmed py-2 pr-2">
-                    <PaginationControls currentPage={currentPage} totalPages={totalPages} />
-                  </div>
-                )}
+                <div
+                  className={cn(
+                    "-mt-px flex flex-wrap justify-end gap-2 border-t border-grid-dimmed px-3 pb-[7px] pt-[6px]",
+                    connectedGithubRepository && environmentGitHubBranch && "justify-between"
+                  )}
+                >
+                  {connectedGithubRepository && environmentGitHubBranch && (
+                    <div className="flex flex-nowrap items-center gap-2 whitespace-nowrap text-sm">
+                      <OctoKitty className="size-4" />
+                      Automatically triggered by pushes to{" "}
+                      <div className="flex max-w-32 items-center gap-1 truncate rounded bg-grid-dimmed px-1 font-mono">
+                        <GitBranchIcon className="size-3 shrink-0" />
+                        <span className="max-w-28 truncate">{environmentGitHubBranch}</span>
+                      </div>{" "}
+                      in
+                      <a
+                        href={connectedGithubRepository.repository.htmlUrl}
+                        target="_blank"
+                        rel="noreferrer noopener"
+                        className="max-w-52 truncate text-sm text-text-dimmed underline transition-colors hover:text-text-bright"
+                      >
+                        {connectedGithubRepository.repository.fullName}
+                      </a>
+                      <LinkButton
+                        variant="minimal/small"
+                        LeadingIcon={CogIcon}
+                        to={v3ProjectSettingsPath(organization, project, environment)}
+                      />
+                    </div>
+                  )}
+                  <PaginationControls currentPage={currentPage} totalPages={totalPages} />
+                </div>
               </div>
             ) : environment.type === "DEVELOPMENT" ? (
-              <MainCenteredContainer className="max-w-md">
+              <MainCenteredContainer className="max-w-prose">
                 <DeploymentsNoneDev />
               </MainCenteredContainer>
             ) : (
-              <MainCenteredContainer className="max-w-md">
+              <MainCenteredContainer className="max-w-prose">
                 <DeploymentsNone />
               </MainCenteredContainer>
             )}
@@ -307,7 +398,7 @@ export default function Page() {
           {deploymentParam && (
             <>
               <ResizableHandle id="deployments-handle" />
-              <ResizablePanel id="deployments-inspector" min="400px" max="700px">
+              <ResizablePanel id="deployments-inspector" min="500px" max="800px">
                 <Outlet />
               </ResizablePanel>
             </>
@@ -318,6 +409,15 @@ export default function Page() {
   );
 }
 
+export function UserTag({ name, avatarUrl }: { name: string; avatarUrl?: string }) {
+  return (
+    <div className="flex items-center gap-1">
+      <UserAvatar avatarUrl={avatarUrl} name={name} className="h-4 w-4" />
+      <Paragraph variant="extra-small">{name}</Paragraph>
+    </div>
+  );
+}
+
 function DeploymentActionsCell({
   deployment,
   path,
@@ -339,7 +439,10 @@ function DeploymentActionsCell({
     compareDeploymentVersions(deployment.version, currentDeployment.version) === -1;
   const canBePromoted = canBeMadeCurrent && !canBeRolledBack;
 
-  if (!canBeRolledBack && !canBePromoted) {
+  const finalStatuses = ["CANCELED", "DEPLOYED", "FAILED", "TIMED_OUT"];
+  const canBeCanceled = !finalStatuses.includes(deployment.status);
+
+  if (!canBeRolledBack && !canBePromoted && !canBeCanceled) {
     return (
       <TableCell to={path} isSelected={isSelected}>
         {""}
@@ -363,7 +466,7 @@ function DeploymentActionsCell({
                   fullWidth
                   textAlignLeft
                 >
-                  Rollback…
+                  Rollback
                 </Button>
               </DialogTrigger>
               <RollbackDeploymentDialog
@@ -383,7 +486,7 @@ function DeploymentActionsCell({
                   fullWidth
                   textAlignLeft
                 >
-                  Promote…
+                  Promote
                 </Button>
               </DialogTrigger>
               <PromoteDeploymentDialog
@@ -393,8 +496,155 @@ function DeploymentActionsCell({
               />
             </Dialog>
           )}
+          {canBeCanceled && (
+            <Dialog>
+              <DialogTrigger asChild>
+                <Button
+                  variant="small-menu-item"
+                  LeadingIcon={NoSymbolIcon}
+                  leadingIconClassName="text-error"
+                  fullWidth
+                  textAlignLeft
+                >
+                  Cancel
+                </Button>
+              </DialogTrigger>
+              <CancelDeploymentDialog
+                projectId={project.id}
+                deploymentShortCode={deployment.shortCode}
+                redirectPath={`${location.pathname}${location.search}`}
+              />
+            </Dialog>
+          )}
         </>
       }
     />
   );
 }
+
+type RollbackDeploymentDialogProps = {
+  projectId: string;
+  deploymentShortCode: string;
+  redirectPath: string;
+};
+
+function RollbackDeploymentDialog({
+  projectId,
+  deploymentShortCode,
+  redirectPath,
+}: RollbackDeploymentDialogProps) {
+  const navigation = useNavigation();
+
+  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/rollback`;
+  const isLoading = navigation.formAction === formAction;
+
+  return (
+    <DialogContent key="rollback">
+      <DialogHeader>Rollback to this deployment?</DialogHeader>
+      <DialogDescription>
+        This deployment will become the default for all future runs. Tasks triggered but not
+        included in this deploy will remain queued until you roll back to or create a new deployment
+        with these tasks included.
+      </DialogDescription>
+      <DialogFooter>
+        <DialogClose asChild>
+          <Button variant="tertiary/medium">Cancel</Button>
+        </DialogClose>
+        <Form
+          action={`/resources/${projectId}/deployments/${deploymentShortCode}/rollback`}
+          method="post"
+        >
+          <Button
+            type="submit"
+            name="redirectUrl"
+            value={redirectPath}
+            variant="primary/medium"
+            LeadingIcon={isLoading ? SpinnerWhite : ArrowPathIcon}
+            disabled={isLoading}
+            shortcut={{ modifiers: ["mod"], key: "enter" }}
+          >
+            {isLoading ? "Rolling back..." : "Rollback deployment"}
+          </Button>
+        </Form>
+      </DialogFooter>
+    </DialogContent>
+  );
+}
+
+function PromoteDeploymentDialog({
+  projectId,
+  deploymentShortCode,
+  redirectPath,
+}: RollbackDeploymentDialogProps) {
+  const navigation = useNavigation();
+
+  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/promote`;
+  const isLoading = navigation.formAction === formAction;
+
+  return (
+    <DialogContent key="promote">
+      <DialogHeader>Promote this deployment?</DialogHeader>
+      <DialogDescription>
+        This deployment will become the default for all future runs not explicitly tied to a
+        specific deployment.
+      </DialogDescription>
+      <DialogFooter>
+        <DialogClose asChild>
+          <Button variant="tertiary/medium">Cancel</Button>
+        </DialogClose>
+        <Form
+          action={`/resources/${projectId}/deployments/${deploymentShortCode}/promote`}
+          method="post"
+        >
+          <Button
+            type="submit"
+            name="redirectUrl"
+            value={redirectPath}
+            variant="primary/medium"
+            LeadingIcon={isLoading ? SpinnerWhite : ArrowPathIcon}
+            disabled={isLoading}
+            shortcut={{ modifiers: ["mod"], key: "enter" }}
+          >
+            {isLoading ? "Promoting..." : "Promote deployment"}
+          </Button>
+        </Form>
+      </DialogFooter>
+    </DialogContent>
+  );
+}
+
+function CancelDeploymentDialog({
+  projectId,
+  deploymentShortCode,
+  redirectPath,
+}: RollbackDeploymentDialogProps) {
+  const navigation = useNavigation();
+
+  const formAction = `/resources/${projectId}/deployments/${deploymentShortCode}/cancel`;
+  const isLoading = navigation.formAction === formAction;
+
+  return (
+    <DialogContent key="cancel">
+      <DialogHeader>Cancel this deployment?</DialogHeader>
+      <DialogDescription>Canceling a deployment cannot be undone. Are you sure?</DialogDescription>
+      <DialogFooter>
+        <DialogClose asChild>
+          <Button variant="tertiary/medium">Back</Button>
+        </DialogClose>
+        <Form action={formAction} method="post">
+          <Button
+            type="submit"
+            name="redirectUrl"
+            value={redirectPath}
+            variant="danger/medium"
+            LeadingIcon={isLoading ? SpinnerWhite : NoSymbolIcon}
+            disabled={isLoading}
+            shortcut={{ modifiers: ["mod"], key: "enter" }}
+          >
+            {isLoading ? "Canceling..." : "Cancel deployment"}
+          </Button>
+        </Form>
+      </DialogFooter>
+    </DialogContent>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
index c52942a8acb..86bd5bbc95d 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables.new/route.tsx
@@ -151,7 +151,13 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   }
 
   const repository = new EnvironmentVariablesRepository(prisma);
-  const result = await repository.create(project.id, submission.value);
+  const result = await repository.create(project.id, {
+    ...submission.value,
+    lastUpdatedBy: {
+      type: "user",
+      userId,
+    },
+  });
 
   if (!result.success) {
     if (result.variableErrors) {
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
index edef3d30603..2670f0188df 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
@@ -9,21 +9,22 @@ import {
   PlusIcon,
   TrashIcon,
 } from "@heroicons/react/20/solid";
-import { Form, type MetaFunction, Outlet, useActionData, useNavigation } from "@remix-run/react";
+import { Form, type MetaFunction, Outlet, useActionData, useFetcher, useNavigation, useRevalidator } from "@remix-run/react";
 import {
   type ActionFunctionArgs,
   type LoaderFunctionArgs,
   json,
-  redirectDocument,
 } from "@remix-run/server-runtime";
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
+import { VercelLogo } from "~/components/integrations/VercelLogo";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { ClipboardField } from "~/components/primitives/ClipboardField";
 import { CopyableText } from "~/components/primitives/CopyableText";
+import { DateTime } from "~/components/primitives/DateTime";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
 import { Fieldset } from "~/components/primitives/Fieldset";
 import { FormButtons } from "~/components/primitives/FormButtons";
@@ -71,6 +72,11 @@ import {
   EditEnvironmentVariableValue,
   EnvironmentVariable,
 } from "~/v3/environmentVariables/repository";
+import { UserAvatar } from "~/components/UserProfilePhoto";
+import { VercelIntegrationService } from "~/services/vercelIntegration.server";
+import { fromPromise } from "neverthrow";
+import { logger } from "~/services/logger.server";
+import { shouldSyncEnvVar, isPullEnvVarsEnabledForEnvironment, type TriggerEnvironmentType } from "~/v3/vercel/vercelProjectIntegrationSchema";
 
 export const meta: MetaFunction = () => {
   return [
@@ -86,7 +92,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
   try {
     const presenter = new EnvironmentVariablesPresenter();
-    const { environmentVariables, environments, hasStaging } = await presenter.call({
+    const { environmentVariables, environments, hasStaging, vercelIntegration } = await presenter.call({
       userId,
       projectSlug: projectParam,
     });
@@ -95,6 +101,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       environmentVariables,
       environments,
       hasStaging,
+      vercelIntegration,
     });
   } catch (error) {
     console.error(error);
@@ -112,6 +119,12 @@ const schema = z.discriminatedUnion("action", [
     key: z.string(),
     ...DeleteEnvironmentVariableValue.shape,
   }),
+  z.object({
+    action: z.literal("update-vercel-sync"),
+    key: z.string(),
+    environmentType: z.enum(["PRODUCTION", "STAGING", "PREVIEW", "DEVELOPMENT"]),
+    syncEnabled: z.union([z.literal("true"), z.literal("false")]).transform((val) => val === "true"),
+  }),
 ]);
 
 export const action = async ({ request, params }: ActionFunctionArgs) => {
@@ -152,26 +165,20 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
   switch (submission.value.action) {
     case "edit": {
       const repository = new EnvironmentVariablesRepository(prisma);
-      const result = await repository.editValue(project.id, submission.value);
+      const result = await repository.editValue(project.id, {
+        ...submission.value,
+        lastUpdatedBy: {
+          type: "user",
+          userId,
+        },
+      });
 
       if (!result.success) {
         submission.error.key = [result.error];
         return json(submission);
       }
 
-      //use redirectDocument because it reloads the page
-      return redirectDocument(
-        v3EnvironmentVariablesPath(
-          { slug: organizationSlug },
-          { slug: projectParam },
-          { slug: envParam }
-        ),
-        {
-          headers: {
-            refresh: "true",
-          },
-        }
-      );
+      return json({ ...submission, success: true });
     }
     case "delete": {
       const repository = new EnvironmentVariablesRepository(prisma);
@@ -182,6 +189,32 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
         return json(submission);
       }
 
+      // Clean up syncEnvVarsMapping if Vercel integration exists (best-effort)
+      const { environmentId, key } = submission.value;
+      const vercelService = new VercelIntegrationService();
+      await fromPromise(
+        (async () => {
+          const integration = await vercelService.getVercelProjectIntegration(project.id);
+          if (integration) {
+            const runtimeEnv = await prisma.runtimeEnvironment.findUnique({
+              where: { id: environmentId },
+              select: { type: true },
+            });
+            if (runtimeEnv) {
+              await vercelService.removeSyncEnvVarForEnvironment(
+                project.id,
+                key,
+                runtimeEnv.type as TriggerEnvironmentType
+              );
+            }
+          }
+        })(),
+        (error) => error
+      ).mapErr((error) => {
+        logger.error("Failed to remove Vercel sync mapping", { error });
+        return error;
+      });
+
       return redirectWithSuccessMessage(
         v3EnvironmentVariablesPath(
           { slug: organizationSlug },
@@ -192,12 +225,31 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
         `Deleted ${submission.value.key} environment variable`
       );
     }
+    case "update-vercel-sync": {
+      const vercelService = new VercelIntegrationService();
+      const integration = await vercelService.getVercelProjectIntegration(project.id);
+
+      if (!integration) {
+        submission.error.key = ["Vercel integration not found"];
+        return json(submission);
+      }
+
+      // Update the sync mapping for the specific env var and environment
+      await vercelService.updateSyncEnvVarForEnvironment(
+        project.id,
+        submission.value.key,
+        submission.value.environmentType,
+        submission.value.syncEnabled
+      );
+
+      return json({ success: true });
+    }
   }
 };
 
 export default function Page() {
   const [revealAll, setRevealAll] = useState(false);
-  const { environmentVariables, environments } = useTypedLoaderData<typeof loader>();
+  const { environmentVariables, environments, vercelIntegration } = useTypedLoaderData<typeof loader>();
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
@@ -292,10 +344,32 @@ export default function Page() {
           <Table containerClassName={cn(filteredItems.length === 0 && "border-t-0")}>
             <TableHeader>
               <TableRow>
-                <TableHeaderCell className="w-[25%]">Key</TableHeaderCell>
-                <TableHeaderCell className="w-[55%]">Value</TableHeaderCell>
-                <TableHeaderCell className="w-[20%]">Environment</TableHeaderCell>
-                <TableHeaderCell hiddenLabel className="pl-24">
+                <TableHeaderCell className={vercelIntegration?.enabled ? "w-[22%]" : "w-[25%]"}>
+                  Key
+                </TableHeaderCell>
+                <TableHeaderCell className={vercelIntegration?.enabled ? "w-[32%]" : "w-[37%]"}>
+                  Value
+                </TableHeaderCell>
+                <TableHeaderCell className={vercelIntegration?.enabled ? "w-[13%]" : "w-[15%]"}>
+                  Environment
+                </TableHeaderCell>
+                {vercelIntegration?.enabled && (
+                  <TableHeaderCell className="w-[8%]">
+                    <SimpleTooltip
+                      button={
+                        <span className="flex items-center gap-1">
+                          Sync
+                          <InformationCircleIcon className="size-4 text-text-dimmed" />
+                        </span>
+                      }
+                      content="When enabled, this variable will be pulled from Vercel during builds. Requires 'Pull env vars before build' to be enabled in settings."
+                    />
+                  </TableHeaderCell>
+                )}
+                <TableHeaderCell className={vercelIntegration?.enabled ? "w-[24%]" : "w-[22%]"}>
+                  Updated
+                </TableHeaderCell>
+                <TableHeaderCell hiddenLabel className="w-0">
                   Actions
                 </TableHeaderCell>
               </TableRow>
@@ -354,9 +428,54 @@ export default function Page() {
                       <TableCell className={cn(cellClassName, borderedCellClassName)}>
                         <EnvironmentCombo environment={variable.environment} className="text-sm" />
                       </TableCell>
+                      {vercelIntegration?.enabled && (
+                        <TableCell className={cn(cellClassName, borderedCellClassName)}>
+                          {variable.environment.type !== "DEVELOPMENT" && (
+                            <VercelSyncCheckbox
+                              envVarKey={variable.key}
+                              environmentType={variable.environment.type as TriggerEnvironmentType}
+                              syncEnabled={shouldSyncEnvVar(
+                                vercelIntegration.syncEnvVarsMapping,
+                                variable.key,
+                                variable.environment.type as TriggerEnvironmentType
+                              )}
+                              pullEnvVarsEnabledForEnv={isPullEnvVarsEnabledForEnvironment(
+                                vercelIntegration.pullEnvVarsBeforeBuild,
+                                variable.environment.type as TriggerEnvironmentType
+                              )}
+                            />
+                          )}
+                        </TableCell>
+                      )}
+                      <TableCell className={cn(cellClassName, borderedCellClassName)}>
+                        <div className="flex items-center gap-3">
+                          {variable.updatedByUser ? (
+                            <div className="flex items-center gap-2">
+                              <UserAvatar
+                                avatarUrl={variable.updatedByUser.avatarUrl}
+                                name={variable.updatedByUser.name}
+                                className="size-5"
+                              />
+                              <span className="text-sm">{variable.updatedByUser.name}</span>
+                            </div>
+                          ) : (variable.lastUpdatedBy?.type === "integration" && variable.lastUpdatedBy?.integration === 'vercel' ) ? (
+                            <div className="flex items-center gap-2">
+                              <VercelLogo className="size-4 text-text-dimmed group-hover/table-row:text-text-bright transition-colors" />
+                              <span className="text-sm text-text-dimmed group-hover/table-row:text-text-bright capitalize transition-colors">
+                                {variable.lastUpdatedBy.integration}
+                              </span>
+                            </div>
+                          ) : null}
+                          {variable.updatedAt ? (
+                            <span className="text-sm text-text-dimmed">
+                              <DateTime date={variable.updatedAt} includeSeconds={false} />
+                            </span>
+                          ) : null}
+                        </div>
+                      </TableCell>
                       <TableCellMenu
-                        className={cn(cellClassName, borderedCellClassName)}
                         isSticky
+                        className="w-0 [&:has(.group-hover/table-row:block)]:w-auto"
                         hiddenButtons={
                           <>
                             <EditEnvironmentVariablePanel
@@ -372,7 +491,7 @@ export default function Page() {
                 })
               ) : (
                 <TableRow>
-                  <TableCell colSpan={4}>
+                  <TableCell colSpan={vercelIntegration?.enabled ? 6 : 5}>
                     {environmentVariables.length === 0 ? (
                       <div className="flex flex-col items-center justify-center gap-y-4 py-8">
                         <Header2>You haven't set any environment variables yet.</Header2>
@@ -417,16 +536,20 @@ function EditEnvironmentVariablePanel({
   revealAll: boolean;
 }) {
   const [isOpen, setIsOpen] = useState(false);
-  const lastSubmission = useActionData();
-  const navigation = useNavigation();
+  const fetcher = useFetcher<typeof action>();
+  const lastSubmission = fetcher.data as any;
 
-  const isLoading =
-    navigation.state !== "idle" &&
-    navigation.formMethod === "post" &&
-    navigation.formData?.get("action") === "edit";
+  const isLoading = fetcher.state !== "idle";
+
+  // Close dialog on successful submission
+  useEffect(() => {
+    if (lastSubmission?.success && fetcher.state === "idle") {
+      setIsOpen(false);
+    }
+  }, [lastSubmission?.success, fetcher.state]);
 
   const [form, { id, environmentId, value }] = useForm({
-    id: "edit-environment-variable",
+    id: `edit-environment-variable-${variable.id}-${variable.environment.id}`,
     // TODO: type this
     lastSubmission: lastSubmission as any,
     onValidate({ formData }) {
@@ -439,12 +562,12 @@ function EditEnvironmentVariablePanel({
     <Dialog open={isOpen} onOpenChange={setIsOpen}>
       <DialogTrigger asChild>
         <Button variant="small-menu-item" LeadingIcon={PencilSquareIcon} fullWidth textAlignLeft>
-          Edit
+          
         </Button>
       </DialogTrigger>
       <DialogContent>
         <DialogHeader>Edit environment variable</DialogHeader>
-        <Form method="post" {...form.props}>
+        <fetcher.Form method="post" {...form.props}>
           <input type="hidden" name="action" value="edit" />
           <input {...conform.input(id, { type: "hidden" })} value={variable.id} />
           <input
@@ -490,7 +613,7 @@ function EditEnvironmentVariablePanel({
               }
             />
           </Fieldset>
-        </Form>
+        </fetcher.Form>
       </DialogContent>
     </Dialog>
   );
@@ -535,8 +658,82 @@ function DeleteEnvironmentVariableButton({
         leadingIconClassName="text-rose-500 group-hover/button:text-text-bright transition-colors"
         className="ml-0.5 transition-colors group-hover/button:bg-error"
       >
-        {isLoading ? "Deleting" : "Delete"}
+        {isLoading ? "Deleting" : ""}
       </Button>
     </Form>
   );
 }
+
+/**
+ * Toggle component for controlling whether an environment variable is pulled from Vercel.
+ *
+ * When enabled, the variable will be pulled from Vercel during builds.
+ * By default, all variables are pulled unless explicitly disabled.
+ *
+ * Note: If the env slug is missing from syncEnvVarsMapping, all vars are pulled by default.
+ * Only when syncEnvVarsMapping[envSlug][envVarName] = false, the env var is skipped during builds.
+ */
+function VercelSyncCheckbox({
+  envVarKey,
+  environmentType,
+  syncEnabled,
+  pullEnvVarsEnabledForEnv,
+}: {
+  envVarKey: string;
+  environmentType: "PRODUCTION" | "STAGING" | "PREVIEW" | "DEVELOPMENT";
+  syncEnabled: boolean;
+  pullEnvVarsEnabledForEnv: boolean;
+}) {
+  const fetcher = useFetcher();
+  const revalidator = useRevalidator();
+
+  const isLoading = fetcher.state !== "idle";
+
+  // Revalidate loader data after successful submission (without full page reload)
+  useEffect(() => {
+    if (fetcher.state === "idle" && fetcher.data) {
+      const data = fetcher.data as { success?: boolean };
+      if (data.success) {
+        revalidator.revalidate();
+      }
+    }
+  }, [fetcher.state, fetcher.data, revalidator]);
+
+  const handleChange = (checked: boolean) => {
+    fetcher.submit(
+      {
+        action: "update-vercel-sync",
+        key: envVarKey,
+        environmentType,
+        syncEnabled: checked.toString(),
+      },
+      { method: "post" }
+    );
+  };
+
+  // If pull env vars is disabled for this environment, show disabled state
+  if (!pullEnvVarsEnabledForEnv) {
+    return (
+      <SimpleTooltip
+        button={
+          <Switch
+            variant="small"
+            checked={false}
+            disabled
+            onCheckedChange={() => {}}
+          />
+        }
+        content="Enable 'Pull env vars before build' for this environment in Vercel settings."
+      />
+    );
+  }
+
+  return (
+    <Switch
+      variant="small"
+      checked={syncEnabled}
+      disabled={isLoading}
+      onCheckedChange={handleChange}
+    />
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx
new file mode 100644
index 00000000000..1806703bbbd
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx
@@ -0,0 +1,853 @@
+import { CheckIcon, BookOpenIcon } from "@heroicons/react/20/solid";
+import { type MetaFunction } from "@remix-run/react";
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { IconCardsFilled, IconDiamondFilled, IconTallymark4 } from "@tabler/icons-react";
+import { tryCatch } from "@trigger.dev/core";
+import { Gauge } from "lucide-react";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { ConcurrencyIcon } from "~/assets/icons/ConcurrencyIcon";
+import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { Feedback } from "~/components/Feedback";
+import { PageBody, PageContainer } from "~/components/layout/AppLayout";
+import { EnvironmentSelector } from "~/components/navigation/EnvironmentSelector";
+import { AnimatedNumber } from "~/components/primitives/AnimatedNumber";
+import { Badge } from "~/components/primitives/Badge";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Header2 } from "~/components/primitives/Headers";
+import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
+import * as Property from "~/components/primitives/PropertyTable";
+import {
+  Table,
+  TableBody,
+  TableCell,
+  TableHeader,
+  TableHeaderCell,
+  TableRow,
+} from "~/components/primitives/Table";
+import { InfoIconTooltip } from "~/components/primitives/Tooltip";
+import { useAutoRevalidate } from "~/hooks/useAutoRevalidate";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import {
+  LimitsPresenter,
+  type FeatureInfo,
+  type LimitsResult,
+  type QuotaInfo,
+  type RateLimitInfo,
+} from "~/presenters/v3/LimitsPresenter.server";
+import { requireUserId } from "~/services/session.server";
+import { cn } from "~/utils/cn";
+import { formatNumber } from "~/utils/numberFormatter";
+import {
+  concurrencyPath,
+  docsPath,
+  EnvironmentParamSchema,
+  organizationBillingPath,
+} from "~/utils/pathBuilder";
+
+export const meta: MetaFunction = () => {
+  return [
+    {
+      title: `Limits | Trigger.dev`,
+    },
+  ];
+};
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Project not found",
+    });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Environment not found",
+    });
+  }
+
+  const presenter = new LimitsPresenter();
+  const [error, result] = await tryCatch(
+    presenter.call({
+      organizationId: project.organizationId,
+      projectId: project.id,
+      environmentId: environment.id,
+      environmentApiKey: environment.apiKey,
+    })
+  );
+
+  if (error) {
+    throw new Response(error.message, {
+      status: 400,
+    });
+  }
+
+  // Match the queues page pattern: pass a poll interval from the loader
+  const autoReloadPollIntervalMs = 5000;
+
+  return typedjson({
+    ...result,
+    autoReloadPollIntervalMs,
+  });
+};
+
+export default function Page() {
+  const data = useTypedLoaderData<typeof loader>();
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  // Auto-revalidate using the loader-provided interval and refresh on focus
+  useAutoRevalidate({ interval: data.autoReloadPollIntervalMs, onFocus: true });
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title="Limits" />
+        <PageAccessories>
+          <AdminDebugTooltip>
+            <Property.Table>
+              <Property.Item>
+                <Property.Label>Plan</Property.Label>
+                <Property.Value>{data.planName ?? "No plan"}</Property.Value>
+              </Property.Item>
+              <Property.Item>
+                <Property.Label>Organization ID</Property.Label>
+                <Property.Value>{data.organizationId}</Property.Value>
+              </Property.Item>
+            </Property.Table>
+          </AdminDebugTooltip>
+          <LinkButton variant={"docs/small"} LeadingIcon={BookOpenIcon} to={docsPath("/limits")}>
+            Limits docs
+          </LinkButton>
+        </PageAccessories>
+      </NavBar>
+      <PageBody scrollable={true}>
+        <div className="mx-auto mt-10 max-w-2xl p-4">
+          <div className="flex flex-col gap-8">
+            {/* Current Plan Section */}
+            {data.planName && (
+              <CurrentPlanSection
+                planName={data.planName}
+                isOnTopPlan={data.isOnTopPlan}
+                billingPath={organizationBillingPath(organization)}
+              />
+            )}
+
+            {/* Concurrency Section */}
+            <ConcurrencySection
+              concurrencyPath={concurrencyPath(organization, project, environment)}
+            />
+
+            {/* Rate Limits Section */}
+            <RateLimitsSection
+              rateLimits={data.rateLimits}
+              isOnTopPlan={data.isOnTopPlan}
+              billingPath={organizationBillingPath(organization)}
+              organization={organization}
+              project={project}
+              environment={environment}
+            />
+
+            {/* Quotas Section */}
+            <QuotasSection
+              quotas={data.quotas}
+              isOnTopPlan={data.isOnTopPlan}
+              billingPath={organizationBillingPath(organization)}
+            />
+
+            {/* Features Section */}
+            <FeaturesSection
+              features={data.features}
+              isOnTopPlan={data.isOnTopPlan}
+              billingPath={organizationBillingPath(organization)}
+            />
+          </div>
+        </div>
+      </PageBody>
+    </PageContainer>
+  );
+}
+
+function CurrentPlanSection({
+  planName,
+  isOnTopPlan,
+  billingPath,
+}: {
+  planName: string;
+  isOnTopPlan: boolean;
+  billingPath: string;
+}) {
+  return (
+    <div className="flex flex-col gap-3">
+      <Header2 className="flex items-center gap-1">
+        <IconCardsFilled className="size-5 text-amber-400" />
+        Current plan
+      </Header2>
+      <Table variant="bright/no-hover">
+        <TableBody>
+          <TableRow>
+            <TableCell className="w-full text-sm">{planName}</TableCell>
+            <TableCell alignment="right">
+              {isOnTopPlan ? (
+                <Feedback
+                  button={<Button variant="secondary/small">Request Enterprise</Button>}
+                  defaultValue="help"
+                />
+              ) : (
+                <LinkButton to={billingPath} variant="secondary/small">
+                  View plans
+                </LinkButton>
+              )}
+            </TableCell>
+          </TableRow>
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
+
+function ConcurrencySection({ concurrencyPath }: { concurrencyPath: string }) {
+  return (
+    <div className="flex flex-col gap-3">
+      <Header2 className="flex items-center gap-1.5">
+        <ConcurrencyIcon className="size-5 text-orange-500" />
+        Concurrency limits
+        <InfoIconTooltip
+          content="Concurrency limits control how many runs execute at the same time."
+          disableHoverableContent
+        />
+      </Header2>
+      <Table variant="bright/no-hover">
+        <TableBody>
+          <TableRow>
+            <TableCell className="w-full text-sm">Concurrency</TableCell>
+            <TableCell alignment="right">
+              <LinkButton to={concurrencyPath} variant="secondary/small">
+                Manage concurrency
+              </LinkButton>
+            </TableCell>
+          </TableRow>
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
+
+function RateLimitsSection({
+  rateLimits,
+  isOnTopPlan,
+  billingPath,
+  organization,
+  project,
+  environment,
+}: {
+  rateLimits: LimitsResult["rateLimits"];
+  isOnTopPlan: boolean;
+  billingPath: string;
+  organization: ReturnType<typeof useOrganization>;
+  project: ReturnType<typeof useProject>;
+  environment: ReturnType<typeof useEnvironment>;
+}) {
+  return (
+    <div className="flex flex-col gap-3">
+      <div className="flex items-center justify-between">
+        <Header2 className="flex items-center gap-1.5">
+          <Gauge className="size-5 text-indigo-500" />
+          Rate limits
+          <InfoIconTooltip
+            content="Rate limits control how many API requests can be made within a time window. They are tracked per API key."
+            disableHoverableContent
+          />
+        </Header2>
+        <EnvironmentSelector
+          organization={organization}
+          project={project}
+          environment={environment}
+          className="w-auto"
+        />
+      </div>
+      <Table variant="bright/no-hover">
+        <TableHeader>
+          <TableRow>
+            <TableHeaderCell>Rate limit</TableHeaderCell>
+            <TableHeaderCell alignment="right">
+              <span className="flex items-center justify-end gap-x-1">
+                Type
+                <InfoIconTooltip
+                  content={
+                    <div className="flex max-w-xs flex-col gap-3 py-1">
+                      <div className="flex flex-col items-start gap-1.5">
+                        <RateLimitTypeBadge type="tokenBucket" />
+                        <span className="pl-0.5 text-text-bright">
+                          Requests consume tokens from a bucket that refills over time. When empty,
+                          requests are rate limited.
+                        </span>
+                      </div>
+                      <div className="flex flex-col items-start gap-1.5">
+                        <RateLimitTypeBadge type="fixedWindow" />
+                        <span className="pl-0.5 text-text-bright">
+                          Allows a set number of requests per time window. The window resets at
+                          fixed intervals.
+                        </span>
+                      </div>
+                      <div className="flex flex-col items-start gap-1.5">
+                        <RateLimitTypeBadge type="slidingWindow" />
+                        <span className="pl-0.5 text-text-bright">
+                          Allows a set number of requests per rolling time window. The limit is
+                          continuously evaluated.
+                        </span>
+                      </div>
+                    </div>
+                  }
+                  disableHoverableContent
+                />
+              </span>
+            </TableHeaderCell>
+            <TableHeaderCell alignment="right">Configuration</TableHeaderCell>
+            <TableHeaderCell alignment="right">
+              <span className="flex items-center justify-end gap-x-1">
+                Available
+                <InfoIconTooltip
+                  content="Current available tokens for this environment's API key"
+                  disableHoverableContent
+                />
+              </span>
+            </TableHeaderCell>
+            <TableHeaderCell alignment="right">Upgrade</TableHeaderCell>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          <RateLimitRow info={rateLimits.api} isOnTopPlan={isOnTopPlan} billingPath={billingPath} />
+          <RateLimitRow
+            info={rateLimits.batch}
+            isOnTopPlan={isOnTopPlan}
+            billingPath={billingPath}
+          />
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
+
+function RateLimitRow({
+  info,
+  isOnTopPlan,
+  billingPath,
+}: {
+  info: RateLimitInfo;
+  isOnTopPlan: boolean;
+  billingPath: string;
+}) {
+  const maxTokens = info.config.type === "tokenBucket" ? info.config.maxTokens : info.config.tokens;
+  const percentage =
+    info.currentTokens !== null && maxTokens > 0 ? info.currentTokens / maxTokens : null;
+
+  return (
+    <TableRow>
+      <TableCell>
+        <span className="flex items-center gap-1 text-sm">
+          {info.name}
+          <InfoIconTooltip content={info.description} disableHoverableContent />
+        </span>
+      </TableCell>
+      <TableCell alignment="right">
+        <div className="flex justify-end">
+          <RateLimitTypeBadge config={info.config} />
+        </div>
+      </TableCell>
+      <TableCell alignment="right">
+        <RateLimitConfigDisplay config={info.config} />
+      </TableCell>
+      <TableCell alignment="right">
+        {info.currentTokens !== null ? (
+          <div className="flex flex-col items-end gap-0.5">
+            <span
+              className={cn(
+                "font-medium tabular-nums",
+                getUsageColorClass(percentage, "remaining")
+              )}
+            >
+              <AnimatedNumber value={info.currentTokens} />
+            </span>
+            <span className="text-xs tabular-nums text-text-dimmed">
+              of {formatNumber(maxTokens)}
+            </span>
+          </div>
+        ) : (
+          <span className="text-text-dimmed">–</span>
+        )}
+      </TableCell>
+      <TableCell alignment="right">
+        <div className="flex justify-end">
+          {info.name === "Batch rate limit" ? (
+            isOnTopPlan ? (
+              <Feedback
+                button={<Button variant="secondary/small">Contact us</Button>}
+                defaultValue="help"
+              />
+            ) : (
+              <LinkButton to={billingPath} variant="secondary/small">
+                View plans
+              </LinkButton>
+            )
+          ) : (
+            <Feedback
+              button={<Button variant="secondary/small">Contact us</Button>}
+              defaultValue="help"
+            />
+          )}
+        </div>
+      </TableCell>
+    </TableRow>
+  );
+}
+
+function RateLimitTypeBadge({
+  config,
+  type,
+}: {
+  config?: RateLimitInfo["config"];
+  type?: "tokenBucket" | "fixedWindow" | "slidingWindow";
+}) {
+  const rateLimitType = type ?? config?.type;
+  switch (rateLimitType) {
+    case "tokenBucket":
+      return (
+        <Badge variant="small" className="w-fit bg-blue-500/20 text-blue-400">
+          Token bucket
+        </Badge>
+      );
+    case "fixedWindow":
+      return (
+        <Badge variant="small" className="w-fit bg-purple-500/20 text-purple-400">
+          Fixed window
+        </Badge>
+      );
+    case "slidingWindow":
+      return (
+        <Badge variant="small" className="w-fit bg-green-500/20 text-green-400">
+          Sliding window
+        </Badge>
+      );
+    default:
+      return null;
+  }
+}
+
+function RateLimitConfigDisplay({ config }: { config: RateLimitInfo["config"] }) {
+  if (config.type === "tokenBucket") {
+    return (
+      <div className="flex flex-col items-end gap-0.5 text-xs">
+        <span className="tabular-nums">
+          <span className="text-text-dimmed">Max tokens:</span>{" "}
+          <span className="font-medium text-text-bright">{formatNumber(config.maxTokens)}</span>
+        </span>
+        <span className="tabular-nums">
+          <span className="text-text-dimmed">Refill:</span>{" "}
+          <span className="font-medium text-text-bright">
+            {formatNumber(config.refillRate)}/{config.interval}
+          </span>
+        </span>
+      </div>
+    );
+  }
+
+  if (config.type === "fixedWindow" || config.type === "slidingWindow") {
+    return (
+      <div className="flex flex-col items-end gap-0.5 text-xs">
+        <span className="tabular-nums">
+          <span className="text-text-dimmed">Tokens:</span>{" "}
+          <span className="font-medium text-text-bright">{formatNumber(config.tokens)}</span>
+        </span>
+        <span className="tabular-nums">
+          <span className="text-text-dimmed">Window:</span>{" "}
+          <span className="font-medium text-text-bright">{config.window}</span>
+        </span>
+      </div>
+    );
+  }
+
+  return <span className="text-text-dimmed">–</span>;
+}
+
+function QuotasSection({
+  quotas,
+  isOnTopPlan,
+  billingPath,
+}: {
+  quotas: LimitsResult["quotas"];
+  isOnTopPlan: boolean;
+  billingPath: string;
+}) {
+  // Collect all quotas that should be shown
+  const quotaRows: QuotaInfo[] = [];
+
+  // Always show projects
+  quotaRows.push(quotas.projects);
+
+  // Add plan-based quotas if they exist
+  if (quotas.teamMembers) quotaRows.push(quotas.teamMembers);
+  if (quotas.schedules) quotaRows.push(quotas.schedules);
+  if (quotas.alerts) quotaRows.push(quotas.alerts);
+  if (quotas.branches) quotaRows.push(quotas.branches);
+  if (quotas.realtimeConnections) quotaRows.push(quotas.realtimeConnections);
+  if (quotas.logRetentionDays) quotaRows.push(quotas.logRetentionDays);
+
+  // Include batch processing concurrency
+  quotaRows.push(quotas.batchProcessingConcurrency);
+
+  // Add queue size quotas if set
+  if (quotas.devQueueSize.limit !== null) quotaRows.push(quotas.devQueueSize);
+  if (quotas.deployedQueueSize.limit !== null) quotaRows.push(quotas.deployedQueueSize);
+
+  // Metric & query quotas
+  if (quotas.metricDashboards) quotaRows.push(quotas.metricDashboards);
+  if (quotas.metricWidgetsPerDashboard) quotaRows.push(quotas.metricWidgetsPerDashboard);
+  if (quotas.queryPeriodDays) quotaRows.push(quotas.queryPeriodDays);
+
+  return (
+    <div className="flex flex-col gap-3">
+      <Header2 className="flex items-center gap-1">
+        <IconTallymark4 className="size-6 text-blue-500" />
+        Quotas
+        <InfoIconTooltip
+          content="Quotas define the maximum resources available to your organization."
+          disableHoverableContent
+        />
+      </Header2>
+      <Table variant="bright/no-hover">
+        <TableHeader>
+          <TableRow>
+            <TableHeaderCell>Quota</TableHeaderCell>
+            <TableHeaderCell alignment="right">Limit</TableHeaderCell>
+            <TableHeaderCell alignment="right">Current</TableHeaderCell>
+            <TableHeaderCell alignment="right">Source</TableHeaderCell>
+            <TableHeaderCell alignment="right">Upgrade</TableHeaderCell>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          {quotaRows.map((quota) => (
+            <QuotaRow
+              key={quota.name}
+              quota={quota}
+              isOnTopPlan={isOnTopPlan}
+              billingPath={billingPath}
+            />
+          ))}
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
+
+function QuotaRow({
+  quota,
+  isOnTopPlan,
+  billingPath,
+}: {
+  quota: QuotaInfo;
+  isOnTopPlan: boolean;
+  billingPath: string;
+}) {
+  // For log retention and query period, we don't show current usage as it's a duration, not a count
+  // For widgets per dashboard, the usage varies per dashboard so we don't show a single number
+  const isDurationQuota = quota.name === "Log retention" || quota.name === "Query period";
+  const isPerItemQuota = quota.name === "Charts per dashboard";
+  const isRetentionQuota = isDurationQuota || isPerItemQuota;
+  const percentage =
+    !isRetentionQuota && quota.limit && quota.limit > 0 ? quota.currentUsage / quota.limit : null;
+
+  // Special handling for duration-based quotas (Log retention, Query period)
+  if (isDurationQuota) {
+    const canUpgrade = !isOnTopPlan;
+    return (
+      <TableRow>
+        <TableCell className="flex w-full items-center gap-1">
+          <span className="text-sm">{quota.name}</span>
+          <InfoIconTooltip content={quota.description} disableHoverableContent />
+        </TableCell>
+        <TableCell alignment="right" className="font-medium tabular-nums">
+          {quota.limit !== null
+              ? `${formatNumber(quota.limit)} ${quota.limit === 1 ? "day" : "days"}`
+              : "Unlimited"}
+        </TableCell>
+        <TableCell alignment="right" className="tabular-nums text-text-dimmed">
+          –
+        </TableCell>
+        <TableCell alignment="right">
+          <SourceBadge source={quota.source} />
+        </TableCell>
+        <TableCell alignment="right">
+          <div className="flex justify-end">
+            {canUpgrade ? (
+              <LinkButton to={billingPath} variant="secondary/small">
+                View plans
+              </LinkButton>
+            ) : (
+              <Feedback
+                button={<Button variant="secondary/small">Contact us</Button>}
+                defaultValue="help"
+              />
+            )}
+          </div>
+        </TableCell>
+      </TableRow>
+    );
+  }
+
+  const renderUpgrade = () => {
+    // Projects always show Contact us (regardless of upgrade flags)
+    if (quota.name === "Projects") {
+      return (
+        <div className="flex justify-end">
+          <Feedback
+            button={<Button variant="secondary/small">Contact us</Button>}
+            defaultValue="help"
+          />
+        </div>
+      );
+    }
+
+    if (!quota.isUpgradable) {
+      return null;
+    }
+
+    // Not on top plan - show View plans
+    if (!isOnTopPlan) {
+      return (
+        <div className="flex justify-end">
+          <LinkButton to={billingPath} variant="secondary/small">
+            View plans
+          </LinkButton>
+        </div>
+      );
+    }
+
+    // On top plan - show Contact us if canExceed is true
+    if (quota.canExceed) {
+      return (
+        <div className="flex justify-end">
+          <Feedback
+            button={<Button variant="secondary/small">Contact us</Button>}
+            defaultValue="help"
+          />
+        </div>
+      );
+    }
+
+    // On top plan but cannot exceed - no upgrade option
+    return null;
+  };
+
+  return (
+    <TableRow>
+      <TableCell className="flex w-full items-center gap-1">
+        <span className="text-sm">{quota.name}</span>
+        <InfoIconTooltip content={quota.description} disableHoverableContent />
+      </TableCell>
+      <TableCell alignment="right" className="font-medium tabular-nums">
+        {quota.limit !== null
+          ? isDurationQuota
+            ? `${formatNumber(quota.limit)} ${quota.limit === 1 ? "day" : "days"}`
+            : formatNumber(quota.limit)
+          : "Unlimited"}
+      </TableCell>
+      <TableCell
+        alignment="right"
+        className={cn(
+          "tabular-nums",
+          isRetentionQuota ? "text-text-dimmed" : getUsageColorClass(percentage, "usage")
+        )}
+      >
+        {isRetentionQuota ? "–" : formatNumber(quota.currentUsage)}
+      </TableCell>
+      <TableCell alignment="right">
+        <SourceBadge source={quota.source} />
+      </TableCell>
+      <TableCell alignment="right">{renderUpgrade()}</TableCell>
+    </TableRow>
+  );
+}
+
+function FeaturesSection({
+  features,
+  isOnTopPlan,
+  billingPath,
+}: {
+  features: LimitsResult["features"];
+  isOnTopPlan: boolean;
+  billingPath: string;
+}) {
+  // For staging environment: show View plans if not enabled (i.e., on Free plan)
+  const stagingUpgradeType = features.hasStagingEnvironment.enabled ? "none" : "view-plans";
+
+  return (
+    <div className="flex flex-col gap-3">
+      <Header2 className="flex items-center gap-1.5">
+        <IconDiamondFilled className="size-5 text-green-600" />
+        Plan features
+      </Header2>
+      <Table variant="bright/no-hover">
+        <TableHeader>
+          <TableRow>
+            <TableHeaderCell>Feature</TableHeaderCell>
+            <TableHeaderCell alignment="right">Status</TableHeaderCell>
+            <TableHeaderCell alignment="right">Upgrade</TableHeaderCell>
+          </TableRow>
+        </TableHeader>
+        <TableBody>
+          <FeatureRow
+            feature={features.hasStagingEnvironment}
+            upgradeType={stagingUpgradeType}
+            billingPath={billingPath}
+          />
+          <FeatureRow
+            feature={features.support}
+            upgradeType={isOnTopPlan ? "contact-us" : "view-plans"}
+            billingPath={billingPath}
+          />
+          <FeatureRow
+            feature={features.includedUsage}
+            upgradeType={isOnTopPlan ? "contact-us" : "view-plans"}
+            billingPath={billingPath}
+          />
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
+
+function FeatureRow({
+  feature,
+  upgradeType,
+  billingPath,
+}: {
+  feature: FeatureInfo;
+  upgradeType: "view-plans" | "contact-us" | "none";
+  billingPath: string;
+}) {
+  const displayValue = () => {
+    if (feature.name === "Included compute" && typeof feature.value === "number") {
+      if (!feature.enabled || feature.value === 0) {
+        return <span className="text-text-dimmed">None</span>;
+      }
+      return (
+        <span className="font-medium text-text-bright">${formatNumber(feature.value / 100)}</span>
+      );
+    }
+
+    if (feature.value !== undefined) {
+      return <span className="font-medium text-text-bright">{feature.value}</span>;
+    }
+
+    return feature.enabled ? (
+      <span className="inline-flex items-center gap-1 text-success">
+        <CheckIcon className="size-4" />
+        Enabled
+      </span>
+    ) : (
+      <span className="inline-flex items-center gap-1 text-text-dimmed">Not available</span>
+    );
+  };
+
+  const renderUpgrade = () => {
+    switch (upgradeType) {
+      case "view-plans":
+        return (
+          <div className="flex justify-end">
+            <LinkButton to={billingPath} variant="secondary/small">
+              View plans
+            </LinkButton>
+          </div>
+        );
+      case "contact-us":
+        return (
+          <div className="flex justify-end">
+            <Feedback
+              button={<Button variant="secondary/small">Contact us</Button>}
+              defaultValue="help"
+            />
+          </div>
+        );
+      case "none":
+        return null;
+    }
+  };
+
+  return (
+    <TableRow>
+      <TableCell className="flex w-full items-center gap-1">
+        <span className="text-sm">{feature.name}</span>
+        <InfoIconTooltip content={feature.description} disableHoverableContent />
+      </TableCell>
+      <TableCell alignment="right">{displayValue()}</TableCell>
+      <TableCell alignment="right">{renderUpgrade()}</TableCell>
+    </TableRow>
+  );
+}
+
+/**
+ * Returns the appropriate color class based on usage percentage.
+ * @param percentage - The usage percentage (0-1 scale)
+ * @param mode - "usage" means higher is worse (quotas), "remaining" means lower is worse (rate limits)
+ * @returns Tailwind color class
+ */
+function getUsageColorClass(
+  percentage: number | null,
+  mode: "usage" | "remaining" = "usage"
+): string {
+  if (percentage === null) return "text-text-dimmed";
+
+  if (mode === "remaining") {
+    // For remaining tokens: 0 = bad (red), <=10% = warning (orange)
+    if (percentage <= 0) return "text-error";
+    if (percentage <= 0.1) return "text-warning";
+    return "text-text-bright";
+  } else {
+    // For usage: 100% = bad (red), >=90% = warning (orange)
+    if (percentage >= 1) return "text-error";
+    if (percentage >= 0.9) return "text-warning";
+    return "text-text-bright";
+  }
+}
+
+function SourceBadge({ source }: { source: "default" | "plan" | "override" }) {
+  const variants: Record<typeof source, { label: string; className: string }> = {
+    default: {
+      label: "Default",
+      className: "bg-indigo-500/20 text-indigo-400",
+    },
+    plan: {
+      label: "Plan",
+      className: "bg-purple-500/20 text-purple-400",
+    },
+    override: {
+      label: "Override",
+      className: "bg-amber-500/20 text-amber-400",
+    },
+  };
+
+  const variant = variants[source];
+
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center rounded px-1.5 py-0.5 text-xs font-medium",
+        variant.className
+      )}
+    >
+      {variant.label}
+    </span>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx
new file mode 100644
index 00000000000..325df8b386b
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs/route.tsx
@@ -0,0 +1,491 @@
+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
+import { type MetaFunction, useFetcher, useNavigation, useLocation, Form } from "@remix-run/react";
+import { XMarkIcon } from "@heroicons/react/20/solid";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+import {
+  TypedAwait,
+  typeddefer,
+  type UseDataFunctionReturn,
+  useTypedLoaderData,
+} from "remix-typedjson";
+import { requireUser } from "~/services/session.server";
+import { getCurrentPlan } from "~/services/platform.v3.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { LogsListPresenter, LogEntry } from "~/presenters/v3/LogsListPresenter.server";
+import type { LogLevel } from "~/utils/logUtils";
+import { $replica, prisma } from "~/db.server";
+import { logsClickhouseClient } from "~/services/clickhouseInstance.server";
+import { NavBar, PageTitle } from "~/components/primitives/PageHeader";
+import { PageBody, PageContainer } from "~/components/layout/AppLayout";
+import { Suspense, useCallback, useEffect, useMemo, useRef, useState, useTransition } from "react";
+import { useOptimisticLocation } from "~/hooks/useOptimisticLocation";
+import { Spinner } from "~/components/primitives/Spinner";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { Callout } from "~/components/primitives/Callout";
+import { LogsTable } from "~/components/logs/LogsTable";
+import { LogDetailView } from "~/components/logs/LogDetailView";
+import { LogsSearchInput } from "~/components/logs/LogsSearchInput";
+import { LogsLevelFilter } from "~/components/logs/LogsLevelFilter";
+import { LogsTaskFilter } from "~/components/logs/LogsTaskFilter";
+import { LogsRunIdFilter } from "~/components/logs/LogsRunIdFilter";
+import { TimeFilter } from "~/components/runs/v3/SharedFilters";
+import {
+  ResizableHandle,
+  ResizablePanel,
+  ResizablePanelGroup,
+} from "~/components/primitives/Resizable";
+import { Button } from "~/components/primitives/Buttons";
+import { FEATURE_FLAG, validateFeatureFlagValue } from "~/v3/featureFlags.server";
+
+// Valid log levels for filtering
+const validLevels: LogLevel[] = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
+
+function parseLevelsFromUrl(url: URL): LogLevel[] | undefined {
+  const levelParams = url.searchParams.getAll("levels").filter((v) => v.length > 0);
+  if (levelParams.length === 0) return undefined;
+  return levelParams.filter((l): l is LogLevel => validLevels.includes(l as LogLevel));
+}
+
+export const meta: MetaFunction = () => {
+  return [
+    {
+      title: `Logs | Trigger.dev`,
+    },
+  ];
+};
+
+// TODO: Move this to a more appropriate shared location
+async function hasLogsPageAccess(
+  userId: string,
+  isAdmin: boolean,
+  isImpersonating: boolean,
+  organizationSlug: string
+): Promise<boolean> {
+  if (isAdmin || isImpersonating) {
+    return true;
+  }
+
+  // Check organization feature flags
+  const organization = await prisma.organization.findFirst({
+    where: {
+      slug: organizationSlug,
+      members: { some: { userId } },
+    },
+    select: {
+      featureFlags: true,
+    },
+  });
+
+  if (!organization?.featureFlags) {
+    return false;
+  }
+
+  const flags = organization.featureFlags as Record<string, unknown>;
+  const hasLogsPageAccessResult = validateFeatureFlagValue(
+    FEATURE_FLAG.hasLogsPageAccess,
+    flags.hasLogsPageAccess
+  );
+
+  return hasLogsPageAccessResult.success && hasLogsPageAccessResult.data === true;
+}
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const userId = user.id;
+
+  const { projectParam, organizationSlug, envParam } = EnvironmentParamSchema.parse(params);
+
+  const canAccess = await hasLogsPageAccess(
+    userId,
+    user.admin,
+    user.isImpersonating,
+    organizationSlug
+  );
+
+  if (!canAccess) {
+    throw redirect("/");
+  }
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Environment not found", { status: 404 });
+  }
+
+  // Get filters from query params
+  const url = new URL(request.url);
+  const tasks = url.searchParams.getAll("tasks").filter((t) => t.length > 0);
+  const runId = url.searchParams.get("runId") ?? undefined;
+  const search = url.searchParams.get("search") ?? undefined;
+  const levels = parseLevelsFromUrl(url);
+  const period = url.searchParams.get("period") ?? undefined;
+  const fromStr = url.searchParams.get("from");
+  const toStr = url.searchParams.get("to");
+  const from = fromStr ? parseInt(fromStr, 10) : undefined;
+  const to = toStr ? parseInt(toStr, 10) : undefined;
+
+  // Get the user's plan to determine log retention limit
+  const plan = await getCurrentPlan(project.organizationId);
+  const retentionLimitDays = plan?.v3Subscription?.plan?.limits.logRetentionDays.number ?? 30;
+
+  const presenter = new LogsListPresenter($replica, logsClickhouseClient);
+
+  const listPromise = presenter
+    .call(project.organizationId, environment.id, {
+      userId,
+      projectId: project.id,
+      tasks: tasks.length > 0 ? tasks : undefined,
+      runId,
+      search,
+      levels,
+      period,
+      from,
+      to,
+      defaultPeriod: "1h",
+      retentionLimitDays
+    })
+    .catch((error) => {
+      if (error instanceof ServiceValidationError) {
+        return { error: error.message };
+      }
+      throw error;
+    });
+
+  return typeddefer({
+    data: listPromise,
+    defaultPeriod: "1h",
+    retentionLimitDays,
+  });
+};
+
+export default function Page() {
+  const { data, defaultPeriod, retentionLimitDays } =
+    useTypedLoaderData<typeof loader>();
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title="Logs" />
+      </NavBar>
+
+      <PageBody scrollable={false}>
+        <Suspense
+          fallback={
+            <div className="grid h-full max-h-full grid-rows-[2.5rem_auto] overflow-hidden">
+              <div className="border-b border-grid-bright" />
+              <div className="my-2 flex items-center justify-center">
+                <div className="mx-auto flex items-center gap-2">
+                  <Spinner />
+                  <Paragraph variant="small">Loading logs…</Paragraph>
+                </div>
+              </div>
+            </div>
+          }
+        >
+          <TypedAwait
+            resolve={data}
+            errorElement={
+              <div className="grid h-full max-h-full grid-rows-[2.5rem_auto_1fr] overflow-hidden">
+                <FiltersBar
+                  defaultPeriod={defaultPeriod}
+                  retentionLimitDays={retentionLimitDays}
+                />
+                <div className="flex items-center justify-center px-3 py-12">
+                  <Callout variant="error" className="max-w-fit">
+                    Unable to load your logs. Please refresh the page or try again in a moment.
+                  </Callout>
+                </div>
+              </div>
+            }
+          >
+            {(result) => {
+              // Check if result contains an error
+              if ("error" in result) {
+                return (
+                  <div className="grid h-full max-h-full grid-rows-[2.5rem_auto_1fr] overflow-hidden">
+                    <FiltersBar
+                      defaultPeriod={defaultPeriod}
+                      retentionLimitDays={retentionLimitDays}
+                    />
+                    <div className="flex items-center justify-center px-3 py-12">
+                      <Callout variant="error" className="max-w-fit">
+                        {result.error}
+                      </Callout>
+                    </div>
+                  </div>
+                );
+              }
+              return (
+                <div className="grid h-full max-h-full grid-rows-[2.5rem_1fr] overflow-hidden">
+                  <FiltersBar
+                    list={result}
+                    defaultPeriod={defaultPeriod}
+                    retentionLimitDays={retentionLimitDays}
+                  />
+                  <LogsList
+                    list={result}
+                    defaultPeriod={defaultPeriod}
+                  />
+                </div>
+              );
+            }}
+          </TypedAwait>
+        </Suspense>
+      </PageBody>
+    </PageContainer>
+  );
+}
+
+function FiltersBar({
+  list,
+  defaultPeriod,
+  retentionLimitDays,
+}: {
+  list?: Exclude<Awaited<UseDataFunctionReturn<typeof loader>["data"]>, { error: string }>;
+  defaultPeriod?: string;
+  retentionLimitDays: number;
+}) {
+  const location = useOptimisticLocation();
+  const searchParams = new URLSearchParams(location.search);
+  const hasFilters =
+    searchParams.has("tasks") ||
+    searchParams.has("runId") ||
+    searchParams.has("search") ||
+    searchParams.has("levels") ||
+    searchParams.has("period") ||
+    searchParams.has("from") ||
+    searchParams.has("to");
+
+  return (
+    <div className="flex items-start justify-between gap-x-2 border-b border-grid-bright p-2">
+      <div className="flex flex-row flex-wrap items-center gap-1">
+        {list ? (
+          <>
+            <LogsTaskFilter possibleTasks={list.possibleTasks} />
+            <LogsRunIdFilter />
+            <TimeFilter defaultPeriod={defaultPeriod} maxPeriodDays={retentionLimitDays} />
+            <LogsLevelFilter />
+            <LogsSearchInput />
+            {hasFilters && (
+              <Form className="h-6">
+                <Button
+                  variant="secondary/small"
+                  LeadingIcon={XMarkIcon}
+                  tooltip="Clear all filters"
+                />
+              </Form>
+            )}
+          </>
+        ) : (
+          <>
+            <LogsTaskFilter possibleTasks={[]} />
+            <LogsRunIdFilter />
+            <TimeFilter defaultPeriod={defaultPeriod} maxPeriodDays={retentionLimitDays} />
+            <LogsLevelFilter />
+            <LogsSearchInput />
+            {hasFilters && (
+              <Form className="h-6">
+                <Button
+                  variant="secondary/small"
+                  LeadingIcon={XMarkIcon}
+                  tooltip="Clear all filters"
+                />
+              </Form>
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function LogsList({
+  list,
+}: {
+  list: Exclude<Awaited<UseDataFunctionReturn<typeof loader>["data"]>, { error: string }>; //exclude error, it is handled
+  defaultPeriod?: string;
+}) {
+  const navigation = useNavigation();
+  const location = useLocation();
+  const fetcher = useFetcher<{ logs: LogEntry[]; pagination: { next?: string } }>();
+  const [, startTransition] = useTransition();
+  const isLoading = navigation.state !== "idle";
+
+  // Accumulated logs state
+  const [accumulatedLogs, setAccumulatedLogs] = useState<LogEntry[]>(list.logs);
+  const [nextCursor, setNextCursor] = useState<string | undefined>(list.pagination.next);
+
+  // Selected log state - managed locally to avoid triggering navigation
+  const [selectedLogId, setSelectedLogId] = useState<string | undefined>(() => {
+    const params = new URLSearchParams(location.search);
+    return params.get("log") ?? undefined;
+  });
+
+  // Track which filter state (search params) the current fetcher request corresponds to
+  const fetcherFilterStateRef = useRef<string>(location.search);
+  // Track whether the current fetch is a "check for new" request vs "load more"
+  const isCheckingForNewRef = useRef<boolean>(false);
+
+  // Clear accumulated logs immediately when filters change (for instant visual feedback)
+  useEffect(() => {
+    setAccumulatedLogs([]);
+    setNextCursor(undefined);
+    // Preserve log selection from URL param, clear if not present
+    const params = new URLSearchParams(location.search);
+    setSelectedLogId(params.get("log") ?? undefined);
+  }, [location.search]);
+
+  // Populate accumulated logs when new data arrives
+  useEffect(() => {
+    setAccumulatedLogs(list.logs);
+    setNextCursor(list.pagination.next);
+  }, [list.logs, list.pagination.next]);
+
+  // Clear log parameter from URL when selectedLogId is cleared
+  useEffect(() => {
+    if (!selectedLogId) {
+      const url = new URL(window.location.href);
+      if (url.searchParams.has("log")) {
+        url.searchParams.delete("log");
+        window.history.replaceState(null, "", url.toString());
+      }
+    }
+  }, [selectedLogId]);
+
+  // Append/prepend new logs when fetcher completes (with deduplication)
+  useEffect(() => {
+    if (fetcher.data && fetcher.state === "idle") {
+      // Ignore fetcher data if it was loaded for a different filter state
+      if (fetcherFilterStateRef.current !== location.search) {
+        return;
+      }
+
+      if (isCheckingForNewRef.current) {
+        // "Check for new" - prepend new logs, don't update cursor
+        setAccumulatedLogs((prev) => {
+          const existingIds = new Set(prev.map((log) => log.id));
+          const newLogs = fetcher.data!.logs.filter((log) => !existingIds.has(log.id));
+          return newLogs.length > 0 ? [...newLogs, ...prev] : prev;
+        });
+        isCheckingForNewRef.current = false;
+      } else {
+        // "Load more" - append logs and update cursor
+        setAccumulatedLogs((prev) => {
+          const existingIds = new Set(prev.map((log) => log.id));
+          const newLogs = fetcher.data!.logs.filter((log) => !existingIds.has(log.id));
+          return newLogs.length > 0 ? [...prev, ...newLogs] : prev;
+        });
+        setNextCursor(fetcher.data.pagination.next);
+      }
+    }
+  }, [fetcher.data, fetcher.state, location.search]);
+
+  // Build resource URL for loading more
+  const loadMoreUrl = useMemo(() => {
+    if (!nextCursor) return null;
+    const resourcePath = `/resources${location.pathname}`;
+    const params = new URLSearchParams(location.search);
+    params.set("cursor", nextCursor);
+    params.delete("log");
+    return `${resourcePath}?${params.toString()}`;
+  }, [location.pathname, location.search, nextCursor]);
+
+  const handleLoadMore = useCallback(() => {
+    if (loadMoreUrl && fetcher.state === "idle") {
+      // Store the current filter state before loading
+      fetcherFilterStateRef.current = location.search;
+      fetcher.load(loadMoreUrl);
+    }
+  }, [loadMoreUrl, fetcher, location.search]);
+
+  const selectedLog = useMemo(() => {
+    if (!selectedLogId) return undefined;
+    return accumulatedLogs.find((log) => log.id === selectedLogId);
+  }, [selectedLogId, accumulatedLogs]);
+
+  const updateUrlWithLog = useCallback((logId: string | undefined) => {
+    const url = new URL(window.location.href);
+    if (logId) {
+      url.searchParams.set("log", logId);
+    } else {
+      url.searchParams.delete("log");
+    }
+    window.history.replaceState(null, "", url.toString());
+  }, []);
+
+  const handleLogSelect = useCallback(
+    (logId: string) => {
+      startTransition(() => {
+        setSelectedLogId(logId);
+      });
+      updateUrlWithLog(logId);
+    },
+    [updateUrlWithLog, startTransition]
+  );
+
+  const handleClosePanel = useCallback(() => {
+    startTransition(() => {
+      setSelectedLogId(undefined);
+    });
+    updateUrlWithLog(undefined);
+  }, [updateUrlWithLog, startTransition]);
+
+  const handleCheckForMore = useCallback(() => {
+    if (fetcher.state !== "idle") return;
+    // Fetch without cursor to check for new logs
+    const resourcePath = `/resources${location.pathname}`;
+    const params = new URLSearchParams(location.search);
+    params.delete("cursor");
+    params.delete("log");
+    fetcherFilterStateRef.current = location.search;
+    isCheckingForNewRef.current = true;
+    fetcher.load(`${resourcePath}?${params.toString()}`);
+  }, [fetcher, location.pathname, location.search]);
+
+  return (
+    <ResizablePanelGroup orientation="horizontal" className="max-h-full">
+      <ResizablePanel id="logs-main" min="200px">
+        <LogsTable
+          key={location.search}
+          logs={accumulatedLogs}
+          searchTerm={list.searchTerm}
+          isLoading={isLoading}
+          isLoadingMore={fetcher.state === "loading"}
+          hasMore={!!nextCursor}
+          onLoadMore={handleLoadMore}
+          onCheckForMore={handleCheckForMore}
+          selectedLogId={selectedLogId}
+          onLogSelect={handleLogSelect}
+        />
+      </ResizablePanel>
+      {/* Side panel for log details */}
+      {selectedLogId && (
+        <>
+          <ResizableHandle id="logs-handle" />
+          <ResizablePanel id="log-detail" min="300px" default="430px" max="600px" isStaticAtRest>
+            <Suspense
+              fallback={
+                <div className="flex h-full items-center justify-center">
+                  <Spinner />
+                </div>
+              }
+            >
+              <LogDetailView
+                logId={selectedLogId}
+                initialLog={selectedLog}
+                onClose={handleClosePanel}
+                searchTerm={list.searchTerm}
+              />
+            </Suspense>
+          </ResizablePanel>
+        </>
+      )}
+    </ResizablePanelGroup>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.$dashboardKey/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.$dashboardKey/route.tsx
new file mode 100644
index 00000000000..4429e0c06e6
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.$dashboardKey/route.tsx
@@ -0,0 +1,295 @@
+import type { TaskTriggerSource } from "@trigger.dev/database";
+import { $replica } from "~/db.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { getAllTaskIdentifiers } from "~/models/task.server";
+import { requireUser } from "~/services/session.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
+import {
+  type LayoutItem,
+  type Widget,
+  MetricDashboardPresenter,
+} from "~/presenters/v3/MetricDashboardPresenter.server";
+import { type LoaderFunctionArgs } from "@remix-run/node";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { PageBody, PageContainer } from "~/components/layout/AppLayout";
+import { NavBar, PageTitle } from "~/components/primitives/PageHeader";
+import { z } from "zod";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { cn } from "~/utils/cn";
+import ReactGridLayout from "react-grid-layout";
+import { MetricWidget } from "../resources.metric";
+import { TitleWidget } from "~/components/metrics/TitleWidget";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { TimeFilter } from "~/components/runs/v3/SharedFilters";
+import { LogsTaskFilter } from "~/components/logs/LogsTaskFilter";
+import { ScopeFilter } from "~/components/metrics/ScopeFilter";
+import { QueuesFilter } from "~/components/metrics/QueuesFilter";
+import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
+import { useSearchParams } from "~/hooks/useSearchParam";
+import { type WidgetData } from "~/components/metrics/QueryWidget";
+import { QueryScopeSchema } from "~/v3/querySchemas";
+
+const ParamSchema = EnvironmentParamSchema.extend({
+  dashboardKey: z.string(),
+});
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const { projectParam, organizationSlug, envParam, dashboardKey } = ParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
+  if (!project) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Project not found",
+    });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, user.id);
+  if (!environment) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Environment not found",
+    });
+  }
+
+  const presenter = new MetricDashboardPresenter();
+  const [dashboard, possibleTasks] = await Promise.all([
+    presenter.builtInDashboard({
+      organizationId: project.organizationId,
+      key: dashboardKey,
+    }),
+    getAllTaskIdentifiers($replica, environment.id),
+  ]);
+
+  return typedjson({
+    ...dashboard,
+    possibleTasks: possibleTasks
+      .map((task) => ({ slug: task.slug, triggerSource: task.triggerSource }))
+      .sort((a, b) => a.slug.localeCompare(b.slug)),
+  });
+};
+
+export default function Page() {
+  const {
+    key,
+    title,
+    layout: dashboardLayout,
+    defaultPeriod,
+    possibleTasks,
+  } = useTypedLoaderData<typeof loader>();
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title={title} />
+      </NavBar>
+      <PageBody scrollable={false}>
+        <div className="h-full">
+          <MetricDashboard
+            key={key}
+            layout={dashboardLayout.layout}
+            widgets={dashboardLayout.widgets}
+            defaultPeriod={defaultPeriod}
+            editable={false}
+            possibleTasks={possibleTasks}
+          />
+        </div>
+      </PageBody>
+    </PageContainer>
+  );
+}
+
+export function MetricDashboard({
+  layout,
+  widgets,
+  defaultPeriod,
+  editable,
+  possibleTasks,
+  onLayoutChange,
+  onEditWidget,
+  onRenameWidget,
+  onDeleteWidget,
+  onDuplicateWidget,
+}: {
+  /** The layout items (positions/sizes) - fully controlled from parent */
+  layout: LayoutItem[];
+  /** The widget configurations keyed by widget ID - fully controlled from parent */
+  widgets: Record<string, Widget>;
+  defaultPeriod: string;
+  editable: boolean;
+  /** Possible tasks for filtering */
+  possibleTasks?: { slug: string; triggerSource: TaskTriggerSource }[];
+  onLayoutChange?: (layout: LayoutItem[]) => void;
+  onEditWidget?: (widgetId: string, widget: WidgetData) => void;
+  onRenameWidget?: (widgetId: string, newTitle: string) => void;
+  onDeleteWidget?: (widgetId: string) => void;
+  onDuplicateWidget?: (widgetId: string, widget: WidgetData) => void;
+}) {
+  const { value, values } = useSearchParams();
+  const { width, containerRef, mounted } = useContainerWidth();
+  const [resizingItemId, setResizingItemId] = useState<string | null>(null);
+  const [isDragging, setIsDragging] = useState(false);
+  const isInteracting = resizingItemId !== null || isDragging;
+
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  const plan = useCurrentPlan();
+  const maxPeriodDays = plan?.v3Subscription?.plan?.limits?.queryPeriodDays?.number;
+
+  const period = value("period");
+  const from = value("from");
+  const to = value("to");
+  const parsedScope = QueryScopeSchema.safeParse(value("scope") ?? "environment");
+  const scope = parsedScope.success ? parsedScope.data : "environment";
+  const tasks = values("tasks").filter((v) => v !== "");
+  const queues = values("queues").filter((v) => v !== "");
+
+  const handleLayoutChange = useCallback(
+    (newLayout: readonly LayoutItem[]) => {
+      const mutableLayout = [...newLayout];
+      onLayoutChange?.(mutableLayout);
+    },
+    [onLayoutChange]
+  );
+
+  // Apply constraints for title widgets: fixed height of 2, allow horizontal resize only
+  const constrainedLayout = useMemo(
+    () =>
+      layout.map((item) => {
+        const widget = widgets[item.i];
+        if (widget?.display.type === "title") {
+          return { ...item, h: 2, minH: 2, maxH: 2 };
+        }
+        return item;
+      }),
+    [layout, widgets]
+  );
+
+  return (
+    <div className="grid max-h-full grid-rows-[auto_1fr] overflow-hidden">
+      <div className="flex items-center gap-1 border-b border-b-grid-bright py-2 pl-2 pr-3">
+        <ScopeFilter />
+        <LogsTaskFilter possibleTasks={possibleTasks ?? []} />
+        <QueuesFilter />
+        <TimeFilter
+          defaultPeriod={defaultPeriod}
+          labelName="Period"
+          hideLabel
+          maxPeriodDays={maxPeriodDays}
+          valueClassName="text-text-bright"
+        />
+      </div>
+      <div
+        ref={containerRef}
+        className={cn(
+          "overflow-y-auto scrollbar-thin scrollbar-track-charcoal-800 scrollbar-thumb-charcoal-700",
+          isInteracting && "select-none"
+        )}
+      >
+        {mounted && (
+          <ReactGridLayout
+            layout={constrainedLayout}
+            width={width}
+            gridConfig={{ cols: 12, rowHeight: 30 }}
+            resizeConfig={{
+              enabled: editable,
+              handles: ["se"],
+            }}
+            dragConfig={{ enabled: editable, handle: ".drag-handle" }}
+            onLayoutChange={handleLayoutChange}
+            onResizeStart={(_layout, oldItem) => setResizingItemId(oldItem?.i ?? null)}
+            onResizeStop={() => setResizingItemId(null)}
+            onDragStart={() => setIsDragging(true)}
+            onDragStop={() => setIsDragging(false)}
+          >
+            {Object.entries(widgets).map(([key, widget]) => (
+              <div key={key}>
+                {widget.display.type === "title" ? (
+                  <TitleWidget
+                    title={widget.title}
+                    isDraggable={editable}
+                    isResizing={resizingItemId === key}
+                    onRename={
+                      onRenameWidget ? (newTitle) => onRenameWidget(key, newTitle) : undefined
+                    }
+                    onDelete={onDeleteWidget ? () => onDeleteWidget(key) : undefined}
+                  />
+                ) : (
+                  <MetricWidget
+                    widgetKey={key}
+                    title={widget.title}
+                    query={widget.query}
+                    scope={scope}
+                    period={period ?? defaultPeriod}
+                    from={from ?? null}
+                    to={to ?? null}
+                    taskIdentifiers={tasks.length > 0 ? tasks : undefined}
+                    queues={queues.length > 0 ? queues : undefined}
+                    config={widget.display}
+                    organizationId={organization.id}
+                    projectId={project.id}
+                    environmentId={environment.id}
+                    refreshIntervalMs={60_000}
+                    isResizing={resizingItemId === key}
+                    isDraggable={editable}
+                    onEdit={
+                      onEditWidget
+                        ? (resultData) => onEditWidget(key, { ...widget, resultData })
+                        : undefined
+                    }
+                    onRename={
+                      onRenameWidget ? (newTitle) => onRenameWidget(key, newTitle) : undefined
+                    }
+                    onDelete={onDeleteWidget ? () => onDeleteWidget(key) : undefined}
+                    onDuplicate={
+                      onDuplicateWidget
+                        ? (resultData) => onDuplicateWidget(key, { ...widget, resultData })
+                        : undefined
+                    }
+                  />
+                )}
+              </div>
+            ))}
+          </ReactGridLayout>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function useContainerWidth(initialWidth = 1280) {
+  const containerRef = useRef<HTMLDivElement>(null);
+  const [width, setWidth] = useState(initialWidth);
+  const [mounted, setMounted] = useState(false);
+
+  const measureWidth = useCallback(() => {
+    if (containerRef.current) {
+      setWidth(containerRef.current.offsetWidth);
+    }
+  }, []);
+
+  useEffect(() => {
+    measureWidth();
+    setMounted(true);
+
+    const element = containerRef.current;
+    if (!element) return;
+
+    const resizeObserver = new ResizeObserver((entries) => {
+      for (const entry of entries) {
+        setWidth(entry.contentRect.width);
+      }
+    });
+
+    resizeObserver.observe(element);
+    return () => resizeObserver.disconnect();
+  }, [measureWidth]);
+
+  return { width, containerRef, mounted };
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.custom.$dashboardId/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.custom.$dashboardId/route.tsx
new file mode 100644
index 00000000000..ce32bec0aa7
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.custom.$dashboardId/route.tsx
@@ -0,0 +1,772 @@
+import { ArrowUpCircleIcon, PlusIcon, TrashIcon } from "@heroicons/react/20/solid";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/node";
+import { Form, useNavigation } from "@remix-run/react";
+import { IconChartHistogram, IconEdit, IconTypography } from "@tabler/icons-react";
+import { useCallback, useEffect, useState } from "react";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { toast } from "sonner";
+import { z } from "zod";
+import { defaultChartConfig } from "~/components/code/ChartConfigPanel";
+import { Feedback } from "~/components/Feedback";
+import { MainCenteredContainer, PageBody, PageContainer } from "~/components/layout/AppLayout";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTrigger,
+} from "~/components/primitives/Dialog";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { Header3 } from "~/components/primitives/Headers";
+import { InfoPanel } from "~/components/primitives/InfoPanel";
+import { Input } from "~/components/primitives/Input";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { Label } from "~/components/primitives/Label";
+import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import {
+  Popover,
+  PopoverContent,
+  PopoverVerticalEllipseTrigger,
+} from "~/components/primitives/Popover";
+import { Sheet, SheetContent } from "~/components/primitives/SheetV3";
+import { ToastUI } from "~/components/primitives/Toast";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
+import { QueryEditor, type QueryEditorSaveData } from "~/components/query/QueryEditor";
+import { $replica, prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { useDashboardEditor } from "~/hooks/useDashboardEditor";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization, useWidgetLimitPerDashboard } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { redirectWithSuccessMessage } from "~/models/message.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { getAllTaskIdentifiers } from "~/models/task.server";
+import { MetricDashboardPresenter } from "~/presenters/v3/MetricDashboardPresenter.server";
+import { QueryPresenter } from "~/presenters/v3/QueryPresenter.server";
+import { requireUser, requireUserId } from "~/services/session.server";
+import {
+  EnvironmentParamSchema,
+  queryPath,
+  v3BillingPath,
+  v3BuiltInDashboardPath,
+} from "~/utils/pathBuilder";
+import { MetricDashboard } from "../_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.metrics.$dashboardKey/route";
+import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
+import { Type } from "lucide-react";
+
+const ParamSchema = EnvironmentParamSchema.extend({
+  dashboardId: z.string(),
+});
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const { projectParam, organizationSlug, envParam, dashboardId } = ParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
+  if (!project) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Project not found",
+    });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, user.id);
+  if (!environment) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Environment not found",
+    });
+  }
+
+  const dashboardPresenter = new MetricDashboardPresenter();
+  const queryPresenter = new QueryPresenter();
+
+  const [dashboard, { defaultQuery, history }, possibleTasks] = await Promise.all([
+    dashboardPresenter.customDashboard({
+      friendlyId: dashboardId,
+      organizationId: project.organizationId,
+    }),
+    queryPresenter.call({
+      organizationId: project.organizationId,
+    }),
+    getAllTaskIdentifiers($replica, environment.id),
+  ]);
+
+  // Admins and impersonating users can use EXPLAIN
+  const isAdmin = user.admin || user.isImpersonating;
+
+  // Compute widget count from dashboard layout
+  const widgetCount = Object.keys(dashboard.layout.widgets).length;
+
+  return typedjson({
+    ...dashboard,
+    // Query editor data
+    queryDefaultQuery: defaultQuery,
+    queryHistory: history,
+    isAdmin,
+    maxRows: env.QUERY_CLICKHOUSE_MAX_RETURNED_ROWS,
+    possibleTasks: possibleTasks
+      .map((task) => ({ slug: task.slug, triggerSource: task.triggerSource }))
+      .sort((a, b) => a.slug.localeCompare(b.slug)),
+    widgetCount,
+  });
+};
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { projectParam, organizationSlug, envParam, dashboardId } = ParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  // Load the dashboard
+  const dashboard = await prisma.metricsDashboard.findFirst({
+    where: {
+      friendlyId: dashboardId,
+      organizationId: project.organizationId,
+    },
+  });
+
+  if (!dashboard) {
+    throw new Response("Dashboard not found", { status: 404 });
+  }
+
+  const formData = await request.formData();
+  const action = formData.get("action");
+
+  switch (action) {
+    case "delete": {
+      await prisma.metricsDashboard.delete({
+        where: { id: dashboard.id },
+      });
+
+      return redirectWithSuccessMessage(
+        v3BuiltInDashboardPath(
+          { slug: organizationSlug },
+          { slug: projectParam },
+          { slug: envParam },
+          "overview"
+        ),
+        request,
+        `Deleted "${dashboard.title}" dashboard`
+      );
+    }
+    case "rename": {
+      const newTitle = formData.get("title");
+      if (typeof newTitle !== "string" || newTitle.trim().length === 0) {
+        throw new Response("Title is required", { status: 400 });
+      }
+
+      await prisma.metricsDashboard.update({
+        where: { id: dashboard.id },
+        data: { title: newTitle.trim() },
+      });
+
+      return typedjson({ success: true });
+    }
+    default: {
+      throw new Response("Invalid action", { status: 400 });
+    }
+  }
+};
+
+export default function Page() {
+  const {
+    friendlyId,
+    title,
+    layout: dashboardLayout,
+    defaultPeriod,
+    queryDefaultQuery,
+    queryHistory,
+    isAdmin,
+    maxRows,
+    possibleTasks,
+    widgetCount: initialWidgetCount,
+  } = useTypedLoaderData<typeof loader>();
+
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+  const plan = useCurrentPlan();
+  const maxPeriodDays = plan?.v3Subscription?.plan?.limits?.queryPeriodDays?.number;
+
+  // Widget limits
+  const widgetLimitPerDashboard = useWidgetLimitPerDashboard();
+  const planLimits = (plan?.v3Subscription?.plan?.limits as any)?.metricWidgetsPerDashboard;
+  const canExceedWidgets = typeof planLimits === "object" && planLimits.canExceed === true;
+
+  // Build the action URLs - both use the resource route to avoid full page renders on POST
+  const widgetActionUrl = `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/dashboards/${friendlyId}/widgets`;
+  const layoutActionUrl = widgetActionUrl;
+
+  // Handle sync errors by showing a toast
+  const handleSyncError = useCallback((error: Error, action: string) => {
+    const actionMessages: Record<string, string> = {
+      add: "Failed to add widget",
+      update: "Failed to update widget",
+      delete: "Failed to delete widget",
+      duplicate: "Failed to duplicate widget",
+      layout: "Failed to save layout",
+    };
+
+    const message = actionMessages[action] || "Failed to save changes";
+
+    toast.custom((t) => (
+      <ToastUI
+        variant="error"
+        message={`${message}. Your changes may not be saved.`}
+        t={t as string}
+        title="Sync Error"
+      />
+    ));
+  }, []);
+
+  // Add title dialog state
+  const [showAddTitleDialog, setShowAddTitleDialog] = useState(false);
+  const [newTitleValue, setNewTitleValue] = useState("");
+
+  // Widget limit dialog state (triggered when hook blocks add/duplicate)
+  const [showWidgetLimitDialog, setShowWidgetLimitDialog] = useState(false);
+
+  const handleWidgetLimitReached = useCallback(() => {
+    setShowWidgetLimitDialog(true);
+  }, []);
+
+  // Use the dashboard editor hook for all state management
+  const { state, actions } = useDashboardEditor({
+    initialData: dashboardLayout,
+    widgetActionUrl,
+    layoutActionUrl,
+    widgetLimit: canExceedWidgets ? undefined : widgetLimitPerDashboard,
+    onSyncError: handleSyncError,
+    onWidgetLimitReached: handleWidgetLimitReached,
+  });
+
+  // Reactive widget count from editor state (title widgets don't count against limits)
+  const currentWidgetCount = Object.values(state.widgets).filter(
+    (w) => w.display.type !== "title"
+  ).length;
+  const totalWidgetCount = Object.keys(state.widgets).length;
+  const widgetLimits = { used: currentWidgetCount, limit: widgetLimitPerDashboard };
+  const widgetIsAtLimit = currentWidgetCount >= widgetLimitPerDashboard;
+  const widgetLimitRatio =
+    widgetLimits.limit > 0 ? widgetLimits.used / widgetLimits.limit : widgetLimits.used > 0 ? 1 : 0;
+  const widgetLimitPercent = Math.min(100, Math.max(0, Math.round(widgetLimitRatio * 100)));
+  const widgetCanUpgrade = plan?.v3Subscription?.plan && !canExceedWidgets;
+
+  // Build the query action URL for the editor
+  const queryActionUrl = queryPath(
+    { slug: organization.slug },
+    { slug: project.slug },
+    { slug: environment.slug }
+  );
+
+  // Handle save from the QueryEditor
+  const handleSave = useCallback(
+    (data: QueryEditorSaveData) => {
+      if (state.editorMode?.type === "add") {
+        actions.addWidget(data.title, data.query, data.config);
+      } else if (state.editorMode?.type === "edit") {
+        actions.updateWidget(state.editorMode.widgetId, data.title, data.query, data.config);
+      }
+    },
+    [state.editorMode, actions]
+  );
+
+  // Render save button for the QueryEditor
+  const renderSaveForm = useCallback(
+    (data: QueryEditorSaveData) => {
+      const isAdd = state.editorMode?.type === "add";
+
+      return (
+        <Button
+          type="button"
+          variant="primary/small"
+          disabled={!data.query}
+          onClick={() => handleSave(data)}
+        >
+          {isAdd ? "Add to dashboard" : "Save changes"}
+        </Button>
+      );
+    },
+    [state.editorMode, handleSave]
+  );
+
+  // Prepare editor props when in editor mode
+  const editorProps = state.editorMode
+    ? (() => {
+        const mode =
+          state.editorMode.type === "add"
+            ? { type: "dashboard-add" as const, dashboardId: friendlyId, dashboardName: title }
+            : {
+                type: "dashboard-edit" as const,
+                dashboardId: friendlyId,
+                dashboardName: title,
+                widgetId: state.editorMode.widgetId,
+                widgetName: state.editorMode.widget.title,
+              };
+
+        // For edit mode, use the widget's existing values as defaults
+        const editorDefaultQuery =
+          state.editorMode.type === "edit" ? state.editorMode.widget.query : queryDefaultQuery;
+        const editorDefaultChartConfig =
+          state.editorMode.type === "edit" && state.editorMode.widget.display.type === "chart"
+            ? {
+                chartType: state.editorMode.widget.display.chartType,
+                xAxisColumn: state.editorMode.widget.display.xAxisColumn,
+                yAxisColumns: state.editorMode.widget.display.yAxisColumns,
+                groupByColumn: state.editorMode.widget.display.groupByColumn,
+                stacked: state.editorMode.widget.display.stacked,
+                sortByColumn: state.editorMode.widget.display.sortByColumn,
+                sortDirection: state.editorMode.widget.display.sortDirection,
+                aggregation: state.editorMode.widget.display.aggregation,
+                seriesColors: state.editorMode.widget.display.seriesColors,
+              }
+            : defaultChartConfig;
+        const editorDefaultBigNumberConfig =
+          state.editorMode.type === "edit" && state.editorMode.widget.display.type === "bignumber"
+            ? {
+                column: state.editorMode.widget.display.column,
+                aggregation: state.editorMode.widget.display.aggregation,
+                sortDirection: state.editorMode.widget.display.sortDirection,
+                abbreviate: state.editorMode.widget.display.abbreviate,
+                prefix: state.editorMode.widget.display.prefix,
+                suffix: state.editorMode.widget.display.suffix,
+              }
+            : undefined;
+        const editorDefaultResultsView =
+          state.editorMode.type === "edit" ? state.editorMode.widget.display.type : "table";
+        // Pass the existing result data when editing
+        const editorDefaultData =
+          state.editorMode.type === "edit" ? state.editorMode.widget.resultData : undefined;
+
+        return {
+          mode,
+          editorDefaultQuery,
+          editorDefaultChartConfig,
+          editorDefaultBigNumberConfig,
+          editorDefaultResultsView,
+          editorDefaultData,
+        };
+      })()
+    : null;
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title={title} />
+        <PageAccessories>
+          {totalWidgetCount > 0 &&
+            (widgetIsAtLimit ? (
+              <>
+                <Dialog>
+                  <DialogTrigger asChild>
+                    <Button variant="primary/small" LeadingIcon={PlusIcon}>
+                      Add chart
+                    </Button>
+                  </DialogTrigger>
+                  <DialogContent>
+                    <DialogHeader>You've exceeded your widget limit</DialogHeader>
+                    <DialogDescription>
+                      You've used {widgetLimits.used}/{widgetLimits.limit} widgets on this
+                      dashboard.
+                    </DialogDescription>
+                    <DialogFooter>
+                      {widgetCanUpgrade ? (
+                        <LinkButton variant="primary/small" to={v3BillingPath(organization)}>
+                          Upgrade
+                        </LinkButton>
+                      ) : (
+                        <Feedback
+                          button={<Button variant="primary/small">Request more</Button>}
+                          defaultValue="help"
+                        />
+                      )}
+                    </DialogFooter>
+                  </DialogContent>
+                </Dialog>
+                <Button
+                  variant="secondary/small"
+                  LeadingIcon={Type}
+                  className="pl-1.5"
+                  iconSpacing="gap-x-1"
+                  onClick={() => {
+                    setNewTitleValue("");
+                    setShowAddTitleDialog(true);
+                  }}
+                >
+                  Add title
+                </Button>
+              </>
+            ) : (
+              <>
+                <Button
+                  variant="primary/small"
+                  LeadingIcon={IconChartHistogram}
+                  className="pl-1.5"
+                  iconSpacing="gap-x-1.5"
+                  onClick={actions.openAddEditor}
+                >
+                  Add chart
+                </Button>
+                <Button
+                  variant="secondary/small"
+                  LeadingIcon={Type}
+                  className="pl-1.5"
+                  iconSpacing="gap-x-1"
+                  onClick={() => {
+                    setNewTitleValue("");
+                    setShowAddTitleDialog(true);
+                  }}
+                >
+                  Add title
+                </Button>
+              </>
+            ))}
+          <Popover>
+            <PopoverVerticalEllipseTrigger variant="secondary" />
+            <PopoverContent className="w-fit min-w-[10rem] p-1" align="end">
+              <div className="flex flex-col gap-1">
+                <RenameDashboardDialog title={title} />
+                <DeleteDashboardDialog title={title} />
+              </div>
+            </PopoverContent>
+          </Popover>
+        </PageAccessories>
+      </NavBar>
+      <PageBody scrollable={false}>
+        <div className="flex h-full flex-col">
+          <div className="min-h-0 flex-1">
+            {totalWidgetCount === 0 ? (
+              <MainCenteredContainer className="max-w-md">
+                <InfoPanel
+                  icon={IconChartHistogram}
+                  iconClassName="text-metrics"
+                  panelClassName="max-full"
+                  title="Add your first chart"
+                  accessory={
+                    <Button
+                      variant="primary/small"
+                      LeadingIcon={PlusIcon}
+                      onClick={actions.openAddEditor}
+                    >
+                      Add chart
+                    </Button>
+                  }
+                >
+                  <Paragraph variant="small">
+                    Charts let you visualize your task metrics. Write a query to pull data from your
+                    runs, then choose how to display it on this dashboard.
+                  </Paragraph>
+                </InfoPanel>
+              </MainCenteredContainer>
+            ) : (
+              <MetricDashboard
+                key={friendlyId}
+                layout={state.layout}
+                widgets={state.widgets}
+                defaultPeriod={defaultPeriod}
+                editable={true}
+                possibleTasks={possibleTasks}
+                onLayoutChange={actions.updateLayout}
+                onEditWidget={actions.openEditEditor}
+                onRenameWidget={actions.renameWidget}
+                onDeleteWidget={actions.deleteWidget}
+                onDuplicateWidget={actions.duplicateWidget}
+              />
+            )}
+          </div>
+          <div className="flex w-full items-start justify-between">
+            <div className="flex h-fit w-full items-center gap-4 border-t border-grid-bright bg-background-bright p-[0.86rem] pl-4">
+              <SimpleTooltip
+                button={
+                  <div className="size-6">
+                    <svg className="h-full w-full -rotate-90 overflow-visible">
+                      <circle
+                        className="fill-none stroke-grid-bright"
+                        strokeWidth="4"
+                        r="10"
+                        cx="12"
+                        cy="12"
+                      />
+                      <circle
+                        className={`fill-none ${
+                          widgetIsAtLimit ? "stroke-error" : "stroke-success"
+                        }`}
+                        strokeWidth="4"
+                        r="10"
+                        cx="12"
+                        cy="12"
+                        strokeDasharray={`${widgetLimitRatio * 62.8} 62.8`}
+                        strokeDashoffset="0"
+                        strokeLinecap="round"
+                      />
+                    </svg>
+                  </div>
+                }
+                content={`${widgetLimitPercent}%`}
+              />
+              <div className="flex w-full items-center justify-between gap-6">
+                {widgetIsAtLimit ? (
+                  <Header3 className="text-error">
+                    You've used all {widgetLimits.limit} of your available widgets. Upgrade your
+                    plan to enable more.
+                  </Header3>
+                ) : (
+                  <Header3>
+                    You've used {widgetLimits.used}/{widgetLimits.limit} of your charts
+                  </Header3>
+                )}
+                {widgetCanUpgrade ? (
+                  <LinkButton
+                    to={v3BillingPath(organization)}
+                    variant="secondary/small"
+                    LeadingIcon={ArrowUpCircleIcon}
+                    leadingIconClassName="text-indigo-500"
+                  >
+                    Upgrade
+                  </LinkButton>
+                ) : (
+                  <Feedback
+                    button={<Button variant="secondary/small">Request more…</Button>}
+                    defaultValue="help"
+                  />
+                )}
+              </div>
+            </div>
+          </div>
+        </div>
+      </PageBody>
+
+      {/* Query Editor Sheet - opens on top of the dashboard */}
+      <Sheet open={!!state.editorMode} onOpenChange={(open) => !open && actions.closeEditor()}>
+        <SheetContent
+          side="right"
+          className="w-[90vw] max-w-none rounded-l-lg border-l border-grid-dimmed p-0 sm:max-w-none"
+        >
+          {editorProps && (
+            <QueryEditor
+              defaultQuery={editorProps.editorDefaultQuery}
+              defaultScope="environment"
+              defaultPeriod={defaultPeriod}
+              defaultResultsView={
+                editorProps.editorDefaultResultsView === "chart"
+                  ? "graph"
+                  : editorProps.editorDefaultResultsView === "bignumber"
+                  ? "bignumber"
+                  : "table"
+              }
+              defaultChartConfig={editorProps.editorDefaultChartConfig}
+              defaultBigNumberConfig={editorProps.editorDefaultBigNumberConfig}
+              defaultData={editorProps.editorDefaultData}
+              history={queryHistory}
+              isAdmin={isAdmin}
+              maxRows={maxRows}
+              queryActionUrl={queryActionUrl}
+              mode={editorProps.mode}
+              maxPeriodDays={maxPeriodDays}
+              save={renderSaveForm}
+              onClose={actions.closeEditor}
+            />
+          )}
+        </SheetContent>
+      </Sheet>
+
+      {/* Add title dialog */}
+      <Dialog open={showAddTitleDialog} onOpenChange={setShowAddTitleDialog}>
+        <DialogContent className="sm:max-w-md">
+          <DialogHeader>Add title</DialogHeader>
+          <form
+            className="space-y-4 pt-3"
+            onSubmit={(e) => {
+              e.preventDefault();
+              if (newTitleValue.trim()) {
+                actions.addTitleWidget(newTitleValue.trim());
+                setShowAddTitleDialog(false);
+              }
+            }}
+          >
+            <InputGroup>
+              <Label>Title</Label>
+              <Input
+                value={newTitleValue}
+                onChange={(e) => setNewTitleValue(e.target.value)}
+                placeholder="Section title"
+                autoFocus
+              />
+            </InputGroup>
+            <DialogFooter>
+              <DialogClose asChild>
+                <Button variant="tertiary/medium">Cancel</Button>
+              </DialogClose>
+              <Button type="submit" variant="primary/medium" disabled={!newTitleValue.trim()}>
+                Add
+              </Button>
+            </DialogFooter>
+          </form>
+        </DialogContent>
+      </Dialog>
+
+      {/* Widget limit dialog - triggered by hook when add/duplicate is blocked */}
+      <Dialog open={showWidgetLimitDialog} onOpenChange={setShowWidgetLimitDialog}>
+        <DialogContent>
+          <DialogHeader>You've exceeded your widget limit</DialogHeader>
+          <DialogDescription>
+            You've used {widgetLimits.used}/{widgetLimits.limit} widgets on this dashboard.
+          </DialogDescription>
+          <DialogFooter>
+            {widgetCanUpgrade ? (
+              <LinkButton variant="primary/small" to={v3BillingPath(organization)}>
+                Upgrade
+              </LinkButton>
+            ) : (
+              <Feedback
+                button={<Button variant="primary/small">Request more</Button>}
+                defaultValue="help"
+              />
+            )}
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </PageContainer>
+  );
+}
+
+function RenameDashboardDialog({ title }: { title: string }) {
+  const navigation = useNavigation();
+  const [isOpen, setIsOpen] = useState(false);
+  const [newTitle, setNewTitle] = useState(title);
+
+  const isRenaming =
+    navigation.state !== "idle" &&
+    navigation.formMethod === "post" &&
+    navigation.formData?.get("action") === "rename";
+
+  // Close dialog when navigation completes
+  useEffect(() => {
+    if (navigation.state === "idle") {
+      setIsOpen(false);
+    }
+  }, [navigation.state]);
+
+  // Sync newTitle state when title changes (after successful rename)
+  useEffect(() => {
+    setNewTitle(title);
+  }, [title]);
+
+  return (
+    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+      <DialogTrigger asChild>
+        <Button
+          variant="small-menu-item"
+          LeadingIcon={IconEdit}
+          fullWidth
+          textAlignLeft
+          className="pl-0.5 pr-3"
+          leadingIconClassName="gap-x-0"
+        >
+          Rename dashboard
+        </Button>
+      </DialogTrigger>
+      <DialogContent className="sm:max-w-sm">
+        <DialogHeader>Rename dashboard</DialogHeader>
+        <Form method="post" className="space-y-4">
+          <input type="hidden" name="action" value="rename" />
+          <InputGroup>
+            <Label>Title</Label>
+            <Input
+              name="title"
+              value={newTitle}
+              onChange={(e) => setNewTitle(e.target.value)}
+              placeholder="Dashboard title"
+              required
+              autoFocus
+            />
+          </InputGroup>
+          <FormButtons
+            confirmButton={
+              <Button
+                type="submit"
+                variant="primary/medium"
+                disabled={isRenaming || !newTitle.trim()}
+              >
+                {isRenaming ? "Saving…" : "Save"}
+              </Button>
+            }
+            cancelButton={
+              <DialogClose asChild>
+                <Button variant="tertiary/medium">Cancel</Button>
+              </DialogClose>
+            }
+          />
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+function DeleteDashboardDialog({ title }: { title: string }) {
+  const navigation = useNavigation();
+  const [isOpen, setIsOpen] = useState(false);
+
+  const isDeleting =
+    navigation.state !== "idle" &&
+    navigation.formMethod === "post" &&
+    navigation.formData?.get("action") === "delete";
+
+  // Close dialog when navigation completes
+  useEffect(() => {
+    if (navigation.state === "idle") {
+      setIsOpen(false);
+    }
+  }, [navigation.state]);
+
+  return (
+    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+      <DialogTrigger asChild>
+        <Button
+          variant="small-menu-item"
+          LeadingIcon={TrashIcon}
+          leadingIconClassName="text-rose-500"
+          fullWidth
+          textAlignLeft
+        >
+          Delete dashboard
+        </Button>
+      </DialogTrigger>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>Delete dashboard</DialogHeader>
+        <div className="mb-2 mt-4 flex flex-col gap-2">
+          <Paragraph>
+            Are you sure you want to delete <strong>"{title}"</strong>? This action cannot be undone
+            and all widgets on this dashboard will be permanently removed.
+          </Paragraph>
+        </div>
+        <DialogFooter>
+          <DialogClose asChild>
+            <Button variant="secondary/medium">Cancel</Button>
+          </DialogClose>
+          <Form method="post">
+            <Button
+              type="submit"
+              name="action"
+              value="delete"
+              variant="danger/medium"
+              LeadingIcon={TrashIcon}
+              disabled={isDeleting}
+            >
+              {isDeleting ? "Deleting…" : "Delete"}
+            </Button>
+          </Form>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/AITabContent.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/AITabContent.tsx
new file mode 100644
index 00000000000..98e4002e718
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/AITabContent.tsx
@@ -0,0 +1,72 @@
+import { useState } from "react";
+import { SparkleListIcon } from "~/assets/icons/SparkleListIcon";
+import { AIQueryInput } from "~/components/code/AIQueryInput";
+import { Header3 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import type { AITimeFilter } from "./types";
+
+export function AITabContent({
+  onQueryGenerated,
+  onTimeFilterChange,
+  getCurrentQuery,
+  aiFixRequest,
+}: {
+  onQueryGenerated: (query: string) => void;
+  onTimeFilterChange?: (filter: AITimeFilter) => void;
+  getCurrentQuery: () => string;
+  aiFixRequest: { prompt: string; key: number } | null;
+}) {
+  const [examplePromptRequest, setExamplePromptRequest] = useState<{
+    prompt: string;
+    key: number;
+  } | null>(null);
+
+  // Use aiFixRequest if present, otherwise use example prompt request
+  const activeRequest = aiFixRequest ?? examplePromptRequest;
+
+  const examplePrompts = [
+    "Show me failed runs by hour for the past 7 days",
+    "Count of runs by status by hour for the past 48h",
+    "Top 50 most expensive runs this week",
+    "Average execution duration by task this week",
+    "Run counts by tag in the past 7 days",
+    "CPU utilization over time by task",
+    "Peak memory usage per run",
+  ];
+
+  return (
+    <div className="space-y-2">
+      <AIQueryInput
+        onQueryGenerated={onQueryGenerated}
+        onTimeFilterChange={onTimeFilterChange}
+        autoSubmitPrompt={activeRequest?.prompt}
+        autoSubmitKey={activeRequest?.key}
+        getCurrentQuery={getCurrentQuery}
+      />
+
+      <div className="pt-4">
+        <Header3 className="mb-3 text-text-bright">Example prompts</Header3>
+        <div className="flex flex-wrap gap-2">
+          {examplePrompts.map((example) => (
+            <button
+              key={example}
+              type="button"
+              onClick={() => {
+                setExamplePromptRequest((prev) => ({
+                  prompt: example,
+                  key: (prev?.key ?? 0) + 1,
+                }));
+              }}
+              className="group flex w-fit items-center gap-2 rounded-full border border-dashed border-charcoal-600 px-4 py-2 transition-colors hover:border-solid hover:border-indigo-500 focus-custom focus-visible:!rounded-full"
+            >
+              <SparkleListIcon className="size-4 shrink-0 text-text-dimmed transition group-hover:text-indigo-500" />
+              <Paragraph variant="small" className="text-left transition group-hover:text-text-bright">
+                {example}
+              </Paragraph>
+            </button>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/ExamplesContent.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/ExamplesContent.tsx
new file mode 100644
index 00000000000..4d027223f14
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/ExamplesContent.tsx
@@ -0,0 +1,159 @@
+import { useState } from "react";
+import { Header3 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import SegmentedControl from "~/components/primitives/SegmentedControl";
+import type { QueryScope } from "~/services/queryService.server";
+import { querySchemas } from "~/v3/querySchemas";
+import { TryableCodeBlock } from "./TRQLGuideContent";
+
+// Example queries for the Examples tab
+export const exampleQueries: Array<{
+  title: string;
+  description: string;
+  query: string;
+  scope: QueryScope;
+  table: string;
+}> = [
+  {
+    title: "Failed runs by task (past 7 days)",
+    description: "Count of failed runs grouped by task identifier over the last 7 days.",
+    query: `SELECT
+  task_identifier,
+  count() AS failed_count
+FROM runs
+WHERE status = 'Failed'
+  AND triggered_at > now() - INTERVAL 7 DAY
+GROUP BY task_identifier
+ORDER BY failed_count DESC
+LIMIT 20`,
+    scope: "environment",
+    table: "runs",
+  },
+  {
+    title: "Execution duration p50 by task (past 7d)",
+    description: "Median (50th percentile) execution duration for each task.",
+    query: `SELECT
+  task_identifier,
+  quantile(0.5)(execution_duration) AS p50_duration_ms
+FROM runs
+WHERE triggered_at > now() - INTERVAL 7 DAY
+  AND execution_duration IS NOT NULL
+GROUP BY task_identifier
+ORDER BY p50_duration_ms DESC
+LIMIT 20`,
+    scope: "environment",
+    table: "runs",
+  },
+  {
+    title: "Runs over time",
+    description:
+      "Count of runs bucketed over time. The bucket size adjusts automatically to the time range.",
+    query: `SELECT
+  timeBucket(),
+  count() AS run_count
+FROM runs
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000`,
+    scope: "environment",
+    table: "runs",
+  },
+  {
+    title: "Most expensive 100 runs (past 7d)",
+    description: "Top 100 runs by cost over the last 7 days.",
+    query: `SELECT
+  run_id,
+  task_identifier,
+  status,
+  total_cost,
+  usage_duration,
+  machine,
+  triggered_at
+FROM runs
+WHERE triggered_at > now() - INTERVAL 7 DAY
+ORDER BY total_cost DESC
+LIMIT 100`,
+    scope: "environment",
+    table: "runs",
+  },
+  {
+    title: "CPU utilization over time",
+    description: "Track process CPU utilization bucketed over time.",
+    query: `SELECT
+  timeBucket(),
+  avg(metric_value) AS avg_cpu
+FROM metrics
+WHERE metric_name = 'process.cpu.utilization'
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000`,
+    scope: "environment",
+    table: "metrics",
+  },
+  {
+    title: "Memory usage by task (past 7d)",
+    description: "Average memory usage per task identifier over the last 7 days.",
+    query: `SELECT
+  task_identifier,
+  avg(metric_value) AS avg_memory
+FROM metrics
+WHERE metric_name = 'system.memory.usage'
+  AND bucket_start > now() - INTERVAL 7 DAY
+GROUP BY task_identifier
+ORDER BY avg_memory DESC
+LIMIT 20`,
+    scope: "environment",
+    table: "metrics",
+  },
+  {
+    title: "Available metric names",
+    description: "List all distinct metric names collected in your environment.",
+    query: `SELECT
+  metric_name,
+  count() AS sample_count
+FROM metrics
+GROUP BY metric_name
+ORDER BY sample_count DESC
+LIMIT 100`,
+    scope: "environment",
+    table: "metrics",
+  },
+];
+
+const tableOptions = querySchemas.map((s) => ({ label: s.name, value: s.name }));
+
+export function ExamplesContent({
+  onTryExample,
+}: {
+  onTryExample: (query: string, scope: QueryScope) => void;
+}) {
+  const [selectedTable, setSelectedTable] = useState(querySchemas[0].name);
+  const filtered = exampleQueries.filter((e) => e.table === selectedTable);
+
+  return (
+    <div className="space-y-6">
+      <div className="sticky top-0 z-10 bg-background-bright pb-3">
+        <SegmentedControl
+          name="examples-table-selector"
+          value={selectedTable}
+          options={tableOptions}
+          variant="secondary/small"
+          fullWidth
+          onChange={setSelectedTable}
+        />
+      </div>
+      {filtered.map((example) => (
+        <div key={example.title}>
+          <Header3 className="mb-1 text-text-bright">{example.title}</Header3>
+          <Paragraph variant="small" className="mb-2 text-text-dimmed">
+            {example.description}
+          </Paragraph>
+          <TryableCodeBlock
+            code={example.query}
+            onTry={() => onTryExample(example.query, example.scope)}
+          />
+        </div>
+      ))}
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHelpSidebar.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHelpSidebar.tsx
new file mode 100644
index 00000000000..daa7187acf2
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHelpSidebar.tsx
@@ -0,0 +1,117 @@
+import { AISparkleIcon } from "~/assets/icons/AISparkleIcon";
+import {
+  ClientTabs,
+  ClientTabsContent,
+  ClientTabsList,
+  ClientTabsTrigger,
+} from "~/components/primitives/ClientTabs";
+import type { QueryScope } from "~/services/queryService.server";
+import { AITabContent } from "./AITabContent";
+import { ExamplesContent } from "./ExamplesContent";
+import { TableSchemaContent } from "./TableSchemaContent";
+import { TRQLGuideContent } from "./TRQLGuideContent";
+import type { AITimeFilter } from "./types";
+
+export function QueryHelpSidebar({
+  onTryExample,
+  onQueryGenerated,
+  onTimeFilterChange,
+  getCurrentQuery,
+  activeTab,
+  onTabChange,
+  aiFixRequest,
+}: {
+  onTryExample: (query: string, scope: QueryScope) => void;
+  onQueryGenerated: (query: string) => void;
+  onTimeFilterChange?: (filter: AITimeFilter) => void;
+  getCurrentQuery: () => string;
+  activeTab: string;
+  onTabChange: (tab: string) => void;
+  aiFixRequest: { prompt: string; key: number } | null;
+}) {
+  return (
+    <div className="grid h-full max-h-full grid-rows-[auto_1fr] overflow-hidden bg-background-bright">
+      <ClientTabs
+        value={activeTab}
+        onValueChange={onTabChange}
+        className="flex min-h-0 flex-col overflow-hidden pt-1"
+      >
+        <div className="h-fit overflow-x-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
+          <ClientTabsList variant="underline" className="mx-3 shrink-0">
+            <ClientTabsTrigger
+              value="ai"
+              variant="underline"
+              layoutId="query-help-tabs"
+              className="shrink-0"
+            >
+              <div className="flex items-center gap-0.5">
+                <AISparkleIcon className="size-4" /> AI
+              </div>
+            </ClientTabsTrigger>
+            <ClientTabsTrigger
+              value="guide"
+              variant="underline"
+              layoutId="query-help-tabs"
+              className="shrink-0"
+            >
+              Writing TRQL
+            </ClientTabsTrigger>
+            <ClientTabsTrigger
+              value="schema"
+              variant="underline"
+              layoutId="query-help-tabs"
+              className="shrink-0"
+            >
+              Table schema
+            </ClientTabsTrigger>
+            <ClientTabsTrigger
+              value="examples"
+              variant="underline"
+              layoutId="query-help-tabs"
+              className="shrink-0"
+            >
+              Examples
+            </ClientTabsTrigger>
+          </ClientTabsList>
+        </div>
+        <ClientTabsContent
+          value="ai"
+          className="min-h-0 flex-1 overflow-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        >
+          <div className="min-w-64 p-3">
+            <AITabContent
+              onQueryGenerated={onQueryGenerated}
+              onTimeFilterChange={onTimeFilterChange}
+              getCurrentQuery={getCurrentQuery}
+              aiFixRequest={aiFixRequest}
+            />
+          </div>
+        </ClientTabsContent>
+        <ClientTabsContent
+          value="guide"
+          className="min-h-0 flex-1 overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        >
+          <div className="min-w-64 p-3">
+            <TRQLGuideContent onTryExample={onTryExample} />
+          </div>
+        </ClientTabsContent>
+        <ClientTabsContent
+          value="schema"
+          className="min-h-0 flex-1 overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        >
+          <div className="min-w-64 p-3">
+            <TableSchemaContent />
+          </div>
+        </ClientTabsContent>
+        <ClientTabsContent
+          value="examples"
+          className="min-h-0 flex-1 overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+        >
+          <div className="min-w-64 p-3">
+            <ExamplesContent onTryExample={onTryExample} />
+          </div>
+        </ClientTabsContent>
+      </ClientTabs>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHistoryPopover.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHistoryPopover.tsx
new file mode 100644
index 00000000000..65c10f3f9d4
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/QueryHistoryPopover.tsx
@@ -0,0 +1,163 @@
+import { useState } from "react";
+import { ClockRotateLeftIcon } from "~/assets/icons/ClockRotateLeftIcon";
+import { Button } from "~/components/primitives/Buttons";
+import { Popover, PopoverTrigger } from "~/components/primitives/Popover";
+import * as PopoverPrimitive from "@radix-ui/react-popover";
+import type { QueryHistoryItem } from "~/presenters/v3/QueryPresenter.server";
+import { timeFilterRenderValues } from "~/components/runs/v3/SharedFilters";
+import { ChevronUpDownIcon } from "@heroicons/react/20/solid";
+import { cn } from "~/utils/cn";
+
+const SQL_KEYWORDS = [
+  "SELECT",
+  "FROM",
+  "WHERE",
+  "ORDER BY",
+  "LIMIT",
+  "GROUP BY",
+  "HAVING",
+  "JOIN",
+  "LEFT JOIN",
+  "RIGHT JOIN",
+  "INNER JOIN",
+  "OUTER JOIN",
+  "AND",
+  "OR",
+  "AS",
+  "ON",
+  "IN",
+  "NOT",
+  "NULL",
+  "DESC",
+  "ASC",
+  "DISTINCT",
+  "COUNT",
+  "SUM",
+  "AVG",
+  "MIN",
+  "MAX",
+];
+
+function highlightSQL(query: string): React.ReactNode[] {
+  // Normalize: collapse multiple spaces/tabs to single space, but preserve newlines
+  // Then trim each line and limit total length
+  const normalized = query
+    .split("\n")
+    .map((line) => line.replace(/[ \t]+/g, " ").trim())
+    .filter((line) => line.length > 0)
+    .join("\n")
+    .slice(0, 500);
+
+  // Create a regex pattern that matches keywords as whole words (case insensitive)
+  const keywordPattern = new RegExp(
+    `\\b(${SQL_KEYWORDS.map((k) => k.replace(/\s+/g, "\\s+")).join("|")})\\b`,
+    "gi"
+  );
+
+  const parts: React.ReactNode[] = [];
+  let lastIndex = 0;
+  let match;
+
+  while ((match = keywordPattern.exec(normalized)) !== null) {
+    // Add text before the match
+    if (match.index > lastIndex) {
+      parts.push(normalized.slice(lastIndex, match.index));
+    }
+    // Add the highlighted keyword
+    parts.push(
+      <span key={match.index} className="text-[#c678dd]">
+        {match[0]}
+      </span>
+    );
+    lastIndex = keywordPattern.lastIndex;
+  }
+
+  // Add remaining text
+  if (lastIndex < normalized.length) {
+    parts.push(normalized.slice(lastIndex));
+  }
+
+  return parts;
+}
+
+export function QueryHistoryPopover({
+  history,
+  onQuerySelected,
+}: {
+  history: QueryHistoryItem[];
+  onQuerySelected: (item: QueryHistoryItem) => void;
+}) {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <Popover open={isOpen} onOpenChange={setIsOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          type="button"
+          variant="secondary/small"
+          LeadingIcon={ClockRotateLeftIcon}
+          leadingIconClassName="-mr-1.5"
+          TrailingIcon={ChevronUpDownIcon}
+          disabled={history.length === 0}
+        >
+          History
+        </Button>
+      </PopoverTrigger>
+      <PopoverPrimitive.Content
+        className={cn(
+          "z-50 w-[400px] min-w-0 overflow-hidden rounded border border-charcoal-700 bg-background-bright p-0 shadow-md outline-none animate-in data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2"
+        )}
+        align="start"
+        sideOffset={6}
+        style={{ maxHeight: "var(--radix-popover-content-available-height)" }}
+      >
+        <div className="max-h-[40rem] overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
+          <div className="p-1">
+            {history.map((item) => {
+              // Format time filter display
+              const { valueLabel } = timeFilterRenderValues({
+                period: item.filterPeriod ?? undefined,
+                from: item.filterFrom ?? undefined,
+                to: item.filterTo ?? undefined,
+              });
+
+              return (
+                <button
+                  key={item.id}
+                  type="button"
+                  onClick={() => {
+                    onQuerySelected(item);
+                    setIsOpen(false);
+                  }}
+                  className="flex w-full flex-col gap-1 rounded-sm px-2 py-2 outline-none transition-colors focus-custom hover:bg-charcoal-750"
+                >
+                  <div className="flex w-full flex-col items-start">
+                    {item.title ? (
+                      <p className="mb-1 truncate text-left text-sm font-medium text-text-bright">
+                        {item.title}
+                      </p>
+                    ) : (
+                      <p className="mb-1 truncate text-left font-mono text-xs text-text-bright">
+                        {item.query.split("\n")[0].slice(0, 60)}
+                      </p>
+                    )}
+                    <div className="flex items-center gap-1.5 text-xs text-text-dimmed">
+                      <span className="capitalize">{item.scope}</span>
+                      {valueLabel && <span>· {valueLabel}</span>}
+                      {item.userName && <span>· {item.userName}</span>}
+                    </div>
+                  </div>
+                  <div className="w-full border-l-2 border-charcoal-600 pl-2.5">
+                    <p className="line-clamp-4 w-full whitespace-pre-wrap text-left font-mono text-xs text-text-dimmed">
+                      {highlightSQL(item.query)}
+                    </p>
+                  </div>
+                </button>
+              );
+            })}
+          </div>
+        </div>
+      </PopoverPrimitive.Content>
+    </Popover>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TRQLGuideContent.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TRQLGuideContent.tsx
new file mode 100644
index 00000000000..35acfd266fc
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TRQLGuideContent.tsx
@@ -0,0 +1,1209 @@
+import { PlayIcon } from "@heroicons/react/20/solid";
+import { CodeBlock } from "~/components/code/CodeBlock";
+import { Button } from "~/components/primitives/Buttons";
+import { Header3 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
+import type { QueryScope } from "~/services/queryService.server";
+
+/** A code block with an integrated "Try it" button */
+export function TryableCodeBlock({
+  code,
+  onTry,
+  className,
+}: {
+  code: string;
+  onTry?: () => void;
+  className?: string;
+}) {
+  return (
+    <div className={className}>
+      <CodeBlock
+        code={code}
+        language="sql"
+        showLineNumbers={false}
+        showOpenInModal={false}
+        className={onTry ? "rounded-b-none border-b-0 text-xs" : "text-xs"}
+      />
+      {onTry && (
+        <div className="flex justify-end rounded-b-md border border-grid-bright p-1">
+          <Button variant="minimal/small" onClick={onTry} LeadingIcon={PlayIcon}>
+            Try it
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+}
+
+type FunctionDoc = { name: string; desc: string; example: string };
+
+function FunctionCategory({ title, functions }: { title: string; functions: FunctionDoc[] }) {
+  return (
+    <div>
+      <Paragraph variant="small/bright" className="mb-1">
+        {title}
+      </Paragraph>
+      <div className="flex flex-wrap gap-1">
+        {functions.map((fn) => (
+          <SimpleTooltip
+            key={fn.name}
+            button={
+              <code className="cursor-help rounded bg-charcoal-750 px-1.5 py-0.5 font-mono text-xxs text-indigo-400 transition-colors hover:bg-charcoal-700 hover:text-indigo-300">
+                {fn.name}
+              </code>
+            }
+            content={
+              <div className="max-w-xs space-y-1">
+                <div className="text-text-bright">{fn.desc}</div>
+                <code className="block rounded bg-charcoal-800 px-1.5 py-1 font-mono text-xxs text-indigo-300">
+                  {fn.example}
+                </code>
+              </div>
+            }
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+export function TRQLGuideContent({
+  onTryExample,
+}: {
+  onTryExample: (query: string, scope: QueryScope) => void;
+}) {
+  return (
+    <div className="space-y-6">
+      <Paragraph variant="small/bright">
+        TRQL is a query language for the Trigger platform. It is based on ClickHouse SQL and extends
+        it with additional features.
+      </Paragraph>
+      {/* Table of contents */}
+      <nav className="space-y-1 text-sm">
+        <a href="#basic" className="block text-text-link hover:underline">
+          Basic queries
+        </a>
+        <a href="#filtering" className="block text-text-link hover:underline">
+          Filtering with WHERE
+        </a>
+        <a href="#sorting" className="block text-text-link hover:underline">
+          Sorting &amp; limiting
+        </a>
+        <a href="#grouping" className="block text-text-link hover:underline">
+          Grouping &amp; aggregation
+        </a>
+        <a href="#functions" className="block text-text-link hover:underline">
+          Available functions
+        </a>
+      </nav>
+
+      {/* Basic queries */}
+      <section id="basic">
+        <Header3 className="mb-2 text-text-bright">Basic queries</Header3>
+        <Paragraph variant="small" className="mb-2 text-text-dimmed">
+          Select columns from a table. Use <code className="text-xs">*</code> to select all columns,
+          or list specific columns.
+        </Paragraph>
+        <TryableCodeBlock
+          code={`SELECT run_id, task_identifier, status
+FROM runs
+LIMIT 10`}
+          onTry={() =>
+            onTryExample(
+              `SELECT run_id, task_identifier, status
+FROM runs
+LIMIT 10`,
+              "environment"
+            )
+          }
+        />
+        <Paragraph variant="small" className="mt-3 text-text-dimmed">
+          Alias columns with <code className="text-xs">AS</code>:
+        </Paragraph>
+        <TryableCodeBlock
+          code={`SELECT task_identifier AS task, count() AS total
+FROM runs
+GROUP BY task`}
+          onTry={() =>
+            onTryExample(
+              `SELECT task_identifier AS task, count() AS total
+FROM runs
+GROUP BY task`,
+              "environment"
+            )
+          }
+          className="mt-1"
+        />
+      </section>
+
+      {/* Filtering */}
+      <section id="filtering">
+        <Header3 className="mb-2 text-text-bright">Filtering with WHERE</Header3>
+        <Paragraph variant="small" className="mb-2 text-text-dimmed">
+          Use comparison operators: <code className="text-xs">=</code>,{" "}
+          <code className="text-xs">!=</code>, <code className="text-xs">&lt;</code>,{" "}
+          <code className="text-xs">&gt;</code>, <code className="text-xs">&lt;=</code>,{" "}
+          <code className="text-xs">&gt;=</code>
+        </Paragraph>
+        <TryableCodeBlock
+          code={`SELECT * FROM runs
+WHERE status = 'Failed'
+  AND created_at > now() - INTERVAL 1 DAY`}
+          onTry={() =>
+            onTryExample(
+              `SELECT * FROM runs
+WHERE status = 'Failed'
+  AND created_at > now() - INTERVAL 1 DAY`,
+              "environment"
+            )
+          }
+        />
+        <Paragraph variant="small" className="mt-3 text-text-dimmed">
+          Other operators:
+        </Paragraph>
+        <TryableCodeBlock
+          code={`-- IN for multiple values
+WHERE status IN ('Failed', 'Crashed')
+
+-- LIKE for pattern matching (% = wildcard)
+WHERE task_identifier LIKE 'email%'
+
+-- ILIKE for case-insensitive matching
+WHERE task_identifier ILIKE '%send%'
+
+-- BETWEEN for ranges
+WHERE created_at BETWEEN '2024-01-01' AND '2024-01-31'
+
+-- NULL checks
+WHERE completed_at IS NOT NULL`}
+          className="mt-1"
+        />
+      </section>
+
+      {/* Sorting & limiting */}
+      <section id="sorting">
+        <Header3 className="mb-2 text-text-bright">Sorting &amp; limiting</Header3>
+        <Paragraph variant="small" className="mb-2 text-text-dimmed">
+          Sort results with <code className="text-xs">ORDER BY</code> (ASC/DESC). Limit results with{" "}
+          <code className="text-xs">LIMIT</code>.
+        </Paragraph>
+        <TryableCodeBlock
+          code={`SELECT run_id, compute_cost, created_at
+FROM runs
+ORDER BY compute_cost DESC, created_at ASC
+LIMIT 50`}
+          onTry={() =>
+            onTryExample(
+              `SELECT run_id, compute_cost, created_at
+FROM runs
+ORDER BY compute_cost DESC, created_at ASC
+LIMIT 50`,
+              "environment"
+            )
+          }
+        />
+      </section>
+
+      {/* Grouping */}
+      <section id="grouping">
+        <Header3 className="mb-2 text-text-bright">Grouping &amp; aggregation</Header3>
+        <Paragraph variant="small" className="mb-2 text-text-dimmed">
+          Use <code className="text-xs">GROUP BY</code> with aggregate functions. Filter groups with{" "}
+          <code className="text-xs">HAVING</code>.
+        </Paragraph>
+        <TryableCodeBlock
+          code={`SELECT
+  task_identifier,
+  status,
+  count() AS run_count,
+  avg(usage_duration) AS avg_duration
+FROM runs
+GROUP BY task_identifier, status
+HAVING run_count > 10
+ORDER BY run_count DESC`}
+          onTry={() =>
+            onTryExample(
+              `SELECT
+  task_identifier,
+  status,
+  count() AS run_count,
+  avg(usage_duration) AS avg_duration
+FROM runs
+GROUP BY task_identifier, status
+HAVING run_count > 10
+ORDER BY run_count DESC`,
+              "environment"
+            )
+          }
+        />
+      </section>
+
+      {/* Functions */}
+      <section id="functions">
+        <Header3 className="mb-2 text-text-bright">Available functions</Header3>
+        <Paragraph variant="extra-small" className="mb-3 text-text-dimmed">
+          Hover over any function to see its description and example usage.
+        </Paragraph>
+
+        <div className="space-y-4">
+          {/* Aggregate functions */}
+          <FunctionCategory
+            title="Aggregate functions"
+            functions={[
+              { name: "count()", desc: "Count rows", example: "count()" },
+              {
+                name: "countIf(col, cond)",
+                desc: "Count rows matching condition",
+                example: "countIf(status, status = 'Failed')",
+              },
+              {
+                name: "countDistinct(col)",
+                desc: "Count unique values",
+                example: "countDistinct(task_identifier)",
+              },
+              { name: "sum(col)", desc: "Sum of values", example: "sum(compute_cost)" },
+              {
+                name: "sumIf(col, cond)",
+                desc: "Sum values matching condition",
+                example: "sumIf(compute_cost, status = 'Completed')",
+              },
+              { name: "avg(col)", desc: "Average of values", example: "avg(usage_duration)" },
+              { name: "min(col)", desc: "Minimum value", example: "min(created_at)" },
+              { name: "max(col)", desc: "Maximum value", example: "max(compute_cost)" },
+              {
+                name: "uniq(col)",
+                desc: "Approximate unique count (fast)",
+                example: "uniq(task_identifier)",
+              },
+              { name: "uniqExact(col)", desc: "Exact unique count", example: "uniqExact(run_id)" },
+              {
+                name: "any(col)",
+                desc: "Any arbitrary value from group",
+                example: "any(task_identifier)",
+              },
+              {
+                name: "anyLast(col)",
+                desc: "Last value encountered in group",
+                example: "anyLast(status)",
+              },
+              {
+                name: "argMin(arg, val)",
+                desc: "Value of arg at minimum val",
+                example: "argMin(run_id, created_at)",
+              },
+              {
+                name: "argMax(arg, val)",
+                desc: "Value of arg at maximum val",
+                example: "argMax(run_id, compute_cost)",
+              },
+              {
+                name: "median(col)",
+                desc: "Median value (50th percentile)",
+                example: "median(usage_duration)",
+              },
+              {
+                name: "quantile(p)(col)",
+                desc: "Value at percentile p (0-1)",
+                example: "quantile(0.95)(usage_duration)",
+              },
+              {
+                name: "stddevPop(col)",
+                desc: "Population standard deviation",
+                example: "stddevPop(usage_duration)",
+              },
+              {
+                name: "stddevSamp(col)",
+                desc: "Sample standard deviation",
+                example: "stddevSamp(usage_duration)",
+              },
+              {
+                name: "groupArray(col)",
+                desc: "Collect values into array",
+                example: "groupArray(run_id)",
+              },
+              {
+                name: "groupUniqArray(col)",
+                desc: "Collect unique values into array",
+                example: "groupUniqArray(status)",
+              },
+              {
+                name: "topK(k)(col)",
+                desc: "Top k most frequent values",
+                example: "topK(5)(task_identifier)",
+              },
+            ]}
+          />
+
+          {/* String functions */}
+          <FunctionCategory
+            title="String functions"
+            functions={[
+              {
+                name: "length(s)",
+                desc: "Length of string in bytes",
+                example: "length(task_identifier)",
+              },
+              {
+                name: "lengthUTF8(s)",
+                desc: "Length in UTF-8 characters",
+                example: "lengthUTF8(task_identifier)",
+              },
+              { name: "empty(s)", desc: "Returns 1 if string is empty", example: "empty(error)" },
+              {
+                name: "notEmpty(s)",
+                desc: "Returns 1 if string is not empty",
+                example: "notEmpty(task_identifier)",
+              },
+              { name: "lower(s)", desc: "Convert to lowercase", example: "lower(status)" },
+              { name: "upper(s)", desc: "Convert to uppercase", example: "upper(status)" },
+              { name: "reverse(s)", desc: "Reverse string", example: "reverse(run_id)" },
+              {
+                name: "concat(s1, s2, ...)",
+                desc: "Concatenate strings",
+                example: "concat(task_identifier, '-', status)",
+              },
+              {
+                name: "substring(s, offset, len)",
+                desc: "Extract substring (1-indexed)",
+                example: "substring(run_id, 1, 10)",
+              },
+              { name: "left(s, n)", desc: "First n characters", example: "left(run_id, 10)" },
+              { name: "right(s, n)", desc: "Last n characters", example: "right(run_id, 8)" },
+              {
+                name: "trim(s)",
+                desc: "Remove leading/trailing whitespace",
+                example: "trim(task_identifier)",
+              },
+              {
+                name: "trimLeft(s)",
+                desc: "Remove leading whitespace",
+                example: "trimLeft(task_identifier)",
+              },
+              {
+                name: "trimRight(s)",
+                desc: "Remove trailing whitespace",
+                example: "trimRight(task_identifier)",
+              },
+              {
+                name: "leftPad(s, len, char)",
+                desc: "Pad string on left",
+                example: "leftPad(toString(attempt), 3, '0')",
+              },
+              {
+                name: "rightPad(s, len, char)",
+                desc: "Pad string on right",
+                example: "rightPad(status, 15, ' ')",
+              },
+              {
+                name: "startsWith(s, prefix)",
+                desc: "Check if starts with prefix",
+                example: "startsWith(task_identifier, 'email')",
+              },
+              {
+                name: "endsWith(s, suffix)",
+                desc: "Check if ends with suffix",
+                example: "endsWith(run_id, 'abc')",
+              },
+              {
+                name: "position(haystack, needle)",
+                desc: "Position of substring (0 if not found)",
+                example: "position(task_identifier, 'send')",
+              },
+              {
+                name: "replace(s, from, to)",
+                desc: "Replace all occurrences",
+                example: "replace(status, '_', '-')",
+              },
+              {
+                name: "replaceOne(s, from, to)",
+                desc: "Replace first occurrence",
+                example: "replaceOne(task_identifier, '-', '_')",
+              },
+              {
+                name: "replaceRegexpAll(s, pattern, repl)",
+                desc: "Replace using regex",
+                example: "replaceRegexpAll(run_id, '[0-9]', 'X')",
+              },
+              {
+                name: "match(s, pattern)",
+                desc: "Regex match (returns 0 or 1)",
+                example: "match(task_identifier, '^email.*')",
+              },
+              {
+                name: "extract(s, pattern)",
+                desc: "Extract first regex match",
+                example: "extract(task_identifier, '[a-z]+')",
+              },
+              {
+                name: "extractAll(s, pattern)",
+                desc: "Extract all regex matches as array",
+                example: "extractAll(task_identifier, '[a-z]+')",
+              },
+              {
+                name: "like(s, pattern)",
+                desc: "SQL LIKE pattern match",
+                example: "like(task_identifier, '%email%')",
+              },
+              {
+                name: "ilike(s, pattern)",
+                desc: "Case-insensitive LIKE",
+                example: "ilike(task_identifier, '%EMAIL%')",
+              },
+              {
+                name: "splitByChar(sep, s)",
+                desc: "Split by character",
+                example: "splitByChar('-', task_identifier)",
+              },
+              {
+                name: "splitByString(sep, s)",
+                desc: "Split by string",
+                example: "splitByString('::', task_identifier)",
+              },
+              {
+                name: "arrayStringConcat(arr, sep)",
+                desc: "Join array to string",
+                example: "arrayStringConcat(tags, ', ')",
+              },
+              {
+                name: "base64Encode(s)",
+                desc: "Encode to base64",
+                example: "base64Encode(run_id)",
+              },
+              {
+                name: "base64Decode(s)",
+                desc: "Decode from base64",
+                example: "base64Decode(encoded_value)",
+              },
+              { name: "repeat(s, n)", desc: "Repeat string n times", example: "repeat('-', 10)" },
+              {
+                name: "format(pattern, args...)",
+                desc: "Format string with placeholders",
+                example: "format('{} - {}', task_identifier, status)",
+              },
+            ]}
+          />
+
+          {/* Date/time functions */}
+          <FunctionCategory
+            title="Date/time functions"
+            functions={[
+              {
+                name: "timeBucket()",
+                desc: "Auto-bucket by time period. Uses the table's time column with an interval based on the query's time range.",
+                example: "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket",
+              },
+              { name: "now()", desc: "Current date and time", example: "now()" },
+              { name: "today()", desc: "Current date", example: "today()" },
+              { name: "yesterday()", desc: "Yesterday's date", example: "yesterday()" },
+              { name: "toYear(dt)", desc: "Extract year", example: "toYear(created_at)" },
+              {
+                name: "toQuarter(dt)",
+                desc: "Extract quarter (1-4)",
+                example: "toQuarter(created_at)",
+              },
+              { name: "toMonth(dt)", desc: "Extract month (1-12)", example: "toMonth(created_at)" },
+              {
+                name: "toDayOfMonth(dt)",
+                desc: "Extract day of month (1-31)",
+                example: "toDayOfMonth(created_at)",
+              },
+              {
+                name: "toDayOfWeek(dt)",
+                desc: "Day of week (1=Monday, 7=Sunday)",
+                example: "toDayOfWeek(created_at)",
+              },
+              { name: "toHour(dt)", desc: "Extract hour (0-23)", example: "toHour(created_at)" },
+              {
+                name: "toMinute(dt)",
+                desc: "Extract minute (0-59)",
+                example: "toMinute(created_at)",
+              },
+              {
+                name: "toSecond(dt)",
+                desc: "Extract second (0-59)",
+                example: "toSecond(created_at)",
+              },
+              {
+                name: "toDate(dt)",
+                desc: "Convert to date (strip time)",
+                example: "toDate(created_at)",
+              },
+              {
+                name: "toDateTime(x)",
+                desc: "Convert to datetime",
+                example: "toDateTime('2024-01-15 10:30:00')",
+              },
+              {
+                name: "toStartOfYear(dt)",
+                desc: "First day of year",
+                example: "toStartOfYear(created_at)",
+              },
+              {
+                name: "toStartOfQuarter(dt)",
+                desc: "First day of quarter",
+                example: "toStartOfQuarter(created_at)",
+              },
+              {
+                name: "toStartOfMonth(dt)",
+                desc: "First day of month",
+                example: "toStartOfMonth(created_at)",
+              },
+              {
+                name: "toStartOfWeek(dt)",
+                desc: "Start of week (Monday)",
+                example: "toStartOfWeek(created_at)",
+              },
+              { name: "toMonday(dt)", desc: "Monday of the week", example: "toMonday(created_at)" },
+              {
+                name: "toStartOfDay(dt)",
+                desc: "Start of day (midnight)",
+                example: "toStartOfDay(created_at)",
+              },
+              {
+                name: "toStartOfHour(dt)",
+                desc: "Start of hour",
+                example: "toStartOfHour(created_at)",
+              },
+              {
+                name: "toStartOfMinute(dt)",
+                desc: "Start of minute",
+                example: "toStartOfMinute(created_at)",
+              },
+              {
+                name: "toStartOfFiveMinutes(dt)",
+                desc: "Round to 5-minute interval",
+                example: "toStartOfFiveMinutes(created_at)",
+              },
+              {
+                name: "toStartOfFifteenMinutes(dt)",
+                desc: "Round to 15-minute interval",
+                example: "toStartOfFifteenMinutes(created_at)",
+              },
+              {
+                name: "toStartOfInterval(dt, INTERVAL n unit)",
+                desc: "Round to custom interval",
+                example: "toStartOfInterval(created_at, INTERVAL 30 MINUTE)",
+              },
+              {
+                name: "toUnixTimestamp(dt)",
+                desc: "Convert to Unix timestamp",
+                example: "toUnixTimestamp(created_at)",
+              },
+              {
+                name: "dateDiff(unit, start, end)",
+                desc: "Difference between dates",
+                example: "dateDiff('minute', started_at, completed_at)",
+              },
+              {
+                name: "dateAdd(unit, n, dt)",
+                desc: "Add time to date",
+                example: "dateAdd('day', 7, created_at)",
+              },
+              {
+                name: "dateSub(unit, n, dt)",
+                desc: "Subtract time from date",
+                example: "dateSub('hour', 1, created_at)",
+              },
+              {
+                name: "dateTrunc(unit, dt)",
+                desc: "Truncate to unit",
+                example: "dateTrunc('month', created_at)",
+              },
+              { name: "addDays(dt, n)", desc: "Add n days", example: "addDays(created_at, 7)" },
+              { name: "addHours(dt, n)", desc: "Add n hours", example: "addHours(created_at, 24)" },
+              {
+                name: "addMinutes(dt, n)",
+                desc: "Add n minutes",
+                example: "addMinutes(created_at, 30)",
+              },
+              {
+                name: "subtractDays(dt, n)",
+                desc: "Subtract n days",
+                example: "subtractDays(now(), 7)",
+              },
+              {
+                name: "subtractHours(dt, n)",
+                desc: "Subtract n hours",
+                example: "subtractHours(now(), 1)",
+              },
+              {
+                name: "formatDateTime(dt, format)",
+                desc: "Format datetime as string",
+                example: "formatDateTime(created_at, '%Y-%m-%d %H:%M')",
+              },
+              {
+                name: "parseDateTimeBestEffort(s)",
+                desc: "Parse string to datetime",
+                example: "parseDateTimeBestEffort('2024-01-15')",
+              },
+              {
+                name: "toTimeZone(dt, tz)",
+                desc: "Convert to timezone",
+                example: "toTimeZone(created_at, 'America/New_York')",
+              },
+            ]}
+          />
+
+          {/* Conditional & null functions */}
+          <FunctionCategory
+            title="Conditional & null functions"
+            functions={[
+              {
+                name: "if(cond, then, else)",
+                desc: "Conditional expression",
+                example: "if(status = 'Failed', 1, 0)",
+              },
+              {
+                name: "multiIf(c1, t1, c2, t2, ..., else)",
+                desc: "Multiple conditions (like CASE)",
+                example: "multiIf(status = 'Completed', 'ok', status = 'Failed', 'bad', 'other')",
+              },
+              {
+                name: "coalesce(a, b, ...)",
+                desc: "First non-null value",
+                example: "coalesce(completed_at, created_at)",
+              },
+              {
+                name: "ifNull(x, alt)",
+                desc: "Return alt if x is null",
+                example: "ifNull(completed_at, now())",
+              },
+              {
+                name: "nullIf(x, y)",
+                desc: "Return null if x equals y",
+                example: "nullIf(status, 'Pending')",
+              },
+              {
+                name: "isNull(x)",
+                desc: "Check if value is null",
+                example: "isNull(completed_at)",
+              },
+              {
+                name: "isNotNull(x)",
+                desc: "Check if value is not null",
+                example: "isNotNull(completed_at)",
+              },
+              {
+                name: "assumeNotNull(x)",
+                desc: "Treat nullable as non-null",
+                example: "assumeNotNull(completed_at)",
+              },
+            ]}
+          />
+
+          {/* Arithmetic & math */}
+          <FunctionCategory
+            title="Arithmetic & math functions"
+            functions={[
+              {
+                name: "plus(a, b)",
+                desc: "Addition (a + b)",
+                example: "plus(compute_cost, invocation_cost)",
+              },
+              {
+                name: "minus(a, b)",
+                desc: "Subtraction (a - b)",
+                example: "minus(completed_at, started_at)",
+              },
+              {
+                name: "multiply(a, b)",
+                desc: "Multiplication (a * b)",
+                example: "multiply(usage_duration, 2)",
+              },
+              {
+                name: "divide(a, b)",
+                desc: "Division (a / b)",
+                example: "divide(compute_cost, usage_duration)",
+              },
+              {
+                name: "intDiv(a, b)",
+                desc: "Integer division",
+                example: "intDiv(usage_duration, 1000)",
+              },
+              { name: "modulo(a, b)", desc: "Modulo (a % b)", example: "modulo(attempt, 2)" },
+              { name: "abs(x)", desc: "Absolute value", example: "abs(compute_cost)" },
+              { name: "sign(x)", desc: "Sign (-1, 0, or 1)", example: "sign(compute_cost)" },
+              { name: "sqrt(x)", desc: "Square root", example: "sqrt(usage_duration)" },
+              { name: "pow(x, y)", desc: "Power (x^y)", example: "pow(2, attempt)" },
+              {
+                name: "round(x, n)",
+                desc: "Round to n decimal places",
+                example: "round(compute_cost, 4)",
+              },
+              { name: "floor(x)", desc: "Round down", example: "floor(compute_cost * 100)" },
+              { name: "ceil(x)", desc: "Round up", example: "ceil(compute_cost * 100)" },
+              { name: "trunc(x)", desc: "Truncate towards zero", example: "trunc(compute_cost)" },
+              { name: "exp(x)", desc: "Exponential (e^x)", example: "exp(1)" },
+              { name: "log(x)", desc: "Natural logarithm", example: "log(usage_duration)" },
+              { name: "log10(x)", desc: "Base-10 logarithm", example: "log10(usage_duration)" },
+              {
+                name: "least(a, b)",
+                desc: "Minimum of two values",
+                example: "least(usage_duration, 10000)",
+              },
+              {
+                name: "greatest(a, b)",
+                desc: "Maximum of two values",
+                example: "greatest(usage_duration, 0)",
+              },
+            ]}
+          />
+
+          {/* Array functions */}
+          <FunctionCategory
+            title="Array functions"
+            functions={[
+              {
+                name: "array(a, b, ...)",
+                desc: "Create array from values",
+                example: "array('a', 'b', 'c')",
+              },
+              {
+                name: "range(start, end)",
+                desc: "Generate array of numbers",
+                example: "range(1, 10)",
+              },
+              { name: "length(arr)", desc: "Number of elements", example: "length(tags)" },
+              { name: "empty(arr)", desc: "Check if array is empty", example: "empty(tags)" },
+              {
+                name: "has(arr, elem)",
+                desc: "Check if array contains element",
+                example: "has(tags, 'important')",
+              },
+              {
+                name: "hasAll(arr1, arr2)",
+                desc: "Check if arr1 contains all of arr2",
+                example: "hasAll(tags, array('a', 'b'))",
+              },
+              {
+                name: "hasAny(arr1, arr2)",
+                desc: "Check if arr1 contains any of arr2",
+                example: "hasAny(tags, array('urgent', 'high'))",
+              },
+              {
+                name: "indexOf(arr, elem)",
+                desc: "Index of element (1-based, 0 if not found)",
+                example: "indexOf(tags, 'important')",
+              },
+              {
+                name: "arrayElement(arr, n)",
+                desc: "Get nth element (1-based)",
+                example: "arrayElement(tags, 1)",
+              },
+              { name: "arrayJoin(arr)", desc: "Expand array to rows", example: "arrayJoin(tags)" },
+              {
+                name: "arraySlice(arr, offset, length)",
+                desc: "Get slice of array",
+                example: "arraySlice(tags, 1, 3)",
+              },
+              {
+                name: "arrayPushBack(arr, elem)",
+                desc: "Append element to array",
+                example: "arrayPushBack(tags, 'new')",
+              },
+              {
+                name: "arrayPushFront(arr, elem)",
+                desc: "Prepend element to array",
+                example: "arrayPushFront(tags, 'first')",
+              },
+              { name: "arraySort(arr)", desc: "Sort array ascending", example: "arraySort(tags)" },
+              {
+                name: "arrayReverseSort(arr)",
+                desc: "Sort array descending",
+                example: "arrayReverseSort(tags)",
+              },
+              {
+                name: "arrayReverse(arr)",
+                desc: "Reverse array order",
+                example: "arrayReverse(tags)",
+              },
+              { name: "arrayUniq(arr)", desc: "Remove duplicates", example: "arrayUniq(tags)" },
+              {
+                name: "arrayDistinct(arr)",
+                desc: "Remove duplicates (preserves order)",
+                example: "arrayDistinct(tags)",
+              },
+              {
+                name: "arrayFlatten(arr)",
+                desc: "Flatten nested arrays",
+                example: "arrayFlatten([[1,2], [3,4]])",
+              },
+              {
+                name: "arrayFilter(func, arr)",
+                desc: "Filter array by condition",
+                example: "arrayFilter(x -> x > 0, arr)",
+              },
+              {
+                name: "arrayMap(func, arr)",
+                desc: "Transform each element",
+                example: "arrayMap(x -> x * 2, arr)",
+              },
+              {
+                name: "arrayMin(arr)",
+                desc: "Minimum element",
+                example: "arrayMin(array(1, 2, 3))",
+              },
+              {
+                name: "arrayMax(arr)",
+                desc: "Maximum element",
+                example: "arrayMax(array(1, 2, 3))",
+              },
+              {
+                name: "arraySum(arr)",
+                desc: "Sum of elements",
+                example: "arraySum(array(1, 2, 3))",
+              },
+              {
+                name: "arrayAvg(arr)",
+                desc: "Average of elements",
+                example: "arrayAvg(array(1, 2, 3))",
+              },
+            ]}
+          />
+
+          {/* JSON functions */}
+          <FunctionCategory
+            title="JSON functions"
+            functions={[
+              {
+                name: "JSONHas(json, key)",
+                desc: "Check if key exists",
+                example: "JSONHas(output, 'result')",
+              },
+              {
+                name: "JSONLength(json)",
+                desc: "Number of elements/keys",
+                example: "JSONLength(output)",
+              },
+              {
+                name: "JSONType(json, key)",
+                desc: "Type of JSON value",
+                example: "JSONType(output, 'data')",
+              },
+              {
+                name: "JSONExtractString(json, key)",
+                desc: "Extract as string",
+                example: "JSONExtractString(output, 'message')",
+              },
+              {
+                name: "JSONExtractInt(json, key)",
+                desc: "Extract as integer",
+                example: "JSONExtractInt(output, 'count')",
+              },
+              {
+                name: "JSONExtractFloat(json, key)",
+                desc: "Extract as float",
+                example: "JSONExtractFloat(output, 'score')",
+              },
+              {
+                name: "JSONExtractBool(json, key)",
+                desc: "Extract as boolean",
+                example: "JSONExtractBool(output, 'success')",
+              },
+              {
+                name: "JSONExtractRaw(json, key)",
+                desc: "Extract as raw JSON string",
+                example: "JSONExtractRaw(output, 'data')",
+              },
+              {
+                name: "JSONExtractArrayRaw(json, key)",
+                desc: "Extract array as strings",
+                example: "JSONExtractArrayRaw(output, 'items')",
+              },
+              {
+                name: "JSONExtractKeys(json)",
+                desc: "Get all keys as array",
+                example: "JSONExtractKeys(output)",
+              },
+              {
+                name: "toJSONString(value)",
+                desc: "Convert to JSON string",
+                example: "toJSONString(map('a', 1))",
+              },
+            ]}
+          />
+
+          {/* Type conversion */}
+          <FunctionCategory
+            title="Type conversion functions"
+            functions={[
+              { name: "toString(x)", desc: "Convert to string", example: "toString(attempt)" },
+              { name: "toInt32(x)", desc: "Convert to 32-bit integer", example: "toInt32('123')" },
+              {
+                name: "toInt64(x)",
+                desc: "Convert to 64-bit integer",
+                example: "toInt64(usage_duration)",
+              },
+              {
+                name: "toFloat64(x)",
+                desc: "Convert to 64-bit float",
+                example: "toFloat64('3.14')",
+              },
+              {
+                name: "toDecimal64(x, scale)",
+                desc: "Convert to decimal",
+                example: "toDecimal64(compute_cost, 6)",
+              },
+              { name: "toDate(x)", desc: "Convert to date", example: "toDate('2024-01-15')" },
+              {
+                name: "toDateOrNull(x)",
+                desc: "Convert to date (null on error)",
+                example: "toDateOrNull(some_string)",
+              },
+              {
+                name: "toDateTime(x)",
+                desc: "Convert to datetime",
+                example: "toDateTime('2024-01-15 10:30:00')",
+              },
+              {
+                name: "toDateTimeOrNull(x)",
+                desc: "Convert to datetime (null on error)",
+                example: "toDateTimeOrNull(some_string)",
+              },
+              { name: "toUUID(x)", desc: "Convert to UUID", example: "toUUID(uuid_string)" },
+              {
+                name: "toTypeName(x)",
+                desc: "Get type name as string",
+                example: "toTypeName(created_at)",
+              },
+            ]}
+          />
+
+          {/* Comparison & logical */}
+          <FunctionCategory
+            title="Comparison & logical functions"
+            functions={[
+              {
+                name: "equals(a, b)",
+                desc: "Equal (a = b)",
+                example: "equals(status, 'Completed')",
+              },
+              {
+                name: "notEquals(a, b)",
+                desc: "Not equal (a != b)",
+                example: "notEquals(status, 'Failed')",
+              },
+              { name: "less(a, b)", desc: "Less than (a < b)", example: "less(attempt, 3)" },
+              {
+                name: "greater(a, b)",
+                desc: "Greater than (a > b)",
+                example: "greater(usage_duration, 1000)",
+              },
+              {
+                name: "lessOrEquals(a, b)",
+                desc: "Less than or equal (a <= b)",
+                example: "lessOrEquals(attempt, 5)",
+              },
+              {
+                name: "greaterOrEquals(a, b)",
+                desc: "Greater than or equal (a >= b)",
+                example: "greaterOrEquals(usage_duration, 0)",
+              },
+              {
+                name: "and(a, b, ...)",
+                desc: "Logical AND",
+                example: "and(status = 'Failed', attempt > 1)",
+              },
+              {
+                name: "or(a, b, ...)",
+                desc: "Logical OR",
+                example: "or(status = 'Failed', status = 'Crashed')",
+              },
+              { name: "not(x)", desc: "Logical NOT", example: "not(is_test)" },
+              {
+                name: "in(x, set)",
+                desc: "Check if x is in set",
+                example: "in(status, ('Failed', 'Crashed'))",
+              },
+            ]}
+          />
+
+          {/* Hash functions */}
+          <FunctionCategory
+            title="Hash functions"
+            functions={[
+              { name: "MD5(s)", desc: "MD5 hash (16 bytes)", example: "hex(MD5(run_id))" },
+              {
+                name: "SHA256(s)",
+                desc: "SHA-256 hash (32 bytes)",
+                example: "hex(SHA256(run_id))",
+              },
+              {
+                name: "sipHash64(s)",
+                desc: "Fast 64-bit hash",
+                example: "sipHash64(task_identifier)",
+              },
+              { name: "cityHash64(s)", desc: "CityHash 64-bit", example: "cityHash64(run_id)" },
+              { name: "xxHash64(s)", desc: "xxHash 64-bit", example: "xxHash64(task_identifier)" },
+              { name: "hex(s)", desc: "Convert to hex string", example: "hex(MD5(run_id))" },
+              { name: "unhex(s)", desc: "Convert from hex string", example: "unhex('48656C6C6F')" },
+            ]}
+          />
+
+          {/* UUID & utility */}
+          <FunctionCategory
+            title="UUID & utility functions"
+            functions={[
+              {
+                name: "generateUUIDv4()",
+                desc: "Generate random UUID",
+                example: "generateUUIDv4()",
+              },
+              {
+                name: "isFinite(x)",
+                desc: "Check if number is finite",
+                example: "isFinite(compute_cost)",
+              },
+              { name: "isNaN(x)", desc: "Check if value is NaN", example: "isNaN(compute_cost)" },
+              {
+                name: "formatReadableSize(bytes)",
+                desc: "Format bytes as human-readable",
+                example: "formatReadableSize(1024)",
+              },
+              {
+                name: "formatReadableQuantity(n)",
+                desc: "Format number with suffixes (K, M, etc)",
+                example: "formatReadableQuantity(1500000)",
+              },
+              {
+                name: "formatReadableTimeDelta(seconds)",
+                desc: "Format seconds as duration",
+                example: "formatReadableTimeDelta(3661)",
+              },
+              {
+                name: "runningDifference(col)",
+                desc: "Difference from previous row",
+                example: "runningDifference(usage_duration)",
+              },
+              {
+                name: "neighbor(col, offset)",
+                desc: "Value from row at offset",
+                example: "neighbor(created_at, -1)",
+              },
+            ]}
+          />
+
+          {/* Tuple & map functions */}
+          <FunctionCategory
+            title="Tuple & map functions"
+            functions={[
+              {
+                name: "tuple(a, b, ...)",
+                desc: "Create tuple",
+                example: "tuple(task_identifier, status)",
+              },
+              {
+                name: "tupleElement(tuple, n)",
+                desc: "Get nth element (1-based)",
+                example: "tupleElement(t, 1)",
+              },
+              {
+                name: "map(k1, v1, k2, v2, ...)",
+                desc: "Create map from key-value pairs",
+                example: "map('a', 1, 'b', 2)",
+              },
+              {
+                name: "mapFromArrays(keys, values)",
+                desc: "Create map from two arrays",
+                example: "mapFromArrays(['a', 'b'], [1, 2])",
+              },
+              {
+                name: "mapContains(map, key)",
+                desc: "Check if map has key",
+                example: "mapContains(m, 'key')",
+              },
+              { name: "mapKeys(map)", desc: "Get all keys as array", example: "mapKeys(m)" },
+              { name: "mapValues(map)", desc: "Get all values as array", example: "mapValues(m)" },
+            ]}
+          />
+
+          {/* Window functions */}
+          <FunctionCategory
+            title="Window functions"
+            functions={[
+              {
+                name: "row_number()",
+                desc: "Row number within partition",
+                example: "row_number() OVER (ORDER BY created_at)",
+              },
+              {
+                name: "rank()",
+                desc: "Rank with gaps for ties",
+                example: "rank() OVER (ORDER BY compute_cost DESC)",
+              },
+              {
+                name: "dense_rank()",
+                desc: "Rank without gaps",
+                example: "dense_rank() OVER (ORDER BY compute_cost DESC)",
+              },
+              {
+                name: "first_value(col)",
+                desc: "First value in window",
+                example: "first_value(status) OVER (PARTITION BY task_identifier)",
+              },
+              {
+                name: "last_value(col)",
+                desc: "Last value in window",
+                example: "last_value(status) OVER (PARTITION BY task_identifier)",
+              },
+              {
+                name: "lag(col, offset, default)",
+                desc: "Value from previous row",
+                example: "lag(created_at, 1) OVER (ORDER BY created_at)",
+              },
+              {
+                name: "lead(col, offset, default)",
+                desc: "Value from next row",
+                example: "lead(created_at, 1) OVER (ORDER BY created_at)",
+              },
+            ]}
+          />
+
+          {/* Interval functions */}
+          <FunctionCategory
+            title="Interval functions"
+            functions={[
+              {
+                name: "toIntervalSecond(n)",
+                desc: "Create n-second interval",
+                example: "toIntervalSecond(30)",
+              },
+              {
+                name: "toIntervalMinute(n)",
+                desc: "Create n-minute interval",
+                example: "toIntervalMinute(5)",
+              },
+              {
+                name: "toIntervalHour(n)",
+                desc: "Create n-hour interval",
+                example: "toIntervalHour(1)",
+              },
+              {
+                name: "toIntervalDay(n)",
+                desc: "Create n-day interval",
+                example: "toIntervalDay(7)",
+              },
+              {
+                name: "toIntervalWeek(n)",
+                desc: "Create n-week interval",
+                example: "toIntervalWeek(2)",
+              },
+              {
+                name: "toIntervalMonth(n)",
+                desc: "Create n-month interval",
+                example: "toIntervalMonth(1)",
+              },
+              {
+                name: "toIntervalYear(n)",
+                desc: "Create n-year interval",
+                example: "toIntervalYear(1)",
+              },
+            ]}
+          />
+        </div>
+      </section>
+    </div>
+  );
+}
+
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx
new file mode 100644
index 00000000000..41c17e6d3f7
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx
@@ -0,0 +1,80 @@
+import { useState } from "react";
+import type { ColumnSchema } from "@internal/tsql";
+import { Badge } from "~/components/primitives/Badge";
+import { CopyableText } from "~/components/primitives/CopyableText";
+import { Header3 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import SegmentedControl from "~/components/primitives/SegmentedControl";
+import { querySchemas } from "~/v3/querySchemas";
+
+function ColumnHelpItem({ col }: { col: ColumnSchema }) {
+  return (
+    <div className="pt-1">
+      <div className="flex items-center gap-2">
+        <CopyableText value={col.name} className="text-sm text-indigo-400" />
+        <Badge className="font-mono text-xxs">{col.type}</Badge>
+      </div>
+      {col.description && (
+        <Paragraph variant="extra-small" className="mt-1 text-text-dimmed">
+          {col.description}
+        </Paragraph>
+      )}
+      {col.example && (
+        <div className="mt-1 flex items-baseline gap-0.5">
+          <span className="text-xs text-text-dimmed">Example:</span>
+          <CopyableText
+            value={col.example}
+            className="rounded-sm bg-charcoal-750 px-1.5 py-0.5 font-mono text-xxs"
+          />
+        </div>
+      )}
+      {col.allowedValues && col.allowedValues.length > 0 && (
+        <div className="mt-0.5 flex flex-wrap gap-1">
+          <span className="text-xs text-text-dimmed">Available options:</span>
+          {col.allowedValues.map((value) => (
+            <CopyableText
+              key={value}
+              value={col.valueMap?.[value] ?? value}
+              className="rounded-sm bg-charcoal-750 px-1.5 py-0.5 font-mono text-xxs"
+            />
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
+
+const tableOptions = querySchemas.map((s) => ({ label: s.name, value: s.name }));
+
+export function TableSchemaContent() {
+  const [selectedTable, setSelectedTable] = useState(querySchemas[0].name);
+  const table = querySchemas.find((s) => s.name === selectedTable) ?? querySchemas[0];
+
+  return (
+    <div>
+      <div className="sticky top-0 z-10 bg-background-bright pb-3">
+        <SegmentedControl
+          name="table-schema-selector"
+          value={selectedTable}
+          options={tableOptions}
+          variant="secondary/small"
+          fullWidth
+          onChange={setSelectedTable}
+        />
+      </div>
+      <div className="mb-2">
+        {table.description && (
+          <Paragraph variant="small" className="text-text-dimmed">
+            {table.description}
+          </Paragraph>
+        )}
+      </div>
+      <div className="flex flex-col gap-2 divide-y divide-grid-dimmed">
+        {Object.values(table.columns).map((col) => (
+          <ColumnHelpItem key={col.name} col={col} />
+        ))}
+      </div>
+    </div>
+  );
+}
+
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
new file mode 100644
index 00000000000..848546a518f
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx
@@ -0,0 +1,295 @@
+import {
+  redirect,
+  type ActionFunctionArgs,
+  type LoaderFunctionArgs,
+} from "@remix-run/server-runtime";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { QueryEditor } from "~/components/query/QueryEditor";
+import { env } from "~/env.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { QueryPresenter } from "~/presenters/v3/QueryPresenter.server";
+import { executeQuery, getDefaultPeriod } from "~/services/queryService.server";
+import { requireUser } from "~/services/session.server";
+import { EnvironmentParamSchema, queryPath } from "~/utils/pathBuilder";
+import { canAccessQuery } from "~/v3/canAccessQuery.server";
+import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { useEnvironment } from "~/hooks/useEnvironment";
+
+/** Convert a Date or ISO string to ISO string format */
+function toISOString(value: Date | string): string {
+  if (typeof value === "string") {
+    return value;
+  }
+  return value.toISOString();
+}
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const { projectParam, organizationSlug, envParam } = EnvironmentParamSchema.parse(params);
+
+  const canAccess = await canAccessQuery({
+    userId: user.id,
+    isAdmin: user.admin,
+    isImpersonating: user.isImpersonating,
+    organizationSlug,
+  });
+  if (!canAccess) {
+    throw redirect("/");
+  }
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
+  if (!project) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Project not found",
+    });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, user.id);
+  if (!environment) {
+    throw new Response(undefined, {
+      status: 404,
+      statusText: "Environment not found",
+    });
+  }
+
+  const presenter = new QueryPresenter();
+  const { defaultQuery, history } = await presenter.call({
+    organizationId: project.organizationId,
+  });
+
+  // Admins and impersonating users can use EXPLAIN
+  const isAdmin = user.admin || user.isImpersonating;
+
+  return typedjson({
+    defaultQuery,
+    defaultPeriod: await getDefaultPeriod(project.organizationId),
+    history,
+    isAdmin,
+    maxRows: env.QUERY_CLICKHOUSE_MAX_RETURNED_ROWS,
+  });
+};
+
+const ActionSchema = z.object({
+  query: z.string().min(1, "Query is required"),
+  scope: z.enum(["environment", "project", "organization"]),
+  explain: z.enum(["true", "false"]).nullable().optional(),
+  period: z.string().nullable().optional(),
+  from: z.string().nullable().optional(),
+  to: z.string().nullable().optional(),
+});
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const user = await requireUser(request);
+  const { projectParam, organizationSlug, envParam } = EnvironmentParamSchema.parse(params);
+
+  const canAccess = await canAccessQuery({
+    userId: user.id,
+    isAdmin: user.admin,
+    isImpersonating: user.isImpersonating,
+    organizationSlug,
+  });
+
+  if (!canAccess) {
+    return typedjson(
+      {
+        error: "Unauthorized",
+        rows: null,
+        columns: null,
+        stats: null,
+        hiddenColumns: null,
+        reachedMaxRows: null,
+        explainOutput: null,
+        generatedSql: null,
+        periodClipped: null,
+      },
+      { status: 403 }
+    );
+  }
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
+  if (!project) {
+    return typedjson(
+      {
+        error: "Project not found",
+        rows: null,
+        columns: null,
+        stats: null,
+        hiddenColumns: null,
+        reachedMaxRows: null,
+        explainOutput: null,
+        generatedSql: null,
+        periodClipped: null,
+      },
+      { status: 404 }
+    );
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, user.id);
+  if (!environment) {
+    return typedjson(
+      {
+        error: "Environment not found",
+        rows: null,
+        columns: null,
+        stats: null,
+        hiddenColumns: null,
+        reachedMaxRows: null,
+        explainOutput: null,
+        generatedSql: null,
+        periodClipped: null,
+      },
+      { status: 404 }
+    );
+  }
+
+  const formData = await request.formData();
+  const parsed = ActionSchema.safeParse({
+    query: formData.get("query"),
+    scope: formData.get("scope"),
+    explain: formData.get("explain"),
+    period: formData.get("period"),
+    from: formData.get("from"),
+    to: formData.get("to"),
+  });
+
+  if (!parsed.success) {
+    return typedjson(
+      {
+        error: parsed.error.errors.map((e) => e.message).join(", "),
+        rows: null,
+        columns: null,
+        stats: null,
+        hiddenColumns: null,
+        reachedMaxRows: null,
+        explainOutput: null,
+        generatedSql: null,
+        periodClipped: null,
+      },
+      { status: 400 }
+    );
+  }
+
+  const { query, scope, explain: explainParam, period, from, to } = parsed.data;
+  // Only allow explain for admins/impersonating users
+  const isAdmin = user.admin || user.isImpersonating;
+  const explain = explainParam === "true" && isAdmin;
+
+  try {
+    const queryResult = await executeQuery({
+      name: "query-page",
+      query,
+      scope,
+      organizationId: project.organizationId,
+      projectId: project.id,
+      environmentId: environment.id,
+      explain,
+      period,
+      from,
+      to,
+      history: {
+        source: "DASHBOARD",
+        userId: user.id,
+        skip: user.isImpersonating,
+      },
+    });
+
+    if (!queryResult.success) {
+      return typedjson(
+        {
+          error: queryResult.error.message,
+          rows: null,
+          columns: null,
+          stats: null,
+          hiddenColumns: null,
+          reachedMaxRows: null,
+          explainOutput: null,
+          generatedSql: null,
+          queryId: null,
+          periodClipped: null,
+        },
+        { status: 400 }
+      );
+    }
+
+    return typedjson({
+      error: null,
+      rows: queryResult.result.rows,
+      columns: queryResult.result.columns,
+      stats: queryResult.result.stats,
+      hiddenColumns: queryResult.result.hiddenColumns ?? null,
+      reachedMaxRows: queryResult.result.reachedMaxRows,
+      explainOutput: queryResult.result.explainOutput ?? null,
+      generatedSql: queryResult.result.generatedSql ?? null,
+      queryId: queryResult.queryId,
+      periodClipped: queryResult.periodClipped,
+      maxQueryPeriod: queryResult.maxQueryPeriod,
+    });
+  } catch (err) {
+    const errorMessage = err instanceof Error ? err.message : "Unknown error executing query";
+    return typedjson(
+      {
+        error: errorMessage,
+        rows: null,
+        columns: null,
+        stats: null,
+        hiddenColumns: null,
+        reachedMaxRows: null,
+        explainOutput: null,
+        generatedSql: null,
+        queryId: null,
+        periodClipped: null,
+      },
+      { status: 500 }
+    );
+  }
+};
+
+export default function Page() {
+  const { defaultPeriod, defaultQuery, history, isAdmin, maxRows } =
+    useTypedLoaderData<typeof loader>();
+
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+  const plan = useCurrentPlan();
+  const maxPeriodDays = plan?.v3Subscription?.plan?.limits?.queryPeriodDays?.number;
+
+  // Use most recent history item if available, otherwise fall back to defaults
+  const initialQuery = history.length > 0 ? history[0].query : defaultQuery;
+  const initialScope = history.length > 0 ? history[0].scope : "environment";
+  const initialTimeFilter =
+    history.length > 0
+      ? {
+          period: history[0].filterPeriod ?? undefined,
+          from: history[0].filterFrom ? toISOString(history[0].filterFrom) : undefined,
+          to: history[0].filterTo ? toISOString(history[0].filterTo) : undefined,
+        }
+      : undefined;
+
+  // Build the query action URL for this page
+  const queryActionUrl = queryPath(
+    { slug: organization.slug },
+    { slug: project.slug },
+    { slug: environment.slug }
+  );
+
+  return (
+    <QueryEditor
+      defaultQuery={initialQuery}
+      defaultScope={initialScope}
+      defaultPeriod={defaultPeriod}
+      defaultTimeFilter={initialTimeFilter}
+      history={history}
+      isAdmin={isAdmin}
+      maxRows={maxRows}
+      queryActionUrl={queryActionUrl}
+      mode={{ type: "standalone" }}
+      maxPeriodDays={maxPeriodDays}
+    />
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types.ts b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types.ts
new file mode 100644
index 00000000000..2fe8a980d84
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types.ts
@@ -0,0 +1,9 @@
+/**
+ * Time filter configuration that can be set by the AI.
+ * Used across both server and client code for AI query generation.
+ */
+export type AITimeFilter = {
+  period?: string;
+  from?: string;
+  to?: string;
+};
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
index de6dea27112..3ea70e1e18a 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
@@ -1,4 +1,5 @@
 import {
+  AdjustmentsHorizontalIcon,
   ArrowUpCircleIcon,
   BookOpenIcon,
   ChatBubbleLeftEllipsisIcon,
@@ -8,19 +9,14 @@ import {
   RectangleStackIcon,
 } from "@heroicons/react/20/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
-import {
-  Form,
-  useNavigate,
-  useNavigation,
-  useRevalidator,
-  useSearchParams,
-  type MetaFunction,
-} from "@remix-run/react";
+import { Form, useNavigation, useSearchParams, type MetaFunction } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { type RuntimeEnvironmentType } from "@trigger.dev/database";
+import type { RuntimeEnvironmentType } from "@trigger.dev/database";
+import type { QueueItem } from "@trigger.dev/core/v3/schemas";
 import { useEffect, useState } from "react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
+import { RunsIcon } from "~/assets/icons/RunsIcon";
 import { TaskIconSmall } from "~/assets/icons/TaskIcon";
 import upgradeForQueuesPath from "~/assets/images/queues-dashboard.png";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
@@ -30,13 +26,16 @@ import { Feedback } from "~/components/Feedback";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { BigNumber } from "~/components/metrics/BigNumber";
 import { Badge } from "~/components/primitives/Badge";
-import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Button, LinkButton, type ButtonVariant } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
 import { FormButtons } from "~/components/primitives/FormButtons";
+import { Header3 } from "~/components/primitives/Headers";
+import { Input } from "~/components/primitives/Input";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
 import { PaginationControls } from "~/components/primitives/Pagination";
 import { Paragraph } from "~/components/primitives/Paragraph";
+import { PopoverMenuItem } from "~/components/primitives/Popover";
 import { Spinner } from "~/components/primitives/Spinner";
 import {
   Table,
@@ -48,30 +47,40 @@ import {
   TableRow,
 } from "~/components/primitives/Table";
 import {
+  InfoIconTooltip,
   SimpleTooltip,
   Tooltip,
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
 } from "~/components/primitives/Tooltip";
+import { env } from "~/env.server";
+import { useAutoRevalidate } from "~/hooks/useAutoRevalidate";
 import { useEnvironment } from "~/hooks/useEnvironment";
-import { useEventSource } from "~/hooks/useEventSource";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
+import { useThrottle } from "~/hooks/useThrottle";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { getUserById } from "~/models/user.server";
 import { EnvironmentQueuePresenter } from "~/presenters/v3/EnvironmentQueuePresenter.server";
 import { QueueListPresenter } from "~/presenters/v3/QueueListPresenter.server";
 import { requireUserId } from "~/services/session.server";
 import { cn } from "~/utils/cn";
-import { docsPath, EnvironmentParamSchema, v3BillingPath } from "~/utils/pathBuilder";
+import {
+  concurrencyPath,
+  docsPath,
+  EnvironmentParamSchema,
+  v3BillingPath,
+  v3RunsPath,
+} from "~/utils/pathBuilder";
+import { concurrencySystem } from "~/v3/services/concurrencySystemInstance.server";
 import { PauseEnvironmentService } from "~/v3/services/pauseEnvironment.server";
 import { PauseQueueService } from "~/v3/services/pauseQueue.server";
 import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
-import { Header3 } from "~/components/primitives/Headers";
-import { Input } from "~/components/primitives/Input";
-import { useThrottle } from "~/hooks/useThrottle";
+import { ConcurrencyIcon } from "~/assets/icons/ConcurrencyIcon";
+import { QueueName } from "~/components/runs/v3/QueueName";
 
 const SearchParamsSchema = z.object({
   query: z.string().optional(),
@@ -119,9 +128,12 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 
     const environmentQueuePresenter = new EnvironmentQueuePresenter();
 
+    const autoReloadPollIntervalMs = env.QUEUES_AUTORELOAD_POLL_INTERVAL_MS;
+
     return typedjson({
       ...queues,
       environment: await environmentQueuePresenter.call(environment),
+      autoReloadPollIntervalMs,
     });
   } catch (error) {
     console.error(error);
@@ -209,34 +221,108 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
         `Queue ${action === "queue-pause" ? "paused" : "resumed"}`
       );
     }
+    case "queue-override": {
+      const friendlyId = formData.get("friendlyId");
+      const concurrencyLimit = formData.get("concurrencyLimit");
+
+      if (!friendlyId) {
+        return redirectWithErrorMessage(redirectPath, request, "Queue ID is required");
+      }
+
+      if (!concurrencyLimit) {
+        return redirectWithErrorMessage(redirectPath, request, "Concurrency limit is required");
+      }
+
+      const limitNumber = parseInt(concurrencyLimit.toString(), 10);
+      if (isNaN(limitNumber) || limitNumber < 0) {
+        return redirectWithErrorMessage(
+          redirectPath,
+          request,
+          "Concurrency limit must be a valid number"
+        );
+      }
+
+      const user = await getUserById(userId);
+      if (!user) {
+        return redirectWithErrorMessage(redirectPath, request, "User not found");
+      }
+
+      const result = await concurrencySystem.queues.overrideQueueConcurrencyLimit(
+        environment,
+        friendlyId.toString(),
+        limitNumber,
+        user
+      );
+
+      if (!result.isOk()) {
+        return redirectWithErrorMessage(
+          redirectPath,
+          request,
+          "Failed to override queue concurrency limit"
+        );
+      }
+
+      return redirectWithSuccessMessage(
+        redirectPath,
+        request,
+        "Queue concurrency limit overridden"
+      );
+    }
+    case "queue-remove-override": {
+      const friendlyId = formData.get("friendlyId");
+
+      if (!friendlyId) {
+        return redirectWithErrorMessage(redirectPath, request, "Queue ID is required");
+      }
+
+      const result = await concurrencySystem.queues.resetConcurrencyLimit(
+        environment,
+        friendlyId.toString()
+      );
+
+      if (!result.isOk()) {
+        return redirectWithErrorMessage(
+          redirectPath,
+          request,
+          "Failed to reset queue concurrency limit"
+        );
+      }
+
+      return redirectWithSuccessMessage(redirectPath, request, "Queue concurrency limit reset");
+    }
     default:
       return redirectWithErrorMessage(redirectPath, request, "Something went wrong");
   }
 };
 
 export default function Page() {
-  const { environment, queues, success, pagination, code, totalQueues, hasFilters } =
-    useTypedLoaderData<typeof loader>();
+  const {
+    environment,
+    queues,
+    success,
+    pagination,
+    code,
+    totalQueues,
+    hasFilters,
+    autoReloadPollIntervalMs,
+  } = useTypedLoaderData<typeof loader>();
 
   const organization = useOrganization();
   const project = useProject();
   const env = useEnvironment();
   const plan = useCurrentPlan();
 
-  // Reload the page periodically
-  const streamedEvents = useEventSource(
-    `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${env.slug}/queues/stream`,
-    {
-      event: "update",
-    }
-  );
+  useAutoRevalidate({ interval: autoReloadPollIntervalMs, onFocus: true });
 
-  const revalidation = useRevalidator();
-  useEffect(() => {
-    if (streamedEvents) {
-      revalidation.revalidate();
-    }
-  }, [streamedEvents]);
+  const limitStatus =
+    environment.running === environment.concurrencyLimit * environment.burstFactor
+      ? "limit"
+      : environment.running > environment.concurrencyLimit
+      ? "burst"
+      : "within";
+
+  const limitClassName =
+    limitStatus === "burst" ? "text-warning" : limitStatus === "limit" ? "text-error" : undefined;
 
   return (
     <PageContainer>
@@ -261,21 +347,54 @@ export default function Page() {
               value={environment.queued}
               suffix={env.paused && environment.queued > 0 ? "paused" : undefined}
               animate
-              accessory={<EnvironmentPauseResumeButton env={env} />}
-              valueClassName={env.paused ? "text-warning" : undefined}
+              accessory={
+                <div className="flex items-start gap-1">
+                  {environment.runsEnabled ? <EnvironmentPauseResumeButton env={env} /> : null}
+                  <LinkButton
+                    variant="secondary/small"
+                    LeadingIcon={RunsIcon}
+                    leadingIconClassName="text-runs"
+                    className="px-2"
+                    to={v3RunsPath(organization, project, env, {
+                      statuses: ["PENDING"],
+                      period: "30d",
+                      rootOnly: false,
+                    })}
+                    tooltip="View queued runs"
+                  />
+                </div>
+              }
+              valueClassName={cn(env.paused ? "text-warning" : undefined, "tabular-nums")}
               compactThreshold={1000000}
             />
             <BigNumber
               title="Running"
               value={environment.running}
               animate
-              valueClassName={
-                environment.running === environment.concurrencyLimit ? "text-warning" : undefined
-              }
+              valueClassName={cn(limitClassName, "tabular-nums")}
               suffix={
-                environment.running === environment.concurrencyLimit
-                  ? "At concurrency limit"
-                  : undefined
+                limitStatus === "burst" ? (
+                  <span className={cn(limitClassName, "flex items-center gap-1")}>
+                    Including {environment.running - environment.concurrencyLimit} burst runs{" "}
+                    <BurstFactorTooltip environment={environment} />
+                  </span>
+                ) : limitStatus === "limit" ? (
+                  "At concurrency limit"
+                ) : undefined
+              }
+              accessory={
+                <LinkButton
+                  variant="secondary/small"
+                  LeadingIcon={RunsIcon}
+                  leadingIconClassName="text-runs"
+                  className="px-2"
+                  to={v3RunsPath(organization, project, env, {
+                    statuses: ["DEQUEUED", "EXECUTING"],
+                    period: "30d",
+                    rootOnly: false,
+                  })}
+                  tooltip="View running runs"
+                />
               }
               compactThreshold={1000000}
             />
@@ -283,24 +402,26 @@ export default function Page() {
               title="Concurrency limit"
               value={environment.concurrencyLimit}
               animate
-              valueClassName={
-                environment.running === environment.concurrencyLimit ? "text-warning" : undefined
+              valueClassName={limitClassName}
+              suffix={
+                environment.burstFactor > 1 ? (
+                  <span className={cn(limitClassName, "flex items-center gap-1")}>
+                    Burst limit {environment.burstFactor * environment.concurrencyLimit}{" "}
+                    <BurstFactorTooltip environment={environment} />
+                  </span>
+                ) : undefined
               }
               accessory={
                 plan ? (
                   plan?.v3Subscription?.plan?.limits.concurrentRuns.canExceed ? (
-                    <Feedback
-                      button={
-                        <Button
-                          variant="tertiary/small"
-                          LeadingIcon={ChatBubbleLeftEllipsisIcon}
-                          leadingIconClassName="text-indigo-500"
-                        >
-                          Increase limit…
-                        </Button>
-                      }
-                      defaultValue="concurrency"
-                    />
+                    <LinkButton
+                      to={concurrencyPath(organization, project, env)}
+                      variant="tertiary/small"
+                      LeadingIcon={ConcurrencyIcon}
+                      leadingIconClassName="text-amber-500"
+                    >
+                      Increase limit
+                    </LinkButton>
                   ) : (
                     <LinkButton
                       to={v3BillingPath(organization, "Upgrade your plan for more concurrency")}
@@ -323,13 +444,21 @@ export default function Page() {
                 pagination.totalPages > 1 && "grid-rows-[auto_1fr_auto]"
               )}
             >
-              <QueueFilters />
+              <div className="flex items-center gap-2 border-t border-grid-dimmed px-1.5 py-1.5">
+                <QueueFilters />
+                <PaginationControls
+                  currentPage={pagination.currentPage}
+                  totalPages={pagination.totalPages}
+                  showPageNumbers={false}
+                />
+              </div>
               <Table containerClassName="border-t">
                 <TableHeader>
                   <TableRow>
                     <TableHeaderCell>Name</TableHeaderCell>
                     <TableHeaderCell alignment="right">Queued</TableHeaderCell>
-                    <TableHeaderCell alignment="right">Running/limit</TableHeaderCell>
+                    <TableHeaderCell alignment="right">Running</TableHeaderCell>
+                    <TableHeaderCell alignment="right">Limit</TableHeaderCell>
                     <TableHeaderCell
                       alignment="right"
                       tooltip={
@@ -355,12 +484,23 @@ export default function Page() {
                               This queue is limited by a concurrency limit set in your code.
                             </Paragraph>
                           </div>
+                          <div className="space-y-0.5">
+                            <Header3>Override</Header3>
+                            <Paragraph
+                              variant="small"
+                              className="!text-wrap text-text-dimmed"
+                              spacing
+                            >
+                              This queue's concurrency limit has been manually overridden from the
+                              dashboard or API.
+                            </Paragraph>
+                          </div>
                         </div>
                       }
                     >
                       Limited by
                     </TableHeaderCell>
-                    <TableHeaderCell className="w-[1%] pl-24">
+                    <TableHeaderCell className="w-[1%] pl-32">
                       <span className="sr-only">Pause/resume</span>
                     </TableHeaderCell>
                   </TableRow>
@@ -369,39 +509,27 @@ export default function Page() {
                   {queues.length > 0 ? (
                     queues.map((queue) => {
                       const limit = queue.concurrencyLimit ?? environment.concurrencyLimit;
-                      const isAtLimit = queue.running === limit;
+                      const isAtLimit = queue.running >= limit;
+                      const queueFilterableName = `${queue.type === "task" ? "task/" : ""}${
+                        queue.name
+                      }`;
                       return (
                         <TableRow key={queue.name}>
                           <TableCell>
                             <span className="flex items-center gap-2">
-                              {queue.type === "task" ? (
-                                <SimpleTooltip
-                                  button={
-                                    <TaskIconSmall
-                                      className={cn(
-                                        "size-[1.125rem] text-blue-500",
-                                        queue.paused && "opacity-50"
-                                      )}
-                                    />
-                                  }
-                                  content={`This queue was automatically created from your "${queue.name}" task`}
-                                />
-                              ) : (
+                              <QueueName {...queue} />
+                              {queue.concurrency?.overriddenAt ? (
                                 <SimpleTooltip
                                   button={
-                                    <RectangleStackIcon
-                                      className={cn(
-                                        "size-[1.125rem] text-purple-500",
-                                        queue.paused && "opacity-50"
-                                      )}
-                                    />
+                                    <Badge variant="extra-small" className="text-text-bright">
+                                      Concurrency limit overridden
+                                    </Badge>
                                   }
-                                  content={`This is a custom queue you added in your code.`}
+                                  content="This queue's concurrency limit has been manually overridden from the dashboard or API."
+                                  className="max-w-xs"
+                                  disableHoverableContent
                                 />
-                              )}
-                              <span className={queue.paused ? "opacity-50" : undefined}>
-                                {queue.name}
-                              </span>
+                              ) : null}
                               {queue.paused ? (
                                 <Badge variant="extra-small" className="text-warning">
                                   Paused
@@ -416,31 +544,50 @@ export default function Page() {
                           </TableCell>
                           <TableCell
                             alignment="right"
-                            className={queue.paused ? "opacity-50" : undefined}
+                            className={cn(
+                              "w-[1%] pl-16 tabular-nums",
+                              queue.paused ? "opacity-50" : undefined
+                            )}
                           >
                             {queue.queued}
                           </TableCell>
                           <TableCell
                             alignment="right"
                             className={cn(
-                              queue.paused ? "tabular-nums opacity-50" : undefined,
+                              "w-[1%] pl-16 tabular-nums",
+                              queue.paused ? "opacity-50" : undefined,
                               queue.running > 0 && "text-text-bright",
                               isAtLimit && "text-warning"
                             )}
                           >
-                            {queue.running}/
-                            <span className={cn("tabular-nums", isAtLimit && "text-warning")}>
-                              {limit}
-                            </span>
+                            {queue.running}
                           </TableCell>
                           <TableCell
                             alignment="right"
                             className={cn(
+                              "w-[1%] pl-16 tabular-nums",
                               queue.paused ? "opacity-50" : undefined,
-                              isAtLimit && "text-warning"
+                              queue.concurrency?.overriddenAt && "font-medium text-text-bright"
                             )}
                           >
-                            {queue.concurrencyLimit ? "User" : "Environment"}
+                            {limit}
+                          </TableCell>
+                          <TableCell
+                            alignment="right"
+                            className={cn(
+                              "w-[1%] pl-16",
+                              queue.paused ? "opacity-50" : undefined,
+                              isAtLimit && "text-warning",
+                              queue.concurrency?.overriddenAt && "font-medium text-text-bright"
+                            )}
+                          >
+                            {queue.concurrency?.overriddenAt ? (
+                              <span className="text-text-bright">Override</span>
+                            ) : queue.concurrencyLimit ? (
+                              "User"
+                            ) : (
+                              "Environment"
+                            )}
                           </TableCell>
                           <TableCellMenu
                             isSticky
@@ -450,13 +597,69 @@ export default function Page() {
                             hiddenButtons={
                               !queue.paused && <QueuePauseResumeButton queue={queue} />
                             }
+                            popoverContent={
+                              <>
+                                {queue.paused ? (
+                                  <QueuePauseResumeButton
+                                    queue={queue}
+                                    variant="minimal/small"
+                                    fullWidth
+                                    showTooltip={false}
+                                  />
+                                ) : (
+                                  <QueuePauseResumeButton
+                                    queue={queue}
+                                    variant="minimal/small"
+                                    fullWidth
+                                    showTooltip={false}
+                                  />
+                                )}
+
+                                <PopoverMenuItem
+                                  icon={RunsIcon}
+                                  leadingIconClassName="text-runs"
+                                  title="View all runs"
+                                  to={v3RunsPath(organization, project, env, {
+                                    queues: [queueFilterableName],
+                                    period: "30d",
+                                    rootOnly: false,
+                                  })}
+                                />
+                                <PopoverMenuItem
+                                  icon={RectangleStackIcon}
+                                  leadingIconClassName="text-queues"
+                                  title="View queued runs"
+                                  to={v3RunsPath(organization, project, env, {
+                                    queues: [queueFilterableName],
+                                    statuses: ["PENDING"],
+                                    period: "30d",
+                                    rootOnly: false,
+                                  })}
+                                />
+                                <PopoverMenuItem
+                                  icon={Spinner}
+                                  leadingIconClassName="text-queues animate-none"
+                                  title="View running runs"
+                                  to={v3RunsPath(organization, project, env, {
+                                    queues: [queueFilterableName],
+                                    statuses: ["DEQUEUED", "EXECUTING"],
+                                    period: "30d",
+                                    rootOnly: false,
+                                  })}
+                                />
+                                <QueueOverrideConcurrencyButton
+                                  queue={queue}
+                                  environmentConcurrencyLimit={environment.concurrencyLimit}
+                                />
+                              </>
+                            }
                           />
                         </TableRow>
                       );
                     })
                   ) : (
                     <TableRow>
-                      <TableCell colSpan={6}>
+                      <TableCell colSpan={7}>
                         <div className="grid place-items-center py-6 text-text-dimmed">
                           <Paragraph>
                             {hasFilters
@@ -603,40 +806,59 @@ function EnvironmentPauseResumeButton({
 
 function QueuePauseResumeButton({
   queue,
+  variant = "tertiary/small",
+  fullWidth = false,
+  showTooltip = true,
 }: {
   /** The "id" here is a friendlyId */
   queue: { id: string; name: string; paused: boolean };
+  variant?: ButtonVariant;
+  fullWidth?: boolean;
+  showTooltip?: boolean;
 }) {
-  const navigation = useNavigation();
   const [isOpen, setIsOpen] = useState(false);
 
+  const trigger = showTooltip ? (
+    <div>
+      <TooltipProvider disableHoverableContent={true}>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <div>
+              <DialogTrigger asChild>
+                <Button
+                  type="button"
+                  variant={variant}
+                  LeadingIcon={queue.paused ? PlayIcon : PauseIcon}
+                  leadingIconClassName={queue.paused ? "text-success" : "text-warning"}
+                  fullWidth={fullWidth}
+                  textAlignLeft={fullWidth}
+                >
+                  {queue.paused ? "Resume..." : "Pause..."}
+                </Button>
+              </DialogTrigger>
+            </div>
+          </TooltipTrigger>
+          <TooltipContent side="right" className={"text-xs"}>
+            {queue.paused
+              ? `Resume processing runs in queue "${queue.name}"`
+              : `Pause processing runs in queue "${queue.name}"`}
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    </div>
+  ) : (
+    <DialogTrigger asChild>
+      <PopoverMenuItem
+        icon={queue.paused ? PlayIcon : PauseIcon}
+        leadingIconClassName={queue.paused ? "text-success" : "text-warning"}
+        title={queue.paused ? "Resume..." : "Pause..."}
+      />
+    </DialogTrigger>
+  );
+
   return (
     <Dialog open={isOpen} onOpenChange={setIsOpen}>
-      <div>
-        <TooltipProvider disableHoverableContent={true}>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <div>
-                <DialogTrigger asChild>
-                  <Button
-                    type="button"
-                    variant="tertiary/small"
-                    LeadingIcon={queue.paused ? PlayIcon : PauseIcon}
-                    leadingIconClassName={queue.paused ? "text-success" : "text-warning"}
-                  >
-                    {queue.paused ? "Resume..." : "Pause..."}
-                  </Button>
-                </DialogTrigger>
-              </div>
-            </TooltipTrigger>
-            <TooltipContent side="right" className={"text-xs"}>
-              {queue.paused
-                ? `Resume processing runs in queue "${queue.name}"`
-                : `Pause processing runs in queue "${queue.name}"`}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
-      </div>
+      {trigger}
       <DialogContent>
         <DialogHeader>{queue.paused ? "Resume queue?" : "Pause queue?"}</DialogHeader>
         <div className="flex flex-col gap-3 pt-3">
@@ -678,6 +900,129 @@ function QueuePauseResumeButton({
   );
 }
 
+function QueueOverrideConcurrencyButton({
+  queue,
+  environmentConcurrencyLimit,
+}: {
+  queue: QueueItem;
+  environmentConcurrencyLimit: number;
+}) {
+  const navigation = useNavigation();
+  const [isOpen, setIsOpen] = useState(false);
+  const [concurrencyLimit, setConcurrencyLimit] = useState<string>(
+    queue.concurrencyLimit?.toString() ?? environmentConcurrencyLimit.toString()
+  );
+
+  const isOverridden = !!queue.concurrency?.overriddenAt;
+  const currentLimit = queue.concurrencyLimit ?? environmentConcurrencyLimit;
+
+  useEffect(() => {
+    if (navigation.state === "loading" || navigation.state === "idle") {
+      setIsOpen(false);
+    }
+  }, [navigation.state]);
+
+  const isLoading = Boolean(
+    navigation.formData?.get("action") === "queue-override" ||
+      navigation.formData?.get("action") === "queue-remove-override"
+  );
+
+  return (
+    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+      <DialogTrigger asChild>
+        <PopoverMenuItem
+          icon={AdjustmentsHorizontalIcon}
+          title={isOverridden ? "Edit override…" : "Override limit…"}
+        />
+      </DialogTrigger>
+      <DialogContent>
+        <DialogHeader>
+          {isOverridden ? "Edit concurrency override" : "Override concurrency limit"}
+        </DialogHeader>
+        <div className="flex flex-col gap-3 pt-3">
+          {isOverridden ? (
+            <Paragraph>
+              This queue's concurrency limit is currently overridden to {currentLimit}.
+              {typeof queue.concurrency?.base === "number" &&
+                ` The original limit set in code was ${queue.concurrency.base}.`}{" "}
+              You can update the override or remove it to restore the{" "}
+              {typeof queue.concurrency?.base === "number"
+                ? "limit set in code"
+                : "environment concurrency limit"}
+              .
+            </Paragraph>
+          ) : (
+            <Paragraph>
+              Override this queue's concurrency limit. The current limit is {currentLimit}, which is
+              set {queue.concurrencyLimit !== null ? "in code" : "by the environment"}.
+            </Paragraph>
+          )}
+          <Form method="post" onSubmit={() => setIsOpen(false)} className="space-y-3">
+            <input type="hidden" name="friendlyId" value={queue.id} />
+            <div className="space-y-2">
+              <label htmlFor="concurrencyLimit" className="text-sm text-text-bright">
+                Concurrency limit
+              </label>
+              <Input
+                type="number"
+                name="concurrencyLimit"
+                id="concurrencyLimit"
+                min="0"
+                max={environmentConcurrencyLimit}
+                value={concurrencyLimit}
+                onChange={(e) => setConcurrencyLimit(e.target.value)}
+                placeholder={currentLimit.toString()}
+                autoFocus
+              />
+            </div>
+
+            <FormButtons
+              defaultAction={{
+                name: "action",
+                value: "queue-override",
+                disabled: isLoading || !concurrencyLimit,
+              }}
+              confirmButton={
+                <Button
+                  type="submit"
+                  name="action"
+                  value="queue-override"
+                  disabled={isLoading || !concurrencyLimit}
+                  variant="primary/medium"
+                  LeadingIcon={isLoading && <Spinner color="white" />}
+                  shortcut={{ modifiers: ["mod"], key: "enter" }}
+                >
+                  {isOverridden ? "Update override" : "Override limit"}
+                </Button>
+              }
+              cancelButton={
+                <div className="flex items-center justify-between gap-2">
+                  {isOverridden && (
+                    <Button
+                      type="submit"
+                      name="action"
+                      value="queue-remove-override"
+                      disabled={isLoading}
+                      variant="danger/medium"
+                    >
+                      Remove override
+                    </Button>
+                  )}
+                  <DialogClose asChild>
+                    <Button type="button" variant="tertiary/medium">
+                      Cancel
+                    </Button>
+                  </DialogClose>
+                </div>
+              }
+            />
+          </Form>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
 function EngineVersionUpgradeCallout() {
   return (
     <div className="mt-4 flex max-w-lg flex-col gap-4 rounded-sm border border-grid-bright bg-background-bright px-4">
@@ -743,7 +1088,7 @@ export function QueueFilters() {
   const search = searchParams.get("query") ?? "";
 
   return (
-    <div className="flex w-full border-t border-grid-dimmed px-1.5 py-1.5">
+    <div className="flex grow">
       <Input
         name="search"
         placeholder="Search queue name"
@@ -756,3 +1101,20 @@ export function QueueFilters() {
     </div>
   );
 }
+
+function BurstFactorTooltip({
+  environment,
+}: {
+  environment: { burstFactor: number; concurrencyLimit: number };
+}) {
+  return (
+    <InfoIconTooltip
+      content={`Your single queue concurrency limit is capped at ${
+        environment.concurrencyLimit
+      }, but you can burst up to ${
+        environment.burstFactor * environment.concurrencyLimit
+      } when across multiple queues/tasks.`}
+      contentClassName="max-w-xs"
+    />
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
new file mode 100644
index 00000000000..3484e1378b4
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
@@ -0,0 +1,464 @@
+import {
+  ArrowRightIcon,
+  ArrowUpCircleIcon,
+  BookOpenIcon,
+  ChatBubbleLeftEllipsisIcon,
+  InformationCircleIcon,
+  MapPinIcon,
+} from "@heroicons/react/20/solid";
+import { Form } from "@remix-run/react";
+import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { tryCatch } from "@trigger.dev/core";
+import { useState } from "react";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { CloudProviderIcon } from "~/assets/icons/CloudProviderIcon";
+import { FlagIcon } from "~/assets/icons/RegionIcons";
+import { cloudProviderTitle } from "~/components/CloudProvider";
+import { Feedback } from "~/components/Feedback";
+import { V4Title } from "~/components/V4Badge";
+import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { MainCenteredContainer, PageBody, PageContainer } from "~/components/layout/AppLayout";
+import { Badge } from "~/components/primitives/Badge";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { ClipboardField } from "~/components/primitives/ClipboardField";
+import { CopyableText } from "~/components/primitives/CopyableText";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "~/components/primitives/Dialog";
+import { InfoPanel } from "~/components/primitives/InfoPanel";
+import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import * as Property from "~/components/primitives/PropertyTable";
+import {
+  Table,
+  TableBlankRow,
+  TableBody,
+  TableCell,
+  TableCellMenu,
+  TableHeader,
+  TableHeaderCell,
+  TableRow,
+} from "~/components/primitives/Table";
+import { TextLink } from "~/components/primitives/TextLink";
+import { useFeatures } from "~/hooks/useFeatures";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useHasAdminAccess } from "~/hooks/useUser";
+import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { type Region, RegionsPresenter } from "~/presenters/v3/RegionsPresenter.server";
+import { requireUser } from "~/services/session.server";
+import {
+  docsPath,
+  EnvironmentParamSchema,
+  ProjectParamSchema,
+  regionsPath,
+  v3BillingPath,
+} from "~/utils/pathBuilder";
+import { SetDefaultRegionService } from "~/v3/services/setDefaultRegion.server";
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const { projectParam } = ProjectParamSchema.parse(params);
+
+  const presenter = new RegionsPresenter();
+  const [error, result] = await tryCatch(
+    presenter.call({
+      userId: user.id,
+      projectSlug: projectParam,
+      isAdmin: user.admin || user.isImpersonating,
+    })
+  );
+
+  if (error) {
+    throw new Response(undefined, {
+      status: 400,
+      statusText: error.message,
+    });
+  }
+
+  return typedjson(result);
+};
+
+const FormSchema = z.object({
+  regionId: z.string(),
+});
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const user = await requireUser(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
+
+  const redirectPath = regionsPath(
+    { slug: organizationSlug },
+    { slug: projectParam },
+    { slug: envParam }
+  );
+
+  if (!project) {
+    throw redirectWithErrorMessage(redirectPath, request, "Project not found");
+  }
+
+  const formData = await request.formData();
+  const parsedFormData = FormSchema.safeParse(Object.fromEntries(formData));
+
+  if (!parsedFormData.success) {
+    throw redirectWithErrorMessage(redirectPath, request, "No region specified");
+  }
+
+  const service = new SetDefaultRegionService();
+  const [error, result] = await tryCatch(
+    service.call({
+      projectId: project.id,
+      regionId: parsedFormData.data.regionId,
+      isAdmin: user.admin || user.isImpersonating,
+    })
+  );
+
+  if (error) {
+    return redirectWithErrorMessage(redirectPath, request, error.message);
+  }
+
+  return redirectWithSuccessMessage(redirectPath, request, `Set ${result.name} as default`);
+};
+
+export default function Page() {
+  const { regions, isPaying } = useTypedLoaderData<typeof loader>();
+  const organization = useOrganization();
+  const isAdmin = useHasAdminAccess();
+  const { isManagedCloud } = useFeatures();
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title={<V4Title>Regions</V4Title>} />
+        <PageAccessories>
+          <AdminDebugTooltip>
+            <Property.Table>
+              {regions.map((region) => (
+                <Property.Item key={region.id}>
+                  <Property.Label>{region.name}</Property.Label>
+                  <Property.Value>{region.id}</Property.Value>
+                </Property.Item>
+              ))}
+            </Property.Table>
+          </AdminDebugTooltip>
+        </PageAccessories>
+      </NavBar>
+      <PageBody scrollable={false}>
+        <div className="grid max-h-full min-h-full grid-rows-[1fr]">
+          {regions.length === 0 ? (
+            <MainCenteredContainer className="max-w-md">
+              <div className="text-center">
+                <Paragraph>No regions found for this project.</Paragraph>
+              </div>
+            </MainCenteredContainer>
+          ) : (
+            <>
+              <div className="overflow-x-auto">
+                <Table>
+                  <TableHeader>
+                    <TableRow>
+                      <TableHeaderCell>Region</TableHeaderCell>
+                      <TableHeaderCell>Cloud Provider</TableHeaderCell>
+                      <TableHeaderCell>Location</TableHeaderCell>
+                      <TableHeaderCell>Static IPs</TableHeaderCell>
+                      {isAdmin && <TableHeaderCell>Admin</TableHeaderCell>}
+                      <TableHeaderCell
+                        alignment="right"
+                        tooltip={
+                          <div className="max-w-[12rem]">
+                            <Paragraph variant="small">
+                              When you trigger a run it will execute in your default region, unless
+                              you override the region when triggering.
+                            </Paragraph>
+                            <LinkButton
+                              variant="docs/small"
+                              LeadingIcon={BookOpenIcon}
+                              to={docsPath("triggering#region")}
+                              className="mb-1 mt-3"
+                            >
+                              Read docs
+                            </LinkButton>
+                          </div>
+                        }
+                      >
+                        Default region
+                      </TableHeaderCell>
+                    </TableRow>
+                  </TableHeader>
+                  <TableBody>
+                    {regions.length === 0 ? (
+                      <TableBlankRow colSpan={5}>
+                        <Paragraph>There are no regions for this project</Paragraph>
+                      </TableBlankRow>
+                    ) : (
+                      regions.map((region) => {
+                        return (
+                          <TableRow key={region.id}>
+                            <TableCell isTabbableCell>
+                              <CopyableText value={region.name} />
+                            </TableCell>
+                            <TableCell>
+                              {region.cloudProvider ? (
+                                <span className="flex items-center gap-2">
+                                  <CloudProviderIcon
+                                    provider={region.cloudProvider}
+                                    className="size-6"
+                                  />
+                                  {cloudProviderTitle(region.cloudProvider)}
+                                </span>
+                              ) : (
+                                "–"
+                              )}
+                            </TableCell>
+                            <TableCell>
+                              <span className="flex items-center gap-2">
+                                {region.location ? (
+                                  <FlagIcon region={region.location} className="size-5" />
+                                ) : null}
+                                {region.description ?? "–"}
+                              </span>
+                            </TableCell>
+                            <TableCell>
+                              {region.staticIPs === null ? (
+                                <LinkButton
+                                  variant="secondary/small"
+                                  to={v3BillingPath(
+                                    organization,
+                                    "Upgrade your plan to unlock static IPs"
+                                  )}
+                                  LeadingIcon={ArrowUpCircleIcon}
+                                  leadingIconClassName="text-indigo-500"
+                                >
+                                  Unlock static IPs
+                                </LinkButton>
+                              ) : region.staticIPs !== undefined ? (
+                                <ClipboardField
+                                  value={region.staticIPs}
+                                  variant={"secondary/small"}
+                                />
+                              ) : (
+                                "Not available"
+                              )}
+                            </TableCell>
+                            {isAdmin && (
+                              <TableCell>{region.isHidden ? "Hidden" : "Visible"}</TableCell>
+                            )}
+                            {region.isDefault ? (
+                              <TableCell alignment="right">
+                                <Badge variant="small" className="inline-grid">
+                                  Default
+                                </Badge>
+                              </TableCell>
+                            ) : (
+                              <TableCellMenu
+                                className="pl-32"
+                                isSticky
+                                visibleButtons={
+                                  <SetDefaultDialog regions={regions} newDefaultRegion={region} />
+                                }
+                              />
+                            )}
+                          </TableRow>
+                        );
+                      })
+                    )}
+
+                    <TableRow className="h-[3.125rem]">
+                      <TableCell colSpan={isAdmin ? 5 : 4}>
+                        <Paragraph variant="extra-small">Suggest a new region</Paragraph>
+                      </TableCell>
+                      <TableCellMenu
+                        alignment="right"
+                        isSticky
+                        visibleButtons={
+                          <Feedback
+                            button={
+                              <Button
+                                variant="secondary/small"
+                                LeadingIcon={ChatBubbleLeftEllipsisIcon}
+                                leadingIconClassName="text-indigo-500"
+                              >
+                                Suggest a region…
+                              </Button>
+                            }
+                            defaultValue="region"
+                          />
+                        }
+                      />
+                    </TableRow>
+                  </TableBody>
+                </Table>
+                {isManagedCloud && (
+                  <InfoPanel
+                    icon={InformationCircleIcon}
+                    iconClassName="size-4"
+                    variant="minimal"
+                    panelClassName="max-w-full gap-1"
+                  >
+                    <Paragraph variant="extra-small" className="flex items-baseline gap-x-0.5">
+                      Trigger.dev is fully GDPR compliant. Learn more in our{" "}
+                      <TextLink to="https://security.trigger.dev">security portal</TextLink> or{" "}
+                      <Feedback
+                        button={
+                          <Paragraph
+                            variant="extra-small"
+                            className="cursor-pointer text-indigo-500 transition hover:text-indigo-400"
+                          >
+                            get in touch
+                          </Paragraph>
+                        }
+                        defaultValue="help"
+                      />
+                      .
+                    </Paragraph>
+                  </InfoPanel>
+                )}
+              </div>
+            </>
+          )}
+        </div>
+      </PageBody>
+    </PageContainer>
+  );
+}
+
+function SetDefaultDialog({
+  regions,
+  newDefaultRegion,
+}: {
+  regions: Region[];
+  newDefaultRegion: Region;
+}) {
+  const [isOpen, setIsOpen] = useState(false);
+  const currentDefaultRegion = regions.find((r) => r.isDefault);
+
+  return (
+    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+      <DialogTrigger asChild>
+        <Button
+          variant="secondary/small"
+          LeadingIcon={MapPinIcon}
+          leadingIconClassName="text-blue-500"
+          iconSpacing="gap-2"
+          className="pl-2"
+        >
+          Set as default…
+        </Button>
+      </DialogTrigger>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Set as default region</DialogTitle>
+        </DialogHeader>
+        <DialogDescription>
+          <Paragraph>
+            Are you sure you want to set {newDefaultRegion.name} as your new default region?
+          </Paragraph>
+
+          <div className="my-4 flex">
+            <div className="flex flex-1 flex-col rounded-md border border-grid-dimmed">
+              <div className="border-b border-grid-dimmed bg-charcoal-800 p-3 font-medium">
+                <Paragraph variant="small/bright">Current default</Paragraph>
+              </div>
+              <div className="border-b border-grid-dimmed p-3">
+                <Paragraph variant="small">{currentDefaultRegion?.name ?? "–"}</Paragraph>
+              </div>
+              <div className="border-b border-grid-dimmed p-3">
+                <Paragraph variant="small" className="flex items-center gap-2">
+                  {currentDefaultRegion?.cloudProvider ? (
+                    <>
+                      <CloudProviderIcon
+                        provider={currentDefaultRegion.cloudProvider}
+                        className="size-6"
+                      />
+                      {cloudProviderTitle(currentDefaultRegion.cloudProvider)}
+                    </>
+                  ) : (
+                    "–"
+                  )}
+                </Paragraph>
+              </div>
+              <div className="p-3">
+                <Paragraph variant="small" className="flex items-center gap-2">
+                  {currentDefaultRegion?.location ? (
+                    <FlagIcon region={currentDefaultRegion.location} className="size-5" />
+                  ) : null}
+                  {currentDefaultRegion?.description ?? "–"}
+                </Paragraph>
+              </div>
+            </div>
+
+            {/* Middle column with arrow */}
+            <div className="flex items-center justify-center px-3">
+              <div className="flex size-10 items-center justify-center rounded-full border border-grid-dimmed bg-charcoal-800 p-2">
+                <ArrowRightIcon className="size-4 text-text-dimmed" />
+              </div>
+            </div>
+
+            {/* Right column */}
+            <div className="flex flex-1 flex-col rounded-md border border-grid-dimmed">
+              <div className="border-b border-grid-dimmed bg-charcoal-800 p-3 font-medium">
+                <Paragraph variant="small/bright">New default</Paragraph>
+              </div>
+              <div className="border-b border-grid-dimmed p-3">
+                <Paragraph variant="small">{newDefaultRegion.name}</Paragraph>
+              </div>
+              <div className="border-b border-grid-dimmed p-3">
+                <Paragraph variant="small" className="flex items-center gap-2">
+                  {newDefaultRegion.cloudProvider ? (
+                    <>
+                      <CloudProviderIcon
+                        provider={newDefaultRegion.cloudProvider}
+                        className="size-6"
+                      />
+                      {cloudProviderTitle(newDefaultRegion.cloudProvider)}
+                    </>
+                  ) : (
+                    "–"
+                  )}
+                </Paragraph>
+              </div>
+              <div className="p-3">
+                <Paragraph variant="small" className="flex items-center gap-2">
+                  {newDefaultRegion.location ? (
+                    <FlagIcon region={newDefaultRegion.location} className="size-5" />
+                  ) : null}
+                  {newDefaultRegion.description ?? "–"}
+                </Paragraph>
+              </div>
+            </div>
+          </div>
+
+          <Paragraph>
+            Runs triggered from now on will execute in "{newDefaultRegion.name}", unless you{" "}
+            <TextLink to={docsPath("triggering#region")}>override when triggering</TextLink>.
+          </Paragraph>
+        </DialogDescription>
+        <DialogFooter>
+          <Button variant="secondary/medium" onClick={() => setIsOpen(false)}>
+            Cancel
+          </Button>
+          <Form method="post">
+            <Button
+              variant="primary/medium"
+              type="submit"
+              name="regionId"
+              shortcut={{ modifiers: ["mod"], key: "enter" }}
+              value={newDefaultRegion.id}
+            >
+              Set as default
+            </Button>
+          </Form>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.stream/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.stream/route.tsx
index 682337caed7..87f3be8a03d 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.stream/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.stream/route.tsx
@@ -1,13 +1,11 @@
 import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { z } from "zod";
-import { RunStreamPresenter } from "~/presenters/v3/RunStreamPresenter.server";
+import { runStreamLoader } from "~/presenters/v3/RunStreamPresenter.server";
 import { requireUserId } from "~/services/session.server";
 
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  await requireUserId(request);
+export async function loader(args: LoaderFunctionArgs) {
+  // Authenticate the user before starting the stream
+  await requireUserId(args.request);
 
-  const { runParam } = z.object({ runParam: z.string() }).parse(params);
-
-  const presenter = new RunStreamPresenter();
-  return presenter.call({ request, runFriendlyId: runParam });
+  // Delegate to the SSE loader
+  return runStreamLoader(args);
 }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
index a27e67f630b..e02d29b95b5 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
@@ -11,7 +11,8 @@ import {
   MagnifyingGlassPlusIcon,
   StopCircleIcon,
 } from "@heroicons/react/20/solid";
-import { useLoaderData, useParams, useRevalidator } from "@remix-run/react";
+
+import { useLoaderData, useRevalidator } from "@remix-run/react";
 import { type LoaderFunctionArgs, type SerializeFrom, json } from "@remix-run/server-runtime";
 import { type Virtualizer } from "@tanstack/react-virtual";
 import {
@@ -20,12 +21,15 @@ import {
   nanosecondsToMilliseconds,
   tryCatch,
 } from "@trigger.dev/core/v3";
-import { type RuntimeEnvironmentType } from "@trigger.dev/database";
+import type { RuntimeEnvironmentType } from "@trigger.dev/database";
 import { motion } from "framer-motion";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import { redirect } from "remix-typedjson";
-import { ShowParentIcon, ShowParentIconSelected } from "~/assets/icons/ShowParentIcon";
+import { ChevronExtraSmallDown } from "~/assets/icons/ChevronExtraSmallDown";
+import { ChevronExtraSmallUp } from "~/assets/icons/ChevronExtraSmallUp";
+import { MoveToTopIcon } from "~/assets/icons/MoveToTopIcon";
+import { MoveUpIcon } from "~/assets/icons/MoveUpIcon";
 import tileBgPath from "~/assets/images/error-banner-tile@2x.png";
 import { DevDisconnectedBanner, useCrossEngineIsConnected } from "~/components/DevPresence";
 import { WarmStartIconWithTooltip } from "~/components/WarmStarts";
@@ -33,6 +37,7 @@ import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { PageBody } from "~/components/layout/AppLayout";
 import { Badge } from "~/components/primitives/Badge";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { DateTimeShort } from "~/components/primitives/DateTime";
 import { Dialog, DialogTrigger } from "~/components/primitives/Dialog";
 import { Header3 } from "~/components/primitives/Headers";
@@ -60,6 +65,7 @@ import {
 import { type NodesState } from "~/components/primitives/TreeView/reducer";
 import { CancelRunDialog } from "~/components/runs/v3/CancelRunDialog";
 import { ReplayRunDialog } from "~/components/runs/v3/ReplayRunDialog";
+import { getRunFiltersFromSearchParams } from "~/components/runs/v3/RunFilters";
 import { RunIcon } from "~/components/runs/v3/RunIcon";
 import {
   SpanTitle,
@@ -67,7 +73,7 @@ import {
   eventBorderClassName,
 } from "~/components/runs/v3/SpanTitle";
 import { TaskRunStatusIcon, runStatusClassNameColor } from "~/components/runs/v3/TaskRunStatus";
-import { env } from "~/env.server";
+import { $replica } from "~/db.server";
 import { useDebounce } from "~/hooks/useDebounce";
 import { useEnvironment } from "~/hooks/useEnvironment";
 import { useEventSource } from "~/hooks/useEventSource";
@@ -75,10 +81,16 @@ import { useInitialDimensions } from "~/hooks/useInitialDimensions";
 import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { useReplaceSearchParams } from "~/hooks/useReplaceSearchParams";
+import { useSearchParams } from "~/hooks/useSearchParam";
 import { type Shortcut, useShortcutKeys } from "~/hooks/useShortcutKeys";
 import { useHasAdminAccess } from "~/hooks/useUser";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { NextRunListPresenter } from "~/presenters/v3/NextRunListPresenter.server";
 import { RunEnvironmentMismatchError, RunPresenter } from "~/presenters/v3/RunPresenter.server";
+import { clickhouseClient } from "~/services/clickhouseInstance.server";
 import { getImpersonationId } from "~/services/impersonation.server";
+import { logger } from "~/services/logger.server";
 import { getResizableSnapshot } from "~/services/resizablePanel.server";
 import { requireUserId } from "~/services/session.server";
 import { cn } from "~/utils/cn";
@@ -93,10 +105,9 @@ import {
   v3RunStreamingPath,
   v3RunsPath,
 } from "~/utils/pathBuilder";
+import type { SpanOverride } from "~/v3/eventRepository/eventRepository.types";
 import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
 import { SpanView } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route";
-import { useSearchParams } from "~/hooks/useSearchParam";
-import { CopyableText } from "~/components/primitives/CopyableText";
 
 const resizableSettings = {
   parent: {
@@ -130,6 +141,106 @@ const resizableSettings = {
 
 type TraceEvent = NonNullable<SerializeFrom<typeof loader>["trace"]>["events"][0];
 
+type RunsListNavigation = {
+  runs: Array<{ friendlyId: string; spanId: string }>;
+  pagination: { next?: string; previous?: string };
+  prevPageLastRun?: { friendlyId: string; spanId: string; cursor: string };
+  nextPageFirstRun?: { friendlyId: string; spanId: string; cursor: string };
+};
+
+async function getRunsListFromTableState({
+  tableStateParam,
+  organizationSlug,
+  projectParam,
+  envParam,
+  runParam,
+  userId,
+}: {
+  tableStateParam: string | null;
+  organizationSlug: string;
+  projectParam: string;
+  envParam: string;
+  runParam: string;
+  userId: string;
+}): Promise<RunsListNavigation | null> {
+  if (!tableStateParam) {
+    return null;
+  }
+
+  try {
+    const tableStateSearchParams = new URLSearchParams(decodeURIComponent(tableStateParam));
+    const filters = getRunFiltersFromSearchParams(tableStateSearchParams);
+
+    const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+    const environment = await findEnvironmentBySlug(project?.id ?? "", envParam, userId);
+
+    if (!project || !environment) {
+      return null;
+    }
+
+    const runsListPresenter = new NextRunListPresenter($replica, clickhouseClient);
+    const currentPageResult = await runsListPresenter.call(project.organizationId, environment.id, {
+      userId,
+      projectId: project.id,
+      ...filters,
+      pageSize: 25, // Load enough runs to provide navigation context
+    });
+
+    const runsList: RunsListNavigation = {
+      runs: currentPageResult.runs,
+      pagination: currentPageResult.pagination,
+    };
+
+    const currentRunIndex = currentPageResult.runs.findIndex((r) => r.friendlyId === runParam);
+
+    if (currentRunIndex === 0 && currentPageResult.pagination.previous) {
+      const prevPageResult = await runsListPresenter.call(project.organizationId, environment.id, {
+        userId,
+        projectId: project.id,
+        ...filters,
+        cursor: currentPageResult.pagination.previous,
+        direction: "backward",
+        pageSize: 1, // We only need the last run from the previous page
+      });
+
+      if (prevPageResult.runs.length > 0) {
+        runsList.prevPageLastRun = {
+          friendlyId: prevPageResult.runs[0].friendlyId,
+          spanId: prevPageResult.runs[0].spanId,
+          cursor: currentPageResult.pagination.previous,
+        };
+      }
+    }
+
+    if (
+      currentRunIndex === currentPageResult.runs.length - 1 &&
+      currentPageResult.pagination.next
+    ) {
+      const nextPageResult = await runsListPresenter.call(project.organizationId, environment.id, {
+        userId,
+        projectId: project.id,
+        ...filters,
+        cursor: currentPageResult.pagination.next,
+        direction: "forward",
+        pageSize: 1, // We only need the first run from the next page
+      });
+
+      if (nextPageResult.runs.length > 0) {
+        runsList.nextPageFirstRun = {
+          friendlyId: nextPageResult.runs[0].friendlyId,
+          spanId: nextPageResult.runs[0].spanId,
+          cursor: currentPageResult.pagination.next,
+        };
+      }
+    }
+
+    return runsList;
+  } catch (error) {
+    logger.error("Error loading runs list from tableState:", { error });
+    return null;
+  }
+}
+
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const userId = await requireUserId(request);
   const impersonationId = await getImpersonationId(request);
@@ -142,7 +253,6 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const [error, result] = await tryCatch(
     presenter.call({
       userId,
-      organizationSlug,
       showDeletedLogs: !!impersonationId,
       projectSlug: projectParam,
       runFriendlyId: runParam,
@@ -169,21 +279,31 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const parent = await getResizableSnapshot(request, resizableSettings.parent.autosaveId);
   const tree = await getResizableSnapshot(request, resizableSettings.tree.autosaveId);
 
+  const runsList = await getRunsListFromTableState({
+    tableStateParam: url.searchParams.get("tableState"),
+    organizationSlug,
+    projectParam,
+    envParam,
+    runParam,
+    userId,
+  });
+
   return json({
     run: result.run,
     trace: result.trace,
-    maximumLiveReloadingSetting: env.MAXIMUM_LIVE_RELOADING_EVENTS,
+    maximumLiveReloadingSetting: result.maximumLiveReloadingSetting,
     resizable: {
       parent,
       tree,
     },
+    runsList,
   });
 };
 
 type LoaderData = SerializeFrom<typeof loader>;
 
 export default function Page() {
-  const { run, trace, resizable, maximumLiveReloadingSetting } = useLoaderData<typeof loader>();
+  const { run, trace, maximumLiveReloadingSetting, runsList } = useLoaderData<typeof loader>();
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
@@ -191,16 +311,47 @@ export default function Page() {
     logCount: trace?.events.length ?? 0,
     isCompleted: run.completedAt !== null,
   });
+  const { value } = useSearchParams();
+  const tableState = decodeURIComponent(value("tableState") ?? "");
+  const tableStateSearchParams = new URLSearchParams(tableState);
+  const filters = getRunFiltersFromSearchParams(tableStateSearchParams);
+  const tabParam = value("tab") ?? undefined;
+  const spanParam = value("span") ?? undefined;
+
+  const [previousRunPath, nextRunPath] = useAdjacentRunPaths({
+    organization,
+    project,
+    environment,
+    tableState,
+    run,
+    runsList,
+    tabParam,
+    useSpan: !!spanParam,
+  });
 
   return (
     <>
       <NavBar>
         <PageTitle
           backButton={{
-            to: v3RunsPath(organization, project, environment),
+            to: v3RunsPath(organization, project, environment, filters),
             text: "Runs",
           }}
-          title={<CopyableText value={run.friendlyId} />}
+          title={
+            <div className="flex items-center gap-x-0">
+              <CopyableText
+                value={run.friendlyId}
+                variant="text-below"
+                className="-ml-[0.4375rem] h-6 px-1.5 font-mono text-xs hover:text-text-bright"
+              />
+              {tableState && (
+                <div className="flex">
+                  <PreviousRunButton to={previousRunPath} />
+                  <NextRunButton to={nextRunPath} />
+                </div>
+              )}
+            </div>
+          }
         />
         {environment.type === "DEVELOPMENT" && <DevDisconnectedBanner isConnected={isConnected} />}
         <PageAccessories>
@@ -276,22 +427,38 @@ export default function Page() {
             run={run}
             trace={trace}
             maximumLiveReloadingSetting={maximumLiveReloadingSetting}
-            resizable={resizable}
           />
         ) : (
-          <NoLogsView
-            run={run}
-            trace={trace}
-            maximumLiveReloadingSetting={maximumLiveReloadingSetting}
-            resizable={resizable}
-          />
+          <NoLogsView run={run} />
         )}
       </PageBody>
     </>
   );
 }
 
-function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: LoaderData) {
+function shouldLiveReload({
+  events,
+  maximumLiveReloadingSetting,
+  run,
+}: {
+  events: TraceEvent[];
+  maximumLiveReloadingSetting: number;
+  run: { completedAt: string | null };
+}): boolean {
+  // We don't live reload if there are a ton of spans/logs
+  if (events.length > maximumLiveReloadingSetting) return false;
+
+  // If the run was completed a while ago, we don't need to live reload anymore
+  if (run.completedAt && new Date(run.completedAt).getTime() < Date.now() - 30_000) return false;
+
+  return true;
+}
+
+function TraceView({
+  run,
+  trace,
+  maximumLiveReloadingSetting,
+}: Pick<LoaderData, "run" | "trace" | "maximumLiveReloadingSetting">) {
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
@@ -302,20 +469,21 @@ function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: Loade
     return <></>;
   }
 
-  const { events, parentRunFriendlyId, duration, rootSpanStatus, rootStartedAt, queuedDuration } =
+  const { events, duration, rootSpanStatus, rootStartedAt, queuedDuration, overridesBySpanId } =
     trace;
-  const shouldLiveReload = events.length <= maximumLiveReloadingSetting;
 
   const changeToSpan = useDebounce((selectedSpan: string) => {
     replaceSearchParam("span", selectedSpan, { replace: true });
   }, 250);
 
+  const isLiveReloading = shouldLiveReload({ events, maximumLiveReloadingSetting, run });
+
   const revalidator = useRevalidator();
   const streamedEvents = useEventSource(
     v3RunStreamingPath(organization, project, environment, run),
     {
       event: "message",
-      disabled: !shouldLiveReload,
+      disabled: !isLiveReloading,
     }
   );
   useEffect(() => {
@@ -325,6 +493,14 @@ function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: Loade
     // WARNING Don't put the revalidator in the useEffect deps array or bad things will happen
   }, [streamedEvents]); // eslint-disable-line react-hooks/exhaustive-deps
 
+  const spanOverrides = selectedSpanId ? overridesBySpanId?.[selectedSpanId] : undefined;
+
+  // Get the linked run ID for cached spans (map built during RunPresenter walk)
+  const { linkedRunIdBySpanId } = trace;
+  const selectedSpanLinkedRunId = selectedSpanId
+    ? linkedRunIdBySpanId?.[selectedSpanId]
+    : undefined;
+
   return (
     <div className={cn("grid h-full max-h-full grid-cols-1 overflow-hidden")}>
       <ResizablePanelGroup
@@ -340,7 +516,6 @@ function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: Loade
             selectedId={selectedSpanId}
             key={events[0]?.id ?? "-"}
             events={events}
-            parentRunFriendlyId={parentRunFriendlyId}
             onSelectedIdChanged={(selectedSpan) => {
               //instantly close the panel if no span is selected
               if (!selectedSpan) {
@@ -355,9 +530,10 @@ function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: Loade
             rootStartedAt={rootStartedAt ? new Date(rootStartedAt) : undefined}
             queuedDuration={queuedDuration}
             environmentType={run.environment.type}
-            shouldLiveReload={shouldLiveReload}
+            shouldLiveReload={isLiveReloading}
             maximumLiveReloadingSetting={maximumLiveReloadingSetting}
             rootRun={run.rootTaskRun}
+            parentRun={run.parentTaskRun}
             isCompleted={run.completedAt !== null}
           />
         </ResizablePanel>
@@ -373,7 +549,9 @@ function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: Loade
             <SpanView
               runParam={run.friendlyId}
               spanId={selectedSpanId}
+              spanOverrides={spanOverrides as SpanOverride | undefined}
               closePanel={() => replaceSearchParam("span")}
+              linkedRunId={selectedSpanLinkedRunId}
             />
           </ResizablePanel>
         )}
@@ -382,7 +560,7 @@ function TraceView({ run, trace, maximumLiveReloadingSetting, resizable }: Loade
   );
 }
 
-function NoLogsView({ run, resizable }: LoaderData) {
+function NoLogsView({ run }: Pick<LoaderData, "run">) {
   const plan = useCurrentPlan();
   const organization = useOrganization();
 
@@ -476,7 +654,6 @@ function NoLogsView({ run, resizable }: LoaderData) {
 type TasksTreeViewProps = {
   events: TraceEvent[];
   selectedId?: string;
-  parentRunFriendlyId?: string;
   onSelectedIdChanged: (selectedId: string | undefined) => void;
   totalDuration: number;
   rootSpanStatus: "executing" | "completed" | "failed";
@@ -487,7 +664,10 @@ type TasksTreeViewProps = {
   maximumLiveReloadingSetting: number;
   rootRun: {
     friendlyId: string;
-    taskIdentifier: string;
+    spanId: string;
+  } | null;
+  parentRun: {
+    friendlyId: string;
     spanId: string;
   } | null;
   isCompleted: boolean;
@@ -496,7 +676,6 @@ type TasksTreeViewProps = {
 function TasksTreeView({
   events,
   selectedId,
-  parentRunFriendlyId,
   onSelectedIdChanged,
   totalDuration,
   rootSpanStatus,
@@ -506,6 +685,7 @@ function TasksTreeView({
   shouldLiveReload,
   maximumLiveReloadingSetting,
   rootRun,
+  parentRun,
   isCompleted,
 }: TasksTreeViewProps) {
   const isAdmin = useHasAdminAccess();
@@ -596,20 +776,30 @@ function TasksTreeView({
           id={resizableSettings.tree.tree.id}
           default={resizableSettings.tree.tree.default}
           min={resizableSettings.tree.tree.min}
-          className="pl-3"
         >
           <div className="grid h-full grid-rows-[2rem_1fr] overflow-hidden">
-            <div className="flex items-center pr-2">
-              {rootRun ? (
-                <ShowParentLink
-                  runFriendlyId={rootRun.friendlyId}
-                  isRoot={true}
-                  spanId={rootRun.spanId}
+            <div className="flex items-center justify-between pl-1 pr-2">
+              {rootRun || parentRun ? (
+                <ShowParentOrRootLinks
+                  relationships={{
+                    root: rootRun
+                      ? {
+                          friendlyId: rootRun.friendlyId,
+                          spanId: rootRun.spanId,
+                          isParent: parentRun ? rootRun.friendlyId === parentRun.friendlyId : true,
+                        }
+                      : undefined,
+                    parent:
+                      parentRun && rootRun?.friendlyId !== parentRun.friendlyId
+                        ? {
+                            friendlyId: parentRun.friendlyId,
+                            spanId: "",
+                          }
+                        : undefined,
+                  }}
                 />
-              ) : parentRunFriendlyId ? (
-                <ShowParentLink runFriendlyId={parentRunFriendlyId} isRoot={false} />
               ) : (
-                <Paragraph variant="small" className="flex-1 text-charcoal-500">
+                <Paragraph variant="extra-small" className="flex-1 pl-3 text-charcoal-500">
                   This is the root task
                 </Paragraph>
               )}
@@ -628,6 +818,7 @@ function TasksTreeView({
               nodes={nodes}
               getNodeProps={getNodeProps}
               getTreeProps={getTreeProps}
+              parentClassName="pl-3"
               renderNode={({ node, state, index }) => (
                 <>
                   <div
@@ -734,7 +925,7 @@ function TasksTreeView({
       </ResizablePanelGroup>
       <div className="flex items-center justify-between gap-2 border-t border-grid-dimmed px-4">
         <div className="grow @container">
-          <div className="hidden items-center gap-4 @[42rem]:flex">
+          <div className="hidden items-center gap-4 @[48rem]:flex">
             <KeyboardShortcuts
               expandAllBelowDepth={expandAllBelowDepth}
               collapseAllBelowDepth={collapseAllBelowDepth}
@@ -742,7 +933,7 @@ function TasksTreeView({
               setShowDurations={setShowDurations}
             />
           </div>
-          <div className="@[42rem]:hidden">
+          <div className="@[48rem]:hidden">
             <Popover>
               <PopoverArrowTrigger>Shortcuts</PopoverArrowTrigger>
               <PopoverContent
@@ -803,7 +994,6 @@ function TimelineView({
   scale,
   rootSpanStatus,
   rootStartedAt,
-  parentRef,
   timelineScrollRef,
   virtualizer,
   events,
@@ -819,6 +1009,7 @@ function TimelineView({
   const initialTimelineDimensions = useInitialDimensions(timelineContainerRef);
   const minTimelineWidth = initialTimelineDimensions?.width ?? 300;
   const maxTimelineWidth = minTimelineWidth * 10;
+  const disableSpansAnimations = rootSpanStatus !== "executing";
 
   //we want to live-update the duration if the root span is still executing
   const [duration, setDuration] = useState(queueAdjustedNs(totalDuration, queuedDuration));
@@ -990,7 +1181,10 @@ function TimelineView({
                                     "-ml-[0.5px] h-[0.5625rem] w-px rounded-none",
                                     eventBackgroundClassName(node.data)
                                   )}
-                                  layoutId={`${node.id}-${event.name}`}
+                                  layoutId={
+                                    disableSpansAnimations ? undefined : `${node.id}-${event.name}`
+                                  }
+                                  animate={disableSpansAnimations ? false : undefined}
                                 />
                               )}
                             </Timeline.Point>
@@ -1008,7 +1202,10 @@ function TimelineView({
                                     "-ml-[0.1562rem] size-[0.3125rem] rounded-full border bg-background-bright",
                                     eventBorderClassName(node.data)
                                   )}
-                                  layoutId={`${node.id}-${event.name}`}
+                                  layoutId={
+                                    disableSpansAnimations ? undefined : `${node.id}-${event.name}`
+                                  }
+                                  animate={disableSpansAnimations ? false : undefined}
                                 />
                               )}
                             </Timeline.Point>
@@ -1027,7 +1224,8 @@ function TimelineView({
                           >
                             <motion.div
                               className={cn("h-px w-full", eventBackgroundClassName(node.data))}
-                              layoutId={`mark-${node.id}`}
+                              layoutId={disableSpansAnimations ? undefined : `mark-${node.id}`}
+                              animate={disableSpansAnimations ? false : undefined}
                             />
                           </Timeline.Span>
                         ) : null}
@@ -1050,6 +1248,7 @@ function TimelineView({
                           }
                           node={node}
                           fadeLeft={isTopSpan && queuedDuration !== undefined}
+                          disableAnimations={disableSpansAnimations}
                         />
                       </>
                     ) : (
@@ -1064,7 +1263,8 @@ function TimelineView({
                               "-ml-0.5 size-3 rounded-full border-2 border-background-bright",
                               eventBackgroundClassName(node.data)
                             )}
-                            layoutId={node.id}
+                            layoutId={disableSpansAnimations ? undefined : node.id}
+                            animate={disableSpansAnimations ? false : undefined}
                           />
                         )}
                       </Timeline.Point>
@@ -1139,60 +1339,108 @@ function TaskLine({ isError, isSelected }: { isError: boolean; isSelected: boole
   return <div className={cn("h-8 w-2 border-r border-grid-bright")} />;
 }
 
-function ShowParentLink({
-  runFriendlyId,
-  spanId,
-  isRoot,
+function ShowParentOrRootLinks({
+  relationships,
 }: {
-  runFriendlyId: string;
-  spanId?: string;
-  isRoot: boolean;
+  relationships: {
+    root?: {
+      friendlyId: string;
+      spanId: string;
+      isParent?: boolean;
+    };
+    parent?: {
+      friendlyId: string;
+      spanId: string;
+    };
+  };
 }) {
-  const [mouseOver, setMouseOver] = useState(false);
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
-  const { spanParam } = useParams();
 
-  const span = spanId ? spanId : spanParam;
+  // Case 1: Root is also the parent
+  if (relationships.root?.isParent === true) {
+    return (
+      <LinkButton
+        variant="minimal/small"
+        to={v3RunSpanPath(
+          organization,
+          project,
+          environment,
+          { friendlyId: relationships.root.friendlyId },
+          { spanId: relationships.root.spanId }
+        )}
+        LeadingIcon={MoveToTopIcon}
+        leadingIconClassName="gap-x-2"
+        shortcut={{ key: "p" }}
+        hideShortcutKey
+        tooltip={
+          <div className="-mr-1 flex items-center gap-1">
+            <Paragraph variant="extra-small">Jump to root and parent run</Paragraph>
+            <ShortcutKey shortcut={{ key: "p" }} variant="small" />
+          </div>
+        }
+        className="text-xs"
+      >
+        Root/parent
+      </LinkButton>
+    );
+  }
 
+  // Case 2: Root and Parent are different runs
   return (
-    <LinkButton
-      variant="minimal/medium"
-      to={
-        span
-          ? v3RunSpanPath(
-              organization,
-              project,
-              environment,
-              {
-                friendlyId: runFriendlyId,
-              },
-              { spanId: span }
-            )
-          : v3RunPath(organization, project, environment, {
-              friendlyId: runFriendlyId,
-            })
-      }
-      onMouseEnter={() => setMouseOver(true)}
-      onMouseLeave={() => setMouseOver(false)}
-      fullWidth
-      textAlignLeft
-      shortcut={{ key: "p" }}
-      className="flex-1"
-    >
-      {mouseOver ? (
-        <ShowParentIconSelected className="h-4 w-4 text-indigo-500" />
-      ) : (
-        <ShowParentIcon className="h-4 w-4 text-charcoal-650" />
+    <div className="flex items-center">
+      {relationships.root && (
+        <LinkButton
+          variant="minimal/small"
+          to={v3RunSpanPath(
+            organization,
+            project,
+            environment,
+            { friendlyId: relationships.root.friendlyId },
+            { spanId: relationships.root.spanId }
+          )}
+          LeadingIcon={MoveToTopIcon}
+          leadingIconClassName="gap-x-2"
+          shortcut={{ key: "t" }}
+          hideShortcutKey
+          tooltip={
+            <div className="-mr-1 flex items-center gap-1">
+              <Paragraph variant="extra-small">Jump to root run</Paragraph>
+              <ShortcutKey shortcut={{ key: "t" }} variant="small" />
+            </div>
+          }
+          className="text-xs"
+        >
+          Root
+        </LinkButton>
       )}
-      <Paragraph
-        variant="small"
-        className={cn(mouseOver ? "text-indigo-500" : "text-charcoal-500")}
-      >
-        {isRoot ? "Show root run" : "Show parent run"}
-      </Paragraph>
-    </LinkButton>
+      {relationships.parent && (
+        <LinkButton
+          variant="minimal/small"
+          to={v3RunSpanPath(
+            organization,
+            project,
+            environment,
+            { friendlyId: relationships.parent.friendlyId },
+            { spanId: relationships.parent.spanId }
+          )}
+          LeadingIcon={MoveUpIcon}
+          leadingIconClassName="gap-x-2"
+          shortcut={{ key: "p" }}
+          hideShortcutKey
+          tooltip={
+            <div className="-mr-1 flex items-center gap-1">
+              <Paragraph variant="extra-small">Jump to parent run</Paragraph>
+              <ShortcutKey shortcut={{ key: "p" }} variant="small" />
+            </div>
+          }
+          className="text-xs"
+        >
+          Parent
+        </LinkButton>
+      )}
+    </div>
   );
 }
 
@@ -1248,8 +1496,14 @@ function SpanWithDuration({
   showDuration,
   node,
   fadeLeft,
+  disableAnimations,
   ...props
-}: Timeline.SpanProps & { node: TraceEvent; showDuration: boolean; fadeLeft: boolean }) {
+}: Timeline.SpanProps & {
+  node: TraceEvent;
+  showDuration: boolean;
+  fadeLeft: boolean;
+  disableAnimations?: boolean;
+}) {
   return (
     <Timeline.Span {...props}>
       <motion.div
@@ -1259,7 +1513,8 @@ function SpanWithDuration({
           fadeLeft ? "rounded-r-sm bg-gradient-to-r from-black/50 to-transparent" : "rounded-sm"
         )}
         style={{ backgroundSize: "20px 100%", backgroundRepeat: "no-repeat" }}
-        layoutId={node.id}
+        layoutId={disableAnimations ? undefined : node.id}
+        animate={disableAnimations ? false : undefined}
       >
         {node.data.isPartial && (
           <div
@@ -1272,10 +1527,12 @@ function SpanWithDuration({
             "sticky left-0 z-10 transition-opacity group-hover:opacity-100",
             !showDuration && "opacity-0"
           )}
+          animate={disableAnimations ? false : undefined}
         >
           <motion.div
             className="whitespace-nowrap rounded-sm px-1 py-0.5 text-xxs text-text-bright text-shadow-custom"
-            layout="position"
+            layout={disableAnimations ? undefined : "position"}
+            animate={disableAnimations ? false : undefined}
           >
             {formatDurationMilliseconds(props.durationMs, {
               style: "short",
@@ -1358,16 +1615,16 @@ function KeyboardShortcuts({
   expandAllBelowDepth,
   collapseAllBelowDepth,
   toggleExpandLevel,
-  setShowDurations,
 }: {
   expandAllBelowDepth: (depth: number) => void;
   collapseAllBelowDepth: (depth: number) => void;
   toggleExpandLevel: (depth: number) => void;
-  setShowDurations: (show: (show: boolean) => boolean) => void;
+  setShowDurations?: (show: (show: boolean) => boolean) => void;
 }) {
   return (
     <>
       <ArrowKeyShortcuts />
+      <AdjacentRunsShortcuts />
       <ShortcutWithAction
         shortcut={{ key: "e" }}
         action={() => expandAllBelowDepth(0)}
@@ -1384,6 +1641,18 @@ function KeyboardShortcuts({
   );
 }
 
+function AdjacentRunsShortcuts() {
+  return (
+    <div className="flex items-center gap-0.5">
+      <ShortcutKey shortcut={{ key: "[" }} variant="medium" className="ml-0 mr-0 px-1" />
+      <ShortcutKey shortcut={{ key: "]" }} variant="medium" className="ml-0 mr-0 px-1" />
+      <Paragraph variant="extra-small" className="ml-1.5 whitespace-nowrap">
+        Next/previous run
+      </Paragraph>
+    </div>
+  );
+}
+
 function ArrowKeyShortcuts() {
   return (
     <div className="flex items-center gap-0.5">
@@ -1430,7 +1699,7 @@ function NumberShortcuts({ toggleLevel }: { toggleLevel: (depth: number) => void
   return (
     <div className="flex items-center gap-0.5">
       <span className={cn(variants.medium, "ml-0 mr-0")}>0</span>
-      <span className="text-[0.75rem] text-text-dimmed">–</span>
+      <span className="text-[0.65rem] text-text-dimmed">–</span>
       <span className={cn(variants.medium, "ml-0 mr-0")}>9</span>
       <Paragraph variant="extra-small" className="ml-1.5 whitespace-nowrap">
         Toggle level
@@ -1462,3 +1731,121 @@ function SearchField({ onChange }: { onChange: (value: string) => void }) {
     />
   );
 }
+
+function useAdjacentRunPaths({
+  organization,
+  project,
+  environment,
+  tableState,
+  run,
+  runsList,
+  tabParam,
+  useSpan,
+}: {
+  organization: { slug: string };
+  project: { slug: string };
+  environment: { slug: string };
+  tableState: string;
+  run: { friendlyId: string; spanId: string };
+  runsList: RunsListNavigation | null;
+  tabParam?: string;
+  useSpan?: boolean;
+}): [string | null, string | null] {
+  if (!runsList || runsList.runs.length === 0) {
+    return [null, null];
+  }
+
+  const currentIndex = runsList.runs.findIndex((r) => r.friendlyId === run.friendlyId);
+
+  if (currentIndex === -1) {
+    return [null, null];
+  }
+
+  // Determine previous run: use prevPageLastRun if at first position, otherwise use previous run in list
+  let previousRun: { friendlyId: string; spanId: string } | null = null;
+  const previousRunTableState = new URLSearchParams(tableState);
+  if (currentIndex > 0) {
+    previousRun = runsList.runs[currentIndex - 1];
+  } else if (runsList.prevPageLastRun) {
+    previousRun = runsList.prevPageLastRun;
+    // Update tableState with the new cursor for the previous page
+    previousRunTableState.set("cursor", runsList.prevPageLastRun.cursor);
+    previousRunTableState.set("direction", "backward");
+  }
+
+  // Determine next run: use nextPageFirstRun if at last position, otherwise use next run in list
+  let nextRun: { friendlyId: string; spanId: string } | null = null;
+  const nextRunTableState = new URLSearchParams(tableState);
+  if (currentIndex < runsList.runs.length - 1) {
+    nextRun = runsList.runs[currentIndex + 1];
+  } else if (runsList.nextPageFirstRun) {
+    nextRun = runsList.nextPageFirstRun;
+    // Update tableState with the new cursor for the next page
+    nextRunTableState.set("cursor", runsList.nextPageFirstRun.cursor);
+    nextRunTableState.set("direction", "forward");
+  }
+
+  const previousURLSearchParams = new URLSearchParams();
+  previousURLSearchParams.set("tableState", previousRunTableState.toString());
+  if (previousRun && useSpan) {
+    previousURLSearchParams.set("span", previousRun.spanId);
+  }
+  if (tabParam && useSpan) {
+    previousURLSearchParams.set("tab", tabParam);
+  }
+  const previousRunPath = previousRun
+    ? v3RunPath(organization, project, environment, previousRun, previousURLSearchParams)
+    : null;
+
+  const nextURLSearchParams = new URLSearchParams();
+  nextURLSearchParams.set("tableState", nextRunTableState.toString());
+  if (nextRun && useSpan) {
+    nextURLSearchParams.set("span", nextRun.spanId);
+  }
+  if (tabParam && useSpan) {
+    nextURLSearchParams.set("tab", tabParam);
+  }
+  const nextRunPath = nextRun
+    ? v3RunPath(organization, project, environment, nextRun, nextURLSearchParams)
+    : null;
+
+  return [previousRunPath, nextRunPath];
+}
+
+function PreviousRunButton({ to }: { to: string | null }) {
+  return (
+    <div className={cn("peer/prev order-1", !to && "pointer-events-none")}>
+      <LinkButton
+        to={to ? to : "#"}
+        variant={"minimal/small"}
+        LeadingIcon={ChevronExtraSmallUp}
+        leadingIconClassName="size-3 group-hover/button:text-text-bright transition-colors"
+        className={cn("flex size-6 max-w-6 items-center", !to && "cursor-not-allowed opacity-50")}
+        onClick={(e) => !to && e.preventDefault()}
+        shortcut={{ key: "j" }}
+        tooltip="Previous Run"
+        disabled={!to}
+        replace
+      />
+    </div>
+  );
+}
+
+function NextRunButton({ to }: { to: string | null }) {
+  return (
+    <div className={cn("peer/next order-3", !to && "pointer-events-none")}>
+      <LinkButton
+        to={to ? to : "#"}
+        variant={"minimal/small"}
+        LeadingIcon={ChevronExtraSmallDown}
+        leadingIconClassName="size-3 group-hover/button:text-text-bright transition-colors"
+        className={cn("flex size-6 max-w-6 items-center", !to && "cursor-not-allowed opacity-50")}
+        onClick={(e) => !to && e.preventDefault()}
+        shortcut={{ key: "k" }}
+        tooltip="Next Run"
+        disabled={!to}
+        replace
+      />
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
index edc9e9f34ca..9f8cf278bef 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
@@ -55,9 +55,11 @@ import {
   v3CreateBulkActionPath,
   v3ProjectPath,
   v3TestPath,
+  v3TestTaskPath,
 } from "~/utils/pathBuilder";
 import { ListPagination } from "../../components/ListPagination";
 import { CreateBulkActionInspector } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction";
+import { Callout } from "~/components/primitives/Callout";
 
 export const meta: MetaFunction = () => {
   return [
@@ -149,7 +151,17 @@ export default function Page() {
                 </div>
               }
             >
-              <TypedAwait resolve={data}>
+              <TypedAwait
+                resolve={data}
+                errorElement={
+                  <div className="flex items-center justify-center px-3 py-12">
+                    <Callout variant="error" className="max-w-fit">
+                      Unable to load your task runs. Please refresh the page or try again in a
+                      moment.
+                    </Callout>
+                  </div>
+                }
+              >
                 {(list) => {
                   return (
                     <RunsList
@@ -224,7 +236,13 @@ function RunsList({
               list.possibleTasks.length === 0 ? (
                 <CreateFirstTaskInstructions />
               ) : (
-                <RunTaskInstructions />
+                <RunTaskInstructions
+                  task={
+                    list.filters.tasks.length === 1
+                      ? list.possibleTasks.find((t) => t.slug === list.filters.tasks[0])
+                      : undefined
+                  }
+                />
               )
             ) : (
               <div className={cn("grid h-full max-h-full grid-rows-[auto_1fr] overflow-hidden")}>
@@ -280,6 +298,7 @@ function RunsList({
                   runs={list.runs}
                   isLoading={isLoading}
                   allowSelection
+                  rootOnlyDefault={rootOnlyDefault}
                 />
               </div>
             )}
@@ -328,7 +347,7 @@ function CreateFirstTaskInstructions() {
   );
 }
 
-function RunTaskInstructions() {
+function RunTaskInstructions({ task }: { task?: { slug: string } }) {
   const organization = useOrganization();
   const project = useProject();
   const environment = useEnvironment();
@@ -341,7 +360,11 @@ function RunTaskInstructions() {
           Perform a test run with a payload directly from the dashboard.
         </Paragraph>
         <LinkButton
-          to={v3TestPath(organization, project, environment)}
+          to={
+            task
+              ? v3TestTaskPath(organization, project, environment, { taskIdentifier: task.slug })
+              : v3TestPath(organization, project, environment)
+          }
           variant="secondary/medium"
           LeadingIcon={BeakerIcon}
           leadingIconClassName="text-lime-500"
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
index a11a2a7f9da..f4e663b1b7d 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.schedules.$scheduleParam/route.tsx
@@ -318,6 +318,7 @@ export default function Page() {
               runs={schedule.runs}
               isLoading={false}
               variant="bright"
+              disableAdjacentRows
             />
           </div>
           <div className="flex flex-col gap-1 pt-2">
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx
index db6f641f5d4..a5a70c39af6 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx
@@ -2,7 +2,8 @@ import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
 import { ExclamationTriangleIcon, FolderIcon, TrashIcon } from "@heroicons/react/20/solid";
 import { Form, type MetaFunction, useActionData, useNavigation } from "@remix-run/react";
-import { type ActionFunction, json } from "@remix-run/server-runtime";
+import { type ActionFunction, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { InlineCode } from "~/components/code/InlineCode";
@@ -12,6 +13,7 @@ import {
   PageContainer,
 } from "~/components/layout/AppLayout";
 import { Button } from "~/components/primitives/Buttons";
+import { CheckboxWithLabel } from "~/components/primitives/Checkbox";
 import { ClipboardField } from "~/components/primitives/ClipboardField";
 import { Fieldset } from "~/components/primitives/Fieldset";
 import { FormButtons } from "~/components/primitives/FormButtons";
@@ -25,13 +27,31 @@ import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/Page
 import { Paragraph } from "~/components/primitives/Paragraph";
 import * as Property from "~/components/primitives/PropertyTable";
 import { SpinnerWhite } from "~/components/primitives/Spinner";
-import { prisma } from "~/db.server";
+import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
-import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
-import { DeleteProjectService } from "~/services/deleteProject.server";
+import {
+  redirectBackWithErrorMessage,
+  redirectBackWithSuccessMessage,
+  redirectWithErrorMessage,
+  redirectWithSuccessMessage,
+} from "~/models/message.server";
+import { ProjectSettingsService } from "~/services/projectSettings.server";
 import { logger } from "~/services/logger.server";
 import { requireUserId } from "~/services/session.server";
-import { organizationPath, v3ProjectPath } from "~/utils/pathBuilder";
+import { organizationPath, v3ProjectPath, EnvironmentParamSchema, v3BillingPath, vercelResourcePath } from "~/utils/pathBuilder";
+import React, { useEffect, useState, useCallback, useRef } from "react";
+import { useSearchParams } from "@remix-run/react";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { ProjectSettingsPresenter } from "~/services/projectSettingsPresenter.server";
+import { type BuildSettings } from "~/v3/buildSettings";
+import { GitHubSettingsPanel } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github";
+import {
+  VercelSettingsPanel,
+  VercelOnboardingModal,
+} from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
+import type { loader as vercelLoader } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel";
+import { OrgIntegrationRepository } from "~/models/orgIntegration.server";
+import { useTypedFetcher } from "remix-typedjson";
 
 export const meta: MetaFunction = () => {
   return [
@@ -41,6 +61,87 @@ export const meta: MetaFunction = () => {
   ];
 };
 
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { projectParam, organizationSlug } = EnvironmentParamSchema.parse(params);
+
+  const projectSettingsPresenter = new ProjectSettingsPresenter();
+  const resultOrFail = await projectSettingsPresenter.getProjectSettings(
+    organizationSlug,
+    projectParam,
+    userId
+  );
+
+  if (resultOrFail.isErr()) {
+    switch (resultOrFail.error.type) {
+      case "project_not_found": {
+        throw new Response(undefined, {
+          status: 404,
+          statusText: "Project not found",
+        });
+      }
+      case "other":
+      default: {
+        resultOrFail.error.type satisfies "other";
+
+        logger.error("Failed loading project settings", {
+          error: resultOrFail.error,
+        });
+        throw new Response(undefined, {
+          status: 400,
+          statusText: "Something went wrong, please try again!",
+        });
+      }
+    }
+  }
+
+  const { gitHubApp, buildSettings } = resultOrFail.value;
+
+  return typedjson({
+    githubAppEnabled: gitHubApp.enabled,
+    buildSettings,
+    vercelIntegrationEnabled: OrgIntegrationRepository.isVercelSupported,
+  });
+};
+
+const UpdateBuildSettingsFormSchema = z.object({
+  action: z.literal("update-build-settings"),
+  triggerConfigFilePath: z
+    .string()
+    .trim()
+    .optional()
+    .transform((val) => (val ? val.replace(/^\/+/, "") : val))
+    .refine((val) => !val || val.length <= 255, {
+      message: "Config file path must not exceed 255 characters",
+    }),
+  installCommand: z
+    .string()
+    .trim()
+    .optional()
+    .refine((val) => !val || !val.includes("\n"), {
+      message: "Install command must be a single line",
+    })
+    .refine((val) => !val || val.length <= 500, {
+      message: "Install command must not exceed 500 characters",
+    }),
+  preBuildCommand: z
+    .string()
+    .trim()
+    .optional()
+    .refine((val) => !val || !val.includes("\n"), {
+      message: "Pre-build command must be a single line",
+    })
+    .refine((val) => !val || val.length <= 500, {
+      message: "Pre-build command must not exceed 500 characters",
+    }),
+  useNativeBuildServer: z
+    .string()
+    .optional()
+    .transform((val) => val === "on"),
+});
+
+type UpdateBuildSettingsFormSchema = z.infer<typeof UpdateBuildSettingsFormSchema>;
+
 export function createSchema(
   constraints: {
     getSlugMatch?: (slug: string) => { isMatch: boolean; projectSlug: string };
@@ -72,6 +173,7 @@ export function createSchema(
         }
       }),
     }),
+    UpdateBuildSettingsFormSchema,
   ]);
 }
 
@@ -95,62 +197,225 @@ export const action: ActionFunction = async ({ request, params }) => {
     return json(submission);
   }
 
-  try {
-    switch (submission.value.action) {
-      case "rename": {
-        await prisma.project.update({
-          where: {
-            slug: projectParam,
-            organization: {
-              members: {
-                some: {
-                  userId,
-                },
-              },
-            },
-          },
-          data: {
-            name: submission.value.projectName,
-          },
-        });
+  const projectSettingsService = new ProjectSettingsService();
+  const membershipResultOrFail = await projectSettingsService.verifyProjectMembership(
+    organizationSlug,
+    projectParam,
+    userId
+  );
 
-        return redirectWithSuccessMessage(
-          v3ProjectPath({ slug: organizationSlug }, { slug: projectParam }),
-          request,
-          `Project renamed to ${submission.value.projectName}`
-        );
+  if (membershipResultOrFail.isErr()) {
+    return json({ errors: { body: membershipResultOrFail.error.type } }, { status: 404 });
+  }
+
+  const { projectId } = membershipResultOrFail.value;
+
+  switch (submission.value.action) {
+    case "rename": {
+      const resultOrFail = await projectSettingsService.renameProject(
+        projectId,
+        submission.value.projectName
+      );
+
+      if (resultOrFail.isErr()) {
+        switch (resultOrFail.error.type) {
+          case "other":
+          default: {
+            resultOrFail.error.type satisfies "other";
+
+            logger.error("Failed to rename project", {
+              error: resultOrFail.error,
+            });
+            return json({ errors: { body: "Failed to rename project" } }, { status: 400 });
+          }
+        }
       }
-      case "delete": {
-        const deleteProjectService = new DeleteProjectService();
-        try {
-          await deleteProjectService.call({ projectSlug: projectParam, userId });
-
-          return redirectWithSuccessMessage(
-            organizationPath({ slug: organizationSlug }),
-            request,
-            "Project deleted"
-          );
-        } catch (error: unknown) {
-          logger.error("Project could not be deleted", {
-            error: error instanceof Error ? error.message : JSON.stringify(error),
-          });
-          return redirectWithErrorMessage(
-            v3ProjectPath({ slug: organizationSlug }, { slug: projectParam }),
-            request,
-            `Project ${projectParam} could not be deleted`
-          );
+
+      return redirectWithSuccessMessage(
+        v3ProjectPath({ slug: organizationSlug }, { slug: projectParam }),
+        request,
+        `Project renamed to ${submission.value.projectName}`
+      );
+    }
+    case "delete": {
+      const resultOrFail = await projectSettingsService.deleteProject(projectParam, userId);
+
+      if (resultOrFail.isErr()) {
+        switch (resultOrFail.error.type) {
+          case "other":
+          default: {
+            resultOrFail.error.type satisfies "other";
+
+            logger.error("Failed to delete project", {
+              error: resultOrFail.error,
+            });
+            return redirectWithErrorMessage(
+              v3ProjectPath({ slug: organizationSlug }, { slug: projectParam }),
+              request,
+              `Project ${projectParam} could not be deleted`
+            );
+          }
         }
       }
+
+      return redirectWithSuccessMessage(
+        organizationPath({ slug: organizationSlug }),
+        request,
+        "Project deleted"
+      );
+    }
+    case "update-build-settings": {
+      const { installCommand, preBuildCommand, triggerConfigFilePath, useNativeBuildServer } =
+        submission.value;
+
+      const resultOrFail = await projectSettingsService.updateBuildSettings(projectId, {
+        installCommand: installCommand || undefined,
+        preBuildCommand: preBuildCommand || undefined,
+        triggerConfigFilePath: triggerConfigFilePath || undefined,
+        useNativeBuildServer: useNativeBuildServer,
+      });
+
+      if (resultOrFail.isErr()) {
+        switch (resultOrFail.error.type) {
+          case "other":
+          default: {
+            resultOrFail.error.type satisfies "other";
+
+            logger.error("Failed to update build settings", {
+              error: resultOrFail.error,
+            });
+            return redirectBackWithErrorMessage(request, "Failed to update build settings");
+          }
+        }
+      }
+
+      return redirectBackWithSuccessMessage(request, "Build settings updated successfully");
+    }
+    default: {
+      submission.value satisfies never;
+      return redirectBackWithErrorMessage(request, "Failed to process request");
     }
-  } catch (error: any) {
-    return json({ errors: { body: error.message } }, { status: 400 });
   }
 };
 
 export default function Page() {
+  const { githubAppEnabled, buildSettings, vercelIntegrationEnabled } =
+    useTypedLoaderData<typeof loader>();
   const project = useProject();
+  const organization = useOrganization();
+  const environment = useEnvironment();
   const lastSubmission = useActionData();
   const navigation = useNavigation();
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  // Vercel onboarding modal state
+  const hasQueryParam = searchParams.get("vercelOnboarding") === "true";
+  const nextUrl = searchParams.get("next");
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const vercelFetcher = useTypedFetcher<typeof vercelLoader>();
+
+  // Helper to open modal and ensure query param is present
+  const openVercelOnboarding = useCallback(() => {
+    setIsModalOpen(true);
+    // Ensure query param is present to maintain state during form submissions
+    if (!hasQueryParam) {
+      setSearchParams((prev) => {
+        prev.set("vercelOnboarding", "true");
+        return prev;
+      });
+    }
+  }, [hasQueryParam, setSearchParams]);
+
+  const closeVercelOnboarding = useCallback(() => {
+    // Remove query param if present
+    if (hasQueryParam) {
+      setSearchParams((prev) => {
+        prev.delete("vercelOnboarding");
+        return prev;
+      });
+    }
+    // Close modal
+    setIsModalOpen(false);
+  }, [hasQueryParam, setSearchParams]);
+
+  // When query param is present, handle modal opening
+  // Note: We don't close the modal based on data state during onboarding - only when explicitly closed
+  useEffect(() => {
+    if (hasQueryParam && vercelIntegrationEnabled) {
+      // Ensure query param is present and modal is open
+      if (vercelFetcher.data?.onboardingData && vercelFetcher.state === "idle") {
+        // Data is loaded, ensure modal is open (query param takes precedence)
+        if (!isModalOpen) {
+          openVercelOnboarding();
+        }
+      } else if (vercelFetcher.state === "idle" && vercelFetcher.data === undefined) {
+        // Load onboarding data
+        vercelFetcher.load(
+          `${vercelResourcePath(organization.slug, project.slug, environment.slug)}?vercelOnboarding=true`
+        );
+      }
+    } else if (!hasQueryParam && isModalOpen) {
+      // Query param removed but modal is open, close modal
+      setIsModalOpen(false);
+    }
+  }, [hasQueryParam, vercelIntegrationEnabled, organization.slug, project.slug, environment.slug, vercelFetcher.data, vercelFetcher.state, isModalOpen, openVercelOnboarding]);
+
+  // Ensure modal stays open when query param is present (even after data reloads)
+  // This is a safeguard to prevent the modal from closing during form submissions
+  useEffect(() => {
+    if (hasQueryParam && !isModalOpen) {
+      // Query param is present but modal is closed, open it
+      // This ensures the modal stays open during the onboarding flow
+      openVercelOnboarding();
+    }
+  }, [hasQueryParam, isModalOpen, openVercelOnboarding]);
+
+  // When data finishes loading (from query param), ensure modal is open
+  useEffect(() => {
+    if (hasQueryParam && vercelFetcher.data?.onboardingData && vercelFetcher.state === "idle") {
+      // Data loaded and query param is present, ensure modal is open
+      if (!isModalOpen) {
+        openVercelOnboarding();
+      }
+    }
+  }, [hasQueryParam, vercelFetcher.data, vercelFetcher.state, isModalOpen, openVercelOnboarding]);
+
+
+  // Track if we're waiting for data from button click (not query param)
+  const waitingForButtonClickRef = useRef(false);
+
+  // Handle opening modal from button click (without query param)
+  const handleOpenVercelModal = useCallback(() => {
+    // Add query param to maintain state during form submissions
+    if (!hasQueryParam) {
+      setSearchParams((prev) => {
+        prev.set("vercelOnboarding", "true");
+        return prev;
+      });
+    }
+
+    if (vercelFetcher.data && vercelFetcher.data.onboardingData) {
+      // Data already loaded, open modal immediately
+      openVercelOnboarding();
+    } else {
+      // Need to load data first, mark that we're waiting for button click
+      waitingForButtonClickRef.current = true;
+      vercelFetcher.load(
+        `${vercelResourcePath(organization.slug, project.slug, environment.slug)}?vercelOnboarding=true`
+      );
+    }
+  }, [organization.slug, project.slug, environment.slug, vercelFetcher, setSearchParams, hasQueryParam, openVercelOnboarding]);
+
+  // When data loads from button click, open modal
+  useEffect(() => {
+    if (waitingForButtonClickRef.current && vercelFetcher.data?.onboardingData && vercelFetcher.state === "idle") {
+      // Data loaded from button click, open modal and ensure query param is present
+      waitingForButtonClickRef.current = false;
+      openVercelOnboarding();
+    }
+  }, [vercelFetcher.data, vercelFetcher.state, openVercelOnboarding]);
+
+  const [hasRenameFormChanges, setHasRenameFormChanges] = useState(false);
 
   const [renameForm, { projectName }] = useForm({
     id: "rename-project",
@@ -187,10 +452,12 @@ export default function Page() {
     navigation.formData?.get("action") === "delete" &&
     (navigation.state === "submitting" || navigation.state === "loading");
 
+  const [deleteInputValue, setDeleteInputValue] = useState("");
+
   return (
     <PageContainer>
       <NavBar>
-        <PageTitle title={`${project.name} project settings`} />
+        <PageTitle title="Project settings" />
 
         <PageAccessories>
           <AdminDebugTooltip>
@@ -212,95 +479,302 @@ export default function Page() {
       </NavBar>
 
       <PageBody>
-        <MainHorizontallyCenteredContainer>
-          <div className="mb-3 border-b border-grid-dimmed pb-3">
-            <Header2>Project settings</Header2>
-          </div>
+        <MainHorizontallyCenteredContainer className="md:mt-6">
           <div className="flex flex-col gap-6">
-            <Fieldset>
-              <InputGroup fullWidth>
-                <Label>Project ref</Label>
-                <ClipboardField value={project.externalRef} variant={"secondary/medium"} />
-                <Hint>
-                  This goes in your{" "}
-                  <InlineCode variant="extra-extra-small">trigger.config</InlineCode> file.
-                </Hint>
-              </InputGroup>
-            </Fieldset>
-
-            <Form method="post" {...renameForm.props}>
-              <input type="hidden" name="action" value="rename" />
-              <Fieldset className="gap-y-0">
-                <InputGroup fullWidth>
-                  <Label htmlFor={projectName.id}>Rename your project</Label>
-                  <Input
-                    {...conform.input(projectName, { type: "text" })}
-                    defaultValue={project.name}
-                    placeholder="Your project name"
-                    icon={FolderIcon}
-                    autoFocus
-                  />
-                  <FormError id={projectName.errorId}>{projectName.error}</FormError>
-                </InputGroup>
-                <FormButtons
-                  confirmButton={
-                    <Button
-                      type="submit"
-                      variant={"secondary/small"}
-                      disabled={isRenameLoading}
-                      LeadingIcon={isRenameLoading ? SpinnerWhite : undefined}
-                    >
-                      Rename project
-                    </Button>
-                  }
-                  className="border-t-0"
-                />
-              </Fieldset>
-            </Form>
-
             <div>
-              <Header2 spacing>Danger zone</Header2>
-              <Form
-                method="post"
-                {...deleteForm.props}
-                className="w-full rounded-sm border border-rose-500/40"
-              >
-                <input type="hidden" name="action" value="delete" />
-                <Fieldset className="p-4">
-                  <InputGroup>
-                    <Label htmlFor={projectSlug.id}>Delete project</Label>
-                    <Input
-                      {...conform.input(projectSlug, { type: "text" })}
-                      placeholder="Your project slug"
-                      icon={ExclamationTriangleIcon}
-                    />
-                    <FormError id={projectSlug.errorId}>{projectSlug.error}</FormError>
-                    <FormError>{deleteForm.error}</FormError>
+              <Header2 spacing>General</Header2>
+              <div className="w-full rounded-sm border border-grid-dimmed p-4">
+                <Fieldset className="mb-5">
+                  <InputGroup fullWidth>
+                    <Label>Project ref</Label>
+                    <ClipboardField value={project.externalRef} variant={"secondary/medium"} />
                     <Hint>
-                      This change is irreversible, so please be certain. Type in the Project slug
-                      <InlineCode variant="extra-small">{project.slug}</InlineCode> and then press
-                      Delete.
+                      This goes in your{" "}
+                      <InlineCode variant="extra-extra-small">trigger.config</InlineCode> file.
                     </Hint>
                   </InputGroup>
-                  <FormButtons
-                    confirmButton={
-                      <Button
-                        type="submit"
-                        variant={"danger/small"}
-                        LeadingIcon={isDeleteLoading ? SpinnerWhite : TrashIcon}
-                        leadingIconClassName="text-white"
-                        disabled={isDeleteLoading}
-                      >
-                        Delete project
-                      </Button>
-                    }
-                  />
                 </Fieldset>
-              </Form>
+                <Form method="post" {...renameForm.props}>
+                  <Fieldset>
+                    <InputGroup fullWidth>
+                      <Label htmlFor={projectName.id}>Project name</Label>
+                      <Input
+                        {...conform.input(projectName, { type: "text" })}
+                        defaultValue={project.name}
+                        placeholder="Project name"
+                        icon={FolderIcon}
+                        autoFocus
+                        onChange={(e) => {
+                          setHasRenameFormChanges(e.target.value !== project.name);
+                        }}
+                      />
+                      <FormError id={projectName.errorId}>{projectName.error}</FormError>
+                    </InputGroup>
+                    <FormButtons
+                      confirmButton={
+                        <Button
+                          type="submit"
+                          name="action"
+                          value="rename"
+                          variant={"secondary/small"}
+                          disabled={isRenameLoading || !hasRenameFormChanges}
+                          LeadingIcon={isRenameLoading ? SpinnerWhite : undefined}
+                        >
+                          Save
+                        </Button>
+                      }
+                    />
+                  </Fieldset>
+                </Form>
+              </div>
+            </div>
+
+            {githubAppEnabled && (
+              <React.Fragment>
+                <div>
+                  <Header2 spacing>Git settings</Header2>
+                  <div className="w-full rounded-sm border border-grid-dimmed p-4">
+                    <GitHubSettingsPanel
+                      organizationSlug={organization.slug}
+                      projectSlug={project.slug}
+                      environmentSlug={environment.slug}
+                      billingPath={v3BillingPath({ slug: organization.slug })}
+                    />
+                  </div>
+                </div>
+
+                {vercelIntegrationEnabled && (
+                  <div>
+                    <Header2 spacing>Vercel integration</Header2>
+                    <div className="w-full rounded-sm border border-grid-dimmed p-4">
+                      <VercelSettingsPanel
+                        organizationSlug={organization.slug}
+                        projectSlug={project.slug}
+                        environmentSlug={environment.slug}
+                        onOpenVercelModal={handleOpenVercelModal}
+                        isLoadingVercelData={vercelFetcher.state === "loading" || vercelFetcher.state === "submitting"}
+                      />
+                    </div>
+                  </div>
+                )}
+
+                <div>
+                  <Header2 spacing>Build settings</Header2>
+                  <div className="w-full rounded-sm border border-grid-dimmed p-4">
+                    <BuildSettingsForm buildSettings={buildSettings ?? {}} />
+                  </div>
+                </div>
+              </React.Fragment>
+            )}
+
+            <div>
+              <Header2 spacing>Danger zone</Header2>
+              <div className="w-full rounded-sm border border-rose-500/40 p-4">
+                <Form method="post" {...deleteForm.props}>
+                  <Fieldset>
+                    <InputGroup fullWidth>
+                      <Label htmlFor={projectSlug.id}>Delete project</Label>
+                      <Input
+                        {...conform.input(projectSlug, { type: "text" })}
+                        placeholder="Your project slug"
+                        icon={ExclamationTriangleIcon}
+                        onChange={(e) => setDeleteInputValue(e.target.value)}
+                      />
+                      <FormError id={projectSlug.errorId}>{projectSlug.error}</FormError>
+                      <FormError>{deleteForm.error}</FormError>
+                      <Hint>
+                        This change is irreversible, so please be certain. Type in the Project slug
+                        <InlineCode variant="extra-small">{project.slug}</InlineCode> and then press
+                        Delete.
+                      </Hint>
+                    </InputGroup>
+                    <FormButtons
+                      confirmButton={
+                        <Button
+                          type="submit"
+                          name="action"
+                          value="delete"
+                          variant={"danger/small"}
+                          LeadingIcon={isDeleteLoading ? SpinnerWhite : TrashIcon}
+                          leadingIconClassName="text-white"
+                          disabled={isDeleteLoading || deleteInputValue !== project.slug}
+                        >
+                          Delete
+                        </Button>
+                      }
+                    />
+                  </Fieldset>
+                </Form>
+              </div>
             </div>
           </div>
         </MainHorizontallyCenteredContainer>
       </PageBody>
+
+      {/* Vercel Onboarding Modal */}
+      {vercelIntegrationEnabled && (
+        <VercelOnboardingModal
+          isOpen={isModalOpen}
+          onClose={closeVercelOnboarding}
+          onboardingData={vercelFetcher.data?.onboardingData ?? null}
+          organizationSlug={organization.slug}
+          projectSlug={project.slug}
+          environmentSlug={environment.slug}
+          hasStagingEnvironment={vercelFetcher.data?.hasStagingEnvironment ?? false}
+          hasPreviewEnvironment={vercelFetcher.data?.hasPreviewEnvironment ?? false}
+          hasOrgIntegration={vercelFetcher.data?.hasOrgIntegration ?? false}
+          nextUrl={nextUrl ?? undefined}
+          onDataReload={(vercelEnvironmentId) => {
+            vercelFetcher.load(
+              `${vercelResourcePath(organization.slug, project.slug, environment.slug)}?vercelOnboarding=true${
+                vercelEnvironmentId ? `&vercelEnvironmentId=${vercelEnvironmentId}` : ""
+              }`
+            );
+          }}
+        />
+      )}
     </PageContainer>
   );
 }
+
+function BuildSettingsForm({ buildSettings }: { buildSettings: BuildSettings }) {
+  const lastSubmission = useActionData() as any;
+  const navigation = useNavigation();
+
+  const [hasBuildSettingsChanges, setHasBuildSettingsChanges] = useState(false);
+  const [buildSettingsValues, setBuildSettingsValues] = useState({
+    preBuildCommand: buildSettings?.preBuildCommand || "",
+    installCommand: buildSettings?.installCommand || "",
+    triggerConfigFilePath: buildSettings?.triggerConfigFilePath || "",
+    useNativeBuildServer: buildSettings?.useNativeBuildServer || false,
+  });
+
+  useEffect(() => {
+    const hasChanges =
+      buildSettingsValues.preBuildCommand !== (buildSettings?.preBuildCommand || "") ||
+      buildSettingsValues.installCommand !== (buildSettings?.installCommand || "") ||
+      buildSettingsValues.triggerConfigFilePath !== (buildSettings?.triggerConfigFilePath || "") ||
+      buildSettingsValues.useNativeBuildServer !== (buildSettings?.useNativeBuildServer || false);
+    setHasBuildSettingsChanges(hasChanges);
+  }, [buildSettingsValues, buildSettings]);
+
+  const [buildSettingsForm, fields] = useForm({
+    id: "update-build-settings",
+    lastSubmission: lastSubmission,
+    shouldRevalidate: "onSubmit",
+    onValidate({ formData }) {
+      return parse(formData, {
+        schema: UpdateBuildSettingsFormSchema,
+      });
+    },
+  });
+
+  const isBuildSettingsLoading =
+    navigation.formData?.get("action") === "update-build-settings" &&
+    (navigation.state === "submitting" || navigation.state === "loading");
+
+  return (
+    <Form method="post" {...buildSettingsForm.props}>
+      <Fieldset>
+        <InputGroup fullWidth>
+          <Label htmlFor={fields.triggerConfigFilePath.id}>Trigger config file</Label>
+          <Input
+            {...conform.input(fields.triggerConfigFilePath, { type: "text" })}
+            defaultValue={buildSettings?.triggerConfigFilePath || ""}
+            placeholder="trigger.config.ts"
+            onChange={(e) => {
+              setBuildSettingsValues((prev) => ({
+                ...prev,
+                triggerConfigFilePath: e.target.value,
+              }));
+            }}
+          />
+          <Hint>
+            Path to your Trigger configuration file, relative to the root directory of your repo.
+          </Hint>
+          <FormError id={fields.triggerConfigFilePath.errorId}>
+            {fields.triggerConfigFilePath.error}
+          </FormError>
+        </InputGroup>
+
+        <InputGroup fullWidth>
+          <Label htmlFor={fields.installCommand.id}>Install command</Label>
+          <Input
+            {...conform.input(fields.installCommand, { type: "text" })}
+            defaultValue={buildSettings?.installCommand || ""}
+            placeholder="e.g., `npm install`, `pnpm install`, or `bun install`"
+            onChange={(e) => {
+              setBuildSettingsValues((prev) => ({
+                ...prev,
+                installCommand: e.target.value,
+              }));
+            }}
+          />
+          <Hint>
+            Command to install your project dependencies. This will be run from the root directory
+            of your repo. Auto-detected by default.
+          </Hint>
+          <FormError id={fields.installCommand.errorId}>{fields.installCommand.error}</FormError>
+        </InputGroup>
+        <InputGroup fullWidth>
+          <Label htmlFor={fields.preBuildCommand.id}>Pre-build command</Label>
+          <Input
+            {...conform.input(fields.preBuildCommand, { type: "text" })}
+            defaultValue={buildSettings?.preBuildCommand || ""}
+            placeholder="e.g., `npm run prisma:generate`"
+            onChange={(e) => {
+              setBuildSettingsValues((prev) => ({
+                ...prev,
+                preBuildCommand: e.target.value,
+              }));
+            }}
+          />
+          <Hint>
+            Any command that needs to run before we build and deploy your project. This will be run
+            from the root directory of your repo.
+          </Hint>
+          <FormError id={fields.preBuildCommand.errorId}>{fields.preBuildCommand.error}</FormError>
+        </InputGroup>
+        <div className="border-t border-grid-dimmed pt-4">
+          <InputGroup>
+            <CheckboxWithLabel
+              id={fields.useNativeBuildServer.id}
+              {...conform.input(fields.useNativeBuildServer, { type: "checkbox" })}
+              label="Use native build server"
+              variant="simple/small"
+              defaultChecked={buildSettings?.useNativeBuildServer || false}
+              onChange={(isChecked) => {
+                setBuildSettingsValues((prev) => ({
+                  ...prev,
+                  useNativeBuildServer: isChecked,
+                }));
+              }}
+            />
+            <Hint>
+              Native build server builds do not rely on external build providers and will become the
+              default in the future. Version 4.2.0 or newer is required.
+            </Hint>
+            <FormError id={fields.useNativeBuildServer.errorId}>
+              {fields.useNativeBuildServer.error}
+            </FormError>
+          </InputGroup>
+        </div>
+        <FormError>{buildSettingsForm.error}</FormError>
+        <FormButtons
+          confirmButton={
+            <Button
+              type="submit"
+              name="action"
+              value="update-build-settings"
+              variant="secondary/small"
+              disabled={isBuildSettingsLoading || !hasBuildSettingsChanges}
+              LeadingIcon={isBuildSettingsLoading ? SpinnerWhite : undefined}
+            >
+              Save
+            </Button>
+          }
+        />
+      </Fieldset>
+    </Form>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
index f104a4e5458..a87cc4530d2 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.test.tasks.$taskParam/route.tsx
@@ -54,7 +54,7 @@ import {
   TestTaskPresenter,
 } from "~/presenters/v3/TestTaskPresenter.server";
 import { logger } from "~/services/logger.server";
-import { requireUserId } from "~/services/session.server";
+import { requireUser } from "~/services/session.server";
 import { cn } from "~/utils/cn";
 import { docsPath, v3RunSpanPath, v3TaskParamsSchema, v3TestPath } from "~/utils/pathBuilder";
 import { TestTaskService } from "~/v3/services/testTask.server";
@@ -73,14 +73,17 @@ import { DeleteTaskRunTemplateData, RunTemplateData } from "~/v3/taskRunTemplate
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
 import { DialogClose, DialogDescription } from "@radix-ui/react-dialog";
 import { FormButtons } from "~/components/primitives/FormButtons";
+import { $replica } from "~/db.server";
+import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { RegionsPresenter, type Region } from "~/presenters/v3/RegionsPresenter.server";
 
 type FormAction = "create-template" | "delete-template" | "run-scheduled" | "run-standard";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
   const { projectParam, organizationSlug, envParam, taskParam } = v3TaskParamsSchema.parse(params);
 
-  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
   if (!project) {
     throw new Response(undefined, {
       status: 404,
@@ -88,7 +91,7 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     });
   }
 
-  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  const environment = await findEnvironmentBySlug(project.id, envParam, user.id);
   if (!environment) {
     throw new Response(undefined, {
       status: 404,
@@ -96,16 +99,23 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     });
   }
 
-  const presenter = new TestTaskPresenter();
+  const presenter = new TestTaskPresenter($replica, clickhouseClient);
   try {
-    const result = await presenter.call({
-      userId,
-      projectId: project.id,
-      taskIdentifier: taskParam,
-      environment: environment,
-    });
-
-    return typedjson(result);
+    const [result, regionsResult] = await Promise.all([
+      presenter.call({
+        userId: user.id,
+        projectId: project.id,
+        taskIdentifier: taskParam,
+        environment: environment,
+      }),
+      new RegionsPresenter().call({
+        userId: user.id,
+        projectSlug: projectParam,
+        isAdmin: user.admin || user.isImpersonating,
+      }),
+    ]);
+
+    return typedjson({ ...result, regions: regionsResult.regions });
   } catch (error) {
     return redirectWithErrorMessage(
       v3TestPath({ slug: organizationSlug }, { slug: projectParam }, environment),
@@ -116,15 +126,15 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 };
 
 export const action: ActionFunction = async ({ request, params }) => {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
   const { organizationSlug, projectParam, envParam } = v3TaskParamsSchema.parse(params);
 
-  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  const project = await findProjectBySlug(organizationSlug, projectParam, user.id);
   if (!project) {
     return redirectBackWithErrorMessage(request, "Project not found");
   }
 
-  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  const environment = await findEnvironmentBySlug(project.id, envParam, user.id);
 
   if (!environment) {
     return redirectBackWithErrorMessage(request, "Environment not found");
@@ -288,6 +298,7 @@ export default function Page() {
           templates={result.taskRunTemplates}
           disableVersionSelection={result.disableVersionSelection}
           allowArbitraryQueues={result.allowArbitraryQueues}
+          regions={result.regions}
         />
       );
     }
@@ -302,6 +313,7 @@ export default function Page() {
           possibleTimezones={result.possibleTimezones}
           disableVersionSelection={result.disableVersionSelection}
           allowArbitraryQueues={result.allowArbitraryQueues}
+          regions={result.regions}
         />
       );
     }
@@ -322,6 +334,7 @@ function StandardTaskForm({
   templates,
   disableVersionSelection,
   allowArbitraryQueues,
+  regions,
 }: {
   task: StandardTaskResult["task"];
   queues: Required<StandardTaskResult>["queue"][];
@@ -330,6 +343,7 @@ function StandardTaskForm({
   templates: RunTemplate[];
   disableVersionSelection: boolean;
   allowArbitraryQueues: boolean;
+  regions: Region[];
 }) {
   const environment = useEnvironment();
   const { value, replace } = useSearchParams();
@@ -371,6 +385,12 @@ function StandardTaskForm({
   );
   const [queueValue, setQueueValue] = useState<string | undefined>(lastRun?.queue);
   const [machineValue, setMachineValue] = useState<string | undefined>(lastRun?.machinePreset);
+  const isDev = environment.type === "DEVELOPMENT";
+  const defaultRegion = regions.find((r) => r.isDefault);
+  const [regionValue, setRegionValue] = useState<string | undefined>(
+    isDev ? undefined : defaultRegion?.name
+  );
+
   const [maxAttemptsValue, setMaxAttemptsValue] = useState<number | undefined>(
     lastRun?.maxAttempts
   );
@@ -379,6 +399,12 @@ function StandardTaskForm({
   );
   const [tagsValue, setTagsValue] = useState<string[]>(lastRun?.runTags ?? []);
 
+  const regionItems = regions.map((r) => ({
+    value: r.name,
+    label: r.description ? `${r.name} — ${r.description}` : r.name,
+    isDefault: r.isDefault,
+  }));
+
   const queueItems = queues.map((q) => ({
     value: q.type === "task" ? `task/${q.name}` : q.name,
     label: q.name,
@@ -407,6 +433,8 @@ function StandardTaskForm({
       tags,
       version,
       machine,
+      region,
+      prioritySeconds,
     },
   ] = useForm({
     id: "test-task",
@@ -577,6 +605,45 @@ function StandardTaskForm({
                 )}
                 <FormError id={version.errorId}>{version.error}</FormError>
               </InputGroup>
+              {regionItems.length > 1 && (
+                <InputGroup>
+                  <Label htmlFor={region.id} variant="small">
+                    Region
+                  </Label>
+                  {/* Our Select primitive uses Ariakit under the hood, which treats
+                      value={undefined} as uncontrolled, keeping stale internal state when
+                      switching environments. The key forces a remount so it reinitializes
+                      with the correct defaultValue. */}
+                  <Select
+                    key={`region-${environment.id}`}
+                    {...conform.select(region)}
+                    variant="tertiary/small"
+                    placeholder={isDev ? "–" : undefined}
+                    dropdownIcon
+                    items={regionItems}
+                    defaultValue={isDev ? undefined : defaultRegion?.name}
+                    value={isDev ? undefined : regionValue}
+                    setValue={isDev ? undefined : (e) => {
+                      if (Array.isArray(e)) return;
+                      setRegionValue(e);
+                    }}
+                    disabled={isDev}
+                  >
+                    {regionItems.map((r) => (
+                      <SelectItem key={r.value} value={r.value}>
+                        {r.label}
+                        {r.isDefault ? " (default)" : ""}
+                      </SelectItem>
+                    ))}
+                  </Select>
+                  {isDev ? (
+                    <Hint>Region is not available in the development environment.</Hint>
+                  ) : (
+                    <Hint>Overrides the region for this run.</Hint>
+                  )}
+                  <FormError id={region.errorId}>{region.error}</FormError>
+                </InputGroup>
+              )}
               <InputGroup>
                 <Label htmlFor={queue.id} variant="small">
                   Queue
@@ -728,6 +795,12 @@ function StandardTaskForm({
                 <Hint>Delays run by a specific duration.</Hint>
                 <FormError id={delaySeconds.errorId}>{delaySeconds.error}</FormError>
               </InputGroup>
+              <InputGroup>
+                <Label variant="small">Priority</Label>
+                <DurationPicker name={prioritySeconds.name} id={prioritySeconds.id} />
+                <Hint>Sets the priority of the run. Higher values mean higher priority.</Hint>
+                <FormError id={prioritySeconds.errorId}>{prioritySeconds.error}</FormError>
+              </InputGroup>
               <InputGroup>
                 <Label variant="small">TTL</Label>
                 <DurationPicker
@@ -794,6 +867,7 @@ function ScheduledTaskForm({
   templates,
   disableVersionSelection,
   allowArbitraryQueues,
+  regions,
 }: {
   task: ScheduledTaskResult["task"];
   runs: ScheduledRun[];
@@ -803,6 +877,7 @@ function ScheduledTaskForm({
   templates: RunTemplate[];
   disableVersionSelection: boolean;
   allowArbitraryQueues: boolean;
+  regions: Region[];
 }) {
   const environment = useEnvironment();
 
@@ -824,6 +899,12 @@ function ScheduledTaskForm({
   );
   const [queueValue, setQueueValue] = useState<string | undefined>(lastRun?.queue);
   const [machineValue, setMachineValue] = useState<string | undefined>(lastRun?.machinePreset);
+  const isDev = environment.type === "DEVELOPMENT";
+  const defaultRegion = regions.find((r) => r.isDefault);
+  const [regionValue, setRegionValue] = useState<string | undefined>(
+    isDev ? undefined : defaultRegion?.name
+  );
+
   const [maxAttemptsValue, setMaxAttemptsValue] = useState<number | undefined>(
     lastRun?.maxAttempts
   );
@@ -834,6 +915,12 @@ function ScheduledTaskForm({
 
   const [showTemplateCreatedSuccessMessage, setShowTemplateCreatedSuccessMessage] = useState(false);
 
+  const regionItems = regions.map((r) => ({
+    value: r.name,
+    label: r.description ? `${r.name} — ${r.description}` : r.name,
+    isDefault: r.isDefault,
+  }));
+
   const queueItems = queues.map((q) => ({
     value: q.type === "task" ? `task/${q.name}` : q.name,
     label: q.name,
@@ -870,6 +957,8 @@ function ScheduledTaskForm({
       tags,
       version,
       machine,
+      region,
+      prioritySeconds,
     },
   ] = useForm({
     id: "test-task-scheduled",
@@ -1091,6 +1180,45 @@ function ScheduledTaskForm({
             )}
             <FormError id={version.errorId}>{version.error}</FormError>
           </InputGroup>
+          {regionItems.length > 1 && (
+            <InputGroup>
+              <Label htmlFor={region.id} variant="small">
+                Region
+              </Label>
+              {/* Our Select primitive uses Ariakit under the hood, which treats
+                  value={undefined} as uncontrolled, keeping stale internal state when
+                  switching environments. The key forces a remount so it reinitializes
+                  with the correct defaultValue. */}
+              <Select
+                key={`region-${environment.id}`}
+                {...conform.select(region)}
+                variant="tertiary/small"
+                placeholder={isDev ? "–" : undefined}
+                dropdownIcon
+                items={regionItems}
+                defaultValue={isDev ? undefined : defaultRegion?.name}
+                value={isDev ? undefined : regionValue}
+                setValue={isDev ? undefined : (e) => {
+                  if (Array.isArray(e)) return;
+                  setRegionValue(e);
+                }}
+                disabled={isDev}
+              >
+                {regionItems.map((r) => (
+                  <SelectItem key={r.value} value={r.value}>
+                    {r.label}
+                    {r.isDefault ? " (default)" : ""}
+                  </SelectItem>
+                ))}
+              </Select>
+              {isDev ? (
+                <Hint>Region is not available in the development environment.</Hint>
+              ) : (
+                <Hint>Overrides the region for this run.</Hint>
+              )}
+              <FormError id={region.errorId}>{region.error}</FormError>
+            </InputGroup>
+          )}
           <InputGroup>
             <Label htmlFor={queue.id} variant="small">
               Queue
@@ -1235,6 +1363,14 @@ function ScheduledTaskForm({
             <Hint>Limits concurrency by creating a separate queue for each value of the key.</Hint>
             <FormError id={concurrencyKey.errorId}>{concurrencyKey.error}</FormError>
           </InputGroup>
+          <InputGroup>
+            <Label htmlFor={prioritySeconds.id} variant="small">
+              Priority
+            </Label>
+            <DurationPicker name={prioritySeconds.name} id={prioritySeconds.id} />
+            <Hint>Sets the priority of the run. Higher values mean higher priority.</Hint>
+            <FormError id={prioritySeconds.errorId}>{prioritySeconds.error}</FormError>
+          </InputGroup>
           <InputGroup>
             <Label htmlFor={ttlSeconds.id} variant="small">
               TTL
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens.$waitpointParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens.$waitpointParam/route.tsx
index 263baed23d0..48b842d34d1 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens.$waitpointParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.tokens.$waitpointParam/route.tsx
@@ -126,6 +126,7 @@ export default function Page() {
             runs={waitpoint.connectedRuns}
             isLoading={false}
             variant="bright"
+            disableAdjacentRows
           />
         </div>
       </div>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam/route.tsx
index aea6b345ee7..3f4be602aa7 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam/route.tsx
@@ -19,7 +19,7 @@ export default function Project() {
 
   return (
     <>
-      <div className="grid grid-cols-[14rem_1fr] overflow-hidden">
+      <div className="grid grid-cols-[auto_1fr] overflow-hidden">
         <DevPresenceProvider enabled={environment.type === "DEVELOPMENT"}>
           <SideMenu
             user={{ ...user, isImpersonating }}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
new file mode 100644
index 00000000000..c4f8762639b
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing-alerts/route.tsx
@@ -0,0 +1,348 @@
+import { conform, list, requestIntent, useFieldList, useForm } from "@conform-to/react";
+import { parse } from "@conform-to/zod";
+import { Form, useActionData, type MetaFunction } from "@remix-run/react";
+import { json, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { tryCatch } from "@trigger.dev/core";
+import { Fragment, useEffect, useRef, useState } from "react";
+import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import {
+  MainHorizontallyCenteredContainer,
+  PageBody,
+  PageContainer,
+} from "~/components/layout/AppLayout";
+import { Button } from "~/components/primitives/Buttons";
+import { CheckboxWithLabel } from "~/components/primitives/Checkbox";
+import { Fieldset } from "~/components/primitives/Fieldset";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { FormError } from "~/components/primitives/FormError";
+import { Header2 } from "~/components/primitives/Headers";
+import { Input } from "~/components/primitives/Input";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { Label } from "~/components/primitives/Label";
+import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { TextLink } from "~/components/primitives/TextLink";
+import { InfoIconTooltip } from "~/components/primitives/Tooltip";
+import { prisma } from "~/db.server";
+import { featuresForRequest } from "~/features.server";
+import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
+import { getBillingAlerts, setBillingAlert } from "~/services/platform.v3.server";
+import { requireUserId } from "~/services/session.server";
+import { formatCurrency, formatNumber } from "~/utils/numberFormatter";
+import {
+  docsPath,
+  OrganizationParamsSchema,
+  organizationPath,
+  v3BillingAlertsPath,
+} from "~/utils/pathBuilder";
+import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
+
+export const meta: MetaFunction = () => {
+  return [
+    {
+      title: `Billing alerts | Trigger.dev`,
+    },
+  ];
+};
+
+export async function loader({ params, request }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug } = OrganizationParamsSchema.parse(params);
+
+  const { isManagedCloud } = featuresForRequest(request);
+  if (!isManagedCloud) {
+    return redirect(organizationPath({ slug: organizationSlug }));
+  }
+
+  const organization = await prisma.organization.findFirst({
+    where: { slug: organizationSlug, members: { some: { userId } } },
+  });
+
+  if (!organization) {
+    throw new Response(null, { status: 404, statusText: "Organization not found" });
+  }
+
+  const [error, alerts] = await tryCatch(getBillingAlerts(organization.id));
+  if (error) {
+    throw new Response(null, { status: 404, statusText: `Billing alerts error: ${error}` });
+  }
+
+  if (!alerts) {
+    throw new Response(null, { status: 404, statusText: "Billing alerts not found" });
+  }
+
+  return typedjson({
+    alerts: {
+      ...alerts,
+      amount: alerts.amount / 100,
+    },
+  });
+}
+
+const schema = z.object({
+  amount: z
+    .number({ invalid_type_error: "Not a valid amount" })
+    .min(0, "Amount must be greater than 0"),
+  emails: z.preprocess((i) => {
+    if (typeof i === "string") return [i];
+
+    if (Array.isArray(i)) {
+      const emails = i.filter((v) => typeof v === "string" && v !== "");
+      if (emails.length === 0) {
+        return [""];
+      }
+      return emails;
+    }
+
+    return [""];
+  }, z.string().email().array().nonempty("At least one email is required")),
+  alertLevels: z.preprocess((i) => {
+    if (typeof i === "string") return [i];
+    return i;
+  }, z.coerce.number().array().nonempty("At least one alert level is required")),
+});
+
+export const action: ActionFunction = async ({ request, params }) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug } = OrganizationParamsSchema.parse(params);
+
+  const formData = await request.formData();
+  const submission = parse(formData, { schema });
+
+  if (!submission.value || submission.intent !== "submit") {
+    return json(submission);
+  }
+
+  try {
+    const organization = await prisma.organization.findFirst({
+      where: { slug: organizationSlug, members: { some: { userId } } },
+    });
+
+    if (!organization) {
+      return redirectWithErrorMessage(
+        v3BillingAlertsPath({ slug: organizationSlug }),
+        request,
+        "You are not authorized to update billing alerts"
+      );
+    }
+
+    const [error, updatedAlert] = await tryCatch(
+      setBillingAlert(organization.id, {
+        ...submission.value,
+        amount: submission.value.amount * 100,
+      })
+    );
+    if (error) {
+      return redirectWithErrorMessage(
+        v3BillingAlertsPath({ slug: organizationSlug }),
+        request,
+        "Failed to update billing alert"
+      );
+    }
+
+    if (!updatedAlert) {
+      return redirectWithErrorMessage(
+        v3BillingAlertsPath({ slug: organizationSlug }),
+        request,
+        "Failed to update billing alert"
+      );
+    }
+
+    return redirectWithSuccessMessage(
+      v3BillingAlertsPath({ slug: organizationSlug }),
+      request,
+      "Billing alert updated"
+    );
+  } catch (error: any) {
+    return json({ errors: { body: error.message } }, { status: 400 });
+  }
+};
+
+export default function Page() {
+  const { alerts } = useTypedLoaderData<typeof loader>();
+  const plan = useCurrentPlan();
+  const [dollarAmount, setDollarAmount] = useState(alerts.amount.toFixed(2));
+
+  const lastSubmission = useActionData();
+
+  const [form, { emails, amount, alertLevels }] = useForm({
+    id: "invite-members",
+    // TODO: type this
+    lastSubmission: lastSubmission as any,
+    onValidate({ formData }) {
+      return parse(formData, { schema });
+    },
+    defaultValue: {
+      emails: [""],
+    },
+  });
+
+  const fieldValues = useRef<string[]>(alerts.emails);
+  const emailFields = useFieldList(form.ref, { ...emails, defaultValue: alerts.emails });
+
+  const checkboxLevels = [0.75, 0.9, 1.0, 2.0, 5.0];
+
+  const spikeAlertLevels = [10.0, 20.0, 50.0, 100.0];
+
+  useEffect(() => {
+    if (alerts.emails.length > 0) {
+      requestIntent(form.ref.current ?? undefined, list.append(emails.name));
+    }
+  }, [emails.name, form.ref]);
+  const isFree = !plan?.v3Subscription?.isPaying;
+
+  return (
+    <PageContainer>
+      <NavBar>
+        <PageTitle title="Billing alerts" />
+        <PageAccessories>
+          <AdminDebugTooltip />
+        </PageAccessories>
+      </NavBar>
+      <PageBody scrollable={true}>
+        <MainHorizontallyCenteredContainer>
+          <div>
+            <div className="mb-3 border-b border-grid-dimmed pb-3">
+              <Header2 spacing>Billing alerts</Header2>
+              <Paragraph variant="small">
+                Receive an email when your compute spend crosses different thresholds. You can also
+                learn how to{" "}
+                <TextLink to={docsPath("how-to-reduce-your-spend")}>
+                  reduce your compute spend
+                </TextLink>
+                .
+              </Paragraph>
+            </div>
+            <Form method="post" {...form.props}>
+              <Fieldset>
+                <InputGroup fullWidth>
+                  <Label htmlFor={amount.id}>Amount</Label>
+                  {isFree ? (
+                    <>
+                      <Paragraph variant="small" className="text-text-dimmed">
+                        ${dollarAmount}
+                      </Paragraph>
+                      <input type="hidden" name={amount.name} value={dollarAmount} />
+                    </>
+                  ) : (
+                    <Input
+                      {...conform.input(amount, { type: "number" })}
+                      value={dollarAmount}
+                      onChange={(e) => {
+                        const numberValue = Number(e.target.value);
+                        if (numberValue < 0) {
+                          setDollarAmount("");
+                          return;
+                        }
+                        setDollarAmount(e.target.value);
+                      }}
+                      step={0.01}
+                      min={0}
+                      placeholder="Enter an amount"
+                      icon={
+                        <span className="-mt-0.5 block pl-0.5 text-sm text-text-dimmed">$</span>
+                      }
+                      className="pl-px"
+                      fullWidth
+                      readOnly={isFree}
+                    />
+                  )}
+                  <FormError id={amount.errorId}>{amount.error}</FormError>
+                </InputGroup>
+                <InputGroup fullWidth>
+                  <Label htmlFor={alertLevels.id}>Alert me when I reach</Label>
+                  {checkboxLevels.map((level) => (
+                    <CheckboxWithLabel
+                      name={alertLevels.name}
+                      id={`level_${level}`}
+                      key={level}
+                      value={level.toString()}
+                      variant="simple/small"
+                      label={
+                        <span>
+                          {level * 100}%{" "}
+                          <span className="text-text-dimmed">
+                            ({formatCurrency(Number(dollarAmount) * level, false)})
+                          </span>
+                        </span>
+                      }
+                      defaultChecked={alerts.alertLevels.includes(level)}
+                      className="pr-0"
+                      readOnly={level === 1.0}
+                    />
+                  ))}
+                  <FormError id={alertLevels.errorId}>{alertLevels.error}</FormError>
+                </InputGroup>
+                <InputGroup fullWidth>
+                  <div className="flex items-center gap-1">
+                    <Label>Spike alerts</Label>
+                    <InfoIconTooltip
+                      content={
+                        "Catch runaway usage from bugs or errors. We recommend keeping these enabled as a safety net."
+                      }
+                      disableHoverableContent
+                    />
+                  </div>
+                  {spikeAlertLevels.map((level) => (
+                    <CheckboxWithLabel
+                      name={alertLevels.name}
+                      id={`level_${level}`}
+                      key={level}
+                      value={level.toString()}
+                      variant="simple/small"
+                      label={
+                        <span>
+                          {formatNumber(level * 100)}%{" "}
+                          <span className="text-text-dimmed">
+                            ({formatCurrency(Number(dollarAmount) * level, false)})
+                          </span>
+                        </span>
+                      }
+                      defaultChecked={
+                        alerts.alertLevels.includes(level) ||
+                        !spikeAlertLevels.some((l) => alerts.alertLevels.includes(l))
+                      }
+                      className="pr-0"
+                    />
+                  ))}
+                </InputGroup>
+                <InputGroup fullWidth>
+                  <Label htmlFor={emails.id}>Email addresses</Label>
+                  {emailFields.map((email, index) => (
+                    <Fragment key={email.key}>
+                      <Input
+                        {...conform.input(email, { type: "email" })}
+                        placeholder={index === 0 ? "Enter an email address" : "Add another email"}
+                        autoFocus={index === 0}
+                        onChange={(e) => {
+                          fieldValues.current[index] = e.target.value;
+                          if (
+                            emailFields.length === fieldValues.current.length &&
+                            fieldValues.current.every((v) => v !== "")
+                          ) {
+                            requestIntent(form.ref.current ?? undefined, list.append(emails.name));
+                          }
+                        }}
+                        fullWidth
+                      />
+                      <FormError id={email.errorId}>{email.error}</FormError>
+                    </Fragment>
+                  ))}
+                </InputGroup>
+                <FormButtons
+                  confirmButton={
+                    <Button type="submit" variant={"primary/small"}>
+                      Update
+                    </Button>
+                  }
+                />
+              </Fieldset>
+            </Form>
+          </div>
+        </MainHorizontallyCenteredContainer>
+      </PageBody>
+    </PageContainer>
+  );
+}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing/route.tsx
index f42c77ad50b..1e579908a92 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.billing/route.tsx
@@ -1,6 +1,6 @@
 import { CalendarDaysIcon, StarIcon } from "@heroicons/react/20/solid";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { type PlanDefinition } from "@trigger.dev/platform/v3";
+import { type PlanDefinition } from "@trigger.dev/platform";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { LinkButton } from "~/components/primitives/Buttons";
@@ -28,7 +28,7 @@ export const meta: MetaFunction = () => {
 };
 
 export async function loader({ params, request }: LoaderFunctionArgs) {
-  await requireUserId(request);
+  const userId = await requireUserId(request);
   const { organizationSlug } = OrganizationParamsSchema.parse(params);
 
   const { isManagedCloud } = featuresForRequest(request);
@@ -41,8 +41,8 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     throw new Response(null, { status: 404, statusText: "Plans not found" });
   }
 
-  const organization = await prisma.organization.findUnique({
-    where: { slug: organizationSlug },
+  const organization = await prisma.organization.findFirst({
+    where: { slug: organizationSlug, members: { some: { userId } } },
   });
 
   if (!organization) {
@@ -83,6 +83,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 export default function ChoosePlanPage() {
   const {
     plans,
+    addOnPricing,
     v3Subscription,
     organizationSlug,
     periodStart,
@@ -141,6 +142,7 @@ export default function ChoosePlanPage() {
           <div>
             <PricingPlans
               plans={plans}
+              concurrencyAddOnPricing={addOnPricing.concurrency}
               subscription={v3Subscription}
               organizationSlug={organizationSlug}
               hasPromotedPlan={false}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.integrations.vercel.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.integrations.vercel.tsx
new file mode 100644
index 00000000000..10b3f2283ce
--- /dev/null
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.integrations.vercel.tsx
@@ -0,0 +1,375 @@
+import type {
+  ActionFunctionArgs,
+  LoaderFunctionArgs,
+} from "@remix-run/node";
+import { json, redirect } from "@remix-run/node";
+import { fromPromise } from "neverthrow";
+import { Form, useActionData, useNavigation } from "@remix-run/react";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { Button } from "~/components/primitives/Buttons";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "~/components/primitives/Dialog";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { Header1 } from "~/components/primitives/Headers";
+import { PageBody, PageContainer } from "~/components/layout/AppLayout";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { Table, TableBody, TableCell, TableHeader, TableHeaderCell, TableRow } from "~/components/primitives/Table";
+import { VercelIntegrationRepository } from "~/models/vercelIntegration.server";
+import { $transaction, prisma } from "~/db.server";
+import { requireOrganization } from "~/services/org.server";
+import { OrganizationParamsSchema } from "~/utils/pathBuilder";
+import { logger } from "~/services/logger.server";
+import { TrashIcon } from "@heroicons/react/20/solid";
+import { v3ProjectSettingsPath } from "~/utils/pathBuilder";
+import { LinkButton } from "~/components/primitives/Buttons";
+
+function formatDate(date: Date): string {
+  return new Intl.DateTimeFormat("en-US", {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+    second: "2-digit",
+    hour12: true,
+  }).format(date);
+}
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const { organizationSlug } = OrganizationParamsSchema.parse(params);
+  const url = new URL(request.url);
+  const configurationId = url.searchParams.get("configurationId") ?? undefined;
+  const { organization } = await requireOrganization(request, organizationSlug);
+  
+  // Find Vercel integration for this organization
+  let vercelIntegration = await prisma.organizationIntegration.findFirst({
+    where: {
+      organizationId: organization.id,
+      service: "VERCEL",
+      deletedAt: null,
+      // If configurationId is provided, filter by it in integrationData
+      ...(configurationId && {
+        integrationData: {
+          path: ["installationId"],
+          equals: configurationId,
+        },
+      }),
+    },
+    include: {
+      tokenReference: true,
+    },
+  });
+
+  if (!vercelIntegration) {
+    return typedjson({
+      organization,
+      vercelIntegration: null,
+      connectedProjects: [],
+      teamId: null,
+      installationId: null,
+    });
+  }
+
+  // Get team ID from integrationData
+  const integrationData = vercelIntegration.integrationData as any;
+  const teamId = integrationData?.teamId ?? null;
+  const installationId = integrationData?.installationId ?? null;
+
+  // Get all connected projects for this integration
+  const connectedProjects = await prisma.organizationProjectIntegration.findMany({
+    where: {
+      organizationIntegrationId: vercelIntegration.id,
+      deletedAt: null,
+    },
+    include: {
+      project: {
+        select: {
+          id: true,
+          slug: true,
+          name: true,
+        },
+      },
+    },
+    orderBy: {
+      createdAt: "desc",
+    },
+  });
+
+  return typedjson({
+    organization,
+    vercelIntegration,
+    connectedProjects,
+    teamId,
+    installationId,
+  });
+};
+
+const ActionSchema = z.object({
+  intent: z.literal("uninstall"),
+});
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const { organizationSlug } = OrganizationParamsSchema.parse(params);
+  const { organization, userId } = await requireOrganization(request, organizationSlug);
+
+  const formData = await request.formData();
+  const result = ActionSchema.safeParse({ intent: formData.get("intent") });
+  if (!result.success) {
+    return json({ error: "Invalid action" }, { status: 400 });
+  }
+
+  // Find Vercel integration
+  const vercelIntegration = await prisma.organizationIntegration.findFirst({
+    where: {
+      organizationId: organization.id,
+      service: "VERCEL",
+      deletedAt: null,
+    },
+    include: {
+      tokenReference: true,
+    },
+  });
+
+  if (!vercelIntegration) {
+    return json({ error: "Vercel integration not found" }, { status: 404 });
+  }
+
+  // Uninstall from Vercel side
+  const uninstallResult = await VercelIntegrationRepository.uninstallVercelIntegration(vercelIntegration);
+
+  if (uninstallResult.isErr()) {
+    logger.error("Failed to uninstall Vercel integration", {
+      organizationId: organization.id,
+      organizationSlug,
+      userId,
+      integrationId: vercelIntegration.id,
+      error: uninstallResult.error.message,
+    });
+
+    return json(
+      { error: "Failed to uninstall Vercel integration. Please try again." },
+      { status: 500 }
+    );
+  }
+
+  // Soft-delete the integration and all connected projects in a transaction
+  const txResult = await fromPromise(
+    $transaction(prisma, async (tx) => {
+      await tx.organizationProjectIntegration.updateMany({
+        where: {
+          organizationIntegrationId: vercelIntegration.id,
+          deletedAt: null,
+        },
+        data: { deletedAt: new Date() },
+      });
+
+      await tx.organizationIntegration.update({
+        where: { id: vercelIntegration.id },
+        data: { deletedAt: new Date() },
+      });
+    }),
+    (error) => error
+  );
+
+  if (txResult.isErr()) {
+    logger.error("Failed to soft-delete Vercel integration records", {
+      organizationId: organization.id,
+      organizationSlug,
+      userId,
+      integrationId: vercelIntegration.id,
+      error: txResult.error instanceof Error ? txResult.error.message : String(txResult.error),
+    });
+
+    return json(
+      { error: "Failed to uninstall Vercel integration. Please try again." },
+      { status: 500 }
+    );
+  }
+
+  if (uninstallResult.value.authInvalid) {
+    logger.warn("Vercel integration uninstalled with auth error - token invalid", {
+      organizationId: organization.id,
+      organizationSlug,
+      userId,
+      integrationId: vercelIntegration.id,
+    });
+  } else {
+    logger.info("Vercel integration uninstalled successfully", {
+      organizationId: organization.id,
+      organizationSlug,
+      userId,
+      integrationId: vercelIntegration.id,
+    });
+  }
+
+  // Redirect back to organization settings
+  return redirect(`/orgs/${organizationSlug}/settings`);
+};
+
+export default function VercelIntegrationPage() {
+  const { organization, vercelIntegration, connectedProjects, teamId, installationId } = 
+    useTypedLoaderData<typeof loader>();
+  const actionData = useActionData<typeof action>();
+  const navigation = useNavigation();
+  const isUninstalling = navigation.state === "submitting" && 
+    navigation.formData?.get("intent") === "uninstall";
+
+  if (!vercelIntegration) {
+    return (
+      <PageContainer>
+        <PageBody>
+          <div className="flex flex-col items-center justify-center py-8">
+            <Header1>No Vercel Integration Found</Header1>
+            <Paragraph className="mt-2 text-center text-text-dimmed">
+              This organization doesn't have a Vercel integration configured.
+            </Paragraph>
+          </div>
+        </PageBody>
+      </PageContainer>
+    );
+  }
+
+  return (
+    <PageContainer>
+      <PageBody>
+        <div className="mb-8">
+          <Header1>Vercel Integration</Header1>
+          <Paragraph className="mt-2 text-text-dimmed">
+            Manage your organization's Vercel integration and connected projects.
+          </Paragraph>
+        </div>
+
+        {/* Integration Info Section */}
+        <div className="mb-8 rounded-lg border border-grid-bright bg-background-bright p-6">
+          <div className="flex items-center justify-between">
+            <div>
+              <h2 className="text-lg font-medium text-text-bright">Integration Details</h2>
+              <div className="mt-2 space-y-1 text-sm text-text-dimmed">
+                {teamId && (
+                  <div>
+                    <span className="font-medium">Vercel Team ID:</span> {teamId}
+                  </div>
+                )}
+                {installationId && (
+                  <div>
+                    <span className="font-medium">Installation ID:</span> {installationId}
+                  </div>
+                )}
+                <div>
+                  <span className="font-medium">Installed:</span>{" "}
+                  {formatDate(new Date(vercelIntegration.createdAt))}
+                </div>
+              </div>
+            </div>
+            <div className="flex flex-col items-end gap-2">
+              <Dialog>
+                <DialogTrigger asChild>
+                  <Button
+                    variant="danger/medium"
+                    LeadingIcon={TrashIcon}
+                    disabled={isUninstalling}
+                  >
+                    Remove Integration
+                  </Button>
+                </DialogTrigger>
+                <DialogContent>
+                  <DialogHeader>
+                    <DialogTitle>Remove Vercel Integration</DialogTitle>
+                  </DialogHeader>
+                  <DialogDescription>
+                    This will permanently remove the Vercel integration and disconnect all projects. 
+                    This action cannot be undone.
+                  </DialogDescription>
+                  <FormButtons
+                    confirmButton={
+                      <Form method="post">
+                        <input type="hidden" name="intent" value="uninstall" />
+                        <Button
+                          variant="danger/medium"
+                          LeadingIcon={TrashIcon}
+                          type="submit"
+                          disabled={isUninstalling}
+                        >
+                          {isUninstalling ? "Removing..." : "Remove Integration"}
+                        </Button>
+                      </Form>
+                    }
+                    cancelButton={
+                      <DialogClose asChild>
+                        <Button variant="tertiary/medium">Cancel</Button>
+                      </DialogClose>
+                    }
+                  />
+                </DialogContent>
+              </Dialog>
+              {actionData?.error && (
+                <Paragraph variant="small" className="text-error">
+                  {actionData.error}
+                </Paragraph>
+              )}
+            </div>
+          </div>
+        </div>
+
+        {/* Connected Projects Section */}
+        <div>
+          <h2 className="mb-4 text-lg font-medium text-text-bright">
+            Connected Projects ({connectedProjects.length})
+          </h2>
+          
+          {connectedProjects.length === 0 ? (
+            <div className="rounded-lg border border-grid-bright bg-background-bright p-6 text-center">
+              <Paragraph className="text-text-dimmed">
+                No projects are currently connected to this Vercel integration.
+              </Paragraph>
+            </div>
+          ) : (
+            <Table>
+              <TableHeader>
+                <TableRow>
+                  <TableHeaderCell>Project Name</TableHeaderCell>
+                  <TableHeaderCell>Vercel Project ID</TableHeaderCell>
+                  <TableHeaderCell>Connected</TableHeaderCell>
+                  <TableHeaderCell hiddenLabel>Actions</TableHeaderCell>
+                </TableRow>
+              </TableHeader>
+              <TableBody>
+                {connectedProjects.map((projectIntegration) => (
+                  <TableRow key={projectIntegration.id}>
+                    <TableCell>{projectIntegration.project.name}</TableCell>
+                    <TableCell className="font-mono text-xs">
+                      {projectIntegration.externalEntityId}
+                    </TableCell>
+                    <TableCell>
+                      {formatDate(new Date(projectIntegration.createdAt))}
+                    </TableCell>
+                    <TableCell>
+                      <LinkButton
+                        variant="minimal/small"
+                        to={v3ProjectSettingsPath(
+                          organization,
+                          projectIntegration.project,
+                          { slug: "prod" } // Default to production environment
+                        )}
+                      >
+                        Configure
+                      </LinkButton>
+                    </TableCell>
+                  </TableRow>
+                ))}
+              </TableBody>
+            </Table>
+          )}
+        </div>
+      </PageBody>
+    </PageContainer>
+  );
+}
\ No newline at end of file
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
index 9e92c27f2bb..0957c06d044 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
@@ -2,18 +2,14 @@ import { InformationCircleIcon } from "@heroicons/react/20/solid";
 import { Await, type MetaFunction } from "@remix-run/react";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { formatDurationMilliseconds } from "@trigger.dev/core/v3";
-import { Suspense } from "react";
-import { Bar, BarChart, CartesianGrid, XAxis, YAxis } from "recharts";
+import { Suspense, useMemo } from "react";
 import { redirect, typeddefer, useTypedLoaderData } from "remix-typedjson";
 import { URL } from "url";
 import { UsageBar } from "~/components/billing/UsageBar";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
-import {
-  type ChartConfig,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-} from "~/components/primitives/Chart";
+import { Card } from "~/components/primitives/charts/Card";
+import type { ChartConfig } from "~/components/primitives/charts/Chart";
+import { Chart } from "~/components/primitives/charts/ChartCompound";
 import { Header2 } from "~/components/primitives/Headers";
 import { InfoPanel } from "~/components/primitives/InfoPanel";
 import { NavBar, PageTitle } from "~/components/primitives/PageHeader";
@@ -46,7 +42,7 @@ export const meta: MetaFunction = () => {
 };
 
 export async function loader({ params, request }: LoaderFunctionArgs) {
-  await requireUserId(request);
+  const userId = await requireUserId(request);
   const { organizationSlug } = OrganizationParamsSchema.parse(params);
 
   const { isManagedCloud } = featuresForRequest(request);
@@ -54,8 +50,8 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     return redirect(organizationPath({ slug: organizationSlug }));
   }
 
-  const organization = await prisma.organization.findUnique({
-    where: { slug: organizationSlug },
+  const organization = await prisma.organization.findFirst({
+    where: { slug: organizationSlug, members: { some: { userId } } },
   });
 
   if (!organization) {
@@ -171,30 +167,30 @@ export default function Page() {
               </Suspense>
             </div>
           </div>
-          <div>
-            <Header2 spacing className="pl-3">
-              Usage by day
-            </Header2>
-            <div className="p-3">
-              <Suspense
-                fallback={
-                  <div className="flex min-h-40 items-center justify-center">
-                    <Spinner />
-                  </div>
-                }
-              >
-                <Await
-                  resolve={usage}
-                  errorElement={
+          <div className="px-3">
+            <Card>
+              <Card.Header>Usage by day</Card.Header>
+              <Card.Content>
+                <Suspense
+                  fallback={
                     <div className="flex min-h-40 items-center justify-center">
-                      <Paragraph variant="small">Failed to load graph.</Paragraph>
+                      <Spinner />
                     </div>
                   }
                 >
-                  {(u) => <UsageChart data={u.timeSeries} />}
-                </Await>
-              </Suspense>
-            </div>
+                  <Await
+                    resolve={usage}
+                    errorElement={
+                      <div className="flex min-h-40 items-center justify-center">
+                        <Paragraph variant="small">Failed to load graph.</Paragraph>
+                      </div>
+                    }
+                  >
+                    {(u) => <UsageChart data={u.timeSeries} />}
+                  </Await>
+                </Suspense>
+              </Card.Content>
+            </Card>
           </div>
           <div>
             <Header2 spacing className="pl-3">
@@ -284,7 +280,7 @@ export default function Page() {
 
 const chartConfig = {
   dollars: {
-    label: "Usage ($)",
+    label: "Usage $",
     color: "#7655fd",
   },
 } satisfies ChartConfig;
@@ -294,48 +290,40 @@ const tooltipDateFormatter = new Intl.DateTimeFormat("en-US", {
   day: "numeric",
 });
 
+const xAxisTickFormatter = (value: string) => {
+  if (!value) return "";
+  const date = new Date(value);
+  return `${date.getDate()}`;
+};
+
+const tooltipLabelFormatter = (label: string) => {
+  if (!label) return "";
+  return tooltipDateFormatter.format(new Date(label));
+};
+
 function UsageChart({ data }: { data: UsageSeriesData }) {
   const maxDollar = Math.max(...data.map((d) => d.dollars));
   const decimalPlaces = maxDollar < 1 ? 4 : 2;
 
-  return (
-    <ChartContainer config={chartConfig} className="max-h-96 min-h-40 w-full">
-      <BarChart accessibilityLayer data={data}>
-        <CartesianGrid vertical={false} />
-        <XAxis
-          fontSize={12}
-          tickLine={false}
-          tickMargin={10}
-          axisLine={false}
-          dataKey="date"
-          tickFormatter={(value) => {
-            if (!value) return "";
-            const date = new Date(value);
-            return `${date.getDate()}`;
-          }}
-          className="text-xs"
-        />
-        <YAxis
-          fontSize={12}
-          tickLine={false}
-          tickMargin={10}
-          axisLine={false}
-          allowDecimals={true}
-          tickFormatter={(value) => `$${value.toFixed(decimalPlaces)}`}
-        />
-        <ChartTooltip
-          content={<ChartTooltipContent />}
-          labelFormatter={(value, data) => {
-            const dateString = data.at(0)?.payload.date;
-            if (!dateString) {
-              return "";
-            }
+  const yAxisTickFormatter = useMemo(
+    () => (value: number) => `$${value.toFixed(decimalPlaces)}`,
+    [decimalPlaces]
+  );
 
-            return tooltipDateFormatter.format(new Date(dateString));
-          }}
-        />
-        <Bar dataKey="dollars" fill="var(--color-dollars)" radius={[4, 4, 0, 0]} />
-      </BarChart>
-    </ChartContainer>
+  return (
+    <Chart.Root
+      config={chartConfig}
+      data={data}
+      dataKey="date"
+      showLegend={false}
+      enableZoom={false}
+      minHeight="160px"
+    >
+      <Chart.Bar
+        xAxisProps={{ tickFormatter: xAxisTickFormatter }}
+        yAxisProps={{ tickFormatter: yAxisTickFormatter, allowDecimals: true }}
+        tooltipLabelFormatter={tooltipLabelFormatter}
+      />
+    </Chart.Root>
   );
 }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug/route.tsx
index 8a22bdefc98..6fea018af54 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug/route.tsx
@@ -3,6 +3,7 @@ import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { typedjson } from "remix-typedjson";
 import { z } from "zod";
 import { RouteErrorDisplay } from "~/components/ErrorDisplay";
+import { prisma } from "~/db.server";
 import { useOptionalOrganization } from "~/hooks/useOrganizations";
 import { useTypedMatchesData } from "~/hooks/useTypedMatchData";
 import { OrganizationsPresenter } from "~/presenters/OrganizationsPresenter.server";
@@ -87,9 +88,18 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   firstDayOfNextMonth.setUTCDate(1);
   firstDayOfNextMonth.setUTCHours(0, 0, 0, 0);
 
-  const [plan, usage] = await Promise.all([
+  const [plan, usage, customDashboards] = await Promise.all([
     getCurrentPlan(organization.id),
     getCachedUsage(organization.id, { from: firstDayOfMonth, to: firstDayOfNextMonth }),
+    prisma.metricsDashboard.findMany({
+      where: { organizationId: organization.id },
+      select: {
+        friendlyId: true,
+        title: true,
+        layout: true,
+      },
+      orderBy: { createdAt: "desc" },
+    }),
   ]);
 
   let hasExceededFreeTier = false;
@@ -99,6 +109,39 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     usagePercentage = usage.cents / plan.v3Subscription.plan.limits.includedUsage;
   }
 
+  // Derive metric dashboard limit from plan, fallback to 3
+  const metricDashboardsLimitValue = plan?.v3Subscription?.plan?.limits?.metricDashboards;
+  const dashboardLimit =
+    typeof metricDashboardsLimitValue === "number"
+      ? metricDashboardsLimitValue
+      : metricDashboardsLimitValue?.number ?? 3;
+
+  // Derive widget-per-dashboard limit from plan, fallback to 16
+  const metricWidgetsLimitValue = plan?.v3Subscription?.plan?.limits?.metricWidgetsPerDashboard;
+  const widgetLimitPerDashboard =
+    typeof metricWidgetsLimitValue === "number"
+      ? metricWidgetsLimitValue
+      : metricWidgetsLimitValue?.number ?? 16;
+
+  // Compute widget counts per dashboard from layout JSON
+  const customDashboardsWithWidgetCount = customDashboards.map((d) => {
+    let widgetCount = 0;
+    try {
+      const layout = JSON.parse(String(d.layout)) as Record<string, unknown>;
+      const widgets = layout.widgets;
+      if (widgets && typeof widgets === "object") {
+        widgetCount = Object.keys(widgets as Record<string, unknown>).length;
+      }
+    } catch {
+      // ignore parse errors
+    }
+    return {
+      friendlyId: d.friendlyId,
+      title: d.title,
+      widgetCount,
+    };
+  });
+
   return typedjson({
     organizations,
     organization,
@@ -106,6 +149,12 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     environment,
     isImpersonating: !!impersonationId,
     currentPlan: { ...plan, v3Usage: { ...usage, hasExceededFreeTier, usagePercentage } },
+    customDashboards: customDashboardsWithWidgetCount,
+    dashboardLimits: {
+      used: customDashboards.length,
+      limit: dashboardLimit,
+    },
+    widgetLimitPerDashboard,
   });
 };
 
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
index 3cd51e26419..d02f869c703 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.projects.new/route.tsx
@@ -7,7 +7,9 @@ import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import invariant from "tiny-invariant";
 import { z } from "zod";
-import { MainCenteredContainer } from "~/components/layout/AppLayout";
+import { BackgroundWrapper } from "~/components/BackgroundWrapper";
+import { Feedback } from "~/components/Feedback";
+import { AppContainer, MainCenteredContainer } from "~/components/layout/AppLayout";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { Fieldset } from "~/components/primitives/Fieldset";
@@ -20,16 +22,17 @@ import { Label } from "~/components/primitives/Label";
 import { ButtonSpinner } from "~/components/primitives/Spinner";
 import { prisma } from "~/db.server";
 import { featuresForRequest } from "~/features.server";
-import { useFeatures } from "~/hooks/useFeatures";
-import { redirectWithSuccessMessage } from "~/models/message.server";
-import { createProject } from "~/models/project.server";
+import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
+import { createProject, ExceededProjectLimitError } from "~/models/project.server";
 import { requireUserId } from "~/services/session.server";
 import {
+  newProjectPath,
   OrganizationParamsSchema,
   organizationPath,
-  v3ProjectPath,
   selectPlanPath,
+  v3ProjectPath,
 } from "~/utils/pathBuilder";
+import { generateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
 
 export async function loader({ params, request }: LoaderFunctionArgs) {
   const userId = await requireUserId(request);
@@ -101,6 +104,12 @@ export const action: ActionFunction = async ({ request, params }) => {
     return json(submission);
   }
 
+  // Check for Vercel integration params in URL
+  const url = new URL(request.url);
+  const code = url.searchParams.get("code");
+  const configurationId = url.searchParams.get("configurationId");
+  const next = url.searchParams.get("next");
+
   try {
     const project = await createProject({
       organizationSlug: organizationSlug,
@@ -109,13 +118,72 @@ export const action: ActionFunction = async ({ request, params }) => {
       version: submission.value.projectVersion,
     });
 
+    // If this is a Vercel integration flow, generate state and redirect to connect
+    if (code && configurationId) {
+      const environment = await prisma.runtimeEnvironment.findFirst({
+        where: {
+          projectId: project.id,
+          slug: "prod",
+          archivedAt: null,
+        },
+      });
+
+      if (!environment) {
+        return redirectWithErrorMessage(
+          newProjectPath({ slug: organizationSlug }),
+          request,
+          "Failed to find project environment."
+        );
+      }
+
+      const state = await generateVercelOAuthState({
+        organizationId: project.organization.id,
+        projectId: project.id,
+        environmentSlug: environment.slug,
+        organizationSlug: project.organization.slug,
+        projectSlug: project.slug,
+      });
+
+      const params = new URLSearchParams({
+        state,
+        code,
+        configurationId,
+        origin: "marketplace",
+      });
+      if (next) {
+        params.set("next", next);
+      }
+      return redirect(`/vercel/connect?${params.toString()}`);
+    }
+
     return redirectWithSuccessMessage(
       v3ProjectPath(project.organization, project),
       request,
       `${submission.value.projectName} created`
     );
-  } catch (error: any) {
-    return json({ errors: { body: error.message } }, { status: 400 });
+  } catch (error) {
+    if (error instanceof ExceededProjectLimitError) {
+      return redirectWithErrorMessage(
+        newProjectPath({ slug: organizationSlug }),
+        request,
+        error.message,
+        {
+          title: "Failed to create project",
+          action: {
+            label: "Request more projects",
+            variant: "secondary/small",
+            action: { type: "help", feedbackType: "help" },
+          },
+        }
+      );
+    }
+
+    return redirectWithErrorMessage(
+      newProjectPath({ slug: organizationSlug }),
+      request,
+      error instanceof Error ? error.message : "Something went wrong",
+      { ephemeral: false }
+    );
   }
 };
 
@@ -138,57 +206,62 @@ export default function Page() {
   const isLoading = navigation.state === "submitting" || navigation.state === "loading";
 
   return (
-    <MainCenteredContainer>
-      <div>
-        <FormTitle
-          LeadingIcon={<FolderIcon className="size-7 text-indigo-500" />}
-          title="Create a new project"
-          description={`This will create a new project in your "${organization.title}" organization.`}
-        />
-        <Form method="post" {...form.props}>
-          {message && (
-            <Callout variant="success" className="mb-4">
-              {message}
-            </Callout>
-          )}
-          <Fieldset>
-            <InputGroup>
-              <Label htmlFor={projectName.id}>Project name</Label>
-              <Input
-                {...conform.input(projectName, { type: "text" })}
-                placeholder="Your project name"
-                icon={FolderIcon}
-                autoFocus
-              />
-              <FormError id={projectName.errorId}>{projectName.error}</FormError>
-            </InputGroup>
-            {canCreateV3Projects ? (
-              <input {...conform.input(projectVersion, { type: "hidden" })} value={"v3"} />
-            ) : (
-              <input {...conform.input(projectVersion, { type: "hidden" })} value={"v2"} />
-            )}
-            <FormButtons
-              confirmButton={
-                <Button
-                  type="submit"
-                  variant={"primary/small"}
-                  disabled={isLoading}
-                  TrailingIcon={isLoading ? ButtonSpinner : undefined}
-                >
-                  {isLoading ? "Creating…" : "Create"}
-                </Button>
-              }
-              cancelButton={
-                organization.projectsCount > 0 ? (
-                  <LinkButton to={organizationPath(organization)} variant={"tertiary/small"}>
-                    Cancel
-                  </LinkButton>
-                ) : undefined
-              }
+    <AppContainer className="bg-charcoal-900">
+      <BackgroundWrapper>
+        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <div>
+            <FormTitle
+              LeadingIcon={<FolderIcon className="size-7 text-indigo-500" />}
+              title="Create a new project"
+              description={`This will create a new project in your "${organization.title}" organization.`}
             />
-          </Fieldset>
-        </Form>
-      </div>
-    </MainCenteredContainer>
+            <Form method="post" {...form.props}>
+              {message && (
+                <Callout variant="success" className="mb-4">
+                  {message}
+                </Callout>
+              )}
+              <Fieldset>
+                <InputGroup>
+                  <Label htmlFor={projectName.id}>Project name</Label>
+                  <Input
+                    {...conform.input(projectName, { type: "text" })}
+                    placeholder="Your project name"
+                    icon={FolderIcon}
+                    autoFocus
+                  />
+                  <FormError id={projectName.errorId}>{projectName.error}</FormError>
+                </InputGroup>
+                {canCreateV3Projects ? (
+                  <input {...conform.input(projectVersion, { type: "hidden" })} value={"v3"} />
+                ) : (
+                  <input {...conform.input(projectVersion, { type: "hidden" })} value={"v2"} />
+                )}
+                <FormButtons
+                  confirmButton={
+                    <Button
+                      type="submit"
+                      variant={"primary/small"}
+                      disabled={isLoading}
+                      TrailingIcon={isLoading ? ButtonSpinner : undefined}
+                    >
+                      {isLoading ? "Creating…" : "Create"}
+                    </Button>
+                  }
+                  cancelButton={
+                    organization.projectsCount > 0 ? (
+                      <LinkButton to={organizationPath(organization)} variant={"secondary/small"}>
+                        Cancel
+                      </LinkButton>
+                    ) : undefined
+                  }
+                />
+              </Fieldset>
+            </Form>
+          </div>
+          <Feedback button={<></>} />
+        </MainCenteredContainer>
+      </BackgroundWrapper>
+    </AppContainer>
   );
 }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx
index e1561becf4c..f5402559bde 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug_.select-plan/route.tsx
@@ -1,6 +1,7 @@
-import { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
-import { MainCenteredContainer } from "~/components/layout/AppLayout";
+import { BackgroundWrapper } from "~/components/BackgroundWrapper";
+import { AppContainer, MainBody, PageBody } from "~/components/layout/AppLayout";
 import { Header1 } from "~/components/primitives/Headers";
 import { prisma } from "~/db.server";
 import { featuresForRequest } from "~/features.server";
@@ -44,20 +45,29 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
 }
 
 export default function ChoosePlanPage() {
-  const { plans, v3Subscription, organizationSlug, periodEnd } =
+  const { plans, v3Subscription, organizationSlug, periodEnd, addOnPricing } =
     useTypedLoaderData<typeof loader>();
 
   return (
-    <MainCenteredContainer className="flex max-w-[80rem] flex-col items-center gap-8 p-3">
-      <Header1 className="text-center">Subscribe for full access</Header1>
-      <PricingPlans
-        plans={plans}
-        subscription={v3Subscription}
-        organizationSlug={organizationSlug}
-        hasPromotedPlan
-        showGithubVerificationBadge
-        periodEnd={periodEnd}
-      />
-    </MainCenteredContainer>
+    <AppContainer>
+      <PageBody className="bg-charcoal-900">
+        <BackgroundWrapper>
+          <div className="mx-auto mt-4 flex h-fit min-h-full max-w-[80rem] flex-col items-center justify-center gap-8 lg:mt-0">
+            <Header1 className="text-center">Subscribe for full access</Header1>
+            <div className="w-full rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+              <PricingPlans
+                plans={plans}
+                concurrencyAddOnPricing={addOnPricing.concurrency}
+                subscription={v3Subscription}
+                organizationSlug={organizationSlug}
+                hasPromotedPlan
+                showGithubVerificationBadge
+                periodEnd={periodEnd}
+              />
+            </div>
+          </div>
+        </BackgroundWrapper>
+      </PageBody>
+    </AppContainer>
   );
 }
diff --git a/apps/webapp/app/routes/_app.orgs.new/route.tsx b/apps/webapp/app/routes/_app.orgs.new/route.tsx
index a171153510e..0a5c7fdd6ae 100644
--- a/apps/webapp/app/routes/_app.orgs.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.new/route.tsx
@@ -7,7 +7,8 @@ import { json, redirect } from "@remix-run/node";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
-import { MainCenteredContainer } from "~/components/layout/AppLayout";
+import { BackgroundWrapper } from "~/components/BackgroundWrapper";
+import { AppContainer, MainCenteredContainer } from "~/components/layout/AppLayout";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Fieldset } from "~/components/primitives/Fieldset";
 import { FormButtons } from "~/components/primitives/FormButtons";
@@ -68,6 +69,27 @@ export const action: ActionFunction = async ({ request }) => {
       });
     }
 
+    // Preserve Vercel integration params if present
+    const url = new URL(request.url);
+    const code = url.searchParams.get("code");
+    const configurationId = url.searchParams.get("configurationId");
+    const integration = url.searchParams.get("integration");
+    const next = url.searchParams.get("next");
+
+    if (code && configurationId && integration === "vercel") {
+      // Redirect to projects/new with params preserved
+      const params = new URLSearchParams({
+        code,
+        configurationId,
+        integration,
+      });
+      if (next) {
+        params.set("next", next);
+      }
+      const redirectUrl = `${organizationPath(organization)}/projects/new?${params.toString()}`;
+      return redirect(redirectUrl);
+    }
+
     return redirect(organizationPath(organization));
   } catch (error: any) {
     return json({ errors: { body: error.message } }, { status: 400 });
@@ -94,85 +116,92 @@ export default function NewOrganizationPage() {
   const isLoading = navigation.state === "submitting" || navigation.state === "loading";
 
   return (
-    <MainCenteredContainer className="max-w-[22rem]">
-      <FormTitle
-        LeadingIcon={<BuildingOffice2Icon className="size-6 text-fuchsia-600" />}
-        title="Create an Organization"
-      />
-      <Form method="post" {...form.props}>
-        <Fieldset>
-          <InputGroup>
-            <Label htmlFor={orgName.id}>Organization name</Label>
-            <Input
-              {...conform.input(orgName, { type: "text" })}
-              placeholder="Your Organization name"
-              icon={BuildingOffice2Icon}
-              autoFocus
-            />
-            <Hint>E.g. your company name or your workspace name.</Hint>
-            <FormError id={orgName.errorId}>{orgName.error}</FormError>
-          </InputGroup>
-          {isManagedCloud && (
-            <>
-              <InputGroup>
-                <Label htmlFor={"companySize"}>Number of employees</Label>
-                <RadioGroup name="companySize" className="flex items-center justify-between gap-2">
-                  <RadioGroupItem
-                    id="employees-1-5"
-                    label="1-5"
-                    value={"1-5"}
-                    variant="button/small"
-                    className="grow"
-                  />
-                  <RadioGroupItem
-                    id="employees-6-49"
-                    label="6-49"
-                    value={"6-49"}
-                    variant="button/small"
-                    className="grow"
-                  />
-                  <RadioGroupItem
-                    id="employees-50-99"
-                    label="50-99"
-                    value={"50-99"}
-                    variant="button/small"
-                    className="grow"
-                  />
-                  <RadioGroupItem
-                    id="employees-100+"
-                    label="100+"
-                    value={"100+"}
-                    variant="button/small"
-                    className="grow"
-                  />
-                </RadioGroup>
-              </InputGroup>
+    <AppContainer className="bg-charcoal-900">
+      <BackgroundWrapper>
+        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <FormTitle
+            LeadingIcon={<BuildingOffice2Icon className="size-6 text-fuchsia-600" />}
+            title="Create an Organization"
+          />
+          <Form method="post" {...form.props}>
+            <Fieldset>
               <InputGroup>
-                <Label htmlFor={"whyUseUs"}>What problem are you trying to solve?</Label>
-                <TextArea name="whyUseUs" rows={4} spellCheck={false} />
-                <Hint>
-                  Your answer will help us understand your use case and provide better support.
-                </Hint>
+                <Label htmlFor={orgName.id}>Organization name</Label>
+                <Input
+                  {...conform.input(orgName, { type: "text" })}
+                  placeholder="Your Organization name"
+                  icon={BuildingOffice2Icon}
+                  autoFocus
+                />
+                <Hint>E.g. your company name or your workspace name.</Hint>
+                <FormError id={orgName.errorId}>{orgName.error}</FormError>
               </InputGroup>
-            </>
-          )}
-
-          <FormButtons
-            confirmButton={
-              <Button type="submit" variant={"primary/small"} disabled={isLoading}>
-                Create
-              </Button>
-            }
-            cancelButton={
-              hasOrganizations ? (
-                <LinkButton to={rootPath()} variant={"tertiary/small"}>
-                  Cancel
-                </LinkButton>
-              ) : null
-            }
-          />
-        </Fieldset>
-      </Form>
-    </MainCenteredContainer>
+              {isManagedCloud && (
+                <>
+                  <InputGroup>
+                    <Label htmlFor={"companySize"}>Number of employees</Label>
+                    <RadioGroup
+                      name="companySize"
+                      className="flex items-center justify-between gap-2"
+                    >
+                      <RadioGroupItem
+                        id="employees-1-5"
+                        label="1-5"
+                        value={"1-5"}
+                        variant="button/small"
+                        className="grow"
+                      />
+                      <RadioGroupItem
+                        id="employees-6-49"
+                        label="6-49"
+                        value={"6-49"}
+                        variant="button/small"
+                        className="grow"
+                      />
+                      <RadioGroupItem
+                        id="employees-50-99"
+                        label="50-99"
+                        value={"50-99"}
+                        variant="button/small"
+                        className="grow"
+                      />
+                      <RadioGroupItem
+                        id="employees-100+"
+                        label="100+"
+                        value={"100+"}
+                        variant="button/small"
+                        className="grow"
+                      />
+                    </RadioGroup>
+                  </InputGroup>
+                  <InputGroup>
+                    <Label htmlFor={"whyUseUs"}>What problem are you trying to solve?</Label>
+                    <TextArea name="whyUseUs" rows={4} spellCheck={false} />
+                    <Hint>
+                      Your answer will help us understand your use case and provide better support.
+                    </Hint>
+                  </InputGroup>
+                </>
+              )}
+
+              <FormButtons
+                confirmButton={
+                  <Button type="submit" variant={"primary/small"} disabled={isLoading}>
+                    Create
+                  </Button>
+                }
+                cancelButton={
+                  hasOrganizations ? (
+                    <LinkButton to={rootPath()} variant={"tertiary/small"}>
+                      Cancel
+                    </LinkButton>
+                  ) : null
+                }
+              />
+            </Fieldset>
+          </Form>
+        </MainCenteredContainer>
+      </BackgroundWrapper>
+    </AppContainer>
   );
 }
diff --git a/apps/webapp/app/routes/account.authorization-code.$authorizationCode/route.tsx b/apps/webapp/app/routes/account.authorization-code.$authorizationCode/route.tsx
index f2c94793610..df75c25ff7f 100644
--- a/apps/webapp/app/routes/account.authorization-code.$authorizationCode/route.tsx
+++ b/apps/webapp/app/routes/account.authorization-code.$authorizationCode/route.tsx
@@ -1,11 +1,8 @@
 import { CheckCircleIcon } from "@heroicons/react/24/solid";
 import { LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { title } from "process";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
-import { ErrorIcon } from "~/assets/icons/ErrorIcon";
 import { AppContainer, MainCenteredContainer } from "~/components/layout/AppLayout";
-import { LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
 import { Header1 } from "~/components/primitives/Headers";
 import { Icon } from "~/components/primitives/Icon";
@@ -13,12 +10,16 @@ import { Paragraph } from "~/components/primitives/Paragraph";
 import { logger } from "~/services/logger.server";
 import { createPersonalAccessTokenFromAuthorizationCode } from "~/services/personalAccessToken.server";
 import { requireUserId } from "~/services/session.server";
-import { rootPath } from "~/utils/pathBuilder";
 
 const ParamsSchema = z.object({
   authorizationCode: z.string(),
 });
 
+const SearchParamsSchema = z.object({
+  source: z.string().optional(),
+  clientName: z.string().optional(),
+});
+
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   const userId = await requireUserId(request);
 
@@ -32,6 +33,14 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     });
   }
 
+  const url = new URL(request.url);
+  const searchObject = Object.fromEntries(url.searchParams.entries());
+
+  const searchParams = SearchParamsSchema.safeParse(searchObject);
+
+  const source = (searchParams.success ? searchParams.data.source : undefined) ?? "cli";
+  const clientName = (searchParams.success ? searchParams.data.clientName : undefined) ?? "unknown";
+
   try {
     const personalAccessToken = await createPersonalAccessTokenFromAuthorizationCode(
       parsedParams.data.authorizationCode,
@@ -39,6 +48,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
     );
     return typedjson({
       success: true as const,
+      source,
+      clientName,
     });
   } catch (error) {
     if (error instanceof Response) {
@@ -49,6 +60,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       return typedjson({
         success: false as const,
         error: error.message,
+        source,
+        clientName,
       });
     }
 
@@ -73,7 +86,7 @@ export default function Page() {
                 <Icon icon={CheckCircleIcon} className="h-6 w-6 text-emerald-500" /> Successfully
                 authenticated
               </Header1>
-              <Paragraph>Return to your terminal to continue.</Paragraph>
+              <Paragraph>{getInstructionsForSource(result.source, result.clientName)}</Paragraph>
             </div>
           ) : (
             <div>
@@ -91,3 +104,21 @@ export default function Page() {
     </AppContainer>
   );
 }
+
+const prettyClientNames: Record<string, string> = {
+  "claude-code": "Claude Code",
+  "cursor-vscode": "Cursor",
+  "Visual Studio Code": "VSCode",
+  "windsurf-client": "Windsurf",
+  "claude-ai": "Claude Desktop",
+};
+
+function getInstructionsForSource(source: string, clientName: string) {
+  if (source === "mcp") {
+    if (clientName) {
+      return `Return to your ${prettyClientNames[clientName] ?? clientName} to continue.`;
+    }
+  }
+
+  return `Return to your terminal to continue.`;
+}
diff --git a/apps/webapp/app/routes/account.tokens/route.tsx b/apps/webapp/app/routes/account.tokens/route.tsx
index 7b7945c70f6..4ad62d7edc8 100644
--- a/apps/webapp/app/routes/account.tokens/route.tsx
+++ b/apps/webapp/app/routes/account.tokens/route.tsx
@@ -3,8 +3,8 @@ import { parse } from "@conform-to/zod";
 import { BookOpenIcon, ShieldCheckIcon, TrashIcon } from "@heroicons/react/20/solid";
 import { ShieldExclamationIcon } from "@heroicons/react/24/solid";
 import { DialogClose } from "@radix-ui/react-dialog";
-import { Form, MetaFunction, useActionData, useFetcher } from "@remix-run/react";
-import { ActionFunction, LoaderFunctionArgs, json } from "@remix-run/server-runtime";
+import { Form, type MetaFunction, useActionData, useFetcher } from "@remix-run/react";
+import { type ActionFunction, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
@@ -16,7 +16,6 @@ import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components
 import { Fieldset } from "~/components/primitives/Fieldset";
 import { FormButtons } from "~/components/primitives/FormButtons";
 import { FormError } from "~/components/primitives/FormError";
-import { Header2 } from "~/components/primitives/Headers";
 import { Hint } from "~/components/primitives/Hint";
 import { Input } from "~/components/primitives/Input";
 import { InputGroup } from "~/components/primitives/InputGroup";
@@ -36,8 +35,8 @@ import {
 import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import { redirectWithSuccessMessage } from "~/models/message.server";
 import {
-  CreatedPersonalAccessToken,
-  ObfuscatedPersonalAccessToken,
+  type CreatedPersonalAccessToken,
+  type ObfuscatedPersonalAccessToken,
   createPersonalAccessToken,
   getValidPersonalAccessTokens,
   revokePersonalAccessToken,
@@ -53,7 +52,7 @@ export const meta: MetaFunction = () => {
   ];
 };
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+export const loader = async ({ request }: LoaderFunctionArgs) => {
   const userId = await requireUserId(request);
 
   try {
@@ -113,7 +112,7 @@ export const action: ActionFunction = async ({ request }) => {
     }
     case "revoke": {
       try {
-        await revokePersonalAccessToken(submission.value.tokenId);
+        await revokePersonalAccessToken(submission.value.tokenId, userId);
 
         return redirectWithSuccessMessage(
           personalAccessTokensPath(),
@@ -125,6 +124,7 @@ export const action: ActionFunction = async ({ request }) => {
       }
     }
     default: {
+      submission.value satisfies never;
       return json({ errors: { body: "Invalid action" } }, { status: 400 });
     }
   }
diff --git a/apps/webapp/app/routes/admin._index.tsx b/apps/webapp/app/routes/admin._index.tsx
index 8da48339ac1..aafb8180026 100644
--- a/apps/webapp/app/routes/admin._index.tsx
+++ b/apps/webapp/app/routes/admin._index.tsx
@@ -138,13 +138,17 @@ export default function AdminDashboardRoute() {
                     <TableCell isSticky={true}>
                       <Form method="post" reloadDocument>
                         <input type="hidden" name="id" value={user.id} />
-
                         <Button
                           type="submit"
                           name="action"
                           value="impersonate"
                           className="mr-2"
                           variant="tertiary/small"
+                          shortcut={
+                            users.length === 1
+                              ? { modifiers: ["mod"], key: "enter", enabledOnInputElements: true }
+                              : undefined
+                          }
                         >
                           Impersonate
                         </Button>
diff --git a/apps/webapp/app/routes/admin.api.v1.environments.$environmentId.engine.repair-queues.ts b/apps/webapp/app/routes/admin.api.v1.environments.$environmentId.engine.repair-queues.ts
new file mode 100644
index 00000000000..30d60197f99
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.environments.$environmentId.engine.repair-queues.ts
@@ -0,0 +1,105 @@
+import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import pMap from "p-map";
+import { z } from "zod";
+import { $replica, prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { determineEngineVersion } from "~/v3/engineVersion.server";
+import { engine } from "~/v3/runEngine.server";
+
+const ParamsSchema = z.object({
+  environmentId: z.string(),
+});
+
+const BodySchema = z.object({
+  dryRun: z.boolean().default(true),
+  queues: z.array(z.string()).default([]),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  // Next authenticate the request
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  if (!user.admin) {
+    return json({ error: "You must be an admin to perform this action" }, { status: 403 });
+  }
+
+  const parsedParams = ParamsSchema.parse(params);
+
+  const environment = await prisma.runtimeEnvironment.findFirst({
+    where: {
+      id: parsedParams.environmentId,
+    },
+    include: {
+      organization: true,
+      project: true,
+      orgMember: true,
+    },
+  });
+
+  if (!environment) {
+    return json({ error: "Environment not found" }, { status: 404 });
+  }
+
+  const engineVersion = await determineEngineVersion({ environment });
+
+  if (engineVersion === "V1") {
+    return json({ error: "Engine version is V1" }, { status: 400 });
+  }
+
+  const body = await request.json();
+  const parsedBody = BodySchema.parse(body);
+
+  const queues = await $replica.taskQueue.findMany({
+    where: {
+      runtimeEnvironmentId: environment.id,
+      version: "V2",
+      name: parsedBody.queues.length > 0 ? { in: parsedBody.queues } : undefined,
+    },
+    select: {
+      friendlyId: true,
+      name: true,
+      concurrencyLimit: true,
+      type: true,
+      paused: true,
+    },
+    orderBy: {
+      orderableName: "asc",
+    },
+  });
+
+  const repairEnvironmentResults = await engine.repairEnvironment(environment, parsedBody.dryRun);
+
+  const repairResults = await pMap(
+    queues,
+    async (queue) => {
+      const repair = await engine.repairQueue(
+        environment,
+        queue.name,
+        parsedBody.dryRun,
+        repairEnvironmentResults.runIds
+      );
+
+      return {
+        queue: queue.name,
+        ...repair,
+      };
+    },
+    { concurrency: 5 }
+  );
+
+  return json({ environment: repairEnvironmentResults, queues: repairResults });
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.environments.$environmentId.engine.report.ts b/apps/webapp/app/routes/admin.api.v1.environments.$environmentId.engine.report.ts
new file mode 100644
index 00000000000..3ea95768991
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.environments.$environmentId.engine.report.ts
@@ -0,0 +1,95 @@
+import { json, LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { $replica, prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { determineEngineVersion } from "~/v3/engineVersion.server";
+import { engine } from "~/v3/runEngine.server";
+
+const ParamsSchema = z.object({
+  environmentId: z.string(),
+});
+
+const SearchParamsSchema = z.object({
+  verbose: z.string().default("0"),
+  page: z.coerce.number().optional(),
+  per_page: z.coerce.number().optional(),
+});
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  // Next authenticate the request
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  if (!user.admin) {
+    return json({ error: "You must be an admin to perform this action" }, { status: 403 });
+  }
+
+  const parsedParams = ParamsSchema.parse(params);
+
+  const environment = await prisma.runtimeEnvironment.findFirst({
+    where: {
+      id: parsedParams.environmentId,
+    },
+    include: {
+      organization: true,
+      project: true,
+      orgMember: true,
+    },
+  });
+
+  if (!environment) {
+    return json({ error: "Environment not found" }, { status: 404 });
+  }
+
+  const engineVersion = await determineEngineVersion({ environment });
+
+  if (engineVersion === "V1") {
+    return json({ error: "Engine version is V1" }, { status: 400 });
+  }
+
+  const url = new URL(request.url);
+  const searchParams = SearchParamsSchema.parse(Object.fromEntries(url.searchParams));
+
+  const page = searchParams.page ?? 1;
+  const perPage = searchParams.per_page ?? 50;
+
+  const queues = await $replica.taskQueue.findMany({
+    where: {
+      runtimeEnvironmentId: environment.id,
+      version: "V2",
+    },
+    select: {
+      friendlyId: true,
+      name: true,
+      concurrencyLimit: true,
+      type: true,
+      paused: true,
+    },
+    orderBy: {
+      orderableName: "asc",
+    },
+    skip: (page - 1) * perPage,
+    take: perPage,
+  });
+
+  const report = await engine.generateEnvironmentReport(
+    environment,
+    queues,
+    searchParams.verbose === "1"
+  );
+
+  return json(report);
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.feature-flags.ts b/apps/webapp/app/routes/admin.api.v1.feature-flags.ts
new file mode 100644
index 00000000000..d0e1dd6b274
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.feature-flags.ts
@@ -0,0 +1,61 @@
+import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { makeSetMultipleFlags, validatePartialFeatureFlags } from "~/v3/featureFlags.server";
+
+export async function action({ request }: ActionFunctionArgs) {
+  // Next authenticate the request
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  if (!user.admin) {
+    return json({ error: "You must be an admin to perform this action" }, { status: 403 });
+  }
+
+  try {
+    // Parse the request body
+    const body = await request.json();
+
+    // Validate the input using the partial schema
+    const validationResult = validatePartialFeatureFlags(body as Record<string, unknown>);
+    if (!validationResult.success) {
+      return json(
+        {
+          error: "Invalid feature flags data",
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    const featureFlags = validationResult.data;
+    const setMultipleFlags = makeSetMultipleFlags(prisma);
+    const updatedFlags = await setMultipleFlags(featureFlags);
+
+    return json({
+      success: true,
+      updatedFlags,
+      message: `Updated ${updatedFlags.length} feature flag(s)`,
+    });
+  } catch (error) {
+    return json(
+      {
+        error: error instanceof Error ? error.message : String(error),
+      },
+      { status: 400 }
+    );
+  }
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.gc.ts b/apps/webapp/app/routes/admin.api.v1.gc.ts
index 1f85307b760..ea63a264acc 100644
--- a/apps/webapp/app/routes/admin.api.v1.gc.ts
+++ b/apps/webapp/app/routes/admin.api.v1.gc.ts
@@ -2,7 +2,8 @@ import { type DataFunctionArgs } from "@remix-run/node";
 import { PerformanceObserver } from "node:perf_hooks";
 import { runInNewContext } from "node:vm";
 import v8 from "v8";
-import { requireUser } from "~/services/session.server";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 
 async function waitTillGcFinishes() {
   let resolver: (value: PerformanceEntry) => void;
@@ -35,9 +36,19 @@ async function waitTillGcFinishes() {
 }
 
 export async function loader({ request }: DataFunctionArgs) {
-  const user = await requireUser(request);
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
 
-  if (!user.admin) {
+  if (!authenticationResult) {
+    throw new Response("You must be an admin to perform this action", { status: 403 });
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user?.admin) {
     throw new Response("You must be an admin to perform this action", { status: 403 });
   }
 
diff --git a/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.concurrency.ts b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.concurrency.ts
index d6491bcc453..d6eee08f37f 100644
--- a/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.concurrency.ts
+++ b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.concurrency.ts
@@ -74,6 +74,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         limit = body.development;
         break;
       }
+      case "PREVIEW":
       case "STAGING": {
         limit = body.staging;
         break;
diff --git a/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.feature-flags.ts b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.feature-flags.ts
new file mode 100644
index 00000000000..96bf340fe0e
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.feature-flags.ts
@@ -0,0 +1,153 @@
+import { ActionFunctionArgs, LoaderFunctionArgs, json } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { validatePartialFeatureFlags } from "~/v3/featureFlags.server";
+
+const ParamsSchema = z.object({
+  organizationId: z.string(),
+});
+
+async function authenticateAdmin(request: Request) {
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return { error: json({ error: "Invalid or Missing API key" }, { status: 401 }) };
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return { error: json({ error: "Invalid or Missing API key" }, { status: 401 }) };
+  }
+
+  if (!user.admin) {
+    return { error: json({ error: "You must be an admin to perform this action" }, { status: 403 }) };
+  }
+
+  return { user };
+}
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const authResult = await authenticateAdmin(request);
+
+  if ("error" in authResult) {
+    return authResult.error;
+  }
+
+  const { organizationId } = ParamsSchema.parse(params);
+
+  const organization = await prisma.organization.findUnique({
+    where: {
+      id: organizationId,
+    },
+    select: {
+      id: true,
+      slug: true,
+      featureFlags: true,
+    },
+  });
+
+  if (!organization) {
+    return json({ error: "Organization not found" }, { status: 404 });
+  }
+
+  const flagsResult = organization.featureFlags
+    ? validatePartialFeatureFlags(organization.featureFlags as Record<string, unknown>)
+    : { success: false as const };
+
+  const featureFlags = flagsResult.success ? flagsResult.data : {};
+
+  return json({
+    organizationId: organization.id,
+    organizationSlug: organization.slug,
+    featureFlags,
+  });
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const authResult = await authenticateAdmin(request);
+
+  if ("error" in authResult) {
+    return authResult.error;
+  }
+
+  const { organizationId } = ParamsSchema.parse(params);
+
+  const organization = await prisma.organization.findUnique({
+    where: {
+      id: organizationId,
+    },
+    select: {
+      id: true,
+      featureFlags: true,
+    },
+  });
+
+  if (!organization) {
+    return json({ error: "Organization not found" }, { status: 404 });
+  }
+
+  try {
+    const body = await request.json();
+
+    // Validate the input using the partial schema
+    const validationResult = validatePartialFeatureFlags(body as Record<string, unknown>);
+    if (!validationResult.success) {
+      return json(
+        {
+          error: "Invalid feature flags data",
+          details: validationResult.error.issues,
+        },
+        { status: 400 }
+      );
+    }
+
+    // Merge new flags with existing flags
+    const existingFlags = organization.featureFlags
+      ? validatePartialFeatureFlags(organization.featureFlags as Record<string, unknown>)
+      : { success: false as const };
+
+    const mergedFlags = {
+      ...(existingFlags.success ? existingFlags.data : {}),
+      ...validationResult.data,
+    };
+
+    // Update the organization's feature flags
+    const updatedOrganization = await prisma.organization.update({
+      where: {
+        id: organizationId,
+      },
+      data: {
+        featureFlags: mergedFlags,
+      },
+      select: {
+        id: true,
+        slug: true,
+        featureFlags: true,
+      },
+    });
+
+    const updatedFlagsResult = updatedOrganization.featureFlags
+      ? validatePartialFeatureFlags(updatedOrganization.featureFlags as Record<string, unknown>)
+      : { success: false as const };
+
+    return json({
+      success: true,
+      organizationId: updatedOrganization.id,
+      organizationSlug: updatedOrganization.slug,
+      featureFlags: updatedFlagsResult.success ? updatedFlagsResult.data : {},
+    });
+  } catch (error) {
+    return json(
+      {
+        error: error instanceof Error ? error.message : String(error),
+      },
+      { status: 400 }
+    );
+  }
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.runs.enable.ts b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.runs.enable.ts
new file mode 100644
index 00000000000..6b1cf2d9939
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.orgs.$organizationId.runs.enable.ts
@@ -0,0 +1,97 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import {
+  type RuntimeEnvironment,
+  type Organization,
+  type Project,
+  type RuntimeEnvironmentType,
+} from "@trigger.dev/database";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { createEnvironment } from "~/models/organization.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { updateEnvConcurrencyLimits } from "~/v3/runQueue.server";
+import { PauseEnvironmentService } from "~/v3/services/pauseEnvironment.server";
+
+const ParamsSchema = z.object({
+  organizationId: z.string(),
+});
+
+const BodySchema = z.object({
+  enable: z.boolean(),
+});
+
+/**
+ * It will enabled/disable runs
+ */
+export async function action({ request, params }: ActionFunctionArgs) {
+  // Next authenticate the request
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  if (!user.admin) {
+    return json({ error: "You must be an admin to perform this action" }, { status: 403 });
+  }
+
+  const { organizationId } = ParamsSchema.parse(params);
+  const body = BodySchema.safeParse(await request.json());
+  if (!body.success) {
+    return json({ error: "Invalid request body", details: body.error }, { status: 400 });
+  }
+
+  const organization = await prisma.organization.update({
+    where: {
+      id: organizationId,
+    },
+    data: {
+      runsEnabled: body.data.enable,
+    },
+  });
+
+  if (!organization) {
+    return json({ error: "Organization not found" }, { status: 404 });
+  }
+
+  const environments = await prisma.runtimeEnvironment.findMany({
+    where: {
+      organizationId,
+      type: {
+        not: "DEVELOPMENT",
+      },
+    },
+    include: {
+      organization: true,
+      project: true,
+    },
+  });
+
+  const pauseEnvironmentService = new PauseEnvironmentService();
+
+  // Set the organization.runsEnabled flag to false
+  for (const environment of environments) {
+    if (body.data.enable) {
+      await pauseEnvironmentService.call({ ...environment, organization }, "resumed");
+    } else {
+      await pauseEnvironmentService.call({ ...environment, organization }, "paused");
+    }
+  }
+
+  return json({
+    success: true,
+    message: `${environments.length} environments updated to ${
+      body.data.enable ? "enabled" : "disabled"
+    }`,
+  });
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.runs-replication.$batchId.backfill.ts b/apps/webapp/app/routes/admin.api.v1.runs-replication.$batchId.backfill.ts
new file mode 100644
index 00000000000..105fcaa408f
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.runs-replication.$batchId.backfill.ts
@@ -0,0 +1,68 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { adminWorker } from "~/v3/services/adminWorker.server";
+
+const Body = z.object({
+  from: z.coerce.date(),
+  to: z.coerce.date(),
+  batchSize: z.number().optional(),
+  delayIntervalMs: z.number().optional(),
+});
+
+const Params = z.object({
+  batchId: z.string(),
+});
+
+const DEFAULT_BATCH_SIZE = 500;
+const DEFAULT_DELAY_INTERVAL_MS = 1000;
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  // Next authenticate the request
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  if (!user.admin) {
+    return json({ error: "You must be an admin to perform this action" }, { status: 403 });
+  }
+
+  const { batchId } = Params.parse(params);
+
+  try {
+    const body = await request.json();
+
+    const { from, to, batchSize, delayIntervalMs } = Body.parse(body);
+
+    await adminWorker.enqueue({
+      job: "admin.backfillRunsToReplication",
+      payload: {
+        from,
+        to,
+        batchSize: batchSize ?? DEFAULT_BATCH_SIZE,
+        delayIntervalMs: delayIntervalMs ?? DEFAULT_DELAY_INTERVAL_MS,
+      },
+      id: batchId,
+    });
+
+    return json({
+      success: true,
+      id: batchId,
+    });
+  } catch (error) {
+    return json({ error: error instanceof Error ? error.message : error }, { status: 400 });
+  }
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.runs-replication.$batchId.cancel.ts b/apps/webapp/app/routes/admin.api.v1.runs-replication.$batchId.cancel.ts
new file mode 100644
index 00000000000..8dfcf9fb85b
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.runs-replication.$batchId.cancel.ts
@@ -0,0 +1,45 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { adminWorker } from "~/v3/services/adminWorker.server";
+
+const Params = z.object({
+  batchId: z.string(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  // Next authenticate the request
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const user = await prisma.user.findUnique({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  if (!user.admin) {
+    return json({ error: "You must be an admin to perform this action" }, { status: 403 });
+  }
+
+  const { batchId } = Params.parse(params);
+
+  try {
+    await adminWorker.cancel(batchId);
+
+    return json({
+      success: true,
+      id: batchId,
+    });
+  } catch (error) {
+    return json({ error: error instanceof Error ? error.message : error }, { status: 400 });
+  }
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.runs-replication.backfill.ts b/apps/webapp/app/routes/admin.api.v1.runs-replication.backfill.ts
index 1584d1acccd..0897c30c21d 100644
--- a/apps/webapp/app/routes/admin.api.v1.runs-replication.backfill.ts
+++ b/apps/webapp/app/routes/admin.api.v1.runs-replication.backfill.ts
@@ -59,7 +59,12 @@ export async function action({ request }: ActionFunctionArgs) {
       throw new Error("Runs replication instance not found");
     }
 
-    await runsReplicationInstance.backfill(runs);
+    await runsReplicationInstance.backfill(
+      runs.map((run) => ({
+        ...run,
+        masterQueue: run.workerQueue,
+      }))
+    );
 
     logger.info("Backfilled runs", { runs });
 
diff --git a/apps/webapp/app/routes/admin.api.v1.simulate-error.ts b/apps/webapp/app/routes/admin.api.v1.simulate-error.ts
new file mode 100644
index 00000000000..6dcf681e09f
--- /dev/null
+++ b/apps/webapp/app/routes/admin.api.v1.simulate-error.ts
@@ -0,0 +1,12 @@
+import { type DataFunctionArgs } from "@remix-run/node";
+import { requireUser } from "~/services/session.server";
+
+export async function loader({ request }: DataFunctionArgs) {
+  const user = await requireUser(request);
+
+  if (!user.admin) {
+    throw new Response("You must be an admin to perform this action", { status: 403 });
+  }
+
+  throw new Error("Test error");
+}
diff --git a/apps/webapp/app/routes/admin.api.v1.snapshot.ts b/apps/webapp/app/routes/admin.api.v1.snapshot.ts
index c8fa7cee409..3b345978f5e 100644
--- a/apps/webapp/app/routes/admin.api.v1.snapshot.ts
+++ b/apps/webapp/app/routes/admin.api.v1.snapshot.ts
@@ -4,7 +4,8 @@ import os from "os";
 import path from "path";
 import { PassThrough } from "stream";
 import v8 from "v8";
-import { requireUser } from "~/services/session.server";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 
 // Format date as yyyy-MM-dd HH_mm_ss_SSS
 function formatDate(date: Date) {
@@ -24,9 +25,19 @@ function formatDate(date: Date) {
 }
 
 export async function loader({ request }: DataFunctionArgs) {
-  const user = await requireUser(request);
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
 
-  if (!user.admin) {
+  if (!authenticationResult) {
+    throw new Response("You must be an admin to perform this action", { status: 403 });
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user?.admin) {
     throw new Response("You must be an admin to perform this action", { status: 403 });
   }
 
diff --git a/apps/webapp/app/routes/admin.orgs.tsx b/apps/webapp/app/routes/admin.orgs.tsx
index bb59cebf310..afdcf5e97c9 100644
--- a/apps/webapp/app/routes/admin.orgs.tsx
+++ b/apps/webapp/app/routes/admin.orgs.tsx
@@ -117,6 +117,11 @@ export default function AdminDashboardRoute() {
                         to={`/@/orgs/${org.slug}`}
                         className="mr-2"
                         variant="tertiary/small"
+                        shortcut={
+                          organizations.length === 1
+                            ? { modifiers: ["mod"], key: "enter", enabledOnInputElements: true }
+                            : undefined
+                        }
                       >
                         Impersonate
                       </LinkButton>
diff --git a/apps/webapp/app/routes/api.v1.artifacts.ts b/apps/webapp/app/routes/api.v1.artifacts.ts
new file mode 100644
index 00000000000..82ae3f53756
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.artifacts.ts
@@ -0,0 +1,91 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import {
+  type CreateArtifactResponseBody,
+  CreateArtifactRequestBody,
+  tryCatch,
+} from "@trigger.dev/core/v3";
+import { authenticateRequest } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { ArtifactsService } from "~/v3/services/artifacts.server";
+
+export async function action({ request }: ActionFunctionArgs) {
+  if (request.method.toUpperCase() !== "POST") {
+    return json({ error: "Method Not Allowed" }, { status: 405 });
+  }
+
+  const authenticationResult = await authenticateRequest(request, {
+    apiKey: true,
+    organizationAccessToken: false,
+    personalAccessToken: false,
+  });
+
+  if (!authenticationResult || !authenticationResult.result.ok) {
+    logger.info("Invalid or missing api key", { url: request.url });
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const [, rawBody] = await tryCatch(request.json());
+  const body = CreateArtifactRequestBody.safeParse(rawBody ?? {});
+
+  if (!body.success) {
+    return json({ error: "Invalid request body", issues: body.error.issues }, { status: 400 });
+  }
+
+  const { environment: authenticatedEnv } = authenticationResult.result;
+
+  const service = new ArtifactsService();
+  return await service
+    .createArtifact(body.data.type, authenticatedEnv, body.data.contentLength)
+    .match(
+      (result) => {
+        return json(
+          {
+            artifactKey: result.artifactKey,
+            uploadUrl: result.uploadUrl,
+            uploadFields: result.uploadFields,
+            expiresAt: result.expiresAt.toISOString(),
+          } satisfies CreateArtifactResponseBody,
+          { status: 201 }
+        );
+      },
+      (error) => {
+        switch (error.type) {
+          case "artifact_size_exceeds_limit": {
+            logger.warn("Artifact size exceeds limit", { error });
+            const sizeMB = parseFloat((error.contentLength / (1024 * 1024)).toFixed(1));
+            const limitMB = parseFloat((error.sizeLimit / (1024 * 1024)).toFixed(1));
+
+            let errorMessage;
+
+            switch (body.data.type) {
+              case "deployment_context":
+                errorMessage = `Artifact size (${sizeMB} MB) exceeds the allowed limit of ${limitMB} MB. Make sure you are in the correct directory of your Trigger.dev project. Reach out to us if you are seeing this error consistently.`;
+                break;
+              default:
+                body.data.type satisfies never;
+                errorMessage = `Artifact size (${sizeMB} MB) exceeds the allowed limit of ${limitMB} MB`;
+            }
+            return json(
+              {
+                error: errorMessage,
+              },
+              { status: 400 }
+            );
+          }
+          case "failed_to_create_presigned_post": {
+            logger.error("Failed to create presigned POST", { error });
+            return json({ error: "Failed to generate artifact upload URL" }, { status: 500 });
+          }
+          case "artifacts_bucket_not_configured": {
+            logger.error("Artifacts bucket not configured", { error });
+            return json({ error: "Internal server error" }, { status: 500 });
+          }
+          default: {
+            error satisfies never;
+            logger.error("Failed creating artifact", { error });
+            return json({ error: "Internal server error" }, { status: 500 });
+          }
+        }
+      }
+    );
+}
diff --git a/apps/webapp/app/routes/api.v1.batches.$batchId.ts b/apps/webapp/app/routes/api.v1.batches.$batchId.ts
index 150978331e5..d852385b4b6 100644
--- a/apps/webapp/app/routes/api.v1.batches.$batchId.ts
+++ b/apps/webapp/app/routes/api.v1.batches.$batchId.ts
@@ -18,6 +18,9 @@ export const loader = createLoaderApiRoute(
           friendlyId: params.batchId,
           runtimeEnvironmentId: auth.environment.id,
         },
+        include: {
+          errors: true,
+        },
       });
     },
     authorization: {
@@ -35,6 +38,18 @@ export const loader = createLoaderApiRoute(
       updatedAt: batch.updatedAt,
       runCount: batch.runCount,
       runs: batch.runIds,
+      // Include error details for PARTIAL_FAILED batches
+      successfulRunCount: batch.successfulRunCount ?? undefined,
+      failedRunCount: batch.failedRunCount ?? undefined,
+      errors:
+        batch.errors.length > 0
+          ? batch.errors.map((err) => ({
+              index: err.index,
+              taskIdentifier: err.taskIdentifier,
+              error: err.error,
+              errorCode: err.errorCode ?? undefined,
+            }))
+          : undefined,
     });
   }
 );
diff --git a/apps/webapp/app/routes/api.v1.deployments.$deploymentId.cancel.ts b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.cancel.ts
new file mode 100644
index 00000000000..dd209d4494b
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.cancel.ts
@@ -0,0 +1,72 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { CancelDeploymentRequestBody, tryCatch } from "@trigger.dev/core/v3";
+import { z } from "zod";
+import { authenticateRequest } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { DeploymentService } from "~/v3/services/deployment.server";
+
+const ParamsSchema = z.object({
+  deploymentId: z.string(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  if (request.method.toUpperCase() !== "POST") {
+    return json({ error: "Method Not Allowed" }, { status: 405 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid params" }, { status: 400 });
+  }
+
+  const authenticationResult = await authenticateRequest(request, {
+    apiKey: true,
+    organizationAccessToken: false,
+    personalAccessToken: false,
+  });
+
+  if (!authenticationResult || !authenticationResult.result.ok) {
+    logger.info("Invalid or missing api key", { url: request.url });
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const { environment: authenticatedEnv } = authenticationResult.result;
+  const { deploymentId } = parsedParams.data;
+
+  const [, rawBody] = await tryCatch(request.json());
+  const body = CancelDeploymentRequestBody.safeParse(rawBody ?? {});
+
+  if (!body.success) {
+    return json({ error: "Invalid request body", issues: body.error.issues }, { status: 400 });
+  }
+
+  const deploymentService = new DeploymentService();
+
+  return await deploymentService
+    .cancelDeployment(authenticatedEnv, deploymentId, {
+      canceledReason: body.data.reason,
+    })
+    .match(
+      () => {
+        return new Response(null, { status: 204 });
+      },
+      (error) => {
+        switch (error.type) {
+          case "deployment_not_found":
+            return json({ error: "Deployment not found" }, { status: 404 });
+          case "failed_to_delete_deployment_timeout":
+            return new Response(null, { status: 204 }); // not a critical error, ignore
+          case "deployment_cannot_be_cancelled":
+            return json(
+              { error: "Deployment is already in a final state and cannot be canceled" },
+              { status: 409 }
+            );
+          case "other":
+          default:
+            error.type satisfies "other";
+            return json({ error: "Internal server error" }, { status: 500 });
+        }
+      }
+    );
+}
diff --git a/apps/webapp/app/routes/api.v1.deployments.$deploymentId.generate-registry-credentials.ts b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.generate-registry-credentials.ts
new file mode 100644
index 00000000000..161f37f930b
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.generate-registry-credentials.ts
@@ -0,0 +1,100 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import {
+  type GenerateRegistryCredentialsResponseBody,
+  ProgressDeploymentRequestBody,
+  tryCatch,
+} from "@trigger.dev/core/v3";
+import { z } from "zod";
+import { authenticateRequest } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { DeploymentService } from "~/v3/services/deployment.server";
+
+const ParamsSchema = z.object({
+  deploymentId: z.string(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  if (request.method.toUpperCase() !== "POST") {
+    return json({ error: "Method Not Allowed" }, { status: 405 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid params" }, { status: 400 });
+  }
+
+  const authenticationResult = await authenticateRequest(request, {
+    apiKey: true,
+    organizationAccessToken: false,
+    personalAccessToken: false,
+  });
+
+  if (!authenticationResult || !authenticationResult.result.ok) {
+    logger.info("Invalid or missing api key", { url: request.url });
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const { environment: authenticatedEnv } = authenticationResult.result;
+  const { deploymentId } = parsedParams.data;
+
+  const [, rawBody] = await tryCatch(request.json());
+  const body = ProgressDeploymentRequestBody.safeParse(rawBody ?? {});
+
+  if (!body.success) {
+    return json({ error: "Invalid request body", issues: body.error.issues }, { status: 400 });
+  }
+
+  const deploymentService = new DeploymentService();
+
+  return await deploymentService.generateRegistryCredentials(authenticatedEnv, deploymentId).match(
+    (result) => {
+      return json(
+        {
+          username: result.username,
+          password: result.password,
+          expiresAt: result.expiresAt.toISOString(),
+          repositoryUri: result.repositoryUri,
+        } satisfies GenerateRegistryCredentialsResponseBody,
+        { status: 200 }
+      );
+    },
+    (error) => {
+      switch (error.type) {
+        case "deployment_not_found":
+          return json({ error: "Deployment not found" }, { status: 404 });
+        case "deployment_has_no_image_reference":
+          logger.error(
+            "Failed to generate registry credentials: deployment_has_no_image_reference",
+            { deploymentId }
+          );
+          return json({ error: "Deployment has no image reference" }, { status: 409 });
+        case "deployment_is_already_final":
+          return json(
+            { error: "Failed to generate registry credentials: deployment_is_already_final" },
+            { status: 409 }
+          );
+        case "missing_registry_credentials":
+          logger.error("Failed to generate registry credentials: missing_registry_credentials", {
+            deploymentId,
+          });
+          return json({ error: "Missing registry credentials" }, { status: 409 });
+        case "registry_not_supported":
+          logger.error("Failed to generate registry credentials: registry_not_supported", {
+            deploymentId,
+          });
+          return json({ error: "Registry not supported" }, { status: 409 });
+        case "registry_region_not_supported":
+          logger.error("Failed to generate registry credentials: registry_region_not_supported", {
+            deploymentId,
+          });
+          return json({ error: "Registry region not supported" }, { status: 409 });
+        case "other":
+        default:
+          error.type satisfies "other";
+          logger.error("Failed to generate registry credentials", { error: error.cause });
+          return json({ error: "Internal server error" }, { status: 500 });
+      }
+    }
+  );
+}
diff --git a/apps/webapp/app/routes/api.v1.deployments.$deploymentId.progress.ts b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.progress.ts
new file mode 100644
index 00000000000..2c78c59f552
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.progress.ts
@@ -0,0 +1,81 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { ProgressDeploymentRequestBody, tryCatch } from "@trigger.dev/core/v3";
+import { z } from "zod";
+import { authenticateRequest } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { DeploymentService } from "~/v3/services/deployment.server";
+
+const ParamsSchema = z.object({
+  deploymentId: z.string(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  if (request.method.toUpperCase() !== "POST") {
+    return json({ error: "Method Not Allowed" }, { status: 405 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid params" }, { status: 400 });
+  }
+
+  const authenticationResult = await authenticateRequest(request, {
+    apiKey: true,
+    organizationAccessToken: false,
+    personalAccessToken: false,
+  });
+
+  if (!authenticationResult || !authenticationResult.result.ok) {
+    logger.info("Invalid or missing api key", { url: request.url });
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
+  }
+
+  const { environment: authenticatedEnv } = authenticationResult.result;
+  const { deploymentId } = parsedParams.data;
+
+  const [, rawBody] = await tryCatch(request.json());
+  const body = ProgressDeploymentRequestBody.safeParse(rawBody ?? {});
+
+  if (!body.success) {
+    return json({ error: "Invalid request body", issues: body.error.issues }, { status: 400 });
+  }
+
+  const deploymentService = new DeploymentService();
+
+  return await deploymentService
+    .progressDeployment(authenticatedEnv, deploymentId, {
+      contentHash: body.data.contentHash,
+      git: body.data.gitMeta,
+      runtime: body.data.runtime,
+      buildServerMetadata: body.data.buildServerMetadata,
+    })
+    .match(
+      () => {
+        return new Response(null, { status: 204 });
+      },
+      (error) => {
+        switch (error.type) {
+          case "failed_to_extend_deployment_timeout": {
+            logger.warn("Failed to extend deployment timeout", { error: error.cause });
+            return new Response(null, { status: 204 }); // ignore these errors for now
+          }
+          case "deployment_not_found":
+            return json({ error: "Deployment not found" }, { status: 404 });
+          case "deployment_cannot_be_progressed":
+            return json(
+              { error: "Deployment is not in a progressable state (PENDING or INSTALLING)" },
+              { status: 409 }
+            );
+          case "failed_to_create_remote_build": {
+            logger.error("Failed to create remote Depot build", { error: error.cause });
+            return json({ error: "Failed to create remote build" }, { status: 500 });
+          }
+          case "other":
+          default:
+            error.type satisfies "other";
+            return json({ error: "Internal server error" }, { status: 500 });
+        }
+      }
+    );
+}
diff --git a/apps/webapp/app/routes/api.v1.deployments.$deploymentId.ts b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.ts
index 643b1f8a132..d0593e564fd 100644
--- a/apps/webapp/app/routes/api.v1.deployments.$deploymentId.ts
+++ b/apps/webapp/app/routes/api.v1.deployments.$deploymentId.ts
@@ -1,4 +1,5 @@
-import { LoaderFunctionArgs, json } from "@remix-run/server-runtime";
+import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
+import { type GetDeploymentResponseBody } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
@@ -38,6 +39,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
           tasks: true,
         },
       },
+      integrationDeployments: true,
     },
   });
 
@@ -52,7 +54,11 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     shortCode: deployment.shortCode,
     version: deployment.version,
     imageReference: deployment.imageReference,
-    errorData: deployment.errorData,
+    imagePlatform: deployment.imagePlatform,
+    commitSHA: deployment.commitSHA,
+    externalBuildData:
+      deployment.externalBuildData as GetDeploymentResponseBody["externalBuildData"],
+    errorData: deployment.errorData as GetDeploymentResponseBody["errorData"],
     worker: deployment.worker
       ? {
           id: deployment.worker.friendlyId,
@@ -65,5 +71,15 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
           })),
         }
       : undefined,
-  });
+    integrationDeployments:
+      deployment.integrationDeployments.length > 0
+        ? deployment.integrationDeployments.map((id) => ({
+            id: id.id,
+            integrationName: id.integrationName,
+            integrationDeploymentId: id.integrationDeploymentId,
+            commitSHA: id.commitSHA,
+            createdAt: id.createdAt,
+          }))
+        : undefined,
+  } satisfies GetDeploymentResponseBody);
 }
diff --git a/apps/webapp/app/routes/api.v1.deployments.ts b/apps/webapp/app/routes/api.v1.deployments.ts
index 65410761b94..0190ba123d5 100644
--- a/apps/webapp/app/routes/api.v1.deployments.ts
+++ b/apps/webapp/app/routes/api.v1.deployments.ts
@@ -1,10 +1,13 @@
-import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import {
+  ApiDeploymentListSearchParams,
   InitializeDeploymentRequestBody,
-  InitializeDeploymentResponseBody,
+  type InitializeDeploymentResponseBody,
 } from "@trigger.dev/core/v3";
+import { $replica } from "~/db.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
+import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { InitializeDeploymentService } from "~/v3/services/initializeDeployment.server";
 
@@ -34,7 +37,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
   const service = new InitializeDeploymentService();
 
   try {
-    const { deployment, imageRef } = await service.call(authenticatedEnv, body.data);
+    const { deployment, imageRef, eventStream } = await service.call(authenticatedEnv, body.data);
 
     const responseBody: InitializeDeploymentResponseBody = {
       id: deployment.friendlyId,
@@ -45,6 +48,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
         deployment.externalBuildData as InitializeDeploymentResponseBody["externalBuildData"],
       imageTag: imageRef,
       imagePlatform: deployment.imagePlatform,
+      eventStream,
     };
 
     return json(responseBody, { status: 200 });
@@ -60,3 +64,119 @@ export async function action({ request, params }: ActionFunctionArgs) {
     }
   }
 }
+
+export const loader = createLoaderApiRoute(
+  {
+    searchParams: ApiDeploymentListSearchParams,
+    allowJWT: true,
+    corsStrategy: "none",
+    authorization: {
+      action: "read",
+      resource: () => ({ deployments: "list" }),
+      superScopes: ["read:deployments", "read:all", "admin"],
+    },
+    findResource: async () => 1, // This is a dummy function, we don't need to find a resource
+  },
+  async ({ searchParams, authentication }) => {
+    const limit = Math.max(Math.min(searchParams["page[size]"] ?? 20, 100), 5);
+
+    const afterDeployment = searchParams["page[after]"]
+      ? await $replica.workerDeployment.findFirst({
+          where: {
+            friendlyId: searchParams["page[after]"],
+            environmentId: authentication.environment.id,
+          },
+        })
+      : undefined;
+
+    const deployments = await $replica.workerDeployment.findMany({
+      where: {
+        environmentId: authentication.environment.id,
+        ...(afterDeployment ? { id: { lt: afterDeployment.id } } : {}),
+        ...getCreatedAtFilter(searchParams),
+        ...(searchParams.status ? { status: searchParams.status } : {}),
+      },
+      orderBy: {
+        id: "desc",
+      },
+      take: limit + 1,
+    });
+
+    const hasMore = deployments.length > limit;
+    const nextCursor = hasMore ? deployments[limit - 1].friendlyId : undefined;
+    const data = hasMore ? deployments.slice(0, limit) : deployments;
+
+    return json({
+      data: data.map((deployment) => ({
+        id: deployment.friendlyId,
+        createdAt: deployment.createdAt,
+        shortCode: deployment.shortCode,
+        version: deployment.version.toString(),
+        runtime: deployment.runtime,
+        runtimeVersion: deployment.runtimeVersion,
+        status: deployment.status,
+        deployedAt: deployment.deployedAt,
+        git: deployment.git,
+        error: deployment.errorData ?? undefined,
+      })),
+      pagination: {
+        next: nextCursor,
+      },
+    });
+  }
+);
+
+import parseDuration from "parse-duration";
+import { parseDate } from "@trigger.dev/core/v3/isomorphic";
+
+function getCreatedAtFilter(searchParams: ApiDeploymentListSearchParams) {
+  if (searchParams.period) {
+    const duration = parseDuration(searchParams.period, "ms");
+
+    if (!duration) {
+      throw new ServiceValidationError(
+        `Invalid search query parameter: period=${searchParams.period}`,
+        400
+      );
+    }
+
+    return {
+      createdAt: {
+        gte: new Date(Date.now() - duration),
+        lte: new Date(),
+      },
+    };
+  }
+
+  if (searchParams.from && searchParams.to) {
+    const fromDate = safeDateFromString(searchParams.from, "from");
+    const toDate = safeDateFromString(searchParams.to, "to");
+
+    return {
+      createdAt: {
+        gte: fromDate,
+        lte: toDate,
+      },
+    };
+  }
+
+  if (searchParams.from) {
+    const fromDate = safeDateFromString(searchParams.from, "from");
+    return {
+      createdAt: {
+        gte: fromDate,
+      },
+    };
+  }
+
+  return {};
+}
+
+function safeDateFromString(value: string, paramName: string) {
+  const date = parseDate(value);
+
+  if (!date) {
+    throw new ServiceValidationError(`Invalid search query parameter: ${paramName}=${value}`, 400);
+  }
+  return date;
+}
diff --git a/apps/webapp/app/routes/api.v1.idempotencyKeys.$key.reset.ts b/apps/webapp/app/routes/api.v1.idempotencyKeys.$key.reset.ts
new file mode 100644
index 00000000000..557a67409de
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.idempotencyKeys.$key.reset.ts
@@ -0,0 +1,51 @@
+import { json } from "@remix-run/server-runtime";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+import { z } from "zod";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { ResetIdempotencyKeyService } from "~/v3/services/resetIdempotencyKey.server";
+import { logger } from "~/services/logger.server";
+
+const ParamsSchema = z.object({
+  key: z.string(),
+});
+
+const BodySchema = z.object({
+  taskIdentifier: z.string().min(1, "Task identifier is required"),
+});
+
+export const { action } = createActionApiRoute(
+  {
+    params: ParamsSchema,
+    body: BodySchema,
+    allowJWT: true,
+    corsStrategy: "all",
+    authorization: {
+      action: "write",
+      resource: () => ({}),
+      superScopes: ["write:runs", "admin"],
+    },
+  },
+  async ({ params, body, authentication }) => {
+    const service = new ResetIdempotencyKeyService();
+
+    try {
+      const result = await service.call(
+        params.key,
+        body.taskIdentifier,
+        authentication.environment
+      );
+      return json(result, { status: 200 });
+    } catch (error) {
+      if (error instanceof ServiceValidationError) {
+        return json({ error: error.message }, { status: error.status ?? 400 });
+      }
+
+      logger.error("Failed to reset idempotency key via API", {
+        error: error instanceof Error ? { name: error.name, message: error.message, stack: error.stack } : String(error),
+      });
+
+      return json({ error: "Internal Server Error" }, { status: 500 });
+    }
+
+  }
+);
diff --git a/apps/webapp/app/routes/api.v1.mock.ts b/apps/webapp/app/routes/api.v1.mock.ts
new file mode 100644
index 00000000000..1ec47cb3b7e
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.mock.ts
@@ -0,0 +1,20 @@
+import { ActionFunctionArgs } from "@remix-run/server-runtime";
+
+export async function action({ request }: ActionFunctionArgs) {
+  if (process.env.NODE_ENV === "production") {
+    return new Response("Not found", { status: 404 });
+  }
+
+  return new Response(
+    JSON.stringify({
+      data: {
+        id: "123",
+        type: "mock",
+        attributes: {
+          name: "Mock",
+        },
+      },
+    }),
+    { status: 200 }
+  );
+}
diff --git a/apps/webapp/app/routes/api.v1.orgs.$orgParam.projects.ts b/apps/webapp/app/routes/api.v1.orgs.$orgParam.projects.ts
new file mode 100644
index 00000000000..dc1791dabc5
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.orgs.$orgParam.projects.ts
@@ -0,0 +1,145 @@
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { json } from "@remix-run/server-runtime";
+import {
+  CreateProjectRequestBody,
+  GetProjectResponseBody,
+  GetProjectsResponseBody,
+  tryCatch,
+} from "@trigger.dev/core/v3";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { createProject } from "~/models/project.server";
+import { logger } from "~/services/logger.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { isCuid } from "cuid";
+
+const ParamsSchema = z.object({
+  orgParam: z.string(),
+});
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  logger.info("get projects", { url: request.url });
+
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const { orgParam } = ParamsSchema.parse(params);
+
+  const projects = await prisma.project.findMany({
+    where: {
+      organization: {
+        ...orgParamWhereClause(orgParam),
+        deletedAt: null,
+        members: {
+          some: {
+            userId: authenticationResult.userId,
+          },
+        },
+      },
+      version: "V3",
+      deletedAt: null,
+    },
+    include: {
+      organization: true,
+    },
+  });
+
+  if (!projects) {
+    return json({ error: "Projects not found" }, { status: 404 });
+  }
+
+  const result: GetProjectsResponseBody = projects.map((project) => ({
+    id: project.id,
+    externalRef: project.externalRef,
+    name: project.name,
+    slug: project.slug,
+    createdAt: project.createdAt,
+    organization: {
+      id: project.organization.id,
+      title: project.organization.title,
+      slug: project.organization.slug,
+      createdAt: project.organization.createdAt,
+    },
+  }));
+
+  return json(result);
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const { orgParam } = ParamsSchema.parse(params);
+
+  const organization = await prisma.organization.findFirst({
+    where: {
+      ...orgParamWhereClause(orgParam),
+      deletedAt: null,
+      members: {
+        some: {
+          userId: authenticationResult.userId,
+        },
+      },
+    },
+  });
+
+  if (!organization) {
+    return json({ error: "Organization not found" }, { status: 404 });
+  }
+
+  const body = await request.json();
+  const parsedBody = CreateProjectRequestBody.safeParse(body);
+
+  if (!parsedBody.success) {
+    return json({ error: "Invalid request body" }, { status: 400 });
+  }
+
+  const [error, project] = await tryCatch(
+    createProject({
+      organizationSlug: organization.slug,
+      name: parsedBody.data.name,
+      userId: authenticationResult.userId,
+      version: "v3",
+    })
+  );
+
+  if (error) {
+    return json({ error: error.message }, { status: 400 });
+  }
+
+  const result: GetProjectResponseBody = {
+    id: project.id,
+    externalRef: project.externalRef,
+    name: project.name,
+    slug: project.slug,
+    createdAt: project.createdAt,
+    organization: {
+      id: project.organization.id,
+      title: project.organization.title,
+      slug: project.organization.slug,
+      createdAt: project.organization.createdAt,
+    },
+  };
+
+  return json(result);
+}
+
+function orgParamWhereClause(orgParam: string) {
+  // If the orgParam is an ID, or if it's a slug
+  // IDs are cuid
+  if (isCuid(orgParam)) {
+    return {
+      id: orgParam,
+    };
+  }
+
+  return {
+    slug: orgParam,
+  };
+}
diff --git a/apps/webapp/app/routes/api.v1.orgs.$organizationSlug.projects.$projectParam.vercel.projects.ts b/apps/webapp/app/routes/api.v1.orgs.$organizationSlug.projects.$projectParam.vercel.projects.ts
new file mode 100644
index 00000000000..aaf54685888
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.orgs.$organizationSlug.projects.$projectParam.vercel.projects.ts
@@ -0,0 +1,147 @@
+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { json } from "@remix-run/server-runtime";
+import { fromPromise } from "neverthrow";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { apiCors } from "~/utils/apiCors";
+import { logger } from "~/services/logger.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import { VercelIntegrationService } from "~/services/vercelIntegration.server";
+
+const ParamsSchema = z.object({
+  organizationSlug: z.string(),
+  projectParam: z.string(),
+});
+
+/**
+ * API endpoint to retrieve connected Vercel projects for a Trigger.dev project.
+ *
+ * GET /api/v1/orgs/:organizationSlug/projects/:projectParam/vercel/projects
+ *
+ * Returns:
+ * - vercelProject: The connected Vercel project details (if any)
+ * - config: The Vercel integration configuration
+ * - syncEnvVarsMapping: The environment variable sync mapping
+ */
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  // Handle CORS
+  if (request.method === "OPTIONS") {
+    return apiCors(request, json({}));
+  }
+
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return apiCors(
+      request,
+      json({ error: "Invalid or Missing Access Token" }, { status: 401 })
+    );
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+  if (!parsedParams.success) {
+    return apiCors(
+      request,
+      json({ error: "Invalid parameters" }, { status: 400 })
+    );
+  }
+
+  const { organizationSlug, projectParam } = parsedParams.data;
+
+  const result = await fromPromise(
+    (async () => {
+      // Find the project, verifying org membership
+      const project = await prisma.project.findFirst({
+        where: {
+          slug: projectParam,
+          organization: {
+            slug: organizationSlug,
+            members: {
+              some: {
+                userId: authenticationResult.userId,
+              },
+            },
+          },
+          deletedAt: null,
+        },
+        select: {
+          id: true,
+          name: true,
+          slug: true,
+          organizationId: true,
+        },
+      });
+
+      if (!project) {
+        return { type: "not_found" as const };
+      }
+
+      // Get Vercel integration for the project
+      const vercelService = new VercelIntegrationService();
+      const integration = await vercelService.getVercelProjectIntegration(project.id);
+
+      return { type: "success" as const, project, integration };
+    })(),
+    (error) => error
+  );
+
+  if (result.isErr()) {
+    logger.error("Failed to fetch Vercel projects", {
+      error: result.error,
+      organizationSlug,
+      projectParam,
+    });
+
+    return apiCors(
+      request,
+      json({ error: "Internal server error" }, { status: 500 })
+    );
+  }
+
+  if (result.value.type === "not_found") {
+    return apiCors(
+      request,
+      json({ error: "Project not found" }, { status: 404 })
+    );
+  }
+
+  const { project, integration } = result.value;
+
+  if (!integration) {
+    return apiCors(
+      request,
+      json({
+        connected: false,
+        vercelProject: null,
+        config: null,
+        syncEnvVarsMapping: null,
+      })
+    );
+  }
+
+  const { parsedIntegrationData } = integration;
+
+  return apiCors(
+    request,
+    json({
+      connected: true,
+      vercelProject: {
+        id: parsedIntegrationData.vercelProjectId,
+        name: parsedIntegrationData.vercelProjectName,
+        teamId: parsedIntegrationData.vercelTeamId,
+      },
+      config: {
+        atomicBuilds: parsedIntegrationData.config.atomicBuilds,
+        pullEnvVarsBeforeBuild: parsedIntegrationData.config.pullEnvVarsBeforeBuild,
+        vercelStagingEnvironment: parsedIntegrationData.config.vercelStagingEnvironment,
+      },
+      syncEnvVarsMapping: parsedIntegrationData.syncEnvVarsMapping,
+      triggerProject: {
+        id: project.id,
+        name: project.name,
+        slug: project.slug,
+      },
+    })
+  );
+}
+
diff --git a/apps/webapp/app/routes/api.v1.orgs.ts b/apps/webapp/app/routes/api.v1.orgs.ts
new file mode 100644
index 00000000000..626162f234b
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.orgs.ts
@@ -0,0 +1,37 @@
+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { json } from "@remix-run/server-runtime";
+import { GetOrgsResponseBody } from "@trigger.dev/core/v3";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const orgs = await prisma.organization.findMany({
+    where: {
+      deletedAt: null,
+      members: {
+        some: {
+          userId: authenticationResult.userId,
+        },
+      },
+    },
+  });
+
+  if (!orgs) {
+    return json({ error: "Orgs not found" }, { status: 404 });
+  }
+
+  const result: GetOrgsResponseBody = orgs.map((org) => ({
+    id: org.id,
+    title: org.title,
+    slug: org.slug,
+    createdAt: org.createdAt,
+  }));
+
+  return json(result);
+}
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.jwt.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.jwt.ts
new file mode 100644
index 00000000000..e4b48ece05e
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.jwt.ts
@@ -0,0 +1,72 @@
+import { type ActionFunctionArgs, json } from "@remix-run/node";
+import { generateJWT as internal_generateJWT } from "@trigger.dev/core/v3";
+import { z } from "zod";
+import {
+  authenticatedEnvironmentForAuthentication,
+  authenticateRequest,
+} from "~/services/apiAuth.server";
+
+const ParamsSchema = z.object({
+  projectRef: z.string(),
+  env: z.enum(["dev", "staging", "prod", "preview"]),
+});
+
+const RequestBodySchema = z.object({
+  claims: z
+    .object({
+      scopes: z.array(z.string()).default([]),
+    })
+    .optional(),
+  expirationTime: z.union([z.number(), z.string()]).optional(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const authenticationResult = await authenticateRequest(request, {
+    personalAccessToken: true,
+    organizationAccessToken: true,
+    apiKey: false,
+  });
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid Params" }, { status: 400 });
+  }
+
+  const { projectRef, env } = parsedParams.data;
+  const triggerBranch = request.headers.get("x-trigger-branch") ?? undefined;
+
+  const runtimeEnv = await authenticatedEnvironmentForAuthentication(
+    authenticationResult,
+    projectRef,
+    env,
+    triggerBranch
+  );
+
+  const parsedBody = RequestBodySchema.safeParse(await request.json());
+
+  if (!parsedBody.success) {
+    return json(
+      { error: "Invalid request body", issues: parsedBody.error.issues },
+      { status: 400 }
+    );
+  }
+
+  const claims = {
+    sub: runtimeEnv.id,
+    pub: true,
+    ...parsedBody.data.claims,
+  };
+
+  const jwt = await internal_generateJWT({
+    secretKey: runtimeEnv.apiKey,
+    payload: claims,
+    expirationTime: parsedBody.data.expirationTime ?? "1h",
+  });
+
+  return json({ token: jwt });
+}
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts
index cb5adeaf0d3..e0349aab558 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.ts
@@ -1,11 +1,12 @@
 import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { type GetProjectEnvResponse } from "@trigger.dev/core/v3";
-import { type RuntimeEnvironment } from "@trigger.dev/database";
 import { z } from "zod";
-import { prisma } from "~/db.server";
 import { env as processEnv } from "~/env.server";
-import { logger } from "~/services/logger.server";
-import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
+import {
+  authenticatedEnvironmentForAuthentication,
+  authenticateRequest,
+  branchNameFromRequest,
+} from "~/services/apiAuth.server";
 
 const ParamsSchema = z.object({
   projectRef: z.string(),
@@ -15,14 +16,6 @@ const ParamsSchema = z.object({
 type ParamsSchema = z.infer<typeof ParamsSchema>;
 
 export async function loader({ request, params }: LoaderFunctionArgs) {
-  logger.info("projects get env", { url: request.url });
-
-  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
-
-  if (!authenticationResult) {
-    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
-  }
-
   const parsedParams = ParamsSchema.safeParse(params);
 
   if (!parsedParams.success) {
@@ -31,117 +24,25 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
   const { projectRef, env } = parsedParams.data;
 
-  const project = await prisma.project.findFirst({
-    where: {
-      externalRef: projectRef,
-      organization: {
-        members: {
-          some: {
-            userId: authenticationResult.userId,
-          },
-        },
-      },
-    },
-  });
+  const authenticationResult = await authenticateRequest(request);
 
-  if (!project) {
-    return json({ error: "Project not found" }, { status: 404 });
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing API key" }, { status: 401 });
   }
 
-  const envResult = await getEnvironmentFromEnv({
-    projectId: project.id,
-    userId: authenticationResult.userId,
+  const environment = await authenticatedEnvironmentForAuthentication(
+    authenticationResult,
+    projectRef,
     env,
-  });
-
-  if (!envResult.success) {
-    return json({ error: envResult.error }, { status: 404 });
-  }
-
-  const runtimeEnv = envResult.environment;
+    branchNameFromRequest(request)
+  );
 
   const result: GetProjectEnvResponse = {
-    apiKey: runtimeEnv.apiKey,
-    name: project.name,
+    apiKey: environment.apiKey,
+    name: environment.project.name,
     apiUrl: processEnv.API_ORIGIN ?? processEnv.APP_ORIGIN,
-    projectId: project.id,
+    projectId: environment.project.id,
   };
 
   return json(result);
 }
-
-async function getEnvironmentFromEnv({
-  projectId,
-  userId,
-  env,
-}: {
-  projectId: string;
-  userId: string;
-  env: ParamsSchema["env"];
-}): Promise<
-  | {
-      success: true;
-      environment: RuntimeEnvironment;
-    }
-  | {
-      success: false;
-      error: string;
-    }
-> {
-  if (env === "dev") {
-    const environment = await prisma.runtimeEnvironment.findFirst({
-      where: {
-        projectId,
-        orgMember: {
-          userId: userId,
-        },
-      },
-    });
-
-    if (!environment) {
-      return {
-        success: false,
-        error: "Dev environment not found",
-      };
-    }
-
-    return {
-      success: true,
-      environment,
-    };
-  }
-
-  let slug: "stg" | "prod" | "preview" = "prod";
-  switch (env) {
-    case "staging":
-      slug = "stg";
-      break;
-    case "prod":
-      slug = "prod";
-      break;
-    case "preview":
-      slug = "preview";
-      break;
-    default:
-      break;
-  }
-
-  const environment = await prisma.runtimeEnvironment.findFirst({
-    where: {
-      projectId,
-      slug,
-    },
-  });
-
-  if (!environment) {
-    return {
-      success: false,
-      error: `${env === "staging" ? "Staging" : "Production"} environment not found`,
-    };
-  }
-
-  return {
-    success: true,
-    environment,
-  };
-}
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.workers.$tagName.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.workers.$tagName.ts
new file mode 100644
index 00000000000..ddb398b4c21
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.$env.workers.$tagName.ts
@@ -0,0 +1,113 @@
+import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { $replica, prisma } from "~/db.server";
+import { findCurrentWorkerFromEnvironment } from "~/v3/models/workerDeployment.server";
+import { type GetWorkerByTagResponse } from "@trigger.dev/core/v3/schemas";
+import { env as $env } from "~/env.server";
+import { v3RunsPath } from "~/utils/pathBuilder";
+import {
+  authenticatedEnvironmentForAuthentication,
+  authenticateRequest,
+} from "~/services/apiAuth.server";
+
+const ParamsSchema = z.object({
+  projectRef: z.string(),
+  tagName: z.string(),
+  env: z.enum(["dev", "staging", "prod", "preview"]),
+});
+
+const HeadersSchema = z.object({
+  "x-trigger-branch": z.string().optional(),
+});
+
+type ParamsSchema = z.infer<typeof ParamsSchema>;
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const authenticationResult = await authenticateRequest(request, {
+    personalAccessToken: true,
+    organizationAccessToken: true,
+    apiKey: false,
+  });
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid Params" }, { status: 400 });
+  }
+  const { projectRef, env } = parsedParams.data;
+
+  const parsedHeaders = HeadersSchema.safeParse(Object.fromEntries(request.headers));
+  const triggerBranch = parsedHeaders.success ? parsedHeaders.data["x-trigger-branch"] : undefined;
+
+  const runtimeEnv = await authenticatedEnvironmentForAuthentication(
+    authenticationResult,
+    projectRef,
+    env,
+    triggerBranch
+  );
+
+  const currentWorker = await findCurrentWorkerFromEnvironment(
+    {
+      id: runtimeEnv.id,
+      type: runtimeEnv.type,
+    },
+    $replica,
+    params.tagName
+  );
+
+  if (!currentWorker) {
+    return json({ error: "Worker not found" }, { status: 404 });
+  }
+
+  const tasks = await $replica.backgroundWorkerTask.findMany({
+    where: {
+      workerId: currentWorker.id,
+    },
+    select: {
+      friendlyId: true,
+      slug: true,
+      filePath: true,
+      triggerSource: true,
+      createdAt: true,
+      payloadSchema: true,
+    },
+    orderBy: {
+      slug: "asc",
+    },
+  });
+
+  const urls = {
+    runs: `${$env.APP_ORIGIN}${v3RunsPath(
+      { slug: runtimeEnv.organization.slug },
+      { slug: runtimeEnv.project.slug },
+      { slug: runtimeEnv.slug },
+      { versions: [currentWorker.version] }
+    )}`,
+  };
+
+  // Prepare the response object
+  const response: GetWorkerByTagResponse = {
+    worker: {
+      id: currentWorker.friendlyId,
+      version: currentWorker.version,
+      engine: currentWorker.engine,
+      sdkVersion: currentWorker.sdkVersion,
+      cliVersion: currentWorker.cliVersion,
+      tasks: tasks.map((task) => ({
+        id: task.friendlyId,
+        slug: task.slug,
+        filePath: task.filePath,
+        triggerSource: task.triggerSource,
+        createdAt: task.createdAt,
+        payloadSchema: task.payloadSchema,
+      })),
+    },
+    urls,
+  };
+
+  return json(response);
+}
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts
index 299133cdf58..6b044c9e833 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.background-workers.$envSlug.$version.ts
@@ -2,8 +2,9 @@ import { LoaderFunctionArgs, json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import {
-  authenticateProjectApiKeyOrPersonalAccessToken,
+  authenticateRequest,
   authenticatedEnvironmentForAuthentication,
+  branchNameFromRequest,
 } from "~/services/apiAuth.server";
 import zlib from "node:zlib";
 
@@ -20,7 +21,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     return json({ error: "Invalid params" }, { status: 400 });
   }
 
-  const authenticationResult = await authenticateProjectApiKeyOrPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request);
 
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing API key" }, { status: 401 });
@@ -29,7 +30,8 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   const environment = await authenticatedEnvironmentForAuthentication(
     authenticationResult,
     parsedParams.data.projectRef,
-    parsedParams.data.envSlug
+    parsedParams.data.envSlug,
+    branchNameFromRequest(request)
   );
 
   // Find the background worker and tasks and files
@@ -82,9 +84,9 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   });
 }
 
-function decompressContent(compressedBuffer: Buffer): string {
-  // First, we need to decode the base64 Buffer to get the actual compressed data
-  const decodedBuffer = Buffer.from(compressedBuffer.toString("utf-8"), "base64");
+function decompressContent(compressedBuffer: Uint8Array): string {
+  // Convert Uint8Array to Buffer and decode base64 in one step
+  const decodedBuffer = Buffer.from(Buffer.from(compressedBuffer).toString("utf-8"), "base64");
 
   // Decompress the data
   const decompressedData = zlib.inflateSync(decodedBuffer);
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.archive.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.archive.ts
index 76147979c0f..64119b5a417 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.archive.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.archive.ts
@@ -2,9 +2,9 @@ import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
 import { tryCatch } from "@trigger.dev/core";
 import { z } from "zod";
 import { prisma } from "~/db.server";
+import { authenticateRequest } from "~/services/apiAuth.server";
 import { ArchiveBranchService } from "~/services/archiveBranch.server";
 import { logger } from "~/services/logger.server";
-import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 
 const ParamsSchema = z.object({
   projectRef: z.string(),
@@ -21,7 +21,12 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   logger.info("Archive branch", { url: request.url, params });
 
-  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request, {
+    personalAccessToken: true,
+    organizationAccessToken: true,
+    apiKey: false,
+  });
+
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
   }
@@ -50,13 +55,16 @@ export async function action({ request, params }: ActionFunctionArgs) {
       archivedAt: true,
     },
     where: {
-      organization: {
-        members: {
-          some: {
-            userId: authenticationResult.userId,
-          },
-        },
-      },
+      organization:
+        authenticationResult.type === "organizationAccessToken"
+          ? { id: authenticationResult.result.organizationId }
+          : {
+              members: {
+                some: {
+                  userId: authenticationResult.result.userId,
+                },
+              },
+            },
       project: {
         externalRef: projectRef,
       },
@@ -74,9 +82,14 @@ export async function action({ request, params }: ActionFunctionArgs) {
   }
 
   const service = new ArchiveBranchService();
-  const result = await service.call(authenticationResult.userId, {
-    environmentId: environment.id,
-  });
+  const result = await service.call(
+    authenticationResult.type === "organizationAccessToken"
+      ? { type: "orgId", organizationId: authenticationResult.result.organizationId }
+      : { type: "userMembership", userId: authenticationResult.result.userId },
+    {
+      environmentId: environment.id,
+    }
+  );
 
   if (result.success) {
     return json(result);
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.ts
index 21654580bf9..8678ef1f9d4 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.branches.ts
@@ -1,7 +1,8 @@
-import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";
+import { json, type LoaderFunctionArgs, type ActionFunctionArgs } from "@remix-run/server-runtime";
 import { tryCatch, UpsertBranchRequestBody } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { prisma } from "~/db.server";
+import { authenticateRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 import { UpsertBranchService } from "~/services/upsertBranch.server";
@@ -19,7 +20,11 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   logger.info("project upsert branch", { url: request.url });
 
-  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request, {
+    personalAccessToken: true,
+    organizationAccessToken: true,
+    apiKey: false,
+  });
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
   }
@@ -38,13 +43,16 @@ export async function action({ request, params }: ActionFunctionArgs) {
     },
     where: {
       externalRef: projectRef,
-      organization: {
-        members: {
-          some: {
-            userId: authenticationResult.userId,
-          },
-        },
-      },
+      organization:
+        authenticationResult.type === "organizationAccessToken"
+          ? { id: authenticationResult.result.organizationId }
+          : {
+              members: {
+                some: {
+                  userId: authenticationResult.result.userId,
+                },
+              },
+            },
     },
   });
   if (!project) {
@@ -81,11 +89,16 @@ export async function action({ request, params }: ActionFunctionArgs) {
   const { branch, env, git } = parsed.data;
 
   const service = new UpsertBranchService();
-  const result = await service.call(authenticationResult.userId, {
-    branchName: branch,
-    parentEnvironmentId: previewEnvironment.id,
-    git,
-  });
+  const result = await service.call(
+    authenticationResult.type === "organizationAccessToken"
+      ? { type: "orgId", organizationId: authenticationResult.result.organizationId }
+      : { type: "userMembership", userId: authenticationResult.result.userId },
+    {
+      branchName: branch,
+      parentEnvironmentId: previewEnvironment.id,
+      git,
+    }
+  );
 
   if (!result.success) {
     return json({ error: result.error }, { status: 400 });
@@ -93,3 +106,82 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   return json(result.branch);
 }
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid Params" }, { status: 400 });
+  }
+
+  const { projectRef } = parsedParams.data;
+
+  const project = await prisma.project.findFirst({
+    select: {
+      id: true,
+    },
+    where: {
+      externalRef: projectRef,
+      organization: {
+        members: {
+          some: {
+            userId: authenticationResult.userId,
+          },
+        },
+      },
+    },
+  });
+
+  if (!project) {
+    return json({ error: "Project not found" }, { status: 404 });
+  }
+
+  const previewEnvironment = await prisma.runtimeEnvironment.findFirst({
+    select: {
+      id: true,
+    },
+    where: {
+      projectId: project.id,
+      slug: "preview",
+    },
+  });
+
+  if (!previewEnvironment) {
+    return json(
+      { error: "You don't have preview branches setup. Go to the dashboard to enable them." },
+      { status: 400 }
+    );
+  }
+
+  const branches = await prisma.runtimeEnvironment.findMany({
+    where: {
+      projectId: project.id,
+      parentEnvironmentId: previewEnvironment.id,
+      archivedAt: null,
+    },
+    select: {
+      id: true,
+      branchName: true,
+      createdAt: true,
+      updatedAt: true,
+      git: true,
+      paused: true,
+    },
+  });
+
+  return json({
+    branches: branches.map((branch) => ({
+      id: branch.id,
+      name: branch.branchName ?? "main",
+      createdAt: branch.createdAt,
+      updatedAt: branch.updatedAt,
+      git: branch.git ?? undefined,
+      isPaused: branch.paused,
+    })),
+  });
+}
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.dev-status.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.dev-status.ts
new file mode 100644
index 00000000000..f5f632a8223
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.dev-status.ts
@@ -0,0 +1,41 @@
+import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import { z } from "zod";
+import { devPresence } from "~/presenters/v3/DevPresence.server";
+import {
+  authenticatedEnvironmentForAuthentication,
+  authenticateRequest,
+} from "~/services/apiAuth.server";
+
+const ParamsSchema = z.object({
+  projectRef: z.string(),
+});
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const authenticationResult = await authenticateRequest(request, {
+    personalAccessToken: true,
+    organizationAccessToken: true,
+    apiKey: false,
+  });
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return json({ error: "Invalid Params" }, { status: 400 });
+  }
+
+  const { projectRef } = parsedParams.data;
+
+  const runtimeEnv = await authenticatedEnvironmentForAuthentication(
+    authenticationResult,
+    projectRef,
+    "dev"
+  );
+
+  const isConnected = await devPresence.isConnected(runtimeEnv.id);
+
+  return json({ isConnected });
+}
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.$name.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.$name.ts
index 7682f6bbbe1..e3081b090e3 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.$name.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.$name.ts
@@ -3,8 +3,9 @@ import { UpdateEnvironmentVariableRequestBody } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import {
-  authenticateProjectApiKeyOrPersonalAccessToken,
+  authenticateRequest,
   authenticatedEnvironmentForAuthentication,
+  branchNameFromRequest,
 } from "~/services/apiAuth.server";
 import { EnvironmentVariablesRepository } from "~/v3/environmentVariables/environmentVariablesRepository.server";
 
@@ -21,7 +22,7 @@ export async function action({ params, request }: ActionFunctionArgs) {
     return json({ error: "Invalid params" }, { status: 400 });
   }
 
-  const authenticationResult = await authenticateProjectApiKeyOrPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request);
 
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing API key" }, { status: 401 });
@@ -30,7 +31,8 @@ export async function action({ params, request }: ActionFunctionArgs) {
   const environment = await authenticatedEnvironmentForAuthentication(
     authenticationResult,
     parsedParams.data.projectRef,
-    parsedParams.data.slug
+    parsedParams.data.slug,
+    branchNameFromRequest(request)
   );
 
   // Find the environment variable
@@ -97,7 +99,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     return json({ error: "Invalid params" }, { status: 400 });
   }
 
-  const authenticationResult = await authenticateProjectApiKeyOrPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request);
 
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing API key" }, { status: 401 });
@@ -106,7 +108,8 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   const environment = await authenticatedEnvironmentForAuthentication(
     authenticationResult,
     parsedParams.data.projectRef,
-    parsedParams.data.slug
+    parsedParams.data.slug,
+    branchNameFromRequest(request)
   );
 
   // Find the environment variable
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.import.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.import.ts
index 803d99f28eb..53bc4429c1d 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.import.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.import.ts
@@ -3,7 +3,7 @@ import { ImportEnvironmentVariablesRequestBody } from "@trigger.dev/core/v3";
 import { parse } from "dotenv";
 import { z } from "zod";
 import {
-  authenticateProjectApiKeyOrPersonalAccessToken,
+  authenticateRequest,
   authenticatedEnvironmentForAuthentication,
   branchNameFromRequest,
 } from "~/services/apiAuth.server";
@@ -21,7 +21,7 @@ export async function action({ params, request }: ActionFunctionArgs) {
     return json({ error: "Invalid params" }, { status: 400 });
   }
 
-  const authenticationResult = await authenticateProjectApiKeyOrPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request);
 
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing API key" }, { status: 401 });
@@ -41,10 +41,13 @@ export async function action({ params, request }: ActionFunctionArgs) {
   const result = await repository.create(environment.project.id, {
     override: typeof body.override === "boolean" ? body.override : false,
     environmentIds: [environment.id],
+    // Pass parent environment ID so new variables can inherit isSecret from parent
+    parentEnvironmentId: environment.parentEnvironmentId ?? undefined,
     variables: Object.entries(body.variables).map(([key, value]) => ({
       key,
       value,
     })),
+    lastUpdatedBy: body.source,
   });
 
   // Only sync parent variables if this is a branch environment
@@ -56,6 +59,7 @@ export async function action({ params, request }: ActionFunctionArgs) {
         key,
         value,
       })),
+      lastUpdatedBy: body.source,
     });
 
     let childFailure = !result.success ? result : undefined;
diff --git a/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.ts b/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.ts
index 6fb1cfba1dc..188290ae8ab 100644
--- a/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.ts
+++ b/apps/webapp/app/routes/api.v1.projects.$projectRef.envvars.$slug.ts
@@ -2,8 +2,9 @@ import { ActionFunctionArgs, LoaderFunctionArgs, json } from "@remix-run/server-
 import { CreateEnvironmentVariableRequestBody } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import {
-  authenticateProjectApiKeyOrPersonalAccessToken,
+  authenticateRequest,
   authenticatedEnvironmentForAuthentication,
+  branchNameFromRequest,
 } from "~/services/apiAuth.server";
 import { EnvironmentVariablesRepository } from "~/v3/environmentVariables/environmentVariablesRepository.server";
 
@@ -19,7 +20,7 @@ export async function action({ params, request }: ActionFunctionArgs) {
     return json({ error: "Invalid params" }, { status: 400 });
   }
 
-  const authenticationResult = await authenticateProjectApiKeyOrPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request);
 
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing API key" }, { status: 401 });
@@ -28,7 +29,8 @@ export async function action({ params, request }: ActionFunctionArgs) {
   const environment = await authenticatedEnvironmentForAuthentication(
     authenticationResult,
     parsedParams.data.projectRef,
-    parsedParams.data.slug
+    parsedParams.data.slug,
+    branchNameFromRequest(request)
   );
 
   const jsonBody = await request.json();
@@ -66,7 +68,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     return json({ error: "Invalid params" }, { status: 400 });
   }
 
-  const authenticationResult = await authenticateProjectApiKeyOrPersonalAccessToken(request);
+  const authenticationResult = await authenticateRequest(request);
 
   if (!authenticationResult) {
     return json({ error: "Invalid or Missing API key" }, { status: 401 });
@@ -75,7 +77,8 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
   const environment = await authenticatedEnvironmentForAuthentication(
     authenticationResult,
     parsedParams.data.projectRef,
-    parsedParams.data.slug
+    parsedParams.data.slug,
+    branchNameFromRequest(request)
   );
 
   const repository = new EnvironmentVariablesRepository();
diff --git a/apps/webapp/app/routes/api.v1.projects.ts b/apps/webapp/app/routes/api.v1.projects.ts
index 3962560f5c6..3a12417dce0 100644
--- a/apps/webapp/app/routes/api.v1.projects.ts
+++ b/apps/webapp/app/routes/api.v1.projects.ts
@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { json } from "@remix-run/server-runtime";
 import { GetProjectsResponseBody } from "@trigger.dev/core/v3";
 import { prisma } from "~/db.server";
diff --git a/apps/webapp/app/routes/api.v1.query.ts b/apps/webapp/app/routes/api.v1.query.ts
new file mode 100644
index 00000000000..f2a792ce4f7
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.query.ts
@@ -0,0 +1,77 @@
+import { json } from "@remix-run/server-runtime";
+import { QueryError } from "@internal/clickhouse";
+import { z } from "zod";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { executeQuery, type QueryScope } from "~/services/queryService.server";
+import { logger } from "~/services/logger.server";
+import { rowsToCSV } from "~/utils/dataExport";
+
+const BodySchema = z.object({
+  query: z.string(),
+  scope: z.enum(["organization", "project", "environment"]).default("environment"),
+  period: z.string().nullish(),
+  from: z.string().nullish(),
+  to: z.string().nullish(),
+  format: z.enum(["json", "csv"]).default("json"),
+});
+
+const { action, loader } = createActionApiRoute(
+  {
+    body: BodySchema,
+    corsStrategy: "all",
+  },
+  async ({ body, authentication }) => {
+    const { query, scope, period, from, to, format } = body;
+    const env = authentication.environment;
+
+    const queryResult = await executeQuery({
+      name: "api-query",
+      query,
+      scope: scope as QueryScope,
+      organizationId: env.organization.id,
+      projectId: env.project.id,
+      environmentId: env.id,
+      period,
+      from,
+      to,
+      history: {
+        source: "API",
+      },
+    });
+
+    if (!queryResult.success) {
+      const message =
+        queryResult.error instanceof QueryError
+          ? queryResult.error.message
+          : "An unexpected error occurred while executing the query.";
+
+      logger.error("Query API error", {
+        error: queryResult.error,
+        query,
+      });
+
+      return json(
+        { error: message },
+        { status: queryResult.error instanceof QueryError ? 400 : 500 }
+      );
+    }
+
+    const { result, periodClipped, maxQueryPeriod } = queryResult;
+
+    if (format === "csv") {
+      const csv = rowsToCSV(result.rows, result.columns);
+
+      return json({
+        format: "csv",
+        results: csv,
+      });
+    }
+
+    return json({
+      format: "json",
+      results: result.rows,
+    });
+  }
+);
+
+export { action, loader };
diff --git a/apps/webapp/app/routes/api.v1.queues.$queueParam.concurrency.override.ts b/apps/webapp/app/routes/api.v1.queues.$queueParam.concurrency.override.ts
new file mode 100644
index 00000000000..3223a2a6062
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.queues.$queueParam.concurrency.override.ts
@@ -0,0 +1,75 @@
+import { json } from "@remix-run/server-runtime";
+import { type RetrieveQueueParam, RetrieveQueueType } from "@trigger.dev/core/v3";
+import { z } from "zod";
+import { toQueueItem } from "~/presenters/v3/QueueRetrievePresenter.server";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { concurrencySystem } from "~/v3/services/concurrencySystemInstance.server";
+
+const BodySchema = z.object({
+  type: RetrieveQueueType.default("id"),
+  concurrencyLimit: z.number().int().min(0).max(100000),
+});
+
+export const { action } = createActionApiRoute(
+  {
+    body: BodySchema,
+    params: z.object({
+      queueParam: z.string().transform((val) => val.replace(/%2F/g, "/")),
+    }),
+  },
+  async ({ params, body, authentication }) => {
+    const input: RetrieveQueueParam =
+      body.type === "id"
+        ? params.queueParam
+        : {
+            type: body.type,
+            name: decodeURIComponent(params.queueParam).replace(/%2F/g, "/"),
+          };
+
+    return concurrencySystem.queues
+      .overrideQueueConcurrencyLimit(authentication.environment, input, body.concurrencyLimit)
+      .match(
+        (queue) => {
+          return json(
+            toQueueItem({
+              friendlyId: queue.friendlyId,
+              name: queue.name,
+              type: queue.type,
+              running: queue.running,
+              queued: queue.queued,
+              concurrencyLimit: queue.concurrencyLimit,
+              concurrencyLimitBase: queue.concurrencyLimitBase,
+              concurrencyLimitOverriddenAt: queue.concurrencyLimitOverriddenAt,
+              concurrencyLimitOverriddenBy: null,
+              paused: queue.paused,
+            }),
+            { status: 200 }
+          );
+        },
+        (error) => {
+          switch (error.type) {
+            case "queue_not_found": {
+              return json({ error: "Queue not found" }, { status: 404 });
+            }
+            case "queue_update_failed": {
+              return json({ error: "Failed to update queue concurrency limit" }, { status: 500 });
+            }
+            case "sync_queue_concurrency_to_engine_failed": {
+              return json(
+                { error: "Failed to sync queue concurrency limit to engine" },
+                { status: 500 }
+              );
+            }
+            case "get_queue_stats_failed": {
+              return json({ error: "Failed to get queue stats" }, { status: 500 });
+            }
+            case "other":
+            default: {
+              error.type satisfies "other";
+              return json({ error: "Internal server error" }, { status: 500 });
+            }
+          }
+        }
+      );
+  }
+);
diff --git a/apps/webapp/app/routes/api.v1.queues.$queueParam.concurrency.reset.ts b/apps/webapp/app/routes/api.v1.queues.$queueParam.concurrency.reset.ts
new file mode 100644
index 00000000000..dbeea591ade
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.queues.$queueParam.concurrency.reset.ts
@@ -0,0 +1,75 @@
+import { json } from "@remix-run/server-runtime";
+import { type RetrieveQueueParam, RetrieveQueueType } from "@trigger.dev/core/v3";
+import { z } from "zod";
+import { toQueueItem } from "~/presenters/v3/QueueRetrievePresenter.server";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { concurrencySystem } from "~/v3/services/concurrencySystemInstance.server";
+
+const BodySchema = z.object({
+  type: RetrieveQueueType.default("id"),
+});
+
+export const { action } = createActionApiRoute(
+  {
+    body: BodySchema,
+    params: z.object({
+      queueParam: z.string().transform((val) => val.replace(/%2F/g, "/")),
+    }),
+  },
+  async ({ params, body, authentication }) => {
+    const input: RetrieveQueueParam =
+      body.type === "id"
+        ? params.queueParam
+        : {
+            type: body.type,
+            name: decodeURIComponent(params.queueParam).replace(/%2F/g, "/"),
+          };
+
+    return concurrencySystem.queues.resetConcurrencyLimit(authentication.environment, input).match(
+      (queue) => {
+        return json(
+          toQueueItem({
+            friendlyId: queue.friendlyId,
+            name: queue.name,
+            type: queue.type,
+            running: queue.running,
+            queued: queue.queued,
+            concurrencyLimit: queue.concurrencyLimit,
+            concurrencyLimitBase: queue.concurrencyLimitBase,
+            concurrencyLimitOverriddenAt: queue.concurrencyLimitOverriddenAt,
+            concurrencyLimitOverriddenBy: null,
+            paused: queue.paused,
+          }),
+          { status: 200 }
+        );
+      },
+      (error) => {
+        switch (error.type) {
+          case "queue_not_found": {
+            return json({ error: "Queue not found" }, { status: 404 });
+          }
+          case "queue_not_overridden": {
+            return json({ error: "Queue is not overridden" }, { status: 400 });
+          }
+          case "queue_update_failed": {
+            return json({ error: "Failed to update queue concurrency limit" }, { status: 500 });
+          }
+          case "sync_queue_concurrency_to_engine_failed": {
+            return json(
+              { error: "Failed to sync queue concurrency limit to engine" },
+              { status: 500 }
+            );
+          }
+          case "get_queue_stats_failed": {
+            return json({ error: "Failed to get queue stats" }, { status: 500 });
+          }
+          case "other":
+          default: {
+            error.type satisfies "other";
+            return json({ error: "Internal server error" }, { status: 500 });
+          }
+        }
+      }
+    );
+  }
+);
diff --git a/apps/webapp/app/routes/api.v1.remote-build-provider-status.ts b/apps/webapp/app/routes/api.v1.remote-build-provider-status.ts
new file mode 100644
index 00000000000..555194e34de
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.remote-build-provider-status.ts
@@ -0,0 +1,94 @@
+import { json } from "@remix-run/node";
+import { err, fromPromise, fromSafePromise, ok } from "neverthrow";
+import z from "zod";
+import { logger } from "~/services/logger.server";
+import { type RemoteBuildProviderStatusResponseBody } from "@trigger.dev/core/v3/schemas";
+
+const DEPOT_STATUS_URL = "https://status.depot.dev/proxy/status.depot.dev";
+const FETCH_TIMEOUT_MS = 2000;
+
+export async function loader() {
+  return await fetchDepotStatus().match(
+    ({ summary: { ongoing_incidents } }) => {
+      if (ongoing_incidents.length > 0) {
+        return json(
+          {
+            status: "degraded",
+            message:
+              "Our remote build provider is currently facing issues. You can use the `--force-local-build` flag to build and deploy the image locally. Read more about local builds here: https://trigger.dev/docs/deployment/overview#local-builds",
+          } satisfies RemoteBuildProviderStatusResponseBody,
+          { status: 200 }
+        );
+      }
+
+      return json(
+        {
+          status: "operational",
+          message: "Depot is operational",
+        } satisfies RemoteBuildProviderStatusResponseBody,
+        { status: 200 }
+      );
+    },
+    () => {
+      return json(
+        {
+          status: "unknown",
+          message: "Failed to fetch remote build provider status",
+        } satisfies RemoteBuildProviderStatusResponseBody,
+        { status: 200 }
+      );
+    }
+  );
+}
+
+function fetchDepotStatus() {
+  return fromPromise(
+    fetch(DEPOT_STATUS_URL, {
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
+    }),
+    (error) => {
+      if (
+        error instanceof Error &&
+        (error.name === "TimeoutError" || error.name === "AbortError")
+      ) {
+        return {
+          type: "timeout" as const,
+        };
+      }
+
+      return {
+        type: "other" as const,
+        cause: error,
+      };
+    }
+  )
+    .andThen((response) => {
+      if (!response.ok) {
+        return err({
+          type: "other" as const,
+          cause: new Error(`Failed to fetch Depot status: ${response.status}`),
+        });
+      }
+
+      return fromSafePromise(response.json());
+    })
+    .andThen((json) => {
+      const parsed = DepotStatusResponseSchema.safeParse(json);
+
+      if (!parsed.success) {
+        logger.warn("Invalid Depot status response", { error: parsed.error });
+        return err({
+          type: "validation_failed" as const,
+        });
+      }
+
+      return ok(parsed.data);
+    });
+}
+
+// partial schema
+const DepotStatusResponseSchema = z.object({
+  summary: z.object({
+    ongoing_incidents: z.array(z.any()),
+  }),
+});
diff --git a/apps/webapp/app/routes/api.v1.runs.$runId.events.ts b/apps/webapp/app/routes/api.v1.runs.$runId.events.ts
index bba571d7c51..ac96c9ddb81 100644
--- a/apps/webapp/app/routes/api.v1.runs.$runId.events.ts
+++ b/apps/webapp/app/routes/api.v1.runs.$runId.events.ts
@@ -2,8 +2,8 @@ import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { getTaskEventStoreTableForRun } from "~/v3/taskEventStore.server";
 import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
-import { eventRepository } from "~/v3/eventRepository.server";
 import { ApiRetrieveRunPresenter } from "~/presenters/v3/ApiRetrieveRunPresenter.server";
+import { resolveEventRepositoryForStore } from "~/v3/eventRepository/index.server";
 
 const ParamsSchema = z.object({
   runId: z.string(), // This is the run friendly ID
@@ -30,9 +30,13 @@ export const loader = createLoaderApiRoute(
       superScopes: ["read:runs", "read:all", "admin"],
     },
   },
-  async ({ resource: run }) => {
+  async ({ resource: run, authentication }) => {
+    const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
     const runEvents = await eventRepository.getRunEvents(
       getTaskEventStoreTableForRun(run),
+      authentication.environment.id,
+      run.traceId,
       run.friendlyId,
       run.createdAt,
       run.completedAt ?? undefined
diff --git a/apps/webapp/app/routes/api.v1.runs.$runId.trace.ts b/apps/webapp/app/routes/api.v1.runs.$runId.trace.ts
new file mode 100644
index 00000000000..cc35836bfe6
--- /dev/null
+++ b/apps/webapp/app/routes/api.v1.runs.$runId.trace.ts
@@ -0,0 +1,60 @@
+import { json } from "@remix-run/server-runtime";
+import { BatchId } from "@trigger.dev/core/v3/isomorphic";
+import { z } from "zod";
+import { $replica } from "~/db.server";
+import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { resolveEventRepositoryForStore } from "~/v3/eventRepository/index.server";
+import { getTaskEventStoreTableForRun } from "~/v3/taskEventStore.server";
+
+const ParamsSchema = z.object({
+  runId: z.string(), // This is the run friendly ID
+});
+
+export const loader = createLoaderApiRoute(
+  {
+    params: ParamsSchema,
+    allowJWT: true,
+    corsStrategy: "all",
+    findResource: (params, auth) => {
+      return $replica.taskRun.findFirst({
+        where: {
+          friendlyId: params.runId,
+          runtimeEnvironmentId: auth.environment.id,
+        },
+      });
+    },
+    shouldRetryNotFound: true,
+    authorization: {
+      action: "read",
+      resource: (run) => ({
+        runs: run.friendlyId,
+        tags: run.runTags,
+        batch: run.batchId ? BatchId.toFriendlyId(run.batchId) : undefined,
+        tasks: run.taskIdentifier,
+      }),
+      superScopes: ["read:runs", "read:all", "admin"],
+    },
+  },
+  async ({ resource: run, authentication }) => {
+    const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
+    const traceSummary = await eventRepository.getTraceDetailedSummary(
+      getTaskEventStoreTableForRun(run),
+      authentication.environment.id,
+      run.traceId,
+      run.createdAt,
+      run.completedAt ?? undefined
+    );
+
+    if (!traceSummary) {
+      return json({ error: "Trace not found" }, { status: 404 });
+    }
+
+    return json(
+      {
+        trace: traceSummary,
+      },
+      { status: 200 }
+    );
+  }
+);
diff --git a/apps/webapp/app/routes/api.v1.runs.ts b/apps/webapp/app/routes/api.v1.runs.ts
index 17a664f6efb..b5191ee2591 100644
--- a/apps/webapp/app/routes/api.v1.runs.ts
+++ b/apps/webapp/app/routes/api.v1.runs.ts
@@ -3,6 +3,7 @@ import {
   ApiRunListPresenter,
   ApiRunListSearchParams,
 } from "~/presenters/v3/ApiRunListPresenter.server";
+import { logger } from "~/services/logger.server";
 import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 
 export const loader = createLoaderApiRoute(
diff --git a/apps/webapp/app/routes/api.v1.schedules.$scheduleId.activate.ts b/apps/webapp/app/routes/api.v1.schedules.$scheduleId.activate.ts
index 59a82e6a776..7eb281c0520 100644
--- a/apps/webapp/app/routes/api.v1.schedules.$scheduleId.activate.ts
+++ b/apps/webapp/app/routes/api.v1.schedules.$scheduleId.activate.ts
@@ -1,8 +1,8 @@
 import type { ActionFunctionArgs } from "@remix-run/server-runtime";
 import { json } from "@remix-run/server-runtime";
-import { truncateSync } from "fs";
 import { z } from "zod";
 import { prisma } from "~/db.server";
+import { scheduleUniqWhereClause, scheduleWhereClause } from "~/models/schedules.server";
 import { ViewSchedulePresenter } from "~/presenters/v3/ViewSchedulePresenter.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 
@@ -34,10 +34,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   try {
     const existingSchedule = await prisma.taskSchedule.findFirst({
-      where: {
-        friendlyId: parsedParams.data.scheduleId,
-        projectId: authenticationResult.environment.projectId,
-      },
+      where: scheduleWhereClause(
+        authenticationResult.environment.projectId,
+        parsedParams.data.scheduleId
+      ),
     });
 
     if (!existingSchedule) {
@@ -45,10 +45,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
     }
 
     await prisma.taskSchedule.update({
-      where: {
-        friendlyId: parsedParams.data.scheduleId,
-        projectId: authenticationResult.environment.projectId,
-      },
+      where: scheduleUniqWhereClause(
+        authenticationResult.environment.projectId,
+        parsedParams.data.scheduleId
+      ),
       data: {
         active: true,
       },
diff --git a/apps/webapp/app/routes/api.v1.schedules.$scheduleId.deactivate.ts b/apps/webapp/app/routes/api.v1.schedules.$scheduleId.deactivate.ts
index 7498160a79a..e9b2997116f 100644
--- a/apps/webapp/app/routes/api.v1.schedules.$scheduleId.deactivate.ts
+++ b/apps/webapp/app/routes/api.v1.schedules.$scheduleId.deactivate.ts
@@ -2,6 +2,7 @@ import type { ActionFunctionArgs } from "@remix-run/server-runtime";
 import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
+import { scheduleUniqWhereClause, scheduleWhereClause } from "~/models/schedules.server";
 import { ViewSchedulePresenter } from "~/presenters/v3/ViewSchedulePresenter.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 
@@ -33,10 +34,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   try {
     const existingSchedule = await prisma.taskSchedule.findFirst({
-      where: {
-        friendlyId: parsedParams.data.scheduleId,
-        projectId: authenticationResult.environment.projectId,
-      },
+      where: scheduleWhereClause(
+        authenticationResult.environment.projectId,
+        parsedParams.data.scheduleId
+      ),
     });
 
     if (!existingSchedule) {
@@ -44,10 +45,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
     }
 
     await prisma.taskSchedule.update({
-      where: {
-        friendlyId: parsedParams.data.scheduleId,
-        projectId: authenticationResult.environment.projectId,
-      },
+      where: scheduleUniqWhereClause(
+        authenticationResult.environment.projectId,
+        parsedParams.data.scheduleId
+      ),
       data: {
         active: false,
       },
diff --git a/apps/webapp/app/routes/api.v1.schedules.$scheduleId.ts b/apps/webapp/app/routes/api.v1.schedules.$scheduleId.ts
index e994852537e..b9fc8e2caff 100644
--- a/apps/webapp/app/routes/api.v1.schedules.$scheduleId.ts
+++ b/apps/webapp/app/routes/api.v1.schedules.$scheduleId.ts
@@ -3,6 +3,7 @@ import { json } from "@remix-run/server-runtime";
 import { ScheduleObject, UpdateScheduleOptions } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { Prisma, prisma } from "~/db.server";
+import { scheduleUniqWhereClause } from "~/models/schedules.server";
 import { ViewSchedulePresenter } from "~/presenters/v3/ViewSchedulePresenter.server";
 import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { UpsertSchedule } from "~/v3/schedules";
@@ -36,10 +37,10 @@ export async function action({ request, params }: ActionFunctionArgs) {
     case "DELETE": {
       try {
         const deletedSchedule = await prisma.taskSchedule.delete({
-          where: {
-            friendlyId: parsedParams.data.scheduleId,
-            projectId: authenticationResult.environment.projectId,
-          },
+          where: scheduleUniqWhereClause(
+            authenticationResult.environment.projectId,
+            parsedParams.data.scheduleId
+          ),
         });
 
         return json(
diff --git a/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts b/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts
index ec1968705f7..2e8c5e97490 100644
--- a/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts
+++ b/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts
@@ -9,6 +9,7 @@ import { authenticateApiRequest } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { BatchTriggerV3Service } from "~/v3/services/batchTriggerV3.server";
 import { HeadersSchema } from "./api.v1.tasks.$taskId.trigger";
+import { determineRealtimeStreamsVersion } from "~/services/realtime/v1StreamsGlobal.server";
 
 const ParamsSchema = z.object({
   taskId: z.string(),
@@ -40,6 +41,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
     "trigger-version": triggerVersion,
     "x-trigger-span-parent-as-link": spanParentAsLink,
     "x-trigger-worker": isFromWorker,
+    "x-trigger-realtime-streams-version": realtimeStreamsVersion,
     traceparent,
     tracestate,
   } = headers.data;
@@ -100,6 +102,7 @@ export async function action({ request, params }: ActionFunctionArgs) {
       triggerVersion: triggerVersion ?? undefined,
       traceContext,
       spanParentAsLink: spanParentAsLink === 1,
+      realtimeStreamsVersion: determineRealtimeStreamsVersion(realtimeStreamsVersion ?? undefined),
     });
 
     if (!result) {
diff --git a/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts b/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts
index a5e4e16225e..0c188c17768 100644
--- a/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts
+++ b/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts
@@ -1,3 +1,4 @@
+import { EngineServiceValidationError } from "@internal/run-engine";
 import { json } from "@remix-run/server-runtime";
 import {
   generateJWT as internal_generateJWT,
@@ -8,9 +9,10 @@ import { TaskRun } from "@trigger.dev/database";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
-import { EngineServiceValidationError } from "~/runEngine/concerns/errors";
 import { ApiAuthenticationResultSuccess, getOneTimeUseToken } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
+import { extractJwtSigningSecretKey } from "~/services/realtime/jwtAuth.server";
+import { determineRealtimeStreamsVersion } from "~/services/realtime/v1StreamsGlobal.server";
 import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";
 import {
@@ -33,6 +35,7 @@ export const HeadersSchema = z.object({
   "x-trigger-client": z.string().nullish(),
   "x-trigger-engine-version": RunEngineVersionSchema.nullish(),
   "x-trigger-request-idempotency-key": z.string().nullish(),
+  "x-trigger-realtime-streams-version": z.string().nullish(),
   traceparent: z.string().optional(),
   tracestate: z.string().optional(),
 });
@@ -63,6 +66,7 @@ const { action, loader } = createActionApiRoute(
       "x-trigger-client": triggerClient,
       "x-trigger-engine-version": engineVersion,
       "x-trigger-request-idempotency-key": requestIdempotencyKey,
+      "x-trigger-realtime-streams-version": realtimeStreamsVersion,
     } = headers;
 
     const cachedResponse = await handleRequestIdempotency(requestIdempotencyKey, {
@@ -82,7 +86,7 @@ const { action, loader } = createActionApiRoute(
         isCached: false,
       }),
       buildResponseHeaders: async (responseBody, cachedEntity) => {
-        return await responseHeaders(cachedEntity, authentication, triggerClient);
+        return await responseHeaders(cachedEntity, authentication);
       },
     });
 
@@ -93,24 +97,12 @@ const { action, loader } = createActionApiRoute(
     const service = new TriggerTaskService();
 
     try {
-      const traceContext =
-        traceparent && isFromWorker /// If the request is from a worker, we should pass the trace context
-          ? { traceparent, tracestate }
-          : undefined;
+      const traceContext = isFromWorker
+        ? { traceparent, tracestate }
+        : { external: { traceparent, tracestate } };
 
       const oneTimeUseToken = await getOneTimeUseToken(authentication);
 
-      logger.debug("Triggering task", {
-        taskId: params.taskId,
-        idempotencyKey,
-        idempotencyKeyTTL,
-        triggerVersion,
-        headers,
-        options: body.options,
-        isFromWorker,
-        traceContext,
-      });
-
       const idempotencyKeyExpiresAt = resolveIdempotencyKeyTTL(idempotencyKeyTTL);
 
       const result = await service.call(
@@ -124,6 +116,9 @@ const { action, loader } = createActionApiRoute(
           traceContext,
           spanParentAsLink: spanParentAsLink === 1,
           oneTimeUseToken,
+          realtimeStreamsVersion: determineRealtimeStreamsVersion(
+            realtimeStreamsVersion ?? undefined
+          ),
         },
         engineVersion ?? undefined
       );
@@ -134,7 +129,7 @@ const { action, loader } = createActionApiRoute(
 
       await saveRequestIdempotency(requestIdempotencyKey, "trigger", result.run.id);
 
-      const $responseHeaders = await responseHeaders(result.run, authentication, triggerClient);
+      const $responseHeaders = await responseHeaders(result.run, authentication);
 
       return json(
         {
@@ -164,39 +159,26 @@ const { action, loader } = createActionApiRoute(
 
 async function responseHeaders(
   run: Pick<TaskRun, "friendlyId">,
-  authentication: ApiAuthenticationResultSuccess,
-  triggerClient?: string | null
+  authentication: ApiAuthenticationResultSuccess
 ): Promise<Record<string, string>> {
   const { environment, realtime } = authentication;
 
-  const claimsHeader = JSON.stringify({
+  const claims = {
     sub: environment.id,
     pub: true,
+    scopes: [`read:runs:${run.friendlyId}`],
     realtime,
-  });
-
-  if (triggerClient === "browser") {
-    const claims = {
-      sub: environment.id,
-      pub: true,
-      scopes: [`read:runs:${run.friendlyId}`],
-      realtime,
-    };
-
-    const jwt = await internal_generateJWT({
-      secretKey: environment.apiKey,
-      payload: claims,
-      expirationTime: "1h",
-    });
+  };
 
-    return {
-      "x-trigger-jwt-claims": claimsHeader,
-      "x-trigger-jwt": jwt,
-    };
-  }
+  const jwt = await internal_generateJWT({
+    secretKey: extractJwtSigningSecretKey(environment),
+    payload: claims,
+    expirationTime: "1h",
+  });
 
   return {
-    "x-trigger-jwt-claims": claimsHeader,
+    "x-trigger-jwt-claims": JSON.stringify(claims),
+    "x-trigger-jwt": jwt,
   };
 }
 
diff --git a/apps/webapp/app/routes/api.v1.tasks.batch.ts b/apps/webapp/app/routes/api.v1.tasks.batch.ts
index d26c55f1cbe..4a10ade0e60 100644
--- a/apps/webapp/app/routes/api.v1.tasks.batch.ts
+++ b/apps/webapp/app/routes/api.v1.tasks.batch.ts
@@ -16,6 +16,8 @@ import {
 } from "~/v3/services/batchTriggerV3.server";
 import { OutOfEntitlementError } from "~/v3/services/triggerTask.server";
 import { HeadersSchema } from "./api.v1.tasks.$taskId.trigger";
+import { determineRealtimeStreamsVersion } from "~/services/realtime/v1StreamsGlobal.server";
+import { extractJwtSigningSecretKey } from "~/services/realtime/jwtAuth.server";
 
 const { action, loader } = createActionApiRoute(
   {
@@ -69,6 +71,7 @@ const { action, loader } = createActionApiRoute(
       "x-trigger-client": triggerClient,
       "x-trigger-engine-version": engineVersion,
       "batch-processing-strategy": batchProcessingStrategy,
+      "x-trigger-realtime-streams-version": realtimeStreamsVersion,
       traceparent,
       tracestate,
     } = headers;
@@ -107,6 +110,9 @@ const { action, loader } = createActionApiRoute(
         traceContext,
         spanParentAsLink: spanParentAsLink === 1,
         oneTimeUseToken,
+        realtimeStreamsVersion: determineRealtimeStreamsVersion(
+          realtimeStreamsVersion ?? undefined
+        ),
       });
 
       const $responseHeaders = await responseHeaders(
@@ -158,7 +164,7 @@ async function responseHeaders(
     };
 
     const jwt = await generateJWT({
-      secretKey: environment.apiKey,
+      secretKey: extractJwtSigningSecretKey(environment),
       payload: claims,
       expirationTime: "1h",
     });
diff --git a/apps/webapp/app/routes/api.v2.batches.$batchId.ts b/apps/webapp/app/routes/api.v2.batches.$batchId.ts
index 150978331e5..c89dbbaf312 100644
--- a/apps/webapp/app/routes/api.v2.batches.$batchId.ts
+++ b/apps/webapp/app/routes/api.v2.batches.$batchId.ts
@@ -18,6 +18,9 @@ export const loader = createLoaderApiRoute(
           friendlyId: params.batchId,
           runtimeEnvironmentId: auth.environment.id,
         },
+        include: {
+          errors: true,
+        },
       });
     },
     authorization: {
@@ -33,8 +36,21 @@ export const loader = createLoaderApiRoute(
       idempotencyKey: batch.idempotencyKey ?? undefined,
       createdAt: batch.createdAt,
       updatedAt: batch.updatedAt,
+      processingCompletedAt: batch.processingCompletedAt ?? undefined,
       runCount: batch.runCount,
       runs: batch.runIds,
+      processing: {
+        completedAt: batch.processingCompletedAt ?? undefined,
+        errors:
+          batch.errors.length > 0
+            ? batch.errors.map((err) => ({
+                index: err.index,
+                taskIdentifier: err.taskIdentifier,
+                error: err.error,
+                errorCode: err.errorCode ?? undefined,
+              }))
+            : [],
+      },
     });
   }
 );
diff --git a/apps/webapp/app/routes/api.v2.runs.$runParam.cancel.ts b/apps/webapp/app/routes/api.v2.runs.$runParam.cancel.ts
index 1a32a8ce37b..a05af273d8d 100644
--- a/apps/webapp/app/routes/api.v2.runs.$runParam.cancel.ts
+++ b/apps/webapp/app/routes/api.v2.runs.$runParam.cancel.ts
@@ -1,53 +1,47 @@
-import type { ActionFunctionArgs } from "@remix-run/server-runtime";
 import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
-import { prisma } from "~/db.server";
-import { authenticateApiRequest } from "~/services/apiAuth.server";
+import { $replica } from "~/db.server";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
 import { CancelTaskRunService } from "~/v3/services/cancelTaskRun.server";
 
 const ParamsSchema = z.object({
   runParam: z.string(),
 });
 
-export async function action({ request, params }: ActionFunctionArgs) {
-  // Ensure this is a POST request
-  if (request.method.toUpperCase() !== "POST") {
-    return { status: 405, body: "Method Not Allowed" };
-  }
-
-  // Authenticate the request
-  const authenticationResult = await authenticateApiRequest(request);
-
-  if (!authenticationResult) {
-    return json({ error: "Invalid or Missing API Key" }, { status: 401 });
-  }
-
-  const parsed = ParamsSchema.safeParse(params);
-
-  if (!parsed.success) {
-    return json({ error: "Invalid or Missing run id" }, { status: 400 });
-  }
-
-  const { runParam } = parsed.data;
-
-  const taskRun = await prisma.taskRun.findUnique({
-    where: {
-      friendlyId: runParam,
-      runtimeEnvironmentId: authenticationResult.environment.id,
+const { action } = createActionApiRoute(
+  {
+    params: ParamsSchema,
+    allowJWT: true,
+    corsStrategy: "none",
+    authorization: {
+      action: "write",
+      resource: (params) => ({ runs: params.runParam }),
+      superScopes: ["write:runs", "admin"],
     },
-  });
+    findResource: async (params, auth) => {
+      return $replica.taskRun.findFirst({
+        where: {
+          friendlyId: params.runParam,
+          runtimeEnvironmentId: auth.environment.id,
+        },
+      });
+    },
+  },
+  async ({ resource }) => {
+    if (!resource) {
+      return json({ error: "Run not found" }, { status: 404 });
+    }
 
-  if (!taskRun) {
-    return json({ error: "Run not found" }, { status: 404 });
-  }
+    const service = new CancelTaskRunService();
 
-  const service = new CancelTaskRunService();
+    try {
+      await service.call(resource);
+    } catch (error) {
+      return json({ error: "Internal Server Error" }, { status: 500 });
+    }
 
-  try {
-    await service.call(taskRun);
-  } catch (error) {
-    return json({ error: "Internal Server Error" }, { status: 500 });
+    return json({ id: resource.friendlyId }, { status: 200 });
   }
+);
 
-  return json({ id: runParam }, { status: 200 });
-}
+export { action };
diff --git a/apps/webapp/app/routes/api.v2.tasks.batch.ts b/apps/webapp/app/routes/api.v2.tasks.batch.ts
index ba03919d499..cd351505b50 100644
--- a/apps/webapp/app/routes/api.v2.tasks.batch.ts
+++ b/apps/webapp/app/routes/api.v2.tasks.batch.ts
@@ -18,6 +18,8 @@ import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { BatchProcessingStrategy } from "~/v3/services/batchTriggerV3.server";
 import { OutOfEntitlementError } from "~/v3/services/triggerTask.server";
 import { HeadersSchema } from "./api.v1.tasks.$taskId.trigger";
+import { determineRealtimeStreamsVersion } from "~/services/realtime/v1StreamsGlobal.server";
+import { extractJwtSigningSecretKey } from "~/services/realtime/jwtAuth.server";
 
 const { action, loader } = createActionApiRoute(
   {
@@ -59,6 +61,7 @@ const { action, loader } = createActionApiRoute(
       "x-trigger-engine-version": engineVersion,
       "batch-processing-strategy": batchProcessingStrategy,
       "x-trigger-request-idempotency-key": requestIdempotencyKey,
+      "x-trigger-realtime-streams-version": realtimeStreamsVersion,
       traceparent,
       tracestate,
     } = headers;
@@ -103,11 +106,12 @@ const { action, loader } = createActionApiRoute(
       return cachedResponse;
     }
 
-    const traceContext =
-      traceparent && isFromWorker // If the request is from a worker, we should pass the trace context
-        ? { traceparent, tracestate }
-        : undefined;
+    const traceContext = isFromWorker
+      ? { traceparent, tracestate }
+      : { external: { traceparent, tracestate } };
 
+    // Note: SDK v4.3+ uses the 2-phase batch API (POST /api/v3/batches + streaming items)
+    // This endpoint is for backwards compatibility with older SDK versions
     const service = new RunEngineBatchTriggerService(batchProcessingStrategy ?? undefined);
 
     service.onBatchTaskRunCreated.attachOnce(async (batch) => {
@@ -120,6 +124,9 @@ const { action, loader } = createActionApiRoute(
         traceContext,
         spanParentAsLink: spanParentAsLink === 1,
         oneTimeUseToken,
+        realtimeStreamsVersion: determineRealtimeStreamsVersion(
+          realtimeStreamsVersion ?? undefined
+        ),
       });
 
       const $responseHeaders = await responseHeaders(
@@ -174,7 +181,7 @@ async function responseHeaders(
     };
 
     const jwt = await generateJWT({
-      secretKey: environment.apiKey,
+      secretKey: extractJwtSigningSecretKey(environment),
       payload: claims,
       expirationTime: "1h",
     });
diff --git a/apps/webapp/app/routes/api.v2.whoami.ts b/apps/webapp/app/routes/api.v2.whoami.ts
index 36e46221f5b..16629db0ec1 100644
--- a/apps/webapp/app/routes/api.v2.whoami.ts
+++ b/apps/webapp/app/routes/api.v2.whoami.ts
@@ -1,97 +1,200 @@
-import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { json } from "@remix-run/server-runtime";
-import { WhoAmIResponse } from "@trigger.dev/core/v3";
+import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { type WhoAmIResponse } from "@trigger.dev/core/v3";
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
-import { logger } from "~/services/logger.server";
-import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 import { v3ProjectPath } from "~/utils/pathBuilder";
+import { authenticateRequest } from "~/services/apiAuth.server";
 
 export async function loader({ request }: LoaderFunctionArgs) {
-  logger.info("whoami v2", { url: request.url });
-  try {
-    const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
-    if (!authenticationResult) {
+  const authenticationResult = await authenticateRequest(request, {
+    personalAccessToken: true,
+    organizationAccessToken: true,
+    apiKey: false,
+  });
+
+  if (!authenticationResult) {
+    return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
+  }
+
+  const url = new URL(request.url);
+  const projectRef = url.searchParams.get("projectRef") ?? undefined;
+
+  switch (authenticationResult.type) {
+    case "personalAccessToken": {
+      const result = await getIdentityFromPAT(authenticationResult.result.userId, projectRef);
+      if (!result.success) {
+        if (result.error === "user_not_found") {
+          return json({ error: "User not found" }, { status: 404 });
+        }
+
+        return json({ error: result.error }, { status: 401 });
+      }
+      return json(result.result);
+    }
+    case "organizationAccessToken": {
+      const result = await getIdentityFromOAT(
+        authenticationResult.result.organizationId,
+        projectRef
+      );
+      return json(result.result);
+    }
+    default: {
+      authenticationResult satisfies never;
       return json({ error: "Invalid or Missing Access Token" }, { status: 401 });
     }
+  }
+}
+
+async function getIdentityFromPAT(
+  userId: string,
+  projectRef: string | undefined
+): Promise<
+  { success: true; result: WhoAmIResponse } | { success: false; error: "user_not_found" }
+> {
+  const user = await prisma.user.findFirst({
+    select: {
+      email: true,
+    },
+    where: {
+      id: userId,
+    },
+  });
+
+  if (!user) {
+    return { success: false, error: "user_not_found" };
+  }
+
+  const userDetails = {
+    userId,
+    email: user.email,
+    dashboardUrl: env.APP_ORIGIN,
+  } satisfies WhoAmIResponse;
+
+  if (!projectRef) {
+    return {
+      success: true,
+      result: userDetails,
+    };
+  }
+
+  const orgs = await prisma.organization.findMany({
+    select: {
+      id: true,
+    },
+    where: {
+      members: {
+        some: {
+          userId,
+        },
+      },
+    },
+  });
 
-    const user = await prisma.user.findUnique({
-      select: {
-        email: true,
+  if (orgs.length === 0) {
+    return {
+      success: true,
+      result: userDetails,
+    };
+  }
+
+  const project = await prisma.project.findFirst({
+    select: {
+      externalRef: true,
+      name: true,
+      slug: true,
+      organization: {
+        select: {
+          slug: true,
+          title: true,
+        },
       },
-      where: {
-        id: authenticationResult.userId,
+    },
+    where: {
+      externalRef: projectRef,
+      organizationId: {
+        in: orgs.map((org) => org.id),
       },
-    });
+    },
+  });
 
-    if (!user) {
-      return json({ error: "User not found" }, { status: 404 });
-    }
+  if (!project) {
+    return {
+      success: true,
+      result: userDetails,
+    };
+  }
+
+  const projectPath = v3ProjectPath({ slug: project.organization.slug }, { slug: project.slug });
 
-    const url = new URL(request.url);
-    const projectRef = url.searchParams.get("projectRef");
+  return {
+    success: true,
+    result: {
+      ...userDetails,
+      project: {
+        url: new URL(projectPath, env.APP_ORIGIN).href,
+        name: project.name,
+        orgTitle: project.organization.title,
+      },
+    },
+  };
+}
 
-    let projectDetails: WhoAmIResponse["project"];
+async function getIdentityFromOAT(
+  organizationId: string,
+  projectRef: string | undefined
+): Promise<{ success: true; result: WhoAmIResponse }> {
+  // Organization auth tokens are currently only used internally for the build server.
+  // We will eventually expose them in the application as well, as they are useful beyond the build server.
+  // At that point we will need a v3 whoami endpoint that properly handles org auth tokens.
+  // For now, we just return a dummy user id and email and keep using the existing v2 whoami endpoint.
+  const orgDetails = {
+    userId: `org_${organizationId}`,
+    email: "not_applicable@trigger.dev",
+    dashboardUrl: env.APP_ORIGIN,
+  } satisfies WhoAmIResponse;
 
-    if (projectRef) {
-      const orgs = await prisma.organization.findMany({
+  if (!projectRef) {
+    return {
+      success: true,
+      result: orgDetails,
+    };
+  }
+
+  const project = await prisma.project.findFirst({
+    select: {
+      externalRef: true,
+      name: true,
+      slug: true,
+      organization: {
         select: {
-          id: true,
+          slug: true,
+          title: true,
         },
-        where: {
-          members: {
-            some: {
-              userId: authenticationResult.userId,
-            },
-          },
-        },
-      });
-
-      if (orgs.length > 0) {
-        const project = await prisma.project.findFirst({
-          select: {
-            externalRef: true,
-            name: true,
-            slug: true,
-            organization: {
-              select: {
-                slug: true,
-                title: true,
-              },
-            },
-          },
-          where: {
-            externalRef: projectRef,
-            organizationId: {
-              in: orgs.map((org) => org.id),
-            },
-          },
-        });
-
-        if (project) {
-          const projectPath = v3ProjectPath(
-            { slug: project.organization.slug },
-            { slug: project.slug }
-          );
-          projectDetails = {
-            url: new URL(projectPath, env.APP_ORIGIN).href,
-            name: project.name,
-            orgTitle: project.organization.title,
-          };
-        }
-      }
-    }
+      },
+    },
+    where: {
+      externalRef: projectRef,
+      organizationId,
+    },
+  });
 
-    const result: WhoAmIResponse = {
-      userId: authenticationResult.userId,
-      email: user.email,
-      dashboardUrl: env.APP_ORIGIN,
-      project: projectDetails,
+  if (!project) {
+    return {
+      success: true,
+      result: orgDetails,
     };
-    return json(result);
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : "Something went wrong";
-    logger.error("Error in whoami v2", { error: errorMessage });
-    return json({ error: errorMessage }, { status: 400 });
   }
+
+  const projectPath = v3ProjectPath(project.organization, project);
+  return {
+    success: true,
+    result: {
+      ...orgDetails,
+      project: {
+        url: new URL(projectPath, env.APP_ORIGIN).href,
+        name: project.name,
+        orgTitle: project.organization.title,
+      },
+    },
+  };
 }
diff --git a/apps/webapp/app/routes/api.v3.batches.$batchId.items.ts b/apps/webapp/app/routes/api.v3.batches.$batchId.items.ts
new file mode 100644
index 00000000000..8307f34afce
--- /dev/null
+++ b/apps/webapp/app/routes/api.v3.batches.$batchId.items.ts
@@ -0,0 +1,128 @@
+import { json, type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { env } from "~/env.server";
+import {
+  StreamBatchItemsService,
+  createNdjsonParserStream,
+  streamToAsyncIterable,
+} from "~/runEngine/services/streamBatchItems.server";
+import { authenticateApiRequestWithFailure } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+import { engine } from "~/v3/runEngine.server";
+
+const ParamsSchema = z.object({
+  batchId: z.string(),
+});
+
+/**
+ * Phase 2 of 2-phase batch API: Stream batch items.
+ *
+ * POST /api/v3/batches/:batchId/items
+ *
+ * Accepts an NDJSON stream of batch items and enqueues them to the BatchQueue.
+ * Each line in the body should be a valid BatchItemNDJSON object.
+ *
+ * The stream is processed with backpressure - items are enqueued as they arrive.
+ * The batch is sealed when the stream completes successfully.
+ */
+export async function action({ request, params }: ActionFunctionArgs) {
+  // Validate params
+  const paramsResult = ParamsSchema.safeParse(params);
+  if (!paramsResult.success) {
+    return json({ error: "Invalid batch ID" }, { status: 400 });
+  }
+
+  const { batchId } = paramsResult.data;
+
+  // Validate content type
+  const contentType = request.headers.get("content-type") || "";
+  if (
+    !contentType.includes("application/x-ndjson") &&
+    !contentType.includes("application/ndjson")
+  ) {
+    return json(
+      {
+        error: "Content-Type must be application/x-ndjson or application/ndjson",
+      },
+      { status: 415 }
+    );
+  }
+
+  // Authenticate the request
+  const authResult = await authenticateApiRequestWithFailure(request, {
+    allowPublicKey: true,
+  });
+
+  if (!authResult.ok) {
+    return json({ error: authResult.error }, { status: 401 });
+  }
+
+  // Get the request body stream
+  const body = request.body;
+  if (!body) {
+    return json({ error: "Request body is required" }, { status: 400 });
+  }
+
+  logger.debug("Stream batch items request", {
+    batchId,
+    contentType,
+    envId: authResult.environment.id,
+  });
+
+  try {
+    // Create NDJSON parser transform stream
+    const parser = createNdjsonParserStream(env.STREAMING_BATCH_ITEM_MAXIMUM_SIZE);
+
+    // Pipe the request body through the parser
+    const parsedStream = body.pipeThrough(parser);
+
+    // Convert to async iterable for the service
+    const itemsIterator = streamToAsyncIterable(parsedStream);
+
+    // Process the stream
+    const service = new StreamBatchItemsService();
+    const result = await service.call(authResult.environment, batchId, itemsIterator, {
+      maxItemBytes: env.STREAMING_BATCH_ITEM_MAXIMUM_SIZE,
+    });
+
+    return json(result, { status: 200 });
+  } catch (error) {
+    logger.error("Stream batch items error", {
+      batchId,
+      error: {
+        message: (error as Error).message,
+        stack: (error as Error).stack,
+      },
+    });
+
+    if (error instanceof ServiceValidationError) {
+      return json({ error: error.message }, { status: 422 });
+    } else if (error instanceof Error) {
+      // Check for stream parsing errors
+      if (
+        error.message.includes("Invalid JSON") ||
+        error.message.includes("exceeds maximum size")
+      ) {
+        return json({ error: error.message }, { status: 400 });
+      }
+
+      return json(
+        { error: error.message },
+        { status: 500, headers: { "x-should-retry": "false" } }
+      );
+    }
+
+    return json({ error: "Something went wrong" }, { status: 500 });
+  }
+}
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  // Return 405 for GET requests - only POST is allowed
+  return json(
+    {
+      error: "Method not allowed. Use POST to stream batch items.",
+    },
+    { status: 405 }
+  );
+}
diff --git a/apps/webapp/app/routes/api.v3.batches.ts b/apps/webapp/app/routes/api.v3.batches.ts
new file mode 100644
index 00000000000..070e6d9f80c
--- /dev/null
+++ b/apps/webapp/app/routes/api.v3.batches.ts
@@ -0,0 +1,229 @@
+import { json } from "@remix-run/server-runtime";
+import { CreateBatchRequestBody, CreateBatchResponse, generateJWT } from "@trigger.dev/core/v3";
+import { prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { BatchRateLimitExceededError } from "~/runEngine/concerns/batchLimits.server";
+import { CreateBatchService } from "~/runEngine/services/createBatch.server";
+import { AuthenticatedEnvironment, getOneTimeUseToken } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import {
+  handleRequestIdempotency,
+  saveRequestIdempotency,
+} from "~/utils/requestIdempotency.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+import { OutOfEntitlementError } from "~/v3/services/triggerTask.server";
+import { HeadersSchema } from "./api.v1.tasks.$taskId.trigger";
+import { determineRealtimeStreamsVersion } from "~/services/realtime/v1StreamsGlobal.server";
+import { extractJwtSigningSecretKey } from "~/services/realtime/jwtAuth.server";
+import { engine } from "~/v3/runEngine.server";
+
+/**
+ * Phase 1 of 2-phase batch API: Create a batch.
+ *
+ * POST /api/v3/batches
+ *
+ * Creates a batch record and optionally blocks the parent run for batchTriggerAndWait.
+ * Items are streamed separately via POST /api/v3/batches/:batchId/items
+ */
+const { action, loader } = createActionApiRoute(
+  {
+    headers: HeadersSchema,
+    body: CreateBatchRequestBody,
+    allowJWT: true,
+    maxContentLength: 131_072, // 128KB is plenty for the batch metadata
+    authorization: {
+      action: "batchTrigger",
+      resource: () => ({
+        // No specific tasks to authorize at batch creation time
+        // Tasks are validated when items are streamed
+        tasks: [],
+      }),
+      superScopes: ["write:tasks", "admin"],
+    },
+    corsStrategy: "all",
+  },
+  async ({ body, headers, authentication }) => {
+    // Validate runCount
+    if (body.runCount <= 0) {
+      return json({ error: "runCount must be a positive integer" }, { status: 400 });
+    }
+
+    // Check runCount against limit
+    if (body.runCount > env.STREAMING_BATCH_MAX_ITEMS) {
+      return json(
+        {
+          error: `Batch runCount of ${body.runCount} exceeds maximum allowed of ${env.STREAMING_BATCH_MAX_ITEMS}.`,
+        },
+        { status: 400 }
+      );
+    }
+
+    const {
+      "trigger-version": triggerVersion,
+      "x-trigger-span-parent-as-link": spanParentAsLink,
+      "x-trigger-worker": isFromWorker,
+      "x-trigger-client": triggerClient,
+      "x-trigger-realtime-streams-version": realtimeStreamsVersion,
+      traceparent,
+      tracestate,
+    } = headers;
+
+    const oneTimeUseToken = await getOneTimeUseToken(authentication);
+
+    logger.debug("Create batch request", {
+      runCount: body.runCount,
+      parentRunId: body.parentRunId,
+      resumeParentOnCompletion: body.resumeParentOnCompletion,
+      idempotencyKey: body.idempotencyKey,
+      triggerVersion,
+      isFromWorker,
+      triggerClient,
+    });
+
+    // Handle idempotency for the batch creation
+    const cachedResponse = await handleRequestIdempotency<
+      { friendlyId: string; runCount: number },
+      CreateBatchResponse
+    >(body.idempotencyKey, {
+      requestType: "create-batch",
+      findCachedEntity: async (cachedRequestId) => {
+        return await prisma.batchTaskRun.findFirst({
+          where: {
+            id: cachedRequestId,
+            runtimeEnvironmentId: authentication.environment.id,
+          },
+          select: {
+            friendlyId: true,
+            runCount: true,
+          },
+        });
+      },
+      buildResponse: (cachedBatch) => ({
+        id: cachedBatch.friendlyId,
+        runCount: cachedBatch.runCount,
+        isCached: true,
+      }),
+      buildResponseHeaders: async (responseBody) => {
+        return await responseHeaders(responseBody, authentication.environment, triggerClient);
+      },
+    });
+
+    if (cachedResponse) {
+      return cachedResponse;
+    }
+
+    const traceContext = isFromWorker
+      ? { traceparent, tracestate }
+      : { external: { traceparent, tracestate } };
+
+    const service = new CreateBatchService();
+
+    service.onBatchTaskRunCreated.attachOnce(async (batch) => {
+      await saveRequestIdempotency(body.idempotencyKey, "create-batch", batch.id);
+    });
+
+    try {
+      const batch = await service.call(authentication.environment, body, {
+        triggerVersion: triggerVersion ?? undefined,
+        traceContext,
+        spanParentAsLink: spanParentAsLink === 1,
+        oneTimeUseToken,
+        realtimeStreamsVersion: determineRealtimeStreamsVersion(
+          realtimeStreamsVersion ?? undefined
+        ),
+      });
+
+      const $responseHeaders = await responseHeaders(
+        batch,
+        authentication.environment,
+        triggerClient
+      );
+
+      return json(batch, {
+        status: 202,
+        headers: $responseHeaders,
+      });
+    } catch (error) {
+      if (error instanceof BatchRateLimitExceededError) {
+        logger.info("Batch rate limit exceeded", {
+          limit: error.limit,
+          remaining: error.remaining,
+          resetAt: error.resetAt.toISOString(),
+          itemCount: error.itemCount,
+        });
+        return json(
+          { error: error.message },
+          {
+            status: 429,
+            headers: {
+              "X-RateLimit-Limit": error.limit.toString(),
+              "X-RateLimit-Remaining": Math.max(0, error.remaining).toString(),
+              "X-RateLimit-Reset": Math.floor(error.resetAt.getTime() / 1000).toString(),
+              "Retry-After": Math.max(
+                1,
+                Math.ceil((error.resetAt.getTime() - Date.now()) / 1000)
+              ).toString(),
+            },
+          }
+        );
+      }
+
+      logger.error("Create batch error", {
+        error: {
+          message: (error as Error).message,
+          stack: (error as Error).stack,
+        },
+      });
+
+      if (error instanceof ServiceValidationError) {
+        return json({ error: error.message }, { status: 422 });
+      } else if (error instanceof OutOfEntitlementError) {
+        return json({ error: error.message }, { status: 422 });
+      } else if (error instanceof Error) {
+        return json(
+          { error: error.message },
+          { status: 500, headers: { "x-should-retry": "false" } }
+        );
+      }
+
+      return json({ error: "Something went wrong" }, { status: 500 });
+    }
+  }
+);
+
+async function responseHeaders(
+  batch: CreateBatchResponse,
+  environment: AuthenticatedEnvironment,
+  triggerClient?: string | null
+): Promise<Record<string, string>> {
+  const claimsHeader = JSON.stringify({
+    sub: environment.id,
+    pub: true,
+  });
+
+  if (triggerClient === "browser") {
+    const claims = {
+      sub: environment.id,
+      pub: true,
+      scopes: [`read:batch:${batch.id}`, `write:batch:${batch.id}`],
+    };
+
+    const jwt = await generateJWT({
+      secretKey: extractJwtSigningSecretKey(environment),
+      payload: claims,
+      expirationTime: "1h",
+    });
+
+    return {
+      "x-trigger-jwt-claims": claimsHeader,
+      "x-trigger-jwt": jwt,
+    };
+  }
+
+  return {
+    "x-trigger-jwt-claims": claimsHeader,
+  };
+}
+
+export { action, loader };
diff --git a/apps/webapp/app/routes/auth.github.callback.tsx b/apps/webapp/app/routes/auth.github.callback.tsx
index d85a68a4729..2313b348f4a 100644
--- a/apps/webapp/app/routes/auth.github.callback.tsx
+++ b/apps/webapp/app/routes/auth.github.callback.tsx
@@ -3,19 +3,21 @@ import { redirect } from "@remix-run/node";
 import { prisma } from "~/db.server";
 import { getSession, redirectWithErrorMessage } from "~/models/message.server";
 import { authenticator } from "~/services/auth.server";
+import { setLastAuthMethodHeader } from "~/services/lastAuthMethod.server";
 import { commitSession } from "~/services/sessionStorage.server";
+import { trackAndClearReferralSource } from "~/services/referralSource.server";
 import { redirectCookie } from "./auth.github";
+import { sanitizeRedirectPath } from "~/utils";
 
 export let loader: LoaderFunction = async ({ request }) => {
   const cookie = request.headers.get("Cookie");
   const redirectValue = await redirectCookie.parse(cookie);
-  const redirectTo = redirectValue ?? "/";
+  const redirectTo = sanitizeRedirectPath(redirectValue);
 
   const auth = await authenticator.authenticate("github", request, {
     failureRedirect: "/login", // If auth fails, the failureRedirect will be thrown as a Response
   });
 
-  // manually get the session
   const session = await getSession(request.headers.get("cookie"));
 
   const userRecord = await prisma.user.findFirst({
@@ -40,19 +42,20 @@ export let loader: LoaderFunction = async ({ request }) => {
     session.set("pending-mfa-user-id", userRecord.id);
     session.set("pending-mfa-redirect-to", redirectTo);
 
-    return redirect("/login/mfa", {
-      headers: {
-        "Set-Cookie": await commitSession(session),
-      },
-    });
+    const headers = new Headers();
+    headers.append("Set-Cookie", await commitSession(session));
+    headers.append("Set-Cookie", await setLastAuthMethodHeader("github"));
+
+    return redirect("/login/mfa", { headers });
   }
 
-  // and store the user data
   session.set(authenticator.sessionKey, auth);
 
-  return redirect(redirectTo, {
-    headers: {
-      "Set-Cookie": await commitSession(session),
-    },
-  });
+  const headers = new Headers();
+  headers.append("Set-Cookie", await commitSession(session));
+  headers.append("Set-Cookie", await setLastAuthMethodHeader("github"));
+
+  await trackAndClearReferralSource(request, auth.userId, headers);
+
+  return redirect(redirectTo, { headers });
 };
diff --git a/apps/webapp/app/routes/auth.github.ts b/apps/webapp/app/routes/auth.github.ts
index ec376153fc8..8c464e0e598 100644
--- a/apps/webapp/app/routes/auth.github.ts
+++ b/apps/webapp/app/routes/auth.github.ts
@@ -1,18 +1,19 @@
-import type { ActionFunction, LoaderFunction } from "@remix-run/node";
-import { createCookie } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
+import { type ActionFunction, type LoaderFunction, redirect, createCookie } from "@remix-run/node";
 import { authenticator } from "~/services/auth.server";
+import { env } from "~/env.server";
+import { sanitizeRedirectPath } from "~/utils";
 
 export let loader: LoaderFunction = () => redirect("/login");
 
 export let action: ActionFunction = async ({ request }) => {
   const url = new URL(request.url);
   const redirectTo = url.searchParams.get("redirectTo");
+  const safeRedirect = sanitizeRedirectPath(redirectTo, "/");
 
   try {
     // call authenticate as usual, in successRedirect use returnTo or a fallback
     return await authenticator.authenticate("github", request, {
-      successRedirect: redirectTo ?? "/",
+      successRedirect: safeRedirect,
       failureRedirect: "/login",
     });
   } catch (error) {
@@ -21,8 +22,8 @@ export let action: ActionFunction = async ({ request }) => {
     // if the error is a Response and is a redirect
     if (error instanceof Response) {
       // we need to append a Set-Cookie header with a cookie storing the
-      // returnTo value
-      error.headers.append("Set-Cookie", await redirectCookie.serialize(redirectTo));
+      // returnTo value (store the sanitized path)
+      error.headers.append("Set-Cookie", await redirectCookie.serialize(safeRedirect));
     }
     throw error;
   }
@@ -31,4 +32,6 @@ export let action: ActionFunction = async ({ request }) => {
 export const redirectCookie = createCookie("redirect-to", {
   maxAge: 60 * 60, // 1 hour
   httpOnly: true,
+  sameSite: "lax",
+  secure: env.NODE_ENV === "production",
 });
diff --git a/apps/webapp/app/routes/auth.google.callback.tsx b/apps/webapp/app/routes/auth.google.callback.tsx
new file mode 100644
index 00000000000..65dabd605ce
--- /dev/null
+++ b/apps/webapp/app/routes/auth.google.callback.tsx
@@ -0,0 +1,62 @@
+import type { LoaderFunction } from "@remix-run/node";
+import { redirect } from "@remix-run/node";
+import { prisma } from "~/db.server";
+import { getSession, redirectWithErrorMessage } from "~/models/message.server";
+import { authenticator } from "~/services/auth.server";
+import { setLastAuthMethodHeader } from "~/services/lastAuthMethod.server";
+import { commitSession } from "~/services/sessionStorage.server";
+import { trackAndClearReferralSource } from "~/services/referralSource.server";
+import { redirectCookie } from "./auth.google";
+import { sanitizeRedirectPath } from "~/utils";
+
+export let loader: LoaderFunction = async ({ request }) => {
+  const cookie = request.headers.get("Cookie");
+  const redirectValue = await redirectCookie.parse(cookie);
+  const redirectTo = sanitizeRedirectPath(redirectValue);
+
+  const auth = await authenticator.authenticate("google", request, {
+    failureRedirect: "/login", // If auth fails, the failureRedirect will be thrown as a Response
+  });
+
+  const session = await getSession(request.headers.get("cookie"));
+
+  const userRecord = await prisma.user.findFirst({
+    where: {
+      id: auth.userId,
+    },
+    select: {
+      id: true,
+      mfaEnabledAt: true,
+    },
+  });
+
+  if (!userRecord) {
+    return redirectWithErrorMessage(
+      "/login",
+      request,
+      "Could not find your account. Please contact support."
+    );
+  }
+
+  if (userRecord.mfaEnabledAt) {
+    session.set("pending-mfa-user-id", userRecord.id);
+    session.set("pending-mfa-redirect-to", redirectTo);
+
+    const headers = new Headers();
+    headers.append("Set-Cookie", await commitSession(session));
+    headers.append("Set-Cookie", await setLastAuthMethodHeader("google"));
+
+    return redirect("/login/mfa", { headers });
+  }
+
+  session.set(authenticator.sessionKey, auth);
+
+  const headers = new Headers();
+  headers.append("Set-Cookie", await commitSession(session));
+  headers.append("Set-Cookie", await setLastAuthMethodHeader("google"));
+
+  await trackAndClearReferralSource(request, auth.userId, headers);
+
+  return redirect(redirectTo, { headers });
+};
+
diff --git a/apps/webapp/app/routes/auth.google.ts b/apps/webapp/app/routes/auth.google.ts
new file mode 100644
index 00000000000..125fd8ec9d8
--- /dev/null
+++ b/apps/webapp/app/routes/auth.google.ts
@@ -0,0 +1,38 @@
+import { type ActionFunction, type LoaderFunction, redirect, createCookie } from "@remix-run/node";
+import { authenticator } from "~/services/auth.server";
+import { env } from "~/env.server";
+import { sanitizeRedirectPath } from "~/utils";
+
+export let loader: LoaderFunction = () => redirect("/login");
+
+export let action: ActionFunction = async ({ request }) => {
+  const url = new URL(request.url);
+  const redirectTo = url.searchParams.get("redirectTo");
+  const safeRedirect = sanitizeRedirectPath(redirectTo, "/");
+
+  try {
+    // call authenticate as usual, in successRedirect use returnTo or a fallback
+    return await authenticator.authenticate("google", request, {
+      successRedirect: safeRedirect,
+      failureRedirect: "/login",
+    });
+  } catch (error) {
+    // here we catch anything authenticator.authenticate throw, this will
+    // include redirects
+    // if the error is a Response and is a redirect
+    if (error instanceof Response) {
+      // we need to append a Set-Cookie header with a cookie storing the
+      // returnTo value (store the sanitized path)
+      error.headers.append("Set-Cookie", await redirectCookie.serialize(safeRedirect));
+    }
+    throw error;
+  }
+};
+
+export const redirectCookie = createCookie("google-redirect-to", {
+  maxAge: 60 * 60, // 1 hour
+  httpOnly: true,
+  sameSite: "lax",
+  secure: env.NODE_ENV === "production",
+});
+
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx
index 048878a85b5..0596ee8b52a 100644
--- a/apps/webapp/app/routes/confirm-basic-details.tsx
+++ b/apps/webapp/app/routes/confirm-basic-details.tsx
@@ -8,6 +8,7 @@ import { motion } from "framer-motion";
 import { forwardRef, useState } from "react";
 import { z } from "zod";
 import { AppContainer, MainCenteredContainer } from "~/components/layout/AppLayout";
+import { BackgroundWrapper } from "~/components/BackgroundWrapper";
 import { Button } from "~/components/primitives/Buttons";
 import { Fieldset } from "~/components/primitives/Fieldset";
 import { FormButtons } from "~/components/primitives/FormButtons";
@@ -24,6 +25,7 @@ import { redirectWithSuccessMessage } from "~/models/message.server";
 import { updateUser } from "~/models/user.server";
 import { requireUserId } from "~/services/session.server";
 import { rootPath } from "~/utils/pathBuilder";
+import { getVercelInstallParams } from "~/v3/vercel";
 
 function createSchema(
   constraints: {
@@ -104,7 +106,24 @@ export const action: ActionFunction = async ({ request }) => {
       referralSource: submission.value.referralSource,
     });
 
-    return redirectWithSuccessMessage(rootPath(), request, "Your details have been updated.");
+    // Preserve Vercel integration params if present
+    const vercelParams = getVercelInstallParams(request);
+    let redirectUrl = rootPath();
+
+    if (vercelParams) {
+      // Redirect to orgs/new with params preserved
+      const params = new URLSearchParams({
+        code: vercelParams.code,
+        configurationId: vercelParams.configurationId,
+        integration: "vercel",
+      });
+      if (vercelParams.next) {
+        params.set("next", vercelParams.next);
+      }
+      redirectUrl = `/orgs/new?${params.toString()}`;
+    }
+
+    return redirectWithSuccessMessage(redirectUrl, request, "Your details have been updated.");
   } catch (error: any) {
     return json({ errors: { body: error.message } }, { status: 400 });
   }
@@ -113,7 +132,7 @@ export const action: ActionFunction = async ({ request }) => {
 const HandIcon = forwardRef<HTMLDivElement, {}>(({}, ref) => {
   return (
     <div ref={ref}>
-      <HandRaisedIcon className="h-7 w-7 text-amber-300" />
+      <HandRaisedIcon className="h-7 w-7 text-amber-400" />
     </div>
   );
 });
@@ -138,107 +157,107 @@ export default function Page() {
   const shouldShowConfirm = user.email !== enteredEmail || user.email === "";
 
   return (
-    <AppContainer>
-      <MainCenteredContainer className="max-w-[22rem]">
-        <Form method="post" {...form.props}>
-          <FormTitle
-            title="Welcome to Trigger.dev"
-            LeadingIcon={
-              <MotionHand
-                style={{
-                  originY: 0.75,
-                }}
-                initial={{
-                  rotate: 0,
-                }}
-                animate={{
-                  rotate: [0, -20, 0, 20, 0, -20, 0, 20, 0],
-                }}
-                transition={{
-                  delay: 1,
-                  duration: 1,
-                  repeatDelay: 5,
-                  repeat: Infinity,
-                  ease: "linear",
-                }}
-              />
-            }
-            description="We just need you to confirm a couple of details, it'll only take a minute."
-          />
-          <Fieldset>
-            <InputGroup>
-              <Label htmlFor={name.id}>Full name</Label>
-              <Input
-                {...conform.input(name, { type: "text" })}
-                defaultValue={user.name ?? ""}
-                placeholder="Your full name"
-                icon={UserIcon}
-                autoFocus
-              />
-              <Hint>Your team will see this name and we'll use it if we need to contact you.</Hint>
-              <FormError id={name.errorId}>{name.error}</FormError>
-            </InputGroup>
-            <InputGroup>
-              <Label htmlFor={email.id}>Email</Label>
-              <Input
-                {...conform.input(email, { type: "email" })}
-                defaultValue={enteredEmail}
-                onChange={(e) => {
-                  setEnteredEmail(e.target.value);
-                }}
-                placeholder="Your email address"
-                icon={EnvelopeIcon}
-                spellCheck={false}
-              />
-              {!shouldShowConfirm && (
-                <Hint>
-                  Check this is the email you'd like associated with your Trigger.dev account.
-                </Hint>
-              )}
-              <FormError id={email.errorId}>{email.error}</FormError>
-            </InputGroup>
-
-            {shouldShowConfirm ? (
+    <AppContainer className="bg-charcoal-900">
+      <BackgroundWrapper>
+        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <Form method="post" {...form.props}>
+            <FormTitle
+              title="Welcome to Trigger.dev"
+              LeadingIcon={
+                <MotionHand
+                  style={{
+                    originY: 0.75,
+                  }}
+                  initial={{
+                    rotate: 0,
+                  }}
+                  animate={{
+                    rotate: [0, -20, 0, 20, 0, -20, 0, 20, 0],
+                  }}
+                  transition={{
+                    delay: 1,
+                    duration: 1,
+                    repeatDelay: 5,
+                    repeat: Infinity,
+                    ease: "linear",
+                  }}
+                />
+              }
+              description="We just need you to confirm a couple of details."
+            />
+            <Fieldset>
               <InputGroup>
-                <Label htmlFor={confirmEmail.id}>Confirm email</Label>
+                <Label htmlFor={name.id}>Full name</Label>
                 <Input
-                  {...conform.input(confirmEmail, { type: "email" })}
-                  placeholder="Your email, again"
-                  icon={EnvelopeIcon}
-                  spellCheck={false}
+                  {...conform.input(name, { type: "text" })}
+                  defaultValue={user.name ?? ""}
+                  placeholder="Your full name"
+                  icon={UserIcon}
+                  autoFocus
                 />
-                <Hint>
-                  Check this is the email you'd like associated with your Trigger.dev account.
-                </Hint>
-                <FormError id={confirmEmail.errorId}>{confirmEmail.error}</FormError>
+                <Hint>Your team will see this name and we'll use it to contact you.</Hint>
+                <FormError id={name.errorId}>{name.error}</FormError>
               </InputGroup>
-            ) : (
-              <>
-                <input {...conform.input(confirmEmail, { type: "hidden" })} value={user.email} />
-              </>
-            )}
-            {isManagedCloud && (
               <InputGroup>
-                <Label htmlFor={confirmEmail.id}>How did you hear about us?</Label>
+                <Label htmlFor={email.id}>Email</Label>
                 <Input
-                  {...conform.input(referralSource, { type: "text" })}
-                  placeholder="Google, X (Twitter)…?"
-                  icon={HeartIcon}
+                  {...conform.input(email, { type: "email" })}
+                  defaultValue={enteredEmail}
+                  onChange={(e) => {
+                    setEnteredEmail(e.target.value);
+                  }}
+                  placeholder="Your email address"
+                  icon={EnvelopeIcon}
                   spellCheck={false}
                 />
+                {!shouldShowConfirm && (
+                  <Hint>Confirm this is the email you'd like for your Trigger.dev account.</Hint>
+                )}
+                <FormError id={email.errorId}>{email.error}</FormError>
               </InputGroup>
-            )}
 
-            <FormButtons
-              confirmButton={
-                <Button type="submit" variant={"primary/small"} TrailingIcon={ArrowRightIcon}>
-                  Continue
-                </Button>
-              }
-            />
-          </Fieldset>
-        </Form>
-      </MainCenteredContainer>
+              {shouldShowConfirm ? (
+                <InputGroup>
+                  <Label htmlFor={confirmEmail.id}>Confirm email</Label>
+                  <Input
+                    {...conform.input(confirmEmail, { type: "email" })}
+                    placeholder="Your email, again"
+                    icon={EnvelopeIcon}
+                    spellCheck={false}
+                  />
+                  <Hint>
+                    Check this is the email you'd like associated with your Trigger.dev account.
+                  </Hint>
+                  <FormError id={confirmEmail.errorId}>{confirmEmail.error}</FormError>
+                </InputGroup>
+              ) : (
+                <>
+                  <input {...conform.input(confirmEmail, { type: "hidden" })} value={user.email} />
+                </>
+              )}
+              {isManagedCloud && (
+                <InputGroup>
+                  <Label htmlFor={confirmEmail.id}>How did you hear about us?</Label>
+                  <Input
+                    {...conform.input(referralSource, { type: "text" })}
+                    placeholder="LLM, Google, X (Twitter)…?"
+                    icon={HeartIcon}
+                    spellCheck={false}
+                  />
+                </InputGroup>
+              )}
+
+              <FormButtons
+                confirmButton={
+                  <Button type="submit" variant={"primary/small"} TrailingIcon={ArrowRightIcon}>
+                    Continue
+                  </Button>
+                }
+              />
+            </Fieldset>
+          </Form>
+        </MainCenteredContainer>
+      </BackgroundWrapper>
     </AppContainer>
   );
 }
diff --git a/apps/webapp/app/routes/deployments.$deploymentParam.ts b/apps/webapp/app/routes/deployments.$deploymentParam.ts
new file mode 100644
index 00000000000..b13b0c5cc1e
--- /dev/null
+++ b/apps/webapp/app/routes/deployments.$deploymentParam.ts
@@ -0,0 +1,70 @@
+import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { redirectWithErrorMessage } from "~/models/message.server";
+import { requireUser } from "~/services/session.server";
+import { rootPath, v3DeploymentPath } from "~/utils/pathBuilder";
+
+const ParamsSchema = z.object({
+  deploymentParam: z.string(),
+});
+
+export async function loader({ params, request }: LoaderFunctionArgs) {
+  const user = await requireUser(request);
+
+  const { deploymentParam } = ParamsSchema.parse(params);
+
+  const deployment = await prisma.workerDeployment.findFirst({
+    where: {
+      friendlyId: deploymentParam,
+      project: {
+        organization: {
+          members: {
+            some: {
+              userId: user.id,
+            },
+          },
+        },
+      },
+    },
+    select: {
+      shortCode: true,
+      environment: {
+        select: {
+          slug: true,
+        },
+      },
+      project: {
+        select: {
+          slug: true,
+          organization: {
+            select: {
+              slug: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!deployment) {
+    return redirectWithErrorMessage(
+      rootPath(),
+      request,
+      "Deployment either doesn't exist or you don't have permission to view it",
+      {
+        ephemeral: false,
+      }
+    );
+  }
+
+  return redirect(
+    v3DeploymentPath(
+      { slug: deployment.project.organization.slug },
+      { slug: deployment.project.slug },
+      { slug: deployment.environment.slug },
+      { shortCode: deployment.shortCode },
+      0
+    )
+  );
+}
diff --git a/apps/webapp/app/routes/engine.v1.dev.config.ts b/apps/webapp/app/routes/engine.v1.dev.config.ts
index 73276b9f7de..bdf7e21054f 100644
--- a/apps/webapp/app/routes/engine.v1.dev.config.ts
+++ b/apps/webapp/app/routes/engine.v1.dev.config.ts
@@ -20,7 +20,11 @@ export const loader = createLoaderApiRoute(
         environmentId: authentication.environment.id,
         dequeueIntervalWithRun: env.DEV_DEQUEUE_INTERVAL_WITH_RUN,
         dequeueIntervalWithoutRun: env.DEV_DEQUEUE_INTERVAL_WITHOUT_RUN,
-        maxConcurrentRuns: env.DEV_MAX_CONCURRENT_RUNS,
+        // Limit max runs to smaller of an optional global limit and the environment limit
+        maxConcurrentRuns: Math.min(
+          env.DEV_MAX_CONCURRENT_RUNS ?? authentication.environment.maximumConcurrencyLimit,
+          authentication.environment.maximumConcurrencyLimit
+        ),
         engineUrl: env.DEV_ENGINE_URL,
       });
     } catch (error) {
diff --git a/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.logs.debug.ts b/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.logs.debug.ts
index 4e240060254..6d39553df1a 100644
--- a/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.logs.debug.ts
+++ b/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.logs.debug.ts
@@ -1,79 +1,3 @@
-import { TypedResponse } from "@remix-run/server-runtime";
-import { assertExhaustive } from "@trigger.dev/core/utils";
-import { RunId } from "@trigger.dev/core/v3/isomorphic";
-import {
-  WorkerApiDebugLogBody,
-  WorkerApiRunAttemptStartResponseBody,
-} from "@trigger.dev/core/v3/workers";
-import { z } from "zod";
-import { prisma } from "~/db.server";
-import { logger } from "~/services/logger.server";
-import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
-import { recordRunDebugLog } from "~/v3/eventRepository.server";
-
-// const { action } = createActionApiRoute(
-//   {
-//     params: z.object({
-//       runFriendlyId: z.string(),
-//     }),
-//     body: WorkerApiDebugLogBody,
-//     method: "POST",
-//   },
-//   async ({
-//     authentication,
-//     body,
-//     params,
-//   }): Promise<TypedResponse<WorkerApiRunAttemptStartResponseBody>> => {
-//     const { runFriendlyId } = params;
-
-//     try {
-//       const run = await prisma.taskRun.findFirst({
-//         where: {
-//           friendlyId: params.runFriendlyId,
-//           runtimeEnvironmentId: authentication.environment.id,
-//         },
-//       });
-
-//       if (!run) {
-//         throw new Response("You don't have permissions for this run", { status: 401 });
-//       }
-
-//       const eventResult = await recordRunDebugLog(
-//         RunId.fromFriendlyId(runFriendlyId),
-//         body.message,
-//         {
-//           attributes: {
-//             properties: body.properties,
-//           },
-//           startTime: body.time,
-//         }
-//       );
-
-//       if (eventResult.success) {
-//         return new Response(null, { status: 204 });
-//       }
-
-//       switch (eventResult.code) {
-//         case "FAILED_TO_RECORD_EVENT":
-//           return new Response(null, { status: 400 }); // send a 400 to prevent retries
-//         case "RUN_NOT_FOUND":
-//           return new Response(null, { status: 404 });
-//         default:
-//           return assertExhaustive(eventResult.code);
-//       }
-//     } catch (error) {
-//       logger.error("Failed to record dev log", {
-//         environmentId: authentication.environment.id,
-//         error,
-//       });
-//       throw error;
-//     }
-//   }
-// );
-
-// export { action };
-
-// Create a generic JSON action in remix
 export function action() {
   return new Response(null, { status: 204 });
 }
diff --git a/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts b/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
index 65d729d31da..0c88cc45f61 100644
--- a/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
+++ b/apps/webapp/app/routes/engine.v1.dev.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
@@ -1,5 +1,5 @@
 import { json, TypedResponse } from "@remix-run/server-runtime";
-import { MachinePreset } from "@trigger.dev/core/v3";
+import { MachinePreset, SemanticInternalAttributes } from "@trigger.dev/core/v3";
 import { RunId, SnapshotId } from "@trigger.dev/core/v3/isomorphic";
 import {
   WorkerApiRunAttemptStartRequestBody,
@@ -57,7 +57,8 @@ const { action } = createActionApiRoute(
       const envVars = await getEnvVars(
         authentication.environment,
         engineResult.run.id,
-        engineResult.execution.machine ?? defaultMachinePreset
+        engineResult.execution.machine ?? defaultMachinePreset,
+        engineResult.run.taskEventStore
       );
 
       return json({
@@ -77,7 +78,8 @@ const { action } = createActionApiRoute(
 async function getEnvVars(
   environment: RuntimeEnvironment,
   runId: string,
-  machinePreset: MachinePreset
+  machinePreset: MachinePreset,
+  taskEventStore?: string
 ): Promise<Record<string, string>> {
   const variables = await resolveVariablesForEnvironment(environment);
 
@@ -94,6 +96,19 @@ async function getEnvVars(
     ]
   );
 
+  if (taskEventStore) {
+    const resourceAttributes = JSON.stringify({
+      [SemanticInternalAttributes.TASK_EVENT_STORE]: taskEventStore,
+    });
+
+    variables.push(
+      ...[
+        { key: "OTEL_RESOURCE_ATTRIBUTES", value: resourceAttributes },
+        { key: "TRIGGER_OTEL_RESOURCE_ATTRIBUTES", value: resourceAttributes },
+      ]
+    );
+  }
+
   return variables.reduce((acc: Record<string, string>, curr) => {
     acc[curr.key] = curr.value;
     return acc;
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.dequeue.ts b/apps/webapp/app/routes/engine.v1.worker-actions.dequeue.ts
index bdc6456236b..2b41cd23c2e 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.dequeue.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.dequeue.ts
@@ -9,7 +9,10 @@ export const action = createActionWorkerApiRoute(
   {
     body: WorkerApiDequeueRequestBody, // Even though we don't use it, we need to keep it for backwards compatibility
   },
-  async ({ authenticatedWorker }): Promise<TypedResponse<WorkerApiDequeueResponseBody>> => {
-    return json(await authenticatedWorker.dequeue());
+  async ({
+    authenticatedWorker,
+    runnerId,
+  }): Promise<TypedResponse<WorkerApiDequeueResponseBody>> => {
+    return json(await authenticatedWorker.dequeue({ runnerId }));
   }
 );
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.logs.debug.ts b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.logs.debug.ts
index a814ae257fe..457c2b4d2c3 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.logs.debug.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.logs.debug.ts
@@ -3,7 +3,7 @@ import { RunId } from "@trigger.dev/core/v3/isomorphic";
 import { WorkerApiDebugLogBody } from "@trigger.dev/core/v3/runEngineWorker";
 import { z } from "zod";
 import { createActionWorkerApiRoute } from "~/services/routeBuilders/apiBuilder.server";
-import { recordRunDebugLog } from "~/v3/eventRepository.server";
+import { recordRunDebugLog } from "~/v3/eventRepository/index.server";
 
 export const action = createActionWorkerApiRoute(
   {
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.complete.ts b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.complete.ts
index 81f53280e14..0ea7c8f3c77 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.complete.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.complete.ts
@@ -18,6 +18,7 @@ export const action = createActionWorkerApiRoute(
     authenticatedWorker,
     body,
     params,
+    runnerId,
   }): Promise<TypedResponse<WorkerApiRunAttemptCompleteResponseBody>> => {
     const { completion } = body;
     const { runFriendlyId, snapshotFriendlyId } = params;
@@ -26,6 +27,7 @@ export const action = createActionWorkerApiRoute(
       runFriendlyId,
       snapshotFriendlyId,
       completion,
+      runnerId,
     });
 
     return json({ result: completeResult });
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
index f7a8e874ecd..de0290f2bb5 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.attempts.start.ts
@@ -18,6 +18,7 @@ export const action = createActionWorkerApiRoute(
     authenticatedWorker,
     body,
     params,
+    runnerId,
   }): Promise<TypedResponse<WorkerApiRunAttemptStartResponseBody>> => {
     const { runFriendlyId, snapshotFriendlyId } = params;
 
@@ -25,6 +26,7 @@ export const action = createActionWorkerApiRoute(
       runFriendlyId,
       snapshotFriendlyId,
       isWarmStart: body.isWarmStart,
+      runnerId,
     });
 
     return json(runExecutionData);
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.continue.ts b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.continue.ts
index b35f26a10e5..bdeb76ca8a8 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.continue.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.continue.ts
@@ -14,6 +14,7 @@ export const loader = createLoaderWorkerApiRoute(
   async ({
     authenticatedWorker,
     params,
+    runnerId,
   }): Promise<TypedResponse<WorkerApiContinueRunExecutionRequestBody>> => {
     const { runFriendlyId, snapshotFriendlyId } = params;
 
@@ -23,12 +24,17 @@ export const loader = createLoaderWorkerApiRoute(
       const continuationResult = await authenticatedWorker.continueRunExecution({
         runFriendlyId,
         snapshotFriendlyId,
+        runnerId,
       });
 
       return json(continuationResult);
     } catch (error) {
-      logger.error("Failed to suspend run", { runFriendlyId, snapshotFriendlyId, error });
-      throw error;
+      logger.warn("Failed to suspend run", { runFriendlyId, snapshotFriendlyId, error });
+      if (error instanceof Error) {
+        throw json({ error: error.message }, { status: 422 });
+      }
+
+      throw json({ error: "Failed to continue run execution" }, { status: 422 });
     }
   }
 );
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.heartbeat.ts b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.heartbeat.ts
index 0942bcde8b7..cd2f63bd1e3 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.heartbeat.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.heartbeat.ts
@@ -13,12 +13,14 @@ export const action = createActionWorkerApiRoute(
   async ({
     authenticatedWorker,
     params,
+    runnerId,
   }): Promise<TypedResponse<WorkloadHeartbeatResponseBody>> => {
     const { runFriendlyId, snapshotFriendlyId } = params;
 
     await authenticatedWorker.heartbeatRun({
       runFriendlyId,
       snapshotFriendlyId,
+      runnerId,
     });
 
     return json({ ok: true });
diff --git a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.suspend.ts b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.suspend.ts
index 2d745ed94ad..ee1b30863f4 100644
--- a/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.suspend.ts
+++ b/apps/webapp/app/routes/engine.v1.worker-actions.runs.$runFriendlyId.snapshots.$snapshotFriendlyId.suspend.ts
@@ -19,6 +19,7 @@ export const action = createActionWorkerApiRoute(
     authenticatedWorker,
     params,
     body,
+    runnerId,
   }): Promise<TypedResponse<WorkerApiSuspendRunResponseBody>> => {
     const { runFriendlyId, snapshotFriendlyId } = params;
 
@@ -39,6 +40,7 @@ export const action = createActionWorkerApiRoute(
         runFriendlyId,
         snapshotFriendlyId,
         checkpoint: body.checkpoint,
+        runnerId,
       });
 
       return json({ ok: true });
diff --git a/apps/webapp/app/routes/invite-accept.tsx b/apps/webapp/app/routes/invite-accept.tsx
index 57c1ddff06f..592384b9515 100644
--- a/apps/webapp/app/routes/invite-accept.tsx
+++ b/apps/webapp/app/routes/invite-accept.tsx
@@ -18,6 +18,12 @@ export async function loader({ request }: LoaderFunctionArgs) {
     );
   }
 
+  if (!user) {
+    return redirectWithSuccessMessage("/", request, "Please log in to accept the invite.", {
+      ephemeral: false,
+    });
+  }
+
   const invite = await getInviteFromToken({ token });
   if (!invite) {
     return redirectWithErrorMessage(
@@ -28,12 +34,6 @@ export async function loader({ request }: LoaderFunctionArgs) {
     );
   }
 
-  if (!user) {
-    return redirectWithSuccessMessage("/", request, "Please log in to accept the invite.", {
-      ephemeral: false,
-    });
-  }
-
   if (invite.email !== user.email) {
     return redirectWithErrorMessage(
       "/",
diff --git a/apps/webapp/app/routes/invite-resend.tsx b/apps/webapp/app/routes/invite-resend.tsx
index 9d5ee08abe5..dc66e898517 100644
--- a/apps/webapp/app/routes/invite-resend.tsx
+++ b/apps/webapp/app/routes/invite-resend.tsx
@@ -1,5 +1,5 @@
 import { parse } from "@conform-to/zod";
-import { ActionFunction, json } from "@remix-run/server-runtime";
+import { type ActionFunction, json } from "@remix-run/server-runtime";
 import { env } from "process";
 import { z } from "zod";
 import { resendInvite } from "~/models/member.server";
@@ -25,6 +25,7 @@ export const action: ActionFunction = async ({ request }) => {
   try {
     const invite = await resendInvite({
       inviteId: submission.value.inviteId,
+      userId,
     });
 
     try {
diff --git a/apps/webapp/app/routes/invite-revoke.tsx b/apps/webapp/app/routes/invite-revoke.tsx
index b066a08ba36..cd499e58dc3 100644
--- a/apps/webapp/app/routes/invite-revoke.tsx
+++ b/apps/webapp/app/routes/invite-revoke.tsx
@@ -1,5 +1,5 @@
 import { parse } from "@conform-to/zod";
-import { ActionFunction, json } from "@remix-run/server-runtime";
+import { type ActionFunction, json } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { revokeInvite } from "~/models/member.server";
 import { redirectWithSuccessMessage } from "~/models/message.server";
@@ -24,7 +24,7 @@ export const action: ActionFunction = async ({ request }) => {
   try {
     const { email, organization } = await revokeInvite({
       userId,
-      slug: submission.value.slug,
+      orgSlug: submission.value.slug,
       inviteId: submission.value.inviteId,
     });
 
diff --git a/apps/webapp/app/routes/invites.tsx b/apps/webapp/app/routes/invites.tsx
index daa5408719c..11998a4676a 100644
--- a/apps/webapp/app/routes/invites.tsx
+++ b/apps/webapp/app/routes/invites.tsx
@@ -1,6 +1,6 @@
 import { conform, useForm } from "@conform-to/react";
 import { parse } from "@conform-to/zod";
-import { ActionFunction, LoaderFunctionArgs, json, redirect } from "@remix-run/node";
+import { type ActionFunction, type LoaderFunctionArgs, json, redirect } from "@remix-run/node";
 import { Form, useActionData } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
@@ -17,6 +17,7 @@ import { redirectWithSuccessMessage } from "~/models/message.server";
 import { requireUser, requireUserId } from "~/services/session.server";
 import { invitesPath, rootPath } from "~/utils/pathBuilder";
 import { EnvelopeIcon } from "@heroicons/react/20/solid";
+import { BackgroundWrapper } from "~/components/BackgroundWrapper";
 
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   const user = await requireUser(request);
@@ -35,7 +36,7 @@ const schema = z.object({
 });
 
 export const action: ActionFunction = async ({ request }) => {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
 
   const formData = await request.formData();
   const submission = parse(formData, { schema });
@@ -48,7 +49,7 @@ export const action: ActionFunction = async ({ request }) => {
     if (submission.intent === "accept") {
       const { remainingInvites, organization } = await acceptInvite({
         inviteId: submission.value.inviteId,
-        userId,
+        user: { id: user.id, email: user.email },
       });
 
       if (remainingInvites.length === 0) {
@@ -63,7 +64,7 @@ export const action: ActionFunction = async ({ request }) => {
     } else if (submission.intent === "decline") {
       const { remainingInvites, organization } = await declineInvite({
         inviteId: submission.value.inviteId,
-        userId,
+        user: { id: user.id, email: user.email },
       });
       if (remainingInvites.length === 0) {
         return redirectWithSuccessMessage(
@@ -98,49 +99,51 @@ export default function Page() {
   });
 
   return (
-    <AppContainer>
-      <MainCenteredContainer>
-        <div>
-          <FormTitle
-            LeadingIcon={<EnvelopeIcon className="size-6 text-cyan-500" />}
-            className="mb-0 text-sky-500"
-            title={simplur`You have ${invites.length} new invitation[|s]`}
-          />
-          {invites.map((invite) => (
-            <Form key={invite.id} method="post" {...form.props}>
-              <Fieldset>
-                <InputGroup className="flex items-center justify-between border-b border-charcoal-800 py-4">
-                  <div className="flex flex-col gap-y-0.5 overflow-hidden">
-                    <Header2 className="truncate">{invite.organization.title}</Header2>
-                    <Paragraph variant="small" className="truncate">
-                      Invited by {invite.inviter.displayName ?? invite.inviter.email}
-                    </Paragraph>
-                    <input name="inviteId" type="hidden" value={invite.id} />
-                  </div>
-                  <div className="flex flex-col gap-y-1">
-                    <Button
-                      type="submit"
-                      name={conform.INTENT}
-                      value="accept"
-                      variant={"primary/small"}
-                    >
-                      Accept
-                    </Button>
-                    <Button
-                      type="submit"
-                      name={conform.INTENT}
-                      value="decline"
-                      variant={"secondary/small"}
-                    >
-                      Decline
-                    </Button>
-                  </div>
-                </InputGroup>
-              </Fieldset>
-            </Form>
-          ))}
-        </div>
-      </MainCenteredContainer>
+    <AppContainer className="bg-charcoal-900">
+      <BackgroundWrapper>
+        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <div>
+            <FormTitle
+              LeadingIcon={<EnvelopeIcon className="size-6 text-cyan-500" />}
+              className="mb-0 text-sky-500"
+              title={simplur`You have ${invites.length} new invitation[|s]`}
+            />
+            {invites.map((invite) => (
+              <Form key={invite.id} method="post" {...form.props}>
+                <Fieldset>
+                  <InputGroup className="flex items-center justify-between border-b border-charcoal-800 py-4">
+                    <div className="flex flex-col gap-y-0.5 overflow-hidden">
+                      <Header2 className="truncate">{invite.organization.title}</Header2>
+                      <Paragraph variant="small" className="truncate">
+                        Invited by {invite.inviter.displayName ?? invite.inviter.email}
+                      </Paragraph>
+                      <input name="inviteId" type="hidden" value={invite.id} />
+                    </div>
+                    <div className="flex flex-col gap-y-1">
+                      <Button
+                        type="submit"
+                        name={conform.INTENT}
+                        value="accept"
+                        variant={"primary/small"}
+                      >
+                        Accept
+                      </Button>
+                      <Button
+                        type="submit"
+                        name={conform.INTENT}
+                        value="decline"
+                        variant={"secondary/small"}
+                      >
+                        Decline
+                      </Button>
+                    </div>
+                  </InputGroup>
+                </Fieldset>
+              </Form>
+            ))}
+          </div>
+        </MainCenteredContainer>
+      </BackgroundWrapper>
     </AppContainer>
   );
 }
diff --git a/apps/webapp/app/routes/login._index/route.tsx b/apps/webapp/app/routes/login._index/route.tsx
index b92c1bb39e2..592ecd3f7c0 100644
--- a/apps/webapp/app/routes/login._index/route.tsx
+++ b/apps/webapp/app/routes/login._index/route.tsx
@@ -2,7 +2,9 @@ import { EnvelopeIcon } from "@heroicons/react/20/solid";
 import type { LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
 import { Form } from "@remix-run/react";
 import { GitHubLightIcon } from "@trigger.dev/companyicons";
+import { motion, useReducedMotion } from "framer-motion";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
+import { GoogleLogo } from "~/assets/logos/GoogleLogo";
 import { LoginPageLayout } from "~/components/LoginPageLayout";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Fieldset } from "~/components/primitives/Fieldset";
@@ -10,12 +12,33 @@ import { FormError } from "~/components/primitives/FormError";
 import { Header1 } from "~/components/primitives/Headers";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { TextLink } from "~/components/primitives/TextLink";
-import { isGithubAuthSupported } from "~/services/auth.server";
+import { isGithubAuthSupported, isGoogleAuthSupported } from "~/services/auth.server";
+import { getLastAuthMethod } from "~/services/lastAuthMethod.server";
 import { commitSession, setRedirectTo } from "~/services/redirectTo.server";
 import { getUserId } from "~/services/session.server";
 import { getUserSession } from "~/services/sessionStorage.server";
 import { requestUrl } from "~/utils/requestUrl.server";
 
+function LastUsedBadge() {
+  const shouldReduceMotion = useReducedMotion();
+
+  return (
+    <div className="absolute -right-5 top-1 z-10 -translate-y-1/2 shadow-md md:-right-[4.6rem] md:top-1/2">
+      <motion.div
+        className="relative rounded border border-charcoal-700 bg-charcoal-800 px-2 py-1 text-center text-xxs font-medium uppercase text-blue-500"
+        initial={shouldReduceMotion ? undefined : { opacity: 0, x: 4 }}
+        animate={shouldReduceMotion ? undefined : { opacity: 1, x: 0 }}
+        transition={shouldReduceMotion ? undefined : { duration: 0.8, ease: "easeOut" }}
+      >
+        <span className="pointer-events-none absolute left-0 top-1/2 -translate-x-1/2 -translate-y-1/2">
+          <span className="hidden h-2 w-2 rotate-45 border-b border-l border-charcoal-700 bg-charcoal-800 md:block" />
+        </span>
+        Last used
+      </motion.div>
+    </div>
+  );
+}
+
 export const meta: MetaFunction = ({ matches }) => {
   const parentMeta = matches
     .flatMap((match) => match.meta ?? [])
@@ -45,6 +68,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
 
   const url = requestUrl(request);
   const redirectTo = url.searchParams.get("redirectTo");
+  const lastAuthMethod = await getLastAuthMethod(request);
 
   if (redirectTo) {
     const session = await setRedirectTo(request, redirectTo);
@@ -53,6 +77,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
       {
         redirectTo,
         showGithubAuth: isGithubAuthSupported,
+        showGoogleAuth: isGoogleAuthSupported,
+        lastAuthMethod,
         authError: null,
       },
       {
@@ -77,6 +103,8 @@ export async function loader({ request }: LoaderFunctionArgs) {
     return typedjson({
       redirectTo: null,
       showGithubAuth: isGithubAuthSupported,
+      showGoogleAuth: isGoogleAuthSupported,
+      lastAuthMethod,
       authError,
     });
   }
@@ -87,33 +115,59 @@ export default function LoginPage() {
 
   return (
     <LoginPageLayout>
-      <Form
-        action={`/auth/github${data.redirectTo ? `?redirectTo=${data.redirectTo}` : ""}`}
-        method="post"
-        className="w-full"
-      >
-        <div className="flex flex-col items-center">
-          <Header1 className="pb-4 font-semibold sm:text-2xl md:text-3xl lg:text-4xl">
-            Welcome
-          </Header1>
-          <Paragraph variant="base" className="mb-6">
-            Create an account or login
-          </Paragraph>
-          <Fieldset className="w-full">
-            <div className="flex flex-col items-center gap-y-2">
-              {data.showGithubAuth && (
-                <Button
-                  type="submit"
-                  variant="primary/extra-large"
-                  fullWidth
-                  data-action="continue with github"
+      <div className="flex w-full flex-col items-center">
+        <Header1 className="pb-4 font-semibold sm:text-2xl md:text-3xl lg:text-4xl">
+          Welcome
+        </Header1>
+        <Paragraph variant="base" className="mb-6">
+          Create an account or login
+        </Paragraph>
+        <Fieldset className="w-full">
+          <div className="flex flex-col items-center gap-y-3">
+            {data.showGithubAuth && (
+              <div className="relative w-full">
+                {data.lastAuthMethod === "github" && <LastUsedBadge />}
+                <Form
+                  action={`/auth/github${data.redirectTo ? `?redirectTo=${encodeURIComponent(data.redirectTo)}` : ""}`}
+                  method="post"
+                  className="w-full"
                 >
-                  <GitHubLightIcon className={"mr-2 size-5"} />
-                  <span className="text-text-bright">Continue with GitHub</span>
-                </Button>
-              )}
+                  <Button
+                    type="submit"
+                    variant="secondary/extra-large"
+                    fullWidth
+                    data-action="continue with github"
+                  >
+                    <GitHubLightIcon className="mr-2 size-5" />
+                    <span className="text-text-bright">Continue with GitHub</span>
+                  </Button>
+                </Form>
+              </div>
+            )}
+            {data.showGoogleAuth && (
+              <div className="relative w-full">
+                {data.lastAuthMethod === "google" && <LastUsedBadge />}
+                <Form
+                  action={`/auth/google${data.redirectTo ? `?redirectTo=${encodeURIComponent(data.redirectTo)}` : ""}`}
+                  method="post"
+                  className="w-full"
+                >
+                  <Button
+                    type="submit"
+                    variant="secondary/extra-large"
+                    fullWidth
+                    data-action="continue with google"
+                  >
+                    <GoogleLogo className="mr-2 size-5" />
+                    <span className="text-text-bright">Continue with Google</span>
+                  </Button>
+                </Form>
+              </div>
+            )}
+            <div className="relative w-full">
+              {data.lastAuthMethod === "email" && <LastUsedBadge />}
               <LinkButton
-                to="/login/magic"
+                to={data.redirectTo ? `/login/magic?redirectTo=${encodeURIComponent(data.redirectTo)}` : "/login/magic"}
                 variant="secondary/extra-large"
                 fullWidth
                 data-action="continue with email"
@@ -122,22 +176,22 @@ export default function LoginPage() {
                 <EnvelopeIcon className="mr-2 size-5 text-text-bright" />
                 Continue with Email
               </LinkButton>
-              {data.authError && <FormError>{data.authError}</FormError>}
             </div>
-            <Paragraph variant="extra-small" className="mt-2 text-center">
-              By signing up you agree to our{" "}
-              <TextLink href="https://trigger.dev/legal" target="_blank">
-                terms
-              </TextLink>
-              {" "}and{" "}
-              <TextLink href="https://trigger.dev/legal/privacy" target="_blank">
-                privacy
-              </TextLink>
-              {" "}policy.
-            </Paragraph>
-          </Fieldset>
-        </div>
-      </Form>
+            {data.authError && <FormError>{data.authError}</FormError>}
+          </div>
+          <Paragraph variant="extra-small" className="mt-2 text-center">
+            By signing up you agree to our{" "}
+            <TextLink href="https://trigger.dev/legal" target="_blank">
+              terms
+            </TextLink>{" "}
+            and{" "}
+            <TextLink href="https://trigger.dev/legal/privacy" target="_blank">
+              privacy
+            </TextLink>{" "}
+            policy.
+          </Paragraph>
+        </Fieldset>
+      </div>
     </LoginPageLayout>
   );
 }
diff --git a/apps/webapp/app/routes/login.magic/route.tsx b/apps/webapp/app/routes/login.magic/route.tsx
index 04085ebd612..8c4323be54e 100644
--- a/apps/webapp/app/routes/login.magic/route.tsx
+++ b/apps/webapp/app/routes/login.magic/route.tsx
@@ -1,7 +1,11 @@
 import { ArrowLeftIcon, EnvelopeIcon } from "@heroicons/react/20/solid";
 import { InboxArrowDownIcon } from "@heroicons/react/24/solid";
-import type { ActionFunctionArgs, LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
+import {
+  redirect,
+  type ActionFunctionArgs,
+  type LoaderFunctionArgs,
+  type MetaFunction,
+} from "@remix-run/node";
 import { Form, useNavigation } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
@@ -18,6 +22,16 @@ import { Spinner } from "~/components/primitives/Spinner";
 import { TextLink } from "~/components/primitives/TextLink";
 import { authenticator } from "~/services/auth.server";
 import { commitSession, getUserSession } from "~/services/sessionStorage.server";
+import { setRedirectTo, commitSession as commitRedirectSession } from "~/services/redirectTo.server";
+import {
+  checkMagicLinkEmailRateLimit,
+  checkMagicLinkEmailDailyRateLimit,
+  MagicLinkRateLimitError,
+  checkMagicLinkIpRateLimit,
+} from "~/services/magicLinkRateLimiter.server";
+import { logger, tryCatch } from "@trigger.dev/core/v3";
+import { env } from "~/env.server";
+import { extractClientIp } from "~/utils/extractClientIp.server";
 
 export const meta: MetaFunction = ({ matches }) => {
   const parentMeta = matches
@@ -46,6 +60,16 @@ export async function loader({ request }: LoaderFunctionArgs) {
   const session = await getUserSession(request);
   const error = session.get("auth:error");
 
+  // Get redirectTo from URL params and store in session if present
+  const url = new URL(request.url);
+  const redirectTo = url.searchParams.get("redirectTo");
+  const headers = new Headers();
+  
+  if (redirectTo) {
+    const redirectSession = await setRedirectTo(request, redirectTo);
+    headers.append("Set-Cookie", await commitRedirectSession(redirectSession));
+  }
+
   let magicLinkError: string | undefined;
   if (error) {
     if ("message" in error) {
@@ -55,13 +79,15 @@ export async function loader({ request }: LoaderFunctionArgs) {
     }
   }
 
+  headers.append("Set-Cookie", await commitSession(session));
+
   return typedjson(
     {
       magicLinkSent: session.has("triggerdotdev:magiclink"),
       magicLinkError,
     },
     {
-      headers: { "Set-Cookie": await commitSession(session) },
+      headers,
     }
   );
 }
@@ -71,26 +97,89 @@ export async function action({ request }: ActionFunctionArgs) {
 
   const payload = Object.fromEntries(await clonedRequest.formData());
 
-  const { action } = z
-    .object({
-      action: z.enum(["send", "reset"]),
-    })
+  const data = z
+    .discriminatedUnion("action", [
+      z.object({
+        action: z.literal("send"),
+        email: z.string().trim().toLowerCase(),
+      }),
+      z.object({
+        action: z.literal("reset"),
+      }),
+    ])
     .parse(payload);
 
-  if (action === "send") {
-    return authenticator.authenticate("email-link", request, {
-      successRedirect: "/login/magic",
-      failureRedirect: "/login/magic",
-    });
-  } else {
-    const session = await getUserSession(request);
-    session.unset("triggerdotdev:magiclink");
-
-    return redirect("/login/magic", {
-      headers: {
-        "Set-Cookie": await commitSession(session),
-      },
-    });
+  switch (data.action) {
+    case "send": {
+      if (!env.LOGIN_RATE_LIMITS_ENABLED) {
+        return authenticator.authenticate("email-link", request, {
+          successRedirect: "/login/magic",
+          failureRedirect: "/login/magic",
+        });
+      }
+
+      const { email } = data;
+      const xff = request.headers.get("x-forwarded-for");
+      const clientIp = extractClientIp(xff);
+
+      const [error] = await tryCatch(
+        Promise.all([
+          clientIp ? checkMagicLinkIpRateLimit(clientIp) : Promise.resolve(),
+          checkMagicLinkEmailRateLimit(email),
+          checkMagicLinkEmailDailyRateLimit(email),
+        ])
+      );
+
+      if (error) {
+        if (error instanceof MagicLinkRateLimitError) {
+          logger.warn("Login magic link rate limit exceeded", {
+            clientIp,
+            email,
+            error,
+          });
+        } else {
+          logger.error("Failed sending login magic link", {
+            clientIp,
+            email,
+            error,
+          });
+        }
+
+        const errorMessage =
+          error instanceof MagicLinkRateLimitError
+            ? "Too many magic link requests. Please try again shortly."
+            : "Failed sending magic link. Please try again shortly.";
+
+        const session = await getUserSession(request);
+        session.set("auth:error", {
+          message: errorMessage,
+        });
+
+        return redirect("/login/magic", {
+          headers: {
+            "Set-Cookie": await commitSession(session),
+          },
+        });
+      }
+
+      return authenticator.authenticate("email-link", request, {
+        successRedirect: "/login/magic",
+        failureRedirect: "/login/magic",
+      });
+    }
+    case "reset":
+    default: {
+      data.action satisfies "reset";
+
+      const session = await getUserSession(request);
+      session.unset("triggerdotdev:magiclink");
+
+      return redirect("/login/magic", {
+        headers: {
+          "Set-Cookie": await commitSession(session),
+        },
+      });
+    }
   }
 }
 
diff --git a/apps/webapp/app/routes/login.mfa/route.tsx b/apps/webapp/app/routes/login.mfa/route.tsx
index 0d1a347d4b5..1a71cd7227a 100644
--- a/apps/webapp/app/routes/login.mfa/route.tsx
+++ b/apps/webapp/app/routes/login.mfa/route.tsx
@@ -20,12 +20,13 @@ import { InputOTP, InputOTPGroup, InputOTPSlot } from "~/components/primitives/I
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { Spinner } from "~/components/primitives/Spinner";
 import { authenticator } from "~/services/auth.server";
-import { commitSession, getUserSession, sessionStorage } from "~/services/sessionStorage.server";
+import { commitSession, getUserSession } from "~/services/sessionStorage.server";
 import { getSession as getMessageSession } from "~/models/message.server";
 import { MultiFactorAuthenticationService } from "~/services/mfa/multiFactorAuthentication.server";
 import { redirectWithErrorMessage, redirectBackWithErrorMessage } from "~/models/message.server";
 import { ServiceValidationError } from "~/v3/services/baseService.server";
 import { checkMfaRateLimit, MfaRateLimitError } from "~/services/mfa/mfaRateLimiter.server";
+import { trackAndClearReferralSource } from "~/services/referralSource.server";
 
 export const meta: MetaFunction = ({ matches }) => {
   const parentMeta = matches
@@ -151,20 +152,21 @@ export async function action({ request }: ActionFunctionArgs) {
 }
 
 async function completeLogin(request: Request, session: Session, userId: string) {
-  // Create a new authenticated session
-  const authSession = await sessionStorage.getSession(request.headers.get("Cookie"));
-  authSession.set(authenticator.sessionKey, { userId });
+  // Set the auth key on the same session object to avoid conflicting Set-Cookie headers
+  // (both authSession and session share the same __session cookie name)
+  session.set(authenticator.sessionKey, { userId });
 
   // Get the redirect URL and clean up pending MFA data
   const redirectTo = session.get("pending-mfa-redirect-to") ?? "/";
   session.unset("pending-mfa-user-id");
   session.unset("pending-mfa-redirect-to");
 
-  return redirect(redirectTo, {
-    headers: {
-      "Set-Cookie": await sessionStorage.commitSession(authSession),
-    },
-  });
+  const headers = new Headers();
+  headers.append("Set-Cookie", await commitSession(session));
+
+  await trackAndClearReferralSource(request, userId, headers);
+
+  return redirect(redirectTo, { headers });
 }
 
 export default function LoginMfaPage() {
diff --git a/apps/webapp/app/routes/magic.tsx b/apps/webapp/app/routes/magic.tsx
index 23b7ce826bf..682f0ef46e5 100644
--- a/apps/webapp/app/routes/magic.tsx
+++ b/apps/webapp/app/routes/magic.tsx
@@ -3,8 +3,10 @@ import { redirect } from "@remix-run/server-runtime";
 import { prisma } from "~/db.server";
 import { redirectWithErrorMessage } from "~/models/message.server";
 import { authenticator } from "~/services/auth.server";
+import { setLastAuthMethodHeader } from "~/services/lastAuthMethod.server";
 import { getRedirectTo } from "~/services/redirectTo.server";
 import { commitSession, getSession } from "~/services/sessionStorage.server";
+import { trackAndClearReferralSource } from "~/services/referralSource.server";
 
 export async function loader({ request }: LoaderFunctionArgs) {
   const redirectTo = await getRedirectTo(request);
@@ -38,19 +40,21 @@ export async function loader({ request }: LoaderFunctionArgs) {
     session.set("pending-mfa-user-id", userRecord.id);
     session.set("pending-mfa-redirect-to", redirectTo ?? "/");
 
-    return redirect("/login/mfa", {
-      headers: {
-        "Set-Cookie": await commitSession(session),
-      },
-    });
+    const headers = new Headers();
+    headers.append("Set-Cookie", await commitSession(session));
+    headers.append("Set-Cookie", await setLastAuthMethodHeader("email"));
+
+    return redirect("/login/mfa", { headers });
   }
 
   // and store the user data
   session.set(authenticator.sessionKey, auth);
 
-  return redirect(redirectTo ?? "/", {
-    headers: {
-      "Set-Cookie": await commitSession(session),
-    },
-  });
+  const headers = new Headers();
+  headers.append("Set-Cookie", await commitSession(session));
+  headers.append("Set-Cookie", await setLastAuthMethodHeader("email"));
+
+  await trackAndClearReferralSource(request, auth.userId, headers);
+
+  return redirect(redirectTo ?? "/", { headers });
 }
diff --git a/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency.ts b/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency.ts
deleted file mode 100644
index e5af3479c60..00000000000
--- a/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { EnvironmentParamSchema, v3QueuesPath } from "~/utils/pathBuilder";
-
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
-  return redirect(
-    v3QueuesPath({ slug: organizationSlug }, { slug: projectParam }, { slug: envParam })
-  );
-};
diff --git a/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.runs.$runParam.ts b/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.runs.$runParam.ts
index 29aa557797a..63a89d7e0aa 100644
--- a/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.runs.$runParam.ts
+++ b/apps/webapp/app/routes/orgs.$organizationSlug.projects.$projectParam.runs.$runParam.ts
@@ -3,14 +3,14 @@ import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { requireUserId } from "~/services/session.server";
-import { ProjectParamSchema, v3DeploymentPath, v3RunPath } from "~/utils/pathBuilder";
+import { ProjectParamSchema, v3RunPath } from "~/utils/pathBuilder";
 
 const ParamSchema = ProjectParamSchema.extend({
   runParam: z.string(),
 });
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  await requireUserId(request);
+  const userId = await requireUserId(request);
   const { organizationSlug, projectParam, runParam } = ParamSchema.parse(params);
 
   const run = await prisma.taskRun.findFirst({
@@ -18,6 +18,14 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       friendlyId: runParam,
       project: {
         slug: projectParam,
+        organization: {
+          slug: organizationSlug,
+          members: {
+            some: {
+              userId,
+            },
+          },
+        },
       },
     },
     select: {
diff --git a/apps/webapp/app/routes/otel.v1.logs.ts b/apps/webapp/app/routes/otel.v1.logs.ts
index c04be32b4e9..a05ddd24cf2 100644
--- a/apps/webapp/app/routes/otel.v1.logs.ts
+++ b/apps/webapp/app/routes/otel.v1.logs.ts
@@ -4,15 +4,15 @@ import { otlpExporter } from "~/v3/otlpExporter.server";
 
 export async function action({ request }: ActionFunctionArgs) {
   try {
-    const contentType = request.headers.get("content-type");
+    const contentType = request.headers.get("content-type")?.toLowerCase() ?? "";
 
-    if (contentType === "application/json") {
+    if (contentType.startsWith("application/json")) {
       const body = await request.json();
 
-      const exportResponse = await otlpExporter.exportLogs(body as ExportLogsServiceRequest, false);
+      const exportResponse = await otlpExporter.exportLogs(body as ExportLogsServiceRequest);
 
       return json(exportResponse, { status: 200 });
-    } else if (contentType === "application/x-protobuf") {
+    } else if (contentType.startsWith("application/x-protobuf")) {
       const buffer = await request.arrayBuffer();
 
       const exportRequest = ExportLogsServiceRequest.decode(new Uint8Array(buffer));
diff --git a/apps/webapp/app/routes/otel.v1.metrics.ts b/apps/webapp/app/routes/otel.v1.metrics.ts
new file mode 100644
index 00000000000..5529f9310ec
--- /dev/null
+++ b/apps/webapp/app/routes/otel.v1.metrics.ts
@@ -0,0 +1,41 @@
+import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import {
+  ExportMetricsServiceRequest,
+  ExportMetricsServiceResponse,
+} from "@trigger.dev/otlp-importer";
+import { otlpExporter } from "~/v3/otlpExporter.server";
+
+export async function action({ request }: ActionFunctionArgs) {
+  try {
+    const contentType = request.headers.get("content-type")?.toLowerCase() ?? "";
+
+    if (contentType.startsWith("application/json")) {
+      const body = await request.json();
+
+      const exportResponse = await otlpExporter.exportMetrics(
+        body as ExportMetricsServiceRequest
+      );
+
+      return json(exportResponse, { status: 200 });
+    } else if (contentType.startsWith("application/x-protobuf")) {
+      const buffer = await request.arrayBuffer();
+
+      const exportRequest = ExportMetricsServiceRequest.decode(new Uint8Array(buffer));
+
+      const exportResponse = await otlpExporter.exportMetrics(exportRequest);
+
+      return new Response(ExportMetricsServiceResponse.encode(exportResponse).finish(), {
+        status: 200,
+      });
+    } else {
+      return new Response(
+        "Unsupported content type. Must be either application/x-protobuf or application/json",
+        { status: 400 }
+      );
+    }
+  } catch (error) {
+    console.error(error);
+
+    return new Response("Internal Server Error", { status: 500 });
+  }
+}
diff --git a/apps/webapp/app/routes/otel.v1.traces.ts b/apps/webapp/app/routes/otel.v1.traces.ts
index 5d77314a1ef..609b72c0465 100644
--- a/apps/webapp/app/routes/otel.v1.traces.ts
+++ b/apps/webapp/app/routes/otel.v1.traces.ts
@@ -4,18 +4,15 @@ import { otlpExporter } from "~/v3/otlpExporter.server";
 
 export async function action({ request }: ActionFunctionArgs) {
   try {
-    const contentType = request.headers.get("content-type");
+    const contentType = request.headers.get("content-type")?.toLowerCase() ?? "";
 
-    if (contentType === "application/json") {
+    if (contentType.startsWith("application/json")) {
       const body = await request.json();
 
-      const exportResponse = await otlpExporter.exportTraces(
-        body as ExportTraceServiceRequest,
-        false
-      );
+      const exportResponse = await otlpExporter.exportTraces(body as ExportTraceServiceRequest);
 
       return json(exportResponse, { status: 200 });
-    } else if (contentType === "application/x-protobuf") {
+    } else if (contentType.startsWith("application/x-protobuf")) {
       const buffer = await request.arrayBuffer();
 
       const exportRequest = ExportTraceServiceRequest.decode(new Uint8Array(buffer));
diff --git a/apps/webapp/app/routes/projects.$projectRef.ts b/apps/webapp/app/routes/projects.$projectRef.ts
new file mode 100644
index 00000000000..856a93c4acb
--- /dev/null
+++ b/apps/webapp/app/routes/projects.$projectRef.ts
@@ -0,0 +1,37 @@
+import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { requireUserId } from "~/services/session.server";
+
+const ParamsSchema = z.object({
+  projectRef: z.string(),
+});
+
+export async function loader({ params, request }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+
+  const validatedParams = ParamsSchema.parse(params);
+
+  const project = await prisma.project.findFirst({
+    where: {
+      externalRef: validatedParams.projectRef,
+      organization: {
+        members: {
+          some: {
+            userId,
+          },
+        },
+      },
+    },
+    include: {
+      organization: true,
+    },
+  });
+
+  if (!project) {
+    return new Response("Not found", { status: 404 });
+  }
+
+  // Redirect to the project's runs page
+  return redirect(`/orgs/${project.organization.slug}/projects/${project.slug}`);
+}
diff --git a/apps/webapp/app/routes/projects.v3.$projectRef.ts b/apps/webapp/app/routes/projects.v3.$projectRef.ts
index 856a93c4acb..48b007a6272 100644
--- a/apps/webapp/app/routes/projects.v3.$projectRef.ts
+++ b/apps/webapp/app/routes/projects.v3.$projectRef.ts
@@ -1,37 +1,12 @@
 import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
 import { z } from "zod";
-import { prisma } from "~/db.server";
-import { requireUserId } from "~/services/session.server";
 
 const ParamsSchema = z.object({
   projectRef: z.string(),
 });
 
 export async function loader({ params, request }: LoaderFunctionArgs) {
-  const userId = await requireUserId(request);
-
   const validatedParams = ParamsSchema.parse(params);
 
-  const project = await prisma.project.findFirst({
-    where: {
-      externalRef: validatedParams.projectRef,
-      organization: {
-        members: {
-          some: {
-            userId,
-          },
-        },
-      },
-    },
-    include: {
-      organization: true,
-    },
-  });
-
-  if (!project) {
-    return new Response("Not found", { status: 404 });
-  }
-
-  // Redirect to the project's runs page
-  return redirect(`/orgs/${project.organization.slug}/projects/${project.slug}`);
+  return redirect(`/projects/${validatedParams.projectRef}`);
 }
diff --git a/apps/webapp/app/routes/realtime.v1.streams.$runId.$streamId.ts b/apps/webapp/app/routes/realtime.v1.streams.$runId.$streamId.ts
index e648225c556..822c10a8101 100644
--- a/apps/webapp/app/routes/realtime.v1.streams.$runId.$streamId.ts
+++ b/apps/webapp/app/routes/realtime.v1.streams.$runId.$streamId.ts
@@ -1,22 +1,77 @@
-import { ActionFunctionArgs } from "@remix-run/server-runtime";
+import { type ActionFunctionArgs } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { $replica } from "~/db.server";
-import { relayRealtimeStreams } from "~/services/realtime/relayRealtimeStreams.server";
+import { getRealtimeStreamInstance } from "~/services/realtime/v1StreamsGlobal.server";
 import { createLoaderApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 
 const ParamsSchema = z.object({
   runId: z.string(),
   streamId: z.string(),
 });
 
+// Plain action for backwards compatibility with older clients that don't send auth headers
 export async function action({ request, params }: ActionFunctionArgs) {
-  const $params = ParamsSchema.parse(params);
+  const parsedParams = ParamsSchema.safeParse(params);
+
+  if (!parsedParams.success) {
+    return new Response("Invalid parameters", { status: 400 });
+  }
+
+  const { runId, streamId } = parsedParams.data;
+
+  // Look up the run without environment scoping for backwards compatibility
+  const run = await $replica.taskRun.findFirst({
+    where: {
+      friendlyId: runId,
+    },
+    select: {
+      id: true,
+      friendlyId: true,
+      runtimeEnvironment: {
+        include: {
+          project: true,
+          organization: true,
+          orgMember: true,
+        },
+      },
+    },
+  });
+
+  if (!run) {
+    return new Response("Run not found", { status: 404 });
+  }
+
+  // Extract client ID from header, default to "default" if not provided
+  const clientId = request.headers.get("X-Client-Id") || "default";
+  const streamVersion = request.headers.get("X-Stream-Version") || "v1";
 
   if (!request.body) {
     return new Response("No body provided", { status: 400 });
   }
 
-  return relayRealtimeStreams.ingestData(request.body, $params.runId, $params.streamId);
+  const resumeFromChunk = request.headers.get("X-Resume-From-Chunk");
+  let resumeFromChunkNumber: number | undefined = undefined;
+  if (resumeFromChunk) {
+    const parsed = parseInt(resumeFromChunk, 10);
+    if (isNaN(parsed) || parsed < 0) {
+      return new Response(`Invalid X-Resume-From-Chunk header value: ${resumeFromChunk}`, {
+        status: 400,
+      });
+    }
+    resumeFromChunkNumber = parsed;
+  }
+
+  // The runtimeEnvironment from the run is already in the correct shape for AuthenticatedEnvironment
+  const realtimeStream = getRealtimeStreamInstance(run.runtimeEnvironment, streamVersion);
+
+  return realtimeStream.ingestData(
+    request.body,
+    run.friendlyId,
+    streamId,
+    clientId,
+    resumeFromChunkNumber
+  );
 }
 
 export const loader = createLoaderApiRoute(
@@ -51,12 +106,32 @@ export const loader = createLoaderApiRoute(
     },
   },
   async ({ params, request, resource: run, authentication }) => {
-    return relayRealtimeStreams.streamResponse(
-      request,
-      run.friendlyId,
-      params.streamId,
+    // Get Last-Event-ID header for resuming from a specific position
+    const lastEventId = request.headers.get("Last-Event-ID") || undefined;
+
+    const timeoutInSecondsRaw = request.headers.get("Timeout-Seconds") ?? undefined;
+    const timeoutInSeconds = timeoutInSecondsRaw ? parseInt(timeoutInSecondsRaw) : undefined;
+
+    if (timeoutInSeconds && isNaN(timeoutInSeconds)) {
+      return new Response("Invalid timeout seconds", { status: 400 });
+    }
+
+    if (timeoutInSeconds && timeoutInSeconds < 1) {
+      return new Response("Timeout seconds must be greater than 0", { status: 400 });
+    }
+
+    if (timeoutInSeconds && timeoutInSeconds > 600) {
+      return new Response("Timeout seconds must be less than 600", { status: 400 });
+    }
+
+    const realtimeStream = getRealtimeStreamInstance(
       authentication.environment,
-      request.signal
+      run.realtimeStreamsVersion
     );
+
+    return realtimeStream.streamResponse(request, run.friendlyId, params.streamId, request.signal, {
+      lastEventId,
+      timeoutInSeconds,
+    });
   }
 );
diff --git a/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.append.ts b/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.append.ts
new file mode 100644
index 00000000000..facb6dd664f
--- /dev/null
+++ b/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.append.ts
@@ -0,0 +1,135 @@
+import { json } from "@remix-run/server-runtime";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { nanoid } from "nanoid";
+import { z } from "zod";
+import { $replica, prisma } from "~/db.server";
+import { getRealtimeStreamInstance } from "~/services/realtime/v1StreamsGlobal.server";
+import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { ServiceValidationError } from "~/v3/services/common.server";
+
+const ParamsSchema = z.object({
+  runId: z.string(),
+  target: z.enum(["self", "parent", "root"]),
+  streamId: z.string(),
+});
+
+const { action } = createActionApiRoute(
+  {
+    params: ParamsSchema,
+  },
+  async ({ request, params, authentication }) => {
+    const run = await $replica.taskRun.findFirst({
+      where: {
+        friendlyId: params.runId,
+        runtimeEnvironmentId: authentication.environment.id,
+      },
+      select: {
+        id: true,
+        friendlyId: true,
+        parentTaskRun: {
+          select: {
+            friendlyId: true,
+          },
+        },
+        rootTaskRun: {
+          select: {
+            friendlyId: true,
+          },
+        },
+      },
+    });
+
+    if (!run) {
+      return new Response("Run not found", { status: 404 });
+    }
+
+    const targetId =
+      params.target === "self"
+        ? run.friendlyId
+        : params.target === "parent"
+        ? run.parentTaskRun?.friendlyId
+        : run.rootTaskRun?.friendlyId;
+
+    if (!targetId) {
+      return new Response("Target not found", { status: 404 });
+    }
+
+    const targetRun = await prisma.taskRun.findFirst({
+      where: {
+        friendlyId: targetId,
+        runtimeEnvironmentId: authentication.environment.id,
+      },
+      select: {
+        realtimeStreams: true,
+        realtimeStreamsVersion: true,
+        completedAt: true,
+        id: true,
+      },
+    });
+
+    if (!targetRun) {
+      return new Response("Run not found", { status: 404 });
+    }
+
+    if (targetRun.completedAt) {
+      return new Response("Cannot append to a realtime stream on a completed run", {
+        status: 400,
+      });
+    }
+
+    if (!targetRun.realtimeStreams.includes(params.streamId)) {
+      await prisma.taskRun.update({
+        where: {
+          id: targetRun.id,
+        },
+        data: {
+          realtimeStreams: {
+            push: params.streamId,
+          },
+        },
+      });
+    }
+
+    const part = await request.text();
+
+    const realtimeStream = getRealtimeStreamInstance(
+      authentication.environment,
+      targetRun.realtimeStreamsVersion
+    );
+
+    const partId = request.headers.get("X-Part-Id") ?? nanoid(7);
+
+    const [appendError] = await tryCatch(
+      realtimeStream.appendPart(part, partId, targetId, params.streamId)
+    );
+
+    if (appendError) {
+      if (appendError instanceof ServiceValidationError) {
+        return json(
+          {
+            ok: false,
+            error: appendError.message,
+          },
+          { status: appendError.status ?? 422 }
+        );
+      } else {
+        return json(
+          {
+            ok: false,
+            error: appendError.message,
+          },
+          { status: 500 }
+        );
+      }
+    }
+
+    return json(
+      {
+        ok: true,
+      },
+      { status: 200 }
+    );
+  }
+);
+
+export { action };
diff --git a/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.ts b/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.ts
index 1735c556e1d..2a8d07053d9 100644
--- a/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.ts
+++ b/apps/webapp/app/routes/realtime.v1.streams.$runId.$target.$streamId.ts
@@ -1,7 +1,11 @@
+import { json } from "@remix-run/server-runtime";
 import { z } from "zod";
-import { $replica } from "~/db.server";
-import { relayRealtimeStreams } from "~/services/realtime/relayRealtimeStreams.server";
-import { createActionApiRoute } from "~/services/routeBuilders/apiBuilder.server";
+import { $replica, prisma } from "~/db.server";
+import { getRealtimeStreamInstance } from "~/services/realtime/v1StreamsGlobal.server";
+import {
+  createActionApiRoute,
+  createLoaderApiRoute,
+} from "~/services/routeBuilders/apiBuilder.server";
 
 const ParamsSchema = z.object({
   runId: z.string(),
@@ -14,10 +18,6 @@ const { action } = createActionApiRoute(
     params: ParamsSchema,
   },
   async ({ request, params, authentication }) => {
-    if (!request.body) {
-      return new Response("No body provided", { status: 400 });
-    }
-
     const run = await $replica.taskRun.findFirst({
       where: {
         friendlyId: params.runId,
@@ -54,8 +54,145 @@ const { action } = createActionApiRoute(
       return new Response("Target not found", { status: 404 });
     }
 
-    return relayRealtimeStreams.ingestData(request.body, targetId, params.streamId);
+    if (request.method === "PUT") {
+      // This is the "create" endpoint
+      const updatedRun = await prisma.taskRun.update({
+        where: {
+          friendlyId: targetId,
+          runtimeEnvironmentId: authentication.environment.id,
+        },
+        data: {
+          realtimeStreams: {
+            push: params.streamId,
+          },
+        },
+        select: {
+          realtimeStreamsVersion: true,
+          completedAt: true,
+        },
+      });
+
+      if (updatedRun.completedAt) {
+        return new Response("Cannot initialize a realtime stream on a completed run", {
+          status: 400,
+        });
+      }
+
+      const realtimeStream = getRealtimeStreamInstance(
+        authentication.environment,
+        updatedRun.realtimeStreamsVersion
+      );
+
+      const { responseHeaders } = await realtimeStream.initializeStream(targetId, params.streamId);
+
+      return json(
+        {
+          version: updatedRun.realtimeStreamsVersion,
+        },
+        { status: 202, headers: responseHeaders }
+      );
+    } else {
+      // Extract client ID from header, default to "default" if not provided
+      const clientId = request.headers.get("X-Client-Id") || "default";
+      const streamVersion = request.headers.get("X-Stream-Version") || "v1";
+
+      if (!request.body) {
+        return new Response("No body provided", { status: 400 });
+      }
+
+      const resumeFromChunk = request.headers.get("X-Resume-From-Chunk");
+      let resumeFromChunkNumber: number | undefined = undefined;
+      if (resumeFromChunk) {
+        const parsed = parseInt(resumeFromChunk, 10);
+        if (isNaN(parsed) || parsed < 0) {
+          return new Response(`Invalid X-Resume-From-Chunk header value: ${resumeFromChunk}`, {
+            status: 400,
+          });
+        }
+        resumeFromChunkNumber = parsed;
+      }
+
+      const realtimeStream = getRealtimeStreamInstance(authentication.environment, streamVersion);
+
+      return realtimeStream.ingestData(
+        request.body,
+        targetId,
+        params.streamId,
+        clientId,
+        resumeFromChunkNumber
+      );
+    }
+  }
+);
+
+const loader = createLoaderApiRoute(
+  {
+    params: ParamsSchema,
+    allowJWT: false,
+    corsStrategy: "none",
+    findResource: async (params, authentication) => {
+      return $replica.taskRun.findFirst({
+        where: {
+          friendlyId: params.runId,
+          runtimeEnvironmentId: authentication.environment.id,
+        },
+        select: {
+          id: true,
+          friendlyId: true,
+          parentTaskRun: {
+            select: {
+              friendlyId: true,
+            },
+          },
+          rootTaskRun: {
+            select: {
+              friendlyId: true,
+            },
+          },
+        },
+      });
+    },
+  },
+  async ({ request, params, resource: run, authentication }) => {
+    if (!run) {
+      return new Response("Run not found", { status: 404 });
+    }
+
+    const targetId =
+      params.target === "self"
+        ? run.friendlyId
+        : params.target === "parent"
+        ? run.parentTaskRun?.friendlyId
+        : run.rootTaskRun?.friendlyId;
+
+    if (!targetId) {
+      return new Response("Target not found", { status: 404 });
+    }
+
+    // Handle HEAD request to get last chunk index
+    if (request.method !== "HEAD") {
+      return new Response("Only HEAD requests are allowed for this endpoint", { status: 405 });
+    }
+
+    // Extract client ID from header, default to "default" if not provided
+    const clientId = request.headers.get("X-Client-Id") || "default";
+    const streamVersion = request.headers.get("X-Stream-Version") || "v1";
+
+    const realtimeStream = getRealtimeStreamInstance(authentication.environment, streamVersion);
+
+    const lastChunkIndex = await realtimeStream.getLastChunkIndex(
+      targetId,
+      params.streamId,
+      clientId
+    );
+
+    return new Response(null, {
+      status: 200,
+      headers: {
+        "X-Last-Chunk-Index": lastChunkIndex.toString(),
+      },
+    });
   }
 );
 
-export { action };
+export { action, loader };
diff --git a/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
new file mode 100644
index 00000000000..c802d115ad1
--- /dev/null
+++ b/apps/webapp/app/routes/resources.$projectId.deployments.$deploymentShortCode.cancel.ts
@@ -0,0 +1,133 @@
+import { parse } from "@conform-to/zod";
+import { type ActionFunction, json } from "@remix-run/node";
+import { errAsync, fromPromise, okAsync } from "neverthrow";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
+import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import { DeploymentService } from "~/v3/services/deployment.server";
+
+export const cancelSchema = z.object({
+  redirectUrl: z.string(),
+});
+
+const ParamSchema = z.object({
+  projectId: z.string(),
+  deploymentShortCode: z.string(),
+});
+
+export const action: ActionFunction = async ({ request, params }) => {
+  const userId = await requireUserId(request);
+  const { projectId, deploymentShortCode } = ParamSchema.parse(params);
+
+  const formData = await request.formData();
+  const submission = parse(formData, { schema: cancelSchema });
+
+  if (!submission.value) {
+    return json(submission);
+  }
+
+  const verifyProjectMembership = () =>
+    fromPromise(
+      prisma.project.findFirst({
+        where: {
+          id: projectId,
+          organization: {
+            members: {
+              some: {
+                userId,
+              },
+            },
+          },
+        },
+        select: {
+          id: true,
+        },
+      }),
+      (error) => ({ type: "other" as const, cause: error })
+    ).andThen((project) => {
+      if (!project) {
+        return errAsync({ type: "project_not_found" as const });
+      }
+      return okAsync(project);
+    });
+
+  const findDeploymentFriendlyId = ({ id }: { id: string }) =>
+    fromPromise(
+      prisma.workerDeployment.findUnique({
+        select: {
+          friendlyId: true,
+          projectId: true,
+        },
+        where: {
+          projectId_shortCode: {
+            projectId: id,
+            shortCode: deploymentShortCode,
+          },
+        },
+      }),
+      (error) => ({ type: "other" as const, cause: error })
+    ).andThen((deployment) => {
+      if (!deployment) {
+        return errAsync({ type: "deployment_not_found" as const });
+      }
+      return okAsync(deployment);
+    });
+
+  const deploymentService = new DeploymentService();
+  const result = await verifyProjectMembership()
+    .andThen(findDeploymentFriendlyId)
+    .andThen((deployment) =>
+      deploymentService.cancelDeployment({ projectId: deployment.projectId }, deployment.friendlyId)
+    );
+
+  if (result.isErr()) {
+    logger.error(
+      `Failed to cancel deployment: ${result.error.type}`,
+      result.error.type === "other"
+        ? {
+            cause: result.error.cause,
+          }
+        : undefined
+    );
+
+    switch (result.error.type) {
+      case "project_not_found":
+        return redirectWithErrorMessage(submission.value.redirectUrl, request, "Project not found");
+      case "deployment_not_found":
+        return redirectWithErrorMessage(
+          submission.value.redirectUrl,
+          request,
+          "Deployment not found"
+        );
+      case "deployment_cannot_be_cancelled":
+        return redirectWithErrorMessage(
+          submission.value.redirectUrl,
+          request,
+          "Deployment is already in a final state and cannot be canceled"
+        );
+      case "failed_to_delete_deployment_timeout":
+        // not a critical error, ignore
+        return redirectWithSuccessMessage(
+          submission.value.redirectUrl,
+          request,
+          `Canceled deployment ${deploymentShortCode}.`
+        );
+      case "other":
+      default:
+        result.error.type satisfies "other";
+        return redirectWithErrorMessage(
+          submission.value.redirectUrl,
+          request,
+          "Internal server error"
+        );
+    }
+  }
+
+  return redirectWithSuccessMessage(
+    submission.value.redirectUrl,
+    request,
+    `Canceled deployment ${deploymentShortCode}.`
+  );
+};
diff --git a/apps/webapp/app/routes/resources.branches.archive.tsx b/apps/webapp/app/routes/resources.branches.archive.tsx
index 6658738ce0d..57ba061bf01 100644
--- a/apps/webapp/app/routes/resources.branches.archive.tsx
+++ b/apps/webapp/app/routes/resources.branches.archive.tsx
@@ -37,7 +37,12 @@ export async function action({ request }: ActionFunctionArgs) {
 
   const archiveBranchService = new ArchiveBranchService();
 
-  const result = await archiveBranchService.call(userId, submission.value);
+  const result = await archiveBranchService.call(
+    { type: "userMembership", userId },
+    {
+      environmentId: submission.value.environmentId,
+    }
+  );
 
   if (result.success) {
     return redirectWithSuccessMessage(
diff --git a/apps/webapp/app/routes/resources.environments.$envId.runs.tags.tsx b/apps/webapp/app/routes/resources.environments.$envId.runs.tags.tsx
new file mode 100644
index 00000000000..1c0805b8954
--- /dev/null
+++ b/apps/webapp/app/routes/resources.environments.$envId.runs.tags.tsx
@@ -0,0 +1,66 @@
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { timeFilters } from "~/components/runs/v3/SharedFilters";
+import { $replica } from "~/db.server";
+import { RunTagListPresenter } from "~/presenters/v3/RunTagListPresenter.server";
+import { requireUserId } from "~/services/session.server";
+
+const Params = z.object({
+  envId: z.string(),
+});
+
+const SearchParams = z.object({
+  name: z.string().optional(),
+  period: z.preprocess((value) => (value === "all" ? undefined : value), z.string().optional()),
+  from: z.coerce.number().optional(),
+  to: z.coerce.number().optional(),
+});
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { envId } = Params.parse(params);
+
+  const environment = await $replica.runtimeEnvironment.findFirst({
+    select: {
+      id: true,
+      projectId: true,
+      organizationId: true,
+    },
+    where: { id: envId, organization: { members: { some: { userId } } } },
+  });
+
+  if (!environment) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const search = new URL(request.url).searchParams;
+
+  const parsedSearchParams = SearchParams.safeParse({
+    name: search.get("name") ?? undefined,
+    period: search.get("period") ?? undefined,
+    from: search.get("from") ?? undefined,
+    to: search.get("to") ?? undefined,
+  });
+
+  if (!parsedSearchParams.success) {
+    throw new Response("Invalid search params", { status: 400 });
+  }
+
+  const { period, from, to } = timeFilters({
+    period: parsedSearchParams.data.period,
+    from: parsedSearchParams.data.from,
+    to: parsedSearchParams.data.to,
+  });
+
+  const presenter = new RunTagListPresenter();
+  const result = await presenter.call({
+    environmentId: environment.id,
+    projectId: environment.projectId,
+    organizationId: environment.organizationId,
+    name: parsedSearchParams.data.name,
+    period,
+    from,
+    to,
+  });
+  return result;
+}
diff --git a/apps/webapp/app/routes/resources.environments.$environmentId.regenerate-api-key.tsx b/apps/webapp/app/routes/resources.environments.$environmentId.regenerate-api-key.tsx
index 7ad6b1c6c57..5efb69bc723 100644
--- a/apps/webapp/app/routes/resources.environments.$environmentId.regenerate-api-key.tsx
+++ b/apps/webapp/app/routes/resources.environments.$environmentId.regenerate-api-key.tsx
@@ -2,8 +2,10 @@ import type { ActionFunctionArgs } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { environmentFullTitle } from "~/components/environments/EnvironmentLabel";
 import { regenerateApiKey } from "~/models/api-key.server";
+import { VercelIntegrationRepository } from "~/models/vercelIntegration.server";
 import { jsonWithErrorMessage, jsonWithSuccessMessage } from "~/models/message.server";
 import { requireUserId } from "~/services/session.server";
+import { logger } from "~/services/logger.server";
 
 const ParamsSchema = z.object({
   environmentId: z.string(),
@@ -19,9 +21,21 @@ export async function action({ request, params }: ActionFunctionArgs) {
 
   const { environmentId } = ParamsSchema.parse(params);
 
+  const formData = await request.formData();
+  const syncToVercel = formData.get("syncToVercel") === "on";
+
   try {
     const updatedEnvironment = await regenerateApiKey({ userId, environmentId });
 
+    // Sync the regenerated API key to Vercel only when requested and not for DEVELOPMENT
+    if (syncToVercel && updatedEnvironment.type !== "DEVELOPMENT") {
+      await syncApiKeyToVercel(
+        updatedEnvironment.projectId,
+        updatedEnvironment.type as "PRODUCTION" | "STAGING" | "PREVIEW",
+        updatedEnvironment.apiKey
+      );
+    }
+
     return jsonWithSuccessMessage(
       { ok: true },
       request,
@@ -37,3 +51,27 @@ export async function action({ request, params }: ActionFunctionArgs) {
     );
   }
 }
+
+/**
+ * Sync the API key to Vercel.
+ * Errors are logged but won't fail the API key regeneration.
+ */
+async function syncApiKeyToVercel(
+  projectId: string,
+  environmentType: "PRODUCTION" | "STAGING" | "PREVIEW" | "DEVELOPMENT",
+  apiKey: string
+): Promise<void> {
+  const result = await VercelIntegrationRepository.syncSingleApiKeyToVercel({
+    projectId,
+    environmentType,
+    apiKey,
+  });
+
+  if (result.isErr()) {
+    logger.warn("syncSingleApiKeyToVercel returned failure", {
+      projectId,
+      environmentType,
+      error: result.error.message,
+    });
+  }
+}
diff --git a/apps/webapp/app/routes/resources.feedback.ts b/apps/webapp/app/routes/resources.feedback.ts
index 6ea572a91c3..a6271c9d5ad 100644
--- a/apps/webapp/app/routes/resources.feedback.ts
+++ b/apps/webapp/app/routes/resources.feedback.ts
@@ -15,6 +15,7 @@ export const feedbackTypeLabel = {
   enterprise: "Enterprise enquiry",
   feedback: "General feedback",
   concurrency: "Increase my concurrency",
+  region: "Suggest a new region",
 };
 
 export type FeedbackType = keyof typeof feedbackTypeLabel;
diff --git a/apps/webapp/app/routes/resources.incidents.tsx b/apps/webapp/app/routes/resources.incidents.tsx
index 319242c8d80..d9e107e5454 100644
--- a/apps/webapp/app/routes/resources.incidents.tsx
+++ b/apps/webapp/app/routes/resources.incidents.tsx
@@ -1,83 +1,158 @@
 import { ExclamationTriangleIcon } from "@heroicons/react/20/solid";
 import { json } from "@remix-run/node";
-import { useFetcher } from "@remix-run/react";
-import { useCallback, useEffect } from "react";
+import { useFetcher, type ShouldRevalidateFunction } from "@remix-run/react";
 import { motion } from "framer-motion";
+import { useEffect, useRef } from "react";
 import { LinkButton } from "~/components/primitives/Buttons";
 import { Paragraph } from "~/components/primitives/Paragraph";
+import { Popover, PopoverContent, PopoverTrigger } from "~/components/primitives/Popover";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import { useFeatures } from "~/hooks/useFeatures";
-import { BetterStackClient } from "~/services/betterstack/betterstack.server";
+import { BetterStackClient, type AggregateState } from "~/services/betterstack/betterstack.server";
+
+// Prevent Remix from revalidating this route when other fetchers submit
+export const shouldRevalidate: ShouldRevalidateFunction = () => false;
+
+export type IncidentLoaderData = {
+  status: AggregateState;
+  title: string | null;
+};
 
 export async function loader() {
   const client = new BetterStackClient();
-  const result = await client.getIncidents();
+  const result = await client.getIncidentStatus();
 
   if (!result.success) {
-    return json({ operational: true });
+    return json<IncidentLoaderData>({ status: "operational", title: null });
   }
 
-  return json({
-    operational: result.data.attributes.aggregate_state === "operational",
+  return json<IncidentLoaderData>({
+    status: result.data.status,
+    title: result.data.title,
   });
 }
 
-export function IncidentStatusPanel() {
-  const { isManagedCloud } = useFeatures();
-  if (!isManagedCloud) {
-    return null;
-  }
+const DEFAULT_MESSAGE =
+  "Our team is working on resolving the issue. Check our status page for more information.";
+
+const POLL_INTERVAL_MS = 60_000;
 
+/** Hook to fetch and poll incident status */
+export function useIncidentStatus() {
+  const { isManagedCloud } = useFeatures();
   const fetcher = useFetcher<typeof loader>();
+  const hasInitiallyFetched = useRef(false);
+
+  useEffect(() => {
+    if (!isManagedCloud) return;
 
-  const fetchIncidents = useCallback(() => {
-    if (fetcher.state === "idle") {
+    // Initial fetch on mount
+    if (!hasInitiallyFetched.current && fetcher.state === "idle") {
+      hasInitiallyFetched.current = true;
       fetcher.load("/resources/incidents");
     }
-  }, [fetcher]);
 
-  useEffect(() => {
-    fetchIncidents();
-
-    const interval = setInterval(fetchIncidents, 60 * 1000); // 1 minute
+    // Poll every 60 seconds
+    const interval = setInterval(() => {
+      if (fetcher.state === "idle") {
+        fetcher.load("/resources/incidents");
+      }
+    }, POLL_INTERVAL_MS);
 
     return () => clearInterval(interval);
-  }, []);
+  }, [isManagedCloud]);
+
+  return {
+    status: fetcher.data?.status ?? "operational",
+    title: fetcher.data?.title ?? null,
+    hasIncident: (fetcher.data?.status ?? "operational") !== "operational",
+    isManagedCloud,
+  };
+}
+
+export function IncidentStatusPanel({
+  isCollapsed = false,
+  title,
+  hasIncident,
+  isManagedCloud,
+}: {
+  isCollapsed?: boolean;
+  title: string | null;
+  hasIncident: boolean;
+  isManagedCloud: boolean;
+}) {
+  if (!isManagedCloud || !hasIncident) {
+    return null;
+  }
 
-  const operational = fetcher.data?.operational ?? true;
+  const message = title || DEFAULT_MESSAGE;
 
   return (
-    <>
-      {!operational && (
+    <Popover>
+      <div className="p-1">
+        <motion.div
+          initial={false}
+          animate={{
+            height: isCollapsed ? 0 : "auto",
+            opacity: isCollapsed ? 0 : 1,
+          }}
+          transition={{ duration: 0.15 }}
+          className="overflow-hidden"
+        >
+          <IncidentPanelContent message={message} />
+        </motion.div>
+
         <motion.div
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={{ opacity: 0 }}
-          transition={{ duration: 0.3 }}
-          className="p-1"
+          initial={false}
+          animate={{
+            height: isCollapsed ? "auto" : 0,
+            opacity: isCollapsed ? 1 : 0,
+          }}
+          transition={{ duration: 0.15 }}
+          className="overflow-hidden"
         >
-          <div className="flex flex-col gap-2 rounded border border-warning/20 bg-warning/5 p-2 pt-1.5">
-            <div className="flex items-center gap-1 border-b border-warning/20 pb-1 text-warning">
-              <ExclamationTriangleIcon className="size-4" />
-              <Paragraph variant="small/bright" className="text-warning">
-                Active incident
-              </Paragraph>
-            </div>
-            <Paragraph variant="extra-small/bright" className="text-warning/80">
-              Our team is working on resolving the issue. Check our status page for more
-              information.
-            </Paragraph>
-            <LinkButton
-              variant="secondary/small"
-              to="https://status.trigger.dev"
-              target="_blank"
-              fullWidth
-              className="border-warning/20 bg-warning/10 hover:!border-warning/30 hover:!bg-warning/20"
-            >
-              <span className="text-warning">View status page</span>
-            </LinkButton>
-          </div>
+          <SimpleTooltip
+            button={
+              <PopoverTrigger className="flex !h-8 w-full items-center justify-center rounded border border-yellow-500/30 bg-yellow-500/15 transition-colors hover:border-yellow-500/50 hover:bg-yellow-500/25">
+                <ExclamationTriangleIcon className="size-5 text-yellow-400" />
+              </PopoverTrigger>
+            }
+            content="Active incident"
+            side="right"
+            sideOffset={8}
+            disableHoverableContent
+            asChild
+          />
         </motion.div>
-      )}
-    </>
+      </div>
+      <PopoverContent side="right" sideOffset={8} align="start" className="!min-w-0 w-52 p-0">
+        <IncidentPanelContent message={message} />
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+function IncidentPanelContent({ message }: { message: string }) {
+  return (
+    <div className="flex flex-col gap-2 rounded border border-yellow-500/30 bg-yellow-500/10 p-2 pt-1.5">
+      <div className="flex items-center gap-1 border-b border-yellow-500/30 pb-1">
+        <ExclamationTriangleIcon className="size-4 text-yellow-400" />
+        <Paragraph variant="small/bright" className="text-yellow-300">
+          Active incident
+        </Paragraph>
+      </div>
+      <Paragraph variant="extra-small/bright" className="text-yellow-300">
+        {message}
+      </Paragraph>
+      <LinkButton
+        variant="secondary/small"
+        to="https://status.trigger.dev"
+        target="_blank"
+        fullWidth
+        className="border-yellow-500/30 bg-yellow-500/15 hover:!border-yellow-500/50 hover:!bg-yellow-500/25"
+      >
+        <span className="text-yellow-300">View status page</span>
+      </LinkButton>
+    </div>
   );
 }
diff --git a/apps/webapp/app/routes/resources.metric.tsx b/apps/webapp/app/routes/resources.metric.tsx
new file mode 100644
index 00000000000..a037fb78823
--- /dev/null
+++ b/apps/webapp/app/routes/resources.metric.tsx
@@ -0,0 +1,284 @@
+import type { OutputColumnMetadata } from "@internal/clickhouse";
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { z } from "zod";
+import { requireUserId } from "~/services/session.server";
+import { hasAccessToEnvironment } from "~/models/runtimeEnvironment.server";
+import { executeQuery } from "~/services/queryService.server";
+import {
+  QueryWidget,
+  type QueryWidgetConfig,
+  type QueryWidgetData,
+} from "~/components/metrics/QueryWidget";
+import { useElementVisibility } from "~/hooks/useElementVisibility";
+import { useInterval } from "~/hooks/useInterval";
+import { env } from "~/env.server";
+
+const Scope = z.union([z.literal("environment"), z.literal("organization"), z.literal("project")]);
+
+// Response type for the action
+type MetricWidgetActionResponse =
+  | { success: false; error: string }
+  | {
+      success: true;
+      data: {
+        rows: Record<string, unknown>[];
+        columns: OutputColumnMetadata[];
+        stats: { elapsed_ns: string } | null;
+        hiddenColumns: string[] | null;
+        reachedMaxRows: boolean;
+        periodClipped: number | null;
+        maxQueryPeriod: number | undefined;
+        timeRange: { from: string; to: string };
+      };
+    };
+
+const MetricWidgetQuery = z.object({
+  query: z.string(),
+  organizationId: z.string(),
+  projectId: z.string(),
+  environmentId: z.string(),
+  scope: Scope,
+  period: z.string().nullable(),
+  from: z.string().nullable(),
+  to: z.string().nullable(),
+  taskIdentifiers: z.array(z.string()).optional(),
+  queues: z.array(z.string()).optional(),
+  tags: z.array(z.string()).optional(),
+});
+
+export const action = async ({ request }: ActionFunctionArgs) => {
+  const userId = await requireUserId(request);
+
+  const data = await request.json();
+  const submission = MetricWidgetQuery.safeParse(data);
+
+  if (!submission.success) {
+    return json(
+      {
+        success: false as const,
+        error: "Invalid input",
+      },
+      { status: 400 }
+    );
+  }
+
+  const {
+    query,
+    organizationId,
+    projectId,
+    environmentId,
+    scope,
+    period,
+    from,
+    to,
+    taskIdentifiers,
+    queues,
+    tags,
+  } = submission.data;
+
+  // Check they should be able to access it
+  const hasAccess = await hasAccessToEnvironment({
+    environmentId,
+    projectId,
+    organizationId,
+    userId,
+  });
+
+  if (!hasAccess) {
+    return json(
+      {
+        success: false as const,
+        error: "You don't have permission for this resource",
+      },
+      { status: 400 }
+    );
+  }
+
+  const queryResult = await executeQuery({
+    name: "query-page",
+    query,
+    scope,
+    organizationId,
+    projectId,
+    environmentId,
+    period,
+    from,
+    to,
+    taskIdentifiers,
+    queues,
+    // Set higher concurrency if many widgets are on screen at once
+    customOrgConcurrencyLimit: env.METRIC_WIDGET_DEFAULT_ORG_CONCURRENCY_LIMIT,
+  });
+
+  if (!queryResult.success) {
+    return json(
+      {
+        success: false as const,
+        error: queryResult.error.message,
+      },
+      { status: 400 }
+    );
+  }
+
+  return json({
+    success: true as const,
+    data: {
+      rows: queryResult.result.rows,
+      columns: queryResult.result.columns,
+      stats: queryResult.result.stats,
+      hiddenColumns: queryResult.result.hiddenColumns ?? null,
+      reachedMaxRows: queryResult.result.reachedMaxRows,
+      periodClipped: queryResult.periodClipped,
+      maxQueryPeriod: queryResult.maxQueryPeriod,
+      timeRange: {
+        from: queryResult.timeRange.from.toISOString(),
+        to: queryResult.timeRange.to.toISOString(),
+      },
+    },
+  });
+};
+
+type MetricWidgetProps = {
+  /** Unique key for this widget - used to identify the fetcher */
+  widgetKey: string;
+  title: string;
+  config: QueryWidgetConfig;
+  refreshIntervalMs?: number;
+  isResizing?: boolean;
+  isDraggable?: boolean;
+  /** Callback when edit button is clicked - receives current data */
+  onEdit?: (data: QueryWidgetData) => void;
+  /** Callback when rename is clicked - receives new title */
+  onRename?: (newTitle: string) => void;
+  /** Callback when delete is clicked */
+  onDelete?: () => void;
+  /** Callback when duplicate is clicked - receives current data */
+  onDuplicate?: (data: QueryWidgetData) => void;
+} & z.infer<typeof MetricWidgetQuery>;
+
+export function MetricWidget({
+  widgetKey,
+  title,
+  config,
+  refreshIntervalMs,
+  isResizing,
+  isDraggable,
+  onEdit,
+  onRename,
+  onDelete,
+  onDuplicate,
+  ...props
+}: MetricWidgetProps) {
+  const [response, setResponse] = useState<MetricWidgetActionResponse | null>(null);
+  const [isLoading, setIsLoading] = useState(false);
+  const abortControllerRef = useRef<AbortController | null>(null);
+
+  // Track the latest props so the submit callback always uses fresh values
+  // without needing to be recreated (which would cause useInterval to re-register listeners).
+  const propsRef = useRef(props);
+  propsRef.current = props;
+
+  const submit = useCallback(() => {
+    // Skip fetching if the widget is not visible on screen
+    if (!isVisibleRef.current) return;
+
+    // Abort any in-flight request for this widget
+    abortControllerRef.current?.abort();
+
+    const controller = new AbortController();
+    abortControllerRef.current = controller;
+    setIsLoading(true);
+
+    fetch(`/resources/metric`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(propsRef.current),
+      signal: controller.signal,
+    })
+      .then(async (res) => {
+        try {
+          return (await res.json()) as MetricWidgetActionResponse;
+        } catch {
+          throw new Error(`Request failed (${res.status})`);
+        }
+      })
+      .then((data) => {
+        if (!controller.signal.aborted) {
+          setResponse(data);
+          setIsLoading(false);
+        }
+      })
+      .catch((err) => {
+        if (err instanceof DOMException && err.name === "AbortError") return;
+        if (!controller.signal.aborted) {
+          // Only surface the error if there's no existing successful data to preserve
+          setResponse((prev) =>
+            prev?.success ? prev : { success: false, error: err.message || "Network error" }
+          );
+          setIsLoading(false);
+        }
+      });
+  }, []);
+
+  // Track visibility so we only fetch for on-screen widgets.
+  // When a widget scrolls into view and has no data yet, trigger a load.
+  const { ref: visibilityRef, isVisibleRef } = useElementVisibility({
+    onVisibilityChange: (visible) => {
+      if (visible && !response) {
+        submit();
+      }
+    },
+  });
+
+  // Clean up on unmount
+  useEffect(() => {
+    return () => {
+      abortControllerRef.current?.abort();
+    };
+  }, []);
+
+  // Reload periodically and on focus (onLoad: false — the useEffect below handles initial load)
+  useInterval({ interval: refreshIntervalMs, callback: submit, onLoad: false });
+
+  // Reload on mount and when query, time period, or filters change
+  useEffect(() => {
+    submit();
+  }, [
+    submit,
+    props.query,
+    props.from,
+    props.to,
+    props.period,
+    props.scope,
+    JSON.stringify(props.taskIdentifiers),
+    JSON.stringify(props.queues),
+  ]);
+
+  const data = response?.success
+    ? { rows: response.data.rows, columns: response.data.columns }
+    : { rows: [], columns: [] };
+
+  const timeRange = response?.success ? response.data.timeRange : undefined;
+
+  return (
+    <div ref={visibilityRef} className="h-full">
+      <QueryWidget
+        title={title}
+        titleString={title}
+        query={props.query}
+        config={config}
+        isLoading={isLoading}
+        data={data}
+        timeRange={timeRange}
+        error={response?.success === false ? response.error : undefined}
+        isResizing={isResizing}
+        isDraggable={isDraggable}
+        onEdit={onEdit}
+        onRename={onRename}
+        onDelete={onDelete}
+        onDuplicate={onDuplicate}
+      />
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.can-view-logs-page/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.can-view-logs-page/route.tsx
new file mode 100644
index 00000000000..2d205d90c10
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.can-view-logs-page/route.tsx
@@ -0,0 +1,53 @@
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { typedjson } from "remix-typedjson";
+import { requireUser } from "~/services/session.server";
+import { prisma } from "~/db.server";
+import { FEATURE_FLAG, validateFeatureFlagValue } from "~/v3/featureFlags.server";
+import { OrganizationParamsSchema } from "~/utils/pathBuilder";
+
+async function hasLogsPageAccess(
+  userId: string,
+  isAdmin: boolean,
+  isImpersonating: boolean,
+  organizationSlug: string
+): Promise<boolean> {
+  if (isAdmin || isImpersonating) {
+    return true;
+  }
+
+  const organization = await prisma.organization.findFirst({
+    where: {
+      slug: organizationSlug,
+      members: { some: { userId } },
+    },
+    select: {
+      featureFlags: true,
+    },
+  });
+
+  if (!organization?.featureFlags) {
+    return false;
+  }
+
+  const flags = organization.featureFlags as Record<string, unknown>;
+  const hasLogsPageAccessResult = validateFeatureFlagValue(
+    FEATURE_FLAG.hasLogsPageAccess,
+    flags.hasLogsPageAccess
+  );
+
+  return hasLogsPageAccessResult.success && hasLogsPageAccessResult.data === true;
+}
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const { organizationSlug } = OrganizationParamsSchema.parse(params);
+
+  const canViewLogsPage = user.admin || user.isImpersonating || await hasLogsPageAccess(
+    user.id,
+    user.admin,
+    user.isImpersonating,
+    organizationSlug
+  );
+
+  return typedjson({ canViewLogsPage });
+};
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.$dashboardId.widgets.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.$dashboardId.widgets.tsx
new file mode 100644
index 00000000000..51bbded5932
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.$dashboardId.widgets.tsx
@@ -0,0 +1,492 @@
+import { type ActionFunctionArgs } from "@remix-run/node";
+import { nanoid } from "nanoid";
+import { z } from "zod";
+import { typedjson } from "remix-typedjson";
+import { prisma } from "~/db.server";
+import { QueryWidgetConfig } from "~/components/metrics/QueryWidget";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import {
+  DashboardLayout,
+  LayoutItem,
+} from "~/presenters/v3/MetricDashboardPresenter.server";
+import { getCurrentPlan } from "~/services/platform.v3.server";
+import { requireUserId } from "~/services/session.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
+
+// Schemas for each action type
+const AddWidgetSchema = z.object({
+  widgetId: z.string().min(1, "Widget ID is required").nullish(),
+  title: z.string().min(1, "Title is required"),
+  query: z.string().default(""),
+  config: z.string().transform((str, ctx) => {
+    try {
+      const parsed = JSON.parse(str);
+      const result = QueryWidgetConfig.safeParse(parsed);
+      if (!result.success) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Invalid widget config",
+        });
+        return z.NEVER;
+      }
+      return result.data;
+    } catch {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Invalid JSON",
+      });
+      return z.NEVER;
+    }
+  }),
+});
+
+const UpdateWidgetSchema = z.object({
+  widgetId: z.string().min(1, "Widget ID is required"),
+  title: z.string().min(1, "Title is required"),
+  query: z.string().min(1, "Query is required"),
+  config: z.string().transform((str, ctx) => {
+    try {
+      const parsed = JSON.parse(str);
+      const result = QueryWidgetConfig.safeParse(parsed);
+      if (!result.success) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Invalid widget config",
+        });
+        return z.NEVER;
+      }
+      return result.data;
+    } catch {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Invalid JSON",
+      });
+      return z.NEVER;
+    }
+  }),
+});
+
+const RenameWidgetSchema = z.object({
+  widgetId: z.string().min(1, "Widget ID is required"),
+  title: z.string().min(1, "Title is required"),
+});
+
+const DeleteWidgetSchema = z.object({
+  widgetId: z.string().min(1, "Widget ID is required"),
+});
+
+const DuplicateWidgetSchema = z.object({
+  widgetId: z.string().min(1, "Widget ID is required"),
+  newId: z.string().min(1, "New widget ID is required").nullish(),
+});
+
+const SaveLayoutSchema = z.object({
+  layout: z.string().transform((str, ctx) => {
+    try {
+      const parsed = JSON.parse(str);
+      const result = z.array(LayoutItem).safeParse(parsed);
+      if (!result.success) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Invalid layout format",
+        });
+        return z.NEVER;
+      }
+      return result.data;
+    } catch {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: "Invalid JSON",
+      });
+      return z.NEVER;
+    }
+  }),
+});
+
+const ParamsSchema = EnvironmentParamSchema.extend({
+  dashboardId: z.string(),
+});
+
+// Check widget limit for add/duplicate actions (title widgets don't count)
+async function checkWidgetLimit(
+  existingLayout: z.infer<typeof DashboardLayout>,
+  organizationId: string
+) {
+  const currentWidgetCount = Object.values(existingLayout.widgets).filter(
+    (w) => w.display.type !== "title"
+  ).length;
+  const plan = await getCurrentPlan(organizationId);
+  const metricWidgetsLimitValue = (plan?.v3Subscription?.plan?.limits as any)
+    ?.metricWidgetsPerDashboard;
+  const widgetLimit =
+    typeof metricWidgetsLimitValue === "number"
+      ? metricWidgetsLimitValue
+      : (metricWidgetsLimitValue?.number ?? 16);
+
+  if (currentWidgetCount >= widgetLimit) {
+    throw new Response("Widget limit reached", { status: 403 });
+  }
+}
+
+// Optimistic concurrency save: uses updateMany so we can include updatedAt
+// in the where clause. If another request modified the dashboard between our
+// read and this write, updatedAt won't match and count will be 0.
+async function saveDashboardLayout(
+  dashboardId: string,
+  expectedUpdatedAt: Date,
+  updatedLayout: z.infer<typeof DashboardLayout>
+) {
+  const result = await prisma.metricsDashboard.updateMany({
+    where: { id: dashboardId, updatedAt: expectedUpdatedAt },
+    data: {
+      layout: JSON.stringify(updatedLayout),
+    },
+  });
+
+  if (result.count === 0) {
+    throw new Response(
+      "Dashboard was modified by another request. Please refresh and try again.",
+      { status: 409 }
+    );
+  }
+}
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam, dashboardId } = ParamsSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Environment not found", { status: 404 });
+  }
+
+  // Load the dashboard
+  const dashboard = await prisma.metricsDashboard.findFirst({
+    where: {
+      friendlyId: dashboardId,
+      organizationId: project.organizationId,
+    },
+  });
+
+  if (!dashboard) {
+    throw new Response("Dashboard not found", { status: 404 });
+  }
+
+  const formData = await request.formData();
+  const action = formData.get("action");
+
+  // Parse existing layout (shared across all actions)
+  let existingLayout: z.infer<typeof DashboardLayout>;
+  try {
+    const parsed = JSON.parse(dashboard.layout);
+    const layoutResult = DashboardLayout.safeParse(parsed);
+    if (!layoutResult.success) {
+      // For add action, we can start with empty layout
+      if (action === "add") {
+        existingLayout = {
+          version: "1",
+          layout: [],
+          widgets: {},
+        };
+      } else {
+        throw new Response("Invalid dashboard layout", { status: 500 });
+      }
+    } else {
+      existingLayout = layoutResult.data;
+    }
+  } catch (e) {
+    if (e instanceof Response) throw e;
+    if (action === "add") {
+      existingLayout = {
+        version: "1",
+        layout: [],
+        widgets: {},
+      };
+    } else {
+      throw new Response("Failed to parse dashboard layout", { status: 500 });
+    }
+  }
+
+  switch (action) {
+    case "add": {
+      const rawData = {
+        widgetId: formData.get("widgetId"),
+        title: formData.get("title"),
+        query: formData.get("query"),
+        config: formData.get("config"),
+      };
+
+      const result = AddWidgetSchema.safeParse(rawData);
+      if (!result.success) {
+        throw new Response("Invalid form data: " + result.error.message, { status: 400 });
+      }
+
+      const { title, query, config } = result.data;
+
+      // Validate that non-title widgets have a query
+      if (config.type !== "title" && !query) {
+        throw new Response("Query is required for chart widgets", { status: 400 });
+      }
+
+      // Title widgets don't count against the limit
+      if (config.type !== "title") {
+        await checkWidgetLimit(existingLayout, project.organizationId);
+      }
+
+      // Use client-provided widget ID if available, otherwise generate one
+      // Using the client's ID ensures optimistic UI state stays in sync with the server
+      const widgetId = result.data.widgetId || nanoid(8);
+
+      // Calculate position at the bottom
+      let maxBottom = 0;
+      for (const item of existingLayout.layout) {
+        const itemBottom = item.y + item.h;
+        if (itemBottom > maxBottom) {
+          maxBottom = itemBottom;
+        }
+      }
+
+      // Add new layout item (full width, height depends on widget type)
+      const newLayoutItem = {
+        i: widgetId,
+        x: 0,
+        y: maxBottom,
+        w: 12,
+        h: config.type === "title" ? 2 : 15,
+      };
+
+      // Add new widget
+      const newWidget = {
+        title,
+        query,
+        display: config,
+      };
+
+      // Update the layout
+      const updatedLayout = {
+        ...existingLayout,
+        layout: [...existingLayout.layout, newLayoutItem],
+        widgets: {
+          ...existingLayout.widgets,
+          [widgetId]: newWidget,
+        },
+      };
+
+      // Save to database (with optimistic concurrency check)
+      await saveDashboardLayout(dashboard.id, dashboard.updatedAt, updatedLayout);
+
+      return typedjson({ success: true, widgetId });
+    }
+
+    case "update": {
+      const rawData = {
+        widgetId: formData.get("widgetId"),
+        title: formData.get("title"),
+        query: formData.get("query"),
+        config: formData.get("config"),
+      };
+
+      const result = UpdateWidgetSchema.safeParse(rawData);
+      if (!result.success) {
+        throw new Response("Invalid form data: " + result.error.message, { status: 400 });
+      }
+
+      const { widgetId, title, query, config } = result.data;
+
+      // Check if widget exists
+      if (!existingLayout.widgets[widgetId]) {
+        throw new Response("Widget not found", { status: 404 });
+      }
+
+      // Update the widget
+      const updatedWidget = {
+        title,
+        query,
+        display: config,
+      };
+
+      // Update the layout
+      const updatedLayout = {
+        ...existingLayout,
+        widgets: {
+          ...existingLayout.widgets,
+          [widgetId]: updatedWidget,
+        },
+      };
+
+      // Save to database (with optimistic concurrency check)
+      await saveDashboardLayout(dashboard.id, dashboard.updatedAt, updatedLayout);
+
+      return typedjson({ success: true, updatedTitle: title });
+    }
+
+    case "rename": {
+      const rawData = {
+        widgetId: formData.get("widgetId"),
+        title: formData.get("title"),
+      };
+
+      const result = RenameWidgetSchema.safeParse(rawData);
+      if (!result.success) {
+        throw new Response("Invalid form data: " + result.error.message, { status: 400 });
+      }
+
+      const { widgetId, title } = result.data;
+
+      // Check if widget exists
+      if (!existingLayout.widgets[widgetId]) {
+        throw new Response("Widget not found", { status: 404 });
+      }
+
+      // Update just the title
+      const updatedLayout = {
+        ...existingLayout,
+        widgets: {
+          ...existingLayout.widgets,
+          [widgetId]: {
+            ...existingLayout.widgets[widgetId],
+            title,
+          },
+        },
+      };
+
+      // Save to database (with optimistic concurrency check)
+      await saveDashboardLayout(dashboard.id, dashboard.updatedAt, updatedLayout);
+
+      return typedjson({ success: true, renamedTitle: title });
+    }
+
+    case "delete": {
+      const rawData = {
+        widgetId: formData.get("widgetId"),
+      };
+
+      const result = DeleteWidgetSchema.safeParse(rawData);
+      if (!result.success) {
+        throw new Response("Invalid form data: " + result.error.message, { status: 400 });
+      }
+
+      const { widgetId } = result.data;
+
+      // Get widget title before deleting (for the success message)
+      const widget = existingLayout.widgets[widgetId];
+      const widgetTitle = widget?.title ?? "Widget";
+
+      // Remove widget from layout and widgets
+      const updatedLayout = {
+        ...existingLayout,
+        layout: existingLayout.layout.filter((item) => item.i !== widgetId),
+        widgets: Object.fromEntries(
+          Object.entries(existingLayout.widgets).filter(([key]) => key !== widgetId)
+        ),
+      };
+
+      // Save to database (with optimistic concurrency check)
+      await saveDashboardLayout(dashboard.id, dashboard.updatedAt, updatedLayout);
+
+      return typedjson({ success: true, deletedTitle: widgetTitle });
+    }
+
+    case "duplicate": {
+      await checkWidgetLimit(existingLayout, project.organizationId);
+
+      const rawData = {
+        widgetId: formData.get("widgetId"),
+        newId: formData.get("newId"),
+      };
+
+      const result = DuplicateWidgetSchema.safeParse(rawData);
+      if (!result.success) {
+        throw new Response("Invalid form data: " + result.error.message, { status: 400 });
+      }
+
+      const { widgetId } = result.data;
+
+      // Find the original widget
+      const originalWidget = existingLayout.widgets[widgetId];
+      if (!originalWidget) {
+        throw new Response("Widget not found", { status: 404 });
+      }
+
+      // Find the original layout item
+      const originalLayoutItem = existingLayout.layout.find((item) => item.i === widgetId);
+      if (!originalLayoutItem) {
+        throw new Response("Widget layout not found", { status: 404 });
+      }
+
+      // Use client-provided ID if available, otherwise generate one
+      // Using the client's ID ensures optimistic UI state stays in sync with the server
+      const newWidgetId = result.data.newId || nanoid(8);
+
+      // Calculate position at the bottom
+      let maxBottom = 0;
+      for (const item of existingLayout.layout) {
+        const itemBottom = item.y + item.h;
+        if (itemBottom > maxBottom) {
+          maxBottom = itemBottom;
+        }
+      }
+
+      // Create new layout item with same dimensions but at the bottom
+      const newLayoutItem = {
+        i: newWidgetId,
+        x: 0,
+        y: maxBottom,
+        w: originalLayoutItem.w,
+        h: originalLayoutItem.h,
+      };
+
+      // Create new widget with "(Copy)" suffix
+      const newWidget = {
+        ...originalWidget,
+        title: `${originalWidget.title} (Copy)`,
+      };
+
+      // Update the layout
+      const updatedLayout = {
+        ...existingLayout,
+        layout: [...existingLayout.layout, newLayoutItem],
+        widgets: {
+          ...existingLayout.widgets,
+          [newWidgetId]: newWidget,
+        },
+      };
+
+      // Save to database (with optimistic concurrency check)
+      await saveDashboardLayout(dashboard.id, dashboard.updatedAt, updatedLayout);
+
+      return typedjson({ success: true, duplicatedTitle: originalWidget.title });
+    }
+
+    case "layout": {
+      const result = SaveLayoutSchema.safeParse({
+        layout: formData.get("layout"),
+      });
+
+      if (!result.success) {
+        throw new Response("Invalid form data: " + result.error.message, { status: 400 });
+      }
+
+      // Update layout positions while preserving widgets
+      const updatedLayout = {
+        ...existingLayout,
+        layout: result.data.layout,
+      };
+
+      // Save to database (with optimistic concurrency check)
+      await saveDashboardLayout(dashboard.id, dashboard.updatedAt, updatedLayout);
+
+      return typedjson({ success: true });
+    }
+
+    default: {
+      throw new Response("Invalid action", { status: 400 });
+    }
+  }
+};
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.create.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.create.tsx
new file mode 100644
index 00000000000..1e33b3b6817
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dashboards.create.tsx
@@ -0,0 +1,84 @@
+import { redirect, type ActionFunctionArgs } from "@remix-run/node";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { getCurrentPlan } from "~/services/platform.v3.server";
+import { requireUserId } from "~/services/session.server";
+import { EnvironmentParamSchema, v3CustomDashboardPath } from "~/utils/pathBuilder";
+import { generateFriendlyId } from "~/v3/friendlyIdentifiers";
+
+const CreateDashboardSchema = z.object({
+  title: z.string().min(1, "Title is required"),
+  description: z.string().optional().default(""),
+});
+
+export const action = async ({ request, params }: ActionFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  // Check dashboard limit
+  const [plan, existingCount] = await Promise.all([
+    getCurrentPlan(project.organizationId),
+    prisma.metricsDashboard.count({
+      where: { organizationId: project.organizationId },
+    }),
+  ]);
+
+  const metricDashboardsLimitValue = (plan?.v3Subscription?.plan?.limits as any)
+    ?.metricDashboards;
+  const dashboardLimit =
+    typeof metricDashboardsLimitValue === "number"
+      ? metricDashboardsLimitValue
+      : (metricDashboardsLimitValue?.number ?? 3);
+
+  if (existingCount >= dashboardLimit) {
+    throw new Response("Dashboard limit reached", { status: 403 });
+  }
+
+  const formData = await request.formData();
+  const rawData = {
+    title: formData.get("title"),
+    description: formData.get("description") ?? "",
+  };
+
+  const result = CreateDashboardSchema.safeParse(rawData);
+  if (!result.success) {
+    throw new Response("Invalid form data", { status: 400 });
+  }
+
+  const { title, description } = result.data;
+
+  // Create empty default layout
+  const defaultLayout = JSON.stringify({
+    version: "1",
+    layout: [],
+    widgets: {},
+  });
+
+  const dashboard = await prisma.metricsDashboard.create({
+    data: {
+      friendlyId: generateFriendlyId("dashboard"),
+      title,
+      description,
+      organizationId: project.organizationId,
+      projectId: project.id,
+      ownerId: userId,
+      layout: defaultLayout,
+    },
+  });
+
+  // Redirect to the new dashboard
+  return redirect(
+    v3CustomDashboardPath(
+      { slug: organizationSlug },
+      { slug: projectParam },
+      { slug: envParam },
+      { friendlyId: dashboard.friendlyId }
+    )
+  );
+};
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
new file mode 100644
index 00000000000..afd89f33577
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
@@ -0,0 +1,903 @@
+import { conform, useForm } from "@conform-to/react";
+import { parse } from "@conform-to/zod";
+import { CheckCircleIcon, LockClosedIcon, PlusIcon } from "@heroicons/react/20/solid";
+import { Form, useActionData, useNavigation, useNavigate, useSearchParams, useLocation } from "@remix-run/react";
+import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
+import { typedjson, useTypedFetcher } from "remix-typedjson";
+import { z } from "zod";
+import { OctoKitty } from "~/components/GitHubLoginButton";
+import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Fieldset } from "~/components/primitives/Fieldset";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { FormError } from "~/components/primitives/FormError";
+import { Hint } from "~/components/primitives/Hint";
+import { Input } from "~/components/primitives/Input";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { Label } from "~/components/primitives/Label";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { Select, SelectItem } from "~/components/primitives/Select";
+import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { Switch } from "~/components/primitives/Switch";
+import { TextLink } from "~/components/primitives/TextLink";
+import { DateTime } from "~/components/primitives/DateTime";
+import { InfoIconTooltip } from "~/components/primitives/Tooltip";
+import {
+  EnvironmentIcon,
+  environmentFullTitle,
+  environmentTextClassName,
+} from "~/components/environments/EnvironmentLabel";
+import { GitBranchIcon } from "lucide-react";
+import {
+  redirectBackWithErrorMessage,
+  redirectBackWithSuccessMessage,
+  redirectWithErrorMessage,
+  redirectWithSuccessMessage,
+} from "~/models/message.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { ProjectSettingsService } from "~/services/projectSettings.server";
+import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import {
+  githubAppInstallPath,
+  EnvironmentParamSchema,
+  v3ProjectSettingsPath,
+} from "~/utils/pathBuilder";
+import { cn } from "~/utils/cn";
+import { type BranchTrackingConfig } from "~/v3/github";
+import { GitHubSettingsPresenter } from "~/presenters/v3/GitHubSettingsPresenter.server";
+import { useEffect, useState } from "react";
+
+// ============================================================================
+// Types
+// ============================================================================
+
+export type GitHubRepository = {
+  id: string;
+  name: string;
+  fullName: string;
+  private: boolean;
+  htmlUrl: string;
+};
+
+export type GitHubAppInstallation = {
+  id: string;
+  appInstallationId: bigint;
+  targetType: string;
+  accountHandle: string;
+  repositories: GitHubRepository[];
+};
+
+export type ConnectedGitHubRepo = {
+  branchTracking: BranchTrackingConfig | undefined;
+  previewDeploymentsEnabled: boolean;
+  createdAt: Date;
+  repository: GitHubRepository;
+};
+
+// ============================================================================
+// Schemas
+// ============================================================================
+
+export const ConnectGitHubRepoFormSchema = z.object({
+  action: z.literal("connect-repo"),
+  installationId: z.string(),
+  repositoryId: z.string(),
+  redirectUrl: z.string().optional(),
+});
+
+export const DisconnectGitHubRepoFormSchema = z.object({
+  action: z.literal("disconnect-repo"),
+  redirectUrl: z.string().optional(),
+});
+
+export const UpdateGitSettingsFormSchema = z.object({
+  action: z.literal("update-git-settings"),
+  productionBranch: z.string().trim().optional(),
+  stagingBranch: z.string().trim().optional(),
+  previewDeploymentsEnabled: z
+    .string()
+    .optional()
+    .transform((val) => val === "on"),
+  redirectUrl: z.string().optional(),
+});
+
+const GitHubActionSchema = z.discriminatedUnion("action", [
+  ConnectGitHubRepoFormSchema,
+  DisconnectGitHubRepoFormSchema,
+  UpdateGitSettingsFormSchema,
+]);
+
+// ============================================================================
+// Loader
+// ============================================================================
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const presenter = new GitHubSettingsPresenter();
+  const resultOrFail = await presenter.call({
+    projectId: project.id,
+    organizationId: project.organizationId,
+  });
+
+  if (resultOrFail.isErr()) {
+    throw new Response("Failed to load GitHub settings", { status: 500 });
+  }
+
+  return typedjson(resultOrFail.value);
+}
+
+// ============================================================================
+// Action
+// ============================================================================
+
+function redirectWithMessage(
+  request: Request,
+  redirectUrl: string | undefined,
+  message: string,
+  type: "success" | "error"
+) {
+  if (type === "success") {
+    return redirectUrl
+      ? redirectWithSuccessMessage(redirectUrl, request, message)
+      : redirectBackWithSuccessMessage(request, message);
+  }
+  return redirectUrl
+    ? redirectWithErrorMessage(redirectUrl, request, message)
+    : redirectBackWithErrorMessage(request, message);
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const formData = await request.formData();
+  const submission = parse(formData, { schema: GitHubActionSchema });
+
+  if (!submission.value || submission.intent !== "submit") {
+    return json(submission);
+  }
+
+  const projectSettingsService = new ProjectSettingsService();
+  const membershipResultOrFail = await projectSettingsService.verifyProjectMembership(
+    organizationSlug,
+    projectParam,
+    userId
+  );
+
+  if (membershipResultOrFail.isErr()) {
+    return json({ errors: { body: membershipResultOrFail.error.type } }, { status: 404 });
+  }
+
+  const { projectId, organizationId } = membershipResultOrFail.value;
+  const { action: actionType } = submission.value;
+
+  // Handle connect-repo action
+  if (actionType === "connect-repo") {
+    const { repositoryId, installationId, redirectUrl } = submission.value;
+
+    const resultOrFail = await projectSettingsService.connectGitHubRepo(
+      projectId,
+      organizationId,
+      repositoryId,
+      installationId
+    );
+
+    if (resultOrFail.isOk()) {
+      return redirectWithMessage(
+        request,
+        redirectUrl,
+        "GitHub repository connected successfully",
+        "success"
+      );
+    }
+
+    const errorType = resultOrFail.error.type;
+
+    if (errorType === "gh_repository_not_found") {
+      return redirectWithMessage(request, redirectUrl, "GitHub repository not found", "error");
+    }
+
+    if (errorType === "project_already_has_connected_repository") {
+      return redirectWithMessage(
+        request,
+        redirectUrl,
+        "Project already has a connected repository",
+        "error"
+      );
+    }
+
+    logger.error("Failed to connect GitHub repository", { error: resultOrFail.error });
+    return redirectWithMessage(
+      request,
+      redirectUrl,
+      "Failed to connect GitHub repository",
+      "error"
+    );
+  }
+
+  // Handle disconnect-repo action
+  if (actionType === "disconnect-repo") {
+    const { redirectUrl } = submission.value;
+
+    const resultOrFail = await projectSettingsService.disconnectGitHubRepo(projectId);
+
+    if (resultOrFail.isOk()) {
+      return redirectWithMessage(
+        request,
+        redirectUrl,
+        "GitHub repository disconnected successfully",
+        "success"
+      );
+    }
+
+    logger.error("Failed to disconnect GitHub repository", { error: resultOrFail.error });
+    return redirectWithMessage(
+      request,
+      redirectUrl,
+      "Failed to disconnect GitHub repository",
+      "error"
+    );
+  }
+
+  // Handle update-git-settings action
+  if (actionType === "update-git-settings") {
+    const { productionBranch, stagingBranch, previewDeploymentsEnabled, redirectUrl } =
+      submission.value;
+
+    const resultOrFail = await projectSettingsService.updateGitSettings(
+      projectId,
+      productionBranch,
+      stagingBranch,
+      previewDeploymentsEnabled
+    );
+
+    if (resultOrFail.isOk()) {
+      return redirectWithMessage(
+        request,
+        redirectUrl,
+        "Git settings updated successfully",
+        "success"
+      );
+    }
+
+    const errorType = resultOrFail.error.type;
+
+    const errorMessages: Record<string, string> = {
+      github_app_not_enabled: "GitHub app is not enabled",
+      connected_gh_repository_not_found: "Connected GitHub repository not found",
+      production_tracking_branch_not_found: "Production tracking branch not found",
+      staging_tracking_branch_not_found: "Staging tracking branch not found",
+    };
+
+    const message = errorMessages[errorType];
+    if (message) {
+      return redirectWithMessage(request, redirectUrl, message, "error");
+    }
+
+    logger.error("Failed to update Git settings", { error: resultOrFail.error });
+    return redirectWithMessage(request, redirectUrl, "Failed to update Git settings", "error");
+  }
+
+  // Exhaustive check - this should never be reached
+  submission.value satisfies never;
+  return redirectBackWithErrorMessage(request, "Failed to process request");
+}
+
+// ============================================================================
+// Helper: Build resource URL for fetching GitHub data
+// ============================================================================
+
+export function gitHubResourcePath(
+  organizationSlug: string,
+  projectSlug: string,
+  environmentSlug: string
+) {
+  return `/resources/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/github`;
+}
+
+// ============================================================================
+// Components
+// ============================================================================
+
+export function ConnectGitHubRepoModal({
+  gitHubAppInstallations,
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  redirectUrl,
+  preventDismiss,
+}: {
+  gitHubAppInstallations: GitHubAppInstallation[];
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  redirectUrl?: string;
+  /** When true, prevents closing the modal via Escape key or clicking outside */
+  preventDismiss?: boolean;
+}) {
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const lastSubmission = useActionData() as any;
+  const navigate = useNavigate();
+
+  const [selectedInstallation, setSelectedInstallation] = useState<
+    GitHubAppInstallation | undefined
+  >(gitHubAppInstallations.at(0));
+
+  const [selectedRepository, setSelectedRepository] = useState<GitHubRepository | undefined>(
+    undefined
+  );
+
+  const navigation = useNavigation();
+  const isConnectRepositoryLoading =
+    navigation.formData?.get("action") === "connect-repo" &&
+    (navigation.state === "submitting" || navigation.state === "loading");
+
+  const [form, { installationId, repositoryId }] = useForm({
+    id: "connect-repo",
+    lastSubmission: lastSubmission,
+    shouldRevalidate: "onSubmit",
+    onValidate({ formData }) {
+      return parse(formData, {
+        schema: ConnectGitHubRepoFormSchema,
+      });
+    },
+  });
+
+  const [searchParams, setSearchParams] = useSearchParams();
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams);
+
+    if (params.get("openGithubRepoModal") === "1") {
+      setIsModalOpen(true);
+      params.delete("openGithubRepoModal");
+      setSearchParams(params);
+    }
+  }, [searchParams, setSearchParams]);
+
+  useEffect(() => {
+    if (lastSubmission && "success" in lastSubmission && lastSubmission.success === true) {
+      setIsModalOpen(false);
+    }
+  }, [lastSubmission]);
+
+  const actionUrl = gitHubResourcePath(organizationSlug, projectSlug, environmentSlug);
+
+  return (
+    <Dialog
+      open={isModalOpen}
+      onOpenChange={(open) => {
+        // When preventDismiss is true, only allow opening, not closing
+        if (preventDismiss && !open) {
+          return;
+        }
+        setIsModalOpen(open);
+      }}
+    >
+      <DialogTrigger asChild>
+        <Button type="button" variant={"secondary/medium"} LeadingIcon={OctoKitty}>
+          Connect GitHub repo
+        </Button>
+      </DialogTrigger>
+      <DialogContent
+        showCloseButton={!preventDismiss}
+        onInteractOutside={(e) => {
+          if (preventDismiss) {
+            e.preventDefault();
+          }
+        }}
+        onEscapeKeyDown={(e) => {
+          if (preventDismiss) {
+            e.preventDefault();
+          }
+        }}
+      >
+        <DialogHeader>Connect GitHub repository</DialogHeader>
+        <div className="mt-2 flex flex-col gap-4">
+          <Form method="post" action={actionUrl} {...form.props} className="w-full">
+            {redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
+            <Paragraph className="mb-3">
+              Choose a GitHub repository to connect to your project.
+            </Paragraph>
+            <Fieldset className="max-w-full gap-y-3">
+              <InputGroup className="max-w-full">
+                <Label htmlFor={installationId.id}>Account</Label>
+                <Select
+                  name={installationId.name}
+                  id={installationId.id}
+                  value={selectedInstallation?.id}
+                  defaultValue={gitHubAppInstallations.at(0)?.id}
+                  setValue={(value) => {
+                    if (Array.isArray(value)) return;
+                    const installation = gitHubAppInstallations.find((i) => i.id === value);
+                    setSelectedInstallation(installation);
+                    setSelectedRepository(undefined);
+                  }}
+                  items={gitHubAppInstallations}
+                  variant="tertiary/small"
+                  placeholder="Select account"
+                  dropdownIcon
+                  text={selectedInstallation ? selectedInstallation.accountHandle : undefined}
+                >
+                  {[
+                    ...gitHubAppInstallations.map((installation) => (
+                      <SelectItem
+                        key={installation.id}
+                        value={installation.id}
+                        icon={<OctoKitty className="size-3 text-text-dimmed" />}
+                      >
+                        {installation.accountHandle}
+                      </SelectItem>
+                    )),
+                    <SelectItem
+                      onClick={(e) => {
+                        e.preventDefault();
+                        navigate(
+                          githubAppInstallPath(
+                            organizationSlug,
+                            `${v3ProjectSettingsPath(
+                              { slug: organizationSlug },
+                              { slug: projectSlug },
+                              { slug: environmentSlug }
+                            )}?openGithubRepoModal=1`
+                          )
+                        );
+                      }}
+                      key="new-account"
+                      icon={<PlusIcon className="size-3 text-text-dimmed" />}
+                    >
+                      Add account
+                    </SelectItem>,
+                  ]}
+                </Select>
+                <FormError id={installationId.errorId}>{installationId.error}</FormError>
+              </InputGroup>
+              <InputGroup className="max-w-full">
+                <Label htmlFor={repositoryId.id}>Repository</Label>
+                <Select
+                  name={repositoryId.name}
+                  id={repositoryId.id}
+                  value={selectedRepository ? selectedRepository.id : undefined}
+                  setValue={(value) => {
+                    if (Array.isArray(value)) return;
+                    const repository = selectedInstallation?.repositories.find(
+                      (r) => r.id === value
+                    );
+                    setSelectedRepository(repository);
+                  }}
+                  variant="tertiary/small"
+                  placeholder="Select repository"
+                  heading="Filter repositories"
+                  dropdownIcon
+                  items={selectedInstallation?.repositories ?? []}
+                  filter={{ keys: ["name"] }}
+                  disabled={!selectedInstallation || selectedInstallation.repositories.length === 0}
+                  text={selectedRepository ? selectedRepository.name : null}
+                >
+                  {(matches) =>
+                    matches.map((repo) => (
+                      <SelectItem key={repo.id} value={repo.id}>
+                        <div className="flex items-center gap-1">
+                          {repo.name}
+                          {repo.private && <LockClosedIcon className="size-3 text-text-dimmed" />}
+                        </div>
+                      </SelectItem>
+                    ))
+                  }
+                </Select>
+                <Hint className={cn("invisible", selectedInstallation && "visible")}>
+                  Configure repository access in{" "}
+                  <TextLink
+                    target="_blank"
+                    rel="noreferrer noopener"
+                    to={`https://github.com/settings/installations/${selectedInstallation?.appInstallationId}`}
+                  >
+                    GitHub
+                  </TextLink>
+                  .
+                </Hint>
+                <FormError id={repositoryId.errorId}>{repositoryId.error}</FormError>
+              </InputGroup>
+              <FormError>{form.error}</FormError>
+              <FormButtons
+                confirmButton={
+                  <Button
+                    type="submit"
+                    name="action"
+                    value="connect-repo"
+                    variant="primary/medium"
+                    LeadingIcon={isConnectRepositoryLoading ? SpinnerWhite : undefined}
+                    leadingIconClassName="text-white"
+                    disabled={isConnectRepositoryLoading}
+                  >
+                    Connect repository
+                  </Button>
+                }
+                cancelButton={
+                  preventDismiss ? undefined : (
+                    <DialogClose asChild>
+                      <Button variant="tertiary/medium">Cancel</Button>
+                    </DialogClose>
+                  )
+                }
+              />
+            </Fieldset>
+          </Form>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+export function GitHubConnectionPrompt({
+  gitHubAppInstallations,
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  redirectUrl,
+}: {
+  gitHubAppInstallations: GitHubAppInstallation[];
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  redirectUrl?: string;
+}) {
+
+  const githubInstallationRedirect = redirectUrl || v3ProjectSettingsPath({ slug: organizationSlug }, { slug: projectSlug }, { slug: environmentSlug });
+  return (
+    <Fieldset>
+      <InputGroup fullWidth>
+        {gitHubAppInstallations.length === 0 && (
+          <LinkButton
+            to={githubAppInstallPath(
+              organizationSlug,
+              `${githubInstallationRedirect}?openGithubRepoModal=1`
+            )}
+            variant={"secondary/medium"}
+            LeadingIcon={OctoKitty}
+          >
+            Install GitHub app
+          </LinkButton>
+        )}
+        {gitHubAppInstallations.length !== 0 && (
+          <div className="flex items-center gap-3">
+            <ConnectGitHubRepoModal
+              gitHubAppInstallations={gitHubAppInstallations}
+              organizationSlug={organizationSlug}
+              projectSlug={projectSlug}
+              environmentSlug={environmentSlug}
+              redirectUrl={redirectUrl}
+            />
+            <span className="flex items-center gap-1 text-xs text-text-dimmed">
+              <CheckCircleIcon className="size-4 text-success" /> GitHub app is installed
+            </span>
+          </div>
+        )}
+      </InputGroup>
+    </Fieldset>
+  );
+}
+
+export function ConnectedGitHubRepoForm({
+  connectedGitHubRepo,
+  previewEnvironmentEnabled,
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  billingPath,
+  redirectUrl,
+}: {
+  connectedGitHubRepo: ConnectedGitHubRepo;
+  previewEnvironmentEnabled?: boolean;
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  billingPath: string;
+  redirectUrl?: string;
+}) {
+  const lastSubmission = useActionData() as any;
+  const navigation = useNavigation();
+
+  const [hasGitSettingsChanges, setHasGitSettingsChanges] = useState(false);
+  const [gitSettingsValues, setGitSettingsValues] = useState({
+    productionBranch: connectedGitHubRepo.branchTracking?.prod?.branch || "",
+    stagingBranch: connectedGitHubRepo.branchTracking?.staging?.branch || "",
+    previewDeploymentsEnabled: connectedGitHubRepo.previewDeploymentsEnabled,
+  });
+
+  useEffect(() => {
+    const hasChanges =
+      gitSettingsValues.productionBranch !==
+        (connectedGitHubRepo.branchTracking?.prod?.branch || "") ||
+      gitSettingsValues.stagingBranch !==
+        (connectedGitHubRepo.branchTracking?.staging?.branch || "") ||
+      gitSettingsValues.previewDeploymentsEnabled !== connectedGitHubRepo.previewDeploymentsEnabled;
+    setHasGitSettingsChanges(hasChanges);
+  }, [gitSettingsValues, connectedGitHubRepo]);
+
+  const [gitSettingsForm, fields] = useForm({
+    id: "update-git-settings",
+    lastSubmission: lastSubmission,
+    shouldRevalidate: "onSubmit",
+    onValidate({ formData }) {
+      return parse(formData, {
+        schema: UpdateGitSettingsFormSchema,
+      });
+    },
+  });
+
+  const isGitSettingsLoading =
+    navigation.formData?.get("action") === "update-git-settings" &&
+    (navigation.state === "submitting" || navigation.state === "loading");
+
+  const actionUrl = gitHubResourcePath(organizationSlug, projectSlug, environmentSlug);
+
+  return (
+    <>
+      <div className="mb-4 flex items-center justify-between rounded-sm border bg-grid-dimmed p-2">
+        <div className="flex items-center gap-2">
+          <OctoKitty className="size-4" />
+          <a
+            href={connectedGitHubRepo.repository.htmlUrl}
+            target="_blank"
+            rel="noreferrer noopener"
+            className="max-w-52 truncate text-sm text-text-bright hover:underline"
+          >
+            {connectedGitHubRepo.repository.fullName}
+          </a>
+          {connectedGitHubRepo.repository.private && (
+            <LockClosedIcon className="size-3 text-text-dimmed" />
+          )}
+          <span className="text-xs text-text-dimmed">
+            <DateTime
+              date={connectedGitHubRepo.createdAt}
+              includeTime={false}
+              includeSeconds={false}
+              showTimezone={false}
+              showTooltip={false}
+            />
+          </span>
+        </div>
+        <Dialog>
+          <DialogTrigger asChild>
+            <Button variant="minimal/small">Disconnect</Button>
+          </DialogTrigger>
+          <DialogContent className="max-w-md">
+            <DialogHeader>Disconnect GitHub repository</DialogHeader>
+            <div className="flex flex-col gap-3 pt-3">
+              <Paragraph className="mb-1">
+                Are you sure you want to disconnect{" "}
+                <span className="font-semibold">{connectedGitHubRepo.repository.fullName}</span>?
+                This will stop automatic deployments from GitHub.
+              </Paragraph>
+              <FormButtons
+                confirmButton={
+                  <Form method="post" action={actionUrl}>
+                    <input type="hidden" name="action" value="disconnect-repo" />
+                    {redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
+                    <Button type="submit" variant="danger/medium">
+                      Disconnect repository
+                    </Button>
+                  </Form>
+                }
+                cancelButton={
+                  <DialogClose asChild>
+                    <Button variant="tertiary/medium">Cancel</Button>
+                  </DialogClose>
+                }
+              />
+            </div>
+          </DialogContent>
+        </Dialog>
+      </div>
+
+      <Form method="post" action={actionUrl} {...gitSettingsForm.props}>
+        {redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
+        <Fieldset>
+          <InputGroup fullWidth>
+            <Hint>
+              Every push to the selected tracking branch creates a deployment in the corresponding
+              environment.
+            </Hint>
+            <div className="mt-1 grid grid-cols-[120px_1fr] gap-3">
+              <div className="flex items-center gap-1.5">
+                <EnvironmentIcon environment={{ type: "PRODUCTION" }} className="size-4" />
+                <span className={`text-sm ${environmentTextClassName({ type: "PRODUCTION" })}`}>
+                  {environmentFullTitle({ type: "PRODUCTION" })}
+                </span>
+              </div>
+              <Input
+                {...conform.input(fields.productionBranch, { type: "text" })}
+                defaultValue={connectedGitHubRepo.branchTracking?.prod?.branch}
+                placeholder="none"
+                variant="tertiary"
+                className="font-mono"
+                icon={GitBranchIcon}
+                onChange={(e) => {
+                  setGitSettingsValues((prev) => ({
+                    ...prev,
+                    productionBranch: e.target.value,
+                  }));
+                }}
+              />
+              <div className="flex items-center gap-1.5">
+                <EnvironmentIcon environment={{ type: "STAGING" }} className="size-4" />
+                <span className={`text-sm ${environmentTextClassName({ type: "STAGING" })}`}>
+                  {environmentFullTitle({ type: "STAGING" })}
+                </span>
+              </div>
+              <Input
+                {...conform.input(fields.stagingBranch, { type: "text" })}
+                defaultValue={connectedGitHubRepo.branchTracking?.staging?.branch}
+                placeholder="none"
+                variant="tertiary"
+                className="font-mono"
+                icon={GitBranchIcon}
+                onChange={(e) => {
+                  setGitSettingsValues((prev) => ({
+                    ...prev,
+                    stagingBranch: e.target.value,
+                  }));
+                }}
+              />
+
+              <div className="flex items-center gap-1.5">
+                <EnvironmentIcon environment={{ type: "PREVIEW" }} className="size-4" />
+                <span className={`text-sm ${environmentTextClassName({ type: "PREVIEW" })}`}>
+                  {environmentFullTitle({ type: "PREVIEW" })}
+                </span>
+              </div>
+              <div className="flex items-center gap-1.5">
+                <Switch
+                  name="previewDeploymentsEnabled"
+                  disabled={!previewEnvironmentEnabled}
+                  defaultChecked={
+                    connectedGitHubRepo.previewDeploymentsEnabled && previewEnvironmentEnabled
+                  }
+                  variant="small"
+                  label="Create preview deployments for pull requests"
+                  labelPosition="right"
+                  onCheckedChange={(checked) => {
+                    setGitSettingsValues((prev) => ({
+                      ...prev,
+                      previewDeploymentsEnabled: checked,
+                    }));
+                  }}
+                />
+                {!previewEnvironmentEnabled && (
+                  <InfoIconTooltip
+                    content={
+                      <span className="text-xs">
+                        <TextLink to={billingPath}>Upgrade</TextLink> your plan to enable preview
+                        branches
+                      </span>
+                    }
+                  />
+                )}
+              </div>
+            </div>
+            <FormError>{fields.productionBranch?.error}</FormError>
+            <FormError>{fields.stagingBranch?.error}</FormError>
+            <FormError>{fields.previewDeploymentsEnabled?.error}</FormError>
+            <FormError>{gitSettingsForm.error}</FormError>
+          </InputGroup>
+
+          <FormButtons
+            confirmButton={
+              <Button
+                type="submit"
+                name="action"
+                value="update-git-settings"
+                variant="secondary/small"
+                disabled={isGitSettingsLoading || !hasGitSettingsChanges}
+                LeadingIcon={isGitSettingsLoading ? SpinnerWhite : undefined}
+              >
+                Save
+              </Button>
+            }
+          />
+        </Fieldset>
+      </Form>
+    </>
+  );
+}
+
+// ============================================================================
+// Main GitHub Settings Panel Component
+// ============================================================================
+
+export function GitHubSettingsPanel({
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  billingPath,
+}: {
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  billingPath: string;
+}) {
+  const fetcher = useTypedFetcher<typeof loader>();
+  const location = useLocation();
+
+  // Use provided redirectUrl or fall back to current path (without search params)
+  const effectiveRedirectUrl = location.pathname;
+  useEffect(() => {
+    fetcher.load(gitHubResourcePath(organizationSlug, projectSlug, environmentSlug));
+  }, [organizationSlug, projectSlug, environmentSlug]);
+
+  const data = fetcher.data;
+
+  // Loading state
+  if (fetcher.state === "loading" && !data) {
+    return (
+      <div className="flex items-center gap-2 text-text-dimmed">
+        <SpinnerWhite className="size-4" />
+        <span className="text-sm">Loading GitHub settings...</span>
+      </div>
+    );
+  }
+
+  // GitHub app not enabled
+  if (!data || !data.enabled) {
+    return null;
+  }
+
+  // Connected repository exists - show form
+  if (data.connectedRepository) {
+    return (
+      <ConnectedGitHubRepoForm
+        connectedGitHubRepo={data.connectedRepository}
+        previewEnvironmentEnabled={data.isPreviewEnvironmentEnabled}
+        organizationSlug={organizationSlug}
+        projectSlug={projectSlug}
+        environmentSlug={environmentSlug}
+        billingPath={billingPath}
+        redirectUrl={effectiveRedirectUrl}
+      />
+    );
+  }
+
+  // No connected repository - show connection prompt
+  return (
+    <div className="flex flex-col gap-2">
+      <GitHubConnectionPrompt
+        gitHubAppInstallations={data.installations ?? []}
+        organizationSlug={organizationSlug}
+        projectSlug={projectSlug}
+        environmentSlug={environmentSlug}
+        redirectUrl={effectiveRedirectUrl}
+      />
+      {!data.connectedRepository && (
+        <Hint>
+          Connect your GitHub repository to automatically deploy your changes.
+        </Hint>
+      )}
+    </div>
+    
+  );
+}
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.$logId.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.$logId.tsx
new file mode 100644
index 00000000000..f862ced6b05
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.$logId.tsx
@@ -0,0 +1,83 @@
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { typedjson } from "remix-typedjson";
+import { z } from "zod";
+import { logsClickhouseClient } from "~/services/clickhouseInstance.server";
+import { requireUserId } from "~/services/session.server";
+import { LogDetailPresenter } from "~/presenters/v3/LogDetailPresenter.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { $replica } from "~/db.server";
+import { ServiceValidationError } from "~/v3/services/baseService.server";
+import type { TaskRunStatus } from "@trigger.dev/database";
+
+const LogIdParamsSchema = z.object({
+  organizationSlug: z.string(),
+  projectParam: z.string(),
+  envParam: z.string(),
+  logId: z.string(),
+});
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam, logId } = LogIdParamsSchema.parse(params);
+
+  // Validate access to project and environment
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Environment not found", { status: 404 });
+  }
+
+  // Parse logId to extract traceId, spanId, runId, and startTime
+  // Format: {traceId}::{spanId}::{runId}::{startTime}
+  // All 4 parts are needed to uniquely identify a log entry (multiple events can share the same spanId)
+  const decodedLogId = decodeURIComponent(logId);
+  const parts = decodedLogId.split("::");
+  if (parts.length !== 4) {
+    throw new Response("Invalid log ID format", { status: 400 });
+  }
+
+  const [traceId, spanId, , startTime] = parts;
+
+  const presenter = new LogDetailPresenter($replica, logsClickhouseClient);
+
+  let result;
+  try {
+    result = await presenter.call({
+      environmentId: environment.id,
+      organizationId: project.organizationId,
+      projectId: project.id,
+      spanId,
+      traceId,
+      startTime,
+    });
+  } catch (error) {
+    if (error instanceof ServiceValidationError) {
+      throw new Response(error.message, { status: 400 });
+    }
+    throw error;
+  }
+
+  if (!result) {
+    throw new Response("Log not found", { status: 404 });
+  }
+
+  // Look up the run status from Postgres
+  let runStatus: TaskRunStatus | undefined;
+  if (result.runId) {
+    const run = await $replica.taskRun.findFirst({
+      select: { status: true },
+      where: {
+        friendlyId: result.runId,
+        runtimeEnvironmentId: environment.id,
+      },
+    });
+    runStatus = run?.status;
+  }
+
+  return typedjson({ ...result, runStatus });
+};
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.ts b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.ts
new file mode 100644
index 00000000000..66ddebe4e2a
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.logs.ts
@@ -0,0 +1,79 @@
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { json } from "@remix-run/node";
+import { requireUser, requireUserId } from "~/services/session.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { LogsListPresenter, type LogLevel, LogsListOptionsSchema } from "~/presenters/v3/LogsListPresenter.server";
+import { $replica } from "~/db.server";
+import { logsClickhouseClient } from "~/services/clickhouseInstance.server";
+import { getCurrentPlan } from "~/services/platform.v3.server";
+
+// Valid log levels for filtering
+const validLevels: LogLevel[] = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
+
+function parseLevelsFromUrl(url: URL): LogLevel[] | undefined {
+  const levelParams = url.searchParams.getAll("levels").filter((v) => v.length > 0);
+  if (levelParams.length === 0) return undefined;
+  return levelParams.filter((l): l is LogLevel => validLevels.includes(l as LogLevel));
+}
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const user = await requireUser(request);
+  const userId = user.id;
+
+  const { projectParam, organizationSlug, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Environment not found", { status: 404 });
+  }
+
+  // Get the user's plan to determine log retention limit
+  const plan = await getCurrentPlan(project.organizationId);
+  const retentionLimitDays = plan?.v3Subscription?.plan?.limits.logRetentionDays.number ?? 30;
+
+  // Get filters from query params
+  const url = new URL(request.url);
+  const tasks = url.searchParams.getAll("tasks").filter((t) => t.length > 0);
+  const runId = url.searchParams.get("runId") ?? undefined;
+  const search = url.searchParams.get("search") ?? undefined;
+  const cursor = url.searchParams.get("cursor") ?? undefined;
+  const levels = parseLevelsFromUrl(url);
+  const period = url.searchParams.get("period") ?? undefined;
+  const fromStr = url.searchParams.get("from");
+  const toStr = url.searchParams.get("to");
+  let from = fromStr ? parseInt(fromStr, 10) : undefined;
+  let to = toStr ? parseInt(toStr, 10) : undefined;
+
+  if (Number.isNaN(from)) from = undefined;
+  if (Number.isNaN(to)) to = undefined;
+
+  const options = LogsListOptionsSchema.parse({
+    userId,
+    projectId: project.id,
+    tasks: tasks.length > 0 ? tasks : undefined,
+    runId,
+    search,
+    cursor,
+    period,
+    from,
+    to,
+    levels,
+    defaultPeriod: "1h",
+    retentionLimitDays,
+  }) as any; // Validated by LogsListOptionsSchema at runtime
+
+  const presenter = new LogsListPresenter($replica, logsClickhouseClient);
+  const result = await presenter.call(project.organizationId, environment.id, options);
+
+  return json({
+    logs: result.logs,
+    pagination: result.pagination,
+  });
+};
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-generate.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-generate.tsx
new file mode 100644
index 00000000000..91ff6218944
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-generate.tsx
@@ -0,0 +1,222 @@
+import { openai } from "@ai-sdk/openai";
+import { type ActionFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { env } from "~/env.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import type { AITimeFilter } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types";
+import { requireUserId } from "~/services/session.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
+import { AIQueryService } from "~/v3/services/aiQueryService.server";
+import { querySchemas } from "~/v3/querySchemas";
+
+const RequestSchema = z.object({
+  prompt: z.string().min(1, "Prompt is required"),
+  mode: z.enum(["new", "edit"]).default("new"),
+  currentQuery: z.string().optional(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  // Parse the request body
+  const formData = await request.formData();
+  const submission = RequestSchema.safeParse(Object.fromEntries(formData));
+
+  if (!submission.success) {
+    return new Response(
+      JSON.stringify({
+        type: "result",
+        success: false,
+        error: "Invalid request data",
+      }),
+      {
+        status: 400,
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+  }
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    return new Response(
+      JSON.stringify({
+        type: "result",
+        success: false,
+        error: "Project not found",
+      }),
+      {
+        status: 404,
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    return new Response(
+      JSON.stringify({
+        type: "result",
+        success: false,
+        error: "Environment not found",
+      }),
+      {
+        status: 404,
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+  }
+
+  if (!env.OPENAI_API_KEY) {
+    return new Response(
+      JSON.stringify({
+        type: "result",
+        success: false,
+        error: "OpenAI API key is not configured",
+      }),
+      {
+        status: 400,
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+  }
+
+  const { prompt, mode, currentQuery } = submission.data;
+
+  const service = new AIQueryService(
+    querySchemas,
+    openai(env.AI_RUN_FILTER_MODEL ?? "gpt-4o-mini")
+  );
+
+  // Create a streaming response
+  const stream = new ReadableStream({
+    async start(controller) {
+      const encoder = new TextEncoder();
+
+      const sendEvent = (event: {
+        type: string;
+        content?: string;
+        tool?: string;
+        args?: unknown;
+        result?: unknown;
+        success?: boolean;
+        query?: string;
+        error?: string;
+        filter?: AITimeFilter;
+        timeFilter?: AITimeFilter;
+      }) => {
+        controller.enqueue(encoder.encode(`data: ${JSON.stringify(event)}\n\n`));
+      };
+
+      try {
+        const result = service.streamQuery(prompt, { mode, currentQuery });
+
+        // Process the stream
+        for await (const part of result.fullStream) {
+          switch (part.type) {
+            case "text-delta": {
+              sendEvent({ type: "thinking", content: part.textDelta });
+              break;
+            }
+            case "tool-call": {
+              sendEvent({
+                type: "tool_call",
+                tool: part.toolName,
+                args: part.args,
+              });
+
+              // If it's a setTimeFilter call, emit the time_filter event immediately
+              if (part.toolName === "setTimeFilter") {
+                const args = part.args as { period?: string; from?: string; to?: string };
+                sendEvent({
+                  type: "time_filter",
+                  filter: {
+                    period: args.period,
+                    from: args.from,
+                    to: args.to,
+                  },
+                });
+              }
+              break;
+            }
+            case "error": {
+              sendEvent({
+                type: "result",
+                success: false,
+                error: part.error instanceof Error ? part.error.message : String(part.error),
+              });
+              break;
+            }
+            case "finish": {
+              // Extract query from the final text
+              const finalText = await result.text;
+              const query = extractQueryFromText(finalText);
+              const timeFilter = service.getPendingTimeFilter();
+
+              if (query) {
+                sendEvent({
+                  type: "result",
+                  success: true,
+                  query,
+                  timeFilter,
+                });
+              } else if (
+                finalText.toLowerCase().includes("cannot") ||
+                finalText.toLowerCase().includes("unable")
+              ) {
+                sendEvent({
+                  type: "result",
+                  success: false,
+                  error: finalText.slice(0, 300),
+                });
+              } else {
+                sendEvent({
+                  type: "result",
+                  success: false,
+                  error: "Could not generate a valid query",
+                });
+              }
+              break;
+            }
+          }
+        }
+      } catch (error) {
+        sendEvent({
+          type: "result",
+          success: false,
+          error: error instanceof Error ? error.message : "An error occurred",
+        });
+      } finally {
+        controller.close();
+      }
+    },
+  });
+
+  return new Response(stream, {
+    headers: {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive",
+    },
+  });
+}
+
+/**
+ * Extract a SQL query from the AI response text
+ */
+function extractQueryFromText(text: string): string | null {
+  // Try to extract from code block first
+  const codeBlockMatch = text.match(/```(?:sql)?\s*([\s\S]*?)```/i);
+  if (codeBlockMatch) {
+    return codeBlockMatch[1].trim();
+  }
+
+  // Try to find a SELECT statement
+  const selectMatch = text.match(/SELECT[\s\S]+?(?:LIMIT\s+\d+|;|$)/i);
+  if (selectMatch) {
+    return selectMatch[0].trim().replace(/;$/, "");
+  }
+
+  return null;
+}
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-title.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-title.tsx
new file mode 100644
index 00000000000..9fa57d7fbe8
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query.ai-title.tsx
@@ -0,0 +1,81 @@
+import { openai } from "@ai-sdk/openai";
+import { json, type ActionFunctionArgs } from "@remix-run/server-runtime";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { requireUserId } from "~/services/session.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
+import { AIQueryTitleService } from "~/v3/services/aiQueryTitleService.server";
+
+const RequestSchema = z.object({
+  query: z.string().min(1, "Query is required"),
+  queryId: z.string().optional(),
+});
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  // Parse the request body
+  const [error, data] = await tryCatch(request.json());
+  if (error) {
+    return json({ success: false as const, error: error.message, title: null }, { status: 400 });
+  }
+  const submission = RequestSchema.safeParse(data);
+
+  if (!submission.success) {
+    return json(
+      { success: false as const, error: "Invalid request data", title: null },
+      { status: 400 }
+    );
+  }
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    return json(
+      { success: false as const, error: "Project not found", title: null },
+      { status: 404 }
+    );
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    return json(
+      { success: false as const, error: "Environment not found", title: null },
+      { status: 404 }
+    );
+  }
+
+  if (!env.OPENAI_API_KEY) {
+    return json(
+      { success: false as const, error: "OpenAI API key is not configured", title: null },
+      { status: 400 }
+    );
+  }
+
+  const { query, queryId } = submission.data;
+
+  const service = new AIQueryTitleService(openai(env.AI_RUN_FILTER_MODEL ?? "gpt-4o-mini"));
+
+  const result = await service.generateTitle(query);
+
+  if (!result.success) {
+    return json({ success: false as const, error: result.error, title: null }, { status: 500 });
+  }
+
+  // Strip leading/trailing quotes that AI sometimes adds
+  const title = result.title.replace(/^["']|["']$/g, "");
+
+  // If a queryId was provided, update the CustomerQuery record with the title
+  if (queryId) {
+    await prisma.customerQuery.update({
+      where: { id: queryId, organizationId: project.organizationId },
+      data: { title },
+    });
+  }
+
+  return json({ success: true as const, title, error: null });
+}
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues.stream.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues.stream.tsx
deleted file mode 100644
index b4104dfe38b..00000000000
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues.stream.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { $replica } from "~/db.server";
-import { env } from "~/env.server";
-import { logger } from "~/services/logger.server";
-import { requireUserId } from "~/services/session.server";
-import { EnvironmentParamSchema } from "~/utils/pathBuilder";
-import { createSSELoader } from "~/utils/sse";
-
-export const loader = createSSELoader({
-  timeout: env.QUEUE_SSE_AUTORELOAD_TIMEOUT_MS,
-  interval: env.QUEUE_SSE_AUTORELOAD_INTERVAL_MS,
-  debug: false,
-  handler: async ({ request, params }) => {
-    const userId = await requireUserId(request);
-    const { projectParam, envParam } = EnvironmentParamSchema.parse(params);
-
-    const environment = await $replica.runtimeEnvironment.findFirst({
-      where: {
-        slug: envParam,
-        OR: [
-          {
-            type: {
-              in: ["PREVIEW", "STAGING", "PRODUCTION"],
-            },
-          },
-          {
-            type: "DEVELOPMENT",
-            orgMember: {
-              userId,
-            },
-          },
-        ],
-        project: {
-          slug: projectParam,
-        },
-      },
-    });
-
-    if (!environment) {
-      throw new Response("Not Found", { status: 404 });
-    }
-
-    return {
-      beforeStream: async () => {
-        logger.debug("Start queue page SSE session", {
-          environmentId: environment.id,
-        });
-      },
-      initStream: async ({ send }) => {
-        send({ event: "time", data: new Date().toISOString() });
-      },
-      iterator: async ({ send }) => {
-        send({
-          event: "update",
-          data: new Date().toISOString(),
-        });
-      },
-      cleanup: async () => {
-        logger.debug("End queue page SSE session", {
-          environmentId: environment.id,
-        });
-      },
-    };
-  },
-});
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.idempotencyKey.reset.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.idempotencyKey.reset.tsx
new file mode 100644
index 00000000000..614b668f910
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.idempotencyKey.reset.tsx
@@ -0,0 +1,93 @@
+import { type ActionFunction, json } from "@remix-run/node";
+import { prisma } from "~/db.server";
+import { jsonWithErrorMessage, jsonWithSuccessMessage } from "~/models/message.server";
+import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import { ResetIdempotencyKeyService } from "~/v3/services/resetIdempotencyKey.server";
+import { v3RunParamsSchema } from "~/utils/pathBuilder";
+
+export const action: ActionFunction = async ({ request, params }) => {
+  const userId = await requireUserId(request);
+  const { projectParam, organizationSlug, envParam, runParam } = v3RunParamsSchema.parse(params);
+
+  try {
+    const taskRun = await prisma.taskRun.findFirst({
+      where: {
+        friendlyId: runParam,
+        project: {
+          slug: projectParam,
+          organization: {
+            slug: organizationSlug,
+            members: {
+              some: {
+                userId,
+              },
+            },
+          },
+        },
+        runtimeEnvironment: {
+          slug: envParam,
+        },
+      },
+      select: {
+        id: true,
+        idempotencyKey: true,
+        taskIdentifier: true,
+        runtimeEnvironmentId: true,
+      },
+    });
+
+    if (!taskRun) {
+      return jsonWithErrorMessage({}, request, "Run not found");
+    }
+
+    if (!taskRun.idempotencyKey) {
+      return jsonWithErrorMessage({}, request, "This run does not have an idempotency key");
+    }
+
+    const environment = await prisma.runtimeEnvironment.findUnique({
+      where: {
+        id: taskRun.runtimeEnvironmentId,
+      },
+      include: {
+        project: {
+          include: {
+            organization: true,
+          },
+        },
+      },
+    });
+
+    if (!environment) {
+      return jsonWithErrorMessage({}, request, "Environment not found");
+    }
+
+    const service = new ResetIdempotencyKeyService();
+
+    await service.call(taskRun.idempotencyKey, taskRun.taskIdentifier, {
+      ...environment,
+      organizationId: environment.project.organizationId,
+      organization: environment.project.organization,
+    });
+
+    return jsonWithSuccessMessage({}, request, "Idempotency key reset successfully");
+  } catch (error) {
+    if (error instanceof Error) {
+      logger.error("Failed to reset idempotency key", {
+        error: {
+          name: error.name,
+          message: error.message,
+          stack: error.stack,
+        },
+      });
+      return jsonWithErrorMessage({}, request, `Failed to reset idempotency key: ${error.message}`);
+    } else {
+      logger.error("Failed to reset idempotency key", { error });
+      return jsonWithErrorMessage(
+        {},
+        request,
+        `Failed to reset idempotency key: ${JSON.stringify(error)}`
+      );
+    }
+  }
+};
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx
index 7158c57b01b..bd186dcea4d 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx
@@ -1,13 +1,20 @@
 import {
+  ArrowPathIcon,
+  ArrowRightIcon,
+  BookOpenIcon,
   CheckIcon,
+  ChevronUpIcon,
+  ClockIcon,
   CloudArrowDownIcon,
   EnvelopeIcon,
+  GlobeAltIcon,
+  KeyIcon,
   QueueListIcon,
+  SignalIcon,
 } from "@heroicons/react/20/solid";
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import {
   formatDurationMilliseconds,
-  MachinePresetName,
   type TaskRunError,
   taskRunErrorEnhancer,
 } from "@trigger.dev/core/v3";
@@ -15,6 +22,7 @@ import { assertNever } from "assert-never";
 import { useEffect } from "react";
 import { typedjson, useTypedFetcher } from "remix-typedjson";
 import { ExitIcon } from "~/assets/icons/ExitIcon";
+import { FlagIcon } from "~/assets/icons/RegionIcons";
 import { AdminDebugRun } from "~/components/admin/debugRun";
 import { CodeBlock } from "~/components/code/CodeBlock";
 import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
@@ -23,9 +31,16 @@ import { MachineLabelCombo } from "~/components/MachineLabelCombo";
 import { MachineTooltipInfo } from "~/components/MachineTooltipInfo";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Callout } from "~/components/primitives/Callout";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { DateTime, DateTimeAccurate } from "~/components/primitives/DateTime";
 import { Header2, Header3 } from "~/components/primitives/Headers";
 import { Paragraph } from "~/components/primitives/Paragraph";
+import {
+  Popover,
+  PopoverContent,
+  PopoverMenuItem,
+  PopoverTrigger,
+} from "~/components/primitives/Popover";
 import * as Property from "~/components/primitives/PropertyTable";
 import { Spinner } from "~/components/primitives/Spinner";
 import {
@@ -46,7 +61,10 @@ import { RunTag } from "~/components/runs/v3/RunTag";
 import { SpanEvents } from "~/components/runs/v3/SpanEvents";
 import { SpanTitle } from "~/components/runs/v3/SpanTitle";
 import { TaskRunAttemptStatusCombo } from "~/components/runs/v3/TaskRunAttemptStatus";
-import { TaskRunStatusCombo, TaskRunStatusReason } from "~/components/runs/v3/TaskRunStatus";
+import {
+  descriptionForTaskRunStatus,
+  TaskRunStatusCombo,
+} from "~/components/runs/v3/TaskRunStatus";
 import { WaitpointDetailTable } from "~/components/runs/v3/WaitpointDetails";
 import { RuntimeIcon } from "~/components/RuntimeIcon";
 import { WarmStartCombo } from "~/components/WarmStarts";
@@ -55,16 +73,20 @@ import { useOrganization } from "~/hooks/useOrganizations";
 import { useProject } from "~/hooks/useProject";
 import { useSearchParams } from "~/hooks/useSearchParam";
 import { useHasAdminAccess } from "~/hooks/useUser";
+import { useCanViewLogsPage } from "~/hooks/useCanViewLogsPage";
 import { redirectWithErrorMessage } from "~/models/message.server";
 import { type Span, SpanPresenter, type SpanRun } from "~/presenters/v3/SpanPresenter.server";
 import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
 import { cn } from "~/utils/cn";
 import { formatCurrencyAccurate } from "~/utils/numberFormatter";
 import {
   docsPath,
   v3BatchPath,
   v3DeploymentVersionPath,
+  v3LogsPath,
   v3RunDownloadLogsPath,
+  v3RunIdempotencyKeyResetPath,
   v3RunPath,
   v3RunRedirectPath,
   v3RunSpanPath,
@@ -73,12 +95,19 @@ import {
   v3SpanParamsSchema,
 } from "~/utils/pathBuilder";
 import { createTimelineSpanEventsFromSpanEvents } from "~/utils/timelineSpanEvents";
+import type { SpanOverride } from "~/v3/eventRepository/eventRepository.types";
+import { type action as resetIdempotencyKeyAction } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.idempotencyKey.reset";
+import { RealtimeStreamViewer } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.streams.$streamKey/route";
 import { CompleteWaitpointForm } from "../resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.waitpoints.$waitpointFriendlyId.complete/route";
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
   const { projectParam, organizationSlug, envParam, runParam, spanParam } =
     v3SpanParamsSchema.parse(params);
 
+  const url = new URL(request.url);
+  const linkedRunId = url.searchParams.get("linkedRunId") ?? undefined;
+
   const presenter = new SpanPresenter();
 
   try {
@@ -86,6 +115,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       projectSlug: projectParam,
       spanId: spanParam,
       runFriendlyId: runParam,
+      userId,
+      linkedRunId,
     });
 
     return typedjson(result);
@@ -113,11 +144,15 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 export function SpanView({
   runParam,
   spanId,
+  spanOverrides,
   closePanel,
+  linkedRunId,
 }: {
   runParam: string;
   spanId: string | undefined;
+  spanOverrides?: SpanOverride;
   closePanel?: () => void;
+  linkedRunId?: string;
 }) {
   const organization = useOrganization();
   const project = useProject();
@@ -126,16 +161,18 @@ export function SpanView({
 
   useEffect(() => {
     if (spanId === undefined) return;
-    fetcher.load(
-      `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/runs/${runParam}/spans/${spanId}`
-    );
-  }, [organization.slug, project.slug, environment.slug, runParam, spanId]);
+    const url = `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${
+      environment.slug
+    }/runs/${runParam}/spans/${spanId}${linkedRunId ? `?linkedRunId=${linkedRunId}` : ""}`;
+    fetcher.load(url);
+  }, [organization.slug, project.slug, environment.slug, runParam, spanId, linkedRunId]);
 
   if (spanId === undefined) {
     return null;
   }
 
-  if (fetcher.state !== "idle" || fetcher.data === undefined) {
+  // Only show loading spinner when there's no data yet, not during revalidation
+  if (fetcher.data === undefined) {
     return (
       <div
         className={cn(
@@ -167,17 +204,26 @@ export function SpanView({
       );
     }
     case "span": {
-      return <SpanBody span={fetcher.data.span} runParam={runParam} closePanel={closePanel} />;
+      return (
+        <SpanBody
+          span={fetcher.data.span}
+          spanOverrides={spanOverrides}
+          runParam={runParam}
+          closePanel={closePanel}
+        />
+      );
     }
   }
 }
 
 function SpanBody({
   span,
+  spanOverrides,
   runParam,
   closePanel,
 }: {
   span: Span;
+  spanOverrides?: SpanOverride;
   runParam?: string;
   closePanel?: () => void;
 }) {
@@ -191,9 +237,11 @@ function SpanBody({
     tab = "overview";
   }
 
+  span = applySpanOverrides(span, spanOverrides);
+
   return (
-    <div className="grid h-full max-h-full grid-rows-[2.5rem_2rem_1fr] overflow-hidden bg-background-bright">
-      <div className="flex items-center justify-between gap-2 overflow-x-hidden px-3">
+    <div className="grid h-full max-h-full grid-rows-[2.5rem_1fr] overflow-hidden bg-background-bright">
+      <div className="flex items-center justify-between gap-2 overflow-x-hidden border-b border-grid-bright px-3 pr-2">
         <div className="flex items-center gap-1 overflow-x-hidden">
           <RunIcon
             name={span.style?.icon}
@@ -207,106 +255,53 @@ function SpanBody({
         {runParam && closePanel && (
           <Button
             onClick={closePanel}
-            variant="minimal/medium"
-            LeadingIcon={ExitIcon}
+            variant="minimal/small"
+            TrailingIcon={ExitIcon}
             shortcut={{ key: "esc" }}
+            shortcutPosition="before-trailing-icon"
+            className="pl-1"
           />
         )}
       </div>
-      <div className="h-fit overflow-x-auto px-3 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
-        <TabContainer>
-          <TabButton
-            isActive={!tab || tab === "overview"}
-            layoutId="span-span"
-            onClick={() => {
-              replace({ tab: "overview" });
-            }}
-            shortcut={{ key: "o" }}
-          >
-            Overview
-          </TabButton>
-          <TabButton
-            isActive={tab === "detail"}
-            layoutId="span-span"
-            onClick={() => {
-              replace({ tab: "detail" });
-            }}
-            shortcut={{ key: "d" }}
-          >
-            Detail
-          </TabButton>
-        </TabContainer>
-      </div>
       <div className="overflow-y-auto scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600">
-        {tab === "detail" ? (
-          <div className="flex flex-col gap-4 px-3 pt-3">
-            <Property.Table>
-              <Property.Item>
-                <Property.Label>Status</Property.Label>
-                <Property.Value>
-                  <TaskRunAttemptStatusCombo
-                    status={
-                      span.isCancelled
-                        ? "CANCELED"
-                        : span.isError
-                        ? "FAILED"
-                        : span.isPartial
-                        ? "EXECUTING"
-                        : "COMPLETED"
-                    }
-                    className="text-sm"
-                  />
-                </Property.Value>
-              </Property.Item>
-              <Property.Item>
-                <Property.Label>Task</Property.Label>
-                <Property.Value>
-                  <SimpleTooltip
-                    button={
-                      <TextLink
-                        to={v3RunsPath(organization, project, environment, {
-                          tasks: [span.taskSlug],
-                        })}
-                      >
-                        {span.taskSlug}
-                      </TextLink>
-                    }
-                    content={`Filter runs by ${span.taskSlug}`}
-                  />
-                </Property.Value>
-              </Property.Item>
-              {span.idempotencyKey && (
-                <Property.Item>
-                  <Property.Label>Idempotency key</Property.Label>
-                  <Property.Value>{span.idempotencyKey}</Property.Value>
-                </Property.Item>
-              )}
-              <Property.Item>
-                <Property.Label>Version</Property.Label>
-                <Property.Value>
-                  {span.workerVersion ? (
-                    span.workerVersion
-                  ) : (
-                    <span className="flex items-center gap-1">
-                      <span>Never started</span>
-                      <InfoIconTooltip
-                        content={"Runs get locked to the latest version when they start."}
-                        contentClassName="normal-case tracking-normal"
-                      />
-                    </span>
-                  )}
-                </Property.Value>
-              </Property.Item>
-            </Property.Table>
-          </div>
-        ) : (
-          <SpanEntity span={span} />
-        )}
+        <SpanEntity span={span} />
       </div>
     </div>
   );
 }
 
+function applySpanOverrides(span: Span, spanOverrides?: SpanOverride): Span {
+  if (!spanOverrides) {
+    return span;
+  }
+
+  const newSpan = { ...span };
+
+  if (spanOverrides.isCancelled) {
+    newSpan.isCancelled = true;
+    newSpan.isPartial = false;
+    newSpan.isError = false;
+  } else if (spanOverrides.isError) {
+    newSpan.isError = true;
+    newSpan.isPartial = false;
+    newSpan.isCancelled = false;
+  }
+
+  if (typeof spanOverrides.duration !== "undefined") {
+    newSpan.duration = spanOverrides.duration;
+  }
+
+  if (spanOverrides.events) {
+    if (newSpan.events) {
+      newSpan.events = [...newSpan.events, ...spanOverrides.events];
+    } else {
+      newSpan.events = spanOverrides.events;
+    }
+  }
+
+  return newSpan;
+}
+
 function RunBody({
   run,
   runParam,
@@ -324,10 +319,12 @@ function RunBody({
   const isAdmin = useHasAdminAccess();
   const { value, replace } = useSearchParams();
   const tab = value("tab");
+  const resetFetcher = useTypedFetcher<typeof resetIdempotencyKeyAction>();
+  const canViewLogsPage = useCanViewLogsPage();
 
   return (
-    <div className="grid h-full max-h-full grid-rows-[2.5rem_2rem_1fr_3.25rem] overflow-hidden bg-background-bright">
-      <div className="flex items-center justify-between gap-2 overflow-x-hidden px-3">
+    <div className="grid h-full max-h-full grid-rows-[2.5rem_2rem_1fr_minmax(3.25rem,auto)] overflow-hidden bg-background-bright">
+      <div className="flex items-center justify-between gap-2 overflow-x-hidden px-3 pr-2">
         <div className="flex items-center gap-1 overflow-x-hidden">
           <RunIcon
             name={run.isCached ? "task-cached" : "task"}
@@ -344,9 +341,11 @@ function RunBody({
         {runParam && closePanel && (
           <Button
             onClick={closePanel}
-            variant="minimal/medium"
-            LeadingIcon={ExitIcon}
+            variant="minimal/small"
+            TrailingIcon={ExitIcon}
             shortcut={{ key: "esc" }}
+            shortcutPosition="before-trailing-icon"
+            className="pl-1"
           />
         )}
       </div>
@@ -378,7 +377,7 @@ function RunBody({
             onClick={() => {
               replace({ tab: "context" });
             }}
-            shortcut={{ key: "c" }}
+            shortcut={{ key: "x" }}
           >
             Context
           </TabButton>
@@ -403,7 +402,11 @@ function RunBody({
                 <Property.Item>
                   <Property.Label>Status</Property.Label>
                   <Property.Value>
-                    <TaskRunStatusCombo status={run.status} />
+                    <SimpleTooltip
+                      button={<TaskRunStatusCombo status={run.status} />}
+                      content={descriptionForTaskRunStatus(run.status)}
+                      disableHoverableContent
+                    />
                   </Property.Value>
                 </Property.Item>
                 <Property.Item>
@@ -416,82 +419,135 @@ function RunBody({
                             tasks: [run.taskIdentifier],
                           })}
                         >
-                          {run.taskIdentifier}
+                          <CopyableText
+                            value={run.taskIdentifier}
+                            copyValue={run.taskIdentifier}
+                            asChild
+                          />
                         </TextLink>
                       }
-                      content={`Filter runs by ${run.taskIdentifier}`}
+                      content={`View runs filtered by ${run.taskIdentifier}`}
+                      disableHoverableContent
                     />
                   </Property.Value>
                 </Property.Item>
+                <Property.Item>
+                  <Property.Label>Run ID</Property.Label>
+                  <Property.Value>
+                    <CopyableText value={run.friendlyId} copyValue={run.friendlyId} asChild />
+                  </Property.Value>
+                </Property.Item>
                 {run.relationships.root ? (
                   run.relationships.root.isParent ? (
                     <Property.Item>
-                      <Property.Label>Root & Parent</Property.Label>
+                      <Property.Label>Root & Parent run</Property.Label>
                       <Property.Value>
-                        <TextLink
-                          to={v3RunSpanPath(
-                            organization,
-                            project,
-                            environment,
-                            {
-                              friendlyId: run.relationships.root.friendlyId,
-                            },
-                            { spanId: run.relationships.root.spanId }
-                          )}
-                          className="group flex flex-wrap items-center gap-x-1 gap-y-0"
-                        >
-                          {run.relationships.root.taskIdentifier}
-                          <span className="break-all text-text-dimmed transition-colors group-hover:text-text-bright/80">
-                            ({run.relationships.root.friendlyId})
-                          </span>
-                        </TextLink>
-                      </Property.Value>
-                    </Property.Item>
-                  ) : (
-                    <>
-                      <Property.Item>
-                        <Property.Label>Root</Property.Label>
-                        <Property.Value>
-                          <TextLink
-                            to={v3RunSpanPath(
-                              organization,
-                              project,
-                              environment,
-                              {
-                                friendlyId: run.relationships.root.friendlyId,
-                              },
-                              { spanId: run.relationships.root.spanId }
-                            )}
-                            className="group flex flex-wrap items-center gap-x-1 gap-y-0"
-                          >
-                            {run.relationships.root.taskIdentifier}
-                            <span className="break-all text-text-dimmed transition-colors group-hover:text-text-bright/80">
-                              ({run.relationships.root.friendlyId})
-                            </span>
-                          </TextLink>
-                        </Property.Value>
-                      </Property.Item>
-                      {run.relationships.parent ? (
-                        <Property.Item>
-                          <Property.Label>Parent</Property.Label>
-                          <Property.Value>
+                        <SimpleTooltip
+                          button={
                             <TextLink
                               to={v3RunSpanPath(
                                 organization,
                                 project,
                                 environment,
                                 {
-                                  friendlyId: run.relationships.parent.friendlyId,
+                                  friendlyId: run.relationships.root.friendlyId,
                                 },
-                                { spanId: run.relationships.parent.spanId }
+                                { spanId: run.relationships.root.spanId }
                               )}
                               className="group flex flex-wrap items-center gap-x-1 gap-y-0"
                             >
-                              {run.relationships.parent.taskIdentifier}
+                              <CopyableText
+                                value={run.relationships.root.taskIdentifier}
+                                copyValue={run.relationships.root.taskIdentifier}
+                                asChild
+                              />
                               <span className="break-all text-text-dimmed transition-colors group-hover:text-text-bright/80">
-                                ({run.relationships.parent.friendlyId})
+                                <CopyableText
+                                  value={run.relationships.root.friendlyId}
+                                  copyValue={run.relationships.root.friendlyId}
+                                  asChild
+                                />
                               </span>
                             </TextLink>
+                          }
+                          content={`Jump to root/parent run`}
+                          disableHoverableContent
+                        />
+                      </Property.Value>
+                    </Property.Item>
+                  ) : (
+                    <>
+                      <Property.Item>
+                        <Property.Label>Root run</Property.Label>
+                        <Property.Value>
+                          <SimpleTooltip
+                            button={
+                              <TextLink
+                                to={v3RunSpanPath(
+                                  organization,
+                                  project,
+                                  environment,
+                                  {
+                                    friendlyId: run.relationships.root.friendlyId,
+                                  },
+                                  { spanId: run.relationships.root.spanId }
+                                )}
+                                className="group flex flex-wrap items-center gap-x-1 gap-y-0"
+                              >
+                                <CopyableText
+                                  value={run.relationships.root.taskIdentifier}
+                                  copyValue={run.relationships.root.taskIdentifier}
+                                  asChild
+                                />
+                                <span className="break-all text-text-dimmed transition-colors group-hover:text-text-bright/80">
+                                  <CopyableText
+                                    value={run.relationships.root.friendlyId}
+                                    copyValue={run.relationships.root.friendlyId}
+                                    asChild
+                                  />
+                                </span>
+                              </TextLink>
+                            }
+                            content={`Jump to root run`}
+                            disableHoverableContent
+                          />
+                        </Property.Value>
+                      </Property.Item>
+                      {run.relationships.parent ? (
+                        <Property.Item>
+                          <Property.Label>Parent run</Property.Label>
+                          <Property.Value>
+                            <SimpleTooltip
+                              button={
+                                <TextLink
+                                  to={v3RunSpanPath(
+                                    organization,
+                                    project,
+                                    environment,
+                                    {
+                                      friendlyId: run.relationships.parent.friendlyId,
+                                    },
+                                    { spanId: run.relationships.parent.spanId }
+                                  )}
+                                  className="group flex flex-wrap items-center gap-x-1 gap-y-0"
+                                >
+                                  <CopyableText
+                                    value={run.relationships.parent.taskIdentifier}
+                                    copyValue={run.relationships.parent.taskIdentifier}
+                                    asChild
+                                  />
+                                  <span className="break-all text-text-dimmed transition-colors group-hover:text-text-bright/80">
+                                    <CopyableText
+                                      value={run.relationships.parent.friendlyId}
+                                      copyValue={run.relationships.parent.friendlyId}
+                                      asChild
+                                    />
+                                  </span>
+                                </TextLink>
+                              }
+                              content={`Jump to parent run`}
+                              disableHoverableContent
+                            />
                           </Property.Value>
                         </Property.Item>
                       ) : null}
@@ -505,27 +561,142 @@ function RunBody({
                       <SimpleTooltip
                         button={
                           <TextLink to={v3BatchPath(organization, project, environment, run.batch)}>
-                            {run.batch.friendlyId}
+                            <CopyableText
+                              value={run.batch.friendlyId}
+                              copyValue={run.batch.friendlyId}
+                              asChild
+                            />
                           </TextLink>
                         }
-                        content={`Jump to ${run.batch.friendlyId}`}
+                        content={`View batches filtered by ${run.batch.friendlyId}`}
+                        disableHoverableContent
                       />
                     </Property.Value>
                   </Property.Item>
                 )}
                 <Property.Item>
-                  <Property.Label>Idempotency</Property.Label>
+                  <Property.Label>
+                    <div className="flex items-center justify-between">
+                      <span className="flex items-center gap-1">
+                        Idempotency
+                        <InfoIconTooltip
+                          content={
+                            <div className="flex max-w-xs flex-col gap-3 p-1 pb-2">
+                              <div>
+                                <div className="mb-0.5 flex items-center gap-1.5">
+                                  <KeyIcon className="size-4 text-text-dimmed" />
+                                  <Header3>Idempotency keys</Header3>
+                                </div>
+                                <Paragraph variant="small" className="!text-wrap text-text-dimmed">
+                                  Prevent duplicate task runs. If you trigger a task with the same
+                                  key twice, the second request returns the original run.
+                                </Paragraph>
+                              </div>
+                              <div>
+                                <div className="mb-1 flex items-center gap-1">
+                                  <GlobeAltIcon className="size-4 text-blue-500" />
+                                  <Header3>Scope</Header3>
+                                </div>
+                                <div className="flex flex-col gap-0.5 text-sm text-text-dimmed">
+                                  <div>Global: applies across all runs</div>
+                                  <div>Run: unique to a parent run</div>
+                                  <div>Attempt: unique to a specific attempt</div>
+                                </div>
+                              </div>
+                              <div>
+                                <div className="mb-1 flex items-center gap-1">
+                                  <SignalIcon className="size-4 text-success" />
+                                  <Header3>Status</Header3>
+                                </div>
+                                <div className="flex flex-col gap-0.5 text-sm text-text-dimmed">
+                                  <div>Active: duplicates are blocked</div>
+                                  <div>Expired: the TTL has passed</div>
+                                  <div>Inactive: the key was reset or cleared</div>
+                                </div>
+                              </div>
+                              <LinkButton
+                                to={docsPath("idempotency")}
+                                variant="docs/small"
+                                LeadingIcon={BookOpenIcon}
+                              >
+                                Read docs
+                              </LinkButton>
+                            </div>
+                          }
+                        />
+                      </span>
+                      {run.idempotencyKeyStatus === "active" ? (
+                        <resetFetcher.Form
+                          method="post"
+                          action={v3RunIdempotencyKeyResetPath(organization, project, environment, {
+                            friendlyId: run.friendlyId,
+                          })}
+                        >
+                          <Button
+                            type="submit"
+                            variant="minimal/small"
+                            LeadingIcon={ArrowPathIcon}
+                            disabled={resetFetcher.state === "submitting"}
+                          >
+                            {resetFetcher.state === "submitting" ? "Resetting..." : "Reset"}
+                          </Button>
+                        </resetFetcher.Form>
+                      ) : run.idempotencyKeyStatus === "expired" ? (
+                        <span className="flex items-center gap-1 text-xs text-amber-500">
+                          <ClockIcon className="size-4" />
+                          Expired
+                        </span>
+                      ) : run.idempotencyKeyStatus === "inactive" ? (
+                        <span className="text-xs text-text-dimmed">Inactive</span>
+                      ) : null}
+                    </div>
+                  </Property.Label>
                   <Property.Value>
-                    <div className="break-all">{run.idempotencyKey ? run.idempotencyKey : "–"}</div>
-                    {run.idempotencyKey && (
+                    {run.idempotencyKeyStatus ? (
+                      <div className="flex flex-col gap-0.5">
+                        <div>
+                          <span className="text-text-dimmed">Key: </span>
+                          {run.idempotencyKey ? (
+                            <CopyableText
+                              value={run.idempotencyKey}
+                              copyValue={run.idempotencyKey}
+                              asChild
+                              className="max-h-5"
+                            />
+                          ) : (
+                            "–"
+                          )}
+                        </div>
+                        <div>
+                          <span className="text-text-dimmed">Scope: </span>
+                          {run.idempotencyKeyScope ?? "–"}
+                        </div>
+                        <div>
+                          <span className="text-text-dimmed">
+                            {run.idempotencyKeyStatus === "expired" ? "Expired: " : "Expires: "}
+                          </span>
+                          {run.idempotencyKeyExpiresAt ? (
+                            <DateTime date={run.idempotencyKeyExpiresAt} />
+                          ) : (
+                            "–"
+                          )}
+                        </div>
+                      </div>
+                    ) : (
+                      "–"
+                    )}
+                  </Property.Value>
+                </Property.Item>
+                <Property.Item>
+                  <Property.Label>Debounce</Property.Label>
+                  <Property.Value>
+                    {run.debounce ? (
                       <div>
-                        Expires:{" "}
-                        {run.idempotencyKeyExpiresAt ? (
-                          <DateTime date={run.idempotencyKeyExpiresAt} />
-                        ) : (
-                          "–"
-                        )}
+                        <div className="break-all">Key: {run.debounce.key}</div>
+                        <div>Delay: {run.debounce.delay}</div>
                       </div>
+                    ) : (
+                      "–"
                     )}
                   </Property.Value>
                 </Property.Item>
@@ -534,7 +705,7 @@ function RunBody({
                   <Property.Value>
                     {run.version ? (
                       environment.type === "DEVELOPMENT" ? (
-                        run.version
+                        <CopyableText value={run.version} copyValue={run.version} asChild />
                       ) : (
                         <SimpleTooltip
                           button={
@@ -547,7 +718,7 @@ function RunBody({
                               )}
                               className="group flex flex-wrap items-center gap-x-1 gap-y-0"
                             >
-                              {run.version}
+                              <CopyableText value={run.version} copyValue={run.version} asChild />
                             </TextLink>
                           }
                           content={"Jump to deployment"}
@@ -600,13 +771,23 @@ function RunBody({
                   <Property.Item>
                     <Property.Label>Replayed from</Property.Label>
                     <Property.Value>
-                      <TextLink
-                        to={v3RunRedirectPath(organization, project, {
-                          friendlyId: run.replayedFromTaskRunFriendlyId,
-                        })}
-                      >
-                        {run.replayedFromTaskRunFriendlyId}
-                      </TextLink>
+                      <SimpleTooltip
+                        button={
+                          <TextLink
+                            to={v3RunRedirectPath(organization, project, {
+                              friendlyId: run.replayedFromTaskRunFriendlyId,
+                            })}
+                          >
+                            <CopyableText
+                              value={run.replayedFromTaskRunFriendlyId}
+                              copyValue={run.replayedFromTaskRunFriendlyId}
+                              asChild
+                            />
+                          </TextLink>
+                        }
+                        content={`Jump to replayed run`}
+                        disableHoverableContent
+                      />
                     </Property.Value>
                   </Property.Item>
                 )}
@@ -696,6 +877,19 @@ function RunBody({
                     <MachineLabelCombo preset={run.machinePreset} />
                   </Property.Value>
                 </Property.Item>
+                {run.region && (
+                  <Property.Item>
+                    <Property.Label>Region</Property.Label>
+                    <Property.Value>
+                      <span className="flex items-center gap-1">
+                        {run.region.location ? (
+                          <FlagIcon region={run.region.location} className="size-5" />
+                        ) : null}
+                        {run.region.name}
+                      </span>
+                    </Property.Value>
+                  </Property.Item>
+                )}
                 <Property.Item>
                   <Property.Label>Run invocation cost</Property.Label>
                   <Property.Value>
@@ -726,18 +920,16 @@ function RunBody({
                       : "–"}
                   </Property.Value>
                 </Property.Item>
-                <Property.Item>
-                  <Property.Label>Run ID</Property.Label>
-                  <Property.Value>{run.friendlyId}</Property.Value>
-                </Property.Item>
-                <Property.Item>
-                  <Property.Label>Internal ID</Property.Label>
-                  <Property.Value>{run.id}</Property.Value>
-                </Property.Item>
                 <Property.Item>
                   <Property.Label>Run Engine</Property.Label>
                   <Property.Value>{run.engine}</Property.Value>
                 </Property.Item>
+                {run.externalTraceId && (
+                  <Property.Item>
+                    <Property.Label>External Trace ID</Property.Label>
+                    <Property.Value>{run.externalTraceId}</Property.Value>
+                  </Property.Item>
+                )}
                 {isAdmin && (
                   <div className="border-t border-yellow-500/50 pt-2">
                     <Paragraph spacing variant="small" className="text-yellow-500">
@@ -747,18 +939,30 @@ function RunBody({
                       <Property.Label>Worker queue</Property.Label>
                       <Property.Value>{run.workerQueue}</Property.Value>
                     </Property.Item>
+                    <Property.Item>
+                      <Property.Label>Trace ID</Property.Label>
+                      <Property.Value>{run.traceId}</Property.Value>
+                    </Property.Item>
+                    <Property.Item>
+                      <Property.Label>Span ID</Property.Label>
+                      <Property.Value>{run.spanId}</Property.Value>
+                    </Property.Item>
+                    <Property.Item>
+                      <Property.Label>Task event store</Property.Label>
+                      <Property.Value>{run.taskEventStore}</Property.Value>
+                    </Property.Item>
                   </div>
                 )}
               </Property.Table>
             </div>
           ) : tab === "context" ? (
             <div className="flex flex-col gap-4 py-3">
-              <CodeBlock code={run.context} showLineNumbers={false} />
+              <CodeBlock code={run.context} showLineNumbers={false} showTextWrapping />
             </div>
           ) : tab === "metadata" ? (
             <div className="flex flex-col gap-4 py-3">
               {run.metadata ? (
-                <CodeBlock code={run.metadata} showLineNumbers={false} />
+                <CodeBlock code={run.metadata} showLineNumbers={false} showTextWrapping />
               ) : (
                 <Callout to="https://trigger.dev/docs/runs/metadata" variant="docs">
                   No metadata set for this run. View our metadata documentation to learn more.
@@ -767,9 +971,11 @@ function RunBody({
             </div>
           ) : (
             <div className="flex flex-col gap-4 pt-3">
-              <div className="space-y-2 border-b border-grid-bright pb-3">
-                <TaskRunStatusCombo status={run.status} className="text-sm" />
-                <TaskRunStatusReason status={run.status} statusReason={run.statusReason} />
+              <div className="border-b border-grid-bright pb-3">
+                <SimpleTooltip
+                  button={<TaskRunStatusCombo status={run.status} className="text-sm" />}
+                  content={descriptionForTaskRunStatus(run.status)}
+                />
               </div>
               <RunTimeline run={run} />
 
@@ -786,7 +992,7 @@ function RunBody({
           )}
         </div>
       </div>
-      <div className="flex items-center justify-between gap-2 border-t border-grid-dimmed px-2">
+      <div className="flex items-center flex-wrap py-2 justify-between gap-2 border-t border-grid-dimmed px-2">
         <div className="flex items-center gap-4">
           {run.friendlyId !== runParam && (
             <LinkButton
@@ -804,19 +1010,59 @@ function RunBody({
               {run.isCached ? "Jump to original run" : "Focus on run"}
             </LinkButton>
           )}
+          <AdminDebugRun friendlyId={run.friendlyId} />
         </div>
-        <AdminDebugRun friendlyId={run.friendlyId} />
-        <div className="flex items-center gap-4">
+        <div className="flex items-center">
           {run.logsDeletedAt === null ? (
-            <LinkButton
-              to={v3RunDownloadLogsPath({ friendlyId: runParam })}
-              LeadingIcon={CloudArrowDownIcon}
-              variant="tertiary/medium"
-              target="_blank"
-              download
-            >
-              Download logs
-            </LinkButton>
+            canViewLogsPage ? (
+              <div className="flex">
+                <LinkButton
+                  to={`${v3LogsPath(organization, project, environment)}?runId=${runParam}&from=${
+                    new Date(run.createdAt).getTime() - 60000
+                  }`}
+                  variant="secondary/medium"
+                  className="rounded-r-none border-r-0"
+                >
+                  View logs
+                </LinkButton>
+                <Popover>
+                  <PopoverTrigger asChild>
+                    <Button
+                      variant="secondary/medium"
+                      className="rounded-l-none border-l-charcoal-700 px-1.5"
+                    >
+                      <ChevronUpIcon className="size-4 transition group-hover/button:text-text-bright" />
+                    </Button>
+                  </PopoverTrigger>
+                  <PopoverContent className="min-w-[140px] p-1" align="end">
+                    <PopoverMenuItem
+                      to={`${v3LogsPath(organization, project, environment)}?runId=${runParam}&from=${
+                        new Date(run.createdAt).getTime() - 60000
+                      }`}
+                      title="View logs"
+                      icon={ArrowRightIcon}
+                      leadingIconClassName="text-blue-500"
+                    />
+                    <PopoverMenuItem
+                      to={v3RunDownloadLogsPath({ friendlyId: runParam })}
+                      title="Download logs"
+                      icon={CloudArrowDownIcon}
+                      leadingIconClassName="text-indigo-500"
+                      openInNewTab
+                    />
+                  </PopoverContent>
+                </Popover>
+              </div>
+            ) : (
+              <LinkButton
+                to={v3RunDownloadLogsPath({ friendlyId: runParam })}
+                LeadingIcon={CloudArrowDownIcon}
+                leadingIconClassName="text-indigo-400"
+                variant="secondary/medium"
+              >
+                Download logs
+              </LinkButton>
+            )
           ) : null}
         </div>
       </div>
@@ -855,7 +1101,7 @@ function RunError({ error }: { error: TaskRunError }) {
           <Header3 className="text-rose-500">{name}</Header3>
           {enhancedError.message && (
             <Callout variant="error">
-              <pre className="text-wrap font-sans text-sm font-normal text-rose-200">
+              <pre className="text-wrap font-sans text-sm font-normal text-rose-200 [word-break:break-word]">
                 {enhancedError.message}
               </pre>
             </Callout>
@@ -974,7 +1220,7 @@ function SpanEntity({ span }: { span: Span }) {
                             {run.taskIdentifier}
                           </TableCell>
                           <TableCell to={path} actionClassName="py-1.5" rowHoverStyle="bright">
-                            {run.lockedToVersion?.version ?? "–"}
+                            {run.taskVersion ?? "–"}
                           </TableCell>
                           <TableCell to={path} actionClassName="py-1.5" rowHoverStyle="bright">
                             <DateTime date={run.createdAt} />
@@ -995,6 +1241,20 @@ function SpanEntity({ span }: { span: Span }) {
             code={span.properties}
             maxLines={20}
             showLineNumbers={false}
+            showCopyButton
+            showTextWrapping
+            showOpenInModal
+          />
+        ) : null}
+        {span.resourceProperties !== undefined ? (
+          <CodeBlock
+            rowTitle="Resource properties"
+            code={span.resourceProperties}
+            maxLines={20}
+            showLineNumbers={false}
+            showCopyButton
+            showTextWrapping
+            showOpenInModal
           />
         ) : null}
       </div>
@@ -1040,6 +1300,9 @@ function SpanEntity({ span }: { span: Span }) {
               code={span.properties}
               maxLines={20}
               showLineNumbers={false}
+              showCopyButton
+              showTextWrapping
+              showOpenInModal
             />
           ) : null}
         </div>
@@ -1066,6 +1329,15 @@ function SpanEntity({ span }: { span: Span }) {
         </div>
       );
     }
+    case "realtime-stream": {
+      return (
+        <RealtimeStreamViewer
+          runId={span.entity.object.runId}
+          streamKey={span.entity.object.streamKey}
+          metadata={span.entity.object.metadata}
+        />
+      );
+    }
     default: {
       assertNever(span.entity);
     }
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.streams.$streamKey/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.streams.$streamKey/route.tsx
new file mode 100644
index 00000000000..a1d94159700
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.streams.$streamKey/route.tsx
@@ -0,0 +1,544 @@
+import { BoltIcon, BoltSlashIcon } from "@heroicons/react/20/solid";
+import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { type SSEStreamPart, SSEStreamSubscription } from "@trigger.dev/core/v3";
+import { useVirtualizer } from "@tanstack/react-virtual";
+import { Clipboard, ClipboardCheck } from "lucide-react";
+import { useCallback, useEffect, useRef, useState } from "react";
+import simplur from "simplur";
+import { ListBulletIcon } from "~/assets/icons/ListBulletIcon";
+import { MoveToBottomIcon } from "~/assets/icons/MoveToBottomIcon";
+import { MoveToTopIcon } from "~/assets/icons/MoveToTopIcon";
+import { SnakedArrowIcon } from "~/assets/icons/SnakedArrowIcon";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { Spinner } from "~/components/primitives/Spinner";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "~/components/primitives/Tooltip";
+import { $replica } from "~/db.server";
+import { useEnvironment } from "~/hooks/useEnvironment";
+import { useOrganization } from "~/hooks/useOrganizations";
+import { useProject } from "~/hooks/useProject";
+import { getRealtimeStreamInstance } from "~/services/realtime/v1StreamsGlobal.server";
+import { requireUserId } from "~/services/session.server";
+import { cn } from "~/utils/cn";
+import { v3RunStreamParamsSchema } from "~/utils/pathBuilder";
+
+type ViewMode = "list" | "compact";
+
+type StreamChunk = {
+  id: string;
+  data: unknown;
+  timestamp: number;
+};
+
+export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+  const userId = await requireUserId(request);
+  const { projectParam, organizationSlug, envParam, runParam, streamKey } =
+    v3RunStreamParamsSchema.parse(params);
+
+  const project = await $replica.project.findFirst({
+    where: {
+      slug: projectParam,
+      organization: {
+        slug: organizationSlug,
+        members: {
+          some: {
+            userId,
+          },
+        },
+      },
+    },
+  });
+
+  if (!project) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const run = await $replica.taskRun.findFirst({
+    where: {
+      friendlyId: runParam,
+      projectId: project.id,
+    },
+    include: {
+      runtimeEnvironment: {
+        include: {
+          project: true,
+          organization: true,
+          orgMember: true,
+        },
+      },
+    },
+  });
+
+  if (!run) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  if (run.runtimeEnvironment.slug !== envParam) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  // Get Last-Event-ID header for resuming from a specific position
+  const lastEventId = request.headers.get("Last-Event-ID") || undefined;
+
+  const realtimeStream = getRealtimeStreamInstance(
+    run.runtimeEnvironment,
+    run.realtimeStreamsVersion
+  );
+
+  return realtimeStream.streamResponse(request, run.friendlyId, streamKey, request.signal, {
+    lastEventId,
+  });
+};
+
+export function RealtimeStreamViewer({
+  runId,
+  streamKey,
+  metadata,
+}: {
+  runId: string;
+  streamKey: string;
+  metadata: Record<string, unknown> | undefined;
+}) {
+  const organization = useOrganization();
+  const project = useProject();
+  const environment = useEnvironment();
+
+  const resourcePath = `/resources/orgs/${organization.slug}/projects/${project.slug}/env/${environment.slug}/runs/${runId}/streams/${streamKey}`;
+
+  const startIndex = typeof metadata?.startIndex === "number" ? metadata.startIndex : undefined;
+  const { chunks, error, isConnected } = useRealtimeStream(resourcePath, startIndex);
+  const scrollRef = useRef<HTMLDivElement>(null);
+  const bottomRef = useRef<HTMLDivElement>(null);
+  const [isAtBottom, setIsAtBottom] = useState(true);
+  const [viewMode, setViewMode] = useState<ViewMode>("list");
+  const [mouseOver, setMouseOver] = useState(false);
+  const [copied, setCopied] = useState(false);
+
+  const getCompactText = useCallback(() => {
+    return chunks
+      .map((chunk) => {
+        if (typeof chunk.data === "string") {
+          return chunk.data;
+        }
+        return JSON.stringify(chunk.data);
+      })
+      .join("");
+  }, [chunks]);
+
+  const onCopied = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+      navigator.clipboard.writeText(getCompactText());
+      setCopied(true);
+      setTimeout(() => {
+        setCopied(false);
+      }, 1500);
+    },
+    [getCompactText]
+  );
+
+  // Use IntersectionObserver to detect when the bottom element is visible
+  useEffect(() => {
+    const bottomElement = bottomRef.current;
+    const scrollElement = scrollRef.current;
+    if (!bottomElement || !scrollElement) return;
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        const entry = entries[0];
+        if (entry) {
+          setIsAtBottom(entry.isIntersecting);
+        }
+      },
+      {
+        root: scrollElement,
+        threshold: 0.1,
+        rootMargin: "0px",
+      }
+    );
+
+    observer.observe(bottomElement);
+
+    // Also add a scroll listener as a backup to ensure state updates
+    let scrollTimeout: ReturnType<typeof setTimeout> | null = null;
+    const handleScroll = () => {
+      if (!scrollElement || !bottomElement) return;
+
+      // Clear any existing timeout
+      if (scrollTimeout) {
+        clearTimeout(scrollTimeout);
+      }
+
+      // Debounce the state update to avoid interrupting smooth scroll
+      scrollTimeout = setTimeout(() => {
+        const scrollBottom = scrollElement.scrollTop + scrollElement.clientHeight;
+        const isNearBottom = scrollElement.scrollHeight - scrollBottom < 50;
+        setIsAtBottom(isNearBottom);
+      }, 100);
+    };
+
+    scrollElement.addEventListener("scroll", handleScroll);
+    // Check initial state
+    const scrollBottom = scrollElement.scrollTop + scrollElement.clientHeight;
+    const isNearBottom = scrollElement.scrollHeight - scrollBottom < 50;
+    setIsAtBottom(isNearBottom);
+
+    return () => {
+      observer.disconnect();
+      scrollElement.removeEventListener("scroll", handleScroll);
+      if (scrollTimeout) {
+        clearTimeout(scrollTimeout);
+      }
+    };
+  }, [chunks.length, viewMode]);
+
+  // Auto-scroll to bottom when new chunks arrive, if we're at the bottom
+  useEffect(() => {
+    if (isAtBottom && scrollRef.current) {
+      // Preserve horizontal scroll position while scrolling to bottom vertically
+      const currentScrollLeft = scrollRef.current.scrollLeft;
+      scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+      scrollRef.current.scrollLeft = currentScrollLeft;
+    }
+  }, [chunks, isAtBottom]);
+
+  const firstLineNumber = startIndex ?? 0;
+  const lastLineNumber = firstLineNumber + chunks.length - 1;
+  const maxLineNumberWidth = (chunks.length > 0 ? lastLineNumber : firstLineNumber).toString()
+    .length;
+
+  // Virtual rendering for list view
+  const rowVirtualizer = useVirtualizer({
+    count: chunks.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 28,
+    overscan: 5,
+  });
+
+  return (
+    <div className="flex h-full flex-col overflow-hidden">
+      {/* Header */}
+      <div className="border-b border-grid-bright bg-background-bright @container">
+        <div className="flex flex-wrap items-center justify-between gap-2 px-3 py-2.5 @[300px]:flex-nowrap">
+          <div className="flex min-w-0 items-center gap-1.5">
+            <TooltipProvider>
+              <Tooltip>
+                <TooltipTrigger>
+                  {isConnected ? (
+                    <BoltIcon className={cn("size-3.5 animate-pulse text-success")} />
+                  ) : (
+                    <BoltSlashIcon className={cn("size-3.5 text-text-dimmed")} />
+                  )}
+                </TooltipTrigger>
+                <TooltipContent side="top" className="text-xs">
+                  {isConnected ? "Connected" : "Disconnected"}
+                </TooltipContent>
+              </Tooltip>
+            </TooltipProvider>
+            <Paragraph
+              variant="small/bright"
+              className="mb-0 flex min-w-0 items-center gap-1 truncate whitespace-nowrap"
+            >
+              <span>Stream:</span>
+              <span className="truncate font-mono text-text-dimmed">{streamKey}</span>
+            </Paragraph>
+          </div>
+          <div className="flex w-full flex-wrap items-center justify-between gap-3 @[300px]:w-auto @[300px]:flex-nowrap">
+            <Paragraph variant="small" className="mb-0 whitespace-nowrap">
+              {simplur`${chunks.length} chunk[|s]`}
+            </Paragraph>
+            <div className="flex items-center gap-3">
+              <TooltipProvider>
+                <Tooltip open={chunks.length === 0 ? false : undefined} disableHoverableContent>
+                  <TooltipTrigger
+                    disabled={chunks.length === 0}
+                    onClick={() => setViewMode(viewMode === "list" ? "compact" : "list")}
+                    className={cn(
+                      "text-text-dimmed transition-colors focus-custom",
+                      chunks.length === 0
+                        ? "cursor-not-allowed opacity-50"
+                        : "hover:cursor-pointer hover:text-text-bright"
+                    )}
+                  >
+                    {viewMode === "list" ? (
+                      <SnakedArrowIcon className="size-4" />
+                    ) : (
+                      <ListBulletIcon className="size-4" />
+                    )}
+                  </TooltipTrigger>
+                  <TooltipContent side="left" className="text-xs">
+                    {viewMode === "list" ? "Flow as text" : "View as list"}
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+              <TooltipProvider>
+                <Tooltip
+                  open={chunks.length === 0 ? false : copied || mouseOver || undefined}
+                  disableHoverableContent
+                >
+                  <TooltipTrigger
+                    disabled={chunks.length === 0}
+                    onClick={onCopied}
+                    onMouseEnter={() => setMouseOver(true)}
+                    onMouseLeave={() => setMouseOver(false)}
+                    className={cn(
+                      "transition-colors duration-100 focus-custom",
+                      chunks.length === 0
+                        ? "cursor-not-allowed opacity-50"
+                        : copied
+                        ? "text-success hover:cursor-pointer"
+                        : "text-text-dimmed hover:cursor-pointer hover:text-text-bright"
+                    )}
+                  >
+                    {copied ? (
+                      <ClipboardCheck className="size-4" />
+                    ) : (
+                      <Clipboard className="size-4" />
+                    )}
+                  </TooltipTrigger>
+                  <TooltipContent side="left" className="text-xs">
+                    {copied ? "Copied" : "Copy"}
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+              <TooltipProvider>
+                <Tooltip open={chunks.length === 0 ? false : undefined} disableHoverableContent>
+                  <TooltipTrigger
+                    disabled={chunks.length === 0}
+                    onClick={() => {
+                      if (isAtBottom) {
+                        scrollRef.current?.scrollTo({ top: 0, behavior: "smooth" });
+                      } else {
+                        bottomRef.current?.scrollIntoView({ behavior: "smooth", block: "end" });
+                      }
+                    }}
+                    className={cn(
+                      "text-text-dimmed transition-colors focus-custom",
+                      chunks.length === 0
+                        ? "cursor-not-allowed opacity-50"
+                        : "hover:cursor-pointer hover:text-text-bright"
+                    )}
+                  >
+                    {isAtBottom ? (
+                      <MoveToTopIcon className="size-4" />
+                    ) : (
+                      <MoveToBottomIcon className="size-4" />
+                    )}
+                  </TooltipTrigger>
+                  <TooltipContent side="left" className="text-xs">
+                    {isAtBottom ? "Scroll to top" : "Scroll to bottom"}
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      {/* Content */}
+      <div
+        ref={scrollRef}
+        className="flex-1 overflow-x-auto overflow-y-auto bg-charcoal-900 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600"
+      >
+        {error && (
+          <div className="border-b border-error/20 bg-error/10 p-3">
+            <Paragraph variant="small" className="mb-0 text-error">
+              Error: {error.message}
+            </Paragraph>
+          </div>
+        )}
+
+        {chunks.length === 0 && !error && (
+          <div className="flex h-full items-center justify-center">
+            {isConnected ? (
+              <div className="flex items-center gap-2">
+                <Spinner />
+                <Paragraph variant="small" className="mb-0 text-text-dimmed">
+                  Waiting for data…
+                </Paragraph>
+              </div>
+            ) : (
+              <Paragraph variant="small" className="mb-0 text-text-dimmed">
+                No data received
+              </Paragraph>
+            )}
+          </div>
+        )}
+
+        {chunks.length > 0 && viewMode === "list" && (
+          <div className="font-mono text-xs leading-tight">
+            <div
+              style={{
+                height: `${rowVirtualizer.getTotalSize()}px`,
+                position: "relative",
+                minWidth: "100%",
+              }}
+            >
+              {rowVirtualizer.getVirtualItems().map((virtualItem) => (
+                <StreamChunkLine
+                  key={virtualItem.key}
+                  chunk={chunks[virtualItem.index]}
+                  lineNumber={firstLineNumber + virtualItem.index}
+                  maxLineNumberWidth={maxLineNumberWidth}
+                  size={virtualItem.size}
+                  start={virtualItem.start}
+                />
+              ))}
+              {/* Sentinel element for IntersectionObserver */}
+              <div
+                ref={bottomRef}
+                className="h-px"
+                style={{
+                  position: "absolute",
+                  top: `${rowVirtualizer.getTotalSize()}px`,
+                }}
+              />
+            </div>
+          </div>
+        )}
+
+        {chunks.length > 0 && viewMode === "compact" && (
+          <div className="p-3 font-mono text-xs leading-relaxed">
+            <CompactStreamView chunks={chunks} />
+            {/* Sentinel element for IntersectionObserver */}
+            <div ref={bottomRef} className="h-px" />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function CompactStreamView({ chunks }: { chunks: StreamChunk[] }) {
+  const compactText = chunks
+    .map((chunk) => {
+      if (typeof chunk.data === "string") {
+        return chunk.data;
+      }
+      return JSON.stringify(chunk.data);
+    })
+    .join("");
+
+  return <div className="whitespace-pre-wrap break-all text-text-bright">{compactText}</div>;
+}
+
+function StreamChunkLine({
+  chunk,
+  lineNumber,
+  maxLineNumberWidth,
+  size,
+  start,
+}: {
+  chunk: StreamChunk;
+  lineNumber: number;
+  maxLineNumberWidth: number;
+  size: number;
+  start: number;
+}) {
+  const formattedData =
+    typeof chunk.data === "string" ? chunk.data : JSON.stringify(chunk.data, null, 2);
+
+  const date = new Date(chunk.timestamp);
+  const timeString = date.toLocaleTimeString("en-US", {
+    hour12: false,
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+  });
+  const milliseconds = date.getMilliseconds().toString().padStart(3, "0");
+  const timestamp = `${timeString}.${milliseconds}`;
+
+  return (
+    <div
+      className="group flex gap-3 py-1 hover:bg-charcoal-800"
+      style={{
+        position: "absolute",
+        top: 0,
+        left: 0,
+        height: `${size}px`,
+        transform: `translateY(${start}px)`,
+      }}
+    >
+      {/* Line number */}
+      <div
+        className="flex-none select-none pl-2 text-right text-charcoal-500"
+        style={{ width: `${Math.max(maxLineNumberWidth, 3)}ch` }}
+      >
+        {lineNumber}
+      </div>
+
+      {/* Timestamp */}
+      <div className="flex-none select-none pl-1 text-charcoal-500">{timestamp}</div>
+
+      {/* Content */}
+      <div className="whitespace-nowrap text-text-bright">{formattedData}</div>
+    </div>
+  );
+}
+
+function useRealtimeStream(resourcePath: string, startIndex?: number) {
+  const [chunks, setChunks] = useState<StreamChunk[]>([]);
+  const [error, setError] = useState<Error | null>(null);
+  const [isConnected, setIsConnected] = useState(false);
+
+  useEffect(() => {
+    const abortController = new AbortController();
+    let reader: ReadableStreamDefaultReader<SSEStreamPart<unknown>> | null = null;
+
+    async function connectAndConsume() {
+      try {
+        const sseSubscription = new SSEStreamSubscription(resourcePath, {
+          signal: abortController.signal,
+          lastEventId: startIndex ? (startIndex - 1).toString() : undefined,
+          timeoutInSeconds: 30,
+        });
+
+        const stream = await sseSubscription.subscribe();
+        setIsConnected(true);
+
+        reader = stream.getReader();
+
+        // Read from the stream
+        while (true) {
+          const { done, value } = await reader.read();
+
+          if (done) {
+            break;
+          }
+
+          if (value !== undefined) {
+            setChunks((prev) => [
+              ...prev,
+              {
+                id: value.id,
+                data: value.chunk,
+                timestamp: value.timestamp,
+              },
+            ]);
+          }
+        }
+      } catch (err) {
+        // Only set error if not aborted
+        if (!abortController.signal.aborted) {
+          setError(err instanceof Error ? err : new Error(String(err)));
+        }
+      } finally {
+        setIsConnected(false);
+      }
+    }
+
+    connectAndConsume();
+
+    return () => {
+      abortController.abort();
+      reader?.cancel();
+    };
+  }, [resourcePath, startIndex]);
+
+  return { chunks, error, isConnected };
+}
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.ai-filter.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.ai-filter.tsx
index 9249d7afe9c..9ae306c98a6 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.ai-filter.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.ai-filter.tsx
@@ -65,13 +65,16 @@ export async function action({ request, params }: ActionFunctionArgs) {
     query: async (search) => {
       const tagPresenter = new RunTagListPresenter();
       const tags = await tagPresenter.call({
+        organizationId: environment.organizationId,
         projectId: environment.projectId,
+        environmentId: environment.id,
         name: search,
         page: 1,
         pageSize: 50,
+        period: "30d",
       });
       return {
-        tags: tags.tags.map((t) => t.name),
+        tags: tags.tags,
       };
     },
   };
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.$bulkActionParam.stream.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.$bulkActionParam.stream.tsx
deleted file mode 100644
index 3eb4a1b2084..00000000000
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.$bulkActionParam.stream.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import { BulkActionStatus } from "@trigger.dev/database";
-import { z } from "zod";
-import { $replica } from "~/db.server";
-import { env } from "~/env.server";
-import { devPresence } from "~/presenters/v3/DevPresence.server";
-import { logger } from "~/services/logger.server";
-import { requireUserId } from "~/services/session.server";
-import { EnvironmentParamSchema, ProjectParamSchema } from "~/utils/pathBuilder";
-import { createSSELoader, type SendFunction } from "~/utils/sse";
-
-const Params = EnvironmentParamSchema.extend({
-  bulkActionParam: z.string(),
-});
-
-export const loader = createSSELoader({
-  timeout: env.DEV_PRESENCE_SSE_TIMEOUT,
-  interval: env.DEV_PRESENCE_POLL_MS,
-  debug: false,
-  handler: async ({ id, controller, debug, request, params }) => {
-    const userId = await requireUserId(request);
-    const { organizationSlug, projectParam, envParam, bulkActionParam } = Params.parse(params);
-
-    const environment = await $replica.runtimeEnvironment.findFirst({
-      where: {
-        id: envParam,
-        project: {
-          slug: projectParam,
-          organization: {
-            members: {
-              some: {
-                userId,
-              },
-            },
-          },
-        },
-      },
-    });
-
-    if (!environment) {
-      throw new Response("Not Found", { status: 404 });
-    }
-
-    const getBulkActionProgress = async (send: SendFunction) => {
-      try {
-        const bulkAction = await $replica.bulkActionGroup.findFirst({
-          select: {
-            status: true,
-            successCount: true,
-            failureCount: true,
-          },
-          where: {
-            friendlyId: bulkActionParam,
-            environmentId: environment.id,
-          },
-        });
-
-        send({
-          event: "progress",
-          data: JSON.stringify({
-            status: bulkAction?.status,
-            successCount: bulkAction?.successCount,
-            failureCount: bulkAction?.failureCount,
-          }),
-        });
-
-        return bulkAction;
-      } catch (error) {
-        // Handle the case where the controller is closed
-        logger.debug("Failed to send bulk action progress data, stream might be closed", { error });
-        return null;
-      }
-    };
-
-    return {
-      beforeStream: async () => {
-        logger.debug("Start dev presence listening SSE session", {
-          environmentId: environment.id,
-        });
-      },
-      initStream: async ({ send }) => {
-        const bulkAction = await getBulkActionProgress(send);
-
-        send({ event: "time", data: new Date().toISOString() });
-
-        if (bulkAction?.status !== BulkActionStatus.PENDING) {
-          return false;
-        }
-
-        return true;
-      },
-      iterator: async ({ send, date }) => {
-        const bulkAction = await getBulkActionProgress(send);
-
-        if (bulkAction?.status !== BulkActionStatus.PENDING) {
-          return false;
-        }
-
-        return true;
-      },
-      cleanup: async ({ send }) => {
-        await getBulkActionProgress(send);
-      },
-    };
-  },
-});
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
index 04809bafa48..be9a2763752 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.bulkaction.tsx
@@ -1,11 +1,9 @@
 import { parse } from "@conform-to/zod";
-import { ArrowPathIcon, CheckIcon, InformationCircleIcon } from "@heroicons/react/20/solid";
+import { ArrowPathIcon, InformationCircleIcon } from "@heroicons/react/20/solid";
 import { XCircleIcon } from "@heroicons/react/24/outline";
 import { Form } from "@remix-run/react";
 import { type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/router";
 import { tryCatch } from "@trigger.dev/core";
-import { type TaskRunStatus } from "@trigger.dev/database";
-import assertNever from "assert-never";
 import { useEffect, useState } from "react";
 import { typedjson, useTypedFetcher } from "remix-typedjson";
 import simplur from "simplur";
@@ -25,7 +23,6 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from "~/components/primitives/Accordion";
-import { AppliedFilter } from "~/components/primitives/AppliedFilter";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { CheckboxWithLabel } from "~/components/primitives/Checkbox";
 import {
@@ -43,19 +40,7 @@ import { InputGroup } from "~/components/primitives/InputGroup";
 import { Label } from "~/components/primitives/Label";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { RadioGroup, RadioGroupItem } from "~/components/primitives/RadioButton";
-import { SpinnerWhite } from "~/components/primitives/Spinner";
-import {
-  filterIcon,
-  filterTitle,
-  type TaskRunListSearchFilterKey,
-  type TaskRunListSearchFilters,
-} from "~/components/runs/v3/RunFilters";
-import {
-  appliedSummary,
-  dateFromString,
-  timeFilterRenderValues,
-} from "~/components/runs/v3/SharedFilters";
-import { runStatusTitle } from "~/components/runs/v3/TaskRunStatus";
+import { type TaskRunListSearchFilters } from "~/components/runs/v3/RunFilters";
 import { useEnvironment } from "~/hooks/useEnvironment";
 import { useOptimisticLocation } from "~/hooks/useOptimisticLocation";
 import { useOrganization } from "~/hooks/useOrganizations";
@@ -69,7 +54,6 @@ import { CreateBulkActionPresenter } from "~/presenters/v3/CreateBulkActionPrese
 import { logger } from "~/services/logger.server";
 import { requireUserId } from "~/services/session.server";
 import { cn } from "~/utils/cn";
-import { formatNumber } from "~/utils/numberFormatter";
 import { EnvironmentParamSchema, v3BulkActionPath, v3RunsPath } from "~/utils/pathBuilder";
 import { BulkActionService } from "~/v3/services/bulk/BulkActionV2.server";
 
@@ -320,7 +304,7 @@ export function CreateBulkActionInspector({
                   label={simplur`${selectedItems.size} individually selected run[|s]`}
                   value={"selected"}
                   variant="button/small"
-                  className="grow"
+                  className="grow tabular-nums"
                 />
               </RadioGroup>
             </InputGroup>
@@ -340,25 +324,25 @@ export function CreateBulkActionInspector({
                 }}
               >
                 <RadioGroupItem
-                  id="action-replay"
+                  id="action-cancel"
                   label={
                     <span className="inline-flex items-center gap-1">
-                      <ArrowPathIcon className="mb-0.5 size-4 text-blue-400" /> Replay runs
+                      <XCircleIcon className="size-4 text-error" /> Cancel runs
                     </span>
                   }
-                  description="Replays all selected runs, regardless of current status."
-                  value={"replay"}
+                  description="Cancels all runs still in progress. Any finished runs won’t be canceled."
+                  value={"cancel"}
                   variant="description"
                 />
                 <RadioGroupItem
-                  id="action-cancel"
+                  id="action-replay"
                   label={
                     <span className="inline-flex items-center gap-1">
-                      <XCircleIcon className="mb-0.5 size-4 text-error" /> Cancel runs
+                      <ArrowPathIcon className="size-4 text-blue-400" /> Replay runs
                     </span>
                   }
-                  description="Cancels all runs still in progress. Any finished runs won’t be canceled."
-                  value={"cancel"}
+                  description="Replays all selected runs, regardless of current status."
+                  value={"replay"}
                   variant="description"
                 />
               </RadioGroup>
@@ -466,8 +450,8 @@ function bulkActionModeFromString(value: string | undefined): BulkActionMode {
 }
 
 function bulkActionActionFromString(value: string | undefined): BulkActionAction {
-  if (!value) return "replay";
+  if (!value) return "cancel";
   const parsed = BulkActionAction.safeParse(value);
-  if (!parsed.success) return "replay";
+  if (!parsed.success) return "cancel";
   return parsed.data;
 }
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
new file mode 100644
index 00000000000..bb0fca6d745
--- /dev/null
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
@@ -0,0 +1,928 @@
+import { useForm } from "@conform-to/react";
+import { parse } from "@conform-to/zod";
+import {
+  CheckCircleIcon,
+  ExclamationTriangleIcon,
+} from "@heroicons/react/20/solid";
+import {
+  Form,
+  useActionData,
+  useFetcher,
+  useNavigation,
+  useLocation,
+} from "@remix-run/react";
+import {
+  type ActionFunctionArgs,
+  type LoaderFunctionArgs,
+  json,
+} from "@remix-run/server-runtime";
+import { typedjson, useTypedFetcher } from "remix-typedjson";
+import { z } from "zod";
+import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
+import { DialogClose } from "@radix-ui/react-dialog";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Callout } from "~/components/primitives/Callout";
+import { Fieldset } from "~/components/primitives/Fieldset";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { FormError } from "~/components/primitives/FormError";
+import { Hint } from "~/components/primitives/Hint";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { Label } from "~/components/primitives/Label";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { Select, SelectItem } from "~/components/primitives/Select";
+import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { DateTime } from "~/components/primitives/DateTime";
+import { VercelLogo } from "~/components/integrations/VercelLogo";
+import { BuildSettingsFields } from "~/components/integrations/VercelBuildSettings";
+import {
+  redirectBackWithErrorMessage,
+  redirectWithSuccessMessage,
+  redirectWithErrorMessage,
+} from "~/models/message.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
+import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import { sanitizeVercelNextUrl } from "~/v3/vercel/vercelUrls.server";
+import { EnvironmentParamSchema, v3ProjectSettingsPath, vercelAppInstallPath, vercelResourcePath } from "~/utils/pathBuilder";
+import {
+  VercelSettingsPresenter,
+  type VercelOnboardingData,
+} from "~/presenters/v3/VercelSettingsPresenter.server";
+import { VercelIntegrationService } from "~/services/vercelIntegration.server";
+import { VercelIntegrationRepository } from "~/models/vercelIntegration.server";
+import {
+  type VercelProjectIntegrationData,
+  type SyncEnvVarsMapping,
+  type EnvSlug,
+  envSlugArrayField,
+  envTypeToSlug,
+  getAvailableEnvSlugs,
+  getAvailableEnvSlugsForBuildSettings,
+} from "~/v3/vercel/vercelProjectIntegrationSchema";
+import { Result, fromPromise } from "neverthrow";
+import { useEffect, useState } from "react";
+
+export type ConnectedVercelProject = {
+  id: string;
+  vercelProjectId: string;
+  vercelProjectName: string;
+  vercelTeamId: string | null;
+  integrationData: VercelProjectIntegrationData;
+  createdAt: Date;
+};
+
+const safeJsonParse = Result.fromThrowable(
+  (val: string) => JSON.parse(val) as Record<string, unknown>,
+  () => null
+);
+
+function parseVercelStagingEnvironment(
+  value: string | null | undefined
+): { environmentId: string; displayName: string } | null {
+  if (!value) return null;
+  return safeJsonParse(value).match(
+    (parsed) => {
+      if (typeof parsed?.environmentId === "string" && typeof parsed?.displayName === "string") {
+        return { environmentId: parsed.environmentId, displayName: parsed.displayName };
+      }
+      return null;
+    },
+    () => null
+  );
+}
+
+const UpdateVercelConfigFormSchema = z.object({
+  action: z.literal("update-config"),
+  atomicBuilds: envSlugArrayField,
+  pullEnvVarsBeforeBuild: envSlugArrayField,
+  discoverEnvVars: envSlugArrayField,
+  vercelStagingEnvironment: z.string().nullable().optional(),
+});
+
+const DisconnectVercelFormSchema = z.object({
+  action: z.literal("disconnect"),
+});
+
+const CompleteOnboardingFormSchema = z.object({
+  action: z.literal("complete-onboarding"),
+  vercelStagingEnvironment: z.string().nullable().optional(),
+  pullEnvVarsBeforeBuild: envSlugArrayField,
+  atomicBuilds: envSlugArrayField,
+  discoverEnvVars: envSlugArrayField,
+  syncEnvVarsMapping: z.string().optional(),
+  next: z.string().optional(),
+  skipRedirect: z.string().optional().transform((val) => val === "true"),
+});
+
+const SkipOnboardingFormSchema = z.object({
+  action: z.literal("skip-onboarding"),
+});
+
+const SelectVercelProjectFormSchema = z.object({
+  action: z.literal("select-vercel-project"),
+  vercelProjectId: z.string().min(1, "Please select a Vercel project"),
+  vercelProjectName: z.string().min(1),
+});
+
+const UpdateEnvMappingFormSchema = z.object({
+  action: z.literal("update-env-mapping"),
+  vercelStagingEnvironment: z.string().nullable().optional(),
+});
+
+const DisableAutoAssignFormSchema = z.object({
+  action: z.literal("disable-auto-assign"),
+});
+
+const VercelActionSchema = z.discriminatedUnion("action", [
+  UpdateVercelConfigFormSchema,
+  DisconnectVercelFormSchema,
+  CompleteOnboardingFormSchema,
+  SkipOnboardingFormSchema,
+  SelectVercelProjectFormSchema,
+  UpdateEnvMappingFormSchema,
+  DisableAutoAssignFormSchema,
+]);
+
+export async function loader({ request, params }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const presenter = new VercelSettingsPresenter();
+  const resultOrFail = await presenter.call({
+    projectId: project.id,
+    organizationId: project.organizationId,
+  });
+
+  if (resultOrFail.isErr()) {
+    logger.error("Failed to load Vercel settings", {
+      url: request.url,
+      params,
+      error: resultOrFail.error,
+    });
+    throw new Response("Failed to load Vercel settings", { status: 500 });
+  }
+
+  const result = resultOrFail.value;
+  const url = new URL(request.url);
+  const needsOnboarding = url.searchParams.get("vercelOnboarding") === "true";
+  const vercelEnvironmentId = url.searchParams.get("vercelEnvironmentId") || undefined;
+
+  let onboardingData: VercelOnboardingData | null = null;
+  if (needsOnboarding) {
+    onboardingData = await presenter.getOnboardingData(
+      project.id,
+      project.organizationId,
+      vercelEnvironmentId
+    );
+  }
+
+  const authInvalid = onboardingData?.authInvalid || result.authInvalid || false;
+  const authError = onboardingData?.authError || result.authError;
+
+  return typedjson({
+    ...result,
+    authInvalid,
+    authError,
+    onboardingData,
+    organizationSlug,
+    projectSlug: projectParam,
+    environmentSlug: envParam,
+    projectId: project.id,
+    organizationId: project.organizationId,
+  });
+}
+
+export async function action({ request, params }: ActionFunctionArgs) {
+  const userId = await requireUserId(request);
+  const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
+
+  const project = await findProjectBySlug(organizationSlug, projectParam, userId);
+  if (!project) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const environment = await findEnvironmentBySlug(project.id, envParam, userId);
+  if (!environment) {
+    throw new Response("Not Found", { status: 404 });
+  }
+
+  const formData = await request.formData();
+  const submission = parse(formData, { schema: VercelActionSchema });
+
+  if (!submission.value || submission.intent !== "submit") {
+    return json(submission);
+  }
+
+  const settingsPath = v3ProjectSettingsPath(
+    { slug: organizationSlug },
+    { slug: projectParam },
+    { slug: envParam }
+  );
+
+  const vercelService = new VercelIntegrationService();
+  const { action: actionType } = submission.value;
+
+  switch (actionType) {
+    case "update-config": {
+      const {
+        atomicBuilds,
+        pullEnvVarsBeforeBuild,
+        discoverEnvVars,
+        vercelStagingEnvironment,
+      } = submission.value;
+
+      const parsedStagingEnv = parseVercelStagingEnvironment(vercelStagingEnvironment);
+
+      const result = await vercelService.updateVercelIntegrationConfig(project.id, {
+        atomicBuilds,
+        pullEnvVarsBeforeBuild,
+        discoverEnvVars,
+        vercelStagingEnvironment: parsedStagingEnv,
+      });
+
+      if (result) {
+        return redirectWithSuccessMessage(settingsPath, request, "Vercel settings updated successfully");
+      }
+
+      return redirectWithErrorMessage(settingsPath, request, "Failed to update Vercel settings");
+    }
+
+    case "disconnect": {
+      const success = await vercelService.disconnectVercelProject(project.id);
+
+      if (success) {
+        return redirectWithSuccessMessage(settingsPath, request, "Vercel project disconnected");
+      }
+
+      return redirectWithErrorMessage(settingsPath, request, "Failed to disconnect Vercel project");
+    }
+
+    case "complete-onboarding": {
+      const {
+        vercelStagingEnvironment,
+        pullEnvVarsBeforeBuild,
+        atomicBuilds,
+        discoverEnvVars,
+        syncEnvVarsMapping,
+        next,
+        skipRedirect,
+      } = submission.value;
+
+      const parsedStagingEnv = parseVercelStagingEnvironment(vercelStagingEnvironment);
+      const parsedSyncEnvVarsMapping = syncEnvVarsMapping
+        ? safeJsonParse(syncEnvVarsMapping).unwrapOr(undefined) as SyncEnvVarsMapping | undefined
+        : undefined;
+
+      const result = await vercelService.completeOnboarding(project.id, {
+        vercelStagingEnvironment: parsedStagingEnv,
+        pullEnvVarsBeforeBuild,
+        atomicBuilds,
+        discoverEnvVars,
+        syncEnvVarsMapping: parsedSyncEnvVarsMapping,
+      });
+
+      if (result) {
+        if (skipRedirect) {
+          return json({ success: true });
+        }
+
+        if (next) {
+          const sanitizedNext = sanitizeVercelNextUrl(next);
+          if (sanitizedNext) {
+            return json({ success: true, redirectTo: sanitizedNext });
+          }
+          logger.warn("Rejected next URL - not same-origin or vercel.com", { next });
+        }
+
+        return json({ success: true, redirectTo: settingsPath });
+      }
+
+      return redirectWithErrorMessage(settingsPath, request, "Failed to complete Vercel setup");
+    }
+
+    case "update-env-mapping": {
+      const { vercelStagingEnvironment } = submission.value;
+
+      const parsedStagingEnv = parseVercelStagingEnvironment(vercelStagingEnvironment);
+
+      const result = await vercelService.updateVercelIntegrationConfig(project.id, {
+        vercelStagingEnvironment: parsedStagingEnv,
+      });
+
+      if (result) {
+        return json({ success: true });
+      }
+
+      return json({ success: false, error: "Failed to update environment mapping" }, { status: 400 });
+    }
+
+    case "skip-onboarding": {
+      return redirectWithSuccessMessage(settingsPath, request, "Vercel integration setup skipped");
+    }
+
+    case "select-vercel-project": {
+      const { vercelProjectId, vercelProjectName } = submission.value;
+
+      const selectResult = await fromPromise(
+        vercelService.selectVercelProject({
+          organizationId: project.organizationId,
+          projectId: project.id,
+          vercelProjectId,
+          vercelProjectName,
+          userId,
+        }),
+        (error) => error
+      );
+
+      if (selectResult.isErr()) {
+        logger.error("Failed to select Vercel project", { error: selectResult.error });
+        return json({
+          error: "Failed to connect Vercel project. Please try again.",
+        });
+      }
+
+      const { integration, syncResult } = selectResult.value;
+
+      if (!syncResult.success && syncResult.errors.length > 0) {
+        logger.warn("Failed to send trigger secrets to Vercel", {
+          projectId: project.id,
+          vercelProjectId,
+          errors: syncResult.errors,
+        });
+      }
+
+      return json({
+        success: true,
+        integrationId: integration.id,
+        syncErrors: syncResult.errors,
+      });
+    }
+
+    case "disable-auto-assign": {
+      const orgIntegration = await VercelIntegrationRepository.findVercelOrgIntegrationForProject(
+        project.id
+      );
+
+      if (!orgIntegration) {
+        return redirectWithErrorMessage(settingsPath, request, "No Vercel integration found");
+      }
+
+      const projectIntegration = await vercelService.getVercelProjectIntegration(project.id);
+
+      if (!projectIntegration) {
+        return redirectWithErrorMessage(settingsPath, request, "No Vercel project connected");
+      }
+
+      const teamId = await VercelIntegrationRepository.getTeamIdFromIntegration(orgIntegration);
+
+      const disableResult = await VercelIntegrationRepository.getVercelClient(orgIntegration)
+        .andThen((client) =>
+          VercelIntegrationRepository.disableAutoAssignCustomDomains(
+            client,
+            projectIntegration.parsedIntegrationData.vercelProjectId,
+            teamId
+          )
+        );
+
+      if (disableResult.isErr()) {
+        logger.error("Failed to disable auto-assign custom domains", { error: disableResult.error });
+        return redirectWithErrorMessage(settingsPath, request, "Failed to disable auto-assign custom domains");
+      }
+
+      return redirectWithSuccessMessage(settingsPath, request, "Auto-assign custom domains disabled");
+    }
+
+    default: {
+      submission.value satisfies never;
+      return redirectBackWithErrorMessage(request, "Failed to process request");
+    }
+  }
+}
+
+function VercelConnectionPrompt({
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  hasOrgIntegration,
+  isGitHubConnected,
+  onOpenModal,
+  isLoading,
+}: {
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  hasOrgIntegration: boolean;
+  isGitHubConnected: boolean;
+  onOpenModal?: () => void;
+  isLoading?: boolean;
+}) {
+  const installPath = vercelAppInstallPath(organizationSlug, projectSlug);
+
+  const handleConnectProject = () => {
+    if (onOpenModal) {
+      onOpenModal();
+    }
+  };
+
+  const isLoadingProjects = isLoading ?? false;
+  const isDisabled = isLoadingProjects || !onOpenModal;
+
+  return (
+    <Fieldset>
+      <InputGroup fullWidth>
+        <div className="flex flex-col gap-3">
+          <div className="flex items-center gap-3">
+            {hasOrgIntegration ? (
+              <>
+                <Button
+                  variant="secondary/medium"
+                  onClick={handleConnectProject}
+                  disabled={isDisabled}
+                  LeadingIcon={
+                    isLoadingProjects
+                      ? () => <SpinnerWhite className="size-4" />
+                      : () => <VercelLogo className="size-4 -mx-1" />
+                  }
+                >
+                  {isLoadingProjects ? "Loading projects..." : "Connect Vercel project"}
+                </Button>
+                <span className="flex items-center gap-1 text-xs text-text-dimmed">
+                  <CheckCircleIcon className="size-4 text-success" /> Vercel app is installed
+                </span>
+                {!onOpenModal && (
+                  <span className="text-xs text-amber-400">
+                    Please reconnect Vercel to continue
+                  </span>
+                )}
+              </>
+            ) : (
+              <>
+                <LinkButton
+                  to={installPath}
+                  variant="secondary/medium"
+                  LeadingIcon={() => <VercelLogo className="size-4 -mx-1" />}
+                >
+                  Install Vercel app
+                </LinkButton>
+              </>
+            )}
+          </div>
+        </div>
+      </InputGroup>
+    </Fieldset>
+  );
+}
+
+function VercelAuthInvalidBanner({ 
+  organizationSlug,
+  projectSlug,
+}: { 
+  organizationSlug: string;
+  projectSlug: string;
+}) {
+  const installUrl = vercelAppInstallPath(organizationSlug, projectSlug);
+
+  return (
+    <Callout variant="error" className="mb-4">
+      <div className="flex items-start gap-3">
+        <div className="flex-1">
+          <p className="font-sans text-sm font-medium text-text-bright mb-2">
+            Vercel connection expired
+          </p>
+          <p className="font-sans text-xs text-text-dimmed mb-3">
+            Your Vercel access token has expired or been revoked. Please reconnect to restore functionality.
+          </p>
+          <LinkButton
+            to={installUrl}
+            variant="minimal/small"
+            className="bg-error/10 hover:bg-error/20 text-error border-error/20"
+          >
+            Reconnect Vercel
+          </LinkButton>
+        </div>
+      </div>
+    </Callout>
+  );
+}
+
+function VercelGitHubWarning() {
+  return (
+    <Callout variant="warning" className="mb-4">
+      <p className="font-sans text-xs font-normal text-text-dimmed">
+        GitHub integration is not connected. Vercel integration cannot sync environment variables and
+        link deployments without a properly installed GitHub integration.
+      </p>
+    </Callout>
+  );
+}
+
+function envSlugLabel(slug: EnvSlug): string {
+  switch (slug) {
+    case "prod":
+      return "Production";
+    case "stg":
+      return "Staging";
+    case "preview":
+      return "Preview";
+    case "dev":
+      return "Development";
+  }
+}
+
+function ConnectedVercelProjectForm({
+  connectedProject,
+  hasStagingEnvironment,
+  hasPreviewEnvironment,
+  customEnvironments,
+  autoAssignCustomDomains,
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+}: {
+  connectedProject: ConnectedVercelProject;
+  hasStagingEnvironment: boolean;
+  hasPreviewEnvironment: boolean;
+  customEnvironments: Array<{ id: string; slug: string }>;
+  autoAssignCustomDomains: boolean | null;
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+}) {
+  const lastSubmission = useActionData() as any;
+  const navigation = useNavigation();
+
+  const [hasConfigChanges, setHasConfigChanges] = useState(false);
+  const [configValues, setConfigValues] = useState({
+    atomicBuilds: connectedProject.integrationData.config.atomicBuilds ?? [],
+    pullEnvVarsBeforeBuild: connectedProject.integrationData.config.pullEnvVarsBeforeBuild ?? [],
+    discoverEnvVars: connectedProject.integrationData.config.discoverEnvVars ?? [],
+    vercelStagingEnvironment:
+      connectedProject.integrationData.config.vercelStagingEnvironment ?? null,
+  });
+
+  const originalAtomicBuilds = connectedProject.integrationData.config.atomicBuilds ?? [];
+  const originalPullEnvVars = connectedProject.integrationData.config.pullEnvVarsBeforeBuild ?? [];
+  const originalDiscoverEnvVars = connectedProject.integrationData.config.discoverEnvVars ?? [];
+  const originalStagingEnv = connectedProject.integrationData.config.vercelStagingEnvironment ?? null;
+
+  useEffect(() => {
+    const atomicBuildsChanged =
+      JSON.stringify([...configValues.atomicBuilds].sort()) !==
+      JSON.stringify([...originalAtomicBuilds].sort());
+    const pullEnvVarsChanged =
+      JSON.stringify([...configValues.pullEnvVarsBeforeBuild].sort()) !==
+      JSON.stringify([...originalPullEnvVars].sort());
+    const discoverEnvVarsChanged =
+      JSON.stringify([...configValues.discoverEnvVars].sort()) !==
+      JSON.stringify([...originalDiscoverEnvVars].sort());
+    const stagingEnvChanged = configValues.vercelStagingEnvironment?.environmentId !== originalStagingEnv?.environmentId;
+
+    setHasConfigChanges(atomicBuildsChanged || pullEnvVarsChanged || discoverEnvVarsChanged || stagingEnvChanged);
+  }, [configValues, originalAtomicBuilds, originalPullEnvVars, originalDiscoverEnvVars, originalStagingEnv]);
+
+  const [configForm, fields] = useForm({
+    id: "update-vercel-config",
+    lastSubmission: lastSubmission,
+    shouldRevalidate: "onSubmit",
+    onValidate({ formData }) {
+      return parse(formData, {
+        schema: UpdateVercelConfigFormSchema,
+      });
+    },
+  });
+
+  const isConfigLoading =
+    navigation.formData?.get("action") === "update-config" &&
+    (navigation.state === "submitting" || navigation.state === "loading");
+
+  const actionUrl = vercelResourcePath(organizationSlug, projectSlug, environmentSlug);
+
+  const availableEnvSlugs = getAvailableEnvSlugs(hasStagingEnvironment, hasPreviewEnvironment);
+  const availableEnvSlugsForBuildSettings = getAvailableEnvSlugsForBuildSettings(hasStagingEnvironment, hasPreviewEnvironment);
+
+  const formatSelectedEnvs = (selected: EnvSlug[], availableSlugs: EnvSlug[] = availableEnvSlugs): string => {
+    if (selected.length === 0) return "None selected";
+    if (selected.length === availableSlugs.length) return "All environments";
+    return selected.map(envSlugLabel).join(", ");
+  };
+
+  return (
+    <>
+      <div className="mb-4 flex items-center justify-between rounded-sm border bg-grid-dimmed p-2">
+        <div className="flex items-center gap-2">
+          <VercelLogo className="size-4" />
+          <span className="max-w-52 truncate text-sm text-text-bright">
+            {connectedProject.vercelProjectName}
+          </span>
+          <span className="text-xs text-text-dimmed">
+            <DateTime
+              date={connectedProject.createdAt}
+              includeTime={false}
+              includeSeconds={false}
+              showTimezone={false}
+              showTooltip={false}
+            />
+          </span>
+        </div>
+        <Dialog>
+          <DialogTrigger asChild>
+            <Button variant="minimal/small">Disconnect</Button>
+          </DialogTrigger>
+          <DialogContent className="max-w-md">
+            <DialogHeader>Disconnect Vercel project</DialogHeader>
+            <div className="flex flex-col gap-3 pt-3">
+              <Paragraph className="mb-1">
+                Are you sure you want to disconnect{" "}
+                <span className="font-semibold">{connectedProject.vercelProjectName}</span>?
+                This will stop pulling environment variables and disable atomic deployments.
+              </Paragraph>
+              <FormButtons
+                confirmButton={
+                  <Form method="post" action={actionUrl}>
+                    <input type="hidden" name="action" value="disconnect" />
+                    <Button type="submit" variant="danger/medium">
+                      Disconnect project
+                    </Button>
+                  </Form>
+                }
+                cancelButton={
+                  <DialogClose asChild>
+                    <Button variant="tertiary/medium">Cancel</Button>
+                  </DialogClose>
+                }
+              />
+            </div>
+          </DialogContent>
+        </Dialog>
+      </div>
+
+      {/* Configuration form */}
+      <Form method="post" action={actionUrl} {...configForm.props}>
+        <input
+          type="hidden"
+          name="atomicBuilds"
+          value={JSON.stringify(configValues.atomicBuilds)}
+        />
+        <input
+          type="hidden"
+          name="pullEnvVarsBeforeBuild"
+          value={JSON.stringify(configValues.pullEnvVarsBeforeBuild)}
+        />
+        <input
+          type="hidden"
+          name="discoverEnvVars"
+          value={JSON.stringify(configValues.discoverEnvVars)}
+        />
+        <input
+          type="hidden"
+          name="vercelStagingEnvironment"
+          value={configValues.vercelStagingEnvironment ? JSON.stringify(configValues.vercelStagingEnvironment) : ""}
+        />
+
+        <Fieldset>
+          <InputGroup fullWidth>
+            <div className="flex flex-col gap-4">
+              {/* Staging environment mapping */}
+              {hasStagingEnvironment && customEnvironments && customEnvironments.length > 0 && (
+                <div>
+                  <Label>Map Vercel environment to Staging</Label>
+                  <Hint className="mb-2">
+                    Select which custom Vercel environment should map to Trigger.dev's Staging
+                    environment.
+                  </Hint>
+                  <Select
+                    value={configValues.vercelStagingEnvironment?.environmentId || ""}
+                    setValue={(value) => {
+                      if (!Array.isArray(value)) {
+                        const env = customEnvironments?.find((e) => e.id === value);
+                        setConfigValues((prev) => ({
+                          ...prev,
+                          vercelStagingEnvironment: env
+                            ? { environmentId: env.id, displayName: env.slug }
+                            : null,
+                        }));
+                      }
+                    }}
+                    items={[{ id: "", slug: "None" }, ...customEnvironments]}
+                    variant="tertiary/small"
+                    placeholder="Select environment"
+                    dropdownIcon
+                    text={configValues.vercelStagingEnvironment?.displayName || "None"}
+                  >
+                    {[
+                      <SelectItem key="" value="">
+                        None
+                      </SelectItem>,
+                      ...customEnvironments.map((env) => (
+                        <SelectItem key={env.id} value={env.id}>
+                          {env.slug}
+                        </SelectItem>
+                      )),
+                    ]}
+                  </Select>
+                </div>
+              )}
+
+              <BuildSettingsFields
+                availableEnvSlugs={availableEnvSlugsForBuildSettings}
+                pullEnvVarsBeforeBuild={configValues.pullEnvVarsBeforeBuild}
+                onPullEnvVarsChange={(slugs) =>
+                  setConfigValues((prev) => ({ ...prev, pullEnvVarsBeforeBuild: slugs }))
+                }
+                discoverEnvVars={configValues.discoverEnvVars}
+                onDiscoverEnvVarsChange={(slugs) =>
+                  setConfigValues((prev) => ({ ...prev, discoverEnvVars: slugs }))
+                }
+                atomicBuilds={configValues.atomicBuilds}
+                onAtomicBuildsChange={(slugs) =>
+                  setConfigValues((prev) => ({ ...prev, atomicBuilds: slugs }))
+                }
+                envVarsConfigLink={`/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/environment-variables`}
+              />
+
+              {/* Warning: autoAssignCustomDomains must be disabled for atomic deployments */}
+              {autoAssignCustomDomains !== false &&
+                configValues.atomicBuilds.includes("prod") && (
+                  <Callout variant="warning">
+                    <div className="flex flex-col gap-2">
+                      <p className="font-sans text-xs font-normal text-text-dimmed">
+                        Atomic deployments require the "Auto-assign Custom Domains" setting to be
+                        disabled on your Vercel project. Without this, Vercel will promote
+                        deployments before Trigger.dev is ready.
+                      </p>
+                      <Form method="post" action={actionUrl}>
+                        <input type="hidden" name="action" value="disable-auto-assign" />
+                        <Button
+                          type="submit"
+                          variant="tertiary/small"
+                          disabled={
+                            navigation.formData?.get("action") === "disable-auto-assign" &&
+                            (navigation.state === "submitting" || navigation.state === "loading")
+                          }
+                          LeadingIcon={
+                            navigation.formData?.get("action") === "disable-auto-assign" &&
+                            (navigation.state === "submitting" || navigation.state === "loading")
+                              ? SpinnerWhite
+                              : undefined
+                          }
+                        >
+                          Disable auto-assign custom domains
+                        </Button>
+                      </Form>
+                    </div>
+                  </Callout>
+                )}
+            </div>
+
+            <FormError>{configForm.error}</FormError>
+          </InputGroup>
+
+          <FormButtons
+            confirmButton={
+              <Button
+                type="submit"
+                name="action"
+                value="update-config"
+                variant="secondary/small"
+                disabled={isConfigLoading || !hasConfigChanges}
+                LeadingIcon={isConfigLoading ? SpinnerWhite : undefined}
+              >
+                Save
+              </Button>
+            }
+          />
+        </Fieldset>
+      </Form>
+    </>
+  );
+}
+
+function VercelSettingsPanel({
+  organizationSlug,
+  projectSlug,
+  environmentSlug,
+  onOpenVercelModal,
+  isLoadingVercelData,
+}: {
+  organizationSlug: string;
+  projectSlug: string;
+  environmentSlug: string;
+  onOpenVercelModal?: () => void;
+  isLoadingVercelData?: boolean;
+}) {
+  const fetcher = useTypedFetcher<typeof loader>();
+  const location = useLocation();
+  const data = fetcher.data;
+  const [hasError, setHasError] = useState(false);
+  const [hasFetched, setHasFetched] = useState(false);
+
+  useEffect(() => {
+    if (!data?.authInvalid && !hasError && !data && !hasFetched) {
+      fetcher.load(vercelResourcePath(organizationSlug, projectSlug, environmentSlug));
+      setHasFetched(true);
+    }
+  }, [organizationSlug, projectSlug, environmentSlug, data?.authInvalid, hasError, data, hasFetched]);
+
+  useEffect(() => {
+    if (hasFetched && fetcher.state === "idle" && fetcher.data === undefined && !hasError) {
+      setHasError(true);
+    }
+  }, [fetcher.state, fetcher.data, hasError, hasFetched]);
+
+  if (hasError) {
+    return (
+      <div className="rounded-sm border border-rose-500/40 bg-rose-500/10 p-4">
+        <div className="flex items-start gap-3">
+          <ExclamationTriangleIcon className="h-5 w-5 text-rose-500 flex-shrink-0" />
+          <div>
+            <p className="font-medium text-rose-400">Failed to load Vercel settings</p>
+            <p className="text-sm text-rose-300 mt-1">
+              There was an error loading the Vercel integration settings. Please refresh the page to try again.
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (fetcher.state === "loading" && !data) {
+    return (
+      <div className="flex items-center gap-2 text-text-dimmed">
+        <SpinnerWhite className="size-4" />
+        <span className="text-sm">Loading Vercel settings...</span>
+      </div>
+    );
+  }
+
+  if (!data || !data.enabled) {
+    return null;
+  }
+
+  const showGitHubWarning = data.connectedProject && !data.isGitHubConnected;
+  const showAuthInvalid = data.authInvalid || data.onboardingData?.authInvalid;
+
+  if (data.connectedProject) {
+    return (
+      <>
+        {showAuthInvalid && <VercelAuthInvalidBanner organizationSlug={organizationSlug} projectSlug={projectSlug} />}
+        {showGitHubWarning && <VercelGitHubWarning />}
+        {!showAuthInvalid && (<ConnectedVercelProjectForm
+          connectedProject={data.connectedProject}
+          hasStagingEnvironment={data.hasStagingEnvironment}
+          hasPreviewEnvironment={data.hasPreviewEnvironment}
+          customEnvironments={data.customEnvironments}
+          autoAssignCustomDomains={data.autoAssignCustomDomains ?? null}
+          organizationSlug={organizationSlug}
+          projectSlug={projectSlug}
+          environmentSlug={environmentSlug}
+        />)}
+      </>
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-2">
+      {showAuthInvalid && <VercelAuthInvalidBanner organizationSlug={organizationSlug} projectSlug={projectSlug} />}
+      {!showAuthInvalid && (
+        <>
+          <VercelConnectionPrompt
+            organizationSlug={organizationSlug}
+            projectSlug={projectSlug}
+            environmentSlug={environmentSlug}
+            hasOrgIntegration={data.hasOrgIntegration}
+            isGitHubConnected={data.isGitHubConnected}
+            onOpenModal={showAuthInvalid ? undefined : onOpenVercelModal}
+            isLoading={isLoadingVercelData}
+          />
+          <Hint>
+            {data.hasOrgIntegration
+              ? "Connect your Vercel project to pull environment variables and trigger builds automatically."
+              : "Install the Vercel app to connect your projects and pull environment variables."}
+          </Hint>
+          {!data.isGitHubConnected && (
+            <Hint>
+              GitHub integration is not connected. Vercel integration cannot sync environment variables and
+              link deployments without a properly installed GitHub integration.
+            </Hint>
+          )}
+        </>
+      )}
+    </div>
+  );
+}
+
+
+import { VercelOnboardingModal } from "~/components/integrations/VercelOnboardingModal";
+
+export { VercelSettingsPanel, VercelOnboardingModal };
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
index 4871a2d0b74..b08cc63ff9d 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
@@ -7,17 +7,18 @@ import {
 } from "@heroicons/react/20/solid";
 import { ArrowDownCircleIcon, ArrowUpCircleIcon } from "@heroicons/react/24/outline";
 import { Form, useLocation, useNavigation } from "@remix-run/react";
-import { ActionFunctionArgs } from "@remix-run/server-runtime";
+import { type ActionFunctionArgs } from "@remix-run/server-runtime";
 import { uiComponent } from "@team-plain/typescript-sdk";
 import { GitHubLightIcon } from "@trigger.dev/companyicons";
 import {
-  FreePlanDefinition,
-  Limits,
-  PaidPlanDefinition,
-  Plans,
-  SetPlanBody,
-  SubscriptionResult,
-} from "@trigger.dev/platform/v3";
+  type AddOnPricing,
+  type FreePlanDefinition,
+  type Limits,
+  type PaidPlanDefinition,
+  type Plans,
+  type SetPlanBody,
+  type SubscriptionResult,
+} from "@trigger.dev/platform";
 import React, { useEffect, useState } from "react";
 import { z } from "zod";
 import { DefinitionTip } from "~/components/DefinitionTooltip";
@@ -42,8 +43,11 @@ import { redirectWithErrorMessage } from "~/models/message.server";
 import { logger } from "~/services/logger.server";
 import { setPlan } from "~/services/platform.v3.server";
 import { requireUser } from "~/services/session.server";
+import { engine } from "~/v3/runEngine.server";
 import { cn } from "~/utils/cn";
 import { sendToPlain } from "~/utils/plain.server";
+import { formatCurrency } from "~/utils/numberFormatter";
+import { EnvironmentLabel } from "~/components/environments/EnvironmentLabel";
 
 const Params = z.object({
   organizationSlug: z.string(),
@@ -74,8 +78,8 @@ export async function action({ request, params }: ActionFunctionArgs) {
     message: message || undefined,
   });
 
-  const organization = await prisma.organization.findUnique({
-    where: { slug: organizationSlug },
+  const organization = await prisma.organization.findFirst({
+    where: { slug: organizationSlug, members: { some: { userId: user.id } } },
   });
 
   if (!organization) {
@@ -152,7 +156,9 @@ export async function action({ request, params }: ActionFunctionArgs) {
     }
   }
 
-  return setPlan(organization, request, form.callerPath, payload);
+  return await setPlan(organization, request, form.callerPath, payload, {
+    invalidateBillingCache: engine.invalidateBillingCache.bind(engine),
+  });
 }
 
 const pricingDefinitions = {
@@ -168,6 +174,9 @@ const pricingDefinitions = {
     title: "Concurrent runs",
     content: "The number of runs that can be executed at the same time.",
   },
+  additionalConcurrency: {
+    title: "Additional concurrency",
+  },
   taskRun: {
     title: "Task runs",
     content: "A single execution of a task.",
@@ -185,6 +194,10 @@ const pricingDefinitions = {
     title: "Schedules",
     content: "You can attach recurring schedules to tasks using cron syntax.",
   },
+  additionalSchedules: {
+    title: "Additional schedules",
+    content: "Then $10/month per 1,000",
+  },
   alerts: {
     title: "Alert destination",
     content:
@@ -195,14 +208,40 @@ const pricingDefinitions = {
     content:
       "Realtime allows you to send the live status and data from your runs to your frontend. This is the number of simultaneous Realtime connections that can be made.",
   },
+  additionalRealtimeConnections: {
+    title: "Additional Realtime connections",
+    content: "Then $10/month per 100",
+  },
+  additionalSeats: {
+    title: "Additional seats",
+    content: "Then $20/month per seat",
+  },
   branches: {
     title: "Branches",
-    content: "The number of preview branches that can be active (you can archive old ones).",
+    content:
+      "Preview branches allow you to test changes before deploying to production. You can have a limited number active at once (but can archive old ones).",
+  },
+  additionalBranches: {
+    title: "Additional branches",
+    content: "Then $10/month per branch",
+  },
+  metricDashboards: {
+    title: "Custom dashboards",
+    content: "Custom metric dashboards for monitoring and visualizing your task data.",
+  },
+  additionalDashboards: {
+    title: "Additional dashboards",
+    content: "Then $10/month per dashboard",
+  },
+  queryPeriod: {
+    title: "Query period",
+    content: "The maximum number of days a query can look back when analyzing your task data.",
   },
 };
 
 type PricingPlansProps = {
   plans: Plans;
+  concurrencyAddOnPricing: AddOnPricing;
   subscription?: SubscriptionResult;
   organizationSlug: string;
   hasPromotedPlan: boolean;
@@ -212,6 +251,7 @@ type PricingPlansProps = {
 
 export function PricingPlans({
   plans,
+  concurrencyAddOnPricing,
   subscription,
   organizationSlug,
   hasPromotedPlan,
@@ -234,7 +274,12 @@ export function PricingPlans({
           subscription={subscription}
           isHighlighted={hasPromotedPlan}
         />
-        <TierPro plan={plans.pro} organizationSlug={organizationSlug} subscription={subscription} />
+        <TierPro
+          plan={plans.pro}
+          organizationSlug={organizationSlug}
+          subscription={subscription}
+          concurrencyAddOnPricing={concurrencyAddOnPricing}
+        />
       </div>
       <div className="mt-3">
         <TierEnterprise />
@@ -335,7 +380,7 @@ export function TierFree({
                 <div className="my-6">
                   <Button
                     type="button"
-                    variant="tertiary/large"
+                    variant="secondary/large"
                     fullWidth
                     className="text-md font-medium"
                     disabled={isLoading}
@@ -381,7 +426,7 @@ export function TierFree({
             <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen} key="cancel">
               <DialogTrigger asChild>
                 <div className="my-6">
-                  <Button variant="tertiary/large" fullWidth className="text-md font-medium">
+                  <Button variant="secondary/large" fullWidth className="text-md font-medium">
                     {`Downgrade to ${plan.title}`}
                   </Button>
                 </div>
@@ -408,6 +453,7 @@ export function TierFree({
                       <Header2 className="mb-1">Why are you thinking of downgrading?</Header2>
                       <ul className="space-y-1">
                         {[
+                          "The Free plan is all I need",
                           "Subscription or usage costs too expensive",
                           "Bugs or technical issues",
                           "No longer need the service",
@@ -442,7 +488,7 @@ export function TierFree({
                     </div>
                   </div>
                   <DialogFooter className="mt-2">
-                    <Button variant="tertiary/medium" onClick={() => setIsDialogOpen(false)}>
+                    <Button variant="secondary/medium" onClick={() => setIsDialogOpen(false)}>
                       Dismiss
                     </Button>
                     <Button
@@ -462,7 +508,7 @@ export function TierFree({
               <input type="hidden" name="type" value="free" />
               <input type="hidden" name="callerPath" value={location.pathname} />
               <Button
-                variant="tertiary/large"
+                variant="secondary/large"
                 type="submit"
                 form="subscribe-verified"
                 fullWidth
@@ -500,11 +546,13 @@ export function TierFree({
             <TeamMembers limits={plan.limits} />
             <Environments limits={plan.limits} />
             <Branches limits={plan.limits} />
+            <MetricDashboards limits={plan.limits} />
             <Schedules limits={plan.limits} />
             <LogRetention limits={plan.limits} />
+            <QueryPeriod limits={plan.limits} />
             <SupportLevel limits={plan.limits} />
             <Alerts limits={plan.limits} />
-            <RealtimeConnecurrency limits={plan.limits} />
+            <RealtimeConcurrency limits={plan.limits} />
           </ul>
         </>
       )}
@@ -549,7 +597,7 @@ export function TierHobby({
         subscription.plan.code !== plan.code ? (
           <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen} key="downgrade">
             <DialogTrigger asChild>
-              <Button variant="tertiary/large" fullWidth className="text-md font-medium">
+              <Button variant="secondary/large" fullWidth className="text-md font-medium">
                 {`Downgrade to ${plan.title}`}
               </Button>
             </DialogTrigger>
@@ -565,11 +613,11 @@ export function TierHobby({
                 </Paragraph>
               </div>
               <DialogFooter>
-                <Button variant="tertiary/medium" onClick={() => setIsDialogOpen(false)}>
+                <Button variant="secondary/medium" onClick={() => setIsDialogOpen(false)}>
                   Dismiss
                 </Button>
                 <Button
-                  variant="tertiary/medium"
+                  variant="secondary/medium"
                   disabled={isLoading}
                   LeadingIcon={isLoading ? () => <Spinner color="white" /> : undefined}
                   form="subscribe-hobby"
@@ -581,7 +629,7 @@ export function TierHobby({
           </Dialog>
         ) : (
           <Button
-            variant={isHighlighted ? "primary/large" : "tertiary/large"}
+            variant={isHighlighted ? "primary/large" : "secondary/large"}
             fullWidth
             className="text-md font-medium"
             form="subscribe-hobby"
@@ -617,11 +665,13 @@ export function TierHobby({
         <TeamMembers limits={plan.limits} />
         <Environments limits={plan.limits} />
         <Branches limits={plan.limits} />
+        <MetricDashboards limits={plan.limits} />
         <Schedules limits={plan.limits} />
         <LogRetention limits={plan.limits} />
+        <QueryPeriod limits={plan.limits} />
         <SupportLevel limits={plan.limits} />
         <Alerts limits={plan.limits} />
-        <RealtimeConnecurrency limits={plan.limits} />
+        <RealtimeConcurrency limits={plan.limits} />
       </ul>
     </TierContainer>
   );
@@ -629,10 +679,12 @@ export function TierHobby({
 
 export function TierPro({
   plan,
+  concurrencyAddOnPricing,
   organizationSlug,
   subscription,
 }: {
   plan: PaidPlanDefinition;
+  concurrencyAddOnPricing: AddOnPricing;
   organizationSlug: string;
   subscription?: SubscriptionResult;
 }) {
@@ -663,7 +715,7 @@ export function TierPro({
           subscription.canceledAt === undefined ? (
             <Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen} key="upgrade">
               <DialogTrigger asChild>
-                <Button variant="tertiary/large" fullWidth className="text-md font-medium">
+                <Button variant="secondary/large" fullWidth className="text-md font-medium">
                   {`Upgrade to ${plan.title}`}
                 </Button>
               </DialogTrigger>
@@ -679,7 +731,7 @@ export function TierPro({
                   </Paragraph>
                 </div>
                 <DialogFooter>
-                  <Button variant="tertiary/medium" onClick={() => setIsDialogOpen(false)}>
+                  <Button variant="secondary/medium" onClick={() => setIsDialogOpen(false)}>
                     Dismiss
                   </Button>
                   <Button
@@ -695,7 +747,7 @@ export function TierPro({
             </Dialog>
           ) : (
             <Button
-              variant="tertiary/large"
+              variant="secondary/large"
               fullWidth
               form="subscribe-pro"
               className="text-md font-medium"
@@ -721,7 +773,11 @@ export function TierPro({
         </div>
       </Form>
       <ul className="flex flex-col gap-2.5">
-        <ConcurrentRuns limits={plan.limits} />
+        <ConcurrentRuns limits={plan.limits}>
+          {`Then ${formatCurrency(concurrencyAddOnPricing.centsPerStep / 100, true)}/month per ${
+            concurrencyAddOnPricing.stepSize
+          }`}
+        </ConcurrentRuns>
         <FeatureItem checked>
           Unlimited{" "}
           <DefinitionTip
@@ -731,14 +787,20 @@ export function TierPro({
             tasks
           </DefinitionTip>
         </FeatureItem>
-        <TeamMembers limits={plan.limits} />
+        <TeamMembers limits={plan.limits}>{pricingDefinitions.additionalSeats.content}</TeamMembers>
         <Environments limits={plan.limits} />
-        <Branches limits={plan.limits} />
-        <Schedules limits={plan.limits} />
+        <Branches limits={plan.limits}>{pricingDefinitions.additionalBranches.content}</Branches>
+        <MetricDashboards limits={plan.limits}>
+          {pricingDefinitions.additionalDashboards.content}
+        </MetricDashboards>
+        <Schedules limits={plan.limits}>{pricingDefinitions.additionalSchedules.content}</Schedules>
         <LogRetention limits={plan.limits} />
+        <QueryPeriod limits={plan.limits} />
         <SupportLevel limits={plan.limits} />
         <Alerts limits={plan.limits} />
-        <RealtimeConnecurrency limits={plan.limits} />
+        <RealtimeConcurrency limits={plan.limits}>
+          {pricingDefinitions.additionalRealtimeConnections.content}
+        </RealtimeConcurrency>
       </ul>
     </TierContainer>
   );
@@ -785,11 +847,11 @@ export function TierEnterprise() {
           <Feedback
             defaultValue="enterprise"
             button={
-              <div className="flex h-10 w-full cursor-pointer items-center justify-center rounded bg-tertiary px-8 text-base font-medium transition hover:bg-charcoal-600">
+              <div className="flex h-10 w-full cursor-pointer items-center justify-center rounded border border-charcoal-600 bg-tertiary px-8 text-base font-medium transition hover:border-charcoal-550 hover:bg-charcoal-600">
                 <span className="text-center text-text-bright">Contact us</span>
               </div>
             }
-          ></Feedback>
+          />
         </div>
       </div>
     </TierContainer>
@@ -809,7 +871,7 @@ function TierContainer({
     <div
       className={cn(
         "flex w-full min-w-[16rem] flex-col p-6",
-        isHighlighted ? "border border-primary" : "border border-grid-dimmed",
+        isHighlighted ? "border border-indigo-500" : "border border-grid-dimmed",
         className
       )}
     >
@@ -840,7 +902,10 @@ function PricingHeader({
   return (
     <div className="flex flex-col gap-2">
       <h2
-        className={cn("text-xl font-medium", isHighlighted ? "text-primary" : "text-text-dimmed")}
+        className={cn(
+          "text-xl font-medium",
+          isHighlighted ? "text-indigo-500" : "text-text-dimmed"
+        )}
       >
         {title}
       </h2>
@@ -896,16 +961,16 @@ function FeatureItem({
   children: React.ReactNode;
 }) {
   return (
-    <li className="flex items-center gap-2">
+    <li className="flex items-start gap-2">
       {checked ? (
         <CheckIcon
           className={cn(
-            "size-4 min-w-4",
+            "mt-0.5 size-4 min-w-4",
             checkedColor === "primary" ? "text-primary" : "text-text-bright"
           )}
         />
       ) : (
-        <XMarkIcon className="size-4 min-w-4 text-charcoal-500" />
+        <XMarkIcon className="mt-0.5 size-4 min-w-4 text-charcoal-500" />
       )}
       <div
         className={cn(
@@ -919,26 +984,77 @@ function FeatureItem({
   );
 }
 
-function ConcurrentRuns({ limits }: { limits: Limits }) {
+function ConcurrentRuns({ limits, children }: { limits: Limits; children?: React.ReactNode }) {
   return (
     <FeatureItem checked>
-      {limits.concurrentRuns.number}
-      {limits.concurrentRuns.canExceed ? "+" : ""}{" "}
-      <DefinitionTip
-        title={pricingDefinitions.concurrentRuns.title}
-        content={pricingDefinitions.concurrentRuns.content}
-      >
-        concurrent runs
-      </DefinitionTip>
+      <div className="flex flex-col gap-y-0.5">
+        <div className="flex items-center gap-1">
+          {limits.concurrentRuns.canExceed ? (
+            <>
+              {limits.concurrentRuns.number}
+              {"+"}
+            </>
+          ) : (
+            <>{limits.concurrentRuns.number} </>
+          )}
+          <DefinitionTip
+            title={pricingDefinitions.concurrentRuns.title}
+            content={
+              <div className="flex flex-col">
+                <Paragraph variant="small/dimmed" spacing>
+                  {pricingDefinitions.concurrentRuns.content}
+                </Paragraph>
+
+                <div className="flex items-center gap-x-1">
+                  <EnvironmentLabel environment={{ type: "PRODUCTION" }} />
+                  <span>
+                    {limits.concurrentRuns.production}
+                    {limits.concurrentRuns.canExceed ? "+" : ""}
+                  </span>
+                </div>
+                <div className="flex items-center gap-x-1">
+                  <EnvironmentLabel environment={{ type: "STAGING" }} />
+                  <span>
+                    {limits.concurrentRuns.staging}
+                    {limits.concurrentRuns.canExceed ? "+" : ""}
+                  </span>
+                </div>
+                <div className="flex items-center gap-x-1">
+                  <EnvironmentLabel environment={{ type: "PREVIEW" }} />
+                  <span>
+                    {limits.concurrentRuns.preview}
+                    {limits.concurrentRuns.canExceed ? "+" : ""}
+                  </span>
+                </div>
+                <div className="flex items-center gap-x-1">
+                  <EnvironmentLabel environment={{ type: "DEVELOPMENT" }} />
+                  <span>
+                    {limits.concurrentRuns.development}
+                    {limits.concurrentRuns.canExceed ? "+" : ""}
+                  </span>
+                </div>
+              </div>
+            }
+          >
+            concurrent runs
+          </DefinitionTip>
+        </div>
+        {children && <span className="text-xs text-text-dimmed">{children}</span>}
+      </div>
     </FeatureItem>
   );
 }
 
-function TeamMembers({ limits }: { limits: Limits }) {
+function TeamMembers({ limits, children }: { limits: Limits; children?: React.ReactNode }) {
   return (
     <FeatureItem checked>
-      {limits.teamMembers.number}
-      {limits.concurrentRuns.canExceed ? "+" : ""} team members
+      <div className="flex flex-col gap-y-0.5">
+        <div className="flex items-center gap-1">
+          {limits.teamMembers.number}
+          {limits.teamMembers.canExceed ? "+" : ""} team members
+        </div>
+        {children && <span className="text-xs text-text-dimmed">{children}</span>}
+      </div>
     </FeatureItem>
   );
 }
@@ -957,17 +1073,22 @@ function Environments({ limits }: { limits: Limits }) {
   );
 }
 
-function Schedules({ limits }: { limits: Limits }) {
+function Schedules({ limits, children }: { limits: Limits; children?: React.ReactNode }) {
   return (
     <FeatureItem checked>
-      {limits.schedules.number}
-      {limits.schedules.canExceed ? "+" : ""}{" "}
-      <DefinitionTip
-        title={pricingDefinitions.schedules.title}
-        content={pricingDefinitions.schedules.content}
-      >
-        schedules
-      </DefinitionTip>
+      <div className="flex flex-col gap-y-0.5">
+        <div className="flex items-center gap-1">
+          {limits.schedules.number}
+          {limits.schedules.canExceed ? "+" : ""}{" "}
+          <DefinitionTip
+            title={pricingDefinitions.schedules.title}
+            content={pricingDefinitions.schedules.content}
+          >
+            schedules
+          </DefinitionTip>
+        </div>
+        {children && <span className="text-xs text-text-dimmed">{children}</span>}
+      </div>
     </FeatureItem>
   );
 }
@@ -1012,32 +1133,99 @@ function Alerts({ limits }: { limits: Limits }) {
   );
 }
 
-function RealtimeConnecurrency({ limits }: { limits: Limits }) {
+function RealtimeConcurrency({ limits, children }: { limits: Limits; children?: React.ReactNode }) {
   return (
     <FeatureItem checked>
-      {limits.realtimeConcurrentConnections.number}
-      {limits.realtimeConcurrentConnections.canExceed ? "+" : ""}{" "}
+      <div className="flex flex-col gap-y-0.5">
+        <div className="flex items-start gap-1">
+          {limits.realtimeConcurrentConnections.canExceed ? (
+            <>
+              {limits.realtimeConcurrentConnections.number}
+              {"+"}
+            </>
+          ) : (
+            <>{limits.realtimeConcurrentConnections.number} </>
+          )}{" "}
+          <DefinitionTip
+            title={pricingDefinitions.realtime.title}
+            content={pricingDefinitions.realtime.content}
+          >
+            concurrent Realtime connections
+          </DefinitionTip>
+        </div>
+        {children && <span className="text-xs text-text-dimmed">{children}</span>}
+      </div>
+    </FeatureItem>
+  );
+}
+
+function MetricDashboards({ limits, children }: { limits: Limits; children?: React.ReactNode }) {
+  if (limits.metricDashboards.number === 0) {
+    return (
+      <FeatureItem>
+        <DefinitionTip
+          title={pricingDefinitions.metricDashboards.title}
+          content={pricingDefinitions.metricDashboards.content}
+        >
+          Custom dashboards
+        </DefinitionTip>
+      </FeatureItem>
+    );
+  }
+
+  return (
+    <FeatureItem checked>
+      <div className="flex flex-col gap-y-0.5">
+        <div className="flex items-center gap-1">
+          {limits.metricDashboards.number}
+          {limits.metricDashboards.canExceed ? "+" : ""}{" "}
+          <DefinitionTip
+            title={pricingDefinitions.metricDashboards.title}
+            content={pricingDefinitions.metricDashboards.content}
+          >
+            custom {limits.metricDashboards.number === 1 ? "dashboard" : "dashboards"}
+          </DefinitionTip>
+        </div>
+        {children && <span className="text-xs text-text-dimmed">{children}</span>}
+      </div>
+    </FeatureItem>
+  );
+}
+
+function QueryPeriod({ limits }: { limits: Limits }) {
+  return (
+    <FeatureItem checked>
+      {limits.queryPeriodDays.number} {limits.queryPeriodDays.number === 1 ? "day" : "days"}{" "}
       <DefinitionTip
-        title={pricingDefinitions.realtime.title}
-        content={pricingDefinitions.realtime.content}
+        title={pricingDefinitions.queryPeriod.title}
+        content={pricingDefinitions.queryPeriod.content}
       >
-        concurrent Realtime connections
+        query period
       </DefinitionTip>
     </FeatureItem>
   );
 }
 
-function Branches({ limits }: { limits: Limits }) {
+function Branches({ limits, children }: { limits: Limits; children?: React.ReactNode }) {
   return (
     <FeatureItem checked={limits.branches.number > 0}>
-      {limits.branches.number}
-      {limits.branches.canExceed ? "+ " : " "}
-      <DefinitionTip
-        title={pricingDefinitions.branches.title}
-        content={pricingDefinitions.branches.content}
-      >
-        preview branches
-      </DefinitionTip>
+      <div className="flex flex-col gap-y-0.5">
+        <div className="flex items-center gap-1">
+          {limits.branches.number > 0 && (
+            <>
+              {limits.branches.number}
+              {limits.branches.canExceed ? "+ " : " "}
+            </>
+          )}
+          <DefinitionTip
+            title={pricingDefinitions.branches.title}
+            content={pricingDefinitions.branches.content}
+          >
+            {limits.branches.number > 0 ? "preview" : "Preview"} branches
+          </DefinitionTip>
+        </div>
+        {children && <span className="text-xs text-text-dimmed">{children}</span>}
+      </div>
     </FeatureItem>
   );
 }
diff --git a/apps/webapp/app/routes/resources.preferences.sidemenu.tsx b/apps/webapp/app/routes/resources.preferences.sidemenu.tsx
new file mode 100644
index 00000000000..13f442aa610
--- /dev/null
+++ b/apps/webapp/app/routes/resources.preferences.sidemenu.tsx
@@ -0,0 +1,76 @@
+import { json, type ActionFunctionArgs } from "@remix-run/node";
+import { z } from "zod";
+import {
+  SideMenuSectionIdSchema,
+  type SideMenuSectionId,
+} from "~/components/navigation/sideMenuTypes";
+import {
+  updateItemOrder,
+  updateSideMenuPreferences,
+} from "~/services/dashboardPreferences.server";
+import { requireUser } from "~/services/session.server";
+
+// Transforms form data string "true"/"false" to boolean, or undefined if not present
+const booleanFromFormData = z
+  .enum(["true", "false"])
+  .transform((val) => val === "true")
+  .optional();
+
+const RequestSchema = z.object({
+  isCollapsed: booleanFromFormData,
+  sectionId: SideMenuSectionIdSchema.optional(),
+  sectionCollapsed: booleanFromFormData,
+  // Generic item order fields
+  organizationId: z.string().optional(),
+  listId: z.string().optional(),
+  itemOrder: z.string().optional(), // JSON-encoded string[]
+});
+
+export async function action({ request }: ActionFunctionArgs) {
+  const user = await requireUser(request);
+
+  const formData = await request.formData();
+  const rawData = Object.fromEntries(formData);
+
+  const result = RequestSchema.safeParse(rawData);
+  if (!result.success) {
+    return json({ success: false, error: "Invalid request data" }, { status: 400 });
+  }
+
+  // Handle item order update
+  if (result.data.organizationId && result.data.listId && result.data.itemOrder) {
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(result.data.itemOrder);
+    } catch {
+      parsed = [];
+    }
+    const orderResult = z.array(z.string()).safeParse(parsed);
+    if (orderResult.success) {
+      await updateItemOrder({
+        user,
+        organizationId: result.data.organizationId,
+        listId: result.data.listId,
+        order: orderResult.data,
+      });
+    }
+    return json({ success: true });
+  }
+
+  // Build sectionCollapsed parameter if both sectionId and sectionCollapsed are provided
+  const sectionCollapsed =
+    result.data.sectionId !== undefined && result.data.sectionCollapsed !== undefined
+      ? {
+          sectionId: result.data.sectionId as SideMenuSectionId,
+          collapsed: result.data.sectionCollapsed,
+        }
+      : undefined;
+
+  await updateSideMenuPreferences({
+    user,
+    isCollapsed: result.data.isCollapsed,
+    sectionCollapsed,
+  });
+
+  return json({ success: true });
+}
diff --git a/apps/webapp/app/routes/resources.projects.$projectParam.runs.tags.tsx b/apps/webapp/app/routes/resources.projects.$projectParam.runs.tags.tsx
deleted file mode 100644
index 449142f53c0..00000000000
--- a/apps/webapp/app/routes/resources.projects.$projectParam.runs.tags.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
-import { z } from "zod";
-import { $replica } from "~/db.server";
-import { RunTagListPresenter } from "~/presenters/v3/RunTagListPresenter.server";
-import { requireUserId } from "~/services/session.server";
-
-const Params = z.object({
-  projectParam: z.string(),
-});
-
-export async function loader({ request, params }: LoaderFunctionArgs) {
-  const userId = await requireUserId(request);
-  const { projectParam } = Params.parse(params);
-
-  const project = await $replica.project.findFirst({
-    where: { slug: projectParam, deletedAt: null, organization: { members: { some: { userId } } } },
-  });
-
-  if (!project) {
-    throw new Response("Not Found", { status: 404 });
-  }
-
-  const search = new URL(request.url).searchParams;
-  const name = search.get("name");
-
-  const presenter = new RunTagListPresenter();
-  const result = await presenter.call({
-    projectId: project.id,
-    name: name ? decodeURIComponent(name) : undefined,
-  });
-  return result;
-}
diff --git a/apps/webapp/app/routes/resources.runs.$runParam.logs.download.ts b/apps/webapp/app/routes/resources.runs.$runParam.logs.download.ts
index 9bfe5dc9e27..f3f21fc15b6 100644
--- a/apps/webapp/app/routes/resources.runs.$runParam.logs.download.ts
+++ b/apps/webapp/app/routes/resources.runs.$runParam.logs.download.ts
@@ -2,13 +2,13 @@ import { LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { prisma } from "~/db.server";
 import { requireUser } from "~/services/session.server";
 import { v3RunParamsSchema } from "~/utils/pathBuilder";
-import { RunPreparedEvent, eventRepository } from "~/v3/eventRepository.server";
+import type { RunPreparedEvent } from "~/v3/eventRepository/eventRepository.types";
 import { createGzip } from "zlib";
 import { Readable } from "stream";
 import { formatDurationMilliseconds } from "@trigger.dev/core/v3/utils/durations";
-import { getDateFromNanoseconds } from "~/utils/taskEvent";
 import { getTaskEventStoreTableForRun } from "~/v3/taskEventStore.server";
 import { TaskEventKind } from "@trigger.dev/database";
+import { resolveEventRepositoryForStore } from "~/v3/eventRepository/index.server";
 
 export async function loader({ params, request }: LoaderFunctionArgs) {
   const user = await requireUser(request);
@@ -33,8 +33,12 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
     return new Response("Not found", { status: 404 });
   }
 
+  const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
   const runEvents = await eventRepository.getRunEvents(
     getTaskEventStoreTableForRun(run),
+    run.runtimeEnvironmentId,
+    run.traceId,
     run.friendlyId,
     run.createdAt,
     run.completedAt ?? undefined
@@ -117,3 +121,7 @@ function formatRunEvent(event: RunPreparedEvent): string {
 
   return entries.join("\n");
 }
+
+function getDateFromNanoseconds(nanoseconds: bigint) {
+  return new Date(Number(nanoseconds) / 1_000_000);
+}
diff --git a/apps/webapp/app/routes/resources.runs.$runParam.ts b/apps/webapp/app/routes/resources.runs.$runParam.ts
index 899dbb63f03..7b116b31c3c 100644
--- a/apps/webapp/app/routes/resources.runs.$runParam.ts
+++ b/apps/webapp/app/routes/resources.runs.$runParam.ts
@@ -76,6 +76,30 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       lockedBy: {
         select: {
           filePath: true,
+          worker: {
+            select: {
+              deployment: {
+                select: {
+                  friendlyId: true,
+                  shortCode: true,
+                  version: true,
+                  runtime: true,
+                  runtimeVersion: true,
+                  git: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      parentTaskRun: {
+        select: {
+          friendlyId: true,
+        },
+      },
+      rootTaskRun: {
+        select: {
+          friendlyId: true,
         },
       },
     },
@@ -163,6 +187,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       baseCostInCents: run.baseCostInCents,
       maxAttempts: run.maxAttempts ?? undefined,
       version: run.lockedToVersion?.version,
+      parentTaskRunId: run.parentTaskRun?.friendlyId ?? undefined,
+      rootTaskRunId: run.rootTaskRun?.friendlyId ?? undefined,
     },
     queue: {
       name: run.queue,
@@ -184,6 +210,16 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
       name: run.project.name,
     },
     machine: run.machinePreset ? machinePresetFromRun(run) : undefined,
+    deployment: run.lockedBy?.worker.deployment
+      ? {
+          id: run.lockedBy.worker.deployment.friendlyId,
+          shortCode: run.lockedBy.worker.deployment.shortCode,
+          version: run.lockedBy.worker.deployment.version,
+          runtime: run.lockedBy.worker.deployment.runtime,
+          runtimeVersion: run.lockedBy.worker.deployment.runtimeVersion,
+          git: run.lockedBy.worker.deployment.git,
+        }
+      : undefined,
   };
 
   return typedjson({
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
index 676d4dabe2c..240d7d3d8ed 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.cancel.ts
@@ -1,9 +1,10 @@
 import { parse } from "@conform-to/zod";
-import { ActionFunction, json } from "@remix-run/node";
+import { type ActionFunction, json } from "@remix-run/node";
 import { z } from "zod";
 import { prisma } from "~/db.server";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
 import { CancelTaskRunService } from "~/v3/services/cancelTaskRun.server";
 
 export const cancelSchema = z.object({
@@ -15,6 +16,7 @@ const ParamSchema = z.object({
 });
 
 export const action: ActionFunction = async ({ request, params }) => {
+  const userId = await requireUserId(request);
   const { runParam } = ParamSchema.parse(params);
 
   const formData = await request.formData();
@@ -25,9 +27,18 @@ export const action: ActionFunction = async ({ request, params }) => {
   }
 
   try {
-    const taskRun = await prisma.taskRun.findUnique({
+    const taskRun = await prisma.taskRun.findFirst({
       where: {
         friendlyId: runParam,
+        project: {
+          organization: {
+            members: {
+              some: {
+                userId,
+              },
+            },
+          },
+        },
       },
     });
 
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.debug.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.debug.ts
index ba48f7085a9..d7acf18e517 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.debug.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.debug.ts
@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs } from "@remix-run/node";
+import { type LoaderFunctionArgs } from "@remix-run/node";
 import { typedjson } from "remix-typedjson";
 import { z } from "zod";
 import { $replica } from "~/db.server";
diff --git a/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts b/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
index 0e87a3d1bdb..eba924f409b 100644
--- a/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
+++ b/apps/webapp/app/routes/resources.taskruns.$runParam.replay.ts
@@ -7,7 +7,7 @@ import { $replica, prisma } from "~/db.server";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { displayableEnvironment } from "~/models/runtimeEnvironment.server";
 import { logger } from "~/services/logger.server";
-import { requireUserId } from "~/services/session.server";
+import { requireUser } from "~/services/session.server";
 import { sortEnvironments } from "~/utils/environmentSort";
 import { v3RunSpanPath } from "~/utils/pathBuilder";
 import { ReplayTaskRunService } from "~/v3/services/replayTaskRun.server";
@@ -15,6 +15,7 @@ import parseDuration from "parse-duration";
 import { findCurrentWorkerDeployment } from "~/v3/models/workerDeployment.server";
 import { queueTypeFromType } from "~/presenters/v3/QueueRetrievePresenter.server";
 import { ReplayRunData } from "~/v3/replayTask";
+import { RegionsPresenter } from "~/presenters/v3/RegionsPresenter.server";
 
 const ParamSchema = z.object({
   runParam: z.string(),
@@ -25,7 +26,8 @@ const QuerySchema = z.object({
 });
 
 export async function loader({ request, params }: LoaderFunctionArgs) {
-  const userId = await requireUserId(request);
+  const user = await requireUser(request);
+  const userId = user.id;
   const { runParam } = ParamSchema.parse(params);
   const { environmentIdOverride } = QuerySchema.parse(
     Object.fromEntries(new URL(request.url).searchParams)
@@ -42,6 +44,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
       maxAttempts: true,
       maxDurationInSeconds: true,
       machinePreset: true,
+      workerQueue: true,
       ttl: true,
       idempotencyKey: true,
       runTags: true,
@@ -49,6 +52,7 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
       taskIdentifier: true,
       project: {
         select: {
+          slug: true,
           environments: {
             select: {
               id: true,
@@ -108,15 +112,26 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
   const disableVersionSelection = environment.type === "DEVELOPMENT";
   const allowArbitraryQueues = backgroundWorkers.at(0)?.engine === "V1";
 
+  const [payload, regionsResult] = await Promise.all([
+    prettyPrintPacket(run.payload, run.payloadType),
+    new RegionsPresenter().call({
+      userId,
+      projectSlug: run.project.slug,
+      isAdmin: user.admin || user.isImpersonating,
+    }),
+  ]);
+
   return typedjson({
     concurrencyKey: run.concurrencyKey,
     maxAttempts: run.maxAttempts,
     maxDurationSeconds: run.maxDurationInSeconds,
     machinePreset: run.machinePreset,
+    region: environment.type === "DEVELOPMENT" ? undefined : run.workerQueue,
+    regions: regionsResult.regions,
     ttlSeconds: run.ttl ? parseDuration(run.ttl, "s") ?? undefined : undefined,
     idempotencyKey: run.idempotencyKey,
     runTags: run.runTags,
-    payload: await prettyPrintPacket(run.payload, run.payloadType),
+    payload,
     payloadType: run.payloadType,
     queue: run.queue,
     metadata: run.seedMetadata
@@ -192,11 +207,13 @@ export const action: ActionFunction = async ({ request, params }) => {
       maxAttempts: submission.value.maxAttempts,
       maxDurationSeconds: submission.value.maxDurationSeconds,
       machine: submission.value.machine,
+      region: submission.value.region,
       delaySeconds: submission.value.delaySeconds,
       idempotencyKey: submission.value.idempotencyKey,
       idempotencyKeyTTLSeconds: submission.value.idempotencyKeyTTLSeconds,
       ttlSeconds: submission.value.ttlSeconds,
       version: submission.value.version,
+      prioritySeconds: submission.value.prioritySeconds,
     });
 
     if (!newRun) {
diff --git a/apps/webapp/app/routes/resources.timezone.ts b/apps/webapp/app/routes/resources.timezone.ts
new file mode 100644
index 00000000000..f06b44e6149
--- /dev/null
+++ b/apps/webapp/app/routes/resources.timezone.ts
@@ -0,0 +1,43 @@
+import { type ActionFunctionArgs, json } from "@remix-run/server-runtime";
+import { z } from "zod";
+import {
+  setTimezonePreference,
+  uiPreferencesStorage,
+} from "~/services/preferences/uiPreferences.server";
+
+const schema = z.object({
+  timezone: z.string().min(1).max(100),
+});
+
+// Cache the supported timezones to avoid repeated calls
+const supportedTimezones = new Set(Intl.supportedValuesOf("timeZone"));
+
+export async function action({ request }: ActionFunctionArgs) {
+  let data: unknown;
+  try {
+    data = await request.json();
+  } catch {
+    return json({ success: false, error: "Invalid JSON" }, { status: 400 });
+  }
+
+  const result = schema.safeParse(data);
+
+  if (!result.success) {
+    return json({ success: false, error: "Invalid timezone" }, { status: 400 });
+  }
+
+  if (!supportedTimezones.has(result.data.timezone)) {
+    return json({ success: false, error: "Invalid timezone" }, { status: 400 });
+  }
+
+  const session = await setTimezonePreference(result.data.timezone, request);
+
+  return json(
+    { success: true },
+    {
+      headers: {
+        "Set-Cookie": await uiPreferencesStorage.commitSession(session),
+      },
+    }
+  );
+}
diff --git a/apps/webapp/app/routes/runs.$runParam.ts b/apps/webapp/app/routes/runs.$runParam.ts
new file mode 100644
index 00000000000..4e9ce3d7a37
--- /dev/null
+++ b/apps/webapp/app/routes/runs.$runParam.ts
@@ -0,0 +1,68 @@
+import { redirect, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { redirectWithErrorMessage } from "~/models/message.server";
+import { requireUser } from "~/services/session.server";
+import { rootPath, v3RunPath } from "~/utils/pathBuilder";
+
+const ParamsSchema = z.object({
+  runParam: z.string(),
+});
+
+export async function loader({ params, request }: LoaderFunctionArgs) {
+  const user = await requireUser(request);
+
+  const { runParam } = ParamsSchema.parse(params);
+
+  const run = await prisma.taskRun.findFirst({
+    where: {
+      friendlyId: runParam,
+      project: {
+        organization: {
+          members: {
+            some: {
+              userId: user.id,
+            },
+          },
+        },
+      },
+    },
+    select: {
+      runtimeEnvironment: {
+        select: {
+          slug: true,
+        },
+      },
+      project: {
+        select: {
+          slug: true,
+          organization: {
+            select: {
+              slug: true,
+            },
+          },
+        },
+      },
+    },
+  });
+
+  if (!run) {
+    return redirectWithErrorMessage(
+      rootPath(),
+      request,
+      "Run either doesn't exist or you don't have permission to view it",
+      {
+        ephemeral: false,
+      }
+    );
+  }
+
+  return redirect(
+    v3RunPath(
+      { slug: run.project.organization.slug },
+      { slug: run.project.slug },
+      { slug: run.runtimeEnvironment.slug },
+      { friendlyId: runParam }
+    )
+  );
+}
diff --git a/apps/webapp/app/routes/storybook.charts/route.tsx b/apps/webapp/app/routes/storybook.charts/route.tsx
new file mode 100644
index 00000000000..3f72904625a
--- /dev/null
+++ b/apps/webapp/app/routes/storybook.charts/route.tsx
@@ -0,0 +1,771 @@
+import { ArrowTrendingUpIcon } from "@heroicons/react/20/solid";
+import { IconTimeline } from "@tabler/icons-react";
+import { useMemo, useState } from "react";
+import { Button } from "~/components/primitives/Buttons";
+import { BigNumberCard } from "~/components/primitives/charts/BigNumberCard";
+import { Card } from "~/components/primitives/charts/Card";
+import { type ChartConfig, type ChartState } from "~/components/primitives/charts/Chart";
+import { Chart } from "~/components/primitives/charts/ChartCompound";
+import {
+  DateRangeProvider,
+  formatISODate,
+  formatISODateLong,
+  useDateRange,
+} from "~/components/primitives/charts/DateRangeContext";
+import type { ZoomRange } from "~/components/primitives/charts/hooks/useZoomSelection";
+import { Paragraph } from "~/components/primitives/Paragraph";
+import { RadioGroup, RadioGroupItem } from "~/components/primitives/RadioButton";
+import SegmentedControl from "~/components/primitives/SegmentedControl";
+
+// Date formatters for chart display
+const xAxisTickFormatter = (value: string) => formatISODate(value);
+const tooltipLabelFormatter = (label: string) => formatISODateLong(label);
+
+/**
+ * Helper function to filter chart data by date range.
+ * In a real app, this would typically be handled server-side.
+ */
+function filterDataByDateRange<T extends Record<string, any>>(
+  data: T[],
+  dataKey: string,
+  startDate: string | undefined,
+  endDate: string | undefined
+): T[] {
+  if (!startDate || !endDate) return data;
+
+  const startIndex = data.findIndex((item) => item[dataKey] === startDate);
+  const endIndex = data.findIndex((item) => item[dataKey] === endDate);
+
+  if (startIndex === -1 || endIndex === -1) return data;
+
+  const [start, end] = [startIndex, endIndex].sort((a, b) => a - b);
+  return data.slice(start, end + 1);
+}
+
+function ChartsDashboard() {
+  const dateRange = useDateRange();
+  const [chartState, setChartState] = useState<ChartState>("loaded");
+
+  // Handle zoom change - updates the shared DateRangeContext
+  // In a real app, this would also trigger a server fetch for more granular data
+  const handleZoomChange = (range: ZoomRange) => {
+    console.log("Zoom changed:", range);
+    // Update the shared date range context so all charts sync
+    // dateRange?.setDateRange(range.start, range.end);
+    // In a real app, you would fetch new data here based on the range:
+    // fetchChartData(range.start, range.end).then(setData);
+  };
+
+  // Filter data based on the current date range from context
+  const filteredBarData = useMemo(
+    () =>
+      filterDataByDateRange(
+        API_DATA.barChartBigDatasetData,
+        "day",
+        dateRange?.startDate,
+        dateRange?.endDate
+      ),
+    [dateRange?.startDate, dateRange?.endDate]
+  );
+
+  const filteredBarData2 = useMemo(
+    () =>
+      filterDataByDateRange(API_DATA.barChartData, "day", dateRange?.startDate, dateRange?.endDate),
+    [dateRange?.startDate, dateRange?.endDate]
+  );
+
+  const filteredLineData = useMemo(
+    () =>
+      filterDataByDateRange(
+        API_DATA.lineChartData,
+        "day",
+        dateRange?.startDate,
+        dateRange?.endDate
+      ),
+    [dateRange?.startDate, dateRange?.endDate]
+  );
+
+  return (
+    <div className="grid">
+      <div className="flex items-center justify-between gap-4 border-b border-charcoal-700 bg-background-bright p-2 pl-3">
+        <div className="flex w-fit items-center">
+          <RadioGroup
+            name="chartState"
+            value={chartState}
+            onValueChange={(value) => setChartState(value as ChartState)}
+            className="flex items-center"
+          >
+            <RadioGroupItem id="loaded" label="Data loaded" value="loaded" variant="simple/small" />
+            <RadioGroupItem
+              id="loading"
+              label="Data loading"
+              value="loading"
+              variant="simple/small"
+            />
+            <RadioGroupItem id="noData" label="No data" value="noData" variant="simple/small" />
+            <RadioGroupItem
+              id="invalid"
+              label="Chart invalid"
+              value="invalid"
+              variant="simple/small"
+            />
+          </RadioGroup>
+        </div>
+        <div className="flex w-fit items-center gap-4">
+          <Paragraph variant="small/bright">
+            Current range: {dateRange?.startDate ? formatISODate(dateRange.startDate) : ""} -{" "}
+            {dateRange?.endDate ? formatISODate(dateRange.endDate) : ""}
+          </Paragraph>
+          <Button variant="secondary/small" onClick={() => dateRange?.resetDateRange()}>
+            Reset Zoom
+          </Button>
+        </div>
+      </div>
+
+      <div className="grid grid-cols-2 gap-3 p-3">
+        {/* Compound Component API Example */}
+        <Card>
+          <Card.Header>
+            <div className="flex items-center gap-1.5">
+              <ArrowTrendingUpIcon className="size-5 text-indigo-500" />
+              Compound API <span className="font-normal text-text-dimmed">(with zoom)</span>
+            </div>
+            <Card.Accessory>
+              <SegmentedControl
+                name="compoundByStatus"
+                options={[
+                  { label: "By status", value: "status" },
+                  { label: "By task", value: "task" },
+                ]}
+                defaultValue="status"
+                variant="secondary/small"
+              />
+            </Card.Accessory>
+          </Card.Header>
+          <Card.Content>
+            <Chart.Root
+              config={barChartBigDatasetConfig}
+              data={filteredBarData}
+              dataKey="day"
+              labelFormatter={tooltipLabelFormatter}
+              enableZoom
+              onZoomChange={handleZoomChange}
+              state={chartState === "loaded" ? undefined : chartState}
+              minHeight="400px"
+              showLegend
+              maxLegendItems={5}
+            >
+              <Chart.Bar
+                stackId="a"
+                referenceLine={{
+                  value: 45000,
+                  label: "Max concurrency",
+                }}
+                xAxisProps={{ tickFormatter: xAxisTickFormatter }}
+                tooltipLabelFormatter={tooltipLabelFormatter}
+              />
+            </Chart.Root>
+          </Card.Content>
+        </Card>
+
+
+        {/* Simple Line Chart (no zoom, but synced with date range) */}
+        <Card>
+          <Card.Header>
+            <div className="flex items-center gap-1.5">
+              <IconTimeline className="size-5 text-indigo-500" />
+              Simple Line <span className="font-normal text-text-dimmed">(synced, no zoom)</span>
+            </div>
+          </Card.Header>
+          <Card.Content>
+            <Chart.Root
+              config={lineChartConfig}
+              data={filteredLineData}
+              dataKey="day"
+              state={chartState === "loaded" ? undefined : chartState}
+              showLegend
+            >
+              <Chart.Line
+                lineType="step"
+                xAxisProps={{ tickFormatter: xAxisTickFormatter }}
+                tooltipLabelFormatter={tooltipLabelFormatter}
+              />
+            </Chart.Root>
+          </Card.Content>
+        </Card>
+
+        {/* Line Chart with Zoom */}
+        <Card>
+          <Card.Header>
+            <div className="flex items-center gap-1.5">
+              <IconTimeline className="size-5 text-green-500" />
+              Line with Zoom
+            </div>
+          </Card.Header>
+          <Card.Content>
+            <Chart.Root
+              config={lineChartConfig}
+              data={filteredLineData}
+              dataKey="day"
+              enableZoom
+              onZoomChange={handleZoomChange}
+              state={chartState === "loaded" ? undefined : chartState}
+              showLegend
+            >
+              <Chart.Line
+                lineType="natural"
+                xAxisProps={{ tickFormatter: xAxisTickFormatter }}
+                tooltipLabelFormatter={tooltipLabelFormatter}
+              />
+            </Chart.Root>
+          </Card.Content>
+        </Card>
+
+        {/* Stacked Area Chart (synced with date range) */}
+        <Card>
+          <Card.Header>
+            <div className="flex items-center gap-1.5">
+              <IconTimeline className="size-5 text-purple-500" />
+              Stacked Area <span className="font-normal text-text-dimmed">(synced)</span>
+            </div>
+          </Card.Header>
+          <Card.Content>
+            <Chart.Root
+              config={lineChartConfig}
+              data={filteredLineData}
+              dataKey="day"
+              state={chartState === "loaded" ? undefined : chartState}
+              showLegend
+            >
+              <Chart.Line
+                stacked
+                lineType="monotone"
+                xAxisProps={{ tickFormatter: xAxisTickFormatter }}
+                tooltipLabelFormatter={tooltipLabelFormatter}
+              />
+            </Chart.Root>
+          </Card.Content>
+        </Card>
+
+        {/* Big Number */}
+        <Card>
+          <Card.Header>
+            Big Number
+            <Card.Accessory>
+              <Button variant="secondary/small">Example button</Button>
+            </Card.Accessory>
+          </Card.Header>
+          <Card.Content>
+            <BigNumberCard
+              rows={[{ amount: 101 }]}
+              columns={[{ name: "amount", type: "Float64" }]}
+              config={{ column: "amount", aggregation: "sum", abbreviate: true }}
+            />
+          </Card.Content>
+        </Card>
+      </div>
+    </div>
+  );
+}
+
+export default function Story() {
+  return (
+    <DateRangeProvider
+      defaultStartDate={API_DATA.defaultDateRange.startDate}
+      defaultEndDate={API_DATA.defaultDateRange.endDate}
+    >
+      <ChartsDashboard />
+    </DateRangeProvider>
+  );
+}
+
+// Mock chart data
+
+const API_DATA = {
+  defaultDateRange: {
+    startDate: new Date(2023, 10, 1), // November 1, 2023
+    endDate: new Date(2023, 10, 30), // November 30, 2023
+  },
+  lineChartData: [
+    { day: "2023-11-01", "success-rate": 96.8, "failure-rate": 3.2 },
+    { day: "2023-11-02", "success-rate": 95.3, "failure-rate": 4.7 },
+    { day: "2023-11-03", "success-rate": 97.1, "failure-rate": 2.9 },
+    { day: "2023-11-04", "success-rate": 94.5, "failure-rate": 5.5 },
+    { day: "2023-11-05", "success-rate": 98.6, "failure-rate": 1.4 },
+    { day: "2023-11-06", "success-rate": 97.8, "failure-rate": 2.2 },
+    { day: "2023-11-07", "success-rate": 93.9, "failure-rate": 6.1 },
+    { day: "2023-11-08", "success-rate": 95.7, "failure-rate": 4.3 },
+    { day: "2023-11-09", "success-rate": 98.2, "failure-rate": 1.8 },
+    { day: "2023-11-10", "success-rate": 96.5, "failure-rate": 3.5 },
+    { day: "2023-11-11", "success-rate": 94.8, "failure-rate": 5.2 },
+    { day: "2023-11-12", "success-rate": 99.1, "failure-rate": 0.9 },
+    { day: "2023-11-13", "success-rate": 97.3, "failure-rate": 2.7 },
+    { day: "2023-11-14", "success-rate": 95.9, "failure-rate": 4.1 },
+    { day: "2023-11-15", "success-rate": 98.4, "failure-rate": 1.6 },
+    { day: "2023-11-16", "success-rate": 96.2, "failure-rate": 3.8 },
+    { day: "2023-11-17", "success-rate": 94.3, "failure-rate": 5.7 },
+    { day: "2023-11-18", "success-rate": 97.5, "failure-rate": 2.5 },
+    { day: "2023-11-19", "success-rate": 95.6, "failure-rate": 4.4 },
+    { day: "2023-11-20", "success-rate": 98.9, "failure-rate": 1.1 },
+    { day: "2023-11-21", "success-rate": 96.7, "failure-rate": 3.3 },
+    { day: "2023-11-22", "success-rate": 95.1, "failure-rate": 4.9 },
+    { day: "2023-11-23", "success-rate": 97.9, "failure-rate": 2.1 },
+    { day: "2023-11-24", "success-rate": 94.7, "failure-rate": 5.3 },
+    { day: "2023-11-25", "success-rate": 98.3, "failure-rate": 1.7 },
+    { day: "2023-11-26", "success-rate": 96.4, "failure-rate": 3.6 },
+    { day: "2023-11-27", "success-rate": 94.9, "failure-rate": 5.1 },
+    { day: "2023-11-28", "success-rate": 97.7, "failure-rate": 2.3 },
+    { day: "2023-11-29", "success-rate": 95.4, "failure-rate": 4.6 },
+    { day: "2023-11-30", "success-rate": 98.8, "failure-rate": 1.2 },
+  ],
+  barChartData: [
+    { day: "2023-11-01", completed: 3245, "in-progress": 4321, canceled: 657, failed: 2987 },
+    { day: "2023-11-02", completed: 4567, "in-progress": 3789, canceled: 879, failed: 3456 },
+    { day: "2023-11-03", completed: 5432, "in-progress": 4567, canceled: 1234, failed: 2345 },
+    { day: "2023-11-04", completed: 0, "in-progress": 5678, canceled: 0, failed: 3678 },
+    { day: "2023-11-05", completed: 6789, "in-progress": 3456, canceled: 2345, failed: 4321 },
+    { day: "2023-11-06", completed: 3456, "in-progress": 6543, canceled: 1567, failed: 2987 },
+    { day: "2023-11-07", completed: 6543, "in-progress": 3456, canceled: 2345, failed: 3456 },
+    { day: "2023-11-08", completed: 0, "in-progress": 7654, canceled: 0, failed: 4567 },
+    { day: "2023-11-09", completed: 8765, "in-progress": 3245, canceled: 3456, failed: 2109 },
+    { day: "2023-11-10", completed: 5432, "in-progress": 6543, canceled: 2109, failed: 3456 },
+    { day: "2023-11-11", completed: 3245, "in-progress": 5432, canceled: 1234, failed: 3987 },
+    { day: "2023-11-12", completed: 0, "in-progress": 6543, canceled: 0, failed: 3456 },
+    { day: "2023-11-13", completed: 7654, "in-progress": 3456, canceled: 2345, failed: 2987 },
+    { day: "2023-11-14", completed: 5432, "in-progress": 5432, canceled: 3456, failed: 3421 },
+    { day: "2023-11-15", completed: 6543, "in-progress": 4321, canceled: 2109, failed: 2345 },
+    { day: "2023-11-16", completed: 0, "in-progress": 7654, canceled: 0, failed: 4567 },
+    { day: "2023-11-17", completed: 8765, "in-progress": 3456, canceled: 3421, failed: 2987 },
+    { day: "2023-11-18", completed: 5432, "in-progress": 5432, canceled: 2345, failed: 3456 },
+    { day: "2023-11-19", completed: 4321, "in-progress": 6543, canceled: 1567, failed: 2987 },
+    { day: "2023-11-20", completed: 0, "in-progress": 7654, canceled: 0, failed: 3678 },
+    { day: "2023-11-21", completed: 4532, "in-progress": 3456, canceled: 1200, failed: 2876 },
+    { day: "2023-11-22", completed: 6789, "in-progress": 4567, canceled: 2345, failed: 3456 },
+    { day: "2023-11-23", completed: 5432, "in-progress": 6543, canceled: 0, failed: 2109 },
+    { day: "2023-11-24", completed: 6543, "in-progress": 0, canceled: 2345, failed: 0 },
+    { day: "2023-11-25", completed: 5432, "in-progress": 0, canceled: 0, failed: 2345 },
+    { day: "2023-11-26", completed: 6543, "in-progress": 6543, canceled: 0, failed: 0 },
+    { day: "2023-11-27", completed: 8765, "in-progress": 3456, canceled: 0, failed: 5678 },
+    { day: "2023-11-28", completed: 5432, "in-progress": 5678, canceled: 4567, failed: 2345 },
+    { day: "2023-11-29", completed: 0, "in-progress": 4567, canceled: 2345, failed: 3456 },
+    { day: "2023-11-30", completed: 7654, "in-progress": 3456, canceled: 5678, failed: 2345 },
+  ],
+  barChartBigDatasetData: [
+    {
+      day: "2023-11-01",
+      "sync-data": 6543,
+      "process-image": 3245,
+      "upload-file": 8765,
+      "extract-metadata": 4321,
+      "compress-video": 5432,
+      "schedule-backup": 0,
+      "convert-audio": 6543,
+      "analyze-document": 3245,
+    },
+    {
+      day: "2023-11-02",
+      "sync-data": 5432,
+      "process-image": 0,
+      "upload-file": 6789,
+      "extract-metadata": 5678,
+      "compress-video": 3456,
+      "schedule-backup": 7654,
+      "convert-audio": 4567,
+      "analyze-document": 2345,
+    },
+    {
+      day: "2023-11-03",
+      "sync-data": 7654,
+      "process-image": 5432,
+      "upload-file": 0,
+      "extract-metadata": 6543,
+      "compress-video": 4321,
+      "schedule-backup": 3456,
+      "convert-audio": 5678,
+      "analyze-document": 6543,
+    },
+    {
+      day: "2023-11-04",
+      "sync-data": 3456,
+      "process-image": 6543,
+      "upload-file": 7654,
+      "extract-metadata": 0,
+      "compress-video": 6789,
+      "schedule-backup": 5432,
+      "convert-audio": 3456,
+      "analyze-document": 4567,
+    },
+    {
+      day: "2023-11-05",
+      "sync-data": 0,
+      "process-image": 8765,
+      "upload-file": 4567,
+      "extract-metadata": 7654,
+      "compress-video": 5432,
+      "schedule-backup": 6543,
+      "convert-audio": 0,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-06",
+      "sync-data": 6789,
+      "process-image": 4321,
+      "upload-file": 5432,
+      "extract-metadata": 6543,
+      "compress-video": 0,
+      "schedule-backup": 8765,
+      "convert-audio": 5432,
+      "analyze-document": 3456,
+    },
+    {
+      day: "2023-11-07",
+      "sync-data": 7654,
+      "process-image": 0,
+      "upload-file": 6789,
+      "extract-metadata": 5432,
+      "compress-video": 7654,
+      "schedule-backup": 4321,
+      "convert-audio": 6543,
+      "analyze-document": 0,
+    },
+    {
+      day: "2023-11-08",
+      "sync-data": 5678,
+      "process-image": 6543,
+      "upload-file": 0,
+      "extract-metadata": 8765,
+      "compress-video": 5432,
+      "schedule-backup": 6543,
+      "convert-audio": 4321,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-09",
+      "sync-data": 0,
+      "process-image": 7654,
+      "upload-file": 5432,
+      "extract-metadata": 6543,
+      "compress-video": 8765,
+      "schedule-backup": 0,
+      "convert-audio": 7654,
+      "analyze-document": 5432,
+    },
+    {
+      day: "2023-11-10",
+      "sync-data": 8765,
+      "process-image": 5432,
+      "upload-file": 7654,
+      "extract-metadata": 0,
+      "compress-video": 6543,
+      "schedule-backup": 7654,
+      "convert-audio": 5432,
+      "analyze-document": 6543,
+    },
+    {
+      day: "2023-11-11",
+      "sync-data": 6543,
+      "process-image": 0,
+      "upload-file": 8765,
+      "extract-metadata": 5432,
+      "compress-video": 7654,
+      "schedule-backup": 5432,
+      "convert-audio": 0,
+      "analyze-document": 8765,
+    },
+    {
+      day: "2023-11-12",
+      "sync-data": 5432,
+      "process-image": 7654,
+      "upload-file": 0,
+      "extract-metadata": 6543,
+      "compress-video": 5432,
+      "schedule-backup": 7654,
+      "convert-audio": 6543,
+      "analyze-document": 5432,
+    },
+    {
+      day: "2023-11-13",
+      "sync-data": 0,
+      "process-image": 6543,
+      "upload-file": 7654,
+      "extract-metadata": 5432,
+      "compress-video": 0,
+      "schedule-backup": 8765,
+      "convert-audio": 5432,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-14",
+      "sync-data": 7654,
+      "process-image": 5432,
+      "upload-file": 6543,
+      "extract-metadata": 0,
+      "compress-video": 7654,
+      "schedule-backup": 5432,
+      "convert-audio": 8765,
+      "analyze-document": 0,
+    },
+    {
+      day: "2023-11-15",
+      "sync-data": 6543,
+      "process-image": 0,
+      "upload-file": 8765,
+      "extract-metadata": 7654,
+      "compress-video": 5432,
+      "schedule-backup": 6543,
+      "convert-audio": 5432,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-16",
+      "sync-data": 5432,
+      "process-image": 7654,
+      "upload-file": 0,
+      "extract-metadata": 6543,
+      "compress-video": 8765,
+      "schedule-backup": 0,
+      "convert-audio": 7654,
+      "analyze-document": 5432,
+    },
+    {
+      day: "2023-11-17",
+      "sync-data": 0,
+      "process-image": 6543,
+      "upload-file": 7654,
+      "extract-metadata": 5432,
+      "compress-video": 6543,
+      "schedule-backup": 7654,
+      "convert-audio": 5432,
+      "analyze-document": 0,
+    },
+    {
+      day: "2023-11-18",
+      "sync-data": 8765,
+      "process-image": 0,
+      "upload-file": 6543,
+      "extract-metadata": 0,
+      "compress-video": 7654,
+      "schedule-backup": 5432,
+      "convert-audio": 6543,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-19",
+      "sync-data": 5432,
+      "process-image": 7654,
+      "upload-file": 0,
+      "extract-metadata": 6543,
+      "compress-video": 5432,
+      "schedule-backup": 0,
+      "convert-audio": 7654,
+      "analyze-document": 5432,
+    },
+    {
+      day: "2023-11-20",
+      "sync-data": 6543,
+      "process-image": 5432,
+      "upload-file": 7654,
+      "extract-metadata": 0,
+      "compress-video": 6543,
+      "schedule-backup": 7654,
+      "convert-audio": 5432,
+      "analyze-document": 0,
+    },
+    {
+      day: "2023-11-21",
+      "sync-data": 8765,
+      "process-image": 4532,
+      "upload-file": 0,
+      "extract-metadata": 6789,
+      "compress-video": 3456,
+      "schedule-backup": 0,
+      "convert-audio": 5432,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-22",
+      "sync-data": 5432,
+      "process-image": 0,
+      "upload-file": 6789,
+      "extract-metadata": 4567,
+      "compress-video": 0,
+      "schedule-backup": 8765,
+      "convert-audio": 3456,
+      "analyze-document": 5678,
+    },
+    {
+      day: "2023-11-23",
+      "sync-data": 0,
+      "process-image": 6789,
+      "upload-file": 4567,
+      "extract-metadata": 0,
+      "compress-video": 7654,
+      "schedule-backup": 3456,
+      "convert-audio": 0,
+      "analyze-document": 5432,
+    },
+    {
+      day: "2023-11-24",
+      "sync-data": 9876,
+      "process-image": 3456,
+      "upload-file": 5678,
+      "extract-metadata": 0,
+      "compress-video": 4567,
+      "schedule-backup": 2345,
+      "convert-audio": 6789,
+      "analyze-document": 0,
+    },
+    {
+      day: "2023-11-25",
+      "sync-data": 5432,
+      "process-image": 0,
+      "upload-file": 8765,
+      "extract-metadata": 3456,
+      "compress-video": 5678,
+      "schedule-backup": 0,
+      "convert-audio": 4567,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-26",
+      "sync-data": 0,
+      "process-image": 7654,
+      "upload-file": 3456,
+      "extract-metadata": 5678,
+      "compress-video": 0,
+      "schedule-backup": 6789,
+      "convert-audio": 3456,
+      "analyze-document": 5678,
+    },
+    {
+      day: "2023-11-27",
+      "sync-data": 8765,
+      "process-image": 3456,
+      "upload-file": 0,
+      "extract-metadata": 5678,
+      "compress-video": 3456,
+      "schedule-backup": 5678,
+      "convert-audio": 0,
+      "analyze-document": 6789,
+    },
+    {
+      day: "2023-11-28",
+      "sync-data": 5678,
+      "process-image": 0,
+      "upload-file": 7654,
+      "extract-metadata": 3456,
+      "compress-video": 5678,
+      "schedule-backup": 3456,
+      "convert-audio": 7654,
+      "analyze-document": 0,
+    },
+    {
+      day: "2023-11-29",
+      "sync-data": 0,
+      "process-image": 8765,
+      "upload-file": 3456,
+      "extract-metadata": 0,
+      "compress-video": 6789,
+      "schedule-backup": 3456,
+      "convert-audio": 5678,
+      "analyze-document": 7654,
+    },
+    {
+      day: "2023-11-30",
+      "sync-data": 7654,
+      "process-image": 3456,
+      "upload-file": 5678,
+      "extract-metadata": 7654,
+      "compress-video": 5432,
+      "schedule-backup": 6789,
+      "convert-audio": 3456,
+      "analyze-document": 5678,
+    },
+  ],
+};
+
+const lineChartConfig = {
+  "success-rate": {
+    label: "Success Rate",
+    color: "#22C55E",
+  },
+  "failure-rate": {
+    label: "Failure Rate",
+    color: "#F43F5E",
+  },
+} satisfies ChartConfig;
+
+const barChartBigDatasetConfig = {
+  "sync-data": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>sync-data</span>
+        <span className="text-text-dimmed/50">7fj29d0ksl38ac5q</span>
+      </div>
+    ),
+    color: "#3B82F6",
+  },
+  "process-image": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>process-image</span>
+        <span className="text-text-dimmed/50">3lk49c7fm2d8r6p0</span>
+      </div>
+    ),
+    color: "#22C55E",
+  },
+  "upload-file": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>upload-file</span>
+        <span className="text-text-dimmed/50">j8k2p3d9f7a6s5l0</span>
+      </div>
+    ),
+    color: "#F59E0B",
+  },
+  "extract-metadata": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>extract-metadata</span>
+        <span className="text-text-dimmed/50">q7w6e5r4t3y2u1i0</span>
+      </div>
+    ),
+    color: "#F43F5E",
+  },
+  "compress-video": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>compress-video</span>
+        <span className="text-text-dimmed/50">a2s3d4f5g6h7j8k9</span>
+      </div>
+    ),
+    color: "#8B5CF6",
+  },
+  "schedule-backup": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>schedule-backup</span>
+        <span className="text-text-dimmed/50">z1x2c3v4b5n6m7l8</span>
+      </div>
+    ),
+    color: "#06B6D4",
+  },
+  "convert-audio": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>convert-audio</span>
+        <span className="text-text-dimmed/50">p0o9i8u7y6t5r4e3</span>
+      </div>
+    ),
+    color: "#EC4899",
+  },
+  "analyze-document": {
+    label: (
+      <div className="flex items-center gap-2">
+        <span>analyze-document</span>
+        <span className="text-text-dimmed/50">m2n3b4v5c6x7z8l9</span>
+      </div>
+    ),
+    color: "#F97316",
+  },
+} satisfies ChartConfig;
diff --git a/apps/webapp/app/routes/storybook.input-fields/route.tsx b/apps/webapp/app/routes/storybook.input-fields/route.tsx
index 62794fab7bf..e6402d732c2 100644
--- a/apps/webapp/app/routes/storybook.input-fields/route.tsx
+++ b/apps/webapp/app/routes/storybook.input-fields/route.tsx
@@ -20,6 +20,9 @@ function InputFieldSet({ disabled }: { disabled?: boolean }) {
         <Input disabled={disabled} variant="medium" placeholder="Name" type="text" />
         <Input disabled={disabled} variant="small" placeholder="Name" type="text" />
         <Input disabled={disabled} variant="tertiary" placeholder="Name" type="text" />
+        <Input disabled={disabled} variant="outline/large" placeholder="Name" type="text" />
+        <Input disabled={disabled} variant="outline/medium" placeholder="Name" type="text" />
+        <Input disabled={disabled} variant="outline/small" placeholder="Name" type="text" />
       </div>
       <div className="m-8 flex w-64 flex-col gap-4">
         <Input
@@ -51,50 +54,6 @@ function InputFieldSet({ disabled }: { disabled?: boolean }) {
           accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="small" />}
         />
       </div>
-      <div className="m-8 flex w-64 flex-col gap-4">
-        <Input
-          disabled={disabled}
-          variant="large"
-          placeholder="Search"
-          icon={<EnvironmentLabel environment={{ type: "DEVELOPMENT" }} />}
-          accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="medium" />}
-        />
-        <Input
-          disabled={disabled}
-          variant="medium"
-          placeholder="Search"
-          icon={<EnvironmentLabel environment={{ type: "DEVELOPMENT" }} />}
-          accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="medium" />}
-        />
-        <Input
-          disabled={disabled}
-          variant="small"
-          placeholder="Search"
-          icon={<EnvironmentLabel environment={{ type: "DEVELOPMENT" }} />}
-          accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="small" />}
-        />
-        <Input
-          disabled={disabled}
-          variant="tertiary"
-          placeholder="Search"
-          icon={<EnvironmentLabel environment={{ type: "DEVELOPMENT" }} />}
-          accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="small" />}
-        />
-        <Input
-          disabled={disabled}
-          variant="tertiary"
-          placeholder="Search"
-          icon={<EnvironmentLabel environment={{ type: "STAGING" }} />}
-          accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="small" />}
-        />
-        <Input
-          disabled={disabled}
-          variant="tertiary"
-          placeholder="Search"
-          icon={<EnvironmentLabel environment={{ type: "PRODUCTION" }} />}
-          accessory={<ShortcutKey shortcut={{ key: "k", modifiers: ["meta"] }} variant="small" />}
-        />
-      </div>
     </div>
   );
 }
diff --git a/apps/webapp/app/routes/storybook.segmented-control/route.tsx b/apps/webapp/app/routes/storybook.segmented-control/route.tsx
index f97d3940399..e3a16590fa2 100644
--- a/apps/webapp/app/routes/storybook.segmented-control/route.tsx
+++ b/apps/webapp/app/routes/storybook.segmented-control/route.tsx
@@ -3,20 +3,48 @@ import { Paragraph } from "~/components/primitives/Paragraph";
 import SegmentedControl from "~/components/primitives/SegmentedControl";
 
 const options = [
-  { label: "Label 1", value: "developer" },
-  { label: "Label 2", value: "Users" },
+  { label: "Label 1", value: "label1" },
+  { label: "Label 2", value: "label2" },
 ];
 
 export default function Story() {
   return (
     <MainCenteredContainer className="flex flex-col gap-8">
       <div className="flex flex-col gap-2">
-        <Paragraph>Primary</Paragraph>
-        <SegmentedControl name="name" options={options} variant="primary" />
+        <Paragraph>primary/small</Paragraph>
+        <SegmentedControl
+          name="name1"
+          defaultValue={options[0].value}
+          options={options}
+          variant="primary/small"
+        />
       </div>
       <div className="flex flex-col gap-2">
-        <Paragraph>Secondary</Paragraph>
-        <SegmentedControl name="name" options={options} variant="secondary" />
+        <Paragraph>primary/medium</Paragraph>
+        <SegmentedControl
+          name="name2"
+          defaultValue={options[0].value}
+          options={options}
+          variant="primary/medium"
+        />
+      </div>
+      <div className="flex flex-col gap-2">
+        <Paragraph>secondary/small</Paragraph>
+        <SegmentedControl
+          name="name3"
+          defaultValue={options[0].value}
+          options={options}
+          variant="secondary/small"
+        />
+      </div>
+      <div className="flex flex-col gap-2">
+        <Paragraph>secondary/medium</Paragraph>
+        <SegmentedControl
+          name="name4"
+          defaultValue={options[0].value}
+          options={options}
+          variant="secondary/medium"
+        />
       </div>
     </MainCenteredContainer>
   );
diff --git a/apps/webapp/app/routes/storybook.stepper/route.tsx b/apps/webapp/app/routes/storybook.stepper/route.tsx
new file mode 100644
index 00000000000..3cbe8f2f632
--- /dev/null
+++ b/apps/webapp/app/routes/storybook.stepper/route.tsx
@@ -0,0 +1,75 @@
+import { useState } from "react";
+import { Header2, Header3 } from "~/components/primitives/Headers";
+import { InputNumberStepper } from "~/components/primitives/InputNumberStepper";
+
+export default function Story() {
+  const [value1, setValue1] = useState<number | "">(0);
+  const [value2, setValue2] = useState<number | "">(100);
+  const [value3, setValue3] = useState<number | "">(0);
+  const [value4, setValue4] = useState<number | "">(250);
+  const [value5, setValue5] = useState<number | "">(250);
+
+  return (
+    <div className="grid h-full w-full place-items-center">
+      <div className="flex flex-col gap-8">
+        <div className="flex flex-col gap-2">
+          <Header2>InputNumberStepper</Header2>
+          <Header3>Size: base (default)</Header3>
+          <div className="flex flex-col gap-2">
+            <label className="text-sm text-text-dimmed">Step: 75</label>
+            <InputNumberStepper
+              value={value1}
+              onChange={(e) => setValue1(e.target.value === "" ? "" : Number(e.target.value))}
+              step={75}
+            />
+          </div>
+
+          <div className="flex flex-col gap-2">
+            <label className="text-sm text-text-dimmed">Step: 50, Min: 0, Max: 1000</label>
+            <InputNumberStepper
+              value={value2}
+              onChange={(e) => setValue2(e.target.value === "" ? "" : Number(e.target.value))}
+              step={50}
+              min={0}
+              max={1000}
+            />
+          </div>
+
+          <div className="flex flex-col gap-2">
+            <label className="text-sm text-text-dimmed">Disabled state</label>
+            <InputNumberStepper
+              value={value3}
+              onChange={(e) => setValue3(e.target.value === "" ? "" : Number(e.target.value))}
+              step={50}
+              disabled
+            />
+          </div>
+        </div>
+
+        <div className="flex flex-col gap-2">
+          <Header3>Size: large</Header3>
+          <div className="flex flex-col gap-2">
+            <label className="text-sm text-text-dimmed">Step: 50</label>
+            <InputNumberStepper
+              value={value4}
+              onChange={(e) => setValue4(e.target.value === "" ? "" : Number(e.target.value))}
+              step={50}
+              controlSize="large"
+            />
+          </div>
+
+          <div className="flex flex-col gap-2">
+            <label className="text-sm text-text-dimmed">Step: 50, Disabled</label>
+            <InputNumberStepper
+              value={value5}
+              onChange={(e) => setValue5(e.target.value === "" ? "" : Number(e.target.value))}
+              step={50}
+              controlSize="large"
+              disabled={true}
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/storybook.table/route.tsx b/apps/webapp/app/routes/storybook.table/route.tsx
index 2a509e55510..afe48a2a71e 100644
--- a/apps/webapp/app/routes/storybook.table/route.tsx
+++ b/apps/webapp/app/routes/storybook.table/route.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { Header1, Header2 } from "~/components/primitives/Headers";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import {
+  CopyableTableCell,
   Table,
   TableBody,
   TableCell,
@@ -60,6 +61,33 @@ export default function Story() {
           </TableBody>
         </Table>
       </div>
+      <div className="flex flex-col gap-2">
+        <Header1>Copyable cells</Header1>
+        <Paragraph>
+          Hover over the first column to see the copy button. Click to copy the cell value.
+        </Paragraph>
+        <Table>
+          <TableHeader className="bg-background-bright">
+            <TableRow>
+              <TableHeaderCell>ID (copyable)</TableHeaderCell>
+              <TableHeaderCell>Name</TableHeaderCell>
+              <TableHeaderCell>Status</TableHeaderCell>
+            </TableRow>
+          </TableHeader>
+          <TableBody>
+            {Array.from({ length: 5 }, (_, index) => {
+              const id = `run_${crypto.randomUUID().slice(0, 8)}`;
+              return (
+                <TableRow key={index}>
+                  <CopyableTableCell value={id}>{id}</CopyableTableCell>
+                  <TableCell>Task {index + 1}</TableCell>
+                  <TableCell>Completed</TableCell>
+                </TableRow>
+              );
+            })}
+          </TableBody>
+        </Table>
+      </div>
     </div>
   );
 }
diff --git a/apps/webapp/app/routes/storybook.tabs.$tabNumber/route.tsx b/apps/webapp/app/routes/storybook.tabs.$tabNumber/route.tsx
index 549108143b1..8cf7aaa1643 100644
--- a/apps/webapp/app/routes/storybook.tabs.$tabNumber/route.tsx
+++ b/apps/webapp/app/routes/storybook.tabs.$tabNumber/route.tsx
@@ -3,7 +3,7 @@ import { useParams } from "@remix-run/react";
 export default function Story() {
   const { tabNumber } = useParams();
   return (
-    <div className="flex items-center justify-center py-8">
+    <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
       <h1 className="text-5xl">{tabNumber}</h1>
     </div>
   );
diff --git a/apps/webapp/app/routes/storybook.tabs/route.tsx b/apps/webapp/app/routes/storybook.tabs/route.tsx
index fc0c8003a45..f3389f2aff2 100644
--- a/apps/webapp/app/routes/storybook.tabs/route.tsx
+++ b/apps/webapp/app/routes/storybook.tabs/route.tsx
@@ -1,18 +1,188 @@
 import { Outlet } from "@remix-run/react";
+import {
+  ClientTabs,
+  ClientTabsContent,
+  ClientTabsList,
+  ClientTabsTrigger,
+} from "~/components/primitives/ClientTabs";
+import { Header1 } from "~/components/primitives/Headers";
+import { Paragraph } from "~/components/primitives/Paragraph";
 import { Tabs } from "~/components/primitives/Tabs";
 
 export default function Story() {
   return (
-    <div className="w-96 p-8">
-      <Tabs
-        tabs={[
-          { label: "My first tab", to: "1" },
-          { label: "Second tab", to: "2" },
-          { label: "Third tab", to: "3" },
-        ]}
-        layoutId="my-tabs"
-      />
-      <Outlet />
+    <div className="flex items-start justify-center gap-20 px-16 pt-20">
+      <div className="flex w-full max-w-2xl flex-col gap-4">
+        <div className="flex h-fit flex-col gap-2">
+          <div className="flex flex-col gap-2">
+            <Header1 spacing>{"<Tabs/>"} (updates the URL)</Header1>
+            <Paragraph>Variant="underline"</Paragraph>
+          </div>
+          <Tabs
+            tabs={[
+              { label: "First tab", to: "1" },
+              { label: "Second tab", to: "2" },
+              { label: "Third tab", to: "3" },
+            ]}
+            layoutId="my-tabs-1"
+            variant="underline"
+          />
+          <Outlet />
+        </div>
+        <div className="flex h-fit flex-col gap-2">
+          <Paragraph>Variant="pipe-divider"</Paragraph>
+          <Tabs
+            tabs={[
+              { label: "First tab", to: "1" },
+              { label: "Second tab", to: "2" },
+              { label: "Third tab", to: "3" },
+            ]}
+            layoutId="my-tabs-2"
+            variant="pipe-divider"
+          />
+          <Outlet />
+        </div>
+        <div className="flex h-fit flex-col gap-2">
+          <Paragraph>Variant="segmented"</Paragraph>
+          <Tabs
+            tabs={[
+              { label: "First tab", to: "1" },
+              { label: "Second tab", to: "2" },
+              { label: "Third tab", to: "3" },
+            ]}
+            layoutId="my-tabs-3"
+            variant="segmented"
+          />
+          <Outlet />
+        </div>
+      </div>
+      <div className="flex w-full max-w-2xl flex-col gap-4">
+        <div className="flex flex-col gap-2">
+          <div className="flex flex-col gap-2">
+            <Header1 spacing>{"<ClientTabs/>"}</Header1>
+            <Paragraph>Variant="underline"</Paragraph>
+          </div>
+          <ClientTabs defaultValue="tab-1">
+            <div className="flex items-center gap-4">
+              <ClientTabsList variant="underline">
+                <ClientTabsTrigger
+                  value={"tab-1"}
+                  variant="underline"
+                  layoutId="client-tabs-underline"
+                >
+                  First tab
+                </ClientTabsTrigger>
+                <ClientTabsTrigger
+                  value={"tab-2"}
+                  variant="underline"
+                  layoutId="client-tabs-underline"
+                >
+                  Second tab
+                </ClientTabsTrigger>
+                <ClientTabsTrigger
+                  value={"tab-3"}
+                  variant="underline"
+                  layoutId="client-tabs-underline"
+                >
+                  Third tab
+                </ClientTabsTrigger>
+              </ClientTabsList>
+            </div>
+            <ClientTabsContent value={"tab-1"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">1</h1>
+              </div>
+            </ClientTabsContent>
+            <ClientTabsContent value={"tab-2"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">2</h1>
+              </div>
+            </ClientTabsContent>
+            <ClientTabsContent value={"tab-3"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">3</h1>
+              </div>
+            </ClientTabsContent>
+          </ClientTabs>
+        </div>
+
+        <div>
+          <Paragraph spacing>Variant="pipe-divider"</Paragraph>
+          <ClientTabs defaultValue="tab-1">
+            <div className="flex items-center gap-4">
+              <ClientTabsList variant="pipe-divider">
+                <ClientTabsTrigger value={"tab-1"} variant="pipe-divider">
+                  First tab
+                </ClientTabsTrigger>
+                <ClientTabsTrigger value={"tab-2"} variant="pipe-divider">
+                  Second tab
+                </ClientTabsTrigger>
+                <ClientTabsTrigger value={"tab-3"} variant="pipe-divider">
+                  Third tab
+                </ClientTabsTrigger>
+              </ClientTabsList>
+            </div>
+            <ClientTabsContent value={"tab-1"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">1</h1>
+              </div>
+            </ClientTabsContent>
+            <ClientTabsContent value={"tab-2"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">2</h1>
+              </div>
+            </ClientTabsContent>
+            <ClientTabsContent value={"tab-3"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">3</h1>
+              </div>
+            </ClientTabsContent>
+          </ClientTabs>
+        </div>
+        <div>
+          <Paragraph spacing>Variant="segmented"</Paragraph>
+          <ClientTabs defaultValue="tab-1">
+            <ClientTabsList variant="segmented">
+              <ClientTabsTrigger
+                value={"tab-1"}
+                variant="segmented"
+                layoutId="client-tabs-segmented"
+              >
+                First tab
+              </ClientTabsTrigger>
+              <ClientTabsTrigger
+                value={"tab-2"}
+                variant="segmented"
+                layoutId="client-tabs-segmented"
+              >
+                Second tab
+              </ClientTabsTrigger>
+              <ClientTabsTrigger
+                value={"tab-3"}
+                variant="segmented"
+                layoutId="client-tabs-segmented"
+              >
+                Third tab
+              </ClientTabsTrigger>
+            </ClientTabsList>
+            <ClientTabsContent value={"tab-1"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">1</h1>
+              </div>
+            </ClientTabsContent>
+            <ClientTabsContent value={"tab-2"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">2</h1>
+              </div>
+            </ClientTabsContent>
+            <ClientTabsContent value={"tab-3"}>
+              <div className="flex items-center justify-center rounded bg-charcoal-700/50 py-8">
+                <h1 className="text-5xl">3</h1>
+              </div>
+            </ClientTabsContent>
+          </ClientTabs>
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/apps/webapp/app/routes/storybook.tsql-editor/route.tsx b/apps/webapp/app/routes/storybook.tsql-editor/route.tsx
new file mode 100644
index 00000000000..a461478b65d
--- /dev/null
+++ b/apps/webapp/app/routes/storybook.tsql-editor/route.tsx
@@ -0,0 +1,331 @@
+import { useState } from "react";
+import { TSQLEditor } from "~/components/code/TSQLEditor";
+import { column, type TableSchema } from "@internal/tsql";
+
+const RUN_STATUSES = ["PENDING", "QUEUED", "EXECUTING", "COMPLETED", "FAILED", "CANCELED"] as const;
+const LOG_LEVELS = ["DEBUG", "INFO", "WARN", "ERROR"] as const;
+
+const runsSchema: TableSchema = {
+  name: "runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  description: "Task runs table - stores all task execution records",
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+  columns: {
+    id: { name: "id", ...column("String", { description: "Unique run identifier" }) },
+    task_id: { name: "task_id", ...column("String", { description: "Task identifier" }) },
+    status: {
+      name: "status",
+      ...column("String", {
+        description: "Run status",
+        allowedValues: [...RUN_STATUSES],
+      }),
+    },
+    created_at: {
+      name: "created_at",
+      ...column("DateTime64", { description: "When the run was created" }),
+    },
+    started_at: {
+      name: "started_at",
+      ...column("Nullable(DateTime64)", { description: "When the run started executing" }),
+    },
+    completed_at: {
+      name: "completed_at",
+      ...column("Nullable(DateTime64)", { description: "When the run completed" }),
+    },
+    duration_ms: {
+      name: "duration_ms",
+      ...column("Nullable(UInt64)", { description: "Run duration in milliseconds" }),
+    },
+    // Virtual column: computed from started_at and completed_at
+    execution_duration: {
+      name: "execution_duration",
+      ...column("Nullable(Int64)", {
+        description: "Computed execution time in milliseconds (virtual column)",
+      }),
+      expression: "dateDiff('millisecond', started_at, completed_at)",
+    },
+    // Virtual column: duration in seconds for convenience
+    duration_seconds: {
+      name: "duration_seconds",
+      ...column("Float64", {
+        description: "Duration in seconds (virtual column)",
+      }),
+      expression: "duration_ms / 1000.0",
+    },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+};
+
+const logsSchema: TableSchema = {
+  name: "logs",
+  clickhouseName: "trigger_dev.task_events_v2",
+  description: "Task logs and events",
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+  columns: {
+    id: { name: "id", ...column("String", { description: "Event identifier" }) },
+    run_id: { name: "run_id", ...column("String", { description: "Associated run ID" }) },
+    level: {
+      name: "level",
+      ...column("String", {
+        description: "Log level",
+        allowedValues: [...LOG_LEVELS],
+      }),
+    },
+    message: { name: "message", ...column("String", { description: "Log message content" }) },
+    timestamp: { name: "timestamp", ...column("DateTime64", { description: "Event timestamp" }) },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+};
+
+const exampleSchema = [runsSchema, logsSchema];
+
+const exampleQueries = [
+  {
+    name: "Simple SELECT",
+    query: "SELECT * FROM runs LIMIT 10",
+  },
+  {
+    name: "With WHERE clause",
+    query: "SELECT id, task_id, status, created_at FROM runs WHERE status = 'COMPLETED' LIMIT 100",
+  },
+  {
+    name: "Enum IN clause",
+    query: "SELECT * FROM runs WHERE status IN ('PENDING', 'QUEUED', 'EXECUTING') LIMIT 50",
+  },
+  {
+    name: "Virtual columns",
+    query: `SELECT 
+  id,
+  status,
+  execution_duration,
+  duration_seconds
+FROM runs
+WHERE execution_duration > 5000
+ORDER BY execution_duration DESC
+LIMIT 20`,
+  },
+  {
+    name: "Aggregation",
+    query: "SELECT status, count(*) as count FROM runs GROUP BY status ORDER BY count DESC",
+  },
+  {
+    name: "Join query",
+    query: `SELECT 
+  runs.id,
+  runs.status,
+  logs.message,
+  logs.level
+FROM runs
+JOIN logs ON runs.id = logs.run_id
+WHERE logs.level = 'ERROR'
+LIMIT 50`,
+  },
+  {
+    name: "Date filtering",
+    query: `SELECT 
+  toStartOfDay(created_at) as day,
+  count(*) as runs_count,
+  avg(duration_ms) as avg_duration
+FROM runs
+WHERE created_at > now() - INTERVAL 7 DAY
+GROUP BY day
+ORDER BY day DESC`,
+  },
+];
+
+export default function Story() {
+  const [query, setQuery] = useState(exampleQueries[0].query);
+
+  return (
+    <div className="flex flex-col gap-y-8 p-8">
+      <div>
+        <h1 className="mb-2 text-2xl font-bold text-text-bright">TSQL Editor</h1>
+        <p className="text-text-dimmed">
+          A CodeMirror-based SQL editor with syntax highlighting, schema-aware autocomplete, and
+          real-time error detection.
+        </p>
+      </div>
+
+      {/* Example queries */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">Example Queries</h2>
+        <div className="flex flex-wrap gap-2">
+          {exampleQueries.map((example) => (
+            <button
+              key={example.name}
+              onClick={() => setQuery(example.query)}
+              className="rounded bg-charcoal-700 px-3 py-1.5 text-sm text-text-dimmed transition hover:bg-charcoal-600 hover:text-text-bright"
+            >
+              {example.name}
+            </button>
+          ))}
+        </div>
+      </div>
+
+      {/* Main editor */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">Editor with Schema</h2>
+        <p className="text-sm text-text-dimmed">
+          Try typing to see autocomplete suggestions. Type <code>status = </code> to see enum value
+          suggestions. Available tables: <code>runs</code>, <code>logs</code>
+        </p>
+        <div className="overflow-hidden rounded-lg border border-grid-dimmed">
+          <TSQLEditor
+            defaultValue={query}
+            onChange={setQuery}
+            schema={exampleSchema}
+            linterEnabled={true}
+            showCopyButton={true}
+            showClearButton={true}
+            minHeight="200px"
+            className="min-h-[200px]"
+          />
+        </div>
+      </div>
+
+      {/* Read-only example */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">Read-only Mode</h2>
+        <div className="overflow-hidden rounded-lg border border-grid-dimmed">
+          <TSQLEditor
+            defaultValue="SELECT id, status, created_at FROM runs WHERE status = 'FAILED' ORDER BY created_at DESC LIMIT 10"
+            readOnly={true}
+            schema={exampleSchema}
+            linterEnabled={false}
+            showCopyButton={true}
+            showClearButton={false}
+            className="min-h-[100px]"
+          />
+        </div>
+      </div>
+
+      {/* Editor without schema (no autocomplete) */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">Without Schema (Basic Mode)</h2>
+        <p className="text-sm text-text-dimmed">
+          Editor without schema - still has SQL syntax highlighting and keyword completion.
+        </p>
+        <div className="overflow-hidden rounded-lg border border-grid-dimmed">
+          <TSQLEditor
+            defaultValue="SELECT * FROM my_table WHERE id = 1"
+            linterEnabled={true}
+            showCopyButton={true}
+            className="min-h-[100px]"
+          />
+        </div>
+      </div>
+
+      {/* Error example */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">With Syntax Error</h2>
+        <p className="text-sm text-text-dimmed">
+          The linter detects syntax errors and underlines them in red.
+        </p>
+        <div className="overflow-hidden rounded-lg border border-grid-dimmed">
+          <TSQLEditor
+            defaultValue="SELEC * FORM runs"
+            linterEnabled={true}
+            showCopyButton={true}
+            className="min-h-[100px]"
+          />
+        </div>
+      </div>
+
+      {/* Invalid enum value example */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">With Invalid Enum Value</h2>
+        <p className="text-sm text-text-dimmed">
+          The linter validates enum values against the schema. Try changing{" "}
+          <code>'INVALID_STATUS'</code> to a valid status like <code>'COMPLETED'</code>.
+        </p>
+        <div className="overflow-hidden rounded-lg border border-grid-dimmed">
+          <TSQLEditor
+            defaultValue="SELECT * FROM runs WHERE status = 'INVALID_STATUS' LIMIT 10"
+            schema={exampleSchema}
+            linterEnabled={true}
+            showCopyButton={true}
+            className="min-h-[100px]"
+          />
+        </div>
+      </div>
+
+      {/* Unknown column example */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">With Unknown Column</h2>
+        <p className="text-sm text-text-dimmed">
+          The linter warns about unknown column names. Try changing <code>unknown_col</code> to a
+          valid column like <code>status</code>.
+        </p>
+        <div className="overflow-hidden rounded-lg border border-grid-dimmed">
+          <TSQLEditor
+            defaultValue="SELECT id, unknown_col FROM runs LIMIT 10"
+            schema={exampleSchema}
+            linterEnabled={true}
+            showCopyButton={true}
+            className="min-h-[100px]"
+          />
+        </div>
+      </div>
+
+      {/* Available tables reference */}
+      <div className="flex flex-col gap-2">
+        <h2 className="text-lg font-semibold text-text-bright">Available Schema</h2>
+        <div className="grid gap-4 md:grid-cols-2">
+          {exampleSchema.map((table) => (
+            <div
+              key={table.name}
+              className="rounded-lg border border-grid-dimmed bg-charcoal-800 p-4"
+            >
+              <h3 className="mb-1 font-mono text-sm font-semibold text-text-bright">
+                {table.name}
+              </h3>
+              <p className="mb-3 text-xs text-text-dimmed">{table.description}</p>
+              <div className="space-y-1">
+                {Object.entries(table.columns).map(([name, col]) => (
+                  <div key={name} className="flex flex-col gap-0.5 text-xs">
+                    <div className="flex items-baseline gap-2">
+                      <code className={col.expression ? "text-purple-400" : "text-blue-400"}>
+                        {name}
+                      </code>
+                      <span className="text-charcoal-400">{col.type}</span>
+                      {col.expression && (
+                        <span className="rounded bg-purple-500/20 px-1 text-[10px] text-purple-300">
+                          virtual
+                        </span>
+                      )}
+                      {col.description && (
+                        <span className="text-text-dimmed">- {col.description}</span>
+                      )}
+                    </div>
+                    {col.allowedValues && col.allowedValues.length > 0 && (
+                      <div className="ml-4 text-green-400/70">
+                        Allowed: {col.allowedValues.join(", ")}
+                      </div>
+                    )}
+                    {col.expression && (
+                      <div className="ml-4 font-mono text-purple-400/70">
+                        Expression: {col.expression}
+                      </div>
+                    )}
+                  </div>
+                ))}
+              </div>
+            </div>
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/webapp/app/routes/storybook/route.tsx b/apps/webapp/app/routes/storybook/route.tsx
index 995bfdf50e6..83d455c2a55 100644
--- a/apps/webapp/app/routes/storybook/route.tsx
+++ b/apps/webapp/app/routes/storybook/route.tsx
@@ -4,7 +4,7 @@ import { Fragment } from "react";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import { AppContainer } from "~/components/layout/AppLayout";
 import { env } from "~/env.server";
-import { requireUserId } from "~/services/session.server";
+import { requireUser } from "~/services/session.server";
 import { cn } from "~/utils/cn";
 
 const stories: Story[] = [
@@ -24,6 +24,10 @@ const stories: Story[] = [
     name: "Callouts",
     slug: "callout",
   },
+  {
+    name: "Charts",
+    slug: "charts",
+  },
   {
     name: "Checkboxes",
     slug: "checkboxes",
@@ -64,10 +68,6 @@ const stories: Story[] = [
     name: "Loading bar divider",
     slug: "loading-bar-divider",
   },
-  {
-    name: "NamedIcon",
-    slug: "named-icon",
-  },
   {
     name: "Page header",
     slug: "page-header",
@@ -84,6 +84,10 @@ const stories: Story[] = [
     name: "Resizable",
     slug: "resizable",
   },
+  {
+    name: "Run & Span timeline",
+    slug: "run-and-span-timeline",
+  },
   {
     name: "Segemented control",
     slug: "segmented-control",
@@ -108,6 +112,10 @@ const stories: Story[] = [
     name: "Tabs",
     slug: "tabs",
   },
+  {
+    name: "Timeline",
+    slug: "timeline",
+  },
   {
     name: "Toast",
     slug: "toast",
@@ -121,12 +129,8 @@ const stories: Story[] = [
     slug: "tree-view",
   },
   {
-    name: "Timeline",
-    slug: "timeline",
-  },
-  {
-    name: "Run & Span timeline",
-    slug: "run-and-span-timeline",
+    name: "TSQL Editor",
+    slug: "tsql-editor",
   },
   {
     name: "Typography",
@@ -136,6 +140,7 @@ const stories: Story[] = [
     name: "Usage",
     slug: "usage",
   },
+  // Forms section
   {
     sectionTitle: "Forms",
     name: "Date fields",
@@ -153,16 +158,17 @@ const stories: Story[] = [
     name: "Simple form",
     slug: "simple-form",
   },
+  {
+    name: "Stepper",
+    slug: "stepper",
+  },
   {
     name: "Textarea",
     slug: "textarea",
   },
+  // Menus section
   {
     sectionTitle: "Menus",
-    name: "Select",
-    slug: "select",
-  },
-  {
     name: "Filter",
     slug: "filter",
   },
@@ -170,14 +176,16 @@ const stories: Story[] = [
     name: "Popover",
     slug: "popover",
   },
+  {
+    name: "Select",
+    slug: "select",
+  },
 ];
 
 export const loader = async ({ request, params }: LoaderFunctionArgs) => {
-  await requireUserId(request);
-
-  console.log("ENV", env.NODE_ENV);
+  const user = await requireUser(request);
 
-  if (env.NODE_ENV !== "development") {
+  if (!user.admin) {
     throw redirect("/");
   }
 
diff --git a/apps/webapp/app/routes/vercel.callback.ts b/apps/webapp/app/routes/vercel.callback.ts
new file mode 100644
index 00000000000..6a188acfa3f
--- /dev/null
+++ b/apps/webapp/app/routes/vercel.callback.ts
@@ -0,0 +1,78 @@
+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { redirect } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { logger } from "~/services/logger.server";
+import { getUserId } from "~/services/session.server";
+import { setReferralSourceCookie } from "~/services/referralSource.server";
+import { requestUrl } from "~/utils/requestUrl.server";
+import { sanitizeVercelNextUrl } from "~/v3/vercel/vercelUrls.server";
+
+const VercelCallbackSchema = z
+  .object({
+    code: z.string().optional(),
+    state: z.string().optional(),
+    error: z.string().optional(),
+    error_description: z.string().optional(),
+    configurationId: z.string().optional(),
+    next: z.string().optional()
+  })
+  .passthrough();
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  if (request.method.toUpperCase() !== "GET") {
+    throw new Response("Method Not Allowed", { status: 405 });
+  }
+
+  const userId = await getUserId(request);
+  if (!userId) {
+    const currentUrl = new URL(request.url);
+    const redirectTo = `${currentUrl.pathname}${currentUrl.search}`;
+    const referralCookie = await setReferralSourceCookie("vercel");
+
+    const headers = new Headers();
+    headers.append("Set-Cookie", referralCookie);
+
+    throw redirect(`/login?redirectTo=${encodeURIComponent(redirectTo)}`, { headers });
+  }
+
+  const url = requestUrl(request);
+  const parsed = VercelCallbackSchema.safeParse(Object.fromEntries(url.searchParams));
+
+  if (!parsed.success) {
+    logger.error("Invalid Vercel callback params", { error: parsed.error });
+    throw new Response("Invalid callback parameters", { status: 400 });
+  }
+
+  const { code, state, error, error_description, configurationId, next: rawNextUrl } = parsed.data;
+
+  // Sanitize the `next` parameter to prevent open redirects
+  const nextUrl = sanitizeVercelNextUrl(rawNextUrl);
+
+  if (error) {
+    logger.error("Vercel OAuth error", { error, error_description });
+    throw new Response("Vercel OAuth error", { status: 500 });
+  }
+
+  if (!code) {
+    logger.error("Missing authorization code from Vercel callback");
+    throw new Response("Missing authorization code", { status: 400 });
+  }
+
+  // Route with state: dashboard-invoked flow
+  if (state) {
+    const params = new URLSearchParams({ state, code, origin: "dashboard" });
+    if (configurationId) params.set("configurationId", configurationId);
+    if (nextUrl) params.set("next", nextUrl);
+    return redirect(`/vercel/connect?${params.toString()}`);
+  }
+
+  // Route without state but with configurationId: marketplace-invoked flow
+  if (configurationId) {
+    const params = new URLSearchParams({ code, configurationId, origin: "marketplace" });
+    if (nextUrl) params.set("next", nextUrl);
+    return redirect(`/vercel/onboarding?${params.toString()}`);
+  }
+
+  logger.error("Missing both state and configurationId from Vercel callback");
+  throw new Response("Missing state or configurationId parameter", { status: 400 });
+}
diff --git a/apps/webapp/app/routes/vercel.configure.tsx b/apps/webapp/app/routes/vercel.configure.tsx
new file mode 100644
index 00000000000..25b9197176c
--- /dev/null
+++ b/apps/webapp/app/routes/vercel.configure.tsx
@@ -0,0 +1,52 @@
+import type { LoaderFunctionArgs } from "@remix-run/node";
+import { redirect } from "@remix-run/node";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { requireUserId } from "~/services/session.server";
+import { organizationVercelIntegrationPath } from "~/utils/pathBuilder";
+
+const SearchParamsSchema = z.object({
+  configurationId: z.string(),
+});
+
+/**
+ * Endpoint to handle Vercel integration configuration request coming from marketplace
+ */
+export const loader = async ({ request }: LoaderFunctionArgs) => {
+  await requireUserId(request);
+  const url = new URL(request.url);
+  const searchParams = Object.fromEntries(url.searchParams);
+  
+  const { configurationId } = SearchParamsSchema.parse(searchParams);
+
+  // Find the organization integration by configurationId (installationId in integrationData)
+  const integration = await prisma.organizationIntegration.findFirst({
+    where: {
+      service: "VERCEL",
+      deletedAt: null,
+      integrationData: {
+        path: ["installationId"],
+        equals: configurationId,
+      },
+    },
+    include: {
+      organization: {
+        select: {
+          slug: true,
+        },
+      },
+    },
+  });
+
+  if (!integration) {
+    throw new Response("Integration not found", { status: 404 });
+  }
+
+  // Redirect to the organization's Vercel integration page
+  return redirect(organizationVercelIntegrationPath(integration.organization));
+};
+
+// This route doesn't render anything, it just redirects
+export default function VercelConfigurePage() {
+  return null;
+}
\ No newline at end of file
diff --git a/apps/webapp/app/routes/vercel.connect.tsx b/apps/webapp/app/routes/vercel.connect.tsx
new file mode 100644
index 00000000000..7c0701edfe3
--- /dev/null
+++ b/apps/webapp/app/routes/vercel.connect.tsx
@@ -0,0 +1,170 @@
+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { redirect } from "@remix-run/server-runtime";
+import { fromPromise } from "neverthrow";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { VercelIntegrationRepository, type TokenResponse } from "~/models/vercelIntegration.server";
+import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import { requestUrl } from "~/utils/requestUrl.server";
+import { v3ProjectSettingsPath } from "~/utils/pathBuilder";
+import { validateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
+
+const VercelConnectSchema = z.object({
+  state: z.string(),
+  configurationId: z.string().optional(),
+  code: z.string(),
+  next: z.string().optional(),
+  origin: z.enum(["marketplace", "dashboard"]),
+});
+
+async function createOrFindVercelIntegration(
+  organizationId: string,
+  projectId: string,
+  tokenResponse: TokenResponse,
+  configurationId: string | undefined,
+  origin: 'marketplace' | 'dashboard'
+): Promise<void> {
+  const project = await prisma.project.findUnique({
+    where: { id: projectId },
+    include: { organization: true },
+  });
+
+  if (!project) {
+    throw new Error("Project not found");
+  }
+
+  let orgIntegration = await VercelIntegrationRepository.findVercelOrgIntegrationByTeamId(
+    organizationId,
+    tokenResponse.teamId ?? null
+  );
+
+  if (orgIntegration) {
+    await VercelIntegrationRepository.updateVercelOrgIntegrationToken({
+      integrationId: orgIntegration.id,
+      accessToken: tokenResponse.accessToken,
+      tokenType: tokenResponse.tokenType,
+      teamId: tokenResponse.teamId ?? null,
+      userId: tokenResponse.userId,
+      installationId: configurationId,
+      raw: tokenResponse.raw
+    });
+  } else {
+    await VercelIntegrationRepository.createVercelOrgIntegration({
+      accessToken: tokenResponse.accessToken,
+      tokenType: tokenResponse.tokenType,
+      teamId: tokenResponse.teamId ?? null,
+      userId: tokenResponse.userId,
+      installationId: configurationId,
+      organization: project.organization,
+      raw: tokenResponse.raw,
+      origin,
+    });
+  }
+}
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+  const url = requestUrl(request);
+
+  const parsed = VercelConnectSchema.safeParse(Object.fromEntries(url.searchParams));
+  if (!parsed.success) {
+    logger.error("Invalid Vercel connect params", { error: parsed.error });
+    throw new Response("Invalid parameters", { status: 400 });
+  }
+
+  const { state, configurationId, code, next, origin } = parsed.data;
+
+  const validationResult = await validateVercelOAuthState(state);
+  if (!validationResult.ok) {
+    logger.error("Invalid Vercel OAuth state JWT", { error: validationResult.error });
+
+    if (
+      validationResult.error?.includes("expired") ||
+      validationResult.error?.includes("Token has expired")
+    ) {
+      const params = new URLSearchParams({ error: "expired" });
+      return redirect(`/vercel/onboarding?${params.toString()}`);
+    }
+
+    throw new Response("Invalid state", { status: 400 });
+  }
+
+  const stateData = validationResult.state;
+
+  const project = await prisma.project.findFirst({
+    where: {
+      id: stateData.projectId,
+      organizationId: stateData.organizationId,
+      deletedAt: null,
+      organization: {
+        members: {
+          some: { userId },
+        },
+      },
+    },
+    include: {
+      organization: true,
+    },
+  });
+
+  if (!project) {
+    logger.error("Project not found or access denied", {
+      projectId: stateData.projectId,
+      userId,
+    });
+    throw new Response("Project not found", { status: 404 });
+  }
+
+  const tokenResult = await VercelIntegrationRepository.exchangeCodeForToken(code);
+  if (tokenResult.isErr()) {
+    const params = new URLSearchParams({ error: "expired" });
+    return redirect(`/vercel/onboarding?${params.toString()}`);
+  }
+  const tokenResponse = tokenResult.value;
+
+  const environment = await prisma.runtimeEnvironment.findFirst({
+    where: {
+      projectId: project.id,
+      slug: stateData.environmentSlug,
+      archivedAt: null,
+    },
+  });
+
+  if (!environment) {
+    logger.error("Environment not found", {
+      projectId: project.id,
+      environmentSlug: stateData.environmentSlug,
+    });
+    throw new Response("Environment not found", { status: 404 });
+  }
+
+  const settingsPath = v3ProjectSettingsPath(
+    { slug: stateData.organizationSlug },
+    { slug: stateData.projectSlug },
+    { slug: environment.slug }
+  );
+
+  const result = await fromPromise(
+    createOrFindVercelIntegration(stateData.organizationId, stateData.projectId, tokenResponse, configurationId, origin),
+    (error) => error
+  );
+
+  if (result.isErr()) {
+    logger.error("Failed to complete Vercel integration", { error: result.error });
+    throw redirect(settingsPath);
+  }
+
+  logger.info("Vercel organization integration created successfully", {
+    organizationId: stateData.organizationId,
+    projectId: stateData.projectId,
+    teamId: tokenResponse.teamId,
+  });
+
+  const params = new URLSearchParams({ vercelOnboarding: "true", origin });
+  if (next) {
+    params.set("next", next);
+  }
+
+  return redirect(`${settingsPath}?${params.toString()}`);
+}
diff --git a/apps/webapp/app/routes/vercel.install.tsx b/apps/webapp/app/routes/vercel.install.tsx
new file mode 100644
index 00000000000..6a1ca4d7a64
--- /dev/null
+++ b/apps/webapp/app/routes/vercel.install.tsx
@@ -0,0 +1,73 @@
+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { redirect } from "@remix-run/server-runtime";
+import { z } from "zod";
+import { $replica } from "~/db.server";
+import { requireUser } from "~/services/session.server";
+import { logger } from "~/services/logger.server";
+import { OrgIntegrationRepository } from "~/models/orgIntegration.server";
+import { generateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
+import { findProjectBySlug } from "~/models/project.server";
+
+const QuerySchema = z.object({
+  org_slug: z.string(),
+  project_slug: z.string(),
+});
+
+export const loader = async ({ request }: LoaderFunctionArgs) => {
+  const searchParams = new URL(request.url).searchParams;
+  const parsed = QuerySchema.safeParse(Object.fromEntries(searchParams));
+
+  if (!parsed.success) {
+    logger.warn("Vercel App installation redirect with invalid params", {
+      searchParams,
+      error: parsed.error,
+    });
+    throw redirect("/");
+  }
+
+  const { org_slug, project_slug } = parsed.data;
+  const user = await requireUser(request);
+
+  // Find the organization
+  const org = await $replica.organization.findFirst({
+    where: { slug: org_slug, members: { some: { userId: user.id } }, deletedAt: null },
+    orderBy: { createdAt: "desc" },
+    select: {
+      id: true,
+    },
+  });
+
+  if (!org) {
+    throw redirect("/");
+  }
+
+  // Find the project
+  const project = await findProjectBySlug(org_slug, project_slug, user.id);
+  if (!project) {
+    logger.warn("Vercel App installation attempt for non-existent project", {
+      org_slug,
+      project_slug,
+      userId: user.id,
+    });
+    throw redirect("/");
+  }
+
+  // Use "prod" as the default environment slug for the redirect
+  // The callback will redirect to the settings page for this environment
+  const environmentSlug = "prod";
+
+  // Generate JWT state token
+  const stateToken = await generateVercelOAuthState({
+    organizationId: org.id,
+    projectId: project.id,
+    environmentSlug,
+    organizationSlug: org_slug,
+    projectSlug: project_slug,
+  });
+
+  // Generate Vercel install URL
+  const vercelInstallUrl = OrgIntegrationRepository.vercelInstallUrl(stateToken);
+
+  return redirect(vercelInstallUrl);
+};
+
diff --git a/apps/webapp/app/routes/vercel.onboarding.tsx b/apps/webapp/app/routes/vercel.onboarding.tsx
new file mode 100644
index 00000000000..bdd1c1d05ca
--- /dev/null
+++ b/apps/webapp/app/routes/vercel.onboarding.tsx
@@ -0,0 +1,465 @@
+import type { ActionFunctionArgs, LoaderFunctionArgs } from "@remix-run/server-runtime";
+import { json, redirect } from "@remix-run/server-runtime";
+import { fromPromise } from "neverthrow";
+import { useEffect, useState } from "react";
+import { Form, useNavigation } from "@remix-run/react";
+import { typedjson, useTypedLoaderData } from "remix-typedjson";
+import { z } from "zod";
+import { BuildingOfficeIcon, FolderIcon } from "@heroicons/react/20/solid";
+import { AppContainer, MainCenteredContainer } from "~/components/layout/AppLayout";
+import { BackgroundWrapper } from "~/components/BackgroundWrapper";
+import { Button, LinkButton } from "~/components/primitives/Buttons";
+import { Fieldset } from "~/components/primitives/Fieldset";
+import { FormButtons } from "~/components/primitives/FormButtons";
+import { FormTitle } from "~/components/primitives/FormTitle";
+import { InputGroup } from "~/components/primitives/InputGroup";
+import { Label } from "~/components/primitives/Label";
+import { Select, SelectItem } from "~/components/primitives/Select";
+import { ButtonSpinner } from "~/components/primitives/Spinner";
+import { prisma } from "~/db.server";
+import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import { confirmBasicDetailsPath, newProjectPath } from "~/utils/pathBuilder";
+import { redirectWithErrorMessage } from "~/models/message.server";
+import { generateVercelOAuthState } from "~/v3/vercel/vercelOAuthState.server";
+
+const LoaderParamsSchema = z.object({
+  organizationId: z.string().optional().nullable(),
+  code: z.string().optional().nullable(),
+  configurationId: z.string().optional().nullable(),
+  next: z.string().optional().nullable(),
+  error: z.string().optional().nullable(),
+});
+
+const SelectOrgActionSchema = z.object({
+  action: z.literal("select-org"),
+  organizationId: z.string(),
+  code: z.string(),
+  configurationId: z.string().optional().nullable(),
+  next: z.string().optional(),
+});
+
+const SelectProjectActionSchema = z.object({
+  action: z.literal("select-project"),
+  projectId: z.string(),
+  organizationId: z.string(),
+  code: z.string(),
+  configurationId: z.string().optional().nullable(),
+  next: z.string().optional().nullable(),
+});
+
+const ActionSchema = z.discriminatedUnion("action", [
+  SelectOrgActionSchema,
+  SelectProjectActionSchema,
+]);
+
+export async function loader({ request }: LoaderFunctionArgs) {
+  const userId = await requireUserId(request);
+  const url = new URL(request.url);
+
+  const params = LoaderParamsSchema.safeParse({
+    organizationId: url.searchParams.get("organizationId"),
+    code: url.searchParams.get("code"),
+    configurationId: url.searchParams.get("configurationId"),
+    next: url.searchParams.get("next"),
+    error: url.searchParams.get("error"),
+  });
+
+  if (!params.success) {
+    logger.error("Invalid params for Vercel onboarding", { error: params.error });
+    throw redirectWithErrorMessage(
+      "/",
+      request,
+      "Invalid installation parameters. Please try again from Vercel."
+    );
+  }
+
+  const { error } = params.data;
+  if (error === "expired") {
+    return typedjson({
+      step: "error" as const,
+      error: "Your installation session has expired. Please start the installation again.",
+      code: params.data.code ?? null,
+      configurationId: params.data.configurationId ?? null,
+      next: params.data.next ?? null,
+    });
+  }
+
+  if (!params.data.code) {
+    logger.error("Missing code parameter for Vercel onboarding");
+    throw redirectWithErrorMessage(
+      "/",
+      request,
+      "Invalid installation parameters. Please try again from Vercel."
+    );
+  }
+
+  const code = params.data.code;
+
+  const organizations = await prisma.organization.findMany({
+    where: {
+      members: {
+        some: { userId },
+      },
+      deletedAt: null,
+    },
+    select: {
+      id: true,
+      title: true,
+      slug: true,
+      projects: {
+        where: {
+          deletedAt: null,
+        },
+        select: {
+          id: true,
+          name: true,
+          slug: true,
+        },
+        orderBy: {
+          createdAt: "asc",
+        },
+      },
+    },
+    orderBy: {
+      createdAt: "asc",
+    },
+  });
+
+  // New user: no organizations
+  if (organizations.length === 0) {
+    const onboardingParams = new URLSearchParams();
+    onboardingParams.set("code", code);
+    if (params.data.configurationId) {
+      onboardingParams.set("configurationId", params.data.configurationId);
+    }
+    onboardingParams.set("integration", "vercel");
+    if (params.data.next) {
+      onboardingParams.set("next", params.data.next);
+    }
+    throw redirect(`${confirmBasicDetailsPath()}?${onboardingParams.toString()}`);
+  }
+
+  // If organizationId is provided, show project selection
+  if (params.data.organizationId) {
+    const organization = organizations.find((org) => org.id === params.data.organizationId);
+
+    if (!organization) {
+      logger.error("Organization not found or access denied", {
+        organizationId: params.data.organizationId,
+        userId,
+      });
+      throw redirectWithErrorMessage(
+        "/",
+        request,
+        "Organization not found. Please try again."
+      );
+    }
+
+    return typedjson({
+      step: "project" as const,
+      organization,
+      organizations,
+      code: code,
+      configurationId: params.data.configurationId ?? null,
+      next: params.data.next ?? null,
+    });
+  }
+
+  return typedjson({
+    step: "org" as const,
+    organizations,
+    code: code,
+    configurationId: params.data.configurationId ?? null,
+    next: params.data.next ?? null,
+  });
+}
+
+export async function action({ request }: ActionFunctionArgs) {
+  const userId = await requireUserId(request);
+  const formData = await request.formData();
+
+  const submission = ActionSchema.safeParse({
+    action: formData.get("action"),
+    organizationId: formData.get("organizationId"),
+    projectId: formData.get("projectId"),
+    code: formData.get("code"),
+    configurationId: formData.get("configurationId"),
+    next: formData.get("next"),
+  });
+
+  if (!submission.success) {
+    return json({ error: "Invalid submission" }, { status: 400 });
+  }
+
+  const { code, configurationId, next } = submission.data;
+
+  // Handle org selection
+  if (submission.data.action === "select-org") {
+    const { organizationId } = submission.data;
+
+    const projectParams = new URLSearchParams();
+    projectParams.set("organizationId", organizationId);
+    projectParams.set("code", code);
+    if (configurationId) {
+      projectParams.set("configurationId", configurationId);
+    }
+    if (next) {
+      projectParams.set("next", next);
+    }
+
+    return redirect(`/vercel/onboarding?${projectParams.toString()}`);
+  }
+
+  // Handle project selection
+  const { projectId, organizationId } = submission.data;
+
+  const project = await prisma.project.findFirst({
+    where: {
+      id: projectId,
+      organizationId,
+      deletedAt: null,
+      organization: {
+        members: { some: { userId } },
+      },
+    },
+    include: {
+      organization: true,
+    },
+  });
+
+  if (!project) {
+    logger.error("Project not found or access denied", { projectId, userId });
+    return json({ error: "Project not found" }, { status: 404 });
+  }
+
+  const environment = await prisma.runtimeEnvironment.findFirst({
+    where: {
+      projectId: project.id,
+      slug: "prod",
+      archivedAt: null,
+    },
+  });
+
+  if (!environment) {
+    logger.error("Environment not found", { projectId: project.id });
+    return json({ error: "Environment not found" }, { status: 404 });
+  }
+
+  const stateResult = await fromPromise(
+    generateVercelOAuthState({
+      organizationId: project.organizationId,
+      projectId: project.id,
+      environmentSlug: environment.slug,
+      organizationSlug: project.organization.slug,
+      projectSlug: project.slug,
+    }),
+    (error) => error
+  );
+
+  if (stateResult.isErr()) {
+    logger.error("Failed to generate Vercel OAuth state", { error: stateResult.error });
+    return json({ error: "Failed to generate installation state" }, { status: 500 });
+  }
+
+  const params = new URLSearchParams();
+  params.set("state", stateResult.value);
+  params.set("code", code);
+  if (configurationId) {
+    params.set("configurationId", configurationId);
+  }
+  params.set("origin", "marketplace");
+  if (next) {
+    params.set("next", next);
+  }
+
+  return redirect(`/vercel/connect?${params.toString()}`, 303);
+}
+
+export default function VercelOnboardingPage() {
+  const data = useTypedLoaderData<typeof loader>();
+  const navigation = useNavigation();
+  const isSubmitting = navigation.state === "submitting";
+  const [isInstalling, setIsInstalling] = useState(false);
+
+  // Reset isInstalling when navigation returns to idle (e.g. on error)
+  useEffect(() => {
+    if (navigation.state === "idle" && isInstalling) {
+      setIsInstalling(false);
+    }
+  }, [navigation.state, isInstalling]);
+
+  if (data.step === "error") {
+    return (
+      <AppContainer className="bg-charcoal-900">
+        <BackgroundWrapper>
+          <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+            <FormTitle title="Installation Expired" description={data.error} />
+            <Button
+              variant="primary/medium"
+              onClick={() => window.close()}
+              className="w-full"
+            >
+              Close
+            </Button>
+          </MainCenteredContainer>
+        </BackgroundWrapper>
+      </AppContainer>
+    );
+  }
+
+  if (data.step === "org") {
+    const newOrgUrl = (() => {
+      const params = new URLSearchParams();
+      params.set("code", data.code);
+      if (data.configurationId) {
+        params.set("configurationId", data.configurationId);
+      }
+      params.set("integration", "vercel");
+      if (data.next) {
+        params.set("next", data.next);
+      }
+      return `/orgs/new?${params.toString()}`;
+    })();
+
+    return (
+      <AppContainer className="bg-charcoal-900">
+        <BackgroundWrapper>
+          <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+            <FormTitle
+              LeadingIcon={<BuildingOfficeIcon className="size-7 text-indigo-500" />}
+              title="Select Organization"
+              description="Choose which organization to install the Vercel integration into."
+            />
+            <Form method="post">
+              <input type="hidden" name="action" value="select-org" />
+              <input type="hidden" name="code" value={data.code} />
+              {data.configurationId && (
+                <input type="hidden" name="configurationId" value={data.configurationId} />
+              )}
+              {data.next && <input type="hidden" name="next" value={data.next} />}
+
+              <Fieldset>
+                <InputGroup>
+                  <Label>Organization</Label>
+                  <Select
+                    name="organizationId"
+                    placeholder="Choose an organization"
+                    required
+                    variant="tertiary/medium"
+                    dropdownIcon
+                    defaultValue={data.organizations[0]?.id}
+                    text={(v) =>
+                      typeof v === "string"
+                        ? data.organizations.find((o) => o.id === v)?.title || "Choose an organization"
+                        : "Choose an organization"
+                    }
+                  >
+                    {data.organizations.map((org) => (
+                      <SelectItem key={org.id} value={org.id}>
+                        {org.title}
+                      </SelectItem>
+                    ))}
+                  </Select>
+                </InputGroup>
+                <FormButtons
+                  confirmButton={
+                    <div className="flex items-center gap-2">
+                      <LinkButton to={newOrgUrl} variant="tertiary/small">
+                        + New Organization
+                      </LinkButton>
+                      <Button type="submit" variant="primary/small">
+                        Continue
+                      </Button>
+                    </div>
+                  }
+                />
+              </Fieldset>
+            </Form>
+          </MainCenteredContainer>
+        </BackgroundWrapper>
+      </AppContainer>
+    );
+  }
+
+  const newProjectUrl = (() => {
+    const params = new URLSearchParams();
+    params.set("code", data.code);
+    if (data.configurationId) {
+      params.set("configurationId", data.configurationId);
+    }
+    params.set("integration", "vercel");
+    params.set("organizationId", data.organization.id);
+    if (data.next) {
+      params.set("next", data.next);
+    }
+    return `${newProjectPath({ slug: data.organization.slug })}?${params.toString()}`;
+  })();
+
+  const isLoading = isSubmitting || isInstalling;
+
+  return (
+    <AppContainer className="bg-charcoal-900">
+      <BackgroundWrapper>
+        <MainCenteredContainer className="max-w-[26rem] rounded-lg border border-grid-bright bg-background-dimmed p-5 shadow-lg">
+          <FormTitle
+            LeadingIcon={<FolderIcon className="size-7 text-indigo-500" />}
+            title="Select Project"
+            description={`Choose which project in "${data.organization.title}" to install the Vercel integration into.`}
+          />
+          <Form method="post" onSubmit={() => setIsInstalling(true)}>
+            <input type="hidden" name="action" value="select-project" />
+            <input type="hidden" name="organizationId" value={data.organization.id} />
+            <input type="hidden" name="code" value={data.code} />
+            {data.configurationId && (
+              <input type="hidden" name="configurationId" value={data.configurationId} />
+            )}
+            {data.next && <input type="hidden" name="next" value={data.next} />}
+
+            <Fieldset>
+              <InputGroup>
+                <Label>Project</Label>
+                <Select
+                  name="projectId"
+                  placeholder="Choose a project"
+                  required
+                  variant="tertiary/medium"
+                  dropdownIcon
+                  defaultValue={data.organization.projects[0]?.id}
+                  text={(v) =>
+                    typeof v === "string"
+                      ? data.organization.projects.find((p) => p.id === v)?.name || "Choose a project"
+                      : "Choose a project"
+                  }
+                >
+                  {data.organization.projects.map((project) => (
+                    <SelectItem key={project.id} value={project.id}>
+                      {project.name}
+                    </SelectItem>
+                  ))}
+                </Select>
+              </InputGroup>
+              <FormButtons
+                confirmButton={
+                  <div className="flex items-center gap-2">
+                    <LinkButton to={newProjectUrl} variant="tertiary/small" disabled={isLoading}>
+                      + New Project
+                    </LinkButton>
+                    <Button
+                      type="submit"
+                      variant="primary/small"
+                      disabled={isLoading}
+                      TrailingIcon={isLoading ? ButtonSpinner : undefined}
+                    >
+                      {isLoading ? "Continuing…" : "Continue"}
+                    </Button>
+                  </div>
+                }
+              />
+            </Fieldset>
+          </Form>
+        </MainCenteredContainer>
+      </BackgroundWrapper>
+    </AppContainer>
+  );
+}
diff --git a/apps/webapp/app/runEngine/concerns/batchGlobalRateLimiter.server.ts b/apps/webapp/app/runEngine/concerns/batchGlobalRateLimiter.server.ts
new file mode 100644
index 00000000000..9d808dd7566
--- /dev/null
+++ b/apps/webapp/app/runEngine/concerns/batchGlobalRateLimiter.server.ts
@@ -0,0 +1,36 @@
+import { Ratelimit } from "@upstash/ratelimit";
+import type { GlobalRateLimiter } from "@trigger.dev/redis-worker";
+import { RateLimiter } from "~/services/rateLimiter.server";
+
+/**
+ * Creates a global rate limiter for the batch queue that limits
+ * the maximum number of items processed per second across all consumers.
+ *
+ * Uses a token bucket algorithm where:
+ * - `itemsPerSecond` tokens are available per second
+ * - The bucket can hold up to `itemsPerSecond` tokens (burst capacity)
+ *
+ * @param itemsPerSecond - Maximum items to process per second
+ * @returns A GlobalRateLimiter compatible with FairQueue
+ */
+export function createBatchGlobalRateLimiter(itemsPerSecond: number): GlobalRateLimiter {
+  const limiter = new RateLimiter({
+    keyPrefix: "batch-queue-global",
+    // Token bucket: refills `itemsPerSecond` tokens every second
+    // Bucket capacity is also `itemsPerSecond` (allows burst up to limit)
+    limiter: Ratelimit.tokenBucket(itemsPerSecond, "1 s", itemsPerSecond),
+    logSuccess: false,
+    logFailure: true,
+  });
+
+  return {
+    async limit() {
+      const result = await limiter.limit("global");
+      return {
+        allowed: result.success,
+        resetAt: result.reset,
+      };
+    },
+  };
+}
+
diff --git a/apps/webapp/app/runEngine/concerns/batchLimits.server.ts b/apps/webapp/app/runEngine/concerns/batchLimits.server.ts
new file mode 100644
index 00000000000..f40088039eb
--- /dev/null
+++ b/apps/webapp/app/runEngine/concerns/batchLimits.server.ts
@@ -0,0 +1,114 @@
+import { Organization } from "@trigger.dev/database";
+import { z } from "zod";
+import { env } from "~/env.server";
+import {
+  RateLimiterConfig,
+  createLimiterFromConfig,
+} from "~/services/authorizationRateLimitMiddleware.server";
+import { createRedisRateLimitClient, Duration, RateLimiter } from "~/services/rateLimiter.server";
+import { singleton } from "~/utils/singleton";
+
+const BatchLimitsConfig = z.object({
+  processingConcurrency: z.number().int().default(env.BATCH_CONCURRENCY_LIMIT_DEFAULT),
+});
+
+/**
+ * Batch limits configuration for a plan type
+ */
+export type BatchLimitsConfig = z.infer<typeof BatchLimitsConfig>;
+
+const batchLimitsRedisClient = singleton("batchLimitsRedisClient", createBatchLimitsRedisClient);
+
+function createBatchLimitsRedisClient() {
+  const redisClient = createRedisRateLimitClient({
+    port: env.RATE_LIMIT_REDIS_PORT,
+    host: env.RATE_LIMIT_REDIS_HOST,
+    username: env.RATE_LIMIT_REDIS_USERNAME,
+    password: env.RATE_LIMIT_REDIS_PASSWORD,
+    tlsDisabled: env.RATE_LIMIT_REDIS_TLS_DISABLED === "true",
+    clusterMode: env.RATE_LIMIT_REDIS_CLUSTER_MODE_ENABLED === "1",
+  });
+
+  return redisClient;
+}
+
+function createOrganizationRateLimiter(organization: Organization): RateLimiter {
+  const limiterConfig = resolveBatchRateLimitConfig(organization.batchRateLimitConfig);
+
+  const limiter = createLimiterFromConfig(limiterConfig);
+
+  return new RateLimiter({
+    redisClient: batchLimitsRedisClient,
+    keyPrefix: "ratelimit:batch",
+    limiter,
+    logSuccess: false,
+    logFailure: true,
+  });
+}
+
+function resolveBatchRateLimitConfig(batchRateLimitConfig?: unknown): RateLimiterConfig {
+  const defaultRateLimiterConfig: RateLimiterConfig = {
+    type: "tokenBucket",
+    refillRate: env.BATCH_RATE_LIMIT_REFILL_RATE,
+    interval: env.BATCH_RATE_LIMIT_REFILL_INTERVAL as Duration,
+    maxTokens: env.BATCH_RATE_LIMIT_MAX,
+  };
+
+  if (!batchRateLimitConfig) {
+    return defaultRateLimiterConfig;
+  }
+
+  const parsedBatchRateLimitConfig = RateLimiterConfig.safeParse(batchRateLimitConfig);
+
+  if (!parsedBatchRateLimitConfig.success) {
+    return defaultRateLimiterConfig;
+  }
+
+  return parsedBatchRateLimitConfig.data;
+}
+
+/**
+ * Get the rate limiter and limits for an organization.
+ * Internally looks up the plan type, but doesn't expose it to callers.
+ */
+export async function getBatchLimits(
+  organization: Organization
+): Promise<{ rateLimiter: RateLimiter; config: BatchLimitsConfig }> {
+  const rateLimiter = createOrganizationRateLimiter(organization);
+  const config = resolveBatchLimitsConfig(organization.batchQueueConcurrencyConfig);
+  return { rateLimiter, config };
+}
+
+function resolveBatchLimitsConfig(batchLimitsConfig?: unknown): BatchLimitsConfig {
+  const defaultLimitsConfig: BatchLimitsConfig = {
+    processingConcurrency: env.BATCH_CONCURRENCY_LIMIT_DEFAULT,
+  };
+
+  if (!batchLimitsConfig) {
+    return defaultLimitsConfig;
+  }
+
+  const parsedBatchLimitsConfig = BatchLimitsConfig.safeParse(batchLimitsConfig);
+
+  if (!parsedBatchLimitsConfig.success) {
+    return defaultLimitsConfig;
+  }
+
+  return parsedBatchLimitsConfig.data;
+}
+
+/**
+ * Error thrown when batch rate limit is exceeded.
+ * Contains information for constructing a proper 429 response.
+ */
+export class BatchRateLimitExceededError extends Error {
+  constructor(
+    public readonly limit: number,
+    public readonly remaining: number,
+    public readonly resetAt: Date,
+    public readonly itemCount: number
+  ) {
+    super(`Batch rate limit exceeded. Limit resets at ${resetAt.toISOString()}`);
+    this.name = "BatchRateLimitExceededError";
+  }
+}
diff --git a/apps/webapp/app/runEngine/concerns/batchPayloads.server.ts b/apps/webapp/app/runEngine/concerns/batchPayloads.server.ts
new file mode 100644
index 00000000000..efd9062195c
--- /dev/null
+++ b/apps/webapp/app/runEngine/concerns/batchPayloads.server.ts
@@ -0,0 +1,171 @@
+import { IOPacket, packetRequiresOffloading, tryCatch } from "@trigger.dev/core/v3";
+import { env } from "~/env.server";
+import { startActiveSpan } from "~/v3/tracer.server";
+import { uploadPacketToObjectStore, r2 } from "~/v3/r2.server";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+
+export type BatchPayloadProcessResult = {
+  /** The processed payload - either the original or an R2 path */
+  payload: unknown;
+  /** The payload type - "application/store" if offloaded to R2 */
+  payloadType: string;
+  /** Whether the payload was offloaded to R2 */
+  wasOffloaded: boolean;
+  /** Size of the payload in bytes */
+  size: number;
+};
+
+/**
+ * BatchPayloadProcessor handles payload offloading for batch items.
+ *
+ * When a batch item's payload exceeds the configured threshold, it's uploaded
+ * to object storage (R2) and the payload is replaced with the storage path.
+ * This aligns with how single task triggers work via DefaultPayloadProcessor.
+ *
+ * Path format: batch_{batchId}/item_{index}/payload.json
+ */
+export class BatchPayloadProcessor {
+  /**
+   * Check if object storage is available for payload offloading.
+   * If not available, large payloads will be stored inline (which may fail for very large payloads).
+   */
+  isObjectStoreAvailable(): boolean {
+    return r2 !== undefined && env.OBJECT_STORE_BASE_URL !== undefined;
+  }
+
+  /**
+   * Process a batch item payload, offloading to R2 if it exceeds the threshold.
+   *
+   * @param payload - The raw payload from the batch item
+   * @param payloadType - The payload type (e.g., "application/json")
+   * @param batchId - The batch ID (internal format)
+   * @param itemIndex - The item index within the batch
+   * @param environment - The authenticated environment for R2 path construction
+   * @returns The processed result with potentially offloaded payload
+   */
+  async process(
+    payload: unknown,
+    payloadType: string,
+    batchId: string,
+    itemIndex: number,
+    environment: AuthenticatedEnvironment
+  ): Promise<BatchPayloadProcessResult> {
+    return startActiveSpan("BatchPayloadProcessor.process()", async (span) => {
+      span.setAttribute("batchId", batchId);
+      span.setAttribute("itemIndex", itemIndex);
+      span.setAttribute("payloadType", payloadType);
+
+      // Create the packet for size checking
+      const packet = this.#createPayloadPacket(payload, payloadType);
+
+      if (!packet.data) {
+        return {
+          payload,
+          payloadType,
+          wasOffloaded: false,
+          size: 0,
+        };
+      }
+
+      const threshold = env.BATCH_PAYLOAD_OFFLOAD_THRESHOLD ?? env.TASK_PAYLOAD_OFFLOAD_THRESHOLD;
+      const { needsOffloading, size } = packetRequiresOffloading(packet, threshold);
+
+      span.setAttribute("payloadSize", size);
+      span.setAttribute("needsOffloading", needsOffloading);
+      span.setAttribute("threshold", threshold);
+
+      if (!needsOffloading) {
+        return {
+          payload,
+          payloadType,
+          wasOffloaded: false,
+          size,
+        };
+      }
+
+      // Check if object store is available
+      if (!this.isObjectStoreAvailable()) {
+        logger.warn("Payload exceeds threshold but object store is not available", {
+          batchId,
+          itemIndex,
+          size,
+          threshold,
+        });
+
+        // Return without offloading - the payload will be stored inline
+        // This may fail downstream for very large payloads
+        return {
+          payload,
+          payloadType,
+          wasOffloaded: false,
+          size,
+        };
+      }
+
+      // Upload to R2
+      const filename = `batch_${batchId}/item_${itemIndex}/payload.json`;
+
+      const [uploadError] = await tryCatch(
+        uploadPacketToObjectStore(filename, packet.data, packet.dataType, environment)
+      );
+
+      if (uploadError) {
+        logger.error("Failed to upload batch item payload to object store", {
+          batchId,
+          itemIndex,
+          error: uploadError instanceof Error ? uploadError.message : String(uploadError),
+        });
+
+        // Throw to fail this item - SDK can retry
+        throw new Error(
+          `Failed to upload large payload to object store: ${
+            uploadError instanceof Error ? uploadError.message : String(uploadError)
+          }`
+        );
+      }
+
+      logger.debug("Batch item payload offloaded to R2", {
+        batchId,
+        itemIndex,
+        filename,
+        size,
+      });
+
+      span.setAttribute("wasOffloaded", true);
+      span.setAttribute("offloadPath", filename);
+
+      return {
+        payload: filename,
+        payloadType: "application/store",
+        wasOffloaded: true,
+        size,
+      };
+    });
+  }
+
+  /**
+   * Create an IOPacket from payload for size checking.
+   */
+  #createPayloadPacket(payload: unknown, payloadType: string): IOPacket {
+    if (payloadType === "application/json") {
+      // Payload from SDK is already serialized as a string - use directly
+      if (typeof payload === "string") {
+        return { data: payload, dataType: "application/json" };
+      }
+      // Non-string payloads (e.g., direct API calls with objects) need serialization
+      return { data: JSON.stringify(payload), dataType: "application/json" };
+    }
+
+    if (typeof payload === "string") {
+      return { data: payload, dataType: payloadType };
+    }
+
+    // For other types, try to stringify
+    try {
+      return { data: JSON.stringify(payload), dataType: payloadType };
+    } catch {
+      return { dataType: payloadType };
+    }
+  }
+}
diff --git a/apps/webapp/app/runEngine/concerns/errors.ts b/apps/webapp/app/runEngine/concerns/errors.ts
deleted file mode 100644
index f1f56b86dd4..00000000000
--- a/apps/webapp/app/runEngine/concerns/errors.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class EngineServiceValidationError extends Error {
-  constructor(message: string, public status?: number) {
-    super(message);
-    this.name = "EngineServiceValidationError";
-  }
-}
diff --git a/apps/webapp/app/runEngine/concerns/idempotencyKeys.server.ts b/apps/webapp/app/runEngine/concerns/idempotencyKeys.server.ts
index 689e7a5736d..d22c8020d29 100644
--- a/apps/webapp/app/runEngine/concerns/idempotencyKeys.server.ts
+++ b/apps/webapp/app/runEngine/concerns/idempotencyKeys.server.ts
@@ -3,6 +3,7 @@ import type { PrismaClientOrTransaction, TaskRun } from "@trigger.dev/database";
 import { logger } from "~/services/logger.server";
 import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";
 import type { RunEngine } from "~/v3/runEngine.server";
+import { shouldIdempotencyKeyBeCleared } from "~/v3/taskStatus";
 import type { TraceEventConcern, TriggerTaskRequest } from "../types";
 
 export type IdempotencyKeyConcernResult =
@@ -16,7 +17,10 @@ export class IdempotencyKeyConcern {
     private readonly traceEventConcern: TraceEventConcern
   ) {}
 
-  async handleTriggerRequest(request: TriggerTaskRequest): Promise<IdempotencyKeyConcernResult> {
+  async handleTriggerRequest(
+    request: TriggerTaskRequest,
+    parentStore: string | undefined
+  ): Promise<IdempotencyKeyConcernResult> {
     const idempotencyKey = request.options?.idempotencyKey ?? request.body.options?.idempotencyKey;
     const idempotencyKeyExpiresAt =
       request.options?.idempotencyKeyExpiresAt ??
@@ -41,6 +45,7 @@ export class IdempotencyKeyConcern {
       : undefined;
 
     if (existingRun) {
+      // The idempotency key has expired
       if (existingRun.idempotencyKeyExpiresAt && existingRun.idempotencyKeyExpiresAt < new Date()) {
         logger.debug("[TriggerTaskService][call] Idempotency key has expired", {
           idempotencyKey: request.options?.idempotencyKey,
@@ -52,42 +57,70 @@ export class IdempotencyKeyConcern {
           where: { id: existingRun.id, idempotencyKey },
           data: { idempotencyKey: null, idempotencyKeyExpiresAt: null },
         });
-      } else {
-        const associatedWaitpoint = existingRun.associatedWaitpoint;
-        const parentRunId = request.body.options?.parentRunId;
-        const resumeParentOnCompletion = request.body.options?.resumeParentOnCompletion;
-        //We're using `andWait` so we need to block the parent run with a waitpoint
-        if (associatedWaitpoint && resumeParentOnCompletion && parentRunId) {
-          await this.traceEventConcern.traceIdempotentRun(
-            request,
-            {
-              existingRun,
-              idempotencyKey,
-              incomplete: associatedWaitpoint.status === "PENDING",
-              isError: associatedWaitpoint.outputIsError,
-            },
-            async (event) => {
-              //block run with waitpoint
-              await this.engine.blockRunWithWaitpoint({
-                runId: RunId.fromFriendlyId(parentRunId),
-                waitpoints: associatedWaitpoint.id,
-                spanIdToComplete: event.spanId,
-                batch: request.options?.batchId
-                  ? {
-                      id: request.options.batchId,
-                      index: request.options.batchIndex ?? 0,
-                    }
-                  : undefined,
-                projectId: request.environment.projectId,
-                organizationId: request.environment.organizationId,
-                tx: this.prisma,
-              });
-            }
-          );
-        }
 
-        return { isCached: true, run: existingRun };
+        return { isCached: false, idempotencyKey, idempotencyKeyExpiresAt };
       }
+
+      // If the existing run failed or was expired, we clear the key and do a new run
+      if (shouldIdempotencyKeyBeCleared(existingRun.status)) {
+        logger.debug("[TriggerTaskService][call] Idempotency key should be cleared", {
+          idempotencyKey: request.options?.idempotencyKey,
+          runStatus: existingRun.status,
+          runId: existingRun.id,
+        });
+
+        // Update the existing run to remove the idempotency key
+        await this.prisma.taskRun.updateMany({
+          where: { id: existingRun.id, idempotencyKey },
+          data: { idempotencyKey: null, idempotencyKeyExpiresAt: null },
+        });
+
+        return { isCached: false, idempotencyKey, idempotencyKeyExpiresAt };
+      }
+
+      // We have an idempotent run, so we return it
+      const associatedWaitpoint = existingRun.associatedWaitpoint;
+      const parentRunId = request.body.options?.parentRunId;
+      const resumeParentOnCompletion = request.body.options?.resumeParentOnCompletion;
+      //We're using `andWait` so we need to block the parent run with a waitpoint
+      if (associatedWaitpoint && resumeParentOnCompletion && parentRunId) {
+        await this.traceEventConcern.traceIdempotentRun(
+          request,
+          parentStore,
+          {
+            existingRun,
+            idempotencyKey,
+            incomplete: associatedWaitpoint.status === "PENDING",
+            isError: associatedWaitpoint.outputIsError,
+          },
+          async (event) => {
+            const spanId =
+              request.options?.parentAsLinkType === "replay"
+                ? event.spanId
+                : event.traceparent?.spanId
+                ? `${event.traceparent.spanId}:${event.spanId}`
+                : event.spanId;
+
+            //block run with waitpoint
+            await this.engine.blockRunWithWaitpoint({
+              runId: RunId.fromFriendlyId(parentRunId),
+              waitpoints: associatedWaitpoint.id,
+              spanIdToComplete: spanId,
+              batch: request.options?.batchId
+                ? {
+                    id: request.options.batchId,
+                    index: request.options.batchIndex ?? 0,
+                  }
+                : undefined,
+              projectId: request.environment.projectId,
+              organizationId: request.environment.organizationId,
+              tx: this.prisma,
+            });
+          }
+        );
+      }
+
+      return { isCached: true, run: existingRun };
     }
 
     return { isCached: false, idempotencyKey, idempotencyKeyExpiresAt };
diff --git a/apps/webapp/app/runEngine/concerns/payloads.server.ts b/apps/webapp/app/runEngine/concerns/payloads.server.ts
index 637a54d5846..5ad84f8dc66 100644
--- a/apps/webapp/app/runEngine/concerns/payloads.server.ts
+++ b/apps/webapp/app/runEngine/concerns/payloads.server.ts
@@ -3,7 +3,7 @@ import { PayloadProcessor, TriggerTaskRequest } from "../types";
 import { env } from "~/env.server";
 import { startActiveSpan } from "~/v3/tracer.server";
 import { uploadPacketToObjectStore } from "~/v3/r2.server";
-import { EngineServiceValidationError } from "./errors";
+import { ServiceValidationError } from "~/v3/services/common.server";
 
 export class DefaultPayloadProcessor implements PayloadProcessor {
   async process(request: TriggerTaskRequest): Promise<IOPacket> {
@@ -36,10 +36,7 @@ export class DefaultPayloadProcessor implements PayloadProcessor {
       );
 
       if (uploadError) {
-        throw new EngineServiceValidationError(
-          "Failed to upload large payload to object store",
-          500
-        ); // This is retryable
+        throw new ServiceValidationError("Failed to upload large payload to object store", 500); // This is retryable
       }
 
       return {
diff --git a/apps/webapp/app/runEngine/concerns/queues.server.ts b/apps/webapp/app/runEngine/concerns/queues.server.ts
index c8bda40d22c..0980dc2a75d 100644
--- a/apps/webapp/app/runEngine/concerns/queues.server.ts
+++ b/apps/webapp/app/runEngine/concerns/queues.server.ts
@@ -13,7 +13,37 @@ import {
 import { WorkerGroupService } from "~/v3/services/worker/workerGroupService.server";
 import type { RunEngine } from "~/v3/runEngine.server";
 import { env } from "~/env.server";
-import { EngineServiceValidationError } from "./errors";
+import { tryCatch } from "@trigger.dev/core/v3";
+import { ServiceValidationError } from "~/v3/services/common.server";
+
+/**
+ * Extract the queue name from a queue option that may be:
+ * - An object with a string `name` property: { name: "queue-name" }
+ * - A double-wrapped object (bug case): { name: { name: "queue-name", ... } }
+ *
+ * This handles the case where the SDK accidentally double-wraps the queue
+ * option when it's already an object with a name property.
+ */
+function extractQueueName(queue: { name?: unknown } | undefined): string | undefined {
+  if (!queue?.name) {
+    return undefined;
+  }
+
+  // Normal case: queue.name is a string
+  if (typeof queue.name === "string") {
+    return queue.name;
+  }
+
+  // Double-wrapped case: queue.name is an object with its own name property
+  if (typeof queue.name === "object" && queue.name !== null && "name" in queue.name) {
+    const innerName = (queue.name as { name: unknown }).name;
+    if (typeof innerName === "string") {
+      return innerName;
+    }
+  }
+
+  return undefined;
+}
 
 export class DefaultQueueManager implements QueueManager {
   constructor(
@@ -31,8 +61,8 @@ export class DefaultQueueManager implements QueueManager {
     // Determine queue name based on lockToVersion and provided options
     if (lockedBackgroundWorker) {
       // Task is locked to a specific worker version
-      if (request.body.options?.queue?.name) {
-        const specifiedQueueName = request.body.options.queue.name;
+      const specifiedQueueName = extractQueueName(request.body.options?.queue);
+      if (specifiedQueueName) {
         // A specific queue name is provided
         const specifiedQueue = await this.prisma.taskQueue.findFirst({
           // Validate it exists for the locked worker
@@ -44,7 +74,7 @@ export class DefaultQueueManager implements QueueManager {
         });
 
         if (!specifiedQueue) {
-          throw new EngineServiceValidationError(
+          throw new ServiceValidationError(
             `Specified queue '${specifiedQueueName}' not found or not associated with locked version '${
               lockedBackgroundWorker.version ?? "<unknown>"
             }'.`
@@ -67,7 +97,7 @@ export class DefaultQueueManager implements QueueManager {
         });
 
         if (!lockedTask) {
-          throw new EngineServiceValidationError(
+          throw new ServiceValidationError(
             `Task '${request.taskId}' not found on locked version '${
               lockedBackgroundWorker.version ?? "<unknown>"
             }'.`
@@ -82,7 +112,7 @@ export class DefaultQueueManager implements QueueManager {
             workerId: lockedBackgroundWorker.id,
             version: lockedBackgroundWorker.version,
           });
-          throw new EngineServiceValidationError(
+          throw new ServiceValidationError(
             `Default queue configuration for task '${request.taskId}' missing on locked version '${
               lockedBackgroundWorker.version ?? "<unknown>"
             }'.`
@@ -96,7 +126,7 @@ export class DefaultQueueManager implements QueueManager {
       // Task is not locked to a specific version, use regular logic
       if (request.body.options?.lockToVersion) {
         // This should only happen if the findFirst failed, indicating the version doesn't exist
-        throw new EngineServiceValidationError(
+        throw new ServiceValidationError(
           `Task locked to version '${request.body.options.lockToVersion}', but no worker found with that version.`
         );
       }
@@ -125,8 +155,10 @@ export class DefaultQueueManager implements QueueManager {
     const { taskId, environment, body } = request;
     const { queue } = body.options ?? {};
 
-    if (queue?.name) {
-      return queue.name;
+    // Use extractQueueName to handle double-wrapped queue objects
+    const queueName = extractQueueName(queue);
+    if (queueName) {
+      return queueName;
     }
 
     const defaultQueueName = `task/${taskId}`;
@@ -176,8 +208,11 @@ export class DefaultQueueManager implements QueueManager {
     return task.queue.name ?? defaultQueueName;
   }
 
-  async validateQueueLimits(environment: AuthenticatedEnvironment): Promise<QueueValidationResult> {
-    const queueSizeGuard = await guardQueueSizeLimitsForEnv(this.engine, environment);
+  async validateQueueLimits(
+    environment: AuthenticatedEnvironment,
+    itemsToAdd?: number
+  ): Promise<QueueValidationResult> {
+    const queueSizeGuard = await guardQueueSizeLimitsForEnv(this.engine, environment, itemsToAdd);
 
     logger.debug("Queue size guard result", {
       queueSizeGuard,
@@ -196,7 +231,10 @@ export class DefaultQueueManager implements QueueManager {
     };
   }
 
-  async getWorkerQueue(environment: AuthenticatedEnvironment): Promise<string | undefined> {
+  async getWorkerQueue(
+    environment: AuthenticatedEnvironment,
+    regionOverride?: string
+  ): Promise<string | undefined> {
     if (environment.type === "DEVELOPMENT") {
       return environment.id;
     }
@@ -206,12 +244,19 @@ export class DefaultQueueManager implements QueueManager {
       engine: this.engine,
     });
 
-    const workerGroup = await workerGroupService.getDefaultWorkerGroupForProject({
-      projectId: environment.projectId,
-    });
+    const [error, workerGroup] = await tryCatch(
+      workerGroupService.getDefaultWorkerGroupForProject({
+        projectId: environment.projectId,
+        regionOverride,
+      })
+    );
+
+    if (error) {
+      throw new ServiceValidationError(error.message);
+    }
 
     if (!workerGroup) {
-      throw new EngineServiceValidationError("No worker group found");
+      throw new ServiceValidationError("No worker group found");
     }
 
     return workerGroup.masterQueue;
diff --git a/apps/webapp/app/runEngine/concerns/runNumbers.server.ts b/apps/webapp/app/runEngine/concerns/runNumbers.server.ts
deleted file mode 100644
index 39033f26236..00000000000
--- a/apps/webapp/app/runEngine/concerns/runNumbers.server.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { autoIncrementCounter } from "~/services/autoIncrementCounter.server";
-import { RunNumberIncrementer, TriggerTaskRequest } from "../types";
-
-export class DefaultRunNumberIncrementer implements RunNumberIncrementer {
-  async incrementRunNumber<T>(
-    request: TriggerTaskRequest,
-    callback: (num: number) => Promise<T>
-  ): Promise<T | undefined> {
-    return await autoIncrementCounter.incrementInTransaction(
-      `v3-run:${request.environment.id}:${request.taskId}`,
-      callback
-    );
-  }
-}
diff --git a/apps/webapp/app/runEngine/concerns/traceEvents.server.ts b/apps/webapp/app/runEngine/concerns/traceEvents.server.ts
index 2aafb068c06..cb2eaa30a58 100644
--- a/apps/webapp/app/runEngine/concerns/traceEvents.server.ts
+++ b/apps/webapp/app/runEngine/concerns/traceEvents.server.ts
@@ -1,41 +1,40 @@
-import { EventRepository } from "~/v3/eventRepository.server";
-import { TracedEventSpan, TraceEventConcern, TriggerTaskRequest } from "../types";
 import { SemanticInternalAttributes } from "@trigger.dev/core/v3/semanticInternalAttributes";
-import { BatchId } from "@trigger.dev/core/v3/isomorphic";
 import { TaskRun } from "@trigger.dev/database";
+import { IEventRepository } from "~/v3/eventRepository/eventRepository.types";
+import { getEventRepository } from "~/v3/eventRepository/index.server";
+import { TracedEventSpan, TraceEventConcern, TriggerTaskRequest } from "../types";
 
 export class DefaultTraceEventsConcern implements TraceEventConcern {
-  private readonly eventRepository: EventRepository;
-
-  constructor(eventRepository: EventRepository) {
-    this.eventRepository = eventRepository;
+  async #getEventRepository(
+    request: TriggerTaskRequest,
+    parentStore: string | undefined
+  ): Promise<{ repository: IEventRepository; store: string }> {
+    return await getEventRepository(
+      request.environment.organization.featureFlags as Record<string, unknown>,
+      parentStore
+    );
   }
 
   async traceRun<T>(
     request: TriggerTaskRequest,
-    callback: (span: TracedEventSpan) => Promise<T>
+    parentStore: string | undefined,
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
   ): Promise<T> {
-    return await this.eventRepository.traceEvent(
+    const { repository, store } = await this.#getEventRepository(request, parentStore);
+
+    return await repository.traceEvent(
       request.taskId,
       {
         context: request.options?.traceContext,
         spanParentAsLink: request.options?.spanParentAsLink,
-        parentAsLinkType: request.options?.parentAsLinkType,
         kind: "SERVER",
         environment: request.environment,
         taskSlug: request.taskId,
         attributes: {
-          properties: {
-            [SemanticInternalAttributes.SHOW_ACTIONS]: true,
-          },
+          properties: {},
           style: {
             icon: request.options?.customIcon ?? "task",
           },
-          runIsTest: request.body.options?.test ?? false,
-          batchId: request.options?.batchId
-            ? BatchId.toFriendlyId(request.options.batchId)
-            : undefined,
-          idempotencyKey: request.options?.idempotencyKey,
         },
         incomplete: true,
         immediate: true,
@@ -44,52 +43,51 @@ export class DefaultTraceEventsConcern implements TraceEventConcern {
           : undefined,
       },
       async (event, traceContext, traceparent) => {
-        return await callback({
-          traceId: event.traceId,
-          spanId: event.spanId,
-          traceContext,
-          traceparent,
-          setAttribute: (key, value) => event.setAttribute(key as any, value),
-          failWithError: event.failWithError.bind(event),
-        });
+        return await callback(
+          {
+            traceId: event.traceId,
+            spanId: event.spanId,
+            traceContext,
+            traceparent,
+            setAttribute: (key, value) => event.setAttribute(key as any, value),
+            failWithError: event.failWithError.bind(event),
+            stop: event.stop.bind(event),
+          },
+          store
+        );
       }
     );
   }
 
   async traceIdempotentRun<T>(
     request: TriggerTaskRequest,
+    parentStore: string | undefined,
     options: {
       existingRun: TaskRun;
       idempotencyKey: string;
       incomplete: boolean;
       isError: boolean;
     },
-    callback: (span: TracedEventSpan) => Promise<T>
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
   ): Promise<T> {
     const { existingRun, idempotencyKey, incomplete, isError } = options;
+    const { repository, store } = await this.#getEventRepository(request, parentStore);
 
-    return await this.eventRepository.traceEvent(
+    return await repository.traceEvent(
       `${request.taskId} (cached)`,
       {
         context: request.options?.traceContext,
         spanParentAsLink: request.options?.spanParentAsLink,
-        parentAsLinkType: request.options?.parentAsLinkType,
         kind: "SERVER",
         environment: request.environment,
         taskSlug: request.taskId,
         attributes: {
           properties: {
-            [SemanticInternalAttributes.SHOW_ACTIONS]: true,
             [SemanticInternalAttributes.ORIGINAL_RUN_ID]: existingRun.friendlyId,
           },
           style: {
             icon: "task-cached",
           },
-          runIsTest: request.body.options?.test ?? false,
-          batchId: request.options?.batchId
-            ? BatchId.toFriendlyId(request.options.batchId)
-            : undefined,
-          idempotencyKey,
           runId: existingRun.friendlyId,
         },
         incomplete,
@@ -98,7 +96,7 @@ export class DefaultTraceEventsConcern implements TraceEventConcern {
       },
       async (event, traceContext, traceparent) => {
         //log a message
-        await this.eventRepository.recordEvent(
+        await repository.recordEvent(
           `There's an existing run for idempotencyKey: ${idempotencyKey}`,
           {
             taskSlug: request.taskId,
@@ -111,14 +109,84 @@ export class DefaultTraceEventsConcern implements TraceEventConcern {
           }
         );
 
-        return await callback({
-          traceId: event.traceId,
-          spanId: event.spanId,
-          traceContext,
-          traceparent,
-          setAttribute: (key, value) => event.setAttribute(key as any, value),
-          failWithError: event.failWithError.bind(event),
-        });
+        return await callback(
+          {
+            traceId: event.traceId,
+            spanId: event.spanId,
+            traceContext,
+            traceparent,
+            setAttribute: (key, value) => event.setAttribute(key as any, value),
+            failWithError: event.failWithError.bind(event),
+            stop: event.stop.bind(event),
+          },
+          store
+        );
+      }
+    );
+  }
+
+  async traceDebouncedRun<T>(
+    request: TriggerTaskRequest,
+    parentStore: string | undefined,
+    options: {
+      existingRun: TaskRun;
+      debounceKey: string;
+      incomplete: boolean;
+      isError: boolean;
+    },
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
+  ): Promise<T> {
+    const { existingRun, debounceKey, incomplete, isError } = options;
+    const { repository, store } = await this.#getEventRepository(request, parentStore);
+
+    return await repository.traceEvent(
+      `${request.taskId} (debounced)`,
+      {
+        context: request.options?.traceContext,
+        spanParentAsLink: request.options?.spanParentAsLink,
+        kind: "SERVER",
+        environment: request.environment,
+        taskSlug: request.taskId,
+        attributes: {
+          properties: {
+            [SemanticInternalAttributes.ORIGINAL_RUN_ID]: existingRun.friendlyId,
+          },
+          style: {
+            icon: "task-cached",
+          },
+          runId: existingRun.friendlyId,
+        },
+        incomplete,
+        isError,
+        immediate: true,
+      },
+      async (event, traceContext, traceparent) => {
+        // Log a message about the debounced trigger
+        await repository.recordEvent(
+          `Debounced: using existing run with key "${debounceKey}"`,
+          {
+            taskSlug: request.taskId,
+            environment: request.environment,
+            attributes: {
+              runId: existingRun.friendlyId,
+            },
+            context: request.options?.traceContext,
+            parentId: event.spanId,
+          }
+        );
+
+        return await callback(
+          {
+            traceId: event.traceId,
+            spanId: event.spanId,
+            traceContext,
+            traceparent,
+            setAttribute: (key, value) => event.setAttribute(key as any, value),
+            failWithError: event.failWithError.bind(event),
+            stop: event.stop.bind(event),
+          },
+          store
+        );
       }
     );
   }
diff --git a/apps/webapp/app/runEngine/services/batchTrigger.server.ts b/apps/webapp/app/runEngine/services/batchTrigger.server.ts
index 2a476e5a1ec..bd796f30624 100644
--- a/apps/webapp/app/runEngine/services/batchTrigger.server.ts
+++ b/apps/webapp/app/runEngine/services/batchTrigger.server.ts
@@ -1,24 +1,25 @@
 import {
-  BatchTriggerTaskV2RequestBody,
-  BatchTriggerTaskV3RequestBody,
-  BatchTriggerTaskV3Response,
-  IOPacket,
+  type BatchTriggerTaskV2RequestBody,
+  type BatchTriggerTaskV3RequestBody,
+  type BatchTriggerTaskV3Response,
+  type IOPacket,
   packetRequiresOffloading,
   parsePacket,
 } from "@trigger.dev/core/v3";
 import { BatchId, RunId } from "@trigger.dev/core/v3/isomorphic";
-import { BatchTaskRun, Prisma } from "@trigger.dev/database";
+import { type BatchTaskRun, Prisma } from "@trigger.dev/database";
 import { Evt } from "evt";
 import { z } from "zod";
-import { prisma, PrismaClientOrTransaction } from "~/db.server";
+import { prisma, type PrismaClientOrTransaction } from "~/db.server";
 import { env } from "~/env.server";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
-import { getEntitlement } from "~/services/platform.v3.server";
 import { batchTriggerWorker } from "~/v3/batchTriggerWorker.server";
+import { DefaultQueueManager } from "../concerns/queues.server";
+import { DefaultTriggerTaskValidator } from "../validators/triggerTaskValidator";
 import { downloadPacketFromObjectStore, uploadPacketToObjectStore } from "../../v3/r2.server";
 import { ServiceValidationError, WithRunEngine } from "../../v3/services/baseService.server";
-import { OutOfEntitlementError, TriggerTaskService } from "../../v3/services/triggerTask.server";
+import { TriggerTaskService } from "../../v3/services/triggerTask.server";
 import { startActiveSpan } from "../../v3/tracer.server";
 
 const PROCESSING_BATCH_SIZE = 50;
@@ -36,15 +37,17 @@ export const BatchProcessingOptions = z.object({
   strategy: BatchProcessingStrategy,
   parentRunId: z.string().optional(),
   resumeParentOnCompletion: z.boolean().optional(),
+  planType: z.string().optional(),
 });
 
 export type BatchProcessingOptions = z.infer<typeof BatchProcessingOptions>;
 
 export type BatchTriggerTaskServiceOptions = {
   triggerVersion?: string;
-  traceContext?: Record<string, string | undefined>;
+  traceContext?: Record<string, string | undefined | Record<string, string | undefined>>;
   spanParentAsLink?: boolean;
   oneTimeUseToken?: string;
+  realtimeStreamsVersion?: "v1" | "v2";
 };
 
 /**
@@ -53,6 +56,8 @@ export type BatchTriggerTaskServiceOptions = {
 export class RunEngineBatchTriggerService extends WithRunEngine {
   private _batchProcessingStrategy: BatchProcessingStrategy;
   public onBatchTaskRunCreated: Evt<BatchTaskRun> = new Evt();
+  private readonly queueConcern: DefaultQueueManager;
+  private readonly validator: DefaultTriggerTaskValidator;
 
   constructor(
     batchProcessingStrategy?: BatchProcessingStrategy,
@@ -60,6 +65,9 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
   ) {
     super({ prisma });
 
+    this.queueConcern = new DefaultQueueManager(this._prisma, this._engine);
+    this.validator = new DefaultTriggerTaskValidator();
+
     // Eric note: We need to force sequential processing because when doing parallel, we end up with high-contention on the parent run lock
     // becuase we are triggering a lot of runs at once, and each one is trying to lock the parent run.
     // by forcing sequential, we are only ever locking the parent run for a single run at a time.
@@ -80,13 +88,18 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
 
           span.setAttribute("batchId", friendlyId);
 
-          if (environment.type !== "DEVELOPMENT") {
-            const result = await getEntitlement(environment.organizationId);
-            if (result && result.hasAccess === false) {
-              throw new OutOfEntitlementError();
-            }
+          // Validate entitlement and extract planType for batch runs
+          const entitlementValidation = await this.validator.validateEntitlement({
+            environment,
+          });
+
+          if (!entitlementValidation.ok) {
+            throw entitlementValidation.error;
           }
 
+          // Extract plan type from entitlement response
+          const planType = entitlementValidation.plan?.type;
+
           // Upload to object store
           const payloadPacket = await this.#handlePayloadPacket(
             body.items,
@@ -99,7 +112,8 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             payloadPacket,
             environment,
             body,
-            options
+            options,
+            planType
           );
 
           if (!batch) {
@@ -152,7 +166,8 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     payloadPacket: IOPacket,
     environment: AuthenticatedEnvironment,
     body: BatchTriggerTaskV2RequestBody,
-    options: BatchTriggerTaskServiceOptions = {}
+    options: BatchTriggerTaskServiceOptions = {},
+    planType?: string
   ) {
     if (body.items.length <= ASYNC_BATCH_PROCESS_SIZE_THRESHOLD) {
       const batch = await this._prisma.batchTaskRun.create({
@@ -191,6 +206,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
         options,
         parentRunId: body.parentRunId,
         resumeParentOnCompletion: body.resumeParentOnCompletion,
+        planType,
       });
 
       switch (result.status) {
@@ -220,6 +236,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             strategy: "sequential",
             parentRunId: body.parentRunId,
             resumeParentOnCompletion: body.resumeParentOnCompletion,
+            planType,
           });
 
           return batch;
@@ -242,6 +259,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             strategy: "sequential",
             parentRunId: body.parentRunId,
             resumeParentOnCompletion: body.resumeParentOnCompletion,
+            planType,
           });
 
           return batch;
@@ -285,6 +303,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             strategy: this._batchProcessingStrategy,
             parentRunId: body.parentRunId,
             resumeParentOnCompletion: body.resumeParentOnCompletion,
+            planType,
           });
 
           break;
@@ -307,6 +326,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
                 strategy: this._batchProcessingStrategy,
                 parentRunId: body.parentRunId,
                 resumeParentOnCompletion: body.resumeParentOnCompletion,
+                planType,
               })
             )
           );
@@ -410,6 +430,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
       options: $options,
       parentRunId: options.parentRunId,
       resumeParentOnCompletion: options.resumeParentOnCompletion,
+      planType: options.planType,
     });
 
     switch (result.status) {
@@ -443,6 +464,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             strategy: options.strategy,
             parentRunId: options.parentRunId,
             resumeParentOnCompletion: options.resumeParentOnCompletion,
+            planType: options.planType,
           });
         }
 
@@ -470,6 +492,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             strategy: options.strategy,
             parentRunId: options.parentRunId,
             resumeParentOnCompletion: options.resumeParentOnCompletion,
+            planType: options.planType,
           });
         } else {
           await this.#enqueueBatchTaskRun({
@@ -486,6 +509,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
             strategy: options.strategy,
             parentRunId: options.parentRunId,
             resumeParentOnCompletion: options.resumeParentOnCompletion,
+            planType: options.planType,
           });
         }
 
@@ -503,6 +527,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     options,
     parentRunId,
     resumeParentOnCompletion,
+    planType,
   }: {
     batch: BatchTaskRun;
     environment: AuthenticatedEnvironment;
@@ -512,6 +537,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     options?: BatchTriggerTaskServiceOptions;
     parentRunId?: string | undefined;
     resumeParentOnCompletion?: boolean | undefined;
+    planType?: string;
   }): Promise<
     | { status: "COMPLETE" }
     | { status: "INCOMPLETE"; workingIndex: number }
@@ -520,6 +546,35 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     // Grab the next PROCESSING_BATCH_SIZE items
     const itemsToProcess = items.slice(currentIndex, currentIndex + batchSize);
 
+    const newRunCount = await this.#countNewRuns(environment, itemsToProcess);
+
+    // Only validate queue size if we have new runs to create, i.e. they're not all cached
+    if (newRunCount > 0) {
+      const queueSizeGuard = await this.queueConcern.validateQueueLimits(environment, newRunCount);
+
+      logger.debug("Queue size guard result for chunk", {
+        batchId: batch.friendlyId,
+        currentIndex,
+        runCount: batch.runCount,
+        newRunCount,
+        queueSizeGuard,
+      });
+
+      if (!queueSizeGuard.ok) {
+        return {
+          status: "ERROR",
+          error: `Cannot trigger ${newRunCount} new tasks as the queue size limit for this environment has been reached. The maximum size is ${queueSizeGuard.maximumSize}`,
+          workingIndex: currentIndex,
+        };
+      }
+    } else {
+      logger.debug("[RunEngineBatchTrigger][processBatchTaskRun] All runs are cached", {
+        batchId: batch.friendlyId,
+        currentIndex,
+        runCount: batch.runCount,
+      });
+    }
+
     logger.debug("[RunEngineBatchTrigger][processBatchTaskRun] Processing batch items", {
       batchId: batch.friendlyId,
       currentIndex,
@@ -540,6 +595,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
           options,
           parentRunId,
           resumeParentOnCompletion,
+          planType,
         });
 
         if (!run) {
@@ -615,6 +671,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     options,
     parentRunId,
     resumeParentOnCompletion,
+    planType,
   }: {
     batch: BatchTaskRun;
     environment: AuthenticatedEnvironment;
@@ -623,6 +680,7 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
     options?: BatchTriggerTaskServiceOptions;
     parentRunId: string | undefined;
     resumeParentOnCompletion: boolean | undefined;
+    planType?: string;
   }) {
     logger.debug("[RunEngineBatchTrigger][processBatchTaskRunItem] Processing item", {
       batchId: batch.friendlyId,
@@ -649,6 +707,9 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
         spanParentAsLink: options?.spanParentAsLink,
         batchId: batch.id,
         batchIndex: currentIndex,
+        skipChecks: true, // Skip entitlement and queue checks since we already validated at batch/chunk level
+        planType, // Pass planType from batch-level entitlement check
+        realtimeStreamsVersion: options?.realtimeStreamsVersion,
       },
       "V2"
     );
@@ -691,4 +752,85 @@ export class RunEngineBatchTriggerService extends WithRunEngine {
       };
     });
   }
+
+  #groupItemsByTaskIdentifier(
+    items: BatchTriggerTaskV2RequestBody["items"]
+  ): Record<string, BatchTriggerTaskV2RequestBody["items"]> {
+    return items.reduce((acc, item) => {
+      if (!item.options?.idempotencyKey) return acc;
+
+      if (!acc[item.task]) {
+        acc[item.task] = [];
+      }
+      acc[item.task].push(item);
+      return acc;
+    }, {} as Record<string, BatchTriggerTaskV2RequestBody["items"]>);
+  }
+
+  async #countNewRuns(
+    environment: AuthenticatedEnvironment,
+    items: BatchTriggerTaskV2RequestBody["items"]
+  ): Promise<number> {
+    // If cached runs check is disabled, return the total number of items
+    if (!env.BATCH_TRIGGER_CACHED_RUNS_CHECK_ENABLED) {
+      return items.length;
+    }
+
+    // Group items by taskIdentifier for efficient lookup
+    const itemsByTask = this.#groupItemsByTaskIdentifier(items);
+
+    // If no items have idempotency keys, all are new runs
+    if (Object.keys(itemsByTask).length === 0) {
+      return items.length;
+    }
+
+    // Fetch cached runs for each task identifier separately to make use of the index
+    const cachedRuns = await Promise.all(
+      Object.entries(itemsByTask).map(([taskIdentifier, taskItems]) =>
+        this._prisma.taskRun.findMany({
+          where: {
+            runtimeEnvironmentId: environment.id,
+            taskIdentifier,
+            idempotencyKey: {
+              in: taskItems.map((i) => i.options?.idempotencyKey).filter(Boolean),
+            },
+          },
+          select: {
+            idempotencyKey: true,
+            idempotencyKeyExpiresAt: true,
+          },
+        })
+      )
+    ).then((results) => results.flat());
+
+    // Create a Map for O(1) lookups instead of O(m) find operations
+    const cachedRunsMap = new Map(cachedRuns.map((run) => [run.idempotencyKey, run]));
+
+    // Count items that are NOT cached (or have expired cache)
+    let newRunCount = 0;
+    const now = new Date();
+
+    for (const item of items) {
+      const idempotencyKey = item.options?.idempotencyKey;
+
+      if (!idempotencyKey) {
+        // No idempotency key = always a new run
+        newRunCount++;
+        continue;
+      }
+
+      const cachedRun = cachedRunsMap.get(idempotencyKey);
+
+      if (!cachedRun) {
+        // No cached run = new run
+        newRunCount++;
+      } else if (cachedRun.idempotencyKeyExpiresAt && cachedRun.idempotencyKeyExpiresAt < now) {
+        // Expired cached run = new run
+        newRunCount++;
+      }
+      // else: valid cached run = not a new run
+    }
+
+    return newRunCount;
+  }
 }
diff --git a/apps/webapp/app/runEngine/services/createBatch.server.ts b/apps/webapp/app/runEngine/services/createBatch.server.ts
new file mode 100644
index 00000000000..9dc107321cc
--- /dev/null
+++ b/apps/webapp/app/runEngine/services/createBatch.server.ts
@@ -0,0 +1,209 @@
+import type { InitializeBatchOptions } from "@internal/run-engine";
+import { type CreateBatchRequestBody, type CreateBatchResponse } from "@trigger.dev/core/v3";
+import { BatchId, RunId } from "@trigger.dev/core/v3/isomorphic";
+import { type BatchTaskRun, Prisma } from "@trigger.dev/database";
+import { Evt } from "evt";
+import { prisma, type PrismaClientOrTransaction } from "~/db.server";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { ServiceValidationError, WithRunEngine } from "../../v3/services/baseService.server";
+import { BatchRateLimitExceededError, getBatchLimits } from "../concerns/batchLimits.server";
+import { DefaultQueueManager } from "../concerns/queues.server";
+import { DefaultTriggerTaskValidator } from "../validators/triggerTaskValidator";
+
+export type CreateBatchServiceOptions = {
+  triggerVersion?: string;
+  traceContext?: Record<string, string | undefined | Record<string, string | undefined>>;
+  spanParentAsLink?: boolean;
+  oneTimeUseToken?: string;
+  realtimeStreamsVersion?: "v1" | "v2";
+};
+
+/**
+ * Create Batch Service (Phase 1 of 2-phase batch API).
+ *
+ * This service handles Phase 1 of the streaming batch API:
+ * 1. Validates entitlement and queue limits
+ * 2. Creates BatchTaskRun in Postgres with status=PENDING, expectedCount set
+ * 3. For batchTriggerAndWait: blocks the parent run immediately
+ * 4. Initializes batch metadata in Redis
+ * 5. Returns batch ID - items are streamed separately via Phase 2
+ *
+ * The batch is NOT sealed until Phase 2 completes.
+ */
+export class CreateBatchService extends WithRunEngine {
+  public onBatchTaskRunCreated: Evt<BatchTaskRun> = new Evt();
+  private readonly queueConcern: DefaultQueueManager;
+  private readonly validator: DefaultTriggerTaskValidator;
+
+  constructor(protected readonly _prisma: PrismaClientOrTransaction = prisma) {
+    super({ prisma: _prisma });
+
+    this.queueConcern = new DefaultQueueManager(this._prisma, this._engine);
+    this.validator = new DefaultTriggerTaskValidator();
+  }
+
+  /**
+   * Create a batch for 2-phase processing.
+   * Items will be streamed separately via the StreamBatchItemsService.
+   */
+  public async call(
+    environment: AuthenticatedEnvironment,
+    body: CreateBatchRequestBody,
+    options: CreateBatchServiceOptions = {}
+  ): Promise<CreateBatchResponse> {
+    try {
+      return await this.traceWithEnv<CreateBatchResponse>(
+        "createBatch()",
+        environment,
+        async (span) => {
+          const { id, friendlyId } = BatchId.generate();
+
+          span.setAttribute("batchId", friendlyId);
+          span.setAttribute("runCount", body.runCount);
+
+          // Validate entitlement
+          const entitlementValidation = await this.validator.validateEntitlement({
+            environment,
+          });
+
+          if (!entitlementValidation.ok) {
+            throw entitlementValidation.error;
+          }
+
+          // Extract plan type from entitlement validation for billing tracking
+          const planType = entitlementValidation.plan?.type;
+
+          // Get batch limits for this organization
+          const { config, rateLimiter } = await getBatchLimits(environment.organization);
+
+          // Check rate limit BEFORE creating the batch
+          // This prevents burst creation of batches that exceed the rate limit
+          const rateResult = await rateLimiter.limit(environment.id, body.runCount);
+
+          if (!rateResult.success) {
+            throw new BatchRateLimitExceededError(
+              rateResult.limit,
+              rateResult.remaining,
+              new Date(rateResult.reset),
+              body.runCount
+            );
+          }
+
+          // Validate queue limits for the expected batch size
+          const queueSizeGuard = await this.queueConcern.validateQueueLimits(
+            environment,
+            body.runCount
+          );
+
+          if (!queueSizeGuard.ok) {
+            throw new ServiceValidationError(
+              `Cannot create batch with ${body.runCount} items as the queue size limit for this environment has been reached. The maximum size is ${queueSizeGuard.maximumSize}`
+            );
+          }
+
+          // Create BatchTaskRun in Postgres with PENDING status
+          // The batch will be sealed (status -> PROCESSING) when items are streamed
+          const batch = await this._prisma.batchTaskRun.create({
+            data: {
+              id,
+              friendlyId,
+              runtimeEnvironmentId: environment.id,
+              status: "PENDING",
+              runCount: body.runCount,
+              expectedCount: body.runCount,
+              runIds: [],
+              batchVersion: "runengine:v2", // 2-phase streaming batch API
+              oneTimeUseToken: options.oneTimeUseToken,
+              idempotencyKey: body.idempotencyKey,
+              // Not sealed yet - will be sealed when items stream completes
+              sealed: false,
+            },
+          });
+
+          this.onBatchTaskRunCreated.post(batch);
+
+          // Block parent run if this is a batchTriggerAndWait
+          if (body.parentRunId && body.resumeParentOnCompletion) {
+            await this._engine.blockRunWithCreatedBatch({
+              runId: RunId.fromFriendlyId(body.parentRunId),
+              batchId: batch.id,
+              environmentId: environment.id,
+              projectId: environment.projectId,
+              organizationId: environment.organizationId,
+            });
+          }
+
+          // Initialize batch metadata in Redis (without items)
+          const initOptions: InitializeBatchOptions = {
+            batchId: id,
+            friendlyId,
+            environmentId: environment.id,
+            environmentType: environment.type,
+            organizationId: environment.organizationId,
+            projectId: environment.projectId,
+            runCount: body.runCount,
+            parentRunId: body.parentRunId,
+            resumeParentOnCompletion: body.resumeParentOnCompletion,
+            triggerVersion: options.triggerVersion,
+            traceContext: options.traceContext as Record<string, unknown> | undefined,
+            spanParentAsLink: options.spanParentAsLink,
+            realtimeStreamsVersion: options.realtimeStreamsVersion,
+            idempotencyKey: body.idempotencyKey,
+            processingConcurrency: config.processingConcurrency,
+            planType,
+          };
+
+          await this._engine.initializeBatch(initOptions);
+
+          logger.info("Batch created", {
+            batchId: friendlyId,
+            runCount: body.runCount,
+            envId: environment.id,
+            projectId: environment.projectId,
+            parentRunId: body.parentRunId,
+            resumeParentOnCompletion: body.resumeParentOnCompletion,
+            processingConcurrency: config.processingConcurrency,
+          });
+
+          return {
+            id: friendlyId,
+            runCount: body.runCount,
+            isCached: false,
+            idempotencyKey: body.idempotencyKey,
+          };
+        }
+      );
+    } catch (error) {
+      // Handle Prisma unique constraint violations
+      if (error instanceof Prisma.PrismaClientKnownRequestError) {
+        logger.debug("CreateBatchService: Prisma error", {
+          code: error.code,
+          message: error.message,
+          meta: error.meta,
+        });
+
+        if (error.code === "P2002") {
+          const target = error.meta?.target;
+
+          if (
+            Array.isArray(target) &&
+            target.length > 0 &&
+            typeof target[0] === "string" &&
+            target[0].includes("oneTimeUseToken")
+          ) {
+            throw new ServiceValidationError(
+              "Cannot create batch with a one-time use token as it has already been used."
+            );
+          } else {
+            throw new ServiceValidationError(
+              "Cannot create batch as it has already been created with the same idempotency key."
+            );
+          }
+        }
+      }
+
+      throw error;
+    }
+  }
+}
diff --git a/apps/webapp/app/runEngine/services/streamBatchItems.server.ts b/apps/webapp/app/runEngine/services/streamBatchItems.server.ts
new file mode 100644
index 00000000000..6fab01341c1
--- /dev/null
+++ b/apps/webapp/app/runEngine/services/streamBatchItems.server.ts
@@ -0,0 +1,470 @@
+import {
+  type BatchItemNDJSON,
+  type StreamBatchItemsResponse,
+  BatchItemNDJSON as BatchItemNDJSONSchema,
+} from "@trigger.dev/core/v3";
+import { BatchId } from "@trigger.dev/core/v3/isomorphic";
+import type { BatchItem, RunEngine } from "@internal/run-engine";
+import { prisma, type PrismaClientOrTransaction } from "~/db.server";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { ServiceValidationError, WithRunEngine } from "../../v3/services/baseService.server";
+import { BatchPayloadProcessor } from "../concerns/batchPayloads.server";
+
+export type StreamBatchItemsServiceOptions = {
+  maxItemBytes: number;
+};
+
+export type StreamBatchItemsServiceConstructorOptions = {
+  prisma?: PrismaClientOrTransaction;
+  engine?: RunEngine;
+};
+
+/**
+ * Stream Batch Items Service (Phase 2 of 2-phase batch API).
+ *
+ * This service handles Phase 2 of the streaming batch API:
+ * 1. Validates batch exists and is in PENDING status
+ * 2. Processes NDJSON stream item by item
+ * 3. Calls engine.enqueueBatchItem() for each item
+ * 4. Tracks accepted/deduplicated counts
+ * 5. On completion: validates count, seals the batch
+ *
+ * The service is designed for streaming and processes items as they arrive,
+ * providing backpressure through the async iterator pattern.
+ */
+export class StreamBatchItemsService extends WithRunEngine {
+  private readonly payloadProcessor: BatchPayloadProcessor;
+
+  constructor(opts: StreamBatchItemsServiceConstructorOptions = {}) {
+    super({ prisma: opts.prisma ?? prisma, engine: opts.engine });
+    this.payloadProcessor = new BatchPayloadProcessor();
+  }
+
+  /**
+   * Parse a batch friendly ID to its internal ID format.
+   * Throws a ServiceValidationError with 400 status if the ID is malformed.
+   */
+  private parseBatchFriendlyId(friendlyId: string): string {
+    try {
+      return BatchId.fromFriendlyId(friendlyId);
+    } catch {
+      throw new ServiceValidationError(`Invalid batchFriendlyId: ${friendlyId}`, 400);
+    }
+  }
+
+  /**
+   * Process a stream of batch items from an async iterator.
+   * Each item is validated and enqueued to the BatchQueue.
+   * The batch is sealed when the stream completes.
+   */
+  public async call(
+    environment: AuthenticatedEnvironment,
+    batchFriendlyId: string,
+    itemsIterator: AsyncIterable<unknown>,
+    options: StreamBatchItemsServiceOptions
+  ): Promise<StreamBatchItemsResponse> {
+    return this.traceWithEnv<StreamBatchItemsResponse>(
+      "streamBatchItems()",
+      environment,
+      async (span) => {
+        span.setAttribute("batchId", batchFriendlyId);
+
+        // Convert friendly ID to internal ID
+        const batchId = this.parseBatchFriendlyId(batchFriendlyId);
+
+        // Validate batch exists and belongs to this environment
+        const batch = await this._prisma.batchTaskRun.findFirst({
+          where: {
+            id: batchId,
+            runtimeEnvironmentId: environment.id,
+          },
+          select: {
+            id: true,
+            friendlyId: true,
+            status: true,
+            runCount: true,
+            sealed: true,
+            batchVersion: true,
+          },
+        });
+
+        if (!batch) {
+          throw new ServiceValidationError(`Batch ${batchFriendlyId} not found`);
+        }
+
+        if (batch.sealed) {
+          throw new ServiceValidationError(
+            `Batch ${batchFriendlyId} is already sealed and cannot accept more items`
+          );
+        }
+
+        if (batch.status !== "PENDING") {
+          throw new ServiceValidationError(
+            `Batch ${batchFriendlyId} is not in PENDING status (current: ${batch.status})`
+          );
+        }
+
+        let itemsAccepted = 0;
+        let itemsDeduplicated = 0;
+        let lastIndex = -1;
+
+        // Process items from the stream
+        for await (const rawItem of itemsIterator) {
+          // Parse and validate the item
+          const parseResult = BatchItemNDJSONSchema.safeParse(rawItem);
+          if (!parseResult.success) {
+            throw new ServiceValidationError(
+              `Invalid item at index ${lastIndex + 1}: ${parseResult.error.message}`
+            );
+          }
+
+          const item = parseResult.data;
+          lastIndex = item.index;
+
+          // Validate index is within expected range
+          if (item.index >= batch.runCount) {
+            throw new ServiceValidationError(
+              `Item index ${item.index} exceeds batch runCount ${batch.runCount}`
+            );
+          }
+
+          // Get the original payload type
+          const originalPayloadType = (item.options?.payloadType as string) ?? "application/json";
+
+          // Process payload - offload to R2 if it exceeds threshold
+          const processedPayload = await this.payloadProcessor.process(
+            item.payload,
+            originalPayloadType,
+            batchId,
+            item.index,
+            environment
+          );
+
+          // Convert to BatchItem format with potentially offloaded payload
+          const batchItem: BatchItem = {
+            task: item.task,
+            payload: processedPayload.payload,
+            payloadType: processedPayload.payloadType,
+            options: item.options,
+          };
+
+          // Enqueue the item
+          const result = await this._engine.enqueueBatchItem(
+            batchId,
+            environment.id,
+            item.index,
+            batchItem
+          );
+
+          if (result.enqueued) {
+            itemsAccepted++;
+          } else {
+            itemsDeduplicated++;
+          }
+        }
+
+        // Get the actual enqueued count from Redis
+        const enqueuedCount = await this._engine.getBatchEnqueuedCount(batchId);
+
+        // Validate we received the expected number of items
+        if (enqueuedCount !== batch.runCount) {
+          logger.warn("Batch item count mismatch", {
+            batchId: batchFriendlyId,
+            expected: batch.runCount,
+            received: enqueuedCount,
+            itemsAccepted,
+            itemsDeduplicated,
+          });
+
+          // Don't seal the batch if count doesn't match
+          // Return sealed: false so client knows to retry with missing items
+          return {
+            id: batchFriendlyId,
+            itemsAccepted,
+            itemsDeduplicated,
+            sealed: false,
+            enqueuedCount,
+            expectedCount: batch.runCount,
+          };
+        }
+
+        // Seal the batch - use conditional update to prevent TOCTOU race
+        // Another concurrent request may have already sealed this batch
+        const now = new Date();
+        const sealResult = await this._prisma.batchTaskRun.updateMany({
+          where: {
+            id: batchId,
+            sealed: false,
+            status: "PENDING",
+          },
+          data: {
+            sealed: true,
+            sealedAt: now,
+            status: "PROCESSING",
+            processingStartedAt: now,
+          },
+        });
+
+        // Check if we won the race to seal the batch
+        if (sealResult.count === 0) {
+          // Another request sealed the batch first - re-query to check current state
+          const currentBatch = await this._prisma.batchTaskRun.findUnique({
+            where: { id: batchId },
+            select: {
+              id: true,
+              friendlyId: true,
+              status: true,
+              sealed: true,
+            },
+          });
+
+          if (currentBatch?.sealed && currentBatch.status === "PROCESSING") {
+            // The batch was sealed by another request - this is fine, the goal was achieved
+            logger.info("Batch already sealed by concurrent request", {
+              batchId: batchFriendlyId,
+              itemsAccepted,
+              itemsDeduplicated,
+              envId: environment.id,
+            });
+
+            span.setAttribute("itemsAccepted", itemsAccepted);
+            span.setAttribute("itemsDeduplicated", itemsDeduplicated);
+            span.setAttribute("sealedByConcurrentRequest", true);
+
+            return {
+              id: batchFriendlyId,
+              itemsAccepted,
+              itemsDeduplicated,
+              sealed: true,
+            };
+          }
+
+          // Batch is in an unexpected state - fail with error
+          const actualStatus = currentBatch?.status ?? "unknown";
+          const actualSealed = currentBatch?.sealed ?? "unknown";
+          logger.error("Batch seal race condition: unexpected state", {
+            batchId: batchFriendlyId,
+            expectedStatus: "PENDING",
+            actualStatus,
+            expectedSealed: false,
+            actualSealed,
+            envId: environment.id,
+          });
+
+          throw new ServiceValidationError(
+            `Batch ${batchFriendlyId} is in unexpected state (status: ${actualStatus}, sealed: ${actualSealed}). Cannot seal batch.`
+          );
+        }
+
+        logger.info("Batch sealed and ready for processing", {
+          batchId: batchFriendlyId,
+          itemsAccepted,
+          itemsDeduplicated,
+          totalEnqueued: enqueuedCount,
+          envId: environment.id,
+        });
+
+        span.setAttribute("itemsAccepted", itemsAccepted);
+        span.setAttribute("itemsDeduplicated", itemsDeduplicated);
+
+        return {
+          id: batchFriendlyId,
+          itemsAccepted,
+          itemsDeduplicated,
+          sealed: true,
+        };
+      }
+    );
+  }
+}
+
+/**
+ * Create an NDJSON parser transform stream.
+ *
+ * Converts a stream of Uint8Array chunks into parsed JSON objects.
+ * Each line in the NDJSON is parsed independently.
+ *
+ * Uses byte-buffer accumulation to:
+ * - Prevent OOM from unbounded string buffers
+ * - Properly handle multibyte UTF-8 characters across chunk boundaries
+ * - Check size limits on raw bytes before decoding
+ *
+ * @param maxItemBytes - Maximum allowed bytes per line (item)
+ * @returns TransformStream that outputs parsed JSON objects
+ */
+export function createNdjsonParserStream(
+  maxItemBytes: number
+): TransformStream<Uint8Array, unknown> {
+  // Single decoder instance, reused for all lines
+  const decoder = new TextDecoder("utf-8", { fatal: true });
+
+  // Byte buffer: array of chunks with tracked total length
+  let chunks: Uint8Array[] = [];
+  let totalBytes = 0;
+  let lineNumber = 0;
+
+  const NEWLINE_BYTE = 0x0a; // '\n'
+
+  /**
+   * Concatenate all chunks into a single Uint8Array
+   */
+  function concatenateChunks(): Uint8Array {
+    if (chunks.length === 0) {
+      return new Uint8Array(0);
+    }
+    if (chunks.length === 1) {
+      return chunks[0];
+    }
+    const result = new Uint8Array(totalBytes);
+    let offset = 0;
+    for (const chunk of chunks) {
+      result.set(chunk, offset);
+      offset += chunk.byteLength;
+    }
+    return result;
+  }
+
+  /**
+   * Find the index of the first newline byte in the buffer.
+   * Returns -1 if not found.
+   */
+  function findNewlineIndex(): number {
+    let globalIndex = 0;
+    for (const chunk of chunks) {
+      for (let i = 0; i < chunk.byteLength; i++) {
+        if (chunk[i] === NEWLINE_BYTE) {
+          return globalIndex + i;
+        }
+      }
+      globalIndex += chunk.byteLength;
+    }
+    return -1;
+  }
+
+  /**
+   * Extract bytes from the buffer up to (but not including) the given index,
+   * and remove those bytes plus the delimiter from the buffer.
+   */
+  function extractLine(newlineIndex: number): Uint8Array {
+    const fullBuffer = concatenateChunks();
+    const lineBytes = fullBuffer.slice(0, newlineIndex);
+    const remaining = fullBuffer.slice(newlineIndex + 1); // Skip the newline
+
+    // Reset buffer with remaining bytes
+    if (remaining.byteLength > 0) {
+      chunks = [remaining];
+      totalBytes = remaining.byteLength;
+    } else {
+      chunks = [];
+      totalBytes = 0;
+    }
+
+    return lineBytes;
+  }
+
+  /**
+   * Parse a line from bytes, handling whitespace trimming.
+   * Returns the parsed object or null for empty lines.
+   */
+  function parseLine(
+    lineBytes: Uint8Array,
+    controller: TransformStreamDefaultController<unknown>
+  ): void {
+    lineNumber++;
+
+    // Decode the line bytes (stream: false since this is a complete line)
+    let lineText: string;
+    try {
+      lineText = decoder.decode(lineBytes, { stream: false });
+    } catch (err) {
+      throw new Error(`Invalid UTF-8 at line ${lineNumber}: ${(err as Error).message}`);
+    }
+
+    const trimmed = lineText.trim();
+    if (!trimmed) {
+      return; // Skip empty lines
+    }
+
+    try {
+      const obj = JSON.parse(trimmed);
+      controller.enqueue(obj);
+    } catch (err) {
+      throw new Error(`Invalid JSON at line ${lineNumber}: ${(err as Error).message}`);
+    }
+  }
+
+  return new TransformStream<Uint8Array, unknown>({
+    transform(chunk, controller) {
+      // Append chunk to buffer
+      chunks.push(chunk);
+      totalBytes += chunk.byteLength;
+
+      // Process all complete lines in the buffer
+      let newlineIndex: number;
+      while ((newlineIndex = findNewlineIndex()) !== -1) {
+        // Check size limit BEFORE extracting/decoding (bytes up to newline)
+        if (newlineIndex > maxItemBytes) {
+          throw new Error(
+            `Item at line ${
+              lineNumber + 1
+            } exceeds maximum size of ${maxItemBytes} bytes (actual: ${newlineIndex})`
+          );
+        }
+
+        const lineBytes = extractLine(newlineIndex);
+        parseLine(lineBytes, controller);
+      }
+
+      // Check if the remaining buffer (incomplete line) exceeds the limit
+      // This prevents OOM from a single huge line without newlines
+      if (totalBytes > maxItemBytes) {
+        throw new Error(
+          `Item at line ${
+            lineNumber + 1
+          } exceeds maximum size of ${maxItemBytes} bytes (buffered: ${totalBytes}, no newline found)`
+        );
+      }
+    },
+
+    flush(controller) {
+      // Flush any remaining bytes from the decoder's internal state
+      // This handles multibyte characters that may have been split across chunks
+      decoder.decode(new Uint8Array(0), { stream: false });
+
+      // Process any remaining buffered data (no trailing newline case)
+      if (totalBytes === 0) {
+        return;
+      }
+
+      // Check size limit before processing final line
+      if (totalBytes > maxItemBytes) {
+        throw new Error(
+          `Item at line ${
+            lineNumber + 1
+          } exceeds maximum size of ${maxItemBytes} bytes (actual: ${totalBytes})`
+        );
+      }
+
+      const finalBytes = concatenateChunks();
+      parseLine(finalBytes, controller);
+    },
+  });
+}
+
+/**
+ * Convert a ReadableStream into an AsyncIterable.
+ * Useful for processing streams with for-await-of loops.
+ */
+export async function* streamToAsyncIterable<T>(stream: ReadableStream<T>): AsyncIterable<T> {
+  const reader = stream.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      yield value;
+    }
+  } finally {
+    reader.releaseLock();
+  }
+}
diff --git a/apps/webapp/app/runEngine/services/triggerTask.server.ts b/apps/webapp/app/runEngine/services/triggerTask.server.ts
index 3847a3036b2..73b4febcc92 100644
--- a/apps/webapp/app/runEngine/services/triggerTask.server.ts
+++ b/apps/webapp/app/runEngine/services/triggerTask.server.ts
@@ -10,8 +10,14 @@ import {
   taskRunErrorEnhancer,
   taskRunErrorToString,
   TriggerTaskRequestBody,
+  TriggerTraceContext,
 } from "@trigger.dev/core/v3";
-import { RunId, stringifyDuration } from "@trigger.dev/core/v3/isomorphic";
+import {
+  parseTraceparent,
+  RunId,
+  serializeTraceparent,
+  stringifyDuration,
+} from "@trigger.dev/core/v3/isomorphic";
 import type { PrismaClientOrTransaction } from "@trigger.dev/database";
 import { createTags } from "~/models/taskRunTag.server";
 import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
@@ -23,29 +29,35 @@ import type {
   TriggerTaskServiceOptions,
   TriggerTaskServiceResult,
 } from "../../v3/services/triggerTask.server";
-import { getTaskEventStore } from "../../v3/taskEventStore.server";
 import { clampMaxDuration } from "../../v3/utils/maxDuration";
-import { EngineServiceValidationError } from "../concerns/errors";
 import { IdempotencyKeyConcern } from "../concerns/idempotencyKeys.server";
 import type {
   PayloadProcessor,
   QueueManager,
-  RunNumberIncrementer,
   TraceEventConcern,
+  TriggerRacepoints,
+  TriggerRacepointSystem,
   TriggerTaskRequest,
   TriggerTaskValidator,
 } from "../types";
+import { ServiceValidationError } from "~/v3/services/common.server";
+
+class NoopTriggerRacepointSystem implements TriggerRacepointSystem {
+  async waitForRacepoint(options: { racepoint: TriggerRacepoints; id: string }): Promise<void> {
+    return;
+  }
+}
 
 export class RunEngineTriggerTaskService {
   private readonly queueConcern: QueueManager;
   private readonly validator: TriggerTaskValidator;
   private readonly payloadProcessor: PayloadProcessor;
   private readonly idempotencyKeyConcern: IdempotencyKeyConcern;
-  private readonly runNumberIncrementer: RunNumberIncrementer;
   private readonly prisma: PrismaClientOrTransaction;
   private readonly engine: RunEngine;
   private readonly tracer: Tracer;
   private readonly traceEventConcern: TraceEventConcern;
+  private readonly triggerRacepointSystem: TriggerRacepointSystem;
   private readonly metadataMaximumSize: number;
 
   constructor(opts: {
@@ -55,10 +67,10 @@ export class RunEngineTriggerTaskService {
     validator: TriggerTaskValidator;
     payloadProcessor: PayloadProcessor;
     idempotencyKeyConcern: IdempotencyKeyConcern;
-    runNumberIncrementer: RunNumberIncrementer;
     traceEventConcern: TraceEventConcern;
     tracer: Tracer;
     metadataMaximumSize: number;
+    triggerRacepointSystem?: TriggerRacepointSystem;
   }) {
     this.prisma = opts.prisma;
     this.engine = opts.engine;
@@ -66,10 +78,10 @@ export class RunEngineTriggerTaskService {
     this.validator = opts.validator;
     this.payloadProcessor = opts.payloadProcessor;
     this.idempotencyKeyConcern = opts.idempotencyKeyConcern;
-    this.runNumberIncrementer = opts.runNumberIncrementer;
     this.tracer = opts.tracer;
     this.traceEventConcern = opts.traceEventConcern;
     this.metadataMaximumSize = opts.metadataMaximumSize;
+    this.triggerRacepointSystem = opts.triggerRacepointSystem ?? new NoopTriggerRacepointSystem();
   }
 
   public async call({
@@ -117,19 +129,65 @@ export class RunEngineTriggerTaskService {
         throw tagValidation.error;
       }
 
-      // Validate entitlement
-      const entitlementValidation = await this.validator.validateEntitlement({
-        environment,
-      });
+      // Validate entitlement (unless skipChecks is enabled)
+      let planType: string | undefined;
+
+      if (!options.skipChecks) {
+        const entitlementValidation = await this.validator.validateEntitlement({
+          environment,
+        });
+
+        if (!entitlementValidation.ok) {
+          throw entitlementValidation.error;
+        }
 
-      if (!entitlementValidation.ok) {
-        throw entitlementValidation.error;
+        // Extract plan type from entitlement response
+        planType = entitlementValidation.plan?.type;
+      } else {
+        // When skipChecks is enabled, planType should be passed via options
+        planType = options.planType;
+
+        if (!planType) {
+          logger.warn("Plan type not set but skipChecks is enabled", {
+            taskId,
+            environment: {
+              id: environment.id,
+              type: environment.type,
+              projectId: environment.projectId,
+              organizationId: environment.organizationId,
+            },
+          });
+        }
       }
 
-      const [parseDelayError, delayUntil] = await tryCatch(parseDelay(body.options?.delay));
+      // Parse delay from either explicit delay option or debounce.delay
+      const delaySource = body.options?.delay ?? body.options?.debounce?.delay;
+      const [parseDelayError, delayUntil] = await tryCatch(parseDelay(delaySource));
 
       if (parseDelayError) {
-        throw new EngineServiceValidationError(`Invalid delay ${body.options?.delay}`);
+        throw new ServiceValidationError(`Invalid delay ${delaySource}`);
+      }
+
+      // Validate debounce options
+      if (body.options?.debounce) {
+        if (!delayUntil) {
+          throw new ServiceValidationError(
+            `Debounce requires a valid delay duration. Provided: ${body.options.debounce.delay}`
+          );
+        }
+
+        // Always validate debounce.delay separately since it's used for rescheduling
+        // This catches the case where options.delay is valid but debounce.delay is invalid
+        const [debounceDelayError, debounceDelayUntil] = await tryCatch(
+          parseDelay(body.options.debounce.delay)
+        );
+
+        if (debounceDelayError || !debounceDelayUntil) {
+          throw new ServiceValidationError(
+            `Invalid debounce delay: ${body.options.debounce.delay}. ` +
+              `Supported formats: {number}s, {number}m, {number}h, {number}d, {number}w`
+          );
+        }
       }
 
       const ttl =
@@ -159,7 +217,8 @@ export class RunEngineTriggerTaskService {
       }
 
       const idempotencyKeyConcernResult = await this.idempotencyKeyConcern.handleTriggerRequest(
-        triggerRequest
+        triggerRequest,
+        parentRun?.taskEventStore
       );
 
       if (idempotencyKeyConcernResult.isCached) {
@@ -168,21 +227,18 @@ export class RunEngineTriggerTaskService {
 
       const { idempotencyKey, idempotencyKeyExpiresAt } = idempotencyKeyConcernResult;
 
+      if (idempotencyKey) {
+        await this.triggerRacepointSystem.waitForRacepoint({
+          racepoint: "idempotencyKey",
+          id: idempotencyKey,
+        });
+      }
+
       if (!options.skipChecks) {
         const queueSizeGuard = await this.queueConcern.validateQueueLimits(environment);
 
-        logger.debug("Queue size guard result", {
-          queueSizeGuard,
-          environment: {
-            id: environment.id,
-            type: environment.type,
-            organization: environment.organization,
-            project: environment.project,
-          },
-        });
-
         if (!queueSizeGuard.ok) {
-          throw new EngineServiceValidationError(
+          throw new ServiceValidationError(
             `Cannot trigger ${taskId} as the queue size limit for this environment has been reached. The maximum size is ${queueSizeGuard.maximumSize}`
           );
         }
@@ -228,111 +284,160 @@ export class RunEngineTriggerTaskService {
 
       const depth = parentRun ? parentRun.depth + 1 : 0;
 
-      const workerQueue = await this.queueConcern.getWorkerQueue(environment);
+      const workerQueue = await this.queueConcern.getWorkerQueue(environment, body.options?.region);
 
       try {
-        return await this.traceEventConcern.traceRun(triggerRequest, async (event) => {
-          const result = await this.runNumberIncrementer.incrementRunNumber(
-            triggerRequest,
-            async (num) => {
-              event.setAttribute("queueName", queueName);
-              span.setAttribute("queueName", queueName);
-              event.setAttribute("runId", runFriendlyId);
-              span.setAttribute("runId", runFriendlyId);
-
-              const payloadPacket = await this.payloadProcessor.process(triggerRequest);
-
-              const taskRun = await this.engine.trigger(
-                {
-                  number: num,
-                  friendlyId: runFriendlyId,
-                  environment: environment,
-                  idempotencyKey,
-                  idempotencyKeyExpiresAt: idempotencyKey ? idempotencyKeyExpiresAt : undefined,
-                  taskIdentifier: taskId,
-                  payload: payloadPacket.data ?? "",
-                  payloadType: payloadPacket.dataType,
-                  context: body.context,
-                  traceContext: event.traceContext,
-                  traceId: event.traceId,
-                  spanId: event.spanId,
-                  parentSpanId:
-                    options.parentAsLinkType === "replay" ? undefined : event.traceparent?.spanId,
-                  replayedFromTaskRunFriendlyId: options.replayedFromTaskRunFriendlyId,
-                  lockedToVersionId: lockedToBackgroundWorker?.id,
-                  taskVersion: lockedToBackgroundWorker?.version,
-                  sdkVersion: lockedToBackgroundWorker?.sdkVersion,
-                  cliVersion: lockedToBackgroundWorker?.cliVersion,
-                  concurrencyKey: body.options?.concurrencyKey,
-                  queue: queueName,
-                  lockedQueueId,
-                  workerQueue,
-                  isTest: body.options?.test ?? false,
-                  delayUntil,
-                  queuedAt: delayUntil ? undefined : new Date(),
-                  maxAttempts: body.options?.maxAttempts,
-                  taskEventStore: getTaskEventStore(),
-                  ttl,
-                  tags,
-                  oneTimeUseToken: options.oneTimeUseToken,
-                  parentTaskRunId: parentRun?.id,
-                  rootTaskRunId: parentRun?.rootTaskRunId ?? parentRun?.id,
-                  batch: options?.batchId
-                    ? {
-                        id: options.batchId,
-                        index: options.batchIndex ?? 0,
+        return await this.traceEventConcern.traceRun(
+          triggerRequest,
+          parentRun?.taskEventStore,
+          async (event, store) => {
+            event.setAttribute("queueName", queueName);
+            span.setAttribute("queueName", queueName);
+            event.setAttribute("runId", runFriendlyId);
+            span.setAttribute("runId", runFriendlyId);
+
+            const payloadPacket = await this.payloadProcessor.process(triggerRequest);
+
+            const taskRun = await this.engine.trigger(
+              {
+                friendlyId: runFriendlyId,
+                environment: environment,
+                idempotencyKey,
+                idempotencyKeyExpiresAt: idempotencyKey ? idempotencyKeyExpiresAt : undefined,
+                idempotencyKeyOptions: body.options?.idempotencyKeyOptions,
+                taskIdentifier: taskId,
+                payload: payloadPacket.data ?? "",
+                payloadType: payloadPacket.dataType,
+                context: body.context,
+                traceContext: this.#propagateExternalTraceContext(
+                  event.traceContext,
+                  parentRun?.traceContext,
+                  event.traceparent?.spanId
+                ),
+                traceId: event.traceId,
+                spanId: event.spanId,
+                parentSpanId:
+                  options.parentAsLinkType === "replay" ? undefined : event.traceparent?.spanId,
+                replayedFromTaskRunFriendlyId: options.replayedFromTaskRunFriendlyId,
+                lockedToVersionId: lockedToBackgroundWorker?.id,
+                taskVersion: lockedToBackgroundWorker?.version,
+                sdkVersion: lockedToBackgroundWorker?.sdkVersion,
+                cliVersion: lockedToBackgroundWorker?.cliVersion,
+                concurrencyKey: body.options?.concurrencyKey,
+                queue: queueName,
+                lockedQueueId,
+                workerQueue,
+                isTest: body.options?.test ?? false,
+                delayUntil,
+                queuedAt: delayUntil ? undefined : new Date(),
+                maxAttempts: body.options?.maxAttempts,
+                taskEventStore: store,
+                ttl,
+                tags,
+                oneTimeUseToken: options.oneTimeUseToken,
+                parentTaskRunId: parentRun?.id,
+                rootTaskRunId: parentRun?.rootTaskRunId ?? parentRun?.id,
+                batch: options?.batchId
+                  ? {
+                      id: options.batchId,
+                      index: options.batchIndex ?? 0,
+                    }
+                  : undefined,
+                resumeParentOnCompletion: body.options?.resumeParentOnCompletion,
+                depth,
+                metadata: metadataPacket?.data,
+                metadataType: metadataPacket?.dataType,
+                seedMetadata: metadataPacket?.data,
+                seedMetadataType: metadataPacket?.dataType,
+                maxDurationInSeconds: body.options?.maxDuration
+                  ? clampMaxDuration(body.options.maxDuration)
+                  : undefined,
+                machine: body.options?.machine,
+                priorityMs: body.options?.priority ? body.options.priority * 1_000 : undefined,
+                queueTimestamp:
+                  options.queueTimestamp ??
+                  (parentRun && body.options?.resumeParentOnCompletion
+                    ? parentRun.queueTimestamp ?? undefined
+                    : undefined),
+                scheduleId: options.scheduleId,
+                scheduleInstanceId: options.scheduleInstanceId,
+                createdAt: options.overrideCreatedAt,
+                bulkActionId: body.options?.bulkActionId,
+                planType,
+                realtimeStreamsVersion: options.realtimeStreamsVersion,
+                debounce: body.options?.debounce,
+                // When debouncing with triggerAndWait, create a span for the debounced trigger
+                onDebounced:
+                  body.options?.debounce && body.options?.resumeParentOnCompletion
+                    ? async ({ existingRun, waitpoint, debounceKey }) => {
+                        return await this.traceEventConcern.traceDebouncedRun(
+                          triggerRequest,
+                          parentRun?.taskEventStore,
+                          {
+                            existingRun,
+                            debounceKey,
+                            incomplete: waitpoint.status === "PENDING",
+                            isError: waitpoint.outputIsError,
+                          },
+                          async (spanEvent) => {
+                            const spanId =
+                              options?.parentAsLinkType === "replay"
+                                ? spanEvent.spanId
+                                : spanEvent.traceparent?.spanId
+                                ? `${spanEvent.traceparent.spanId}:${spanEvent.spanId}`
+                                : spanEvent.spanId;
+                            return spanId;
+                          }
+                        );
                       }
                     : undefined,
-                  resumeParentOnCompletion: body.options?.resumeParentOnCompletion,
-                  depth,
-                  metadata: metadataPacket?.data,
-                  metadataType: metadataPacket?.dataType,
-                  seedMetadata: metadataPacket?.data,
-                  seedMetadataType: metadataPacket?.dataType,
-                  maxDurationInSeconds: body.options?.maxDuration
-                    ? clampMaxDuration(body.options.maxDuration)
-                    : undefined,
-                  machine: body.options?.machine,
-                  priorityMs: body.options?.priority ? body.options.priority * 1_000 : undefined,
-                  queueTimestamp:
-                    options.queueTimestamp ??
-                    (parentRun && body.options?.resumeParentOnCompletion
-                      ? parentRun.queueTimestamp ?? undefined
-                      : undefined),
-                  scheduleId: options.scheduleId,
-                  scheduleInstanceId: options.scheduleInstanceId,
-                  createdAt: options.overrideCreatedAt,
-                  bulkActionId: body.options?.bulkActionId,
-                },
-                this.prisma
-              );
+              },
+              this.prisma
+            );
 
-              const error = taskRun.error ? TaskRunError.parse(taskRun.error) : undefined;
+            // If the returned run has a different friendlyId, it was debounced.
+            // For triggerAndWait: stop the outer span since a replacement debounced span was created via onDebounced.
+            // For regular trigger: let the span complete normally - no replacement span needed since the
+            // original run already has its span from when it was first created.
+            if (
+              taskRun.friendlyId !== runFriendlyId &&
+              body.options?.debounce &&
+              body.options?.resumeParentOnCompletion
+            ) {
+              event.stop();
+            }
 
-              if (error) {
-                event.failWithError(error);
-              }
+            const error = taskRun.error ? TaskRunError.parse(taskRun.error) : undefined;
 
-              return { run: taskRun, error, isCached: false };
+            if (error) {
+              event.failWithError(error);
             }
-          );
 
-          if (result?.error) {
-            throw new EngineServiceValidationError(
-              taskRunErrorToString(taskRunErrorEnhancer(result.error))
-            );
-          }
+            const result = { run: taskRun, error, isCached: false };
 
-          return result;
-        });
+            if (result?.error) {
+              throw new ServiceValidationError(
+                taskRunErrorToString(taskRunErrorEnhancer(result.error))
+              );
+            }
+
+            return result;
+          }
+        );
       } catch (error) {
         if (error instanceof RunDuplicateIdempotencyKeyError) {
           //retry calling this function, because this time it will return the idempotent run
-          return await this.call({ taskId, environment, body, options, attempt: attempt + 1 });
+          return await this.call({
+            taskId,
+            environment,
+            body,
+            options: { ...options, runFriendlyId },
+            attempt: attempt + 1,
+          });
         }
 
         if (error instanceof RunOneTimeUseTokenError) {
-          throw new EngineServiceValidationError(
+          throw new ServiceValidationError(
             `Cannot trigger ${taskId} with a one-time use token as it has already been used.`
           );
         }
@@ -341,4 +446,50 @@ export class RunEngineTriggerTaskService {
       }
     });
   }
+
+  #propagateExternalTraceContext(
+    traceContext: Record<string, unknown>,
+    parentRunTraceContext: unknown,
+    parentSpanId: string | undefined
+  ): TriggerTraceContext {
+    if (!parentRunTraceContext) {
+      return traceContext;
+    }
+
+    const parsedParentRunTraceContext = TriggerTraceContext.safeParse(parentRunTraceContext);
+
+    if (!parsedParentRunTraceContext.success) {
+      return traceContext;
+    }
+
+    const { external } = parsedParentRunTraceContext.data;
+
+    if (!external) {
+      return traceContext;
+    }
+
+    if (!external.traceparent) {
+      return traceContext;
+    }
+
+    const parsedTraceparent = parseTraceparent(external.traceparent);
+
+    if (!parsedTraceparent) {
+      return traceContext;
+    }
+
+    const newExternalTraceparent = serializeTraceparent(
+      parsedTraceparent.traceId,
+      parentSpanId ?? parsedTraceparent.spanId,
+      parsedTraceparent.traceFlags
+    );
+
+    return {
+      ...traceContext,
+      external: {
+        ...external,
+        traceparent: newExternalTraceparent,
+      },
+    };
+  }
 }
diff --git a/apps/webapp/app/runEngine/types.ts b/apps/webapp/app/runEngine/types.ts
index 9523999d542..7186d81ff9b 100644
--- a/apps/webapp/app/runEngine/types.ts
+++ b/apps/webapp/app/runEngine/types.ts
@@ -1,18 +1,13 @@
-import { BackgroundWorker, TaskRun } from "@trigger.dev/database";
-
-import {
-  IOPacket,
-  RunChainState,
-  TaskRunError,
-  TriggerTaskRequestBody,
-} from "@trigger.dev/core/v3";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import type { BackgroundWorker, TaskRun } from "@trigger.dev/database";
+import type { IOPacket, TaskRunError, TriggerTaskRequestBody } from "@trigger.dev/core/v3";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import type { ReportUsagePlan } from "@trigger.dev/platform";
 
 export type TriggerTaskServiceOptions = {
   idempotencyKey?: string;
   idempotencyKeyExpiresAt?: Date;
   triggerVersion?: string;
-  traceContext?: Record<string, string | undefined>;
+  traceContext?: Record<string, unknown>;
   spanParentAsLink?: boolean;
   parentAsLinkType?: "replay" | "trigger";
   batchId?: string;
@@ -22,6 +17,7 @@ export type TriggerTaskServiceOptions = {
   skipChecks?: boolean;
   oneTimeUseToken?: string;
   overrideCreatedAt?: Date;
+  planType?: string;
 };
 
 // domain/triggerTask.ts
@@ -66,21 +62,20 @@ export interface QueueManager {
     lockedBackgroundWorker?: LockedBackgroundWorker
   ): Promise<QueueProperties>;
   getQueueName(request: TriggerTaskRequest): Promise<string>;
-  validateQueueLimits(env: AuthenticatedEnvironment): Promise<QueueValidationResult>;
-  getWorkerQueue(env: AuthenticatedEnvironment): Promise<string | undefined>;
+  validateQueueLimits(
+    env: AuthenticatedEnvironment,
+    itemsToAdd?: number
+  ): Promise<QueueValidationResult>;
+  getWorkerQueue(
+    env: AuthenticatedEnvironment,
+    regionOverride?: string
+  ): Promise<string | undefined>;
 }
 
 export interface PayloadProcessor {
   process(request: TriggerTaskRequest): Promise<IOPacket>;
 }
 
-export interface RunNumberIncrementer {
-  incrementRunNumber<T>(
-    request: TriggerTaskRequest,
-    callback: (num: number) => Promise<T>
-  ): Promise<T | undefined>;
-}
-
 export interface TagValidationParams {
   tags?: string[] | string;
 }
@@ -109,9 +104,19 @@ export type ValidationResult =
       error: Error;
     };
 
+export type EntitlementValidationResult =
+  | {
+      ok: true;
+      plan?: ReportUsagePlan;
+    }
+  | {
+      ok: false;
+      error: Error;
+    };
+
 export interface TriggerTaskValidator {
   validateTags(params: TagValidationParams): ValidationResult;
-  validateEntitlement(params: EntitlementValidationParams): Promise<ValidationResult>;
+  validateEntitlement(params: EntitlementValidationParams): Promise<EntitlementValidationResult>;
   validateMaxAttempts(params: MaxAttemptsValidationParams): ValidationResult;
   validateParentRun(params: ParentRunValidationParams): ValidationResult;
 }
@@ -119,28 +124,53 @@ export interface TriggerTaskValidator {
 export type TracedEventSpan = {
   traceId: string;
   spanId: string;
-  traceContext: Record<string, string | undefined>;
+  traceContext: Record<string, unknown>;
   traceparent?: {
     traceId: string;
     spanId: string;
   };
   setAttribute: (key: string, value: string) => void;
   failWithError: (error: TaskRunError) => void;
+  /**
+   * Stop the span without writing any event.
+   * Used when a debounced run is returned - the span for the debounced
+   * trigger is created separately via traceDebouncedRun.
+   */
+  stop: () => void;
 };
 
 export interface TraceEventConcern {
   traceRun<T>(
     request: TriggerTaskRequest,
-    callback: (span: TracedEventSpan) => Promise<T>
+    parentStore: string | undefined,
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
   ): Promise<T>;
   traceIdempotentRun<T>(
     request: TriggerTaskRequest,
+    parentStore: string | undefined,
     options: {
       existingRun: TaskRun;
       idempotencyKey: string;
       incomplete: boolean;
       isError: boolean;
     },
-    callback: (span: TracedEventSpan) => Promise<T>
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
   ): Promise<T>;
+  traceDebouncedRun<T>(
+    request: TriggerTaskRequest,
+    parentStore: string | undefined,
+    options: {
+      existingRun: TaskRun;
+      debounceKey: string;
+      incomplete: boolean;
+      isError: boolean;
+    },
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
+  ): Promise<T>;
+}
+
+export type TriggerRacepoints = "idempotencyKey";
+
+export interface TriggerRacepointSystem {
+  waitForRacepoint(options: { racepoint: TriggerRacepoints; id: string }): Promise<void>;
 }
diff --git a/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts b/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts
index e63bdacfb58..ab6e46521ab 100644
--- a/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts
+++ b/apps/webapp/app/runEngine/validators/triggerTaskValidator.ts
@@ -3,15 +3,16 @@ import { logger } from "~/services/logger.server";
 import { getEntitlement } from "~/services/platform.v3.server";
 import { MAX_ATTEMPTS, OutOfEntitlementError } from "~/v3/services/triggerTask.server";
 import { isFinalRunStatus } from "~/v3/taskStatus";
-import { EngineServiceValidationError } from "../concerns/errors";
-import {
+import type {
   EntitlementValidationParams,
+  EntitlementValidationResult,
   MaxAttemptsValidationParams,
   ParentRunValidationParams,
   TagValidationParams,
   TriggerTaskValidator,
   ValidationResult,
 } from "../types";
+import { ServiceValidationError } from "~/v3/services/common.server";
 
 export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
   validateTags(params: TagValidationParams): ValidationResult {
@@ -28,7 +29,7 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
     if (tags.length > MAX_TAGS_PER_RUN) {
       return {
         ok: false,
-        error: new EngineServiceValidationError(
+        error: new ServiceValidationError(
           `Runs can only have ${MAX_TAGS_PER_RUN} tags, you're trying to set ${tags.length}.`
         ),
       };
@@ -37,7 +38,9 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
     return { ok: true };
   }
 
-  async validateEntitlement(params: EntitlementValidationParams): Promise<ValidationResult> {
+  async validateEntitlement(
+    params: EntitlementValidationParams
+  ): Promise<EntitlementValidationResult> {
     const { environment } = params;
 
     if (environment.type === "DEVELOPMENT") {
@@ -53,7 +56,7 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
       };
     }
 
-    return { ok: true };
+    return { ok: true, plan: result?.plan };
   }
 
   validateMaxAttempts(params: MaxAttemptsValidationParams): ValidationResult {
@@ -62,7 +65,7 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
     if (attempt > MAX_ATTEMPTS) {
       return {
         ok: false,
-        error: new EngineServiceValidationError(
+        error: new ServiceValidationError(
           `Failed to trigger ${taskId} after ${MAX_ATTEMPTS} attempts.`
         ),
       };
@@ -92,7 +95,7 @@ export class DefaultTriggerTaskValidator implements TriggerTaskValidator {
 
       return {
         ok: false,
-        error: new EngineServiceValidationError(
+        error: new ServiceValidationError(
           `Cannot trigger ${taskId} as the parent run has a status of ${parentRun.status}`
         ),
       };
diff --git a/apps/webapp/app/services/apiAuth.server.ts b/apps/webapp/app/services/apiAuth.server.ts
index 3d839ba4409..611953efc4f 100644
--- a/apps/webapp/app/services/apiAuth.server.ts
+++ b/apps/webapp/app/services/apiAuth.server.ts
@@ -2,7 +2,8 @@ import { json } from "@remix-run/server-runtime";
 import { type Prettify } from "@trigger.dev/core";
 import { SignJWT, errors, jwtVerify } from "jose";
 import { z } from "zod";
-import { prisma } from "~/db.server";
+
+import { $replica } from "~/db.server";
 import { env } from "~/env.server";
 import { findProjectByRef } from "~/models/project.server";
 import {
@@ -16,6 +17,11 @@ import {
   authenticateApiRequestWithPersonalAccessToken,
   isPersonalAccessToken,
 } from "./personalAccessToken.server";
+import {
+  type OrganizationAccessTokenAuthenticationResult,
+  authenticateApiRequestWithOrganizationAccessToken,
+  isOrganizationAccessToken,
+} from "./organizationAccessToken.server";
 import { isPublicJWT, validatePublicJwtKey } from "./realtime/jwtAuth.server";
 import { sanitizeBranchName } from "~/v3/gitBranch";
 
@@ -309,25 +315,81 @@ function getApiKeyResult(apiKey: string): {
   return { apiKey, type };
 }
 
-export type DualAuthenticationResult =
+export type AuthenticationResult =
   | {
       type: "personalAccessToken";
       result: PersonalAccessTokenAuthenticationResult;
     }
+  | {
+      type: "organizationAccessToken";
+      result: OrganizationAccessTokenAuthenticationResult;
+    }
   | {
       type: "apiKey";
       result: ApiAuthenticationResult;
     };
 
-export async function authenticateProjectApiKeyOrPersonalAccessToken(
-  request: Request
-): Promise<DualAuthenticationResult | undefined> {
+type AuthenticationMethod = "personalAccessToken" | "organizationAccessToken" | "apiKey";
+
+type AllowedAuthenticationMethods = Record<AuthenticationMethod, boolean> &
+  ({ personalAccessToken: true } | { organizationAccessToken: true } | { apiKey: true });
+
+const defaultAllowedAuthenticationMethods: AllowedAuthenticationMethods = {
+  personalAccessToken: true,
+  organizationAccessToken: true,
+  apiKey: true,
+};
+
+type FilteredAuthenticationResult<
+  T extends AllowedAuthenticationMethods = AllowedAuthenticationMethods
+> =
+  | (T["personalAccessToken"] extends true
+      ? Extract<AuthenticationResult, { type: "personalAccessToken" }>
+      : never)
+  | (T["organizationAccessToken"] extends true
+      ? Extract<AuthenticationResult, { type: "organizationAccessToken" }>
+      : never)
+  | (T["apiKey"] extends true ? Extract<AuthenticationResult, { type: "apiKey" }> : never);
+
+/**
+ * Authenticates an incoming request by checking for various token types.
+ *
+ * Supports personal access tokens, organization access tokens, and API keys.
+ * Returns the appropriate authentication result based on the token type found.
+ *
+ * This method currently only allows private keys for the `apiKey` authentication method.
+ *
+ * @template T - The allowed authentication methods configuration type
+ * @param request - The incoming HTTP request containing authentication headers
+ * @param allowedAuthenticationMethods - Configuration object specifying which authentication methods are allowed.
+ *   At least one method must be set to `true`. Defaults to allowing all methods.
+ * @returns Authentication result with only the enabled auth method types, or undefined if no valid token found
+ *
+ * @example
+ * ```typescript
+ * // Only allow personal access tokens
+ * const result = await authenticateRequest(request, {
+ *   personalAccessToken: true,
+ *   organizationAccessToken: false,
+ *   apiKey: false,
+ * });
+ * // result type: { type: "personalAccessToken"; result: PersonalAccessTokenAuthenticationResult } | undefined
+ * ```
+ */
+export async function authenticateRequest<
+  T extends AllowedAuthenticationMethods = AllowedAuthenticationMethods
+>(
+  request: Request,
+  allowedAuthenticationMethods?: T
+): Promise<FilteredAuthenticationResult<T> | undefined> {
+  const allowedMethods = allowedAuthenticationMethods ?? defaultAllowedAuthenticationMethods;
+
   const { apiKey, branchName } = getApiKeyFromRequest(request);
   if (!apiKey) {
     return;
   }
 
-  if (isPersonalAccessToken(apiKey)) {
+  if (allowedMethods.personalAccessToken && isPersonalAccessToken(apiKey)) {
     const result = await authenticateApiRequestWithPersonalAccessToken(request);
 
     if (!result) {
@@ -337,23 +399,49 @@ export async function authenticateProjectApiKeyOrPersonalAccessToken(
     return {
       type: "personalAccessToken",
       result,
-    };
+    } satisfies Extract<
+      AuthenticationResult,
+      { type: "personalAccessToken" }
+    > as FilteredAuthenticationResult<T>;
   }
 
-  const result = await authenticateApiKey(apiKey, { allowPublicKey: false, branchName });
+  if (allowedMethods.organizationAccessToken && isOrganizationAccessToken(apiKey)) {
+    const result = await authenticateApiRequestWithOrganizationAccessToken(request);
 
-  if (!result) {
-    return;
+    if (!result) {
+      return;
+    }
+
+    return {
+      type: "organizationAccessToken",
+      result,
+    } satisfies Extract<
+      AuthenticationResult,
+      { type: "organizationAccessToken" }
+    > as FilteredAuthenticationResult<T>;
   }
 
-  return {
-    type: "apiKey",
-    result,
-  };
+  if (allowedMethods.apiKey) {
+    const result = await authenticateApiKey(apiKey, { allowPublicKey: false, branchName });
+
+    if (!result) {
+      return;
+    }
+
+    return {
+      type: "apiKey",
+      result,
+    } satisfies Extract<
+      AuthenticationResult,
+      { type: "apiKey" }
+    > as FilteredAuthenticationResult<T>;
+  }
+
+  return;
 }
 
 export async function authenticatedEnvironmentForAuthentication(
-  auth: DualAuthenticationResult,
+  auth: AuthenticationResult,
   projectRef: string,
   slug: string,
   branch?: string
@@ -391,14 +479,14 @@ export async function authenticatedEnvironmentForAuthentication(
       return auth.result.environment;
     }
     case "personalAccessToken": {
-      const user = await prisma.user.findUnique({
+      const user = await $replica.user.findUnique({
         where: {
           id: auth.result.userId,
         },
       });
 
       if (!user) {
-        throw json({ error: "Invalid or Missing API key" }, { status: 401 });
+        throw json({ error: "Invalid or missing personal access token" }, { status: 401 });
       }
 
       const project = await findProjectByRef(projectRef, user.id);
@@ -407,8 +495,89 @@ export async function authenticatedEnvironmentForAuthentication(
         throw json({ error: "Project not found" }, { status: 404 });
       }
 
-      if (!branch) {
-        const environment = await prisma.runtimeEnvironment.findFirst({
+      const sanitizedBranch = sanitizeBranchName(branch);
+
+      if (!sanitizedBranch) {
+        const environment = await $replica.runtimeEnvironment.findFirst({
+          where: {
+            projectId: project.id,
+            slug: slug,
+            ...(slug === "dev"
+              ? {
+                  orgMember: {
+                    userId: user.id,
+                  },
+                }
+              : {}),
+          },
+          include: {
+            project: true,
+            organization: true,
+          },
+        });
+
+        if (!environment) {
+          throw json({ error: "Environment not found" }, { status: 404 });
+        }
+
+        return environment;
+      }
+
+      const environment = await $replica.runtimeEnvironment.findFirst({
+        where: {
+          projectId: project.id,
+          type: "PREVIEW",
+          branchName: sanitizedBranch,
+          archivedAt: null,
+        },
+        include: {
+          project: true,
+          organization: true,
+          parentEnvironment: true,
+        },
+      });
+
+      if (!environment) {
+        throw json({ error: "Branch not found" }, { status: 404 });
+      }
+
+      if (!environment.parentEnvironment) {
+        throw json({ error: "Branch not associated with a preview environment" }, { status: 400 });
+      }
+
+      return {
+        ...environment,
+        apiKey: environment.parentEnvironment.apiKey,
+        organization: environment.organization,
+        project: environment.project,
+      };
+    }
+    case "organizationAccessToken": {
+      const organization = await $replica.organization.findUnique({
+        where: {
+          id: auth.result.organizationId,
+        },
+      });
+
+      if (!organization) {
+        throw json({ error: "Invalid or missing organization access token" }, { status: 401 });
+      }
+
+      const project = await $replica.project.findFirst({
+        where: {
+          organizationId: organization.id,
+          externalRef: projectRef,
+        },
+      });
+
+      if (!project) {
+        throw json({ error: "Project not found" }, { status: 404 });
+      }
+
+      const sanitizedBranch = sanitizeBranchName(branch);
+
+      if (!sanitizedBranch) {
+        const environment = await $replica.runtimeEnvironment.findFirst({
           where: {
             projectId: project.id,
             slug: slug,
@@ -426,11 +595,11 @@ export async function authenticatedEnvironmentForAuthentication(
         return environment;
       }
 
-      const environment = await prisma.runtimeEnvironment.findFirst({
+      const environment = await $replica.runtimeEnvironment.findFirst({
         where: {
           projectId: project.id,
-          slug: slug,
-          branchName: sanitizeBranchName(branch),
+          type: "PREVIEW",
+          branchName: sanitizedBranch,
           archivedAt: null,
         },
         include: {
@@ -455,6 +624,10 @@ export async function authenticatedEnvironmentForAuthentication(
         project: environment.project,
       };
     }
+    default: {
+      auth satisfies never;
+      throw json({ error: "Invalid authentication result" }, { status: 401 });
+    }
   }
 }
 
diff --git a/apps/webapp/app/services/apiRateLimit.server.ts b/apps/webapp/app/services/apiRateLimit.server.ts
index 611a19fb3ef..dee0a889d1b 100644
--- a/apps/webapp/app/services/apiRateLimit.server.ts
+++ b/apps/webapp/app/services/apiRateLimit.server.ts
@@ -22,6 +22,7 @@ export const apiRateLimiter = authorizationRateLimitMiddleware({
   limiterCache: {
     fresh: 60_000 * 10, // Data is fresh for 10 minutes
     stale: 60_000 * 20, // Date is stale after 20 minutes
+    maxItems: 1000,
   },
   limiterConfigOverride: async (authorizationValue) => {
     const authenticatedEnv = await authenticateAuthorizationHeader(authorizationValue, {
@@ -60,6 +61,7 @@ export const apiRateLimiter = authorizationRateLimitMiddleware({
     "/api/v1/auth/jwt/claims",
     /^\/api\/v1\/runs\/[^\/]+\/attempts$/, // /api/v1/runs/$runFriendlyId/attempts
     /^\/api\/v1\/waitpoints\/tokens\/[^\/]+\/callback\/[^\/]+$/, // /api/v1/waitpoints/tokens/$waitpointFriendlyId/callback/$hash
+    /^\/api\/v\d+\/deployments/, // /api/v{1,2,3,n}/deployments/*
   ],
   log: {
     rejections: env.API_RATE_LIMIT_REJECTION_LOGS_ENABLED === "1",
diff --git a/apps/webapp/app/services/archiveBranch.server.ts b/apps/webapp/app/services/archiveBranch.server.ts
index e0ff0e1174d..9d7897f32c0 100644
--- a/apps/webapp/app/services/archiveBranch.server.ts
+++ b/apps/webapp/app/services/archiveBranch.server.ts
@@ -10,18 +10,34 @@ export class ArchiveBranchService {
     this.#prismaClient = prismaClient;
   }
 
-  public async call(userId: string, { environmentId }: { environmentId: string }) {
+  public async call(
+    // The orgFilter approach is not ideal but we need to keep it this way for now because of how the service is used in routes and api endpoints.
+    // Currently authorization checks are spread across the controller/route layer and the service layer. Often we check in multiple places for org/project membership.
+    // Ideally we would take care of both the authentication and authorization checks in the controllers and routes.
+    // That would unify how we handle authorization and org/project membership checks. Also it would make the service layer queries simpler.
+    orgFilter:
+      | { type: "userMembership"; userId: string }
+      | { type: "orgId"; organizationId: string },
+    {
+      environmentId,
+    }: {
+      environmentId: string;
+    }
+  ) {
     try {
       const environment = await this.#prismaClient.runtimeEnvironment.findFirstOrThrow({
         where: {
           id: environmentId,
-          organization: {
-            members: {
-              some: {
-                userId: userId,
-              },
-            },
-          },
+          organization:
+            orgFilter.type === "userMembership"
+              ? {
+                  members: {
+                    some: {
+                      userId: orgFilter.userId,
+                    },
+                  },
+                }
+              : { id: orgFilter.organizationId },
         },
         include: {
           organization: {
diff --git a/apps/webapp/app/services/auth.server.ts b/apps/webapp/app/services/auth.server.ts
index 8266537b822..c5650691012 100644
--- a/apps/webapp/app/services/auth.server.ts
+++ b/apps/webapp/app/services/auth.server.ts
@@ -2,6 +2,7 @@ import { Authenticator } from "remix-auth";
 import type { AuthUser } from "./authUser";
 import { addEmailLinkStrategy } from "./emailAuth.server";
 import { addGitHubStrategy } from "./gitHubAuth.server";
+import { addGoogleStrategy } from "./googleAuth.server";
 import { sessionStorage } from "./sessionStorage.server";
 import { env } from "~/env.server";
 
@@ -13,10 +14,18 @@ const isGithubAuthSupported =
   typeof env.AUTH_GITHUB_CLIENT_ID === "string" &&
   typeof env.AUTH_GITHUB_CLIENT_SECRET === "string";
 
+const isGoogleAuthSupported =
+  typeof env.AUTH_GOOGLE_CLIENT_ID === "string" &&
+  typeof env.AUTH_GOOGLE_CLIENT_SECRET === "string";
+
 if (env.AUTH_GITHUB_CLIENT_ID && env.AUTH_GITHUB_CLIENT_SECRET) {
   addGitHubStrategy(authenticator, env.AUTH_GITHUB_CLIENT_ID, env.AUTH_GITHUB_CLIENT_SECRET);
 }
 
+if (env.AUTH_GOOGLE_CLIENT_ID && env.AUTH_GOOGLE_CLIENT_SECRET) {
+  addGoogleStrategy(authenticator, env.AUTH_GOOGLE_CLIENT_ID, env.AUTH_GOOGLE_CLIENT_SECRET);
+}
+
 addEmailLinkStrategy(authenticator);
 
-export { authenticator, isGithubAuthSupported };
+export { authenticator, isGithubAuthSupported, isGoogleAuthSupported };
diff --git a/apps/webapp/app/services/authorization.server.ts b/apps/webapp/app/services/authorization.server.ts
index a7a31011657..15f85cc3278 100644
--- a/apps/webapp/app/services/authorization.server.ts
+++ b/apps/webapp/app/services/authorization.server.ts
@@ -1,6 +1,6 @@
 export type AuthorizationAction = "read" | "write" | string; // Add more actions as needed
 
-const ResourceTypes = ["tasks", "tags", "runs", "batch", "waitpoints"] as const;
+const ResourceTypes = ["tasks", "tags", "runs", "batch", "waitpoints", "deployments"] as const;
 
 export type AuthorizationResources = {
   [key in (typeof ResourceTypes)[number]]?: string | string[];
diff --git a/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts b/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts
index 0ca4b80afdc..431a0062db8 100644
--- a/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts
+++ b/apps/webapp/app/services/authorizationRateLimitMiddleware.server.ts
@@ -1,15 +1,14 @@
 import { createCache, DefaultStatefulContext, Namespace, Cache as UnkeyCache } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import { createLRUMemoryStore } from "@internal/cache";
 import { Ratelimit } from "@upstash/ratelimit";
 import { Request as ExpressRequest, Response as ExpressResponse, NextFunction } from "express";
-import { RedisOptions } from "ioredis";
 import { createHash } from "node:crypto";
 import { z } from "zod";
 import { env } from "~/env.server";
+import { RedisWithClusterOptions } from "~/redis.server";
 import { logger } from "./logger.server";
-import { createRedisRateLimitClient, Duration, RateLimiter } from "./rateLimiter.server";
+import { createRedisRateLimitClient, Duration, Limiter, RateLimiter } from "./rateLimiter.server";
 import { RedisCacheStore } from "./unkey/redisCacheStore.server";
-import { RedisWithClusterOptions } from "~/redis.server";
 
 const DurationSchema = z.custom<Duration>((value) => {
   if (typeof value !== "string") {
@@ -64,6 +63,7 @@ type Options = {
   limiterCache?: {
     fresh: number;
     stale: number;
+    maxItems: number;
   };
   log?: {
     requests?: boolean;
@@ -130,6 +130,18 @@ async function resolveLimitConfig(
   return cacheResult.val ?? defaultLimiter;
 }
 
+/**
+ * Creates a Ratelimit limiter from a RateLimiterConfig.
+ * This function is shared across the codebase to ensure consistent limiter creation.
+ */
+export function createLimiterFromConfig(config: RateLimiterConfig): Limiter {
+  return config.type === "fixedWindow"
+    ? Ratelimit.fixedWindow(config.tokens, config.window)
+    : config.type === "tokenBucket"
+    ? Ratelimit.tokenBucket(config.refillRate, config.interval, config.maxTokens)
+    : Ratelimit.slidingWindow(config.tokens, config.window);
+}
+
 //returns an Express middleware that rate limits using the Bearer token in the Authorization header
 export function authorizationRateLimitMiddleware({
   redis,
@@ -145,7 +157,7 @@ export function authorizationRateLimitMiddleware({
   limiterConfigOverride,
 }: Options) {
   const ctx = new DefaultStatefulContext();
-  const memory = new MemoryStore({ persistentMap: new Map() });
+  const memory = createLRUMemoryStore(limiterCache?.maxItems ?? 1000);
   const redisCacheStore = new RedisCacheStore({
     connection: {
       keyPrefix: `cache:${keyPrefix}:rate-limit-cache:`,
@@ -246,16 +258,7 @@ export function authorizationRateLimitMiddleware({
       limiterConfigOverride
     );
 
-    const limiter =
-      limiterConfig.type === "fixedWindow"
-        ? Ratelimit.fixedWindow(limiterConfig.tokens, limiterConfig.window)
-        : limiterConfig.type === "tokenBucket"
-        ? Ratelimit.tokenBucket(
-            limiterConfig.refillRate,
-            limiterConfig.interval,
-            limiterConfig.maxTokens
-          )
-        : Ratelimit.slidingWindow(limiterConfig.tokens, limiterConfig.window);
+    const limiter = createLimiterFromConfig(limiterConfig);
 
     const rateLimiter = new RateLimiter({
       redisClient,
diff --git a/apps/webapp/app/services/betterstack/betterstack.server.ts b/apps/webapp/app/services/betterstack/betterstack.server.ts
index 41a43b3a699..95fe2208836 100644
--- a/apps/webapp/app/services/betterstack/betterstack.server.ts
+++ b/apps/webapp/app/services/betterstack/betterstack.server.ts
@@ -1,26 +1,56 @@
-import { type ApiResult, wrapZodFetch } from "@trigger.dev/core/v3/zodfetch";
+import { wrapZodFetch } from "@trigger.dev/core/v3/zodfetch";
 import { createCache, DefaultStatefulContext, Namespace } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import { createLRUMemoryStore } from "@internal/cache";
 import { z } from "zod";
 import { env } from "~/env.server";
 
-const IncidentSchema = z.object({
+const StatusPageSchema = z.object({
   data: z.object({
     id: z.string(),
     type: z.string(),
     attributes: z.object({
-      aggregate_state: z.string(),
+      aggregate_state: z.enum(["operational", "degraded", "downtime"]),
     }),
   }),
 });
 
-export type Incident = z.infer<typeof IncidentSchema>;
+const StatusReportsSchema = z.object({
+  data: z.array(
+    z.object({
+      id: z.string(),
+      type: z.literal("status_report"),
+      attributes: z.object({
+        title: z.string().nullable(),
+        starts_at: z.string().nullable(),
+        ends_at: z.string().nullable(),
+        aggregate_state: z.string().nullable(),
+      }),
+    })
+  ),
+  pagination: z.object({
+    first: z.string().nullable(),
+    last: z.string().nullable(),
+    prev: z.string().nullable(),
+    next: z.string().nullable(),
+  }),
+});
+
+export type AggregateState = "operational" | "degraded" | "downtime";
+
+export type IncidentStatus = {
+  status: AggregateState;
+  title: string | null;
+};
+
+type CachedResult =
+  | { success: true; data: IncidentStatus }
+  | { success: false; error: unknown };
 
 const ctx = new DefaultStatefulContext();
-const memory = new MemoryStore({ persistentMap: new Map() });
+const memory = createLRUMemoryStore(100);
 
 const cache = createCache({
-  query: new Namespace<ApiResult<Incident>>(ctx, {
+  query: new Namespace<CachedResult>(ctx, {
     stores: [memory],
     fresh: 15_000,
     stale: 30_000,
@@ -30,59 +60,115 @@ const cache = createCache({
 export class BetterStackClient {
   private readonly baseUrl = "https://uptime.betterstack.com/api/v2";
 
-  async getIncidents() {
+  async getIncidentStatus(): Promise<CachedResult> {
     const apiKey = env.BETTERSTACK_API_KEY;
-    if (!apiKey) {
-      return { success: false as const, error: "BETTERSTACK_API_KEY is not set" };
+    const statusPageId = env.BETTERSTACK_STATUS_PAGE_ID;
+
+    if (!apiKey || !statusPageId) {
+      return { success: false, error: "Missing BetterStack configuration" };
     }
 
-    const statusPageId = env.BETTERSTACK_STATUS_PAGE_ID;
-    if (!statusPageId) {
-      return { success: false as const, error: "BETTERSTACK_STATUS_PAGE_ID is not set" };
+    const cachedResult = await cache.query.swr("betterstack-incident-status", () =>
+      this.fetchIncidentStatus(apiKey, statusPageId)
+    );
+
+    if (cachedResult.err || !cachedResult.val) {
+      return { success: false, error: cachedResult.err ?? "No result from cache" };
     }
 
-    const cachedResult = await cache.query.swr("betterstack", async () => {
-      try {
-        const result = await wrapZodFetch(
-          IncidentSchema,
-          `${this.baseUrl}/status-pages/${statusPageId}`,
-          {
-            headers: {
-              Authorization: `Bearer ${apiKey}`,
-              "Content-Type": "application/json",
-            },
-          },
-          {
-            retry: {
-              maxAttempts: 3,
-              minTimeoutInMs: 1000,
-              maxTimeoutInMs: 5000,
-            },
-          }
-        );
-
-        return result;
-      } catch (error) {
-        console.error("Failed to fetch incidents from BetterStack:", error);
-        return {
-          success: false as const,
-          error: error instanceof Error ? error.message : "Unknown error",
-        };
+    return cachedResult.val;
+  }
+
+  private async fetchIncidentStatus(
+    apiKey: string,
+    statusPageId: string
+  ): Promise<CachedResult> {
+    const headers = {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json",
+    };
+    const retryConfig = {
+      retry: { maxAttempts: 3, minTimeoutInMs: 1000, maxTimeoutInMs: 5000 },
+    };
+
+    try {
+      // Fetch the status page to get aggregate state
+      const statusPageResult = await wrapZodFetch(
+        StatusPageSchema,
+        `${this.baseUrl}/status-pages/${statusPageId}`,
+        { headers },
+        retryConfig
+      );
+
+      if (!statusPageResult.success) {
+        return { success: false, error: statusPageResult.error };
+      }
+
+      const status = statusPageResult.data.data.attributes.aggregate_state;
+
+      // If operational, no need to fetch reports
+      if (status === "operational") {
+        return { success: true, data: { status, title: null } };
       }
-    });
 
-    if (cachedResult.err) {
-      return { success: false as const, error: cachedResult.err };
+      // Fetch status reports to get the incident title
+      const title = await this.fetchActiveReportTitle(apiKey, statusPageId, headers, retryConfig);
+
+      return { success: true, data: { status, title } };
+    } catch (error) {
+      console.error("Failed to fetch incident status from BetterStack:", error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : "Unknown error",
+      };
+    }
+  }
+
+  private async fetchActiveReportTitle(
+    apiKey: string,
+    statusPageId: string,
+    headers: Record<string, string>,
+    retryConfig: { retry: { maxAttempts: number; minTimeoutInMs: number; maxTimeoutInMs: number } }
+  ): Promise<string | null> {
+    const reportsUrl = `${this.baseUrl}/status-pages/${statusPageId}/status-reports`;
+
+    let reportsResult = await wrapZodFetch(
+      StatusReportsSchema,
+      reportsUrl,
+      { headers },
+      retryConfig
+    );
+
+    if (!reportsResult.success) {
+      return null;
     }
 
-    if (!cachedResult.val) {
-      return { success: false as const, error: "No result from BetterStack" };
+    // Fetch last page if there are multiple pages (most recent reports are at the end)
+    const { first, last } = reportsResult.data.pagination;
+    if (last && last !== first) {
+      const lastPageResult = await wrapZodFetch(
+        StatusReportsSchema,
+        last,
+        { headers },
+        retryConfig
+      );
+      if (lastPageResult.success) {
+        reportsResult = lastPageResult;
+      }
     }
 
-    if (!cachedResult.val.success) {
-      return { success: false as const, error: cachedResult.val.error };
+    // Find active reports (not resolved, not ended)
+    const activeReports = reportsResult.data.data.filter(
+      (report) =>
+        report.attributes.aggregate_state !== "resolved" && report.attributes.ends_at === null
+    );
+
+    if (activeReports.length === 0) {
+      return null;
     }
 
-    return { success: true as const, data: cachedResult.val.data.data };
+    // Return the title from the most recent active report
+    const mostRecent = activeReports[activeReports.length - 1];
+    return mostRecent.attributes.title;
   }
 }
diff --git a/apps/webapp/app/services/clickhouseInstance.server.ts b/apps/webapp/app/services/clickhouseInstance.server.ts
index 32fc9bc0d4b..f88b3baaaed 100644
--- a/apps/webapp/app/services/clickhouseInstance.server.ts
+++ b/apps/webapp/app/services/clickhouseInstance.server.ts
@@ -28,3 +28,72 @@ function initializeClickhouseClient() {
 
   return clickhouse;
 }
+
+export const logsClickhouseClient = singleton(
+  "logsClickhouseClient",
+  initializeLogsClickhouseClient
+);
+
+function initializeLogsClickhouseClient() {
+  if (!env.LOGS_CLICKHOUSE_URL) {
+    throw new Error("LOGS_CLICKHOUSE_URL is not set");
+  }
+
+  const url = new URL(env.LOGS_CLICKHOUSE_URL);
+
+  // Remove secure param
+  url.searchParams.delete("secure");
+
+  return new ClickHouse({
+    url: url.toString(),
+    name: "logs-clickhouse",
+    keepAlive: {
+      enabled: env.CLICKHOUSE_KEEP_ALIVE_ENABLED === "1",
+      idleSocketTtl: env.CLICKHOUSE_KEEP_ALIVE_IDLE_SOCKET_TTL_MS,
+    },
+    logLevel: env.CLICKHOUSE_LOG_LEVEL,
+    compression: {
+      request: true,
+    },
+    maxOpenConnections: env.CLICKHOUSE_MAX_OPEN_CONNECTIONS,
+    clickhouseSettings: {
+      max_memory_usage: env.CLICKHOUSE_LOGS_LIST_MAX_MEMORY_USAGE.toString(),
+      max_bytes_before_external_sort:
+        env.CLICKHOUSE_LOGS_LIST_MAX_BYTES_BEFORE_EXTERNAL_SORT.toString(),
+      max_threads: env.CLICKHOUSE_LOGS_LIST_MAX_THREADS,
+      ...(env.CLICKHOUSE_LOGS_LIST_MAX_ROWS_TO_READ && {
+        max_rows_to_read: env.CLICKHOUSE_LOGS_LIST_MAX_ROWS_TO_READ.toString(),
+      }),
+      ...(env.CLICKHOUSE_LOGS_LIST_MAX_EXECUTION_TIME && {
+        max_execution_time: env.CLICKHOUSE_LOGS_LIST_MAX_EXECUTION_TIME,
+      }),
+    },
+  });
+}
+
+export const queryClickhouseClient = singleton(
+  "queryClickhouseClient",
+  initializeQueryClickhouseClient
+);
+
+function initializeQueryClickhouseClient() {
+  if (!env.QUERY_CLICKHOUSE_URL) {
+    throw new Error("QUERY_CLICKHOUSE_URL is not set");
+  }
+
+  const url = new URL(env.QUERY_CLICKHOUSE_URL);
+
+  return new ClickHouse({
+    url: url.toString(),
+    name: "query-clickhouse",
+    keepAlive: {
+      enabled: env.CLICKHOUSE_KEEP_ALIVE_ENABLED === "1",
+      idleSocketTtl: env.CLICKHOUSE_KEEP_ALIVE_IDLE_SOCKET_TTL_MS,
+    },
+    logLevel: env.CLICKHOUSE_LOG_LEVEL,
+    compression: {
+      request: true,
+    },
+    maxOpenConnections: env.CLICKHOUSE_MAX_OPEN_CONNECTIONS,
+  });
+}
diff --git a/apps/webapp/app/services/dashboardPreferences.server.ts b/apps/webapp/app/services/dashboardPreferences.server.ts
index 3649704b811..7af007dc381 100644
--- a/apps/webapp/app/services/dashboardPreferences.server.ts
+++ b/apps/webapp/app/services/dashboardPreferences.server.ts
@@ -3,6 +3,26 @@ import { prisma } from "~/db.server";
 import { logger } from "./logger.server";
 import { type UserFromSession } from "./session.server";
 
+const SideMenuPreferences = z.object({
+  isCollapsed: z.boolean().default(false),
+  // Map for section collapsed states - keys are section identifiers
+  collapsedSections: z.record(z.string(), z.boolean()).optional(),
+  /** Organization-specific settings */
+  organizations: z
+    .record(
+      z.string(),
+      z.object({
+        orderedItems: z.record(z.string(), z.array(z.string())),
+      })
+    )
+    .optional(),
+});
+
+export type SideMenuPreferences = z.infer<typeof SideMenuPreferences>;
+
+import { type SideMenuSectionId } from "~/components/navigation/sideMenuTypes";
+export type { SideMenuSectionId };
+
 const DashboardPreferences = z.object({
   version: z.literal("1"),
   currentProjectId: z.string().optional(),
@@ -12,6 +32,7 @@ const DashboardPreferences = z.object({
       currentEnvironment: z.object({ id: z.string() }),
     })
   ),
+  sideMenu: SideMenuPreferences.optional(),
 });
 
 export type DashboardPreferences = z.infer<typeof DashboardPreferences>;
@@ -99,3 +120,113 @@ export async function clearCurrentProject({ user }: { user: UserFromSession }) {
     },
   });
 }
+
+export async function updateSideMenuPreferences({
+  user,
+  isCollapsed,
+  sectionCollapsed,
+}: {
+  user: UserFromSession;
+  isCollapsed?: boolean;
+  /** Update a specific section's collapsed state */
+  sectionCollapsed?: { sectionId: SideMenuSectionId; collapsed: boolean };
+}) {
+  if (user.isImpersonating) {
+    return;
+  }
+
+  // Parse with schema to apply defaults, then overlay any new values
+  const currentSideMenu = SideMenuPreferences.parse(user.dashboardPreferences.sideMenu ?? {});
+
+  // Build the updated collapsedSections map
+  let updatedCollapsedSections = { ...currentSideMenu.collapsedSections };
+
+  if (sectionCollapsed) {
+    updatedCollapsedSections[sectionCollapsed.sectionId] = sectionCollapsed.collapsed;
+  }
+
+  const updatedSideMenu = SideMenuPreferences.parse({
+    ...currentSideMenu,
+    ...(isCollapsed !== undefined && { isCollapsed }),
+    collapsedSections: updatedCollapsedSections,
+  });
+
+  // Only update if something changed
+  const hasCollapsedSectionsChanged =
+    JSON.stringify(updatedSideMenu.collapsedSections) !==
+    JSON.stringify(currentSideMenu.collapsedSections);
+
+  if (updatedSideMenu.isCollapsed === currentSideMenu.isCollapsed && !hasCollapsedSectionsChanged) {
+    return;
+  }
+
+  const updatedPreferences: DashboardPreferences = {
+    ...user.dashboardPreferences,
+    sideMenu: updatedSideMenu,
+  };
+
+  return prisma.user.update({
+    where: {
+      id: user.id,
+    },
+    data: {
+      dashboardPreferences: updatedPreferences,
+    },
+  });
+}
+
+/** Get the stored item order for a specific list within an organization */
+export function getItemOrder(
+  sideMenu: SideMenuPreferences | undefined,
+  organizationId: string,
+  listId: string
+): string[] | undefined {
+  return sideMenu?.organizations?.[organizationId]?.orderedItems?.[listId];
+}
+
+export async function updateItemOrder({
+  user,
+  organizationId,
+  listId,
+  order,
+}: {
+  user: UserFromSession;
+  organizationId: string;
+  listId: string;
+  order: string[];
+}) {
+  if (user.isImpersonating) {
+    return;
+  }
+
+  const currentSideMenu = SideMenuPreferences.parse(user.dashboardPreferences.sideMenu ?? {});
+  const currentOrg = currentSideMenu.organizations?.[organizationId];
+
+  const updatedSideMenu = SideMenuPreferences.parse({
+    ...currentSideMenu,
+    organizations: {
+      ...currentSideMenu.organizations,
+      [organizationId]: {
+        ...currentOrg,
+        orderedItems: {
+          ...currentOrg?.orderedItems,
+          [listId]: order,
+        },
+      },
+    },
+  });
+
+  const updatedPreferences: DashboardPreferences = {
+    ...user.dashboardPreferences,
+    sideMenu: updatedSideMenu,
+  };
+
+  return prisma.user.update({
+    where: {
+      id: user.id,
+    },
+    data: {
+      dashboardPreferences: updatedPreferences,
+    },
+  });
+}
diff --git a/apps/webapp/app/services/engineRateLimit.server.ts b/apps/webapp/app/services/engineRateLimit.server.ts
index 9eb20342f38..ba043c7fa3c 100644
--- a/apps/webapp/app/services/engineRateLimit.server.ts
+++ b/apps/webapp/app/services/engineRateLimit.server.ts
@@ -1,5 +1,4 @@
 import { env } from "~/env.server";
-import { authenticateAuthorizationHeader } from "./apiAuth.server";
 import { authorizationRateLimitMiddleware } from "./authorizationRateLimitMiddleware.server";
 import { Duration } from "./rateLimiter.server";
 
@@ -22,6 +21,7 @@ export const engineRateLimiter = authorizationRateLimitMiddleware({
   limiterCache: {
     fresh: 60_000 * 10, // Data is fresh for 10 minutes
     stale: 60_000 * 20, // Date is stale after 20 minutes
+    maxItems: 1000,
   },
   pathMatchers: [/^\/engine/],
   // Regex allow any path starting with /engine/v1/worker-actions/
diff --git a/apps/webapp/app/services/gitHub.server.ts b/apps/webapp/app/services/gitHub.server.ts
new file mode 100644
index 00000000000..4363c680502
--- /dev/null
+++ b/apps/webapp/app/services/gitHub.server.ts
@@ -0,0 +1,190 @@
+import { App, type Octokit } from "octokit";
+import { env } from "../env.server";
+import { prisma } from "~/db.server";
+import { logger } from "./logger.server";
+import { errAsync, fromPromise, okAsync, type ResultAsync } from "neverthrow";
+
+export const githubApp =
+  env.GITHUB_APP_ENABLED === "1"
+    ? new App({
+        appId: env.GITHUB_APP_ID,
+        privateKey: env.GITHUB_APP_PRIVATE_KEY,
+        webhooks: {
+          secret: env.GITHUB_APP_WEBHOOK_SECRET,
+        },
+      })
+    : null;
+
+/**
+ * Links a GitHub App installation to a Trigger organization
+ */
+export async function linkGitHubAppInstallation(
+  installationId: number,
+  organizationId: string
+): Promise<void> {
+  if (!githubApp) {
+    throw new Error("GitHub App is not enabled");
+  }
+
+  const octokit = await githubApp.getInstallationOctokit(installationId);
+  const { data: installation } = await octokit.rest.apps.getInstallation({
+    installation_id: installationId,
+  });
+
+  const repositories = await fetchInstallationRepositories(octokit, installationId);
+
+  const repositorySelection = installation.repository_selection === "all" ? "ALL" : "SELECTED";
+
+  await prisma.githubAppInstallation.create({
+    data: {
+      appInstallationId: installationId,
+      organizationId,
+      targetId: installation.target_id,
+      targetType: installation.target_type,
+      accountHandle: installation.account
+        ? "login" in installation.account
+          ? installation.account.login
+          : "slug" in installation.account
+          ? installation.account.slug
+          : "-"
+        : "-",
+      permissions: installation.permissions,
+      repositorySelection,
+      repositories: {
+        create: repositories,
+      },
+    },
+  });
+}
+
+/**
+ * Links a GitHub App installation to a Trigger organization
+ */
+export async function updateGitHubAppInstallation(installationId: number): Promise<void> {
+  if (!githubApp) {
+    throw new Error("GitHub App is not enabled");
+  }
+
+  const octokit = await githubApp.getInstallationOctokit(installationId);
+  const { data: installation } = await octokit.rest.apps.getInstallation({
+    installation_id: installationId,
+  });
+
+  const existingInstallation = await prisma.githubAppInstallation.findFirst({
+    where: { appInstallationId: installationId },
+  });
+
+  if (!existingInstallation) {
+    throw new Error("GitHub App installation not found");
+  }
+
+  const repositorySelection = installation.repository_selection === "all" ? "ALL" : "SELECTED";
+
+  // repos are updated asynchronously via webhook events
+  await prisma.githubAppInstallation.update({
+    where: { id: existingInstallation?.id },
+    data: {
+      appInstallationId: installationId,
+      targetId: installation.target_id,
+      targetType: installation.target_type,
+      accountHandle: installation.account
+        ? "login" in installation.account
+          ? installation.account.login
+          : "slug" in installation.account
+          ? installation.account.slug
+          : "-"
+        : "-",
+      permissions: installation.permissions,
+      suspendedAt: existingInstallation?.suspendedAt,
+      repositorySelection,
+    },
+  });
+}
+
+async function fetchInstallationRepositories(octokit: Octokit, installationId: number) {
+  const iterator = octokit.paginate.iterator(octokit.rest.apps.listReposAccessibleToInstallation, {
+    installation_id: installationId,
+    per_page: 100,
+  });
+
+  const allRepos = [];
+  const maxPages = 3;
+  let pageCount = 0;
+
+  for await (const { data } of iterator) {
+    pageCount++;
+    allRepos.push(...data);
+
+    if (maxPages && pageCount >= maxPages) {
+      logger.warn("GitHub installation repository fetch truncated", {
+        installationId,
+        maxPages,
+        totalReposFetched: allRepos.length,
+      });
+      break;
+    }
+  }
+
+  return allRepos.map((repo) => ({
+    githubId: repo.id,
+    name: repo.name,
+    fullName: repo.full_name,
+    htmlUrl: repo.html_url,
+    private: repo.private,
+    defaultBranch: repo.default_branch,
+  }));
+}
+
+/**
+ * Checks if a branch exists in a GitHub repository
+ */
+export function checkGitHubBranchExists(
+  installationId: number,
+  fullRepoName: string,
+  branch: string
+): ResultAsync<boolean, { type: "other" | "github_app_not_enabled"; cause?: unknown }> {
+  if (!githubApp) {
+    return errAsync({ type: "github_app_not_enabled" as const });
+  }
+
+  if (!branch || branch.trim() === "") {
+    return okAsync(false);
+  }
+
+  const [owner, repo] = fullRepoName.split("/");
+
+  const getOctokit = () =>
+    fromPromise(githubApp.getInstallationOctokit(installationId), (error) => ({
+      type: "other" as const,
+      cause: error,
+    }));
+
+  const getBranch = (octokit: Octokit) =>
+    fromPromise(
+      octokit.rest.repos.getBranch({
+        owner,
+        repo,
+        branch,
+      }),
+      (error) => ({
+        type: "other" as const,
+        cause: error,
+      })
+    );
+
+  return getOctokit()
+    .andThen((octokit) => getBranch(octokit))
+    .map(() => true)
+    .orElse((error) => {
+      if (
+        error.cause &&
+        error.cause instanceof Error &&
+        "status" in error.cause &&
+        error.cause.status === 404
+      ) {
+        return okAsync(false);
+      }
+
+      return errAsync(error);
+    });
+}
diff --git a/apps/webapp/app/services/gitHubAuth.server.ts b/apps/webapp/app/services/gitHubAuth.server.ts
index b38b7004f8c..981a22a2d0a 100644
--- a/apps/webapp/app/services/gitHubAuth.server.ts
+++ b/apps/webapp/app/services/gitHubAuth.server.ts
@@ -20,7 +20,7 @@ export function addGitHubStrategy(
     async ({ extraParams, profile }) => {
       const emails = profile.emails;
 
-      if (!emails) {
+      if (!emails?.length) {
         throw new Error("GitHub login requires an email address");
       }
 
diff --git a/apps/webapp/app/services/gitHubSession.server.ts b/apps/webapp/app/services/gitHubSession.server.ts
new file mode 100644
index 00000000000..499c1dff1ac
--- /dev/null
+++ b/apps/webapp/app/services/gitHubSession.server.ts
@@ -0,0 +1,124 @@
+import { createCookieSessionStorage } from "@remix-run/node";
+import { randomBytes } from "crypto";
+import { env } from "../env.server";
+import { logger } from "./logger.server";
+
+const sessionStorage = createCookieSessionStorage({
+  cookie: {
+    name: "__github_app_install",
+    httpOnly: true,
+    maxAge: 60 * 60, // 1 hour
+    path: "/",
+    sameSite: "lax",
+    secrets: [env.SESSION_SECRET],
+    secure: env.NODE_ENV === "production",
+  },
+});
+
+/**
+ * Creates a secure session for GitHub App installation with organization tracking
+ */
+export async function createGitHubAppInstallSession(
+  organizationId: string,
+  redirectTo: string
+): Promise<{ url: string; cookieHeader: string }> {
+  if (env.GITHUB_APP_ENABLED !== "1") {
+    throw new Error("GitHub App is not enabled");
+  }
+
+  const state = randomBytes(32).toString("hex");
+
+  const session = await sessionStorage.getSession();
+  session.set("organizationId", organizationId);
+  session.set("redirectTo", redirectTo);
+  session.set("state", state);
+  session.set("createdAt", Date.now());
+
+  const githubAppSlug = env.GITHUB_APP_SLUG;
+
+  // the state query param gets passed through to the installation callback
+  const url = `https://github.com/apps/${githubAppSlug}/installations/new?state=${state}`;
+
+  const cookieHeader = await sessionStorage.commitSession(session);
+
+  return { url, cookieHeader };
+}
+
+/**
+ * Validates and retrieves the GitHub App installation session
+ */
+export async function validateGitHubAppInstallSession(
+  cookieHeader: string | null,
+  state: string
+): Promise<
+  { valid: true; organizationId: string; redirectTo: string } | { valid: false; error?: string }
+> {
+  if (!cookieHeader) {
+    return {
+      valid: false,
+      error: "No installation session cookie found",
+    };
+  }
+
+  const session = await sessionStorage.getSession(cookieHeader);
+
+  const sessionState = session.get("state");
+  const organizationId = session.get("organizationId");
+  const redirectTo = session.get("redirectTo");
+  const createdAt = session.get("createdAt");
+
+  if (!sessionState || !organizationId || !createdAt || !redirectTo) {
+    logger.warn("GitHub App installation session missing required fields", {
+      hasState: !!sessionState,
+      hasOrgId: !!organizationId,
+      hasCreatedAt: !!createdAt,
+      hasRedirectTo: !!redirectTo,
+    });
+
+    return {
+      valid: false,
+      error: "invalid_session_data",
+    };
+  }
+
+  if (sessionState !== state) {
+    logger.warn("GitHub App installation state mismatch", {
+      expectedState: sessionState,
+      receivedState: state,
+    });
+    return {
+      valid: false,
+      error: "state_mismatch",
+    };
+  }
+
+  const expirationTime = createdAt + 60 * 60 * 1000;
+  if (Date.now() > expirationTime) {
+    logger.warn("GitHub App installation session expired", {
+      createdAt: new Date(createdAt),
+      now: new Date(),
+    });
+    return {
+      valid: false,
+      error: "session_expired",
+    };
+  }
+
+  return {
+    valid: true,
+    organizationId,
+    redirectTo,
+  };
+}
+
+/**
+ * Destroys the GitHub App installation cookie session
+ */
+export async function destroyGitHubAppInstallSession(cookieHeader: string | null): Promise<string> {
+  if (!cookieHeader) {
+    return "";
+  }
+
+  const session = await sessionStorage.getSession(cookieHeader);
+  return await sessionStorage.destroySession(session);
+}
diff --git a/apps/webapp/app/services/googleAuth.server.ts b/apps/webapp/app/services/googleAuth.server.ts
new file mode 100644
index 00000000000..bcd227f2e97
--- /dev/null
+++ b/apps/webapp/app/services/googleAuth.server.ts
@@ -0,0 +1,54 @@
+import type { Authenticator } from "remix-auth";
+import { GoogleStrategy } from "remix-auth-google";
+import { env } from "~/env.server";
+import { findOrCreateUser } from "~/models/user.server";
+import type { AuthUser } from "./authUser";
+import { logger } from "./logger.server";
+import { postAuthentication } from "./postAuth.server";
+
+export function addGoogleStrategy(
+  authenticator: Authenticator<AuthUser>,
+  clientID: string,
+  clientSecret: string
+) {
+  const googleStrategy = new GoogleStrategy(
+    {
+      clientID,
+      clientSecret,
+      callbackURL: `${env.LOGIN_ORIGIN}/auth/google/callback`,
+    },
+    async ({ extraParams, profile }) => {
+      const emails = profile.emails;
+
+      if (!emails?.length) {
+        throw new Error("Google login requires an email address");
+      }
+
+      try {
+        logger.debug("Google login", {
+          emails,
+          profile,
+          extraParams,
+        });
+
+        const { user, isNewUser } = await findOrCreateUser({
+          email: emails[0].value,
+          authenticationMethod: "GOOGLE",
+          authenticationProfile: profile,
+          authenticationExtraParams: extraParams,
+        });
+
+        await postAuthentication({ user, isNewUser, loginMethod: "GOOGLE" });
+
+        return {
+          userId: user.id,
+        };
+      } catch (error) {
+        logger.error("Google login failed", { error: JSON.stringify(error) });
+        throw error;
+      }
+    }
+  );
+
+  authenticator.use(googleStrategy);
+}
diff --git a/apps/webapp/app/services/lastAuthMethod.server.ts b/apps/webapp/app/services/lastAuthMethod.server.ts
new file mode 100644
index 00000000000..e058ea73a02
--- /dev/null
+++ b/apps/webapp/app/services/lastAuthMethod.server.ts
@@ -0,0 +1,25 @@
+import { createCookie } from "@remix-run/node";
+import { env } from "~/env.server";
+
+export type LastAuthMethod = "github" | "google" | "email";
+
+// Cookie that persists for 1 year to remember the user's last login method
+export const lastAuthMethodCookie = createCookie("last-auth-method", {
+  maxAge: 60 * 60 * 24 * 365, // 1 year
+  httpOnly: true,
+  sameSite: "lax",
+  secure: env.NODE_ENV === "production",
+});
+
+export async function getLastAuthMethod(request: Request): Promise<LastAuthMethod | null> {
+  const cookie = request.headers.get("Cookie");
+  const value = await lastAuthMethodCookie.parse(cookie);
+  if (value === "github" || value === "google" || value === "email") {
+    return value;
+  }
+  return null;
+}
+
+export async function setLastAuthMethodHeader(method: LastAuthMethod): Promise<string> {
+  return lastAuthMethodCookie.serialize(method);
+}
diff --git a/apps/webapp/app/services/logger.server.ts b/apps/webapp/app/services/logger.server.ts
index 2d208bca07a..be5baff9c85 100644
--- a/apps/webapp/app/services/logger.server.ts
+++ b/apps/webapp/app/services/logger.server.ts
@@ -3,6 +3,7 @@ import { Logger } from "@trigger.dev/core/logger";
 import { sensitiveDataReplacer } from "./sensitiveDataReplacer";
 import { AsyncLocalStorage } from "async_hooks";
 import { getHttpContext } from "./httpAsyncStorage.server";
+import { captureException, captureMessage } from "@sentry/remix";
 
 const currentFieldsStore = new AsyncLocalStorage<Record<string, unknown>>();
 
@@ -10,6 +11,41 @@ export function trace<T>(fields: Record<string, unknown>, fn: () => T): T {
   return currentFieldsStore.run(fields, fn);
 }
 
+Logger.onError = (message, ...args) => {
+  const error = extractErrorFromArgs(args);
+
+  if (error) {
+    captureException(error, {
+      extra: {
+        message,
+        ...flattenArgs(args),
+      },
+    });
+  } else {
+    captureMessage(message, {
+      level: "error",
+      extra: flattenArgs(args),
+    });
+  }
+};
+
+function extractErrorFromArgs(args: Array<Record<string, unknown> | undefined>) {
+  for (const arg of args) {
+    if (arg && "error" in arg && arg.error instanceof Error) {
+      return arg.error;
+    }
+  }
+  return;
+}
+
+function flattenArgs(args: Array<Record<string, unknown> | undefined>) {
+  return args.reduce((acc, arg) => {
+    if (arg) {
+      return { ...acc, ...arg };
+    }
+    return acc;
+  }, {});
+}
 export const logger = new Logger(
   "webapp",
   (process.env.APP_LOG_LEVEL ?? "debug") as LogLevel,
diff --git a/apps/webapp/app/services/magicLinkRateLimiter.server.ts b/apps/webapp/app/services/magicLinkRateLimiter.server.ts
new file mode 100644
index 00000000000..2944e467960
--- /dev/null
+++ b/apps/webapp/app/services/magicLinkRateLimiter.server.ts
@@ -0,0 +1,96 @@
+import { Ratelimit } from "@upstash/ratelimit";
+import { env } from "~/env.server";
+import { createRedisRateLimitClient, RateLimiter } from "~/services/rateLimiter.server";
+import { singleton } from "~/utils/singleton";
+
+export class MagicLinkRateLimitError extends Error {
+  public readonly retryAfter: number;
+
+  constructor(retryAfter: number) {
+    super("Magic link request rate limit exceeded.");
+    this.retryAfter = retryAfter;
+  }
+}
+
+function getRedisClient() {
+  return createRedisRateLimitClient({
+    port: env.RATE_LIMIT_REDIS_PORT,
+    host: env.RATE_LIMIT_REDIS_HOST,
+    username: env.RATE_LIMIT_REDIS_USERNAME,
+    password: env.RATE_LIMIT_REDIS_PASSWORD,
+    tlsDisabled: env.RATE_LIMIT_REDIS_TLS_DISABLED === "true",
+    clusterMode: env.RATE_LIMIT_REDIS_CLUSTER_MODE_ENABLED === "1",
+  });
+}
+
+const magicLinkEmailRateLimiter = singleton(
+  "magicLinkEmailRateLimiter",
+  initializeMagicLinkEmailRateLimiter
+);
+
+function initializeMagicLinkEmailRateLimiter() {
+  return new RateLimiter({
+    redisClient: getRedisClient(),
+    keyPrefix: "auth:magiclink:email",
+    limiter: Ratelimit.slidingWindow(3, "1 m"), // 3 requests per minute per email
+    logSuccess: false,
+    logFailure: true,
+  });
+}
+
+const magicLinkEmailDailyRateLimiter = singleton(
+  "magicLinkEmailDailyRateLimiter",
+  initializeMagicLinkEmailDailyRateLimiter
+);
+
+function initializeMagicLinkEmailDailyRateLimiter() {
+  return new RateLimiter({
+    redisClient: getRedisClient(),
+    keyPrefix: "auth:magiclink:email:daily",
+    limiter: Ratelimit.slidingWindow(30, "1 d"), // 30 requests per day per email
+    logSuccess: false,
+    logFailure: true,
+  });
+}
+
+const magicLinkIpRateLimiter = singleton(
+  "magicLinkIpRateLimiter",
+  initializeMagicLinkIpRateLimiter
+);
+
+function initializeMagicLinkIpRateLimiter() {
+  return new RateLimiter({
+    redisClient: getRedisClient(),
+    keyPrefix: "auth:magiclink:ip",
+    limiter: Ratelimit.slidingWindow(10, "1 m"), // 10 requests per minute per IP
+    logSuccess: false,
+    logFailure: true,
+  });
+}
+
+export async function checkMagicLinkEmailRateLimit(identifier: string): Promise<void> {
+  const result = await magicLinkEmailRateLimiter.limit(identifier);
+
+  if (!result.success) {
+    const retryAfter = new Date(result.reset).getTime() - Date.now();
+    throw new MagicLinkRateLimitError(retryAfter);
+  }
+}
+
+export async function checkMagicLinkEmailDailyRateLimit(identifier: string): Promise<void> {
+  const result = await magicLinkEmailDailyRateLimiter.limit(identifier);
+
+  if (!result.success) {
+    const retryAfter = new Date(result.reset).getTime() - Date.now();
+    throw new MagicLinkRateLimitError(retryAfter);
+  }
+}
+
+export async function checkMagicLinkIpRateLimit(ip: string): Promise<void> {
+  const result = await magicLinkIpRateLimiter.limit(ip);
+
+  if (!result.success) {
+    const retryAfter = new Date(result.reset).getTime() - Date.now();
+    throw new MagicLinkRateLimitError(retryAfter);
+  }
+}
diff --git a/apps/webapp/app/services/org.server.ts b/apps/webapp/app/services/org.server.ts
new file mode 100644
index 00000000000..75c1467ab24
--- /dev/null
+++ b/apps/webapp/app/services/org.server.ts
@@ -0,0 +1,20 @@
+import { prisma } from "~/db.server";
+import { requireUserId } from "./session.server";
+
+export async function requireOrganization(request: Request, organizationSlug: string) {
+  const userId = await requireUserId(request);
+  
+  const organization = await prisma.organization.findFirst({
+    where: {
+      slug: organizationSlug,
+      members: { some: { userId } },
+      deletedAt: null,
+    },
+  });
+
+  if (!organization) {
+    throw new Response("Organization not found", { status: 404 });
+  }
+
+  return { organization, userId };
+}
diff --git a/apps/webapp/app/services/organizationAccessToken.server.ts b/apps/webapp/app/services/organizationAccessToken.server.ts
new file mode 100644
index 00000000000..ba11374c24d
--- /dev/null
+++ b/apps/webapp/app/services/organizationAccessToken.server.ts
@@ -0,0 +1,159 @@
+import { customAlphabet } from "nanoid";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { logger } from "./logger.server";
+import { hashToken } from "~/utils/tokens.server";
+
+const tokenValueLength = 40;
+//lowercase only, removed 0 and l to avoid confusion
+const tokenGenerator = customAlphabet("123456789abcdefghijkmnopqrstuvwxyz", tokenValueLength);
+
+type CreateOrganizationAccessTokenOptions = {
+  name: string;
+  organizationId: string;
+  expiresAt?: Date;
+};
+
+export async function getValidOrganizationAccessTokens(organizationId: string) {
+  const organizationAccessTokens = await prisma.organizationAccessToken.findMany({
+    select: {
+      id: true,
+      name: true,
+      createdAt: true,
+      lastAccessedAt: true,
+      expiresAt: true,
+    },
+    where: {
+      organizationId,
+      revokedAt: null,
+      OR: [{ expiresAt: null }, { expiresAt: { gte: new Date() } }],
+    },
+  });
+
+  return organizationAccessTokens.map((oat) => ({
+    id: oat.id,
+    name: oat.name,
+    createdAt: oat.createdAt,
+    lastAccessedAt: oat.lastAccessedAt,
+    expiresAt: oat.expiresAt,
+  }));
+}
+
+export type ObfuscatedOrganizationAccessToken = Awaited<
+  ReturnType<typeof getValidOrganizationAccessTokens>
+>[number];
+
+export async function revokeOrganizationAccessToken(tokenId: string) {
+  await prisma.organizationAccessToken.update({
+    where: {
+      id: tokenId,
+    },
+    data: {
+      revokedAt: new Date(),
+    },
+  });
+}
+
+export type OrganizationAccessTokenAuthenticationResult = {
+  organizationId: string;
+};
+
+const AuthorizationHeaderSchema = z.string().regex(/^Bearer .+$/);
+
+export async function authenticateApiRequestWithOrganizationAccessToken(
+  request: Request
+): Promise<OrganizationAccessTokenAuthenticationResult | undefined> {
+  const token = getOrganizationAccessTokenFromRequest(request);
+  if (!token) {
+    return;
+  }
+
+  return authenticateOrganizationAccessToken(token);
+}
+
+function getOrganizationAccessTokenFromRequest(request: Request) {
+  const rawAuthorization = request.headers.get("Authorization");
+
+  const authorization = AuthorizationHeaderSchema.safeParse(rawAuthorization);
+  if (!authorization.success) {
+    return;
+  }
+
+  const organizationAccessToken = authorization.data.replace(/^Bearer /, "");
+  return organizationAccessToken;
+}
+
+export async function authenticateOrganizationAccessToken(
+  token: string
+): Promise<OrganizationAccessTokenAuthenticationResult | undefined> {
+  if (!token.startsWith(tokenPrefix)) {
+    logger.warn(`OAT doesn't start with ${tokenPrefix}`);
+    return;
+  }
+
+  const hashedToken = hashToken(token);
+
+  const organizationAccessToken = await prisma.organizationAccessToken.findFirst({
+    where: {
+      hashedToken,
+      revokedAt: null,
+      OR: [{ expiresAt: null }, { expiresAt: { gte: new Date() } }],
+    },
+  });
+
+  if (!organizationAccessToken) {
+    return;
+  }
+
+  await prisma.organizationAccessToken.update({
+    where: {
+      id: organizationAccessToken.id,
+    },
+    data: {
+      lastAccessedAt: new Date(),
+    },
+  });
+
+  return {
+    organizationId: organizationAccessToken.organizationId,
+  };
+}
+
+export function isOrganizationAccessToken(token: string) {
+  return token.startsWith(tokenPrefix);
+}
+
+export async function createOrganizationAccessToken({
+  name,
+  organizationId,
+  expiresAt,
+}: CreateOrganizationAccessTokenOptions) {
+  const token = createToken();
+
+  const organizationAccessToken = await prisma.organizationAccessToken.create({
+    data: {
+      name,
+      organizationId,
+      hashedToken: hashToken(token),
+      expiresAt,
+    },
+  });
+
+  return {
+    id: organizationAccessToken.id,
+    name,
+    organizationId,
+    token,
+    expiresAt: organizationAccessToken.expiresAt,
+  };
+}
+
+export type CreatedOrganizationAccessToken = Awaited<
+  ReturnType<typeof createOrganizationAccessToken>
+>;
+
+const tokenPrefix = "tr_oat_";
+
+function createToken() {
+  return `${tokenPrefix}${tokenGenerator()}`;
+}
diff --git a/apps/webapp/app/services/personalAccessToken.server.ts b/apps/webapp/app/services/personalAccessToken.server.ts
index f48582ec9b5..ebe8bc31ff5 100644
--- a/apps/webapp/app/services/personalAccessToken.server.ts
+++ b/apps/webapp/app/services/personalAccessToken.server.ts
@@ -1,10 +1,10 @@
-import { PersonalAccessToken } from "@trigger.dev/database";
+import { type PersonalAccessToken } from "@trigger.dev/database";
 import { customAlphabet, nanoid } from "nanoid";
-import nodeCrypto from "node:crypto";
 import { z } from "zod";
 import { prisma } from "~/db.server";
-import { env } from "~/env.server";
 import { logger } from "./logger.server";
+import { decryptToken, encryptToken, hashToken } from "~/utils/tokens.server";
+import { env } from "~/env.server";
 
 const tokenValueLength = 40;
 //lowercase only, removed 0 and l to avoid confusion
@@ -79,15 +79,20 @@ export async function getPersonalAccessTokenFromAuthorizationCode(authorizationC
   };
 }
 
-export async function revokePersonalAccessToken(tokenId: string) {
-  await prisma.personalAccessToken.update({
+export async function revokePersonalAccessToken(tokenId: string, userId: string) {
+  const result = await prisma.personalAccessToken.updateMany({
     where: {
       id: tokenId,
+      userId,
     },
     data: {
       revokedAt: new Date(),
     },
   });
+
+  if (result.count === 0) {
+    throw new Error("PAT not found or already revoked");
+  }
 }
 
 export type PersonalAccessTokenAuthenticationResult = {
@@ -266,7 +271,7 @@ export async function createPersonalAccessToken({
   userId,
 }: CreatePersonalAccessTokenOptions) {
   const token = createToken();
-  const encryptedToken = encryptToken(token);
+  const encryptedToken = encryptToken(token, env.ENCRYPTION_KEY);
 
   const personalAccessToken = await prisma.personalAccessToken.create({
     data: {
@@ -303,22 +308,6 @@ function obfuscateToken(token: string) {
   return `${tokenPrefix}${obfuscated}`;
 }
 
-function encryptToken(value: string) {
-  const nonce = nodeCrypto.randomBytes(12);
-  const cipher = nodeCrypto.createCipheriv("aes-256-gcm", env.ENCRYPTION_KEY, nonce);
-
-  let encrypted = cipher.update(value, "utf8", "hex");
-  encrypted += cipher.final("hex");
-
-  const tag = cipher.getAuthTag().toString("hex");
-
-  return {
-    nonce: nonce.toString("hex"),
-    ciphertext: encrypted,
-    tag,
-  };
-}
-
 function decryptPersonalAccessToken(personalAccessToken: PersonalAccessToken) {
   const encryptedData = EncryptedSecretValueSchema.safeParse(personalAccessToken.encryptedToken);
   if (!encryptedData.success) {
@@ -330,28 +319,8 @@ function decryptPersonalAccessToken(personalAccessToken: PersonalAccessToken) {
   const decryptedToken = decryptToken(
     encryptedData.data.nonce,
     encryptedData.data.ciphertext,
-    encryptedData.data.tag
+    encryptedData.data.tag,
+    env.ENCRYPTION_KEY
   );
   return decryptedToken;
 }
-
-function decryptToken(nonce: string, ciphertext: string, tag: string): string {
-  const decipher = nodeCrypto.createDecipheriv(
-    "aes-256-gcm",
-    env.ENCRYPTION_KEY,
-    Buffer.from(nonce, "hex")
-  );
-
-  decipher.setAuthTag(Buffer.from(tag, "hex"));
-
-  let decrypted = decipher.update(ciphertext, "hex", "utf8");
-  decrypted += decipher.final("utf8");
-
-  return decrypted;
-}
-
-function hashToken(token: string): string {
-  const hash = nodeCrypto.createHash("sha256");
-  hash.update(token);
-  return hash.digest("hex");
-}
diff --git a/apps/webapp/app/services/platform.v3.server.ts b/apps/webapp/app/services/platform.v3.server.ts
index 40d0c87bf48..2fc4c8c5c1f 100644
--- a/apps/webapp/app/services/platform.v3.server.ts
+++ b/apps/webapp/app/services/platform.v3.server.ts
@@ -1,17 +1,24 @@
-import type { Organization, Project } from "@trigger.dev/database";
+import { MachinePresetName, tryCatch } from "@trigger.dev/core/v3";
+import type { Organization, Project, RuntimeEnvironmentType } from "@trigger.dev/database";
 import {
   BillingClient,
-  type Limits,
-  type SetPlanBody,
-  type UsageSeriesParams,
-  type UsageResult,
   defaultMachine as defaultMachineFromPlatform,
   machines as machinesFromPlatform,
+  type BillingAlertsResult,
+  type Limits,
   type MachineCode,
-} from "@trigger.dev/platform/v3";
+  type ReportUsageResult,
+  type SetPlanBody,
+  type UpdateBillingAlertsRequest,
+  type UsageResult,
+  type UsageSeriesParams,
+  type CurrentPlan,
+} from "@trigger.dev/platform";
 import { createCache, DefaultStatefulContext, Namespace } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import { createLRUMemoryStore } from "@internal/cache";
+import { existsSync, readFileSync } from "node:fs";
 import { redirect } from "remix-typedjson";
+import { z } from "zod";
 import { env } from "~/env.server";
 import { redirectWithErrorMessage, redirectWithSuccessMessage } from "~/models/message.server";
 import { createEnvironment } from "~/models/organization.server";
@@ -19,9 +26,7 @@ import { logger } from "~/services/logger.server";
 import { newProjectPath, organizationBillingPath } from "~/utils/pathBuilder";
 import { singleton } from "~/utils/singleton";
 import { RedisCacheStore } from "./unkey/redisCacheStore.server";
-import { existsSync, readFileSync } from "node:fs";
-import { z } from "zod";
-import { MachinePresetName } from "@trigger.dev/core/v3";
+import { $replica } from "~/db.server";
 
 function initializeClient() {
   if (isCloud() && process.env.BILLING_API_URL && process.env.BILLING_API_KEY) {
@@ -40,7 +45,7 @@ const client = singleton("billingClient", initializeClient);
 
 function initializePlatformCache() {
   const ctx = new DefaultStatefulContext();
-  const memory = new MemoryStore({ persistentMap: new Map() });
+  const memory = createLRUMemoryStore(1000);
   const redisCacheStore = new RedisCacheStore({
     connection: {
       keyPrefix: "tr:cache:platform:v3",
@@ -195,7 +200,7 @@ export async function getCurrentPlan(orgId: string) {
     firstDayOfNextMonth.setUTCHours(0, 0, 0, 0);
 
     if (!result.success) {
-      logger.error("Error getting current plan", { orgId, error: result.error });
+      logger.error("Error getting current plan - no success", { orgId, error: result.error });
       return undefined;
     }
 
@@ -211,7 +216,7 @@ export async function getCurrentPlan(orgId: string) {
 
     return { ...result, usage };
   } catch (e) {
-    logger.error("Error getting current plan", { orgId, error: e });
+    logger.error("Error getting current plan - caught error", { orgId, error: e });
     return undefined;
   }
 }
@@ -222,13 +227,13 @@ export async function getLimits(orgId: string) {
   try {
     const result = await client.currentPlan(orgId);
     if (!result.success) {
-      logger.error("Error getting limits", { orgId, error: result.error });
+      logger.error("Error getting limits - no success", { orgId, error: result.error });
       return undefined;
     }
 
     return result.v3Subscription?.plan?.limits;
   } catch (e) {
-    logger.error("Error getting limits", { orgId, error: e });
+    logger.error("Error getting limits - caught error", { orgId, error: e });
     return undefined;
   }
 }
@@ -244,6 +249,52 @@ export async function getLimit(orgId: string, limit: keyof Limits, fallback: num
   return fallback;
 }
 
+export async function getDefaultEnvironmentConcurrencyLimit(
+  organizationId: string,
+  environmentType: RuntimeEnvironmentType
+): Promise<number> {
+  if (!client) {
+    const org = await $replica.organization.findFirst({
+      where: {
+        id: organizationId,
+      },
+      select: {
+        maximumConcurrencyLimit: true,
+      },
+    });
+    if (!org) throw new Error("Organization not found");
+    return org.maximumConcurrencyLimit;
+  }
+
+  const result = await client.currentPlan(organizationId);
+  if (!result.success) throw new Error("Error getting current plan");
+
+  const limit = getDefaultEnvironmentLimitFromPlan(environmentType, result);
+  if (!limit) throw new Error("No plan found");
+
+  return limit;
+}
+
+export function getDefaultEnvironmentLimitFromPlan(
+  environmentType: RuntimeEnvironmentType,
+  plan: CurrentPlan
+): number | undefined {
+  if (!plan.v3Subscription?.plan) return undefined;
+
+  switch (environmentType) {
+    case "DEVELOPMENT":
+      return plan.v3Subscription.plan.limits.concurrentRuns.development;
+    case "STAGING":
+      return plan.v3Subscription.plan.limits.concurrentRuns.staging;
+    case "PREVIEW":
+      return plan.v3Subscription.plan.limits.concurrentRuns.preview;
+    case "PRODUCTION":
+      return plan.v3Subscription.plan.limits.concurrentRuns.production;
+    default:
+      return plan.v3Subscription.plan.limits.concurrentRuns.number;
+  }
+}
+
 export async function getCachedLimit(orgId: string, limit: keyof Limits, fallback: number) {
   return platformCache.limits.swr(`${orgId}:${limit}`, async () => {
     return getLimit(orgId, limit, fallback);
@@ -269,12 +320,12 @@ export async function getPlans() {
   try {
     const result = await client.plans();
     if (!result.success) {
-      logger.error("Error getting plans", { error: result.error });
+      logger.error("Error getting plans - no success", { error: result.error });
       return undefined;
     }
     return result;
   } catch (e) {
-    logger.error("Error getting plans", { error: e });
+    logger.error("Error getting plans - caught error", { error: e });
     return undefined;
   }
 }
@@ -283,59 +334,78 @@ export async function setPlan(
   organization: { id: string; slug: string },
   request: Request,
   callerPath: string,
-  plan: SetPlanBody
+  plan: SetPlanBody,
+  opts?: { invalidateBillingCache?: (orgId: string) => void }
 ) {
   if (!client) {
-    throw redirectWithErrorMessage(callerPath, request, "Error setting plan");
+    return redirectWithErrorMessage(callerPath, request, "Error setting plan", {
+      ephemeral: false,
+    });
   }
 
-  try {
-    const result = await client.setPlan(organization.id, plan);
+  const [error, result] = await tryCatch(client.setPlan(organization.id, plan));
 
-    if (!result) {
-      throw redirectWithErrorMessage(callerPath, request, "Error setting plan");
-    }
+  if (error) {
+    return redirectWithErrorMessage(callerPath, request, error.message, { ephemeral: false });
+  }
 
-    if (!result.success) {
-      throw redirectWithErrorMessage(callerPath, request, result.error);
-    }
+  if (!result) {
+    return redirectWithErrorMessage(callerPath, request, "Error setting plan", {
+      ephemeral: false,
+    });
+  }
 
-    switch (result.action) {
-      case "free_connect_required": {
-        return redirect(result.connectUrl);
-      }
-      case "free_connected": {
-        if (result.accepted) {
-          return redirect(newProjectPath(organization, "You're on the Free plan."));
-        } else {
-          return redirectWithErrorMessage(
-            callerPath,
-            request,
-            "Free tier unlock failed, your GitHub account is too new."
-          );
-        }
-      }
-      case "create_subscription_flow_start": {
-        return redirect(result.checkoutUrl);
-      }
-      case "updated_subscription": {
-        return redirectWithSuccessMessage(
+  if (!result.success) {
+    return redirectWithErrorMessage(callerPath, request, result.error, { ephemeral: false });
+  }
+
+  switch (result.action) {
+    case "free_connect_required": {
+      return redirect(result.connectUrl);
+    }
+    case "free_connected": {
+      if (result.accepted) {
+        // Invalidate billing cache since plan changed
+        opts?.invalidateBillingCache?.(organization.id);
+        return redirect(newProjectPath(organization, "You're on the Free plan."));
+      } else {
+        return redirectWithErrorMessage(
           callerPath,
           request,
-          "Subscription updated successfully."
+          "Free tier unlock failed, your GitHub account is too new.",
+          { ephemeral: false }
         );
       }
-      case "canceled_subscription": {
-        return redirectWithSuccessMessage(callerPath, request, "Subscription canceled.");
-      }
     }
+    case "create_subscription_flow_start": {
+      return redirect(result.checkoutUrl);
+    }
+    case "updated_subscription": {
+      // Invalidate billing cache since subscription changed
+      opts?.invalidateBillingCache?.(organization.id);
+      return redirectWithSuccessMessage(callerPath, request, "Subscription updated successfully.");
+    }
+    case "canceled_subscription": {
+      // Invalidate billing cache since subscription was canceled
+      opts?.invalidateBillingCache?.(organization.id);
+      return redirectWithSuccessMessage(callerPath, request, "Subscription canceled.");
+    }
+  }
+}
+
+export async function setConcurrencyAddOn(organizationId: string, amount: number) {
+  if (!client) return undefined;
+
+  try {
+    const result = await client.setAddOn(organizationId, { type: "concurrency", amount });
+    if (!result.success) {
+      logger.error("Error setting concurrency add on - no success", { error: result.error });
+      return undefined;
+    }
+    return result;
   } catch (e) {
-    logger.error("Error setting plan", { organizationId: organization.id, error: e });
-    throw redirectWithErrorMessage(
-      callerPath,
-      request,
-      e instanceof Error ? e.message : "Error setting plan"
-    );
+    logger.error("Error setting concurrency add on - caught error", { error: e });
+    return undefined;
   }
 }
 
@@ -345,12 +415,12 @@ export async function getUsage(organizationId: string, { from, to }: { from: Dat
   try {
     const result = await client.usage(organizationId, { from, to });
     if (!result.success) {
-      logger.error("Error getting usage", { error: result.error });
+      logger.error("Error getting usage - no success", { error: result.error });
       return undefined;
     }
     return result;
   } catch (e) {
-    logger.error("Error getting usage", { error: e });
+    logger.error("Error getting usage - caught error", { error: e });
     return undefined;
   }
 }
@@ -379,12 +449,12 @@ export async function getUsageSeries(organizationId: string, params: UsageSeries
   try {
     const result = await client.usageSeries(organizationId, params);
     if (!result.success) {
-      logger.error("Error getting usage series", { error: result.error });
+      logger.error("Error getting usage series - no success", { error: result.error });
       return undefined;
     }
     return result;
   } catch (e) {
-    logger.error("Error getting usage series", { error: e });
+    logger.error("Error getting usage series - caught error", { error: e });
     return undefined;
   }
 }
@@ -403,12 +473,12 @@ export async function reportInvocationUsage(
       additionalData,
     });
     if (!result.success) {
-      logger.error("Error reporting invocation", { error: result.error });
+      logger.error("Error reporting invocation - no success", { error: result.error });
       return undefined;
     }
     return result;
   } catch (e) {
-    logger.error("Error reporting invocation", { error: e });
+    logger.error("Error reporting invocation - caught error", { error: e });
     return undefined;
   }
 }
@@ -423,27 +493,32 @@ export async function reportComputeUsage(request: Request) {
   });
 }
 
-export async function getEntitlement(organizationId: string) {
+export async function getEntitlement(
+  organizationId: string
+): Promise<ReportUsageResult | undefined> {
   if (!client) return undefined;
 
   try {
     const result = await client.getEntitlement(organizationId);
     if (!result.success) {
-      logger.error("Error getting entitlement", { error: result.error });
+      logger.error("Error getting entitlement - no success", { error: result.error });
       return {
         hasAccess: true as const,
       };
     }
     return result;
   } catch (e) {
-    logger.error("Error getting entitlement", { error: e });
+    logger.error("Error getting entitlement - caught error", { error: e });
     return {
       hasAccess: true as const,
     };
   }
 }
 
-export async function projectCreated(organization: Organization, project: Project) {
+export async function projectCreated(
+  organization: Pick<Organization, "id" | "maximumConcurrencyLimit">,
+  project: Project
+) {
   if (!isCloud()) {
     await createEnvironment({ organization, project, type: "STAGING" });
     await createEnvironment({
@@ -467,6 +542,74 @@ export async function projectCreated(organization: Organization, project: Projec
   }
 }
 
+export async function getBillingAlerts(
+  organizationId: string
+): Promise<BillingAlertsResult | undefined> {
+  if (!client) return undefined;
+  const result = await client.getBillingAlerts(organizationId);
+  if (!result.success) {
+    logger.error("Error getting billing alert", { error: result.error, organizationId });
+    throw new Error("Error getting billing alert");
+  }
+  return result;
+}
+
+export async function setBillingAlert(
+  organizationId: string,
+  alert: UpdateBillingAlertsRequest
+): Promise<BillingAlertsResult | undefined> {
+  if (!client) return undefined;
+  const result = await client.updateBillingAlerts(organizationId, alert);
+  if (!result.success) {
+    logger.error("Error setting billing alert", { error: result.error, organizationId });
+    throw new Error("Error setting billing alert");
+  }
+  return result;
+}
+
+export async function generateRegistryCredentials(
+  projectId: string,
+  region: "us-east-1" | "eu-central-1"
+) {
+  if (!client) return undefined;
+  const result = await client.generateRegistryCredentials(projectId, region);
+  if (!result.success) {
+    logger.error("Error generating registry credentials", {
+      error: result.error,
+      projectId,
+      region,
+    });
+    throw new Error("Failed to generate registry credentials");
+  }
+
+  return result;
+}
+
+export async function enqueueBuild(
+  projectId: string,
+  deploymentId: string,
+  artifactKey: string,
+  options: {
+    skipPromotion?: boolean;
+    configFilePath?: string;
+  }
+) {
+  if (!client) return undefined;
+  const result = await client.enqueueBuild(projectId, { deploymentId, artifactKey, options });
+  if (!result.success) {
+    logger.error("Error enqueuing build", {
+      error: result.error,
+      projectId,
+      deploymentId,
+      artifactKey,
+      options,
+    });
+    throw new Error("Failed to enqueue build");
+  }
+
+  return result;
+}
+
 function isCloud(): boolean {
   const acceptableHosts = [
     "https://cloud.trigger.dev",
diff --git a/apps/webapp/app/services/postAuth.server.ts b/apps/webapp/app/services/postAuth.server.ts
index 39e914129a1..feb42ccaef8 100644
--- a/apps/webapp/app/services/postAuth.server.ts
+++ b/apps/webapp/app/services/postAuth.server.ts
@@ -10,5 +10,8 @@ export async function postAuthentication({
   loginMethod: User["authenticationMethod"];
   isNewUser: boolean;
 }) {
-  telemetry.user.identify({ user, isNewUser });
+  telemetry.user.identify({
+    user,
+    isNewUser,
+  });
 }
diff --git a/apps/webapp/app/services/preferences/uiPreferences.server.ts b/apps/webapp/app/services/preferences/uiPreferences.server.ts
index 0d23a546c2d..44282499db3 100644
--- a/apps/webapp/app/services/preferences/uiPreferences.server.ts
+++ b/apps/webapp/app/services/preferences/uiPreferences.server.ts
@@ -42,3 +42,15 @@ export async function setRootOnlyFilterPreference(rootOnly: boolean, request: Re
   session.set("rootOnly", rootOnly);
   return session;
 }
+
+export async function getTimezonePreference(request: Request): Promise<string> {
+  const session = await getUiPreferencesSession(request);
+  const timezone = session.get("timezone");
+  return typeof timezone === "string" ? timezone : "UTC";
+}
+
+export async function setTimezonePreference(timezone: string, request: Request) {
+  const session = await getUiPreferencesSession(request);
+  session.set("timezone", timezone);
+  return session;
+}
diff --git a/apps/webapp/app/services/projectSettings.server.ts b/apps/webapp/app/services/projectSettings.server.ts
new file mode 100644
index 00000000000..ae035d53008
--- /dev/null
+++ b/apps/webapp/app/services/projectSettings.server.ts
@@ -0,0 +1,329 @@
+import { type PrismaClient } from "@trigger.dev/database";
+import { prisma } from "~/db.server";
+import { DeleteProjectService } from "~/services/deleteProject.server";
+import { BranchTrackingConfigSchema, type BranchTrackingConfig } from "~/v3/github";
+import { checkGitHubBranchExists } from "~/services/gitHub.server";
+import { errAsync, fromPromise, okAsync, ResultAsync } from "neverthrow";
+import { type BuildSettings } from "~/v3/buildSettings";
+
+export class ProjectSettingsService {
+  #prismaClient: PrismaClient;
+
+  constructor(prismaClient: PrismaClient = prisma) {
+    this.#prismaClient = prismaClient;
+  }
+
+  renameProject(projectId: string, newName: string) {
+    return fromPromise(
+      this.#prismaClient.project.update({
+        where: {
+          id: projectId,
+        },
+        data: {
+          name: newName,
+        },
+      }),
+      (error) => ({
+        type: "other" as const,
+        cause: error,
+      })
+    );
+  }
+
+  deleteProject(projectSlug: string, userId: string) {
+    const deleteProjectService = new DeleteProjectService(this.#prismaClient);
+
+    return fromPromise(deleteProjectService.call({ projectSlug, userId }), (error) => ({
+      type: "other" as const,
+      cause: error,
+    }));
+  }
+
+  connectGitHubRepo(
+    projectId: string,
+    organizationId: string,
+    repositoryId: string,
+    installationId: string
+  ) {
+    const getRepository = () =>
+      fromPromise(
+        this.#prismaClient.githubRepository.findFirst({
+          where: {
+            id: repositoryId,
+            installationId,
+            installation: {
+              organizationId: organizationId,
+            },
+          },
+          select: {
+            id: true,
+            name: true,
+            defaultBranch: true,
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).andThen((repository) => {
+        if (!repository) {
+          return errAsync({ type: "gh_repository_not_found" as const });
+        }
+        return okAsync(repository);
+      });
+
+    const findExistingConnection = () =>
+      fromPromise(
+        this.#prismaClient.connectedGithubRepository.findFirst({
+          where: {
+            projectId: projectId,
+          },
+        }),
+        (error) => ({ type: "other" as const, cause: error })
+      );
+
+    const createConnectedRepo = (defaultBranch: string, previewDeploymentsEnabled: boolean) =>
+      fromPromise(
+        this.#prismaClient.connectedGithubRepository.create({
+          data: {
+            projectId: projectId,
+            repositoryId: repositoryId,
+            branchTracking: {
+              prod: { branch: defaultBranch },
+              staging: {},
+            } satisfies BranchTrackingConfig,
+            previewDeploymentsEnabled,
+          },
+        }),
+        (error) => ({ type: "other" as const, cause: error })
+      );
+
+    return ResultAsync.combine([
+      getRepository(),
+      findExistingConnection(),
+      this.isPreviewEnvironmentEnabled(projectId),
+    ]).andThen(([repository, existingConnection, previewEnvironmentEnabled]) => {
+      if (existingConnection) {
+        return errAsync({ type: "project_already_has_connected_repository" as const });
+      }
+
+      return createConnectedRepo(repository.defaultBranch, previewEnvironmentEnabled);
+    });
+  }
+
+  disconnectGitHubRepo(projectId: string) {
+    return fromPromise(
+      this.#prismaClient.connectedGithubRepository.delete({
+        where: {
+          projectId: projectId,
+        },
+      }),
+      (error) => ({ type: "other" as const, cause: error })
+    );
+  }
+
+  updateGitSettings(
+    projectId: string,
+    productionBranch?: string,
+    stagingBranch?: string,
+    previewDeploymentsEnabled?: boolean
+  ) {
+    const getExistingConnectedRepo = () =>
+      fromPromise(
+        this.#prismaClient.connectedGithubRepository.findFirst({
+          where: {
+            projectId: projectId,
+          },
+          include: {
+            repository: {
+              include: {
+                installation: true,
+              },
+            },
+          },
+        }),
+        (error) => ({ type: "other" as const, cause: error })
+      )
+        .andThen((connectedRepo) => {
+          if (!connectedRepo) {
+            return errAsync({ type: "connected_gh_repository_not_found" as const });
+          }
+          return okAsync(connectedRepo);
+        })
+        .map((connectedRepo) => {
+          const branchTrackingOrFailure = BranchTrackingConfigSchema.safeParse(
+            connectedRepo.branchTracking
+          );
+          const branchTracking = branchTrackingOrFailure.success
+            ? branchTrackingOrFailure.data
+            : undefined;
+
+          return {
+            ...connectedRepo,
+            branchTracking,
+          };
+        });
+
+    const validateProductionBranch = ({
+      installationId,
+      fullRepoName,
+      oldProductionBranch,
+    }: {
+      installationId: number;
+      fullRepoName: string;
+      oldProductionBranch?: string;
+    }) => {
+      if (productionBranch && oldProductionBranch !== productionBranch) {
+        return checkGitHubBranchExists(installationId, fullRepoName, productionBranch).andThen(
+          (exists) => {
+            if (!exists) {
+              return errAsync({ type: "production_tracking_branch_not_found" as const });
+            }
+            return okAsync(productionBranch);
+          }
+        );
+      }
+
+      return okAsync(productionBranch);
+    };
+
+    const validateStagingBranch = ({
+      installationId,
+      fullRepoName,
+      oldStagingBranch,
+    }: {
+      installationId: number;
+      fullRepoName: string;
+      oldStagingBranch?: string;
+    }) => {
+      if (stagingBranch && oldStagingBranch !== stagingBranch) {
+        return checkGitHubBranchExists(installationId, fullRepoName, stagingBranch).andThen(
+          (exists) => {
+            if (!exists) {
+              return errAsync({ type: "staging_tracking_branch_not_found" as const });
+            }
+            return okAsync(stagingBranch);
+          }
+        );
+      }
+
+      return okAsync(stagingBranch);
+    };
+
+    const updateConnectedRepo = (data: {
+      productionBranch: string | undefined;
+      stagingBranch: string | undefined;
+      previewDeploymentsEnabled: boolean | undefined;
+    }) =>
+      fromPromise(
+        this.#prismaClient.connectedGithubRepository.update({
+          where: {
+            projectId: projectId,
+          },
+          data: {
+            branchTracking: {
+              prod: data.productionBranch ? { branch: data.productionBranch } : {},
+              staging: data.stagingBranch ? { branch: data.stagingBranch } : {},
+            } satisfies BranchTrackingConfig,
+            previewDeploymentsEnabled: data.previewDeploymentsEnabled,
+          },
+        }),
+        (error) => ({ type: "other" as const, cause: error })
+      );
+
+    return getExistingConnectedRepo()
+      .andThen((connectedRepo) => {
+        const installationId = Number(connectedRepo.repository.installation.appInstallationId);
+
+        return ResultAsync.combine([
+          validateProductionBranch({
+            installationId,
+            fullRepoName: connectedRepo.repository.fullName,
+            oldProductionBranch: connectedRepo.branchTracking?.prod?.branch,
+          }),
+          validateStagingBranch({
+            installationId,
+            fullRepoName: connectedRepo.repository.fullName,
+            oldStagingBranch: connectedRepo.branchTracking?.staging?.branch,
+          }),
+          this.isPreviewEnvironmentEnabled(projectId),
+        ]);
+      })
+      .map(([productionBranch, stagingBranch, previewEnvironmentEnabled]) => ({
+        productionBranch,
+        stagingBranch,
+        previewDeploymentsEnabled: previewDeploymentsEnabled && previewEnvironmentEnabled,
+      }))
+      .andThen(updateConnectedRepo);
+  }
+
+  updateBuildSettings(projectId: string, buildSettings: BuildSettings) {
+    return fromPromise(
+      this.#prismaClient.project.update({
+        where: {
+          id: projectId,
+        },
+        data: {
+          buildSettings: buildSettings,
+        },
+      }),
+      (error) => ({
+        type: "other" as const,
+        cause: error,
+      })
+    );
+  }
+
+  verifyProjectMembership(organizationSlug: string, projectSlug: string, userId: string) {
+    const findProject = () =>
+      fromPromise(
+        this.#prismaClient.project.findFirst({
+          where: {
+            slug: projectSlug,
+            organization: {
+              slug: organizationSlug,
+              members: {
+                some: {
+                  userId,
+                },
+              },
+            },
+          },
+          select: {
+            id: true,
+            organizationId: true,
+          },
+        }),
+        (error) => ({ type: "other" as const, cause: error })
+      );
+
+    return findProject().andThen((project) => {
+      if (!project) {
+        return errAsync({ type: "user_not_in_project" as const });
+      }
+
+      return okAsync({
+        projectId: project.id,
+        organizationId: project.organizationId,
+      });
+    });
+  }
+
+  private isPreviewEnvironmentEnabled(projectId: string) {
+    return fromPromise(
+      this.#prismaClient.runtimeEnvironment.findFirst({
+        select: {
+          id: true,
+        },
+        where: {
+          projectId: projectId,
+          slug: "preview",
+        },
+      }),
+      (error) => ({
+        type: "other" as const,
+        cause: error,
+      })
+    ).map((previewEnvironment) => previewEnvironment !== null);
+  }
+}
diff --git a/apps/webapp/app/services/projectSettingsPresenter.server.ts b/apps/webapp/app/services/projectSettingsPresenter.server.ts
new file mode 100644
index 00000000000..6108dd164e4
--- /dev/null
+++ b/apps/webapp/app/services/projectSettingsPresenter.server.ts
@@ -0,0 +1,172 @@
+import { type PrismaClient } from "@trigger.dev/database";
+import { prisma } from "~/db.server";
+import { BranchTrackingConfigSchema } from "~/v3/github";
+import { env } from "~/env.server";
+import { findProjectBySlug } from "~/models/project.server";
+import { err, fromPromise, ok, ResultAsync } from "neverthrow";
+import { BuildSettingsSchema } from "~/v3/buildSettings";
+
+export class ProjectSettingsPresenter {
+  #prismaClient: PrismaClient;
+
+  constructor(prismaClient: PrismaClient = prisma) {
+    this.#prismaClient = prismaClient;
+  }
+
+  getProjectSettings(organizationSlug: string, projectSlug: string, userId: string) {
+    const githubAppEnabled = env.GITHUB_APP_ENABLED === "1";
+
+    const getProject = () =>
+      fromPromise(findProjectBySlug(organizationSlug, projectSlug, userId), (error) => ({
+        type: "other" as const,
+        cause: error,
+      }))
+        .andThen((project) => {
+          if (!project) {
+            return err({ type: "project_not_found" as const });
+          }
+          return ok(project);
+        })
+        .map((project) => {
+          const buildSettingsOrFailure = BuildSettingsSchema.safeParse(project.buildSettings);
+          const buildSettings = buildSettingsOrFailure.success
+            ? buildSettingsOrFailure.data
+            : undefined;
+          return { ...project, buildSettings };
+        });
+
+    if (!githubAppEnabled) {
+      return getProject().map(({ buildSettings }) => ({
+        gitHubApp: {
+          enabled: false,
+          connectedRepository: undefined,
+          installations: undefined,
+          isPreviewEnvironmentEnabled: undefined,
+        },
+        buildSettings,
+      }));
+    }
+
+    const findConnectedGithubRepository = (projectId: string) =>
+      fromPromise(
+        this.#prismaClient.connectedGithubRepository.findFirst({
+          where: {
+            projectId,
+            repository: {
+              installation: {
+                deletedAt: null,
+                suspendedAt: null,
+              },
+            },
+          },
+          select: {
+            branchTracking: true,
+            previewDeploymentsEnabled: true,
+            createdAt: true,
+            repository: {
+              select: {
+                id: true,
+                name: true,
+                fullName: true,
+                htmlUrl: true,
+                private: true,
+              },
+            },
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((connectedGithubRepository) => {
+        if (!connectedGithubRepository) {
+          return undefined;
+        }
+
+        const branchTrackingOrFailure = BranchTrackingConfigSchema.safeParse(
+          connectedGithubRepository.branchTracking
+        );
+        const branchTracking = branchTrackingOrFailure.success
+          ? branchTrackingOrFailure.data
+          : undefined;
+
+        return {
+          ...connectedGithubRepository,
+          branchTracking,
+        };
+      });
+
+    const listGithubAppInstallations = (organizationId: string) =>
+      fromPromise(
+        this.#prismaClient.githubAppInstallation.findMany({
+          where: {
+            organizationId,
+            deletedAt: null,
+            suspendedAt: null,
+          },
+          select: {
+            id: true,
+            accountHandle: true,
+            targetType: true,
+            appInstallationId: true,
+            repositories: {
+              select: {
+                id: true,
+                name: true,
+                fullName: true,
+                htmlUrl: true,
+                private: true,
+              },
+              // Most installations will only have a couple of repos so loading them here should be fine.
+              // However, there might be outlier organizations so it's best to expose the installation repos
+              // via a resource endpoint and filter on user input.
+              take: 200,
+            },
+          },
+          take: 20,
+          orderBy: {
+            createdAt: "desc",
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      );
+
+    const isPreviewEnvironmentEnabled = (projectId: string) =>
+      fromPromise(
+        this.#prismaClient.runtimeEnvironment.findFirst({
+          select: {
+            id: true,
+          },
+          where: {
+            projectId: projectId,
+            slug: "preview",
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map((previewEnvironment) => previewEnvironment !== null);
+
+    return getProject().andThen((project) =>
+      ResultAsync.combine([
+        isPreviewEnvironmentEnabled(project.id),
+        findConnectedGithubRepository(project.id),
+        listGithubAppInstallations(project.organizationId),
+      ]).map(
+        ([isPreviewEnvironmentEnabled, connectedGithubRepository, githubAppInstallations]) => ({
+          gitHubApp: {
+            enabled: true,
+            connectedRepository: connectedGithubRepository,
+            installations: githubAppInstallations,
+            isPreviewEnvironmentEnabled,
+          },
+          buildSettings: project.buildSettings,
+        })
+      )
+    );
+  }
+}
diff --git a/apps/webapp/app/services/queryConcurrencyLimiter.server.ts b/apps/webapp/app/services/queryConcurrencyLimiter.server.ts
new file mode 100644
index 00000000000..b623f018b1c
--- /dev/null
+++ b/apps/webapp/app/services/queryConcurrencyLimiter.server.ts
@@ -0,0 +1,29 @@
+import { env } from "~/env.server";
+import { singleton } from "~/utils/singleton";
+import { RedisConcurrencyLimiter } from "./redisConcurrencyLimiter.server";
+
+function initializeQueryConcurrencyLimiter() {
+  return new RedisConcurrencyLimiter({
+    keyPrefix: "query:concurrency",
+    redis: {
+      port: env.RATE_LIMIT_REDIS_PORT,
+      host: env.RATE_LIMIT_REDIS_HOST,
+      username: env.RATE_LIMIT_REDIS_USERNAME,
+      password: env.RATE_LIMIT_REDIS_PASSWORD,
+      tlsDisabled: env.RATE_LIMIT_REDIS_TLS_DISABLED === "true",
+      clusterMode: env.RATE_LIMIT_REDIS_CLUSTER_MODE_ENABLED === "1",
+    },
+  });
+}
+
+export const queryConcurrencyLimiter = singleton(
+  "queryConcurrencyLimiter",
+  initializeQueryConcurrencyLimiter
+);
+
+/** Default per-org concurrency limit from environment */
+export const DEFAULT_ORG_CONCURRENCY_LIMIT = env.QUERY_DEFAULT_ORG_CONCURRENCY_LIMIT;
+
+/** Global concurrency limit from environment */
+export const GLOBAL_CONCURRENCY_LIMIT = env.QUERY_GLOBAL_CONCURRENCY_LIMIT;
+
diff --git a/apps/webapp/app/services/queryService.server.ts b/apps/webapp/app/services/queryService.server.ts
new file mode 100644
index 00000000000..6cd2af03b16
--- /dev/null
+++ b/apps/webapp/app/services/queryService.server.ts
@@ -0,0 +1,342 @@
+import {
+  executeTSQL,
+  QueryError,
+  type ClickHouseSettings,
+  type ExecuteTSQLOptions,
+  type FieldMappings,
+  type TSQLQueryResult,
+} from "@internal/clickhouse";
+import type { CustomerQuerySource } from "@trigger.dev/database";
+import type { TableSchema, WhereClauseCondition } from "@internal/tsql";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { queryClickhouseClient } from "./clickhouseInstance.server";
+import {
+  queryConcurrencyLimiter,
+  DEFAULT_ORG_CONCURRENCY_LIMIT,
+  GLOBAL_CONCURRENCY_LIMIT,
+} from "./queryConcurrencyLimiter.server";
+import { getLimit } from "./platform.v3.server";
+import { timeFilters, timeFilterFromTo } from "~/components/runs/v3/SharedFilters";
+import parse from "parse-duration";
+import { querySchemas, QueryScopeSchema, type QueryScope } from "~/v3/querySchemas";
+
+export { QueryScopeSchema };
+export type { TableSchema, TSQLQueryResult, QueryScope };
+
+const scopeToEnum = {
+  organization: "ORGANIZATION",
+  project: "PROJECT",
+  environment: "ENVIRONMENT",
+} as const;
+
+/**
+ * Default ClickHouse settings for query protection
+ * Based on PostHog's HogQL settings to prevent expensive queries
+ */
+function getDefaultClickhouseSettings(): ClickHouseSettings {
+  return {
+    // Query execution limits
+    max_execution_time: env.QUERY_CLICKHOUSE_MAX_EXECUTION_TIME,
+    timeout_overflow_mode: "throw",
+    max_memory_usage: String(env.QUERY_CLICKHOUSE_MAX_MEMORY_USAGE),
+
+    // AST complexity limits to prevent extremely complex queries
+    max_ast_elements: String(env.QUERY_CLICKHOUSE_MAX_AST_ELEMENTS),
+    max_expanded_ast_elements: String(env.QUERY_CLICKHOUSE_MAX_EXPANDED_AST_ELEMENTS),
+
+    // Memory management for GROUP BY operations
+    max_bytes_before_external_group_by: String(
+      env.QUERY_CLICKHOUSE_MAX_BYTES_BEFORE_EXTERNAL_GROUP_BY
+    ),
+
+    // Safety settings
+    format_csv_allow_double_quotes: 0,
+    readonly: "1", // Ensure queries are read-only
+  };
+}
+
+export type ExecuteQueryOptions<TOut extends z.ZodSchema> = Omit<
+  ExecuteTSQLOptions<TOut>,
+  "tableSchema" | "fieldMappings" | "enforcedWhereClause" | "whereClauseFallback" | "schema"
+> & {
+  organizationId: string;
+  projectId: string;
+  environmentId: string;
+  /** The scope of the query - determines tenant isolation */
+  scope: QueryScope;
+  period?: string | null;
+  from?: string | null;
+  to?: string | null;
+  /** Filter to specific task identifiers */
+  taskIdentifiers?: string[];
+  /** Filter to specific queues */
+  queues?: string[];
+  /** History options for saving query to billing/audit */
+  history?: {
+    /** Where the query originated from */
+    source: CustomerQuerySource;
+    /** User ID (optional, null for API calls) */
+    userId?: string | null;
+    /** Skip saving to history (e.g., when impersonating) */
+    skip?: boolean;
+  };
+  /** Custom per-org concurrency limit (overrides default) */
+  customOrgConcurrencyLimit?: number;
+};
+
+/**
+ * Extended result type that includes the optional queryId when saved to history
+ */
+export type ExecuteQueryResult<T> =
+  | {
+      success: true;
+      result: T;
+      queryId: string | null;
+      periodClipped: number | null;
+      maxQueryPeriod: number;
+      timeRange: { from: Date; to: Date };
+    }
+  | { success: false; error: Error };
+
+export async function getDefaultPeriod(organizationId: string): Promise<string> {
+  const idealDefaultPeriodDays = 7;
+  const maxQueryPeriod = await getLimit(organizationId, "queryPeriodDays", 30);
+  if (maxQueryPeriod < idealDefaultPeriodDays) {
+    return `${maxQueryPeriod}d`;
+  }
+  return `${idealDefaultPeriodDays}d`;
+}
+
+/**
+ * Execute a TSQL query against ClickHouse with tenant isolation
+ * Handles building tenant options, field mappings, and optionally saves to history
+ * Returns [error, result, queryId] where queryId is the CustomerQuery ID if saved to history
+ */
+export async function executeQuery<TOut extends z.ZodSchema>(
+  options: ExecuteQueryOptions<TOut>
+): Promise<ExecuteQueryResult<Exclude<TSQLQueryResult<z.output<TOut>>[1], null>>> {
+  const {
+    period,
+    from,
+    to,
+    scope,
+    organizationId,
+    projectId,
+    environmentId,
+    taskIdentifiers,
+    queues,
+    history,
+    customOrgConcurrencyLimit,
+    ...baseOptions
+  } = options;
+
+  // Generate unique request ID for concurrency tracking
+  const requestId = crypto.randomUUID();
+  const orgLimit = customOrgConcurrencyLimit ?? DEFAULT_ORG_CONCURRENCY_LIMIT;
+
+  // Acquire concurrency slot
+  const acquireResult = await queryConcurrencyLimiter.acquire({
+    key: projectId,
+    requestId,
+    keyLimit: orgLimit,
+    globalLimit: GLOBAL_CONCURRENCY_LIMIT,
+  });
+
+  if (!acquireResult.success) {
+    const errorMessage =
+      acquireResult.reason === "key_limit"
+        ? `You've exceeded your query concurrency of ${orgLimit} for this project. Please try again later.`
+        : "We're experiencing a lot of queries at the moment. Please try again later.";
+    return { success: false, error: new QueryError(errorMessage, { query: options.query }) };
+  }
+
+  // Detect which table the query targets to determine the time column
+  // Each table schema declares its primary time column via timeConstraint
+  const matchedSchema = querySchemas.find((s) =>
+    new RegExp(`\\bFROM\\s+${s.name}\\b`, "i").test(options.query)
+  );
+  const timeColumn = matchedSchema?.timeConstraint ?? "triggered_at";
+
+  // Build time filter fallback for the table's time column
+  const defaultPeriod = await getDefaultPeriod(organizationId);
+  const timeFilter = timeFilters({
+    period: period ?? undefined,
+    from: from ?? undefined,
+    to: to ?? undefined,
+    defaultPeriod,
+  });
+
+  // Calculate the effective "from" date the user is requesting (for period clipping check)
+  // This is null only when the user specifies just a "to" date (rare case)
+  let requestedFromDate: Date | null = null;
+  if (timeFilter.from) {
+    requestedFromDate = new Date(timeFilter.from);
+  } else if (!timeFilter.to) {
+    // Period specified (or default) - calculate from now
+    const periodMs = parse(timeFilter.period ?? defaultPeriod) ?? 7 * 24 * 60 * 60 * 1000;
+    requestedFromDate = new Date(Date.now() - periodMs);
+  }
+
+  // Build the fallback WHERE condition based on what the user specified
+  let timeFallback: WhereClauseCondition;
+  if (timeFilter.from && timeFilter.to) {
+    timeFallback = { op: "between", low: timeFilter.from, high: timeFilter.to };
+  } else if (timeFilter.from) {
+    timeFallback = { op: "gte", value: timeFilter.from };
+  } else if (timeFilter.to) {
+    timeFallback = { op: "lte", value: timeFilter.to };
+  } else {
+    timeFallback = { op: "gte", value: requestedFromDate! };
+  }
+
+  const maxQueryPeriod = await getLimit(organizationId, "queryPeriodDays", 30);
+  const maxQueryPeriodDate = new Date(Date.now() - maxQueryPeriod * 24 * 60 * 60 * 1000);
+
+  // Check if the requested time period exceeds the plan limit
+  const periodClipped = requestedFromDate !== null && requestedFromDate < maxQueryPeriodDate;
+
+  // Force tenant isolation and time period limits
+  const enforcedWhereClause = {
+    organization_id: { op: "eq", value: organizationId },
+    project_id:
+      scope === "project" || scope === "environment" ? { op: "eq", value: projectId } : undefined,
+    environment_id: scope === "environment" ? { op: "eq", value: environmentId } : undefined,
+    [timeColumn]: { op: "gte", value: maxQueryPeriodDate },
+    // Optional filters for tasks and queues
+    task_identifier:
+      taskIdentifiers && taskIdentifiers.length > 0
+        ? { op: "in", values: taskIdentifiers }
+        : undefined,
+    queue: queues && queues.length > 0 ? { op: "in", values: queues } : undefined,
+  } satisfies Record<string, WhereClauseCondition | undefined>;
+
+  // Compute the effective time range for timeBucket() interval calculation
+  const timeRange = timeFilterFromTo({
+    period: period ?? undefined,
+    from: from ?? undefined,
+    to: to ?? undefined,
+    defaultPeriod,
+  });
+
+  try {
+    // Build field mappings for project_ref → project_id and environment_id → slug translation
+    const projects = await prisma.project.findMany({
+      where: { organizationId },
+      select: { id: true, externalRef: true },
+    });
+
+    const environments = await prisma.runtimeEnvironment.findMany({
+      where: { project: { organizationId } },
+      select: { id: true, slug: true },
+    });
+
+    const fieldMappings: FieldMappings = {
+      project: Object.fromEntries(projects.map((p) => [p.id, p.externalRef])),
+      environment: Object.fromEntries(environments.map((e) => [e.id, e.slug])),
+    };
+
+    const result = await executeTSQL(queryClickhouseClient.reader, {
+      ...baseOptions,
+      schema: z.record(z.any()),
+      tableSchema: querySchemas,
+      transformValues: true,
+      enforcedWhereClause,
+      fieldMappings,
+      whereClauseFallback: {
+        [timeColumn]: timeFallback,
+      },
+      timeRange,
+      clickhouseSettings: {
+        ...getDefaultClickhouseSettings(),
+        ...baseOptions.clickhouseSettings, // Allow caller overrides if needed
+      },
+      querySettings: {
+        maxRows: env.QUERY_CLICKHOUSE_MAX_RETURNED_ROWS,
+        ...baseOptions.querySettings, // Allow caller overrides if needed
+      },
+    });
+
+    // If query failed, return early with no queryId
+    if (result[0] !== null) {
+      return { success: false, error: result[0] };
+    }
+
+    let queryId: string | null = null;
+
+    // If query succeeded and history options provided, save to history
+    // Skip history for EXPLAIN queries (admin debugging) and when explicitly skipped (e.g., impersonating)
+    if (history && !history.skip && !baseOptions.explain) {
+      // Check if this query is the same as the last one saved (avoid duplicate history entries)
+      const lastQuery = await prisma.customerQuery.findFirst({
+        where: {
+          organizationId,
+          source: history.source,
+          userId: history.userId ?? null,
+        },
+        orderBy: { createdAt: "desc" },
+        select: {
+          id: true,
+          query: true,
+          scope: true,
+          filterPeriod: true,
+          filterFrom: true,
+          filterTo: true,
+        },
+      });
+
+      // Save the effective period used for the query (timeFilters() handles defaults)
+      // Only save period if no custom from/to range was specified
+      const historyTimeFilter = {
+        period: timeFilter.from || timeFilter.to ? undefined : timeFilter.period,
+        from: timeFilter.from,
+        to: timeFilter.to,
+      };
+      const isDuplicate =
+        lastQuery &&
+        lastQuery.query === options.query &&
+        lastQuery.scope === scopeToEnum[scope] &&
+        lastQuery.filterPeriod === (timeFilter?.period ?? null) &&
+        lastQuery.filterFrom?.getTime() === (timeFilter?.from?.getTime() ?? undefined) &&
+        lastQuery.filterTo?.getTime() === (timeFilter?.to?.getTime() ?? undefined);
+
+      if (isDuplicate && lastQuery) {
+        // Return the existing query's ID for duplicate queries
+        queryId = lastQuery.id;
+      } else {
+        const created = await prisma.customerQuery.create({
+          data: {
+            query: options.query,
+            scope: scopeToEnum[scope],
+            stats: { ...result[1].stats },
+            source: history.source,
+            organizationId,
+            projectId: scope === "project" || scope === "environment" ? projectId : null,
+            environmentId: scope === "environment" ? environmentId : null,
+            userId: history.userId ?? null,
+            filterPeriod: historyTimeFilter?.period ?? null,
+            filterFrom: historyTimeFilter?.from ?? null,
+            filterTo: historyTimeFilter?.to ?? null,
+          },
+        });
+        queryId = created.id;
+      }
+    }
+
+    return {
+      success: true,
+      result: result[1],
+      queryId,
+      periodClipped: periodClipped ? maxQueryPeriod : null,
+      maxQueryPeriod,
+      timeRange,
+    };
+  } finally {
+    // Always release the concurrency slot
+    await queryConcurrencyLimiter.release({
+      key: projectId,
+      requestId,
+    });
+  }
+}
diff --git a/apps/webapp/app/services/realtime/jwtAuth.server.ts b/apps/webapp/app/services/realtime/jwtAuth.server.ts
index d5950d99d38..1bac76b8f3a 100644
--- a/apps/webapp/app/services/realtime/jwtAuth.server.ts
+++ b/apps/webapp/app/services/realtime/jwtAuth.server.ts
@@ -2,6 +2,7 @@ import { json } from "@remix-run/server-runtime";
 import { validateJWT } from "@trigger.dev/core/v3/jwt";
 import { findEnvironmentById } from "~/models/runtimeEnvironment.server";
 import { AuthenticatedEnvironment } from "../apiAuth.server";
+import { logger } from "../logger.server";
 
 export type ValidatePublicJwtKeySuccess = {
   ok: true;
@@ -89,6 +90,12 @@ export function isPublicJWT(token: string): boolean {
   }
 }
 
+export function extractJwtSigningSecretKey(
+  environment: AuthenticatedEnvironment & { parentEnvironment?: { apiKey: string } }
+) {
+  return environment.parentEnvironment?.apiKey ?? environment.apiKey;
+}
+
 function extractJWTSub(token: string): string | undefined {
   // Split the token
   const parts = token.split(".");
diff --git a/apps/webapp/app/services/realtime/redisRealtimeStreams.server.ts b/apps/webapp/app/services/realtime/redisRealtimeStreams.server.ts
index 776b6179fab..a0a6de09e98 100644
--- a/apps/webapp/app/services/realtime/redisRealtimeStreams.server.ts
+++ b/apps/webapp/app/services/realtime/redisRealtimeStreams.server.ts
@@ -1,45 +1,90 @@
+import { Logger, LogLevel } from "@trigger.dev/core/logger";
 import Redis, { RedisOptions } from "ioredis";
-import { AuthenticatedEnvironment } from "../apiAuth.server";
-import { logger } from "../logger.server";
-import { StreamIngestor, StreamResponder } from "./types";
-import { LineTransformStream } from "./utils.server";
 import { env } from "~/env.server";
+import { StreamIngestor, StreamResponder, StreamResponseOptions } from "./types";
 
 export type RealtimeStreamsOptions = {
   redis: RedisOptions | undefined;
+  logger?: Logger;
+  logLevel?: LogLevel;
+  inactivityTimeoutMs?: number; // Close stream after this many ms of no new data (default: 60000)
 };
 
+// Legacy constant for backward compatibility (no longer written, but still recognized when reading)
 const END_SENTINEL = "<<CLOSE_STREAM>>";
 
+// Internal types for stream pipeline
+type StreamChunk =
+  | { type: "ping" }
+  | { type: "data"; redisId: string; data: string }
+  | { type: "legacy-data"; redisId: string; data: string };
+
 // Class implementing both interfaces
 export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
-  constructor(private options: RealtimeStreamsOptions) {}
+  private logger: Logger;
+  private inactivityTimeoutMs: number;
+
+  constructor(private options: RealtimeStreamsOptions) {
+    this.logger = options.logger ?? new Logger("RedisRealtimeStreams", options.logLevel ?? "info");
+    this.inactivityTimeoutMs = options.inactivityTimeoutMs ?? 60000; // Default: 60 seconds
+  }
+
+  async initializeStream(
+    runId: string,
+    streamId: string
+  ): Promise<{ responseHeaders?: Record<string, string> }> {
+    return {};
+  }
 
   async streamResponse(
     request: Request,
     runId: string,
     streamId: string,
-    environment: AuthenticatedEnvironment,
-    signal: AbortSignal
+    signal: AbortSignal,
+    options?: StreamResponseOptions
   ): Promise<Response> {
     const redis = new Redis(this.options.redis ?? {});
     const streamKey = `stream:${runId}:${streamId}`;
     let isCleanedUp = false;
 
-    const stream = new ReadableStream({
+    const stream = new ReadableStream<StreamChunk>({
       start: async (controller) => {
-        let lastId = "0";
+        // Start from lastEventId if provided, otherwise from beginning
+        let lastId = options?.lastEventId ?? "0";
         let retryCount = 0;
         const maxRetries = 3;
+        let lastDataTime = Date.now();
+        let lastEnqueueTime = Date.now();
+        const blockTimeMs = 5000;
+        const pingIntervalMs = 10000; // 10 seconds
+
+        if (options?.lastEventId) {
+          this.logger.debug("[RealtimeStreams][streamResponse] Resuming from lastEventId", {
+            streamKey,
+            lastEventId: options?.lastEventId,
+          });
+        }
 
         try {
           while (!signal.aborted) {
+            // Check if we need to send a ping
+            const timeSinceLastEnqueue = Date.now() - lastEnqueueTime;
+            if (timeSinceLastEnqueue >= pingIntervalMs) {
+              controller.enqueue({ type: "ping" });
+              lastEnqueueTime = Date.now();
+            }
+
+            // Compute inactivity threshold once to use consistently in both branches
+            const inactivityThresholdMs = options?.timeoutInSeconds
+              ? options.timeoutInSeconds * 1000
+              : this.inactivityTimeoutMs;
+
             try {
               const messages = await redis.xread(
                 "COUNT",
                 100,
                 "BLOCK",
-                5000,
+                blockTimeMs,
                 "STREAMS",
                 streamKey,
                 lastId
@@ -49,41 +94,104 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
 
               if (messages && messages.length > 0) {
                 const [_key, entries] = messages[0];
+                let foundData = false;
 
                 for (let i = 0; i < entries.length; i++) {
                   const [id, fields] = entries[i];
                   lastId = id;
 
                   if (fields && fields.length >= 2) {
-                    if (fields[1] === END_SENTINEL && i === entries.length - 1) {
-                      controller.close();
-                      return;
+                    // Extract the data field from the Redis entry
+                    // Fields format: ["field1", "value1", "field2", "value2", ...]
+                    let data: string | null = null;
+
+                    for (let j = 0; j < fields.length; j += 2) {
+                      if (fields[j] === "data") {
+                        data = fields[j + 1];
+                        break;
+                      }
                     }
 
-                    if (fields[1] !== END_SENTINEL) {
-                      controller.enqueue(fields[1]);
+                    // Handle legacy entries that don't have field names (just data at index 1)
+                    if (data === null && fields.length >= 2) {
+                      data = fields[1];
                     }
 
-                    if (signal.aborted) {
-                      controller.close();
-                      return;
+                    if (data) {
+                      // Skip legacy END_SENTINEL entries (backward compatibility)
+                      if (data === END_SENTINEL) {
+                        continue;
+                      }
+
+                      // Enqueue structured chunk with Redis stream ID
+                      controller.enqueue({
+                        type: "data",
+                        redisId: id,
+                        data,
+                      });
+
+                      foundData = true;
+                      lastDataTime = Date.now();
+                      lastEnqueueTime = Date.now();
+
+                      if (signal.aborted) {
+                        controller.close();
+                        return;
+                      }
                     }
                   }
                 }
+
+                // If we didn't find any data in this batch, might have only seen sentinels
+                if (!foundData) {
+                  // Check for inactivity timeout
+                  const inactiveMs = Date.now() - lastDataTime;
+                  if (inactiveMs >= inactivityThresholdMs) {
+                    this.logger.debug(
+                      "[RealtimeStreams][streamResponse] Closing stream due to inactivity",
+                      {
+                        streamKey,
+                        inactiveMs,
+                        threshold: inactivityThresholdMs,
+                      }
+                    );
+                    controller.close();
+                    return;
+                  }
+                }
+              } else {
+                // No messages received (timed out on BLOCK)
+                // Check for inactivity timeout
+                const inactiveMs = Date.now() - lastDataTime;
+                if (inactiveMs >= inactivityThresholdMs) {
+                  this.logger.debug(
+                    "[RealtimeStreams][streamResponse] Closing stream due to inactivity",
+                    {
+                      streamKey,
+                      inactiveMs,
+                      threshold: inactivityThresholdMs,
+                    }
+                  );
+                  controller.close();
+                  return;
+                }
               }
             } catch (error) {
               if (signal.aborted) break;
 
-              logger.error("[RealtimeStreams][streamResponse] Error reading from Redis stream:", {
-                error,
-              });
+              this.logger.error(
+                "[RealtimeStreams][streamResponse] Error reading from Redis stream:",
+                {
+                  error,
+                }
+              );
               retryCount++;
               if (retryCount >= maxRetries) throw error;
               await new Promise((resolve) => setTimeout(resolve, 1000 * retryCount));
             }
           }
         } catch (error) {
-          logger.error("[RealtimeStreams][streamResponse] Fatal error in stream processing:", {
+          this.logger.error("[RealtimeStreams][streamResponse] Fatal error in stream processing:", {
             error,
           });
           controller.error(error);
@@ -95,12 +203,63 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
         await cleanup();
       },
     })
-      .pipeThrough(new LineTransformStream())
       .pipeThrough(
-        new TransformStream({
+        // Transform 1: Buffer partial lines across Redis entries
+        (() => {
+          let buffer = "";
+          let lastRedisId = "0";
+
+          return new TransformStream<StreamChunk, StreamChunk & { line: string }>({
+            transform(chunk, controller) {
+              if (chunk.type === "ping") {
+                controller.enqueue(chunk as any);
+              } else if (chunk.type === "data" || chunk.type === "legacy-data") {
+                // Buffer partial lines: accumulate until we see newlines
+                buffer += chunk.data;
+
+                // Split on newlines
+                const lines = buffer.split("\n");
+
+                // The last element might be incomplete, hold it back in buffer
+                buffer = lines.pop() || "";
+
+                // Emit complete lines with the Redis ID of the chunk that completed them
+                for (const line of lines) {
+                  if (line.trim().length > 0) {
+                    controller.enqueue({
+                      ...chunk,
+                      line,
+                    });
+                  }
+                }
+
+                // Update last Redis ID for next iteration
+                lastRedisId = chunk.redisId;
+              }
+            },
+            flush(controller) {
+              // On stream end, emit any leftover buffered text
+              if (buffer.trim().length > 0) {
+                controller.enqueue({
+                  type: "data",
+                  redisId: lastRedisId,
+                  data: "",
+                  line: buffer.trim(),
+                });
+              }
+            },
+          });
+        })()
+      )
+      .pipeThrough(
+        // Transform 2: Format as SSE
+        new TransformStream<StreamChunk & { line?: string }, string>({
           transform(chunk, controller) {
-            for (const line of chunk) {
-              controller.enqueue(`data: ${line}\n\n`);
+            if (chunk.type === "ping") {
+              controller.enqueue(`: ping\n\n`);
+            } else if ((chunk.type === "data" || chunk.type === "legacy-data") && chunk.line) {
+              // Use Redis stream ID as SSE event ID
+              controller.enqueue(`id: ${chunk.redisId}\ndata: ${chunk.line}\n\n`);
             }
           },
         })
@@ -113,7 +272,7 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
       await redis.quit().catch(console.error);
     }
 
-    signal.addEventListener("abort", cleanup);
+    signal.addEventListener("abort", cleanup, { once: true });
 
     return new Response(stream, {
       headers: {
@@ -127,16 +286,23 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
   async ingestData(
     stream: ReadableStream<Uint8Array>,
     runId: string,
-    streamId: string
+    streamId: string,
+    clientId: string,
+    resumeFromChunk?: number
   ): Promise<Response> {
     const redis = new Redis(this.options.redis ?? {});
     const streamKey = `stream:${runId}:${streamId}`;
+    const startChunk = resumeFromChunk ?? 0;
+    // Start counting from the resume point, not from 0
+    let currentChunkIndex = startChunk;
+
+    const self = this;
 
     async function cleanup() {
       try {
         await redis.quit();
       } catch (error) {
-        logger.error("[RedisRealtimeStreams][ingestData] Error in cleanup:", { error });
+        self.logger.error("[RedisRealtimeStreams][ingestData] Error in cleanup:", { error });
       }
     }
 
@@ -151,9 +317,13 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
           break;
         }
 
-        logger.debug("[RedisRealtimeStreams][ingestData] Reading data", {
+        // Write each chunk with its index and clientId
+        this.logger.debug("[RedisRealtimeStreams][ingestData] Writing chunk", {
           streamKey,
           runId,
+          clientId,
+          chunkIndex: currentChunkIndex,
+          resumeFromChunk: startChunk,
           value,
         });
 
@@ -163,32 +333,137 @@ export class RedisRealtimeStreams implements StreamIngestor, StreamResponder {
           "~",
           String(env.REALTIME_STREAM_MAX_LENGTH),
           "*",
+          "clientId",
+          clientId,
+          "chunkIndex",
+          currentChunkIndex.toString(),
           "data",
           value
         );
+
+        currentChunkIndex++;
       }
 
-      // Send the END_SENTINEL and set TTL with a pipeline.
-      const pipeline = redis.pipeline();
-      pipeline.xadd(
-        streamKey,
-        "MAXLEN",
-        "~",
-        String(env.REALTIME_STREAM_MAX_LENGTH),
-        "*",
-        "data",
-        END_SENTINEL
-      );
-      pipeline.expire(streamKey, env.REALTIME_STREAM_TTL);
-      await pipeline.exec();
+      // Set TTL for cleanup when stream is done
+      await redis.expire(streamKey, env.REALTIME_STREAM_TTL);
 
       return new Response(null, { status: 200 });
     } catch (error) {
-      logger.error("[RealtimeStreams][ingestData] Error in ingestData:", { error });
+      if (error instanceof Error) {
+        if ("code" in error && error.code === "ECONNRESET") {
+          this.logger.info("[RealtimeStreams][ingestData] Connection reset during ingestData:", {
+            error,
+          });
+          return new Response(null, { status: 500 });
+        }
+      }
+
+      this.logger.error("[RealtimeStreams][ingestData] Error in ingestData:", { error });
 
       return new Response(null, { status: 500 });
     } finally {
       await cleanup();
     }
   }
+
+  async appendPart(part: string, partId: string, runId: string, streamId: string): Promise<void> {
+    const redis = new Redis(this.options.redis ?? {});
+    const streamKey = `stream:${runId}:${streamId}`;
+
+    await redis.xadd(
+      streamKey,
+      "MAXLEN",
+      "~",
+      String(env.REALTIME_STREAM_MAX_LENGTH),
+      "*",
+      "clientId",
+      "",
+      "chunkIndex",
+      "0",
+      "data",
+      JSON.stringify(part) + "\n"
+    );
+
+    // Set TTL for cleanup when stream is done
+    await redis.expire(streamKey, env.REALTIME_STREAM_TTL);
+
+    await redis.quit();
+  }
+
+  async getLastChunkIndex(runId: string, streamId: string, clientId: string): Promise<number> {
+    const redis = new Redis(this.options.redis ?? {});
+    const streamKey = `stream:${runId}:${streamId}`;
+
+    try {
+      // Paginate through the stream from newest to oldest until we find this client's last chunk
+      const batchSize = 100;
+      let lastId = "+"; // Start from newest
+
+      while (true) {
+        const entries = await redis.xrevrange(streamKey, lastId, "-", "COUNT", batchSize);
+
+        if (!entries || entries.length === 0) {
+          // Reached the beginning of the stream, no chunks from this client
+          this.logger.debug(
+            "[RedisRealtimeStreams][getLastChunkIndex] No chunks found for client",
+            {
+              streamKey,
+              clientId,
+            }
+          );
+          return -1;
+        }
+
+        // Search through this batch for the client's last chunk
+        for (const [id, fields] of entries) {
+          let entryClientId: string | null = null;
+          let chunkIndex: number | null = null;
+          let data: string | null = null;
+
+          for (let i = 0; i < fields.length; i += 2) {
+            if (fields[i] === "clientId") {
+              entryClientId = fields[i + 1];
+            }
+            if (fields[i] === "chunkIndex") {
+              chunkIndex = parseInt(fields[i + 1], 10);
+            }
+            if (fields[i] === "data") {
+              data = fields[i + 1];
+            }
+          }
+
+          // Skip legacy END_SENTINEL entries (backward compatibility)
+          if (data === END_SENTINEL) {
+            continue;
+          }
+
+          // Check if this entry is from our client and has a chunkIndex
+          if (entryClientId === clientId && chunkIndex !== null) {
+            this.logger.debug("[RedisRealtimeStreams][getLastChunkIndex] Found last chunk", {
+              streamKey,
+              clientId,
+              chunkIndex,
+            });
+            return chunkIndex;
+          }
+        }
+
+        // Move to next batch (older entries)
+        // Use the ID of the last entry in this batch as the new cursor
+        lastId = `(${entries[entries.length - 1][0]}`; // Exclusive range with (
+      }
+    } catch (error) {
+      this.logger.error("[RedisRealtimeStreams][getLastChunkIndex] Error getting last chunk:", {
+        error,
+        streamKey,
+        clientId,
+      });
+      // Return -1 to indicate we don't know what the server has
+      return -1;
+    } finally {
+      await redis.quit().catch((err) => {
+        this.logger.error("[RedisRealtimeStreams][getLastChunkIndex] Error in cleanup:", { err });
+      });
+    }
+  }
 }
diff --git a/apps/webapp/app/services/realtime/relayRealtimeStreams.server.ts b/apps/webapp/app/services/realtime/relayRealtimeStreams.server.ts
deleted file mode 100644
index 46e16ff5e95..00000000000
--- a/apps/webapp/app/services/realtime/relayRealtimeStreams.server.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-import { AuthenticatedEnvironment } from "../apiAuth.server";
-import { logger } from "../logger.server";
-import { StreamIngestor, StreamResponder } from "./types";
-import { LineTransformStream } from "./utils.server";
-import { v1RealtimeStreams } from "./v1StreamsGlobal.server";
-import { singleton } from "~/utils/singleton";
-
-export type RelayRealtimeStreamsOptions = {
-  ttl: number;
-  cleanupInterval: number;
-  fallbackIngestor: StreamIngestor;
-  fallbackResponder: StreamResponder;
-  waitForBufferTimeout?: number; // Time to wait for buffer in ms (default: 500ms)
-  waitForBufferInterval?: number; // Polling interval in ms (default: 50ms)
-};
-
-interface RelayedStreamRecord {
-  stream: ReadableStream<Uint8Array>;
-  createdAt: number;
-  lastAccessed: number;
-  locked: boolean;
-  finalized: boolean;
-}
-
-export class RelayRealtimeStreams implements StreamIngestor, StreamResponder {
-  private _buffers: Map<string, RelayedStreamRecord> = new Map();
-  private cleanupInterval: NodeJS.Timeout;
-  private waitForBufferTimeout: number;
-  private waitForBufferInterval: number;
-
-  constructor(private options: RelayRealtimeStreamsOptions) {
-    this.waitForBufferTimeout = options.waitForBufferTimeout ?? 1200;
-    this.waitForBufferInterval = options.waitForBufferInterval ?? 50;
-
-    // Periodic cleanup
-    this.cleanupInterval = setInterval(() => {
-      this.cleanup();
-    }, this.options.cleanupInterval).unref();
-  }
-
-  async streamResponse(
-    request: Request,
-    runId: string,
-    streamId: string,
-    environment: AuthenticatedEnvironment,
-    signal: AbortSignal
-  ): Promise<Response> {
-    let record = this._buffers.get(`${runId}:${streamId}`);
-
-    if (!record) {
-      logger.debug(
-        "[RelayRealtimeStreams][streamResponse] No ephemeral record found, waiting to see if one becomes available",
-        {
-          streamId,
-          runId,
-        }
-      );
-
-      record = await this.waitForBuffer(`${runId}:${streamId}`);
-
-      if (!record) {
-        logger.debug(
-          "[RelayRealtimeStreams][streamResponse] No ephemeral record found, using fallback",
-          {
-            streamId,
-            runId,
-          }
-        );
-
-        // No ephemeral record, use fallback
-        return this.options.fallbackResponder.streamResponse(
-          request,
-          runId,
-          streamId,
-          environment,
-          signal
-        );
-      }
-    }
-
-    // Only 1 reader of the stream can use the relayed stream, the rest should use the fallback
-    if (record.locked) {
-      logger.debug("[RelayRealtimeStreams][streamResponse] Stream already locked, using fallback", {
-        streamId,
-        runId,
-      });
-
-      return this.options.fallbackResponder.streamResponse(
-        request,
-        runId,
-        streamId,
-        environment,
-        signal
-      );
-    }
-
-    record.locked = true;
-    record.lastAccessed = Date.now();
-
-    logger.debug("[RelayRealtimeStreams][streamResponse] Streaming from ephemeral record", {
-      streamId,
-      runId,
-    });
-
-    // Create a streaming response from the buffered data
-    const stream = record.stream
-      .pipeThrough(new TextDecoderStream())
-      .pipeThrough(new LineTransformStream())
-      .pipeThrough(
-        new TransformStream({
-          transform(chunk, controller) {
-            for (const line of chunk) {
-              controller.enqueue(`data: ${line}\n\n`);
-            }
-          },
-        })
-      )
-      .pipeThrough(new TextEncoderStream());
-
-    // Once we start streaming, consider deleting the buffer when done.
-    // For a simple approach, we can rely on finalized and no more reads.
-    // Or we can let TTL cleanup handle it if multiple readers might come in.
-    return new Response(stream, {
-      headers: {
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
-        Connection: "keep-alive",
-        "x-trigger-relay-realtime-streams": "true",
-      },
-    });
-  }
-
-  async ingestData(
-    stream: ReadableStream<Uint8Array>,
-    runId: string,
-    streamId: string
-  ): Promise<Response> {
-    const [localStream, fallbackStream] = stream.tee();
-
-    logger.debug("[RelayRealtimeStreams][ingestData] Ingesting data", { runId, streamId });
-
-    // Handle local buffering asynchronously and catch errors
-    this.handleLocalIngestion(localStream, runId, streamId).catch((err) => {
-      logger.error("[RelayRealtimeStreams][ingestData] Error in local ingestion:", { err });
-    });
-
-    // Forward to the fallback ingestor asynchronously and catch errors
-    return this.options.fallbackIngestor.ingestData(fallbackStream, runId, streamId);
-  }
-
-  /**
-   * Handles local buffering of the stream data.
-   * @param stream The readable stream to buffer.
-   * @param streamId The unique identifier for the stream.
-   */
-  private async handleLocalIngestion(
-    stream: ReadableStream<Uint8Array>,
-    runId: string,
-    streamId: string
-  ) {
-    this.createOrUpdateRelayedStream(`${runId}:${streamId}`, stream);
-  }
-
-  /**
-   * Retrieves an existing buffer or creates a new one for the given streamId.
-   * @param streamId The unique identifier for the stream.
-   */
-  private createOrUpdateRelayedStream(
-    bufferKey: string,
-    stream: ReadableStream<Uint8Array>
-  ): RelayedStreamRecord {
-    let record = this._buffers.get(bufferKey);
-    if (!record) {
-      record = {
-        stream,
-        createdAt: Date.now(),
-        lastAccessed: Date.now(),
-        finalized: false,
-        locked: false,
-      };
-      this._buffers.set(bufferKey, record);
-    } else {
-      record.lastAccessed = Date.now();
-    }
-    return record;
-  }
-
-  private cleanup() {
-    const now = Date.now();
-
-    logger.debug("[RelayRealtimeStreams][cleanup] Cleaning up old buffers", {
-      bufferCount: this._buffers.size,
-    });
-
-    for (const [key, record] of this._buffers.entries()) {
-      // If last accessed is older than ttl, clean up
-      if (now - record.lastAccessed > this.options.ttl) {
-        this.deleteBuffer(key);
-      }
-    }
-
-    logger.debug("[RelayRealtimeStreams][cleanup] Cleaned up old buffers", {
-      bufferCount: this._buffers.size,
-    });
-  }
-
-  private deleteBuffer(bufferKey: string) {
-    this._buffers.delete(bufferKey);
-  }
-
-  /**
-   * Waits for a buffer to be created within a specified timeout.
-   * @param streamId The unique identifier for the stream.
-   * @returns A promise that resolves to true if the buffer was created, false otherwise.
-   */
-  private async waitForBuffer(bufferKey: string): Promise<RelayedStreamRecord | undefined> {
-    const timeout = this.waitForBufferTimeout;
-    const interval = this.waitForBufferInterval;
-    const maxAttempts = Math.ceil(timeout / interval);
-    let attempts = 0;
-
-    return new Promise<RelayedStreamRecord | undefined>((resolve) => {
-      const checkBuffer = () => {
-        attempts++;
-        if (this._buffers.has(bufferKey)) {
-          resolve(this._buffers.get(bufferKey));
-          return;
-        }
-        if (attempts >= maxAttempts) {
-          resolve(undefined);
-          return;
-        }
-        setTimeout(checkBuffer, interval);
-      };
-      checkBuffer();
-    });
-  }
-
-  // Don't forget to clear interval on shutdown if needed
-  close() {
-    clearInterval(this.cleanupInterval);
-  }
-}
-
-function initializeRelayRealtimeStreams() {
-  return new RelayRealtimeStreams({
-    ttl: 1000 * 60 * 5, // 5 minutes
-    cleanupInterval: 1000 * 60, // 1 minute
-    fallbackIngestor: v1RealtimeStreams,
-    fallbackResponder: v1RealtimeStreams,
-  });
-}
-
-export const relayRealtimeStreams = singleton(
-  "relayRealtimeStreams",
-  initializeRelayRealtimeStreams
-);
diff --git a/apps/webapp/app/services/realtime/s2realtimeStreams.server.ts b/apps/webapp/app/services/realtime/s2realtimeStreams.server.ts
new file mode 100644
index 00000000000..1d03116ff57
--- /dev/null
+++ b/apps/webapp/app/services/realtime/s2realtimeStreams.server.ts
@@ -0,0 +1,265 @@
+// app/realtime/S2RealtimeStreams.ts
+import type { UnkeyCache } from "@internal/cache";
+import { StreamIngestor, StreamResponder, StreamResponseOptions } from "./types";
+import { Logger, LogLevel } from "@trigger.dev/core/logger";
+import { randomUUID } from "node:crypto";
+
+export type S2RealtimeStreamsOptions = {
+  // S2
+  basin: string; // e.g., "my-basin"
+  accessToken: string; // "Bearer" token issued in S2 console
+  streamPrefix?: string; // defaults to ""
+
+  // Read behavior
+  s2WaitSeconds?: number;
+
+  flushIntervalMs?: number; // how often to flush buffered chunks (default 200ms)
+  maxRetries?: number; // max number of retries for failed flushes (default 10)
+
+  logger?: Logger;
+  logLevel?: LogLevel;
+
+  accessTokenExpirationInMs?: number;
+
+  cache?: UnkeyCache<{
+    accessToken: string;
+  }>;
+};
+
+type S2IssueAccessTokenResponse = { access_token: string };
+type S2AppendInput = { records: { body: string }[] };
+type S2AppendAck = {
+  start: { seq_num: number; timestamp: number };
+  end: { seq_num: number; timestamp: number };
+  tail: { seq_num: number; timestamp: number };
+};
+
+export class S2RealtimeStreams implements StreamResponder, StreamIngestor {
+  private readonly basin: string;
+  private readonly baseUrl: string;
+  private readonly token: string;
+  private readonly streamPrefix: string;
+
+  private readonly s2WaitSeconds: number;
+
+  private readonly flushIntervalMs: number;
+  private readonly maxRetries: number;
+
+  private readonly logger: Logger;
+  private readonly level: LogLevel;
+
+  private readonly accessTokenExpirationInMs: number;
+
+  private readonly cache?: UnkeyCache<{
+    accessToken: string;
+  }>;
+
+  constructor(opts: S2RealtimeStreamsOptions) {
+    this.basin = opts.basin;
+    this.baseUrl = `https://${this.basin}.b.aws.s2.dev/v1`;
+    this.token = opts.accessToken;
+    this.streamPrefix = opts.streamPrefix ?? "";
+
+    this.s2WaitSeconds = opts.s2WaitSeconds ?? 60;
+
+    this.flushIntervalMs = opts.flushIntervalMs ?? 200;
+    this.maxRetries = opts.maxRetries ?? 10;
+
+    this.logger = opts.logger ?? new Logger("S2RealtimeStreams", opts.logLevel ?? "info");
+    this.level = opts.logLevel ?? "info";
+
+    this.cache = opts.cache;
+    this.accessTokenExpirationInMs = opts.accessTokenExpirationInMs ?? 60_000 * 60 * 24; // 1 day
+  }
+
+  private toStreamName(runId: string, streamId: string): string {
+    return `${this.streamPrefix}/runs/${runId}/${streamId}`;
+  }
+
+  async initializeStream(
+    runId: string,
+    streamId: string
+  ): Promise<{ responseHeaders?: Record<string, string> }> {
+    const id = randomUUID();
+
+    const accessToken = await this.getS2AccessToken(id);
+
+    return {
+      responseHeaders: {
+        "X-S2-Access-Token": accessToken,
+        "X-S2-Stream-Name": `/runs/${runId}/${streamId}`,
+        "X-S2-Basin": this.basin,
+        "X-S2-Flush-Interval-Ms": this.flushIntervalMs.toString(),
+        "X-S2-Max-Retries": this.maxRetries.toString(),
+      },
+    };
+  }
+
+  ingestData(
+    stream: ReadableStream<Uint8Array>,
+    runId: string,
+    streamId: string,
+    clientId: string,
+    resumeFromChunk?: number
+  ): Promise<Response> {
+    throw new Error("S2 streams are written to S2 via the client, not from the server");
+  }
+
+  async appendPart(part: string, partId: string, runId: string, streamId: string): Promise<void> {
+    const s2Stream = this.toStreamName(runId, streamId);
+
+    this.logger.debug(`S2 appending to stream`, { part, stream: s2Stream });
+
+    const result = await this.s2Append(s2Stream, {
+      records: [{ body: JSON.stringify({ data: part, id: partId }) }],
+    });
+
+    this.logger.debug(`S2 append result`, { result });
+  }
+
+  getLastChunkIndex(runId: string, streamId: string, clientId: string): Promise<number> {
+    throw new Error("S2 streams are written to S2 via the client, not from the server");
+  }
+
+  // ---------- Serve SSE from S2 ----------
+
+  async streamResponse(
+    request: Request,
+    runId: string,
+    streamId: string,
+    signal: AbortSignal,
+    options?: StreamResponseOptions
+  ): Promise<Response> {
+    const s2Stream = this.toStreamName(runId, streamId);
+    const startSeq = this.parseLastEventId(options?.lastEventId);
+
+    this.logger.info(`S2 streaming records from stream`, { stream: s2Stream, startSeq });
+
+    // Request SSE stream from S2 and return it directly
+    const s2Response = await this.s2StreamRecords(s2Stream, {
+      seq_num: startSeq ?? 0,
+      clamp: true,
+      wait: options?.timeoutInSeconds ?? this.s2WaitSeconds, // S2 will keep the connection open and stream new records
+      signal, // Pass abort signal so S2 connection is cleaned up when client disconnects
+    });
+
+    // Return S2's SSE response directly to the client
+    return s2Response;
+  }
+
+  // ---------- Internals: S2 REST ----------
+  private async s2Append(stream: string, body: S2AppendInput): Promise<S2AppendAck> {
+    // POST /v1/streams/{stream}/records (JSON)
+    const res = await fetch(`${this.baseUrl}/streams/${encodeURIComponent(stream)}/records`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${this.token}`,
+        "Content-Type": "application/json",
+        "S2-Format": "raw", // UTF-8 JSON encoding (no base64 overhead) when your data is text. :contentReference[oaicite:8]{index=8}
+      },
+      body: JSON.stringify(body),
+    });
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`S2 append failed: ${res.status} ${res.statusText} ${text}`);
+    }
+    return (await res.json()) as S2AppendAck;
+  }
+
+  private async getS2AccessToken(id: string): Promise<string> {
+    if (!this.cache) {
+      return this.s2IssueAccessToken(id);
+    }
+
+    const result = await this.cache.accessToken.swr(this.streamPrefix, async () => {
+      return this.s2IssueAccessToken(id);
+    });
+
+    if (!result.val) {
+      throw new Error("Failed to get S2 access token");
+    }
+
+    return result.val;
+  }
+
+  private async s2IssueAccessToken(id: string): Promise<string> {
+    // POST /v1/access-tokens
+    const res = await fetch(`https://aws.s2.dev/v1/access-tokens`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${this.token}`,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        id,
+        scope: {
+          basins: {
+            exact: this.basin,
+          },
+          ops: ["append", "create-stream"],
+          streams: {
+            prefix: this.streamPrefix,
+          },
+        },
+        expires_at: new Date(Date.now() + this.accessTokenExpirationInMs).toISOString(),
+        auto_prefix_streams: true,
+      }),
+    });
+
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`S2 issue access token failed: ${res.status} ${res.statusText} ${text}`);
+    }
+    const data = (await res.json()) as S2IssueAccessTokenResponse;
+    return data.access_token;
+  }
+
+  private async s2StreamRecords(
+    stream: string,
+    opts: {
+      seq_num?: number;
+      clamp?: boolean;
+      wait?: number;
+      signal?: AbortSignal;
+    }
+  ): Promise<Response> {
+    // GET /v1/streams/{stream}/records with Accept: text/event-stream for SSE streaming
+    const qs = new URLSearchParams();
+    if (opts.seq_num != null) qs.set("seq_num", String(opts.seq_num));
+    if (opts.clamp != null) qs.set("clamp", String(opts.clamp));
+    if (opts.wait != null) qs.set("wait", String(opts.wait));
+
+    const res = await fetch(`${this.baseUrl}/streams/${encodeURIComponent(stream)}/records?${qs}`, {
+      method: "GET",
+      headers: {
+        Authorization: `Bearer ${this.token}`,
+        Accept: "text/event-stream",
+        "S2-Format": "raw",
+      },
+      signal: opts.signal,
+    });
+
+    if (!res.ok) {
+      const text = await res.text().catch(() => "");
+      throw new Error(`S2 stream failed: ${res.status} ${res.statusText} ${text}`);
+    }
+
+    const headers = new Headers(res.headers);
+    headers.set("X-Stream-Version", "v2");
+    headers.set("Access-Control-Expose-Headers", "*");
+
+    return new Response(res.body, {
+      headers,
+      status: res.status,
+      statusText: res.statusText,
+    });
+  }
+
+  private parseLastEventId(lastEventId?: string): number | undefined {
+    if (!lastEventId) return undefined;
+    // tolerate formats like "1699999999999-5" (take leading digits)
+    const digits = lastEventId.split("-")[0];
+    const n = Number(digits);
+    return Number.isFinite(n) && n >= 0 ? n + 1 : undefined;
+  }
+}
diff --git a/apps/webapp/app/services/realtime/types.ts b/apps/webapp/app/services/realtime/types.ts
index 802e99c38e9..912711019ab 100644
--- a/apps/webapp/app/services/realtime/types.ts
+++ b/apps/webapp/app/services/realtime/types.ts
@@ -1,21 +1,35 @@
-import { AuthenticatedEnvironment } from "../apiAuth.server";
-
 // Interface for stream ingestion
 export interface StreamIngestor {
+  initializeStream(
+    runId: string,
+    streamId: string
+  ): Promise<{ responseHeaders?: Record<string, string> }>;
+
   ingestData(
     stream: ReadableStream<Uint8Array>,
     runId: string,
-    streamId: string
+    streamId: string,
+    clientId: string,
+    resumeFromChunk?: number
   ): Promise<Response>;
+
+  appendPart(part: string, partId: string, runId: string, streamId: string): Promise<void>;
+
+  getLastChunkIndex(runId: string, streamId: string, clientId: string): Promise<number>;
 }
 
+export type StreamResponseOptions = {
+  timeoutInSeconds?: number;
+  lastEventId?: string;
+};
+
 // Interface for stream response
 export interface StreamResponder {
   streamResponse(
     request: Request,
     runId: string,
     streamId: string,
-    environment: AuthenticatedEnvironment,
-    signal: AbortSignal
+    signal: AbortSignal,
+    options?: StreamResponseOptions
   ): Promise<Response>;
 }
diff --git a/apps/webapp/app/services/realtime/v1StreamsGlobal.server.ts b/apps/webapp/app/services/realtime/v1StreamsGlobal.server.ts
index e7d26520023..7cc21101bf2 100644
--- a/apps/webapp/app/services/realtime/v1StreamsGlobal.server.ts
+++ b/apps/webapp/app/services/realtime/v1StreamsGlobal.server.ts
@@ -1,6 +1,16 @@
+import {
+  createCache,
+  createLRUMemoryStore,
+  DefaultStatefulContext,
+  Namespace,
+  RedisCacheStore,
+} from "@internal/cache";
 import { env } from "~/env.server";
 import { singleton } from "~/utils/singleton";
+import { AuthenticatedEnvironment } from "../apiAuth.server";
 import { RedisRealtimeStreams } from "./redisRealtimeStreams.server";
+import { S2RealtimeStreams } from "./s2realtimeStreams.server";
+import { StreamIngestor, StreamResponder } from "./types";
 
 function initializeRedisRealtimeStreams() {
   return new RedisRealtimeStreams({
@@ -13,7 +23,87 @@ function initializeRedisRealtimeStreams() {
       ...(env.REALTIME_STREAMS_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
       keyPrefix: "tr:realtime:streams:",
     },
+    inactivityTimeoutMs: env.REALTIME_STREAMS_INACTIVITY_TIMEOUT_MS,
   });
 }
 
 export const v1RealtimeStreams = singleton("realtimeStreams", initializeRedisRealtimeStreams);
+
+export function getRealtimeStreamInstance(
+  environment: AuthenticatedEnvironment,
+  streamVersion: string
+): StreamIngestor & StreamResponder {
+  if (streamVersion === "v1") {
+    return v1RealtimeStreams;
+  } else {
+    if (env.REALTIME_STREAMS_S2_BASIN && env.REALTIME_STREAMS_S2_ACCESS_TOKEN) {
+      return new S2RealtimeStreams({
+        basin: env.REALTIME_STREAMS_S2_BASIN,
+        accessToken: env.REALTIME_STREAMS_S2_ACCESS_TOKEN,
+        streamPrefix: [
+          "org",
+          environment.organization.id,
+          "env",
+          environment.slug,
+          environment.id,
+        ].join("/"),
+        logLevel: env.REALTIME_STREAMS_S2_LOG_LEVEL,
+        flushIntervalMs: env.REALTIME_STREAMS_S2_FLUSH_INTERVAL_MS,
+        maxRetries: env.REALTIME_STREAMS_S2_MAX_RETRIES,
+        s2WaitSeconds: env.REALTIME_STREAMS_S2_WAIT_SECONDS,
+        accessTokenExpirationInMs: env.REALTIME_STREAMS_S2_ACCESS_TOKEN_EXPIRATION_IN_MS,
+        cache: s2RealtimeStreamsCache,
+      });
+    }
+
+    throw new Error("Realtime streams v2 is required for this run but S2 configuration is missing");
+  }
+}
+
+export function determineRealtimeStreamsVersion(streamVersion?: string): "v1" | "v2" {
+  if (!streamVersion) {
+    return env.REALTIME_STREAMS_DEFAULT_VERSION;
+  }
+
+  if (
+    streamVersion === "v2" &&
+    env.REALTIME_STREAMS_S2_BASIN &&
+    env.REALTIME_STREAMS_S2_ACCESS_TOKEN
+  ) {
+    return "v2";
+  }
+
+  return "v1";
+}
+
+const s2RealtimeStreamsCache = singleton(
+  "s2RealtimeStreamsCache",
+  initializeS2RealtimeStreamsCache
+);
+
+function initializeS2RealtimeStreamsCache() {
+  const ctx = new DefaultStatefulContext();
+  const redisCacheStore = new RedisCacheStore({
+    name: "s2-realtime-streams-cache",
+    connection: {
+      port: env.REALTIME_STREAMS_REDIS_PORT,
+      host: env.REALTIME_STREAMS_REDIS_HOST,
+      username: env.REALTIME_STREAMS_REDIS_USERNAME,
+      password: env.REALTIME_STREAMS_REDIS_PASSWORD,
+      enableAutoPipelining: true,
+      ...(env.REALTIME_STREAMS_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
+      keyPrefix: "s2-realtime-streams-cache:",
+    },
+    useModernCacheKeyBuilder: true,
+  });
+
+  const memoryStore = createLRUMemoryStore(5000);
+
+  return createCache({
+    accessToken: new Namespace<string>(ctx, {
+      stores: [memoryStore, redisCacheStore],
+      fresh: Math.floor(env.REALTIME_STREAMS_S2_ACCESS_TOKEN_EXPIRATION_IN_MS / 2),
+      stale: Math.floor(env.REALTIME_STREAMS_S2_ACCESS_TOKEN_EXPIRATION_IN_MS / 2 + 60_000),
+    }),
+  });
+}
diff --git a/apps/webapp/app/services/realtimeClient.server.ts b/apps/webapp/app/services/realtimeClient.server.ts
index 68bccc9f6a2..d962a57426e 100644
--- a/apps/webapp/app/services/realtimeClient.server.ts
+++ b/apps/webapp/app/services/realtimeClient.server.ts
@@ -8,7 +8,7 @@ import { longPollingFetch } from "~/utils/longPollingFetch";
 import { logger } from "./logger.server";
 import { jumpHash } from "@trigger.dev/core/v3/serverOnly";
 import { Cache, createCache, DefaultStatefulContext, Namespace } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import { createLRUMemoryStore } from "@internal/cache";
 import { RedisCacheStore } from "./unkey/redisCacheStore.server";
 import { env } from "~/env.server";
 import { API_VERSIONS, CURRENT_API_VERSION } from "~/api/versions";
@@ -43,6 +43,7 @@ const DEFAULT_ELECTRIC_COLUMNS = [
   "outputType",
   "runTags",
   "error",
+  "realtimeStreams",
 ];
 
 const RESERVED_COLUMNS = ["id", "taskIdentifier", "friendlyId", "status", "createdAt"];
@@ -83,7 +84,7 @@ export class RealtimeClient {
     this.#registerCommands();
 
     const ctx = new DefaultStatefulContext();
-    const memory = new MemoryStore({ persistentMap: new Map() });
+    const memory = createLRUMemoryStore(1000);
     const redisCacheStore = new RedisCacheStore({
       connection: {
         keyPrefix: "tr:cache:realtime",
diff --git a/apps/webapp/app/services/redisConcurrencyLimiter.server.ts b/apps/webapp/app/services/redisConcurrencyLimiter.server.ts
new file mode 100644
index 00000000000..a4f87f88f43
--- /dev/null
+++ b/apps/webapp/app/services/redisConcurrencyLimiter.server.ts
@@ -0,0 +1,143 @@
+import { createRedisClient, type RedisClient, type RedisWithClusterOptions } from "~/redis.server";
+
+export type RedisConcurrencyLimiterOptions = {
+  redis: RedisWithClusterOptions;
+  /** Prefix for Redis keys */
+  keyPrefix: string;
+  /** Auto-expire stale entries after this many seconds (default: 300 = 5 minutes) */
+  expiryTimeInSeconds?: number;
+};
+
+export type AcquireResult =
+  | { success: true }
+  | { success: false; reason: "key_limit" | "global_limit" };
+
+/**
+ * A generic Redis-based concurrency limiter that supports two-level limiting:
+ * - Key-level limit (e.g., per organization)
+ * - Global limit (across all keys)
+ *
+ * Uses Redis sorted sets with timestamps to track active requests,
+ * with automatic expiry of stale entries as a safety net.
+ */
+export class RedisConcurrencyLimiter {
+  private redis: RedisClient;
+  private keyPrefix: string;
+  private expiryTimeInSeconds: number;
+
+  constructor(options: RedisConcurrencyLimiterOptions) {
+    this.redis = createRedisClient(`${options.keyPrefix}:limiter`, options.redis);
+    this.keyPrefix = options.keyPrefix;
+    this.expiryTimeInSeconds = options.expiryTimeInSeconds ?? 300; // 5 minutes default
+    this.#registerCommands();
+  }
+
+  /**
+   * Acquire a concurrency slot atomically checking both key and global limits.
+   *
+   * @param options.key - The key to limit (e.g., organizationId)
+   * @param options.requestId - A unique identifier for this request
+   * @param options.keyLimit - The maximum concurrent requests for this key
+   * @param options.globalLimit - The maximum concurrent requests globally
+   * @returns Success or failure with reason
+   */
+  async acquire(options: {
+    key: string;
+    requestId: string;
+    keyLimit: number;
+    globalLimit: number;
+  }): Promise<AcquireResult> {
+    const { key, requestId, keyLimit, globalLimit } = options;
+    const keyKey = this.#getKeyKey(key);
+    const globalKey = this.#getGlobalKey();
+    const now = Date.now();
+    const cutoffTime = now - this.expiryTimeInSeconds * 1000;
+
+    // @ts-expect-error - Custom command defined via defineCommand
+    const result = await this.redis.acquireConcurrency(
+      keyKey,
+      globalKey,
+      now.toString(),
+      requestId,
+      this.expiryTimeInSeconds.toString(),
+      cutoffTime.toString(),
+      keyLimit.toString(),
+      globalLimit.toString()
+    );
+
+    // Result: 1 = success, 0 = key limit exceeded, -1 = global limit exceeded
+    if (result === 1) {
+      return { success: true };
+    } else if (result === 0) {
+      return { success: false, reason: "key_limit" };
+    } else {
+      return { success: false, reason: "global_limit" };
+    }
+  }
+
+  /**
+   * Release a concurrency slot.
+   *
+   * @param options.key - The key that was used to acquire
+   * @param options.requestId - The request identifier used to acquire
+   */
+  async release(options: { key: string; requestId: string }): Promise<void> {
+    const { key, requestId } = options;
+    const keyKey = this.#getKeyKey(key);
+    const globalKey = this.#getGlobalKey();
+
+    // Remove from both sets in a single round trip
+    await this.redis.pipeline().zrem(keyKey, requestId).zrem(globalKey, requestId).exec();
+  }
+
+  #getKeyKey(key: string): string {
+    return `${this.keyPrefix}:key:${key}`;
+  }
+
+  #getGlobalKey(): string {
+    return `${this.keyPrefix}:global`;
+  }
+
+  #registerCommands() {
+    this.redis.defineCommand("acquireConcurrency", {
+      numberOfKeys: 2,
+      lua: /* lua */ `
+        local keyKey = KEYS[1]
+        local globalKey = KEYS[2]
+
+        local timestamp = tonumber(ARGV[1])
+        local requestId = ARGV[2]
+        local expiryTime = tonumber(ARGV[3])
+        local cutoffTime = tonumber(ARGV[4])
+        local keyLimit = tonumber(ARGV[5])
+        local globalLimit = tonumber(ARGV[6])
+
+        -- Remove expired entries from both sets
+        redis.call('ZREMRANGEBYSCORE', keyKey, '-inf', cutoffTime)
+        redis.call('ZREMRANGEBYSCORE', globalKey, '-inf', cutoffTime)
+
+        -- Check global limit first (more restrictive check)
+        local globalCount = redis.call('ZCARD', globalKey)
+        if globalCount >= globalLimit then
+            return -1  -- Global limit exceeded
+        end
+
+        -- Check key-specific limit
+        local keyCount = redis.call('ZCARD', keyKey)
+        if keyCount >= keyLimit then
+            return 0  -- Key limit exceeded
+        end
+
+        -- Add the request to both sorted sets
+        redis.call('ZADD', keyKey, timestamp, requestId)
+        redis.call('ZADD', globalKey, timestamp, requestId)
+
+        -- Set expiry on both keys
+        redis.call('EXPIRE', keyKey, expiryTime)
+        redis.call('EXPIRE', globalKey, expiryTime)
+
+        return 1  -- Success
+      `,
+    });
+  }
+}
diff --git a/apps/webapp/app/services/referralSource.server.ts b/apps/webapp/app/services/referralSource.server.ts
new file mode 100644
index 00000000000..e98c8ebcb2c
--- /dev/null
+++ b/apps/webapp/app/services/referralSource.server.ts
@@ -0,0 +1,53 @@
+import { createCookie } from "@remix-run/node";
+import { z } from "zod";
+import { prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { telemetry } from "~/services/telemetry.server";
+
+const ReferralSourceSchema = z.enum(["vercel"]);
+
+export type ReferralSource = z.infer<typeof ReferralSourceSchema>;
+
+// Cookie that persists for 1 hour to track referral source during login flow
+export const referralSourceCookie = createCookie("referral-source", {
+  maxAge: 60 * 60, // 1 hour
+  httpOnly: true,
+  sameSite: "lax",
+  secure: env.NODE_ENV === "production",
+});
+
+export async function getReferralSource(request: Request): Promise<ReferralSource | null> {
+  const cookie = request.headers.get("Cookie");
+  const value = await referralSourceCookie.parse(cookie);
+  const parsed = ReferralSourceSchema.safeParse(value);
+  return parsed.success ? parsed.data : null;
+}
+
+export async function setReferralSourceCookie(source: ReferralSource): Promise<string> {
+  return referralSourceCookie.serialize(source);
+}
+
+export async function clearReferralSourceCookie(): Promise<string> {
+  return referralSourceCookie.serialize("", {
+    maxAge: 0,
+  });
+}
+
+export async function trackAndClearReferralSource(
+  request: Request,
+  userId: string,
+  headers: Headers
+): Promise<void> {
+  const referralSource = await getReferralSource(request);
+  if (!referralSource) return;
+
+  headers.append("Set-Cookie", await clearReferralSourceCookie());
+
+  const user = await prisma.user.findUnique({ where: { id: userId } });
+  if (!user) return;
+
+  const userAge = Date.now() - user.createdAt.getTime();
+  if (userAge >= 30 * 1000) return;
+
+  telemetry.user.identify({ user, isNewUser: true, referralSource });
+}
diff --git a/apps/webapp/app/services/requestIdempotency.server.ts b/apps/webapp/app/services/requestIdempotency.server.ts
index 64e839fbcac..85767ed8951 100644
--- a/apps/webapp/app/services/requestIdempotency.server.ts
+++ b/apps/webapp/app/services/requestIdempotency.server.ts
@@ -1,6 +1,6 @@
 import { Logger, LogLevel } from "@trigger.dev/core/logger";
 import { createCache, DefaultStatefulContext, Namespace, Cache as UnkeyCache } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import { createLRUMemoryStore } from "@internal/cache";
 import { RedisCacheStore } from "./unkey/redisCacheStore.server";
 import { RedisWithClusterOptions } from "~/redis.server";
 import { validate as uuidValidate, version as uuidVersion } from "uuid";
@@ -33,7 +33,7 @@ export class RequestIdempotencyService<TTypes extends string> {
       : "request-idempotency:";
 
     const ctx = new DefaultStatefulContext();
-    const memory = new MemoryStore({ persistentMap: new Map() });
+    const memory = createLRUMemoryStore(1000);
     const redisCacheStore = new RedisCacheStore({
       name: "request-idempotency",
       connection: {
diff --git a/apps/webapp/app/services/requestIdempotencyInstance.server.ts b/apps/webapp/app/services/requestIdempotencyInstance.server.ts
index 1429ed50b04..20061daa4c1 100644
--- a/apps/webapp/app/services/requestIdempotencyInstance.server.ts
+++ b/apps/webapp/app/services/requestIdempotencyInstance.server.ts
@@ -17,6 +17,6 @@ function createRequestIdempotencyInstance() {
     },
     logLevel: env.REQUEST_IDEMPOTENCY_LOG_LEVEL,
     ttlInMs: env.REQUEST_IDEMPOTENCY_TTL_IN_MS,
-    types: ["batch-trigger", "trigger"],
+    types: ["batch-trigger", "trigger", "create-batch"],
   });
 }
diff --git a/apps/webapp/app/services/resourceMonitor.server.ts b/apps/webapp/app/services/resourceMonitor.server.ts
new file mode 100644
index 00000000000..9a8fee52eb9
--- /dev/null
+++ b/apps/webapp/app/services/resourceMonitor.server.ts
@@ -0,0 +1,11 @@
+import { ResourceMonitor } from "@trigger.dev/core/v3/serverOnly";
+import { singleton } from "~/utils/singleton";
+
+export const resourceMonitor = singleton("resourceMonitor", initializeResourceMonitor);
+
+function initializeResourceMonitor() {
+  return new ResourceMonitor({
+    ctx: {},
+    verbose: false,
+  });
+}
diff --git a/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts b/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts
index 9e161abe072..9fa2b8e5d05 100644
--- a/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts
+++ b/apps/webapp/app/services/routeBuilders/apiBuilder.server.ts
@@ -22,6 +22,9 @@ import {
   WorkerGroupTokenService,
 } from "~/v3/services/worker/workerGroupTokenService.server";
 import { API_VERSIONS, getApiVersion } from "~/api/versions";
+import { WORKER_HEADERS } from "@trigger.dev/core/v3/runEngineWorker";
+import { ServiceValidationError } from "~/v3/services/common.server";
+import { EngineServiceValidationError } from "@internal/run-engine";
 
 type AnyZodSchema = z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>;
 
@@ -430,7 +433,8 @@ type ApiKeyActionRouteBuilderOptions<
   TParamsSchema extends AnyZodSchema | undefined = undefined,
   TSearchParamsSchema extends AnyZodSchema | undefined = undefined,
   THeadersSchema extends AnyZodSchema | undefined = undefined,
-  TBodySchema extends AnyZodSchema | undefined = undefined
+  TBodySchema extends AnyZodSchema | undefined = undefined,
+  TResource = never
 > = {
   params?: TParamsSchema;
   searchParams?: TSearchParamsSchema;
@@ -438,6 +442,17 @@ type ApiKeyActionRouteBuilderOptions<
   allowJWT?: boolean;
   corsStrategy?: "all" | "none";
   method?: "POST" | "PUT" | "DELETE" | "PATCH";
+  findResource?: (
+    params: TParamsSchema extends z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>
+      ? z.infer<TParamsSchema>
+      : undefined,
+    authentication: ApiAuthenticationResultSuccess,
+    searchParams: TSearchParamsSchema extends
+      | z.ZodFirstPartySchemaTypes
+      | z.ZodDiscriminatedUnion<any, any>
+      ? z.infer<TSearchParamsSchema>
+      : undefined
+  ) => Promise<TResource | undefined>;
   authorization?: {
     action: AuthorizationAction;
     resource: (
@@ -466,7 +481,8 @@ type ApiKeyActionHandlerFunction<
   TParamsSchema extends AnyZodSchema | undefined,
   TSearchParamsSchema extends AnyZodSchema | undefined,
   THeadersSchema extends AnyZodSchema | undefined = undefined,
-  TBodySchema extends AnyZodSchema | undefined = undefined
+  TBodySchema extends AnyZodSchema | undefined = undefined,
+  TResource = never
 > = (args: {
   params: TParamsSchema extends z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>
     ? z.infer<TParamsSchema>
@@ -484,25 +500,29 @@ type ApiKeyActionHandlerFunction<
     : undefined;
   authentication: ApiAuthenticationResultSuccess;
   request: Request;
+  resource?: TResource;
 }) => Promise<Response>;
 
 export function createActionApiRoute<
   TParamsSchema extends AnyZodSchema | undefined = undefined,
   TSearchParamsSchema extends AnyZodSchema | undefined = undefined,
   THeadersSchema extends AnyZodSchema | undefined = undefined,
-  TBodySchema extends AnyZodSchema | undefined = undefined
+  TBodySchema extends AnyZodSchema | undefined = undefined,
+  TResource = never
 >(
   options: ApiKeyActionRouteBuilderOptions<
     TParamsSchema,
     TSearchParamsSchema,
     THeadersSchema,
-    TBodySchema
+    TBodySchema,
+    TResource
   >,
   handler: ApiKeyActionHandlerFunction<
     TParamsSchema,
     TSearchParamsSchema,
     THeadersSchema,
-    TBodySchema
+    TBodySchema,
+    TResource
   >
 ) {
   const {
@@ -682,6 +702,18 @@ export function createActionApiRoute<
         }
       }
 
+      const resource = options.findResource
+        ? await options.findResource(parsedParams, authenticationResult, parsedSearchParams)
+        : undefined;
+
+      if (options.findResource && !resource) {
+        return await wrapResponse(
+          request,
+          json({ error: "Resource not found" }, { status: 404 }),
+          corsStrategy !== "none"
+        );
+      }
+
       const result = await handler({
         params: parsedParams,
         searchParams: parsedSearchParams,
@@ -689,6 +721,7 @@ export function createActionApiRoute<
         body: parsedBody,
         authentication: authenticationResult,
         request,
+        resource,
       });
       return await wrapResponse(request, result, corsStrategy !== "none");
     } catch (error) {
@@ -765,6 +798,7 @@ type WorkerLoaderHandlerFunction<
   headers: THeadersSchema extends z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>
     ? z.infer<THeadersSchema>
     : undefined;
+  runnerId?: string;
 }) => Promise<Response>;
 
 export function createLoaderWorkerApiRoute<
@@ -828,12 +862,15 @@ export function createLoaderWorkerApiRoute<
         parsedHeaders = headers.data;
       }
 
+      const runnerId = request.headers.get(WORKER_HEADERS.RUNNER_ID) ?? undefined;
+
       const result = await handler({
         params: parsedParams,
         searchParams: parsedSearchParams,
         authenticatedWorker: authenticationResult,
         request,
         headers: parsedHeaders,
+        runnerId,
       });
       return result;
     } catch (error) {
@@ -894,6 +931,7 @@ type WorkerActionHandlerFunction<
   body: TBodySchema extends z.ZodFirstPartySchemaTypes | z.ZodDiscriminatedUnion<any, any>
     ? z.infer<TBodySchema>
     : undefined;
+  runnerId?: string;
 }) => Promise<Response>;
 
 export function createActionWorkerApiRoute<
@@ -991,6 +1029,8 @@ export function createActionWorkerApiRoute<
         parsedBody = parsed.data;
       }
 
+      const runnerId = request.headers.get(WORKER_HEADERS.RUNNER_ID) ?? undefined;
+
       const result = await handler({
         params: parsedParams,
         searchParams: parsedSearchParams,
@@ -998,14 +1038,22 @@ export function createActionWorkerApiRoute<
         request,
         body: parsedBody,
         headers: parsedHeaders,
+        runnerId,
       });
       return result;
     } catch (error) {
-      console.error("Error in API route:", error);
       if (error instanceof Response) {
         return error;
       }
 
+      if (error instanceof EngineServiceValidationError) {
+        return json({ error: error.message }, { status: error.status ?? 422 });
+      }
+
+      if (error instanceof ServiceValidationError) {
+        return json({ error: error.message }, { status: error.status ?? 422 });
+      }
+
       logger.error("Error in action", {
         error:
           error instanceof Error
diff --git a/apps/webapp/app/services/runsBackfiller.server.ts b/apps/webapp/app/services/runsBackfiller.server.ts
new file mode 100644
index 00000000000..7fc824f3d39
--- /dev/null
+++ b/apps/webapp/app/services/runsBackfiller.server.ts
@@ -0,0 +1,97 @@
+import { Tracer } from "@opentelemetry/api";
+import type { PrismaClientOrTransaction } from "@trigger.dev/database";
+import { RunsReplicationService } from "~/services/runsReplicationService.server";
+import { startSpan } from "~/v3/tracing.server";
+import { FINAL_RUN_STATUSES } from "../v3/taskStatus";
+import { Logger } from "@trigger.dev/core/logger";
+
+export class RunsBackfillerService {
+  private readonly prisma: PrismaClientOrTransaction;
+  private readonly runsReplicationInstance: RunsReplicationService;
+  private readonly tracer: Tracer;
+  private readonly logger: Logger;
+
+  constructor(opts: {
+    prisma: PrismaClientOrTransaction;
+    runsReplicationInstance: RunsReplicationService;
+    tracer: Tracer;
+    logLevel?: "log" | "error" | "warn" | "info" | "debug";
+  }) {
+    this.prisma = opts.prisma;
+    this.runsReplicationInstance = opts.runsReplicationInstance;
+    this.tracer = opts.tracer;
+    this.logger = new Logger("RunsBackfillerService", opts.logLevel ?? "debug");
+  }
+
+  public async call({
+    from,
+    to,
+    cursor,
+    batchSize,
+  }: {
+    from: Date;
+    to: Date;
+    cursor?: string;
+    batchSize?: number;
+  }): Promise<string | undefined> {
+    return await startSpan(this.tracer, "RunsBackfillerService.call()", async (span) => {
+      span.setAttribute("from", from.toISOString());
+      span.setAttribute("to", to.toISOString());
+      span.setAttribute("cursor", cursor ?? "");
+      span.setAttribute("batchSize", batchSize ?? 0);
+
+      const runs = await this.prisma.taskRun.findMany({
+        where: {
+          createdAt: {
+            gte: from,
+            lte: to,
+          },
+          status: {
+            in: FINAL_RUN_STATUSES,
+          },
+          ...(cursor ? { id: { gt: cursor } } : {}),
+        },
+        orderBy: {
+          id: "asc",
+        },
+        take: batchSize,
+      });
+
+      if (runs.length === 0) {
+        this.logger.info("No runs to backfill", { from, to, cursor });
+
+        return;
+      }
+
+      this.logger.info("Backfilling runs", {
+        from,
+        to,
+        cursor,
+        batchSize,
+        runCount: runs.length,
+        firstCreatedAt: runs[0].createdAt,
+        lastCreatedAt: runs[runs.length - 1].createdAt,
+      });
+
+      await this.runsReplicationInstance.backfill(
+        runs.map((run) => ({
+          ...run,
+          masterQueue: run.workerQueue,
+        }))
+      );
+
+      const lastRun = runs[runs.length - 1];
+
+      this.logger.info("Backfilled runs", {
+        from,
+        to,
+        cursor,
+        batchSize,
+        lastRunId: lastRun.id,
+      });
+
+      // Return the last run ID to continue from
+      return lastRun.id;
+    });
+  }
+}
diff --git a/apps/webapp/app/services/runsReplicationInstance.server.ts b/apps/webapp/app/services/runsReplicationInstance.server.ts
index 86b17601a7d..8dc078d338f 100644
--- a/apps/webapp/app/services/runsReplicationInstance.server.ts
+++ b/apps/webapp/app/services/runsReplicationInstance.server.ts
@@ -2,9 +2,9 @@ import { ClickHouse } from "@internal/clickhouse";
 import invariant from "tiny-invariant";
 import { env } from "~/env.server";
 import { singleton } from "~/utils/singleton";
-import { provider } from "~/v3/tracer.server";
-import { logger } from "./logger.server";
+import { meter, provider } from "~/v3/tracer.server";
 import { RunsReplicationService } from "./runsReplicationService.server";
+import { signalsEmitter } from "./signals.server";
 
 export const runsReplicationInstance = singleton(
   "runsReplicationInstance",
@@ -62,9 +62,12 @@ function initializeRunsReplicationInstance() {
     logLevel: env.RUN_REPLICATION_LOG_LEVEL,
     waitForAsyncInsert: env.RUN_REPLICATION_WAIT_FOR_ASYNC_INSERT === "1",
     tracer: provider.getTracer("runs-replication-service"),
+    meter,
     insertMaxRetries: env.RUN_REPLICATION_INSERT_MAX_RETRIES,
     insertBaseDelayMs: env.RUN_REPLICATION_INSERT_BASE_DELAY_MS,
     insertMaxDelayMs: env.RUN_REPLICATION_INSERT_MAX_DELAY_MS,
+    insertStrategy: env.RUN_REPLICATION_INSERT_STRATEGY,
+    disablePayloadInsert: env.RUN_REPLICATION_DISABLE_PAYLOAD_INSERT === "1",
   });
 
   if (env.RUN_REPLICATION_ENABLED === "1") {
@@ -79,8 +82,8 @@ function initializeRunsReplicationInstance() {
         });
       });
 
-    process.on("SIGTERM", service.shutdown.bind(service));
-    process.on("SIGINT", service.shutdown.bind(service));
+    signalsEmitter.on("SIGTERM", service.shutdown.bind(service));
+    signalsEmitter.on("SIGINT", service.shutdown.bind(service));
   }
 
   return service;
diff --git a/apps/webapp/app/services/runsReplicationService.server.ts b/apps/webapp/app/services/runsReplicationService.server.ts
index 3acd04e4129..faa0f3d9822 100644
--- a/apps/webapp/app/services/runsReplicationService.server.ts
+++ b/apps/webapp/app/services/runsReplicationService.server.ts
@@ -1,5 +1,6 @@
-import type { ClickHouse, RawTaskRunPayloadV1, TaskRunV2 } from "@internal/clickhouse";
-import { RedisOptions } from "@internal/redis";
+import type { ClickHouse, TaskRunInsertArray, PayloadInsertArray } from "@internal/clickhouse";
+import { getTaskRunField, getPayloadField } from "@internal/clickhouse";
+import { type RedisOptions } from "@internal/redis";
 import {
   LogicalReplicationClient,
   type MessageDelete,
@@ -7,15 +8,24 @@ import {
   type MessageUpdate,
   type PgoutputMessage,
 } from "@internal/replication";
-import { recordSpanError, startSpan, trace, type Tracer } from "@internal/tracing";
-import { Logger, LogLevel } from "@trigger.dev/core/logger";
+import {
+  getMeter,
+  recordSpanError,
+  startSpan,
+  trace,
+  type Counter,
+  type Histogram,
+  type Meter,
+  type Tracer,
+} from "@internal/tracing";
+import { Logger, type LogLevel } from "@trigger.dev/core/logger";
 import { tryCatch } from "@trigger.dev/core/utils";
 import { parsePacketAsJson } from "@trigger.dev/core/v3/utils/ioSerialization";
-import { TaskRun } from "@trigger.dev/database";
+import { unsafeExtractIdempotencyKeyScope, unsafeExtractIdempotencyKeyUser } from "@trigger.dev/core/v3/serverOnly";
+import { type TaskRun } from "@trigger.dev/database";
 import { nanoid } from "nanoid";
 import EventEmitter from "node:events";
 import pLimit from "p-limit";
-import { logger } from "./logger.server";
 import { detectBadJsonStrings } from "~/utils/detectBadJsonStrings";
 
 interface TransactionEvent<T = any> {
@@ -52,17 +62,29 @@ export type RunsReplicationServiceOptions = {
   logger?: Logger;
   logLevel?: LogLevel;
   tracer?: Tracer;
+  meter?: Meter;
   waitForAsyncInsert?: boolean;
+  insertStrategy?: "insert" | "insert_async";
   // Retry configuration for insert operations
   insertMaxRetries?: number;
   insertBaseDelayMs?: number;
   insertMaxDelayMs?: number;
+  disablePayloadInsert?: boolean;
 };
 
-type TaskRunInsert = { _version: bigint; run: TaskRun; event: "insert" | "update" | "delete" };
+type PostgresTaskRun = TaskRun & { masterQueue: string };
+
+type TaskRunInsert = {
+  _version: bigint;
+  run: PostgresTaskRun;
+  event: "insert" | "update" | "delete";
+};
 
 export type RunsReplicationServiceEvents = {
   message: [{ lsn: string; message: PgoutputMessage; service: RunsReplicationService }];
+  batchFlushed: [
+    { flushId: string; taskRunInserts: TaskRunInsertArray[]; payloadInserts: PayloadInsertArray[] }
+  ];
 };
 
 export class RunsReplicationService {
@@ -80,6 +102,7 @@ export class RunsReplicationService {
   private _isShuttingDown = false;
   private _isShutDownComplete = false;
   private _tracer: Tracer;
+  private _meter: Meter;
   private _currentParseDurationMs: number | null = null;
   private _lastAcknowledgedAt: number | null = null;
   private _acknowledgeTimeoutMs: number;
@@ -90,6 +113,18 @@ export class RunsReplicationService {
   private _insertMaxRetries: number;
   private _insertBaseDelayMs: number;
   private _insertMaxDelayMs: number;
+  private _insertStrategy: "insert" | "insert_async";
+  private _disablePayloadInsert: boolean;
+
+  // Metrics
+  private _replicationLagHistogram: Histogram;
+  private _batchesFlushedCounter: Counter;
+  private _batchSizeHistogram: Histogram;
+  private _taskRunsInsertedCounter: Counter;
+  private _payloadsInsertedCounter: Counter;
+  private _insertRetriesCounter: Counter;
+  private _eventsProcessedCounter: Counter;
+  private _flushDurationHistogram: Histogram;
 
   public readonly events: EventEmitter<RunsReplicationServiceEvents>;
 
@@ -98,9 +133,63 @@ export class RunsReplicationService {
       options.logger ?? new Logger("RunsReplicationService", options.logLevel ?? "info");
     this.events = new EventEmitter();
     this._tracer = options.tracer ?? trace.getTracer("runs-replication-service");
+    this._meter = options.meter ?? getMeter("runs-replication");
+
+    // Initialize metrics
+    this._replicationLagHistogram = this._meter.createHistogram(
+      "runs_replication.replication_lag_ms",
+      {
+        description: "Replication lag from Postgres commit to processing",
+        unit: "ms",
+      }
+    );
+
+    this._batchesFlushedCounter = this._meter.createCounter("runs_replication.batches_flushed", {
+      description: "Total batches flushed to ClickHouse",
+    });
+
+    this._batchSizeHistogram = this._meter.createHistogram("runs_replication.batch_size", {
+      description: "Number of items per batch flush",
+      unit: "items",
+    });
+
+    this._taskRunsInsertedCounter = this._meter.createCounter(
+      "runs_replication.task_runs_inserted",
+      {
+        description: "Task run inserts to ClickHouse",
+        unit: "inserts",
+      }
+    );
+
+    this._payloadsInsertedCounter = this._meter.createCounter(
+      "runs_replication.payloads_inserted",
+      {
+        description: "Payload inserts to ClickHouse",
+        unit: "inserts",
+      }
+    );
+
+    this._insertRetriesCounter = this._meter.createCounter("runs_replication.insert_retries", {
+      description: "Insert retry attempts",
+    });
+
+    this._eventsProcessedCounter = this._meter.createCounter("runs_replication.events_processed", {
+      description: "Replication events processed (inserts, updates, deletes)",
+    });
+
+    this._flushDurationHistogram = this._meter.createHistogram(
+      "runs_replication.flush_duration_ms",
+      {
+        description: "Duration of batch flush operations",
+        unit: "ms",
+      }
+    );
 
     this._acknowledgeTimeoutMs = options.acknowledgeTimeoutMs ?? 1_000;
 
+    this._insertStrategy = options.insertStrategy ?? "insert";
+    this._disablePayloadInsert = options.disablePayloadInsert ?? false;
+
     this._replicationClient = new LogicalReplicationClient({
       pgConfig: {
         connectionString: options.pgConnectionUrl,
@@ -126,6 +215,18 @@ export class RunsReplicationService {
       flushInterval: options.flushIntervalMs ?? 100,
       maxConcurrency: options.maxFlushConcurrency ?? 100,
       callback: this.#flushBatch.bind(this),
+      // Key-based deduplication to reduce duplicates sent to ClickHouse
+      getKey: (item) => {
+        if (!item?.run?.id) {
+          this.logger.warn("Skipping replication event with null run", { event: item });
+          return null;
+        }
+        return `${item.event}_${item.run.id}`;
+      },
+      // Keep the run with the higher version (latest)
+      // and take the last occurrence for that version.
+      // Items originating from the same DB transaction have the same version.
+      shouldReplace: (existing, incoming) => incoming._version >= existing._version,
       logger: new Logger("ConcurrentFlushScheduler", options.logLevel ?? "info"),
       tracer: options.tracer,
     });
@@ -169,6 +270,8 @@ export class RunsReplicationService {
   }
 
   public async shutdown() {
+    if (this._isShuttingDown) return;
+
     this._isShuttingDown = true;
 
     this.logger.info("Initiating shutdown of runs replication service");
@@ -214,7 +317,7 @@ export class RunsReplicationService {
     }
   }
 
-  async backfill(runs: TaskRun[]) {
+  async backfill(runs: PostgresTaskRun[]) {
     // divide into batches of 50 to get data from Postgres
     const flushId = nanoid();
     // Use current timestamp as LSN (high enough to be above existing data)
@@ -323,7 +426,7 @@ export class RunsReplicationService {
         const replicationLagMs = Date.now() - Number(message.commitTime / 1000n);
         this._currentTransaction.commitEndLsn = message.commitEndLsn;
         this._currentTransaction.replicationLagMs = replicationLagMs;
-        const transaction = this._currentTransaction as Transaction<TaskRun>;
+        const transaction = this._currentTransaction as Transaction<PostgresTaskRun>;
         this._currentTransaction = null;
 
         if (transaction.commitEndLsn) {
@@ -341,7 +444,7 @@ export class RunsReplicationService {
     }
   }
 
-  #handleTransaction(transaction: Transaction<TaskRun>) {
+  #handleTransaction(transaction: Transaction<PostgresTaskRun>) {
     if (this._isShutDownComplete) return;
 
     if (this._isShuttingDown) {
@@ -378,22 +481,15 @@ export class RunsReplicationService {
       }))
     );
 
-    this._tracer
-      .startSpan("handle_transaction", {
-        attributes: {
-          "transaction.xid": transaction.xid,
-          "transaction.replication_lag_ms": transaction.replicationLagMs,
-          "transaction.events": transaction.events.length,
-          "transaction.commit_end_lsn": transaction.commitEndLsn,
-          "transaction.parse_duration_ms": this._currentParseDurationMs ?? undefined,
-          "transaction.lsn_to_uint64_ms": lsnToUInt64DurationMs,
-          "transaction.version": _version.toString(),
-        },
-        startTime: transaction.beginStartTimestamp,
-      })
-      .end();
+    // Record metrics
+    this._replicationLagHistogram.record(transaction.replicationLagMs);
 
-    this.logger.info("handle_transaction", {
+    // Count events by type
+    for (const event of transaction.events) {
+      this._eventsProcessedCounter.add(1, { event_type: event.tag });
+    }
+
+    this.logger.debug("handle_transaction", {
       transaction: {
         xid: transaction.xid,
         commitLsn: transaction.commitLsn,
@@ -456,6 +552,8 @@ export class RunsReplicationService {
       batchSize: batch.length,
     });
 
+    const flushStartTime = performance.now();
+
     await startSpan(this._tracer, "flushBatch", async (span) => {
       const preparedInserts = await startSpan(this._tracer, "prepare_inserts", async (span) => {
         return await Promise.all(batch.map(this.#prepareRunInserts.bind(this)));
@@ -463,11 +561,47 @@ export class RunsReplicationService {
 
       const taskRunInserts = preparedInserts
         .map(({ taskRunInsert }) => taskRunInsert)
-        .filter(Boolean);
+        .filter((x): x is TaskRunInsertArray => Boolean(x))
+        // batch inserts in clickhouse are more performant if the items
+        // are pre-sorted by the primary key
+        .sort((a, b) => {
+          const aOrgId = getTaskRunField(a, "organization_id");
+          const bOrgId = getTaskRunField(b, "organization_id");
+          if (aOrgId !== bOrgId) {
+            return aOrgId < bOrgId ? -1 : 1;
+          }
+          const aProjId = getTaskRunField(a, "project_id");
+          const bProjId = getTaskRunField(b, "project_id");
+          if (aProjId !== bProjId) {
+            return aProjId < bProjId ? -1 : 1;
+          }
+          const aEnvId = getTaskRunField(a, "environment_id");
+          const bEnvId = getTaskRunField(b, "environment_id");
+          if (aEnvId !== bEnvId) {
+            return aEnvId < bEnvId ? -1 : 1;
+          }
+          const aCreatedAt = getTaskRunField(a, "created_at");
+          const bCreatedAt = getTaskRunField(b, "created_at");
+          if (aCreatedAt !== bCreatedAt) {
+            return aCreatedAt - bCreatedAt;
+          }
+          const aRunId = getTaskRunField(a, "run_id");
+          const bRunId = getTaskRunField(b, "run_id");
+          if (aRunId === bRunId) return 0;
+          return aRunId < bRunId ? -1 : 1;
+        });
 
       const payloadInserts = preparedInserts
         .map(({ payloadInsert }) => payloadInsert)
-        .filter(Boolean);
+        .filter((x): x is PayloadInsertArray => Boolean(x))
+        // batch inserts in clickhouse are more performant if the items
+        // are pre-sorted by the primary key
+        .sort((a, b) => {
+          const aRunId = getPayloadField(a, "run_id");
+          const bRunId = getPayloadField(b, "run_id");
+          if (aRunId === bRunId) return 0;
+          return aRunId < bRunId ? -1 : 1;
+        });
 
       span.setAttribute("task_run_inserts", taskRunInserts.length);
       span.setAttribute("payload_inserts", payloadInserts.length);
@@ -496,7 +630,6 @@ export class RunsReplicationService {
         this.logger.error("Error inserting task run inserts", {
           error: taskRunError,
           flushId,
-          runIds: taskRunInserts.map((r) => r.run_id),
         });
         recordSpanError(span, taskRunError);
       }
@@ -505,7 +638,6 @@ export class RunsReplicationService {
         this.logger.error("Error inserting payload inserts", {
           error: payloadError,
           flushId,
-          runIds: payloadInserts.map((r) => r.run_id),
         });
         recordSpanError(span, payloadError);
       }
@@ -515,6 +647,24 @@ export class RunsReplicationService {
         taskRunInserts: taskRunInserts.length,
         payloadInserts: payloadInserts.length,
       });
+
+      this.events.emit("batchFlushed", { flushId, taskRunInserts, payloadInserts });
+
+      // Record metrics
+      const flushDurationMs = performance.now() - flushStartTime;
+      const hasErrors = taskRunError !== null || payloadError !== null;
+
+      this._batchSizeHistogram.record(batch.length);
+      this._flushDurationHistogram.record(flushDurationMs);
+      this._batchesFlushedCounter.add(1, { success: !hasErrors });
+
+      if (!taskRunError) {
+        this._taskRunsInsertedCounter.add(taskRunInserts.length);
+      }
+
+      if (!payloadError) {
+        this._payloadsInsertedCounter.add(payloadInserts.length);
+      }
     });
   }
 
@@ -546,6 +696,10 @@ export class RunsReplicationService {
             delay,
           });
 
+          // Record retry metric
+          const operation = operationName.includes("task run") ? "task_runs" : "payloads";
+          this._insertRetriesCounter.add(1, { operation });
+
           await new Promise((resolve) => setTimeout(resolve, delay));
           continue;
         }
@@ -598,18 +752,27 @@ export class RunsReplicationService {
     return delay + jitter;
   }
 
-  async #insertTaskRunInserts(taskRunInserts: TaskRunV2[], attempt: number) {
+  #getClickhouseInsertSettings() {
+    if (this._insertStrategy === "insert") {
+      return {};
+    }
+
+    return {
+      async_insert: 1 as const,
+      async_insert_max_data_size: "1000000",
+      async_insert_busy_timeout_ms: 1000,
+      wait_for_async_insert: this.options.waitForAsyncInsert ? (1 as const) : (0 as const),
+    };
+  }
+
+  async #insertTaskRunInserts(taskRunInserts: TaskRunInsertArray[], attempt: number) {
     return await startSpan(this._tracer, "insertTaskRunsInserts", async (span) => {
-      const [insertError, insertResult] = await this.options.clickhouse.taskRuns.insert(
-        taskRunInserts,
-        {
+      const [insertError, insertResult] =
+        await this.options.clickhouse.taskRuns.insertCompactArrays(taskRunInserts, {
           params: {
-            clickhouse_settings: {
-              wait_for_async_insert: this.options.waitForAsyncInsert ? 1 : 0,
-            },
+            clickhouse_settings: this.#getClickhouseInsertSettings(),
           },
-        }
-      );
+        });
 
       if (insertError) {
         this.logger.error("Error inserting task run inserts attempt", {
@@ -625,18 +788,14 @@ export class RunsReplicationService {
     });
   }
 
-  async #insertPayloadInserts(payloadInserts: RawTaskRunPayloadV1[], attempt: number) {
+  async #insertPayloadInserts(payloadInserts: PayloadInsertArray[], attempt: number) {
     return await startSpan(this._tracer, "insertPayloadInserts", async (span) => {
-      const [insertError, insertResult] = await this.options.clickhouse.taskRuns.insertPayloads(
-        payloadInserts,
-        {
+      const [insertError, insertResult] =
+        await this.options.clickhouse.taskRuns.insertPayloadsCompactArrays(payloadInserts, {
           params: {
-            clickhouse_settings: {
-              wait_for_async_insert: this.options.waitForAsyncInsert ? 1 : 0,
-            },
+            clickhouse_settings: this.#getClickhouseInsertSettings(),
           },
-        }
-      );
+        });
 
       if (insertError) {
         this.logger.error("Error inserting payload inserts attempt", {
@@ -654,28 +813,18 @@ export class RunsReplicationService {
 
   async #prepareRunInserts(
     batchedRun: TaskRunInsert
-  ): Promise<{ taskRunInsert?: TaskRunV2; payloadInsert?: RawTaskRunPayloadV1 }> {
+  ): Promise<{ taskRunInsert?: TaskRunInsertArray; payloadInsert?: PayloadInsertArray }> {
     this.logger.debug("Preparing run", {
       batchedRun,
     });
 
     const { run, _version, event } = batchedRun;
 
-    if (!run.environmentType) {
-      return {
-        taskRunInsert: undefined,
-        payloadInsert: undefined,
-      };
+    if (!run.environmentType || !run.organizationId) {
+      return {};
     }
 
-    if (!run.organizationId) {
-      return {
-        taskRunInsert: undefined,
-        payloadInsert: undefined,
-      };
-    }
-
-    if (event === "update" || event === "delete") {
+    if (event === "update" || event === "delete" || this._disablePayloadInsert) {
       const taskRunInsert = await this.#prepareTaskRunInsert(
         run,
         run.organizationId,
@@ -684,10 +833,7 @@ export class RunsReplicationService {
         _version
       );
 
-      return {
-        taskRunInsert,
-        payloadInsert: undefined,
-      };
+      return { taskRunInsert };
     }
 
     const [taskRunInsert, payloadInsert] = await Promise.all([
@@ -695,76 +841,79 @@ export class RunsReplicationService {
       this.#preparePayloadInsert(run, _version),
     ]);
 
-    return {
-      taskRunInsert,
-      payloadInsert,
-    };
+    return { taskRunInsert, payloadInsert };
   }
 
   async #prepareTaskRunInsert(
-    run: TaskRun,
+    run: PostgresTaskRun,
     organizationId: string,
     environmentType: string,
     event: "insert" | "update" | "delete",
     _version: bigint
-  ): Promise<TaskRunV2> {
+  ): Promise<TaskRunInsertArray> {
     const output = await this.#prepareJson(run.output, run.outputType);
 
-    return {
-      environment_id: run.runtimeEnvironmentId,
-      organization_id: organizationId,
-      project_id: run.projectId,
-      run_id: run.id,
-      updated_at: run.updatedAt.getTime(),
-      created_at: run.createdAt.getTime(),
-      status: run.status,
-      environment_type: environmentType,
-      friendly_id: run.friendlyId,
-      engine: run.engine,
-      task_identifier: run.taskIdentifier,
-      queue: run.queue,
-      span_id: run.spanId,
-      trace_id: run.traceId,
-      error: { data: run.error },
-      attempt: run.attemptNumber ?? 1,
-      schedule_id: run.scheduleId ?? "",
-      batch_id: run.batchId ?? "",
-      completed_at: run.completedAt?.getTime(),
-      started_at: run.startedAt?.getTime(),
-      executed_at: run.executedAt?.getTime(),
-      delay_until: run.delayUntil?.getTime(),
-      queued_at: run.queuedAt?.getTime(),
-      expired_at: run.expiredAt?.getTime(),
-      usage_duration_ms: run.usageDurationMs,
-      cost_in_cents: run.costInCents,
-      base_cost_in_cents: run.baseCostInCents,
-      tags: run.runTags ?? [],
-      task_version: run.taskVersion ?? "",
-      sdk_version: run.sdkVersion ?? "",
-      cli_version: run.cliVersion ?? "",
-      machine_preset: run.machinePreset ?? "",
-      root_run_id: run.rootTaskRunId ?? "",
-      parent_run_id: run.parentTaskRunId ?? "",
-      depth: run.depth,
-      is_test: run.isTest,
-      idempotency_key: run.idempotencyKey ?? "",
-      expiration_ttl: run.ttl ?? "",
-      output,
-      concurrency_key: run.concurrencyKey ?? "",
-      bulk_action_group_ids: run.bulkActionGroupIds ?? [],
-      _version: _version.toString(),
-      _is_deleted: event === "delete" ? 1 : 0,
-    };
+    // Return array matching TASK_RUN_COLUMNS order
+    return [
+      run.runtimeEnvironmentId, // environment_id
+      organizationId, // organization_id
+      run.projectId, // project_id
+      run.id, // run_id
+      run.updatedAt.getTime(), // updated_at
+      run.createdAt.getTime(), // created_at
+      run.status, // status
+      environmentType, // environment_type
+      run.friendlyId, // friendly_id
+      run.attemptNumber ?? 1, // attempt
+      run.engine, // engine
+      run.taskIdentifier, // task_identifier
+      run.queue, // queue
+      run.scheduleId ?? "", // schedule_id
+      run.batchId ?? "", // batch_id
+      run.completedAt?.getTime() ?? null, // completed_at
+      run.startedAt?.getTime() ?? null, // started_at
+      run.executedAt?.getTime() ?? null, // executed_at
+      run.delayUntil?.getTime() ?? null, // delay_until
+      run.queuedAt?.getTime() ?? null, // queued_at
+      run.expiredAt?.getTime() ?? null, // expired_at
+      run.usageDurationMs ?? 0, // usage_duration_ms
+      run.costInCents ?? 0, // cost_in_cents
+      run.baseCostInCents ?? 0, // base_cost_in_cents
+      output, // output
+      { data: run.error }, // error
+      run.runTags ?? [], // tags
+      run.taskVersion ?? "", // task_version
+      run.sdkVersion ?? "", // sdk_version
+      run.cliVersion ?? "", // cli_version
+      run.machinePreset ?? "", // machine_preset
+      run.rootTaskRunId ?? "", // root_run_id
+      run.parentTaskRunId ?? "", // parent_run_id
+      run.depth ?? 0, // depth
+      run.spanId, // span_id
+      run.traceId, // trace_id
+      run.idempotencyKey ?? "", // idempotency_key
+      unsafeExtractIdempotencyKeyUser(run) ?? "", // idempotency_key_user
+      unsafeExtractIdempotencyKeyScope(run) ?? "", // idempotency_key_scope
+      run.ttl ?? "", // expiration_ttl
+      run.isTest ?? false, // is_test
+      _version.toString(), // _version
+      event === "delete" ? 1 : 0, // _is_deleted
+      run.concurrencyKey ?? "", // concurrency_key
+      run.bulkActionGroupIds ?? [], // bulk_action_group_ids
+      run.masterQueue ?? "", // worker_queue
+      run.maxDurationInSeconds ?? null, // max_duration_in_seconds
+    ];
   }
 
-  async #preparePayloadInsert(run: TaskRun, _version: bigint): Promise<RawTaskRunPayloadV1> {
+  async #preparePayloadInsert(run: TaskRun, _version: bigint): Promise<PayloadInsertArray> {
     const payload = await this.#prepareJson(run.payload, run.payloadType);
 
-    return {
-      run_id: run.id,
-      created_at: run.createdAt.getTime(),
-      payload,
-    };
+    // Return array matching PAYLOAD_COLUMNS order
+    return [
+      run.id, // run_id
+      run.createdAt.getTime(), // created_at
+      payload, // payload
+    ];
   }
 
   async #prepareJson(
@@ -805,6 +954,7 @@ export class RunsReplicationService {
 
     return { data: parsedData };
   }
+
 }
 
 export type ConcurrentFlushSchedulerConfig<T> = {
@@ -812,12 +962,16 @@ export type ConcurrentFlushSchedulerConfig<T> = {
   flushInterval: number;
   maxConcurrency?: number;
   callback: (flushId: string, batch: T[]) => Promise<void>;
+  /** Key-based deduplication. Return null to skip the item. */
+  getKey: (item: T) => string | null;
+  /** Determine if incoming item should replace existing. */
+  shouldReplace: (existing: T, incoming: T) => boolean;
   tracer?: Tracer;
   logger?: Logger;
 };
 
 export class ConcurrentFlushScheduler<T> {
-  private currentBatch: T[]; // Adjust the type according to your data structure
+  private batch = new Map<string, T>();
   private readonly BATCH_SIZE: number;
   private readonly flushInterval: number;
   private readonly MAX_CONCURRENCY: number;
@@ -832,7 +986,6 @@ export class ConcurrentFlushScheduler<T> {
     this.logger = config.logger ?? new Logger("ConcurrentFlushScheduler", "info");
     this._tracer = config.tracer ?? trace.getTracer("concurrent-flush-scheduler");
 
-    this.currentBatch = [];
     this.BATCH_SIZE = config.batchSize;
     this.flushInterval = config.flushInterval;
     this.MAX_CONCURRENCY = config.maxConcurrency || 1;
@@ -842,7 +995,18 @@ export class ConcurrentFlushScheduler<T> {
   }
 
   addToBatch(items: T[]): void {
-    this.currentBatch = this.currentBatch.concat(items);
+    for (const item of items) {
+      const key = this.config.getKey(item);
+      if (key === null) {
+        continue;
+      }
+
+      const existing = this.batch.get(key);
+      if (!existing || this.config.shouldReplace(existing, item)) {
+        this.batch.set(key, item);
+      }
+    }
+
     this.#flushNextBatchIfNeeded();
   }
 
@@ -865,11 +1029,16 @@ export class ConcurrentFlushScheduler<T> {
     this.#flushNextBatchIfNeeded();
   }
 
+  #getBatchSize(): number {
+    return this.batch.size;
+  }
+
   #flushNextBatchIfNeeded(): void {
-    if (this.currentBatch.length >= this.BATCH_SIZE || this._isShutDown) {
+    const currentSize = this.#getBatchSize();
+    if (currentSize >= this.BATCH_SIZE || this._isShutDown) {
       this.logger.debug("Batch size threshold reached, initiating flush", {
         batchSize: this.BATCH_SIZE,
-        currentSize: this.currentBatch.length,
+        currentSize,
         isShutDown: this._isShutDown,
       });
 
@@ -894,19 +1063,20 @@ export class ConcurrentFlushScheduler<T> {
   }
 
   async #checkAndFlush(): Promise<void> {
-    if (this.currentBatch.length > 0) {
+    const currentSize = this.#getBatchSize();
+    if (currentSize > 0) {
       this.logger.debug("Periodic flush check triggered", {
-        currentBatchSize: this.currentBatch.length,
+        currentBatchSize: currentSize,
       });
       await this.#flushNextBatch();
     }
   }
 
   async #flushNextBatch(): Promise<void> {
-    if (this.currentBatch.length === 0) return;
+    if (this.batch.size === 0) return;
 
-    const batch = this.currentBatch;
-    this.currentBatch = [];
+    const batch = Array.from(this.batch.values());
+    this.batch.clear();
 
     const callback = this.config.callback;
 
diff --git a/apps/webapp/app/services/runsRepository.server.ts b/apps/webapp/app/services/runsRepository/clickhouseRunsRepository.server.ts
similarity index 62%
rename from apps/webapp/app/services/runsRepository.server.ts
rename to apps/webapp/app/services/runsRepository/clickhouseRunsRepository.server.ts
index 3196c436b3d..9d3a92e9110 100644
--- a/apps/webapp/app/services/runsRepository.server.ts
+++ b/apps/webapp/app/services/runsRepository/clickhouseRunsRepository.server.ts
@@ -1,79 +1,28 @@
-import { type ClickHouse, type ClickhouseQueryBuilder } from "@internal/clickhouse";
-import { type Tracer } from "@internal/tracing";
-import { type Logger, type LogLevel } from "@trigger.dev/core/logger";
-import { MachinePresetName } from "@trigger.dev/core/v3";
-import { BulkActionId, RunId } from "@trigger.dev/core/v3/isomorphic";
-import { TaskRunStatus } from "@trigger.dev/database";
+import { type ClickhouseQueryBuilder } from "@internal/clickhouse";
+import { RunId } from "@trigger.dev/core/v3/isomorphic";
+import {
+  type FilterRunsOptions,
+  type IRunsRepository,
+  type ListRunsOptions,
+  type RunListInputOptions,
+  type RunsRepositoryOptions,
+  type TagListOptions,
+  convertRunListInputOptionsToFilterRunsOptions,
+} from "./runsRepository.server";
 import parseDuration from "parse-duration";
-import { z } from "zod";
-import { timeFilters } from "~/components/runs/v3/SharedFilters";
-import { type PrismaClient } from "~/db.server";
-
-export type RunsRepositoryOptions = {
-  clickhouse: ClickHouse;
-  prisma: PrismaClient;
-  logger?: Logger;
-  logLevel?: LogLevel;
-  tracer?: Tracer;
-};
-
-const RunStatus = z.enum(Object.values(TaskRunStatus) as [TaskRunStatus, ...TaskRunStatus[]]);
-
-const RunListInputOptionsSchema = z.object({
-  organizationId: z.string(),
-  projectId: z.string(),
-  environmentId: z.string(),
-  //filters
-  tasks: z.array(z.string()).optional(),
-  versions: z.array(z.string()).optional(),
-  statuses: z.array(RunStatus).optional(),
-  tags: z.array(z.string()).optional(),
-  scheduleId: z.string().optional(),
-  period: z.string().optional(),
-  from: z.number().optional(),
-  to: z.number().optional(),
-  isTest: z.boolean().optional(),
-  rootOnly: z.boolean().optional(),
-  batchId: z.string().optional(),
-  runId: z.array(z.string()).optional(),
-  bulkId: z.string().optional(),
-  queues: z.array(z.string()).optional(),
-  machines: MachinePresetName.array().optional(),
-});
-
-export type RunListInputOptions = z.infer<typeof RunListInputOptionsSchema>;
-export type RunListInputFilters = Omit<
-  RunListInputOptions,
-  "organizationId" | "projectId" | "environmentId"
->;
-
-export type ParsedRunFilters = RunListInputFilters & {
-  cursor?: string;
-  direction?: "forward" | "backward";
-};
-
-type FilterRunsOptions = Omit<RunListInputOptions, "period"> & {
-  period: number | undefined;
-};
-
-type Pagination = {
-  page: {
-    size: number;
-    cursor?: string;
-    direction?: "forward" | "backward";
-  };
-};
-
-export type ListRunsOptions = RunListInputOptions & Pagination;
-
-export class RunsRepository {
+
+export class ClickHouseRunsRepository implements IRunsRepository {
   constructor(private readonly options: RunsRepositoryOptions) {}
 
+  get name() {
+    return "clickhouse";
+  }
+
   async listRunIds(options: ListRunsOptions) {
     const queryBuilder = this.options.clickhouse.taskRuns.queryBuilder();
     applyRunFiltersToQueryBuilder(
       queryBuilder,
-      await this.#convertRunListInputOptionsToFilterRunsOptions(options)
+      await convertRunListInputOptionsToFilterRunsOptions(options, this.options.prisma)
     );
 
     if (options.page.cursor) {
@@ -103,6 +52,29 @@ export class RunsRepository {
     return runIds;
   }
 
+  async listFriendlyRunIds(options: ListRunsOptions) {
+    // First get internal IDs from ClickHouse
+    const internalIds = await this.listRunIds(options);
+
+    if (internalIds.length === 0) {
+      return [];
+    }
+
+    // Then get friendly IDs from Prisma
+    const runs = await this.options.prisma.taskRun.findMany({
+      where: {
+        id: {
+          in: internalIds,
+        },
+      },
+      select: {
+        friendlyId: true,
+      },
+    });
+
+    return runs.map((run) => run.friendlyId);
+  }
+
   async listRuns(options: ListRunsOptions) {
     const runIds = await this.listRunIds(options);
 
@@ -200,7 +172,7 @@ export class RunsRepository {
     const queryBuilder = this.options.clickhouse.taskRuns.countQueryBuilder();
     applyRunFiltersToQueryBuilder(
       queryBuilder,
-      await this.#convertRunListInputOptionsToFilterRunsOptions(options)
+      await convertRunListInputOptionsToFilterRunsOptions(options, this.options.prisma)
     );
 
     const [queryError, result] = await queryBuilder.execute();
@@ -216,71 +188,55 @@ export class RunsRepository {
     return result[0].count;
   }
 
-  async #convertRunListInputOptionsToFilterRunsOptions(
-    options: RunListInputOptions
-  ): Promise<FilterRunsOptions> {
-    const convertedOptions: FilterRunsOptions = {
-      ...options,
-      period: undefined,
-    };
-
-    // Convert time period to ms
-    const time = timeFilters({
-      period: options.period,
-      from: options.from,
-      to: options.to,
-    });
-    convertedOptions.period = time.period ? parseDuration(time.period) ?? undefined : undefined;
-
-    // batch friendlyId to id
-    if (options.batchId && options.batchId.startsWith("batch_")) {
-      const batch = await this.options.prisma.batchTaskRun.findFirst({
-        select: {
-          id: true,
-        },
-        where: {
-          friendlyId: options.batchId,
-          runtimeEnvironmentId: options.environmentId,
-        },
+  async listTags(options: TagListOptions) {
+    const queryBuilder = this.options.clickhouse.taskRuns
+      .tagQueryBuilder()
+      .where("organization_id = {organizationId: String}", {
+        organizationId: options.organizationId,
+      })
+      .where("project_id = {projectId: String}", {
+        projectId: options.projectId,
+      })
+      .where("environment_id = {environmentId: String}", {
+        environmentId: options.environmentId,
       });
 
-      if (batch) {
-        convertedOptions.batchId = batch.id;
-      }
+    const periodMs = options.period ? parseDuration(options.period) ?? undefined : undefined;
+    if (periodMs) {
+      queryBuilder.where("created_at >= fromUnixTimestamp64Milli({period: Int64})", {
+        period: new Date(Date.now() - periodMs).getTime(),
+      });
     }
 
-    // scheduleId can be a friendlyId
-    if (options.scheduleId && options.scheduleId.startsWith("sched_")) {
-      const schedule = await this.options.prisma.taskSchedule.findFirst({
-        select: {
-          id: true,
-        },
-        where: {
-          friendlyId: options.scheduleId,
-          projectId: options.projectId,
-        },
+    if (options.from) {
+      queryBuilder.where("created_at >= fromUnixTimestamp64Milli({from: Int64})", {
+        from: options.from,
       });
-
-      if (schedule) {
-        convertedOptions.scheduleId = schedule?.id;
-      }
     }
 
-    if (options.bulkId && options.bulkId.startsWith("bulk_")) {
-      convertedOptions.bulkId = BulkActionId.toId(options.bulkId);
+    if (options.to) {
+      queryBuilder.where("created_at <= fromUnixTimestamp64Milli({to: Int64})", { to: options.to });
     }
 
-    if (options.runId) {
-      //convert to friendlyId
-      convertedOptions.runId = options.runId.map((r) => RunId.toFriendlyId(r));
+    // Filter by query (case-insensitive contains search)
+    if (options.query && options.query.trim().length > 0) {
+      queryBuilder.where("positionCaseInsensitiveUTF8(tag, {query: String}) > 0", {
+        query: options.query,
+      });
     }
 
-    // Show all runs if we are filtering by batchId or runId
-    if (options.batchId || options.runId?.length || options.scheduleId || options.tasks?.length) {
-      convertedOptions.rootOnly = false;
+    // Add ordering and pagination
+    queryBuilder.orderBy("tag ASC").limit(options.limit);
+
+    const [queryError, result] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
     }
 
-    return convertedOptions;
+    return {
+      tags: result.map((row) => row.tag),
+    };
   }
 }
 
@@ -373,7 +329,3 @@ function applyRunFiltersToQueryBuilder<T>(
     });
   }
 }
-
-export function parseRunListInputOptions(data: any): RunListInputOptions {
-  return RunListInputOptionsSchema.parse(data);
-}
diff --git a/apps/webapp/app/services/runsRepository/postgresRunsRepository.server.ts b/apps/webapp/app/services/runsRepository/postgresRunsRepository.server.ts
new file mode 100644
index 00000000000..eaf22420901
--- /dev/null
+++ b/apps/webapp/app/services/runsRepository/postgresRunsRepository.server.ts
@@ -0,0 +1,344 @@
+import { RunId } from "@trigger.dev/core/v3/isomorphic";
+import { Prisma } from "@trigger.dev/database";
+import { sqlDatabaseSchema } from "~/db.server";
+import {
+  type FilterRunsOptions,
+  type IRunsRepository,
+  type ListRunsOptions,
+  type ListedRun,
+  type RunListInputOptions,
+  type RunsRepositoryOptions,
+  type TagListOptions,
+  convertRunListInputOptionsToFilterRunsOptions,
+} from "./runsRepository.server";
+
+export class PostgresRunsRepository implements IRunsRepository {
+  constructor(private readonly options: RunsRepositoryOptions) {}
+
+  get name() {
+    return "postgres";
+  }
+
+  async listRunIds(options: ListRunsOptions) {
+    const filterOptions = await convertRunListInputOptionsToFilterRunsOptions(
+      options,
+      this.options.prisma
+    );
+
+    const query = this.#buildRunIdsQuery(filterOptions, options.page);
+    const runs = await this.options.prisma.$queryRaw<{ id: string }[]>(query);
+
+    return runs.map((run) => run.id);
+  }
+
+  async listFriendlyRunIds(options: ListRunsOptions) {
+    const filterOptions = await convertRunListInputOptionsToFilterRunsOptions(
+      options,
+      this.options.prisma
+    );
+
+    const query = this.#buildFriendlyRunIdsQuery(filterOptions, options.page);
+    const runs = await this.options.prisma.$queryRaw<{ friendlyId: string }[]>(query);
+
+    return runs.map((run) => run.friendlyId);
+  }
+
+  async listRuns(options: ListRunsOptions) {
+    const filterOptions = await convertRunListInputOptionsToFilterRunsOptions(
+      options,
+      this.options.prisma
+    );
+
+    const query = this.#buildRunsQuery(filterOptions, options.page);
+    const runs = await this.options.prisma.$queryRaw<ListedRun[]>(query);
+
+    // If there are more runs than the page size, we need to fetch the next page
+    const hasMore = runs.length > options.page.size;
+
+    let nextCursor: string | null = null;
+    let previousCursor: string | null = null;
+
+    // Get cursors for next and previous pages
+    const direction = options.page.direction ?? "forward";
+    switch (direction) {
+      case "forward": {
+        previousCursor = options.page.cursor ? runs.at(0)?.id ?? null : null;
+        if (hasMore) {
+          // The next cursor should be the last run ID from this page
+          nextCursor = runs[options.page.size - 1]?.id ?? null;
+        }
+        break;
+      }
+      case "backward": {
+        const reversedRuns = [...runs].reverse();
+        if (hasMore) {
+          previousCursor = reversedRuns.at(1)?.id ?? null;
+          nextCursor = reversedRuns.at(options.page.size)?.id ?? null;
+        } else {
+          nextCursor = reversedRuns.at(options.page.size - 1)?.id ?? null;
+        }
+        break;
+      }
+    }
+
+    const runsToReturn =
+      options.page.direction === "backward" && hasMore
+        ? runs.slice(1, options.page.size + 1)
+        : runs.slice(0, options.page.size);
+
+    // ClickHouse is slightly delayed, so we're going to do in-memory status filtering too
+    let filteredRuns = runsToReturn;
+    if (options.statuses && options.statuses.length > 0) {
+      filteredRuns = runsToReturn.filter((run) => options.statuses!.includes(run.status));
+    }
+
+    return {
+      runs: filteredRuns,
+      pagination: {
+        nextCursor,
+        previousCursor,
+      },
+    };
+  }
+
+  async countRuns(options: RunListInputOptions) {
+    const filterOptions = await convertRunListInputOptionsToFilterRunsOptions(
+      options,
+      this.options.prisma
+    );
+
+    const query = this.#buildCountQuery(filterOptions);
+    const result = await this.options.prisma.$queryRaw<{ count: bigint }[]>(query);
+
+    if (result.length === 0) {
+      throw new Error("No count rows returned");
+    }
+
+    return Number(result[0].count);
+  }
+
+  async listTags({ projectId, query, offset, limit }: TagListOptions) {
+    const tags = await this.options.prisma.taskRunTag.findMany({
+      select: {
+        name: true,
+      },
+      where: {
+        projectId,
+        name: query
+          ? {
+              startsWith: query,
+              mode: "insensitive",
+            }
+          : undefined,
+      },
+      orderBy: {
+        id: "desc",
+      },
+      take: limit + 1,
+      skip: offset,
+    });
+
+    return {
+      tags: tags.map((tag) => tag.name),
+    };
+  }
+
+  #buildRunIdsQuery(
+    filterOptions: FilterRunsOptions,
+    page: { size: number; cursor?: string; direction?: "forward" | "backward" }
+  ) {
+    const whereConditions = this.#buildWhereConditions(filterOptions, page.cursor, page.direction);
+
+    return Prisma.sql`
+      SELECT tr.id
+      FROM ${sqlDatabaseSchema}."TaskRun" tr
+      WHERE ${whereConditions}
+      ORDER BY ${page.direction === "backward" ? Prisma.sql`tr.id ASC` : Prisma.sql`tr.id DESC`}
+      LIMIT ${page.size + 1}
+    `;
+  }
+
+  #buildFriendlyRunIdsQuery(
+    filterOptions: FilterRunsOptions,
+    page: { size: number; cursor?: string; direction?: "forward" | "backward" }
+  ) {
+    const whereConditions = this.#buildWhereConditions(filterOptions, page.cursor, page.direction);
+
+    return Prisma.sql`
+      SELECT tr."friendlyId"
+      FROM ${sqlDatabaseSchema}."TaskRun" tr
+      WHERE ${whereConditions}
+      ORDER BY ${page.direction === "backward" ? Prisma.sql`tr.id ASC` : Prisma.sql`tr.id DESC`}
+      LIMIT ${page.size + 1}
+    `;
+  }
+
+  #buildRunsQuery(
+    filterOptions: FilterRunsOptions,
+    page: { size: number; cursor?: string; direction?: "forward" | "backward" }
+  ) {
+    const whereConditions = this.#buildWhereConditions(filterOptions, page.cursor, page.direction);
+
+    return Prisma.sql`
+      SELECT
+        tr.id,
+        tr."friendlyId",
+        tr."taskIdentifier",
+        tr."taskVersion",
+        tr."runtimeEnvironmentId",
+        tr.status,
+        tr."createdAt",
+        tr."startedAt",
+        tr."lockedAt",
+        tr."delayUntil",
+        tr."updatedAt",
+        tr."completedAt",
+        tr."isTest",
+        tr."spanId",
+        tr."idempotencyKey",
+        tr."ttl",
+        tr."expiredAt",
+        tr."costInCents",
+        tr."baseCostInCents",
+        tr."usageDurationMs",
+        tr."runTags",
+        tr."depth",
+        tr."rootTaskRunId",
+        tr."batchId",
+        tr."metadata",
+        tr."metadataType",
+        tr."machinePreset",
+        tr."queue"
+      FROM ${sqlDatabaseSchema}."TaskRun" tr
+      WHERE ${whereConditions}
+      ORDER BY ${page.direction === "backward" ? Prisma.sql`tr.id ASC` : Prisma.sql`tr.id DESC`}
+      LIMIT ${page.size + 1}
+    `;
+  }
+
+  #buildCountQuery(filterOptions: FilterRunsOptions) {
+    const whereConditions = this.#buildWhereConditions(filterOptions);
+
+    return Prisma.sql`
+      SELECT COUNT(*) as count
+      FROM ${sqlDatabaseSchema}."TaskRun" tr
+      WHERE ${whereConditions}
+    `;
+  }
+
+  #buildWhereConditions(
+    filterOptions: FilterRunsOptions,
+    cursor?: string,
+    direction?: "forward" | "backward"
+  ) {
+    const conditions: Prisma.Sql[] = [];
+
+    // Environment filter
+    conditions.push(Prisma.sql`tr."runtimeEnvironmentId" = ${filterOptions.environmentId}`);
+
+    // Cursor pagination
+    if (cursor) {
+      if (direction === "forward" || !direction) {
+        conditions.push(Prisma.sql`tr.id < ${cursor}`);
+      } else {
+        conditions.push(Prisma.sql`tr.id > ${cursor}`);
+      }
+    }
+
+    // Task filters
+    if (filterOptions.tasks && filterOptions.tasks.length > 0) {
+      conditions.push(Prisma.sql`tr."taskIdentifier" IN (${Prisma.join(filterOptions.tasks)})`);
+    }
+
+    // Version filters
+    if (filterOptions.versions && filterOptions.versions.length > 0) {
+      conditions.push(Prisma.sql`tr."taskVersion" IN (${Prisma.join(filterOptions.versions)})`);
+    }
+
+    // Status filters
+    if (filterOptions.statuses && filterOptions.statuses.length > 0) {
+      conditions.push(
+        Prisma.sql`tr.status = ANY(ARRAY[${Prisma.join(
+          filterOptions.statuses
+        )}]::"TaskRunStatus"[])`
+      );
+    }
+
+    // Tag filters
+    if (filterOptions.tags && filterOptions.tags.length > 0) {
+      conditions.push(
+        Prisma.sql`tr."runTags" && ARRAY[${Prisma.join(filterOptions.tags)}]::text[]`
+      );
+    }
+
+    // Schedule filter
+    if (filterOptions.scheduleId) {
+      conditions.push(Prisma.sql`tr."scheduleId" = ${filterOptions.scheduleId}`);
+    }
+
+    // Time period filter
+    if (filterOptions.period) {
+      conditions.push(
+        Prisma.sql`tr."createdAt" >= NOW() - INTERVAL '1 millisecond' * ${filterOptions.period}`
+      );
+    }
+
+    // From date filter
+    if (filterOptions.from) {
+      conditions.push(
+        Prisma.sql`tr."createdAt" >= ${new Date(filterOptions.from).toISOString()}::timestamp`
+      );
+    }
+
+    // To date filter
+    if (filterOptions.to) {
+      const toDate = new Date(filterOptions.to);
+      const now = new Date();
+      const clampedDate = toDate > now ? now : toDate;
+      conditions.push(Prisma.sql`tr."createdAt" <= ${clampedDate.toISOString()}::timestamp`);
+    }
+
+    // Test filter
+    if (typeof filterOptions.isTest === "boolean") {
+      conditions.push(Prisma.sql`tr."isTest" = ${filterOptions.isTest}`);
+    }
+
+    // Root only filter
+    if (filterOptions.rootOnly) {
+      conditions.push(Prisma.sql`tr."rootTaskRunId" IS NULL`);
+    }
+
+    // Batch filter
+    if (filterOptions.batchId) {
+      conditions.push(Prisma.sql`tr."batchId" = ${filterOptions.batchId}`);
+    }
+
+    // Bulk action filter
+    if (filterOptions.bulkId) {
+      conditions.push(
+        Prisma.sql`tr."bulkActionGroupIds" && ARRAY[${filterOptions.bulkId}]::text[]`
+      );
+    }
+
+    // Run ID filter
+    if (filterOptions.runId && filterOptions.runId.length > 0) {
+      const friendlyIds = filterOptions.runId.map((runId) => RunId.toFriendlyId(runId));
+      conditions.push(Prisma.sql`tr."friendlyId" IN (${Prisma.join(friendlyIds)})`);
+    }
+
+    // Queue filter
+    if (filterOptions.queues && filterOptions.queues.length > 0) {
+      conditions.push(Prisma.sql`tr."queue" IN (${Prisma.join(filterOptions.queues)})`);
+    }
+
+    // Machine preset filter
+    if (filterOptions.machines && filterOptions.machines.length > 0) {
+      conditions.push(Prisma.sql`tr."machinePreset" IN (${Prisma.join(filterOptions.machines)})`);
+    }
+
+    // Combine all conditions with AND
+    return conditions.reduce((acc, condition) =>
+      acc === null ? condition : Prisma.sql`${acc} AND ${condition}`
+    );
+  }
+}
diff --git a/apps/webapp/app/services/runsRepository/runsRepository.server.ts b/apps/webapp/app/services/runsRepository/runsRepository.server.ts
new file mode 100644
index 00000000000..90b58b8a980
--- /dev/null
+++ b/apps/webapp/app/services/runsRepository/runsRepository.server.ts
@@ -0,0 +1,449 @@
+import { type ClickHouse } from "@internal/clickhouse";
+import { type Tracer } from "@internal/tracing";
+import { type Logger, type LogLevel } from "@trigger.dev/core/logger";
+import { MachinePresetName } from "@trigger.dev/core/v3";
+import { BulkActionId, RunId } from "@trigger.dev/core/v3/isomorphic";
+import { type Prisma, TaskRunStatus } from "@trigger.dev/database";
+import parseDuration from "parse-duration";
+import { z } from "zod";
+import { timeFilters } from "~/components/runs/v3/SharedFilters";
+import { type PrismaClient, type PrismaClientOrTransaction } from "~/db.server";
+import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+import { startActiveSpan } from "~/v3/tracer.server";
+import { logger } from "../logger.server";
+import { ClickHouseRunsRepository } from "./clickhouseRunsRepository.server";
+import { PostgresRunsRepository } from "./postgresRunsRepository.server";
+
+export type RunsRepositoryOptions = {
+  clickhouse: ClickHouse;
+  prisma: PrismaClientOrTransaction;
+  logger?: Logger;
+  logLevel?: LogLevel;
+  tracer?: Tracer;
+};
+
+const RunStatus = z.enum(Object.values(TaskRunStatus) as [TaskRunStatus, ...TaskRunStatus[]]);
+
+const RunListInputOptionsSchema = z.object({
+  organizationId: z.string(),
+  projectId: z.string(),
+  environmentId: z.string(),
+  //filters
+  tasks: z.array(z.string()).optional(),
+  versions: z.array(z.string()).optional(),
+  statuses: z.array(RunStatus).optional(),
+  tags: z.array(z.string()).optional(),
+  scheduleId: z.string().optional(),
+  period: z.string().optional(),
+  from: z.number().optional(),
+  to: z.number().optional(),
+  isTest: z.boolean().optional(),
+  rootOnly: z.boolean().optional(),
+  batchId: z.string().optional(),
+  runId: z.array(z.string()).optional(),
+  bulkId: z.string().optional(),
+  queues: z.array(z.string()).optional(),
+  machines: MachinePresetName.array().optional(),
+});
+
+export type RunListInputOptions = z.infer<typeof RunListInputOptionsSchema>;
+export type RunListInputFilters = Omit<
+  RunListInputOptions,
+  "organizationId" | "projectId" | "environmentId"
+>;
+
+export type ParsedRunFilters = RunListInputFilters & {
+  cursor?: string;
+  direction?: "forward" | "backward";
+};
+
+export type FilterRunsOptions = Omit<RunListInputOptions, "period"> & {
+  period: number | undefined;
+};
+
+type Pagination = {
+  page: {
+    size: number;
+    cursor?: string;
+    direction?: "forward" | "backward";
+  };
+};
+
+type OffsetPagination = {
+  offset: number;
+  limit: number;
+};
+
+export type ListedRun = Prisma.TaskRunGetPayload<{
+  select: {
+    id: true;
+    friendlyId: true;
+    taskIdentifier: true;
+    taskVersion: true;
+    runtimeEnvironmentId: true;
+    status: true;
+    createdAt: true;
+    startedAt: true;
+    lockedAt: true;
+    delayUntil: true;
+    updatedAt: true;
+    completedAt: true;
+    isTest: true;
+    spanId: true;
+    idempotencyKey: true;
+    ttl: true;
+    expiredAt: true;
+    costInCents: true;
+    baseCostInCents: true;
+    usageDurationMs: true;
+    runTags: true;
+    depth: true;
+    rootTaskRunId: true;
+    batchId: true;
+    metadata: true;
+    metadataType: true;
+    machinePreset: true;
+    queue: true;
+  };
+}>;
+
+export type ListRunsOptions = RunListInputOptions & Pagination;
+
+export type TagListOptions = {
+  organizationId: string;
+  projectId: string;
+  environmentId: string;
+  period?: string;
+  from?: number;
+  to?: number;
+  /** Performs a case insensitive contains search on the tag name */
+  query?: string;
+} & OffsetPagination;
+
+export type TagList = {
+  tags: string[];
+};
+
+export interface IRunsRepository {
+  name: string;
+  listRunIds(options: ListRunsOptions): Promise<string[]>;
+  /** Returns friendly IDs (e.g., run_xxx) instead of internal UUIDs. Used for ClickHouse task_events queries. */
+  listFriendlyRunIds(options: ListRunsOptions): Promise<string[]>;
+  listRuns(options: ListRunsOptions): Promise<{
+    runs: ListedRun[];
+    pagination: {
+      nextCursor: string | null;
+      previousCursor: string | null;
+    };
+  }>;
+  countRuns(options: RunListInputOptions): Promise<number>;
+  listTags(options: TagListOptions): Promise<TagList>;
+}
+
+export class RunsRepository implements IRunsRepository {
+  private readonly clickHouseRunsRepository: ClickHouseRunsRepository;
+  private readonly postgresRunsRepository: PostgresRunsRepository;
+  private readonly defaultRepository: "clickhouse" | "postgres";
+  private readonly logger: Logger;
+
+  constructor(
+    private readonly options: RunsRepositoryOptions & {
+      defaultRepository?: "clickhouse" | "postgres";
+    }
+  ) {
+    this.clickHouseRunsRepository = new ClickHouseRunsRepository(options);
+    this.postgresRunsRepository = new PostgresRunsRepository(options);
+    this.defaultRepository = options.defaultRepository ?? "clickhouse";
+    this.logger = options.logger ?? logger;
+  }
+
+  get name() {
+    return "runsRepository";
+  }
+
+  async #getRepository(): Promise<IRunsRepository> {
+    return startActiveSpan("runsRepository.getRepository", async (span) => {
+      const getFlag = makeFlag(this.options.prisma);
+      const runsListRepository = await getFlag({
+        key: FEATURE_FLAG.runsListRepository,
+        defaultValue: this.defaultRepository,
+      });
+
+      span.setAttribute("repository.name", runsListRepository);
+
+      logger.log("runsListRepository", { runsListRepository });
+
+      switch (runsListRepository) {
+        case "postgres":
+          return this.postgresRunsRepository;
+        case "clickhouse":
+        default:
+          return this.clickHouseRunsRepository;
+      }
+    });
+  }
+
+  async listRunIds(options: ListRunsOptions): Promise<string[]> {
+    const repository = await this.#getRepository();
+    return startActiveSpan(
+      "runsRepository.listRunIds",
+      async () => {
+        try {
+          return await repository.listRunIds(options);
+        } catch (error) {
+          // If ClickHouse fails, retry with Postgres
+          if (repository.name === "clickhouse") {
+            this.logger?.warn("ClickHouse failed, retrying with Postgres", { error });
+            return startActiveSpan(
+              "runsRepository.listRunIds.fallback",
+              async () => {
+                return await this.postgresRunsRepository.listRunIds(options);
+              },
+              {
+                attributes: {
+                  "repository.name": "postgres",
+                  "fallback.reason": "clickhouse_error",
+                  "fallback.error": error instanceof Error ? error.message : String(error),
+                  organizationId: options.organizationId,
+                  projectId: options.projectId,
+                  environmentId: options.environmentId,
+                },
+              }
+            );
+          }
+          throw error;
+        }
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+          organizationId: options.organizationId,
+          projectId: options.projectId,
+          environmentId: options.environmentId,
+        },
+      }
+    );
+  }
+
+  async listFriendlyRunIds(options: ListRunsOptions): Promise<string[]> {
+    const repository = await this.#getRepository();
+    return startActiveSpan(
+      "runsRepository.listFriendlyRunIds",
+      async () => {
+        try {
+          return await repository.listFriendlyRunIds(options);
+        } catch (error) {
+          // If ClickHouse fails, retry with Postgres
+          if (repository.name === "clickhouse") {
+            this.logger?.warn("ClickHouse failed, retrying with Postgres", { error });
+            return startActiveSpan(
+              "runsRepository.listFriendlyRunIds.fallback",
+              async () => {
+                return await this.postgresRunsRepository.listFriendlyRunIds(options);
+              },
+              {
+                attributes: {
+                  "repository.name": "postgres",
+                  "fallback.reason": "clickhouse_error",
+                  "fallback.error": error instanceof Error ? error.message : String(error),
+                  organizationId: options.organizationId,
+                  projectId: options.projectId,
+                  environmentId: options.environmentId,
+                },
+              }
+            );
+          }
+          throw error;
+        }
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+          organizationId: options.organizationId,
+          projectId: options.projectId,
+          environmentId: options.environmentId,
+        },
+      }
+    );
+  }
+
+  async listRuns(options: ListRunsOptions): Promise<{
+    runs: ListedRun[];
+    pagination: {
+      nextCursor: string | null;
+      previousCursor: string | null;
+    };
+  }> {
+    const repository = await this.#getRepository();
+    return startActiveSpan(
+      "runsRepository.listRuns",
+      async () => {
+        try {
+          return await repository.listRuns(options);
+        } catch (error) {
+          // If ClickHouse fails, retry with Postgres
+          if (repository.name === "clickhouse") {
+            this.logger?.warn("ClickHouse failed, retrying with Postgres", { error });
+            return startActiveSpan(
+              "runsRepository.listRuns.fallback",
+              async () => {
+                return await this.postgresRunsRepository.listRuns(options);
+              },
+              {
+                attributes: {
+                  "repository.name": "postgres",
+                  "fallback.reason": "clickhouse_error",
+                  "fallback.error": error instanceof Error ? error.message : String(error),
+                  organizationId: options.organizationId,
+                  projectId: options.projectId,
+                  environmentId: options.environmentId,
+                },
+              }
+            );
+          }
+          throw error;
+        }
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+          organizationId: options.organizationId,
+          projectId: options.projectId,
+          environmentId: options.environmentId,
+        },
+      }
+    );
+  }
+
+  async countRuns(options: RunListInputOptions): Promise<number> {
+    const repository = await this.#getRepository();
+    return startActiveSpan(
+      "runsRepository.countRuns",
+      async () => {
+        try {
+          return await repository.countRuns(options);
+        } catch (error) {
+          // If ClickHouse fails, retry with Postgres
+          if (repository.name === "clickhouse") {
+            this.logger?.warn("ClickHouse failed, retrying with Postgres", { error });
+            return startActiveSpan(
+              "runsRepository.countRuns.fallback",
+              async () => {
+                return await this.postgresRunsRepository.countRuns(options);
+              },
+              {
+                attributes: {
+                  "repository.name": "postgres",
+                  "fallback.reason": "clickhouse_error",
+                  "fallback.error": error instanceof Error ? error.message : String(error),
+                  organizationId: options.organizationId,
+                  projectId: options.projectId,
+                  environmentId: options.environmentId,
+                },
+              }
+            );
+          }
+          throw error;
+        }
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+          organizationId: options.organizationId,
+          projectId: options.projectId,
+          environmentId: options.environmentId,
+        },
+      }
+    );
+  }
+
+  async listTags(options: TagListOptions): Promise<TagList> {
+    const repository = await this.#getRepository();
+    return startActiveSpan(
+      "runsRepository.listTags",
+      async () => {
+        return await repository.listTags(options);
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+          organizationId: options.organizationId,
+          projectId: options.projectId,
+          environmentId: options.environmentId,
+        },
+      }
+    );
+  }
+}
+
+export function parseRunListInputOptions(data: any): RunListInputOptions {
+  return RunListInputOptionsSchema.parse(data);
+}
+
+export async function convertRunListInputOptionsToFilterRunsOptions(
+  options: RunListInputOptions,
+  prisma: RunsRepositoryOptions["prisma"]
+): Promise<FilterRunsOptions> {
+  const convertedOptions: FilterRunsOptions = {
+    ...options,
+    period: undefined,
+  };
+
+  // Convert time period to ms
+  const time = timeFilters({
+    period: options.period,
+    from: options.from,
+    to: options.to,
+  });
+  convertedOptions.period = time.period ? parseDuration(time.period) ?? undefined : undefined;
+
+  // Batch friendlyId to id
+  if (options.batchId && options.batchId.startsWith("batch_")) {
+    const batch = await prisma.batchTaskRun.findFirst({
+      select: {
+        id: true,
+      },
+      where: {
+        friendlyId: options.batchId,
+        runtimeEnvironmentId: options.environmentId,
+      },
+    });
+
+    if (batch) {
+      convertedOptions.batchId = batch.id;
+    }
+  }
+
+  // ScheduleId can be a friendlyId
+  if (options.scheduleId && options.scheduleId.startsWith("sched_")) {
+    const schedule = await prisma.taskSchedule.findFirst({
+      select: {
+        id: true,
+      },
+      where: {
+        friendlyId: options.scheduleId,
+        projectId: options.projectId,
+      },
+    });
+
+    if (schedule) {
+      convertedOptions.scheduleId = schedule?.id;
+    }
+  }
+
+  if (options.bulkId && options.bulkId.startsWith("bulk_")) {
+    convertedOptions.bulkId = BulkActionId.toId(options.bulkId);
+  }
+
+  if (options.runId) {
+    // Convert to friendlyId
+    convertedOptions.runId = options.runId.map((r) => RunId.toFriendlyId(r));
+  }
+
+  // Show all runs if we are filtering by batchId or runId
+  if (options.batchId || options.runId?.length || options.scheduleId || options.tasks?.length) {
+    convertedOptions.rootOnly = false;
+  }
+
+  return convertedOptions;
+}
diff --git a/apps/webapp/app/services/signals.server.ts b/apps/webapp/app/services/signals.server.ts
new file mode 100644
index 00000000000..308f16fdeaa
--- /dev/null
+++ b/apps/webapp/app/services/signals.server.ts
@@ -0,0 +1,32 @@
+import { EventEmitter } from "events";
+import { singleton } from "~/utils/singleton";
+
+export type SignalsEvents = {
+  SIGTERM: [
+    {
+      time: Date;
+      signal: NodeJS.Signals;
+    }
+  ];
+  SIGINT: [
+    {
+      time: Date;
+      signal: NodeJS.Signals;
+    }
+  ];
+};
+
+export type SignalsEventArgs<T extends keyof SignalsEvents> = SignalsEvents[T];
+
+export type SignalsEmitter = EventEmitter<SignalsEvents>;
+
+function initializeSignalsEmitter() {
+  const emitter = new EventEmitter<SignalsEvents>();
+
+  process.on("SIGTERM", () => emitter.emit("SIGTERM", { time: new Date(), signal: "SIGTERM" }));
+  process.on("SIGINT", () => emitter.emit("SIGINT", { time: new Date(), signal: "SIGINT" }));
+
+  return emitter;
+}
+
+export const signalsEmitter = singleton("signalsEmitter", initializeSignalsEmitter);
diff --git a/apps/webapp/app/services/telemetry.server.ts b/apps/webapp/app/services/telemetry.server.ts
index 98ca11ed908..f8bd3d3d993 100644
--- a/apps/webapp/app/services/telemetry.server.ts
+++ b/apps/webapp/app/services/telemetry.server.ts
@@ -28,18 +28,32 @@ class Telemetry {
   }
 
   user = {
-    identify: ({ user, isNewUser }: { user: User; isNewUser: boolean }) => {
+    identify: ({
+      user,
+      isNewUser,
+      referralSource,
+    }: {
+      user: User;
+      isNewUser: boolean;
+      referralSource?: string;
+    }) => {
       if (this.#posthogClient) {
+        const properties: Record<string, any> = {
+          email: user.email,
+          name: user.name,
+          authenticationMethod: user.authenticationMethod,
+          admin: user.admin,
+          createdAt: user.createdAt,
+          isNewUser,
+        };
+        
+        if (referralSource) {
+          properties.referralSource = referralSource;
+        }
+        
         this.#posthogClient.identify({
           distinctId: user.id,
-          properties: {
-            email: user.email,
-            name: user.name,
-            authenticationMethod: user.authenticationMethod,
-            admin: user.admin,
-            createdAt: user.createdAt,
-            isNewUser,
-          },
+          properties,
         });
       }
       if (isNewUser) {
diff --git a/apps/webapp/app/services/upsertBranch.server.ts b/apps/webapp/app/services/upsertBranch.server.ts
index 5f53ae2b984..a11fdc350ab 100644
--- a/apps/webapp/app/services/upsertBranch.server.ts
+++ b/apps/webapp/app/services/upsertBranch.server.ts
@@ -14,7 +14,16 @@ export class UpsertBranchService {
     this.#prismaClient = prismaClient;
   }
 
-  public async call(userId: string, { parentEnvironmentId, branchName, git }: CreateBranchOptions) {
+  public async call(
+    // The orgFilter approach is not ideal but we need to keep it this way for now because of how the service is used in routes and api endpoints.
+    // Currently authorization checks are spread across the controller/route layer and the service layer. Often we check in multiple places for org/project membership.
+    // Ideally we would take care of both the authentication and authorization checks in the controllers and routes.
+    // That would unify how we handle authorization and org/project membership checks. Also it would make the service layer queries simpler.
+    orgFilter:
+      | { type: "userMembership"; userId: string }
+      | { type: "orgId"; organizationId: string },
+    { parentEnvironmentId, branchName, git }: CreateBranchOptions
+  ) {
     const sanitizedBranchName = sanitizeBranchName(branchName);
     if (!sanitizedBranchName) {
       return {
@@ -34,13 +43,16 @@ export class UpsertBranchService {
       const parentEnvironment = await this.#prismaClient.runtimeEnvironment.findFirst({
         where: {
           id: parentEnvironmentId,
-          organization: {
-            members: {
-              some: {
-                userId: userId,
-              },
-            },
-          },
+          organization:
+            orgFilter.type === "userMembership"
+              ? {
+                  members: {
+                    some: {
+                      userId: orgFilter.userId,
+                    },
+                  },
+                }
+              : { id: orgFilter.organizationId },
         },
         include: {
           organization: {
diff --git a/apps/webapp/app/services/vercelIntegration.server.ts b/apps/webapp/app/services/vercelIntegration.server.ts
new file mode 100644
index 00000000000..d9b70eae3a5
--- /dev/null
+++ b/apps/webapp/app/services/vercelIntegration.server.ts
@@ -0,0 +1,656 @@
+import type {
+  PrismaClient,
+  OrganizationProjectIntegration,
+  OrganizationIntegration,
+  SecretReference,
+} from "@trigger.dev/database";
+import { ResultAsync } from "neverthrow";
+import { prisma, $transaction } from "~/db.server";
+import { logger } from "~/services/logger.server";
+import { VercelIntegrationRepository } from "~/models/vercelIntegration.server";
+import { findCurrentWorkerDeployment } from "~/v3/models/workerDeployment.server";
+import {
+  VercelProjectIntegrationDataSchema,
+  VercelProjectIntegrationData,
+  VercelIntegrationConfig,
+  SyncEnvVarsMapping,
+  TriggerEnvironmentType,
+  EnvSlug,
+  envTypeToSlug,
+  createDefaultVercelIntegrationData,
+} from "~/v3/vercel/vercelProjectIntegrationSchema";
+
+export type VercelProjectIntegrationWithParsedData = OrganizationProjectIntegration & {
+  parsedIntegrationData: VercelProjectIntegrationData;
+};
+
+export type VercelProjectIntegrationWithData = VercelProjectIntegrationWithParsedData & {
+  organizationIntegration: OrganizationIntegration;
+};
+
+export type VercelProjectIntegrationWithProject = VercelProjectIntegrationWithData & {
+  project: {
+    id: string;
+    name: string;
+    slug: string;
+  };
+};
+
+export class VercelIntegrationService {
+  #prismaClient: PrismaClient;
+
+  constructor(prismaClient: PrismaClient = prisma) {
+    this.#prismaClient = prismaClient;
+  }
+
+  async getVercelProjectIntegration(
+    projectId: string,
+  ): Promise<VercelProjectIntegrationWithData | null> {
+    const integration = await this.#prismaClient.organizationProjectIntegration.findFirst({
+      where: {
+        projectId,
+        deletedAt: null,
+        organizationIntegration: {
+          service: "VERCEL",
+          deletedAt: null,
+        },
+      },
+      include: {
+        organizationIntegration: true,
+      },
+    });
+
+    if (!integration) {
+      return null;
+    }
+
+    const parsedData = VercelProjectIntegrationDataSchema.safeParse(integration.integrationData);
+
+    if (!parsedData.success) {
+      logger.error("Failed to parse Vercel integration data", {
+        projectId,
+        integrationId: integration.id,
+        error: parsedData.error,
+      });
+      return null;
+    }
+
+    return {
+      ...integration,
+      parsedIntegrationData: parsedData.data,
+    };
+  }
+
+  async getConnectedVercelProjects(
+    organizationId: string
+  ): Promise<VercelProjectIntegrationWithProject[]> {
+    const integrations = await this.#prismaClient.organizationProjectIntegration.findMany({
+      where: {
+        deletedAt: null,
+        organizationIntegration: {
+          organizationId,
+          service: "VERCEL",
+          deletedAt: null,
+        },
+      },
+      include: {
+        organizationIntegration: true,
+        project: {
+          select: {
+            id: true,
+            name: true,
+            slug: true,
+          },
+        },
+      },
+    });
+
+    return integrations
+      .map((integration) => {
+        const parsedData = VercelProjectIntegrationDataSchema.safeParse(integration.integrationData);
+        if (!parsedData.success) {
+          logger.error("Failed to parse Vercel integration data", {
+            integrationId: integration.id,
+            error: parsedData.error,
+          });
+          return null;
+        }
+
+        return {
+          ...integration,
+          parsedIntegrationData: parsedData.data,
+        };
+      })
+      .filter((i): i is VercelProjectIntegrationWithProject => i !== null);
+  }
+
+  async createVercelProjectIntegration(params: {
+    organizationIntegrationId: string;
+    projectId: string;
+    vercelProjectId: string;
+    vercelProjectName: string;
+    vercelTeamId: string | null;
+    vercelTeamSlug?: string;
+    installedByUserId?: string;
+  }): Promise<OrganizationProjectIntegration> {
+    const integrationData = createDefaultVercelIntegrationData(
+      params.vercelProjectId,
+      params.vercelProjectName,
+      params.vercelTeamId,
+      params.vercelTeamSlug
+    );
+
+    return this.#prismaClient.organizationProjectIntegration.create({
+      data: {
+        organizationIntegrationId: params.organizationIntegrationId,
+        projectId: params.projectId,
+        externalEntityId: params.vercelProjectId,
+        integrationData: integrationData,
+        installedBy: params.installedByUserId,
+      },
+    });
+  }
+
+  async selectVercelProject(params: {
+    organizationId: string;
+    projectId: string;
+    vercelProjectId: string;
+    vercelProjectName: string;
+    userId: string;
+  }): Promise<{
+    integration: OrganizationProjectIntegration;
+    syncResult: { success: boolean; errors: string[] };
+  }> {
+    const orgIntegration = await VercelIntegrationRepository.findVercelOrgIntegrationByOrganization(
+      params.organizationId
+    );
+
+    if (!orgIntegration) {
+      throw new Error("No Vercel organization integration found");
+    }
+
+    const teamId = await VercelIntegrationRepository.getTeamIdFromIntegration(orgIntegration);
+
+    const vercelTeamSlug = await VercelIntegrationRepository.getVercelClient(orgIntegration)
+      .andThen((client) => VercelIntegrationRepository.getTeamSlug(client, teamId))
+      .match(
+        (slug) => slug,
+        () => undefined
+      );
+
+    // Use a serializable transaction to prevent duplicate project integrations
+    // from concurrent selectVercelProject calls (read-then-write race condition).
+    const txResult = await $transaction(
+      this.#prismaClient,
+      "selectVercelProject",
+      async (tx) => {
+        const existing = await tx.organizationProjectIntegration.findFirst({
+          where: {
+            projectId: params.projectId,
+            deletedAt: null,
+            organizationIntegration: {
+              service: "VERCEL",
+              deletedAt: null,
+            },
+          },
+          include: {
+            organizationIntegration: true,
+          },
+        });
+
+        if (existing) {
+          const parsedData = VercelProjectIntegrationDataSchema.safeParse(
+            existing.integrationData
+          );
+
+          const updated = await tx.organizationProjectIntegration.update({
+            where: { id: existing.id },
+            data: {
+              externalEntityId: params.vercelProjectId,
+              integrationData: {
+                ...(parsedData.success ? parsedData.data : {}),
+                vercelProjectId: params.vercelProjectId,
+                vercelProjectName: params.vercelProjectName,
+                vercelTeamId: teamId,
+                vercelTeamSlug,
+              },
+            },
+          });
+
+          return {
+            integration: updated,
+            wasCreated: false,
+            vercelStagingEnvironment: parsedData.success
+              ? parsedData.data.config.vercelStagingEnvironment
+              : null,
+          };
+        }
+
+        const integrationData = createDefaultVercelIntegrationData(
+          params.vercelProjectId,
+          params.vercelProjectName,
+          teamId,
+          vercelTeamSlug
+        );
+
+        const created = await tx.organizationProjectIntegration.create({
+          data: {
+            organizationIntegrationId: orgIntegration.id,
+            projectId: params.projectId,
+            externalEntityId: params.vercelProjectId,
+            integrationData: integrationData,
+            installedBy: params.userId,
+          },
+        });
+
+        return {
+          integration: created,
+          wasCreated: true,
+          vercelStagingEnvironment: null,
+        };
+      },
+      { isolationLevel: "Serializable" }
+    );
+
+    if (!txResult) {
+      throw new Error("Failed to select Vercel project: transaction returned undefined");
+    }
+
+    const { integration, wasCreated, vercelStagingEnvironment } = txResult;
+
+    const syncResultAsync = await VercelIntegrationRepository.syncApiKeysToVercel({
+      projectId: params.projectId,
+      vercelProjectId: params.vercelProjectId,
+      teamId,
+      vercelStagingEnvironment,
+      orgIntegration,
+    });
+    const syncResult = syncResultAsync.isOk()
+      ? { success: syncResultAsync.value.errors.length === 0, errors: syncResultAsync.value.errors }
+      : { success: false, errors: [syncResultAsync.error.message] };
+
+    if (wasCreated) {
+      const disableResult = await VercelIntegrationRepository.getVercelClient(orgIntegration)
+        .andThen((client) =>
+          VercelIntegrationRepository.disableAutoAssignCustomDomains(
+            client,
+            params.vercelProjectId,
+            teamId
+          )
+        );
+
+      if (disableResult.isErr()) {
+        logger.warn("Failed to disable autoAssignCustomDomains during project selection", {
+          projectId: params.projectId,
+          vercelProjectId: params.vercelProjectId,
+          error: disableResult.error.message,
+        });
+      }
+
+      logger.info("Vercel project selected and API keys synced", {
+        projectId: params.projectId,
+        vercelProjectId: params.vercelProjectId,
+        vercelProjectName: params.vercelProjectName,
+        syncSuccess: syncResult.success,
+        syncErrors: syncResult.errors,
+      });
+    }
+
+    return { integration, syncResult };
+  }
+
+  async updateVercelIntegrationConfig(
+    projectId: string,
+    configUpdates: Partial<VercelIntegrationConfig>
+  ): Promise<VercelProjectIntegrationWithParsedData | null> {
+    const existing = await this.getVercelProjectIntegration(projectId);
+    if (!existing) {
+      return null;
+    }
+
+    const updatedConfig = {
+      ...existing.parsedIntegrationData.config,
+      ...configUpdates,
+    };
+
+    const updatedData: VercelProjectIntegrationData = {
+      ...existing.parsedIntegrationData,
+      config: updatedConfig,
+    };
+
+    const updated = await this.#prismaClient.organizationProjectIntegration.update({
+      where: { id: existing.id },
+      data: {
+        integrationData: updatedData,
+      },
+    });
+
+    if (!updatedConfig.atomicBuilds?.includes("prod")) {
+      return { ...updated, parsedIntegrationData: updatedData };
+    }
+
+    const orgIntegration = await VercelIntegrationRepository.findVercelOrgIntegrationForProject(
+      projectId
+    );
+
+    if (orgIntegration) {
+      await this.#syncTriggerVersionToVercelProduction(
+        projectId,
+        updatedConfig.atomicBuilds,
+        orgIntegration
+      );
+    }
+
+    return {
+      ...updated,
+      parsedIntegrationData: updatedData,
+    };
+  }
+
+  async updateSyncEnvVarsMapping(
+    projectId: string,
+    syncEnvVarsMapping: SyncEnvVarsMapping
+  ): Promise<VercelProjectIntegrationWithParsedData | null> {
+    const existing = await this.getVercelProjectIntegration(projectId);
+    if (!existing) {
+      return null;
+    }
+
+    const updatedData: VercelProjectIntegrationData = {
+      ...existing.parsedIntegrationData,
+      syncEnvVarsMapping,
+    };
+
+    const updated = await this.#prismaClient.organizationProjectIntegration.update({
+      where: { id: existing.id },
+      data: {
+        integrationData: updatedData,
+      },
+    });
+
+    return {
+      ...updated,
+      parsedIntegrationData: updatedData,
+    };
+  }
+
+  async updateSyncEnvVarForEnvironment(
+    projectId: string,
+    envVarKey: string,
+    environmentType: TriggerEnvironmentType,
+    syncEnabled: boolean
+  ): Promise<VercelProjectIntegrationWithParsedData | null> {
+    const existing = await this.getVercelProjectIntegration(projectId);
+    if (!existing) {
+      return null;
+    }
+
+    const currentMapping = existing.parsedIntegrationData.syncEnvVarsMapping || {};
+    const envSlug = envTypeToSlug(environmentType);
+
+    const currentEnvSettings = currentMapping[envSlug] || {};
+
+    const updatedMapping: SyncEnvVarsMapping = {
+      ...currentMapping,
+      [envSlug]: {
+        ...currentEnvSettings,
+        [envVarKey]: syncEnabled,
+      },
+    };
+
+    const updatedData: VercelProjectIntegrationData = {
+      ...existing.parsedIntegrationData,
+      syncEnvVarsMapping: updatedMapping,
+    };
+
+    const updated = await this.#prismaClient.organizationProjectIntegration.update({
+      where: { id: existing.id },
+      data: {
+        integrationData: updatedData,
+      },
+    });
+
+    return {
+      ...updated,
+      parsedIntegrationData: updatedData,
+    };
+  }
+
+  async removeSyncEnvVarForEnvironment(
+    projectId: string,
+    envVarKey: string,
+    environmentType: TriggerEnvironmentType
+  ): Promise<void> {
+    const existing = await this.getVercelProjectIntegration(projectId);
+    if (!existing) return;
+
+    const currentMapping = existing.parsedIntegrationData.syncEnvVarsMapping || {};
+    const envSlug = envTypeToSlug(environmentType);
+    const currentEnvSettings = currentMapping[envSlug];
+    if (!currentEnvSettings || !(envVarKey in currentEnvSettings)) return;
+
+    const { [envVarKey]: _, ...rest } = currentEnvSettings;
+    const updatedMapping = { ...currentMapping, [envSlug]: rest };
+
+    await this.#prismaClient.organizationProjectIntegration.update({
+      where: { id: existing.id },
+      data: {
+        integrationData: {
+          ...existing.parsedIntegrationData,
+          syncEnvVarsMapping: updatedMapping,
+        },
+      },
+    });
+  }
+
+  async completeOnboarding(
+    projectId: string,
+    params: {
+      vercelStagingEnvironment?: { environmentId: string; displayName: string } | null;
+      pullEnvVarsBeforeBuild?: EnvSlug[] | null;
+      atomicBuilds?: EnvSlug[] | null;
+      discoverEnvVars?: EnvSlug[] | null;
+      syncEnvVarsMapping?: SyncEnvVarsMapping;
+    }
+  ): Promise<VercelProjectIntegrationWithParsedData | null> {
+    const existing = await this.getVercelProjectIntegration(projectId);
+    if (!existing) {
+      return null;
+    }
+
+    const syncEnvVarsMapping = params.syncEnvVarsMapping ?? { "dev":{}, "stg":{}, "prod":{}, "preview":{} };
+    const updatedData: VercelProjectIntegrationData = {
+      ...existing.parsedIntegrationData,
+      config: {
+        ...existing.parsedIntegrationData.config,
+        pullEnvVarsBeforeBuild: params.pullEnvVarsBeforeBuild ?? null,
+        atomicBuilds: params.atomicBuilds ?? null,
+        discoverEnvVars: params.discoverEnvVars ?? null,
+        vercelStagingEnvironment: params.vercelStagingEnvironment ?? null,
+      },
+      //This is intentionally not updated here, in case of resetting the onboarding it should not override the existing mapping with an empty one
+      syncEnvVarsMapping: existing.parsedIntegrationData.syncEnvVarsMapping, 
+      onboardingCompleted: true,
+    };
+
+    const updated = await this.#prismaClient.organizationProjectIntegration.update({
+      where: { id: existing.id },
+      data: {
+        integrationData: updatedData,
+      },
+    });
+
+    const orgIntegration = await VercelIntegrationRepository.findVercelOrgIntegrationForProject(
+      projectId
+    );
+
+    if (orgIntegration) {
+      const teamId = await VercelIntegrationRepository.getTeamIdFromIntegration(orgIntegration);
+
+      const pullResult = await VercelIntegrationRepository.pullEnvVarsFromVercel({
+        projectId,
+        vercelProjectId: updatedData.vercelProjectId,
+        teamId,
+        vercelStagingEnvironment: params.vercelStagingEnvironment,
+        syncEnvVarsMapping,
+        orgIntegration,
+      });
+
+      if (pullResult.isErr()) {
+        logger.error("Failed to pull env vars from Vercel during onboarding", {
+          projectId,
+          error: pullResult.error.message,
+        });
+      } else if (pullResult.value.errors.length > 0) {
+        logger.warn("Errors pulling env vars from Vercel during onboarding", {
+          projectId,
+          errors: pullResult.value.errors,
+        });
+      }
+
+      await this.#syncTriggerVersionToVercelProduction(
+        projectId,
+        updatedData.config.atomicBuilds,
+        orgIntegration
+      );
+    }
+
+    return {
+      ...updated,
+      parsedIntegrationData: updatedData,
+    };
+  }
+
+  async #syncTriggerVersionToVercelProduction(
+    projectId: string,
+    atomicBuilds: string[] | null | undefined,
+    orgIntegration: OrganizationIntegration & { tokenReference: SecretReference }
+  ): Promise<void> {
+    if (!atomicBuilds?.includes("prod")) {
+      return;
+    }
+
+    const prodEnvironment = await this.#prismaClient.runtimeEnvironment.findFirst({
+      where: {
+        projectId,
+        type: "PRODUCTION",
+      },
+      select: {
+        id: true,
+      },
+    });
+
+    if (!prodEnvironment) {
+      return;
+    }
+
+    const currentDeployment = await findCurrentWorkerDeployment({
+      environmentId: prodEnvironment.id,
+    });
+
+    if (!currentDeployment?.version) {
+      return;
+    }
+
+    const clientResult = await VercelIntegrationRepository.getVercelClient(orgIntegration);
+    if (clientResult.isErr()) {
+      logger.error("Failed to get Vercel client for TRIGGER_VERSION sync", {
+        projectId,
+        error: clientResult.error.message,
+      });
+      return;
+    }
+    const client = clientResult.value;
+    const teamId = await VercelIntegrationRepository.getTeamIdFromIntegration(orgIntegration);
+
+    // Get the Vercel project ID from the project integration
+    const projectIntegration = await this.#prismaClient.organizationProjectIntegration.findFirst({
+      where: {
+        projectId,
+        organizationIntegrationId: orgIntegration.id,
+        deletedAt: null,
+      },
+      select: {
+        externalEntityId: true,
+      },
+    });
+
+    if (!projectIntegration) {
+      return;
+    }
+
+    const vercelProjectId = projectIntegration.externalEntityId;
+
+    // Check if TRIGGER_VERSION already exists targeting production
+    const envVarsResult = await VercelIntegrationRepository.getVercelEnvironmentVariables(
+      client,
+      vercelProjectId,
+      teamId
+    );
+
+    if (envVarsResult.isErr()) {
+      logger.warn("Failed to fetch Vercel env vars for TRIGGER_VERSION sync", {
+        projectId,
+        vercelProjectId,
+        error: envVarsResult.error.message,
+      });
+      return;
+    }
+
+    const existingTriggerVersion = envVarsResult.value.find(
+      (env) => env.key === "TRIGGER_VERSION" && env.target.includes("production")
+    );
+
+    if (existingTriggerVersion) {
+      return;
+    }
+
+    // Push TRIGGER_VERSION to Vercel production
+    const createResult = await ResultAsync.fromPromise(
+      client.projects.createProjectEnv({
+        idOrName: vercelProjectId,
+        ...(teamId && { teamId }),
+        upsert: "true",
+        requestBody: {
+          key: "TRIGGER_VERSION",
+          value: currentDeployment.version,
+          target: ["production"] as any,
+          type: "encrypted",
+        },
+      }),
+      (error) => error
+    );
+
+    if (createResult.isErr()) {
+      logger.error("Failed to sync TRIGGER_VERSION to Vercel production", {
+        projectId,
+        vercelProjectId,
+        error: createResult.error instanceof Error ? createResult.error.message : String(createResult.error),
+      });
+      return;
+    }
+
+    logger.info("Synced TRIGGER_VERSION to Vercel production", {
+      projectId,
+      vercelProjectId,
+      version: currentDeployment.version,
+    });
+  }
+
+  async disconnectVercelProject(projectId: string): Promise<boolean> {
+    const existing = await this.getVercelProjectIntegration(projectId);
+    if (!existing) {
+      return false;
+    }
+
+    await this.#prismaClient.organizationProjectIntegration.update({
+      where: { id: existing.id },
+      data: {
+        deletedAt: new Date(),
+      },
+    });
+
+    return true;
+  }
+}
+
diff --git a/apps/webapp/app/tailwind.css b/apps/webapp/app/tailwind.css
index 3d68e87811d..2e435a032b7 100644
--- a/apps/webapp/app/tailwind.css
+++ b/apps/webapp/app/tailwind.css
@@ -1,6 +1,38 @@
 @import url("non.geist");
 @import url("non.geist/mono");
 
+@import "react-grid-layout/css/styles.css";
+@import "react-resizable/css/styles.css";
+
+/* Override react-grid-layout placeholder color (default is red) */
+.react-grid-item.react-grid-placeholder {
+  background: rgb(99 102 241) !important; /* indigo-500 */
+  border-radius: 0.375rem !important; /* rounded-md */
+}
+
+/* Sidebar reorder grid: subtle placeholder */
+.sidebar-reorder-grid .react-grid-item.react-grid-placeholder {
+  background: rgb(39 42 46) !important; /* charcoal-700 */
+  border-radius: 0.25rem;
+  opacity: 1 !important;
+}
+
+/* Sidebar reorder grid: only animate transform (vertical position), not width/height */
+.sidebar-reorder-grid .react-grid-item {
+  transition: transform 200ms ease !important;
+}
+
+/* Override resize handle icon to white */
+.react-resizable-handle {
+  background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2IDYiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiNmZmZmZmYwMCIgeD0iMHB4IiB5PSIwcHgiIHdpZHRoPSI2cHgiIGhlaWdodD0iNnB4Ij48ZyBvcGFjaXR5PSIwLjMwMiI+PHBhdGggZD0iTSA2IDYgTCAwIDYgTCAwIDQuMiBMIDQgNC4yIEwgNC4yIDQuMiBMIDQuMiAwIEwgNiAwIEwgNiA2IEwgNiA2IFoiIGZpbGw9IiNmZmZmZmYiLz48L2c+PC9zdmc+') !important;
+}
+.react-resizable-handle::after {
+  border-bottom-color: rgba(255, 255, 255, 0.4) !important;
+  border-right-color: rgba(255, 255, 255, 0.4) !important;
+  border-top-color: rgba(255, 255, 255, 0.4) !important;
+  border-left-color: rgba(255, 255, 255, 0.4) !important;
+}
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -11,6 +43,12 @@
   inherits: false;
 }
 
+@supports (-webkit-hyphens: none) {
+  .safari-only {
+    @apply border-b border-grid-dimmed;
+  }
+}
+
 @layer base {
   * {
     @apply border-grid-bright;
@@ -106,3 +144,102 @@
     --gradient-angle: 360deg;
   }
 }
+
+/* Streamdown markdown styling */
+.streamdown-container {
+  /* Streamdown uses shadcn/ui CSS variables - define them for our theme */
+  --muted: 220 13% 20%;
+  --muted-foreground: 215 14% 60%;
+  --foreground: 210 20% 90%;
+  --border: 217 19% 27%;
+
+  /* Code block styling */
+  & [data-code-block-container] {
+    @apply rounded border-charcoal-650 my-0;
+  }
+  & [data-code-block] {
+    border-top: none;
+  }
+
+  & p {
+    @apply my-1;
+  }
+  & h1, & h2, & h3, & h4, & h5, & h6 {
+    @apply font-semibold text-text-bright mt-2 mb-1;
+  }
+  & h1 {
+    @apply text-base;
+  }
+  & h2 {
+    @apply text-sm;
+  }
+  & h3, & h4, & h5, & h6 {
+    @apply text-xs;
+  }
+  & ul, & ol {
+    @apply ml-4 my-1;
+  }
+  & ul {
+    @apply list-disc;
+  }
+  & ol {
+    @apply list-decimal;
+  }
+  & li {
+    @apply my-0.5;
+  }
+  /* Inline code (not in pre blocks) */
+  & code:not(pre code) {
+    @apply bg-charcoal-700 px-1 py-0.5 rounded text-text-bright font-mono;
+  }
+  & blockquote {
+    @apply border-l-2 border-charcoal-600 pl-3 my-2 italic;
+  }
+  & a {
+    @apply text-blue-400 hover:underline;
+  }
+  & strong {
+    @apply font-semibold text-text-bright;
+  }
+  & em {
+    @apply italic;
+  }
+  & hr {
+    @apply my-2 border-charcoal-600;
+  }
+  & table {
+    @apply w-full my-2 border-collapse;
+  }
+  & th, & td {
+    @apply border border-charcoal-600 px-2 py-1 text-left;
+  }
+  & th {
+    @apply bg-charcoal-700 font-semibold;
+  }
+
+  /* Streamdown code block container */
+  & [data-code-block-container] {
+    @apply my-2 border-charcoal-700;
+  }
+  & [data-code-block-header] {
+    @apply bg-charcoal-800 text-text-dimmed border-b border-charcoal-700;
+  }
+  /* Hide light mode code block, show dark mode */
+  & [data-code-block].dark\:hidden {
+    display: none !important;
+  }
+  & [data-code-block].hidden.dark\:block {
+    display: block !important;
+  }
+  /* Override the bg-muted/40 class to let inline styles work */
+  & [data-code-block] pre {
+    background-color: inherit !important;
+    @apply scrollbar-thin scrollbar-track-transparent scrollbar-thumb-charcoal-600;
+  }
+  & [data-code-block] pre code {
+    @apply bg-transparent;
+  }
+  & [data-code-block] .line {
+    @apply leading-relaxed;
+  }
+}
diff --git a/apps/webapp/app/utils.ts b/apps/webapp/app/utils.ts
index 7dc407cec6c..adb18292811 100644
--- a/apps/webapp/app/utils.ts
+++ b/apps/webapp/app/utils.ts
@@ -7,22 +7,38 @@ const DEFAULT_REDIRECT = "/";
  * This should be used any time the redirect path is user-provided
  * (Like the query string on our login/signup pages). This avoids
  * open-redirect vulnerabilities.
- * @param {string} to The redirect destination
+ * @param {string} path The redirect destination
  * @param {string} defaultRedirect The redirect to use if the to is unsafe.
  */
-export function safeRedirect(
-  to: FormDataEntryValue | string | null | undefined,
+export function sanitizeRedirectPath(
+  path: string | undefined | null,
   defaultRedirect: string = DEFAULT_REDIRECT
-) {
-  if (!to || typeof to !== "string") {
+): string {
+  if (!path || typeof path !== "string") {
     return defaultRedirect;
   }
 
-  if (!to.startsWith("/") || to.startsWith("//")) {
+  if (!path.startsWith("/") || path.startsWith("//")) {
     return defaultRedirect;
   }
 
-  return to;
+  try {
+    // should not parse as a full URL
+    new URL(path);
+    return defaultRedirect;
+  } catch {}
+
+  try {
+    // ensure it's a valid relative path
+    const url = new URL(path, "https://example.com");
+    if (url.hostname !== "example.com") {
+      return defaultRedirect;
+    }
+  } catch {
+    return defaultRedirect;
+  }
+
+  return path;
 }
 
 /**
diff --git a/apps/webapp/app/utils/boolEnv.ts b/apps/webapp/app/utils/boolEnv.ts
index a2609034e3c..824292447e8 100644
--- a/apps/webapp/app/utils/boolEnv.ts
+++ b/apps/webapp/app/utils/boolEnv.ts
@@ -1,9 +1,14 @@
 import { z } from "zod";
 
-export const BoolEnv = z.preprocess((val) => {
+const baseBoolEnv = z.preprocess((val) => {
   if (typeof val !== "string") {
     return val;
   }
 
   return ["true", "1"].includes(val.toLowerCase().trim());
 }, z.boolean());
+
+// Create a type-safe version that only accepts boolean defaults
+export const BoolEnv = baseBoolEnv as Omit<typeof baseBoolEnv, "default"> & {
+  default: (value: boolean) => z.ZodDefault<typeof baseBoolEnv>;
+};
diff --git a/apps/webapp/app/utils/columnFormat.ts b/apps/webapp/app/utils/columnFormat.ts
new file mode 100644
index 00000000000..731b42fdb9f
--- /dev/null
+++ b/apps/webapp/app/utils/columnFormat.ts
@@ -0,0 +1,70 @@
+import type { ColumnFormatType } from "@internal/clickhouse";
+import { formatDurationMilliseconds } from "@trigger.dev/core/v3";
+import { formatCurrencyAccurate } from "~/utils/numberFormatter";
+
+/**
+ * Format a number as binary bytes (KiB, MiB, GiB, TiB)
+ */
+export function formatBytes(bytes: number): string {
+  if (bytes === 0) return "0 B";
+  const units = ["B", "KiB", "MiB", "GiB", "TiB"];
+  const i = Math.min(
+    Math.max(0, Math.floor(Math.log(Math.abs(bytes)) / Math.log(1024))),
+    units.length - 1
+  );
+  return `${(bytes / Math.pow(1024, i)).toFixed(i === 0 ? 0 : 2)} ${units[i]}`;
+}
+
+/**
+ * Format a number as decimal bytes (KB, MB, GB, TB)
+ */
+export function formatDecimalBytes(bytes: number): string {
+  if (bytes === 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  const i = Math.min(
+    Math.max(0, Math.floor(Math.log(Math.abs(bytes)) / Math.log(1000))),
+    units.length - 1
+  );
+  return `${(bytes / Math.pow(1000, i)).toFixed(i === 0 ? 0 : 2)} ${units[i]}`;
+}
+
+/**
+ * Format a large number with human-readable suffix (K, M, B)
+ */
+export function formatQuantity(value: number): string {
+  const abs = Math.abs(value);
+  if (abs >= 1_000_000_000) return `${(value / 1_000_000_000).toFixed(2)}B`;
+  if (abs >= 1_000_000) return `${(value / 1_000_000).toFixed(2)}M`;
+  if (abs >= 1_000) return `${(value / 1_000).toFixed(2)}K`;
+  return value.toLocaleString();
+}
+
+/**
+ * Creates a value formatter function for a given column format type.
+ * Used by chart tooltips, legend values, and big number cards.
+ */
+export function createValueFormatter(
+  format?: ColumnFormatType
+): ((value: number) => string) | undefined {
+  if (!format) return undefined;
+  switch (format) {
+    case "bytes":
+      return (v) => formatBytes(v);
+    case "decimalBytes":
+      return (v) => formatDecimalBytes(v);
+    case "percent":
+      return (v) => `${v.toFixed(2)}%`;
+    case "quantity":
+      return (v) => formatQuantity(v);
+    case "duration":
+      return (v) => formatDurationMilliseconds(v, { style: "short" });
+    case "durationSeconds":
+      return (v) => formatDurationMilliseconds(v * 1000, { style: "short" });
+    case "costInDollars":
+      return (v) => formatCurrencyAccurate(v);
+    case "cost":
+      return (v) => formatCurrencyAccurate(v / 100);
+    default:
+      return undefined;
+  }
+}
diff --git a/apps/webapp/app/utils/dataExport.ts b/apps/webapp/app/utils/dataExport.ts
new file mode 100644
index 00000000000..be7cde397b8
--- /dev/null
+++ b/apps/webapp/app/utils/dataExport.ts
@@ -0,0 +1,79 @@
+import type { OutputColumnMetadata } from "@internal/clickhouse";
+
+/**
+ * Escape a value for CSV format.
+ * - Wraps in quotes if the value contains commas, quotes, or newlines
+ * - Escapes quotes by doubling them
+ */
+function escapeCSVValue(value: unknown): string {
+  if (value === null || value === undefined) {
+    return "";
+  }
+
+  const stringValue = typeof value === "object" ? JSON.stringify(value) : String(value);
+
+  // Check if we need to quote the value
+  if (
+    stringValue.includes(",") ||
+    stringValue.includes('"') ||
+    stringValue.includes("\n") ||
+    stringValue.includes("\r")
+  ) {
+    // Escape quotes by doubling them and wrap in quotes
+    return `"${stringValue.replace(/"/g, '""')}"`;
+  }
+
+  return stringValue;
+}
+
+/**
+ * Convert query result rows to CSV format.
+ *
+ * @param rows - Array of row objects from query results
+ * @param columns - Column metadata describing the result columns
+ * @returns CSV string with header row and data rows
+ */
+export function rowsToCSV(rows: Record<string, unknown>[], columns: OutputColumnMetadata[]): string {
+  if (columns.length === 0) {
+    return "";
+  }
+
+  const columnNames = columns.map((col) => col.name);
+
+  // Header row
+  const headerRow = columnNames.map(escapeCSVValue).join(",");
+
+  // Data rows
+  const dataRows = rows.map((row) => columnNames.map((name) => escapeCSVValue(row[name])).join(","));
+
+  return [headerRow, ...dataRows].join("\n");
+}
+
+/**
+ * Convert query result rows to JSON format.
+ *
+ * @param rows - Array of row objects from query results
+ * @returns Formatted JSON string
+ */
+export function rowsToJSON(rows: Record<string, unknown>[]): string {
+  return JSON.stringify(rows, null, 2);
+}
+
+/**
+ * Trigger a file download in the browser.
+ *
+ * @param content - The file content as a string
+ * @param filename - The name for the downloaded file
+ * @param mimeType - The MIME type of the file
+ */
+export function downloadFile(content: string, filename: string, mimeType: string): void {
+  const blob = new Blob([content], { type: mimeType });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = filename;
+  a.click();
+  URL.revokeObjectURL(url);
+}
+
+
diff --git a/apps/webapp/app/utils/environmentSort.ts b/apps/webapp/app/utils/environmentSort.ts
index 00c7a335808..8b1709a2b0d 100644
--- a/apps/webapp/app/utils/environmentSort.ts
+++ b/apps/webapp/app/utils/environmentSort.ts
@@ -12,10 +12,14 @@ type SortType = {
   userName?: string | null;
 };
 
-export function sortEnvironments<T extends SortType>(environments: T[]): T[] {
+export function sortEnvironments<T extends SortType>(
+  environments: T[],
+  sortOrder?: RuntimeEnvironmentType[]
+): T[] {
+  const order = sortOrder ?? environmentSortOrder;
   return environments.sort((a, b) => {
-    const aIndex = environmentSortOrder.indexOf(a.type);
-    const bIndex = environmentSortOrder.indexOf(b.type);
+    const aIndex = order.indexOf(a.type);
+    const bIndex = order.indexOf(b.type);
 
     const difference = aIndex - bIndex;
 
diff --git a/apps/webapp/app/utils/extractClientIp.server.ts b/apps/webapp/app/utils/extractClientIp.server.ts
new file mode 100644
index 00000000000..bbfa5180713
--- /dev/null
+++ b/apps/webapp/app/utils/extractClientIp.server.ts
@@ -0,0 +1,10 @@
+/**
+ * Extracts the client IP address from the X-Forwarded-For header.
+ * Takes the last item in the header since ALB appends the real client IP by default.
+ */
+export function extractClientIp(xff: string | null): string | null {
+  if (!xff) return null;
+
+  const parts = xff.split(",").map((p) => p.trim());
+  return parts[parts.length - 1]; // take last item, ALB appends the real client IP by default
+}
diff --git a/apps/webapp/app/utils/httpErrors.ts b/apps/webapp/app/utils/httpErrors.ts
index 637b6bf4bf6..5131730e3bb 100644
--- a/apps/webapp/app/utils/httpErrors.ts
+++ b/apps/webapp/app/utils/httpErrors.ts
@@ -5,11 +5,26 @@ export function friendlyErrorDisplay(statusCode: number, statusText?: string) {
         title: "400: Bad request",
         message: statusText ?? "The request was invalid.",
       };
+    case 401:
+      return {
+        title: "401: Unauthorized",
+        message: statusText ?? "Please sign in to continue.",
+      };
+    case 403:
+      return {
+        title: "403: Forbidden",
+        message: statusText ?? "You don't have permission to access this resource.",
+      };
     case 404:
       return {
         title: "404: Page not found",
         message: statusText ?? "The page you're looking for doesn't exist.",
       };
+    case 429:
+      return {
+        title: "429: Too many requests",
+        message: statusText ?? "Please wait a moment and try again.",
+      };
     case 500:
       return {
         title: "500: Server error",
diff --git a/apps/webapp/app/utils/logUtils.ts b/apps/webapp/app/utils/logUtils.ts
new file mode 100644
index 00000000000..71ec44534b0
--- /dev/null
+++ b/apps/webapp/app/utils/logUtils.ts
@@ -0,0 +1,114 @@
+import { createElement, Fragment, type ReactNode } from "react";
+import { z } from "zod";
+
+export const LogLevelSchema = z.enum(["TRACE", "DEBUG", "INFO", "WARN", "ERROR"]);
+export type LogLevel = z.infer<typeof LogLevelSchema>;
+
+export const validLogLevels: LogLevel[] = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
+
+// Default styles for search highlighting
+const DEFAULT_HIGHLIGHT_STYLES: React.CSSProperties = {
+  backgroundColor: "#facc15", // yellow-400
+  color: "#000000",
+  fontWeight: "500",
+  borderRadius: "0.25rem",
+  padding: "0 0.125rem",
+} as const;
+
+/**
+ * Highlights all occurrences of a search term in text with consistent styling.
+ * Case-insensitive search with regex special character escaping.
+ *
+ * @param text - The text to search within
+ * @param searchTerm - The term to highlight (optional)
+ * @param style - Optional custom inline styles for highlights
+ * @returns React nodes with highlighted matches, or the original text if no matches
+ */
+export function highlightSearchText(
+  text: string,
+  searchTerm?: string,
+  style: React.CSSProperties = DEFAULT_HIGHLIGHT_STYLES
+): ReactNode {
+  if (!searchTerm || searchTerm.trim() === "") {
+    return text;
+  }
+
+  // Defense in depth: limit search term length to prevent ReDoS and performance issues
+  const MAX_SEARCH_LENGTH = 500;
+  if (searchTerm.length > MAX_SEARCH_LENGTH) {
+    return text;
+  }
+
+  // Escape special regex characters in search term
+  const escapedSearch = searchTerm.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const regex = new RegExp(escapedSearch, "gi");
+
+  const parts: ReactNode[] = [];
+  let lastIndex = 0;
+  let match;
+  let matchCount = 0;
+
+  while ((match = regex.exec(text)) !== null) {
+    // Add text before match
+    if (match.index > lastIndex) {
+      parts.push(text.substring(lastIndex, match.index));
+    }
+    // Add highlighted match
+    parts.push(
+      createElement("span", { key: `match-${matchCount}`, style }, match[0])
+    );
+    lastIndex = regex.lastIndex;
+    matchCount++;
+  }
+
+  // Add remaining text
+  if (lastIndex < text.length) {
+    parts.push(text.substring(lastIndex));
+  }
+
+  return parts.length > 0 ? parts : text;
+}
+
+// Convert ClickHouse kind to display level
+export function kindToLevel(kind: string, status: string): LogLevel {
+  // ERROR can come from either kind or status
+  if (kind === "LOG_ERROR" || status === "ERROR") {
+    return "ERROR";
+  }
+
+  switch (kind) {
+    case "DEBUG_EVENT":
+    case "LOG_DEBUG":
+      return "DEBUG";
+    case "LOG_INFO":
+      return "INFO";
+    case "LOG_WARN":
+      return "WARN";
+    case "LOG_LOG":
+      return "INFO"; // Changed from "LOG"
+    case "SPAN":
+      return "TRACE";
+    case "ANCESTOR_OVERRIDE":
+    case "SPAN_EVENT":
+    default:
+      return "INFO";
+  }
+}
+
+// Level badge color styles
+export function getLevelColor(level: LogLevel): string {
+  switch (level) {
+    case "ERROR":
+      return "text-error bg-error/10 border-error/20";
+    case "WARN":
+      return "text-warning bg-warning/10 border-warning/20";
+    case "TRACE":
+      return "text-purple-400 bg-purple-500/10 border-purple-500/20";
+    case "DEBUG":
+      return "text-charcoal-400 bg-charcoal-700 border-charcoal-600";
+    case "INFO":
+      return "text-blue-400 bg-blue-500/10 border-blue-500/20";
+    default:
+      return "text-text-dimmed bg-charcoal-750 border-charcoal-700";
+  }
+}
diff --git a/apps/webapp/app/utils/numberFormatter.ts b/apps/webapp/app/utils/numberFormatter.ts
index 13b59b1401c..8cdc2e07931 100644
--- a/apps/webapp/app/utils/numberFormatter.ts
+++ b/apps/webapp/app/utils/numberFormatter.ts
@@ -6,7 +6,18 @@ export const formatNumberCompact = (num: number): string => {
 
 const formatter = Intl.NumberFormat("en");
 
+// Formatter for small decimal values that need more precision
+const preciseFormatter = Intl.NumberFormat("en", {
+  minimumSignificantDigits: 1,
+  maximumSignificantDigits: 6,
+});
+
 export const formatNumber = (num: number): string => {
+  // For very small numbers (between -1 and 1, exclusive), use precise formatting
+  // to avoid rounding 0.000025 to 0
+  if (num !== 0 && Math.abs(num) < 1) {
+    return preciseFormatter.format(num);
+  }
   return formatter.format(num);
 };
 
diff --git a/apps/webapp/app/utils/pathBuilder.ts b/apps/webapp/app/utils/pathBuilder.ts
index 93610360bc9..4f1c03d8d66 100644
--- a/apps/webapp/app/utils/pathBuilder.ts
+++ b/apps/webapp/app/utils/pathBuilder.ts
@@ -40,6 +40,10 @@ export const v3SpanParamsSchema = v3RunParamsSchema.extend({
   spanParam: z.string(),
 });
 
+export const v3RunStreamParamsSchema = v3RunParamsSchema.extend({
+  streamKey: z.string(),
+});
+
 export const v3DeploymentParams = EnvironmentParamSchema.extend({
   deploymentParam: z.string(),
 });
@@ -117,6 +121,14 @@ export function organizationSettingsPath(organization: OrgForPath) {
   return `${organizationPath(organization)}/settings`;
 }
 
+export function organizationIntegrationsPath(organization: OrgForPath) {
+  return `${organizationPath(organization)}/settings/integrations`;
+}
+
+export function organizationVercelIntegrationPath(organization: OrgForPath) {
+  return `${organizationIntegrationsPath(organization)}/vercel`;
+}
+
 function organizationParam(organization: OrgForPath) {
   return organization.slug;
 }
@@ -141,6 +153,28 @@ export function v3ProjectPath(organization: OrgForPath, project: ProjectForPath)
   return `/orgs/${organizationParam(organization)}/projects/${projectParam(project)}`;
 }
 
+export function githubAppInstallPath(organizationSlug: string, redirectTo: string) {
+  return `/github/install?org_slug=${organizationSlug}&redirect_to=${encodeURIComponent(
+    redirectTo
+  )}`;
+}
+
+export function vercelAppInstallPath(organizationSlug: string, projectSlug: string) {
+  return `/vercel/install?org_slug=${organizationSlug}&project_slug=${projectSlug}`;
+}
+
+export function vercelCallbackPath() {
+  return `/vercel/callback`;
+}
+
+export function vercelResourcePath(
+  organizationSlug: string,
+  projectSlug: string,
+  environmentSlug: string
+) {
+  return `/resources/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/vercel`;
+}
+
 export function v3EnvironmentPath(
   organization: OrgForPath,
   project: ProjectForPath,
@@ -232,6 +266,34 @@ export function v3TestPath(
   return `${v3EnvironmentPath(organization, project, environment)}/test`;
 }
 
+export function queryPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/query`;
+}
+
+export function v3CustomDashboardPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath,
+  dashboard: { friendlyId: string }
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/metrics/custom/${
+    dashboard.friendlyId
+  }`;
+}
+
+export function v3BuiltInDashboardPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath,
+  key: string
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/metrics/${key}`;
+}
+
 export function v3TestTaskPath(
   organization: OrgForPath,
   project: ProjectForPath,
@@ -278,9 +340,11 @@ export function v3RunPath(
   organization: OrgForPath,
   project: ProjectForPath,
   environment: EnvironmentForPath,
-  run: v3RunForPath
+  run: v3RunForPath,
+  searchParams?: URLSearchParams
 ) {
-  return `${v3RunsPath(organization, project, environment)}/${run.friendlyId}`;
+  const query = searchParams ? `?${searchParams.toString()}` : "";
+  return `${v3RunsPath(organization, project, environment)}/${run.friendlyId}${query}`;
 }
 
 export function v3RunRedirectPath(
@@ -291,6 +355,10 @@ export function v3RunRedirectPath(
   return `${v3ProjectPath(organization, project)}/runs/${run.friendlyId}`;
 }
 
+export function v3RunPathFromFriendlyId(runId: string) {
+  return `/runs/${runId}`;
+}
+
 export function v3RunDownloadLogsPath(run: v3RunForPath) {
   return `/resources/runs/${run.friendlyId}/logs/download`;
 }
@@ -300,9 +368,12 @@ export function v3RunSpanPath(
   project: ProjectForPath,
   environment: EnvironmentForPath,
   run: v3RunForPath,
-  span: v3SpanForPath
+  span: v3SpanForPath,
+  searchParams?: URLSearchParams
 ) {
-  return `${v3RunPath(organization, project, environment, run)}?span=${span.spanId}`;
+  searchParams = searchParams ?? new URLSearchParams();
+  searchParams.set("span", span.spanId);
+  return `${v3RunPath(organization, project, environment, run, searchParams)}`;
 }
 
 export function v3RunStreamingPath(
@@ -314,6 +385,17 @@ export function v3RunStreamingPath(
   return `${v3RunPath(organization, project, environment, run)}/stream`;
 }
 
+export function v3RunIdempotencyKeyResetPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath,
+  run: v3RunForPath
+) {
+  return `/resources/orgs/${organizationParam(organization)}/projects/${projectParam(
+    project
+  )}/env/${environmentParam(environment)}/runs/${run.friendlyId}/idempotencyKey/reset`;
+}
+
 export function v3SchedulesPath(
   organization: OrgForPath,
   project: ProjectForPath,
@@ -397,7 +479,7 @@ export function v3BatchPath(
   environment: EnvironmentForPath,
   batch: { friendlyId: string }
 ) {
-  return `${v3EnvironmentPath(organization, project, environment)}/batches?id=${batch.friendlyId}`;
+  return `${v3BatchesPath(organization, project, environment)}/${batch.friendlyId}`;
 }
 
 export function v3BatchRunsPath(
@@ -417,6 +499,14 @@ export function v3ProjectSettingsPath(
   return `${v3EnvironmentPath(organization, project, environment)}/settings`;
 }
 
+export function v3LogsPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/logs`;
+}
+
 export function v3DeploymentsPath(
   organization: OrgForPath,
   project: ProjectForPath,
@@ -453,12 +543,40 @@ export function branchesPath(
   return `${v3EnvironmentPath(organization, project, environment)}/branches`;
 }
 
+export function concurrencyPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/concurrency`;
+}
+
+export function limitsPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/limits`;
+}
+
+export function regionsPath(
+  organization: OrgForPath,
+  project: ProjectForPath,
+  environment: EnvironmentForPath
+) {
+  return `${v3EnvironmentPath(organization, project, environment)}/regions`;
+}
+
 export function v3BillingPath(organization: OrgForPath, message?: string) {
   return `${organizationPath(organization)}/settings/billing${
     message ? `?message=${encodeURIComponent(message)}` : ""
   }`;
 }
 
+export function v3BillingAlertsPath(organization: OrgForPath) {
+  return `${organizationPath(organization)}/settings/billing-alerts`;
+}
+
 export function v3StripePortalPath(organization: OrgForPath) {
   return `/resources/${organization.slug}/subscription/portal`;
 }
diff --git a/apps/webapp/app/utils/queryPerformanceMonitor.server.ts b/apps/webapp/app/utils/queryPerformanceMonitor.server.ts
new file mode 100644
index 00000000000..69a11f22b3f
--- /dev/null
+++ b/apps/webapp/app/utils/queryPerformanceMonitor.server.ts
@@ -0,0 +1,64 @@
+import { env } from "~/env.server";
+import { logger } from "~/services/logger.server";
+
+export interface QueryPerformanceConfig {
+  verySlowQueryThreshold?: number; // ms
+  maxQueryLogLength: number;
+}
+
+export class QueryPerformanceMonitor {
+  private config: QueryPerformanceConfig;
+
+  constructor(config: Partial<QueryPerformanceConfig> = {}) {
+    this.config = {
+      maxQueryLogLength: 1000,
+      ...config,
+    };
+  }
+
+  onQuery(
+    clientType: "writer" | "replica",
+    log: {
+      duration: number;
+      query: string;
+      params: string;
+      target: string;
+      timestamp: Date;
+    }
+  ) {
+    if (this.config.verySlowQueryThreshold === undefined) {
+      return;
+    }
+
+    const { duration, query, params, target, timestamp } = log;
+
+    // Only log very slow queries as errors
+    if (duration > this.config.verySlowQueryThreshold) {
+      // Truncate long queries for readability
+      const truncatedQuery =
+        query.length > this.config.maxQueryLogLength
+          ? query.substring(0, this.config.maxQueryLogLength) + "..."
+          : query;
+
+      logger.error("Prisma: very slow database query", {
+        clientType,
+        durationMs: duration,
+        query: truncatedQuery,
+        target,
+        timestamp,
+        paramCount: this.countParams(query),
+        hasParams: params !== "[]" && params !== "",
+      });
+    }
+  }
+
+  private countParams(query: string): number {
+    // Count the number of $1, $2, etc. parameters in the query
+    const paramMatches = query.match(/\$\d+/g);
+    return paramMatches ? paramMatches.length : 0;
+  }
+}
+
+export const queryPerformanceMonitor = new QueryPerformanceMonitor({
+  verySlowQueryThreshold: env.VERY_SLOW_QUERY_THRESHOLD_MS,
+});
diff --git a/apps/webapp/app/utils/requestIdempotency.server.ts b/apps/webapp/app/utils/requestIdempotency.server.ts
index 9f03c7adf2e..2b2fd36e648 100644
--- a/apps/webapp/app/utils/requestIdempotency.server.ts
+++ b/apps/webapp/app/utils/requestIdempotency.server.ts
@@ -4,7 +4,7 @@ import { logger } from "~/services/logger.server";
 import { requestIdempotency } from "~/services/requestIdempotencyInstance.server";
 import { startActiveSpan } from "~/v3/tracer.server";
 
-type RequestIdempotencyType = "batch-trigger" | "trigger";
+type RequestIdempotencyType = "batch-trigger" | "trigger" | "create-batch";
 
 export type IdempotencyConfig<T, R> = {
   requestType: RequestIdempotencyType;
diff --git a/apps/webapp/app/utils/taskEvent.ts b/apps/webapp/app/utils/taskEvent.ts
deleted file mode 100644
index 5fa2713e169..00000000000
--- a/apps/webapp/app/utils/taskEvent.ts
+++ /dev/null
@@ -1,572 +0,0 @@
-import { Attributes, Link } from "@opentelemetry/api";
-import {
-  correctErrorStackTrace,
-  ExceptionEventProperties,
-  isExceptionSpanEvent,
-  millisecondsToNanoseconds,
-  NULL_SENTINEL,
-  SemanticInternalAttributes,
-  SpanEvent,
-  SpanEvents,
-  SpanMessagingEvent,
-  TaskEventStyle,
-  unflattenAttributes,
-} from "@trigger.dev/core/v3";
-import { Prisma, TaskEvent, TaskEventKind } from "@trigger.dev/database";
-import { createTreeFromFlatItems, flattenTree } from "~/components/primitives/TreeView/TreeView";
-import type {
-  PreparedEvent,
-  SpanLink,
-  SpanSummary,
-  TraceSummary,
-} from "~/v3/eventRepository.server";
-
-export type TraceSpan = NonNullable<ReturnType<typeof createSpanFromEvents>>;
-
-export function prepareTrace(events: TaskEvent[]): TraceSummary | undefined {
-  let preparedEvents: Array<PreparedEvent> = [];
-  let rootSpanId: string | undefined;
-  const eventsBySpanId = new Map<string, PreparedEvent>();
-
-  for (const event of events) {
-    preparedEvents.push(prepareEvent(event));
-
-    if (!rootSpanId && !event.parentId) {
-      rootSpanId = event.spanId;
-    }
-  }
-
-  for (const event of preparedEvents) {
-    const existingEvent = eventsBySpanId.get(event.spanId);
-
-    if (!existingEvent) {
-      eventsBySpanId.set(event.spanId, event);
-      continue;
-    }
-
-    if (event.isCancelled || !event.isPartial) {
-      eventsBySpanId.set(event.spanId, event);
-    }
-  }
-
-  preparedEvents = Array.from(eventsBySpanId.values());
-
-  const spansBySpanId = new Map<string, SpanSummary>();
-
-  const spans = preparedEvents.map((event) => {
-    const ancestorCancelled = isAncestorCancelled(eventsBySpanId, event.spanId);
-    const duration = calculateDurationIfAncestorIsCancelled(
-      eventsBySpanId,
-      event.spanId,
-      event.duration
-    );
-
-    const span = {
-      id: event.spanId,
-      parentId: event.parentId ?? undefined,
-      runId: event.runId,
-      data: {
-        message: event.message,
-        style: event.style,
-        duration,
-        isError: event.isError,
-        isPartial: ancestorCancelled ? false : event.isPartial,
-        isCancelled: event.isCancelled === true ? true : event.isPartial && ancestorCancelled,
-        startTime: getDateFromNanoseconds(event.startTime),
-        level: event.level,
-        events: event.events,
-        environmentType: event.environmentType,
-        isDebug: event.kind === TaskEventKind.LOG,
-      },
-    } satisfies SpanSummary;
-
-    spansBySpanId.set(event.spanId, span);
-
-    return span;
-  });
-
-  if (!rootSpanId) {
-    return;
-  }
-
-  const rootSpan = spansBySpanId.get(rootSpanId);
-
-  if (!rootSpan) {
-    return;
-  }
-
-  return {
-    rootSpan,
-    spans,
-  };
-}
-
-export function createTraceTreeFromEvents(traceSummary: TraceSummary, spanId: string) {
-  //this tree starts at the passed in span (hides parent elements if there are any)
-  const tree = createTreeFromFlatItems(traceSummary.spans, spanId);
-
-  //we need the start offset for each item, and the total duration of the entire tree
-  const treeRootStartTimeMs = tree ? tree?.data.startTime.getTime() : 0;
-  let totalDuration = tree?.data.duration ?? 0;
-  const events = tree
-    ? flattenTree(tree).map((n) => {
-        const offset = millisecondsToNanoseconds(n.data.startTime.getTime() - treeRootStartTimeMs);
-        totalDuration = Math.max(totalDuration, offset + n.data.duration);
-        return {
-          ...n,
-          data: {
-            ...n.data,
-            //set partial nodes to null duration
-            duration: n.data.isPartial ? null : n.data.duration,
-            offset,
-            isRoot: n.id === traceSummary.rootSpan.id,
-          },
-        };
-      })
-    : [];
-
-  //total duration should be a minimum of 1ms
-  totalDuration = Math.max(totalDuration, millisecondsToNanoseconds(1));
-
-  let rootSpanStatus: "executing" | "completed" | "failed" = "executing";
-  if (events[0]) {
-    if (events[0].data.isError) {
-      rootSpanStatus = "failed";
-    } else if (!events[0].data.isPartial) {
-      rootSpanStatus = "completed";
-    }
-  }
-
-  return {
-    rootSpanStatus,
-    events: events,
-    parentRunFriendlyId:
-      tree?.id === traceSummary.rootSpan.id ? undefined : traceSummary.rootSpan.runId,
-    duration: totalDuration,
-    rootStartedAt: tree?.data.startTime,
-  };
-}
-
-export function createSpanFromEvents(events: TaskEvent[], spanId: string) {
-  const spanEvent = getSpanEvent(events, spanId);
-
-  if (!spanEvent) {
-    return;
-  }
-
-  const preparedEvent = prepareEvent(spanEvent);
-  const span = createSpanFromEvent(events, preparedEvent);
-
-  const output = rehydrateJson(spanEvent.output);
-  const payload = rehydrateJson(spanEvent.payload);
-
-  const show = rehydrateShow(spanEvent.properties);
-
-  const properties = sanitizedAttributes(spanEvent.properties);
-
-  const messagingEvent = SpanMessagingEvent.optional().safeParse((properties as any)?.messaging);
-
-  const links: SpanLink[] = [];
-
-  if (messagingEvent.success && messagingEvent.data) {
-    if (messagingEvent.data.message && "id" in messagingEvent.data.message) {
-      if (messagingEvent.data.message.id.startsWith("run_")) {
-        links.push({
-          type: "run",
-          icon: "runs",
-          title: `Run ${messagingEvent.data.message.id}`,
-          runId: messagingEvent.data.message.id,
-        });
-      }
-    }
-  }
-
-  const backLinks = spanEvent.links as any as Link[] | undefined;
-
-  if (backLinks && backLinks.length > 0) {
-    backLinks.forEach((l) => {
-      const title = String(l.attributes?.[SemanticInternalAttributes.LINK_TITLE] ?? "Triggered by");
-
-      links.push({
-        type: "span",
-        icon: "trigger",
-        title,
-        traceId: l.context.traceId,
-        spanId: l.context.spanId,
-      });
-    });
-  }
-
-  const spanEvents = transformEvents(
-    preparedEvent.events,
-    spanEvent.metadata as Attributes,
-    spanEvent.environmentType === "DEVELOPMENT"
-  );
-
-  return {
-    ...spanEvent,
-    ...span.data,
-    payload,
-    output,
-    events: spanEvents,
-    show,
-    links,
-    properties: properties ? JSON.stringify(properties, null, 2) : undefined,
-    showActionBar: show?.actions === true,
-  };
-}
-
-export function createSpanFromEvent(events: TaskEvent[], event: PreparedEvent) {
-  let ancestorCancelled = false;
-  let duration = event.duration;
-
-  if (!event.isCancelled && event.isPartial) {
-    walkSpanAncestors(events, event, (ancestorEvent, level) => {
-      if (level >= 8) {
-        return { stop: true };
-      }
-
-      if (ancestorEvent.isCancelled) {
-        ancestorCancelled = true;
-
-        // We need to get the cancellation time from the cancellation span event
-        const cancellationEvent = ancestorEvent.events.find(
-          (event) => event.name === "cancellation"
-        );
-
-        if (cancellationEvent) {
-          duration = calculateDurationFromStart(event.startTime, cancellationEvent.time);
-        }
-
-        return { stop: true };
-      }
-
-      return { stop: false };
-    });
-  }
-
-  const span = {
-    id: event.spanId,
-    parentId: event.parentId ?? undefined,
-    runId: event.runId,
-    idempotencyKey: event.idempotencyKey,
-    data: {
-      message: event.message,
-      style: event.style,
-      duration,
-      isError: event.isError,
-      isPartial: ancestorCancelled ? false : event.isPartial,
-      isCancelled: event.isCancelled === true ? true : event.isPartial && ancestorCancelled,
-      startTime: getDateFromNanoseconds(event.startTime),
-      level: event.level,
-      events: event.events,
-      environmentType: event.environmentType,
-    },
-  };
-
-  return span;
-}
-
-function walkSpanAncestors(
-  events: TaskEvent[],
-  event: PreparedEvent,
-  callback: (event: PreparedEvent, level: number) => { stop: boolean }
-) {
-  const parentId = event.parentId;
-  if (!parentId) {
-    return;
-  }
-
-  let parentEvent = getSpanEvent(events, parentId);
-  let level = 1;
-
-  while (parentEvent) {
-    const preparedParentEvent = prepareEvent(parentEvent);
-
-    const result = callback(preparedParentEvent, level);
-
-    if (result.stop) {
-      return;
-    }
-
-    if (!preparedParentEvent.parentId) {
-      return;
-    }
-
-    parentEvent = getSpanEvent(events, preparedParentEvent.parentId);
-
-    level++;
-  }
-}
-
-function getSpanEvent(events: TaskEvent[], spanId: string) {
-  const spans = events.filter((e) => e.spanId === spanId);
-  const completedSpan = spans.find((s) => !s.isPartial);
-
-  if (completedSpan) {
-    return completedSpan;
-  }
-
-  return spans.at(0);
-}
-
-export function prepareEvent(event: TaskEvent): PreparedEvent {
-  return {
-    ...event,
-    duration: Number(event.duration),
-    events: parseEventsField(event.events),
-    style: parseStyleField(event.style),
-  };
-}
-
-function parseEventsField(events: Prisma.JsonValue): SpanEvents {
-  const unsafe = events
-    ? (events as any[]).map((e) => ({
-        ...e,
-        properties: unflattenAttributes(e.properties as Attributes),
-      }))
-    : undefined;
-
-  return unsafe as SpanEvents;
-}
-
-function parseStyleField(style: Prisma.JsonValue): TaskEventStyle {
-  const unsafe = unflattenAttributes(style as Attributes);
-
-  if (!unsafe) {
-    return {};
-  }
-
-  if (typeof unsafe === "object") {
-    return Object.assign(
-      {
-        icon: undefined,
-        variant: undefined,
-      },
-      unsafe
-    ) as TaskEventStyle;
-  }
-
-  return {};
-}
-
-export function isAncestorCancelled(events: Map<string, PreparedEvent>, spanId: string) {
-  const event = events.get(spanId);
-
-  if (!event) {
-    return false;
-  }
-
-  if (event.isCancelled) {
-    return true;
-  }
-
-  if (event.parentId) {
-    return isAncestorCancelled(events, event.parentId);
-  }
-
-  return false;
-}
-
-function calculateDurationIfAncestorIsCancelled(
-  events: Map<string, PreparedEvent>,
-  spanId: string,
-  defaultDuration: number
-) {
-  const event = events.get(spanId);
-
-  if (!event) {
-    return defaultDuration;
-  }
-
-  if (event.isCancelled) {
-    return defaultDuration;
-  }
-
-  if (!event.isPartial) {
-    return defaultDuration;
-  }
-
-  if (event.parentId) {
-    const cancelledAncestor = findFirstCancelledAncestor(events, event.parentId);
-
-    if (cancelledAncestor) {
-      // We need to get the cancellation time from the cancellation span event
-      const cancellationEvent = cancelledAncestor.events.find(
-        (event) => event.name === "cancellation"
-      );
-
-      if (cancellationEvent) {
-        return calculateDurationFromStart(event.startTime, cancellationEvent.time);
-      }
-    }
-  }
-
-  return defaultDuration;
-}
-
-export function calculateDurationFromStart(startTime: bigint, endTime: Date = new Date()) {
-  const $endtime = typeof endTime === "string" ? new Date(endTime) : endTime;
-
-  return Number(BigInt($endtime.getTime() * 1_000_000) - startTime);
-}
-
-function findFirstCancelledAncestor(events: Map<string, PreparedEvent>, spanId: string) {
-  const event = events.get(spanId);
-
-  if (!event) {
-    return;
-  }
-
-  if (event.isCancelled) {
-    return event;
-  }
-
-  if (event.parentId) {
-    return findFirstCancelledAncestor(events, event.parentId);
-  }
-
-  return;
-}
-
-export function getDateFromNanoseconds(nanoseconds: bigint) {
-  return new Date(Number(nanoseconds) / 1_000_000);
-}
-
-export function getNowInNanoseconds(): bigint {
-  return BigInt(new Date().getTime() * 1_000_000);
-}
-
-export function rehydrateJson(json: Prisma.JsonValue): any {
-  if (json === null) {
-    return undefined;
-  }
-
-  if (json === NULL_SENTINEL) {
-    return null;
-  }
-
-  if (typeof json === "string") {
-    return json;
-  }
-
-  if (typeof json === "number") {
-    return json;
-  }
-
-  if (typeof json === "boolean") {
-    return json;
-  }
-
-  if (Array.isArray(json)) {
-    return json.map((item) => rehydrateJson(item));
-  }
-
-  if (typeof json === "object") {
-    return unflattenAttributes(json as Attributes);
-  }
-
-  return null;
-}
-
-export function rehydrateShow(properties: Prisma.JsonValue): { actions?: boolean } | undefined {
-  if (properties === null || properties === undefined) {
-    return;
-  }
-
-  if (typeof properties !== "object") {
-    return;
-  }
-
-  if (Array.isArray(properties)) {
-    return;
-  }
-
-  const actions = properties[SemanticInternalAttributes.SHOW_ACTIONS];
-
-  if (typeof actions === "boolean") {
-    return { actions };
-  }
-
-  return;
-}
-
-export function sanitizedAttributes(json: Prisma.JsonValue) {
-  if (json === null || json === undefined) {
-    return;
-  }
-
-  const withoutPrivateProperties = removePrivateProperties(json as Attributes);
-  if (!withoutPrivateProperties) {
-    return;
-  }
-
-  return unflattenAttributes(withoutPrivateProperties);
-}
-// removes keys that start with a $ sign. If there are no keys left, return undefined
-function removePrivateProperties(
-  attributes: Attributes | undefined | null
-): Attributes | undefined {
-  if (!attributes) {
-    return undefined;
-  }
-
-  const result: Attributes = {};
-
-  for (const [key, value] of Object.entries(attributes)) {
-    if (key.startsWith("$")) {
-      continue;
-    }
-
-    result[key] = value;
-  }
-
-  if (Object.keys(result).length === 0) {
-    return undefined;
-  }
-
-  return result;
-}
-
-export function transformEvents(
-  events: SpanEvents,
-  properties: Attributes,
-  isDev: boolean
-): SpanEvents {
-  return (events ?? []).map((event) => transformEvent(event, properties, isDev));
-}
-
-function transformEvent(event: SpanEvent, properties: Attributes, isDev: boolean): SpanEvent {
-  if (isExceptionSpanEvent(event)) {
-    return {
-      ...event,
-      properties: {
-        exception: transformException(event.properties.exception, properties, isDev),
-      },
-    };
-  }
-
-  return event;
-}
-
-function transformException(
-  exception: ExceptionEventProperties,
-  properties: Attributes,
-  isDev: boolean
-): ExceptionEventProperties {
-  const projectDirAttributeValue = properties[SemanticInternalAttributes.PROJECT_DIR];
-
-  if (projectDirAttributeValue !== undefined && typeof projectDirAttributeValue !== "string") {
-    return exception;
-  }
-
-  return {
-    ...exception,
-    stacktrace: exception.stacktrace
-      ? correctErrorStackTrace(exception.stacktrace, projectDirAttributeValue, {
-          removeFirstLine: true,
-          isDev,
-        })
-      : undefined,
-  };
-}
diff --git a/apps/webapp/app/utils/throttle.ts b/apps/webapp/app/utils/throttle.ts
index a6c1a77a32d..5b264ebd862 100644
--- a/apps/webapp/app/utils/throttle.ts
+++ b/apps/webapp/app/utils/throttle.ts
@@ -1,13 +1,13 @@
 //From: https://kettanaito.com/blog/debounce-vs-throttle
 
 /** A very simple throttle. Will execute the function at the end of each period and discard any other calls during that period. */
-export function throttle(
-  func: (...args: any[]) => void,
+export function throttle<TArgs extends unknown[]>(
+  func: (...args: TArgs) => void,
   durationMs: number
-): (...args: any[]) => void {
+): (...args: TArgs) => void {
   let isPrimedToFire = false;
 
-  return (...args: any[]) => {
+  return (...args: TArgs) => {
     if (!isPrimedToFire) {
       isPrimedToFire = true;
 
diff --git a/apps/webapp/app/utils/tokens.server.ts b/apps/webapp/app/utils/tokens.server.ts
new file mode 100644
index 00000000000..ae91018ba47
--- /dev/null
+++ b/apps/webapp/app/utils/tokens.server.ts
@@ -0,0 +1,34 @@
+import nodeCrypto from "node:crypto";
+
+export function encryptToken(value: string, key: string) {
+  const nonce = nodeCrypto.randomBytes(12);
+  const cipher = nodeCrypto.createCipheriv("aes-256-gcm", key, nonce);
+
+  let encrypted = cipher.update(value, "utf8", "hex");
+  encrypted += cipher.final("hex");
+
+  const tag = cipher.getAuthTag().toString("hex");
+
+  return {
+    nonce: nonce.toString("hex"),
+    ciphertext: encrypted,
+    tag,
+  };
+}
+
+export function decryptToken(nonce: string, ciphertext: string, tag: string, key: string): string {
+  const decipher = nodeCrypto.createDecipheriv("aes-256-gcm", key, Buffer.from(nonce, "hex"));
+
+  decipher.setAuthTag(Buffer.from(tag, "hex"));
+
+  let decrypted = decipher.update(ciphertext, "hex", "utf8");
+  decrypted += decipher.final("utf8");
+
+  return decrypted;
+}
+
+export function hashToken(token: string): string {
+  const hash = nodeCrypto.createHash("sha256");
+  hash.update(token);
+  return hash.digest("hex");
+}
diff --git a/apps/webapp/app/v3/alertsWorker.server.ts b/apps/webapp/app/v3/alertsWorker.server.ts
index 3e1917ead13..46670887a75 100644
--- a/apps/webapp/app/v3/alertsWorker.server.ts
+++ b/apps/webapp/app/v3/alertsWorker.server.ts
@@ -33,6 +33,7 @@ function initializeWorker() {
         retry: {
           maxAttempts: 3,
         },
+        logErrors: false,
       },
       "v3.performDeploymentAlerts": {
         schema: z.object({
@@ -42,6 +43,7 @@ function initializeWorker() {
         retry: {
           maxAttempts: 3,
         },
+        logErrors: false,
       },
       "v3.deliverAlert": {
         schema: z.object({
@@ -51,6 +53,7 @@ function initializeWorker() {
         retry: {
           maxAttempts: 3,
         },
+        logErrors: false,
       },
     },
     concurrency: {
diff --git a/apps/webapp/app/v3/batchTriggerWorker.server.ts b/apps/webapp/app/v3/batchTriggerWorker.server.ts
index e1993293894..52f36d72e23 100644
--- a/apps/webapp/app/v3/batchTriggerWorker.server.ts
+++ b/apps/webapp/app/v3/batchTriggerWorker.server.ts
@@ -6,8 +6,23 @@ import { RunEngineBatchTriggerService } from "~/runEngine/services/batchTrigger.
 import { logger } from "~/services/logger.server";
 import { singleton } from "~/utils/singleton";
 import { BatchTriggerV3Service } from "./services/batchTriggerV3.server";
+// Import engine to ensure it's initialized (which initializes BatchQueue for v2 batches)
+import { engine } from "./runEngine.server";
 
+/**
+ * Legacy batch trigger worker for processing v3 and run engine v1 batches.
+ *
+ * NOTE: Run Engine v2 batches (batchVersion: "runengine:v2") use the new BatchQueue
+ * system with Deficit Round Robin scheduling, which is encapsulated within the RunEngine.
+ * See runEngine.server.ts for the configuration.
+ *
+ * This worker is kept for backwards compatibility with:
+ * - v3 batches (batchVersion: "v3") - handled by BatchTriggerV3Service
+ * - Run Engine v1 batches (batchVersion: "runengine:v1") - handled by RunEngineBatchTriggerService
+ */
 function initializeWorker() {
+  // Ensure the engine (and its BatchQueue) is initialized
+  void engine;
   const redisOptions = {
     keyPrefix: "batch-trigger:worker:",
     host: env.BATCH_TRIGGER_WORKER_REDIS_HOST,
diff --git a/apps/webapp/app/v3/buildSettings.ts b/apps/webapp/app/v3/buildSettings.ts
new file mode 100644
index 00000000000..1ff88caa9d1
--- /dev/null
+++ b/apps/webapp/app/v3/buildSettings.ts
@@ -0,0 +1,10 @@
+import { z } from "zod";
+
+export const BuildSettingsSchema = z.object({
+  triggerConfigFilePath: z.string().optional(),
+  installCommand: z.string().optional(),
+  preBuildCommand: z.string().optional(),
+  useNativeBuildServer: z.boolean().optional(),
+});
+
+export type BuildSettings = z.infer<typeof BuildSettingsSchema>;
diff --git a/apps/webapp/app/v3/canAccessQuery.server.ts b/apps/webapp/app/v3/canAccessQuery.server.ts
new file mode 100644
index 00000000000..87a248725b5
--- /dev/null
+++ b/apps/webapp/app/v3/canAccessQuery.server.ts
@@ -0,0 +1,47 @@
+import { prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { FEATURE_FLAG, makeFlag } from "~/v3/featureFlags.server";
+
+export async function canAccessQuery(options: {
+  userId: string;
+  isAdmin: boolean;
+  isImpersonating: boolean;
+  organizationSlug: string;
+}): Promise<boolean> {
+  const { userId, isAdmin, isImpersonating, organizationSlug } = options;
+
+  // 1. If it's on then we have access
+  const globallyEnabled = env.QUERY_FEATURE_ENABLED === "1";
+  if (globallyEnabled) {
+    return true;
+  }
+
+  // 2. Admins always have access
+  if (isAdmin || isImpersonating) {
+    return true;
+  }
+
+  // 3. Check if org/global feature flag is on
+  const org = await prisma.organization.findFirst({
+    where: {
+      slug: organizationSlug,
+      members: { some: { userId } },
+    },
+    select: {
+      featureFlags: true,
+    },
+  });
+
+  const flag = makeFlag();
+  const flagResult = await flag({
+    key: FEATURE_FLAG.hasQueryAccess,
+    defaultValue: false,
+    overrides: (org?.featureFlags as Record<string, unknown>) ?? {},
+  });
+  if (flagResult) {
+    return true;
+  }
+
+  // 4. Not enabled anywhere
+  return false;
+}
diff --git a/apps/webapp/app/v3/dynamicFlushScheduler.server.ts b/apps/webapp/app/v3/dynamicFlushScheduler.server.ts
index f87c2a143be..946bc193667 100644
--- a/apps/webapp/app/v3/dynamicFlushScheduler.server.ts
+++ b/apps/webapp/app/v3/dynamicFlushScheduler.server.ts
@@ -1,38 +1,162 @@
+import { Logger } from "@trigger.dev/core/logger";
+import { tryCatch } from "@trigger.dev/core/utils";
 import { nanoid } from "nanoid";
+import pLimit from "p-limit";
+import { signalsEmitter } from "~/services/signals.server";
 
 export type DynamicFlushSchedulerConfig<T> = {
   batchSize: number;
   flushInterval: number;
   callback: (flushId: string, batch: T[]) => Promise<void>;
+  // New configuration options
+  minConcurrency?: number;
+  maxConcurrency?: number;
+  maxBatchSize?: number;
+  memoryPressureThreshold?: number; // Number of items that triggers increased concurrency
+  loadSheddingThreshold?: number; // Number of items that triggers load shedding
+  loadSheddingEnabled?: boolean;
+  isDroppableEvent?: (item: T) => boolean; // Function to determine if an event can be dropped
 };
 
 export class DynamicFlushScheduler<T> {
-  private batchQueue: T[][]; // Adjust the type according to your data structure
-  private currentBatch: T[]; // Adjust the type according to your data structure
+  private batchQueue: T[][];
+  private currentBatch: T[];
   private readonly BATCH_SIZE: number;
   private readonly FLUSH_INTERVAL: number;
   private flushTimer: NodeJS.Timeout | null;
+  private metricsReporterTimer: NodeJS.Timeout | undefined;
   private readonly callback: (flushId: string, batch: T[]) => Promise<void>;
 
+  // New properties for dynamic scaling
+  private readonly minConcurrency: number;
+  private readonly maxConcurrency: number;
+  private readonly maxBatchSize: number;
+  private readonly memoryPressureThreshold: number;
+  private limiter: ReturnType<typeof pLimit>;
+  private currentBatchSize: number;
+  private totalQueuedItems: number = 0;
+  private consecutiveFlushFailures: number = 0;
+  private lastFlushTime: number = Date.now();
+  private metrics = {
+    flushedBatches: 0,
+    failedBatches: 0,
+    totalItemsFlushed: 0,
+    droppedEvents: 0,
+    droppedEventsByKind: new Map<string, number>(),
+  };
+  private isShuttingDown: boolean = false;
+
+  // New properties for load shedding
+  private readonly loadSheddingThreshold: number;
+  private readonly loadSheddingEnabled: boolean;
+  private readonly isDroppableEvent?: (item: T) => boolean;
+  private isLoadShedding: boolean = false;
+
+  private readonly logger: Logger = new Logger("EventRepo.DynamicFlushScheduler", "debug");
+
   constructor(config: DynamicFlushSchedulerConfig<T>) {
     this.batchQueue = [];
     this.currentBatch = [];
     this.BATCH_SIZE = config.batchSize;
+    this.currentBatchSize = config.batchSize;
     this.FLUSH_INTERVAL = config.flushInterval;
     this.callback = config.callback;
     this.flushTimer = null;
+
+    // Initialize dynamic scaling parameters
+    this.minConcurrency = config.minConcurrency ?? 1;
+    this.maxConcurrency = config.maxConcurrency ?? 10;
+    this.maxBatchSize = config.maxBatchSize ?? config.batchSize * 5;
+    this.memoryPressureThreshold = config.memoryPressureThreshold ?? config.batchSize * 20;
+
+    // Initialize load shedding parameters
+    this.loadSheddingThreshold = config.loadSheddingThreshold ?? config.batchSize * 50;
+    this.loadSheddingEnabled = config.loadSheddingEnabled ?? true;
+    this.isDroppableEvent = config.isDroppableEvent;
+
+    // Start with minimum concurrency
+    this.limiter = pLimit(this.minConcurrency);
+
     this.startFlushTimer();
+    this.startMetricsReporter();
+    this.setupShutdownHandlers();
   }
 
   addToBatch(items: T[]): void {
-    this.currentBatch.push(...items);
+    let itemsToAdd = items;
+
+    // Apply load shedding if enabled and we're over the threshold
+    if (this.loadSheddingEnabled && this.totalQueuedItems >= this.loadSheddingThreshold) {
+      const { kept, dropped } = this.applyLoadShedding(items);
+      itemsToAdd = kept;
+
+      if (dropped.length > 0) {
+        this.metrics.droppedEvents += dropped.length;
+
+        // Track dropped events by kind if possible
+        dropped.forEach((item) => {
+          const kind = this.getEventKind(item);
+          if (kind) {
+            const currentCount = this.metrics.droppedEventsByKind.get(kind) || 0;
+            this.metrics.droppedEventsByKind.set(kind, currentCount + 1);
+          }
+        });
+
+        if (!this.isLoadShedding) {
+          this.isLoadShedding = true;
+        }
 
-    if (this.currentBatch.length >= this.BATCH_SIZE) {
-      this.batchQueue.push(this.currentBatch);
-      this.currentBatch = [];
-      this.flushNextBatch();
-      this.resetFlushTimer();
+        this.logger.warn("Load shedding", {
+          totalQueuedItems: this.totalQueuedItems,
+          threshold: this.loadSheddingThreshold,
+          droppedCount: dropped.length,
+        });
+      }
+    } else if (this.isLoadShedding && this.totalQueuedItems < this.loadSheddingThreshold * 0.8) {
+      this.isLoadShedding = false;
+      this.logger.info("Load shedding deactivated", {
+        totalQueuedItems: this.totalQueuedItems,
+        threshold: this.loadSheddingThreshold,
+        totalDropped: this.metrics.droppedEvents,
+      });
     }
+
+    this.currentBatch.push(...itemsToAdd);
+    this.totalQueuedItems += itemsToAdd.length;
+
+    // Check if we need to create a batch (if we are shutting down, create a batch immediately because the flush timer is stopped)
+    if (this.currentBatch.length >= this.currentBatchSize || this.isShuttingDown) {
+      this.createBatch();
+    }
+
+    // Adjust concurrency based on queue pressure
+    this.adjustConcurrency();
+  }
+
+  private createBatch(): void {
+    if (this.currentBatch.length === 0) return;
+
+    this.batchQueue.push(this.currentBatch);
+    this.currentBatch = [];
+    this.flushBatches();
+    this.resetFlushTimer();
+  }
+
+  private setupShutdownHandlers(): void {
+    signalsEmitter.on("SIGTERM", () =>
+      this.shutdown().catch((error) => {
+        this.logger.error("Error shutting down dynamic flush scheduler", {
+          error,
+        });
+      })
+    );
+    signalsEmitter.on("SIGINT", () =>
+      this.shutdown().catch((error) => {
+        this.logger.error("Error shutting down dynamic flush scheduler", {
+          error,
+        });
+      })
+    );
   }
 
   private startFlushTimer(): void {
@@ -43,28 +167,257 @@ export class DynamicFlushScheduler<T> {
     if (this.flushTimer) {
       clearInterval(this.flushTimer);
     }
+
+    if (this.isShuttingDown) return;
+
     this.startFlushTimer();
   }
 
   private checkAndFlush(): void {
     if (this.currentBatch.length > 0) {
-      this.batchQueue.push(this.currentBatch);
-      this.currentBatch = [];
+      this.createBatch();
+    }
+    this.flushBatches();
+  }
+
+  private async flushBatches(): Promise<void> {
+    const batchesToFlush: T[][] = [];
+
+    // Dequeue all available batches up to current concurrency limit
+    while (this.batchQueue.length > 0 && batchesToFlush.length < this.limiter.concurrency) {
+      const batch = this.batchQueue.shift();
+      if (batch) {
+        batchesToFlush.push(batch);
+      }
+    }
+
+    if (batchesToFlush.length === 0) return;
+
+    // Schedule all batches for concurrent processing
+    const flushPromises = batchesToFlush.map((batch) =>
+      this.limiter(async () => {
+        const itemCount = batch.length;
+
+        const self = this;
+
+        async function tryFlush(flushId: string, batchToFlush: T[], attempt: number = 1) {
+          try {
+            const startTime = Date.now();
+            await self.callback(flushId, batchToFlush);
+
+            const duration = Date.now() - startTime;
+            self.totalQueuedItems -= itemCount;
+            self.consecutiveFlushFailures = 0;
+            self.lastFlushTime = Date.now();
+            self.metrics.flushedBatches++;
+            self.metrics.totalItemsFlushed += itemCount;
+
+            self.logger.debug("Batch flushed successfully", {
+              flushId,
+              itemCount,
+              duration,
+              remainingQueueDepth: self.totalQueuedItems,
+              activeConcurrency: self.limiter.activeCount,
+              pendingConcurrency: self.limiter.pendingCount,
+            });
+          } catch (error) {
+            self.consecutiveFlushFailures++;
+            self.metrics.failedBatches++;
+
+            self.logger.error("Error attempting to flush batch", {
+              flushId,
+              itemCount,
+              error,
+              consecutiveFailures: self.consecutiveFlushFailures,
+              attempt,
+            });
+
+            // Back off on failures
+            if (self.consecutiveFlushFailures > 5) {
+              self.adjustConcurrency(true);
+            }
+
+            if (attempt <= 3) {
+              await new Promise((resolve) => setTimeout(resolve, 500));
+              return await tryFlush(flushId, batchToFlush, attempt + 1);
+            } else {
+              throw error;
+            }
+          }
+        }
+
+        const [flushError] = await tryCatch(tryFlush(nanoid(), batch));
+
+        if (flushError) {
+          this.logger.error("Error flushing batch", {
+            error: flushError,
+          });
+        }
+      })
+    );
+
+    // Don't await here - let them run concurrently
+    Promise.allSettled(flushPromises).then(() => {
+      const shouldContinueFlushing =
+        this.batchQueue.length > 0 && (this.consecutiveFlushFailures < 3 || this.isShuttingDown);
+      // After flush completes, check if we need to flush more
+      if (shouldContinueFlushing) {
+        this.flushBatches();
+      }
+    });
+  }
+
+  private lastConcurrencyAdjustment: number = Date.now();
+
+  private adjustConcurrency(backOff: boolean = false): void {
+    const currentConcurrency = this.limiter.concurrency;
+    let newConcurrency = currentConcurrency;
+
+    // Calculate pressure metrics - moved outside the if/else block
+    const queuePressure = this.totalQueuedItems / this.memoryPressureThreshold;
+    const timeSinceLastFlush = Date.now() - this.lastFlushTime;
+    const timeSinceLastAdjustment = Date.now() - this.lastConcurrencyAdjustment;
+
+    // Don't adjust too frequently (except for backoff)
+    if (!backOff && timeSinceLastAdjustment < 1000) {
+      return;
     }
-    this.flushNextBatch();
+
+    if (backOff) {
+      // Reduce concurrency on failures
+      newConcurrency = Math.max(this.minConcurrency, Math.floor(currentConcurrency * 0.75));
+    } else {
+      if (queuePressure > 0.8 || timeSinceLastFlush > this.FLUSH_INTERVAL * 2) {
+        // High pressure - increase concurrency
+        newConcurrency = Math.min(this.maxConcurrency, currentConcurrency + 2);
+      } else if (queuePressure < 0.2 && currentConcurrency > this.minConcurrency) {
+        // Low pressure - decrease concurrency
+        newConcurrency = Math.max(this.minConcurrency, currentConcurrency - 1);
+      }
+    }
+
+    // Adjust batch size based on pressure
+    if (this.totalQueuedItems > this.memoryPressureThreshold) {
+      this.currentBatchSize = Math.min(
+        this.maxBatchSize,
+        Math.floor(this.BATCH_SIZE * (1 + queuePressure))
+      );
+    } else {
+      this.currentBatchSize = this.BATCH_SIZE;
+    }
+
+    // Update concurrency if changed
+    if (newConcurrency !== currentConcurrency) {
+      this.limiter = pLimit(newConcurrency);
+
+      this.logger.info("Adjusted flush concurrency", {
+        previousConcurrency: currentConcurrency,
+        newConcurrency,
+        queuePressure,
+        totalQueuedItems: this.totalQueuedItems,
+        currentBatchSize: this.currentBatchSize,
+        memoryPressureThreshold: this.memoryPressureThreshold,
+      });
+    }
+  }
+
+  private startMetricsReporter(): void {
+    // Report metrics every 30 seconds
+    this.metricsReporterTimer = setInterval(() => {
+      const droppedByKind: Record<string, number> = {};
+      this.metrics.droppedEventsByKind.forEach((count, kind) => {
+        droppedByKind[kind] = count;
+      });
+
+      this.logger.info("DynamicFlushScheduler metrics", {
+        totalQueuedItems: this.totalQueuedItems,
+        batchQueueLength: this.batchQueue.length,
+        currentBatchLength: this.currentBatch.length,
+        currentConcurrency: this.limiter.concurrency,
+        activeConcurrent: this.limiter.activeCount,
+        pendingConcurrent: this.limiter.pendingCount,
+        currentBatchSize: this.currentBatchSize,
+        isLoadShedding: this.isLoadShedding,
+        metrics: {
+          ...this.metrics,
+          droppedByKind,
+        },
+      });
+    }, 30000);
   }
 
-  private async flushNextBatch(): Promise<void> {
-    if (this.batchQueue.length === 0) return;
+  private applyLoadShedding(items: T[]): { kept: T[]; dropped: T[] } {
+    if (!this.isDroppableEvent) {
+      // If no function provided to determine droppable events, keep all
+      return { kept: items, dropped: [] };
+    }
 
-    const batchToFlush = this.batchQueue.shift();
-    try {
-      await this.callback(nanoid(), batchToFlush!);
-      if (this.batchQueue.length > 0) {
-        this.flushNextBatch();
+    const kept: T[] = [];
+    const dropped: T[] = [];
+
+    for (const item of items) {
+      if (this.isDroppableEvent(item)) {
+        dropped.push(item);
+      } else {
+        kept.push(item);
       }
-    } catch (error) {
-      console.error("Error inserting batch:", error);
+    }
+
+    return { kept, dropped };
+  }
+
+  private getEventKind(item: T): string | undefined {
+    // Try to extract the kind from the event if it has one
+    if (item && typeof item === "object" && "kind" in item) {
+      return String(item.kind);
+    }
+    return undefined;
+  }
+
+  // Method to get current status
+  getStatus() {
+    const droppedByKind: Record<string, number> = {};
+    this.metrics.droppedEventsByKind.forEach((count, kind) => {
+      droppedByKind[kind] = count;
+    });
+
+    return {
+      queuedItems: this.totalQueuedItems,
+      batchQueueLength: this.batchQueue.length,
+      currentBatchSize: this.currentBatch.length,
+      concurrency: this.limiter.concurrency,
+      activeFlushes: this.limiter.activeCount,
+      pendingFlushes: this.limiter.pendingCount,
+      isLoadShedding: this.isLoadShedding,
+      metrics: {
+        ...this.metrics,
+        droppedEventsByKind: droppedByKind,
+      },
+    };
+  }
+
+  // Graceful shutdown
+  async shutdown(): Promise<void> {
+    if (this.isShuttingDown) return;
+
+    this.isShuttingDown = true;
+
+    if (this.flushTimer) {
+      clearInterval(this.flushTimer);
+    }
+
+    if (this.metricsReporterTimer) {
+      clearInterval(this.metricsReporterTimer);
+    }
+
+    // Flush any remaining items
+    if (this.currentBatch.length > 0) {
+      this.createBatch();
+    }
+
+    // Wait for all pending flushes to complete
+    while (this.batchQueue.length > 0 || this.limiter.activeCount > 0) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
     }
   }
-}
+}
\ No newline at end of file
diff --git a/apps/webapp/app/v3/environmentVariableRules.server.ts b/apps/webapp/app/v3/environmentVariableRules.server.ts
index ddaee2b2493..fce17d03644 100644
--- a/apps/webapp/app/v3/environmentVariableRules.server.ts
+++ b/apps/webapp/app/v3/environmentVariableRules.server.ts
@@ -8,8 +8,6 @@ type VariableRule =
 const blacklistedVariables: VariableRule[] = [
   { type: "exact", key: "TRIGGER_SECRET_KEY" },
   { type: "exact", key: "TRIGGER_API_URL" },
-  { type: "prefix", prefix: "OTEL_" },
-  { type: "whitelist", key: "OTEL_LOG_LEVEL" },
 ];
 
 export function removeBlacklistedVariables(
diff --git a/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts b/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
index ea6243f4a53..c6c72d79567 100644
--- a/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
+++ b/apps/webapp/app/v3/environmentVariables/environmentVariablesRepository.server.ts
@@ -6,9 +6,12 @@ import { env } from "~/env.server";
 import { getSecretStore } from "~/services/secrets/secretStore.server";
 import { generateFriendlyId } from "../friendlyIdentifiers";
 import {
+  type CreateEnvironmentVariables,
   type CreateResult,
   type DeleteEnvironmentVariable,
   type DeleteEnvironmentVariableValue,
+  type EditEnvironmentVariable,
+  type EditEnvironmentVariableValue,
   type EnvironmentVariable,
   type EnvironmentVariableWithSecret,
   type ProjectEnvironmentVariable,
@@ -17,6 +20,7 @@ import {
 } from "./repository";
 import { removeBlacklistedVariables } from "../environmentVariableRules.server";
 import { deduplicateVariableArray } from "../deduplicateVariableArray.server";
+import { logger } from "~/services/logger.server";
 
 function secretKeyProjectPrefix(projectId: string) {
   return `environmentvariable:${projectId}:`;
@@ -44,18 +48,7 @@ const SecretValue = z.object({ secret: z.string() });
 export class EnvironmentVariablesRepository implements Repository {
   constructor(private prismaClient: PrismaClient = prisma) {}
 
-  async create(
-    projectId: string,
-    options: {
-      override: boolean;
-      environmentIds: string[];
-      isSecret?: boolean;
-      variables: {
-        key: string;
-        value: string;
-      }[];
-    }
-  ): Promise<CreateResult> {
+  async create(projectId: string, options: CreateEnvironmentVariables): Promise<CreateResult> {
     const project = await this.prismaClient.project.findFirst({
       where: {
         id: projectId,
@@ -163,10 +156,49 @@ export class EnvironmentVariablesRepository implements Repository {
             prismaClient: tx,
           });
 
+          // If parentEnvironmentId is provided and isSecret is not explicitly set,
+          // look up if the parent has this variable marked as secret
+          let inheritedIsSecret: boolean | undefined = undefined;
+          if (options.isSecret === undefined && options.parentEnvironmentId) {
+            const parentVariableValue = await tx.environmentVariableValue.findFirst({
+              where: {
+                variableId: environmentVariable.id,
+                environmentId: options.parentEnvironmentId,
+              },
+              select: {
+                isSecret: true,
+              },
+            });
+            if (parentVariableValue?.isSecret) {
+              inheritedIsSecret = true;
+            }
+          }
+
+          const effectiveIsSecret = options.isSecret ?? inheritedIsSecret;
+
           //set the secret values and references
           for (const environmentId of options.environmentIds) {
             const key = secretKey(projectId, environmentId, variable.key);
 
+            const existingValueRecord = await tx.environmentVariableValue.findFirst({
+              where: {
+                variableId: environmentVariable.id,
+                environmentId,
+              },
+            });
+
+            // Check if value already exists and is the same, and no metadata change (e.g. isSecret toggle)
+            const existingSecret = await secretStore.getSecret(SecretValue, key);
+            const canSkip =
+              existingSecret &&
+              existingSecret.secret === variable.value &&
+              existingValueRecord &&
+              (options.isSecret === undefined ||
+                existingValueRecord.isSecret === options.isSecret);
+            if (canSkip) {
+              continue;
+            }
+
             //create the secret reference
             const secretReference = await tx.secretReference.upsert({
               where: {
@@ -179,23 +211,36 @@ export class EnvironmentVariablesRepository implements Repository {
               update: {},
             });
 
-            const variableValue = await tx.environmentVariableValue.upsert({
-              where: {
-                variableId_environmentId: {
+            if (existingValueRecord) {
+              await tx.environmentVariableValue.update({
+                where: {
+                  id: existingValueRecord.id,
+                },
+                data: {
+                  version: {
+                    increment: 1,
+                  },
+                  ...(options.lastUpdatedBy ? { lastUpdatedBy: options.lastUpdatedBy } : {}),
+                  valueReferenceId: secretReference.id,
+                  ...(options.isSecret !== undefined
+                    ? {
+                        isSecret: options.isSecret,
+                      }
+                    : {}),
+                },
+              });
+            } else {
+              await tx.environmentVariableValue.create({
+                data: {
                   variableId: environmentVariable.id,
-                  environmentId,
+                  environmentId: environmentId,
+                  valueReferenceId: secretReference.id,
+                  isSecret: effectiveIsSecret,
+                  version: 1,
+                  lastUpdatedBy: options.lastUpdatedBy ? options.lastUpdatedBy : Prisma.JsonNull,
                 },
-              },
-              create: {
-                variableId: environmentVariable.id,
-                environmentId: environmentId,
-                valueReferenceId: secretReference.id,
-                isSecret: options.isSecret,
-              },
-              update: {
-                isSecret: options.isSecret,
-              },
-            });
+              });
+            }
 
             await secretStore.setSecret<{ secret: string }>(key, {
               secret: variable.value,
@@ -225,14 +270,7 @@ export class EnvironmentVariablesRepository implements Repository {
     }
   }
 
-  async edit(
-    projectId: string,
-    options: {
-      values: { value: string; environmentId: string }[];
-      id: string;
-      keepEmptyValues?: boolean;
-    }
-  ): Promise<Result> {
+  async edit(projectId: string, options: EditEnvironmentVariable): Promise<Result> {
     const project = await this.prismaClient.project.findFirst({
       where: {
         id: projectId,
@@ -322,6 +360,20 @@ export class EnvironmentVariablesRepository implements Repository {
               await secretStore.setSecret<{ secret: string }>(key, {
                 secret: value.value,
               });
+              await tx.environmentVariableValue.update({
+                where: {
+                  variableId_environmentId: {
+                    variableId: environmentVariable.id,
+                    environmentId: value.environmentId,
+                  },
+                },
+                data: {
+                  version: {
+                    increment: 1,
+                  },
+                  lastUpdatedBy: options.lastUpdatedBy ? options.lastUpdatedBy : undefined,
+                },
+              });
             }
             continue;
           }
@@ -339,6 +391,8 @@ export class EnvironmentVariablesRepository implements Repository {
               variableId: environmentVariable.id,
               environmentId: value.environmentId,
               valueReferenceId: secretReference.id,
+              version: 1,
+              lastUpdatedBy: options.lastUpdatedBy ? options.lastUpdatedBy : Prisma.JsonNull,
             },
           });
 
@@ -359,14 +413,7 @@ export class EnvironmentVariablesRepository implements Repository {
     }
   }
 
-  async editValue(
-    projectId: string,
-    options: {
-      id: string;
-      environmentId: string;
-      value: string;
-    }
-  ): Promise<Result> {
+  async editValue(projectId: string, options: EditEnvironmentVariableValue): Promise<Result> {
     const project = await this.prismaClient.project.findFirst({
       where: {
         id: projectId,
@@ -425,6 +472,21 @@ export class EnvironmentVariablesRepository implements Repository {
         await secretStore.setSecret<{ secret: string }>(key, {
           secret: options.value,
         });
+
+        await tx.environmentVariableValue.update({
+          where: {
+            variableId_environmentId: {
+              variableId: environmentVariable.id,
+              environmentId: options.environmentId,
+            },
+          },
+          data: {
+            version: {
+              increment: 1,
+            },
+            lastUpdatedBy: options.lastUpdatedBy ? options.lastUpdatedBy : undefined,
+          },
+        });
       });
 
       return {
@@ -824,12 +886,16 @@ export async function resolveVariablesForEnvironment(
   runtimeEnvironment: RuntimeEnvironmentForEnvRepo,
   parentEnvironment?: RuntimeEnvironmentForEnvRepo
 ) {
-  const projectSecrets = await environmentVariablesRepository.getEnvironmentVariables(
+  let projectSecrets = await environmentVariablesRepository.getEnvironmentVariables(
     runtimeEnvironment.projectId,
     runtimeEnvironment.id,
     parentEnvironment?.id
   );
 
+  projectSecrets = renameVariables(projectSecrets, {
+    OTEL_RESOURCE_ATTRIBUTES: "CUSTOM_OTEL_RESOURCE_ATTRIBUTES",
+  });
+
   const overridableTriggerVariables = await resolveOverridableTriggerVariables(runtimeEnvironment);
 
   const builtInVariables =
@@ -837,11 +903,28 @@ export async function resolveVariablesForEnvironment(
       ? await resolveBuiltInDevVariables(runtimeEnvironment)
       : await resolveBuiltInProdVariables(runtimeEnvironment, parentEnvironment);
 
-  return deduplicateVariableArray([
+  const overridableOtelVariables =
+    runtimeEnvironment.type === "DEVELOPMENT"
+      ? await resolveOverridableOtelDevVariables(runtimeEnvironment)
+      : [];
+
+  const result = deduplicateVariableArray([
     ...overridableTriggerVariables,
+    ...overridableOtelVariables,
     ...projectSecrets,
     ...builtInVariables,
   ]);
+
+  return result;
+}
+
+function renameVariables(variables: EnvironmentVariable[], renameMap: Record<string, string>) {
+  return variables.map((variable) => {
+    return {
+      ...variable,
+      key: renameMap[variable.key] ?? variable.key,
+    };
+  });
 }
 
 async function resolveOverridableTriggerVariables(
@@ -860,7 +943,7 @@ async function resolveOverridableTriggerVariables(
 async function resolveBuiltInDevVariables(runtimeEnvironment: RuntimeEnvironmentForEnvRepo) {
   let result: Array<EnvironmentVariable> = [
     {
-      key: "OTEL_EXPORTER_OTLP_ENDPOINT",
+      key: "TRIGGER_OTEL_EXPORTER_OTLP_ENDPOINT",
       value: env.DEV_OTEL_EXPORTER_OTLP_ENDPOINT ?? `${env.APP_ORIGIN.replace(/\/$/, "")}/otel`,
     },
     {
@@ -873,8 +956,72 @@ async function resolveBuiltInDevVariables(runtimeEnvironment: RuntimeEnvironment
     },
   ];
 
+  if (env.DEV_OTEL_METRICS_ENDPOINT) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_ENDPOINT",
+      value: env.DEV_OTEL_METRICS_ENDPOINT,
+    });
+  }
+
+  if (env.DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS",
+      value: env.DEV_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
+    });
+  }
+
+  if (env.DEV_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS",
+      value: env.DEV_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS,
+    });
+  }
+
+  if (env.DEV_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS",
+      value: env.DEV_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS,
+    });
+  }
+
   if (env.DEV_OTEL_BATCH_PROCESSING_ENABLED === "1") {
     result = result.concat([
+      {
+        key: "TRIGGER_OTEL_BATCH_PROCESSING_ENABLED",
+        value: "1",
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE",
+        value: env.DEV_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE,
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_SCHEDULED_DELAY_MILLIS",
+        value: env.DEV_OTEL_SPAN_SCHEDULED_DELAY_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS",
+        value: env.DEV_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_MAX_QUEUE_SIZE",
+        value: env.DEV_OTEL_SPAN_MAX_QUEUE_SIZE,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_MAX_EXPORT_BATCH_SIZE",
+        value: env.DEV_OTEL_LOG_MAX_EXPORT_BATCH_SIZE,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_SCHEDULED_DELAY_MILLIS",
+        value: env.DEV_OTEL_LOG_SCHEDULED_DELAY_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_EXPORT_TIMEOUT_MILLIS",
+        value: env.DEV_OTEL_LOG_EXPORT_TIMEOUT_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_MAX_QUEUE_SIZE",
+        value: env.DEV_OTEL_LOG_MAX_QUEUE_SIZE,
+      },
       {
         key: "OTEL_BATCH_PROCESSING_ENABLED",
         value: "1",
@@ -919,6 +1066,19 @@ async function resolveBuiltInDevVariables(runtimeEnvironment: RuntimeEnvironment
   return [...result, ...commonVariables];
 }
 
+async function resolveOverridableOtelDevVariables(
+  runtimeEnvironment: RuntimeEnvironmentForEnvRepo
+) {
+  let result: Array<EnvironmentVariable> = [
+    {
+      key: "OTEL_EXPORTER_OTLP_ENDPOINT",
+      value: env.DEV_OTEL_EXPORTER_OTLP_ENDPOINT ?? `${env.APP_ORIGIN.replace(/\/$/, "")}/otel`,
+    },
+  ];
+
+  return result;
+}
+
 async function resolveBuiltInProdVariables(
   runtimeEnvironment: RuntimeEnvironmentForEnvRepo,
   parentEnvironment?: RuntimeEnvironmentForEnvRepo
@@ -955,8 +1115,65 @@ async function resolveBuiltInProdVariables(
     ]);
   }
 
+  if (env.PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS",
+      value: env.PROD_OTEL_METRICS_EXPORT_INTERVAL_MILLIS,
+    });
+  }
+
+  if (env.PROD_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS",
+      value: env.PROD_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS,
+    });
+  }
+
+  if (env.PROD_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS) {
+    result.push({
+      key: "TRIGGER_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS",
+      value: env.PROD_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS,
+    });
+  }
+
   if (env.PROD_OTEL_BATCH_PROCESSING_ENABLED === "1") {
     result = result.concat([
+      {
+        key: "TRIGGER_OTEL_BATCH_PROCESSING_ENABLED",
+        value: "1",
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE",
+        value: env.PROD_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE,
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_SCHEDULED_DELAY_MILLIS",
+        value: env.PROD_OTEL_SPAN_SCHEDULED_DELAY_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS",
+        value: env.PROD_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_SPAN_MAX_QUEUE_SIZE",
+        value: env.PROD_OTEL_SPAN_MAX_QUEUE_SIZE,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_MAX_EXPORT_BATCH_SIZE",
+        value: env.PROD_OTEL_LOG_MAX_EXPORT_BATCH_SIZE,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_SCHEDULED_DELAY_MILLIS",
+        value: env.PROD_OTEL_LOG_SCHEDULED_DELAY_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_EXPORT_TIMEOUT_MILLIS",
+        value: env.PROD_OTEL_LOG_EXPORT_TIMEOUT_MILLIS,
+      },
+      {
+        key: "TRIGGER_OTEL_LOG_MAX_QUEUE_SIZE",
+        value: env.PROD_OTEL_LOG_MAX_QUEUE_SIZE,
+      },
       {
         key: "OTEL_BATCH_PROCESSING_ENABLED",
         value: "1",
@@ -1091,6 +1308,14 @@ async function resolveCommonBuiltInVariables(
         String(env.TRIGGER_OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT)
       ),
     },
+    {
+      key: "TRIGGER_WAIT_UNTIL_TIMEOUT_MS",
+      value: resolveBuiltInEnvironmentVariableOverrides(
+        "TRIGGER_WAIT_UNTIL_TIMEOUT_MS",
+        runtimeEnvironment,
+        String(env.WAIT_UNTIL_TIMEOUT_MS)
+      ),
+    },
   ];
 }
 
diff --git a/apps/webapp/app/v3/environmentVariables/repository.ts b/apps/webapp/app/v3/environmentVariables/repository.ts
index 521e22f7a28..ea027bc2ca8 100644
--- a/apps/webapp/app/v3/environmentVariables/repository.ts
+++ b/apps/webapp/app/v3/environmentVariables/repository.ts
@@ -6,9 +6,25 @@ export const EnvironmentVariableKey = z
   .nonempty("Key is required")
   .regex(/^\w+$/, "Keys can only use alphanumeric characters and underscores");
 
+export const EnvironmentVariableUpdaterSchema = z.discriminatedUnion("type", [
+  z.object({
+    type: z.literal("user"),
+    userId: z.string(),
+  }),
+  z.object({
+    type: z.literal("integration"),
+    integration: z.string(),
+  }),
+]);
+export type EnvironmentVariableUpdater = z.infer<typeof EnvironmentVariableUpdaterSchema>;
+
 export const CreateEnvironmentVariables = z.object({
+  override: z.boolean(),
   environmentIds: z.array(z.string()),
+  isSecret: z.boolean().optional(),
+  parentEnvironmentId: z.string().optional(),
   variables: z.array(z.object({ key: EnvironmentVariableKey, value: z.string() })),
+  lastUpdatedBy: EnvironmentVariableUpdaterSchema.optional(),
 });
 
 export type CreateEnvironmentVariables = z.infer<typeof CreateEnvironmentVariables>;
@@ -32,6 +48,7 @@ export const EditEnvironmentVariable = z.object({
     })
   ),
   keepEmptyValues: z.boolean().optional(),
+  lastUpdatedBy: EnvironmentVariableUpdaterSchema.optional(),
 });
 export type EditEnvironmentVariable = z.infer<typeof EditEnvironmentVariable>;
 
@@ -51,6 +68,7 @@ export const EditEnvironmentVariableValue = z.object({
   id: z.string(),
   environmentId: z.string(),
   value: z.string(),
+  lastUpdatedBy: EnvironmentVariableUpdaterSchema.optional(),
 });
 export type EditEnvironmentVariableValue = z.infer<typeof EditEnvironmentVariableValue>;
 
diff --git a/apps/webapp/app/v3/eventRepository.server.ts b/apps/webapp/app/v3/eventRepository.server.ts
deleted file mode 100644
index cfca7002097..00000000000
--- a/apps/webapp/app/v3/eventRepository.server.ts
+++ /dev/null
@@ -1,1832 +0,0 @@
-import { Attributes, AttributeValue, Link, trace, TraceFlags, Tracer } from "@opentelemetry/api";
-import { RandomIdGenerator } from "@opentelemetry/sdk-trace-base";
-import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
-import {
-  ExceptionEventProperties,
-  ExceptionSpanEvent,
-  NULL_SENTINEL,
-  PRIMARY_VARIANT,
-  SemanticInternalAttributes,
-  SpanEvent,
-  SpanEvents,
-  SpanMessagingEvent,
-  TaskEventEnvironment,
-  TaskEventStyle,
-  TaskRunError,
-  correctErrorStackTrace,
-  createPacketAttributesAsJson,
-  flattenAttributes,
-  isExceptionSpanEvent,
-  omit,
-  unflattenAttributes,
-} from "@trigger.dev/core/v3";
-import { Prisma, TaskEvent, TaskEventKind, TaskEventStatus } from "@trigger.dev/database";
-import { createHash } from "node:crypto";
-import { EventEmitter } from "node:stream";
-import { Gauge } from "prom-client";
-import { $replica, PrismaClient, PrismaReplicaClient, prisma } from "~/db.server";
-import { env } from "~/env.server";
-import { metricsRegister } from "~/metrics.server";
-import { logger } from "~/services/logger.server";
-import { singleton } from "~/utils/singleton";
-import { DynamicFlushScheduler } from "./dynamicFlushScheduler.server";
-import { startActiveSpan } from "./tracer.server";
-import { createRedisClient, RedisClient, RedisWithClusterOptions } from "~/redis.server";
-import { startSpan } from "./tracing.server";
-import { nanoid } from "nanoid";
-import { TaskEventStore, TaskEventStoreTable } from "./taskEventStore.server";
-
-const MAX_FLUSH_DEPTH = 5;
-
-export type CreatableEvent = Omit<
-  Prisma.TaskEventCreateInput,
-  "id" | "createdAt" | "properties" | "metadata" | "style" | "output" | "payload"
-> & {
-  properties: Attributes;
-  metadata: Attributes | undefined;
-  style: Attributes | undefined;
-  output: Attributes | string | boolean | number | undefined;
-  payload: Attributes | string | boolean | number | undefined;
-};
-
-export type CreatableEventKind = TaskEventKind;
-export type CreatableEventStatus = TaskEventStatus;
-export type CreatableEventEnvironmentType = CreatableEvent["environmentType"];
-
-export type TraceAttributes = Partial<
-  Pick<
-    CreatableEvent,
-    | "attemptId"
-    | "isError"
-    | "isCancelled"
-    | "isDebug"
-    | "runId"
-    | "runIsTest"
-    | "output"
-    | "outputType"
-    | "metadata"
-    | "properties"
-    | "style"
-    | "queueId"
-    | "queueName"
-    | "batchId"
-    | "payload"
-    | "payloadType"
-    | "idempotencyKey"
-  >
->;
-
-export type SetAttribute<T extends TraceAttributes> = (key: keyof T, value: T[keyof T]) => void;
-
-export type TraceEventOptions = {
-  kind?: CreatableEventKind;
-  context?: Record<string, string | undefined>;
-  spanParentAsLink?: boolean;
-  parentAsLinkType?: "trigger" | "replay";
-  spanIdSeed?: string;
-  attributes: TraceAttributes;
-  environment: TaskEventEnvironment;
-  taskSlug: string;
-  startTime?: bigint;
-  endTime?: Date;
-  immediate?: boolean;
-};
-
-export type EventBuilder = {
-  traceId: string;
-  spanId: string;
-  setAttribute: SetAttribute<TraceAttributes>;
-  stop: () => void;
-  failWithError: (error: TaskRunError) => void;
-};
-
-export type EventRepoConfig = {
-  batchSize: number;
-  batchInterval: number;
-  redis: RedisWithClusterOptions;
-  retentionInDays: number;
-  partitioningEnabled: boolean;
-  tracer?: Tracer;
-};
-
-export type QueryOptions = Prisma.TaskEventWhereInput;
-
-export type TaskEventRecord = TaskEvent;
-
-export type QueriedEvent = Prisma.TaskEventGetPayload<{
-  select: {
-    spanId: true;
-    parentId: true;
-    runId: true;
-    idempotencyKey: true;
-    message: true;
-    style: true;
-    startTime: true;
-    duration: true;
-    isError: true;
-    isPartial: true;
-    isCancelled: true;
-    level: true;
-    events: true;
-    environmentType: true;
-    kind: true;
-  };
-}>;
-
-export type PreparedEvent = Omit<QueriedEvent, "events" | "style" | "duration"> & {
-  duration: number;
-  events: SpanEvents;
-  style: TaskEventStyle;
-};
-
-export type RunPreparedEvent = PreparedEvent & {
-  taskSlug?: string;
-};
-
-export type SpanLink =
-  | {
-      type: "run";
-      icon?: string;
-      title: string;
-      runId: string;
-    }
-  | {
-      type: "span";
-      icon?: string;
-      title: string;
-      traceId: string;
-      spanId: string;
-    };
-
-export type SpanSummary = {
-  id: string;
-  parentId: string | undefined;
-  runId: string;
-  data: {
-    message: string;
-    style: TaskEventStyle;
-    events: SpanEvents;
-    startTime: Date;
-    duration: number;
-    isError: boolean;
-    isPartial: boolean;
-    isCancelled: boolean;
-    isDebug: boolean;
-    level: NonNullable<CreatableEvent["level"]>;
-    environmentType: CreatableEventEnvironmentType;
-  };
-};
-
-export type TraceSummary = { rootSpan: SpanSummary; spans: Array<SpanSummary> };
-
-export type UpdateEventOptions = {
-  attributes: TraceAttributes;
-  endTime?: Date;
-  immediate?: boolean;
-  events?: SpanEvents;
-};
-
-export class EventRepository {
-  private readonly _flushScheduler: DynamicFlushScheduler<CreatableEvent>;
-  private _randomIdGenerator = new RandomIdGenerator();
-  private _redisPublishClient: RedisClient;
-  private _subscriberCount = 0;
-  private _tracer: Tracer;
-  private _lastFlushedAt: Date | undefined;
-  private taskEventStore: TaskEventStore;
-
-  get subscriberCount() {
-    return this._subscriberCount;
-  }
-
-  constructor(
-    db: PrismaClient = prisma,
-    readReplica: PrismaReplicaClient = $replica,
-    private readonly _config: EventRepoConfig
-  ) {
-    this._flushScheduler = new DynamicFlushScheduler({
-      batchSize: _config.batchSize,
-      flushInterval: _config.batchInterval,
-      callback: this.#flushBatch.bind(this),
-    });
-
-    this._redisPublishClient = createRedisClient("trigger:eventRepoPublisher", this._config.redis);
-    this._tracer = _config.tracer ?? trace.getTracer("eventRepo", "0.0.1");
-
-    // Instantiate the store using the partitioning flag.
-    this.taskEventStore = new TaskEventStore(db, readReplica);
-  }
-
-  async insert(event: CreatableEvent) {
-    this._flushScheduler.addToBatch([event]);
-  }
-
-  async insertImmediate(event: CreatableEvent) {
-    await this.#flushBatch(nanoid(), [event]);
-  }
-
-  async insertMany(events: CreatableEvent[]) {
-    this._flushScheduler.addToBatch(events);
-  }
-
-  async insertManyImmediate(events: CreatableEvent[]) {
-    return await this.#flushBatch(nanoid(), events);
-  }
-
-  async completeEvent(
-    storeTable: TaskEventStoreTable,
-    spanId: string,
-    startCreatedAt: Date,
-    endCreatedAt?: Date,
-    options?: UpdateEventOptions
-  ) {
-    const events = await this.queryIncompleteEvents(
-      storeTable,
-      { spanId },
-      startCreatedAt,
-      endCreatedAt
-    );
-
-    if (events.length === 0) {
-      logger.warn("No incomplete events found for spanId", { spanId, options });
-      return;
-    }
-
-    const event = events[0];
-
-    const output = options?.attributes.output
-      ? await createPacketAttributesAsJson(
-          options?.attributes.output,
-          options?.attributes.outputType ?? "application/json"
-        )
-      : undefined;
-
-    logger.debug("Completing event", {
-      spanId,
-      eventId: event.id,
-    });
-
-    const completedEvent = {
-      ...omit(event, "id"),
-      isPartial: false,
-      isError: options?.attributes.isError ?? false,
-      isCancelled: false,
-      status: options?.attributes.isError ? "ERROR" : "OK",
-      links: event.links ?? [],
-      events: event.events ?? (options?.events as any) ?? [],
-      duration: calculateDurationFromStart(event.startTime, options?.endTime),
-      properties: event.properties as Attributes,
-      metadata: event.metadata as Attributes,
-      style: event.style as Attributes,
-      output: output,
-      outputType:
-        options?.attributes.outputType === "application/store" ||
-        options?.attributes.outputType === "text/plain"
-          ? options?.attributes.outputType
-          : "application/json",
-      payload: event.payload as Attributes,
-      payloadType: event.payloadType,
-    } satisfies CreatableEvent;
-
-    await this.insert(completedEvent);
-
-    return completedEvent;
-  }
-
-  async cancelEvent(event: TaskEventRecord, cancelledAt: Date, reason: string) {
-    if (!event.isPartial) {
-      return;
-    }
-
-    await this.insertImmediate({
-      ...omit(event, "id"),
-      isPartial: false,
-      isError: false,
-      isCancelled: true,
-      status: "ERROR",
-      links: event.links ?? [],
-      events: [
-        {
-          name: "cancellation",
-          time: cancelledAt,
-          properties: {
-            reason,
-          },
-        },
-        ...((event.events as any[]) ?? []),
-      ],
-      duration: calculateDurationFromStart(event.startTime, cancelledAt),
-      properties: event.properties as Attributes,
-      metadata: event.metadata as Attributes,
-      style: event.style as Attributes,
-      output: event.output as Attributes,
-      outputType: event.outputType,
-      payload: event.payload as Attributes,
-      payloadType: event.payloadType,
-    });
-  }
-
-  async cancelEvents(events: TaskEventRecord[], cancelledAt: Date, reason: string) {
-    const eventsToCancel = events.filter((event) => event.isPartial);
-
-    if (eventsToCancel.length === 0) {
-      return;
-    }
-
-    await this.insertMany(
-      eventsToCancel.map((event) => ({
-        ...omit(event, "id"),
-        isPartial: false,
-        isError: false,
-        isCancelled: true,
-        status: "ERROR",
-        links: event.links ?? [],
-        events: [
-          {
-            name: "cancellation",
-            time: cancelledAt,
-            properties: {
-              reason,
-            },
-          },
-          ...((event.events as any[]) ?? []),
-        ],
-        duration: calculateDurationFromStart(event.startTime, cancelledAt),
-        properties: event.properties as Attributes,
-        metadata: event.metadata as Attributes,
-        style: event.style as Attributes,
-        output: event.output as Attributes,
-        outputType: event.outputType,
-        payload: event.payload as Attributes,
-        payloadType: event.payloadType,
-      }))
-    );
-  }
-
-  async crashEvent({
-    event,
-    crashedAt,
-    exception,
-  }: {
-    event: TaskEventRecord;
-    crashedAt: Date;
-    exception: ExceptionEventProperties;
-  }) {
-    if (!event.isPartial) {
-      return;
-    }
-
-    await this.insertImmediate({
-      ...omit(event, "id"),
-      isPartial: false,
-      isError: true,
-      isCancelled: false,
-      status: "ERROR",
-      links: event.links ?? [],
-      events: [
-        {
-          name: "exception",
-          time: crashedAt,
-          properties: {
-            exception,
-          },
-        } satisfies ExceptionSpanEvent,
-        ...((event.events as any[]) ?? []),
-      ],
-      duration: calculateDurationFromStart(event.startTime, crashedAt),
-      properties: event.properties as Attributes,
-      metadata: event.metadata as Attributes,
-      style: event.style as Attributes,
-      output: event.output as Attributes,
-      outputType: event.outputType,
-      payload: event.payload as Attributes,
-      payloadType: event.payloadType,
-    });
-  }
-
-  async #queryEvents(
-    storeTable: TaskEventStoreTable,
-    queryOptions: QueryOptions,
-    startCreatedAt: Date,
-    endCreatedAt?: Date
-  ): Promise<TaskEventRecord[]> {
-    return await this.taskEventStore.findMany(
-      storeTable,
-      queryOptions,
-      startCreatedAt,
-      endCreatedAt
-    );
-  }
-
-  async queryIncompleteEvents(
-    storeTable: TaskEventStoreTable,
-    queryOptions: QueryOptions,
-    startCreatedAt: Date,
-    endCreatedAt?: Date,
-    allowCompleteDuplicate = false
-  ) {
-    // First we will find all the events that match the query options (selecting minimal data).
-    const taskEvents = await this.taskEventStore.findMany(
-      storeTable,
-      queryOptions,
-      startCreatedAt,
-      endCreatedAt,
-      { spanId: true, isPartial: true, isCancelled: true },
-      undefined,
-      { limit: 500 }
-    );
-
-    // Optimize the filtering by pre-processing the data
-    const completeEventSpanIds = new Set<string>();
-    const incompleteEvents: Array<{ spanId: string }> = [];
-
-    // Single pass to categorize events and build lookup structures
-    for (const event of taskEvents) {
-      if (!event.isPartial && !event.isCancelled) {
-        // This is a complete event
-        completeEventSpanIds.add(event.spanId);
-      } else if (event.isPartial && !event.isCancelled) {
-        // This is a potentially incomplete event
-        incompleteEvents.push(event);
-      }
-      // Skip cancelled events as they are not incomplete
-    }
-
-    // Filter incomplete events, excluding those with complete duplicates
-    const filteredTaskEvents = allowCompleteDuplicate
-      ? incompleteEvents
-      : incompleteEvents.filter((event) => !completeEventSpanIds.has(event.spanId));
-
-    if (filteredTaskEvents.length === 0) {
-      return [];
-    }
-
-    return this.#queryEvents(
-      storeTable,
-      {
-        spanId: {
-          in: filteredTaskEvents.map((event) => event.spanId),
-        },
-      },
-      startCreatedAt,
-      endCreatedAt
-    );
-  }
-
-  public async getTraceSummary(
-    storeTable: TaskEventStoreTable,
-    traceId: string,
-    startCreatedAt: Date,
-    endCreatedAt?: Date,
-    options?: { includeDebugLogs?: boolean }
-  ): Promise<TraceSummary | undefined> {
-    return await startActiveSpan("getTraceSummary", async (span) => {
-      const events = await this.taskEventStore.findTraceEvents(
-        storeTable,
-        traceId,
-        startCreatedAt,
-        endCreatedAt,
-        { includeDebugLogs: options?.includeDebugLogs }
-      );
-
-      let preparedEvents: Array<PreparedEvent> = [];
-      let rootSpanId: string | undefined;
-      const eventsBySpanId = new Map<string, PreparedEvent>();
-
-      for (const event of events) {
-        preparedEvents.push(prepareEvent(event));
-
-        if (!rootSpanId && !event.parentId) {
-          rootSpanId = event.spanId;
-        }
-      }
-
-      for (const event of preparedEvents) {
-        const existingEvent = eventsBySpanId.get(event.spanId);
-
-        if (!existingEvent) {
-          eventsBySpanId.set(event.spanId, event);
-          continue;
-        }
-
-        if (event.isCancelled || !event.isPartial) {
-          eventsBySpanId.set(event.spanId, event);
-        }
-      }
-
-      preparedEvents = Array.from(eventsBySpanId.values());
-
-      const spansBySpanId = new Map<string, SpanSummary>();
-
-      const spans = preparedEvents.map((event) => {
-        const ancestorCancelled = isAncestorCancelled(eventsBySpanId, event.spanId);
-        const duration = calculateDurationIfAncestorIsCancelled(
-          eventsBySpanId,
-          event.spanId,
-          event.duration
-        );
-
-        const span = {
-          id: event.spanId,
-          parentId: event.parentId ?? undefined,
-          runId: event.runId,
-          idempotencyKey: event.idempotencyKey,
-          data: {
-            message: event.message,
-            style: event.style,
-            duration,
-            isError: event.isError,
-            isPartial: ancestorCancelled ? false : event.isPartial,
-            isCancelled: event.isCancelled === true ? true : event.isPartial && ancestorCancelled,
-            isDebug: event.kind === TaskEventKind.LOG,
-            startTime: getDateFromNanoseconds(event.startTime),
-            level: event.level,
-            events: event.events,
-            environmentType: event.environmentType,
-          },
-        };
-
-        spansBySpanId.set(event.spanId, span);
-
-        return span;
-      });
-
-      if (!rootSpanId) {
-        return;
-      }
-
-      const rootSpan = spansBySpanId.get(rootSpanId);
-
-      if (!rootSpan) {
-        return;
-      }
-
-      return {
-        rootSpan,
-        spans,
-      };
-    });
-  }
-
-  public async getRunEvents(
-    storeTable: TaskEventStoreTable,
-    runId: string,
-    startCreatedAt: Date,
-    endCreatedAt?: Date
-  ): Promise<RunPreparedEvent[]> {
-    return await startActiveSpan("getRunEvents", async (span) => {
-      const events = await this.taskEventStore.findMany(
-        storeTable,
-        {
-          runId,
-          isPartial: false,
-        },
-        startCreatedAt,
-        endCreatedAt,
-        {
-          spanId: true,
-          parentId: true,
-          runId: true,
-          idempotencyKey: true,
-          message: true,
-          style: true,
-          startTime: true,
-          duration: true,
-          isError: true,
-          isPartial: true,
-          isCancelled: true,
-          kind: true,
-          level: true,
-          events: true,
-          environmentType: true,
-          taskSlug: true,
-        }
-      );
-
-      let preparedEvents: Array<PreparedEvent> = [];
-
-      for (const event of events) {
-        preparedEvents.push(prepareEvent(event));
-      }
-
-      return preparedEvents;
-    });
-  }
-
-  // A Span can be cancelled if it is partial and has a parent that is cancelled
-  // And a span's duration, if it is partial and has a cancelled parent, is the time between the start of the span and the time of the cancellation event of the parent
-  public async getSpan(
-    storeTable: TaskEventStoreTable,
-    spanId: string,
-    traceId: string,
-    startCreatedAt: Date,
-    endCreatedAt?: Date,
-    options?: { includeDebugLogs?: boolean }
-  ) {
-    return await startActiveSpan("getSpan", async (s) => {
-      const spanEvent = await this.#getSpanEvent(
-        storeTable,
-        spanId,
-        startCreatedAt,
-        endCreatedAt,
-        options
-      );
-
-      if (!spanEvent) {
-        return;
-      }
-
-      const preparedEvent = prepareEvent(spanEvent);
-
-      const span = await this.#createSpanFromEvent(
-        storeTable,
-        preparedEvent,
-        startCreatedAt,
-        endCreatedAt
-      );
-
-      const output = rehydrateJson(spanEvent.output);
-      const payload = rehydrateJson(spanEvent.payload);
-
-      const show = rehydrateShow(spanEvent.properties);
-
-      const properties = sanitizedAttributes(spanEvent.properties);
-
-      const messagingEvent = SpanMessagingEvent.optional().safeParse(
-        (properties as any)?.messaging
-      );
-
-      const links: SpanLink[] = [];
-
-      if (messagingEvent.success && messagingEvent.data) {
-        if (messagingEvent.data.message && "id" in messagingEvent.data.message) {
-          if (messagingEvent.data.message.id.startsWith("run_")) {
-            links.push({
-              type: "run",
-              icon: "runs",
-              title: `Run ${messagingEvent.data.message.id}`,
-              runId: messagingEvent.data.message.id,
-            });
-          }
-        }
-      }
-
-      const backLinks = spanEvent.links as any as Link[] | undefined;
-
-      if (backLinks && backLinks.length > 0) {
-        backLinks.forEach((l) => {
-          const title = String(
-            l.attributes?.[SemanticInternalAttributes.LINK_TITLE] ?? "Triggered by"
-          );
-
-          links.push({
-            type: "span",
-            icon: "trigger",
-            title,
-            traceId: l.context.traceId,
-            spanId: l.context.spanId,
-          });
-        });
-      }
-
-      const spanEvents = transformEvents(
-        preparedEvent.events,
-        spanEvent.metadata as Attributes,
-        spanEvent.environmentType === "DEVELOPMENT"
-      );
-
-      const originalRun = rehydrateAttribute<string>(
-        spanEvent.properties,
-        SemanticInternalAttributes.ORIGINAL_RUN_ID
-      );
-
-      const entity = {
-        type: rehydrateAttribute<string>(
-          spanEvent.properties,
-          SemanticInternalAttributes.ENTITY_TYPE
-        ),
-        id: rehydrateAttribute<string>(spanEvent.properties, SemanticInternalAttributes.ENTITY_ID),
-      };
-
-      return {
-        ...spanEvent,
-        ...span.data,
-        payload,
-        output,
-        properties,
-        events: spanEvents,
-        show,
-        links,
-        originalRun,
-        entity,
-      };
-    });
-  }
-
-  async #createSpanFromEvent(
-    storeTable: TaskEventStoreTable,
-    event: PreparedEvent,
-    startCreatedAt: Date,
-    endCreatedAt?: Date
-  ) {
-    return await startActiveSpan("createSpanFromEvent", async (s) => {
-      let ancestorCancelled = false;
-      let duration = event.duration;
-
-      if (!event.isCancelled && event.isPartial) {
-        await this.#walkSpanAncestors(
-          storeTable,
-          event,
-          startCreatedAt,
-          endCreatedAt,
-          (ancestorEvent, level) => {
-            if (level >= 8) {
-              return { stop: true };
-            }
-
-            if (ancestorEvent.isCancelled) {
-              ancestorCancelled = true;
-
-              // We need to get the cancellation time from the cancellation span event
-              const cancellationEvent = ancestorEvent.events.find(
-                (event) => event.name === "cancellation"
-              );
-
-              if (cancellationEvent) {
-                duration = calculateDurationFromStart(event.startTime, cancellationEvent.time);
-              }
-
-              return { stop: true };
-            }
-
-            return { stop: false };
-          }
-        );
-      }
-
-      const span = {
-        id: event.spanId,
-        parentId: event.parentId ?? undefined,
-        runId: event.runId,
-        idempotencyKey: event.idempotencyKey,
-        data: {
-          message: event.message,
-          style: event.style,
-          duration,
-          isError: event.isError,
-          isPartial: ancestorCancelled ? false : event.isPartial,
-          isCancelled: event.isCancelled === true ? true : event.isPartial && ancestorCancelled,
-          startTime: getDateFromNanoseconds(event.startTime),
-          level: event.level,
-          events: event.events,
-          environmentType: event.environmentType,
-        },
-      };
-
-      return span;
-    });
-  }
-
-  async #walkSpanAncestors(
-    storeTable: TaskEventStoreTable,
-    event: PreparedEvent,
-    startCreatedAt: Date,
-    endCreatedAt: Date | undefined,
-    callback: (event: PreparedEvent, level: number) => { stop: boolean }
-  ) {
-    const parentId = event.parentId;
-    if (!parentId) {
-      return;
-    }
-
-    await startActiveSpan("walkSpanAncestors", async (s) => {
-      let parentEvent = await this.#getSpanEvent(
-        storeTable,
-        parentId,
-        startCreatedAt,
-        endCreatedAt
-      );
-      let level = 1;
-
-      while (parentEvent) {
-        const preparedParentEvent = prepareEvent(parentEvent);
-
-        const result = callback(preparedParentEvent, level);
-
-        if (result.stop) {
-          return;
-        }
-
-        if (!preparedParentEvent.parentId) {
-          return;
-        }
-
-        parentEvent = await this.#getSpanEvent(
-          storeTable,
-          preparedParentEvent.parentId,
-          startCreatedAt,
-          endCreatedAt
-        );
-
-        level++;
-      }
-    });
-  }
-
-  async #getSpanEvent(
-    storeTable: TaskEventStoreTable,
-    spanId: string,
-    startCreatedAt: Date,
-    endCreatedAt?: Date,
-    options?: { includeDebugLogs?: boolean }
-  ) {
-    return await startActiveSpan("getSpanEvent", async (s) => {
-      const events = await this.taskEventStore.findMany(
-        storeTable,
-        { spanId },
-        startCreatedAt,
-        endCreatedAt,
-        undefined,
-        {
-          startTime: "asc",
-        },
-        options
-      );
-
-      let finalEvent: TaskEvent | undefined;
-
-      for (const event of events) {
-        if (event.isPartial && finalEvent) {
-          continue;
-        }
-
-        finalEvent = event;
-      }
-
-      return finalEvent;
-    });
-  }
-
-  public async recordEvent(
-    message: string,
-    options: TraceEventOptions & { duration?: number; parentId?: string }
-  ) {
-    const propagatedContext = extractContextFromCarrier(options.context ?? {});
-
-    const startTime = options.startTime ?? getNowInNanoseconds();
-    const duration =
-      options.duration ??
-      (options.endTime ? calculateDurationFromStart(startTime, options.endTime) : 100);
-
-    const traceId = propagatedContext?.traceparent?.traceId ?? this.generateTraceId();
-    const parentId = options.parentId ?? propagatedContext?.traceparent?.spanId;
-    const tracestate = propagatedContext?.tracestate;
-    const spanId = options.spanIdSeed
-      ? this.#generateDeterministicSpanId(traceId, options.spanIdSeed)
-      : this.generateSpanId();
-
-    const metadata = {
-      [SemanticInternalAttributes.ENVIRONMENT_ID]: options.environment.id,
-      [SemanticInternalAttributes.ENVIRONMENT_TYPE]: options.environment.type,
-      [SemanticInternalAttributes.ORGANIZATION_ID]: options.environment.organizationId,
-      [SemanticInternalAttributes.PROJECT_ID]: options.environment.projectId,
-      [SemanticInternalAttributes.PROJECT_REF]: options.environment.project.externalRef,
-      [SemanticInternalAttributes.RUN_ID]: options.attributes.runId,
-      [SemanticInternalAttributes.RUN_IS_TEST]: options.attributes.runIsTest ?? false,
-      [SemanticInternalAttributes.BATCH_ID]: options.attributes.batchId ?? undefined,
-      [SemanticInternalAttributes.TASK_SLUG]: options.taskSlug,
-      [SemanticResourceAttributes.SERVICE_NAME]: "api server",
-      [SemanticResourceAttributes.SERVICE_NAMESPACE]: "trigger.dev",
-      ...options.attributes.metadata,
-    };
-
-    const style = {
-      [SemanticInternalAttributes.STYLE_ICON]: options.attributes.isDebug ? "warn" : "play",
-    };
-
-    if (!options.attributes.runId) {
-      throw new Error("runId is required");
-    }
-
-    const event: CreatableEvent = {
-      traceId,
-      spanId,
-      parentId,
-      tracestate,
-      message: message,
-      serviceName: "api server",
-      serviceNamespace: "trigger.dev",
-      level: options.attributes.isDebug ? "WARN" : "TRACE",
-      kind: options.attributes.isDebug ? TaskEventKind.LOG : options.kind,
-      status: "OK",
-      startTime,
-      isPartial: false,
-      duration, // convert to nanoseconds
-      environmentId: options.environment.id,
-      environmentType: options.environment.type,
-      organizationId: options.environment.organizationId,
-      projectId: options.environment.projectId,
-      projectRef: options.environment.project.externalRef,
-      runId: options.attributes.runId,
-      runIsTest: options.attributes.runIsTest ?? false,
-      taskSlug: options.taskSlug,
-      queueId: options.attributes.queueId,
-      queueName: options.attributes.queueName,
-      batchId: options.attributes.batchId ?? undefined,
-      properties: {
-        ...style,
-        ...(flattenAttributes(metadata, SemanticInternalAttributes.METADATA) as Record<
-          string,
-          string
-        >),
-        ...options.attributes.properties,
-      },
-      metadata: metadata,
-      style: stripAttributePrefix(style, SemanticInternalAttributes.STYLE),
-      output: undefined,
-      outputType: undefined,
-      payload: undefined,
-      payloadType: undefined,
-    };
-
-    if (options.immediate) {
-      await this.insertImmediate(event);
-    } else {
-      this._flushScheduler.addToBatch([event]);
-    }
-
-    return event;
-  }
-
-  public async traceEvent<TResult>(
-    message: string,
-    options: TraceEventOptions & { incomplete?: boolean; isError?: boolean },
-    callback: (
-      e: EventBuilder,
-      traceContext: Record<string, string | undefined>,
-      traceparent?: { traceId: string; spanId: string }
-    ) => Promise<TResult>
-  ): Promise<TResult> {
-    const propagatedContext = extractContextFromCarrier(options.context ?? {});
-
-    const start = process.hrtime.bigint();
-    const startTime = options.startTime ?? getNowInNanoseconds();
-
-    const traceId = options.spanParentAsLink
-      ? this.generateTraceId()
-      : propagatedContext?.traceparent?.traceId ?? this.generateTraceId();
-    const parentId = options.spanParentAsLink ? undefined : propagatedContext?.traceparent?.spanId;
-    const tracestate = options.spanParentAsLink ? undefined : propagatedContext?.tracestate;
-    const spanId = options.spanIdSeed
-      ? this.#generateDeterministicSpanId(traceId, options.spanIdSeed)
-      : this.generateSpanId();
-
-    const traceContext = {
-      traceparent: `00-${traceId}-${spanId}-01`,
-    };
-
-    const links: Link[] =
-      options.spanParentAsLink && propagatedContext?.traceparent
-        ? [
-            {
-              context: {
-                traceId: propagatedContext.traceparent.traceId,
-                spanId: propagatedContext.traceparent.spanId,
-                traceFlags: TraceFlags.SAMPLED,
-              },
-              attributes: {
-                [SemanticInternalAttributes.LINK_TITLE]:
-                  options.parentAsLinkType === "replay" ? "Replay of" : "Triggered by",
-              },
-            },
-          ]
-        : [];
-
-    let isStopped = false;
-    let failedWithError: TaskRunError | undefined;
-
-    const eventBuilder = {
-      traceId,
-      spanId,
-      setAttribute: (key: keyof TraceAttributes, value: TraceAttributes[keyof TraceAttributes]) => {
-        if (value) {
-          // We need to merge the attributes with the existing attributes
-          const existingValue = options.attributes[key];
-
-          if (existingValue && typeof existingValue === "object" && typeof value === "object") {
-            // @ts-ignore
-            options.attributes[key] = { ...existingValue, ...value };
-          } else {
-            // @ts-ignore
-            options.attributes[key] = value;
-          }
-        }
-      },
-      stop: () => {
-        isStopped = true;
-      },
-      failWithError: (error: TaskRunError) => {
-        failedWithError = error;
-      },
-    };
-
-    const result = await callback(eventBuilder, traceContext, propagatedContext?.traceparent);
-
-    if (isStopped) {
-      return result;
-    }
-
-    const duration = process.hrtime.bigint() - start;
-
-    const metadata = {
-      [SemanticInternalAttributes.ENVIRONMENT_ID]: options.environment.id,
-      [SemanticInternalAttributes.ENVIRONMENT_TYPE]: options.environment.type,
-      [SemanticInternalAttributes.ORGANIZATION_ID]: options.environment.organizationId,
-      [SemanticInternalAttributes.PROJECT_ID]: options.environment.projectId,
-      [SemanticInternalAttributes.PROJECT_REF]: options.environment.project.externalRef,
-      [SemanticInternalAttributes.RUN_ID]: options.attributes.runId,
-      [SemanticInternalAttributes.RUN_IS_TEST]: options.attributes.runIsTest ?? false,
-      [SemanticInternalAttributes.BATCH_ID]: options.attributes.batchId ?? undefined,
-      [SemanticInternalAttributes.TASK_SLUG]: options.taskSlug,
-      [SemanticResourceAttributes.SERVICE_NAME]: "api server",
-      [SemanticResourceAttributes.SERVICE_NAMESPACE]: "trigger.dev",
-      ...options.attributes.metadata,
-    };
-
-    const style = {
-      [SemanticInternalAttributes.STYLE_ICON]: "task",
-      [SemanticInternalAttributes.STYLE_VARIANT]: PRIMARY_VARIANT,
-      ...options.attributes.style,
-    };
-
-    if (!options.attributes.runId) {
-      throw new Error("runId is required");
-    }
-
-    const event: CreatableEvent = {
-      traceId,
-      spanId,
-      parentId,
-      tracestate,
-      duration: options.incomplete ? 0 : duration,
-      isPartial: failedWithError ? false : options.incomplete,
-      isError: !!failedWithError,
-      message: message,
-      serviceName: "api server",
-      serviceNamespace: "trigger.dev",
-      level: "TRACE",
-      kind: options.kind,
-      status: failedWithError ? "ERROR" : "OK",
-      startTime,
-      environmentId: options.environment.id,
-      environmentType: options.environment.type,
-      organizationId: options.environment.organizationId,
-      projectId: options.environment.projectId,
-      projectRef: options.environment.project.externalRef,
-      runId: options.attributes.runId,
-      runIsTest: options.attributes.runIsTest ?? false,
-      taskSlug: options.taskSlug,
-      queueId: options.attributes.queueId,
-      queueName: options.attributes.queueName,
-      batchId: options.attributes.batchId ?? undefined,
-      properties: {
-        ...(flattenAttributes(metadata, SemanticInternalAttributes.METADATA) as Record<
-          string,
-          string
-        >),
-        ...flattenAttributes(options.attributes.properties),
-      },
-      metadata: metadata,
-      style: stripAttributePrefix(style, SemanticInternalAttributes.STYLE),
-      output: undefined,
-      outputType: undefined,
-      links: links as unknown as Prisma.InputJsonValue,
-      payload: options.attributes.payload,
-      payloadType: options.attributes.payloadType,
-      idempotencyKey: options.attributes.idempotencyKey,
-      events: failedWithError
-        ? [
-            {
-              name: "exception",
-              time: new Date(),
-              properties: {
-                exception: createExceptionPropertiesFromError(failedWithError),
-              },
-            },
-          ]
-        : undefined,
-    };
-
-    if (options.immediate) {
-      await this.insertImmediate(event);
-    } else {
-      this._flushScheduler.addToBatch([event]);
-    }
-
-    return result;
-  }
-
-  async subscribeToTrace(traceId: string) {
-    const redis = createRedisClient("trigger:eventRepoSubscriber", this._config.redis);
-
-    const channel = `events:${traceId}`;
-
-    // Subscribe to the channel.
-    await redis.subscribe(channel);
-
-    // Increment the subscriber count.
-    this._subscriberCount++;
-
-    const eventEmitter = new EventEmitter();
-
-    // Define the message handler.
-    redis.on("message", (_, message) => {
-      eventEmitter.emit("message", message);
-    });
-
-    // Return a function that can be used to unsubscribe.
-    const unsubscribe = async () => {
-      await redis.unsubscribe(channel);
-      redis.quit();
-      this._subscriberCount--;
-    };
-
-    return {
-      unsubscribe,
-      eventEmitter,
-    };
-  }
-
-  async #flushBatch(flushId: string, batch: CreatableEvent[]) {
-    return await startSpan(this._tracer, "flushBatch", async (span) => {
-      const events = excludePartialEventsWithCorrespondingFullEvent(batch);
-
-      span.setAttribute("flush_id", flushId);
-      span.setAttribute("event_count", events.length);
-      span.setAttribute("partial_event_count", batch.length - events.length);
-      span.setAttribute(
-        "last_flush_in_ms",
-        this._lastFlushedAt ? new Date().getTime() - this._lastFlushedAt.getTime() : 0
-      );
-
-      const flushedEvents = await this.#doFlushBatch(flushId, events);
-
-      this._lastFlushedAt = new Date();
-
-      if (flushedEvents.length !== events.length) {
-        logger.debug("[EventRepository][flushBatch] Failed to insert all events", {
-          attemptCount: events.length,
-          successCount: flushedEvents.length,
-        });
-
-        span.setAttribute("failed_event_count", events.length - flushedEvents.length);
-      }
-
-      this.#publishToRedis(flushedEvents);
-    });
-  }
-
-  private get taskEventStoreTable(): TaskEventStoreTable {
-    return this._config.partitioningEnabled ? "taskEventPartitioned" : "taskEvent";
-  }
-
-  async #doFlushBatch(
-    flushId: string,
-    events: CreatableEvent[],
-    depth: number = 1
-  ): Promise<CreatableEvent[]> {
-    return await startSpan(this._tracer, "doFlushBatch", async (span) => {
-      try {
-        span.setAttribute("event_count", events.length);
-        span.setAttribute("depth", depth);
-        span.setAttribute("flush_id", flushId);
-
-        await this.taskEventStore.createMany(
-          this.taskEventStoreTable,
-          events as Prisma.TaskEventCreateManyInput[]
-        );
-
-        span.setAttribute("inserted_event_count", events.length);
-
-        return events;
-      } catch (error) {
-        if (error instanceof Prisma.PrismaClientUnknownRequestError) {
-          logger.error("Failed to insert events, most likely because of null characters", {
-            error: {
-              name: error.name,
-              message: error.message,
-              stack: error.stack,
-              clientVersion: error.clientVersion,
-            },
-          });
-
-          if (events.length === 1) {
-            logger.debug("Attempting to insert event individually and it failed", {
-              event: events[0],
-              error: {
-                name: error.name,
-                message: error.message,
-                stack: error.stack,
-                clientVersion: error.clientVersion,
-              },
-            });
-
-            span.setAttribute("failed_event_count", 1);
-
-            return [];
-          }
-
-          if (depth > MAX_FLUSH_DEPTH) {
-            logger.error("Failed to insert events, reached maximum depth", {
-              error: {
-                name: error.name,
-                message: error.message,
-                stack: error.stack,
-                clientVersion: error.clientVersion,
-              },
-              depth,
-              eventsCount: events.length,
-            });
-
-            span.setAttribute("reached_max_flush_depth", true);
-            span.setAttribute("failed_event_count", events.length);
-
-            return [];
-          }
-
-          // Split the events into two batches, and recursively try to insert them.
-          const middle = Math.floor(events.length / 2);
-          const [firstHalf, secondHalf] = [events.slice(0, middle), events.slice(middle)];
-
-          return await startSpan(this._tracer, "bisectBatch", async (span) => {
-            span.setAttribute("first_half_count", firstHalf.length);
-            span.setAttribute("second_half_count", secondHalf.length);
-            span.setAttribute("depth", depth);
-            span.setAttribute("flush_id", flushId);
-
-            const [firstHalfEvents, secondHalfEvents] = await Promise.all([
-              this.#doFlushBatch(flushId, firstHalf, depth + 1),
-              this.#doFlushBatch(flushId, secondHalf, depth + 1),
-            ]);
-
-            return firstHalfEvents.concat(secondHalfEvents);
-          });
-        }
-
-        throw error;
-      }
-    });
-  }
-
-  async #publishToRedis(events: CreatableEvent[]) {
-    if (events.length === 0) return;
-    const uniqueTraces = new Set(events.map((e) => `events:${e.traceId}`));
-
-    await Promise.allSettled(
-      Array.from(uniqueTraces).map((traceId) =>
-        this._redisPublishClient.publish(traceId, new Date().toISOString())
-      )
-    );
-  }
-
-  public generateTraceId() {
-    return this._randomIdGenerator.generateTraceId();
-  }
-
-  public generateSpanId() {
-    return this._randomIdGenerator.generateSpanId();
-  }
-
-  /**
-   * Returns a deterministically random 8-byte span ID formatted/encoded as a 16 lowercase hex
-   * characters corresponding to 64 bits, based on the trace ID and seed.
-   */
-  #generateDeterministicSpanId(traceId: string, seed: string) {
-    const hash = createHash("sha1");
-    hash.update(traceId);
-    hash.update(seed);
-    const buffer = hash.digest();
-    let hexString = "";
-    for (let i = 0; i < 8; i++) {
-      const val = buffer.readUInt8(i);
-      const str = val.toString(16).padStart(2, "0");
-      hexString += str;
-    }
-    return hexString;
-  }
-}
-
-export const eventRepository = singleton("eventRepo", initializeEventRepo);
-
-function initializeEventRepo() {
-  const repo = new EventRepository(prisma, $replica, {
-    batchSize: env.EVENTS_BATCH_SIZE,
-    batchInterval: env.EVENTS_BATCH_INTERVAL,
-    retentionInDays: env.EVENTS_DEFAULT_LOG_RETENTION,
-    partitioningEnabled: env.TASK_EVENT_PARTITIONING_ENABLED === "1",
-    redis: {
-      port: env.PUBSUB_REDIS_PORT,
-      host: env.PUBSUB_REDIS_HOST,
-      username: env.PUBSUB_REDIS_USERNAME,
-      password: env.PUBSUB_REDIS_PASSWORD,
-      tlsDisabled: env.PUBSUB_REDIS_TLS_DISABLED === "true",
-      clusterMode: env.PUBSUB_REDIS_CLUSTER_MODE_ENABLED === "1",
-    },
-  });
-
-  new Gauge({
-    name: "event_repository_subscriber_count",
-    help: "Number of event repository subscribers",
-    collect() {
-      this.set(repo.subscriberCount);
-    },
-    registers: [metricsRegister],
-  });
-
-  return repo;
-}
-
-export function stripAttributePrefix(attributes: Attributes, prefix: string) {
-  const result: Attributes = {};
-
-  for (const [key, value] of Object.entries(attributes)) {
-    if (key.startsWith(prefix)) {
-      result[key.slice(prefix.length + 1)] = value;
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-
-export function createExceptionPropertiesFromError(error: TaskRunError): ExceptionEventProperties {
-  switch (error.type) {
-    case "BUILT_IN_ERROR": {
-      return {
-        type: error.name,
-        message: error.message,
-        stacktrace: error.stackTrace,
-      };
-    }
-    case "CUSTOM_ERROR": {
-      return {
-        type: "Error",
-        message: error.raw,
-      };
-    }
-    case "INTERNAL_ERROR": {
-      return {
-        type: "Internal error",
-        message: [error.code, error.message].filter(Boolean).join(": "),
-        stacktrace: error.stackTrace,
-      };
-    }
-    case "STRING_ERROR": {
-      return {
-        type: "Error",
-        message: error.raw,
-      };
-    }
-  }
-}
-
-/**
- * Filters out partial events from a batch of creatable events, excluding those that have a corresponding full event.
- * @param batch - The batch of creatable events to filter.
- * @returns The filtered array of creatable events, excluding partial events with corresponding full events.
- */
-function excludePartialEventsWithCorrespondingFullEvent(batch: CreatableEvent[]): CreatableEvent[] {
-  const partialEvents = batch.filter((event) => event.isPartial);
-  const fullEvents = batch.filter((event) => !event.isPartial);
-
-  return fullEvents.concat(
-    partialEvents.filter((partialEvent) => {
-      return !fullEvents.some((fullEvent) => fullEvent.spanId === partialEvent.spanId);
-    })
-  );
-}
-
-export function extractContextFromCarrier(carrier: Record<string, string | undefined>) {
-  const traceparent = carrier["traceparent"];
-  const tracestate = carrier["tracestate"];
-
-  return {
-    traceparent: parseTraceparent(traceparent),
-    tracestate,
-  };
-}
-
-function parseTraceparent(traceparent?: string): { traceId: string; spanId: string } | undefined {
-  if (!traceparent) {
-    return undefined;
-  }
-
-  const parts = traceparent.split("-");
-
-  if (parts.length !== 4) {
-    return undefined;
-  }
-
-  const [version, traceId, spanId, flags] = parts;
-
-  if (version !== "00") {
-    return undefined;
-  }
-
-  return { traceId, spanId };
-}
-
-function prepareEvent(event: QueriedEvent): PreparedEvent {
-  return {
-    ...event,
-    duration: Number(event.duration),
-    events: parseEventsField(event.events),
-    style: parseStyleField(event.style),
-  };
-}
-
-function parseEventsField(events: Prisma.JsonValue): SpanEvents {
-  const unsafe = events
-    ? (events as any[]).map((e) => ({
-        ...e,
-        properties: unflattenAttributes(e.properties as Attributes),
-      }))
-    : undefined;
-
-  return unsafe as SpanEvents;
-}
-
-function parseStyleField(style: Prisma.JsonValue): TaskEventStyle {
-  const unsafe = unflattenAttributes(style as Attributes);
-
-  if (!unsafe) {
-    return {};
-  }
-
-  if (typeof unsafe === "object") {
-    return Object.assign(
-      {
-        icon: undefined,
-        variant: undefined,
-      },
-      unsafe
-    ) as TaskEventStyle;
-  }
-
-  return {};
-}
-
-function isAncestorCancelled(events: Map<string, PreparedEvent>, spanId: string) {
-  const event = events.get(spanId);
-
-  if (!event) {
-    return false;
-  }
-
-  if (event.isCancelled) {
-    return true;
-  }
-
-  if (event.parentId) {
-    return isAncestorCancelled(events, event.parentId);
-  }
-
-  return false;
-}
-
-function calculateDurationIfAncestorIsCancelled(
-  events: Map<string, PreparedEvent>,
-  spanId: string,
-  defaultDuration: number
-) {
-  const event = events.get(spanId);
-
-  if (!event) {
-    return defaultDuration;
-  }
-
-  if (event.isCancelled) {
-    return defaultDuration;
-  }
-
-  if (!event.isPartial) {
-    return defaultDuration;
-  }
-
-  if (event.parentId) {
-    const cancelledAncestor = findFirstCancelledAncestor(events, event.parentId);
-
-    if (cancelledAncestor) {
-      // We need to get the cancellation time from the cancellation span event
-      const cancellationEvent = cancelledAncestor.events.find(
-        (event) => event.name === "cancellation"
-      );
-
-      if (cancellationEvent) {
-        return calculateDurationFromStart(event.startTime, cancellationEvent.time);
-      }
-    }
-  }
-
-  return defaultDuration;
-}
-
-function findFirstCancelledAncestor(events: Map<string, PreparedEvent>, spanId: string) {
-  const event = events.get(spanId);
-
-  if (!event) {
-    return;
-  }
-
-  if (event.isCancelled) {
-    return event;
-  }
-
-  if (event.parentId) {
-    return findFirstCancelledAncestor(events, event.parentId);
-  }
-
-  return;
-}
-
-function sanitizedAttributes(json: Prisma.JsonValue) {
-  if (json === null || json === undefined) {
-    return;
-  }
-
-  const withoutPrivateProperties = removePrivateProperties(json as Attributes);
-  if (!withoutPrivateProperties) {
-    return;
-  }
-
-  return unflattenAttributes(withoutPrivateProperties);
-}
-// removes keys that start with a $ sign. If there are no keys left, return undefined
-function removePrivateProperties(
-  attributes: Attributes | undefined | null
-): Attributes | undefined {
-  if (!attributes) {
-    return undefined;
-  }
-
-  const result: Attributes = {};
-
-  for (const [key, value] of Object.entries(attributes)) {
-    if (key.startsWith("$")) {
-      continue;
-    }
-
-    result[key] = value;
-  }
-
-  if (Object.keys(result).length === 0) {
-    return undefined;
-  }
-
-  return result;
-}
-
-function transformEvents(events: SpanEvents, properties: Attributes, isDev: boolean): SpanEvents {
-  return (events ?? []).map((event) => transformEvent(event, properties, isDev));
-}
-
-function transformEvent(event: SpanEvent, properties: Attributes, isDev: boolean): SpanEvent {
-  if (isExceptionSpanEvent(event)) {
-    return {
-      ...event,
-      properties: {
-        exception: transformException(event.properties.exception, properties, isDev),
-      },
-    };
-  }
-
-  return event;
-}
-
-function transformException(
-  exception: ExceptionEventProperties,
-  properties: Attributes,
-  isDev: boolean
-): ExceptionEventProperties {
-  const projectDirAttributeValue = properties[SemanticInternalAttributes.PROJECT_DIR];
-
-  if (projectDirAttributeValue !== undefined && typeof projectDirAttributeValue !== "string") {
-    return exception;
-  }
-
-  return {
-    ...exception,
-    stacktrace: exception.stacktrace
-      ? correctErrorStackTrace(exception.stacktrace, projectDirAttributeValue, {
-          removeFirstLine: true,
-          isDev,
-        })
-      : undefined,
-  };
-}
-
-function calculateDurationFromStart(startTime: bigint, endTime: Date = new Date()) {
-  const $endtime = typeof endTime === "string" ? new Date(endTime) : endTime;
-
-  return Number(BigInt($endtime.getTime() * 1_000_000) - startTime);
-}
-
-function getNowInNanoseconds(): bigint {
-  return BigInt(new Date().getTime() * 1_000_000);
-}
-
-export function getDateFromNanoseconds(nanoseconds: bigint) {
-  return new Date(Number(nanoseconds) / 1_000_000);
-}
-
-function rehydrateJson(json: Prisma.JsonValue): any {
-  if (json === null) {
-    return undefined;
-  }
-
-  if (json === NULL_SENTINEL) {
-    return null;
-  }
-
-  if (typeof json === "string") {
-    return json;
-  }
-
-  if (typeof json === "number") {
-    return json;
-  }
-
-  if (typeof json === "boolean") {
-    return json;
-  }
-
-  if (Array.isArray(json)) {
-    return json.map((item) => rehydrateJson(item));
-  }
-
-  if (typeof json === "object") {
-    return unflattenAttributes(json as Attributes);
-  }
-
-  return null;
-}
-
-function rehydrateShow(properties: Prisma.JsonValue): { actions?: boolean } | undefined {
-  if (properties === null || properties === undefined) {
-    return;
-  }
-
-  if (typeof properties !== "object") {
-    return;
-  }
-
-  if (Array.isArray(properties)) {
-    return;
-  }
-
-  const actions = properties[SemanticInternalAttributes.SHOW_ACTIONS];
-
-  if (typeof actions === "boolean") {
-    return { actions };
-  }
-
-  return;
-}
-
-export function rehydrateAttribute<T extends AttributeValue>(
-  properties: Prisma.JsonValue,
-  key: string
-): T | undefined {
-  if (properties === null || properties === undefined) {
-    return;
-  }
-
-  if (typeof properties !== "object") {
-    return;
-  }
-
-  if (Array.isArray(properties)) {
-    return;
-  }
-
-  const value = properties[key];
-
-  if (value === undefined) {
-    return;
-  }
-
-  return value as T;
-}
-
-export async function findRunForEventCreation(runId: string) {
-  return prisma.taskRun.findFirst({
-    where: {
-      id: runId,
-    },
-    select: {
-      friendlyId: true,
-      taskIdentifier: true,
-      traceContext: true,
-      runtimeEnvironment: {
-        select: {
-          id: true,
-          type: true,
-          organizationId: true,
-          projectId: true,
-          project: {
-            select: {
-              externalRef: true,
-            },
-          },
-        },
-      },
-    },
-  });
-}
-
-export async function recordRunEvent(
-  runId: string,
-  message: string,
-  options: Omit<TraceEventOptions, "environment" | "taskSlug" | "startTime"> & {
-    duration?: number;
-    parentId?: string;
-    startTime?: Date;
-  }
-): Promise<
-  | {
-      success: true;
-    }
-  | {
-      success: false;
-      code: "RUN_NOT_FOUND" | "FAILED_TO_RECORD_EVENT";
-      error?: unknown;
-    }
-> {
-  try {
-    const foundRun = await findRunForEventCreation(runId);
-
-    if (!foundRun) {
-      logger.error("Failed to find run for event creation", { runId });
-      return {
-        success: false,
-        code: "RUN_NOT_FOUND",
-      };
-    }
-
-    const { attributes, startTime, ...optionsRest } = options;
-
-    await eventRepository.recordEvent(message, {
-      environment: foundRun.runtimeEnvironment,
-      taskSlug: foundRun.taskIdentifier,
-      context: foundRun.traceContext as Record<string, string | undefined>,
-      attributes: {
-        runId: foundRun.friendlyId,
-        ...attributes,
-      },
-      startTime: BigInt((startTime?.getTime() ?? Date.now()) * 1_000_000),
-      ...optionsRest,
-    });
-
-    return {
-      success: true,
-    };
-  } catch (error) {
-    logger.error("Failed to record event for run", {
-      error: error instanceof Error ? error.message : error,
-      runId,
-    });
-
-    return {
-      success: false,
-      code: "FAILED_TO_RECORD_EVENT",
-      error,
-    };
-  }
-}
-
-export async function recordRunDebugLog(
-  runId: string,
-  message: string,
-  options: Omit<TraceEventOptions, "environment" | "taskSlug" | "startTime"> & {
-    duration?: number;
-    parentId?: string;
-    startTime?: Date;
-  }
-): Promise<
-  | {
-      success: true;
-    }
-  | {
-      success: false;
-      code: "RUN_NOT_FOUND" | "FAILED_TO_RECORD_EVENT";
-      error?: unknown;
-    }
-> {
-  return recordRunEvent(runId, message, {
-    ...options,
-    attributes: {
-      ...options?.attributes,
-      isDebug: true,
-    },
-  });
-}
diff --git a/apps/webapp/app/v3/eventRepository/clickhouseEventRepository.server.ts b/apps/webapp/app/v3/eventRepository/clickhouseEventRepository.server.ts
new file mode 100644
index 00000000000..076a4fccf67
--- /dev/null
+++ b/apps/webapp/app/v3/eventRepository/clickhouseEventRepository.server.ts
@@ -0,0 +1,2100 @@
+import type {
+  ClickHouse,
+  TaskEventDetailedSummaryV1Result,
+  TaskEventDetailsV1Result,
+  TaskEventSummaryV1Result,
+  TaskEventV1Input,
+  TaskEventV2Input,
+} from "@internal/clickhouse";
+import { Attributes, startSpan, trace, Tracer } from "@internal/tracing";
+import { createJsonErrorObject } from "@trigger.dev/core/v3/errors";
+import { serializeTraceparent } from "@trigger.dev/core/v3/isomorphic";
+import {
+  AttemptFailedSpanEvent,
+  CancellationSpanEvent,
+  ExceptionSpanEvent,
+  isAttemptFailedSpanEvent,
+  isCancellationSpanEvent,
+  isExceptionSpanEvent,
+  OtherSpanEvent,
+  PRIMARY_VARIANT,
+  SpanEvents,
+  TaskEventStyle,
+  TaskRunError,
+} from "@trigger.dev/core/v3/schemas";
+import { SemanticInternalAttributes } from "@trigger.dev/core/v3/semanticInternalAttributes";
+import { unflattenAttributes } from "@trigger.dev/core/v3/utils/flattenAttributes";
+import { TaskEventLevel } from "@trigger.dev/database";
+import { logger } from "~/services/logger.server";
+import { DynamicFlushScheduler } from "../dynamicFlushScheduler.server";
+import { tracePubSub } from "../services/tracePubSub.server";
+import type { TaskEventStoreTable } from "../taskEventStore.server";
+import {
+  calculateDurationFromStart,
+  calculateDurationFromStartJsDate,
+  convertDateToNanoseconds,
+  createExceptionPropertiesFromError,
+  extractContextFromCarrier,
+  generateDeterministicSpanId,
+  generateSpanId,
+  generateTraceId,
+  getNowInNanoseconds,
+  parseEventsField,
+  removePrivateProperties,
+  isEmptyObject,
+} from "./common.server";
+import type {
+  CompleteableTaskRun,
+  CreateEventInput,
+  EventBuilder,
+  IEventRepository,
+  RunPreparedEvent,
+  SpanDetail,
+  SpanDetailedSummary,
+  SpanOverride,
+  SpanSummary,
+  SpanSummaryCommon,
+  TraceAttributes,
+  TraceDetailedSummary,
+  TraceEventOptions,
+  TraceSummary,
+} from "./eventRepository.types";
+
+export type ClickhouseEventRepositoryConfig = {
+  clickhouse: ClickHouse;
+  batchSize?: number;
+  flushInterval?: number;
+  insertStrategy?: "insert" | "insert_async";
+  waitForAsyncInsert?: boolean;
+  asyncInsertMaxDataSize?: number;
+  asyncInsertBusyTimeoutMs?: number;
+  tracer?: Tracer;
+  maximumTraceSummaryViewCount?: number;
+  maximumTraceDetailedSummaryViewCount?: number;
+  maximumLiveReloadingSetting?: number;
+  /**
+   * Maximum age in milliseconds for start_time. If start_time is older than this threshold,
+   * it will be clamped to the current time when creating events.
+   * If not provided, no clamping will be done.
+   */
+  startTimeMaxAgeMs?: number;
+  /**
+   * The version of the ClickHouse task_events table to use.
+   * - "v1": Uses task_events_v1 (partitioned by start_time)
+   * - "v2": Uses task_events_v2 (partitioned by inserted_at to avoid "too many parts" errors)
+   */
+  version?: "v1" | "v2";
+};
+
+/**
+ * ClickHouse-based implementation of the EventRepository.
+ * This implementation stores events in ClickHouse for better analytics and performance.
+ */
+export class ClickhouseEventRepository implements IEventRepository {
+  private _clickhouse: ClickHouse;
+  private _config: ClickhouseEventRepositoryConfig;
+  private readonly _flushScheduler: DynamicFlushScheduler<TaskEventV1Input | TaskEventV2Input>;
+  private _tracer: Tracer;
+  private _version: "v1" | "v2";
+
+  constructor(config: ClickhouseEventRepositoryConfig) {
+    this._clickhouse = config.clickhouse;
+    this._config = config;
+    this._tracer = config.tracer ?? trace.getTracer("clickhouseEventRepo", "0.0.1");
+    this._version = config.version ?? "v1";
+
+    this._flushScheduler = new DynamicFlushScheduler({
+      batchSize: config.batchSize ?? 1000,
+      flushInterval: config.flushInterval ?? 1000,
+      callback: this.#flushBatch.bind(this),
+      minConcurrency: 1,
+      maxConcurrency: 10,
+      maxBatchSize: 10000,
+      memoryPressureThreshold: 10000,
+      loadSheddingThreshold: 10000,
+      loadSheddingEnabled: false,
+      isDroppableEvent: (event: TaskEventV1Input | TaskEventV2Input) => {
+        // Only drop LOG events during load shedding
+        return event.kind === "DEBUG_EVENT";
+      },
+    });
+  }
+
+  get version() {
+    return this._version;
+  }
+
+  get maximumLiveReloadingSetting() {
+    return this._config.maximumLiveReloadingSetting ?? 1000;
+  }
+
+  /**
+   * Clamps a start time (in nanoseconds) to now if it's too far in the past.
+   * Returns the clamped value as a bigint.
+   */
+  #clampStartTimeNanoseconds(startTimeNs: bigint): bigint {
+    if (!this._config.startTimeMaxAgeMs) {
+      return startTimeNs;
+    }
+
+    const nowNs = getNowInNanoseconds();
+    const maxAgeNs = BigInt(this._config.startTimeMaxAgeMs) * 1_000_000n; // ms to ns
+    const minAllowedStartTime = nowNs - maxAgeNs;
+
+    if (startTimeNs < minAllowedStartTime) {
+      return nowNs;
+    }
+
+    return startTimeNs;
+  }
+
+  /**
+   * Clamps a start time string (nanoseconds as string) to now if it's too far in the past.
+   * Returns the formatted string for ClickHouse.
+   */
+  #clampAndFormatStartTime(startTimeNsString: string): string {
+    const startTimeNs = BigInt(startTimeNsString);
+    const clampedNs = this.#clampStartTimeNanoseconds(startTimeNs);
+    return formatClickhouseDate64NanosecondsEpochString(clampedNs.toString());
+  }
+
+  /**
+   * Clamps a Date start time to now if it's too far in the past.
+   */
+  #clampStartTimeDate(startTime: Date): Date {
+    if (!this._config.startTimeMaxAgeMs) {
+      return startTime;
+    }
+
+    const now = new Date();
+    const minAllowedStartTime = new Date(now.getTime() - this._config.startTimeMaxAgeMs);
+
+    if (startTime < minAllowedStartTime) {
+      return now;
+    }
+
+    return startTime;
+  }
+
+  async #flushBatch(flushId: string, events: (TaskEventV1Input | TaskEventV2Input)[]) {
+    await startSpan(this._tracer, "flushBatch", async (span) => {
+      span.setAttribute("flush_id", flushId);
+      span.setAttribute("event_count", events.length);
+      span.setAttribute("version", this._version);
+
+      const firstEvent = events[0];
+
+      if (firstEvent) {
+        logger.debug("ClickhouseEventRepository.flushBatch first event", {
+          event: firstEvent,
+          version: this._version,
+        });
+      }
+
+      const insertFn =
+        this._version === "v2"
+          ? this._clickhouse.taskEventsV2.insert
+          : this._clickhouse.taskEvents.insert;
+
+      const [insertError, insertResult] = await insertFn(events, {
+        params: {
+          clickhouse_settings: this.#getClickhouseInsertSettings(),
+        },
+      });
+
+      if (insertError) {
+        throw insertError;
+      }
+
+      logger.info("ClickhouseEventRepository.flushBatch Inserted batch into clickhouse", {
+        events: events.length,
+        insertResult,
+        version: this._version,
+      });
+
+      this.#publishToRedis(events);
+    });
+  }
+
+  #getClickhouseInsertSettings() {
+    if (this._config.insertStrategy === "insert") {
+      return {};
+    } else {
+      return {
+        async_insert: 1 as const,
+        async_insert_max_data_size: this._config.asyncInsertMaxDataSize?.toString() ?? "10485760",
+        async_insert_busy_timeout_ms: this._config.asyncInsertBusyTimeoutMs ?? 5000,
+        wait_for_async_insert: this._config.waitForAsyncInsert ? (1 as const) : (0 as const),
+      };
+    }
+  }
+
+  async #publishToRedis(events: (TaskEventV1Input | TaskEventV2Input)[]) {
+    if (events.length === 0) return;
+    await tracePubSub.publish(events.map((e) => e.trace_id));
+  }
+
+  async insertMany(events: CreateEventInput[]): Promise<void> {
+    this.addToBatch(events.flatMap((event) => this.createEventToTaskEventV1Input(event)));
+  }
+
+  async insertManyImmediate(events: CreateEventInput[]): Promise<void> {
+    this.insertMany(events);
+  }
+
+  private createEventToTaskEventV1Input(event: CreateEventInput): TaskEventV1Input[] {
+    return [
+      {
+        environment_id: event.environmentId,
+        organization_id: event.organizationId,
+        project_id: event.projectId,
+        task_identifier: event.taskSlug,
+        run_id: event.runId,
+        start_time: this.#clampAndFormatStartTime(event.startTime.toString()),
+        duration: formatClickhouseUnsignedIntegerString(event.duration ?? 0),
+        trace_id: event.traceId,
+        span_id: event.spanId,
+        parent_span_id: event.parentId ?? "",
+        message: event.message,
+        kind: this.createEventToTaskEventV1InputKind(event),
+        status: this.createEventToTaskEventV1InputStatus(event),
+        attributes: this.createEventToTaskEventV1InputAttributes(
+          event.properties,
+          event.resourceProperties
+        ),
+        metadata: this.createEventToTaskEventV1InputMetadata(event),
+        expires_at: convertDateToClickhouseDateTime(
+          new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) // 1 year
+        ),
+        machine_id: event.machineId ?? "",
+      },
+      ...this.spanEventsToTaskEventV1Input(event),
+    ];
+  }
+
+  private spanEventsToTaskEventV1Input(event: CreateEventInput): TaskEventV1Input[] {
+    if (!event.events) return [];
+
+    const spanEvents = parseEventsField(event.events);
+
+    const records = spanEvents.map((e) => this.createTaskEventV1InputFromSpanEvent(e, event));
+
+    if (event.isPartial) {
+      return records;
+    }
+
+    // Only return events where the event start_time is greater than the span start_time
+    return records.filter(
+      (r) =>
+        convertClickhouseDate64NanosecondsEpochStringToBigInt(r.start_time) >
+        BigInt(event.startTime)
+    );
+  }
+
+  private createTaskEventV1InputFromSpanEvent(
+    spanEvent: SpanEvents[number],
+    event: CreateEventInput
+  ): TaskEventV1Input {
+    if (isExceptionSpanEvent(spanEvent)) {
+      return this.createTaskEventV1InputFromExceptionEvent(spanEvent, event);
+    }
+
+    if (isCancellationSpanEvent(spanEvent)) {
+      return this.createTaskEventV1InputFromCancellationEvent(spanEvent, event);
+    }
+
+    if (isAttemptFailedSpanEvent(spanEvent)) {
+      return this.createTaskEventV1InputFromAttemptFailedEvent(spanEvent, event);
+    }
+
+    return this.createTaskEventV1InputFromOtherEvent(spanEvent, event);
+  }
+
+  private createTaskEventV1InputFromExceptionEvent(
+    spanEvent: ExceptionSpanEvent,
+    event: CreateEventInput
+  ): TaskEventV1Input {
+    return {
+      environment_id: event.environmentId,
+      organization_id: event.organizationId,
+      project_id: event.projectId,
+      task_identifier: event.taskSlug,
+      run_id: event.runId,
+      start_time: this.#clampAndFormatStartTime(
+        convertDateToNanoseconds(spanEvent.time).toString()
+      ),
+      duration: "0", // Events have no duration
+      trace_id: event.traceId,
+      span_id: event.spanId,
+      parent_span_id: event.parentId ?? "",
+      message: spanEvent.name,
+      kind: "SPAN_EVENT",
+      status: "ERROR",
+      attributes: {
+        error: {
+          message: spanEvent.properties.exception.message,
+          name: spanEvent.properties.exception.type,
+          stackTrace: spanEvent.properties.exception.stacktrace,
+        },
+      },
+      metadata: JSON.stringify({
+        exception: spanEvent.properties.exception,
+      }), // Events have no metadata
+      expires_at: convertDateToClickhouseDateTime(
+        new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) // 1 year
+      ),
+    };
+  }
+
+  private createTaskEventV1InputFromCancellationEvent(
+    spanEvent: CancellationSpanEvent,
+    event: CreateEventInput
+  ): TaskEventV1Input {
+    return {
+      environment_id: event.environmentId,
+      organization_id: event.organizationId,
+      project_id: event.projectId,
+      task_identifier: event.taskSlug,
+      run_id: event.runId,
+      start_time: this.#clampAndFormatStartTime(
+        convertDateToNanoseconds(spanEvent.time).toString()
+      ),
+      duration: "0", // Events have no duration
+      trace_id: event.traceId,
+      span_id: event.spanId,
+      parent_span_id: event.parentId ?? "",
+      message: spanEvent.name,
+      kind: "SPAN_EVENT",
+      status: "CANCELLED",
+      attributes: {},
+      metadata: JSON.stringify({
+        reason: spanEvent.properties.reason,
+      }), // Events have no metadata
+      expires_at: convertDateToClickhouseDateTime(
+        new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) // 1 year
+      ),
+    };
+  }
+
+  private createTaskEventV1InputFromAttemptFailedEvent(
+    spanEvent: AttemptFailedSpanEvent,
+    event: CreateEventInput
+  ): TaskEventV1Input {
+    return {
+      environment_id: event.environmentId,
+      organization_id: event.organizationId,
+      project_id: event.projectId,
+      task_identifier: event.taskSlug,
+      run_id: event.runId,
+      start_time: this.#clampAndFormatStartTime(
+        convertDateToNanoseconds(spanEvent.time).toString()
+      ),
+      duration: "0", // Events have no duration
+      trace_id: event.traceId,
+      span_id: event.spanId,
+      parent_span_id: event.parentId ?? "",
+      message: spanEvent.name,
+      kind: "ANCESTOR_OVERRIDE",
+      status: "OK",
+      attributes: {
+        error: {
+          message: spanEvent.properties.exception.message,
+          name: spanEvent.properties.exception.type,
+          stackTrace: spanEvent.properties.exception.stacktrace,
+        },
+      },
+      metadata: JSON.stringify(spanEvent.properties),
+      expires_at: convertDateToClickhouseDateTime(
+        new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) // 1 year
+      ),
+    };
+  }
+
+  private createTaskEventV1InputFromOtherEvent(
+    spanEvent: OtherSpanEvent,
+    event: CreateEventInput
+  ): TaskEventV1Input {
+    return {
+      environment_id: event.environmentId,
+      organization_id: event.organizationId,
+      project_id: event.projectId,
+      task_identifier: event.taskSlug,
+      run_id: event.runId,
+      start_time: this.#clampAndFormatStartTime(
+        convertDateToNanoseconds(spanEvent.time).toString()
+      ),
+      duration: "0", // Events have no duration
+      trace_id: event.traceId,
+      span_id: event.spanId,
+      parent_span_id: event.parentId ?? "",
+      message: spanEvent.name,
+      kind: "SPAN_EVENT",
+      status: "OK",
+      attributes: {},
+      metadata: JSON.stringify(unflattenAttributes(spanEvent.properties as Attributes)),
+      expires_at: convertDateToClickhouseDateTime(
+        new Date(Date.now() + 365 * 24 * 60 * 60 * 1000) // 1 year
+      ),
+    };
+  }
+
+  private createEventToTaskEventV1InputKind(event: CreateEventInput): string {
+    if (event.kind === "UNSPECIFIED") {
+      return "ANCESTOR_OVERRIDE";
+    }
+
+    if (event.level === "TRACE") {
+      return "SPAN";
+    }
+
+    if (event.isDebug) {
+      return "DEBUG_EVENT";
+    }
+
+    return `LOG_${(event.level ?? "LOG").toUpperCase()}`;
+  }
+
+  private createEventToTaskEventV1InputStatus(event: CreateEventInput): string {
+    if (event.isPartial) {
+      return "PARTIAL";
+    }
+
+    if (event.isError) {
+      return "ERROR";
+    }
+
+    if (event.isCancelled) {
+      return "CANCELLED";
+    }
+
+    return "OK";
+  }
+
+  private createEventToTaskEventV1InputAttributes(
+    attributes: Attributes,
+    resourceAttributes?: Attributes
+  ): Record<string, unknown> {
+    if (!attributes && !resourceAttributes) {
+      return {};
+    }
+
+    return {
+      ...this.createAttributesToInputAttributes(attributes),
+      ...this.createAttributesToInputAttributes(resourceAttributes, "$resource"),
+    };
+  }
+
+  private createAttributesToInputAttributes(
+    attributes: Attributes | undefined,
+    key?: string
+  ): Record<string, unknown> {
+    if (!attributes) {
+      return {};
+    }
+
+    const publicAttributes = removePrivateProperties(attributes);
+
+    if (!publicAttributes) {
+      return {};
+    }
+
+    const unflattenedAttributes = unflattenAttributes(publicAttributes);
+
+    if (unflattenedAttributes && typeof unflattenedAttributes === "object") {
+      if (key) {
+        return {
+          [key]: unflattenedAttributes,
+        };
+      }
+
+      return {
+        ...unflattenedAttributes,
+      };
+    }
+
+    return {};
+  }
+
+  private createEventToTaskEventV1InputMetadata(event: CreateEventInput): string {
+    return JSON.stringify({
+      style: event.style ? unflattenAttributes(event.style) : undefined,
+      attemptNumber: event.attemptNumber,
+      entity: this.extractEntityFromAttributes(event.properties),
+    });
+  }
+
+  private extractEntityFromAttributes(
+    attributes: Attributes
+  ): { entityType: string; entityId?: string; entityMetadata?: string } | undefined {
+    if (!attributes || typeof attributes !== "object") {
+      return undefined;
+    }
+
+    const entityType = attributes[SemanticInternalAttributes.ENTITY_TYPE];
+    const entityId = attributes[SemanticInternalAttributes.ENTITY_ID];
+    const entityMetadata = attributes[SemanticInternalAttributes.ENTITY_METADATA];
+
+    if (typeof entityType !== "string") {
+      return undefined;
+    }
+
+    return {
+      entityType,
+      entityId: entityId as string | undefined,
+      entityMetadata: entityMetadata as string | undefined,
+    };
+  }
+
+  private addToBatch(events: TaskEventV1Input[] | TaskEventV1Input) {
+    this._flushScheduler.addToBatch(Array.isArray(events) ? events : [events]);
+  }
+
+  // Event recording methods
+  async recordEvent(
+    message: string,
+    options: TraceEventOptions & { duration?: number; parentId?: string }
+  ): Promise<void> {
+    const propagatedContext = extractContextFromCarrier(options.context ?? {});
+
+    const startTime = options.startTime ?? getNowInNanoseconds();
+    const duration =
+      options.duration ??
+      (options.endTime
+        ? calculateDurationFromStart(startTime, options.endTime, 100 * 1_000_000)
+        : 100);
+
+    const traceId = propagatedContext?.traceparent?.traceId ?? generateTraceId();
+    const parentId = options.parentId ?? propagatedContext?.traceparent?.spanId;
+    const spanId = options.spanIdSeed
+      ? generateDeterministicSpanId(traceId, options.spanIdSeed)
+      : generateSpanId();
+
+    if (!options.attributes.runId) {
+      throw new Error("runId is required");
+    }
+
+    const kind = options.attributes.isDebug ? "DEBUG_EVENT" : "SPAN";
+
+    const metadata = {
+      style: {
+        icon: options.attributes.isDebug ? "warn" : "play",
+      },
+      ...options.attributes.metadata,
+    };
+
+    const event: TaskEventV1Input = {
+      environment_id: options.environment.id,
+      organization_id: options.environment.organizationId,
+      project_id: options.environment.projectId,
+      task_identifier: options.taskSlug,
+      run_id: options.attributes.runId,
+      start_time: this.#clampAndFormatStartTime(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(duration),
+      trace_id: traceId,
+      span_id: spanId,
+      parent_span_id: parentId ?? "",
+      message,
+      kind,
+      status: "OK",
+      attributes: options.attributes.properties
+        ? this.createEventToTaskEventV1InputAttributes(options.attributes.properties)
+        : undefined,
+      metadata: JSON.stringify(metadata),
+      // TODO: make sure configurable and by org
+      expires_at: convertDateToClickhouseDateTime(new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)),
+    };
+
+    this._flushScheduler.addToBatch([event]);
+  }
+
+  async traceEvent<TResult>(
+    message: string,
+    options: TraceEventOptions & { incomplete?: boolean; isError?: boolean },
+    callback: (
+      e: EventBuilder,
+      traceContext: Record<string, string | undefined>,
+      traceparent?: { traceId: string; spanId: string }
+    ) => Promise<TResult>
+  ): Promise<TResult> {
+    const propagatedContext = extractContextFromCarrier(options.context ?? {});
+
+    const start = process.hrtime.bigint();
+    const startTime = options.startTime ?? getNowInNanoseconds();
+
+    const traceId = options.spanParentAsLink
+      ? generateTraceId()
+      : propagatedContext?.traceparent?.traceId ?? generateTraceId();
+    const parentId = options.spanParentAsLink ? undefined : propagatedContext?.traceparent?.spanId;
+    const spanId = options.spanIdSeed
+      ? generateDeterministicSpanId(traceId, options.spanIdSeed)
+      : generateSpanId();
+
+    const traceContext = {
+      ...options.context,
+      traceparent: serializeTraceparent(traceId, spanId),
+    };
+
+    let isStopped = false;
+    let failedWithError: TaskRunError | undefined;
+
+    const eventBuilder = {
+      traceId,
+      spanId,
+      setAttribute: (key: keyof TraceAttributes, value: TraceAttributes[keyof TraceAttributes]) => {
+        if (value) {
+          // We need to merge the attributes with the existing attributes
+          const existingValue = options.attributes[key];
+
+          if (existingValue && typeof existingValue === "object" && typeof value === "object") {
+            // @ts-ignore
+            options.attributes[key] = { ...existingValue, ...value };
+          } else {
+            // @ts-ignore
+            options.attributes[key] = value;
+          }
+        }
+      },
+      stop: () => {
+        isStopped = true;
+      },
+      failWithError: (error: TaskRunError) => {
+        failedWithError = error;
+      },
+    };
+
+    const result = await callback(eventBuilder, traceContext, propagatedContext?.traceparent);
+
+    if (isStopped) {
+      return result;
+    }
+
+    const duration = process.hrtime.bigint() - start;
+
+    if (!options.attributes.runId) {
+      throw new Error("runId is required");
+    }
+
+    const metadata = {
+      style: {
+        icon: "task",
+        variant: PRIMARY_VARIANT,
+        ...options.attributes.style,
+      },
+      ...options.attributes.metadata,
+    };
+
+    const event: TaskEventV1Input = {
+      environment_id: options.environment.id,
+      organization_id: options.environment.organizationId,
+      project_id: options.environment.projectId,
+      task_identifier: options.taskSlug,
+      run_id: options.attributes.runId,
+      start_time: this.#clampAndFormatStartTime(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(options.incomplete ? 0 : duration),
+      trace_id: traceId,
+      span_id: spanId,
+      parent_span_id: parentId ?? "",
+      message,
+      kind: "SPAN",
+      status: failedWithError ? "ERROR" : options.incomplete ? "PARTIAL" : "OK",
+      attributes: options.attributes.properties
+        ? this.createEventToTaskEventV1InputAttributes(options.attributes.properties)
+        : {},
+      metadata: JSON.stringify(metadata),
+      // TODO: make sure configurable and by org
+      expires_at: convertDateToClickhouseDateTime(new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)),
+    };
+
+    const events = [event];
+
+    if (failedWithError) {
+      const error = createJsonErrorObject(failedWithError);
+
+      events.push({
+        environment_id: options.environment.id,
+        organization_id: options.environment.organizationId,
+        project_id: options.environment.projectId,
+        task_identifier: options.taskSlug,
+        run_id: options.attributes.runId,
+        start_time: this.#clampAndFormatStartTime(startTime.toString()),
+        duration: formatClickhouseUnsignedIntegerString(options.incomplete ? 0 : duration),
+        trace_id: traceId,
+        span_id: spanId,
+        parent_span_id: parentId ?? "",
+        message: "exception",
+        kind: "SPAN_EVENT",
+        status: "ERROR",
+        attributes: {
+          error,
+        },
+        metadata: JSON.stringify({
+          exception: createExceptionPropertiesFromError(failedWithError),
+        }),
+        // TODO: make sure configurable and by org
+        expires_at: convertDateToClickhouseDateTime(
+          new Date(Date.now() + 365 * 24 * 60 * 60 * 1000)
+        ),
+      });
+    }
+
+    this._flushScheduler.addToBatch(events);
+
+    return result;
+  }
+
+  // Run event completion methods
+  async completeSuccessfulRunEvent({
+    run,
+    endTime,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+  }): Promise<void> {
+    if (!run.organizationId) {
+      return;
+    }
+
+    const clampedCreatedAt = this.#clampStartTimeDate(run.createdAt);
+    const startTime = convertDateToNanoseconds(clampedCreatedAt);
+    const expiresAt = convertDateToClickhouseDateTime(
+      new Date(run.createdAt.getTime() + 30 * 24 * 60 * 60 * 1000)
+    );
+
+    const event: TaskEventV1Input = {
+      environment_id: run.runtimeEnvironmentId,
+      organization_id: run.organizationId,
+      project_id: run.projectId,
+      task_identifier: run.taskIdentifier,
+      run_id: run.friendlyId,
+      start_time: formatClickhouseDate64NanosecondsEpochString(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(
+        calculateDurationFromStart(startTime, endTime ?? new Date())
+      ),
+      trace_id: run.traceId,
+      span_id: run.spanId,
+      parent_span_id: run.parentSpanId ?? "",
+      message: run.taskIdentifier,
+      kind: "SPAN",
+      status: "OK",
+      attributes: {},
+      metadata: "{}",
+      expires_at: expiresAt,
+    };
+
+    this.addToBatch(event);
+  }
+
+  async completeCachedRunEvent({
+    run,
+    blockedRun,
+    spanId,
+    parentSpanId,
+    spanCreatedAt,
+    isError,
+    endTime,
+  }: {
+    run: CompleteableTaskRun;
+    blockedRun: CompleteableTaskRun;
+    spanId: string;
+    parentSpanId: string;
+    spanCreatedAt: Date;
+    isError: boolean;
+    endTime?: Date;
+  }): Promise<void> {
+    if (!run.organizationId) {
+      return;
+    }
+
+    const clampedSpanCreatedAt = this.#clampStartTimeDate(spanCreatedAt);
+    const startTime = convertDateToNanoseconds(clampedSpanCreatedAt);
+    const expiresAt = convertDateToClickhouseDateTime(
+      new Date(run.createdAt.getTime() + 30 * 24 * 60 * 60 * 1000)
+    );
+
+    const event: TaskEventV1Input = {
+      environment_id: run.runtimeEnvironmentId,
+      organization_id: run.organizationId,
+      project_id: run.projectId,
+      task_identifier: run.taskIdentifier,
+      run_id: blockedRun.friendlyId,
+      start_time: formatClickhouseDate64NanosecondsEpochString(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(
+        calculateDurationFromStart(startTime, endTime ?? new Date())
+      ),
+      trace_id: blockedRun.traceId,
+      span_id: spanId,
+      parent_span_id: parentSpanId,
+      message: run.taskIdentifier,
+      kind: "SPAN",
+      status: isError ? "ERROR" : "OK",
+      attributes: {},
+      metadata: "{}",
+      expires_at: expiresAt,
+    };
+
+    this.addToBatch(event);
+  }
+
+  async completeFailedRunEvent({
+    run,
+    endTime,
+    exception,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    exception: { message?: string; type?: string; stacktrace?: string };
+  }): Promise<void> {
+    if (!run.organizationId) {
+      return;
+    }
+
+    const clampedCreatedAt = this.#clampStartTimeDate(run.createdAt);
+    const startTime = convertDateToNanoseconds(clampedCreatedAt);
+    const expiresAt = convertDateToClickhouseDateTime(
+      new Date(run.createdAt.getTime() + 30 * 24 * 60 * 60 * 1000)
+    );
+
+    const event: TaskEventV1Input = {
+      environment_id: run.runtimeEnvironmentId,
+      organization_id: run.organizationId,
+      project_id: run.projectId,
+      task_identifier: run.taskIdentifier,
+      run_id: run.friendlyId,
+      start_time: formatClickhouseDate64NanosecondsEpochString(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(
+        calculateDurationFromStart(startTime, endTime ?? new Date())
+      ),
+      trace_id: run.traceId,
+      span_id: run.spanId,
+      parent_span_id: run.parentSpanId ?? "",
+      message: run.taskIdentifier,
+      kind: "SPAN",
+      status: "ERROR",
+      attributes: {
+        error: {
+          name: exception.type,
+          message: exception.message,
+          stackTrace: exception.stacktrace,
+        },
+      },
+      metadata: "{}",
+      expires_at: expiresAt,
+    };
+
+    this.addToBatch(event);
+  }
+
+  async completeExpiredRunEvent({
+    run,
+    endTime,
+    ttl,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    ttl: string;
+  }): Promise<void> {
+    if (!run.organizationId) {
+      return;
+    }
+
+    const clampedCreatedAt = this.#clampStartTimeDate(run.createdAt);
+    const startTime = convertDateToNanoseconds(clampedCreatedAt);
+    const expiresAt = convertDateToClickhouseDateTime(
+      new Date(run.createdAt.getTime() + 30 * 24 * 60 * 60 * 1000)
+    );
+
+    const event: TaskEventV1Input = {
+      environment_id: run.runtimeEnvironmentId,
+      organization_id: run.organizationId,
+      project_id: run.projectId,
+      task_identifier: run.taskIdentifier,
+      run_id: run.friendlyId,
+      start_time: formatClickhouseDate64NanosecondsEpochString(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(
+        calculateDurationFromStart(startTime, endTime ?? new Date())
+      ),
+      trace_id: run.traceId,
+      span_id: run.spanId,
+      parent_span_id: run.parentSpanId ?? "",
+      message: run.taskIdentifier,
+      kind: "SPAN",
+      status: "ERROR",
+      attributes: {
+        error: {
+          message: `Run expired because the TTL (${ttl}) was reached`,
+        },
+      },
+      metadata: "{}",
+      expires_at: expiresAt,
+    };
+
+    this.addToBatch(event);
+  }
+
+  async createAttemptFailedRunEvent({
+    run,
+    endTime,
+    attemptNumber,
+    exception,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    attemptNumber: number;
+    exception: { message?: string; type?: string; stacktrace?: string };
+  }): Promise<void> {
+    if (!run.organizationId) {
+      return;
+    }
+
+    const clampedEndTime = this.#clampStartTimeDate(endTime ?? new Date());
+    const startTime = convertDateToNanoseconds(clampedEndTime);
+    const expiresAt = convertDateToClickhouseDateTime(
+      new Date(run.createdAt.getTime() + 30 * 24 * 60 * 60 * 1000)
+    );
+
+    const event: TaskEventV1Input = {
+      environment_id: run.runtimeEnvironmentId,
+      organization_id: run.organizationId,
+      project_id: run.projectId,
+      task_identifier: run.taskIdentifier,
+      run_id: run.friendlyId,
+      start_time: formatClickhouseDate64NanosecondsEpochString(startTime.toString()),
+      duration: "0",
+      trace_id: run.traceId,
+      span_id: run.spanId,
+      parent_span_id: run.parentSpanId ?? "",
+      message: "attempt_failed",
+      kind: "ANCESTOR_OVERRIDE",
+      status: "OK",
+      attributes: {},
+      metadata: JSON.stringify({
+        exception,
+        attemptNumber,
+        runId: run.friendlyId,
+      }),
+      expires_at: expiresAt,
+    };
+
+    this.addToBatch(event);
+  }
+
+  async cancelRunEvent({
+    reason,
+    run,
+    cancelledAt,
+  }: {
+    reason: string;
+    run: CompleteableTaskRun;
+    cancelledAt: Date;
+  }): Promise<void> {
+    if (!run.organizationId) {
+      return;
+    }
+
+    const clampedCreatedAt = this.#clampStartTimeDate(run.createdAt);
+    const startTime = convertDateToNanoseconds(clampedCreatedAt);
+    const expiresAt = convertDateToClickhouseDateTime(
+      new Date(run.createdAt.getTime() + 30 * 24 * 60 * 60 * 1000)
+    );
+
+    const event: TaskEventV1Input = {
+      environment_id: run.runtimeEnvironmentId,
+      organization_id: run.organizationId,
+      project_id: run.projectId,
+      task_identifier: run.taskIdentifier,
+      run_id: run.friendlyId,
+      start_time: formatClickhouseDate64NanosecondsEpochString(startTime.toString()),
+      duration: formatClickhouseUnsignedIntegerString(
+        calculateDurationFromStart(startTime, cancelledAt)
+      ),
+      trace_id: run.traceId,
+      span_id: run.spanId,
+      parent_span_id: run.parentSpanId ?? "",
+      message: run.taskIdentifier,
+      kind: "SPAN",
+      status: "CANCELLED",
+      attributes: {},
+      metadata: JSON.stringify({
+        reason,
+      }),
+      expires_at: expiresAt,
+    };
+
+    this.addToBatch(event);
+  }
+
+  // Query methods
+  async getTraceSummary(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<TraceSummary | undefined> {
+    const startCreatedAtWithBuffer = new Date(startCreatedAt.getTime() - 60_000);
+    const endCreatedAtWithBuffer = endCreatedAt
+      ? new Date(endCreatedAt.getTime() + 60_000)
+      : undefined;
+
+    const queryBuilder =
+      this._version === "v2"
+        ? this._clickhouse.taskEventsV2.traceSummaryQueryBuilder()
+        : this._clickhouse.taskEvents.traceSummaryQueryBuilder();
+
+    queryBuilder.where("environment_id = {environmentId: String}", { environmentId });
+    queryBuilder.where("trace_id = {traceId: String}", { traceId });
+    queryBuilder.where("start_time >= {startCreatedAt: String}", {
+      startCreatedAt: convertDateToNanoseconds(startCreatedAtWithBuffer).toString(),
+    });
+
+    if (endCreatedAtWithBuffer) {
+      queryBuilder.where("start_time <= {endCreatedAt: String}", {
+        endCreatedAt: convertDateToNanoseconds(endCreatedAtWithBuffer).toString(),
+      });
+    }
+
+    // For v2, add inserted_at filtering for partition pruning
+    if (this._version === "v2") {
+      queryBuilder.where("inserted_at >= {insertedAtStart: DateTime64(3)}", {
+        insertedAtStart: convertDateToClickhouseDateTime(startCreatedAtWithBuffer),
+      });
+      // No upper bound on inserted_at - we want all events inserted up to now
+    }
+
+    if (options?.includeDebugLogs === false) {
+      queryBuilder.where("kind != {kind: String}", { kind: "DEBUG_EVENT" });
+    }
+
+    queryBuilder.orderBy("start_time ASC");
+
+    if (this._config.maximumTraceSummaryViewCount) {
+      queryBuilder.limit(this._config.maximumTraceSummaryViewCount);
+    }
+
+    const [queryError, records] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
+    }
+
+    if (!records) {
+      return;
+    }
+
+    // O(n) grouping instead of O(n²) array spreading
+    const recordsGroupedBySpanId: Record<string, TaskEventSummaryV1Result[]> = {};
+    for (const record of records) {
+      if (!recordsGroupedBySpanId[record.span_id]) {
+        recordsGroupedBySpanId[record.span_id] = [];
+      }
+      recordsGroupedBySpanId[record.span_id].push(record);
+    }
+
+    const spanSummaries = new Map<string, SpanSummary>();
+    let rootSpanId: string | undefined;
+
+    // Create temporary metadata cache for this query
+    const metadataCache = new Map<string, Record<string, unknown>>();
+
+    for (const [spanId, spanRecords] of Object.entries(recordsGroupedBySpanId)) {
+      const spanSummary = this.#mergeRecordsIntoSpanSummary(spanId, spanRecords, metadataCache);
+
+      if (!spanSummary) {
+        continue;
+      }
+
+      spanSummaries.set(spanId, spanSummary);
+
+      if (!rootSpanId && !spanSummary.parentId) {
+        rootSpanId = spanId;
+      }
+    }
+
+    if (!rootSpanId) {
+      return;
+    }
+
+    const spans = Array.from(spanSummaries.values());
+    const rootSpan = spanSummaries.get(rootSpanId);
+
+    if (!rootSpan) {
+      return;
+    }
+
+    const overridesBySpanId: Record<string, SpanOverride> = {};
+
+    const finalSpans = spans.map((span) => {
+      return this.#applyAncestorOverrides(span, spanSummaries, overridesBySpanId);
+    });
+
+    return {
+      rootSpan,
+      spans: finalSpans,
+      overridesBySpanId,
+    };
+  }
+
+  async getSpan(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    spanId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<SpanDetail | undefined> {
+    const startCreatedAtWithBuffer = new Date(startCreatedAt.getTime() - 1000);
+
+    const queryBuilder =
+      this._version === "v2"
+        ? this._clickhouse.taskEventsV2.spanDetailsQueryBuilder()
+        : this._clickhouse.taskEvents.spanDetailsQueryBuilder();
+
+    queryBuilder.where("environment_id = {environmentId: String}", { environmentId });
+    queryBuilder.where("trace_id = {traceId: String}", { traceId });
+    queryBuilder.where("span_id = {spanId: String}", { spanId });
+    queryBuilder.where("start_time >= {startCreatedAt: String}", {
+      startCreatedAt: convertDateToNanoseconds(startCreatedAtWithBuffer).toString(),
+    });
+
+    if (endCreatedAt) {
+      queryBuilder.where("start_time <= {endCreatedAt: String}", {
+        endCreatedAt: convertDateToNanoseconds(endCreatedAt).toString(),
+      });
+    }
+
+    // For v2, add inserted_at filtering for partition pruning
+    if (this._version === "v2") {
+      queryBuilder.where("inserted_at >= {insertedAtStart: DateTime64(3)}", {
+        insertedAtStart: convertDateToClickhouseDateTime(startCreatedAtWithBuffer),
+      });
+    }
+
+    queryBuilder.orderBy("start_time ASC");
+
+    const [queryError, records] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
+    }
+
+    if (!records) {
+      return;
+    }
+
+    // Create temporary metadata cache for this query
+    const metadataCache = new Map<string, Record<string, unknown>>();
+    const span = this.#mergeRecordsIntoSpanDetail(spanId, records, metadataCache);
+
+    return span;
+  }
+
+  #mergeRecordsIntoSpanDetail(
+    spanId: string,
+    records: TaskEventDetailsV1Result[],
+    metadataCache: Map<string, Record<string, unknown>>
+  ): SpanDetail | undefined {
+    if (records.length === 0) {
+      return undefined;
+    }
+
+    let span: SpanDetail | undefined;
+    let earliestStartTime: Date | undefined;
+
+    for (const record of records) {
+      const recordStartTime = convertClickhouseDateTime64ToJsDate(record.start_time);
+
+      // Track the earliest start time across all records
+      if (
+        record.kind !== "ANCESTOR_OVERRIDE" &&
+        record.kind !== "SPAN_EVENT" &&
+        (!earliestStartTime || recordStartTime < earliestStartTime)
+      ) {
+        earliestStartTime = recordStartTime;
+      }
+
+      if (!span) {
+        span = {
+          spanId: spanId,
+          parentId: record.parent_span_id ? record.parent_span_id : null,
+          message: record.message,
+          isError: false,
+          isPartial: true, // Partial by default, can only be set to false
+          isCancelled: false,
+          level: kindToLevel(record.kind),
+          startTime: recordStartTime,
+          duration: typeof record.duration === "number" ? record.duration : Number(record.duration),
+          events: [],
+          style: {},
+          properties: undefined,
+          resourceProperties: undefined,
+          entity: {
+            type: undefined,
+            id: undefined,
+            metadata: undefined,
+          },
+          metadata: {},
+        };
+      }
+
+      if (isLogEvent(record.kind)) {
+        span.isPartial = false;
+        span.isCancelled = false;
+        span.isError = record.status === "ERROR";
+      }
+
+      const parsedMetadata = this.#parseMetadata(record.metadata, metadataCache);
+
+      if (record.kind === "SPAN_EVENT") {
+        // We need to add an event to the span
+        span.events.push({
+          name: record.message,
+          time: recordStartTime,
+          properties: parsedMetadata ?? {},
+        });
+      }
+
+      if (parsedMetadata && "style" in parsedMetadata && parsedMetadata.style) {
+        span.style = parsedMetadata.style as TaskEventStyle;
+      }
+
+      if (
+        parsedMetadata &&
+        "entity" in parsedMetadata &&
+        typeof parsedMetadata.entity === "object" &&
+        parsedMetadata.entity &&
+        "entityType" in parsedMetadata.entity &&
+        typeof parsedMetadata.entity.entityType === "string" &&
+        "entityId" in parsedMetadata.entity &&
+        typeof parsedMetadata.entity.entityId === "string"
+      ) {
+        span.entity = {
+          id: parsedMetadata.entity.entityId,
+          type: parsedMetadata.entity.entityType,
+          metadata:
+            "entityMetadata" in parsedMetadata.entity &&
+            parsedMetadata.entity.entityMetadata &&
+            typeof parsedMetadata.entity.entityMetadata === "string"
+              ? parsedMetadata.entity.entityMetadata
+              : undefined,
+        };
+      }
+
+      if (record.kind === "SPAN") {
+        if (record.status === "ERROR") {
+          span.isError = true;
+          span.isPartial = false;
+          span.isCancelled = false;
+        } else if (record.status === "CANCELLED") {
+          span.isCancelled = true;
+          span.isPartial = false;
+          span.isError = false;
+        } else if (record.status === "OK") {
+          span.isPartial = false;
+        }
+
+        if (record.status !== "PARTIAL") {
+          span.duration =
+            typeof record.duration === "number" ? record.duration : Number(record.duration);
+        } else {
+          span.message = record.message;
+        }
+      }
+
+      if (
+        (span.properties == null ||
+          (typeof span.properties === "object" && Object.keys(span.properties).length === 0)) &&
+        typeof record.attributes_text === "string"
+      ) {
+        const parsedAttributes = this.#parseAttributes(record.attributes_text);
+        const resourceAttributes = parsedAttributes["$resource"];
+
+        // Remove the $resource key from the attributes
+        delete parsedAttributes["$resource"];
+
+        span.properties = parsedAttributes;
+        span.resourceProperties = resourceAttributes as Record<string, unknown> | undefined;
+      }
+    }
+
+    // Always use the earliest start time found across all records
+    if (span && earliestStartTime) {
+      span.startTime = earliestStartTime;
+    }
+
+    return span;
+  }
+
+  #parseAttributes(attributes_text: string): Record<string, unknown> {
+    if (!attributes_text) {
+      return {};
+    }
+
+    return JSON.parse(attributes_text) as Record<string, unknown>;
+  }
+
+  #applyAncestorOverrides<TSpanSummary extends SpanSummaryCommon>(
+    span: TSpanSummary,
+    spansById: Map<string, TSpanSummary>,
+    overridesBySpanId: Record<string, SpanOverride>
+  ): TSpanSummary {
+    if (span.data.level !== "TRACE") {
+      return span;
+    }
+
+    if (!span.data.isPartial) {
+      return span;
+    }
+
+    if (!span.parentId) {
+      return span;
+    }
+
+    // Now we need to walk the ancestors of the span by span.parentId
+    // The first ancestor that is a TRACE span that is "closed" we will use to override the span
+    let parentSpanId: string | undefined = span.parentId;
+    let overrideSpan: TSpanSummary | undefined;
+
+    while (parentSpanId) {
+      const parentSpan = spansById.get(parentSpanId);
+
+      if (!parentSpan) {
+        break;
+      }
+
+      if (parentSpan.data.level === "TRACE" && !parentSpan.data.isPartial) {
+        overrideSpan = parentSpan;
+        break;
+      }
+
+      parentSpanId = parentSpan.parentId;
+    }
+
+    if (overrideSpan) {
+      return this.#applyAncestorToSpan(span, overrideSpan, overridesBySpanId);
+    }
+
+    return span;
+  }
+
+  #applyAncestorToSpan<TSpanSummary extends SpanSummaryCommon>(
+    span: TSpanSummary,
+    overrideSpan: TSpanSummary,
+    overridesBySpanId: Record<string, SpanOverride>
+  ): TSpanSummary {
+    if (overridesBySpanId[span.id]) {
+      return span;
+    }
+
+    let override: SpanOverride | undefined = undefined;
+
+    const overrideEndTime = calculateEndTimeFromStartTime(
+      overrideSpan.data.startTime,
+      overrideSpan.data.duration
+    );
+
+    if (overrideSpan.data.isCancelled) {
+      override = {
+        isCancelled: true,
+        duration: calculateDurationFromStartJsDate(span.data.startTime, overrideEndTime),
+      };
+
+      span.data.isCancelled = true;
+      span.data.isPartial = false;
+      span.data.isError = false;
+      span.data.duration = calculateDurationFromStartJsDate(span.data.startTime, overrideEndTime);
+
+      const cancellationEvent = overrideSpan.data.events.find(
+        (event) => event.name === "cancellation"
+      );
+
+      if (cancellationEvent) {
+        span.data.events.push(cancellationEvent);
+        override.events = [cancellationEvent];
+      }
+    }
+
+    if (overrideSpan.data.isError && span.data.attemptNumber) {
+      const attemptFailedEvent = overrideSpan.data.events.find(
+        (event) =>
+          event.name === "attempt_failed" &&
+          event.properties.attemptNumber === span.data.attemptNumber &&
+          event.properties.runId === span.runId
+      ) as AttemptFailedSpanEvent | undefined;
+
+      if (attemptFailedEvent) {
+        const exceptionEvent = {
+          name: "exception",
+          time: attemptFailedEvent.time,
+          properties: {
+            exception: attemptFailedEvent.properties.exception,
+          },
+        } satisfies ExceptionSpanEvent;
+
+        span.data.isError = true;
+        span.data.isPartial = false;
+        span.data.isCancelled = false;
+        span.data.duration = calculateDurationFromStartJsDate(span.data.startTime, overrideEndTime);
+        span.data.events.push(exceptionEvent);
+        span.data.events.push(attemptFailedEvent);
+
+        override = {
+          isError: true,
+          events: [exceptionEvent],
+          duration: calculateDurationFromStartJsDate(span.data.startTime, overrideEndTime),
+        };
+      }
+    }
+
+    if (override) {
+      overridesBySpanId[span.id] = override;
+    }
+
+    return span;
+  }
+
+  #mergeRecordsIntoSpanSummary(
+    spanId: string,
+    records: TaskEventSummaryV1Result[],
+    metadataCache: Map<string, Record<string, unknown>>
+  ): SpanSummary | undefined {
+    if (records.length === 0) {
+      return undefined;
+    }
+
+    let span: SpanSummary | undefined;
+    let earliestStartTime: Date | undefined;
+
+    for (const record of records) {
+      const recordStartTime = convertClickhouseDateTime64ToJsDate(record.start_time);
+
+      // Track the earliest start time across all records, except for ancestor overrides and span events
+      if (
+        record.kind !== "ANCESTOR_OVERRIDE" &&
+        record.kind !== "SPAN_EVENT" &&
+        (!earliestStartTime || recordStartTime < earliestStartTime)
+      ) {
+        earliestStartTime = recordStartTime;
+      }
+
+      if (!span) {
+        span = {
+          id: spanId,
+          parentId: record.parent_span_id ? record.parent_span_id : undefined,
+          runId: record.run_id,
+          data: {
+            message: record.message,
+            style: {},
+            duration:
+              typeof record.duration === "number" ? record.duration : Number(record.duration),
+            isError: false,
+            isPartial: true, // Partial by default, can only be set to false
+            isCancelled: false,
+            isDebug: record.kind === "DEBUG_EVENT",
+            startTime: recordStartTime,
+            level: kindToLevel(record.kind),
+            events: [],
+          },
+        };
+      }
+
+      if (isLogEvent(record.kind)) {
+        span.data.isPartial = false;
+        span.data.isCancelled = false;
+        span.data.isError = record.status === "ERROR";
+      }
+
+      const parsedMetadata = this.#parseMetadata(record.metadata, metadataCache);
+
+      if (
+        parsedMetadata &&
+        "attemptNumber" in parsedMetadata &&
+        typeof parsedMetadata.attemptNumber === "number"
+      ) {
+        span.data.attemptNumber = parsedMetadata.attemptNumber;
+      }
+
+      if (record.kind === "ANCESTOR_OVERRIDE" || record.kind === "SPAN_EVENT") {
+        // We need to add an event to the span
+        span.data.events.push({
+          name: record.message,
+          time: recordStartTime,
+          properties: parsedMetadata ?? {},
+        });
+      }
+
+      if (parsedMetadata && "style" in parsedMetadata && parsedMetadata.style) {
+        span.data.style = parsedMetadata.style as TaskEventStyle;
+      }
+
+      if (record.kind === "SPAN") {
+        if (record.status === "ERROR") {
+          span.data.isError = true;
+          span.data.isPartial = false;
+          span.data.isCancelled = false;
+        } else if (record.status === "CANCELLED") {
+          span.data.isCancelled = true;
+          span.data.isPartial = false;
+          span.data.isError = false;
+        } else if (record.status === "OK") {
+          span.data.isPartial = false;
+        }
+
+        if (record.status !== "PARTIAL") {
+          span.data.duration =
+            typeof record.duration === "number" ? record.duration : Number(record.duration);
+        } else {
+          span.data.message = record.message;
+        }
+      }
+    }
+
+    // Always use the earliest start time found across all records
+    if (span && earliestStartTime) {
+      span.data.startTime = earliestStartTime;
+    }
+
+    return span;
+  }
+
+  #parseMetadata(
+    metadata: string,
+    cache: Map<string, Record<string, unknown>>
+  ): Record<string, unknown> | undefined {
+    if (!metadata) {
+      return undefined;
+    }
+
+    // Check cache first
+    const cached = cache.get(metadata);
+    if (cached) {
+      return cached;
+    }
+
+    const parsed = JSON.parse(metadata);
+
+    if (typeof parsed !== "object" || parsed === null) {
+      return undefined;
+    }
+
+    const result = parsed as Record<string, unknown>;
+
+    // Cache the result - no size limit needed since cache is per-query
+    cache.set(metadata, result);
+
+    return result;
+  }
+
+  async getTraceDetailedSummary(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<TraceDetailedSummary | undefined> {
+    const startCreatedAtWithBuffer = new Date(startCreatedAt.getTime() - 1000);
+
+    const queryBuilder =
+      this._version === "v2"
+        ? this._clickhouse.taskEventsV2.traceDetailedSummaryQueryBuilder()
+        : this._clickhouse.taskEvents.traceDetailedSummaryQueryBuilder();
+
+    queryBuilder.where("environment_id = {environmentId: String}", { environmentId });
+    queryBuilder.where("trace_id = {traceId: String}", { traceId });
+    queryBuilder.where("start_time >= {startCreatedAt: String}", {
+      startCreatedAt: convertDateToNanoseconds(startCreatedAtWithBuffer).toString(),
+    });
+
+    if (endCreatedAt) {
+      queryBuilder.where("start_time <= {endCreatedAt: String}", {
+        endCreatedAt: convertDateToNanoseconds(endCreatedAt).toString(),
+      });
+    }
+
+    // For v2, add inserted_at filtering for partition pruning
+    if (this._version === "v2") {
+      queryBuilder.where("inserted_at >= {insertedAtStart: DateTime64(3)}", {
+        insertedAtStart: convertDateToClickhouseDateTime(startCreatedAtWithBuffer),
+      });
+    }
+
+    if (options?.includeDebugLogs === false) {
+      queryBuilder.where("kind != {kind: String}", { kind: "DEBUG_EVENT" });
+    }
+
+    queryBuilder.orderBy("start_time ASC");
+
+    if (this._config.maximumTraceDetailedSummaryViewCount) {
+      queryBuilder.limit(this._config.maximumTraceDetailedSummaryViewCount);
+    }
+
+    const [queryError, records] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
+    }
+
+    if (!records) {
+      return;
+    }
+
+    // O(n) grouping instead of O(n²) array spreading
+    const recordsGroupedBySpanId: Record<string, TaskEventDetailedSummaryV1Result[]> = {};
+    for (const record of records) {
+      if (!recordsGroupedBySpanId[record.span_id]) {
+        recordsGroupedBySpanId[record.span_id] = [];
+      }
+      recordsGroupedBySpanId[record.span_id].push(record);
+    }
+
+    const spanSummaries = new Map<string, SpanDetailedSummary>();
+    let rootSpanId: string | undefined;
+
+    // Create temporary metadata cache for this query
+    const metadataCache = new Map<string, Record<string, unknown>>();
+
+    for (const [spanId, spanRecords] of Object.entries(recordsGroupedBySpanId)) {
+      const spanSummary = this.#mergeRecordsIntoSpanDetailedSummary(
+        spanId,
+        spanRecords,
+        metadataCache
+      );
+
+      if (!spanSummary) {
+        continue;
+      }
+
+      spanSummaries.set(spanId, spanSummary);
+
+      if (!rootSpanId && !spanSummary.parentId) {
+        rootSpanId = spanId;
+      }
+    }
+
+    if (!rootSpanId) {
+      return;
+    }
+
+    const spans = Array.from(spanSummaries.values());
+
+    const overridesBySpanId: Record<string, SpanOverride> = {};
+    const spanDetailedSummaryMap = new Map<string, SpanDetailedSummary>();
+
+    const finalSpans = spans.map((span) => {
+      const finalSpan = this.#applyAncestorOverrides(span, spanSummaries, overridesBySpanId);
+      spanDetailedSummaryMap.set(span.id, finalSpan);
+      return finalSpan;
+    });
+
+    // Second pass: build parent-child relationships
+    for (const finalSpan of finalSpans) {
+      if (finalSpan.parentId) {
+        const parent = spanDetailedSummaryMap.get(finalSpan.parentId);
+        if (parent) {
+          parent.children.push(finalSpan);
+        }
+      }
+    }
+
+    const rootSpan = spanDetailedSummaryMap.get(rootSpanId);
+
+    if (!rootSpan) {
+      return;
+    }
+
+    return {
+      traceId,
+      rootSpan,
+    };
+  }
+
+  #mergeRecordsIntoSpanDetailedSummary(
+    spanId: string,
+    records: TaskEventDetailedSummaryV1Result[],
+    metadataCache: Map<string, Record<string, unknown>>
+  ): SpanDetailedSummary | undefined {
+    if (records.length === 0) {
+      return undefined;
+    }
+
+    let span: SpanDetailedSummary | undefined;
+    let earliestStartTime: Date | undefined;
+
+    for (const record of records) {
+      const recordStartTime = convertClickhouseDateTime64ToJsDate(record.start_time);
+
+      // Track the earliest start time across all records
+      if (
+        record.kind !== "ANCESTOR_OVERRIDE" &&
+        record.kind !== "SPAN_EVENT" &&
+        (!earliestStartTime || recordStartTime < earliestStartTime)
+      ) {
+        earliestStartTime = recordStartTime;
+      }
+
+      if (!span) {
+        span = {
+          id: spanId,
+          parentId: record.parent_span_id ? record.parent_span_id : undefined,
+          runId: record.run_id,
+          data: {
+            message: record.message,
+            taskSlug: undefined,
+            duration:
+              typeof record.duration === "number" ? record.duration : Number(record.duration),
+            isError: false,
+            isPartial: true, // Partial by default, can only be set to false
+            isCancelled: false,
+            startTime: recordStartTime,
+            level: kindToLevel(record.kind),
+            events: [],
+          },
+          children: [],
+        };
+      }
+
+      if (isLogEvent(record.kind)) {
+        span.data.isPartial = false;
+        span.data.isCancelled = false;
+        span.data.isError = record.status === "ERROR";
+      }
+
+      const parsedMetadata = this.#parseMetadata(record.metadata, metadataCache);
+
+      if (
+        parsedMetadata &&
+        "attemptNumber" in parsedMetadata &&
+        typeof parsedMetadata.attemptNumber === "number"
+      ) {
+        span.data.attemptNumber = parsedMetadata.attemptNumber;
+      }
+
+      if (record.kind === "ANCESTOR_OVERRIDE" || record.kind === "SPAN_EVENT") {
+        // We need to add an event to the span
+        span.data.events.push({
+          name: record.message,
+          time: recordStartTime,
+          properties: parsedMetadata ?? {},
+        });
+      }
+
+      if (record.kind === "SPAN") {
+        if (record.status === "ERROR") {
+          span.data.isError = true;
+          span.data.isPartial = false;
+          span.data.isCancelled = false;
+        } else if (record.status === "CANCELLED") {
+          span.data.isCancelled = true;
+          span.data.isPartial = false;
+          span.data.isError = false;
+        } else if (record.status === "OK") {
+          span.data.isPartial = false;
+        }
+
+        if (record.status !== "PARTIAL") {
+          span.data.duration =
+            typeof record.duration === "number" ? record.duration : Number(record.duration);
+        } else {
+          span.data.message = record.message;
+        }
+      }
+    }
+
+    // Always use the earliest start time found across all records
+    if (span && earliestStartTime) {
+      span.data.startTime = earliestStartTime;
+    }
+
+    return span;
+  }
+
+  async getRunEvents(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    runId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date
+  ): Promise<RunPreparedEvent[]> {
+    const startCreatedAtWithBuffer = new Date(startCreatedAt.getTime() - 1000);
+
+    const queryBuilder =
+      this._version === "v2"
+        ? this._clickhouse.taskEventsV2.traceSummaryQueryBuilder()
+        : this._clickhouse.taskEvents.traceSummaryQueryBuilder();
+
+    queryBuilder.where("environment_id = {environmentId: String}", { environmentId });
+    queryBuilder.where("trace_id = {traceId: String}", { traceId });
+    queryBuilder.where("run_id = {runId: String}", { runId });
+    queryBuilder.where("start_time >= {startCreatedAt: String}", {
+      startCreatedAt: convertDateToNanoseconds(startCreatedAtWithBuffer).toString(),
+    });
+
+    if (endCreatedAt) {
+      queryBuilder.where("start_time <= {endCreatedAt: String}", {
+        endCreatedAt: convertDateToNanoseconds(endCreatedAt).toString(),
+      });
+    }
+
+    // For v2, add inserted_at filtering for partition pruning
+    if (this._version === "v2") {
+      queryBuilder.where("inserted_at >= {insertedAtStart: DateTime64(3)}", {
+        insertedAtStart: convertDateToClickhouseDateTime(startCreatedAtWithBuffer),
+      });
+    }
+
+    queryBuilder.where("kind != {kind: String}", { kind: "DEBUG_EVENT" });
+    queryBuilder.orderBy("start_time ASC");
+
+    if (this._config.maximumTraceSummaryViewCount) {
+      queryBuilder.limit(this._config.maximumTraceSummaryViewCount);
+    }
+
+    const [queryError, records] = await queryBuilder.execute();
+
+    if (queryError) {
+      throw queryError;
+    }
+
+    if (!records) {
+      return [];
+    }
+
+    // O(n) grouping instead of O(n²) array spreading
+    const recordsGroupedBySpanId: Record<string, TaskEventSummaryV1Result[]> = {};
+    for (const record of records) {
+      if (!recordsGroupedBySpanId[record.span_id]) {
+        recordsGroupedBySpanId[record.span_id] = [];
+      }
+      recordsGroupedBySpanId[record.span_id].push(record);
+    }
+
+    const spanSummaries = new Map<string, SpanSummary>();
+    let rootSpanId: string | undefined;
+
+    // Create temporary metadata cache for this query
+    const metadataCache = new Map<string, Record<string, unknown>>();
+
+    for (const [spanId, spanRecords] of Object.entries(recordsGroupedBySpanId)) {
+      const spanSummary = this.#mergeRecordsIntoSpanSummary(spanId, spanRecords, metadataCache);
+
+      if (!spanSummary) {
+        continue;
+      }
+
+      spanSummaries.set(spanId, spanSummary);
+
+      // Find root span for optimized override algorithm
+      if (!rootSpanId && !spanSummary.parentId) {
+        rootSpanId = spanId;
+      }
+    }
+
+    const spans = Array.from(spanSummaries.values());
+
+    const overridesBySpanId: Record<string, SpanOverride> = {};
+
+    const finalSpans = spans.map((span) => {
+      return this.#applyAncestorOverrides(span, spanSummaries, overridesBySpanId);
+    });
+
+    const runPreparedEvents = finalSpans.map((span) => this.#spanSummaryToRunPreparedEvent(span));
+
+    return runPreparedEvents;
+  }
+
+  #spanSummaryToRunPreparedEvent(span: SpanSummary): RunPreparedEvent {
+    return {
+      spanId: span.id,
+      parentId: span.parentId ?? null,
+      runId: span.runId,
+      message: span.data.message,
+      style: span.data.style,
+      events: span.data.events,
+      startTime: convertDateToNanoseconds(span.data.startTime),
+      duration: span.data.duration,
+      isError: span.data.isError,
+      isPartial: span.data.isPartial,
+      isCancelled: span.data.isCancelled,
+      kind: "UNSPECIFIED",
+      attemptNumber: span.data.attemptNumber ?? null,
+      level: span.data.level,
+    };
+  }
+}
+
+// Precompile regex for performance (used ~30k times per trace)
+const CLICKHOUSE_DATETIME_REGEX =
+  /^(\d{4})-(\d{2})-(\d{2})[ T](\d{2}):(\d{2}):(\d{2})(?:\.(\d{1,9}))?(?:Z|([+-])(\d{2}):?(\d{2}))?$/;
+
+export const convertDateToClickhouseDateTime = (date: Date): string => {
+  // 2024-11-06T20:37:00.123Z -> 2024-11-06 21:37:00.123
+  return date.toISOString().replace("T", " ").replace("Z", "");
+};
+
+/**
+ * Convert a ClickHouse DateTime64 to nanoseconds since epoch (UTC).
+ * Accepts:
+ *  - "2025-09-23 12:32:46.130262875"
+ *  - "2025-09-23T12:32:46.13"
+ *  - "2025-09-23 12:32:46Z"
+ *  - "2025-09-23 12:32:46.130262875+02:00"
+ */
+export function convertClickhouseDateTime64ToNanosecondsEpoch(date: string): bigint {
+  const s = date.trim();
+  const m = CLICKHOUSE_DATETIME_REGEX.exec(s);
+  if (!m) {
+    throw new Error(`Invalid ClickHouse DateTime64 string: "${date}"`);
+  }
+
+  const year = Number(m[1]);
+  const month = Number(m[2]); // 1-12
+  const day = Number(m[3]); // 1-31
+  const hour = Number(m[4]);
+  const minute = Number(m[5]);
+  const second = Number(m[6]);
+  const fraction = m[7] ?? ""; // up to 9 digits
+  const sign = m[8] as "+" | "-" | undefined;
+  const offH = m[9] ? Number(m[9]) : 0;
+  const offM = m[10] ? Number(m[10]) : 0;
+
+  // Convert fractional seconds to exactly 9 digits (nanoseconds within the second).
+  const nsWithinSecond = Number(fraction.padEnd(9, "0")); // 0..999_999_999
+
+  // Split into millisecond part (for Date) and leftover nanoseconds.
+  const msPart = Math.trunc(nsWithinSecond / 1_000_000); // 0..999
+  const leftoverNs = nsWithinSecond - msPart * 1_000_000; // 0..999_999
+
+  // Build milliseconds since epoch in UTC using Date.UTC (avoids local TZ/DST issues).
+  let msEpoch = Date.UTC(year, month - 1, day, hour, minute, second, msPart);
+
+  // If an explicit offset was provided, adjust to true UTC.
+  if (sign) {
+    const offsetMinutesSigned = (sign === "+" ? 1 : -1) * (offH * 60 + offM);
+    msEpoch -= offsetMinutesSigned * 60_000;
+  }
+
+  // Combine ms to ns with leftover.
+  return BigInt(msEpoch) * 1_000_000n + BigInt(leftoverNs);
+}
+
+/**
+ * Convert a ClickHouse DateTime64 to a JS Date.
+ * Accepts:
+ *  - "2025-09-23 12:32:46.130262875"
+ *  - "2025-09-23T12:32:46.13"
+ *  - "2025-09-23 12:32:46Z"
+ *  - "2025-09-23 12:32:46.130262875+02:00"
+ *
+ * Optimized with fast path for common format (avoids regex for 99% of cases).
+ */
+export function convertClickhouseDateTime64ToJsDate(date: string): Date {
+  // Fast path for common format: "2025-09-23 12:32:46.130262875" or "2025-09-23 12:32:46"
+  // This avoids the expensive regex for the common case
+  if (date.length >= 19 && date[4] === "-" && date[7] === "-" && date[10] === " ") {
+    const year = Number(date.substring(0, 4));
+    const month = Number(date.substring(5, 7));
+    const day = Number(date.substring(8, 10));
+    const hour = Number(date.substring(11, 13));
+    const minute = Number(date.substring(14, 16));
+    const second = Number(date.substring(17, 19));
+
+    // Parse fractional seconds if present
+    let ms = 0;
+    if (date.length > 20 && date[19] === ".") {
+      // Take first 3 digits after decimal (milliseconds), pad if shorter
+      const fracStr = date.substring(20, Math.min(23, date.length));
+      ms = Number(fracStr.padEnd(3, "0"));
+    }
+
+    return new Date(Date.UTC(year, month - 1, day, hour, minute, second, ms));
+  }
+
+  // Fallback to regex for other formats (T separator, timezone offsets, etc.)
+  const s = date.trim();
+  const m = CLICKHOUSE_DATETIME_REGEX.exec(s);
+  if (!m) {
+    throw new Error(`Invalid ClickHouse DateTime64 string: "${date}"`);
+  }
+
+  const year = Number(m[1]);
+  const month = Number(m[2]); // 1-12
+  const day = Number(m[3]); // 1-31
+  const hour = Number(m[4]);
+  const minute = Number(m[5]);
+  const second = Number(m[6]);
+  const fraction = m[7] ?? ""; // up to 9 digits
+
+  // Convert fractional seconds to exactly 9 digits (nanoseconds within the second).
+  const nsWithinSecond = Number(fraction.padEnd(9, "0")); // 0..999_999_999
+
+  // Split into millisecond part (for Date)
+  const msPart = Math.trunc(nsWithinSecond / 1_000_000); // 0..999
+
+  return new Date(Date.UTC(year, month - 1, day, hour, minute, second, msPart));
+}
+
+function kindToLevel(kind: string): TaskEventLevel {
+  switch (kind) {
+    case "DEBUG_EVENT":
+    case "LOG_DEBUG": {
+      return "DEBUG";
+    }
+    case "LOG_LOG": {
+      return "LOG";
+    }
+    case "LOG_INFO": {
+      return "INFO";
+    }
+    case "LOG_WARN": {
+      return "WARN";
+    }
+    case "LOG_ERROR": {
+      return "ERROR";
+    }
+    case "SPAN":
+    case "ANCESTOR_OVERRIDE":
+    case "SPAN_EVENT": {
+      return "TRACE";
+    }
+    default: {
+      return "TRACE";
+    }
+  }
+}
+
+function isLogEvent(kind: string): boolean {
+  return kind.startsWith("LOG_") || kind === "DEBUG_EVENT";
+}
+
+function calculateEndTimeFromStartTime(startTime: Date, duration: number): Date {
+  return new Date(startTime.getTime() + duration / 1_000_000);
+}
+
+// This will take a string like "1759427319944999936" and return "1759427319.944999936"
+function formatClickhouseDate64NanosecondsEpochString(date: string): string {
+  if (date.length !== 19) {
+    return date;
+  }
+
+  return date.substring(0, 10) + "." + date.substring(10);
+}
+
+function convertClickhouseDate64NanosecondsEpochStringToBigInt(date: string): bigint {
+  const parts = date.split(".");
+  return BigInt(parts.join(""));
+}
+
+function formatClickhouseUnsignedIntegerString(value: number | bigint): string {
+  if (value < 0) {
+    return "0";
+  }
+
+  if (typeof value === "bigint") {
+    return value.toString();
+  }
+
+  return Math.floor(value).toString();
+}
diff --git a/apps/webapp/app/v3/eventRepository/clickhouseEventRepositoryInstance.server.ts b/apps/webapp/app/v3/eventRepository/clickhouseEventRepositoryInstance.server.ts
new file mode 100644
index 00000000000..36fb13c6e96
--- /dev/null
+++ b/apps/webapp/app/v3/eventRepository/clickhouseEventRepositoryInstance.server.ts
@@ -0,0 +1,104 @@
+import { ClickHouse } from "@internal/clickhouse";
+import { env } from "~/env.server";
+import { singleton } from "~/utils/singleton";
+import { ClickhouseEventRepository } from "./clickhouseEventRepository.server";
+
+export const clickhouseEventRepository = singleton(
+  "clickhouseEventRepository",
+  initializeClickhouseRepository
+);
+
+export const clickhouseEventRepositoryV2 = singleton(
+  "clickhouseEventRepositoryV2",
+  initializeClickhouseRepositoryV2
+);
+
+function getClickhouseClient() {
+  if (!env.EVENTS_CLICKHOUSE_URL) {
+    throw new Error("EVENTS_CLICKHOUSE_URL is not set");
+  }
+
+  const url = new URL(env.EVENTS_CLICKHOUSE_URL);
+  url.searchParams.delete("secure");
+
+  return new ClickHouse({
+    url: url.toString(),
+    name: "task-events",
+    keepAlive: {
+      enabled: env.EVENTS_CLICKHOUSE_KEEP_ALIVE_ENABLED === "1",
+      idleSocketTtl: env.EVENTS_CLICKHOUSE_KEEP_ALIVE_IDLE_SOCKET_TTL_MS,
+    },
+    logLevel: env.EVENTS_CLICKHOUSE_LOG_LEVEL,
+    compression: {
+      request: env.EVENTS_CLICKHOUSE_COMPRESSION_REQUEST === "1",
+    },
+    maxOpenConnections: env.EVENTS_CLICKHOUSE_MAX_OPEN_CONNECTIONS,
+  });
+}
+
+function initializeClickhouseRepository() {
+  if (!env.EVENTS_CLICKHOUSE_URL) {
+    throw new Error("EVENTS_CLICKHOUSE_URL is not set");
+  }
+
+  const url = new URL(env.EVENTS_CLICKHOUSE_URL);
+  url.searchParams.delete("secure");
+
+  const safeUrl = new URL(url.toString());
+  safeUrl.password = "redacted";
+
+  console.log("🗃️  Initializing Clickhouse event repository (v1)", { url: safeUrl.toString() });
+
+  const clickhouse = getClickhouseClient();
+
+  const repository = new ClickhouseEventRepository({
+    clickhouse: clickhouse,
+    batchSize: env.EVENTS_CLICKHOUSE_BATCH_SIZE,
+    flushInterval: env.EVENTS_CLICKHOUSE_FLUSH_INTERVAL_MS,
+    maximumTraceSummaryViewCount: env.EVENTS_CLICKHOUSE_MAX_TRACE_SUMMARY_VIEW_COUNT,
+    maximumTraceDetailedSummaryViewCount:
+      env.EVENTS_CLICKHOUSE_MAX_TRACE_DETAILED_SUMMARY_VIEW_COUNT,
+    maximumLiveReloadingSetting: env.EVENTS_CLICKHOUSE_MAX_LIVE_RELOADING_SETTING,
+    insertStrategy: env.EVENTS_CLICKHOUSE_INSERT_STRATEGY,
+    waitForAsyncInsert: env.EVENTS_CLICKHOUSE_WAIT_FOR_ASYNC_INSERT === "1",
+    asyncInsertMaxDataSize: env.EVENTS_CLICKHOUSE_ASYNC_INSERT_MAX_DATA_SIZE,
+    asyncInsertBusyTimeoutMs: env.EVENTS_CLICKHOUSE_ASYNC_INSERT_BUSY_TIMEOUT_MS,
+    startTimeMaxAgeMs: env.EVENTS_CLICKHOUSE_START_TIME_MAX_AGE_MS,
+    version: "v1",
+  });
+
+  return repository;
+}
+
+function initializeClickhouseRepositoryV2() {
+  if (!env.EVENTS_CLICKHOUSE_URL) {
+    throw new Error("EVENTS_CLICKHOUSE_URL is not set");
+  }
+
+  const url = new URL(env.EVENTS_CLICKHOUSE_URL);
+  url.searchParams.delete("secure");
+
+  const safeUrl = new URL(url.toString());
+  safeUrl.password = "redacted";
+
+  console.log("🗃️  Initializing Clickhouse event repository (v2)", { url: safeUrl.toString() });
+
+  const clickhouse = getClickhouseClient();
+
+  const repository = new ClickhouseEventRepository({
+    clickhouse: clickhouse,
+    batchSize: env.EVENTS_CLICKHOUSE_BATCH_SIZE,
+    flushInterval: env.EVENTS_CLICKHOUSE_FLUSH_INTERVAL_MS,
+    maximumTraceSummaryViewCount: env.EVENTS_CLICKHOUSE_MAX_TRACE_SUMMARY_VIEW_COUNT,
+    maximumTraceDetailedSummaryViewCount:
+      env.EVENTS_CLICKHOUSE_MAX_TRACE_DETAILED_SUMMARY_VIEW_COUNT,
+    maximumLiveReloadingSetting: env.EVENTS_CLICKHOUSE_MAX_LIVE_RELOADING_SETTING,
+    insertStrategy: env.EVENTS_CLICKHOUSE_INSERT_STRATEGY,
+    waitForAsyncInsert: env.EVENTS_CLICKHOUSE_WAIT_FOR_ASYNC_INSERT === "1",
+    asyncInsertMaxDataSize: env.EVENTS_CLICKHOUSE_ASYNC_INSERT_MAX_DATA_SIZE,
+    asyncInsertBusyTimeoutMs: env.EVENTS_CLICKHOUSE_ASYNC_INSERT_BUSY_TIMEOUT_MS,
+    version: "v2",
+  });
+
+  return repository;
+}
diff --git a/apps/webapp/app/v3/eventRepository/common.server.ts b/apps/webapp/app/v3/eventRepository/common.server.ts
new file mode 100644
index 00000000000..2e3bdf37c50
--- /dev/null
+++ b/apps/webapp/app/v3/eventRepository/common.server.ts
@@ -0,0 +1,176 @@
+import { Attributes } from "@opentelemetry/api";
+import { RandomIdGenerator } from "@opentelemetry/sdk-trace-base";
+import { parseTraceparent } from "@trigger.dev/core/v3/isomorphic";
+import { ExceptionEventProperties, SpanEvents, TaskRunError } from "@trigger.dev/core/v3/schemas";
+import { unflattenAttributes } from "@trigger.dev/core/v3/utils/flattenAttributes";
+import { createHash } from "node:crypto";
+
+export function extractContextFromCarrier(carrier: Record<string, unknown>) {
+  const traceparent = carrier["traceparent"];
+  const tracestate = carrier["tracestate"];
+
+  if (typeof traceparent !== "string") {
+    return undefined;
+  }
+
+  return {
+    ...carrier,
+    traceparent: parseTraceparent(traceparent),
+    tracestate,
+  };
+}
+
+export function getNowInNanoseconds(): bigint {
+  return BigInt(new Date().getTime() * 1_000_000);
+}
+
+export function getDateFromNanoseconds(nanoseconds: bigint): Date {
+  return new Date(Number(nanoseconds) / 1_000_000);
+}
+
+export function calculateDurationFromStart(
+  startTime: bigint,
+  endTime: Date = new Date(),
+  minimumDuration?: number
+) {
+  const $endtime = typeof endTime === "string" ? new Date(endTime) : endTime;
+
+  const duration = Number(BigInt($endtime.getTime() * 1_000_000) - startTime);
+
+  if (minimumDuration && duration < minimumDuration) {
+    return minimumDuration;
+  }
+
+  return duration;
+}
+
+export function calculateDurationFromStartJsDate(startTime: Date, endTime: Date = new Date()) {
+  const $endtime = typeof endTime === "string" ? new Date(endTime) : endTime;
+
+  return ($endtime.getTime() - startTime.getTime()) * 1_000_000;
+}
+
+export function convertDateToNanoseconds(date: Date): bigint {
+  return BigInt(date.getTime()) * BigInt(1_000_000);
+}
+
+/**
+ * Returns a deterministically random 8-byte span ID formatted/encoded as a 16 lowercase hex
+ * characters corresponding to 64 bits, based on the trace ID and seed.
+ */
+export function generateDeterministicSpanId(traceId: string, seed: string) {
+  const hash = createHash("sha1");
+  hash.update(traceId);
+  hash.update(seed);
+  const buffer = hash.digest();
+  let hexString = "";
+  for (let i = 0; i < 8; i++) {
+    const val = buffer.readUInt8(i);
+    const str = val.toString(16).padStart(2, "0");
+    hexString += str;
+  }
+  return hexString;
+}
+
+const randomIdGenerator = new RandomIdGenerator();
+
+export function generateTraceId() {
+  return randomIdGenerator.generateTraceId();
+}
+
+export function generateSpanId() {
+  return randomIdGenerator.generateSpanId();
+}
+
+export function stripAttributePrefix(attributes: Attributes, prefix: string) {
+  const result: Attributes = {};
+
+  for (const [key, value] of Object.entries(attributes)) {
+    if (key.startsWith(prefix)) {
+      result[key.slice(prefix.length + 1)] = value;
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+
+export function parseEventsField(events: unknown): SpanEvents {
+  if (!events) return [];
+  if (!Array.isArray(events)) return [];
+
+  const unsafe = events
+    ? (events as any[]).map((e) => ({
+        ...e,
+        properties: unflattenAttributes(e.properties as Attributes),
+      }))
+    : undefined;
+
+  return unsafe as SpanEvents;
+}
+
+export function createExceptionPropertiesFromError(error: TaskRunError): ExceptionEventProperties {
+  switch (error.type) {
+    case "BUILT_IN_ERROR": {
+      return {
+        type: error.name,
+        message: error.message,
+        stacktrace: error.stackTrace,
+      };
+    }
+    case "CUSTOM_ERROR": {
+      return {
+        type: "Error",
+        message: error.raw,
+      };
+    }
+    case "INTERNAL_ERROR": {
+      return {
+        type: "Internal error",
+        message: [error.code, error.message].filter(Boolean).join(": "),
+        stacktrace: error.stackTrace,
+      };
+    }
+    case "STRING_ERROR": {
+      return {
+        type: "Error",
+        message: error.raw,
+      };
+    }
+  }
+}
+
+// removes keys that start with a $ sign. If there are no keys left, return undefined
+export function removePrivateProperties(
+  attributes: Attributes | undefined | null
+): Attributes | undefined {
+  if (!attributes) {
+    return undefined;
+  }
+
+  const result: Attributes = {};
+
+  for (const [key, value] of Object.entries(attributes)) {
+    if (key.startsWith("$")) {
+      continue;
+    }
+
+    result[key] = value;
+  }
+
+  if (Object.keys(result).length === 0) {
+    return undefined;
+  }
+
+  return result;
+}
+
+export function isEmptyObject(obj: object) {
+  for (var prop in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, prop)) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/apps/webapp/app/v3/eventRepository/eventRepository.server.ts b/apps/webapp/app/v3/eventRepository/eventRepository.server.ts
new file mode 100644
index 00000000000..de2a19e395e
--- /dev/null
+++ b/apps/webapp/app/v3/eventRepository/eventRepository.server.ts
@@ -0,0 +1,1857 @@
+import { Attributes, AttributeValue, trace, Tracer } from "@opentelemetry/api";
+import { RandomIdGenerator } from "@opentelemetry/sdk-trace-base";
+import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
+import {
+  AttemptFailedSpanEvent,
+  correctErrorStackTrace,
+  ExceptionEventProperties,
+  ExceptionSpanEvent,
+  flattenAttributes,
+  isExceptionSpanEvent,
+  nanosecondsToMilliseconds,
+  PRIMARY_VARIANT,
+  SemanticInternalAttributes,
+  SpanEvent,
+  SpanEvents,
+  TaskEventStyle,
+  TaskRunError,
+  unflattenAttributes,
+} from "@trigger.dev/core/v3";
+import { serializeTraceparent } from "@trigger.dev/core/v3/isomorphic";
+import { Prisma, TaskEvent, TaskEventKind } from "@trigger.dev/database";
+import { nanoid } from "nanoid";
+import { Gauge } from "prom-client";
+import { $replica, prisma, PrismaClient, PrismaReplicaClient } from "~/db.server";
+import { env } from "~/env.server";
+import { metricsRegister } from "~/metrics.server";
+import { logger } from "~/services/logger.server";
+import { singleton } from "~/utils/singleton";
+import { DynamicFlushScheduler } from "../dynamicFlushScheduler.server";
+import { tracePubSub } from "../services/tracePubSub.server";
+import { DetailedTraceEvent, TaskEventStore, TaskEventStoreTable } from "../taskEventStore.server";
+import { startActiveSpan } from "../tracer.server";
+import { startSpan } from "../tracing.server";
+import {
+  calculateDurationFromStart,
+  convertDateToNanoseconds,
+  createExceptionPropertiesFromError,
+  extractContextFromCarrier,
+  generateDeterministicSpanId,
+  generateSpanId,
+  generateTraceId,
+  getDateFromNanoseconds,
+  getNowInNanoseconds,
+  isEmptyObject,
+  parseEventsField,
+  removePrivateProperties,
+  stripAttributePrefix,
+} from "./common.server";
+import type {
+  CompleteableTaskRun,
+  CreateEventInput,
+  EventBuilder,
+  EventRepoConfig,
+  IEventRepository,
+  PreparedDetailedEvent,
+  PreparedEvent,
+  QueriedEvent,
+  RunPreparedEvent,
+  SpanDetail,
+  SpanDetailedSummary,
+  SpanSummary,
+  TraceAttributes,
+  TraceDetailedSummary,
+  TraceEventOptions,
+  TraceSummary,
+} from "./eventRepository.types";
+
+const MAX_FLUSH_DEPTH = 5;
+
+export class EventRepository implements IEventRepository {
+  private readonly _flushScheduler: DynamicFlushScheduler<Prisma.TaskEventCreateManyInput>;
+  private _randomIdGenerator = new RandomIdGenerator();
+  private _subscriberCount = 0;
+  private _tracer: Tracer;
+  private _lastFlushedAt: Date | undefined;
+  private taskEventStore: TaskEventStore;
+
+  get subscriberCount() {
+    return this._subscriberCount;
+  }
+
+  get flushSchedulerStatus() {
+    return this._flushScheduler.getStatus();
+  }
+
+  get maximumLiveReloadingSetting() {
+    return env.MAXIMUM_LIVE_RELOADING_EVENTS;
+  }
+
+  constructor(
+    db: PrismaClient = prisma,
+    readReplica: PrismaReplicaClient = $replica,
+    private readonly _config: EventRepoConfig
+  ) {
+    this._flushScheduler = new DynamicFlushScheduler({
+      batchSize: _config.batchSize,
+      flushInterval: _config.batchInterval,
+      callback: this.#flushBatch.bind(this),
+      minConcurrency: _config.minConcurrency,
+      maxConcurrency: _config.maxConcurrency,
+      maxBatchSize: _config.maxBatchSize,
+      memoryPressureThreshold: _config.memoryPressureThreshold,
+      loadSheddingThreshold: _config.loadSheddingThreshold,
+      loadSheddingEnabled: _config.loadSheddingEnabled,
+      isDroppableEvent: (event: Prisma.TaskEventCreateManyInput) => {
+        // Only drop LOG events during load shedding
+        return event.kind === TaskEventKind.LOG;
+      },
+    });
+
+    this._tracer = _config.tracer ?? trace.getTracer("eventRepo", "0.0.1");
+
+    // Instantiate the store using the partitioning flag.
+    this.taskEventStore = new TaskEventStore(db, readReplica);
+  }
+
+  #createableEventToPrismaEvent(event: CreateEventInput): Prisma.TaskEventCreateManyInput {
+    return {
+      message: event.message,
+      traceId: event.traceId,
+      spanId: event.spanId,
+      parentId: event.parentId,
+      isError: event.isError,
+      isPartial: event.isPartial,
+      isCancelled: event.isCancelled,
+      serviceName: "",
+      serviceNamespace: "",
+      level: event.level,
+      kind: event.kind,
+      status: event.status,
+      links: [],
+      events: event.events,
+      startTime: event.startTime,
+      duration: event.duration,
+      attemptNumber: event.attemptNumber,
+      environmentId: event.environmentId,
+      environmentType: event.environmentType,
+      organizationId: event.organizationId,
+      projectId: event.projectId,
+      projectRef: "",
+      runId: event.runId,
+      runIsTest: false,
+      taskSlug: event.taskSlug,
+      properties: event.properties as Prisma.InputJsonValue,
+      metadata: event.metadata as Prisma.InputJsonValue,
+      style: event.style as Prisma.InputJsonValue,
+    };
+  }
+
+  private async insertImmediate(event: CreateEventInput) {
+    await this.#flushBatch(nanoid(), [this.#createableEventToPrismaEvent(event)]);
+  }
+
+  async insertMany(events: CreateEventInput[]) {
+    this._flushScheduler.addToBatch(events.map(this.#createableEventToPrismaEvent));
+  }
+
+  async insertManyImmediate(events: CreateEventInput[]) {
+    await this.#flushBatchWithReturn(nanoid(), events.map(this.#createableEventToPrismaEvent));
+  }
+
+  async completeSuccessfulRunEvent({ run, endTime }: { run: CompleteableTaskRun; endTime?: Date }) {
+    const startTime = convertDateToNanoseconds(run.createdAt);
+
+    await this.insertImmediate({
+      message: run.taskIdentifier,
+      level: "TRACE",
+      kind: "SERVER",
+      traceId: run.traceId,
+      spanId: run.spanId,
+      parentId: run.parentSpanId,
+      runId: run.friendlyId,
+      projectId: run.projectId,
+      taskSlug: run.taskIdentifier,
+      environmentId: run.runtimeEnvironmentId,
+      environmentType: "DEVELOPMENT",
+      organizationId: run.organizationId ?? "",
+      isPartial: false,
+      isError: false,
+      isCancelled: false,
+      status: "OK",
+      startTime,
+      properties: {},
+      metadata: undefined,
+      style: undefined,
+      duration: calculateDurationFromStart(startTime, endTime ?? new Date()),
+    });
+  }
+
+  async completeCachedRunEvent({
+    run,
+    blockedRun,
+    endTime,
+    spanId,
+    parentSpanId,
+    spanCreatedAt,
+    isError,
+  }: {
+    run: CompleteableTaskRun;
+    blockedRun: CompleteableTaskRun;
+    spanId: string;
+    parentSpanId: string;
+    spanCreatedAt: Date;
+    isError: boolean;
+    endTime?: Date;
+  }) {
+    const startTime = convertDateToNanoseconds(spanCreatedAt);
+
+    await this.insertImmediate({
+      message: run.taskIdentifier,
+      level: "TRACE",
+      kind: "SERVER",
+      traceId: blockedRun.traceId,
+      spanId: spanId,
+      parentId: parentSpanId,
+      runId: blockedRun.friendlyId,
+      projectId: run.projectId,
+      taskSlug: run.taskIdentifier,
+      environmentId: run.runtimeEnvironmentId,
+      environmentType: "DEVELOPMENT",
+      organizationId: run.organizationId ?? "",
+      isPartial: false,
+      isError,
+      isCancelled: false,
+      status: "OK",
+      startTime,
+      properties: {},
+      metadata: undefined,
+      style: undefined,
+      duration: calculateDurationFromStart(startTime, endTime ?? new Date()),
+    });
+  }
+
+  async completeFailedRunEvent({
+    run,
+    endTime,
+    exception,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    exception: { message?: string; type?: string; stacktrace?: string };
+  }) {
+    const startTime = convertDateToNanoseconds(run.createdAt);
+
+    await this.insertImmediate({
+      message: run.taskIdentifier,
+      level: "TRACE",
+      kind: "SERVER",
+      traceId: run.traceId,
+      spanId: run.spanId,
+      parentId: run.parentSpanId,
+      runId: run.friendlyId,
+      projectId: run.projectId,
+      taskSlug: run.taskIdentifier,
+      environmentId: run.runtimeEnvironmentId,
+      environmentType: "DEVELOPMENT",
+      organizationId: run.organizationId ?? "",
+      isPartial: false,
+      isError: true,
+      isCancelled: false,
+      status: "ERROR",
+      startTime,
+      events: [
+        {
+          name: "exception",
+          time: endTime ?? new Date(),
+          properties: {
+            exception,
+          },
+        },
+      ],
+      properties: {},
+      metadata: undefined,
+      style: undefined,
+      duration: calculateDurationFromStart(startTime, endTime ?? new Date()),
+    });
+  }
+
+  async completeExpiredRunEvent({
+    run,
+    endTime,
+    ttl,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    ttl: string;
+  }) {
+    const startTime = convertDateToNanoseconds(run.createdAt);
+
+    await this.insertImmediate({
+      message: run.taskIdentifier,
+      level: "TRACE",
+      kind: "SERVER",
+      traceId: run.traceId,
+      spanId: run.spanId,
+      parentId: run.parentSpanId,
+      runId: run.friendlyId,
+      projectId: run.projectId,
+      taskSlug: run.taskIdentifier,
+      environmentId: run.runtimeEnvironmentId,
+      environmentType: "DEVELOPMENT",
+      organizationId: run.organizationId ?? "",
+      isPartial: false,
+      isError: true,
+      isCancelled: false,
+      status: "ERROR",
+      startTime,
+      events: [
+        {
+          name: "exception",
+          time: endTime ?? new Date(),
+          properties: {
+            exception: {
+              message: `Run expired because the TTL (${ttl}) was reached`,
+            },
+          },
+        },
+      ],
+      properties: {},
+      metadata: undefined,
+      style: undefined,
+      duration: calculateDurationFromStart(startTime, endTime ?? new Date()),
+    });
+  }
+
+  async createAttemptFailedRunEvent({
+    run,
+    endTime,
+    attemptNumber,
+    exception,
+  }: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    attemptNumber: number;
+    exception: { message?: string; type?: string; stacktrace?: string };
+  }) {
+    const startTime = convertDateToNanoseconds(run.createdAt);
+
+    await this.insertImmediate({
+      message: run.taskIdentifier,
+      level: "TRACE",
+      kind: "UNSPECIFIED", // This will be treated as an "invisible" event
+      traceId: run.traceId,
+      spanId: run.spanId,
+      parentId: run.parentSpanId,
+      runId: run.friendlyId,
+      projectId: run.projectId,
+      taskSlug: run.taskIdentifier,
+      environmentId: run.runtimeEnvironmentId,
+      environmentType: "DEVELOPMENT",
+      organizationId: run.organizationId ?? "",
+      isPartial: true,
+      isError: false,
+      isCancelled: false,
+      status: "OK",
+      startTime,
+      events: [
+        {
+          name: "attempt_failed",
+          time: endTime ?? new Date(),
+          properties: {
+            exception,
+            attemptNumber,
+            runId: run.friendlyId,
+          },
+        } satisfies AttemptFailedSpanEvent,
+      ],
+      properties: {},
+      metadata: undefined,
+      style: undefined,
+      duration: calculateDurationFromStart(startTime, endTime ?? new Date()),
+    });
+  }
+
+  async cancelRunEvent({
+    reason,
+    run,
+    cancelledAt,
+  }: {
+    reason: string;
+    run: CompleteableTaskRun;
+    cancelledAt: Date;
+  }) {
+    const startTime = convertDateToNanoseconds(run.createdAt);
+
+    await this.insertImmediate({
+      message: run.taskIdentifier,
+      level: "TRACE",
+      kind: "SERVER",
+      traceId: run.traceId,
+      spanId: run.spanId,
+      parentId: run.parentSpanId,
+      runId: run.friendlyId,
+      projectId: run.projectId,
+      taskSlug: run.taskIdentifier,
+      environmentId: run.runtimeEnvironmentId,
+      environmentType: "DEVELOPMENT",
+      organizationId: run.organizationId ?? "",
+      isPartial: false,
+      isError: true,
+      isCancelled: true,
+      status: "ERROR",
+      events: [
+        {
+          name: "cancellation",
+          time: cancelledAt,
+          properties: {
+            reason,
+          },
+        },
+      ],
+      startTime,
+      properties: {},
+      metadata: undefined,
+      style: undefined,
+      duration: calculateDurationFromStart(startTime, cancelledAt),
+    });
+  }
+
+  public async getTraceSummary(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<TraceSummary | undefined> {
+    return await startActiveSpan("getTraceSummary", async (span) => {
+      const events = await this.taskEventStore.findTraceEvents(
+        storeTable,
+        traceId,
+        startCreatedAt,
+        endCreatedAt,
+        { includeDebugLogs: options?.includeDebugLogs }
+      );
+
+      let preparedEvents: Array<PreparedEvent> = [];
+      let rootSpanId: string | undefined;
+      const eventsBySpanId = new Map<string, PreparedEvent>();
+
+      for (const event of events) {
+        preparedEvents.push(prepareEvent(event));
+
+        if (!rootSpanId && !event.parentId) {
+          rootSpanId = event.spanId;
+        }
+      }
+
+      for (const event of preparedEvents) {
+        const existingEvent = eventsBySpanId.get(event.spanId);
+
+        if (!existingEvent) {
+          eventsBySpanId.set(event.spanId, event);
+          continue;
+        }
+
+        // This is an invisible event, and we just want to keep the original event but concat together
+        // the event.events with the existingEvent.events
+        if (event.kind === "UNSPECIFIED") {
+          eventsBySpanId.set(event.spanId, {
+            ...existingEvent,
+            events: [...(existingEvent.events ?? []), ...(event.events ?? [])],
+          });
+          continue;
+        }
+
+        if (event.isCancelled || !event.isPartial) {
+          const mergedEvent: PreparedEvent = {
+            ...event,
+            // Preserve style from the original partial event
+            style: existingEvent.style,
+            events: [...(existingEvent.events ?? []), ...(event.events ?? [])],
+          };
+          eventsBySpanId.set(event.spanId, mergedEvent);
+          continue;
+        }
+      }
+
+      preparedEvents = Array.from(eventsBySpanId.values());
+
+      const spansBySpanId = new Map<string, SpanSummary>();
+
+      const spans = preparedEvents.map((event) => {
+        const overrides = getAncestorOverrides({
+          spansById: eventsBySpanId,
+          span: event,
+        });
+
+        const ancestorCancelled = overrides?.isCancelled ?? false;
+        const ancestorIsError = overrides?.isError ?? false;
+        const duration = overrides?.duration ?? event.duration;
+        const events = [...(overrides?.events ?? []), ...(event.events ?? [])];
+        const isPartial = ancestorCancelled || ancestorIsError ? false : event.isPartial;
+        const isCancelled =
+          event.isCancelled === true ? true : event.isPartial && ancestorCancelled;
+        const isError = isCancelled
+          ? false
+          : typeof overrides?.isError === "boolean"
+          ? overrides.isError
+          : event.isError;
+
+        const span = {
+          id: event.spanId,
+          parentId: event.parentId ?? undefined,
+          runId: event.runId,
+          data: {
+            message: event.message,
+            style: event.style,
+            duration,
+            isError,
+            isPartial,
+            isCancelled,
+            isDebug: event.kind === TaskEventKind.LOG,
+            startTime: getDateFromNanoseconds(event.startTime),
+            level: event.level,
+            events,
+          },
+        };
+
+        spansBySpanId.set(event.spanId, span);
+
+        return span;
+      });
+
+      if (!rootSpanId) {
+        return;
+      }
+
+      const rootSpan = spansBySpanId.get(rootSpanId);
+
+      if (!rootSpan) {
+        return;
+      }
+
+      return {
+        rootSpan,
+        spans,
+      };
+    });
+  }
+
+  public async getTraceDetailedSummary(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<TraceDetailedSummary | undefined> {
+    return await startActiveSpan("getTraceDetailedSummary", async (span) => {
+      const events = await this.taskEventStore.findDetailedTraceEvents(
+        storeTable,
+        traceId,
+        startCreatedAt,
+        endCreatedAt,
+        { includeDebugLogs: options?.includeDebugLogs }
+      );
+
+      let preparedEvents: Array<PreparedDetailedEvent> = [];
+      let rootSpanId: string | undefined;
+      const eventsBySpanId = new Map<string, PreparedDetailedEvent>();
+
+      for (const event of events) {
+        preparedEvents.push(prepareDetailedEvent(event));
+
+        if (!rootSpanId && !event.parentId) {
+          rootSpanId = event.spanId;
+        }
+      }
+
+      for (const event of preparedEvents) {
+        const existingEvent = eventsBySpanId.get(event.spanId);
+
+        if (!existingEvent) {
+          eventsBySpanId.set(event.spanId, event);
+          continue;
+        }
+
+        // This is an invisible event, and we just want to keep the original event but concat together
+        // the event.events with the existingEvent.events
+        if (event.kind === "UNSPECIFIED") {
+          eventsBySpanId.set(event.spanId, {
+            ...existingEvent,
+            events: [...(existingEvent.events ?? []), ...(event.events ?? [])],
+          });
+          continue;
+        }
+
+        if (event.isCancelled || !event.isPartial) {
+          // If we have a cancelled event and an existing partial event,
+          // merge them: use cancelled event data but preserve style from the partial event
+          if (event.isCancelled && existingEvent.isPartial && !existingEvent.isCancelled) {
+            const mergedEvent: PreparedDetailedEvent = {
+              ...event, // Use cancelled event as base (has correct timing, status, events)
+              // Preserve style from the original partial event
+              style: existingEvent.style,
+              events: [...(existingEvent.events ?? []), ...(event.events ?? [])],
+            };
+            eventsBySpanId.set(event.spanId, mergedEvent);
+            continue;
+          }
+        }
+      }
+
+      preparedEvents = Array.from(eventsBySpanId.values());
+
+      if (!rootSpanId) {
+        return;
+      }
+
+      // Build hierarchical structure
+      const spanDetailedSummaryMap = new Map<string, SpanDetailedSummary>();
+
+      // First pass: create all span detailed summaries
+      for (const event of preparedEvents) {
+        const overrides = getAncestorOverrides({
+          spansById: eventsBySpanId,
+          span: event,
+        });
+
+        const ancestorCancelled = overrides?.isCancelled ?? false;
+        const ancestorIsError = overrides?.isError ?? false;
+        const duration = overrides?.duration ?? event.duration;
+        const events = [...(overrides?.events ?? []), ...(event.events ?? [])];
+        const isPartial = ancestorCancelled || ancestorIsError ? false : event.isPartial;
+        const isCancelled =
+          event.isCancelled === true ? true : event.isPartial && ancestorCancelled;
+        const isError = isCancelled
+          ? false
+          : typeof overrides?.isError === "boolean"
+          ? overrides.isError
+          : event.isError;
+
+        const properties = event.properties
+          ? removePrivateProperties(event.properties as Attributes)
+          : {};
+
+        const spanDetailedSummary: SpanDetailedSummary = {
+          id: event.spanId,
+          parentId: event.parentId ?? undefined,
+          runId: event.runId,
+          data: {
+            message: event.message,
+            taskSlug: event.taskSlug ?? undefined,
+            events: events?.filter((e) => !e.name.startsWith("trigger.dev")),
+            startTime: getDateFromNanoseconds(event.startTime),
+            duration: nanosecondsToMilliseconds(duration),
+            isError,
+            isPartial,
+            isCancelled,
+            level: event.level,
+            properties,
+          },
+          children: [],
+        };
+
+        spanDetailedSummaryMap.set(event.spanId, spanDetailedSummary);
+      }
+
+      // Second pass: build parent-child relationships
+      for (const spanSummary of spanDetailedSummaryMap.values()) {
+        if (spanSummary.parentId) {
+          const parent = spanDetailedSummaryMap.get(spanSummary.parentId);
+          if (parent) {
+            parent.children.push(spanSummary);
+          }
+        }
+      }
+
+      const rootSpan = spanDetailedSummaryMap.get(rootSpanId);
+
+      if (!rootSpan) {
+        return;
+      }
+
+      return {
+        traceId,
+        rootSpan,
+      };
+    });
+  }
+
+  public async getRunEvents(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    runId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date
+  ): Promise<RunPreparedEvent[]> {
+    return await startActiveSpan("getRunEvents", async (span) => {
+      const events = await this.taskEventStore.findMany(
+        storeTable,
+        {
+          runId,
+          isPartial: false,
+        },
+        startCreatedAt,
+        endCreatedAt,
+        {
+          spanId: true,
+          parentId: true,
+          runId: true,
+          idempotencyKey: true,
+          message: true,
+          style: true,
+          startTime: true,
+          duration: true,
+          isError: true,
+          isPartial: true,
+          isCancelled: true,
+          kind: true,
+          level: true,
+          events: true,
+          environmentType: true,
+          taskSlug: true,
+          attemptNumber: true,
+        }
+      );
+
+      let preparedEvents: Array<PreparedEvent> = [];
+
+      for (const event of events) {
+        if (event.kind === "UNSPECIFIED") {
+          continue;
+        }
+
+        preparedEvents.push(prepareEvent(event));
+      }
+
+      return preparedEvents;
+    });
+  }
+
+  // A Span can be cancelled if it is partial and has a parent that is cancelled
+  // And a span's duration, if it is partial and has a cancelled parent, is the time between the start of the span and the time of the cancellation event of the parent
+  public async getSpan(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    spanId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<SpanDetail | undefined> {
+    return await startActiveSpan("getSpan", async (s) => {
+      const spanEvent = await this.#getSpanEvent({
+        storeTable,
+        spanId,
+        environmentId,
+        startCreatedAt,
+        endCreatedAt,
+        options,
+      });
+
+      if (!spanEvent) {
+        return;
+      }
+
+      const preparedEvent = prepareEvent(spanEvent);
+
+      const span = await this.#createSpanFromEvent(
+        storeTable,
+        preparedEvent,
+        environmentId,
+        startCreatedAt,
+        endCreatedAt
+      );
+
+      const properties = sanitizedAttributes(spanEvent.properties);
+
+      const spanEvents = transformEvents(
+        span.data.events,
+        spanEvent.metadata as Attributes,
+        spanEvent.environmentType === "DEVELOPMENT"
+      );
+
+      // Used for waitpoint token spans
+      const entity = {
+        type: rehydrateAttribute<string>(
+          spanEvent.properties,
+          SemanticInternalAttributes.ENTITY_TYPE
+        ),
+        id: rehydrateAttribute<string>(spanEvent.properties, SemanticInternalAttributes.ENTITY_ID),
+        metadata: undefined,
+      };
+
+      return {
+        // Core Identity & Structure
+        spanId: spanEvent.spanId,
+        parentId: spanEvent.parentId,
+        message: spanEvent.message,
+
+        // Status & State
+        isError: span.data.isError,
+        isPartial: span.data.isPartial,
+        isCancelled: span.data.isCancelled,
+        level: spanEvent.level,
+        kind: spanEvent.kind,
+
+        // Timing
+        startTime: span.data.startTime,
+        duration: nanosecondsToMilliseconds(span.data.duration),
+
+        // Content & Display
+        events: spanEvents,
+        style: span.data.style,
+        properties: properties,
+
+        // Entity & Relationships
+        entity,
+
+        // Additional properties
+        metadata: spanEvent.metadata,
+      };
+    });
+  }
+
+  async #createSpanFromEvent(
+    storeTable: TaskEventStoreTable,
+    event: PreparedEvent,
+    environmentId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date
+  ) {
+    return await startActiveSpan("createSpanFromEvent", async (s) => {
+      let overrides: AncestorOverrides | undefined;
+
+      if (!event.isCancelled && event.isPartial) {
+        await this.#walkSpanAncestors(
+          storeTable,
+          event,
+          environmentId,
+          startCreatedAt,
+          endCreatedAt,
+          (ancestorEvent, level) => {
+            if (level >= 8) {
+              return { stop: true };
+            }
+
+            if (ancestorEvent.isCancelled) {
+              overrides = {
+                isCancelled: true,
+              };
+
+              // We need to get the cancellation time from the cancellation span event
+              const cancellationEvent = ancestorEvent.events.find(
+                (event) => event.name === "cancellation"
+              );
+
+              if (cancellationEvent) {
+                overrides.duration = calculateDurationFromStart(
+                  event.startTime,
+                  cancellationEvent.time
+                );
+              }
+
+              return { stop: true };
+            }
+
+            const attemptFailedEvent = (ancestorEvent.events ?? []).find(
+              (spanEvent) =>
+                spanEvent.name === "attempt_failed" &&
+                spanEvent.properties.attemptNumber === event.attemptNumber
+            );
+
+            if (!attemptFailedEvent) {
+              return { stop: false };
+            }
+
+            overrides = {
+              isError: true,
+              events: [
+                {
+                  name: "exception",
+                  time: attemptFailedEvent.time,
+                  properties: {
+                    exception: (attemptFailedEvent as AttemptFailedSpanEvent).properties.exception,
+                  },
+                },
+              ],
+              duration: calculateDurationFromStart(event.startTime, attemptFailedEvent.time),
+            };
+
+            return { stop: false };
+          }
+        );
+      }
+
+      const ancestorCancelled = overrides?.isCancelled ?? false;
+      const ancestorIsError = overrides?.isError ?? false;
+      const duration = overrides?.duration ?? event.duration;
+      const events = [...(overrides?.events ?? []), ...(event.events ?? [])];
+      const isPartial = ancestorCancelled || ancestorIsError ? false : event.isPartial;
+      const isCancelled = event.isCancelled === true ? true : event.isPartial && ancestorCancelled;
+      const isError = isCancelled
+        ? false
+        : typeof overrides?.isError === "boolean"
+        ? overrides.isError
+        : event.isError;
+
+      const span = {
+        id: event.spanId,
+        parentId: event.parentId ?? undefined,
+        runId: event.runId,
+        data: {
+          message: event.message,
+          style: event.style,
+          duration,
+          isError,
+          isPartial,
+          isCancelled,
+          startTime: getDateFromNanoseconds(event.startTime),
+          level: event.level,
+          events,
+        },
+      };
+
+      return span;
+    });
+  }
+
+  async #walkSpanAncestors(
+    storeTable: TaskEventStoreTable,
+    event: PreparedEvent,
+    environmentId: string,
+    startCreatedAt: Date,
+    endCreatedAt: Date | undefined,
+    callback: (event: PreparedEvent, level: number) => { stop: boolean }
+  ) {
+    const parentId = event.parentId;
+    if (!parentId) {
+      return;
+    }
+
+    await startActiveSpan("walkSpanAncestors", async (s) => {
+      let parentEvent = await this.#getSpanEvent({
+        storeTable,
+        spanId: parentId,
+        environmentId,
+        startCreatedAt,
+        endCreatedAt,
+      });
+      let level = 1;
+
+      while (parentEvent) {
+        const preparedParentEvent = prepareEvent(parentEvent);
+
+        const result = callback(preparedParentEvent, level);
+
+        if (result.stop) {
+          return;
+        }
+
+        if (!preparedParentEvent.parentId) {
+          return;
+        }
+
+        parentEvent = await this.#getSpanEvent({
+          storeTable,
+          spanId: preparedParentEvent.parentId,
+          environmentId,
+          startCreatedAt,
+          endCreatedAt,
+        });
+
+        level++;
+      }
+    });
+  }
+
+  async #getSpanEvent({
+    storeTable,
+    spanId,
+    environmentId,
+    startCreatedAt,
+    endCreatedAt,
+    options,
+  }: {
+    storeTable: TaskEventStoreTable;
+    spanId: string;
+    environmentId: string;
+    startCreatedAt: Date;
+    endCreatedAt?: Date;
+    options?: { includeDebugLogs?: boolean };
+  }) {
+    return await startActiveSpan("getSpanEvent", async (s) => {
+      const events = await this.taskEventStore.findMany(
+        storeTable,
+        { spanId, environmentId },
+        startCreatedAt,
+        endCreatedAt,
+        undefined,
+        {
+          startTime: "asc",
+        },
+        options
+      );
+
+      let finalEvent: TaskEvent | undefined;
+      let overrideEvents: TaskEvent[] = [];
+      let partialEvent: TaskEvent | undefined;
+
+      // Separate partial and final events
+      for (const event of events) {
+        if (event.kind === "UNSPECIFIED") {
+          overrideEvents.push(event);
+          continue;
+        }
+
+        if (event.isPartial) {
+          // Take the first partial event (earliest)
+          if (!partialEvent) {
+            partialEvent = event;
+          }
+        } else {
+          // Take the last complete/cancelled event (most recent)
+          finalEvent = event;
+        }
+      }
+
+      // If we have both partial and final events, merge them intelligently
+      if (finalEvent && partialEvent) {
+        return this.#mergeOverrides(
+          this.#mergePartialWithFinalEvent(partialEvent, finalEvent),
+          overrideEvents
+        );
+      }
+
+      // Return whichever event we have
+      return this.#mergeOverrides(finalEvent ?? partialEvent, overrideEvents);
+    });
+  }
+
+  /**
+   * Merges a partial event with a final (complete/cancelled) event.
+   * Uses the final event as base but fills in missing fields from the partial event.
+   */
+  #mergePartialWithFinalEvent(partialEvent: TaskEvent, finalEvent: TaskEvent): TaskEvent {
+    const merged = {
+      ...finalEvent, // Use final event as base
+      // Override with partial event fields only if final event fields are missing/empty
+      properties: isEmpty(finalEvent.properties) ? partialEvent.properties : finalEvent.properties,
+      metadata: isEmpty(finalEvent.metadata) ? partialEvent.metadata : finalEvent.metadata,
+      style: isEmpty(finalEvent.style) ? partialEvent.style : finalEvent.style,
+      output: isEmpty(finalEvent.output) ? partialEvent.output : finalEvent.output,
+      payload: isEmpty(finalEvent.payload) ? partialEvent.payload : finalEvent.payload,
+      payloadType: !finalEvent.payloadType ? partialEvent.payloadType : finalEvent.payloadType,
+    };
+
+    return merged;
+  }
+
+  #mergeOverrides(
+    event: TaskEvent | undefined,
+    overrideEvents: TaskEvent[]
+  ): TaskEvent | undefined {
+    function extractEventsFromEvent(event: TaskEvent): SpanEvent[] {
+      return (event.events ?? []) as unknown as SpanEvent[];
+    }
+
+    if (!event) {
+      return;
+    }
+
+    return {
+      ...event,
+      events: [
+        ...extractEventsFromEvent(event),
+        ...overrideEvents.flatMap(extractEventsFromEvent),
+      ] as unknown as Prisma.JsonValue,
+    };
+  }
+
+  public async recordEvent(
+    message: string,
+    options: TraceEventOptions & { duration?: number; parentId?: string }
+  ) {
+    const propagatedContext = extractContextFromCarrier(options.context ?? {});
+
+    const startTime = options.startTime ?? getNowInNanoseconds();
+    const duration =
+      options.duration ??
+      (options.endTime ? calculateDurationFromStart(startTime, options.endTime) : 100);
+
+    const traceId = propagatedContext?.traceparent?.traceId ?? generateTraceId();
+    const parentId = options.parentId ?? propagatedContext?.traceparent?.spanId;
+    const tracestate = propagatedContext?.tracestate;
+    const spanId = options.spanIdSeed
+      ? generateDeterministicSpanId(traceId, options.spanIdSeed)
+      : generateSpanId();
+
+    const metadata = {
+      [SemanticInternalAttributes.ENVIRONMENT_ID]: options.environment.id,
+      [SemanticInternalAttributes.ENVIRONMENT_TYPE]: options.environment.type,
+      [SemanticInternalAttributes.ORGANIZATION_ID]: options.environment.organizationId,
+      [SemanticInternalAttributes.PROJECT_ID]: options.environment.projectId,
+      [SemanticInternalAttributes.PROJECT_REF]: options.environment.project.externalRef,
+      [SemanticInternalAttributes.RUN_ID]: options.attributes.runId,
+      [SemanticInternalAttributes.TASK_SLUG]: options.taskSlug,
+      [SemanticResourceAttributes.SERVICE_NAME]: "api server",
+      [SemanticResourceAttributes.SERVICE_NAMESPACE]: "trigger.dev",
+      ...options.attributes.metadata,
+    };
+
+    const style = {
+      [SemanticInternalAttributes.STYLE_ICON]: options.attributes.isDebug ? "warn" : "play",
+    };
+
+    if (!options.attributes.runId) {
+      throw new Error("runId is required");
+    }
+
+    const event: CreateEventInput = {
+      traceId,
+      spanId,
+      parentId,
+      message: message,
+      level: options.attributes.isDebug ? "WARN" : "TRACE",
+      kind: options.attributes.isDebug ? TaskEventKind.LOG : options.kind,
+      status: "OK",
+      startTime,
+      isPartial: false,
+      duration, // convert to nanoseconds
+      environmentId: options.environment.id,
+      environmentType: options.environment.type,
+      organizationId: options.environment.organizationId,
+      runId: options.attributes.runId,
+      projectId: options.environment.projectId,
+      taskSlug: options.taskSlug,
+      properties: {
+        ...style,
+        ...(flattenAttributes(metadata, SemanticInternalAttributes.METADATA) as Record<
+          string,
+          string
+        >),
+        ...options.attributes.properties,
+      },
+      metadata: metadata,
+      style: stripAttributePrefix(style, SemanticInternalAttributes.STYLE),
+    };
+
+    if (options.immediate) {
+      await this.insertImmediate(event);
+    } else {
+      this._flushScheduler.addToBatch([this.#createableEventToPrismaEvent(event)]);
+    }
+  }
+
+  public async traceEvent<TResult>(
+    message: string,
+    options: TraceEventOptions & { incomplete?: boolean; isError?: boolean },
+    callback: (
+      e: EventBuilder,
+      traceContext: Record<string, string | undefined>,
+      traceparent?: { traceId: string; spanId: string }
+    ) => Promise<TResult>
+  ): Promise<TResult> {
+    const propagatedContext = extractContextFromCarrier(options.context ?? {});
+
+    const start = process.hrtime.bigint();
+    const startTime = options.startTime ?? getNowInNanoseconds();
+
+    const traceId = options.spanParentAsLink
+      ? generateTraceId()
+      : propagatedContext?.traceparent?.traceId ?? generateTraceId();
+    const parentId = options.spanParentAsLink ? undefined : propagatedContext?.traceparent?.spanId;
+    const tracestate = options.spanParentAsLink ? undefined : propagatedContext?.tracestate;
+    const spanId = options.spanIdSeed
+      ? generateDeterministicSpanId(traceId, options.spanIdSeed)
+      : generateSpanId();
+
+    const traceContext = {
+      ...options.context,
+      traceparent: serializeTraceparent(traceId, spanId),
+    };
+
+    let isStopped = false;
+    let failedWithError: TaskRunError | undefined;
+
+    const eventBuilder = {
+      traceId,
+      spanId,
+      setAttribute: (key: keyof TraceAttributes, value: TraceAttributes[keyof TraceAttributes]) => {
+        if (value) {
+          // We need to merge the attributes with the existing attributes
+          const existingValue = options.attributes[key];
+
+          if (existingValue && typeof existingValue === "object" && typeof value === "object") {
+            // @ts-ignore
+            options.attributes[key] = { ...existingValue, ...value };
+          } else {
+            // @ts-ignore
+            options.attributes[key] = value;
+          }
+        }
+      },
+      stop: () => {
+        isStopped = true;
+      },
+      failWithError: (error: TaskRunError) => {
+        failedWithError = error;
+      },
+    };
+
+    const result = await callback(eventBuilder, traceContext, propagatedContext?.traceparent);
+
+    if (isStopped) {
+      return result;
+    }
+
+    const duration = process.hrtime.bigint() - start;
+
+    const metadata = {
+      [SemanticInternalAttributes.ENVIRONMENT_ID]: options.environment.id,
+      [SemanticInternalAttributes.ENVIRONMENT_TYPE]: options.environment.type,
+      [SemanticInternalAttributes.ORGANIZATION_ID]: options.environment.organizationId,
+      [SemanticInternalAttributes.PROJECT_ID]: options.environment.projectId,
+      [SemanticInternalAttributes.PROJECT_REF]: options.environment.project.externalRef,
+      [SemanticInternalAttributes.RUN_ID]: options.attributes.runId,
+      [SemanticInternalAttributes.TASK_SLUG]: options.taskSlug,
+      [SemanticResourceAttributes.SERVICE_NAME]: "api server",
+      [SemanticResourceAttributes.SERVICE_NAMESPACE]: "trigger.dev",
+      ...options.attributes.metadata,
+    };
+
+    const style = {
+      [SemanticInternalAttributes.STYLE_ICON]: "task",
+      [SemanticInternalAttributes.STYLE_VARIANT]: PRIMARY_VARIANT,
+      ...options.attributes.style,
+    };
+
+    if (!options.attributes.runId) {
+      throw new Error("runId is required");
+    }
+
+    const event: CreateEventInput = {
+      traceId,
+      spanId,
+      parentId,
+      duration: options.incomplete ? 0 : duration,
+      isPartial: failedWithError ? false : options.incomplete,
+      isError: options.isError === true || !!failedWithError,
+      message: message,
+      level: "TRACE",
+      kind: options.kind,
+      status: failedWithError ? "ERROR" : "OK",
+      startTime,
+      environmentId: options.environment.id,
+      environmentType: options.environment.type,
+      organizationId: options.environment.organizationId,
+      projectId: options.environment.projectId,
+      runId: options.attributes.runId,
+      taskSlug: options.taskSlug,
+      properties: {
+        ...(flattenAttributes(metadata, SemanticInternalAttributes.METADATA) as Record<
+          string,
+          string
+        >),
+        ...flattenAttributes(options.attributes.properties),
+      },
+      metadata: metadata,
+      style: stripAttributePrefix(style, SemanticInternalAttributes.STYLE),
+      events: failedWithError
+        ? [
+            {
+              name: "exception",
+              time: new Date(),
+              properties: {
+                exception: createExceptionPropertiesFromError(failedWithError),
+              },
+            },
+          ]
+        : undefined,
+    };
+
+    if (options.immediate) {
+      await this.insertImmediate(event);
+    } else {
+      this._flushScheduler.addToBatch([this.#createableEventToPrismaEvent(event)]);
+    }
+
+    return result;
+  }
+
+  async #flushBatch(flushId: string, batch: Prisma.TaskEventCreateManyInput[]) {
+    await startSpan(this._tracer, "flushBatch", async (span) => {
+      const events = excludePartialEventsWithCorrespondingFullEvent(batch);
+
+      span.setAttribute("flush_id", flushId);
+      span.setAttribute("event_count", events.length);
+      span.setAttribute("partial_event_count", batch.length - events.length);
+      span.setAttribute(
+        "last_flush_in_ms",
+        this._lastFlushedAt ? new Date().getTime() - this._lastFlushedAt.getTime() : 0
+      );
+
+      const flushedEvents = await this.#doFlushBatch(flushId, events);
+
+      this._lastFlushedAt = new Date();
+
+      if (flushedEvents.length !== events.length) {
+        logger.debug("[EventRepository][flushBatch] Failed to insert all events", {
+          attemptCount: events.length,
+          successCount: flushedEvents.length,
+        });
+
+        span.setAttribute("failed_event_count", events.length - flushedEvents.length);
+      }
+
+      this.#publishToRedis(flushedEvents);
+    });
+  }
+
+  async #flushBatchWithReturn(
+    flushId: string,
+    batch: Prisma.TaskEventCreateManyInput[]
+  ): Promise<Prisma.TaskEventCreateManyInput[]> {
+    return await startSpan(this._tracer, "flushBatch", async (span) => {
+      const events = excludePartialEventsWithCorrespondingFullEvent(batch);
+
+      span.setAttribute("flush_id", flushId);
+      span.setAttribute("event_count", events.length);
+      span.setAttribute("partial_event_count", batch.length - events.length);
+      span.setAttribute(
+        "last_flush_in_ms",
+        this._lastFlushedAt ? new Date().getTime() - this._lastFlushedAt.getTime() : 0
+      );
+
+      const flushedEvents = await this.#doFlushBatch(flushId, events);
+
+      this._lastFlushedAt = new Date();
+
+      if (flushedEvents.length !== events.length) {
+        logger.debug("[EventRepository][flushBatch] Failed to insert all events", {
+          attemptCount: events.length,
+          successCount: flushedEvents.length,
+        });
+
+        span.setAttribute("failed_event_count", events.length - flushedEvents.length);
+      }
+
+      this.#publishToRedis(flushedEvents);
+
+      return flushedEvents;
+    });
+  }
+
+  private get taskEventStoreTable(): TaskEventStoreTable {
+    return this._config.partitioningEnabled ? "taskEventPartitioned" : "taskEvent";
+  }
+
+  async #doFlushBatch(
+    flushId: string,
+    events: Prisma.TaskEventCreateManyInput[],
+    depth: number = 1
+  ): Promise<Prisma.TaskEventCreateManyInput[]> {
+    return await startSpan(this._tracer, "doFlushBatch", async (span) => {
+      try {
+        span.setAttribute("event_count", events.length);
+        span.setAttribute("depth", depth);
+        span.setAttribute("flush_id", flushId);
+
+        await this.taskEventStore.createMany(
+          this.taskEventStoreTable,
+          events as Prisma.TaskEventCreateManyInput[]
+        );
+
+        span.setAttribute("inserted_event_count", events.length);
+
+        return events;
+      } catch (error) {
+        if (isRetriablePrismaError(error)) {
+          const isKnownError = error instanceof Prisma.PrismaClientKnownRequestError;
+          span.setAttribute("prisma_error_type", isKnownError ? "known" : "unknown");
+
+          const errorDetails = getPrismaErrorDetails(error);
+          if (errorDetails.code) {
+            span.setAttribute("prisma_error_code", errorDetails.code);
+          }
+
+          logger.info("Failed to insert events, will attempt bisection", {
+            error: errorDetails,
+          });
+
+          if (events.length === 1) {
+            logger.debug("Attempting to insert event individually and it failed", {
+              event: events[0],
+              error: errorDetails,
+            });
+
+            span.setAttribute("failed_event_count", 1);
+
+            return [];
+          }
+
+          if (depth > MAX_FLUSH_DEPTH) {
+            logger.error("Failed to insert events, reached maximum depth", {
+              error: errorDetails,
+              depth,
+              eventsCount: events.length,
+            });
+
+            span.setAttribute("reached_max_flush_depth", true);
+            span.setAttribute("failed_event_count", events.length);
+
+            return [];
+          }
+
+          // Split the events into two batches, and recursively try to insert them.
+          const middle = Math.floor(events.length / 2);
+          const [firstHalf, secondHalf] = [events.slice(0, middle), events.slice(middle)];
+
+          return await startSpan(this._tracer, "bisectBatch", async (span) => {
+            span.setAttribute("first_half_count", firstHalf.length);
+            span.setAttribute("second_half_count", secondHalf.length);
+            span.setAttribute("depth", depth);
+            span.setAttribute("flush_id", flushId);
+
+            const [firstHalfEvents, secondHalfEvents] = await Promise.all([
+              this.#doFlushBatch(flushId, firstHalf, depth + 1),
+              this.#doFlushBatch(flushId, secondHalf, depth + 1),
+            ]);
+
+            return firstHalfEvents.concat(secondHalfEvents);
+          });
+        }
+
+        throw error;
+      }
+    });
+  }
+
+  async #publishToRedis(events: Prisma.TaskEventCreateManyInput[]) {
+    if (events.length === 0) return;
+
+    await tracePubSub.publish(events.map((e) => e.traceId));
+  }
+}
+
+export const eventRepository = singleton("eventRepo", initializeEventRepo);
+
+function initializeEventRepo() {
+  const repo = new EventRepository(prisma, $replica, {
+    batchSize: env.EVENTS_BATCH_SIZE,
+    batchInterval: env.EVENTS_BATCH_INTERVAL,
+    retentionInDays: env.EVENTS_DEFAULT_LOG_RETENTION,
+    partitioningEnabled: env.TASK_EVENT_PARTITIONING_ENABLED === "1",
+    minConcurrency: env.EVENTS_MIN_CONCURRENCY,
+    maxConcurrency: env.EVENTS_MAX_CONCURRENCY,
+    maxBatchSize: env.EVENTS_MAX_BATCH_SIZE,
+    memoryPressureThreshold: env.EVENTS_MEMORY_PRESSURE_THRESHOLD,
+    loadSheddingThreshold: env.EVENTS_LOAD_SHEDDING_THRESHOLD,
+    loadSheddingEnabled: env.EVENTS_LOAD_SHEDDING_ENABLED === "1",
+  });
+
+  new Gauge({
+    name: "event_repository_subscriber_count",
+    help: "Number of event repository subscribers",
+    collect() {
+      this.set(repo.subscriberCount);
+    },
+    registers: [metricsRegister],
+  });
+
+  // Add metrics for flush scheduler
+  new Gauge({
+    name: "event_flush_scheduler_queued_items",
+    help: "Total number of items queued in the flush scheduler",
+    collect() {
+      const status = repo.flushSchedulerStatus;
+      this.set(status.queuedItems);
+    },
+    registers: [metricsRegister],
+  });
+
+  new Gauge({
+    name: "event_flush_scheduler_batch_queue_length",
+    help: "Number of batches waiting to be flushed",
+    collect() {
+      const status = repo.flushSchedulerStatus;
+      this.set(status.batchQueueLength);
+    },
+    registers: [metricsRegister],
+  });
+
+  new Gauge({
+    name: "event_flush_scheduler_concurrency",
+    help: "Current concurrency level of the flush scheduler",
+    collect() {
+      const status = repo.flushSchedulerStatus;
+      this.set(status.concurrency);
+    },
+    registers: [metricsRegister],
+  });
+
+  new Gauge({
+    name: "event_flush_scheduler_active_flushes",
+    help: "Number of active flush operations",
+    collect() {
+      const status = repo.flushSchedulerStatus;
+      this.set(status.activeFlushes);
+    },
+    registers: [metricsRegister],
+  });
+
+  new Gauge({
+    name: "event_flush_scheduler_dropped_events",
+    help: "Total number of events dropped due to load shedding",
+    collect() {
+      const status = repo.flushSchedulerStatus;
+      this.set(status.metrics.droppedEvents);
+    },
+    registers: [metricsRegister],
+  });
+
+  new Gauge({
+    name: "event_flush_scheduler_is_load_shedding",
+    help: "Whether load shedding is currently active (1 = active, 0 = inactive)",
+    collect() {
+      const status = repo.flushSchedulerStatus;
+      this.set(status.isLoadShedding ? 1 : 0);
+    },
+    registers: [metricsRegister],
+  });
+
+  return repo;
+}
+
+/**
+ * Filters out partial events from a batch of creatable events, excluding those that have a corresponding full event.
+ * @param batch - The batch of creatable events to filter.
+ * @returns The filtered array of creatable events, excluding partial events with corresponding full events.
+ */
+function excludePartialEventsWithCorrespondingFullEvent(
+  batch: Prisma.TaskEventCreateManyInput[]
+): Prisma.TaskEventCreateManyInput[] {
+  const partialEvents = batch.filter((event) => event.isPartial);
+  const fullEvents = batch.filter((event) => !event.isPartial);
+
+  return fullEvents.concat(
+    partialEvents.filter((partialEvent) => {
+      return !fullEvents.some((fullEvent) => fullEvent.spanId === partialEvent.spanId);
+    })
+  );
+}
+
+function prepareEvent(event: QueriedEvent): PreparedEvent {
+  return {
+    ...event,
+    duration: Number(event.duration),
+    events: parseEventsField(event.events),
+    style: parseStyleField(event.style),
+  };
+}
+
+function prepareDetailedEvent(event: DetailedTraceEvent): PreparedDetailedEvent {
+  return {
+    ...event,
+    duration: Number(event.duration),
+    events: parseEventsField(event.events),
+    style: parseStyleField(event.style),
+  };
+}
+
+function parseStyleField(style: Prisma.JsonValue): TaskEventStyle {
+  const unsafe = unflattenAttributes(style as Attributes);
+
+  if (!unsafe) {
+    return {};
+  }
+
+  if (typeof unsafe === "object") {
+    return Object.assign(
+      {
+        icon: undefined,
+        variant: undefined,
+      },
+      unsafe
+    ) as TaskEventStyle;
+  }
+
+  return {};
+}
+
+type AncestorOverrides = {
+  isCancelled?: boolean;
+  duration?: number;
+  isError?: boolean;
+  events?: SpanEvents;
+};
+
+function getAncestorOverrides({
+  spansById,
+  span,
+}: {
+  spansById: Map<string, PreparedEvent>;
+  span: PreparedEvent;
+}): AncestorOverrides | undefined {
+  if (span.level !== "TRACE") {
+    return;
+  }
+
+  if (!span.isPartial) {
+    return;
+  }
+
+  const overrides: AncestorOverrides = {};
+
+  const cancelledAncestor = findCancelledAncestor(spansById, span, span.spanId);
+
+  if (cancelledAncestor) {
+    overrides.isCancelled = true;
+
+    // We need to get the cancellation time from the cancellation span event
+    const cancellationEvent = cancelledAncestor.events.find(
+      (event) => event.name === "cancellation"
+    );
+
+    if (cancellationEvent) {
+      overrides.duration = calculateDurationFromStart(span.startTime, cancellationEvent.time);
+    }
+
+    return overrides;
+  }
+
+  const attemptFailedAncestorEvent = findAttemptFailedAncestor(spansById, span, span.spanId);
+
+  if (attemptFailedAncestorEvent) {
+    overrides.isError = true;
+    overrides.events = [
+      {
+        name: "exception",
+        time: attemptFailedAncestorEvent.time,
+        properties: {
+          exception: attemptFailedAncestorEvent.properties.exception,
+        },
+      } satisfies ExceptionSpanEvent,
+    ];
+    overrides.duration = calculateDurationFromStart(
+      span.startTime,
+      attemptFailedAncestorEvent.time
+    );
+
+    return overrides;
+  }
+
+  return;
+}
+
+function findCancelledAncestor(
+  spansById: Map<string, PreparedEvent>,
+  originalSpan: PreparedEvent,
+  spanId?: string | null
+) {
+  if (!spanId) {
+    return;
+  }
+
+  if (originalSpan.spanId === spanId) {
+    return findCancelledAncestor(spansById, originalSpan, originalSpan.parentId);
+  }
+
+  const ancestorSpan = spansById.get(spanId);
+
+  if (!ancestorSpan) {
+    return;
+  }
+
+  if (ancestorSpan.isCancelled) {
+    return ancestorSpan;
+  }
+
+  if (ancestorSpan.parentId) {
+    return findCancelledAncestor(spansById, originalSpan, ancestorSpan.parentId);
+  }
+
+  return;
+}
+
+function findAttemptFailedAncestor(
+  spansById: Map<string, PreparedEvent>,
+  originalSpan: PreparedEvent,
+  spanId?: string | null
+) {
+  if (!spanId) {
+    return;
+  }
+
+  if (originalSpan.spanId === spanId) {
+    return findAttemptFailedAncestor(spansById, originalSpan, originalSpan.parentId);
+  }
+
+  const ancestorSpan = spansById.get(spanId);
+
+  if (!ancestorSpan) {
+    return;
+  }
+
+  const attemptFailedEvent = (ancestorSpan.events ?? []).find(
+    (event) =>
+      event.name === "attempt_failed" &&
+      event.properties.attemptNumber === originalSpan.attemptNumber
+  );
+
+  if (attemptFailedEvent) {
+    return attemptFailedEvent as AttemptFailedSpanEvent;
+  }
+
+  if (ancestorSpan.parentId) {
+    return findAttemptFailedAncestor(spansById, originalSpan, ancestorSpan.parentId);
+  }
+
+  return;
+}
+
+function sanitizedAttributes(json: Prisma.JsonValue) {
+  if (json === null || json === undefined) {
+    return;
+  }
+
+  const withoutPrivateProperties = removePrivateProperties(json as Attributes);
+  if (!withoutPrivateProperties) {
+    return;
+  }
+
+  return unflattenAttributes(withoutPrivateProperties);
+}
+
+function transformEvents(events: SpanEvents, properties: Attributes, isDev: boolean): SpanEvents {
+  return (events ?? []).map((event) => transformEvent(event, properties, isDev));
+}
+
+function transformEvent(event: SpanEvent, properties: Attributes, isDev: boolean): SpanEvent {
+  if (isExceptionSpanEvent(event)) {
+    return {
+      ...event,
+      properties: {
+        exception: transformException(event.properties.exception, properties, isDev),
+      },
+    };
+  }
+
+  return event;
+}
+
+function transformException(
+  exception: ExceptionEventProperties,
+  properties: Attributes,
+  isDev: boolean
+): ExceptionEventProperties {
+  const projectDirAttributeValue = properties[SemanticInternalAttributes.PROJECT_DIR];
+
+  if (projectDirAttributeValue !== undefined && typeof projectDirAttributeValue !== "string") {
+    return exception;
+  }
+
+  return {
+    ...exception,
+    stacktrace: exception.stacktrace
+      ? correctErrorStackTrace(exception.stacktrace, projectDirAttributeValue, {
+          removeFirstLine: true,
+          isDev,
+        })
+      : undefined,
+  };
+}
+
+export function rehydrateAttribute<T extends AttributeValue>(
+  properties: Prisma.JsonValue,
+  key: string
+): T | undefined {
+  if (properties === null || properties === undefined) {
+    return;
+  }
+
+  if (typeof properties !== "object") {
+    return;
+  }
+
+  if (Array.isArray(properties)) {
+    return;
+  }
+
+  const value = properties[key];
+
+  if (value === undefined) {
+    return;
+  }
+
+  return value as T;
+}
+
+/**
+ * Extracts error details from Prisma errors in a type-safe way.
+ * Only includes 'code' property for PrismaClientKnownRequestError.
+ */
+function getPrismaErrorDetails(
+  error: Prisma.PrismaClientUnknownRequestError | Prisma.PrismaClientKnownRequestError
+): {
+  name: string;
+  message: string;
+  stack: string | undefined;
+  clientVersion: string;
+  code?: string;
+} {
+  const base = {
+    name: error.name,
+    message: error.message,
+    stack: error.stack,
+    clientVersion: error.clientVersion,
+  };
+
+  if (error instanceof Prisma.PrismaClientKnownRequestError) {
+    return { ...base, code: error.code };
+  }
+
+  return base;
+}
+
+/**
+ * Checks if a PrismaClientKnownRequestError is a Unicode/hex escape error.
+ */
+function isUnicodeError(error: Prisma.PrismaClientKnownRequestError): boolean {
+  return (
+    error.message.includes("lone leading surrogate in hex escape") ||
+    error.message.includes("unexpected end of hex escape") ||
+    error.message.includes("invalid Unicode") ||
+    error.message.includes("invalid escape sequence")
+  );
+}
+
+/**
+ * Determines if a Prisma error should be retried with bisection logic.
+ * Returns true for errors that might be resolved by splitting the batch.
+ */
+function isRetriablePrismaError(
+  error: unknown
+): error is Prisma.PrismaClientUnknownRequestError | Prisma.PrismaClientKnownRequestError {
+  if (error instanceof Prisma.PrismaClientUnknownRequestError) {
+    // Always retry unknown errors with bisection
+    return true;
+  }
+
+  if (error instanceof Prisma.PrismaClientKnownRequestError) {
+    // Only retry known errors if they're Unicode/hex escape related
+    return isUnicodeError(error);
+  }
+
+  return false;
+}
+// Helper function to check if a field is empty/missing
+function isEmpty(value: any): boolean {
+  if (value === null || value === undefined) return true;
+  if (typeof value === "object" && !Array.isArray(value) && isEmptyObject(value)) return true;
+  return false;
+}
diff --git a/apps/webapp/app/v3/eventRepository/eventRepository.types.ts b/apps/webapp/app/v3/eventRepository/eventRepository.types.ts
new file mode 100644
index 00000000000..75664ad0525
--- /dev/null
+++ b/apps/webapp/app/v3/eventRepository/eventRepository.types.ts
@@ -0,0 +1,412 @@
+import { Attributes, Tracer } from "@opentelemetry/api";
+import type {
+  ExceptionEventProperties,
+  SpanEvents,
+  TaskEventEnvironment,
+  TaskEventStyle,
+  TaskRunError,
+} from "@trigger.dev/core/v3";
+import type {
+  Prisma,
+  TaskEvent,
+  TaskEventKind,
+  TaskEventLevel,
+  TaskEventStatus,
+  TaskRun,
+} from "@trigger.dev/database";
+import type { DetailedTraceEvent, TaskEventStoreTable } from "../taskEventStore.server";
+export type { ExceptionEventProperties };
+
+// ============================================================================
+// Event Creation Types
+// ============================================================================
+
+export type CreateEventInput = Omit<
+  Prisma.TaskEventCreateInput,
+  | "id"
+  | "createdAt"
+  | "properties"
+  | "metadata"
+  | "style"
+  | "output"
+  | "payload"
+  | "serviceName"
+  | "serviceNamespace"
+  | "tracestate"
+  | "projectRef"
+  | "runIsTest"
+  | "workerId"
+  | "queueId"
+  | "queueName"
+  | "batchId"
+  | "taskPath"
+  | "taskExportName"
+  | "workerVersion"
+  | "idempotencyKey"
+  | "attemptId"
+  | "usageDurationMs"
+  | "usageCostInCents"
+  | "machinePreset"
+  | "machinePresetCpu"
+  | "machinePresetMemory"
+  | "machinePresetCentsPerMs"
+  | "links"
+> & {
+  properties: Attributes;
+  resourceProperties?: Attributes;
+  metadata: Attributes | undefined;
+  style: Attributes | undefined;
+  machineId?: string;
+};
+
+export type CreatableEventKind = TaskEventKind;
+export type CreatableEventStatus = TaskEventStatus;
+
+// ============================================================================
+// Task Run Types
+// ============================================================================
+
+export type CompleteableTaskRun = Pick<
+  TaskRun,
+  | "friendlyId"
+  | "traceId"
+  | "spanId"
+  | "parentSpanId"
+  | "createdAt"
+  | "completedAt"
+  | "taskIdentifier"
+  | "projectId"
+  | "runtimeEnvironmentId"
+  | "organizationId"
+  | "isTest"
+>;
+
+// ============================================================================
+// Trace and Event Types
+// ============================================================================
+
+export type TraceAttributes = Partial<
+  Pick<
+    CreateEventInput,
+    "isError" | "isCancelled" | "isDebug" | "runId" | "metadata" | "properties" | "style"
+  >
+>;
+
+export type SetAttribute<T extends TraceAttributes> = (key: keyof T, value: T[keyof T]) => void;
+
+export type TraceEventOptions = {
+  kind?: CreatableEventKind;
+  context?: Record<string, unknown>;
+  spanParentAsLink?: boolean;
+  spanIdSeed?: string;
+  attributes: TraceAttributes;
+  environment: TaskEventEnvironment;
+  taskSlug: string;
+  startTime?: bigint;
+  endTime?: Date;
+  immediate?: boolean;
+};
+
+export type EventBuilder = {
+  traceId: string;
+  spanId: string;
+  setAttribute: SetAttribute<TraceAttributes>;
+  stop: () => void;
+  failWithError: (error: TaskRunError) => void;
+};
+
+export type UpdateEventOptions = {
+  attributes: TraceAttributes;
+  endTime?: Date;
+  immediate?: boolean;
+  events?: SpanEvents;
+};
+
+// ============================================================================
+// Configuration Types
+// ============================================================================
+
+export type EventRepoConfig = {
+  batchSize: number;
+  batchInterval: number;
+  retentionInDays: number;
+  partitioningEnabled: boolean;
+  tracer?: Tracer;
+  minConcurrency?: number;
+  maxConcurrency?: number;
+  maxBatchSize?: number;
+  memoryPressureThreshold?: number;
+  loadSheddingThreshold?: number;
+  loadSheddingEnabled?: boolean;
+};
+
+// ============================================================================
+// Query Types
+// ============================================================================
+
+export type QueryOptions = Prisma.TaskEventWhereInput;
+
+export type TaskEventRecord = TaskEvent;
+
+export type QueriedEvent = Prisma.TaskEventGetPayload<{
+  select: {
+    spanId: true;
+    parentId: true;
+    runId: true;
+    message: true;
+    style: true;
+    startTime: true;
+    duration: true;
+    isError: true;
+    isPartial: true;
+    isCancelled: true;
+    level: true;
+    events: true;
+    kind: true;
+    attemptNumber: true;
+  };
+}>;
+
+export type PreparedEvent = Omit<QueriedEvent, "events" | "style" | "duration"> & {
+  duration: number;
+  events: SpanEvents;
+  style: TaskEventStyle;
+};
+
+export type PreparedDetailedEvent = Omit<DetailedTraceEvent, "events" | "style" | "duration"> & {
+  duration: number;
+  events: SpanEvents;
+  style: TaskEventStyle;
+};
+
+export type RunPreparedEvent = PreparedEvent & {
+  taskSlug?: string;
+};
+
+export type SpanDetail = {
+  // ============================================================================
+  // Core Identity & Structure
+  // ============================================================================
+  spanId: string; // Tree structure, span identification
+  parentId: string | null; // Tree hierarchy
+  message: string; // Displayed as span title
+
+  // ============================================================================
+  // Status & State
+  // ============================================================================
+  isError: boolean; // Error status display, filtering, status icons
+  isPartial: boolean; // In-progress status display, timeline calculations
+  isCancelled: boolean; // Cancelled status display, status determination
+  level: TaskEventLevel; // Text styling, timeline rendering decisions
+
+  // ============================================================================
+  // Timing
+  // ============================================================================
+  startTime: Date; // Timeline calculations, display
+  duration: number; // Timeline width, duration display, calculations
+
+  // ============================================================================
+  // Content & Display
+  // ============================================================================
+  events: SpanEvents; // Timeline events, SpanEvents component
+  style: TaskEventStyle; // Icons, variants, accessories (RunIcon, SpanTitle)
+  properties: Record<string, unknown> | string | number | boolean | null | undefined; // Displayed as JSON in span properties (CodeBlock)
+  resourceProperties?: Record<string, unknown> | string | number | boolean | null | undefined; // Displayed as JSON in span resource properties (CodeBlock)
+
+  // ============================================================================
+  // Entity & Relationships
+  // ============================================================================
+  entity: {
+    // Used for entity type switching in SpanEntity
+    type: string | undefined;
+    id: string | undefined;
+    metadata: string | undefined;
+  };
+
+  metadata: any; // Used by SpanPresenter for entity processing
+};
+
+// ============================================================================
+// Span and Link Types
+// ============================================================================
+
+export type SpanSummaryCommon = {
+  id: string;
+  parentId: string | undefined;
+  runId: string;
+  data: {
+    message: string;
+    events: SpanEvents;
+    startTime: Date;
+    duration: number;
+    isError: boolean;
+    isPartial: boolean;
+    isCancelled: boolean;
+    level: NonNullable<CreateEventInput["level"]>;
+    attemptNumber?: number;
+  };
+};
+
+export type SpanSummary = {
+  id: string;
+  parentId: string | undefined;
+  runId: string;
+  data: {
+    message: string;
+    style: TaskEventStyle;
+    events: SpanEvents;
+    startTime: Date;
+    duration: number;
+    isError: boolean;
+    isPartial: boolean;
+    isCancelled: boolean;
+    isDebug: boolean;
+    level: NonNullable<CreateEventInput["level"]>;
+    attemptNumber?: number;
+  };
+};
+
+export type SpanOverride = {
+  isCancelled?: boolean;
+  isError?: boolean;
+  duration?: number;
+  events?: SpanEvents;
+};
+
+export type TraceSummary = {
+  rootSpan: SpanSummary;
+  spans: Array<SpanSummary>;
+  overridesBySpanId?: Record<string, SpanOverride>;
+};
+
+export type SpanDetailedSummary = {
+  id: string;
+  parentId: string | undefined;
+  runId: string;
+  data: {
+    message: string;
+    taskSlug?: string;
+    events: SpanEvents;
+    startTime: Date;
+    duration: number;
+    isError: boolean;
+    isPartial: boolean;
+    isCancelled: boolean;
+    level: NonNullable<CreateEventInput["level"]>;
+    attemptNumber?: number;
+    properties?: Attributes;
+  };
+  children: Array<SpanDetailedSummary>;
+};
+
+export type TraceDetailedSummary = {
+  traceId: string;
+  rootSpan: SpanDetailedSummary;
+};
+
+// ============================================================================
+// Event Repository Interface
+// ============================================================================
+
+/**
+ * Interface for the EventRepository class.
+ * Defines the public API for managing task events, traces, and spans.
+ */
+export interface IEventRepository {
+  maximumLiveReloadingSetting: number;
+  // Event insertion methods
+  insertMany(events: CreateEventInput[]): Promise<void>;
+  insertManyImmediate(events: CreateEventInput[]): Promise<void>;
+
+  // Run event completion methods
+  completeSuccessfulRunEvent(params: { run: CompleteableTaskRun; endTime?: Date }): Promise<void>;
+
+  completeCachedRunEvent(params: {
+    run: CompleteableTaskRun;
+    blockedRun: CompleteableTaskRun;
+    spanId: string;
+    parentSpanId: string;
+    spanCreatedAt: Date;
+    isError: boolean;
+    endTime?: Date;
+  }): Promise<void>;
+
+  completeFailedRunEvent(params: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    exception: { message?: string; type?: string; stacktrace?: string };
+  }): Promise<void>;
+
+  completeExpiredRunEvent(params: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    ttl: string;
+  }): Promise<void>;
+
+  createAttemptFailedRunEvent(params: {
+    run: CompleteableTaskRun;
+    endTime?: Date;
+    attemptNumber: number;
+    exception: { message?: string; type?: string; stacktrace?: string };
+  }): Promise<void>;
+
+  cancelRunEvent(params: {
+    reason: string;
+    run: CompleteableTaskRun;
+    cancelledAt: Date;
+  }): Promise<void>;
+
+  // Query methods
+  getTraceSummary(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<TraceSummary | undefined>;
+
+  getTraceDetailedSummary(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<TraceDetailedSummary | undefined>;
+
+  getRunEvents(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    traceId: string,
+    runId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date
+  ): Promise<RunPreparedEvent[]>;
+
+  getSpan(
+    storeTable: TaskEventStoreTable,
+    environmentId: string,
+    spanId: string,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ): Promise<SpanDetail | undefined>;
+
+  // Event recording methods
+  recordEvent(
+    message: string,
+    options: TraceEventOptions & { duration?: number; parentId?: string }
+  ): Promise<void>;
+
+  traceEvent<TResult>(
+    message: string,
+    options: TraceEventOptions & { incomplete?: boolean; isError?: boolean },
+    callback: (
+      e: EventBuilder,
+      traceContext: Record<string, string | undefined>,
+      traceparent?: { traceId: string; spanId: string }
+    ) => Promise<TResult>
+  ): Promise<TResult>;
+}
diff --git a/apps/webapp/app/v3/eventRepository/index.server.ts b/apps/webapp/app/v3/eventRepository/index.server.ts
new file mode 100644
index 00000000000..2f457e23593
--- /dev/null
+++ b/apps/webapp/app/v3/eventRepository/index.server.ts
@@ -0,0 +1,263 @@
+import { env } from "~/env.server";
+import { eventRepository } from "./eventRepository.server";
+import {
+  clickhouseEventRepository,
+  clickhouseEventRepositoryV2,
+} from "./clickhouseEventRepositoryInstance.server";
+import { IEventRepository, TraceEventOptions } from "./eventRepository.types";
+import { prisma } from "~/db.server";
+import { logger } from "~/services/logger.server";
+import { FEATURE_FLAG, flag } from "../featureFlags.server";
+import { getTaskEventStore } from "../taskEventStore.server";
+
+export function resolveEventRepositoryForStore(store: string | undefined): IEventRepository {
+  const taskEventStore = store ?? env.EVENT_REPOSITORY_DEFAULT_STORE;
+
+  if (taskEventStore === "clickhouse_v2") {
+    return clickhouseEventRepositoryV2;
+  }
+
+  if (taskEventStore === "clickhouse") {
+    return clickhouseEventRepository;
+  }
+
+  return eventRepository;
+}
+
+export const EVENT_STORE_TYPES = {
+  POSTGRES: "postgres",
+  CLICKHOUSE: "clickhouse",
+  CLICKHOUSE_V2: "clickhouse_v2",
+} as const;
+
+export type EventStoreType = (typeof EVENT_STORE_TYPES)[keyof typeof EVENT_STORE_TYPES];
+
+export async function getConfiguredEventRepository(
+  organizationId: string
+): Promise<{ repository: IEventRepository; store: EventStoreType }> {
+  const organization = await prisma.organization.findFirst({
+    select: {
+      id: true,
+      featureFlags: true,
+    },
+    where: {
+      id: organizationId,
+    },
+  });
+
+  if (!organization) {
+    throw new Error("Organization not found when configuring event repository");
+  }
+
+  // resolveTaskEventRepositoryFlag checks:
+  // 1. organization.featureFlags (highest priority)
+  // 2. global feature flags (via flags() function)
+  // 3. env.EVENT_REPOSITORY_DEFAULT_STORE (fallback)
+  const taskEventStore = await resolveTaskEventRepositoryFlag(
+    (organization.featureFlags as Record<string, unknown> | null) ?? undefined
+  );
+
+  if (taskEventStore === EVENT_STORE_TYPES.CLICKHOUSE_V2) {
+    return { repository: clickhouseEventRepositoryV2, store: EVENT_STORE_TYPES.CLICKHOUSE_V2 };
+  }
+
+  if (taskEventStore === EVENT_STORE_TYPES.CLICKHOUSE) {
+    return { repository: clickhouseEventRepository, store: EVENT_STORE_TYPES.CLICKHOUSE };
+  }
+
+  return { repository: eventRepository, store: EVENT_STORE_TYPES.POSTGRES };
+}
+
+export async function getEventRepository(
+  featureFlags: Record<string, unknown> | undefined,
+  parentStore: string | undefined
+): Promise<{ repository: IEventRepository; store: string }> {
+  if (typeof parentStore === "string") {
+    if (parentStore === "clickhouse_v2") {
+      return { repository: clickhouseEventRepositoryV2, store: "clickhouse_v2" };
+    }
+    if (parentStore === "clickhouse") {
+      return { repository: clickhouseEventRepository, store: "clickhouse" };
+    } else {
+      return { repository: eventRepository, store: getTaskEventStore() };
+    }
+  }
+
+  const taskEventRepository = await resolveTaskEventRepositoryFlag(featureFlags);
+
+  if (taskEventRepository === "clickhouse_v2") {
+    return { repository: clickhouseEventRepositoryV2, store: "clickhouse_v2" };
+  }
+
+  if (taskEventRepository === "clickhouse") {
+    return { repository: clickhouseEventRepository, store: "clickhouse" };
+  }
+
+  return { repository: eventRepository, store: getTaskEventStore() };
+}
+
+export async function getV3EventRepository(
+  parentStore: string | undefined
+): Promise<{ repository: IEventRepository; store: string }> {
+  if (typeof parentStore === "string") {
+    if (parentStore === "clickhouse_v2") {
+      return { repository: clickhouseEventRepositoryV2, store: "clickhouse_v2" };
+    }
+    if (parentStore === "clickhouse") {
+      return { repository: clickhouseEventRepository, store: "clickhouse" };
+    } else {
+      return { repository: eventRepository, store: getTaskEventStore() };
+    }
+  }
+
+  if (env.EVENT_REPOSITORY_DEFAULT_STORE === "clickhouse_v2") {
+    return { repository: clickhouseEventRepositoryV2, store: "clickhouse_v2" };
+  } else if (env.EVENT_REPOSITORY_DEFAULT_STORE === "clickhouse") {
+    return { repository: clickhouseEventRepository, store: "clickhouse" };
+  } else {
+    return { repository: eventRepository, store: getTaskEventStore() };
+  }
+}
+
+async function resolveTaskEventRepositoryFlag(
+  featureFlags: Record<string, unknown> | undefined
+): Promise<"clickhouse" | "clickhouse_v2" | "postgres"> {
+  const flagResult = await flag({
+    key: FEATURE_FLAG.taskEventRepository,
+    defaultValue: env.EVENT_REPOSITORY_DEFAULT_STORE,
+    overrides: featureFlags,
+  });
+
+  if (flagResult === "clickhouse_v2") {
+    return "clickhouse_v2";
+  }
+
+  if (flagResult === "clickhouse") {
+    return "clickhouse";
+  }
+
+  return flagResult;
+}
+
+export async function recordRunDebugLog(
+  runId: string,
+  message: string,
+  options: Omit<TraceEventOptions, "environment" | "taskSlug" | "startTime"> & {
+    duration?: number;
+    parentId?: string;
+    startTime?: Date;
+  }
+): Promise<
+  | {
+      success: true;
+    }
+  | {
+      success: false;
+      code: "RUN_NOT_FOUND" | "FAILED_TO_RECORD_EVENT";
+      error?: unknown;
+    }
+> {
+  if (env.EVENT_REPOSITORY_DEBUG_LOGS_DISABLED) {
+    // drop debug events silently
+    return {
+      success: true,
+    };
+  }
+
+  return recordRunEvent(runId, message, {
+    ...options,
+    attributes: {
+      ...options?.attributes,
+      isDebug: true,
+    },
+  });
+}
+
+async function recordRunEvent(
+  runId: string,
+  message: string,
+  options: Omit<TraceEventOptions, "environment" | "taskSlug" | "startTime"> & {
+    duration?: number;
+    parentId?: string;
+    startTime?: Date;
+  }
+): Promise<
+  | {
+      success: true;
+    }
+  | {
+      success: false;
+      code: "RUN_NOT_FOUND" | "FAILED_TO_RECORD_EVENT";
+      error?: unknown;
+    }
+> {
+  try {
+    const foundRun = await findRunForEventCreation(runId);
+
+    if (!foundRun) {
+      logger.error("Failed to find run for event creation", { runId });
+      return {
+        success: false,
+        code: "RUN_NOT_FOUND",
+      };
+    }
+
+    const $eventRepository = resolveEventRepositoryForStore(foundRun.taskEventStore);
+
+    const { attributes, startTime, ...optionsRest } = options;
+
+    await $eventRepository.recordEvent(message, {
+      environment: foundRun.runtimeEnvironment,
+      taskSlug: foundRun.taskIdentifier,
+      context: foundRun.traceContext as Record<string, string | undefined>,
+      attributes: {
+        runId: foundRun.friendlyId,
+        ...attributes,
+      },
+      startTime: BigInt((startTime?.getTime() ?? Date.now()) * 1_000_000),
+      ...optionsRest,
+    });
+
+    return {
+      success: true,
+    };
+  } catch (error) {
+    logger.error("Failed to record event for run", {
+      error: error instanceof Error ? error.message : error,
+      runId,
+    });
+
+    return {
+      success: false,
+      code: "FAILED_TO_RECORD_EVENT",
+      error,
+    };
+  }
+}
+
+async function findRunForEventCreation(runId: string) {
+  return prisma.taskRun.findFirst({
+    where: {
+      id: runId,
+    },
+    select: {
+      friendlyId: true,
+      taskIdentifier: true,
+      traceContext: true,
+      taskEventStore: true,
+      runtimeEnvironment: {
+        select: {
+          id: true,
+          type: true,
+          organizationId: true,
+          projectId: true,
+          project: {
+            select: {
+              externalRef: true,
+            },
+          },
+        },
+      },
+    },
+  });
+}
diff --git a/apps/webapp/app/v3/failedTaskRun.server.ts b/apps/webapp/app/v3/failedTaskRun.server.ts
index 3935c21ddd6..f4b3c92ea66 100644
--- a/apps/webapp/app/v3/failedTaskRun.server.ts
+++ b/apps/webapp/app/v3/failedTaskRun.server.ts
@@ -4,6 +4,7 @@ import {
   TaskRunExecution,
   TaskRunExecutionRetry,
   TaskRunFailedExecutionResult,
+  V3TaskRunExecution,
 } from "@trigger.dev/core/v3";
 import type { Prisma, TaskRun } from "@trigger.dev/database";
 import * as semver from "semver";
@@ -129,7 +130,7 @@ export class FailedTaskRunRetryHelper extends BaseService {
   async #getRetriableAttemptExecution(
     run: TaskRunWithAttempts,
     completion: TaskRunFailedExecutionResult
-  ): Promise<TaskRunExecution | undefined> {
+  ): Promise<V3TaskRunExecution | undefined> {
     let attempt = run.attempts[0];
 
     // We need to create an attempt if:
diff --git a/apps/webapp/app/v3/featureFlags.server.ts b/apps/webapp/app/v3/featureFlags.server.ts
index 6f7c3edce51..e889b2123d2 100644
--- a/apps/webapp/app/v3/featureFlags.server.ts
+++ b/apps/webapp/app/v3/featureFlags.server.ts
@@ -1,23 +1,39 @@
 import { z } from "zod";
-import { prisma, PrismaClientOrTransaction } from "~/db.server";
+import { prisma, type PrismaClientOrTransaction } from "~/db.server";
 
 export const FEATURE_FLAG = {
   defaultWorkerInstanceGroupId: "defaultWorkerInstanceGroupId",
+  runsListRepository: "runsListRepository",
+  taskEventRepository: "taskEventRepository",
+  hasQueryAccess: "hasQueryAccess",
+  hasLogsPageAccess: "hasLogsPageAccess",
 } as const;
 
 const FeatureFlagCatalog = {
   [FEATURE_FLAG.defaultWorkerInstanceGroupId]: z.string(),
+  [FEATURE_FLAG.runsListRepository]: z.enum(["clickhouse", "postgres"]),
+  [FEATURE_FLAG.taskEventRepository]: z.enum(["clickhouse", "clickhouse_v2", "postgres"]),
+  [FEATURE_FLAG.hasQueryAccess]: z.coerce.boolean(),
+  [FEATURE_FLAG.hasLogsPageAccess]: z.coerce.boolean(),
 };
 
 type FeatureFlagKey = keyof typeof FeatureFlagCatalog;
 
-export type FlagsOptions = {
-  key: FeatureFlagKey;
+export type FlagsOptions<T extends FeatureFlagKey> = {
+  key: T;
+  defaultValue?: z.infer<(typeof FeatureFlagCatalog)[T]>;
+  overrides?: Record<string, unknown>;
 };
 
-export function makeFlags(_prisma: PrismaClientOrTransaction = prisma) {
-  return async function flags<T extends FeatureFlagKey>(
-    opts: FlagsOptions
+export function makeFlag(_prisma: PrismaClientOrTransaction = prisma) {
+  function flag<T extends FeatureFlagKey>(
+    opts: FlagsOptions<T> & { defaultValue: z.infer<(typeof FeatureFlagCatalog)[T]> }
+  ): Promise<z.infer<(typeof FeatureFlagCatalog)[T]>>;
+  function flag<T extends FeatureFlagKey>(
+    opts: FlagsOptions<T>
+  ): Promise<z.infer<(typeof FeatureFlagCatalog)[T]> | undefined>;
+  async function flag<T extends FeatureFlagKey>(
+    opts: FlagsOptions<T>
   ): Promise<z.infer<(typeof FeatureFlagCatalog)[T]> | undefined> {
     const value = await _prisma.featureFlag.findUnique({
       where: {
@@ -25,19 +41,31 @@ export function makeFlags(_prisma: PrismaClientOrTransaction = prisma) {
       },
     });
 
-    const parsed = FeatureFlagCatalog[opts.key].safeParse(value?.value);
+    const flagSchema = FeatureFlagCatalog[opts.key];
+
+    if (opts.overrides?.[opts.key]) {
+      const parsed = flagSchema.safeParse(opts.overrides[opts.key]);
+
+      if (parsed.success) {
+        return parsed.data;
+      }
+    }
+
+    const parsed = flagSchema.safeParse(value?.value);
 
     if (!parsed.success) {
-      return;
+      return opts.defaultValue;
     }
 
     return parsed.data;
-  };
+  }
+
+  return flag;
 }
 
-export function makeSetFlags(_prisma: PrismaClientOrTransaction = prisma) {
-  return async function setFlags<T extends FeatureFlagKey>(
-    opts: FlagsOptions & { value: z.infer<(typeof FeatureFlagCatalog)[T]> }
+export function makeSetFlag(_prisma: PrismaClientOrTransaction = prisma) {
+  return async function setFlag<T extends FeatureFlagKey>(
+    opts: FlagsOptions<T> & { value: z.infer<(typeof FeatureFlagCatalog)[T]> }
   ): Promise<void> {
     await _prisma.featureFlag.upsert({
       where: {
@@ -54,5 +82,100 @@ export function makeSetFlags(_prisma: PrismaClientOrTransaction = prisma) {
   };
 }
 
+export type AllFlagsOptions = {
+  defaultValues?: Partial<FeatureFlagCatalog>;
+  overrides?: Record<string, unknown>;
+};
+
+export function makeFlags(_prisma: PrismaClientOrTransaction = prisma) {
+  return async function flags(options?: AllFlagsOptions): Promise<Partial<FeatureFlagCatalog>> {
+    const rows = await _prisma.featureFlag.findMany();
+
+    // Build a map of key -> value from database
+    const dbValues = new Map<string, unknown>();
+    for (const row of rows) {
+      dbValues.set(row.key, row.value);
+    }
+
+    const result: Partial<FeatureFlagCatalog> = {};
+
+    // Process each flag in the catalog
+    for (const key of Object.keys(FeatureFlagCatalog) as FeatureFlagKey[]) {
+      const schema = FeatureFlagCatalog[key];
+
+      // Priority: overrides > database > defaultValues
+      if (options?.overrides?.[key] !== undefined) {
+        const parsed = schema.safeParse(options.overrides[key]);
+        if (parsed.success) {
+          (result as any)[key] = parsed.data;
+          continue;
+        }
+      }
+
+      if (dbValues.has(key)) {
+        const parsed = schema.safeParse(dbValues.get(key));
+        if (parsed.success) {
+          (result as any)[key] = parsed.data;
+          continue;
+        }
+      }
+
+      if (options?.defaultValues?.[key] !== undefined) {
+        const parsed = schema.safeParse(options.defaultValues[key]);
+        if (parsed.success) {
+          (result as any)[key] = parsed.data;
+        }
+      }
+    }
+
+    return result;
+  };
+}
+
+export const flag = makeFlag();
 export const flags = makeFlags();
-export const setFlags = makeSetFlags();
+export const setFlag = makeSetFlag();
+
+// Create a Zod schema from the existing catalog
+export const FeatureFlagCatalogSchema = z.object(FeatureFlagCatalog);
+export type FeatureFlagCatalog = z.infer<typeof FeatureFlagCatalogSchema>;
+
+// Utility function to validate a feature flag value
+export function validateFeatureFlagValue<T extends FeatureFlagKey>(
+  key: T,
+  value: unknown
+): z.SafeParseReturnType<unknown, z.infer<(typeof FeatureFlagCatalog)[T]>> {
+  return FeatureFlagCatalog[key].safeParse(value);
+}
+
+// Utility function to validate all feature flags at once
+export function validateAllFeatureFlags(values: Record<string, unknown>) {
+  return FeatureFlagCatalogSchema.safeParse(values);
+}
+
+// Utility function to validate partial feature flags (all keys optional)
+export function validatePartialFeatureFlags(values: Record<string, unknown>) {
+  return FeatureFlagCatalogSchema.partial().safeParse(values);
+}
+
+// Utility function to set multiple feature flags at once
+export function makeSetMultipleFlags(_prisma: PrismaClientOrTransaction = prisma) {
+  return async function setMultipleFlags(
+    flags: Partial<z.infer<typeof FeatureFlagCatalogSchema>>
+  ): Promise<{ key: string; value: any }[]> {
+    const setFlag = makeSetFlag(_prisma);
+    const updatedFlags: { key: string; value: any }[] = [];
+
+    for (const [key, value] of Object.entries(flags)) {
+      if (value !== undefined) {
+        await setFlag({
+          key: key as any,
+          value: value as any,
+        });
+        updatedFlags.push({ key, value });
+      }
+    }
+
+    return updatedFlags;
+  };
+}
diff --git a/apps/webapp/app/v3/getDeploymentImageRef.server.ts b/apps/webapp/app/v3/getDeploymentImageRef.server.ts
index c6610146ea2..70e6023891b 100644
--- a/apps/webapp/app/v3/getDeploymentImageRef.server.ts
+++ b/apps/webapp/app/v3/getDeploymentImageRef.server.ts
@@ -6,10 +6,14 @@ import {
   type Tag,
   RepositoryNotFoundException,
   GetAuthorizationTokenCommand,
+  PutLifecyclePolicyCommand,
+  PutImageTagMutabilityCommand,
 } from "@aws-sdk/client-ecr";
 import { STSClient, AssumeRoleCommand } from "@aws-sdk/client-sts";
 import { tryCatch } from "@trigger.dev/core";
 import { logger } from "~/services/logger.server";
+import { type RegistryConfig } from "./registryConfig.server";
+import type { EnvironmentType } from "@trigger.dev/core/v3";
 
 // Optional configuration for cross-account access
 export type AssumeRoleConfig = {
@@ -97,30 +101,27 @@ export async function createEcrClient({
 }
 
 export async function getDeploymentImageRef({
-  host,
-  namespace,
+  registry,
   projectRef,
   nextVersion,
-  environmentSlug,
-  registryTags,
-  assumeRole,
+  environmentType,
+  deploymentShortCode,
 }: {
-  host: string;
-  namespace: string;
+  registry: RegistryConfig;
   projectRef: string;
   nextVersion: string;
-  environmentSlug: string;
-  registryTags?: string;
-  assumeRole?: AssumeRoleConfig;
+  environmentType: EnvironmentType;
+  deploymentShortCode: string;
 }): Promise<{
   imageRef: string;
   isEcr: boolean;
   repoCreated: boolean;
 }> {
-  const repositoryName = `${namespace}/${projectRef}`;
-  const imageRef = `${host}/${repositoryName}:${nextVersion}.${environmentSlug}`;
+  const repositoryName = `${registry.namespace}/${projectRef}`;
+  const envType = environmentType.toLowerCase();
+  const imageRef = `${registry.host}/${repositoryName}:${nextVersion}.${envType}.${deploymentShortCode}`;
 
-  if (!isEcrRegistry(host)) {
+  if (!isEcrRegistry(registry.host)) {
     return {
       imageRef,
       isEcr: false,
@@ -131,16 +132,19 @@ export async function getDeploymentImageRef({
   const [ecrRepoError, ecrData] = await tryCatch(
     ensureEcrRepositoryExists({
       repositoryName,
-      registryHost: host,
-      registryTags,
-      assumeRole,
+      registryHost: registry.host,
+      registryTags: registry.ecrTags,
+      assumeRole: {
+        roleArn: registry.ecrAssumeRoleArn,
+        externalId: registry.ecrAssumeRoleExternalId,
+      },
     })
   );
 
   if (ecrRepoError) {
     logger.error("Failed to ensure ECR repository exists", {
       repositoryName,
-      host,
+      host: registry.host,
       ecrRepoError: ecrRepoError.message,
     });
     throw ecrRepoError;
@@ -193,6 +197,22 @@ export function parseRegistryTags(tags: string): Tag[] {
     .filter((tag): tag is Tag => tag !== null);
 }
 
+const untaggedImageExpirationPolicy = JSON.stringify({
+  rules: [
+    {
+      rulePriority: 1,
+      description: "Expire untagged images older than 3 days",
+      selection: {
+        tagStatus: "untagged",
+        countType: "sinceImagePushed",
+        countUnit: "days",
+        countNumber: 3,
+      },
+      action: { type: "expire" },
+    },
+  ],
+});
+
 async function createEcrRepository({
   repositoryName,
   region,
@@ -211,7 +231,14 @@ async function createEcrRepository({
   const result = await ecr.send(
     new CreateRepositoryCommand({
       repositoryName,
-      imageTagMutability: "IMMUTABLE",
+      imageTagMutability: "IMMUTABLE_WITH_EXCLUSION",
+      imageTagMutabilityExclusionFilters: [
+        {
+          // only the `cache` tag will be mutable, all other tags will be immutable
+          filter: "cache",
+          filterType: "WILDCARD",
+        },
+      ],
       encryptionConfiguration: {
         encryptionType: "AES256",
       },
@@ -225,9 +252,68 @@ async function createEcrRepository({
     throw new Error(`Failed to create ECR repository: ${repositoryName}`);
   }
 
+  // When the `cache` tag is mutated, the old cache images are untagged.
+  // This policy matches those images and expires them to avoid bloating the repository.
+  await ecr.send(
+    new PutLifecyclePolicyCommand({
+      repositoryName: result.repository.repositoryName,
+      registryId: result.repository.registryId,
+      lifecyclePolicyText: untaggedImageExpirationPolicy,
+    })
+  );
+
   return result.repository;
 }
 
+async function updateEcrRepositoryCacheSettings({
+  repositoryName,
+  region,
+  accountId,
+  assumeRole,
+}: {
+  repositoryName: string;
+  region: string;
+  accountId?: string;
+  assumeRole?: AssumeRoleConfig;
+}): Promise<void> {
+  logger.debug("Updating ECR repository tag mutability to IMMUTABLE_WITH_EXCLUSION", {
+    repositoryName,
+    region,
+  });
+
+  const ecr = await createEcrClient({ region, assumeRole });
+
+  await ecr.send(
+    new PutImageTagMutabilityCommand({
+      repositoryName,
+      registryId: accountId,
+      imageTagMutability: "IMMUTABLE_WITH_EXCLUSION",
+      imageTagMutabilityExclusionFilters: [
+        {
+          // only the `cache` tag will be mutable, all other tags will be immutable
+          filter: "cache",
+          filterType: "WILDCARD",
+        },
+      ],
+    })
+  );
+
+  // When the `cache` tag is mutated, the old cache images are untagged.
+  // This policy matches those images and expires them to avoid bloating the repository.
+  await ecr.send(
+    new PutLifecyclePolicyCommand({
+      repositoryName,
+      registryId: accountId,
+      lifecyclePolicyText: untaggedImageExpirationPolicy,
+    })
+  );
+
+  logger.debug("Successfully updated ECR repository to IMMUTABLE_WITH_EXCLUSION", {
+    repositoryName,
+    region,
+  });
+}
+
 async function getEcrRepository({
   repositoryName,
   region,
@@ -256,7 +342,10 @@ async function getEcrRepository({
 
     return result.repositories[0];
   } catch (error) {
-    if (error instanceof RepositoryNotFoundException) {
+    if (
+      error instanceof RepositoryNotFoundException ||
+      (error instanceof Error && error.message?.includes("does not exist"))
+    ) {
       logger.debug("ECR repository not found: RepositoryNotFoundException", {
         repositoryName,
         region,
@@ -316,6 +405,22 @@ async function ensureEcrRepositoryExists({
 
   if (existingRepo) {
     logger.debug("ECR repository already exists", { repositoryName, region, existingRepo });
+
+    // check if the repository is missing the cache settings
+    if (existingRepo.imageTagMutability === "IMMUTABLE") {
+      const [updateError] = await tryCatch(
+        updateEcrRepositoryCacheSettings({ repositoryName, region, accountId, assumeRole })
+      );
+
+      if (updateError) {
+        logger.error("Failed to update ECR repository cache settings", {
+          repositoryName,
+          region,
+          updateError,
+        });
+      }
+    }
+
     return {
       repo: existingRepo,
       repoCreated: false,
diff --git a/apps/webapp/app/v3/gitBranch.ts b/apps/webapp/app/v3/gitBranch.ts
index 109de645b9e..06c76f06241 100644
--- a/apps/webapp/app/v3/gitBranch.ts
+++ b/apps/webapp/app/v3/gitBranch.ts
@@ -29,7 +29,7 @@ export function isValidGitBranchName(branch: string): boolean {
   return true;
 }
 
-export function sanitizeBranchName(ref: string): string | null {
+export function sanitizeBranchName(ref: string | undefined): string | null {
   if (!ref) return null;
   if (ref.startsWith("refs/heads/")) return ref.substring("refs/heads/".length);
   if (ref.startsWith("refs/remotes/")) return ref.substring("refs/remotes/".length);
diff --git a/apps/webapp/app/v3/github.ts b/apps/webapp/app/v3/github.ts
new file mode 100644
index 00000000000..570a987cc66
--- /dev/null
+++ b/apps/webapp/app/v3/github.ts
@@ -0,0 +1,35 @@
+import { z } from "zod";
+
+export const BranchTrackingConfigSchema = z.object({
+  prod: z.object({
+    branch: z.string().optional(),
+  }),
+  staging: z.object({
+    branch: z.string().optional(),
+  }),
+});
+
+export type BranchTrackingConfig = z.infer<typeof BranchTrackingConfigSchema>;
+
+export function getTrackedBranchForEnvironment(
+  branchTracking: BranchTrackingConfig | undefined,
+  previewDeploymentsEnabled: boolean,
+  environment: {
+    type: "PRODUCTION" | "STAGING" | "DEVELOPMENT" | "PREVIEW";
+    branchName?: string;
+  }
+): string | undefined {
+  switch (environment.type) {
+    case "PRODUCTION":
+      return branchTracking?.prod?.branch;
+    case "STAGING":
+      return branchTracking?.staging?.branch;
+    case "PREVIEW":
+      return previewDeploymentsEnabled ? environment.branchName : undefined;
+    case "DEVELOPMENT":
+      return undefined;
+    default:
+      environment.type satisfies never;
+      return undefined;
+  }
+}
diff --git a/apps/webapp/app/v3/handleSocketIo.server.ts b/apps/webapp/app/v3/handleSocketIo.server.ts
index 3ed00f3e07e..fbc50428407 100644
--- a/apps/webapp/app/v3/handleSocketIo.server.ts
+++ b/apps/webapp/app/v3/handleSocketIo.server.ts
@@ -22,7 +22,7 @@ import { findEnvironmentById } from "~/models/runtimeEnvironment.server";
 import { authenticateApiRequestWithFailure } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { singleton } from "~/utils/singleton";
-import { recordRunDebugLog } from "./eventRepository.server";
+import { recordRunDebugLog } from "./eventRepository/index.server";
 import { sharedQueueTasks } from "./marqs/sharedQueueConsumer.server";
 import { engine } from "./runEngine.server";
 import { CompleteAttemptService } from "./services/completeAttempt.server";
diff --git a/apps/webapp/app/v3/legacyRunEngineWorker.server.ts b/apps/webapp/app/v3/legacyRunEngineWorker.server.ts
index 09fdbf886cf..7a381063bdc 100644
--- a/apps/webapp/app/v3/legacyRunEngineWorker.server.ts
+++ b/apps/webapp/app/v3/legacyRunEngineWorker.server.ts
@@ -5,7 +5,10 @@ import { env } from "~/env.server";
 import { logger } from "~/services/logger.server";
 import { singleton } from "~/utils/singleton";
 import { TaskRunHeartbeatFailedService } from "./taskRunHeartbeatFailed.server";
-import { completeBatchTaskRunItemV3 } from "./services/batchTriggerV3.server";
+import {
+  completeBatchTaskRunItemV3,
+  tryCompleteBatchV3,
+} from "./services/batchTriggerV3.server";
 import { prisma } from "~/db.server";
 import { marqs } from "./marqs/index.server";
 
@@ -50,6 +53,16 @@ function initializeWorker() {
           maxAttempts: 10,
         },
       },
+      tryCompleteBatchV3: {
+        schema: z.object({
+          batchId: z.string(),
+          scheduleResumeOnComplete: z.boolean(),
+        }),
+        visibilityTimeoutMs: 30_000,
+        retry: {
+          maxAttempts: 5,
+        },
+      },
       scheduleRequeueMessage: {
         schema: z.object({
           messageId: z.string(),
@@ -85,6 +98,9 @@ function initializeWorker() {
           attempt
         );
       },
+      tryCompleteBatchV3: async ({ payload }) => {
+        await tryCompleteBatchV3(payload.batchId, prisma, payload.scheduleResumeOnComplete);
+      },
       scheduleRequeueMessage: async ({ payload }) => {
         await marqs.requeueMessageById(payload.messageId);
       },
diff --git a/apps/webapp/app/v3/machinePresets.server.ts b/apps/webapp/app/v3/machinePresets.server.ts
index 024cb9f114e..ee01aace828 100644
--- a/apps/webapp/app/v3/machinePresets.server.ts
+++ b/apps/webapp/app/v3/machinePresets.server.ts
@@ -6,7 +6,7 @@ export function machinePresetFromConfig(config: unknown): MachinePreset {
   const parsedConfig = MachineConfig.safeParse(config);
 
   if (!parsedConfig.success) {
-    logger.error("Failed to parse machine config", { config });
+    logger.info("Failed to parse machine config", { config });
 
     return machinePresetFromName("small-1x");
   }
diff --git a/apps/webapp/app/v3/marqs/devQueueConsumer.server.ts b/apps/webapp/app/v3/marqs/devQueueConsumer.server.ts
index f723bb82c19..aadb192987f 100644
--- a/apps/webapp/app/v3/marqs/devQueueConsumer.server.ts
+++ b/apps/webapp/app/v3/marqs/devQueueConsumer.server.ts
@@ -1,6 +1,6 @@
 import { Context, ROOT_CONTEXT, Span, SpanKind, context, trace } from "@opentelemetry/api";
 import {
-  TaskRunExecution,
+  V3TaskRunExecution,
   TaskRunExecutionLazyAttemptPayload,
   TaskRunExecutionResult,
   TaskRunFailedExecutionResult,
@@ -139,7 +139,7 @@ export class DevQueueConsumer {
   public async taskAttemptCompleted(
     workerId: string,
     completion: TaskRunExecutionResult,
-    execution: TaskRunExecution
+    execution: V3TaskRunExecution
   ) {
     if (completion.ok) {
       this._taskSuccesses++;
diff --git a/apps/webapp/app/v3/marqs/fairDequeuingStrategy.server.ts b/apps/webapp/app/v3/marqs/fairDequeuingStrategy.server.ts
index b0b3fe89dba..e9205cd000e 100644
--- a/apps/webapp/app/v3/marqs/fairDequeuingStrategy.server.ts
+++ b/apps/webapp/app/v3/marqs/fairDequeuingStrategy.server.ts
@@ -1,5 +1,5 @@
 import { createCache, DefaultStatefulContext, Namespace, Cache as UnkeyCache } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import { createLRUMemoryStore } from "@internal/cache";
 import { randomUUID } from "crypto";
 import { Redis } from "ioredis";
 import { EnvQueues, MarQSFairDequeueStrategy, MarQSKeyProducer } from "./types";
@@ -99,7 +99,7 @@ export class FairDequeuingStrategy implements MarQSFairDequeueStrategy {
 
   constructor(private options: FairDequeuingStrategyOptions) {
     const ctx = new DefaultStatefulContext();
-    const memory = new MemoryStore({ persistentMap: new Map() });
+    const memory = createLRUMemoryStore(500);
 
     this._cache = createCache({
       concurrencyLimit: new Namespace<number>(ctx, {
diff --git a/apps/webapp/app/v3/marqs/index.server.ts b/apps/webapp/app/v3/marqs/index.server.ts
index 1636dba5f06..5348f228ae1 100644
--- a/apps/webapp/app/v3/marqs/index.server.ts
+++ b/apps/webapp/app/v3/marqs/index.server.ts
@@ -1,3 +1,4 @@
+import { type RedisOptions } from "@internal/redis";
 import {
   context,
   propagation,
@@ -10,18 +11,31 @@ import {
 } from "@opentelemetry/api";
 import {
   SEMATTRS_MESSAGE_ID,
-  SEMATTRS_MESSAGING_SYSTEM,
   SEMATTRS_MESSAGING_OPERATION,
+  SEMATTRS_MESSAGING_SYSTEM,
 } from "@opentelemetry/semantic-conventions";
+import { Logger } from "@trigger.dev/core/logger";
+import { tryCatch } from "@trigger.dev/core/utils";
 import { flattenAttributes } from "@trigger.dev/core/v3";
+import { Worker, type WorkerConcurrencyOptions } from "@trigger.dev/redis-worker";
 import Redis, { type Callback, type Result } from "ioredis";
+import { setInterval as setIntervalAsync } from "node:timers/promises";
+import z from "zod";
 import { env } from "~/env.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
+import { signalsEmitter } from "~/services/signals.server";
 import { singleton } from "~/utils/singleton";
+import { legacyRunEngineWorker } from "../legacyRunEngineWorker.server";
 import { concurrencyTracker } from "../services/taskRunConcurrencyTracker.server";
 import { attributesFromAuthenticatedEnv, tracer } from "../tracer.server";
 import { AsyncWorker } from "./asyncWorker.server";
+import {
+  MARQS_DELAYED_REQUEUE_THRESHOLD_IN_MS,
+  MARQS_RESUME_PRIORITY_TIMESTAMP_OFFSET,
+  MARQS_RETRY_PRIORITY_TIMESTAMP_OFFSET,
+  MARQS_SCHEDULED_REQUEUE_AVAILABLE_AT_THRESHOLD_IN_MS,
+} from "./constants.server";
 import { FairDequeuingStrategy } from "./fairDequeuingStrategy.server";
 import { MarQSShortKeyProducer } from "./marqsKeyProducer";
 import {
@@ -35,13 +49,6 @@ import {
   VisibilityTimeoutStrategy,
 } from "./types";
 import { V3LegacyRunEngineWorkerVisibilityTimeout } from "./v3VisibilityTimeout.server";
-import { legacyRunEngineWorker } from "../legacyRunEngineWorker.server";
-import {
-  MARQS_DELAYED_REQUEUE_THRESHOLD_IN_MS,
-  MARQS_RESUME_PRIORITY_TIMESTAMP_OFFSET,
-  MARQS_RETRY_PRIORITY_TIMESTAMP_OFFSET,
-  MARQS_SCHEDULED_REQUEUE_AVAILABLE_AT_THRESHOLD_IN_MS,
-} from "./constants.server";
 
 const KEY_PREFIX = "marqs:";
 
@@ -70,6 +77,29 @@ export type MarQSOptions = {
   enableRebalancing?: boolean;
   verbose?: boolean;
   subscriber?: MessageQueueSubscriber;
+  sharedWorkerQueueConsumerIntervalMs?: number;
+  sharedWorkerQueueMaxMessageCount?: number;
+  sharedWorkerQueueCooloffPeriodMs?: number;
+  sharedWorkerQueueCooloffCountThreshold?: number;
+  eagerDequeuingEnabled?: boolean;
+  workerOptions: {
+    pollIntervalMs?: number;
+    immediatePollIntervalMs?: number;
+    shutdownTimeoutMs?: number;
+    concurrency?: WorkerConcurrencyOptions;
+    enabled?: boolean;
+    redisOptions: RedisOptions;
+  };
+};
+
+const workerCatalog = {
+  processQueueForWorkerQueue: {
+    schema: z.object({
+      queueKey: z.string(),
+      parentQueueKey: z.string(),
+    }),
+    visibilityTimeoutMs: 30_000,
+  },
 };
 
 /**
@@ -79,6 +109,11 @@ export class MarQS {
   private redis: Redis;
   public keys: MarQSKeyProducer;
   #rebalanceWorkers: Array<AsyncWorker> = [];
+  private worker: Worker<typeof workerCatalog>;
+  private queueDequeueCooloffPeriod: Map<string, number> = new Map();
+  private queueDequeueCooloffCounts: Map<string, number> = new Map();
+  private clearCooloffPeriodInterval: NodeJS.Timeout;
+  isShuttingDown: boolean = false;
 
   constructor(private readonly options: MarQSOptions) {
     this.redis = options.redis;
@@ -87,6 +122,48 @@ export class MarQS {
 
     this.#startRebalanceWorkers();
     this.#registerCommands();
+
+    // This will prevent these cooloff maps from growing indefinitely
+    this.clearCooloffPeriodInterval = setInterval(() => {
+      this.queueDequeueCooloffCounts.clear();
+      this.queueDequeueCooloffPeriod.clear();
+    }, 60_000 * 10); // 10 minutes
+
+    this.worker = new Worker({
+      name: "marqs-worker",
+      redisOptions: options.workerOptions.redisOptions,
+      catalog: workerCatalog,
+      concurrency: options.workerOptions?.concurrency,
+      pollIntervalMs: options.workerOptions?.pollIntervalMs ?? 1000,
+      immediatePollIntervalMs: options.workerOptions?.immediatePollIntervalMs ?? 100,
+      shutdownTimeoutMs: options.workerOptions?.shutdownTimeoutMs ?? 10_000,
+      logger: new Logger("MarQSWorker", "info"),
+      jobs: {
+        processQueueForWorkerQueue: async (job) => {
+          await this.#processQueueForWorkerQueue(job.payload.queueKey, job.payload.parentQueueKey);
+        },
+      },
+    });
+
+    if (options.workerOptions?.enabled) {
+      this.worker.start();
+    }
+
+    this.#setupShutdownHandlers();
+  }
+
+  #setupShutdownHandlers() {
+    signalsEmitter.on("SIGTERM", () => this.shutdown("SIGTERM"));
+    signalsEmitter.on("SIGINT", () => this.shutdown("SIGINT"));
+  }
+
+  async shutdown(signal: NodeJS.Signals) {
+    if (this.isShuttingDown) return;
+    this.isShuttingDown = true;
+
+    console.log("👇 Shutting down marqs", this.name, signal);
+    clearInterval(this.clearCooloffPeriodInterval);
+    this.#rebalanceWorkers.forEach((worker) => worker.stop());
   }
 
   get name() {
@@ -276,6 +353,21 @@ export class MarQS {
           span.setAttribute("reserve_recursive_queue", reserve.recursiveQueue);
         }
 
+        if (env.type !== "DEVELOPMENT" && this.options.eagerDequeuingEnabled) {
+          // This will move the message to the worker queue so it can be dequeued
+          await this.worker.enqueueOnce({
+            id: messageQueue, // dedupe by environment, queue, and concurrency key
+            job: "processQueueForWorkerQueue",
+            payload: {
+              queueKey: messageQueue,
+              parentQueueKey: parentQueue,
+            },
+            // Add a small delay to dedupe messages so at most one of these will processed,
+            // every 500ms per queue, concurrency key, and environment
+            availableAt: new Date(Date.now() + 500), // 500ms from now
+          });
+        }
+
         const result = await this.#callEnqueueMessage(messagePayload, reserve);
 
         if (result) {
@@ -488,15 +580,18 @@ export class MarQS {
         span.setAttribute("queue_count", queues.length);
 
         for (const messageQueue of queues) {
-          const messageData = await this.#callDequeueMessage({
+          const messages = await this.#callDequeueMessages({
             messageQueue,
             parentQueue,
+            maxCount: 1,
           });
 
-          if (!messageData) {
+          if (!messages || messages.length === 0) {
             return;
           }
 
+          const messageData = messages[0];
+
           const message = await this.readMessage(messageData.messageId);
 
           if (message) {
@@ -554,11 +649,184 @@ export class MarQS {
   }
 
   /**
-   * Dequeue a message from the shared queue (this should be used in production environments)
+   * Dequeue a message from the shared worker queue (this should be used in production environments)
+   */
+  public async dequeueMessageFromSharedWorkerQueue(consumerId: string) {
+    return this.#trace(
+      "dequeueMessageFromSharedWorkerQueue",
+      async (span) => {
+        span.setAttribute(SemanticAttributes.CONSUMER_ID, consumerId);
+
+        const workerQueueKey = this.keys.sharedWorkerQueueKey();
+
+        span.setAttribute(SemanticAttributes.PARENT_QUEUE, workerQueueKey);
+
+        // Try and pop a message from the worker queue (redis list)
+        const messageId = await this.#trace("popMessageFromWorkerQueue", async (innerSpan) => {
+          innerSpan.setAttribute(SemanticAttributes.PARENT_QUEUE, workerQueueKey);
+          innerSpan.setAttribute(SemanticAttributes.CONSUMER_ID, consumerId);
+
+          const results = await this.redis.popMessageFromWorkerQueue(workerQueueKey);
+
+          if (!results) {
+            return null;
+          }
+
+          const [messageId, queueLength] = results;
+
+          innerSpan.setAttribute("queue_length", Number(queueLength));
+
+          return messageId;
+        });
+
+        if (!messageId) {
+          return;
+        }
+
+        const message = await this.readMessage(messageId);
+
+        if (!message) {
+          return;
+        }
+
+        if (this.options.subscriber) {
+          await this.#trace(
+            "postMessageDequeued",
+            async (subscriberSpan) => {
+              subscriberSpan.setAttributes({
+                [SemanticAttributes.MESSAGE_ID]: message.messageId,
+                [SemanticAttributes.QUEUE]: message.queue,
+                [SemanticAttributes.PARENT_QUEUE]: message.parentQueue,
+              });
+
+              return await this.options.subscriber?.messageDequeued(message);
+            },
+            {
+              kind: SpanKind.INTERNAL,
+              attributes: {
+                [SEMATTRS_MESSAGING_OPERATION]: "receive",
+                [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+              },
+            }
+          );
+        }
+
+        await this.#trace(
+          "startHeartbeat",
+          async (heartbeatSpan) => {
+            heartbeatSpan.setAttributes({
+              [SemanticAttributes.MESSAGE_ID]: message.messageId,
+              visibility_timeout_ms: this.visibilityTimeoutInMs,
+            });
+
+            return await this.options.visibilityTimeoutStrategy.startHeartbeat(
+              message.messageId,
+              this.visibilityTimeoutInMs
+            );
+          },
+          {
+            kind: SpanKind.INTERNAL,
+            attributes: {
+              [SEMATTRS_MESSAGING_OPERATION]: "receive",
+              [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+            },
+          }
+        );
+
+        return message;
+      },
+      {
+        kind: SpanKind.CONSUMER,
+        attributes: {
+          [SEMATTRS_MESSAGING_OPERATION]: "receive",
+          [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+        },
+      }
+    );
+  }
+
+  public startSharedWorkerQueueConsumer(consumerId: string) {
+    const abortController = new AbortController();
+
+    this.#startSharedWorkerQueueConsumer(consumerId, abortController).catch((error) => {
+      logger.error("Failed to start shared worker queue consumer", {
+        error,
+        service: this.name,
+        consumerId,
+      });
+    });
+
+    return () => {
+      abortController.abort();
+    };
+  }
+
+  async #startSharedWorkerQueueConsumer(consumerId: string, abortController: AbortController) {
+    let lastProcessedAt = Date.now();
+    let processedCount = 0;
+
+    try {
+      for await (const _ of setIntervalAsync(
+        this.options.sharedWorkerQueueConsumerIntervalMs ?? 500,
+        null,
+        {
+          signal: abortController.signal,
+        }
+      )) {
+        logger.debug(`Processing shared worker queue`, {
+          processedCount,
+          lastProcessedAt,
+          service: this.name,
+          consumerId,
+        });
+
+        const now = performance.now();
+
+        const [error, results] = await tryCatch(this.#processSharedWorkerQueue(consumerId));
+
+        if (error) {
+          logger.error(`Failed to process shared worker queue`, {
+            error,
+            service: this.name,
+            consumerId,
+          });
+
+          continue;
+        }
+
+        const duration = performance.now() - now;
+
+        logger.debug(`Processed shared worker queue`, {
+          processedCount,
+          lastProcessedAt,
+          service: this.name,
+          duration,
+          results,
+          consumerId,
+        });
+
+        processedCount++;
+        lastProcessedAt = Date.now();
+      }
+    } catch (error) {
+      if (error instanceof Error && error.name !== "AbortError") {
+        throw error;
+      }
+
+      logger.debug(`Shared worker queue consumer stopped`, {
+        service: this.name,
+        processedCount,
+        lastProcessedAt,
+      });
+    }
+  }
+
+  /**
+   * Dequeue as many messages as possible from queues into the shared worker queue list
    */
-  public async dequeueMessageInSharedQueue(consumerId: string) {
+  async #processSharedWorkerQueue(consumerId: string) {
     return this.#trace(
-      "dequeueMessageInSharedQueue",
+      "processSharedWorkerQueue",
       async (span) => {
         span.setAttribute(SemanticAttributes.CONSUMER_ID, consumerId);
 
@@ -581,63 +849,140 @@ export class MarQS {
 
         let attemptedEnvs = 0;
         let attemptedQueues = 0;
+        let messageCount = 0;
+        let coolOffPeriodCount = 0;
 
-        // Try each queue in order until we successfully dequeue a message
+        // Try each queue in order, attempt to dequeue a message from each queue, keep going until we've tried all the queues
         for (const env of envQueues) {
           attemptedEnvs++;
 
           for (const messageQueue of env.queues) {
             attemptedQueues++;
 
-            try {
-              const messageData = await this.#callDequeueMessage({
-                messageQueue,
-                parentQueue,
-              });
-
-              if (!messageData) {
-                continue; // Try next queue if no message was dequeued
+            const cooloffPeriod = this.queueDequeueCooloffPeriod.get(messageQueue);
+
+            // If the queue is in a cooloff period, skip attempting to dequeue from it
+            if (cooloffPeriod) {
+              // If the cooloff period is still active, skip attempting to dequeue from it
+              if (cooloffPeriod > Date.now()) {
+                coolOffPeriodCount++;
+                continue;
+              } else {
+                // If the cooloff period is over, delete the cooloff period and attempt to dequeue from the queue
+                this.queueDequeueCooloffPeriod.delete(messageQueue);
               }
+            }
 
-              const message = await this.readMessage(messageData.messageId);
-
-              if (message) {
-                span.setAttributes({
-                  [SEMATTRS_MESSAGE_ID]: message.messageId,
-                  [SemanticAttributes.QUEUE]: message.queue,
-                  [SemanticAttributes.MESSAGE_ID]: message.messageId,
-                  [SemanticAttributes.CONCURRENCY_KEY]: message.concurrencyKey,
-                  [SemanticAttributes.PARENT_QUEUE]: message.parentQueue,
-                  attempted_queues: attemptedQueues, // How many queues we tried before success
-                  attempted_envs: attemptedEnvs, // How many environments we tried before success
-                  message_timestamp: message.timestamp,
-                  message_age: this.#calculateMessageAge(message),
-                  message_priority: message.priority,
-                  message_enqueue_method: message.enqueueMethod,
-                  message_available_at: message.availableAt,
-                  ...flattenAttributes(message.data, "message.data"),
-                });
-
-                await this.options.subscriber?.messageDequeued(message);
-
-                await this.options.visibilityTimeoutStrategy.startHeartbeat(
-                  messageData.messageId,
-                  this.visibilityTimeoutInMs
-                );
-
-                return message;
+            await this.#trace(
+              "attemptDequeue",
+              async (attemptDequeueSpan) => {
+                try {
+                  attemptDequeueSpan.setAttributes({
+                    [SemanticAttributes.QUEUE]: messageQueue,
+                    [SemanticAttributes.PARENT_QUEUE]: parentQueue,
+                  });
+
+                  const messages = await this.#trace(
+                    "callDequeueMessages",
+                    async (dequeueSpan) => {
+                      dequeueSpan.setAttributes({
+                        [SemanticAttributes.QUEUE]: messageQueue,
+                        [SemanticAttributes.PARENT_QUEUE]: parentQueue,
+                      });
+
+                      return await this.#callDequeueMessages({
+                        messageQueue,
+                        parentQueue,
+                        maxCount: this.options.sharedWorkerQueueMaxMessageCount ?? 10,
+                      });
+                    },
+                    {
+                      kind: SpanKind.CONSUMER,
+                      attributes: {
+                        [SEMATTRS_MESSAGING_OPERATION]: "receive",
+                        [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+                      },
+                    }
+                  );
+
+                  if (!messages || messages.length === 0) {
+                    const cooloffCount = this.queueDequeueCooloffCounts.get(messageQueue) ?? 0;
+
+                    const cooloffCountThreshold = Math.max(
+                      10,
+                      this.options.sharedWorkerQueueCooloffCountThreshold ?? 10
+                    ); // minimum of 10
+
+                    if (cooloffCount >= cooloffCountThreshold) {
+                      // If no messages were dequeued, set a cooloff period for the queue
+                      // This is to prevent the queue from being dequeued too frequently
+                      // and to give other queues a chance to dequeue messages more frequently
+                      this.queueDequeueCooloffPeriod.set(
+                        messageQueue,
+                        Date.now() + (this.options.sharedWorkerQueueCooloffPeriodMs ?? 10_000) // defaults to 10 seconds
+                      );
+                      this.queueDequeueCooloffCounts.delete(messageQueue);
+                    } else {
+                      this.queueDequeueCooloffCounts.set(messageQueue, cooloffCount + 1);
+                    }
+
+                    attemptDequeueSpan.setAttribute("message_count", 0);
+                    return null; // Try next queue if no message was dequeued
+                  }
+
+                  this.queueDequeueCooloffCounts.delete(messageQueue);
+
+                  messageCount += messages.length;
+
+                  attemptDequeueSpan.setAttribute("message_count", messages.length);
+
+                  await this.#trace(
+                    "addToWorkerQueue",
+                    async (addToWorkerQueueSpan) => {
+                      const workerQueueKey = this.keys.sharedWorkerQueueKey();
+
+                      addToWorkerQueueSpan.setAttributes({
+                        message_count: messages.length,
+                        [SemanticAttributes.PARENT_QUEUE]: workerQueueKey,
+                      });
+
+                      await this.redis.rpush(
+                        workerQueueKey,
+                        ...messages.map((message) => message.messageId)
+                      );
+                    },
+                    {
+                      kind: SpanKind.INTERNAL,
+                      attributes: {
+                        [SEMATTRS_MESSAGING_OPERATION]: "receive",
+                        [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+                      },
+                    }
+                  );
+                } catch (error) {
+                  // Log error but continue trying other queues
+                  logger.warn(`[${this.name}] Failed to dequeue from queue ${messageQueue}`, {
+                    error,
+                  });
+                  return null;
+                }
+              },
+              {
+                kind: SpanKind.CONSUMER,
+                attributes: {
+                  [SEMATTRS_MESSAGING_OPERATION]: "receive",
+                  [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+                },
               }
-            } catch (error) {
-              // Log error but continue trying other queues
-              logger.warn(`[${this.name}] Failed to dequeue from queue ${messageQueue}`, { error });
-              continue;
-            }
+            );
           }
         }
 
         // If we get here, we tried all queues but couldn't dequeue a message
         span.setAttribute("attempted_queues", attemptedQueues);
         span.setAttribute("attempted_envs", attemptedEnvs);
+        span.setAttribute("message_count", messageCount);
+        span.setAttribute("cooloff_period_count", coolOffPeriodCount);
 
         return;
       },
@@ -651,6 +996,64 @@ export class MarQS {
     );
   }
 
+  async #processQueueForWorkerQueue(queueKey: string, parentQueueKey: string) {
+    return this.#trace("processQueueForWorkerQueue", async (span) => {
+      span.setAttributes({
+        [SemanticAttributes.QUEUE]: queueKey,
+        [SemanticAttributes.PARENT_QUEUE]: parentQueueKey,
+      });
+
+      const maxCount = this.options.sharedWorkerQueueMaxMessageCount ?? 10;
+
+      const dequeuedMessages = await this.#callDequeueMessages({
+        messageQueue: queueKey,
+        parentQueue: parentQueueKey,
+        maxCount,
+      });
+
+      if (!dequeuedMessages || dequeuedMessages.length === 0) {
+        return;
+      }
+
+      await this.#trace(
+        "addToWorkerQueue",
+        async (addToWorkerQueueSpan) => {
+          const workerQueueKey = this.keys.sharedWorkerQueueKey();
+
+          addToWorkerQueueSpan.setAttributes({
+            message_count: dequeuedMessages.length,
+            [SemanticAttributes.PARENT_QUEUE]: workerQueueKey,
+          });
+
+          await this.redis.rpush(
+            workerQueueKey,
+            ...dequeuedMessages.map((message) => message.messageId)
+          );
+        },
+        {
+          kind: SpanKind.INTERNAL,
+          attributes: {
+            [SEMATTRS_MESSAGING_OPERATION]: "receive",
+            [SEMATTRS_MESSAGING_SYSTEM]: "marqs",
+          },
+        }
+      );
+
+      // If we dequeued the max count, we need to enqueue another job to dequeue the next batch
+      if (dequeuedMessages.length === maxCount) {
+        await this.worker.enqueueOnce({
+          id: queueKey,
+          job: "processQueueForWorkerQueue",
+          payload: {
+            queueKey,
+            parentQueueKey,
+          },
+          availableAt: new Date(Date.now() + 500), // 500ms from now
+        });
+      }
+    });
+  }
+
   public async acknowledgeMessage(messageId: string, reason: string = "unknown") {
     return this.#trace(
       "acknowledgeMessage",
@@ -682,6 +1085,20 @@ export class MarQS {
           messageId,
         });
 
+        const sharedQueueKey = this.keys.sharedQueueKey();
+
+        if (this.options.eagerDequeuingEnabled && message.parentQueue === sharedQueueKey) {
+          await this.worker.enqueueOnce({
+            id: message.queue,
+            job: "processQueueForWorkerQueue",
+            payload: {
+              queueKey: message.queue,
+              parentQueueKey: message.parentQueue,
+            },
+            availableAt: new Date(Date.now() + 500), // 500ms from now
+          });
+        }
+
         await this.options.subscriber?.messageAcked(message);
       },
       {
@@ -1256,12 +1673,14 @@ export class MarQS {
     }
   }
 
-  async #callDequeueMessage({
+  async #callDequeueMessages({
     messageQueue,
     parentQueue,
+    maxCount,
   }: {
     messageQueue: string;
     parentQueue: string;
+    maxCount: number;
   }) {
     const queueConcurrencyLimitKey = this.keys.queueConcurrencyLimitKeyFromQueue(messageQueue);
     const queueCurrentConcurrencyKey = this.keys.queueCurrentConcurrencyKeyFromQueue(messageQueue);
@@ -1271,7 +1690,7 @@ export class MarQS {
     const queueReserveConcurrencyKey = this.keys.queueReserveConcurrencyKeyFromQueue(messageQueue);
     const envQueueKey = this.keys.envQueueKeyFromQueue(messageQueue);
 
-    logger.debug("Calling dequeueMessage", {
+    logger.debug("Calling dequeueMessages", {
       messageQueue,
       parentQueue,
       queueConcurrencyLimitKey,
@@ -1284,7 +1703,7 @@ export class MarQS {
       service: this.name,
     });
 
-    const result = await this.redis.dequeueMessage(
+    const result = await this.redis.dequeueMessages(
       messageQueue,
       parentQueue,
       queueConcurrencyLimitKey,
@@ -1296,7 +1715,8 @@ export class MarQS {
       envQueueKey,
       messageQueue,
       String(Date.now()),
-      String(this.options.defaultEnvConcurrency)
+      String(this.options.defaultEnvConcurrency),
+      String(maxCount)
     );
 
     if (!result) {
@@ -1308,14 +1728,23 @@ export class MarQS {
       service: this.name,
     });
 
-    if (result.length !== 2) {
-      return;
+    const messages = [];
+    for (let i = 0; i < result.length; i += 2) {
+      const messageId = result[i];
+      const messageScore = result[i + 1];
+
+      messages.push({
+        messageId,
+        messageScore,
+      });
     }
 
-    return {
-      messageId: result[0],
-      messageScore: result[1],
-    };
+    logger.debug("dequeueMessages parsed result", {
+      messages,
+      service: this.name,
+    });
+
+    return messages.filter(Boolean);
   }
 
   async #callRequeueMessage(message: MessagePayload) {
@@ -1746,7 +2175,7 @@ return true
       `,
     });
 
-    this.redis.defineCommand("dequeueMessage", {
+    this.redis.defineCommand("dequeueMessages", {
       numberOfKeys: 9,
       lua: `
 local queueKey = KEYS[1]
@@ -1762,6 +2191,7 @@ local envQueueKey = KEYS[9]
 local queueName = ARGV[1]
 local currentTime = tonumber(ARGV[2])
 local defaultEnvConcurrencyLimit = ARGV[3]
+local maxCount = tonumber(ARGV[4] or '1')
 
 -- Check current env concurrency against the limit
 local envCurrentConcurrency = tonumber(redis.call('SCARD', envCurrentConcurrencyKey) or '0')
@@ -1784,27 +2214,38 @@ if queueCurrentConcurrency >= totalQueueConcurrencyLimit then
     return nil
 end
 
--- Attempt to dequeue the next message
-local messages = redis.call('ZRANGEBYSCORE', queueKey, '-inf', currentTime, 'WITHSCORES', 'LIMIT', 0, 1)
+-- Calculate how many messages we can actually dequeue based on concurrency limits
+local envAvailableCapacity = totalEnvConcurrencyLimit - envCurrentConcurrency
+local queueAvailableCapacity = totalQueueConcurrencyLimit - queueCurrentConcurrency
+local actualMaxCount = math.min(maxCount, envAvailableCapacity, queueAvailableCapacity)
 
-if #messages == 0 then
+if actualMaxCount <= 0 then
     return nil
 end
 
-local messageId = messages[1]
-local messageScore = tonumber(messages[2])
+-- Attempt to dequeue messages up to actualMaxCount
+local messagesWithScores = redis.call('ZRANGEBYSCORE', queueKey, '-inf', currentTime, 'WITHSCORES', 'LIMIT', 0, actualMaxCount)
 
--- Remove the message from the queue and update concurrency
-redis.call('ZREM', queueKey, messageId)
-redis.call('ZREM', envQueueKey, messageId)
-redis.call('SADD', queueCurrentConcurrencyKey, messageId)
-redis.call('SADD', envCurrentConcurrencyKey, messageId)
+if #messagesWithScores == 0 then
+    return nil
+end
+
+local messageIds = {}
+for i = 1, #messagesWithScores, 2 do
+    table.insert(messageIds, messagesWithScores[i])
+end
+
+-- Remove the messages from the queue and update concurrency
+redis.call('ZREM', queueKey, unpack(messageIds))
+redis.call('ZREM', envQueueKey, unpack(messageIds))
+redis.call('SADD', queueCurrentConcurrencyKey, unpack(messageIds))
+redis.call('SADD', envCurrentConcurrencyKey, unpack(messageIds))
 
 -- Remove the message from the reserve concurrency set
-redis.call('SREM', envReserveConcurrencyKey, messageId)
+redis.call('SREM', envReserveConcurrencyKey, unpack(messageIds))
 
 -- Remove the message from the queue reserve concurrency set
-redis.call('SREM', queueReserveConcurrencyKey, messageId)
+redis.call('SREM', queueReserveConcurrencyKey, unpack(messageIds))
 
 -- Rebalance the parent queue
 local earliestMessage = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
@@ -1814,7 +2255,27 @@ else
     redis.call('ZADD', parentQueueKey, earliestMessage[2], queueName)
 end
 
-return {messageId, messageScore} -- Return message details
+return messagesWithScores
+      `,
+    });
+
+    this.redis.defineCommand("popMessageFromWorkerQueue", {
+      numberOfKeys: 1,
+      lua: `
+local workerQueueKey = KEYS[1]
+
+-- lpop the first message from the worker queue
+local messageId = redis.call('LPOP', workerQueueKey)
+
+-- if there is no messageId, return nil
+if not messageId then
+    return nil
+end
+
+-- get the length of the worker queue
+local queueLength = tonumber(redis.call('LLEN', workerQueueKey) or '0')
+
+return {messageId, queueLength} -- Return message details
       `,
     });
 
@@ -2061,7 +2522,7 @@ declare module "ioredis" {
       callback?: Callback<string>
     ): Result<string, Context>;
 
-    dequeueMessage(
+    dequeueMessages(
       queueKey: string,
       parentQueueKey: string,
       queueConcurrencyLimitKey: string,
@@ -2074,7 +2535,13 @@ declare module "ioredis" {
       queueName: string,
       currentTime: string,
       defaultEnvConcurrencyLimit: string,
-      callback?: Callback<[string, string]>
+      maxCount: string,
+      callback?: Callback<string[]>
+    ): Result<string[] | null, Context>;
+
+    popMessageFromWorkerQueue(
+      workerQueueKey: string,
+      callback?: Callback<[string, string] | null>
     ): Result<[string, string] | null, Context>;
 
     requeueMessage(
@@ -2211,5 +2678,30 @@ function getMarQSClient() {
     enableRebalancing: !env.MARQS_DISABLE_REBALANCING,
     maximumNackCount: env.MARQS_MAXIMUM_NACK_COUNT,
     subscriber: concurrencyTracker,
+    sharedWorkerQueueConsumerIntervalMs: env.MARQS_SHARED_WORKER_QUEUE_CONSUMER_INTERVAL_MS,
+    sharedWorkerQueueMaxMessageCount: env.MARQS_SHARED_WORKER_QUEUE_MAX_MESSAGE_COUNT,
+    eagerDequeuingEnabled: env.MARQS_SHARED_WORKER_QUEUE_EAGER_DEQUEUE_ENABLED === "1",
+    sharedWorkerQueueCooloffCountThreshold: env.MARQS_SHARED_WORKER_QUEUE_COOLOFF_COUNT_THRESHOLD,
+    sharedWorkerQueueCooloffPeriodMs: env.MARQS_SHARED_WORKER_QUEUE_COOLOFF_PERIOD_MS,
+    workerOptions: {
+      enabled: env.MARQS_WORKER_ENABLED === "1",
+      pollIntervalMs: env.MARQS_WORKER_POLL_INTERVAL_MS,
+      immediatePollIntervalMs: env.MARQS_WORKER_IMMEDIATE_POLL_INTERVAL_MS,
+      shutdownTimeoutMs: env.MARQS_WORKER_SHUTDOWN_TIMEOUT_MS,
+      concurrency: {
+        workers: env.MARQS_WORKER_COUNT,
+        tasksPerWorker: env.MARQS_WORKER_CONCURRENCY_TASKS_PER_WORKER,
+        limit: env.MARQS_WORKER_CONCURRENCY_LIMIT,
+      },
+      redisOptions: {
+        keyPrefix: KEY_PREFIX,
+        port: env.REDIS_PORT ?? undefined,
+        host: env.REDIS_HOST ?? undefined,
+        username: env.REDIS_USERNAME ?? undefined,
+        password: env.REDIS_PASSWORD ?? undefined,
+        enableAutoPipelining: true,
+        ...(env.REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
+      },
+    },
   });
 }
diff --git a/apps/webapp/app/v3/marqs/marqsKeyProducer.ts b/apps/webapp/app/v3/marqs/marqsKeyProducer.ts
index 673d180229c..5c9c7238adc 100644
--- a/apps/webapp/app/v3/marqs/marqsKeyProducer.ts
+++ b/apps/webapp/app/v3/marqs/marqsKeyProducer.ts
@@ -2,6 +2,7 @@ import { MarQSKeyProducer, MarQSKeyProducerEnv, QueueDescriptor } from "./types"
 
 const constants = {
   SHARED_QUEUE: "sharedQueue",
+  SHARED_WORKER_QUEUE: "sharedWorkerQueue",
   CURRENT_CONCURRENCY_PART: "currentConcurrency",
   CONCURRENCY_LIMIT_PART: "concurrency",
   DISABLED_CONCURRENCY_LIMIT_PART: "disabledConcurrency",
@@ -108,6 +109,10 @@ export class MarQSShortKeyProducer implements MarQSKeyProducer {
     return constants.SHARED_QUEUE;
   }
 
+  sharedWorkerQueueKey(): string {
+    return constants.SHARED_WORKER_QUEUE;
+  }
+
   queueConcurrencyLimitKeyFromQueue(queue: string) {
     const descriptor = this.queueDescriptorFromQueue(queue);
 
diff --git a/apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts b/apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts
index 21544cc7564..8cc10fd5c08 100644
--- a/apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts
+++ b/apps/webapp/app/v3/marqs/sharedQueueConsumer.server.ts
@@ -11,8 +11,8 @@ import {
 import {
   AckCallbackResult,
   MachinePreset,
-  ProdTaskRunExecution,
-  ProdTaskRunExecutionPayload,
+  V3ProdTaskRunExecution,
+  V3ProdTaskRunExecutionPayload,
   TaskRunError,
   TaskRunErrorCodes,
   TaskRunExecution,
@@ -22,6 +22,7 @@ import {
   TaskRunSuccessfulExecutionResult,
   parsePacket,
   serverWebsocketMessages,
+  SemanticInternalAttributes,
 } from "@trigger.dev/core/v3";
 import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
 import {
@@ -166,6 +167,7 @@ export class SharedQueueConsumer {
   private _runningDurationInMs = 0;
   private _currentMessage: MessagePayload | undefined;
   private _currentMessageData: SharedQueueMessageBody | undefined;
+  private _stopWorkerQueueConsumer?: () => void;
 
   constructor(
     private _providerSender: ZodMessageSender<typeof serverWebsocketMessages>,
@@ -173,7 +175,7 @@ export class SharedQueueConsumer {
   ) {
     this._options = {
       maximumItemsPerTrace: options.maximumItemsPerTrace ?? 500,
-      traceTimeoutSeconds: options.traceTimeoutSeconds ?? 10,
+      traceTimeoutSeconds: options.traceTimeoutSeconds ?? 1,
       nextTickInterval: options.nextTickInterval ?? 1000, // 1 second
       interval: options.interval ?? 100, // 100ms
     };
@@ -233,6 +235,10 @@ export class SharedQueueConsumer {
       return;
     }
 
+    console.log("❌ Stopping the SharedQueueConsumer");
+
+    this._stopWorkerQueueConsumer?.();
+
     logger.debug("Stopping shared queue consumer");
     this._enabled = false;
 
@@ -252,6 +258,9 @@ export class SharedQueueConsumer {
     this._reasonStats = {};
     this._actionStats = {};
     this._outcomeStats = {};
+    this._stopWorkerQueueConsumer = marqs?.startSharedWorkerQueueConsumer(this._id);
+
+    console.log("✅ Started the SharedQueueConsumer");
 
     this.#doWork().finally(() => {});
   }
@@ -429,7 +438,7 @@ export class SharedQueueConsumer {
     this._currentMessage = undefined;
     this._currentMessageData = undefined;
 
-    const message = await marqs?.dequeueMessageInSharedQueue(this._id);
+    const message = await marqs?.dequeueMessageFromSharedWorkerQueue(this._id);
 
     if (!message) {
       return {
@@ -621,7 +630,8 @@ export class SharedQueueConsumer {
     const worker = deployment?.worker;
 
     if (!deployment || !worker) {
-      logger.error("No matching deployment found for task run", {
+      // This happens when a run is "WAITING_FOR_DEPLOY" and is expected
+      logger.info("No matching deployment found for task run", {
         queueMessage: message.data,
         messageId: message.messageId,
       });
@@ -1639,6 +1649,7 @@ export const AttemptForExecutionGetPayload = {
         baseCostInCents: true,
         maxDurationInSeconds: true,
         tags: true,
+        taskEventStore: true,
       },
     },
     queue: {
@@ -1679,7 +1690,7 @@ class SharedQueueTasks {
   private async _executionFromAttempt(
     attempt: AttemptForExecution,
     machinePreset?: MachinePreset
-  ): Promise<ProdTaskRunExecution> {
+  ): Promise<V3ProdTaskRunExecution> {
     const { backgroundWorkerTask, taskRun, queue } = attempt;
 
     if (!machinePreset) {
@@ -1693,7 +1704,7 @@ class SharedQueueTasks {
       dataType: taskRun.metadataType,
     });
 
-    const execution: ProdTaskRunExecution = {
+    const execution: V3ProdTaskRunExecution = {
       task: {
         id: backgroundWorkerTask.slug,
         filePath: backgroundWorkerTask.filePath,
@@ -1784,7 +1795,7 @@ class SharedQueueTasks {
     setToExecuting?: boolean;
     isRetrying?: boolean;
     skipStatusChecks?: boolean;
-  }): Promise<ProdTaskRunExecutionPayload | undefined> {
+  }): Promise<V3ProdTaskRunExecutionPayload | undefined> {
     const attempt = await prisma.taskRunAttempt.findFirst({
       where: {
         id,
@@ -1871,10 +1882,11 @@ class SharedQueueTasks {
     const variables = await this.#buildEnvironmentVariables(
       attempt.runtimeEnvironment,
       taskRun.id,
-      machinePreset
+      machinePreset,
+      taskRun.taskEventStore ?? undefined
     );
 
-    const payload: ProdTaskRunExecutionPayload = {
+    const payload: V3ProdTaskRunExecutionPayload = {
       execution,
       traceContext: taskRun.traceContext as Record<string, unknown>,
       environment: variables.reduce((acc: Record<string, string>, curr) => {
@@ -1888,7 +1900,7 @@ class SharedQueueTasks {
 
   async getResumePayload(attemptId: string): Promise<
     | {
-        execution: ProdTaskRunExecution;
+        execution: V3ProdTaskRunExecution;
         completion: TaskRunExecutionResult;
       }
     | undefined
@@ -1927,7 +1939,7 @@ class SharedQueueTasks {
 
   async getResumePayloads(attemptIds: string[]): Promise<
     Array<{
-      execution: ProdTaskRunExecution;
+      execution: V3ProdTaskRunExecution;
       completion: TaskRunExecutionResult;
     }>
   > {
@@ -1985,7 +1997,7 @@ class SharedQueueTasks {
     id: string,
     setToExecuting?: boolean,
     isRetrying?: boolean
-  ): Promise<ProdTaskRunExecutionPayload | undefined> {
+  ): Promise<V3ProdTaskRunExecutionPayload | undefined> {
     const run = await prisma.taskRun.findFirst({
       where: {
         id,
@@ -2040,6 +2052,7 @@ class SharedQueueTasks {
           },
         },
         machinePreset: true,
+        taskEventStore: true,
       },
     });
 
@@ -2062,7 +2075,12 @@ class SharedQueueTasks {
     const machinePreset =
       machinePresetFromRun(run) ?? machinePresetFromConfig(run.lockedBy?.machineConfig ?? {});
 
-    const variables = await this.#buildEnvironmentVariables(environment, run.id, machinePreset);
+    const variables = await this.#buildEnvironmentVariables(
+      environment,
+      run.id,
+      machinePreset,
+      run.taskEventStore ?? undefined
+    );
 
     return {
       traceContext: run.traceContext as Record<string, unknown>,
@@ -2169,7 +2187,8 @@ class SharedQueueTasks {
   async #buildEnvironmentVariables(
     environment: RuntimeEnvironmentForEnvRepo,
     runId: string,
-    machinePreset: MachinePreset
+    machinePreset: MachinePreset,
+    taskEventStore?: string
   ): Promise<Array<EnvironmentVariable>> {
     const variables = await resolveVariablesForEnvironment(environment);
 
@@ -2178,6 +2197,14 @@ class SharedQueueTasks {
       machine_preset: machinePreset.name,
     });
 
+    if (taskEventStore) {
+      const resourceAttributes = JSON.stringify({
+        [SemanticInternalAttributes.TASK_EVENT_STORE]: taskEventStore,
+      });
+
+      variables.push(...[{ key: "OTEL_RESOURCE_ATTRIBUTES", value: resourceAttributes }]);
+    }
+
     return [
       ...variables,
       ...[
diff --git a/apps/webapp/app/v3/marqs/types.ts b/apps/webapp/app/v3/marqs/types.ts
index 98792a30992..69e75ac44a5 100644
--- a/apps/webapp/app/v3/marqs/types.ts
+++ b/apps/webapp/app/v3/marqs/types.ts
@@ -36,6 +36,7 @@ export interface MarQSKeyProducer {
   envSharedQueueKey(env: MarQSKeyProducerEnv): string;
   sharedQueueKey(): string;
   sharedQueueScanPattern(): string;
+  sharedWorkerQueueKey(): string;
   queueCurrentConcurrencyScanPattern(): string;
   queueConcurrencyLimitKeyFromQueue(queue: string): string;
   queueCurrentConcurrencyKeyFromQueue(queue: string): string;
diff --git a/apps/webapp/app/v3/otlpExporter.server.ts b/apps/webapp/app/v3/otlpExporter.server.ts
index 888a6f46bb9..837071b7de7 100644
--- a/apps/webapp/app/v3/otlpExporter.server.ts
+++ b/apps/webapp/app/v3/otlpExporter.server.ts
@@ -1,105 +1,158 @@
-import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
+import { trace, Tracer } from "@opentelemetry/api";
 import { SemanticInternalAttributes } from "@trigger.dev/core/v3";
 import {
   AnyValue,
   ExportLogsServiceRequest,
   ExportLogsServiceResponse,
+  ExportMetricsServiceRequest,
+  ExportMetricsServiceResponse,
   ExportTraceServiceRequest,
   ExportTraceServiceResponse,
   KeyValue,
   ResourceLogs,
+  ResourceMetrics,
   ResourceSpans,
   SeverityNumber,
   Span,
   Span_Event,
-  Span_Link,
   Span_SpanKind,
   Status_StatusCode,
 } from "@trigger.dev/otlp-importer";
+import type { MetricsV1Input } from "@internal/clickhouse";
+import { logger } from "~/services/logger.server";
+import { clickhouseClient } from "~/services/clickhouseInstance.server";
+import { DynamicFlushScheduler } from "./dynamicFlushScheduler.server";
+import { ClickhouseEventRepository } from "./eventRepository/clickhouseEventRepository.server";
 import {
+  clickhouseEventRepository,
+  clickhouseEventRepositoryV2,
+} from "./eventRepository/clickhouseEventRepositoryInstance.server";
+import { generateSpanId } from "./eventRepository/common.server";
+import { EventRepository, eventRepository } from "./eventRepository/eventRepository.server";
+import type {
   CreatableEventKind,
   CreatableEventStatus,
-  EventRepository,
-  eventRepository,
-  type CreatableEvent,
-  CreatableEventEnvironmentType,
-} from "./eventRepository.server";
-import { logger } from "~/services/logger.server";
-import { trace, Tracer } from "@opentelemetry/api";
+  CreateEventInput,
+  IEventRepository,
+} from "./eventRepository/eventRepository.types";
 import { startSpan } from "./tracing.server";
 import { enrichCreatableEvents } from "./utils/enrichCreatableEvents.server";
-
-export type OTLPExporterConfig = {
-  batchSize: number;
-  batchInterval: number;
-};
+import { env } from "~/env.server";
+import { detectBadJsonStrings } from "~/utils/detectBadJsonStrings";
+import { singleton } from "~/utils/singleton";
 
 class OTLPExporter {
   private _tracer: Tracer;
 
   constructor(
     private readonly _eventRepository: EventRepository,
+    private readonly _clickhouseEventRepository: ClickhouseEventRepository,
+    private readonly _clickhouseEventRepositoryV2: ClickhouseEventRepository,
+    private readonly _metricsFlushScheduler: DynamicFlushScheduler<MetricsV1Input>,
     private readonly _verbose: boolean,
     private readonly _spanAttributeValueLengthLimit: number
   ) {
     this._tracer = trace.getTracer("otlp-exporter");
   }
 
-  async exportTraces(
-    request: ExportTraceServiceRequest,
-    immediate: boolean = false
-  ): Promise<ExportTraceServiceResponse> {
+  async exportTraces(request: ExportTraceServiceRequest): Promise<ExportTraceServiceResponse> {
     return await startSpan(this._tracer, "exportTraces", async (span) => {
       this.#logExportTracesVerbose(request);
 
-      const events = this.#filterResourceSpans(request.resourceSpans).flatMap((resourceSpan) => {
-        return convertSpansToCreateableEvents(resourceSpan, this._spanAttributeValueLengthLimit);
-      });
+      const eventsWithStores = this.#filterResourceSpans(request.resourceSpans).flatMap(
+        (resourceSpan) => {
+          return convertSpansToCreateableEvents(resourceSpan, this._spanAttributeValueLengthLimit);
+        }
+      );
 
-      const enrichedEvents = enrichCreatableEvents(events);
+      const eventCount = await this.#exportEvents(eventsWithStores);
 
-      this.#logEventsVerbose(enrichedEvents, "exportTraces");
+      span.setAttribute("event_count", eventCount);
 
-      span.setAttribute("event_count", enrichedEvents.length);
+      return ExportTraceServiceResponse.create();
+    });
+  }
 
-      if (immediate) {
-        await this._eventRepository.insertManyImmediate(enrichedEvents);
-      } else {
-        await this._eventRepository.insertMany(enrichedEvents);
+  async exportMetrics(
+    request: ExportMetricsServiceRequest
+  ): Promise<ExportMetricsServiceResponse> {
+    return await startSpan(this._tracer, "exportMetrics", async (span) => {
+      const rows = this.#filterResourceMetrics(request.resourceMetrics).flatMap(
+        (resourceMetrics) => {
+          return convertMetricsToClickhouseRows(
+            resourceMetrics,
+            this._spanAttributeValueLengthLimit
+          );
+        }
+      );
+
+      span.setAttribute("metric_row_count", rows.length);
+
+      if (rows.length > 0) {
+        this._metricsFlushScheduler.addToBatch(rows);
       }
 
-      return ExportTraceServiceResponse.create();
+      return ExportMetricsServiceResponse.create();
     });
   }
 
-  async exportLogs(
-    request: ExportLogsServiceRequest,
-    immediate: boolean = false
-  ): Promise<ExportLogsServiceResponse> {
+  async exportLogs(request: ExportLogsServiceRequest): Promise<ExportLogsServiceResponse> {
     return await startSpan(this._tracer, "exportLogs", async (span) => {
       this.#logExportLogsVerbose(request);
 
-      const events = this.#filterResourceLogs(request.resourceLogs).flatMap((resourceLog) => {
-        return convertLogsToCreateableEvents(resourceLog, this._spanAttributeValueLengthLimit);
-      });
+      const eventsWithStores = this.#filterResourceLogs(request.resourceLogs).flatMap(
+        (resourceLog) => {
+          return convertLogsToCreateableEvents(resourceLog, this._spanAttributeValueLengthLimit);
+        }
+      );
+
+      const eventCount = await this.#exportEvents(eventsWithStores);
+
+      span.setAttribute("event_count", eventCount);
+
+      return ExportLogsServiceResponse.create();
+    });
+  }
+
+  async #exportEvents(
+    eventsWithStores: { events: Array<CreateEventInput>; taskEventStore: string }[]
+  ) {
+    const eventsGroupedByStore = eventsWithStores.reduce((acc, { events, taskEventStore }) => {
+      acc[taskEventStore] = acc[taskEventStore] || [];
+      acc[taskEventStore].push(...events);
+      return acc;
+    }, {} as Record<string, Array<CreateEventInput>>);
+
+    let eventCount = 0;
+
+    for (const [store, events] of Object.entries(eventsGroupedByStore)) {
+      const eventRepository = this.#getEventRepositoryForStore(store);
 
       const enrichedEvents = enrichCreatableEvents(events);
 
-      this.#logEventsVerbose(enrichedEvents, "exportLogs");
+      this.#logEventsVerbose(enrichedEvents, `exportEvents ${store}`);
 
-      span.setAttribute("event_count", enrichedEvents.length);
+      eventCount += enrichedEvents.length;
 
-      if (immediate) {
-        await this._eventRepository.insertManyImmediate(enrichedEvents);
-      } else {
-        await this._eventRepository.insertMany(enrichedEvents);
-      }
+      await eventRepository.insertMany(enrichedEvents);
+    }
 
-      return ExportLogsServiceResponse.create();
-    });
+    return eventCount;
+  }
+
+  #getEventRepositoryForStore(store: string): IEventRepository {
+    if (store === "clickhouse") {
+      return this._clickhouseEventRepository;
+    }
+
+    if (store === "clickhouse_v2") {
+      return this._clickhouseEventRepositoryV2;
+    }
+
+    return this._eventRepository;
   }
 
-  #logEventsVerbose(events: CreatableEvent[], prefix: string) {
+  #logEventsVerbose(events: CreateEventInput[], prefix: string) {
     if (!this._verbose) return;
 
     events.forEach((event) => {
@@ -179,17 +232,51 @@ class OTLPExporter {
       return isBoolValue(attribute.value) ? attribute.value.boolValue : false;
     });
   }
+
+  #filterResourceMetrics(resourceMetrics: ResourceMetrics[]): ResourceMetrics[] {
+    return resourceMetrics.filter((rm) => {
+      const triggerAttribute = rm.resource?.attributes.find(
+        (attribute) => attribute.key === SemanticInternalAttributes.TRIGGER
+      );
+
+      if (!triggerAttribute) return false;
+
+      return isBoolValue(triggerAttribute.value) ? triggerAttribute.value.boolValue : false;
+    });
+  }
 }
 
 function convertLogsToCreateableEvents(
   resourceLog: ResourceLogs,
   spanAttributeValueLengthLimit: number
-): Array<CreatableEvent> {
+): { events: Array<CreateEventInput>; taskEventStore: string } {
   const resourceAttributes = resourceLog.resource?.attributes ?? [];
 
   const resourceProperties = extractEventProperties(resourceAttributes);
 
-  return resourceLog.scopeLogs.flatMap((scopeLog) => {
+  const userDefinedResourceAttributes = truncateAttributes(
+    convertKeyValueItemsToMap(resourceAttributes ?? [], [], undefined, [
+      SemanticInternalAttributes.USAGE,
+      SemanticInternalAttributes.SPAN,
+      SemanticInternalAttributes.METADATA,
+      SemanticInternalAttributes.STYLE,
+      SemanticInternalAttributes.METRIC_EVENTS,
+      SemanticInternalAttributes.TRIGGER,
+      "process",
+      "sdk",
+      "service",
+      "ctx",
+      "cli",
+      "cloud",
+    ]),
+    spanAttributeValueLengthLimit
+  );
+
+  const taskEventStore =
+    extractStringAttribute(resourceAttributes, [SemanticInternalAttributes.TASK_EVENT_STORE]) ??
+    env.EVENT_REPOSITORY_DEFAULT_STORE;
+
+  const events = resourceLog.scopeLogs.flatMap((scopeLog) => {
     return scopeLog.logRecords
       .map((log) => {
         const logLevel = logLevelToEventLevel(log.severityNumber);
@@ -203,9 +290,22 @@ function convertLogsToCreateableEvents(
           SemanticInternalAttributes.METADATA
         );
 
+        const properties =
+          truncateAttributes(
+            convertKeyValueItemsToMap(log.attributes ?? [], [], undefined, [
+              SemanticInternalAttributes.USAGE,
+              SemanticInternalAttributes.SPAN,
+              SemanticInternalAttributes.METADATA,
+              SemanticInternalAttributes.STYLE,
+              SemanticInternalAttributes.METRIC_EVENTS,
+              SemanticInternalAttributes.TRIGGER,
+            ]),
+            spanAttributeValueLengthLimit
+          ) ?? {};
+
         return {
           traceId: binaryToHex(log.traceId),
-          spanId: eventRepository.generateSpanId(),
+          spanId: generateSpanId(),
           parentId: binaryToHex(log.spanId),
           message: isStringValue(log.body)
             ? log.body.stringValue.slice(0, 4096)
@@ -216,64 +316,22 @@ function convertLogsToCreateableEvents(
           isError: logLevel === "ERROR",
           status: logLevelToEventStatus(log.severityNumber),
           startTime: log.timeUnixNano,
-          properties: {
-            ...convertKeyValueItemsToMap(
-              truncateAttributes(log.attributes ?? [], spanAttributeValueLengthLimit),
-              [SemanticInternalAttributes.SPAN_ID, SemanticInternalAttributes.SPAN_PARTIAL]
-            ),
-          },
+          properties,
+          resourceProperties: userDefinedResourceAttributes,
           style: convertKeyValueItemsToMap(
             pickAttributes(log.attributes ?? [], SemanticInternalAttributes.STYLE),
             []
           ),
-          output: detectPrimitiveValue(
-            convertKeyValueItemsToMap(
-              pickAttributes(log.attributes ?? [], SemanticInternalAttributes.OUTPUT),
-              []
-            ),
-            SemanticInternalAttributes.OUTPUT
-          ),
-          payload: detectPrimitiveValue(
-            convertKeyValueItemsToMap(
-              pickAttributes(log.attributes ?? [], SemanticInternalAttributes.PAYLOAD),
-              []
-            ),
-            SemanticInternalAttributes.PAYLOAD
-          ),
-          metadata: logProperties.metadata ?? resourceProperties.metadata,
-          serviceName: logProperties.serviceName ?? resourceProperties.serviceName ?? "unknown",
-          serviceNamespace:
-            logProperties.serviceNamespace ?? resourceProperties.serviceNamespace ?? "unknown",
+          metadata: logProperties.metadata ?? resourceProperties.metadata ?? {},
           environmentId:
             logProperties.environmentId ?? resourceProperties.environmentId ?? "unknown",
-          environmentType:
-            logProperties.environmentType ?? resourceProperties.environmentType ?? "DEVELOPMENT",
+          environmentType: "DEVELOPMENT" as const, // We've deprecated this but we need to keep it for backwards compatibility
           organizationId:
             logProperties.organizationId ?? resourceProperties.organizationId ?? "unknown",
           projectId: logProperties.projectId ?? resourceProperties.projectId ?? "unknown",
-          projectRef: logProperties.projectRef ?? resourceProperties.projectRef ?? "unknown",
           runId: logProperties.runId ?? resourceProperties.runId ?? "unknown",
-          runIsTest: logProperties.runIsTest ?? resourceProperties.runIsTest ?? false,
           taskSlug: logProperties.taskSlug ?? resourceProperties.taskSlug ?? "unknown",
-          taskPath: logProperties.taskPath ?? resourceProperties.taskPath ?? "unknown",
-          workerId: logProperties.workerId ?? resourceProperties.workerId ?? "unknown",
-          workerVersion:
-            logProperties.workerVersion ?? resourceProperties.workerVersion ?? "unknown",
-          queueId: logProperties.queueId ?? resourceProperties.queueId ?? "unknown",
-          queueName: logProperties.queueName ?? resourceProperties.queueName ?? "unknown",
-          batchId: logProperties.batchId ?? resourceProperties.batchId,
-          idempotencyKey: logProperties.idempotencyKey ?? resourceProperties.idempotencyKey,
-          machinePreset: logProperties.machinePreset ?? resourceProperties.machinePreset,
-          machinePresetCpu: logProperties.machinePresetCpu ?? resourceProperties.machinePresetCpu,
-          machinePresetMemory:
-            logProperties.machinePresetMemory ?? resourceProperties.machinePresetMemory,
-          machinePresetCentsPerMs:
-            logProperties.machinePresetCentsPerMs ?? resourceProperties.machinePresetCentsPerMs,
-          attemptId:
-            extractStringAttribute(
-              log.attributes ?? [],
-              [SemanticInternalAttributes.METADATA, SemanticInternalAttributes.ATTEMPT_ID].join(".")
-            ) ?? resourceProperties.attemptId,
+          machineId: logProperties.machineId ?? resourceProperties.machineId,
           attemptNumber:
             extractNumberAttribute(
               log.attributes ?? [],
@@ -285,17 +343,41 @@ function convertLogsToCreateableEvents(
       })
       .filter(Boolean);
   });
+
+  return { events, taskEventStore };
 }
 
 function convertSpansToCreateableEvents(
   resourceSpan: ResourceSpans,
   spanAttributeValueLengthLimit: number
-): Array<CreatableEvent> {
+): { events: Array<CreateEventInput>; taskEventStore: string } {
   const resourceAttributes = resourceSpan.resource?.attributes ?? [];
 
   const resourceProperties = extractEventProperties(resourceAttributes);
 
-  return resourceSpan.scopeSpans.flatMap((scopeSpan) => {
+  const userDefinedResourceAttributes = truncateAttributes(
+    convertKeyValueItemsToMap(resourceAttributes ?? [], [], undefined, [
+      SemanticInternalAttributes.USAGE,
+      SemanticInternalAttributes.SPAN,
+      SemanticInternalAttributes.METADATA,
+      SemanticInternalAttributes.STYLE,
+      SemanticInternalAttributes.METRIC_EVENTS,
+      SemanticInternalAttributes.TRIGGER,
+      "process",
+      "sdk",
+      "service",
+      "ctx",
+      "cli",
+      "cloud",
+    ]),
+    spanAttributeValueLengthLimit
+  );
+
+  const taskEventStore =
+    extractStringAttribute(resourceAttributes, [SemanticInternalAttributes.TASK_EVENT_STORE]) ??
+    env.EVENT_REPOSITORY_DEFAULT_STORE;
+
+  const events = resourceSpan.scopeSpans.flatMap((scopeSpan) => {
     return scopeSpan.spans
       .map((span) => {
         const isPartial = isPartialSpan(span);
@@ -309,6 +391,19 @@ function convertSpansToCreateableEvents(
           SemanticInternalAttributes.METADATA
         );
 
+        const properties =
+          truncateAttributes(
+            convertKeyValueItemsToMap(span.attributes ?? [], [], undefined, [
+              SemanticInternalAttributes.USAGE,
+              SemanticInternalAttributes.SPAN,
+              SemanticInternalAttributes.METADATA,
+              SemanticInternalAttributes.STYLE,
+              SemanticInternalAttributes.METRIC_EVENTS,
+              SemanticInternalAttributes.TRIGGER,
+            ]),
+            spanAttributeValueLengthLimit
+          ) ?? {};
+
         return {
           traceId: binaryToHex(span.traceId),
           spanId: isPartial
@@ -326,76 +421,24 @@ function convertSpansToCreateableEvents(
           level: "TRACE" as const,
           status: spanStatusToEventStatus(span.status),
           startTime: span.startTimeUnixNano,
-          links: spanLinksToEventLinks(span.links ?? []),
           events: spanEventsToEventEvents(span.events ?? []),
           duration: span.endTimeUnixNano - span.startTimeUnixNano,
-          properties: {
-            ...convertKeyValueItemsToMap(
-              truncateAttributes(span.attributes ?? [], spanAttributeValueLengthLimit),
-              [SemanticInternalAttributes.SPAN_ID, SemanticInternalAttributes.SPAN_PARTIAL]
-            ),
-          },
+          properties,
+          resourceProperties: userDefinedResourceAttributes,
           style: convertKeyValueItemsToMap(
             pickAttributes(span.attributes ?? [], SemanticInternalAttributes.STYLE),
             []
           ),
-          output: detectPrimitiveValue(
-            convertKeyValueItemsToMap(
-              pickAttributes(span.attributes ?? [], SemanticInternalAttributes.OUTPUT),
-              []
-            ),
-            SemanticInternalAttributes.OUTPUT
-          ),
-          outputType: pickAttributeStringValue(
-            span.attributes ?? [],
-            SemanticInternalAttributes.OUTPUT_TYPE
-          ),
-          payload: detectPrimitiveValue(
-            convertKeyValueItemsToMap(
-              pickAttributes(span.attributes ?? [], SemanticInternalAttributes.PAYLOAD),
-              []
-            ),
-            SemanticInternalAttributes.PAYLOAD
-          ),
-          payloadType:
-            pickAttributeStringValue(
-              span.attributes ?? [],
-              SemanticInternalAttributes.PAYLOAD_TYPE
-            ) ?? "application/json",
-          metadata: spanProperties.metadata ?? resourceProperties.metadata,
-          serviceName: spanProperties.serviceName ?? resourceProperties.serviceName ?? "unknown",
-          serviceNamespace:
-            spanProperties.serviceNamespace ?? resourceProperties.serviceNamespace ?? "unknown",
+          metadata: spanProperties.metadata ?? resourceProperties.metadata ?? {},
           environmentId:
             spanProperties.environmentId ?? resourceProperties.environmentId ?? "unknown",
-          environmentType:
-            spanProperties.environmentType ?? resourceProperties.environmentType ?? "DEVELOPMENT",
+          environmentType: "DEVELOPMENT" as const,
           organizationId:
             spanProperties.organizationId ?? resourceProperties.organizationId ?? "unknown",
           projectId: spanProperties.projectId ?? resourceProperties.projectId ?? "unknown",
-          projectRef: spanProperties.projectRef ?? resourceProperties.projectRef ?? "unknown",
           runId: spanProperties.runId ?? resourceProperties.runId ?? "unknown",
-          runIsTest: spanProperties.runIsTest ?? resourceProperties.runIsTest ?? false,
           taskSlug: spanProperties.taskSlug ?? resourceProperties.taskSlug ?? "unknown",
-          taskPath: spanProperties.taskPath ?? resourceProperties.taskPath ?? "unknown",
-          workerId: spanProperties.workerId ?? resourceProperties.workerId ?? "unknown",
-          workerVersion:
-            spanProperties.workerVersion ?? resourceProperties.workerVersion ?? "unknown",
-          queueId: spanProperties.queueId ?? resourceProperties.queueId ?? "unknown",
-          queueName: spanProperties.queueName ?? resourceProperties.queueName ?? "unknown",
-          batchId: spanProperties.batchId ?? resourceProperties.batchId,
-          idempotencyKey: spanProperties.idempotencyKey ?? resourceProperties.idempotencyKey,
-          machinePreset: spanProperties.machinePreset ?? resourceProperties.machinePreset,
-          machinePresetCpu: spanProperties.machinePresetCpu ?? resourceProperties.machinePresetCpu,
-          machinePresetMemory:
-            spanProperties.machinePresetMemory ?? resourceProperties.machinePresetMemory,
-          machinePresetCentsPerMs:
-            spanProperties.machinePresetCentsPerMs ?? resourceProperties.machinePresetCentsPerMs,
-          attemptId:
-            extractStringAttribute(
-              span.attributes ?? [],
-              [SemanticInternalAttributes.METADATA, SemanticInternalAttributes.ATTEMPT_ID].join(".")
-            ) ?? resourceProperties.attemptId,
+          machineId: spanProperties.machineId ?? resourceProperties.machineId,
           attemptNumber:
             extractNumberAttribute(
               span.attributes ?? [],
@@ -403,96 +446,221 @@ function convertSpansToCreateableEvents(
                 "."
               )
             ) ?? resourceProperties.attemptNumber,
-          usageDurationMs:
-            extractDoubleAttribute(
-              span.attributes ?? [],
-              SemanticInternalAttributes.USAGE_DURATION_MS
-            ) ??
-            extractNumberAttribute(
-              span.attributes ?? [],
-              SemanticInternalAttributes.USAGE_DURATION_MS
-            ),
-          usageCostInCents: extractDoubleAttribute(
-            span.attributes ?? [],
-            SemanticInternalAttributes.USAGE_COST_IN_CENTS
-          ),
         };
       })
       .filter(Boolean);
   });
+
+  return { events, taskEventStore };
+}
+
+function floorToTenSecondBucket(timeUnixNano: bigint | number): string {
+  const epochMs = Number(BigInt(timeUnixNano) / BigInt(1_000_000));
+  const flooredMs = Math.floor(epochMs / 10_000) * 10_000;
+  const date = new Date(flooredMs);
+  // Format as ClickHouse DateTime: YYYY-MM-DD HH:MM:SS
+  return date.toISOString().replace("T", " ").replace(/\.\d{3}Z$/, "");
+}
+
+function convertMetricsToClickhouseRows(
+  resourceMetrics: ResourceMetrics,
+  spanAttributeValueLengthLimit: number
+): MetricsV1Input[] {
+  const resourceAttributes = resourceMetrics.resource?.attributes ?? [];
+  const resourceProperties = extractEventProperties(resourceAttributes);
+
+  const organizationId = resourceProperties.organizationId ?? "unknown";
+  const projectId = resourceProperties.projectId ?? "unknown";
+  const environmentId = resourceProperties.environmentId ?? "unknown";
+  const resourceCtx = {
+    taskSlug: resourceProperties.taskSlug,
+    runId: resourceProperties.runId,
+    attemptNumber: resourceProperties.attemptNumber,
+    machineId: extractStringAttribute(resourceAttributes, SemanticInternalAttributes.MACHINE_ID),
+    workerId: extractStringAttribute(resourceAttributes, SemanticInternalAttributes.WORKER_ID),
+    workerVersion: extractStringAttribute(
+      resourceAttributes,
+      SemanticInternalAttributes.WORKER_VERSION
+    ),
+  };
+
+  const rows: MetricsV1Input[] = [];
+
+  for (const scopeMetrics of resourceMetrics.scopeMetrics) {
+    for (const metric of scopeMetrics.metrics) {
+      const metricName = metric.name;
+
+      // Process gauge data points
+      if (metric.gauge) {
+        for (const dp of metric.gauge.dataPoints) {
+          const value: number =
+            dp.asDouble !== undefined ? dp.asDouble : dp.asInt !== undefined ? Number(dp.asInt) : 0;
+          const resolved = resolveDataPointContext(dp.attributes ?? [], resourceCtx);
+
+          rows.push({
+            organization_id: organizationId,
+            project_id: projectId,
+            environment_id: environmentId,
+            metric_name: metricName,
+            metric_type: "gauge",
+            metric_subject: resolved.machineId ?? "unknown",
+            bucket_start: floorToTenSecondBucket(dp.timeUnixNano),
+            value,
+            attributes: resolved.attributes,
+          });
+        }
+      }
+
+      // Process sum data points
+      if (metric.sum) {
+        for (const dp of metric.sum.dataPoints) {
+          const value: number =
+            dp.asDouble !== undefined ? dp.asDouble : dp.asInt !== undefined ? Number(dp.asInt) : 0;
+          const resolved = resolveDataPointContext(dp.attributes ?? [], resourceCtx);
+
+          rows.push({
+            organization_id: organizationId,
+            project_id: projectId,
+            environment_id: environmentId,
+            metric_name: metricName,
+            metric_type: "sum",
+            metric_subject: resolved.machineId ?? "unknown",
+            bucket_start: floorToTenSecondBucket(dp.timeUnixNano),
+            value,
+            attributes: resolved.attributes,
+          });
+        }
+      }
+
+      // Process histogram data points
+      if (metric.histogram) {
+        for (const dp of metric.histogram.dataPoints) {
+          const resolved = resolveDataPointContext(dp.attributes ?? [], resourceCtx);
+          const count = Number(dp.count);
+          const sum = dp.sum ?? 0;
+
+          rows.push({
+            organization_id: organizationId,
+            project_id: projectId,
+            environment_id: environmentId,
+            metric_name: metricName,
+            metric_type: "histogram",
+            metric_subject: resolved.machineId ?? "unknown",
+            bucket_start: floorToTenSecondBucket(dp.timeUnixNano),
+            value: count > 0 ? sum / count : 0,
+            attributes: resolved.attributes,
+          });
+        }
+      }
+    }
+  }
+
+  return rows;
+}
+
+// Prefixes injected by TaskContextMetricExporter — these are extracted into
+// the nested `trigger` key and should not appear as top-level user attributes.
+const INTERNAL_METRIC_ATTRIBUTE_PREFIXES = ["ctx.", "worker."];
+
+interface ResourceContext {
+  taskSlug: string | undefined;
+  runId: string | undefined;
+  attemptNumber: number | undefined;
+  machineId: string | undefined;
+  workerId: string | undefined;
+  workerVersion: string | undefined;
+}
+
+function resolveDataPointContext(
+  dpAttributes: KeyValue[],
+  resourceCtx: ResourceContext
+): {
+  machineId: string | undefined;
+  attributes: Record<string, unknown>;
+} {
+  const runId =
+    resourceCtx.runId ??
+    extractStringAttribute(dpAttributes, SemanticInternalAttributes.RUN_ID);
+  const taskSlug =
+    resourceCtx.taskSlug ??
+    extractStringAttribute(dpAttributes, SemanticInternalAttributes.TASK_SLUG);
+  const attemptNumber =
+    resourceCtx.attemptNumber ??
+    extractNumberAttribute(dpAttributes, SemanticInternalAttributes.ATTEMPT_NUMBER);
+  const machineId =
+    resourceCtx.machineId ??
+    extractStringAttribute(dpAttributes, SemanticInternalAttributes.MACHINE_ID);
+  const workerId =
+    resourceCtx.workerId ??
+    extractStringAttribute(dpAttributes, SemanticInternalAttributes.WORKER_ID);
+  const workerVersion =
+    resourceCtx.workerVersion ??
+    extractStringAttribute(dpAttributes, SemanticInternalAttributes.WORKER_VERSION);
+  const machineName = extractStringAttribute(
+    dpAttributes,
+    SemanticInternalAttributes.MACHINE_PRESET_NAME
+  );
+  const environmentType = extractStringAttribute(
+    dpAttributes,
+    SemanticInternalAttributes.ENVIRONMENT_TYPE
+  );
+
+  // Build the trigger context object with only defined values
+  const trigger: Record<string, string | number> = {};
+  if (runId) trigger.run_id = runId;
+  if (taskSlug) trigger.task_slug = taskSlug;
+  if (attemptNumber !== undefined) trigger.attempt_number = attemptNumber;
+  if (machineId) trigger.machine_id = machineId;
+  if (machineName) trigger.machine_name = machineName;
+  if (workerId) trigger.worker_id = workerId;
+  if (workerVersion) trigger.worker_version = workerVersion;
+  if (environmentType) trigger.environment_type = environmentType;
+
+  // Build user attributes, filtering out internal ctx/worker keys
+  const result: Record<string, unknown> = {};
+
+  if (Object.keys(trigger).length > 0) {
+    result.trigger = trigger;
+  }
+
+  for (const attr of dpAttributes) {
+    if (INTERNAL_METRIC_ATTRIBUTE_PREFIXES.some((prefix) => attr.key.startsWith(prefix))) {
+      continue;
+    }
+
+    if (isStringValue(attr.value)) {
+      result[attr.key] = attr.value.stringValue;
+    } else if (isIntValue(attr.value)) {
+      result[attr.key] = Number(attr.value.intValue);
+    } else if (isDoubleValue(attr.value)) {
+      result[attr.key] = attr.value.doubleValue;
+    } else if (isBoolValue(attr.value)) {
+      result[attr.key] = attr.value.boolValue;
+    }
+  }
+
+  return { machineId, attributes: result };
 }
 
 function extractEventProperties(attributes: KeyValue[], prefix?: string) {
   return {
-    metadata: convertKeyValueItemsToMap(attributes, [SemanticInternalAttributes.TRIGGER]),
-    serviceName: extractStringAttribute(attributes, SemanticResourceAttributes.SERVICE_NAME),
-    serviceNamespace: extractStringAttribute(
-      attributes,
-      SemanticResourceAttributes.SERVICE_NAMESPACE
-    ),
+    metadata: convertSelectedKeyValueItemsToMap(attributes, [SemanticInternalAttributes.METADATA]),
     environmentId: extractStringAttribute(attributes, [
       prefix,
       SemanticInternalAttributes.ENVIRONMENT_ID,
     ]),
-    environmentType: extractStringAttribute(attributes, [
-      prefix,
-      SemanticInternalAttributes.ENVIRONMENT_TYPE,
-    ]) as CreatableEventEnvironmentType,
     organizationId: extractStringAttribute(attributes, [
       prefix,
       SemanticInternalAttributes.ORGANIZATION_ID,
     ]),
     projectId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.PROJECT_ID]),
-    projectRef: extractStringAttribute(attributes, [
-      prefix,
-      SemanticInternalAttributes.PROJECT_REF,
-    ]),
     runId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.RUN_ID]),
-    runIsTest: extractBooleanAttribute(
-      attributes,
-      [prefix, SemanticInternalAttributes.RUN_IS_TEST],
-      false
-    ),
-    attemptId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.ATTEMPT_ID]),
     attemptNumber: extractNumberAttribute(attributes, [
       prefix,
       SemanticInternalAttributes.ATTEMPT_NUMBER,
     ]),
     taskSlug: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.TASK_SLUG]),
-    taskPath: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.TASK_PATH]),
-    taskExportName: "@deprecated",
-    workerId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.WORKER_ID]),
-    workerVersion: extractStringAttribute(attributes, [
-      prefix,
-      SemanticInternalAttributes.WORKER_VERSION,
-    ]),
-    queueId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.QUEUE_ID]),
-    queueName: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.QUEUE_NAME]),
-    batchId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.BATCH_ID]),
-    idempotencyKey: extractStringAttribute(attributes, [
-      prefix,
-      SemanticInternalAttributes.IDEMPOTENCY_KEY,
-    ]),
-    machinePreset: extractStringAttribute(attributes, [
-      prefix,
-      SemanticInternalAttributes.MACHINE_PRESET_NAME,
-    ]),
-    machinePresetCpu:
-      extractDoubleAttribute(attributes, [prefix, SemanticInternalAttributes.MACHINE_PRESET_CPU]) ??
-      extractNumberAttribute(attributes, [prefix, SemanticInternalAttributes.MACHINE_PRESET_CPU]),
-    machinePresetMemory:
-      extractDoubleAttribute(attributes, [
-        prefix,
-        SemanticInternalAttributes.MACHINE_PRESET_MEMORY,
-      ]) ??
-      extractNumberAttribute(attributes, [
-        prefix,
-        SemanticInternalAttributes.MACHINE_PRESET_MEMORY,
-      ]),
-    machinePresetCentsPerMs: extractDoubleAttribute(attributes, [
-      prefix,
-      SemanticInternalAttributes.MACHINE_PRESET_CENTS_PER_MS,
-    ]),
+    machineId: extractStringAttribute(attributes, [prefix, SemanticInternalAttributes.MACHINE_ID]),
   };
 }
 
@@ -507,29 +675,64 @@ function pickAttributes(attributes: KeyValue[], prefix: string): KeyValue[] {
     });
 }
 
-function pickAttributeStringValue(attributes: KeyValue[], key: string): string | undefined {
-  const attribute = attributes.find((attribute) => attribute.key === key);
+function convertKeyValueItemsToMap(
+  attributes: KeyValue[],
+  filteredKeys: string[] = [],
+  prefix?: string,
+  filteredPrefixes: string[] = []
+): Record<string, string | number | boolean | undefined> | undefined {
+  if (!attributes) return;
+  if (!attributes.length) return;
 
-  if (!attribute) return undefined;
+  let filteredAttributes = attributes.filter((attribute) => !filteredKeys.includes(attribute.key));
+
+  if (!filteredAttributes.length) return;
+
+  if (filteredPrefixes.length) {
+    filteredAttributes = filteredAttributes.filter(
+      (attribute) => !filteredPrefixes.some((prefix) => attribute.key.startsWith(prefix))
+    );
+  }
+
+  if (!filteredAttributes.length) return;
+
+  const result = filteredAttributes.reduce(
+    (map: Record<string, string | number | boolean | undefined>, attribute) => {
+      map[`${prefix ? `${prefix}.` : ""}${attribute.key}`] = isStringValue(attribute.value)
+        ? attribute.value.stringValue
+        : isIntValue(attribute.value)
+        ? Number(attribute.value.intValue)
+        : isDoubleValue(attribute.value)
+        ? attribute.value.doubleValue
+        : isBoolValue(attribute.value)
+        ? attribute.value.boolValue
+        : isBytesValue(attribute.value)
+        ? binaryToHex(attribute.value.bytesValue)
+        : undefined;
+
+      return map;
+    },
+    {}
+  );
 
-  return isStringValue(attribute.value) ? attribute.value.stringValue : undefined;
+  return result;
 }
 
-function convertKeyValueItemsToMap(
+function convertSelectedKeyValueItemsToMap(
   attributes: KeyValue[],
-  filteredKeys: string[] = [],
+  selectedPrefixes: string[] = [],
   prefix?: string
 ): Record<string, string | number | boolean | undefined> | undefined {
   if (!attributes) return;
   if (!attributes.length) return;
 
-  const filteredAttributes = attributes.filter(
-    (attribute) => !filteredKeys.includes(attribute.key)
+  let selectedAttributes = attributes.filter((attribute) =>
+    selectedPrefixes.some((prefix) => attribute.key.startsWith(prefix))
   );
 
-  if (!filteredAttributes.length) return;
+  if (!selectedAttributes.length) return;
 
-  const result = filteredAttributes.reduce(
+  const result = selectedAttributes.reduce(
     (map: Record<string, string | number | boolean | undefined>, attribute) => {
       map[`${prefix ? `${prefix}.` : ""}${attribute.key}`] = isStringValue(attribute.value)
         ? attribute.value.stringValue
@@ -564,18 +767,7 @@ function detectPrimitiveValue(
   return attributes;
 }
 
-function spanLinksToEventLinks(links: Span_Link[]): CreatableEvent["links"] {
-  return links.map((link) => {
-    return {
-      traceId: binaryToHex(link.traceId),
-      spanId: binaryToHex(link.spanId),
-      tracestate: link.traceState,
-      properties: convertKeyValueItemsToMap(link.attributes ?? []),
-    };
-  });
-}
-
-function spanEventsToEventEvents(events: Span_Event[]): CreatableEvent["events"] {
+function spanEventsToEventEvents(events: Span_Event[]): CreateEventInput["events"] {
   return events.map((event) => {
     return {
       name: event.name,
@@ -624,7 +816,7 @@ function spanKindToEventKind(kind: Span["kind"]): CreatableEventKind {
   }
 }
 
-function logLevelToEventLevel(level: SeverityNumber): CreatableEvent["level"] {
+function logLevelToEventLevel(level: SeverityNumber): CreateEventInput["level"] {
   switch (level) {
     case SeverityNumber.TRACE:
     case SeverityNumber.TRACE2:
@@ -859,23 +1051,98 @@ function binaryToHex(buffer: Buffer | string | undefined): string | undefined {
   return Buffer.from(Array.from(buffer)).toString("hex");
 }
 
-function truncateAttributes(attributes: KeyValue[], maximumLength: number = 1024): KeyValue[] {
-  return attributes.map((attribute) => {
-    return isStringValue(attribute.value)
-      ? {
-          key: attribute.key,
-          value: {
-            stringValue: attribute.value.stringValue.slice(0, maximumLength),
-          },
-        }
-      : attribute;
-  });
+function truncateAttributes(
+  attributes: Record<string, string | number | boolean | undefined> | undefined,
+  maximumLength: number = 1024
+): Record<string, string | number | boolean | undefined> | undefined {
+  if (!attributes) return undefined;
+
+  const truncatedAttributes: Record<string, string | number | boolean | undefined> = {};
+
+  for (const [key, value] of Object.entries(attributes)) {
+    if (!key) continue;
+
+    if (typeof value === "string") {
+      truncatedAttributes[key] = truncateAndDetectUnpairedSurrogate(value, maximumLength);
+    } else {
+      truncatedAttributes[key] = value;
+    }
+  }
+
+  return truncatedAttributes;
 }
 
-export const otlpExporter = new OTLPExporter(
-  eventRepository,
-  process.env.OTLP_EXPORTER_VERBOSE === "1",
-  process.env.SERVER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT
-    ? parseInt(process.env.SERVER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT, 10)
-    : 8192
-);
+function truncateAndDetectUnpairedSurrogate(str: string, maximumLength: number): string {
+  const truncatedString = smartTruncateString(str, maximumLength);
+
+  if (hasUnpairedSurrogateAtEnd(truncatedString)) {
+    return smartTruncateString(truncatedString, [...truncatedString].length - 1);
+  }
+
+  return truncatedString;
+}
+
+const ASCII_ONLY_REGEX = /^[\p{ASCII}]*$/u;
+
+function smartTruncateString(str: string, maximumLength: number): string {
+  if (!str) return "";
+  if (str.length <= maximumLength) return str;
+
+  const checkLength = Math.min(str.length, maximumLength * 2 + 2);
+
+  if (ASCII_ONLY_REGEX.test(str.slice(0, checkLength))) {
+    return str.slice(0, maximumLength);
+  }
+
+  return [...str.slice(0, checkLength)].slice(0, maximumLength).join("");
+}
+
+function hasUnpairedSurrogateAtEnd(str: string): boolean {
+  if (str.length === 0) return false;
+
+  const lastCode = str.charCodeAt(str.length - 1);
+
+  // Check if last character is an unpaired high surrogate
+  if (lastCode >= 0xd800 && lastCode <= 0xdbff) {
+    return true; // High surrogate at end = unpaired
+  }
+
+  // Check if last character is an unpaired low surrogate
+  if (lastCode >= 0xdc00 && lastCode <= 0xdfff) {
+    // Low surrogate is only valid if preceded by high surrogate
+    if (str.length === 1) return true; // Single low surrogate
+
+    const secondLastCode = str.charCodeAt(str.length - 2);
+    if (secondLastCode < 0xd800 || secondLastCode > 0xdbff) {
+      return true; // Low surrogate not preceded by high surrogate
+    }
+  }
+
+  return false;
+}
+
+export const otlpExporter = singleton("otlpExporter", initializeOTLPExporter);
+
+function initializeOTLPExporter() {
+  const metricsFlushScheduler = new DynamicFlushScheduler<MetricsV1Input>({
+    batchSize: env.METRICS_CLICKHOUSE_BATCH_SIZE,
+    flushInterval: env.METRICS_CLICKHOUSE_FLUSH_INTERVAL_MS,
+    callback: async (_flushId, batch) => {
+      await clickhouseClient.metrics.insert(batch);
+    },
+    minConcurrency: 1,
+    maxConcurrency: env.METRICS_CLICKHOUSE_MAX_CONCURRENCY,
+    loadSheddingEnabled: false,
+  });
+
+  return new OTLPExporter(
+    eventRepository,
+    clickhouseEventRepository,
+    clickhouseEventRepositoryV2,
+    metricsFlushScheduler,
+    process.env.OTLP_EXPORTER_VERBOSE === "1",
+    process.env.SERVER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT
+      ? parseInt(process.env.SERVER_OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT, 10)
+      : 8192
+  );
+}
diff --git a/apps/webapp/app/v3/querySchemas.ts b/apps/webapp/app/v3/querySchemas.ts
new file mode 100644
index 00000000000..53c3be60fa2
--- /dev/null
+++ b/apps/webapp/app/v3/querySchemas.ts
@@ -0,0 +1,610 @@
+import { column, type BucketThreshold, type TableSchema } from "@internal/tsql";
+import { z } from "zod";
+import { autoFormatSQL } from "~/components/code/TSQLEditor";
+import { runFriendlyStatus, runStatusTitleFromStatus } from "~/components/runs/v3/TaskRunStatus";
+import { logger } from "~/services/logger.server";
+
+export const QueryScopeSchema = z.enum(["organization", "project", "environment"]);
+export type QueryScope = z.infer<typeof QueryScopeSchema>;
+
+/**
+ * Environment type values
+ */
+const ENVIRONMENT_TYPES = ["PRODUCTION", "STAGING", "DEVELOPMENT", "PREVIEW"] as const;
+
+/**
+ * Machine preset values
+ */
+const MACHINE_PRESETS = [
+  "micro",
+  "small-1x",
+  "small-2x",
+  "medium-1x",
+  "medium-2x",
+  "large-1x",
+  "large-2x",
+] as const;
+
+/**
+ * Schema definition for the runs table (trigger_dev.task_runs_v2)
+ */
+export const runsSchema: TableSchema = {
+  name: "runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  description: "Task runs - stores all task execution records",
+  timeConstraint: "triggered_at",
+  useFinal: true,
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+  requiredFilters: [{ column: "engine", value: "V2" }],
+  columns: {
+    run_id: {
+      name: "run_id",
+      clickhouseName: "friendly_id",
+      ...column("String", {
+        description:
+          "A unique ID for a run. They always start with `run_`, e.g., run_cm1a2b3c4d5e6f7g8h9i",
+        customRenderType: "runId",
+        example: "run_cm1a2b3c4d5e6f7g8h9i",
+        coreColumn: true,
+      }),
+    },
+    environment: {
+      name: "environment",
+      clickhouseName: "environment_id",
+      ...column("String", { description: "The environment slug", example: "prod" }),
+      fieldMapping: "environment",
+      customRenderType: "environment",
+    },
+    project: {
+      name: "project",
+      clickhouseName: "project_id",
+      ...column("String", {
+        description: "The project reference, they always start with `proj_`.",
+        example: "proj_howcnaxbfxdmwmxazktx",
+      }),
+      fieldMapping: "project",
+      customRenderType: "project",
+    },
+    environment_type: {
+      name: "environment_type",
+      ...column("LowCardinality(String)", {
+        description: "Environment type",
+        allowedValues: [...ENVIRONMENT_TYPES],
+        customRenderType: "environmentType",
+        example: "PRODUCTION",
+      }),
+    },
+    attempt_count: {
+      name: "attempt_count",
+      clickhouseName: "attempt",
+      ...column("UInt8", {
+        description: "Number of attempts (starts at 1)",
+        example: "1",
+        customRenderType: "number",
+      }),
+    },
+    status: {
+      name: "status",
+      ...column("LowCardinality(String)", {
+        description: "Run status",
+        allowedValues: [...runFriendlyStatus],
+        valueMap: runStatusTitleFromStatus,
+        customRenderType: "runStatus",
+        example: "Completed",
+        coreColumn: true,
+      }),
+    },
+    is_finished: {
+      name: "is_finished",
+      ...column("UInt8", {
+        description:
+          "Whether the run is finished. This includes failed and successful runs. (0 or 1)",
+        example: "0",
+      }),
+      expression:
+        "if(status IN ('COMPLETED_SUCCESSFULLY', 'COMPLETED_WITH_ERRORS', 'CANCELED', 'TIMED_OUT', 'CRASHED', 'SYSTEM_FAILURE', 'EXPIRED', 'PAUSED'), true, false)",
+    },
+
+    // Task & queue
+    task_identifier: {
+      name: "task_identifier",
+      ...column("String", {
+        description: "Task identifier/slug",
+        example: "my-background-task",
+        coreColumn: true,
+      }),
+    },
+    queue: {
+      name: "queue",
+      ...column("String", {
+        description: "Queue name",
+        example: "task/my-background-task",
+        customRenderType: "queue",
+      }),
+    },
+
+    batch_id: {
+      name: "batch_id",
+      ...column("String", {
+        description: "Batch ID (if part of a batch)",
+        example: "batch_5678efgh",
+        expression: "if(batch_id = '', NULL, 'batch_' || batch_id)",
+      }),
+      whereTransform: (value: string) => value.replace(/^batch_/, ""),
+    },
+
+    // Related runs
+    root_run_id: {
+      name: "root_run_id",
+      ...column("String", {
+        description: "Root run ID (for child runs)",
+        example: "run_cm1a2b3c4d5e6f7g8h9i",
+        customRenderType: "runId",
+        expression: "if(root_run_id = '', NULL, 'run_' || root_run_id)",
+      }),
+      whereTransform: (value: string) => value.replace(/^run_/, ""),
+    },
+    parent_run_id: {
+      name: "parent_run_id",
+      ...column("String", {
+        description: "Parent run ID (for child runs)",
+        example: "run_cm1a2b3c4d5e6f7g8h9i",
+        customRenderType: "runId",
+        expression: "if(parent_run_id = '', NULL, 'run_' || parent_run_id)",
+      }),
+      whereTransform: (value: string) => value.replace(/^run_/, ""),
+    },
+    depth: {
+      name: "depth",
+      ...column("UInt8", { description: "Nesting depth (0 for root runs)", example: "0" }),
+    },
+    is_root_run: {
+      name: "is_root_run",
+      ...column("UInt8", { description: "Whether this is a root run (0 or 1)", example: "0" }),
+      expression: "if(depth = 0, true, false)",
+    },
+    is_child_run: {
+      name: "is_child_run",
+      ...column("UInt8", { description: "Whether this is a child run (0 or 1)", example: "0" }),
+      expression: "if(depth > 0, true, false)",
+    },
+
+    idempotency_key: {
+      name: "idempotency_key",
+      clickhouseName: "idempotency_key_user",
+      ...column("String", { description: "Idempotency key (available from 4.3.3)", example: "user-123-action-456" }),
+    },
+    idempotency_key_scope: {
+      name: "idempotency_key_scope",
+      ...column("String", { description: "The idempotency key scope determines whether a task should be considered unique within a parent run, a specific attempt, or globally. An empty value means there's no idempotency key set (available from 4.3.3).", example: "run", allowedValues: ["global", "run", "attempt"], }),
+    },
+    region: {
+      name: "region",
+      clickhouseName: "worker_queue",
+      ...column("String", {
+        description: "Region",
+        example: "us-east-1",
+      }),
+      expression: "if(startsWith(worker_queue, 'cm'), NULL, worker_queue)",
+    },
+
+    // Timing
+    triggered_at: {
+      name: "triggered_at",
+      clickhouseName: "created_at",
+      ...column("DateTime64", {
+        description: "When the run was triggered.",
+        example: "2024-01-15 09:30:00.000",
+        coreColumn: true,
+      }),
+    },
+    queued_at: {
+      name: "queued_at",
+      ...column("Nullable(DateTime64)", {
+        description:
+          "When the run was added to the queue. This is normally the same time as the triggered_at time, unless a delay is passed in or it's a scheduled run.",
+        example: "2024-01-15 09:30:01.000",
+      }),
+    },
+    dequeued_at: {
+      name: "dequeued_at",
+      clickhouseName: "started_at",
+      ...column("Nullable(DateTime64)", {
+        description:
+          "When the run was dequeued for execution. This happens when there is available concurrency to execute your run.",
+        example: "2024-01-15 09:30:01.000",
+      }),
+    },
+    executed_at: {
+      name: "executed_at",
+      ...column("Nullable(DateTime64)", {
+        description: "When execution of the run began.",
+        example: "2024-01-15 09:30:01.500",
+      }),
+    },
+    completed_at: {
+      name: "completed_at",
+      ...column("Nullable(DateTime64)", {
+        description: "When the run completed",
+        example: "2024-01-15 09:30:05.000",
+      }),
+    },
+    delay_until: {
+      name: "delay_until",
+      ...column("Nullable(DateTime64)", {
+        description: "Delayed execution until this time",
+        example: "2024-01-15 10:00:00.000",
+      }),
+    },
+    has_delay: {
+      name: "has_delay",
+      ...column("UInt8", { description: "Whether the run had a delay passed in", example: "1" }),
+      expression: "if(isNotNull(delay_until), true, false)",
+    },
+    expired_at: {
+      name: "expired_at",
+      ...column("Nullable(DateTime64)", {
+        description:
+          'If there was a TTL on the run, this is when the run "expired". By default dev runs have a TTL of 10 minutes.',
+        example: "2024-01-15 09:35:00.000",
+      }),
+    },
+    ttl: {
+      name: "ttl",
+      clickhouseName: "expiration_ttl",
+      ...column("String", {
+        description: "The TTL string for expiration – by default dev runs have a TTL of '10m'.",
+        example: "10m",
+      }),
+    },
+
+    // Useful time periods
+    execution_duration: {
+      name: "execution_duration",
+      ...column("Nullable(Int64)", {
+        description:
+          "The time between starting to execute and completing. This includes any time spent waiting (it is not compute time, use `usage_duration` for that).",
+        customRenderType: "duration",
+        example: "4000",
+      }),
+      expression: "dateDiff('millisecond', executed_at, completed_at)",
+    },
+    total_duration: {
+      name: "total_duration",
+      ...column("Nullable(Int64)", {
+        description:
+          "The time between being triggered and completing (if it has). This includes any time spent waiting (it is not compute time, use `usage_duration` for that).",
+        customRenderType: "duration",
+        example: "4000",
+      }),
+      expression: "dateDiff('millisecond', created_at, completed_at)",
+    },
+    queued_duration: {
+      name: "queued_duration",
+      ...column("Nullable(Int64)", {
+        description:
+          "The time between being queued and dequeued. Remember you need enough available concurrency for runs to be dequeued and start executing.",
+        customRenderType: "duration",
+        example: "4000",
+      }),
+      expression: "dateDiff('millisecond', queued_at, started_at)",
+    },
+
+    // Cost & usage
+    usage_duration: {
+      name: "usage_duration",
+      clickhouseName: "usage_duration_ms",
+      ...column("UInt32", {
+        description: "Compute usage duration in milliseconds.",
+        customRenderType: "duration",
+        example: "3500",
+      }),
+    },
+    compute_cost: {
+      name: "compute_cost",
+      ...column("Float64", {
+        description: "Compute cost in dollars",
+        customRenderType: "costInDollars",
+        example: "0.000676",
+      }),
+      expression: "cost_in_cents / 100.0",
+    },
+    invocation_cost: {
+      name: "invocation_cost",
+      ...column("Float64", {
+        description: "Invocation cost in dollars – the cost to start a run.",
+        customRenderType: "costInDollars",
+        example: "0.000025",
+      }),
+      expression: "base_cost_in_cents / 100.0",
+    },
+    total_cost: {
+      name: "total_cost",
+      ...column("Float64", {
+        description: "Total cost in dollars (compute_cost + invocation_cost)",
+        customRenderType: "costInDollars",
+        example: "0.000701",
+      }),
+      expression: "(cost_in_cents + base_cost_in_cents) / 100.0",
+    },
+
+    // Output & error (JSON columns)
+    // For JSON columns, NULL checks are transformed to check for empty object '{}'
+    // So `error IS NULL` becomes `error = '{}'` and `error IS NOT NULL` becomes `error != '{}'`
+    // textColumn uses the pre-materialized text columns for better performance
+    // dataPrefix handles the internal {"data": ...} wrapper transparently
+    output: {
+      name: "output",
+      ...column("JSON", {
+        description: "The data you returned from the task.",
+        example: '{"result": "success"}',
+      }),
+      nullValue: "'{}'", // Transform NULL checks to compare against empty object
+      textColumn: "output_text", // Use output_text for full JSON value queries
+      dataPrefix: "data", // Internal data is wrapped in {"data": ...}
+    },
+    error: {
+      name: "error",
+      ...column("JSON", {
+        description:
+          "If a run completely failed (after all attempts) then this error will be populated.",
+        example: '{"message": "Task failed"}',
+      }),
+      nullValue: "'{}'", // Transform NULL checks to compare against empty object
+      textColumn: "error_text", // Use error_text for full JSON value queries
+      dataPrefix: "data", // Internal data is wrapped in {"data": ...}
+    },
+
+    // Tags & versions
+    tags: {
+      name: "tags",
+      ...column("Array(String)", {
+        description: "Tags you have added to the run.",
+        customRenderType: "tags",
+        example: '["user:123", "priority:high"]',
+      }),
+    },
+    task_version: {
+      name: "task_version",
+      ...column("String", {
+        description: "The version of your code in reverse date format.",
+        example: "20240115.1",
+      }),
+    },
+    sdk_version: {
+      name: "sdk_version",
+      ...column("String", {
+        description: "The SDK package version for this run.",
+        example: "3.3.0",
+      }),
+    },
+    cli_version: {
+      name: "cli_version",
+      ...column("String", {
+        description: "The CLI package version for this run.",
+        example: "3.3.0",
+      }),
+    },
+    machine: {
+      name: "machine",
+      clickhouseName: "machine_preset",
+      ...column("LowCardinality(String)", {
+        description: "The machine that the run executed on.",
+        allowedValues: [...MACHINE_PRESETS],
+        customRenderType: "machine",
+        example: "small-1x",
+      }),
+    },
+    is_test: {
+      name: "is_test",
+      ...column("UInt8", { description: "Whether this is a test run (0 or 1)", example: "0" }),
+      expression: "if(is_test > 0, true, false)",
+    },
+    concurrency_key: {
+      name: "concurrency_key",
+      ...column("String", {
+        description: "The concurrency key you passed in when triggering the run.",
+        example: "user:1234567",
+      }),
+    },
+    max_duration: {
+      name: "max_duration",
+      clickhouseName: "max_duration_in_seconds",
+      ...column("Nullable(UInt32)", {
+        description:
+          "The maximum allowed compute duration for this run in seconds. If the run exceeds this duration, the run will fail with an error. Can be set on an individual task, in the trigger.config, or per-run when triggering.",
+        example: "300",
+        customRenderType: "durationSeconds",
+      }),
+    },
+    bulk_action_group_ids: {
+      name: "bulk_action_group_ids",
+      ...column("Array(String)", {
+        description: "Any bulk actions that operated on this run.",
+        example: '["bulk_12345678", "bulk_34567890"]',
+        whereTransform: (value: string) => {
+          logger.log(`WHERE TRANSFORM: ${value}`);
+          return value.replace(/^bulk_/, "");
+        },
+      }),
+    },
+  },
+};
+
+/**
+ * Schema definition for the metrics table (trigger_dev.metrics_v1)
+ */
+export const metricsSchema: TableSchema = {
+  name: "metrics",
+  clickhouseName: "trigger_dev.metrics_v1",
+  description: "Host and runtime metrics collected during task execution",
+  timeConstraint: "bucket_start",
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+  columns: {
+    environment: {
+      name: "environment",
+      clickhouseName: "environment_id",
+      ...column("String", { description: "The environment slug", example: "prod" }),
+      fieldMapping: "environment",
+      customRenderType: "environment",
+    },
+    project: {
+      name: "project",
+      clickhouseName: "project_id",
+      ...column("String", {
+        description: "The project reference, they always start with `proj_`.",
+        example: "proj_howcnaxbfxdmwmxazktx",
+      }),
+      fieldMapping: "project",
+      customRenderType: "project",
+    },
+    metric_name: {
+      name: "metric_name",
+      ...column("LowCardinality(String)", {
+        description: "The name of the metric (e.g. process.cpu.utilization, system.memory.usage)",
+        example: "process.cpu.utilization",
+        coreColumn: true,
+      }),
+    },
+    metric_type: {
+      name: "metric_type",
+      ...column("LowCardinality(String)", {
+        description: "The type of metric",
+        allowedValues: ["gauge", "sum", "histogram"],
+        example: "gauge",
+      }),
+    },
+    machine_id: {
+      name: "machine_id",
+      clickhouseName: "metric_subject",
+      ...column("String", {
+        description: "The machine ID that produced this metric",
+        example: "machine-abc123",
+      }),
+    },
+    bucket_start: {
+      name: "bucket_start",
+      ...column("DateTime", {
+        description: "The start of the 10-second aggregation bucket",
+        example: "2024-01-15 09:30:00",
+        coreColumn: true,
+      }),
+    },
+    metric_value: {
+      name: "metric_value",
+      clickhouseName: "value",
+      ...column("Float64", {
+        description: "The metric value",
+        example: "0.75",
+        coreColumn: true,
+      }),
+    },
+
+    // Attributes (JSON column for user-defined and system attributes)
+    attributes: {
+      name: "attributes",
+      ...column("JSON", {
+        description: "JSON attributes attached to the metric data point.",
+        example: '{"region": "us-east-1"}',
+      }),
+    },
+
+    // Trigger context columns (from attributes.trigger.* JSON subpaths)
+    run_id: {
+      name: "run_id",
+      ...column("String", {
+        description: "The run ID associated with this metric",
+        customRenderType: "runId",
+        example: "run_cm1a2b3c4d5e6f7g8h9i",
+        coreColumn: true,
+      }),
+      expression: "attributes.trigger.run_id",
+    },
+    task_identifier: {
+      name: "task_identifier",
+      ...column("String", {
+        description: "Task identifier/slug",
+        example: "my-background-task",
+        coreColumn: true,
+      }),
+      expression: "attributes.trigger.task_slug",
+    },
+    attempt_number: {
+      name: "attempt_number",
+      ...column("UInt64", {
+        description: "The attempt number for this metric",
+        example: "1",
+      }),
+      expression: "attributes.trigger.attempt_number",
+    },
+    machine_name: {
+      name: "machine_name",
+      ...column("String", {
+        description: "The machine preset used for execution",
+        allowedValues: [...MACHINE_PRESETS],
+        example: "small-1x",
+      }),
+      expression: "attributes.trigger.machine_name",
+    },
+    environment_type: {
+      name: "environment_type",
+      ...column("String", {
+        description: "Environment type",
+        allowedValues: [...ENVIRONMENT_TYPES],
+        customRenderType: "environmentType",
+        example: "PRODUCTION",
+      }),
+      expression: "attributes.trigger.environment_type",
+    },
+    worker_id: {
+      name: "worker_id",
+      ...column("String", {
+        description: "The worker ID that produced this metric",
+        customRenderType: "deploymentId",
+        example: "deployment_cm1a2b3c4d5e",
+      }),
+      expression: "attributes.trigger.worker_id",
+    },
+    worker_version: {
+      name: "worker_version",
+      ...column("String", {
+        description: "The worker version that produced this metric",
+        example: "20240115.1",
+      }),
+      expression: "attributes.trigger.worker_version",
+    },
+  },
+  timeBucketThresholds: [
+    // Metrics are pre-aggregated into 10-second buckets, so 10s is the most granular interval.
+    // All thresholds are shifted coarser compared to the runs table defaults.
+    { maxRangeSeconds: 3 * 60 * 60, interval: { value: 10, unit: "SECOND" } },
+    { maxRangeSeconds: 12 * 60 * 60, interval: { value: 1, unit: "MINUTE" } },
+    { maxRangeSeconds: 2 * 24 * 60 * 60, interval: { value: 5, unit: "MINUTE" } },
+    { maxRangeSeconds: 7 * 24 * 60 * 60, interval: { value: 15, unit: "MINUTE" } },
+    { maxRangeSeconds: 30 * 24 * 60 * 60, interval: { value: 1, unit: "HOUR" } },
+    { maxRangeSeconds: 90 * 24 * 60 * 60, interval: { value: 6, unit: "HOUR" } },
+    { maxRangeSeconds: 180 * 24 * 60 * 60, interval: { value: 1, unit: "DAY" } },
+    { maxRangeSeconds: 365 * 24 * 60 * 60, interval: { value: 1, unit: "WEEK" } },
+  ] satisfies BucketThreshold[],
+};
+
+/**
+ * All available schemas for the query editor
+ */
+export const querySchemas: TableSchema[] = [runsSchema, metricsSchema];
+
+/**
+ * Default query for the query editor
+ */
+export const defaultQuery = autoFormatSQL(`SELECT run_id, task_identifier, triggered_at, status
+FROM runs
+ORDER BY triggered_at DESC
+LIMIT 100`);
diff --git a/apps/webapp/app/v3/registryConfig.server.ts b/apps/webapp/app/v3/registryConfig.server.ts
new file mode 100644
index 00000000000..72e2abdaee8
--- /dev/null
+++ b/apps/webapp/app/v3/registryConfig.server.ts
@@ -0,0 +1,35 @@
+import { env } from "~/env.server";
+
+export type RegistryConfig = {
+  host: string;
+  username?: string;
+  password?: string;
+  namespace: string;
+  ecrTags?: string;
+  ecrAssumeRoleArn?: string;
+  ecrAssumeRoleExternalId?: string;
+};
+
+export function getRegistryConfig(isV4Deployment: boolean): RegistryConfig {
+  if (isV4Deployment) {
+    return {
+      host: env.V4_DEPLOY_REGISTRY_HOST,
+      username: env.V4_DEPLOY_REGISTRY_USERNAME,
+      password: env.V4_DEPLOY_REGISTRY_PASSWORD,
+      namespace: env.V4_DEPLOY_REGISTRY_NAMESPACE,
+      ecrTags: env.V4_DEPLOY_REGISTRY_ECR_TAGS,
+      ecrAssumeRoleArn: env.V4_DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
+      ecrAssumeRoleExternalId: env.V4_DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
+    };
+  }
+
+  return {
+    host: env.DEPLOY_REGISTRY_HOST,
+    username: env.DEPLOY_REGISTRY_USERNAME,
+    password: env.DEPLOY_REGISTRY_PASSWORD,
+    namespace: env.DEPLOY_REGISTRY_NAMESPACE,
+    ecrTags: env.DEPLOY_REGISTRY_ECR_TAGS,
+    ecrAssumeRoleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
+    ecrAssumeRoleExternalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
+  };
+}
diff --git a/apps/webapp/app/v3/remoteImageBuilder.server.ts b/apps/webapp/app/v3/remoteImageBuilder.server.ts
index e1e6916c419..a6f113022af 100644
--- a/apps/webapp/app/v3/remoteImageBuilder.server.ts
+++ b/apps/webapp/app/v3/remoteImageBuilder.server.ts
@@ -1,20 +1,36 @@
 import { depot } from "@depot/sdk-node";
-import { Project } from "@trigger.dev/database";
+import { type ExternalBuildData } from "@trigger.dev/core/v3";
+import { type Project } from "@trigger.dev/database";
 import { prisma } from "~/db.server";
 import { env } from "~/env.server";
+import pRetry from "p-retry";
+import { logger } from "~/services/logger.server";
 
-export async function createRemoteImageBuild(project: Project) {
+export async function createRemoteImageBuild(
+  project: Project
+): Promise<ExternalBuildData | undefined> {
   if (!remoteBuildsEnabled()) {
     return;
   }
 
   const builderProjectId = await createBuilderProjectIfNotExists(project);
 
-  const result = await depot.build.v1.BuildService.createBuild(
-    { projectId: builderProjectId },
+  const result = await pRetry(
+    () =>
+      depot.build.v1.BuildService.createBuild(
+        { projectId: builderProjectId },
+        {
+          headers: {
+            Authorization: `Bearer ${env.DEPOT_TOKEN}`,
+          },
+        }
+      ),
     {
-      headers: {
-        Authorization: `Bearer ${env.DEPOT_TOKEN}`,
+      retries: 3,
+      minTimeout: 200,
+      maxTimeout: 2000,
+      onFailedAttempt: (error) => {
+        logger.error("Failed attempt to create remote Depot build", { error });
       },
     }
   );
diff --git a/apps/webapp/app/v3/runEngine.server.ts b/apps/webapp/app/v3/runEngine.server.ts
index 30f344e7242..efba5fbdb05 100644
--- a/apps/webapp/app/v3/runEngine.server.ts
+++ b/apps/webapp/app/v3/runEngine.server.ts
@@ -1,7 +1,9 @@
 import { RunEngine } from "@internal/run-engine";
 import { $replica, prisma } from "~/db.server";
 import { env } from "~/env.server";
-import { defaultMachine } from "~/services/platform.v3.server";
+import { createBatchGlobalRateLimiter } from "~/runEngine/concerns/batchGlobalRateLimiter.server";
+import { logger } from "~/services/logger.server";
+import { defaultMachine, getCurrentPlan } from "~/services/platform.v3.server";
 import { singleton } from "~/utils/singleton";
 import { allMachines } from "./machinePresets.server";
 import { meter, tracer } from "./tracer.server";
@@ -15,6 +17,8 @@ function createRunEngine() {
     prisma,
     readOnlyPrisma: $replica,
     logLevel: env.RUN_ENGINE_WORKER_LOG_LEVEL,
+    treatProductionExecutionStallsAsOOM:
+      env.RUN_ENGINE_TREAT_PRODUCTION_EXECUTION_STALLS_AS_OOM === "1",
     worker: {
       disabled: env.RUN_ENGINE_WORKER_ENABLED === "0",
       workers: env.RUN_ENGINE_WORKER_COUNT,
@@ -67,6 +71,9 @@ function createRunEngine() {
       dequeueBlockingTimeoutSeconds: env.RUN_ENGINE_DEQUEUE_BLOCKING_TIMEOUT_SECONDS,
       masterQueueConsumersIntervalMs: env.RUN_ENGINE_MASTER_QUEUE_CONSUMERS_INTERVAL_MS,
       masterQueueConsumersDisabled: env.RUN_ENGINE_WORKER_ENABLED === "0",
+      masterQueueCooloffPeriodMs: env.RUN_ENGINE_MASTER_QUEUE_COOLOFF_PERIOD_MS,
+      masterQueueCooloffCountThreshold: env.RUN_ENGINE_MASTER_QUEUE_COOLOFF_COUNT_THRESHOLD,
+      masterQueueConsumerDequeueCount: env.RUN_ENGINE_MASTER_QUEUE_CONSUMER_DEQUEUE_COUNT,
       concurrencySweeper: {
         scanSchedule: env.RUN_ENGINE_CONCURRENCY_SWEEPER_SCAN_SCHEDULE,
         processMarkedSchedule: env.RUN_ENGINE_CONCURRENCY_SWEEPER_PROCESS_MARKED_SCHEDULE,
@@ -104,7 +111,87 @@ function createRunEngine() {
       EXECUTING_WITH_WAITPOINTS: env.RUN_ENGINE_TIMEOUT_EXECUTING_WITH_WAITPOINTS,
       SUSPENDED: env.RUN_ENGINE_TIMEOUT_SUSPENDED,
     },
+    suspendedHeartbeatRetriesConfig: {
+      maxCount: env.RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_MAX_COUNT,
+      maxDelayMs: env.RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_MAX_DELAY_MS,
+      initialDelayMs: env.RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_INITIAL_DELAY_MS,
+      factor: env.RUN_ENGINE_SUSPENDED_HEARTBEAT_RETRIES_FACTOR,
+    },
     retryWarmStartThresholdMs: env.RUN_ENGINE_RETRY_WARM_START_THRESHOLD_MS,
+    billing: {
+      getCurrentPlan: async (orgId: string) => {
+        const plan = await getCurrentPlan(orgId);
+
+        // This only happens when there's no billing service running or on errors
+        if (!plan) {
+          logger.warn("engine.getCurrentPlan: no plan", { orgId });
+          return {
+            isPaying: true,
+            type: "paid", // default to paid
+          };
+        }
+
+        // This shouldn't happen
+        if (!plan.v3Subscription) {
+          logger.warn("engine.getCurrentPlan: no v3 subscription", { orgId });
+          return {
+            isPaying: false,
+            type: "free",
+          };
+        }
+
+        // Neither should this
+        if (!plan.v3Subscription.plan) {
+          logger.warn("engine.getCurrentPlan: no v3 subscription plan", { orgId });
+          return {
+            isPaying: plan.v3Subscription.isPaying,
+            type: plan.v3Subscription.isPaying ? "paid" : "free",
+          };
+        }
+
+        // This is the normal case when the billing service is running
+        return {
+          isPaying: plan.v3Subscription.isPaying,
+          type: plan.v3Subscription.plan.type,
+        };
+      },
+    },
+    // BatchQueue with DRR scheduling for fair batch processing
+    // Consumers are controlled by options.worker.disabled (same as main worker)
+    batchQueue: {
+      redis: {
+        keyPrefix: "engine:",
+        port: env.BATCH_TRIGGER_WORKER_REDIS_PORT ?? undefined,
+        host: env.BATCH_TRIGGER_WORKER_REDIS_HOST ?? undefined,
+        username: env.BATCH_TRIGGER_WORKER_REDIS_USERNAME ?? undefined,
+        password: env.BATCH_TRIGGER_WORKER_REDIS_PASSWORD ?? undefined,
+        enableAutoPipelining: true,
+        ...(env.BATCH_TRIGGER_WORKER_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
+      },
+      drr: {
+        quantum: env.BATCH_QUEUE_DRR_QUANTUM,
+        maxDeficit: env.BATCH_QUEUE_MAX_DEFICIT,
+        masterQueueLimit: env.BATCH_QUEUE_MASTER_QUEUE_LIMIT,
+      },
+      shardCount: env.BATCH_QUEUE_SHARD_COUNT,
+      workerQueueBlockingTimeoutSeconds: env.BATCH_QUEUE_WORKER_QUEUE_ENABLED
+        ? env.BATCH_QUEUE_WORKER_QUEUE_TIMEOUT_SECONDS
+        : undefined,
+      consumerCount: env.BATCH_QUEUE_CONSUMER_COUNT,
+      consumerIntervalMs: env.BATCH_QUEUE_CONSUMER_INTERVAL_MS,
+      consumerEnabled: env.BATCH_QUEUE_WORKER_ENABLED,
+      // Default processing concurrency when no specific limit is set
+      // This is overridden per-batch based on the plan type at batch creation
+      defaultConcurrency: env.BATCH_CONCURRENCY_LIMIT_DEFAULT,
+      // Optional global rate limiter - limits max items/sec processed across all consumers
+      globalRateLimiter: env.BATCH_QUEUE_GLOBAL_RATE_LIMIT
+        ? createBatchGlobalRateLimiter(env.BATCH_QUEUE_GLOBAL_RATE_LIMIT)
+        : undefined,
+    },
+    // Debounce configuration
+    debounce: {
+      maxDebounceDurationMs: env.RUN_ENGINE_MAXIMUM_DEBOUNCE_DURATION_MS,
+    },
   });
 
   return engine;
diff --git a/apps/webapp/app/v3/runEngineHandlers.server.ts b/apps/webapp/app/v3/runEngineHandlers.server.ts
index fffee593686..7992ffbc70e 100644
--- a/apps/webapp/app/v3/runEngineHandlers.server.ts
+++ b/apps/webapp/app/v3/runEngineHandlers.server.ts
@@ -1,58 +1,72 @@
-import { $replica, prisma } from "~/db.server";
-import {
-  createExceptionPropertiesFromError,
-  eventRepository,
-  recordRunDebugLog,
-} from "./eventRepository.server";
+import { CompleteBatchResult } from "@internal/run-engine";
+import { SpanKind } from "@internal/tracing";
+import { tryCatch } from "@trigger.dev/core/utils";
 import { createJsonErrorObject, sanitizeError } from "@trigger.dev/core/v3";
+import { RunId } from "@trigger.dev/core/v3/isomorphic";
+import { BatchTaskRunStatus, Prisma } from "@trigger.dev/database";
+import { $replica, prisma } from "~/db.server";
+import { env } from "~/env.server";
+import { findEnvironmentById, findEnvironmentFromRun } from "~/models/runtimeEnvironment.server";
+import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
-import { safeJsonParse } from "~/utils/json";
-import type { Attributes } from "@opentelemetry/api";
+import { updateMetadataService } from "~/services/metadata/updateMetadataInstance.server";
 import { reportInvocationUsage } from "~/services/platform.v3.server";
+import { MetadataTooLargeError } from "~/utils/packets";
+import { TriggerTaskService } from "~/v3/services/triggerTask.server";
+import { tracer } from "~/v3/tracer.server";
+import { createExceptionPropertiesFromError } from "./eventRepository/common.server";
+import { recordRunDebugLog, resolveEventRepositoryForStore } from "./eventRepository/index.server";
 import { roomFromFriendlyRunId, socketIo } from "./handleSocketIo.server";
 import { engine } from "./runEngine.server";
 import { PerformTaskRunAlertsService } from "./services/alerts/performTaskRunAlerts.server";
-import { RunId } from "@trigger.dev/core/v3/isomorphic";
-import { updateMetadataService } from "~/services/metadata/updateMetadataInstance.server";
-import { findEnvironmentFromRun } from "~/models/runtimeEnvironment.server";
-import { env } from "~/env.server";
-import { getTaskEventStoreTableForRun } from "./taskEventStore.server";
 
 export function registerRunEngineEventBusHandlers() {
   engine.eventBus.on("runSucceeded", async ({ time, run }) => {
-    try {
-      const completedEvent = await eventRepository.completeEvent(
-        getTaskEventStoreTableForRun(run),
-        run.spanId,
-        run.createdAt,
-        run.completedAt ?? undefined,
-        {
-          endTime: time,
-          attributes: {
-            isError: false,
-            output:
-              run.outputType === "application/store" || run.outputType === "text/plain"
-                ? run.output
-                : run.output
-                ? (safeJsonParse(run.output) as Attributes)
-                : undefined,
-            outputType: run.outputType,
-          },
-        }
-      );
+    const [taskRunError, taskRun] = await tryCatch(
+      $replica.taskRun.findFirstOrThrow({
+        where: {
+          id: run.id,
+        },
+        select: {
+          id: true,
+          friendlyId: true,
+          traceId: true,
+          spanId: true,
+          parentSpanId: true,
+          createdAt: true,
+          completedAt: true,
+          taskIdentifier: true,
+          projectId: true,
+          runtimeEnvironmentId: true,
+          environmentType: true,
+          isTest: true,
+          organizationId: true,
+          taskEventStore: true,
+        },
+      })
+    );
 
-      if (!completedEvent) {
-        logger.error("[runSucceeded] Failed to complete event for unknown reason", {
-          runId: run.id,
-          spanId: run.spanId,
-        });
-        return;
-      }
-    } catch (error) {
-      logger.error("[runSucceeded] Failed to complete event", {
-        error: error instanceof Error ? error.message : error,
+    if (taskRunError) {
+      logger.error("[runSucceeded] Failed to find task run", {
+        error: taskRunError,
+        runId: run.id,
+      });
+      return;
+    }
+
+    const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
+    const [completeSuccessfulRunEventError] = await tryCatch(
+      eventRepository.completeSuccessfulRunEvent({
+        run: taskRun,
+        endTime: time,
+      })
+    );
+
+    if (completeSuccessfulRunEventError) {
+      logger.error("[runSucceeded] Failed to complete successful run event", {
+        error: completeSuccessfulRunEventError,
         runId: run.id,
-        spanId: run.spanId,
       });
     }
   });
@@ -72,263 +86,343 @@ export function registerRunEngineEventBusHandlers() {
 
   // Handle events
   engine.eventBus.on("runFailed", async ({ time, run }) => {
-    try {
-      const sanitizedError = sanitizeError(run.error);
-      const exception = createExceptionPropertiesFromError(sanitizedError);
+    const sanitizedError = sanitizeError(run.error);
+    const exception = createExceptionPropertiesFromError(sanitizedError);
 
-      const eventStore = getTaskEventStoreTableForRun(run);
+    const [taskRunError, taskRun] = await tryCatch(
+      $replica.taskRun.findFirstOrThrow({
+        where: {
+          id: run.id,
+        },
+        select: {
+          id: true,
+          friendlyId: true,
+          traceId: true,
+          spanId: true,
+          parentSpanId: true,
+          createdAt: true,
+          completedAt: true,
+          taskIdentifier: true,
+          projectId: true,
+          runtimeEnvironmentId: true,
+          environmentType: true,
+          isTest: true,
+          organizationId: true,
+          taskEventStore: true,
+        },
+      })
+    );
 
-      const completedEvent = await eventRepository.completeEvent(
-        eventStore,
-        run.spanId,
-        run.createdAt,
-        run.completedAt ?? undefined,
-        {
-          endTime: time,
-          attributes: {
-            isError: true,
-          },
-          events: [
-            {
-              name: "exception",
-              time,
-              properties: {
-                exception,
-              },
-            },
-          ],
-        }
-      );
+    if (taskRunError) {
+      logger.error("[runFailed] Failed to find task run", {
+        error: taskRunError,
+        runId: run.id,
+      });
+      return;
+    }
 
-      if (!completedEvent) {
-        logger.error("[runFailed] Failed to complete event for unknown reason", {
-          runId: run.id,
-          spanId: run.spanId,
-        });
-        return;
-      }
+    const eventRepository = resolveEventRepositoryForStore(taskRun.taskEventStore);
 
-      const inProgressEvents = await eventRepository.queryIncompleteEvents(
-        eventStore,
-        {
-          runId: completedEvent?.runId,
-        },
-        run.createdAt,
-        run.completedAt ?? undefined
-      );
+    const [completeFailedRunEventError] = await tryCatch(
+      eventRepository.completeFailedRunEvent({
+        run: taskRun,
+        endTime: time,
+        exception,
+      })
+    );
 
-      await Promise.all(
-        inProgressEvents.map((event) => {
-          try {
-            const completedEvent = eventRepository.completeEvent(
-              eventStore,
-              run.spanId,
-              run.createdAt,
-              run.completedAt ?? undefined,
-              {
-                endTime: time,
-                attributes: {
-                  isError: true,
-                },
-                events: [
-                  {
-                    name: "exception",
-                    time,
-                    properties: {
-                      exception,
-                    },
-                  },
-                ],
-              }
-            );
-
-            if (!completedEvent) {
-              logger.error("[runFailed] Failed to complete in-progress event for unknown reason", {
-                runId: run.id,
-                spanId: run.spanId,
-                eventId: event.id,
-              });
-              return;
-            }
-          } catch (error) {
-            logger.error("[runFailed] Failed to complete in-progress event", {
-              error: error instanceof Error ? error.message : error,
-              runId: run.id,
-              spanId: run.spanId,
-              eventId: event.id,
-            });
-          }
-        })
-      );
-    } catch (error) {
-      logger.error("[runFailed] Failed to complete event", {
-        error: error instanceof Error ? error.message : error,
+    if (completeFailedRunEventError) {
+      logger.error("[runFailed] Failed to complete failed run event", {
+        error: completeFailedRunEventError,
         runId: run.id,
-        spanId: run.spanId,
       });
     }
   });
 
   engine.eventBus.on("runAttemptFailed", async ({ time, run }) => {
-    try {
-      const sanitizedError = sanitizeError(run.error);
-      const exception = createExceptionPropertiesFromError(sanitizedError);
-      const eventStore = getTaskEventStoreTableForRun(run);
+    const sanitizedError = sanitizeError(run.error);
+    const exception = createExceptionPropertiesFromError(sanitizedError);
 
-      const inProgressEvents = await eventRepository.queryIncompleteEvents(
-        eventStore,
-        {
-          runId: RunId.toFriendlyId(run.id),
-          spanId: {
-            not: run.spanId,
-          },
+    const [taskRunError, taskRun] = await tryCatch(
+      $replica.taskRun.findFirstOrThrow({
+        where: {
+          id: run.id,
         },
-        run.createdAt,
-        run.completedAt ?? undefined
-      );
+        select: {
+          id: true,
+          friendlyId: true,
+          traceId: true,
+          spanId: true,
+          parentSpanId: true,
+          createdAt: true,
+          completedAt: true,
+          taskIdentifier: true,
+          projectId: true,
+          runtimeEnvironmentId: true,
+          environmentType: true,
+          isTest: true,
+          organizationId: true,
+          taskEventStore: true,
+        },
+      })
+    );
 
-      await Promise.all(
-        inProgressEvents.map((event) => {
-          return eventRepository.crashEvent({
-            event: event,
-            crashedAt: time,
-            exception,
-          });
-        })
-      );
-    } catch (error) {
-      logger.error("[runAttemptFailed] Failed to complete event", {
-        error: error instanceof Error ? error.message : error,
+    if (taskRunError) {
+      logger.error("[runAttemptFailed] Failed to find task run", {
+        error: taskRunError,
         runId: run.id,
-        spanId: run.spanId,
       });
+      return;
     }
-  });
 
-  engine.eventBus.on("cachedRunCompleted", async ({ time, span, blockedRunId, hasError }) => {
-    try {
-      const blockedRun = await $replica.taskRun.findFirst({
-        select: {
-          taskEventStore: true,
-        },
-        where: {
-          id: blockedRunId,
-        },
+    const eventRepository = resolveEventRepositoryForStore(taskRun.taskEventStore);
+
+    const [createAttemptFailedRunEventError] = await tryCatch(
+      eventRepository.createAttemptFailedRunEvent({
+        run: taskRun,
+        endTime: time,
+        attemptNumber: run.attemptNumber,
+        exception,
+      })
+    );
+
+    if (createAttemptFailedRunEventError) {
+      logger.error("[runAttemptFailed] Failed to create attempt failed run event", {
+        error: createAttemptFailedRunEventError,
+        runId: run.id,
       });
+    }
+  });
 
-      if (!blockedRun) {
-        logger.error("[cachedRunCompleted] Blocked run not found", {
-          blockedRunId,
+  engine.eventBus.on(
+    "cachedRunCompleted",
+    async ({ time, span, blockedRunId, hasError, cachedRunId }) => {
+      const [parentSpanId, spanId] = span.id.split(":");
+
+      if (!spanId || !parentSpanId) {
+        logger.debug("[cachedRunCompleted] Invalid span id", {
+          spanId,
+          parentSpanId,
         });
         return;
       }
 
-      const eventStore = getTaskEventStoreTableForRun(blockedRun);
+      const [cachedRunError, cachedRun] = await tryCatch(
+        $replica.taskRun.findFirstOrThrow({
+          where: {
+            id: cachedRunId,
+          },
+          select: {
+            id: true,
+            friendlyId: true,
+            traceId: true,
+            spanId: true,
+            parentSpanId: true,
+            createdAt: true,
+            completedAt: true,
+            taskIdentifier: true,
+            projectId: true,
+            runtimeEnvironmentId: true,
+            environmentType: true,
+            isTest: true,
+            organizationId: true,
+          },
+        })
+      );
 
-      const completedEvent = await eventRepository.completeEvent(
-        eventStore,
-        span.id,
-        span.createdAt,
-        time,
-        {
-          endTime: time,
-          attributes: {
-            isError: hasError,
+      if (cachedRunError) {
+        logger.error("[cachedRunCompleted] Failed to find cached run", {
+          error: cachedRunError,
+          cachedRunId,
+        });
+        return;
+      }
+
+      const [blockedRunError, blockedRun] = await tryCatch(
+        $replica.taskRun.findFirst({
+          where: {
+            id: blockedRunId,
           },
-        }
+          select: {
+            id: true,
+            friendlyId: true,
+            traceId: true,
+            spanId: true,
+            parentSpanId: true,
+            createdAt: true,
+            completedAt: true,
+            taskIdentifier: true,
+            projectId: true,
+            runtimeEnvironmentId: true,
+            environmentType: true,
+            isTest: true,
+            organizationId: true,
+            taskEventStore: true,
+          },
+        })
       );
 
-      if (!completedEvent) {
-        logger.error("[cachedRunCompleted] Failed to complete event for unknown reason", {
-          span,
+      if (blockedRunError) {
+        logger.error("[cachedRunCompleted] Failed to find blocked run", {
+          error: blockedRunError,
+          blockedRunId,
+        });
+      }
+
+      if (!blockedRun) {
+        logger.error("[cachedRunCompleted] Blocked run not found", {
+          blockedRunId,
         });
         return;
       }
-    } catch (error) {
-      logger.error("[cachedRunCompleted] Failed to complete event for unknown reason", {
-        error: error instanceof Error ? error.message : error,
-        span,
-      });
-    }
-  });
 
-  engine.eventBus.on("runExpired", async ({ time, run }) => {
-    try {
-      const eventStore = getTaskEventStoreTableForRun(run);
+      const eventRepository = resolveEventRepositoryForStore(blockedRun.taskEventStore);
 
-      const completedEvent = await eventRepository.completeEvent(
-        eventStore,
-        run.spanId,
-        run.createdAt,
-        run.completedAt ?? undefined,
-        {
+      const [completeCachedRunEventError] = await tryCatch(
+        eventRepository.completeCachedRunEvent({
+          run: cachedRun,
+          blockedRun,
+          spanId,
+          parentSpanId,
+          spanCreatedAt: span.createdAt,
+          isError: hasError,
           endTime: time,
-          attributes: {
-            isError: true,
-          },
-          events: [
-            {
-              name: "exception",
-              time,
-              properties: {
-                exception: {
-                  message: `Run expired because the TTL (${run.ttl}) was reached`,
-                },
-              },
-            },
-          ],
-        }
+        })
       );
 
-      if (!completedEvent) {
-        logger.error("[runFailed] Failed to complete event for unknown reason", {
-          runId: run.id,
-          spanId: run.spanId,
+      if (completeCachedRunEventError) {
+        logger.error("[cachedRunCompleted] Failed to complete cached run event", {
+          error: completeCachedRunEventError,
+          cachedRunId,
         });
-        return;
       }
-    } catch (error) {
-      logger.error("[runExpired] Failed to complete event", {
-        error: error instanceof Error ? error.message : error,
+    }
+  );
+
+  engine.eventBus.on("runExpired", async ({ time, run }) => {
+    if (!run.ttl) {
+      return;
+    }
+
+    const [taskRunError, taskRun] = await tryCatch(
+      $replica.taskRun.findFirstOrThrow({
+        where: {
+          id: run.id,
+        },
+        select: {
+          id: true,
+          friendlyId: true,
+          traceId: true,
+          spanId: true,
+          parentSpanId: true,
+          createdAt: true,
+          completedAt: true,
+          taskIdentifier: true,
+          projectId: true,
+          runtimeEnvironmentId: true,
+          environmentType: true,
+          isTest: true,
+          organizationId: true,
+          taskEventStore: true,
+        },
+      })
+    );
+
+    if (taskRunError) {
+      logger.error("[runExpired] Failed to find task run", {
+        error: taskRunError,
+        runId: run.id,
+      });
+      return;
+    }
+
+    const eventRepository = resolveEventRepositoryForStore(taskRun.taskEventStore);
+
+    const [completeExpiredRunEventError] = await tryCatch(
+      eventRepository.completeExpiredRunEvent({
+        run: taskRun,
+        endTime: time,
+        ttl: run.ttl,
+      })
+    );
+
+    if (completeExpiredRunEventError) {
+      logger.error("[runExpired] Failed to complete expired run event", {
+        error: completeExpiredRunEventError,
         runId: run.id,
-        spanId: run.spanId,
       });
     }
   });
 
   engine.eventBus.on("runCancelled", async ({ time, run }) => {
-    try {
-      const eventStore = getTaskEventStoreTableForRun(run);
-
-      const inProgressEvents = await eventRepository.queryIncompleteEvents(
-        eventStore,
-        {
-          runId: run.friendlyId,
+    const [taskRunError, taskRun] = await tryCatch(
+      $replica.taskRun.findFirstOrThrow({
+        where: {
+          id: run.id,
         },
-        run.createdAt,
-        run.completedAt ?? undefined
-      );
+        select: {
+          id: true,
+          friendlyId: true,
+          traceId: true,
+          spanId: true,
+          parentSpanId: true,
+          createdAt: true,
+          completedAt: true,
+          taskIdentifier: true,
+          projectId: true,
+          runtimeEnvironmentId: true,
+          environmentType: true,
+          isTest: true,
+          organizationId: true,
+          taskEventStore: true,
+        },
+      })
+    );
+
+    if (taskRunError) {
+      logger.error("[runCancelled] Task run not found", {
+        error: taskRunError,
+        runId: run.id,
+      });
+      return;
+    }
 
-      const error = createJsonErrorObject(run.error);
+    const eventRepository = resolveEventRepositoryForStore(taskRun.taskEventStore);
 
-      await eventRepository.cancelEvents(inProgressEvents, time, error.message);
-    } catch (error) {
-      logger.error("[runCancelled] Failed to cancel event", {
-        error: error instanceof Error ? error.message : error,
+    const error = createJsonErrorObject(run.error);
+
+    const [cancelRunEventError] = await tryCatch(
+      eventRepository.cancelRunEvent({
+        reason: error.message,
+        run: taskRun,
+        cancelledAt: time,
+      })
+    );
+
+    if (cancelRunEventError) {
+      logger.error("[runCancelled] Failed to cancel run event", {
+        error: cancelRunEventError,
         runId: run.id,
-        spanId: run.spanId,
       });
     }
   });
 
   engine.eventBus.on("runRetryScheduled", async ({ time, run, environment, retryAt }) => {
     try {
-      let retryMessage = `Retry #${run.attemptNumber} delay`;
+      if (retryAt && time && time >= retryAt) {
+        return;
+      }
+
+      let retryMessage = `Retry ${
+        typeof run.attemptNumber === "number" ? `#${run.attemptNumber - 1}` : ""
+      } delay`;
 
       if (run.nextMachineAfterOOM) {
         retryMessage += ` after OOM`;
       }
 
+      const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
       await eventRepository.recordEvent(retryMessage, {
         startTime: BigInt(time.getTime() * 1000000),
         taskSlug: run.taskIdentifier,
@@ -342,7 +436,6 @@ export function registerRunEngineEventBusHandlers() {
           style: {
             icon: "schedule-attempt",
           },
-          queueName: run.queue,
         },
         context: run.traceContext as Record<string, string | undefined>,
         endTime: retryAt,
@@ -381,17 +474,31 @@ export function registerRunEngineEventBusHandlers() {
     try {
       await updateMetadataService.call(run.id, run.metadata, env);
     } catch (e) {
-      logger.error("[runMetadataUpdated] Failed to update metadata", {
-        taskRun: run.id,
-        error:
-          e instanceof Error
-            ? {
-                name: e.name,
-                message: e.message,
-                stack: e.stack,
-              }
-            : e,
-      });
+      if (e instanceof MetadataTooLargeError) {
+        logger.warn("[runMetadataUpdated] Failed to update metadata, too large", {
+          taskRun: run.id,
+          error:
+            e instanceof Error
+              ? {
+                  name: e.name,
+                  message: e.message,
+                  stack: e.stack,
+                }
+              : e,
+        });
+      } else {
+        logger.error("[runMetadataUpdated] Failed to update metadata", {
+          taskRun: run.id,
+          error:
+            e instanceof Error
+              ? {
+                  name: e.name,
+                  message: e.message,
+                  stack: e.stack,
+                }
+              : e,
+        });
+      }
     }
   });
 
@@ -525,3 +632,206 @@ export function registerRunEngineEventBusHandlers() {
     }
   });
 }
+
+/**
+ * Set up the BatchQueue processing callbacks.
+ * These handle creating runs from batch items and completing batches.
+ *
+ * Payload handling:
+ * - If payloadType is "application/store", the payload is an R2 path (already offloaded)
+ * - DefaultPayloadProcessor in TriggerTaskService will pass it through without re-offloading
+ * - The run engine will download from R2 when the task executes
+ */
+export function setupBatchQueueCallbacks() {
+  // Item processing callback - creates a run for each batch item
+  engine.setBatchProcessItemCallback(async ({ batchId, friendlyId, itemIndex, item, meta }) => {
+    return tracer.startActiveSpan(
+      "batch.processItem",
+      {
+        kind: SpanKind.INTERNAL,
+        attributes: {
+          "batch.id": friendlyId,
+          "batch.item_index": itemIndex,
+          "batch.task": item.task,
+          "batch.environment_id": meta.environmentId,
+          "batch.parent_run_id": meta.parentRunId ?? "",
+        },
+      },
+      async (span) => {
+        try {
+          const environment = await findEnvironmentById(meta.environmentId);
+
+          if (!environment) {
+            span.setAttribute("batch.result.error", "Environment not found");
+            span.end();
+            return {
+              success: false as const,
+              error: "Environment not found",
+              errorCode: "ENVIRONMENT_NOT_FOUND",
+            };
+          }
+
+          const triggerTaskService = new TriggerTaskService();
+
+          // Normalize payload - for application/store (R2 paths), this passes through as-is
+          const payload = normalizePayload(item.payload, item.payloadType);
+
+          const result = await triggerTaskService.call(
+            item.task,
+            environment,
+            {
+              payload,
+              options: {
+                ...(item.options as Record<string, unknown>),
+                payloadType: item.payloadType,
+                parentRunId: meta.parentRunId,
+                resumeParentOnCompletion: meta.resumeParentOnCompletion,
+                parentBatch: batchId,
+              },
+            },
+            {
+              triggerVersion: meta.triggerVersion,
+              traceContext: meta.traceContext as Record<string, unknown> | undefined,
+              spanParentAsLink: meta.spanParentAsLink,
+              batchId,
+              batchIndex: itemIndex,
+              skipChecks: true, // Already validated at batch level
+              realtimeStreamsVersion: meta.realtimeStreamsVersion,
+              planType: meta.planType,
+            },
+            "V2"
+          );
+
+          if (result) {
+            span.setAttribute("batch.result.run_id", result.run.friendlyId);
+            span.end();
+            return { success: true as const, runId: result.run.friendlyId };
+          } else {
+            span.setAttribute("batch.result.error", "TriggerTaskService returned undefined");
+            span.end();
+            return {
+              success: false as const,
+              error: "TriggerTaskService returned undefined",
+              errorCode: "TRIGGER_FAILED",
+            };
+          }
+        } catch (error) {
+          span.setAttribute(
+            "batch.result.error",
+            error instanceof Error ? error.message : String(error)
+          );
+          span.recordException(error instanceof Error ? error : new Error(String(error)));
+          span.end();
+          return {
+            success: false as const,
+            error: error instanceof Error ? error.message : String(error),
+            errorCode: "TRIGGER_ERROR",
+          };
+        }
+      }
+    );
+  });
+
+  // Batch completion callback - updates Postgres with results
+  engine.setBatchCompletionCallback(async (result: CompleteBatchResult) => {
+    const { batchId, runIds, successfulRunCount, failedRunCount, failures } = result;
+
+    // Determine final status
+    let status: BatchTaskRunStatus;
+    if (failedRunCount > 0 && successfulRunCount === 0) {
+      status = "ABORTED";
+    } else if (failedRunCount > 0) {
+      status = "PARTIAL_FAILED";
+    } else {
+      status = "PENDING"; // All runs created, waiting for completion
+    }
+
+    try {
+      // Use a transaction to ensure atomicity of batch update and error record creation
+      // skipDuplicates handles idempotency when callback is retried (relies on unique constraint)
+      await prisma.$transaction(async (tx) => {
+        // Update BatchTaskRun
+        await tx.batchTaskRun.update({
+          where: { id: batchId },
+          data: {
+            status,
+            runIds,
+            successfulRunCount,
+            failedRunCount,
+            completedAt: status === "ABORTED" ? new Date() : undefined,
+            processingCompletedAt: new Date(),
+          },
+        });
+
+        // Create error records if there were failures
+        if (failures.length > 0) {
+          await tx.batchTaskRunError.createMany({
+            data: failures.map((failure) => ({
+              batchTaskRunId: batchId,
+              index: failure.index,
+              taskIdentifier: failure.taskIdentifier,
+              payload: failure.payload,
+              options: failure.options as Prisma.InputJsonValue | undefined,
+              error: failure.error,
+              errorCode: failure.errorCode,
+            })),
+            skipDuplicates: true,
+          });
+        }
+      });
+
+      // Try to complete the batch (handles waitpoint completion if all runs are done)
+      if (status !== "ABORTED") {
+        await engine.tryCompleteBatch({ batchId });
+      }
+
+      logger.info("Batch completion handled", {
+        batchId,
+        status,
+        successfulRunCount,
+        failedRunCount,
+      });
+    } catch (error) {
+      logger.error("Failed to handle batch completion", {
+        batchId,
+        error: error instanceof Error ? error.message : String(error),
+      });
+      // Re-throw to preserve Redis data for retry (BatchQueue expects errors to propagate)
+      throw error;
+    }
+  });
+
+  logger.info("BatchQueue callbacks configured");
+}
+
+/**
+ * Normalize the payload from BatchQueue.
+ *
+ * Handles different payload types:
+ * - "application/store": Already offloaded to R2, payload is the path - pass through as-is
+ * - "application/json": May be a pre-serialized JSON string - parse to avoid double-stringification
+ * - Other types: Pass through as-is
+ *
+ * @param payload - The raw payload from the batch item
+ * @param payloadType - The payload type (e.g., "application/json", "application/store")
+ */
+function normalizePayload(payload: unknown, payloadType?: string): unknown {
+  // Only process "application/json" payloads
+  // For all other types (including undefined), return as-is
+  if (payloadType !== "application/json") {
+    return payload;
+  }
+
+  // For JSON payloads, if payload is a string, try to parse it
+  // This handles pre-serialized JSON from the SDK
+  if (typeof payload === "string") {
+    try {
+      return JSON.parse(payload);
+    } catch {
+      // If it's not valid JSON, return as-is
+      return payload;
+    }
+  }
+
+  return payload;
+}
diff --git a/apps/webapp/app/v3/services/adminWorker.server.ts b/apps/webapp/app/v3/services/adminWorker.server.ts
new file mode 100644
index 00000000000..97c94b954f0
--- /dev/null
+++ b/apps/webapp/app/v3/services/adminWorker.server.ts
@@ -0,0 +1,102 @@
+import { Logger } from "@trigger.dev/core/logger";
+import { Worker as RedisWorker } from "@trigger.dev/redis-worker";
+import { z } from "zod";
+import { env } from "~/env.server";
+import { logger } from "~/services/logger.server";
+import { runsReplicationInstance } from "~/services/runsReplicationInstance.server";
+import { singleton } from "~/utils/singleton";
+import { tracer } from "../tracer.server";
+import { $replica } from "~/db.server";
+import { RunsBackfillerService } from "../../services/runsBackfiller.server";
+
+function initializeWorker() {
+  const redisOptions = {
+    keyPrefix: "admin:worker:",
+    host: env.ADMIN_WORKER_REDIS_HOST,
+    port: env.ADMIN_WORKER_REDIS_PORT,
+    username: env.ADMIN_WORKER_REDIS_USERNAME,
+    password: env.ADMIN_WORKER_REDIS_PASSWORD,
+    enableAutoPipelining: true,
+    ...(env.ADMIN_WORKER_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
+  };
+
+  logger.debug(`👨‍🏭 Initializing admin worker at host ${env.ADMIN_WORKER_REDIS_HOST}`);
+
+  const worker = new RedisWorker({
+    name: "admin-worker",
+    redisOptions,
+    catalog: {
+      "admin.backfillRunsToReplication": {
+        schema: z.object({
+          from: z.coerce.date(),
+          to: z.coerce.date(),
+          cursor: z.string().optional(),
+          batchSize: z.coerce.number().int().default(500),
+          delayIntervalMs: z.coerce.number().int().default(1000),
+        }),
+        visibilityTimeoutMs: 60_000 * 15, // 15 minutes
+        retry: {
+          maxAttempts: 5,
+        },
+      },
+    },
+    concurrency: {
+      workers: env.ADMIN_WORKER_CONCURRENCY_WORKERS,
+      tasksPerWorker: env.ADMIN_WORKER_CONCURRENCY_TASKS_PER_WORKER,
+      limit: env.ADMIN_WORKER_CONCURRENCY_LIMIT,
+    },
+    pollIntervalMs: env.ADMIN_WORKER_POLL_INTERVAL,
+    immediatePollIntervalMs: env.ADMIN_WORKER_IMMEDIATE_POLL_INTERVAL,
+    shutdownTimeoutMs: env.ADMIN_WORKER_SHUTDOWN_TIMEOUT_MS,
+    logger: new Logger("AdminWorker", env.ADMIN_WORKER_LOG_LEVEL),
+    jobs: {
+      "admin.backfillRunsToReplication": async ({ payload, id }) => {
+        if (!runsReplicationInstance) {
+          logger.error("Runs replication instance not found");
+          return;
+        }
+
+        const service = new RunsBackfillerService({
+          prisma: $replica,
+          runsReplicationInstance: runsReplicationInstance,
+          tracer: tracer,
+        });
+
+        const cursor = await service.call({
+          from: payload.from,
+          to: payload.to,
+          cursor: payload.cursor,
+          batchSize: payload.batchSize,
+        });
+
+        if (cursor) {
+          await worker.enqueue({
+            job: "admin.backfillRunsToReplication",
+            payload: {
+              from: payload.from,
+              to: payload.to,
+              cursor,
+              batchSize: payload.batchSize,
+              delayIntervalMs: payload.delayIntervalMs,
+            },
+            id,
+            availableAt: new Date(Date.now() + payload.delayIntervalMs),
+            cancellationKey: id,
+          });
+        }
+      },
+    },
+  });
+
+  if (env.ADMIN_WORKER_ENABLED === "true") {
+    logger.debug(
+      `👨‍🏭 Starting admin worker at host ${env.ADMIN_WORKER_REDIS_HOST}, pollInterval = ${env.ADMIN_WORKER_POLL_INTERVAL}, immediatePollInterval = ${env.ADMIN_WORKER_IMMEDIATE_POLL_INTERVAL}, workers = ${env.ADMIN_WORKER_CONCURRENCY_WORKERS}, tasksPerWorker = ${env.ADMIN_WORKER_CONCURRENCY_TASKS_PER_WORKER}, concurrencyLimit = ${env.ADMIN_WORKER_CONCURRENCY_LIMIT}`
+    );
+
+    worker.start();
+  }
+
+  return worker;
+}
+
+export const adminWorker = singleton("adminWorker", initializeWorker);
diff --git a/apps/webapp/app/v3/services/aiQueryService.server.ts b/apps/webapp/app/v3/services/aiQueryService.server.ts
new file mode 100644
index 00000000000..3e40fc810de
--- /dev/null
+++ b/apps/webapp/app/v3/services/aiQueryService.server.ts
@@ -0,0 +1,655 @@
+import { openai } from "@ai-sdk/openai";
+import {
+  parseTSQLSelect,
+  validateQuery,
+  type TableSchema,
+  type ValidationIssue,
+} from "@internal/tsql";
+import { streamText, type LanguageModelV1, tool } from "ai";
+import { z } from "zod";
+import type { AITimeFilter } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/types";
+
+// Re-export for backwards compatibility
+export type { AITimeFilter };
+
+/**
+ * Stream event types for AI query generation
+ */
+export type AIQueryStreamEvent =
+  | { type: "thinking"; content: string }
+  | { type: "tool_call"; tool: string; args: unknown }
+  | { type: "tool_result"; tool: string; result: unknown }
+  | { type: "time_filter"; filter: AITimeFilter }
+  | { type: "result"; success: true; query: string; timeFilter?: AITimeFilter }
+  | { type: "result"; success: false; error: string };
+
+/**
+ * Result type for non-streaming call
+ */
+export type AIQueryResult =
+  | { success: true; query: string; timeFilter?: AITimeFilter }
+  | { success: false; error: string };
+
+/**
+ * Options for query generation
+ */
+export interface AIQueryOptions {
+  mode?: "new" | "edit";
+  currentQuery?: string;
+}
+
+/**
+ * Validation result from the validateTSQLQuery tool
+ */
+interface QueryValidationResult {
+  valid: boolean;
+  syntaxError?: string;
+  issues: ValidationIssue[];
+}
+
+/**
+ * Service for generating TSQL queries from natural language using AI
+ */
+export class AIQueryService {
+  private pendingTimeFilter: AITimeFilter | undefined;
+
+  constructor(
+    private readonly tableSchema: TableSchema[],
+    private readonly model: LanguageModelV1 = openai("gpt-4.1-mini")
+  ) {}
+
+  /**
+   * Build the setTimeFilter tool definition
+   * Used by both streamQuery() and call() to keep behavior consistent
+   */
+  private buildSetTimeFilterTool() {
+    return tool({
+      description:
+        "Set the time filter for the query page UI instead of adding time conditions to the query. ALWAYS use this tool when the user wants to filter by time (e.g., 'last 7 days', 'past hour', 'yesterday'). The UI will apply this filter automatically using the table's time column (triggered_at for runs, bucket_start for metrics). Do NOT add triggered_at or bucket_start to the WHERE clause for time filtering - use this tool instead.",
+      parameters: z.object({
+        period: z
+          .string()
+          .optional()
+          .describe(
+            "Relative time period like '1m', '5m', '30m', '1h', '6h', '12h', '1d', '3d', '7d', '14d', '30d', '90d'. Use this for 'last X days/hours/minutes' requests."
+          ),
+        from: z
+          .string()
+          .optional()
+          .describe(
+            "ISO 8601 timestamp for the start of an absolute date range. Use with 'to' for specific date ranges."
+          ),
+        to: z
+          .string()
+          .optional()
+          .describe(
+            "ISO 8601 timestamp for the end of an absolute date range. Use with 'from' for specific date ranges."
+          ),
+      }),
+      execute: async ({ period, from, to }) => {
+        // Store the time filter so we can include it in the result
+        this.pendingTimeFilter = { period, from, to };
+        return {
+          success: true,
+          message: period
+            ? `Time filter set to: last ${period}`
+            : `Time filter set to: ${from ?? "start"} - ${to ?? "now"}`,
+        };
+      },
+    });
+  }
+
+  /**
+   * Generate a TSQL query from natural language, streaming the result
+   */
+  streamQuery(prompt: string, options: AIQueryOptions = {}) {
+    const { mode = "new", currentQuery } = options;
+    // Reset pending time filter for new request
+    this.pendingTimeFilter = undefined;
+
+    const schemaDescription = this.buildSchemaDescription();
+    const systemPrompt =
+      mode === "edit" && currentQuery
+        ? this.buildEditSystemPrompt(schemaDescription)
+        : this.buildSystemPrompt(schemaDescription);
+
+    // Build the user prompt based on mode
+    const userPrompt =
+      mode === "edit" && currentQuery ? this.buildEditUserPrompt(prompt, currentQuery) : prompt;
+
+    return streamText({
+      model: this.model,
+      system: systemPrompt,
+      prompt: userPrompt,
+      tools: {
+        validateTSQLQuery: tool({
+          description:
+            "Validate a TSQL query for syntax errors and schema compliance. Always use this tool to verify your query before returning it to the user.",
+          parameters: z.object({
+            query: z.string().describe("The TSQL query to validate"),
+          }),
+          execute: async ({ query }) => {
+            return this.validateQuery(query);
+          },
+        }),
+        getTableSchema: tool({
+          description:
+            "Get detailed schema information about available tables and columns. Use this to understand what data is available and how to query it.",
+          parameters: z.object({
+            tableName: z
+              .string()
+              .optional()
+              .describe("Optional: specific table name to get details for"),
+          }),
+          execute: async ({ tableName }) => {
+            return this.getSchemaInfo(tableName);
+          },
+        }),
+        setTimeFilter: this.buildSetTimeFilterTool(),
+      },
+      maxSteps: 5,
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: {
+          feature: "ai-query-generator",
+          mode,
+        },
+      },
+    });
+  }
+
+  /**
+   * Get the pending time filter (set by the AI during query generation)
+   */
+  getPendingTimeFilter(): AITimeFilter | undefined {
+    return this.pendingTimeFilter;
+  }
+
+  /**
+   * Generate a TSQL query from natural language (non-streaming)
+   */
+  async call(prompt: string, options: AIQueryOptions = {}): Promise<AIQueryResult> {
+    const { mode = "new", currentQuery } = options;
+    // Reset pending time filter for new request
+    this.pendingTimeFilter = undefined;
+
+    const schemaDescription = this.buildSchemaDescription();
+    const systemPrompt =
+      mode === "edit" && currentQuery
+        ? this.buildEditSystemPrompt(schemaDescription)
+        : this.buildSystemPrompt(schemaDescription);
+
+    // Build the user prompt based on mode
+    const userPrompt =
+      mode === "edit" && currentQuery ? this.buildEditUserPrompt(prompt, currentQuery) : prompt;
+
+    const result = await streamText({
+      model: this.model,
+      system: systemPrompt,
+      prompt: userPrompt,
+      tools: {
+        validateTSQLQuery: tool({
+          description:
+            "Validate a TSQL query for syntax errors and schema compliance. Always use this tool to verify your query before returning it to the user.",
+          parameters: z.object({
+            query: z.string().describe("The TSQL query to validate"),
+          }),
+          execute: async ({ query }) => {
+            return this.validateQuery(query);
+          },
+        }),
+        getTableSchema: tool({
+          description:
+            "Get detailed schema information about available tables and columns. Use this to understand what data is available and how to query it.",
+          parameters: z.object({
+            tableName: z
+              .string()
+              .optional()
+              .describe("Optional: specific table name to get details for"),
+          }),
+          execute: async ({ tableName }) => {
+            return this.getSchemaInfo(tableName);
+          },
+        }),
+        setTimeFilter: this.buildSetTimeFilterTool(),
+      },
+      maxSteps: 5,
+      experimental_telemetry: {
+        isEnabled: true,
+        metadata: {
+          feature: "ai-query-generator",
+          mode,
+        },
+      },
+    });
+
+    // Wait for the full response
+    const text = await result.text;
+
+    // Try to extract a valid query from the response
+    const query = this.extractQueryFromResponse(text);
+
+    if (query) {
+      // Validate the extracted query one more time
+      const validation = this.validateQuery(query);
+      if (validation.valid) {
+        return { success: true, query, timeFilter: this.pendingTimeFilter };
+      } else {
+        const errorMessages = validation.issues.map((i) => i.message).join("; ");
+        return {
+          success: false,
+          error: validation.syntaxError || errorMessages || "Query validation failed",
+        };
+      }
+    }
+
+    // If no query was found, check if there's an error message
+    if (text.toLowerCase().includes("cannot") || text.toLowerCase().includes("unable")) {
+      return { success: false, error: text.slice(0, 200) };
+    }
+
+    return { success: false, error: "Could not generate a valid query" };
+  }
+
+  /**
+   * Validate a TSQL query using the parser and validator
+   */
+  private validateQuery(query: string): QueryValidationResult {
+    try {
+      // First, try to parse the query
+      const ast = parseTSQLSelect(query);
+
+      // Then validate against the schema
+      const validationResult = validateQuery(ast, this.tableSchema);
+
+      return {
+        valid: validationResult.valid,
+        issues: validationResult.issues,
+      };
+    } catch (error) {
+      // Syntax error during parsing
+      return {
+        valid: false,
+        syntaxError: error instanceof Error ? error.message : String(error),
+        issues: [],
+      };
+    }
+  }
+
+  /**
+   * Get schema information for the AI
+   */
+  private getSchemaInfo(tableName?: string): {
+    tables: Array<{
+      name: string;
+      description?: string;
+      columns: Array<{
+        name: string;
+        type: string;
+        description?: string;
+        allowedValues?: string[];
+        example?: string;
+      }>;
+    }>;
+  } {
+    const tables = tableName
+      ? this.tableSchema.filter((t) => t.name.toLowerCase() === tableName?.toLowerCase())
+      : this.tableSchema;
+
+    return {
+      tables: tables.map((table) => ({
+        name: table.name,
+        description: table.description,
+        columns: Object.values(table.columns).map((col) => ({
+          name: col.name,
+          type: col.type,
+          description: col.description,
+          allowedValues: col.valueMap ? Object.values(col.valueMap) : col.allowedValues,
+          example: col.example,
+        })),
+      })),
+    };
+  }
+
+  /**
+   * Build a description of the schema for the system prompt
+   */
+  private buildSchemaDescription(): string {
+    const parts: string[] = [];
+
+    for (const table of this.tableSchema) {
+      parts.push(`## Table: ${table.name}`);
+      if (table.description) {
+        parts.push(table.description);
+      }
+      parts.push("");
+
+      // Identify core columns
+      const coreColumns = Object.values(table.columns)
+        .filter((col) => col.coreColumn === true)
+        .map((col) => col.name);
+      if (coreColumns.length > 0) {
+        parts.push(`Core columns (use these as defaults): ${coreColumns.join(", ")}`);
+        parts.push("");
+      }
+
+      parts.push("Columns:");
+
+      for (const col of Object.values(table.columns)) {
+        let colDesc = `- ${col.name} (${col.type})`;
+        if (col.coreColumn) {
+          colDesc += " [CORE]";
+        }
+        if (col.description) {
+          colDesc += `: ${col.description}`;
+        }
+        parts.push(colDesc);
+
+        // Add allowed values for enum-like columns
+        const allowedValues = col.valueMap ? Object.values(col.valueMap) : col.allowedValues;
+        if (allowedValues && allowedValues.length > 0 && allowedValues.length <= 20) {
+          parts.push(`  Allowed values: ${allowedValues.join(", ")}`);
+        }
+
+        // Add example if available
+        if (col.example) {
+          parts.push(`  Example: ${col.example}`);
+        }
+      }
+      parts.push("");
+    }
+
+    return parts.join("\n");
+  }
+
+  /**
+   * Build the system prompt for the AI
+   */
+  private buildSystemPrompt(schemaDescription: string): string {
+    return `You are an expert SQL assistant that generates TSQL queries for a task analytics system. TSQL is a SQL dialect similar to ClickHouse SQL.
+
+## Your Task
+Convert natural language requests into valid TSQL SELECT queries. Always validate your queries using the validateTSQLQuery tool before returning them.
+
+## Available Schema
+${schemaDescription}
+
+## Choosing the Right Table
+
+- **runs** — Task run records (status, timing, cost, output, etc.). Use for questions about runs, tasks, failures, durations, costs, queues.
+- **metrics** — Host and runtime metrics collected during task execution (CPU, memory). Use for questions about resource usage, CPU utilization, memory consumption, or performance monitoring. Each row is a 10-second aggregation bucket tied to a specific run.
+
+When the user mentions "CPU", "memory", "utilization", "resource usage", or similar terms, query the \`metrics\` table. When they mention "runs", "tasks", "failures", "status", "duration", or "cost", query the \`runs\` table.
+
+## TSQL Syntax Guide
+
+TSQL supports standard SQL syntax with some ClickHouse-specific features:
+
+### Basic SELECT
+\`\`\`sql
+SELECT column1, column2, ...
+FROM table_name
+WHERE conditions
+ORDER BY column [ASC|DESC]
+LIMIT n
+\`\`\`
+
+### Filtering (WHERE clause)
+- Comparison: =, !=, <, >, <=, >=
+- Logical: AND, OR, NOT
+- Pattern matching: LIKE, ILIKE (case-insensitive), NOT LIKE
+- Range: BETWEEN value1 AND value2
+- Set membership: IN ('value1', 'value2'), NOT IN (...)
+- Null checks: IS NULL, IS NOT NULL
+- Array contains: has(array_column, 'value')
+
+### Aggregations
+- count() - count rows
+- countIf(condition) - count rows matching condition
+- sum(column), sumIf(column, condition)
+- avg(column), min(column), max(column)
+- uniq(column) - approximate unique count
+- quantile(p)(column) - percentile (p between 0 and 1)
+- groupArray(column) - collect values into array
+
+### Grouping
+\`\`\`sql
+SELECT column, count() as cnt
+FROM table
+GROUP BY column
+HAVING cnt > 10
+\`\`\`
+
+### Date/Time Functions
+- timeBucket() - automatically bucket by time. Uses the table's time column and picks the best interval based on the query's time range. Use in SELECT and reference as \`timeBucket\` in GROUP BY / ORDER BY.
+- now() - current timestamp
+- today() - current date
+- toDate(datetime) - extract date
+- toStartOfDay/Hour/Minute(datetime)
+- dateDiff('unit', start, end) - difference in units (second, minute, hour, day, week, month, year)
+- INTERVAL n unit - time interval (e.g., INTERVAL 7 DAY)
+
+### Time Bucketing
+When the user wants to see data "over time", "by hour", "by day", or any time-series aggregation, prefer \`timeBucket()\` over manual \`toStartOfHour\`/\`toStartOfDay\` calls. \`timeBucket()\` automatically picks the right interval for the current time range.
+
+\`\`\`sql
+-- Runs over time (bucket size auto-selected)
+SELECT timeBucket(), count() AS run_count
+FROM runs
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000
+\`\`\`
+
+Only use explicit \`toStartOfHour\`/\`toStartOfDay\` etc. if the user specifically requests a particular bucket size (e.g., "group by hour", "bucket by day").
+
+### Common Patterns
+
+#### Runs table
+- Status filter: WHERE status = 'Failed' or WHERE status IN ('Failed', 'Crashed')
+- Time filtering: Use the \`setTimeFilter\` tool (NOT triggered_at/bucket_start in WHERE clause)
+
+#### Metrics table
+- Filter by metric name: WHERE metric_name = 'process.cpu.utilization'
+- Filter by run: WHERE run_id = 'run_abc123'
+- Filter by task: WHERE task_identifier = 'my-task'
+- Available metric names: process.cpu.utilization, process.cpu.time, process.memory.usage, system.memory.usage, system.memory.utilization, system.network.io, system.network.dropped, system.network.errors, nodejs.event_loop.utilization, nodejs.event_loop.delay.p95, nodejs.event_loop.delay.max, nodejs.heap.used, nodejs.heap.total
+- Use \`metric_value\` — the metric's observed value
+- Use prettyFormat(expr, 'bytes') to tell the UI to format values as bytes (e.g., "1.50 GiB") — keeps values numeric for charts
+- Use prettyFormat(expr, 'percent') for percentage values
+- prettyFormat does NOT change the SQL — it only adds a display hint
+- Available format types: bytes, decimalBytes, percent, quantity, duration, durationSeconds, costInDollars
+- For memory metrics (including nodejs.heap.*), always use prettyFormat with 'bytes'
+- For CPU utilization, consider prettyFormat with 'percent'
+
+\`\`\`sql
+-- CPU utilization over time for a task
+SELECT timeBucket(), task_identifier, prettyFormat(avg(metric_value), 'percent') AS avg_cpu
+FROM metrics
+WHERE metric_name = 'process.cpu.utilization'
+GROUP BY timeBucket, task_identifier
+ORDER BY timeBucket
+LIMIT 1000
+\`\`\`
+
+\`\`\`sql
+-- Peak memory usage per run
+SELECT run_id, task_identifier, prettyFormat(max(metric_value), 'bytes') AS peak_memory
+FROM metrics
+WHERE metric_name = 'process.memory.usage'
+GROUP BY run_id, task_identifier
+ORDER BY peak_memory DESC
+LIMIT 100
+\`\`\`
+
+## Important Rules
+
+1. NEVER use SELECT * - ClickHouse is a columnar database where SELECT * has very poor performance
+2. Always select only the specific columns needed for the request
+3. When column selection is ambiguous, use the core columns marked [CORE] in the schema
+4. **TIME FILTERING**: When the user wants to filter by time (e.g., "last 7 days", "past hour", "yesterday"), ALWAYS use the \`setTimeFilter\` tool instead of adding time conditions to the WHERE clause. The UI has a time filter that will apply this automatically. This applies to both the \`runs\` table (triggered_at) and the \`metrics\` table (bucket_start).
+5. Do NOT add \`triggered_at\` or \`bucket_start\` to WHERE clauses for time filtering - use \`setTimeFilter\` tool instead. If the user doesn't specify a time period, do NOT add any time filter (the UI defaults to 7 days).
+6. **TIME BUCKETING**: When the user wants to see data over time or in time buckets, use \`timeBucket()\` in SELECT and reference it as \`timeBucket\` in GROUP BY / ORDER BY. Only use manual bucketing functions (toStartOfHour, toStartOfDay, etc.) when the user explicitly requests a specific bucket size.
+7. ALWAYS use the validateTSQLQuery tool to check your query before returning it
+8. If validation fails, fix the issues and try again (up to 3 attempts)
+9. Use column names exactly as defined in the schema (case-sensitive)
+10. For enum columns like status, use the allowed values shown in the schema
+11. Always include a LIMIT clause (default to 100 if not specified)
+12. Use meaningful column aliases with AS for aggregations
+13. Format queries with proper indentation for readability
+
+## Response Format
+
+After validating successfully, return ONLY the SQL query wrapped in a code block:
+
+\`\`\`sql
+SELECT ...
+FROM ...
+\`\`\`
+
+If you cannot generate a valid query, explain why briefly.`;
+  }
+
+  /**
+   * Build the system prompt for edit mode
+   */
+  private buildEditSystemPrompt(schemaDescription: string): string {
+    return `You are an expert SQL assistant that modifies existing TSQL queries for a task analytics system. TSQL is a SQL dialect similar to ClickHouse SQL.
+
+## Your Task
+Modify the provided TSQL query according to the user's instructions. Make only the changes requested - preserve the existing query structure where possible.
+
+## Available Schema
+${schemaDescription}
+
+## Choosing the Right Table
+
+- **runs** — Task run records (status, timing, cost, output, etc.). Use for questions about runs, tasks, failures, durations, costs, queues.
+- **metrics** — Host and runtime metrics collected during task execution (CPU, memory). Use for questions about resource usage, CPU utilization, memory consumption, or performance monitoring. Each row is a 10-second aggregation bucket tied to a specific run.
+
+## TSQL Syntax Guide
+
+TSQL supports standard SQL syntax with some ClickHouse-specific features:
+
+### Basic SELECT
+\`\`\`sql
+SELECT column1, column2, ...
+FROM table_name
+WHERE conditions
+ORDER BY column [ASC|DESC]
+LIMIT n
+\`\`\`
+
+### Filtering (WHERE clause)
+- Comparison: =, !=, <, >, <=, >=
+- Logical: AND, OR, NOT
+- Pattern matching: LIKE, ILIKE (case-insensitive), NOT LIKE
+- Range: BETWEEN value1 AND value2
+- Set membership: IN ('value1', 'value2'), NOT IN (...)
+- Null checks: IS NULL, IS NOT NULL
+- Array contains: has(array_column, 'value')
+
+### Aggregations
+- count() - count rows
+- countIf(condition) - count rows matching condition
+- sum(column), sumIf(column, condition)
+- avg(column), min(column), max(column)
+- uniq(column) - approximate unique count
+- quantile(p)(column) - percentile (p between 0 and 1)
+- groupArray(column) - collect values into array
+
+### Grouping
+\`\`\`sql
+SELECT column, count() as cnt
+FROM table
+GROUP BY column
+HAVING cnt > 10
+\`\`\`
+
+### Date/Time Functions
+- timeBucket() - automatically bucket by time. Uses the table's time column and picks the best interval based on the query's time range. Use in SELECT and reference as \`timeBucket\` in GROUP BY / ORDER BY.
+- now() - current timestamp
+- today() - current date
+- toDate(datetime) - extract date
+- toStartOfDay/Hour/Minute(datetime)
+- dateDiff('unit', start, end) - difference in units (second, minute, hour, day, week, month, year)
+- INTERVAL n unit - time interval (e.g., INTERVAL 7 DAY)
+
+### Time Bucketing
+When the user wants to see data "over time", "by hour", "by day", or any time-series aggregation, prefer \`timeBucket()\` over manual \`toStartOfHour\`/\`toStartOfDay\` calls unless the user specifically requests a particular bucket size.
+
+\`\`\`sql
+SELECT timeBucket(), count() AS run_count
+FROM runs
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000
+\`\`\`
+
+### Common Metrics Patterns
+- Filter by metric: WHERE metric_name = 'process.cpu.utilization'
+- Available metric names: process.cpu.utilization, process.cpu.time, process.memory.usage, system.memory.usage, system.memory.utilization, system.network.io, system.network.dropped, system.network.errors, nodejs.event_loop.utilization, nodejs.event_loop.delay.p50, nodejs.event_loop.delay.p99, nodejs.event_loop.delay.max, nodejs.heap.used, nodejs.heap.total
+- Use \`metric_value\` — the metric's observed value
+- Use prettyFormat(expr, 'bytes') for memory metrics (including nodejs.heap.*), prettyFormat(expr, 'percent') for CPU utilization
+- prettyFormat does NOT change the SQL — it only adds a display hint for the UI
+
+## Important Rules
+
+1. NEVER use SELECT * - ClickHouse is a columnar database where SELECT * has very poor performance
+2. If the existing query uses SELECT *, replace it with specific columns (use core columns marked [CORE] as defaults)
+3. **TIME FILTERING**: When the user wants to change time filtering (e.g., "change to last 30 days"), use the \`setTimeFilter\` tool instead of modifying time column conditions. If the existing query has \`triggered_at\` or \`bucket_start\` in WHERE for time filtering, consider removing it and using \`setTimeFilter\` instead.
+4. **TIME BUCKETING**: When adding time-series grouping, use \`timeBucket()\` in SELECT and reference it as \`timeBucket\` in GROUP BY / ORDER BY. Only use manual bucketing functions (toStartOfHour, toStartOfDay, etc.) when the user explicitly requests a specific bucket size.
+5. ALWAYS use the validateTSQLQuery tool to check your modified query before returning it
+6. If validation fails, fix the issues and try again (up to 3 attempts)
+7. Use column names exactly as defined in the schema (case-sensitive)
+8. For enum columns like status, use the allowed values shown in the schema
+9. Always include a LIMIT clause (default to 100 if not specified)
+10. Preserve the user's existing query structure and style where possible
+11. Only make the changes specifically requested by the user
+
+## Response Format
+
+After validating successfully, return ONLY the modified SQL query wrapped in a code block:
+
+\`\`\`sql
+SELECT ...
+FROM ...
+\`\`\`
+
+If you cannot make the requested modification, explain why briefly.`;
+  }
+
+  /**
+   * Build the user prompt for edit mode
+   */
+  private buildEditUserPrompt(userRequest: string, currentQuery: string): string {
+    return `Here is the current TSQL query:
+
+\`\`\`sql
+${currentQuery}
+\`\`\`
+
+Please modify this query according to the following instructions:
+
+${userRequest}`;
+  }
+
+  /**
+   * Extract a SQL query from the AI response text
+   */
+  private extractQueryFromResponse(text: string): string | null {
+    // Try to extract from code block first
+    const codeBlockMatch = text.match(/```(?:sql)?\s*([\s\S]*?)```/i);
+    if (codeBlockMatch) {
+      return codeBlockMatch[1].trim();
+    }
+
+    // Try to find a SELECT statement
+    const selectMatch = text.match(/SELECT[\s\S]+?(?:LIMIT\s+\d+|;|$)/i);
+    if (selectMatch) {
+      return selectMatch[0].trim().replace(/;$/, "");
+    }
+
+    return null;
+  }
+}
diff --git a/apps/webapp/app/v3/services/aiQueryTitleService.server.ts b/apps/webapp/app/v3/services/aiQueryTitleService.server.ts
new file mode 100644
index 00000000000..983f732453a
--- /dev/null
+++ b/apps/webapp/app/v3/services/aiQueryTitleService.server.ts
@@ -0,0 +1,71 @@
+import { openai } from "@ai-sdk/openai";
+import { generateText, type LanguageModelV1 } from "ai";
+import { env } from "~/env.server";
+
+/**
+ * Result type for title generation
+ */
+export type AIQueryTitleResult =
+  | { success: true; title: string }
+  | { success: false; error: string };
+
+/**
+ * Service for generating concise titles for SQL queries using AI
+ */
+export class AIQueryTitleService {
+  constructor(private readonly model: LanguageModelV1 = openai("gpt-4o-mini")) {}
+
+  /**
+   * Generate a concise title for a SQL query
+   */
+  async generateTitle(query: string): Promise<AIQueryTitleResult> {
+    if (!env.OPENAI_API_KEY) {
+      return { success: false, error: "OpenAI API key is not configured" };
+    }
+
+    try {
+      const result = await generateText({
+        model: this.model,
+        system: `You are a helpful assistant that generates concise titles for SQL queries.
+
+Your task is to create a short, descriptive title (5-10 words) that summarizes what the query does.
+
+Guidelines:
+- Focus on the main purpose/intent of the query
+- Use plain language, not technical SQL terms
+- Start with an action verb when appropriate (e.g., "Count", "List", "Show", "Find")
+- Be specific about what data is being retrieved
+- Do not include quotes around the title
+- Do not include punctuation at the end
+
+Examples:
+- "Failed runs by hour over 7 days"
+- "Top 50 most expensive task runs"
+- "Run counts grouped by status"
+- "Average execution time by task"
+- "Recent runs with errors"`,
+        prompt: `Generate a concise title for this SQL query:\n\n${query}`,
+        maxTokens: 50,
+        experimental_telemetry: {
+          isEnabled: true,
+          metadata: {
+            feature: "ai-query-title",
+          },
+        },
+      });
+
+      const title = result.text.trim();
+
+      if (!title) {
+        return { success: false, error: "No title generated" };
+      }
+
+      return { success: true, title };
+    } catch (error) {
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : "Failed to generate title",
+      };
+    }
+  }
+}
diff --git a/apps/webapp/app/v3/services/aiRunFilterService.server.ts b/apps/webapp/app/v3/services/aiRunFilterService.server.ts
index 04a4c227c24..4ce12b94557 100644
--- a/apps/webapp/app/v3/services/aiRunFilterService.server.ts
+++ b/apps/webapp/app/v3/services/aiRunFilterService.server.ts
@@ -175,6 +175,21 @@ export class AIRunFilterService {
   - "using large machine" → machines: ["large-1x", "large-2x"]
   - "root only" → rootOnly: true
   
+  Time-specific patterns:
+  - "around 8am today" → from/to: 7am-9am today (1-2 hour window around the time)
+  - "at 2pm yesterday" → from/to: 2pm-2:59pm yesterday (exact hour)
+  - "this morning" → from/to: 6am-12pm today
+  - "this afternoon" → from/to: 12pm-6pm today
+  - "this evening" → from/to: 6pm-10pm today
+  - "started around X" / "that started at X" → same as time filtering (treat "started" as temporal filter)
+  - "began around X" / "ran at X" → same as time filtering
+  
+  When handling specific times:
+  - "around" adds ±1 hour buffer (e.g., "around 8am" = 7am-9am)
+  - "at" means exact hour (e.g., "at 2pm" = 2pm-2:59pm)
+  - For relative days: "today" = current date, "yesterday" = current date - 1 day
+  - Convert times to ISO format for from/to filters
+  
   Use the available tools to look up actual tags, versions, queues, and tasks in the environment when the user mentions them. This will help you provide accurate filter values.
   
   Unless they specify they only want root runs, set rootOnly to false.
diff --git a/apps/webapp/app/v3/services/alerts/deliverAlert.server.ts b/apps/webapp/app/v3/services/alerts/deliverAlert.server.ts
index ecbf8ef1bcd..debb176da57 100644
--- a/apps/webapp/app/v3/services/alerts/deliverAlert.server.ts
+++ b/apps/webapp/app/v3/services/alerts/deliverAlert.server.ts
@@ -22,6 +22,7 @@ import { environmentTitle } from "~/components/environments/EnvironmentLabel";
 import { type Prisma, type prisma, type PrismaClientOrTransaction } from "~/db.server";
 import { env } from "~/env.server";
 import {
+  isIntegrationForService,
   type OrganizationIntegrationForService,
   OrgIntegrationRepository,
 } from "~/models/orgIntegration.server";
@@ -158,7 +159,7 @@ export class DeliverAlertService extends BaseService {
       }
     } catch (error) {
       if (error instanceof SkipRetryError) {
-        logger.error("[DeliverAlert] Skipping retry", {
+        logger.warn("[DeliverAlert] Skipping retry", {
           reason: error.message,
         });
 
@@ -644,7 +645,7 @@ export class DeliverAlertService extends BaseService {
           },
         });
 
-    if (!integration) {
+    if (!integration || !isIntegrationForService(integration, "SLACK")) {
       logger.error("[DeliverAlert] Slack integration not found", {
         alert,
       });
@@ -926,7 +927,7 @@ export class DeliverAlertService extends BaseService {
     });
 
     if (!response.ok) {
-      logger.error("[DeliverAlert] Failed to send alert webhook", {
+      logger.info("[DeliverAlert] Failed to send alert webhook", {
         status: response.status,
         statusText: response.statusText,
         url: webhook.url,
@@ -951,7 +952,7 @@ export class DeliverAlertService extends BaseService {
       return await client.chat.postMessage(message);
     } catch (error) {
       if (isWebAPIRateLimitedError(error)) {
-        logger.error("[DeliverAlert] Slack rate limited", {
+        logger.warn("[DeliverAlert] Slack rate limited", {
           error,
           message,
         });
@@ -960,7 +961,7 @@ export class DeliverAlertService extends BaseService {
       }
 
       if (isWebAPIHTTPError(error)) {
-        logger.error("[DeliverAlert] Slack HTTP error", {
+        logger.warn("[DeliverAlert] Slack HTTP error", {
           error,
           message,
         });
@@ -969,7 +970,7 @@ export class DeliverAlertService extends BaseService {
       }
 
       if (isWebAPIRequestError(error)) {
-        logger.error("[DeliverAlert] Slack request error", {
+        logger.warn("[DeliverAlert] Slack request error", {
           error,
           message,
         });
@@ -978,7 +979,7 @@ export class DeliverAlertService extends BaseService {
       }
 
       if (isWebAPIPlatformError(error)) {
-        logger.error("[DeliverAlert] Slack platform error", {
+        logger.warn("[DeliverAlert] Slack platform error", {
           error,
           message,
         });
@@ -991,10 +992,19 @@ export class DeliverAlertService extends BaseService {
           throw new SkipRetryError("Slack invalid blocks");
         }
 
+        if (error.data.error === "account_inactive") {
+          logger.info("[DeliverAlert] Slack account inactive, skipping retry", {
+            error,
+            message,
+          });
+
+          throw new SkipRetryError("Slack account inactive");
+        }
+
         throw new Error("Slack platform error");
       }
 
-      logger.error("[DeliverAlert] Failed to send slack message", {
+      logger.warn("[DeliverAlert] Failed to send slack message", {
         error,
         message,
       });
diff --git a/apps/webapp/app/v3/services/allocateConcurrency.server.ts b/apps/webapp/app/v3/services/allocateConcurrency.server.ts
new file mode 100644
index 00000000000..83fb69d0623
--- /dev/null
+++ b/apps/webapp/app/v3/services/allocateConcurrency.server.ts
@@ -0,0 +1,97 @@
+import { tryCatch } from "@trigger.dev/core";
+import { ManageConcurrencyPresenter } from "~/presenters/v3/ManageConcurrencyPresenter.server";
+import { BaseService } from "./baseService.server";
+import { updateEnvConcurrencyLimits } from "../runQueue.server";
+
+type Input = {
+  userId: string;
+  projectId: string;
+  organizationId: string;
+  environments: { id: string; amount: number }[];
+};
+
+type Result =
+  | {
+      success: true;
+    }
+  | {
+      success: false;
+      error: string;
+    };
+
+export class AllocateConcurrencyService extends BaseService {
+  async call({ userId, projectId, organizationId, environments }: Input): Promise<Result> {
+    // fetch the current concurrency
+    const presenter = new ManageConcurrencyPresenter(this._prisma, this._replica);
+    const [error, result] = await tryCatch(
+      presenter.call({
+        userId,
+        projectId,
+        organizationId,
+      })
+    );
+
+    if (error) {
+      return {
+        success: false,
+        error: "Unknown error",
+      };
+    }
+
+    const previousExtra = result.environments.reduce(
+      (acc, e) => Math.max(0, e.maximumConcurrencyLimit - e.planConcurrencyLimit) + acc,
+      0
+    );
+    const requested = new Map(environments.map((e) => [e.id, e.amount]));
+    const newExtra = result.environments.reduce((acc, env) => {
+      const targetExtra = requested.has(env.id)
+        ? Math.max(0, requested.get(env.id)!)
+        : Math.max(0, env.maximumConcurrencyLimit - env.planConcurrencyLimit);
+      return acc + targetExtra;
+    }, 0);
+    const change = newExtra - previousExtra;
+
+    const totalExtra = result.extraAllocatedConcurrency + change;
+
+    if (change > result.extraUnallocatedConcurrency) {
+      return {
+        success: false,
+        error: `You don't have enough unallocated concurrency available. You requested ${totalExtra} but only have ${result.extraUnallocatedConcurrency}.`,
+      };
+    }
+
+    for (const environment of environments) {
+      const existingEnvironment = result.environments.find((e) => e.id === environment.id);
+
+      if (!existingEnvironment) {
+        return {
+          success: false,
+          error: `Environment not found ${environment.id}`,
+        };
+      }
+
+      const newConcurrency = existingEnvironment.planConcurrencyLimit + environment.amount;
+
+      const updatedEnvironment = await this._prisma.runtimeEnvironment.update({
+        where: {
+          id: environment.id,
+        },
+        data: {
+          maximumConcurrencyLimit: newConcurrency,
+        },
+        include: {
+          project: true,
+          organization: true,
+        },
+      });
+
+      if (!updatedEnvironment.paused) {
+        await updateEnvConcurrencyLimits(updatedEnvironment);
+      }
+    }
+
+    return {
+      success: true,
+    };
+  }
+}
diff --git a/apps/webapp/app/v3/services/artifacts.server.ts b/apps/webapp/app/v3/services/artifacts.server.ts
new file mode 100644
index 00000000000..9e82af51234
--- /dev/null
+++ b/apps/webapp/app/v3/services/artifacts.server.ts
@@ -0,0 +1,92 @@
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { BaseService } from "./baseService.server";
+import { env } from "~/env.server";
+import { createPresignedPost } from "@aws-sdk/s3-presigned-post";
+import { S3Client } from "@aws-sdk/client-s3";
+import { customAlphabet } from "nanoid";
+import { errAsync, fromPromise } from "neverthrow";
+
+const nanoid = customAlphabet("1234567890abcdefghijklmnopqrstuvwxyz", 24);
+const objectStoreClient =
+  env.ARTIFACTS_OBJECT_STORE_ACCESS_KEY_ID &&
+  env.ARTIFACTS_OBJECT_STORE_SECRET_ACCESS_KEY &&
+  env.ARTIFACTS_OBJECT_STORE_BASE_URL
+    ? new S3Client({
+        credentials: {
+          accessKeyId: env.ARTIFACTS_OBJECT_STORE_ACCESS_KEY_ID,
+          secretAccessKey: env.ARTIFACTS_OBJECT_STORE_SECRET_ACCESS_KEY,
+        },
+        region: env.ARTIFACTS_OBJECT_STORE_REGION,
+        endpoint: env.ARTIFACTS_OBJECT_STORE_BASE_URL,
+        forcePathStyle: true,
+      })
+    : new S3Client();
+
+const artifactKeyPrefixByType = {
+  deployment_context: "deployments",
+} as const;
+const artifactBytesSizeLimitByType = {
+  deployment_context: 100 * 1024 * 1024, // 100MB
+} as const;
+
+export class ArtifactsService extends BaseService {
+  private readonly bucket = env.ARTIFACTS_OBJECT_STORE_BUCKET;
+
+  public createArtifact(
+    type: "deployment_context",
+    authenticatedEnv: AuthenticatedEnvironment,
+    contentLength?: number
+  ) {
+    const limit = artifactBytesSizeLimitByType[type];
+
+    // this is just a validation using client-side data
+    // the actual limit will be enforced by S3
+    if (contentLength && contentLength > limit) {
+      return errAsync({
+        type: "artifact_size_exceeds_limit" as const,
+        contentLength,
+        sizeLimit: limit,
+      });
+    }
+
+    const uniqueId = nanoid();
+    const key = `${artifactKeyPrefixByType[type]}/${authenticatedEnv.project.externalRef}/${authenticatedEnv.slug}/${uniqueId}.tar.gz`;
+
+    return this.createPresignedPost(key, limit, contentLength).map((result) => ({
+      artifactKey: key,
+      uploadUrl: result.url,
+      uploadFields: result.fields,
+      expiresAt: result.expiresAt,
+    }));
+  }
+
+  private createPresignedPost(key: string, sizeLimit: number, contentLength?: number) {
+    if (!this.bucket) {
+      return errAsync({
+        type: "artifacts_bucket_not_configured" as const,
+      });
+    }
+
+    const ttlSeconds = 300; // 5 minutes
+    const expiresAt = new Date(Date.now() + ttlSeconds * 1000);
+
+    return fromPromise(
+      createPresignedPost(objectStoreClient, {
+        Bucket: this.bucket,
+        Key: key,
+        Conditions: [["content-length-range", 0, sizeLimit]],
+        Fields: {
+          "Content-Type": "application/gzip",
+        },
+        Expires: ttlSeconds,
+      }),
+      (error) => ({
+        type: "failed_to_create_presigned_post" as const,
+        cause: error,
+      })
+    ).map((result) => ({
+      ...result,
+      expiresAt,
+    }));
+  }
+}
diff --git a/apps/webapp/app/v3/services/batchTriggerV3.server.ts b/apps/webapp/app/v3/services/batchTriggerV3.server.ts
index 150c2a6f004..e4bc583b7cc 100644
--- a/apps/webapp/app/v3/services/batchTriggerV3.server.ts
+++ b/apps/webapp/app/v3/services/batchTriggerV3.server.ts
@@ -14,7 +14,7 @@ import {
   TaskRunAttempt,
 } from "@trigger.dev/database";
 import { z } from "zod";
-import { $transaction, prisma, PrismaClientOrTransaction } from "~/db.server";
+import { prisma, PrismaClientOrTransaction } from "~/db.server";
 import { env } from "~/env.server";
 import { batchTaskRunItemStatusForRunStatus } from "~/models/taskRun.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
@@ -56,6 +56,7 @@ export type BatchTriggerTaskServiceOptions = {
   traceContext?: Record<string, string | undefined>;
   spanParentAsLink?: boolean;
   oneTimeUseToken?: string;
+  realtimeStreamsVersion?: "v1" | "v2";
 };
 
 type RunItemData = {
@@ -848,9 +849,10 @@ export class BatchTriggerV3Service extends BaseService {
         triggerVersion: options?.triggerVersion,
         traceContext: options?.traceContext,
         spanParentAsLink: options?.spanParentAsLink,
-        batchId: batch.friendlyId,
+        batchId: batch.id,
         skipChecks: true,
         runFriendlyId: task.runId,
+        realtimeStreamsVersion: options?.realtimeStreamsVersion,
       }
     );
 
@@ -932,6 +934,69 @@ export class BatchTriggerV3Service extends BaseService {
   }
 }
 
+export async function tryCompleteBatchV3(
+  batchId: string,
+  tx: PrismaClientOrTransaction,
+  scheduleResumeOnComplete: boolean
+) {
+  const batch = await tx.batchTaskRun.findFirst({
+    where: { id: batchId },
+    select: {
+      id: true,
+      sealed: true,
+      status: true,
+      expectedCount: true,
+      dependentTaskAttemptId: true,
+    },
+  });
+
+  if (!batch) {
+    logger.debug("tryCompleteBatchV3: Batch not found", { batchId });
+    return;
+  }
+
+  if (batch.status === "COMPLETED") {
+    logger.debug("tryCompleteBatchV3: Already completed", { batchId });
+    return;
+  }
+
+  if (!batch.sealed) {
+    logger.debug("tryCompleteBatchV3: Not sealed yet", { batchId });
+    return;
+  }
+
+  // Count completed items (read-only, no contention)
+  const completedCount = await tx.batchTaskRunItem.count({
+    where: { batchTaskRunId: batchId, status: "COMPLETED" },
+  });
+
+  if (completedCount < batch.expectedCount) {
+    logger.debug("tryCompleteBatchV3: Not all items completed", {
+      batchId,
+      completedCount,
+      expectedCount: batch.expectedCount,
+    });
+    return;
+  }
+
+  // Mark batch COMPLETED (idempotent via status check)
+  const updated = await tx.batchTaskRun.updateMany({
+    where: { id: batchId, status: "PENDING" },
+    data: { status: "COMPLETED", completedAt: new Date(), completedCount },
+  });
+
+  if (updated.count === 0) {
+    logger.debug("tryCompleteBatchV3: Already transitioned", { batchId });
+    return;
+  }
+
+  logger.debug("tryCompleteBatchV3: Batch completed", { batchId, completedCount });
+
+  if (scheduleResumeOnComplete && batch.dependentTaskAttemptId) {
+    await ResumeBatchRunService.enqueue(batchId, true, tx);
+  }
+}
+
 export async function completeBatchTaskRunItemV3(
   itemId: string,
   batchTaskRunId: string,
@@ -951,86 +1016,32 @@ export async function completeBatchTaskRunItemV3(
     isRetry,
   });
 
-  if (isRetry) {
-    logger.debug("completeBatchTaskRunItemV3 retrying", {
-      itemId,
-      batchTaskRunId,
-      scheduleResumeOnComplete,
-      taskRunAttemptId,
-      retryAttempt,
-    });
-  }
-
   try {
-    await $transaction(
-      tx,
-      "completeBatchTaskRunItemV3",
-      async (tx, span) => {
-        span?.setAttribute("batch_id", batchTaskRunId);
-
-        // Update the item to complete
-        const updated = await tx.batchTaskRunItem.updateMany({
-          where: {
-            id: itemId,
-            status: "PENDING",
-          },
-          data: {
-            status: "COMPLETED",
-            taskRunAttemptId,
-          },
-        });
-
-        if (updated.count === 0) {
-          return;
-        }
-
-        const updatedBatchRun = await tx.batchTaskRun.update({
-          where: {
-            id: batchTaskRunId,
-          },
-          data: {
-            completedCount: {
-              increment: 1,
-            },
-          },
-          select: {
-            sealed: true,
-            status: true,
-            completedCount: true,
-            expectedCount: true,
-            dependentTaskAttemptId: true,
-          },
-        });
+    // Update item to COMPLETED (no transaction needed, no contention)
+    const updated = await tx.batchTaskRunItem.updateMany({
+      where: { id: itemId, status: "PENDING" },
+      data: { status: "COMPLETED", taskRunAttemptId },
+    });
 
-        if (
-          updatedBatchRun.status === "PENDING" &&
-          updatedBatchRun.completedCount === updatedBatchRun.expectedCount &&
-          updatedBatchRun.sealed
-        ) {
-          await tx.batchTaskRun.update({
-            where: {
-              id: batchTaskRunId,
-            },
-            data: {
-              status: "COMPLETED",
-              completedAt: new Date(),
-            },
-          });
+    if (updated.count === 0) {
+      logger.debug("completeBatchTaskRunItemV3: Item already completed", {
+        itemId,
+        batchTaskRunId,
+      });
+      return;
+    }
 
-          // We only need to resume the batch if it has a dependent task attempt ID
-          if (scheduleResumeOnComplete && updatedBatchRun.dependentTaskAttemptId) {
-            await ResumeBatchRunService.enqueue(batchTaskRunId, true, tx);
-          }
-        }
-      },
-      {
-        timeout: 10_000,
-        maxWait: 4_000,
-      }
-    );
+    // Schedule debounced completion check
+    // enqueue with same ID overwrites, resetting the 200ms timer (debounce behavior)
+    await legacyRunEngineWorker.enqueue({
+      id: `tryCompleteBatchV3:${batchTaskRunId}`,
+      job: "tryCompleteBatchV3",
+      payload: { batchId: batchTaskRunId, scheduleResumeOnComplete },
+      availableAt: new Date(Date.now() + 200),
+    });
   } catch (error) {
     if (isPrismaRetriableError(error) || isPrismaRaceConditionError(error)) {
-      logger.error("completeBatchTaskRunItemV3 failed with a Prisma Error, scheduling a retry", {
+      logger.error("completeBatchTaskRunItemV3 failed, scheduling retry", {
         itemId,
         batchTaskRunId,
         error,
@@ -1039,24 +1050,17 @@ export async function completeBatchTaskRunItemV3(
       });
 
       if (isRetry) {
-        //throwing this error will cause the Redis worker to retry the job
         throw error;
       } else {
-        //schedule a retry
         await legacyRunEngineWorker.enqueue({
           id: `completeBatchTaskRunItem:${itemId}`,
           job: "completeBatchTaskRunItem",
-          payload: {
-            itemId,
-            batchTaskRunId,
-            scheduleResumeOnComplete,
-            taskRunAttemptId,
-          },
+          payload: { itemId, batchTaskRunId, scheduleResumeOnComplete, taskRunAttemptId },
           availableAt: new Date(Date.now() + 2_000),
         });
       }
     } else {
-      logger.error("completeBatchTaskRunItemV3 failed with a non-retriable error", {
+      logger.error("completeBatchTaskRunItemV3 failed with non-retriable error", {
         itemId,
         batchTaskRunId,
         error,
diff --git a/apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts b/apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts
index a68d6d330f5..98b6079c108 100644
--- a/apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts
+++ b/apps/webapp/app/v3/services/bulk/BulkActionV2.server.ts
@@ -12,7 +12,7 @@ import {
   parseRunListInputOptions,
   type RunListInputFilters,
   RunsRepository,
-} from "~/services/runsRepository.server";
+} from "~/services/runsRepository/runsRepository.server";
 import { BaseService } from "../baseService.server";
 import { commonWorker } from "~/v3/commonWorker.server";
 import { env } from "~/env.server";
diff --git a/apps/webapp/app/v3/services/cancelAttempt.server.ts b/apps/webapp/app/v3/services/cancelAttempt.server.ts
index b889705e1ed..79b05ede26c 100644
--- a/apps/webapp/app/v3/services/cancelAttempt.server.ts
+++ b/apps/webapp/app/v3/services/cancelAttempt.server.ts
@@ -1,11 +1,9 @@
 import { $transaction, type PrismaClientOrTransaction, prisma } from "~/db.server";
 import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
-import { eventRepository } from "../eventRepository.server";
 import { isCancellableRunStatus } from "../taskStatus";
 import { BaseService } from "./baseService.server";
 import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
-import { getTaskEventStoreTableForRun } from "../taskEventStore.server";
 
 export class CancelAttemptService extends BaseService {
   public async call(
@@ -72,25 +70,6 @@ export class CancelAttemptService extends BaseService {
           error: isCancellable ? { type: "STRING_ERROR", raw: reason } : undefined,
         });
       });
-
-      const inProgressEvents = await eventRepository.queryIncompleteEvents(
-        getTaskEventStoreTableForRun(taskRunAttempt.taskRun),
-        {
-          runId: taskRunAttempt.taskRun.friendlyId,
-        },
-        taskRunAttempt.taskRun.createdAt,
-        taskRunAttempt.taskRun.completedAt ?? undefined
-      );
-
-      logger.debug("Cancelling in-progress events", {
-        inProgressEvents: inProgressEvents.map((event) => event.id),
-      });
-
-      await Promise.all(
-        inProgressEvents.map((event) => {
-          return eventRepository.cancelEvent(event, cancelledAt, reason);
-        })
-      );
     });
   }
 }
diff --git a/apps/webapp/app/v3/services/cancelTaskRun.server.ts b/apps/webapp/app/v3/services/cancelTaskRun.server.ts
index ef2bc5ee1ca..0c27a0b957f 100644
--- a/apps/webapp/app/v3/services/cancelTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/cancelTaskRun.server.ts
@@ -1,8 +1,5 @@
 import { RunEngineVersion, type TaskRun } from "@trigger.dev/database";
-import { logger } from "~/services/logger.server";
-import { eventRepository } from "../eventRepository.server";
 import { engine } from "../runEngine.server";
-import { getTaskEventStoreTableForRun } from "../taskEventStore.server";
 import { BaseService } from "./baseService.server";
 import { CancelTaskRunServiceV1 } from "./cancelTaskRunV1.server";
 
diff --git a/apps/webapp/app/v3/services/cancelTaskRunV1.server.ts b/apps/webapp/app/v3/services/cancelTaskRunV1.server.ts
index fa30d7fc7ba..4b4482a1dab 100644
--- a/apps/webapp/app/v3/services/cancelTaskRunV1.server.ts
+++ b/apps/webapp/app/v3/services/cancelTaskRunV1.server.ts
@@ -1,16 +1,16 @@
-import { type Prisma, type TaskRun } from "@trigger.dev/database";
+import { type Prisma } from "@trigger.dev/database";
 import assertNever from "assert-never";
 import { logger } from "~/services/logger.server";
-import { eventRepository } from "../eventRepository.server";
 import { socketIo } from "../handleSocketIo.server";
 import { devPubSub } from "../marqs/devPubSub.server";
 import { CANCELLABLE_ATTEMPT_STATUSES, isCancellableRunStatus } from "../taskStatus";
 import { BaseService } from "./baseService.server";
 import { CancelAttemptService } from "./cancelAttempt.server";
 import { CancelTaskAttemptDependenciesService } from "./cancelTaskAttemptDependencies.server";
-import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
-import { getTaskEventStoreTableForRun } from "../taskEventStore.server";
 import { CancelableTaskRun } from "./cancelTaskRun.server";
+import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { resolveEventRepositoryForStore } from "../eventRepository/index.server";
 
 type ExtendedTaskRun = Prisma.TaskRunGetPayload<{
   include: {
@@ -43,7 +43,7 @@ export class CancelTaskRunServiceV1 extends BaseService {
 
     // Make sure the task run is in a cancellable state
     if (!isCancellableRunStatus(taskRun.status)) {
-      logger.error("Task run is not in a cancellable state", {
+      logger.info("Task run is not in a cancellable state", {
         runId: taskRun.id,
         status: taskRun.status,
       });
@@ -92,6 +92,7 @@ export class CancelTaskRunServiceV1 extends BaseService {
         },
         runtimeEnvironment: true,
         lockedToVersion: true,
+        project: true,
       },
       attemptStatus: "CANCELED",
       error: {
@@ -100,21 +101,22 @@ export class CancelTaskRunServiceV1 extends BaseService {
       },
     });
 
-    const inProgressEvents = await eventRepository.queryIncompleteEvents(
-      getTaskEventStoreTableForRun(taskRun),
-      {
-        runId: taskRun.friendlyId,
-      },
-      taskRun.createdAt,
-      taskRun.completedAt ?? undefined
-    );
+    const eventRepository = resolveEventRepositoryForStore(cancelledTaskRun.taskEventStore);
 
-    logger.debug("Cancelling in-progress events", {
-      inProgressEvents: inProgressEvents.map((event) => event.id),
-      eventCount: inProgressEvents.length,
-    });
+    const [cancelRunEventError] = await tryCatch(
+      eventRepository.cancelRunEvent({
+        reason: opts.reason,
+        run: cancelledTaskRun,
+        cancelledAt: opts.cancelledAt,
+      })
+    );
 
-    await eventRepository.cancelEvents(inProgressEvents, opts.cancelledAt, opts.reason);
+    if (cancelRunEventError) {
+      logger.error("[CancelTaskRunServiceV1] Failed to cancel run event", {
+        error: cancelRunEventError,
+        runId: cancelledTaskRun.id,
+      });
+    }
 
     // Cancel any in progress attempts
     if (opts.cancelAttempts) {
diff --git a/apps/webapp/app/v3/services/checkSchedule.server.ts b/apps/webapp/app/v3/services/checkSchedule.server.ts
index 25a0944dc6e..7c85641c404 100644
--- a/apps/webapp/app/v3/services/checkSchedule.server.ts
+++ b/apps/webapp/app/v3/services/checkSchedule.server.ts
@@ -92,7 +92,7 @@ export class CheckScheduleService extends BaseService {
       const limit = await getLimit(project.organizationId, "schedules", 100_000_000);
       const schedulesCount = await CheckScheduleService.getUsedSchedulesCount({
         prisma: this._prisma,
-        environments: project.environments,
+        projectId,
       });
 
       if (schedulesCount >= limit) {
@@ -105,26 +105,25 @@ export class CheckScheduleService extends BaseService {
 
   static async getUsedSchedulesCount({
     prisma,
-    environments,
+    projectId,
   }: {
     prisma: PrismaClientOrTransaction;
-    environments: { id: string; type: RuntimeEnvironmentType; archivedAt: Date | null }[];
+    projectId: string;
   }) {
-    const deployedEnvironments = environments.filter(
-      (env) => env.type !== "DEVELOPMENT" && !env.archivedAt
-    );
-    const schedulesCount = await prisma.taskScheduleInstance.count({
+    return await prisma.taskScheduleInstance.count({
       where: {
-        environmentId: {
-          in: deployedEnvironments.map((env) => env.id),
-        },
+        projectId,
         active: true,
+        environment: {
+          type: {
+            not: "DEVELOPMENT",
+          },
+          archivedAt: null,
+        },
         taskSchedule: {
           active: true,
         },
       },
     });
-
-    return schedulesCount;
   }
 }
diff --git a/apps/webapp/app/v3/services/completeAttempt.server.ts b/apps/webapp/app/v3/services/completeAttempt.server.ts
index d0b9d911b6e..99169331a99 100644
--- a/apps/webapp/app/v3/services/completeAttempt.server.ts
+++ b/apps/webapp/app/v3/services/completeAttempt.server.ts
@@ -1,14 +1,14 @@
-import { Attributes } from "@opentelemetry/api";
+import { tryCatch } from "@trigger.dev/core/utils";
 import {
   MachinePresetName,
   TaskRunContext,
-  TaskRunError,
   TaskRunErrorCodes,
   TaskRunExecution,
   TaskRunExecutionResult,
   TaskRunExecutionRetry,
   TaskRunFailedExecutionResult,
   TaskRunSuccessfulExecutionResult,
+  V3TaskRunExecution,
   flattenAttributes,
   isOOMRunError,
   sanitizeError,
@@ -21,18 +21,17 @@ import { PrismaClientOrTransaction } from "~/db.server";
 import { env } from "~/env.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
-import { safeJsonParse } from "~/utils/json";
 import { marqs } from "~/v3/marqs/index.server";
-import { createExceptionPropertiesFromError, eventRepository } from "../eventRepository.server";
 import { FailedTaskRunRetryHelper } from "../failedTaskRun.server";
 import { socketIo } from "../handleSocketIo.server";
-import { getTaskEventStoreTableForRun } from "../taskEventStore.server";
+import { createExceptionPropertiesFromError } from "../eventRepository/common.server";
 import { FAILED_RUN_STATUSES, isFinalAttemptStatus, isFinalRunStatus } from "../taskStatus";
 import { BaseService } from "./baseService.server";
 import { CancelAttemptService } from "./cancelAttempt.server";
 import { CreateCheckpointService } from "./createCheckpoint.server";
 import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
 import { RetryAttemptService } from "./retryAttempt.server";
+import { resolveEventRepositoryForStore } from "../eventRepository/index.server";
 
 type FoundAttempt = Awaited<ReturnType<typeof findAttempt>>;
 
@@ -60,7 +59,7 @@ export class CompleteAttemptService extends BaseService {
     checkpoint,
   }: {
     completion: TaskRunExecutionResult;
-    execution: TaskRunExecution;
+    execution: V3TaskRunExecution;
     env?: AuthenticatedEnvironment;
     checkpoint?: CheckpointData;
   }): Promise<"COMPLETED" | "RETRIED"> {
@@ -164,27 +163,22 @@ export class CompleteAttemptService extends BaseService {
       env,
     });
 
-    // Now we need to "complete" the task run event/span
-    await eventRepository.completeEvent(
-      getTaskEventStoreTableForRun(taskRunAttempt.taskRun),
-      taskRunAttempt.taskRun.spanId,
-      taskRunAttempt.taskRun.createdAt,
-      taskRunAttempt.taskRun.completedAt ?? undefined,
-      {
+    const eventRepository = resolveEventRepositoryForStore(taskRunAttempt.taskRun.taskEventStore);
+
+    const [completeSuccessfulRunEventError] = await tryCatch(
+      eventRepository.completeSuccessfulRunEvent({
+        run: taskRunAttempt.taskRun,
         endTime: new Date(),
-        attributes: {
-          isError: false,
-          output:
-            completion.outputType === "application/store" || completion.outputType === "text/plain"
-              ? completion.output
-              : completion.output
-              ? (safeJsonParse(completion.output) as Attributes)
-              : undefined,
-          outputType: completion.outputType,
-        },
-      }
+      })
     );
 
+    if (completeSuccessfulRunEventError) {
+      logger.error("[CompleteAttemptService] Failed to complete successful run event", {
+        error: completeSuccessfulRunEventError,
+        runId: taskRunAttempt.taskRunId,
+      });
+    }
+
     return "COMPLETED";
   }
 
@@ -196,7 +190,7 @@ export class CompleteAttemptService extends BaseService {
     checkpoint,
   }: {
     completion: TaskRunFailedExecutionResult;
-    execution: TaskRunExecution;
+    execution: V3TaskRunExecution;
     taskRunAttempt: NonNullable<FoundAttempt>;
     env?: AuthenticatedEnvironment;
     checkpoint?: CheckpointData;
@@ -213,7 +207,7 @@ export class CompleteAttemptService extends BaseService {
         taskRunAttempt.friendlyId,
         taskRunAttempt.taskRunId,
         new Date(),
-        "Cancelled by user",
+        "Canceled by user",
         env
       );
 
@@ -322,29 +316,23 @@ export class CompleteAttemptService extends BaseService {
       exitRun(taskRunAttempt.taskRunId);
     }
 
-    // Now we need to "complete" the task run event/span
-    await eventRepository.completeEvent(
-      getTaskEventStoreTableForRun(taskRunAttempt.taskRun),
-      taskRunAttempt.taskRun.spanId,
-      taskRunAttempt.taskRun.createdAt,
-      taskRunAttempt.taskRun.completedAt ?? undefined,
-      {
+    const eventRepository = resolveEventRepositoryForStore(taskRunAttempt.taskRun.taskEventStore);
+
+    const [completeFailedRunEventError] = await tryCatch(
+      eventRepository.completeFailedRunEvent({
+        run: taskRunAttempt.taskRun,
         endTime: failedAt,
-        attributes: {
-          isError: true,
-        },
-        events: [
-          {
-            name: "exception",
-            time: failedAt,
-            properties: {
-              exception: createExceptionPropertiesFromError(sanitizedError),
-            },
-          },
-        ],
-      }
+        exception: createExceptionPropertiesFromError(sanitizedError),
+      })
     );
 
+    if (completeFailedRunEventError) {
+      logger.error("[CompleteAttemptService] Failed to complete failed run event", {
+        error: completeFailedRunEventError,
+        runId: taskRunAttempt.taskRunId,
+      });
+    }
+
     await this._prisma.taskRun.update({
       where: {
         id: taskRunAttempt.taskRunId,
@@ -385,64 +373,43 @@ export class CompleteAttemptService extends BaseService {
       return "COMPLETED";
     }
 
-    const inProgressEvents = await eventRepository.queryIncompleteEvents(
-      getTaskEventStoreTableForRun(taskRunAttempt.taskRun),
-      {
-        runId: taskRunAttempt.taskRun.friendlyId,
-      },
-      taskRunAttempt.taskRun.createdAt,
-      taskRunAttempt.taskRun.completedAt ?? undefined
-    );
-
     // Handle in-progress events
     switch (status) {
       case "CRASHED": {
-        logger.debug("[CompleteAttemptService] Crashing in-progress events", {
-          inProgressEvents: inProgressEvents.map((event) => event.id),
-        });
-
-        await Promise.all(
-          inProgressEvents.map((event) => {
-            return eventRepository.crashEvent({
-              event,
-              crashedAt: failedAt,
-              exception: createExceptionPropertiesFromError(sanitizedError),
-            });
+        const [createAttemptFailedEventError] = await tryCatch(
+          eventRepository.createAttemptFailedRunEvent({
+            run: taskRunAttempt.taskRun,
+            endTime: failedAt,
+            attemptNumber: taskRunAttempt.number,
+            exception: createExceptionPropertiesFromError(sanitizedError),
           })
         );
 
+        if (createAttemptFailedEventError) {
+          logger.error("[CompleteAttemptService] Failed to create attempt failed run event", {
+            error: createAttemptFailedEventError,
+            runId: taskRunAttempt.taskRunId,
+          });
+        }
+
         break;
       }
       case "SYSTEM_FAILURE": {
-        logger.debug("[CompleteAttemptService] Failing in-progress events", {
-          inProgressEvents: inProgressEvents.map((event) => event.id),
-        });
-
-        await Promise.all(
-          inProgressEvents.map((event) => {
-            return eventRepository.completeEvent(
-              getTaskEventStoreTableForRun(taskRunAttempt.taskRun),
-              event.spanId,
-              taskRunAttempt.taskRun.createdAt,
-              taskRunAttempt.taskRun.completedAt ?? undefined,
-              {
-                endTime: failedAt,
-                attributes: {
-                  isError: true,
-                },
-                events: [
-                  {
-                    name: "exception",
-                    time: failedAt,
-                    properties: {
-                      exception: createExceptionPropertiesFromError(sanitizedError),
-                    },
-                  },
-                ],
-              }
-            );
+        const [createAttemptFailedEventError] = await tryCatch(
+          eventRepository.createAttemptFailedRunEvent({
+            run: taskRunAttempt.taskRun,
+            endTime: failedAt,
+            attemptNumber: taskRunAttempt.number,
+            exception: createExceptionPropertiesFromError(sanitizedError),
           })
         );
+
+        if (createAttemptFailedEventError) {
+          logger.error("[CompleteAttemptService] Failed to create attempt failed run event", {
+            error: createAttemptFailedEventError,
+            runId: taskRunAttempt.taskRunId,
+          });
+        }
       }
     }
 
@@ -559,7 +526,7 @@ export class CompleteAttemptService extends BaseService {
     forceRequeue = false,
     oomMachine,
   }: {
-    execution: TaskRunExecution;
+    execution: V3TaskRunExecution;
     executionRetry: TaskRunExecutionRetry;
     executionRetryInferred: boolean;
     taskRunAttempt: NonNullable<FoundAttempt>;
@@ -571,6 +538,8 @@ export class CompleteAttemptService extends BaseService {
   }) {
     const retryAt = new Date(executionRetry.timestamp);
 
+    const eventRepository = resolveEventRepositoryForStore(taskRunAttempt.taskRun.taskEventStore);
+
     // Retry the task run
     await eventRepository.recordEvent(
       `Retry #${execution.attempt.number} delay${oomMachine ? " after OOM" : ""}`,
@@ -590,8 +559,6 @@ export class CompleteAttemptService extends BaseService {
           style: {
             icon: "schedule-attempt",
           },
-          queueId: taskRunAttempt.queueId,
-          queueName: taskRunAttempt.taskRun.queue,
         },
         context: taskRunAttempt.taskRun.traceContext as Record<string, string | undefined>,
         spanIdSeed: `retry-${taskRunAttempt.number + 1}`,
@@ -648,7 +615,7 @@ export class CompleteAttemptService extends BaseService {
     executionRetryInferred,
     checkpoint,
   }: {
-    execution: TaskRunExecution;
+    execution: V3TaskRunExecution;
     taskRunAttempt: NonNullable<FoundAttempt>;
     executionRetry: TaskRunExecutionRetry;
     executionRetryInferred: boolean;
diff --git a/apps/webapp/app/v3/services/concurrencySystem.server.ts b/apps/webapp/app/v3/services/concurrencySystem.server.ts
new file mode 100644
index 00000000000..1a34fd61f28
--- /dev/null
+++ b/apps/webapp/app/v3/services/concurrencySystem.server.ts
@@ -0,0 +1,210 @@
+import { TaskQueue, User } from "@trigger.dev/database";
+import { errAsync, fromPromise, okAsync } from "neverthrow";
+import { PrismaClientOrTransaction } from "~/db.server";
+import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { removeQueueConcurrencyLimits, updateQueueConcurrencyLimits } from "../runQueue.server";
+import { engine } from "../runEngine.server";
+
+export type ConcurrencySystemOptions = {
+  db: PrismaClientOrTransaction;
+  reader: PrismaClientOrTransaction;
+};
+
+export type QueueInput = string | { type: "task" | "custom"; name: string };
+
+export class ConcurrencySystem {
+  constructor(private readonly options: ConcurrencySystemOptions) {}
+
+  private get db() {
+    return this.options.db;
+  }
+
+  get queues() {
+    return {
+      overrideQueueConcurrencyLimit: (
+        environment: AuthenticatedEnvironment,
+        queue: QueueInput,
+        concurrencyLimit: number,
+        overriddenBy?: User
+      ) => {
+        return findQueueFromInput(this.db, environment, queue)
+          .andThen((queue) =>
+            overrideQueueConcurrencyLimit(
+              this.db,
+              environment,
+              queue,
+              concurrencyLimit,
+              overriddenBy
+            )
+          )
+          .andThen((queue) => syncQueueConcurrencyToEngine(environment, queue))
+          .andThen((queue) => getQueueStats(environment, queue));
+      },
+      resetConcurrencyLimit: (environment: AuthenticatedEnvironment, queue: QueueInput) => {
+        return findQueueFromInput(this.db, environment, queue)
+          .andThen((queue) => resetQueueConcurrencyLimit(this.db, queue))
+          .andThen((queue) => syncQueueConcurrencyToEngine(environment, queue))
+          .andThen((queue) => getQueueStats(environment, queue));
+      },
+    };
+  }
+}
+
+function findQueueFromInput(
+  db: PrismaClientOrTransaction,
+  environment: AuthenticatedEnvironment,
+  queue: QueueInput
+) {
+  if (typeof queue === "string") {
+    return findQueueByFriendlyId(db, environment, queue);
+  }
+
+  const queueName =
+    queue.type === "task" ? `task/${queue.name.replace(/^task\//, "")}` : queue.name;
+
+  return findQueueByName(db, environment, queueName);
+}
+
+function findQueueByFriendlyId(
+  db: PrismaClientOrTransaction,
+  environment: AuthenticatedEnvironment,
+  friendlyId: string
+) {
+  return fromPromise(
+    db.taskQueue.findFirst({
+      where: {
+        runtimeEnvironmentId: environment.id,
+        friendlyId,
+      },
+    }),
+    (error) => ({
+      type: "other" as const,
+      cause: error,
+    })
+  ).andThen((queue) => {
+    if (!queue) {
+      return errAsync({ type: "queue_not_found" as const });
+    }
+    return okAsync(queue);
+  });
+}
+
+function findQueueByName(
+  db: PrismaClientOrTransaction,
+  environment: AuthenticatedEnvironment,
+  queue: string
+) {
+  return fromPromise(
+    db.taskQueue.findFirst({
+      where: {
+        runtimeEnvironmentId: environment.id,
+        name: queue,
+      },
+    }),
+    (error) => ({
+      type: "other" as const,
+      cause: error,
+    })
+  ).andThen((queue) => {
+    if (!queue) {
+      return errAsync({ type: "queue_not_found" as const });
+    }
+    return okAsync(queue);
+  });
+}
+
+function overrideQueueConcurrencyLimit(
+  db: PrismaClientOrTransaction,
+  environment: AuthenticatedEnvironment,
+  queue: TaskQueue,
+  concurrencyLimit: number,
+  overriddenBy?: User
+) {
+  const newConcurrencyLimit = Math.max(
+    Math.min(concurrencyLimit, environment.maximumConcurrencyLimit),
+    0
+  );
+
+  const concurrencyLimitBase = queue.concurrencyLimitOverriddenAt
+    ? queue.concurrencyLimitBase
+    : queue.concurrencyLimit;
+
+  return fromPromise(
+    db.taskQueue.update({
+      where: {
+        id: queue.id,
+      },
+      data: {
+        concurrencyLimit: newConcurrencyLimit,
+        concurrencyLimitBase: concurrencyLimitBase ?? null,
+        concurrencyLimitOverriddenAt: new Date(),
+        concurrencyLimitOverriddenBy: overriddenBy?.id ?? null,
+      },
+    }),
+    (error) => ({
+      type: "queue_update_failed" as const,
+      cause: error,
+    })
+  );
+}
+
+function resetQueueConcurrencyLimit(db: PrismaClientOrTransaction, queue: TaskQueue) {
+  if (queue.concurrencyLimitOverriddenAt === null) {
+    return errAsync({ type: "queue_not_overridden" as const });
+  }
+
+  const newConcurrencyLimit = queue.concurrencyLimitBase;
+
+  return fromPromise(
+    db.taskQueue.update({
+      where: { id: queue.id },
+      data: {
+        concurrencyLimitOverriddenAt: null,
+        concurrencyLimit: newConcurrencyLimit,
+        concurrencyLimitBase: null,
+        concurrencyLimitOverriddenBy: null,
+      },
+    }),
+    (error) => ({
+      type: "queue_update_failed" as const,
+      cause: error,
+    })
+  );
+}
+
+function syncQueueConcurrencyToEngine(environment: AuthenticatedEnvironment, queue: TaskQueue) {
+  if (queue.paused) {
+    // Queue is paused, don't update Redis limits - keep at 0
+    return okAsync(queue);
+  }
+
+  if (typeof queue.concurrencyLimit === "number") {
+    return fromPromise(
+      updateQueueConcurrencyLimits(environment, queue.name, queue.concurrencyLimit),
+      (error) => ({
+        type: "sync_queue_concurrency_to_engine_failed" as const,
+        cause: error,
+      })
+    ).andThen(() => okAsync(queue));
+  } else {
+    return fromPromise(removeQueueConcurrencyLimits(environment, queue.name), (error) => ({
+      type: "sync_queue_concurrency_to_engine_failed" as const,
+      cause: error,
+    })).andThen(() => okAsync(queue));
+  }
+}
+
+function getQueueStats(environment: AuthenticatedEnvironment, queue: TaskQueue) {
+  return fromPromise(
+    Promise.all([
+      engine.lengthOfQueues(environment, [queue.name]),
+      engine.currentConcurrencyOfQueues(environment, [queue.name]),
+    ]),
+    (error) => ({
+      type: "get_queue_stats_failed" as const,
+      cause: error,
+    })
+  ).andThen(([queued, running]) =>
+    okAsync({ queued: queued[queue.name] ?? 0, running: running[queue.name] ?? 0, ...queue })
+  );
+}
diff --git a/apps/webapp/app/v3/services/concurrencySystemInstance.server.ts b/apps/webapp/app/v3/services/concurrencySystemInstance.server.ts
new file mode 100644
index 00000000000..fec48f27507
--- /dev/null
+++ b/apps/webapp/app/v3/services/concurrencySystemInstance.server.ts
@@ -0,0 +1,15 @@
+import { prisma, $replica } from "~/db.server";
+import { ConcurrencySystem } from "./concurrencySystem.server";
+import { singleton } from "~/utils/singleton";
+
+export const concurrencySystem = singleton(
+  "concurrency-system",
+  initalizeConcurrencySystemInstance
+);
+
+function initalizeConcurrencySystemInstance() {
+  return new ConcurrencySystem({
+    db: prisma,
+    reader: $replica,
+  });
+}
diff --git a/apps/webapp/app/v3/services/crashTaskRun.server.ts b/apps/webapp/app/v3/services/crashTaskRun.server.ts
index b6c463a53c2..9ed7d8b7aaf 100644
--- a/apps/webapp/app/v3/services/crashTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/crashTaskRun.server.ts
@@ -1,13 +1,13 @@
+import { tryCatch } from "@trigger.dev/core/utils";
+import { sanitizeError, TaskRunErrorCodes, TaskRunInternalError } from "@trigger.dev/core/v3";
 import { TaskRun, TaskRunAttempt } from "@trigger.dev/database";
-import { eventRepository } from "../eventRepository.server";
-import { BaseService } from "./baseService.server";
-import { logger } from "~/services/logger.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { logger } from "~/services/logger.server";
+import { FailedTaskRunRetryHelper } from "../failedTaskRun.server";
 import { CRASHABLE_ATTEMPT_STATUSES, isCrashableRunStatus } from "../taskStatus";
-import { sanitizeError, TaskRunErrorCodes, TaskRunInternalError } from "@trigger.dev/core/v3";
+import { BaseService } from "./baseService.server";
 import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
-import { FailedTaskRunRetryHelper } from "../failedTaskRun.server";
-import { getTaskEventStoreTableForRun } from "../taskEventStore.server";
+import { resolveEventRepositoryForStore } from "../eventRepository/index.server";
 
 export type CrashTaskRunServiceOptions = {
   reason?: string;
@@ -120,34 +120,27 @@ export class CrashTaskRunService extends BaseService {
       },
     });
 
-    const inProgressEvents = await eventRepository.queryIncompleteEvents(
-      getTaskEventStoreTableForRun(taskRun),
-      {
-        runId: taskRun.friendlyId,
-      },
-      taskRun.createdAt,
-      taskRun.completedAt ?? undefined,
-      options?.overrideCompletion
-    );
+    const eventRepository = resolveEventRepositoryForStore(crashedTaskRun.taskEventStore);
 
-    logger.debug("[CrashTaskRunService] Crashing in-progress events", {
-      inProgressEvents: inProgressEvents.map((event) => event.id),
-    });
-
-    await Promise.all(
-      inProgressEvents.map((event) => {
-        return eventRepository.crashEvent({
-          event: event,
-          crashedAt: opts.crashedAt,
-          exception: {
-            type: opts.errorCode ?? TaskRunErrorCodes.TASK_RUN_CRASHED,
-            message: opts.reason,
-            stacktrace: opts.logs,
-          },
-        });
+    const [createAttemptFailedEventError] = await tryCatch(
+      eventRepository.completeFailedRunEvent({
+        run: crashedTaskRun,
+        endTime: opts.crashedAt,
+        exception: {
+          type: opts.errorCode ?? TaskRunErrorCodes.TASK_RUN_CRASHED,
+          message: opts.reason,
+          stacktrace: opts.logs,
+        },
       })
     );
 
+    if (createAttemptFailedEventError) {
+      logger.error("[CrashTaskRunService] Failed to complete failed run event", {
+        error: createAttemptFailedEventError,
+        runId: crashedTaskRun.id,
+      });
+    }
+
     if (!opts.crashAttempts) {
       return;
     }
diff --git a/apps/webapp/app/v3/services/createBackgroundWorker.server.ts b/apps/webapp/app/v3/services/createBackgroundWorker.server.ts
index 35513236aaa..98a45681442 100644
--- a/apps/webapp/app/v3/services/createBackgroundWorker.server.ts
+++ b/apps/webapp/app/v3/services/createBackgroundWorker.server.ts
@@ -78,7 +78,8 @@ export class CreateBackgroundWorkerService extends BaseService {
           version: nextVersion,
           runtimeEnvironmentId: environment.id,
           projectId: project.id,
-          metadata: body.metadata,
+          // body.metadata has an index signature that Prisma doesn't like (from the JSONSchema type) so we are safe to just cast it
+          metadata: body.metadata as Prisma.InputJsonValue,
           contentHash: body.metadata.contentHash,
           cliVersion: body.metadata.cliPackageVersion,
           sdkVersion: body.metadata.packageVersion,
@@ -281,6 +282,7 @@ async function createWorkerTask(
         fileId: tasksToBackgroundFiles?.get(task.id) ?? null,
         maxDurationInSeconds: task.maxDuration ? clampMaxDuration(task.maxDuration) : null,
         queueId: queue.id,
+        payloadSchema: task.payloadSchema as any,
       },
     });
   } catch (error) {
@@ -358,38 +360,33 @@ async function createWorkerQueue(
 ) {
   let queueName = sanitizeQueueName(queue.name);
 
-  const concurrencyLimit =
+  const baseConcurrencyLimit =
     typeof queue.concurrencyLimit === "number"
-      ? Math.max(
-          Math.min(
-            queue.concurrencyLimit,
-            environment.maximumConcurrencyLimit,
-            environment.organization.maximumConcurrencyLimit
-          ),
-          0
-        )
+      ? Math.max(Math.min(queue.concurrencyLimit, environment.maximumConcurrencyLimit), 0)
       : queue.concurrencyLimit;
 
   const taskQueue = await upsertWorkerQueueRecord(
     queueName,
-    concurrencyLimit ?? null,
+    baseConcurrencyLimit ?? null,
     orderableName,
     queueType,
     worker,
     prisma
   );
 
+  const newConcurrencyLimit = taskQueue.concurrencyLimit;
+
   if (!taskQueue.paused) {
-    if (typeof concurrencyLimit === "number") {
+    if (typeof newConcurrencyLimit === "number") {
       logger.debug("createWorkerQueue: updating concurrency limit", {
         workerId: worker.id,
         taskQueue,
         orgId: environment.organizationId,
         projectId: environment.projectId,
         environmentId: environment.id,
-        concurrencyLimit,
+        concurrencyLimit: newConcurrencyLimit,
       });
-      await updateQueueConcurrencyLimits(environment, taskQueue.name, concurrencyLimit);
+      await updateQueueConcurrencyLimits(environment, taskQueue.name, newConcurrencyLimit);
     } else {
       logger.debug("createWorkerQueue: removing concurrency limit", {
         workerId: worker.id,
@@ -397,7 +394,7 @@ async function createWorkerQueue(
         orgId: environment.organizationId,
         projectId: environment.projectId,
         environmentId: environment.id,
-        concurrencyLimit,
+        concurrencyLimit: newConcurrencyLimit,
       });
       await removeQueueConcurrencyLimits(environment, taskQueue.name);
     }
@@ -454,6 +451,8 @@ async function upsertWorkerQueueRecord(
         },
       });
     } else {
+      const hasOverride = taskQueue.concurrencyLimitOverriddenAt !== null;
+
       taskQueue = await prisma.taskQueue.update({
         where: {
           id: taskQueue.id,
@@ -462,7 +461,9 @@ async function upsertWorkerQueueRecord(
           workers: { connect: { id: worker.id } },
           version: "V2",
           orderableName,
-          concurrencyLimit,
+          // If overridden, keep current limit and update base; otherwise update limit normally
+          concurrencyLimit: hasOverride ? undefined : concurrencyLimit,
+          concurrencyLimitBase: hasOverride ? concurrencyLimit : undefined,
         },
       });
     }
@@ -593,6 +594,7 @@ export async function syncDeclarativeSchedules(
             create: [
               {
                 environmentId: environment.id,
+                projectId: environment.projectId,
               },
             ],
           },
diff --git a/apps/webapp/app/v3/services/createCheckpoint.server.ts b/apps/webapp/app/v3/services/createCheckpoint.server.ts
index ec87d5bacdb..761f3a5185a 100644
--- a/apps/webapp/app/v3/services/createCheckpoint.server.ts
+++ b/apps/webapp/app/v3/services/createCheckpoint.server.ts
@@ -132,7 +132,7 @@ export class CreateCheckpointService extends BaseService {
         }
 
         if (childRun.dependency?.resumedAt) {
-          logger.error("CreateCheckpointService: Child run already resumed", {
+          logger.info("CreateCheckpointService: Child run already resumed", {
             childRun,
             params,
           });
@@ -168,7 +168,7 @@ export class CreateCheckpointService extends BaseService {
         }
 
         if (batchRun.resumedAt) {
-          logger.error("CreateCheckpointService: Batch already resumed", {
+          logger.info("CreateCheckpointService: Batch already resumed", {
             batchRun,
             params,
           });
diff --git a/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV3.server.ts b/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV3.server.ts
index 76be016528b..e093f2c2006 100644
--- a/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV3.server.ts
+++ b/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV3.server.ts
@@ -1,5 +1,5 @@
 import { CreateBackgroundWorkerRequestBody } from "@trigger.dev/core/v3";
-import type { BackgroundWorker } from "@trigger.dev/database";
+import type { BackgroundWorker, Prisma } from "@trigger.dev/database";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { socketIo } from "../handleSocketIo.server";
@@ -48,7 +48,8 @@ export class CreateDeploymentBackgroundWorkerServiceV3 extends BaseService {
           version: deployment.version,
           runtimeEnvironmentId: environment.id,
           projectId: environment.projectId,
-          metadata: body.metadata,
+          // body.metadata has an index signature that Prisma doesn't like (from the JSONSchema type) so we are safe to just cast it
+          metadata: body.metadata as Prisma.InputJsonValue,
           contentHash: body.metadata.contentHash,
           cliVersion: body.metadata.cliPackageVersion,
           sdkVersion: body.metadata.packageVersion,
diff --git a/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts b/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts
index 2fb32966de8..cc73a8569d9 100644
--- a/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts
+++ b/apps/webapp/app/v3/services/createDeploymentBackgroundWorkerV4.server.ts
@@ -1,6 +1,6 @@
 import { CreateBackgroundWorkerRequestBody, logger, tryCatch } from "@trigger.dev/core/v3";
 import { BackgroundWorkerId } from "@trigger.dev/core/v3/isomorphic";
-import type { BackgroundWorker, WorkerDeployment } from "@trigger.dev/database";
+import type { BackgroundWorker, Prisma, WorkerDeployment } from "@trigger.dev/database";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { BaseService, ServiceValidationError } from "./baseService.server";
 import {
@@ -65,7 +65,8 @@ export class CreateDeploymentBackgroundWorkerServiceV4 extends BaseService {
           version: deployment.version,
           runtimeEnvironmentId: environment.id,
           projectId: environment.projectId,
-          metadata: body.metadata,
+          // body.metadata has an index signature that Prisma doesn't like (from the JSONSchema type) so we are safe to just cast it
+          metadata: body.metadata as Prisma.InputJsonValue,
           contentHash: body.metadata.contentHash,
           cliVersion: body.metadata.cliPackageVersion,
           sdkVersion: body.metadata.packageVersion,
diff --git a/apps/webapp/app/v3/services/createTaskRunAttempt.server.ts b/apps/webapp/app/v3/services/createTaskRunAttempt.server.ts
index 60d7448b2e0..df5e4e2b744 100644
--- a/apps/webapp/app/v3/services/createTaskRunAttempt.server.ts
+++ b/apps/webapp/app/v3/services/createTaskRunAttempt.server.ts
@@ -1,4 +1,4 @@
-import { parsePacket, TaskRunExecution } from "@trigger.dev/core/v3";
+import { parsePacket, V3TaskRunExecution } from "@trigger.dev/core/v3";
 import { TaskRun, TaskRunAttempt } from "@trigger.dev/database";
 import { MAX_TASK_RUN_ATTEMPTS } from "~/consts";
 import { $transaction, prisma, PrismaClientOrTransaction } from "~/db.server";
@@ -25,7 +25,7 @@ export class CreateTaskRunAttemptService extends BaseService {
     setToExecuting?: boolean;
     startAtZero?: boolean;
   }): Promise<{
-    execution: TaskRunExecution;
+    execution: V3TaskRunExecution;
     run: TaskRun;
     attempt: TaskRunAttempt;
   }> {
@@ -189,7 +189,7 @@ export class CreateTaskRunAttemptService extends BaseService {
         dataType: taskRun.metadataType,
       });
 
-      const execution: TaskRunExecution = {
+      const execution: V3TaskRunExecution = {
         task: {
           id: lockedBy.slug,
           filePath: lockedBy.filePath,
diff --git a/apps/webapp/app/v3/services/deployment.server.ts b/apps/webapp/app/v3/services/deployment.server.ts
new file mode 100644
index 00000000000..985e0e47543
--- /dev/null
+++ b/apps/webapp/app/v3/services/deployment.server.ts
@@ -0,0 +1,511 @@
+import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { BaseService } from "./baseService.server";
+import { errAsync, fromPromise, okAsync, type ResultAsync } from "neverthrow";
+import { type WorkerDeployment, type Project } from "@trigger.dev/database";
+import {
+  BuildServerMetadata,
+  logger,
+  type GitMeta,
+  type DeploymentEvent,
+} from "@trigger.dev/core/v3";
+import { TimeoutDeploymentService } from "./timeoutDeployment.server";
+import { env } from "~/env.server";
+import { createRemoteImageBuild } from "../remoteImageBuilder.server";
+import { FINAL_DEPLOYMENT_STATUSES } from "./failDeployment.server";
+import { enqueueBuild, generateRegistryCredentials } from "~/services/platform.v3.server";
+import { AppendRecord, S2 } from "@s2-dev/streamstore";
+import { createRedisClient } from "~/redis.server";
+
+const S2_TOKEN_KEY_PREFIX = "s2-token:read:deployment-event-stream:project:";
+const s2TokenRedis = createRedisClient("s2-token-cache", {
+  host: env.CACHE_REDIS_HOST,
+  port: env.CACHE_REDIS_PORT,
+  username: env.CACHE_REDIS_USERNAME,
+  password: env.CACHE_REDIS_PASSWORD,
+  tlsDisabled: env.CACHE_REDIS_TLS_DISABLED === "true",
+  clusterMode: env.CACHE_REDIS_CLUSTER_MODE_ENABLED === "1",
+});
+const s2 = env.S2_ENABLED === "1" ? new S2({ accessToken: env.S2_ACCESS_TOKEN }) : undefined;
+
+export class DeploymentService extends BaseService {
+  /**
+   * Progresses a deployment from PENDING to INSTALLING and then to BUILDING.
+   * Also extends the deployment timeout.
+   *
+   * When progressing to BUILDING, the remote Depot build is also created.
+   *
+   * Only acts when the current status allows. Not idempotent.
+   *
+   * @param authenticatedEnv The environment which the deployment belongs to.
+   * @param friendlyId The friendly deployment ID.
+   * @param updates Optional deployment details to persist.
+   */
+  public progressDeployment(
+    authenticatedEnv: AuthenticatedEnvironment,
+    friendlyId: string,
+    updates: Partial<
+      Pick<WorkerDeployment, "contentHash" | "runtime"> & {
+        git: GitMeta;
+        buildServerMetadata: BuildServerMetadata;
+      }
+    >
+  ) {
+    const { buildServerMetadata: newBuildServerMetadata, ...restUpdates } = updates;
+
+    const validateDeployment = (
+      deployment: Pick<WorkerDeployment, "id" | "status"> & {
+        buildServerMetadata?: BuildServerMetadata;
+      }
+    ) => {
+      if (deployment.status !== "PENDING" && deployment.status !== "INSTALLING") {
+        logger.warn(
+          "Attempted progressing deployment that is not in PENDING or INSTALLING status",
+          {
+            deployment,
+          }
+        );
+        return errAsync({ type: "deployment_cannot_be_progressed" as const });
+      }
+
+      return okAsync(deployment);
+    };
+
+    const progressToInstalling = (
+      deployment: Pick<WorkerDeployment, "id"> & { buildServerMetadata?: BuildServerMetadata }
+    ) => {
+      const existingBuildServerMetadata = deployment.buildServerMetadata;
+
+      return fromPromise(
+        this._prisma.workerDeployment.updateMany({
+          where: { id: deployment.id, status: "PENDING" }, // status could've changed in the meantime, we're not locking the row
+          data: {
+            ...restUpdates,
+            ...(newBuildServerMetadata
+              ? {
+                  buildServerMetadata: {
+                    ...(existingBuildServerMetadata ?? {}),
+                    ...newBuildServerMetadata,
+                  },
+                }
+              : {}),
+            status: "INSTALLING",
+            startedAt: new Date(),
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).andThen((result) => {
+        if (result.count === 0) {
+          return errAsync({ type: "deployment_cannot_be_progressed" as const });
+        }
+        return okAsync({ id: deployment.id, status: "INSTALLING" as const });
+      });
+    };
+
+    const progressToBuilding = (
+      deployment: Pick<WorkerDeployment, "id"> & { buildServerMetadata?: BuildServerMetadata }
+    ) => {
+      const createRemoteBuildIfNeeded = deployment.buildServerMetadata?.isNativeBuild
+        ? okAsync(undefined)
+        : fromPromise(createRemoteImageBuild(authenticatedEnv.project), (error) => ({
+            type: "failed_to_create_remote_build" as const,
+            cause: error,
+          }));
+
+      const existingBuildServerMetadata = deployment.buildServerMetadata as
+        | BuildServerMetadata
+        | null
+        | undefined;
+
+      return createRemoteBuildIfNeeded
+        .andThen((externalBuildData) =>
+          fromPromise(
+            this._prisma.workerDeployment.updateMany({
+              where: { id: deployment.id, status: "INSTALLING" }, // status could've changed in the meantime, we're not locking the row
+              data: {
+                ...restUpdates,
+                ...(newBuildServerMetadata
+                  ? {
+                      buildServerMetadata: {
+                        ...(existingBuildServerMetadata ?? {}),
+                        ...newBuildServerMetadata,
+                      },
+                    }
+                  : {}),
+                ...(externalBuildData ? { externalBuildData } : {}),
+                status: "BUILDING",
+                installedAt: new Date(),
+              },
+            }),
+            (error) => ({
+              type: "other" as const,
+              cause: error,
+            })
+          )
+        )
+        .andThen((result) => {
+          if (result.count === 0) {
+            return errAsync({ type: "deployment_cannot_be_progressed" as const });
+          }
+          return okAsync({ id: deployment.id, status: "BUILDING" as const });
+        });
+    };
+
+    const extendTimeout = (deployment: Pick<WorkerDeployment, "id" | "status">) =>
+      fromPromise(
+        TimeoutDeploymentService.enqueue(
+          deployment.id,
+          deployment.status,
+          deployment.status === "INSTALLING"
+            ? "Installing dependencies timed out"
+            : "Building timed out",
+          new Date(Date.now() + env.DEPLOY_TIMEOUT_MS)
+        ),
+        (error) => ({
+          type: "failed_to_extend_deployment_timeout" as const,
+          cause: error,
+        })
+      );
+
+    return this.getDeployment(authenticatedEnv.projectId, friendlyId)
+      .andThen(validateDeployment)
+      .andThen((deployment) => {
+        if (deployment.status === "PENDING") {
+          return progressToInstalling(deployment);
+        }
+        return progressToBuilding(deployment);
+      })
+      .andThen(extendTimeout)
+      .map(() => undefined);
+  }
+
+  /**
+   * Cancels a deployment that is not yet in a final state.
+   *
+   * Only acts when the current status is not final. Not idempotent.
+   *
+   * @param authenticatedEnv The environment which the deployment belongs to.
+   * @param friendlyId The friendly deployment ID.
+   * @param data Cancelation reason.
+   */
+  public cancelDeployment(
+    authenticatedEnv: Pick<AuthenticatedEnvironment, "projectId">,
+    friendlyId: string,
+    data?: Partial<Pick<WorkerDeployment, "canceledReason">>
+  ) {
+    const validateDeployment = (
+      deployment: Pick<WorkerDeployment, "id" | "status" | "shortCode"> & {
+        environment: { project: { externalRef: string } };
+      }
+    ) => {
+      if (FINAL_DEPLOYMENT_STATUSES.includes(deployment.status)) {
+        logger.warn("Attempted cancelling deployment in a final state", {
+          deployment,
+        });
+        return errAsync({ type: "deployment_cannot_be_cancelled" as const });
+      }
+
+      return okAsync(deployment);
+    };
+
+    const cancelDeployment = (
+      deployment: Pick<WorkerDeployment, "id" | "shortCode"> & {
+        environment: { project: { externalRef: string } };
+      }
+    ) =>
+      fromPromise(
+        this._prisma.workerDeployment.updateMany({
+          where: {
+            id: deployment.id,
+            status: {
+              notIn: FINAL_DEPLOYMENT_STATUSES, // status could've changed in the meantime, we're not locking the row
+            },
+          },
+          data: {
+            status: "CANCELED",
+            canceledAt: new Date(),
+            canceledReason: data?.canceledReason,
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).andThen((result) => {
+        if (result.count === 0) {
+          return errAsync({ type: "deployment_cannot_be_cancelled" as const });
+        }
+        return okAsync({ deployment });
+      });
+
+    const deleteTimeout = (deployment: Pick<WorkerDeployment, "id">) =>
+      fromPromise(TimeoutDeploymentService.dequeue(deployment.id, this._prisma), (error) => ({
+        type: "failed_to_delete_deployment_timeout" as const,
+        cause: error,
+      }));
+
+    return this.getDeployment(authenticatedEnv.projectId, friendlyId)
+      .andThen(validateDeployment)
+      .andThen(cancelDeployment)
+      .andThen(({ deployment }) =>
+        this.appendToEventLog(deployment.environment.project, deployment, [
+          {
+            type: "finalized",
+            data: {
+              result: "canceled",
+              message: data?.canceledReason ?? undefined,
+            },
+          },
+        ])
+          .orElse((error) => {
+            logger.error("Failed to append event to deployment event log", { error });
+            return okAsync(deployment);
+          })
+          .map(() => deployment)
+      )
+      .andThen(deleteTimeout)
+      .map(() => undefined);
+  }
+
+  /**
+   * Generates registry credentials for a deployment. Returns an error if the deployment is in a final state.
+   *
+   * Uses the `platform` package, only available in cloud.
+   *
+   * @param authenticatedEnv The environment which the deployment belongs to.
+   * @param friendlyId The friendly deployment ID.
+   */
+  public generateRegistryCredentials(
+    authenticatedEnv: Pick<AuthenticatedEnvironment, "projectId">,
+    friendlyId: string
+  ) {
+    const validateDeployment = (
+      deployment: Pick<WorkerDeployment, "id" | "status" | "imageReference">
+    ) => {
+      if (FINAL_DEPLOYMENT_STATUSES.includes(deployment.status)) {
+        return errAsync({ type: "deployment_is_already_final" as const });
+      }
+      return okAsync(deployment);
+    };
+
+    const getDeploymentRegion = (deployment: Pick<WorkerDeployment, "imageReference">) => {
+      if (!deployment.imageReference) {
+        return errAsync({ type: "deployment_has_no_image_reference" as const });
+      }
+      if (!deployment.imageReference.includes("amazonaws.com")) {
+        return errAsync({ type: "registry_not_supported" as const });
+      }
+
+      // we should connect the deployment to a region more explicitly in the future
+      // for now we just use the image reference to determine the region
+      if (deployment.imageReference.includes("us-east-1")) {
+        return okAsync({ region: "us-east-1" as const });
+      }
+      if (deployment.imageReference.includes("eu-central-1")) {
+        return okAsync({ region: "eu-central-1" as const });
+      }
+
+      return errAsync({ type: "registry_region_not_supported" as const });
+    };
+
+    const generateCredentials = ({ region }: { region: "us-east-1" | "eu-central-1" }) =>
+      fromPromise(generateRegistryCredentials(authenticatedEnv.projectId, region), (error) => ({
+        type: "other" as const,
+        cause: error,
+      })).andThen((result) => {
+        if (!result || !result.success) {
+          return errAsync({ type: "missing_registry_credentials" as const });
+        }
+        return okAsync({
+          username: result.username,
+          password: result.password,
+          expiresAt: new Date(result.expiresAt),
+          repositoryUri: result.repositoryUri,
+        });
+      });
+
+    return this.getDeployment(authenticatedEnv.projectId, friendlyId)
+      .andThen(validateDeployment)
+      .andThen(getDeploymentRegion)
+      .andThen(generateCredentials);
+  }
+
+  public enqueueBuild(
+    authenticatedEnv: Pick<AuthenticatedEnvironment, "projectId">,
+    deployment: Pick<WorkerDeployment, "friendlyId">,
+    artifactKey: string,
+    options: {
+      skipPromotion?: boolean;
+      configFilePath?: string;
+    }
+  ) {
+    return fromPromise(
+      enqueueBuild(authenticatedEnv.projectId, deployment.friendlyId, artifactKey, options),
+      (error) => ({
+        type: "failed_to_enqueue_build" as const,
+        cause: error,
+      })
+    );
+  }
+
+  public appendToEventLog(
+    project: Pick<Project, "externalRef">,
+    deployment: Pick<WorkerDeployment, "shortCode">,
+    events: DeploymentEvent[]
+  ): ResultAsync<
+    undefined,
+    { type: "s2_is_disabled" } | { type: "failed_to_append_to_event_log"; cause: unknown }
+  > {
+    if (env.S2_ENABLED !== "1" || !s2) {
+      return errAsync({ type: "s2_is_disabled" as const });
+    }
+
+    const basin = s2.basin(env.S2_DEPLOYMENT_LOGS_BASIN_NAME);
+    const stream = basin.stream(
+      `projects/${project.externalRef}/deployments/${deployment.shortCode}`
+    );
+
+    return fromPromise(
+      stream.append(events.map((event) => AppendRecord.make(JSON.stringify(event)))),
+      (error) => ({
+        type: "failed_to_append_to_event_log" as const,
+        cause: error,
+      })
+    ).map(() => undefined);
+  }
+
+  public createEventStream(
+    project: Pick<Project, "externalRef">,
+    deployment: Pick<WorkerDeployment, "shortCode">
+  ): ResultAsync<
+    { basin: string; stream: string },
+    { type: "s2_is_disabled" } | { type: "failed_to_create_event_stream"; cause: unknown }
+  > {
+    if (env.S2_ENABLED !== "1" || !s2) {
+      return errAsync({ type: "s2_is_disabled" as const });
+    }
+    const basin = s2.basin(env.S2_DEPLOYMENT_LOGS_BASIN_NAME);
+
+    return fromPromise(
+      basin.streams.create({
+        stream: `projects/${project.externalRef}/deployments/${deployment.shortCode}`,
+      }),
+      (error) => ({
+        type: "failed_to_create_event_stream" as const,
+        cause: error,
+      })
+    ).map(({ name }) => ({
+      basin: basin.name,
+      stream: name,
+    }));
+  }
+
+  public getEventStreamAccessToken(
+    project: Pick<Project, "externalRef">
+  ): ResultAsync<string, { type: "s2_is_disabled" } | { type: "other"; cause: unknown }> {
+    if (env.S2_ENABLED !== "1" || !s2) {
+      return errAsync({ type: "s2_is_disabled" as const });
+    }
+    const basinName = env.S2_DEPLOYMENT_LOGS_BASIN_NAME;
+    const redisKey = `${S2_TOKEN_KEY_PREFIX}${project.externalRef}`;
+
+    const getTokenFromCache = () =>
+      fromPromise(s2TokenRedis.get(redisKey), (error) => ({
+        type: "other" as const,
+        cause: error,
+      })).andThen((cachedToken) => {
+        if (!cachedToken) {
+          return errAsync({ type: "s2_token_cache_not_found" as const });
+        }
+        return okAsync(cachedToken);
+      });
+
+    const issueS2Token = () =>
+      fromPromise(
+        s2.accessTokens.issue({
+          id: `${project.externalRef}-${new Date().getTime()}`,
+          expires_at: new Date(Date.now() + 60 * 60 * 1000).toISOString(), // 1 hour
+          scope: {
+            ops: ["read"],
+            basins: {
+              exact: basinName,
+            },
+            streams: {
+              prefix: `projects/${project.externalRef}/deployments/`,
+            },
+          },
+        }),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      ).map(({ access_token }) => access_token);
+
+    const cacheToken = (token: string) =>
+      fromPromise(
+        s2TokenRedis.setex(
+          redisKey,
+          59 * 60, // slightly shorter than the token validity period
+          token
+        ),
+        (error) => ({
+          type: "other" as const,
+          cause: error,
+        })
+      );
+
+    return getTokenFromCache().orElse(() =>
+      issueS2Token().andThen((token) =>
+        cacheToken(token)
+          .map(() => token)
+          .orElse((error) => {
+            logger.error("Failed to cache S2 token", { error });
+            return okAsync(token); // ignore the cache error
+          })
+      )
+    );
+  }
+
+  private getDeployment(projectId: string, friendlyId: string) {
+    return fromPromise(
+      this._prisma.workerDeployment.findFirst({
+        where: {
+          friendlyId,
+          projectId,
+        },
+        select: {
+          status: true,
+          id: true,
+          buildServerMetadata: true,
+          imageReference: true,
+          shortCode: true,
+          environment: {
+            include: {
+              project: {
+                select: {
+                  externalRef: true,
+                },
+              },
+            },
+          },
+        },
+      }),
+      (error) => ({
+        type: "other" as const,
+        cause: error,
+      })
+    )
+      .andThen((deployment) => {
+        if (!deployment) {
+          return errAsync({ type: "deployment_not_found" as const });
+        }
+        return okAsync(deployment);
+      })
+      .map((deployment) => ({
+        ...deployment,
+        buildServerMetadata: BuildServerMetadata.safeParse(deployment.buildServerMetadata).data,
+      }));
+  }
+}
diff --git a/apps/webapp/app/v3/services/deploymentIndexFailed.server.ts b/apps/webapp/app/v3/services/deploymentIndexFailed.server.ts
index fffab0af037..ad1ff097264 100644
--- a/apps/webapp/app/v3/services/deploymentIndexFailed.server.ts
+++ b/apps/webapp/app/v3/services/deploymentIndexFailed.server.ts
@@ -1,7 +1,8 @@
 import { PerformDeploymentAlertsService } from "./alerts/performDeploymentAlerts.server";
 import { BaseService } from "./baseService.server";
 import { logger } from "~/services/logger.server";
-import { WorkerDeploymentStatus } from "@trigger.dev/database";
+import { type WorkerDeploymentStatus } from "@trigger.dev/database";
+import { DeploymentService } from "./deployment.server";
 
 const FINAL_DEPLOYMENT_STATUSES: WorkerDeploymentStatus[] = [
   "CANCELED",
@@ -31,6 +32,13 @@ export class DeploymentIndexFailed extends BaseService {
         : {
             id: maybeFriendlyId,
           },
+      include: {
+        environment: {
+          include: {
+            project: true,
+          },
+        },
+      },
     });
 
     if (!deployment) {
@@ -66,6 +74,21 @@ export class DeploymentIndexFailed extends BaseService {
       },
     });
 
+    const deploymentService = new DeploymentService();
+    await deploymentService
+      .appendToEventLog(deployment.environment.project, failedDeployment, [
+        {
+          type: "finalized",
+          data: {
+            result: "failed",
+            message: error.message,
+          },
+        },
+      ])
+      .orTee((error) => {
+        logger.error("Failed to append failed deployment event to event log", { error });
+      });
+
     await PerformDeploymentAlertsService.enqueue(failedDeployment.id);
 
     return failedDeployment;
diff --git a/apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts b/apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts
index 931c8046148..7839b9e6e07 100644
--- a/apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts
+++ b/apps/webapp/app/v3/services/executeTasksWaitingForDeploy.ts
@@ -33,7 +33,7 @@ export class ExecuteTasksWaitingForDeployService extends BaseService {
 
     const maxCount = env.LEGACY_RUN_ENGINE_WAITING_FOR_DEPLOY_BATCH_SIZE;
 
-    const runsWaitingForDeploy = await this._prisma.taskRun.findMany({
+    const runsWaitingForDeploy = await this._replica.taskRun.findMany({
       where: {
         runtimeEnvironmentId: backgroundWorker.runtimeEnvironmentId,
         projectId: backgroundWorker.projectId,
diff --git a/apps/webapp/app/v3/services/expireEnqueuedRun.server.ts b/apps/webapp/app/v3/services/expireEnqueuedRun.server.ts
index 9e97795eaab..aa69f4c9f65 100644
--- a/apps/webapp/app/v3/services/expireEnqueuedRun.server.ts
+++ b/apps/webapp/app/v3/services/expireEnqueuedRun.server.ts
@@ -1,10 +1,10 @@
 import { PrismaClientOrTransaction } from "~/db.server";
 import { logger } from "~/services/logger.server";
 import { commonWorker } from "../commonWorker.server";
-import { eventRepository } from "../eventRepository.server";
 import { BaseService } from "./baseService.server";
 import { FinalizeTaskRunService } from "./finalizeTaskRun.server";
-import { getTaskEventStoreTableForRun } from "../taskEventStore.server";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { resolveEventRepositoryForStore } from "../eventRepository/index.server";
 
 export class ExpireEnqueuedRunService extends BaseService {
   public static async ack(runId: string, tx?: PrismaClientOrTransaction) {
@@ -78,28 +78,23 @@ export class ExpireEnqueuedRunService extends BaseService {
       },
     });
 
-    await eventRepository.completeEvent(
-      getTaskEventStoreTableForRun(run),
-      run.spanId,
-      run.createdAt,
-      run.completedAt ?? undefined,
-      {
-        endTime: new Date(),
-        attributes: {
-          isError: true,
-        },
-        events: [
-          {
-            name: "exception",
-            time: new Date(),
-            properties: {
-              exception: {
-                message: `Run expired because the TTL (${run.ttl}) was reached`,
-              },
-            },
-          },
-        ],
+    const eventRepository = resolveEventRepositoryForStore(run.taskEventStore);
+
+    if (run.ttl) {
+      const [completeExpiredRunEventError] = await tryCatch(
+        eventRepository.completeExpiredRunEvent({
+          run,
+          endTime: new Date(),
+          ttl: run.ttl,
+        })
+      );
+
+      if (completeExpiredRunEventError) {
+        logger.error("[ExpireEnqueuedRunService] Failed to complete expired run event", {
+          error: completeExpiredRunEventError,
+          runId: run.id,
+        });
       }
-    );
+    }
   }
 }
diff --git a/apps/webapp/app/v3/services/failDeployment.server.ts b/apps/webapp/app/v3/services/failDeployment.server.ts
index b486a0f67ec..b26cc77d4d2 100644
--- a/apps/webapp/app/v3/services/failDeployment.server.ts
+++ b/apps/webapp/app/v3/services/failDeployment.server.ts
@@ -1,11 +1,12 @@
 import { PerformDeploymentAlertsService } from "./alerts/performDeploymentAlerts.server";
 import { BaseService } from "./baseService.server";
 import { logger } from "~/services/logger.server";
-import { WorkerDeploymentStatus } from "@trigger.dev/database";
-import { FailDeploymentRequestBody } from "@trigger.dev/core/v3/schemas";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { type WorkerDeploymentStatus } from "@trigger.dev/database";
+import { type FailDeploymentRequestBody } from "@trigger.dev/core/v3/schemas";
+import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { DeploymentService } from "./deployment.server";
 
-const FINAL_DEPLOYMENT_STATUSES: WorkerDeploymentStatus[] = [
+export const FINAL_DEPLOYMENT_STATUSES: WorkerDeploymentStatus[] = [
   "CANCELED",
   "DEPLOYED",
   "FAILED",
@@ -50,6 +51,21 @@ export class FailDeploymentService extends BaseService {
       },
     });
 
+    const deploymentService = new DeploymentService();
+    await deploymentService
+      .appendToEventLog(authenticatedEnv.project, failedDeployment, [
+        {
+          type: "finalized",
+          data: {
+            result: "failed",
+            message: params.error.message,
+          },
+        },
+      ])
+      .orTee((error) => {
+        logger.error("Failed to append failed deployment event to event log", { error });
+      });
+
     await PerformDeploymentAlertsService.enqueue(failedDeployment.id);
 
     return failedDeployment;
diff --git a/apps/webapp/app/v3/services/finalizeDeployment.server.ts b/apps/webapp/app/v3/services/finalizeDeployment.server.ts
index 6e9b0c1da31..6cbfc323e7a 100644
--- a/apps/webapp/app/v3/services/finalizeDeployment.server.ts
+++ b/apps/webapp/app/v3/services/finalizeDeployment.server.ts
@@ -1,5 +1,5 @@
-import { FinalizeDeploymentRequestBody } from "@trigger.dev/core/v3/schemas";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import type { FinalizeDeploymentRequestBody } from "@trigger.dev/core/v3/schemas";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { socketIo } from "../handleSocketIo.server";
 import { updateEnvConcurrencyLimits } from "../runQueue.server";
@@ -9,6 +9,9 @@ import { ChangeCurrentDeploymentService } from "./changeCurrentDeployment.server
 import { projectPubSub } from "./projectPubSub.server";
 import { FailDeploymentService } from "./failDeployment.server";
 import { TimeoutDeploymentService } from "./timeoutDeployment.server";
+import { DeploymentService } from "./deployment.server";
+import { engine } from "../runEngine.server";
+import { tryCatch } from "@trigger.dev/core";
 
 export class FinalizeDeploymentService extends BaseService {
   public async call(
@@ -75,6 +78,20 @@ export class FinalizeDeploymentService extends BaseService {
       },
     });
 
+    const deploymentService = new DeploymentService();
+    await deploymentService
+      .appendToEventLog(authenticatedEnv.project, finalizedDeployment, [
+        {
+          type: "finalized",
+          data: {
+            result: "succeeded",
+          },
+        },
+      ])
+      .orTee((error) => {
+        logger.error("Failed to append finalized deployment event to event log", { error });
+      });
+
     await TimeoutDeploymentService.dequeue(deployment.id, this._prisma);
 
     if (typeof body.skipPromotion === "undefined" || !body.skipPromotion) {
@@ -116,6 +133,18 @@ export class FinalizeDeploymentService extends BaseService {
       });
     }
 
+    if (deployment.worker.engine === "V2") {
+      const [schedulePendingVersionsError] = await tryCatch(
+        engine.scheduleEnqueueRunsForBackgroundWorker(deployment.worker.id)
+      );
+
+      if (schedulePendingVersionsError) {
+        logger.error("Error scheduling pending versions", {
+          error: schedulePendingVersionsError,
+        });
+      }
+    }
+
     await PerformDeploymentAlertsService.enqueue(deployment.id);
 
     return finalizedDeployment;
diff --git a/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts b/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts
index e15c3d2c453..2ad2b7b8258 100644
--- a/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts
+++ b/apps/webapp/app/v3/services/finalizeDeploymentV2.server.ts
@@ -1,5 +1,8 @@
-import { ExternalBuildData, FinalizeDeploymentRequestBody } from "@trigger.dev/core/v3/schemas";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import {
+  ExternalBuildData,
+  type FinalizeDeploymentRequestBody,
+} from "@trigger.dev/core/v3/schemas";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { BaseService, ServiceValidationError } from "./baseService.server";
 import { join } from "node:path";
@@ -11,6 +14,7 @@ import { FinalizeDeploymentService } from "./finalizeDeployment.server";
 import { remoteBuildsEnabled } from "../remoteImageBuilder.server";
 import { getEcrAuthToken, isEcrRegistry } from "../getDeploymentImageRef.server";
 import { tryCatch } from "@trigger.dev/core";
+import { getRegistryConfig, type RegistryConfig } from "../registryConfig.server";
 
 export class FinalizeDeploymentV2Service extends BaseService {
   public async call(
@@ -37,6 +41,7 @@ export class FinalizeDeploymentV2Service extends BaseService {
         externalBuildData: true,
         environment: true,
         imageReference: true,
+        type: true,
         worker: {
           select: {
             project: true,
@@ -66,6 +71,15 @@ export class FinalizeDeploymentV2Service extends BaseService {
       throw new ServiceValidationError("Worker deployment is not in DEPLOYING status");
     }
 
+    const finalizeService = new FinalizeDeploymentService();
+
+    if (body.skipPushToRegistry) {
+      logger.debug("Skipping push to registry during deployment finalization", {
+        deployment,
+      });
+      return await finalizeService.call(authenticatedEnv, id, body);
+    }
+
     const externalBuildData = deployment.externalBuildData
       ? ExternalBuildData.safeParse(deployment.externalBuildData)
       : undefined;
@@ -78,10 +92,13 @@ export class FinalizeDeploymentV2Service extends BaseService {
       throw new ServiceValidationError("External build data is invalid");
     }
 
+    const isV4Deployment = deployment.type === "MANAGED";
+    const registryConfig = getRegistryConfig(isV4Deployment);
+
+    // For non-ECR registries, username and password are required upfront
     if (
-      !env.DEPLOY_REGISTRY_HOST ||
-      !env.DEPLOY_REGISTRY_USERNAME ||
-      !env.DEPLOY_REGISTRY_PASSWORD
+      !isEcrRegistry(registryConfig.host) &&
+      (!registryConfig.username || !registryConfig.password)
     ) {
       throw new ServiceValidationError("Missing deployment registry credentials");
     }
@@ -104,12 +121,7 @@ export class FinalizeDeploymentV2Service extends BaseService {
           orgToken: env.DEPOT_TOKEN,
           projectId: externalBuildData.data.projectId,
         },
-        registry: {
-          host: env.DEPLOY_REGISTRY_HOST,
-          namespace: env.DEPLOY_REGISTRY_NAMESPACE,
-          username: env.DEPLOY_REGISTRY_USERNAME,
-          password: env.DEPLOY_REGISTRY_PASSWORD,
-        },
+        registry: registryConfig,
         deployment: {
           version: deployment.version,
           environmentSlug: deployment.environment.slug,
@@ -131,7 +143,6 @@ export class FinalizeDeploymentV2Service extends BaseService {
       pushedImage: pushResult.image,
     });
 
-    const finalizeService = new FinalizeDeploymentService();
     const finalizedDeployment = await finalizeService.call(authenticatedEnv, id, body);
 
     return finalizedDeployment;
@@ -144,12 +155,7 @@ type ExecutePushToRegistryOptions = {
     orgToken: string;
     projectId: string;
   };
-  registry: {
-    host: string;
-    namespace: string;
-    username: string;
-    password: string;
-  };
+  registry: RegistryConfig;
   deployment: {
     version: string;
     environmentSlug: string;
@@ -175,12 +181,7 @@ async function executePushToRegistry(
   writer?: WritableStreamDefaultWriter
 ): Promise<ExecutePushResult> {
   // Step 1: We need to "login" to the registry
-  const [loginError, configDir] = await tryCatch(
-    ensureLoggedIntoDockerRegistry(registry.host, {
-      username: registry.username,
-      password: registry.password,
-    })
-  );
+  const [loginError, configDir] = await tryCatch(ensureLoggedIntoDockerRegistry(registry));
 
   if (loginError) {
     logger.error("Failed to login to registry", {
@@ -260,29 +261,35 @@ async function executePushToRegistry(
   }
 }
 
-async function ensureLoggedIntoDockerRegistry(
-  registryHost: string,
-  auth: { username: string; password: string } | undefined = undefined
-) {
+async function ensureLoggedIntoDockerRegistry(registryConfig: RegistryConfig) {
   const tmpDir = await createTempDir();
   const dockerConfigPath = join(tmpDir, "config.json");
 
+  let auth: { username: string; password: string };
+
   // If this is an ECR registry, get fresh credentials
-  if (isEcrRegistry(registryHost)) {
+  if (isEcrRegistry(registryConfig.host)) {
     auth = await getEcrAuthToken({
-      registryHost,
-      assumeRole: {
-        roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
-        externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
-      },
+      registryHost: registryConfig.host,
+      assumeRole: registryConfig.ecrAssumeRoleArn
+        ? {
+            roleArn: registryConfig.ecrAssumeRoleArn,
+            externalId: registryConfig.ecrAssumeRoleExternalId,
+          }
+        : undefined,
     });
-  } else if (!auth) {
+  } else if (!registryConfig.username || !registryConfig.password) {
     throw new Error("Authentication required for non-ECR registry");
+  } else {
+    auth = {
+      username: registryConfig.username,
+      password: registryConfig.password,
+    };
   }
 
   await writeJSONFile(dockerConfigPath, {
     auths: {
-      [registryHost]: {
+      [registryConfig.host]: {
         auth: Buffer.from(`${auth.username}:${auth.password}`).toString("base64"),
       },
     },
diff --git a/apps/webapp/app/v3/services/finalizeTaskRun.server.ts b/apps/webapp/app/v3/services/finalizeTaskRun.server.ts
index 796a10a3b06..ab51df5de60 100644
--- a/apps/webapp/app/v3/services/finalizeTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/finalizeTaskRun.server.ts
@@ -150,7 +150,7 @@ export class FinalizeTaskRunService extends BaseService {
     }
 
     if (isFatalRunStatus(run.status)) {
-      logger.error("FinalizeTaskRunService: Fatal status", { runId: run.id, status: run.status });
+      logger.warn("FinalizeTaskRunService: Fatal status", { runId: run.id, status: run.status });
 
       const extendedRun = await this._prisma.taskRun.findFirst({
         where: { id: run.id },
@@ -170,7 +170,7 @@ export class FinalizeTaskRunService extends BaseService {
       });
 
       if (extendedRun && extendedRun.runtimeEnvironment.type !== "DEVELOPMENT") {
-        logger.error("FinalizeTaskRunService: Fatal status, requesting worker exit", {
+        logger.warn("FinalizeTaskRunService: Fatal status, requesting worker exit", {
           runId: run.id,
           status: run.status,
         });
@@ -305,9 +305,10 @@ export class FinalizeTaskRunService extends BaseService {
     });
 
     if (!run.lockedById) {
-      logger.error(
+      // This happens when a run is expired or was cancelled before an attempt, it's not a problem
+      logger.info(
         "FinalizeTaskRunService: No lockedById, so can't get the BackgroundWorkerTask. Not creating an attempt.",
-        { runId: run.id }
+        { runId: run.id, status: run.status }
       );
       return;
     }
diff --git a/apps/webapp/app/v3/services/initializeDeployment.server.ts b/apps/webapp/app/v3/services/initializeDeployment.server.ts
index ea4fc65835d..951db37d8bd 100644
--- a/apps/webapp/app/v3/services/initializeDeployment.server.ts
+++ b/apps/webapp/app/v3/services/initializeDeployment.server.ts
@@ -1,4 +1,8 @@
-import { type InitializeDeploymentRequestBody } from "@trigger.dev/core/v3";
+import {
+  BuildServerMetadata,
+  type InitializeDeploymentRequestBody,
+  type ExternalBuildData,
+} from "@trigger.dev/core/v3";
 import { customAlphabet } from "nanoid";
 import { env } from "~/env.server";
 import { type AuthenticatedEnvironment } from "~/services/apiAuth.server";
@@ -10,6 +14,9 @@ import { BaseService, ServiceValidationError } from "./baseService.server";
 import { TimeoutDeploymentService } from "./timeoutDeployment.server";
 import { getDeploymentImageRef } from "../getDeploymentImageRef.server";
 import { tryCatch } from "@trigger.dev/core";
+import { getRegistryConfig } from "../registryConfig.server";
+import { DeploymentService } from "./deployment.server";
+import { errAsync } from "neverthrow";
 
 const nanoid = customAlphabet("1234567890abcdefghijklmnopqrstuvwxyz", 8);
 
@@ -18,7 +25,40 @@ export class InitializeDeploymentService extends BaseService {
     environment: AuthenticatedEnvironment,
     payload: InitializeDeploymentRequestBody
   ) {
-    return this.traceWithEnv("call", environment, async (span) => {
+    return this.traceWithEnv("call", environment, async () => {
+      if (payload.gitMeta?.commitSha?.startsWith("deployment_")) {
+        // When we introduced automatic deployments via the build server, we slightly changed the deployment flow
+        // mainly in the initialization and starting step: now deployments are first initialized in the `PENDING` status
+        // and updated to `BUILDING` once the build server dequeues the build job.
+        // Newer versions of the `deploy` command in the CLI will automatically attach to the existing deployment
+        // and continue with the build process. For older versions, we can't change the command's client-side behavior,
+        // so we need to handle this case here in the initialization endpoint. As we control the env variables which
+        // the git meta is extracted from in the build server, we can use those to pass the existing deployment ID
+        // to this endpoint. This doesn't affect the git meta on the deployment as it is set prior to this step using the
+        // /start endpoint. It's a rather hacky solution, but it will do for now as it enables us to avoid degrading the
+        // build server experience for users with older CLI versions. We'll eventually be able to remove this workaround
+        // once we stop supporting 3.x CLI versions.
+
+        const existingDeploymentId = payload.gitMeta.commitSha;
+        const existingDeployment = await this._prisma.workerDeployment.findFirst({
+          where: {
+            environmentId: environment.id,
+            friendlyId: existingDeploymentId,
+          },
+        });
+
+        if (!existingDeployment) {
+          throw new ServiceValidationError(
+            "Existing deployment not found during deployment initialization"
+          );
+        }
+
+        return {
+          deployment: existingDeployment,
+          imageRef: existingDeployment.imageReference ?? "",
+        };
+      }
+
       if (payload.type === "UNMANAGED") {
         throw new ServiceValidationError("UNMANAGED deployments are not supported");
       }
@@ -53,8 +93,18 @@ export class InitializeDeploymentService extends BaseService {
         );
       }
 
-      // Try and create a depot build and get back the external build data
-      const externalBuildData = await createRemoteImageBuild(environment.project);
+      // For the `PENDING` initial status, defer the creation of the Depot build until the deployment is started to avoid token expiration issues.
+      // For local and native builds we don't need to generate the Depot tokens. We still need to create an empty object sadly due to a bug in older CLI versions.
+      const generateExternalBuildToken =
+        payload.initialStatus === "PENDING" || payload.isNativeBuild || payload.isLocalBuild;
+
+      const externalBuildData = generateExternalBuildToken
+        ? ({
+            projectId: "-",
+            buildToken: "-",
+            buildId: "-",
+          } satisfies ExternalBuildData)
+        : await createRemoteImageBuild(environment.project);
 
       const triggeredBy = payload.userId
         ? await this._prisma.user.findFirst({
@@ -69,7 +119,11 @@ export class InitializeDeploymentService extends BaseService {
           })
         : undefined;
 
-      // If DEPLOY_IMAGE_OVERRIDE is set, use it instead of generating an image reference
+      const isV4Deployment = payload.type === "MANAGED";
+      const registryConfig = getRegistryConfig(isV4Deployment);
+
+      const deploymentShortCode = nanoid(8);
+
       let imageRef: string;
       let isEcr = false;
       let repoCreated = false;
@@ -85,16 +139,11 @@ export class InitializeDeploymentService extends BaseService {
       } else {
         const [imageRefError, imageRefResult] = await tryCatch(
           getDeploymentImageRef({
-            host: env.DEPLOY_REGISTRY_HOST,
-            namespace: env.DEPLOY_REGISTRY_NAMESPACE,
+            registry: registryConfig,
             projectRef: environment.project.externalRef,
             nextVersion,
-            environmentSlug: environment.slug,
-            registryTags: env.DEPLOY_REGISTRY_ECR_TAGS,
-            assumeRole: {
-              roleArn: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN,
-              externalId: env.DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID,
-            },
+            environmentType: environment.type,
+            deploymentShortCode,
           })
         );
 
@@ -115,6 +164,44 @@ export class InitializeDeploymentService extends BaseService {
         repoCreated = imageRefResult.repoCreated;
       }
 
+      // We keep using `BUILDING` as the initial status if not explicitly set
+      // to avoid changing the behavior for deployments not created in the build server.
+      // Native builds always start in the `PENDING` status.
+      const initialStatus =
+        payload.initialStatus ?? (payload.isNativeBuild ? "PENDING" : "BUILDING");
+
+      const deploymentService = new DeploymentService();
+      const s2StreamOrFail = await deploymentService
+        .createEventStream(environment.project, { shortCode: deploymentShortCode })
+        .andThen(({ basin, stream }) =>
+          deploymentService.getEventStreamAccessToken(environment.project).map((accessToken) => ({
+            basin,
+            stream,
+            accessToken,
+          }))
+        );
+
+      if (s2StreamOrFail.isErr()) {
+        logger.error(
+          "Failed to create S2 event stream on deployment initialization, continuing without logs stream",
+          {
+            environmentId: environment.id,
+            projectId: environment.projectId,
+            error: s2StreamOrFail.error,
+          }
+        );
+      }
+
+      const eventStream = s2StreamOrFail.isOk()
+        ? {
+            s2: {
+              basin: s2StreamOrFail.value.basin,
+              stream: s2StreamOrFail.value.stream,
+              accessToken: s2StreamOrFail.value.accessToken,
+            },
+          }
+        : undefined;
+
       logger.debug("Creating deployment", {
         environmentId: environment.id,
         projectId: environment.projectId,
@@ -124,37 +211,100 @@ export class InitializeDeploymentService extends BaseService {
         imageRef,
         isEcr,
         repoCreated,
+        initialStatus,
+        artifactKey: payload.isNativeBuild ? payload.artifactKey : undefined,
+        isNativeBuild: payload.isNativeBuild,
       });
 
+      const buildServerMetadata: BuildServerMetadata | undefined =
+        payload.isNativeBuild || payload.buildId
+          ? {
+              buildId: payload.buildId,
+              ...(payload.isNativeBuild
+                ? {
+                    isNativeBuild: payload.isNativeBuild,
+                    artifactKey: payload.artifactKey,
+                    skipPromotion: payload.skipPromotion,
+                    configFilePath: payload.configFilePath,
+                    skipEnqueue: payload.skipEnqueue,
+                  }
+                : {}),
+            }
+          : undefined;
+
       const deployment = await this._prisma.workerDeployment.create({
         data: {
           friendlyId: generateFriendlyId("deployment"),
           contentHash: payload.contentHash,
-          shortCode: nanoid(8),
+          shortCode: deploymentShortCode,
           version: nextVersion,
-          status: "BUILDING",
+          status: initialStatus,
           environmentId: environment.id,
           projectId: environment.projectId,
           externalBuildData,
+          buildServerMetadata,
           triggeredById: triggeredBy?.id,
           type: payload.type,
           imageReference: imageRef,
           imagePlatform: env.DEPLOY_IMAGE_PLATFORM,
           git: payload.gitMeta ?? undefined,
+          commitSHA: payload.gitMeta?.commitSha ?? undefined,
           runtime: payload.runtime ?? undefined,
+          triggeredVia: payload.triggeredVia ?? undefined,
+          startedAt: initialStatus === "BUILDING" ? new Date() : undefined,
         },
       });
 
+      const timeoutMs =
+        deployment.status === "PENDING" ? env.DEPLOY_QUEUE_TIMEOUT_MS : env.DEPLOY_TIMEOUT_MS;
+
       await TimeoutDeploymentService.enqueue(
         deployment.id,
-        "BUILDING",
+        deployment.status,
         "Building timed out",
-        new Date(Date.now() + env.DEPLOY_TIMEOUT_MS)
+        new Date(Date.now() + timeoutMs)
       );
 
+      // For github integration there is no artifactKey, hence we skip it here
+      if (payload.isNativeBuild && payload.artifactKey && !payload.skipEnqueue) {
+        const result = await deploymentService
+          .enqueueBuild(environment, deployment, payload.artifactKey, {
+            skipPromotion: payload.skipPromotion,
+            configFilePath: payload.configFilePath,
+          })
+          .orElse((error) => {
+            logger.error("Failed to enqueue build", {
+              environmentId: environment.id,
+              projectId: environment.projectId,
+              deploymentId: deployment.id,
+              error: error.cause,
+            });
+
+            return deploymentService
+              .cancelDeployment(environment, deployment.friendlyId, {
+                canceledReason: "Failed to enqueue build, please try again shortly.",
+              })
+              .orTee((cancelError) =>
+                logger.error("Failed to cancel deployment after failed build enqueue", {
+                  environmentId: environment.id,
+                  projectId: environment.projectId,
+                  deploymentId: deployment.id,
+                  error: cancelError,
+                })
+              )
+              .andThen(() => errAsync(error))
+              .orElse(() => errAsync(error));
+          });
+
+        if (result.isErr()) {
+          throw Error("Failed to enqueue build");
+        }
+      }
+
       return {
         deployment,
         imageRef,
+        eventStream,
       };
     });
   }
diff --git a/apps/webapp/app/v3/services/pauseEnvironment.server.ts b/apps/webapp/app/v3/services/pauseEnvironment.server.ts
index de0216989d4..99e588ca7df 100644
--- a/apps/webapp/app/v3/services/pauseEnvironment.server.ts
+++ b/apps/webapp/app/v3/services/pauseEnvironment.server.ts
@@ -27,6 +27,25 @@ export class PauseEnvironmentService extends WithRunEngine {
     action: PauseStatus
   ): Promise<PauseEnvironmentResult> {
     try {
+      const org = await this._prisma.organization.findFirst({
+        where: {
+          id: environment.organizationId,
+        },
+        select: {
+          runsEnabled: true,
+        },
+      });
+
+      if (!org) {
+        throw new Error("Organization not found");
+      }
+
+      if (!org.runsEnabled && action === "resumed") {
+        throw new Error(
+          "Runs are disabled for this organization. Your free plan has probably been exceeded. If not please contact support."
+        );
+      }
+
       await this._prisma.runtimeEnvironment.update({
         where: {
           id: environment.id,
diff --git a/apps/webapp/app/v3/services/pauseQueue.server.ts b/apps/webapp/app/v3/services/pauseQueue.server.ts
index f4e18eab4b6..b5ba5f399ad 100644
--- a/apps/webapp/app/v3/services/pauseQueue.server.ts
+++ b/apps/webapp/app/v3/services/pauseQueue.server.ts
@@ -88,6 +88,9 @@ export class PauseQueueService extends BaseService {
           running: results[1]?.[updatedQueue.name] ?? 0,
           queued: results[0]?.[updatedQueue.name] ?? 0,
           concurrencyLimit: updatedQueue.concurrencyLimit ?? null,
+          concurrencyLimitBase: updatedQueue.concurrencyLimitBase ?? null,
+          concurrencyLimitOverriddenAt: updatedQueue.concurrencyLimitOverriddenAt ?? null,
+          concurrencyLimitOverriddenBy: queue.concurrencyLimitOverriddenBy ?? null,
           paused: updatedQueue.paused,
         }),
       };
diff --git a/apps/webapp/app/v3/services/replayTaskRun.server.ts b/apps/webapp/app/v3/services/replayTaskRun.server.ts
index e29b5d423ab..a5018f51c57 100644
--- a/apps/webapp/app/v3/services/replayTaskRun.server.ts
+++ b/apps/webapp/app/v3/services/replayTaskRun.server.ts
@@ -11,6 +11,7 @@ import { BaseService } from "./baseService.server";
 import { OutOfEntitlementError, TriggerTaskService } from "./triggerTask.server";
 import { type RunOptionsData } from "../testTask";
 import { replaceSuperJsonPayload } from "@trigger.dev/core/v3/utils/ioSerialization";
+import { determineRealtimeStreamsVersion } from "~/services/realtime/v1StreamsGlobal.server";
 
 type OverrideOptions = {
   environmentId?: string;
@@ -37,6 +38,16 @@ export class ReplayTaskRunService extends BaseService {
       taskRunFriendlyId: existingTaskRun.friendlyId,
     });
 
+    const existingEnvironment = await this._prisma.runtimeEnvironment.findFirstOrThrow({
+      where: {
+        id: existingTaskRun.runtimeEnvironmentId,
+      },
+      select: {
+        id: true,
+        type: true,
+      },
+    });
+
     const payloadPacket = await this.overrideExistingPayloadPacket(
       existingTaskRun,
       overrideOptions.payload
@@ -48,6 +59,12 @@ export class ReplayTaskRunService extends BaseService {
     const payloadType = payloadPacket.dataType;
     const metadata = overrideOptions.metadata ?? (await this.getExistingMetadata(existingTaskRun));
     const tags = overrideOptions.tags ?? existingTaskRun.runTags;
+    // Only use the region from the existing run if V2 engine and neither environment is dev
+    const ignoreRegion =
+      existingTaskRun.engine === "V1" ||
+      existingEnvironment.type === "DEVELOPMENT" ||
+      authenticatedEnvironment.type === "DEVELOPMENT";
+    const region = ignoreRegion ? undefined : overrideOptions.region ?? existingTaskRun.workerQueue;
 
     try {
       const taskQueue = await this._prisma.taskQueue.findFirst({
@@ -92,6 +109,8 @@ export class ReplayTaskRunService extends BaseService {
             lockToVersion:
               overrideOptions.version === "latest" ? undefined : overrideOptions.version,
             bulkActionId: overrideOptions?.bulkActionId,
+            region,
+            priority: overrideOptions.prioritySeconds,
           },
         },
         {
@@ -101,6 +120,9 @@ export class ReplayTaskRunService extends BaseService {
           traceContext: {
             traceparent: `00-${existingTaskRun.traceId}-${existingTaskRun.spanId}-01`,
           },
+          realtimeStreamsVersion: determineRealtimeStreamsVersion(
+            existingTaskRun.realtimeStreamsVersion
+          ),
         }
       );
 
diff --git a/apps/webapp/app/v3/services/resetIdempotencyKey.server.ts b/apps/webapp/app/v3/services/resetIdempotencyKey.server.ts
new file mode 100644
index 00000000000..95684999303
--- /dev/null
+++ b/apps/webapp/app/v3/services/resetIdempotencyKey.server.ts
@@ -0,0 +1,36 @@
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import { BaseService, ServiceValidationError } from "./baseService.server";
+import { logger } from "~/services/logger.server";
+
+export class ResetIdempotencyKeyService extends BaseService {
+  public async call(
+    idempotencyKey: string,
+    taskIdentifier: string,
+    authenticatedEnv: AuthenticatedEnvironment
+  ): Promise<{ id: string }> {
+    const { count } = await this._prisma.taskRun.updateMany({
+      where: {
+        idempotencyKey,
+        taskIdentifier,
+        runtimeEnvironmentId: authenticatedEnv.id,
+      },
+      data: {
+        idempotencyKey: null,
+        idempotencyKeyExpiresAt: null,
+      },
+    });
+
+    if (count === 0) {
+      throw new ServiceValidationError(
+        `No runs found with idempotency key: ${idempotencyKey} and task: ${taskIdentifier}`,
+        404
+      );
+    }
+
+    logger.info(
+      `Reset idempotency key: ${idempotencyKey} for task: ${taskIdentifier} in env: ${authenticatedEnv.id}, affected ${count} run(s)`
+    );
+
+    return { id: idempotencyKey };
+  }
+}
diff --git a/apps/webapp/app/v3/services/setConcurrencyAddOn.server.ts b/apps/webapp/app/v3/services/setConcurrencyAddOn.server.ts
new file mode 100644
index 00000000000..66ac7cdf19c
--- /dev/null
+++ b/apps/webapp/app/v3/services/setConcurrencyAddOn.server.ts
@@ -0,0 +1,143 @@
+import { ManageConcurrencyPresenter } from "~/presenters/v3/ManageConcurrencyPresenter.server";
+import { BaseService } from "./baseService.server";
+import { tryCatch } from "@trigger.dev/core";
+import { setConcurrencyAddOn } from "~/services/platform.v3.server";
+import assertNever from "assert-never";
+import { sendToPlain } from "~/utils/plain.server";
+import { uiComponent } from "@team-plain/typescript-sdk";
+
+type Input = {
+  userId: string;
+  projectId: string;
+  organizationId: string;
+  action: "purchase" | "quota-increase";
+  amount: number;
+};
+
+type Result =
+  | {
+      success: true;
+    }
+  | {
+      success: false;
+      error: string;
+    };
+
+export class SetConcurrencyAddOnService extends BaseService {
+  async call({ userId, projectId, organizationId, action, amount }: Input): Promise<Result> {
+    // fetch the current concurrency
+    const presenter = new ManageConcurrencyPresenter(this._prisma, this._replica);
+    const [error, result] = await tryCatch(
+      presenter.call({
+        userId,
+        projectId,
+        organizationId,
+      })
+    );
+
+    if (error) {
+      return {
+        success: false,
+        error: "Unknown error",
+      };
+    }
+
+    const currentConcurrency = result.extraConcurrency;
+    const totalExtraConcurrency = amount;
+
+    switch (action) {
+      case "purchase": {
+        const updatedConcurrency = await setConcurrencyAddOn(organizationId, totalExtraConcurrency);
+        if (!updatedConcurrency) {
+          return {
+            success: false,
+            error: "Failed to update concurrency",
+          };
+        }
+
+        switch (updatedConcurrency?.result) {
+          case "success": {
+            return {
+              success: true,
+            };
+          }
+          case "error": {
+            return {
+              success: false,
+              error: updatedConcurrency.error,
+            };
+          }
+          case "max_quota_reached": {
+            return {
+              success: false,
+              error: `You can't purchase more than ${updatedConcurrency.maxQuota} concurrency without requesting an increase.`,
+            };
+          }
+          default: {
+            return {
+              success: false,
+              error: "Failed to update concurrency, unknown result.",
+            };
+          }
+        }
+      }
+      case "quota-increase": {
+        const user = await this._replica.user.findFirst({
+          where: { id: userId },
+        });
+
+        if (!user) {
+          return {
+            success: false,
+            error: "No matching user found.",
+          };
+        }
+
+        const organization = await this._replica.organization.findFirst({
+          select: {
+            title: true,
+          },
+          where: { id: organizationId },
+        });
+
+        const [error, result] = await tryCatch(
+          sendToPlain({
+            userId,
+            email: user.email,
+            name: user.name ?? user.displayName ?? user.email,
+            title: `Concurrency quota request: ${totalExtraConcurrency}`,
+            components: [
+              uiComponent.text({
+                text: `Org: ${organization?.title} (${organizationId})`,
+              }),
+              uiComponent.divider({ spacingSize: "M" }),
+              uiComponent.text({
+                text: `Total concurrency (set this): ${totalExtraConcurrency}`,
+              }),
+              uiComponent.text({
+                text: `Current extra concurrency: ${currentConcurrency}`,
+              }),
+              uiComponent.text({
+                text: `Amount requested: ${amount}`,
+              }),
+            ],
+          })
+        );
+
+        if (error) {
+          return {
+            success: false,
+            error: error.message,
+          };
+        }
+
+        return {
+          success: true,
+        };
+      }
+      default: {
+        assertNever(action);
+      }
+    }
+  }
+}
diff --git a/apps/webapp/app/v3/services/setDefaultRegion.server.ts b/apps/webapp/app/v3/services/setDefaultRegion.server.ts
new file mode 100644
index 00000000000..cada8194527
--- /dev/null
+++ b/apps/webapp/app/v3/services/setDefaultRegion.server.ts
@@ -0,0 +1,58 @@
+import { BaseService, ServiceValidationError } from "./baseService.server";
+
+export class SetDefaultRegionService extends BaseService {
+  public async call({
+    projectId,
+    regionId,
+    isAdmin = false,
+  }: {
+    projectId: string;
+    regionId: string;
+    isAdmin?: boolean;
+  }) {
+    const workerGroup = await this._prisma.workerInstanceGroup.findFirst({
+      where: {
+        id: regionId,
+      },
+    });
+
+    if (!workerGroup) {
+      throw new ServiceValidationError("Region not found");
+    }
+
+    const project = await this._prisma.project.findFirst({
+      where: {
+        id: projectId,
+      },
+    });
+
+    if (!project) {
+      throw new ServiceValidationError("Project not found");
+    }
+
+    // If their project is restricted, only allow them to set default regions that are allowed
+    if (!isAdmin) {
+      if (project.allowedWorkerQueues.length > 0) {
+        if (!project.allowedWorkerQueues.includes(workerGroup.masterQueue)) {
+          throw new ServiceValidationError("You're not allowed to set this region as default");
+        }
+      } else if (workerGroup.hidden) {
+        throw new ServiceValidationError("This region is not available to you");
+      }
+    }
+
+    await this._prisma.project.update({
+      where: {
+        id: projectId,
+      },
+      data: {
+        defaultWorkerGroupId: regionId,
+      },
+    });
+
+    return {
+      id: workerGroup.id,
+      name: workerGroup.name,
+    };
+  }
+}
diff --git a/apps/webapp/app/v3/services/testTask.server.ts b/apps/webapp/app/v3/services/testTask.server.ts
index e2e52078b4e..0b64367f600 100644
--- a/apps/webapp/app/v3/services/testTask.server.ts
+++ b/apps/webapp/app/v3/services/testTask.server.ts
@@ -28,7 +28,9 @@ export class TestTaskService extends BaseService {
             maxDuration: data.maxDurationSeconds,
             tags: data.tags,
             machine: data.machine,
+            region: data.region,
             lockToVersion: data.version === "latest" ? undefined : data.version,
+            priority: data.prioritySeconds,
           },
         });
 
@@ -65,7 +67,9 @@ export class TestTaskService extends BaseService {
               maxDuration: data.maxDurationSeconds,
               tags: data.tags,
               machine: data.machine,
+              region: data.region,
               lockToVersion: data.version === "latest" ? undefined : data.version,
+              priority: data.prioritySeconds,
             },
           },
           { customIcon: "scheduled" }
diff --git a/apps/webapp/app/v3/services/timeoutDeployment.server.ts b/apps/webapp/app/v3/services/timeoutDeployment.server.ts
index 5cf69f76e45..efb2569a94e 100644
--- a/apps/webapp/app/v3/services/timeoutDeployment.server.ts
+++ b/apps/webapp/app/v3/services/timeoutDeployment.server.ts
@@ -2,8 +2,9 @@ import { logger } from "~/services/logger.server";
 import { BaseService } from "./baseService.server";
 import { commonWorker } from "../commonWorker.server";
 import { PerformDeploymentAlertsService } from "./alerts/performDeploymentAlerts.server";
-import { PrismaClientOrTransaction } from "~/db.server";
+import { type PrismaClientOrTransaction } from "~/db.server";
 import { workerQueue } from "~/services/worker.server";
+import { DeploymentService } from "./deployment.server";
 
 export class TimeoutDeploymentService extends BaseService {
   public async call(id: string, fromStatus: string, errorMessage: string) {
@@ -12,7 +13,11 @@ export class TimeoutDeploymentService extends BaseService {
         id,
       },
       include: {
-        environment: true,
+        environment: {
+          include: {
+            project: true,
+          },
+        },
       },
     });
 
@@ -29,7 +34,7 @@ export class TimeoutDeploymentService extends BaseService {
       return;
     }
 
-    await this._prisma.workerDeployment.update({
+    const timedOutDeployment = await this._prisma.workerDeployment.update({
       where: {
         id: deployment.id,
       },
@@ -40,6 +45,21 @@ export class TimeoutDeploymentService extends BaseService {
       },
     });
 
+    const deploymentService = new DeploymentService();
+    await deploymentService
+      .appendToEventLog(deployment.environment.project, timedOutDeployment, [
+        {
+          type: "finalized",
+          data: {
+            result: "timed_out",
+            message: errorMessage,
+          },
+        },
+      ])
+      .orTee((error) => {
+        logger.error("Failed to append timed out deployment event to event log", { error });
+      });
+
     await PerformDeploymentAlertsService.enqueue(deployment.id);
   }
 
diff --git a/apps/webapp/app/v3/services/tracePubSub.server.ts b/apps/webapp/app/v3/services/tracePubSub.server.ts
new file mode 100644
index 00000000000..2b6082f86f9
--- /dev/null
+++ b/apps/webapp/app/v3/services/tracePubSub.server.ts
@@ -0,0 +1,94 @@
+import { createRedisClient, RedisClient, RedisWithClusterOptions } from "~/redis.server";
+import { EventEmitter } from "node:events";
+import { env } from "~/env.server";
+import { singleton } from "~/utils/singleton";
+import { Gauge } from "prom-client";
+import { metricsRegister } from "~/metrics.server";
+
+export type TracePubSubOptions = {
+  redis: RedisWithClusterOptions;
+};
+
+export class TracePubSub {
+  private _publisher: RedisClient;
+  private _subscriberCount = 0;
+
+  constructor(private _options: TracePubSubOptions) {
+    this._publisher = createRedisClient("trigger:eventRepoPublisher", this._options.redis);
+  }
+
+  get subscriberCount() {
+    return this._subscriberCount;
+  }
+
+  async publish(traceIds: string[]) {
+    if (traceIds.length === 0) return;
+    const uniqueTraces = new Set(traceIds.map((e) => `events:${e}`));
+
+    await Promise.allSettled(
+      Array.from(uniqueTraces).map((traceId) =>
+        this._publisher.publish(traceId, new Date().toISOString())
+      )
+    );
+  }
+
+  async subscribeToTrace(traceId: string) {
+    const redis = createRedisClient("trigger:eventRepoSubscriber", this._options.redis);
+
+    const channel = `events:${traceId}`;
+
+    // Subscribe to the channel.
+    await redis.subscribe(channel);
+
+    // Increment the subscriber count.
+    this._subscriberCount++;
+
+    const eventEmitter = new EventEmitter();
+
+    // Define the message handler - store reference so we can remove it later.
+    const messageHandler = (_: string, message: string) => {
+      eventEmitter.emit("message", message);
+    };
+    redis.on("message", messageHandler);
+
+    // Return a function that can be used to unsubscribe.
+    const unsubscribe = async () => {
+      // Remove the message listener before closing the connection
+      redis.off("message", messageHandler);
+      await redis.unsubscribe(channel);
+      await redis.quit();
+      this._subscriberCount--;
+    };
+
+    return {
+      unsubscribe,
+      eventEmitter,
+    };
+  }
+}
+
+export const tracePubSub = singleton("tracePubSub", initializeTracePubSub);
+
+function initializeTracePubSub() {
+  const pubSub = new TracePubSub({
+    redis: {
+      port: env.PUBSUB_REDIS_PORT,
+      host: env.PUBSUB_REDIS_HOST,
+      username: env.PUBSUB_REDIS_USERNAME,
+      password: env.PUBSUB_REDIS_PASSWORD,
+      tlsDisabled: env.PUBSUB_REDIS_TLS_DISABLED === "true",
+      clusterMode: env.PUBSUB_REDIS_CLUSTER_MODE_ENABLED === "1",
+    },
+  });
+
+  new Gauge({
+    name: "trace_pub_sub_subscribers",
+    help: "Number of trace pub sub subscribers",
+    collect() {
+      this.set(pubSub.subscriberCount);
+    },
+    registers: [metricsRegister],
+  });
+
+  return pubSub;
+}
diff --git a/apps/webapp/app/v3/services/triggerTask.server.ts b/apps/webapp/app/v3/services/triggerTask.server.ts
index c43485cbb5b..2ed34f0342c 100644
--- a/apps/webapp/app/v3/services/triggerTask.server.ts
+++ b/apps/webapp/app/v3/services/triggerTask.server.ts
@@ -1,25 +1,23 @@
 import { TriggerTaskRequestBody } from "@trigger.dev/core/v3";
 import { RunEngineVersion, TaskRun } from "@trigger.dev/database";
+import { env } from "~/env.server";
 import { IdempotencyKeyConcern } from "~/runEngine/concerns/idempotencyKeys.server";
 import { DefaultPayloadProcessor } from "~/runEngine/concerns/payloads.server";
 import { DefaultQueueManager } from "~/runEngine/concerns/queues.server";
-import { DefaultRunNumberIncrementer } from "~/runEngine/concerns/runNumbers.server";
 import { DefaultTraceEventsConcern } from "~/runEngine/concerns/traceEvents.server";
 import { RunEngineTriggerTaskService } from "~/runEngine/services/triggerTask.server";
 import { DefaultTriggerTaskValidator } from "~/runEngine/validators/triggerTaskValidator";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { determineEngineVersion } from "../engineVersion.server";
-import { eventRepository } from "../eventRepository.server";
 import { tracer } from "../tracer.server";
 import { WithRunEngine } from "./baseService.server";
 import { TriggerTaskServiceV1 } from "./triggerTaskV1.server";
-import { env } from "~/env.server";
 
 export type TriggerTaskServiceOptions = {
   idempotencyKey?: string;
   idempotencyKeyExpiresAt?: Date;
   triggerVersion?: string;
-  traceContext?: Record<string, string | undefined>;
+  traceContext?: Record<string, unknown>;
   spanParentAsLink?: boolean;
   parentAsLinkType?: "replay" | "trigger";
   batchId?: string;
@@ -33,6 +31,8 @@ export type TriggerTaskServiceOptions = {
   queueTimestamp?: Date;
   overrideCreatedAt?: Date;
   replayedFromTaskRunFriendlyId?: string;
+  planType?: string;
+  realtimeStreamsVersion?: "v1" | "v2";
 };
 
 export class OutOfEntitlementError extends Error {
@@ -92,7 +92,7 @@ export class TriggerTaskService extends WithRunEngine {
     body: TriggerTaskRequestBody,
     options: TriggerTaskServiceOptions = {}
   ): Promise<TriggerTaskServiceResult | undefined> {
-    const traceEventConcern = new DefaultTraceEventsConcern(eventRepository);
+    const traceEventConcern = new DefaultTraceEventsConcern();
 
     const service = new RunEngineTriggerTaskService({
       prisma: this._prisma,
@@ -105,7 +105,6 @@ export class TriggerTaskService extends WithRunEngine {
         this._engine,
         traceEventConcern
       ),
-      runNumberIncrementer: new DefaultRunNumberIncrementer(),
       traceEventConcern,
       tracer: tracer,
       metadataMaximumSize: env.TASK_RUN_METADATA_MAXIMUM_SIZE,
diff --git a/apps/webapp/app/v3/services/triggerTaskV1.server.ts b/apps/webapp/app/v3/services/triggerTaskV1.server.ts
index 3a5ac0f9613..efc6510ef3c 100644
--- a/apps/webapp/app/v3/services/triggerTaskV1.server.ts
+++ b/apps/webapp/app/v3/services/triggerTaskV1.server.ts
@@ -1,9 +1,8 @@
 import {
   IOPacket,
   packetRequiresOffloading,
-  SemanticInternalAttributes,
-  taskRunErrorToString,
   taskRunErrorEnhancer,
+  taskRunErrorToString,
   TriggerTaskRequestBody,
 } from "@trigger.dev/core/v3";
 import {
@@ -12,6 +11,7 @@ import {
   stringifyDuration,
 } from "@trigger.dev/core/v3/isomorphic";
 import { Prisma } from "@trigger.dev/database";
+import { z } from "zod";
 import { env } from "~/env.server";
 import { createTag, MAX_TAGS_PER_RUN } from "~/models/taskRunTag.server";
 import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
@@ -22,7 +22,7 @@ import { parseDelay } from "~/utils/delays";
 import { resolveIdempotencyKeyTTL } from "~/utils/idempotencyKeys.server";
 import { handleMetadataPacket } from "~/utils/packets";
 import { marqs } from "~/v3/marqs/index.server";
-import { eventRepository } from "../eventRepository.server";
+import { getV3EventRepository } from "../eventRepository/index.server";
 import { generateFriendlyId } from "../friendlyIdentifiers";
 import { findCurrentWorkerFromEnvironment } from "../models/workerDeployment.server";
 import { guardQueueSizeLimitsForEnv } from "../queueSizeLimits.server";
@@ -33,6 +33,7 @@ import { startActiveSpan } from "../tracer.server";
 import { clampMaxDuration } from "../utils/maxDuration";
 import { BaseService, ServiceValidationError } from "./baseService.server";
 import { EnqueueDelayedRunService } from "./enqueueDelayedRun.server";
+import { enqueueRun } from "./enqueueRun.server";
 import { ExpireEnqueuedRunService } from "./expireEnqueuedRun.server";
 import {
   MAX_ATTEMPTS,
@@ -40,9 +41,6 @@ import {
   TriggerTaskServiceOptions,
   TriggerTaskServiceResult,
 } from "./triggerTask.server";
-import { getTaskEventStore } from "../taskEventStore.server";
-import { enqueueRun } from "./enqueueRun.server";
-import { z } from "zod";
 
 // This is here for backwords compatibility for v3 users
 const QueueOptions = z.object({
@@ -181,6 +179,7 @@ export class TriggerTaskServiceV1 extends BaseService {
                   depth: true,
                   queueTimestamp: true,
                   queue: true,
+                  taskEventStore: true,
                 },
               },
             },
@@ -218,6 +217,7 @@ export class TriggerTaskServiceV1 extends BaseService {
                   taskIdentifier: true,
                   rootTaskRunId: true,
                   depth: true,
+                  taskEventStore: true,
                 },
               },
             },
@@ -239,6 +239,7 @@ export class TriggerTaskServiceV1 extends BaseService {
                       depth: true,
                       queueTimestamp: true,
                       queue: true,
+                      taskEventStore: true,
                     },
                   },
                 },
@@ -290,26 +291,26 @@ export class TriggerTaskServiceV1 extends BaseService {
           })
         : undefined;
 
+      const { repository, store } = await getV3EventRepository(
+        dependentAttempt?.taskRun.taskEventStore ??
+          parentAttempt?.taskRun.taskEventStore ??
+          dependentBatchRun?.dependentTaskAttempt?.taskRun.taskEventStore
+      );
+
       try {
-        const result = await eventRepository.traceEvent(
+        const result = await repository.traceEvent(
           taskId,
           {
             context: options.traceContext,
             spanParentAsLink: options.spanParentAsLink,
-            parentAsLinkType: options.parentAsLinkType,
             kind: "SERVER",
             environment,
             taskSlug: taskId,
             attributes: {
-              properties: {
-                [SemanticInternalAttributes.SHOW_ACTIONS]: true,
-              },
+              properties: {},
               style: {
                 icon: options.customIcon ?? "task",
               },
-              runIsTest: body.options?.test ?? false,
-              batchId: options.batchId,
-              idempotencyKey,
             },
             incomplete: true,
             immediate: true,
@@ -340,7 +341,6 @@ export class TriggerTaskServiceV1 extends BaseService {
                   queueName = sanitizeQueueName(`task/${taskId}`);
                 }
 
-                event.setAttribute("queueName", queueName);
                 span.setAttribute("queueName", queueName);
 
                 //upsert tags
@@ -405,7 +405,7 @@ export class TriggerTaskServiceV1 extends BaseService {
                     queuedAt: delayUntil ? undefined : new Date(),
                     queueTimestamp,
                     maxAttempts: body.options?.maxAttempts,
-                    taskEventStore: getTaskEventStore(),
+                    taskEventStore: store,
                     ttl,
                     tags:
                       tagIds.length === 0
@@ -476,8 +476,7 @@ export class TriggerTaskServiceV1 extends BaseService {
                       ? Math.max(
                           Math.min(
                             body.options.queue.concurrencyLimit,
-                            environment.maximumConcurrencyLimit,
-                            environment.organization.maximumConcurrencyLimit
+                            environment.maximumConcurrencyLimit
                           ),
                           0
                         )
diff --git a/apps/webapp/app/v3/services/upsertTaskSchedule.server.ts b/apps/webapp/app/v3/services/upsertTaskSchedule.server.ts
index 6d5fa7d4955..d9d8b6c0a46 100644
--- a/apps/webapp/app/v3/services/upsertTaskSchedule.server.ts
+++ b/apps/webapp/app/v3/services/upsertTaskSchedule.server.ts
@@ -7,6 +7,7 @@ import { calculateNextScheduledTimestampFromNow } from "../utils/calculateNextSc
 import { BaseService, ServiceValidationError } from "./baseService.server";
 import { CheckScheduleService } from "./checkSchedule.server";
 import { scheduleEngine } from "../scheduleEngine.server";
+import { scheduleWhereClause } from "~/models/schedules.server";
 
 export type UpsertTaskScheduleServiceOptions = UpsertSchedule;
 
@@ -37,9 +38,7 @@ export class UpsertTaskScheduleService extends BaseService {
 
     const existingSchedule = schedule.friendlyId
       ? await this._prisma.taskSchedule.findFirst({
-          where: {
-            friendlyId: schedule.friendlyId,
-          },
+          where: scheduleWhereClause(projectId, schedule.friendlyId),
         })
       : await this._prisma.taskSchedule.findFirst({
           where: {
@@ -110,6 +109,7 @@ export class UpsertTaskScheduleService extends BaseService {
         data: {
           taskScheduleId: scheduleRecord.id,
           environmentId,
+          projectId,
         },
         include: {
           environment: {
@@ -184,6 +184,7 @@ export class UpsertTaskScheduleService extends BaseService {
           data: {
             taskScheduleId: scheduleRecord.id,
             environmentId,
+            projectId: existingSchedule.projectId,
           },
           include: {
             environment: {
diff --git a/apps/webapp/app/v3/services/worker/workerGroupService.server.ts b/apps/webapp/app/v3/services/worker/workerGroupService.server.ts
index e33c3056fef..936f8bbd48e 100644
--- a/apps/webapp/app/v3/services/worker/workerGroupService.server.ts
+++ b/apps/webapp/app/v3/services/worker/workerGroupService.server.ts
@@ -2,7 +2,7 @@ import { WorkerInstanceGroup, WorkerInstanceGroupType } from "@trigger.dev/datab
 import { WithRunEngine } from "../baseService.server";
 import { WorkerGroupTokenService } from "./workerGroupTokenService.server";
 import { logger } from "~/services/logger.server";
-import { FEATURE_FLAG, makeFlags, makeSetFlags } from "~/v3/featureFlags.server";
+import { FEATURE_FLAG, makeFlag, makeSetFlag } from "~/v3/featureFlags.server";
 
 export class WorkerGroupService extends WithRunEngine {
   private readonly defaultNamePrefix = "worker_group";
@@ -47,14 +47,14 @@ export class WorkerGroupService extends WithRunEngine {
         },
       });
 
-      const getFlag = makeFlags(this._prisma);
+      const getFlag = makeFlag(this._prisma);
       const defaultWorkerInstanceGroupId = await getFlag({
         key: FEATURE_FLAG.defaultWorkerInstanceGroupId,
       });
 
       // If there's no global default yet we should set it to the new worker group
       if (!defaultWorkerInstanceGroupId) {
-        const setFlag = makeSetFlags(this._prisma);
+        const setFlag = makeSetFlag(this._prisma);
         await setFlag({
           key: FEATURE_FLAG.defaultWorkerInstanceGroupId,
           value: workerGroup.id,
@@ -166,7 +166,7 @@ export class WorkerGroupService extends WithRunEngine {
   }
 
   async getGlobalDefaultWorkerGroup() {
-    const flags = makeFlags(this._prisma);
+    const flags = makeFlag(this._prisma);
 
     const defaultWorkerInstanceGroupId = await flags({
       key: FEATURE_FLAG.defaultWorkerInstanceGroupId,
@@ -195,10 +195,12 @@ export class WorkerGroupService extends WithRunEngine {
 
   async getDefaultWorkerGroupForProject({
     projectId,
+    regionOverride,
   }: {
     projectId: string;
+    regionOverride?: string;
   }): Promise<WorkerInstanceGroup | undefined> {
-    const project = await this._prisma.project.findUnique({
+    const project = await this._prisma.project.findFirst({
       where: {
         id: projectId,
       },
@@ -208,8 +210,39 @@ export class WorkerGroupService extends WithRunEngine {
     });
 
     if (!project) {
-      logger.error("[WorkerGroupService] Project not found", { projectId });
-      return;
+      throw new Error("Project not found.");
+    }
+
+    // If they've specified a region, we need to check they have access to it
+    if (regionOverride) {
+      const workerGroup = await this._prisma.workerInstanceGroup.findFirst({
+        where: {
+          masterQueue: regionOverride,
+        },
+      });
+
+      if (!workerGroup) {
+        throw new Error(`The region you specified doesn't exist ("${regionOverride}").`);
+      }
+
+      // If they're restricted, check they have access
+      if (project.allowedWorkerQueues.length > 0) {
+        if (project.allowedWorkerQueues.includes(workerGroup.masterQueue)) {
+          return workerGroup;
+        }
+
+        throw new Error(
+          `You don't have access to this region ("${regionOverride}"). You can use the following regions: ${project.allowedWorkerQueues.join(
+            ", "
+          )}.`
+        );
+      }
+
+      if (workerGroup.hidden) {
+        throw new Error(`The region you specified isn't available to you ("${regionOverride}").`);
+      }
+
+      return workerGroup;
     }
 
     if (project.defaultWorkerGroup) {
diff --git a/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts b/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
index 910d599050a..b29056c6244 100644
--- a/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
+++ b/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
@@ -1,35 +1,51 @@
-import { customAlphabet } from "nanoid";
-import { ServiceValidationError, WithRunEngine, WithRunEngineOptions } from "../baseService.server";
-import { createHash, timingSafeEqual } from "crypto";
-import { logger } from "~/services/logger.server";
+import { createCache, createLRUMemoryStore, DefaultStatefulContext, Namespace } from "@internal/cache";
+import {
+  CheckpointInput,
+  CompleteRunAttemptResult,
+  DequeuedMessage,
+  ExecutionResult,
+  MachinePreset,
+  SemanticInternalAttributes,
+  StartRunAttemptResult,
+  TaskRunExecutionResult,
+} from "@trigger.dev/core/v3";
+import { fromFriendlyId } from "@trigger.dev/core/v3/isomorphic";
+import { WORKER_HEADERS } from "@trigger.dev/core/v3/workers";
 import {
   Prisma,
   RuntimeEnvironment,
   WorkerInstanceGroup,
   WorkerInstanceGroupType,
 } from "@trigger.dev/database";
+import { createHash, timingSafeEqual } from "crypto";
+import { customAlphabet } from "nanoid";
 import { z } from "zod";
-import { WORKER_HEADERS } from "@trigger.dev/core/v3/workers";
-import {
-  TaskRunExecutionResult,
-  DequeuedMessage,
-  CompleteRunAttemptResult,
-  StartRunAttemptResult,
-  ExecutionResult,
-  MachinePreset,
-  MachineResources,
-  CheckpointInput,
-} from "@trigger.dev/core/v3";
 import { env } from "~/env.server";
-import { $transaction } from "~/db.server";
-import { resolveVariablesForEnvironment } from "~/v3/environmentVariables/environmentVariablesRepository.server";
 import { generateJWTTokenForEnvironment } from "~/services/apiAuth.server";
-import {
-  CURRENT_UNMANAGED_DEPLOYMENT_LABEL,
-  fromFriendlyId,
-} from "@trigger.dev/core/v3/isomorphic";
-import { machinePresetFromName } from "~/v3/machinePresets.server";
+import { logger } from "~/services/logger.server";
 import { defaultMachine } from "~/services/platform.v3.server";
+import { singleton } from "~/utils/singleton";
+import { resolveVariablesForEnvironment } from "~/v3/environmentVariables/environmentVariablesRepository.server";
+import { machinePresetFromName } from "~/v3/machinePresets.server";
+import { WithRunEngine, WithRunEngineOptions } from "../baseService.server";
+
+const authenticatedWorkerInstanceCache = singleton(
+  "authenticatedWorkerInstanceCache",
+  createAuthenticatedWorkerInstanceCache
+);
+
+function createAuthenticatedWorkerInstanceCache() {
+  return createCache({
+    authenticatedWorkerInstance: new Namespace<AuthenticatedWorkerInstance>(
+      new DefaultStatefulContext(),
+      {
+        stores: [createLRUMemoryStore(1000)],
+        fresh: 60_000 * 10, // 10 minutes
+        stale: 60_000 * 11, // 11 minutes
+      }
+    ),
+  });
+}
 
 export class WorkerGroupTokenService extends WithRunEngine {
   private readonly tokenPrefix = "tr_wgt_";
@@ -148,321 +164,150 @@ export class WorkerGroupTokenService extends WithRunEngine {
       return;
     }
 
-    const workerGroup = await this.findWorkerGroup({ token });
+    const managedWorkerSecret = request.headers.get(WORKER_HEADERS.MANAGED_SECRET);
 
-    if (!workerGroup) {
-      logger.warn("[WorkerGroupTokenService] Worker group not found", { token });
+    if (!managedWorkerSecret) {
+      logger.error("[WorkerGroupTokenService] Managed secret not found in request", {
+        headers: this.sanitizeHeaders(request),
+      });
       return;
     }
 
-    if (workerGroup.type === WorkerInstanceGroupType.MANAGED) {
-      const managedWorkerSecret = request.headers.get(WORKER_HEADERS.MANAGED_SECRET);
-
-      if (!managedWorkerSecret) {
-        logger.error("[WorkerGroupTokenService] Managed secret not found in request", {
-          headers: this.sanitizeHeaders(request),
-        });
-        return;
-      }
-
-      const encoder = new TextEncoder();
-
-      const a = encoder.encode(managedWorkerSecret);
-      const b = encoder.encode(env.MANAGED_WORKER_SECRET);
-
-      if (a.byteLength !== b.byteLength) {
-        logger.error("[WorkerGroupTokenService] Managed secret length mismatch", {
-          managedWorkerSecret,
-          headers: this.sanitizeHeaders(request),
-        });
-        return;
-      }
-
-      if (!timingSafeEqual(a, b)) {
-        logger.error("[WorkerGroupTokenService] Managed secret mismatch", {
-          managedWorkerSecret,
-          headers: this.sanitizeHeaders(request),
-        });
-        return;
-      }
-    }
+    const encoder = new TextEncoder();
 
-    const workerInstance = await this.getOrCreateWorkerInstance({
-      workerGroup,
-      instanceName,
-      deploymentId: request.headers.get(WORKER_HEADERS.DEPLOYMENT_ID) ?? undefined,
-    });
+    const a = encoder.encode(managedWorkerSecret);
+    const b = encoder.encode(env.MANAGED_WORKER_SECRET);
 
-    if (!workerInstance) {
-      logger.error("[WorkerGroupTokenService] Unable to get or create worker instance", {
-        workerGroup,
-        instanceName,
+    if (a.byteLength !== b.byteLength) {
+      logger.error("[WorkerGroupTokenService] Managed secret length mismatch", {
+        managedWorkerSecret,
+        headers: this.sanitizeHeaders(request),
       });
       return;
     }
 
-    if (workerGroup.type === WorkerInstanceGroupType.MANAGED) {
-      return new AuthenticatedWorkerInstance({
-        prisma: this._prisma,
-        engine: this._engine,
-        type: WorkerInstanceGroupType.MANAGED,
-        name: workerGroup.name,
-        workerGroupId: workerGroup.id,
-        workerInstanceId: workerInstance.id,
-        masterQueue: workerGroup.masterQueue,
-        environment: null,
-        runnerId: request.headers.get(WORKER_HEADERS.RUNNER_ID) ?? undefined,
+    if (!timingSafeEqual(a, b)) {
+      logger.error("[WorkerGroupTokenService] Managed secret mismatch", {
+        managedWorkerSecret,
+        headers: this.sanitizeHeaders(request),
       });
-    }
-
-    if (!workerInstance.environment) {
-      logger.error(
-        "[WorkerGroupTokenService] Unmanaged worker instance not linked to environment",
-        { workerGroup, workerInstance }
-      );
       return;
     }
 
-    if (!workerInstance.deployment) {
-      logger.error("[WorkerGroupTokenService] Unmanaged worker instance not linked to deployment", {
-        workerGroup,
-        workerInstance,
-      });
-      return;
-    }
+    const cacheKey = ["worker-group-token", token, instanceName];
 
-    if (!workerInstance.deployment.workerId) {
-      logger.error(
-        "[WorkerGroupTokenService] Unmanaged worker instance deployment not linked to background worker",
-        { workerGroup, workerInstance }
-      );
+    const result = await authenticatedWorkerInstanceCache.authenticatedWorkerInstance.swr(
+      cacheKey.join("-"),
+      async () => {
+        const workerGroup = await this.findWorkerGroup({ token });
+
+        if (!workerGroup) {
+          logger.warn("[WorkerGroupTokenService] Worker group not found", { token });
+          return;
+        }
+
+        const workerInstance = await this.getOrCreateWorkerInstance({
+          workerGroup,
+          instanceName,
+        });
+
+        if (!workerInstance) {
+          logger.error("[WorkerGroupTokenService] Unable to get or create worker instance", {
+            workerGroup,
+            instanceName,
+          });
+          return;
+        }
+
+        return new AuthenticatedWorkerInstance({
+          prisma: this._prisma,
+          engine: this._engine,
+          type: WorkerInstanceGroupType.MANAGED,
+          name: workerGroup.name,
+          workerGroupId: workerGroup.id,
+          workerInstanceId: workerInstance.id,
+          masterQueue: workerGroup.masterQueue,
+        });
+      }
+    );
+
+    if (result.err) {
+      logger.error("[WorkerGroupTokenService] Failed to authenticate worker instance", {
+        error: result.err,
+      });
       return;
     }
 
-    return new AuthenticatedWorkerInstance({
-      prisma: this._prisma,
-      engine: this._engine,
-      type: WorkerInstanceGroupType.UNMANAGED,
-      name: workerGroup.name,
-      workerGroupId: workerGroup.id,
-      workerInstanceId: workerInstance.id,
-      masterQueue: workerGroup.masterQueue,
-      environmentId: workerInstance.environment.id,
-      deploymentId: workerInstance.deployment.id,
-      backgroundWorkerId: workerInstance.deployment.workerId,
-      environment: workerInstance.environment,
-    });
+    return result.val;
   }
 
   private async getOrCreateWorkerInstance({
     workerGroup,
     instanceName,
-    deploymentId,
   }: {
     workerGroup: WorkerInstanceGroup;
     instanceName: string;
-    deploymentId?: string;
   }) {
-    return await $transaction(this._prisma, async (tx) => {
-      const resourceIdentifier = deploymentId ? `${deploymentId}:${instanceName}` : instanceName;
+    const resourceIdentifier = instanceName;
 
-      const workerInstance = await tx.workerInstance.findFirst({
-        where: {
+    const workerInstance = await this._prisma.workerInstance.findFirst({
+      where: {
+        workerGroupId: workerGroup.id,
+        resourceIdentifier,
+      },
+      include: {
+        deployment: true,
+        environment: true,
+      },
+    });
+
+    if (workerInstance) {
+      return workerInstance;
+    }
+
+    try {
+      const newWorkerInstance = await this._prisma.workerInstance.create({
+        data: {
           workerGroupId: workerGroup.id,
+          name: instanceName,
           resourceIdentifier,
         },
         include: {
+          // This will always be empty for shared worker instances, but required for types
           deployment: true,
           environment: true,
         },
       });
 
-      if (workerInstance) {
-        return workerInstance;
-      }
+      return newWorkerInstance;
+    } catch (error) {
+      // Gracefully handle race conditions when connecting for the first time
+      if (error instanceof Prisma.PrismaClientKnownRequestError) {
+        // Unique constraint violation
+        if (error.code === "P2002") {
+          try {
+            const existingWorkerInstance = await this._prisma.workerInstance.findFirst({
+              where: {
+                workerGroupId: workerGroup.id,
+                resourceIdentifier,
+              },
+              include: {
+                deployment: true,
+                environment: true,
+              },
+            });
 
-      if (workerGroup.type === WorkerInstanceGroupType.MANAGED) {
-        if (deploymentId) {
-          logger.warn(
-            "[WorkerGroupTokenService] Shared worker group instances should not authenticate with a deployment ID",
-            {
+            return existingWorkerInstance;
+          } catch (error) {
+            logger.error("[WorkerGroupTokenService] Failed to find worker instance", {
               workerGroup,
               workerInstance,
-              deploymentId,
-            }
-          );
-        }
-
-        try {
-          const newWorkerInstance = await tx.workerInstance.create({
-            data: {
-              workerGroupId: workerGroup.id,
-              name: instanceName,
-              resourceIdentifier,
-            },
-            include: {
-              // This will always be empty for shared worker instances, but required for types
-              deployment: true,
-              environment: true,
-            },
-          });
-          return newWorkerInstance;
-        } catch (error) {
-          // Gracefully handle race conditions when connecting for the first time
-          if (error instanceof Prisma.PrismaClientKnownRequestError) {
-            // Unique constraint violation
-            if (error.code === "P2002") {
-              try {
-                const existingWorkerInstance = await tx.workerInstance.findFirst({
-                  where: {
-                    workerGroupId: workerGroup.id,
-                    resourceIdentifier,
-                  },
-                  include: {
-                    deployment: true,
-                    environment: true,
-                  },
-                });
-                return existingWorkerInstance;
-              } catch (error) {
-                logger.error("[WorkerGroupTokenService] Failed to find worker instance", {
-                  workerGroup,
-                  workerInstance,
-                  deploymentId,
-                });
-                return;
-              }
-            }
+            });
+            return;
           }
         }
       }
-
-      if (!workerGroup.projectId || !workerGroup.organizationId) {
-        logger.error(
-          "[WorkerGroupTokenService] Unmanaged worker group missing project or organization",
-          {
-            workerGroup,
-            workerInstance,
-            deploymentId,
-          }
-        );
-        return;
-      }
-
-      if (!deploymentId) {
-        logger.error("[WorkerGroupTokenService] Unmanaged worker group required deployment ID", {
-          workerGroup,
-          workerInstance,
-        });
-        return;
-      }
-
-      // Unmanaged workers instances are locked to a specific deployment version
-
-      const deployment = await tx.workerDeployment.findFirst({
-        where: {
-          ...(deploymentId.startsWith("deployment_")
-            ? {
-                friendlyId: deploymentId,
-              }
-            : {
-                id: deploymentId,
-              }),
-        },
-      });
-
-      if (!deployment) {
-        logger.error("[WorkerGroupTokenService] Deployment not found", {
-          workerGroup,
-          workerInstance,
-          deploymentId,
-        });
-        return;
-      }
-
-      if (deployment.projectId !== workerGroup.projectId) {
-        logger.error("[WorkerGroupTokenService] Deployment does not match worker group project", {
-          deployment,
-          workerGroup,
-          workerInstance,
-        });
-        return;
-      }
-
-      if (deployment.status === "DEPLOYING") {
-        // This is the first instance to be created for this deployment, so mark it as deployed
-        await tx.workerDeployment.update({
-          where: {
-            id: deployment.id,
-          },
-          data: {
-            status: "DEPLOYED",
-            deployedAt: new Date(),
-          },
-        });
-
-        // Check if the deployment should be promoted
-        const workerPromotion = await tx.workerDeploymentPromotion.findFirst({
-          where: {
-            label: CURRENT_UNMANAGED_DEPLOYMENT_LABEL,
-            environmentId: deployment.environmentId,
-          },
-          include: {
-            deployment: true,
-          },
-        });
-
-        const shouldPromote =
-          !workerPromotion || deployment.createdAt > workerPromotion.deployment.createdAt;
-
-        if (shouldPromote) {
-          // Promote the deployment
-          await tx.workerDeploymentPromotion.upsert({
-            where: {
-              environmentId_label: {
-                environmentId: deployment.environmentId,
-                label: CURRENT_UNMANAGED_DEPLOYMENT_LABEL,
-              },
-            },
-            create: {
-              deploymentId: deployment.id,
-              environmentId: deployment.environmentId,
-              label: CURRENT_UNMANAGED_DEPLOYMENT_LABEL,
-            },
-            update: {
-              deploymentId: deployment.id,
-            },
-          });
-        }
-      } else if (deployment.status !== "DEPLOYED") {
-        logger.error("[WorkerGroupTokenService] Deployment not deploying or deployed", {
-          deployment,
-          workerGroup,
-          workerInstance,
-        });
-        return;
-      }
-
-      const nonSharedWorkerInstance = tx.workerInstance.create({
-        data: {
-          workerGroupId: workerGroup.id,
-          name: instanceName,
-          resourceIdentifier,
-          environmentId: deployment.environmentId,
-          deploymentId: deployment.id,
-        },
-        include: {
-          deployment: true,
-          environment: {
-            include: {
-              parentEnvironment: true,
-            },
-          },
-        },
-      });
-
-      return nonSharedWorkerInstance;
-    });
+    }
   }
 
   private sanitizeHeaders(request: Request, skipHeaders = ["authorization"]) {
@@ -491,11 +336,6 @@ export type AuthenticatedWorkerInstanceOptions = WithRunEngineOptions<{
   workerGroupId: string;
   workerInstanceId: string;
   masterQueue: string;
-  environmentId?: string;
-  deploymentId?: string;
-  backgroundWorkerId?: string;
-  runnerId?: string;
-  environment: EnvironmentWithParent | null;
 }>;
 
 export class AuthenticatedWorkerInstance extends WithRunEngine {
@@ -503,11 +343,7 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
   readonly name: string;
   readonly workerGroupId: string;
   readonly workerInstanceId: string;
-  readonly runnerId?: string;
   readonly masterQueue: string;
-  readonly environment: EnvironmentWithParent | null;
-  readonly deploymentId?: string;
-  readonly backgroundWorkerId?: string;
 
   // FIXME: Required for unmanaged workers
   readonly isLatestDeployment = true;
@@ -520,10 +356,6 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
     this.workerGroupId = opts.workerGroupId;
     this.workerInstanceId = opts.workerInstanceId;
     this.masterQueue = opts.masterQueue;
-    this.environment = opts.environment;
-    this.deploymentId = opts.deploymentId;
-    this.backgroundWorkerId = opts.backgroundWorkerId;
-    this.runnerId = opts.runnerId;
   }
 
   async connect(metadata: Record<string, any>): Promise<void> {
@@ -537,62 +369,12 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
     });
   }
 
-  async dequeue(): Promise<DequeuedMessage[]> {
-    if (this.type === WorkerInstanceGroupType.MANAGED) {
-      return await this._engine.dequeueFromWorkerQueue({
-        consumerId: this.workerInstanceId,
-        workerQueue: this.masterQueue,
-        workerId: this.workerInstanceId,
-        runnerId: this.runnerId,
-      });
-    }
-
-    if (!this.environment || !this.deploymentId || !this.backgroundWorkerId) {
-      logger.error("[AuthenticatedWorkerInstance] Missing environment or deployment", {
-        ...this.toJSON(),
-      });
-      return [];
-    }
-
-    await this._prisma.workerInstance.update({
-      where: {
-        id: this.workerInstanceId,
-      },
-      data: {
-        lastDequeueAt: new Date(),
-      },
-    });
-
-    if (this.isLatestDeployment) {
-      return await this._engine.dequeueFromEnvironmentWorkerQueue({
-        consumerId: this.workerInstanceId,
-        environmentId: this.environment.id,
-        workerId: this.workerInstanceId,
-        runnerId: this.runnerId,
-      });
-    }
-
-    throw new ServiceValidationError("Unmanaged workers cannot dequeue from a specific version");
-  }
-
-  /** Allows managed workers to dequeue from a specific environment */
-  async dequeueFromEnvironment(
-    backgroundWorkerId: string,
-    environmentId: string
-  ): Promise<DequeuedMessage[]> {
-    if (this.type !== WorkerInstanceGroupType.MANAGED) {
-      logger.error("[AuthenticatedWorkerInstance] Worker instance is not managed", {
-        ...this.toJSON(),
-      });
-      return [];
-    }
-
-    return await this._engine.dequeueFromEnvironmentWorkerQueue({
+  async dequeue({ runnerId }: { runnerId?: string }): Promise<DequeuedMessage[]> {
+    return await this._engine.dequeueFromWorkerQueue({
       consumerId: this.workerInstanceId,
-      backgroundWorkerId,
-      environmentId,
+      workerQueue: this.masterQueue,
       workerId: this.workerInstanceId,
-      runnerId: this.runnerId,
+      runnerId,
     });
   }
 
@@ -610,15 +392,17 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
   async heartbeatRun({
     runFriendlyId,
     snapshotFriendlyId,
+    runnerId,
   }: {
     runFriendlyId: string;
     snapshotFriendlyId: string;
+    runnerId?: string;
   }): Promise<ExecutionResult> {
     return await this._engine.heartbeatRun({
       runId: fromFriendlyId(runFriendlyId),
       snapshotId: fromFriendlyId(snapshotFriendlyId),
       workerId: this.workerInstanceId,
-      runnerId: this.runnerId,
+      runnerId,
     });
   }
 
@@ -626,10 +410,12 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
     runFriendlyId,
     snapshotFriendlyId,
     isWarmStart,
+    runnerId,
   }: {
     runFriendlyId: string;
     snapshotFriendlyId: string;
     isWarmStart?: boolean;
+    runnerId?: string;
   }): Promise<
     StartRunAttemptResult & {
       envVars: Record<string, string>;
@@ -640,28 +426,27 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
       snapshotId: fromFriendlyId(snapshotFriendlyId),
       isWarmStart,
       workerId: this.workerInstanceId,
-      runnerId: this.runnerId,
+      runnerId,
     });
 
     const defaultMachinePreset = machinePresetFromName(defaultMachine);
 
-    const environment =
-      this.environment ??
-      (await this._prisma.runtimeEnvironment.findFirst({
-        where: {
-          id: engineResult.execution.environment.id,
-        },
-        include: {
-          parentEnvironment: true,
-        },
-      }));
+    const environment = await this._prisma.runtimeEnvironment.findFirst({
+      where: {
+        id: engineResult.execution.environment.id,
+      },
+      include: {
+        parentEnvironment: true,
+      },
+    });
 
     const envVars = environment
       ? await this.getEnvVars(
           environment,
           engineResult.run.id,
           engineResult.execution.machine ?? defaultMachinePreset,
-          environment.parentEnvironment ?? undefined
+          environment.parentEnvironment ?? undefined,
+          engineResult.run.taskEventStore ?? undefined
         )
       : {};
 
@@ -675,17 +460,19 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
     runFriendlyId,
     snapshotFriendlyId,
     completion,
+    runnerId,
   }: {
     runFriendlyId: string;
     snapshotFriendlyId: string;
     completion: TaskRunExecutionResult;
+    runnerId?: string;
   }): Promise<CompleteRunAttemptResult> {
     return await this._engine.completeRunAttempt({
       runId: fromFriendlyId(runFriendlyId),
       snapshotId: fromFriendlyId(snapshotFriendlyId),
       completion,
       workerId: this.workerInstanceId,
-      runnerId: this.runnerId,
+      runnerId,
     });
   }
 
@@ -699,32 +486,36 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
     runFriendlyId,
     snapshotFriendlyId,
     checkpoint,
+    runnerId,
   }: {
     runFriendlyId: string;
     snapshotFriendlyId: string;
     checkpoint: CheckpointInput;
+    runnerId?: string;
   }) {
     return await this._engine.createCheckpoint({
       runId: fromFriendlyId(runFriendlyId),
       snapshotId: fromFriendlyId(snapshotFriendlyId),
       checkpoint,
       workerId: this.workerInstanceId,
-      runnerId: this.runnerId,
+      runnerId,
     });
   }
 
   async continueRunExecution({
     runFriendlyId,
     snapshotFriendlyId,
+    runnerId,
   }: {
     runFriendlyId: string;
     snapshotFriendlyId: string;
+    runnerId?: string;
   }) {
     return await this._engine.continueRunExecution({
       runId: fromFriendlyId(runFriendlyId),
       snapshotId: fromFriendlyId(snapshotFriendlyId),
       workerId: this.workerInstanceId,
-      runnerId: this.runnerId,
+      runnerId,
     });
   }
 
@@ -742,24 +533,12 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
   }
 
   toJSON(): WorkerGroupTokenAuthenticationResponse {
-    if (this.type === WorkerInstanceGroupType.MANAGED) {
-      return {
-        type: WorkerInstanceGroupType.MANAGED,
-        name: this.name,
-        workerGroupId: this.workerGroupId,
-        workerInstanceId: this.workerInstanceId,
-        masterQueue: this.masterQueue,
-      };
-    }
-
     return {
-      type: WorkerInstanceGroupType.UNMANAGED,
+      type: WorkerInstanceGroupType.MANAGED,
       name: this.name,
       workerGroupId: this.workerGroupId,
       workerInstanceId: this.workerInstanceId,
       masterQueue: this.masterQueue,
-      environmentId: this.environment?.id!,
-      deploymentId: this.deploymentId!,
     };
   }
 
@@ -767,7 +546,8 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
     environment: RuntimeEnvironment,
     runId: string,
     machinePreset: MachinePreset,
-    parentEnvironment?: RuntimeEnvironment
+    parentEnvironment?: RuntimeEnvironment,
+    taskEventStore?: string
   ): Promise<Record<string, string>> {
     const variables = await resolveVariablesForEnvironment(environment, parentEnvironment);
 
@@ -784,6 +564,19 @@ export class AuthenticatedWorkerInstance extends WithRunEngine {
       ]
     );
 
+    if (taskEventStore) {
+      const resourceAttributes = JSON.stringify({
+        [SemanticInternalAttributes.TASK_EVENT_STORE]: taskEventStore,
+      });
+
+      variables.push(
+        ...[
+          { key: "OTEL_RESOURCE_ATTRIBUTES", value: resourceAttributes },
+          { key: "TRIGGER_OTEL_RESOURCE_ATTRIBUTES", value: resourceAttributes },
+        ]
+      );
+    }
+
     return variables.reduce((acc: Record<string, string>, curr) => {
       acc[curr.key] = curr.value;
       return acc;
diff --git a/apps/webapp/app/v3/taskEventStore.server.ts b/apps/webapp/app/v3/taskEventStore.server.ts
index 269aab84b4c..6a80aa99261 100644
--- a/apps/webapp/app/v3/taskEventStore.server.ts
+++ b/apps/webapp/app/v3/taskEventStore.server.ts
@@ -9,7 +9,6 @@ export type TraceEvent = Pick<
   | "spanId"
   | "parentId"
   | "runId"
-  | "idempotencyKey"
   | "message"
   | "style"
   | "startTime"
@@ -19,8 +18,28 @@ export type TraceEvent = Pick<
   | "isCancelled"
   | "level"
   | "events"
-  | "environmentType"
   | "kind"
+  | "attemptNumber"
+>;
+
+export type DetailedTraceEvent = Pick<
+  TaskEvent,
+  | "spanId"
+  | "parentId"
+  | "runId"
+  | "message"
+  | "style"
+  | "startTime"
+  | "duration"
+  | "isError"
+  | "isPartial"
+  | "isCancelled"
+  | "level"
+  | "events"
+  | "kind"
+  | "taskSlug"
+  | "properties"
+  | "attemptNumber"
 >;
 
 export type TaskEventStoreTable = "taskEvent" | "taskEventPartitioned";
@@ -151,7 +170,6 @@ export class TaskEventStore {
           "spanId",
           "parentId",
           "runId",
-          "idempotencyKey",
           LEFT(message, 256) as message,
           style,
           "startTime",
@@ -161,8 +179,8 @@ export class TaskEventStore {
           "isCancelled",
           level,
           events,
-          "environmentType",
-          "kind"
+          "kind",
+          "attemptNumber"
         FROM "TaskEventPartitioned"
         WHERE
           "traceId" = ${traceId}
@@ -183,7 +201,6 @@ export class TaskEventStore {
           "spanId",
           "parentId",
           "runId",
-          "idempotencyKey",
           LEFT(message, 256) as message,
           style,
           "startTime",
@@ -193,8 +210,8 @@ export class TaskEventStore {
           "isCancelled",
           level,
           events,
-          "environmentType",
-          "kind"
+          "kind",
+          "attemptNumber"
         FROM "TaskEvent"
         WHERE "traceId" = ${traceId}
           ${
@@ -207,4 +224,83 @@ export class TaskEventStore {
       `;
     }
   }
+
+  async findDetailedTraceEvents(
+    table: TaskEventStoreTable,
+    traceId: string,
+    startCreatedAt: Date,
+    endCreatedAt?: Date,
+    options?: { includeDebugLogs?: boolean }
+  ) {
+    const filterDebug =
+      options?.includeDebugLogs === false || options?.includeDebugLogs === undefined;
+
+    if (table === "taskEventPartitioned") {
+      const createdAtBufferInMillis = env.TASK_EVENT_PARTITIONED_WINDOW_IN_SECONDS * 1000;
+      const startCreatedAtWithBuffer = new Date(startCreatedAt.getTime() - createdAtBufferInMillis);
+      const $endCreatedAt = endCreatedAt ?? new Date();
+      const endCreatedAtWithBuffer = new Date($endCreatedAt.getTime() + createdAtBufferInMillis);
+
+      return await this.readReplica.$queryRaw<DetailedTraceEvent[]>`
+        SELECT
+          "spanId",
+          "parentId",
+          "runId",
+          message,
+          style,
+          "startTime",
+          duration,
+          "isError",
+          "isPartial",
+          "isCancelled",
+          level,
+          events,
+          "kind",
+          "taskSlug",
+          properties,
+          "attemptNumber"
+        FROM "TaskEventPartitioned"
+        WHERE
+          "traceId" = ${traceId}
+          AND "createdAt" >= ${startCreatedAtWithBuffer.toISOString()}::timestamp
+          AND "createdAt" < ${endCreatedAtWithBuffer.toISOString()}::timestamp
+          ${
+            filterDebug
+              ? Prisma.sql`AND \"kind\" <> CAST('LOG'::text AS "public"."TaskEventKind")`
+              : Prisma.empty
+          }
+        ORDER BY "startTime" ASC
+        LIMIT ${env.MAXIMUM_TRACE_DETAILED_SUMMARY_VIEW_COUNT}
+      `;
+    } else {
+      return await this.readReplica.$queryRaw<DetailedTraceEvent[]>`
+        SELECT
+          "spanId",
+          "parentId",
+          "runId",
+          message,
+          style,
+          "startTime",
+          duration,
+          "isError",
+          "isPartial",
+          "isCancelled",
+          level,
+          events,
+          "kind",
+          "taskSlug",
+          properties,
+          "attemptNumber"
+        FROM "TaskEvent"
+        WHERE "traceId" = ${traceId}
+          ${
+            filterDebug
+              ? Prisma.sql`AND \"kind\" <> CAST('LOG'::text AS "public"."TaskEventKind")`
+              : Prisma.empty
+          }
+        ORDER BY "startTime" ASC
+        LIMIT ${env.MAXIMUM_TRACE_DETAILED_SUMMARY_VIEW_COUNT}
+      `;
+    }
+  }
 }
diff --git a/apps/webapp/app/v3/taskStatus.ts b/apps/webapp/app/v3/taskStatus.ts
index 6b276bfc007..b5e1d915cf7 100644
--- a/apps/webapp/app/v3/taskStatus.ts
+++ b/apps/webapp/app/v3/taskStatus.ts
@@ -128,3 +128,7 @@ export function isRestorableRunStatus(status: TaskRunStatus): boolean {
 export function isRestorableAttemptStatus(status: TaskRunAttemptStatus): boolean {
   return RESTORABLE_ATTEMPT_STATUSES.includes(status);
 }
+
+export function shouldIdempotencyKeyBeCleared(status: TaskRunStatus): boolean {
+  return isFailedRunStatus(status) || status === "EXPIRED";
+}
diff --git a/apps/webapp/app/v3/telemetry/compactMetricExporter.server.ts b/apps/webapp/app/v3/telemetry/compactMetricExporter.server.ts
new file mode 100644
index 00000000000..c5e97dbb28a
--- /dev/null
+++ b/apps/webapp/app/v3/telemetry/compactMetricExporter.server.ts
@@ -0,0 +1,153 @@
+import { type ExportResult, ExportResultCode } from "@opentelemetry/core";
+import type {
+  PushMetricExporter,
+  ResourceMetrics,
+  MetricData,
+  DataPoint,
+  Histogram,
+  ExponentialHistogram,
+} from "@opentelemetry/sdk-metrics";
+
+/**
+ * Compact metric exporter that logs metrics in a single-line format
+ * Similar to Prometheus text format for better readability
+ */
+export class CompactMetricExporter implements PushMetricExporter {
+  /**
+   * Export metrics in a compact format
+   */
+  export(metrics: ResourceMetrics, resultCallback: (result: ExportResult) => void): void {
+    try {
+      this._exportMetrics(metrics);
+      resultCallback({ code: ExportResultCode.SUCCESS });
+    } catch (error) {
+      resultCallback({
+        code: ExportResultCode.FAILED,
+        error: error instanceof Error ? error : new Error(String(error)),
+      });
+    }
+  }
+
+  /**
+   * Shutdown the exporter
+   */
+  async shutdown(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  /**
+   * Force flush any buffered data
+   */
+  async forceFlush(): Promise<void> {
+    return Promise.resolve();
+  }
+
+  /**
+   * Process and log metrics in compact format
+   */
+  private _exportMetrics(resourceMetrics: ResourceMetrics): void {
+    for (const scopeMetric of resourceMetrics.scopeMetrics) {
+      for (const metric of scopeMetric.metrics) {
+        this._exportMetric(metric);
+      }
+    }
+  }
+
+  /**
+   * Export a single metric
+   */
+  private _exportMetric(metric: MetricData): void {
+    const metricName = metric.descriptor.name;
+
+    for (const dataPoint of metric.dataPoints) {
+      const formattedLine = this._formatDataPoint(metricName, dataPoint);
+      if (formattedLine) {
+        console.log(formattedLine);
+      }
+    }
+  }
+
+  /**
+   * Format a data point into a single line
+   */
+  private _formatDataPoint(
+    metricName: string,
+    dataPoint: DataPoint<number> | DataPoint<Histogram> | DataPoint<ExponentialHistogram>
+  ): string | null {
+    // Extract attributes/labels
+    const labels = this._formatLabels(dataPoint.attributes);
+
+    // Extract value based on data point type
+    const value = this._extractValue(dataPoint);
+
+    if (value === null || value === undefined) {
+      return null;
+    }
+
+    // Format as: metric_name{label1="value1",label2="value2"} = value
+    if (labels) {
+      return `${metricName}{${labels}} = ${value}`;
+    }
+
+    return `${metricName} = ${value}`;
+  }
+
+  /**
+   * Format attributes as Prometheus-style labels
+   */
+  private _formatLabels(attributes: Record<string, unknown>): string {
+    const entries = Object.entries(attributes);
+    if (entries.length === 0) {
+      return "";
+    }
+
+    return entries.map(([key, value]) => `${key}="${String(value)}"`).join(",");
+  }
+
+  /**
+   * Extract the numeric value from a data point
+   */
+  private _extractValue(
+    dataPoint: DataPoint<number> | DataPoint<Histogram> | DataPoint<ExponentialHistogram>
+  ): number | null {
+    const value = dataPoint.value;
+
+    // Check if value is a simple number (Gauge, Sum, UpDownSum)
+    if (typeof value === "number") {
+      return value;
+    }
+
+    // Check if value is a Histogram or ExponentialHistogram
+    if (this._isHistogram(value) || this._isExponentialHistogram(value)) {
+      return value.sum ?? null;
+    }
+
+    return null;
+  }
+
+  /**
+   * Type guard for Histogram
+   */
+  private _isHistogram(value: unknown): value is Histogram {
+    return (
+      value !== null &&
+      typeof value === "object" &&
+      "sum" in value &&
+      "count" in value &&
+      "buckets" in value
+    );
+  }
+
+  /**
+   * Type guard for ExponentialHistogram
+   */
+  private _isExponentialHistogram(value: unknown): value is ExponentialHistogram {
+    return (
+      value !== null &&
+      typeof value === "object" &&
+      "sum" in value &&
+      "count" in value &&
+      "scale" in value
+    );
+  }
+}
diff --git a/apps/webapp/app/v3/telemetry/loggerExporter.server.ts b/apps/webapp/app/v3/telemetry/loggerExporter.server.ts
index 691665c2045..236ad1d5cf5 100644
--- a/apps/webapp/app/v3/telemetry/loggerExporter.server.ts
+++ b/apps/webapp/app/v3/telemetry/loggerExporter.server.ts
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import { ExportResult, ExportResultCode, hrTimeToMicroseconds } from "@opentelemetry/core";
-import { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
+import { type ExportResult, ExportResultCode, hrTimeToMicroseconds } from "@opentelemetry/core";
+import type { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
 
 export class LoggerSpanExporter implements SpanExporter {
   /**
@@ -47,11 +47,13 @@ export class LoggerSpanExporter implements SpanExporter {
    * @param span
    */
   private _exportInfo(span: ReadableSpan) {
+    const parentSpanId = span.parentSpanContext?.spanId;
+
     return {
       traceId: span.spanContext().traceId,
       parentId:
-        span.parentSpanId && span.parentSpanId !== "" && span.parentSpanId !== "0000000000000000"
-          ? span.parentSpanId
+        parentSpanId && parentSpanId !== "" && parentSpanId !== "0000000000000000"
+          ? parentSpanId
           : undefined,
       traceState: span.spanContext().traceState?.serialize(),
       message: span.name,
diff --git a/apps/webapp/app/v3/testTask.ts b/apps/webapp/app/v3/testTask.ts
index 79d9e97ec3d..54db301cdef 100644
--- a/apps/webapp/app/v3/testTask.ts
+++ b/apps/webapp/app/v3/testTask.ts
@@ -22,6 +22,7 @@ export const RunOptionsData = z.object({
   concurrencyKey: z.string().optional(),
   maxAttempts: z.number().min(1).optional(),
   machine: MachinePresetName.optional(),
+  region: z.string().optional(),
   maxDurationSeconds: z
     .number()
     .min(0)
@@ -46,6 +47,11 @@ export const RunOptionsData = z.object({
       message: "Each tag must be at most 128 characters long",
     }),
   version: z.string().optional(),
+  prioritySeconds: z
+    .number()
+    .min(0)
+    .optional()
+    .transform((val) => (val === 0 ? undefined : val)),
 });
 
 export type RunOptionsData = z.infer<typeof RunOptionsData>;
diff --git a/apps/webapp/app/v3/tracer.server.ts b/apps/webapp/app/v3/tracer.server.ts
index cf47df248b0..71e14521e50 100644
--- a/apps/webapp/app/v3/tracer.server.ts
+++ b/apps/webapp/app/v3/tracer.server.ts
@@ -1,18 +1,17 @@
 import {
-  Attributes,
-  Context,
+  type Attributes,
+  type Context,
   DiagConsoleLogger,
   DiagLogLevel,
-  Link,
-  Span,
-  SpanKind,
-  SpanOptions,
+  type Link,
+  type Span,
+  type SpanKind,
+  type SpanOptions,
   SpanStatusCode,
-  Tracer,
   diag,
   trace,
   metrics,
-  Meter,
+  type Meter,
 } from "@opentelemetry/api";
 import { logs, SeverityNumber } from "@opentelemetry/api-logs";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
@@ -21,41 +20,47 @@ import { BatchLogRecordProcessor, LoggerProvider } from "@opentelemetry/sdk-logs
 import { type Instrumentation, registerInstrumentations } from "@opentelemetry/instrumentation";
 import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
 import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
-import {
-  MeterProvider,
-  ConsoleMetricExporter,
-  PeriodicExportingMetricReader,
-} from "@opentelemetry/sdk-metrics";
+import { MeterProvider, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";
-import { Resource } from "@opentelemetry/resources";
 import {
   BatchSpanProcessor,
   ParentBasedSampler,
-  Sampler,
+  type Sampler,
   SamplingDecision,
-  SamplingResult,
+  type SamplingResult,
   SimpleSpanProcessor,
+  type SpanProcessor,
   TraceIdRatioBasedSampler,
 } from "@opentelemetry/sdk-trace-base";
 import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
-import {
-  SEMRESATTRS_SERVICE_INSTANCE_ID,
-  SEMRESATTRS_SERVICE_NAME,
-} from "@opentelemetry/semantic-conventions";
+import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
+import { HostMetrics } from "@opentelemetry/host-metrics";
+import { AwsInstrumentation as AwsSdkInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
+import { awsEcsDetector, awsEc2Detector } from "@opentelemetry/resource-detector-aws";
+import {
+  detectResources,
+  resourceFromAttributes,
+  serviceInstanceIdDetector,
+  osDetector,
+  hostDetector,
+  processDetector,
+  type ResourceDetector,
+} from "@opentelemetry/resources";
 import { env } from "~/env.server";
-import { AuthenticatedEnvironment } from "~/services/apiAuth.server";
+import type { AuthenticatedEnvironment } from "~/services/apiAuth.server";
 import { singleton } from "~/utils/singleton";
 import { LoggerSpanExporter } from "./telemetry/loggerExporter.server";
+import { CompactMetricExporter } from "./telemetry/compactMetricExporter.server";
 import { logger } from "~/services/logger.server";
 import { flattenAttributes } from "@trigger.dev/core/v3";
-import { randomUUID } from "node:crypto";
 import { prisma } from "~/db.server";
+import { metricsRegister } from "~/metrics.server";
+import type { Prisma } from "@trigger.dev/database";
+import { performance } from "node:perf_hooks";
 
 export const SEMINTATTRS_FORCE_RECORDING = "forceRecording";
 
-const SERVICE_INSTANCE_ID = randomUUID();
-
 class CustomWebappSampler implements Sampler {
   constructor(private readonly _baseSampler: Sampler) {}
 
@@ -168,6 +173,22 @@ export async function emitWarnLog(message: string, params: Record<string, unknow
   });
 }
 
+function getResource() {
+  const detectors: ResourceDetector[] = [serviceInstanceIdDetector];
+
+  if (env.INTERNAL_OTEL_ADDITIONAL_DETECTORS_ENABLED) {
+    detectors.push(osDetector, hostDetector, processDetector, awsEcsDetector, awsEc2Detector);
+  }
+
+  const detectedResource = detectResources({ detectors });
+
+  const baseResource = resourceFromAttributes({
+    [ATTR_SERVICE_NAME]: env.SERVICE_NAME,
+  });
+
+  return baseResource.merge(detectedResource);
+}
+
 function setupTelemetry() {
   if (env.INTERNAL_OTEL_TRACE_DISABLED === "1") {
     console.log(`🔦 Tracer disabled, returning a noop tracer`);
@@ -184,19 +205,7 @@ function setupTelemetry() {
 
   const samplingRate = 1.0 / Math.max(parseInt(env.INTERNAL_OTEL_TRACE_SAMPLING_RATE, 10), 1);
 
-  const provider = new NodeTracerProvider({
-    forceFlushTimeoutMillis: 15_000,
-    resource: new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: env.SERVICE_NAME,
-      [SEMRESATTRS_SERVICE_INSTANCE_ID]: SERVICE_INSTANCE_ID,
-    }),
-    sampler: new ParentBasedSampler({
-      root: new CustomWebappSampler(new TraceIdRatioBasedSampler(samplingRate)),
-    }),
-    spanLimits: {
-      attributeCountLimit: 1024,
-    },
-  });
+  const spanProcessors: SpanProcessor[] = [];
 
   if (env.INTERNAL_OTEL_TRACE_EXPORTER_URL) {
     const headers = parseInternalTraceHeaders() ?? {};
@@ -207,7 +216,7 @@ function setupTelemetry() {
       headers,
     });
 
-    provider.addSpanProcessor(
+    spanProcessors.push(
       new BatchSpanProcessor(exporter, {
         maxExportBatchSize: 512,
         scheduledDelayMillis: 1000,
@@ -224,11 +233,22 @@ function setupTelemetry() {
       console.log(`🔦 Tracer: Logger exporter enabled (sampling = ${samplingRate})`);
 
       const loggerExporter = new LoggerSpanExporter();
-
-      provider.addSpanProcessor(new SimpleSpanProcessor(loggerExporter));
+      spanProcessors.push(new SimpleSpanProcessor(loggerExporter));
     }
   }
 
+  const provider = new NodeTracerProvider({
+    forceFlushTimeoutMillis: 15_000,
+    resource: getResource(),
+    sampler: new ParentBasedSampler({
+      root: new CustomWebappSampler(new TraceIdRatioBasedSampler(samplingRate)),
+    }),
+    spanLimits: {
+      attributeCountLimit: 1024,
+    },
+    spanProcessors,
+  });
+
   if (env.INTERNAL_OTEL_LOG_EXPORTER_URL) {
     const headers = parseInternalTraceHeaders() ?? {};
 
@@ -238,24 +258,21 @@ function setupTelemetry() {
       headers,
     });
 
+    const batchLogExporter = new BatchLogRecordProcessor(logExporter, {
+      maxExportBatchSize: 64,
+      scheduledDelayMillis: 200,
+      exportTimeoutMillis: 30000,
+      maxQueueSize: 512,
+    });
+
     const loggerProvider = new LoggerProvider({
-      resource: new Resource({
-        [SEMRESATTRS_SERVICE_NAME]: env.SERVICE_NAME,
-      }),
+      resource: getResource(),
       logRecordLimits: {
         attributeCountLimit: 1000,
       },
+      processors: [batchLogExporter],
     });
 
-    loggerProvider.addLogRecordProcessor(
-      new BatchLogRecordProcessor(logExporter, {
-        maxExportBatchSize: 64,
-        scheduledDelayMillis: 200,
-        exportTimeoutMillis: 30000,
-        maxQueueSize: 512,
-      })
-    );
-
     logs.setGlobalLoggerProvider(loggerProvider);
 
     console.log(
@@ -268,6 +285,9 @@ function setupTelemetry() {
   let instrumentations: Instrumentation[] = [
     new HttpInstrumentation(),
     new ExpressInstrumentation(),
+    new AwsSdkInstrumentation({
+      suppressInternalInstrumentation: true,
+    }),
   ];
 
   if (env.INTERNAL_OTEL_TRACE_INSTRUMENT_PRISMA_ENABLED === "1") {
@@ -296,10 +316,7 @@ function setupMetrics() {
   const exporter = createMetricsExporter();
 
   const meterProvider = new MeterProvider({
-    resource: new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: env.SERVICE_NAME,
-      [SEMRESATTRS_SERVICE_INSTANCE_ID]: SERVICE_INSTANCE_ID,
-    }),
+    resource: getResource(),
     readers: [
       new PeriodicExportingMetricReader({
         exporter,
@@ -313,12 +330,41 @@ function setupMetrics() {
 
   const meter = meterProvider.getMeter("trigger.dev", "3.3.12");
 
-  configurePrismaMetrics(meter);
+  configurePrismaMetrics({ meter });
+  configureNodejsMetrics({ meter });
+  configureHostMetrics({ meterProvider });
 
   return meter;
 }
 
-function configurePrismaMetrics(meter: Meter) {
+function configurePrismaMetrics({ meter }: { meter: Meter }) {
+  // Counters
+  const queriesTotal = meter.createObservableCounter("db.client.queries.total", {
+    description: "Total number of Prisma Client queries executed",
+    unit: "queries",
+  });
+  const datasourceQueriesTotal = meter.createObservableCounter("db.datasource.queries.total", {
+    description: "Total number of datasource queries executed",
+    unit: "queries",
+  });
+  const connectionsOpenedTotal = meter.createObservableCounter("db.pool.connections.opened.total", {
+    description: "Total number of pool connections opened",
+    unit: "connections",
+  });
+  const connectionsClosedTotal = meter.createObservableCounter("db.pool.connections.closed.total", {
+    description: "Total number of pool connections closed",
+    unit: "connections",
+  });
+
+  // Gauges
+  const queriesActive = meter.createObservableGauge("db.client.queries.active", {
+    description: "Number of currently active Prisma Client queries",
+    unit: "queries",
+  });
+  const queriesWait = meter.createObservableGauge("db.client.queries.wait", {
+    description: "Number of queries currently waiting for a connection",
+    unit: "queries",
+  });
   const totalGauge = meter.createObservableGauge("db.pool.connections.total", {
     description: "Open Prisma-pool connections",
     unit: "connections",
@@ -332,29 +378,376 @@ function configurePrismaMetrics(meter: Meter) {
     unit: "connections",
   });
 
+  // Histogram statistics as gauges
+  const queriesWaitTimeCount = meter.createObservableGauge("db.client.queries.wait_time.count", {
+    description: "Number of wait time observations",
+    unit: "observations",
+  });
+  const queriesWaitTimeSum = meter.createObservableGauge("db.client.queries.wait_time.sum", {
+    description: "Total wait time across all observations",
+    unit: "ms",
+  });
+  const queriesWaitTimeMean = meter.createObservableGauge("db.client.queries.wait_time.mean", {
+    description: "Average wait time for a connection",
+    unit: "ms",
+  });
+
+  const queriesDurationCount = meter.createObservableGauge("db.client.queries.duration.count", {
+    description: "Number of query duration observations",
+    unit: "observations",
+  });
+  const queriesDurationSum = meter.createObservableGauge("db.client.queries.duration.sum", {
+    description: "Total query duration across all observations",
+    unit: "ms",
+  });
+  const queriesDurationMean = meter.createObservableGauge("db.client.queries.duration.mean", {
+    description: "Average duration of Prisma Client queries",
+    unit: "ms",
+  });
+
+  const datasourceQueriesDurationCount = meter.createObservableGauge(
+    "db.datasource.queries.duration.count",
+    {
+      description: "Number of datasource query duration observations",
+      unit: "observations",
+    }
+  );
+  const datasourceQueriesDurationSum = meter.createObservableGauge(
+    "db.datasource.queries.duration.sum",
+    {
+      description: "Total datasource query duration across all observations",
+      unit: "ms",
+    }
+  );
+  const datasourceQueriesDurationMean = meter.createObservableGauge(
+    "db.datasource.queries.duration.mean",
+    {
+      description: "Average duration of datasource queries",
+      unit: "ms",
+    }
+  );
+
   // Single helper so we hit Prisma only once per scrape ---------------------
-  async function readPoolCounters() {
-    const { gauges } = await prisma.$metrics.json();
+  async function readPrismaMetrics() {
+    const metrics = await prisma.$metrics.json();
 
-    const busy = gauges.find((g) => g.key === "prisma_pool_connections_busy")?.value ?? 0;
-    const free = gauges.find((g) => g.key === "prisma_pool_connections_idle")?.value ?? 0;
-    const total =
-      gauges.find((g) => g.key === "prisma_pool_connections_open")?.value ?? busy + free; // fallback compute
+    // Extract counter values
+    const counters: Record<string, number> = {};
+    for (const counter of metrics.counters) {
+      counters[counter.key] = counter.value;
+    }
+
+    // Extract gauge values
+    const gauges: Record<string, number> = {};
+    for (const gauge of metrics.gauges) {
+      gauges[gauge.key] = gauge.value;
+    }
+
+    // Extract histogram values
+    const histograms: Record<string, Prisma.MetricHistogram> = {};
+    for (const histogram of metrics.histograms) {
+      histograms[histogram.key] = histogram.value;
+    }
 
-    return { total, busy, free };
+    return {
+      counters: {
+        queriesTotal: counters["prisma_client_queries_total"] ?? 0,
+        datasourceQueriesTotal: counters["prisma_datasource_queries_total"] ?? 0,
+        connectionsOpenedTotal: counters["prisma_pool_connections_opened_total"] ?? 0,
+        connectionsClosedTotal: counters["prisma_pool_connections_closed_total"] ?? 0,
+      },
+      gauges: {
+        queriesActive: gauges["prisma_client_queries_active"] ?? 0,
+        queriesWait: gauges["prisma_client_queries_wait"] ?? 0,
+        connectionsOpen: gauges["prisma_pool_connections_open"] ?? 0,
+        connectionsBusy: gauges["prisma_pool_connections_busy"] ?? 0,
+        connectionsIdle: gauges["prisma_pool_connections_idle"] ?? 0,
+      },
+      histograms: {
+        queriesWait: histograms["prisma_client_queries_wait_histogram_ms"],
+        queriesDuration: histograms["prisma_client_queries_duration_histogram_ms"],
+        datasourceQueriesDuration: histograms["prisma_datasource_queries_duration_histogram_ms"],
+      },
+    };
   }
 
   meter.addBatchObservableCallback(
     async (res) => {
-      const { total, busy, free } = await readPoolCounters();
-      res.observe(totalGauge, total);
-      res.observe(busyGauge, busy);
-      res.observe(freeGauge, free);
+      const { counters, gauges, histograms } = await readPrismaMetrics();
+
+      // Observe counters
+      res.observe(queriesTotal, counters.queriesTotal);
+      res.observe(datasourceQueriesTotal, counters.datasourceQueriesTotal);
+      res.observe(connectionsOpenedTotal, counters.connectionsOpenedTotal);
+      res.observe(connectionsClosedTotal, counters.connectionsClosedTotal);
+
+      // Observe gauges
+      res.observe(queriesActive, gauges.queriesActive);
+      res.observe(queriesWait, gauges.queriesWait);
+      res.observe(totalGauge, gauges.connectionsOpen);
+      res.observe(busyGauge, gauges.connectionsBusy);
+      res.observe(freeGauge, gauges.connectionsIdle);
+
+      // Observe histogram statistics as gauges
+      if (histograms.queriesWait) {
+        res.observe(queriesWaitTimeCount, histograms.queriesWait.count);
+        res.observe(queriesWaitTimeSum, histograms.queriesWait.sum);
+        res.observe(
+          queriesWaitTimeMean,
+          histograms.queriesWait.count > 0
+            ? histograms.queriesWait.sum / histograms.queriesWait.count
+            : 0
+        );
+      }
+
+      if (histograms.queriesDuration) {
+        res.observe(queriesDurationCount, histograms.queriesDuration.count);
+        res.observe(queriesDurationSum, histograms.queriesDuration.sum);
+        res.observe(
+          queriesDurationMean,
+          histograms.queriesDuration.count > 0
+            ? histograms.queriesDuration.sum / histograms.queriesDuration.count
+            : 0
+        );
+      }
+
+      if (histograms.datasourceQueriesDuration) {
+        res.observe(datasourceQueriesDurationCount, histograms.datasourceQueriesDuration.count);
+        res.observe(datasourceQueriesDurationSum, histograms.datasourceQueriesDuration.sum);
+        res.observe(
+          datasourceQueriesDurationMean,
+          histograms.datasourceQueriesDuration.count > 0
+            ? histograms.datasourceQueriesDuration.sum / histograms.datasourceQueriesDuration.count
+            : 0
+        );
+      }
     },
-    [totalGauge, busyGauge, freeGauge]
+    [
+      queriesTotal,
+      datasourceQueriesTotal,
+      connectionsOpenedTotal,
+      connectionsClosedTotal,
+      queriesActive,
+      queriesWait,
+      totalGauge,
+      busyGauge,
+      freeGauge,
+      queriesWaitTimeCount,
+      queriesWaitTimeSum,
+      queriesWaitTimeMean,
+      queriesDurationCount,
+      queriesDurationSum,
+      queriesDurationMean,
+      datasourceQueriesDurationCount,
+      datasourceQueriesDurationSum,
+      datasourceQueriesDurationMean,
+    ]
   );
 }
 
+function configureNodejsMetrics({ meter }: { meter: Meter }) {
+  if (!env.INTERNAL_OTEL_NODEJS_METRICS_ENABLED) {
+    return;
+  }
+
+  console.log("🔦 Metrics: Node.js runtime metrics enabled (handles, requests, event loop)");
+
+  // UV Threadpool size - based on UV_THREADPOOL_SIZE env var (default 4)
+  const uvThreadpoolSizeGauge = meter.createObservableGauge("nodejs.uv_threadpool.size", {
+    description: "Size of the libuv threadpool",
+    unit: "threads",
+  });
+
+  // Active handles - total and by type
+  const activeHandlesGauge = meter.createObservableGauge("nodejs.active_handles", {
+    description: "Number of active libuv handles grouped by handle type",
+    unit: "handles",
+  });
+  const activeHandlesTotalGauge = meter.createObservableGauge("nodejs.active_handles.total", {
+    description: "Total number of active handles",
+    unit: "handles",
+  });
+
+  // Active requests - total and by type
+  const activeRequestsGauge = meter.createObservableGauge("nodejs.active_requests", {
+    description: "Number of active libuv requests grouped by request type",
+    unit: "requests",
+  });
+  const activeRequestsTotalGauge = meter.createObservableGauge("nodejs.active_requests.total", {
+    description: "Total number of active requests",
+    unit: "requests",
+  });
+
+  // Event loop lag metrics
+  const eventLoopLagMinGauge = meter.createObservableGauge("nodejs.eventloop.lag.min", {
+    description: "Event loop minimum delay",
+    unit: "s",
+  });
+  const eventLoopLagMaxGauge = meter.createObservableGauge("nodejs.eventloop.lag.max", {
+    description: "Event loop maximum delay",
+    unit: "s",
+  });
+  const eventLoopLagMeanGauge = meter.createObservableGauge("nodejs.eventloop.lag.mean", {
+    description: "Event loop mean delay",
+    unit: "s",
+  });
+  const eventLoopLagP50Gauge = meter.createObservableGauge("nodejs.eventloop.lag.p50", {
+    description: "Event loop 50th percentile delay",
+    unit: "s",
+  });
+  const eventLoopLagP90Gauge = meter.createObservableGauge("nodejs.eventloop.lag.p90", {
+    description: "Event loop 90th percentile delay",
+    unit: "s",
+  });
+  const eventLoopLagP99Gauge = meter.createObservableGauge("nodejs.eventloop.lag.p99", {
+    description: "Event loop 99th percentile delay",
+    unit: "s",
+  });
+  // ELU observable gauge (unit is a ratio, 0..1)
+  const eluGauge = meter.createObservableGauge("nodejs.event_loop.utilization", {
+    description: "Event loop utilization over the last collection interval",
+    unit: "1", // OpenTelemetry convention for ratios
+  });
+
+  // Get UV threadpool size (defaults to 4 if not set)
+  const uvThreadpoolSize = parseInt(process.env.UV_THREADPOOL_SIZE || "4", 10);
+
+  let lastEventLoopUtilization = performance.eventLoopUtilization();
+
+  // Single helper to read metrics from prom-client
+  async function readNodeMetrics() {
+    const metrics = await metricsRegister.getMetricsAsJSON();
+
+    // Get handle metrics with types
+    const activeHandles = metrics.find((m) => m.name === "nodejs_active_handles");
+    const activeHandlesTotal = metrics.find((m) => m.name === "nodejs_active_handles_total");
+
+    // Get request metrics with types
+    const activeRequests = metrics.find((m) => m.name === "nodejs_active_requests");
+    const activeRequestsTotal = metrics.find((m) => m.name === "nodejs_active_requests_total");
+
+    // Event loop metrics
+    const eventLoopLagMin = metrics.find((m) => m.name === "nodejs_eventloop_lag_min_seconds");
+    const eventLoopLagMax = metrics.find((m) => m.name === "nodejs_eventloop_lag_max_seconds");
+    const eventLoopLagMean = metrics.find((m) => m.name === "nodejs_eventloop_lag_mean_seconds");
+    const eventLoopLagP50 = metrics.find((m) => m.name === "nodejs_eventloop_lag_p50_seconds");
+    const eventLoopLagP90 = metrics.find((m) => m.name === "nodejs_eventloop_lag_p90_seconds");
+    const eventLoopLagP99 = metrics.find((m) => m.name === "nodejs_eventloop_lag_p99_seconds");
+
+    // Extract handle types
+    const handlesByType: Record<string, number> = {};
+    if (activeHandles?.values) {
+      for (const value of activeHandles.values) {
+        const type = value.labels?.type;
+        if (type) {
+          handlesByType[type] = value.value;
+        }
+      }
+    }
+
+    // Extract request types
+    const requestsByType: Record<string, number> = {};
+    if (activeRequests?.values) {
+      for (const value of activeRequests.values) {
+        const type = value.labels?.type;
+        if (type) {
+          requestsByType[type] = value.value;
+        }
+      }
+    }
+
+    const currentEventLoopUtilization = performance.eventLoopUtilization();
+    // Diff over [lastSnapshot, current]
+    const diff = performance.eventLoopUtilization(
+      currentEventLoopUtilization,
+      lastEventLoopUtilization
+    );
+
+    // diff.utilization is between 0 and 1 (fraction of time "active")
+    const utilization = Number.isFinite(diff.utilization) ? diff.utilization : 0;
+
+    return {
+      threadpoolSize: uvThreadpoolSize,
+      handlesByType,
+      handlesTotal: activeHandlesTotal?.values?.[0]?.value ?? 0,
+      requestsByType,
+      requestsTotal: activeRequestsTotal?.values?.[0]?.value ?? 0,
+      eventLoop: {
+        min: eventLoopLagMin?.values?.[0]?.value ?? 0,
+        max: eventLoopLagMax?.values?.[0]?.value ?? 0,
+        mean: eventLoopLagMean?.values?.[0]?.value ?? 0,
+        p50: eventLoopLagP50?.values?.[0]?.value ?? 0,
+        p90: eventLoopLagP90?.values?.[0]?.value ?? 0,
+        p99: eventLoopLagP99?.values?.[0]?.value ?? 0,
+        utilization,
+      },
+    };
+  }
+
+  meter.addBatchObservableCallback(
+    async (res) => {
+      const {
+        threadpoolSize,
+        handlesByType,
+        handlesTotal,
+        requestsByType,
+        requestsTotal,
+        eventLoop,
+      } = await readNodeMetrics();
+
+      // Observe UV threadpool size
+      res.observe(uvThreadpoolSizeGauge, threadpoolSize);
+
+      // Observe handle metrics by type
+      for (const [type, count] of Object.entries(handlesByType)) {
+        res.observe(activeHandlesGauge, count, { type });
+      }
+      res.observe(activeHandlesTotalGauge, handlesTotal);
+
+      // Observe request metrics by type
+      for (const [type, count] of Object.entries(requestsByType)) {
+        res.observe(activeRequestsGauge, count, { type });
+      }
+      res.observe(activeRequestsTotalGauge, requestsTotal);
+
+      // Observe event loop metrics
+      res.observe(eventLoopLagMinGauge, eventLoop.min);
+      res.observe(eventLoopLagMaxGauge, eventLoop.max);
+      res.observe(eventLoopLagMeanGauge, eventLoop.mean);
+      res.observe(eventLoopLagP50Gauge, eventLoop.p50);
+      res.observe(eventLoopLagP90Gauge, eventLoop.p90);
+      res.observe(eventLoopLagP99Gauge, eventLoop.p99);
+      res.observe(eluGauge, eventLoop.utilization);
+    },
+    [
+      uvThreadpoolSizeGauge,
+      activeHandlesGauge,
+      activeHandlesTotalGauge,
+      activeRequestsGauge,
+      activeRequestsTotalGauge,
+      eventLoopLagMinGauge,
+      eventLoopLagMaxGauge,
+      eventLoopLagMeanGauge,
+      eventLoopLagP50Gauge,
+      eventLoopLagP90Gauge,
+      eventLoopLagP99Gauge,
+      eluGauge,
+    ]
+  );
+}
+
+function configureHostMetrics({ meterProvider }: { meterProvider: MeterProvider }) {
+  if (!env.INTERNAL_OTEL_HOST_METRICS_ENABLED) {
+    return;
+  }
+
+  console.log("🔦 Metrics: Host metrics enabled (CPU, memory, network)");
+
+  const hostMetrics = new HostMetrics({ meterProvider });
+
+  hostMetrics.start();
+}
+
 const SemanticEnvResources = {
   ENV_ID: "$trigger.env.id",
   ENV_TYPE: "$trigger.env.type",
@@ -417,6 +810,7 @@ function createMetricsExporter() {
       headers,
     });
   } else {
-    return new ConsoleMetricExporter();
+    console.log(`🔦 Tracer: Compact metric exporter enabled`);
+    return new CompactMetricExporter();
   }
 }
diff --git a/apps/webapp/app/v3/tracing.server.ts b/apps/webapp/app/v3/tracing.server.ts
index 936cf9a572d..b02fc5ec696 100644
--- a/apps/webapp/app/v3/tracing.server.ts
+++ b/apps/webapp/app/v3/tracing.server.ts
@@ -41,33 +41,14 @@ export async function startSpanWithEnv<T>(
   fn: (span: Span) => Promise<T>,
   options?: SpanOptions
 ): Promise<T> {
-  return startSpan(
-    tracer,
-    name,
-    async (span) => {
-      try {
-        return await fn(span);
-      } catch (e) {
-        if (e instanceof Error) {
-          span.recordException(e);
-        } else {
-          span.recordException(new Error(String(e)));
-        }
-
-        throw e;
-      } finally {
-        span.end();
-      }
+  return startSpan(tracer, name, fn, {
+    ...options,
+    attributes: {
+      ...attributesFromAuthenticatedEnv(env),
+      ...options?.attributes,
     },
-    {
-      attributes: {
-        ...attributesFromAuthenticatedEnv(env),
-        ...options?.attributes,
-      },
-      kind: SpanKind.SERVER,
-      ...options,
-    }
-  );
+    kind: SpanKind.SERVER,
+  });
 }
 
 export async function emitDebugLog(
diff --git a/apps/webapp/app/v3/utils/enrichCreatableEvents.server.ts b/apps/webapp/app/v3/utils/enrichCreatableEvents.server.ts
index 70cf1e37495..f718c13d2dd 100644
--- a/apps/webapp/app/v3/utils/enrichCreatableEvents.server.ts
+++ b/apps/webapp/app/v3/utils/enrichCreatableEvents.server.ts
@@ -1,12 +1,12 @@
-import type { CreatableEvent } from "../eventRepository.server";
+import type { CreateEventInput } from "../eventRepository/eventRepository.types";
 
-export function enrichCreatableEvents(events: CreatableEvent[]) {
+export function enrichCreatableEvents(events: CreateEventInput[]) {
   return events.map((event) => {
     return enrichCreatableEvent(event);
   });
 }
 
-function enrichCreatableEvent(event: CreatableEvent): CreatableEvent {
+function enrichCreatableEvent(event: CreateEventInput): CreateEventInput {
   const message = formatPythonStyle(event.message, event.properties);
 
   event.message = message;
@@ -15,10 +15,14 @@ function enrichCreatableEvent(event: CreatableEvent): CreatableEvent {
   return event;
 }
 
-function enrichStyle(event: CreatableEvent) {
+function enrichStyle(event: CreateEventInput) {
   const baseStyle = event.style ?? {};
   const props = event.properties;
 
+  if (!props) {
+    return baseStyle;
+  }
+
   // Direct property access and early returns
   // GenAI System check
   const system = props["gen_ai.system"];
@@ -66,7 +70,7 @@ function formatPythonStyle(template: string, values: Record<string, any>): strin
   return template.replace(/\{([^}]+?)(?:!r)?\}/g, (match, key) => {
     const hasRepr = match.endsWith("!r}");
     const actualKey = hasRepr ? key : key;
-    const value = values[actualKey];
+    const value = values?.[actualKey];
 
     if (value === undefined) {
       return match;
diff --git a/apps/webapp/app/v3/vercel/index.ts b/apps/webapp/app/v3/vercel/index.ts
new file mode 100644
index 00000000000..f34f0b64c6b
--- /dev/null
+++ b/apps/webapp/app/v3/vercel/index.ts
@@ -0,0 +1,17 @@
+export * from "./vercelProjectIntegrationSchema";
+
+export function getVercelInstallParams(request: Request) {
+  const url = new URL(request.url);
+  const code = url.searchParams.get("code");
+  const configurationId = url.searchParams.get("configurationId");
+  const integration = url.searchParams.get("integration");
+  const next = url.searchParams.get("next");
+
+  if (code && configurationId && (integration === "vercel" || !integration)) {
+    return { code, configurationId, next };
+  }
+
+  return null;
+}
+
+
diff --git a/apps/webapp/app/v3/vercel/vercelOAuthState.server.ts b/apps/webapp/app/v3/vercel/vercelOAuthState.server.ts
new file mode 100644
index 00000000000..31f42acc879
--- /dev/null
+++ b/apps/webapp/app/v3/vercel/vercelOAuthState.server.ts
@@ -0,0 +1,40 @@
+import { generateJWT, validateJWT } from "@trigger.dev/core/v3/jwt";
+import { z } from "zod";
+import { env } from "~/env.server";
+
+export const VercelOAuthStateSchema = z.object({
+  organizationId: z.string(),
+  projectId: z.string(),
+  environmentSlug: z.string(),
+  organizationSlug: z.string(),
+  projectSlug: z.string(),
+});
+
+export type VercelOAuthState = z.infer<typeof VercelOAuthStateSchema>;
+
+export async function generateVercelOAuthState(
+  params: VercelOAuthState
+): Promise<string> {
+  return generateJWT({
+    secretKey: env.ENCRYPTION_KEY,
+    payload: params,
+    expirationTime: "15m",
+  });
+}
+
+export async function validateVercelOAuthState(
+  token: string
+): Promise<{ ok: true; state: VercelOAuthState } | { ok: false; error: string }> {
+  const result = await validateJWT(token, env.ENCRYPTION_KEY);
+
+  if (!result.ok) {
+    return { ok: false, error: result.error };
+  }
+
+  const parseResult = VercelOAuthStateSchema.safeParse(result.payload);
+  if (!parseResult.success) {
+    return { ok: false, error: "Invalid state payload" };
+  }
+
+  return { ok: true, state: parseResult.data };
+}
diff --git a/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts b/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts
new file mode 100644
index 00000000000..213e730c643
--- /dev/null
+++ b/apps/webapp/app/v3/vercel/vercelProjectIntegrationSchema.ts
@@ -0,0 +1,225 @@
+import { Result } from "neverthrow";
+import { z } from "zod";
+
+export const EnvSlugSchema = z.enum(["dev", "stg", "prod", "preview"]);
+export type EnvSlug = z.infer<typeof EnvSlugSchema>;
+
+export const ALL_ENV_SLUGS: EnvSlug[] = ["dev", "stg", "prod", "preview"];
+
+const safeJsonParse = Result.fromThrowable(
+  (val: string) => JSON.parse(val) as unknown,
+  () => null
+);
+
+/**
+ * Zod transform for form fields that submit JSON-encoded arrays.
+ * Parses the string as JSON and returns the array, or null if invalid.
+ */
+export const jsonArrayField = z.string().optional().transform((val) => {
+  if (!val) return null;
+  return safeJsonParse(val).match(
+    (parsed) => (Array.isArray(parsed) ? parsed : null),
+    () => null
+  );
+});
+
+/**
+ * Zod transform for form fields that submit JSON-encoded EnvSlug arrays.
+ * Parses the string as JSON and validates each element is a valid EnvSlug.
+ * Invalid elements are filtered out rather than rejecting the whole array.
+ */
+export const envSlugArrayField = z.string().optional().transform((val): EnvSlug[] | null => {
+  if (!val) return null;
+  return safeJsonParse(val).match(
+    (parsed) => {
+      if (!Array.isArray(parsed)) return null;
+      return parsed.filter((item): item is EnvSlug => EnvSlugSchema.safeParse(item).success);
+    },
+    () => null
+  );
+});
+
+export const VercelIntegrationConfigSchema = z.object({
+  atomicBuilds: z.array(EnvSlugSchema).nullable().optional(),
+  pullEnvVarsBeforeBuild: z.array(EnvSlugSchema).nullable().optional(),
+  /** Maps a custom Vercel environment to Trigger.dev's staging environment. */
+  vercelStagingEnvironment: z.object({
+    environmentId: z.string(),
+    displayName: z.string(),
+  }).nullable().optional(),
+  discoverEnvVars: z.array(EnvSlugSchema).nullable().optional(),
+});
+
+export type VercelIntegrationConfig = z.infer<typeof VercelIntegrationConfigSchema>;
+
+export const TriggerEnvironmentType = z.enum(["PRODUCTION", "STAGING", "PREVIEW", "DEVELOPMENT"]);
+export type TriggerEnvironmentType = z.infer<typeof TriggerEnvironmentType>;
+
+/**
+ * Per-environment, per-variable sync settings.
+ * Missing env slug = sync all vars. Missing var in env = sync by default.
+ * Only explicitly `false` entries disable sync.
+ */
+export const SyncEnvVarsMappingSchema = z.record(EnvSlugSchema, z.record(z.string(), z.boolean())).default({});
+
+export type SyncEnvVarsMapping = z.infer<typeof SyncEnvVarsMappingSchema>;
+
+export const VercelProjectIntegrationDataSchema = z.object({
+  config: VercelIntegrationConfigSchema,
+  syncEnvVarsMapping: SyncEnvVarsMappingSchema,
+  vercelProjectName: z.string(),
+  vercelTeamId: z.string().nullable(),
+  vercelTeamSlug: z.string().optional(),
+  vercelProjectId: z.string(),
+  onboardingCompleted: z.boolean().optional(),
+});
+
+export type VercelProjectIntegrationData = z.infer<typeof VercelProjectIntegrationDataSchema>;
+
+export function createDefaultVercelIntegrationData(
+  vercelProjectId: string,
+  vercelProjectName: string,
+  vercelTeamId: string | null,
+  vercelTeamSlug?: string
+): VercelProjectIntegrationData {
+  return {
+    config: {
+      atomicBuilds: ["prod"],
+      pullEnvVarsBeforeBuild: ["prod", "stg", "preview"],
+      discoverEnvVars: ["prod", "stg", "preview"],
+      vercelStagingEnvironment: null,
+    },
+    syncEnvVarsMapping: {},
+    vercelProjectId,
+    vercelProjectName,
+    vercelTeamId,
+    vercelTeamSlug,
+  };
+}
+
+/**
+ * Maps a Trigger.dev environment type to its Vercel target identifier(s).
+ * Returns null for STAGING when no custom environment is configured.
+ */
+export function envTypeToVercelTarget(
+  envType: TriggerEnvironmentType,
+  stagingEnvironmentId?: string | null
+): string[] | null {
+  switch (envType) {
+    case "PRODUCTION":
+      return ["production"];
+    case "STAGING":
+      return stagingEnvironmentId ? [stagingEnvironmentId] : null;
+    case "PREVIEW":
+      return ["preview"];
+    case "DEVELOPMENT":
+      return ["development"];
+  }
+}
+
+export function getAvailableEnvSlugs(
+  hasStagingEnvironment: boolean,
+  hasPreviewEnvironment: boolean
+): EnvSlug[] {
+  return ALL_ENV_SLUGS.filter((s) => {
+    if (s === "stg" && !hasStagingEnvironment) return false;
+    if (s === "preview" && !hasPreviewEnvironment) return false;
+    return true;
+  });
+}
+
+export function getAvailableEnvSlugsForBuildSettings(
+  hasStagingEnvironment: boolean,
+  hasPreviewEnvironment: boolean
+): EnvSlug[] {
+  return getAvailableEnvSlugs(hasStagingEnvironment, hasPreviewEnvironment).filter((s) => s !== "dev");
+}
+
+export function isDiscoverEnvVarsEnabledForEnvironment(
+  discoverEnvVars: EnvSlug[] | null | undefined,
+  environmentType: TriggerEnvironmentType
+): boolean {
+  if (!discoverEnvVars || discoverEnvVars.length === 0) {
+    return false;
+  }
+  const envSlug = envTypeToSlug(environmentType);
+  return discoverEnvVars.includes(envSlug);
+}
+
+export function envTypeToSlug(environmentType: TriggerEnvironmentType): EnvSlug {
+  switch (environmentType) {
+    case "DEVELOPMENT":
+      return "dev";
+    case "STAGING":
+      return "stg";
+    case "PRODUCTION":
+      return "prod";
+    case "PREVIEW":
+      return "preview";
+  }
+}
+
+export function envSlugToType(slug: EnvSlug): TriggerEnvironmentType {
+  switch (slug) {
+    case "dev":
+      return "DEVELOPMENT";
+    case "stg":
+      return "STAGING";
+    case "prod":
+      return "PRODUCTION";
+    case "preview":
+      return "PREVIEW";
+  }
+}
+
+export function shouldSyncEnvVar(
+  mapping: SyncEnvVarsMapping,
+  envVarName: string,
+  environmentType: TriggerEnvironmentType
+): boolean {
+  const envSlug = envTypeToSlug(environmentType);
+  const envSettings = mapping[envSlug];
+  if (!envSettings) {
+    return true;
+  }
+  return envSettings[envVarName] !== false;
+}
+
+export function shouldSyncEnvVarForAnyEnvironment(
+  mapping: SyncEnvVarsMapping,
+  envVarName: string
+): boolean {
+  for (const slug of ALL_ENV_SLUGS) {
+    const envSettings = mapping[slug];
+    if (!envSettings) {
+      return true;
+    }
+    if (envSettings[envVarName] !== false) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+export function isPullEnvVarsEnabledForEnvironment(
+  pullEnvVarsBeforeBuild: EnvSlug[] | null | undefined,
+  environmentType: TriggerEnvironmentType
+): boolean {
+  if (!pullEnvVarsBeforeBuild || pullEnvVarsBeforeBuild.length === 0) {
+    return false;
+  }
+  const envSlug = envTypeToSlug(environmentType);
+  return pullEnvVarsBeforeBuild.includes(envSlug);
+}
+
+export function isAtomicBuildsEnabledForEnvironment(
+  atomicBuilds: EnvSlug[] | null | undefined,
+  environmentType: TriggerEnvironmentType
+): boolean {
+  if (!atomicBuilds || atomicBuilds.length === 0) {
+    return false;
+  }
+  const envSlug = envTypeToSlug(environmentType);
+  return atomicBuilds.includes(envSlug);
+}
diff --git a/apps/webapp/app/v3/vercel/vercelUrls.server.ts b/apps/webapp/app/v3/vercel/vercelUrls.server.ts
new file mode 100644
index 00000000000..957e0d2907b
--- /dev/null
+++ b/apps/webapp/app/v3/vercel/vercelUrls.server.ts
@@ -0,0 +1,26 @@
+/**
+ * Validates `next` parameter from Vercel callbacks.
+ * Only allows vercel.com subdomains (the expected source) and same-origin relative paths.
+ */
+export function sanitizeVercelNextUrl(url: string | undefined | null): string | undefined {
+  if (!url) return undefined;
+
+  // Allow relative paths (same-origin) but reject protocol-relative URLs
+  if (url.startsWith("/") && !url.startsWith("//")) {
+    return url;
+  }
+
+  try {
+    const parsed = new URL(url);
+    if (
+      parsed.protocol === "https:" &&
+      /^([a-z0-9-]+\.)*vercel\.com$/i.test(parsed.hostname)
+    ) {
+      return parsed.toString();
+    }
+  } catch {
+    // Invalid URL
+  }
+
+  return undefined;
+}
diff --git a/apps/webapp/evals/aiQuery.eval.ts b/apps/webapp/evals/aiQuery.eval.ts
new file mode 100644
index 00000000000..b65cf076ddc
--- /dev/null
+++ b/apps/webapp/evals/aiQuery.eval.ts
@@ -0,0 +1,374 @@
+import { evalite } from "evalite";
+import { Levenshtein } from "autoevals";
+import { AIQueryService } from "~/v3/services/aiQueryService.server";
+import { runsSchema } from "~/v3/querySchemas";
+import dotenv from "dotenv";
+import { traceAISDKModel } from "evalite/ai-sdk";
+import { openai } from "@ai-sdk/openai";
+
+dotenv.config({ path: "../../.env" });
+
+// Helper to normalize queries for comparison
+function normalizeQuery(query: string): string {
+  return query
+    .replace(/\s+/g, " ")
+    .replace(/\(\s+/g, "(")
+    .replace(/\s+\)/g, ")")
+    .trim()
+    .toLowerCase();
+}
+
+// Type for parsed query results
+interface ParsedQueryResult {
+  success: boolean;
+  query?: string;
+  error?: string;
+}
+
+// Custom scorer that checks if the generated query is semantically similar
+// and also syntactically valid
+const QuerySimilarity = {
+  name: "QuerySimilarity",
+  scorer: async ({
+    input,
+    output,
+    expected,
+  }: {
+    input: string;
+    output: string;
+    expected?: string;
+  }) => {
+    if (!expected) {
+      return 0;
+    }
+
+    // Parse the output to extract the query
+    const outputParsed = JSON.parse(output) as ParsedQueryResult;
+    const expectedParsed = JSON.parse(expected) as ParsedQueryResult;
+
+    // Check success status first
+    if (outputParsed.success !== expectedParsed.success) {
+      return 0;
+    }
+
+    // If both failed, check if error messages are similar
+    if (!outputParsed.success && !expectedParsed.success) {
+      // Give partial credit for correctly identifying an error case
+      return 0.5;
+    }
+
+    // If both succeeded, compare the queries
+    if (outputParsed.success && expectedParsed.success) {
+      const normalizedOutput = normalizeQuery(outputParsed.query ?? "");
+      const normalizedExpected = normalizeQuery(expectedParsed.query ?? "");
+
+      // Key patterns to check
+      const patterns = [
+        // Table name
+        /from\s+runs/i,
+        // Status filter patterns
+        /status\s*=\s*'[^']+'/i,
+        /status\s+in\s*\([^)]+\)/i,
+        // Time patterns
+        /interval\s+\d+\s+(day|hour|minute|week|month)/i,
+        /triggered_at\s*>/i,
+        // Aggregation patterns
+        /count\(\)/i,
+        /sum\(/i,
+        /avg\(/i,
+        /group\s+by/i,
+        // Ordering
+        /order\s+by/i,
+        // Limit
+        /limit\s+\d+/i,
+      ];
+
+      let matchScore = 0;
+      let totalPatterns = 0;
+
+      for (const pattern of patterns) {
+        const outputMatch = pattern.test(normalizedOutput);
+        const expectedMatch = pattern.test(normalizedExpected);
+
+        if (expectedMatch) {
+          totalPatterns++;
+          if (outputMatch) {
+            matchScore++;
+          }
+        }
+      }
+
+      // Base score from pattern matching
+      const patternScore = totalPatterns > 0 ? matchScore / totalPatterns : 0.5;
+
+      // Use Levenshtein for overall similarity
+      const levenshteinResult = await Levenshtein({
+        output: normalizedOutput,
+        expected: normalizedExpected,
+      });
+      const levenshteinScore = levenshteinResult?.score ?? 0;
+
+      // Weighted combination
+      return 0.6 * patternScore + 0.4 * levenshteinScore;
+    }
+
+    return 0;
+  },
+};
+
+evalite("AI Query Generator", {
+  data: async () => {
+    return [
+      // Basic SELECT queries
+      {
+        input: "Show me all runs",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Get the 10 most recent runs",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+ORDER BY triggered_at DESC
+LIMIT 10`,
+        }),
+      },
+
+      // Status filtering
+      {
+        input: "Show failed runs",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE status = 'Failed'
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Get all completed runs",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE status = 'Completed'
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Find runs that crashed or timed out",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE status IN ('Crashed', 'Timed out')
+LIMIT 100`,
+        }),
+      },
+
+      // Time-based filtering
+      {
+        input: "Runs from the last 7 days",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE triggered_at > now() - INTERVAL 7 DAY
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Show runs from the past hour",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE triggered_at > now() - INTERVAL 1 HOUR
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Failed runs in the last 24 hours",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE status = 'Failed'
+  AND triggered_at > now() - INTERVAL 1 DAY
+ORDER BY triggered_at DESC
+LIMIT 100`,
+        }),
+      },
+
+      // Aggregations
+      {
+        input: "Count of runs by status",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT status, count() AS count
+FROM runs
+GROUP BY status
+ORDER BY count DESC`,
+        }),
+      },
+      {
+        input: "How many runs per task?",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT task_identifier, count() AS run_count
+FROM runs
+GROUP BY task_identifier
+ORDER BY run_count DESC
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Average execution duration by task",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT task_identifier, avg(execution_duration) AS avg_duration
+FROM runs
+GROUP BY task_identifier
+ORDER BY avg_duration DESC
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Total cost by task in the last 30 days",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT task_identifier, sum(total_cost) AS total_cost
+FROM runs
+WHERE triggered_at > now() - INTERVAL 30 DAY
+GROUP BY task_identifier
+ORDER BY total_cost DESC
+LIMIT 100`,
+        }),
+      },
+
+      // Complex queries
+      {
+        input: "Top 10 most expensive failed runs from last week",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT run_id, task_identifier, status, total_cost, triggered_at
+FROM runs
+WHERE status = 'Failed'
+  AND triggered_at > now() - INTERVAL 7 DAY
+ORDER BY total_cost DESC
+LIMIT 10`,
+        }),
+      },
+      {
+        input: "Runs using large machines that took more than 5 minutes",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE machine IN ('large-1x', 'large-2x')
+  AND usage_duration > 300000
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Show p95 execution duration by task for completed runs",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT task_identifier, quantile(0.95)(execution_duration) AS p95_duration
+FROM runs
+WHERE status = 'Completed'
+  AND execution_duration IS NOT NULL
+GROUP BY task_identifier
+ORDER BY p95_duration DESC
+LIMIT 100`,
+        }),
+      },
+
+      // Specific columns
+      {
+        input: "Just show run IDs and their statuses",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT run_id, status
+FROM runs
+LIMIT 100`,
+        }),
+      },
+      {
+        input: "Get run_id, task, status and cost for recent runs",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT run_id, task_identifier, status, total_cost
+FROM runs
+ORDER BY triggered_at DESC
+LIMIT 100`,
+        }),
+      },
+
+      // Root runs
+      {
+        input: "Show only root runs (not child runs)",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE is_root_run = 1
+LIMIT 100`,
+        }),
+      },
+
+      // Queue filtering
+      {
+        input: "Runs in the shared queue",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE queue LIKE '%shared%'
+LIMIT 100`,
+        }),
+      },
+
+      // Tags
+      {
+        input: "Find runs with tag 'important'",
+        expected: JSON.stringify({
+          success: true,
+          query: `SELECT *
+FROM runs
+WHERE has(tags, 'important')
+LIMIT 100`,
+        }),
+      },
+
+      // Error cases
+      {
+        input: "Do something",
+        expected: JSON.stringify({
+          success: false,
+          error: "Please be more specific about what data you want to query",
+        }),
+      },
+      {
+        input: "Show me the weather",
+        expected: JSON.stringify({
+          success: false,
+          error: "I can only generate queries for task run data",
+        }),
+      },
+    ];
+  },
+  task: async (input) => {
+    const service = new AIQueryService([runsSchema], traceAISDKModel(openai("gpt-4o-mini")));
+
+    const result = await service.call(input);
+    return JSON.stringify(result);
+  },
+  scorers: [QuerySimilarity, Levenshtein],
+});
diff --git a/apps/webapp/evals/aiRunFilter.eval.ts b/apps/webapp/evals/aiRunFilter.eval.ts
index 68f3ac20683..b80328789e2 100644
--- a/apps/webapp/evals/aiRunFilter.eval.ts
+++ b/apps/webapp/evals/aiRunFilter.eval.ts
@@ -216,6 +216,37 @@ evalite("AI Run Filter", {
           },
         }),
       },
+      // Time-specific queries with hours
+      {
+        input: "tasks that started around 8am today",
+        expected: JSON.stringify({
+          success: true,
+          filters: {
+            from: new Date(new Date().toDateString() + " 07:00:00").getTime(),
+            to: new Date(new Date().toDateString() + " 09:00:00").getTime(),
+          },
+        }),
+      },
+      {
+        input: "runs that started at 2pm yesterday",
+        expected: JSON.stringify({
+          success: true,
+          filters: {
+            from: new Date(new Date(Date.now() - 24*60*60*1000).toDateString() + " 14:00:00").getTime(),
+            to: new Date(new Date(Date.now() - 24*60*60*1000).toDateString() + " 14:59:59").getTime(),
+          },
+        }),
+      },
+      {
+        input: "any runs started this morning",
+        expected: JSON.stringify({
+          success: true,
+          filters: {
+            from: new Date(new Date().toDateString() + " 06:00:00").getTime(),
+            to: new Date(new Date().toDateString() + " 12:00:00").getTime(),
+          },
+        }),
+      },
       // Ambiguous cases that should return errors
       {
         input: "Show me something",
diff --git a/apps/webapp/memory-leak-detector.js b/apps/webapp/memory-leak-detector.js
new file mode 100644
index 00000000000..3b8695465ec
--- /dev/null
+++ b/apps/webapp/memory-leak-detector.js
@@ -0,0 +1,977 @@
+#!/usr/bin/env node
+
+/**
+ * Memory Leak Detector for Trigger.dev Webapp
+ *
+ * This script starts the server, performs memory snapshots, executes API requests,
+ * and analyzes memory usage patterns to detect potential memory leaks.
+ *
+ * Usage: node memory-leak-detector.js [options]
+ */
+
+const { spawn, exec } = require("child_process");
+const fs = require("fs");
+const path = require("path");
+const http = require("http");
+const { performance } = require("perf_hooks");
+
+class MemoryLeakDetector {
+  constructor(options = {}) {
+    // Create timestamped directory for this run
+    const runTimestamp = new Date().toISOString().replace(/[:.]/g, "-");
+    const baseDir = options.baseDir || "./.memory-snapshots";
+    const runDir = `${baseDir}/${runTimestamp}-${options.label || "memory-leak-detector"}`;
+
+    this.options = {
+      // Server configuration
+      serverPort: options.serverPort || 3030,
+      serverStartTimeout: options.serverStartTimeout || 30000,
+
+      // Sentry configuration
+      sentryDsn: options.sentryDsn || "",
+
+      // Memory snapshot configuration
+      heapSnapshotPath: `${runDir}/snapshots`,
+      adminToken: options.adminToken, // Bearer token for admin API access
+
+      apiKey: options.apiKey,
+
+      // Testing configuration
+      warmupRequests: options.warmupRequests || 10,
+      testRequests: options.testRequests || 100,
+      requestDelay: options.requestDelay || 50, // ms between requests
+      requestTimeout: options.requestTimeout || 5000,
+
+      // API endpoints to test (configurable)
+      apiEndpoints: options.apiEndpoints || ["/api/v1/runs"],
+      postApiEndpoints: options.postApiEndpoints || ["/api/v1/mock"],
+
+      // Memory analysis thresholds
+      memoryLeakThreshold: options.memoryLeakThreshold || 50, // MB increase
+      heapGrowthThreshold: options.heapGrowthThreshold || 0.2, // 20% growth
+
+      // Output configuration
+      verbose: options.verbose || false,
+      outputFile: `${runDir}/memory-leak-report.json`,
+      runDir: runDir,
+      runTimestamp: runTimestamp,
+
+      ...options,
+    };
+
+    this.serverProcess = null;
+    this.results = {
+      startTime: new Date().toISOString(),
+      runTimestamp: runTimestamp,
+      runDirectory: runDir,
+      serverInfo: {},
+      snapshots: [],
+      testPhases: [], // Track each phase of testing
+      totalRequests: {
+        warmup: 0,
+        phase1: 0,
+        phase2: 0,
+        successful: 0,
+        failed: 0,
+        errors: [],
+      },
+      memoryAnalysis: {},
+      recommendations: [],
+    };
+  }
+
+  log(message, level = "info") {
+    const timestamp = new Date().toISOString();
+    const prefix = `[${timestamp}] [${level.toUpperCase()}]`;
+
+    if (level === "error") {
+      console.error(`${prefix} ${message}`);
+    } else if (this.options.verbose || level === "info") {
+      console.log(`${prefix} ${message}`);
+    }
+  }
+
+  async ensureSnapshotDir() {
+    if (!fs.existsSync(this.options.runDir)) {
+      fs.mkdirSync(this.options.runDir, { recursive: true });
+      this.log(`Created run directory: ${this.options.runDir}`);
+    }
+    if (!fs.existsSync(this.options.heapSnapshotPath)) {
+      fs.mkdirSync(this.options.heapSnapshotPath, { recursive: true });
+      this.log(`Created snapshot directory: ${this.options.heapSnapshotPath}`);
+    }
+  }
+
+  async takeHeapSnapshot(label) {
+    const timestamp = Date.now();
+    const filename = `heap-${label}-${timestamp}.heapsnapshot`;
+    const filepath = path.join(this.options.heapSnapshotPath, filename);
+
+    try {
+      let snapshotData;
+
+      if (this.options.adminToken) {
+        this.log(`Running GC before snapshot...`);
+        await this.runGc();
+
+        // Use the admin API endpoint to get actual V8 heap snapshot
+        this.log(`Taking V8 heap snapshot via admin API: ${label}...`);
+
+        snapshotData = await this.takeV8HeapSnapshot(label, filepath, timestamp);
+      } else {
+        // Fallback to basic memory usage info
+        this.log(`Taking basic memory snapshot: ${label} (no admin token provided)...`);
+
+        const memUsage = process.memoryUsage();
+        snapshotData = {
+          label,
+          timestamp,
+          filename: filename.replace(".heapsnapshot", ".json"),
+          filepath: filepath.replace(".heapsnapshot", ".json"),
+          processMemory: memUsage,
+          type: "basic",
+        };
+
+        fs.writeFileSync(snapshotData.filepath, JSON.stringify(snapshotData, null, 2));
+      }
+
+      this.results.snapshots.push(snapshotData);
+      this.log(`Snapshot completed: ${label}`);
+
+      return snapshotData;
+    } catch (error) {
+      this.log(`Failed to take heap snapshot: ${error.message}`, "error");
+      throw error;
+    }
+  }
+
+  async takeV8HeapSnapshot(label, filepath, timestamp) {
+    return new Promise((resolve, reject) => {
+      const requestOptions = {
+        hostname: "localhost",
+        port: this.options.serverPort,
+        path: "/admin/api/v1/snapshot",
+        method: "GET",
+        timeout: 120000, // Heap snapshots can take a while
+        headers: {
+          Authorization: `Bearer ${this.options.adminToken}`,
+          "User-Agent": "memory-leak-detector/1.0",
+        },
+      };
+
+      const req = http.request(requestOptions, (res) => {
+        if (res.statusCode !== 200) {
+          reject(new Error(`Admin API returned ${res.statusCode}: ${res.statusMessage}`));
+          return;
+        }
+
+        const writeStream = fs.createWriteStream(filepath);
+        let downloadedBytes = 0;
+
+        res.on("data", (chunk) => {
+          downloadedBytes += chunk.length;
+          this.log(`Downloaded ${downloadedBytes} bytes`);
+          writeStream.write(chunk);
+        });
+
+        res.on("end", () => {
+          writeStream.end();
+
+          const snapshotData = {
+            label,
+            timestamp,
+            filename: path.basename(filepath),
+            filepath,
+            size: downloadedBytes,
+            type: "v8-heapsnapshot",
+          };
+
+          this.log(`V8 heap snapshot saved: ${Math.round(downloadedBytes / 1024 / 1024)}MB`);
+          resolve(snapshotData);
+        });
+
+        res.on("error", (error) => {
+          writeStream.destroy();
+          fs.unlink(filepath, () => {}); // Clean up partial file
+          reject(error);
+        });
+
+        writeStream.on("error", (error) => {
+          res.destroy();
+          reject(error);
+        });
+      });
+
+      req.on("error", (error) => {
+        reject(new Error(`Failed to connect to admin API: ${error.message}`));
+      });
+
+      req.on("timeout", () => {
+        req.destroy();
+        reject(new Error("Admin API request timeout"));
+      });
+
+      req.end();
+    });
+  }
+
+  async runGc() {
+    return new Promise((resolve, reject) => {
+      const requestOptions = {
+        hostname: "localhost",
+        port: this.options.serverPort,
+        path: "/admin/api/v1/gc",
+        method: "GET",
+        timeout: 120000, // GC can take a while
+        headers: {
+          Authorization: `Bearer ${this.options.adminToken}`,
+          "User-Agent": "memory-leak-detector/1.0",
+        },
+      };
+
+      const req = http.request(requestOptions, (res) => {
+        if (res.statusCode !== 200) {
+          reject(new Error(`Admin API returned ${res.statusCode}: ${res.statusMessage}`));
+          return;
+        }
+
+        res.on("data", (chunk) => {
+          this.log(`GC run completed`);
+        });
+
+        res.on("end", () => {
+          resolve();
+        });
+
+        res.on("error", (error) => {
+          reject(error);
+        });
+      });
+
+      req.on("error", (error) => {
+        reject(new Error(`Failed to connect to admin API: ${error.message}`));
+      });
+
+      req.on("timeout", () => {
+        req.destroy();
+        reject(new Error("Admin API request timeout"));
+      });
+
+      req.end();
+    });
+  }
+
+  async startServer() {
+    return new Promise((resolve, reject) => {
+      this.log("Starting server...");
+
+      // First, build the project
+      const buildProcess = spawn("npm", ["run", "build"], {
+        cwd: process.cwd(),
+        stdio: this.options.verbose ? "inherit" : "pipe",
+      });
+
+      buildProcess.on("close", (code) => {
+        if (code !== 0) {
+          reject(new Error(`Build failed with code ${code}`));
+          return;
+        }
+
+        this.log("Build completed, starting server...");
+
+        const nodePath = path.resolve(process.cwd(), "../../node_modules/.pnpm/node_modules");
+
+        this.log(`Using NODE_PATH: ${nodePath}`);
+
+        // Start the server with memory inspection flags
+        this.serverProcess = spawn(
+          "node",
+          ["--max-old-space-size=16384", "--expose-gc", "./build/server.js"],
+          {
+            cwd: process.cwd(),
+            stdio: ["ignore", "pipe", "pipe"],
+            env: {
+              ...process.env,
+              NODE_ENV: "production",
+              NODE_PATH: nodePath,
+              PORT: this.options.serverPort,
+              // Disable Sentry to prevent memory leaks from it
+              SENTRY_DSN: this.options.sentryDsn,
+            },
+          }
+        );
+
+        let serverReady = false;
+        const timeout = setTimeout(() => {
+          if (!serverReady) {
+            this.serverProcess.kill();
+            reject(new Error("Server failed to start within timeout"));
+          }
+        }, this.options.serverStartTimeout);
+
+        this.serverProcess.stdout.on("data", (data) => {
+          const output = data.toString();
+          if (this.options.verbose) {
+            console.log("SERVER:", output.trim());
+          }
+
+          if (output.includes("server ready") && !serverReady) {
+            serverReady = true;
+            clearTimeout(timeout);
+
+            this.results.serverInfo = {
+              port: this.options.serverPort,
+              startTime: Date.now(),
+              nodeVersion: process.version,
+            };
+
+            this.log(`Server started on port ${this.options.serverPort}`);
+
+            // Wait a bit more for server to fully initialize
+            setTimeout(() => resolve(), 2000);
+          }
+        });
+
+        this.serverProcess.stderr.on("data", (data) => {
+          const error = data.toString();
+          if (this.options.verbose || error.includes("Error")) {
+            console.error("SERVER ERROR:", error.trim());
+          }
+        });
+
+        this.serverProcess.on("close", (code) => {
+          if (!serverReady && code !== 0) {
+            clearTimeout(timeout);
+            reject(new Error(`Server process exited with code ${code}`));
+          }
+        });
+      });
+    });
+  }
+
+  async makeRequest(endpoint, options = {}) {
+    return new Promise((resolve, reject) => {
+      const requestOptions = {
+        hostname: "localhost",
+        port: this.options.serverPort,
+        path: endpoint,
+        method: options.method || "GET",
+        timeout: this.options.requestTimeout,
+        headers: {
+          "User-Agent": "memory-leak-detector/1.0",
+          Accept: "application/json",
+          Authorization: `Bearer ${this.options.apiKey}`,
+          ...options.headers,
+        },
+      };
+
+      const req = http.request(requestOptions, (res) => {
+        let data = "";
+
+        res.on("data", (chunk) => {
+          data += chunk;
+        });
+
+        res.on("end", () => {
+          resolve({
+            statusCode: res.statusCode,
+            headers: res.headers,
+            body: data,
+            endpoint: endpoint,
+          });
+        });
+      });
+
+      req.on("error", (error) => {
+        reject({ error, endpoint });
+      });
+
+      req.on("timeout", () => {
+        req.destroy();
+        reject({ error: new Error("Request timeout"), endpoint });
+      });
+
+      if (options.body) {
+        req.write(options.body);
+      }
+
+      req.end();
+    });
+  }
+
+  async performRequestPhase(phaseName, numRequests) {
+    this.log(`Starting ${phaseName} phase with ${numRequests} GET requests...`);
+
+    const startTime = performance.now();
+    let successfulRequests = 0;
+    let failedRequests = 0;
+    const errors = [];
+
+    for (let i = 0; i < numRequests; i++) {
+      const endpoint = this.options.apiEndpoints[i % this.options.apiEndpoints.length];
+
+      try {
+        const response = await this.makeRequest(endpoint);
+
+        if (response.statusCode >= 200 && response.statusCode < 300) {
+          successfulRequests++;
+        } else {
+          failedRequests++;
+          errors.push({
+            endpoint,
+            statusCode: response.statusCode,
+            error: `HTTP ${response.statusCode}`,
+            phase: phaseName,
+          });
+        }
+      } catch (error) {
+        failedRequests++;
+        errors.push({
+          endpoint: error.endpoint,
+          error: error.error?.message || "Unknown error",
+          phase: phaseName,
+        });
+      }
+
+      // Add delay between requests
+      if (i < numRequests - 1) {
+        await this.delay(this.options.requestDelay);
+      }
+
+      // Progress reporting
+      if (this.options.verbose && numRequests > 25 && (i + 1) % 25 === 0) {
+        this.log(`${phaseName}: ${i + 1}/${numRequests} requests completed`);
+      }
+    }
+
+    this.log(`Continuing with ${phaseName} phase with ${numRequests} POST requests...`);
+
+    for (let i = 0; i < numRequests; i++) {
+      const endpoint = this.options.postApiEndpoints[i % this.options.postApiEndpoints.length];
+
+      try {
+        // Send a LARGE body to try and trigger a memory leak
+        const response = await this.makeRequest(endpoint, {
+          method: "POST",
+          body: JSON.stringify(
+            Array.from({ length: 1000 }, (_, index) => ({
+              id: index,
+              name: `Mock ${index}`,
+              description: `Mock ${index} description`,
+              createdAt: new Date().toISOString(),
+              updatedAt: new Date().toISOString(),
+              uuid: crypto.randomUUID(),
+            }))
+          ),
+        });
+
+        if (response.statusCode >= 200 && response.statusCode < 300) {
+          successfulRequests++;
+        } else {
+          failedRequests++;
+          errors.push({
+            endpoint,
+            statusCode: response.statusCode,
+            error: `HTTP ${response.statusCode}`,
+            phase: phaseName,
+          });
+        }
+      } catch (error) {
+        failedRequests++;
+        errors.push({
+          endpoint: error.endpoint,
+          error: error.error?.message || "Unknown error",
+          phase: phaseName,
+        });
+      }
+
+      // Add delay between requests
+      if (i < numRequests - 1) {
+        await this.delay(this.options.requestDelay);
+      }
+
+      // Progress reporting
+      if (this.options.verbose && numRequests > 25 && (i + 1) % 25 === 0) {
+        this.log(`${phaseName}: ${i + 1}/${numRequests} requests completed`);
+      }
+    }
+
+    const endTime = performance.now();
+    const duration = endTime - startTime;
+
+    const phaseResults = {
+      phase: phaseName,
+      total: numRequests,
+      successful: successfulRequests,
+      failed: failedRequests,
+      errors: errors.slice(0, 5), // Keep only first 5 errors per phase
+      duration: Math.round(duration),
+      requestsPerSecond: Math.round((numRequests / duration) * 1000),
+    };
+
+    this.results.testPhases.push(phaseResults);
+
+    // Update totals
+    this.results.totalRequests.successful += successfulRequests;
+    this.results.totalRequests.failed += failedRequests;
+    this.results.totalRequests.errors.push(...errors.slice(0, 3));
+
+    if (phaseName === "warmup") {
+      this.results.totalRequests.warmup = numRequests;
+    } else if (phaseName === "load-test-1") {
+      this.results.totalRequests.phase1 = numRequests;
+    } else if (phaseName === "load-test-2") {
+      this.results.totalRequests.phase2 = numRequests;
+    }
+
+    this.log(
+      `${phaseName} completed: ${successfulRequests}/${numRequests} successful (${Math.round(
+        duration
+      )}ms total)`
+    );
+
+    return phaseResults;
+  }
+
+  analyzeMemoryUsage() {
+    if (this.results.snapshots.length < 3) {
+      this.log("Need at least 3 snapshots to analyze memory usage", "warn");
+      return;
+    }
+
+    const snapshot1 = this.results.snapshots[0]; // after warmup
+    const snapshot2 = this.results.snapshots[1]; // after first load test
+    const snapshot3 = this.results.snapshots[2]; // after second load test
+
+    let analysis = {};
+
+    // Handle different snapshot types
+    if (
+      snapshot1.type === "v8-heapsnapshot" &&
+      snapshot2.type === "v8-heapsnapshot" &&
+      snapshot3.type === "v8-heapsnapshot"
+    ) {
+      const size1 = snapshot1.size || 0;
+      const size2 = snapshot2.size || 0;
+      const size3 = snapshot3.size || 0;
+
+      const growth1to2 = size2 - size1;
+      const growth2to3 = size3 - size2;
+      const totalGrowth = size3 - size1;
+
+      const growth1to2Percent = size1 > 0 ? (growth1to2 / size1) * 100 : 0;
+      const growth2to3Percent = size2 > 0 ? (growth2to3 / size2) * 100 : 0;
+      const totalGrowthPercent = size1 > 0 ? (totalGrowth / size1) * 100 : 0;
+
+      analysis = {
+        snapshotAnalysis: {
+          type: "v8-heapsnapshot",
+          phase1: {
+            size: Math.round(size1 / 1024 / 1024),
+            file: snapshot1.filename,
+          },
+          phase2: {
+            size: Math.round(size2 / 1024 / 1024),
+            file: snapshot2.filename,
+            growthFromPhase1: Math.round(growth1to2 / 1024 / 1024),
+            growthPercentFromPhase1: Math.round(growth1to2Percent * 100) / 100,
+          },
+          phase3: {
+            size: Math.round(size3 / 1024 / 1024),
+            file: snapshot3.filename,
+            growthFromPhase2: Math.round(growth2to3 / 1024 / 1024),
+            growthPercentFromPhase2: Math.round(growth2to3Percent * 100) / 100,
+          },
+          total: {
+            growth: Math.round(totalGrowth / 1024 / 1024),
+            growthPercent: Math.round(totalGrowthPercent * 100) / 100,
+          },
+        },
+        snapshots: this.results.snapshots.length,
+        snapshotPaths: this.results.snapshots.map((s) => s.filepath),
+      };
+
+      // Use total growth for recommendations
+      var heapGrowth = totalGrowth;
+      var heapGrowthPercent = totalGrowthPercent;
+    } else if (snapshot1.processMemory && snapshot2.processMemory && snapshot3.processMemory) {
+      // Traditional process memory analysis with 3 snapshots
+      const heap1 = snapshot1.processMemory.heapUsed;
+      const heap2 = snapshot2.processMemory.heapUsed;
+      const heap3 = snapshot3.processMemory.heapUsed;
+      const rss1 = snapshot1.processMemory.rss;
+      const rss2 = snapshot2.processMemory.rss;
+      const rss3 = snapshot3.processMemory.rss;
+
+      const heapGrowth1to2 = heap2 - heap1;
+      const heapGrowth2to3 = heap3 - heap2;
+      const totalHeapGrowth = heap3 - heap1;
+      const rssGrowth1to2 = rss2 - rss1;
+      const rssGrowth2to3 = rss3 - rss2;
+      const totalRssGrowth = rss3 - rss1;
+
+      analysis = {
+        heapUsage: {
+          phase1: Math.round(heap1 / 1024 / 1024),
+          phase2: Math.round(heap2 / 1024 / 1024),
+          phase3: Math.round(heap3 / 1024 / 1024),
+          growth1to2: Math.round(heapGrowth1to2 / 1024 / 1024),
+          growth2to3: Math.round(heapGrowth2to3 / 1024 / 1024),
+          totalGrowth: Math.round(totalHeapGrowth / 1024 / 1024),
+          totalGrowthPercent: Math.round((totalHeapGrowth / heap1) * 100 * 100) / 100,
+        },
+        rssUsage: {
+          phase1: Math.round(rss1 / 1024 / 1024),
+          phase2: Math.round(rss2 / 1024 / 1024),
+          phase3: Math.round(rss3 / 1024 / 1024),
+          growth1to2: Math.round(rssGrowth1to2 / 1024 / 1024),
+          growth2to3: Math.round(rssGrowth2to3 / 1024 / 1024),
+          totalGrowth: Math.round(totalRssGrowth / 1024 / 1024),
+          totalGrowthPercent: Math.round((totalRssGrowth / rss1) * 100 * 100) / 100,
+        },
+        snapshots: this.results.snapshots.length,
+      };
+
+      var heapGrowth = totalHeapGrowth;
+      var heapGrowthPercent = (totalHeapGrowth / heap1) * 100;
+    } else {
+      this.log("Mixed or incompatible snapshot types - cannot analyze memory growth", "warn");
+      analysis = {
+        error: "Incompatible snapshot types",
+        snapshots: this.results.snapshots.length,
+        snapshotTypes: this.results.snapshots.map((s) => ({ label: s.label, type: s.type })),
+      };
+      this.results.memoryAnalysis = analysis;
+      return;
+    }
+
+    this.results.memoryAnalysis = analysis;
+
+    // Generate recommendations
+    const recommendations = [];
+
+    if (Math.abs(heapGrowth) > this.options.memoryLeakThreshold * 1024 * 1024) {
+      recommendations.push({
+        type: "warning",
+        message: `Significant heap growth detected: ${Math.round(
+          heapGrowth / 1024 / 1024
+        )}MB increase`,
+        suggestion: "Consider investigating object retention and event listener cleanup",
+      });
+    }
+
+    if (Math.abs(heapGrowthPercent) > this.options.heapGrowthThreshold * 100) {
+      recommendations.push({
+        type: "warning",
+        message: `High heap growth percentage: ${heapGrowthPercent.toFixed(1)}%`,
+        suggestion: "Review memory allocation patterns and garbage collection behavior",
+      });
+    }
+
+    if (
+      this.results.totalRequests.failed >
+      (this.results.totalRequests.phase1 + this.results.totalRequests.phase2) * 0.1
+    ) {
+      recommendations.push({
+        type: "error",
+        message: `High request failure rate: ${this.results.totalRequests.failed}/${
+          this.results.totalRequests.phase1 + this.results.totalRequests.phase2
+        }`,
+        suggestion: "Fix failing endpoints before analyzing memory patterns",
+      });
+    }
+
+    if (recommendations.length === 0) {
+      recommendations.push({
+        type: "info",
+        message: "No obvious memory leaks detected in this test run",
+        suggestion: "Consider running longer tests or testing different API endpoints",
+      });
+    }
+
+    this.results.recommendations = recommendations;
+
+    // Log analysis results
+    this.log("=== Memory Analysis Results ===");
+
+    if (this.results.memoryAnalysis.snapshotAnalysis) {
+      const analysis = this.results.memoryAnalysis.snapshotAnalysis;
+      this.log(`V8 Heap Snapshot Analysis:`);
+      this.log(`  Phase 1 (after warmup): ${analysis.phase1.size}MB`);
+      this.log(
+        `  Phase 2 (after load test 1): ${analysis.phase2.size}MB (${
+          analysis.phase2.growthPercentFromPhase1 > 0 ? "+" : ""
+        }${analysis.phase2.growthPercentFromPhase1}%)`
+      );
+      this.log(
+        `  Phase 3 (after load test 2): ${analysis.phase3.size}MB (${
+          analysis.phase3.growthPercentFromPhase2 > 0 ? "+" : ""
+        }${analysis.phase3.growthPercentFromPhase2}%)`
+      );
+      this.log(
+        `  Total Growth: ${analysis.total.growthPercent > 0 ? "+" : ""}${
+          analysis.total.growth
+        }MB (${analysis.total.growthPercent}%)`
+      );
+
+      this.log(`\nSnapshot files saved:`);
+      this.log(`  1. ${analysis.phase1.file}`);
+      this.log(`  2. ${analysis.phase2.file}`);
+      this.log(`  3. ${analysis.phase3.file}`);
+      this.log(`\n💡 Analyze snapshots in Chrome DevTools:`);
+      this.log(`  1. Open Chrome DevTools → Memory tab`);
+      this.log(`  2. Load all 3 .heapsnapshot files`);
+      this.log(`  3. Compare snapshots to identify memory leaks`);
+      this.log(`  4. Focus on comparing snapshot 1 vs 3 for overall growth`);
+    } else if (this.results.memoryAnalysis.heapUsage) {
+      const heap = this.results.memoryAnalysis.heapUsage;
+      const rss = this.results.memoryAnalysis.rssUsage;
+      this.log(`Heap Usage Analysis:`);
+      this.log(`  Phase 1: ${heap.phase1}MB`);
+      this.log(
+        `  Phase 2: ${heap.phase2}MB (${heap.growth1to2 > 0 ? "+" : ""}${heap.growth1to2}MB)`
+      );
+      this.log(
+        `  Phase 3: ${heap.phase3}MB (${heap.growth2to3 > 0 ? "+" : ""}${heap.growth2to3}MB)`
+      );
+      this.log(
+        `  Total Growth: ${heap.totalGrowthPercent > 0 ? "+" : ""}${heap.totalGrowth}MB (${
+          heap.totalGrowthPercent
+        }%)`
+      );
+
+      this.log(`RSS Usage Analysis:`);
+      this.log(`  Phase 1: ${rss.phase1}MB`);
+      this.log(`  Phase 2: ${rss.phase2}MB (${rss.growth1to2 > 0 ? "+" : ""}${rss.growth1to2}MB)`);
+      this.log(`  Phase 3: ${rss.phase3}MB (${rss.growth2to3 > 0 ? "+" : ""}${rss.growth2to3}MB)`);
+      this.log(
+        `  Total Growth: ${rss.totalGrowthPercent > 0 ? "+" : ""}${rss.totalGrowth}MB (${
+          rss.totalGrowthPercent
+        }%)`
+      );
+    }
+
+    recommendations.forEach((rec, i) => {
+      this.log(
+        `${i + 1}. [${rec.type.toUpperCase()}] ${rec.message}`,
+        rec.type === "error" ? "error" : "info"
+      );
+      this.log(`   Suggestion: ${rec.suggestion}`, "info");
+    });
+  }
+
+  async generateReport() {
+    const reportData = {
+      ...this.results,
+      endTime: new Date().toISOString(),
+      configuration: {
+        serverPort: this.options.serverPort,
+        testRequests: this.options.testRequests,
+        warmupRequests: this.options.warmupRequests,
+        apiEndpoints: this.options.apiEndpoints,
+        memoryLeakThreshold: this.options.memoryLeakThreshold,
+        heapGrowthThreshold: this.options.heapGrowthThreshold,
+        adminToken: this.options.adminToken ? "[REDACTED]" : null,
+        runDirectory: this.options.runDir,
+      },
+    };
+
+    try {
+      fs.writeFileSync(this.options.outputFile, JSON.stringify(reportData, null, 2));
+      this.log(`Report saved to: ${this.options.outputFile}`);
+    } catch (error) {
+      this.log(`Failed to save report: ${error.message}`, "error");
+    }
+
+    return reportData;
+  }
+
+  async delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
+  async cleanup() {
+    if (this.serverProcess && !this.serverProcess.killed) {
+      this.log("Stopping server...");
+      this.serverProcess.kill("SIGTERM");
+
+      // Wait a bit for graceful shutdown
+      await this.delay(2000);
+
+      if (!this.serverProcess.killed) {
+        this.serverProcess.kill("SIGKILL");
+      }
+    }
+  }
+
+  async run() {
+    try {
+      this.log("=== Memory Leak Detection Started ===");
+      this.log(`Run directory: ${this.options.runDir}`);
+
+      await this.ensureSnapshotDir();
+      await this.startServer();
+
+      // Wait for server to fully initialize
+      await this.delay(3000);
+
+      // Phase 1: Warmup requests + first snapshot
+      this.log("\n=== Phase 1: Warmup ===");
+      await this.performRequestPhase("warmup", this.options.warmupRequests);
+
+      // Force GC and wait before snapshot
+      if (global.gc) {
+        global.gc();
+        await this.delay(1000);
+      }
+      await this.takeHeapSnapshot("after-warmup");
+
+      // Phase 2: First load test + second snapshot
+      this.log("\n=== Phase 2: Load Test 1 ===");
+      await this.performRequestPhase("load-test-1", this.options.testRequests);
+
+      // Force GC and wait before snapshot
+      if (global.gc) {
+        global.gc();
+        await this.delay(1000);
+      }
+      await this.takeHeapSnapshot("after-load-test-1");
+
+      // Phase 3: Second load test + third snapshot
+      this.log("\n=== Phase 3: Load Test 2 ===");
+      await this.performRequestPhase("load-test-2", this.options.testRequests);
+
+      // Force GC and wait before final snapshot
+      if (global.gc) {
+        global.gc();
+        await this.delay(2000);
+      }
+      await this.takeHeapSnapshot("after-load-test-2");
+
+      // Analyze results
+      this.analyzeMemoryUsage();
+
+      // Generate report
+      await this.generateReport();
+
+      this.log("\n=== Memory Leak Detection Completed ===");
+      this.log(`📁 All results saved to: ${this.options.runDir}`);
+      this.log(`📊 Report: ${this.options.outputFile}`);
+      this.log(`📈 Snapshots: ${this.options.heapSnapshotPath}`);
+
+      if (
+        this.results.snapshots.length === 3 &&
+        this.results.snapshots[0].type === "v8-heapsnapshot"
+      ) {
+        this.log(`\n🔍 Next steps:`);
+        this.log(`1. Analyze snapshots in Chrome DevTools Memory tab`);
+        this.log(`2. Compare snapshot 1 vs 3 to identify memory leaks`);
+        this.log(`3. Look for growing Sentry-related objects`);
+        this.log(`4. Run with SENTRY_DSN enabled to compare results`);
+      }
+    } catch (error) {
+      this.log(`Detection failed: ${error.message}`, "error");
+      throw error;
+    } finally {
+      await this.cleanup();
+    }
+  }
+}
+
+// CLI interface
+function parseArgs() {
+  const args = process.argv.slice(2);
+  const options = {};
+
+  for (let i = 0; i < args.length; i += 2) {
+    const arg = args[i];
+    const value = args[i + 1];
+
+    switch (arg) {
+      case "--port":
+        options.serverPort = parseInt(value);
+        break;
+      case "--requests":
+        options.testRequests = parseInt(value);
+        break;
+      case "--delay":
+        options.requestDelay = parseInt(value);
+        break;
+      case "--endpoints":
+        options.apiEndpoints = value.split(",");
+        break;
+      case "--threshold":
+        options.memoryLeakThreshold = parseFloat(value);
+        break;
+      case "--output":
+        options.outputFile = value;
+        break;
+      case "--token":
+        options.adminToken = value;
+        break;
+      case "--api-key":
+        options.apiKey = value;
+        break;
+      case "--sentry-dsn":
+        options.sentryDsn = value;
+        break;
+      case "--label":
+        options.label = value;
+        break;
+      case "--verbose":
+        options.verbose = true;
+        i--; // No value for this flag
+        break;
+      case "--help":
+        console.log(`
+Memory Leak Detector Usage:
+
+node memory-leak-detector.js [options]
+
+Options:
+  --port <number>        Server port (default: 3030)
+  --requests <number>    Number of test requests (default: 100)  
+  --delay <ms>          Delay between requests (default: 50)
+  --endpoints <list>     Comma-separated API endpoints to test
+  --label <string>       Label for the run
+  --threshold <MB>       Memory leak threshold in MB (default: 50)
+  --token <string>       Admin Bearer token for V8 heap snapshots
+  --api-key <string>     API key for API requests
+  --sentry-dsn <string>  Sentry DSN for memory leak detection
+  --output <file>        Output report file (default: memory-leak-report.json)
+  --verbose             Enable verbose logging
+  --help                Show this help
+
+Examples:
+  node memory-leak-detector.js --verbose --requests 200
+  node memory-leak-detector.js --token "your-admin-token" --api-key "your-api-key" --verbose
+  node memory-leak-detector.js --endpoints "/api/v1/whoami,/api/v1/projects" --threshold 25
+        `);
+        process.exit(0);
+    }
+  }
+
+  return options;
+}
+
+// Main execution
+if (require.main === module) {
+  const options = parseArgs();
+  const detector = new MemoryLeakDetector(options);
+
+  detector
+    .run()
+    .then(() => {
+      console.log("\n✅ Memory leak detection completed successfully!");
+      console.log(`📁 Results directory: ${detector.options.runDir}`);
+      console.log(`📊 Report: ${detector.options.outputFile}`);
+      console.log(`📈 Snapshots: ${detector.options.heapSnapshotPath}`);
+      process.exit(0);
+    })
+    .catch((error) => {
+      console.error("\n❌ Memory leak detection failed:", error.message);
+      process.exit(1);
+    });
+}
+
+module.exports = MemoryLeakDetector;
diff --git a/apps/webapp/package.json b/apps/webapp/package.json
index c0ed2e0c588..42a1741d2eb 100644
--- a/apps/webapp/package.json
+++ b/apps/webapp/package.json
@@ -4,25 +4,19 @@
   "version": "1.0.0",
   "sideEffects": false,
   "scripts": {
-    "build": "run-s build:**",
-    "build:db:seed": "esbuild --platform=node --bundle --minify --format=cjs ./prisma/seed.ts --outdir=prisma",
-    "build:remix": "remix build",
-    "build:server": "esbuild --platform=node --format=cjs ./server.ts --outdir=build",
+    "build": "run-s build:** && pnpm run upload:sourcemaps",
+    "build:remix": "remix build --sourcemap",
+    "build:server": "esbuild --platform=node --format=cjs ./server.ts --outdir=build --sourcemap",
+    "build:sentry": "esbuild --platform=node --format=cjs ./sentry.server.ts --outdir=build --sourcemap",
     "dev": "cross-env PORT=3030 remix dev -c \"node ./build/server.js\"",
     "dev:worker": "cross-env NODE_PATH=../../node_modules/.pnpm/node_modules node ./build/server.js",
     "format": "prettier --write .",
     "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint .",
     "start": "cross-env NODE_ENV=production node --max-old-space-size=8192 ./build/server.js",
     "start:local": "cross-env node --max-old-space-size=8192 ./build/server.js",
-    "typecheck": "tsc --noEmit -p ./tsconfig.check.json",
-    "db:seed": "node prisma/seed.js",
-    "db:seed:local": "ts-node prisma/seed.ts",
-    "build:db:populate": "esbuild --platform=node --bundle --minify --format=cjs ./prisma/populate.ts --outdir=prisma",
-    "db:populate": "node prisma/populate.js --",
-    "generate:sourcemaps": "remix build --sourcemap",
-    "clean:sourcemaps": "run-s clean:sourcemaps:*",
-    "clean:sourcemaps:public": "rimraf ./build/**/*.map",
-    "clean:sourcemaps:build": "rimraf ./public/build/**/*.map",
+    "typecheck": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" tsc --noEmit -p ./tsconfig.check.json",
+    "db:seed": "tsx seed.mts",
+    "upload:sourcemaps": "bash ./upload-sourcemaps.sh",
     "test": "vitest --no-file-parallelism",
     "eval:dev": "evalite watch"
   },
@@ -35,19 +29,24 @@
     "@ai-sdk/openai": "^1.3.23",
     "@ariakit/react": "^0.4.6",
     "@ariakit/react-core": "^0.4.6",
-    "@aws-sdk/client-ecr": "^3.839.0",
+    "@aws-sdk/client-ecr": "^3.931.0",
+    "@aws-sdk/client-s3": "^3.936.0",
     "@aws-sdk/client-sqs": "^3.445.0",
     "@aws-sdk/client-sts": "^3.840.0",
+    "@aws-sdk/credential-provider-node": "^3.936.0",
+    "@aws-sdk/s3-presigned-post": "^3.936.0",
+    "@aws-sdk/s3-request-presigner": "^3.936.0",
     "@better-auth/utils": "^0.2.6",
-    "@codemirror/autocomplete": "^6.3.1",
-    "@codemirror/commands": "^6.1.2",
-    "@codemirror/lang-javascript": "^6.1.1",
-    "@codemirror/lang-json": "^6.0.1",
-    "@codemirror/language": "^6.3.1",
-    "@codemirror/lint": "^6.4.2",
-    "@codemirror/search": "^6.2.3",
-    "@codemirror/state": "^6.1.3",
-    "@codemirror/view": "^6.5.0",
+    "@codemirror/autocomplete": "6.4.0",
+    "@codemirror/commands": "6.1.3",
+    "@codemirror/lang-javascript": "6.1.2",
+    "@codemirror/lang-json": "6.0.1",
+    "@codemirror/lang-sql": "6.5.5",
+    "@codemirror/language": "6.3.2",
+    "@codemirror/lint": "6.4.2",
+    "@codemirror/search": "6.2.3",
+    "@codemirror/state": "6.2.0",
+    "@codemirror/view": "6.7.2",
     "@conform-to/react": "0.9.2",
     "@conform-to/zod": "0.9.2",
     "@depot/cli": "0.0.1-cli.2.80.0",
@@ -55,32 +54,37 @@
     "@electric-sql/react": "^0.3.5",
     "@headlessui/react": "^1.7.8",
     "@heroicons/react": "^2.0.12",
+    "@internal/cache": "workspace:*",
     "@internal/redis": "workspace:*",
     "@internal/run-engine": "workspace:*",
     "@internal/schedule-engine": "workspace:*",
     "@internal/tracing": "workspace:*",
+    "@internal/tsql": "workspace:*",
     "@internal/zod-worker": "workspace:*",
     "@internationalized/date": "^3.5.1",
     "@kapaai/react-sdk": "^0.1.3",
     "@lezer/highlight": "^1.1.6",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.52.1",
-    "@opentelemetry/core": "1.25.1",
-    "@opentelemetry/exporter-logs-otlp-http": "0.52.1",
-    "@opentelemetry/exporter-metrics-otlp-proto": "0.52.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/instrumentation-express": "^0.36.1",
-    "@opentelemetry/instrumentation-http": "0.52.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/sdk-logs": "0.52.1",
-    "@opentelemetry/sdk-metrics": "1.25.1",
-    "@opentelemetry/sdk-node": "0.52.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/sdk-trace-node": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.25.1",
+    "@opentelemetry/api-logs": "0.203.0",
+    "@opentelemetry/core": "2.0.1",
+    "@opentelemetry/exporter-logs-otlp-http": "0.203.0",
+    "@opentelemetry/exporter-metrics-otlp-proto": "0.203.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
+    "@opentelemetry/host-metrics": "^0.37.0",
+    "@opentelemetry/instrumentation": "0.203.0",
+    "@opentelemetry/instrumentation-aws-sdk": "^0.57.0",
+    "@opentelemetry/instrumentation-express": "^0.52.0",
+    "@opentelemetry/instrumentation-http": "0.203.0",
+    "@opentelemetry/resource-detector-aws": "^2.3.0",
+    "@opentelemetry/resources": "2.0.1",
+    "@opentelemetry/sdk-logs": "0.203.0",
+    "@opentelemetry/sdk-metrics": "2.0.1",
+    "@opentelemetry/sdk-node": "0.203.0",
+    "@opentelemetry/sdk-trace-base": "2.0.1",
+    "@opentelemetry/sdk-trace-node": "2.0.1",
+    "@opentelemetry/semantic-conventions": "1.36.0",
     "@popperjs/core": "^2.11.8",
-    "@prisma/instrumentation": "^5.11.0",
+    "@prisma/instrumentation": "^6.14.0",
     "@radix-ui/react-accordion": "^1.2.11",
     "@radix-ui/react-alert-dialog": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.3",
@@ -103,18 +107,21 @@
     "@remix-run/serve": "2.1.0",
     "@remix-run/server-runtime": "2.1.0",
     "@remix-run/v1-meta": "^0.1.3",
+    "@s2-dev/streamstore": "^0.17.2",
+    "@sentry/remix": "9.46.0",
     "@slack/web-api": "7.9.1",
     "@socket.io/redis-adapter": "^8.3.0",
-    "@splinetool/react-spline": "^2.2.6",
-    "@tabler/icons-react": "^2.39.0",
+    "@tabler/icons-react": "^3.36.1",
     "@tailwindcss/container-queries": "^0.1.1",
+    "@tanstack/match-sorter-utils": "^8.19.4",
+    "@tanstack/react-table": "^8.21.3",
     "@tanstack/react-virtual": "^3.0.4",
     "@team-plain/typescript-sdk": "^3.5.0",
     "@trigger.dev/companyicons": "^1.5.35",
     "@trigger.dev/core": "workspace:*",
     "@trigger.dev/database": "workspace:*",
     "@trigger.dev/otlp-importer": "workspace:*",
-    "@trigger.dev/platform": "1.0.15",
+    "@trigger.dev/platform": "1.0.23",
     "@trigger.dev/redis-worker": "workspace:*",
     "@trigger.dev/sdk": "workspace:*",
     "@types/pg": "8.6.6",
@@ -122,6 +129,7 @@
     "@unkey/cache": "^1.5.0",
     "@unkey/error": "^0.2.0",
     "@upstash/ratelimit": "^1.1.3",
+    "@vercel/sdk": "^1.19.1",
     "@whatwg-node/fetch": "^0.9.14",
     "ai": "^4.3.19",
     "assert-never": "^1.2.1",
@@ -134,15 +142,16 @@
     "cronstrue": "^2.21.0",
     "cross-env": "^7.0.3",
     "cuid": "^2.1.8",
+    "date-fns": "^4.1.0",
     "dompurify": "^3.2.6",
     "dotenv": "^16.4.5",
     "effect": "^3.11.7",
     "emails": "workspace:*",
+    "eventsource": "^4.0.0",
     "evt": "^2.4.13",
     "express": "4.20.0",
     "framer-motion": "^10.12.11",
     "graphile-worker": "0.16.6",
-    "highlight.run": "^7.3.4",
     "humanize-duration": "^3.27.3",
     "input-otp": "^1.4.2",
     "intl-parse-accept-language": "^1.0.0",
@@ -156,11 +165,14 @@
     "match-sorter": "^6.3.4",
     "morgan": "^1.10.0",
     "nanoid": "3.3.8",
+    "neverthrow": "^8.2.0",
     "non.geist": "^1.0.2",
+    "octokit": "^3.2.1",
     "ohash": "^1.1.3",
     "openai": "^4.33.1",
     "p-limit": "^6.2.0",
     "p-map": "^6.0.0",
+    "p-retry": "^4.6.1",
     "parse-duration": "^2.1.0",
     "posthog-js": "^1.93.3",
     "posthog-node": "4.17.1",
@@ -172,18 +184,22 @@
     "react": "^18.2.0",
     "react-aria": "^3.31.1",
     "react-collapse": "^5.1.1",
+    "react-day-picker": "^9.13.0",
     "react-dom": "^18.2.0",
+    "react-grid-layout": "^2.2.2",
     "react-hotkeys-hook": "^4.4.1",
     "react-popper": "^2.3.0",
+    "react-resizable": "^3.1.3",
     "react-resizable-panels": "^2.0.9",
     "react-stately": "^3.29.1",
     "react-use": "17.5.1",
     "react-window-splitter": "^0.4.1",
-    "recharts": "^2.12.6",
+    "recharts": "^2.15.2",
     "regression": "^2.0.1",
     "remix-auth": "^3.6.0",
     "remix-auth-email-link": "2.0.2",
     "remix-auth-github": "^1.6.0",
+    "remix-auth-google": "^2.0.0",
     "remix-typedjson": "0.3.1",
     "remix-utils": "^7.7.0",
     "seedrandom": "^3.0.5",
@@ -194,7 +210,9 @@
     "socket.io": "4.7.4",
     "socket.io-adapter": "^2.5.4",
     "sonner": "^1.0.3",
+    "sql-formatter": "^15.4.10",
     "sqs-consumer": "^7.4.0",
+    "streamdown": "^1.4.0",
     "superjson": "^2.2.1",
     "tailwind-merge": "^1.12.0",
     "tailwind-scrollbar-hide": "^1.1.7",
@@ -205,7 +223,7 @@
     "ulidx": "^2.2.1",
     "uuid": "^9.0.0",
     "ws": "^8.11.0",
-    "zod": "3.23.8",
+    "zod": "3.25.76",
     "zod-error": "1.5.0",
     "zod-validation-error": "^1.5.0"
   },
@@ -216,6 +234,7 @@
     "@remix-run/dev": "2.1.0",
     "@remix-run/eslint-config": "2.1.0",
     "@remix-run/testing": "^2.1.0",
+    "@sentry/cli": "2.50.2",
     "@swc/core": "^1.3.4",
     "@swc/helpers": "^0.4.11",
     "@tailwindcss/forms": "^0.5.3",
@@ -272,11 +291,11 @@
     "supertest": "^7.0.0",
     "tailwind-scrollbar": "^3.0.1",
     "tailwindcss": "3.4.1",
-    "ts-node": "^10.7.0",
     "tsconfig-paths": "^3.14.1",
+    "tsx": "^4.20.6",
     "vite-tsconfig-paths": "^4.0.5"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.19.0 || >=20.6.0"
   }
 }
diff --git a/apps/webapp/prisma/seed.ts b/apps/webapp/prisma/seed.ts
deleted file mode 100644
index 009f9278b50..00000000000
--- a/apps/webapp/prisma/seed.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { seedCloud } from "./seedCloud";
-import { prisma } from "../app/db.server";
-import { createEnvironment } from "~/models/organization.server";
-
-async function runDataMigrations() {
-  await runStagingEnvironmentMigration();
-}
-
-async function runStagingEnvironmentMigration() {
-  try {
-    await prisma.$transaction(async (tx) => {
-      const existingDataMigration = await tx.dataMigration.findUnique({
-        where: {
-          name: "2023-09-27-AddStagingEnvironments",
-        },
-      });
-
-      if (existingDataMigration) {
-        return;
-      }
-
-      await tx.dataMigration.create({
-        data: {
-          name: "2023-09-27-AddStagingEnvironments",
-        },
-      });
-
-      console.log("Running data migration 2023-09-27-AddStagingEnvironments");
-
-      const projectsWithoutStagingEnvironments = await tx.project.findMany({
-        where: {
-          environments: {
-            none: {
-              type: "STAGING",
-            },
-          },
-        },
-        include: {
-          organization: true,
-        },
-      });
-
-      for (const project of projectsWithoutStagingEnvironments) {
-        try {
-          console.log(
-            `Creating staging environment for project ${project.slug} on org ${project.organization.slug}`
-          );
-
-          await createEnvironment({
-            organization: project.organization,
-            project,
-            type: "STAGING",
-            isBranchableEnvironment: false,
-            member: undefined,
-            prismaClient: tx,
-          });
-        } catch (error) {
-          console.error(error);
-        }
-      }
-
-      await tx.dataMigration.update({
-        where: {
-          name: "2023-09-27-AddStagingEnvironments",
-        },
-        data: {
-          completedAt: new Date(),
-        },
-      });
-    });
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-async function seed() {
-  if (process.env.NODE_ENV === "development" && process.env.SEED_CLOUD === "enabled") {
-    await seedCloud(prisma);
-  }
-
-  await runDataMigrations();
-}
-
-seed()
-  .catch((e) => {
-    console.error(e);
-    process.exit(1);
-  })
-  .finally(async () => {
-    await prisma.$disconnect();
-  });
diff --git a/apps/webapp/prisma/seedCloud.ts b/apps/webapp/prisma/seedCloud.ts
deleted file mode 100644
index 49cc9aef5cb..00000000000
--- a/apps/webapp/prisma/seedCloud.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { PrismaClient } from "@trigger.dev/database";
-
-export async function seedCloud(prisma: PrismaClient) {
-  if (!process.env.SEED_CLOUD_EMAIL) {
-    return;
-  }
-
-  const name = process.env.SEED_CLOUD_EMAIL.split("@")[0];
-
-  // Create a user, organization, and project
-  const user = await prisma.user.upsert({
-    where: {
-      email: process.env.SEED_CLOUD_EMAIL,
-    },
-    create: {
-      email: process.env.SEED_CLOUD_EMAIL,
-      name,
-      authenticationMethod: "MAGIC_LINK",
-    },
-    update: {},
-  });
-
-  const organization = await prisma.organization.upsert({
-    where: {
-      slug: "seed-org-123",
-    },
-    create: {
-      title: "Personal Workspace",
-      slug: "seed-org-123",
-      members: {
-        create: {
-          userId: user.id,
-          role: "ADMIN",
-        },
-      },
-      projects: {
-        create: {
-          name: "My Project",
-          slug: "my-project-123",
-          externalRef: "my-project-123",
-        },
-      },
-    },
-    update: {},
-    include: {
-      members: true,
-      projects: true,
-    },
-  });
-
-  const adminMember = organization.members[0];
-  const defaultProject = organization.projects[0];
-
-  const devEnv = await prisma.runtimeEnvironment.upsert({
-    where: {
-      apiKey: "tr_dev_bNaLxayOXqoj",
-    },
-    create: {
-      apiKey: "tr_dev_bNaLxayOXqoj",
-      pkApiKey: "pk_dev_323f3650218e370508cf",
-      slug: "dev",
-      type: "DEVELOPMENT",
-      project: {
-        connect: {
-          id: defaultProject.id,
-        },
-      },
-      organization: {
-        connect: {
-          id: organization.id,
-        },
-      },
-      orgMember: {
-        connect: {
-          id: adminMember.id,
-        },
-      },
-      shortcode: "octopus-tentacles",
-    },
-    update: {},
-  });
-
-  await prisma.runtimeEnvironment.upsert({
-    where: {
-      apiKey: "tr_prod_bNaLxayOXqoj",
-    },
-    create: {
-      apiKey: "tr_prod_bNaLxayOXqoj",
-      pkApiKey: "pk_dev_323f3650218e378191cf",
-      slug: "prod",
-      type: "PRODUCTION",
-      project: {
-        connect: {
-          id: defaultProject.id,
-        },
-      },
-      organization: {
-        connect: {
-          id: organization.id,
-        },
-      },
-      shortcode: "stripey-zebra",
-    },
-    update: {},
-  });
-}
diff --git a/apps/webapp/remix.config.js b/apps/webapp/remix.config.js
index 624a767460f..0363560f612 100644
--- a/apps/webapp/remix.config.js
+++ b/apps/webapp/remix.config.js
@@ -22,10 +22,22 @@ module.exports = {
     "highlight.run",
     "random-words",
     "superjson",
+    "copy-anything",
+    "is-what",
     "prismjs/components/prism-json",
     "prismjs/components/prism-typescript",
     "redlock",
     "parse-duration",
+    "uncrypto",
   ],
-  browserNodeBuiltinsPolyfill: { modules: { path: true, os: true, crypto: true } },
+  browserNodeBuiltinsPolyfill: {
+    modules: {
+      path: true,
+      os: true,
+      crypto: true,
+      http2: true,
+      assert: true,
+      util: true,
+    },
+  },
 };
diff --git a/apps/webapp/seed.mts b/apps/webapp/seed.mts
new file mode 100644
index 00000000000..aa08eaaeec0
--- /dev/null
+++ b/apps/webapp/seed.mts
@@ -0,0 +1,251 @@
+import { prisma } from "./app/db.server";
+import { createOrganization } from "./app/models/organization.server";
+import { createProject } from "./app/models/project.server";
+import { AuthenticationMethod, Organization, Prisma, User } from "@trigger.dev/database";
+
+async function seed() {
+  console.log("🌱 Starting seed...");
+
+  // Create or find the local user
+  let user = await prisma.user.findUnique({
+    where: { email: "local@trigger.dev" },
+  });
+
+  if (!user) {
+    console.log("Creating local user...");
+    user = await prisma.user.create({
+      data: {
+        email: "local@trigger.dev",
+        authenticationMethod: AuthenticationMethod.MAGIC_LINK,
+        name: "Local Developer",
+        displayName: "Local Developer",
+        admin: true,
+        confirmedBasicDetails: true,
+      },
+    });
+    console.log(`✅ Created user: ${user.email} (${user.id})`);
+  } else {
+    console.log(`✅ User already exists: ${user.email} (${user.id})`);
+  }
+
+  // Create or find the references organization
+  // Look for an organization where the user is a member and the title is "References"
+  let organization = await prisma.organization.findFirst({
+    where: {
+      title: "References",
+      members: {
+        some: {
+          userId: user.id,
+        },
+      },
+    },
+  });
+
+  if (!organization) {
+    console.log("Creating references organization...");
+    organization = await createOrganization({
+      title: "References",
+      userId: user.id,
+      companySize: "1-10",
+    });
+    console.log(`✅ Created organization: ${organization.title} (${organization.slug})`);
+  } else {
+    console.log(`✅ Organization already exists: ${organization.title} (${organization.slug})`);
+  }
+
+  // Define the reference projects with their specific project refs
+  const referenceProjects = [
+    {
+      name: "hello-world",
+      externalRef: "proj_rrkpdguyagvsoktglnod",
+    },
+    {
+      name: "d3-chat",
+      externalRef: "proj_cdmymsrobxmcgjqzhdkq",
+    },
+    {
+      name: "realtime-streams",
+      externalRef: "proj_klxlzjnzxmbgiwuuwhvb",
+    },
+  ];
+
+  // Create or find each project
+  for (const projectConfig of referenceProjects) {
+    await findOrCreateProject(projectConfig.name, organization, user.id, projectConfig.externalRef);
+  }
+
+  await createBatchLimitOrgs(user);
+
+  console.log("\n🎉 Seed complete!\n");
+  console.log("Summary:");
+  console.log(`User: ${user.email}`);
+  console.log(`Organization: ${organization.title} (${organization.slug})`);
+  console.log(`Projects: ${referenceProjects.map((p) => p.name).join(", ")}`);
+  console.log("\n⚠️  Note: Update the .env files in d3-chat and realtime-streams with:");
+  console.log(`  - d3-chat: TRIGGER_PROJECT_REF=proj_cdmymsrobxmcgjqzhdkq`);
+  console.log(`  - realtime-streams: TRIGGER_PROJECT_REF=proj_klxlzjnzxmbgiwuuwhvb`);
+}
+
+async function createBatchLimitOrgs(user: User) {
+  const org1 = await findOrCreateOrganization("batch-limit-org-1", user, {
+    batchQueueConcurrencyConfig: { processingConcurrency: 1 },
+  });
+  const org2 = await findOrCreateOrganization("batch-limit-org-2", user, {
+    batchQueueConcurrencyConfig: { processingConcurrency: 5 },
+  });
+  const org3 = await findOrCreateOrganization("batch-limit-org-3", user, {
+    batchQueueConcurrencyConfig: { processingConcurrency: 10 },
+  });
+
+  // Create 3 projects in each organization
+  const org1Project1 = await findOrCreateProject("batch-limit-project-1", org1, user.id);
+  const org1Project2 = await findOrCreateProject("batch-limit-project-2", org1, user.id);
+  const org1Project3 = await findOrCreateProject("batch-limit-project-3", org1, user.id);
+
+  const org2Project1 = await findOrCreateProject("batch-limit-project-1", org2, user.id);
+  const org2Project2 = await findOrCreateProject("batch-limit-project-2", org2, user.id);
+  const org2Project3 = await findOrCreateProject("batch-limit-project-3", org2, user.id);
+
+  const org3Project1 = await findOrCreateProject("batch-limit-project-1", org3, user.id);
+  const org3Project2 = await findOrCreateProject("batch-limit-project-2", org3, user.id);
+  const org3Project3 = await findOrCreateProject("batch-limit-project-3", org3, user.id);
+
+  console.log("tenants.json");
+  console.log(
+    JSON.stringify({
+      apiUrl: "http://localhost:3030",
+      tenants: [
+        {
+          id: org1Project1.project.externalRef,
+          secretKey: org1Project1.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org1Project2.project.externalRef,
+          secretKey: org1Project2.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org1Project3.project.externalRef,
+          secretKey: org1Project3.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org2Project1.project.externalRef,
+          secretKey: org2Project1.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org2Project2.project.externalRef,
+          secretKey: org2Project2.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org2Project3.project.externalRef,
+          secretKey: org2Project3.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org3Project1.project.externalRef,
+          secretKey: org3Project1.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org3Project2.project.externalRef,
+          secretKey: org3Project2.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+        {
+          id: org3Project3.project.externalRef,
+          secretKey: org3Project3.environments.find((e) => e.type === "DEVELOPMENT")?.apiKey,
+        },
+      ],
+    })
+  );
+}
+
+seed()
+  .catch((e) => {
+    console.error("❌ Seed failed:");
+    console.error(e);
+    process.exit(1);
+  })
+  .finally(async () => {
+    await prisma.$disconnect();
+  });
+
+async function findOrCreateOrganization(
+  title: string,
+  user: User,
+  updates?: Prisma.OrganizationUpdateInput
+) {
+  let organization = await prisma.organization.findFirst({
+    where: {
+      title: title,
+      members: {
+        some: {
+          userId: user.id,
+        },
+      },
+    },
+  });
+
+  if (!organization) {
+    console.log(`Creating organization: ${title}...`);
+    organization = await createOrganization({
+      title: title,
+      userId: user.id,
+      companySize: "1-10",
+    });
+  }
+
+  if (updates) {
+    organization = await prisma.organization.update({
+      where: { id: organization.id },
+      data: updates,
+    });
+  }
+
+  return organization;
+}
+
+async function findOrCreateProject(
+  name: string,
+  organization: Organization,
+  userId: string,
+  externalRef?: string
+) {
+  let project = await prisma.project.findFirst({
+    where: {
+      name,
+      organizationId: organization.id,
+    },
+  });
+
+  if (!project) {
+    console.log(`Creating project: ${name}...`);
+    project = await createProject({
+      organizationSlug: organization.slug,
+      name,
+      userId,
+      version: "v3",
+    });
+
+    if (externalRef) {
+      project = await prisma.project.update({
+        where: { id: project.id },
+        data: { externalRef },
+      });
+    }
+  }
+
+  console.log(`✅ Project ready: ${project.name} (${project.externalRef})`);
+
+  // list environments for this project
+  const environments = await prisma.runtimeEnvironment.findMany({
+    where: { projectId: project.id },
+    select: {
+      slug: true,
+      type: true,
+      apiKey: true,
+    },
+  });
+  console.log(`   Environments for ${project.name}:`);
+  for (const env of environments) {
+    console.log(`   - ${env.type.toLowerCase()} (${env.slug}): ${env.apiKey}`);
+  }
+
+  return { project, environments };
+}
diff --git a/apps/webapp/sentry.server.ts b/apps/webapp/sentry.server.ts
new file mode 100644
index 00000000000..a50efcfe85b
--- /dev/null
+++ b/apps/webapp/sentry.server.ts
@@ -0,0 +1,27 @@
+import * as Sentry from "@sentry/remix";
+
+if (process.env.SENTRY_DSN) {
+  console.log("🔭 Initializing Sentry");
+
+  Sentry.init({
+    dsn: process.env.SENTRY_DSN,
+    release: process.env.BUILD_GIT_SHA,
+
+    // Adds request headers and IP for users, for more info visit: and captures action formData attributes
+    // https://docs.sentry.io/platforms/javascript/guides/remix/configuration/options/#sendDefaultPii
+    sendDefaultPii: false,
+
+    skipOpenTelemetrySetup: true,
+    registerEsmLoaderHooks: false,
+    disableInstrumentationWarnings: true,
+
+    maxBreadcrumbs: 0,
+    shutdownTimeout: 10,
+
+    serverName: process.env.SERVICE_NAME,
+    environment: process.env.APP_ENV,
+
+    ignoreErrors: ["queryRoute() call aborted"],
+    includeLocalVariables: false,
+  });
+}
diff --git a/apps/webapp/server.ts b/apps/webapp/server.ts
index 1ad45fb538a..b2cc9387332 100644
--- a/apps/webapp/server.ts
+++ b/apps/webapp/server.ts
@@ -1,3 +1,5 @@
+import "./sentry.server";
+
 import { createRequestHandler } from "@remix-run/express";
 import { broadcastDevReady, logDevReady } from "@remix-run/server-runtime";
 import compression from "compression";
@@ -10,168 +12,257 @@ import type { Server as IoServer } from "socket.io";
 import { WebSocketServer } from "ws";
 import { RateLimitMiddleware } from "~/services/apiRateLimit.server";
 import { type RunWithHttpContextFunction } from "~/services/httpAsyncStorage.server";
+import cluster from "node:cluster";
+import os from "node:os";
 
-const app = express();
+const ENABLE_CLUSTER = process.env.ENABLE_CLUSTER === "1";
+const cpuCount = os.availableParallelism();
+const WORKERS =
+  Number.parseInt(process.env.WEB_CONCURRENCY || process.env.CLUSTER_WORKERS || "", 10) || cpuCount;
 
-if (process.env.DISABLE_COMPRESSION !== "1") {
-  app.use(compression());
+function forkWorkers() {
+  for (let i = 0; i < WORKERS; i++) {
+    cluster.fork();
+  }
 }
 
-// http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
-app.disable("x-powered-by");
+function installPrimarySignalHandlers() {
+  let didHandleSigterm = false;
+  let didHandleSigint = false;
+  let didGracefulExit = false;
+
+  const forward = (signal: NodeJS.Signals) => {
+    for (const id in cluster.workers) {
+      const w = cluster.workers[id];
+      if (w?.process?.pid) {
+        try {
+          process.kill(w.process.pid, signal);
+        } catch {}
+      }
+    }
+  };
+
+  const gracefulExit = () => {
+    if (didGracefulExit) return;
+    didGracefulExit = true;
+
+    const timeoutMs = Number(process.env.GRACEFUL_SHUTDOWN_TIMEOUT || 30_000);
+    // wait for workers to exit, then exit the primary too
+    const maybeExit = () => {
+      const alive = Object.values(cluster.workers || {}).some((w) => w && !w.isDead());
+      if (!alive) process.exit(0);
+    };
+    setInterval(maybeExit, 1000);
+    setTimeout(() => process.exit(0), timeoutMs);
+  };
 
-// Remix fingerprints its assets so we can cache forever.
-app.use("/build", express.static("public/build", { immutable: true, maxAge: "1y" }));
+  process.on("SIGTERM", () => {
+    if (didHandleSigterm) return;
+    didHandleSigterm = true;
+    forward("SIGTERM");
+    gracefulExit();
+  });
+  process.on("SIGINT", () => {
+    if (didHandleSigint) return;
+    didHandleSigint = true;
+    forward("SIGINT");
+    gracefulExit();
+  });
+}
 
-// Everything else (like favicon.ico) is cached for an hour. You may want to be
-// more aggressive with this caching.
-app.use(express.static("public", { maxAge: "1h" }));
+if (ENABLE_CLUSTER && cluster.isPrimary) {
+  process.title = `node webapp-server primary`;
+  console.log(`[cluster] Primary ${process.pid} is starting with ${WORKERS} workers`);
+  forkWorkers();
 
-app.use(morgan("tiny"));
+  cluster.on("exit", (worker, code, signal) => {
+    const intentional =
+      // If we sent "shutdown", the worker will exit with code 0 after closing.
+      code === 0 || worker.exitedAfterDisconnect;
+    console.log(
+      `[cluster] worker ${worker.process.pid} exited (code=${code}, signal=${signal}, intentional=${intentional})`
+    );
+    // If it wasn't during a shutdown, replace the worker.
+    if (!intentional) cluster.fork();
+  });
 
-process.title = "node webapp-server";
+  installPrimarySignalHandlers();
+} else {
+  const app = express();
 
-const MODE = process.env.NODE_ENV;
-const BUILD_DIR = path.join(process.cwd(), "build");
-const build = require(BUILD_DIR);
+  if (process.env.DISABLE_COMPRESSION !== "1") {
+    app.use(compression());
+  }
 
-const port = process.env.REMIX_APP_PORT || process.env.PORT || 3000;
+  // http://expressjs.com/en/advanced/best-practice-security.html#at-a-minimum-disable-x-powered-by-header
+  app.disable("x-powered-by");
 
-if (process.env.HTTP_SERVER_DISABLED !== "true") {
-  const socketIo: { io: IoServer } | undefined = build.entry.module.socketIo;
-  const wss: WebSocketServer | undefined = build.entry.module.wss;
-  const apiRateLimiter: RateLimitMiddleware = build.entry.module.apiRateLimiter;
-  const engineRateLimiter: RateLimitMiddleware = build.entry.module.engineRateLimiter;
-  const runWithHttpContext: RunWithHttpContextFunction = build.entry.module.runWithHttpContext;
+  // Remix fingerprints its assets so we can cache forever.
+  app.use("/build", express.static("public/build", { immutable: true, maxAge: "1y" }));
 
-  app.use((req, res, next) => {
-    // helpful headers:
-    res.set("Strict-Transport-Security", `max-age=${60 * 60 * 24 * 365 * 100}`);
+  // Everything else (like favicon.ico) is cached for an hour. You may want to be
+  // more aggressive with this caching.
+  app.use(express.static("public", { maxAge: "1h" }));
 
-    // Add X-Robots-Tag header for test-cloud.trigger.dev
-    if (req.hostname !== "cloud.trigger.dev") {
-      res.set("X-Robots-Tag", "noindex, nofollow");
-    }
+  app.use(morgan("tiny"));
 
-    // /clean-urls/ -> /clean-urls
-    if (req.path.endsWith("/") && req.path.length > 1) {
-      const query = req.url.slice(req.path.length);
-      const safepath = req.path.slice(0, -1).replace(/\/+/g, "/");
-      res.redirect(301, safepath + query);
-      return;
-    }
-    next();
-  });
+  process.title = ENABLE_CLUSTER
+    ? `node webapp-worker-${cluster.isWorker ? cluster.worker?.id : "solo"}`
+    : "node webapp-server";
 
-  app.use((req, res, next) => {
-    // Generate a unique request ID for each request
-    const requestId = nanoid();
+  const MODE = process.env.NODE_ENV;
+  const BUILD_DIR = path.join(process.cwd(), "build");
+  const build = require(BUILD_DIR);
 
-    runWithHttpContext({ requestId, path: req.url, host: req.hostname, method: req.method }, next);
-  });
+  const port = process.env.REMIX_APP_PORT || process.env.PORT || 3000;
 
-  if (process.env.DASHBOARD_AND_API_DISABLED !== "true") {
-    if (process.env.ALLOW_ONLY_REALTIME_API === "true") {
-      // Block all requests that do not start with /realtime
-      app.use((req, res, next) => {
-        // Make sure /healthcheck is still accessible
-        if (!req.url.startsWith("/realtime") && req.url !== "/healthcheck") {
-          res.status(404).send("Not Found");
-          return;
-        }
+  if (process.env.HTTP_SERVER_DISABLED !== "true") {
+    const socketIo: { io: IoServer } | undefined = build.entry.module.socketIo;
+    const wss: WebSocketServer | undefined = build.entry.module.wss;
+    const apiRateLimiter: RateLimitMiddleware = build.entry.module.apiRateLimiter;
+    const engineRateLimiter: RateLimitMiddleware = build.entry.module.engineRateLimiter;
+    const runWithHttpContext: RunWithHttpContextFunction = build.entry.module.runWithHttpContext;
 
-        next();
-      });
-    }
+    app.use((req, res, next) => {
+      // helpful headers:
+      res.set("Strict-Transport-Security", `max-age=${60 * 60 * 24 * 365 * 100}`);
 
-    app.use(apiRateLimiter);
-    app.use(engineRateLimiter);
+      // Add X-Robots-Tag header for test-cloud.trigger.dev
+      if (req.hostname !== "cloud.trigger.dev") {
+        res.set("X-Robots-Tag", "noindex, nofollow");
+      }
 
-    app.all(
-      "*",
-      // @ts-ignore
-      createRequestHandler({
-        build,
-        mode: MODE,
-      })
-    );
-  } else {
-    // we need to do the health check here at /healthcheck
-    app.get("/healthcheck", (req, res) => {
-      res.status(200).send("OK");
+      // /clean-urls/ -> /clean-urls
+      if (req.path.endsWith("/") && req.path.length > 1) {
+        const query = req.url.slice(req.path.length);
+        const safepath = req.path.slice(0, -1).replace(/\/+/g, "/");
+        res.redirect(301, safepath + query);
+        return;
+      }
+      next();
     });
-  }
 
-  const server = app.listen(port, () => {
-    console.log(`✅ server ready: http://localhost:${port} [NODE_ENV: ${MODE}]`);
+    app.use((req, res, next) => {
+      // Generate a unique request ID for each request
+      const requestId = nanoid();
+
+      runWithHttpContext(
+        { requestId, path: req.url, host: req.hostname, method: req.method },
+        next
+      );
+    });
+
+    if (process.env.DASHBOARD_AND_API_DISABLED !== "true") {
+      if (process.env.ALLOW_ONLY_REALTIME_API === "true") {
+        // Block all requests that do not start with /realtime
+        app.use((req, res, next) => {
+          // Make sure /healthcheck is still accessible
+          if (!req.url.startsWith("/realtime") && req.url !== "/healthcheck") {
+            res.status(404).send("Not Found");
+            return;
+          }
+
+          next();
+        });
+      }
 
-    if (MODE === "development") {
-      broadcastDevReady(build)
-        .then(() => logDevReady(build))
-        .catch(console.error);
+      app.use(apiRateLimiter);
+      app.use(engineRateLimiter);
+
+      app.all(
+        "*",
+        // @ts-ignore
+        createRequestHandler({
+          build,
+          mode: MODE,
+        })
+      );
+    } else {
+      // we need to do the health check here at /healthcheck
+      app.get("/healthcheck", (req, res) => {
+        res.status(200).send("OK");
+      });
     }
-  });
 
-  server.keepAliveTimeout = 65 * 1000;
-  // Mitigate against https://github.com/triggerdotdev/trigger.dev/security/dependabot/128
-  // by not allowing 2000+ headers to be sent and causing a DoS
-  // headers will instead be limited by the maxHeaderSize
-  server.maxHeadersCount = 0;
+    const server = app.listen(port, () => {
+      console.log(
+        `✅ server ready: http://localhost:${port} [NODE_ENV: ${MODE}]${
+          ENABLE_CLUSTER && cluster.isWorker ? ` [worker ${cluster.worker?.id}/${process.pid}]` : ""
+        }`
+      );
 
-  process.on("SIGTERM", () => {
-    server.close((err) => {
-      if (err) {
-        console.error("Error closing express server:", err);
-      } else {
-        console.log("Express server closed gracefully.");
+      if (MODE === "development") {
+        broadcastDevReady(build)
+          .then(() => logDevReady(build))
+          .catch(console.error);
       }
     });
-  });
 
-  socketIo?.io.attach(server);
-  server.removeAllListeners("upgrade"); // prevent duplicate upgrades from listeners created by io.attach()
+    server.keepAliveTimeout = 65 * 1000;
+    // Mitigate against https://github.com/triggerdotdev/trigger.dev/security/dependabot/128
+    // by not allowing 2000+ headers to be sent and causing a DoS
+    // headers will instead be limited by the maxHeaderSize
+    server.maxHeadersCount = 0;
 
-  server.on("upgrade", async (req, socket, head) => {
-    console.log(
-      `Attemping to upgrade connection at url ${req.url} with headers: ${JSON.stringify(
-        req.headers
-      )}`
-    );
+    let didCloseServer = false;
 
-    socket.on("error", (err) => {
-      console.error("Connection upgrade error:", err);
-    });
+    function closeServer(signal: NodeJS.Signals) {
+      if (didCloseServer) return;
+      didCloseServer = true;
 
-    const url = new URL(req.url ?? "", "http://localhost");
+      server.close((err) => {
+        if (err) {
+          console.error("Error closing express server:", err);
+        } else {
+          console.log("Express server closed gracefully.");
+        }
+      });
+    }
 
-    // Upgrade socket.io connection
-    if (url.pathname.startsWith("/socket.io/")) {
-      console.log(`Socket.io client connected, upgrading their connection...`);
+    process.on("SIGTERM", closeServer);
+    process.on("SIGINT", closeServer);
 
-      // https://github.com/socketio/socket.io/issues/4693
-      (socketIo?.io.engine as EngineServer).handleUpgrade(req, socket, head);
-      return;
-    }
+    socketIo?.io.attach(server);
+    server.removeAllListeners("upgrade"); // prevent duplicate upgrades from listeners created by io.attach()
 
-    // Only upgrade the connecting if the path is `/ws`
-    if (url.pathname !== "/ws") {
-      // Setting the socket.destroy() error param causes an error event to be emitted which needs to be handled with socket.on("error") to prevent uncaught exceptions.
-      socket.destroy(
-        new Error(
-          "Cannot connect because of invalid path: Please include `/ws` in the path of your upgrade request."
-        )
-      );
-      return;
-    }
+    server.on("upgrade", async (req, socket, head) => {
+      console.log(`Attemping to upgrade connection at url ${req.url}`);
+
+      socket.on("error", (err) => {
+        console.error("Connection upgrade error:", err);
+      });
+
+      const url = new URL(req.url ?? "", "http://localhost");
+
+      // Upgrade socket.io connection
+      if (url.pathname.startsWith("/socket.io/")) {
+        console.log(`Socket.io client connected, upgrading their connection...`);
+
+        // https://github.com/socketio/socket.io/issues/4693
+        (socketIo?.io.engine as EngineServer).handleUpgrade(req, socket, head);
+        return;
+      }
 
-    console.log(`Client connected, upgrading their connection...`);
+      // Only upgrade the connecting if the path is `/ws`
+      if (url.pathname !== "/ws") {
+        // Setting the socket.destroy() error param causes an error event to be emitted which needs to be handled with socket.on("error") to prevent uncaught exceptions.
+        socket.destroy(
+          new Error(
+            "Cannot connect because of invalid path: Please include `/ws` in the path of your upgrade request."
+          )
+        );
+        return;
+      }
+
+      console.log(`Client connected, upgrading their connection...`);
 
-    // Handle the WebSocket connection
-    wss?.handleUpgrade(req, socket, head, (ws) => {
-      wss?.emit("connection", ws, req);
+      // Handle the WebSocket connection
+      wss?.handleUpgrade(req, socket, head, (ws) => {
+        wss?.emit("connection", ws, req);
+      });
     });
-  });
-} else {
-  require(BUILD_DIR);
-  console.log(`✅ app ready (skipping http server)`);
+  } else {
+    require(BUILD_DIR);
+    console.log(`✅ app ready (skipping http server)`);
+  }
 }
diff --git a/apps/webapp/tailwind.config.js b/apps/webapp/tailwind.config.js
index 7ca81fd8eea..b3d6e2b235f 100644
--- a/apps/webapp/tailwind.config.js
+++ b/apps/webapp/tailwind.config.js
@@ -159,7 +159,14 @@ const runs = colors.indigo[500];
 const batches = colors.pink[500];
 const schedules = colors.yellow[500];
 const queues = colors.purple[500];
+const query = colors.blue[500];
+const metrics = colors.green[500];
+const customDashboards = charcoal[400];
 const deployments = colors.green[500];
+const concurrency = colors.amber[500];
+const limits = colors.purple[500];
+const regions = colors.green[500];
+const logs = colors.pink[500];
 const tests = colors.lime[500];
 const apiKeys = colors.amber[500];
 const environmentVariables = colors.pink[500];
@@ -234,8 +241,13 @@ module.exports = {
         runs,
         batches,
         schedules,
+        concurrency,
         queues,
+        query,
+        regions,
+        limits,
         deployments,
+        logs,
         tests,
         apiKeys,
         environmentVariables,
@@ -244,6 +256,8 @@ module.exports = {
         orgSettings,
         docs,
         bulkActions,
+        metrics,
+        customDashboards,
       },
       focusStyles: {
         outline: "1px solid",
diff --git a/apps/webapp/test/authorizationRateLimitMiddleware.test.ts b/apps/webapp/test/authorizationRateLimitMiddleware.test.ts
index af88d4c4af1..5c02abfbab4 100644
--- a/apps/webapp/test/authorizationRateLimitMiddleware.test.ts
+++ b/apps/webapp/test/authorizationRateLimitMiddleware.test.ts
@@ -368,6 +368,7 @@ describe.skipIf(process.env.GITHUB_ACTIONS)("authorizationRateLimitMiddleware",
         limiterCache: {
           fresh: 1000, // 1 second
           stale: 2000, // 2 seconds
+          maxItems: 1000,
         },
         limiterConfigOverride: async (authorizationValue) => {
           configOverrideCalls++;
diff --git a/apps/webapp/test/components/code/tsql/tsqlCompletion.test.ts b/apps/webapp/test/components/code/tsql/tsqlCompletion.test.ts
new file mode 100644
index 00000000000..f5e56fb6e24
--- /dev/null
+++ b/apps/webapp/test/components/code/tsql/tsqlCompletion.test.ts
@@ -0,0 +1,328 @@
+import { describe, it, expect } from "vitest";
+import { createTSQLCompletion } from "~/components/code/tsql/tsqlCompletion";
+import type { TableSchema } from "@internal/tsql";
+
+// Helper to create a mock completion context
+function createMockContext(doc: string, pos: number, explicit = false) {
+  return {
+    state: {
+      doc: {
+        toString: () => doc,
+        sliceString: (from: number, to: number) => doc.slice(from, to),
+      },
+    },
+    pos,
+    explicit,
+    matchBefore: (regex: RegExp) => {
+      const beforePos = doc.slice(0, pos);
+      const match = beforePos.match(new RegExp(regex.source + "$"));
+      if (match) {
+        return {
+          from: pos - match[0].length,
+          to: pos,
+          text: match[0],
+        };
+      }
+      return null;
+    },
+  } as any;
+}
+
+// Test schema with enum columns
+const testSchema: TableSchema[] = [
+  {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+    description: "Task runs table",
+    columns: {
+      id: { name: "id", type: "String", description: "Run ID" },
+      status: {
+        name: "status",
+        type: "LowCardinality(String)",
+        description: "Run status",
+        allowedValues: ["Completed", "Failed", "Queued", "Executing"],
+      },
+      machine: {
+        name: "machine",
+        type: "LowCardinality(String)",
+        description: "Machine preset",
+        allowedValues: ["micro", "small-1x", "small-2x", "medium-1x"],
+      },
+      environment_type: {
+        name: "environment_type",
+        type: "LowCardinality(String)",
+        description: "Environment type",
+        allowedValues: ["PRODUCTION", "STAGING", "DEVELOPMENT", "PREVIEW"],
+      },
+      created_at: { name: "created_at", type: "DateTime64", description: "Creation time" },
+      organization_id: { name: "organization_id", type: "String" },
+      project_id: { name: "project_id", type: "String" },
+      environment_id: { name: "environment_id", type: "String" },
+    },
+  },
+  {
+    name: "logs",
+    clickhouseName: "trigger_dev.task_events_v2",
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+    description: "Task logs table",
+    columns: {
+      id: { name: "id", type: "String" },
+      run_id: { name: "run_id", type: "String" },
+      message: { name: "message", type: "String" },
+      level: { name: "level", type: "String" },
+      timestamp: { name: "timestamp", type: "DateTime64" },
+      organization_id: { name: "organization_id", type: "String" },
+      project_id: { name: "project_id", type: "String" },
+      environment_id: { name: "environment_id", type: "String" },
+    },
+  },
+];
+
+describe("createTSQLCompletion", () => {
+  const completionSource = createTSQLCompletion(testSchema);
+
+  it("should return null for empty input without explicit trigger", () => {
+    const context = createMockContext("", 0, false);
+    const result = completionSource(context);
+    expect(result).toBeNull();
+  });
+
+  it("should return completions when explicitly triggered", () => {
+    const context = createMockContext("", 0, true);
+    const result = completionSource(context);
+    expect(result).not.toBeNull();
+    expect(result?.options.length).toBeGreaterThan(0);
+  });
+
+  it("should include tables in completions", () => {
+    // When typing after FROM, tables should be available
+    const doc = "SELECT * FROM r";
+    const context = createMockContext(doc, doc.length, true);
+    const result = completionSource(context);
+
+    expect(result).not.toBeNull();
+
+    const tableLabels = result?.options.map((o) => o.label);
+    // Tables should always be available in completions
+    expect(tableLabels).toContain("runs");
+    expect(tableLabels).toContain("logs");
+  });
+
+  it("should suggest columns after SELECT keyword", () => {
+    const doc = "SELECT FROM runs";
+    // Position cursor right after SELECT
+    const pos = 7;
+    const context = createMockContext(doc, pos, true);
+    const result = completionSource(context);
+
+    expect(result).not.toBeNull();
+
+    // Should include functions
+    const labels = result?.options.map((o) => o.label) || [];
+    expect(labels.some((l) => l === "count")).toBe(true);
+    expect(labels.some((l) => l === "sum")).toBe(true);
+  });
+
+  it("should suggest columns with table prefix for qualified references", () => {
+    const doc = "SELECT runs. FROM runs";
+    // Position cursor right after "runs."
+    const pos = 12;
+    const context = createMockContext(doc, pos, true);
+    const result = completionSource(context);
+
+    expect(result).not.toBeNull();
+
+    const columnLabels = result?.options.map((o) => o.label);
+    expect(columnLabels).toContain("id");
+    expect(columnLabels).toContain("status");
+    expect(columnLabels).toContain("created_at");
+  });
+
+  it("should include SQL keywords in general context", () => {
+    const doc = "S";
+    const context = createMockContext(doc, doc.length, true);
+    const result = completionSource(context);
+
+    expect(result).not.toBeNull();
+
+    const labels = result?.options.map((o) => o.label);
+    expect(labels).toContain("SELECT");
+  });
+
+  it("should include aggregate functions", () => {
+    const doc = "SELECT ";
+    const context = createMockContext(doc, doc.length, true);
+    const result = completionSource(context);
+
+    expect(result).not.toBeNull();
+
+    const labels = result?.options.map((o) => o.label);
+    expect(labels).toContain("count");
+    expect(labels).toContain("sum");
+    expect(labels).toContain("avg");
+    expect(labels).toContain("min");
+    expect(labels).toContain("max");
+  });
+
+  it("should handle WHERE clause context", () => {
+    const doc = "SELECT * FROM runs WHERE ";
+    const context = createMockContext(doc, doc.length, true);
+    const result = completionSource(context);
+
+    expect(result).not.toBeNull();
+
+    // Should suggest columns
+    const labels = result?.options.map((o) => o.label) || [];
+    expect(labels).toContain("status");
+
+    // Should include conditional keywords
+    expect(labels).toContain("AND");
+    expect(labels).toContain("OR");
+  });
+
+  describe("enum value completions", () => {
+    it("should suggest enum values after = operator", () => {
+      const doc = "SELECT * FROM runs WHERE status = ";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'Completed'");
+      expect(labels).toContain("'Failed'");
+      expect(labels).toContain("'Queued'");
+      expect(labels).toContain("'Executing'");
+    });
+
+    it("should suggest enum values after = with opening quote", () => {
+      const doc = "SELECT * FROM runs WHERE status = '";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'Completed'");
+      expect(labels).toContain("'Failed'");
+    });
+
+    it("should suggest enum values with partial input", () => {
+      const doc = "SELECT * FROM runs WHERE status = 'Comp";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'Completed'");
+    });
+
+    it("should suggest enum values for machine column", () => {
+      const doc = "SELECT * FROM runs WHERE machine = ";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'micro'");
+      expect(labels).toContain("'small-1x'");
+      expect(labels).toContain("'medium-1x'");
+    });
+
+    it("should suggest enum values for environment_type column", () => {
+      const doc = "SELECT * FROM runs WHERE environment_type = ";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'PRODUCTION'");
+      expect(labels).toContain("'STAGING'");
+      expect(labels).toContain("'DEVELOPMENT'");
+    });
+
+    it("should suggest enum values after != operator", () => {
+      const doc = "SELECT * FROM runs WHERE status != ";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'Completed'");
+      expect(labels).toContain("'Failed'");
+    });
+
+    it("should suggest enum values after IN (", () => {
+      const doc = "SELECT * FROM runs WHERE status IN (";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'Completed'");
+      expect(labels).toContain("'Failed'");
+    });
+
+    it("should suggest enum values after comma in IN clause", () => {
+      const doc = "SELECT * FROM runs WHERE status IN ('Completed', ";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).toContain("'Failed'");
+      expect(labels).toContain("'Queued'");
+    });
+
+    it("should include closing quote in replacement range when auto-paired", () => {
+      // Simulate cursor between auto-paired quotes: status = '|'
+      const doc = "SELECT * FROM runs WHERE status = ''";
+      const pos = doc.length - 1; // Cursor is between the quotes
+      const context = createMockContext(doc, pos, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+      // The 'to' should extend past the cursor to include the closing quote
+      expect(result?.to).toBe(pos + 1);
+    });
+
+    it("should not extend 'to' when no closing quote present", () => {
+      const doc = "SELECT * FROM runs WHERE status = '";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+      // 'to' should be undefined (or not set) since there's no closing quote
+      expect(result?.to).toBeUndefined();
+    });
+
+    it("should not suggest enum values for columns without allowedValues", () => {
+      const doc = "SELECT * FROM runs WHERE id = ";
+      const context = createMockContext(doc, doc.length, true);
+      const result = completionSource(context);
+
+      expect(result).not.toBeNull();
+
+      // Should return empty options for value context with non-enum column
+      const labels = result?.options.map((o) => o.label) || [];
+      expect(labels).not.toContain("'Completed'");
+      expect(labels.length).toBe(0);
+    });
+  });
+});
+
diff --git a/apps/webapp/test/components/code/tsql/tsqlLinter.test.ts b/apps/webapp/test/components/code/tsql/tsqlLinter.test.ts
new file mode 100644
index 00000000000..a669c1209df
--- /dev/null
+++ b/apps/webapp/test/components/code/tsql/tsqlLinter.test.ts
@@ -0,0 +1,79 @@
+import { describe, it, expect } from "vitest";
+import { isValidTSQLQuery, getTSQLError } from "~/components/code/tsql/tsqlLinter";
+
+describe("tsqlLinter", () => {
+  describe("isValidTSQLQuery", () => {
+    it("should return true for empty queries", () => {
+      expect(isValidTSQLQuery("")).toBe(true);
+      expect(isValidTSQLQuery("   ")).toBe(true);
+    });
+
+    it("should return true for valid SELECT queries", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users")).toBe(true);
+      expect(isValidTSQLQuery("SELECT id, name FROM users WHERE status = 'active'")).toBe(true);
+      expect(isValidTSQLQuery("SELECT count(*) FROM users GROUP BY status")).toBe(true);
+    });
+
+    it("should return true for queries with ORDER BY", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users ORDER BY created_at DESC")).toBe(true);
+    });
+
+    it("should return true for queries with LIMIT", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users LIMIT 10")).toBe(true);
+      expect(isValidTSQLQuery("SELECT * FROM users LIMIT 10 OFFSET 20")).toBe(true);
+    });
+
+    it("should return true for queries with JOINs", () => {
+      expect(isValidTSQLQuery("SELECT * FROM users JOIN orders ON users.id = orders.user_id")).toBe(
+        true
+      );
+      expect(
+        isValidTSQLQuery(
+          "SELECT * FROM users LEFT JOIN orders ON users.id = orders.user_id"
+        )
+      ).toBe(true);
+    });
+
+    it("should return false for invalid syntax", () => {
+      expect(isValidTSQLQuery("SELEC * FROM users")).toBe(false);
+      expect(isValidTSQLQuery("SELECT * FORM users")).toBe(false);
+      expect(isValidTSQLQuery("SELECT FROM users")).toBe(false);
+    });
+
+    it("should return false for incomplete queries", () => {
+      expect(isValidTSQLQuery("SELECT * FROM")).toBe(false);
+      expect(isValidTSQLQuery("SELECT")).toBe(false);
+    });
+  });
+
+  describe("getTSQLError", () => {
+    it("should return null for empty queries", () => {
+      expect(getTSQLError("")).toBeNull();
+      expect(getTSQLError("   ")).toBeNull();
+    });
+
+    it("should return null for valid queries", () => {
+      expect(getTSQLError("SELECT * FROM users")).toBeNull();
+      expect(getTSQLError("SELECT id, name FROM users WHERE id = 1")).toBeNull();
+    });
+
+    it("should return error message for invalid queries", () => {
+      const error = getTSQLError("SELEC * FROM users");
+      expect(error).not.toBeNull();
+      expect(typeof error).toBe("string");
+    });
+
+    it("should include position information in error", () => {
+      const error = getTSQLError("SELECT * FORM users");
+      expect(error).not.toBeNull();
+      // Error message should contain line/column info
+      expect(error).toContain("line");
+    });
+
+    it("should handle unclosed string literals", () => {
+      const error = getTSQLError("SELECT * FROM users WHERE name = 'test");
+      expect(error).not.toBeNull();
+    });
+  });
+});
+
diff --git a/apps/webapp/test/concurrentFlushScheduler.test.ts b/apps/webapp/test/concurrentFlushScheduler.test.ts
new file mode 100644
index 00000000000..9ab7954033e
--- /dev/null
+++ b/apps/webapp/test/concurrentFlushScheduler.test.ts
@@ -0,0 +1,161 @@
+import { ConcurrentFlushScheduler } from "~/services/runsReplicationService.server";
+
+vi.setConfig({ testTimeout: 10_000 });
+
+type TestItem = {
+  id: string;
+  event: "insert" | "update";
+  version: number;
+};
+
+describe("ConcurrentFlushScheduler", () => {
+  it("should deduplicate items by key, keeping the latest version", async () => {
+    const flushedBatches: TestItem[][] = [];
+
+    const scheduler = new ConcurrentFlushScheduler<TestItem>({
+      batchSize: 100,
+      flushInterval: 50,
+      maxConcurrency: 1,
+      callback: async (_flushId, batch) => {
+        flushedBatches.push([...batch]);
+      },
+      getKey: (item) => `${item.event}_${item.id}`,
+      shouldReplace: (existing, incoming) => incoming.version >= existing.version,
+    });
+
+    scheduler.start();
+
+    // Add items with duplicate keys but different versions
+    scheduler.addToBatch([
+      { id: "run_1", event: "insert", version: 1 },
+      { id: "run_1", event: "update", version: 2 },
+      { id: "run_2", event: "insert", version: 1 },
+    ]);
+
+    // Add more items - should merge with existing
+    scheduler.addToBatch([
+      { id: "run_1", event: "insert", version: 3 }, // Higher version, should replace
+      { id: "run_1", event: "update", version: 1 }, // Lower version, should NOT replace
+      { id: "run_2", event: "update", version: 4 },
+    ]);
+
+    // Wait for flush
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    scheduler.shutdown();
+
+    // Should have flushed once with deduplicated items
+    expect(flushedBatches.length).toBeGreaterThanOrEqual(1);
+
+    const allFlushed = flushedBatches.flat();
+
+    // Find items by their key
+    const insertRun1 = allFlushed.find((i) => i.id === "run_1" && i.event === "insert");
+    const updateRun1 = allFlushed.find((i) => i.id === "run_1" && i.event === "update");
+    const insertRun2 = allFlushed.find((i) => i.id === "run_2" && i.event === "insert");
+    const updateRun2 = allFlushed.find((i) => i.id === "run_2" && i.event === "update");
+
+    // Verify correct versions were kept
+    expect(insertRun1?.version).toBe(3); // Latest version for insert_run_1
+    expect(updateRun1?.version).toBe(2); // Original update_run_1 (v1 didn't replace v2)
+    expect(insertRun2?.version).toBe(1); // Only version for insert_run_2
+    expect(updateRun2?.version).toBe(4); // Only version for update_run_2
+  });
+
+  it("should skip items where getKey returns null", async () => {
+    const flushedBatches: TestItem[][] = [];
+
+    const scheduler = new ConcurrentFlushScheduler<TestItem>({
+      batchSize: 100,
+      flushInterval: 50,
+      maxConcurrency: 1,
+      callback: async (_flushId, batch) => {
+        flushedBatches.push([...batch]);
+      },
+      getKey: (item) => {
+        if (!item.id) {
+          return null;
+        }
+        return `${item.event}_${item.id}`;
+      },
+      shouldReplace: (existing, incoming) => incoming.version >= existing.version,
+    });
+
+    scheduler.start();
+
+    scheduler.addToBatch([
+      { id: "run_1", event: "insert", version: 1 },
+      { id: "", event: "insert", version: 2 }, // Should be skipped (null key)
+      { id: "run_2", event: "insert", version: 1 },
+    ]);
+
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    scheduler.shutdown();
+
+    const allFlushed = flushedBatches.flat();
+    expect(allFlushed).toHaveLength(2);
+    expect(allFlushed.map((i) => i.id).sort()).toEqual(["run_1", "run_2"]);
+  });
+
+  it("should flush when batch size threshold is reached", async () => {
+    const flushedBatches: TestItem[][] = [];
+
+    const scheduler = new ConcurrentFlushScheduler<TestItem>({
+      batchSize: 3,
+      flushInterval: 10000, // Long interval so timer doesn't trigger
+      maxConcurrency: 1,
+      callback: async (_flushId, batch) => {
+        flushedBatches.push([...batch]);
+      },
+      getKey: (item) => `${item.event}_${item.id}`,
+      shouldReplace: (existing, incoming) => incoming.version >= existing.version,
+    });
+
+    scheduler.start();
+
+    // Add 3 unique items - should trigger flush
+    scheduler.addToBatch([
+      { id: "run_1", event: "insert", version: 1 },
+      { id: "run_2", event: "insert", version: 1 },
+      { id: "run_3", event: "insert", version: 1 },
+    ]);
+
+    await new Promise((resolve) => setTimeout(resolve, 50));
+
+    expect(flushedBatches.length).toBe(1);
+    expect(flushedBatches[0]).toHaveLength(3);
+
+    scheduler.shutdown();
+  });
+
+  it("should respect shouldReplace returning false", async () => {
+    const flushedBatches: TestItem[][] = [];
+
+    const scheduler = new ConcurrentFlushScheduler<TestItem>({
+      batchSize: 100,
+      flushInterval: 50,
+      maxConcurrency: 1,
+      callback: async (_flushId, batch) => {
+        flushedBatches.push([...batch]);
+      },
+      getKey: (item) => `${item.event}_${item.id}`,
+      // Never replace - first item wins
+      shouldReplace: () => false,
+    });
+
+    scheduler.start();
+
+    scheduler.addToBatch([{ id: "run_1", event: "insert", version: 10 }]);
+
+    scheduler.addToBatch([{ id: "run_1", event: "insert", version: 999 }]);
+
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    scheduler.shutdown();
+
+    const allFlushed = flushedBatches.flat();
+    const insertRun1 = allFlushed.find((i) => i.id === "run_1" && i.event === "insert");
+    expect(insertRun1?.version).toBe(10); // First one wins
+  });
+});
diff --git a/apps/webapp/test/engine/streamBatchItems.test.ts b/apps/webapp/test/engine/streamBatchItems.test.ts
new file mode 100644
index 00000000000..9e3b3aafe8b
--- /dev/null
+++ b/apps/webapp/test/engine/streamBatchItems.test.ts
@@ -0,0 +1,849 @@
+import { describe, expect, it, vi } from "vitest";
+
+// Mock the db prisma client - needs to be before other imports
+vi.mock("~/db.server", () => ({
+  prisma: {},
+  $replica: {},
+}));
+
+vi.mock("~/services/platform.v3.server", async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>;
+  return {
+    ...actual,
+    getEntitlement: vi.fn(),
+  };
+});
+
+import { RunEngine } from "@internal/run-engine";
+import { setupAuthenticatedEnvironment } from "@internal/run-engine/tests";
+import { containerTest } from "@internal/testcontainers";
+import { trace } from "@opentelemetry/api";
+import { PrismaClient } from "@trigger.dev/database";
+import { BatchId } from "@trigger.dev/core/v3/isomorphic";
+import {
+  StreamBatchItemsService,
+  createNdjsonParserStream,
+  streamToAsyncIterable,
+} from "../../app/runEngine/services/streamBatchItems.server";
+import { ServiceValidationError } from "../../app/v3/services/baseService.server";
+
+vi.setConfig({ testTimeout: 30_000 }); // 30 seconds timeout
+
+describe("StreamBatchItemsService", () => {
+  /**
+   * Helper to create a batch directly in the database
+   */
+  async function createBatch(
+    prisma: PrismaClient,
+    environmentId: string,
+    options: {
+      runCount: number;
+      status?: "PENDING" | "PROCESSING" | "COMPLETED" | "ABORTED";
+      sealed?: boolean;
+    }
+  ) {
+    const { id, friendlyId } = BatchId.generate();
+
+    const batch = await prisma.batchTaskRun.create({
+      data: {
+        id,
+        friendlyId,
+        runtimeEnvironmentId: environmentId,
+        status: options.status ?? "PENDING",
+        runCount: options.runCount,
+        expectedCount: options.runCount,
+        runIds: [],
+        batchVersion: "runengine:v2",
+        sealed: options.sealed ?? false,
+      },
+    });
+
+    return batch;
+  }
+
+  /**
+   * Helper to create an async iterable from items
+   */
+  async function* itemsToAsyncIterable(
+    items: Array<{ task: string; payload: string; index: number }>
+  ) {
+    for (const item of items) {
+      yield item;
+    }
+  }
+
+  containerTest(
+    "should seal batch successfully when no race condition",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+          disabled: true,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        batchQueue: {
+          redis: redisOptions,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Create a batch
+      const batch = await createBatch(prisma, authenticatedEnvironment.id, {
+        runCount: 2,
+        status: "PENDING",
+        sealed: false,
+      });
+
+      // Initialize the batch in Redis
+      await engine.initializeBatch({
+        batchId: batch.id,
+        friendlyId: batch.friendlyId,
+        environmentId: authenticatedEnvironment.id,
+        environmentType: authenticatedEnvironment.type,
+        organizationId: authenticatedEnvironment.organizationId,
+        projectId: authenticatedEnvironment.projectId,
+        runCount: 2,
+        processingConcurrency: 10,
+      });
+
+      // Enqueue items directly to Redis (bypassing the service's item processing)
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 0, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item1" }),
+        payloadType: "application/json",
+      });
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 1, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item2" }),
+        payloadType: "application/json",
+      });
+
+      // Create service with our test engine and prisma
+      const service = new StreamBatchItemsService({
+        prisma,
+        engine,
+      });
+
+      // Create an empty items iterator since items are already enqueued
+      const items = itemsToAsyncIterable([]);
+
+      const result = await service.call(authenticatedEnvironment, batch.friendlyId, items, {
+        maxItemBytes: 1024 * 1024,
+      });
+
+      expect(result.sealed).toBe(true);
+      expect(result.id).toBe(batch.friendlyId);
+
+      // Verify the batch is sealed in the database
+      const updatedBatch = await prisma.batchTaskRun.findUnique({
+        where: { id: batch.id },
+      });
+
+      expect(updatedBatch?.sealed).toBe(true);
+      expect(updatedBatch?.status).toBe("PROCESSING");
+      expect(updatedBatch?.sealedAt).toBeDefined();
+      expect(updatedBatch?.processingStartedAt).toBeDefined();
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should handle race condition when batch already sealed by another request",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+          disabled: true,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        batchQueue: {
+          redis: redisOptions,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Create a batch that is already sealed and PROCESSING (simulating another request won the race)
+      const batch = await createBatch(prisma, authenticatedEnvironment.id, {
+        runCount: 2,
+        status: "PROCESSING",
+        sealed: true,
+      });
+
+      // Initialize the batch in Redis with full count
+      await engine.initializeBatch({
+        batchId: batch.id,
+        friendlyId: batch.friendlyId,
+        environmentId: authenticatedEnvironment.id,
+        environmentType: authenticatedEnvironment.type,
+        organizationId: authenticatedEnvironment.organizationId,
+        projectId: authenticatedEnvironment.projectId,
+        runCount: 2,
+        processingConcurrency: 10,
+      });
+
+      // Enqueue items directly
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 0, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item1" }),
+        payloadType: "application/json",
+      });
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 1, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item2" }),
+        payloadType: "application/json",
+      });
+
+      const service = new StreamBatchItemsService({
+        prisma,
+        engine,
+      });
+
+      // This should fail because the batch is already sealed
+      await expect(
+        service.call(authenticatedEnvironment, batch.friendlyId, itemsToAsyncIterable([]), {
+          maxItemBytes: 1024 * 1024,
+        })
+      ).rejects.toThrow(ServiceValidationError);
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should return sealed=true when concurrent request already sealed the batch during seal attempt",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+          disabled: true,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        batchQueue: {
+          redis: redisOptions,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Create a batch in PENDING state
+      const batch = await createBatch(prisma, authenticatedEnvironment.id, {
+        runCount: 2,
+        status: "PENDING",
+        sealed: false,
+      });
+
+      // Initialize the batch in Redis
+      await engine.initializeBatch({
+        batchId: batch.id,
+        friendlyId: batch.friendlyId,
+        environmentId: authenticatedEnvironment.id,
+        environmentType: authenticatedEnvironment.type,
+        organizationId: authenticatedEnvironment.organizationId,
+        projectId: authenticatedEnvironment.projectId,
+        runCount: 2,
+        processingConcurrency: 10,
+      });
+
+      // Enqueue items
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 0, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item1" }),
+        payloadType: "application/json",
+      });
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 1, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item2" }),
+        payloadType: "application/json",
+      });
+
+      // Create a custom prisma client that simulates a race condition:
+      // When updateMany is called on batchTaskRun, it returns count: 0 (as if another request beat us)
+      // but the subsequent findUnique shows the batch is sealed and PROCESSING
+      const racingPrisma = {
+        ...prisma,
+        batchTaskRun: {
+          ...prisma.batchTaskRun,
+          findFirst: prisma.batchTaskRun.findFirst.bind(prisma.batchTaskRun),
+          updateMany: async () => {
+            // Simulate another request winning the race - seal the batch first
+            await prisma.batchTaskRun.update({
+              where: { id: batch.id },
+              data: {
+                sealed: true,
+                sealedAt: new Date(),
+                status: "PROCESSING",
+                processingStartedAt: new Date(),
+              },
+            });
+            // Return 0 as if the conditional update failed
+            return { count: 0 };
+          },
+          findUnique: prisma.batchTaskRun.findUnique.bind(prisma.batchTaskRun),
+        },
+      } as unknown as PrismaClient;
+
+      const service = new StreamBatchItemsService({
+        prisma: racingPrisma,
+        engine,
+      });
+
+      // Call the service - it should detect the race and return success since batch is sealed
+      const result = await service.call(
+        authenticatedEnvironment,
+        batch.friendlyId,
+        itemsToAsyncIterable([]),
+        {
+          maxItemBytes: 1024 * 1024,
+        }
+      );
+
+      // Should return sealed=true because the batch was sealed (by the "other" request)
+      expect(result.sealed).toBe(true);
+      expect(result.id).toBe(batch.friendlyId);
+
+      // Verify the batch is sealed in the database
+      const updatedBatch = await prisma.batchTaskRun.findUnique({
+        where: { id: batch.id },
+      });
+
+      expect(updatedBatch?.sealed).toBe(true);
+      expect(updatedBatch?.status).toBe("PROCESSING");
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should throw error when race condition leaves batch in unexpected state",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+          disabled: true,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        batchQueue: {
+          redis: redisOptions,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Create a batch in PENDING state
+      const batch = await createBatch(prisma, authenticatedEnvironment.id, {
+        runCount: 2,
+        status: "PENDING",
+        sealed: false,
+      });
+
+      // Initialize the batch in Redis
+      await engine.initializeBatch({
+        batchId: batch.id,
+        friendlyId: batch.friendlyId,
+        environmentId: authenticatedEnvironment.id,
+        environmentType: authenticatedEnvironment.type,
+        organizationId: authenticatedEnvironment.organizationId,
+        projectId: authenticatedEnvironment.projectId,
+        runCount: 2,
+        processingConcurrency: 10,
+      });
+
+      // Enqueue items
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 0, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item1" }),
+        payloadType: "application/json",
+      });
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 1, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item2" }),
+        payloadType: "application/json",
+      });
+
+      // Create a custom prisma client that simulates a race condition where
+      // the batch ends up in an unexpected state (ABORTED instead of PROCESSING)
+      const racingPrisma = {
+        ...prisma,
+        batchTaskRun: {
+          ...prisma.batchTaskRun,
+          findFirst: prisma.batchTaskRun.findFirst.bind(prisma.batchTaskRun),
+          updateMany: async () => {
+            // Simulate the batch being aborted by another process
+            await prisma.batchTaskRun.update({
+              where: { id: batch.id },
+              data: {
+                sealed: true,
+                status: "ABORTED",
+              },
+            });
+            // Return 0 as if the conditional update failed
+            return { count: 0 };
+          },
+          findUnique: prisma.batchTaskRun.findUnique.bind(prisma.batchTaskRun),
+        },
+      } as unknown as PrismaClient;
+
+      const service = new StreamBatchItemsService({
+        prisma: racingPrisma,
+        engine,
+      });
+
+      // Call the service - it should throw because the batch is in an unexpected state
+      await expect(
+        service.call(authenticatedEnvironment, batch.friendlyId, itemsToAsyncIterable([]), {
+          maxItemBytes: 1024 * 1024,
+        })
+      ).rejects.toThrow(/unexpected state/);
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should return sealed=false when item count does not match",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+          disabled: true,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        batchQueue: {
+          redis: redisOptions,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Create a batch expecting 3 items
+      const batch = await createBatch(prisma, authenticatedEnvironment.id, {
+        runCount: 3,
+        status: "PENDING",
+        sealed: false,
+      });
+
+      // Initialize the batch in Redis
+      await engine.initializeBatch({
+        batchId: batch.id,
+        friendlyId: batch.friendlyId,
+        environmentId: authenticatedEnvironment.id,
+        environmentType: authenticatedEnvironment.type,
+        organizationId: authenticatedEnvironment.organizationId,
+        projectId: authenticatedEnvironment.projectId,
+        runCount: 3,
+        processingConcurrency: 10,
+      });
+
+      // Only enqueue 2 items (1 short of expected)
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 0, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item1" }),
+        payloadType: "application/json",
+      });
+      await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, 1, {
+        task: "test-task",
+        payload: JSON.stringify({ data: "item2" }),
+        payloadType: "application/json",
+      });
+
+      const service = new StreamBatchItemsService({
+        prisma,
+        engine,
+      });
+
+      const result = await service.call(
+        authenticatedEnvironment,
+        batch.friendlyId,
+        itemsToAsyncIterable([]),
+        {
+          maxItemBytes: 1024 * 1024,
+        }
+      );
+
+      // Should return sealed=false because item count doesn't match
+      expect(result.sealed).toBe(false);
+      expect(result.enqueuedCount).toBe(2);
+      expect(result.expectedCount).toBe(3);
+
+      // Verify the batch is NOT sealed in the database
+      const updatedBatch = await prisma.batchTaskRun.findUnique({
+        where: { id: batch.id },
+      });
+
+      expect(updatedBatch?.sealed).toBe(false);
+      expect(updatedBatch?.status).toBe("PENDING");
+
+      await engine.quit();
+    }
+  );
+});
+
+describe("createNdjsonParserStream", () => {
+  /**
+   * Helper to collect all items from a ReadableStream
+   */
+  async function collectStream<T>(stream: ReadableStream<T>): Promise<T[]> {
+    const results: T[] = [];
+    for await (const item of streamToAsyncIterable(stream)) {
+      results.push(item);
+    }
+    return results;
+  }
+
+  /**
+   * Helper to create a ReadableStream from an array of Uint8Array chunks
+   */
+  function chunksToStream(chunks: Uint8Array[]): ReadableStream<Uint8Array> {
+    let index = 0;
+    return new ReadableStream({
+      pull(controller) {
+        if (index < chunks.length) {
+          controller.enqueue(chunks[index++]);
+        } else {
+          controller.close();
+        }
+      },
+    });
+  }
+
+  it("should parse basic NDJSON correctly", async () => {
+    const ndjson = '{"name":"alice"}\n{"name":"bob"}\n{"name":"charlie"}\n';
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(ndjson)]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ name: "alice" }, { name: "bob" }, { name: "charlie" }]);
+  });
+
+  it("should handle NDJSON without trailing newline", async () => {
+    const ndjson = '{"id":1}\n{"id":2}';
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(ndjson)]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ id: 1 }, { id: 2 }]);
+  });
+
+  it("should skip empty lines", async () => {
+    const ndjson = '{"a":1}\n\n{"b":2}\n   \n{"c":3}\n';
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(ndjson)]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ a: 1 }, { b: 2 }, { c: 3 }]);
+  });
+
+  it("should handle chunks split mid-line", async () => {
+    // Split '{"split":"value"}\n' across multiple chunks
+    const encoder = new TextEncoder();
+    const chunks = [encoder.encode('{"spl'), encoder.encode('it":"va'), encoder.encode('lue"}\n')];
+    const stream = chunksToStream(chunks);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ split: "value" }]);
+  });
+
+  it("should handle multibyte UTF-8 characters split across chunks", async () => {
+    // Test with emoji and other multibyte characters
+    // The emoji "😀" is 4 bytes: 0xF0 0x9F 0x98 0x80
+    const json = '{"emoji":"😀"}\n';
+    const fullBytes = new TextEncoder().encode(json);
+
+    // Split in the middle of the emoji (between byte 2 and 3 of the 4-byte sequence)
+    // Find where the emoji starts
+    const emojiStart = fullBytes.indexOf(0xf0);
+    expect(emojiStart).toBeGreaterThan(0);
+
+    // Split after first 2 bytes of the emoji
+    const chunk1 = fullBytes.slice(0, emojiStart + 2);
+    const chunk2 = fullBytes.slice(emojiStart + 2);
+
+    const stream = chunksToStream([chunk1, chunk2]);
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ emoji: "😀" }]);
+  });
+
+  it("should handle multiple multibyte characters across chunks", async () => {
+    // Japanese text: "こんにちは" (each hiragana is 3 bytes in UTF-8)
+    const json = '{"greeting":"こんにちは"}\n';
+    const fullBytes = new TextEncoder().encode(json);
+
+    // Split into many small chunks to stress test UTF-8 handling
+    const chunkSize = 3; // Deliberately misaligned with UTF-8 boundaries
+    const chunks: Uint8Array[] = [];
+    for (let i = 0; i < fullBytes.length; i += chunkSize) {
+      chunks.push(fullBytes.slice(i, i + chunkSize));
+    }
+
+    const stream = chunksToStream(chunks);
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ greeting: "こんにちは" }]);
+  });
+
+  it("should reject lines exceeding maxItemBytes", async () => {
+    const maxBytes = 50;
+    // Create a line that exceeds the limit
+    const largeJson = JSON.stringify({ data: "x".repeat(100) }) + "\n";
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(largeJson)]);
+
+    const parser = createNdjsonParserStream(maxBytes);
+
+    await expect(collectStream(stream.pipeThrough(parser))).rejects.toThrow(/exceeds maximum size/);
+  });
+
+  it("should reject unbounded accumulation without newlines", async () => {
+    const maxBytes = 50;
+    // Send data without any newlines that exceeds the buffer limit
+    const encoder = new TextEncoder();
+    const chunks = [
+      encoder.encode('{"start":"'),
+      encoder.encode("x".repeat(60)), // This will push buffer over 50 bytes
+    ];
+    const stream = chunksToStream(chunks);
+
+    const parser = createNdjsonParserStream(maxBytes);
+
+    await expect(collectStream(stream.pipeThrough(parser))).rejects.toThrow(
+      /exceeds maximum size.*no newline found/
+    );
+  });
+
+  it("should check byte size before decoding to prevent OOM", async () => {
+    // This test verifies that size is checked on raw bytes, not decoded string length
+    // Unicode characters like "🎉" are 4 bytes but 2 UTF-16 code units (string length 2)
+    const maxBytes = 30;
+
+    // Create a line with emojis - each emoji is 4 bytes
+    // {"e":"🎉🎉🎉🎉🎉"} = 5 + 20 (5 emojis * 4 bytes) + 2 = 27 bytes - should pass
+    const smallJson = '{"e":"🎉🎉🎉🎉🎉"}\n';
+    const smallBytes = new TextEncoder().encode(smallJson);
+    expect(smallBytes.length).toBeLessThan(maxBytes);
+
+    // {"e":"🎉🎉🎉🎉🎉🎉🎉"} = 7 emojis * 4 bytes + overhead = 35 bytes - should fail
+    const largeJson = '{"e":"🎉🎉🎉🎉🎉🎉🎉"}\n';
+    const largeBytes = new TextEncoder().encode(largeJson);
+    expect(largeBytes.length).toBeGreaterThan(maxBytes);
+
+    // Small one should succeed
+    const stream1 = chunksToStream([smallBytes]);
+    const parser1 = createNdjsonParserStream(maxBytes);
+    const results1 = await collectStream(stream1.pipeThrough(parser1));
+    expect(results1).toHaveLength(1);
+
+    // Large one should fail
+    const stream2 = chunksToStream([largeBytes]);
+    const parser2 = createNdjsonParserStream(maxBytes);
+    await expect(collectStream(stream2.pipeThrough(parser2))).rejects.toThrow(/exceeds maximum/);
+  });
+
+  it("should handle final line in flush without trailing newline", async () => {
+    const ndjson = '{"first":1}\n{"second":2}'; // No trailing newline
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(ndjson)]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ first: 1 }, { second: 2 }]);
+  });
+
+  it("should reject invalid JSON", async () => {
+    const ndjson = '{"valid":true}\n{invalid json}\n';
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(ndjson)]);
+
+    const parser = createNdjsonParserStream(1024);
+
+    await expect(collectStream(stream.pipeThrough(parser))).rejects.toThrow(
+      /Invalid JSON at line 2/
+    );
+  });
+
+  it("should reject invalid UTF-8 sequences", async () => {
+    // Invalid UTF-8: 0xFF is never valid in UTF-8
+    const invalidBytes = new Uint8Array([
+      0x7b,
+      0x22,
+      0x78,
+      0x22,
+      0x3a,
+      0xff,
+      0x7d,
+      0x0a, // {"x":�}\n with invalid byte
+    ]);
+    const stream = chunksToStream([invalidBytes]);
+
+    const parser = createNdjsonParserStream(1024);
+
+    await expect(collectStream(stream.pipeThrough(parser))).rejects.toThrow(/Invalid UTF-8/);
+  });
+
+  it("should handle many small chunks efficiently", async () => {
+    // Simulate streaming byte-by-byte
+    const json = '{"test":"value"}\n';
+    const bytes = new TextEncoder().encode(json);
+    const chunks = Array.from(bytes).map((b) => new Uint8Array([b]));
+
+    const stream = chunksToStream(chunks);
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ test: "value" }]);
+  });
+
+  it("should handle multiple lines per chunk", async () => {
+    const ndjson = '{"a":1}\n{"b":2}\n{"c":3}\n{"d":4}\n{"e":5}\n';
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode(ndjson)]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([{ a: 1 }, { b: 2 }, { c: 3 }, { d: 4 }, { e: 5 }]);
+  });
+
+  it("should handle empty stream", async () => {
+    const stream = chunksToStream([]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([]);
+  });
+
+  it("should handle stream with only whitespace", async () => {
+    const encoder = new TextEncoder();
+    const stream = chunksToStream([encoder.encode("   \n\n   \n")]);
+
+    const parser = createNdjsonParserStream(1024);
+    const results = await collectStream(stream.pipeThrough(parser));
+
+    expect(results).toEqual([]);
+  });
+});
diff --git a/apps/webapp/test/engine/triggerTask.test.ts b/apps/webapp/test/engine/triggerTask.test.ts
index ad16be44e71..0306c6f235a 100644
--- a/apps/webapp/test/engine/triggerTask.test.ts
+++ b/apps/webapp/test/engine/triggerTask.test.ts
@@ -16,7 +16,7 @@ vi.mock("~/services/platform.v3.server", async (importOriginal) => {
 
 import { RunEngine } from "@internal/run-engine";
 import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "@internal/run-engine/tests";
-import { containerTest } from "@internal/testcontainers";
+import { assertNonNullable, containerTest } from "@internal/testcontainers";
 import { trace } from "@opentelemetry/api";
 import { IOPacket } from "@trigger.dev/core/v3";
 import { TaskRun } from "@trigger.dev/database";
@@ -27,27 +27,21 @@ import {
   MaxAttemptsValidationParams,
   ParentRunValidationParams,
   PayloadProcessor,
-  RunNumberIncrementer,
   TagValidationParams,
   TracedEventSpan,
   TraceEventConcern,
+  TriggerRacepoints,
+  TriggerRacepointSystem,
   TriggerTaskRequest,
   TriggerTaskValidator,
   ValidationResult,
 } from "~/runEngine/types";
 import { RunEngineTriggerTaskService } from "../../app/runEngine/services/triggerTask.server";
+import { promiseWithResolvers } from "@trigger.dev/core";
+import { setTimeout } from "node:timers/promises";
 
 vi.setConfig({ testTimeout: 30_000 }); // 30 seconds timeout
 
-class MockRunNumberIncrementer implements RunNumberIncrementer {
-  async incrementRunNumber<T>(
-    request: TriggerTaskRequest,
-    callback: (num: number) => Promise<T>
-  ): Promise<T | undefined> {
-    return await callback(1);
-  }
-}
-
 class MockPayloadProcessor implements PayloadProcessor {
   async process(request: TriggerTaskRequest): Promise<IOPacket> {
     return {
@@ -75,36 +69,94 @@ class MockTriggerTaskValidator implements TriggerTaskValidator {
 class MockTraceEventConcern implements TraceEventConcern {
   async traceRun<T>(
     request: TriggerTaskRequest,
-    callback: (span: TracedEventSpan) => Promise<T>
+    parentStore: string | undefined,
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
   ): Promise<T> {
-    return await callback({
-      traceId: "test",
-      spanId: "test",
-      traceContext: {},
-      traceparent: undefined,
-      setAttribute: () => {},
-      failWithError: () => {},
-    });
+    return await callback(
+      {
+        traceId: "test",
+        spanId: "test",
+        traceContext: {},
+        traceparent: undefined,
+        setAttribute: () => {},
+        failWithError: () => {},
+        stop: () => {},
+      },
+      "test"
+    );
   }
 
   async traceIdempotentRun<T>(
     request: TriggerTaskRequest,
+    parentStore: string | undefined,
     options: {
       existingRun: TaskRun;
       idempotencyKey: string;
       incomplete: boolean;
       isError: boolean;
     },
-    callback: (span: TracedEventSpan) => Promise<T>
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
   ): Promise<T> {
-    return await callback({
-      traceId: "test",
-      spanId: "test",
-      traceContext: {},
-      traceparent: undefined,
-      setAttribute: () => {},
-      failWithError: () => {},
-    });
+    return await callback(
+      {
+        traceId: "test",
+        spanId: "test",
+        traceContext: {},
+        traceparent: undefined,
+        setAttribute: () => {},
+        failWithError: () => {},
+        stop: () => {},
+      },
+      "test"
+    );
+  }
+
+  async traceDebouncedRun<T>(
+    request: TriggerTaskRequest,
+    parentStore: string | undefined,
+    options: {
+      existingRun: TaskRun;
+      debounceKey: string;
+      incomplete: boolean;
+      isError: boolean;
+    },
+    callback: (span: TracedEventSpan, store: string) => Promise<T>
+  ): Promise<T> {
+    return await callback(
+      {
+        traceId: "test",
+        spanId: "test",
+        traceContext: {},
+        traceparent: undefined,
+        setAttribute: () => {},
+        failWithError: () => {},
+        stop: () => {},
+      },
+      "test"
+    );
+  }
+}
+
+type TriggerRacepoint = { promise: Promise<void>; resolve: (value: void) => void };
+
+class MockTriggerRacepointSystem implements TriggerRacepointSystem {
+  private racepoints: Record<string, TriggerRacepoint | undefined> = {};
+
+  async waitForRacepoint({ id }: { racepoint: TriggerRacepoints; id: string }): Promise<void> {
+    const racepoint = this.racepoints[id];
+
+    if (racepoint) {
+      return racepoint.promise;
+    }
+
+    return Promise.resolve();
+  }
+
+  registerRacepoint(racepoint: TriggerRacepoints, id: string): TriggerRacepoint {
+    const { promise, resolve } = promiseWithResolvers<void>();
+    this.racepoints[id] = { promise, resolve };
+
+    return { promise, resolve };
   }
 }
 
@@ -157,7 +209,6 @@ describe("RunEngineTriggerTaskService", () => {
     const triggerTaskService = new RunEngineTriggerTaskService({
       engine,
       prisma,
-      runNumberIncrementer: new MockRunNumberIncrementer(),
       payloadProcessor: new MockPayloadProcessor(),
       queueConcern: queuesManager,
       idempotencyKeyConcern,
@@ -248,7 +299,6 @@ describe("RunEngineTriggerTaskService", () => {
     const triggerTaskService = new RunEngineTriggerTaskService({
       engine,
       prisma,
-      runNumberIncrementer: new MockRunNumberIncrementer(),
       payloadProcessor: new MockPayloadProcessor(),
       queueConcern: queuesManager,
       idempotencyKeyConcern,
@@ -312,6 +362,227 @@ describe("RunEngineTriggerTaskService", () => {
     await engine.quit();
   });
 
+  containerTest(
+    "should handle idempotency keys when the engine throws an RunDuplicateIdempotencyKeyError",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+        logLevel: "debug",
+      });
+
+      const parentTask = "parent-task";
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const taskIdentifier = "test-task";
+
+      //create background worker
+      await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, taskIdentifier]);
+
+      const parentRun1 = await engine.trigger(
+        {
+          number: 1,
+          friendlyId: "run_p1",
+          environment: authenticatedEnvironment,
+          taskIdentifier: parentTask,
+          payload: "{}",
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t12345",
+          spanId: "s12345",
+          queue: `task/${parentTask}`,
+          isTest: false,
+          tags: [],
+          workerQueue: "main",
+        },
+        prisma
+      );
+
+      //dequeue parent and create the attempt
+      await setTimeout(500);
+      const dequeued = await engine.dequeueFromWorkerQueue({
+        consumerId: "test_12345",
+        workerQueue: "main",
+      });
+      await engine.startRunAttempt({
+        runId: parentRun1.id,
+        snapshotId: dequeued[0].snapshot.id,
+      });
+
+      const parentRun2 = await engine.trigger(
+        {
+          number: 2,
+          friendlyId: "run_p2",
+          environment: authenticatedEnvironment,
+          taskIdentifier: parentTask,
+          payload: "{}",
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t12346",
+          spanId: "s12346",
+          queue: `task/${parentTask}`,
+          isTest: false,
+          tags: [],
+          workerQueue: "main",
+        },
+        prisma
+      );
+
+      await setTimeout(500);
+      const dequeued2 = await engine.dequeueFromWorkerQueue({
+        consumerId: "test_12345",
+        workerQueue: "main",
+      });
+      await engine.startRunAttempt({
+        runId: parentRun2.id,
+        snapshotId: dequeued2[0].snapshot.id,
+      });
+
+      const queuesManager = new DefaultQueueManager(prisma, engine);
+
+      const idempotencyKeyConcern = new IdempotencyKeyConcern(
+        prisma,
+        engine,
+        new MockTraceEventConcern()
+      );
+
+      const triggerRacepointSystem = new MockTriggerRacepointSystem();
+
+      const triggerTaskService = new RunEngineTriggerTaskService({
+        engine,
+        prisma,
+        payloadProcessor: new MockPayloadProcessor(),
+        queueConcern: queuesManager,
+        idempotencyKeyConcern,
+        validator: new MockTriggerTaskValidator(),
+        traceEventConcern: new MockTraceEventConcern(),
+        tracer: trace.getTracer("test", "0.0.0"),
+        metadataMaximumSize: 1024 * 1024 * 1, // 1MB
+        triggerRacepointSystem,
+      });
+
+      const idempotencyKey = "test-idempotency-key";
+
+      const racepoint = triggerRacepointSystem.registerRacepoint("idempotencyKey", idempotencyKey);
+
+      const childTriggerPromise1 = triggerTaskService.call({
+        taskId: taskIdentifier,
+        environment: authenticatedEnvironment,
+        body: {
+          payload: { test: "test" },
+          options: {
+            idempotencyKey,
+            parentRunId: parentRun1.friendlyId,
+            resumeParentOnCompletion: true,
+          },
+        },
+      });
+
+      const childTriggerPromise2 = triggerTaskService.call({
+        taskId: taskIdentifier,
+        environment: authenticatedEnvironment,
+        body: {
+          payload: { test: "test" },
+          options: {
+            idempotencyKey,
+            parentRunId: parentRun2.friendlyId,
+            resumeParentOnCompletion: true,
+          },
+        },
+      });
+
+      await setTimeout(500);
+
+      // Now we can resolve the racepoint
+      racepoint.resolve();
+
+      const result = await childTriggerPromise1;
+      const result2 = await childTriggerPromise2;
+
+      expect(result).toBeDefined();
+      expect(result?.run.friendlyId).toBeDefined();
+      expect(result?.run.status).toBe("PENDING");
+
+      const run = await prisma.taskRun.findUnique({
+        where: {
+          id: result?.run.id,
+        },
+      });
+
+      expect(run).toBeDefined();
+      expect(run?.friendlyId).toBe(result?.run.friendlyId);
+      expect(run?.engine).toBe("V2");
+      expect(run?.queuedAt).toBeDefined();
+      expect(run?.queue).toBe(`task/${taskIdentifier}`);
+
+      expect(result2).toBeDefined();
+      expect(result2?.run.friendlyId).toBe(result?.run.friendlyId);
+
+      const parent1ExecutionData = await engine.getRunExecutionData({ runId: parentRun1.id });
+      assertNonNullable(parent1ExecutionData);
+      expect(parent1ExecutionData.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+      const parent2ExecutionData = await engine.getRunExecutionData({ runId: parentRun2.id });
+      assertNonNullable(parent2ExecutionData);
+      expect(parent2ExecutionData.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+      const parent1RunWaitpoint = await prisma.taskRunWaitpoint.findFirst({
+        where: {
+          taskRunId: parentRun1.id,
+        },
+        include: {
+          waitpoint: true,
+        },
+      });
+
+      assertNonNullable(parent1RunWaitpoint);
+      expect(parent1RunWaitpoint.waitpoint.type).toBe("RUN");
+      expect(parent1RunWaitpoint.waitpoint.completedByTaskRunId).toBe(result?.run.id);
+
+      const parent2RunWaitpoint = await prisma.taskRunWaitpoint.findFirst({
+        where: {
+          taskRunId: parentRun2.id,
+        },
+        include: {
+          waitpoint: true,
+        },
+      });
+
+      assertNonNullable(parent2RunWaitpoint);
+      expect(parent2RunWaitpoint.waitpoint.type).toBe("RUN");
+      expect(parent2RunWaitpoint.waitpoint.completedByTaskRunId).toBe(result2?.run.id);
+
+      await engine.quit();
+    }
+  );
+
   containerTest(
     "should resolve queue names correctly when locked to version",
     async ({ prisma, redisOptions }) => {
@@ -390,7 +661,6 @@ describe("RunEngineTriggerTaskService", () => {
       const triggerTaskService = new RunEngineTriggerTaskService({
         engine,
         prisma,
-        runNumberIncrementer: new MockRunNumberIncrementer(),
         payloadProcessor: new MockPayloadProcessor(),
         queueConcern: queuesManager,
         idempotencyKeyConcern,
@@ -474,4 +744,432 @@ describe("RunEngineTriggerTaskService", () => {
       await engine.quit();
     }
   );
+
+  containerTest(
+    "should preserve runFriendlyId across retries when RunDuplicateIdempotencyKeyError is thrown",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+        logLevel: "debug",
+      });
+
+      const parentTask = "parent-task";
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+      const taskIdentifier = "test-task";
+
+      // Create background worker
+      await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, taskIdentifier]);
+
+      // Create parent runs and start their attempts (required for resumeParentOnCompletion)
+      const parentRun1 = await engine.trigger(
+        {
+          number: 1,
+          friendlyId: "run_p1",
+          environment: authenticatedEnvironment,
+          taskIdentifier: parentTask,
+          payload: "{}",
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t12345",
+          spanId: "s12345",
+          queue: `task/${parentTask}`,
+          isTest: false,
+          tags: [],
+          workerQueue: "main",
+        },
+        prisma
+      );
+
+      await setTimeout(500);
+      const dequeued = await engine.dequeueFromWorkerQueue({
+        consumerId: "test_12345",
+        workerQueue: "main",
+      });
+      await engine.startRunAttempt({
+        runId: parentRun1.id,
+        snapshotId: dequeued[0].snapshot.id,
+      });
+
+      const parentRun2 = await engine.trigger(
+        {
+          number: 2,
+          friendlyId: "run_p2",
+          environment: authenticatedEnvironment,
+          taskIdentifier: parentTask,
+          payload: "{}",
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t12346",
+          spanId: "s12346",
+          queue: `task/${parentTask}`,
+          isTest: false,
+          tags: [],
+          workerQueue: "main",
+        },
+        prisma
+      );
+
+      await setTimeout(500);
+      const dequeued2 = await engine.dequeueFromWorkerQueue({
+        consumerId: "test_12345",
+        workerQueue: "main",
+      });
+      await engine.startRunAttempt({
+        runId: parentRun2.id,
+        snapshotId: dequeued2[0].snapshot.id,
+      });
+
+      const queuesManager = new DefaultQueueManager(prisma, engine);
+      const idempotencyKeyConcern = new IdempotencyKeyConcern(
+        prisma,
+        engine,
+        new MockTraceEventConcern()
+      );
+
+      const triggerRacepointSystem = new MockTriggerRacepointSystem();
+
+      // Track all friendlyIds passed to the payload processor
+      const processedFriendlyIds: string[] = [];
+      class TrackingPayloadProcessor implements PayloadProcessor {
+        async process(request: TriggerTaskRequest): Promise<IOPacket> {
+          processedFriendlyIds.push(request.friendlyId);
+          return {
+            data: JSON.stringify(request.body.payload),
+            dataType: "application/json",
+          };
+        }
+      }
+
+      const triggerTaskService = new RunEngineTriggerTaskService({
+        engine,
+        prisma,
+        payloadProcessor: new TrackingPayloadProcessor(),
+        queueConcern: queuesManager,
+        idempotencyKeyConcern,
+        validator: new MockTriggerTaskValidator(),
+        traceEventConcern: new MockTraceEventConcern(),
+        tracer: trace.getTracer("test", "0.0.0"),
+        metadataMaximumSize: 1024 * 1024 * 1, // 1MB
+        triggerRacepointSystem,
+      });
+
+      const idempotencyKey = "test-preserve-friendly-id";
+      const racepoint = triggerRacepointSystem.registerRacepoint("idempotencyKey", idempotencyKey);
+
+      // Trigger two concurrent requests with same idempotency key
+      // One will succeed, one will fail with RunDuplicateIdempotencyKeyError and retry
+      const childTriggerPromise1 = triggerTaskService.call({
+        taskId: taskIdentifier,
+        environment: authenticatedEnvironment,
+        body: {
+          payload: { test: "test1" },
+          options: {
+            idempotencyKey,
+            parentRunId: parentRun1.friendlyId,
+            resumeParentOnCompletion: true,
+          },
+        },
+      });
+
+      const childTriggerPromise2 = triggerTaskService.call({
+        taskId: taskIdentifier,
+        environment: authenticatedEnvironment,
+        body: {
+          payload: { test: "test2" },
+          options: {
+            idempotencyKey,
+            parentRunId: parentRun2.friendlyId,
+            resumeParentOnCompletion: true,
+          },
+        },
+      });
+
+      await setTimeout(500);
+
+      // Resolve the racepoint to allow both requests to proceed
+      racepoint.resolve();
+
+      const result1 = await childTriggerPromise1;
+      const result2 = await childTriggerPromise2;
+
+      // Both should return the same run (one created, one cached)
+      expect(result1).toBeDefined();
+      expect(result2).toBeDefined();
+      expect(result1?.run.friendlyId).toBe(result2?.run.friendlyId);
+
+      // The key assertion: When a retry happens due to RunDuplicateIdempotencyKeyError,
+      // the same friendlyId should be used. We expect exactly 2 calls to payloadProcessor
+      // (one for each concurrent request), not 3 (which would indicate a new friendlyId on retry)
+      // Since the retry returns early from the idempotency cache, payloadProcessor is not called again.
+      expect(processedFriendlyIds.length).toBe(2);
+
+      // Verify that we have exactly 2 unique friendlyIds (one per original request)
+      const uniqueFriendlyIds = new Set(processedFriendlyIds);
+      expect(uniqueFriendlyIds.size).toBe(2);
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should reject invalid debounce.delay when no explicit delay is provided",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+      const taskIdentifier = "test-task";
+
+      await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+      const queuesManager = new DefaultQueueManager(prisma, engine);
+      const idempotencyKeyConcern = new IdempotencyKeyConcern(
+        prisma,
+        engine,
+        new MockTraceEventConcern()
+      );
+
+      const triggerTaskService = new RunEngineTriggerTaskService({
+        engine,
+        prisma,
+        payloadProcessor: new MockPayloadProcessor(),
+        queueConcern: queuesManager,
+        idempotencyKeyConcern,
+        validator: new MockTriggerTaskValidator(),
+        traceEventConcern: new MockTraceEventConcern(),
+        tracer: trace.getTracer("test", "0.0.0"),
+        metadataMaximumSize: 1024 * 1024 * 1,
+      });
+
+      // Invalid debounce.delay format (ms not supported)
+      await expect(
+        triggerTaskService.call({
+          taskId: taskIdentifier,
+          environment: authenticatedEnvironment,
+          body: {
+            payload: { test: "test" },
+            options: {
+              debounce: {
+                key: "test-key",
+                delay: "300ms", // Invalid - ms not supported
+              },
+            },
+          },
+        })
+      ).rejects.toThrow("Debounce requires a valid delay duration");
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should reject invalid debounce.delay even when explicit delay is valid",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+      const taskIdentifier = "test-task";
+
+      await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+      const queuesManager = new DefaultQueueManager(prisma, engine);
+      const idempotencyKeyConcern = new IdempotencyKeyConcern(
+        prisma,
+        engine,
+        new MockTraceEventConcern()
+      );
+
+      const triggerTaskService = new RunEngineTriggerTaskService({
+        engine,
+        prisma,
+        payloadProcessor: new MockPayloadProcessor(),
+        queueConcern: queuesManager,
+        idempotencyKeyConcern,
+        validator: new MockTriggerTaskValidator(),
+        traceEventConcern: new MockTraceEventConcern(),
+        tracer: trace.getTracer("test", "0.0.0"),
+        metadataMaximumSize: 1024 * 1024 * 1,
+      });
+
+      // Valid explicit delay but invalid debounce.delay
+      // This is the bug case: the explicit delay passes validation,
+      // but debounce.delay would fail later when rescheduling
+      await expect(
+        triggerTaskService.call({
+          taskId: taskIdentifier,
+          environment: authenticatedEnvironment,
+          body: {
+            payload: { test: "test" },
+            options: {
+              delay: "5m", // Valid explicit delay
+              debounce: {
+                key: "test-key",
+                delay: "invalid-delay", // Invalid debounce delay
+              },
+            },
+          },
+        })
+      ).rejects.toThrow("Invalid debounce delay");
+
+      await engine.quit();
+    }
+  );
+
+  containerTest(
+    "should accept valid debounce.delay formats",
+    async ({ prisma, redisOptions }) => {
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+      const taskIdentifier = "test-task";
+
+      await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+      const queuesManager = new DefaultQueueManager(prisma, engine);
+      const idempotencyKeyConcern = new IdempotencyKeyConcern(
+        prisma,
+        engine,
+        new MockTraceEventConcern()
+      );
+
+      const triggerTaskService = new RunEngineTriggerTaskService({
+        engine,
+        prisma,
+        payloadProcessor: new MockPayloadProcessor(),
+        queueConcern: queuesManager,
+        idempotencyKeyConcern,
+        validator: new MockTriggerTaskValidator(),
+        traceEventConcern: new MockTraceEventConcern(),
+        tracer: trace.getTracer("test", "0.0.0"),
+        metadataMaximumSize: 1024 * 1024 * 1,
+      });
+
+      // Valid debounce.delay format
+      const result = await triggerTaskService.call({
+        taskId: taskIdentifier,
+        environment: authenticatedEnvironment,
+        body: {
+          payload: { test: "test" },
+          options: {
+            debounce: {
+              key: "test-key",
+              delay: "5s", // Valid format
+            },
+          },
+        },
+      });
+
+      expect(result).toBeDefined();
+      expect(result?.run.friendlyId).toBeDefined();
+
+      await engine.quit();
+    }
+  );
 });
diff --git a/apps/webapp/test/environmentVariableRules.test.ts b/apps/webapp/test/environmentVariableRules.test.ts
index af27dd3c7cd..39e3d9892ea 100644
--- a/apps/webapp/test/environmentVariableRules.test.ts
+++ b/apps/webapp/test/environmentVariableRules.test.ts
@@ -15,33 +15,6 @@ describe("removeBlacklistedVariables", () => {
     expect(result).toEqual([{ key: "NORMAL_VAR", value: "normal" }]);
   });
 
-  it("should remove variables with blacklisted prefixes", () => {
-    const variables: EnvironmentVariable[] = [
-      { key: "OTEL_SERVICE_NAME", value: "my-service" },
-      { key: "OTEL_TRACE_SAMPLER", value: "always_on" },
-      { key: "NORMAL_VAR", value: "normal" },
-    ];
-
-    const result = removeBlacklistedVariables(variables);
-
-    expect(result).toEqual([{ key: "NORMAL_VAR", value: "normal" }]);
-  });
-
-  it("should keep whitelisted variables even if they match a blacklisted prefix", () => {
-    const variables: EnvironmentVariable[] = [
-      { key: "OTEL_LOG_LEVEL", value: "debug" },
-      { key: "OTEL_SERVICE_NAME", value: "my-service" },
-      { key: "NORMAL_VAR", value: "normal" },
-    ];
-
-    const result = removeBlacklistedVariables(variables);
-
-    expect(result).toEqual([
-      { key: "OTEL_LOG_LEVEL", value: "debug" },
-      { key: "NORMAL_VAR", value: "normal" },
-    ]);
-  });
-
   it("should handle empty input array", () => {
     const variables: EnvironmentVariable[] = [];
 
@@ -53,8 +26,6 @@ describe("removeBlacklistedVariables", () => {
   it("should handle mixed case variables", () => {
     const variables: EnvironmentVariable[] = [
       { key: "trigger_secret_key", value: "secret123" }, // Different case
-      { key: "OTEL_LOG_LEVEL", value: "debug" },
-      { key: "otel_service_name", value: "my-service" }, // Different case
       { key: "NORMAL_VAR", value: "normal" },
     ];
 
@@ -64,8 +35,6 @@ describe("removeBlacklistedVariables", () => {
     // Note: The function is case-sensitive, so different case variables should pass through
     expect(result).toEqual([
       { key: "trigger_secret_key", value: "secret123" },
-      { key: "OTEL_LOG_LEVEL", value: "debug" },
-      { key: "otel_service_name", value: "my-service" },
       { key: "NORMAL_VAR", value: "normal" },
     ]);
   });
@@ -73,17 +42,12 @@ describe("removeBlacklistedVariables", () => {
   it("should handle variables with empty values", () => {
     const variables: EnvironmentVariable[] = [
       { key: "TRIGGER_SECRET_KEY", value: "" },
-      { key: "OTEL_SERVICE_NAME", value: "" },
-      { key: "OTEL_LOG_LEVEL", value: "" },
       { key: "NORMAL_VAR", value: "" },
     ];
 
     const result = removeBlacklistedVariables(variables);
 
-    expect(result).toEqual([
-      { key: "OTEL_LOG_LEVEL", value: "" },
-      { key: "NORMAL_VAR", value: "" },
-    ]);
+    expect(result).toEqual([{ key: "NORMAL_VAR", value: "" }]);
   });
 
   it("should handle all types of rules in a single array", () => {
@@ -91,11 +55,6 @@ describe("removeBlacklistedVariables", () => {
       // Exact matches (should be removed)
       { key: "TRIGGER_SECRET_KEY", value: "secret123" },
       { key: "TRIGGER_API_URL", value: "https://api.example.com" },
-      // Prefix matches (should be removed)
-      { key: "OTEL_SERVICE_NAME", value: "my-service" },
-      { key: "OTEL_TRACE_SAMPLER", value: "always_on" },
-      // Whitelist exception (should be kept)
-      { key: "OTEL_LOG_LEVEL", value: "debug" },
       // Normal variables (should be kept)
       { key: "NORMAL_VAR", value: "normal" },
       { key: "DATABASE_URL", value: "postgres://..." },
@@ -104,7 +63,6 @@ describe("removeBlacklistedVariables", () => {
     const result = removeBlacklistedVariables(variables);
 
     expect(result).toEqual([
-      { key: "OTEL_LOG_LEVEL", value: "debug" },
       { key: "NORMAL_VAR", value: "normal" },
       { key: "DATABASE_URL", value: "postgres://..." },
     ]);
diff --git a/apps/webapp/test/fairDequeuingStrategy.test.ts b/apps/webapp/test/fairDequeuingStrategy.test.ts
index 3b4a6a375b6..0d8b708161a 100644
--- a/apps/webapp/test/fairDequeuingStrategy.test.ts
+++ b/apps/webapp/test/fairDequeuingStrategy.test.ts
@@ -270,8 +270,8 @@ describe("FairDequeuingStrategy", () => {
 
       console.log("Second distribution took", distribute2Duration, "ms");
 
-      // Make sure the second call is more than 2 times faster than the first
-      expect(distribute2Duration).toBeLessThan(withTolerance(distribute1Duration / 2));
+      // Make sure the second call is faster than the first
+      expect(distribute2Duration).toBeLessThan(distribute1Duration);
 
       const startDistribute3 = performance.now();
 
@@ -284,8 +284,8 @@ describe("FairDequeuingStrategy", () => {
 
       console.log("Third distribution took", distribute3Duration, "ms");
 
-      // Make sure the third call is more than 4 times the second
-      expect(withTolerance(distribute3Duration)).toBeGreaterThan(distribute2Duration * 4);
+      // Make sure the third call is faster than the second
+      expect(withTolerance(distribute3Duration)).toBeGreaterThan(distribute2Duration);
     }
   );
 
diff --git a/apps/webapp/test/getDeploymentImageRef.test.ts b/apps/webapp/test/getDeploymentImageRef.test.ts
index 01a04c53a0d..a05236596f2 100644
--- a/apps/webapp/test/getDeploymentImageRef.test.ts
+++ b/apps/webapp/test/getDeploymentImageRef.test.ts
@@ -8,7 +8,7 @@ import {
 } from "../app/v3/getDeploymentImageRef.server";
 import { DeleteRepositoryCommand } from "@aws-sdk/client-ecr";
 
-describe.skipIf(process.env.RUN_REGISTRY_TESTS !== "1")("getDeploymentImageRef", () => {
+describe("getDeploymentImageRef", () => {
   const testHost =
     process.env.DEPLOY_REGISTRY_HOST || "123456789012.dkr.ecr.us-east-1.amazonaws.com";
   const testNamespace = process.env.DEPLOY_REGISTRY_NAMESPACE || "test-namespace";
@@ -25,7 +25,7 @@ describe.skipIf(process.env.RUN_REGISTRY_TESTS !== "1")("getDeploymentImageRef",
 
   // Clean up test repository after tests
   afterAll(async () => {
-    if (process.env.KEEP_TEST_REPO === "1") {
+    if (process.env.KEEP_TEST_REPO === "1" || process.env.RUN_ECR_TESTS !== "1") {
       return;
     }
 
@@ -56,89 +56,150 @@ describe.skipIf(process.env.RUN_REGISTRY_TESTS !== "1")("getDeploymentImageRef",
 
   it("should return the correct image ref for non-ECR registry", async () => {
     const imageRef = await getDeploymentImageRef({
-      host: "registry.digitalocean.com",
-      namespace: testNamespace,
+      registry: {
+        host: "registry.example.com",
+        namespace: testNamespace,
+        username: "test-user",
+        password: "test-pass",
+        ecrTags: registryTags,
+        ecrAssumeRoleArn: roleArn,
+        ecrAssumeRoleExternalId: externalId,
+      },
       projectRef: testProjectRef,
       nextVersion: "20250630.1",
-      environmentSlug: "test",
-      registryTags,
-      assumeRole,
+      environmentType: "DEVELOPMENT",
+      deploymentShortCode: "test1234",
     });
 
+    // Check the image ref structure and that it contains expected parts
     expect(imageRef.imageRef).toBe(
-      `registry.digitalocean.com/${testNamespace}/${testProjectRef}:20250630.1.test`
+      `registry.example.com/${testNamespace}/${testProjectRef}:20250630.1.development.test1234`
     );
     expect(imageRef.isEcr).toBe(false);
   });
 
-  it("should create ECR repository and return correct image ref", async () => {
-    const imageRef1 = await getDeploymentImageRef({
-      host: testHost,
-      namespace: testNamespace,
-      projectRef: testProjectRef2,
-      nextVersion: "20250630.1",
-      environmentSlug: "test",
-      registryTags,
-      assumeRole,
-    });
+  it.skipIf(process.env.RUN_ECR_TESTS !== "1")(
+    "should create ECR repository and return correct image ref",
+    async () => {
+      const imageRef1 = await getDeploymentImageRef({
+        registry: {
+          host: testHost,
+          namespace: testNamespace,
+          username: "test-user",
+          password: "test-pass",
+          ecrTags: registryTags,
+          ecrAssumeRoleArn: roleArn,
+          ecrAssumeRoleExternalId: externalId,
+        },
+        projectRef: testProjectRef2,
+        nextVersion: "20250630.1",
+        environmentType: "DEVELOPMENT",
+        deploymentShortCode: "test1234",
+      });
 
-    expect(imageRef1.imageRef).toBe(
-      `${testHost}/${testNamespace}/${testProjectRef2}:20250630.1.test`
-    );
-    expect(imageRef1.isEcr).toBe(true);
-    expect(imageRef1.repoCreated).toBe(true);
+      expect(imageRef1.imageRef).toBe(
+        `${testHost}/${testNamespace}/${testProjectRef2}:20250630.1.development.test1234`
+      );
+      expect(imageRef1.isEcr).toBe(true);
+      expect(imageRef1.repoCreated).toBe(true);
 
-    const imageRef2 = await getDeploymentImageRef({
-      host: testHost,
-      namespace: testNamespace,
-      projectRef: testProjectRef2,
-      nextVersion: "20250630.2",
-      environmentSlug: "test",
-      registryTags,
-      assumeRole,
-    });
+      const imageRef2 = await getDeploymentImageRef({
+        registry: {
+          host: testHost,
+          namespace: testNamespace,
+          username: "test-user",
+          password: "test-pass",
+          ecrTags: registryTags,
+          ecrAssumeRoleArn: roleArn,
+          ecrAssumeRoleExternalId: externalId,
+        },
+        projectRef: testProjectRef2,
+        nextVersion: "20250630.2",
+        environmentType: "DEVELOPMENT",
+        deploymentShortCode: "test1234",
+      });
 
-    expect(imageRef2.imageRef).toBe(
-      `${testHost}/${testNamespace}/${testProjectRef2}:20250630.2.test`
-    );
-    expect(imageRef2.isEcr).toBe(true);
-    expect(imageRef2.repoCreated).toBe(false);
-  });
+      expect(imageRef2.imageRef).toBe(
+        `${testHost}/${testNamespace}/${testProjectRef2}:20250630.2.development.test1234`
+      );
+      expect(imageRef2.isEcr).toBe(true);
+      expect(imageRef2.repoCreated).toBe(false);
+    }
+  );
 
-  it("should reuse existing ECR repository", async () => {
+  it.skipIf(process.env.RUN_ECR_TESTS !== "1")("should reuse existing ECR repository", async () => {
     // This should use the repository created in the previous test
     const imageRef = await getDeploymentImageRef({
-      host: testHost,
-      namespace: testNamespace,
+      registry: {
+        host: testHost,
+        namespace: testNamespace,
+        username: "test-user",
+        password: "test-pass",
+        ecrTags: registryTags,
+        ecrAssumeRoleArn: roleArn,
+        ecrAssumeRoleExternalId: externalId,
+      },
       projectRef: testProjectRef,
       nextVersion: "20250630.2",
-      environmentSlug: "prod",
-      registryTags,
-      assumeRole,
+      environmentType: "PRODUCTION",
+      deploymentShortCode: "test1234",
     });
 
     expect(imageRef.imageRef).toBe(
-      `${testHost}/${testNamespace}/${testProjectRef}:20250630.2.prod`
+      `${testHost}/${testNamespace}/${testProjectRef}:20250630.2.production.test1234`
     );
     expect(imageRef.isEcr).toBe(true);
   });
 
-  it("should throw error for invalid ECR host", async () => {
-    await expect(
-      getDeploymentImageRef({
-        host: "invalid.ecr.amazonaws.com",
+  it("should generate unique image tags for different deployments with same environment type", async () => {
+    // Simulates the scenario where multiple deployments happen to the same environment type
+    const sameEnvironmentType = "PREVIEW";
+    const sameVersion = "20250630.1";
+
+    const firstImageRef = await getDeploymentImageRef({
+      registry: {
+        host: "registry.example.com",
         namespace: testNamespace,
-        projectRef: testProjectRef,
-        nextVersion: "20250630.1",
-        environmentSlug: "test",
-        registryTags,
-        assumeRole,
-      })
-    ).rejects.toThrow("Invalid ECR registry host: invalid.ecr.amazonaws.com");
+        username: "test-user",
+        password: "test-pass",
+        ecrTags: registryTags,
+        ecrAssumeRoleArn: roleArn,
+        ecrAssumeRoleExternalId: externalId,
+      },
+      projectRef: testProjectRef,
+      nextVersion: sameVersion,
+      environmentType: sameEnvironmentType,
+      deploymentShortCode: "test1234",
+    });
+
+    const secondImageRef = await getDeploymentImageRef({
+      registry: {
+        host: "registry.example.com",
+        namespace: testNamespace,
+        username: "test-user",
+        password: "test-pass",
+        ecrTags: registryTags,
+        ecrAssumeRoleArn: roleArn,
+        ecrAssumeRoleExternalId: externalId,
+      },
+      projectRef: testProjectRef,
+      nextVersion: sameVersion,
+      environmentType: sameEnvironmentType,
+      deploymentShortCode: "test4321",
+    });
+
+    // Even with the same environment type and version, the image refs should be different due to deployment short codes
+    expect(firstImageRef.imageRef).toBe(
+      `registry.example.com/${testNamespace}/${testProjectRef}:${sameVersion}.preview.test1234`
+    );
+    expect(secondImageRef.imageRef).toBe(
+      `registry.example.com/${testNamespace}/${testProjectRef}:${sameVersion}.preview.test4321`
+    );
+    expect(firstImageRef.imageRef).not.toBe(secondImageRef.imageRef);
   });
 });
 
-describe.skipIf(process.env.RUN_REGISTRY_AUTH_TESTS !== "1")("getEcrAuthToken", () => {
+describe.skipIf(process.env.RUN_ECR_TESTS !== "1")("getEcrAuthToken", () => {
   const testHost =
     process.env.DEPLOY_REGISTRY_HOST || "123456789012.dkr.ecr.us-east-1.amazonaws.com";
 
@@ -163,8 +224,7 @@ describe.skipIf(process.env.RUN_REGISTRY_AUTH_TESTS !== "1")("getEcrAuthToken",
     expect(auth.password.length).toBeGreaterThan(0);
 
     // Verify the token format (should be a base64-encoded string)
-    const base64Regex = /^[A-Za-z0-9+/=]+$/;
-    expect(base64Regex.test(auth.password)).toBe(true);
+    expect(auth.password).toMatch(/^[A-Za-z0-9+/=]+$/);
   });
 
   it("should throw error for invalid region", async () => {
diff --git a/apps/webapp/test/redisRealtimeStreams.test.ts b/apps/webapp/test/redisRealtimeStreams.test.ts
new file mode 100644
index 00000000000..05117543930
--- /dev/null
+++ b/apps/webapp/test/redisRealtimeStreams.test.ts
@@ -0,0 +1,1524 @@
+import { redisTest } from "@internal/testcontainers";
+import Redis from "ioredis";
+import { describe, expect } from "vitest";
+import { RedisRealtimeStreams } from "~/services/realtime/redisRealtimeStreams.server.js";
+
+describe("RedisRealtimeStreams", () => {
+  redisTest(
+    "Should ingest chunks with correct indices and retrieve last chunk index",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_test123";
+      const streamId = "test-stream";
+
+      // Create a mock stream with 5 chunks
+      const chunks = [
+        JSON.stringify({ chunk: 0, data: "chunk 0" }),
+        JSON.stringify({ chunk: 1, data: "chunk 1" }),
+        JSON.stringify({ chunk: 2, data: "chunk 2" }),
+        JSON.stringify({ chunk: 3, data: "chunk 3" }),
+        JSON.stringify({ chunk: 4, data: "chunk 4" }),
+      ];
+
+      // Create a ReadableStream from the chunks
+      const encoder = new TextEncoder();
+      const stream = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      // Ingest the data with default client ID
+      const response = await redisRealtimeStreams.ingestData(stream, runId, streamId, "default");
+
+      // Verify response
+      expect(response.status).toBe(200);
+
+      // Verify chunks were stored with correct indices
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      // Should have 5 chunks (no END_SENTINEL anymore)
+      expect(entries.length).toBe(5);
+
+      // Verify each chunk has the correct index
+      for (let i = 0; i < 5; i++) {
+        const [_id, fields] = entries[i];
+
+        // Find chunkIndex and data fields
+        let chunkIndex: number | null = null;
+        let data: string | null = null;
+
+        for (let j = 0; j < fields.length; j += 2) {
+          if (fields[j] === "chunkIndex") {
+            chunkIndex = parseInt(fields[j + 1], 10);
+          }
+          if (fields[j] === "data") {
+            data = fields[j + 1];
+          }
+        }
+
+        expect(chunkIndex).toBe(i);
+        expect(data).toBe(chunks[i] + "\n");
+      }
+
+      // Test getLastChunkIndex for the default client
+      const lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(
+        runId,
+        streamId,
+        "default"
+      );
+      expect(lastChunkIndex).toBe(4); // Last chunk should be index 4
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should resume from specified chunk index and skip duplicates",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_test456";
+      const streamId = "test-stream-resume";
+
+      // First, ingest chunks 0-2
+      const initialChunks = [
+        JSON.stringify({ chunk: 0, data: "chunk 0" }),
+        JSON.stringify({ chunk: 1, data: "chunk 1" }),
+        JSON.stringify({ chunk: 2, data: "chunk 2" }),
+      ];
+
+      const encoder = new TextEncoder();
+      const initialStream = new ReadableStream({
+        start(controller) {
+          for (const chunk of initialChunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(initialStream, runId, streamId, "default");
+
+      // Verify we have 3 chunks
+      let lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "default");
+      expect(lastChunkIndex).toBe(2);
+
+      // Now "resume" from chunk 3 with new chunks (simulating a retry)
+      // When client queries server, server says "I have up to chunk 2"
+      // So client resumes from chunk 3 onwards
+      const resumeChunks = [
+        JSON.stringify({ chunk: 3, data: "chunk 3" }), // New
+        JSON.stringify({ chunk: 4, data: "chunk 4" }), // New
+      ];
+
+      const resumeStream = new ReadableStream({
+        start(controller) {
+          for (const chunk of resumeChunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      // Resume from chunk 3 (server tells us it already has 0-2)
+      await redisRealtimeStreams.ingestData(resumeStream, runId, streamId, "default", 3);
+
+      // Verify we now have 5 chunks total (0, 1, 2, 3, 4)
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      expect(entries.length).toBe(5);
+
+      // Verify last chunk index is 4
+      lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "default");
+      expect(lastChunkIndex).toBe(4);
+
+      // Verify chunk indices are sequential
+      for (let i = 0; i < 5; i++) {
+        const [_id, fields] = entries[i];
+
+        let chunkIndex: number | null = null;
+        for (let j = 0; j < fields.length; j += 2) {
+          if (fields[j] === "chunkIndex") {
+            chunkIndex = parseInt(fields[j + 1], 10);
+          }
+        }
+
+        expect(chunkIndex).toBe(i);
+      }
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should return -1 for getLastChunkIndex when stream does not exist",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(
+        "run_nonexistent",
+        "nonexistent-stream",
+        "default"
+      );
+
+      expect(lastChunkIndex).toBe(-1);
+    }
+  );
+
+  redisTest(
+    "Should correctly stream response data back to consumers",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_stream_test";
+      const streamId = "test-stream-response";
+
+      // Ingest some data first
+      const chunks = [
+        JSON.stringify({ message: "chunk 0" }),
+        JSON.stringify({ message: "chunk 1" }),
+        JSON.stringify({ message: "chunk 2" }),
+      ];
+
+      const encoder = new TextEncoder();
+      const ingestStream = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(ingestStream, runId, streamId, "default");
+
+      // Now stream the response
+      const mockRequest = new Request("http://localhost/test");
+      const abortController = new AbortController();
+
+      const response = await redisRealtimeStreams.streamResponse(
+        mockRequest,
+        runId,
+        streamId,
+        abortController.signal
+      );
+
+      expect(response.status).toBe(200);
+      expect(response.headers.get("Content-Type")).toBe("text/event-stream");
+
+      // Read the stream
+      const reader = response.body!.getReader();
+      const decoder = new TextDecoder();
+      const receivedData: string[] = [];
+
+      let done = false;
+      while (!done && receivedData.length < 3) {
+        const { value, done: streamDone } = await reader.read();
+        done = streamDone;
+
+        if (value) {
+          const text = decoder.decode(value);
+          // Parse SSE format: "id: ...\ndata: {json}\n\n"
+          const events = text.split("\n\n").filter((event) => event.trim());
+          for (const event of events) {
+            const lines = event.split("\n");
+            for (const line of lines) {
+              if (line.startsWith("data: ")) {
+                const data = line.substring(6).trim();
+                if (data) {
+                  receivedData.push(data);
+                }
+              }
+            }
+          }
+        }
+      }
+
+      // Cancel the stream
+      abortController.abort();
+      reader.releaseLock();
+
+      // Verify we received all chunks
+      // Note: LineTransformStream strips newlines, so we don't expect them in output
+      expect(receivedData.length).toBe(3);
+      for (let i = 0; i < 3; i++) {
+        expect(receivedData[i]).toBe(chunks[i]);
+      }
+
+      // Cleanup
+      await redis.del(`stream:${runId}:${streamId}`);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should handle empty stream ingestion",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_empty_test";
+      const streamId = "empty-stream";
+
+      // Create an empty stream
+      const emptyStream = new ReadableStream({
+        start(controller) {
+          controller.close();
+        },
+      });
+
+      const response = await redisRealtimeStreams.ingestData(
+        emptyStream,
+        runId,
+        streamId,
+        "default"
+      );
+
+      expect(response.status).toBe(200);
+
+      // Should have no entries (empty stream)
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+      expect(entries.length).toBe(0);
+
+      // getLastChunkIndex should return -1 for empty stream
+      const lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(
+        runId,
+        streamId,
+        "default"
+      );
+      expect(lastChunkIndex).toBe(-1);
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest("Should handle resume from chunk 0", { timeout: 30_000 }, async ({ redisOptions }) => {
+    const redis = new Redis(redisOptions);
+    const redisRealtimeStreams = new RedisRealtimeStreams({
+      redis: redisOptions,
+    });
+
+    const runId = "run_resume_zero";
+    const streamId = "test-stream-zero";
+
+    const chunks = [
+      JSON.stringify({ chunk: 0, data: "chunk 0" }),
+      JSON.stringify({ chunk: 1, data: "chunk 1" }),
+    ];
+
+    const encoder = new TextEncoder();
+    const stream = new ReadableStream({
+      start(controller) {
+        for (const chunk of chunks) {
+          controller.enqueue(encoder.encode(chunk + "\n"));
+        }
+        controller.close();
+      },
+    });
+
+    // Explicitly resume from chunk 0 (should write all chunks)
+    await redisRealtimeStreams.ingestData(stream, runId, streamId, "default", 0);
+
+    const streamKey = `stream:${runId}:${streamId}`;
+    const entries = await redis.xrange(streamKey, "-", "+");
+
+    expect(entries.length).toBe(2);
+
+    // Verify indices start at 0
+    for (let i = 0; i < 2; i++) {
+      const [_id, fields] = entries[i];
+      let chunkIndex: number | null = null;
+      for (let j = 0; j < fields.length; j += 2) {
+        if (fields[j] === "chunkIndex") {
+          chunkIndex = parseInt(fields[j + 1], 10);
+        }
+      }
+      expect(chunkIndex).toBe(i);
+    }
+
+    // Cleanup
+    await redis.del(streamKey);
+    await redis.quit();
+  });
+
+  redisTest(
+    "Should handle large number of chunks",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_large_test";
+      const streamId = "large-stream";
+      const chunkCount = 100;
+
+      // Create 100 chunks
+      const chunks: string[] = [];
+      for (let i = 0; i < chunkCount; i++) {
+        chunks.push(JSON.stringify({ chunk: i, data: `chunk ${i}` }));
+      }
+
+      const encoder = new TextEncoder();
+      const stream = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(stream, runId, streamId, "default");
+
+      // Verify last chunk index
+      const lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(
+        runId,
+        streamId,
+        "default"
+      );
+      expect(lastChunkIndex).toBe(chunkCount - 1);
+
+      // Verify all chunks stored
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      expect(entries.length).toBe(chunkCount);
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should handle streamResponse with legacy data format (backward compatibility)",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_legacy_test";
+      const streamId = "legacy-stream";
+      const streamKey = `stream:${runId}:${streamId}`;
+
+      // Manually add entries in legacy format (without chunkIndex or clientId fields)
+      await redis.xadd(streamKey, "*", "data", "legacy chunk 1\n");
+      await redis.xadd(streamKey, "*", "data", "legacy chunk 2\n");
+
+      // Stream the response
+      const mockRequest = new Request("http://localhost/test");
+      const abortController = new AbortController();
+
+      const response = await redisRealtimeStreams.streamResponse(
+        mockRequest,
+        runId,
+        streamId,
+        abortController.signal
+      );
+
+      expect(response.status).toBe(200);
+
+      // Read the stream
+      const reader = response.body!.getReader();
+      const decoder = new TextDecoder();
+      const receivedData: string[] = [];
+
+      let done = false;
+      while (!done && receivedData.length < 2) {
+        const { value, done: streamDone } = await reader.read();
+        done = streamDone;
+
+        if (value) {
+          const text = decoder.decode(value);
+          const events = text.split("\n\n").filter((event) => event.trim());
+          for (const event of events) {
+            const lines = event.split("\n");
+            for (const line of lines) {
+              if (line.startsWith("data: ")) {
+                const data = line.substring(6).trim();
+                if (data) {
+                  receivedData.push(data);
+                }
+              }
+            }
+          }
+        }
+      }
+
+      // Cancel the stream
+      abortController.abort();
+      reader.releaseLock();
+
+      // Verify we received both legacy chunks
+      expect(receivedData.length).toBe(2);
+      expect(receivedData[0]).toBe("legacy chunk 1");
+      expect(receivedData[1]).toBe("legacy chunk 2");
+
+      // getLastChunkIndex should return -1 for legacy format (no chunkIndex field)
+      const lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(
+        runId,
+        streamId,
+        "default"
+      );
+      expect(lastChunkIndex).toBe(-1);
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should handle concurrent ingestion to the same stream",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_concurrent_test";
+      const streamId = "concurrent-stream";
+
+      // Create two sets of chunks that will be ingested concurrently
+      const chunks1 = [
+        JSON.stringify({ source: "A", chunk: 0, data: "A-chunk 0" }),
+        JSON.stringify({ source: "A", chunk: 1, data: "A-chunk 1" }),
+        JSON.stringify({ source: "A", chunk: 2, data: "A-chunk 2" }),
+      ];
+
+      const chunks2 = [
+        JSON.stringify({ source: "B", chunk: 0, data: "B-chunk 0" }),
+        JSON.stringify({ source: "B", chunk: 1, data: "B-chunk 1" }),
+        JSON.stringify({ source: "B", chunk: 2, data: "B-chunk 2" }),
+      ];
+
+      const encoder = new TextEncoder();
+
+      // Create two streams
+      const stream1 = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks1) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      const stream2 = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks2) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      // Ingest both streams concurrently - both starting from chunk 0
+      // Note: Using the same clientId will cause duplicate chunk indices (not recommended in practice)
+      const [response1, response2] = await Promise.all([
+        redisRealtimeStreams.ingestData(stream1, runId, streamId, "default", 0),
+        redisRealtimeStreams.ingestData(stream2, runId, streamId, "default", 0),
+      ]);
+
+      expect(response1.status).toBe(200);
+      expect(response2.status).toBe(200);
+
+      // Verify both sets of chunks were stored
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      // Should have 6 total chunks (3 from each stream)
+      expect(entries.length).toBe(6);
+
+      // Verify we have chunks from both sources (though order may be interleaved)
+      const sourceACounts = entries.filter(([_id, fields]) => {
+        for (let j = 0; j < fields.length; j += 2) {
+          if (fields[j] === "data" && fields[j + 1].includes('"source":"A"')) {
+            return true;
+          }
+        }
+        return false;
+      });
+
+      const sourceBCounts = entries.filter(([_id, fields]) => {
+        for (let j = 0; j < fields.length; j += 2) {
+          if (fields[j] === "data" && fields[j + 1].includes('"source":"B"')) {
+            return true;
+          }
+        }
+        return false;
+      });
+
+      expect(sourceACounts.length).toBe(3);
+      expect(sourceBCounts.length).toBe(3);
+
+      // Note: Both streams write chunks 0, 1, 2, so we'll have duplicate indices
+      // This is expected behavior - the last-write-wins with Redis XADD
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should handle concurrent ingestion with different clients and resume points",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_concurrent_resume_test";
+      const streamId = "concurrent-resume-stream";
+
+      // Client A writes initial chunks 0-2
+      const clientAInitial = [
+        JSON.stringify({ client: "A", phase: "initial", chunk: 0 }),
+        JSON.stringify({ client: "A", phase: "initial", chunk: 1 }),
+        JSON.stringify({ client: "A", phase: "initial", chunk: 2 }),
+      ];
+
+      const encoder = new TextEncoder();
+      const streamA1 = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientAInitial) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamA1, runId, streamId, "client-A", 0);
+
+      // Client B writes initial chunks 0-1
+      const clientBInitial = [
+        JSON.stringify({ client: "B", phase: "initial", chunk: 0 }),
+        JSON.stringify({ client: "B", phase: "initial", chunk: 1 }),
+      ];
+
+      const streamB1 = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientBInitial) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamB1, runId, streamId, "client-B", 0);
+
+      // Verify each client's initial state
+      let lastChunkA = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-A");
+      let lastChunkB = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-B");
+      expect(lastChunkA).toBe(2);
+      expect(lastChunkB).toBe(1);
+
+      // Now both clients resume concurrently from their own resume points
+      const clientAResume = [
+        JSON.stringify({ client: "A", phase: "resume", chunk: 3 }),
+        JSON.stringify({ client: "A", phase: "resume", chunk: 4 }),
+      ];
+
+      const clientBResume = [
+        JSON.stringify({ client: "B", phase: "resume", chunk: 2 }),
+        JSON.stringify({ client: "B", phase: "resume", chunk: 3 }),
+      ];
+
+      const streamA2 = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientAResume) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      const streamB2 = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientBResume) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      // Both resume concurrently from their own points
+      const [response1, response2] = await Promise.all([
+        redisRealtimeStreams.ingestData(streamA2, runId, streamId, "client-A", 3),
+        redisRealtimeStreams.ingestData(streamB2, runId, streamId, "client-B", 2),
+      ]);
+
+      expect(response1.status).toBe(200);
+      expect(response2.status).toBe(200);
+
+      // Verify each client's final state
+      lastChunkA = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-A");
+      lastChunkB = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-B");
+
+      expect(lastChunkA).toBe(4); // Client A: chunks 0-4
+      expect(lastChunkB).toBe(3); // Client B: chunks 0-3
+
+      // Verify total chunks in stream
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      // 5 from client A (0-4) + 4 from client B (0-3) = 9 total
+      expect(entries.length).toBe(9);
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should track chunk indices independently for different clients",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_multi_client_test";
+      const streamId = "multi-client-stream";
+
+      // Client A writes chunks 0-2
+      const clientAChunks = [
+        JSON.stringify({ client: "A", chunk: 0, data: "A0" }),
+        JSON.stringify({ client: "A", chunk: 1, data: "A1" }),
+        JSON.stringify({ client: "A", chunk: 2, data: "A2" }),
+      ];
+
+      const encoder = new TextEncoder();
+      const streamA = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientAChunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamA, runId, streamId, "client-A", 0);
+
+      // Client B writes chunks 0-1
+      const clientBChunks = [
+        JSON.stringify({ client: "B", chunk: 0, data: "B0" }),
+        JSON.stringify({ client: "B", chunk: 1, data: "B1" }),
+      ];
+
+      const streamB = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientBChunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamB, runId, streamId, "client-B", 0);
+
+      // Verify last chunk index for each client independently
+      const lastChunkA = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-A");
+      const lastChunkB = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-B");
+
+      expect(lastChunkA).toBe(2); // Client A wrote 3 chunks (0-2)
+      expect(lastChunkB).toBe(1); // Client B wrote 2 chunks (0-1)
+
+      // Verify total chunks in stream (5 chunks total)
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      expect(entries.length).toBe(5);
+
+      // Verify each chunk has correct clientId
+      let clientACount = 0;
+      let clientBCount = 0;
+
+      for (const [_id, fields] of entries) {
+        let clientId: string | null = null;
+        for (let j = 0; j < fields.length; j += 2) {
+          if (fields[j] === "clientId") {
+            clientId = fields[j + 1];
+          }
+        }
+
+        if (clientId === "client-A") clientACount++;
+        if (clientId === "client-B") clientBCount++;
+      }
+
+      expect(clientACount).toBe(3);
+      expect(clientBCount).toBe(2);
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should handle one client resuming while another client is writing new chunks",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_client_resume_test";
+      const streamId = "client-resume-stream";
+
+      // Client A writes initial chunks 0-2
+      const clientAInitial = [
+        JSON.stringify({ client: "A", chunk: 0 }),
+        JSON.stringify({ client: "A", chunk: 1 }),
+        JSON.stringify({ client: "A", chunk: 2 }),
+      ];
+
+      const encoder = new TextEncoder();
+      const streamA1 = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientAInitial) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamA1, runId, streamId, "client-A", 0);
+
+      // Verify client A's last chunk
+      let lastChunkA = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-A");
+      expect(lastChunkA).toBe(2);
+
+      // Client B writes chunks 0-1 (different client, independent sequence)
+      const clientBChunks = [
+        JSON.stringify({ client: "B", chunk: 0 }),
+        JSON.stringify({ client: "B", chunk: 1 }),
+      ];
+
+      const streamB = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientBChunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamB, runId, streamId, "client-B", 0);
+
+      // Verify client B's last chunk
+      const lastChunkB = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-B");
+      expect(lastChunkB).toBe(1);
+
+      // Client A resumes from chunk 3
+      const clientAResume = [
+        JSON.stringify({ client: "A", chunk: 3 }),
+        JSON.stringify({ client: "A", chunk: 4 }),
+      ];
+
+      const streamA2 = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientAResume) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamA2, runId, streamId, "client-A", 3);
+
+      // Verify final state
+      lastChunkA = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-A");
+      expect(lastChunkA).toBe(4); // Client A now has chunks 0-4
+
+      // Client B's last chunk should be unchanged
+      const lastChunkBAfter = await redisRealtimeStreams.getLastChunkIndex(
+        runId,
+        streamId,
+        "client-B"
+      );
+      expect(lastChunkBAfter).toBe(1); // Still 1
+
+      // Verify stream has chunks from both clients
+      const streamKey = `stream:${runId}:${streamId}`;
+      const entries = await redis.xrange(streamKey, "-", "+");
+
+      // 5 from client A + 2 from client B = 7 total
+      expect(entries.length).toBe(7);
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should return -1 for client that has never written to stream",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_client_not_found_test";
+      const streamId = "client-not-found-stream";
+
+      // Client A writes some chunks
+      const clientAChunks = [
+        JSON.stringify({ client: "A", chunk: 0 }),
+        JSON.stringify({ client: "A", chunk: 1 }),
+      ];
+
+      const encoder = new TextEncoder();
+      const streamA = new ReadableStream({
+        start(controller) {
+          for (const chunk of clientAChunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(streamA, runId, streamId, "client-A", 0);
+
+      // Client A's last chunk should be 1
+      const lastChunkA = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-A");
+      expect(lastChunkA).toBe(1);
+
+      // Client B never wrote anything, should return -1
+      const lastChunkB = await redisRealtimeStreams.getLastChunkIndex(runId, streamId, "client-B");
+      expect(lastChunkB).toBe(-1);
+
+      // Cleanup
+      const streamKey = `stream:${runId}:${streamId}`;
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should skip legacy END_SENTINEL entries when reading and finding last chunk",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_backward_compat_test";
+      const streamId = "backward-compat-stream";
+      const streamKey = `stream:${runId}:${streamId}`;
+
+      // Manually create a stream with mix of new format and legacy END_SENTINEL
+      await redis.xadd(
+        streamKey,
+        "*",
+        "clientId",
+        "client-A",
+        "chunkIndex",
+        "0",
+        "data",
+        "chunk 0\n"
+      );
+      await redis.xadd(
+        streamKey,
+        "*",
+        "clientId",
+        "client-A",
+        "chunkIndex",
+        "1",
+        "data",
+        "chunk 1\n"
+      );
+      await redis.xadd(streamKey, "*", "data", "<<CLOSE_STREAM>>"); // Legacy END_SENTINEL
+      await redis.xadd(
+        streamKey,
+        "*",
+        "clientId",
+        "client-A",
+        "chunkIndex",
+        "2",
+        "data",
+        "chunk 2\n"
+      );
+      await redis.xadd(streamKey, "*", "data", "<<CLOSE_STREAM>>"); // Another legacy END_SENTINEL
+
+      // getLastChunkIndex should skip END_SENTINELs and find chunk 2
+      const lastChunkIndex = await redisRealtimeStreams.getLastChunkIndex(
+        runId,
+        streamId,
+        "client-A"
+      );
+      expect(lastChunkIndex).toBe(2);
+
+      // streamResponse should skip END_SENTINELs and only return actual data
+      const mockRequest = new Request("http://localhost/test");
+      const abortController = new AbortController();
+
+      const response = await redisRealtimeStreams.streamResponse(
+        mockRequest,
+        runId,
+        streamId,
+        abortController.signal
+      );
+
+      expect(response.status).toBe(200);
+
+      // Read the stream
+      const reader = response.body!.getReader();
+      const decoder = new TextDecoder();
+      const receivedData: string[] = [];
+
+      let done = false;
+      while (!done && receivedData.length < 3) {
+        const { value, done: streamDone } = await reader.read();
+        done = streamDone;
+
+        if (value) {
+          const text = decoder.decode(value);
+          const events = text.split("\n\n").filter((event) => event.trim());
+          for (const event of events) {
+            const lines = event.split("\n");
+            for (const line of lines) {
+              if (line.startsWith("data: ")) {
+                const data = line.substring(6).trim();
+                if (data) {
+                  receivedData.push(data);
+                }
+              }
+            }
+          }
+        }
+      }
+
+      // Cancel the stream
+      abortController.abort();
+      reader.releaseLock();
+
+      // Should receive 3 chunks (END_SENTINELs skipped)
+      expect(receivedData.length).toBe(3);
+      expect(receivedData[0]).toBe("chunk 0");
+      expect(receivedData[1]).toBe("chunk 1");
+      expect(receivedData[2]).toBe("chunk 2");
+
+      // Cleanup
+      await redis.del(streamKey);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should close stream after inactivity timeout",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+        inactivityTimeoutMs: 2000, // 2 seconds for faster test
+      });
+
+      const runId = "run_inactivity_test";
+      const streamId = "inactivity-stream";
+
+      // Write 2 chunks
+      const chunks = [JSON.stringify({ chunk: 0 }), JSON.stringify({ chunk: 1 })];
+
+      const encoder = new TextEncoder();
+      const stream = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(stream, runId, streamId, "default");
+
+      // Start streaming
+      const mockRequest = new Request("http://localhost/test");
+      const abortController = new AbortController();
+
+      const response = await redisRealtimeStreams.streamResponse(
+        mockRequest,
+        runId,
+        streamId,
+        abortController.signal
+      );
+
+      expect(response.status).toBe(200);
+
+      // Read the stream
+      const reader = response.body!.getReader();
+      const decoder = new TextDecoder();
+      const receivedData: string[] = [];
+
+      const startTime = Date.now();
+      let streamClosed = false;
+
+      try {
+        while (true) {
+          const { value, done } = await reader.read();
+
+          if (done) {
+            streamClosed = true;
+            break;
+          }
+
+          if (value) {
+            const text = decoder.decode(value);
+            const events = text.split("\n\n").filter((event) => event.trim());
+            for (const event of events) {
+              const lines = event.split("\n");
+              for (const line of lines) {
+                if (line.startsWith("data: ")) {
+                  const data = line.substring(6).trim();
+                  if (data) {
+                    receivedData.push(data);
+                  }
+                }
+              }
+            }
+          }
+        }
+      } catch (error) {
+        // Expected to eventually close
+      } finally {
+        reader.releaseLock();
+      }
+
+      const elapsedMs = Date.now() - startTime;
+
+      // Verify stream closed naturally
+      expect(streamClosed).toBe(true);
+
+      // Should have received both chunks
+      expect(receivedData.length).toBe(2);
+
+      // Should have closed after inactivity timeout + one BLOCK cycle
+      // BLOCK time is 5000ms, so minimum time is ~5s (one full BLOCK timeout)
+      // The inactivity is checked AFTER the BLOCK returns
+      expect(elapsedMs).toBeGreaterThan(4000); // At least one BLOCK cycle
+      expect(elapsedMs).toBeLessThan(8000); // But not more than 2 cycles
+
+      // Cleanup
+      await redis.del(`stream:${runId}:${streamId}`);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should format response with event IDs from Redis stream",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_event_id_test";
+      const streamId = "event-id-stream";
+
+      // Ingest some data with specific clientId
+      const chunks = [
+        JSON.stringify({ message: "chunk 0" }),
+        JSON.stringify({ message: "chunk 1" }),
+        JSON.stringify({ message: "chunk 2" }),
+      ];
+
+      const encoder = new TextEncoder();
+      const ingestStream = new ReadableStream({
+        start(controller) {
+          for (const chunk of chunks) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(ingestStream, runId, streamId, "test-client-123");
+
+      // Stream the response
+      const mockRequest = new Request("http://localhost/test");
+      const abortController = new AbortController();
+
+      const response = await redisRealtimeStreams.streamResponse(
+        mockRequest,
+        runId,
+        streamId,
+        abortController.signal
+      );
+
+      expect(response.status).toBe(200);
+      expect(response.headers.get("Content-Type")).toBe("text/event-stream");
+
+      // Read the stream
+      const reader = response.body!.getReader();
+      const decoder = new TextDecoder();
+      const receivedEvents: Array<{ id: string; data: string }> = [];
+
+      let done = false;
+      while (!done && receivedEvents.length < 3) {
+        const { value, done: streamDone } = await reader.read();
+        done = streamDone;
+
+        if (value) {
+          const text = decoder.decode(value);
+          // Split by double newline to get individual events
+          const events = text.split("\n\n").filter((event) => event.trim());
+
+          for (const event of events) {
+            const lines = event.split("\n");
+            let id: string | null = null;
+            let data: string | null = null;
+
+            for (const line of lines) {
+              if (line.startsWith("id: ")) {
+                id = line.substring(4);
+              } else if (line.startsWith("data: ")) {
+                data = line.substring(6);
+              }
+            }
+
+            if (id && data) {
+              receivedEvents.push({ id, data });
+            }
+          }
+        }
+      }
+
+      // Cancel the stream
+      abortController.abort();
+      reader.releaseLock();
+
+      // Verify we received all chunks with correct event IDs
+      expect(receivedEvents.length).toBe(3);
+
+      // Verify event IDs are Redis stream IDs (format: timestamp-sequence like "1234567890123-0")
+      for (let i = 0; i < 3; i++) {
+        expect(receivedEvents[i].id).toMatch(/^\d+-\d+$/);
+        expect(receivedEvents[i].data).toBe(chunks[i]);
+      }
+
+      // Verify IDs are in order (each ID should be > previous)
+      expect(receivedEvents[1].id > receivedEvents[0].id).toBe(true);
+      expect(receivedEvents[2].id > receivedEvents[1].id).toBe(true);
+
+      // Cleanup
+      await redis.del(`stream:${runId}:${streamId}`);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should support resuming from Last-Event-ID",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_resume_test";
+      const streamId = "resume-stream";
+
+      // Ingest data in two batches
+      const firstBatch = [
+        JSON.stringify({ batch: 1, chunk: 0 }),
+        JSON.stringify({ batch: 1, chunk: 1 }),
+        JSON.stringify({ batch: 1, chunk: 2 }),
+      ];
+
+      const encoder = new TextEncoder();
+      const firstStream = new ReadableStream({
+        start(controller) {
+          for (const chunk of firstBatch) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(firstStream, runId, streamId, "client-A");
+
+      // Stream and read first batch
+      const mockRequest1 = new Request("http://localhost/test");
+      const abortController1 = new AbortController();
+
+      const response1 = await redisRealtimeStreams.streamResponse(
+        mockRequest1,
+        runId,
+        streamId,
+        abortController1.signal
+      );
+
+      expect(response1.status).toBe(200);
+
+      const reader1 = response1.body!.getReader();
+      const decoder1 = new TextDecoder();
+      const firstEvents: Array<{ id: string; data: string }> = [];
+
+      let done1 = false;
+      while (!done1 && firstEvents.length < 3) {
+        const { value, done: streamDone } = await reader1.read();
+        done1 = streamDone;
+
+        if (value) {
+          const text = decoder1.decode(value);
+          const events = text.split("\n\n").filter((event) => event.trim());
+
+          for (const event of events) {
+            const lines = event.split("\n");
+            let id: string | null = null;
+            let data: string | null = null;
+
+            for (const line of lines) {
+              if (line.startsWith("id: ")) {
+                id = line.substring(4);
+              } else if (line.startsWith("data: ")) {
+                data = line.substring(6);
+              }
+            }
+
+            if (id && data) {
+              firstEvents.push({ id, data });
+            }
+          }
+        }
+      }
+
+      abortController1.abort();
+      reader1.releaseLock();
+
+      expect(firstEvents.length).toBe(3);
+      const lastEventId = firstEvents[firstEvents.length - 1].id;
+
+      // Ingest second batch
+      const secondBatch = [
+        JSON.stringify({ batch: 2, chunk: 0 }),
+        JSON.stringify({ batch: 2, chunk: 1 }),
+      ];
+
+      const secondStream = new ReadableStream({
+        start(controller) {
+          for (const chunk of secondBatch) {
+            controller.enqueue(encoder.encode(chunk + "\n"));
+          }
+          controller.close();
+        },
+      });
+
+      await redisRealtimeStreams.ingestData(secondStream, runId, streamId, "client-A");
+
+      // Resume streaming from lastEventId
+      const mockRequest2 = new Request("http://localhost/test");
+      const abortController2 = new AbortController();
+
+      const response2 = await redisRealtimeStreams.streamResponse(
+        mockRequest2,
+        runId,
+        streamId,
+        abortController2.signal,
+        { lastEventId }
+      );
+
+      expect(response2.status).toBe(200);
+
+      const reader2 = response2.body!.getReader();
+      const decoder2 = new TextDecoder();
+      const resumedEvents: Array<{ id: string; data: string }> = [];
+
+      let done2 = false;
+      while (!done2 && resumedEvents.length < 2) {
+        const { value, done: streamDone } = await reader2.read();
+        done2 = streamDone;
+
+        if (value) {
+          const text = decoder2.decode(value);
+          const events = text.split("\n\n").filter((event) => event.trim());
+
+          for (const event of events) {
+            const lines = event.split("\n");
+            let id: string | null = null;
+            let data: string | null = null;
+
+            for (const line of lines) {
+              if (line.startsWith("id: ")) {
+                id = line.substring(4);
+              } else if (line.startsWith("data: ")) {
+                data = line.substring(6);
+              }
+            }
+
+            if (id && data) {
+              resumedEvents.push({ id, data });
+            }
+          }
+        }
+      }
+
+      abortController2.abort();
+      reader2.releaseLock();
+
+      // Verify we only received the second batch (events after lastEventId)
+      expect(resumedEvents.length).toBe(2);
+      expect(resumedEvents[0].data).toBe(secondBatch[0]);
+      expect(resumedEvents[1].data).toBe(secondBatch[1]);
+
+      // Verify the resumed events have IDs greater than lastEventId
+      expect(resumedEvents[0].id > lastEventId).toBe(true);
+      expect(resumedEvents[1].id > lastEventId).toBe(true);
+
+      // Cleanup
+      await redis.del(`stream:${runId}:${streamId}`);
+      await redis.quit();
+    }
+  );
+
+  redisTest(
+    "Should handle chunks split mid-line (regression test)",
+    { timeout: 30_000 },
+    async ({ redisOptions }) => {
+      const redis = new Redis(redisOptions);
+      const redisRealtimeStreams = new RedisRealtimeStreams({
+        redis: redisOptions,
+      });
+
+      const runId = "run_split_test";
+      const streamId = "test-split-stream";
+
+      // Simulate what happens in production: a JSON line split across multiple network chunks
+      // This reproduces the issue where we see partial chunks like:
+      // - "{\"timestamp\":"
+      // - "1762880245493,\"chunkIndex\":780,\"data\":\"Chunk 781/1000\"}"
+      const fullLine = JSON.stringify({
+        timestamp: 1762880245493,
+        chunkIndex: 780,
+        data: "Chunk 781/1000",
+      });
+
+      // Split the line at an arbitrary position (in the middle of the JSON)
+      const splitPoint = 16; // Splits after '{"timestamp":'
+      const chunk1 = fullLine.substring(0, splitPoint);
+      const chunk2 = fullLine.substring(splitPoint);
+
+      // Create a ReadableStream that sends split chunks
+      const encoder = new TextEncoder();
+      const stream = new ReadableStream({
+        start(controller) {
+          controller.enqueue(encoder.encode(chunk1));
+          controller.enqueue(encoder.encode(chunk2 + "\n")); // Add newline at end
+          controller.close();
+        },
+      });
+
+      // Ingest the split data
+      await redisRealtimeStreams.ingestData(stream, runId, streamId, "client1");
+
+      // Now consume the stream and verify we get the complete line, not split chunks
+      const abortController = new AbortController();
+      const response = await redisRealtimeStreams.streamResponse(
+        new Request("http://localhost/test"),
+        runId,
+        streamId,
+        abortController.signal
+      );
+
+      const reader = response.body!.getReader();
+      const decoder = new TextDecoder();
+      let receivedData = "";
+
+      // Read all chunks from the response
+      const readTimeout = setTimeout(() => {
+        abortController.abort();
+      }, 5000);
+
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+
+          receivedData += decoder.decode(value, { stream: true });
+
+          // Once we have data, we can stop
+          if (receivedData.includes("data: ")) {
+            break;
+          }
+        }
+      } finally {
+        clearTimeout(readTimeout);
+        abortController.abort();
+        reader.releaseLock();
+      }
+
+      // Parse the SSE data
+      const lines = receivedData.split("\n").filter((line) => line.startsWith("data: "));
+
+      // We should receive exactly ONE complete line, not two partial lines
+      expect(lines.length).toBe(1);
+
+      // Extract the data (remove "data: " prefix)
+      const dataLine = lines[0].substring(6);
+
+      // Verify it's the complete, valid JSON
+      expect(dataLine).toBe(fullLine);
+
+      // Verify it parses correctly as JSON
+      const parsed = JSON.parse(dataLine) as {
+        timestamp: number;
+        chunkIndex: number;
+        data: string;
+      };
+      expect(parsed.timestamp).toBe(1762880245493);
+      expect(parsed.chunkIndex).toBe(780);
+      expect(parsed.data).toBe("Chunk 781/1000");
+
+      // Cleanup
+      await redis.del(`stream:${runId}:${streamId}`);
+      await redis.quit();
+    }
+  );
+});
diff --git a/apps/webapp/test/registryConfig.test.ts b/apps/webapp/test/registryConfig.test.ts
new file mode 100644
index 00000000000..341761d0115
--- /dev/null
+++ b/apps/webapp/test/registryConfig.test.ts
@@ -0,0 +1,215 @@
+import { describe, expect, it, vi, beforeEach } from "vitest";
+
+describe("getRegistryConfig", () => {
+  // Base env with all required fields to make env.server.ts happy
+  const baseEnv = {
+    NODE_ENV: "test" as const,
+    DATABASE_URL: "postgresql://test:test@localhost:5432/test",
+    DIRECT_URL: "postgresql://test:test@localhost:5432/test",
+    SESSION_SECRET: "test-session-secret",
+    MAGIC_LINK_SECRET: "test-magic-link-secret",
+    ENCRYPTION_KEY: "test-encryption-keeeeey-32-bytes",
+    CLICKHOUSE_URL: "http://localhost:8123",
+  };
+
+  beforeEach(() => {
+    // Reset modules to ensure fresh imports
+    vi.resetModules();
+  });
+
+  it("should return v3 config for non-v4 deployments", async () => {
+    // Set up v3 env vars
+    process.env = {
+      ...baseEnv,
+      DEPLOY_REGISTRY_HOST: "v3-host.example.com",
+      DEPLOY_REGISTRY_USERNAME: "v3-user",
+      DEPLOY_REGISTRY_PASSWORD: "v3-password",
+      DEPLOY_REGISTRY_NAMESPACE: "v3-namespace",
+      DEPLOY_REGISTRY_ECR_TAGS: "env=v3,version=3",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: "arn:aws:iam::123456789012:role/v3-role",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: "v3-external-id",
+    };
+
+    const { getRegistryConfig } = await import("../app/v3/registryConfig.server");
+    const config = getRegistryConfig(false);
+
+    expect(config).toEqual({
+      host: "v3-host.example.com",
+      username: "v3-user",
+      password: "v3-password",
+      namespace: "v3-namespace",
+      ecrTags: "env=v3,version=3",
+      ecrAssumeRoleArn: "arn:aws:iam::123456789012:role/v3-role",
+      ecrAssumeRoleExternalId: "v3-external-id",
+    });
+  });
+
+  it("should return v4 config for v4 deployments when V4 vars are set", async () => {
+    // Set up v3 + v4 env vars
+    process.env = {
+      ...baseEnv,
+      DEPLOY_REGISTRY_HOST: "v3-host.example.com",
+      DEPLOY_REGISTRY_USERNAME: "v3-user",
+      DEPLOY_REGISTRY_PASSWORD: "v3-password",
+      DEPLOY_REGISTRY_NAMESPACE: "v3-namespace",
+      DEPLOY_REGISTRY_ECR_TAGS: "env=v3,version=3",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: "arn:aws:iam::123456789012:role/v3-role",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: "v3-external-id",
+
+      V4_DEPLOY_REGISTRY_HOST: "v4-host.example.com",
+      V4_DEPLOY_REGISTRY_USERNAME: "v4-user",
+      V4_DEPLOY_REGISTRY_PASSWORD: "v4-password",
+      V4_DEPLOY_REGISTRY_NAMESPACE: "v4-namespace",
+      V4_DEPLOY_REGISTRY_ECR_TAGS: "env=v4,version=4",
+      V4_DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: "arn:aws:iam::456789012345:role/v4-role",
+      V4_DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: "v4-external-id",
+    };
+
+    const { getRegistryConfig } = await import("../app/v3/registryConfig.server");
+    const config = getRegistryConfig(true);
+
+    expect(config).toEqual({
+      host: "v4-host.example.com",
+      username: "v4-user",
+      password: "v4-password",
+      namespace: "v4-namespace",
+      ecrTags: "env=v4,version=4",
+      ecrAssumeRoleArn: "arn:aws:iam::456789012345:role/v4-role",
+      ecrAssumeRoleExternalId: "v4-external-id",
+    });
+  });
+
+  it("should fallback to v3 config when V4 vars are not set", async () => {
+    // Set up only v3 env vars (no v4 vars)
+    process.env = {
+      ...baseEnv,
+      DEPLOY_REGISTRY_HOST: "v3-only-host.example.com",
+      DEPLOY_REGISTRY_USERNAME: "v3-only-user",
+      DEPLOY_REGISTRY_PASSWORD: "v3-only-password",
+      DEPLOY_REGISTRY_NAMESPACE: "v3-only-namespace",
+      DEPLOY_REGISTRY_ECR_TAGS: "env=v3only",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: "arn:aws:iam::111111111111:role/v3-only-role",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: "v3-only-external-id",
+      // V4 vars not set - should fallback to v3 via transform
+    };
+
+    const { getRegistryConfig } = await import("../app/v3/registryConfig.server");
+    const config = getRegistryConfig(true);
+
+    expect(config).toEqual({
+      host: "v3-only-host.example.com",
+      username: "v3-only-user",
+      password: "v3-only-password",
+      namespace: "v3-only-namespace",
+      ecrTags: "env=v3only",
+      ecrAssumeRoleArn: "arn:aws:iam::111111111111:role/v3-only-role",
+      ecrAssumeRoleExternalId: "v3-only-external-id",
+    });
+  });
+
+  it("should handle partial v4 config with mixed fallbacks", async () => {
+    // Set up v3 vars + only some v4 vars
+    process.env = {
+      ...baseEnv,
+      DEPLOY_REGISTRY_HOST: "v3-mixed-host.example.com",
+      DEPLOY_REGISTRY_USERNAME: "v3-mixed-user",
+      DEPLOY_REGISTRY_PASSWORD: "v3-mixed-password",
+      DEPLOY_REGISTRY_NAMESPACE: "v3-mixed-namespace",
+      DEPLOY_REGISTRY_ECR_TAGS: "env=v3mixed",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_ARN: "arn:aws:iam::222222222222:role/v3-mixed-role",
+      DEPLOY_REGISTRY_ECR_ASSUME_ROLE_EXTERNAL_ID: "v3-mixed-external-id",
+
+      // Only some V4 vars are set - others should fallback to v3
+      V4_DEPLOY_REGISTRY_HOST: "v4-partial-host.example.com",
+      V4_DEPLOY_REGISTRY_USERNAME: "v4-partial-user",
+      // V4_DEPLOY_REGISTRY_PASSWORD not set - should fallback to v3
+      // Other V4 vars not set - should fallback to v3
+    };
+
+    const { getRegistryConfig } = await import("../app/v3/registryConfig.server");
+    const config = getRegistryConfig(true);
+
+    expect(config).toEqual({
+      host: "v4-partial-host.example.com", // v4 value
+      username: "v4-partial-user", // v4 value
+      password: "v3-mixed-password", // v3 fallback
+      namespace: "v3-mixed-namespace", // v3 fallback
+      ecrTags: "env=v3mixed", // v3 fallback
+      ecrAssumeRoleArn: "arn:aws:iam::222222222222:role/v3-mixed-role", // v3 fallback
+      ecrAssumeRoleExternalId: "v3-mixed-external-id", // v3 fallback
+    });
+  });
+
+  it("should handle basic registry config without ECR or V4 vars", async () => {
+    // Set up basic registry config without ECR or V4 vars
+    process.env = {
+      ...baseEnv,
+      DEPLOY_REGISTRY_HOST: "registry.example.com",
+      DEPLOY_REGISTRY_USERNAME: "basic-user",
+      DEPLOY_REGISTRY_PASSWORD: "basic-password",
+      DEPLOY_REGISTRY_NAMESPACE: "basic-namespace",
+      // No ECR vars and no V4 vars - should all be undefined
+    };
+
+    const { getRegistryConfig } = await import("../app/v3/registryConfig.server");
+
+    const v3Config = getRegistryConfig(false);
+    const v4Config = getRegistryConfig(true);
+
+    expect(v3Config).toEqual({
+      host: "registry.example.com",
+      username: "basic-user",
+      password: "basic-password",
+      namespace: "basic-namespace",
+      ecrTags: undefined,
+      ecrAssumeRoleArn: undefined,
+      ecrAssumeRoleExternalId: undefined,
+    });
+
+    // V4 should fallback to v3 values since V4 vars not set
+    expect(v4Config).toEqual({
+      host: "registry.example.com",
+      username: "basic-user",
+      password: "basic-password",
+      namespace: "basic-namespace",
+      ecrTags: undefined,
+      ecrAssumeRoleArn: undefined,
+      ecrAssumeRoleExternalId: undefined,
+    });
+  });
+
+  it("should handle undefined/null values gracefully", async () => {
+    // Set up minimal required values only
+    process.env = {
+      ...baseEnv,
+      DEPLOY_REGISTRY_HOST: "minimal-host.example.com",
+      DEPLOY_REGISTRY_NAMESPACE: "minimal-namespace",
+      // Other vars not set - should be undefined
+    };
+
+    const { getRegistryConfig } = await import("../app/v3/registryConfig.server");
+
+    const v3Config = getRegistryConfig(false);
+    const v4Config = getRegistryConfig(true);
+
+    expect(v3Config).toEqual({
+      host: "minimal-host.example.com",
+      username: undefined,
+      password: undefined,
+      namespace: "minimal-namespace",
+      ecrTags: undefined,
+      ecrAssumeRoleArn: undefined,
+      ecrAssumeRoleExternalId: undefined,
+    });
+
+    expect(v4Config).toEqual({
+      host: "minimal-host.example.com",
+      username: undefined,
+      password: undefined,
+      namespace: "minimal-namespace", // fallback default
+      ecrTags: undefined,
+      ecrAssumeRoleArn: undefined,
+      ecrAssumeRoleExternalId: undefined,
+    });
+  });
+});
diff --git a/apps/webapp/test/runsBackfiller.test.ts b/apps/webapp/test/runsBackfiller.test.ts
new file mode 100644
index 00000000000..7051fb976f5
--- /dev/null
+++ b/apps/webapp/test/runsBackfiller.test.ts
@@ -0,0 +1,183 @@
+import { vi } from "vitest";
+
+// Mock the db prisma client
+vi.mock("~/db.server", () => ({
+  prisma: {},
+  $replica: {},
+}));
+
+import { ClickHouse } from "@internal/clickhouse";
+import { containerTest } from "@internal/testcontainers";
+import { z } from "zod";
+import { RunsBackfillerService } from "~/services/runsBackfiller.server";
+import { RunsReplicationService } from "~/services/runsReplicationService.server";
+import { createInMemoryTracing } from "./utils/tracing";
+
+vi.setConfig({ testTimeout: 60_000 });
+
+describe("RunsBackfillerService", () => {
+  containerTest(
+    "should backfill completed runs to clickhouse",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const clickhouse = new ClickHouse({
+        url: clickhouseContainer.getConnectionUrl(),
+        name: "runs-replication",
+        compression: {
+          request: true,
+        },
+      });
+
+      const { tracer, exporter } = createInMemoryTracing();
+
+      const runsReplicationService = new RunsReplicationService({
+        clickhouse,
+        pgConnectionUrl: postgresContainer.getConnectionUri(),
+        serviceName: "runs-replication",
+        slotName: "task_runs_to_clickhouse_v1",
+        publicationName: "task_runs_to_clickhouse_v1_publication",
+        redisOptions,
+        maxFlushConcurrency: 1,
+        flushIntervalMs: 100,
+        flushBatchSize: 1,
+        leaderLockTimeoutMs: 5000,
+        leaderLockExtendIntervalMs: 1000,
+        ackIntervalSeconds: 5,
+        tracer,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Insert 11 completed runs into the database
+      for (let i = 0; i < 11; i++) {
+        await prisma.taskRun.create({
+          data: {
+            friendlyId: `run_1234_${i}`,
+            taskIdentifier: "my-task",
+            payload: JSON.stringify({ foo: "bar" }),
+            traceId: "1234",
+            spanId: "1234",
+            queue: "test",
+            runtimeEnvironmentId: runtimeEnvironment.id,
+            projectId: project.id,
+            organizationId: organization.id,
+            environmentType: "DEVELOPMENT",
+            engine: "V2",
+            status: "COMPLETED_SUCCESSFULLY",
+          },
+        });
+      }
+
+      // Insert a second run that's not completed
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_1235",
+          taskIdentifier: "my-task",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+          status: "PENDING",
+        },
+      });
+
+      // Insert a third run that was created before the "from" date
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_1236",
+          taskIdentifier: "my-task",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+          status: "COMPLETED_SUCCESSFULLY",
+          createdAt: new Date(Date.now() - 60000), // 60 seconds ago
+        },
+      });
+
+      const service = new RunsBackfillerService({
+        prisma,
+        runsReplicationInstance: runsReplicationService,
+        tracer,
+      });
+
+      const from = new Date(Date.now() - 10000);
+      const to = new Date(Date.now() + 1000);
+
+      const backfillResult = await service.call({
+        from,
+        to,
+        batchSize: 10,
+      });
+
+      expect(backfillResult).toBeDefined();
+
+      // Okay now use the cursor to backfill again for the next batch
+      const backfillResult2 = await service.call({
+        from,
+        to,
+        batchSize: 10,
+        cursor: backfillResult,
+      });
+
+      expect(backfillResult2).toBeDefined();
+
+      // Now use the cursor to backfill again for the next batch, but this time it will return undefined because there are no more runs to backfill
+      const backfillResult3 = await service.call({
+        from,
+        to,
+        batchSize: 10,
+        cursor: backfillResult2,
+      });
+
+      expect(backfillResult3).toBeUndefined();
+
+      // Check that the row was replicated to clickhouse
+      const queryRuns = clickhouse.reader.query({
+        name: "runs-replication",
+        query: "SELECT * FROM trigger_dev.task_runs_v2",
+        schema: z.any(),
+      });
+
+      const [queryError, result] = await queryRuns({});
+
+      expect(queryError).toBeNull();
+      expect(result?.length).toBe(11);
+    }
+  );
+});
diff --git a/apps/webapp/test/runsReplicationService.part1.test.ts b/apps/webapp/test/runsReplicationService.part1.test.ts
index aaaa9dd1b8f..87ebd0cde2d 100644
--- a/apps/webapp/test/runsReplicationService.part1.test.ts
+++ b/apps/webapp/test/runsReplicationService.part1.test.ts
@@ -1,11 +1,10 @@
 import { ClickHouse } from "@internal/clickhouse";
 import { containerTest } from "@internal/testcontainers";
-import { Logger } from "@trigger.dev/core/logger";
 import { setTimeout } from "node:timers/promises";
 import { z } from "zod";
 import { TaskRunStatus } from "~/database-types";
 import { RunsReplicationService } from "~/services/runsReplicationService.server";
-import { createInMemoryTracing } from "./utils/tracing";
+import { createInMemoryTracing, createInMemoryMetrics } from "./utils/tracing";
 import superjson from "superjson";
 
 vi.setConfig({ testTimeout: 60_000 });
@@ -22,6 +21,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         compression: {
           request: true,
         },
+        logLevel: "warn",
       });
 
       const { tracer, exporter } = createInMemoryTracing();
@@ -40,6 +40,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
         tracer,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -72,7 +73,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Now we insert a row into the table
       const taskRun = await prisma.taskRun.create({
         data: {
           friendlyId: "run_1234",
@@ -91,7 +91,6 @@ describe("RunsReplicationService (part 1/2)", () => {
 
       await setTimeout(1000);
 
-      // Check that the row was replicated to clickhouse
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication",
         query: "SELECT * FROM trigger_dev.task_runs_v2",
@@ -119,16 +118,8 @@ describe("RunsReplicationService (part 1/2)", () => {
 
       expect(spans.length).toBeGreaterThan(0);
 
-      const transactionSpan = spans.find(
-        (span) =>
-          span.name === "handle_transaction" &&
-          typeof span.attributes["transaction.events"] === "number" &&
-          span.attributes["transaction.events"] > 0
-      );
-
-      expect(transactionSpan).not.toBeNull();
-      expect(transactionSpan?.attributes["transaction.parse_duration_ms"]).toBeGreaterThan(0);
-      expect(transactionSpan?.attributes["transaction.parse_duration_ms"]).toBeLessThan(5);
+      const flushBatchSpan = spans.find((span) => span.name === "flushBatch");
+      expect(flushBatchSpan).toBeDefined();
 
       await runsReplicationService.stop();
     }
@@ -145,6 +136,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         compression: {
           request: true,
         },
+        logLevel: "warn",
       });
 
       const { tracer, exporter } = createInMemoryTracing();
@@ -163,6 +155,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
         tracer,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -197,7 +190,6 @@ describe("RunsReplicationService (part 1/2)", () => {
 
       const date = new Date();
 
-      // Now we insert a row into the table
       const taskRun = await prisma.taskRun.create({
         data: {
           friendlyId: "run_1234",
@@ -222,7 +214,6 @@ describe("RunsReplicationService (part 1/2)", () => {
 
       await setTimeout(1000);
 
-      // Check that the row was replicated to clickhouse
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication",
         query: "SELECT * FROM trigger_dev.task_runs_v2",
@@ -276,13 +267,14 @@ describe("RunsReplicationService (part 1/2)", () => {
   );
 
   containerTest(
-    "should not produce any handle_transaction spans when no TaskRun events are produced",
+    "should not produce any flush spans when no TaskRun events are produced",
     async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
       await prisma.$executeRawUnsafe(`ALTER TABLE public."TaskRun" REPLICA IDENTITY FULL;`);
 
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication",
+        logLevel: "warn",
       });
 
       const { tracer, exporter } = createInMemoryTracing();
@@ -301,6 +293,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
         tracer,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -337,9 +330,9 @@ describe("RunsReplicationService (part 1/2)", () => {
 
       const spans = exporter.getFinishedSpans();
 
-      const handleTransactionSpans = spans.filter((span) => span.name === "handle_transaction");
+      const flushBatchSpans = spans.filter((span) => span.name === "flushBatch");
 
-      expect(handleTransactionSpans.length).toBe(0);
+      expect(flushBatchSpans.length).toBe(0);
 
       await runsReplicationService.stop();
     }
@@ -353,6 +346,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-batching",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -368,6 +362,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -400,7 +395,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert a row into the table with a unique friendlyId
       const uniqueFriendlyId = `run_batching_${Date.now()}`;
       const taskRun = await prisma.taskRun.create({
         data: {
@@ -418,10 +412,8 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for replication
       await setTimeout(1000);
 
-      // Query ClickHouse for the replicated run
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication-batching",
         query: "SELECT * FROM trigger_dev.task_runs_v2 WHERE run_id = {run_id:String}",
@@ -458,6 +450,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-payload",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -473,6 +466,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -505,7 +499,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert a row into the table with a unique payload
       const uniquePayload = { foo: "payload-test", bar: Date.now() };
       const taskRun = await prisma.taskRun.create({
         data: {
@@ -524,10 +517,8 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for replication
       await setTimeout(1000);
 
-      // Query ClickHouse for the replicated payload
       const queryPayloads = clickhouse.reader.query({
         name: "runs-replication-payload",
         query: "SELECT * FROM trigger_dev.raw_task_runs_payload_v1 WHERE run_id = {run_id:String}",
@@ -560,6 +551,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-payload",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -575,6 +567,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -607,7 +600,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert a row into the table with a unique payload
       const largePayload = {
         foo: Array.from({ length: 100 }, () => "foo").join(""),
         bar: Array.from({ length: 100 }, () => "bar").join(""),
@@ -631,10 +623,8 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for replication
       await setTimeout(1000);
 
-      // Query ClickHouse for the replicated payload
       const queryPayloads = clickhouse.reader.query({
         name: "runs-replication-payload",
         query: "SELECT * FROM trigger_dev.raw_task_runs_payload_v1 WHERE run_id = {run_id:String}",
@@ -667,6 +657,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-update",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -682,6 +673,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -714,7 +706,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert a row into the table
       const uniqueFriendlyId = `run_update_${Date.now()}`;
       const taskRun = await prisma.taskRun.create({
         data: {
@@ -734,19 +725,15 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for initial replication
       await setTimeout(1000);
 
-      // Update the status field
       await prisma.taskRun.update({
         where: { id: taskRun.id },
         data: { status: TaskRunStatus.COMPLETED_SUCCESSFULLY },
       });
 
-      // Wait for replication
       await setTimeout(1000);
 
-      // Query ClickHouse for the replicated run
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication-update",
         query: "SELECT * FROM trigger_dev.task_runs_v2 FINAL WHERE run_id = {run_id:String}",
@@ -777,6 +764,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-delete",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -792,6 +780,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -824,7 +813,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert a row into the table
       const uniqueFriendlyId = `run_delete_${Date.now()}`;
       const taskRun = await prisma.taskRun.create({
         data: {
@@ -844,18 +832,14 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for initial replication
       await setTimeout(1000);
 
-      // Delete the TaskRun
       await prisma.taskRun.delete({
         where: { id: taskRun.id },
       });
 
-      // Wait for replication
       await setTimeout(1000);
 
-      // Query ClickHouse for the replicated run using FINAL
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication-delete",
         query: "SELECT * FROM trigger_dev.task_runs_v2 FINAL WHERE run_id = {run_id:String}",
@@ -880,6 +864,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-shutdown-handover",
+        logLevel: "warn",
       });
 
       // Service A
@@ -896,6 +881,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationServiceA.start();
@@ -928,13 +914,10 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert Run 1
       const run1Id = `run_shutdown_handover_1_${Date.now()}`;
 
-      // Initiate shutdown when the first insert message is received
       runsReplicationServiceA.events.on("message", async ({ message, service }) => {
         if (message.tag === "insert") {
-          // Initiate shutdown
           await service.shutdown();
         }
       });
@@ -957,7 +940,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert Run 2 after shutdown is initiated
       const run2Id = `run_shutdown_handover_2_${Date.now()}`;
       const taskRun2 = await prisma.taskRun.create({
         data: {
@@ -977,17 +959,13 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for flush to complete
       await setTimeout(1000);
 
-      // Query ClickHouse for both runs using FINAL
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication-shutdown-handover",
         query: "SELECT * FROM trigger_dev.task_runs_v2 FINAL ORDER BY created_at ASC",
         schema: z.any(),
       });
-
-      // Make sure only the first run is in ClickHouse
       const [queryError, result] = await queryRuns({});
       expect(queryError).toBeNull();
       expect(result?.length).toBe(1);
@@ -1007,11 +985,11 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationServiceB.start();
 
-      // Wait for replication
       await setTimeout(1000);
 
       const [queryErrorB, resultB] = await queryRuns({});
@@ -1037,6 +1015,7 @@ describe("RunsReplicationService (part 1/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-shutdown-after-processed",
+        logLevel: "warn",
       });
 
       // Service A
@@ -1053,6 +1032,7 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationServiceA.start();
@@ -1085,7 +1065,6 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Insert Run 1
       const run1Id = `run_shutdown_after_processed_${Date.now()}`;
       const taskRun1 = await prisma.taskRun.create({
         data: {
@@ -1105,10 +1084,8 @@ describe("RunsReplicationService (part 1/2)", () => {
         },
       });
 
-      // Wait for replication to ensure transaction is processed
       await setTimeout(1000);
 
-      // Query ClickHouse for the run using FINAL
       const queryRuns = clickhouse.reader.query({
         name: "runs-replication-shutdown-after-processed",
         query: "SELECT * FROM trigger_dev.task_runs_v2 FINAL WHERE run_id = {run_id:String}",
@@ -1121,12 +1098,10 @@ describe("RunsReplicationService (part 1/2)", () => {
       expect(resultA?.length).toBe(1);
       expect(resultA?.[0]).toEqual(expect.objectContaining({ run_id: taskRun1.id }));
 
-      // Shutdown after all transactions are processed
       await runsReplicationServiceA.shutdown();
 
-      await setTimeout(500); // Give a moment for shutdown
+      await setTimeout(500);
 
-      // Insert another run
       const taskRun2 = await prisma.taskRun.create({
         data: {
           friendlyId: `run_shutdown_after_processed_${Date.now()}`,
@@ -1159,13 +1134,13 @@ describe("RunsReplicationService (part 1/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationServiceB.start();
 
       await setTimeout(1000);
 
-      // Query ClickHouse for the second run
       const [queryErrorB, resultB] = await queryRuns({ run_id: taskRun2.id });
       expect(queryErrorB).toBeNull();
       expect(resultB?.length).toBe(1);
@@ -1174,4 +1149,200 @@ describe("RunsReplicationService (part 1/2)", () => {
       await runsReplicationServiceB.stop();
     }
   );
+
+  containerTest(
+    "should record metrics with correct values when replicating runs",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      await prisma.$executeRawUnsafe(`ALTER TABLE public."TaskRun" REPLICA IDENTITY FULL;`);
+
+      const clickhouse = new ClickHouse({
+        url: clickhouseContainer.getConnectionUrl(),
+        name: "runs-replication-metrics",
+        logLevel: "warn",
+      });
+
+      const { tracer } = createInMemoryTracing();
+      const metricsHelper = createInMemoryMetrics();
+
+      const runsReplicationService = new RunsReplicationService({
+        clickhouse,
+        pgConnectionUrl: postgresContainer.getConnectionUri(),
+        serviceName: "runs-replication-metrics",
+        slotName: "task_runs_to_clickhouse_v1",
+        publicationName: "task_runs_to_clickhouse_v1_publication",
+        redisOptions,
+        maxFlushConcurrency: 2,
+        flushIntervalMs: 100,
+        flushBatchSize: 5,
+        leaderLockTimeoutMs: 5000,
+        leaderLockExtendIntervalMs: 1000,
+        ackIntervalSeconds: 5,
+        tracer,
+        meter: metricsHelper.meter,
+        logLevel: "warn",
+      });
+
+      await runsReplicationService.start();
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test-metrics",
+          slug: "test-metrics",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test-metrics",
+          slug: "test-metrics",
+          organizationId: organization.id,
+          externalRef: "test-metrics",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test-metrics",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test-metrics",
+          pkApiKey: "test-metrics",
+          shortcode: "test-metrics",
+        },
+      });
+
+      const now = Date.now();
+      const createdRuns: string[] = [];
+
+      for (let i = 0; i < 5; i++) {
+        const run = await prisma.taskRun.create({
+          data: {
+            friendlyId: `run_metrics_${now}_${i}`,
+            taskIdentifier: "my-task-metrics",
+            payload: JSON.stringify({ index: i }),
+            payloadType: "application/json",
+            traceId: `metrics-${now}-${i}`,
+            spanId: `metrics-${now}-${i}`,
+            queue: "test-metrics",
+            runtimeEnvironmentId: runtimeEnvironment.id,
+            projectId: project.id,
+            organizationId: organization.id,
+            environmentType: "DEVELOPMENT",
+            engine: "V2",
+            status: "PENDING",
+          },
+        });
+        createdRuns.push(run.id);
+      }
+
+      await setTimeout(1000);
+
+      for (let i = 0; i < 3; i++) {
+        await prisma.taskRun.update({
+          where: { id: createdRuns[i] },
+          data: { status: "EXECUTING" },
+        });
+      }
+
+      await setTimeout(1000);
+
+      for (let i = 0; i < 2; i++) {
+        await prisma.taskRun.update({
+          where: { id: createdRuns[i] },
+          data: {
+            status: "COMPLETED_SUCCESSFULLY",
+            completedAt: new Date(),
+            output: JSON.stringify({ result: "success" }),
+            outputType: "application/json",
+          },
+        });
+      }
+
+      await setTimeout(1000);
+
+      const metrics = await metricsHelper.getMetrics();
+
+      function getMetricData(name: string) {
+        for (const resourceMetrics of metrics) {
+          for (const scopeMetrics of resourceMetrics.scopeMetrics) {
+            for (const metric of scopeMetrics.metrics) {
+              if (metric.descriptor.name === name) {
+                return metric;
+              }
+            }
+          }
+        }
+        return null;
+      }
+
+      function sumCounterValues(metric: any): number {
+        if (!metric?.dataPoints) return 0;
+        return metric.dataPoints.reduce((sum: number, dp: any) => sum + (dp.value || 0), 0);
+      }
+
+      function histogramHasData(metric: any): boolean {
+        if (!metric?.dataPoints || metric.dataPoints.length === 0) return false;
+        return metric.dataPoints.some((dp: any) => {
+          return (
+            (typeof dp.count === "number" && dp.count > 0) ||
+            (typeof dp.value?.count === "number" && dp.value.count > 0) ||
+            (Array.isArray(dp.buckets?.counts) && dp.buckets.counts.some((c: number) => c > 0)) ||
+            (typeof dp.sum === "number" && dp.sum > 0) ||
+            typeof dp.min === "number" ||
+            typeof dp.max === "number"
+          );
+        });
+      }
+
+      function getCounterAttributeValues(metric: any, attributeName: string): unknown[] {
+        if (!metric?.dataPoints) return [];
+        return metric.dataPoints
+          .filter((dp: any) => dp.attributes?.[attributeName] !== undefined)
+          .map((dp: any) => dp.attributes[attributeName]);
+      }
+
+      const batchesFlushed = getMetricData("runs_replication.batches_flushed");
+      expect(batchesFlushed).not.toBeNull();
+      const totalBatchesFlushed = sumCounterValues(batchesFlushed);
+      expect(totalBatchesFlushed).toBeGreaterThanOrEqual(1);
+
+      const successAttributeValues = getCounterAttributeValues(batchesFlushed, "success");
+      expect(successAttributeValues.length).toBeGreaterThanOrEqual(1);
+
+      const taskRunsInserted = getMetricData("runs_replication.task_runs_inserted");
+      expect(taskRunsInserted).not.toBeNull();
+      const totalTaskRunsInserted = sumCounterValues(taskRunsInserted);
+      expect(totalTaskRunsInserted).toBeGreaterThanOrEqual(5);
+
+      const payloadsInserted = getMetricData("runs_replication.payloads_inserted");
+      expect(payloadsInserted).not.toBeNull();
+      const totalPayloadsInserted = sumCounterValues(payloadsInserted);
+      expect(totalPayloadsInserted).toBeGreaterThanOrEqual(1);
+
+      const eventsProcessed = getMetricData("runs_replication.events_processed");
+      expect(eventsProcessed).not.toBeNull();
+      const totalEventsProcessed = sumCounterValues(eventsProcessed);
+      expect(totalEventsProcessed).toBeGreaterThanOrEqual(1);
+
+      const eventTypes = getCounterAttributeValues(eventsProcessed, "event_type");
+      expect(eventTypes.length).toBeGreaterThanOrEqual(1);
+      expect(eventTypes).toContain("insert");
+
+      const batchSize = getMetricData("runs_replication.batch_size");
+      expect(batchSize).not.toBeNull();
+      expect(histogramHasData(batchSize)).toBe(true);
+
+      const replicationLag = getMetricData("runs_replication.replication_lag_ms");
+      expect(replicationLag).not.toBeNull();
+      expect(histogramHasData(replicationLag)).toBe(true);
+
+      const flushDuration = getMetricData("runs_replication.flush_duration_ms");
+      expect(flushDuration).not.toBeNull();
+      expect(histogramHasData(flushDuration)).toBe(true);
+
+      await runsReplicationService.stop();
+      await metricsHelper.shutdown();
+    }
+  );
 });
diff --git a/apps/webapp/test/runsReplicationService.part2.test.ts b/apps/webapp/test/runsReplicationService.part2.test.ts
index cb04867f939..a93f99f246b 100644
--- a/apps/webapp/test/runsReplicationService.part2.test.ts
+++ b/apps/webapp/test/runsReplicationService.part2.test.ts
@@ -1,4 +1,4 @@
-import { ClickHouse } from "@internal/clickhouse";
+import { ClickHouse, getTaskRunField, getPayloadField } from "@internal/clickhouse";
 import { containerTest } from "@internal/testcontainers";
 import { Logger } from "@trigger.dev/core/logger";
 import { readFile } from "node:fs/promises";
@@ -18,6 +18,7 @@ describe("RunsReplicationService (part 2/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-shutdown-handover",
+        logLevel: "warn",
       });
 
       // Service A
@@ -35,7 +36,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockExtendIntervalMs: 1000,
         leaderLockAcquireAdditionalTimeMs: 10_000,
         ackIntervalSeconds: 5,
-        logger: new Logger("runs-replication-shutdown-handover-a", "debug"),
+        logger: new Logger("runs-replication-shutdown-handover-a", "warn"),
       });
 
       await runsReplicationServiceA.start();
@@ -55,7 +56,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockExtendIntervalMs: 1000,
         leaderLockAcquireAdditionalTimeMs: 10_000,
         ackIntervalSeconds: 5,
-        logger: new Logger("runs-replication-shutdown-handover-b", "debug"),
+        logger: new Logger("runs-replication-shutdown-handover-b", "warn"),
       });
 
       // Now we need to initiate starting the second service, and after 6 seconds, we need to shutdown the first service
@@ -147,6 +148,7 @@ describe("RunsReplicationService (part 2/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-stress-bulk-insert",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -162,7 +164,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
-        logger: new Logger("runs-replication-stress-bulk-insert", "info"),
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -261,6 +263,7 @@ describe("RunsReplicationService (part 2/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-stress-bulk-insert",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -276,7 +279,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
-        logger: new Logger("runs-replication-stress-bulk-insert", "info"),
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -381,6 +384,7 @@ describe("RunsReplicationService (part 2/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-multi-event-tx",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -396,6 +400,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -513,6 +518,7 @@ describe("RunsReplicationService (part 2/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-long-tx",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -528,7 +534,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
-        logger: new Logger("runs-replication-long-tx", "info"),
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -619,6 +625,7 @@ describe("RunsReplicationService (part 2/2)", () => {
       const clickhouse = new ClickHouse({
         url: clickhouseContainer.getConnectionUrl(),
         name: "runs-replication-stress-bulk-insert",
+        logLevel: "warn",
       });
 
       const runsReplicationService = new RunsReplicationService({
@@ -634,7 +641,7 @@ describe("RunsReplicationService (part 2/2)", () => {
         leaderLockTimeoutMs: 5000,
         leaderLockExtendIntervalMs: 1000,
         ackIntervalSeconds: 5,
-        logger: new Logger("runs-replication-stress-bulk-insert", "info"),
+        logLevel: "warn",
       });
 
       await runsReplicationService.start();
@@ -754,11 +761,6 @@ describe("RunsReplicationService (part 2/2)", () => {
       expect(queryError).toBeNull();
       expect(result?.length).toBe(10);
 
-      console.log("Data", {
-        runsData,
-        result,
-      });
-
       // Check a few random runs for correctness
       for (let i = 0; i < 9; i++) {
         const expected = runsData[i];
@@ -783,4 +785,652 @@ describe("RunsReplicationService (part 2/2)", () => {
       await runsReplicationService.stop();
     }
   );
+
+  containerTest(
+    "should merge duplicate event+run.id combinations keeping the latest version",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      await prisma.$executeRawUnsafe(`ALTER TABLE public.\"TaskRun\" REPLICA IDENTITY FULL;`);
+
+      const clickhouse = new ClickHouse({
+        url: clickhouseContainer.getConnectionUrl(),
+        name: "runs-replication-merge-batch",
+        logLevel: "warn",
+      });
+
+      const runsReplicationService = new RunsReplicationService({
+        clickhouse,
+        pgConnectionUrl: postgresContainer.getConnectionUri(),
+        serviceName: "runs-replication-merge-batch",
+        slotName: "task_runs_to_clickhouse_v1",
+        publicationName: "task_runs_to_clickhouse_v1_publication",
+        redisOptions,
+        maxFlushConcurrency: 1,
+        flushIntervalMs: 100,
+        flushBatchSize: 10, // Higher batch size to test merging
+        leaderLockTimeoutMs: 5000,
+        leaderLockExtendIntervalMs: 1000,
+        ackIntervalSeconds: 5,
+        logLevel: "warn",
+      });
+
+      // Listen to batchFlushed events to verify merging
+      const batchFlushedEvents: Array<{
+        flushId: string;
+        taskRunInserts: any[];
+        payloadInserts: any[];
+      }> = [];
+
+      runsReplicationService.events.on("batchFlushed", (event) => {
+        batchFlushedEvents.push(event);
+      });
+
+      await runsReplicationService.start();
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test-merge-batch",
+          slug: "test-merge-batch",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test-merge-batch",
+          slug: "test-merge-batch",
+          organizationId: organization.id,
+          externalRef: "test-merge-batch",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test-merge-batch",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test-merge-batch",
+          pkApiKey: "test-merge-batch",
+          shortcode: "test-merge-batch",
+        },
+      });
+
+      // Create a run and rapidly update it multiple times in a transaction
+      // This should create multiple events for the same run that get merged
+      const run = await prisma.taskRun.create({
+        data: {
+          friendlyId: `run_merge_${Date.now()}`,
+          taskIdentifier: "my-task-merge",
+          payload: JSON.stringify({ version: 1 }),
+          payloadType: "application/json",
+          traceId: `merge-${Date.now()}`,
+          spanId: `merge-${Date.now()}`,
+          queue: "test-merge-batch",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+          status: "PENDING_VERSION",
+        },
+      });
+      await prisma.taskRun.update({
+        where: { id: run.id },
+        data: { status: "DEQUEUED" },
+      });
+      await prisma.taskRun.update({
+        where: { id: run.id },
+        data: { status: "EXECUTING" },
+      });
+      await prisma.taskRun.update({
+        where: { id: run.id },
+        data: { status: "PAUSED" },
+      });
+      await prisma.taskRun.update({
+        where: { id: run.id },
+        data: { status: "EXECUTING" },
+      });
+      await prisma.taskRun.update({
+        where: { id: run.id },
+        data: { status: "COMPLETED_SUCCESSFULLY" },
+      });
+
+      await setTimeout(1000);
+
+      expect(batchFlushedEvents?.[0].taskRunInserts).toHaveLength(2);
+      // Use getTaskRunField for type-safe array access
+      expect(getTaskRunField(batchFlushedEvents![0].taskRunInserts[0], "run_id")).toEqual(run.id);
+      expect(getTaskRunField(batchFlushedEvents![0].taskRunInserts[0], "status")).toEqual(
+        "PENDING_VERSION"
+      );
+      expect(getTaskRunField(batchFlushedEvents![0].taskRunInserts[1], "run_id")).toEqual(run.id);
+      expect(getTaskRunField(batchFlushedEvents![0].taskRunInserts[1], "status")).toEqual(
+        "COMPLETED_SUCCESSFULLY"
+      );
+
+      await runsReplicationService.stop();
+    }
+  );
+
+  containerTest(
+    "should sort batch inserts according to table schema ordering for optimal performance",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      await prisma.$executeRawUnsafe(`ALTER TABLE public.\"TaskRun\" REPLICA IDENTITY FULL;`);
+
+      const clickhouse = new ClickHouse({
+        url: clickhouseContainer.getConnectionUrl(),
+        name: "runs-replication-sorting",
+        logLevel: "warn",
+      });
+
+      const runsReplicationService = new RunsReplicationService({
+        clickhouse,
+        pgConnectionUrl: postgresContainer.getConnectionUri(),
+        serviceName: "runs-replication-sorting",
+        slotName: "task_runs_to_clickhouse_v1",
+        publicationName: "task_runs_to_clickhouse_v1_publication",
+        redisOptions,
+        maxFlushConcurrency: 1,
+        flushIntervalMs: 100,
+        flushBatchSize: 10,
+        leaderLockTimeoutMs: 5000,
+        leaderLockExtendIntervalMs: 1000,
+        ackIntervalSeconds: 5,
+        logLevel: "warn",
+      });
+
+      // Listen to batchFlushed events to verify sorting
+      const batchFlushedEvents: Array<{
+        flushId: string;
+        taskRunInserts: any[];
+        payloadInserts: any[];
+      }> = [];
+
+      runsReplicationService.events.on("batchFlushed", (event) => {
+        batchFlushedEvents.push(event);
+      });
+
+      await runsReplicationService.start();
+
+      // Create two organizations to test sorting by organization_id
+      const org1 = await prisma.organization.create({
+        data: { title: "org-z", slug: "org-z" },
+      });
+
+      const org2 = await prisma.organization.create({
+        data: { title: "org-a", slug: "org-a" },
+      });
+
+      const project1 = await prisma.project.create({
+        data: {
+          name: "test-sorting-z",
+          slug: "test-sorting-z",
+          organizationId: org1.id,
+          externalRef: "test-sorting-z",
+        },
+      });
+
+      const project2 = await prisma.project.create({
+        data: {
+          name: "test-sorting-a",
+          slug: "test-sorting-a",
+          organizationId: org2.id,
+          externalRef: "test-sorting-a",
+        },
+      });
+
+      const env1 = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test-sorting-z",
+          type: "DEVELOPMENT",
+          projectId: project1.id,
+          organizationId: org1.id,
+          apiKey: "test-sorting-z",
+          pkApiKey: "test-sorting-z",
+          shortcode: "test-sorting-z",
+        },
+      });
+
+      const env2 = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test-sorting-a",
+          type: "DEVELOPMENT",
+          projectId: project2.id,
+          organizationId: org2.id,
+          apiKey: "test-sorting-a",
+          pkApiKey: "test-sorting-a",
+          shortcode: "test-sorting-a",
+        },
+      });
+
+      const now = Date.now();
+
+      const run1 = await prisma.taskRun.create({
+        data: {
+          friendlyId: `run_sort_org_z_${now}`,
+          taskIdentifier: "my-task-sort",
+          payload: JSON.stringify({ org: "z" }),
+          payloadType: "application/json",
+          traceId: `sort-z-${now}`,
+          spanId: `sort-z-${now}`,
+          queue: "test-sorting",
+          runtimeEnvironmentId: env1.id,
+          projectId: project1.id,
+          organizationId: org1.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+          status: "PENDING",
+          createdAt: new Date(now + 2000),
+        },
+      });
+      await prisma.taskRun.update({
+        where: { id: run1.id },
+        data: { status: "DEQUEUED" },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: `run_sort_org_a_${now}`,
+          taskIdentifier: "my-task-sort",
+          payload: JSON.stringify({ org: "a" }),
+          payloadType: "application/json",
+          traceId: `sort-a-${now}`,
+          spanId: `sort-a-${now}`,
+          queue: "test-sorting",
+          runtimeEnvironmentId: env2.id,
+          projectId: project2.id,
+          organizationId: org2.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+          status: "PENDING",
+          createdAt: new Date(now + 1000),
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: `run_sort_org_a_${now}_2`,
+          taskIdentifier: "my-task-sort",
+          payload: JSON.stringify({ org: "a" }),
+          payloadType: "application/json",
+          traceId: `sort-a-${now}`,
+          spanId: `sort-a-${now}`,
+          queue: "test-sorting",
+          runtimeEnvironmentId: env2.id,
+          projectId: project2.id,
+          organizationId: org2.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+          status: "PENDING",
+          createdAt: new Date(now),
+        },
+      });
+
+      await setTimeout(1000);
+
+      expect(batchFlushedEvents[0]?.taskRunInserts.length).toBeGreaterThan(1);
+      expect(batchFlushedEvents[0]?.payloadInserts.length).toBeGreaterThan(1);
+
+      // Verify sorting order: organization_id, project_id, environment_id, created_at, run_id
+      for (let i = 1; i < batchFlushedEvents[0]?.taskRunInserts.length; i++) {
+        const prev = batchFlushedEvents[0]!.taskRunInserts[i - 1];
+        const curr = batchFlushedEvents[0]!.taskRunInserts[i];
+
+        const prevKey = [
+          getTaskRunField(prev, "organization_id"),
+          getTaskRunField(prev, "project_id"),
+          getTaskRunField(prev, "environment_id"),
+          getTaskRunField(prev, "created_at"),
+          getTaskRunField(prev, "run_id"),
+        ];
+        const currKey = [
+          getTaskRunField(curr, "organization_id"),
+          getTaskRunField(curr, "project_id"),
+          getTaskRunField(curr, "environment_id"),
+          getTaskRunField(curr, "created_at"),
+          getTaskRunField(curr, "run_id"),
+        ];
+
+        const keysAreEqual = prevKey.every((val, idx) => val === currKey[idx]);
+        if (keysAreEqual) {
+          // Also valid order
+          continue;
+        }
+
+        // Compare tuples lexicographically
+        let isCorrectOrder = false;
+        for (let j = 0; j < prevKey.length; j++) {
+          if (prevKey[j] < currKey[j]) {
+            isCorrectOrder = true;
+            break;
+          }
+          if (prevKey[j] > currKey[j]) {
+            isCorrectOrder = false;
+            break;
+          }
+          // If equal, continue to next field
+        }
+
+        expect(isCorrectOrder).toBeTruthy();
+      }
+
+      // Verify payloadInserts are also sorted by run_id
+      for (let i = 1; i < batchFlushedEvents[0]?.payloadInserts.length; i++) {
+        const prev = batchFlushedEvents[0]!.payloadInserts[i - 1];
+        const curr = batchFlushedEvents[0]!.payloadInserts[i];
+        expect(getPayloadField(prev, "run_id") <= getPayloadField(curr, "run_id")).toBeTruthy();
+      }
+
+      await runsReplicationService.stop();
+    }
+  );
+
+  containerTest(
+    "should exhaustively replicate all TaskRun columns to ClickHouse",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      await prisma.$executeRawUnsafe(`ALTER TABLE public."TaskRun" REPLICA IDENTITY FULL;`);
+
+      const clickhouse = new ClickHouse({
+        url: clickhouseContainer.getConnectionUrl(),
+        name: "runs-replication-exhaustive",
+        logLevel: "warn",
+      });
+
+      const runsReplicationService = new RunsReplicationService({
+        clickhouse,
+        pgConnectionUrl: postgresContainer.getConnectionUri(),
+        serviceName: "runs-replication-exhaustive",
+        slotName: "task_runs_to_clickhouse_v1",
+        publicationName: "task_runs_to_clickhouse_v1_publication",
+        redisOptions,
+        maxFlushConcurrency: 1,
+        flushIntervalMs: 100,
+        flushBatchSize: 1,
+        leaderLockTimeoutMs: 5000,
+        leaderLockExtendIntervalMs: 1000,
+        ackIntervalSeconds: 5,
+        logLevel: "warn",
+      });
+
+      await runsReplicationService.start();
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test-exhaustive",
+          slug: "test-exhaustive",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test-exhaustive",
+          slug: "test-exhaustive",
+          organizationId: organization.id,
+          externalRef: "test-exhaustive",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test-exhaustive",
+          type: "PRODUCTION",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test-exhaustive",
+          pkApiKey: "test-exhaustive",
+          shortcode: "test-exhaustive",
+        },
+      });
+
+      // Create a batch for the batchId field
+      const batch = await prisma.batchTaskRun.create({
+        data: {
+          friendlyId: "batch_exhaustive",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          status: "PENDING",
+        },
+      });
+
+      // Create a root run for the rootTaskRunId field
+      const rootRun = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_root_exhaustive",
+          taskIdentifier: "root-task",
+          payload: JSON.stringify({ root: true }),
+          traceId: "root-trace-id",
+          spanId: "root-span-id",
+          queue: "root-queue",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "PRODUCTION",
+          engine: "V2",
+        },
+      });
+
+      // Create a parent run for the parentTaskRunId field
+      const parentRun = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_parent_exhaustive",
+          taskIdentifier: "parent-task",
+          payload: JSON.stringify({ parent: true }),
+          traceId: "parent-trace-id",
+          spanId: "parent-span-id",
+          queue: "parent-queue",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "PRODUCTION",
+          engine: "V2",
+          rootTaskRunId: rootRun.id,
+          depth: 1,
+        },
+      });
+
+      // Set up all the dates we'll use
+      const now = new Date();
+      const createdAt = new Date(now.getTime() - 10000);
+      const updatedAt = new Date(now.getTime() - 5000);
+      const startedAt = new Date(now.getTime() - 8000);
+      const executedAt = new Date(now.getTime() - 7500);
+      const completedAt = new Date(now.getTime() - 6000);
+      const delayUntil = new Date(now.getTime() - 9000);
+      const queuedAt = new Date(now.getTime() - 9500);
+      const expiredAt = null; // Not expired
+
+      // Create the main task run with ALL fields populated
+      const taskRun = await prisma.taskRun.create({
+        data: {
+          // Core identifiers
+          friendlyId: "run_exhaustive_test",
+          taskIdentifier: "exhaustive-task",
+
+          // Environment/project/org
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "PRODUCTION",
+
+          // Engine and execution
+          engine: "V2",
+          status: "COMPLETED_SUCCESSFULLY",
+          attemptNumber: 3,
+          queue: "exhaustive-queue",
+          workerQueue: "exhaustive-worker-queue",
+
+          // Relationships
+          // Note: scheduleId is not set to test empty string handling
+          batchId: batch.id,
+          rootTaskRunId: rootRun.id,
+          parentTaskRunId: parentRun.id,
+          depth: 2,
+
+          // Timestamps
+          createdAt,
+          updatedAt,
+          startedAt,
+          executedAt,
+          completedAt,
+          delayUntil,
+          queuedAt,
+          expiredAt,
+
+          // Payload and output
+          payload: JSON.stringify({ input: "test-payload" }),
+          payloadType: "application/json",
+          output: JSON.stringify({ result: "test-output" }),
+          outputType: "application/json",
+          error: { message: "test error", name: "TestError" },
+
+          // Tracing
+          traceId: "exhaustive-trace-id-12345",
+          spanId: "exhaustive-span-id-67890",
+
+          // Versioning
+          taskVersion: "1.2.3",
+          sdkVersion: "3.0.0",
+          cliVersion: "2.5.1",
+
+          // Execution settings
+          machinePreset: "large-1x",
+          idempotencyKey: "exhaustive-idempotency-key-hashed",
+          idempotencyKeyOptions: {
+            key: "exhaustive-idempotency-key",
+            scope: "run",
+          },
+          ttl: "1h",
+          isTest: true,
+          concurrencyKey: "exhaustive-concurrency-key",
+          maxDurationInSeconds: 3600,
+
+          // Tags and bulk actions
+          runTags: ["tag1", "tag2", "exhaustive-tag"],
+          bulkActionGroupIds: ["bulk-group-1", "bulk-group-2"],
+
+          // Usage metrics
+          usageDurationMs: 12345,
+          costInCents: 50,
+          baseCostInCents: 25,
+        },
+      });
+
+      // Wait for replication
+      await setTimeout(1500);
+
+      // Query ClickHouse directly to get all columns
+      const queryRuns = clickhouse.reader.query({
+        name: "exhaustive-replication-test",
+        query: "SELECT * FROM trigger_dev.task_runs_v2 FINAL WHERE run_id = {run_id:String}",
+        schema: z.any(),
+        params: z.object({ run_id: z.string() }),
+      });
+
+      const [queryError, result] = await queryRuns({ run_id: taskRun.id });
+
+      expect(queryError).toBeNull();
+      expect(result).toHaveLength(1);
+
+      const clickhouseRun = result![0];
+
+      // Exhaustively verify each column
+      // Core identifiers
+      expect(clickhouseRun.run_id).toBe(taskRun.id);
+      expect(clickhouseRun.friendly_id).toBe("run_exhaustive_test");
+      expect(clickhouseRun.task_identifier).toBe("exhaustive-task");
+
+      // Environment/project/org
+      expect(clickhouseRun.environment_id).toBe(runtimeEnvironment.id);
+      expect(clickhouseRun.project_id).toBe(project.id);
+      expect(clickhouseRun.organization_id).toBe(organization.id);
+      expect(clickhouseRun.environment_type).toBe("PRODUCTION");
+
+      // Engine and execution
+      expect(clickhouseRun.engine).toBe("V2");
+      expect(clickhouseRun.status).toBe("COMPLETED_SUCCESSFULLY");
+      expect(clickhouseRun.attempt).toBe(3);
+      expect(clickhouseRun.queue).toBe("exhaustive-queue");
+      expect(clickhouseRun.worker_queue).toBe("exhaustive-worker-queue");
+
+      // Relationships
+      expect(clickhouseRun.schedule_id).toBe(""); // Empty when not set
+      expect(clickhouseRun.batch_id).toBe(batch.id);
+      expect(clickhouseRun.root_run_id).toBe(rootRun.id);
+      expect(clickhouseRun.parent_run_id).toBe(parentRun.id);
+      expect(clickhouseRun.depth).toBe(2);
+
+      // Timestamps (ClickHouse returns DateTime64 as strings in UTC without 'Z' suffix)
+      // Helper to parse ClickHouse timestamp strings to milliseconds
+      function parseClickhouseTimestamp(ts: string | null): number | null {
+        if (ts === null || ts === "1970-01-01 00:00:00.000") return null;
+        return new Date(ts + "Z").getTime();
+      }
+
+      expect(parseClickhouseTimestamp(clickhouseRun.created_at)).toBe(createdAt.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.updated_at)).toBe(updatedAt.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.started_at)).toBe(startedAt.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.executed_at)).toBe(executedAt.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.completed_at)).toBe(completedAt.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.delay_until)).toBe(delayUntil.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.queued_at)).toBe(queuedAt.getTime());
+      expect(parseClickhouseTimestamp(clickhouseRun.expired_at)).toBeNull();
+
+      // Output (parsed JSON)
+      expect(clickhouseRun.output).toEqual({ data: { result: "test-output" } });
+
+      // Error
+      expect(clickhouseRun.error).toEqual({
+        data: { message: "test error", name: "TestError" },
+      });
+
+      // Tracing
+      expect(clickhouseRun.trace_id).toBe("exhaustive-trace-id-12345");
+      expect(clickhouseRun.span_id).toBe("exhaustive-span-id-67890");
+
+      // Versioning
+      expect(clickhouseRun.task_version).toBe("1.2.3");
+      expect(clickhouseRun.sdk_version).toBe("3.0.0");
+      expect(clickhouseRun.cli_version).toBe("2.5.1");
+
+      // Execution settings
+      expect(clickhouseRun.machine_preset).toBe("large-1x");
+      expect(clickhouseRun.idempotency_key).toBe("exhaustive-idempotency-key-hashed");
+      expect(clickhouseRun.idempotency_key_user).toBe("exhaustive-idempotency-key");
+      expect(clickhouseRun.idempotency_key_scope).toBe("run");
+      expect(clickhouseRun.expiration_ttl).toBe("1h");
+      expect(clickhouseRun.is_test).toBe(1); // ClickHouse returns booleans as integers
+      expect(clickhouseRun.concurrency_key).toBe("exhaustive-concurrency-key");
+      expect(clickhouseRun.max_duration_in_seconds).toBe(3600);
+
+      // Tags and bulk actions
+      expect(clickhouseRun.tags).toEqual(["tag1", "tag2", "exhaustive-tag"]);
+      expect(clickhouseRun.bulk_action_group_ids).toEqual(["bulk-group-1", "bulk-group-2"]);
+
+      // Usage metrics
+      expect(clickhouseRun.usage_duration_ms).toBe(12345);
+      expect(clickhouseRun.cost_in_cents).toBe(50);
+      expect(clickhouseRun.base_cost_in_cents).toBe(25);
+
+      // Internal ClickHouse columns
+      expect(clickhouseRun._is_deleted).toBe(0);
+      expect(clickhouseRun._version).toBeDefined();
+      expect(typeof clickhouseRun._version).toBe("number"); // ClickHouse returns UInt64 as number
+
+      // Also verify the payload was inserted into the payloads table
+      const queryPayloads = clickhouse.reader.query({
+        name: "exhaustive-payload-test",
+        query: "SELECT * FROM trigger_dev.raw_task_runs_payload_v1 WHERE run_id = {run_id:String}",
+        schema: z.any(),
+        params: z.object({ run_id: z.string() }),
+      });
+
+      const [payloadError, payloadResult] = await queryPayloads({ run_id: taskRun.id });
+
+      expect(payloadError).toBeNull();
+      expect(payloadResult).toHaveLength(1);
+      expect(payloadResult![0].run_id).toBe(taskRun.id);
+      expect(parseClickhouseTimestamp(payloadResult![0].created_at)).toBe(createdAt.getTime());
+      expect(payloadResult![0].payload).toEqual({ data: { input: "test-payload" } });
+
+      await runsReplicationService.stop();
+    }
+  );
 });
diff --git a/apps/webapp/test/runsRepository.part1.test.ts b/apps/webapp/test/runsRepository.part1.test.ts
new file mode 100644
index 00000000000..45d91ad44e7
--- /dev/null
+++ b/apps/webapp/test/runsRepository.part1.test.ts
@@ -0,0 +1,749 @@
+import { describe, expect, vi } from "vitest";
+
+// Mock the db prisma client
+vi.mock("~/db.server", () => ({
+  prisma: {},
+  $replica: {},
+}));
+
+import { containerTest } from "@internal/testcontainers";
+import { setTimeout } from "node:timers/promises";
+import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
+import { setupClickhouseReplication } from "./utils/replicationUtils";
+
+vi.setConfig({ testTimeout: 60_000 });
+
+describe("RunsRepository (part 1/2)", () => {
+  containerTest(
+    "should list runs, using clickhouse as the source",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Now we insert a row into the table
+      const taskRun = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_1234",
+          taskIdentifier: "my-task",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      const { runs, pagination } = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+      });
+
+      expect(runs).toHaveLength(1);
+      expect(runs[0].id).toBe(taskRun.id);
+      expect(pagination.nextCursor).toBe(null);
+      expect(pagination.previousCursor).toBe(null);
+    }
+  );
+
+  containerTest(
+    "should filter runs by task identifiers",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Create runs with different task identifiers
+      const taskRun1 = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_task1",
+          taskIdentifier: "task-1",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      const taskRun2 = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_task2",
+          taskIdentifier: "task-2",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1235",
+          spanId: "1235",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      const taskRun3 = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_task3",
+          taskIdentifier: "task-3",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1236",
+          spanId: "1236",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      // Test filtering by specific tasks
+      const { runs } = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        tasks: ["task-1", "task-2"],
+      });
+
+      expect(runs).toHaveLength(2);
+      expect(runs.map((r) => r.taskIdentifier).sort()).toEqual(["task-1", "task-2"]);
+    }
+  );
+
+  containerTest(
+    "should filter runs by task versions",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Create runs with different task versions
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_v1",
+          taskIdentifier: "my-task",
+          taskVersion: "1.0.0",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_v2",
+          taskIdentifier: "my-task",
+          taskVersion: "2.0.0",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1235",
+          spanId: "1235",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_v3",
+          taskIdentifier: "my-task",
+          taskVersion: "3.0.0",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1236",
+          spanId: "1236",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      // Test filtering by specific versions
+      const { runs } = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        versions: ["1.0.0", "3.0.0"],
+      });
+
+      expect(runs).toHaveLength(2);
+      expect(runs.map((r) => r.taskVersion).sort()).toEqual(["1.0.0", "3.0.0"]);
+    }
+  );
+
+  containerTest(
+    "should filter runs by status",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Create runs with different statuses
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_pending",
+          taskIdentifier: "my-task",
+          status: "PENDING",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_executing",
+          taskIdentifier: "my-task",
+          status: "EXECUTING",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1235",
+          spanId: "1235",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_completed",
+          taskIdentifier: "my-task",
+          status: "COMPLETED_SUCCESSFULLY",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1236",
+          spanId: "1236",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      // Test filtering by specific statuses
+      const { runs } = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        statuses: ["PENDING", "COMPLETED_SUCCESSFULLY"],
+      });
+
+      expect(runs).toHaveLength(2);
+      expect(runs.map((r) => r.status).sort()).toEqual(["COMPLETED_SUCCESSFULLY", "PENDING"]);
+    }
+  );
+
+  containerTest(
+    "should filter runs by tags",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Create runs with different tags
+      const taskRun1 = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_urgent",
+          taskIdentifier: "my-task",
+          runTags: ["urgent", "production"],
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      const taskRun2 = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_regular",
+          taskIdentifier: "my-task",
+          runTags: ["regular", "development"],
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1235",
+          spanId: "1235",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      const taskRun3 = await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_urgent_dev",
+          taskIdentifier: "my-task",
+          runTags: ["urgent", "development"],
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1236",
+          spanId: "1236",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      // Test filtering by tags
+      const { runs } = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        tags: ["urgent"],
+      });
+
+      expect(runs).toHaveLength(2);
+      expect(runs.map((r) => r.friendlyId).sort()).toEqual(["run_urgent", "run_urgent_dev"]);
+    }
+  );
+
+  containerTest(
+    "should filter runs by scheduleId",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Create runs with different schedule IDs
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_scheduled_1",
+          taskIdentifier: "my-task",
+          scheduleId: "schedule_1",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_scheduled_2",
+          taskIdentifier: "my-task",
+          scheduleId: "schedule_2",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1235",
+          spanId: "1235",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_unscheduled",
+          taskIdentifier: "my-task",
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1236",
+          spanId: "1236",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      // Test filtering by schedule ID
+      const { runs } = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        scheduleId: "schedule_1",
+      });
+
+      expect(runs).toHaveLength(1);
+      expect(runs[0].friendlyId).toBe("run_scheduled_1");
+    }
+  );
+
+  containerTest(
+    "should filter runs by isTest flag",
+    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
+      const { clickhouse } = await setupClickhouseReplication({
+        prisma,
+        databaseUrl: postgresContainer.getConnectionUri(),
+        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
+        redisOptions,
+      });
+
+      const organization = await prisma.organization.create({
+        data: {
+          title: "test",
+          slug: "test",
+        },
+      });
+
+      const project = await prisma.project.create({
+        data: {
+          name: "test",
+          slug: "test",
+          organizationId: organization.id,
+          externalRef: "test",
+        },
+      });
+
+      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          slug: "test",
+          type: "DEVELOPMENT",
+          projectId: project.id,
+          organizationId: organization.id,
+          apiKey: "test",
+          pkApiKey: "test",
+          shortcode: "test",
+        },
+      });
+
+      // Create test and non-test runs
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_test",
+          taskIdentifier: "my-task",
+          isTest: true,
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1234",
+          spanId: "1234",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await prisma.taskRun.create({
+        data: {
+          friendlyId: "run_production",
+          taskIdentifier: "my-task",
+          isTest: false,
+          payload: JSON.stringify({ foo: "bar" }),
+          traceId: "1235",
+          spanId: "1235",
+          queue: "test",
+          runtimeEnvironmentId: runtimeEnvironment.id,
+          projectId: project.id,
+          organizationId: organization.id,
+          environmentType: "DEVELOPMENT",
+          engine: "V2",
+        },
+      });
+
+      await setTimeout(1000);
+
+      const runsRepository = new RunsRepository({
+        prisma,
+        clickhouse,
+      });
+
+      // Test filtering by isTest=true
+      const testRuns = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        isTest: true,
+      });
+
+      expect(testRuns.runs).toHaveLength(1);
+      expect(testRuns.runs[0].friendlyId).toBe("run_test");
+
+      // Test filtering by isTest=false
+      const productionRuns = await runsRepository.listRuns({
+        page: { size: 10 },
+        projectId: project.id,
+        environmentId: runtimeEnvironment.id,
+        organizationId: organization.id,
+        isTest: false,
+      });
+
+      expect(productionRuns.runs).toHaveLength(1);
+      expect(productionRuns.runs[0].friendlyId).toBe("run_production");
+    }
+  );
+});
\ No newline at end of file
diff --git a/apps/webapp/test/runsRepository.test.ts b/apps/webapp/test/runsRepository.part2.test.ts
similarity index 51%
rename from apps/webapp/test/runsRepository.test.ts
rename to apps/webapp/test/runsRepository.part2.test.ts
index 56e6bf92d6e..5fbe80ce52e 100644
--- a/apps/webapp/test/runsRepository.test.ts
+++ b/apps/webapp/test/runsRepository.part2.test.ts
@@ -1,744 +1,19 @@
+import { describe, expect, vi } from "vitest";
+
+// Mock the db prisma client
+vi.mock("~/db.server", () => ({
+  prisma: {},
+  $replica: {},
+}));
+
 import { containerTest } from "@internal/testcontainers";
 import { setTimeout } from "node:timers/promises";
-import { RunsRepository } from "~/services/runsRepository.server";
+import { RunsRepository } from "~/services/runsRepository/runsRepository.server";
 import { setupClickhouseReplication } from "./utils/replicationUtils";
 
 vi.setConfig({ testTimeout: 60_000 });
 
-describe("RunsRepository", () => {
-  containerTest(
-    "should list runs, using clickhouse as the source",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Now we insert a row into the table
-      const taskRun = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_1234",
-          taskIdentifier: "my-task",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      const { runs, pagination } = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-      });
-
-      expect(runs).toHaveLength(1);
-      expect(runs[0].id).toBe(taskRun.id);
-      expect(pagination.nextCursor).toBe(null);
-      expect(pagination.previousCursor).toBe(null);
-    }
-  );
-
-  containerTest(
-    "should filter runs by task identifiers",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Create runs with different task identifiers
-      const taskRun1 = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_task1",
-          taskIdentifier: "task-1",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      const taskRun2 = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_task2",
-          taskIdentifier: "task-2",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1235",
-          spanId: "1235",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      const taskRun3 = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_task3",
-          taskIdentifier: "task-3",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1236",
-          spanId: "1236",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      // Test filtering by specific tasks
-      const { runs } = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        tasks: ["task-1", "task-2"],
-      });
-
-      expect(runs).toHaveLength(2);
-      expect(runs.map((r) => r.taskIdentifier).sort()).toEqual(["task-1", "task-2"]);
-    }
-  );
-
-  containerTest(
-    "should filter runs by task versions",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Create runs with different task versions
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_v1",
-          taskIdentifier: "my-task",
-          taskVersion: "1.0.0",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_v2",
-          taskIdentifier: "my-task",
-          taskVersion: "2.0.0",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1235",
-          spanId: "1235",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_v3",
-          taskIdentifier: "my-task",
-          taskVersion: "3.0.0",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1236",
-          spanId: "1236",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      // Test filtering by specific versions
-      const { runs } = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        versions: ["1.0.0", "3.0.0"],
-      });
-
-      expect(runs).toHaveLength(2);
-      expect(runs.map((r) => r.taskVersion).sort()).toEqual(["1.0.0", "3.0.0"]);
-    }
-  );
-
-  containerTest(
-    "should filter runs by status",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Create runs with different statuses
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_pending",
-          taskIdentifier: "my-task",
-          status: "PENDING",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_executing",
-          taskIdentifier: "my-task",
-          status: "EXECUTING",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1235",
-          spanId: "1235",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_completed",
-          taskIdentifier: "my-task",
-          status: "COMPLETED_SUCCESSFULLY",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1236",
-          spanId: "1236",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      // Test filtering by specific statuses
-      const { runs } = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        statuses: ["PENDING", "COMPLETED_SUCCESSFULLY"],
-      });
-
-      expect(runs).toHaveLength(2);
-      expect(runs.map((r) => r.status).sort()).toEqual(["COMPLETED_SUCCESSFULLY", "PENDING"]);
-    }
-  );
-
-  containerTest(
-    "should filter runs by tags",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Create runs with different tags
-      const taskRun1 = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_urgent",
-          taskIdentifier: "my-task",
-          runTags: ["urgent", "production"],
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      const taskRun2 = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_regular",
-          taskIdentifier: "my-task",
-          runTags: ["regular", "development"],
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1235",
-          spanId: "1235",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      const taskRun3 = await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_urgent_dev",
-          taskIdentifier: "my-task",
-          runTags: ["urgent", "development"],
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1236",
-          spanId: "1236",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      // Test filtering by tags
-      const { runs } = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        tags: ["urgent"],
-      });
-
-      expect(runs).toHaveLength(2);
-      expect(runs.map((r) => r.friendlyId).sort()).toEqual(["run_urgent", "run_urgent_dev"]);
-    }
-  );
-
-  containerTest(
-    "should filter runs by scheduleId",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Create runs with different schedule IDs
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_scheduled_1",
-          taskIdentifier: "my-task",
-          scheduleId: "schedule_1",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_scheduled_2",
-          taskIdentifier: "my-task",
-          scheduleId: "schedule_2",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1235",
-          spanId: "1235",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_unscheduled",
-          taskIdentifier: "my-task",
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1236",
-          spanId: "1236",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      // Test filtering by schedule ID
-      const { runs } = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        scheduleId: "schedule_1",
-      });
-
-      expect(runs).toHaveLength(1);
-      expect(runs[0].friendlyId).toBe("run_scheduled_1");
-    }
-  );
-
-  containerTest(
-    "should filter runs by isTest flag",
-    async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
-      const { clickhouse } = await setupClickhouseReplication({
-        prisma,
-        databaseUrl: postgresContainer.getConnectionUri(),
-        clickhouseUrl: clickhouseContainer.getConnectionUrl(),
-        redisOptions,
-      });
-
-      const organization = await prisma.organization.create({
-        data: {
-          title: "test",
-          slug: "test",
-        },
-      });
-
-      const project = await prisma.project.create({
-        data: {
-          name: "test",
-          slug: "test",
-          organizationId: organization.id,
-          externalRef: "test",
-        },
-      });
-
-      const runtimeEnvironment = await prisma.runtimeEnvironment.create({
-        data: {
-          slug: "test",
-          type: "DEVELOPMENT",
-          projectId: project.id,
-          organizationId: organization.id,
-          apiKey: "test",
-          pkApiKey: "test",
-          shortcode: "test",
-        },
-      });
-
-      // Create test and non-test runs
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_test",
-          taskIdentifier: "my-task",
-          isTest: true,
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1234",
-          spanId: "1234",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await prisma.taskRun.create({
-        data: {
-          friendlyId: "run_production",
-          taskIdentifier: "my-task",
-          isTest: false,
-          payload: JSON.stringify({ foo: "bar" }),
-          traceId: "1235",
-          spanId: "1235",
-          queue: "test",
-          runtimeEnvironmentId: runtimeEnvironment.id,
-          projectId: project.id,
-          organizationId: organization.id,
-          environmentType: "DEVELOPMENT",
-          engine: "V2",
-        },
-      });
-
-      await setTimeout(1000);
-
-      const runsRepository = new RunsRepository({
-        prisma,
-        clickhouse,
-      });
-
-      // Test filtering by isTest=true
-      const testRuns = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        isTest: true,
-      });
-
-      expect(testRuns.runs).toHaveLength(1);
-      expect(testRuns.runs[0].friendlyId).toBe("run_test");
-
-      // Test filtering by isTest=false
-      const productionRuns = await runsRepository.listRuns({
-        page: { size: 10 },
-        projectId: project.id,
-        environmentId: runtimeEnvironment.id,
-        organizationId: organization.id,
-        isTest: false,
-      });
-
-      expect(productionRuns.runs).toHaveLength(1);
-      expect(productionRuns.runs[0].friendlyId).toBe("run_production");
-    }
-  );
-
+describe("RunsRepository (part 2/2)", () => {
   containerTest(
     "should filter runs by rootOnly flag",
     async ({ clickhouseContainer, redisOptions, postgresContainer, prisma }) => {
@@ -1514,4 +789,4 @@ describe("RunsRepository", () => {
       expect(secondPage.pagination.previousCursor).toBeTruthy();
     }
   );
-});
+});
\ No newline at end of file
diff --git a/apps/webapp/test/utils/tracing.ts b/apps/webapp/test/utils/tracing.ts
index 591e27120a0..09500a6c354 100644
--- a/apps/webapp/test/utils/tracing.ts
+++ b/apps/webapp/test/utils/tracing.ts
@@ -1,12 +1,19 @@
 import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
 import { InMemorySpanExporter, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
-import { context, trace } from "@opentelemetry/api";
+import { trace } from "@opentelemetry/api";
+import {
+  MeterProvider,
+  InMemoryMetricExporter,
+  PeriodicExportingMetricReader,
+  AggregationTemporality,
+} from "@opentelemetry/sdk-metrics";
 
 export function createInMemoryTracing() {
   // Initialize the tracer provider and exporter
-  const provider = new NodeTracerProvider();
   const exporter = new InMemorySpanExporter();
-  provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+  const provider = new NodeTracerProvider({
+    spanProcessors: [new SimpleSpanProcessor(exporter)],
+  });
   provider.register();
 
   // Retrieve the tracer
@@ -17,3 +24,42 @@ export function createInMemoryTracing() {
     tracer,
   };
 }
+
+export function createInMemoryMetrics() {
+  // Initialize the metric exporter with cumulative temporality for easier testing
+  const metricExporter = new InMemoryMetricExporter(AggregationTemporality.CUMULATIVE);
+
+  // Create a metric reader that exports frequently for testing
+  const metricReader = new PeriodicExportingMetricReader({
+    exporter: metricExporter,
+    exportIntervalMillis: 100, // Export frequently for tests
+  });
+
+  // Initialize the meter provider
+  const meterProvider = new MeterProvider({
+    readers: [metricReader],
+  });
+
+  // Retrieve a meter
+  const meter = meterProvider.getMeter("test-meter");
+
+  return {
+    metricExporter,
+    metricReader,
+    meterProvider,
+    meter,
+    // Helper to force collection and get metrics
+    async getMetrics() {
+      await metricReader.forceFlush();
+      return metricExporter.getMetrics();
+    },
+    // Helper to reset metrics between tests
+    reset() {
+      metricExporter.reset();
+    },
+    // Helper to shutdown the meter provider
+    async shutdown() {
+      await meterProvider.shutdown();
+    },
+  };
+}
diff --git a/apps/webapp/test/vercelUrls.test.ts b/apps/webapp/test/vercelUrls.test.ts
new file mode 100644
index 00000000000..9e3d81630f1
--- /dev/null
+++ b/apps/webapp/test/vercelUrls.test.ts
@@ -0,0 +1,56 @@
+import { describe, it, expect } from "vitest";
+import { sanitizeVercelNextUrl } from "../app/v3/vercel/vercelUrls.server";
+
+describe("sanitizeVercelNextUrl", () => {
+  it("returns undefined for null/undefined/empty", () => {
+    expect(sanitizeVercelNextUrl(null)).toBeUndefined();
+    expect(sanitizeVercelNextUrl(undefined)).toBeUndefined();
+    expect(sanitizeVercelNextUrl("")).toBeUndefined();
+  });
+
+  it("allows relative paths", () => {
+    expect(sanitizeVercelNextUrl("/dashboard")).toBe("/dashboard");
+    expect(sanitizeVercelNextUrl("/some/path?query=1")).toBe("/some/path?query=1");
+  });
+
+  it("rejects protocol-relative URLs", () => {
+    expect(sanitizeVercelNextUrl("//evil.com/path")).toBeUndefined();
+  });
+
+  it("allows vercel.com URLs", () => {
+    expect(sanitizeVercelNextUrl("https://vercel.com/dashboard")).toBe(
+      "https://vercel.com/dashboard"
+    );
+    expect(sanitizeVercelNextUrl("https://app.vercel.com/settings")).toBe(
+      "https://app.vercel.com/settings"
+    );
+  });
+
+  it("allows vercel.com subdomains", () => {
+    expect(sanitizeVercelNextUrl("https://my-team.vercel.com/project")).toBe(
+      "https://my-team.vercel.com/project"
+    );
+  });
+
+  it("rejects non-vercel HTTPS URLs", () => {
+    expect(sanitizeVercelNextUrl("https://evil.com/path")).toBeUndefined();
+    expect(sanitizeVercelNextUrl("https://not-vercel.com")).toBeUndefined();
+    expect(sanitizeVercelNextUrl("https://vercel.com.evil.com")).toBeUndefined();
+  });
+
+  it("rejects HTTP vercel.com URLs", () => {
+    expect(sanitizeVercelNextUrl("http://vercel.com/dashboard")).toBeUndefined();
+  });
+
+  it("rejects javascript: URLs", () => {
+    expect(sanitizeVercelNextUrl("javascript:alert(1)")).toBeUndefined();
+  });
+
+  it("rejects data: URLs", () => {
+    expect(sanitizeVercelNextUrl("data:text/html,<script>alert(1)</script>")).toBeUndefined();
+  });
+
+  it("rejects invalid URLs", () => {
+    expect(sanitizeVercelNextUrl("not a url at all")).toBeUndefined();
+  });
+});
diff --git a/apps/webapp/tsconfig.check.json b/apps/webapp/tsconfig.check.json
index 091b4ddb36a..cb73affedf9 100644
--- a/apps/webapp/tsconfig.check.json
+++ b/apps/webapp/tsconfig.check.json
@@ -9,5 +9,6 @@
       "@/*": ["./*"]
     },
     "customConditions": []
-  }
+  },
+  "exclude": ["**/*.test.ts", "**/*.test.tsx"]
 }
diff --git a/apps/webapp/tsconfig.json b/apps/webapp/tsconfig.json
index a10eda99cfb..36944e395b6 100644
--- a/apps/webapp/tsconfig.json
+++ b/apps/webapp/tsconfig.json
@@ -2,7 +2,7 @@
   "exclude": ["./cypress", "./cypress.config.ts"],
   "include": ["remix.env.d.ts", "global.d.ts", "**/*.ts", "**/*.tsx"],
   "compilerOptions": {
-    "types": ["vitest/globals"],
+    "types": ["vitest/globals", "node"],
     "lib": ["DOM", "DOM.Iterable", "DOM.AsyncIterable", "ES2020"],
     "isolatedModules": true,
     "esModuleInterop": true,
diff --git a/apps/webapp/upload-sourcemaps.sh b/apps/webapp/upload-sourcemaps.sh
new file mode 100755
index 00000000000..699399e4bd2
--- /dev/null
+++ b/apps/webapp/upload-sourcemaps.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -eo pipefail
+
+if [ -n "$SENTRY_ORG" ] && [ -n "$SENTRY_PROJECT" ] && [ -n "$SENTRY_AUTH_TOKEN" ] && [ -n "$SENTRY_RELEASE" ]; then
+  sentry-cli releases new $SENTRY_RELEASE
+  sentry-cli sourcemaps inject ./build
+  sentry-cli sourcemaps upload ./build --release $SENTRY_RELEASE
+  # Now we need to delete the sourcemaps from the build directory
+  rm -rf ./build/*.map
+else
+  echo "Skipping sourcemap upload: Missing required environment variables"
+  echo "Required: SENTRY_ORG, SENTRY_PROJECT, SENTRY_AUTH_TOKEN, SENTRY_RELEASE"
+fi
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 62343b652e9..a6444bc7633 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_IMAGE=node:20.11.1-bullseye-slim@sha256:5a5a92b3a8d392691c983719dbdc65d9f30085d6dcd65376e7a32e6fe9bf4cbe
+ARG NODE_IMAGE=node:20.20-bullseye-slim@sha256:d6c3903e556d4161f63af4550e76244908b6668e1a7d2983eff4873a0c2b0413
 
 FROM golang:1.23-alpine AS goose_builder
 RUN go install github.com/pressly/goose/v3/cmd/goose@latest
@@ -8,7 +8,7 @@ FROM ${NODE_IMAGE} AS pruner
 WORKDIR /triggerdotdev
 
 COPY --chown=node:node . .
-RUN npx -q turbo@1.10.9 prune --scope=webapp --docker
+RUN npx -q turbo@2.5.4 prune --scope=webapp --docker
 RUN find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
 
 # Base strategy to have layer caching
@@ -19,32 +19,41 @@ COPY --chown=node:node .gitignore .gitignore
 COPY --from=pruner --chown=node:node /triggerdotdev/out/json/ .
 COPY --from=pruner --chown=node:node /triggerdotdev/out/pnpm-lock.yaml ./pnpm-lock.yaml
 COPY --from=pruner --chown=node:node /triggerdotdev/out/pnpm-workspace.yaml ./pnpm-workspace.yaml
+COPY --chown=node:node patches ./patches
 
 ## Dev deps
 FROM base AS dev-deps
 WORKDIR /triggerdotdev
-# Corepack is used to install pnpm
-RUN corepack enable
-ENV NODE_ENV development
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --ignore-scripts --no-frozen-lockfile
+# Corepack is used to install pnpm with the exact version from packageManager
+RUN corepack enable && corepack prepare pnpm@10.23.0 --activate
+ENV NODE_ENV=development
+RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --no-frozen-lockfile
+# Generate Prisma client here where all deps are installed
+COPY --from=pruner --chown=node:node /triggerdotdev/internal-packages/database/prisma/schema.prisma /triggerdotdev/internal-packages/database/prisma/schema.prisma
+RUN pnpx prisma@6.14.0 generate --schema /triggerdotdev/internal-packages/database/prisma/schema.prisma
 
 ## Production deps
 FROM base AS production-deps
 WORKDIR /triggerdotdev
-# Corepack is used to install pnpm
-RUN corepack enable
-ENV NODE_ENV production
+# Corepack is used to install pnpm with the exact version from packageManager
+RUN corepack enable && corepack prepare pnpm@10.23.0 --activate
+ENV NODE_ENV=production
 RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpm install --prod --no-frozen-lockfile
-COPY --from=pruner --chown=node:node /triggerdotdev/internal-packages/database/prisma/schema.prisma /triggerdotdev/internal-packages/database/prisma/schema.prisma
-# RUN pnpm add @prisma/client@5.1.1 -w
-ENV NPM_CONFIG_IGNORE_WORKSPACE_ROOT_CHECK true
-RUN --mount=type=cache,id=pnpm,target=/root/.local/share/pnpm/store pnpx prisma@5.4.1 generate --schema /triggerdotdev/internal-packages/database/prisma/schema.prisma
 
 ## Builder (builds the webapp)
 FROM base AS builder
+# This is needed for the sentry-cli binary while building the webapp
+RUN apt-get update && apt-get install -y openssl dumb-init ca-certificates
 WORKDIR /triggerdotdev
-# Corepack is used to install pnpm
-RUN corepack enable
+# Corepack is used to install pnpm with the exact version from packageManager
+RUN corepack enable && corepack prepare pnpm@10.23.0 --activate
+
+ARG SENTRY_RELEASE
+ARG SENTRY_ORG
+ARG SENTRY_PROJECT
+ENV SENTRY_RELEASE=${SENTRY_RELEASE} \
+    SENTRY_ORG=${SENTRY_ORG} \
+    SENTRY_PROJECT=${SENTRY_PROJECT}
 
 # Goose and schemas
 COPY --from=goose_builder /go/bin/goose /usr/local/bin/goose
@@ -60,21 +69,24 @@ RUN chmod +x ./scripts/entrypoint.sh
 COPY --chown=node:node .configs/tsconfig.base.json .configs/tsconfig.base.json
 COPY --chown=node:node scripts/updateVersion.ts scripts/updateVersion.ts
 RUN pnpm run generate
-RUN pnpm run build --filter=webapp...
+RUN --mount=type=secret,id=sentry_auth_token \
+    SENTRY_AUTH_TOKEN=$(cat /run/secrets/sentry_auth_token) \
+    pnpm run build --filter=webapp...
 
 # Runner
 FROM ${NODE_IMAGE} AS runner
 RUN apt-get update && apt-get install -y openssl netcat-openbsd ca-certificates
 WORKDIR /triggerdotdev
-ENV NODE_ENV production
+ENV NODE_ENV=production
 
 COPY --from=base /usr/bin/dumb-init /usr/bin/dumb-init
 COPY --from=pruner --chown=node:node /triggerdotdev/out/full/ .
 COPY --from=production-deps --chown=node:node /triggerdotdev .
+# Copy generated Prisma client from dev-deps
+COPY --from=dev-deps --chown=node:node /triggerdotdev/internal-packages/database/generated ./internal-packages/database/generated
 COPY --from=builder --chown=node:node /triggerdotdev/apps/webapp/build/server.js ./apps/webapp/build/server.js
 COPY --from=builder --chown=node:node /triggerdotdev/apps/webapp/build ./apps/webapp/build
 COPY --from=builder --chown=node:node /triggerdotdev/apps/webapp/public ./apps/webapp/public
-COPY --from=builder --chown=node:node /triggerdotdev/apps/webapp/prisma/seed.js ./apps/webapp/prisma/seed.js
 COPY --from=builder --chown=node:node /triggerdotdev/scripts ./scripts
 
 # Goose and schemas
@@ -94,11 +106,11 @@ ENV BUILD_APP_VERSION=${BUILD_APP_VERSION} \
 EXPOSE 3000
 
 # Add global pnpm shims and install pnpm during build (root user)
-RUN corepack enable && corepack prepare --activate
+RUN corepack enable && corepack prepare pnpm@10.23.0 --activate
 
 USER node
 
 # Ensure pnpm is installed during build and not silently downloaded at runtime (node user)
-RUN corepack prepare --activate
+RUN corepack prepare pnpm@10.23.0 --activate
 
-CMD ["./scripts/entrypoint.sh"]
+CMD ["./scripts/entrypoint.sh"]
\ No newline at end of file
diff --git a/docker/config/grafana/provisioning/dashboards/batch-queue.json b/docker/config/grafana/provisioning/dashboards/batch-queue.json
new file mode 100644
index 00000000000..1c154b43fe9
--- /dev/null
+++ b/docker/config/grafana/provisioning/dashboards/batch-queue.json
@@ -0,0 +1,710 @@
+{
+  "annotations": {
+    "list": []
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 1,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 0 },
+      "id": 1,
+      "panels": [],
+      "title": "Processing Health",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 0, "y": 1 },
+      "id": 2,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_items_processed_total[5m]))",
+          "legendFormat": "Items/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Items Processed Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 6, "y": 1 },
+      "id": 3,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_items_failed_total[5m]))",
+          "legendFormat": "Failed/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Items Failed Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "max": 1,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "red", "value": null },
+              { "color": "yellow", "value": 0.9 },
+              { "color": "green", "value": 0.95 }
+            ]
+          },
+          "unit": "percentunit"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 12, "y": 1 },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_items_processed_total[5m])) / (sum(rate(triggerdotdev_batch_queue_items_processed_total[5m])) + sum(rate(triggerdotdev_batch_queue_items_failed_total[5m])))",
+          "legendFormat": "Success Rate",
+          "refId": "A"
+        }
+      ],
+      "title": "Success Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 18, "y": 1 },
+      "id": 5,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_batches_completed_total[5m]))",
+          "legendFormat": "Batches/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Batches Completed Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 7 },
+      "id": 6,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_items_processed_total[5m])) by (envId)",
+          "legendFormat": "Processed - {{envId}}",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_items_failed_total[5m])) by (envId)",
+          "legendFormat": "Failed - {{envId}}",
+          "refId": "B"
+        }
+      ],
+      "title": "Items Processed/Failed by Environment",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 7 },
+      "id": 7,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_batches_enqueued_total[5m]))",
+          "legendFormat": "Enqueued",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_batches_completed_total[5m]))",
+          "legendFormat": "Completed",
+          "refId": "B"
+        }
+      ],
+      "title": "Batches Enqueued vs Completed",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 15 },
+      "id": 8,
+      "panels": [],
+      "title": "Latency",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 16 },
+      "id": 9,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.50, sum(rate(triggerdotdev_batch_queue_item_queue_time_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.95, sum(rate(triggerdotdev_batch_queue_item_queue_time_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p95",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(triggerdotdev_batch_queue_item_queue_time_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p99",
+          "refId": "C"
+        }
+      ],
+      "title": "Item Queue Time (time from enqueue to processing)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 16 },
+      "id": 10,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.50, sum(rate(triggerdotdev_batch_queue_batch_processing_duration_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.95, sum(rate(triggerdotdev_batch_queue_batch_processing_duration_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p95",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(triggerdotdev_batch_queue_batch_processing_duration_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p99",
+          "refId": "C"
+        }
+      ],
+      "title": "Batch Processing Duration (creation to completion)",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 24 },
+      "id": 11,
+      "panels": [],
+      "title": "Queue Depth",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 8, "x": 0, "y": 25 },
+      "id": 12,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(triggerdotdev_batch_queue_inflight_count_messages)",
+          "legendFormat": "In-flight",
+          "refId": "A"
+        }
+      ],
+      "title": "Messages In-Flight",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 8, "x": 8, "y": 25 },
+      "id": 13,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(triggerdotdev_batch_queue_master_queue_length_queues)",
+          "legendFormat": "Active Queues",
+          "refId": "A"
+        }
+      ],
+      "title": "Active Queues in Master Queue",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 1 },
+              { "color": "red", "value": 10 }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 8, "x": 16, "y": 25 },
+      "id": 14,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(triggerdotdev_batch_queue_dlq_length_messages)",
+          "legendFormat": "DLQ Size",
+          "refId": "A"
+        }
+      ],
+      "title": "Dead Letter Queue (should be 0)",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 33 },
+      "id": 15,
+      "panels": [],
+      "title": "FairQueue Internals",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 34 },
+      "id": 16,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_messages_completed_total[5m]))",
+          "legendFormat": "Completed",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_messages_failed_total[5m]))",
+          "legendFormat": "Failed",
+          "refId": "B"
+        },
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_messages_retried_total[5m]))",
+          "legendFormat": "Retried",
+          "refId": "C"
+        }
+      ],
+      "title": "FairQueue Message Processing",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 34 },
+      "id": 17,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.50, sum(rate(triggerdotdev_batch_queue_message_processing_time_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.95, sum(rate(triggerdotdev_batch_queue_message_processing_time_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p95",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(triggerdotdev_batch_queue_message_processing_time_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p99",
+          "refId": "C"
+        }
+      ],
+      "title": "FairQueue Message Processing Time",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 42 },
+      "id": 18,
+      "panels": [],
+      "title": "Items Enqueued",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 24, "x": 0, "y": 43 },
+      "id": 19,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_batch_queue_items_enqueued_total[5m])) by (envId)",
+          "legendFormat": "Enqueued - {{envId}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Items Enqueued Rate by Environment",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 39,
+  "tags": ["trigger.dev", "batch-queue"],
+  "templating": { "list": [] },
+  "time": { "from": "now-15m", "to": "now" },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Batch Queue Metrics",
+  "uid": "batch-queue-metrics",
+  "version": 3
+}
diff --git a/docker/config/grafana/provisioning/dashboards/dashboards.yml b/docker/config/grafana/provisioning/dashboards/dashboards.yml
new file mode 100644
index 00000000000..bdb2d1b7135
--- /dev/null
+++ b/docker/config/grafana/provisioning/dashboards/dashboards.yml
@@ -0,0 +1,17 @@
+# Grafana dashboard provisioning
+# Automatically loads dashboard JSON files from the dashboards folder
+
+apiVersion: 1
+
+providers:
+  - name: "Trigger.dev Dashboards"
+    orgId: 1
+    folder: "Trigger.dev"
+    folderUid: "triggerdotdev"
+    type: file
+    disableDeletion: false
+    updateIntervalSeconds: 30
+    allowUiUpdates: true
+    options:
+      path: /etc/grafana/provisioning/dashboards
+
diff --git a/docker/config/grafana/provisioning/dashboards/nodejs-runtime.json b/docker/config/grafana/provisioning/dashboards/nodejs-runtime.json
new file mode 100644
index 00000000000..9f190b4977e
--- /dev/null
+++ b/docker/config/grafana/provisioning/dashboards/nodejs-runtime.json
@@ -0,0 +1,446 @@
+{
+  "annotations": {
+    "list": []
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 1,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 0 },
+      "id": 1,
+      "panels": [],
+      "title": "Event Loop Health",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "max": 1,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 0.7 },
+              { "color": "red", "value": 0.9 }
+            ]
+          },
+          "unit": "percentunit"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 0, "y": 1 },
+      "id": 2,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_event_loop_utilization_ratio",
+          "legendFormat": "ELU",
+          "refId": "A"
+        }
+      ],
+      "title": "Event Loop Utilization",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 0.1 },
+              { "color": "red", "value": 0.5 }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 6, "y": 1 },
+      "id": 3,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_eventloop_lag_p99_seconds",
+          "legendFormat": "p99 Lag",
+          "refId": "A"
+        }
+      ],
+      "title": "Event Loop Lag (p99)",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 0.05 },
+              { "color": "red", "value": 0.1 }
+            ]
+          },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 12, "y": 1 },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_eventloop_lag_mean_seconds",
+          "legendFormat": "Mean Lag",
+          "refId": "A"
+        }
+      ],
+      "title": "Event Loop Lag (Mean)",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 18, "y": 1 },
+      "id": 5,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_uv_threadpool_size_threads",
+          "legendFormat": "UV Threadpool",
+          "refId": "A"
+        }
+      ],
+      "title": "UV Threadpool Size",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "max": 1,
+          "min": 0,
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "percentunit"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 7 },
+      "id": 6,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_event_loop_utilization_ratio",
+          "legendFormat": "Event Loop Utilization",
+          "refId": "A"
+        }
+      ],
+      "title": "Event Loop Utilization Over Time",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 7 },
+      "id": 7,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_eventloop_lag_p50_seconds",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "triggerdotdev_nodejs_eventloop_lag_p90_seconds",
+          "legendFormat": "p90",
+          "refId": "B"
+        },
+        {
+          "expr": "triggerdotdev_nodejs_eventloop_lag_p99_seconds",
+          "legendFormat": "p99",
+          "refId": "C"
+        },
+        {
+          "expr": "triggerdotdev_nodejs_eventloop_lag_max_seconds",
+          "legendFormat": "max",
+          "refId": "D"
+        }
+      ],
+      "title": "Event Loop Lag Percentiles",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 15 },
+      "id": 8,
+      "panels": [],
+      "title": "Handles & Requests",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 16 },
+      "id": 9,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_active_handles_total_handles",
+          "legendFormat": "Total Handles",
+          "refId": "A"
+        }
+      ],
+      "title": "Active Handles (Total)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 16 },
+      "id": 10,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_active_requests_total_requests",
+          "legendFormat": "Total Requests",
+          "refId": "A"
+        }
+      ],
+      "title": "Active Requests (Total)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "normal" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 24, "x": 0, "y": 24 },
+      "id": 11,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "right", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "triggerdotdev_nodejs_active_handles_handles",
+          "legendFormat": "{{type}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Active Handles by Type",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 39,
+  "tags": ["trigger.dev", "nodejs", "runtime"],
+  "templating": { "list": [] },
+  "time": { "from": "now-15m", "to": "now" },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Node.js Runtime",
+  "uid": "nodejs-runtime",
+  "version": 1
+}
+
diff --git a/docker/config/grafana/provisioning/dashboards/runs-replication.json b/docker/config/grafana/provisioning/dashboards/runs-replication.json
new file mode 100644
index 00000000000..680f260daa0
--- /dev/null
+++ b/docker/config/grafana/provisioning/dashboards/runs-replication.json
@@ -0,0 +1,546 @@
+{
+  "annotations": {
+    "list": []
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 1,
+  "links": [],
+  "panels": [
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 0 },
+      "id": 1,
+      "panels": [],
+      "title": "Throughput",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 0, "y": 1 },
+      "id": 2,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_task_runs_inserted_inserts_total[5m]))",
+          "legendFormat": "Runs/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Task Runs Inserted Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 6, "y": 1 },
+      "id": 3,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_payloads_inserted_inserts_total[5m]))",
+          "legendFormat": "Payloads/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Payloads Inserted Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 12, "y": 1 },
+      "id": 4,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_batches_flushed_total[5m]))",
+          "legendFormat": "Batches/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Batches Flushed Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "max": 1,
+          "min": 0,
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "red", "value": null },
+              { "color": "yellow", "value": 0.9 },
+              { "color": "green", "value": 0.99 }
+            ]
+          },
+          "unit": "percentunit"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 6, "w": 6, "x": 18, "y": 1 },
+      "id": 5,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "none",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_batches_flushed_total{success=\"true\"}[5m])) / sum(rate(triggerdotdev_runs_replication_batches_flushed_total[5m]))",
+          "legendFormat": "Success Rate",
+          "refId": "A"
+        }
+      ],
+      "title": "Flush Success Rate",
+      "type": "stat"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 7 },
+      "id": 6,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_events_processed_total[5m])) by (event_type)",
+          "legendFormat": "{{event_type}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Events Processed by Type",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 7 },
+      "id": 7,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_task_runs_inserted_inserts_total[5m]))",
+          "legendFormat": "Task Runs",
+          "refId": "A"
+        },
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_payloads_inserted_inserts_total[5m]))",
+          "legendFormat": "Payloads",
+          "refId": "B"
+        }
+      ],
+      "title": "Insert Rate Over Time",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 15 },
+      "id": 8,
+      "panels": [],
+      "title": "Latency & Lag",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 16 },
+      "id": 9,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.50, sum(rate(triggerdotdev_runs_replication_replication_lag_ms_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.95, sum(rate(triggerdotdev_runs_replication_replication_lag_ms_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p95",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(triggerdotdev_runs_replication_replication_lag_ms_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p99",
+          "refId": "C"
+        }
+      ],
+      "title": "Replication Lag (Postgres → ClickHouse)",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "ms"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 16 },
+      "id": 10,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.50, sum(rate(triggerdotdev_runs_replication_flush_duration_ms_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.95, sum(rate(triggerdotdev_runs_replication_flush_duration_ms_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p95",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(triggerdotdev_runs_replication_flush_duration_ms_milliseconds_bucket[5m])) by (le))",
+          "legendFormat": "p99",
+          "refId": "C"
+        }
+      ],
+      "title": "Flush Duration",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 24 },
+      "id": 11,
+      "panels": [],
+      "title": "Batching & Queue",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 0, "y": 25 },
+      "id": 13,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.50, sum(rate(triggerdotdev_runs_replication_batch_size_items_bucket[5m])) by (le))",
+          "legendFormat": "p50",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.95, sum(rate(triggerdotdev_runs_replication_batch_size_items_bucket[5m])) by (le))",
+          "legendFormat": "p95",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.99, sum(rate(triggerdotdev_runs_replication_batch_size_items_bucket[5m])) by (le))",
+          "legendFormat": "p99",
+          "refId": "C"
+        }
+      ],
+      "title": "Batch Size Distribution",
+      "type": "timeseries"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "thresholds" },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              { "color": "green", "value": null },
+              { "color": "yellow", "value": 1 },
+              { "color": "red", "value": 10 }
+            ]
+          },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 12, "x": 12, "y": 25 },
+      "id": 14,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false },
+        "textMode": "auto"
+      },
+      "pluginVersion": "11.3.0",
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_insert_retries_total[5m]))",
+          "legendFormat": "Retries/sec",
+          "refId": "A"
+        }
+      ],
+      "title": "Insert Retries (should be low)",
+      "type": "stat"
+    },
+    {
+      "collapsed": false,
+      "gridPos": { "h": 1, "w": 24, "x": 0, "y": 33 },
+      "id": 15,
+      "panels": [],
+      "title": "Retries by Operation",
+      "type": "row"
+    },
+    {
+      "datasource": { "type": "prometheus", "uid": "prometheus" },
+      "fieldConfig": {
+        "defaults": {
+          "color": { "mode": "palette-classic" },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": { "legend": false, "tooltip": false, "viz": false },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": { "type": "linear" },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": { "group": "A", "mode": "none" },
+            "thresholdsStyle": { "mode": "off" }
+          },
+          "mappings": [],
+          "thresholds": { "mode": "absolute", "steps": [{ "color": "green", "value": null }] },
+          "unit": "short"
+        },
+        "overrides": []
+      },
+      "gridPos": { "h": 8, "w": 24, "x": 0, "y": 34 },
+      "id": 16,
+      "options": {
+        "legend": { "calcs": ["mean", "max"], "displayMode": "table", "placement": "bottom", "showLegend": true },
+        "tooltip": { "mode": "multi", "sort": "desc" }
+      },
+      "targets": [
+        {
+          "expr": "sum(rate(triggerdotdev_runs_replication_insert_retries_total[5m])) by (operation)",
+          "legendFormat": "{{operation}}",
+          "refId": "A"
+        }
+      ],
+      "title": "Insert Retries by Operation",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 39,
+  "tags": ["trigger.dev", "runs-replication", "clickhouse"],
+  "templating": { "list": [] },
+  "time": { "from": "now-15m", "to": "now" },
+  "timepicker": {},
+  "timezone": "browser",
+  "title": "Runs Replication Service",
+  "uid": "runs-replication-metrics",
+  "version": 1
+}
diff --git a/docker/config/grafana/provisioning/datasources/datasources.yml b/docker/config/grafana/provisioning/datasources/datasources.yml
new file mode 100644
index 00000000000..51194dbc064
--- /dev/null
+++ b/docker/config/grafana/provisioning/datasources/datasources.yml
@@ -0,0 +1,18 @@
+# Grafana datasource provisioning
+# Automatically configures Prometheus as the default datasource
+
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    uid: prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:9090
+    isDefault: true
+    editable: false
+    jsonData:
+      httpMethod: POST
+      manageAlerts: true
+      prometheusType: Prometheus
+
diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
new file mode 100644
index 00000000000..73a1474c76f
--- /dev/null
+++ b/docker/config/nginx.conf
@@ -0,0 +1,45 @@
+# nginx.conf (relevant bits)
+events {}
+
+http {
+  # This now governs idle close for HTTP/2, since http2_idle_timeout is obsolete.
+  keepalive_timeout 75s;   # ← set to 60–80s to reproduce your prod-ish drop
+
+  # Good defaults for streaming
+  sendfile off;            # avoid sendfile delays for tiny frames
+  tcp_nodelay on;
+
+  upstream app_upstream {
+    server host.docker.internal:3030;
+    keepalive 16;
+  }
+
+  server {
+    listen 8443 ssl;       # ← no ‘http2’ here…
+    http2 on;              # ← …use the standalone directive instead
+    server_name localhost;
+
+    ssl_certificate     /etc/nginx/certs/cert.pem;
+    ssl_certificate_key /etc/nginx/certs/key.pem;
+
+    location / {
+      # Make SSE actually stream through NGINX:
+      proxy_buffering off;                    # don’t buffer
+      gzip off;                               # don’t compress
+      add_header X-Accel-Buffering no;        # belt & suspenders for NGINX buffering
+      proxy_set_header Accept-Encoding "";    # stop upstream gzip (SSE + gzip = sad)
+
+      # Plain h1 to upstream is fine for SSE
+      proxy_http_version 1.1;
+      proxy_set_header Connection "";
+
+      proxy_read_timeout 30s;
+      proxy_send_timeout 30s;
+
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-For $remote_addr;
+
+      proxy_pass http://app_upstream;
+    }
+  }
+}
diff --git a/docker/config/otel-collector-config.yaml b/docker/config/otel-collector-config.yaml
new file mode 100644
index 00000000000..eab68960989
--- /dev/null
+++ b/docker/config/otel-collector-config.yaml
@@ -0,0 +1,36 @@
+# OpenTelemetry Collector configuration for local development
+# Receives OTLP metrics from the webapp and exposes them in Prometheus format
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 0.0.0.0:4317
+      http:
+        endpoint: 0.0.0.0:4318
+
+processors:
+  batch:
+    timeout: 10s
+    send_batch_size: 1024
+
+exporters:
+  prometheus:
+    endpoint: 0.0.0.0:8889
+    namespace: triggerdotdev
+    const_labels:
+      source: otel_collector
+    resource_to_telemetry_conversion:
+      enabled: true
+
+  # Debug exporter for troubleshooting (optional, uncomment to enable)
+  # debug:
+  #   verbosity: detailed
+
+service:
+  pipelines:
+    metrics:
+      receivers: [otlp]
+      processors: [batch]
+      exporters: [prometheus]
+
diff --git a/docker/config/prometheus.yml b/docker/config/prometheus.yml
new file mode 100644
index 00000000000..b4ad879ffed
--- /dev/null
+++ b/docker/config/prometheus.yml
@@ -0,0 +1,33 @@
+# Prometheus configuration for local development
+# Scrapes metrics from OTEL Collector and the webapp /metrics endpoint
+
+global:
+  scrape_interval: 15s
+  evaluation_interval: 15s
+
+scrape_configs:
+  # Scrape OpenTelemetry Collector's Prometheus exporter
+  # This includes all OTel metrics (batch queue, fair queue, etc.)
+  - job_name: "otel-collector"
+    static_configs:
+      - targets: ["otel-collector:8889"]
+    metrics_path: /metrics
+
+  # Scrape webapp's /metrics endpoint
+  # This includes Prisma metrics and prom-client default metrics
+  # Note: The webapp runs on host machine, not in Docker network
+  # Use host.docker.internal on Mac/Windows, or the actual host IP on Linux
+  - job_name: "webapp"
+    static_configs:
+      - targets: ["host.docker.internal:3030"]
+    metrics_path: /metrics
+    # Uncomment if you set TRIGGER_METRICS_AUTH_PASSWORD
+    # authorization:
+    #   type: Bearer
+    #   credentials: your-password-here
+
+  # Prometheus self-monitoring
+  - job_name: "prometheus"
+    static_configs:
+      - targets: ["localhost:9090"]
+
diff --git a/docker/config/toxiproxy.json b/docker/config/toxiproxy.json
new file mode 100644
index 00000000000..3462471672d
--- /dev/null
+++ b/docker/config/toxiproxy.json
@@ -0,0 +1,8 @@
+[
+  {
+    "name": "trigger_webapp_local",
+    "listen": "[::]:30303",
+    "upstream": "host.docker.internal:3030",
+    "enabled": true
+  }
+]
\ No newline at end of file
diff --git a/docker/dev-compose.yml b/docker/dev-compose.yml
index d3b02b3bf38..27f0ba18595 100644
--- a/docker/dev-compose.yml
+++ b/docker/dev-compose.yml
@@ -36,7 +36,7 @@ services:
 
   electric:
     container_name: electric-dev
-    image: electricsql/electric:1.0.0-beta.15@sha256:4ae0f895753b82684aa31ea1c708e9e86d0a9bca355acb7270dcb24062520810
+    image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36
     restart: always
     environment:
       DATABASE_URL: postgresql://postgres:postgres@db:5432/postgres?sslmode=disable
@@ -48,7 +48,7 @@ services:
       - db
 
   clickhouse:
-    image: bitnami/clickhouse:latest
+    image: bitnamilegacy/clickhouse:latest
     container_name: clickhouse-dev
     environment:
       CLICKHOUSE_ADMIN_USER: default
@@ -111,7 +111,7 @@ services:
       CLICKHOUSE_URL: http://default:password@clickhouse:8123
       SESSION_SECRET: secret123
       MAGIC_LINK_SECRET: secret123
-      ENCRYPTION_KEY: secret123
+      ENCRYPTION_KEY: dummy-encryption-keeeey-32-bytes
       REMIX_APP_PORT: 3030
       PORT: 3030
     networks:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 26fbf252303..c80648d710c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,7 +4,10 @@ volumes:
   database-data:
   database-data-alt:
   redis-data:
-  clickhouse:
+  clickhouse-data:
+  clickhouse-logs:
+  prometheus-data:
+  grafana-data:
 
 networks:
   app_network:
@@ -48,11 +51,12 @@ services:
 
   electric:
     container_name: electric
-    image: electricsql/electric:1.0.22@sha256:1b151dc8a6fd5292fba70cbc744e25bd3a1e42db5fc89b7e479b7b939980a0e2
+    image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36
     restart: always
     environment:
       DATABASE_URL: postgresql://postgres:postgres@database:5432/postgres?sslmode=disable
       ELECTRIC_INSECURE: true
+      ELECTRIC_ENABLE_INTEGRATION_TESTING: true
     networks:
       - app_network
     ports:
@@ -62,7 +66,7 @@ services:
 
   electric-shard-1:
     container_name: electric-shard-1
-    image: electricsql/electric:1.0.22@sha256:1b151dc8a6fd5292fba70cbc744e25bd3a1e42db5fc89b7e479b7b939980a0e2
+    image: electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36
     restart: always
     environment:
       DATABASE_URL: postgresql://postgres:postgres@database:5432/postgres?sslmode=disable
@@ -76,16 +80,23 @@ services:
       - database
 
   clickhouse:
-    image: bitnami/clickhouse:latest
+    image: clickhouse/clickhouse-server:25.6.2
+    restart: always
     container_name: clickhouse
+    ulimits:
+      nofile:
+        soft: 262144
+        hard: 262144
     environment:
-      CLICKHOUSE_ADMIN_USER: default
-      CLICKHOUSE_ADMIN_PASSWORD: password
+      CLICKHOUSE_USER: default
+      CLICKHOUSE_PASSWORD: password
+      CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
     ports:
       - "8123:8123"
       - "9000:9000"
     volumes:
-      - clickhouse:/bitnami/clickhouse
+      - clickhouse-data:/var/lib/clickhouse
+      - clickhouse-logs:/var/log/clickhouse-server
     networks:
       - app_network
     healthcheck:
@@ -104,10 +115,10 @@ services:
           "--query",
           "SELECT 1",
         ]
-      interval: 3s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
+      interval: "3s"
+      timeout: "5s"
+      retries: "5"
+      start_period: "10s"
 
   clickhouse_migrator:
     build:
@@ -132,15 +143,74 @@ services:
     networks:
       - app_network
 
-  # otel-collector:
-  #   container_name: otel-collector
-  #   image: otel/opentelemetry-collector-contrib:latest
-  #   restart: always
-  #   command: ["--config", "/etc/otel-collector-config.yaml"]
-  #   volumes:
-  #     - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
-  #   ports:
-  #     - "55680:55680"
-  #     - "55681:55681"
-  #     - "4317:4317" # OTLP gRPC receiver
-  #     - "4318:4318" # OTLP http receiver
+  toxiproxy:
+    container_name: toxiproxy
+    image: ghcr.io/shopify/toxiproxy:latest
+    restart: always
+    volumes:
+      - ./config/toxiproxy.json:/config/toxiproxy.json
+    ports:
+      - "30303:30303" # Proxied webapp port
+      - "8474:8474" # Toxiproxy API port
+    networks:
+      - app_network
+    command: ["-host", "0.0.0.0", "-config", "/config/toxiproxy.json"]
+
+  nginx-h2:
+    image: nginx:1.27
+    container_name: nginx-h2
+    restart: unless-stopped
+    ports:
+      - "8443:8443"
+    volumes:
+      - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
+      - ./config/certs:/etc/nginx/certs:ro
+
+  # Observability stack for local development
+  otel-collector:
+    container_name: otel-collector
+    image: otel/opentelemetry-collector-contrib:0.96.0
+    restart: always
+    command: ["--config", "/etc/otel-collector-config.yaml"]
+    volumes:
+      - ./config/otel-collector-config.yaml:/etc/otel-collector-config.yaml:ro
+    ports:
+      - "4317:4317" # OTLP gRPC receiver
+      - "4318:4318" # OTLP HTTP receiver
+      - "8889:8889" # Prometheus exporter
+    networks:
+      - app_network
+
+  prometheus:
+    container_name: prometheus
+    image: prom/prometheus:v2.54.1
+    restart: always
+    volumes:
+      - ./config/prometheus.yml:/etc/prometheus/prometheus.yml:ro
+      - prometheus-data:/prometheus
+    ports:
+      - "9090:9090"
+    networks:
+      - app_network
+    command:
+      - "--config.file=/etc/prometheus/prometheus.yml"
+      - "--storage.tsdb.path=/prometheus"
+      - "--web.enable-lifecycle"
+
+  grafana:
+    container_name: grafana
+    image: grafana/grafana:11.3.0
+    restart: always
+    volumes:
+      - grafana-data:/var/lib/grafana
+      - ./config/grafana/provisioning:/etc/grafana/provisioning:ro
+    ports:
+      - "3001:3000"
+    environment:
+      GF_SECURITY_ADMIN_USER: admin
+      GF_SECURITY_ADMIN_PASSWORD: admin
+      GF_USERS_ALLOW_SIGN_UP: false
+    networks:
+      - app_network
+    depends_on:
+      - prometheus
diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index 102af5bd31e..a6bc7dd15b9 100755
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -5,12 +5,15 @@ if [ -n "$DATABASE_HOST" ]; then
   scripts/wait-for-it.sh ${DATABASE_HOST} -- echo "database is up"
 fi
 
-# Run migrations
-echo "Running prisma migrations"
-pnpm --filter @trigger.dev/database db:migrate:deploy
-echo "Prisma migrations done"
+if [ "$SKIP_POSTGRES_MIGRATIONS" != "1" ]; then
+  echo "Running prisma migrations"
+  pnpm --filter @trigger.dev/database db:migrate:deploy
+  echo "Prisma migrations done"
+else
+  echo "SKIP_POSTGRES_MIGRATIONS=1, skipping Postgres migrations."
+fi
 
-if [ -n "$CLICKHOUSE_URL" ]; then
+if [ -n "$CLICKHOUSE_URL" ] && [ "$SKIP_CLICKHOUSE_MIGRATIONS" != "1" ]; then
   # Run ClickHouse migrations
   echo "Running ClickHouse migrations..."
   export GOOSE_DRIVER=clickhouse
@@ -30,6 +33,8 @@ if [ -n "$CLICKHOUSE_URL" ]; then
   export GOOSE_MIGRATION_DIR=/triggerdotdev/internal-packages/clickhouse/schema
   /usr/local/bin/goose up
   echo "ClickHouse migrations complete."
+elif [ "$SKIP_CLICKHOUSE_MIGRATIONS" = "1" ]; then
+  echo "SKIP_CLICKHOUSE_MIGRATIONS=1, skipping ClickHouse migrations."
 else
   echo "CLICKHOUSE_URL not set, skipping ClickHouse migrations."
 fi
diff --git a/docker/services-compose.yml b/docker/services-compose.yml
index 1d0509b2174..32d7e8bdc1f 100644
--- a/docker/services-compose.yml
+++ b/docker/services-compose.yml
@@ -37,7 +37,7 @@ services:
       DIRECT_URL: postgres://postgres:postgres@db:5432/postgres?schema=public
       SESSION_SECRET: secret123
       MAGIC_LINK_SECRET: secret123
-      ENCRYPTION_KEY: secret123
+      ENCRYPTION_KEY: dummy-encryption-keeeey-32-bytes
       REMIX_APP_PORT: 3030
       PORT: 3030
       WORKER_ENABLED: "false"
@@ -56,7 +56,7 @@ services:
       DIRECT_URL: postgres://postgres:postgres@db:5432/postgres?schema=public
       SESSION_SECRET: secret123
       MAGIC_LINK_SECRET: secret123
-      ENCRYPTION_KEY: secret123
+      ENCRYPTION_KEY: dummy-encryption-keeeey-32-bytes
       REMIX_APP_PORT: 3030
       PORT: 3030
       HTTP_SERVER_DISABLED: "true"
diff --git a/docs/apikeys.mdx b/docs/apikeys.mdx
index 5b9eeef1a1b..38626760ebe 100644
--- a/docs/apikeys.mdx
+++ b/docs/apikeys.mdx
@@ -39,7 +39,7 @@ The default URL is `https://api.trigger.dev`.
 If you prefer to manually configure the SDK, you can call the `configure` method:
 
 ```ts
-import { configure } from "@trigger.dev/sdk/v3";
+import { configure } from "@trigger.dev/sdk";
 import { myTask } from "./trigger/myTasks";
 
 configure({
diff --git a/docs/batch-queue-metrics.md b/docs/batch-queue-metrics.md
new file mode 100644
index 00000000000..10f95fee087
--- /dev/null
+++ b/docs/batch-queue-metrics.md
@@ -0,0 +1,252 @@
+# Batch Queue & Fair Queue Metrics Guide
+
+This document provides a comprehensive breakdown of all metrics emitted by the Batch Queue and Fair Queue systems, including what they mean and how to identify degraded system states.
+
+## Overview
+
+The batch queue system consists of two layers:
+1. **BatchQueue** (`batch_queue.*`) - High-level batch processing metrics
+2. **FairQueue** (`batch-queue.*`) - Low-level message queue metrics (with `name: "batch-queue"`)
+
+Both layers emit metrics that together provide full observability into batch processing.
+
+---
+
+## BatchQueue Metrics
+
+These metrics track batch-level operations.
+
+### Counters
+
+| Metric | Description | Labels |
+|--------|-------------|--------|
+| `batch_queue.batches_enqueued` | Number of batches initialized for processing | `envId`, `itemCount`, `streaming` |
+| `batch_queue.items_enqueued` | Number of individual batch items enqueued | `envId` |
+| `batch_queue.items_processed` | Number of batch items successfully processed (turned into runs) | `envId` |
+| `batch_queue.items_failed` | Number of batch items that failed processing | `envId`, `errorCode` |
+| `batch_queue.batches_completed` | Number of batches that completed (all items processed) | `envId`, `hasFailures` |
+
+### Histograms
+
+| Metric | Description | Unit | Labels |
+|--------|-------------|------|--------|
+| `batch_queue.batch_processing_duration` | Time from batch creation to completion | ms | `envId`, `itemCount` |
+| `batch_queue.item_queue_time` | Time from item enqueue to processing start | ms | `envId` |
+
+---
+
+## FairQueue Metrics (batch-queue namespace)
+
+These metrics track the underlying message queue operations. With the batch queue configuration, they are prefixed with `batch-queue.`.
+
+### Counters
+
+| Metric | Description |
+|--------|-------------|
+| `batch-queue.messages.enqueued` | Number of messages (batch items) added to the queue |
+| `batch-queue.messages.completed` | Number of messages successfully processed |
+| `batch-queue.messages.failed` | Number of messages that failed processing |
+| `batch-queue.messages.retried` | Number of message retry attempts |
+| `batch-queue.messages.dlq` | Number of messages sent to dead letter queue |
+
+### Histograms
+
+| Metric | Description | Unit |
+|--------|-------------|------|
+| `batch-queue.message.processing_time` | Time to process a single message | ms |
+| `batch-queue.message.queue_time` | Time a message spent waiting in queue | ms |
+
+### Observable Gauges
+
+| Metric | Description | Labels |
+|--------|-------------|--------|
+| `batch-queue.queue.length` | Current number of messages in a queue | `fairqueue.queue_id` |
+| `batch-queue.master_queue.length` | Number of active queues in the master queue shard | `fairqueue.shard_id` |
+| `batch-queue.inflight.count` | Number of messages currently being processed | `fairqueue.shard_id` |
+| `batch-queue.dlq.length` | Number of messages in the dead letter queue | `fairqueue.tenant_id` |
+
+---
+
+## Key Relationships
+
+Understanding how metrics relate helps diagnose issues:
+
+```
+batches_enqueued × avg_items_per_batch ≈ items_enqueued
+items_enqueued = items_processed + items_failed + items_pending
+batches_completed ≤ batches_enqueued (lag indicates processing backlog)
+```
+
+---
+
+## Degraded State Indicators
+
+### 🔴 Critical Issues
+
+#### 1. Processing Stopped
+**Symptoms:**
+- `batch_queue.items_processed` rate drops to 0
+- `batch-queue.inflight.count` is 0
+- `batch-queue.master_queue.length` is growing
+
+**Likely Causes:**
+- Consumer loops crashed
+- Redis connection issues
+- All consumers blocked by concurrency limits
+
+**Actions:**
+- Check webapp logs for "BatchQueue consumers started" message
+- Verify Redis connectivity
+- Check for "Unknown concurrency group" errors
+
+#### 2. Items Stuck in Queue
+**Symptoms:**
+- `batch_queue.item_queue_time` p99 > 60 seconds
+- `batch-queue.queue.length` growing continuously
+- `batch-queue.inflight.count` at max capacity
+
+**Likely Causes:**
+- Processing is slower than ingestion
+- Concurrency limits too restrictive
+- Global rate limiter bottleneck
+
+**Actions:**
+- Increase `BATCH_QUEUE_CONSUMER_COUNT`
+- Review concurrency limits per environment
+- Check `BATCH_QUEUE_GLOBAL_RATE_LIMIT` setting
+
+#### 3. High Failure Rate
+**Symptoms:**
+- `batch_queue.items_failed` rate > 5% of `items_processed`
+- `batch-queue.messages.dlq` increasing
+
+**Likely Causes:**
+- TriggerTaskService errors
+- Invalid task identifiers
+- Downstream service issues
+
+**Actions:**
+- Check `errorCode` label distribution on `items_failed`
+- Review batch error records in database
+- Check TriggerTaskService logs
+
+### 🟡 Warning Signs
+
+#### 4. Growing Backlog
+**Symptoms:**
+- `batch_queue.batches_enqueued` - `batch_queue.batches_completed` is increasing over time
+- `batch-queue.master_queue.length` trending upward
+
+**Likely Causes:**
+- Sustained high load
+- Processing capacity insufficient
+- Specific tenants monopolizing resources
+
+**Actions:**
+- Monitor DRR deficit distribution across tenants
+- Consider scaling consumers
+- Review per-tenant concurrency settings
+
+#### 5. Uneven Tenant Processing
+**Symptoms:**
+- Some `envId` labels show much higher `item_queue_time` than others
+- DRR logs show "tenants blocked by concurrency" frequently
+
+**Likely Causes:**
+- Concurrency limits too low for high-volume tenants
+- DRR quantum/maxDeficit misconfigured
+
+**Actions:**
+- Review `BATCH_CONCURRENCY_*` environment settings
+- Adjust DRR parameters if needed
+
+#### 6. Rate Limit Impact
+**Symptoms:**
+- `batch_queue.item_queue_time` has periodic spikes
+- Logs show "Global rate limit reached, waiting"
+
+**Likely Causes:**
+- `BATCH_QUEUE_GLOBAL_RATE_LIMIT` is set too low
+
+**Actions:**
+- Increase global rate limit if system can handle more throughput
+- Or accept as intentional throttling
+
+---
+
+## Recommended Dashboards
+
+### Processing Health
+```
+# Throughput
+rate(batch_queue_items_processed_total[5m])
+rate(batch_queue_items_failed_total[5m])
+
+# Success Rate
+rate(batch_queue_items_processed_total[5m]) / 
+  (rate(batch_queue_items_processed_total[5m]) + rate(batch_queue_items_failed_total[5m]))
+
+# Batch Completion Rate
+rate(batch_queue_batches_completed_total[5m]) / rate(batch_queue_batches_enqueued_total[5m])
+```
+
+### Latency
+```
+# Item Queue Time (p50, p95, p99)
+histogram_quantile(0.50, rate(batch_queue_item_queue_time_bucket[5m]))
+histogram_quantile(0.95, rate(batch_queue_item_queue_time_bucket[5m]))
+histogram_quantile(0.99, rate(batch_queue_item_queue_time_bucket[5m]))
+
+# Batch Processing Duration
+histogram_quantile(0.95, rate(batch_queue_batch_processing_duration_bucket[5m]))
+```
+
+### Queue Depth
+```
+# Current backlog
+batch_queue_master_queue_length
+batch_queue_inflight_count
+
+# DLQ (should be 0)
+batch_queue_dlq_length
+```
+
+---
+
+## Alert Thresholds (Suggested)
+
+| Condition | Severity | Threshold |
+|-----------|----------|-----------|
+| Processing stopped | Critical | `items_processed` rate = 0 for 5min |
+| High failure rate | Warning | `items_failed` / `items_processed` > 0.05 |
+| Queue time p99 | Warning | > 30 seconds |
+| Queue time p99 | Critical | > 120 seconds |
+| DLQ length | Warning | > 0 |
+| Batch completion lag | Warning | `batches_enqueued - batches_completed` > 100 |
+
+---
+
+## Environment Variables Affecting Metrics
+
+| Variable | Impact |
+|----------|--------|
+| `BATCH_QUEUE_CONSUMER_COUNT` | More consumers = higher throughput, lower queue time |
+| `BATCH_QUEUE_CONSUMER_INTERVAL_MS` | Lower = more frequent polling, higher throughput |
+| `BATCH_QUEUE_GLOBAL_RATE_LIMIT` | Caps max items/sec, increases queue time if too low |
+| `BATCH_CONCURRENCY_FREE/PAID/ENTERPRISE` | Per-tenant concurrency limits |
+| `BATCH_QUEUE_DRR_QUANTUM` | Credits per tenant per round (fairness tuning) |
+| `BATCH_QUEUE_MAX_DEFICIT` | Max accumulated credits (prevents starvation) |
+
+---
+
+## Debugging Checklist
+
+When investigating batch queue issues:
+
+1. **Check consumer status**: Look for "BatchQueue consumers started" in logs
+2. **Check Redis**: Verify connection and inspect keys with prefix `engine:batch-queue:`
+3. **Check concurrency**: Look for "tenants blocked by concurrency" debug logs
+4. **Check rate limits**: Look for "Global rate limit reached" debug logs
+5. **Check DRR state**: Query `batch:drr:deficit` hash in Redis
+6. **Check batch status**: Query `BatchTaskRun` table for stuck `PROCESSING` batches
+
diff --git a/docs/batch-queue-stress-test-plan.md b/docs/batch-queue-stress-test-plan.md
new file mode 100644
index 00000000000..0a8c6399606
--- /dev/null
+++ b/docs/batch-queue-stress-test-plan.md
@@ -0,0 +1,5011 @@
+# Batch Queue Stress Test Plan
+
+This document outlines a systematic approach to testing the new Batch Queue with Deficit Round Robin (DRR) scheduling.
+
+## Test Environment
+
+**Setup:**
+
+- Single local machine running one webapp instance (single BatchQueue consumer process)
+- 3 organizations, each with 3 projects = **9 tenants total**
+- All tenants using the same task ID: `stress-test-task`
+
+**Note:** In production, multiple webapp instances will run BatchQueue consumers in parallel. This single-instance testing focuses on algorithm behavior rather than horizontal scaling.
+
+## Configuration Options Under Test
+
+| Variable                                | Default | Description                                            |
+| --------------------------------------- | ------- | ------------------------------------------------------ |
+| `BATCH_QUEUE_DRR_QUANTUM`               | 5       | Credits allocated per environment per scheduling round |
+| `BATCH_QUEUE_MAX_DEFICIT`               | 50      | Maximum accumulated deficit (prevents starvation)      |
+| `BATCH_QUEUE_CONSUMER_COUNT`            | 1       | Number of concurrent consumer loops                    |
+| `BATCH_QUEUE_CONSUMER_INTERVAL_MS`      | 100     | Polling interval between consumer iterations           |
+| `BATCH_CONCURRENCY_DEFAULT_CONCURRENCY` | 10      | Default concurrent batch items per environment         |
+| `BATCH_QUEUE_GLOBAL_RATE_LIMIT`         | none    | Optional global items/sec limit                        |
+
+**Per-Org Settings (via database):**
+
+- `batchQueueConcurrencyConfig` - Override concurrency per org
+- `batchRateLimitConfig` - Rate limit per org
+
+---
+
+## Test Series Overview
+
+| Series | Focus               | Objective                                              |
+| ------ | ------------------- | ------------------------------------------------------ |
+| A      | Baseline            | Establish reference metrics with defaults              |
+| B      | DRR Quantum         | Understand how quantum affects fairness and throughput |
+| C      | Max Deficit         | Understand starvation prevention and catch-up behavior |
+| D      | Consumer Count      | Test parallelism within single process                 |
+| E      | Consumer Interval   | Test polling frequency impact                          |
+| F      | Concurrency Limits  | Test per-environment processing limits                 |
+| G      | Global Rate Limiter | Test global throughput caps                            |
+| H      | Asymmetric Load     | Test fairness under uneven workloads                   |
+| I      | Combined Tuning     | Test optimized configurations                          |
+
+---
+
+## Series A: Baseline (Default Configuration)
+
+**Objective:** Establish baseline metrics with all default settings.
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+# BATCH_QUEUE_CONSUMER_COUNT not set (default: 1)
+# BATCH_QUEUE_CONSUMER_INTERVAL_MS not set (default: 100)
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+# BATCH_QUEUE_GLOBAL_RATE_LIMIT not set
+```
+
+### Test A1: Fairness Baseline (All 9 Tenants)
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Baseline fairness test"
+```
+
+**Expected:** All tenants should complete in roughly similar timeframes.
+
+<details>
+<summary>Results A1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Baseline fairness test",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 54.51792024230187,
+    "overallDuration": 49525,
+    "fairnessIndex": 0.9999098436641237,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49323,
+        "avgItemsPerSecond": 6.082355087890031,
+        "avgBatchDuration": 49238,
+        "minBatchDuration": 49196,
+        "maxBatchDuration": 49322,
+        "p50Duration": 49196,
+        "p95Duration": 49322,
+        "p99Duration": 49322
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49460,
+        "avgItemsPerSecond": 6.06550748079256,
+        "avgBatchDuration": 49290.666666666664,
+        "minBatchDuration": 49187,
+        "maxBatchDuration": 49429,
+        "p50Duration": 49256,
+        "p95Duration": 49429,
+        "p99Duration": 49429
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49484,
+        "avgItemsPerSecond": 6.062565677794843,
+        "avgBatchDuration": 36861.666666666664,
+        "minBatchDuration": 15041,
+        "maxBatchDuration": 49472,
+        "p50Duration": 46072,
+        "p95Duration": 49472,
+        "p99Duration": 49472
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 48442,
+        "avgItemsPerSecond": 6.192973039924033,
+        "avgBatchDuration": 48347,
+        "minBatchDuration": 48223,
+        "maxBatchDuration": 48442,
+        "p50Duration": 48376,
+        "p95Duration": 48442,
+        "p99Duration": 48442
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 48446,
+        "avgItemsPerSecond": 6.192461709945094,
+        "avgBatchDuration": 48102.333333333336,
+        "minBatchDuration": 47417,
+        "maxBatchDuration": 48446,
+        "p50Duration": 48444,
+        "p95Duration": 48446,
+        "p99Duration": 48446
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 48288,
+        "avgItemsPerSecond": 6.21272365805169,
+        "avgBatchDuration": 36139.333333333336,
+        "minBatchDuration": 16087,
+        "maxBatchDuration": 48218,
+        "p50Duration": 44113,
+        "p95Duration": 48218,
+        "p99Duration": 48218
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49148,
+        "avgItemsPerSecond": 6.104012370798404,
+        "avgBatchDuration": 49074.666666666664,
+        "minBatchDuration": 49061,
+        "maxBatchDuration": 49099,
+        "p50Duration": 49064,
+        "p95Duration": 49099,
+        "p99Duration": 49099
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49178,
+        "avgItemsPerSecond": 6.1002887470006915,
+        "avgBatchDuration": 48484.333333333336,
+        "minBatchDuration": 47154,
+        "maxBatchDuration": 49176,
+        "p50Duration": 49123,
+        "p95Duration": 49176,
+        "p99Duration": 49176
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49454,
+        "avgItemsPerSecond": 6.066243377684312,
+        "avgBatchDuration": 49372.666666666664,
+        "minBatchDuration": 49251,
+        "maxBatchDuration": 49454,
+        "p50Duration": 49413,
+        "p95Duration": 49454,
+        "p99Duration": 49454
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T14:23:40.510Z",
+    "end": "2025-12-15T14:24:30.035Z"
+  }
+}
+```
+
+**Observations:**
+
+- Overall throughput: **54.52 items/sec** with 9 tenants competing
+- Fairness index: **0.9999** (nearly perfect fairness)
+- Notable patterns: All tenants completed within 1-2 seconds of each other (48-50s range). Per-tenant throughput ~6 items/sec each. **DRR is working excellently for symmetric load.**
+
+</details>
+
+### Test A2: Throughput Baseline (Single Tenant)
+
+**Command:**
+
+```bash
+pnpm stress throughput --batch-sizes 100,500,1000 --batch-count 3
+```
+
+**Expected:** Establish throughput ceiling for single tenant.
+
+<details>
+<summary>Results A2 (click to expand)</summary>
+
+```json
+[
+  {
+    "scenario": "throughput-100",
+    "config": {
+      "tenantCount": 1,
+      "batchSize": 100,
+      "batchCount": 3
+    },
+    "results": {
+      "totalItemsProcessed": 300,
+      "totalBatches": 3,
+      "overallThroughput": 82.57638315441784,
+      "overallDuration": 3633,
+      "fairnessIndex": 1,
+      "perTenant": [
+        {
+          "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+          "totalItems": 300,
+          "totalBatches": 3,
+          "totalDuration": 3570,
+          "avgItemsPerSecond": 84.03361344537815,
+          "avgBatchDuration": 3558.6666666666665,
+          "minBatchDuration": 3538,
+          "maxBatchDuration": 3570,
+          "p50Duration": 3568,
+          "p95Duration": 3570,
+          "p99Duration": 3570
+        }
+      ]
+    },
+    "timestamps": {
+      "start": "2025-12-15T14:41:19.119Z",
+      "end": "2025-12-15T14:41:22.752Z"
+    }
+  },
+  {
+    "scenario": "throughput-500",
+    "config": {
+      "tenantCount": 1,
+      "batchSize": 500,
+      "batchCount": 3
+    },
+    "results": {
+      "totalItemsProcessed": 1500,
+      "totalBatches": 3,
+      "overallThroughput": 97.48488984207448,
+      "overallDuration": 15387,
+      "fairnessIndex": 1,
+      "perTenant": [
+        {
+          "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+          "totalItems": 1500,
+          "totalBatches": 3,
+          "totalDuration": 15384,
+          "avgItemsPerSecond": 97.50390015600624,
+          "avgBatchDuration": 15369,
+          "minBatchDuration": 15356,
+          "maxBatchDuration": 15384,
+          "p50Duration": 15367,
+          "p95Duration": 15384,
+          "p99Duration": 15384
+        }
+      ]
+    },
+    "timestamps": {
+      "start": "2025-12-15T14:41:23.069Z",
+      "end": "2025-12-15T14:41:38.456Z"
+    }
+  },
+  {
+    "scenario": "throughput-1000",
+    "config": {
+      "tenantCount": 1,
+      "batchSize": 1000,
+      "batchCount": 3
+    },
+    "results": {
+      "totalItemsProcessed": 3000,
+      "totalBatches": 3,
+      "overallThroughput": 88.60796880999499,
+      "overallDuration": 33857,
+      "fairnessIndex": 1,
+      "perTenant": [
+        {
+          "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+          "totalItems": 3000,
+          "totalBatches": 3,
+          "totalDuration": 33839,
+          "avgItemsPerSecond": 88.65510210112592,
+          "avgBatchDuration": 33109,
+          "minBatchDuration": 32731,
+          "maxBatchDuration": 33827,
+          "p50Duration": 32769,
+          "p95Duration": 33827,
+          "p99Duration": 33827
+        }
+      ]
+    },
+    "timestamps": {
+      "start": "2025-12-15T14:41:38.860Z",
+      "end": "2025-12-15T14:42:12.717Z"
+    }
+  }
+]
+```
+
+**Observations:**
+
+- Max throughput achieved: **97.48 items/sec** (at batch size 500)
+- Scaling behavior: **Non-linear.** 100 items → 82.58/sec, 500 items → 97.48/sec (peak), 1000 items → 88.61/sec. Sweet spot around 500 items per batch. Larger batches may introduce overhead or hit concurrency limits.
+
+</details>
+
+---
+
+## Series B: DRR Quantum Variations
+
+**Objective:** Understand how quantum size affects fairness vs. throughput tradeoff.
+
+**Theory:**
+
+- Lower quantum = more frequent tenant switching = better fairness, possibly lower throughput
+- Higher quantum = longer bursts per tenant = potentially higher throughput, worse fairness
+
+### Test B1: Very Low Quantum (quantum=1)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=1
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Low quantum=1"
+```
+
+<details>
+<summary>Results B1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Low quantum=1",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 66.08899985313556,
+    "overallDuration": 40854,
+    "fairnessIndex": 0.9997008998554137,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40769,
+        "avgItemsPerSecond": 7.358532218106895,
+        "avgBatchDuration": 36850.333333333336,
+        "minBatchDuration": 29016,
+        "maxBatchDuration": 40769,
+        "p50Duration": 40766,
+        "p95Duration": 40769,
+        "p99Duration": 40769
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40771,
+        "avgItemsPerSecond": 7.358171249172206,
+        "avgBatchDuration": 40408.333333333336,
+        "minBatchDuration": 39684,
+        "maxBatchDuration": 40771,
+        "p50Duration": 40770,
+        "p95Duration": 40771,
+        "p99Duration": 40771
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40754,
+        "avgItemsPerSecond": 7.361240614418216,
+        "avgBatchDuration": 40106,
+        "minBatchDuration": 39076,
+        "maxBatchDuration": 40753,
+        "p50Duration": 40489,
+        "p95Duration": 40753,
+        "p99Duration": 40753
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40770,
+        "avgItemsPerSecond": 7.358351729212656,
+        "avgBatchDuration": 40717.333333333336,
+        "minBatchDuration": 40616,
+        "maxBatchDuration": 40769,
+        "p50Duration": 40767,
+        "p95Duration": 40769,
+        "p99Duration": 40769
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40767,
+        "avgItemsPerSecond": 7.358893222459342,
+        "avgBatchDuration": 40610,
+        "minBatchDuration": 40299,
+        "maxBatchDuration": 40766,
+        "p50Duration": 40765,
+        "p95Duration": 40766,
+        "p99Duration": 40766
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40780,
+        "avgItemsPerSecond": 7.356547327121138,
+        "avgBatchDuration": 40681.666666666664,
+        "minBatchDuration": 40497,
+        "maxBatchDuration": 40778,
+        "p50Duration": 40770,
+        "p95Duration": 40778,
+        "p99Duration": 40778
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40771,
+        "avgItemsPerSecond": 7.358171249172206,
+        "avgBatchDuration": 40766.333333333336,
+        "minBatchDuration": 40764,
+        "maxBatchDuration": 40769,
+        "p50Duration": 40766,
+        "p95Duration": 40769,
+        "p99Duration": 40769
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38628,
+        "avgItemsPerSecond": 7.766387076731904,
+        "avgBatchDuration": 34753,
+        "minBatchDuration": 28057,
+        "maxBatchDuration": 38627,
+        "p50Duration": 37575,
+        "p95Duration": 38627,
+        "p99Duration": 38627
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40754,
+        "avgItemsPerSecond": 7.361240614418216,
+        "avgBatchDuration": 40018.333333333336,
+        "minBatchDuration": 39630,
+        "maxBatchDuration": 40754,
+        "p50Duration": 39671,
+        "p95Duration": 40754,
+        "p99Duration": 40754
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T14:48:32.814Z",
+    "end": "2025-12-15T14:49:13.668Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9997** (vs baseline: **0.9999**) - nearly identical
+- Throughput: **66.09 items/sec** (vs baseline: **54.52**) - +21% improvement!
+- Context switching overhead visible?: **Not significantly.** Despite switching tenants every 1 item, throughput actually improved. The tighter scheduling may have better utilized concurrency slots.
+
+</details>
+
+### Test B2: Medium Quantum (quantum=10)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=10
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Medium quantum=10"
+```
+
+<details>
+<summary>Results B2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Medium quantum=10",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 64.68615237182559,
+    "overallDuration": 41740,
+    "fairnessIndex": 0.9998055065601579,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40743,
+        "avgItemsPerSecond": 7.363228039172373,
+        "avgBatchDuration": 37656,
+        "minBatchDuration": 31484,
+        "maxBatchDuration": 40743,
+        "p50Duration": 40741,
+        "p95Duration": 40743,
+        "p99Duration": 40743
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40745,
+        "avgItemsPerSecond": 7.362866609399926,
+        "avgBatchDuration": 36601.666666666664,
+        "minBatchDuration": 28318,
+        "maxBatchDuration": 40745,
+        "p50Duration": 40742,
+        "p95Duration": 40745,
+        "p99Duration": 40745
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41664,
+        "avgItemsPerSecond": 7.200460829493087,
+        "avgBatchDuration": 38524.333333333336,
+        "minBatchDuration": 32253,
+        "maxBatchDuration": 41660,
+        "p50Duration": 41660,
+        "p95Duration": 41660,
+        "p99Duration": 41660
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41443,
+        "avgItemsPerSecond": 7.238858190768043,
+        "avgBatchDuration": 36661.333333333336,
+        "minBatchDuration": 32251,
+        "maxBatchDuration": 41443,
+        "p50Duration": 36290,
+        "p95Duration": 41443,
+        "p99Duration": 41443
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40436,
+        "avgItemsPerSecond": 7.419131467009596,
+        "avgBatchDuration": 40406,
+        "minBatchDuration": 40349,
+        "maxBatchDuration": 40436,
+        "p50Duration": 40433,
+        "p95Duration": 40436,
+        "p99Duration": 40436
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41044,
+        "avgItemsPerSecond": 7.309229119968814,
+        "avgBatchDuration": 39122,
+        "minBatchDuration": 35972,
+        "maxBatchDuration": 41040,
+        "p50Duration": 40354,
+        "p95Duration": 41040,
+        "p99Duration": 41040
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41683,
+        "avgItemsPerSecond": 7.197178705947269,
+        "avgBatchDuration": 41325,
+        "minBatchDuration": 40636,
+        "maxBatchDuration": 41683,
+        "p50Duration": 41656,
+        "p95Duration": 41683,
+        "p99Duration": 41683
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41412,
+        "avgItemsPerSecond": 7.244277021153288,
+        "avgBatchDuration": 40959.666666666664,
+        "minBatchDuration": 40735,
+        "maxBatchDuration": 41406,
+        "p50Duration": 40738,
+        "p95Duration": 41406,
+        "p99Duration": 41406
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 39914,
+        "avgItemsPerSecond": 7.516159743448415,
+        "avgBatchDuration": 36645,
+        "minBatchDuration": 32034,
+        "maxBatchDuration": 39914,
+        "p50Duration": 37987,
+        "p95Duration": 39914,
+        "p99Duration": 39914
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T14:51:13.796Z",
+    "end": "2025-12-15T14:51:55.536Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9998** (excellent)
+- Throughput: **64.69 items/sec** (vs quantum=1: 66.09, slightly lower)
+- Comparison to baseline: **+18% throughput vs baseline.** Higher quantum didn't provide expected gains; the overhead theory is not supported by evidence.
+
+</details>
+
+### Test B3: High Quantum (quantum=25)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=25
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "High quantum=25"
+```
+
+<details>
+<summary>Results B3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "High quantum=25",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 84.3644544431946,
+    "overallDuration": 32004,
+    "fairnessIndex": 0.9999195340273302,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31137,
+        "avgItemsPerSecond": 9.634839579920994,
+        "avgBatchDuration": 31135.333333333332,
+        "minBatchDuration": 31134,
+        "maxBatchDuration": 31137,
+        "p50Duration": 31135,
+        "p95Duration": 31137,
+        "p99Duration": 31137
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31135,
+        "avgItemsPerSecond": 9.635458487233016,
+        "avgBatchDuration": 30287.333333333332,
+        "minBatchDuration": 29792,
+        "maxBatchDuration": 31133,
+        "p50Duration": 29937,
+        "p95Duration": 31133,
+        "p99Duration": 31133
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31197,
+        "avgItemsPerSecond": 9.616309260505819,
+        "avgBatchDuration": 24641,
+        "minBatchDuration": 18973,
+        "maxBatchDuration": 31197,
+        "p50Duration": 23753,
+        "p95Duration": 31197,
+        "p99Duration": 31197
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31105,
+        "avgItemsPerSecond": 9.644751647645073,
+        "avgBatchDuration": 29303,
+        "minBatchDuration": 25964,
+        "maxBatchDuration": 31105,
+        "p50Duration": 30840,
+        "p95Duration": 31105,
+        "p99Duration": 31105
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31120,
+        "avgItemsPerSecond": 9.640102827763496,
+        "avgBatchDuration": 31006.333333333332,
+        "minBatchDuration": 30835,
+        "maxBatchDuration": 31120,
+        "p50Duration": 31064,
+        "p95Duration": 31120,
+        "p99Duration": 31120
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31075,
+        "avgItemsPerSecond": 9.654062751407883,
+        "avgBatchDuration": 24953.333333333332,
+        "minBatchDuration": 21079,
+        "maxBatchDuration": 31073,
+        "p50Duration": 22708,
+        "p95Duration": 31073,
+        "p99Duration": 31073
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31965,
+        "avgItemsPerSecond": 9.385265133740027,
+        "avgBatchDuration": 25924.666666666668,
+        "minBatchDuration": 22904,
+        "maxBatchDuration": 31964,
+        "p50Duration": 22906,
+        "p95Duration": 31964,
+        "p99Duration": 31964
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31106,
+        "avgItemsPerSecond": 9.644441586832123,
+        "avgBatchDuration": 26298.333333333332,
+        "minBatchDuration": 16867,
+        "maxBatchDuration": 31106,
+        "p50Duration": 30922,
+        "p95Duration": 31106,
+        "p99Duration": 31106
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30886,
+        "avgItemsPerSecond": 9.713138638865505,
+        "avgBatchDuration": 30883,
+        "minBatchDuration": 30881,
+        "maxBatchDuration": 30884,
+        "p50Duration": 30884,
+        "p95Duration": 30884,
+        "p99Duration": 30884
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T14:54:10.280Z",
+    "end": "2025-12-15T14:54:42.284Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9999** (best in B series!)
+- Throughput: **84.36 items/sec** (**BEST in B series**, +55% vs baseline)
+- Evidence of tenant starvation?: **None.** All tenants completed in 30-32s range. Higher quantum=25 actually provided better throughput AND fairness!
+
+</details>
+
+### Test B4: Very High Quantum (quantum=50)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=50
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Very high quantum=50"
+```
+
+<details>
+<summary>Results B4 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Very high quantum=50",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 51.97605251506343,
+    "overallDuration": 51947,
+    "fairnessIndex": 0.9997441540697334,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51416,
+        "avgItemsPerSecond": 5.834759607904155,
+        "avgBatchDuration": 51002,
+        "minBatchDuration": 50774,
+        "maxBatchDuration": 51416,
+        "p50Duration": 50816,
+        "p95Duration": 51416,
+        "p99Duration": 51416
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51847,
+        "avgItemsPerSecond": 5.786255713927518,
+        "avgBatchDuration": 51840.666666666664,
+        "minBatchDuration": 51838,
+        "maxBatchDuration": 51843,
+        "p50Duration": 51841,
+        "p95Duration": 51843,
+        "p99Duration": 51843
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51252,
+        "avgItemsPerSecond": 5.853430110044486,
+        "avgBatchDuration": 51034.333333333336,
+        "minBatchDuration": 50778,
+        "maxBatchDuration": 51250,
+        "p50Duration": 51075,
+        "p95Duration": 51250,
+        "p99Duration": 51250
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 50778,
+        "avgItemsPerSecond": 5.908070424199456,
+        "avgBatchDuration": 50768.666666666664,
+        "minBatchDuration": 50765,
+        "maxBatchDuration": 50776,
+        "p50Duration": 50765,
+        "p95Duration": 50776,
+        "p99Duration": 50776
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49692,
+        "avgItemsPerSecond": 6.037189084762135,
+        "avgBatchDuration": 49689.666666666664,
+        "minBatchDuration": 49687,
+        "maxBatchDuration": 49692,
+        "p50Duration": 49690,
+        "p95Duration": 49692,
+        "p99Duration": 49692
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51843,
+        "avgItemsPerSecond": 5.786702158439905,
+        "avgBatchDuration": 51842,
+        "minBatchDuration": 51841,
+        "maxBatchDuration": 51843,
+        "p50Duration": 51842,
+        "p95Duration": 51843,
+        "p99Duration": 51843
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 50821,
+        "avgItemsPerSecond": 5.9030715649042715,
+        "avgBatchDuration": 50794.666666666664,
+        "minBatchDuration": 50779,
+        "maxBatchDuration": 50821,
+        "p50Duration": 50784,
+        "p95Duration": 50821,
+        "p99Duration": 50821
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49689,
+        "avgItemsPerSecond": 6.037553583288052,
+        "avgBatchDuration": 49682,
+        "minBatchDuration": 49678,
+        "maxBatchDuration": 49689,
+        "p50Duration": 49679,
+        "p95Duration": 49689,
+        "p99Duration": 49689
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51838,
+        "avgItemsPerSecond": 5.787260310968787,
+        "avgBatchDuration": 51483.333333333336,
+        "minBatchDuration": 50775,
+        "maxBatchDuration": 51838,
+        "p50Duration": 51837,
+        "p95Duration": 51838,
+        "p99Duration": 51838
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T14:58:47.844Z",
+    "end": "2025-12-15T14:59:39.791Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9997** (still excellent)
+- Throughput: **51.98 items/sec** (**WORST in B series**, -5% vs baseline)
+- Notable patterns: **Diminishing returns / counterproductive.** Very high quantum=50 actually hurt throughput. With 9 tenants each getting 50-item bursts, tenants wait too long for their turn. **Sweet spot appears to be quantum=25.**
+
+</details>
+
+---
+
+## Series C: Max Deficit Variations
+
+**Objective:** Understand how max deficit cap affects catch-up behavior for starved tenants.
+
+**Theory:**
+
+- Lower max deficit = limits how much a starved tenant can "catch up"
+- Higher max deficit = allows more aggressive catch-up, but could starve other tenants
+
+### Test C1: Low Max Deficit (maxDeficit=10)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=10
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Low maxDeficit=10"
+```
+
+<details>
+<summary>Results C1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Low maxDeficit=10",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 52.51385782359234,
+    "overallDuration": 51415,
+    "fairnessIndex": 0.9997739979483051,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49624,
+        "avgItemsPerSecond": 6.0454618732871195,
+        "avgBatchDuration": 49357.333333333336,
+        "minBatchDuration": 48832,
+        "maxBatchDuration": 49624,
+        "p50Duration": 49616,
+        "p95Duration": 49624,
+        "p99Duration": 49624
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51230,
+        "avgItemsPerSecond": 5.8559437829396845,
+        "avgBatchDuration": 50431,
+        "minBatchDuration": 49201,
+        "maxBatchDuration": 51230,
+        "p50Duration": 50862,
+        "p95Duration": 51230,
+        "p99Duration": 51230
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51410,
+        "avgItemsPerSecond": 5.83544057576347,
+        "avgBatchDuration": 49448.333333333336,
+        "minBatchDuration": 45734,
+        "maxBatchDuration": 51410,
+        "p50Duration": 51201,
+        "p95Duration": 51410,
+        "p99Duration": 51410
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49206,
+        "avgItemsPerSecond": 6.096817461285209,
+        "avgBatchDuration": 46922.333333333336,
+        "minBatchDuration": 42366,
+        "maxBatchDuration": 49201,
+        "p50Duration": 49200,
+        "p95Duration": 49201,
+        "p99Duration": 49201
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 50661,
+        "avgItemsPerSecond": 5.921714928643334,
+        "avgBatchDuration": 48617.666666666664,
+        "minBatchDuration": 46575,
+        "maxBatchDuration": 50661,
+        "p50Duration": 48617,
+        "p95Duration": 50661,
+        "p99Duration": 50661
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 50189,
+        "avgItemsPerSecond": 5.977405407559425,
+        "avgBatchDuration": 49945.666666666664,
+        "minBatchDuration": 49823,
+        "maxBatchDuration": 50189,
+        "p50Duration": 49825,
+        "p95Duration": 50189,
+        "p99Duration": 50189
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 51232,
+        "avgItemsPerSecond": 5.8557151780137415,
+        "avgBatchDuration": 50892.333333333336,
+        "minBatchDuration": 50636,
+        "maxBatchDuration": 51229,
+        "p50Duration": 50812,
+        "p95Duration": 51229,
+        "p99Duration": 51229
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 49639,
+        "avgItemsPerSecond": 6.0436350450250815,
+        "avgBatchDuration": 44099,
+        "minBatchDuration": 41326,
+        "maxBatchDuration": 49638,
+        "p50Duration": 41333,
+        "p95Duration": 49638,
+        "p99Duration": 49638
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 50193,
+        "avgItemsPerSecond": 5.976929053852131,
+        "avgBatchDuration": 49979.666666666664,
+        "minBatchDuration": 49623,
+        "maxBatchDuration": 50193,
+        "p50Duration": 50123,
+        "p95Duration": 50193,
+        "p99Duration": 50193
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:01:17.027Z",
+    "end": "2025-12-15T15:02:08.442Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9998** (excellent)
+- Throughput: **52.51 items/sec** (similar to baseline)
+- Recovery behavior: **Constrained.** Low max deficit limits catch-up ability. Total duration 51.4s, consistent with limited burst capacity.
+
+</details>
+
+### Test C2: Medium Max Deficit (maxDeficit=25)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=25
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Medium maxDeficit=25"
+```
+
+<details>
+<summary>Results C2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Medium maxDeficit=25",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 66.32928806564142,
+    "overallDuration": 40706,
+    "fairnessIndex": 0.9992454865624668,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 39801,
+        "avgItemsPerSecond": 7.537499057812618,
+        "avgBatchDuration": 35339.333333333336,
+        "minBatchDuration": 28824,
+        "maxBatchDuration": 39800,
+        "p50Duration": 37394,
+        "p95Duration": 39800,
+        "p99Duration": 39800
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 39487,
+        "avgItemsPerSecond": 7.597437131207739,
+        "avgBatchDuration": 36988.666666666664,
+        "minBatchDuration": 34055,
+        "maxBatchDuration": 39486,
+        "p50Duration": 37425,
+        "p95Duration": 39486,
+        "p99Duration": 39486
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37449,
+        "avgItemsPerSecond": 8.010894816951053,
+        "avgBatchDuration": 36409.333333333336,
+        "minBatchDuration": 34337,
+        "maxBatchDuration": 37447,
+        "p50Duration": 37444,
+        "p95Duration": 37447,
+        "p99Duration": 37447
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40648,
+        "avgItemsPerSecond": 7.380436921865774,
+        "avgBatchDuration": 39841.666666666664,
+        "minBatchDuration": 39419,
+        "maxBatchDuration": 40647,
+        "p50Duration": 39459,
+        "p95Duration": 40647,
+        "p99Duration": 40647
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38760,
+        "avgItemsPerSecond": 7.739938080495356,
+        "avgBatchDuration": 36378.333333333336,
+        "minBatchDuration": 33012,
+        "maxBatchDuration": 38750,
+        "p50Duration": 37373,
+        "p95Duration": 38750,
+        "p99Duration": 38750
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37706,
+        "avgItemsPerSecond": 7.956293428101628,
+        "avgBatchDuration": 37609.333333333336,
+        "minBatchDuration": 37424,
+        "maxBatchDuration": 37706,
+        "p50Duration": 37698,
+        "p95Duration": 37706,
+        "p99Duration": 37706
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40621,
+        "avgItemsPerSecond": 7.385342556805593,
+        "avgBatchDuration": 38921,
+        "minBatchDuration": 36642,
+        "maxBatchDuration": 40621,
+        "p50Duration": 39500,
+        "p95Duration": 40621,
+        "p99Duration": 40621
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38757,
+        "avgItemsPerSecond": 7.740537193281214,
+        "avgBatchDuration": 38744,
+        "minBatchDuration": 38730,
+        "maxBatchDuration": 38757,
+        "p50Duration": 38745,
+        "p95Duration": 38757,
+        "p99Duration": 38757
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38751,
+        "avgItemsPerSecond": 7.741735697143299,
+        "avgBatchDuration": 37674.666666666664,
+        "minBatchDuration": 35558,
+        "maxBatchDuration": 38740,
+        "p50Duration": 38726,
+        "p95Duration": 38740,
+        "p99Duration": 38740
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:03:24.382Z",
+    "end": "2025-12-15T15:04:05.088Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9992** (slightly lower but still very good)
+- Throughput: **66.33 items/sec** (+22% vs baseline)
+- Recovery behavior: **Better.** More headroom for catch-up. Duration dropped from 51.4s (C1) to 40.7s.
+
+</details>
+
+### Test C3: High Max Deficit (maxDeficit=100)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=100
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "High maxDeficit=100"
+```
+
+<details>
+<summary>Results C3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "High maxDeficit=100",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 73.73624272878718,
+    "overallDuration": 36617,
+    "fairnessIndex": 0.9988716605255289,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 32809,
+        "avgItemsPerSecond": 9.143832484988875,
+        "avgBatchDuration": 30391.666666666668,
+        "minBatchDuration": 28722,
+        "maxBatchDuration": 32751,
+        "p50Duration": 29702,
+        "p95Duration": 32751,
+        "p99Duration": 32751
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 36540,
+        "avgItemsPerSecond": 8.210180623973727,
+        "avgBatchDuration": 28375.666666666668,
+        "minBatchDuration": 13115,
+        "maxBatchDuration": 36537,
+        "p50Duration": 35475,
+        "p95Duration": 36537,
+        "p99Duration": 36537
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 36337,
+        "avgItemsPerSecond": 8.256047554833916,
+        "avgBatchDuration": 28524.666666666668,
+        "minBatchDuration": 13114,
+        "maxBatchDuration": 36322,
+        "p50Duration": 36138,
+        "p95Duration": 36322,
+        "p99Duration": 36322
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 35478,
+        "avgItemsPerSecond": 8.45594452900389,
+        "avgBatchDuration": 27529.333333333332,
+        "minBatchDuration": 23556,
+        "maxBatchDuration": 35475,
+        "p50Duration": 23557,
+        "p95Duration": 35475,
+        "p99Duration": 35475
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 35453,
+        "avgItemsPerSecond": 8.461907313908554,
+        "avgBatchDuration": 35291,
+        "minBatchDuration": 35039,
+        "maxBatchDuration": 35438,
+        "p50Duration": 35396,
+        "p95Duration": 35438,
+        "p99Duration": 35438
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 36430,
+        "avgItemsPerSecond": 8.23497117760088,
+        "avgBatchDuration": 34851.333333333336,
+        "minBatchDuration": 31705,
+        "maxBatchDuration": 36425,
+        "p50Duration": 36424,
+        "p95Duration": 36425,
+        "p99Duration": 36425
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 36500,
+        "avgItemsPerSecond": 8.21917808219178,
+        "avgBatchDuration": 31197,
+        "minBatchDuration": 27638,
+        "maxBatchDuration": 36495,
+        "p50Duration": 29458,
+        "p95Duration": 36495,
+        "p99Duration": 36495
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 36573,
+        "avgItemsPerSecond": 8.202772537117545,
+        "avgBatchDuration": 27671.666666666668,
+        "minBatchDuration": 23222,
+        "maxBatchDuration": 36570,
+        "p50Duration": 23223,
+        "p95Duration": 36570,
+        "p99Duration": 36570
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 35514,
+        "avgItemsPerSecond": 8.44737286703835,
+        "avgBatchDuration": 35127.666666666664,
+        "minBatchDuration": 34370,
+        "maxBatchDuration": 35511,
+        "p50Duration": 35502,
+        "p95Duration": 35511,
+        "p99Duration": 35511
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:06:48.615Z",
+    "end": "2025-12-15T15:07:25.232Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness index: **0.9989** (slightly lower due to more aggressive catch-up)
+- Throughput: **73.74 items/sec** (**+35% vs baseline**, best in C series)
+- Any evidence of new tenant starvation during catch-up?: **Minor variance.** Some tenants took 13-37s for batches (wider spread) but all finished within reasonable bounds. **Higher max deficit = better throughput but slightly more variance.**
+
+</details>
+
+---
+
+## Series D: Consumer Count Variations
+
+**Objective:** Test parallelism within a single process.
+
+**Theory:**
+
+- More consumers = higher potential throughput (limited by concurrency limits)
+- Diminishing returns expected as consumers contend for the same work
+
+### Test D1: Single Consumer (baseline)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=1
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Single consumer"
+```
+
+<details>
+<summary>Results D1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Single consumer",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 41.326108917255944,
+    "overallDuration": 65334,
+    "fairnessIndex": 0.9996736075271871,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 62086,
+        "avgItemsPerSecond": 4.832007215797443,
+        "avgBatchDuration": 60490.333333333336,
+        "minBatchDuration": 59021,
+        "maxBatchDuration": 62084,
+        "p50Duration": 60366,
+        "p95Duration": 62084,
+        "p99Duration": 62084
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 65000,
+        "avgItemsPerSecond": 4.615384615384616,
+        "avgBatchDuration": 63631.333333333336,
+        "minBatchDuration": 61952,
+        "maxBatchDuration": 64991,
+        "p50Duration": 63951,
+        "p95Duration": 64991,
+        "p99Duration": 64991
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 62539,
+        "avgItemsPerSecond": 4.797006667839269,
+        "avgBatchDuration": 60631,
+        "minBatchDuration": 58991,
+        "maxBatchDuration": 62536,
+        "p50Duration": 60366,
+        "p95Duration": 62536,
+        "p99Duration": 62536
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 64125,
+        "avgItemsPerSecond": 4.678362573099415,
+        "avgBatchDuration": 61768.666666666664,
+        "minBatchDuration": 58220,
+        "maxBatchDuration": 64118,
+        "p50Duration": 62968,
+        "p95Duration": 64118,
+        "p99Duration": 64118
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 62536,
+        "avgItemsPerSecond": 4.797236791608034,
+        "avgBatchDuration": 55644,
+        "minBatchDuration": 48107,
+        "maxBatchDuration": 62516,
+        "p50Duration": 56309,
+        "p95Duration": 62516,
+        "p99Duration": 62516
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 65257,
+        "avgItemsPerSecond": 4.597207962364191,
+        "avgBatchDuration": 62698.666666666664,
+        "minBatchDuration": 60933,
+        "maxBatchDuration": 65257,
+        "p50Duration": 61906,
+        "p95Duration": 65257,
+        "p99Duration": 65257
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 62654,
+        "avgItemsPerSecond": 4.788201870590864,
+        "avgBatchDuration": 60963.666666666664,
+        "minBatchDuration": 59342,
+        "maxBatchDuration": 62654,
+        "p50Duration": 60895,
+        "p95Duration": 62654,
+        "p99Duration": 62654
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 62966,
+        "avgItemsPerSecond": 4.76447606644856,
+        "avgBatchDuration": 61417.333333333336,
+        "minBatchDuration": 60031,
+        "maxBatchDuration": 62961,
+        "p50Duration": 61260,
+        "p95Duration": 62961,
+        "p99Duration": 62961
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 64690,
+        "avgItemsPerSecond": 4.637501932292472,
+        "avgBatchDuration": 59325,
+        "minBatchDuration": 51023,
+        "maxBatchDuration": 64686,
+        "p50Duration": 62266,
+        "p95Duration": 64686,
+        "p99Duration": 64686
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:09:10.445Z",
+    "end": "2025-12-15T15:10:15.779Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **41.33 items/sec** (lowest in D series, -24% vs baseline)
+- Fairness: **0.9997** (excellent)
+- **Single consumer is a bottleneck.** Total duration 65.3s. Each tenant averaging only ~4.6 items/sec.
+
+</details>
+
+### Test D2: Multiple Consumers (count=3)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "3 consumers"
+```
+
+<details>
+<summary>Results D2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "3 consumers",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 57.55211663895639,
+    "overallDuration": 46914,
+    "fairnessIndex": 0.9992021047885379,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46746,
+        "avgItemsPerSecond": 6.417661404184315,
+        "avgBatchDuration": 46353,
+        "minBatchDuration": 45585,
+        "maxBatchDuration": 46746,
+        "p50Duration": 46728,
+        "p95Duration": 46746,
+        "p99Duration": 46746
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46812,
+        "avgItemsPerSecond": 6.40861317610869,
+        "avgBatchDuration": 46805,
+        "minBatchDuration": 46794,
+        "maxBatchDuration": 46812,
+        "p50Duration": 46809,
+        "p95Duration": 46812,
+        "p99Duration": 46812
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46606,
+        "avgItemsPerSecond": 6.436939449856242,
+        "avgBatchDuration": 38880,
+        "minBatchDuration": 33105,
+        "maxBatchDuration": 46604,
+        "p50Duration": 36931,
+        "p95Duration": 46604,
+        "p99Duration": 46604
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46821,
+        "avgItemsPerSecond": 6.407381303261357,
+        "avgBatchDuration": 46059,
+        "minBatchDuration": 45679,
+        "maxBatchDuration": 46810,
+        "p50Duration": 45688,
+        "p95Duration": 46810,
+        "p99Duration": 46810
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 43729,
+        "avgItemsPerSecond": 6.860435866358709,
+        "avgBatchDuration": 42251,
+        "minBatchDuration": 39304,
+        "maxBatchDuration": 43729,
+        "p50Duration": 43720,
+        "p95Duration": 43729,
+        "p99Duration": 43729
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46597,
+        "avgItemsPerSecond": 6.438182715625469,
+        "avgBatchDuration": 45484.333333333336,
+        "minBatchDuration": 44415,
+        "maxBatchDuration": 46567,
+        "p50Duration": 45471,
+        "p95Duration": 46567,
+        "p99Duration": 46567
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46808,
+        "avgItemsPerSecond": 6.409160827209024,
+        "avgBatchDuration": 45405,
+        "minBatchDuration": 43679,
+        "maxBatchDuration": 46761,
+        "p50Duration": 45775,
+        "p95Duration": 46761,
+        "p99Duration": 46761
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46811,
+        "avgItemsPerSecond": 6.408750080109376,
+        "avgBatchDuration": 45293,
+        "minBatchDuration": 44526,
+        "maxBatchDuration": 46784,
+        "p50Duration": 44569,
+        "p95Duration": 46784,
+        "p99Duration": 46784
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 43732,
+        "avgItemsPerSecond": 6.859965242842769,
+        "avgBatchDuration": 41508,
+        "minBatchDuration": 39455,
+        "maxBatchDuration": 43581,
+        "p50Duration": 41488,
+        "p95Duration": 43581,
+        "p99Duration": 43581
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:11:42.929Z",
+    "end": "2025-12-15T15:12:29.843Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **57.55 items/sec** (vs single: **1.39x** improvement)
+- Fairness impact: **0.9992** (very minor degradation)
+- Duration dropped from 65.3s to 46.9s. **3 consumers is a good balance.**
+
+</details>
+
+### Test D3: Many Consumers (count=5)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=5
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "5 consumers"
+```
+
+<details>
+<summary>Results D3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "5 consumers",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 63.80263717566993,
+    "overallDuration": 42318,
+    "fairnessIndex": 0.9999000645903268,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41203,
+        "avgItemsPerSecond": 7.281023226464092,
+        "avgBatchDuration": 40931,
+        "minBatchDuration": 40810,
+        "maxBatchDuration": 41167,
+        "p50Duration": 40816,
+        "p95Duration": 41167,
+        "p99Duration": 41167
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41814,
+        "avgItemsPerSecond": 7.1746305065289135,
+        "avgBatchDuration": 37657.333333333336,
+        "minBatchDuration": 35575,
+        "maxBatchDuration": 41814,
+        "p50Duration": 35583,
+        "p95Duration": 41814,
+        "p99Duration": 41814
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41795,
+        "avgItemsPerSecond": 7.177892092355545,
+        "avgBatchDuration": 37201.666666666664,
+        "minBatchDuration": 34298,
+        "maxBatchDuration": 41795,
+        "p50Duration": 35512,
+        "p95Duration": 41795,
+        "p99Duration": 41795
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41837,
+        "avgItemsPerSecond": 7.170686234672658,
+        "avgBatchDuration": 40580.333333333336,
+        "minBatchDuration": 38694,
+        "maxBatchDuration": 41833,
+        "p50Duration": 41214,
+        "p95Duration": 41833,
+        "p99Duration": 41833
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41829,
+        "avgItemsPerSecond": 7.1720576633436135,
+        "avgBatchDuration": 39891.666666666664,
+        "minBatchDuration": 37128,
+        "maxBatchDuration": 41786,
+        "p50Duration": 40761,
+        "p95Duration": 41786,
+        "p99Duration": 41786
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 42246,
+        "avgItemsPerSecond": 7.10126402499645,
+        "avgBatchDuration": 34807.333333333336,
+        "minBatchDuration": 28353,
+        "maxBatchDuration": 42154,
+        "p50Duration": 33915,
+        "p95Duration": 42154,
+        "p99Duration": 42154
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41654,
+        "avgItemsPerSecond": 7.202189465597542,
+        "avgBatchDuration": 40819.333333333336,
+        "minBatchDuration": 40181,
+        "maxBatchDuration": 41653,
+        "p50Duration": 40624,
+        "p95Duration": 41653,
+        "p99Duration": 41653
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 41210,
+        "avgItemsPerSecond": 7.279786459597185,
+        "avgBatchDuration": 40886.333333333336,
+        "minBatchDuration": 40630,
+        "maxBatchDuration": 41210,
+        "p50Duration": 40819,
+        "p95Duration": 41210,
+        "p99Duration": 41210
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 40813,
+        "avgItemsPerSecond": 7.350599073824517,
+        "avgBatchDuration": 37843.666666666664,
+        "minBatchDuration": 31921,
+        "maxBatchDuration": 40810,
+        "p50Duration": 40800,
+        "p95Duration": 40810,
+        "p99Duration": 40810
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:13:47.964Z",
+    "end": "2025-12-15T15:14:30.282Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **63.80 items/sec** (vs 3 consumers: **1.11x** improvement)
+- Fairness: **0.9999** (nearly perfect!)
+- Diminishing returns?: **Yes, starting to see it.** Going from 3→5 consumers added ~11% throughput. Still beneficial but less dramatic.
+
+</details>
+
+### Test D4: High Consumer Count (count=10)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=10
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "10 consumers"
+```
+
+<details>
+<summary>Results D4 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "10 consumers",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 114.94252873563218,
+    "overallDuration": 23490,
+    "fairnessIndex": 0.9887990604258773,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 23004,
+        "avgItemsPerSecond": 13.041210224308816,
+        "avgBatchDuration": 21971,
+        "minBatchDuration": 19947,
+        "maxBatchDuration": 23004,
+        "p50Duration": 22962,
+        "p95Duration": 23004,
+        "p99Duration": 23004
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 22777,
+        "avgItemsPerSecond": 13.171181454976512,
+        "avgBatchDuration": 21004.666666666668,
+        "minBatchDuration": 18477,
+        "maxBatchDuration": 22775,
+        "p50Duration": 21762,
+        "p95Duration": 22775,
+        "p99Duration": 22775
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 21772,
+        "avgItemsPerSecond": 13.77916590115745,
+        "avgBatchDuration": 21014.666666666668,
+        "minBatchDuration": 19505,
+        "maxBatchDuration": 21772,
+        "p50Duration": 21767,
+        "p95Duration": 21772,
+        "p99Duration": 21772
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 22339,
+        "avgItemsPerSecond": 13.42942835399973,
+        "avgBatchDuration": 21297.333333333332,
+        "minBatchDuration": 20240,
+        "maxBatchDuration": 22339,
+        "p50Duration": 21313,
+        "p95Duration": 22339,
+        "p99Duration": 22339
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 22597,
+        "avgItemsPerSecond": 13.276098597158914,
+        "avgBatchDuration": 20592.333333333332,
+        "minBatchDuration": 17413,
+        "maxBatchDuration": 22597,
+        "p50Duration": 21767,
+        "p95Duration": 22597,
+        "p99Duration": 22597
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 21762,
+        "avgItemsPerSecond": 13.785497656465399,
+        "avgBatchDuration": 21700,
+        "minBatchDuration": 21578,
+        "maxBatchDuration": 21762,
+        "p50Duration": 21760,
+        "p95Duration": 21762,
+        "p99Duration": 21762
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 22275,
+        "avgItemsPerSecond": 13.468013468013467,
+        "avgBatchDuration": 22239.333333333332,
+        "minBatchDuration": 22218,
+        "maxBatchDuration": 22275,
+        "p50Duration": 22225,
+        "p95Duration": 22275,
+        "p99Duration": 22275
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 16719,
+        "avgItemsPerSecond": 17.94365691727974,
+        "avgBatchDuration": 15697,
+        "minBatchDuration": 13656,
+        "maxBatchDuration": 16719,
+        "p50Duration": 16716,
+        "p95Duration": 16719,
+        "p99Duration": 16719
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 23387,
+        "avgItemsPerSecond": 12.827639286783254,
+        "avgBatchDuration": 23160.333333333332,
+        "minBatchDuration": 22770,
+        "maxBatchDuration": 23387,
+        "p50Duration": 23324,
+        "p95Duration": 23387,
+        "p99Duration": 23387
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:16:28.939Z",
+    "end": "2025-12-15T15:16:52.429Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **114.94 items/sec** (**BEST IN ALL TESTS SO FAR!** 2.78x vs single consumer)
+- Fairness: **0.9888** (noticeably lower - some tenants got 17s while others got 23s)
+- CPU impact: **Not measured, but likely higher.**
+- Contention visible?: **Yes, fairness degradation suggests some contention/scheduling variance.** One tenant (org-3:efaelbvnogkhjnrdfsmi) finished in 16.7s while others took 21-23s. **10 consumers is great for throughput but comes at fairness cost.**
+
+</details>
+
+---
+
+## Series E: Consumer Interval Variations
+
+**Objective:** Test polling frequency impact on throughput and latency.
+
+**Theory:**
+
+- Lower interval = more responsive, higher CPU usage
+- Higher interval = lower CPU, higher latency for new work
+
+### Test E1: Fast Polling (interval=20ms)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=20
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Fast polling 20ms"
+```
+
+<details>
+<summary>Results E1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Fast polling 20ms",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 70.23019898556379,
+    "overallDuration": 38445,
+    "fairnessIndex": 0.9979118686098942,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38383,
+        "avgItemsPerSecond": 7.815960190709429,
+        "avgBatchDuration": 32665.333333333332,
+        "minBatchDuration": 28219,
+        "maxBatchDuration": 38381,
+        "p50Duration": 31396,
+        "p95Duration": 38381,
+        "p99Duration": 38381
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37376,
+        "avgItemsPerSecond": 8.026541095890412,
+        "avgBatchDuration": 37178.333333333336,
+        "minBatchDuration": 36801,
+        "maxBatchDuration": 37376,
+        "p50Duration": 37358,
+        "p95Duration": 37376,
+        "p99Duration": 37376
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37361,
+        "avgItemsPerSecond": 8.029763657289687,
+        "avgBatchDuration": 29490.666666666668,
+        "minBatchDuration": 23952,
+        "maxBatchDuration": 37361,
+        "p50Duration": 27159,
+        "p95Duration": 37361,
+        "p99Duration": 37361
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37997,
+        "avgItemsPerSecond": 7.895360160012633,
+        "avgBatchDuration": 36532,
+        "minBatchDuration": 34226,
+        "maxBatchDuration": 37994,
+        "p50Duration": 37376,
+        "p95Duration": 37994,
+        "p99Duration": 37994
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37889,
+        "avgItemsPerSecond": 7.917865343503392,
+        "avgBatchDuration": 36989,
+        "minBatchDuration": 35364,
+        "maxBatchDuration": 37867,
+        "p50Duration": 37736,
+        "p95Duration": 37867,
+        "p99Duration": 37867
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 37359,
+        "avgItemsPerSecond": 8.030193527664016,
+        "avgBatchDuration": 36533.666666666664,
+        "minBatchDuration": 35927,
+        "maxBatchDuration": 37357,
+        "p50Duration": 36317,
+        "p95Duration": 37357,
+        "p99Duration": 37357
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38245,
+        "avgItemsPerSecond": 7.844162635638646,
+        "avgBatchDuration": 34851.333333333336,
+        "minBatchDuration": 28081,
+        "maxBatchDuration": 38237,
+        "p50Duration": 38236,
+        "p95Duration": 38237,
+        "p99Duration": 38237
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 38090,
+        "avgItemsPerSecond": 7.876082961407193,
+        "avgBatchDuration": 36777.666666666664,
+        "minBatchDuration": 34984,
+        "maxBatchDuration": 38019,
+        "p50Duration": 37330,
+        "p95Duration": 38019,
+        "p99Duration": 38019
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 33054,
+        "avgItemsPerSecond": 9.076057360682519,
+        "avgBatchDuration": 24749.666666666668,
+        "minBatchDuration": 17350,
+        "maxBatchDuration": 33048,
+        "p50Duration": 23851,
+        "p95Duration": 33048,
+        "p99Duration": 33048
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:18:51.094Z",
+    "end": "2025-12-15T15:19:29.539Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **70.23 items/sec** (good improvement over baseline)
+- Fairness: **0.9979** (slightly lower)
+- CPU usage (if observed): **Expected higher due to more frequent polling.** Faster polling didn't dramatically improve throughput - suggests bottleneck is elsewhere (processing time, not poll latency).
+
+</details>
+
+### Test E2: Medium Polling (interval=50ms)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Medium polling 50ms"
+```
+
+<details>
+<summary>Results E2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Medium polling 50ms",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 93.56806210146937,
+    "overallDuration": 28856,
+    "fairnessIndex": 0.9994094367115308,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28584,
+        "avgItemsPerSecond": 10.495382031905962,
+        "avgBatchDuration": 26949,
+        "minBatchDuration": 25606,
+        "maxBatchDuration": 28582,
+        "p50Duration": 26659,
+        "p95Duration": 28582,
+        "p99Duration": 28582
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28733,
+        "avgItemsPerSecond": 10.440956391605472,
+        "avgBatchDuration": 28390,
+        "minBatchDuration": 27709,
+        "maxBatchDuration": 28732,
+        "p50Duration": 28729,
+        "p95Duration": 28732,
+        "p99Duration": 28732
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 26660,
+        "avgItemsPerSecond": 11.252813203300825,
+        "avgBatchDuration": 24539,
+        "minBatchDuration": 20303,
+        "maxBatchDuration": 26660,
+        "p50Duration": 26654,
+        "p95Duration": 26660,
+        "p99Duration": 26660
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28729,
+        "avgItemsPerSecond": 10.442410108252986,
+        "avgBatchDuration": 28355.333333333332,
+        "minBatchDuration": 27708,
+        "maxBatchDuration": 28727,
+        "p50Duration": 28631,
+        "p95Duration": 28727,
+        "p99Duration": 28727
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28732,
+        "avgItemsPerSecond": 10.44131978282055,
+        "avgBatchDuration": 23195.666666666668,
+        "minBatchDuration": 13149,
+        "maxBatchDuration": 28729,
+        "p50Duration": 27709,
+        "p95Duration": 28729,
+        "p99Duration": 28729
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28683,
+        "avgItemsPerSecond": 10.459156991946449,
+        "avgBatchDuration": 28325,
+        "minBatchDuration": 27667,
+        "maxBatchDuration": 28680,
+        "p50Duration": 28628,
+        "p95Duration": 28680,
+        "p99Duration": 28680
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28728,
+        "avgItemsPerSecond": 10.442773600668337,
+        "avgBatchDuration": 28049,
+        "minBatchDuration": 26791,
+        "maxBatchDuration": 28728,
+        "p50Duration": 28628,
+        "p95Duration": 28728,
+        "p99Duration": 28728
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28829,
+        "avgItemsPerSecond": 10.406188213257483,
+        "avgBatchDuration": 28452.666666666668,
+        "minBatchDuration": 27805,
+        "maxBatchDuration": 28829,
+        "p50Duration": 28724,
+        "p95Duration": 28829,
+        "p99Duration": 28829
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28824,
+        "avgItemsPerSecond": 10.407993338884264,
+        "avgBatchDuration": 28786.666666666668,
+        "minBatchDuration": 28727,
+        "maxBatchDuration": 28817,
+        "p50Duration": 28816,
+        "p95Duration": 28817,
+        "p99Duration": 28817
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:20:41.913Z",
+    "end": "2025-12-15T15:21:10.769Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **93.57 items/sec** (**BEST in E series!** +72% vs baseline)
+- Fairness: **0.9994** (excellent)
+- **50ms polling with 3 consumers is a sweet spot.** Much better than 20ms (70.23) - suggests 20ms introduced contention overhead.
+
+</details>
+
+### Test E3: Default Polling (interval=100ms)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=100
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Default polling 100ms"
+```
+
+<details>
+<summary>Results E3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Default polling 100ms",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 86.52182272639877,
+    "overallDuration": 31206,
+    "fairnessIndex": 0.9996560386487722,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31119,
+        "avgItemsPerSecond": 9.640412609659693,
+        "avgBatchDuration": 24846,
+        "minBatchDuration": 12442,
+        "maxBatchDuration": 31116,
+        "p50Duration": 30980,
+        "p95Duration": 31116,
+        "p99Duration": 31116
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30083,
+        "avgItemsPerSecond": 9.972409666589103,
+        "avgBatchDuration": 28193.666666666668,
+        "minBatchDuration": 24794,
+        "maxBatchDuration": 30082,
+        "p50Duration": 29705,
+        "p95Duration": 30082,
+        "p99Duration": 30082
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30774,
+        "avgItemsPerSecond": 9.748488984207448,
+        "avgBatchDuration": 28711.333333333332,
+        "minBatchDuration": 26655,
+        "maxBatchDuration": 30774,
+        "p50Duration": 28705,
+        "p95Duration": 30774,
+        "p99Duration": 30774
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29722,
+        "avgItemsPerSecond": 10.093533409595585,
+        "avgBatchDuration": 29380.666666666668,
+        "minBatchDuration": 28699,
+        "maxBatchDuration": 29722,
+        "p50Duration": 29721,
+        "p95Duration": 29722,
+        "p99Duration": 29722
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30761,
+        "avgItemsPerSecond": 9.752608822860115,
+        "avgBatchDuration": 28703,
+        "minBatchDuration": 27637,
+        "maxBatchDuration": 30759,
+        "p50Duration": 27713,
+        "p95Duration": 30759,
+        "p99Duration": 30759
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29721,
+        "avgItemsPerSecond": 10.093873019077419,
+        "avgBatchDuration": 29032.333333333332,
+        "minBatchDuration": 27674,
+        "maxBatchDuration": 29719,
+        "p50Duration": 29704,
+        "p95Duration": 29719,
+        "p99Duration": 29719
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30089,
+        "avgItemsPerSecond": 9.97042108411712,
+        "avgBatchDuration": 23863.666666666668,
+        "minBatchDuration": 12440,
+        "maxBatchDuration": 30087,
+        "p50Duration": 29064,
+        "p95Duration": 30087,
+        "p99Duration": 30087
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29704,
+        "avgItemsPerSecond": 10.099649878804202,
+        "avgBatchDuration": 23475,
+        "minBatchDuration": 20361,
+        "maxBatchDuration": 29701,
+        "p50Duration": 20363,
+        "p95Duration": 29701,
+        "p99Duration": 29701
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31114,
+        "avgItemsPerSecond": 9.641961817831202,
+        "avgBatchDuration": 30969.333333333332,
+        "minBatchDuration": 30943,
+        "maxBatchDuration": 30984,
+        "p50Duration": 30981,
+        "p95Duration": 30984,
+        "p99Duration": 30984
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:22:27.627Z",
+    "end": "2025-12-15T15:22:58.833Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **86.52 items/sec** (+59% vs baseline)
+- Fairness: **0.9997** (excellent)
+- 100ms default is solid but slightly lower than 50ms (93.57). **100ms is a good default for balance.**
+
+</details>
+
+### Test E4: Slow Polling (interval=250ms)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=250
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Slow polling 250ms"
+```
+
+<details>
+<summary>Results E4 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Slow polling 250ms",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 47.45583970471922,
+    "overallDuration": 56895,
+    "fairnessIndex": 0.9993684226112225,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 56835,
+        "avgItemsPerSecond": 5.278437582475587,
+        "avgBatchDuration": 56487.666666666664,
+        "minBatchDuration": 56107,
+        "maxBatchDuration": 56835,
+        "p50Duration": 56521,
+        "p95Duration": 56835,
+        "p99Duration": 56835
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 56711,
+        "avgItemsPerSecond": 5.289979016416568,
+        "avgBatchDuration": 48760.666666666664,
+        "minBatchDuration": 34046,
+        "maxBatchDuration": 56710,
+        "p50Duration": 55526,
+        "p95Duration": 56710,
+        "p99Duration": 56710
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 55715,
+        "avgItemsPerSecond": 5.384546351969847,
+        "avgBatchDuration": 55026.666666666664,
+        "minBatchDuration": 54680,
+        "maxBatchDuration": 55715,
+        "p50Duration": 54685,
+        "p95Duration": 55715,
+        "p99Duration": 55715
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 56114,
+        "avgItemsPerSecond": 5.346259400506113,
+        "avgBatchDuration": 47434,
+        "minBatchDuration": 42815,
+        "maxBatchDuration": 56109,
+        "p50Duration": 43378,
+        "p95Duration": 56109,
+        "p99Duration": 56109
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 52049,
+        "avgItemsPerSecond": 5.763799496628177,
+        "avgBatchDuration": 51173,
+        "minBatchDuration": 49551,
+        "maxBatchDuration": 52046,
+        "p50Duration": 51922,
+        "p95Duration": 52046,
+        "p99Duration": 52046
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 55787,
+        "avgItemsPerSecond": 5.377596931184685,
+        "avgBatchDuration": 55069.666666666664,
+        "minBatchDuration": 53713,
+        "maxBatchDuration": 55787,
+        "p50Duration": 55709,
+        "p95Duration": 55787,
+        "p99Duration": 55787
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 55790,
+        "avgItemsPerSecond": 5.377307761247535,
+        "avgBatchDuration": 47576,
+        "minBatchDuration": 31153,
+        "maxBatchDuration": 55788,
+        "p50Duration": 55787,
+        "p95Duration": 55788,
+        "p99Duration": 55788
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 56010,
+        "avgItemsPerSecond": 5.356186395286556,
+        "avgBatchDuration": 47534.333333333336,
+        "minBatchDuration": 30885,
+        "maxBatchDuration": 56010,
+        "p50Duration": 55708,
+        "p95Duration": 56010,
+        "p99Duration": 56010
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 55784,
+        "avgItemsPerSecond": 5.377886132224293,
+        "avgBatchDuration": 55374.333333333336,
+        "minBatchDuration": 54732,
+        "maxBatchDuration": 55784,
+        "p50Duration": 55607,
+        "p95Duration": 55784,
+        "p99Duration": 55784
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:24:13.441Z",
+    "end": "2025-12-15T15:25:10.336Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **47.46 items/sec** (-13% vs baseline, worst in E series)
+- Fairness: **0.9994** (good)
+- Latency impact: **Significant.** Duration 56.9s vs 28.9s for 50ms. **250ms is too slow - introduces unnecessary latency between scheduling rounds.**
+
+</details>
+
+---
+
+## Series F: Concurrency Limit Variations
+
+**Objective:** Test per-environment processing concurrency limits.
+
+**Theory:**
+
+- Lower concurrency = throttled processing per env, better resource control
+- Higher concurrency = faster per-env processing, potentially starving smaller tenants
+
+### Test F1: Low Concurrency (concurrency=2)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=2
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Low concurrency=2"
+```
+
+<details>
+<summary>Results F1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Low concurrency=2",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 90.7288551362613,
+    "overallDuration": 29759,
+    "fairnessIndex": 0.9931064638844554,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28794,
+        "avgItemsPerSecond": 10.418837257762034,
+        "avgBatchDuration": 27016,
+        "minBatchDuration": 23890,
+        "maxBatchDuration": 28794,
+        "p50Duration": 28364,
+        "p95Duration": 28794,
+        "p99Duration": 28794
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29532,
+        "avgItemsPerSecond": 10.158472165786264,
+        "avgBatchDuration": 27720,
+        "minBatchDuration": 26284,
+        "maxBatchDuration": 29529,
+        "p50Duration": 27347,
+        "p95Duration": 29529,
+        "p99Duration": 29529
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29439,
+        "avgItemsPerSecond": 10.19056353816366,
+        "avgBatchDuration": 22083.333333333332,
+        "minBatchDuration": 10765,
+        "maxBatchDuration": 29423,
+        "p50Duration": 26062,
+        "p95Duration": 29423,
+        "p99Duration": 29423
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29529,
+        "avgItemsPerSecond": 10.15950421619425,
+        "avgBatchDuration": 22252.666666666668,
+        "minBatchDuration": 17683,
+        "maxBatchDuration": 29396,
+        "p50Duration": 19679,
+        "p95Duration": 29396,
+        "p99Duration": 29396
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28474,
+        "avgItemsPerSecond": 10.535927512818711,
+        "avgBatchDuration": 26113.666666666668,
+        "minBatchDuration": 24815,
+        "maxBatchDuration": 28474,
+        "p50Duration": 25052,
+        "p95Duration": 28474,
+        "p99Duration": 28474
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 22890,
+        "avgItemsPerSecond": 13.10615989515072,
+        "avgBatchDuration": 22201.666666666668,
+        "minBatchDuration": 20834,
+        "maxBatchDuration": 22887,
+        "p50Duration": 22884,
+        "p95Duration": 22887,
+        "p99Duration": 22887
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 27952,
+        "avgItemsPerSecond": 10.732684602175159,
+        "avgBatchDuration": 21568.333333333332,
+        "minBatchDuration": 18289,
+        "maxBatchDuration": 27826,
+        "p50Duration": 18590,
+        "p95Duration": 27826,
+        "p99Duration": 27826
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28473,
+        "avgItemsPerSecond": 10.536297545042672,
+        "avgBatchDuration": 26193.333333333332,
+        "minBatchDuration": 25054,
+        "maxBatchDuration": 28470,
+        "p50Duration": 25056,
+        "p95Duration": 28470,
+        "p99Duration": 28470
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29668,
+        "avgItemsPerSecond": 10.111905082917621,
+        "avgBatchDuration": 28195.666666666668,
+        "minBatchDuration": 25936,
+        "maxBatchDuration": 29562,
+        "p50Duration": 29089,
+        "p95Duration": 29562,
+        "p99Duration": 29562
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:27:02.038Z",
+    "end": "2025-12-15T15:27:31.797Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **90.73 items/sec** (+66% vs baseline)
+- Fairness index: **0.9931** (slightly degraded)
+- Processing time variance: **Higher.** One tenant (org-2:giomqjmqmqbcngusxqfo) finished in 22.9s while others took 28-30s. **Low concurrency=2 paradoxically gave high throughput but with fairness cost.** The system may be "batching up" work more efficiently but creating uneven distribution.
+
+</details>
+
+### Test F2: Medium Concurrency (concurrency=5)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=5
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Medium concurrency=5"
+```
+
+<details>
+<summary>Results F2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Medium concurrency=5",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 58.25368400612742,
+    "overallDuration": 46349,
+    "fairnessIndex": 0.9998661349420435,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46278,
+        "avgItemsPerSecond": 6.482561908466226,
+        "avgBatchDuration": 45090,
+        "minBatchDuration": 43007,
+        "maxBatchDuration": 46275,
+        "p50Duration": 45988,
+        "p95Duration": 46275,
+        "p99Duration": 46275
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 45205,
+        "avgItemsPerSecond": 6.63643402278509,
+        "avgBatchDuration": 44818,
+        "minBatchDuration": 44147,
+        "maxBatchDuration": 45164,
+        "p50Duration": 45143,
+        "p95Duration": 45164,
+        "p99Duration": 45164
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 45206,
+        "avgItemsPerSecond": 6.636287218510818,
+        "avgBatchDuration": 44442,
+        "minBatchDuration": 43086,
+        "maxBatchDuration": 45206,
+        "p50Duration": 45034,
+        "p95Duration": 45206,
+        "p99Duration": 45206
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 45210,
+        "avgItemsPerSecond": 6.635700066357001,
+        "avgBatchDuration": 44481.666666666664,
+        "minBatchDuration": 43090,
+        "maxBatchDuration": 45210,
+        "p50Duration": 45145,
+        "p95Duration": 45210,
+        "p99Duration": 45210
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 45209,
+        "avgItemsPerSecond": 6.635846844654825,
+        "avgBatchDuration": 45130.333333333336,
+        "minBatchDuration": 44982,
+        "maxBatchDuration": 45207,
+        "p50Duration": 45202,
+        "p95Duration": 45207,
+        "p99Duration": 45207
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46279,
+        "avgItemsPerSecond": 6.482421832796733,
+        "avgBatchDuration": 45474,
+        "minBatchDuration": 44160,
+        "maxBatchDuration": 46277,
+        "p50Duration": 45985,
+        "p95Duration": 46277,
+        "p99Duration": 46277
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 45209,
+        "avgItemsPerSecond": 6.635846844654825,
+        "avgBatchDuration": 44499.333333333336,
+        "minBatchDuration": 43086,
+        "maxBatchDuration": 45206,
+        "p50Duration": 45206,
+        "p95Duration": 45206,
+        "p99Duration": 45206
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46278,
+        "avgItemsPerSecond": 6.482561908466226,
+        "avgBatchDuration": 45212,
+        "minBatchDuration": 44153,
+        "maxBatchDuration": 46276,
+        "p50Duration": 45207,
+        "p95Duration": 46276,
+        "p99Duration": 46276
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 46262,
+        "avgItemsPerSecond": 6.484803942760797,
+        "avgBatchDuration": 44808,
+        "minBatchDuration": 42006,
+        "maxBatchDuration": 46209,
+        "p50Duration": 46209,
+        "p95Duration": 46209,
+        "p99Duration": 46209
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:28:48.965Z",
+    "end": "2025-12-15T15:29:35.314Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **58.25 items/sec** (+7% vs baseline)
+- Fairness index: **0.9999** (nearly perfect!)
+- **Concurrency=5 gives best fairness but modest throughput.** All tenants completed in 45-46s range (very tight clustering).
+
+</details>
+
+### Test F3: Default Concurrency (concurrency=10)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Default concurrency=10"
+```
+
+<details>
+<summary>Results F3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Default concurrency=10",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 88.71073728479432,
+    "overallDuration": 30436,
+    "fairnessIndex": 0.9986319639223729,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29265,
+        "avgItemsPerSecond": 10.251153254741158,
+        "avgBatchDuration": 22707.666666666668,
+        "minBatchDuration": 12771,
+        "maxBatchDuration": 29256,
+        "p50Duration": 26096,
+        "p95Duration": 29256,
+        "p99Duration": 29256
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30322,
+        "avgItemsPerSecond": 9.893806477145308,
+        "avgBatchDuration": 23069,
+        "minBatchDuration": 12719,
+        "maxBatchDuration": 30322,
+        "p50Duration": 26166,
+        "p95Duration": 30322,
+        "p99Duration": 30322
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29049,
+        "avgItemsPerSecond": 10.327377878756584,
+        "avgBatchDuration": 26282.333333333332,
+        "minBatchDuration": 21766,
+        "maxBatchDuration": 29041,
+        "p50Duration": 28040,
+        "p95Duration": 29041,
+        "p99Duration": 29041
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29051,
+        "avgItemsPerSecond": 10.326666896148154,
+        "avgBatchDuration": 22590.333333333332,
+        "minBatchDuration": 11757,
+        "maxBatchDuration": 29043,
+        "p50Duration": 26971,
+        "p95Duration": 29043,
+        "p99Duration": 29043
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30247,
+        "avgItemsPerSecond": 9.918339008827322,
+        "avgBatchDuration": 22704.333333333332,
+        "minBatchDuration": 12811,
+        "maxBatchDuration": 30217,
+        "p50Duration": 25085,
+        "p95Duration": 30217,
+        "p99Duration": 30217
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30216,
+        "avgItemsPerSecond": 9.928514694201748,
+        "avgBatchDuration": 23965.333333333332,
+        "minBatchDuration": 12747,
+        "maxBatchDuration": 30216,
+        "p50Duration": 28933,
+        "p95Duration": 30216,
+        "p99Duration": 30216
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29163,
+        "avgItemsPerSecond": 10.287007509515483,
+        "avgBatchDuration": 29106,
+        "minBatchDuration": 29005,
+        "maxBatchDuration": 29163,
+        "p50Duration": 29150,
+        "p95Duration": 29163,
+        "p99Duration": 29163
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 26728,
+        "avgItemsPerSecond": 11.224184375935348,
+        "avgBatchDuration": 24337.666666666668,
+        "minBatchDuration": 21607,
+        "maxBatchDuration": 26726,
+        "p50Duration": 24680,
+        "p95Duration": 26726,
+        "p99Duration": 26726
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29268,
+        "avgItemsPerSecond": 10.25010250102501,
+        "avgBatchDuration": 28511.333333333332,
+        "minBatchDuration": 27111,
+        "maxBatchDuration": 29268,
+        "p50Duration": 29155,
+        "p95Duration": 29268,
+        "p99Duration": 29268
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:31:05.764Z",
+    "end": "2025-12-15T15:31:36.200Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **88.71 items/sec** (+63% vs baseline)
+- Fairness index: **0.9986** (very good)
+- **Default concurrency=10 is solid.** Good balance of throughput and fairness. Duration 30.4s.
+
+</details>
+
+### Test F4: High Concurrency (concurrency=25)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=25
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "High concurrency=25"
+```
+
+<details>
+<summary>Results F4 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "High concurrency=25",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 92.11873080859776,
+    "overallDuration": 29310,
+    "fairnessIndex": 0.9985800387045317,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28196,
+        "avgItemsPerSecond": 10.63980706483189,
+        "avgBatchDuration": 21146.333333333332,
+        "minBatchDuration": 9134,
+        "maxBatchDuration": 28193,
+        "p50Duration": 26112,
+        "p95Duration": 28193,
+        "p99Duration": 28193
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 26122,
+        "avgItemsPerSecond": 11.484572391087971,
+        "avgBatchDuration": 24917.333333333332,
+        "minBatchDuration": 22512,
+        "maxBatchDuration": 26122,
+        "p50Duration": 26118,
+        "p95Duration": 26122,
+        "p99Duration": 26122
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 27157,
+        "avgItemsPerSecond": 11.046875575358102,
+        "avgBatchDuration": 20760.333333333332,
+        "minBatchDuration": 17529,
+        "maxBatchDuration": 27154,
+        "p50Duration": 17598,
+        "p95Duration": 27154,
+        "p99Duration": 27154
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29234,
+        "avgItemsPerSecond": 10.262023671067935,
+        "avgBatchDuration": 27852.666666666668,
+        "minBatchDuration": 27155,
+        "maxBatchDuration": 29232,
+        "p50Duration": 27171,
+        "p95Duration": 29232,
+        "p99Duration": 29232
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29230,
+        "avgItemsPerSecond": 10.263427984946972,
+        "avgBatchDuration": 28536,
+        "minBatchDuration": 27154,
+        "maxBatchDuration": 29230,
+        "p50Duration": 29224,
+        "p95Duration": 29230,
+        "p99Duration": 29230
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28199,
+        "avgItemsPerSecond": 10.63867513032377,
+        "avgBatchDuration": 28189.666666666668,
+        "minBatchDuration": 28179,
+        "maxBatchDuration": 28195,
+        "p50Duration": 28195,
+        "p95Duration": 28195,
+        "p99Duration": 28195
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29231,
+        "avgItemsPerSecond": 10.26307687044576,
+        "avgBatchDuration": 27848.333333333332,
+        "minBatchDuration": 27149,
+        "maxBatchDuration": 29231,
+        "p50Duration": 27165,
+        "p95Duration": 29231,
+        "p99Duration": 29231
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 28194,
+        "avgItemsPerSecond": 10.640561821664184,
+        "avgBatchDuration": 27132.666666666668,
+        "minBatchDuration": 26095,
+        "maxBatchDuration": 28190,
+        "p50Duration": 27113,
+        "p95Duration": 28190,
+        "p99Duration": 28190
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 29234,
+        "avgItemsPerSecond": 10.262023671067935,
+        "avgBatchDuration": 28871,
+        "minBatchDuration": 28201,
+        "maxBatchDuration": 29232,
+        "p50Duration": 29180,
+        "p95Duration": 29232,
+        "p99Duration": 29232
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:32:57.803Z",
+    "end": "2025-12-15T15:33:27.113Z"
+  }
+}
+```
+
+**Observations:**
+
+- Throughput: **92.12 items/sec** (+69% vs baseline, best in F series)
+- Fairness index: **0.9986** (very good)
+- Resource contention?: **Minimal.** Duration 29.3s, only marginally better than concurrency=10 (30.4s). **Diminishing returns above concurrency=10.** Higher concurrency helps but gains are flattening.
+
+</details>
+
+---
+
+## Series G: Global Rate Limiter
+
+**Objective:** Test global throughput caps across all consumers.
+
+**Theory:**
+
+- Rate limiting provides predictable resource consumption
+- Should not affect fairness, only overall throughput
+
+### Test G1: Moderate Rate Limit (50 items/sec)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+BATCH_QUEUE_GLOBAL_RATE_LIMIT=50
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Rate limit 50/sec"
+```
+
+<details>
+<summary>Results G1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Rate limit 50/sec",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 45.432364670447086,
+    "overallDuration": 59429,
+    "fairnessIndex": 0.9985621839167762,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 54093,
+        "avgItemsPerSecond": 5.546004104043037,
+        "avgBatchDuration": 54091,
+        "minBatchDuration": 54089,
+        "maxBatchDuration": 54093,
+        "p50Duration": 54091,
+        "p95Duration": 54093,
+        "p99Duration": 54093
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 54109,
+        "avgItemsPerSecond": 5.544364153837624,
+        "avgBatchDuration": 53601,
+        "minBatchDuration": 52695,
+        "maxBatchDuration": 54109,
+        "p50Duration": 53999,
+        "p95Duration": 54109,
+        "p99Duration": 54109
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 59343,
+        "avgItemsPerSecond": 5.055356149840756,
+        "avgBatchDuration": 57304.333333333336,
+        "minBatchDuration": 55866,
+        "maxBatchDuration": 59029,
+        "p50Duration": 57018,
+        "p95Duration": 59029,
+        "p99Duration": 59029
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 58371,
+        "avgItemsPerSecond": 5.139538469445443,
+        "avgBatchDuration": 57164.333333333336,
+        "minBatchDuration": 56262,
+        "maxBatchDuration": 58093,
+        "p50Duration": 57138,
+        "p95Duration": 58093,
+        "p99Duration": 58093
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 58285,
+        "avgItemsPerSecond": 5.147121901003689,
+        "avgBatchDuration": 55634.333333333336,
+        "minBatchDuration": 50470,
+        "maxBatchDuration": 58284,
+        "p50Duration": 58149,
+        "p95Duration": 58284,
+        "p99Duration": 58284
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 55174,
+        "avgItemsPerSecond": 5.437343676369304,
+        "avgBatchDuration": 41686.333333333336,
+        "minBatchDuration": 28166,
+        "maxBatchDuration": 55157,
+        "p50Duration": 41736,
+        "p95Duration": 55157,
+        "p99Duration": 55157
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 58284,
+        "avgItemsPerSecond": 5.147210212065061,
+        "avgBatchDuration": 57015.666666666664,
+        "minBatchDuration": 54788,
+        "maxBatchDuration": 58246,
+        "p50Duration": 58013,
+        "p95Duration": 58246,
+        "p99Duration": 58246
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 59296,
+        "avgItemsPerSecond": 5.059363194819212,
+        "avgBatchDuration": 58258.666666666664,
+        "minBatchDuration": 57226,
+        "maxBatchDuration": 59291,
+        "p50Duration": 58259,
+        "p95Duration": 59291,
+        "p99Duration": 59291
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 59408,
+        "avgItemsPerSecond": 5.049824939402101,
+        "avgBatchDuration": 58836.333333333336,
+        "minBatchDuration": 58371,
+        "maxBatchDuration": 59107,
+        "p50Duration": 59031,
+        "p95Duration": 59107,
+        "p99Duration": 59107
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:35:48.593Z",
+    "end": "2025-12-15T15:36:48.022Z"
+  }
+}
+```
+
+**Observations:**
+
+- Actual throughput: **45.43 items/sec** (target: 50) - ~91% of limit
+- Fairness preserved?: **Yes, 0.9986** (excellent)
+- **Rate limiter is working correctly.** Duration 59.4s shows throttling is effective. Some overhead explains why we don't hit exactly 50/sec.
+
+</details>
+
+### Test G2: Higher Rate Limit (100 items/sec)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+BATCH_QUEUE_GLOBAL_RATE_LIMIT=100
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Rate limit 100/sec"
+```
+
+<details>
+<summary>Results G2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Rate limit 100/sec",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 81.93487694595333,
+    "overallDuration": 32953,
+    "fairnessIndex": 0.9994851661042276,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31984,
+        "avgItemsPerSecond": 9.379689844922462,
+        "avgBatchDuration": 30240.333333333332,
+        "minBatchDuration": 28799,
+        "maxBatchDuration": 31980,
+        "p50Duration": 29942,
+        "p95Duration": 31980,
+        "p99Duration": 31980
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31947,
+        "avgItemsPerSecond": 9.3905531035778,
+        "avgBatchDuration": 26446,
+        "minBatchDuration": 23696,
+        "maxBatchDuration": 31945,
+        "p50Duration": 23697,
+        "p95Duration": 31945,
+        "p99Duration": 31945
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 32914,
+        "avgItemsPerSecond": 9.114662453667133,
+        "avgBatchDuration": 31870.666666666668,
+        "minBatchDuration": 29821,
+        "maxBatchDuration": 32912,
+        "p50Duration": 32879,
+        "p95Duration": 32912,
+        "p99Duration": 32912
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30770,
+        "avgItemsPerSecond": 9.749756256093598,
+        "avgBatchDuration": 26862,
+        "minBatchDuration": 22381,
+        "maxBatchDuration": 30768,
+        "p50Duration": 27437,
+        "p95Duration": 30768,
+        "p99Duration": 30768
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30770,
+        "avgItemsPerSecond": 9.749756256093598,
+        "avgBatchDuration": 29516.666666666668,
+        "minBatchDuration": 27853,
+        "maxBatchDuration": 30769,
+        "p50Duration": 29928,
+        "p95Duration": 30769,
+        "p99Duration": 30769
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30771,
+        "avgItemsPerSecond": 9.749439407234084,
+        "avgBatchDuration": 28237.333333333332,
+        "minBatchDuration": 25781,
+        "maxBatchDuration": 30769,
+        "p50Duration": 28162,
+        "p95Duration": 30769,
+        "p99Duration": 30769
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31890,
+        "avgItemsPerSecond": 9.40733772342427,
+        "avgBatchDuration": 23515.666666666668,
+        "minBatchDuration": 18184,
+        "maxBatchDuration": 31888,
+        "p50Duration": 20475,
+        "p95Duration": 31888,
+        "p99Duration": 31888
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 30956,
+        "avgItemsPerSecond": 9.691174570357928,
+        "avgBatchDuration": 28886,
+        "minBatchDuration": 25781,
+        "maxBatchDuration": 30947,
+        "p50Duration": 29930,
+        "p95Duration": 30947,
+        "p99Duration": 30947
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 31976,
+        "avgItemsPerSecond": 9.382036527395547,
+        "avgBatchDuration": 29608.666666666668,
+        "minBatchDuration": 26943,
+        "maxBatchDuration": 31974,
+        "p50Duration": 29909,
+        "p95Duration": 31974,
+        "p99Duration": 31974
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:37:49.150Z",
+    "end": "2025-12-15T15:38:22.103Z"
+  }
+}
+```
+
+**Observations:**
+
+- Actual throughput: **81.93 items/sec** (limit was 100)
+- Is this limit binding or above natural throughput?: **Above natural throughput.** Without rate limiting (E2 with same settings), throughput was 93.57/sec. The 100/sec limit is barely constraining. **Use rate limits below ~90/sec to have meaningful impact.**
+
+</details>
+
+### Test G3: Low Rate Limit (20 items/sec)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+BATCH_QUEUE_GLOBAL_RATE_LIMIT=20
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Rate limit 20/sec"
+```
+
+<details>
+<summary>Results G3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "fairness-9t",
+  "description": "Rate limit 20/sec",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 100,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 2700,
+    "totalBatches": 27,
+    "overallThroughput": 21.692671090900326,
+    "overallDuration": 124466,
+    "fairnessIndex": 0.997793763355806,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 108861,
+        "avgItemsPerSecond": 2.755807865075647,
+        "avgBatchDuration": 99844,
+        "minBatchDuration": 93281,
+        "maxBatchDuration": 108850,
+        "p50Duration": 97401,
+        "p95Duration": 108850,
+        "p99Duration": 108850
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 111633,
+        "avgItemsPerSecond": 2.687377388406654,
+        "avgBatchDuration": 85438,
+        "minBatchDuration": 71861,
+        "maxBatchDuration": 111516,
+        "p50Duration": 72937,
+        "p95Duration": 111516,
+        "p99Duration": 111516
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 123298,
+        "avgItemsPerSecond": 2.433129491151519,
+        "avgBatchDuration": 96355,
+        "minBatchDuration": 43494,
+        "maxBatchDuration": 123297,
+        "p50Duration": 122274,
+        "p95Duration": 123297,
+        "p99Duration": 123297
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 121568,
+        "avgItemsPerSecond": 2.4677546722821795,
+        "avgBatchDuration": 92002,
+        "minBatchDuration": 53253,
+        "maxBatchDuration": 121568,
+        "p50Duration": 101185,
+        "p95Duration": 121568,
+        "p99Duration": 121568
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 123851,
+        "avgItemsPerSecond": 2.422265464146434,
+        "avgBatchDuration": 118623.66666666667,
+        "minBatchDuration": 111599,
+        "maxBatchDuration": 123784,
+        "p50Duration": 120488,
+        "p95Duration": 123784,
+        "p99Duration": 123784
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 120270,
+        "avgItemsPerSecond": 2.4943876278373662,
+        "avgBatchDuration": 113171.33333333333,
+        "minBatchDuration": 109360,
+        "maxBatchDuration": 120269,
+        "p50Duration": 109885,
+        "p95Duration": 120269,
+        "p99Duration": 120269
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 123169,
+        "avgItemsPerSecond": 2.4356778085394866,
+        "avgBatchDuration": 118514,
+        "minBatchDuration": 113405,
+        "maxBatchDuration": 123164,
+        "p50Duration": 118973,
+        "p95Duration": 123164,
+        "p99Duration": 123164
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 124246,
+        "avgItemsPerSecond": 2.414564653992885,
+        "avgBatchDuration": 119631.33333333333,
+        "minBatchDuration": 114504,
+        "maxBatchDuration": 124241,
+        "p50Duration": 120149,
+        "p95Duration": 124241,
+        "p99Duration": 124241
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 300,
+        "totalBatches": 3,
+        "totalDuration": 122197,
+        "avgItemsPerSecond": 2.4550520880218007,
+        "avgBatchDuration": 120645.33333333333,
+        "minBatchDuration": 118022,
+        "maxBatchDuration": 122197,
+        "p50Duration": 121717,
+        "p95Duration": 122197,
+        "p99Duration": 122197
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:39:42.414Z",
+    "end": "2025-12-15T15:41:46.880Z"
+  }
+}
+```
+
+**Observations:**
+
+- Actual throughput: **21.69 items/sec** (target: 20) - slightly above limit
+- Fairness index: **0.9978** (good but slight variance)
+- Duration 124.5s (2+ minutes) - shows throttling working hard. **Strict rate limiting works but creates fairness variance** - some tenants saw 72-124s batch durations (wide spread).
+
+</details>
+
+---
+
+## Series H: Asymmetric Load Testing
+
+**Objective:** Test fairness when tenants have dramatically different workloads.
+
+### Test H1: Asymmetric with Default Config
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress asymmetric --small-size 50 --large-size 800 --batch-count 3 -d "Asymmetric baseline"
+```
+
+<details>
+<summary>Results H1 (click to expand)</summary>
+
+```json
+{
+  "scenario": "asymmetric-combined",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 0,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 10350,
+    "totalBatches": 27,
+    "overallThroughput": 67.60816590394816,
+    "overallDuration": 107281,
+    "fairnessIndex": 0.9978993490004432,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16361,
+        "avgItemsPerSecond": 9.168143756494102,
+        "avgBatchDuration": 14312.666666666666,
+        "minBatchDuration": 12271,
+        "maxBatchDuration": 16360,
+        "p50Duration": 14307,
+        "p95Duration": 16360,
+        "p99Duration": 16360
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16361,
+        "avgItemsPerSecond": 9.168143756494102,
+        "avgBatchDuration": 13968.333333333334,
+        "minBatchDuration": 11240,
+        "maxBatchDuration": 16358,
+        "p50Duration": 14307,
+        "p95Duration": 16358,
+        "p99Duration": 16358
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16361,
+        "avgItemsPerSecond": 9.168143756494102,
+        "avgBatchDuration": 12117.333333333334,
+        "minBatchDuration": 8977,
+        "maxBatchDuration": 16359,
+        "p50Duration": 11016,
+        "p95Duration": 16359,
+        "p99Duration": 16359
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 13966,
+        "avgItemsPerSecond": 10.740369468709723,
+        "avgBatchDuration": 13624.333333333334,
+        "minBatchDuration": 12945,
+        "maxBatchDuration": 13964,
+        "p50Duration": 13964,
+        "p95Duration": 13964,
+        "p99Duration": 13964
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16116,
+        "avgItemsPerSecond": 9.307520476545047,
+        "avgBatchDuration": 14416.666666666666,
+        "minBatchDuration": 11021,
+        "maxBatchDuration": 16116,
+        "p50Duration": 16113,
+        "p95Duration": 16116,
+        "p99Duration": 16116
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 107273,
+        "avgItemsPerSecond": 22.37282447586998,
+        "avgBatchDuration": 106213,
+        "minBatchDuration": 105126,
+        "maxBatchDuration": 107273,
+        "p50Duration": 106240,
+        "p95Duration": 107273,
+        "p99Duration": 107273
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 106584,
+        "avgItemsPerSecond": 22.51745102454402,
+        "avgBatchDuration": 105934,
+        "minBatchDuration": 105097,
+        "maxBatchDuration": 106574,
+        "p50Duration": 106131,
+        "p95Duration": 106574,
+        "p99Duration": 106574
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 107116,
+        "avgItemsPerSecond": 22.40561634116285,
+        "avgBatchDuration": 106374.33333333333,
+        "minBatchDuration": 105308,
+        "maxBatchDuration": 107100,
+        "p50Duration": 106715,
+        "p95Duration": 107100,
+        "p99Duration": 107100
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 107046,
+        "avgItemsPerSecond": 22.42026792220167,
+        "avgBatchDuration": 104503.66666666667,
+        "minBatchDuration": 102401,
+        "maxBatchDuration": 106989,
+        "p50Duration": 104121,
+        "p95Duration": 106989,
+        "p99Duration": 106989
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:44:50.480Z",
+    "end": "2025-12-15T15:46:37.770Z"
+  }
+}
+```
+
+**Observations:**
+
+- Small batch completion times: **14-17s** (150 items × 5 tenants)
+- Large batch completion times: **105-107s** (2400 items × 4 tenants)
+- Were small batches starved?: **NO!** Small batches finished ~6x faster than large batches, exactly as expected. **DRR correctly prioritizes smaller workloads and doesn't let large batches monopolize.** Fairness index 0.9979 is excellent given asymmetric load.
+
+</details>
+
+### Test H2: Asymmetric with Low Quantum (better fairness?)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=2
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress asymmetric --small-size 50 --large-size 800 --batch-count 3 -d "Asymmetric low quantum"
+```
+
+<details>
+<summary>Results H2 (click to expand)</summary>
+
+```json
+{
+  "scenario": "asymmetric-combined",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 0,
+    "batchCount": 3
+  },
+  "results": {
+    "totalItemsProcessed": 10350,
+    "totalBatches": 27,
+    "overallThroughput": 58.418499446364066,
+    "overallDuration": 127189,
+    "fairnessIndex": 0.9991864215649569,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16648,
+        "avgItemsPerSecond": 9.01009130225853,
+        "avgBatchDuration": 15360,
+        "minBatchDuration": 14080,
+        "maxBatchDuration": 16647,
+        "p50Duration": 15353,
+        "p95Duration": 16647,
+        "p99Duration": 16647
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 18118,
+        "avgItemsPerSecond": 8.279059498840931,
+        "avgBatchDuration": 16403.333333333332,
+        "minBatchDuration": 15020,
+        "maxBatchDuration": 18115,
+        "p50Duration": 16075,
+        "p95Duration": 18115,
+        "p99Duration": 18115
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16307,
+        "avgItemsPerSecond": 9.198503710063163,
+        "avgBatchDuration": 15531.333333333334,
+        "minBatchDuration": 14206,
+        "maxBatchDuration": 16305,
+        "p50Duration": 16083,
+        "p95Duration": 16305,
+        "p99Duration": 16305
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 16646,
+        "avgItemsPerSecond": 9.011173855580921,
+        "avgBatchDuration": 14090,
+        "minBatchDuration": 11256,
+        "maxBatchDuration": 16645,
+        "p50Duration": 14369,
+        "p95Duration": 16645,
+        "p99Duration": 16645
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 150,
+        "totalBatches": 3,
+        "totalDuration": 17696,
+        "avgItemsPerSecond": 8.476491862567812,
+        "avgBatchDuration": 16322,
+        "minBatchDuration": 14600,
+        "maxBatchDuration": 17694,
+        "p50Duration": 16672,
+        "p95Duration": 17694,
+        "p99Duration": 17694
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 125841,
+        "avgItemsPerSecond": 19.07168569861969,
+        "avgBatchDuration": 125238.66666666667,
+        "minBatchDuration": 124354,
+        "maxBatchDuration": 125800,
+        "p50Duration": 125562,
+        "p95Duration": 125800,
+        "p99Duration": 125800
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 127140,
+        "avgItemsPerSecond": 18.876828692779615,
+        "avgBatchDuration": 126407.66666666667,
+        "minBatchDuration": 125398,
+        "maxBatchDuration": 127140,
+        "p50Duration": 126685,
+        "p95Duration": 127140,
+        "p99Duration": 127140
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 125854,
+        "avgItemsPerSecond": 19.069715702321737,
+        "avgBatchDuration": 125322.66666666667,
+        "minBatchDuration": 124426,
+        "maxBatchDuration": 125849,
+        "p50Duration": 125693,
+        "p95Duration": 125849,
+        "p99Duration": 125849
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 2400,
+        "totalBatches": 3,
+        "totalDuration": 126467,
+        "avgItemsPerSecond": 18.977282611274088,
+        "avgBatchDuration": 124552.33333333333,
+        "minBatchDuration": 123402,
+        "maxBatchDuration": 126202,
+        "p50Duration": 124053,
+        "p95Duration": 126202,
+        "p99Duration": 126202
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:50:21.351Z",
+    "end": "2025-12-15T15:52:28.745Z"
+  }
+}
+```
+
+**Observations:**
+
+- Small batch completion times: **14-18s** (slightly slower than H1's 14-17s)
+- Large batch completion times: **123-127s** (slower than H1's 105-107s)
+- Improvement over H1?: **Mixed.** Fairness improved (0.9992 vs 0.9979) but overall throughput dropped (58.42 vs 67.61 items/sec). **Low quantum=2 improves fairness but at throughput cost.** For asymmetric loads, default quantum=5 is better balance.
+
+</details>
+
+### Test H3: Burst Test (All Tenants Simultaneous)
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress burst --batch-size 500 -d "Burst test baseline"
+```
+
+<details>
+<summary>Results H3 (click to expand)</summary>
+
+```json
+{
+  "scenario": "burst-9t-500i",
+  "config": {
+    "tenantCount": 9,
+    "batchSize": 500,
+    "batchCount": 1
+  },
+  "results": {
+    "totalItemsProcessed": 4500,
+    "totalBatches": 9,
+    "overallThroughput": 68.83786388459714,
+    "overallDuration": 65371,
+    "fairnessIndex": 0.9999479889573228,
+    "perTenant": [
+      {
+        "tenantId": "org-1:proj_czimyjnqtbskjmvimpwh",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64508,
+        "avgItemsPerSecond": 7.750976623054505,
+        "avgBatchDuration": 64508,
+        "minBatchDuration": 64508,
+        "maxBatchDuration": 64508,
+        "p50Duration": 64508,
+        "p95Duration": 64508,
+        "p99Duration": 64508
+      },
+      {
+        "tenantId": "org-1:proj_lvfvbfatttkmiocyaojf",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64504,
+        "avgItemsPerSecond": 7.751457273967506,
+        "avgBatchDuration": 64504,
+        "minBatchDuration": 64504,
+        "maxBatchDuration": 64504,
+        "p50Duration": 64504,
+        "p95Duration": 64504,
+        "p99Duration": 64504
+      },
+      {
+        "tenantId": "org-1:proj_pogdfmagzpxpjggpwrlj",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64404,
+        "avgItemsPerSecond": 7.7634929507484,
+        "avgBatchDuration": 64404,
+        "minBatchDuration": 64404,
+        "maxBatchDuration": 64404,
+        "p50Duration": 64404,
+        "p95Duration": 64404,
+        "p99Duration": 64404
+      },
+      {
+        "tenantId": "org-2:proj_prxnkqpzdapktltqmxhb",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64504,
+        "avgItemsPerSecond": 7.751457273967506,
+        "avgBatchDuration": 64504,
+        "minBatchDuration": 64504,
+        "maxBatchDuration": 64504,
+        "p50Duration": 64504,
+        "p95Duration": 64504,
+        "p99Duration": 64504
+      },
+      {
+        "tenantId": "org-2:proj_zgysghtkiezoakvjscin",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64507,
+        "avgItemsPerSecond": 7.7510967801943975,
+        "avgBatchDuration": 64507,
+        "minBatchDuration": 64507,
+        "maxBatchDuration": 64507,
+        "p50Duration": 64507,
+        "p95Duration": 64507,
+        "p99Duration": 64507
+      },
+      {
+        "tenantId": "org-2:proj_giomqjmqmqbcngusxqfo",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64391,
+        "avgItemsPerSecond": 7.7650603345187985,
+        "avgBatchDuration": 64391,
+        "minBatchDuration": 64391,
+        "maxBatchDuration": 64391,
+        "p50Duration": 64391,
+        "p95Duration": 64391,
+        "p99Duration": 64391
+      },
+      {
+        "tenantId": "org-3:proj_qopvqsgghjbtrrfcwlqs",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 63375,
+        "avgItemsPerSecond": 7.889546351084813,
+        "avgBatchDuration": 63375,
+        "minBatchDuration": 63375,
+        "maxBatchDuration": 63375,
+        "p50Duration": 63375,
+        "p95Duration": 63375,
+        "p99Duration": 63375
+      },
+      {
+        "tenantId": "org-3:proj_efaelbvnogkhjnrdfsmi",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 64497,
+        "avgItemsPerSecond": 7.752298556522009,
+        "avgBatchDuration": 64497,
+        "minBatchDuration": 64497,
+        "maxBatchDuration": 64497,
+        "p50Duration": 64497,
+        "p95Duration": 64497,
+        "p99Duration": 64497
+      },
+      {
+        "tenantId": "org-3:proj_ytivyoceocenyxuprmga",
+        "totalItems": 500,
+        "totalBatches": 1,
+        "totalDuration": 65316,
+        "avgItemsPerSecond": 7.655092167309695,
+        "avgBatchDuration": 65316,
+        "minBatchDuration": 65316,
+        "maxBatchDuration": 65316,
+        "p50Duration": 65316,
+        "p95Duration": 65316,
+        "p99Duration": 65316
+      }
+    ]
+  },
+  "timestamps": {
+    "start": "2025-12-15T15:53:49.834Z",
+    "end": "2025-12-15T15:54:55.205Z"
+  }
+}
+```
+
+**Observations:**
+
+- Fairness under burst: **0.9999** (nearly perfect!)
+- Throughput: **68.84 items/sec**
+- Any tenant significantly slower?: **All tenants finished within 2s of each other (63-65s range).** **Excellent burst handling!** Even under simultaneous 4500-item burst from 9 tenants, DRR maintained perfect fairness. This is the ideal scenario for DRR.
+
+</details>
+
+---
+
+## Series I: Combined/Optimized Configurations
+
+**Objective:** Test promising combinations based on earlier results.
+
+### Test I1: Throughput-Optimized
+
+Based on Series B-F results, configure for maximum throughput.
+
+**Configuration (adjust based on findings):**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=10
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=5
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=25
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 5 --tenants all -d "Throughput optimized"
+```
+
+<details>
+<summary>Results I1 (click to expand)</summary>
+
+```json
+// Paste results here
+```
+
+**Observations:**
+
+- Throughput: **\_** items/sec
+- Fairness tradeoff: **\_**
+
+</details>
+
+### Test I2: Fairness-Optimized
+
+Based on Series B-F results, configure for best fairness.
+
+**Configuration (adjust based on findings):**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=2
+BATCH_QUEUE_MAX_DEFICIT=25
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=5
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 5 --tenants all -d "Fairness optimized"
+```
+
+<details>
+<summary>Results I2 (click to expand)</summary>
+
+```json
+// Paste results here
+```
+
+**Observations:**
+
+- Fairness index: **\_**
+- Throughput cost: **\_**
+
+</details>
+
+### Test I3: Balanced Configuration
+
+Best balance of throughput and fairness.
+
+**Configuration (adjust based on findings):**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 5 --tenants all -d "Balanced configuration"
+```
+
+<details>
+<summary>Results I3 (click to expand)</summary>
+
+```json
+// Paste results here
+```
+
+**Observations:**
+
+- Throughput: **\_** items/sec
+- Fairness index: **\_**
+- Recommended for production?: **\_**
+
+</details>
+
+---
+
+## Per-Org Concurrency Testing (Optional Series J)
+
+If time permits, test different concurrency limits per organization by updating the database.
+
+### Setting Per-Org Concurrency
+
+```sql
+-- Set org-1 to high concurrency (50)
+UPDATE "Organization"
+SET "batchQueueConcurrencyConfig" = '{"default": 50}'
+WHERE slug = 'org-1';
+
+-- Set org-2 to medium concurrency (10)
+UPDATE "Organization"
+SET "batchQueueConcurrencyConfig" = '{"default": 10}'
+WHERE slug = 'org-2';
+
+-- Set org-3 to low concurrency (2)
+UPDATE "Organization"
+SET "batchQueueConcurrencyConfig" = '{"default": 2}'
+WHERE slug = 'org-3';
+```
+
+### Test J1: Mixed Org Concurrency Limits
+
+**Configuration:**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=50
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10  # fallback
+```
+
+**Command:**
+
+```bash
+pnpm stress fairness --batch-size 100 --batch-count 3 --tenants all -d "Mixed org concurrency"
+```
+
+<details>
+<summary>Results J1 (click to expand)</summary>
+
+```json
+// Paste results here
+```
+
+**Observations:**
+
+- Org-1 (high concurrency) throughput: **\_**
+- Org-2 (medium concurrency) throughput: **\_**
+- Org-3 (low concurrency) throughput: **\_**
+- Does DRR still maintain fairness?: **\_**
+
+</details>
+
+---
+
+## Results Summary Table
+
+| Test | Config Summary         | Throughput (items/sec) | Fairness Index | Notes                              |
+| ---- | ---------------------- | ---------------------- | -------------- | ---------------------------------- |
+| A1   | Baseline               | 54.52                  | 0.9999         | Reference point                    |
+| A2   | Throughput baseline    | 97.48 (peak @ 500)     | 1.0000         | Single tenant max                  |
+| B1   | quantum=1              | 66.09                  | 0.9997         | +21% vs baseline                   |
+| B2   | quantum=10             | 64.69                  | 0.9998         | +18%                               |
+| B3   | quantum=25             | **84.36**              | **0.9999**     | **Best B series**                  |
+| B4   | quantum=50             | 51.98                  | 0.9997         | Too high, hurts perf               |
+| C1   | maxDeficit=10          | 52.51                  | 0.9998         | Limited catch-up                   |
+| C2   | maxDeficit=25          | 66.33                  | 0.9992         | +22%                               |
+| C3   | maxDeficit=100         | **73.74**              | 0.9989         | **Best C**, slight fairness cost   |
+| D1   | consumers=1            | 41.33                  | 0.9997         | Bottleneck                         |
+| D2   | consumers=3            | 57.55                  | 0.9992         | 1.39x vs D1                        |
+| D3   | consumers=5            | 63.80                  | 0.9999         | Good balance                       |
+| D4   | consumers=10           | **114.94**             | 0.9888         | **Best throughput**, fairness cost |
+| E1   | interval=20ms          | 70.23                  | 0.9979         | Contention overhead                |
+| E2   | interval=50ms          | **93.57**              | **0.9994**     | **Best E series**                  |
+| E3   | interval=100ms         | 86.52                  | 0.9997         | Good default                       |
+| E4   | interval=250ms         | 47.46                  | 0.9994         | Too slow                           |
+| F1   | concurrency=2          | 90.73                  | 0.9931         | High but unfair                    |
+| F2   | concurrency=5          | 58.25                  | **0.9999**     | **Best fairness**                  |
+| F3   | concurrency=10         | 88.71                  | 0.9986         | Good balance                       |
+| F4   | concurrency=25         | **92.12**              | 0.9986         | **Best F series**                  |
+| F5   | concurrency=50         | _not tested_           | _not tested_   |                                    |
+| G1   | rateLimit=50           | 45.43                  | 0.9986         | Effective throttle                 |
+| G2   | rateLimit=100          | 81.93                  | 0.9995         | Not binding                        |
+| G3   | rateLimit=20           | 21.69                  | 0.9978         | Strict throttle                    |
+| H1   | asymmetric baseline    | 67.61                  | 0.9979         | Small batches not starved          |
+| H2   | asymmetric low quantum | 58.42                  | 0.9992         | Better fairness, lower throughput  |
+| H3   | burst test             | 68.84                  | **0.9999**     | **Perfect burst fairness**         |
+| I1   | throughput optimized   | _pending_              | _pending_      |                                    |
+| I2   | fairness optimized     | _pending_              | _pending_      |                                    |
+| I3   | balanced               | _pending_              | _pending_      |                                    |
+
+---
+
+## Recommended Execution Order
+
+1. **Series A** (Baseline) - Establish reference point
+2. **Series B** (DRR Quantum) - Understand core fairness mechanism
+3. **Series C** (Max Deficit) - Understand starvation prevention
+4. **Series D** (Consumer Count) - Find optimal parallelism
+5. **Series E** (Consumer Interval) - Find optimal polling frequency
+6. **Series F** (Concurrency) - Find optimal per-env limits
+7. **Series G** (Global Rate Limit) - Test throttling mechanism
+8. **Series H** (Asymmetric) - Validate fairness under realistic conditions
+9. **Series I** (Combined) - Test optimized configurations
+
+## Between Tests
+
+After each configuration change:
+
+1. Restart the webapp to pick up new env vars
+2. Wait ~5 seconds for BatchQueue to initialize
+3. Consider clearing Redis state between tests if needed: `redis-cli FLUSHDB`
+
+---
+
+## Key Metrics to Watch
+
+1. **Throughput** (`overallThroughput`) - Higher is better, all else equal
+2. **Fairness Index** (`fairnessIndex`) - Closer to 1.0 is better
+3. **Per-Tenant Variance** - Look at min/max batch durations across tenants
+4. **P95/P99 Latencies** - Watch for tail latencies indicating starvation
+
+## Notes and Observations
+
+### Key Findings from Series A-H
+
+#### 1. DRR Fairness is Excellent
+
+- **Fairness Index consistently 0.99+** across all tests
+- Burst scenario (H3) achieved **0.9999 fairness** with 9 tenants competing simultaneously
+- Asymmetric load (H1) showed small batches complete quickly without being starved by large batches
+
+#### 2. Throughput vs Fairness Tradeoffs
+
+| Configuration         | Effect on Throughput | Effect on Fairness |
+| --------------------- | -------------------- | ------------------ |
+| Higher quantum (25)   | ↑ Significant        | → Neutral          |
+| Higher quantum (50)   | ↓ Hurts              | → Neutral          |
+| Higher maxDeficit     | ↑ Moderate           | ↓ Slight           |
+| More consumers        | ↑↑ Major             | ↓ Moderate (at 10) |
+| Faster polling (50ms) | ↑ Best               | → Neutral          |
+| Higher concurrency    | ↑ Moderate           | → Neutral          |
+
+#### 3. Recommended Default Configuration
+
+Based on test results, the optimal balanced configuration is:
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=25          # Sweet spot from B series
+BATCH_QUEUE_MAX_DEFICIT=50          # Default is fine (100 gains throughput but costs fairness)
+BATCH_QUEUE_CONSUMER_COUNT=3        # Good balance (10 is faster but less fair)
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=50 # Best from E series
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=10  # Good balance from F series
+```
+
+**Expected performance:** ~90-100 items/sec with 0.999+ fairness
+
+#### 4. Configuration Recommendations by Use Case
+
+**High-throughput priority (fairness acceptable at 0.98+):**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=25
+BATCH_QUEUE_MAX_DEFICIT=100
+BATCH_QUEUE_CONSUMER_COUNT=10
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=50
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=25
+```
+
+**Strict fairness priority (throughput can be lower):**
+
+```env
+BATCH_QUEUE_DRR_QUANTUM=5
+BATCH_QUEUE_MAX_DEFICIT=25
+BATCH_QUEUE_CONSUMER_COUNT=3
+BATCH_QUEUE_CONSUMER_INTERVAL_MS=100
+BATCH_CONCURRENCY_DEFAULT_CONCURRENCY=5
+```
+
+#### 5. Surprising Results
+
+1. **quantum=1 outperformed quantum=10**: Lower quantum didn't add expected overhead. May be due to better slot utilization.
+
+2. **quantum=50 was worst**: Too much time between tenant switches caused overall slowdown.
+
+3. **concurrency=2 had high throughput but poor fairness**: Some tenants finished much faster than others.
+
+4. **20ms polling was worse than 50ms**: Too-fast polling created contention.
+
+#### 6. Rate Limiter Behavior
+
+- Rate limiter effectively caps throughput
+- At 50/sec limit, achieved ~45/sec (91% efficiency)
+- At 20/sec limit, achieved ~22/sec (108% - slight overshoot)
+- Rate limiting preserved fairness well (0.997-0.999)
+
+#### 7. Asymmetric Load Handling
+
+- **Excellent!** Small batches (150 items) completed in 14-17s
+- Large batches (2400 items) completed in 105-127s
+- DRR prevented large batches from starving small ones
+- Lower quantum (2) improved fairness but hurt overall throughput by ~13%
+
+### Scaling Observations
+
+- Single consumer: ~41 items/sec
+- 3 consumers: ~58 items/sec (1.4x)
+- 5 consumers: ~64 items/sec (1.5x)
+- 10 consumers: ~115 items/sec (2.8x)
+
+**Diminishing returns start around 5 consumers, with fairness degradation at 10.**
+
+### Production Recommendations
+
+1. **Start with defaults** - They're well-tuned for most cases
+2. **Consider quantum=25** for throughput boost without fairness cost
+3. **Use 3-5 consumers** for good parallelism without contention
+4. **50ms polling** is optimal for most workloads
+5. **Monitor fairness index** in production metrics
+6. **Use global rate limiter** if you need to cap resource usage
+
+---
+
+**Document created:** $(date)
+**Last updated:**
diff --git a/docs/building-with-ai.mdx b/docs/building-with-ai.mdx
new file mode 100644
index 00000000000..e551324cadf
--- /dev/null
+++ b/docs/building-with-ai.mdx
@@ -0,0 +1,275 @@
+---
+title: "Overview"
+sidebarTitle: "Overview"
+description: "Tools and resources for building Trigger.dev projects with AI coding assistants."
+---
+
+## Quick setup
+
+We provide multiple tools to help AI coding assistants write correct Trigger.dev code. Use one or all of them for the best developer experience.
+
+
+<Steps>
+
+<Step title="Install the MCP Server">
+  Give your AI assistant direct access to Trigger.dev tools — search docs, trigger tasks, deploy projects, and monitor runs. Works with Claude Code, Cursor, Windsurf, VS Code (Copilot), and Zed.
+
+  ```bash
+  npx trigger.dev@latest install-mcp
+  ```
+
+  [Learn more →](/mcp-introduction)
+</Step>
+
+<Step title="Install Skills">
+  Portable instruction sets that teach any AI coding assistant Trigger.dev best practices. Works with Claude Code, Cursor, Windsurf, VS Code (Copilot), and any tool that supports the [Agent Skills standard](https://agentskills.io).
+
+  ```bash
+  npx skills add triggerdotdev/skills
+  ```
+
+  [Learn more →](/skills)
+</Step>
+
+<Step title="Install Agent Rules">
+  Comprehensive rule sets installed directly into your AI client's config files. Works with Cursor, Claude Code, VS Code (Copilot), Windsurf, Gemini CLI, Cline, and more. Claude Code also gets a dedicated subagent for hands-on help.
+
+  ```bash
+  npx trigger.dev@latest install-rules
+  ```
+
+  [Learn more →](/mcp-agent-rules)
+</Step>
+
+</Steps>
+
+## Skills vs Agent Rules vs MCP
+
+Not sure which tool to use? Here's how they compare:
+
+| | **Skills** | **Agent Rules** | **MCP Server** |
+|:--|:-----------|:----------------|:---------------|
+| **What it does** | Drops skill files into your project | Installs rule sets into client config | Runs a live server your AI connects to |
+| **Installs to** | `.claude/skills/`, `.cursor/skills/`, etc. | `.cursor/rules/`, `CLAUDE.md`, `AGENTS.md`, etc. | `mcp.json`, `~/.claude.json`, etc. |
+| **Updates** | Re-run `npx skills add` | Re-run `npx trigger.dev@latest install-rules` or auto-prompted on `trigger dev` | Always latest (uses `@latest`) |
+| **Best for** | Teaching patterns and best practices | Comprehensive code generation guidance | Live project interaction (deploy, trigger, monitor) |
+| **Works offline** | Yes | Yes | No (calls Trigger.dev API) |
+
+**Our recommendation:** Install all three. Skills and Agent Rules teach your AI *how* to write code. The MCP Server lets it *do things* in your project.
+
+## Project-level context snippet
+
+If you prefer a lightweight/passive approach, paste the snippet below into a context file at the root of your project. Different AI tools read different files:
+
+| File | Read by |
+|:-----|:--------|
+| `CLAUDE.md` | Claude Code |
+| `AGENTS.md` | OpenAI Codex, Jules, OpenCode |
+| `.cursor/rules/*.md` | Cursor |
+| `.github/copilot-instructions.md` | GitHub Copilot |
+| `CONVENTIONS.md` | Windsurf, Cline, and others |
+
+Create the file that matches your AI tool (or multiple files if your team uses different tools) and paste the snippet below. This gives the AI essential Trigger.dev context without installing anything.
+
+<Accordion title="Copy the snippet">
+
+````markdown
+# Trigger.dev rules
+
+## Imports
+
+Always import from `@trigger.dev/sdk` — never from `@trigger.dev/sdk/v3` or use the deprecated `client.defineJob` pattern.
+
+## Task pattern
+
+Every task must be exported. Use `task()` from `@trigger.dev/sdk`:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  retry: {
+    maxAttempts: 3,
+    factor: 1.8,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+  },
+  run: async (payload: { url: string }) => {
+    // No timeouts — runs can take as long as needed
+    return { success: true };
+  },
+});
+```
+
+## Triggering tasks
+
+From your backend (Next.js route, Express handler, etc.):
+
+```ts
+import type { myTask } from "./trigger/my-task";
+import { tasks } from "@trigger.dev/sdk";
+
+// Fire and forget
+const handle = await tasks.trigger<typeof myTask>("my-task", { url: "https://example.com" });
+
+// Batch trigger (up to 1,000 items)
+const batchHandle = await tasks.batchTrigger<typeof myTask>("my-task", [
+  { payload: { url: "https://example.com/1" } },
+  { payload: { url: "https://example.com/2" } },
+]);
+```
+
+### From inside other tasks
+
+```ts
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    // Fire and forget
+    await childTask.trigger({ data: "value" });
+
+    // Wait for result — returns a Result object, NOT the output directly
+    const result = await childTask.triggerAndWait({ data: "value" });
+    if (result.ok) {
+      console.log(result.output); // The actual return value
+    } else {
+      console.error(result.error);
+    }
+
+    // Or use .unwrap() to get output directly (throws on failure)
+    const output = await childTask.triggerAndWait({ data: "value" }).unwrap();
+  },
+});
+```
+
+> Never wrap `triggerAndWait` or `batchTriggerAndWait` in `Promise.all` — this is not supported.
+
+## Error handling
+
+```ts
+import { task, retry, AbortTaskRunError } from "@trigger.dev/sdk";
+
+export const resilientTask = task({
+  id: "resilient-task",
+  retry: { maxAttempts: 5 },
+  run: async (payload) => {
+    // Permanent error — skip retrying
+    if (!payload.isValid) {
+      throw new AbortTaskRunError("Invalid payload, will not retry");
+    }
+
+    // Retry a specific block (not the whole task)
+    const data = await retry.onThrow(
+      async () => await fetchExternalApi(payload),
+      { maxAttempts: 3 }
+    );
+
+    return data;
+  },
+});
+```
+
+## Schema validation
+
+Use `schemaTask` with Zod for payload validation:
+
+```ts
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+
+export const processVideo = schemaTask({
+  id: "process-video",
+  schema: z.object({ videoUrl: z.string().url() }),
+  run: async (payload) => {
+    // payload is typed and validated
+  },
+});
+```
+
+## Waits
+
+Use `wait.for` for delays, `wait.until` for dates, and `wait.forToken` for external callbacks:
+
+```ts
+import { wait } from "@trigger.dev/sdk";
+await wait.for({ seconds: 30 });
+await wait.until({ date: new Date("2025-01-01") });
+```
+
+## Configuration
+
+`trigger.config.ts` lives at the project root:
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk/build";
+
+export default defineConfig({
+  project: "<your-project-ref>",
+  dirs: ["./trigger"],
+});
+```
+
+## Common mistakes
+
+1. **Forgetting to export tasks** — every task must be a named export
+2. **Importing from `@trigger.dev/sdk/v3`** — this is the old v3 path; always use `@trigger.dev/sdk`
+3. **Using `client.defineJob()`** — this is the deprecated v2 API
+4. **Calling `task.trigger()` directly** — use `tasks.trigger<typeof myTask>("task-id", payload)` from your backend
+5. **Using `triggerAndWait` result as output** — it returns a `Result` object; check `result.ok` then access `result.output`, or use `.unwrap()`
+6. **Wrapping waits/triggerAndWait in `Promise.all`** — not supported in Trigger.dev tasks
+7. **Adding timeouts to tasks** — tasks have no built-in timeout; use `maxDuration` in config if needed
+````
+
+</Accordion>
+
+## llms.txt
+
+We also publish machine-readable documentation for LLM consumption:
+
+- [trigger.dev/docs/llms.txt](https://trigger.dev/docs/llms.txt) — concise overview
+- [trigger.dev/docs/llms-full.txt](https://trigger.dev/docs/llms-full.txt) — full documentation
+
+These follow the [llms.txt standard](https://llmstxt.org) and can be fed directly into any LLM context window.
+
+
+## Troubleshooting
+
+<AccordionGroup>
+
+<Accordion title="AI keeps generating old v2/v3 code">
+  Install [Agent Rules](/mcp-agent-rules) or [Skills](/skills) — they override the outdated patterns in the AI's training data. The [context snippet](#project-level-context-snippet) above is a quick alternative.
+</Accordion>
+
+<Accordion title="MCP server won't connect">
+  1. Make sure you've restarted your AI client after adding the config
+  2. Run `npx trigger.dev@latest install-mcp` again — it will detect and fix common issues
+  3. Check that `npx trigger.dev@latest mcp` runs without errors in your terminal
+  4. See the [MCP introduction](/mcp-introduction) for client-specific config details
+</Accordion>
+
+<Accordion title="Which tool should I install?">
+  All three if possible. If you can only pick one:
+  - **Agent Rules** if you want the broadest code generation improvement
+  - **Skills** if you use multiple AI tools and want a single install
+  - **MCP Server** if you need to trigger tasks, deploy, and search docs from your AI
+</Accordion>
+
+</AccordionGroup>
+
+## Next steps
+
+<CardGroup cols={2}>
+  <Card title="MCP Server" icon="sparkles" href="/mcp-introduction">
+    Install and configure the MCP Server for live project interaction.
+  </Card>
+  <Card title="Skills" icon="wand-magic-sparkles" href="/skills">
+    Portable instruction sets for any AI coding assistant.
+  </Card>
+  <Card title="Agent Rules" icon="scroll" href="/mcp-agent-rules">
+    Comprehensive rule sets installed into your AI client.
+  </Card>
+  <Card title="Writing tasks" icon="code" href="/tasks/overview">
+    Learn the task patterns your AI assistant will follow.
+  </Card>
+</CardGroup>
diff --git a/docs/bulk-actions.mdx b/docs/bulk-actions.mdx
index 0e2b4468a32..04d0551c935 100644
--- a/docs/bulk-actions.mdx
+++ b/docs/bulk-actions.mdx
@@ -3,16 +3,10 @@ title: "Bulk actions"
 description: "Perform actions like replay and cancel on multiple runs at once."
 ---
 
-Bulk actions allow you to perform operations like replaying or canceling on multiple runs at once. This is especially useful when you need to retry a batch of failed runs with a new version of your code, or when you need to cancel multiple in-progress runs.
-
-## Bulk replaying
-
-You can replay multiple runs at once by selecting them from the table on the Runs page using the checkbox on the left hand side of the row. Then click the "Replay runs" button from the bulk action bar that appears at the bottom of the screen.
-
-This is especially useful if you have lots of failed runs and want to run them all again. To do this, first filter the runs by the status you want, then select all the runs you want to replay and click the "Replay runs" button from the bulk action bar at the bottom of the page.
+Bulk actions allow you to perform replaying and canceling on multiple runs at once. This is especially useful when you need to retry a batch of failed runs with a new version of your code, or when you need to cancel multiple in-progress runs.
 
 <video
-  src="https://content.trigger.dev/bulk-replaying-runs.mp4"
+  src="https://content.trigger.dev/bulk-actions.mp4"
   preload="auto"
   controls={true}
   loop
@@ -22,19 +16,34 @@ This is especially useful if you have lots of failed runs and want to run them a
   height="100%"
 />
 
-## Bulk canceling
+## How to create a new bulk action
+
+<Icon icon="circle-1" iconType="solid" color="#FF2D6B" size="20" /> Open the bulk action panel from the top right of the runs page
+
+![Access bulk actions](/images/bulk-action-open-panel.png)
+
+
+<Icon icon="circle-2" iconType="solid" color="#FF2D6B" size="20" /> Filter the runs table to show the runs you want to bulk action
+
+<Icon icon="circle-3" iconType="solid" color="#FF2D6B" size="20" /> Alternatively, you can select individual runs
+
+<Icon icon="circle-4" iconType="solid" color="#FF2D6B" size="20" /> Choose the runs you want to bulk action
+
+<Icon icon="circle-5" iconType="solid" color="#FF2D6B" size="20" /> Name your bulk action (optional)
+
+<Icon icon="circle-6" iconType="solid" color="#FF2D6B" size="20" /> Choose the action you want to perform, replay or cancel
+
+<Icon icon="circle-7" iconType="solid" color="#FF2D6B" size="20" /> Click the "Replay" or "Cancel" button and confirm in the dialog
 
-Similar to replaying multiple runs, you can cancel multiple runs at once. This is particularly useful when you have a batch of runs that you want to stop, perhaps because they were triggered with incorrect parameters or are no longer needed.
+![Access bulk actions](/images/bulk-action-create.png)
 
-To cancel multiple runs:
+<Icon icon="circle-8" iconType="solid" color="#FF2D6B" size="20" /> You'll now view the bulk action processing from the bulk action page
 
-1. Filter the runs table to show the runs you want to cancel (e.g., all runs with status "QUEUED" or "EXECUTING")
-2. Use the checkboxes on the left side of the runs table to select the runs you want to cancel 
-3. Click the "Cancel runs" button in the bulk action bar that appears at the bottom of the screen
+<Icon icon="circle-9" iconType="solid" color="#FF2D6B" size="20" /> You can replay or view the runs from this page
 
-After confirming, all selected runs that can be canceled (those in appropriate states like QUEUED or EXECUTING) will be canceled. The status of these runs will change to "CANCELED" and they will not be resumed.
+![Access bulk actions](/images/bulk-action-page.png)
 
 <Note>
   You can only cancel runs that are in states that allow cancellation (like QUEUED or EXECUTING).
-  Runs that are already completed, failed, or in other final states cannot be canceled.
+  Runs that are already completed, failed, or in other final states by the time the bulk action process gets to them, cannot be canceled.
 </Note>
\ No newline at end of file
diff --git a/docs/cli-preview-archive.mdx b/docs/cli-preview-archive.mdx
index 2f0fb81ad16..292742798ec 100644
--- a/docs/cli-preview-archive.mdx
+++ b/docs/cli-preview-archive.mdx
@@ -2,10 +2,8 @@
 title: "CLI preview archive command"
 sidebarTitle: "preview archive"
 description: "The `trigger.dev preview archive` command can be used to archive a preview branch."
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
 import ProjectPathArg from "/snippets/cli-args-project-path.mdx";
 import CommonOptions from "/snippets/cli-options-common.mdx";
 import ProjectRefOption from "/snippets/cli-options-project-ref.mdx";
@@ -14,22 +12,20 @@ import ConfigFileOption from "/snippets/cli-options-config-file.mdx";
 import SkipUpdateCheckOption from "/snippets/cli-options-skip-update-check.mdx";
 import BranchOption from "/snippets/cli-options-branch.mdx";
 
-<UpgradeToV4Note />
-
 Run the command like this:
 
 <CodeGroup>
 
 ```bash npm
-npx trigger.dev@v4-beta preview archive
+npx trigger.dev@latest preview archive
 ```
 
 ```bash pnpm
-pnpm dlx trigger.dev@v4-beta preview archive
+pnpm dlx trigger.dev@latest preview archive
 ```
 
 ```bash yarn
-yarn dlx trigger.dev@v4-beta preview archive
+yarn dlx trigger.dev@latest preview archive
 ```
 
 </CodeGroup>
@@ -39,7 +35,7 @@ It will archive the preview branch, automatically detecting the branch name from
 ## Arguments
 
 ```
-npx trigger.dev@v4-beta preview archive [path]
+npx trigger.dev@latest preview archive [path]
 ```
 
 <ProjectPathArg />
diff --git a/docs/cli-switch.mdx b/docs/cli-switch.mdx
index ac3f5293486..40df6793a5d 100644
--- a/docs/cli-switch.mdx
+++ b/docs/cli-switch.mdx
@@ -2,10 +2,8 @@
 title: "CLI switch command"
 sidebarTitle: "switch"
 description: "The `trigger.dev switch` command can be used to switch between profiles."
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
 import ProjectPathArg from "/snippets/cli-args-project-path.mdx";
 import CommonOptions from "/snippets/cli-options-common.mdx";
 import ProjectRefOption from "/snippets/cli-options-project-ref.mdx";
@@ -14,22 +12,20 @@ import ConfigFileOption from "/snippets/cli-options-config-file.mdx";
 import SkipUpdateCheckOption from "/snippets/cli-options-skip-update-check.mdx";
 import BranchOption from "/snippets/cli-options-branch.mdx";
 
-<UpgradeToV4Note />
-
 Run the command like this:
 
 <CodeGroup>
 
 ```bash npm
-npx trigger.dev@v4-beta switch [profile]
+npx trigger.dev@latest switch [profile]
 ```
 
 ```bash pnpm
-pnpm dlx trigger.dev@v4-beta switch [profile]
+pnpm dlx trigger.dev@latest switch [profile]
 ```
 
 ```bash yarn
-yarn dlx trigger.dev@v4-beta switch [profile]
+yarn dlx trigger.dev@latest switch [profile]
 ```
 
 </CodeGroup>
@@ -39,7 +35,7 @@ It will switch to the specified profile. If no profile is specified, it will lis
 ## Arguments
 
 ```
-npx trigger.dev@v4-beta switch [profile]
+npx trigger.dev@latest switch [profile]
 ```
 
 <ParamField body="Profile" type="[profile]">
diff --git a/docs/config/config-file.mdx b/docs/config/config-file.mdx
index 5bf73a1a959..8d34270433d 100644
--- a/docs/config/config-file.mdx
+++ b/docs/config/config-file.mdx
@@ -11,7 +11,7 @@ import NodeVersions from "/snippets/node-versions.mdx";
 The `trigger.config.ts` file is used to configure your Trigger.dev project. It is a TypeScript file at the root of your project that exports a default configuration object. Here's an example:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   // Your project ref (you can see it on the Project settings page in the dashboard)
@@ -53,7 +53,7 @@ The config file handles a lot of things, like:
 You can specify the directories where your tasks are located using the `dirs` option:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -66,7 +66,7 @@ If you omit the `dirs` option, we will automatically detect directories that are
 We will search for TypeScript and JavaScript files in the specified directories and include them in the build process. We automatically exclude files that have `.test` or `.spec` in the name, but you can customize this by specifying glob patterns in the `ignorePatterns` option:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -75,26 +75,40 @@ export default defineConfig({
 });
 ```
 
+## Custom tsconfig path
+
+You can specify a custom path to your tsconfig file. This is useful if you have a custom tsconfig file that you want to use.
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  dirs: ["./trigger"],
+  tsconfig: "./custom-tsconfig.json", // Custom tsconfig path
+});
+```
+
 ## Lifecycle functions
 
 You can add lifecycle functions to get notified when any task starts, succeeds, or fails using `onStart`, `onSuccess` and `onFailure`:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
   // Your other config settings...
-  onSuccess: async (payload, output, { ctx }) => {
+  onSuccess: async ({ payload, output, ctx }) => {
     console.log("Task succeeded", ctx.task.id);
   },
-  onFailure: async (payload, error, { ctx }) => {
+  onFailure: async ({ payload, error, ctx }) => {
     console.log("Task failed", ctx.task.id);
   },
-  onStart: async (payload, { ctx }) => {
+  onStart: async ({ payload, ctx }) => {
     console.log("Task started", ctx.task.id);
   },
-  init: async (payload, { ctx }) => {
+  init: async ({ payload, ctx }) => {
     console.log("I run before any task is run");
   },
 });
@@ -111,7 +125,7 @@ We use OpenTelemetry (OTEL) for our run logs. This means you get a lot of inform
 Here we add Prisma and OpenAI instrumentations to your `trigger.config.ts` file.
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
 import { OpenAIInstrumentation } from "@traceloop/instrumentation-openai";
 
@@ -140,21 +154,30 @@ Some ones we recommend:
 
 ### Telemetry Exporters
 
-You can also configure custom telemetry exporters to send your traces and logs to other external services. For example, you can send your logs to [Axiom](https://axiom.co/docs/guides/opentelemetry-nodejs#exporter-instrumentation-ts). First, add the opentelemetry exporter packages to your package.json file:
+You can also configure custom telemetry exporters to send your traces, logs, and metrics to other external services. For example, you can send your logs to [Axiom](https://axiom.co/docs/guides/opentelemetry-nodejs#exporter-instrumentation-ts). First, add the opentelemetry exporter packages to your package.json file:
 
 ```json package.json
 "dependencies": {
   "@opentelemetry/exporter-logs-otlp-http": "0.52.1",
-  "@opentelemetry/exporter-trace-otlp-http": "0.52.1"
+  "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
+  "@opentelemetry/exporter-metrics-otlp-proto": "0.52.1"
 }
 ```
 
+<Note>
+  Axiom's `/v1/metrics` endpoint only supports protobuf (`application/x-protobuf`), not JSON. Use
+  `@opentelemetry/exporter-metrics-otlp-proto` instead of
+  `@opentelemetry/exporter-metrics-otlp-http` for metrics. Traces and logs work fine with the
+  `-http` (JSON) exporters.
+</Note>
+
 Then, configure the exporters in your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-proto";
 
 // Initialize OTLP trace exporter with the endpoint URL and headers;
 export default defineConfig({
@@ -182,23 +205,28 @@ export default defineConfig({
         },
       }),
     ],
+    metricExporters: [
+      new OTLPMetricExporter({
+        url: "https://api.axiom.co/v1/metrics",
+        headers: {
+          Authorization: `Bearer ${process.env.AXIOM_API_TOKEN}`,
+          "x-axiom-metrics-dataset": process.env.AXIOM_METRICS_DATASET,
+        },
+      }),
+    ],
   },
 });
 ```
 
-Make sure to set the `AXIOM_API_TOKEN` and `AXIOM_DATASET` environment variables in your project.
+Make sure to set the `AXIOM_API_TOKEN`, `AXIOM_DATASET`, and `AXIOM_METRICS_DATASET` environment variables in your project. Axiom requires a separate, dedicated dataset for metrics — you cannot reuse the same dataset for traces/logs and metrics.
 
-<Note>
-  The `logExporters` option is available in the v4 beta SDK. See our [v4 upgrade
-  guide](/upgrade-to-v4) for more information.
-</Note>
-
-It's important to note that you cannot configure exporters using `OTEL_*` environment variables, as they would conflict with our internal telemetry. Instead you should configure the exporters via passing in arguments to the `OTLPTraceExporter` and `OTLPLogExporter` constructors. For example, here is how you can configure exporting to Honeycomb:
+It's important to note that you cannot configure exporters using `OTEL_*` environment variables, as they would conflict with our internal telemetry. Instead you should configure the exporters via passing in arguments to the `OTLPTraceExporter`, `OTLPLogExporter`, and `OTLPMetricExporter` constructors. For example, here is how you can configure exporting to Honeycomb:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
 
 // Initialize OTLP trace exporter with the endpoint URL and headers;
 export default defineConfig({
@@ -226,6 +254,15 @@ export default defineConfig({
         },
       }),
     ],
+    metricExporters: [
+      new OTLPMetricExporter({
+        url: "https://api.honeycomb.io/v1/metrics",
+        headers: {
+          "x-honeycomb-team": process.env.HONEYCOMB_API_KEY,
+          "x-honeycomb-dataset": process.env.HONEYCOMB_DATASET,
+        },
+      }),
+    ],
   },
 });
 ```
@@ -235,7 +272,7 @@ export default defineConfig({
 We currently only officially support the `node` runtime, but you can try our experimental `bun` runtime by setting the `runtime` option in your config file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -255,7 +292,7 @@ See our [Bun guide](/guides/frameworks/bun) for more information.
 You can specify the default machine for all tasks in your project:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -271,7 +308,7 @@ See our [machines documentation](/machines) for more information.
 You can set the log level for your project:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -282,12 +319,27 @@ export default defineConfig({
 
 The `logLevel` only determines which logs are sent to the Trigger.dev instance when using the `logger` API. All `console` based logs are always sent.
 
+## Console logging
+
+You can control console logging behavior in development:
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  enableConsoleLogging: true, // Enable console logging while running dev CLI
+  disableConsoleInterceptor: false, // Disable console interceptor (prevents logs from being sent to the trigger.dev dashboard)
+});
+```
+
 ## Max duration
 
 You can set the default `maxDuration` for all tasks in your project:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -298,12 +350,77 @@ export default defineConfig({
 
 See our [maxDuration guide](/runs/max-duration) for more information.
 
+## Process keep alive
+
+Keep the process alive after the task has finished running so the next task doesn't have to wait for the process to start up again.
+
+Note that the process could be killed at any time, and we don't make any guarantees about the process being alive for a certain amount of time
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  processKeepAlive: true,
+});
+```
+
+You can pass an object to the `processKeepAlive` option to configure the behavior:
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  processKeepAlive: {
+    enabled: true,
+    // The maximum number of executions per process. If the process has run more than this number of times, it will be killed.
+    maxExecutionsPerProcess: 50, // Default: 50
+    // The maximum number of concurrent processes to keep alive in dev.
+    devMaxPoolSize: 25, // Default: 25
+  },
+});
+```
+
+## Development behavior
+
+You can control the working directory behavior in development:
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  legacyDevProcessCwdBehaviour: false, // Default: true
+});
+```
+
+When set to `false`, the current working directory will be set to the build directory, which more closely matches production behavior.
+
+## CA certificates
+
+CA Cert file to be added to NODE_EXTRA_CA_CERT environment variable, useful in use with self signed cert in the trigger.dev environment.
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  // Must start with "./" and be relative to project root
+  extraCACerts: "./certs/ca.crt",
+});
+```
+
 ## Build configuration
 
 You can customize the build process using the `build` option:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -311,6 +428,12 @@ export default defineConfig({
   build: {
     // Don't bundle these packages
     external: ["header-generator"],
+    // Automatically detect external dependencies (default: true)
+    autoDetectExternal: true,
+    // Keep function/class names in bundle (default: true)
+    keepNames: true,
+    // Minify generated code (default: false, experimental)
+    minify: false,
   },
 });
 ```
@@ -326,7 +449,7 @@ export default defineConfig({
 All code is bundled by default, but you can exclude some packages from the bundle using the `external` option:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -342,7 +465,7 @@ When a package is excluded from the bundle, it will be added to a dynamically ge
 Each entry in the external should be a package name, not necessarily the import path. For example, if you want to exclude the `ai` package, but you are importing `ai/rsc`, you should just include `ai` in the `external` array:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -353,9 +476,26 @@ export default defineConfig({
 });
 ```
 
+#### WebAssembly (WASM) packages
+
+Packages that use WebAssembly (WASM) must be added to the `external` array. WASM files are binary modules that need to be loaded at runtime and cannot be bundled into JavaScript code. When you add a WASM package to `external`, the package will be installed as a dependency in the runtime environment, ensuring the WASM files are available at their expected paths.
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  build: {
+    external: ["your-wasm-package-name"],
+  },
+});
+```
+
 <Note>
-  Any packages that install or build a native binary should be added to external, as native binaries
-  cannot be bundled. For example, `re2`, `sharp`, and `sqlite3` should be added to external.
+  Any packages that install or build a native binary or use WebAssembly (WASM) should be added to
+  external, as they cannot be bundled. For example, `re2`, `sharp`, `sqlite3`, and WASM packages
+  should be added to external.
 </Note>
 
 ### JSX
@@ -363,7 +503,7 @@ export default defineConfig({
 You can customize the `jsx` options that are passed to `esbuild` using the `jsx` option:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -390,7 +530,7 @@ See the [esbuild JSX documentation](https://esbuild.github.io/content-types/#jsx
 You can add custom [import conditions](https://esbuild.github.io/api/#conditions) to your build using the `conditions` option:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
diff --git a/docs/config/extensions/additionalFiles.mdx b/docs/config/extensions/additionalFiles.mdx
index 455459a82c6..038bf185ab8 100644
--- a/docs/config/extensions/additionalFiles.mdx
+++ b/docs/config/extensions/additionalFiles.mdx
@@ -7,16 +7,17 @@ description: "Use the additionalFiles build extension to copy additional files t
 Import the `additionalFiles` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { additionalFiles } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
   project: "<project ref>",
   // Your other config settings...
+  // We strongly recommend setting this to false
+  // When set to `false`, the current working directory will be set to the build directory, which more closely matches production behavior.
+  legacyDevProcessCwdBehaviour: false, // Default: true
   build: {
-    extensions: [
-      additionalFiles({ files: ["wrangler/wrangler.toml", "./assets/**", "./fonts/**"] }),
-    ],
+    extensions: [additionalFiles({ files: ["./assets/**", "wrangler/wrangler.toml"] })],
   },
 });
 ```
@@ -25,4 +26,13 @@ This will copy the files specified in the `files` array to the build directory.
 
 This extension effects both the `dev` and the `deploy` commands, and the resulting paths will be the same for both.
 
+If you use `legacyDevProcessCwdBehaviour: false`, you can then do this:
+
+```ts
+import path from "node:path";
+
+// You can use `process.cwd()` if you use `legacyDevProcessCwdBehaviour: false`
+const interRegularFont = path.join(process.cwd(), "assets/Inter-Regular.ttf");
+```
+
 <Note>The root of the project is the directory that contains the trigger.config.ts file</Note>
diff --git a/docs/config/extensions/additionalPackages.mdx b/docs/config/extensions/additionalPackages.mdx
index 7837c5dacdd..d62562e6709 100644
--- a/docs/config/extensions/additionalPackages.mdx
+++ b/docs/config/extensions/additionalPackages.mdx
@@ -7,7 +7,7 @@ description: "Use the additionalPackages build extension to include additional p
 Import the `additionalPackages` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { additionalPackages } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -22,7 +22,7 @@ export default defineConfig({
 This allows you to include additional packages in the build that are not automatically included via imports. This is useful if you want to install a package that includes a CLI tool that you want to invoke in your tasks via `exec`. We will try to automatically resolve the version of the package but you can specify the version by using the `@` symbol:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
diff --git a/docs/config/extensions/aptGet.mdx b/docs/config/extensions/aptGet.mdx
index b45ecaa485b..817c4157d7a 100644
--- a/docs/config/extensions/aptGet.mdx
+++ b/docs/config/extensions/aptGet.mdx
@@ -7,7 +7,7 @@ description: "Use the aptGet build extension to install system packages into the
 You can install system packages into the deployed image using the `aptGet` extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { aptGet } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -22,7 +22,7 @@ export default defineConfig({
 If you want to install a specific version of a package, you can specify the version like this:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
diff --git a/docs/config/extensions/audioWaveform.mdx b/docs/config/extensions/audioWaveform.mdx
index 7b3df9f3da4..de23eb04769 100644
--- a/docs/config/extensions/audioWaveform.mdx
+++ b/docs/config/extensions/audioWaveform.mdx
@@ -7,7 +7,7 @@ description: "Use the audioWaveform build extension to add support for Audio Wav
 Previously, we installed [Audio Waveform](https://github.com/bbc/audiowaveform) in the build image. That's been moved to a build extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
 
 export default defineConfig({
diff --git a/docs/config/extensions/custom.mdx b/docs/config/extensions/custom.mdx
index 2d581c6545f..02c5980cf9b 100644
--- a/docs/config/extensions/custom.mdx
+++ b/docs/config/extensions/custom.mdx
@@ -20,7 +20,7 @@ Build extensions allow you to hook into the build system and customize the build
 Build extensions are added to your `trigger.config.ts` file, with a required `name` and optional build hook functions. Here's a simple example of a build extension that just logs a message when the build starts:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
@@ -45,7 +45,7 @@ You can also extract that out into a function instead of defining it inline, in
 </Note>
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { BuildExtension } from "@trigger.dev/build";
 
 export default defineConfig({
@@ -72,7 +72,7 @@ function myExtension(): BuildExtension {
 This allows the extension to add additional dependencies to the list of externals for the build. This is useful for dependencies that are not included in the bundle, but are expected to be available at runtime.
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
@@ -94,7 +94,7 @@ export default defineConfig({
 This hook runs before the build starts. It receives the `BuildContext` object as an argument.
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
@@ -114,7 +114,7 @@ export default defineConfig({
 If you want to add an esbuild plugin, you must do so in the `onBuildStart` hook. Here's an example of adding a custom esbuild plugin:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
@@ -144,7 +144,7 @@ export default defineConfig({
 You can use the `BuildContext.target` property to determine if the build is for `dev` or `deploy`:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
@@ -170,7 +170,7 @@ export default defineConfig({
 This hook runs after the build completes. It receives the `BuildContext` object and a `BuildManifest` object as arguments. This is where you can add in one or more `BuildLayer`'s to the context.
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
diff --git a/docs/config/extensions/emitDecoratorMetadata.mdx b/docs/config/extensions/emitDecoratorMetadata.mdx
index 49f5d399b7d..24317fae5df 100644
--- a/docs/config/extensions/emitDecoratorMetadata.mdx
+++ b/docs/config/extensions/emitDecoratorMetadata.mdx
@@ -7,7 +7,7 @@ description: "Use the emitDecoratorMetadata build extension to enable support fo
 If you need support for the `emitDecoratorMetadata` typescript compiler option, import the `emitDecoratorMetadata` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
 
 export default defineConfig({
diff --git a/docs/config/extensions/esbuildPlugin.mdx b/docs/config/extensions/esbuildPlugin.mdx
index bc0a7fc87bc..71f5a1ac1ea 100644
--- a/docs/config/extensions/esbuildPlugin.mdx
+++ b/docs/config/extensions/esbuildPlugin.mdx
@@ -7,7 +7,7 @@ description: "Use the esbuildPlugin build extension to add existing or custom es
 You can easily add existing or custom esbuild plugins to your build process using the `esbuildPlugin` extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { esbuildPlugin } from "@trigger.dev/build/extensions";
 import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
 
diff --git a/docs/config/extensions/ffmpeg.mdx b/docs/config/extensions/ffmpeg.mdx
index 581970b411e..cd414c4af5c 100644
--- a/docs/config/extensions/ffmpeg.mdx
+++ b/docs/config/extensions/ffmpeg.mdx
@@ -7,7 +7,7 @@ description: "Use the ffmpeg build extension to include FFmpeg in your project"
 You can add the `ffmpeg` build extension to your build process:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { ffmpeg } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -26,7 +26,7 @@ By default, this will install the version of `ffmpeg` that is available in the D
 If you need FFmpeg 7.x, you can pass `{ version: "7" }` to the extension. This will install a static build of FFmpeg 7.x instead of using the Debian package:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { ffmpeg } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
diff --git a/docs/config/extensions/lightpanda.mdx b/docs/config/extensions/lightpanda.mdx
new file mode 100644
index 00000000000..1e1efc8f639
--- /dev/null
+++ b/docs/config/extensions/lightpanda.mdx
@@ -0,0 +1,56 @@
+---
+title: "Lightpanda"
+sidebarTitle: "lightpanda"
+description: "Use the lightpanda build extension to add Lightpanda browser to your project"
+tag: "v4"
+---
+
+To use the Lightpanda browser in your project, add the extension to your `trigger.config.ts` file:
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+
+export default defineConfig({
+  project: "<project ref>",
+  build: {
+    extensions: [lightpanda()],
+  },
+});
+```
+
+## Options
+
+- `version`: The version of the browser to install. Default: `"latest"`.
+- `disableTelemetry`: Whether to disable telemetry. Default: `false`.
+
+For example:
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+
+export default defineConfig({
+  project: "<project ref>",
+  build: {
+    extensions: [
+      lightpanda({
+        version: "nightly",
+        disableTelemetry: true,
+      }),
+    ],
+  },
+});
+```
+
+## Development
+
+When running in dev, you will first have to download the Lightpanda browser binary and make sure it's in your `PATH`. See [Lightpanda's installation guide](https://lightpanda.io/docs/getting-started/installation).
+
+## Next steps
+
+<CardGroup>
+  <Card title="Lightpanda" color="#6ac6e2" icon="bolt" href="/guides/examples/lightpanda">
+    Learn how to use Lightpanda in your project.
+  </Card>
+</CardGroup>
diff --git a/docs/config/extensions/overview.mdx b/docs/config/extensions/overview.mdx
index abba56694ee..c60083ba882 100644
--- a/docs/config/extensions/overview.mdx
+++ b/docs/config/extensions/overview.mdx
@@ -11,7 +11,7 @@ You can use pre-built extensions by installing the `@trigger.dev/build` package
 Build extensions are added to your `trigger.config.ts` file under the `build.extensions` property:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "my-project",
@@ -31,7 +31,7 @@ export default defineConfig({
 If you are using a pre-built extension, you can import it from the `@trigger.dev/build` package:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { ffmpeg } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -50,7 +50,6 @@ Trigger.dev provides a set of built-in extensions that you can use to customize
 | :-------------------------------------------------------------------- | :----------------------------------------------------------------------------- |
 | [prismaExtension](/config/extensions/prismaExtension)                 | Using prisma in your Trigger.dev tasks                                         |
 | [pythonExtension](/config/extensions/pythonExtension)                 | Execute Python scripts in your project                                         |
-| [playwright](/config/extensions/playwright)                           | Use Playwright in your Trigger.dev tasks                                       |
 | [puppeteer](/config/extensions/puppeteer)                             | Use Puppeteer in your Trigger.dev tasks                                        |
 | [ffmpeg](/config/extensions/ffmpeg)                                   | Use FFmpeg in your Trigger.dev tasks                                           |
 | [aptGet](/config/extensions/aptGet)                                   | Install system packages in your build image                                    |
diff --git a/docs/config/extensions/playwright.mdx b/docs/config/extensions/playwright.mdx
index 0a6dce2bf53..ea8461301e6 100644
--- a/docs/config/extensions/playwright.mdx
+++ b/docs/config/extensions/playwright.mdx
@@ -2,13 +2,8 @@
 title: "Playwright"
 sidebarTitle: "playwright"
 description: "Use the playwright build extension to use Playwright with Trigger.dev"
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
-<UpgradeToV4Note />
-
 If you are using [Playwright](https://playwright.dev/), you should use the Playwright build extension.
 
 - Automatically installs Playwright and required browser dependencies
@@ -24,7 +19,7 @@ If you are using [Playwright](https://playwright.dev/), you should use the Playw
 You can use it for a simple Playwright setup like this:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { playwright } from "@trigger.dev/build/extensions/playwright";
 
 export default defineConfig({
@@ -51,7 +46,7 @@ export default defineConfig({
 ### Custom browsers and version
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { playwright } from "@trigger.dev/build/extensions/playwright";
 
 export default defineConfig({
@@ -72,7 +67,7 @@ export default defineConfig({
 By default, browsers are run in headless mode. If you need to run browsers with a UI (for example, for debugging), set `headless: false`. This will automatically set up a virtual display using Xvfb.
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { playwright } from "@trigger.dev/build/extensions/playwright";
 
 export default defineConfig({
@@ -96,6 +91,32 @@ The extension sets the following environment variables during the build:
 - `PLAYWRIGHT_SKIP_BROWSER_VALIDATION`: Set to `1` to skip browser validation at runtime
 - `DISPLAY`: Set to `:99` if `headless: false` (for Xvfb)
 
+## Troubleshooting
+
+### Browser download failures
+
+If you encounter errors during the build process related to browser downloads (e.g., "failed to solve: process did not complete successfully: exit code: 9"), this is a known issue with certain Playwright versions.
+
+**Workaround:** Revert Playwright to version `1.40.0` in your project dependencies. You can specify this version explicitly in your config:
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { playwright } from "@trigger.dev/build/extensions/playwright";
+
+export default defineConfig({
+  project: "<project ref>",
+  build: {
+    extensions: [
+      playwright({
+        version: "1.40.0",
+      }),
+    ],
+  },
+});
+```
+
+For more details, see [GitHub issue #2440](https://github.com/triggerdotdev/trigger.dev/issues/2440#issuecomment-3815104376).
+
 ## Managing browser instances
 
 To prevent issues with waits and resumes, you can use middleware and locals to manage the browser instance. This will ensure the browser is available for the whole run, and is properly cleaned up on waits, resumes, and after the run completes.
diff --git a/docs/config/extensions/prismaExtension.mdx b/docs/config/extensions/prismaExtension.mdx
index 73bc94b16a4..f4efbe2de20 100644
--- a/docs/config/extensions/prismaExtension.mdx
+++ b/docs/config/extensions/prismaExtension.mdx
@@ -4,154 +4,1011 @@ sidebarTitle: "prismaExtension"
 description: "Use the prismaExtension build extension to use Prisma with Trigger.dev"
 ---
 
-If you are using Prisma, you should use the prisma build extension.
+The `prismaExtension` supports multiple Prisma versions and deployment strategies through **three distinct modes** that handle the evolving Prisma ecosystem, from legacy setups to Prisma 7.
 
-- Automatically handles copying Prisma files to the build directory
-- Generates the Prisma client during the deploy process
-- Optionally will migrate the database during the deploy process
-- Support for TypedSQL and multiple schema files
-- You can use `prismaSchemaFolder` to specify just the directory containing your schema file, instead of the full path
-- You can add the extension twice if you have multiple separate schemas in the same project (example below)
+<Note>
+  The `prismaExtension` requires an explicit `mode` parameter. All configurations must specify a
+  mode.
+</Note>
 
-You can use it for a simple Prisma setup like this:
+## Migration from previous versions
+
+### Before (pre 4.1.1)
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
+extensions: [
+  prismaExtension({
+    schema: "prisma/schema.prisma",
+    migrate: true,
+    typedSql: true,
+    directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+  }),
+];
+```
+
+### After (4.1.1+)
+
+```ts
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+extensions: [
+  prismaExtension({
+    mode: "legacy", // MODE IS REQUIRED
+    schema: "prisma/schema.prisma",
+    migrate: true,
+    typedSql: true,
+    directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+  }),
+];
+```
+
+## Choosing the right mode
+
+Use this decision tree to determine which mode is right for your project:
+
+```mermaid
+flowchart TD
+    Start([Which mode should I use?]) --> Q1{Using Prisma 7 or<br/>6.20+ beta?}
+    Q1 -->|Yes| Modern[Modern Mode]
+    Q1 -->|No| Q2{Using Prisma 6.16+<br/>with engineType='client'?}
+    Q2 -->|Yes| Modern
+    Q2 -->|No| Q3{Need custom client<br/>output path?}
+    Q3 -->|Yes| Q4{Want to manage<br/>prisma generate yourself?}
+    Q4 -->|Yes| Engine[Engine-only Mode]
+    Q4 -->|No| Legacy[Legacy Mode]
+    Q3 -->|No| Legacy
+
+    Modern -->|Features| ModernFeatures["• Zero configuration<br/>• Database adapters<br/>• Plain TypeScript (no binaries)<br/>• You manage generation"]
+    Engine -->|Features| EngineFeatures["• Only installs engines<br/>• Auto version detection<br/>• You manage generation<br/>• Minimal overhead"]
+    Legacy -->|Features| LegacyFeatures["• Auto prisma generate<br/>• Migrations support<br/>• TypedSQL support<br/>• Config file support"]
+
+    style Modern fill:#10b981,stroke:#059669,color:#fff
+    style Engine fill:#3b82f6,stroke:#2563eb,color:#fff
+    style Legacy fill:#8b5cf6,stroke:#7c3aed,color:#fff
+```
+
+## Extension modes
+
+### Legacy mode
+
+**Use when:** You're using Prisma 6.x or earlier with the `prisma-client-js` provider.
+
+**Features:**
+
+- Automatic `prisma generate` during deployment
+- Supports single-file schemas (`prisma/schema.prisma`)
+- Supports multi-file schemas (Prisma 6.7+, directory-based schemas)
+- Supports Prisma config files (`prisma.config.ts`) via `@prisma/config` package
+- Migration support with `migrate: true`
+- TypedSQL support with `typedSql: true`
+- Custom generator selection
+- Handles Prisma client versioning automatically (with filesystem fallback detection)
+- Automatic extraction of schema and migrations paths from config files
+
+**Schema configuration:**
+
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["typedSql"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+```
+
+**Extension configuration:**
+
+```ts
+// Single-file schema
+prismaExtension({
+  mode: "legacy",
+  schema: "prisma/schema.prisma",
+  migrate: true,
+  typedSql: true,
+  directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+});
+
+// Multi-file schema (Prisma 6.7+)
+prismaExtension({
+  mode: "legacy",
+  schema: "./prisma", // Point to directory
+  migrate: true,
+  typedSql: true,
+  directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+});
+```
+
+**Tested versions:**
+
+- Prisma 6.14.0
+- Prisma 6.7.0+ (multi-file schema support)
+- Prisma 5.x
+
+---
+
+### Engine-only mode
+
+**Use when:** You have a custom Prisma client output path and want to manage `prisma generate` yourself.
+
+**Features:**
+
+- Only installs Prisma engine binaries (no client generation)
+- Automatic version detection from `@prisma/client`
+- Manual override of version and binary target
+- Minimal overhead - just ensures engines are available
+- You control when and how `prisma generate` runs
+
+**Schema configuration:**
+
+```prisma
+generator client {
+  provider      = "prisma-client-js"
+  output        = "../src/generated/prisma"
+  // Ensure the "debian-openssl-3.0.x" binary target is included for deployment to the trigger.dev cloud
+  binaryTargets = ["native", "debian-openssl-3.0.x"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+```
+
+**Extension configuration:**
+
+```ts
+// Auto-detect version
+prismaExtension({
+  mode: "engine-only",
+});
+
+// Explicit version (recommended for reproducible builds)
+prismaExtension({
+  mode: "engine-only",
+  version: "6.19.0",
+});
+```
+
+**Important notes:**
+
+- You **must** run `prisma generate` yourself (typically in a prebuild script)
+- Your schema **must** include the correct `binaryTargets` for deployment to the trigger.dev cloud. The binary target is `debian-openssl-3.0.x`.
+- The extension sets `PRISMA_QUERY_ENGINE_LIBRARY` and `PRISMA_QUERY_ENGINE_SCHEMA_ENGINE` environment variables to the correct paths for the binary targets.
+
+**package.json example:**
+
+```json
+{
+  "scripts": {
+    "prebuild": "prisma generate",
+    "dev": "trigger dev",
+    "deploy": "trigger deploy"
+  }
+}
+```
+
+**Tested versions:**
+
+- Prisma 6.19.0
+- Prisma 6.16.0+
+
+---
+
+### Modern mode
+
+**Use when:** You're using Prisma 6.16+ with the new `prisma-client` provider (with `engineType = "client"`) or preparing for Prisma 7.
+
+**Features:**
+
+- Designed for the new Prisma architecture
+- Zero configuration required
+- Automatically marks `@prisma/client` as external
+- Works with Prisma 7 beta releases & Prisma 7 when released
+- You manage client generation (like engine-only mode)
+
+**Schema configuration (Prisma 6.16+ with engineType):**
+
+```prisma
+generator client {
+  provider        = "prisma-client"
+  output          = "../src/generated/prisma"
+  engineType      = "client"
+  previewFeatures = ["views"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+```
+
+**Schema configuration (Prisma 7):**
+
+```prisma
+generator client {
+  provider = "prisma-client"
+  output   = "../src/generated/prisma"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+```
+
+**Extension configuration:**
+
+```ts
+prismaExtension({
+  mode: "modern",
+});
+```
+
+**Prisma config (Prisma 7):**
+
+```ts
+// prisma.config.ts
+import { defineConfig, env } from "prisma/config";
+import "dotenv/config";
+
 export default defineConfig({
-  project: "<project ref>",
-  // Your other config settings...
-  build: {
-    extensions: [
-      prismaExtension({
-        version: "5.19.0", // optional, we'll automatically detect the version if not provided
-        schema: "prisma/schema.prisma",
-      }),
-    ],
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
   },
 });
 ```
 
-<Note>
-  This does not have any effect when running the `dev` command, only when running the `deploy`
-  command.
-</Note>
+**Important notes:**
+
+- You **must** run `prisma generate` yourself.
+- Requires Prisma 6.16.0+ or Prisma 7 beta
+- The new `prisma-client` provider generates plain TypeScript (no Rust binaries)
+- Requires database adapters (e.g., `@prisma/adapter-pg` for PostgreSQL)
+
+**Tested versions:**
+
+- Prisma 6.16.0 with `engineType = "client"`
+- Prisma 6.20.0-integration-next.8 (Prisma 7 beta)
+
+---
+
+## Migration guide
+
+### From old prismaExtension to legacy mode
+
+If you were using the previous `prismaExtension`, migrate to legacy mode:
+
+```ts
+// Old
+prismaExtension({
+  schema: "prisma/schema.prisma",
+  migrate: true,
+});
+
+// New - add mode
+prismaExtension({
+  mode: "legacy",
+  schema: "prisma/schema.prisma",
+  migrate: true,
+});
+```
+
+### Preparing for Prisma 7
 
-### Migrations
+If you want to adopt the new Prisma architecture, use modern mode:
 
-If you want to also run migrations during the build process, you can pass in the `migrate` option:
+1. Update your schema to use `prisma-client` provider
+2. Add database adapters to your dependencies
+3. Configure the extension:
+
+```ts
+prismaExtension({
+  mode: "modern",
+});
+```
+
+### Manage your own prisma generate step
+
+When using `modern` and `engine-only` modes, you'll need to ensure that you run `prisma generate` yourself before deploying your project.
+
+#### Github Actions
+
+If you are deploying your project using GitHub Actions, you can add a step to your workflow to run `prisma generate` before deploying your project, for example:
+
+```yaml
+steps:
+  - name: Generate Prisma client
+    run: npx prisma@6.19.0 generate
+  - name: Deploy Trigger.dev
+    run: npx trigger.dev@4.1.1 deploy
+    env:
+      TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
+```
+
+#### Trigger.dev Github integration
+
+If you are using the [Trigger.dev Github integration](/github-integration), you can configure a pre-build command to run `prisma generate` before deploying your project. Navigate to your project's settings page and configure the pre-build command to run `prisma generate`, for example:
+
+![Pre-build command](/images/pre-build-command-prisma-generate.png)
+
+---
+
+## Version compatibility matrix
+
+| Prisma version   | Recommended mode      | Notes                                        |
+| ---------------- | --------------------- | -------------------------------------------- |
+| < 5.0            | Legacy                | Older Prisma versions                        |
+| 5.0 - 6.15       | Legacy                | Standard Prisma setup                        |
+| 6.7+             | Legacy                | Multi-file schema support                    |
+| 6.16+            | Engine-only or Modern | Modern mode requires `engineType = "client"` |
+| 6.20+ (7.0 beta) | Modern                | Prisma 7 with new architecture               |
+
+---
+
+## Prisma config file support
+
+Legacy mode supports loading configuration from a `prisma.config.ts` file using the official `@prisma/config` package.
+
+**Use when:** You want to use Prisma's new config file format (Prisma 6+) to centralize your Prisma configuration.
+
+**Benefits:**
+
+- Single source of truth for Prisma configuration
+- Automatic extraction of schema location and migrations path
+- Type-safe configuration with TypeScript
+- Works seamlessly with Prisma 7's config-first approach
+
+**prisma.config.ts:**
+
+```ts
+import { defineConfig, env } from "prisma/config";
+import "dotenv/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+    directUrl: env("DATABASE_URL_UNPOOLED"),
+  },
+});
+```
+
+**trigger.config.ts:**
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+prismaExtension({
+  mode: "legacy",
+  configFile: "./prisma.config.ts", // Use config file instead of schema
+  migrate: true,
+  directUrlEnvVarName: "DATABASE_URL_UNPOOLED", // For migrations
+});
+```
+
+**What gets extracted:**
+
+- `schema` - The schema file or directory path
+- `migrations.path` - The migrations directory path (if specified)
+
+**Note:** Either `schema` or `configFile` must be specified, but not both.
+
+**When to use which:**
+
+| Use `schema` option          | Use `configFile` option           |
+| ---------------------------- | --------------------------------- |
+| Standard Prisma setup        | Using Prisma 6+ with config files |
+| Single or multi-file schemas | Preparing for Prisma 7            |
+| No `prisma.config.ts` file   | Centralized configuration needed  |
+| Simple setup                 | Want migrations path in config    |
+
+---
+
+## Multi-file schema support
+
+Prisma 6.7 introduced support for splitting your schema across multiple files in a directory structure.
+
+**Example structure:**
+
+```
+prisma/
+├── schema.prisma (main file with generator/datasource)
+├── models/
+│   ├── users.prisma
+│   └── posts.prisma
+└── sql/
+    └── getUserByEmail.sql
+```
+
+**Configuration:**
+
+```ts
+prismaExtension({
+  mode: "legacy",
+  schema: "./prisma", // Point to directory instead of file
+  migrate: true,
+  typedSql: true,
+});
+```
+
+**package.json:**
+
+```json
+{
+  "prisma": {
+    "schema": "./prisma"
+  }
+}
+```
+
+---
+
+## TypedSQL support
+
+TypedSQL is available in legacy mode for Prisma 5.19.0+ with the `typedSql` preview feature.
+
+**Schema configuration:**
+
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["typedSql"]
+}
+```
+
+**Extension configuration:**
+
+```ts
+prismaExtension({
+  mode: "legacy",
+  schema: "prisma/schema.prisma",
+  typedSql: true, // Enable TypedSQL
+});
+```
+
+**Usage in tasks:**
+
+```ts
+import { db, sql } from "./db";
+
+const users = await db.$queryRawTyped(sql.getUserByEmail("user@example.com"));
+```
+
+---
+
+## Database migration support
+
+Migrations are supported in legacy mode only.
+
+**Extension configuration:**
+
+```ts
+// Using schema option
+prismaExtension({
+  mode: "legacy",
+  schema: "prisma/schema.prisma",
+  migrate: true, // Run migrations on deployment
+  directUrlEnvVarName: "DATABASE_URL_UNPOOLED", // For connection pooling
+});
+
+// Using configFile option
+prismaExtension({
+  mode: "legacy",
+  configFile: "./prisma.config.ts", // Migrations path extracted from config
+  migrate: true,
+});
+```
+
+**What this does:**
+
+1. Copies `prisma/migrations/` to the build output
+2. Runs `prisma migrate deploy` before generating the client
+3. Uses the `directUrlEnvVarName` for unpooled connections (required for migrations)
+
+When using `configFile`, the migrations path is automatically extracted from your `prisma.config.ts`:
+
+```ts
+// prisma.config.ts
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations", // Automatically used by the extension
+  },
+});
+```
+
+---
+
+## Binary targets and deployment
+
+### Trigger.dev Cloud
+
+The default binary target is `debian-openssl-3.0.x` for Trigger.dev Cloud deployments.
+
+**Legacy mode:** Handled automatically
+
+**Engine-only mode:** Specify in schema like so:
+
+```prisma
+generator client {
+  provider      = "prisma-client-js"
+  binaryTargets = ["native", "debian-openssl-3.0.x"]
+}
+```
+
+**Modern mode:** Handled by database adapters
+
+### Self-hosted / local deployment
+
+For local deployments (e.g., Docker on macOS), you may need a different binary target like so:
+
+```ts
+prismaExtension({
+  mode: "engine-only",
+  version: "6.19.0",
+  binaryTarget: "linux-arm64-openssl-3.0.x", // For macOS ARM64
+});
+```
+
+---
+
+## Environment variables
+
+### Required variables
+
+All modes:
+
+- `DATABASE_URL`: Your database connection string
+
+Legacy mode with migrations:
+
+- `DATABASE_URL_UNPOOLED` (or your custom `directUrlEnvVarName`): Direct database connection for migrations
+
+### Auto-set variables
+
+Engine-only mode sets:
+
+- `PRISMA_QUERY_ENGINE_LIBRARY`: Path to the query engine
+- `PRISMA_QUERY_ENGINE_SCHEMA_ENGINE`: Path to the schema engine
+
+---
+
+## Troubleshooting
+
+### "Could not find Prisma schema"
+
+**Legacy mode:** Ensure the `schema` path is correct relative to your working directory.
+
+```ts
+// If your project structure is:
+// project/
+//   trigger.config.ts
+//   prisma/
+//     schema.prisma
+
+prismaExtension({
+  mode: "legacy",
+  schema: "./prisma/schema.prisma", // Correct
+  // schema: "prisma/schema.prisma", // Also works
+});
+```
+
+### "Could not determine @prisma/client version"
+
+The extension includes improved version detection that tries multiple strategies:
+
+1. Check if `@prisma/client` is imported in your code (externals)
+2. Use the `version` option if specified
+3. Detect from filesystem by looking for `@prisma/client` or `prisma` in `node_modules`
+
+**Legacy mode:** The extension will automatically detect the version from your installed packages. If it still fails, specify the version explicitly:
+
+```ts
+prismaExtension({
+  mode: "legacy",
+  schema: "prisma/schema.prisma",
+  version: "6.19.0", // Add explicit version
+});
+```
+
+**Engine-only mode:** Specify the version explicitly:
+
+```ts
+prismaExtension({
+  mode: "engine-only",
+  version: "6.19.0", // Add explicit version
+});
+```
+
+### "Binary target not found"
+
+**Engine-only mode:** Make sure your schema includes the deployment binary target:
+
+```prisma
+generator client {
+  provider      = "prisma-client-js"
+  binaryTargets = ["native", "linux-arm64-openssl-3.0.x"]
+}
+```
+
+### "Module not found: @prisma/client/sql"
+
+**Legacy mode:** Make sure `typedSql: true` is set and you have Prisma 5.19.0+:
+
+```ts
+prismaExtension({
+  mode: "legacy",
+  schema: "prisma/schema.prisma",
+  typedSql: true, // Required for TypedSQL
+});
+```
+
+### "Config file not found" or config loading errors
+
+**Legacy mode with configFile:** Ensure the config file path is correct:
+
+```ts
+prismaExtension({
+  mode: "legacy",
+  configFile: "./prisma.config.ts", // Path relative to project root
+  migrate: true,
+});
+```
+
+**Requirements:**
+
+- The config file must exist at the specified path
+- Your project must have the `prisma` package installed (Prisma 6+)
+- The config file must have a default export
+- The config must specify a `schema` path
+
+**Debugging:**
+
+Use `--log-level debug` in your `trigger deploy` command to see detailed logs:
+
+```ts
+npx trigger.dev@latest deploy --log-level debug
+```
+
+Then grep for `[PrismaExtension]` in your build logs to see detailed information about config loading, schema resolution, and migrations setup.
+
+---
+
+## Complete examples
+
+### Example 1: Standard Prisma 6 setup (legacy mode)
+
+**prisma/schema.prisma:**
+
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["typedSql"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+```
+
+**trigger.config.ts:**
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
-  project: "<project ref>",
-  // Your other config settings...
+  project: process.env.TRIGGER_PROJECT_REF!,
   build: {
     extensions: [
       prismaExtension({
+        mode: "legacy",
         schema: "prisma/schema.prisma",
         migrate: true,
-        directUrlEnvVarName: "DATABASE_URL_UNPOOLED", // optional - the name of the environment variable that contains the direct database URL if you are using a direct database URL
+        typedSql: true,
+        directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
       }),
     ],
   },
 });
 ```
 
-### clientGenerator
+---
+
+### Example 2: Multi-file schema (legacy mode)
 
-If you have multiple `generator` statements defined in your schema file, you can pass in the `clientGenerator` option to specify the `prisma-client-js` generator, which will prevent other generators from being generated. Some examples where you may need to do this include when using the `prisma-kysely` or `prisma-json-types-generator` generators.
+**prisma/schema.prisma:**
 
-<CodeGroup>
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["typedSql"]
+}
 
-```prisma schema.prisma
 datasource db {
   provider  = "postgresql"
   url       = env("DATABASE_URL")
   directUrl = env("DATABASE_URL_UNPOOLED")
 }
+```
 
-// We only want to generate the prisma-client-js generator
-generator client {
-  provider        = "prisma-client-js"
+**prisma/models/users.prisma:**
+
+```prisma
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  posts     Post[]
 }
+```
+
+**prisma/models/posts.prisma:**
 
-generator kysely {
-  provider     = "prisma-kysely"
-  output       = "../../src/kysely"
-  enumFileName = "enums.ts"
-  fileName     = "types.ts"
+```prisma
+model Post {
+  id        String   @id @default(cuid())
+  title     String
+  content   String
+  authorId  String
+  author    User     @relation(fields: [authorId], references: [id])
 }
+```
+
+**package.json:**
 
-generator json {
-  provider = "prisma-json-types-generator"
+```json
+{
+  "prisma": {
+    "schema": "./prisma"
+  }
 }
 ```
 
-```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
-import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+**trigger.config.ts:**
+
+```ts
+prismaExtension({
+  mode: "legacy",
+  schema: "./prisma", // Directory, not file
+  migrate: true,
+  typedSql: true,
+  directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+});
+```
+
+---
+
+### Example 3: Using Prisma config file (legacy mode)
+
+Use a `prisma.config.ts` file to centralize your Prisma configuration.
+
+**prisma.config.ts:**
+
+```ts
+import { defineConfig, env } from "prisma/config";
+import "dotenv/config";
 
 export default defineConfig({
-  project: "<project ref>",
-  // Your other config settings...
-  build: {
-    extensions: [
-      prismaExtension({
-        schema: "prisma/schema.prisma",
-        clientGenerator: "client",
-      }),
-    ],
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+    directUrl: env("DATABASE_URL_UNPOOLED"),
   },
 });
 ```
 
-</CodeGroup>
+**prisma/schema.prisma:**
 
-### TypedSQL
+```prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["typedSql"]
+}
 
-If you are using [TypedSQL](https://www.prisma.io/typedsql), you'll need to enable it via the `typedSql` option:
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+}
+```
+
+**trigger.config.ts:**
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
-  project: "<project ref>",
-  // Your other config settings...
+  project: process.env.TRIGGER_PROJECT_REF!,
   build: {
     extensions: [
       prismaExtension({
-        schema: "prisma/schema.prisma",
+        mode: "legacy",
+        configFile: "./prisma.config.ts", // Load from config file
+        migrate: true,
         typedSql: true,
+        // schema and migrations path are extracted from prisma.config.ts
       }),
     ],
   },
 });
 ```
 
-<Note>
-  The `prismaExtension` will inject the `DATABASE_URL` environment variable into the build process. Learn more about setting environment variables for deploying in our [Environment Variables](/deploy-environment-variables) guide.
+**src/db.ts:**
 
-These environment variables are only used during the build process and are not embedded in the final container image.
+```ts
+import { PrismaClient } from "@prisma/client";
+export * as sql from "@prisma/client/sql";
 
-</Note>
+export const db = new PrismaClient({
+  datasources: {
+    db: {
+      url: process.env.DATABASE_URL,
+    },
+  },
+});
+```
+
+---
+
+### Example 4: Custom output path (engine-only mode)
 
-### Multiple schemas
+**prisma/schema.prisma:**
 
-If you have multiple separate schemas in the same project you can add the extension multiple times:
+```prisma
+generator client {
+  provider      = "prisma-client-js"
+  output        = "../src/generated/prisma"
+  binaryTargets = ["native", "linux-arm64-openssl-3.0.x"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+```
+
+**package.json:**
+
+```json
+{
+  "scripts": {
+    "generate": "prisma generate",
+    "dev": "pnpm generate && trigger dev",
+    "deploy": "trigger deploy"
+  }
+}
+```
+
+**trigger.config.ts:**
 
 ```ts
 prismaExtension({
-  schema: 'prisma/schema/main.prisma',
-  version: '6.2.0',
-  migrate: false,
-}),
+  mode: "engine-only",
+  version: "6.19.0",
+  binaryTarget: "linux-arm64-openssl-3.0.x",
+});
+```
+
+**src/db.ts:**
+
+```ts
+import { PrismaClient } from "./generated/prisma/client.js";
+
+export const db = new PrismaClient({
+  datasources: {
+    db: {
+      url: process.env.DATABASE_URL,
+    },
+  },
+});
+```
+
+---
+
+### Example 5: Prisma 7 beta (modern mode)
+
+**prisma/schema.prisma:**
+
+```prisma
+generator client {
+  provider = "prisma-client"
+  output   = "../src/generated/prisma"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+```
+
+**prisma.config.ts:**
+
+```ts
+import { defineConfig, env } from "prisma/config";
+import "dotenv/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+  },
+});
+```
+
+**package.json:**
+
+```json
+{
+  "dependencies": {
+    "@prisma/client": "6.20.0-integration-next.8",
+    "@prisma/adapter-pg": "6.20.0-integration-next.8"
+  },
+  "scripts": {
+    "generate": "prisma generate",
+    "dev": "pnpm generate && trigger dev",
+    "deploy": "trigger deploy"
+  }
+}
+```
+
+**trigger.config.ts:**
+
+```ts
 prismaExtension({
-  schema: 'prisma/schema/secondary.prisma',
-  version: '6.2.0',
-  migrate: false,
-}),
+  mode: "modern",
+});
+```
+
+**src/db.ts:**
+
+```ts
+import { PrismaClient } from "./generated/prisma/client.js";
+import { PrismaPg } from "@prisma/adapter-pg";
+
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL!,
+});
+
+export const db = new PrismaClient({ adapter });
 ```
+
+---
+
+## Resources
+
+- [Prisma Documentation](https://www.prisma.io/docs)
+- [Multi-File Schema (Prisma 6.7+)](https://www.prisma.io/docs/orm/prisma-schema/overview/location#multi-file-prisma-schema)
+- [TypedSQL (Prisma 5.19+)](https://www.prisma.io/docs/orm/prisma-client/using-raw-sql/typedsql)
+- [Prisma 7 Beta Documentation](https://www.prisma.io/docs)
+
+---
diff --git a/docs/config/extensions/puppeteer.mdx b/docs/config/extensions/puppeteer.mdx
index 62942e7f87a..a2f3091bd7b 100644
--- a/docs/config/extensions/puppeteer.mdx
+++ b/docs/config/extensions/puppeteer.mdx
@@ -9,7 +9,7 @@ description: "Use the puppeteer build extension to enable support for Puppeteer
 To use Puppeteer in your project, add these build settings to your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
 
 export default defineConfig({
diff --git a/docs/config/extensions/pythonExtension.mdx b/docs/config/extensions/pythonExtension.mdx
index 21704d65d34..a8a30a02fb7 100644
--- a/docs/config/extensions/pythonExtension.mdx
+++ b/docs/config/extensions/pythonExtension.mdx
@@ -15,7 +15,7 @@ npm add @trigger.dev/python
 Then, you can use the `pythonExtension` build extension in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { pythonExtension } from "@trigger.dev/python/extension";
 
 export default defineConfig({
@@ -29,7 +29,7 @@ export default defineConfig({
 This will take care of adding python to the build image and setting up the necessary environment variables to execute Python scripts. You can then use our `python` utilities in the `@trigger.dev/python` package to execute Python scripts in your tasks. For example, running a Python script inline in a task:
 
 ```ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 
 export const myScript = task({
@@ -46,7 +46,7 @@ export const myScript = task({
 You can automatically add python scripts to your project using the `scripts` option in the `pythonExtension` function. This will copy the specified scripts to the build directory during the deploy process. For example:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { pythonExtension } from "@trigger.dev/python/extension";
 
 export default defineConfig({
@@ -64,7 +64,7 @@ export default defineConfig({
 This will copy all Python files in the `python` directory to the build directory during the deploy process. You can then execute these scripts using the `python.runScript` function:
 
 ```ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 
 export const myScript = task({
@@ -86,7 +86,7 @@ export const myScript = task({
 If you have a `requirements.txt` file in your project, you can use the `requirementsFile` option in the `pythonExtension` function to install the required packages during the build process. For example:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { pythonExtension } from "@trigger.dev/python/extension";
 
 export default defineConfig({
@@ -113,7 +113,7 @@ This will install the packages specified in the `requirements.txt` file during t
 If you are using a virtual environment in your project, you can use the `devPythonBinaryPath` option in the `pythonExtension` function to specify the path to the Python binary in the virtual environment. For example:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { pythonExtension } from "@trigger.dev/python/extension";
 
 export default defineConfig({
@@ -135,7 +135,7 @@ This has no effect in production mode, but in development mode, it will use the
 All of the `python` functions have a streaming version that allows you to stream the output of the Python script as it runs. For example:
 
 ```ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 
 export const myStreamingScript = task({
@@ -165,7 +165,7 @@ print(os.environ["MY_ENV_VAR"])
 You can also pass additional environment variables to the Python script using the `env` option in the `python.runScript` function. For example:
 
 ```ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 
 export const myScript = task({
diff --git a/docs/config/extensions/syncEnvVars.mdx b/docs/config/extensions/syncEnvVars.mdx
index c4fc338fecc..d6b0be78323 100644
--- a/docs/config/extensions/syncEnvVars.mdx
+++ b/docs/config/extensions/syncEnvVars.mdx
@@ -9,7 +9,7 @@ The `syncEnvVars` build extension will sync env vars from another service into T
 `syncEnvVars` takes an async callback function, and any env vars returned from the callback will be synced to Trigger.dev.
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -37,7 +37,7 @@ The callback is passed a context object with the following properties:
 In this example we're using env vars from [Infisical](https://infisical.com).
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncEnvVars } from "@trigger.dev/build/extensions/core";
 import { InfisicalSDK } from "@infisical/sdk";
 
@@ -71,17 +71,43 @@ export default defineConfig({
 
 The `syncVercelEnvVars` build extension syncs environment variables from your Vercel project to Trigger.dev.
 
-<Note>
-  You need to set the `VERCEL_ACCESS_TOKEN` and `VERCEL_PROJECT_ID` environment variables, or pass
-  in the token and project ID as arguments to the `syncVercelEnvVars` build extension. If you're
-  working with a team project, you'll also need to set `VERCEL_TEAM_ID`, which can be found in your
-  team settings. You can find / generate the `VERCEL_ACCESS_TOKEN` in your Vercel
-  [dashboard](https://vercel.com/account/settings/tokens). Make sure the scope of the token covers
-  the project with the environment variables you want to sync.
-</Note>
+<AccordionGroup>
+<Accordion title="Setting up authentication including team projects">
+You need to set the `VERCEL_ACCESS_TOKEN` and `VERCEL_PROJECT_ID` environment variables, or pass
+in the token and project ID as arguments to the `syncVercelEnvVars` build extension. If you're
+working with a team project, you'll also need to set `VERCEL_TEAM_ID`, which can be found in your
+team settings.
+
+You can find / generate the `VERCEL_ACCESS_TOKEN` in your Vercel
+[dashboard](https://vercel.com/account/settings/tokens). Make sure the scope of the token covers
+the project with the environment variables you want to sync.
+</Accordion>
+
+<Accordion title="Running in Vercel build environment">
+When running the build from a Vercel build environment (e.g., during a Vercel deployment), the
+environment variable values will be read from `process.env` instead of fetching them from the
+Vercel API. This is determined by checking if the `VERCEL` environment variable is present.
+
+The API is still used to determine which environment variables are configured for your project, but
+the actual values come from the local environment. Reading values from `process.env` allows the
+extension to use values that Vercel integrations (such as the Neon integration) set per preview
+deployment in the "Provisioning Integrations" phase that happens just before the Vercel build
+starts.
+</Accordion>
+
+<Accordion title="Using with Neon database Vercel integration">
+If you have the Neon database Vercel integration installed and are running builds outside of the
+Vercel environment, we recommend using `syncNeonEnvVars` in addition to `syncVercelEnvVars` for your
+database environment variables.
+
+This ensures that the correct database connection strings are used for your 
+selected environment and current branch, as `syncVercelEnvVars` may not accurately reflect
+branch-specific database credentials when run locally.
+</Accordion>
+</AccordionGroup>
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncVercelEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -97,7 +123,7 @@ export default defineConfig({
 Or you can pass in the token and project ID as arguments:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncVercelEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -107,10 +133,90 @@ export default defineConfig({
     extensions: [
       syncVercelEnvVars({
         projectId: "your-vercel-project-id",
-        vercelAccessToken: "your-vercel-access-token",
+        vercelAccessToken: "your-vercel-access-token", // optional, we recommend to keep it as env variable
         vercelTeamId: "your-vercel-team-id", // optional
       }),
     ],
   },
 });
 ```
+
+### syncNeonEnvVars
+
+The `syncNeonEnvVars` build extension syncs environment variables from your Neon database project to Trigger.dev. It automatically detects branches and builds the appropriate database connection strings for your environment.
+
+<AccordionGroup>
+<Accordion title="Setting up authentication">
+You need to set the `NEON_ACCESS_TOKEN` and `NEON_PROJECT_ID` environment variables, or pass them
+as arguments to the `syncNeonEnvVars` build extension.
+
+You can generate a `NEON_ACCESS_TOKEN` in your Neon [dashboard](https://console.neon.tech/app/settings/api-keys).
+</Accordion>
+
+<Accordion title="Running in Vercel environment">
+When running the build from a Vercel environment (determined by checking if the `VERCEL`
+environment variable is present), this extension is skipped entirely.
+
+This is because Neon's Vercel integration already handles environment variable synchronization in Vercel environments.
+</Accordion>
+
+<Accordion title="Using with Neon database Vercel integration">
+If you have the Neon database Vercel integration installed and are running builds outside of the
+Vercel environment, we recommend using `syncNeonEnvVars` in addition to `syncVercelEnvVars` for your
+database environment variables.
+
+This ensures that the correct database connection strings are used for your selected environment and current branch, as `syncVercelEnvVars` may not accurately reflect branch-specific database credentials when run locally.
+</Accordion>
+</AccordionGroup>
+
+<Note>
+  This extension is skipped for `prod` environments. It is designed to sync branch-specific
+  database connections for preview/staging environments.
+</Note>
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { syncNeonEnvVars } from "@trigger.dev/build/extensions/core";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  build: {
+    // This will automatically use the NEON_ACCESS_TOKEN and NEON_PROJECT_ID environment variables
+    extensions: [syncNeonEnvVars()],
+  },
+});
+```
+
+Or you can pass in the token and project ID as arguments:
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { syncNeonEnvVars } from "@trigger.dev/build/extensions/core";
+
+export default defineConfig({
+  project: "<project ref>",
+  // Your other config settings...
+  build: {
+    extensions: [
+      syncNeonEnvVars({
+        projectId: "your-neon-project-id",
+        neonAccessToken: "your-neon-access-token", // optional, we recommend to keep it as env variable
+        branch: "your-branch-name", // optional, defaults to ctx.branch
+        databaseName: "your-database-name", // optional, defaults to the first database
+        roleName: "your-role-name", // optional, defaults to the database owner
+        envVarPrefix: "MY_PREFIX_", // optional, prefix for all synced env vars
+      }),
+    ],
+  },
+});
+```
+
+The extension syncs the following environment variables (with optional prefix):
+
+- `DATABASE_URL` - Pooled connection string
+- `DATABASE_URL_UNPOOLED` - Direct connection string
+- `POSTGRES_URL`, `POSTGRES_URL_NO_SSL`, `POSTGRES_URL_NON_POOLING`
+- `POSTGRES_PRISMA_URL` - Connection string optimized for Prisma
+- `POSTGRES_HOST`, `POSTGRES_USER`, `POSTGRES_PASSWORD`, `POSTGRES_DATABASE`
+- `PGHOST`, `PGHOST_UNPOOLED`, `PGUSER`, `PGPASSWORD`, `PGDATABASE`
diff --git a/docs/context.mdx b/docs/context.mdx
index bd9d3547ed3..4e4b8f7bac6 100644
--- a/docs/context.mdx
+++ b/docs/context.mdx
@@ -13,7 +13,7 @@ Context (`ctx`) is a way to get information about a run.
 <RequestExample>
 
 ```typescript Context example
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const parentTask = task({
   id: "parent-task",
diff --git a/docs/deploy-environment-variables.mdx b/docs/deploy-environment-variables.mdx
index 3815c106be4..a4c3b75daf4 100644
--- a/docs/deploy-environment-variables.mdx
+++ b/docs/deploy-environment-variables.mdx
@@ -66,6 +66,18 @@ You can edit an environment variable's values. You cannot edit the key name, you
 
 </Steps>
 
+## Local development
+
+When running `npx trigger.dev dev`, the CLI automatically loads environment variables from these files in order (later files override any duplicate keys from earlier ones):
+
+- `.env`
+- `.env.development`
+- `.env.local`
+- `.env.development.local`
+- `dev.vars`
+
+These variables are available to your tasks via `process.env`. You don't need to use the `--env-file` flag for this automatic loading.
+
 ## In your code
 
 You can use our SDK to get and manipulate environment variables. You can also easily sync environment variables from another service into Trigger.dev.
@@ -83,6 +95,84 @@ We have a complete set of SDK functions (and REST API) you can use to directly m
 | [envvars.update()](/management/envvars/update)     | Update a single environment variable                        |
 | [envvars.del()](/management/envvars/delete)        | Delete a single environment variable                        |
 
+#### Initial load from .env file
+
+To initially load environment variables from a `.env` file into your Trigger.dev cloud environment, you can use `envvars.upload()`. This is useful for one-time bulk imports when setting up a new project or environment.
+
+```ts
+import { envvars } from "@trigger.dev/sdk";
+import { readFileSync } from "fs";
+import { parse } from "dotenv";
+
+// Read and parse your .env file
+const envContent = readFileSync(".env.production", "utf-8");
+const parsed = parse(envContent);
+
+// Upload to Trigger.dev (replace with your project ref and environment slug)
+await envvars.upload("proj_your_project_ref", "prod", {
+  variables: parsed,
+  override: false, // Set to true to override existing variables
+});
+```
+
+When called inside a task, you can omit the project ref and environment slug as they'll be automatically inferred from the task context:
+
+```ts
+import { envvars, task } from "@trigger.dev/sdk";
+import { readFileSync } from "fs";
+import { parse } from "dotenv";
+
+export const setupEnvVars = task({
+  id: "setup-env-vars",
+  run: async () => {
+    const envContent = readFileSync(".env.production", "utf-8");
+    const parsed = parse(envContent);
+
+    // projectRef and environment slug are automatically inferred from ctx
+    await envvars.upload({
+      variables: parsed,
+      override: false,
+    });
+  },
+});
+```
+
+<Note>
+This is different from `syncEnvVars` which automatically syncs variables during every deploy. Use `envvars.upload()` for one-time initial loads, and `syncEnvVars` for ongoing synchronization.
+</Note>
+
+#### Getting the current environment
+
+When using `envvars.retrieve()` inside a task, you can access the current environment information from the task context (`ctx`). The `envvars.retrieve()` function doesn't return the environment, but you can get it from `ctx.environment`:
+
+```ts
+import { envvars, task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload, { ctx }) => {
+    // Get the current environment information
+    const currentEnv = ctx.environment.slug; // e.g., "dev", "prod", "staging"
+    const envType = ctx.environment.type; // e.g., "DEVELOPMENT", "PRODUCTION", "STAGING", "PREVIEW"
+
+    // Retrieve an environment variable
+    // When called inside a task, projectRef and slug are automatically inferred
+    const apiKey = await envvars.retrieve("API_KEY");
+
+    console.log(`Retrieved API_KEY from environment: ${currentEnv} (${envType})`);
+    console.log(`Value: ${apiKey.value}`);
+  },
+});
+```
+
+The context object provides:
+- `ctx.environment.slug` - The environment slug (e.g., "dev", "prod")
+- `ctx.environment.type` - The environment type ("DEVELOPMENT", "PRODUCTION", "STAGING", or "PREVIEW")
+- `ctx.environment.id` - The environment ID
+- `ctx.project.ref` - The project reference
+
+For more information about the context object, see the [Context documentation](/context).
+
 ### Sync env vars from another service
 
 You could use the SDK functions above but it's much easier to use our `syncEnvVars` build extension in your `trigger.config` file.
@@ -95,7 +185,7 @@ You could use the SDK functions above but it's much easier to use our `syncEnvVa
 In this example we're using env vars from [Infisical](https://infisical.com).
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncEnvVars } from "@trigger.dev/build/extensions/core";
 import { InfisicalSDK } from "@infisical/sdk";
 
@@ -234,3 +324,103 @@ You can now use the `client` object to make authenticated requests to Google API
 </Step>
 
 </Steps>
+
+## Using `.env.production` or dotenvx with Trigger.dev
+
+Trigger.dev does not automatically load `.env.production` files or dotenvx files during deploys.  
+To use these files in your Trigger.dev environment:
+
+### Option 1 — Manually add your environment variables
+
+1. Open your `.env.production` (or `.env`) file  
+2. Copy the full contents  
+3. Go to your Trigger.dev project → **Environment Variables**  
+4. Click **Add variables**  
+5. Paste the contents directly into the editor
+
+Trigger.dev will automatically parse and create each key/value pair.
+
+This is the simplest way to bring dotenvx or `.env.production` variables into your Trigger.dev environment.
+
+### Option 2 — Sync variables automatically using `syncEnvVars`
+
+If you'd prefer an automated flow, you can use the `syncEnvVars` build extension to programmatically load and return your variables:
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { syncEnvVars } from "@trigger.dev/build/extensions/core";
+import dotenvx from "@dotenvx/dotenvx";
+import { readFileSync } from "fs";
+
+export default defineConfig({
+  project: "<project id>",
+  build: {
+    extensions: [
+      syncEnvVars(async () => {
+        const envContent = readFileSync(".env.production", "utf-8");
+        const parsed = dotenvx.parse(envContent);
+        return parsed ?? {};
+      }),
+    ],
+  },
+});
+```
+
+This will read your .env.production file using dotenvx and sync the variables to Trigger.dev during every deploy.
+
+**Summary**
+
+- Trigger.dev does not automatically detect .env.production or dotenvx files
+- You can paste them manually into the dashboard
+- Or sync them automatically using a build extension
+
+## Multi-tenant applications
+
+If you're building a multi-tenant application where each tenant needs different environment variables (like tenant-specific API keys or database credentials), you don't need a separate project for each tenant. Instead, use a single project and load tenant-specific secrets at runtime.
+
+<Note>
+  This is different from [syncing environment variables at deploy time](#sync-env-vars-from-another-service). 
+  Here, secrets are loaded dynamically during task execution, not synced to Trigger.dev's environment variables.
+</Note>
+
+### Recommended approach
+
+Use a secrets service (Infisical, AWS Secrets Manager, HashiCorp Vault, etc.) to store tenant-specific secrets, then retrieve them at the start of each task run based on the tenant identifier in your payload or context.
+
+**Important:** Never pass secrets in the task payload, as payloads are logged and visible in the dashboard.
+
+### Example implementation
+
+```ts
+import { task } from "@trigger.dev/sdk";
+import { SecretsManagerClient, GetSecretValueCommand } from "@aws-sdk/client-secrets-manager";
+
+export const processTenantData = task({
+  id: "process-tenant-data",
+  run: async (payload: { tenantId: string; data: unknown }) => {
+    // Retrieve tenant-specific secret at runtime
+    const client = new SecretsManagerClient({ region: "us-east-1" });
+    const response = await client.send(
+      new GetSecretValueCommand({
+        SecretId: `tenants/${payload.tenantId}/supabase-key`,
+      })
+    );
+
+    const supabaseKey = JSON.parse(response.SecretString!).SUPABASE_SERVICE_KEY;
+
+    // Your task logic using the tenant-specific secret
+    // ...
+  },
+});
+```
+
+You can use any secrets service - see the [sync env vars section](#sync-env-vars-from-another-service) for an example with Infisical.
+
+### Benefits
+
+- **Single codebase** - Deploy once, works for all tenants
+- **Secure** - Secrets never appear in payloads or logs
+- **Scalable** - No project limit constraints
+- **Flexible** - Easy to add new tenants without redeploying
+
+This approach allows you to support unlimited tenants with a single Trigger.dev project, avoiding the [project limit](/limits#projects) while maintaining security and separation of tenant data.
\ No newline at end of file
diff --git a/docs/deployment/connect-repo.png b/docs/deployment/connect-repo.png
new file mode 100644
index 00000000000..10600bf49ae
Binary files /dev/null and b/docs/deployment/connect-repo.png differ
diff --git a/docs/deployment/git-settings.png b/docs/deployment/git-settings.png
new file mode 100644
index 00000000000..a265a01ca8b
Binary files /dev/null and b/docs/deployment/git-settings.png differ
diff --git a/docs/deployment/overview.mdx b/docs/deployment/overview.mdx
index d2c3b7e7e35..8c15954cba8 100644
--- a/docs/deployment/overview.mdx
+++ b/docs/deployment/overview.mdx
@@ -180,7 +180,26 @@ Now you can trigger tasks against the staging environment by setting the `TRIGGE
 TRIGGER_SECRET_KEY="tr_stg_abcd123"
 ```
 
-Currently, we only support two environments: `prod` and `staging`. Multiple environments are on our roadmap which you can track [here](https://feedback.trigger.dev/p/more-environments).
+For additional environments beyond `prod` and `staging`, you can use [preview branches](/deployment/preview-branches), which allow you to create isolated environments for each branch of your code.
+
+## Local builds
+
+By default we use a remote build provider to speed up builds. However, you can also force the build to happen locally on your machine using the `--force-local-build` flag:
+
+```bash
+npx trigger.dev deploy --force-local-build
+```
+
+<Tip>
+  Deploying with local builds can be a useful fallback in cases where our remote build provider is experiencing availability issues.
+</Tip>
+
+### System requirements
+
+To use local builds, you need the following tools installed on your machine:
+
+- Docker ([installation guide](https://docs.docker.com/get-started/get-docker))
+- Docker Buildx ([installation guide](https://github.com/docker/buildx#installing))
 
 ## Environment variables
 
@@ -214,6 +233,8 @@ You can run the deploy command with `--log-level debug` at the end. This will pr
 
 There should be a link below the error message to the full build logs on your machine. Take a look at these to see what went wrong. Join [our Discord](https://trigger.dev/discord) and you share it privately with us if you can't figure out what's going wrong. Do NOT share these publicly as the verbose logs might reveal private information about your project.
 
+Sometimes these errors are caused by upstream availability issues with our remote build provider. In this case, you can try deploying with a local build using the `--force-local-build` flag. Refer to the [Local builds](#local-builds) section for more information.
+
 #### `Deployment encountered an error`
 
 Usually there will be some useful guidance below this message. If you can't figure out what's going wrong then join [our Discord](https://trigger.dev/discord) and create a Help forum post with a link to your deployment.
@@ -223,7 +244,7 @@ Usually there will be some useful guidance below this message. If you can't figu
 This happens because `.node` files are native code and can't be bundled like other packages. To fix this, add your package to [`build.external`](/config/config-file#external) in the `trigger.config.ts` file like this:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
diff --git a/docs/deployment/preview-branches.mdx b/docs/deployment/preview-branches.mdx
index f7882970df0..f2a354e2e9d 100644
--- a/docs/deployment/preview-branches.mdx
+++ b/docs/deployment/preview-branches.mdx
@@ -1,13 +1,8 @@
 ---
 title: "Preview branches"
 description: "Create isolated environments for each branch of your code, allowing you to test changes before merging to production. You can create preview branches manually or automatically from your git branches."
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
-<UpgradeToV4Note />
-
 ## How to use preview branches
 
 The preview environment is special – you create branches from it. The branches you create live under the preview environment and have all the features you're used to from other environments (like staging or production). That means you can trigger runs, have schedules, test them, use Realtime, etc.
@@ -77,7 +72,7 @@ This GitHub Action will:
 
 1. Automatically create a preview branch for your Pull Request (if the branch doesn't already exist).
 2. Deploy the preview branch.
-3. Archive the preview branch when the Pull Request is merged/closed.
+3. Archive the preview branch when the Pull Request is merged/closed. This only works if your workflow runs on **closed** PRs (`types: [opened, synchronize, reopened, closed]`). If you omit `closed`, branches won't be archived automatically.
 
 ```yml .github/workflows/trigger-preview-branches.yml
 name: Deploy to Trigger.dev (preview branches)
@@ -101,7 +96,7 @@ jobs:
         run: npm install
 
       - name: Deploy preview branch
-        run: npx trigger.dev@v4-beta deploy --env preview
+        run: npx trigger.dev@latest deploy --env preview
         env:
           TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
 ```
@@ -121,13 +116,13 @@ You can manually specify the branch using `--branch <branch-name>` in the deploy
 Creating and deploying a preview branch manually is easy:
 
 ```bash
-npx trigger.dev@v4-beta deploy --env preview
+npx trigger.dev@latest deploy --env preview
 ```
 
 This will create and deploy a preview branch, automatically detecting the git branch. If for some reason the auto-detection doesn't work it will let you know and tell you do this:
 
 ```bash
-npx trigger.dev@v4-beta deploy --env preview --branch your-branch-name
+npx trigger.dev@latest deploy --env preview --branch your-branch-name
 ```
 
 ### Archiving a preview branch
@@ -135,7 +130,7 @@ npx trigger.dev@v4-beta deploy --env preview --branch your-branch-name
 You can manually archive a preview branch with the CLI:
 
 ```bash
-npx trigger.dev@v4-beta preview archive
+npx trigger.dev@latest preview archive
 ```
 
 Again we will try auto-detect the current branch. But you can specify the branch name with `--branch <branch-name>`.
diff --git a/docs/docs.json b/docs/docs.json
index b88d903a93b..7c52e79b91c 100644
--- a/docs/docs.json
+++ b/docs/docs.json
@@ -24,10 +24,11 @@
             "pages": [
               "introduction",
               "quick-start",
+              "manual-setup",
               "video-walkthrough",
               "how-it-works",
               "limits",
-              "upgrade-to-v4"
+              "migrating-from-v3"
             ]
           },
           {
@@ -42,6 +43,18 @@
               "apikeys"
             ]
           },
+          {
+            "group": "Building with AI",
+            "pages": [
+              "building-with-ai",
+              {
+                "group": "MCP Server",
+                "pages": ["mcp-introduction", "mcp-tools"]
+              },
+              "skills",
+              "mcp-agent-rules"
+            ]
+          },
           {
             "group": "Writing tasks",
             "pages": [
@@ -57,10 +70,14 @@
               "machines",
               "idempotency",
               "runs/max-duration",
+              "runs/heartbeats",
               "tags",
               "runs/metadata",
+              "tasks/streams",
               "run-usage",
-              "context"
+              "context",
+              "runs/priority",
+              "hidden-tasks"
             ]
           },
           {
@@ -78,6 +95,7 @@
                       "config/extensions/pythonExtension",
                       "config/extensions/playwright",
                       "config/extensions/puppeteer",
+                      "config/extensions/lightpanda",
                       "config/extensions/ffmpeg",
                       "config/extensions/aptGet",
                       "config/extensions/additionalFiles",
@@ -107,35 +125,38 @@
               "deployment/atomic-deployment",
               {
                 "group": "Deployment integrations",
-                "pages": ["vercel-integration"]
+                "pages": ["github-integration", "vercel-integration"]
               }
             ]
           },
           {
-            "group": "Frontend usage",
+            "group": "Realtime",
             "pages": [
-              "frontend/overview",
+              "realtime/overview",
+              "realtime/how-it-works",
+              "realtime/run-object",
+              "realtime/auth",
+              {
+                "group": "React hooks (frontend)",
+                "pages": [
+                  "realtime/react-hooks/overview",
+                  "realtime/react-hooks/triggering",
+                  "realtime/react-hooks/subscribe",
+                  "realtime/react-hooks/streams",
+                  "realtime/react-hooks/swr",
+                  "realtime/react-hooks/use-wait-token"
+                ]
+              },
               {
-                "group": "React hooks",
+                "group": "Backend",
                 "pages": [
-                  "frontend/react-hooks/overview",
-                  "frontend/react-hooks/realtime",
-                  "frontend/react-hooks/triggering"
+                  "realtime/backend/overview",
+                  "realtime/backend/subscribe",
+                  "realtime/backend/streams"
                 ]
               }
             ]
           },
-          {
-            "group": "Realtime API",
-            "pages": [
-              "realtime/overview",
-              "realtime/streams",
-              "realtime/react-hooks",
-              "realtime/subscribe-to-run",
-              "realtime/subscribe-to-runs-with-tag",
-              "realtime/subscribe-to-batch"
-            ]
-          },
           {
             "group": "CLI",
             "pages": [
@@ -158,6 +179,10 @@
               }
             ]
           },
+          {
+            "group": "Insights",
+            "pages": ["insights/query", "insights/metrics"]
+          },
           {
             "group": "Using the Dashboard",
             "pages": ["run-tests", "troubleshooting-alerts", "replaying", "bulk-actions"]
@@ -166,6 +191,7 @@
             "group": "Troubleshooting",
             "pages": [
               "troubleshooting",
+              "how-to-reduce-your-spend",
               "troubleshooting-debugging-in-vscode",
               "upgrading-packages",
               "troubleshooting-uptime-status",
@@ -182,14 +208,9 @@
               {
                 "group": "Environment variables",
                 "pages": ["self-hosting/env/webapp", "self-hosting/env/supervisor"]
-              }
-            ],
-            "tags": ["v4"],
-            "tag": "v4"
-          },
-          {
-            "group": "Self-hosting",
-            "pages": ["open-source-self-hosting"]
+              },
+              "open-source-self-hosting"
+            ]
           },
           {
             "group": "Open source",
@@ -220,6 +241,10 @@
             "group": "Tasks API",
             "pages": ["management/tasks/trigger", "management/tasks/batch-trigger"]
           },
+          {
+            "group": "Batches API",
+            "pages": ["management/batches/create", "management/batches/stream-items"]
+          },
           {
             "group": "Runs API",
             "pages": [
@@ -231,6 +256,16 @@
               "management/runs/update-metadata"
             ]
           },
+          {
+            "group": "Queues API",
+            "pages": [
+              "management/queues/list",
+              "management/queues/retrieve",
+              "management/queues/pause",
+              "management/queues/concurrency-override",
+              "management/queues/concurrency-reset"
+            ]
+          },
           {
             "group": "Schedules API",
             "pages": [
@@ -254,6 +289,18 @@
               "management/envvars/update",
               "management/envvars/delete"
             ]
+          },
+          {
+            "group": "Deployments API",
+            "pages": [
+              "management/deployments/retrieve",
+              "management/deployments/get-latest",
+              "management/deployments/promote"
+            ]
+          },
+          {
+            "group": "Query API",
+            "pages": ["management/query/execute"]
           }
         ]
       },
@@ -287,6 +334,7 @@
                 },
                 "pages": [
                   "guides/ai-agents/overview",
+
                   "guides/ai-agents/generate-translate-copy",
                   "guides/ai-agents/route-question",
                   "guides/ai-agents/respond-and-check-content",
@@ -294,7 +342,7 @@
                   "guides/ai-agents/verify-news-article"
                 ]
               },
-              "guides/cursor-rules",
+              "guides/ai-agents/claude-code-trigger",
               "guides/frameworks/drizzle",
               "guides/frameworks/prisma",
               "guides/frameworks/sequin",
@@ -321,24 +369,39 @@
                   "guides/frameworks/webhooks-guides-overview",
                   "guides/frameworks/nextjs-webhooks",
                   "guides/frameworks/remix-webhooks",
-                  "guides/examples/stripe-webhook"
+                  "guides/examples/stripe-webhook",
+                  "guides/examples/hookdeck-webhook"
                 ]
               }
             ]
           },
-
+          {
+            "group": "Use cases",
+            "pages": [
+              "guides/use-cases/overview",
+              "guides/use-cases/data-processing-etl",
+              "guides/use-cases/media-generation",
+              "guides/use-cases/media-processing",
+              "guides/use-cases/marketing"
+            ]
+          },
           {
             "group": "Example projects",
             "pages": [
+              "guides/example-projects/anchor-browser-web-scraper",
               "guides/example-projects/batch-llm-evaluator",
+              "guides/example-projects/claude-changelog-generator",
+              "guides/example-projects/claude-github-wiki",
               "guides/example-projects/claude-thinking-chatbot",
+              "guides/example-projects/cursor-background-agent",
               "guides/example-projects/human-in-the-loop-workflow",
               "guides/example-projects/mastra-agents-with-memory",
               "guides/example-projects/meme-generator-human-in-the-loop",
-              "guides/example-projects/openai-agent-sdk-guardrails",
               "guides/example-projects/openai-agents-sdk-typescript-playground",
+              "guides/example-projects/product-image-generator",
               "guides/example-projects/realtime-csv-importer",
               "guides/example-projects/realtime-fal-ai",
+              "guides/example-projects/smart-spreadsheet",
               "guides/example-projects/turborepo-monorepo-prisma",
               "guides/example-projects/vercel-ai-sdk-deep-research",
               "guides/example-projects/vercel-ai-sdk-image-generator"
@@ -347,6 +410,7 @@
           {
             "group": "Python guides",
             "pages": [
+              "guides/example-projects/openai-agent-sdk-guardrails",
               "guides/python/python-image-processing",
               "guides/python/python-doc-to-markdown",
               "guides/python/python-crawl4ai",
@@ -362,12 +426,14 @@
               "guides/examples/fal-ai-realtime",
               "guides/examples/ffmpeg-video-processing",
               "guides/examples/firecrawl-url-crawl",
+              "guides/examples/lightpanda",
               "guides/examples/libreoffice-pdf-conversion",
               "guides/examples/open-ai-with-retrying",
               "guides/examples/pdf-to-image",
               "guides/examples/puppeteer",
               "guides/examples/react-pdf",
               "guides/examples/react-email",
+              "guides/examples/replicate-image-generation",
               "guides/examples/resend-email-sequence",
               "guides/examples/satori",
               "guides/examples/scrape-hacker-news",
@@ -407,6 +473,11 @@
       "display": "simple"
     }
   },
+  "styling": {
+    "codeblocks": {
+      "theme": "css-variables"
+    }
+  },
   "appearance": {
     "default": "dark",
     "strict": true
@@ -570,11 +641,63 @@
     },
     {
       "source": "/frontend/react-hooks",
-      "destination": "/frontend/react-hooks/overview"
+      "destination": "/realtime/react-hooks/overview"
+    },
+    {
+      "source": "/frontend/overview",
+      "destination": "/realtime/auth"
+    },
+    {
+      "source": "/frontend/react-hooks/overview",
+      "destination": "/realtime/react-hooks/overview"
+    },
+    {
+      "source": "/frontend/react-hooks/realtime",
+      "destination": "/realtime/react-hooks/realtime"
+    },
+    {
+      "source": "/frontend/react-hooks/triggering",
+      "destination": "/realtime/react-hooks/triggering"
+    },
+    {
+      "source": "/realtime/backend",
+      "destination": "/realtime/backend/overview"
+    },
+    {
+      "source": "/realtime/streams",
+      "destination": "/realtime/backend/streams"
+    },
+    {
+      "source": "/realtime/react-hooks",
+      "destination": "/realtime/react-hooks/overview"
+    },
+    {
+      "source": "/realtime/subscribe-to-run",
+      "destination": "/realtime/backend/subscribe"
+    },
+    {
+      "source": "/realtime/subscribe-to-runs-with-tag",
+      "destination": "/realtime/backend/subscribe"
+    },
+    {
+      "source": "/realtime/subscribe-to-batch",
+      "destination": "/realtime/backend/subscribe"
     },
     {
       "source": "/management/projects/runs",
       "destination": "/management/overview"
+    },
+    {
+      "source": "/guides/cursor-rules",
+      "destination": "/mcp-agent-rules"
+    },
+    {
+      "source": "/agents/rules/overview",
+      "destination": "/mcp-agent-rules"
+    },
+    {
+      "source": "/upgrade-to-v4",
+      "destination": "/migrating-from-v3"
     }
   ]
 }
diff --git a/docs/errors-retrying.mdx b/docs/errors-retrying.mdx
index 2a9fd3863bc..246db2b82af 100644
--- a/docs/errors-retrying.mdx
+++ b/docs/errors-retrying.mdx
@@ -31,7 +31,7 @@ This task will retry 10 times with exponential backoff.
 One way to gain reliability is to break your work into smaller tasks and [trigger](/triggering) them from each other. Each task can have its own retrying behavior:
 
 ```ts /trigger/multiple-tasks.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -70,7 +70,7 @@ We provide some useful functions that you can use to retry smaller parts of a ta
 You can retry a block of code that can throw an error, with the same retry settings as a task.
 
 ```ts /trigger/retry-on-throw.ts
-import { task, logger, retry } from "@trigger.dev/sdk/v3";
+import { task, logger, retry } from "@trigger.dev/sdk";
 
 export const retryOnThrow = task({
   id: "retry-on-throw",
@@ -106,7 +106,7 @@ You can use `fetch`, `axios`, or any other library in your code.
 But we do provide a convenient function to perform HTTP requests with conditional retrying based on the response:
 
 ```ts /trigger/retry-fetch.ts
-import { task, logger, retry } from "@trigger.dev/sdk/v3";
+import { task, logger, retry } from "@trigger.dev/sdk";
 
 export const taskWithFetchRetries = task({
   id: "task-with-fetch-retries",
@@ -180,7 +180,7 @@ export const taskWithFetchRetries = task({
 
 ## Advanced error handling and retrying
 
-We provide a `handleError` callback on the task and in your `trigger.config` file. This gets called when an uncaught error is thrown in your task.
+We provide a `catchError` callback on the task and in your `trigger.config` file. This gets called when an uncaught error is thrown in your task.
 
 You can
 
@@ -203,7 +203,7 @@ In this complicated example:
 <CodeGroup>
 
 ```ts tasks.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { calculateISO8601DurationOpenAIVariantResetAt, openai } from "./openai.js";
 
 export const openaiTask = task({
@@ -219,7 +219,7 @@ export const openaiTask = task({
 
     return chatCompletion.choices[0].message.content;
   },
-  handleError: async (payload, error, { ctx, retryAt }) => {
+  catchError: async ({ payload, error, ctx, retryAt }) => {
     if (error instanceof OpenAI.APIError) {
       if (!error.status) {
         return {
@@ -309,7 +309,7 @@ export function calculateISO8601DurationOpenAIVariantResetAt(
 You can prevent retries by throwing an `AbortTaskRunError`. This will fail the task attempt and disable retrying.
 
 ```ts /trigger/myTasks.ts
-import { task, AbortTaskRunError } from "@trigger.dev/sdk/v3";
+import { task, AbortTaskRunError } from "@trigger.dev/sdk";
 
 export const openaiTask = task({
   id: "openai-task",
@@ -335,7 +335,7 @@ export const openaiTask = task({
 Sometimes you want to catch an error and don't want to retry the task. You can use try/catch as you normally would. In this example we fallback to using Replicate if OpenAI fails.
 
 ```ts /trigger/myTasks.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const openaiTask = task({
   id: "openai-task",
diff --git a/docs/frontend/overview.mdx b/docs/frontend/overview.mdx
deleted file mode 100644
index 6df411bc3a5..00000000000
--- a/docs/frontend/overview.mdx
+++ /dev/null
@@ -1,171 +0,0 @@
----
-title: Overview & Authentication
-sidebarTitle: Overview & Auth
-description: Using the Trigger.dev SDK from your frontend application.
----
-
-You can use our [React hooks](/frontend/react-hooks) in your frontend application to interact with the Trigger.dev API. This guide will show you how to generate Public Access Tokens that can be used to authenticate your requests.
-
-## Authentication
-
-To create a Public Access Token, you can use the `auth.createPublicToken` function in your **backend** code:
-
-```tsx
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken(); // 👈 this public access token has no permissions, so is pretty useless!
-```
-
-### Scopes
-
-By default a Public Access Token has no permissions. You must specify the scopes you need when creating a Public Access Token:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      runs: true, // ❌ this token can read all runs, possibly useful for debugging/testing
-    },
-  },
-});
-```
-
-This will allow the token to read all runs, which is probably not what you want. You can specify only certain runs by passing an array of run IDs:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      runs: ["run_1234", "run_5678"], // ✅ this token can read only these runs
-    },
-  },
-});
-```
-
-You can scope the token to only read certain tasks:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      tasks: ["my-task-1", "my-task-2"], // 👈 this token can read all runs of these tasks
-    },
-  },
-});
-```
-
-Or tags:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      tags: ["my-tag-1", "my-tag-2"], // 👈 this token can read all runs with these tags
-    },
-  },
-});
-```
-
-Or a specific batch of runs:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      batch: "batch_1234", // 👈 this token can read all runs in this batch
-    },
-  },
-});
-```
-
-You can also combine scopes. For example, to read runs with specific tags and for specific tasks:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      tasks: ["my-task-1", "my-task-2"],
-      tags: ["my-tag-1", "my-tag-2"],
-    },
-  },
-});
-```
-
-### Expiration
-
-By default, Public Access Token's expire after 15 minutes. You can specify a different expiration time when creating a Public Access Token:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-const publicToken = await auth.createPublicToken({
-  expirationTime: "1hr",
-});
-```
-
-- If `expirationTime` is a string, it will be treated as a time span
-- If `expirationTime` is a number, it will be treated as a Unix timestamp
-- If `expirationTime` is a `Date`, it will be treated as a date
-
-The format used for a time span is the same as the [jose package](https://github.com/panva/jose), which is a number followed by a unit. Valid units are: "sec", "secs", "second", "seconds", "s", "minute", "minutes", "min", "mins", "m", "hour", "hours", "hr", "hrs", "h", "day", "days", "d", "week", "weeks", "w", "year", "years", "yr", "yrs", and "y". It is not possible to specify months. 365.25 days is used as an alias for a year. If the string is suffixed with "ago", or prefixed with a "-", the resulting time span gets subtracted from the current unix timestamp. A "from now" suffix can also be used for readability when adding to the current unix timestamp.
-
-## Auto-generated tokens
-
-When triggering a task from your backend, the `handle` received from the `trigger` function now includes a `publicAccessToken` field. This token can be used to authenticate requests in your frontend application:
-
-```ts
-import { tasks } from "@trigger.dev/sdk/v3";
-
-const handle = await tasks.trigger("my-task", { some: "data" });
-
-console.log(handle.publicAccessToken);
-```
-
-By default, tokens returned from the `trigger` function expire after 15 minutes and have a read scope for that specific run. You can customize the expiration of the auto-generated tokens by passing a `publicTokenOptions` object to the `trigger` function:
-
-```ts
-import { tasks } from "@trigger.dev/sdk/v3";
-
-const handle = await tasks.trigger(
-  "my-task",
-  { some: "data" },
-  {
-    tags: ["my-tag"],
-  },
-  {
-    publicAccessToken: {
-      expirationTime: "1hr",
-    },
-  }
-);
-```
-
-You will also get back a Public Access Token when using the `batchTrigger` function:
-
-```ts
-import { tasks } from "@trigger.dev/sdk/v3";
-
-const handle = await tasks.batchTrigger("my-task", [
-  { payload: { some: "data" } },
-  { payload: { some: "data" } },
-  { payload: { some: "data" } },
-]);
-
-console.log(handle.publicAccessToken);
-```
-
-## Usage
-
-To learn how to use these Public Access Tokens, see our [React hooks](/frontend/react-hooks) guide.
diff --git a/docs/frontend/react-hooks/overview.mdx b/docs/frontend/react-hooks/overview.mdx
deleted file mode 100644
index 3dedfcaa2b3..00000000000
--- a/docs/frontend/react-hooks/overview.mdx
+++ /dev/null
@@ -1,337 +0,0 @@
----
-title: Overview
-sidebarTitle: Overview
-description: Using the Trigger.dev v3 API from your React application.
----
-
-import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
-
-Our react hooks package provides a set of hooks that make it easy to interact with the Trigger.dev API from your React application, using our [frontend API](/frontend/overview). You can use these hooks to fetch runs, and subscribe to real-time updates, and trigger tasks from your frontend application.
-
-## Installation
-
-Install the `@trigger.dev/react-hooks` package in your project:
-
-<CodeGroup>
-
-```bash npm
-npm add @trigger.dev/react-hooks
-```
-
-```bash pnpm
-pnpm add @trigger.dev/react-hooks
-```
-
-```bash yarn
-yarn install @trigger.dev/react-hooks
-```
-
-</CodeGroup>
-
-## Authentication
-
-All hooks accept an optional last argument `options` that accepts an `accessToken` param, which should be a valid Public Access Token. Learn more about [generating tokens in the frontend guide](/frontend/overview).
-
-```tsx
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken, // This is required
-    baseURL: "https://your-trigger-dev-instance.com", // optional, only needed if you are self-hosting Trigger.dev
-  });
-
-  // ...
-}
-```
-
-Alternatively, you can use our `TriggerAuthContext` provider
-
-```tsx
-import { TriggerAuthContext } from "@trigger.dev/react-hooks";
-
-export function SetupTrigger({ publicAccessToken }: { publicAccessToken: string }) {
-  return (
-    <TriggerAuthContext.Provider value={{ accessToken: publicAccessToken }}>
-      <MyComponent />
-    </TriggerAuthContext.Provider>
-  );
-}
-```
-
-Now children components can use the hooks to interact with the Trigger.dev API. If you are self-hosting Trigger.dev, you can provide the `baseURL` to the `TriggerAuthContext` provider.
-
-```tsx
-import { TriggerAuthContext } from "@trigger.dev/react-hooks";
-
-export function SetupTrigger({ publicAccessToken }: { publicAccessToken: string }) {
-  return (
-    <TriggerAuthContext.Provider
-      value={{
-        accessToken: publicAccessToken,
-        baseURL: "https://your-trigger-dev-instance.com",
-      }}
-    >
-      <MyComponent />
-    </TriggerAuthContext.Provider>
-  );
-}
-```
-
-### Next.js and client components
-
-If you are using Next.js with the App Router, you have to make sure the component that uses the `TriggerAuthContext` is a client component. So for example, the following code will not work:
-
-```tsx app/page.tsx
-import { TriggerAuthContext } from "@trigger.dev/react-hooks";
-
-export default function Page() {
-  return (
-    <TriggerAuthContext.Provider value={{ accessToken: "your-access-token" }}>
-      <MyComponent />
-    </TriggerAuthContext.Provider>
-  );
-}
-```
-
-That's because `Page` is a server component and the `TriggerAuthContext.Provider` uses client-only react code. To fix this, wrap the `TriggerAuthContext.Provider` in a client component:
-
-```ts components/TriggerProvider.tsx
-"use client";
-
-import { TriggerAuthContext } from "@trigger.dev/react-hooks";
-
-export function TriggerProvider({
-  accessToken,
-  children,
-}: {
-  accessToken: string;
-  children: React.ReactNode;
-}) {
-  return (
-    <TriggerAuthContext.Provider
-      value={{
-        accessToken,
-      }}
-    >
-      {children}
-    </TriggerAuthContext.Provider>
-  );
-}
-```
-
-### Passing the token to the frontend
-
-Techniques for passing the token to the frontend vary depending on your setup. Here are a few ways to do it for different setups:
-
-#### Next.js App Router
-
-If you are using Next.js with the App Router and you are triggering a task from a server action, you can use cookies to store and pass the token to the frontend.
-
-```tsx actions/trigger.ts
-"use server";
-
-import { tasks } from "@trigger.dev/sdk/v3";
-import type { exampleTask } from "@/trigger/example";
-import { redirect } from "next/navigation";
-import { cookies } from "next/headers";
-
-export async function startRun() {
-  const handle = await tasks.trigger<typeof exampleTask>("example", { foo: "bar" });
-
-  // Set the auto-generated publicAccessToken in a cookie
-  cookies().set("publicAccessToken", handle.publicAccessToken); // ✅ this token only has access to read this run
-
-  redirect(`/runs/${handle.id}`);
-}
-```
-
-Then in the `/runs/[id].tsx` page, you can read the token from the cookie and pass it to the `TriggerProvider`.
-
-```tsx pages/runs/[id].tsx
-import { TriggerProvider } from "@/components/TriggerProvider";
-
-export default function RunPage({ params }: { params: { id: string } }) {
-  const publicAccessToken = cookies().get("publicAccessToken");
-
-  return (
-    <TriggerProvider accessToken={publicAccessToken}>
-      <RunDetails id={params.id} />
-    </TriggerProvider>
-  );
-}
-```
-
-Instead of a cookie, you could also use a query parameter to pass the token to the frontend:
-
-```tsx actions/trigger.ts
-import { tasks } from "@trigger.dev/sdk/v3";
-import type { exampleTask } from "@/trigger/example";
-import { redirect } from "next/navigation";
-import { cookies } from "next/headers";
-
-export async function startRun() {
-  const handle = await tasks.trigger<typeof exampleTask>("example", { foo: "bar" });
-
-  redirect(`/runs/${handle.id}?publicAccessToken=${handle.publicAccessToken}`);
-}
-```
-
-And then in the `/runs/[id].tsx` page:
-
-```tsx pages/runs/[id].tsx
-import { TriggerProvider } from "@/components/TriggerProvider";
-
-export default function RunPage({
-  params,
-  searchParams,
-}: {
-  params: { id: string };
-  searchParams: { publicAccessToken: string };
-}) {
-  return (
-    <TriggerProvider accessToken={searchParams.publicAccessToken}>
-      <RunDetails id={params.id} />
-    </TriggerProvider>
-  );
-}
-```
-
-Another alternative would be to use a server-side rendered page to fetch the token and pass it to the frontend:
-
-<CodeGroup>
-
-```tsx pages/runs/[id].tsx
-import { TriggerProvider } from "@/components/TriggerProvider";
-import { generatePublicAccessToken } from "@/trigger/auth";
-
-export default async function RunPage({ params }: { params: { id: string } }) {
-  // This will be executed on the server only
-  const publicAccessToken = await generatePublicAccessToken(params.id);
-
-  return (
-    <TriggerProvider accessToken={publicAccessToken}>
-      <RunDetails id={params.id} />
-    </TriggerProvider>
-  );
-}
-```
-
-```tsx trigger/auth.ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-export async function generatePublicAccessToken(runId: string) {
-  return auth.createPublicToken({
-    scopes: {
-      read: {
-        runs: [runId],
-      },
-    },
-    expirationTime: "1h",
-  });
-}
-```
-
-</CodeGroup>
-
-## SWR vs Realtime hooks
-
-We offer two "styles" of hooks: SWR and Realtime. The SWR hooks use the [swr](https://swr.vercel.app/) library to fetch data once and cache it. The Realtime hooks use [Trigger.dev realtime](/realtime) to subscribe to updates in real-time.
-
-<Note>
-  It can be a little confusing which one to use because [swr](https://swr.vercel.app/) can also be
-  configured to poll for updates. But because of rate-limits and the way the Trigger.dev API works,
-  we recommend using the Realtime hooks for most use-cases.
-</Note>
-
-## SWR Hooks
-
-### useRun
-
-The `useRun` hook allows you to fetch a run by its ID.
-
-```tsx
-"use client"; // This is needed for Next.js App Router or other RSC frameworks
-
-import { useRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({ runId }: { runId: string }) {
-  const { run, error, isLoading } = useRun(runId);
-
-  if (isLoading) return <div>Loading...</div>;
-  if (error) return <div>Error: {error.message}</div>;
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-The `run` object returned is the same as the [run object](/management/runs/retrieve) returned by the Trigger.dev API. To correctly type the run's payload and output, you can provide the type of your task to the `useRun` hook:
-
-```tsx
-import { useRun } from "@trigger.dev/react-hooks";
-import type { myTask } from "@/trigger/myTask";
-
-export function MyComponent({ runId }: { runId: string }) {
-  const { run, error, isLoading } = useRun<typeof myTask>(runId, {
-    refreshInterval: 0, // Disable polling
-  });
-
-  if (isLoading) return <div>Loading...</div>;
-  if (error) return <div>Error: {error.message}</div>;
-
-  // Now run.payload and run.output are correctly typed
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-### Common options
-
-You can pass the following options to the all SWR hooks:
-
-<ParamField path="revalidateOnFocus" type="boolean">
-  Revalidate the data when the window regains focus.
-</ParamField>
-
-<ParamField path="revalidateOnReconnect" type="boolean">
-  Revalidate the data when the browser regains a network connection.
-</ParamField>
-
-<ParamField path="refreshInterval" type="number">
-  Poll for updates at the specified interval (in milliseconds). Polling is not recommended for most
-  use-cases. Use the Realtime hooks instead.
-</ParamField>
-
-### Common return values
-
-<ResponseField name="error" type="Error">
-  An error object if an error occurred while fetching the data.
-</ResponseField>
-
-<ResponseField name="isLoading" type="boolean">
-  A boolean indicating if the data is currently being fetched.
-</ResponseField>
-
-<ResponseField name="isValidating" type="boolean">
-  A boolean indicating if the data is currently being revalidated.
-</ResponseField>
-
-<ResponseField name="isError" type="boolean">
-  A boolean indicating if an error occurred while fetching the data.
-</ResponseField>
-
-## Realtime hooks
-
-See our [Realtime hooks documentation](/frontend/react-hooks/realtime) for more information.
-
-## Trigger Hooks
-
-See our [Trigger hooks documentation](/frontend/react-hooks/triggering) for more information.
-
-<RealtimeExamplesCards />
diff --git a/docs/frontend/react-hooks/realtime.mdx b/docs/frontend/react-hooks/realtime.mdx
deleted file mode 100644
index d1cb260faad..00000000000
--- a/docs/frontend/react-hooks/realtime.mdx
+++ /dev/null
@@ -1,420 +0,0 @@
----
-title: Realtime hooks
-sidebarTitle: Realtime
-description: Get live updates from the Trigger.dev API in your frontend application.
----
-
-import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
-
-These hooks allow you to subscribe to runs, batches, and streams using [Trigger.dev realtime](/realtime). Before reading this guide:
-
-- Read our [Realtime documentation](/realtime) to understand how the Trigger.dev realtime API works.
-- Read how to [setup and authenticate](/frontend/overview) using the `@trigger.dev/react-hooks` package.
-
-## Hooks
-
-### useRealtimeRun
-
-The `useRealtimeRun` hook allows you to subscribe to a run by its ID.
-
-```tsx
-"use client"; // This is needed for Next.js App Router or other RSC frameworks
-
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-To correctly type the run's payload and output, you can provide the type of your task to the `useRealtimeRun` hook:
-
-```tsx
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-import type { myTask } from "@/trigger/myTask";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, error } = useRealtimeRun<typeof myTask>(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  // Now run.payload and run.output are correctly typed
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-You can supply an `onComplete` callback to the `useRealtimeRun` hook to be called when the run is completed or errored. This is useful if you want to perform some action when the run is completed, like navigating to a different page or showing a notification.
-
-```tsx
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken,
-    onComplete: (run, error) => {
-      console.log("Run completed", run);
-    },
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-See our [Realtime documentation](/realtime) for more information about the type of the run object and more.
-
-### useRealtimeRunsWithTag
-
-The `useRealtimeRunsWithTag` hook allows you to subscribe to multiple runs with a specific tag.
-
-```tsx
-"use client"; // This is needed for Next.js App Router or other RSC frameworks
-
-import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
-
-export function MyComponent({ tag }: { tag: string }) {
-  const { runs, error } = useRealtimeRunsWithTag(tag);
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return (
-    <div>
-      {runs.map((run) => (
-        <div key={run.id}>Run: {run.id}</div>
-      ))}
-    </div>
-  );
-}
-```
-
-To correctly type the runs payload and output, you can provide the type of your task to the `useRealtimeRunsWithTag` hook:
-
-```tsx
-import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
-import type { myTask } from "@/trigger/myTask";
-
-export function MyComponent({ tag }: { tag: string }) {
-  const { runs, error } = useRealtimeRunsWithTag<typeof myTask>(tag);
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  // Now runs[i].payload and runs[i].output are correctly typed
-
-  return (
-    <div>
-      {runs.map((run) => (
-        <div key={run.id}>Run: {run.id}</div>
-      ))}
-    </div>
-  );
-}
-```
-
-If `useRealtimeRunsWithTag` could return multiple different types of tasks, you can pass a union of all the task types to the hook:
-
-```tsx
-import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
-import type { myTask1, myTask2 } from "@/trigger/myTasks";
-
-export function MyComponent({ tag }: { tag: string }) {
-  const { runs, error } = useRealtimeRunsWithTag<typeof myTask1 | typeof myTask2>(tag);
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  // You can narrow down the type of the run based on the taskIdentifier
-  for (const run of runs) {
-    if (run.taskIdentifier === "my-task-1") {
-      // run is correctly typed as myTask1
-    } else if (run.taskIdentifier === "my-task-2") {
-      // run is correctly typed as myTask2
-    }
-  }
-
-  return (
-    <div>
-      {runs.map((run) => (
-        <div key={run.id}>Run: {run.id}</div>
-      ))}
-    </div>
-  );
-}
-```
-
-### useRealtimeBatch
-
-The `useRealtimeBatch` hook allows you to subscribe to a batch of runs by its the batch ID.
-
-```tsx
-"use client"; // This is needed for Next.js App Router or other RSC frameworks
-
-import { useRealtimeBatch } from "@trigger.dev/react-hooks";
-
-export function MyComponent({ batchId }: { batchId: string }) {
-  const { runs, error } = useRealtimeBatch(batchId);
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return (
-    <div>
-      {runs.map((run) => (
-        <div key={run.id}>Run: {run.id}</div>
-      ))}
-    </div>
-  );
-}
-```
-
-See our [Realtime documentation](/realtime) for more information.
-
-### useRealtimeRunWithStreams
-
-The `useRealtimeRunWithStreams` hook allows you to subscribe to a run by its ID and also receive any streams that are emitted by the task. See our [Realtime documentation](/realtime#streams) for more information about emitting streams from a task.
-
-```tsx
-"use client"; // This is needed for Next.js App Router or other RSC frameworks
-
-import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, streams, error } = useRealtimeRunWithStreams(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return (
-    <div>
-      <div>Run: {run.id}</div>
-      <div>
-        {Object.keys(streams).map((stream) => (
-          <div key={stream}>Stream: {stream}</div>
-        ))}
-      </div>
-    </div>
-  );
-}
-```
-
-You can provide the type of the streams to the `useRealtimeRunWithStreams` hook:
-
-```tsx
-import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
-import type { myTask } from "@/trigger/myTask";
-
-type STREAMS = {
-  openai: string; // this is the type of each "part" of the stream
-};
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, streams, error } = useRealtimeRunWithStreams<typeof myTask, STREAMS>(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  const text = streams.openai?.map((part) => part).join("");
-
-  return (
-    <div>
-      <div>Run: {run.id}</div>
-      <div>{text}</div>
-    </div>
-  );
-}
-```
-
-As you can see above, each stream is an array of the type you provided, keyed by the stream name. If instead of a pure text stream you have a stream of objects, you can provide the type of the object:
-
-```tsx
-import type { TextStreamPart } from "ai";
-import type { myTask } from "@/trigger/myTask";
-
-type STREAMS = { openai: TextStreamPart<{}> };
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, streams, error } = useRealtimeRunWithStreams<typeof myTask, STREAMS>(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  const text = streams.openai
-    ?.filter((stream) => stream.type === "text-delta")
-    ?.map((part) => part.text)
-    .join("");
-
-  return (
-    <div>
-      <div>Run: {run.id}</div>
-      <div>{text}</div>
-    </div>
-  );
-}
-```
-
-## Common options
-
-### accessToken & baseURL
-
-You can pass the `accessToken` option to the Realtime hooks to authenticate the subscription.
-
-```tsx
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken,
-    baseURL: "https://my-self-hosted-trigger.com", // Optional if you are using a self-hosted Trigger.dev instance
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-### enabled
-
-You can pass the `enabled` option to the Realtime hooks to enable or disable the subscription.
-
-```tsx
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-  enabled,
-}: {
-  runId: string;
-  publicAccessToken: string;
-  enabled: boolean;
-}) {
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken,
-    enabled,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-This allows you to conditionally disable using the hook based on some state.
-
-### id
-
-You can pass the `id` option to the Realtime hooks to change the ID of the subscription.
-
-```tsx
-import { useRealtimeRun } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  id,
-  runId,
-  publicAccessToken,
-  enabled,
-}: {
-  id: string;
-  runId: string;
-  publicAccessToken: string;
-  enabled: boolean;
-}) {
-  const { run, error } = useRealtimeRun(runId, {
-    accessToken: publicAccessToken,
-    enabled,
-    id,
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return <div>Run: {run.id}</div>;
-}
-```
-
-This allows you to change the ID of the subscription based on some state. Passing in a different ID will unsubscribe from the current subscription and subscribe to the new one (and remove any cached data).
-
-### experimental_throttleInMs
-
-The `*withStreams` variants of the Realtime hooks accept an `experimental_throttleInMs` option to throttle the updates from the server. This can be useful if you are getting too many updates and want to reduce the number of updates.
-
-```tsx
-import { useRealtimeRunsWithStreams } from "@trigger.dev/react-hooks";
-
-export function MyComponent({
-  runId,
-  publicAccessToken,
-}: {
-  runId: string;
-  publicAccessToken: string;
-}) {
-  const { runs, error } = useRealtimeRunsWithStreams(tag, {
-    accessToken: publicAccessToken,
-    experimental_throttleInMs: 1000, // Throttle updates to once per second
-  });
-
-  if (error) return <div>Error: {error.message}</div>;
-
-  return (
-    <div>
-      {runs.map((run) => (
-        <div key={run.id}>Run: {run.id}</div>
-      ))}
-    </div>
-  );
-}
-```
-
-<RealtimeExamplesCards />
diff --git a/docs/github-actions.mdx b/docs/github-actions.mdx
index 9fba762faef..3f1c145926f 100644
--- a/docs/github-actions.mdx
+++ b/docs/github-actions.mdx
@@ -5,6 +5,10 @@ description: "You can easily deploy your tasks with GitHub actions and other CI
 
 The instructions below are specific to GitHub Actions, but the same concepts can be used with other CI systems.
 
+<Tip>
+  Check out our new [GitHub integration](/github-integration) for automatic deployments, without adding any GitHub Actions workflows.
+</Tip>
+
 ## GitHub Actions example
 
 This simple GitHub action workflow will deploy your Trigger.dev tasks when new code is pushed to the `main` branch and the `trigger` directory has changes in it.
@@ -79,6 +83,41 @@ jobs:
 
 If you already have a GitHub action file, you can just add the final step "🚀 Deploy Trigger.dev" to your existing file.
 
+## Preview branches
+
+To deploy to preview branches from Pull Requests and have them archived when PRs are merged or closed, use a workflow that runs on `pull_request` with **all four types** including `closed`:
+
+```yaml .github/workflows/trigger-preview-branches.yml
+name: Deploy to Trigger.dev (preview branches)
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, closed]
+
+jobs:
+  deploy-preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20.x"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Deploy preview branch
+        run: npx trigger.dev@latest deploy --env preview
+        env:
+          TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
+```
+
+<Note>
+  **Include `closed`** in the `pull_request.types` list. Without it, preview branches won't be archived when PRs are merged or closed, and you may hit the limit on active preview branches. See [Preview branches](/deployment/preview-branches#preview-branches-with-github-actions-recommended) for more details.
+</Note>
+
 ## Creating a Personal Access Token
 
 <Steps>
@@ -102,13 +141,16 @@ If you already have a GitHub action file, you can just add the final step "🚀
 ## CLI Version pinning
 
 The CLI and `@trigger.dev/*` package versions need to be in sync with the `trigger.dev` CLI, otherwise there will be errors and unpredictable behavior. Hence, the `deploy` command will automatically fail during CI on any version mismatches.
-Tip: add the deploy command to your `package.json` file to keep versions managed in the same place. For example:
+Tip: add the `trigger.dev` CLI to your `devDependencies` and the deploy command to your `package.json` file to keep versions managed in the same place. For example:
 
 ```json
 {
   "scripts": {
-    "deploy:trigger-prod": "npx trigger.dev@3.0.0 deploy",
-    "deploy:trigger": "npx trigger.dev@3.0.0 deploy --env staging"
+    "deploy:trigger-prod": "trigger deploy",
+    "deploy:trigger": "trigger deploy --env staging"
+  },
+  "devDependencies": {
+    "trigger.dev": "4.0.2"
   }
 }
 ```
@@ -127,18 +169,11 @@ You should use the version you run locally during dev and manual deploy. The cur
 
 ## Self-hosting
 
-When self-hosting, you will have to take a few additional steps:
+When self-hosting, you need to:
 
-- Specify the `TRIGGER_API_URL` environment variable. You can add it to the GitHub secrets the same way as the access token. This should point at your webapp domain, for example: `https://trigger.example.com`
-- Setup docker as you will need to build and push the image to your registry. On [Trigger.dev Cloud](https://cloud.trigger.dev) this is all done remotely.
+- Set up Docker Buildx in your CI environment for building images locally.
 - Add your registry credentials to the GitHub secrets.
-- Use the `--self-hosted` and `--push` flags when deploying.
-
-<Tip>
-  If you're self-hosting v4, the `--self-hosted` and `--push` flags are **NOT** needed.
-</Tip>
-
-Other than that, your GitHub action file will look very similar to the one above:
+- Specify the `TRIGGER_API_URL` environment variable pointing to your webapp domain, for example: `https://trigger.example.com`
 
 <CodeGroup>
 
@@ -165,13 +200,11 @@ jobs:
       - name: Install dependencies
         run: npm install
 
-      # docker setup - part 1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
           version: latest
 
-      # docker setup - part 2
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -181,11 +214,9 @@ jobs:
       - name: 🚀 Deploy Trigger.dev
         env:
           TRIGGER_ACCESS_TOKEN: ${{ secrets.TRIGGER_ACCESS_TOKEN }}
-          # required when self-hosting
           TRIGGER_API_URL: ${{ secrets.TRIGGER_API_URL }}
-        # deploy with additional flags
         run: |
-          npx trigger.dev@latest deploy --self-hosted --push
+          npx trigger.dev@latest deploy
 ```
 
 </CodeGroup>
diff --git a/docs/github-integration.mdx b/docs/github-integration.mdx
new file mode 100644
index 00000000000..f4becb0b4ff
--- /dev/null
+++ b/docs/github-integration.mdx
@@ -0,0 +1,136 @@
+---
+title: "GitHub integration"
+description: "Automatically deploy your tasks on every push to your GitHub repository."
+---
+
+## How it works
+
+Once you connect a GitHub repository to your project, you can configure tracking branches for the production and staging environments.
+Every push to a tracked branch creates a deployment in the corresponding environment. Preview branch deployments are also supported for pull requests.
+
+This eliminates the need to manually run the `trigger.dev deploy` command or set up custom CI/CD workflows.
+
+## Setup
+
+<Steps>
+
+<Step title="Install our GitHub app">
+  Go to your project's settings page and click `Install GitHub app`.
+  This will take you to GitHub to authorize the Trigger.dev app for your organization or personal account.
+</Step>
+
+<Step title="Connect your repository">
+  Select a repository to connect to your project.
+</Step>
+
+<Step title="Configure branch tracking">
+  Choose which branches should trigger automatic deployments:
+
+  - **Production**: The branch that deploys to your production environment, e.g., `main`.
+  - **Staging**: The branch that deploys to your staging environment.
+  - **Preview**: Toggle to enable preview deployments for pull requests
+</Step>
+
+<Step title="Customize build settings (optional)">
+  Configure how your project is built:
+
+  - **Trigger config file**: Path to your `trigger.config.ts` file. By default, we look for it in the root of your repository. The path should be relative to the root of your repository and contain the config file name, e.g., `apps/tasks/trigger.config.ts`.
+  - **Install command**: Auto-detected by default, but you can override it if necessary. The command will be run from the root of your repository.
+  - **Pre-build command**: Run any commands before building and deploying your project, e.g., `pnpm run prisma:generate`. The command will be run from the root of your repository.
+</Step>
+
+</Steps>
+
+## Branch tracking
+
+Our GitHub integration uses branch tracking to determine when and where to deploy your code.
+
+![Trigger.dev project git settings](/deployment/git-settings.png)
+
+### Production and staging branches
+
+When you connect a repository, the default branch of your repository will be used as the production tracking branch, by default.
+
+When you configure a production or staging branch, every push to that branch will trigger a deployment.
+Our build server will install the project dependencies, build your project, and deploy it to the corresponding environment.
+
+If there are multiple consecutive pushes to a tracked branch, the later deployments will be queued until the previous deployment completes.
+
+<Note>
+  When you connect a repository, the default branch of your repository will be used as the production tracking branch by default.
+  You can change this in the git settings of your project.
+</Note>
+
+### Pull requests
+
+By default, pull requests will be deployed to preview branch environments, enabling you to test changes before merging.
+When the pull request is merged or closed, the preview branch is automatically archived.
+
+The name of the preview branch matches the branch name of the pull request.
+
+<Note>
+  Preview branch deployments require the preview environment to be enabled on your project. Learn more about [preview branches](/deployment/preview-branches).
+</Note>
+
+## Disconnecting a repository
+
+You can disconnect a repository at any time from your project git settings. This will stop automatic deployments triggered from GitHub.
+
+## Managing repository access
+
+To add or remove repository access for the Trigger.dev GitHub app, follow the link in the `Connect GitHub repository` modal:
+
+![Trigger.dev prompt to connect a GitHub repository](/deployment/connect-repo.png)
+
+Alternatively, you can follow these steps on GitHub:
+
+1. Go to your GitHub account settings
+2. Navigate to **Settings** → **Applications** → **Installed GitHub Apps**
+3. Click **Configure** next to `Trigger.dev App`
+4. Update repository access under `Repository access`
+
+Changes to repository access will be reflected immediately in your Trigger.dev project settings.
+
+## Environment variables at build time
+
+You can expose environment variables during the build and deployment process by prefixing them with `TRIGGER_BUILD_`.
+In the build server, the `TRIGGER_BUILD_` prefix is stripped from the variable name, i.e., `TRIGGER_BUILD_MY_TOKEN` is exposed as `MY_TOKEN`.
+
+Build extensions will also have access to these variables.
+
+<Note>
+  Build environment variables only apply to deployments in the environment you set them in.
+</Note>
+
+Learn more about managing [environment variables](/deploy-environment-variables).
+
+## Using a private npm registry
+
+If your project uses packages from a private npm registry, you can provide authentication by setting a `TRIGGER_BUILD_NPM_RC` environment variable.
+
+The value should be the contents of your `.npmrc` file including any token credentials, encoded to base64.
+
+### Example
+
+Example `.npmrc` file containing credentials for a private npm registry and a GitHub package registry:
+
+```
+//registry.npmjs.org/:_authToken=<YOUR_NPM_TOKEN>
+@<YOUR_NAMESPACE>:registry=https://npm.pkg.github.com
+//npm.pkg.github.com/:always-auth=true
+//npm.pkg.github.com/:_authToken=<YOUR_GITHUB_TOKEN>
+```
+
+Encode it to base64:
+
+```bash
+# Encode your .npmrc file
+cat .npmrc | base64
+```
+
+Then, set the `TRIGGER_BUILD_NPM_RC` environment variable in your project settings with the encoded value.
+
+<Note>
+  The build server will automatically create a `.npmrc` file in the installation directory based on the content of the `TRIGGER_BUILD_NPM_RC` environment variable.
+  This enables the build server to authenticate to your private npm registry.
+</Note>
\ No newline at end of file
diff --git a/docs/guides/ai-agents/claude-code-trigger.mdx b/docs/guides/ai-agents/claude-code-trigger.mdx
new file mode 100644
index 00000000000..859171d542d
--- /dev/null
+++ b/docs/guides/ai-agents/claude-code-trigger.mdx
@@ -0,0 +1,210 @@
+---
+title: "Claude Agent SDK setup guide"
+sidebarTitle: "Claude Agent SDK"
+icon: "sparkles"
+description: "Build AI agents that can read files, run commands, and edit code using the Claude Agent SDK and Trigger.dev."
+---
+
+The [Claude Agent SDK](https://platform.claude.com/docs/en/agent-sdk/overview) gives you the same tools, agent loop, and context management that power Claude Code. Combined with Trigger.dev, you get durable execution, automatic retries, and full observability for your agents.
+
+## Setup
+
+<Note>
+  This guide assumes you are working with an existing [Trigger.dev](https://trigger.dev) project.
+  Follow our [quickstart](/quick-start) to get set up if you don't have a project yet.
+</Note>
+
+<Steps>
+
+<Step title="Install the Claude Agent SDK">
+
+```bash npm
+npm install @anthropic-ai/claude-agent-sdk
+```
+
+</Step>
+
+<Step title="Configure trigger.config.ts">
+
+Add the SDK to the `external` array so it's not bundled:
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  build: {
+    external: ["@anthropic-ai/claude-agent-sdk"],
+  },
+  machine: "small-2x",
+});
+```
+
+<Note>
+  Adding packages to `external` prevents them from being bundled, which is necessary for the Claude
+  Agent SDK. See the [build configuration docs](/config/config-file#external) for more details.
+</Note>
+
+</Step>
+
+<Step title="Set your API key">
+
+Add your Anthropic API key to your environment variables. The SDK reads it automatically.
+
+```bash
+ANTHROPIC_API_KEY=sk-ant-...
+```
+
+You can set this in the [Trigger.dev dashboard](https://cloud.trigger.dev) under **Environment Variables**, or in your `.env` file for local development.
+
+</Step>
+
+<Step title="Create your first agent task">
+
+This example creates a task where Claude generates code in an empty workspace. The agent will create files based on your prompt:
+
+```ts trigger/claude-agent.ts
+import { query } from "@anthropic-ai/claude-agent-sdk";
+import { schemaTask, logger } from "@trigger.dev/sdk";
+import { mkdtemp, rm, readdir } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+
+export const codeGenerator = schemaTask({
+  id: "code-generator",
+  schema: z.object({
+    prompt: z.string(),
+  }),
+  run: async ({ prompt }, { signal }) => {
+    const abortController = new AbortController();
+    signal.addEventListener("abort", () => abortController.abort());
+
+    // Create an empty workspace for the agent
+    // The agent will create files here based on the prompt
+    const workDir = await mkdtemp(join(tmpdir(), "claude-agent-"));
+    logger.info("Created workspace", { workDir });
+
+    try {
+      const result = query({
+        prompt,
+        options: {
+          model: "claude-sonnet-4-20250514",
+          abortController,
+          cwd: workDir,
+          maxTurns: 10,
+          permissionMode: "acceptEdits",
+          allowedTools: ["Read", "Edit", "Write", "Glob"],
+        },
+      });
+
+      for await (const message of result) {
+        logger.info("Agent message", { type: message.type });
+      }
+
+      // See what files Claude created
+      const files = await readdir(workDir, { recursive: true });
+      logger.info("Files created", { files });
+
+      return { filesCreated: files };
+    } finally {
+      await rm(workDir, { recursive: true, force: true });
+    }
+  },
+});
+```
+
+</Step>
+
+<Step title="Run the dev server">
+
+```bash
+npx trigger.dev@latest dev
+```
+
+</Step>
+
+<Step title="Test your agent">
+
+Go to the Trigger.dev dashboard, find your `code-generator` task, and trigger it with a test payload:
+
+```json
+{
+  "prompt": "Create a Node.js project with a fibonacci.ts file containing a function to calculate fibonacci numbers, and a fibonacci.test.ts file with tests."
+}
+```
+
+</Step>
+
+</Steps>
+
+## How it works
+
+The `query()` function runs Claude in an agentic loop where it can:
+
+1. **Read files** - Explore codebases with `Read`, `Grep`, and `Glob` tools
+2. **Edit files** - Modify code with `Edit` and `Write` tools
+3. **Run commands** - Execute shell commands with `Bash` tool (if enabled)
+4. **Think step by step** - Use extended thinking for complex problems
+
+The agent continues until it completes the task or reaches `maxTurns`.
+
+### Permission modes
+
+| Mode                  | What it does                                          |
+| --------------------- | ----------------------------------------------------- |
+| `"default"`           | Asks for approval on potentially dangerous operations |
+| `"acceptEdits"`       | Auto-approves file operations, asks for bash/network  |
+| `"bypassPermissions"` | Skips all safety checks (not recommended)             |
+
+### Available tools
+
+```ts
+allowedTools: [
+  "Task", // Planning and task management
+  "Glob", // Find files by pattern
+  "Grep", // Search file contents
+  "Read", // Read file contents
+  "Edit", // Edit existing files
+  "Write", // Create new files
+  "Bash", // Run shell commands
+  "TodoRead", // Read todo list
+  "TodoWrite", // Update todo list
+];
+```
+
+## GitHub repo
+
+<Card
+  title="View the Claude Agent SDK + Trigger.dev example"
+  icon="GitHub"
+  href="https://github.com/triggerdotdev/examples/tree/main/claude-agent-sdk-trigger"
+>
+  A complete example with two agent patterns: basic safe code generation and advanced with bash
+  execution.
+</Card>
+
+## Example projects using the Claude Agent SDK
+
+<CardGroup cols={2}>
+  <Card
+    title="Claude changelog generator"
+    icon="scroll"
+    href="/guides/example-projects/claude-changelog-generator"
+  >
+    Generate changelogs from git commits using custom MCP tools.
+  </Card>
+  <Card
+    title="Claude GitHub wiki agent"
+    icon="book"
+    href="/guides/example-projects/claude-github-wiki"
+  >
+    Analyze repositories and answer questions with real-time streaming.
+  </Card>
+</CardGroup>
+
+## Learn more
+
+- [Claude Agent SDK docs](https://platform.claude.com/docs/en/agent-sdk/overview) – Official Anthropic documentation
+- [Trigger.dev Realtime](/realtime/overview) – Stream agent progress to your frontend
+- [Waitpoints](/wait) – Add human-in-the-loop approval steps
diff --git a/docs/guides/ai-agents/generate-translate-copy.mdx b/docs/guides/ai-agents/generate-translate-copy.mdx
index 4d555f10a28..cb5e034aa31 100644
--- a/docs/guides/ai-agents/generate-translate-copy.mdx
+++ b/docs/guides/ai-agents/generate-translate-copy.mdx
@@ -24,7 +24,7 @@ In this example, we'll create a workflow that generates and translates copy. Thi
 
 ```typescript
 import { openai } from "@ai-sdk/openai";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { generateText } from "ai";
 
 export interface TranslatePayload {
diff --git a/docs/guides/ai-agents/overview.mdx b/docs/guides/ai-agents/overview.mdx
index db694fa0554..0c27982a450 100644
--- a/docs/guides/ai-agents/overview.mdx
+++ b/docs/guides/ai-agents/overview.mdx
@@ -4,47 +4,24 @@ sidebarTitle: "Overview"
 description: "Real world AI agent example tasks using Trigger.dev"
 ---
 
-## Overview
-
-These guides will show you how to set up different types of AI agent workflows with Trigger.dev. The examples take inspiration from Anthropic's blog post on [building effective agents](https://www.anthropic.com/research/building-effective-agents).
+## Example projects using AI agents
 
 <CardGroup cols={2}>
   <Card
-    title="Prompt chaining"
-    img="/guides/ai-agents/prompt-chaining.png"
-    href="/guides/ai-agents/generate-translate-copy"
-  >
-    Chain prompts together to generate and translate marketing copy automatically
-  </Card>
-  <Card title="Routing" img="/guides/ai-agents/routing.png" href="/guides/ai-agents/route-question">
-    Send questions to different AI models based on complexity analysis
-  </Card>
-  <Card
-    title="Parallelization"
-    img="/guides/ai-agents/parallelization.png"
-    href="/guides/ai-agents/respond-and-check-content"
-  >
-    Simultaneously check for inappropriate content while responding to customer inquiries
-  </Card>
-  <Card
-    title="Orchestrator"
-    img="/guides/ai-agents/orchestrator-workers.png"
-    href="/guides/ai-agents/verify-news-article"
+    icon="scroll"
+    title="Claude changelog generator"
+    href="/guides/example-projects/claude-changelog-generator"
   >
-    Coordinate multiple AI workers to verify news article accuracy
+    Automatically generate professional changelogs from git commits using Claude.
   </Card>
   <Card
-    title="Evaluator-optimizer"
-    img="/guides/ai-agents/evaluator-optimizer.png"
-    href="/guides/ai-agents/translate-and-refine"
+    icon="book"
+    title="Claude GitHub wiki agent"
+    href="/guides/example-projects/claude-github-wiki"
   >
-    Translate text and automatically improve quality through feedback loops
+    Generate and maintain GitHub wiki documentation with Claude-powered analysis.
   </Card>
-</CardGroup>
 
-## Example projects using AI agents
-
-<CardGroup cols={2}>
   <Card
     icon="hand"
     title="Human-in-the-loop workflow"
@@ -82,4 +59,49 @@ These guides will show you how to set up different types of AI agent workflows w
   >
     Use the Vercel AI SDK to generate comprehensive PDF reports using a deep research agent.
   </Card>
+  <Card
+    title="Smart Spreadsheet"
+    icon="table"
+    href="/guides/example-projects/smart-spreadsheet"
+  >
+    Enrich company data using Exa search and Claude with real-time streaming results.
+  </Card>
+</CardGroup>
+
+## Agent fundamentals
+
+These guides will show you how to set up different types of AI agent workflows with Trigger.dev. The examples take inspiration from Anthropic's blog post on [building effective agents](https://www.anthropic.com/research/building-effective-agents).
+
+<CardGroup cols={2}>
+  <Card
+    title="Prompt chaining"
+    img="/guides/ai-agents/prompt-chaining.png"
+    href="/guides/ai-agents/generate-translate-copy"
+  >
+    Chain prompts together to generate and translate marketing copy automatically
+  </Card>
+  <Card title="Routing" img="/guides/ai-agents/routing.png" href="/guides/ai-agents/route-question">
+    Send questions to different AI models based on complexity analysis
+  </Card>
+  <Card
+    title="Parallelization"
+    img="/guides/ai-agents/parallelization.png"
+    href="/guides/ai-agents/respond-and-check-content"
+  >
+    Simultaneously check for inappropriate content while responding to customer inquiries
+  </Card>
+  <Card
+    title="Orchestrator"
+    img="/guides/ai-agents/orchestrator-workers.png"
+    href="/guides/ai-agents/verify-news-article"
+  >
+    Coordinate multiple AI workers to verify news article accuracy
+  </Card>
+  <Card
+    title="Evaluator-optimizer"
+    img="/guides/ai-agents/evaluator-optimizer.png"
+    href="/guides/ai-agents/translate-and-refine"
+  >
+    Translate text and automatically improve quality through feedback loops
+  </Card>
 </CardGroup>
diff --git a/docs/guides/ai-agents/respond-and-check-content.mdx b/docs/guides/ai-agents/respond-and-check-content.mdx
index ca487fa3ddc..560b69b80c5 100644
--- a/docs/guides/ai-agents/respond-and-check-content.mdx
+++ b/docs/guides/ai-agents/respond-and-check-content.mdx
@@ -23,7 +23,7 @@ In this example, we'll create a workflow that simultaneously checks content for
 
 ```typescript
 import { openai } from "@ai-sdk/openai";
-import { batch, task } from "@trigger.dev/sdk/v3";
+import { batch, task } from "@trigger.dev/sdk";
 import { generateText } from "ai";
 
 // Task to generate customer response
diff --git a/docs/guides/ai-agents/route-question.mdx b/docs/guides/ai-agents/route-question.mdx
index 69eb7053143..de1cb3e92fd 100644
--- a/docs/guides/ai-agents/route-question.mdx
+++ b/docs/guides/ai-agents/route-question.mdx
@@ -24,7 +24,7 @@ In this example, we'll create a workflow that routes a question to a different A
 
 ```typescript
 import { openai } from "@ai-sdk/openai";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { generateText } from "ai";
 import { z } from "zod";
 
diff --git a/docs/guides/ai-agents/translate-and-refine.mdx b/docs/guides/ai-agents/translate-and-refine.mdx
index fd3d1b5a9d3..80f557fd0c3 100644
--- a/docs/guides/ai-agents/translate-and-refine.mdx
+++ b/docs/guides/ai-agents/translate-and-refine.mdx
@@ -23,7 +23,7 @@ This example task translates text into a target language and refines the transla
 - Recursively calls itself to refine the translation based on the feedback
 
 ```typescript
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { generateText } from "ai";
 import { openai } from "@ai-sdk/openai";
 
diff --git a/docs/guides/ai-agents/verify-news-article.mdx b/docs/guides/ai-agents/verify-news-article.mdx
index 2d912c74156..e235ae9d35c 100644
--- a/docs/guides/ai-agents/verify-news-article.mdx
+++ b/docs/guides/ai-agents/verify-news-article.mdx
@@ -26,7 +26,7 @@ Our example task uses multiple LLM calls to extract claims from a news article a
 
 ```typescript
 import { openai } from "@ai-sdk/openai";
-import { batch, logger, task } from "@trigger.dev/sdk/v3";
+import { batch, logger, task } from "@trigger.dev/sdk";
 import { CoreMessage, generateText } from "ai";
 
 // Define types for our workers' outputs
diff --git a/docs/guides/example-projects/anchor-browser-web-scraper.mdx b/docs/guides/example-projects/anchor-browser-web-scraper.mdx
new file mode 100644
index 00000000000..1bdd8b5d456
--- /dev/null
+++ b/docs/guides/example-projects/anchor-browser-web-scraper.mdx
@@ -0,0 +1,124 @@
+---
+title: "Automated website monitoring with Anchor Browser"
+sidebarTitle: "Anchor Browser web scraper"
+description: "Automated web monitoring using Trigger.dev's task scheduling and Anchor Browser's AI-powered browser automation."
+---
+
+import WebScrapingWarning from "/snippets/web-scraping-warning.mdx";
+
+<WebScrapingWarning />
+
+## Overview
+
+This example demonstrates automated web monitoring using Trigger.dev's task scheduling and Anchor Browser's AI-powered browser automation tools.
+
+The task runs daily at 5pm ET to find the cheapest Broadway tickets available for same-day shows.
+
+**How it works:**
+
+- Trigger.dev schedules and executes the monitoring task
+- Anchor Browser spins up a remote browser session with an AI agent
+- The AI agent uses computer vision and natural language processing to analyze the TDF website
+- AI agent returns the lowest-priced show with specific details: name, price, and showtime
+
+## Tech stack
+
+- **[Node.js](https://nodejs.org)** runtime environment (version 18.2 or higher)
+- **[Trigger.dev](https://trigger.dev)** for task scheduling and task orchestration
+- **[Anchor Browser](https://anchorbrowser.io/)** for AI-powered browser automation
+- **[Playwright](https://playwright.dev/)** for browser automation libraries (handled via external dependencies)
+
+## GitHub repo
+
+<Card
+  title="View the Anchor Browser web scraper repo"
+  icon="GitHub"
+  href="https://github.com/triggerdotdev/examples/tree/main/anchor-browser-web-scraper"
+>
+  Click here to view the full code for this project in our examples repository on GitHub. You can
+  fork it and use it as a starting point for your own project.
+</Card>
+
+## Relevant code
+
+### Broadway ticket monitor task
+
+This task runs daily at 5pm ET, in [src/trigger/broadway-monitor.ts](https://github.com/triggerdotdev/examples/tree/main/anchor-browser-web-scraper/src/trigger/broadway-monitor.ts):
+
+```ts
+import { schedules } from "@trigger.dev/sdk";
+import Anchorbrowser from "anchorbrowser";
+
+export const broadwayMonitor = schedules.task({
+  id: "broadway-ticket-monitor",
+  cron: "0 21 * * *",
+  run: async (payload, { ctx }) => {
+    const client = new Anchorbrowser({
+      apiKey: process.env.ANCHOR_BROWSER_API_KEY!,
+    });
+
+    let session;
+    try {
+      // Create explicit session to get live view URL
+      session = await client.sessions.create();
+      console.log(`Session ID: ${session.data.id}`);
+      console.log(`Live View URL: https://live.anchorbrowser.io?sessionId=${session.data.id}`);
+
+      const response = await client.tools.performWebTask({
+        sessionId: session.data.id,
+        url: "https://www.tdf.org/discount-ticket-programs/tkts-by-tdf/tkts-live/",
+        prompt: `Look for the "Broadway Shows" section on this page. Find the show with the absolute lowest starting price available right now and return the show name, current lowest price, and show time. Be very specific about the current price you see. Format as: Show: [name], Price: [exact current price], Time: [time]`,
+      });
+
+      console.log("Raw response:", response);
+
+      const result = response.data.result?.result || response.data.result || response.data;
+
+      if (result && typeof result === "string" && result.includes("Show:")) {
+        console.log(`🎭 Best Broadway Deal Found!`);
+        console.log(result);
+
+        return {
+          success: true,
+          bestDeal: result,
+          liveViewUrl: `https://live.anchorbrowser.io?sessionId=${session.data.id}`,
+        };
+      } else {
+        console.log("No Broadway deals found today");
+        return { success: true, message: "No deals found" };
+      }
+    } finally {
+      if (session?.data?.id) {
+        try {
+          await client.sessions.delete(session.data.id);
+        } catch (cleanupError) {
+          console.warn("Failed to cleanup session:", cleanupError);
+        }
+      }
+    }
+  },
+});
+```
+
+### Build configuration
+
+Since Anchor Browser uses browser automation libraries (Playwright) under the hood, we need to configure Trigger.dev to handle these dependencies properly by excluding them from the build bundle in [trigger.config.ts](https://github.com/triggerdotdev/examples/tree/main/anchor-browser-web-scraper/trigger.config.ts):
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "proj_your_project_id_here", // Get from Trigger.dev dashboard
+  maxDuration: 3600, // 1 hour - plenty of time for web automation
+  dirs: ["./src/trigger"],
+  build: {
+    external: ["playwright-core", "playwright", "chromium-bidi"],
+  },
+});
+```
+
+## Learn more
+
+- View the [Anchor Browser docs](https://anchorbrowser.io/docs) to learn more about Anchor Browser's AI-powered browser automation tools.
+- Check out the source code for the [Anchor Browser web scraper repo](https://github.com/triggerdotdev/examples/tree/main/anchor-browser-web-scraper) on GitHub.
+- Browser our [example projects](/guides/introduction) to see how you can use Trigger.dev with other services.
diff --git a/docs/guides/example-projects/batch-llm-evaluator.mdx b/docs/guides/example-projects/batch-llm-evaluator.mdx
index c214e80722a..d000962c098 100644
--- a/docs/guides/example-projects/batch-llm-evaluator.mdx
+++ b/docs/guides/example-projects/batch-llm-evaluator.mdx
@@ -39,11 +39,15 @@ This demo is a full stack example that uses the following:
 - View the Trigger.dev task code in the [src/trigger/batch.ts](https://github.com/triggerdotdev/examples/blob/main/batch-llm-evaluator/src/trigger/batch.ts) file.
 - The `evaluateModels` task uses the `batch.triggerByTaskAndWait` method to distribute the task to the different LLM models.
 - It then passes the results through to a `summarizeEvals` task that calculates some dummy "tags" for each LLM response.
-- We use a [useRealtimeRunsWithTag](https://trigger.dev/docs/frontend/react-hooks/realtime#userealtimerunswithtag) hook to subscribe to the different evaluation tasks runs in the [src/components/llm-evaluator.tsx](https://github.com/triggerdotdev/examples/blob/main/batch-llm-evaluator/src/components/llm-evaluator.tsx) file.
+- We use a [useRealtimeRunsWithTag](/realtime/react-hooks/subscribe#userealtimerunswithtag) hook to subscribe to the different evaluation tasks runs in the [src/components/llm-evaluator.tsx](https://github.com/triggerdotdev/examples/blob/main/batch-llm-evaluator/src/components/llm-evaluator.tsx) file.
 - We then pass the relevant run down into three different components for the different models:
   - The `AnthropicEval` component: [src/components/evals/Anthropic.tsx](https://github.com/triggerdotdev/examples/blob/main/batch-llm-evaluator/src/components/evals/Anthropic.tsx)
   - The `XAIEval` component: [src/components/evals/XAI.tsx](https://github.com/triggerdotdev/examples/blob/main/batch-llm-evaluator/src/components/evals/XAI.tsx)
   - The `OpenAIEval` component: [src/components/evals/OpenAI.tsx](https://github.com/triggerdotdev/examples/blob/main/batch-llm-evaluator/src/components/evals/OpenAI.tsx)
-- Each of these components then uses [useRealtimeRunWithStreams](https://trigger.dev/docs/frontend/react-hooks/realtime#userealtimerunwithstreams) to subscribe to the different LLM responses.
+- Each of these components then uses [useRealtimeRunWithStreams](/realtime/react-hooks/streams#userealtimerunwithstreams) to subscribe to the different LLM responses.
+
+<Note>
+  This example uses the older `useRealtimeRunWithStreams` hook. For new projects, consider using the new [`useRealtimeStream`](/realtime/react-hooks/streams#userealtimestream-recommended) hook (SDK 4.1.0+) for a simpler API and better type safety with defined streams.
+</Note>
 
 <RealtimeLearnMore />
diff --git a/docs/guides/example-projects/claude-changelog-generator.mdx b/docs/guides/example-projects/claude-changelog-generator.mdx
new file mode 100644
index 00000000000..8d2d7983946
--- /dev/null
+++ b/docs/guides/example-projects/claude-changelog-generator.mdx
@@ -0,0 +1,95 @@
+---
+title: "Changelog generator using Claude Agent SDK"
+sidebarTitle: "Claude changelog generator"
+description: "Automatically generate changelogs from your git commit history using the Claude Agent SDK and Trigger.dev."
+---
+
+## Overview
+
+This demo how to build an AI agent using the Claude Agent SDK that explores GitHub commits, investigates unclear changes by fetching diffs on demand, and generates developer-friendly changelogs.
+
+## Tech stack
+
+- **[Next.js](https://nextjs.org)** – Frontend framework using App Router
+- **[Claude Agent SDK](https://docs.anthropic.com/en/docs/agents-and-tools/claude-agent-sdk)** – Anthropic's agent SDK for building AI agents with custom tools
+- **[Trigger.dev](https://trigger.dev)** – workflow orchestration with real-time streaming, observability, and deployment
+- **[Octokit](https://github.com/octokit/octokit.js)** – GitHub API client for fetching commits and diffs
+
+## Demo video
+
+<video
+  controls
+  className="w-full aspect-video"
+  src="https://github.com/user-attachments/assets/ea151c1d-f866-4da4-90e4-96d65008d51a"
+></video>
+
+## GitHub repo
+
+<Card
+  title="View the changelog generator repo"
+  icon="GitHub"
+  href="https://github.com/triggerdotdev/examples/tree/main/changelog-generator"
+>
+  Click here to view the full open source code for this project in our examples repository on
+  GitHub. You can fork it and use it as a starting point for your own project.
+</Card>
+
+## How it works
+
+The agent workflow:
+
+1. **Receive request** – User provides a GitHub repo URL and date range
+2. **List commits** – Agent calls `list_commits` MCP tool to get all commits
+3. **Analyze commits** – Agent categorizes each commit:
+   - Skip trivial commits (typos, formatting)
+   - Include clear features/improvements directly
+   - Investigate unclear commits by fetching their diffs
+4. **Generate changelog** – Agent writes a categorized markdown changelog
+5. **Stream output** – Changelog streams to the frontend in real-time
+
+## Features
+
+- **Two-phase analysis** – Lists all commits first, then selectively fetches diffs only for ambiguous ones
+- **Custom tools** – `list_commits` and `get_commit_diff` called autonomously by Claude
+- **Real-time streaming** – Changelog streams to the frontend as it's generated via Trigger.dev Realtime
+- **Live observability** – Agent phase, turn count, and tool calls broadcast via run metadata
+- **Private repo support** – Optional GitHub token for private repositories
+
+## Relevant code
+
+| File                                                                                                                                                 | Description                            |
+| ---------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------- |
+| [`trigger/generate-changelog.ts`](https://github.com/triggerdotdev/examples/blob/main/changelog-generator/trigger/generate-changelog.ts)             | Main task with custom tools            |
+| [`trigger/changelog-stream.ts`](https://github.com/triggerdotdev/examples/blob/main/changelog-generator/trigger/changelog-stream.ts)                 | Stream definition for real-time output |
+| [`app/api/generate-changelog/route.ts`](https://github.com/triggerdotdev/examples/blob/main/changelog-generator/app/api/generate-changelog/route.ts) | API endpoint that triggers the task    |
+| [`app/response/[runId]/page.tsx`](https://github.com/triggerdotdev/examples/blob/main/changelog-generator/app/response/%5BrunId%5D/page.tsx)         | Streaming display page                 |
+
+## trigger.config.ts
+
+You need to mark the Claude Agent SDK as external in your trigger.config.ts file.
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  runtime: "node",
+  logLevel: "log",
+  maxDuration: 300,
+  build: {
+    external: ["@anthropic-ai/claude-agent-sdk"],
+  },
+  machine: "small-2x",
+});
+```
+
+<Note>
+  Adding packages to `external` prevents them from being bundled, which is necessary for the Claude
+  Agent SDK. See the [build configuration docs](/config/config-file#external) for more details.
+</Note>
+
+## Learn more
+
+- [**Building agents with Claude Agent SDK**](/guides/ai-agents/claude-code-trigger) – Comprehensive guide for using Claude Agent SDK with Trigger.dev
+- [**Realtime**](/realtime/overview) – Stream task progress to your frontend
+- [**Scheduled tasks**](/tasks/scheduled) – Automate changelog generation on a schedule
diff --git a/docs/guides/example-projects/claude-github-wiki.mdx b/docs/guides/example-projects/claude-github-wiki.mdx
new file mode 100644
index 00000000000..828fc58810f
--- /dev/null
+++ b/docs/guides/example-projects/claude-github-wiki.mdx
@@ -0,0 +1,93 @@
+---
+title: "Claude GitHub wiki"
+sidebarTitle: "Claude GitHub wiki"
+description: "Ask questions about any public GitHub repository and get AI-powered analysis using the Claude Agent SDK and Trigger.dev."
+---
+
+## Overview
+
+This demo shows how to build an AI agent using the Claude Agent SDK that clones any public GitHub repo and uses Claude to answer questions about its codebase. The agent explores the code using `Grep` and `Read` tools to provide detailed, accurate answers.
+
+## Tech stack
+
+- **[Next.js](https://nextjs.org/)** – React framework with App Router for the frontend
+- **[Claude Agent SDK](https://docs.anthropic.com/en/docs/agents-and-tools/claude-agent-sdk)** – Anthropic's SDK for building AI agents with file system and search tools
+- **[Trigger.dev](https://trigger.dev/)** – workflow orchestration with real-time streaming, observability, and deployment
+
+## Demo video
+
+<video
+  controls
+  className="w-full aspect-video"
+  src="https://github.com/user-attachments/assets/ff89ae41-0488-4d1c-aa7d-4dad15cefc12"
+></video>
+
+## GitHub repo
+
+<Card
+  title="View the Claude GitHub wiki agent repo"
+  icon="GitHub"
+  href="https://github.com/triggerdotdev/examples/tree/main/claude-agent-github-wiki"
+>
+  Click here to view the full code for this project in our examples repository on GitHub. You can
+  fork it and use it as a starting point for your own project.
+</Card>
+
+## How it works
+
+The agent workflow:
+
+1. **Receive question** – User provides a GitHub URL and question about the repo
+2. **Clone repository** – Shallow clone to a temp directory (depth=1 for speed)
+3. **Analyze with Claude** – Agent explores the codebase using allowed tools:
+   - `Grep` – Search for patterns across files
+   - `Read` – Read file contents
+4. **Stream response** – Analysis streams to the frontend in real-time
+5. **Cleanup** – Temp directory is always deleted, even on failure
+
+## Features
+
+- **Ask anything about any public repo** – Architecture, security vulnerabilities, API endpoints, testing strategies, etc.
+- **Claude Agent SDK exploration** – Claude explores the codebase using `Grep` and `Read` tools
+- **Cancel anytime** – Abort long-running tasks with proper cleanup
+- **Trigger.dev [Realtime](/realtime/overview) streaming** – Watch Claude's analysis stream in as it's generated
+- **Progress tracking** – See clone status, analysis progress, and repo size via Trigger.dev metadata
+
+## Relevant code
+
+| File                                                                                                                                              | Description                                                         |
+| ------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------- |
+| [`trigger/analyze-repo.ts`](https://github.com/triggerdotdev/examples/blob/main/claude-agent-github-wiki/trigger/analyze-repo.ts)                 | Main task that clones repo, runs Claude agent, and streams response |
+| [`trigger/agent-stream.ts`](https://github.com/triggerdotdev/examples/blob/main/claude-agent-github-wiki/trigger/agent-stream.ts)                 | Typed stream definition for real-time text responses                |
+| [`app/api/analyze-repo/route.ts`](https://github.com/triggerdotdev/examples/blob/main/claude-agent-github-wiki/app/api/analyze-repo/route.ts)     | API endpoint that triggers the task                                 |
+| [`app/response/[runId]/page.tsx`](https://github.com/triggerdotdev/examples/blob/main/claude-agent-github-wiki/app/response/%5BrunId%5D/page.tsx) | Real-time streaming display with progress                           |
+
+## trigger.config.ts
+
+You need to mark the Claude Agent SDK as external in your trigger.config.ts file.
+
+```ts trigger.config.ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  runtime: "node",
+  logLevel: "log",
+  maxDuration: 3600, // 60 minutes for large repos
+  build: {
+    external: ["@anthropic-ai/claude-agent-sdk"],
+  },
+  machine: "medium-2x",
+});
+```
+
+<Note>
+  Adding packages to `external` prevents them from being bundled, which is necessary for the Claude
+  Agent SDK. See the [build configuration docs](/config/config-file#external) for more details.
+</Note>
+
+## Learn more
+
+- [**Building agents with Claude Agent SDK**](/guides/ai-agents/claude-code-trigger) – Comprehensive guide for using Claude Agent SDK with Trigger.dev
+- [**Trigger.dev Realtime**](/realtime/overview) – Stream task progress to your frontend
+- [**Errors and retrying**](/errors-retrying) – Handle failures gracefully
diff --git a/docs/guides/example-projects/cursor-background-agent.mdx b/docs/guides/example-projects/cursor-background-agent.mdx
new file mode 100644
index 00000000000..b05ffa0df9d
--- /dev/null
+++ b/docs/guides/example-projects/cursor-background-agent.mdx
@@ -0,0 +1,111 @@
+---
+title: "Background Cursor agent using the Cursor CLI"
+sidebarTitle: "Cursor background agent"
+description: "Run Cursor's headless CLI agent in a Trigger.dev task and stream the live output to the frontend using Trigger.dev Realtime Streams."
+---
+
+import RealtimeLearnMore from "/snippets/realtime-learn-more.mdx";
+
+## Overview
+
+This example runs [Cursor's headless CLI](https://cursor.com/cli) in a Trigger.dev task. The agent spawns as a child process, and its NDJSON stdout is parsed and piped to the browser in real-time using [Realtime Streams](/realtime/react-hooks/streams). The result is a live terminal UI that renders each Cursor event (system messages, assistant responses, tool calls, results) as it happens.
+
+**Tech stack:**
+
+- **[Next.js](https://nextjs.org/)** for the web app (App Router with server actions)
+- **[Cursor CLI](https://cursor.com/cli)** for the headless AI coding agent
+- **[Trigger.dev](https://trigger.dev)** for task orchestration, real-time streaming, and deployment
+
+## Video
+
+<video
+  controls
+  className="w-full aspect-video"
+  src="https://github.com/user-attachments/assets/459aa160-6659-478e-868f-32e74f79d21a"
+></video>
+
+**Features:**
+
+- **Build extensions**: Installs the `cursor-agent` binary into the task container image using `addLayer`, demonstrating how to ship system binaries with your tasks
+- **Realtime Streams v2**: NDJSON from a child process stdout is parsed and piped directly to the browser using `streams.define()` and `.pipe()`
+- **Live terminal rendering**: Each Cursor event renders as a distinct row with auto-scroll
+- **Long-running tasks**: Cursor agent runs for minutes; Trigger.dev handles lifecycle, timeouts, and retries automatically
+- **Machine selection**: Uses the `medium-2x` preset for resource-intensive CLI tools
+- **LLM model picker**: Switch between models from the UI before triggering a run
+
+## GitHub repo
+
+<Card
+  title="View the Cursor background agent repo"
+  icon="GitHub"
+  href="https://github.com/triggerdotdev/examples/tree/main/cursor-cli-demo"
+>
+  Click here to view the full code for this project in our examples repository on GitHub. You can
+  fork it and use it as a starting point for your own project.
+</Card>
+
+## How it works
+
+### Task orchestration
+
+The task spawns the Cursor CLI as a child process and streams its output to the frontend:
+
+1. A Next.js server action triggers the `cursor-agent` task with the user's prompt and selected model
+2. The task spawns the Cursor CLI binary using a helper that returns a typed NDJSON stream and a `waitUntilExit()` promise
+3. Each line of NDJSON stdout is parsed into typed Cursor events and piped to a Realtime Stream
+4. The frontend subscribes to the stream using `useRealtimeRunWithStreams` and renders each event in a terminal UI
+5. The task waits for the CLI process to exit and returns the result
+
+### Build extension for system binaries
+
+The example includes a custom build extension that installs `cursor-agent` into the container image using `addLayer`. The official install script is run at build time, then the resolved entry point and its dependencies are copied to a fixed path so the task can invoke them at runtime with the bundled Node binary.
+
+```ts extensions/cursor-cli.ts
+const CURSOR_AGENT_DIR = "/usr/local/lib/cursor-agent";
+
+export const cursorCli = (): BuildExtension => ({
+  name: "cursor-cli",
+  onBuildComplete(context) {
+    if (context.target === "dev") return;
+
+    context.addLayer({
+      id: "cursor-cli",
+      image: {
+        instructions: [
+          "RUN apt-get update && apt-get install -y curl ca-certificates && rm -rf /var/lib/apt/lists/*",
+          'ENV PATH="/root/.local/bin:$PATH"',
+          "RUN curl -fsSL https://cursor.com/install | bash",
+          `RUN cp -r $(dirname $(readlink -f /root/.local/bin/cursor-agent)) ${CURSOR_AGENT_DIR}`,
+        ],
+      },
+    });
+  },
+});
+```
+
+### Streaming with Realtime Streams v2
+
+The stream is defined with a typed schema and piped from the child process:
+
+```ts trigger/cursor-stream.ts
+export const cursorStream = streams.define("cursor", cursorEventSchema);
+```
+
+```ts trigger/cursor-agent.ts
+const { stream, waitUntilExit } = spawnCursorAgent({ prompt, model });
+cursorStream.pipe(stream);
+await waitUntilExit();
+```
+
+On the frontend, the `useRealtimeRunWithStreams` hook subscribes to these events and renders them as they arrive.
+
+## Relevant code
+
+- **Build extension + spawn helper**: [extensions/cursor-cli.ts](https://github.com/triggerdotdev/examples/blob/main/cursor-cli-demo/extensions/cursor-cli.ts): installs the binary and provides a typed NDJSON stream with `waitUntilExit()`
+- **Task definition**: [trigger/cursor-agent.ts](https://github.com/triggerdotdev/examples/blob/main/cursor-cli-demo/trigger/cursor-agent.ts): spawns the CLI, pipes the stream, waits for exit
+- **Stream definition**: [trigger/cursor-stream.ts](https://github.com/triggerdotdev/examples/blob/main/cursor-cli-demo/trigger/cursor-stream.ts): Realtime Streams v2 stream with typed schema
+- **Terminal UI**: [components/terminal.tsx](https://github.com/triggerdotdev/examples/blob/main/cursor-cli-demo/components/terminal.tsx): renders live events using `useRealtimeRunWithStreams`
+- **Event types**: [lib/cursor-events.ts](https://github.com/triggerdotdev/examples/blob/main/cursor-cli-demo/lib/cursor-events.ts): TypeScript types and parsers for Cursor NDJSON events
+- **Trigger config**: [trigger.config.ts](https://github.com/triggerdotdev/examples/blob/main/cursor-cli-demo/trigger.config.ts): project config with the cursor CLI build extension
+
+<RealtimeLearnMore />
diff --git a/docs/guides/example-projects/human-in-the-loop-workflow.mdx b/docs/guides/example-projects/human-in-the-loop-workflow.mdx
index 36d5bcc66fa..fd0aef14ab0 100644
--- a/docs/guides/example-projects/human-in-the-loop-workflow.mdx
+++ b/docs/guides/example-projects/human-in-the-loop-workflow.mdx
@@ -2,11 +2,8 @@
 title: "Human-in-the-loop workflow with ReactFlow and Trigger.dev waitpoint tokens"
 sidebarTitle: "Human-in-the-loop workflow"
 description: "This example project creates audio summaries of newspaper articles using a human-in-the-loop workflow built with ReactFlow and Trigger.dev waitpoint tokens."
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
 ## Overview
 
 This demo is a full stack example that uses the following:
@@ -77,9 +74,6 @@ await wait.completeToken<ReviewPayload>(
 );
 ```
 
-<UpgradeToV4Note />
-
-
 While the workflow in this example is static and does not allow changing the connections between nodes in the UI, it serves as a good baseline for understanding how to build completely custom workflow builders using Trigger.dev and ReactFlow.
 
 ## Learn more about Trigger.dev Realtime and waitpoint tokens
@@ -87,6 +81,6 @@ While the workflow in this example is static and does not allow changing the con
 To learn more, take a look at the following resources:
 
 - [Trigger.dev Realtime](/realtime) - learn more about how to subscribe to runs and get real-time updates
-- [Realtime streaming](/realtime/streams) - learn more about streaming data from your tasks
-- [React hooks](/frontend/react-hooks) - learn more about using React hooks to interact with the Trigger.dev API
+- [Realtime streaming](/realtime/react-hooks/streams) - learn more about streaming data from your tasks
+- [React hooks](/realtime/react-hooks) - learn more about using React hooks to interact with the Trigger.dev API
 - [Waitpoint tokens](/wait-for-token) - learn about waitpoint tokens in Trigger.dev and human-in-the-loop flows
diff --git a/docs/guides/example-projects/mastra-agents-with-memory.mdx b/docs/guides/example-projects/mastra-agents-with-memory.mdx
index b900d6df571..344eb7913c7 100644
--- a/docs/guides/example-projects/mastra-agents-with-memory.mdx
+++ b/docs/guides/example-projects/mastra-agents-with-memory.mdx
@@ -2,13 +2,8 @@
 title: "Mastra agents with memory sharing + Trigger.dev task orchestration"
 sidebarTitle: "Mastra agents with memory"
 description: "Multi-agent workflow with persistent memory sharing using Mastra and Trigger.dev for clothing recommendations based on weather data."
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
-<UpgradeToV4Note />
-
 ## Overview
 
 Enter a city and an activity, and get a clothing recommendation generated for you based on today's weather.
diff --git a/docs/guides/example-projects/meme-generator-human-in-the-loop.mdx b/docs/guides/example-projects/meme-generator-human-in-the-loop.mdx
index bbf0aac4128..050cfb543d5 100644
--- a/docs/guides/example-projects/meme-generator-human-in-the-loop.mdx
+++ b/docs/guides/example-projects/meme-generator-human-in-the-loop.mdx
@@ -2,13 +2,8 @@
 title: "Meme generator with human-in-the-loop approval"
 sidebarTitle: "AI meme generator"
 description: "This example project creates memes using OpenAI's DALL-E 3 with a human-in-the-loop approval workflow built using Trigger.dev waitpoint tokens."
-tag: "v4"
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
-<UpgradeToV4Note />
-
 ## Overview
 
 This demo is a full stack example that uses the following:
diff --git a/docs/guides/example-projects/openai-agents-sdk-typescript-playground.mdx b/docs/guides/example-projects/openai-agents-sdk-typescript-playground.mdx
index 531120204a9..6ba17e539b5 100644
--- a/docs/guides/example-projects/openai-agents-sdk-typescript-playground.mdx
+++ b/docs/guides/example-projects/openai-agents-sdk-typescript-playground.mdx
@@ -2,7 +2,6 @@
 title: "OpenAI Agents SDK for Typescript + Trigger.dev playground"
 sidebarTitle: "OpenAI Agents SDK for Typescript playground"
 description: "Build production-ready AI agents with OpenAI Agents SDK for Typescript and Trigger.dev. Explore 7 examples covering streaming, multi-agent systems, and tool integration."
-tag: "v4"
 ---
 
 ## Overview
diff --git a/docs/guides/example-projects/product-image-generator.mdx b/docs/guides/example-projects/product-image-generator.mdx
new file mode 100644
index 00000000000..c34c1160353
--- /dev/null
+++ b/docs/guides/example-projects/product-image-generator.mdx
@@ -0,0 +1,61 @@
+---
+title: "Product image generator using Replicate and Trigger.dev"
+sidebarTitle: "Product image generator"
+description: "AI-powered product image generator that transforms basic product photos into professional marketing shots using Replicate's image generation models"
+---
+
+## Overview
+
+This project demonstrates how to build an AI-powered product image generator that transforms basic product photos into professional marketing shots. Users upload a product image and receive three professionally styled variations: clean product shots, lifestyle scenes, and hero shots with dramatic lighting.
+
+## Video
+
+<video
+  controls
+  className="w-full aspect-video"
+  src="https://content.trigger.dev/product-image-generator-example.mp4"
+/>
+
+## GitHub repo
+
+Clone this repo and follow the instructions in the `README.md` file to get started.
+
+<Card
+  title="View the product image generator repo"
+  icon="GitHub"
+  href="https://github.com/triggerdotdev/examples/tree/main/product-image-generator"
+>
+  Click here to view the full code in our examples repository on GitHub. You can fork it and use it
+  as a starting point for your project.
+</Card>
+
+## Tech stack
+
+- [**Next.js**](https://nextjs.org/) – frontend React framework
+- [**Replicate**](https://replicate.com/docs) – AI image generation using the `google/nano-banana` image-to-image model
+- [**UploadThing**](https://uploadthing.com/) – file upload management and server callbacks
+- [**Cloudflare R2**](https://developers.cloudflare.com/r2/) – scalable image storage with public URLs
+
+## How it works
+
+The application orchestrates image generation through two main tasks: [`generateImages`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/trigger/generate-images.ts) coordinates batch processing, while [`generateImage`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/trigger/generate-images.ts) handles individual style generation.
+
+Each generation task enhances prompts with style-specific instructions, calls Replicate's `google/nano-banana` image-to-image model, creates waitpoint tokens for async webhook handling, and uploads results to Cloudflare R2. The frontend displays real-time progress updates via React hooks as tasks complete.
+
+Style presets include clean product shots (white background), lifestyle scenes (person holding product), and hero shots (dramatic lighting).
+
+## Relevant code
+
+- **Image generation tasks** – batch processing with waitpoints for Replicate webhook callbacks ([`app/trigger/generate-images.ts`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/trigger/generate-images.ts))
+- **Upload handler** – UploadThing integration that triggers batch generation ([`app/api/uploadthing/core.ts`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/api/uploadthing/core.ts))
+- **Real-time progress UI** – live task updates using React hooks ([`app/components/GeneratedCard.tsx`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/components/GeneratedCard.tsx))
+- **Custom prompt interface** – user-defined style generation ([`app/components/CustomPromptCard.tsx`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/components/CustomPromptCard.tsx))
+- **Main app component** – layout and state management ([`app/ProductImageGenerator.tsx`](https://github.com/triggerdotdev/examples/blob/main/product-image-generator/app/ProductImageGenerator.tsx))
+
+## Learn more
+
+- [**Waitpoints**](/wait-for-token) – pause tasks for async webhook callbacks
+- [**React hooks**](/realtime/react-hooks/overview) – real-time task updates and frontend integration
+- [**Batch operations**](/triggering#tasks-batchtrigger) – parallel task execution patterns
+- [**Replicate API**](https://replicate.com/docs/get-started/nextjs) – AI model integration
+- [**UploadThing**](https://docs.uploadthing.com/) – file upload handling and server callbacks
diff --git a/docs/guides/example-projects/smart-spreadsheet.mdx b/docs/guides/example-projects/smart-spreadsheet.mdx
new file mode 100644
index 00000000000..ab1cc48a45e
--- /dev/null
+++ b/docs/guides/example-projects/smart-spreadsheet.mdx
@@ -0,0 +1,92 @@
+---
+title: "Smart Spreadsheet"
+sidebarTitle: "Smart Spreadsheet"
+description: "An AI-powered company enrichment tool that uses Exa search and Claude to extract verified company data with source attribution."
+---
+
+import RealtimeLearnMore from "/snippets/realtime-learn-more.mdx";
+
+## Overview
+
+Smart Spreadsheet is an AI-powered tool that enriches company data on demand. Input a company name or website URL and get verified information including industry, headcount, and funding details; each with source attribution. Results appear in the frontend in real-time as each task completes.
+
+- A [Next.js](https://nextjs.org/) app with [Trigger.dev](https://trigger.dev/) for background tasks
+- [Exa](https://exa.ai/) – an AI-native search engine that returns clean, structured content ready for LLM extraction
+- [Claude](https://anthropic.com/) via the [Vercel AI SDK](https://sdk.vercel.ai/) for data extraction
+- [Supabase](https://supabase.com/) PostgreSQL database for persistence
+- Trigger.dev [Realtime](/realtime/overview) for live updates to the frontend
+
+## Video
+
+<video
+  controls
+  className="w-full aspect-video"
+  src="https://content.trigger.dev/smart-spreadsheet.mp4"
+></video>
+
+## GitHub repo
+
+<Card
+  title="View the Smart Spreadsheet repo"
+  icon="github"
+  href="https://github.com/triggerdotdev/examples/tree/main/smart-spreadsheet"
+>
+  Click here to view the full code for this project in our examples repository on GitHub. You can
+  fork it and use it as a starting point for your own project.
+</Card>
+
+## How it works
+
+The enrichment workflow:
+
+1. **Trigger enrichment** – User enters a company name or URL in the spreadsheet UI
+2. **Parallel data gathering** – Four subtasks run concurrently to fetch basic info, industry, employee count, and funding details
+3. **AI extraction** – Each subtask uses Exa search + Claude to extract structured data with source URLs
+4. **Real-time updates** – Results appear in the frontend as each subtask completes
+5. **Persist results** – Enriched data is saved to Supabase with source attribution
+
+## Features
+
+- **Parallel processing** – All four enrichment categories run simultaneously using [batch.triggerByTaskAndWait](/triggering#batch-trigger-by-task-and-wait)
+- **Source attribution** – Every data point includes the URL it was extracted from
+- **Live updates** – Results appear in the UI as each task completes using [Realtime](/realtime/overview)
+- **Structured extraction** – Zod schemas ensure consistent data output from Claude
+
+## Key code patterns
+
+### Parallel task execution
+
+The main task triggers all four enrichment subtasks simultaneously using `batch.triggerByTaskAndWait`:
+
+```ts src/trigger/enrich-company.ts
+const { runs } = await batch.triggerByTaskAndWait([
+  { task: getBasicInfo, payload: { companyName, companyUrl } },
+  { task: getIndustry, payload: { companyName, companyUrl } },
+  { task: getEmployeeCount, payload: { companyName, companyUrl } },
+  { task: getFundingRound, payload: { companyName, companyUrl } },
+]);
+```
+
+### Live updates from child tasks
+
+Each subtask uses `metadata.parent.set()` to update the parent's metadata as soon as data is extracted:
+
+```ts src/trigger/get-basic-info.ts
+// After Claude extracts the data, update the parent task's metadata
+metadata.parent.set("website", object.website);
+metadata.parent.set("description", object.description);
+```
+
+The frontend subscribes to these metadata updates using [Realtime](/realtime/overview), so users see each field populate as it's discovered.
+
+## Relevant code
+
+| File                                                                                                                                           | Description                                                            |
+| ---------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| [`src/trigger/enrich-company.ts`](https://github.com/triggerdotdev/examples/blob/main/smart-spreadsheet/src/trigger/enrich-company.ts)         | Main orchestrator that triggers parallel subtasks and persists results |
+| [`src/trigger/get-basic-info.ts`](https://github.com/triggerdotdev/examples/blob/main/smart-spreadsheet/src/trigger/get-basic-info.ts)         | Extracts company website and description                               |
+| [`src/trigger/get-industry.ts`](https://github.com/triggerdotdev/examples/blob/main/smart-spreadsheet/src/trigger/get-industry.ts)             | Classifies company industry                                            |
+| [`src/trigger/get-employee-count.ts`](https://github.com/triggerdotdev/examples/blob/main/smart-spreadsheet/src/trigger/get-employee-count.ts) | Finds employee headcount                                               |
+| [`src/trigger/get-funding-round.ts`](https://github.com/triggerdotdev/examples/blob/main/smart-spreadsheet/src/trigger/get-funding-round.ts)   | Discovers latest funding information                                   |
+
+<RealtimeLearnMore />
diff --git a/docs/guides/example-projects/vercel-ai-sdk-deep-research.mdx b/docs/guides/example-projects/vercel-ai-sdk-deep-research.mdx
index aa0d54687c4..43ed33c1fcf 100644
--- a/docs/guides/example-projects/vercel-ai-sdk-deep-research.mdx
+++ b/docs/guides/example-projects/vercel-ai-sdk-deep-research.mdx
@@ -2,15 +2,10 @@
 title: "Deep research agent using Vercel's AI SDK"
 sidebarTitle: "Deep research agent"
 description: "Deep research agent which generates comprehensive PDF reports using Vercel's AI SDK."
-tag: "v4"
 ---
 
 import RealtimeLearnMore from "/snippets/realtime-learn-more.mdx";
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
-<UpgradeToV4Note />
-
 <Info title="Acknowledgements">
   Acknowledgements: This example project is derived from the brilliant [deep research
   guide](https://aie-feb-25.vercel.app/docs/deep-research) by [Nico
@@ -110,7 +105,7 @@ Level 0 (Initial Query): "AI safety in autonomous vehicles"
 
 ### Using Trigger.dev Realtime to trigger and subscribe to the deep research task
 
-We use the [`useRealtimeTaskTrigger`](/frontend/react-hooks/triggering#userealtimetasktrigger) React hook to trigger the `deep-research` task and subscribe to it's updates.
+We use the [`useRealtimeTaskTrigger`](/realtime/react-hooks/triggering#userealtimetasktrigger) React hook to trigger the `deep-research` task and subscribe to it's updates.
 
 **Frontend (React Hook)**:
 
diff --git a/docs/guides/example-projects/vercel-ai-sdk-image-generator.mdx b/docs/guides/example-projects/vercel-ai-sdk-image-generator.mdx
index 15eda0270ab..ea13ac92b08 100644
--- a/docs/guides/example-projects/vercel-ai-sdk-image-generator.mdx
+++ b/docs/guides/example-projects/vercel-ai-sdk-image-generator.mdx
@@ -11,7 +11,7 @@ import RealtimeLearnMore from "/snippets/realtime-learn-more.mdx";
 This demo is a full stack example that uses the following:
 
 - A [Next.js](https://nextjs.org/) app using [shadcn](https://ui.shadcn.com/) for the UI
-- Our 'useRealtimeRun' [React hook](https://trigger.dev/docs/frontend/react-hooks/realtime) to subscribe to the run and show updates on the frontend
+- Our 'useRealtimeRun' [React hook](/realtime/react-hooks/subscribe#userealtimerun) to subscribe to the run and show updates on the frontend
 - The [Vercel AI SDK](https://sdk.vercel.ai/docs/introduction) to [generate images](https://sdk.vercel.ai/docs/ai-sdk-core/image-generation) using OpenAI's DALL-E models
 
 ## GitHub repo
@@ -36,6 +36,6 @@ This demo is a full stack example that uses the following:
 ## Relevant code
 
 - View the Trigger.dev task code which generates the image using the Vercel AI SDK in [src/trigger/realtime-generate-image.ts](https://github.com/triggerdotdev/examples/tree/main/vercel-ai-sdk-image-generator/src/trigger/realtime-generate-image.ts).
-- We use a [useRealtimeRun](https://trigger.dev/docs/frontend/react-hooks/realtime#userealtimerun) hook to subscribe to the run in [src/app/processing/[id]/ProcessingContent.tsx](https://github.com/triggerdotdev/examples/tree/main/vercel-ai-sdk-image-generator/src/app/processing/[id]/ProcessingContent.tsx).
+- We use a [useRealtimeRun](/realtime/react-hooks/subscribe#userealtimerun) hook to subscribe to the run in [src/app/processing/[id]/ProcessingContent.tsx](https://github.com/triggerdotdev/examples/tree/main/vercel-ai-sdk-image-generator/src/app/processing/[id]/ProcessingContent.tsx).
 
 <RealtimeLearnMore />
diff --git a/docs/guides/examples/dall-e3-generate-image.mdx b/docs/guides/examples/dall-e3-generate-image.mdx
index 5846be703f1..fc0a7f0d04f 100644
--- a/docs/guides/examples/dall-e3-generate-image.mdx
+++ b/docs/guides/examples/dall-e3-generate-image.mdx
@@ -11,7 +11,7 @@ This example demonstrates how to use Trigger.dev to make reliable calls to AI AP
 ## Task code
 
 ```ts trigger/generateContent.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import OpenAI from "openai";
 
 const openai = new OpenAI({
diff --git a/docs/guides/examples/deepgram-transcribe-audio.mdx b/docs/guides/examples/deepgram-transcribe-audio.mdx
index 90268e80bb2..e9b43127bc1 100644
--- a/docs/guides/examples/deepgram-transcribe-audio.mdx
+++ b/docs/guides/examples/deepgram-transcribe-audio.mdx
@@ -17,7 +17,7 @@ Transcribe audio using [Deepgram's](https://developers.deepgram.com/docs/introdu
 
 ```ts trigger/deepgramTranscription.ts
 import { createClient } from "@deepgram/sdk";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 
 // Initialize the Deepgram client, using your Deepgram API key (you can find this in your Deepgram account settings).
 const deepgram = createClient(process.env.DEEPGRAM_SECRET_KEY);
diff --git a/docs/guides/examples/fal-ai-image-to-cartoon.mdx b/docs/guides/examples/fal-ai-image-to-cartoon.mdx
index 1deb56b095a..850a82b0763 100644
--- a/docs/guides/examples/fal-ai-image-to-cartoon.mdx
+++ b/docs/guides/examples/fal-ai-image-to-cartoon.mdx
@@ -30,7 +30,7 @@ This video walks through the process of creating this task in a Next.js project.
 This task converts an image to a cartoon using Fal.ai, and uploads the result to Cloudflare R2.
 
 ```ts trigger/fal-ai-image-to-cartoon.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 import * as fal from "@fal-ai/serverless-client";
 import fetch from "node-fetch";
diff --git a/docs/guides/examples/fal-ai-realtime.mdx b/docs/guides/examples/fal-ai-realtime.mdx
index 38f28c44f51..501c6ad8148 100644
--- a/docs/guides/examples/fal-ai-realtime.mdx
+++ b/docs/guides/examples/fal-ai-realtime.mdx
@@ -41,7 +41,7 @@ This task generates an image from a prompt using Fal.ai.
 
 ```ts trigger/fal-ai-image-from-prompt-realtime.ts
 import * as fal from "@fal-ai/serverless-client";
-import { logger, schemaTask } from "@trigger.dev/sdk/v3";
+import { logger, schemaTask } from "@trigger.dev/sdk";
 import { z } from "zod";
 
 export const FalResult = z.object({
diff --git a/docs/guides/examples/ffmpeg-video-processing.mdx b/docs/guides/examples/ffmpeg-video-processing.mdx
index 145545311bd..260550c2823 100644
--- a/docs/guides/examples/ffmpeg-video-processing.mdx
+++ b/docs/guides/examples/ffmpeg-video-processing.mdx
@@ -17,7 +17,7 @@ To use these example tasks, you'll first need to add our FFmpeg extension to you
 
 ```ts trigger.config.ts
 import { ffmpeg } from "@trigger.dev/build/extensions/core";
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -52,7 +52,7 @@ This task demonstrates how to use FFmpeg to compress a video, reducing its file
 
 ```ts trigger/ffmpeg-compress-video.ts
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import ffmpeg from "fluent-ffmpeg";
 import fs from "fs/promises";
 import fetch from "node-fetch";
@@ -164,7 +164,7 @@ This task demonstrates how to use FFmpeg to extract audio from a video, convert
 
 ```ts trigger/ffmpeg-extract-audio.ts
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import ffmpeg from "fluent-ffmpeg";
 import fs from "fs/promises";
 import fetch from "node-fetch";
@@ -277,7 +277,7 @@ This task demonstrates how to use FFmpeg to generate a thumbnail from a video at
 
 ```ts trigger/ffmpeg-generate-thumbnail.ts
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import ffmpeg from "fluent-ffmpeg";
 import fs from "fs/promises";
 import fetch from "node-fetch";
diff --git a/docs/guides/examples/firecrawl-url-crawl.mdx b/docs/guides/examples/firecrawl-url-crawl.mdx
index b55b3626932..9bf388be85f 100644
--- a/docs/guides/examples/firecrawl-url-crawl.mdx
+++ b/docs/guides/examples/firecrawl-url-crawl.mdx
@@ -20,11 +20,11 @@ Here are two examples of how to use Firecrawl with Trigger.dev:
 This task crawls a website and returns the `crawlResult` object. You can set the `limit` parameter to control the number of URLs that are crawled.
 
 ```ts trigger/firecrawl-url-crawl.ts
-import FirecrawlApp from "@mendable/firecrawl-js";
-import { task } from "@trigger.dev/sdk/v3";
+import Firecrawl from "@mendable/firecrawl-js";
+import { task } from "@trigger.dev/sdk";
 
 // Initialize the Firecrawl client with your API key
-const firecrawlClient = new FirecrawlApp({
+const firecrawlClient = new Firecrawl({
   apiKey: process.env.FIRECRAWL_API_KEY, // Get this from your Firecrawl dashboard
 });
 
@@ -34,15 +34,15 @@ export const firecrawlCrawl = task({
     const { url } = payload;
 
     // Crawl: scrapes all the URLs of a web page and return content in LLM-ready format
-    const crawlResult = await firecrawlClient.crawlUrl(url, {
+    const crawlResult = await firecrawlClient.crawl(url, {
       limit: 100, // Limit the number of URLs to crawl
       scrapeOptions: {
         formats: ["markdown", "html"],
       },
     });
 
-    if (!crawlResult.success) {
-      throw new Error(`Failed to crawl: ${crawlResult.error}`);
+    if (crawlResult.status === "failed") {
+      throw new Error(`Failed to crawl: ${url}`);
     }
 
     return {
@@ -65,11 +65,11 @@ You can test your task by triggering it from the Trigger.dev dashboard.
 This task scrapes a single URL and returns the `scrapeResult` object.
 
 ```ts trigger/firecrawl-url-scrape.ts
-import FirecrawlApp, { ScrapeResponse } from "@mendable/firecrawl-js";
-import { task } from "@trigger.dev/sdk/v3";
+import Firecrawl from "@mendable/firecrawl-js";
+import { task } from "@trigger.dev/sdk";
 
 // Initialize the Firecrawl client with your API key
-const firecrawlClient = new FirecrawlApp({
+const firecrawlClient = new Firecrawl({
   apiKey: process.env.FIRECRAWL_API_KEY, // Get this from your Firecrawl dashboard
 });
 
@@ -79,13 +79,9 @@ export const firecrawlScrape = task({
     const { url } = payload;
 
     // Scrape: scrapes a URL and get its content in LLM-ready format (markdown, structured data via LLM Extract, screenshot, html)
-    const scrapeResult = (await firecrawlClient.scrapeUrl(url, {
+    const scrapeResult = await firecrawlClient.scrape(url, {
       formats: ["markdown", "html"],
-    })) as ScrapeResponse;
-
-    if (!scrapeResult.success) {
-      throw new Error(`Failed to scrape: ${scrapeResult.error}`);
-    }
+    });
 
     return {
       data: scrapeResult,
diff --git a/docs/guides/examples/hookdeck-webhook.mdx b/docs/guides/examples/hookdeck-webhook.mdx
new file mode 100644
index 00000000000..a28949fca94
--- /dev/null
+++ b/docs/guides/examples/hookdeck-webhook.mdx
@@ -0,0 +1,71 @@
+---
+title: "Trigger tasks from Hookdeck webhooks"
+sidebarTitle: "Hookdeck webhooks"
+description: "This example demonstrates how to use Hookdeck to receive webhooks and trigger Trigger.dev tasks."
+---
+
+## Overview
+
+This example shows how to use [Hookdeck](https://hookdeck.com) as your webhook infrastructure to trigger Trigger.dev tasks. Hookdeck receives webhooks from external services, and forwards them directly to the Trigger.dev API. This gives you the best of both worlds: Hookdeck's webhook management, logging, and replay capabilities, combined with Trigger.dev's reliable task execution.
+
+## Key features
+
+- Use Hookdeck as your webhook endpoint for external services
+- Hookdeck forwards webhooks directly to Trigger.dev tasks via the API
+- All webhooks are logged and replayable in Hookdeck
+
+## Setting up Hookdeck
+
+You'll configure everything in the [Hookdeck dashboard](https://dashboard.hookdeck.com). No code changes needed in your app.
+
+### 1. Create a destination
+
+In Hookdeck, create a new [destination](https://hookdeck.com/docs/destinations) with the following settings:
+
+- **URL**: `https://api.trigger.dev/api/v1/tasks/<task-id>/trigger` (replace `<task-id>` with your task ID)
+- **Method**: POST
+- **Authentication**: Bearer token (use your `TRIGGER_SECRET_KEY` from Trigger.dev)
+
+### 2. Add a transformation
+
+Create a [transformation](https://hookdeck.com/docs/transformations) to wrap the webhook body in the `payload` field that Trigger.dev expects:
+
+```javascript
+addHandler("transform", (request, context) => {
+  request.body = { payload: { ...request.body } };
+  return request;
+});
+```
+
+### 3. Create a connection
+
+Create a [connection](https://hookdeck.com/docs/connections) that links your source (where webhooks come from) to the destination and transformation you created above.
+
+## Task code
+
+This task will be triggered when Hookdeck forwards a webhook to the Trigger.dev API.
+
+```ts trigger/webhook-handler.ts
+import { task } from "@trigger.dev/sdk";
+
+export const webhookHandler = task({
+  id: "webhook-handler",
+  run: async (payload: Record<string, unknown>) => {
+    // The payload contains the original webhook data from the external service
+    console.log("Received webhook:", payload);
+
+    // Add your custom logic here
+  },
+});
+```
+
+## Testing your setup
+
+To test everything is working:
+
+1. Set up your destination, transformation, and connection in [Hookdeck](https://dashboard.hookdeck.com)
+2. Send a test webhook to your Hookdeck source URL (use the Hookdeck Console or cURL)
+3. Check the Hookdeck dashboard to verify the webhook was received and forwarded
+4. Check the [Trigger.dev dashboard](https://cloud.trigger.dev) to see the successful run of your task
+
+For more information on setting up Hookdeck, refer to the [Hookdeck Documentation](https://hookdeck.com/docs).
diff --git a/docs/guides/examples/libreoffice-pdf-conversion.mdx b/docs/guides/examples/libreoffice-pdf-conversion.mdx
index 35d821834ed..bec9f1e0645 100644
--- a/docs/guides/examples/libreoffice-pdf-conversion.mdx
+++ b/docs/guides/examples/libreoffice-pdf-conversion.mdx
@@ -18,7 +18,7 @@ To deploy this task, you'll need to add LibreOffice to your project configuratio
 
 ```ts trigger.config.ts
 import { aptGet } from "@trigger.dev/build/extensions/core";
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -55,7 +55,7 @@ This task demonstrates how to use LibreOffice to convert a document (.doc or .do
 
 ```ts trigger/libreoffice-pdf-convert.ts
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import libreoffice from "libreoffice-convert";
 import { promisify } from "node:util";
 import path from "path";
diff --git a/docs/guides/examples/lightpanda.mdx b/docs/guides/examples/lightpanda.mdx
new file mode 100644
index 00000000000..d2a431624ef
--- /dev/null
+++ b/docs/guides/examples/lightpanda.mdx
@@ -0,0 +1,224 @@
+---
+title: "Lightpanda"
+sidebarTitle: "Lightpanda"
+description: "These examples demonstrate how to use Lightpanda with Trigger.dev."
+tag: "v4"
+---
+
+import ScrapingWarning from "/snippets/web-scraping-warning.mdx";
+
+## Overview
+
+Lightpanda is a purpose-built browser for AI and automation workflows. It is 10x faster, uses 10x less RAM than Chrome headless.
+
+Here are a few examples of how to use Lightpanda with Trigger.dev.
+
+<ScrapingWarning />
+
+## Limitations
+
+- Lightpanda does not support the `puppeteer` screenshot feature.
+
+## Using Lightpanda Cloud
+
+### Prerequisites
+
+- A [Lightpanda](https://lightpanda.io/) cloud token
+
+### Get links from a website
+In this task we use Lightpanda browser to get links from a provided URL. You will have to pass the URL as a payload when triggering the task.
+
+Make sure to add `LIGHTPANDA_TOKEN` to your Trigger.dev dashboard on the Environment Variables page:
+```bash
+LIGHTPANDA_TOKEN="<your-token>"
+```
+
+```ts trigger/lightpanda-cloud-puppeteer.ts
+import { logger, task } from "@trigger.dev/sdk";
+import puppeteer from "puppeteer-core";
+
+export const lightpandaCloudPuppeteer = task({
+  id: "lightpanda-cloud-puppeteer",
+  machine: {
+    preset: "micro",
+  },
+  run: async (payload: { url: string }, { ctx }) => {
+    logger.log("Lets get a page's links with Lightpanda!", { payload, ctx });
+
+    if (!payload.url) {
+      logger.warn("Please define the payload url");
+      throw new Error("payload.url is undefined");
+    }
+
+    const token = process.env.LIGHTPANDA_TOKEN;
+    if (!token) {
+      logger.warn("Please define the env variable LIGHTPANDA_TOKEN");
+      throw new Error("LIGHTPANDA_TOKEN is undefined");
+    }
+
+    // Connect to Lightpanda's cloud
+    const browser = await puppeteer.connect({
+      browserWSEndpoint: `wss://cloud.lightpanda.io/ws?browser=lightpanda&token=${token}`,
+    });
+    const context = await browser.createBrowserContext();
+    const page = await context.newPage();
+
+    // Dump all the links from the page.
+    await page.goto(payload.url);
+
+    const links = await page.evaluate(() => {
+      return Array.from(document.querySelectorAll("a")).map((row) => {
+        return row.getAttribute("href");
+      });
+    });
+
+    logger.info("Processing done, shutting down…");
+
+    await page.close();
+    await context.close();
+    await browser.disconnect();
+
+    logger.info("✅ Completed");
+
+    return {
+      links,
+    };
+  },
+});
+```
+
+### Proxies
+
+Proxies can be used with your browser via the proxy query string parameter. By default, the proxy used is "datacenter" which is a pool of shared datacenter IPs.
+`datacenter` accepts an optional `country` query string parameter which is an [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country code.
+
+```bash
+# This example will use a German IP
+wss://cloud.lightpanda.io/ws?proxy=datacenter&country=de&token=${token}
+```
+
+### Session
+
+A session is alive until you close it or the connection is closed. The max duration of a session is 15 minutes.
+
+## Using Lightpanda browser directly
+
+### Prerequisites
+
+- Setup the [Lightpanda build extension](/config/extensions/lightpanda)
+
+### Get the HTML of a webpage
+
+This task will dump the HTML of a provided URL using the Lightpanda browser binary. You will have to pass the URL as a payload when triggering the task.
+
+```ts trigger/lightpanda-fetch.ts
+import { logger, task } from "@trigger.dev/sdk";
+import { execSync } from "node:child_process";
+
+export const lightpandaFetch = task({
+  id: "lightpanda-fetch",
+  machine: {
+    preset: "micro",
+  },
+  run: async (payload: { url: string }, { ctx }) => {
+    logger.log("Lets get a page's content with Lightpanda!", { payload, ctx });
+
+    if (!payload.url) {
+      logger.warn("Please define the payload url");
+      throw new Error("payload.url is undefined");
+    }
+
+    const buffer = execSync(`lightpanda fetch --dump ${payload.url}`);
+
+    logger.info("✅ Completed");
+
+    return {
+      message: buffer.toString(),
+    };
+  },
+});
+```
+
+### Lightpanda CDP with Puppeteer
+
+This task initializes a Lightpanda CDP server and uses it with `puppeteer-core` to scrape a provided URL.
+
+```ts trigger/lightpanda-cdp.ts
+import { logger, task } from "@trigger.dev/sdk";
+import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import puppeteer from "puppeteer-core";
+
+const spawnLightpanda = async (host: string, port: string) =>
+  new Promise<ChildProcessWithoutNullStreams>((resolve, reject) => {
+    const child = spawn("lightpanda", [
+      "serve",
+      "--host",
+      host,
+      "--port",
+      port,
+      "--log_level",
+      "info",
+    ]);
+
+    child.on("spawn", async () => {
+      logger.info("Running Lightpanda's CDP server…", {
+        pid: child.pid,
+      });
+
+      await new Promise((resolve) => setTimeout(resolve, 250));
+      resolve(child);
+    });
+    child.on("error", (e) => reject(e));
+  });
+
+export const lightpandaCDP = task({
+  id: "lightpanda-cdp",
+  machine: {
+    preset: "micro",
+  },
+  run: async (payload: { url: string }, { ctx }) => {
+    logger.log("Lets get a page's links with Lightpanda!", { payload, ctx });
+
+    if (!payload.url) {
+      logger.warn("Please define the payload url");
+      throw new Error("payload.url is undefined");
+    }
+
+    const host = process.env.LIGHTPANDA_CDP_HOST ?? "127.0.0.1";
+    const port = process.env.LIGHTPANDA_CDP_PORT ?? "9222";
+
+    // Launch Lightpanda's CDP server
+    const lpProcess = await spawnLightpanda(host, port);
+
+    const browser = await puppeteer.connect({
+      browserWSEndpoint: `ws://${host}:${port}`,
+    });
+    const context = await browser.createBrowserContext();
+    const page = await context.newPage();
+
+    // Dump all the links from the page.
+    await page.goto(payload.url);
+
+    const links = await page.evaluate(() => {
+      return Array.from(document.querySelectorAll("a")).map((row) => {
+        return row.getAttribute("href");
+      });
+    });
+
+    logger.info("Processing done");
+    logger.info("Shutting down…");
+
+    // Close Puppeteer instance
+    await browser.close();
+
+    // Stop Lightpanda's CDP Server
+    lpProcess.kill();
+
+    logger.info("✅ Completed");
+
+    return {
+      links,
+    };
+  },
+});
+```
diff --git a/docs/guides/examples/open-ai-with-retrying.mdx b/docs/guides/examples/open-ai-with-retrying.mdx
index 2a0ae1f6bea..483fbd97263 100644
--- a/docs/guides/examples/open-ai-with-retrying.mdx
+++ b/docs/guides/examples/open-ai-with-retrying.mdx
@@ -11,7 +11,7 @@ Sometimes OpenAI calls can take a long time to complete, or they can fail. This
 ## Task code
 
 ```ts trigger/openai.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import OpenAI from "openai";
 
 const openai = new OpenAI({
diff --git a/docs/guides/examples/pdf-to-image.mdx b/docs/guides/examples/pdf-to-image.mdx
index 4c852645778..3a2a69f344a 100644
--- a/docs/guides/examples/pdf-to-image.mdx
+++ b/docs/guides/examples/pdf-to-image.mdx
@@ -27,7 +27,7 @@ export default defineConfig({
 ## Task code
 
 ```ts trigger/pdfToImage.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 import { execSync } from "child_process";
 import fs from "fs";
diff --git a/docs/guides/examples/puppeteer.mdx b/docs/guides/examples/puppeteer.mdx
index 7bd59db2836..9a6f91f018d 100644
--- a/docs/guides/examples/puppeteer.mdx
+++ b/docs/guides/examples/puppeteer.mdx
@@ -27,7 +27,7 @@ There are 3 example tasks to follow on this page:
 To use all examples on this page, you'll first need to add these build settings to your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
 
 export default defineConfig({
@@ -59,7 +59,7 @@ In this example we use [Puppeteer](https://pptr.dev/) to log out the title of a
 ### Task code
 
 ```ts trigger/puppeteer-basic-example.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import puppeteer from "puppeteer";
 
 export const puppeteerTask = task({
@@ -91,7 +91,7 @@ In this example we use [Puppeteer](https://pptr.dev/) to generate a PDF from the
 ### Task code
 
 ```ts trigger/puppeteer-generate-pdf.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import puppeteer from "puppeteer";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 
@@ -153,12 +153,13 @@ In this example we use [Puppeteer](https://pptr.dev/) with a [BrowserBase](https
 <Warning>
   When web scraping, you MUST use the technique below which uses a proxy with Puppeteer. Direct
   scraping without using `browserWSEndpoint` is prohibited and will result in account suspension.
+  Screenshots are also prohibited when scraping.
 </Warning>
 
 ### Task code
 
 ```ts trigger/scrape-website.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import puppeteer from "puppeteer-core";
 
 export const puppeteerScrapeWithProxy = task({
diff --git a/docs/guides/examples/react-email.mdx b/docs/guides/examples/react-email.mdx
index 4929fc373ea..322b47da150 100644
--- a/docs/guides/examples/react-email.mdx
+++ b/docs/guides/examples/react-email.mdx
@@ -23,7 +23,7 @@ This example demonstrates how to use Trigger.dev to send emails using [React Ema
 
 ```tsx trigger/sendReactEmail.tsx
 import { Body, Button, Container, Head, Heading, Html, Preview } from "@react-email/components";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { Resend } from "resend";
 
 // Initialize Resend client
@@ -293,7 +293,7 @@ const footer = {
 And then to trigger the email, you can use the following task:
 
 ```tsx trigger/triggerWelcomeEmail.tsx
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { Resend } from "resend";
 import TriggerWelcomeEmail from "emails/trigger-welcome-email";
 
diff --git a/docs/guides/examples/react-pdf.mdx b/docs/guides/examples/react-pdf.mdx
index c766705999d..dbffd155b3e 100644
--- a/docs/guides/examples/react-pdf.mdx
+++ b/docs/guides/examples/react-pdf.mdx
@@ -13,7 +13,7 @@ This example demonstrates how to use Trigger.dev to generate a PDF using [react-
 <Info> This example must be a .tsx file to use React components.</Info>
 
 ```ts trigger/generateResumePDF.tsx
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { renderToBuffer, Document, Page, Text, View } from "@react-pdf/renderer";
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
 
diff --git a/docs/guides/examples/replicate-image-generation.mdx b/docs/guides/examples/replicate-image-generation.mdx
new file mode 100644
index 00000000000..756a518ff78
--- /dev/null
+++ b/docs/guides/examples/replicate-image-generation.mdx
@@ -0,0 +1,109 @@
+---
+title: "Image-to-image generation using Replicate and nano-banana"
+sidebarTitle: "Replicate image generation"
+description: "Learn how to generate images from source image URLs using Replicate and Trigger.dev."
+---
+
+## Overview
+
+This example demonstrates how to use Trigger.dev to generate images from source image URLs using [Replicate](https://replicate.com/), the [nano-banana-image-to-image](https://replicate.com/meta/nano-banana-image-to-image) model.
+
+## Task code
+
+```tsx trigger/generateImage.tsx
+import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
+import { task, wait } from "@trigger.dev/sdk";
+import Replicate, { Prediction } from "replicate";
+
+// Initialize clients
+const replicate = new Replicate({
+  auth: process.env.REPLICATE_API_TOKEN,
+});
+
+const s3Client = new S3Client({
+  region: "auto",
+  endpoint: process.env.R2_ENDPOINT,
+  credentials: {
+    accessKeyId: process.env.R2_ACCESS_KEY_ID ?? "",
+    secretAccessKey: process.env.R2_SECRET_ACCESS_KEY ?? "",
+  },
+});
+
+const model = "google/nano-banana";
+
+export const generateImageAndUploadToR2 = task({
+  id: "generate-image-and-upload-to-r2",
+  run: async (payload: { prompt: string; imageUrl: string }) => {
+    const { prompt, imageUrl } = payload;
+
+    const token = await wait.createToken({
+      timeout: "10m",
+    });
+
+    // Use Flux with structured prompt
+    const output = await replicate.predictions.create({
+      model: model,
+      input: { prompt, image_input: [imageUrl] },
+      // pass the provided URL to Replicate's webhook, so they can "callback"
+      webhook: token.url,
+      webhook_events_filter: ["completed"],
+    });
+
+    const result = await wait.forToken<Prediction>(token).unwrap();
+    // unwrap() throws a timeout error or returns the result 👆
+
+    if (!result.ok) {
+      throw new Error("Failed to create prediction");
+    }
+
+    const generatedImageUrl = result.output.output;
+
+    const image = await fetch(generatedImageUrl);
+    const imageBuffer = Buffer.from(await image.arrayBuffer());
+
+    const base64Image = Buffer.from(imageBuffer).toString("base64");
+
+    const timestamp = Date.now();
+    const filename = `generated-${timestamp}.png`;
+
+    // Generate unique key for R2
+    const sanitizedFileName = filename.replace(/[^a-zA-Z0-9.-]/g, "_");
+    const r2Key = `uploaded-images/${timestamp}-${sanitizedFileName}`;
+
+    const uploadParams = {
+      Bucket: process.env.R2_BUCKET,
+      Key: r2Key,
+      Body: imageBuffer,
+      ContentType: "image/png",
+      // Add cache control for better performance
+      CacheControl: "public, max-age=31536000", // 1 year
+    };
+
+    const uploadResult = await s3Client.send(new PutObjectCommand(uploadParams));
+
+    // Construct the public URL using the R2_PUBLIC_URL env var
+    const publicUrl = `${process.env.R2_PUBLIC_URL}/${r2Key}`;
+
+    return {
+      success: true,
+      publicUrl,
+      originalPrompt: prompt,
+      sourceImageUrl: imageUrl,
+    };
+  },
+});
+```
+
+## Environment variables
+
+You will need to set the following environment variables:
+
+```
+TRIGGER_SECRET_KEY=<your-trigger-secret-key>
+REPLICATE_API_TOKEN=<your-replicate-api-token>
+R2_ENDPOINT=<your-r2-endpoint>
+R2_ACCESS_KEY_ID=<your-r2-access-key-id>
+R2_SECRET_ACCESS_KEY=<your-r2-secret-access-key>
+R2_BUCKET=<your-r2-bucket>
+R2_PUBLIC_URL=<your-r2-public-url>
+```
diff --git a/docs/guides/examples/satori.mdx b/docs/guides/examples/satori.mdx
index 62a386e20c6..23052b05148 100644
--- a/docs/guides/examples/satori.mdx
+++ b/docs/guides/examples/satori.mdx
@@ -13,7 +13,7 @@ This can be customized and extended however you like, full list of options can b
 ## Task code
 
 ```tsx trigger/generateOgImage.ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { z } from "zod";
 import satori from "satori";
 import sharp from "sharp";
diff --git a/docs/guides/examples/scrape-hacker-news.mdx b/docs/guides/examples/scrape-hacker-news.mdx
index 69626ba1fcd..fe9ecf1fd95 100644
--- a/docs/guides/examples/scrape-hacker-news.mdx
+++ b/docs/guides/examples/scrape-hacker-news.mdx
@@ -50,7 +50,7 @@ And we'll be using the following tools and features:
 First up, add these build settings to your `trigger.config.ts` file:
 
 ```tsx trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
 
 export default defineConfig({
@@ -79,7 +79,7 @@ RESEND_API_KEY: "<your Resend API key>"
 
 ```ts trigger/scrape-hacker-news.ts
 import { render } from "@react-email/render";
-import { logger, schedules, task, wait } from "@trigger.dev/sdk/v3";
+import { logger, schedules, task, wait } from "@trigger.dev/sdk";
 import { OpenAI } from "openai";
 import puppeteer from "puppeteer-core";
 import { Resend } from "resend";
diff --git a/docs/guides/examples/sentry-error-tracking.mdx b/docs/guides/examples/sentry-error-tracking.mdx
index 735bb5f615b..422a4f9dca5 100644
--- a/docs/guides/examples/sentry-error-tracking.mdx
+++ b/docs/guides/examples/sentry-error-tracking.mdx
@@ -13,9 +13,12 @@ Automatically send errors and source maps to your Sentry project from your Trigg
 - A [Sentry](https://sentry.io) account and project
 - A [Trigger.dev](https://trigger.dev) account and project
 
-## Build configuration
+## Setup
 
-To send errors to Sentry when there are errors in your tasks, you'll need to add this build configuration to your `trigger.config.ts` file. This will then run every time you deploy your project.
+This setup involves two files:
+
+1. **`trigger.config.ts`** - Configures the build to upload source maps to Sentry during deployment
+2. **`trigger/init.ts`** - Initializes Sentry and registers the error tracking hook at runtime
 
 <Note>
   You will need to set the `SENTRY_AUTH_TOKEN` and `SENTRY_DSN` environment variables. You can find
@@ -25,11 +28,14 @@ To send errors to Sentry when there are errors in your tasks, you'll need to add
   dashboard](https://cloud.trigger.dev), under environment variables in your project's sidebar.
 </Note>
 
+### Build configuration
+
+Add this build configuration to your `trigger.config.ts` file. This uses the Sentry esbuild plugin to upload source maps every time you deploy your project.
+
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { esbuildPlugin } from "@trigger.dev/build/extensions";
 import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
-import * as Sentry from "@sentry/node";
 
 export default defineConfig({
   project: "<project ref>",
@@ -47,23 +53,6 @@ export default defineConfig({
       ),
     ],
   },
-  init: async () => {
-    Sentry.init({
-      defaultIntegrations: false,
-      // The Data Source Name (DSN) is a unique identifier for your Sentry project.
-      dsn: process.env.SENTRY_DSN,
-      // Update this to match the environment you want to track errors for
-      environment: process.env.NODE_ENV === "production" ? "production" : "development",
-    });
-  },
-  onFailure: async (payload, error, { ctx }) => {
-    Sentry.captureException(error, {
-      extra: {
-        payload,
-        ctx,
-      },
-    });
-  },
 });
 ```
 
@@ -73,6 +62,39 @@ export default defineConfig({
   deploying). You can use pre-built extensions or create your own.
 </Note>
 
+### Runtime initialization
+
+Create a `trigger/init.ts` file to initialize Sentry and register the global `onFailure` hook. This file is automatically loaded when your tasks execute.
+
+```ts trigger/init.ts
+import { tasks } from "@trigger.dev/sdk";
+import * as Sentry from "@sentry/node";
+
+// Initialize Sentry
+Sentry.init({
+  defaultIntegrations: false,
+  // The Data Source Name (DSN) is a unique identifier for your Sentry project.
+  dsn: process.env.SENTRY_DSN,
+  // Update this to match the environment you want to track errors for
+  environment: process.env.NODE_ENV === "production" ? "production" : "development",
+});
+
+// Register a global onFailure hook to capture errors
+tasks.onFailure(({ payload, error, ctx }) => {
+  Sentry.captureException(error, {
+    extra: {
+      payload,
+      ctx,
+    },
+  });
+});
+```
+
+<Note>
+  Learn more about [global lifecycle hooks](/tasks/overview#global-lifecycle-hooks) and the
+  [`init.ts` file](/tasks/overview#init-ts).
+</Note>
+
 ## Testing that errors are being sent to Sentry
 
 To test that errors are being sent to Sentry, you need to create a task that will fail.
@@ -80,7 +102,7 @@ To test that errors are being sent to Sentry, you need to create a task that wil
 This task takes no payload, and will throw an error.
 
 ```ts trigger/sentry-error-test.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const sentryErrorTest = task({
   id: "sentry-error-test",
diff --git a/docs/guides/examples/sharp-image-processing.mdx b/docs/guides/examples/sharp-image-processing.mdx
index becfc39c3cd..890bb546ae4 100644
--- a/docs/guides/examples/sharp-image-processing.mdx
+++ b/docs/guides/examples/sharp-image-processing.mdx
@@ -21,7 +21,7 @@ This task processes and watermarks an image using the Sharp library, and then up
 To use this example, you'll first need to add these build settings to your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -49,7 +49,7 @@ export default defineConfig({
 ```ts trigger/sharp-image-processing.ts
 import { S3Client } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import fs from "fs/promises";
 import os from "os";
 import path from "path";
diff --git a/docs/guides/examples/stripe-webhook.mdx b/docs/guides/examples/stripe-webhook.mdx
index 972ca3b7b93..b10c2b02807 100644
--- a/docs/guides/examples/stripe-webhook.mdx
+++ b/docs/guides/examples/stripe-webhook.mdx
@@ -32,7 +32,7 @@ Here are examples of how you can set up a handler using different frameworks:
 ```ts Next.js
 // app/api/stripe-webhook/route.ts
 import { NextResponse } from "next/server";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import Stripe from "stripe";
 import type { stripeCheckoutCompleted } from "@/trigger/stripe-checkout-completed";
 //     👆 **type-only** import
@@ -84,7 +84,7 @@ export async function POST(request: Request) {
 import { type ActionFunctionArgs, json } from "@remix-run/node";
 import type { stripeCheckoutCompleted } from "src/trigger/stripe-webhook";
 //     👆 **type-only** import
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import Stripe from "stripe";
 
 export async function action({ request }: ActionFunctionArgs) {
@@ -127,7 +127,7 @@ export async function action({ request }: ActionFunctionArgs) {
 This task is triggered when a `checkout.session.completed` event is received from Stripe.
 
 ```ts trigger/stripe-checkout-completed.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import type stripe from "stripe";
 
 export const stripeCheckoutCompleted = task({
diff --git a/docs/guides/examples/supabase-database-operations.mdx b/docs/guides/examples/supabase-database-operations.mdx
index 26796b7b0d4..3cacbd27554 100644
--- a/docs/guides/examples/supabase-database-operations.mdx
+++ b/docs/guides/examples/supabase-database-operations.mdx
@@ -27,7 +27,7 @@ This is a basic task which inserts a new row into a table from a Trigger.dev tas
 
 ```ts trigger/supabase-database-insert.ts
 import { createClient } from "@supabase/supabase-js";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import jwt from "jsonwebtoken";
 // Generate the Typescript types using the Supabase CLI: https://supabase.com/docs/guides/api/rest/generating-types
 import { Database } from "database.types";
@@ -117,7 +117,7 @@ This type of task is useful for managing user subscriptions, updating user detai
 
 ```ts trigger/supabase-update-user-subscription.ts
 import { createClient } from "@supabase/supabase-js";
-import { AbortTaskRunError, task } from "@trigger.dev/sdk/v3";
+import { AbortTaskRunError, task } from "@trigger.dev/sdk";
 // Generate the Typescript types using the Supabase CLI: https://supabase.com/docs/guides/api/rest/generating-types
 import { Database } from "database.types";
 
diff --git a/docs/guides/examples/supabase-storage-upload.mdx b/docs/guides/examples/supabase-storage-upload.mdx
index a4c91d7e7c8..d9b6544f409 100644
--- a/docs/guides/examples/supabase-storage-upload.mdx
+++ b/docs/guides/examples/supabase-storage-upload.mdx
@@ -22,7 +22,7 @@ This task downloads a video from a provided URL and uploads it to Supabase Stora
 
 ```ts trigger/supabase-storage-upload.ts
 import { createClient } from "@supabase/supabase-js";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import fetch from "node-fetch";
 
 // Initialize Supabase client
@@ -92,7 +92,7 @@ This task downloads a video from a provided URL, saves it to a temporary file, a
 
 ```ts trigger/supabase-storage-upload-s3.ts
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import fetch from "node-fetch";
 
 // Initialize S3 client for Supabase Storage
diff --git a/docs/guides/examples/vercel-ai-sdk.mdx b/docs/guides/examples/vercel-ai-sdk.mdx
index db4f7306a55..dbddb8a6d64 100644
--- a/docs/guides/examples/vercel-ai-sdk.mdx
+++ b/docs/guides/examples/vercel-ai-sdk.mdx
@@ -19,7 +19,7 @@ This task shows how to use the Vercel AI SDK to generate text from a prompt with
 ### Task code
 
 ```ts trigger/vercel-ai-sdk-openai.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { generateText } from "ai";
 // Install the package of the AI model you want to use, in this case OpenAI
 import { openai } from "@ai-sdk/openai"; // Ensure OPENAI_API_KEY environment variable is set
diff --git a/docs/guides/examples/vercel-sync-env-vars.mdx b/docs/guides/examples/vercel-sync-env-vars.mdx
index 59f72ea7e7a..bcdb7d30cb7 100644
--- a/docs/guides/examples/vercel-sync-env-vars.mdx
+++ b/docs/guides/examples/vercel-sync-env-vars.mdx
@@ -19,8 +19,16 @@ To sync environment variables, you just need to add our build extension to your
   the project with the environment variables you want to sync.
 </Note>
 
+<Note>
+  When running the build from a Vercel build environment (e.g., during a Vercel deployment), the
+  environment variable values will be read from `process.env` instead of fetching them from the
+  Vercel API. This is determined by checking if the `VERCEL` environment variable is present. The
+  API is still used to determine which environment variables are configured for your project, but
+  the actual values come from the local environment.
+</Note>
+
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncVercelEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
diff --git a/docs/guides/frameworks/bun.mdx b/docs/guides/frameworks/bun.mdx
index 380ebcdc1d0..d4115138250 100644
--- a/docs/guides/frameworks/bun.mdx
+++ b/docs/guides/frameworks/bun.mdx
@@ -1,7 +1,7 @@
 ---
 title: "Bun guide"
 sidebarTitle: "Bun"
-description: "This guide will show you how to setup Trigger.dev with Bun"
+description: "This guide will show you how to setup Trigger.dev in your existing Bun project, test an example task, and view the run."
 icon: "js"
 ---
 
@@ -9,17 +9,21 @@ import Prerequisites from "/snippets/framework-prerequisites.mdx";
 import CliRunTestStep from "/snippets/step-run-test.mdx";
 import CliViewRunStep from "/snippets/step-view-run.mdx";
 
-<Warning>A specific Bun version is currently required for the dev command to work. This is due to a [bug](https://github.com/oven-sh/bun/issues/13799) with IPC. Please use Bun version 1.1.24 or lower: `curl -fsSL https://bun.sh/install | bash -s -- bun-v1.1.24`</Warning>
-
-We now have experimental support for Bun. This guide will show you have to setup Trigger.dev in your existing Bun project, test an example task, and view the run.
-
-<Warn>
-  The trigger.dev CLI does not yet support Bun. So you will need to run the CLI using Node.js. But
+<Warning>
+  The trigger.dev CLI does not yet support Bun. So you will need to run the CLI using Node.js.
   Bun will still be used to execute your tasks, even in the `dev` environment.
-</Warn>
+</Warning>
+
+<Note>
+  **Supported Bun version:** Deployed tasks run on Bun 1.3.3. For local development, use Bun 1.3.x for compatibility.
+</Note>
 
 <Prerequisites framework="Bun" />
 
+## Known issues
+
+- Certain OpenTelemetry instrumentation will not work with Bun, because Bun does not support Node's `register` hook. This means that some libraries that rely on this hook will not work with Bun.
+
 ## Initial setup
 
 <Steps>
@@ -62,7 +66,7 @@ Install the "Hello World" example task when prompted. We'll use this task to tes
 
     ```ts example.ts
     import { Database } from "bun:sqlite";
-    import { task } from "@trigger.dev/sdk/v3";
+    import { task } from "@trigger.dev/sdk";
 
     export const bunTask = task({
       id: "bun-task",
@@ -109,7 +113,3 @@ yarn dlx trigger.dev@latest dev
 <CliViewRunStep />
 
 </Steps>
-
-## Known issues
-
-- Certain OpenTelemetry instrumentation will not work with Bun, because Bun does not support Node's `register` hook. This means that some libraries that rely on this hook will not work with Bun.
diff --git a/docs/guides/frameworks/drizzle.mdx b/docs/guides/frameworks/drizzle.mdx
index 81a4868828b..5ea84d9e108 100644
--- a/docs/guides/frameworks/drizzle.mdx
+++ b/docs/guides/frameworks/drizzle.mdx
@@ -51,7 +51,7 @@ This is a simple task that will add a new user to your database, we will call it
 
 ```ts /trigger/drizzle-add-new-user.ts
 import { eq } from "drizzle-orm";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { users } from "src/db/schema";
 import { drizzle } from "drizzle-orm/node-postgres";
 
@@ -80,7 +80,7 @@ Next, in your `trigger.config.js` file, add `pg` to the `externals` array. `pg`
 It is marked as an external to ensure that it is not bundled into the task's bundle, and instead will be installed and loaded from `node_modules` at runtime.
 
 ```js /trigger.config.js
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>", // Your project reference
diff --git a/docs/guides/frameworks/nextjs-webhooks.mdx b/docs/guides/frameworks/nextjs-webhooks.mdx
index 5f7d6de0364..25c91f07265 100644
--- a/docs/guides/frameworks/nextjs-webhooks.mdx
+++ b/docs/guides/frameworks/nextjs-webhooks.mdx
@@ -36,7 +36,7 @@ In your new file, add the following code:
 
 ```ts /pages/api/webhook-handler.ts
 import { helloWorldTask } from "@/trigger/example";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { NextApiRequest, NextApiResponse } from "next";
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
@@ -60,7 +60,7 @@ In your new file, add the following code:
 
 ```ts /app/api/webhook-handler/route.ts
 import type { helloWorldTask } from "@/trigger/example";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import { NextResponse } from "next/server";
 
 export async function POST(req: Request) {
diff --git a/docs/guides/frameworks/nextjs.mdx b/docs/guides/frameworks/nextjs.mdx
index 675ce916115..d8b35cbe649 100644
--- a/docs/guides/frameworks/nextjs.mdx
+++ b/docs/guides/frameworks/nextjs.mdx
@@ -14,7 +14,6 @@ import UsefulNextSteps from "/snippets/useful-next-steps.mdx";
 import TriggerTaskNextjs from "/snippets/trigger-tasks-nextjs.mdx";
 import NextjsTroubleshootingMissingApiKey from "/snippets/nextjs-missing-api-key.mdx";
 import NextjsTroubleshootingButtonSyntax from "/snippets/nextjs-button-syntax.mdx";
-import WorkerFailedToStartWhenRunningDevCommand from "/snippets/worker-failed-to-start.mdx";
 import AddEnvironmentVariables from "/snippets/add-environment-variables.mdx";
 import DeployingYourTask from "/snippets/deplopying-your-task.mdx";
 import VercelDocsCards from "/snippets/vercel-docs-cards.mdx";
@@ -67,7 +66,7 @@ Here are the steps to trigger your task in the Next.js App and Pages router and
       ```ts app/api/hello-world/route.ts
       // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
       import type { helloWorldTask } from "@/trigger/example";
-      import { tasks } from "@trigger.dev/sdk/v3";
+      import { tasks } from "@trigger.dev/sdk";
       import { NextResponse } from "next/server";
 
       //tasks.trigger also works with the edge runtime
@@ -107,7 +106,7 @@ Here are the steps to trigger your task in the Next.js App and Pages router and
         "use server";
 
         import type { helloWorldTask } from "@/trigger/example";
-        import { tasks } from "@trigger.dev/sdk/v3";
+        import { tasks } from "@trigger.dev/sdk";
 
         export async function myTask() {
           try {
@@ -220,7 +219,7 @@ Here are the steps to trigger your task in the Next.js App and Pages router and
       ```ts pages/api/hello-world.ts
       // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
       import { helloWorldTask } from "@/trigger/example";
-      import { tasks } from "@trigger.dev/sdk/v3";
+      import { tasks } from "@trigger.dev/sdk";
       import type { NextApiRequest, NextApiResponse } from "next";
 
       export default async function handler(
@@ -263,7 +262,7 @@ If you want to automatically sync environment variables from your Vercel project
 </Note>
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncVercelEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -370,7 +369,7 @@ To run this task in production, you will need to set the `REVALIDATION_SECRET` e
 </Note>
 
 ```ts trigger/revalidate-path.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 
 const NEXTJS_APP_URL = process.env.NEXTJS_APP_URL; // e.g. "http://localhost:3000" or "https://my-nextjs-app.vercel.app"
 const REVALIDATION_SECRET = process.env.REVALIDATION_SECRET; // Create a REVALIDATION_SECRET and set it in your environment variables
@@ -432,7 +431,6 @@ You can test your revalidation task in the Trigger.dev dashboard on the testing
 
     <NextjsTroubleshootingMissingApiKey/>
     <NextjsTroubleshootingButtonSyntax/>
-    <WorkerFailedToStartWhenRunningDevCommand/>
 
 <VercelDocsCards />
 <UsefulNextSteps />
diff --git a/docs/guides/frameworks/prisma.mdx b/docs/guides/frameworks/prisma.mdx
index b85c33b70c4..97be31bb965 100644
--- a/docs/guides/frameworks/prisma.mdx
+++ b/docs/guides/frameworks/prisma.mdx
@@ -51,7 +51,7 @@ This is a simple task that will add a new user to the database.
 
 ```ts /trigger/prisma-add-new-user.ts
 import { PrismaClient } from "@prisma/client";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 // Initialize Prisma client
 const prisma = new PrismaClient();
@@ -84,8 +84,6 @@ Next, configure the Prisma [build extension](https://trigger.dev/docs/config/ext
 
 This will ensure that the Prisma client is available when the task runs.
 
-For a full list of options available in the Prisma build extension, see the [Prisma build extension documentation](https://trigger.dev/docs/config/extensions/prismaExtension).
-
 ```js /trigger.config.js
 export default defineConfig({
   project: "<project ref>", // Your project reference
@@ -93,15 +91,19 @@ export default defineConfig({
   build: {
     extensions: [
       prismaExtension({
+        mode: "legacy", // required
         version: "5.20.0", // optional, we'll automatically detect the version if not provided
-        // update this to the path of your Prisma schema file
-        schema: "prisma/schema.prisma",
+        schema: "prisma/schema.prisma", // update this to the path of your Prisma schema file
       }),
     ],
   },
 });
 ```
 
+The `prismaExtension` requires a `mode` parameter. For standard Prisma setups, use `"legacy"`
+mode. See the [Prisma extension documentation](/config/extensions/prismaExtension) for other modes
+and full configuration options.
+
 <Note>
   [Build extensions](/config/extensions/overview) allow you to hook into the build system and
   customize the build process or the resulting bundle and container image (in the case of
@@ -117,7 +119,7 @@ We use OpenTelemetry to [instrument](https://trigger.dev/docs/config/config-file
 If you want to automatically log all Prisma queries and mutations, you can use the Prisma instrumentation extension.
 
 ```js /trigger.config.js
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
 import { OpenAIInstrumentation } from "@traceloop/instrumentation-openai";
 
diff --git a/docs/guides/frameworks/remix-webhooks.mdx b/docs/guides/frameworks/remix-webhooks.mdx
index 2a4270a3efb..a62d90cb9d0 100644
--- a/docs/guides/frameworks/remix-webhooks.mdx
+++ b/docs/guides/frameworks/remix-webhooks.mdx
@@ -28,7 +28,7 @@ In your new file, add the following code:
 
 ```ts /api/webhook-handler.ts
 import type { ActionFunctionArgs } from "@remix-run/node";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import { helloWorldTask } from "src/trigger/example";
 
 export async function action({ request }: ActionFunctionArgs) {
diff --git a/docs/guides/frameworks/remix.mdx b/docs/guides/frameworks/remix.mdx
index 7bbc70429b0..d8fdb3450af 100644
--- a/docs/guides/frameworks/remix.mdx
+++ b/docs/guides/frameworks/remix.mdx
@@ -50,7 +50,7 @@ Add this code to your `api.hello-world.ts` file which imports your task:
 
 ```ts app/routes/api.hello-world.ts
 import type { helloWorldTask } from "../../src/trigger/example";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 
 export async function loader() {
   const handle = await tasks.trigger<typeof helloWorldTask>("hello-world", "James");
@@ -80,7 +80,7 @@ export async function loader() {
 Before we start, it's important to note that:
 
 - We'll be using a type-only import for the task to ensure compatibility with the edge runtime.
-- The `@trigger.dev/sdk/v3` package supports the edge runtime out of the box.
+- The `@trigger.dev/sdk` package supports the edge runtime out of the box.
 
 There are a few extra steps to follow to deploy your `/api/hello-world` API endpoint to Vercel Edge Functions.
 
@@ -91,7 +91,7 @@ There are a few extra steps to follow to deploy your `/api/hello-world` API endp
 Update your API route to use the `runtime: "edge"` option and change it to an `action()` so we can trigger the task from a curl request later on.
 
 ```ts app/routes/api.hello-world.ts
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { helloWorldTask } from "../../src/trigger/example";
 //      👆 **type-only** import
 
diff --git a/docs/guides/frameworks/sequin.mdx b/docs/guides/frameworks/sequin.mdx
index 986cd6f1330..2823745f347 100644
--- a/docs/guides/frameworks/sequin.mdx
+++ b/docs/guides/frameworks/sequin.mdx
@@ -39,54 +39,52 @@ Start by creating a new Trigger.dev task that takes in a Sequin change event as
   In your `src/trigger/tasks` directory, create a new file called `create-embedding-for-post.ts` and add the following code:
 
   <CodeGroup>
-  ```ts trigger/create-embedding-for-post.ts
-  import { task } from "@trigger.dev/sdk/v3";
-  import { OpenAI } from "openai";
-  import { upsertEmbedding } from "../util";
+```ts trigger/create-embedding-for-post.ts
+import { task } from "@trigger.dev/sdk";
+import { OpenAI } from "openai";
+import { upsertEmbedding } from "../util";
 
 const openai = new OpenAI({
-apiKey: process.env.OPENAI_API_KEY,
+  apiKey: process.env.OPENAI_API_KEY,
 });
 
 export const createEmbeddingForPost = task({
-id: "create-embedding-for-post",
-run: async (payload: {
-record: {
-id: number;
-title: string;
-body: string;
-author: string;
-createdAt: string;
-embedding: string | null;
-},
-metadata: {
-table_schema: string,
-table_name: string,
-consumer: {
-id: string;
-name: string;
-};
-};
-}) => {
-// Create an embedding using the title and body of payload.record
-const content = `${payload.record.title}\n\n${payload.record.body}`;
-const embedding = (await openai.embeddings.create({
-model: "text-embedding-ada-002",
-input: content,
-})).data[0].embedding;
-
-      // Upsert the embedding in the database. See utils.ts for the implementation -> ->
-      await upsertEmbedding(embedding, payload.record.id);
-
-      // Return the updated record
-      return {
-        ...payload.record,
-        embedding: JSON.stringify(embedding),
+  id: "create-embedding-for-post",
+  run: async (payload: {
+    record: {
+      id: number;
+      title: string;
+      body: string;
+      author: string;
+      createdAt: string;
+      embedding: string | null;
+    },
+    metadata: {
+      table_schema: string,
+      table_name: string,
+      consumer: {
+        id: string;
+        name: string;
       };
-    }
-
+    };
+  }) => {
+    // Create an embedding using the title and body of payload.record
+    const content = `${payload.record.title}\n\n${payload.record.body}`;
+    const embedding = (await openai.embeddings.create({
+      model: "text-embedding-ada-002",
+      input: content,
+    })).data[0].embedding;
+
+    // Upsert the embedding in the database. See utils.ts for the implementation -> ->
+    await upsertEmbedding(embedding, payload.record.id);
+
+    // Return the updated record
+    return {
+      ...payload.record,
+      embedding: JSON.stringify(embedding),
+    };
+  }
 });
-
 ````
 
 ```ts utils.ts
@@ -161,7 +159,7 @@ You'll now create an API endpoint that will receive posts from Sequin and then t
 
 ```ts app/api/create-embedding-for-post/route.ts
 import type { createEmbeddingForPost } from "@/trigger/create-embedding-for-post";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import { NextResponse } from "next/server";
 
 export async function POST(req: Request) {
diff --git a/docs/guides/frameworks/supabase-edge-functions-basic.mdx b/docs/guides/frameworks/supabase-edge-functions-basic.mdx
index f848f050007..26087401607 100644
--- a/docs/guides/frameworks/supabase-edge-functions-basic.mdx
+++ b/docs/guides/frameworks/supabase-edge-functions-basic.mdx
@@ -14,7 +14,6 @@ import UsefulNextSteps from "/snippets/useful-next-steps.mdx";
 import TriggerTaskNextjs from "/snippets/trigger-tasks-nextjs.mdx";
 import NextjsTroubleshootingMissingApiKey from "/snippets/nextjs-missing-api-key.mdx";
 import NextjsTroubleshootingButtonSyntax from "/snippets/nextjs-button-syntax.mdx";
-import WorkerFailedToStartWhenRunningDevCommand from "/snippets/worker-failed-to-start.mdx";
 import SupabaseDocsCards from "/snippets/supabase-docs-cards.mdx";
 
 import SupabaseAuthInfo from "/snippets/supabase-auth-info.mdx";
@@ -78,7 +77,7 @@ Replace the placeholder code in your `edge-function-trigger/index.ts` file with
 // Setup type definitions for built-in Supabase Runtime APIs
 import "jsr:@supabase/functions-js/edge-runtime.d.ts";
 // Import the Trigger.dev SDK - replace "<your-sdk-version>" with the version of the SDK you are using, e.g. "3.0.0". You can find this in your package.json file.
-import { tasks } from "npm:@trigger.dev/sdk@3.0.0/v3";
+import { tasks } from "npm:@trigger.dev/sdk@3.0.0";
 // Import your task type from your /trigger folder
 import type { helloWorldTask } from "../../../src/trigger/example.ts";
 //     👆 **type-only** import
diff --git a/docs/guides/frameworks/supabase-edge-functions-database-webhooks.mdx b/docs/guides/frameworks/supabase-edge-functions-database-webhooks.mdx
index 71bb59dcd70..4114e95ef9c 100644
--- a/docs/guides/frameworks/supabase-edge-functions-database-webhooks.mdx
+++ b/docs/guides/frameworks/supabase-edge-functions-database-webhooks.mdx
@@ -10,7 +10,6 @@ import UsefulNextSteps from "/snippets/useful-next-steps.mdx";
 import TriggerTaskNextjs from "/snippets/trigger-tasks-nextjs.mdx";
 import NextjsTroubleshootingMissingApiKey from "/snippets/nextjs-missing-api-key.mdx";
 import NextjsTroubleshootingButtonSyntax from "/snippets/nextjs-button-syntax.mdx";
-import WorkerFailedToStartWhenRunningDevCommand from "/snippets/worker-failed-to-start.mdx";
 import SupabaseDocsCards from "/snippets/supabase-docs-cards.mdx";
 import SupabaseAuthInfo from "/snippets/supabase-auth-info.mdx";
 
@@ -147,7 +146,7 @@ These dependencies will allow you to interact with the Deepgram and Supabase API
 // Install any missing dependencies below
 import { createClient as createDeepgramClient } from "@deepgram/sdk";
 import { createClient as createSupabaseClient } from "@supabase/supabase-js";
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import ffmpeg from "fluent-ffmpeg";
 import fs from "fs";
 import { Readable } from "node:stream";
@@ -255,7 +254,7 @@ Before you can deploy the task, you'll need to add the FFmpeg build extension to
 ```ts trigger.config.ts
 // Add this import
 import { ffmpeg } from "@trigger.dev/build/extensions/core";
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>", // Replace with your project ref
@@ -331,7 +330,7 @@ supabase functions new video-processing-handler
 ```ts functions/video-processing-handler/index.ts
 // Setup type definitions for built-in Supabase Runtime APIs
 import "jsr:@supabase/functions-js/edge-runtime.d.ts";
-import { tasks } from "npm:@trigger.dev/sdk@latest/v3";
+import { tasks } from "npm:@trigger.dev/sdk@latest";
 // Import the videoProcessAndUpdate task from the trigger folder
 import type { videoProcessAndUpdate } from "../../../src/trigger/videoProcessAndUpdate.ts";
 //     👆 type only import
diff --git a/docs/guides/frameworks/webhooks-guides-overview.mdx b/docs/guides/frameworks/webhooks-guides-overview.mdx
index 5e9703b53ef..4c0a4404276 100644
--- a/docs/guides/frameworks/webhooks-guides-overview.mdx
+++ b/docs/guides/frameworks/webhooks-guides-overview.mdx
@@ -31,6 +31,10 @@ A webhook handler is code that executes in response to an event. They can be end
     How to create a Stripe webhook handler and trigger a task when a 'checkout session completed'
     event is received.
   </Card>
+  <Card title="Hookdeck webhooks" icon="webhook" href="/guides/examples/hookdeck-webhook">
+    Use Hookdeck to receive webhooks and forward them to Trigger.dev tasks with logging and replay
+    capabilities.
+  </Card>
   <Card
     title="Supabase database webhooks guide"
     icon="webhook"
diff --git a/docs/guides/introduction.mdx b/docs/guides/introduction.mdx
index 12fc3e0faaa..116c8539b0d 100644
--- a/docs/guides/introduction.mdx
+++ b/docs/guides/introduction.mdx
@@ -15,6 +15,8 @@ mode: "center"
   <Card title="SvelteKit" img="/images/logo-svelte.png" href="/guides/community/sveltekit" />
 </CardGroup>
 
+import UseCasesCards from "/snippets/use-cases-cards.mdx";
+
 ## Guides
 
 Get set up fast using our detailed walk-through guides.
@@ -26,6 +28,7 @@ Get set up fast using our detailed walk-through guides.
 | [AI Agent: News verification](/guides/ai-agents/verify-news-article)                       | Orchestrate fact checking of news articles                           |
 | [AI Agent: Route questions](/guides/ai-agents/route-question)                              | Route questions to different models based on complexity              |
 | [AI Agent: Translation refinement](/guides/ai-agents/translate-and-refine)                 | Evaluate and refine translations with feedback                       |
+| [Claude Agent SDK](/guides/ai-agents/claude-code-trigger)                                  | Build AI agents that read files, run commands, and edit code         |
 | [Cursor rules](/guides/cursor-rules)                                                       | Use Cursor rules to help write Trigger.dev tasks                     |
 | [Prisma](/guides/frameworks/prisma)                                                        | How to setup Prisma with Trigger.dev                                 |
 | [Python image processing](/guides/python/python-image-processing)                          | Use Python and Pillow to process images                              |
@@ -34,26 +37,35 @@ Get set up fast using our detailed walk-through guides.
 | [Python web crawler](/guides/python/python-crawl4ai)                                       | Use Python, Crawl4AI and Playwright to create a headless web crawler |
 | [Sequin database triggers](/guides/frameworks/sequin)                                      | Trigger tasks from database changes using Sequin                     |
 | [Stripe webhooks](/guides/examples/stripe-webhook)                                         | Trigger tasks from incoming Stripe webhook events                    |
+| [Hookdeck webhooks](/guides/examples/hookdeck-webhook)                                     | Use Hookdeck to receive webhooks and forward them to Trigger.dev tasks |
 | [Supabase database webhooks](/guides/frameworks/supabase-edge-functions-database-webhooks) | Trigger tasks using Supabase database webhooks                       |
 | [Supabase edge function hello world](/guides/frameworks/supabase-edge-functions-basic)     | Trigger tasks from Supabase edge function                            |
 | [Using webhooks in Next.js](/guides/frameworks/nextjs-webhooks)                            | Trigger tasks from a webhook in Next.js                              |
 | [Using webhooks in Remix](/guides/frameworks/remix-webhooks)                               | Trigger tasks from a webhook in Remix                                |
 
+<UseCasesCards />
+
 ## Example projects
 
 Example projects are full projects with example repos you can fork and use. These are a great way of learning how to use Trigger.dev in your projects.
 
 | Example project                                                                                                 | Description                                                                                                                            | Framework | GitHub                                                                                                         |
 | :-------------------------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------- | :-------- | :------------------------------------------------------------------------------------------------------------- |
+| [Anchor Browser web scraper](/guides/example-projects/anchor-browser-web-scraper)                               | Monitor a website and find the cheapest tickets for a show.                                                                            | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/anchor-browser-web-scraper)                |
 | [Batch LLM Evaluator](/guides/example-projects/batch-llm-evaluator)                                             | Evaluate multiple LLM models and stream the results to the frontend.                                                                   | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/batch-llm-evaluator)                       |
+| [Claude changelog generator](/guides/example-projects/claude-changelog-generator)                               | Automatically generate professional changelogs from git commits using Claude.                                                          | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/changelog-generator)                       |
+| [Claude GitHub wiki agent](/guides/example-projects/claude-github-wiki)                                         | Generate and maintain GitHub wiki documentation with Claude-powered analysis.                                                          | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/claude-agent-github-wiki)                  |
 | [Claude thinking chatbot](/guides/example-projects/claude-thinking-chatbot)                                     | Use Vercel's AI SDK and Anthropic's Claude 3.7 model to create a thinking chatbot.                                                     | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/claude-thinking-chatbot)                   |
+| [Cursor background agent](/guides/example-projects/cursor-background-agent)                                     | Run Cursor's headless CLI agent as a background task, streaming live output to the browser.                                            | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/cursor-cli-demo)                           |
 | [Human-in-the-loop workflow](/guides/example-projects/human-in-the-loop-workflow)                               | Create audio summaries of newspaper articles using a human-in-the-loop workflow built with ReactFlow and Trigger.dev waitpoint tokens. | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/article-summary-workflow)                  |
 | [Mastra agents with memory](/guides/example-projects/mastra-agents-with-memory)                                 | Use Mastra to create a weather agent that can collect live weather data and generate clothing recommendations.                         | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/mastra-agents)                             |
 | [OpenAI Agents SDK for Python guardrails](/guides/example-projects/openai-agent-sdk-guardrails)                 | Use the OpenAI Agents SDK for Python to create a guardrails system for your AI agents.                                                 | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/openai-agent-sdk-guardrails-examples)      |
 | [OpenAI Agents SDK for TypeScript playground](/guides/example-projects/openai-agents-sdk-typescript-playground) | A playground containing 7 AI agents using the OpenAI Agents SDK for TypeScript with Trigger.dev.                                       | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/openai-agents-sdk-with-trigger-playground) |
+| [Product image generator](/guides/example-projects/product-image-generator)                                     | Transform basic product photos into professional marketing shots using Replicate's image generation models.                            | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/product-image-generator)                   |
 | [Python web crawler](/guides/python/python-crawl4ai)                                                            | Use Python, Crawl4AI and Playwright to create a headless web crawler with Trigger.dev.                                                 | —         | [View the repo](https://github.com/triggerdotdev/examples/tree/main/python-crawl4ai)                           |
 | [Realtime CSV Importer](/guides/example-projects/realtime-csv-importer)                                         | Upload a CSV file and see the progress of the task streamed to the frontend.                                                           | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/realtime-csv-importer)                     |
 | [Realtime Fal.ai image generation](/guides/example-projects/realtime-fal-ai)                                    | Generate an image from a prompt using Fal.ai and show the progress of the task on the frontend using Realtime.                         | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/realtime-fal-ai-image-generation)          |
+| [Smart Spreadsheet](/guides/example-projects/smart-spreadsheet)                                                 | Enrich company data using Exa search and Claude with real-time streaming results.                                                      | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/smart-spreadsheet)                         |
 | [Turborepo monorepo with Prisma](/guides/example-projects/turborepo-monorepo-prisma)                            | Use Prisma in a Turborepo monorepo with Trigger.dev.                                                                                   | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/monorepos/turborepo-prisma-tasks-package)  |
 | [Vercel AI SDK image generator](/guides/example-projects/vercel-ai-sdk-image-generator)                         | Use the Vercel AI SDK to generate images from a prompt.                                                                                | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/vercel-ai-sdk-image-generator)             |
 | [Vercel AI SDK deep research agent](/guides/example-projects/vercel-ai-sdk-deep-research)                       | Use the Vercel AI SDK to generate comprehensive PDF reports using a deep research agent.                                               | Next.js   | [View the repo](https://github.com/triggerdotdev/examples/tree/main/vercel-ai-sdk-deep-research-agent)         |
@@ -71,12 +83,14 @@ Task code you can copy and paste to use in your project. They can all be extende
 | [FFmpeg video processing](/guides/examples/ffmpeg-video-processing)           | Use FFmpeg to process a video in various ways and save it to Cloudflare R2.                                                                          |
 | [Firecrawl URL crawl](/guides/examples/firecrawl-url-crawl)                   | Learn how to use Firecrawl to crawl a URL and return LLM-ready markdown.                                                                             |
 | [LibreOffice PDF conversion](/guides/examples/libreoffice-pdf-conversion)     | Convert a document to PDF using LibreOffice.                                                                                                         |
+| [Lightpanda](/guides/examples/lightpanda)                                     | Use Lightpanda browser (or cloud version) to get a webpage's content.                                                                                |
 | [OpenAI with retrying](/guides/examples/open-ai-with-retrying)                | Create a reusable OpenAI task with custom retry options.                                                                                             |
 | [PDF to image](/guides/examples/pdf-to-image)                                 | Use `MuPDF` to turn a PDF into images and save them to Cloudflare R2.                                                                                |
 | [Puppeteer](/guides/examples/puppeteer)                                       | Use Puppeteer to generate a PDF or scrape a webpage.                                                                                                 |
 | [React email](/guides/examples/react-email)                                   | Send an email using React Email.                                                                                                                     |
 | [React to PDF](/guides/examples/react-pdf)                                    | Use `react-pdf` to generate a PDF and save it to Cloudflare R2.                                                                                      |
 | [Resend email sequence](/guides/examples/resend-email-sequence)               | Send a sequence of emails over several days using Resend with Trigger.dev.                                                                           |
+| [Replicate image generation](/guides/examples/replicate-image-generation)     | Learn how to generate images from source image URLs using Replicate and Trigger.dev.                                                                 |
 | [Satori](/guides/examples/satori)                                             | Generate OG images using React Satori.                                                                                                               |
 | [Scrape Hacker News](/guides/examples/scrape-hacker-news)                     | Scrape Hacker News using BrowserBase and Puppeteer, summarize the articles with ChatGPT and send an email of the summary every weekday using Resend. |
 | [Sentry error tracking](/guides/examples/sentry-error-tracking)               | Automatically send errors to Sentry from your tasks.                                                                                                 |
diff --git a/docs/guides/new-build-system-preview.mdx b/docs/guides/new-build-system-preview.mdx
index 984092cd272..f4064c2db5f 100644
--- a/docs/guides/new-build-system-preview.mdx
+++ b/docs/guides/new-build-system-preview.mdx
@@ -47,10 +47,10 @@ The new build system does not effect your trigger task files at all, so those ca
 
 ### `defineConfig`
 
-You should now import the `defineConfig` function from `@trigger.dev/sdk/v3` and export the config as the default export:
+You should now import the `defineConfig` function from `@trigger.dev/sdk` and export the config as the default export:
 
 ```
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -66,7 +66,7 @@ The new build system will bundle all dependencies by default, so `dependenciesTo
 Now that all dependencies are bundled, there are some situations where bundling a dependency doesn't work, and needs to be made external (e.g. when a dependency includes a native module). You can now specify these dependencies as build externals in the `defineConfig` function:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -91,7 +91,7 @@ npm add @trigger.dev/build@0.0.0-prerelease-20240911144933 -D
 Now you can import the `additionalFiles` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { additionalFiles } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -117,7 +117,7 @@ npm add @trigger.dev/build@0.0.0-prerelease-20240911144933 -D
 Now you can import the `additionalPackages` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { additionalPackages } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -141,7 +141,7 @@ npm add @trigger.dev/build@0.0.0-prerelease-20240911144933 -D
 Now you can import the `syncEnvVars` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -167,7 +167,7 @@ One other difference is now `params.env` only contains the environment variables
 If you make use of decorators in your code, and have enabled the `emitDecoratorMetadata` tsconfig compiler option, you'll need to enable this in the new build sytem using the `emitDecoratorMetadata` build extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
 
 export default defineConfig({
@@ -189,7 +189,7 @@ npm add @trigger.dev/build@0.0.0-prerelease-20240911144933 -D
 Then you can import the `prismaExtension` build extension and use it in your `trigger.config.ts` file, passing in the path to your Prisma schema file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
@@ -214,7 +214,7 @@ This will make sure that your prisma client is generated during the build proces
 If you want to also run migrations during the build process, you can pass in the `migrate` option:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
@@ -256,7 +256,7 @@ generator kysely {
 ```
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
@@ -279,7 +279,7 @@ export default defineConfig({
 Previously, we installed [Audio Waveform](https://github.com/bbc/audiowaveform) in the build image. That's been moved to a build extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
 
 export default defineConfig({
@@ -295,7 +295,7 @@ export default defineConfig({
 You can now add esbuild plugins to customize the build process using the `esbuildPlugin` build extension. The example below shows how to automatically upload sourcemaps to Sentry using their esbuild plugin:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { esbuildPlugin } from "@trigger.dev/build/extensions";
 import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
 
diff --git a/docs/guides/python/python-crawl4ai.mdx b/docs/guides/python/python-crawl4ai.mdx
index 526d0eaf582..d66aeb1e2bb 100644
--- a/docs/guides/python/python-crawl4ai.mdx
+++ b/docs/guides/python/python-crawl4ai.mdx
@@ -60,9 +60,9 @@ Once you have a proxy service, set the following environment variables in your T
 After you've initialized your project with Trigger.dev, add these build settings to your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { pythonExtension } from "@trigger.dev/python/extension";
-import type { BuildContext, BuildExtension } from "@trigger.dev/core/v3/build";
+import type { BuildContext, BuildExtension } from "@trigger.dev/core/build";
 
 export default defineConfig({
   project: "<project ref>",
@@ -123,7 +123,7 @@ export function installPlaywrightChromium(): BuildExtension {
 This task uses the `python.runScript` method to run the `crawl-url.py` script with the given URL as an argument. You can see the original task in our examples repository [here](https://github.com/triggerdotdev/examples/blob/main/python-crawl4ai/src/trigger/pythonTasks.ts).
 
 ```ts src/trigger/pythonTasks.ts
-import { logger, schemaTask, task } from "@trigger.dev/sdk/v3";
+import { logger, schemaTask, task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 import { z } from "zod";
 
diff --git a/docs/guides/python/python-doc-to-markdown.mdx b/docs/guides/python/python-doc-to-markdown.mdx
index a36a240cec3..43b2a28b4d4 100644
--- a/docs/guides/python/python-doc-to-markdown.mdx
+++ b/docs/guides/python/python-doc-to-markdown.mdx
@@ -6,11 +6,6 @@ description: "Learn how to use Trigger.dev with Python to convert documents to m
 
 import PythonLearnMore from "/snippets/python-learn-more.mdx";
 
-<Note>
-  This project uses Trigger.dev v4 (which is currently in beta as of 28 April 2025). If you want to
-  run this project you will need to [upgrade to v4](/upgrade-to-v4).
-</Note>
-
 ## Overview
 
 Convert documents to markdown using Microsoft's [MarkItDown](https://github.com/microsoft/markitdown) library. This can be especially useful for preparing documents in a structured format for AI applications.
@@ -45,7 +40,7 @@ After you've initialized your project with Trigger.dev, add these build settings
 
 ```ts trigger.config.ts
 import { pythonExtension } from "@trigger.dev/python/extension";
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   runtime: "node",
@@ -76,7 +71,7 @@ export default defineConfig({
 This task uses the `python.runScript` method to run the `markdown-converter.py` script with the given document URL as an argument.
 
 ```ts src/trigger/convertToMarkdown.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 import * as fs from "fs";
 import * as path from "path";
diff --git a/docs/guides/python/python-image-processing.mdx b/docs/guides/python/python-image-processing.mdx
index 0f81d2b54fd..26987dbaf27 100644
--- a/docs/guides/python/python-image-processing.mdx
+++ b/docs/guides/python/python-image-processing.mdx
@@ -42,7 +42,7 @@ After you've initialized your project with Trigger.dev, add these build settings
 
 ```ts trigger.config.ts
 import { pythonExtension } from "@trigger.dev/python/extension";
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   runtime: "node",
@@ -73,7 +73,7 @@ export default defineConfig({
 This task uses the `python.runScript` method to run the `image-processing.py` script with the given image URL as an argument. You can adjust the image processing parameters in the payload, with options such as height, width, quality, output format, etc.
 
 ```ts src/trigger/processImage.ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { z } from "zod";
 import { python } from "@trigger.dev/python";
 import { promises as fs } from "fs";
diff --git a/docs/guides/python/python-pdf-form-extractor.mdx b/docs/guides/python/python-pdf-form-extractor.mdx
index 3367ea9baf2..0b8c856d799 100644
--- a/docs/guides/python/python-pdf-form-extractor.mdx
+++ b/docs/guides/python/python-pdf-form-extractor.mdx
@@ -41,7 +41,7 @@ After you've initialized your project with Trigger.dev, add these build settings
 
 ```ts trigger.config.ts
 import { pythonExtension } from "@trigger.dev/python/extension";
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   runtime: "node",
@@ -72,7 +72,7 @@ export default defineConfig({
 This task uses the `python.runScript` method to run the `image-processing.py` script with the given image URL as an argument. You can adjust the image processing parameters in the payload, with options such as height, width, quality, output format, etc.
 
 ```ts src/trigger/pythonPdfTask.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { python } from "@trigger.dev/python";
 
 export const processPdfForm = task({
diff --git a/docs/guides/use-cases/data-processing-etl.mdx b/docs/guides/use-cases/data-processing-etl.mdx
new file mode 100644
index 00000000000..f6bfdd65819
--- /dev/null
+++ b/docs/guides/use-cases/data-processing-etl.mdx
@@ -0,0 +1,159 @@
+---
+title: "Data processing & ETL workflows"
+sidebarTitle: "Data processing & ETL"
+description: "Learn how to use Trigger.dev for data processing and ETL (Extract, Transform, Load), including web scraping, database synchronization, batch enrichment and more."
+---
+
+import UseCasesCards from "/snippets/use-cases-cards.mdx";
+
+## Overview
+
+Build complex data pipelines that process large datasets without timeouts. Handle streaming analytics, batch enrichment, web scraping, database sync, and file processing with automatic retries and progress tracking.
+
+## Featured examples
+
+<CardGroup cols={3}>
+  <Card
+    title="Realtime CSV importer"
+    icon="book"
+    href="/guides/example-projects/realtime-csv-importer"
+  >
+    Import CSV files with progress streamed live to frontend.
+  </Card>
+  <Card title="Web scraper with BrowserBase" icon="book" href="/guides/examples/scrape-hacker-news">
+    Scrape websites using BrowserBase and Puppeteer.
+  </Card>
+  <Card
+    title="Supabase database webhooks"
+    icon="book"
+    href="/guides/frameworks/supabase-edge-functions-database-webhooks"
+  >
+    Trigger tasks from Supabase database webhooks.
+  </Card>
+</CardGroup>
+
+## Benefits of using Trigger.dev for data processing & ETL workflows
+
+**Process datasets for hours without timeouts:** Handle multi-hour transformations, large file processing, or complete database exports. No execution time limits.
+
+**Parallel processing with built-in rate limiting:** Process thousands of records simultaneously while respecting API rate limits. Scale efficiently without overwhelming downstream services.
+
+**Stream progress to your users in real-time:** Show row-by-row processing status updating live in your dashboard. Users see exactly where processing is and how long remains.
+
+## Production use cases
+
+<CardGroup cols={1}>
+  <Card title="MagicSchool AI customer story" href="https://trigger.dev/customers/magicschool-ai-customer-story">
+
+Read how MagicSchool AI uses Trigger.dev to generate insights from millions of student interactions.
+
+</Card>
+
+<Card title="Comp AI customer story" href="https://trigger.dev/customers/comp-ai-customer-story">
+
+Read how Comp AI uses Trigger.dev to automate evidence collection at scale, powering their open source, AI-driven compliance platform.
+
+</Card>
+<Card title="Midday customer story" href="https://trigger.dev/customers/midday-customer-story">
+
+Read how Midday use Trigger.dev to sync large volumes of bank transactions in their financial management platform.
+
+</Card>
+</CardGroup>
+
+## Example workflow patterns
+
+<Tabs>
+  <Tab title="CSV file import">
+    Simple CSV import pipeline. Receives file upload, parses CSV rows, validates data, imports to database with progress tracking.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[importCSV] --> B[parseCSVFile]
+    B --> C[validateRows]
+    C --> D[bulkInsertToDB]
+    D --> E[notifyCompletion]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Multi-source ETL pipeline">
+    **Coordinator pattern with parallel extraction**. Batch triggers parallel extraction from multiple sources (APIs, databases, S3), transforms and validates data, loads to data warehouse with monitoring.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[runETLPipeline] --> B[coordinateExtraction]
+    B --> C[batchTriggerAndWait]
+
+    C --> D[extractFromAPI]
+    C --> E[extractFromDatabase]
+    C --> F[extractFromS3]
+
+    D --> G[transformData]
+    E --> G
+    F --> G
+
+    G --> H[validateData]
+    H --> I[loadToWarehouse]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Parallel web scraping">
+    **Coordinator pattern with browser automation**. Launches headless browsers in parallel to scrape multiple pages, extracts structured data, cleans and normalizes content, stores in database.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[scrapeSite] --> B[coordinateScraping]
+    B --> C[batchTriggerAndWait]
+
+    C --> D[scrapePage1]
+    C --> E[scrapePage2]
+    C --> F[scrapePageN]
+
+    D --> G[cleanData]
+    E --> G
+    F --> G
+
+    G --> H[normalizeData]
+    H --> I[storeInDatabase]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Batch data enrichment">
+    **Coordinator pattern with rate limiting**. Fetches records needing enrichment, batch triggers parallel API calls with configurable concurrency to respect rate limits, validates enriched data, updates database.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[enrichRecords] --> B[fetchRecordsToEnrich]
+    B --> C[coordinateEnrichment]
+    C --> D[batchTriggerAndWait]
+
+    D --> E[enrichRecord1]
+    D --> F[enrichRecord2]
+    D --> G[enrichRecordN]
+
+    E --> H[validateEnrichedData]
+    F --> H
+    G --> H
+
+    H --> I[updateDatabase]
+```
+
+</div>
+  </Tab>
+</Tabs>
+
+<UseCasesCards />
diff --git a/docs/guides/use-cases/marketing.mdx b/docs/guides/use-cases/marketing.mdx
new file mode 100644
index 00000000000..83d08d95d9d
--- /dev/null
+++ b/docs/guides/use-cases/marketing.mdx
@@ -0,0 +1,147 @@
+---
+title: "Marketing workflows"
+sidebarTitle: "Marketing"
+description: "Learn how to use Trigger.dev for marketing workflows, including drip campaigns, behavioral triggers, personalization engines, and AI-powered content workflows"
+---
+
+import UseCasesCards from "/snippets/use-cases-cards.mdx";
+
+## Overview
+
+Build marketing workflows from email drip sequences to orchestrating full multi-channel campaigns. Handle multi-day sequences, behavioral triggers, dynamic content generation, and build live analytics dashboards.
+
+## Featured examples
+
+<CardGroup cols={3}>
+  <Card
+    title="Email sequences with Resend"
+    icon="book"
+    href="/guides/examples/resend-email-sequence"
+  >
+    Send multi-day email sequences with wait delays between messages.
+  </Card>
+  <Card
+    title="Product image generator"
+    icon="book"
+    href="/guides/example-projects/product-image-generator"
+  >
+    Transform product photos into professional marketing images using Replicate.
+  </Card>
+  <Card
+    title="Human-in-the-loop workflow"
+    icon="book"
+    href="/guides/example-projects/human-in-the-loop-workflow"
+  >
+    Approve marketing content using a human-in-the-loop workflow.
+  </Card>
+</CardGroup>
+
+## Benefits of using Trigger.dev for marketing workflows
+
+**Delays without idle costs:** Wait hours or weeks between steps. Waits over 5 seconds are automatically checkpointed and don't count towards compute usage. Perfect for drip campaigns and scheduled follow-ups.
+
+**Guaranteed delivery:** Messages send exactly once, even after retries. Personalized content isn't regenerated on failure.
+
+**Scale without limits:** Process thousands in parallel while respecting rate limits. Send to entire segments without overwhelming APIs.
+
+## Production use cases
+
+  <Card title="Icon customer story" href="https://trigger.dev/customers/icon-customer-story">
+
+Read how Icon uses Trigger.dev to process and generate thousands of videos per month for their AI-driven video creation platform.
+
+</Card>
+
+## Example workflow patterns
+
+<Tabs>
+  <Tab title="Drip email campaign">
+    Simple drip campaign. User signs up, waits specified delay, sends personalized email, tracks engagement.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[userCreateAccount] --> B[sendWelcomeEmail]
+    B --> C[wait.for 24h]
+    C --> D[sendProductTipsEmail]
+    D --> E[wait.for 7d]
+    E --> F[sendFeedbackEmail]
+
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Multi-channel campaigns">
+    **Router pattern with delay orchestration**. User action triggers campaign, router selects channel based on preferences (email/SMS/push), coordinates multi-day sequence with delays between messages, tracks engagement across channels.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[startCampaign] --> B[fetchUserProfile]
+    B --> C[selectChannel]
+    C --> D{Preferred<br/>Channel?}
+
+    D -->|Email| E[sendEmail1]
+    D -->|SMS| F[sendSMS1]
+    D -->|Push| G[sendPush1]
+
+    E --> H[wait.for 2d]
+    F --> H
+    G --> H
+
+    H --> I[sendFollowUp]
+    I --> J[trackConversion]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="AI content with approval">
+    **Supervisor pattern with approval gate**. Generates AI marketing content (images, copy, assets), pauses with wait.forToken for human review, applies revisions if needed, publishes to channels after approval.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[createCampaignAssets] --> B[generateAIContent]
+    B --> C[wait.forToken approval]
+    C --> D{Approved?}
+
+    D -->|Yes| E[publishToChannels]
+    D -->|Needs revision| F[applyFeedback]
+    F --> B
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Survey response enrichment">
+    **Coordinator pattern with enrichment**. User completes survey, batch triggers parallel enrichment from CRM/analytics, analyzes and scores responses, updates customer profiles, triggers personalized follow-up campaigns.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processSurveyResponse] --> B[coordinateEnrichment]
+    B --> C[batchTriggerAndWait]
+
+    C --> D[fetchCRMData]
+    C --> E[fetchAnalytics]
+    C --> F[fetchBehaviorData]
+
+    D --> G[analyzeAndScore]
+    E --> G
+    F --> G
+
+    G --> H[updateCRMProfile]
+    H --> I[triggerFollowUp]
+```
+
+</div>
+  </Tab>
+</Tabs>
+
+<UseCasesCards />
diff --git a/docs/guides/use-cases/media-generation.mdx b/docs/guides/use-cases/media-generation.mdx
new file mode 100644
index 00000000000..919440df5f6
--- /dev/null
+++ b/docs/guides/use-cases/media-generation.mdx
@@ -0,0 +1,144 @@
+---
+title: "AI media generation workflows"
+sidebarTitle: "AI media generation"
+description: "Learn how to use Trigger.dev for AI media generation including image creation, video synthesis, audio generation, and multi-modal content workflows"
+---
+
+import UseCasesCards from "/snippets/use-cases-cards.mdx";
+
+## Overview
+
+Build AI media generation pipelines that handle unpredictable API latencies and long-running operations. Generate images, videos, audio, and multi-modal content with automatic retries, progress tracking, and no timeout limits.
+
+## Featured examples
+
+<CardGroup cols={3}>
+  <Card
+    title="Product image generator"
+    icon="book"
+    href="/guides/example-projects/product-image-generator"
+  >
+    Transform product photos into professional marketing images using Replicate.
+  </Card>
+  <Card
+    title="Meme generator (human-in-the-loop)"
+    icon="book"
+    href="/guides/example-projects/meme-generator-human-in-the-loop"
+  >
+    Generate memes with DALL·E 3 and add human approval steps.
+  </Card>
+  <Card
+    title="Vercel AI SDK image generation"
+    icon="book"
+    href="/guides/example-projects/vercel-ai-sdk-image-generator"
+  >
+    Generate images from text prompts using the Vercel AI SDK.
+  </Card>
+</CardGroup>
+
+## Benefits of using Trigger.dev for AI media generation workflows
+
+**Pay only for active compute, not AI inference time:** Checkpoint-resume pauses during AI API calls. Generate content that takes minutes or hours without paying for idle inference time.
+
+**No timeout limits for long generations:** Handle generations that take minutes or hours without execution limits. Perfect for high-quality video synthesis and complex multi-modal workflows.
+
+**Human approval gates for brand safety:** Add review steps before publishing AI-generated content. Pause workflows for human approval using waitpoint tokens.
+
+## Production use cases
+
+<CardGroup cols={1}>
+
+  <Card title="Icon customer story" href="https://trigger.dev/customers/icon-customer-story">
+
+Read how Icon uses Trigger.dev to process and generate thousands of videos per month for their AI-driven video creation platform.
+
+</Card>
+
+<Card title="Papermark customer story" href="https://trigger.dev/customers/papermark-customer-story">
+
+Read how Papermark process thousands of documents per month using Trigger.dev.
+
+</Card>
+</CardGroup>
+
+## Example workflow patterns
+
+<Tabs>
+ <Tab title="AI content with approval">
+    **Supervisor pattern with approval gate**. Generates AI content, pauses execution with wait.forToken to allow human review, applies feedback if needed, publishes approved content.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[generateContent] --> B[createWithAI]
+    B --> C[wait.forToken approval]
+    C --> D{Approved?}
+
+    D -->|Yes| E[publishContent]
+    D -->|Needs revision| F[applyFeedback]
+    F --> B
+```
+
+</div>
+  </Tab>
+  <Tab title="AI image generation">
+    Simple AI image generation. Receives prompt and parameters, calls OpenAI DALL·E 3, post-processes result, uploads to storage.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[generateImage] --> B[optimizeImage]
+    B --> C[uploadToStorage]
+    C --> D[updateDatabase]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Batch image generation">
+    **Coordinator pattern with rate limiting**. Receives batch of generation requests, coordinates parallel processing with configurable concurrency to respect API rate limits, validates outputs, stores results.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processBatch] --> B[coordinateGeneration]
+    B --> C[batchTriggerAndWait]
+
+    C --> D[generateImage1]
+    C --> E[generateImage2]
+    C --> F[generateImageN]
+
+    D --> G[validateResults]
+    E --> G
+    F --> G
+
+    G --> H[storeResults]
+    H --> I[notifyCompletion]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Multi-step image enhancement">
+    **Coordinator pattern with sequential processing**. Generates initial content with AI, applies style transfer or enhancement, upscales resolution, optimizes and compresses for delivery.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processCreative] --> B[generateWithAI]
+    B --> C[applyStyleTransfer]
+    C --> D[upscaleResolution]
+    D --> E[optimizeAndCompress]
+    E --> F[uploadToStorage]
+```
+
+</div>
+  </Tab>
+
+</Tabs>
+
+<UseCasesCards />
diff --git a/docs/guides/use-cases/media-processing.mdx b/docs/guides/use-cases/media-processing.mdx
new file mode 100644
index 00000000000..e0f6aa87197
--- /dev/null
+++ b/docs/guides/use-cases/media-processing.mdx
@@ -0,0 +1,191 @@
+---
+title: "Media processing workflows"
+sidebarTitle: "Media processing"
+description: "Learn how to use Trigger.dev for media processing including video transcoding, image optimization, audio transformation, and document conversion."
+---
+
+import UseCasesCards from "/snippets/use-cases-cards.mdx";
+
+## Overview
+
+Build media processing pipelines that handle large files and long-running operations. Process videos, images, audio, and documents with automatic retries, progress tracking, and no timeout limits.
+
+## Featured examples
+
+<CardGroup cols={3}>
+  <Card title="FFmpeg video processing" icon="book" href="/guides/examples/ffmpeg-video-processing">
+    Process videos and upload results to R2 storage using FFmpeg.
+  </Card>
+  <Card
+    title="Product image generator"
+    icon="book"
+    href="/guides/example-projects/product-image-generator"
+  >
+    Transform product photos into professional marketing images using Replicate.
+  </Card>
+  <Card
+    title="LibreOffice PDF conversion"
+    icon="book"
+    href="/guides/examples/libreoffice-pdf-conversion"
+  >
+    Convert documents to PDF using LibreOffice.
+  </Card>
+</CardGroup>
+
+## Benefits of using Trigger.dev for media processing workflows
+
+**Process multi-hour videos without timeouts:** Transcode videos, extract frames, or run CPU-intensive operations for hours. No execution time limits.
+
+**Stream progress to users in real-time:** Show processing status updating live in your UI. Users see exactly where encoding is and how long remains.
+
+**Parallel processing with resource control:** Process hundreds of files simultaneously with configurable concurrency limits. Control resource usage without overwhelming infrastructure.
+
+## Example workflow patterns
+
+<Tabs>
+  <Tab title="Video transcode">
+    Simple video transcoding pipeline. Downloads video from storage, batch triggers parallel transcoding to multiple formats and thumbnail extraction, uploads all results.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processVideo] --> B[downloadFromStorage]
+    B --> C[batchTriggerAndWait]
+
+    C --> D[transcodeToHD]
+    C --> E[transcodeToSD]
+    C --> F[extractThumbnail]
+
+    D --> G[uploadToStorage]
+    E --> G
+    F --> G
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Adaptive video processing">
+    **Router + Coordinator pattern**. Analyzes video metadata to determine source resolution, routes to appropriate transcoding preset, batch triggers parallel post-processing for thumbnails, preview clips, and chapter detection.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processVideoUpload] --> B[analyzeMetadata]
+    B --> C{Source<br/>Resolution?}
+
+    C -->|4K Source| D[transcode4K]
+    C -->|HD Source| E[transcodeHD]
+    C -->|SD Source| F[transcodeSD]
+
+    D --> G[coordinatePostProcessing]
+    E --> G
+    F --> G
+
+    G --> H[batchTriggerAndWait]
+    H --> I[extractThumbnails]
+    H --> J[generatePreview]
+    H --> K[detectChapters]
+
+    I --> L[uploadToStorage]
+    J --> L
+    K --> L
+
+    L --> M[notifyComplete]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Smart image optimization">
+    **Router + Coordinator pattern**. Analyzes image content to detect type, routes to specialized processing (background removal for products, face detection for portraits, scene analysis for landscapes), upscales with AI, batch triggers parallel variant generation.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processImageUpload] --> B[analyzeContent]
+    B --> C{Content<br/>Type?}
+
+    C -->|Product| D[removeBackground]
+    C -->|Portrait| E[detectFaces]
+    C -->|Landscape| F[analyzeScene]
+
+    D --> G[upscaleWithAI]
+    E --> G
+    F --> G
+
+    G --> H[batchTriggerAndWait]
+    H --> I[generateWebP]
+    H --> J[generateThumbnails]
+    H --> K[generateSocialCrops]
+
+    I --> L[uploadToStorage]
+    J --> L
+    K --> L
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Podcast production">
+    **Coordinator pattern**. Pre-processes raw audio with noise reduction and speaker diarization, batch triggers parallel tasks for transcription (Deepgram), audio enhancement, and chapter detection, aggregates results to generate show notes and publish.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processAudioUpload] --> B[cleanAudio]
+    B --> C[coordinateProcessing]
+
+    C --> D[batchTriggerAndWait]
+    D --> E[transcribeWithDeepgram]
+    D --> F[enhanceAudio]
+    D --> G[detectChapters]
+
+    E --> H[generateShowNotes]
+    F --> H
+    G --> H
+
+    H --> I[publishToPlatforms]
+```
+
+</div>
+  </Tab>
+
+  <Tab title="Document extraction with approval">
+    **Router pattern with human-in-the-loop**. Detects file type and routes to appropriate processor, classifies document with AI to determine type (invoice/contract/receipt), extracts structured data fields, optionally pauses with wait.forToken for human approval.
+
+<div align="center">
+
+```mermaid
+graph TB
+    A[processDocumentUpload] --> B[detectFileType]
+
+    B -->|PDF| C[extractText]
+    B -->|Word/Excel| D[convertToPDF]
+    B -->|Image| E[runOCR]
+
+    C --> F[classifyDocument]
+    D --> F
+    E --> F
+
+    F -->|Invoice| G[extractLineItems]
+    F -->|Contract| H[extractClauses]
+    F -->|Receipt| I[extractExpenses]
+
+    G --> J{Needs<br/>Review?}
+    H --> J
+    I --> J
+
+    J -->|Yes| K[wait.forToken approval]
+    J -->|No| L[processAndIntegrate]
+    K --> L
+```
+
+</div>
+  </Tab>
+</Tabs>
+
+<UseCasesCards />
diff --git a/docs/guides/use-cases/overview.mdx b/docs/guides/use-cases/overview.mdx
new file mode 100644
index 00000000000..8bb9477abb9
--- /dev/null
+++ b/docs/guides/use-cases/overview.mdx
@@ -0,0 +1,11 @@
+---
+title: "Use cases"
+sidebarTitle: "Overview"
+description: "Explore common use cases for Trigger.dev including data processing, media workflows, marketing automation, and AI generation"
+---
+
+import UseCasesCards from "/snippets/use-cases-cards.mdx";
+
+Trigger.dev handles workflows that traditional platforms struggle with: long-running operations, unpredictable API latencies, multi-hour processing, and complex orchestration patterns. Our platform provides no timeout limits, automatic retries, and real-time progress tracking built in.
+
+<UseCasesCards />
diff --git a/docs/guides/use-cases/upgrading-from-v2.mdx b/docs/guides/use-cases/upgrading-from-v2.mdx
index 05f73b9a3fb..3cc1f88be72 100644
--- a/docs/guides/use-cases/upgrading-from-v2.mdx
+++ b/docs/guides/use-cases/upgrading-from-v2.mdx
@@ -59,7 +59,7 @@ client.defineJob({
 In v3 it looks like this:
 
 ```ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import { db } from "@/lib/db";
 export const getCreatorVideosFromTikTok = task({
   id: "my-job-id",
@@ -136,7 +136,7 @@ export const openaiJob = task({
 So don't use the `@trigger.dev/openai` package in v3, use the official OpenAI SDK.
 Bear in mind that the syntax for the latest official SDK will probably be different from the @trigger.dev integration SDK. You will need to adapt the code accordingly.
 3. The most critical difference is that inside the `run` function you do NOT need to wrap everything in `io.runTask`. So anything inside there can be extracted out and be used in the main body of the function without wrapping it.
-4. The import for `task` in v3 is `import { task } from "@trigger.dev/sdk/v3";`
+4. The import for `task` in v3 is `import { task } from "@trigger.dev/sdk";`
 5. You can trigger jobs from other jobs. In v2 this was typically done by either calling `io.sendEvent()` or by calling `yourOtherTask.invoke()`. In v3 you call `.trigger()` on the other task, there are no events in v3.
 v2:
 
@@ -258,7 +258,7 @@ client.defineJob({
 In v3 we eliminate a lot of code mainly because we don't need tricks to try avoid timeouts. Here's the equivalent v3 code:
 
 ```ts v3 OpenAI task
-import { logger, task, wait } from "@trigger.dev/sdk/v3";
+import { logger, task, wait } from "@trigger.dev/sdk";
 
 //1. Official OpenAI SDK
 import OpenAI from "openai";
diff --git a/docs/help-slack.mdx b/docs/help-slack.mdx
index 6388cb66b31..0b733522ac2 100644
--- a/docs/help-slack.mdx
+++ b/docs/help-slack.mdx
@@ -2,7 +2,7 @@
 title: "Slack support"
 ---
 
-If you have a paid Trigger.dev account, you can request a private Slack Connect channel.
+If you're on the Trigger.dev Pro plan, you can request a private Slack Connect channel.
 
 To do this:
 
diff --git a/docs/hidden-tasks.mdx b/docs/hidden-tasks.mdx
new file mode 100644
index 00000000000..1624a11ecf3
--- /dev/null
+++ b/docs/hidden-tasks.mdx
@@ -0,0 +1,56 @@
+---
+title: "Hidden tasks"
+description: "Create tasks that are not exported from your trigger files but can still be executed."
+---
+
+Hidden tasks are tasks that are not exported from your trigger files but can still be executed. These tasks are only accessible to other tasks within the same file or module where they're defined.
+
+```ts trigger/my-task.ts
+import { task } from "@trigger.dev/sdk";
+
+// This is a hidden task - not exported
+const internalTask = task({
+  id: "internal-processing",
+  run: async (payload: any, { ctx }) => {
+    // Internal processing logic
+  },
+});
+```
+
+Hidden tasks are useful for creating internal workflows that should only be triggered by other tasks in the same file:
+
+```ts trigger/my-workflow.ts
+import { task } from "@trigger.dev/sdk";
+
+// Hidden task for internal use
+const processData = task({
+  id: "process-data",
+  run: async (payload: { data: string }, { ctx }) => {
+    // Process the data
+    return { processed: payload.data.toUpperCase() };
+  },
+});
+
+// Public task that uses the hidden task
+export const mainWorkflow = task({
+  id: "main-workflow",
+  run: async (payload: any, { ctx }) => {
+    const result = await processData.trigger({ data: payload.input });
+    return result;
+  },
+});
+```
+
+You can also create packages of reusable tasks that can be imported and used without needing to re-export them:
+
+```ts trigger/my-task.ts
+import { task } from "@trigger.dev/sdk";
+import { sendToSlack } from "@repo/tasks"; // Hidden task from another package
+
+export const notificationTask = task({
+  id: "send-notification",
+  run: async (payload: any, { ctx }) => {
+    await sendToSlack.trigger(payload);
+  },
+});
+```
\ No newline at end of file
diff --git a/docs/how-it-works.mdx b/docs/how-it-works.mdx
index a1eafc53bc8..88bb4c07036 100644
--- a/docs/how-it-works.mdx
+++ b/docs/how-it-works.mdx
@@ -11,7 +11,7 @@ Trigger.dev v3 allows you to integrate long-running async tasks into your applic
 For example, the below task processes a video with `ffmpeg` and sends the results to an s3 bucket, then updates a database with the results and sends an email to the user.
 
 ```ts /trigger/video.ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 import { updateVideoUrl } from "../db.js";
 import ffmpeg from "fluent-ffmpeg";
 import { Readable } from "node:stream";
@@ -85,7 +85,7 @@ Now in your application, you can trigger this task by calling:
 
 ```ts
 import { NextResponse } from "next/server";
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { convertVideo } from "./trigger/video";
 //     👆 **type-only** import
 
@@ -165,7 +165,7 @@ This approach allows Trigger.dev to manage resources efficiently, handle complex
 Example of a parent and child task using the Checkpoint-Resume System:
 
 ```ts
-import { task, wait } from "@trigger.dev/sdk/v3";
+import { task, wait } from "@trigger.dev/sdk";
 
 export const parentTask = task({
   id: "parent-task",
@@ -249,7 +249,7 @@ Let's rewrite the `convert-video` task above to be more durable:
 <CodeGroup>
 
 ```ts /trigger/video.ts
-import { idempotencyKeys, logger, task } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, logger, task } from "@trigger.dev/sdk";
 import { processVideo, sendUserEmail, uploadToS3 } from "./tasks.js";
 import { updateVideoUrl } from "../db.js";
 
@@ -287,7 +287,7 @@ export const convertVideo = task({
 ```
 
 ```ts /trigger/tasks.ts
-import { task, logger } from "@trigger.dev/sdk/v3";
+import { task, logger } from "@trigger.dev/sdk";
 import ffmpeg from "fluent-ffmpeg";
 import { Readable } from "node:stream";
 import type { ReadableStream } from "node:stream/web";
@@ -430,7 +430,9 @@ When you run `npx trigger.dev@latest dev`, we run your task code locally on your
 
 ## Staging and production environments
 
-Trigger.dev supports deploying to multiple "deployed" environments, such as staging and production. This allows you to test your tasks in a staging environment before deploying them to production. You can deploy to a new environment by running `npx trigger.dev@latest deploy --env <env>`, where `<env>` is the name of the environment you want to deploy to. Each environment has its own API Key, which you can use to trigger tasks in that environment.
+Trigger.dev supports deploying to `prod` and `staging` environments. This allows you to test your tasks in a staging environment before deploying them to production. You can deploy to a different environment by running `npx trigger.dev@latest deploy --env <env>`, where `<env>` is either `prod` or `staging`. Each environment has its own API Key, which you can use to trigger tasks in that environment.
+
+For additional isolated environments, you can use [preview branches](/deployment/preview-branches), which allow you to create separate environments for each branch of your code.
 
 ## OpenTelemetry
 
@@ -441,7 +443,7 @@ The Trigger.dev logging and task dashboard is powered by OpenTelemetry traces an
 Because we use standard OpenTelemetry, you can instrument your code and OpenTelemetry compatible libraries to get detailed traces and logs of your tasks. The above trace instruments both Prisma and the AWS SDK:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
 import { AwsInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
 
diff --git a/docs/how-to-reduce-your-spend.mdx b/docs/how-to-reduce-your-spend.mdx
new file mode 100644
index 00000000000..c070745d433
--- /dev/null
+++ b/docs/how-to-reduce-your-spend.mdx
@@ -0,0 +1,217 @@
+---
+title: "How to reduce your spend"
+description: "Tips and best practices to reduce your costs on Trigger.dev"
+---
+
+## Check out your usage page regularly
+
+Monitor your usage dashboard to understand your spending patterns. You can see:
+
+- Your most expensive tasks
+- Your total duration by task
+- Number of runs by task
+- Spikes in your daily usage
+
+![Usage dashboard](./images/usage-dashboard.png)
+
+You can view your usage page by clicking the "Organization" menu in the top left of the dashboard and then clicking "Usage".
+
+## Create billing alerts
+
+Configure billing alerts in your dashboard to get notified when you approach spending thresholds. This helps you:
+
+- Catch unexpected cost increases early
+- Identify runaway tasks before they become expensive
+
+The billing alerts page includes two types of alerts:
+
+- **Standard alerts**: Get notified at 75%, 90%, 100%, 200%, and 500% of your monthly budget
+- **Spike alerts**: Catch runaway usage from bugs or errors with alerts at 10x (1000%), 20x (2000%), 50x (5000%), and 100x (10000%) of your monthly budget. We recommend keeping these enabled as a safety net.
+
+![Billing alerts](./images/billing-alerts-ui.png)
+
+You can view your billing alerts page by clicking the "Organization" menu in the top left of the dashboard and then clicking "Settings".
+
+## Reduce your machine sizes
+
+The larger the machine, the more it costs per second. [View the machine pricing](https://trigger.dev/pricing#computePricing).
+
+Start with the smallest machine that works, then scale up only if needed:
+
+```ts
+// Default: small-1x (0.5 vCPU, 0.5 GB RAM)
+export const lightTask = task({
+  id: "light-task",
+  // No machine config needed - uses small-1x by default
+  run: async (payload) => {
+    // Simple operations
+  },
+});
+
+// Only use larger machines when necessary
+export const heavyTask = task({
+  id: "heavy-task",
+  machine: "medium-1x", // 1 vCPU, 2 GB RAM
+  run: async (payload) => {
+    // CPU/memory intensive operations
+  },
+});
+```
+
+You can also override machine size when triggering if you know certain payloads need more resources. [Read more about machine sizes](/machines).
+
+## Avoid duplicate work using idempotencyKey
+
+Idempotency keys prevent expensive duplicate work by ensuring the same operation isn't performed multiple times. This is especially valuable during task retries or when the same trigger might fire multiple times.
+
+When you use an idempotency key, Trigger.dev remembers the result and skips re-execution, saving you compute costs:
+
+```ts
+export const expensiveApiCall = task({
+  id: "expensive-api-call",
+  run: async (payload: { userId: string }) => {
+    // This expensive operation will only run once per user
+    await wait.for(
+      { seconds: 30 },
+      {
+        idempotencyKey: `user-processing-${payload.userId}`,
+        idempotencyKeyTTL: "1h",
+      }
+    );
+
+    const result = await processUserData(payload.userId);
+    return result;
+  },
+});
+```
+
+You can use idempotency keys with various wait functions:
+
+```ts
+// Skip waits during retries
+const token = await wait.createToken({
+  idempotencyKey: `daily-report-${new Date().toDateString()}`,
+  idempotencyKeyTTL: "24h",
+});
+
+// Prevent duplicate child task execution
+await childTask.triggerAndWait(
+  { data: payload },
+  {
+    idempotencyKey: `process-${payload.id}`,
+    idempotencyKeyTTL: "1h",
+  }
+);
+```
+
+The `idempotencyKeyTTL` controls how long the result is cached. Use shorter TTLs (like "1h") for time-sensitive operations, or longer ones (up to 30 days default) for expensive operations that rarely need re-execution. This prevents both unnecessary duplicate work and stale data issues.
+
+## Do more work in parallel in a single task
+
+Sometimes it's more efficient to do more work in a single task than split across many. This is particularly true when you're doing lots of async work such as API calls – most of the time is spent waiting, so it's an ideal candidate for doing calls in parallel inside the same task.
+
+```ts
+export const processItems = task({
+  id: "process-items",
+  run: async (payload: { items: string[] }) => {
+    // Process all items in parallel
+    const promises = payload.items.map((item) => processItem(item));
+    // This works very well for API calls
+    await Promise.all(promises);
+  },
+});
+```
+
+## Don't needlessly retry
+
+When an error is thrown in a task, your run will be automatically reattempted based on your [retry settings](/tasks/overview#retry-options).
+
+Try setting lower `maxAttempts` for less critical tasks:
+
+```ts
+export const apiTask = task({
+  id: "api-task",
+  retry: {
+    maxAttempts: 2, // Don't retry forever
+  },
+  run: async (payload) => {
+    // API calls that might fail
+  },
+});
+```
+
+This is very useful for intermittent errors, but if there's a permanent error you don't want to retry because you will just keep failing and waste compute. Use [AbortTaskRunError](/errors-retrying#using-aborttaskrunerror) to prevent a retry:
+
+```ts
+import { task, AbortTaskRunError } from "@trigger.dev/sdk";
+
+export const someTask = task({
+  id: "some-task",
+  run: async (payload) => {
+    const result = await doSomething(payload);
+
+    if (!result.success) {
+      // This is a known permanent error, so don't retry
+      throw new AbortTaskRunError(result.error);
+    }
+
+    return result;
+  },
+});
+```
+
+## Use appropriate maxDuration settings
+
+Set realistic maxDurations to prevent runs from executing for too long:
+
+```ts
+export const boundedTask = task({
+  id: "bounded-task",
+  maxDuration: 300, // 5 minutes max
+  run: async (payload) => {
+    // Task will be terminated after 5 minutes
+  },
+});
+```
+
+## Use waitpoints instead of polling
+
+Waits longer than 5 seconds automatically checkpoint your task, meaning you don't pay for compute while waiting. Use `wait.for()`, `wait.until()`, or `triggerAndWait()` instead of polling loops.
+
+```ts
+import { task, wait } from "@trigger.dev/sdk";
+
+export const waitpointTask = task({
+  id: "waitpoint-task",
+  run: async (payload) => {
+    // This wait is free - your task is checkpointed
+    await wait.for({ minutes: 5 });
+
+    // Parent is also checkpointed while waiting for child tasks
+    const result = await childTask.triggerAndWait({ data: payload });
+    return result;
+  },
+});
+```
+
+[Read more about waitpoints](/wait-for).
+
+## Use debounce to consolidate multiple triggers
+
+When a task might be triggered multiple times in quick succession, use debounce to consolidate them into a single run. This is useful for document indexing, webhook aggregation, cache invalidation, and real-time sync scenarios.
+
+```ts
+// Multiple rapid triggers consolidate into 1 run
+await updateIndex.trigger(
+  { docId: "doc-123" },
+  { debounce: { key: "doc-123", delay: "5s" } }
+);
+
+// Use trailing mode to process the most recent payload
+await processUpdate.trigger(
+  { version: 2 },
+  { debounce: { key: "update-123", delay: "10s", mode: "trailing" } }
+);
+```
+
+[Read more about debounce](/triggering#debounce).
diff --git a/docs/idempotency.mdx b/docs/idempotency.mdx
index e9400a77eba..034246eafbf 100644
--- a/docs/idempotency.mdx
+++ b/docs/idempotency.mdx
@@ -1,22 +1,47 @@
 ---
 title: "Idempotency"
-description: "An API call or operation is “idempotent” if it has the same result when called more than once."
+description: "An API call or operation is idempotent if it has the same result when called more than once."
 ---
 
-We currently support idempotency at the task level, meaning that if you trigger a task with the same `idempotencyKey` twice, the second request will not create a new task run.
+We currently support idempotency at the task level, meaning that if you trigger a task with the same `idempotencyKey` twice, the second request will not create a new task run. Instead, the original run's handle is returned, allowing you to track the existing run's progress.
 
-<Warning>
-  In version 3.3.0 and later, the `idempotencyKey` option is not available when using
-  `triggerAndWait` or `batchTriggerAndWait`, due to a bug that would sometimes cause the parent task
-  to become stuck. We are working on a fix for this issue.
-</Warning>
+## Why use idempotency keys?
+
+The most common use case is **preventing duplicate child tasks when a parent task retries**. Without idempotency keys, each retry of the parent would trigger a new child task run:
+
+```mermaid
+sequenceDiagram
+    participant Parent as Parent Task
+    participant SDK as Trigger.dev
+    participant Child as Child Task
+
+    Note over Parent: Attempt 1
+    Parent->>SDK: trigger(childTask, {idempotencyKey})
+    SDK->>Child: Creates child run
+    Child-->>SDK: Running...
+    Parent->>Parent: Fails, will retry
+
+    Note over Parent: Attempt 2 (retry)
+    Parent->>SDK: trigger(childTask, {idempotencyKey})
+    Note over SDK: Same key, returns existing run
+    SDK-->>Parent: Returns original child run
+    
+    Note over Child: Child task only runs once
+```
+
+Other common use cases include:
+
+- **Preventing duplicate emails** - Ensure a confirmation email is only sent once, even if the parent task retries
+- **Avoiding double-charging customers** - Prevent duplicate payment processing during retries
+- **One-time setup tasks** - Ensure initialization or migration tasks only run once
+- **Deduplicating webhook processing** - Handle the same webhook event only once, even if it's delivered multiple times
 
 ## `idempotencyKey` option
 
-You can provide an `idempotencyKey` to ensure that a task is only triggered once with the same key. This is useful if you are triggering a task within another task that might be retried:
+You can provide an `idempotencyKey` when triggering a task:
 
 ```ts
-import { idempotencyKeys, task } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -41,7 +66,7 @@ You can use the `idempotencyKeys.create` SDK function to create an idempotency k
 We automatically inject the run ID when generating the idempotency key when running inside a task by default. You can turn it off by passing the `scope` option to `idempotencyKeys.create`:
 
 ```ts
-import { idempotencyKeys, task } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -61,7 +86,7 @@ export const myTask = task({
 If you are triggering a task from your backend code, you can use the `idempotencyKeys.create` SDK function to create an idempotency key.
 
 ```ts
-import { idempotencyKeys, tasks } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, tasks } from "@trigger.dev/sdk";
 
 // You can also pass an array of strings to create a idempotency key
 const idempotencyKey = await idempotencyKeys.create([myUser.id, "my-task"]);
@@ -77,12 +102,16 @@ import { myTask } from "./trigger/myTasks";
 await myTask.trigger({ some: "data" }, { idempotencyKey: myUser.id });
 ```
 
+<Note>
+When you pass a raw string, it defaults to `"run"` scope (scoped to the parent run). See [Default behavior](#default-behavior) for details on how scopes work and how to use global scope instead.
+</Note>
+
 <Note>Make sure you provide sufficiently unique keys to avoid collisions.</Note>
 
 You can pass the `idempotencyKey` when calling `batchTrigger` as well:
 
 ```ts
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 
 await tasks.batchTrigger("my-task", [
   {
@@ -92,6 +121,149 @@ await tasks.batchTrigger("my-task", [
 ]);
 ```
 
+## Understanding scopes
+
+The `scope` option determines how your idempotency key is processed. When you provide a key, it gets hashed together with additional context based on the scope. This means the same key string can produce different idempotency behaviors depending on the scope you choose.
+
+### Available scopes
+
+| Scope | What gets hashed | Description | Use case |
+| --- | --- | --- | --- |
+| `"run"` | `key + parentRunId` | Key is combined with the parent run ID | Prevent duplicates within a single parent run (default) |
+| `"attempt"` | `key + parentRunId + attemptNumber` | Key is combined with the parent run ID and attempt number | Allow child tasks to re-run on each retry of the parent |
+| `"global"` | `key` | Key is used as-is, no context added | Ensure a task only runs once ever, regardless of parent |
+
+### `run` scope (default)
+
+The `run` scope makes the idempotency key unique to the current parent task run. This is the default behavior for both raw strings and `idempotencyKeys.create()`.
+
+```ts
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
+
+export const processOrder = task({
+  id: "process-order",
+  retry: { maxAttempts: 3 },
+  run: async (payload: { orderId: string; email: string }) => {
+    // This key is scoped to this specific run of processOrder
+    // If processOrder retries, the same key still refers to the same child run
+    const idempotencyKey = await idempotencyKeys.create(`send-confirmation-${payload.orderId}`);
+
+    // sendEmail will only be triggered once, even if processOrder retries multiple times
+    await sendEmail.trigger(
+      { to: payload.email, subject: "Order confirmed" },
+      { idempotencyKey }
+    );
+
+    // ... more processing that might fail and cause a retry
+  },
+});
+```
+
+With `run` scope, if you trigger `processOrder` twice with different run IDs, both will send emails because the idempotency keys are different (they include different parent run IDs).
+
+### `attempt` scope
+
+The `attempt` scope makes the idempotency key unique to each attempt of the parent task. Use this when you want child tasks to re-execute on each retry.
+
+```ts
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
+
+export const syncData = task({
+  id: "sync-data",
+  retry: { maxAttempts: 3 },
+  run: async (payload: { userId: string }) => {
+    // This key changes on each retry attempt
+    const idempotencyKey = await idempotencyKeys.create(`fetch-${payload.userId}`, {
+      scope: "attempt",
+    });
+
+    // fetchLatestData will run again on each retry, getting fresh data
+    const result = await fetchLatestData.triggerAndWait(
+      { userId: payload.userId },
+      { idempotencyKey }
+    );
+
+    // Process the fresh data...
+  },
+});
+```
+
+### `global` scope
+
+The `global` scope makes the idempotency key truly global across all runs. Use this when you want to ensure a task only runs once ever (until the TTL expires), regardless of which parent task triggered it.
+
+```ts
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
+
+export const onboardUser = task({
+  id: "onboard-user",
+  run: async (payload: { userId: string; email: string }) => {
+    // This key is global - the welcome email will only be sent once per user,
+    // even if onboardUser is triggered multiple times from different places
+    const idempotencyKey = await idempotencyKeys.create(`welcome-email-${payload.userId}`, {
+      scope: "global",
+    });
+
+    await sendWelcomeEmail.trigger(
+      { to: payload.email },
+      { idempotencyKey, idempotencyKeyTTL: "7d" }
+    );
+  },
+});
+```
+
+<Note>
+Even with `global` scope, idempotency keys are still isolated to the specific task and environment. Using the same key to trigger *different* tasks will not deduplicate - both tasks will run. See [Environment and task scoping](#environment-and-task-scoping) for more details.
+</Note>
+
+## Default behavior
+
+Understanding the default behavior is important to avoid unexpected results:
+
+### Passing a raw string
+
+When you pass a raw string directly to the `idempotencyKey` option, it is automatically processed with `run` scope:
+
+```ts
+// These two are equivalent when called inside a task:
+await childTask.trigger(payload, { idempotencyKey: "my-key" });
+await childTask.trigger(payload, { idempotencyKey: await idempotencyKeys.create("my-key") });
+```
+
+<Warning>
+**Breaking change in v4.3.1:** In v4.3.0 and earlier, raw strings defaulted to `global` scope. Starting in v4.3.1, raw strings now default to `run` scope. If you're upgrading and relied on the previous global behavior, you must now explicitly use `idempotencyKeys.create("key", { scope: "global" })`.
+</Warning>
+
+This means raw strings are scoped to the parent run by default. If you want global behavior, you must explicitly create the key with `scope: "global"`:
+
+```ts
+// For global idempotency, you must use idempotencyKeys.create with scope: "global"
+const idempotencyKey = await idempotencyKeys.create("my-key", { scope: "global" });
+await childTask.trigger(payload, { idempotencyKey });
+```
+
+### Triggering from backend code
+
+When triggering tasks from your backend code (outside of a task), there is no parent run context. In this case, `run` and `attempt` scopes behave the same as `global` since there's no run ID or attempt number to inject:
+
+```ts
+// In your backend code (e.g., an API route)
+import { idempotencyKeys, tasks } from "@trigger.dev/sdk";
+
+// All three of these behave the same when called outside a task:
+await tasks.trigger("my-task", payload, { idempotencyKey: "my-key" });
+await tasks.trigger("my-task", payload, {
+  idempotencyKey: await idempotencyKeys.create("my-key", { scope: "run" }),
+});
+await tasks.trigger("my-task", payload, {
+  idempotencyKey: await idempotencyKeys.create("my-key", { scope: "global" }),
+});
+```
+
+<Note>
+When triggering from backend code, the scope doesn't matter since there's no task context. All scopes effectively behave as global.
+</Note>
+
 ## `idempotencyKeyTTL` option
 
 The `idempotencyKeyTTL` option defines a time window during which a task with the same idempotency key will only run once. Here's how it works:
@@ -105,7 +277,7 @@ The `idempotencyKeyTTL` option defines a time window during which a task with th
 By default idempotency keys are stored for 30 days. You can change this by passing the `idempotencyKeyTTL` option when triggering a task:
 
 ```ts
-import { idempotencyKeys, task, wait } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, task, wait } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -136,12 +308,38 @@ You can use the following units for the `idempotencyKeyTTL` option:
 - `h` for hours (e.g. `2h`)
 - `d` for days (e.g. `3d`)
 
+## Failed runs and idempotency
+
+When a run with an idempotency key **fails**, the key is automatically cleared. This means triggering the same task with the same idempotency key will create a new run. However, **successful** and **canceled** runs keep their idempotency key. If you need to re-trigger after a successful or canceled run, you can:
+
+1. **Reset the idempotency key** using `idempotencyKeys.reset()`:
+
+```ts
+import { idempotencyKeys } from "@trigger.dev/sdk";
+
+// Clear the idempotency key to allow re-triggering
+await idempotencyKeys.reset("my-task", "my-idempotency-key");
+
+// Now you can trigger the task again
+await myTask.trigger(payload, { idempotencyKey: "my-idempotency-key" });
+```
+
+2. **Use a shorter TTL** so the key expires automatically:
+
+```ts
+// Key expires after 5 minutes
+await myTask.trigger(payload, { 
+  idempotencyKey: "my-key", 
+  idempotencyKeyTTL: "5m" 
+});
+```
+
 ## Payload-based idempotency
 
 We don't currently support payload-based idempotency, but you can implement it yourself by hashing the payload and using the hash as the idempotency key.
 
 ```ts
-import { idempotencyKeys, task } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
 import { createHash } from "node:crypto";
 
 // Somewhere in your code
@@ -158,8 +356,145 @@ function hash(payload: any): string {
 }
 ```
 
+## Resetting idempotency keys
+
+You can reset an idempotency key to clear it from all associated runs. This is useful if you need to allow a task to be triggered again with the same idempotency key.
+
+When you reset an idempotency key, it will be cleared for all runs that match both the task identifier and the idempotency key in the current environment. This allows you to trigger the task again with the same key.
+
+### API signature
+
+```ts
+idempotencyKeys.reset(
+  taskIdentifier: string,
+  idempotencyKey: string,
+  requestOptions?: ZodFetchOptions
+): Promise<{ id: string }>
+```
+
+| Parameter | Description |
+| --- | --- |
+| `taskIdentifier` | The identifier of the task (e.g., `"my-task"`) |
+| `idempotencyKey` | The idempotency key hash to reset (the 64-character hash string) |
+| `requestOptions` | Optional fetch options for the API request |
+
+### Resetting keys created with `idempotencyKeys.create()`
+
+When you pass an `IdempotencyKey` created with `idempotencyKeys.create()`, the scope and original key are automatically extracted, making it easy to reset:
+
+```ts
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
+
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    const key = await idempotencyKeys.create("my-key", { scope: "global" });
+    await childTask.trigger(payload, { idempotencyKey: key });
+
+    // Later in the same task, reset it - options extracted automatically
+    await idempotencyKeys.reset("child-task", key);
+  },
+});
+```
+
+### Resetting global keys
+
+Global keys are the simplest to reset since they don't require any run context:
+
+```ts
+import { idempotencyKeys } from "@trigger.dev/sdk";
+
+// From anywhere - inside a task or from your backend code
+await idempotencyKeys.reset("my-task", "my-key", { scope: "global" });
+```
+
+### Resetting run-scoped keys
+
+Keys created with `"run"` scope (the default) include the parent run ID in the hash. When resetting from inside the same task, the run ID is automatically available:
+
+```ts
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
+
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    // Create a run-scoped key (default)
+    const key = await idempotencyKeys.create("my-key");
+    await childTask.trigger(payload, { idempotencyKey: key });
+
+    // Reset works automatically inside the task - run ID is available from context
+    await idempotencyKeys.reset("child-task", key);
+  },
+});
+```
+
+When resetting from outside a task, you must provide the `parentRunId` if the key was created within a task context:
+
+```ts
+import { idempotencyKeys } from "@trigger.dev/sdk";
+
+// If the key was created within a task, you need the parent run ID
+await idempotencyKeys.reset("my-task", "my-key", {
+  scope: "run",
+  parentRunId: "run_abc123"
+});
+```
+
+<Note>
+If you triggered the task from backend code, all scopes behave as global (see [Triggering from backend code](#triggering-from-backend-code)). Use `scope: "global"` when resetting.
+</Note>
+
+### Resetting attempt-scoped keys
+
+Keys created with `"attempt"` scope include both the parent run ID and attempt number. When resetting from outside a task, you must provide both:
+
+```ts
+import { idempotencyKeys } from "@trigger.dev/sdk";
+
+// From your backend code
+await idempotencyKeys.reset("my-task", "my-key", {
+  scope: "attempt",
+  parentRunId: "run_abc123",
+  attemptNumber: 1
+});
+```
+
+<Warning>
+If you try to reset a `"run"` or `"attempt"` scoped key from outside a task without providing the required `parentRunId` (and `attemptNumber` for attempt scope), it will throw an error.
+</Warning>
+
+### Resetting from the dashboard
+
+You can also reset idempotency keys directly from the Trigger.dev dashboard:
+
+1. Navigate to the run that has the idempotency key you want to reset
+2. In the run details panel, find the "Idempotency key" section
+3. Click the "Reset" button
+
+This is useful when you need to manually allow a task to be re-triggered without writing code.
+
+![Idempotency section in the run details pane showing the key, scope, and expiration time](/images/idempotency-key-dashboard.png)
+
+<Note>
+Resetting an idempotency key only affects runs in the current environment. The reset is scoped to the specific task identifier and idempotency key combination.
+</Note>
+
 ## Important notes
 
+### Environment and task scoping
+
 Idempotency keys, even the ones scoped globally, are actually scoped to the task and the environment. This means that you cannot collide with keys from other environments (e.g. dev will never collide with prod), or to other projects and orgs.
 
 If you use the same idempotency key for triggering different tasks, the tasks will not be idempotent, and both tasks will be triggered. There's currently no way to make multiple tasks idempotent with the same key.
+
+### How scopes affect the key
+
+The scope determines what gets hashed alongside your key:
+
+- Same key + `"run"` scope in different parent runs = different hashes = both tasks run
+- Same key + `"global"` scope in different parent runs = same hash = only first task runs
+- Same key + different scopes = different hashes = both tasks run
+
+This is why understanding scopes is crucial: the same string key can produce different idempotency behavior depending on the scope and context.
+
+
diff --git a/docs/images/billing-alerts-ui.png b/docs/images/billing-alerts-ui.png
new file mode 100644
index 00000000000..54c97fcdb75
Binary files /dev/null and b/docs/images/billing-alerts-ui.png differ
diff --git a/docs/images/bulk-action-create.png b/docs/images/bulk-action-create.png
new file mode 100644
index 00000000000..91d11f8c301
Binary files /dev/null and b/docs/images/bulk-action-create.png differ
diff --git a/docs/images/bulk-action-open-panel.png b/docs/images/bulk-action-open-panel.png
new file mode 100644
index 00000000000..3887d1000d8
Binary files /dev/null and b/docs/images/bulk-action-open-panel.png differ
diff --git a/docs/images/bulk-action-page.png b/docs/images/bulk-action-page.png
new file mode 100644
index 00000000000..c0a9cce1cc1
Binary files /dev/null and b/docs/images/bulk-action-page.png differ
diff --git a/docs/images/claude-code-subagent.png b/docs/images/claude-code-subagent.png
new file mode 100644
index 00000000000..0adf0d5c3c2
Binary files /dev/null and b/docs/images/claude-code-subagent.png differ
diff --git a/docs/images/idempotency-key-dashboard.png b/docs/images/idempotency-key-dashboard.png
new file mode 100644
index 00000000000..575f9682e86
Binary files /dev/null and b/docs/images/idempotency-key-dashboard.png differ
diff --git a/docs/images/intro-ai.jpg b/docs/images/intro-ai.jpg
new file mode 100644
index 00000000000..9905922a22b
Binary files /dev/null and b/docs/images/intro-ai.jpg differ
diff --git a/docs/images/intro-lightpanda.jpg b/docs/images/intro-lightpanda.jpg
new file mode 100644
index 00000000000..8fc2102bb08
Binary files /dev/null and b/docs/images/intro-lightpanda.jpg differ
diff --git a/docs/images/intro-frameworks.jpg b/docs/images/intro-mcp.jpg
similarity index 100%
rename from docs/images/intro-frameworks.jpg
rename to docs/images/intro-mcp.jpg
diff --git a/docs/images/lifecycle-functions.png b/docs/images/lifecycle-functions.png
index d27936600d5..7aafd3faece 100644
Binary files a/docs/images/lifecycle-functions.png and b/docs/images/lifecycle-functions.png differ
diff --git a/docs/images/machines-resource-monitor-ffmpeg.png b/docs/images/machines-resource-monitor-ffmpeg.png
new file mode 100644
index 00000000000..97bb2906574
Binary files /dev/null and b/docs/images/machines-resource-monitor-ffmpeg.png differ
diff --git a/docs/images/machines-resource-monitor-logs.png b/docs/images/machines-resource-monitor-logs.png
new file mode 100644
index 00000000000..bc2d323f920
Binary files /dev/null and b/docs/images/machines-resource-monitor-logs.png differ
diff --git a/docs/images/metrics-built-in.png b/docs/images/metrics-built-in.png
new file mode 100644
index 00000000000..7104a16c4a3
Binary files /dev/null and b/docs/images/metrics-built-in.png differ
diff --git a/docs/images/pre-build-command-prisma-generate.png b/docs/images/pre-build-command-prisma-generate.png
new file mode 100644
index 00000000000..191b4b92eac
Binary files /dev/null and b/docs/images/pre-build-command-prisma-generate.png differ
diff --git a/docs/images/priority-runs.png b/docs/images/priority-runs.png
new file mode 100644
index 00000000000..bad6922f056
Binary files /dev/null and b/docs/images/priority-runs.png differ
diff --git a/docs/images/query-chart-usage-percentiles.png b/docs/images/query-chart-usage-percentiles.png
new file mode 100644
index 00000000000..43142ea28ad
Binary files /dev/null and b/docs/images/query-chart-usage-percentiles.png differ
diff --git a/docs/images/test-dashboard.png b/docs/images/test-dashboard.png
new file mode 100644
index 00000000000..14fccdbddda
Binary files /dev/null and b/docs/images/test-dashboard.png differ
diff --git a/docs/images/test-page.png b/docs/images/test-page.png
deleted file mode 100644
index e7002839961..00000000000
Binary files a/docs/images/test-page.png and /dev/null differ
diff --git a/docs/images/test-select-environment.png b/docs/images/test-select-environment.png
deleted file mode 100644
index 078162461cc..00000000000
Binary files a/docs/images/test-select-environment.png and /dev/null differ
diff --git a/docs/images/test-select-task.png b/docs/images/test-select-task.png
deleted file mode 100644
index ec7a6fac023..00000000000
Binary files a/docs/images/test-select-task.png and /dev/null differ
diff --git a/docs/images/test-set-payload.png b/docs/images/test-set-payload.png
deleted file mode 100644
index b0c3a5661fe..00000000000
Binary files a/docs/images/test-set-payload.png and /dev/null differ
diff --git a/docs/images/usage-dashboard.png b/docs/images/usage-dashboard.png
new file mode 100644
index 00000000000..585a626544a
Binary files /dev/null and b/docs/images/usage-dashboard.png differ
diff --git a/docs/insights/metrics.mdx b/docs/insights/metrics.mdx
new file mode 100644
index 00000000000..e6609590aa6
--- /dev/null
+++ b/docs/insights/metrics.mdx
@@ -0,0 +1,102 @@
+---
+title: "Metrics dashboards"
+description: "Create custom dashboards with real-time metrics powered by TRQL queries."
+---
+
+## Overview
+
+In the Trigger.dev dashboard we have built-in dashboards and you can create your own.
+
+Metrics dashboards are powered by [TRQL queries](/insights/query) with widgets that can be displayed as charts, tables, or single values. They automatically refresh to show the latest data.
+
+### Available metrics data
+
+Trigger.dev automatically collects process metrics (CPU, memory) and Node.js runtime metrics (event loop, heap) for all deployed tasks -- no configuration needed. Requires SDK version **4.4.1 or later**. You can also create custom metrics using the `otel.metrics` API from the SDK.
+
+All of this data is available in the `metrics` table for use in dashboard widgets. See [Logging, tracing & metrics](/logging#metrics) for the full list of automatic metrics and how to create custom ones, or the [Query page](/insights/query#metrics-table-columns) for the `metrics` table schema.
+
+![The built-in Metrics dashboard](/images/metrics-built-in.png)
+
+### Visualization types
+
+- **Line chart** - Show trends over time
+- **Bar chart** - Compare values across categories
+- **Area chart** - Display cumulative trends
+- **Table** - Show detailed data in rows
+- **Single value** - Display a single metric (count, sum, average, etc.)
+
+You can also add Titles to your dashboard.
+
+## Filtering and time ranges
+
+All widgets on a dashboard use the time range filter applied to the dashboard.
+
+You can also filter the data by:
+
+- Scope: Environment, Project, Organization
+- Tasks
+- Queues
+
+## Creating custom metrics dashboards
+
+1. In the sidebar click the + icon next to "Metrics".
+2. Name your custom dashboard.
+3. From the top-right you can "Add chart" or "Add title".
+4. For charts you write [TRQL queries](/insights/query) and choose a visualization type.
+5. You can resize and reposition widgets on your dashboards.
+
+## Performance considerations
+
+### Optimize queries for metrics
+
+1. **Use time bucketing** - `timeBucket()` automatically groups by appropriate intervals
+2. **Limit result size** - Add `LIMIT` clauses, especially for table widgets
+3. **Use approximate functions** - `uniq()` instead of `uniqExact()` for faster approximate counts
+
+## Exporting metric data
+
+Export data from any metric widget:
+
+1. Click the widget menu (three dots)
+2. Select "Copy JSON" or "Copy CSV"
+
+## Best practices
+
+1. **Start simple** - Begin with basic metrics and iterate based on insights
+2. **Use meaningful names** - Give widgets clear, descriptive titles
+3. **Group related metrics** - Organize dashboards by theme (performance, costs, errors)
+4. **Test queries first** - Use the Query page to develop and test before adding to dashboards
+
+## Troubleshooting
+
+### Widget shows "No data"
+
+- Check that your query returns results in the Query page
+- Verify time filters include the period with data
+- Ensure task/queue filters match existing runs
+
+### Widget is slow to load
+
+- Add time range filters to your query
+- Use `LIMIT` clauses
+- Simplify aggregations
+- Check query execution time in Query page
+
+### Chart displays incorrectly
+
+- Verify column names match visualization config
+- Check data types (numbers for charts, dates for time series)
+- Ensure `timeBucket()` is used for time-series charts
+- Review that series columns exist in query results
+
+## Limits
+
+Metrics is powered by Query so have [the same limits](/insights/query#limits) as Query.
+
+There is a separate concurrency limits for metric widgets.
+
+| Limit                     | Details        |
+| :------------------------ | :------------- |
+| Concurrent widget queries | 30 per project |
+
+See [Limits](/limits) for details.
diff --git a/docs/insights/query.mdx b/docs/insights/query.mdx
new file mode 100644
index 00000000000..69f1af70bb8
--- /dev/null
+++ b/docs/insights/query.mdx
@@ -0,0 +1,581 @@
+---
+title: "Query"
+description: "Query allows you to write custom queries against your data using TRQL (Trigger.dev Query Language), a SQL-style language based on ClickHouse SQL. You can query your data through the dashboard, SDK, or REST API."
+---
+
+### Available tables
+
+- `runs`: contains all task run data including status, timing, costs, and metadata
+- `metrics`: contains metrics data for your runs including CPU, memory, and your custom metrics
+
+### `metrics` table columns
+
+| Column | Type | Description |
+| :--- | :--- | :--- |
+| `metric_name` | string | Metric identifier (e.g., `process.cpu.utilization`) |
+| `metric_type` | string | `gauge`, `sum`, or `histogram` |
+| `value` | number | The observed value |
+| `bucket_start` | datetime | 10-second aggregation bucket start time |
+| `run_id` | string | Associated run ID |
+| `task_identifier` | string | Task slug |
+| `attempt_number` | number | Attempt number |
+| `machine_id` | string | Machine that produced the metric |
+| `machine_name` | string | Machine preset (e.g., `small-1x`) |
+| `worker_version` | string | Worker version |
+| `environment_type` | string | `PRODUCTION`, `STAGING`, `DEVELOPMENT`, `PREVIEW` |
+| `attributes` | json | Raw JSON attributes for custom data |
+
+See [Logging, tracing & metrics](/logging#automatic-system-and-runtime-metrics) for the full list of automatically collected metrics and how to create custom metrics.
+
+### `prettyFormat()`
+
+Use `prettyFormat()` to format metric values for display:
+
+```sql
+SELECT
+  timeBucket(),
+  prettyFormat(avg(value), 'bytes') AS avg_memory
+FROM metrics
+WHERE metric_name = 'process.memory.usage'
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000
+```
+
+Available format types: `bytes`, `percent`, `duration`, `durationSeconds`, `quantity`, `costInDollars`.
+
+## Using the Query dashboard
+
+Navigate to the Query page to write and execute queries. The dashboard provides:
+
+- **AI-powered query generation** - Describe what you want in natural language
+- **Syntax highlighting** - SQL syntax highlighting for better readability
+- **Query history** - Access your previous queries
+- **Interactive help** - Built-in documentation for TRQL syntax and functions
+- **Export options** - Download results as JSON or CSV
+
+![The Query dashboard](/images/query-chart-usage-percentiles.png)
+
+## Querying from the SDK
+
+Use `query.execute()` to run TRQL queries programmatically from your backend code:
+
+```typescript
+import { query } from "@trigger.dev/sdk";
+
+// Basic query with defaults (environment scope, json format)
+const result = await query.execute("SELECT run_id, status FROM runs LIMIT 10");
+console.log(result.results); // Array<Record<string, any>>
+```
+
+### Type-safe queries
+
+Use the `QueryTable` type for nice inferred types in your query results:
+
+```typescript
+import { query, type QueryTable } from "@trigger.dev/sdk";
+
+// Type-safe query using QueryTable with specific columns
+const typedResult = await query.execute<QueryTable<"runs", "run_id" | "status" | "triggered_at">>(
+  "SELECT run_id, status, triggered_at FROM runs LIMIT 10"
+);
+
+typedResult.results.forEach((row) => {
+  console.log(row.run_id, row.status); // Fully typed!
+});
+```
+
+### Query options
+
+```typescript
+import { query } from "@trigger.dev/sdk";
+
+const result = await query.execute("SELECT COUNT(*) as count FROM runs", {
+  // Scope: "environment" (default), "project", or "organization"
+  scope: "project",
+  // Time period using shorthand (e.g., "7d", "30d", "1h")
+  period: "7d",
+  // Or use explicit time range
+  // from: new Date("2024-01-01"),
+  // to: new Date("2024-01-31"),
+
+  // Response format: "json" (default) or "csv"
+  format: "json",
+});
+```
+
+### CSV export
+
+Export query results as CSV by setting `format: "csv"`:
+
+```typescript
+const csvResult = await query.execute("SELECT run_id, status, triggered_at FROM runs", {
+  format: "csv",
+  period: "7d",
+});
+
+const lines = csvResult.results.split("\n");
+console.log(lines[0]); // CSV header row
+```
+
+## Querying from the REST API
+
+Execute queries via HTTP POST to `/api/v1/query`:
+
+```sh
+curl -X POST https://api.trigger.dev/api/v1/query \
+  -H "Authorization: Bearer YOUR_SECRET_KEY" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "query": "SELECT run_id, status FROM runs LIMIT 10",
+    "scope": "environment",
+    "period": "7d",
+    "format": "json"
+  }'
+```
+
+See the [API reference](/management/query/execute) for full details.
+
+## TRQL syntax guide
+
+### Basic queries
+
+Select columns from a table:
+
+```sql
+SELECT run_id, task_identifier, status
+FROM runs
+LIMIT 10
+```
+
+Alias columns with `AS`:
+
+```sql
+SELECT task_identifier AS task, count() AS total
+FROM runs
+GROUP BY task
+```
+
+### Using \*
+
+Note that when you use `SELECT *` we don't return all the columns, we only return the core columns. This is for performance reasons (the underlying ClickHouse database is columnar and selecting lots of columns isn't efficient).
+
+You should specify the columns you want to return.
+
+### Filtering with WHERE
+
+Use comparison operators:
+
+```sql
+SELECT run_id, task_identifier FROM runs
+WHERE status = 'Failed'
+```
+
+Available operators:
+
+```sql
+-- Comparison operators
+WHERE status = 'Failed'           -- Equal
+WHERE status != 'Completed'       -- Not equal
+WHERE attempt_count > 3           -- Greater than
+WHERE attempt_count >= 3          -- Greater than or equal
+WHERE attempt_count < 5           -- Less than
+WHERE attempt_count <= 5          -- Less than or equal
+
+-- IN for multiple values
+WHERE status IN ('Failed', 'Crashed')
+
+-- LIKE for pattern matching (% = wildcard)
+WHERE task_identifier LIKE 'email%'
+
+-- ILIKE for case-insensitive matching
+WHERE task_identifier ILIKE '%send%'
+
+-- BETWEEN for ranges
+WHERE triggered_at BETWEEN '2024-01-01' AND '2024-01-31'
+
+-- NULL checks
+WHERE completed_at IS NOT NULL
+WHERE completed_at IS NULL
+
+-- Array column checks
+WHERE has(tags, 'user_12345')
+WHERE notEmpty(tags)
+WHERE hasAny(tags, array('user_12345', 'user_67890'))
+WHERE hasAll(tags, array('user_12345', 'user_67890'))
+WHERE indexOf(tags, 'user_12345') > 0
+WHERE arrayElement(tags, 1) = 'user_12345'
+```
+
+### Sorting and limiting
+
+Sort results with `ORDER BY`:
+
+```sql
+SELECT run_id, compute_cost, triggered_at
+FROM runs
+ORDER BY compute_cost DESC, triggered_at ASC
+LIMIT 50
+```
+
+### Grouping and aggregation
+
+Use `GROUP BY` with aggregate functions:
+
+```sql
+SELECT
+  task_identifier,
+  avg(value) AS avg_memory
+FROM metrics
+WHERE metric_name = 'process.memory.usage'
+GROUP BY task_identifier
+ORDER BY avg_memory DESC
+LIMIT 20
+```
+
+## Available functions
+
+TRQL provides a rich set of functions for data analysis.
+
+### Aggregate functions
+
+- `count()` - Count rows
+- `countIf(col, cond)` - Count rows matching condition
+- `countDistinct(col)` - Count unique values
+- `sum(col)` - Sum of values
+- `sumIf(col, cond)` - Sum values matching condition
+- `avg(col)` - Average of values
+- `min(col)` - Minimum value
+- `max(col)` - Maximum value
+- `median(col)` - Median value (50th percentile)
+- `quantile(p)(col)` - Value at percentile p (0-1)
+- `stddevPop(col)` - Population standard deviation
+- `stddevSamp(col)` - Sample standard deviation
+
+Example:
+
+```sql
+SELECT
+  task_identifier,
+  count() AS total_runs,
+  avg(usage_duration) AS avg_duration_ms,
+  median(usage_duration) AS median_duration_ms,
+  quantile(0.95)(usage_duration) AS p95_duration_ms
+FROM runs
+GROUP BY task_identifier
+```
+
+### Date/time functions
+
+**Time bucketing:**
+
+```sql
+-- Auto-bucket by time period based on query's time range
+SELECT timeBucket(), count() AS runs
+FROM runs
+GROUP BY timeBucket()
+```
+
+**Date extraction:**
+
+```sql
+SELECT
+  toYear(triggered_at) AS year,
+  toMonth(triggered_at) AS month,
+  toDayOfWeek(triggered_at) AS day_of_week,
+  toHour(triggered_at) AS hour
+FROM runs
+```
+
+**Date truncation:**
+
+```sql
+SELECT
+  toStartOfDay(triggered_at) AS day,
+  count() AS runs_per_day
+FROM runs
+GROUP BY day
+ORDER BY day DESC
+```
+
+**Date arithmetic:**
+
+```sql
+-- Add/subtract time
+SELECT dateAdd('day', 7, triggered_at) AS week_later
+FROM runs
+
+-- Calculate differences
+SELECT dateDiff('minute', executed_at, completed_at) AS duration_minutes
+FROM runs
+WHERE completed_at IS NOT NULL
+```
+
+Common date functions:
+
+- `now()` - Current date and time
+- `today()` - Current date
+- `toDate(dt)` - Convert to date
+- `toStartOfDay(dt)`, `toStartOfHour(dt)`, `toStartOfMonth(dt)` - Truncate to start of period
+- `formatDateTime(dt, format)` - Format datetime as string
+
+### String functions
+
+```sql
+SELECT
+  lower(status) AS status_lower,
+  upper(status) AS status_upper,
+  concat(task_identifier, '-', status) AS combined,
+  substring(run_id, 1, 8) AS short_id,
+  length(task_identifier) AS name_length
+FROM runs
+```
+
+Common string functions:
+
+- `length(s)` - String length
+- `lower(s)`, `upper(s)` - Case conversion
+- `concat(s1, s2, ...)` - Concatenate strings
+- `substring(s, offset, len)` - Extract substring
+- `trim(s)` - Remove whitespace
+- `replace(s, from, to)` - Replace occurrences
+- `startsWith(s, prefix)`, `endsWith(s, suffix)` - Check prefixes/suffixes
+
+### Conditional functions
+
+```sql
+SELECT
+  run_id,
+  if(status = 'Failed', 1, 0) AS is_failed,
+  multiIf(
+    status = 'Completed', 'ok',
+    status = 'Failed', 'bad',
+    'other'
+  ) AS status_category,
+  coalesce(completed_at, triggered_at) AS end_time
+FROM runs
+```
+
+- `if(cond, then, else)` - Conditional expression
+- `multiIf(c1, t1, c2, t2, ..., else)` - Multiple conditions (like CASE)
+- `coalesce(a, b, ...)` - First non-null value
+
+### Math functions
+
+```sql
+SELECT
+  round(compute_cost, 4) AS cost_rounded,
+  ceil(usage_duration / 1000) AS duration_seconds_up,
+  floor(usage_duration / 1000) AS duration_seconds_down,
+  abs(compute_cost) AS cost_abs
+FROM runs
+```
+
+### Array functions
+
+Useful for working with tags and other array columns:
+
+```sql
+SELECT
+  run_id,
+  tags,
+  length(tags) AS tag_count,
+  has(tags, 'user_12345') AS is_production,
+  arrayJoin(tags) AS individual_tag  -- Expand array to rows
+FROM runs
+WHERE notEmpty(tags)
+```
+
+### JSON functions
+
+Extract data from JSON columns (like runs.output, runs.error, metrics.attributes, etc.):
+
+```sql
+SELECT
+  run_id,
+  output.message AS output_message,
+  output.count AS count,
+  output.error != NULL AS has_error
+FROM runs
+WHERE output IS NOT NULL
+```
+
+## Query scopes
+
+Control what data your query can access:
+
+- **`environment`** (default) - Query runs in the current environment only
+- **`project`** - Query runs across all environments in the project
+- **`organization`** - Query runs across all projects in the organization
+
+```typescript
+// Query across all environments in a project
+const result = await query.execute("SELECT environment, count() FROM runs GROUP BY environment", {
+  scope: "project",
+});
+```
+
+## Time ranges
+
+We recommend avoiding adding `triggered_at` in the actual TRQL query. The dashboard, API, and SDK have a time filter that is applied automatically and is easier to work with. It means the queries can be executed with multiple periods easily.
+
+### Using period shorthand
+
+```typescript
+await query.execute("SELECT count() FROM runs", {
+  period: "4d", // Last 4 days
+});
+
+// Supported periods: "1h", "6h", "12h", "1d", "7d", "30d", "90d", etc.
+```
+
+### Using explicit dates
+
+```typescript
+await query.execute("SELECT count() FROM runs", {
+  from: new Date("2024-01-01"),
+  to: new Date("2024-01-31"),
+});
+
+// Or use Unix timestamps
+await query.execute("SELECT count() FROM runs", {
+  from: Date.now() - 7 * 24 * 60 * 60 * 1000, // 7 days ago
+  to: Date.now(),
+});
+```
+
+## Example queries
+
+### Failed runs (in the last 24 hours)
+
+```sql
+SELECT
+  task_identifier,
+  run_id,
+  error,
+  triggered_at
+FROM runs
+WHERE status = 'Failed'
+ORDER BY triggered_at DESC
+```
+
+With the time filter set to 24h.
+
+### Task success rate by day
+
+```sql
+SELECT
+  toDate(triggered_at) AS day,
+  task_identifier,
+  countIf(status = 'Completed') AS completed,
+  countIf(status = 'Failed') AS failed,
+  round(completed / (completed + failed) * 100, 2) AS success_rate_pct
+FROM runs
+WHERE status IN ('Completed', 'Failed')
+GROUP BY day, task_identifier
+ORDER BY day DESC, task_identifier
+```
+
+### Top 10 most expensive runs
+
+```sql
+SELECT
+  run_id,
+  task_identifier,
+  compute_cost,
+  usage_duration,
+  triggered_at
+FROM runs
+WHERE compute_cost > 0
+ORDER BY compute_cost DESC
+LIMIT 10
+```
+
+### Average compute duration over time
+
+```sql
+SELECT
+  timeBucket() AS time,
+  task_identifier,
+  avg(usage_duration) AS avg_duration_ms,
+  count() AS run_count
+FROM runs
+WHERE usage_duration IS NOT NULL
+GROUP BY time, task_identifier
+ORDER BY time ASC
+```
+
+### Runs by queue and machine
+
+```sql
+SELECT
+  queue,
+  machine,
+  count() AS run_count,
+  countIf(status = 'Completed') AS completed,
+  countIf(status = 'Failed') AS failed
+FROM runs
+GROUP BY queue, machine
+ORDER BY queue, machine
+```
+
+### CPU utilization over time
+
+Track process CPU utilization bucketed over time.
+
+```sql
+SELECT
+  timeBucket(),
+  avg(value) AS avg_cpu
+FROM metrics
+WHERE metric_name = 'process.cpu.utilization'
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000
+```
+
+### Memory usage by task (past 7d)
+
+Average process memory usage per task identifier over the last 7 days.
+
+```sql
+SELECT
+  task_identifier,
+  avg(value) AS avg_memory
+FROM metrics
+WHERE metric_name = 'process.memory.usage'
+GROUP BY task_identifier
+ORDER BY avg_memory DESC
+LIMIT 20
+```
+
+### Available metric names
+
+List all distinct metric names collected in your environment.
+
+```sql
+SELECT
+  metric_name,
+  count() AS sample_count
+FROM metrics
+GROUP BY metric_name
+ORDER BY sample_count DESC
+LIMIT 100
+```
+
+## Best practices
+
+1. **Use the built-in time filtering** - The dashboard, API, and SDK have a time filter that is applied automatically and is easier to work with. It means the queries can be executed with multiple periods easily.
+2. **Use LIMIT** - Add a `LIMIT` clause to reduce the rows returned if you don't need everything.
+3. **Use appropriate aggregations** - For large datasets, use `uniq()` instead of `uniqExact()` for approximate but faster counts
+
+## Limits
+
+We have several limits to prevent abuse and ensure performance:
+
+- **Concurrency limit**: We limit the number of concurrent queries per organization.
+- **Row limit**: We limit the number of rows returned to 10k.
+- **Time restrictions**: We limit the time period you can query.
+- **Time/Memory limit**: We limit the memory a query can use and the time it can run for. As well as other limits like AST complexity.
+
+See [Limits](/limits) for current quota details.
diff --git a/docs/introduction.mdx b/docs/introduction.mdx
index c8ed0f34802..383040de145 100644
--- a/docs/introduction.mdx
+++ b/docs/introduction.mdx
@@ -7,13 +7,17 @@ mode: "center"
 
 <CardGroup cols={2}>
   <Card title="Quick start" img="/images/intro-quickstart.jpg" href="/quick-start">
-    Get started with Trigger.dev in 3 minutes
+    Get started with Trigger.dev and run your first task in 3 minutes
   </Card>
-  <Card title="Examples" img="/images/intro-examples.jpg" href="/guides/introduction#example-tasks">
-    Explore dozens of examples tasks to use in your own projects
+  <Card
+    title="Guides, frameworks & examples"
+    img="/images/intro-examples.jpg"
+    href="/guides/introduction#example-tasks"
+  >
+    Browse our wide range of guides, frameworks and example projects
   </Card>
-  <Card title="Frameworks" img="/images/intro-frameworks.jpg" href="/guides/introduction#frameworks">
-    Learn how to use Trigger.dev with your favorite frameworks
+  <Card title="Building with AI" img="/images/intro-ai.jpg" href="/building-with-ai">
+    Learn how to build Trigger.dev projects using AI coding assistants
   </Card>
   <Card title="Video walkthrough" img="/images/intro-video.jpg" href="/video-walkthrough">
     Watch an end-to-end demo of Trigger.dev in 10 minutes
@@ -24,7 +28,7 @@ mode: "center"
 
 Trigger.dev is an open source background jobs framework that lets you write reliable workflows in plain async code. Run long-running AI tasks, handle complex background jobs, and build AI agents with built-in queuing, automatic retries, and real-time monitoring. No timeouts, elastic scaling, and zero infrastructure management required.
 
-We provide everything you need to build and manage background tasks: a CLI and SDK for writing tasks in your existing codebase, support for both [regular](/tasks/overview) and [scheduled](/tasks/scheduled) tasks, full observability through our dashboard, and a [Realtime API](/realtime) with [React hooks](/frontend/react-hooks#realtime-hooks) for showing task status in your frontend. You can use [Trigger.dev Cloud](https://cloud.trigger.dev) or [self-host](/open-source-self-hosting) on your own infrastructure.
+We provide everything you need to build and manage background tasks: a CLI and SDK for writing tasks in your existing codebase, support for both [regular](/tasks/overview) and [scheduled](/tasks/scheduled) tasks, full observability through our dashboard, and a [Realtime API](/realtime) with [React hooks](/realtime/react-hooks#realtime-hooks) for showing task status in your frontend. You can use [Trigger.dev Cloud](https://cloud.trigger.dev) or [self-host](/self-hosting/overview) on your own infrastructure.
 
 ## Learn the concepts
 
@@ -39,7 +43,8 @@ We provide everything you need to build and manage background tasks: a CLI and S
     Runs are the instances of tasks that are executed. Learn how they work.
   </Card>
   <Card title="API keys" icon="key" href="/apikeys" color="#EAEA08">
-    API keys are used to authenticate requests to the Trigger.dev API. Learn how to create and use them.
+    API keys are used to authenticate requests to the Trigger.dev API. Learn how to create and use
+    them.
   </Card>
 </CardGroup>
 
@@ -52,55 +57,126 @@ We provide everything you need to build and manage background tasks: a CLI and S
   <Card title="Realtime API" icon="loader" href="/realtime" color="#22C55E">
     The Realtime API allows you to trigger tasks and get the status of runs.
   </Card>
-  <Card title="React hooks" icon="react" href="/frontend/react-hooks" color="#3B82F6">
+  <Card title="React hooks" icon="react" href="/realtime/react-hooks" color="#3B82F6">
     React hooks are a way to show task status in your frontend.
   </Card>
   <Card title="Waits" icon="calendar-clock" href="/wait" color="#F59E0B">
     Waits are a way to wait for a task to finish before continuing.
   </Card>
-  <Card title="Errors and retries" icon="message-exclamation" href="/errors-retrying" color="#F43F5E">
+  <Card
+    title="Errors and retries"
+    icon="message-exclamation"
+    href="/errors-retrying"
+    color="#F43F5E"
+  >
     Learn how to handle errors and retries.
   </Card>
   <Card title="Concurrency & Queues" icon="line-height" href="/queue-concurrency" color="#D946EF">
     Configure what you want to happen when there is more than one run at a time.
   </Card>
+  <Card
+    title="Wait for token (human-in-the-loop)"
+    icon="hand"
+    href="/wait-for-token"
+    color="#EAEA08"
+  >
+    Pause runs until a token is completed via an approval workflow.
+  </Card>
+  <Card title="Build extensions" icon="gear" href="/config/extensions/overview" color="#22C55E">
+    Customize the build process or the resulting bundle and container image.
+  </Card>
 </CardGroup>
 
+## Explore by build extension
+
+| Extension             | What it does                                                 | Docs                                                   |
+| :-------------------- | :----------------------------------------------------------- | :----------------------------------------------------- |
+| prismaExtension       | Use Prisma with Trigger.dev                                  | [Learn more](/config/extensions/prismaExtension)       |
+| pythonExtension       | Execute Python scripts in Trigger.dev                        | [Learn more](/config/extensions/pythonExtension)       |
+| playwright            | Use Playwright with Trigger.dev                              | [Learn more](/config/extensions/playwright)            |
+| puppeteer             | Use Puppeteer with Trigger.dev                               | [Learn more](/config/extensions/puppeteer)             |
+| lightpanda            | Use Lightpanda with Trigger.dev                              | [Learn more](/config/extensions/lightpanda)            |
+| ffmpeg                | Use FFmpeg with Trigger.dev                                  | [Learn more](/config/extensions/ffmpeg)                |
+| aptGet                | Install system packages with aptGet                          | [Learn more](/config/extensions/aptGet)                |
+| additionalFiles       | Copy additional files to the build directory                 | [Learn more](/config/extensions/additionalFiles)       |
+| additionalPackages    | Include additional packages in the build                     | [Learn more](/config/extensions/additionalPackages)    |
+| syncEnvVars           | Automatically sync environment variables to Trigger.dev      | [Learn more](/config/extensions/syncEnvVars)           |
+| esbuildPlugin         | Add existing or custom esbuild plugins to your build process | [Learn more](/config/extensions/esbuildPlugin)         |
+| emitDecoratorMetadata | Support for the emitDecoratorMetadata TypeScript compiler    | [Learn more](/config/extensions/emitDecoratorMetadata) |
+| audioWaveform         | Support for Audio Waveform in your project                   | [Learn more](/config/extensions/audioWaveform)         |
+
 ## Explore by example
 
 <CardGroup cols={3}>
-  <Card title="FFmpeg" img="/images/intro-ffmpeg.jpg" href="/guides/examples/ffmpeg-video-processing"/>
-  <Card title="Fal.ai" img="/images/intro-fal.jpg" href="/guides/examples/fal-ai-image-to-cartoon"/>
-  <Card title="Puppeteer" img="/images/intro-puppeteer.jpg" href="/guides/examples/puppeteer"/>
-  <Card title="LibreOffice" img="/images/intro-libreoffice.jpg" href="/guides/examples/libreoffice-pdf-conversion"/>
-  <Card title="OpenAI" img="/images/intro-openai.jpg" href="/guides/examples/open-ai-with-retrying"/>
-  <Card title="Browserbase" img="/images/intro-browserbase.jpg" href="/guides/examples/scrape-hacker-news"/>
-  <Card title="Sentry" img="/images/intro-sentry.jpg" href="/guides/examples/sentry-error-tracking"/>
-  <Card title="Resend" img="/images/intro-resend.jpg" href="/guides/examples/resend-email-sequence"/>
-  <Card title="Vercel AI SDK" img="/images/intro-vercel.jpg" href="/guides/examples/vercel-ai-sdk"/>
-  <Card title="Sharp" img="/images/intro-sharp.jpg" href="/guides/examples/sharp-image-processing"/>
-  <Card title="Deepgram" img="/images/intro-deepgram.jpg" href="/guides/examples/deepgram-transcribe-audio"/>
-  <Card title="Supabase" img="/images/intro-supabase.jpg" href="/guides/examples/supabase-database-operations"/>
-  <Card title="DALL•E" img="/images/intro-openai.jpg" href="/guides/examples/dall-e3-generate-image"/>
-  <Card title="Firecrawl" img="/images/intro-firecrawl.jpg" href="/guides/examples/firecrawl-url-crawl"/>
+  <Card
+    title="FFmpeg"
+    img="/images/intro-ffmpeg.jpg"
+    href="/guides/examples/ffmpeg-video-processing"
+  />
+  <Card
+    title="Fal.ai"
+    img="/images/intro-fal.jpg"
+    href="/guides/examples/fal-ai-image-to-cartoon"
+  />
+  <Card title="Puppeteer" img="/images/intro-puppeteer.jpg" href="/guides/examples/puppeteer" />
+  <Card
+    title="LibreOffice"
+    img="/images/intro-libreoffice.jpg"
+    href="/guides/examples/libreoffice-pdf-conversion"
+  />
+  <Card
+    title="OpenAI"
+    img="/images/intro-openai.jpg"
+    href="/guides/examples/open-ai-with-retrying"
+  />
+  <Card
+    title="Browserbase"
+    img="/images/intro-browserbase.jpg"
+    href="/guides/examples/scrape-hacker-news"
+  />
+  <Card
+    title="Sentry"
+    img="/images/intro-sentry.jpg"
+    href="/guides/examples/sentry-error-tracking"
+  />
+  <Card
+    title="Resend"
+    img="/images/intro-resend.jpg"
+    href="/guides/examples/resend-email-sequence"
+  />
+  <Card
+    title="Vercel AI SDK"
+    img="/images/intro-vercel.jpg"
+    href="/guides/examples/vercel-ai-sdk"
+  />
+  <Card
+    title="Sharp"
+    img="/images/intro-sharp.jpg"
+    href="/guides/examples/sharp-image-processing"
+  />
+  <Card
+    title="Deepgram"
+    img="/images/intro-deepgram.jpg"
+    href="/guides/examples/deepgram-transcribe-audio"
+  />
+  <Card
+    title="Supabase"
+    img="/images/intro-supabase.jpg"
+    href="/guides/examples/supabase-database-operations"
+  />
+  <Card
+    title="DALL•E"
+    img="/images/intro-openai.jpg"
+    href="/guides/examples/dall-e3-generate-image"
+  />
+  <Card
+    title="Firecrawl"
+    img="/images/intro-firecrawl.jpg"
+    href="/guides/examples/firecrawl-url-crawl"
+  />
+  <Card title="Lightpanda" img="/images/intro-lightpanda.jpg" href="/guides/examples/lightpanda" />
 </CardGroup>
 
-## Explore by build extension
-
-| Extension | What it does | Docs |
-|:----------|:------------|:--------------|
-| prismaExtension | Use Prisma with Trigger.dev | [Learn more](/config/extensions/prismaExtension) |
-| pythonExtension | Execute Python scripts in Trigger.dev | [Learn more](/config/extensions/pythonExtension) |
-| puppeteer | Use Puppeteer with Trigger.dev | [Learn more](/config/extensions/puppeteer) |
-| ffmpeg | Use FFmpeg with Trigger.dev | [Learn more](/config/extensions/ffmpeg) |
-| aptGet | Install system packages with aptGet | [Learn more](/config/extensions/aptGet) |
-| additionalFiles | Copy additional files to the build directory | [Learn more](/config/extensions/additionalFiles) |
-| additionalPackages | Include additional packages in the build | [Learn more](/config/extensions/additionalPackages) |
-| syncEnvVars | Automatically sync environment variables to Trigger.dev | [Learn more](/config/extensions/syncEnvVars) |
-| esbuildPlugin | Add existing or custom esbuild plugins to your build process | [Learn more](/config/extensions/esbuildPlugin) |
-| emitDecoratorMetadata | Support for the emitDecoratorMetadata TypeScript compiler | [Learn more](/config/extensions/emitDecoratorMetadata) |
-| audioWaveform | Support for Audio Waveform in your project | [Learn more](/config/extensions/audioWaveform) |
-
 ## Getting help
 
 We'd love to hear from you or give you a hand getting started. Here are some ways to get in touch with us.
diff --git a/docs/limits.mdx b/docs/limits.mdx
index 51e0dddcc53..d507d1e0c91 100644
--- a/docs/limits.mdx
+++ b/docs/limits.mdx
@@ -5,6 +5,8 @@ description: "There are some hard and soft limits that you might hit."
 
 import RateLimitHitUseBatchTrigger from "/snippets/rate-limit-hit-use-batchtrigger.mdx";
 
+You can view your current limits, quotas, and rate limit usage in real-time by visiting the **Limits** page in the dashboard (accessible from the left sidebar). This page shows current rate limit token availability, quota usage, and plan features for your organization.
+
 ## Concurrency limits
 
 | Pricing tier | Limit                |
@@ -13,7 +15,7 @@ import RateLimitHitUseBatchTrigger from "/snippets/rate-limit-hit-use-batchtrigg
 | Hobby        | 25 concurrent runs   |
 | Pro          | 100+ concurrent runs |
 
-Additional bundles above the Pro tier are available for $10/month per 100 concurrent runs. Contact us via [email](https://trigger.dev/contact) or [Discord](https://trigger.dev/discord) to request more.
+Extra concurrency above the Pro tier limit is available via the dashboard. Click the "Concurrency" page from the left sidebar when on the Pro plan to purchase more.
 
 ## Rate limits
 
@@ -23,6 +25,8 @@ Generally speaking each SDK call is an API call.
 | :---- | :------------------------ |
 | API   | 1,500 requests per minute |
 
+You can request a higher rate limit from us if you're on a paid plan.
+
 <RateLimitHitUseBatchTrigger />
 
 ## Queued tasks
@@ -51,6 +55,14 @@ If you add them [dynamically using code](/management/schedules/create) make sure
 
 If you're creating schedules for your user you will definitely need to request more schedules from us.
 
+## Projects
+
+| Pricing tier | Limit               |
+| :----------- | :------------------ |
+| All tiers    | 10 per organization |
+
+Each project receives its own concurrency allocation. If you need to support multiple tenants with the same codebase but different environment variables, see the [Multi-tenant applications](/deploy-environment-variables#multi-tenant-applications) section for a recommended workaround.
+
 ## Preview branches
 
 | Pricing tier | Limit                |
@@ -69,24 +81,54 @@ Additional bundles above the Pro tier are available for $10/month per preview br
 | Hobby        | 50 concurrent connections   |
 | Pro          | 500+ concurrent connections |
 
-Additional bundles are available for $10/month per 100 realtime connections. Contact us via [email](https://trigger.dev/contact) or [Discord](https://trigger.dev/discord) to request more.
+Additional bundles are available for $10/month per 100 concurrent connections. Contact us via [email](https://trigger.dev/contact) or [Discord](https://trigger.dev/discord) to request more.
 
 ## Task payloads and outputs
 
-| Limit                  | Details                                       |
-| :--------------------- | :-------------------------------------------- |
-| Single trigger payload | Must not exceed 3MB                           |
-| Batch trigger payload  | The total of all payloads must not exceed 5MB |
-| Task outputs           | Must not exceed 10MB                          |
+| Limit                  | Details                                                            |
+| :--------------------- | :----------------------------------------------------------------- |
+| Single trigger payload | Must not exceed 3MB                                                |
+| Batch trigger payload  | Each item can be up to 3MB (SDK 4.3.1+). Prior: 1MB total combined |
+| Task outputs           | Must not exceed 10MB                                               |
 
 Payloads and outputs that exceed 512KB will be offloaded to object storage and a presigned URL will be provided to download the data when calling `runs.retrieve`. You don't need to do anything to handle this in your tasks however, as we will transparently upload/download these during operation.
 
 ## Batch size
 
-A single batch can have a maximum of 500 items.
+A single batch can have a maximum of 1,000 items with SDK 4.3.1+. Prior versions are limited to 500 items.
 
 <SoftLimit />
 
+## Batch trigger rate limits
+
+Batch triggering uses a token bucket algorithm to rate limit the number of runs you can trigger per environment. Each run in a batch consumes one token.
+
+| Pricing tier | Bucket size | Refill rate           |
+| :----------- | :---------- | :-------------------- |
+| Free         | 1,200 runs  | 100 runs every 10 sec |
+| Hobby        | 5,000 runs  | 500 runs every 5 sec  |
+| Pro          | 5,000 runs  | 500 runs every 5 sec  |
+
+**How it works**: You can burst up to your bucket size, then tokens refill at the specified rate. For example, a Free user can trigger 1,200 runs immediately, then must wait for tokens to refill (100 runs become available every 10 seconds).
+
+<Note>
+  When you hit batch rate limits, the SDK throws a `BatchTriggerError` with `isRateLimited: true`.
+  See [Handling batch trigger errors](/triggering#handling-batch-trigger-errors) for how to detect
+  and react to rate limits in your code.
+</Note>
+
+## Batch processing concurrency
+
+The number of batches that can be processed concurrently per environment.
+
+| Pricing tier | Limit                 |
+| :----------- | :-------------------- |
+| Free         | 1 concurrent batch    |
+| Hobby        | 10 concurrent batches |
+| Pro          | 10 concurrent batches |
+
+This limits how many batches can have their items actively being processed into runs at the same time.
+
 ## Log retention
 
 | Pricing tier | Limit   |
@@ -136,7 +178,7 @@ We limit the size of logs to prevent oversized data potentially causing issues.
 
 ## Alerts
 
-An alert destination is a single email address, Slack channel, or webhook URL that you want to send alerts to. 
+An alert destination is a single email address, Slack channel, or webhook URL that you want to send alerts to.
 
 | Pricing tier | Limit                   |
 | :----------- | :---------------------- |
@@ -146,6 +188,36 @@ An alert destination is a single email address, Slack channel, or webhook URL th
 
 If you're on the Pro plan and need more than the plan limit, you can request more by contacting us via [email](https://trigger.dev/contact) or [Discord](https://trigger.dev/discord).
 
+## Query
+
+Query execution is subject to the following limits:
+
+| Limit              | Details               |
+| :----------------- | :-------------------- |
+| Max execution time | 10 seconds per query  |
+| Max result rows    | 10,000 rows per query |
+| Concurrent queries | 3 per project         |
+
+### Query lookback period
+
+The maximum time range a query can look back is based on your plan:
+
+| Pricing tier | Limit   |
+| :----------- | :------ |
+| Free         | 1 day   |
+| Hobby        | 7 days  |
+| Pro          | 30 days |
+
+If your query's time range exceeds your plan's lookback limit, it will be automatically clipped to the maximum allowed period.
+
+## Metric widget concurrency
+
+The number of metric widgets that can be queried concurrently per project.
+
+| Limit                     | Details        |
+| :------------------------ | :------------- |
+| Concurrent widget queries | 30 per project |
+
 ## Machines
 
 The default machine is `small-1x` which has 0.5 vCPU and 0.5 GB of RAM. You can optionally configure a higher spec machine which will increase the cost of running the task but can also improve the performance of the task if it is CPU or memory bound.
@@ -160,4 +232,4 @@ See the [machine configurations](/machines#machine-configurations) for more deta
 | Hobby        | 5 team members   |
 | Pro          | 25+ team members |
 
-Additional seats are available for $20/month per seat. Contact us via [email](https://trigger.dev/contact) or [Discord](https://trigger.dev/discord) to request more.
\ No newline at end of file
+Additional seats are available for $20/month per seat. Contact us via [email](https://trigger.dev/contact) or [Discord](https://trigger.dev/discord) to request more.
diff --git a/docs/logging.mdx b/docs/logging.mdx
index 90ead35b944..35587213cd2 100644
--- a/docs/logging.mdx
+++ b/docs/logging.mdx
@@ -1,6 +1,6 @@
 ---
-title: "Logging and tracing"
-description: "How to use the built-in logging and tracing system."
+title: "Logging, tracing & metrics"
+description: "How to use the built-in logging, tracing, and metrics system."
 ---
 
 ![The run log](/images/run-log.png)
@@ -16,7 +16,7 @@ You can use `console.log()`, `console.error()`, etc as normal and they will be s
 We recommend that you use our `logger` object which creates structured logs. Structured logs will make it easier for you to search the logs to quickly find runs.
 
 ```ts /trigger/logging.ts
-import { task, logger } from "@trigger.dev/sdk/v3";
+import { task, logger } from "@trigger.dev/sdk";
 
 export const loggingExample = task({
   id: "logging-example",
@@ -54,7 +54,7 @@ You can [add instrumentations](/config/config-file#instrumentations). The Prisma
 If you want to add custom traces to your code, you can use the `logger.trace` function. It will create a new OTEL trace and you can set attributes on it.
 
 ```ts
-import { logger, task } from "@trigger.dev/sdk/v3";
+import { logger, task } from "@trigger.dev/sdk";
 
 export const customTrace = task({
   id: "custom-trace",
@@ -77,3 +77,119 @@ export const customTrace = task({
   },
 });
 ```
+
+## Metrics
+
+Trigger.dev collects system and runtime metrics automatically for deployed tasks, and provides an API for recording custom metrics using OpenTelemetry.
+
+You can view metrics in the [Metrics dashboards](/insights/metrics), query them with [TRQL](/insights/query), and export them to external services via [telemetry exporters](/config/config-file#telemetry-exporters).
+
+### Custom metrics API
+
+Import `otel` from `@trigger.dev/sdk` and use the standard OpenTelemetry Metrics API to create custom instruments.
+
+Create instruments **at module level** (outside the task `run` function) so they are reused across runs:
+
+```ts /trigger/metrics.ts
+import { task, logger, otel } from "@trigger.dev/sdk";
+
+// Create a meter — instruments are created once at module level
+const meter = otel.metrics.getMeter("my-app");
+
+const itemsProcessed = meter.createCounter("items.processed", {
+  description: "Total number of items processed",
+  unit: "items",
+});
+
+const itemDuration = meter.createHistogram("item.duration", {
+  description: "Time spent processing each item",
+  unit: "ms",
+});
+
+const queueDepth = meter.createUpDownCounter("queue.depth", {
+  description: "Current queue depth",
+  unit: "items",
+});
+
+export const processQueue = task({
+  id: "process-queue",
+  run: async (payload: { items: string[] }) => {
+    queueDepth.add(payload.items.length);
+
+    for (const item of payload.items) {
+      const start = performance.now();
+
+      // ... process item ...
+
+      const elapsed = performance.now() - start;
+
+      itemsProcessed.add(1, { "item.type": "order" });
+      itemDuration.record(elapsed, { "item.type": "order" });
+      queueDepth.add(-1);
+    }
+
+    logger.info("Queue processed", { count: payload.items.length });
+  },
+});
+```
+
+#### Available instrument types
+
+| Instrument | Method | Use case |
+| :--- | :--- | :--- |
+| Counter | `meter.createCounter()` | Monotonically increasing values (items processed, requests sent) |
+| Histogram | `meter.createHistogram()` | Distributions of values (durations, sizes) |
+| UpDownCounter | `meter.createUpDownCounter()` | Values that go up and down (queue depth, active connections) |
+
+All instruments accept optional attributes when recording values. Attributes let you break down metrics by dimension (e.g., by item type, status, or region).
+
+### Automatic system and runtime metrics
+
+Trigger.dev automatically collects the following metrics for deployed tasks. No configuration is needed. Requires SDK version **4.4.1 or later**.
+
+| Metric name | Type | Unit | Description |
+| :--- | :--- | :--- | :--- |
+| `process.cpu.utilization` | gauge | ratio | Process CPU usage (0-1) |
+| `process.cpu.time` | counter | seconds | CPU time consumed |
+| `process.memory.usage` | gauge | bytes | Process memory usage |
+| `nodejs.event_loop.utilization` | gauge | ratio | Event loop utilization (0-1) |
+| `nodejs.event_loop.delay.p95` | gauge | seconds | Event loop delay p95 |
+| `nodejs.event_loop.delay.max` | gauge | seconds | Event loop delay max |
+| `nodejs.heap.used` | gauge | bytes | V8 heap used |
+| `nodejs.heap.total` | gauge | bytes | V8 heap total |
+
+<Note>
+In dev mode (`trigger dev`), only `process.*` and custom metrics are available.
+</Note>
+
+### Context attributes
+
+All metrics (both automatic and custom) are tagged with run context so you can filter and group them:
+
+- `run_id` — the run that produced the metric
+- `task_identifier` — the task slug
+- `attempt_number` — the attempt number
+- `machine_name` — the machine preset (e.g., `small-1x`)
+- `worker_version` — the deployed worker version
+- `environment_type` — `PRODUCTION`, `STAGING`, `DEVELOPMENT`, or `PREVIEW`
+
+### Querying metrics
+
+Use [TRQL](/insights/query) to query metrics data. For example, to see average CPU utilization over time:
+
+```sql
+SELECT
+  timeBucket(),
+  avg(value) AS avg_cpu
+FROM metrics
+WHERE metric_name = 'process.cpu.utilization'
+GROUP BY timeBucket
+ORDER BY timeBucket
+LIMIT 1000
+```
+
+See the [Query page](/insights/query#metrics-table-columns) for the full `metrics` table schema.
+
+### Exporting metrics
+
+You can send metrics to external observability services (Axiom, Honeycomb, Datadog, etc.) by configuring [telemetry exporters](/config/config-file#telemetry-exporters) in your `trigger.config.ts`.
diff --git a/docs/machines.mdx b/docs/machines.mdx
index 486b4fef810..b3c08c177ed 100644
--- a/docs/machines.mdx
+++ b/docs/machines.mdx
@@ -6,7 +6,7 @@ description: "Configure the number of vCPUs and GBs of RAM you want the task to
 The `machine` configuration is optional. Using higher spec machines will increase the cost of running the task but can also improve the performance of the task if it is CPU or memory bound.
 
 ```ts /trigger/heavy-task.ts
-import {  task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const heavyTask = task({
   id: "heavy-task",
@@ -20,7 +20,7 @@ export const heavyTask = task({
 The default machine is `small-1x` which has 0.5 vCPU and 0.5 GB of RAM. You can change the default machine in your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import type { TriggerConfig } from "@trigger.dev/sdk/v3";
+import type { TriggerConfig } from "@trigger.dev/sdk";
 
 export const config: TriggerConfig = {
   machine: "small-2x",
@@ -30,15 +30,15 @@ export const config: TriggerConfig = {
 
 ## Machine configurations
 
-| Preset              | vCPU | Memory | Disk space |
-| :------------------ | :--- | :----- | :--------- |
-| micro               | 0.25 | 0.25   | 10GB       |
-| small-1x (default)  | 0.5  | 0.5    | 10GB       |
-| small-2x            | 1    | 1      | 10GB       |
-| medium-1x           | 1    | 2      | 10GB       |
-| medium-2x           | 2    | 4      | 10GB       |
-| large-1x            | 4    | 8      | 10GB       |
-| large-2x            | 8    | 16     | 10GB       |
+| Preset             | vCPU | Memory | Disk space |
+| :----------------- | :--- | :----- | :--------- |
+| micro              | 0.25 | 0.25   | 10GB       |
+| small-1x (default) | 0.5  | 0.5    | 10GB       |
+| small-2x           | 1    | 1      | 10GB       |
+| medium-1x          | 1    | 2      | 10GB       |
+| medium-2x          | 2    | 4      | 10GB       |
+| large-1x           | 4    | 8      | 10GB       |
+| large-2x           | 8    | 16     | 10GB       |
 
 You can view the Trigger.dev cloud pricing for these machines [here](https://trigger.dev/pricing#computePricing).
 
@@ -60,15 +60,856 @@ This is useful when you know that a certain payload will require more memory tha
 
 Sometimes you might see one of your runs fail with an "Out Of Memory" error.
 
-> TASK_PROCESS_OOM_KILLED. Your task ran out of memory. Try increasing the machine specs. If this doesn't fix it there might be a memory leak.
+> TASK_PROCESS_OOM_KILLED. Your run was terminated due to exceeding the machine's memory limit. Try increasing the machine preset in your task options or replay using a larger machine.
 
-We automatically detect common Out Of Memory errors, including when ffmpeg throws an error because it ran out of memory.
+We automatically detect common Out Of Memory errors:
+
+- When using Node.js, if the V8 heap limit is exceeded (this can happen when creating large long-lived objects)
+- When the entire process exceeds the memory limit of the machine the run is executing on.
+- When a child process, such as ffmpeg, causes the memory limit of the machine to be exceeded, and exits with a non-zero code.
+
+### Memory/Resource monitoring
+
+To better understand why an OOM error occurred, we've published a helper class that will log memory debug information at regular intervals.
+
+First, add this `ResourceMonitor` class to your project:
+
+<Accordion title="View ResourceMonitor class">
+
+```ts /src/resourceMonitor.ts
+import { promisify } from "node:util";
+import { exec } from "node:child_process";
+import os from "node:os";
+import { promises as fs } from "node:fs";
+import { type Context, logger } from "@trigger.dev/sdk";
+import { getHeapStatistics } from "node:v8";
+import { PerformanceObserver, constants } from "node:perf_hooks";
+
+const execAsync = promisify(exec);
+
+export type DiskMetrics = {
+  total: number;
+  used: number;
+  free: number;
+  percentUsed: number;
+  warning?: string;
+};
+
+export type MemoryMetrics = {
+  total: number;
+  free: number;
+  used: number;
+  percentUsed: number;
+};
+
+export type NodeProcessMetrics = {
+  memoryUsage: number;
+  memoryUsagePercent: number;
+  heapUsed: number;
+  heapSizeLimit: number;
+  heapUsagePercent: number;
+  availableHeap: number;
+  isNearHeapLimit: boolean;
+};
+
+export type TargetProcessMetrics = {
+  method: string;
+  processName: string;
+  count: number;
+  processes: ProcessInfo[];
+  averages: {
+    cpu: number;
+    memory: number;
+    rss: number;
+    vsz: number;
+  } | null;
+  totals: {
+    cpu: number;
+    memory: number;
+    rss: number;
+    vsz: number;
+  } | null;
+};
+
+export type ProcessMetrics = {
+  node: NodeProcessMetrics;
+  targetProcess: TargetProcessMetrics | null;
+};
+
+type GCSummary = {
+  count: number;
+  totalDuration: number; // ms
+  avgDuration: number; // ms
+  maxDuration: number; // ms
+  kinds: Record<
+    string,
+    {
+      // breakdown by kind
+      count: number;
+      totalDuration: number;
+      avgDuration: number;
+      maxDuration: number;
+    }
+  >;
+};
+
+type ProcessInfo = {
+  user: string;
+  pid: number;
+  cpu: number;
+  mem: number;
+  vsz: number;
+  rss: number;
+  command: string;
+};
+
+export type SystemMetrics = {
+  disk: DiskMetrics;
+  memory: MemoryMetrics;
+};
+
+export type ResourceMonitorConfig = {
+  dirName?: string;
+  processName?: string;
+  ctx: Context;
+  compactLogging?: boolean;
+};
+
+// Constants
+const DISK_LIMIT_GB = 10;
+const DISK_LIMIT_BYTES = DISK_LIMIT_GB * 1024 * 1024 * 1024; // 10Gi in bytes
+
+export class ResourceMonitor {
+  private logInterval: NodeJS.Timeout | null = null;
+  private logger: typeof logger;
+  private dirName: string;
+  private processName: string | undefined;
+  private ctx: Context;
+  private verbose: boolean;
+  private compactLogging: boolean;
+  private gcObserver: PerformanceObserver | null = null;
+  private bufferedGcEntries: PerformanceEntry[] = [];
+
+  constructor(config: ResourceMonitorConfig) {
+    this.logger = logger;
+    this.dirName = config.dirName ?? "/tmp";
+    this.processName = config.processName;
+    this.ctx = config.ctx;
+    this.verbose = true;
+    this.compactLogging = config.compactLogging ?? false;
+  }
+
+  /**
+   * Start periodic resource monitoring
+   * @param intervalMs Monitoring interval in milliseconds
+   */
+  startMonitoring(intervalMs = 10000): void {
+    if (intervalMs < 1000) {
+      intervalMs = 1000;
+      this.logger.warn("ResourceMonitor: intervalMs is less than 1000, setting to 1000");
+    }
+
+    if (this.logInterval) {
+      clearInterval(this.logInterval);
+    }
+
+    this.logInterval = setInterval(this.logResources.bind(this), intervalMs);
+
+    this.gcObserver = new PerformanceObserver((list) => {
+      this.bufferedGcEntries.push(...list.getEntries());
+    });
+
+    this.gcObserver.observe({ entryTypes: ["gc"], buffered: true });
+  }
+
+  /**
+   * Stop resource monitoring
+   */
+  stopMonitoring(): void {
+    if (this.logInterval) {
+      clearInterval(this.logInterval);
+      this.logInterval = null;
+    }
+
+    if (this.gcObserver) {
+      this.gcObserver.disconnect();
+      this.gcObserver = null;
+    }
+  }
+
+  private async logResources() {
+    try {
+      await this.logResourceSnapshot("ResourceMonitor");
+    } catch (error) {
+      this.logger.error(
+        `Resource monitoring error: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+
+  /**
+   * Get combined system metrics (disk and memory)
+   */
+  private async getSystemMetrics(): Promise<SystemMetrics> {
+    const [disk, memory] = await Promise.all([this.getDiskMetrics(), this.getMemoryMetrics()]);
+    return { disk, memory };
+  }
+
+  /**
+   * Get disk space information
+   */
+  private async getDiskMetrics(): Promise<DiskMetrics> {
+    try {
+      // Even with permission errors, du will output a total
+      const { stdout, stderr } = await execAsync(`du -sb ${this.dirName} || true`);
+
+      // Get the last line of stdout which contains the total
+      const lastLine = stdout.split("\n").filter(Boolean).pop() || "";
+      const usedBytes = parseInt(lastLine.split("\t")[0], 10);
+
+      const effectiveTotal = DISK_LIMIT_BYTES;
+      const effectiveUsed = Math.min(usedBytes, DISK_LIMIT_BYTES);
+      const effectiveFree = effectiveTotal - effectiveUsed;
+      const percentUsed = (effectiveUsed / effectiveTotal) * 100;
+
+      const metrics: DiskMetrics = {
+        total: effectiveTotal,
+        used: effectiveUsed,
+        free: effectiveFree,
+        percentUsed,
+      };
+
+      // If we had permission errors, add a warning
+      if (stderr.includes("Permission denied") || stderr.includes("cannot access")) {
+        metrics.warning = "Some directories were not accessible";
+      } else if (stderr.includes("No such file or directory")) {
+        metrics.warning = "The directory does not exist";
+      }
+
+      return metrics;
+    } catch (error) {
+      this.logger.error(
+        `Error getting disk metrics: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return {
+        free: DISK_LIMIT_BYTES,
+        total: DISK_LIMIT_BYTES,
+        used: 0,
+        percentUsed: 0,
+        warning: "Failed to measure disk usage",
+      };
+    }
+  }
+
+  /**
+   * Get memory metrics
+   */
+  private getMemoryMetrics(): MemoryMetrics {
+    const total = os.totalmem();
+    const free = os.freemem();
+    const used = total - free;
+    const percentUsed = (used / total) * 100;
+
+    return { total, free, used, percentUsed };
+  }
+
+  /**
+   * Get process-specific metrics using /proc filesystem
+   */
+  private async getProcMetrics(pids: number[]): Promise<ProcessInfo[]> {
+    return Promise.all(
+      pids.map(async (pid) => {
+        try {
+          // Read process status
+          const status = await fs.readFile(`/proc/${pid}/status`, "utf8");
+          const cmdline = await fs.readFile(`/proc/${pid}/cmdline`, "utf8");
+          const stat = await fs.readFile(`/proc/${pid}/stat`, "utf8");
+
+          // Parse VmRSS (resident set size) from status
+          const rss = parseInt(status.match(/VmRSS:\s+(\d+)/)?.[1] ?? "0", 10);
+          // Parse VmSize (virtual memory size) from status
+          const vsz = parseInt(status.match(/VmSize:\s+(\d+)/)?.[1] ?? "0", 10);
+          // Get process owner
+          const user = (await fs.stat(`/proc/${pid}`)).uid.toString();
+
+          // Parse CPU stats from /proc/[pid]/stat
+          const stats = stat.split(" ");
+          const utime = parseInt(stats[13], 10);
+          const stime = parseInt(stats[14], 10);
+          const starttime = parseInt(stats[21], 10);
+
+          // Calculate CPU percentage
+          const totalTime = utime + stime;
+          const uptime = os.uptime();
+          const hertz = 100; // Usually 100 on Linux
+          const elapsedTime = uptime - starttime / hertz;
+          const cpuUsage = 100 * (totalTime / hertz / elapsedTime);
+
+          // Calculate memory percentage against total system memory
+          const totalMem = os.totalmem();
+          const memoryPercent = (rss * 1024 * 100) / totalMem;
+
+          return {
+            user,
+            pid,
+            cpu: cpuUsage,
+            mem: memoryPercent,
+            vsz,
+            rss,
+            command: cmdline.replace(/\0/g, " ").trim(),
+          };
+        } catch (error) {
+          return null;
+        }
+      })
+    ).then((results) => results.filter((r): r is ProcessInfo => r !== null));
+  }
+
+  /**
+   * Find PIDs for a process name using /proc filesystem
+   */
+  private async findPidsByName(processName?: string): Promise<number[]> {
+    if (!processName) {
+      return [];
+    }
+
+    try {
+      const pids: number[] = [];
+      const procDirs = await fs.readdir("/proc");
+
+      for (const dir of procDirs) {
+        if (!/^\d+$/.test(dir)) continue;
+
+        const processPid = parseInt(dir, 10);
+
+        // Ignore processes that have a lower PID than our own PID
+        if (processPid <= process.pid) {
+          continue;
+        }
+
+        try {
+          const cmdline = await fs.readFile(`/proc/${dir}/cmdline`, "utf8");
+          if (cmdline.includes(processName)) {
+            pids.push(parseInt(dir, 10));
+          }
+        } catch {
+          // Ignore errors reading individual process info
+          continue;
+        }
+      }
+
+      return pids;
+    } catch {
+      return [];
+    }
+  }
+
+  /**
+   * Get process-specific metrics
+   */
+  private async getProcessMetrics(): Promise<ProcessMetrics> {
+    // Get Node.js process metrics
+    const totalMemory = os.totalmem();
+    // Convert GB to bytes (machine.memory is in GB)
+    const machineMemoryBytes = this.ctx.machine
+      ? this.ctx.machine.memory * 1024 * 1024 * 1024
+      : totalMemory;
+    const nodeMemoryUsage = process.memoryUsage();
+
+    // Node process percentage is based on machine memory if available, otherwise system memory
+    const nodeMemoryPercent = (nodeMemoryUsage.rss / machineMemoryBytes) * 100;
+    const heapStats = getHeapStatistics();
+
+    const nodeMetrics: NodeProcessMetrics = {
+      memoryUsage: nodeMemoryUsage.rss,
+      memoryUsagePercent: nodeMemoryPercent,
+      heapUsed: nodeMemoryUsage.heapUsed,
+      heapSizeLimit: heapStats.heap_size_limit,
+      heapUsagePercent: (heapStats.used_heap_size / heapStats.heap_size_limit) * 100,
+      availableHeap: heapStats.total_available_size,
+      isNearHeapLimit: heapStats.used_heap_size / heapStats.heap_size_limit > 0.8,
+    };
+
+    let method = "ps";
+
+    try {
+      let processes: ProcessInfo[] = [];
+
+      // Try ps first, fall back to /proc if it fails
+      try {
+        const { stdout: psOutput } = await execAsync(
+          `ps aux | grep ${this.processName} | grep -v grep`
+        );
+
+        if (psOutput.trim()) {
+          processes = psOutput
+            .trim()
+            .split("\n")
+            .filter((line) => {
+              const parts = line.trim().split(/\s+/);
+              const pid = parseInt(parts[1], 10);
+
+              // Ignore processes that have a lower PID than our own PID
+              return pid > process.pid;
+            })
+            .map((line) => {
+              const parts = line.trim().split(/\s+/);
+              return {
+                user: parts[0],
+                pid: parseInt(parts[1], 10),
+                cpu: parseFloat(parts[2]),
+                mem: parseFloat(parts[3]),
+                vsz: parseInt(parts[4], 10),
+                rss: parseInt(parts[5], 10),
+                command: parts.slice(10).join(" "),
+              };
+            });
+        }
+      } catch {
+        // ps failed, try /proc instead
+        method = "proc";
+        const pids = await this.findPidsByName(this.processName);
+        processes = await this.getProcMetrics(pids);
+      }
+
+      if (processes.length === 0) {
+        return {
+          node: nodeMetrics,
+          targetProcess: this.processName
+            ? {
+                method,
+                processName: this.processName,
+                count: 0,
+                processes: [],
+                averages: null,
+                totals: null,
+              }
+            : null,
+        };
+      }
+
+      // For CPU:
+      // - ps shows CPU percentage per core (e.g., 100% = 1 core)
+      // - machine.cpu is in cores (e.g., 0.5 = half a core)
+      // - we want to show percentage of allocated CPU (e.g., 100% = using all allocated CPU)
+      const availableCpu = this.ctx.machine?.cpu ?? os.cpus().length;
+      const cpuNormalizer = availableCpu * 100; // Convert to basis points for better precision with fractional CPUs
+
+      // For Memory:
+      // - ps 'mem' is already a percentage of system memory
+      // - we need to convert it to a percentage of machine memory
+      // - if machine memory is 0.5GB and system has 16GB, we multiply the percentage by 32
+      const memoryScaleFactor = this.ctx.machine ? totalMemory / machineMemoryBytes : 1;
+
+      const totals = processes.reduce(
+        (acc, proc) => ({
+          cpu: acc.cpu + proc.cpu,
+          // Scale memory percentage to machine memory
+          // TODO: test this
+          memory: acc.memory + proc.mem * memoryScaleFactor,
+          rss: acc.rss + proc.rss,
+          vsz: acc.vsz + proc.vsz,
+        }),
+        { cpu: 0, memory: 0, rss: 0, vsz: 0 }
+      );
+
+      const count = processes.length;
+
+      const averages = {
+        cpu: totals.cpu / (count * cpuNormalizer),
+        memory: totals.memory / count,
+        rss: totals.rss / count,
+        vsz: totals.vsz / count,
+      };
+
+      return {
+        node: nodeMetrics,
+        targetProcess: this.processName
+          ? {
+              method,
+              processName: this.processName,
+              count,
+              processes,
+              averages,
+              totals: {
+                cpu: totals.cpu / cpuNormalizer,
+                memory: totals.memory,
+                rss: totals.rss,
+                vsz: totals.vsz,
+              },
+            }
+          : null,
+      };
+    } catch (error) {
+      return {
+        node: nodeMetrics,
+        targetProcess: this.processName
+          ? {
+              method,
+              processName: this.processName,
+              count: 0,
+              processes: [],
+              averages: null,
+              totals: null,
+            }
+          : null,
+      };
+    }
+  }
+
+  /**
+   * Log a snapshot of current resource usage
+   */
+  async logResourceSnapshot(label = "Resource Snapshot"): Promise<void> {
+    try {
+      const payload = await this.getResourceSnapshotPayload();
+      const enhancedLabel = this.compactLogging
+        ? this.createCompactLabel(payload, label)
+        : this.createEnhancedLabel(payload, label);
+
+      if (payload.process.node.isNearHeapLimit) {
+        this.logger.warn(`${enhancedLabel}: Node is near heap limit`, payload);
+      } else {
+        this.logger.info(enhancedLabel, payload);
+      }
+    } catch (error) {
+      this.logger.error(
+        `Error logging resource snapshot: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+
+  /**
+   * Create an enhanced log label with key metrics for quick scanning
+   */
+  private createEnhancedLabel(payload: any, baseLabel: string): string {
+    const parts: string[] = [baseLabel];
+
+    // System resources with text indicators
+    const diskPercent = parseFloat(payload.system.disk.percentUsed);
+    const memoryPercent = parseFloat(payload.system.memory.percentUsed);
+    const diskIndicator = this.getTextIndicator(diskPercent, 80, 90);
+    const memIndicator = this.getTextIndicator(memoryPercent, 80, 90);
+    parts.push(`Disk:${diskPercent.toFixed(1).padStart(5)}%${diskIndicator}`);
+    parts.push(`Mem:${memoryPercent.toFixed(1).padStart(5)}%${memIndicator}`);
+
+    // Node process metrics with text indicators
+    const nodeMemPercent = parseFloat(payload.process.node.memoryUsagePercent);
+    const heapPercent = parseFloat(payload.process.node.heapUsagePercent);
+    const nodeIndicator = this.getTextIndicator(nodeMemPercent, 70, 85);
+    const heapIndicator = this.getTextIndicator(heapPercent, 70, 85);
+    parts.push(`Node:${nodeMemPercent.toFixed(1).padStart(4)}%${nodeIndicator}`);
+    parts.push(`Heap:${heapPercent.toFixed(1).padStart(4)}%${heapIndicator}`);
+
+    // Target process metrics (if available)
+    if (payload.process.targetProcess && payload.process.targetProcess.count > 0) {
+      const targetCpu = payload.process.targetProcess.totals?.cpuPercent || "0";
+      const targetMem = payload.process.targetProcess.totals?.memoryPercent || "0";
+      const targetCpuNum = parseFloat(targetCpu);
+      const targetMemNum = parseFloat(targetMem);
+      const cpuIndicator = this.getTextIndicator(targetCpuNum, 80, 90);
+      const memIndicator = this.getTextIndicator(targetMemNum, 80, 90);
+      parts.push(
+        `${payload.process.targetProcess.processName}:${targetCpu.padStart(
+          4
+        )}%${cpuIndicator}/${targetMem.padStart(4)}%${memIndicator}`
+      );
+    }
+
+    // GC activity with performance indicators
+    if (payload.gc && payload.gc.count > 0) {
+      const avgDuration = payload.gc.avgDuration;
+      const gcIndicator = this.getTextIndicator(avgDuration, 5, 10, true);
+      parts.push(
+        `GC:${payload.gc.count.toString().padStart(2)}(${avgDuration
+          .toFixed(1)
+          .padStart(4)}ms)${gcIndicator}`
+      );
+    }
+
+    // Machine constraints
+    if (payload.constraints) {
+      parts.push(`[${payload.constraints.cpu}CPU/${payload.constraints.memoryGB}GB]`);
+    }
+
+    // Warning indicators (only show critical ones in the main label)
+    const criticalWarnings: string[] = [];
+    if (payload.process.node.isNearHeapLimit) criticalWarnings.push("HEAP_LIMIT");
+    if (diskPercent > 90) criticalWarnings.push("DISK_CRITICAL");
+    if (memoryPercent > 95) criticalWarnings.push("MEM_CRITICAL");
+    if (payload.system.disk.warning) criticalWarnings.push("DISK_WARN");
+
+    if (criticalWarnings.length > 0) {
+      parts.push(`[${criticalWarnings.join(",")}]`);
+    }
+
+    return parts.join(" | ");
+  }
+
+  /**
+   * Get text-based indicator for percentage values
+   */
+  private getTextIndicator(
+    value: number,
+    warningThreshold: number,
+    criticalThreshold: number,
+    isDuration = false
+  ): string {
+    if (isDuration) {
+      // For duration values, higher is worse
+      if (value >= criticalThreshold) return " [CRIT]";
+      if (value >= warningThreshold) return " [WARN]";
+      return " [OK]";
+    } else {
+      // For percentage values, higher is worse
+      if (value >= criticalThreshold) return " [CRIT]";
+      if (value >= warningThreshold) return " [WARN]";
+      return " [OK]";
+    }
+  }
+
+  /**
+   * Create a compact version of the enhanced label for high-frequency logging
+   */
+  private createCompactLabel(payload: any, baseLabel: string): string {
+    const parts: string[] = [baseLabel];
+
+    // Only show critical metrics in compact mode
+    const diskPercent = parseFloat(payload.system.disk.percentUsed);
+    const memoryPercent = parseFloat(payload.system.memory.percentUsed);
+    const heapPercent = parseFloat(payload.process.node.heapUsagePercent);
+
+    // Use single character indicators for compactness
+    const diskIndicator = diskPercent > 90 ? "!" : diskPercent > 80 ? "?" : ".";
+    const memIndicator = memoryPercent > 95 ? "!" : memoryPercent > 80 ? "?" : ".";
+    const heapIndicator = heapPercent > 85 ? "!" : heapPercent > 70 ? "?" : ".";
+
+    parts.push(`D:${diskPercent.toFixed(0).padStart(2)}%${diskIndicator}`);
+    parts.push(`M:${memoryPercent.toFixed(0).padStart(2)}%${memIndicator}`);
+    parts.push(`H:${heapPercent.toFixed(0).padStart(2)}%${heapIndicator}`);
+
+    // GC activity (only if significant)
+    if (payload.gc && payload.gc.count > 0 && payload.gc.avgDuration > 2) {
+      const gcIndicator =
+        payload.gc.avgDuration > 10 ? "!" : payload.gc.avgDuration > 5 ? "?" : ".";
+      parts.push(`GC:${payload.gc.count}${gcIndicator}`);
+    }
+
+    return parts.join(" ");
+  }
+
+  async getResourceSnapshotPayload() {
+    const [systemMetrics, processMetrics] = await Promise.all([
+      this.getSystemMetrics(),
+      this.getProcessMetrics(),
+    ]);
+
+    const gcSummary = summarizeGCEntries(this.bufferedGcEntries);
+    this.bufferedGcEntries = [];
+
+    const formatBytes = (bytes: number) => (bytes / (1024 * 1024)).toFixed(2);
+    const formatPercent = (value: number) => value.toFixed(1);
+
+    return {
+      system: {
+        disk: {
+          limitGiB: DISK_LIMIT_GB,
+          dirName: this.dirName,
+          usedGiB: (systemMetrics.disk.used / (1024 * 1024 * 1024)).toFixed(2),
+          freeGiB: (systemMetrics.disk.free / (1024 * 1024 * 1024)).toFixed(2),
+          percentUsed: formatPercent(systemMetrics.disk.percentUsed),
+          warning: systemMetrics.disk.warning,
+        },
+        memory: {
+          freeGB: (systemMetrics.memory.free / (1024 * 1024 * 1024)).toFixed(2),
+          percentUsed: formatPercent(systemMetrics.memory.percentUsed),
+        },
+      },
+      gc: gcSummary,
+      constraints: this.ctx.machine
+        ? {
+            cpu: this.ctx.machine.cpu,
+            memoryGB: this.ctx.machine.memory,
+            diskGB: DISK_LIMIT_BYTES / (1024 * 1024 * 1024),
+          }
+        : {
+            cpu: os.cpus().length,
+            memoryGB: Math.floor(os.totalmem() / (1024 * 1024 * 1024)),
+            note: "Using system resources (no machine constraints specified)",
+          },
+      process: {
+        node: {
+          memoryUsageMB: formatBytes(processMetrics.node.memoryUsage),
+          memoryUsagePercent: formatPercent(processMetrics.node.memoryUsagePercent),
+          heapUsedMB: formatBytes(processMetrics.node.heapUsed),
+          heapSizeLimitMB: formatBytes(processMetrics.node.heapSizeLimit),
+          heapUsagePercent: formatPercent(processMetrics.node.heapUsagePercent),
+          availableHeapMB: formatBytes(processMetrics.node.availableHeap),
+          isNearHeapLimit: processMetrics.node.isNearHeapLimit,
+          ...(this.verbose
+            ? {
+                heapStats: getHeapStatistics(),
+              }
+            : {}),
+        },
+        targetProcess: processMetrics.targetProcess
+          ? {
+              method: processMetrics.targetProcess.method,
+              processName: processMetrics.targetProcess.processName,
+              count: processMetrics.targetProcess.count,
+              averages: processMetrics.targetProcess.averages
+                ? {
+                    cpuPercent: formatPercent(processMetrics.targetProcess.averages.cpu * 100),
+                    memoryPercent: formatPercent(processMetrics.targetProcess.averages.memory),
+                    rssMB: formatBytes(processMetrics.targetProcess.averages.rss * 1024),
+                    vszMB: formatBytes(processMetrics.targetProcess.averages.vsz * 1024),
+                  }
+                : null,
+              totals: processMetrics.targetProcess.totals
+                ? {
+                    cpuPercent: formatPercent(processMetrics.targetProcess.totals.cpu * 100),
+                    memoryPercent: formatPercent(processMetrics.targetProcess.totals.memory),
+                    rssMB: formatBytes(processMetrics.targetProcess.totals.rss * 1024),
+                    vszMB: formatBytes(processMetrics.targetProcess.totals.vsz * 1024),
+                  }
+                : null,
+            }
+          : null,
+      },
+      timestamp: new Date().toISOString(),
+    };
+  }
+}
+
+function summarizeGCEntries(entries: PerformanceEntry[]): GCSummary {
+  if (entries.length === 0) {
+    return {
+      count: 0,
+      totalDuration: 0,
+      avgDuration: 0,
+      maxDuration: 0,
+      kinds: {},
+    };
+  }
+
+  let totalDuration = 0;
+  let maxDuration = 0;
+  const kinds: Record<string, { count: number; totalDuration: number; maxDuration: number }> = {};
+
+  for (const e of entries) {
+    const duration = e.duration;
+    totalDuration += duration;
+    if (duration > maxDuration) maxDuration = duration;
+
+    const kind = kindName((e as any)?.detail?.kind ?? "unknown");
+    if (!kinds[kind]) {
+      kinds[kind] = { count: 0, totalDuration: 0, maxDuration: 0 };
+    }
+    kinds[kind].count += 1;
+    kinds[kind].totalDuration += duration;
+    if (duration > kinds[kind].maxDuration) kinds[kind].maxDuration = duration;
+  }
+
+  // finalize averages
+  const avgDuration = totalDuration / entries.length;
+  const kindsWithAvg: GCSummary["kinds"] = {};
+  for (const [kind, stats] of Object.entries(kinds)) {
+    kindsWithAvg[kind] = {
+      count: stats.count,
+      totalDuration: stats.totalDuration,
+      avgDuration: stats.totalDuration / stats.count,
+      maxDuration: stats.maxDuration,
+    };
+  }
+
+  return {
+    count: entries.length,
+    totalDuration,
+    avgDuration,
+    maxDuration,
+    kinds: kindsWithAvg,
+  };
+}
+
+const kindName = (k: number | string) => {
+  if (typeof k === "number") {
+    return (
+      {
+        [constants.NODE_PERFORMANCE_GC_MAJOR]: "major",
+        [constants.NODE_PERFORMANCE_GC_MINOR]: "minor",
+        [constants.NODE_PERFORMANCE_GC_INCREMENTAL]: "incremental",
+        [constants.NODE_PERFORMANCE_GC_WEAKCB]: "weak-cb",
+      }[k] ?? `kind:${k}`
+    );
+  }
+  return k;
+};
+```
+
+</Accordion>
+
+Then, in your task, you can create an instance of the `ResourceMonitor` class and start monitoring memory, disk, and CPU usage:
+
+```ts /src/trigger/example.ts
+import { task, logger, wait } from "@trigger.dev/sdk";
+import { ResourceMonitor } from "../resourceMonitor.js";
+
+// Middleware to enable the resource monitor
+tasks.middleware("resource-monitor", async ({ ctx, next }) => {
+  const resourceMonitor = new ResourceMonitor({
+    ctx,
+  });
+
+  // Only enable the resource monitor if the environment variable is set
+  if (process.env.RESOURCE_MONITOR_ENABLED === "1") {
+    resourceMonitor.startMonitoring(1_000);
+  }
+
+  await next();
+
+  resourceMonitor.stopMonitoring();
+});
+
+export const resourceMonitorTest = task({
+  id: "resource-monitor-test",
+  run: async (payload: any, { ctx }) => {
+    const interval = createMemoryPressure();
+
+    await setTimeout(180_000);
+
+    clearInterval(interval);
+
+    return {
+      message: "Hello, resources!",
+    };
+  },
+});
+```
+
+This will produce logs that look like this:
+
+![Resource monitor logs](/images/machines-resource-monitor-logs.png)
+
+If you are spawning a child process and you want to monitor its memory usage, you can pass the `processName` option to the `ResourceMonitor` class:
+
+```ts /src/trigger/example.ts
+const resourceMonitor = new ResourceMonitor({
+  ctx,
+  processName: "ffmpeg",
+});
+```
+
+This will produce logs that includes the memory and CPU usage of the `ffmpeg` process:
+
+![Resource monitor logs](/images/machines-resource-monitor-ffmpeg.png)
+
+### Explicit OOM errors
 
 You can explicitly throw an Out Of Memory error in your task. This can be useful if you use a native package that detects it's going to run out of memory and then stops before it runs out. If you can detect this, you can then throw this error.
 
 ```ts /trigger/heavy-task.ts
-import {  task } from "@trigger.dev/sdk/v3";
-import { OutOfMemoryError } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
+import { OutOfMemoryError } from "@trigger.dev/sdk";
 
 export const yourTask = task({
   id: "your-task",
@@ -88,7 +929,7 @@ If OOM errors happen regularly you need to either optimize the memory-efficiency
 If you are seeing rare OOM errors, it might make sense to add a setting to your task to retry with a large machine when an OOM happens:
 
 ```ts /trigger/heavy-task.ts
-import {  task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const yourTask = task({
   id: "your-task",
@@ -105,5 +946,7 @@ export const yourTask = task({
 ```
 
 <Note>
-  This will only retry the task if you get an OOM error. It won't permanently change the machine that a new run starts on, so if you consistently see OOM errors you should change the machine in the `machine` property.
+  This will only retry the task if you get an OOM error. It won't permanently change the machine
+  that a new run starts on, so if you consistently see OOM errors you should change the machine in
+  the `machine` property.
 </Note>
diff --git a/docs/management/advanced-usage.mdx b/docs/management/advanced-usage.mdx
index 0413d1690bd..b0a0cbd2aaf 100644
--- a/docs/management/advanced-usage.mdx
+++ b/docs/management/advanced-usage.mdx
@@ -9,7 +9,7 @@ description: Advanced usage of the Trigger.dev management API
 All API methods return a `Promise` subclass `ApiPromise` that includes helpers for accessing the underlying HTTP response:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 async function main() {
   const { data: run, response: raw } = await runs.retrieve("run_1234").withResponse();
diff --git a/docs/management/authentication.mdx b/docs/management/authentication.mdx
index 2d24c1f3541..e7d36663423 100644
--- a/docs/management/authentication.mdx
+++ b/docs/management/authentication.mdx
@@ -8,14 +8,14 @@ There are two methods of authenticating with the management API: using a secret
 
 <Note>
   There is a separate authentication strategy when making requests from your frontend application.
-  See the [Frontend guide](/frontend/overview) for more information. This guide is for backend usage
+  See the [Realtime guide](/realtime/overview) for more information. This guide is for backend usage
   only.
 </Note>
 
 Certain API functions work with both authentication methods, but require different arguments depending on the method used. For example, the `runs.list` function can be called using either a `secretKey` or a `personalAccessToken`, but the `projectRef` argument is required when using a `personalAccessToken`:
 
 ```ts
-import { configure, runs } from "@trigger.dev/sdk/v3";
+import { configure, runs } from "@trigger.dev/sdk";
 
 // Using secretKey authentication
 configure({
@@ -82,7 +82,7 @@ A PAT is a token associated with a specific user, and gives access to all the or
 For example, when uploading environment variables using a PAT, you must provide the `projectRef` and `environment` arguments:
 
 ```ts
-import { configure, envvars } from "@trigger.dev/sdk/v3";
+import { configure, envvars } from "@trigger.dev/sdk";
 
 configure({
   secretKey: process.env["TRIGGER_ACCESS_TOKEN"], // starts with tr_pat_
@@ -94,4 +94,67 @@ await envvars.upload("proj_1234", "dev", {
   },
   override: true,
 });
-```
\ No newline at end of file
+```
+
+### Preview branch targeting
+
+When working with preview branches, you may need to target a specific branch when making API calls. This is particularly useful for managing environment variables or other resources that are scoped to individual preview branches.
+
+<Tabs>
+  <Tab title="SDK">
+    To target a specific preview branch, include the `previewBranch` option in your SDK configuration:
+
+```ts
+import { configure, envvars } from "@trigger.dev/sdk";
+
+configure({
+  secretKey: process.env["TRIGGER_ACCESS_TOKEN"], // starts with tr_pat_
+  previewBranch: "feature-xyz",
+});
+
+await envvars.update("proj_1234", "preview", "DATABASE_URL", {
+  value: "your_preview_database_url",
+});
+```
+
+  </Tab>
+  <Tab title="cURL">
+    To target a specific preview branch, include the `x-trigger-branch` header in your API requests with the branch name as the value:
+
+```bash
+curl --request PUT \
+  --url https://api.trigger.dev/api/v1/projects/{projectRef}/envvars/preview/DATABASE_URL \
+  --header 'Authorization: Bearer <token>' \
+  --header 'x-trigger-branch: feature-xyz' \
+  --header 'Content-Type: application/json' \
+  --data '{
+    "value": "your_preview_database_url"
+  }'
+```
+
+  </Tab>
+</Tabs>
+This will set the `DATABASE_URL` environment variable specifically for the `feature-xyz` preview branch.
+
+<Note>
+  The `x-trigger-branch` header is only relevant when working with the `preview` environment (`{env}
+  ` parameter set to `preview`). It has no effect when working with `dev`, `staging`, or `prod`
+  environments.
+</Note>
+
+#### SDK usage with preview branches
+
+When using the SDK to manage preview branch environment variables, the branch targeting is handled automatically when you're running in a preview environment with the `TRIGGER_PREVIEW_BRANCH` environment variable set. However, you can also specify the branch explicitly:
+
+```ts
+import { configure, envvars } from "@trigger.dev/sdk";
+
+configure({
+  secretKey: process.env["TRIGGER_ACCESS_TOKEN"], // starts with tr_pat_
+  previewBranch: "feature-xyz", // Optional: specify the branch
+});
+
+await envvars.update("proj_1234", "preview", "DATABASE_URL", {
+  value: "your_preview_database_url",
+});
+```
diff --git a/docs/management/auto-pagination.mdx b/docs/management/auto-pagination.mdx
index 67fa69467b8..3d5159e1206 100644
--- a/docs/management/auto-pagination.mdx
+++ b/docs/management/auto-pagination.mdx
@@ -8,7 +8,7 @@ All list endpoints in the management API support auto-pagination.
 You can use `for await … of` syntax to iterate through items across all pages:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 async function fetchAllRuns() {
   const allRuns = [];
@@ -24,7 +24,7 @@ async function fetchAllRuns() {
 You can also use helpers on the return value from any `list` method to get the next/previous page of results:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 async function main() {
   let page = await runs.list({ limit: 10 });
diff --git a/docs/management/batches/create.mdx b/docs/management/batches/create.mdx
new file mode 100644
index 00000000000..f9a11cb2e44
--- /dev/null
+++ b/docs/management/batches/create.mdx
@@ -0,0 +1,5 @@
+---
+title: "Create batch"
+openapi: "openapi POST /api/v3/batches"
+---
+
diff --git a/docs/management/batches/stream-items.mdx b/docs/management/batches/stream-items.mdx
new file mode 100644
index 00000000000..66f074bc42e
--- /dev/null
+++ b/docs/management/batches/stream-items.mdx
@@ -0,0 +1,5 @@
+---
+title: "Stream batch items"
+openapi: "openapi POST /api/v3/batches/{batchId}/items"
+---
+
diff --git a/docs/management/deployments/get-latest.mdx b/docs/management/deployments/get-latest.mdx
new file mode 100644
index 00000000000..78be92be293
--- /dev/null
+++ b/docs/management/deployments/get-latest.mdx
@@ -0,0 +1,4 @@
+---
+title: "Get latest deployment"
+openapi: "v3-openapi GET /api/v1/deployments/latest"
+---
diff --git a/docs/management/deployments/promote.mdx b/docs/management/deployments/promote.mdx
new file mode 100644
index 00000000000..e1e885c0d75
--- /dev/null
+++ b/docs/management/deployments/promote.mdx
@@ -0,0 +1,4 @@
+---
+title: "Promote deployment"
+openapi: "v3-openapi POST /api/v1/deployments/{version}/promote"
+---
diff --git a/docs/management/deployments/retrieve.mdx b/docs/management/deployments/retrieve.mdx
new file mode 100644
index 00000000000..8a7eb215572
--- /dev/null
+++ b/docs/management/deployments/retrieve.mdx
@@ -0,0 +1,4 @@
+---
+title: "Get deployment"
+openapi: "v3-openapi GET /api/v1/deployments/{deploymentId}"
+---
diff --git a/docs/management/errors-and-retries.mdx b/docs/management/errors-and-retries.mdx
index cbb7ebf3d88..53a50653a55 100644
--- a/docs/management/errors-and-retries.mdx
+++ b/docs/management/errors-and-retries.mdx
@@ -9,7 +9,7 @@ description: Handling errors and retries with the Trigger.dev management API
 When the SDK method is unable to connect to the API server, or the API server returns a non-successful response, the SDK will throw an `ApiError` that you can catch and handle:
 
 ```ts
-import { runs, APIError } from "@trigger.dev/sdk/v3";
+import { runs, APIError } from "@trigger.dev/sdk";
 
 async function main() {
   try {
@@ -31,7 +31,7 @@ The SDK will automatically retry requests that fail due to network errors or ser
 You can customize the retry behavior by passing a `requestOptions` option to the `configure` function:
 
 ```ts
-import { configure } from "@trigger.dev/sdk/v3";
+import { configure } from "@trigger.dev/sdk";
 
 configure({
   requestOptions: {
@@ -49,7 +49,7 @@ configure({
 All SDK functions also take a `requestOptions` parameter as the last argument, which can be used to customize the request options. You can use this to disable retries for a specific request:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 async function main() {
   const run = await runs.retrieve("run_1234", {
diff --git a/docs/management/overview.mdx b/docs/management/overview.mdx
index 1c5467006d5..0a7ca5a44a9 100644
--- a/docs/management/overview.mdx
+++ b/docs/management/overview.mdx
@@ -26,10 +26,10 @@ yarn add @trigger.dev/sdk@latest
 
 ## Usage
 
-All `v3` functionality is provided through the `@trigger.dev/sdk/v3` module. You can import the entire module or individual resources as needed.
+All `v3` functionality is provided through the `@trigger.dev/sdk` module. You can import the entire module or individual resources as needed.
 
 ```ts
-import { configure, runs } from "@trigger.dev/sdk/v3";
+import { configure, runs } from "@trigger.dev/sdk";
 
 configure({
   // this is the default and if the `TRIGGER_SECRET_KEY` environment variable is set, can omit calling configure
diff --git a/docs/management/query/execute.mdx b/docs/management/query/execute.mdx
new file mode 100644
index 00000000000..ce0149e2d22
--- /dev/null
+++ b/docs/management/query/execute.mdx
@@ -0,0 +1,11 @@
+---
+title: "Execute a query"
+openapi: "v3-openapi POST /api/v1/query"
+---
+
+See the [Query documentation](/insights/query#example-queries) for comprehensive examples including:
+
+- Failed runs analysis
+- Task success rates over time
+- Cost tracking and optimization
+- Performance metrics and percentiles
diff --git a/docs/management/queues/concurrency-override.mdx b/docs/management/queues/concurrency-override.mdx
new file mode 100644
index 00000000000..de62d91c950
--- /dev/null
+++ b/docs/management/queues/concurrency-override.mdx
@@ -0,0 +1,4 @@
+---
+title: "Override Concurrency Limit"
+openapi: "v3-openapi POST /api/v1/queues/{queueParam}/concurrency/override"
+---
diff --git a/docs/management/queues/concurrency-reset.mdx b/docs/management/queues/concurrency-reset.mdx
new file mode 100644
index 00000000000..7e790e21e45
--- /dev/null
+++ b/docs/management/queues/concurrency-reset.mdx
@@ -0,0 +1,4 @@
+---
+title: "Reset Concurrency Limit"
+openapi: "v3-openapi POST /api/v1/queues/{queueParam}/concurrency/reset"
+---
diff --git a/docs/management/queues/list.mdx b/docs/management/queues/list.mdx
new file mode 100644
index 00000000000..e74b9dfe1e6
--- /dev/null
+++ b/docs/management/queues/list.mdx
@@ -0,0 +1,4 @@
+---
+title: "List Queues"
+openapi: "v3-openapi GET /api/v1/queues"
+---
diff --git a/docs/management/queues/pause.mdx b/docs/management/queues/pause.mdx
new file mode 100644
index 00000000000..2f684459b17
--- /dev/null
+++ b/docs/management/queues/pause.mdx
@@ -0,0 +1,4 @@
+---
+title: "Pause or Resume Queue"
+openapi: "v3-openapi POST /api/v1/queues/{queueParam}/pause"
+---
diff --git a/docs/management/queues/retrieve.mdx b/docs/management/queues/retrieve.mdx
new file mode 100644
index 00000000000..3410e6d89d1
--- /dev/null
+++ b/docs/management/queues/retrieve.mdx
@@ -0,0 +1,4 @@
+---
+title: "Retrieve Queue"
+openapi: "v3-openapi GET /api/v1/queues/{queueParam}"
+---
diff --git a/docs/manual-setup.mdx b/docs/manual-setup.mdx
new file mode 100644
index 00000000000..a4cbb5e35ab
--- /dev/null
+++ b/docs/manual-setup.mdx
@@ -0,0 +1,632 @@
+---
+title: "Manual setup"
+description: "How to manually setup Trigger.dev in your project."
+---
+
+This guide covers how to manually set up Trigger.dev in your project, including configuration for different package managers, monorepos, and build extensions. This guide replicates all the steps performed by the `trigger.dev init` command. Follow our [Quickstart](/quick-start) for a more streamlined setup.
+
+## Prerequisites
+
+- Node.js 18.20+ (or Bun runtime)
+- A Trigger.dev account (sign up at [trigger.dev](https://trigger.dev))
+- TypeScript 5.0.4 or later (for TypeScript projects)
+
+## CLI Authentication
+
+Before setting up your project, you need to authenticate the CLI with Trigger.dev:
+
+```bash
+# Login to Trigger.dev
+npx trigger.dev@latest login
+
+# Or with a specific API URL (for self-hosted instances)
+npx trigger.dev@latest login --api-url https://your-trigger-instance.com
+```
+
+This will open your browser to authenticate. Once authenticated, you'll need to select or create a project in the Trigger.dev dashboard to get your project reference (e.g., `proj_abc123`).
+
+## Package installation
+
+Install the required packages based on your package manager:
+
+<CodeGroup>
+
+```bash npm
+npm add @trigger.dev/sdk@latest
+npm add --save-dev @trigger.dev/build@latest
+```
+
+```bash pnpm
+pnpm add @trigger.dev/sdk@latest
+pnpm add -D @trigger.dev/build@latest
+```
+
+```bash yarn
+yarn add @trigger.dev/sdk@latest
+yarn add -D @trigger.dev/build@latest
+```
+
+```bash bun
+bun add @trigger.dev/sdk@latest
+bun add -D @trigger.dev/build@latest
+```
+
+</CodeGroup>
+
+## Environment variables
+
+For local development, you need to set up the `TRIGGER_SECRET_KEY` environment variable. This key authenticates your application with Trigger.dev.
+
+1. Go to your project dashboard in Trigger.dev
+2. Navigate to the "API Keys" page
+3. Copy the **DEV** secret key
+4. Add it to your local environment file:
+
+```bash
+TRIGGER_SECRET_KEY=tr_dev_xxxxxxxxxx
+```
+
+### Self-hosted instances
+
+If you're using a self-hosted Trigger.dev instance, also set:
+
+```bash
+TRIGGER_API_URL=https://your-trigger-instance.com
+```
+
+## CLI setup
+
+You can run the Trigger.dev CLI in two ways:
+
+### Option 1: Using npx/pnpm dlx/yarn dlx
+
+```bash
+# npm
+npx trigger.dev@latest dev
+
+# pnpm
+pnpm dlx trigger.dev@latest dev
+
+# yarn
+yarn dlx trigger.dev@latest dev
+```
+
+### Option 2: Add as dev dependency
+
+Add the CLI to your `package.json`:
+
+```json
+{
+  "devDependencies": {
+    "trigger.dev": "^4.0.0"
+  }
+}
+```
+
+Then add scripts to your `package.json`:
+
+```json
+{
+  "scripts": {
+    "dev:trigger": "trigger dev",
+    "deploy:trigger": "trigger deploy"
+  }
+}
+```
+
+### Version pinning
+
+Make sure to pin the version of the CLI to the same version as the SDK that you are using:
+
+```json
+"devDependencies": {
+  "trigger.dev": "^4.0.0",
+  "@trigger.dev/build": "^4.0.0"
+},
+"dependencies": {
+  "@trigger.dev/sdk": "^4.0.0"
+}
+```
+
+While running the CLI `dev` or `deploy` commands, the CLI will automatically detect mismatched versions and warn you.
+
+## Configuration file
+
+Create a `trigger.config.ts` file in your project root (or `trigger.config.mjs` for JavaScript projects):
+
+```typescript
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  // Your project ref from the Trigger.dev dashboard
+  project: "<your-project-ref>", // e.g., "proj_abc123"
+
+  // Directories containing your tasks
+  dirs: ["./src/trigger"], // Customize based on your project structure
+
+  // Retry configuration
+  retries: {
+    enabledInDev: false, // Enable retries in development
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+
+  // Build configuration (optional)
+  build: {
+    extensions: [], // Build extensions go here
+  },
+
+  // Max duration of a task in seconds
+  maxDuration: 3600,
+});
+```
+
+### Using the Bun runtime
+
+By default, Trigger.dev will use the Node.js runtime. If you're using Bun, you can specify the runtime:
+
+```typescript
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<your-project-ref>",
+  runtime: "bun",
+  dirs: ["./src/trigger"],
+});
+```
+
+See our [Bun runtime documentation](/guides/frameworks/bun) for more information.
+
+## Add your first task
+
+Create a `trigger` directory (matching the `dirs` in your config) and add an example task:
+
+```typescript src/trigger/example.ts
+import { task } from "@trigger.dev/sdk";
+
+export const helloWorld = task({
+  id: "hello-world",
+  run: async (payload: { name: string }) => {
+    console.log(`Hello ${payload.name}!`);
+
+    return {
+      message: `Hello ${payload.name}!`,
+      timestamp: new Date().toISOString(),
+    };
+  },
+});
+```
+
+See our [Tasks](/tasks/overview) docs for more information on how to create tasks.
+
+## TypeScript config
+
+If you're using TypeScript, add `trigger.config.ts` to your `tsconfig.json` include array:
+
+```json
+{
+  "compilerOptions": {
+    // ... your existing options
+  },
+  "include": [
+    // ... your existing includes
+    "trigger.config.ts"
+  ]
+}
+```
+
+## Git config
+
+Add `.trigger` to your `.gitignore` file to exclude Trigger.dev's local development files:
+
+```bash
+# Trigger.dev
+.trigger
+```
+
+If you don't have a `.gitignore` file, create one with this content.
+
+## React hooks setup
+
+If you're building a React frontend application and want to display task status in real-time, install the React hooks package:
+
+### Installation
+
+```bash
+# npm
+npm install @trigger.dev/react-hooks@latest
+
+# pnpm
+pnpm add @trigger.dev/react-hooks@latest
+
+# yarn
+yarn add @trigger.dev/react-hooks@latest
+
+# bun
+bun add @trigger.dev/react-hooks@latest
+```
+
+### Basic usage
+
+1. **Generate a Public Access Token** in your backend:
+
+```typescript
+import { auth } from "@trigger.dev/sdk";
+
+// In your backend API
+export async function getPublicAccessToken() {
+  const publicAccessToken = await auth.createPublicToken({
+    scopes: ["read:runs"], // Customize based on needs
+  });
+
+  return publicAccessToken;
+}
+```
+
+2. **Use hooks to monitor tasks**:
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function TaskStatus({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!run) return <div>Loading...</div>;
+
+  return (
+    <div>
+      <p>Status: {run.status}</p>
+      <p>Progress: {run.completedAt ? "Complete" : "Running..."}</p>
+    </div>
+  );
+}
+```
+
+For more information, see the [React Hooks documentation](/realtime/react-hooks/overview).
+
+## Build extensions
+
+Build extensions allow you to customize the build process. Ensure you have the `@trigger.dev/build` package installed in your project (see [package installation](#package-installation)).
+
+Now you can use any of the built-in extensions:
+
+```typescript
+import { defineConfig } from "@trigger.dev/sdk";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+export default defineConfig({
+  project: "<project-ref>",
+  build: {
+    extensions: [
+      prismaExtension({
+        mode: "legacy",
+        schema: "prisma/schema.prisma",
+        migrate: true, // Run migrations on deploy
+      }),
+    ],
+  },
+});
+```
+
+See our [Build extensions](/config/extensions/overview) docs for more information on how to use build extensions and the available extensions.
+
+## Monorepo setup
+
+There are two main approaches for setting up Trigger.dev in a monorepo:
+
+1. **Tasks as a package**: Create a separate package for your Trigger.dev tasks that can be shared across apps
+2. **Tasks in apps**: Install Trigger.dev directly in individual apps that need background tasks
+
+Both approaches work well depending on your needs. Use the tasks package approach if you want to share tasks across multiple applications, or the app-based approach if tasks are specific to individual apps.
+
+### Approach 1: Tasks as a package (Turborepo)
+
+This approach creates a dedicated tasks package that can be consumed by multiple apps in your monorepo.
+
+#### 1. Set up workspace configuration
+
+**Root `package.json`**:
+
+```json
+{
+  "name": "my-monorepo",
+  "private": true,
+  "scripts": {
+    "build": "turbo run build",
+    "dev": "turbo run dev",
+    "lint": "turbo run lint"
+  },
+  "devDependencies": {
+    "turbo": "^2.4.4",
+    "typescript": "5.8.2"
+  },
+  "packageManager": "pnpm@9.0.0"
+}
+```
+
+**`pnpm-workspace.yaml`**:
+
+```yaml
+packages:
+  - "apps/*"
+  - "packages/*"
+```
+
+**`turbo.json`**:
+
+```json
+{
+  "$schema": "https://turbo.build/schema.json",
+  "ui": "tui",
+  "tasks": {
+    "build": {
+      "dependsOn": ["^build"],
+      "outputs": [".next/**", "!.next/cache/**"]
+    },
+    "dev": {
+      "cache": false,
+      "persistent": true
+    },
+    "lint": {
+      "dependsOn": ["^lint"]
+    }
+  }
+}
+```
+
+#### 2. Create the tasks package
+
+**`packages/tasks/package.json`**:
+
+```json
+{
+  "name": "@repo/tasks",
+  "version": "0.0.0",
+  "dependencies": {
+    "@trigger.dev/sdk": "^4.0.0"
+  },
+  "devDependencies": {
+    "@trigger.dev/build": "^4.0.0"
+  },
+  "exports": {
+    ".": "./src/trigger/index.ts",
+    "./trigger": "./src/index.ts"
+  }
+}
+```
+
+**`packages/tasks/trigger.config.ts`**:
+
+```typescript
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<your-project-ref>", // Replace with your project reference
+  dirs: ["./src/trigger"],
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  maxDuration: 3600,
+});
+```
+
+**`packages/tasks/src/index.ts`**:
+
+```typescript
+export * from "@trigger.dev/sdk"; // Export values and types from the Trigger.dev sdk
+```
+
+**`packages/tasks/src/trigger/index.ts`**:
+
+```typescript
+// Export tasks
+export * from "./example";
+```
+
+**`packages/tasks/src/trigger/example.ts`**:
+
+```typescript
+import { task } from "@trigger.dev/sdk";
+
+export const helloWorld = task({
+  id: "hello-world",
+  run: async (payload: { name: string }) => {
+    console.log(`Hello ${payload.name}!`);
+
+    return {
+      message: `Hello ${payload.name}!`,
+      timestamp: new Date().toISOString(),
+    };
+  },
+});
+```
+
+See our [turborepo-prisma-tasks-package example](https://github.com/triggerdotdev/examples/tree/main/monorepos/turborepo-prisma-tasks-package) for a more complete example.
+
+#### 3. Use tasks in your apps
+
+**`apps/web/package.json`**:
+
+```json
+{
+  "name": "web",
+  "dependencies": {
+    "@repo/tasks": "workspace:*",
+    "next": "^15.2.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  }
+}
+```
+
+**`apps/web/app/api/actions.ts`**:
+
+```typescript
+"use server";
+
+import { tasks } from "@repo/tasks/trigger";
+import type { helloWorld } from "@repo/tasks";
+//     👆 type only import
+
+export async function triggerHelloWorld(name: string) {
+  try {
+    const handle = await tasks.trigger<typeof helloWorld>("hello-world", {
+      name: name,
+    });
+
+    return handle.id;
+  } catch (error) {
+    console.error(error);
+    return { error: "something went wrong" };
+  }
+}
+```
+
+#### 4. Development workflow
+
+Run the development server for the tasks package:
+
+```bash
+# From the root of your monorepo
+cd packages/tasks
+npx trigger.dev@latest dev
+
+# Or using turbo (if you add dev:trigger script to tasks package.json)
+turbo run dev:trigger --filter=@repo/tasks
+```
+
+### Approach 2: Tasks in apps (Turborepo)
+
+This approach installs Trigger.dev directly in individual apps that need background tasks.
+
+#### 1. Install in your app
+
+**`apps/web/package.json`**:
+
+```json
+{
+  "name": "web",
+  "dependencies": {
+    "@trigger.dev/sdk": "^4.0.0",
+    "next": "^15.2.1",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0"
+  },
+  "devDependencies": {
+    "@trigger.dev/build": "^4.0.0"
+  }
+}
+```
+
+#### 2. Add configuration
+
+**`apps/web/trigger.config.ts`**:
+
+```typescript
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<your-project-ref>", // Replace with your project reference
+  dirs: ["./src/trigger"],
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  maxDuration: 3600,
+});
+```
+
+#### 3. Create tasks
+
+**`apps/web/src/trigger/example.ts`**:
+
+```typescript
+import { task } from "@trigger.dev/sdk";
+
+export const helloWorld = task({
+  id: "hello-world",
+  run: async (payload: { name: string }) => {
+    console.log(`Hello ${payload.name}!`);
+
+    return {
+      message: `Hello ${payload.name}!`,
+      timestamp: new Date().toISOString(),
+    };
+  },
+});
+```
+
+#### 4. Use tasks in your app
+
+**`apps/web/app/api/actions.ts`**:
+
+```typescript
+"use server";
+
+import { tasks } from "@trigger.dev/sdk";
+import type { helloWorld } from "../../src/trigger/example";
+//     👆 type only import
+
+export async function triggerHelloWorld(name: string) {
+  try {
+    const handle = await tasks.trigger<typeof helloWorld>("hello-world", {
+      name: name,
+    });
+
+    return handle.id;
+  } catch (error) {
+    console.error(error);
+    return { error: "something went wrong" };
+  }
+}
+```
+
+#### 5. Development workflow
+
+```bash
+# From the app directory
+cd apps/web
+npx trigger.dev@latest dev
+
+# Or from the root using turbo
+turbo run dev:trigger --filter=web
+```
+
+## Example projects
+
+You can find a growing list of example projects in our [examples](/guides/introduction) section.
+
+## Troubleshooting
+
+If you run into any issues, please check our [Troubleshooting](/troubleshooting) page.
+
+## Feedback
+
+If you have any feedback, please let us know by [opening an issue](https://github.com/triggerdotdev/trigger.dev/issues).
diff --git a/docs/mcp-agent-rules.mdx b/docs/mcp-agent-rules.mdx
new file mode 100644
index 00000000000..d9ba021b891
--- /dev/null
+++ b/docs/mcp-agent-rules.mdx
@@ -0,0 +1,132 @@
+---
+title: "Agent rules"
+sidebarTitle: "Agent rules"
+description: "Install Trigger.dev agent rules to guide AI assistants toward correct, up-to-date code patterns."
+---
+
+## What are Trigger.dev agent rules?
+
+Trigger.dev agent rules are comprehensive instruction sets that guide AI assistants to write optimal Trigger.dev code. These rules ensure your AI assistant understands best practices, current APIs, and recommended patterns when working with Trigger.dev projects.
+
+<Note>
+  Agent Rules are one of three AI tools we provide. You can also install [Skills](/skills) for portable cross-editor instruction sets or the [MCP Server](/mcp-introduction) for live project interaction. See the [comparison table](/building-with-ai#skills-vs-agent-rules-vs-mcp) for details.
+</Note>
+
+## Installation
+
+Install the agent rules with the following command:
+
+```bash
+npx trigger.dev@latest install-rules
+```
+
+## Available rule sets
+
+We provide five specialized rule sets, each optimized for different aspects of Trigger.dev development:
+
+| Rule set | Tokens | Description | GitHub |
+|:---------|:-------|:------------|:------------|
+| **Basic tasks** | 1,200 | Essential rules for writing basic Trigger.dev tasks and fundamental patterns | [View](https://github.com/triggerdotdev/trigger.dev/blob/main/rules/4.0.0/basic-tasks.md) |
+| **Advanced tasks** | 3,000 | Comprehensive rules for complex workflows, error handling, and advanced task patterns | [View](https://github.com/triggerdotdev/trigger.dev/blob/main/rules/4.0.0/advanced-tasks.md) |
+| **Scheduled tasks** | 780 | Specialized guidance for cron jobs, scheduled workflows, and time-based triggers | [View](https://github.com/triggerdotdev/trigger.dev/blob/main/rules/4.0.0/scheduled-tasks.md) |
+| **Configuration** | 1,900 | Complete guide for trigger.config.ts setup, environment configuration, and project structure | [View](https://github.com/triggerdotdev/trigger.dev/blob/main/rules/4.0.0/config.md) |
+| **Realtime** | 1,700 | Using Trigger.dev Realtime features and frontend integration patterns | [View](https://github.com/triggerdotdev/trigger.dev/blob/main/rules/4.0.0/realtime.md) |
+
+## Claude Code subagent
+
+For Claude Code users, we provide a subagent called `trigger-dev-expert` that's an expert at writing well-structured Trigger.dev code.
+
+### Installation
+
+The subagent is available as an option when running the rules installation command. Select "Claude Code" as your client and choose to include the subagent when prompted.
+
+![Claude Code subagent installation](/images/claude-code-subagent.png)
+
+### Usage
+
+Activate the subagent in your prompts by requesting it explicitly:
+
+```markdown
+use the trigger-dev-expert subagent to create a trigger.dev job that accepts a video url, processes it with ffmpeg to extract the audio, runs the audio through a text-to-speech API like openai, and then uploads both the transcription and the audio to s3
+```
+
+The subagent works best when combined with the appropriate rule sets installed alongside it, providing both high-level architectural guidance and detailed implementation knowledge.
+
+## Supported AI clients
+
+The Trigger.dev rules work across a wide range of AI coding assistants and editors:
+
+| Client | Rule activation | Docs |
+|:--------|:----------------|:--------------|
+| **Cursor** | Automatic when working in trigger directories | [Link](https://docs.cursor.com/en/context/rules#rules/) |
+| **Claude Code** | Context-aware activation + custom subagent | [Link](https://docs.anthropic.com/en/docs/claude-code) |
+| **VSCode Copilot** | Integration with GitHub Copilot chat | [Link](https://code.visualstudio.com/docs/copilot/overview) |
+| **Windsurf** | Automatic activation in Trigger.dev projects | [Link](https://docs.windsurf.com/windsurf/cascade/memories#rules) |
+| **Gemini CLI** | Command-line integration | [Link](https://ai.google.dev/gemini-api/docs) |
+| **Cline** | Automatic context detection | [Link](https://github.com/cline/cline) |
+| **Sourcegraph AMP** | Code intelligence integration | [Link](https://sourcegraph.com/docs) |
+| **Kilo** | Custom rule integration | [Link](https://kilocode.ai/docs/advanced-usage/custom-rules) |
+| **Ruler** | Rule management | [Link](https://github.com/intellectronica/ruler) |
+| **AGENTS.md** | Universal format for OpenAI Codex, Jules, OpenCode, etc. |  |
+
+### Rule activation behavior
+
+Different AI tools handle rules differently:
+
+- **Automatic Activation**: Cursor, Windsurf, VSCode Copilot, and Cline automatically apply relevant rules when working in Trigger.dev projects or when `trigger.config.ts` is detected
+- **Context-Aware**: Claude Code intelligently applies rules based on the current context and file types
+- **Manual Integration**: AGENTS.md clients and others append rules to configuration files for manual activation
+
+## Keeping rules updated
+
+Trigger.dev rules are regularly updated to reflect new features, API changes, and best practices. The CLI includes automatic update detection.
+
+### Automatic update notifications
+
+When running `npx trigger.dev@latest dev`, you'll receive notifications when newer rule versions are available with a simple update command.
+
+### Manual updates
+
+Update rules anytime with:
+
+```bash
+npx trigger.dev@latest install-rules
+```
+
+The update process replaces existing rules without creating duplicates, keeping your configuration files clean and organized.
+
+### Why updates matter
+
+- **Current API patterns**: Access the latest Trigger.dev APIs and features
+- **Performance optimizations**: Benefit from improved patterns and practices
+- **Deprecated pattern avoidance**: Prevent AI assistants from generating outdated code
+- **New feature support**: Immediate access to newly released capabilities
+
+## Getting started
+
+1. Install the rules:
+
+```bash
+npx trigger.dev@latest install-rules
+```
+
+2. Follow the prompts to install the rules for your AI client.
+
+3. Consider installing the `trigger-dev-expert` subagent if using Claude Code.
+
+## Next steps
+
+<CardGroup cols={2}>
+  <Card title="Skills" icon="wand-magic-sparkles" href="/skills">
+    Portable instruction sets that work across all AI coding assistants.
+  </Card>
+  <Card title="MCP Server" icon="sparkles" href="/mcp-introduction">
+    Give your AI assistant direct access to Trigger.dev tools and APIs.
+  </Card>
+  <Card title="Complete AI setup" icon="layer-group" href="/building-with-ai">
+    See all AI tools and how they compare.
+  </Card>
+  <Card title="Writing tasks" icon="code" href="/tasks/overview">
+    Learn the task patterns that agent rules teach your AI assistant.
+  </Card>
+</CardGroup>
diff --git a/docs/mcp-introduction.mdx b/docs/mcp-introduction.mdx
new file mode 100644
index 00000000000..a00f3dda896
--- /dev/null
+++ b/docs/mcp-introduction.mdx
@@ -0,0 +1,374 @@
+---
+title: "MCP Introduction"
+sidebarTitle: "Introduction"
+description: "Learn how to install and configure the Trigger.dev MCP Server"
+---
+
+## What is the Trigger.dev MCP Server?
+
+The Trigger.dev MCP (Model Context Protocol) Server enables AI assistants to interact directly with your Trigger.dev projects. It provides a comprehensive set of tools to:
+
+- Search Trigger.dev documentation
+- Initialize new Trigger.dev projects
+- List and manage your projects and organizations
+- Get task information and trigger task runs
+- Deploy projects to different environments
+- Monitor run details and list runs with filtering options
+
+## Installation
+
+The quickest way to get set up is the interactive installer:
+
+```bash
+npx trigger.dev@latest install-mcp
+```
+
+It will detect your installed clients and configure them automatically. You can also copy-paste the config for your client below.
+
+## Client Configuration
+
+Each client has a slightly different config format. Copy the snippet for your client into the appropriate file.
+
+<Tabs>
+  <Tab title="Claude Code">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client claude-code
+    ```
+
+    Or add this configuration to `~/.claude.json` (user) or `.mcp.json` (project):
+
+    ```json
+    {
+      "mcpServers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Claude Code MCP docs ↗](https://code.claude.com/docs/en/mcp)
+  </Tab>
+  <Tab title="Cursor">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client cursor
+    ```
+
+    Or add this configuration to `~/.cursor/mcp.json` (user) or `.cursor/mcp.json` (project):
+
+    ```json
+    {
+      "mcpServers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Cursor MCP docs ↗](https://cursor.com/docs/context/mcp)
+  </Tab>
+  <Tab title="Windsurf">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client windsurf
+    ```
+
+    Or add this configuration to `~/.codeium/windsurf/mcp_config.json`:
+
+    ```json
+    {
+      "mcpServers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Windsurf MCP docs ↗](https://docs.windsurf.com/windsurf/cascade/mcp)
+  </Tab>
+  <Tab title="VS Code">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client vscode
+    ```
+
+    Or add this configuration to `.vscode/mcp.json` (project) or `~/Library/Application Support/Code/User/mcp.json` (user, macOS):
+
+    ```json
+    {
+      "servers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    <Note>VS Code uses `servers` instead of `mcpServers`.</Note>
+
+    [View VS Code MCP docs ↗](https://code.visualstudio.com/docs/copilot/chat/mcp-servers)
+  </Tab>
+  <Tab title="Zed">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client zed
+    ```
+
+    Or add this configuration to `~/.config/zed/settings.json`:
+
+    ```json
+    {
+      "context_servers": {
+        "trigger": {
+          "source": "custom",
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Zed context servers docs ↗](https://zed.dev/docs/ai/mcp)
+  </Tab>
+  <Tab title="Cline">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client cline
+    ```
+
+    Or add this configuration to `~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json`:
+
+    ```json
+    {
+      "mcpServers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Cline MCP docs ↗](https://docs.cline.bot/mcp/configuring-mcp-servers)
+  </Tab>
+  <Tab title="Gemini CLI">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client gemini-cli
+    ```
+
+    Or add this configuration to `~/.gemini/settings.json` (user) or `.gemini/settings.json` (project):
+
+    ```json
+    {
+      "mcpServers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+  </Tab>
+  <Tab title="AMP">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client amp
+    ```
+
+    Or add this configuration to `~/.config/amp/settings.json`:
+
+    ```json
+    {
+      "amp.mcpServers": {
+        "trigger": {
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Sourcegraph AMP MCP docs ↗](https://ampcode.com/manual#mcp)
+  </Tab>
+  <Tab title="Codex CLI">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client openai-codex
+    ```
+
+    Or add this configuration to `~/.codex/config.toml`:
+
+    ```toml
+    [mcp_servers.trigger]
+    command = "npx"
+    args = ["trigger.dev@latest", "mcp"]
+    ```
+  </Tab>
+  <Tab title="Crush">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client crush
+    ```
+
+    Or add this configuration to `.crush.json` (project), `crush.json`, or `~/.config/crush/crush.json` (user). Files are loaded in priority order: `.crush.json` → `crush.json` → `$HOME/.config/crush/crush.json`.
+
+    ```json
+    {
+      "mcp": {
+        "trigger": {
+          "type": "stdio",
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+
+    [View Charm MCP docs ↗](https://github.com/charmbracelet/crush)
+  </Tab>
+  <Tab title="opencode">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client opencode
+    ```
+
+    Or add this configuration to `~/.config/opencode/opencode.json` (user) or `./opencode.json` (project):
+
+    ```json
+    {
+      "mcp": {
+        "trigger": {
+          "type": "local",
+          "command": ["npx", "trigger.dev@latest", "mcp"],
+          "enabled": true
+        }
+      }
+    }
+    ```
+
+    [View opencode MCP docs ↗](https://opencode.ai/docs/mcp-servers/)
+  </Tab>
+  <Tab title="Ruler">
+    Install using the command line:
+
+    ```bash
+    npx trigger.dev@latest install-mcp --client ruler
+    ```
+
+    Or add this configuration to `.ruler/mcp.json`:
+
+    ```json
+    {
+      "mcpServers": {
+        "trigger": {
+          "type": "stdio",
+          "command": "npx",
+          "args": ["trigger.dev@latest", "mcp"]
+        }
+      }
+    }
+    ```
+  </Tab>
+</Tabs>
+
+After adding the config, restart your client. You should see a server named **trigger** connect automatically.
+
+## Authentication
+
+The `search_docs` tool works without authentication. All other tools require you to be logged in via the [Trigger.dev CLI](/cli-login-commands). The first time you use an authenticated tool, your MCP client will prompt you to log in.
+
+<Accordion title="CLI Options">
+
+The `install-mcp` command supports these options:
+
+**Core Options**
+
+- `-p, --project-ref <project ref>` — Scope the MCP server to a specific project
+- `-t, --tag <package tag>` — CLI package version to use (default: latest)
+- `--dev-only` — Restrict to the dev environment only
+- `--yolo` — Install into all supported clients automatically
+- `--scope <scope>` — `user`, `project`, or `local`
+- `--client <clients...>` — Install into specific client(s)
+
+**Configuration Options**
+
+- `--log-file <log file>` — Write logs to a file
+- `-a, --api-url <value>` — Custom Trigger.dev API URL
+- `-l, --log-level <level>` — Log level (debug, info, log, warn, error, none)
+
+**Examples**
+
+Install for all supported clients:
+
+```bash
+npx trigger.dev@latest install-mcp --yolo
+```
+
+Install for specific clients:
+
+```bash
+npx trigger.dev@latest install-mcp --client claude-code cursor --scope user
+```
+
+Restrict to dev environment for a specific project:
+
+```bash
+npx trigger.dev@latest install-mcp --dev-only --project-ref proj_abc123
+```
+
+To add these options to a manual config, append them to the `args` array:
+
+```json
+{
+  "args": ["trigger.dev@latest", "mcp", "--dev-only", "--project-ref", "proj_abc123"]
+}
+```
+
+</Accordion>
+
+## Getting Started
+
+Once installed, you can start using the MCP server by asking your AI assistant questions like:
+
+- `"Search the trigger docs for a ffmpeg example"`
+- `"Initialize trigger.dev in my project"`
+- `"Get all tasks in my project"`
+- `"Trigger my foobar task with a sample payload"`
+- `"Get the details of the latest run for my foobar task"`
+- `"List all runs for my foobar task"`
+- `"Deploy my project to staging"`
+- `"Deploy my project to production"`
+
+## Next Steps
+
+<CardGroup cols={2}>
+  <Card title="MCP Tools" icon="wrench" href="/mcp-tools">
+    Explore all available MCP tools for managing your projects.
+  </Card>
+  <Card title="Skills" icon="wand-magic-sparkles" href="/skills">
+    Portable instruction sets that teach AI assistants Trigger.dev patterns.
+  </Card>
+  <Card title="Agent Rules" icon="scroll" href="/mcp-agent-rules">
+    Install comprehensive rule sets directly into your AI client.
+  </Card>
+</CardGroup>
diff --git a/docs/mcp-tools.mdx b/docs/mcp-tools.mdx
new file mode 100644
index 00000000000..fdcdb56f3d6
--- /dev/null
+++ b/docs/mcp-tools.mdx
@@ -0,0 +1,133 @@
+---
+title: "MCP Tools"
+sidebarTitle: "Tools"
+description: "Learn about how to use the tools available in the Trigger.dev MCP Server"
+---
+
+## Documentation and Search Tools
+
+### search_docs
+
+Search the Trigger.dev documentation for guides, examples, and API references.
+
+**Example usage:**
+- `"How do I create a scheduled task?"`
+- `"Show me webhook examples"`
+- `"What are the deployment options?"`
+
+## Project Management Tools
+
+### list_orgs
+
+List all organizations you have access to.
+
+**Example usage:**
+- `"What organizations do I have?"`
+- `"Show me my orgs"`
+
+### list_projects
+
+List all projects in your Trigger.dev account.
+
+**Example usage:**
+- `"What projects do I have?"`
+- `"List my Trigger.dev projects"`
+
+### create_project_in_org
+
+Create a new project in an organization.
+
+**Example usage:**
+- `"Create a new project called 'my-app'"`
+- `"Set up a new Trigger.dev project"`
+
+### initialize_project
+
+Initialize Trigger.dev in your project with automatic setup and configuration.
+
+**Example usage:**
+- `"Set up Trigger.dev in this project"`
+- `"Add Trigger.dev to my app"`
+
+## Task Management Tools
+
+### get_current_worker
+
+Get the current worker for a project, including the worker version, SDK version, and registered tasks with their payload schemas.
+
+**Example usage:**
+- `"What tasks are available?"`
+- `"Show me the tasks in dev"`
+
+### trigger_task
+
+Trigger a task to run with a specific payload. You can add a delay, set tags, configure retries, choose a machine size, set a TTL, or use an idempotency key.
+
+**Example usage:**
+- `"Run the email-notification task"`
+- `"Trigger my-task with userId 123"`
+- `"Execute the sync task in production"`
+
+## Run Monitoring Tools
+
+### get_run_details
+
+Get detailed information about a specific task run, including logs and status. Enable debug mode to get the full trace with all logs and spans.
+
+**Example usage:**
+- `"Show me details for run run_abc123"`
+- `"Why did this run fail?"`
+
+### list_runs
+
+List runs for a project. Filter by status, task, tags, version, machine size, or time period.
+
+**Example usage:**
+- `"Show me recent runs"`
+- `"List failed runs from the last 7 days"`
+- `"What runs are currently executing?"`
+
+### wait_for_run_to_complete
+
+Wait for a specific run to finish and return the result.
+
+**Example usage:**
+- `"Wait for run run_abc123 to complete"`
+
+### cancel_run
+
+Cancel a running or queued run.
+
+**Example usage:**
+- `"Cancel run run_abc123"`
+- `"Stop that task"`
+
+## Deployment Tools
+
+### deploy
+
+Deploy your project to staging or production.
+
+**Example usage:**
+- `"Deploy to production"`
+- `"Deploy to staging"`
+
+### list_deploys
+
+List deployments for a project. Filter by status or time period.
+
+**Example usage:**
+- `"Show me recent deployments"`
+- `"What's deployed to production?"`
+
+### list_preview_branches
+
+List all preview branches in the project.
+
+**Example usage:**
+- `"What preview branches exist?"`
+- `"Show me preview deployments"`
+
+<Callout type="warning">
+  The deploy and list_preview_branches tools are not available when the MCP server is running with the `--dev-only` flag.
+</Callout>
diff --git a/docs/migrating-from-v3.mdx b/docs/migrating-from-v3.mdx
new file mode 100644
index 00000000000..5530d66b62d
--- /dev/null
+++ b/docs/migrating-from-v3.mdx
@@ -0,0 +1,334 @@
+---
+title: "Migrating from v3"
+description: "What's new in v4, how to migrate, and breaking changes."
+---
+
+import NodeVersions from "/snippets/node-versions.mdx";
+import MigrateV4UsingAi from "/snippets/migrate-v4-using-ai.mdx";
+
+<Warning>
+  **Action required: Trigger.dev v3 deprecation**
+
+We're retiring Trigger.dev v3. **New v3 deploys will stop working from 1 April 2026.** Trigger.dev v4 is stable, fully supported, and recommended for all users.
+
+**Key dates:**
+
+- **1 April 2026** — New v3 deploys will no longer work. Existing v3 runs will continue to execute.
+- **1 July 2026** — v3 will be fully shut down. All v3 runs will stop executing.
+
+**What you need to do:** Migrate to v4 before April to avoid disruption to your task executions. The migration takes about 2 minutes — follow the steps on this page below. If you have questions or need help, [contact us](https://trigger.dev/contact) or reach out in our [Discord](https://trigger.dev/discord).
+
+</Warning>
+
+## What's new in v4?
+
+| Feature                                                              | Description                                                                                                                                                                                                |
+| :------------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [Wait for token](/wait-for-token)                                    | Create and wait for tokens to be completed, enabling approval workflows and waiting for arbitrary external conditions.                                                                                     |
+| Wait idempotency                                                     | Skip waits if the same idempotency key is used again when using [wait for](/wait-for#wait-idempotency), [wait until](/wait-until#wait-idempotency), or [wait for token](/wait-for-token#wait-idempotency). |
+| [Priority](/runs/priority)                                           | Specify a priority when triggering a task.                                                                                                                                                                 |
+| [Global lifecycle hooks](/tasks/overview#global-lifecycle-hooks)     | Register global lifecycle hooks that are executed for all runs, regardless of the task.                                                                                                                    |
+| [onWait and onResume](/tasks/overview#onwait-and-onresume-functions) | Run code when a run is paused or resumed because of a wait.                                                                                                                                                |
+| [onComplete](/tasks/overview#oncomplete-function)                    | Run code when a run completes, regardless of whether it succeeded or failed.                                                                                                                               |
+| [onCancel](/tasks/overview#oncancel-function)                        | Run code when a run is cancelled.                                                                                                                                                                          |
+| [Hidden tasks](/hidden-tasks)                                        | Create tasks that are not exported from your trigger files but can still be executed.                                                                                                                      |
+| [Middleware & locals](#middleware-and-locals)                        | The middleware system runs at the top level, executing before and after all lifecycle hooks. The locals API allows sharing data between middleware and hooks.                                              |
+| [useWaitToken](/realtime/react-hooks/use-wait-token)                 | Use the useWaitToken hook to complete a wait token from a React component.                                                                                                                                 |
+| [ai.tool](/tasks/schemaTask#ai-tool)                                 | Create an AI tool from an existing `schemaTask` to use with the Vercel [AI SDK](https://vercel.com/docs/ai-sdk).                                                                                           |
+
+## Node.js support
+
+<NodeVersions />
+
+## How to migrate to v4
+
+First read the deprecations and breaking changes sections below.
+
+We recommend the following steps to migrate to v4:
+
+1. Install the v4 package.
+2. Run the `trigger dev` CLI command and test your tasks locally, fixing any breaking changes.
+3. Deploy to the staging environment and test your tasks in staging, fixing any breaking changes. (this step is optional, but highly recommended)
+4. Once you've verified that v4 is working as expected, you should deploy your application backend with the updated v4 package.
+5. Once you've deployed your application backend, you should deploy your tasks to the production environment.
+
+Note that between steps 4 and 5, runs triggered with the v4 package will continue using v3, and only new runs triggered after step 5 is complete will use v4.
+
+<Warning>
+  Once v4 is activated in your environment, there will be a period of time where old runs will
+  continue to execute using v3, while new runs will use v4. Because these engines use completely
+  different underlying queues and concurrency models, it's possible you may have up to double the
+  amount of concurrently executing runs. Once the runs drain from the old run engine, the
+  concurrency will return to normal.
+</Warning>
+
+<Note>
+  When migrating from v3 to v4, our infrastructure IPs may change. If you use IP allowlisting (e.g. for databases or APIs), [update your allowlists](https://trigger.dev/changelog/static-ips) with the current static IPs before or immediately after switching to v4 to avoid connectivity issues or downtime.
+</Note>
+
+## Migrate using AI
+
+Use the prompt in the accordion below to help you migrate your v3 tasks to v4. The prompt gives good results when using Claude 4 Sonnet. You’ll need a relatively large token limit.
+
+<MigrateV4UsingAi />
+
+## Installation
+
+To opt-in to using v4, you will need to update your dependencies to the latest version:
+
+<CodeGroup>
+
+```bash npx
+npx trigger.dev@latest update
+```
+
+```bash yarn
+yarn dlx trigger.dev@latest update
+```
+
+```bash pnpm
+pnpm dlx trigger.dev@latest update
+```
+
+</CodeGroup>
+
+This command should update all of your `@trigger.dev/*` packages to a `4.x` version.
+
+## Deprecations
+
+We've deprecated the following APIs:
+
+### @trigger.dev/sdk/v3
+
+We've deprecated the `@trigger.dev/sdk/v3` import path and moved to a new path:
+
+```ts
+// This still works, but will be removed in a future version
+import { task } from "@trigger.dev/sdk/v3";
+
+// This is the new path
+import { task } from "@trigger.dev/sdk";
+```
+
+### `handleError` and `init`
+
+We've renamed the `handleError` hook to `catchError` to better reflect that it can catch and react to errors. `handleError` will be removed in a future version.
+
+`init` was previously used to initialize data used in the run function:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+const myTask = task({
+  init: async () => {
+    return {
+      myClient: new MyClient(),
+    };
+  },
+  run: async (payload: any, { ctx, init }) => {
+    const client = init.myClient;
+    await client.doSomething();
+  },
+});
+```
+
+This has now been deprecated in favor of the `locals` API and middleware. See the [Improved middleware and locals](/tasks/overview#middleware-and-locals-functions) section for more details.
+
+### toolTask
+
+We've deprecated the `toolTask` function, which created both a Trigger.dev task and a tool compatible with the Vercel [AI SDK](https://vercel.com/docs/ai-sdk):
+
+```ts
+import { toolTask, schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+import { generateText } from "ai";
+
+const myToolTask = toolTask({
+  id: "my-tool-task",
+  run: async (payload: any, { ctx }) => {},
+});
+
+export const myAiTask = schemaTask({
+  id: "my-ai-task",
+  schema: z.object({
+    text: z.string(),
+  }),
+  run: async (payload, { ctx }) => {
+    const { text } = await generateText({
+      prompt: payload.text,
+      model: openai("gpt-4o"),
+      tools: {
+        myToolTask,
+      },
+    });
+  },
+});
+```
+
+We've replaced the `toolTask` function with the `ai.tool` function, which creates an AI tool from an existing `schemaTask`. See the [ai.tool](/tasks/schemaTask#ai-tool) page for more details.
+
+## Breaking changes
+
+### Queue changes
+
+Previously, it was possible to specify a queue name of a queue that did not exist, along with a concurrency limit. The queue would then be created "on-demand" with the specified concurrency limit. If the queue did exist, the concurrency limit of the queue would be updated to the specified value:
+
+```ts
+await myTask.trigger({ foo: "bar" }, { queue: { name: "my-queue", concurrencyLimit: 10 } });
+```
+
+This is no longer possible, and queues must now be defined ahead of time using the `queue` function:
+
+```ts
+import { queue } from "@trigger.dev/sdk";
+
+const myQueue = queue({
+  name: "my-queue",
+  concurrencyLimit: 10,
+});
+```
+
+Now when you trigger a task, you can only specify the queue by name:
+
+```ts
+await myTask.trigger({ foo: "bar" }, { queue: "my-queue" });
+```
+
+Or you can set the queue on the task:
+
+```ts
+import { queue, task } from "@trigger.dev/sdk";
+
+const myQueue = queue({
+  name: "my-queue",
+  concurrencyLimit: 10,
+});
+
+export const myTask = task({
+  id: "my-task",
+  queue: myQueue,
+  run: async (payload: any, { ctx }) => {},
+});
+
+// You can optionally specify the queue directly on the task
+export const myTask2 = task({
+  id: "my-task-2",
+  queue: {
+    name: "my-queue-2",
+    concurrencyLimit: 50,
+  },
+  run: async (payload: any, { ctx }) => {},
+});
+```
+
+Now you can trigger these tasks without having to specify the queue name in the trigger options:
+
+```ts
+await myTask.trigger({ foo: "bar" }); // Will use the queue defined on the task
+await myTask2.trigger({ foo: "bar" }); // Will use the queue defined on the task
+```
+
+If you're using `concurrencyKey` you can specify the `queue` and `concurrencyKey` like this:
+
+```ts
+const handle = await generatePullRequest.trigger(data, {
+  queue: "paid-users",
+  concurrencyKey: data.userId,
+});
+```
+
+For each unique value of `concurrencyKey`, a new queue will be created using the `concurrencyLimit` from the queue. This allows you to have a queue per user.
+
+### Lifecycle hooks
+
+We've changed the function signatures of the lifecycle hooks to be more consistent and easier to use, by unifying all the parameters into a single object that can be destructured.
+
+Previously, hooks received a payload as the first argument and then an additional object as the second argument:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  onStart: ({ payload, ctx }) => {},
+  run: async (payload, { ctx }) => {},
+});
+```
+
+Now, all the parameters are passed in a single object:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  onStart: ({ payload, ctx }) => {},
+  // The run function still uses separate parameters
+  run: async (payload, { ctx }) => {},
+});
+```
+
+This is true for all the lifecycle hooks:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  onStart: ({ payload, ctx, task }) => {},
+  onSuccess: ({ payload, ctx, task, output }) => {},
+  onFailure: ({ payload, ctx, task, error }) => {},
+  onWait: ({ payload, ctx, task, wait }) => {},
+  onResume: ({ payload, ctx, task, wait }) => {},
+  onComplete: ({ payload, ctx, task, result }) => {},
+  catchError: ({ payload, ctx, task, error, retry, retryAt, retryDelayInMs }) => {},
+  run: async (payload, { ctx }) => {},
+});
+```
+
+### Context changes
+
+We've made a few small changes to the `ctx` object:
+
+- `ctx.attempt.id` and `ctx.attempt.status` have been removed. `ctx.attempt.number` is still available.
+- `ctx.task.exportName` has been removed (since we no longer require tasks to be exported to be triggered).
+
+### BatchTrigger changes
+
+The `batchTrigger` function no longer returns a `runs` list directly. In v3, you could access the runs directly from the batch handle:
+
+```ts
+// In v3
+const batchHandle = await tasks.batchTrigger([
+  [myTask, { foo: "bar" }],
+  [myOtherTask, { baz: "qux" }],
+]);
+
+// You could access runs directly
+console.log(batchHandle.runs);
+```
+
+In v4, you now need to use the `batch.retrieve()` method to get the batch with its runs:
+
+```ts
+// In v4
+const batchHandle = await tasks.batchTrigger([
+  [myTask, { foo: "bar" }],
+  [myOtherTask, { baz: "qux" }],
+]);
+
+// Now you need to retrieve the batch to get the runs
+const batch = await batch.retrieve(batchHandle.batchId);
+console.log(batch.runs);
+```
+
+### OpenTelemetry
+
+We are now using newer versions of the OpenTelemetry packages. This means that if you're using custom exporters you may need to update the packages:
+
+| Package                                   | Previous Version | New Version | Change Type  |
+| ----------------------------------------- | ---------------- | ----------- | ------------ |
+| `@opentelemetry/api-logs`                 | 0.52.1           | 0.203.0     | Major update |
+| `@opentelemetry/exporter-logs-otlp-http`  | 0.52.1           | 0.203.0     | Major update |
+| `@opentelemetry/exporter-trace-otlp-http` | 0.52.1           | 0.203.0     | Major update |
+| `@opentelemetry/instrumentation`          | 0.52.1           | 0.203.0     | Major update |
diff --git a/docs/migration-defer.mdx b/docs/migration-defer.mdx
index b40a29624fc..0a7d7f9292d 100644
--- a/docs/migration-defer.mdx
+++ b/docs/migration-defer.mdx
@@ -204,7 +204,7 @@ In Trigger.dev it looks like this:
 
 ```ts /trigger/someTasks.ts
 import { performLongRunningTask } from "@/utils/performLongRunningTask";
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 //named export
 export const longRunningTask = task({
@@ -259,7 +259,7 @@ export default defer.cron(sendMondayNewletter, "0 0 * * 1");
 In Trigger.dev the task looks like this:
 
 ```ts
-import { schedules } from "@trigger.dev/sdk/v3";
+import { schedules } from "@trigger.dev/sdk";
 
 //this task will run when any of the attached schedules trigger
 export const sendMondayNewletter = schedules.task({
diff --git a/docs/migration-mergent.mdx b/docs/migration-mergent.mdx
index b41e691b2a8..7b90675b191 100644
--- a/docs/migration-mergent.mdx
+++ b/docs/migration-mergent.mdx
@@ -48,7 +48,7 @@ This is typically called by Mergent via HTTP POST, and you’d register the endp
 #### The same task in Trigger.dev
 
 ```ts trigger/processVideo.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const processVideoTask = task({
   id: "process-video",
@@ -83,7 +83,7 @@ export async function dailyReportTask(req) {
 **Trigger.dev scheduled task:**
 
 ```ts trigger/dailyReport.ts
-import { schedules } from "@trigger.dev/sdk/v3";
+import { schedules } from "@trigger.dev/sdk";
 
 export const dailyReportTask = schedules.task({
   id: "daily-report",
diff --git a/docs/open-source-self-hosting.mdx b/docs/open-source-self-hosting.mdx
index a3c56274ecc..ba5fc498701 100644
--- a/docs/open-source-self-hosting.mdx
+++ b/docs/open-source-self-hosting.mdx
@@ -1,14 +1,12 @@
 ---
 title: "Docker (legacy)"
-description: "You can self-host Trigger.dev on your own infrastructure using Docker."
+description: "Self-host Trigger.dev on your own infrastructure using Docker."
 ---
 
-<Tip>This guide is for v3, you can find the v4 guide [here](/self-hosting/docker).</Tip>
+<Note>This is a legacy guide for self-hosting v3 using Docker, you can find the v4 guide [here](/self-hosting/docker).</Note>
 
 <Warning>Security, scaling, and reliability concerns are not fully addressed here. This guide is meant for evaluation purposes and won't result in a production-ready deployment.</Warning>
 
-<Note>This guide is for Docker only. We don't currently provide documentation for Kubernetes.</Note>
-
 ## Overview
 
 <Frame>
@@ -315,7 +313,7 @@ All email addresses can sign up and log in this way. If you would like to restri
 
 ```bash
 # every email that does not match this regex will be rejected
-WHITELISTED_EMAILS="authorized@yahoo\.com|authorized@gmail\.com"
+WHITELISTED_EMAILS="^(authorized@yahoo\.com|authorized@gmail\.com)$"
 ```
 
 It's currently impossible to restrict GitHub OAuth logins by account name or email like above, so this method is _not recommended_ for self-hosted instances. It's also very easy to lock yourself out of your own instance.
diff --git a/docs/openapi.yml b/docs/openapi.yml
index d5dd12ff467..922e8d7f287 100644
--- a/docs/openapi.yml
+++ b/docs/openapi.yml
@@ -43,6 +43,159 @@ paths:
               schema:
                 $ref: "#/components/schemas/Error"
 
+  /api/v3/batches:
+    post:
+      operationId: createBatch
+      externalDocs:
+        description: Find more info here
+        url: "https://trigger.dev/docs/triggering"
+      tags:
+        - Batches
+      summary: Create a batch (Phase 1)
+      description: |
+        Phase 1 of 2-phase batch API. Creates a batch record and optionally blocks the parent run for batchTriggerAndWait.
+        After creating a batch, stream items via POST /api/v3/batches/{batchId}/items.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/CreateBatchRequest"
+      responses:
+        "202":
+          description: Batch successfully created
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/CreateBatchResponse"
+          headers:
+            x-trigger-jwt-claims:
+              description: JWT claims for the batch
+              schema:
+                type: string
+            x-trigger-jwt:
+              description: JWT token for browser clients
+              schema:
+                type: string
+        "400":
+          description: Invalid request (e.g., runCount <= 0 or exceeds maximum)
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "401":
+          description: Unauthorized - API key is missing or invalid
+        "422":
+          description: Validation error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "429":
+          description: Rate limit exceeded
+          headers:
+            X-RateLimit-Limit:
+              description: Maximum number of requests allowed
+              schema:
+                type: integer
+            X-RateLimit-Remaining:
+              description: Number of requests remaining
+              schema:
+                type: integer
+            X-RateLimit-Reset:
+              description: Unix timestamp when the rate limit resets
+              schema:
+                type: integer
+            Retry-After:
+              description: Seconds to wait before retrying
+              schema:
+                type: integer
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "500":
+          description: Internal server error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+
+  /api/v3/batches/{batchId}/items:
+    post:
+      operationId: streamBatchItems
+      externalDocs:
+        description: Find more info here
+        url: "https://trigger.dev/docs/triggering"
+      tags:
+        - Batches
+      summary: Stream batch items (Phase 2)
+      description: |
+        Phase 2 of 2-phase batch API. Accepts an NDJSON stream of batch items and enqueues them.
+        Each line in the body should be a valid BatchItemNDJSON object.
+        The stream is processed with backpressure - items are enqueued as they arrive.
+        The batch is sealed when the stream completes successfully.
+      parameters:
+        - name: batchId
+          in: path
+          required: true
+          description: The batch ID returned from POST /api/v3/batches
+          schema:
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/x-ndjson:
+            schema:
+              type: string
+              description: |
+                NDJSON (newline-delimited JSON) stream where each line is a BatchItemNDJSON object.
+                Example:
+                {"index":0,"task":"my-task","payload":{"key":"value1"}}
+                {"index":1,"task":"my-task","payload":{"key":"value2"}}
+          application/ndjson:
+            schema:
+              type: string
+              description: |
+                NDJSON (newline-delimited JSON) stream where each line is a BatchItemNDJSON object.
+      responses:
+        "200":
+          description: Items successfully processed
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/StreamBatchItemsResponse"
+        "400":
+          description: Invalid request (e.g., invalid JSON, item exceeds maximum size)
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "401":
+          description: Unauthorized - API key is missing or invalid
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "415":
+          description: Unsupported Media Type - Content-Type must be application/x-ndjson or application/ndjson
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "422":
+          description: Validation error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+        "500":
+          description: Internal server error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+
 components:
   schemas:
     Error:
@@ -130,6 +283,91 @@ components:
       type: object
       additionalProperties: true
       description: A JSON object that represents the deserialized payload or context.
+    CreateBatchRequest:
+      type: object
+      required:
+        - runCount
+      properties:
+        runCount:
+          type: integer
+          minimum: 1
+          description: Expected number of items in the batch. Must be a positive integer.
+        parentRunId:
+          type: string
+          description: Parent run ID (friendly ID) for batchTriggerAndWait.
+        resumeParentOnCompletion:
+          type: boolean
+          description: Whether to resume parent on completion. Set to true for batchTriggerAndWait.
+        idempotencyKey:
+          type: string
+          description: Idempotency key for the batch. If provided and a batch with this key already exists, the existing batch will be returned.
+    CreateBatchResponse:
+      type: object
+      required:
+        - id
+        - runCount
+        - isCached
+      properties:
+        id:
+          type: string
+          description: The batch ID (friendly ID). Use this to stream items via POST /api/v3/batches/{batchId}/items.
+        runCount:
+          type: integer
+          description: The expected run count.
+        isCached:
+          type: boolean
+          description: Whether this response came from a cached/idempotent batch.
+        idempotencyKey:
+          type: string
+          description: The idempotency key if provided.
+    BatchItemNDJSON:
+      type: object
+      required:
+        - index
+        - task
+      properties:
+        index:
+          type: integer
+          minimum: 0
+          description: Zero-based index of this item. Used for idempotency and ordering.
+        task:
+          type: string
+          description: The task identifier to trigger.
+        payload:
+          description: The payload for this task run. Can be any JSON value.
+        options:
+          type: object
+          additionalProperties: true
+          description: Options for this specific item.
+    StreamBatchItemsResponse:
+      type: object
+      required:
+        - id
+        - itemsAccepted
+        - itemsDeduplicated
+        - sealed
+      properties:
+        id:
+          type: string
+          description: The batch ID.
+        itemsAccepted:
+          type: integer
+          description: Number of items successfully accepted.
+        itemsDeduplicated:
+          type: integer
+          description: Number of items that were deduplicated (already enqueued).
+        sealed:
+          type: boolean
+          description: |
+            Whether the batch was sealed and is ready for processing.
+            If false, the batch needs more items before processing can start.
+            Clients should check this field and retry with missing items if needed.
+        enqueuedCount:
+          type: integer
+          description: Total items currently enqueued. Only present when sealed=false to help with retries.
+        expectedCount:
+          type: integer
+          description: Expected total item count. Only present when sealed=false to help with retries.
   securitySchemes:
     BearerAuth:
       type: http
diff --git a/docs/queue-concurrency.mdx b/docs/queue-concurrency.mdx
index b76e3746950..24e77f4e67f 100644
--- a/docs/queue-concurrency.mdx
+++ b/docs/queue-concurrency.mdx
@@ -3,7 +3,9 @@ title: "Concurrency & Queues"
 description: "Configure what you want to happen when there is more than one run at a time."
 ---
 
-When you trigger a task, it isn't executed immediately. Instead, the task [run](/runs) is placed into a queue for execution. By default, each task gets its own queue with unbounded concurrency—meaning the task runs as soon as resources are available, subject only to the overall concurrency limits of your environment. If you need more control (for example, to limit concurrency or share limits across multiple tasks), you can define a custom queue as described later in this document.
+When you trigger a task, it isn't executed immediately. Instead, the task [run](/runs) is placed into a queue for execution.
+
+By default, each task gets its own queue and the concurrency is only limited by your environment concurrency limit. If you need more control (for example, to limit concurrency or share limits across multiple tasks), you can define a custom queue as described later.
 
 Controlling concurrency is useful when you have a task that can't be run concurrently, or when you want to limit the number of runs to avoid overloading a resource.
 
@@ -11,12 +13,14 @@ It's important to note that only actively executing runs count towards concurren
 
 ## Default concurrency
 
-By default, all tasks have an unbounded concurrency limit, limited only by the overall concurrency limits of your environment. This means that each task could possibly "fill up" the entire
-concurrency limit of your environment.
+By default, all tasks have an unbounded concurrency limit, limited only by the overall concurrency limits of your environment.
 
 <Note>
-  Your environment has a maximum concurrency limit which depends on your plan. If you're a paying
-  customer you can request a higher limit by [contacting us](https://www.trigger.dev/contact).
+  Your environment has a base concurrency limit and a burstable limit (default burst factor of 2.0x
+  the base limit). Individual queues are limited by the base concurrency limit, not the burstable
+  limit. For example, if your base limit is 10, your environment can burst up to 20 concurrent runs,
+  but any single queue can have at most 10 concurrent runs. If you're a paying customer you can
+  request higher burst limits by [contacting us](https://www.trigger.dev/contact).
 </Note>
 
 ## Setting task concurrency
@@ -67,13 +71,18 @@ export const task2 = task({
 
 In this example, `task1` and `task2` share the same queue, so only one of them can run at a time.
 
-## Setting the concurrency when you trigger a run
+## Setting the queue when you trigger a run
 
-When you trigger a task you can override the concurrency limit. This is really useful if you sometimes have high priority runs.
+When you trigger a task you can override the default queue. This is really useful if you sometimes have high priority runs.
 
-The task:
+The task and queue definition:
 
 ```ts /trigger/override-concurrency.ts
+const paidQueue = queue({
+  name: "paid-users",
+  concurrencyLimit: 10,
+});
+
 export const generatePullRequest = task({
   id: "generate-pull-request",
   queue: {
@@ -86,7 +95,7 @@ export const generatePullRequest = task({
 });
 ```
 
-Triggering from your backend and overriding the concurrency:
+Triggering from your backend and overriding the queue:
 
 ```ts app/api/push/route.ts
 import { generatePullRequest } from "~/trigger/override-concurrency";
@@ -95,19 +104,15 @@ export async function POST(request: Request) {
   const data = await request.json();
 
   if (data.branch === "main") {
-    //trigger the task, with a different queue
+    //trigger the task, with the paid users queue
     const handle = await generatePullRequest.trigger(data, {
-      queue: {
-        //the "main-branch" queue will have a concurrency limit of 10
-        //this triggered run will use that queue
-        name: "main-branch", // Make sure to change the queue name or the task concurrency limit will be updated
-        concurrencyLimit: 10,
-      },
+      // Set the paid users queue
+      queue: "paid-users",
     });
 
     return Response.json(handle);
   } else {
-    //triggered with the default (concurrency of 1)
+    //triggered with the default queue (concurrency of 1)
     const handle = await generatePullRequest.trigger(data);
     return Response.json(handle);
   }
@@ -118,7 +123,7 @@ export async function POST(request: Request) {
 
 If you're building an application where you want to run tasks for your users, you might want a separate queue for each of your users (or orgs, projects, etc.).
 
-You can do this by using `concurrencyKey`. It creates a separate queue for each value of the key.
+You can do this by using `concurrencyKey`. It creates a copy of the queue for each unique value of the key.
 
 Your backend code:
 
@@ -129,26 +134,20 @@ export async function POST(request: Request) {
   const data = await request.json();
 
   if (data.isFreeUser) {
-    //free users can only have 1 PR generated at a time
+    //the "free-users" queue has a concurrency limit of 1
     const handle = await generatePullRequest.trigger(data, {
-      queue: {
-        //every free user gets a queue with a concurrency limit of 1
-        name: "free-users",
-        concurrencyLimit: 1,
-      },
+      queue: "free-users",
+      //this creates a free-users queue for each user
       concurrencyKey: data.userId,
     });
 
     //return a success response with the handle
     return Response.json(handle);
   } else {
-    //trigger the task, with a different queue
+    //the "paid-users" queue has a concurrency limit of 10
     const handle = await generatePullRequest.trigger(data, {
-      queue: {
-        //every paid user gets a queue with a concurrency limit of 10
-        name: "paid-users",
-        concurrencyLimit: 10,
-      },
+      queue: "paid-users",
+      //this creates a paid-users queue for each user
       concurrencyKey: data.userId,
     });
 
@@ -160,7 +159,7 @@ export async function POST(request: Request) {
 
 ## Concurrency and subtasks
 
-When you trigger a task that has subtasks, the subtasks will not inherit the concurrency settings of the parent task. Unless otherwise specified, subtasks will run on their own queue
+When you trigger a task that has subtasks, the subtasks will not inherit the queue from the parent task. Unless otherwise specified, subtasks will run on their own queue
 
 ```ts /trigger/subtasks.ts
 export const parentTask = task({
@@ -182,21 +181,27 @@ export const subtask = task({
 
 ## Waits and concurrency
 
-With our [task checkpoint system](/how-it-works#the-checkpoint-resume-system), a parent task can trigger and wait for a subtask to complete. The way this system interacts with the concurrency system is a little complicated but important to understand. There are two main scenarios that we handle slightly differently:
+With our [task checkpoint system](/how-it-works#the-checkpoint-resume-system), tasks can wait at various waitpoints (like waiting for subtasks to complete, delays, or external events). The way this system interacts with the concurrency system is important to understand.
 
-- When a parent task waits for a subtask on a different queue.
-- When a parent task waits for a subtask on the same queue.
+Concurrency is only released when a run reaches a waitpoint and is checkpointed. When a run is checkpointed, it transitions to the `WAITING` state and releases its concurrency slot back to both the queue and the environment, allowing other runs to execute or resume.
 
-These scenarios are discussed in more detail below:
+This means that:
 
-<Note>
-  We sometimes refer to the parent task as the "parent" and the subtask as the "child". Subtask and
-  child task are used interchangeably. We apologize for the confusion.
-</Note>
+- Only actively executing runs count towards concurrency limits
+- Runs in the `WAITING` state (checkpointed at waitpoints) do not consume concurrency slots
+- You can have more runs in the `WAITING` state than your queue's concurrency limit
+- When a waiting run resumes (e.g., when a subtask completes), it must re-acquire a concurrency slot
+
+For example, if you have a queue with a `concurrencyLimit` of 1:
+
+- You can only have exactly 1 run executing at a time
+- You may have multiple runs in the `WAITING` state that belong to that queue
+- When the executing run reaches a waitpoint and checkpoints, it releases its slot
+- The next queued run can then begin execution
 
 ### Waiting for a subtask on a different queue
 
-During the time when a parent task is waiting on a subtask, the "concurrency" slot of the parent task is still considered occupied on the parent task queue, but is temporarily "released" to the environment. An example will help illustrate this:
+When a parent task triggers and waits for a subtask on a different queue, the parent task will checkpoint and release its concurrency slot once it reaches the wait point. This prevents environment deadlocks where all concurrency slots would be occupied by waiting tasks.
 
 ```ts /trigger/waiting.ts
 export const parentTask = task({
@@ -205,8 +210,10 @@ export const parentTask = task({
     concurrencyLimit: 1,
   },
   run: async (payload) => {
-    //trigger a subtask
+    //trigger a subtask and wait for it to complete
     await subtask.triggerAndWait(payload);
+    // The parent task checkpoints here and releases its concurrency slot
+    // allowing other tasks to execute while waiting
   },
 });
 
@@ -218,85 +225,130 @@ export const subtask = task({
 });
 ```
 
-For example purposes, let's say the environment concurrency limit is 1. When the parent task is triggered, it will occupy the only slot in the environment. When the parent task triggers the subtask, the subtask will be placed in the queue for the subtask. The parent task will then wait for the subtask to complete. During this time, the parent task slot is temporarily released to the environment, allowing another task to run. Once the subtask completes, the parent task slot is reoccupied.
+When the parent task reaches the `triggerAndWait` call, it checkpoints and transitions to the `WAITING` state, releasing its concurrency slot back to both its queue and the environment. Once the subtask completes, the parent task will resume and re-acquire a concurrency slot.
 
-This system prevents "stuck" tasks. If the parent task were to wait on the subtask and not release the slot, the environment would be stuck with only one task running.
+## Managing queues with the SDK
 
-And because only the environment slot is released, the parent task queue slot is still occupied. This means that if another task is triggered on the parent task queue, it will be placed in the queue and wait for the parent task to complete, respecting the concurrency limit.
+The SDK provides a `queues` namespace that allows you to manage queues programmatically. You can list, retrieve, pause, resume, and modify concurrency limits for queues.
 
-### Waiting for a subtask on the same queue
+<Note>
+  Import from `@trigger.dev/sdk`:
+  ```ts
+  import { queues } from "@trigger.dev/sdk";
+  ```
+</Note>
 
-Because tasks can trigger and wait recursively, or share the same queue, we've added special handling for when a parent task waits for a subtask on the same queue.
+### Listing queues
 
-Recall above that when waiting for a subtask on a different queue, the parent task slot is temporarily released to the environment. When the parent task and the subtask share a queue, we also release the parent task slot to the queue. Again, an example will help illustrate this:
+You can list all queues in your environment with pagination support:
 
-```ts /trigger/waiting-same-queue.ts
-export const myQueue = queue({
-  name: "my-queue",
-  concurrencyLimit: 1,
-});
+```ts
+import { queues } from "@trigger.dev/sdk";
 
-export const parentTask = task({
-  id: "parent-task",
-  queue: myQueue,
-  run: async (payload) => {
-    //trigger a subtask
-    await subtask.triggerAndWait(payload);
-  },
-});
+// List all queues (returns paginated results)
+const allQueues = await queues.list();
 
-export const subtask = task({
-  id: "subtask",
-  queue: myQueue,
-  run: async (payload) => {
-    //...
-  },
+// With pagination options
+const pagedQueues = await queues.list({
+  page: 1,
+  perPage: 20,
 });
 ```
 
-In this example, the parent task and the subtask share the same queue with a concurrency limit of 1. When the parent task triggers the subtask, the parent task slot is released to the queue, giving the subtask the opportunity to run. Once the subtask completes, the parent task slot is reoccupied.
+### Retrieving a queue
 
-It's very important to note that we only release at-most X slots to the queue, where X is the concurrency limit of the queue. This means that you can only trigger and wait for X subtasks on the same queue. If you try to trigger and wait for more than X subtasks, you will receive a `RECURSIVE_WAIT_DEADLOCK` error. The following example will result in a deadlock:
+You can retrieve a specific queue by its ID, or by its type and name:
 
-```ts /trigger/deadlock.ts
-export const myQueue = queue({
-  name: "my-queue",
-  concurrencyLimit: 1,
-});
+```ts
+import { queues } from "@trigger.dev/sdk";
 
-export const parentTask = task({
-  id: "parent-task",
-  queue: myQueue,
-  run: async (payload) => {
-    //trigger a subtask
-    await subtask.triggerAndWait(payload);
-  },
-});
+// Using queue ID (starts with "queue_")
+const queueById = await queues.retrieve("queue_1234");
 
-export const subtask = task({
-  id: "subtask",
-  queue: myQueue,
-  run: async (payload) => {
-    //trigger a subtask
-    await subsubtask.triggerAndWait(payload);
-  },
+// Using type and name for a task's default queue
+const taskQueue = await queues.retrieve({
+  type: "task",
+  name: "my-task-id",
 });
 
-export const subsubtask = task({
-  id: "subsubtask",
-  queue: myQueue,
-  run: async (payload) => {
-    //...
-  },
+// Using type and name for a custom queue
+const customQueue = await queues.retrieve({
+  type: "custom",
+  name: "my-custom-queue",
 });
 ```
 
-Now this will result in a `RECURSIVE_WAIT_DEADLOCK` error because the parent task is waiting for the subtask, and the subtask is waiting for the subsubtask, but there is no more concurrency available in the queue. It will look a bit like this in the logs:
+The queue object contains useful information about the queue state:
+
+```ts
+{
+  id: "queue_1234",       // Queue ID
+  name: "my-task-id",     // Queue name
+  type: "task",           // "task" or "custom"
+  running: 5,             // Currently executing runs
+  queued: 10,             // Runs waiting to execute
+  paused: false,          // Whether the queue is paused
+  concurrencyLimit: 10,   // Current concurrency limit
+  concurrency: {
+    current: 10,          // Effective limit
+    base: 10,             // Default limit from code
+    override: null,       // Override value (if set)
+    overriddenAt: null,   // When override was applied
+    overriddenBy: null,   // Who applied the override
+  }
+}
+```
+
+### Pausing and resuming queues
 
-![Recursive task deadlock](/images/recursive-task-deadlock-min.png)
+You can pause a queue to prevent new runs from starting. Runs that are currently executing will continue to completion.
 
-### Mitigating recursive wait deadlocks
+```ts
+import { queues } from "@trigger.dev/sdk";
 
-If you are recursively triggering and waiting for tasks on the same queue, you can mitigate the risk of a deadlock by increasing the concurrency limit of the queue. This will allow you to trigger and wait for more subtasks.
+// Pause a queue using its ID
+await queues.pause("queue_1234");
 
-You can also use different queues for the parent task and the subtask. This will allow you to trigger and wait for more subtasks without the risk of a deadlock.
+// Or using type and name
+await queues.pause({ type: "task", name: "my-task-id" });
+await queues.pause({ type: "custom", name: "my-custom-queue" });
+```
+
+To resume a paused queue and allow new runs to start:
+
+```ts
+import { queues } from "@trigger.dev/sdk";
+
+// Resume a queue using its ID
+await queues.resume("queue_1234");
+
+// Or using type and name
+await queues.resume({ type: "task", name: "my-task-id" });
+await queues.resume({ type: "custom", name: "my-custom-queue" });
+```
+
+### Overriding concurrency limits
+
+You can temporarily override a queue's concurrency limit. This is useful for scaling up or down based on demand:
+
+```ts
+import { queues } from "@trigger.dev/sdk";
+
+// Set concurrency limit to 5
+await queues.overrideConcurrencyLimit("queue_1234", 5);
+
+// Or using type and name
+await queues.overrideConcurrencyLimit({ type: "task", name: "my-task-id" }, 20);
+```
+
+To reset the concurrency limit back to the base value defined in your code:
+
+```ts
+import { queues } from "@trigger.dev/sdk";
+
+// Reset concurrency limit to the base value
+await queues.resetConcurrencyLimit("queue_1234");
+
+// Or using type and name
+await queues.resetConcurrencyLimit({ type: "task", name: "my-task-id" });
+```
diff --git a/docs/quick-start.mdx b/docs/quick-start.mdx
index d6253bc2697..375d225b670 100644
--- a/docs/quick-start.mdx
+++ b/docs/quick-start.mdx
@@ -8,29 +8,14 @@ import CliDevStep from '/snippets/step-cli-dev.mdx';
 import CliRunTestStep from '/snippets/step-run-test.mdx';
 import CliViewRunStep from '/snippets/step-view-run.mdx';
 
-In this guide we will:
 
-1. Create a `trigger.config.ts` file and a `/trigger` directory with an example task.
-2. Get you to run the task using the CLI.
-3. Show you how to view the run logs for that task.
+
 
 <Steps titleSize="h3">
 
 <Step title="Create a Trigger.dev account">
 
-You can either:
-
-- Use the [Trigger.dev Cloud](https://cloud.trigger.dev).
-- Or [self-host](/open-source-self-hosting) the service.
-
-</Step>
-
-<Step title="Create your first project">
-
-Once you've created an account, follow the steps in the app to:
-
-1. Complete your account details.
-2. Create your first Organization and Project.
+Sign up at [Trigger.dev Cloud](https://cloud.trigger.dev) (or [self-host](/open-source-self-hosting)). The onboarding flow will guide you through creating your first organization and project.
 
 </Step>
 
@@ -43,11 +28,18 @@ Once you've created an account, follow the steps in the app to:
 
 ## Next steps
 
-<CardGroup>
+<CardGroup cols={2}>
+<Card title="Building with AI" icon="brain" href="/building-with-ai">
+  Learn how to build Trigger.dev projects using AI coding assistants
+</Card>
   <Card title="How to trigger your tasks" icon="bolt" href="/triggering">
     Learn how to trigger tasks from your code.
   </Card>
   <Card title="Writing tasks" icon="wand-magic-sparkles" href="/tasks/overview">
     Tasks are the core of Trigger.dev. Learn what they are and how to write them.
   </Card>
+  <Card title="Guides and example projects" icon="books" href="/guides/introduction">
+  Guides and examples for triggering tasks from your code.
+</Card>
+
 </CardGroup>
diff --git a/docs/realtime/auth.mdx b/docs/realtime/auth.mdx
new file mode 100644
index 00000000000..80634b82a8a
--- /dev/null
+++ b/docs/realtime/auth.mdx
@@ -0,0 +1,204 @@
+---
+title: Realtime authentication
+sidebarTitle: Realtime auth
+description: Authenticating real-time API requests with Public Access Tokens or Trigger Tokens
+---
+
+To use the Realtime API, you need to authenticate your requests with Public Access Tokens or Trigger Tokens. These tokens provide secure, scoped access to your runs and can be used in both frontend and backend applications.
+
+## Token Types
+
+There are two types of tokens you can use with the Realtime API:
+
+- **[Public Access Tokens](#public-access-tokens-for-subscribing-to-runs)** - Used to read and subscribe to run data. Can be used in both the frontend and backend.
+- **[Trigger Tokens](#trigger-tokens-for-frontend-triggering-only)** - Used to trigger tasks from your frontend. These are more secure, single-use tokens that can only be used in the frontend.
+
+## Public Access Tokens (for subscribing to runs)
+
+Use Public Access Tokens to subscribe to runs and receive real-time updates in your frontend or backend.
+
+### Creating Public Access Tokens
+
+You can create a Public Access Token using the `auth.createPublicToken` function in your **backend** code:
+
+```tsx
+// Somewhere in your backend code
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken(); // 👈 this public access token has no permissions, so is pretty useless!
+```
+
+### Scopes
+
+By default a Public Access Token has no permissions. You must specify the scopes you need when creating a Public Access Token:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      runs: true, // ❌ this token can read all runs, possibly useful for debugging/testing
+    },
+  },
+});
+```
+
+This will allow the token to read all runs, which is probably not what you want. You can specify only certain runs by passing an array of run IDs:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      runs: ["run_1234", "run_5678"], // ✅ this token can read only these runs
+    },
+  },
+});
+```
+
+You can scope the token to only read certain tasks:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      tasks: ["my-task-1", "my-task-2"], // 👈 this token can read all runs of these tasks
+    },
+  },
+});
+```
+
+Or tags:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      tags: ["my-tag-1", "my-tag-2"], // 👈 this token can read all runs with these tags
+    },
+  },
+});
+```
+
+Or a specific batch of runs:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      batch: "batch_1234", // 👈 this token can read all runs in this batch
+    },
+  },
+});
+```
+
+You can also combine scopes. For example, to read runs with specific tags and for specific tasks:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      tasks: ["my-task-1", "my-task-2"],
+      tags: ["my-tag-1", "my-tag-2"],
+    },
+  },
+});
+```
+
+### Expiration
+
+By default, Public Access Token's expire after 15 minutes. You can specify a different expiration time when creating a Public Access Token:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+const publicToken = await auth.createPublicToken({
+  expirationTime: "1hr",
+});
+```
+
+- If `expirationTime` is a string, it will be treated as a time span
+- If `expirationTime` is a number, it will be treated as a Unix timestamp
+- If `expirationTime` is a `Date`, it will be treated as a date
+
+The format used for a time span is the same as the [jose package](https://github.com/panva/jose), which is a number followed by a unit. Valid units are: "sec", "secs", "second", "seconds", "s", "minute", "minutes", "min", "mins", "m", "hour", "hours", "hr", "hrs", "h", "day", "days", "d", "week", "weeks", "w", "year", "years", "yr", "yrs", and "y". It is not possible to specify months. 365.25 days is used as an alias for a year. If the string is suffixed with "ago", or prefixed with a "-", the resulting time span gets subtracted from the current unix timestamp. A "from now" suffix can also be used for readability when adding to the current unix timestamp.
+
+### Auto-generated tokens
+
+When you [trigger tasks](/triggering) from your backend, the `handle` received includes a `publicAccessToken` field. This token can be used to authenticate real-time requests in your frontend application.
+
+By default, auto-generated tokens expire after 15 minutes and have a read scope for the specific run(s) that were triggered. You can customize the expiration by passing a `publicTokenOptions` object to the trigger function.
+
+See our [triggering documentation](/triggering) for detailed examples of how to trigger tasks and get auto-generated tokens.
+
+### Subscribing to runs with Public Access Tokens
+
+Once you have a Public Access Token, you can use it to authenticate requests to the Realtime API in both backend and frontend applications.
+
+**Backend usage:** See our [backend documentation](/realtime/backend) for examples of what you can do with Realtime in your backend once you have authenticated with a token.
+
+**Frontend usage:** See our [React hooks documentation](/realtime/react-hooks) for examples of using tokens with frontend components.
+
+## Trigger Tokens (for frontend triggering only)
+
+For triggering tasks from your frontend, you need special "trigger" tokens. These tokens can only be used once to trigger a task and are more secure than regular Public Access Tokens.
+
+### Creating Trigger Tokens
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+const triggerToken = await auth.createTriggerPublicToken("my-task");
+```
+
+### Multiple tasks
+
+You can pass multiple tasks to create a token that can trigger multiple tasks:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+const triggerToken = await auth.createTriggerPublicToken(["my-task-1", "my-task-2"]);
+```
+
+### Multiple use
+
+You can also create tokens that can be used multiple times:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+const triggerToken = await auth.createTriggerPublicToken("my-task", {
+  multipleUse: true, // ❌ Use this with caution!
+});
+```
+
+### Expiration
+
+These tokens also expire, with the default expiration time being 15 minutes. You can specify a custom expiration time:
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+const triggerToken = await auth.createTriggerPublicToken("my-task", {
+  expirationTime: "24hr",
+});
+```
+
+### Triggering tasks from the frontend with Trigger Tokens
+
+Check out our [React hooks documentation](/realtime/react-hooks) for examples of how to use Trigger Tokens in your frontend applications.
diff --git a/docs/realtime/backend/overview.mdx b/docs/realtime/backend/overview.mdx
new file mode 100644
index 00000000000..7adb30bfa0e
--- /dev/null
+++ b/docs/realtime/backend/overview.mdx
@@ -0,0 +1,46 @@
+---
+title: Backend overview
+sidebarTitle: Overview
+description: Using the Trigger.dev realtime API from your backend code
+---
+
+import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
+
+Use these backend functions to subscribe to runs and streams from your server-side code or other tasks.
+
+## Overview
+
+There are three main categories of functionality:
+
+- **[Subscribe functions](/realtime/backend/subscribe)** - Subscribe to run updates using async iterators
+- **[Metadata](/realtime/backend/subscribe#subscribe-to-metadata-updates-from-your-tasks)** - Update and subscribe to run metadata in real-time
+- **[Streams](/realtime/backend/streams)** - Read and consume real-time streaming data from your tasks
+
+<Note>
+  To learn how to emit streams from your tasks, see our [Realtime Streams](/tasks/streams) documentation.
+</Note>
+
+## Authentication
+
+All backend functions support both server-side and client-side authentication:
+
+- **Server-side**: Use your API key (automatically handled in tasks)
+- **Client-side**: Generate a Public Access Token with appropriate scopes
+
+See our [authentication guide](/realtime/auth) for detailed information on creating and using tokens.
+
+## Quick example
+
+Subscribe to a run:
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+
+// Trigger a task
+const handle = await tasks.trigger("my-task", { some: "data" });
+
+// Subscribe to real-time updates
+for await (const run of runs.subscribeToRun(handle.id)) {
+  console.log(`Run ${run.id} status: ${run.status}`);
+}
+```
diff --git a/docs/realtime/backend/streams.mdx b/docs/realtime/backend/streams.mdx
new file mode 100644
index 00000000000..11c21bd2f4d
--- /dev/null
+++ b/docs/realtime/backend/streams.mdx
@@ -0,0 +1,414 @@
+---
+title: Streams
+sidebarTitle: Streams
+description: Read and consume real-time streaming data from your tasks in your backend
+---
+
+The Streams API allows you to read streaming data from your Trigger.dev tasks in your backend code. This is particularly useful for consuming AI/LLM outputs, progress updates, or any other real-time data that your tasks emit.
+
+<Note>
+  To learn how to emit streams from your tasks, see our [Realtime Streams](/tasks/streams) documentation. For frontend applications using React, see our [React hooks streams documentation](/realtime/react-hooks/streams).
+</Note>
+
+## Reading streams
+
+### Using defined streams (Recommended)
+
+The recommended approach is to use [defined streams](/tasks/streams#defining-typed-streams-recommended) for full type safety:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function consumeStream(runId: string) {
+  // Read from the defined stream
+  const stream = await aiStream.read(runId);
+
+  let fullText = "";
+
+  for await (const chunk of stream) {
+    console.log("Received chunk:", chunk); // chunk is typed!
+    fullText += chunk;
+  }
+
+  console.log("Final text:", fullText);
+}
+```
+
+### Direct stream reading
+
+If you prefer not to use defined streams, you can read directly by specifying the stream key:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+
+async function consumeStream(runId: string) {
+  // Read from a stream by key
+  const stream = await streams.read<string>(runId, "ai-output");
+
+  for await (const chunk of stream) {
+    console.log("Received chunk:", chunk);
+  }
+}
+```
+
+### Reading from the default stream
+
+Every run has a default stream, so you can omit the stream key:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+
+async function consumeDefaultStream(runId: string) {
+  // Read from the default stream
+  const stream = await streams.read<string>(runId);
+
+  for await (const chunk of stream) {
+    console.log("Received chunk:", chunk);
+  }
+}
+```
+
+## Stream options
+
+The `read()` method accepts several options for controlling stream behavior:
+
+### Timeout
+
+Set a timeout to stop reading if no data is received within a specified time:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function consumeWithTimeout(runId: string) {
+  const stream = await aiStream.read(runId, {
+    timeoutInSeconds: 120, // Wait up to 2 minutes for data
+  });
+
+  try {
+    for await (const chunk of stream) {
+      console.log("Received chunk:", chunk);
+    }
+  } catch (error) {
+    if (error.name === "TimeoutError") {
+      console.log("Stream timed out");
+    }
+  }
+}
+```
+
+### Start index
+
+Resume reading from a specific chunk index (useful for reconnection scenarios):
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function resumeStream(runId: string, lastChunkIndex: number) {
+  // Start reading from the chunk after the last one we received
+  const stream = await aiStream.read(runId, {
+    startIndex: lastChunkIndex + 1,
+  });
+
+  for await (const chunk of stream) {
+    console.log("Received chunk:", chunk);
+  }
+}
+```
+
+### Abort signal
+
+Use an `AbortSignal` to cancel stream reading:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function consumeWithCancellation(runId: string) {
+  const controller = new AbortController();
+
+  // Cancel after 30 seconds
+  setTimeout(() => controller.abort(), 30000);
+
+  const stream = await aiStream.read(runId, {
+    signal: controller.signal,
+  });
+
+  try {
+    for await (const chunk of stream) {
+      console.log("Received chunk:", chunk);
+
+      // Optionally abort based on content
+      if (chunk.includes("STOP")) {
+        controller.abort();
+      }
+    }
+  } catch (error) {
+    if (error.name === "AbortError") {
+      console.log("Stream was cancelled");
+    }
+  }
+}
+```
+
+### Combining options
+
+You can combine multiple options:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function advancedStreamConsumption(runId: string) {
+  const controller = new AbortController();
+
+  const stream = await aiStream.read(runId, {
+    timeoutInSeconds: 300, // 5 minute timeout
+    startIndex: 0, // Start from the beginning
+    signal: controller.signal, // Allow cancellation
+  });
+
+  try {
+    for await (const chunk of stream) {
+      console.log("Received chunk:", chunk);
+    }
+  } catch (error) {
+    if (error.name === "AbortError") {
+      console.log("Stream was cancelled");
+    } else if (error.name === "TimeoutError") {
+      console.log("Stream timed out");
+    } else {
+      console.error("Stream error:", error);
+    }
+  }
+}
+```
+
+## Practical examples
+
+### Reading AI streaming responses
+
+Here's a complete example of consuming an AI stream from your backend:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function consumeAIStream(runId: string) {
+  const stream = await aiStream.read(runId, {
+    timeoutInSeconds: 300, // AI responses can take time
+  });
+
+  let fullResponse = "";
+  const chunks: string[] = [];
+
+  for await (const chunk of stream) {
+    chunks.push(chunk);
+    fullResponse += chunk;
+
+    // Process each chunk as it arrives
+    console.log("Chunk received:", chunk);
+
+    // Could send to websocket, SSE, etc.
+    // await sendToClient(chunk);
+  }
+
+  console.log("Stream complete!");
+  console.log("Total chunks:", chunks.length);
+  console.log("Full response:", fullResponse);
+
+  return { fullResponse, chunks };
+}
+```
+
+### Reading multiple streams
+
+If a task emits multiple streams, you can read them concurrently or sequentially:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream, progressStream } from "./trigger/streams";
+
+async function consumeMultipleStreams(runId: string) {
+  // Read streams concurrently
+  const [aiData, progressData] = await Promise.all([
+    consumeStream(aiStream, runId),
+    consumeStream(progressStream, runId),
+  ]);
+
+  return { aiData, progressData };
+}
+
+async function consumeStream<T>(
+  streamDef: { read: (runId: string) => Promise<AsyncIterableStream<T>> },
+  runId: string
+): Promise<T[]> {
+  const stream = await streamDef.read(runId);
+  const chunks: T[] = [];
+
+  for await (const chunk of stream) {
+    chunks.push(chunk);
+  }
+
+  return chunks;
+}
+```
+
+### Piping streams to HTTP responses
+
+You can pipe streams directly to HTTP responses for server-sent events (SSE):
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+import type { NextRequest } from "next/server";
+
+export async function GET(request: NextRequest) {
+  const runId = request.nextUrl.searchParams.get("runId");
+
+  if (!runId) {
+    return new Response("Missing runId", { status: 400 });
+  }
+
+  const stream = await aiStream.read(runId, {
+    timeoutInSeconds: 300,
+  });
+
+  // Create a readable stream for SSE
+  const encoder = new TextEncoder();
+  const readableStream = new ReadableStream({
+    async start(controller) {
+      try {
+        for await (const chunk of stream) {
+          // Format as SSE
+          const data = `data: ${JSON.stringify({ chunk })}\n\n`;
+          controller.enqueue(encoder.encode(data));
+        }
+        controller.close();
+      } catch (error) {
+        controller.error(error);
+      }
+    },
+  });
+
+  return new Response(readableStream, {
+    headers: {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      "Connection": "keep-alive",
+    },
+  });
+}
+```
+
+### Implementing retry logic
+
+Handle transient errors with retry logic:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function consumeStreamWithRetry(
+  runId: string,
+  maxRetries = 3
+): Promise<string[]> {
+  let lastChunkIndex = 0;
+  const allChunks: string[] = [];
+  let attempt = 0;
+
+  while (attempt < maxRetries) {
+    try {
+      const stream = await aiStream.read(runId, {
+        startIndex: lastChunkIndex,
+        timeoutInSeconds: 120,
+      });
+
+      for await (const chunk of stream) {
+        allChunks.push(chunk);
+        lastChunkIndex++;
+      }
+
+      // Success! Break out of retry loop
+      break;
+    } catch (error) {
+      attempt++;
+
+      if (attempt >= maxRetries) {
+        throw new Error(`Failed after ${maxRetries} attempts: ${error.message}`);
+      }
+
+      console.log(`Retry attempt ${attempt} after error:`, error.message);
+
+      // Wait before retrying (exponential backoff)
+      await new Promise((resolve) => setTimeout(resolve, 1000 * Math.pow(2, attempt)));
+    }
+  }
+
+  return allChunks;
+}
+```
+
+### Processing streams in chunks
+
+Process streams in batches for efficiency:
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { aiStream } from "./trigger/streams";
+
+async function processStreamInBatches(runId: string, batchSize = 10) {
+  const stream = await aiStream.read(runId);
+
+  let batch: string[] = [];
+
+  for await (const chunk of stream) {
+    batch.push(chunk);
+
+    if (batch.length >= batchSize) {
+      // Process the batch
+      await processBatch(batch);
+      batch = [];
+    }
+  }
+
+  // Process remaining chunks
+  if (batch.length > 0) {
+    await processBatch(batch);
+  }
+}
+
+async function processBatch(chunks: string[]) {
+  console.log(`Processing batch of ${chunks.length} chunks`);
+  // Do something with the batch
+  // e.g., save to database, send to queue, etc.
+}
+```
+
+## Using with `runs.subscribeToRun()`
+
+For more advanced use cases where you need both the run status and streams, you can use the `runs.subscribeToRun()` method with `.withStreams()`:
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+import type { myTask } from "./trigger/myTask";
+
+async function subscribeToRunAndStreams(runId: string) {
+  for await (const update of runs.subscribeToRun<typeof myTask>(runId).withStreams()) {
+    switch (update.type) {
+      case "run":
+        console.log("Run update:", update.run.status);
+        break;
+      case "default":
+        console.log("Stream chunk:", update.chunk);
+        break;
+    }
+  }
+}
+```
+
+<Note>
+  For most use cases, we recommend using `streams.read()` with defined streams for better type safety and clearer code. Use `runs.subscribeToRun().withStreams()` only when you need to track both run status and stream data simultaneously.
+</Note>
diff --git a/docs/realtime/backend/subscribe.mdx b/docs/realtime/backend/subscribe.mdx
new file mode 100644
index 00000000000..ffa46532bf6
--- /dev/null
+++ b/docs/realtime/backend/subscribe.mdx
@@ -0,0 +1,225 @@
+---
+title: Subscribe functions
+sidebarTitle: Subscribe
+description: Subscribe to run updates using async iterators
+---
+
+These functions allow you to subscribe to run updates from your backend code. Each function returns an async iterator that yields run objects as they change.
+
+## runs.subscribeToRun
+
+Subscribes to all changes to a specific run.
+
+```ts Example
+import { runs } from "@trigger.dev/sdk";
+
+for await (const run of runs.subscribeToRun("run_1234")) {
+  console.log(run);
+}
+```
+
+This function subscribes to all changes to a run. It returns an async iterator that yields the run object whenever the run is updated. The iterator will complete when the run is finished.
+
+**Authentication**: This function supports both server-side and client-side authentication. For server-side authentication, use your API key. For client-side authentication, you must generate a public access token with read access to the specific run. See our [authentication guide](/realtime/auth) for details.
+
+**Response**: The AsyncIterator yields the [run object](/realtime/run-object).
+
+## runs.subscribeToRunsWithTag
+
+Subscribes to all changes to runs with a specific tag.
+
+```ts Example
+import { runs } from "@trigger.dev/sdk";
+
+for await (const run of runs.subscribeToRunsWithTag("user:1234")) {
+  console.log(run);
+}
+```
+
+This function subscribes to all changes to runs with a specific tag. It returns an async iterator that yields the run object whenever a run with the specified tag is updated. This iterator will never complete, so you must manually break out of the loop when you no longer want to receive updates.
+
+**Authentication**: This function supports both server-side and client-side authentication. For server-side authentication, use your API key. For client-side authentication, you must generate a public access token with read access to the specific tag. See our [authentication guide](/realtime/auth) for details.
+
+**Response**: The AsyncIterator yields the [run object](/realtime/run-object).
+
+## runs.subscribeToBatch
+
+Subscribes to all changes for runs in a batch.
+
+```ts Example
+import { runs } from "@trigger.dev/sdk";
+
+for await (const run of runs.subscribeToBatch("batch_1234")) {
+  console.log(run);
+}
+```
+
+This function subscribes to all changes for runs in a batch. It returns an async iterator that yields a run object whenever a run in the batch is updated. The iterator does not complete on its own, you must manually `break` the loop when you want to stop listening for updates.
+
+**Authentication**: This function supports both server-side and client-side authentication. For server-side authentication, use your API key. For client-side authentication, you must generate a public access token with read access to the specific batch. See our [authentication guide](/realtime/auth) for details.
+
+**Response**: The AsyncIterator yields the [run object](/realtime/run-object).
+
+## Type safety
+
+You can infer the types of the run's payload and output by passing the type of the task to the subscribe functions:
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+import type { myTask } from "./trigger/my-task";
+
+async function myBackend() {
+  const handle = await tasks.trigger("my-task", { some: "data" });
+
+  for await (const run of runs.subscribeToRun<typeof myTask>(handle.id)) {
+    // run.payload and run.output are now typed
+    console.log(run.payload.some);
+
+    if (run.output) {
+      console.log(run.output.some);
+    }
+  }
+}
+```
+
+When using `subscribeToRunsWithTag`, you can pass a union of task types:
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+import type { myTask, myOtherTask } from "./trigger/my-task";
+
+for await (const run of runs.subscribeToRunsWithTag<typeof myTask | typeof myOtherTask>("my-tag")) {
+  // Narrow down the type based on the taskIdentifier
+  switch (run.taskIdentifier) {
+    case "my-task": {
+      console.log("Run output:", run.output.foo); // Type-safe
+      break;
+    }
+    case "my-other-task": {
+      console.log("Run output:", run.output.bar); // Type-safe
+      break;
+    }
+  }
+}
+```
+
+## Subscribe to metadata updates from your tasks
+
+The metadata API allows you to update custom metadata on runs and receive real-time updates when metadata changes. This is useful for tracking progress, storing intermediate results, or adding custom status information that can be monitored in real-time.
+
+<Note>
+  For frontend applications using React, see our [React hooks metadata
+  documentation](/realtime/react-hooks/subscribe#using-metadata-to-show-progress-in-your-ui) for
+  consuming metadata updates in your UI.
+</Note>
+
+When you update metadata from within a task using `metadata.set()`, `metadata.append()`, or other metadata methods, all subscribers to that run will automatically receive the updated run object containing the new metadata.
+
+This makes metadata perfect for:
+
+- Progress tracking
+- Status updates
+- Intermediate results
+- Custom notifications
+
+Use the metadata API within your task to update metadata in real-time. In this basic example task, we're updating the progress of a task as it processes items.
+
+### How to subscribe to metadata updates
+
+This example task updates the progress of a task as it processes items.
+
+```ts
+// Your task code
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const progressTask = task({
+  id: "progress-task",
+  run: async (payload: { items: string[] }) => {
+    const total = payload.items.length;
+
+    for (let i = 0; i < payload.items.length; i++) {
+      // Update progress metadata
+      metadata.set("progress", {
+        current: i + 1,
+        total: total,
+        percentage: Math.round(((i + 1) / total) * 100),
+        currentItem: payload.items[i],
+      });
+
+      // Process the item
+      await processItem(payload.items[i]);
+    }
+
+    metadata.set("status", "completed");
+    return { processed: total };
+  },
+});
+
+async function processItem(item: string) {
+  // Simulate work
+  await new Promise((resolve) => setTimeout(resolve, 1000));
+}
+```
+
+We can now subscribe to the runs and receive real-time metadata updates.
+
+```ts
+// Somewhere in your backend code
+import { runs } from "@trigger.dev/sdk";
+import type { progressTask } from "./trigger/progress-task";
+
+async function monitorProgress(runId: string) {
+  for await (const run of runs.subscribeToRun<typeof progressTask>(runId)) {
+    console.log(`Run ${run.id} status: ${run.status}`);
+
+    if (run.metadata?.progress) {
+      const progress = run.metadata.progress as {
+        current: number;
+        total: number;
+        percentage: number;
+        currentItem: string;
+      };
+
+      console.log(`Progress: ${progress.current}/${progress.total} (${progress.percentage}%)`);
+      console.log(`Processing: ${progress.currentItem}`);
+    }
+
+    if (run.metadata?.status === "completed") {
+      console.log("Task completed!");
+      break;
+    }
+  }
+}
+```
+
+For more information on how to write tasks that use the metadata API, as well as more examples, see our [run metadata docs](/runs/metadata#more-metadata-task-examples).
+
+### Type safety
+
+You can get type safety for your metadata by defining types:
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+import type { progressTask } from "./trigger/progress-task";
+
+interface ProgressMetadata {
+  progress?: {
+    current: number;
+    total: number;
+    percentage: number;
+    currentItem: string;
+  };
+  status?: "running" | "completed" | "failed";
+}
+
+async function monitorTypedProgress(runId: string) {
+  for await (const run of runs.subscribeToRun<typeof progressTask>(runId)) {
+    const metadata = run.metadata as ProgressMetadata;
+
+    if (metadata?.progress) {
+      // Now you have full type safety
+      console.log(`Progress: ${metadata.progress.percentage}%`);
+    }
+  }
+}
+```
diff --git a/docs/realtime/how-it-works.mdx b/docs/realtime/how-it-works.mdx
new file mode 100644
index 00000000000..04dd13dadad
--- /dev/null
+++ b/docs/realtime/how-it-works.mdx
@@ -0,0 +1,92 @@
+---
+title: How it works
+sidebarTitle: How it works
+description: Technical details about how the Trigger.dev Realtime API works
+---
+
+## Architecture
+
+The Realtime API is built on top of [Electric SQL](https://electric-sql.com/), an open-source PostgreSQL syncing engine. The Trigger.dev API wraps Electric SQL and provides a simple API to subscribe to [runs](/runs) and get real-time updates.
+
+## Run changes
+
+You will receive updates whenever a run changes for the following reasons:
+
+- The run moves to a new state. See our [run lifecycle docs](/runs#the-run-lifecycle) for more information.
+- [Run tags](/tags) are added or removed.
+- [Run metadata](/runs/metadata) is updated.
+
+## Run object
+
+The run object returned by Realtime subscriptions is optimized for streaming updates and differs from the management API's run object. See [the run object](/realtime/run-object) page for the complete schema and field descriptions.
+
+## Basic usage
+
+After you trigger a task, you can subscribe to the run using the `runs.subscribeToRun` function. This function returns an async iterator that you can use to get updates on the run status.
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+async function myBackend() {
+  const handle = await tasks.trigger("my-task", { some: "data" });
+
+  for await (const run of runs.subscribeToRun(handle.id)) {
+    // This will log the run every time it changes
+    console.log(run);
+  }
+}
+```
+
+Every time the run changes, the async iterator will yield the updated run. You can use this to update your UI, log the run status, or take any other action.
+
+Alternatively, you can subscribe to changes to any run that includes a specific tag (or tags) using the `runs.subscribeToRunsWithTag` function.
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+for await (const run of runs.subscribeToRunsWithTag("user:1234")) {
+  // This will log the run every time it changes, for all runs with the tag "user:1234"
+  console.log(run);
+}
+```
+
+If you've used `batchTrigger` to trigger multiple runs, you can also subscribe to changes to all the runs triggered in the batch using the `runs.subscribeToBatch` function.
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+
+// Somewhere in your backend code
+for await (const run of runs.subscribeToBatch("batch-id")) {
+  // This will log the run every time it changes, for all runs in the batch with the ID "batch-id"
+  console.log(run);
+}
+```
+
+## Run metadata
+
+The run metadata API gives you the ability to add or update custom metadata on a run, which will cause the run to be updated. This allows you to extend the Realtime API with custom data attached to a run that can be used for various purposes. Some common use cases include:
+
+- Adding a link to a related resource
+- Adding a reference to a user or organization
+- Adding a custom status with progress information
+
+See our [run metadata docs](/runs/metadata) for more on how to write tasks that use the metadata API.
+
+### Using metadata with Realtime & React hooks
+
+You can combine run metadata with the Realtime API to bridge the gap between your trigger.dev tasks and your applications in two ways:
+
+1. Using our [React hooks](/realtime/react-hooks/subscribe#using-metadata) to subscribe to metadata updates and update your UI in real-time.
+2. Using our [backend functions](/realtime/backend) to subscribe to metadata updates in your backend.
+
+## Limits
+
+The Realtime API in the Trigger.dev Cloud limits the number of concurrent subscriptions, depending on your plan. If you exceed the limit, you will receive an error when trying to subscribe to a run. For more information, see our [pricing page](https://trigger.dev/pricing).
+
+## Learn more
+
+- Read our Realtime blog post ["How we built a real-time service that handles 20,000 updates per second](https://trigger.dev/blog/how-we-built-realtime)
+- Using Realtime: [React Hooks (frontend)](/realtime/react-hooks)
+- Using [Backend (server-side)](/realtime/backend)
diff --git a/docs/realtime/overview.mdx b/docs/realtime/overview.mdx
index 718181dc165..8819c4003f8 100644
--- a/docs/realtime/overview.mdx
+++ b/docs/realtime/overview.mdx
@@ -1,272 +1,39 @@
 ---
 title: Realtime overview
 sidebarTitle: Overview
-description: Using the Trigger.dev v3 realtime API
+description: Using the Trigger.dev Realtime API to trigger and/or subscribe to runs in real-time.
 ---
 
-import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
+Trigger.dev Realtime allows you to trigger, subscribe to, and get real-time updates for runs. This is useful for monitoring runs, updating UIs, and building real-time dashboards.
 
-Trigger.dev Realtime is a set of APIs that allow you to subscribe to runs and get real-time updates on the run status. This is useful for monitoring runs, updating UIs, and building realtime dashboards.
+You can subscribe to real-time updates for different scopes of runs:
 
-## How it works
+- **Specific runs** - Monitor individual run progress by run ID
+- **Runs with specific tags** - Track all runs that have certain [tags](/tags) (e.g., all runs tagged with `user:123`)
+- **Batch runs** - All runs within a specific batch
+- **Trigger + subscribe combos** - Trigger a task and immediately subscribe to its run (frontend only)
 
-The Realtime API is built on top of [Electric SQL](https://electric-sql.com/), an open-source PostgreSQL syncing engine. The Trigger.dev API wraps Electric SQL and provides a simple API to subscribe to [runs](/runs) and get real-time updates.
+Once subscribed, you'll receive the complete [run object](/realtime/run-object) with automatic real-time updates whenever the [run changes](/realtime/how-it-works#run-changes), including:
 
-## Walkthrough
+- **Status changes** - queued → executing → completed, etc.
+- **Metadata updates** - Custom progress tracking, status updates, user data, etc. ([React hooks](/realtime/react-hooks/subscribe#using-metadata-to-show-progress-in-your-ui) | [backend](/realtime/backend/subscribe#subscribe-to-metadata-updates-from-your-tasks))
+- **Tag changes** - When [tags](/tags) are added or removed from the run
+- **Realtime Streams** - Stream real-time data from your tasks, perfect for AI/LLM outputs and progress updates. ([Learn more](/tasks/streams) | [React hooks](/realtime/react-hooks/streams) | [Backend](/realtime/backend/streams))
 
-<iframe
-  width="100%"
-  height="315"
-  src="https://www.youtube.com/embed/RhJAbSGkS88?si=4Z72SfygeklNI3As"
-  title="YouTube video player"
-  allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-  referrerPolicy="strict-origin-when-cross-origin"
-  allowFullScreen
-/>
+## Using Realtime in your applications
 
-## Usage
+### Authentication
 
-After you trigger a task, you can subscribe to the run using the `runs.subscribeToRun` function. This function returns an async iterator that you can use to get updates on the run status.
+All Realtime subscriptions require authentication so you can securely trigger and subscribe to runs. See our [authentication guide](/realtime/auth) for more details.
 
-```ts
-import { runs, tasks } from "@trigger.dev/sdk/v3";
+### Frontend implementation
 
-// Somewhere in your backend code
-async function myBackend() {
-  const handle = await tasks.trigger("my-task", { some: "data" });
+Use our React hooks to build real-time UIs that update as runs execute. Ideal for progress bars, status indicators, and live dashboards.
 
-  for await (const run of runs.subscribeToRun(handle.id)) {
-    // This will log the run every time it changes
-    console.log(run);
-  }
-}
-```
+→ **[See our React hooks guide](/realtime/react-hooks/)**
 
-Every time the run changes, the async iterator will yield the updated run. You can use this to update your UI, log the run status, or take any other action.
+### Backend implementation
 
-Alternatively, you can subscribe to changes to any run that includes a specific tag (or tags) using the `runs.subscribeToRunsWithTag` function.
+Use our server-side SDK to subscribe to runs from your backend code, other tasks, or serverless functions. Perfect for triggering workflows, sending notifications, or updating databases based on run status changes.
 
-```ts
-import { runs } from "@trigger.dev/sdk/v3";
-
-// Somewhere in your backend code
-for await (const run of runs.subscribeToRunsWithTag("user:1234")) {
-  // This will log the run every time it changes, for all runs with the tag "user:1234"
-  console.log(run);
-}
-```
-
-If you've used `batchTrigger` to trigger multiple runs, you can also subscribe to changes to all the runs triggered in the batch using the `runs.subscribeToBatch` function.
-
-```ts
-import { runs } from "@trigger.dev/sdk/v3";
-
-// Somewhere in your backend code
-for await (const run of runs.subscribeToBatch("batch-id")) {
-  // This will log the run every time it changes, for all runs in the batch with the ID "batch-id"
-  console.log(run);
-}
-```
-
-### React hooks
-
-We also provide a set of React hooks that make it easy to use the Realtime API in your React components. See the [React hooks doc](/frontend/react-hooks) for more information.
-
-## Run changes
-
-You will receive updates whenever a run changes for the following reasons:
-
-- The run moves to a new state. See our [run lifecycle docs](/runs#the-run-lifecycle) for more information.
-- [Run tags](/tags) are added or removed.
-- [Run metadata](/runs/metadata) is updated.
-
-## Run object
-
-The run object returned by the async iterator is NOT the same as the run object returned by the `runs.retrieve` function. This is because Electric SQL streams changes from a single PostgreSQL table, and the run object returned by `runs.retrieve` is a combination of multiple tables.
-
-The run object returned by the async iterator has the following fields:
-
-<ParamField path="id" type="string" required>
-  The run ID.
-</ParamField>
-
-<ParamField path="taskIdentifier" type="string" required>
-  The task identifier.
-</ParamField>
-
-<ParamField path="payload" type="object" required>
-  The input payload for the run.
-</ParamField>
-
-<ParamField path="output" type="object">
-  The output result of the run.
-</ParamField>
-
-<ParamField path="createdAt" type="Date" required>
-  Timestamp when the run was created.
-</ParamField>
-
-<ParamField path="updatedAt" type="Date" required>
-  Timestamp when the run was last updated.
-</ParamField>
-
-<ParamField path="number" type="number" required>
-  Sequential number assigned to the run.
-</ParamField>
-
-<ParamField path="status" type="RunStatus" required>
-  Current status of the run.
-
-  <Accordion title="RunStatus enum">
-
-| Status               | Description                                                                                               |
-| -------------------- | --------------------------------------------------------------------------------------------------------- |
-| `WAITING_FOR_DEPLOY` | Task hasn't been deployed yet but is waiting to be executed                                               |
-| `QUEUED`             | Run is waiting to be executed by a worker                                                                 |
-| `EXECUTING`          | Run is currently being executed by a worker                                                               |
-| `REATTEMPTING`       | Run has failed and is waiting to be retried                                                               |
-| `FROZEN`             | Run has been paused by the system, and will be resumed by the system                                      |
-| `COMPLETED`          | Run has been completed successfully                                                                       |
-| `CANCELED`           | Run has been canceled by the user                                                                         |
-| `FAILED`             | Run has been completed with errors                                                                        |
-| `CRASHED`            | Run has crashed and won't be retried, most likely the worker ran out of resources, e.g. memory or storage |
-| `INTERRUPTED`        | Run was interrupted during execution, mostly this happens in development environments                     |
-| `SYSTEM_FAILURE`     | Run has failed to complete, due to an error in the system                                                 |
-| `DELAYED`            | Run has been scheduled to run at a specific time                                                          |
-| `EXPIRED`            | Run has expired and won't be executed                                                                     |
-| `TIMED_OUT`          | Run has reached it's maxDuration and has been stopped                                                     |
-
-</Accordion>
-</ParamField>
-
-<ParamField path="durationMs" type="number" required>
-  Duration of the run in milliseconds.
-</ParamField>
-
-<ParamField path="costInCents" type="number" required>
-  Total cost of the run in cents.
-</ParamField>
-
-<ParamField path="baseCostInCents" type="number" required>
-  Base cost of the run in cents before any additional charges.
-</ParamField>
-
-<ParamField path="tags" type="string[]" required>
-  Array of tags associated with the run.
-</ParamField>
-
-<ParamField path="idempotencyKey" type="string">
-  Key used to ensure idempotent execution.
-</ParamField>
-
-<ParamField path="expiredAt" type="Date">
-  Timestamp when the run expired.
-</ParamField>
-
-<ParamField path="ttl" type="string">
-  Time-to-live duration for the run.
-</ParamField>
-
-<ParamField path="finishedAt" type="Date">
-  Timestamp when the run finished.
-</ParamField>
-
-<ParamField path="startedAt" type="Date">
-  Timestamp when the run started.
-</ParamField>
-
-<ParamField path="delayedUntil" type="Date">
-  Timestamp until which the run is delayed.
-</ParamField>
-
-<ParamField path="queuedAt" type="Date">
-  Timestamp when the run was queued.
-</ParamField>
-
-<ParamField path="metadata" type="Record<string, DeserializedJson>">
-  Additional metadata associated with the run.
-</ParamField>
-
-<ParamField path="error" type="SerializedError">
-  Error information if the run failed.
-</ParamField>
-
-<ParamField path="isTest" type="boolean" required>
-  Indicates whether this is a test run.
-</ParamField>
-
-## Type-safety
-
-You can infer the types of the run's payload and output by passing the type of the task to the `subscribeToRun` function. This will give you type-safe access to the run's payload and output.
-
-```ts
-import { runs, tasks } from "@trigger.dev/sdk/v3";
-import type { myTask } from "./trigger/my-task";
-
-// Somewhere in your backend code
-async function myBackend() {
-  const handle = await tasks.trigger("my-task", { some: "data" });
-
-  for await (const run of runs.subscribeToRun<typeof myTask>(handle.id)) {
-    // This will log the run every time it changes
-    console.log(run.payload.some);
-
-    if (run.output) {
-      // This will log the output if it exists
-      console.log(run.output.some);
-    }
-  }
-}
-```
-
-When using `subscribeToRunsWithTag`, you can pass a union of task types for all the possible tasks that can have the tag.
-
-```ts
-import { runs } from "@trigger.dev/sdk/v3";
-import type { myTask, myOtherTask } from "./trigger/my-task";
-
-// Somewhere in your backend code
-for await (const run of runs.subscribeToRunsWithTag<typeof myTask | typeof myOtherTask>("my-tag")) {
-  // You can narrow down the type based on the taskIdentifier
-  switch (run.taskIdentifier) {
-    case "my-task": {
-      console.log("Run output:", run.output.foo); // This will be type-safe
-      break;
-    }
-    case "my-other-task": {
-      console.log("Run output:", run.output.bar); // This will be type-safe
-      break;
-    }
-  }
-}
-```
-
-## Run metadata
-
-The run metadata API gives you the ability to add or update custom metadata on a run, which will cause the run to be updated. This allows you to extend the realtime API with custom data attached to a run that can be used for various purposes. Some common use cases include:
-
-- Adding a link to a related resource
-- Adding a reference to a user or organization
-- Adding a custom status with progress information
-
-See our [run metadata docs](/runs/metadata) for more on how to use this feature.
-
-### Using w/Realtime & React hooks
-
-We suggest combining run metadata with the realtime API and our [React hooks](/frontend/react-hooks) to bridge the gap between your trigger.dev tasks and your UI. This allows you to update your UI in real-time based on changes to the run metadata. As a simple example, you could add a custom status to a run with a progress value, and update your UI based on that progress.
-
-We have a full demo app repo available [here](https://github.com/triggerdotdev/nextjs-realtime-simple-demo)
-
-## Realtime streams
-
-See our dedicated [Realtime streams](/realtime/streams) documentation for more information on how to use the Realtime streams API.
-
-## Limits
-
-The Realtime API in the Trigger.dev Cloud limits the number of concurrent subscriptions, depending on your plan. If you exceed the limit, you will receive an error when trying to subscribe to a run. For more information, see our [pricing page](https://trigger.dev/pricing).
-
-## Known issues
-
-There is currently a known issue where the realtime API does not work if subscribing to a run that has a large payload or large output and are stored in object store instead of the database. We are working on a fix for this issue: https://github.com/triggerdotdev/trigger.dev/issues/1451. As a workaround you'll need to keep payloads and outputs below 128KB when using the realtime API.
-
-<RealtimeExamplesCards />
+→ **[See our Backend guide](/realtime/backend)**
diff --git a/docs/realtime/react-hooks.mdx b/docs/realtime/react-hooks.mdx
deleted file mode 100644
index 8622bb78803..00000000000
--- a/docs/realtime/react-hooks.mdx
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Realtime React hooks
-sidebarTitle: React hooks
-description: Subscribes to all changes to a run in a React component.
----
-
-See our [React hooks](/frontend/react-hooks) for more information about how to use the Realtime API from your frontend application.
diff --git a/docs/realtime/react-hooks/overview.mdx b/docs/realtime/react-hooks/overview.mdx
new file mode 100644
index 00000000000..7cf84c63f04
--- /dev/null
+++ b/docs/realtime/react-hooks/overview.mdx
@@ -0,0 +1,73 @@
+---
+title: React hooks overview
+sidebarTitle: Overview
+description: Using the Trigger.dev Realtime API from your React applications.
+---
+
+import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
+
+Our React hooks package provides a set of hooks that make it easy to interact with the Trigger.dev Realtime API from your React applications. You can use these hooks to subscribe to real-time updates, and trigger tasks from your frontend.
+
+## Installation
+
+Install the `@trigger.dev/react-hooks` package in your project:
+
+<CodeGroup>
+
+```bash npm
+npm add @trigger.dev/react-hooks
+```
+
+```bash pnpm
+pnpm add @trigger.dev/react-hooks
+```
+
+```bash yarn
+yarn install @trigger.dev/react-hooks
+```
+
+</CodeGroup>
+
+## Authentication
+
+All hooks require authentication with a Public Access Token. Pass the token via the `accessToken` option:
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+    baseURL: "https://your-trigger-dev-instance.com", // optional, only needed if you are self-hosting Trigger.dev
+  });
+
+  // ...
+}
+```
+
+Learn more about [generating and managing tokens in our authentication guide](/realtime/auth).
+
+## Available hooks
+
+We provide several categories of hooks:
+
+- **[Triggering hooks](/realtime/react-hooks/triggering)** - Trigger tasks from your frontend application
+- **[Subscribe hooks](/realtime/react-hooks/subscribe)** - Subscribe to runs, batches, metadata, and more
+- **[Streams hooks](/realtime/react-hooks/streams)** - Subscribe to real-time streams from your tasks
+- **[SWR hooks](/realtime/react-hooks/swr)** - Fetch data once and cache it using SWR
+
+## SWR vs Realtime hooks
+
+We offer two "styles" of hooks: SWR and Realtime. The SWR hooks use the [swr](https://swr.vercel.app/) library to fetch data once and cache it. The Realtime hooks use [Trigger.dev Realtime](/realtime) to subscribe to updates in real-time.
+
+<Note>
+  It can be a little confusing which one to use because [swr](https://swr.vercel.app/) can also be
+  configured to poll for updates. But because of rate-limits and the way the Trigger.dev API works,
+  we recommend using the Realtime hooks for most use-cases.
+</Note>
diff --git a/docs/realtime/react-hooks/streams.mdx b/docs/realtime/react-hooks/streams.mdx
new file mode 100644
index 00000000000..670941e8997
--- /dev/null
+++ b/docs/realtime/react-hooks/streams.mdx
@@ -0,0 +1,369 @@
+---
+title: Streams hooks
+sidebarTitle: Streams
+description: Subscribe to real-time streams from your tasks in React components
+---
+
+These hooks allow you to consume real-time streams from your tasks. Streams are useful for displaying AI/LLM outputs as they're generated, or any other real-time data from your tasks.
+
+<Note>
+  To learn how to emit streams from your tasks, see our [Realtime Streams](/tasks/streams)
+  documentation.
+</Note>
+
+## useRealtimeStream (Recommended)
+
+<Note>
+  Available in SDK version **4.1.0 or later**. This is the recommended way to consume streams in
+  your React components.
+</Note>
+
+The `useRealtimeStream` hook allows you to subscribe to a specific stream by its run ID and stream key. This hook is designed to work seamlessly with [defined streams](/tasks/streams#defining-typed-streams-recommended) for full type safety.
+
+### Basic Usage
+
+```tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+
+export function StreamViewer({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { parts, error } = useRealtimeStream<string>(runId, "ai-output", {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  return (
+    <div>
+      {parts.map((part, i) => (
+        <span key={i}>{part}</span>
+      ))}
+    </div>
+  );
+}
+```
+
+### With Defined Streams
+
+The recommended approach is to use defined streams for full type safety:
+
+```tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "@/app/streams";
+
+export function StreamViewer({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  // Pass the defined stream directly - full type safety!
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken: publicAccessToken,
+    timeoutInSeconds: 600,
+    onData: (chunk) => {
+      console.log("New chunk:", chunk); // chunk is typed!
+    },
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  return (
+    <div>
+      {parts.map((part, i) => (
+        <span key={i}>{part}</span>
+      ))}
+    </div>
+  );
+}
+```
+
+### Streaming AI Responses
+
+Here's a complete example showing how to display streaming AI responses:
+
+```tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "@/trigger/streams";
+import { Streamdown } from "streamdown";
+
+export function AIStreamViewer({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken: publicAccessToken,
+    timeoutInSeconds: 300,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading stream...</div>;
+
+  const text = parts.join("");
+
+  return (
+    <div className="prose">
+      <Streamdown isAnimating={true}>{text}</Streamdown>
+    </div>
+  );
+}
+```
+
+### Options
+
+The `useRealtimeStream` hook accepts the following options:
+
+```tsx
+const { parts, error } = useRealtimeStream(streamOrRunId, streamKeyOrOptions, {
+  accessToken: "pk_...", // Required: Public access token
+  baseURL: "https://api.trigger.dev", // Optional: Custom API URL
+  timeoutInSeconds: 60, // Optional: Timeout (default: 60)
+  startIndex: 0, // Optional: Start from specific chunk
+  throttleInMs: 16, // Optional: Throttle updates (default: 16ms)
+  onData: (chunk) => {}, // Optional: Callback for each chunk
+});
+```
+
+### Using Default Stream
+
+You can omit the stream key to use the default stream:
+
+```tsx
+const { parts, error } = useRealtimeStream<string>(runId, {
+  accessToken: publicAccessToken,
+});
+```
+
+For more information on defining and using streams, see the [Realtime Streams v2](/tasks/streams) documentation.
+
+## useRealtimeRunWithStreams
+
+<Note>
+  For new projects, we recommend using `useRealtimeStream` instead (available in SDK 4.1.0+). This
+  hook is still supported for backward compatibility and use cases where you need to subscribe to
+  both the run and all its streams at once.
+</Note>
+
+The `useRealtimeRunWithStreams` hook allows you to subscribe to a run by its ID and also receive any streams that are emitted by the task. This is useful when you need to access both the run metadata and multiple streams simultaneously.
+
+```tsx
+"use client"; // This is needed for Next.js App Router or other RSC frameworks
+
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, streams, error } = useRealtimeRunWithStreams(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return (
+    <div>
+      <div>Run: {run.id}</div>
+      <div>
+        {Object.keys(streams).map((stream) => (
+          <div key={stream}>Stream: {stream}</div>
+        ))}
+      </div>
+    </div>
+  );
+}
+```
+
+You can also provide the type of the streams to the `useRealtimeRunWithStreams` hook to get type-safety:
+
+```tsx
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+import type { myTask } from "@/trigger/myTask";
+
+type STREAMS = {
+  openai: string; // this is the type of each "part" of the stream
+};
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, streams, error } = useRealtimeRunWithStreams<typeof myTask, STREAMS>(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  const text = streams.openai?.map((part) => part).join("");
+
+  return (
+    <div>
+      <div>Run: {run.id}</div>
+      <div>{text}</div>
+    </div>
+  );
+}
+```
+
+As you can see above, each stream is an array of the type you provided, keyed by the stream name. If instead of a pure text stream you have a stream of objects, you can provide the type of the object:
+
+```tsx
+import type { TextStreamPart } from "ai";
+import type { myTask } from "@/trigger/myTask";
+
+type STREAMS = { openai: TextStreamPart<{}> };
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, streams, error } = useRealtimeRunWithStreams<typeof myTask, STREAMS>(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  const text = streams.openai
+    ?.filter((stream) => stream.type === "text-delta")
+    ?.map((part) => part.text)
+    .join("");
+
+  return (
+    <div>
+      <div>Run: {run.id}</div>
+      <div>{text}</div>
+    </div>
+  );
+}
+```
+
+### Streaming AI responses with useRealtimeRunWithStreams
+
+Here's an example showing how to display streaming OpenAI responses using `useRealtimeRunWithStreams`:
+
+```tsx
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+import type { aiStreaming, STREAMS } from "./trigger/ai-streaming";
+
+function MyComponent({ runId, publicAccessToken }: { runId: string; publicAccessToken: string }) {
+  const { streams } = useRealtimeRunWithStreams<typeof aiStreaming, STREAMS>(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (!streams.openai) {
+    return <div>Loading...</div>;
+  }
+
+  const text = streams.openai.join(""); // `streams.openai` is an array of strings
+
+  return (
+    <div>
+      <h2>OpenAI response:</h2>
+      <p>{text}</p>
+    </div>
+  );
+}
+```
+
+### AI SDK with tools
+
+When using the AI SDK with tools with `useRealtimeRunWithStreams`, you can access tool calls and results:
+
+```tsx
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+import type { aiStreamingWithTools, STREAMS } from "./trigger/ai-streaming";
+
+function MyComponent({ runId, publicAccessToken }: { runId: string; publicAccessToken: string }) {
+  const { streams } = useRealtimeRunWithStreams<typeof aiStreamingWithTools, STREAMS>(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (!streams.openai) {
+    return <div>Loading...</div>;
+  }
+
+  // streams.openai is an array of TextStreamPart
+  const toolCall = streams.openai.find(
+    (stream) => stream.type === "tool-call" && stream.toolName === "getWeather"
+  );
+  const toolResult = streams.openai.find((stream) => stream.type === "tool-result");
+  const textDeltas = streams.openai.filter((stream) => stream.type === "text-delta");
+
+  const text = textDeltas.map((delta) => delta.textDelta).join("");
+  const weatherLocation = toolCall ? toolCall.args.location : undefined;
+  const weather = toolResult ? toolResult.result.temperature : undefined;
+
+  return (
+    <div>
+      <h2>OpenAI response:</h2>
+      <p>{text}</p>
+      <h2>Weather:</h2>
+      <p>
+        {weatherLocation
+          ? `The weather in ${weatherLocation} is ${weather} degrees.`
+          : "No weather data"}
+      </p>
+    </div>
+  );
+}
+```
+
+### Throttling updates
+
+The `useRealtimeRunWithStreams` hook accepts an `experimental_throttleInMs` option to throttle the updates from the server. This can be useful if you are getting too many updates and want to reduce the number of updates.
+
+```tsx
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, streams, error } = useRealtimeRunWithStreams(runId, {
+    accessToken: publicAccessToken,
+    experimental_throttleInMs: 1000, // Throttle updates to once per second
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return (
+    <div>
+      <div>Run: {run.id}</div>
+      {/* Display streams */}
+    </div>
+  );
+}
+```
+
+All other options (accessToken, baseURL, enabled, id) work the same as the other realtime hooks.
+
+For the newer `useRealtimeStream` hook, use the `throttleInMs` option instead (see [options above](#options)).
diff --git a/docs/realtime/react-hooks/subscribe.mdx b/docs/realtime/react-hooks/subscribe.mdx
new file mode 100644
index 00000000000..41ef2b61f85
--- /dev/null
+++ b/docs/realtime/react-hooks/subscribe.mdx
@@ -0,0 +1,656 @@
+---
+title: Subscribing to runs
+sidebarTitle: Subscribe
+description: Get live updates from runs, batches, metadata, and more in your frontend application.
+---
+
+These hooks allow you to subscribe to runs, batches, and streams using [Trigger.dev Realtime](/realtime). They automatically include real-time updates for run status, metadata, output, and other properties.
+
+## Hooks
+
+## Triggering + Realtime hooks
+
+For triggering tasks and immediately subscribing to their runs, we provide combo hooks, details on how to use them can be found in the [triggering](/realtime/react-hooks/triggering) section.
+
+- **[`useRealtimeTaskTrigger`](/realtime/react-hooks/triggering#userealtimetasktrigger)** - Trigger a task and subscribe to the run
+- **[`useRealtimeTaskTriggerWithStreams`](/realtime/react-hooks/triggering#userealtimetasktriggerwithstreams)** - Trigger a task and subscribe to both run updates and streams
+
+## Other Realtime subscription hooks
+
+### useRealtimeRun
+
+The `useRealtimeRun` hook allows you to subscribe to a run by its ID.
+
+```tsx
+"use client"; // This is needed for Next.js App Router or other RSC frameworks
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+To correctly type the run's payload and output, you can provide the type of your task to the `useRealtimeRun` hook:
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+import type { myTask } from "@/trigger/myTask";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun<typeof myTask>(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  // Now run.payload and run.output are correctly typed
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+You can supply an `onComplete` callback to the `useRealtimeRun` hook to be called when the run is completed or errored. This is useful if you want to perform some action when the run is completed, like navigating to a different page or showing a notification.
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+    onComplete: (run, error) => {
+      console.log("Run completed", run);
+    },
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+When you only need run status (for example, a progress bar or completion badge), you can omit large fields like `payload` and `output` by passing `skipColumns`. This reduces the data sent over the wire and avoids issues such as "Large HTTP Payload" warnings in tools like Sentry.
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function RunStatusBadge({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+    skipColumns: ["payload", "output"],
+  });
+
+  if (error) return <span>Error</span>;
+  if (!run) return <span>Loading…</span>;
+
+  return <span>Status: {run.status}</span>;
+}
+```
+
+You can skip any of: `payload`, `output`, `metadata`, `startedAt`, `delayUntil`, `queuedAt`, `expiredAt`, `completedAt`, `number`, `isTest`, `usageDurationMs`, `costInCents`, `baseCostInCents`, `ttl`, `payloadType`, `outputType`, `runTags`, `error`. The `useRealtimeRunsWithTag` hook also accepts a `skipColumns` option in the same way.
+
+See our [run object reference](/realtime/run-object) for the complete schema and [How it Works documentation](/realtime/how-it-works) for more technical details.
+
+### useRealtimeRunsWithTag
+
+The `useRealtimeRunsWithTag` hook allows you to subscribe to multiple runs with a specific tag.
+
+```tsx
+"use client"; // This is needed for Next.js App Router or other RSC frameworks
+
+import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+
+export function MyComponent({ tag }: { tag: string }) {
+  const { runs, error } = useRealtimeRunsWithTag(tag);
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return (
+    <div>
+      {runs.map((run) => (
+        <div key={run.id}>Run: {run.id}</div>
+      ))}
+    </div>
+  );
+}
+```
+
+To correctly type the runs payload and output, you can provide the type of your task to the `useRealtimeRunsWithTag` hook:
+
+```tsx
+import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+import type { myTask } from "@/trigger/myTask";
+
+export function MyComponent({ tag }: { tag: string }) {
+  const { runs, error } = useRealtimeRunsWithTag<typeof myTask>(tag);
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  // Now runs[i].payload and runs[i].output are correctly typed
+
+  return (
+    <div>
+      {runs.map((run) => (
+        <div key={run.id}>Run: {run.id}</div>
+      ))}
+    </div>
+  );
+}
+```
+
+If `useRealtimeRunsWithTag` could return multiple different types of tasks, you can pass a union of all the task types to the hook:
+
+```tsx
+import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+import type { myTask1, myTask2 } from "@/trigger/myTasks";
+
+export function MyComponent({ tag }: { tag: string }) {
+  const { runs, error } = useRealtimeRunsWithTag<typeof myTask1 | typeof myTask2>(tag);
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  // You can narrow down the type of the run based on the taskIdentifier
+  for (const run of runs) {
+    if (run.taskIdentifier === "my-task-1") {
+      // run is correctly typed as myTask1
+    } else if (run.taskIdentifier === "my-task-2") {
+      // run is correctly typed as myTask2
+    }
+  }
+
+  return (
+    <div>
+      {runs.map((run) => (
+        <div key={run.id}>Run: {run.id}</div>
+      ))}
+    </div>
+  );
+}
+```
+
+### useRealtimeBatch
+
+The `useRealtimeBatch` hook allows you to subscribe to a batch of runs by its the batch ID.
+
+```tsx
+"use client"; // This is needed for Next.js App Router or other RSC frameworks
+
+import { useRealtimeBatch } from "@trigger.dev/react-hooks";
+
+export function MyComponent({ batchId }: { batchId: string }) {
+  const { runs, error } = useRealtimeBatch(batchId);
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return (
+    <div>
+      {runs.map((run) => (
+        <div key={run.id}>Run: {run.id}</div>
+      ))}
+    </div>
+  );
+}
+```
+
+See our [Realtime documentation](/realtime) for more information.
+
+## Using metadata to show progress in your UI
+
+All realtime hooks automatically include metadata updates. Whenever your task updates metadata using `metadata.set()`, `metadata.append()`, or other metadata methods, your component will re-render with the updated data.
+
+<Note>To learn how to write tasks using metadata, see our [metadata](/runs/metadata) guide.</Note>
+
+### Progress monitoring
+
+This example demonstrates how to create a progress monitor component that can be used to display the progress of a run:
+
+```tsx
+"use client"; // This is needed for Next.js App Router or other RSC frameworks
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function ProgressMonitor({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error, isLoading } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  if (isLoading) return <div>Loading run...</div>;
+  if (error) return <div>Error: {error.message}</div>;
+  if (!run) return <div>Run not found</div>;
+
+  const progress = run.metadata?.progress as
+    | {
+        current: number;
+        total: number;
+        percentage: number;
+        currentItem: string;
+      }
+    | undefined;
+
+  return (
+    <div className="space-y-4">
+      <div>
+        <h3>Run Status: {run.status}</h3>
+        <p>Run ID: {run.id}</p>
+      </div>
+
+      {progress && (
+        <div className="space-y-2">
+          <div className="flex justify-between text-sm">
+            <span>Progress</span>
+            <span>{progress.percentage}%</span>
+          </div>
+          <div className="w-full bg-gray-200 rounded-full h-2">
+            <div
+              className="bg-blue-600 h-2 rounded-full transition-all duration-300"
+              style={{ width: `${progress.percentage}%` }}
+            />
+          </div>
+          <p className="text-sm text-gray-600">
+            Processing: {progress.currentItem} ({progress.current}/{progress.total})
+          </p>
+        </div>
+      )}
+    </div>
+  );
+}
+```
+
+### Reusable progress bar
+
+This example demonstrates how to create a reusable progress bar component that can be used to display the percentage progress of a run:
+
+```tsx
+"use client";
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+interface ProgressBarProps {
+  runId: string;
+  publicAccessToken: string;
+  title?: string;
+}
+
+export function ProgressBar({ runId, publicAccessToken, title }: ProgressBarProps) {
+  const { run } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  const progress = run?.metadata?.progress as
+    | {
+        current?: number;
+        total?: number;
+        percentage?: number;
+        currentItem?: string;
+      }
+    | undefined;
+
+  const percentage = progress?.percentage ?? 0;
+  const isComplete = run?.status === "COMPLETED";
+  const isFailed = run?.status === "FAILED";
+
+  return (
+    <div className="w-full space-y-2">
+      {title && <h4 className="font-medium">{title}</h4>}
+
+      <div className="w-full bg-gray-200 rounded-full h-3">
+        <div
+          className={`h-3 rounded-full transition-all duration-500 ${
+            isFailed ? "bg-red-500" : isComplete ? "bg-green-500" : "bg-blue-500"
+          }`}
+          style={{ width: `${percentage}%` }}
+        />
+      </div>
+
+      <div className="flex justify-between text-sm text-gray-600">
+        <span>
+          {progress?.current && progress?.total
+            ? `${progress.current}/${progress.total} items`
+            : "Processing..."}
+        </span>
+        <span>{percentage}%</span>
+      </div>
+
+      {progress?.currentItem && (
+        <p className="text-sm text-gray-500 truncate">Current: {progress.currentItem}</p>
+      )}
+    </div>
+  );
+}
+```
+
+### Status indicator with logs
+
+This example demonstrates how to create a status indicator component that can be used to display the status of a run, and also logs that are emitted by the task:
+
+```tsx
+"use client";
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+interface StatusIndicatorProps {
+  runId: string;
+  publicAccessToken: string;
+}
+
+export function StatusIndicator({ runId, publicAccessToken }: StatusIndicatorProps) {
+  const { run } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  const status = run?.metadata?.status as string | undefined;
+  const logs = run?.metadata?.logs as string[] | undefined;
+
+  const getStatusColor = (status: string | undefined) => {
+    switch (status) {
+      case "completed":
+        return "text-green-600 bg-green-100";
+      case "failed":
+        return "text-red-600 bg-red-100";
+      case "running":
+        return "text-blue-600 bg-blue-100";
+      default:
+        return "text-gray-600 bg-gray-100";
+    }
+  };
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center space-x-2">
+        <span className={`px-3 py-1 rounded-full text-sm font-medium ${getStatusColor(status)}`}>
+          {status || run?.status || "Unknown"}
+        </span>
+        <span className="text-sm text-gray-500">Run {run?.id}</span>
+      </div>
+
+      {logs && logs.length > 0 && (
+        <div className="bg-gray-50 rounded-lg p-4">
+          <h4 className="font-medium mb-2">Logs</h4>
+          <div className="space-y-1 max-h-48 overflow-y-auto">
+            {logs.map((log, index) => (
+              <div key={index} className="text-sm text-gray-700 font-mono">
+                {log}
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+```
+
+### Multi-stage deployment monitor
+
+This example demonstrates how to create a multi-stage deployment monitor component that can be used to display the progress of a deployment:
+
+```tsx
+"use client";
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+interface DeploymentMonitorProps {
+  runId: string;
+  publicAccessToken: string;
+}
+
+const DEPLOYMENT_STAGES = [
+  "initializing",
+  "building",
+  "testing",
+  "deploying",
+  "verifying",
+  "completed",
+] as const;
+
+export function DeploymentMonitor({ runId, publicAccessToken }: DeploymentMonitorProps) {
+  const { run } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  const status = run?.metadata?.status as string | undefined;
+  const logs = run?.metadata?.logs as string[] | undefined;
+  const currentStageIndex = DEPLOYMENT_STAGES.indexOf(status as any);
+
+  return (
+    <div className="space-y-6">
+      <h3 className="text-lg font-semibold">Deployment Progress</h3>
+
+      {/* Stage indicators */}
+      <div className="space-y-4">
+        {DEPLOYMENT_STAGES.map((stage, index) => {
+          const isActive = currentStageIndex === index;
+          const isCompleted = currentStageIndex > index;
+          const isFailed = run?.status === "FAILED" && currentStageIndex === index;
+
+          return (
+            <div key={stage} className="flex items-center space-x-3">
+              <div
+                className={`w-6 h-6 rounded-full flex items-center justify-center text-sm font-medium ${
+                  isFailed
+                    ? "bg-red-500 text-white"
+                    : isCompleted
+                    ? "bg-green-500 text-white"
+                    : isActive
+                    ? "bg-blue-500 text-white"
+                    : "bg-gray-200 text-gray-600"
+                }`}
+              >
+                {isCompleted ? "✓" : index + 1}
+              </div>
+              <span
+                className={`capitalize ${
+                  isActive
+                    ? "font-medium text-blue-600"
+                    : isCompleted
+                    ? "text-green-600"
+                    : isFailed
+                    ? "text-red-600"
+                    : "text-gray-500"
+                }`}
+              >
+                {stage}
+              </span>
+              {isActive && (
+                <div className="animate-spin w-4 h-4 border-2 border-blue-500 border-t-transparent rounded-full" />
+              )}
+            </div>
+          );
+        })}
+      </div>
+
+      {/* Recent logs */}
+      {logs && logs.length > 0 && (
+        <div className="bg-black text-green-400 rounded-lg p-4 font-mono text-sm">
+          <div className="space-y-1 max-h-32 overflow-y-auto">
+            {logs.slice(-5).map((log, index) => (
+              <div key={index}>
+                <span className="text-gray-500">$ </span>
+                {log}
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+```
+
+### Type safety
+
+Define TypeScript interfaces for your metadata to get full type safety:
+
+```tsx
+"use client";
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+interface TaskMetadata {
+  progress?: {
+    current: number;
+    total: number;
+    percentage: number;
+    currentItem: string;
+  };
+  status?: "initializing" | "processing" | "completed" | "failed";
+  user?: {
+    id: string;
+    name: string;
+  };
+  logs?: string[];
+}
+
+export function TypedMetadataComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+  });
+
+  // Type-safe metadata access
+  const metadata = run?.metadata as TaskMetadata | undefined;
+
+  return (
+    <div>
+      {metadata?.progress && <p>Progress: {metadata.progress.percentage}%</p>}
+
+      {metadata?.user && (
+        <p>
+          User: {metadata.user.name} ({metadata.user.id})
+        </p>
+      )}
+
+      {metadata?.status && <p>Status: {metadata.status}</p>}
+    </div>
+  );
+}
+```
+
+## Common options
+
+### accessToken & baseURL
+
+You can pass the `accessToken` option to the Realtime hooks to authenticate the subscription.
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+}: {
+  runId: string;
+  publicAccessToken: string;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+    baseURL: "https://my-self-hosted-trigger.com", // Optional if you are using a self-hosted Trigger.dev instance
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+### enabled
+
+You can pass the `enabled` option to the Realtime hooks to enable or disable the subscription.
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  runId,
+  publicAccessToken,
+  enabled,
+}: {
+  runId: string;
+  publicAccessToken: string;
+  enabled: boolean;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+    enabled,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+This allows you to conditionally disable using the hook based on some state.
+
+### id
+
+You can pass the `id` option to the Realtime hooks to change the ID of the subscription.
+
+```tsx
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({
+  id,
+  runId,
+  publicAccessToken,
+  enabled,
+}: {
+  id: string;
+  runId: string;
+  publicAccessToken: string;
+  enabled: boolean;
+}) {
+  const { run, error } = useRealtimeRun(runId, {
+    accessToken: publicAccessToken,
+    enabled,
+    id,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+This allows you to change the ID of the subscription based on some state. Passing in a different ID will unsubscribe from the current subscription and subscribe to the new one (and remove any cached data).
diff --git a/docs/realtime/react-hooks/swr.mdx b/docs/realtime/react-hooks/swr.mdx
new file mode 100644
index 00000000000..6eae5b180f2
--- /dev/null
+++ b/docs/realtime/react-hooks/swr.mdx
@@ -0,0 +1,87 @@
+---
+title: SWR hooks
+sidebarTitle: SWR
+description: Fetch and cache data using SWR-based hooks
+---
+
+SWR hooks use the [swr](https://swr.vercel.app/) library to fetch data once and cache it. These hooks are useful when you need to fetch data without real-time updates.
+
+<Note>
+  While SWR can be configured to poll for updates, we recommend using our other [Realtime
+  hooks](/realtime/react-hooks/) for most use-cases due to rate-limits and the way the Trigger.dev
+  API works.
+</Note>
+
+## useRun
+
+The `useRun` hook allows you to fetch a run by its ID.
+
+```tsx
+"use client"; // This is needed for Next.js App Router or other RSC frameworks
+
+import { useRun } from "@trigger.dev/react-hooks";
+
+export function MyComponent({ runId }: { runId: string }) {
+  const { run, error, isLoading } = useRun(runId);
+
+  if (isLoading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+The `run` object returned is the same as the [run object](/management/runs/retrieve) returned by the Trigger.dev API. To correctly type the run's payload and output, you can provide the type of your task to the `useRun` hook:
+
+```tsx
+import { useRun } from "@trigger.dev/react-hooks";
+import type { myTask } from "@/trigger/myTask";
+
+export function MyComponent({ runId }: { runId: string }) {
+  const { run, error, isLoading } = useRun<typeof myTask>(runId, {
+    refreshInterval: 0, // Disable polling
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error.message}</div>;
+
+  // Now run.payload and run.output are correctly typed
+
+  return <div>Run: {run.id}</div>;
+}
+```
+
+## Common SWR options
+
+You can pass the following options to the all SWR hooks:
+
+<ParamField path="revalidateOnFocus" type="boolean">
+  Revalidate the data when the window regains focus.
+</ParamField>
+
+<ParamField path="revalidateOnReconnect" type="boolean">
+  Revalidate the data when the browser regains a network connection.
+</ParamField>
+
+<ParamField path="refreshInterval" type="number">
+  Poll for updates at the specified interval (in milliseconds). Polling is not recommended for most
+  use-cases. Use the Realtime hooks instead.
+</ParamField>
+
+## Common SWR return values
+
+<ResponseField name="error" type="Error">
+  An error object if an error occurred while fetching the data.
+</ResponseField>
+
+<ResponseField name="isLoading" type="boolean">
+  A boolean indicating if the data is currently being fetched.
+</ResponseField>
+
+<ResponseField name="isValidating" type="boolean">
+  A boolean indicating if the data is currently being revalidated.
+</ResponseField>
+
+<ResponseField name="isError" type="boolean">
+  A boolean indicating if an error occurred while fetching the data.
+</ResponseField>{" "}
diff --git a/docs/frontend/react-hooks/triggering.mdx b/docs/realtime/react-hooks/triggering.mdx
similarity index 67%
rename from docs/frontend/react-hooks/triggering.mdx
rename to docs/realtime/react-hooks/triggering.mdx
index 26bfcb1c121..50320ccd48f 100644
--- a/docs/frontend/react-hooks/triggering.mdx
+++ b/docs/realtime/react-hooks/triggering.mdx
@@ -4,81 +4,23 @@ sidebarTitle: Triggering
 description: Triggering tasks from your frontend application.
 ---
 
-import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
-
 We provide a set of hooks that can be used to trigger tasks from your frontend application.
 
-## Demo
-
-We've created a [Demo application](https://github.com/triggerdotdev/realtime-llm-battle) that demonstrates how to use our React hooks to trigger tasks in a Next.js application. The application uses the `@trigger.dev/react-hooks` package to trigger a task and subscribe to the run in real-time.
-
-## Installation
-
-Install the `@trigger.dev/react-hooks` package in your project:
-
-<CodeGroup>
-
-```bash npm
-npm add @trigger.dev/react-hooks
-```
-
-```bash pnpm
-pnpm add @trigger.dev/react-hooks
-```
-
-```bash yarn
-yarn install @trigger.dev/react-hooks
-```
-
-</CodeGroup>
-
-## Authentication
-
-To authenticate a trigger hook, you must provide a special one-time use "trigger" token. These tokens are very similar to [Public Access Tokens](/frontend/overview#authentication), but they can only be used once to trigger a task. You can generate a trigger token using the `auth.createTriggerPublicToken` function in your backend code:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-// Somewhere in your backend code
-const triggerToken = await auth.createTriggerPublicToken("my-task");
-```
-
-These tokens also expire, with the default expiration time being 15 minutes. You can specify a custom expiration time by passing a `expirationTime` parameter:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-// Somewhere in your backend code
-const triggerToken = await auth.createTriggerPublicToken("my-task", {
-  expirationTime: "24hr",
-});
-```
-
-You can also pass multiple tasks to the `createTriggerPublicToken` function to create a token that can trigger multiple tasks:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-// Somewhere in your backend code
-const triggerToken = await auth.createTriggerPublicToken(["my-task-1", "my-task-2"]);
-```
-
-You can also pass the `multipleUse` parameter to create a token that can be used multiple times:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-// Somewhere in your backend code
-const triggerToken = await auth.createTriggerPublicToken("my-task", {
-  multipleUse: true, // ❌ Use this with caution!
-});
-```
-
 <Note>
-  After generating the trigger token in your backend, you must pass it to your frontend application.
-  We have a guide on how to do this in the [React hooks
-  overview](/frontend/react-hooks/overview#passing-the-token-to-the-frontend).
+  For triggering tasks from your frontend, you need to use “trigger” tokens. These can only be used
+  once to trigger a task and are more secure than regular Public Access Tokens. To learn more about
+  how to create and use these tokens, see our [Trigger
+  Tokens](/realtime/auth#trigger-tokens-for-frontend-triggering-only) documentation.
 </Note>
 
 ## Hooks
 
+We provide three hooks for triggering tasks from your frontend application:
+
+- `useTaskTrigger` - Trigger a task from your frontend application.
+- `useRealtimeTaskTrigger` - Trigger a task from your frontend application and subscribe to the run.
+- `useRealtimeTaskTriggerWithStreams` - Trigger a task from your frontend application and subscribe to the run, and also receive any streams that are emitted by the task.
+
 ### useTaskTrigger
 
 The `useTaskTrigger` hook allows you to trigger a task from your frontend application.
@@ -88,7 +30,7 @@ The `useTaskTrigger` hook allows you to trigger a task from your frontend applic
 
 import { useTaskTrigger } from "@trigger.dev/react-hooks";
 import type { myTask } from "@/trigger/myTask";
-//     👆 This is the type of your task
+//     👆 This is the type of your task, include this to get type-safety
 
 export function MyComponent({ publicAccessToken }: { publicAccessToken: string }) {
   //                         pass the type of your task here 👇
@@ -127,7 +69,7 @@ submit({ foo: "bar" }, { tags: ["tag1", "tag2"] });
 
 #### Using the handle object
 
-You can use the `handle` object to initiate a subsequent [realtime hook](/frontend/react-hooks/realtime#userealtimerun) to subscribe to the run.
+You can use the `handle` object to initiate a subsequent [Realtime hook](/realtime/react-hooks/subscribe#userealtimerun) to subscribe to the run.
 
 ```tsx
 "use client"; // This is needed for Next.js App Router or other RSC frameworks
@@ -193,7 +135,7 @@ export function MyComponent({ publicAccessToken }: { publicAccessToken: string }
     return <div>Error: {error.message}</div>;
   }
 
-  // This is the realtime run object, which will automatically update when the run changes
+  // This is the Realtime run object, which will automatically update when the run changes
   if (run) {
     return <div>Run ID: {run.id}</div>;
   }
@@ -250,5 +192,3 @@ export function MyComponent({ publicAccessToken }: { publicAccessToken: string }
   );
 }
 ```
-
-<RealtimeExamplesCards />
diff --git a/docs/realtime/react-hooks/use-wait-token.mdx b/docs/realtime/react-hooks/use-wait-token.mdx
new file mode 100644
index 00000000000..13cfdc303c2
--- /dev/null
+++ b/docs/realtime/react-hooks/use-wait-token.mdx
@@ -0,0 +1,34 @@
+---
+title: useWaitToken
+description: Use the useWaitToken hook to complete a wait token from a React component
+---
+
+We've added a new `useWaitToken` react hook that allows you to complete a wait token from a React component, using a Public Access Token.
+
+```ts backend.ts
+import { wait } from "@trigger.dev/sdk";
+
+// Somewhere in your code, you'll need to create the token and then pass the token ID and the public token to the frontend
+const token = await wait.createToken({
+  timeout: "10m",
+});
+
+return {
+  tokenId: token.id,
+  publicToken: token.publicAccessToken, // An automatically generated public access token that expires in 1 hour
+};
+```
+
+Now you can use the `useWaitToken` hook in your frontend code:
+
+```tsx frontend.tsx
+import { useWaitToken } from "@trigger.dev/react-hooks";
+
+export function MyComponent({ publicToken, tokenId }: { publicToken: string; tokenId: string }) {
+  const { complete } = useWaitToken(tokenId, {
+    accessToken: publicToken,
+  });
+
+  return <button onClick={() => complete({ foo: "bar" })}>Complete</button>;
+}
+```
diff --git a/docs/realtime/run-object.mdx b/docs/realtime/run-object.mdx
new file mode 100644
index 00000000000..a7b16447e3d
--- /dev/null
+++ b/docs/realtime/run-object.mdx
@@ -0,0 +1,174 @@
+---
+title: "The run object"
+sidebarTitle: "The run object"
+description: "The run object schema for Realtime subscriptions"
+---
+
+The [run object](/realtime/run-object#the-run-object) is the main object returned by Realtime subscriptions (e.g., `runs.subscribeToRun()`). It contains all the information about the run, including the run ID, task identifier, payload, output, and more.
+
+Type-safety is supported for the run object, so you can infer the types of the run's payload and output. See [type-safety](#type-safety) for more information.
+
+## The run object
+
+### Properties
+
+<ParamField path="id" type="string" required>
+  The run ID.
+</ParamField>
+
+<ParamField path="taskIdentifier" type="string" required>
+  The task identifier.
+</ParamField>
+
+<ParamField path="payload" type="object" required>
+  The input payload for the run.
+</ParamField>
+
+<ParamField path="output" type="object">
+  The output result of the run.
+</ParamField>
+
+<ParamField path="createdAt" type="Date" required>
+  Timestamp when the run was created.
+</ParamField>
+
+<ParamField path="updatedAt" type="Date" required>
+  Timestamp when the run was last updated.
+</ParamField>
+
+<ParamField path="number" type="number" required>
+  Sequential number assigned to the run.
+</ParamField>
+
+<ParamField path="status" type="RunStatus" required>
+  Current status of the run.
+
+  <Accordion title="RunStatus enum">
+
+| Status               | Description                                                                                               |
+| -------------------- | --------------------------------------------------------------------------------------------------------- |
+| `WAITING_FOR_DEPLOY` | Task hasn't been deployed yet but is waiting to be executed                                               |
+| `QUEUED`             | Run is waiting to be executed by a worker                                                                 |
+| `EXECUTING`          | Run is currently being executed by a worker                                                               |
+| `REATTEMPTING`       | Run has failed and is waiting to be retried                                                               |
+| `FROZEN`             | Run has been paused by the system, and will be resumed by the system                                      |
+| `COMPLETED`          | Run has been completed successfully                                                                       |
+| `CANCELED`           | Run has been canceled by the user                                                                         |
+| `FAILED`             | Run has been completed with errors                                                                        |
+| `CRASHED`            | Run has crashed and won't be retried, most likely the worker ran out of resources, e.g. memory or storage |
+| `INTERRUPTED`        | Run was interrupted during execution, mostly this happens in development environments                     |
+| `SYSTEM_FAILURE`     | Run has failed to complete, due to an error in the system                                                 |
+| `DELAYED`            | Run has been scheduled to run at a specific time                                                          |
+| `EXPIRED`            | Run has expired and won't be executed                                                                     |
+| `TIMED_OUT`          | Run has reached it's maxDuration and has been stopped                                                     |
+
+</Accordion>
+</ParamField>
+
+<ParamField path="durationMs" type="number" required>
+  Duration of the run in milliseconds.
+</ParamField>
+
+<ParamField path="costInCents" type="number" required>
+  Total cost of the run in cents.
+</ParamField>
+
+<ParamField path="baseCostInCents" type="number" required>
+  Base cost of the run in cents before any additional charges.
+</ParamField>
+
+<ParamField path="tags" type="string[]" required>
+  Array of tags associated with the run.
+</ParamField>
+
+<ParamField path="idempotencyKey" type="string">
+  Key used to ensure idempotent execution.
+</ParamField>
+
+<ParamField path="expiredAt" type="Date">
+  Timestamp when the run expired.
+</ParamField>
+
+<ParamField path="ttl" type="string">
+  Time-to-live duration for the run.
+</ParamField>
+
+<ParamField path="finishedAt" type="Date">
+  Timestamp when the run finished.
+</ParamField>
+
+<ParamField path="startedAt" type="Date">
+  Timestamp when the run started.
+</ParamField>
+
+<ParamField path="delayedUntil" type="Date">
+  Timestamp until which the run is delayed.
+</ParamField>
+
+<ParamField path="queuedAt" type="Date">
+  Timestamp when the run was queued.
+</ParamField>
+
+<ParamField path="metadata" type="Record<string, DeserializedJson>">
+  Additional metadata associated with the run.
+</ParamField>
+
+<ParamField path="error" type="SerializedError">
+  Error information if the run failed.
+</ParamField>
+
+<ParamField path="isTest" type="boolean" required>
+  Indicates whether this is a test run.
+</ParamField>
+
+## Type-safety
+
+You can infer the types of the run's payload and output by passing the type of the task to the `subscribeToRun` function. This will give you type-safe access to the run's payload and output.
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+import type { myTask } from "./trigger/my-task";
+
+// Somewhere in your backend code
+async function myBackend() {
+  const handle = await tasks.trigger("my-task", { some: "data" });
+
+  for await (const run of runs.subscribeToRun<typeof myTask>(handle.id)) {
+    // This will log the run every time it changes
+    console.log(run.payload.some);
+
+    if (run.output) {
+      // This will log the output if it exists
+      console.log(run.output.some);
+    }
+  }
+}
+```
+
+When using `subscribeToRunsWithTag`, you can pass a union of task types for all the possible tasks that can have the tag.
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+import type { myTask, myOtherTask } from "./trigger/my-task";
+
+// Somewhere in your backend code
+for await (const run of runs.subscribeToRunsWithTag<typeof myTask | typeof myOtherTask>("my-tag")) {
+  // You can narrow down the type based on the taskIdentifier
+  switch (run.taskIdentifier) {
+    case "my-task": {
+      console.log("Run output:", run.output.foo); // This will be type-safe
+      break;
+    }
+    case "my-other-task": {
+      console.log("Run output:", run.output.bar); // This will be type-safe
+      break;
+    }
+  }
+}
+```
+
+This works with all realtime subscription functions:
+
+- `runs.subscribeToRun<TaskType>()`
+- `runs.subscribeToRunsWithTag<TaskType>()`
+- `runs.subscribeToBatch<TaskType>()`
diff --git a/docs/realtime/streams.mdx b/docs/realtime/streams.mdx
deleted file mode 100644
index aa74a68e096..00000000000
--- a/docs/realtime/streams.mdx
+++ /dev/null
@@ -1,455 +0,0 @@
----
-title: Realtime streams
-sidebarTitle: Streams
-description: Stream data in realtime from inside your tasks
----
-
-import RealtimeExamplesCards from "/snippets/realtime-examples-cards.mdx";
-
-The world is going realtime, and so should your tasks. With the Streams API, you can stream data from your tasks to the outside world in realtime. This is useful for a variety of use cases, including AI.
-
-## How it works
-
-The Streams API is a simple API that allows you to send data from your tasks to the outside world in realtime using the [metadata](/runs/metadata) system. You can send any kind of data that is streamed in realtime, but the most common use case is to send streaming output from streaming LLM providers, like OpenAI.
-
-## Usage
-
-To use the Streams API, you need to register a stream with a specific key using `metadata.stream`. The following example uses the OpenAI SDK with `stream: true` to stream the output of the LLM model in realtime:
-
-```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
-import OpenAI from "openai";
-
-const openai = new OpenAI({
-  apiKey: process.env.OPENAI_API_KEY,
-});
-
-export type STREAMS = {
-  openai: OpenAI.ChatCompletionChunk; // The type of the chunk is determined by the provider
-};
-
-export const myTask = task({
-  id: "my-task",
-  run: async (payload: { prompt: string }) => {
-    const completion = await openai.chat.completions.create({
-      messages: [{ role: "user", content: payload.prompt }],
-      model: "gpt-3.5-turbo",
-      stream: true,
-    });
-
-    // Register the stream with the key "openai"
-    // This will "tee" the stream and send it to the metadata system
-    const stream = await metadata.stream("openai", completion);
-
-    let text = "";
-
-    // You can read the returned stream as an async iterator
-    for await (const chunk of stream) {
-      logger.log("Received chunk", { chunk });
-
-      // The type of the chunk is determined by the provider
-      text += chunk.choices.map((choice) => choice.delta?.content).join("");
-    }
-
-    return { text };
-  },
-});
-```
-
-You can then subscribe to the stream using the `runs.subscribeToRun` method:
-
-<Note>
-  `runs.subscribeToRun` should be used from your backend or another task. To subscribe to a run from
-  your frontend, you can use our [React hooks](/frontend/react-hooks).
-</Note>
-
-```ts
-import { runs } from "@trigger.dev/sdk/v3";
-import type { myTask, STREAMS } from "./trigger/my-task";
-
-// Somewhere in your backend
-async function subscribeToStream(runId: string) {
-  // Use a for-await loop to subscribe to the stream
-  for await (const part of runs.subscribeToRun<typeof myTask>(runId).withStreams<STREAMS>()) {
-    switch (part.type) {
-      case "run": {
-        console.log("Received run", part.run);
-        break;
-      }
-      case "openai": {
-        // part.chunk is of type OpenAI.ChatCompletionChunk
-        console.log("Received OpenAI chunk", part.chunk);
-        break;
-      }
-    }
-  }
-}
-```
-
-You can register and subscribe to multiple streams in the same task. Let's add a stream from the response body of a fetch request:
-
-```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
-import OpenAI from "openai";
-
-const openai = new OpenAI({
-  apiKey: process.env.OPENAI_API_KEY,
-});
-
-export type STREAMS = {
-  openai: OpenAI.ChatCompletionChunk; // The type of the chunk is determined by the provider
-  fetch: string; // The response body will be an array of strings
-};
-
-export const myTask = task({
-  id: "my-task",
-  run: async (payload: { prompt: string }) => {
-    const completion = await openai.chat.completions.create({
-      messages: [{ role: "user", content: payload.prompt }],
-      model: "gpt-3.5-turbo",
-      stream: true,
-    });
-
-    // Register the stream with the key "openai"
-    await metadata.stream("openai", completion);
-
-    const response = await fetch("https://jsonplaceholder.typicode.com/posts");
-
-    if (!response.body) {
-      return;
-    }
-
-    // Register the stream with the key "fetch"
-    // Pipe the response.body through a TextDecoderStream to convert it to a string
-    await metadata.stream("fetch", response.body.pipeThrough(new TextDecoderStream()));
-  },
-});
-```
-
-<Note>
-  You may notice above that we aren't consuming either of the streams in the task. In the
-  background, we'll wait until all streams are consumed before the task is considered complete (with
-  a max timeout of 60 seconds). If you have a longer running stream, make sure to consume it in the
-  task.
-</Note>
-
-And then subscribing to the streams:
-
-```ts
-import { runs } from "@trigger.dev/sdk/v3";
-import type { myTask, STREAMS } from "./trigger/my-task";
-
-// Somewhere in your backend
-async function subscribeToStream(runId: string) {
-  // Use a for-await loop to subscribe to the stream
-  for await (const part of runs.subscribeToRun<typeof myTask>(runId).withStreams<STREAMS>()) {
-    switch (part.type) {
-      case "run": {
-        console.log("Received run", part.run);
-        break;
-      }
-      case "openai": {
-        // part.chunk is of type OpenAI.ChatCompletionChunk
-        console.log("Received OpenAI chunk", part.chunk);
-        break;
-      }
-      case "fetch": {
-        // part.chunk is a string
-        console.log("Received fetch chunk", part.chunk);
-        break;
-      }
-    }
-  }
-}
-```
-
-## React hooks
-
-If you're building a frontend application, you can use our React hooks to subscribe to streams. Here's an example of how you can use the `useRealtimeRunWithStreams` hook to subscribe to a stream:
-
-```tsx
-import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
-import type { myTask, STREAMS } from "./trigger/my-task";
-
-// Somewhere in your React component
-function MyComponent({ runId, publicAccessToken }: { runId: string; publicAccessToken: string }) {
-  const { run, streams } = useRealtimeRunWithStreams<typeof myTask, STREAMS>(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (!run) {
-    return <div>Loading...</div>;
-  }
-
-  return (
-    <div>
-      <h1>Run ID: {run.id}</h1>
-      <h2>Streams:</h2>
-      <ul>
-        {Object.entries(streams).map(([key, value]) => (
-          <li key={key}>
-            <strong>{key}</strong>: {JSON.stringify(value)}
-          </li>
-        ))}
-      </ul>
-    </div>
-  );
-}
-```
-
-Read more about using the React hooks in the [React hooks](/frontend/react-hooks) documentation.
-
-## Usage with the `ai` SDK
-
-The [ai SDK](https://sdk.vercel.ai/docs/introduction) provides a higher-level API for working with AI models. You can use the `ai` SDK with the Streams API by using the `streamText` method:
-
-```ts
-import { openai } from "@ai-sdk/openai";
-import { logger, metadata, runs, schemaTask } from "@trigger.dev/sdk/v3";
-import { streamText } from "ai";
-import { z } from "zod";
-
-export type STREAMS = {
-  openai: string;
-};
-
-export const aiStreaming = schemaTask({
-  id: "ai-streaming",
-  description: "Stream data from the AI sdk",
-  schema: z.object({
-    model: z.string().default("o1-preview"),
-    prompt: z.string().default("Hello, how are you?"),
-  }),
-  run: async ({ model, prompt }) => {
-    logger.info("Running OpenAI model", { model, prompt });
-
-    const result = streamText({
-      model: openai(model),
-      prompt,
-    });
-
-    // pass the textStream to the metadata system
-    const stream = await metadata.stream("openai", result.textStream);
-
-    let text = "";
-
-    for await (const chunk of stream) {
-      logger.log("Received chunk", { chunk });
-
-      text += chunk; // chunk is a string
-    }
-
-    return { text };
-  },
-});
-```
-
-And then render the stream in your frontend:
-
-```tsx
-import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
-import type { aiStreaming, STREAMS } from "./trigger/ai-streaming";
-
-function MyComponent({ runId, publicAccessToken }: { runId: string; publicAccessToken: string }) {
-  const { streams } = useRealtimeRunWithStreams<typeof aiStreaming, STREAMS>(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (!streams.openai) {
-    return <div>Loading...</div>;
-  }
-
-  const text = streams.openai.join(""); // `streams.openai` is an array of strings
-
-  return (
-    <div>
-      <h2>OpenAI response:</h2>
-      <p>{text}</p>
-    </div>
-  );
-}
-```
-
-### Using tools and `fullStream`
-
-When calling `streamText`, you can provide a `tools` object that allows the LLM to use additional tools. You can then access the tool call and results using the `fullStream` method:
-
-```ts
-import { openai } from "@ai-sdk/openai";
-import { logger, metadata, runs, schemaTask } from "@trigger.dev/sdk/v3";
-import { streamText, tool, type TextStreamPart } from "ai";
-import { z } from "zod";
-
-const tools = {
-  getWeather: tool({
-    description: "Get the weather in a location",
-    parameters: z.object({
-      location: z.string().describe("The location to get the weather for"),
-    }),
-    execute: async ({ location }) => ({
-      location,
-      temperature: 72 + Math.floor(Math.random() * 21) - 10,
-    }),
-  }),
-};
-
-export type STREAMS = {
-  // Give the stream a type of TextStreamPart along with the tools
-  openai: TextStreamPart<{ getWeather: typeof tools.getWeather }>;
-};
-
-export const aiStreamingWithTools = schemaTask({
-  id: "ai-streaming-with-tools",
-  description: "Stream data from the AI SDK and use tools",
-  schema: z.object({
-    model: z.string().default("gpt-4o-mini"),
-    prompt: z
-      .string()
-      .default(
-        "Based on the temperature, will I need to wear extra clothes today in San Fransico? Please be detailed."
-      ),
-  }),
-  run: async ({ model, prompt }) => {
-    logger.info("Running OpenAI model", { model, prompt });
-
-    const result = streamText({
-      model: openai(model),
-      prompt,
-      tools, // Pass in the tools to use
-      maxSteps: 5, // Allow streamText to repeatedly call the model
-    });
-
-    // pass the fullStream to the metadata system
-    const stream = await metadata.stream("openai", result.fullStream);
-
-    let text = "";
-
-    for await (const chunk of stream) {
-      logger.log("Received chunk", { chunk });
-
-      // chunk is a TextStreamPart
-      if (chunk.type === "text-delta") {
-        text += chunk.textDelta;
-      }
-    }
-
-    return { text };
-  },
-});
-```
-
-Now you can get access to the tool call and results in your frontend:
-
-```tsx
-import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
-import type { aiStreamingWithTools, STREAMS } from "./trigger/ai-streaming";
-
-function MyComponent({ runId, publicAccessToken }: { runId: string; publicAccessToken: string }) {
-  const { streams } = useRealtimeRunWithStreams<typeof aiStreamingWithTools, STREAMS>(runId, {
-    accessToken: publicAccessToken,
-  });
-
-  if (!streams.openai) {
-    return <div>Loading...</div>;
-  }
-
-  // streams.openai is an array of TextStreamPart
-  const toolCall = streams.openai.find(
-    (stream) => stream.type === "tool-call" && stream.toolName === "getWeather"
-  );
-  const toolResult = streams.openai.find((stream) => stream.type === "tool-result");
-  const textDeltas = streams.openai.filter((stream) => stream.type === "text-delta");
-
-  const text = textDeltas.map((delta) => delta.textDelta).join("");
-  const weatherLocation = toolCall ? toolCall.args.location : undefined;
-  const weather = toolResult ? toolResult.result.temperature : undefined;
-
-  return (
-    <div>
-      <h2>OpenAI response:</h2>
-      <p>{text}</p>
-      <h2>Weather:</h2>
-      <p>
-        {weatherLocation
-          ? `The weather in ${weatherLocation} is ${weather} degrees.`
-          : "No weather data"}
-      </p>
-    </div>
-  );
-}
-```
-
-### Using `toolTask`
-
-As you can see above, we defined a tool which will be used in the `aiStreamingWithTools` task. You can also define a Trigger.dev task that can be used as a tool, and will automatically be invoked with `triggerAndWait` when the tool is called. This is done using the `toolTask` function:
-
-```ts
-import { openai } from "@ai-sdk/openai";
-import { logger, metadata, runs, schemaTask, toolTask } from "@trigger.dev/sdk/v3";
-import { streamText, tool, type TextStreamPart } from "ai";
-import { z } from "zod";
-
-export const getWeather = toolTask({
-  id: "get-weather",
-  description: "Get the weather for a location",
-  // Define the parameters for the tool, which becomes the task payload
-  parameters: z.object({
-    location: z.string(),
-  }),
-  run: async ({ location }) => {
-    // return mock data
-    return {
-      location,
-      temperature: 72 + Math.floor(Math.random() * 21) - 10,
-    };
-  },
-});
-
-export type STREAMS = {
-  // Give the stream a type of TextStreamPart along with the tools
-  openai: TextStreamPart<{ getWeather: typeof getWeather.tool }>;
-};
-
-export const aiStreamingWithTools = schemaTask({
-  id: "ai-streaming-with-tools",
-  description: "Stream data from the AI SDK and use tools",
-  schema: z.object({
-    model: z.string().default("gpt-4o-mini"),
-    prompt: z
-      .string()
-      .default(
-        "Based on the temperature, will I need to wear extra clothes today in San Fransico? Please be detailed."
-      ),
-  }),
-  run: async ({ model, prompt }) => {
-    logger.info("Running OpenAI model", { model, prompt });
-
-    const result = streamText({
-      model: openai(model),
-      prompt,
-      tools: {
-        getWeather: getWeather.tool, // pass weatherTask.tool as a tool
-      },
-      maxSteps: 5, // Allow streamText to repeatedly call the model
-    });
-
-    // pass the fullStream to the metadata system
-    const stream = await metadata.stream("openai", result.fullStream);
-
-    let text = "";
-
-    for await (const chunk of stream) {
-      logger.log("Received chunk", { chunk });
-
-      // chunk is a TextStreamPart
-      if (chunk.type === "text-delta") {
-        text += chunk.textDelta;
-      }
-    }
-
-    return { text };
-  },
-});
-```
-
-<RealtimeExamplesCards />
diff --git a/docs/realtime/subscribe-to-batch.mdx b/docs/realtime/subscribe-to-batch.mdx
deleted file mode 100644
index 9e0364b019d..00000000000
--- a/docs/realtime/subscribe-to-batch.mdx
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: runs.subscribeToBatch
-sidebarTitle: subscribeToBatch
-description: Subscribes to all changes for runs in a batch.
----
-
-import RunObject from "/snippets/realtime/run-object.mdx";
-
-<RequestExample>
-
-```ts Example
-import { runs } from "@trigger.dev/sdk/v3";
-
-for await (const run of runs.subscribeToBatch("batch_1234")) {
-  console.log(run);
-}
-```
-
-</RequestExample>
-
-This function subscribes to all changes for runs in a batch. It returns an async iterator that yields the a run object whenever a run in the batch is updated. The iterator does not complete on it's own, you must manually `break` the loop when you want to stop listening for updates.
-
-### Authentication
-
-This function supports both server-side and client-side authentication. For server-side authentication, use your API key. For client-side authentication, you must generate a public access token with one of the following scopes:
-
-- `read:batch:<batchId>`
-- `read:runs` will provide access to all runs (not recommended for production use)
-
-To generate a public access token, use the `auth.createPublicToken` function:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-// Somewhere in your backend code
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      batch: ["batch_1234"],
-    },
-  },
-});
-```
-
-### Response
-
-The AsyncIterator yields an object with the following properties:
-
-<RunObject />
diff --git a/docs/realtime/subscribe-to-run.mdx b/docs/realtime/subscribe-to-run.mdx
deleted file mode 100644
index c2b4d88ea75..00000000000
--- a/docs/realtime/subscribe-to-run.mdx
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: runs.subscribeToRun
-sidebarTitle: subscribeToRun
-description: Subscribes to all changes to a run.
----
-
-import RunObject from "/snippets/realtime/run-object.mdx";
-
-<RequestExample>
-
-```ts Example
-import { runs } from "@trigger.dev/sdk/v3";
-
-for await (const run of runs.subscribeToRun("run_1234")) {
-  console.log(run);
-}
-```
-
-</RequestExample>
-
-This function subscribes to all changes to a run. It returns an async iterator that yields the run object whenever the run is updated. The iterator will complete when the run is finished.
-
-### Authentication
-
-This function supports both server-side and client-side authentication. For server-side authentication, use your API key. For client-side authentication, you must generate a public access token with one of the following scopes:
-
-- `read:runs`
-- `read:runs:<runId>`
-
-To generate a public access token, use the `auth.createPublicToken` function:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-// Somewhere in your backend code
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      runs: ["run_1234"],
-    },
-  },
-});
-```
-
-### Response
-
-The AsyncIterator yields an object with the following properties:
-
-<RunObject />
diff --git a/docs/realtime/subscribe-to-runs-with-tag.mdx b/docs/realtime/subscribe-to-runs-with-tag.mdx
deleted file mode 100644
index 950a4eefafd..00000000000
--- a/docs/realtime/subscribe-to-runs-with-tag.mdx
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: runs.subscribeToRunsWithTag
-sidebarTitle: subscribeToRunsWithTag
-description: Subscribes to all changes to runs with a specific tag.
----
-
-import RunObject from "/snippets/realtime/run-object.mdx";
-
-<RequestExample>
-
-```ts Example
-import { runs } from "@trigger.dev/sdk/v3";
-
-for await (const run of runs.subscribeToRunsWithTag("user:1234")) {
-  console.log(run);
-}
-```
-
-</RequestExample>
-
-This function subscribes to all changes to runs with a specific tag. It returns an async iterator that yields the run object whenever a run with the specified tag is updated. This iterator will never complete, so you must manually break out of the loop when you no longer want to receive updates.
-
-### Authentication
-
-This function supports both server-side and client-side authentication. For server-side authentication, use your API key. For client-side authentication, you must generate a public access token with one of the following scopes:
-
-- `read:runs`
-- `read:tags:<tagName>`
-
-To generate a public access token, use the `auth.createPublicToken` function:
-
-```ts
-import { auth } from "@trigger.dev/sdk/v3";
-
-// Somewhere in your backend code
-const publicToken = await auth.createPublicToken({
-  scopes: {
-    read: {
-      tags: ["user:1234"],
-    },
-  },
-});
-```
-
-### Response
-
-The AsyncIterator yields an object with the following properties:
-
-<RunObject />
diff --git a/docs/run-tests.mdx b/docs/run-tests.mdx
index b6cf7c2379e..6598f7dbab5 100644
--- a/docs/run-tests.mdx
+++ b/docs/run-tests.mdx
@@ -3,24 +3,18 @@ title: "Run tests"
 description: "You can use the dashboard to run a test of your tasks."
 ---
 
-From the "Test" page in the sidebar of the dashboard you can run a test for any of your tasks, that includes for any environment.
+From the "Test" page in the side menu of the dashboard you can run a test for any of your tasks from any environment.
 
-<Steps>
+![Select an environment](/images/test-dashboard.png)
 
-<Step title="Select an environment">
-  ![Select an environment](/images/test-select-environment.png)
-</Step>
+<Icon icon="circle-1" iconType="solid" color="#FF2D6B" size="20" /> Select a task to test
 
-<Step title="Select the task to test">
-  ![Select the task to test](/images/test-select-task.png)
-</Step>
+<Icon icon="circle-2" iconType="solid" color="#FF2D6B" size="20" /> Include a payload or metadata
 
-<Step title="Enter a payload">
-  Select a recent payload as a starting point or enter from scratch. Payloads must be valid JSON – you will see helpful errors if it is not. Press the "Run test" button or use the keyboard shortcut to run the test.
-![Enter a payload](/images/test-set-payload.png)
+<Icon icon="circle-3" iconType="solid" color="#FF2D6B" size="20" /> Configure any additional options like the machine size, queue or delay
 
-</Step>
+<Icon icon="circle-4" iconType="solid" color="#FF2D6B" size="20" /> Select from previous test runs
 
-<Step title="View the run live">![View the run live](/images/run-in-progress.png)</Step>
+<Icon icon="circle-5" iconType="solid" color="#FF2D6B" size="20" /> Save the current test configuration as a template for later
 
-</Steps>
+<Icon icon="circle-6" iconType="solid" color="#FF2D6B" size="20" /> Run the test
diff --git a/docs/run-usage.mdx b/docs/run-usage.mdx
index 20124816477..4c00423310f 100644
--- a/docs/run-usage.mdx
+++ b/docs/run-usage.mdx
@@ -8,6 +8,8 @@ description: "Get compute duration and cost from inside a run, or for a specific
 You can get the cost and duration of the current including retries of the same run.
 
 ```ts
+import { task, usage, wait } from "@trigger.dev/sdk";
+
 export const heavyTask = task({
   id: "heavy-task",
   machine: {
@@ -63,7 +65,7 @@ export const heavyTask = task({
 You can use [runs.retrieve()](/management/runs/retrieve) to get a single run or [runs.list()](/management/runs/list) to get a list of runs. The response will include `costInCents` `baseCostInCents` and `durationMs` fields.
 
 ```ts single run
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 const run = await runs.retrieve("run-id");
 console.log(run.costInCents, run.baseCostInCents, run.durationMs);
@@ -71,7 +73,7 @@ const totalCost = run.costInCents + run.baseCostInCents;
 ```
 
 ```ts multiple runs
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 let totalCost = 0;
 for await (const run of runs.list({ tag: "user_123456" })) {
@@ -87,6 +89,8 @@ console.log("Total cost", totalCost);
 You can also wrap code with `usage.measure` to get the cost and duration of that block of code:
 
 ```ts
+import { usage, logger } from "@trigger.dev/sdk";
+
 // Inside a task run function, or inside a function that's called from there.
 const { result, compute } = await usage.measure(async () => {
   //...Do something for 1 second
diff --git a/docs/runs.mdx b/docs/runs.mdx
index 4bba924d56d..12f1cd50a9c 100644
--- a/docs/runs.mdx
+++ b/docs/runs.mdx
@@ -3,6 +3,8 @@ title: "Runs"
 description: "Understanding the lifecycle of task run execution in Trigger.dev"
 ---
 
+import RunBooleanHelpers from "/snippets/run-boolean-helpers.mdx";
+
 In Trigger.dev, the concepts of runs and attempts are fundamental to understanding how tasks are executed and managed. This article explains these concepts in detail and provides insights into the various states a run can go through during its lifecycle.
 
 ## What are runs?
@@ -22,11 +24,10 @@ A run can go through **various** states during its lifecycle. The following diag
 
 Runs can also find themselves in lots of other states depending on what's happening at any given time. The following sections describe all the possible states in more detail.
 
-### Initial States
+### Initial states
 
-<Icon icon="rectangle-history" iconType="solid" color="#FBBF24" size={17} /> **Waiting for deploy**:
-If a task is triggered before it has been deployed, the run enters this state and waits for the task
-to be deployed.
+<Icon icon="rectangle-history" iconType="solid" color="#FBBF24" size={17} /> **Pending version**:
+The task is waiting for a version update because it cannot execute without additional information (task, queue, etc.).
 
 <Icon icon="clock" iconType="solid" color="#878C99" size={17} /> **Delayed**: When a run is triggered
 with a delay, it enters this state until the specified delay period has passed.
@@ -34,18 +35,17 @@ with a delay, it enters this state until the specified delay period has passed.
 <Icon icon="rectangle-history" iconType="solid" color="#878C99" size={17} /> **Queued**: The run is ready
 to be executed and is waiting in the queue.
 
-### Execution States
+<Icon icon="rectangle-history" iconType="solid" color="#878C99" size={17} /> **Dequeued**: The task has been dequeued and is being sent to a worker to start executing.
 
-<Icon icon="spinner-third" iconType="duotone" color="#3B82F6" size={17} /> **Executing**: The task is
-currently running.
+### Execution states
 
-<Icon icon="arrows-rotate" iconType="solid" color="#3B82F6" size={17} /> **Reattempting**: The task has
-failed and is being retried.
+<Icon icon="spinner-third" iconType="duotone" color="#3B82F6" size={17} /> **Executing**: The task is
+currently being executed by a worker.
 
 <Icon icon="hourglass" iconType="solid" color="#878C99" size={17} /> **Waiting**: You have used a
 [triggerAndWait()](/triggering#yourtask-triggerandwait), [batchTriggerAndWait()](/triggering#yourtask-batchtriggerandwait) or a [wait function](/wait). When the wait is complete, the task will resume execution.
 
-### Final States
+### Final states
 
 <Icon icon="circle-check" iconType="solid" color="#28BF5C" size={17} /> **Completed**: The task has successfully
 finished execution.
@@ -54,21 +54,18 @@ finished execution.
 by the user.
 
 <Icon icon="circle-xmark" iconType="solid" color="#E11D48" size={17} /> **Failed**: The task has failed
-to complete successfully.
+to complete successfully due to an error in the task code.
 
 <Icon icon="alarm-exclamation" iconType="solid" color="#E11D48" size={17} /> **Timed out**: Task has
 failed because it exceeded its `maxDuration`.
 
 <Icon icon="fire" iconType="solid" color="#E11D48" size={17} /> **Crashed**: The worker process crashed
-during execution (likely due to an Out of Memory error).
-
-<Icon icon="bolt-slash" iconType="solid" color="#E11D48" size={17} /> **Interrupted**: In development
-mode, when the CLI is disconnected.
+during execution (likely due to an Out of Memory error) and won’t be retried.
 
 <Icon icon="bug" iconType="solid" color="#E11D48" size={17} /> **System failure**: An unrecoverable system
 error has occurred.
 
-<Icon icon="trash-can" iconType="solid" color="#878C99" size={17} /> **Expired**: The run's Time-to-Live
+<Icon icon="trash-can" iconType="solid" color="#878C99" size={17} /> **Expired**: The run's [Time-to-Live](#time-to-live-ttl)
 (TTL) has passed before it could start executing.
 
 ## Attempts
@@ -92,6 +89,35 @@ A run is considered finished when:
 
 At this point, the run will have either an output (if successful) or an error (if failed).
 
+## Boolean helpers
+
+Run objects returned from the API and Realtime include convenient boolean helper methods to check the run's status:
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+
+const run = await runs.retrieve("run_1234");
+
+if (run.isCompleted) {
+  console.log("Run completed successfully");
+}
+```
+
+<RunBooleanHelpers />
+
+These helpers are also available when subscribing to Realtime run updates:
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+
+for await (const run of runs.subscribeToRun("run_1234")) {
+  if (run.isCompleted) {
+    console.log("Run completed successfully!");
+    break;
+  }
+}
+```
+
 ## Advanced run features
 
 ### Idempotency Keys
@@ -184,7 +210,7 @@ Similar to `triggerAndWait()`, the `batchTriggerAndWait()` function lets you bat
 List runs in a specific environment. You can filter the runs by status, created at, task identifier, version, and more:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 // Get the first page of runs, returning up to 20 runs
 let page = await runs.list({ limit: 20 });
@@ -203,7 +229,7 @@ while (page.hasNextPage()) {
 You can also use an Async Iterator to get all runs:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 for await (const run of runs.list({ limit: 20 })) {
   console.log(run);
@@ -213,7 +239,7 @@ for await (const run of runs.list({ limit: 20 })) {
 You can provide multiple filters to the `list()` function to narrow down the results:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 const response = await runs.list({
   status: ["QUEUED", "EXECUTING"], // Filter by status
@@ -232,7 +258,7 @@ const response = await runs.list({
 Fetch a single run by it's ID:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 const run = await runs.retrieve(runId);
 ```
@@ -240,7 +266,7 @@ const run = await runs.retrieve(runId);
 You can provide the type of the task to correctly type the `run.payload` and `run.output`:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 import type { myTask } from "./trigger/myTask";
 
 const run = await runs.retrieve<typeof myTask>(runId);
@@ -252,7 +278,7 @@ console.log(run.output.bar); // string
 If you have just triggered a run, you can pass the entire response object to `retrieve()` and the response will already be typed:
 
 ```ts
-import { runs, tasks } from "@trigger.dev/sdk/v3";
+import { runs, tasks } from "@trigger.dev/sdk";
 import type { myTask } from "./trigger/myTask";
 
 const response = await tasks.trigger<typeof myTask>({ foo: "bar" });
@@ -267,7 +293,7 @@ console.log(run.output.bar); // string
 Cancel a run:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 await runs.cancel(runId);
 ```
@@ -277,7 +303,7 @@ await runs.cancel(runId);
 Replay a run:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 await runs.replay(runId);
 ```
@@ -287,7 +313,7 @@ await runs.replay(runId);
 Updates a delayed run with a new delay. Only valid when the run is in the DELAYED state.
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 await runs.reschedule(runId, { delay: "1h" });
 ```
@@ -297,7 +323,7 @@ await runs.reschedule(runId, { delay: "1h" });
 Subscribe to changes to a specific run in real-time:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 for await (const run of runs.subscribeToRun(runId)) {
   console.log(run);
@@ -307,7 +333,7 @@ for await (const run of runs.subscribeToRun(runId)) {
 Similar to `runs.retrieve()`, you can provide the type of the task to correctly type the `run.payload` and `run.output`:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 import type { myTask } from "./trigger/myTask";
 
 for await (const run of runs.subscribeToRun<typeof myTask>(runId)) {
diff --git a/docs/runs/heartbeats.mdx b/docs/runs/heartbeats.mdx
new file mode 100644
index 00000000000..b28f9fcbde7
--- /dev/null
+++ b/docs/runs/heartbeats.mdx
@@ -0,0 +1,38 @@
+---
+title: "Heartbeats"
+sidebarTitle: "Heartbeats"
+description: "Keep long-running or CPU-heavy tasks from being marked as stalled."
+---
+
+We send a heartbeat from your task to the platform every 30 seconds. If we don't receive a heartbeat within 5 minutes, we mark the run as stalled and stop it with a `TASK_RUN_STALLED_EXECUTING` error.
+
+Code that blocks the event loop for too long (for example, a tight loop doing synchronous work on a large dataset) can prevent heartbeats from being sent. In that case, use `heartbeats.yield()` inside the loop so the runtime can yield to the event loop and send a heartbeat. You can call it every iteration; the implementation only yields when needed.
+
+```ts
+import { task, heartbeats } from "@trigger.dev/sdk";
+
+export const processLargeDataset = task({
+  id: "process-large-dataset",
+  run: async (payload: { items: string[] }) => {
+    for (const row of payload.items) {
+      await heartbeats.yield();
+      processRow(row);
+    }
+    return { processed: payload.items.length };
+  },
+});
+
+function processRow(row: string) {
+  // synchronous CPU-heavy work
+}
+```
+
+If you see `TASK_RUN_STALLED_EXECUTING`, see [Task run stalled executing](/troubleshooting#task-run-stalled-executing) in the troubleshooting guide.
+
+## Sending progress to Trigger.dev
+
+To stream progress or status updates to the dashboard and your app, use [run metadata](/runs/metadata). Call `metadata.set()` (or `metadata.append()`) as the task runs. The dashboard and [Realtime](/realtime) (including `runs.subscribeToRun` and the React hooks) receive those updates as they happen. See [Progress monitoring](/realtime/backend/subscribe#progress-monitoring) for a full example.
+
+## Sending updates to your own system
+
+Trigger.dev doesn’t push run updates to external services. To send progress or heartbeats to your own backend (for example Supabase Realtime), call your API or client from inside the task when you want to emit an update—e.g. in the same loop where you call `heartbeats.yield()` or `metadata.set()`. Use whatever your stack supports: HTTP, the Supabase client, or another SDK.
diff --git a/docs/runs/max-duration.mdx b/docs/runs/max-duration.mdx
index 4b4872eee0c..643cc53318f 100644
--- a/docs/runs/max-duration.mdx
+++ b/docs/runs/max-duration.mdx
@@ -9,7 +9,7 @@ The `maxDuration` parameter sets a maximum compute time limit for tasks. When a
 You must set a default maxDuration in your `trigger.config.ts` file, which will apply to all tasks unless overridden:
 
 ```ts /config/trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "proj_gtcwttqhhtlasxgfuhxs",
@@ -38,7 +38,7 @@ The `maxDuration` is set in seconds, and is compared to the CPU time elapsed sin
 You can inspect the CPU time of a task inside the run function with our `usage` utility:
 
 ```ts /trigger/max-duration.ts
-import { task, usage } from "@trigger.dev/sdk/v3";
+import { task, usage } from "@trigger.dev/sdk";
 
 export const maxDurationTask = task({
   id: "max-duration-task",
@@ -60,7 +60,7 @@ The above value will be compared to the `maxDuration` you set. If the task excee
 You can set a `maxDuration` on a specific task:
 
 ```ts /trigger/max-duration-task.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const maxDurationTask = task({
   id: "max-duration-task",
@@ -76,7 +76,7 @@ This will override the default `maxDuration` set in the config file. If you have
 You can "turn off" the Max duration set in your config file for a specific task like so:
 
 ```ts /trigger/max-duration-task.ts
-import { task, timeout } from "@trigger.dev/sdk/v3";
+import { task, timeout } from "@trigger.dev/sdk";
 
 export const maxDurationTask = task({
   id: "max-duration-task",
@@ -107,7 +107,7 @@ You can also set the `maxDuration` to `timeout.None` to turn off the max duratio
 
 ```ts /trigger/max-duration.ts
 import { maxDurationTask } from "./trigger/max-duration-task";
-import { timeout } from "@trigger.dev/sdk/v3";
+import { timeout } from "@trigger.dev/sdk";
 
 // Trigger the task with no maxDuration
 const run = await maxDurationTask.trigger(
@@ -123,7 +123,7 @@ const run = await maxDurationTask.trigger(
 You can access the `maxDuration` set for a run in the run context:
 
 ```ts /trigger/max-duration-task.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const maxDurationTask = task({
   id: "max-duration-task",
diff --git a/docs/runs/metadata.mdx b/docs/runs/metadata.mdx
index 87c648b9a0b..d0dff36758c 100644
--- a/docs/runs/metadata.mdx
+++ b/docs/runs/metadata.mdx
@@ -20,7 +20,7 @@ const handle = await myTask.trigger(
 You can get the current metadata at any time by calling `metadata.get()` or `metadata.current()` (only inside a run):
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -39,7 +39,7 @@ export const myTask = task({
 Any of these methods can be called anywhere "inside" the run function, or a function called from the run function:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -57,7 +57,7 @@ async function doSomeWork() {
 If you call any of the metadata methods outside of the run function, they will have no effect:
 
 ```ts
-import { metadata } from "@trigger.dev/sdk/v3";
+import { metadata } from "@trigger.dev/sdk";
 
 // Somewhere outside of the run function
 function doSomeWork() {
@@ -77,7 +77,7 @@ These methods also work inside any task lifecycle hook, either attached to the s
 <CodeGroup>
 
 ```ts myTasks.ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -94,7 +94,7 @@ export const myTask = task({
 ```
 
 ```ts trigger.config.ts
-import { defineConfig, metadata } from "@trigger.dev/sdk/v3";
+import { defineConfig, metadata } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "proj_1234",
@@ -117,7 +117,7 @@ All metadata update methods (accept for `flush` and `stream`) are synchronous an
 Set the value of a key in the metadata object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -139,7 +139,7 @@ export const myTask = task({
 Delete a key from the metadata object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -161,7 +161,7 @@ export const myTask = task({
 Replace the entire metadata object with a new object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -180,7 +180,7 @@ export const myTask = task({
 Append a value to an array in the metadata object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -201,7 +201,7 @@ export const myTask = task({
 Remove a value from an array in the metadata object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -225,7 +225,7 @@ export const myTask = task({
 Increment a numeric value in the metadata object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -246,7 +246,7 @@ export const myTask = task({
 Decrement a numeric value in the metadata object:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -264,10 +264,17 @@ export const myTask = task({
 
 ### stream
 
-Capture a stream of values and make the stream available when using Realtime. See our [Realtime streams](/realtime/streams) documentation for more information.
+<Note>
+  As of SDK version **4.1.0**, `metadata.stream()` has been replaced by [Realtime Streams
+  v2](/tasks/streams). We recommend using the new `streams.pipe()` API for better reliability,
+  unlimited stream length, and improved developer experience. The examples below are provided for
+  backward compatibility.
+</Note>
+
+Capture a stream of values and make the stream available when using Realtime. See our [Realtime Streams v2](/tasks/streams) documentation for the recommended approach.
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -295,7 +302,7 @@ export const myTask = task({
 `metadata.stream` accepts any `AsyncIterable` or `ReadableStream` object. The stream will be captured and made available in the Realtime API. So for example, you could pass the body of a fetch response to `metadata.stream` to capture the response body and make it available in Realtime:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -329,7 +336,7 @@ export const myTask = task({
 Or the results of a streaming call to the OpenAI SDK:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 import OpenAI from "openai";
 
 const openai = new OpenAI({
@@ -365,7 +372,7 @@ export const myTask = task({
 Flush the metadata to the database. The SDK will automatically flush the metadata periodically, so you don't need to call this method unless you need to ensure that the metadata is persisted immediately.
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -384,7 +391,7 @@ export const myTask = task({
 All of the update methods can be chained together in a fluent API:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -405,7 +412,7 @@ Tasks that have been triggered by a parent task (a.k.a. a "child task") can upda
 To update the parent task's metadata, use the `metadata.parent` accessor:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myParentTask = task({
   id: "my-parent-task",
@@ -435,14 +442,14 @@ metadata.parent.append("logs", "Step 1 complete");
 metadata.parent.remove("logs", "Step 1 complete");
 metadata.parent.increment("progress", 0.4);
 metadata.parent.decrement("otherProgress", 0.1);
-metadata.parent.stream("llm", readableStream);
+metadata.parent.stream("llm", readableStream); // Use streams.pipe() instead (v4.1+)
 
 metadata.root.set("progress", 0.5);
 metadata.root.append("logs", "Step 1 complete");
 metadata.root.remove("logs", "Step 1 complete");
 metadata.root.increment("progress", 0.4);
 metadata.root.decrement("otherProgress", 0.1);
-metadata.root.stream("llm", readableStream);
+metadata.root.stream("llm", readableStream); // Use streams.pipe() instead (v4.1+)
 ```
 
 You can also chain the update methods together:
@@ -461,7 +468,7 @@ An example of where you might use parent and root updates is in a task that trig
 
 ```ts
 import { CSVRow, UploadedFileData, parseCSVFromUrl } from "@/utils";
-import { batch, logger, metadata, schemaTask } from "@trigger.dev/sdk/v3";
+import { batch, logger, metadata, schemaTask } from "@trigger.dev/sdk";
 
 export const handleCSVRow = schemaTask({
   id: "handle-csv-row",
@@ -514,12 +521,110 @@ Combined with [Realtime](/realtime), you could use this to show a live progress
   height="100%"
 />
 
+## More metadata task examples
+
+Using metadata updates in conjunction with our [Realtime React hooks](/realtime/react-hooks/overview) can be a powerful way to build real-time UIs. Here are some example tasks demonstrating how to use metadata in your tasks to track progress, status, and more:
+
+### Progress tracking
+
+Track progress with percentage and current step:
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const batchProcessingTask = task({
+  id: "batch-processing",
+  run: async (payload: { records: any[] }) => {
+    for (let i = 0; i < payload.records.length; i++) {
+      const record = payload.records[i];
+
+      // Update progress
+      metadata.set("progress", {
+        step: i + 1,
+        total: payload.records.length,
+        percentage: Math.round(((i + 1) / payload.records.length) * 100),
+        currentRecord: record.id,
+      });
+
+      await processRecord(record);
+    }
+  },
+});
+```
+
+### Status updates with logs
+
+Append log entries while maintaining status:
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const deploymentTask = task({
+  id: "deployment",
+  run: async (payload: { version: string }) => {
+    metadata.set("status", "initializing");
+    metadata.append("logs", "Starting deployment...");
+
+    // Step 1
+    metadata.set("status", "building");
+    metadata.append("logs", "Building application...");
+    await buildApplication();
+
+    // Step 2
+    metadata.set("status", "deploying");
+    metadata.append("logs", "Deploying to production...");
+    await deployToProduction();
+
+    // Step 3
+    metadata.set("status", "verifying");
+    metadata.append("logs", "Running health checks...");
+    await runHealthChecks();
+
+    metadata.set("status", "completed");
+    metadata.append("logs", "Deployment successful!");
+  },
+});
+```
+
+### User context and notifications
+
+Store user information and notification preferences:
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const userTask = task({
+  id: "user-task",
+  run: async (payload: { userId: string; action: string }) => {
+    // Set user context in metadata
+    metadata.set("user", {
+      id: payload.userId,
+      action: payload.action,
+      startedAt: new Date().toISOString(),
+    });
+
+    // Update status for user notifications
+    metadata.set("notification", {
+      type: "info",
+      message: `Starting ${payload.action} for user ${payload.userId}`,
+    });
+
+    await performUserAction(payload);
+
+    metadata.set("notification", {
+      type: "success",
+      message: `${payload.action} completed successfully`,
+    });
+  },
+});
+```
+
 ## Metadata propagation
 
 Metadata is NOT propagated to child tasks. If you want to pass metadata to a child task, you must do so explicitly:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -570,7 +675,7 @@ const handle = await myTask.trigger(
 We recommend wrapping the metadata API in a [Zod](https://zod.dev) schema (or your validator library of choice) to provide type safety:
 
 ```ts
-import { task, metadata } from "@trigger.dev/sdk/v3";
+import { task, metadata } from "@trigger.dev/sdk";
 import { z } from "zod";
 
 const Metadata = z.object({
@@ -613,7 +718,7 @@ You can view the metadata for a run in the Trigger.dev dashboard. The metadata w
 You can use the `runs.retrieve()` SDK function to get the metadata for a run:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 const run = await runs.retrieve("run_1234");
 
diff --git a/docs/runs/priority.mdx b/docs/runs/priority.mdx
new file mode 100644
index 00000000000..20da1894629
--- /dev/null
+++ b/docs/runs/priority.mdx
@@ -0,0 +1,31 @@
+---
+title: "Priority"
+description: "Specify a priority when triggering a run."
+---
+
+You can set a priority when you trigger a run. This allows you to prioritize some of your runs over others, so they are started sooner. This is very useful when:
+
+- You have critical work that needs to start more quickly (and you have long queues).
+- You want runs for your premium users to take priority over free users.
+
+The value for priority is a time offset in seconds that determines the order of dequeuing.
+
+![Priority runs](/images/priority-runs.png)
+
+If you specify a priority of `10` the run will dequeue before runs that were triggered with no priority 8 seconds ago, like in this example:
+
+```ts
+// no priority = 0
+await myTask.trigger({ foo: "bar" });
+
+//... imagine 8s pass by
+
+// this run will start before the run above that was triggered 8s ago (with no priority)
+await myTask.trigger({ foo: "bar" }, { priority: 10 });
+```
+
+If you passed a value of `3600` the run would dequeue before runs that were triggered an hour ago (with no priority).
+
+<Note>
+  Setting a high priority will not allow you to beat runs from other organizations. It will only affect the order of your own runs.
+</Note>
diff --git a/docs/self-hosting/docker.mdx b/docs/self-hosting/docker.mdx
index ef2c7d6e851..df9ae246c2d 100644
--- a/docs/self-hosting/docker.mdx
+++ b/docs/self-hosting/docker.mdx
@@ -14,6 +14,7 @@ Should the burden ever get too much, we'd be happy to see you on [Trigger.dev cl
 ## What's new?
 
 Goodbye v3, hello v4! We made quite a few changes:
+
 - **Much simpler setup.** The provider and coordinator are now combined into a single supervisor. No more startup scripts, just `docker compose up`.
 - **Automatic container cleanup.** The supervisor will automatically clean up containers that are no longer needed.
 - **Support for multiple worker machines.** This is a big one, and we're very excited about it! You can now scale your workers horizontally as needed.
@@ -102,19 +103,9 @@ docker compose logs -f webapp
 6. (optional) To initialize a new project, run the following command:
 
 ```bash
-npx trigger.dev@v4-beta init -p <project-ref> -a http://localhost:8030
+npx trigger.dev@latest init -p <project-ref> -a http://localhost:8030
 ```
 
-<Warning>
-The commands displayed in the webapp are incorrect while v4 is in beta. You should always use the `v4-beta` tag and not `latest`.
-</Warning>
-
-{/* 7. Bonus: Add traefik as a reverse proxy
-
-```bash
-docker compose -f docker-compose.yml -f ../docker-compose.traefik.yml up -d
-``` */}
-
 ### Worker
 
 1. Clone the repository
@@ -156,13 +147,6 @@ If you want to run the webapp and worker on the same machine, just replace the `
 docker compose -f webapp/docker-compose.yml -f worker/docker-compose.yml up -d
 ```
 
-{/* And optionally add traefik as a reverse proxy:
-
-```bash
-# Run this from the /hosting/docker directory
-docker compose -f webapp/docker-compose.yml -f worker/docker-compose.yml -f docker-compose.traefik.yml up -d
-``` */}
-
 ## Worker token
 
 When running the combined stack, worker bootstrap is handled automatically. When running the webapp and worker separately, you will need to manually set the worker token.
@@ -200,6 +184,30 @@ docker compose down
 docker compose up -d
 ```
 
+### Creating additional worker groups
+
+To create additional worker groups beyond the bootstrap group, use the admin API endpoint. This requires admin privileges.
+
+**Making a user admin:**
+- **New users**: Set `ADMIN_EMAILS` environment variable (regex pattern) before user creation.
+- **Existing users**: Set `admin = true` in the `user` table in your database.
+
+**Creating a worker group:**
+
+```bash
+api_url=http://localhost:8030
+wg_name=my-worker
+admin_pat=tr_pat_...
+
+curl -X POST \
+  "$api_url/admin/api/v1/workers" \
+  -H "Authorization: Bearer $admin_pat" \
+  -H "Content-Type: application/json" \
+  -d "{\"name\": \"$wg_name\"}"
+```
+
+The response includes a `token` field if the worker group is newly created.
+
 ## Registry setup
 
 The registry is used to store and pull deployment images. When testing the stack locally, the defaults should work out of the box.
@@ -245,7 +253,7 @@ You should change these before deploying to production, especially the password.
 ### Setup
 
 <Note>
-The `packets` bucket is created by default. In case this doesn't work, you can create it manually.
+  The `packets` bucket is created by default. In case this doesn't work, you can create it manually.
 </Note>
 
 1. Login to the dashboard: `http://localhost:9001`
@@ -315,7 +323,7 @@ All email addresses can sign up and log in this way. If you would like to restri
 
 ```bash
 # every email that does not match this regex will be rejected
-WHITELISTED_EMAILS="authorized@yahoo\.com|authorized@gmail\.com"
+WHITELISTED_EMAILS="^(authorized@yahoo\.com|authorized@gmail\.com)$"
 ```
 
 This will apply to all auth methods including magic link and GitHub OAuth.
@@ -323,13 +331,14 @@ This will apply to all auth methods including magic link and GitHub OAuth.
 ## Version locking
 
 There are several reasons to lock the version of your Docker images:
+
 - **Backwards compatibility.** We try our best to maintain compatibility with older CLI versions, but it's not always possible. If you don't want to update your CLI, you can lock your Docker images to that specific version.
 - **Ensuring full feature support.** Sometimes, new CLI releases will also require new or updated platform features. Running unlocked images can make any issues difficult to debug. Using a specific tag can help here as well.
 
-By default, the images will point at the latest versioned release via the `v4-beta` tag. You can override this by specifying a different tag in your `.env` file. For example:
+By default, the images will point at the latest versioned release via the `latest` tag. You can override this by specifying a different tag in your `.env` file. For example:
 
 ```bash
-TRIGGER_IMAGE_TAG=v4.0.0-v4-beta.21
+TRIGGER_IMAGE_TAG=v4.0.0
 ```
 
 ## Troubleshooting
@@ -345,20 +354,24 @@ TRIGGER_IMAGE_TAG=v4.0.0-v4-beta.21
   docker compose logs -f webapp
   ```
 
+- **Deploy fails with `ERROR: schema "graphile_worker" does not exist`.** This error occurs when Graphile Worker migrations fail to run during webapp startup. Check the webapp logs for certificate-related errors like `self-signed certificate in certificate chain`. This is often caused by PostgreSQL SSL certificate issues when using an external PostgreSQL instance with SSL enabled. Ensure that both the webapp and supervisor containers have access to the same CA certificate used by your PostgreSQL instance. You can configure this by mounting the certificate file and setting the `NODE_EXTRA_CA_CERTS` environment variable to point to the certificate path. Once the certificate issue is resolved, the migrations will complete and create the required `graphile_worker` schema.
+
+- **ClickHouse migrations say "no migrations to run" but schema is missing.** The goose migration tracker is out of sync. Exec into the webapp container, set the GOOSE env vars (from webapp startup logs), and run `goose reset && goose up`.
+
+  <Warning>
+    **Data Loss Warning:** The `goose reset` command is destructive and will drop the entire schema. Make sure to backup your data and confirm you are running this in a non-production environment before executing this command.
+  </Warning>
+
 ## CLI usage
 
 This section highlights some of the CLI commands and options that are useful when self-hosting. Please check the [CLI reference](/cli-introduction) for more in-depth documentation.
 
-<Warning>
-While v4 is in beta, always use `@v4-beta` instead of `@latest`. For example: `npx trigger.dev@v4-beta dev`
-</Warning>
-
 ### Login
 
 To avoid being redirected to [Trigger.dev Cloud](https://cloud.trigger.dev) when using the CLI, you need to specify the URL of your self-hosted instance with the `--api-url` or `-a` flag. For example:
 
 ```bash
-npx trigger.dev@v4-beta login -a http://trigger.example.com
+npx trigger.dev@latest login -a http://trigger.example.com
 ```
 
 Once you've logged in, you shouldn't have to specify the URL again with other commands.
@@ -368,7 +381,7 @@ Once you've logged in, you shouldn't have to specify the URL again with other co
 You can specify a profile when logging in. This allows you to easily use the CLI with multiple instances of Trigger.dev. For example:
 
 ```bash
-npx trigger.dev@v4-beta login -a http://trigger.example.com \
+npx trigger.dev@latest login -a http://trigger.example.com \
     --profile self-hosted
 ```
 
@@ -377,29 +390,29 @@ Logging in with a new profile will also make it the new default profile.
 To use a specific profile, you can use the `--profile` flag with other commands:
 
 ```bash
-npx trigger.dev@v4-beta dev --profile self-hosted
+npx trigger.dev@latest dev --profile self-hosted
 ```
 
 To list all your profiles, use the `list-profiles` command:
 
 ```bash
-npx trigger.dev@v4-beta list-profiles
+npx trigger.dev@latest list-profiles
 ```
 
 To remove a profile, use the `logout` command:
 
 ```bash
-npx trigger.dev@v4-beta logout --profile self-hosted
+npx trigger.dev@latest logout --profile self-hosted
 ```
 
 To switch to a different profile, use the `switch` command:
 
 ```bash
 # To run interactively
-npx trigger.dev@v4-beta switch
+npx trigger.dev@latest switch
 
 # To switch to a specific profile
-npx trigger.dev@v4-beta switch self-hosted
+npx trigger.dev@latest switch self-hosted
 ```
 
 ### Whoami
@@ -407,12 +420,12 @@ npx trigger.dev@v4-beta switch self-hosted
 It can be useful to check you are logged into the correct instance. Running this will also show the API URL:
 
 ```bash
-npx trigger.dev@v4-beta whoami
+npx trigger.dev@latest whoami
 ```
 
 ## CI / GitHub Actions
 
-When running the CLI in a CI environment, your login profiles won't be available. Instead, you can use the `TRIGGER_API_URL` and `TRIGGER_ACCESS_TOKEN` environment 
+When running the CLI in a CI environment, your login profiles won't be available. Instead, you can use the `TRIGGER_API_URL` and `TRIGGER_ACCESS_TOKEN` environment
 variables to point at your self-hosted instance and authenticate.
 
 For more detailed instructions, see the [GitHub Actions guide](/github-actions).
diff --git a/docs/self-hosting/env/webapp.mdx b/docs/self-hosting/env/webapp.mdx
index 49e561179bd..fb61a8ff40c 100644
--- a/docs/self-hosting/env/webapp.mdx
+++ b/docs/self-hosting/env/webapp.mdx
@@ -101,7 +101,9 @@ mode: "wide"
 | `TASK_PAYLOAD_MAXIMUM_SIZE`                      | No       | 3145728 (3MB)         | Max task payload size.                                                                                    |
 | `BATCH_TASK_PAYLOAD_MAXIMUM_SIZE`                | No       | 1000000 (1MB)         | Max batch payload size.                                                                                   |
 | `TASK_RUN_METADATA_MAXIMUM_SIZE`                 | No       | 262144 (256KB)        | Max metadata size.                                                                                        |
-| `MAX_BATCH_V2_TRIGGER_ITEMS`                     | No       | 500                   | Max batch size.                                                                                           |
+| `MAX_BATCH_V2_TRIGGER_ITEMS`                     | No       | 500                   | Max batch size (legacy v2 API).                                                                           |
+| `STREAMING_BATCH_MAX_ITEMS`                      | No       | 1000                  | Max items in streaming batch (v3 API, requires SDK 4.3.1+).                                               |
+| `STREAMING_BATCH_ITEM_MAXIMUM_SIZE`              | No       | 3145728 (3MB)         | Max size per item in streaming batch.                                                                     |
 | `MAXIMUM_DEV_QUEUE_SIZE`                         | No       | —                     | Max dev queue size.                                                                                       |
 | `MAXIMUM_DEPLOYED_QUEUE_SIZE`                    | No       | —                     | Max deployed queue size.                                                                                  |
 | **OTel limits**                                  |          |                       |                                                                                                           |
@@ -140,5 +142,5 @@ mode: "wide"
 | `OPENAI_API_KEY`                                 | No       | —                     | OpenAI API key.                                                                                           |
 | `MACHINE_PRESETS_OVERRIDE_PATH`                  | No       | —                     | Path to machine presets override file. See [machine overrides](/self-hosting/overview#machine-overrides). |
 | `APP_ENV`                                        | No       | `NODE_ENV`            | App environment. Used for things like the title tag.                                                      |
-| `ADMIN_EMAILS`                                   | No       | —                     | Regex of user emails to automatically promote to admin.                                                   |
+| `ADMIN_EMAILS`                                   | No       | —                     | Regex of user emails to automatically promote to admin on signup. Does not apply to existing users.     |
 | `EVENT_LOOP_MONITOR_ENABLED`                     | No       | 1                     | Node.js event loop lag monitor.                                                                           |
\ No newline at end of file
diff --git a/docs/self-hosting/kubernetes.mdx b/docs/self-hosting/kubernetes.mdx
index 8932607ec84..eba66f4ed07 100644
--- a/docs/self-hosting/kubernetes.mdx
+++ b/docs/self-hosting/kubernetes.mdx
@@ -14,6 +14,7 @@ Should the burden ever get too much, we'd be happy to see you on [Trigger.dev cl
 ## Requirements
 
 ### Prerequisites
+
 - Kubernetes cluster 1.19+
 - Helm 3.8+
 - Kubectl with cluster access
@@ -23,11 +24,13 @@ Should the burden ever get too much, we'd be happy to see you on [Trigger.dev cl
 The following are minimum requirements for running the entire stack on Kubernetes:
 
 **Cluster resources:**
+
 - 6+ vCPU total
 - 12+ GB RAM total
 - Persistent volume support
 
 **Individual components:**
+
 - **Webapp**: 1 vCPU, 2 GB RAM
 - **Supervisor**: 1 vCPU, 1 GB RAM
 - **PostgreSQL**: 1 vCPU, 2 GB RAM
@@ -58,7 +61,7 @@ webapp:
 ```bash
 helm upgrade -n trigger --install trigger \
   oci://ghcr.io/triggerdotdev/charts/trigger \
-  --version "~4.0.0-beta" \
+  --version "~4.0.0" \
   --create-namespace
 ```
 
@@ -77,19 +80,17 @@ kubectl port-forward svc/trigger-webapp 3040:3030 -n trigger
 kubectl logs -n trigger deployment/trigger-webapp | grep -A1 "magic link"
 ```
 
-<Warning>
-While v4 is in beta, always use `@v4-beta` instead of `@latest`. For example: `npx trigger.dev@v4-beta dev`
-</Warning>
-
 ## Configuration
 
 Most values map directly to the environment variables documented in the [webapp](/self-hosting/env/webapp) and [supervisor](/self-hosting/env/supervisor) environment variable overview.
 
 **Naming convention:**
+
 - Environment variables use `UPPER_SNAKE_CASE`
 - Helm values use `camelCase`
 
 **Example mapping:**
+
 ```bash
 # Environment variable
 APP_ORIGIN=https://trigger.example.com
@@ -106,16 +107,16 @@ The following commands will display the default values:
 ```bash
 # Specific version
 helm show values oci://ghcr.io/triggerdotdev/charts/trigger \
-  --version "4.0.0-beta.5"
+  --version "4.0.5"
 
-# Latest v4 beta
+# Latest v4
 helm show values oci://ghcr.io/triggerdotdev/charts/trigger \
-  --version "~4.0.0-beta"
+  --version "~4.0.0"
 ```
 
 ### Custom values
 
-The default values are insecure and are only suitable for testing. You will need to configure your own secrets as a bare minimum. 
+The default values are insecure and are only suitable for testing. You will need to configure your own secrets as a bare minimum.
 
 Create a `values-custom.yaml` file to override the defaults. For example:
 
@@ -170,7 +171,7 @@ Deploy with your custom values:
 ```bash
 helm upgrade -n trigger --install trigger \
   oci://ghcr.io/triggerdotdev/charts/trigger \
-  --version "~4.0.0-beta" \
+  --version "~4.0.0" \
   --create-namespace \
   -f values-custom.yaml
 ```
@@ -203,6 +204,7 @@ You can disable the built-in services and use external services instead. The cha
 #### PostgreSQL
 
 **Direct configuration:**
+
 ```yaml
 postgres:
   deploy: false
@@ -212,6 +214,7 @@ postgres:
 ```
 
 **Using existing secrets (recommended):**
+
 ```yaml
 postgres:
   deploy: false
@@ -226,6 +229,7 @@ postgres:
 #### Redis
 
 **Direct configuration:**
+
 ```yaml
 redis:
   deploy: false
@@ -238,6 +242,7 @@ redis:
 ```
 
 **Using existing secrets (recommended):**
+
 ```yaml
 redis:
   deploy: false
@@ -253,6 +258,7 @@ redis:
 #### ClickHouse
 
 **Direct configuration:**
+
 ```yaml
 clickhouse:
   deploy: false
@@ -264,6 +270,7 @@ clickhouse:
 ```
 
 **Using existing secrets (recommended):**
+
 ```yaml
 clickhouse:
   deploy: false
@@ -278,6 +285,7 @@ clickhouse:
 #### S3 Object Storage
 
 **Direct configuration:**
+
 ```yaml
 minio:
   deploy: false
@@ -289,6 +297,7 @@ s3:
 ```
 
 **Using existing secrets (recommended):**
+
 ```yaml
 minio:
   deploy: false
@@ -323,7 +332,7 @@ webapp:
   extraEnvVars:
     - name: NODE_EXTRA_CA_CERTS
       value: "/etc/ssl/certs/postgres-ca.crt"
-  
+
   extraVolumes:
     - name: postgres-ca-cert
       secret:
@@ -331,7 +340,7 @@ webapp:
         items:
           - key: ca.crt
             path: postgres-ca.crt
-  
+
   extraVolumeMounts:
     - name: postgres-ca-cert
       mountPath: /etc/ssl/certs
@@ -339,6 +348,7 @@ webapp:
 ```
 
 **Benefits:**
+
 - No plaintext credentials in `values.yaml` or Helm releases
 - Complete `DATABASE_URL` stored securely in Kubernetes secrets
 - Compatible with secret management tools (External Secrets Operator, etc.)
@@ -407,7 +417,8 @@ registry:
 ```
 
 <Note>
-The internal registry (`registry.external: false`) is experimental and requires proper TLS setup and additional cluster configuration. Use an external registry for production.
+  The internal registry (`registry.external: false`) is experimental and requires proper TLS setup
+  and additional cluster configuration. Use an external registry for production.
 </Note>
 
 ## Object storage
@@ -434,6 +445,7 @@ secrets:
 Authentication options are identical to the [Docker-based installation](/self-hosting/docker#authentication). The configuration is specified in your `values.yaml`:
 
 **GitHub OAuth:**
+
 ```yaml
 webapp:
   extraEnvVars:
@@ -444,6 +456,7 @@ webapp:
 ```
 
 **Email authentication (Resend):**
+
 ```yaml
 webapp:
   extraEnvVars:
@@ -458,11 +471,12 @@ webapp:
 ```
 
 **Restricting access:**
+
 ```yaml
 webapp:
   extraEnvVars:
     - name: WHITELISTED_EMAILS
-      value: "user1@company\\.com|user2@company\\.com"
+      value: "^(user1@company\\.com|user2@company\\.com)$"
 ```
 
 ## Version locking
@@ -470,29 +484,31 @@ webapp:
 You can lock versions in two ways:
 
 **Helm chart version (recommended):**
+
 ```bash
 # Pin to a specific version for production
 helm upgrade -n trigger --install trigger \
   oci://ghcr.io/triggerdotdev/charts/trigger \
-  --version "4.0.0-beta.5"
+  --version "4.0.5"
 
 # The app version will be different from the chart version
 # This is the version of the Trigger.dev webapp and supervisor
 # ..and should always match your Trigger.dev CLI version
 helm show chart \
   oci://ghcr.io/triggerdotdev/charts/trigger \
-  --version "4.0.0-beta.5" | grep appVersion
+  --version "4.0.5" | grep appVersion
 ```
 
 **Specific image tags:**
+
 ```yaml
 webapp:
   image:
-    tag: "v4.0.0-v4-beta.21"
+    tag: "v4.0.0"
 
 supervisor:
   image:
-    tag: "v4.0.0-v4-beta.21"
+    tag: "v4.0.0"
 ```
 
 The chart version's `appVersion` field determines the default image tags. Newer image tags may be incompatible with older chart versions and vice versa.
@@ -500,24 +516,27 @@ The chart version's `appVersion` field determines the default image tags. Newer
 ## Troubleshooting
 
 **Check logs:**
+
 ```bash
 # Webapp logs
-kubectl logs deployment/trigger-webapp -n trigger -f 
+kubectl logs deployment/trigger-webapp -n trigger -f
 
 # Supervisor logs
-kubectl logs deployment/trigger-supervisor -n trigger -f 
+kubectl logs deployment/trigger-supervisor -n trigger -f
 
 # All pods
-kubectl logs -l app.kubernetes.io/instance=trigger -n trigger -f 
+kubectl logs -l app.kubernetes.io/instance=trigger -n trigger -f
 ```
 
 **Check pod status:**
+
 ```bash
 kubectl get pods -n trigger
 kubectl describe pod <pod-name> -n trigger
 ```
 
 **Start from scratch:**
+
 ```bash
 # Delete the release
 helm uninstall trigger -n trigger
@@ -531,10 +550,12 @@ kubectl delete namespace trigger
 ```
 
 **Common issues:**
+
 - **Magic links not working**: Check webapp logs for email delivery errors
 - **Deploy fails**: Verify registry access and authentication
 - **Pods stuck pending**: Describe the pod and check the events
 - **Worker token issues**: Check webapp and supervisor logs for errors
+- **Deploy fails with `ERROR: schema "graphile_worker" does not exist`**: See the [Docker troubleshooting](/self-hosting/docker#troubleshooting) section for details on resolving PostgreSQL SSL certificate issues that prevent Graphile Worker migrations.
 
 See the [Docker troubleshooting](/self-hosting/docker#troubleshooting) section for more information.
 
@@ -542,13 +563,9 @@ See the [Docker troubleshooting](/self-hosting/docker#troubleshooting) section f
 
 See the [Docker CLI usage](/self-hosting/docker#cli-usage) section, the commands are identical regardless of deployment method.
 
-<Warning>
-While v4 is in beta, always use `@v4-beta` instead of `@latest`. For example: `npx trigger.dev@v4-beta dev`
-</Warning>
-
 ## CI / GitHub Actions
 
-When running the CLI in a CI environment, your login profiles won't be available. Instead, you can use the `TRIGGER_API_URL` and `TRIGGER_ACCESS_TOKEN` environment 
+When running the CLI in a CI environment, your login profiles won't be available. Instead, you can use the `TRIGGER_API_URL` and `TRIGGER_ACCESS_TOKEN` environment
 variables to point at your self-hosted instance and authenticate.
 
 For more detailed instructions, see the [GitHub Actions guide](/github-actions).
diff --git a/docs/skills.mdx b/docs/skills.mdx
new file mode 100644
index 00000000000..f12c5c36eb6
--- /dev/null
+++ b/docs/skills.mdx
@@ -0,0 +1,87 @@
+---
+title: "Skills"
+description: "Install Trigger.dev skills to teach any AI coding assistant best practices for writing tasks, agents, and workflows."
+sidebarTitle: "Skills"
+tag: "new"
+---
+
+## What are agent skills?
+
+Skills are portable instruction sets that teach AI coding assistants how to use Trigger.dev effectively. Unlike vendor-specific config files (`.cursor/rules`, `CLAUDE.md`), skills use an open standard that works across all major AI assistants. For example, Cursor users and Claude Code users can get the same knowledge from a single install.
+
+<Note>
+  Skills are one of three AI tools we provide. You can also install [Agent Rules](/mcp-agent-rules) for client-specific rule sets or the [MCP Server](/mcp-introduction) for live project interaction. See the [comparison table](/building-with-ai#skills-vs-agent-rules-vs-mcp) for details.
+</Note>
+
+Skills are installed as directories containing a `SKILL.md` file. Each `SKILL.md` includes YAML frontmatter (name, description) and markdown instructions with patterns, examples, and best practices that AI assistants automatically discover and follow.
+
+## Installation
+
+When you run `npx skills add triggerdotdev/skills`, the CLI detects your installed AI tools and copies the appropriate files to each tool's expected location. For example, `.claude/skills/`, `.cursor/skills/`, `.github/skills/`, etc.
+
+```bash
+npx skills add triggerdotdev/skills
+```
+
+<Note>`skills` is an open-source CLI by Vercel. Learn more at [skills.sh](https://skills.sh).</Note>
+
+The result: your AI assistant understands Trigger.dev's specific patterns for exports, schema validation, error handling, retries, and more.
+
+
+## Available skills
+
+Install all skills at once, or pick the ones relevant to your current work:
+
+```bash
+# Install all Trigger.dev skills
+npx skills add triggerdotdev/skills
+
+# Or install individual skills
+npx skills add triggerdotdev/skills --skill trigger-tasks
+npx skills add triggerdotdev/skills --skill trigger-agents
+npx skills add triggerdotdev/skills --skill trigger-config
+npx skills add triggerdotdev/skills --skill trigger-realtime
+npx skills add triggerdotdev/skills --skill trigger-setup
+```
+
+| Skill | Use for | Covers |
+|-------|---------|--------|
+| `trigger-setup` | First time setup, new projects | SDK install, `npx trigger init`, project structure |
+| `trigger-tasks` | Writing background tasks, async workflows, scheduled tasks | Triggering, waits, queues, retries, cron, metadata |
+| `trigger-agents` | LLM workflows, orchestration, multi-step AI agents | Prompt chaining, routing, parallelization, human-in-the-loop |
+| `trigger-realtime` | Live updates, progress indicators, streaming | React hooks, progress bars, streaming AI responses |
+| `trigger-config` | Project setup, build configuration | `trigger.config.ts`, extensions (Prisma, FFmpeg, Playwright) |
+
+Not sure which skill to install? Install `trigger-tasks`; it covers the most common patterns for writing Trigger.dev tasks.
+
+
+## Supported AI assistants
+
+Skills work with any AI coding assistant that supports the [Agent Skills standard](https://agentskills.io), including:
+
+- [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
+- [Cursor](https://cursor.com)
+- [Windsurf](https://codeium.com/windsurf)
+- [GitHub Copilot](https://github.com/features/copilot)
+- [Cline](https://github.com/cline/cline)
+- [Codex CLI](https://github.com/openai/codex)
+- [Gemini CLI](https://github.com/google-gemini/gemini-cli)
+- [OpenCode](https://opencode.ai)
+- [View all →](https://skills.sh)
+
+## Next steps
+
+<CardGroup cols={2}>
+  <Card title="Agent Rules" icon="scroll" href="/mcp-agent-rules">
+    Install comprehensive rule sets directly into your AI client.
+  </Card>
+  <Card title="MCP Server" icon="sparkles" href="/mcp-introduction">
+    Give your AI assistant direct access to Trigger.dev tools and APIs.
+  </Card>
+  <Card title="Writing tasks" icon="code" href="/tasks/overview">
+    Learn the task patterns that skills teach your AI assistant.
+  </Card>
+  <Card title="skills.sh" icon="box" href="https://skills.sh">
+    Browse the full Agent Skills ecosystem.
+  </Card>
+</CardGroup>
\ No newline at end of file
diff --git a/docs/snippets/bundle-packages.mdx b/docs/snippets/bundle-packages.mdx
index a4477b5b545..52676c5fdf1 100644
--- a/docs/snippets/bundle-packages.mdx
+++ b/docs/snippets/bundle-packages.mdx
@@ -4,7 +4,7 @@
     Bundle all ESM packages so that you don't have to specifiy them manually like this:
 
     ```ts trigger.config.ts
-    import type { TriggerConfig } from "@trigger.dev/sdk/v3";
+    import type { TriggerConfig } from "@trigger.dev/sdk";
 
     export const config: TriggerConfig = {
       //..other stuff
@@ -18,7 +18,7 @@
     Bundle individual packages using strings or regex like this:
   
     ```ts trigger.config.ts
-    import type { TriggerConfig } from "@trigger.dev/sdk/v3";
+    import type { TriggerConfig } from "@trigger.dev/sdk";
 
     export const config: TriggerConfig = {
       //..other stuff
diff --git a/docs/snippets/cli-commands-deploy.mdx b/docs/snippets/cli-commands-deploy.mdx
index d3ed672f2bd..cc5e6120a8a 100644
--- a/docs/snippets/cli-commands-deploy.mdx
+++ b/docs/snippets/cli-commands-deploy.mdx
@@ -77,6 +77,10 @@ npx trigger.dev@latest deploy [path]
   Turn off syncing environment variables with the Trigger.dev instance.
 </ParamField>
 
+<ParamField body="Local build" type="--local-build">
+  Force building the deployment image locally using your local Docker. This is automatic when self-hosting.
+</ParamField>
+
 ### Common options
 
 These options are available on most commands.
@@ -85,50 +89,10 @@ These options are available on most commands.
 
 ### Self-hosting
 
-These options are typically used when [self-hosting](/open-source-self-hosting) or for local development.
-
-<ParamField body="Self-hosted (builds locally)" type="--self-hosted">
-  Builds and loads the image using your local docker. Use the `--registry` option to specify the
-  registry to push the image to when using `--self-hosted`, or just use `--push` to push to the
-  default registry.
-</ParamField>
-
-<ParamField body="Skip deploying the image" type="--skip-deploy | -D">
-  Load the built image into your local docker.
-</ParamField>
-
-<ParamField body="Load image" type="--load-image">
-  Loads the image into your local docker after building it.
-</ParamField>
-
-<ParamField body="Registry" type="--registry">
-  Specify the registry to push the image to when using `--self-hosted`. Will automatically enable
-  `--push`.
-</ParamField>
-
-<ParamField body="Push image" type="--push">
-  When using the `--self-hosted` flag, push the image to the registry.
-</ParamField>
-
-<ParamField body="Namespace" type="--namespace">
-  The namespace to use when pushing the image to the registry. For example, if pushing to Docker
-  Hub, the namespace is your Docker Hub username.
-</ParamField>
-
-<ParamField body="Network" type="--network">
-  The networking mode for RUN instructions when using `--self-hosted`.
-</ParamField>
-
-## Examples
-
-### Push to Docker Hub (self-hosted)
-
-An example of deploying to Docker Hub when using a self-hosted setup:
+When [self-hosting](/self-hosting/overview), builds are performed locally by default. Once you've logged in to your self-hosted instance using the CLI, you can deploy with:
 
 ```bash
-npx trigger.dev@latest deploy \
-  --self-hosted \
-  --load-image \
-  --registry docker.io \
-  --namespace mydockerhubusername
+npx trigger.dev@latest deploy
 ```
+
+For CI/CD environments, set `TRIGGER_ACCESS_TOKEN` and `TRIGGER_API_URL` environment variables. See the [GitHub Actions guide](/github-actions#self-hosting) for more details.
diff --git a/docs/snippets/cli-commands-develop.mdx b/docs/snippets/cli-commands-develop.mdx
index 1af5e351a05..cb684d0b094 100644
--- a/docs/snippets/cli-commands-develop.mdx
+++ b/docs/snippets/cli-commands-develop.mdx
@@ -1,9 +1,9 @@
-import ProjectPathArg from '/snippets/cli-args-project-path.mdx';
-import CommonOptions from '/snippets/cli-options-common.mdx';
-import ProjectRefOption from '/snippets/cli-options-project-ref.mdx';
-import EnvFileOption from '/snippets/cli-options-env-file.mdx';
-import ConfigFileOption from '/snippets/cli-options-config-file.mdx';
-import SkipUpdateCheckOption from '/snippets/cli-options-skip-update-check.mdx';
+import ProjectPathArg from "/snippets/cli-args-project-path.mdx";
+import CommonOptions from "/snippets/cli-options-common.mdx";
+import ProjectRefOption from "/snippets/cli-options-project-ref.mdx";
+import EnvFileOption from "/snippets/cli-options-env-file.mdx";
+import ConfigFileOption from "/snippets/cli-options-config-file.mdx";
+import SkipUpdateCheckOption from "/snippets/cli-options-skip-update-check.mdx";
 
 This runs a server on your machine that can execute Trigger.dev tasks:
 
@@ -39,6 +39,11 @@ It is worth noting that each task runs in a separate Node process. This means th
 
 <SkipUpdateCheckOption />
 
+<ParamField body="Analyze build output" type="--analyze">
+  Analyzes the build output and displays detailed import timings. This is useful for debugging the
+  start times for your runs which can be caused by importing lots of code or heavy packages.
+</ParamField>
+
 ### Common options
 
 These options are available on most commands.
diff --git a/docs/snippets/code/openai-retry.mdx b/docs/snippets/code/openai-retry.mdx
index a0ad35affb4..beb386e812e 100644
--- a/docs/snippets/code/openai-retry.mdx
+++ b/docs/snippets/code/openai-retry.mdx
@@ -1,5 +1,5 @@
 ```ts /trigger/openai.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 import OpenAI from "openai";
 
 const openai = new OpenAI({
diff --git a/docs/snippets/migrate-v4-using-ai.mdx b/docs/snippets/migrate-v4-using-ai.mdx
new file mode 100644
index 00000000000..fa749ed7231
--- /dev/null
+++ b/docs/snippets/migrate-v4-using-ai.mdx
@@ -0,0 +1,218 @@
+<Accordion title="Copy paste this prompt in full" icon="sparkles">
+
+```md
+
+I would like you to help me migrate my v3 task code to v4. Here are the important differences:
+
+We've deprecated the `@trigger.dev/sdk/v3` import path and moved to a new path:
+
+// This is the old path
+import { task } from "@trigger.dev/sdk/v3";
+
+// This is the new path, use this instead
+import { task } from "@trigger.dev/sdk";
+
+We've renamed the `handleError` hook to `catchError`. Use this instead of `handleError`.
+
+`init` was previously used to initialize data used in the run function. This is the old version:
+
+import { task } from "@trigger.dev/sdk";
+
+const myTask = task({
+  init: async () => {
+    return {
+      myClient: new MyClient(),
+    };
+  },
+  run: async (payload: any, { ctx, init }) => {
+    const client = init.myClient;
+    await client.doSomething();
+  },
+});
+
+This is the new version using middleware and locals:
+
+import { task, locals, tasks } from "@trigger.dev/sdk";
+
+// Create a local for your client
+const MyClientLocal = locals.create<MyClient>("myClient");
+
+// Set up middleware to initialize the client
+tasks.middleware("my-client", async ({ next }) => {
+  const client = new MyClient();
+  locals.set(MyClientLocal, client);
+  await next();
+});
+
+// Helper function to get the client
+function getMyClient() {
+  return locals.getOrThrow(MyClientLocal);
+}
+
+const myTask = task({
+  run: async (payload: any, { ctx }) => {
+    const client = getMyClient();
+    await client.doSomething();
+  },
+});
+
+We’ve deprecated the `toolTask` function and replaced it with the `ai.tool` function, which creates an AI tool from an existing `schemaTask`. This is the old version:
+
+import { toolTask, schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+import { generateText } from "ai";
+
+const myToolTask = toolTask({
+  id: "my-tool-task",
+  run: async (payload: any, { ctx }) => {},
+});
+
+export const myAiTask = schemaTask({
+  id: "my-ai-task",
+  schema: z.object({
+    text: z.string(),
+  }),
+  run: async (payload, { ctx }) => {
+    const { text } = await generateText({
+      prompt: payload.text,
+      model: openai("gpt-4o"),
+      tools: {
+        myToolTask,
+      },
+    });
+  },
+});
+
+This is the new version:
+
+import { schemaTask, ai } from "@trigger.dev/sdk";
+import { z } from "zod";
+import { generateText } from "ai";
+
+// Convert toolTask to schemaTask with a schema
+const myToolTask = schemaTask({
+  id: "my-tool-task",
+  schema: z.object({
+    // Add appropriate schema for your tool's payload
+    input: z.string(),
+  }),
+  run: async (payload, { ctx }) => {},
+});
+
+// Create an AI tool from the schemaTask
+const myTool = ai.tool(myToolTask);
+
+export const myAiTask = schemaTask({
+  id: "my-ai-task",
+  schema: z.object({
+    text: z.string(),
+  }),
+  run: async (payload, { ctx }) => {
+    const { text } = await generateText({
+      prompt: payload.text,
+      model: openai("gpt-4o"),
+      tools: {
+        myTool, // Use the ai.tool created from schemaTask
+      },
+    });
+  },
+});
+
+We've made several breaking changes that require code updates:
+
+**Queue changes**: Queues must now be defined ahead of time using the `queue` function. You can no longer create queues "on-demand" when triggering tasks. This is the old version:
+
+
+// Old v3 way - creating queue on-demand
+await myTask.trigger({ foo: "bar" }, { queue: { name: "my-queue", concurrencyLimit: 10 } });
+
+
+This is the new version:
+
+
+// New v4 way - define queue first
+import { queue, task } from "@trigger.dev/sdk";
+
+const myQueue = queue({
+  name: "my-queue",
+  concurrencyLimit: 10,
+});
+
+export const myTask = task({
+  id: "my-task",
+  queue: myQueue, // Set queue on task
+  run: async (payload: any, { ctx }) => {},
+});
+
+// Now trigger without queue options
+await myTask.trigger({ foo: "bar" });
+
+// Or specify queue by name
+await myTask.trigger({ foo: "bar" }, { queue: "my-queue" });
+
+
+**Lifecycle hooks**: Function signatures have changed to use a single object parameter instead of separate parameters. Prefer `onStartAttempt` over the deprecated `onStart` when you need code to run before each attempt. This is the old version:
+
+
+// Old v3 way
+export const myTask = task({
+  id: "my-task",
+  onStart: (payload, { ctx }) => {},
+  onSuccess: (payload, output, { ctx }) => {},
+  onFailure: (payload, error, { ctx }) => {},
+  catchError: (payload, { ctx, error, retry }) => {},
+  run: async (payload, { ctx }) => {},
+});
+
+
+This is the new version:
+
+
+// New v4 way - single object parameter for hooks
+export const myTask = task({
+  id: "my-task",
+  onStartAttempt: ({ payload, ctx }) => {},  // prefer over deprecated onStart
+  onSuccess: ({ payload, ctx, task, output }) => {},
+  onFailure: ({ payload, ctx, task, error }) => {},
+  catchError: ({ payload, ctx, task, error, retry, retryAt, retryDelayInMs }) => {},
+  run: async (payload, { ctx }) => {}, // run function unchanged
+});
+
+
+**BatchTrigger changes**: The `batchTrigger` function no longer returns runs directly. This is the old version:
+
+
+// Old v3 way
+const batchHandle = await tasks.batchTrigger([
+  [myTask, { foo: "bar" }],
+  [myOtherTask, { baz: "qux" }],
+]);
+
+console.log(batchHandle.runs); // Direct access
+
+
+This is the new version:
+
+
+// New v4 way
+const batchHandle = await tasks.batchTrigger([
+  [myTask, { foo: "bar" }],
+  [myOtherTask, { baz: "qux" }],
+]);
+
+const batch = await batch.retrieve(batchHandle.batchId); // Use batch.retrieve()
+console.log(batch.runs);
+
+
+**triggerAndWait / batchTriggerAndWait**: In v4 these return a Result object, not the raw output. Use `if (result.ok) { ... result.output }` or call `.unwrap()` to get the output (throws if the run failed). Do not wrap `triggerAndWait` or `batchTriggerAndWait` in `Promise.all` — this is not supported.
+
+
+**Context (ctx) changes**: `ctx.attempt.id` and `ctx.attempt.status` have been removed; use `ctx.attempt.number` where needed. `ctx.task.exportName` has been removed.
+
+
+Can you help me convert the following code from v3 to v4? Please include the full converted code in the answer, do not truncate it anywhere.
+
+```
+
+</Accordion>
+
diff --git a/docs/snippets/node-versions.mdx b/docs/snippets/node-versions.mdx
index 88275ef5ff5..76bc386f810 100644
--- a/docs/snippets/node-versions.mdx
+++ b/docs/snippets/node-versions.mdx
@@ -1,4 +1,23 @@
 Trigger.dev runs your tasks on specific Node.js versions:
 
-- **v3**: Uses Node.js `21.7.3`
-- **v4**: Uses Node.js `21.7.3` 
\ No newline at end of file
+### v3
+
+- Node.js `21.7.3`
+
+### v4
+
+- Node.js `21.7.3` (default)
+- Node.js `22.16.0` (`node-22`)
+- Bun `1.3.3` (`bun`)
+
+You can change the runtime by setting the `runtime` field in your `trigger.config.ts` file.
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  // "node", "node-22" or "bun"
+  runtime: "node-22",
+  project: "<your-project-ref>",
+});
+```
diff --git a/docs/snippets/rate-limit-hit-use-batchtrigger.mdx b/docs/snippets/rate-limit-hit-use-batchtrigger.mdx
index b8573c8c48c..009ba46c1db 100644
--- a/docs/snippets/rate-limit-hit-use-batchtrigger.mdx
+++ b/docs/snippets/rate-limit-hit-use-batchtrigger.mdx
@@ -1 +1 @@
-The most common cause of hitting the API rate limit is if you’re calling `trigger()` on a task in a loop, instead of doing this use `batchTrigger()` which will trigger multiple tasks in a single API call. You can have up to 100 tasks in a single batch trigger call.
+The most common cause of hitting the API rate limit is if you're calling `trigger()` on a task in a loop, instead of doing this use `batchTrigger()` which will trigger multiple tasks in a single API call. You can have up to 1,000 tasks in a single batch trigger call with SDK 4.3.1+ (500 in prior versions).
diff --git a/docs/snippets/realtime-examples-cards.mdx b/docs/snippets/realtime-examples-cards.mdx
index 9cfaa805760..6be059621cd 100644
--- a/docs/snippets/realtime-examples-cards.mdx
+++ b/docs/snippets/realtime-examples-cards.mdx
@@ -1,6 +1,14 @@
 ## Examples
 
 <CardGroup cols={2}>
+  <Card
+    title="Claude Thinking Chatbot"
+    icon="messages"
+    href="/guides/example-projects/claude-thinking-chatbot"
+  >
+    A chatbot using the AI SDK that demonstrates Anthropic Claude 3.7's thinking capabilities through the Realtime API and
+    react hooks.
+  </Card>
   <Card
     title="Image Generation with fal.ai"
     icon="image"
@@ -25,14 +33,6 @@
     A Next.js app that uses the Realtime API and react hooks to evaluate language model responses on
     the frontend in real-time.
   </Card>
-  <Card
-    title="Claude Thinking Chatbot"
-    icon="messages"
-    href="/guides/example-projects/claude-thinking-chatbot"
-  >
-    A chatbot that demonstrates Claude 3.7's thinking capabilities through the Realtime API and
-    react hooks.
-  </Card>
 
 </CardGroup>
 
diff --git a/docs/snippets/realtime-learn-more.mdx b/docs/snippets/realtime-learn-more.mdx
index 9cad1534d97..c9b2ef2bd24 100644
--- a/docs/snippets/realtime-learn-more.mdx
+++ b/docs/snippets/realtime-learn-more.mdx
@@ -3,6 +3,6 @@
 To learn more, take a look at the following resources:
 
 - [Trigger.dev Realtime](/realtime) - learn more about how to subscribe to runs and get real-time updates
-- [Realtime streaming](/realtime/streams) - learn more about streaming data from your tasks
+- [Realtime streaming](/realtime/react-hooks/streams) - learn more about streaming data from your tasks
 - [Batch Triggering](/triggering#tasks-batchtrigger) - learn more about how to trigger tasks in batches
-- [React hooks](/frontend/react-hooks) - learn more about using React hooks to interact with the Trigger.dev API
+- [React hooks](/realtime/react-hooks) - learn more about using React hooks to interact with the Trigger.dev API
diff --git a/docs/snippets/run-boolean-helpers.mdx b/docs/snippets/run-boolean-helpers.mdx
new file mode 100644
index 00000000000..48aac6ae110
--- /dev/null
+++ b/docs/snippets/run-boolean-helpers.mdx
@@ -0,0 +1,7 @@
+- **`isQueued`**: Returns `true` when the status is `QUEUED`, `PENDING_VERSION`, or `DELAYED`
+- **`isExecuting`**: Returns `true` when the status is `EXECUTING` or `DEQUEUED`. These count against your concurrency limits.
+- **`isWaiting`**: Returns `true` when the status is `WAITING`. These do not count against your concurrency limits.
+- **`isCompleted`**: Returns `true` when the status is any of the completed statuses
+- **`isCanceled`**: Returns `true` when the status is `CANCELED`
+- **`isFailed`**: Returns `true` when the status is any of the failed statuses
+- **`isSuccess`**: Returns `true` when the status is `COMPLETED` 
\ No newline at end of file
diff --git a/docs/snippets/step-cli-init.mdx b/docs/snippets/step-cli-init.mdx
index 265f3d9c894..84bb340dcfe 100644
--- a/docs/snippets/step-cli-init.mdx
+++ b/docs/snippets/step-cli-init.mdx
@@ -20,12 +20,19 @@ yarn dlx trigger.dev@latest init
 
 </CodeGroup>
 
+
 It will do a few things:
 
-1. Log you into the CLI if you're not already logged in.
-2. Create a `trigger.config.ts` file in the root of your project.
-3. Ask where you'd like to create the `/trigger` directory.
-4. Create the `/trigger` directory with an example task, `/trigger/example.[ts/js]`.
+<Tip title="MCP Server">
+  Our [Trigger.dev MCP server](/mcp-introduction) gives your AI assistant direct access to Trigger.dev tools; search docs, trigger tasks, deploy projects, and monitor runs. We recommend installing it for the best developer experience.
+</Tip>
+
+1. Ask if you want to install the [Trigger.dev MCP server](/mcp-introduction) for your AI assistant.
+2. Log you into the CLI if you're not already logged in.
+3. Ask you to select your project.
+4. Install the required SDK packages.
+5. Ask where you'd like to create the `/trigger` directory and create it with an example task.
+6. Create a `trigger.config.ts` file in the root of your project.
 
 Install the "Hello World" example task when prompted. We'll use this task to test the setup.
 
diff --git a/docs/snippets/step-run-test.mdx b/docs/snippets/step-run-test.mdx
index 5bf8b2f5b00..90d89094d5d 100644
--- a/docs/snippets/step-run-test.mdx
+++ b/docs/snippets/step-run-test.mdx
@@ -1,11 +1,13 @@
 <Step title="Perform a test run using the dashboard">
 
-The CLI `dev` command spits out various useful URLs. Right now we want to visit the Test page <Icon icon="circle-1" iconType="solid" size={20} color="F43F47" />.
+The CLI `dev` command spits out various useful URLs. Right now we want to visit the Test page.
 
-You should see our Example task in the list <Icon icon="circle-2" iconType="solid" size={20} color="F43F47" />, select it. Most tasks have a "payload" which you enter in the JSON editor <Icon icon="circle-3" iconType="solid" size={20} color="F43F47" />, but our example task doesn't need any input.
+You should see our Example task in the list <Icon icon="circle-1" iconType="solid" size={20} color="F43F47" />, select it. Most tasks have a "payload" which you enter in the JSON editor <Icon icon="circle-2" iconType="solid" size={20} color="F43F47" />, but our example task doesn't need any input.
 
-Press the "Run test" button <Icon icon="circle-4" iconType="solid" size={20} color="F43F47" />.
+You can configure options on the run <Icon icon="circle-3" iconType="solid" size={20} color="F43F47" />, view recent payloads <Icon icon="circle-4" iconType="solid" size={20} color="F43F47" />, and create run templates <Icon icon="circle-5" iconType="solid" size={20} color="F43F47" />.
 
-![Test page](/images/test-page.png)
+Press the "Run test" button <Icon icon="circle-6" iconType="solid" size={20} color="F43F47" />.
+
+![Test page](/images/test-dashboard.png)
 
 </Step>
diff --git a/docs/snippets/upgrade-to-v4-note.mdx b/docs/snippets/upgrade-to-v4-note.mdx
deleted file mode 100644
index 70ce8a405e1..00000000000
--- a/docs/snippets/upgrade-to-v4-note.mdx
+++ /dev/null
@@ -1,4 +0,0 @@
-<Note>
-  This feature is only available in the v4 beta. To upgrade to v4, see the [upgrade to v4
-  docs](/upgrade-to-v4).
-</Note>
diff --git a/docs/snippets/use-cases-cards.mdx b/docs/snippets/use-cases-cards.mdx
new file mode 100644
index 00000000000..b43f8e5c9d7
--- /dev/null
+++ b/docs/snippets/use-cases-cards.mdx
@@ -0,0 +1,24 @@
+## Featured use cases
+
+<CardGroup cols={2}>
+  <Card
+    title="Data processing & ETL workflows"
+    icon="database"
+    href="/guides/use-cases/data-processing-etl"
+  >
+    Build complex data pipelines that process large datasets without timeouts.
+  </Card>
+  <Card title="Media processing workflows" icon="film" href="/guides/use-cases/media-processing">
+    Batch process videos, images, audio, and documents with no execution time limits.
+  </Card>
+  <Card
+    title="AI media generation workflows"
+    icon="wand-magic-sparkles"
+    href="/guides/use-cases/media-generation"
+  >
+    Generate images, videos, audio, documents and other media using AI models.
+  </Card>
+  <Card title="Marketing workflows" icon="bullhorn" href="/guides/use-cases/marketing">
+    Build drip campaigns, create marketing content, and orchestrate multi-channel campaigns.
+  </Card>
+</CardGroup>
diff --git a/docs/style.css b/docs/style.css
index f41ac48218a..94aea582db3 100644
--- a/docs/style.css
+++ b/docs/style.css
@@ -1,17 +1,31 @@
-/* Tooltip style on the code block */
-div[class="absolute top-11 left-1/2 transform -translate-x-1/2 -translate-y-1/2 hidden group-hover:block text-white rounded-lg px-1.5 py-0.5 text-xs bg-primary-dark"] {
-  color:#1A1B1F;
-  border-radius: 0.25rem;
+button~.absolute.peer-hover\:opacity-100 {
+    color: #000
 }
 
-/* Link anchor active state - icon container */
-div[class="mr-4 rounded-md p-1"] {
-  border-radius: 0.25rem;
-  border: 1px solid #464748;
-}
+:root {
+    /* Code block colors - Trigger.dark theme */
+    --mint-color-background: #121317;
+    --mint-color-text: #D4D4D4;
+    --mint-token-constant: #9B99FF;
+    --mint-token-string: #AFEC73;
+    --mint-token-comment: #5F6570;
+    --mint-token-keyword: #E888F8;
+    --mint-token-parameter: #CCCBFF;
+    --mint-token-function: #D9F07C;
+    --mint-token-string-expression: #AFEC73;
+    --mint-token-punctuation: #878C99;
+    --mint-token-link: #826DFF;
 
-/* Link anchor default state - icon container */
-div[class="mr-4 rounded-md p-1 zinc-box group-hover:brightness-100 group-hover:ring-0 ring-1 ring-gray-950/5 dark:ring-gray-700/40"] {
-  border-radius: 0.25rem;
-  border: 1px solid transparent;
-}
\ No newline at end of file
+    /* Shiki css-variables fallbacks */
+    --shiki-foreground: #D4D4D4;
+    --shiki-background: #121317;
+    --shiki-token-constant: #9B99FF;
+    --shiki-token-string: #AFEC73;
+    --shiki-token-comment: #5F6570;
+    --shiki-token-keyword: #E888F8;
+    --shiki-token-parameter: #CCCBFF;
+    --shiki-token-function: #D9F07C;
+    --shiki-token-string-expression: #AFEC73;
+    --shiki-token-punctuation: #878C99;
+    --shiki-token-link: #826DFF;
+}
diff --git a/docs/tags.mdx b/docs/tags.mdx
index dcc3b438c61..33029929bb1 100644
--- a/docs/tags.mdx
+++ b/docs/tags.mdx
@@ -5,7 +5,7 @@ description: "Tags allow you to easily filter runs in the dashboard and when usi
 
 ## What are tags?
 
-We support up to 10 tags per run. Each one must be a string between 1 and 64 characters long.
+We support up to 10 tags per run. Each one must be a string between 1 and 128 characters long.
 
 We recommend prefixing your tags with their type and then an underscore or colon. For example, `user_123456` or `video:123`.
 
@@ -60,7 +60,7 @@ This will create a run with the tags `user_123456` and `org_abcdefg`. They look
 Use the `tags.add()` function to add tags to a run from inside the `run` function. This will add the tag `product_1234567` to the run:
 
 ```ts
-import { task, tags } from "@trigger.dev/sdk/v3";
+import { task, tags } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -75,7 +75,7 @@ export const myTask = task({
 });
 ```
 
-Reminder: you can only have up to 5 tags per run. If you call `tags.add()` and the total number of tags will be more than 5 we log an error and ignore the new tags. That includes tags from triggering and from inside the run function.
+Reminder: you can only have up to 10 tags per run. If you call `tags.add()` and the total number of tags will be more than 10 we log an error and ignore the new tags. That includes tags from triggering and from inside the run function.
 
 ### Propagating tags to child runs
 
@@ -111,7 +111,7 @@ On the Runs page open the filter menu, choose "Tags" and then start typing in th
 You can provide filters to the `runs.list` SDK function, including an array of tags.
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 // Loop through all runs with the tag "user_123456" that have completed
 for await (const run of runs.list({ tag: "user_123456", status: ["COMPLETED"] })) {
diff --git a/docs/tasks/overview.mdx b/docs/tasks/overview.mdx
index 4682cdc643b..fe2e7ce5c73 100644
--- a/docs/tasks/overview.mdx
+++ b/docs/tasks/overview.mdx
@@ -11,24 +11,19 @@ There are different types of tasks including regular tasks and [scheduled tasks]
 Here's an incredibly simple task:
 
 ```ts /trigger/hello-world.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
-//1. You need to export each task, even if it's a subtask
-export const helloWorld = task({
-  //2. Use a unique id for each task
+const helloWorld = task({
+  //1. Use a unique id for each task
   id: "hello-world",
-  //3. The run function is the main function of the task
+  //2. The run function is the main function of the task
   run: async (payload: { message: string }) => {
-    //4. You can write code that runs for a long time here, there are no timeouts
+    //3. You can write code that runs for a long time here, there are no timeouts
     console.log(payload.message);
   },
 });
 ```
 
-<Note>
-  You must `export` each task, even subtasks inside the same file. When exported they are accessible so their configuration can be registered with the platform.
-</Note>
-
 You can trigger this in two ways:
 
 1. From the dashboard [using the "Test" feature](/run-tests).
@@ -141,50 +136,127 @@ export const longTask = task({
 
 See our [maxDuration guide](/runs/max-duration) for more information.
 
+## Global lifecycle hooks
+
+<Note>When specifying global lifecycle hooks, we recommend using the `init.ts` file.</Note>
+
+You can register global lifecycle hooks that are executed for all runs, regardless of the task. While you can still define these in the `trigger.config.ts` file, you can also register them anywhere in your codebase:
+
+```ts
+import { tasks } from "@trigger.dev/sdk";
+
+tasks.onStart(({ ctx, payload, task }) => {
+  console.log("Run started", ctx.run);
+});
+
+tasks.onSuccess(({ ctx, output }) => {
+  console.log("Run finished", ctx.run);
+});
+
+tasks.onFailure(({ ctx, error }) => {
+  console.log("Run failed", ctx.run);
+});
+```
+
+### `init.ts`
+
+If you create a `init.ts` file at the root of your trigger directory, it will be automatically loaded when a task is executed. This is useful if you want to register global lifecycle hooks, or initialize a database connection, etc.
+
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
+
+tasks.onStart(({ ctx, payload, task }) => {
+  console.log("Run started", ctx.run);
+});
+```
+
 ## Lifecycle functions
 
 ![Lifecycle functions](/images/lifecycle-functions.png)
 
-### `init` function
+### `middleware` and `locals` functions
 
-This function is called before a run attempt:
+Our task middleware system runs at the top level, executing before and after all lifecycle hooks. This allows you to wrap the entire task execution lifecycle with custom logic.
 
-```ts /trigger/init.ts
-export const taskWithInit = task({
-  id: "task-with-init",
-  init: async (payload, { ctx }) => {
-    //...
-  },
-  run: async (payload: any, { ctx }) => {
-    //...
-  },
+<Info>
+  An error thrown in `middleware` is just like an uncaught error in the run function: it will
+  propagate through to `catchError()` function and then will fail the attempt (either causing a
+  retry or failing the run).
+</Info>
+
+The `locals` API allows you to share data between middleware and hooks.
+
+```ts db.ts
+import { locals } from "@trigger.dev/sdk";
+import { logger, tasks } from "@trigger.dev/sdk";
+
+// This would be type of your database client here
+const DbLocal = locals.create<{ connect: () => Promise<void>; disconnect: () => Promise<void> }>(
+  "db"
+);
+
+export function getDb() {
+  return locals.getOrThrow(DbLocal);
+}
+
+export function setDb(db: { connect: () => Promise<void> }) {
+  locals.set(DbLocal, db);
+}
+
+tasks.middleware("db", async ({ ctx, payload, next, task }) => {
+  // This would be your database client here
+  const db = locals.set(DbLocal, {
+    connect: async () => {
+      logger.info("Connecting to the database");
+    },
+    disconnect: async () => {
+      logger.info("Disconnecting from the database");
+    },
+  });
+
+  await db.connect();
+
+  await next();
+
+  await db.disconnect();
+});
+
+// Disconnect when the run is paused
+tasks.onWait("db", async ({ ctx, payload, task }) => {
+  const db = getDb();
+  await db.disconnect();
+});
+
+// Reconnect when the run is resumed
+tasks.onResume("db", async ({ ctx, payload, task }) => {
+  const db = getDb();
+  await db.connect();
 });
 ```
 
-You can also return data from the `init` function that will be available in the params of the `run`, `cleanup`, `onSuccess`, and `onFailure` functions.
+You can access the database client using `getDb()` in your tasks `run` function and all your hooks (global or task specific):
 
-```ts /trigger/init-return.ts
-export const taskWithInitReturn = task({
-  id: "task-with-init-return",
-  init: async (payload, { ctx }) => {
-    return { someData: "someValue" };
-  },
-  run: async (payload: any, { ctx, init }) => {
-    console.log(init.someData); // "someValue"
+```ts
+import { getDb } from "./db";
+
+export const myTask = task({
+  run: async (payload: any, { ctx }) => {
+    const db = getDb();
+    await db.query("SELECT 1");
   },
 });
 ```
 
-<Info>Errors thrown in the `init` function are ignored.</Info>
+### `onStartAttempt` function
 
-### `cleanup` function
+<Info>The `onStartAttempt` function was introduced in v4.1.0</Info>
 
-This function is called after the `run` function is executed, regardless of whether the run was successful or not. It's useful for cleaning up resources, logging, or other side effects.
+Before a task run attempt starts, the `onStartAttempt` function is called. It's useful for sending notifications, logging, and other side effects.
 
-```ts /trigger/cleanup.ts
-export const taskWithCleanup = task({
-  id: "task-with-cleanup",
-  cleanup: async (payload, { ctx }) => {
+```ts /trigger/on-start.ts
+export const taskWithOnStartAttempt = task({
+  id: "task-with-on-start-attempt",
+  onStartAttempt: async ({ payload, ctx }) => {
     //...
   },
   run: async (payload: any, { ctx }) => {
@@ -193,47 +265,70 @@ export const taskWithCleanup = task({
 });
 ```
 
-<Info>Errors thrown in the `cleanup` function will fail the attempt.</Info>
+You can also define a global `onStartAttempt` function using `tasks.onStartAttempt()`.
 
-### `middleware` function
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
 
-This function is called before the `run` function, it allows you to wrap the run function with custom code.
+tasks.onStartAttempt(({ ctx, payload, task }) => {
+  console.log(
+    `Run ${ctx.run.id} started on task ${task} attempt ${ctx.run.attempt.number}`,
+    ctx.run
+  );
+});
+```
 
-<Info>
-  An error thrown in `middleware` is just like an uncaught error in the run function: it will
-  propagate through to `handleError()` and then will fail the attempt (causing a retry).
-</Info>
+<Info>Errors thrown in the `onStartAttempt` function will cause the attempt to fail.</Info>
 
-### `onStart` function
+If you want to execute code before just the first attempt, you can use the `onStartAttempt` function and check `ctx.run.attempt.number === 1`:
 
-When a task run starts, the `onStart` function is called. It's useful for sending notifications, logging, and other side effects. This function will only be called one per run (not per retry). If you want to run code before each retry, use the `init` function.
+```ts /trigger/on-start-attempt.ts
+export const taskWithOnStartAttempt = task({
+  id: "task-with-on-start-attempt",
+  onStartAttempt: async ({ payload, ctx }) => {
+    if (ctx.run.attempt.number === 1) {
+      console.log("Run started on attempt 1", ctx.run);
+    }
+  },
+});
+```
 
-```ts /trigger/on-start.ts
-export const taskWithOnStart = task({
-  id: "task-with-on-start",
-  onStart: async (payload, { ctx }) => {
-    //...
+### `onWait` and `onResume` functions
+
+These lifecycle hooks allow you to run code when a run is paused or resumed because of a wait:
+
+```ts
+export const myTask = task({
+  id: "my-task",
+  onWait: async ({ wait }) => {
+    console.log("Run paused", wait);
+  },
+  onResume: async ({ wait }) => {
+    console.log("Run resumed", wait);
   },
   run: async (payload: any, { ctx }) => {
-    //...
+    console.log("Run started", ctx.run);
+
+    await wait.for({ seconds: 10 });
+
+    console.log("Run finished", ctx.run);
   },
 });
 ```
 
-You can also define an `onStart` function in your `trigger.config.ts` file to get notified when any task starts.
+You can also define global `onWait` and `onResume` functions using `tasks.onWait()` and `tasks.onResume()`:
 
-```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
 
-export default defineConfig({
-  project: "proj_1234",
-  onStart: async (payload, { ctx }) => {
-    console.log("Task started", ctx.task.id);
-  },
+tasks.onWait(({ ctx, payload, wait, task }) => {
+  console.log("Run paused", ctx.run, wait);
 });
-```
 
-<Info>Errors thrown in the `onStart` function are ignored.</Info>
+tasks.onResume(({ ctx, payload, wait, task }) => {
+  console.log("Run resumed", ctx.run, wait);
+});
+```
 
 ### `onSuccess` function
 
@@ -242,7 +337,7 @@ When a task run succeeds, the `onSuccess` function is called. It's useful for se
 ```ts /trigger/on-success.ts
 export const taskWithOnSuccess = task({
   id: "task-with-on-success",
-  onSuccess: async (payload, output, { ctx }) => {
+  onSuccess: async ({ payload, output, ctx }) => {
     //...
   },
   run: async (payload: any, { ctx }) => {
@@ -251,20 +346,51 @@ export const taskWithOnSuccess = task({
 });
 ```
 
-You can also define an `onSuccess` function in your `trigger.config.ts` file to get notified when any task succeeds.
+You can also define a global `onSuccess` function using `tasks.onSuccess()`.
 
-```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
 
-export default defineConfig({
-  project: "proj_1234",
-  onSuccess: async (payload, output, { ctx }) => {
-    console.log("Task succeeded", ctx.task.id);
-  },
+tasks.onSuccess(({ ctx, payload, output }) => {
+  console.log("Task succeeded", ctx.task.id);
+});
+```
+
+<Info>
+  Errors thrown in the `onSuccess` function will be ignored, but you will still be able to see them
+  in the dashboard.
+</Info>
+
+### `onComplete` function
+
+This hook is executed when a run completes, regardless of whether it succeeded or failed:
+
+```ts /trigger/on-complete.ts
+export const taskWithOnComplete = task({
+  id: "task-with-on-complete",
+  onComplete: async ({ payload, output, ctx }) => {
+  if (result.ok) {
+    console.log("Run succeeded", result.data);
+  } else {
+    console.log("Run failed", result.error);
+  }
+});
+```
+
+You can also define a global `onComplete` function using `tasks.onComplete()`.
+
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
+
+tasks.onComplete(({ ctx, payload, output }) => {
+  console.log("Task completed", ctx.task.id);
 });
 ```
 
-<Info>Errors thrown in the `onSuccess` function are ignored.</Info>
+<Info>
+  Errors thrown in the `onComplete` function will be ignored, but you will still be able to see them
+  in the dashboard.
+</Info>
 
 ### `onFailure` function
 
@@ -273,7 +399,7 @@ When a task run fails, the `onFailure` function is called. It's useful for sendi
 ```ts /trigger/on-failure.ts
 export const taskWithOnFailure = task({
   id: "task-with-on-failure",
-  onFailure: async (payload, error, { ctx }) => {
+  onFailure: async ({ payload, error, ctx }) => {
     //...
   },
   run: async (payload: any, { ctx }) => {
@@ -282,33 +408,228 @@ export const taskWithOnFailure = task({
 });
 ```
 
-You can also define an `onFailure` function in your `trigger.config.ts` file to get notified when any task fails.
+You can also define a global `onFailure` function using `tasks.onFailure()`.
 
-```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
 
-export default defineConfig({
-  project: "proj_1234",
-  onFailure: async (payload, error, { ctx }) => {
-    console.log("Task failed", ctx.task.id);
-  },
+tasks.onFailure(({ ctx, payload, error }) => {
+  console.log("Task failed", ctx.task.id);
 });
 ```
 
-<Info>Errors thrown in the `onFailure` function are ignored.</Info>
+<Info>
+  Errors thrown in the `onFailure` function will be ignored, but you will still be able to see them
+  in the dashboard.
+</Info>
 
 <Note>
-  `onFailure` doesn’t fire for some of the run statuses like `Crashed`, `System failures`, and `Canceled`.
+  `onFailure` doesn’t fire for some of the run statuses like `Crashed`, `System failures`, and
+  `Canceled`.
 </Note>
 
-### `handleError` functions
+### `catchError` functions
 
 You can define a function that will be called when an error is thrown in the `run` function, that allows you to control how the error is handled and whether the task should be retried.
 
-Read more about `handleError` in our [Errors and Retrying guide](/errors-retrying).
+Read more about `catchError` in our [Errors and Retrying guide](/errors-retrying).
 
 <Info>Uncaught errors will throw a special internal error of the type `HANDLE_ERROR_ERROR`.</Info>
 
+### `onCancel` function
+
+You can define an `onCancel` hook that is called when a run is cancelled. This is useful if you want to clean up any resources that were allocated for the run.
+
+```ts
+tasks.onCancel(({ ctx, signal }) => {
+  console.log("Run cancelled", signal);
+});
+```
+
+You can use the `onCancel` hook along with the `signal` passed into the run function to interrupt a call to an external service, for example using the [streamText](https://ai-sdk.dev/docs/reference/ai-sdk-core/stream-text) function from the AI SDK:
+
+```ts
+import { logger, tasks, schemaTask } from "@trigger.dev/sdk";
+import { streamText } from "ai";
+import { z } from "zod";
+
+export const interruptibleChat = schemaTask({
+  id: "interruptible-chat",
+  description: "Chat with the AI",
+  schema: z.object({
+    prompt: z.string().describe("The prompt to chat with the AI"),
+  }),
+  run: async ({ prompt }, { signal }) => {
+    const chunks: TextStreamPart<{}>[] = [];
+
+    // 👇 This is a global onCancel hook, but it's inside of the run function
+    tasks.onCancel(async () => {
+      // We have access to the chunks here, and can save them to the database
+      await saveChunksToDatabase(chunks);
+    });
+
+    try {
+      const result = streamText({
+        model: getModel(),
+        prompt,
+        experimental_telemetry: {
+          isEnabled: true,
+        },
+        tools: {},
+        abortSignal: signal, // 👈 Pass the signal to the streamText function, which aborts with the run is cancelled
+        onChunk: ({ chunk }) => {
+          chunks.push(chunk);
+        },
+      });
+
+      const textParts = [];
+
+      for await (const part of result.textStream) {
+        textParts.push(part);
+      }
+
+      return textParts.join("");
+    } catch (error) {
+      if (error instanceof Error && error.name === "AbortError") {
+        // streamText will throw an AbortError if the signal is aborted, so we can handle it here
+      } else {
+        throw error;
+      }
+    }
+  },
+});
+```
+
+The `onCancel` hook can optionally wait for the `run` function to finish, and access the output of the run:
+
+```ts
+import { logger, task } from "@trigger.dev/sdk";
+import { setTimeout } from "node:timers/promises";
+
+export const cancelExampleTask = task({
+  id: "cancel-example",
+  // Signal will be aborted when the task is cancelled 👇
+  run: async (payload: { message: string }, { signal }) => {
+    try {
+      // We pass the signal to setTimeout to abort the timeout if the task is cancelled
+      await setTimeout(10_000, undefined, { signal });
+    } catch (error) {
+      // Ignore the abort error
+    }
+
+    // Do some more work here
+
+    return {
+      message: "Hello, world!",
+    };
+  },
+  onCancel: async ({ runPromise }) => {
+    // You can await the runPromise to get the output of the task
+    const output = await runPromise;
+  },
+});
+```
+
+<Note>
+  You will have up to 30 seconds to complete the `runPromise` in the `onCancel` hook. After that
+  point the process will be killed.
+</Note>
+
+### `onStart` function (deprecated)
+
+<Info>The `onStart` function was deprecated in v4.1.0. Use `onStartAttempt` instead.</Info>
+
+When a task run starts, the `onStart` function is called. It's useful for sending notifications, logging, and other side effects.
+
+<Warning>
+  This function will only be called once per run (not per attempt). If you want to run code before
+  each attempt, use a middleware function or the `onStartAttempt` function.
+</Warning>
+
+```ts /trigger/on-start.ts
+export const taskWithOnStart = task({
+  id: "task-with-on-start",
+  onStart: async ({ payload, ctx }) => {
+    //...
+  },
+  run: async (payload: any, { ctx }) => {
+    //...
+  },
+});
+```
+
+You can also define a global `onStart` function using `tasks.onStart()`.
+
+```ts init.ts
+import { tasks } from "@trigger.dev/sdk";
+
+tasks.onStart(({ ctx, payload, task }) => {
+  console.log(`Run ${ctx.run.id} started on task ${task}`, ctx.run);
+});
+```
+
+<Info>Errors thrown in the `onStart` function will cause the attempt to fail.</Info>
+
+### `init` function (deprecated)
+
+<Warning>
+  The `init` hook is deprecated and will be removed in the future. Use
+  [middleware](/tasks/overview#middleware-and-locals-functions) instead.
+</Warning>
+
+This function is called before a run attempt:
+
+```ts /trigger/init.ts
+export const taskWithInit = task({
+  id: "task-with-init",
+  init: async ({ payload, ctx }) => {
+    //...
+  },
+  run: async (payload: any, { ctx }) => {
+    //...
+  },
+});
+```
+
+You can also return data from the `init` function that will be available in the params of the `run`, `cleanup`, `onSuccess`, and `onFailure` functions.
+
+```ts /trigger/init-return.ts
+export const taskWithInitReturn = task({
+  id: "task-with-init-return",
+  init: async ({ payload, ctx }) => {
+    return { someData: "someValue" };
+  },
+  run: async (payload: any, { ctx, init }) => {
+    console.log(init.someData); // "someValue"
+  },
+});
+```
+
+<Info>Errors thrown in the `init` function will cause the attempt to fail.</Info>
+
+### `cleanup` function (deprecated)
+
+<Warning>
+  The `cleanup` hook is deprecated and will be removed in the future. Use
+  [middleware](/tasks/overview#middleware-and-locals-functions) instead.
+</Warning>
+
+This function is called after the `run` function is executed, regardless of whether the run was successful or not. It's useful for cleaning up resources, logging, or other side effects.
+
+```ts /trigger/cleanup.ts
+export const taskWithCleanup = task({
+  id: "task-with-cleanup",
+  cleanup: async ({ payload, ctx }) => {
+    //...
+  },
+  run: async (payload: any, { ctx }) => {
+    //...
+  },
+});
+```
+
+<Info>Errors thrown in the `cleanup` function will cause the attempt to fail.</Info>
+
 ## Next steps
 
 <CardGroup>
diff --git a/docs/tasks/scheduled.mdx b/docs/tasks/scheduled.mdx
index aea6efb9db8..84985708f64 100644
--- a/docs/tasks/scheduled.mdx
+++ b/docs/tasks/scheduled.mdx
@@ -3,14 +3,17 @@ title: "Scheduled tasks (cron)"
 description: "A task that is triggered on a recurring schedule using cron syntax."
 ---
 
-<Note>Scheduled tasks are only for recurring tasks. If you want to trigger a one-off task at a future time, you should [use the delay option](/triggering#delay).</Note>
+<Note>
+  Scheduled tasks are only for recurring tasks. If you want to trigger a one-off task at a future
+  time, you should [use the delay option](/triggering#delay).
+</Note>
 
 ## Defining a scheduled task
 
 This task will run when any of the attached schedules trigger. They have a predefined payload with some useful properties:
 
 ```ts
-import { schedules } from "@trigger.dev/sdk/v3";
+import { schedules } from "@trigger.dev/sdk";
 
 export const firstScheduledTask = schedules.task({
   id: "first-scheduled-task",
@@ -104,6 +107,9 @@ export const secondScheduledTask = schedules.task({
     //5am every day Tokyo time
     pattern: "0 5 * * *",
     timezone: "Asia/Tokyo",
+    //optional, defaults to all environments
+    //possible values are "PRODUCTION", "STAGING", "PREVIEW" and "DEVELOPMENT"
+    environments: ["PRODUCTION", "STAGING"],
   },
   run: async (payload) => {},
 });
@@ -227,7 +233,7 @@ By using the `externalId` you can have schedules for your users. This is useful
 A reminder task:
 
 ```ts /trigger/reminder.ts
-import { schedules } from "@trigger.dev/sdk/v3";
+import { schedules } from "@trigger.dev/sdk";
 
 //this task will run when any of the attached schedules trigger
 export const reminderTask = schedules.task({
diff --git a/docs/tasks/schemaTask.mdx b/docs/tasks/schemaTask.mdx
index 5f28ebe2cda..3692d1d7035 100644
--- a/docs/tasks/schemaTask.mdx
+++ b/docs/tasks/schemaTask.mdx
@@ -9,7 +9,7 @@ The `schemaTask` function allows you to define a task with a runtime payload sch
 ## Usage
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { z } from "zod";
 
 const myTask = schemaTask({
@@ -34,7 +34,7 @@ const myTask = schemaTask({
 When you trigger the task directly, the payload will be validated against the schema before the [run](/runs) is created:
 
 ```ts
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import { myTask } from "./trigger/myTasks";
 
 // This will call the schema parser function and validate the payload
@@ -53,7 +53,7 @@ We will also validate the payload every time before the task is run, so you can
 Certain schema libraries, like Zod, split their type inference into "schema in" and "schema out". This means that you can define a single schema that will produce different types when triggering the task and when running the task. For example, you can define a schema that has a default value for a field, or a string coerced into a date:
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { z } from "zod";
 
 const myTask = schemaTask({
@@ -76,6 +76,138 @@ await myTask.trigger({ age: 30, dob: "2020-01-01" }); // this is valid
 await myTask.trigger({ name: "Alice", age: 30, dob: "2020-01-01" }); // this is also valid
 ```
 
+## `ai.tool`
+
+The `ai.tool` function allows you to create an AI tool from an existing `schemaTask` to use with the Vercel [AI SDK](https://vercel.com/docs/ai-sdk):
+
+```ts
+import { ai } from "@trigger.dev/sdk/ai";
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+import { generateText } from "ai";
+
+const myToolTask = schemaTask({
+  id: "my-tool-task",
+  schema: z.object({
+    foo: z.string(),
+  }),
+  run: async (payload: any, { ctx }) => {},
+});
+
+const myTool = ai.tool(myToolTask);
+
+export const myAiTask = schemaTask({
+  id: "my-ai-task",
+  schema: z.object({
+    text: z.string(),
+  }),
+  run: async (payload, { ctx }) => {
+    const { text } = await generateText({
+      prompt: payload.text,
+      model: openai("gpt-4o"),
+      tools: {
+        myTool,
+      },
+    });
+  },
+});
+```
+
+You can also pass the `experimental_toToolResultContent` option to the `ai.tool` function to customize the content of the tool result:
+
+```ts
+import { openai } from "@ai-sdk/openai";
+import { Sandbox } from "@e2b/code-interpreter";
+import { ai } from "@trigger.dev/sdk/ai";
+import { schemaTask } from "@trigger.dev/sdk";
+import { generateObject } from "ai";
+import { z } from "zod";
+
+const chartTask = schemaTask({
+  id: "chart",
+  description: "Generate a chart using natural language",
+  schema: z.object({
+    input: z.string().describe("The chart to generate"),
+  }),
+  run: async ({ input }) => {
+    const code = await generateObject({
+      model: openai("gpt-4o"),
+      schema: z.object({
+        code: z.string().describe("The Python code to execute"),
+      }),
+      system: `
+        You are a helpful assistant that can generate Python code to be executed in a sandbox, using matplotlib.pyplot.
+
+        For example: 
+        
+        import matplotlib.pyplot as plt
+        plt.plot([1, 2, 3, 4])
+        plt.ylabel('some numbers')
+        plt.show()
+        
+        Make sure the code ends with plt.show()
+      `,
+      prompt: input,
+    });
+
+    const sandbox = await Sandbox.create();
+
+    const execution = await sandbox.runCode(code.object.code);
+
+    const firstResult = execution.results[0];
+
+    if (firstResult.png) {
+      return {
+        chart: firstResult.png,
+      };
+    } else {
+      throw new Error("No chart generated");
+    }
+  },
+});
+
+// This is useful if you want to return an image from the tool
+export const chartTool = ai.tool(chartTask, {
+  experimental_toToolResultContent: (result) => {
+    return [
+      {
+        type: "image",
+        data: result.chart,
+        mimeType: "image/png",
+      },
+    ];
+  },
+});
+```
+
+You can access the current tool execution options inside the task run function using the `ai.currentToolOptions()` function:
+
+```ts
+import { ai } from "@trigger.dev/sdk/ai";
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+
+const myToolTask = schemaTask({
+  id: "my-tool-task",
+  schema: z.object({
+    foo: z.string(),
+  }),
+  run: async (payload, { ctx }) => {
+    const toolOptions = ai.currentToolOptions();
+    console.log(toolOptions);
+  },
+});
+
+export const myAiTask = ai.tool(myToolTask);
+```
+
+See the [AI SDK tool execution options docs](https://sdk.vercel.ai/docs/ai-sdk-core/tools-and-tool-calling#tool-execution-options) for more details on the tool execution options.
+
+<Note>
+  `ai.tool` is compatible with `schemaTask`'s defined with Zod and ArkType schemas, or any schemas
+  that implement a `.toJsonSchema()` function.
+</Note>
+
 ## Supported schema types
 
 ### Zod
@@ -83,7 +215,7 @@ await myTask.trigger({ name: "Alice", age: 30, dob: "2020-01-01" }); // this is
 You can use the [Zod](https://zod.dev) schema library to define your schema. The schema will be validated using Zod's `parse` function.
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { z } from "zod";
 
 export const zodTask = schemaTask({
@@ -101,7 +233,7 @@ export const zodTask = schemaTask({
 ### Yup
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import * as yup from "yup";
 
 export const yupTask = schemaTask({
@@ -119,7 +251,7 @@ export const yupTask = schemaTask({
 ### Superstruct
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { object, string } from "superstruct";
 
 export const superstructTask = schemaTask({
@@ -137,7 +269,7 @@ export const superstructTask = schemaTask({
 ### ArkType
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { type } from "arktype";
 
 export const arktypeTask = schemaTask({
@@ -155,7 +287,7 @@ export const arktypeTask = schemaTask({
 ### @effect/schema
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import * as Schema from "@effect/schema/Schema";
 
 // For some funny typescript reason, you cannot pass the Schema.decodeUnknownSync directly to schemaTask
@@ -175,7 +307,7 @@ export const effectTask = schemaTask({
 ### runtypes
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import * as T from "runtypes";
 
 export const runtypesTask = schemaTask({
@@ -193,7 +325,7 @@ export const runtypesTask = schemaTask({
 ### valibot
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 
 import * as v from "valibot";
 
@@ -217,7 +349,7 @@ export const valibotTask = schemaTask({
 ### typebox
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 import { Type } from "@sinclair/typebox";
 import { wrap } from "@typeschema/typebox";
 
@@ -240,7 +372,7 @@ export const typeboxTask = schemaTask({
 You can also define a custom parser function that will be called with the payload before the task is run. The parser function should return the parsed payload or throw an error if the payload is invalid.
 
 ```ts
-import { schemaTask } from "@trigger.dev/sdk/v3";
+import { schemaTask } from "@trigger.dev/sdk";
 
 export const customParserTask = schemaTask({
   id: "types/custom-parser",
diff --git a/docs/tasks/streams.mdx b/docs/tasks/streams.mdx
new file mode 100644
index 00000000000..2d494977a32
--- /dev/null
+++ b/docs/tasks/streams.mdx
@@ -0,0 +1,730 @@
+---
+title: "Realtime Streams"
+sidebarTitle: "Streams"
+description: "Stream data in realtime from your Trigger.dev tasks to your frontend or backend applications."
+---
+
+Realtime Streams allow you to pipe streaming data from your Trigger.dev tasks to your frontend or backend applications in real-time. This is perfect for use cases like streaming AI completions, progress updates, or any continuous data flow.
+
+<Note>
+  Streams v2 requires SDK version **4.1.0 or later**. Make sure to upgrade your `@trigger.dev/sdk`
+  and `@trigger.dev/react-hooks` packages to use these features. If you're on an earlier version,
+  see the [metadata.stream()](/runs/metadata#stream) documentation.
+</Note>
+
+## Overview
+
+Streams v2 is a major upgrade that provides:
+
+- **Unlimited stream length** (previously capped at 2000 chunks)
+- **Unlimited active streams per run** (previously 5)
+- **Improved reliability** with automatic resumption on connection loss
+- **28-day stream retention** (previously 1 day)
+- **Multiple client streams** can pipe to a single stream
+- **Enhanced dashboard visibility** for viewing stream data in real-time
+
+## Enabling Streams v2
+
+Streams v2 is **automatically enabled** when triggering runs from the SDK using 4.1.0 or later. If you aren't triggering via the SDK, you'll need to explicitly enable v2 streams via setting the `x-trigger-realtime-streams-version=v2` header when triggering the task.
+
+If you'd like to **opt-out** of the v2 streams, you can see so in one of the following two ways:
+
+### Option 1: Configure the SDK
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+auth.configure({
+  future: {
+    v2RealtimeStreams: false,
+  },
+});
+```
+
+### Option 2: Environment Variable
+
+Set the `TRIGGER_V2_REALTIME_STREAMS=0` environment variable in your backend code (where you trigger tasks).
+
+## Limits Comparison
+
+| Limit                            | Streams v1 | Streams v2 |
+| -------------------------------- | ---------- | ---------- |
+| Maximum stream length            | 2000       | Unlimited  |
+| Number of active streams per run | 5          | Unlimited  |
+| Maximum streams per run          | 10         | Unlimited  |
+| Maximum stream TTL               | 1 day      | 28 days    |
+| Maximum stream size              | 10MB       | 300 MiB    |
+
+## Quick Start
+
+The recommended workflow for using Realtime Streams v2:
+
+1. **Define your streams** in a shared location using `streams.define()`
+2. **Use the defined stream** in your tasks with `.pipe()`, `.append()`, or `.writer()`
+3. **Read from the stream** using `.read()` or the `useRealtimeStream` hook in React
+
+This approach gives you full type safety, better code organization, and easier maintenance as your application grows.
+
+## Defining Typed Streams (Recommended)
+
+The recommended way to work with streams is to define them once with `streams.define()`. This allows you to specify the chunk type and stream ID in one place, and then reuse that definition throughout your codebase with full type safety.
+
+### Creating a Defined Stream
+
+Define your streams in a shared location (like `app/streams.ts` or `trigger/streams.ts`):
+
+```ts
+import { streams, InferStreamType } from "@trigger.dev/sdk";
+
+// Define a stream with a specific type
+export const aiStream = streams.define<string>({
+  id: "ai-output",
+});
+
+// Export the type for use in frontend components
+export type AIStreamPart = InferStreamType<typeof aiStream>;
+```
+
+You can define streams for any JSON-serializable type:
+
+```ts
+import { streams, InferStreamType } from "@trigger.dev/sdk";
+import { UIMessageChunk } from "ai";
+
+// Stream for AI UI message chunks
+export const aiStream = streams.define<UIMessageChunk>({
+  id: "ai",
+});
+
+// Stream for progress updates
+export const progressStream = streams.define<{ step: string; percent: number }>({
+  id: "progress",
+});
+
+// Stream for simple text
+export const logStream = streams.define<string>({
+  id: "logs",
+});
+
+// Export types
+export type AIStreamPart = InferStreamType<typeof aiStream>;
+export type ProgressStreamPart = InferStreamType<typeof progressStream>;
+export type LogStreamPart = InferStreamType<typeof logStream>;
+```
+
+### Using Defined Streams in Tasks
+
+Once defined, you can use all stream methods on your defined stream:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+import { aiStream } from "./streams";
+
+export const streamTask = task({
+  id: "stream-task",
+  run: async (payload: { prompt: string }) => {
+    // Get a stream from an AI service, database, etc.
+    const stream = await getAIStream(payload.prompt);
+
+    // Pipe the stream using your defined stream
+    const { stream: readableStream, waitUntilComplete } = aiStream.pipe(stream);
+
+    // Option A: Iterate over the stream locally
+    for await (const chunk of readableStream) {
+      console.log("Received chunk:", chunk);
+    }
+
+    // Option B: Wait for the stream to complete
+    await waitUntilComplete();
+
+    return { message: "Stream completed" };
+  },
+});
+```
+
+#### Reading from a Stream
+
+Use the defined stream's `read()` method to consume data from anywhere (frontend, backend, or another task):
+
+```ts
+import { aiStream } from "./streams";
+
+const stream = await aiStream.read(runId);
+
+for await (const chunk of stream) {
+  console.log(chunk); // chunk is typed as the stream's chunk type
+}
+```
+
+With options:
+
+```ts
+const stream = await aiStream.read(runId, {
+  timeoutInSeconds: 60, // Stop if no data for 60 seconds
+  startIndex: 10, // Start from the 10th chunk
+});
+```
+
+#### Appending to a Stream
+
+Use the defined stream's `append()` method to add a single chunk:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+import { aiStream, progressStream, logStream } from "./streams";
+
+export const appendTask = task({
+  id: "append-task",
+  run: async (payload) => {
+    // Append to different streams with full type safety
+    await logStream.append("Processing started");
+    await progressStream.append({ step: "Initialization", percent: 0 });
+
+    // Do some work...
+
+    await progressStream.append({ step: "Processing", percent: 50 });
+    await logStream.append("Step 1 complete");
+
+    // Do more work...
+
+    await progressStream.append({ step: "Complete", percent: 100 });
+    await logStream.append("All steps complete");
+  },
+});
+```
+
+#### Writing Multiple Chunks
+
+Use the defined stream's `writer()` method for more complex stream writing:
+
+```ts
+import { task } from "@trigger.dev/sdk";
+import { logStream } from "./streams";
+
+export const writerTask = task({
+  id: "writer-task",
+  run: async (payload) => {
+    const { waitUntilComplete } = logStream.writer({
+      execute: ({ write, merge }) => {
+        // Write individual chunks
+        write("Chunk 1");
+        write("Chunk 2");
+
+        // Merge another stream
+        const additionalStream = ReadableStream.from(["Chunk 3", "Chunk 4", "Chunk 5"]);
+        merge(additionalStream);
+      },
+    });
+
+    await waitUntilComplete();
+  },
+});
+```
+
+### Using Defined Streams in React
+
+Defined streams work seamlessly with the `useRealtimeStream` hook:
+
+```tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "@/app/streams";
+
+export function StreamViewer({ accessToken, runId }: { accessToken: string; runId: string }) {
+  // Pass the defined stream directly - full type safety!
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    timeoutInSeconds: 600,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  return (
+    <div>
+      {parts.map((part, i) => (
+        <span key={i}>{part}</span>
+      ))}
+    </div>
+  );
+}
+```
+
+## Direct Stream Methods (Without Defining)
+
+<Warning>
+  We strongly recommend using `streams.define()` instead of direct methods. Defined streams provide
+  better organization, full type safety, and make it easier to maintain your codebase as it grows.
+</Warning>
+
+If you have a specific reason to avoid defined streams, you can use stream methods directly by specifying the stream key each time.
+
+### Direct Piping
+
+```ts
+import { streams, task } from "@trigger.dev/sdk";
+
+export const directStreamTask = task({
+  id: "direct-stream",
+  run: async (payload: { prompt: string }) => {
+    const stream = await getAIStream(payload.prompt);
+
+    // Specify the stream key directly
+    const { stream: readableStream, waitUntilComplete } = streams.pipe("ai-output", stream);
+
+    await waitUntilComplete();
+  },
+});
+```
+
+### Direct Reading
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+
+// Specify the stream key when reading
+const stream = await streams.read(runId, "ai-output");
+
+for await (const chunk of stream) {
+  console.log(chunk);
+}
+```
+
+### Direct Appending
+
+```ts
+import { streams, task } from "@trigger.dev/sdk";
+
+export const directAppendTask = task({
+  id: "direct-append",
+  run: async (payload) => {
+    // Specify the stream key each time
+    await streams.append("logs", "Processing started");
+    await streams.append("progress", "50%");
+    await streams.append("logs", "Complete");
+  },
+});
+```
+
+### Direct Writing
+
+```ts
+import { streams, task } from "@trigger.dev/sdk";
+
+export const directWriterTask = task({
+  id: "direct-writer",
+  run: async (payload) => {
+    const { waitUntilComplete } = streams.writer("output", {
+      execute: ({ write, merge }) => {
+        write("Chunk 1");
+        write("Chunk 2");
+      },
+    });
+
+    await waitUntilComplete();
+  },
+});
+```
+
+## Default Stream
+
+Every run has a "default" stream, allowing you to skip the stream key entirely. This is useful for simple cases where you only need one stream per run.
+
+Using direct methods:
+
+```ts
+import { streams, task } from "@trigger.dev/sdk";
+
+export const defaultStreamTask = task({
+  id: "default-stream",
+  run: async (payload) => {
+    const stream = getDataStream();
+
+    // No stream key needed - uses "default"
+    const { waitUntilComplete } = streams.pipe(stream);
+
+    await waitUntilComplete();
+  },
+});
+
+// Reading from the default stream
+const readStream = await streams.read(runId);
+```
+
+## Targeting Different Runs
+
+You can pipe streams to parent, root, or any other run using the `target` option. This works with both defined streams and direct methods.
+
+### With Defined Streams
+
+```ts
+import { task } from "@trigger.dev/sdk";
+import { logStream } from "./streams";
+
+export const childTask = task({
+  id: "child-task",
+  run: async (payload, { ctx }) => {
+    const stream = getDataStream();
+
+    // Pipe to parent run
+    logStream.pipe(stream, { target: "parent" });
+
+    // Pipe to root run
+    logStream.pipe(stream, { target: "root" });
+
+    // Pipe to self (default behavior)
+    logStream.pipe(stream, { target: "self" });
+
+    // Pipe to a specific run ID
+    logStream.pipe(stream, { target: payload.otherRunId });
+  },
+});
+```
+
+### With Direct Methods
+
+```ts
+import { streams, task } from "@trigger.dev/sdk";
+
+export const childTask = task({
+  id: "child-task",
+  run: async (payload, { ctx }) => {
+    const stream = getDataStream();
+
+    // Pipe to parent run
+    streams.pipe("output", stream, { target: "parent" });
+
+    // Pipe to root run
+    streams.pipe("output", stream, { target: "root" });
+
+    // Pipe to a specific run ID
+    streams.pipe("output", stream, { target: payload.otherRunId });
+  },
+});
+```
+
+## Streaming from Outside a Task
+
+If you specify a `target` run ID, you can pipe streams from anywhere (like a Next.js API route):
+
+```ts
+import { streams } from "@trigger.dev/sdk";
+import { openai } from "@ai-sdk/openai";
+import { streamText } from "ai";
+
+export async function POST(req: Request) {
+  const { messages, runId } = await req.json();
+
+  const result = streamText({
+    model: openai("gpt-4o"),
+    messages,
+  });
+
+  // Pipe AI stream to a Trigger.dev run
+  const { stream } = streams.pipe("ai-stream", result.toUIMessageStream(), {
+    target: runId,
+  });
+
+  return new Response(stream as any, {
+    headers: { "Content-Type": "text/event-stream" },
+  });
+}
+```
+
+## React Hook
+
+Use the `useRealtimeStream` hook to subscribe to streams in your React components.
+
+### With Defined Streams (Recommended)
+
+```tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "@/app/streams";
+
+export function StreamViewer({ accessToken, runId }: { accessToken: string; runId: string }) {
+  // Pass the defined stream directly for full type safety
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    timeoutInSeconds: 600,
+    onData: (chunk) => {
+      console.log("New chunk:", chunk); // chunk is typed!
+    },
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  return (
+    <div>
+      {parts.map((part, i) => (
+        <span key={i}>{part}</span>
+      ))}
+    </div>
+  );
+}
+```
+
+### With Direct Stream Keys
+
+If you prefer not to use defined streams, you can specify the stream key directly:
+
+```tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+
+export function StreamViewer({ accessToken, runId }: { accessToken: string; runId: string }) {
+  const { parts, error } = useRealtimeStream<string>(runId, "ai-output", {
+    accessToken,
+    timeoutInSeconds: 600,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  return (
+    <div>
+      {parts.map((part, i) => (
+        <span key={i}>{part}</span>
+      ))}
+    </div>
+  );
+}
+```
+
+### Using Default Stream
+
+```tsx
+// Omit stream key to use the default stream
+const { parts, error } = useRealtimeStream<string>(runId, {
+  accessToken,
+});
+```
+
+### Hook Options
+
+```tsx
+const { parts, error } = useRealtimeStream(streamDef, runId, {
+  accessToken: "pk_...", // Required: Public access token
+  baseURL: "https://api.trigger.dev", // Optional: Custom API URL
+  timeoutInSeconds: 60, // Optional: Timeout (default: 60)
+  startIndex: 0, // Optional: Start from specific chunk
+  throttleInMs: 16, // Optional: Throttle updates (default: 16ms)
+  onData: (chunk) => {}, // Optional: Callback for each chunk
+});
+```
+
+## Complete Example: AI Streaming
+
+### Define the stream
+
+```ts
+// app/streams.ts
+import { streams, InferStreamType } from "@trigger.dev/sdk";
+import { UIMessageChunk } from "ai";
+
+export const aiStream = streams.define<UIMessageChunk>({
+  id: "ai",
+});
+
+export type AIStreamPart = InferStreamType<typeof aiStream>;
+```
+
+### Create the task
+
+```ts
+// trigger/ai-task.ts
+import { task } from "@trigger.dev/sdk";
+import { openai } from "@ai-sdk/openai";
+import { streamText } from "ai";
+import { aiStream } from "@/app/streams";
+
+export const generateAI = task({
+  id: "generate-ai",
+  run: async (payload: { prompt: string }) => {
+    const result = streamText({
+      model: openai("gpt-4o"),
+      prompt: payload.prompt,
+    });
+
+    const { waitUntilComplete } = aiStream.pipe(result.toUIMessageStream());
+
+    await waitUntilComplete();
+
+    return { success: true };
+  },
+});
+```
+
+### Frontend component
+
+```tsx
+// components/ai-stream.tsx
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "@/app/streams";
+
+export function AIStream({ accessToken, runId }: { accessToken: string; runId: string }) {
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    timeoutInSeconds: 300,
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  return (
+    <div className="prose">
+      {parts.map((part, i) => (
+        <span key={i}>{part}</span>
+      ))}
+    </div>
+  );
+}
+```
+
+## Migration from v1
+
+If you're using the old `metadata.stream()` API, here's how to migrate to the recommended v2 approach:
+
+### Step 1: Define Your Streams
+
+Create a shared streams definition file:
+
+```ts
+// app/streams.ts or trigger/streams.ts
+import { streams, InferStreamType } from "@trigger.dev/sdk";
+
+export const myStream = streams.define<string>({
+  id: "my-stream",
+});
+
+export type MyStreamPart = InferStreamType<typeof myStream>;
+```
+
+### Step 2: Update Your Tasks
+
+Replace `metadata.stream()` with the defined stream's `pipe()` method:
+
+```ts
+// Before (v1)
+import { metadata, task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload) => {
+    const stream = getDataStream();
+    await metadata.stream("my-stream", stream);
+  },
+});
+```
+
+```ts
+// After (v2 - Recommended)
+import { task } from "@trigger.dev/sdk";
+import { myStream } from "./streams";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload) => {
+    const stream = getDataStream();
+
+    // Don't await - returns immediately
+    const { waitUntilComplete } = myStream.pipe(stream);
+
+    // Optionally wait for completion
+    await waitUntilComplete();
+  },
+});
+```
+
+### Step 3: Update Your Frontend
+
+Use the defined stream with `useRealtimeStream`:
+
+```tsx
+// Before
+const { parts, error } = useRealtimeStream<string>(runId, "my-stream", {
+  accessToken,
+});
+```
+
+```tsx
+// After
+import { myStream } from "@/app/streams";
+
+const { parts, error } = useRealtimeStream(myStream, runId, {
+  accessToken,
+});
+```
+
+### Alternative: Direct Methods (Not Recommended)
+
+If you prefer not to use defined streams, you can use direct methods:
+
+```ts
+import { streams, task } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload) => {
+    const stream = getDataStream();
+    const { waitUntilComplete } = streams.pipe("my-stream", stream);
+    await waitUntilComplete();
+  },
+});
+```
+
+## Reliability Features
+
+Streams v2 includes automatic reliability improvements:
+
+- **Automatic resumption**: If a connection is lost, both appending and reading will automatically resume from the last successful chunk
+- **No data loss**: Network issues won't cause stream data to be lost
+- **Idempotent operations**: Duplicate chunks are automatically handled
+
+These improvements happen automatically - no code changes needed.
+
+## Dashboard Integration
+
+Streams are now visible in the Trigger.dev dashboard, allowing you to:
+
+- View stream data in real-time as it's generated
+- Inspect historical stream data for completed runs
+- Debug streaming issues with full visibility into chunk delivery
+
+<video src="https://content.trigger.dev/streams-v2-dashboard.mp4" controls muted autoPlay loop />
+
+## Best Practices
+
+1. **Always use `streams.define()`**: Define your streams in a shared location for better organization, type safety, and code reusability. This is the recommended approach for all streams.
+2. **Export stream types**: Use `InferStreamType` to export types for your frontend components
+3. **Handle errors gracefully**: Always check for errors when reading streams in your UI
+4. **Set appropriate timeouts**: Adjust `timeoutInSeconds` based on your use case (AI completions may need longer timeouts)
+5. **Target parent runs**: When orchestrating with child tasks, pipe to parent runs for easier consumption
+6. **Throttle frontend updates**: Use `throttleInMs` in `useRealtimeStream` to prevent excessive re-renders
+7. **Use descriptive stream IDs**: Choose clear, descriptive IDs like `"ai-output"` or `"progress"` instead of generic names
+
+## Troubleshooting
+
+### Stream not appearing in dashboard
+
+- Ensure you've enabled Streams v2 via the future flag or environment variable
+- Verify your task is actually writing to the stream
+- Check that the stream key matches between writing and reading
+
+### Stream timeout errors
+
+- Increase `timeoutInSeconds` in your `read()` or `useRealtimeStream()` calls
+- Ensure your stream source is actively producing data
+- Check network connectivity between your application and Trigger.dev
+
+### Missing chunks
+
+- With v2, chunks should never be lost due to automatic resumption
+- Verify you're reading from the correct stream key
+- Check the `startIndex` option if you're not seeing expected chunks
diff --git a/docs/triggering.mdx b/docs/triggering.mdx
index 235383796f5..9d1d4d39e1b 100644
--- a/docs/triggering.mdx
+++ b/docs/triggering.mdx
@@ -7,12 +7,11 @@ description: "Tasks need to be triggered in order to run."
 
 Trigger tasks **from your backend**:
 
-| Function                 | What it does                                                                                     |                               |
-| :----------------------- | :----------------------------------------------------------------------------------------------- | ----------------------------- |
-| `tasks.trigger()`        | Triggers a task and returns a handle you can use to fetch and manage the run.                    | [Docs](#tasks-trigger)        |
-| `tasks.batchTrigger()`   | Triggers a single task in a batch and returns a handle you can use to fetch and manage the runs. | [Docs](#tasks-batchtrigger)   |
-| `tasks.triggerAndPoll()` | Triggers a task and then polls the run until it’s complete.                                      | [Docs](#tasks-triggerandpoll) |
-| `batch.trigger()`        | Similar to `tasks.batchTrigger` but allows running multiple different tasks                      | [Docs](#batch-trigger)        |
+| Function               | What it does                                                                                     |                             |
+| :--------------------- | :----------------------------------------------------------------------------------------------- | --------------------------- |
+| `tasks.trigger()`      | Triggers a task and returns a handle you can use to fetch and manage the run.                    | [Docs](#tasks-trigger)      |
+| `tasks.batchTrigger()` | Triggers a single task in a batch and returns a handle you can use to fetch and manage the runs. | [Docs](#tasks-batchtrigger) |
+| `batch.trigger()`      | Similar to `tasks.batchTrigger` but allows running multiple different tasks                      | [Docs](#batch-trigger)      |
 
 Trigger tasks **from inside a another task**:
 
@@ -46,7 +45,7 @@ Triggers a single run of a task with the payload you pass in, and any options yo
 </Note>
 
 ```ts Your backend
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { emailSequence } from "~/trigger/emails";
 //     👆 **type-only** import
 
@@ -66,10 +65,10 @@ export async function POST(request: Request) {
 }
 ```
 
-You can pass in options to the task using the second argument:
+You can pass in options to the task using the third argument:
 
 ```ts Your backend
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { emailSequence } from "~/trigger/emails";
 
 //app/email/route.ts
@@ -97,7 +96,7 @@ export async function POST(request: Request) {
 Triggers multiple runs of a single task with the payloads you pass in, and any options you specify, without needing to import the task.
 
 ```ts Your backend
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { emailSequence } from "~/trigger/emails";
 //     👆 **type-only** import
 
@@ -117,10 +116,10 @@ export async function POST(request: Request) {
 }
 ```
 
-You can pass in options to the `batchTrigger` function using the second argument:
+You can pass in options to the `batchTrigger` function using the third argument:
 
 ```ts Your backend
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { emailSequence } from "~/trigger/emails";
 
 //app/email/route.ts
@@ -143,7 +142,7 @@ export async function POST(request: Request) {
 You can also pass in options for each run in the batch:
 
 ```ts Your backend
-import { tasks } from "@trigger.dev/sdk/v3";
+import { tasks } from "@trigger.dev/sdk";
 import type { emailSequence } from "~/trigger/emails";
 
 //app/email/route.ts
@@ -162,46 +161,12 @@ export async function POST(request: Request) {
 }
 ```
 
-### tasks.triggerAndPoll()
-
-Triggers a single run of a task with the payload you pass in, and any options you specify, and then polls the run until it's complete.
-
-<Warning>
-  We don't recommend using `triggerAndPoll()`, especially inside a web request, as it will block the
-  request until the run is complete. Please see our [Realtime docs](/realtime) for a better way to
-  handle this.
-</Warning>
-
-```ts Your backend
-import { tasks } from "@trigger.dev/sdk/v3";
-import type { emailSequence } from "~/trigger/emails";
-
-//app/email/route.ts
-export async function POST(request: Request) {
-  //get the JSON from the request
-  const data = await request.json();
-
-  // Pass the task type to `triggerAndPoll()` as a generic argument, giving you full type checking
-  const result = await tasks.triggerAndPoll<typeof emailSequence>(
-    "email-sequence",
-    {
-      to: data.email,
-      name: data.name,
-    },
-    { pollIntervalMs: 5000 }
-  );
-
-  //return a success response with the result
-  return Response.json(result);
-}
-```
-
 ### batch.trigger()
 
 Triggers multiple runs of different tasks with the payloads you pass in, and any options you specify. This is useful when you need to trigger multiple tasks at once.
 
 ```ts Your backend
-import { batch } from "@trigger.dev/sdk/v3";
+import { batch } from "@trigger.dev/sdk";
 import type { myTask1, myTask2 } from "~/trigger/myTasks";
 
 export async function POST(request: Request) {
@@ -233,12 +198,12 @@ Triggers a single run of a task with the payload you pass in, and any options yo
 
 <Note>
   If you need to call `trigger()` on a task in a loop, use
-  [`batchTrigger()`](#yourTask-batchtrigger) instead which will trigger up to 500 runs in a single
-  call.
+  [`batchTrigger()`](#yourTask-batchtrigger) instead which will trigger up to 1,000 runs in a single
+  call with SDK 4.3.1+ (500 runs in prior versions).
 </Note>
 
 ```ts ./trigger/my-task.ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 import { myOtherTask } from "~/trigger/my-other-task";
 
 export const myTask = task({
@@ -255,7 +220,7 @@ export const myTask = task({
 To pass options to the triggered task, you can use the second argument:
 
 ```ts ./trigger/my-task.ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 import { myOtherTask } from "~/trigger/my-other-task";
 
 export const myTask = task({
@@ -274,7 +239,7 @@ export const myTask = task({
 Triggers multiple runs of a single task with the payloads you pass in, and any options you specify.
 
 ```ts /trigger/my-task.ts
-import { batch } from "@trigger.dev/sdk/v3";
+import { batch } from "@trigger.dev/sdk";
 import { myOtherTask } from "~/trigger/my-other-task";
 
 export const myTask = task({
@@ -291,7 +256,7 @@ export const myTask = task({
 If you need to pass options to `batchTrigger`, you can use the second argument:
 
 ```ts /trigger/my-task.ts
-import { batch } from "@trigger.dev/sdk/v3";
+import { batch } from "@trigger.dev/sdk";
 import { myOtherTask } from "~/trigger/my-other-task";
 
 export const myTask = task({
@@ -310,7 +275,7 @@ export const myTask = task({
 You can also pass in options for each run in the batch:
 
 ```ts /trigger/my-task.ts
-import { batch } from "@trigger.dev/sdk/v3";
+import { batch } from "@trigger.dev/sdk";
 import { myOtherTask } from "~/trigger/my-other-task";
 
 export const myTask = task({
@@ -416,7 +381,7 @@ export const parentTask = task({
 You can also catch the error if the child task fails and get more information about the error:
 
 ```ts /trigger/parent.ts
-import { task, SubtaskUnwrapError } from "@trigger.dev/sdk/v3";
+import { task, SubtaskUnwrapError } from "@trigger.dev/sdk";
 export const parentTask = task({
   id: "parent-task",
   run: async (payload: string) => {
@@ -565,7 +530,7 @@ export const batchParentTask = task({
 You can batch trigger multiple different tasks and wait for all the results:
 
 ```ts /trigger/batch.ts
-import { batch, task } from "@trigger.dev/sdk/v3";
+import { batch, task } from "@trigger.dev/sdk";
 
 export const parentTask = task({
   id: "parent-task",
@@ -576,7 +541,7 @@ export const parentTask = task({
       { id: "child-task-2", payload: { bar: 42 } }, // 👈 The payload is typed correctly based on the task `id`
     ]);
 
-    for (const result of results) {
+    for (const result of results.runs) {
       if (result.ok) {
         // 👇 Narrow the type of the result based on the taskIdentifier
         switch (result.taskIdentifier) {
@@ -614,7 +579,7 @@ export const childTask2 = task({
 You can batch trigger multiple different tasks by passing in the task instances. This function is especially useful when you have a static set of tasks you want to trigger:
 
 ```ts /trigger/batch.ts
-import { batch, task, runs } from "@trigger.dev/sdk/v3";
+import { batch, task, runs } from "@trigger.dev/sdk";
 
 export const parentTask = task({
   id: "parent-task",
@@ -650,7 +615,7 @@ export const childTask2 = task({
 You can batch trigger multiple different tasks by passing in the task instances, and wait for all the results. This function is especially useful when you have a static set of tasks you want to trigger:
 
 ```ts /trigger/batch.ts
-import { batch, task, runs } from "@trigger.dev/sdk/v3";
+import { batch, task, runs } from "@trigger.dev/sdk";
 
 export const parentTask = task({
   id: "parent-task",
@@ -704,7 +669,7 @@ export const childTask2 = task({
 ## Triggering from your frontend
 
 If you want to trigger a task directly from a frontend application, you can use our [React
-hooks](/frontend/react-hooks/triggering).
+hooks](/realtime/react-hooks/triggering).
 
 ## Options
 
@@ -742,13 +707,14 @@ Runs that are delayed and have not been enqueued yet will display in the dashboa
 
 <Note>
   Delayed runs will be enqueued at the time specified, and will run as soon as possible after that
-  time, just as a normally triggered run would.
+  time, just as a normally triggered run would. They execute on the currently deployed version when
+  they start, not the version that was active when they were enqueued.
 </Note>
 
 You can cancel a delayed run using the `runs.cancel` SDK function:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 await runs.cancel("run_1234");
 ```
@@ -756,7 +722,7 @@ await runs.cancel("run_1234");
 You can also reschedule a delayed run using the `runs.reschedule` SDK function:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 // The delay option here takes the same format as the trigger delay option
 await runs.reschedule("run_1234", { delay: "1h" });
@@ -768,6 +734,12 @@ The `delay` option is also available when using `batchTrigger`:
 await myTask.batchTrigger([{ payload: { some: "data" }, options: { delay: "1h" } }]);
 ```
 
+<Note>
+  If your payload contains Date objects, pass them directly rather than manually stringifying with
+  `JSON.stringify()`. The SDK handles Date serialization automatically. If you need to stringify
+  manually, convert Dates to ISO strings first (e.g., `date.toISOString()`).
+</Note>
+
 ### `ttl`
 
 You can set a TTL (time to live) when triggering a task, which will automatically expire the run if it hasn't started within the specified time. This is useful for ensuring that a run doesn't get stuck in the queue for too long.
@@ -813,7 +785,7 @@ For this reason, the `ttl` option only accepts durations and not absolute timest
 You can provide an `idempotencyKey` to ensure that a task is only triggered once with the same key. This is useful if you are triggering a task within another task that might be retried:
 
 ```typescript
-import { idempotencyKeys, task } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -845,7 +817,7 @@ For more information, see our [Idempotency](/idempotency) documentation.
 Idempotency keys automatically expire after 30 days, but you can set a custom TTL for an idempotency key when triggering a task:
 
 ```typescript
-import { idempotencyKeys, task } from "@trigger.dev/sdk/v3";
+import { idempotencyKeys, task } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -866,6 +838,144 @@ export const myTask = task({
 
 For more information, see our [Idempotency](/idempotency) documentation.
 
+### `debounce`
+
+You can debounce task triggers to consolidate multiple trigger calls into a single delayed run. When a run with the same debounce key already exists in the delayed state, subsequent triggers "push" the existing run's execution time later rather than creating new runs.
+
+This is useful for scenarios like:
+
+- Real-time document indexing where you want to wait for the user to finish typing
+- Aggregating webhook events from the same source
+- Rate limiting expensive operations while still processing the final request
+
+```ts
+// First trigger creates a new run, delayed by 5 seconds
+await myTask.trigger({ some: "data" }, { debounce: { key: "user-123", delay: "5s" } });
+
+// If triggered again within 5 seconds, the existing run is pushed later
+await myTask.trigger({ updated: "data" }, { debounce: { key: "user-123", delay: "5s" } });
+
+// The run only executes after 5 seconds of no new triggers
+// Note: The first payload is used (first trigger wins)
+```
+
+<Note>
+  Debounce keys are scoped to the task identifier, so different tasks can use the same key without
+  conflicts.
+</Note>
+
+The `debounce` option accepts:
+
+- `key` - A unique string to identify the debounce group (scoped to the task)
+- `delay` - Duration string specifying how long to delay. Supported units: `s` (seconds), `m` (minutes), `h`/`hr` (hours), `d` (days), `w` (weeks). Minimum is 1 second. Examples: `"5s"`, `"1m"`, `"2h30m"`
+- `mode` - Optional. Controls which trigger's data is used: `"leading"` (default) or `"trailing"`
+- `maxDelay` - Optional. Maximum total time from the first trigger before the run must execute. Uses the same duration format as `delay`
+
+**How it works:**
+
+1. First trigger with a debounce key creates a new delayed run
+2. Subsequent triggers with the same key (while the run is still delayed) push the execution time further
+3. Once no new triggers occur within the delay duration, the run executes
+4. After the run starts executing, a new trigger with the same key will create a new run
+
+**Limiting total delay with `maxDelay`:**
+
+By default, continuous triggers can delay execution indefinitely. The `maxDelay` option sets an upper bound on the total delay from the first trigger, ensuring the run eventually executes even with constant activity.
+
+```ts
+await summarizeChat.trigger(
+  { conversationId: "123" },
+  {
+    debounce: {
+      key: "conversation-123",
+      delay: "10s",    // Wait 10s after each message
+      maxDelay: "5m",  // But always run within 5 minutes of first trigger
+    },
+  }
+);
+```
+
+This is useful for scenarios like:
+
+- Summarizing AI chat threads that need periodic updates even during active conversations
+- Syncing data that should happen regularly despite continuous changes
+- Any case where you want debouncing but also guarantee timely execution
+
+**Timeline example with `maxDelay`:**
+
+Consider `delay: "5s"` and `maxDelay: "30s"` with triggers arriving every 2 seconds:
+
+| Time | Event | Result |
+| :--- | :--- | :--- |
+| 0s | Trigger 1 | Run A created, scheduled for 5s |
+| 2s | Trigger 2 | Run A rescheduled to 7s |
+| 4s | Trigger 3 | Run A rescheduled to 9s |
+| ... | ... | ... |
+| 26s | Trigger 14 | Run A rescheduled to 31s |
+| 28s | Trigger 15 | Would reschedule to 33s, but exceeds maxDelay (30s). Run A executes, Run B created |
+| 30s | Trigger 16 | Run B rescheduled to 35s |
+
+Without `maxDelay`, continuous triggers would prevent the run from ever executing. With `maxDelay: "30s"`, execution is guaranteed within 30 seconds of the first trigger.
+
+<Note>
+  The `maxDelay` value is evaluated from each trigger call, not stored with the original run. This
+  means if you pass different `maxDelay` values for the same debounce key, each trigger uses its own
+  `maxDelay` to check against the original run's creation time. For consistent behavior, use the
+  same `maxDelay` value for all triggers with the same debounce key.
+</Note>
+
+**Leading vs Trailing mode:**
+
+By default, debounce uses **leading mode** - the run executes with data from the **first** trigger.
+
+With **trailing mode**, each subsequent trigger updates the run's data (payload, metadata, tags, maxAttempts, maxDuration, and machine), so the run executes with data from the **last** trigger:
+
+```ts
+// Leading mode (default): runs with first payload
+await myTask.trigger({ count: 1 }, { debounce: { key: "user-123", delay: "5s" } });
+await myTask.trigger({ count: 2 }, { debounce: { key: "user-123", delay: "5s" } });
+// After 5 seconds, runs with { count: 1 }
+
+// Trailing mode: runs with last payload
+await myTask.trigger(
+  { count: 1 },
+  { debounce: { key: "user-123", delay: "5s", mode: "trailing" } }
+);
+await myTask.trigger(
+  { count: 2 },
+  { debounce: { key: "user-123", delay: "5s", mode: "trailing" } }
+);
+// After 5 seconds, runs with { count: 2 }
+```
+
+Use **trailing mode** when you want to process the most recent data, such as:
+
+- Saving the latest version of a document after edits stop
+- Processing the final state after a series of rapid updates
+
+**With `triggerAndWait`:**
+
+When using `triggerAndWait` with debounce, the parent run blocks on the existing debounced run if one exists:
+
+```ts
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload: string) => {
+    // Both will wait for the same run
+    const result = await childTask.triggerAndWait(
+      { data: payload },
+      { debounce: { key: "shared-key", delay: "3s" } }
+    );
+    return result;
+  },
+});
+```
+
+<Note>
+  Idempotency keys take precedence over debounce keys. If both are provided and an idempotency match
+  is found, it wins.
+</Note>
+
 ### `queue`
 
 When you trigger a task you can override the concurrency limit. This is really useful if you sometimes have high priority runs.
@@ -980,6 +1090,152 @@ View our [metadata doc](/runs/metadata) for more information.
 
 View our [maxDuration doc](/runs/max-duration) for more information.
 
+### `priority`
+
+View our [priority doc](/runs/priority) for more information.
+
+### `region`
+
+You can override the default region when you trigger a run:
+
+```ts
+await yourTask.trigger(payload, { region: "eu-central-1" });
+```
+
+If you don't specify a region it will use the default for your project. Go to the "Regions" page in the dashboard to see available regions or switch your default. Static IP addresses are also available on the Regions page for paid plans.
+
+The region is where your runs are executed, it does not change where the run payload, output, tags, logs, or are any other data is stored.
+
+### `machine`
+
+You can override the default machine preset when you trigger a run:
+
+```ts
+await yourTask.trigger(payload, { machine: "large-1x" });
+```
+
+If you don't specify a machine it will use the machine preset for your task (or the default for your project). For more information read [the machines guide](/machines).
+
+## Streaming batch triggering
+
+<Note>This feature is only available with SDK 4.3.1+</Note>
+
+For large batches, you can pass an `AsyncIterable` or `ReadableStream` instead of an array. This allows you to generate items on-demand without loading them all into memory upfront.
+
+```ts /trigger/my-task.ts
+import { task } from "@trigger.dev/sdk";
+import { myOtherTask } from "~/trigger/my-other-task";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload: { userIds: string[] }) => {
+    // Use an async generator to stream items
+    async function* generateItems() {
+      for (const userId of payload.userIds) {
+        yield { payload: { userId } };
+      }
+    }
+
+    const batchHandle = await myOtherTask.batchTrigger(generateItems());
+
+    return { batchId: batchHandle.batchId };
+  },
+});
+```
+
+This works with all batch trigger methods:
+
+- `yourTask.batchTrigger()`
+- `yourTask.batchTriggerAndWait()`
+- `batch.triggerByTask()`
+- `batch.triggerByTaskAndWait()`
+- `tasks.batchTrigger()`
+
+Streaming is especially useful when generating batches from database queries, API pagination, or
+file processing where you don't want to load all items into memory at once.
+
+## Handling batch trigger errors
+
+When batch triggering fails, the SDK throws a `BatchTriggerError` with properties that help you understand what went wrong and how to react:
+
+| Property | Type | Description |
+| :--- | :--- | :--- |
+| `isRateLimited` | `boolean` | `true` if the error was caused by rate limiting |
+| `retryAfterMs` | `number \| undefined` | Milliseconds until the rate limit resets |
+| `phase` | `"create" \| "stream"` | Which phase of batch creation failed |
+| `batchId` | `string \| undefined` | The batch ID if it was created before failure |
+| `itemCount` | `number` | Number of items attempted in the batch |
+| `cause` | `unknown` | The underlying error |
+
+### Detecting and handling rate limits
+
+When you hit [batch trigger rate limits](/limits#batch-trigger-rate-limits), you can detect this and implement retry logic:
+
+```ts Your backend
+import { tasks, BatchTriggerError } from "@trigger.dev/sdk";
+import type { myTask } from "~/trigger/myTask";
+
+async function triggerBatchWithRetry(items: { payload: { userId: string } }[], maxRetries = 3) {
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    try {
+      return await tasks.batchTrigger<typeof myTask>("my-task", items);
+    } catch (error) {
+      if (error instanceof BatchTriggerError && error.isRateLimited) {
+        // Rate limited - wait and retry
+        const waitMs = error.retryAfterMs ?? 10000;
+        console.log(`Rate limited. Waiting ${waitMs}ms before retry ${attempt + 1}/${maxRetries}`);
+        await new Promise((resolve) => setTimeout(resolve, waitMs));
+        continue;
+      }
+      // Not a rate limit error - rethrow
+      throw error;
+    }
+  }
+  throw new Error("Max retries exceeded");
+}
+```
+
+### Handling errors inside tasks
+
+When calling `batchTrigger` from inside another task, you can handle errors similarly:
+
+```ts /trigger/parent-task.ts
+import { task, BatchTriggerError } from "@trigger.dev/sdk";
+import { childTask } from "./child-task";
+
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload: { userIds: string[] }) => {
+    const items = payload.userIds.map((userId) => ({ payload: { userId } }));
+
+    try {
+      const batchHandle = await childTask.batchTrigger(items);
+      return { batchId: batchHandle.batchId };
+    } catch (error) {
+      if (error instanceof BatchTriggerError) {
+        // Log details about the failure
+        console.error("Batch trigger failed", {
+          message: error.message,
+          phase: error.phase,
+          itemCount: error.itemCount,
+          isRateLimited: error.isRateLimited,
+        });
+
+        if (error.isRateLimited) {
+          // You might want to re-throw to let the task retry naturally
+          throw error;
+        }
+      }
+      throw error;
+    }
+  },
+});
+```
+
+<Note>
+  For rate limit values and how the token bucket algorithm works, see [Batch trigger rate limits](/limits#batch-trigger-rate-limits).
+</Note>
+
 ## Large Payloads
 
 We recommend keeping your task payloads as small as possible. We currently have a hard limit on task payloads above 10MB.
@@ -989,7 +1245,7 @@ If your payload size is larger than 512KB, instead of saving the payload to the
 When your task runs, we automatically download the payload from the object store and pass it to your task function. We also will return to you a `payloadPresignedUrl` from the `runs.retrieve` SDK function so you can download the payload if needed:
 
 ```ts
-import { runs } from "@trigger.dev/sdk/v3";
+import { runs } from "@trigger.dev/sdk";
 
 const run = await runs.retrieve(handle);
 
@@ -1043,7 +1299,7 @@ const handle = await myTask.trigger({
 ```
 
 ```ts /trigger/myTasks.ts
-import { task } from "@trigger.dev/sdk/v3";
+import { task } from "@trigger.dev/sdk";
 
 export const myTask = task({
   id: "my-task",
@@ -1058,7 +1314,3 @@ export const myTask = task({
 ```
 
 </CodeGroup>
-
-### Batch Triggering
-
-When using triggering a batch, the total size of all payloads cannot exceed 1MB. This means if you are doing a batch of 100 runs, each payload should be less than 100KB. The max batch size is 500 runs.
diff --git a/docs/troubleshooting-alerts.mdx b/docs/troubleshooting-alerts.mdx
index b79ddb05cf4..1d4322201b3 100644
--- a/docs/troubleshooting-alerts.mdx
+++ b/docs/troubleshooting-alerts.mdx
@@ -42,7 +42,7 @@ For the alert webhooks you can use the SDK to parse them. Here is an example of
 
 ```ts
 import { ActionFunctionArgs, json } from "@remix-run/server-runtime";
-import { webhooks, WebhookError } from "@trigger.dev/sdk/v3";
+import { webhooks, WebhookError } from "@trigger.dev/sdk";
 
 export async function action({ request }: ActionFunctionArgs) {
   // Make sure this is a POST request
diff --git a/docs/troubleshooting.mdx b/docs/troubleshooting.mdx
index ca0acb0726a..bd612110e03 100644
--- a/docs/troubleshooting.mdx
+++ b/docs/troubleshooting.mdx
@@ -39,7 +39,7 @@ Ensure you have stopped your local dev server then locate the hidden `.trigger`
 If you see errors like this when running `trigger.dev dev`:
 
 ```
-Could not resolve "@trigger.dev/core/v3"
+Could not resolve "@trigger.dev/core"
 The Yarn Plug'n'Play manifest forbids importing "@trigger.dev/core" here because it's not listed as a dependency of this package
 ```
 
@@ -73,12 +73,16 @@ This happens because Docker Desktop left behind a config file that's still tryin
 
 Usually there will be some useful guidance below this message. If you can't figure out what's going wrong then join [our Discord](https://trigger.dev/discord) and create a Help forum post with a link to your deployment.
 
+### `resource_exhausted`
+
+If you see a `resource_exhausted` error during deploy, the build may have hit resource limits on our build infrastructure. Try our [native builder](https://trigger.dev/changelog/deployments-with-native-builds).
+
 ### `No loader is configured for ".node" files`
 
 This happens because `.node` files are native code and can't be bundled like other packages. To fix this, add your package to [`build.external`](/config/config-file#external) in the `trigger.config.ts` file like this:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -93,6 +97,10 @@ export default defineConfig({
 
 If you see this error, add pino (and any other associated packages) to your `external` build settings in your `trigger.config.ts` file. Learn more about the `external` setting in the [config docs](/config/config-file#external).
 
+### `Failed to index deployment` with `Column must be greater than or equal to 0, got -1`
+
+This can occur when using `runtime: "bun"` during the indexing phase (we load and execute your task files to discover exports). A short-term workaround is to [pnpm patch](https://pnpm.io/cli/patch) the `source-map` package. See [this GitHub issue](https://github.com/triggerdotdev/trigger.dev/issues/3045) for the patch details.
+
 ### `reactDOMServer.renderToPipeableStream is not a function` when using react-email
 
 If you see this error when using `@react-email/render`:
@@ -105,7 +113,7 @@ TypeError: reactDOMServer.renderToPipeableStream is not a function
 This happens because react-email packages have bundling conflicts with our build process. To fix this, add the react-email packages to your `external` build settings in your `trigger.config.ts` file:
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -118,7 +126,6 @@ export default defineConfig({
 
 <CorepackError />
 
-
 ## Project setup issues
 
 ### `The requested module 'node:events' does not provide an export named 'addAbortListener'`
@@ -152,6 +159,10 @@ Your code is deployed separately from the rest of your app(s) so you need to mak
 
 Prisma uses code generation to create the client from your schema file. This means you need to add a bit of config so we can generate this file before your tasks run: [Read the guide](/config/extensions/prismaExtension).
 
+### Database connection requires IPv4
+
+Trigger.dev currently only supports IPv4 database connections. If your database provider only provides an IPv6 connection string, you'll need to use an IPv4 address instead. [Upvote IPv6 support](https://triggerdev.featurebase.app/p/support-ipv6-database-connections).
+
 ### `Parallel waits are not supported`
 
 In the current version, you can't perform more that one "wait" in parallel.
@@ -172,16 +183,88 @@ The most common situation this happens is if you're using `Promise.all` around s
 
 Make sure that you always use `await` when you call `trigger`, `triggerAndWait`, `batchTrigger`, and `batchTriggerAndWait`. If you don't then it's likely the task(s) won't be triggered because the calling function process can be terminated before the networks calls are sent.
 
+### `COULD_NOT_FIND_EXECUTOR`
+
+If you see a `COULD_NOT_FIND_EXECUTOR` error when triggering a task, it may be caused by dynamically importing the child task. When tasks are dynamically imported, the executor may not be properly registered.
+
+Use a top-level import instead:
+
+```ts
+import { myChildTask } from "~/trigger/my-child-task";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload: string) => {
+    await myChildTask.trigger({ payload: "data" });
+  },
+});
+```
+
+Alternatively, use `tasks.trigger()` or `batch.triggerAndWait()` without importing the task:
+
+```ts
+import { batch } from "@trigger.dev/sdk";
+
+export const myTask = task({
+  id: "my-task",
+  run: async (payload: string) => {
+    await batch.triggerAndWait([{ id: "my-child-task", payload: "data" }]);
+  },
+});
+```
+
 ### Rate limit exceeded
 
 <RateLimitHitUseBatchTrigger />
 
 View the [rate limits](/limits) page for more information.
 
+### Runs waiting in queue due to concurrency limits
+
+If runs are staying in the `QUEUED` state for extended periods, check your concurrency usage in the dashboard. Review how many runs are `EXECUTING` or `DEQUEUED` (these count against limits) and check if any runs are stuck in `EXECUTING` state, as they may be blocking new runs.
+
+**Solutions:**
+
+- **Increase concurrency limits** - If you're on a paid plan, increase your environment concurrency limit via the dashboard
+- **Review queue concurrency limits** - Check if individual queues have restrictive `concurrencyLimit` settings
+- **Check for stuck runs** - See if stalled runs are blocking new executions
+
 ### `Crypto is not defined`
 
 This can happen in different situations, for example when using plain strings as idempotency keys. Support for `Crypto` without a special flag was added in Node `v19.0.0`. You will have to upgrade Node - we recommend even-numbered major releases, e.g. `v20` or `v22`. Alternatively, you can switch from plain strings to the `idempotencyKeys.create` SDK function. [Read the guide](/idempotency).
 
+### Task run stalled executing
+
+If you see a `TASK_RUN_STALLED_EXECUTING` error it means that we didn't receive a heartbeat from your task before the stall timeout. We automatically heartbeat runs every 30 seconds, and the heartbeat timeout is 5 minutes.
+
+<Note>
+
+If this was a dev run, then most likely the `trigger.dev dev` CLI was stopped, and it wasn't an issue with your code.
+
+</Note>
+
+These errors can happen when code inside your task is blocking the event loop for too long. The most likely cause would be an accidental infinite loop. It could also be a CPU-heavy operation that's blocking the event loop, like nested loops with very large arrays. We recommend reading the [Don't Block the Event Loop](https://nodejs.org/en/learn/asynchronous-work/dont-block-the-event-loop) guide from Node.js for common patterns that can cause this.
+
+If you are doing a continuous CPU-heavy task, then we recommend you try using our `heartbeats.yield` function to automatically yield to the event loop periodically:
+
+```ts
+import { heartbeats } from "@trigger.dev/sdk";
+
+// code inside your task
+for (const row of bigDataset) {
+  await heartbeats.yield(); // safe to call every iteration, we will only actually yield when we need to
+  process(row); // this is a synchronous operation
+}
+```
+
+<Note>
+
+You could also offload the CPU-heavy work to a Node.js worker thread, but this is more complex to setup currently. We are planning on adding support for this in the future.
+
+</Note>
+
+If the above doesn't work, then we recommend you try increasing the machine size of your task. See our [machines guide](/machines) for more information.
+
 ## Framework specific issues
 
 ### NestJS swallows all errors/exceptions
diff --git a/docs/upgrade-to-v4.mdx b/docs/upgrade-to-v4.mdx
deleted file mode 100644
index 528888b6f9b..00000000000
--- a/docs/upgrade-to-v4.mdx
+++ /dev/null
@@ -1,1177 +0,0 @@
----
-title: "Upgrading to v4"
-description: "What's new in v4, how to upgrade, and breaking changes."
----
-
-import NodeVersions from "/snippets/node-versions.mdx";
-
-## What's new in v4?
-
-[Read our blog post](https://trigger.dev/blog/v4-beta-launch) for an overview of the new features.
-
-### Node.js support
-
-<NodeVersions />
-
-### Wait tokens
-
-In addition to waiting for a specific duration, or waiting for a child task to complete, you can now create and wait for a token to be completed, giving you more flexibility and the ability to wait for arbitrary conditions. For example, you can send the token to a Slack channel, and only complete the token when the user has clicked an "Approve" button.
-
-To wait for a token, you need to first create one using the `wait.createToken` function:
-
-```ts
-import { wait } from "@trigger.dev/sdk";
-
-// Somewhere in your code, either your backend or inside a task
-const token = await wait.createToken({
-  timeout: "10m", // you can optionally specify a timeout for the token
-});
-
-await sendTokenToSlack(token.id);
-```
-
-Wait tokens are completed with a payload that you can specify when you complete the token:
-
-```ts
-// When the user clicks the "Approve" button, you can complete the token
-await wait.completeToken(tokenId, {
-  status: "approved",
-});
-```
-
-You can wait for the token using the token ID:
-
-```ts
-type ApprovalToken = {
-  status: "approved" | "rejected";
-};
-
-// Inside a task
-const result = await wait.forToken<ApprovalToken>(tokenId);
-
-if (result.ok) {
-  console.log("Token completed", result.output.status); // "approved" or "rejected"
-} else {
-  console.log("Token timed out", result.error);
-}
-```
-
-### Wait idempotency
-
-You can now pass an idempotency key to any wait function, allowing you to skip waits if the same idempotency key is used again. This can be useful if you want to skip waits when retrying a task, for example:
-
-```ts
-// Specify the idempotency key and TTL when creating a wait token
-const token = await wait.createToken({
-  idempotencyKey: "my-idempotency-key",
-  idempotencyKeyTTL: "1h",
-});
-
-// Specify the idempotency key and TTL when waiting for a duration:
-await wait.for({ seconds: 10 }, { idempotencyKey: "my-idempotency-key", idempotencyKeyTTL: "1h" });
-
-// Specify the idempotency key and TTL when waiting for a child task:
-await childTask.triggerAndWait(
-  { foo: "bar" },
-  {
-    idempotencyKey: "my-idempotency-key",
-    idempotencyKeyTTL: "1h",
-  }
-);
-```
-
-`idempotencyKeyTTL` allows you to specify how long the idempotency key should be valid for. The default is 30 days.
-
-### Priority
-
-You can now specify a priority when triggering a task. This allows you to prioritize certain tasks over others, and is useful if you want to ensure that certain tasks are executed before others.
-
-```ts
-await task.trigger({ foo: "bar" }, { priority: 1 });
-```
-
-The priority value is a time duration in seconds, which offsets the timestamp of the run in the queue. If you specify a priority of `10`, the run will win over runs with a priority of `0` that were triggered within the last 10 seconds. A more concrete example:
-
-```ts
-// Triggered at 12:00:00, into a queue with a large number of queued runs
-await task.trigger({ foo: "bar" }, { priority: 0 });
-// Triggered at 12:00:09, into the same queue
-await task.trigger({ foo: "bar" }, { priority: 10 });
-```
-
-In this case, the second run will be executed first, because it's priority moved it 1 second ahead of the first run.
-
-<Note>
-  We purposefully chose to use a time duration as the priority value instead of specifying priority
-  levels, because priority levels can cause "level starvation" where lower priority runs are never
-  executed because there are always higher priority runs in the queue.
-</Note>
-
-### Global lifecycle hooks
-
-We've added a new way to register global lifecycle hooks that are executed for all runs, regardless of the task. Previously, this was only possible in the `trigger.config.ts` file, but now you can register them anywhere in your codebase:
-
-```ts
-import { tasks } from "@trigger.dev/sdk";
-
-tasks.onStart(({ ctx, payload, task }) => {
-  console.log("Run started", ctx.run);
-});
-
-tasks.onSuccess(({ ctx, output }) => {
-  console.log("Run finished", ctx.run);
-});
-
-tasks.onFailure(({ ctx, error }) => {
-  console.log("Run failed", ctx.run);
-});
-```
-
-### `init.ts`
-
-If you create a `init.ts` file at the root of your trigger directory, it will be automatically loaded when a task is executed. This is useful if you want to register global lifecycle hooks, or initialize a database connection, etc.
-
-```ts init.ts
-import { tasks } from "@trigger.dev/sdk";
-
-tasks.onStart(({ ctx, payload, task }) => {
-  console.log("Run started", ctx.run);
-});
-```
-
-### onWait and onResume
-
-We've added two new lifecycle hooks that allow you to run code when a run is paused or resumed because of a wait:
-
-```ts
-export const myTask = task({
-  id: "my-task",
-  onWait: async ({ wait }) => {
-    console.log("Run paused", wait);
-  },
-  onResume: async ({ wait }) => {
-    console.log("Run resumed", wait);
-  },
-  run: async (payload: any, { ctx }) => {
-    console.log("Run started", ctx.run);
-
-    await wait.for({ seconds: 10 });
-
-    console.log("Run finished", ctx.run);
-  },
-});
-```
-
-### onComplete
-
-We've added a new lifecycle hook that is executed when a run completes, regardless of whether it succeeded or failed:
-
-```ts
-tasks.onComplete(({ ctx, result }) => {
-  if (result.ok) {
-    console.log("Run succeeded", result.data);
-  } else {
-    console.log("Run failed", result.error);
-  }
-});
-```
-
-### onCancel
-
-<Note>Available in v4.0.0-beta.12 and later.</Note>
-
-You can now define an `onCancel` hook that is called when a run is cancelled. This is useful if you want to clean up any resources that were allocated for the run.
-
-```ts
-tasks.onCancel(({ ctx, signal }) => {
-  console.log("Run cancelled", signal);
-});
-```
-
-You can use the `onCancel` hook along with the `signal` passed into the run function to interrupt a call to an external service, for example using the [streamText](https://ai-sdk.dev/docs/reference/ai-sdk-core/stream-text) function from the AI SDK:
-
-```ts
-import { logger, tasks, schemaTask } from "@trigger.dev/sdk";
-import { streamText } from "ai";
-import { z } from "zod";
-
-export const interruptibleChat = schemaTask({
-  id: "interruptible-chat",
-  description: "Chat with the AI",
-  schema: z.object({
-    prompt: z.string().describe("The prompt to chat with the AI"),
-  }),
-  run: async ({ prompt }, { signal }) => {
-    const chunks: TextStreamPart<{}>[] = [];
-
-    // 👇 This is a global onCancel hook, but it's inside of the run function
-    tasks.onCancel(async () => {
-      // We have access to the chunks here, and can save them to the database
-      await saveChunksToDatabase(chunks);
-    });
-
-    try {
-      const result = streamText({
-        model: getModel(),
-        prompt,
-        experimental_telemetry: {
-          isEnabled: true,
-        },
-        tools: {},
-        abortSignal: signal, // 👈 Pass the signal to the streamText function, which aborts with the run is cancelled
-        onChunk: ({ chunk }) => {
-          chunks.push(chunk);
-        },
-      });
-
-      const textParts = [];
-
-      for await (const part of result.textStream) {
-        textParts.push(part);
-      }
-
-      return textParts.join("");
-    } catch (error) {
-      if (error instanceof Error && error.name === "AbortError") {
-        // streamText will throw an AbortError if the signal is aborted, so we can handle it here
-      } else {
-        throw error;
-      }
-    }
-  },
-});
-```
-
-The `onCancel` hook can optionally wait for the `run` function to finish, and access the output of the run:
-
-```ts
-import { logger, task } from "@trigger.dev/sdk";
-import { setTimeout } from "node:timers/promises";
-
-export const cancelExampleTask = task({
-  id: "cancel-example",
-  // Signal will be aborted when the task is cancelled 👇
-  run: async (payload: { message: string }, { signal }) => {
-    try {
-      // We pass the signal to setTimeout to abort the timeout if the task is cancelled
-      await setTimeout(10_000, undefined, { signal });
-    } catch (error) {
-      // Ignore the abort error
-    }
-
-    // Do some more work here
-
-    return {
-      message: "Hello, world!",
-    };
-  },
-  onCancel: async ({ runPromise }) => {
-    // You can await the runPromise to get the output of the task
-    const output = await runPromise;
-  },
-});
-```
-
-<Note>
-  You will have up to 30 seconds to complete the `runPromise` in the `onCancel` hook. After that
-  point the process will be killed.
-</Note>
-
-### Improved middleware and locals
-
-Our task middleware system is now much more useful. Previously it only ran "around" the `run` function, but now we've hoisted it to the top level and it now runs before/after all the other hooks.
-
-We've also added a new `locals` API that allows you to share data between middleware and hooks.
-
-```ts db.ts
-import { locals } from "@trigger.dev/sdk";
-import { logger, tasks } from "@trigger.dev/sdk";
-
-// This would be type of your database client here
-const DbLocal = locals.create<{ connect: () => Promise<void>; disconnect: () => Promise<void> }>(
-  "db"
-);
-
-export function getDb() {
-  return locals.getOrThrow(DbLocal);
-}
-
-export function setDb(db: { connect: () => Promise<void> }) {
-  locals.set(DbLocal, db);
-}
-
-tasks.middleware("db", async ({ ctx, payload, next, task }) => {
-  // This would be your database client here
-  const db = locals.set(DbLocal, {
-    connect: async () => {
-      logger.info("Connecting to the database");
-    },
-    disconnect: async () => {
-      logger.info("Disconnecting from the database");
-    },
-  });
-
-  await db.connect();
-
-  await next();
-
-  await db.disconnect();
-});
-
-// Disconnect when the run is paused
-tasks.onWait("db", async ({ ctx, payload, task }) => {
-  const db = getDb();
-  await db.disconnect();
-});
-
-// Reconnect when the run is resumed
-tasks.onResume("db", async ({ ctx, payload, task }) => {
-  const db = getDb();
-  await db.connect();
-});
-```
-
-Now in your tasks `run` function and all your hooks (global or task specific) you can access the database client using `getDb()`:
-
-```ts
-import { getDb } from "./db";
-
-export const myTask = task({
-  run: async (payload: any, { ctx }) => {
-    const db = getDb();
-    await db.query("SELECT 1");
-  },
-});
-```
-
-### Hidden tasks
-
-Previously, you were required to export the task from a file in your trigger directory to be able to execute it. We've changed the way tasks are indexed and this requirement has been removed. So you can now just define a task without exporting it, and everything will still work:
-
-```ts trigger/my-task.ts
-import { task } from "@trigger.dev/sdk";
-
-const myTask = task({
-  run: async (payload: any, { ctx }) => {},
-});
-```
-
-You can use this to define "hidden" tasks that should only ever be triggered by other tasks in the same file:
-
-```ts trigger/my-task.ts
-import { task } from "@trigger.dev/sdk";
-
-const myTask = task({
-  run: async (payload: any, { ctx }) => {},
-});
-
-export const myTask2 = task({
-  run: async (payload: any, { ctx }) => {
-    await myTask.trigger(payload);
-  },
-});
-```
-
-Or you can create a package of reusable tasks that can be imported and used in your tasks, without having to re-export them:
-
-```ts trigger/my-task.ts
-import { task } from "@trigger.dev/sdk";
-import { sendToSlack } from "@repo/tasks";
-
-export const myTask = task({
-  run: async (payload: any, { ctx }) => {
-    await sendToSlack.trigger(payload);
-  },
-});
-```
-
-### useWaitToken
-
-We've added a new `useWaitToken` react hook that allows you to complete a wait token from a React component, using a Public Access Token.
-
-```ts backend.ts
-import { wait } from "@trigger.dev/sdk";
-
-// Somewhere in your code, you'll need to create the token and then pass the token ID and the public token to the frontend
-const token = await wait.createToken({
-  timeout: "10m",
-});
-
-return {
-  tokenId: token.id,
-  publicToken: token.publicAccessToken, // An automatically generated public access token that expires in 1 hour
-};
-```
-
-Now you can use the `useWaitToken` hook in your frontend code:
-
-```tsx frontend.tsx
-import { useWaitToken } from "@trigger.dev/react-hooks";
-
-export function MyComponent({ publicToken, tokenId }: { publicToken: string; tokenId: string }) {
-  const { complete } = useWaitToken(tokenId, {
-    accessToken: publicToken,
-  });
-
-  return <button onClick={() => complete({ foo: "bar" })}>Complete</button>;
-}
-```
-
-### `ai.tool`
-
-We've added a new `ai.tool` function that allows you to create an AI tool from an existing `schemaTask` to use with the Vercel [AI SDK](https://vercel.com/docs/ai-sdk):
-
-```ts
-import { ai } from "@trigger.dev/sdk/ai";
-import { schemaTask } from "@trigger.dev/sdk";
-import { z } from "zod";
-import { generateText } from "ai";
-
-const myToolTask = schemaTask({
-  id: "my-tool-task",
-  schema: z.object({
-    foo: z.string(),
-  }),
-  run: async (payload: any, { ctx }) => {},
-});
-
-const myTool = ai.tool(myToolTask);
-
-export const myAiTask = schemaTask({
-  id: "my-ai-task",
-  schema: z.object({
-    text: z.string(),
-  }),
-  run: async (payload, { ctx }) => {
-    const { text } = await generateText({
-      prompt: payload.text,
-      model: openai("gpt-4o"),
-      tools: {
-        myTool,
-      },
-    });
-  },
-});
-```
-
-You can also pass the `experimental_toToolResultContent` option to the `ai.tool` function to customize the content of the tool result:
-
-```ts
-import { openai } from "@ai-sdk/openai";
-import { Sandbox } from "@e2b/code-interpreter";
-import { ai } from "@trigger.dev/sdk/ai";
-import { schemaTask } from "@trigger.dev/sdk/v3";
-import { generateObject } from "ai";
-import { z } from "zod";
-
-const chartTask = schemaTask({
-  id: "chart",
-  description: "Generate a chart using natural language",
-  schema: z.object({
-    input: z.string().describe("The chart to generate"),
-  }),
-  run: async ({ input }) => {
-    const code = await generateObject({
-      model: openai("gpt-4o"),
-      schema: z.object({
-        code: z.string().describe("The Python code to execute"),
-      }),
-      system: `
-        You are a helpful assistant that can generate Python code to be executed in a sandbox, using matplotlib.pyplot.
-
-        For example: 
-        
-        import matplotlib.pyplot as plt
-        plt.plot([1, 2, 3, 4])
-        plt.ylabel('some numbers')
-        plt.show()
-        
-        Make sure the code ends with plt.show()
-      `,
-      prompt: input,
-    });
-
-    const sandbox = await Sandbox.create();
-
-    const execution = await sandbox.runCode(code.object.code);
-
-    const firstResult = execution.results[0];
-
-    if (firstResult.png) {
-      return {
-        chart: firstResult.png,
-      };
-    } else {
-      throw new Error("No chart generated");
-    }
-  },
-});
-
-// This is useful if you want to return an image from the tool
-export const chartTool = ai.tool(chartTask, {
-  experimental_toToolResultContent: (result) => {
-    return [
-      {
-        type: "image",
-        data: result.chart,
-        mimeType: "image/png",
-      },
-    ];
-  },
-});
-```
-
-You can also now get access to the current tool execution options inside the task run function using the `ai.currentToolOptions()` function:
-
-```ts
-import { ai } from "@trigger.dev/sdk/ai";
-import { schemaTask } from "@trigger.dev/sdk";
-import { z } from "zod";
-
-const myToolTask = schemaTask({
-  id: "my-tool-task",
-  schema: z.object({
-    foo: z.string(),
-  }),
-  run: async (payload, { ctx }) => {
-    const toolOptions = ai.currentToolOptions();
-    console.log(toolOptions);
-  },
-});
-
-export const myAiTask = ai.tool(myToolTask);
-```
-
-See the [AI SDK tool execution options docs](https://sdk.vercel.ai/docs/ai-sdk-core/tools-and-tool-calling#tool-execution-options) for more details on the tool execution options.
-
-<Note>
-  `ai.tool` is compatible with `schemaTask`'s defined with Zod and ArkType schemas, or any schemas
-  that implement a `.toJsonSchema()` function.
-</Note>
-
-## How to migrate to v4
-
-First read the deprecations, breaking changes, and known issues sections below.
-
-We recommend the following steps to migrate to v4:
-
-1. Install the v4 package.
-2. Run the `trigger dev` CLI command and test your tasks locally, fixing any breaking changes.
-3. Deploy to the staging environment and test your tasks in staging, fixing any breaking changes. (this step is optional, but highly recommended)
-4. Once you've verified that v4 is working as expected, you should deploy your application backend with the updated v4 package.
-5. Once you've deployed your application backend, you should deploy your tasks to the production environment.
-
-Note that between steps 4 and 5, runs triggered with the v4 package will continue using v3, and only new runs triggered after step 5 is complete will use v4.
-
-<Warning>
-  Once v4 is activated in your environment, there will be a period of time where old runs will
-  continue to execute using v3, while new runs will use v4. Because these engines use completely
-  different underlying queues and concurrency models, it's possible you may have up to double the
-  amount of concurrently executing runs. Once the runs drain from the old run engine, the
-  concurrency will return to normal.
-</Warning>
-
-## Installation
-
-To opt-in to using v4, you will need to update your dependencies to the latest version of the `v4-beta` tag.
-
-<CodeGroup>
-
-```bash npm
-npm add @trigger.dev/sdk@v4-beta -E
-```
-
-```bash yarn
-yarn add @trigger.dev/sdk@v4-beta -E
-```
-
-```bash pnpm
-pnpm add @trigger.dev/sdk@v4-beta -E
-```
-
-</CodeGroup>
-
-<Note> You will need to do this for all your `@trigger.dev/*` packages. </Note>
-
-You'll also need to use the `v4-beta` version of the `trigger.dev` CLI package:
-
-<CodeGroup>
-
-```bash npx
-npx trigger.dev@v4-beta dev
-```
-
-```bash yarn
-yarn dlx trigger.dev@v4-beta dev
-```
-
-```bash pnpm
-pnpm dlx trigger.dev@v4-beta dev
-```
-
-</CodeGroup>
-
-## Known issues
-
-During the beta we will be tracking issues and releasing regular fixes.
-
-## Deprecations
-
-We've deprecated the following APIs:
-
-### @trigger.dev/sdk/v3
-
-We've deprecated the `@trigger.dev/sdk/v3` import path and moved to a new path:
-
-```ts
-// This still works, but will be removed in a future version
-import { task } from "@trigger.dev/sdk/v3";
-
-// This is the new path
-import { task } from "@trigger.dev/sdk";
-```
-
-### `handleError` and `init`
-
-We've renamed the `handleError` hook to `catchError` to better reflect that it can catch and react to errors. `handleError` will be removed in a future version.
-
-`init` was previously used to initialize data used in the run function:
-
-```ts
-import { task } from "@trigger.dev/sdk";
-
-const myTask = task({
-  init: async () => {
-    return {
-      myClient: new MyClient(),
-    };
-  },
-  run: async (payload: any, { ctx, init }) => {
-    const client = init.myClient;
-    await client.doSomething();
-  },
-});
-```
-
-This has now been deprecated in favor of the `locals` API and middleware. See the [Improved middleware and locals](#improved-middleware-and-locals) section for more details.
-
-### toolTask
-
-We've deprecated the `toolTask` function, which created both a Trigger.dev task and a tool compatible with the Vercel [AI SDK](https://vercel.com/docs/ai-sdk):
-
-```ts
-import { toolTask, schemaTask } from "@trigger.dev/sdk";
-import { z } from "zod";
-import { generateText } from "ai";
-
-const myToolTask = toolTask({
-  id: "my-tool-task",
-  run: async (payload: any, { ctx }) => {},
-});
-
-export const myAiTask = schemaTask({
-  id: "my-ai-task",
-  schema: z.object({
-    text: z.string(),
-  }),
-  run: async (payload, { ctx }) => {
-    const { text } = await generateText({
-      prompt: payload.text,
-      model: openai("gpt-4o"),
-      tools: {
-        myToolTask,
-      },
-    });
-  },
-});
-```
-
-We've replaced the `toolTask` function with the `ai.tool` function, which creates an AI tool from an existing `schemaTask`. See the [ai.tool](#ai-tool) section for more details.
-
-## Breaking changes
-
-### Queue changes
-
-Previously, it was possible to specify a queue name of a queue that did not exist, along with a concurrency limit. The queue would then be created "on-demand" with the specified concurrency limit. If the queue did exist, the concurrency limit of the queue would be updated to the specified value:
-
-```ts
-await myTask.trigger({ foo: "bar" }, { queue: { name: "my-queue", concurrencyLimit: 10 } });
-```
-
-This is no longer possible, and queues must now be defined ahead of time using the `queue` function:
-
-```ts
-import { queue } from "@trigger.dev/sdk";
-
-const myQueue = queue({
-  name: "my-queue",
-  concurrencyLimit: 10,
-});
-```
-
-Now when you trigger a task, you can only specify the queue by name:
-
-```ts
-await myTask.trigger({ foo: "bar" }, { queue: "my-queue" });
-```
-
-Or you can set the queue on the task:
-
-```ts
-import { queue, task } from "@trigger.dev/sdk";
-
-const myQueue = queue({
-  name: "my-queue",
-  concurrencyLimit: 10,
-});
-
-export const myTask = task({
-  id: "my-task",
-  queue: myQueue,
-  run: async (payload: any, { ctx }) => {},
-});
-
-// You can optionally specify the queue directly on the task
-export const myTask2 = task({
-  id: "my-task-2",
-  queue: {
-    name: "my-queue-2",
-    concurrencyLimit: 50,
-  },
-  run: async (payload: any, { ctx }) => {},
-});
-```
-
-Now you can trigger these tasks without having to specify the queue name in the trigger options:
-
-```ts
-await myTask.trigger({ foo: "bar" }); // Will use the queue defined on the task
-await myTask2.trigger({ foo: "bar" }); // Will use the queue defined on the task
-```
-
-### Concurrency changes
-
-We've changed a few things around how concurrency is managed at the environment and queue level:
-
-- Environment concurrency limits are now "burstable" above the base concurrency limit. The default burst factor is 2.0, meaning that the environment concurrency limit can be up to 2x the base concurrency limit. So if your base concurrency limit is 10, the environment concurrency limit can be up to 20.
-- Each individual queue has a maximum concurrency limit of the environment base concurrency limit, NOT the burstable limit. So if your base concurrency limit is 10, the queue concurrency limit can be up to 10. This means if you don't set the queue concurrency limit, it will default to the environment base concurrency limit.
-- The only time we "release" concurrency is when a run is checkpointed. This means that if you have a run that is waiting on a waitpoint, and the run is checkpointed, the concurrency will be released back into the queue, allowing other runs to execute/resume. We release the concurrency back to the queue and the environment.
-
-This means that if you have a queue with a `concurrencyLimit` of 1, you can only have exactly 1 run executing at a time, but you may have more than 1 run in the `WAITING` state that belongs to that queue. Runs are only transitioned to the `WAITING` state when they are waiting on a waitpoint and have been checkpointed.
-
-### New Run Statuses
-
-We've done some work cleaning up the run statuses. The new statuses are:
-
-- `PENDING_VERSION`: Task is waiting for a version update because it cannot execute without additional information (task, queue, etc.).
-- `QUEUED`: Task is waiting to be executed by a worker.
-- `DEQUEUED`: Task has been dequeued and is being sent to a worker to start executing.
-- `EXECUTING`: Task is currently being executed by a worker.
-- `WAITING`: Task has been paused by the system, and will be resumed by the system.
-- `COMPLETED`: Task has been completed successfully.
-- `CANCELED`: Task has been canceled by the user.
-- `FAILED`: Task has failed to complete, due to an error in the task code.
-- `CRASHED`: Task has crashed and won't be retried, most likely the worker ran out of resources, e.g. memory or storage.
-- `SYSTEM_FAILURE`: Task has failed to complete, due to an error in the system
-- `DELAYED`: Task has been scheduled to run at a specific time.
-- `EXPIRED`: Task has expired and won't be executed,
-- `TIMED_OUT`: Task has reached its maxDuration and has been stopped.
-
-We've removed the following statuses:
-
-- `WAITING_FOR_DEPLOY`: This is no longer used, and is replaced by `PENDING_VERSION`
-- `FROZEN`: This is no longer used, and is replaced by `WAITING`
-- `INTERRUPTED`: This is no longer used
-- `REATTEMPTING`: This is no longer used, and is replaced by `EXECUTING`
-
-We've also added "boolean" helpers to runs returned via the API and from Realtime:
-
-- `isQueued`: Returns true when the status is `QUEUED`, `PENDING_VERSION`, or `DELAYED`
-- `isExecuting`: Returns true when the status is `EXECUTING`, `DEQUEUED`. These count against your concurrency limits.
-- `isWaiting`: Returns true when the status is `WAITING`. These do not count against your concurrency limits.
-- `isCompleted`: Returns true when the status is any of the completed statuses.
-- `isCanceled`: Returns true when the status is `CANCELED`
-- `isFailed`: Returns true when the status is any of the failed statuses.
-- `isSuccess`: Returns true when the status is `COMPLETED`
-
-### Lifecycle hooks
-
-We've changed the function signatures of the lifecycle hooks to be more consistent and easier to use, by unifying all the parameters into a single object that can be destructured.
-
-Previously, hooks received a payload as the first argument and then an additional object as the second argument:
-
-```ts
-import { task } from "@trigger.dev/sdk";
-
-export const myTask = task({
-  id: "my-task",
-  onStart: (payload, { ctx }) => {},
-  run: async (payload, { ctx }) => {},
-});
-```
-
-Now, all the parameters are passed in a single object:
-
-```ts
-import { task } from "@trigger.dev/sdk";
-
-export const myTask = task({
-  id: "my-task",
-  onStart: ({ payload, ctx }) => {},
-  // The run function still uses separate parameters
-  run: async (payload, { ctx }) => {},
-});
-```
-
-This is true for all the lifecycle hooks:
-
-```ts
-import { task } from "@trigger.dev/sdk";
-
-export const myTask = task({
-  id: "my-task",
-  onStart: ({ payload, ctx, task }) => {},
-  onSuccess: ({ payload, ctx, task, output }) => {},
-  onFailure: ({ payload, ctx, task, error }) => {},
-  onWait: ({ payload, ctx, task, wait }) => {},
-  onResume: ({ payload, ctx, task, wait }) => {},
-  onComplete: ({ payload, ctx, task, result }) => {},
-  catchError: ({ payload, ctx, task, error, retry, retryAt, retryDelayInMs }) => {},
-  run: async (payload, { ctx }) => {},
-});
-```
-
-### Context changes
-
-We've made a few small changes to the `ctx` object:
-
-- `ctx.attempt.id` and `ctx.attempt.status` have been removed. `ctx.attempt.number` is still available.
-- `ctx.task.exportName` has been removed (since we no longer require tasks to be exported to be triggered).
-
-### BatchTrigger changes
-
-The `batchTrigger` function no longer returns a `runs` list directly. In v3, you could access the runs directly from the batch handle:
-
-```ts
-// In v3
-const batchHandle = await tasks.batchTrigger([
-  [myTask, { foo: "bar" }],
-  [myOtherTask, { baz: "qux" }],
-]);
-
-// You could access runs directly
-console.log(batchHandle.runs);
-```
-
-In v4, you now need to use the `runs.list()` method to get the list of runs:
-
-```ts
-// In v4
-const batchHandle = await tasks.batchTrigger([
-  [myTask, { foo: "bar" }],
-  [myOtherTask, { baz: "qux" }],
-]);
-
-// Now you need to call runs.list()
-const runs = await batchHandle.runs.list();
-console.log(runs);
-```
-
-## v4 beta Changelog
-
-<Update label="April 9, 2025" description="v4.0.0-beta.0">
-  [Trigger.dev v4
-  release](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.0).
-  Please see our upgrade to v4 docs to view the full changelog. Run Engine 2.0 (alpha)
-  ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575)), improved warm start times by
-  eagerly creating the child TaskRunProcess when a previous run as completed
-  ([#1879](https://github.com/triggerdotdev/trigger.dev/pull/1879)), and new lifecycle hooks
-  ([#1817](https://github.com/triggerdotdev/trigger.dev/pull/1817)).
-</Update>
-
-<Update label="April 11, 2025" description="v4.0.0-beta.1">
-  [Release
-  v4.0.0-beta.1](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.1).
-  Fixed init.ts in custom trigger dirs and init command now correctly installs v4-beta packages
-  ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914)). Updated nypm package to support
-  test-based bun.lock files and handle flush errors gracefully in dev
-  ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914)).
-</Update>
-
-<Update label="April 15, 2025" description="v4.0.0-beta.2">
-  [Release
-  v4.0.0-beta.2](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.2).
-  Managed run controller performance and reliability improvements
-  ([#1927](https://github.com/triggerdotdev/trigger.dev/pull/1927)).
-</Update>
-
-<Update label="April 16, 2025" description="v4.0.0-beta.3">
-  [Release
-  v4.0.0-beta.3](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.3).
-  Improved usage flushing ([#1931](https://github.com/triggerdotdev/trigger.dev/pull/1931)) and
-  fixed stalled run detection ([#1934](https://github.com/triggerdotdev/trigger.dev/pull/1934)).
-</Update>
-
-<Update label="April 17, 2025" description="v4.0.0-beta.5">
-  [Release
-  v4.0.0-beta.5](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.5).
-  Updated dependencies with various bug fixes and improvements.
-</Update>
-
-<Update label="April 18, 2025" description="v4.0.0-beta.6">
-  [Release
-  v4.0.0-beta.6](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.6).
-  The dev command now uses the platform-provided engine URL
-  ([#1949](https://github.com/triggerdotdev/trigger.dev/pull/1949)).
-</Update>
-
-<Update label="April 23, 2025" description="v4.0.0-beta.7">
-  [Release
-  v4.0.0-beta.7](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.7).
-  Fixed runLimiter check on dequeueRuns
-  ([#1953](https://github.com/triggerdotdev/trigger.dev/pull/1953)) and QUEUED status snapshot
-  handler ([#1963](https://github.com/triggerdotdev/trigger.dev/pull/1963)).
-</Update>
-
-<Update label="April 23, 2025" description="v4.0.0-beta.8">
-  [Release
-  v4.0.0-beta.8](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.8).
-  Prevented large outputs from overwriting each other
-  ([#1971](https://github.com/triggerdotdev/trigger.dev/pull/1971)).
-</Update>
-
-<Update label="April 25, 2025" description="v4.0.0-beta.9">
-  [Release
-  v4.0.0-beta.9](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.9).
-  Fixed default machine config indexing
-  ([#1979](https://github.com/triggerdotdev/trigger.dev/pull/1979)).
-</Update>
-
-<Update label="April 28, 2025" description="v4.0.0-beta.10">
-  [Release
-  v4.0.0-beta.10](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.10).
-  TriggerApiError 4xx errors no longer cause tasks to be retried
-  ([#1970](https://github.com/triggerdotdev/trigger.dev/pull/1970)). Fixed polling interval reset
-  bug that could create duplicate intervals, protected against unexpected attempt number changes,
-  and prevented run execution zombies after warm starts
-  ([#1987](https://github.com/triggerdotdev/trigger.dev/pull/1987)).
-</Update>
-
-<Update label="April 29, 2025" description="v4.0.0-beta.11">
-  [Release
-  v4.0.0-beta.11](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.11).
-  Updated dependencies with various bug fixes and improvements.
-</Update>
-
-<Update label="May 3, 2025" description="v4.0.0-beta.12">
-  [Release
-  v4.0.0-beta.12](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.12).
-  Display clickable links in Cursor terminal
-  ([#1998](https://github.com/triggerdotdev/trigger.dev/pull/1998)) and added AI assistance link
-  when you have build errors ([#1925](https://github.com/triggerdotdev/trigger.dev/pull/1925)).
-  Added validation when passing a directory to deploy command with helpful hints
-  ([#2013](https://github.com/triggerdotdev/trigger.dev/pull/2013)).
-</Update>
-
-<Update label="May 7, 2025" description="v4.0.0-beta.13">
-  [Release
-  v4.0.0-beta.13](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.13).
-  Correctly resolved waitpoints that come in early, ensured correct state before requesting
-  suspension, and fixed race conditions in snapshot processing
-  ([#2006](https://github.com/triggerdotdev/trigger.dev/pull/2006)). Always print full deploy logs
-  in CI ([#2006](https://github.com/triggerdotdev/trigger.dev/pull/2006)).
-</Update>
-
-<Update label="May 8, 2025" description="v4.0.0-beta.14">
-  [Release
-  v4.0.0-beta.14](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.14).
-  Updated dependencies with various bug fixes and improvements.
-</Update>
-
-<Update label="May 14, 2025" description="v4.0.0-beta.15">
-  [Release
-  v4.0.0-beta.15](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.15).
-  Added external log exporters and fixed missing external trace exporters in deployed tasks
-  ([#2038](https://github.com/triggerdotdev/trigger.dev/pull/2038)). Log images sizes for
-  self-hosted deploys ([#1764](https://github.com/triggerdotdev/trigger.dev/pull/1764)) and fixed
-  init.ts auto-import for deployed workers
-  ([#2041](https://github.com/triggerdotdev/trigger.dev/pull/2041)).
-</Update>
-
-<Update label="May 14, 2025" description="v4.0.0-beta.16">
-  [Release
-  v4.0.0-beta.16](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.16).
-  Fixed init.ts detection when using the sentry esbuild plugin
-  ([#2051](https://github.com/triggerdotdev/trigger.dev/pull/2051)).
-</Update>
-
-<Update label="May 22, 2025" description="v4.0.0-beta.17">
-  [Release
-  v4.0.0-beta.17](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.17).
-  Exposed esbuild `keepNames` ([#2091](https://github.com/triggerdotdev/trigger.dev/pull/2091)) and
-  `minify` options (experimental) ([#2091](https://github.com/triggerdotdev/trigger.dev/pull/2091)).
-  Added `experimental_autoDetectExternal` trigger config option
-  ([#2083](https://github.com/triggerdotdev/trigger.dev/pull/2083)) and output esbuild metafile,
-  which can be inspected after `deploy --dry run`
-  ([#2087](https://github.com/triggerdotdev/trigger.dev/pull/2087)).
-</Update>
-
-<Update label="May 22, 2025" description="v4.0.0-beta.18">
-  [Release
-  v4.0.0-beta.18](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.18).
-  Fixed dev runs ([#2094](https://github.com/triggerdotdev/trigger.dev/pull/2094)).
-</Update>
-
-<Update label="June 2, 2025" description="v4.0.0-beta.19">
-  [Release
-  v4.0.0-beta.19](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.19).
-  Added import timings and bundle size analysis - the dev command now warns about slow imports
-  ([#2114](https://github.com/triggerdotdev/trigger.dev/pull/2114)). Fixed metadata collapsing
-  correctness ([#2115](https://github.com/triggerdotdev/trigger.dev/pull/2115)), added support for
-  Preview branches in v4 projects ([#2086](https://github.com/triggerdotdev/trigger.dev/pull/2086)),
-  can now set project ref using the TRIGGER_PROJECT_REF env var
-  ([#2109](https://github.com/triggerdotdev/trigger.dev/pull/2109)), and fixed `syncEnvVars` for
-  non-preview deployments ([#2131](https://github.com/triggerdotdev/trigger.dev/pull/2131)).
-</Update>
-
-<Update label="June 3, 2025" description="v4.0.0-beta.20">
-  [Release
-  v4.0.0-beta.20](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.20).
-  Updated dependencies with various bug fixes and improvements.
-</Update>
-
-<Update label="June 6, 2025" description="v4.0.0-beta.21">
-  [Release
-  v4.0.0-beta.21](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.21).
-  Runtime agnostic SDK config via env vars
-  ([#2132](https://github.com/triggerdotdev/trigger.dev/pull/2132)) and fixed update command version
-  range handling ([#2153](https://github.com/triggerdotdev/trigger.dev/pull/2153)). Resolved issue
-  where CLI could get stuck during deploy finalization, unified local and remote build logic with
-  multi-platform build support, improved switch command which now accepts profile name as an
-  argument, registry configuration is now fully managed by the webapp, the deploy `--self-hosted`
-  flag is no longer required, and enhanced deployment error reporting and image digest retrieval
-  ([#2138](https://github.com/triggerdotdev/trigger.dev/pull/2138)). Updated profile switcher
-  ([#2150](https://github.com/triggerdotdev/trigger.dev/pull/2150)).
-</Update>
-
-<Update label="July 4, 2025" description="v4.0.0-beta.22">
-  [Release
-  v4.0.0-beta.22](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.22).
-  Fix update command version mismatch detection
-  ([#2199](https://github.com/triggerdotdev/trigger.dev/pull/2199)). Add project details to the
-  whoami command ([#2231](https://github.com/triggerdotdev/trigger.dev/pull/2231)). Serialize
-  metadata to prevent invalid metadata from breaking run completions
-  ([#2219](https://github.com/triggerdotdev/trigger.dev/pull/2219))
-
-This release also includes a new experimental `processKeepAlive` option, which allows you to
-keep the process alive after the run has completed for the next warm start, which makes warm starts even faster.
-
-Currently during a warm start, we still recreate the actual task run process between runs, leading to a completely fresh global environment for each run. This experimental option will keep the task run process alive between run executions, leading to even faster warm starts. This option is respected in both the `dev` CLI and in deployed tasks.
-
-To enable this option, add this to your `trigger.config.ts`:
-
-```ts
-import { defineConfig } from "@trigger.dev/sdk";
-
-export default defineConfig({
-  project: "<project ref>",
-  // This is false by default
-  experimental_processKeepAlive: true,
-  maxDuration: 60,
-});
-```
-
-You can also pass an object to `experimental_processKeepAlive` to provide more options:
-
-```ts
-import { defineConfig } from "@trigger.dev/sdk";
-
-export default defineConfig({
-  project: "<project ref>",
-  experimental_processKeepAlive: {
-    enabled: true,
-    // After 20 runs execute with a single process, we'll restart the process and start fresh
-    maxExecutionsPerProcess: 20,
-    // In dev, you can combine this option with setting a max pool size, giving you the ability to limit the number of processes created on your local dev machine. Has no effect on deployed tasks
-    devMaxPoolSize: 10,
-  },
-  maxDuration: 60,
-});
-```
-
-## Gotchas
-
-- Be careful with memory usage and memory leaks, as this will cause memory to persist across run executions.
-- It's possible different tasks get executed in the same persisted process.
-- If you configure any 3rd party SDKs globally using env vars for API keys, those SDKs will not change between runs. So if you change an env var between runs, the SDK will be "stale" and continue using the old env var value. Instead, you should initialize SDKs using env vars at runtime (in any of the lifecycle hooks or inside the `run` function of a task.
-- Cancelling a task will cause the task run process to be restarted. Exiting the process is the only reliable way to actually stop a running function from stopping.
-- This DOES NOT effect cold starts, warm starts only will be improved.
-
-We recommend enabling this option and testing in a staging or preview environment before trying it out in prod, as there could be unknown issues depending on what you are doing in your tasks. [#2183](https://github.com/triggerdotdev/trigger.dev/pull/2183)
-
-</Update>
-
-<Update label="July 18, 2025" description="v4.0.0-beta.23">
-  [Release
-  v4.0.0-beta.23](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.23).
-
-- fix: Logging large objects is now much more performant and uses less memory ([#2263](https://github.com/triggerdotdev/trigger.dev/pull/2263))
-- New internal idempotency implementation for trigger and batch trigger to prevent request retries from duplicating work ([#2256](https://github.com/triggerdotdev/trigger.dev/pull/2256))
-
-- Enhance deploy command output to better distinguish between local and remote builds ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
-- Fixes a bug that would allow processes that had OOM errors to be incorrectly reused when experimental_processKeepAlive was enabled ([#2261](https://github.com/triggerdotdev/trigger.dev/pull/2261))
-- Add runtime version detection for display in the dashboard ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
-- Update base images to latest compatible versions. The `node-22` runtime now uses v22.16.0 and `bun` uses the latest v1.2.18 release. The default `node` runtime is unchanged and points at v21.7.3. ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
-- Fail fast in CI when running deploy with missing `TRIGGER_ACCESS_TOKEN` and add useful error message with link to docs ([#2258](https://github.com/triggerdotdev/trigger.dev/pull/2258))
-
-</Update>
-
-<Update label="July 22, 2025" description="v4.0.0-beta.24">
-  [Release
-  v4.0.0-beta.24](https://github.com/triggerdotdev/trigger.dev/releases/tag/trigger.dev%404.0.0-v4-beta.24).
-
-- Removes the `releaseConcurrencyOnWaitpoint` option on queues and the `releaseConcurrency` option on various wait functions. Replaced with the following default behavior: ([#2284](https://github.com/triggerdotdev/trigger.dev/pull/2284))
-
-  - Concurrency is never released when a run is first blocked via a waitpoint, at either the env or queue level.
-  - Concurrency is always released when a run is checkpointed and shutdown, at both the env and queue level.
-
-  Additionally, environment concurrency limits now have a new "Burst Factor", defaulting to 2.0x. The "Burst Factor" allows the environment-wide concurrency limit to be higher than any individual queue's concurrency limit. For example, if you have an environment concurrency limit of 100, and a Burst Factor of 2.0x, then you can execute up to 200 runs concurrently, but any one task/queue can still only execute 100 runs concurrently.
-
-  We've done some work cleaning up the run statuses. The new statuses are:
-
-  - `PENDING_VERSION`: Task is waiting for a version update because it cannot execute without additional information (task, queue, etc.)
-  - `QUEUED`: Task is waiting to be executed by a worker
-  - `DEQUEUED`: Task has been dequeued and is being sent to a worker to start executing.
-  - `EXECUTING`: Task is currently being executed by a worker
-  - `WAITING`: Task has been paused by the system, and will be resumed by the system
-  - `COMPLETED`: Task has been completed successfully
-  - `CANCELED`: Task has been canceled by the user
-  - `FAILED`: Task has failed to complete, due to an error in the system
-  - `CRASHED`: Task has crashed and won't be retried, most likely the worker ran out of resources, e.g. memory or storage
-  - `SYSTEM_FAILURE`: Task has failed to complete, due to an error in the system
-  - `DELAYED`: Task has been scheduled to run at a specific time
-  - `EXPIRED`: Task has expired and won't be executed
-  - `TIMED_OUT`: Task has reached it's maxDuration and has been stopped
-
-  We've removed the following statuses:
-
-  - `WAITING_FOR_DEPLOY`: This is no longer used, and is replaced by `PENDING_VERSION`
-  - `FROZEN`: This is no longer used, and is replaced by `WAITING`
-  - `INTERRUPTED`: This is no longer used
-  - `REATTEMPTING`: This is no longer used, and is replaced by `EXECUTING`
-
-  We've also added "boolean" helpers to runs returned via the API and from Realtime:
-
-  - `isQueued`: Returns true when the status is `QUEUED`, `PENDING_VERSION`, or `DELAYED`
-  - `isExecuting`: Returns true when the status is `EXECUTING`, `DEQUEUED`. These count against your concurrency limits.
-  - `isWaiting`: Returns true when the status is `WAITING`. These do not count against your concurrency limits.
-  - `isCompleted`: Returns true when the status is any of the completed statuses.
-  - `isCanceled`: Returns true when the status is `CANCELED`
-  - `isFailed`: Returns true when the status is any of the failed statuses.
-  - `isSuccess`: Returns true when the status is `COMPLETED`
-
-  This change adds the ability to easily detect which runs are being counted against your concurrency limit by filtering for both `EXECUTING` or `DEQUEUED`.
-
-- Added runs.list filtering for queue and machine ([#2277](https://github.com/triggerdotdev/trigger.dev/pull/2277))
-
-</Update>
diff --git a/docs/upgrading-beta.mdx b/docs/upgrading-beta.mdx
index e5618f1cb5c..532526fc4d8 100644
--- a/docs/upgrading-beta.mdx
+++ b/docs/upgrading-beta.mdx
@@ -52,10 +52,10 @@ The new build system does not effect your trigger task files at all, so those ca
 
 ### `defineConfig`
 
-You should now import the `defineConfig` function from `@trigger.dev/sdk/v3` and export the config as the default export:
+You should now import the `defineConfig` function from `@trigger.dev/sdk` and export the config as the default export:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -71,7 +71,7 @@ The new build system will bundle all dependencies by default, so `dependenciesTo
 Now that all dependencies are bundled, there are some situations where bundling a dependency doesn't work, and needs to be made external (e.g. when a dependency includes a native module). You can now specify these dependencies as build externals in the `defineConfig` function:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   project: "<project ref>",
@@ -96,7 +96,7 @@ npm add @trigger.dev/build@latest -D
 Now you can import the `additionalFiles` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { additionalFiles } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -122,7 +122,7 @@ npm add @trigger.dev/build@latest -D
 Now you can import the `additionalPackages` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { additionalPackages } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -146,7 +146,7 @@ npm add @trigger.dev/build@latest -D
 Now you can import the `syncEnvVars` build extension and use it in your `trigger.config.ts` file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { syncEnvVars } from "@trigger.dev/build/extensions/core";
 
 export default defineConfig({
@@ -174,7 +174,7 @@ See the [syncEnvVars](/deploy-environment-variables#sync-env-vars-from-another-s
 If you make use of decorators in your code, and have enabled the `emitDecoratorMetadata` tsconfig compiler option, you'll need to enable this in the new build sytem using the `emitDecoratorMetadata` build extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
 
 export default defineConfig({
@@ -196,7 +196,7 @@ npm add @trigger.dev/build@latest -D
 Then you can import the `prismaExtension` build extension and use it in your `trigger.config.ts` file, passing in the path to your Prisma schema file:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
@@ -221,7 +221,7 @@ This will make sure that your prisma client is generated during the build proces
 If you want to also run migrations during the build process, you can pass in the `migrate` option:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
@@ -263,7 +263,7 @@ generator kysely {
 ```
 
 ```ts trigger.config.ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
 
 export default defineConfig({
@@ -286,7 +286,7 @@ export default defineConfig({
 Previously, we installed [Audio Waveform](https://github.com/bbc/audiowaveform) in the build image. That's been moved to a build extension:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
 
 export default defineConfig({
@@ -302,7 +302,7 @@ export default defineConfig({
 You can now add esbuild plugins to customize the build process using the `esbuildPlugin` build extension. The example below shows how to automatically upload sourcemaps to Sentry using their esbuild plugin:
 
 ```ts
-import { defineConfig } from "@trigger.dev/sdk/v3";
+import { defineConfig } from "@trigger.dev/sdk";
 import { esbuildPlugin } from "@trigger.dev/build/extensions";
 import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
 
diff --git a/docs/v3-openapi.yaml b/docs/v3-openapi.yaml
index b94280419b3..080c20ca0f7 100644
--- a/docs/v3-openapi.yaml
+++ b/docs/v3-openapi.yaml
@@ -43,7 +43,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const schedule = await schedules.create({
               task: 'my-task',
@@ -85,7 +85,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const allSchedules = await schedules.list();
 
@@ -120,7 +120,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const schedule = await schedules.retrieve(scheduleId);
 
@@ -163,7 +163,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const updatedSchedule = await schedules.update(scheduleId, {
               task: 'my-updated-task',
@@ -195,7 +195,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             await schedules.del(scheduleId);
 
@@ -229,7 +229,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const schedule = await schedules.deactivate(scheduleId);
 
@@ -263,7 +263,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const schedule = await schedules.activate(scheduleId);
 
@@ -292,7 +292,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { schedules } from "@trigger.dev/sdk/v3";
+            import { schedules } from "@trigger.dev/sdk";
 
             const { timezones } = await schedules.timezones();
 
@@ -356,7 +356,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { runs } from "@trigger.dev/sdk/v3";
+            import { runs } from "@trigger.dev/sdk";
 
             const handle = await runs.replay("run_1234");
 
@@ -431,7 +431,7 @@ paths:
         - lang: typescript
           label: Save metadata
           source: |-
-            import { metadata, task } from "@trigger.dev/sdk/v3";
+            import { metadata, task } from "@trigger.dev/sdk";
 
             export const myTask = task({
               id: "my-task",
@@ -501,10 +501,374 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { runs } from "@trigger.dev/sdk/v3";
+            import { runs } from "@trigger.dev/sdk";
 
             await runs.cancel("run_1234");
 
+  "/api/v1/deployments/{deploymentId}":
+    parameters:
+      - in: path
+        name: deploymentId
+        required: true
+        schema:
+          type: string
+        description: The deployment ID.
+    get:
+      operationId: get_deployment_v1
+      summary: Get deployment
+      description: Retrieve information about a specific deployment by its ID.
+      responses:
+        "200":
+          description: Successful request
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    description: The deployment ID
+                  status:
+                    type: string
+                    enum:
+                      [
+                        "PENDING",
+                        "INSTALLING",
+                        "BUILDING",
+                        "DEPLOYING",
+                        "DEPLOYED",
+                        "FAILED",
+                        "CANCELED",
+                        "TIMED_OUT",
+                      ]
+                    description: The current status of the deployment
+                  contentHash:
+                    type: string
+                    description: Hash of the deployment content
+                  shortCode:
+                    type: string
+                    description: The short code for the deployment
+                  version:
+                    type: string
+                    description: The deployment version (e.g., "20250228.1")
+                  imageReference:
+                    type: string
+                    nullable: true
+                    description: Reference to the deployment image
+                  imagePlatform:
+                    type: string
+                    description: Platform of the deployment image
+                  externalBuildData:
+                    type: object
+                    nullable: true
+                    description: External build data if applicable
+                  errorData:
+                    type: object
+                    nullable: true
+                    description: Error data if the deployment failed
+                  worker:
+                    type: object
+                    nullable: true
+                    description: Worker information if available
+                    properties:
+                      id:
+                        type: string
+                      version:
+                        type: string
+                      tasks:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            id:
+                              type: string
+                            slug:
+                              type: string
+                            filePath:
+                              type: string
+                            exportName:
+                              type: string
+        "401":
+          description: Unauthorized - Access token is missing or invalid
+        "404":
+          description: Deployment not found
+      tags:
+        - deployments
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            const response = await fetch(
+              `https://api.trigger.dev/api/v1/deployments/${deploymentId}`,
+              {
+                method: "GET",
+                headers: {
+                  "Authorization": `Bearer ${secretKey}`,
+                },
+              }
+            );
+            const deployment = await response.json();
+        - lang: curl
+          source: |-
+            curl -X GET "https://api.trigger.dev/api/v1/deployments/deployment_1234" \
+              -H "Authorization: Bearer tr_dev_1234"
+
+  "/api/v1/deployments/latest":
+    get:
+      operationId: get_latest_deployment_v1
+      summary: Get latest deployment
+      description: Retrieve information about the latest unmanaged deployment for the authenticated project.
+      responses:
+        "200":
+          description: Successful request
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    description: The deployment ID
+                  status:
+                    type: string
+                    enum:
+                      [
+                        "PENDING",
+                        "INSTALLING",
+                        "BUILDING",
+                        "DEPLOYING",
+                        "DEPLOYED",
+                        "FAILED",
+                        "CANCELED",
+                        "TIMED_OUT",
+                      ]
+                    description: The current status of the deployment
+                  contentHash:
+                    type: string
+                    description: Hash of the deployment content
+                  shortCode:
+                    type: string
+                    description: The short code for the deployment
+                  version:
+                    type: string
+                    description: The deployment version (e.g., "20250228.1")
+                  imageReference:
+                    type: string
+                    nullable: true
+                    description: Reference to the deployment image
+                  errorData:
+                    type: object
+                    nullable: true
+                    description: Error data if the deployment failed
+        "401":
+          description: Unauthorized - API key is missing or invalid
+        "404":
+          description: No deployment found
+      tags:
+        - deployments
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            const response = await fetch(
+              "https://api.trigger.dev/api/v1/deployments/latest",
+              {
+                method: "GET",
+                headers: {
+                  "Authorization": `Bearer ${secretKey}`,
+                },
+              }
+            );
+            const deployment = await response.json();
+        - lang: curl
+          source: |-
+            curl -X GET "https://api.trigger.dev/api/v1/deployments/latest" \
+              -H "Authorization: Bearer tr_dev_1234"
+
+  "/api/v1/deployments/{version}/promote":
+    parameters:
+      - in: path
+        name: version
+        required: true
+        schema:
+          type: string
+        description: The deployment version to promote (e.g., "20250228.1").
+    post:
+      operationId: promote_deployment_v1
+      summary: Promote deployment
+      description: Promote a previously deployed version to be the current version for the environment. This makes the specified version active for new task runs.
+      responses:
+        "200":
+          description: Deployment promoted successfully
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    description: The deployment ID
+                  version:
+                    type: string
+                    description: The deployment version (e.g., "20250228.1")
+                  shortCode:
+                    type: string
+                    description: The short code for the deployment
+        "400":
+          description: Invalid request
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+        "401":
+          description: Unauthorized - API key is missing or invalid
+        "404":
+          description: Deployment not found
+      tags:
+        - deployments
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            const response = await fetch(
+              `https://api.trigger.dev/api/v1/deployments/${version}/promote`,
+              {
+                method: "POST",
+                headers: {
+                  "Authorization": `Bearer ${secretKey}`,
+                  "Content-Type": "application/json",
+                },
+              }
+            );
+            const result = await response.json();
+        - lang: curl
+          source: |-
+            curl -X POST "https://api.trigger.dev/api/v1/deployments/20250228.1/promote" \
+              -H "Authorization: Bearer tr_dev_1234" \
+              -H "Content-Type: application/json"
+
+  "/api/v1/query":
+    post:
+      operationId: execute_query_v1
+      summary: Execute a TRQL query
+      description: Execute a TRQL (Trigger.dev Query Language) query against your run data. TRQL is a SQL-style query language that allows you to analyze runs, calculate metrics, and export data.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              "$ref": "#/components/schemas/ExecuteQueryRequestBody"
+      responses:
+        "200":
+          description: Query executed successfully
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ExecuteQueryResponse"
+        "400":
+          description: Invalid query or request parameters
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+                    description: Error message describing the query error
+        "401":
+          description: Unauthorized - API key is missing or invalid
+        "500":
+          description: Internal server error during query execution
+      tags:
+        - query
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          label: SDK - Basic query
+          source: |-
+            import { query } from "@trigger.dev/sdk";
+
+            // Basic query with defaults (environment scope, json format)
+            const result = await query.execute(
+              "SELECT run_id, status FROM runs LIMIT 10"
+            );
+            console.log(result.results);
+        - lang: typescript
+          label: SDK - Type-safe query
+          source: |-
+            import { query, type QueryTable } from "@trigger.dev/sdk";
+
+            // Type-safe query using QueryTable
+            const result = await query.execute<
+              QueryTable<"runs", "run_id" | "status" | "triggered_at">
+            >(
+              "SELECT run_id, status, triggered_at FROM runs LIMIT 10"
+            );
+
+            result.results.forEach(row => {
+              console.log(row.run_id, row.status); // Fully typed!
+            });
+        - lang: typescript
+          label: SDK - With options
+          source: |-
+            import { query } from "@trigger.dev/sdk";
+
+            const result = await query.execute(
+              "SELECT COUNT(*) as count FROM runs WHERE status = 'Failed'",
+              {
+                scope: "project",       // Query across all environments
+                period: "7d",           // Last 7 days
+                format: "json"
+              }
+            );
+        - lang: typescript
+          label: SDK - CSV export
+          source: |-
+            import { query } from "@trigger.dev/sdk";
+
+            const csvResult = await query.execute(
+              "SELECT run_id, status, triggered_at FROM runs",
+              {
+                format: "csv",
+                period: "30d"
+              }
+            );
+
+            // csvResult.results is a CSV string
+            const lines = csvResult.results.split('\n');
+        - lang: curl
+          label: cURL - Basic query
+          source: |-
+            curl -X POST "https://api.trigger.dev/api/v1/query" \
+              -H "Authorization: Bearer tr_dev_1234" \
+              -H "Content-Type: application/json" \
+              -d '{
+                "query": "SELECT run_id, status FROM runs LIMIT 10",
+                "scope": "environment",
+                "period": "7d",
+                "format": "json"
+              }'
+        - lang: curl
+          label: cURL - Aggregation query
+          source: |-
+            curl -X POST "https://api.trigger.dev/api/v1/query" \
+              -H "Authorization: Bearer tr_dev_1234" \
+              -H "Content-Type: application/json" \
+              -d '{
+                "query": "SELECT task_identifier, count() as runs, countIf(status = '\''Failed'\'') as failures FROM runs GROUP BY task_identifier",
+                "scope": "environment",
+                "from": "2024-01-01T00:00:00Z",
+                "to": "2024-01-31T23:59:59Z",
+                "format": "json"
+              }'
+
   "/api/v1/runs/{runId}/reschedule":
     parameters:
       - $ref: "#/components/parameters/runId"
@@ -566,7 +930,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { runs } from "@trigger.dev/sdk/v3";
+            import { runs } from "@trigger.dev/sdk";
 
             const handle = await runs.reschedule("run_1234", { delay: new Date("2024-06-29T20:45:56.340Z") });
 
@@ -625,7 +989,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { runs } from "@trigger.dev/sdk/v3";
+            import { runs } from "@trigger.dev/sdk";
 
             const result = await runs.retrieve("run_1234");
 
@@ -680,7 +1044,7 @@ paths:
         - lang: typescript
           label: List runs
           source: |-
-            import { runs } from "@trigger.dev/sdk/v3";
+            import { runs } from "@trigger.dev/sdk";
 
             // Get the first page of runs
             let page = await runs.list({ limit: 20 });
@@ -704,7 +1068,7 @@ paths:
         - lang: typescript
           label: Filter runs
           source: |-
-            import { runs } from "@trigger.dev/sdk/v3";
+            import { runs } from "@trigger.dev/sdk";
 
             const response = await runs.list({
               status: ["QUEUED", "EXECUTING"],
@@ -750,7 +1114,7 @@ paths:
         - lang: typescript
           label: List runs
           source: |-
-            import { runs, configure } from "@trigger.dev/sdk/v3";
+            import { runs, configure } from "@trigger.dev/sdk";
 
             configure({
               accessToken: "tr_pat_1234" // always use an environment variable for this
@@ -778,7 +1142,7 @@ paths:
         - lang: typescript
           label: Filter runs
           source: |-
-            import { runs, configure } from "@trigger.dev/sdk/v3";
+            import { runs, configure } from "@trigger.dev/sdk";
 
             configure({
               accessToken: "tr_pat_1234" // always use an environment variable for this
@@ -838,7 +1202,7 @@ paths:
         - lang: typescript
           label: Outside of a task
           source: |-
-            import { envvars, configure } from "@trigger.dev/sdk/v3";
+            import { envvars, configure } from "@trigger.dev/sdk";
 
             const variables = await envvars.list("proj_yubjwjsfkxnylobaqvqz", "dev");
 
@@ -848,7 +1212,7 @@ paths:
         - lang: typescript
           label: Inside a task
           source: |-
-            import { envvars, task } from "@trigger.dev/sdk/v3";
+            import { envvars, task } from "@trigger.dev/sdk";
 
             export const myTask = task({
               id: "my-task",
@@ -911,7 +1275,7 @@ paths:
         - lang: typescript
           label: Outside of a task
           source: |-
-            import { envvars } from "@trigger.dev/sdk/v3";
+            import { envvars } from "@trigger.dev/sdk";
 
             await envvars.create("proj_yubjwjsfkxnylobaqvqz", "dev", {
               name: "SLACK_API_KEY",
@@ -920,7 +1284,7 @@ paths:
         - lang: typescript
           label: Inside a task
           source: |-
-            import { envvars, task } from "@trigger.dev/sdk/v3";
+            import { envvars, task } from "@trigger.dev/sdk";
 
             export const myTask = task({
               id: "my-task",
@@ -998,7 +1362,7 @@ paths:
         - lang: typescript
           label: Import variables from an array
           source: |-
-            import { envvars } from "@trigger.dev/sdk/v3";
+            import { envvars } from "@trigger.dev/sdk";
 
             await envvars.upload("proj_yubjwjsfkxnylobaqvqz", "dev", {
               variables: { SLACK_API_KEY: "slack_key_1234" },
@@ -1048,7 +1412,7 @@ paths:
         - lang: typescript
           label: Outside of a task
           source: |-
-            import { envvars } from "@trigger.dev/sdk/v3";
+            import { envvars } from "@trigger.dev/sdk";
 
             const variable = await envvars.retrieve("proj_yubjwjsfkxnylobaqvqz", "dev", "SLACK_API_KEY");
 
@@ -1056,7 +1420,7 @@ paths:
         - lang: typescript
           label: Inside a task
           source: |-
-            import { envvars, task } from "@trigger.dev/sdk/v3";
+            import { envvars, task } from "@trigger.dev/sdk";
 
             export const myTask = task({
               id: "my-task",
@@ -1106,13 +1470,13 @@ paths:
         - lang: typescript
           label: Outside of a task
           source: |-
-            import { envvars } from "@trigger.dev/sdk/v3";
+            import { envvars } from "@trigger.dev/sdk";
 
             await envvars.del("proj_yubjwjsfkxnylobaqvqz", "dev", "SLACK_API_KEY");
         - lang: typescript
           label: Inside a task
           source: |-
-            import { envvars, task } from "@trigger.dev/sdk/v3";
+            import { envvars, task } from "@trigger.dev/sdk";
 
             export const myTask = task({
               id: "my-task",
@@ -1165,7 +1529,7 @@ paths:
         - lang: typescript
           label: Outside of a task
           source: |-
-            import { envvars } from "@trigger.dev/sdk/v3";
+            import { envvars } from "@trigger.dev/sdk";
 
             await envvars.update("proj_yubjwjsfkxnylobaqvqz", "dev", "SLACK_API_KEY", {
               value: "slack_123456"
@@ -1173,7 +1537,7 @@ paths:
         - lang: typescript
           label: Inside a task
           source: |-
-            import { envvars, task } from "@trigger.dev/sdk/v3";
+            import { envvars, task } from "@trigger.dev/sdk";
 
             export const myTask = task({
               id: "my-task",
@@ -1229,7 +1593,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { task } from "@trigger.dev/sdk/v3";
+            import { task } from "@trigger.dev/sdk";
 
             export const myTask = await task({
               id: "my-task",
@@ -1301,7 +1665,7 @@ paths:
     post:
       operationId: batch_trigger_task_v1
       summary: Batch trigger tasks
-      description: Batch trigger tasks with up to 500 payloads.
+      description: Batch trigger tasks with up to 1,000 payloads with SDK 4.3.1+ (500 in prior versions).
       requestBody:
         required: true
         content:
@@ -1340,7 +1704,7 @@ paths:
       x-codeSamples:
         - lang: typescript
           source: |-
-            import { task } from "@trigger.dev/sdk/v3";
+            import { task } from "@trigger.dev/sdk";
 
             export const myTask = await task({
               id: "my-task",
@@ -1390,6 +1754,301 @@ paths:
                     ]
                   }'
 
+  "/api/v1/queues":
+    get:
+      operationId: list_queues_v1
+      summary: List all queues
+      description: List all queues in your environment with pagination support.
+      parameters:
+        - in: query
+          name: page
+          schema:
+            type: integer
+          required: false
+          description: Page number of the queue listing (1-based)
+        - in: query
+          name: perPage
+          schema:
+            type: integer
+          required: false
+          description: Number of queues per page
+      responses:
+        "200":
+          description: Successful request
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ListQueuesResult"
+        "401":
+          description: Unauthorized request
+      tags:
+        - queues
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            import { queues } from "@trigger.dev/sdk";
+
+            // List all queues
+            const allQueues = await queues.list();
+
+            // With pagination
+            const pagedQueues = await queues.list({
+              page: 1,
+              perPage: 20,
+            });
+
+  "/api/v1/queues/{queueParam}":
+    get:
+      operationId: retrieve_queue_v1
+      summary: Retrieve a queue
+      description: Get a queue by its ID, or by type and name.
+      parameters:
+        - in: path
+          name: queueParam
+          required: true
+          schema:
+            type: string
+          description: The queue ID (e.g., `queue_1234`), or the name of the queue when using the `type` query parameter.
+          example: queue_1234
+        - in: query
+          name: type
+          schema:
+            type: string
+            enum: [id, task, custom]
+            default: id
+          required: false
+          description: |
+            How to interpret the `queueParam` path parameter:
+            - `id`: Treat as a queue ID (default)
+            - `task`: Treat as a task ID to get the task's default queue
+            - `custom`: Treat as a custom queue name
+      responses:
+        "200":
+          description: Successful request
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/QueueObject"
+        "401":
+          description: Unauthorized request
+        "404":
+          description: Queue not found
+      tags:
+        - queues
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            import { queues } from "@trigger.dev/sdk";
+
+            // Using queue ID
+            const queue = await queues.retrieve("queue_1234");
+
+            // Using type and name for a task queue
+            const taskQueue = await queues.retrieve({
+              type: "task",
+              name: "my-task-id",
+            });
+
+            // Using type and name for a custom queue
+            const customQueue = await queues.retrieve({
+              type: "custom",
+              name: "my-custom-queue",
+            });
+
+  "/api/v1/queues/{queueParam}/pause":
+    post:
+      operationId: pause_queue_v1
+      summary: Pause or resume a queue
+      description: Pause a queue to prevent new runs from starting, or resume a paused queue. Runs that are currently executing will continue to completion.
+      parameters:
+        - in: path
+          name: queueParam
+          required: true
+          schema:
+            type: string
+          description: The queue ID (e.g., `queue_1234`), or the name of the queue when using the `type` body parameter.
+          example: queue_1234
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required: ["action"]
+              properties:
+                type:
+                  type: string
+                  enum: [id, task, custom]
+                  default: id
+                  description: |
+                    How to interpret the `queueParam` path parameter:
+                    - `id`: Treat as a queue ID (default)
+                    - `task`: Treat as a task ID to get the task's default queue
+                    - `custom`: Treat as a custom queue name
+                action:
+                  type: string
+                  enum: [pause, resume]
+                  description: Whether to pause or resume the queue
+      responses:
+        "200":
+          description: Queue paused or resumed successfully
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/QueueObject"
+        "400":
+          description: Invalid request parameters
+        "401":
+          description: Unauthorized request
+        "404":
+          description: Queue not found
+      tags:
+        - queues
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            import { queues } from "@trigger.dev/sdk";
+
+            // Pause a queue
+            await queues.pause("queue_1234");
+            await queues.pause({ type: "task", name: "my-task-id" });
+
+            // Resume a queue
+            await queues.resume("queue_1234");
+            await queues.resume({ type: "task", name: "my-task-id" });
+
+  "/api/v1/queues/{queueParam}/concurrency/override":
+    post:
+      operationId: override_queue_concurrency_v1
+      summary: Override queue concurrency limit
+      description: Override the concurrency limit of a queue. This is useful for temporarily scaling up or down based on demand.
+      parameters:
+        - in: path
+          name: queueParam
+          required: true
+          schema:
+            type: string
+          description: The queue ID (e.g., `queue_1234`), or the name of the queue when using the `type` body parameter.
+          example: queue_1234
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required: ["concurrencyLimit"]
+              properties:
+                type:
+                  type: string
+                  enum: [id, task, custom]
+                  default: id
+                  description: |
+                    How to interpret the `queueParam` path parameter:
+                    - `id`: Treat as a queue ID (default)
+                    - `task`: Treat as a task ID to get the task's default queue
+                    - `custom`: Treat as a custom queue name
+                concurrencyLimit:
+                  type: integer
+                  minimum: 0
+                  maximum: 100000
+                  description: The new concurrency limit to set for the queue
+      responses:
+        "200":
+          description: Concurrency limit overridden successfully
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/QueueObject"
+        "400":
+          description: Invalid request parameters
+        "401":
+          description: Unauthorized request
+        "404":
+          description: Queue not found
+      tags:
+        - queues
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            import { queues } from "@trigger.dev/sdk";
+
+            // Override concurrency limit to 5
+            await queues.overrideConcurrencyLimit("queue_1234", 5);
+
+            // Using type and name
+            await queues.overrideConcurrencyLimit(
+              { type: "task", name: "my-task-id" },
+              20
+            );
+
+  "/api/v1/queues/{queueParam}/concurrency/reset":
+    post:
+      operationId: reset_queue_concurrency_v1
+      summary: Reset queue concurrency limit
+      description: Reset the concurrency limit of a queue back to its base value defined in code.
+      parameters:
+        - in: path
+          name: queueParam
+          required: true
+          schema:
+            type: string
+          description: The queue ID (e.g., `queue_1234`), or the name of the queue when using the `type` body parameter.
+          example: queue_1234
+      requestBody:
+        required: false
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                type:
+                  type: string
+                  enum: [id, task, custom]
+                  default: id
+                  description: |
+                    How to interpret the `queueParam` path parameter:
+                    - `id`: Treat as a queue ID (default)
+                    - `task`: Treat as a task ID to get the task's default queue
+                    - `custom`: Treat as a custom queue name
+      responses:
+        "200":
+          description: Concurrency limit reset successfully
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/QueueObject"
+        "400":
+          description: Queue is not overridden or invalid request parameters
+        "401":
+          description: Unauthorized request
+        "404":
+          description: Queue not found
+      tags:
+        - queues
+      security:
+        - secretKey: []
+      x-codeSamples:
+        - lang: typescript
+          source: |-
+            import { queues } from "@trigger.dev/sdk";
+
+            // Reset concurrency limit to the base value
+            await queues.resetConcurrencyLimit("queue_1234");
+
+            // Using type and name
+            await queues.resetConcurrencyLimit({
+              type: "task",
+              name: "my-task-id",
+            });
+
 components:
   parameters:
     taskIdentifier:
@@ -1498,7 +2157,7 @@ components:
         Our TypeScript SDK will default to using the value of the `TRIGGER_SECRET_KEY` environment variable if it is set. If you are using the SDK in a different environment, you can set the key using the `configure` function.
 
         ```typescript
-        import { configure } from "@trigger.dev/sdk/v3";
+        import { configure } from "@trigger.dev/sdk";
 
         configure({ accessToken: "tr_dev_1234" });
         ```
@@ -1512,7 +2171,7 @@ components:
         Our TypeScript SDK will default to using the value of the `TRIGGER_ACCESS_TOKEN` environment variable if it is set. If you are using the SDK in a different environment, you can set the key using the `configure` function.
 
         ```typescript
-        import { configure } from "@trigger.dev/sdk/v3";
+        import { configure } from "@trigger.dev/sdk";
 
         configure({ accessToken: "tr_pat_1234" });
         ```
@@ -1535,6 +2194,97 @@ components:
           minimum: 0
           maximum: 1000
           description: An optional property that specifies the maximum number of concurrent run executions. If this property is omitted, the task can potentially use up the full concurrency of an environment.
+    QueueObject:
+      type: object
+      required: ["id", "name", "type", "running", "queued", "paused"]
+      properties:
+        id:
+          type: string
+          description: The queue ID, e.g., `queue_1234`
+          example: queue_1234
+        name:
+          type: string
+          description: The queue name. For task queues, this is the task ID. For custom queues, this is the name you specified.
+          example: my-task-id
+        type:
+          type: string
+          enum: [task, custom]
+          description: |
+            The type of queue:
+            - `task`: Created automatically for each task
+            - `custom`: Created explicitly in your code using `queue()`
+          example: task
+        running:
+          type: integer
+          description: The number of runs currently executing
+          example: 5
+        queued:
+          type: integer
+          description: The number of runs currently queued
+          example: 10
+        paused:
+          type: boolean
+          description: Whether the queue is paused. When paused, no new runs will start.
+          example: false
+        concurrencyLimit:
+          type: integer
+          nullable: true
+          description: The current concurrency limit of the queue
+          example: 10
+        concurrency:
+          type: object
+          description: Detailed concurrency information
+          properties:
+            current:
+              type: integer
+              nullable: true
+              description: The effective/current concurrency limit
+              example: 10
+            base:
+              type: integer
+              nullable: true
+              description: The base concurrency limit defined in code
+              example: 10
+            override:
+              type: integer
+              nullable: true
+              description: The override concurrency limit (if set)
+              example: null
+            overriddenAt:
+              type: string
+              format: date-time
+              nullable: true
+              description: When the concurrency limit was overridden
+              example: null
+            overriddenBy:
+              type: string
+              nullable: true
+              description: Who overrode the concurrency limit (null if via API)
+              example: null
+    ListQueuesResult:
+      type: object
+      required: ["data", "pagination"]
+      properties:
+        data:
+          type: array
+          items:
+            "$ref": "#/components/schemas/QueueObject"
+          description: An array of queue objects
+        pagination:
+          type: object
+          properties:
+            currentPage:
+              type: integer
+              description: The current page number
+              example: 1
+            totalPages:
+              type: integer
+              description: The total number of pages
+              example: 5
+            count:
+              type: integer
+              description: The total number of queues
+              example: 50
     BatchTriggerRequestBody:
       type: object
       properties:
@@ -1828,7 +2578,7 @@ components:
           example: ["user_5df987al13", "org_c6b7dycmxw"]
           items:
             type: string
-            description: A tag must be between 1 and 64 characters, a run can have up to 5 tags attached to it.
+            description: A tag must be between 1 and 128 characters, a run can have up to 10 tags attached to it.
         costInCents:
           type: number
           example: 0.00292
@@ -2005,7 +2755,7 @@ components:
           example: ["user_5df987al13", "org_c6b7dycmxw"]
           items:
             type: string
-            description: A tag must be between 1 and 64 characters, a run can have up to 5 tags attached to it.
+            description: A tag must be between 1 and 128 characters, a run can have up to 10 tags attached to it.
         metadata:
           type: object
           description: The metadata of the run. See [Metadata](/runs/metadata) for more information.
@@ -2717,3 +3467,61 @@ components:
         stackTrace:
           type: string
           example: "Error: Something went wrong"
+    ExecuteQueryRequestBody:
+      type: object
+      required:
+        - query
+      properties:
+        query:
+          type: string
+          description: The TRQL query to execute
+          example: "SELECT run_id, status, triggered_at FROM runs WHERE status = 'Failed' LIMIT 10"
+        scope:
+          type: string
+          enum: ["environment", "project", "organization"]
+          default: "environment"
+          description: The scope of data to query - environment (default), project, or organization
+        period:
+          type: string
+          nullable: true
+          description: Time period shorthand (e.g., "7d", "30d", "1h"). Cannot be used with from/to.
+          example: "7d"
+        from:
+          type: string
+          format: date-time
+          nullable: true
+          description: Start of time range as ISO 8601 timestamp. Must be used with 'to'.
+          example: "2024-01-01T00:00:00Z"
+        to:
+          type: string
+          format: date-time
+          nullable: true
+          description: End of time range as ISO 8601 timestamp. Must be used with 'from'.
+          example: "2024-01-31T23:59:59Z"
+        format:
+          type: string
+          enum: ["json", "csv"]
+          default: "json"
+          description: Response format - "json" returns structured data (default), "csv" returns CSV string
+    ExecuteQueryResponse:
+      oneOf:
+        - type: object
+          description: JSON format response
+          properties:
+            format:
+              type: string
+              enum: ["json"]
+            results:
+              type: array
+              items:
+                type: object
+              description: Array of result rows
+        - type: object
+          description: CSV format response
+          properties:
+            format:
+              type: string
+              enum: ["csv"]
+            results:
+              type: string
+              description: CSV-formatted results
diff --git a/docs/vercel-integration.mdx b/docs/vercel-integration.mdx
index 36b769c2328..6cc3b91b94e 100644
--- a/docs/vercel-integration.mdx
+++ b/docs/vercel-integration.mdx
@@ -1,8 +1,168 @@
 ---
 title: "Vercel integration"
-description: "When you deploy to Vercel, automatically deploy your associated tasks."
+description: "Automatically deploy your tasks whenever you deploy to Vercel."
 ---
 
-import ComingSoon from "/snippets/coming-soon-in-review.mdx"
+## How it works
 
-<ComingSoon />
+The Vercel integration connects your Vercel project to your Trigger.dev project so that every Vercel deployment automatically triggers a Trigger.dev deployment. It also syncs environment variables from Vercel into Trigger.dev and supports atomic deployments to keep your app and tasks in sync.
+
+This eliminates the need to manually run the `trigger.dev deploy` command or maintain custom CI/CD workflows for Vercel-based projects.
+
+<Note>
+  The Vercel integration requires the [GitHub integration](/github-integration) to be connected as
+  well, since Trigger.dev builds your tasks from your GitHub repository.
+</Note>
+
+## Installation
+
+You can connect Vercel from two entry points:
+
+### From the Trigger.dev dashboard
+
+<Steps>
+
+<Step title="Connect Vercel">
+  Go to your project's **Settings** page and click **Connect Vercel**. This will redirect you to
+  Vercel to authorize the Trigger.dev app.
+</Step>
+
+<Step title="Select a Vercel project">
+  Choose which Vercel project to connect to your Trigger.dev project.
+</Step>
+
+<Step title="Map environments">
+  If your Vercel project has custom environments, choose which one maps to your Trigger.dev staging
+  environment.
+</Step>
+
+<Step title="Sync environment variables">
+  Review the environment variables that will be pulled from Vercel into Trigger.dev. You can
+  deselect any variables you don't want to sync.
+</Step>
+
+<Step title="Configure build options">
+  Optionally adjust [build options](#build-options) for atomic deployments, env var pulling, and new
+  env var discovery.
+</Step>
+
+<Step title="Connect GitHub">
+  If your GitHub repository isn't already connected, you'll be prompted to connect it.
+</Step>
+
+</Steps>
+
+### From the Vercel Marketplace
+
+<Steps>
+
+<Step title="Install the integration">
+  Install the [Trigger.dev integration from the Vercel
+  Marketplace](https://vercel.com/marketplace/trigger). This will redirect you to Trigger.dev to
+  complete setup.
+</Step>
+
+<Step title="Select your Trigger.dev organization and project">
+  Choose which Trigger.dev organization and project to connect. If you're new to Trigger.dev, you'll
+  be guided through creating an organization and project.
+</Step>
+
+<Step title="Connect GitHub">
+  If your GitHub repository isn't already connected, you'll be prompted to connect it.
+</Step>
+
+</Steps>
+
+<Note>
+  When installing from the Vercel Marketplace, default Build options are applied automatically. You
+  can adjust them later in your project settings.
+</Note>
+
+<Warning>
+  **Vercel Root Directory:** If your Vercel project uses a **Root Directory** (e.g. you deploy a
+  single subfolder such as `app` or `web`), you may see "The specified Root Directory does not
+  exist" after connecting the integration. If you see this error, try using the **repository root**
+  (leave Root Directory empty) in your Vercel project settings. If your Vercel frontend build
+  requires a Root Directory (e.g. in a monorepo), keep that setting in Vercel and instead point
+  Trigger.dev to the subfolder by setting the **Trigger config file** path (and other [Build
+  options](#build-options)) in your Trigger.dev project configuration. Trigger.dev always builds
+  from the repo root.
+</Warning>
+
+## Environment variable sync
+
+The integration syncs environment variables in both directions:
+
+**Vercel → Trigger.dev**: Environment variables from your Vercel project are pulled into Trigger.dev. This happens during the initial setup and optionally before each build. Variables are synced per-environment (production, staging, preview).
+
+**Trigger.dev → Vercel**: Trigger.dev syncs API keys (like `TRIGGER_SECRET_KEY`) to your Vercel project so your app can communicate with Trigger.dev.
+
+The following variables are excluded from the Vercel → Trigger.dev sync:
+
+- `TRIGGER_SECRET_KEY`, `TRIGGER_VERSION`, `TRIGGER_PREVIEW_BRANCH` (managed by Trigger.dev)
+- Sensitive/secret-type variables (Vercel API limitation)
+
+You can control sync behavior per-variable from your project's Vercel settings. Deselecting a variable prevents its value from being updated during future syncs.
+
+<Tip>
+  For dynamic environment variables (e.g., from NeonDB branching), use the `syncEnvVars` build
+  extension instead. Learn more about [environment variables](/deploy-environment-variables).
+</Tip>
+
+## Atomic deployments
+
+Atomic deployments ensure your Vercel app and Trigger.dev tasks are deployed in sync. When enabled, Trigger.dev gates your Vercel deployment until the task build completes, then triggers a Vercel redeployment with the correct `TRIGGER_VERSION` set. This guarantees your app always uses the matching version of your tasks.
+
+Atomic deployments are enabled for the production environment by default.
+
+<Note>
+  When atomic deployments are enabled, the integration automatically disables `Auto-assign Custom
+  Production Domains` on your Vercel project. This is required so that Vercel doesn't promote a
+  deployment before the Trigger.dev build is ready.
+</Note>
+
+Previously, setting up atomic deployments with Vercel required custom GitHub Actions workflows. The Vercel integration automates this entirely. For more details on how atomic deployments work, see [Atomic deploys](/deployment/atomic-deployment).
+
+## Environment mapping
+
+The integration maps Vercel environments to Trigger.dev environments:
+
+| Vercel environment | Trigger.dev environment        |
+| ------------------ | ------------------------------ |
+| Production         | Production                     |
+| Custom environment | Staging (you choose which one) |
+| Preview            | Preview                        |
+| Development        | Development                    |
+
+If your Vercel project has a custom environment, you can select which one maps to your Trigger.dev staging environment during setup or in your project settings.
+
+<Note>
+  Preview deployments require the preview environment to be enabled on your project. Learn more
+  about [preview branches](/deployment/preview-branches).
+</Note>
+
+## Build options
+
+You can configure the following settings per-environment from your project's Vercel settings:
+
+- **Atomic deployments**: Controls whether Trigger.dev and Vercel deployments are synchronized. Enabled for production by default.
+- **Pull env vars before build**: When enabled, Trigger.dev pulls the latest environment variables from Vercel before each build. Enabled for production, staging, and preview by default.
+- **Discover new env vars**: When enabled, new environment variables found in Vercel that don't yet exist in Trigger.dev are created automatically during builds. Only available for environments that also have env var pulling enabled. Enabled for production, staging, and preview by default.
+
+To change build options that would normally go in `trigger.config.ts` (such as [extensions](/config/config-file#extensions) or other build configuration), use **Build options** on your project's configuration page in the Trigger.dev dashboard.
+
+## Disconnecting
+
+You can disconnect the Vercel integration from either side:
+
+- **From Trigger.dev**: Go to your project **Settings** and disconnect Vercel.
+- **From Vercel**: Uninstall the Trigger.dev integration from your Vercel dashboard. This is automatically detected and the connection is removed on the Trigger.dev side.
+
+Disconnecting stops automatic deployments, environment variable syncing, and deployment checks. Your existing deployments and environment variables are not affected.
+
+## Related
+
+- [GitHub integration](/github-integration)
+- [Atomic deploys](/deployment/atomic-deployment)
+- [Environment variables](/deploy-environment-variables)
+- [Preview branches](/deployment/preview-branches)
diff --git a/docs/versioning.mdx b/docs/versioning.mdx
index 1e6170a9da8..743e7c47485 100644
--- a/docs/versioning.mdx
+++ b/docs/versioning.mdx
@@ -24,6 +24,8 @@ Versions numbers are incremented each time a new version is created for that dat
 
 When a task run starts it is locked to the latest version of the code (for that environment). Once locked it won't change versions, even if you deploy new versions. This is to ensure that a task run is not affected by changes to the code.
 
+Delayed runs are locked to the version that's active when they begin executing, not when they're enqueued.
+
 ### Child tasks and version locking
 
 Trigger and wait functions version lock child task runs to the parent task run version. This ensures the results from child runs match what the parent task is expecting. If you don't wait then version locking doesn't apply.
diff --git a/docs/video-walkthrough.mdx b/docs/video-walkthrough.mdx
index f172860b30c..7da8e3f47ee 100644
--- a/docs/video-walkthrough.mdx
+++ b/docs/video-walkthrough.mdx
@@ -3,12 +3,21 @@ title: "Video walkthrough"
 description: "Go from zero to a working task in your Next.js app in 10 minutes."
 ---
 
-  <iframe width="100%" height="315" src="https://www.youtube.com/embed/YH_4c0K7fGM?si=5JzZmZseuqI5aciM" title="Trigger.dev walkthrough" allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerPolicy="strict-origin-when-cross-origin" allowFullScreen/>
+{" "}
+<iframe
+  width="100%"
+  height="315"
+  src="https://www.youtube.com/embed/YH_4c0K7fGM?si=5JzZmZseuqI5aciM"
+  title="Trigger.dev walkthrough"
+  allow="accelerometer; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+  referrerPolicy="strict-origin-when-cross-origin"
+  allowFullScreen
+/>
 
 ### In this video we cover the following topics:
 
 - [0:00](https://youtu.be/YH_4c0K7fGM?si=J8svVzotZtyTXDap&t=0) – [Install Trigger.dev](/quick-start) in an existing Next.js project
 - [1:44](https://youtu.be/YH_4c0K7fGM?si=J8svVzotZtyTXDap&t=104) – [Run and test](/run-tests) the "Hello, world!" example project
 - [2:09](https://youtu.be/YH_4c0K7fGM?si=FMTP8ep_cDBCU0_x&t=128) – Create and run an AI image generation task that uses [Fal.ai](https://fal.ai) – ([View the code](/guides/examples/fal-ai-image-to-cartoon))
-- [6:25](https://youtu.be/YH_4c0K7fGM?si=pPc8iLI2Y9FGD3yo&t=385) – Create and run a [Realtime](/realtime/overview) example using [React hooks](/frontend/react-hooks) – ([View the code](/guides/examples/fal-ai-realtime))
+- [6:25](https://youtu.be/YH_4c0K7fGM?si=pPc8iLI2Y9FGD3yo&t=385) – Create and run a [Realtime](/realtime/overview) example using [React hooks](/realtime/react-hooks) – ([View the code](/guides/examples/fal-ai-realtime))
 - [11:10](https://youtu.be/YH_4c0K7fGM?si=Mjd0EvvNsNlVouvY&t=670) – [Deploy your task](/cli-deploy) to the Trigger.dev Cloud
diff --git a/docs/wait-for-token.mdx b/docs/wait-for-token.mdx
index 8098243dfd6..98d7ec96e7d 100644
--- a/docs/wait-for-token.mdx
+++ b/docs/wait-for-token.mdx
@@ -1,17 +1,12 @@
 ---
 title: "Wait for token"
-description: "Wait until a token is completed."
-tag: "v4"
+description: "Wait until a token is completed using waitpoint tokens."
 ---
 
-import UpgradeToV4Note from "/snippets/upgrade-to-v4-note.mdx";
-
 Waitpoint tokens pause task runs until you complete the token. They're commonly used for approval workflows and other scenarios where you need to wait for external confirmation, such as human-in-the-loop processes.
 
 You can complete a token using the SDK or by making a POST request to the token's URL.
 
-<UpgradeToV4Note />
-
 ## Usage
 
 To get started using wait tokens, you need to first create a token using the `wait.createToken` function:
@@ -55,7 +50,7 @@ await wait.completeToken<ApprovalToken>(tokenId, {
 });
 ```
 
-Or you can make an HTTP POST request to the `url` it returns:
+Or you can make an HTTP POST request to the `url` it returns. This is an HTTP callback:
 
 ```ts
 import { wait } from "@trigger.dev/sdk";
@@ -125,7 +120,7 @@ The JSON body of the POST request will be used as the output of the token. If th
 
 <ParamField query="publicAccessToken" type="string">
   A Public Access Token that can be used to complete the token from a client-side application (or
-  another backend). See our [frontend docs](/frontend/overview) for more details.
+  another backend). See our [Realtime docs](/realtime/auth) for more details.
 </ParamField>
 
 ### Example
@@ -182,7 +177,7 @@ You can complete a token using a raw HTTP request or from another language.
 curl -X POST "https://api.trigger.dev/api/v1/waitpoints/tokens/{tokenId}/complete" \
   -H "Authorization: Bearer {token}" \
   -H "Content-Type: application/json" \
-  -d '{"output": { "status": "approved"}}'
+  -d '{"data": { "status": "approved"}}'
 ```
 
 ```python python
@@ -191,7 +186,7 @@ import requests
 response = requests.post(
   "https://api.trigger.dev/api/v1/waitpoints/tokens/{tokenId}/complete",
   headers={"Authorization": f"Bearer {token}"},
-  json={"output": { "status": "approved"}}
+  json={"data": { "status": "approved"}}
 )
 ```
 
@@ -204,7 +199,7 @@ http = Net::HTTP.new(uri.host, uri.port)
 request = Net::HTTP::Post.new(uri)
 request["Authorization"] = "Bearer {token}"
 request["Content-Type"] = "application/json"
-request.body = JSON.generate({ output: { status: "approved" } })
+request.body = JSON.generate({ data: { status: "approved" } })
 
 response = http.request(request)
 ```
@@ -223,7 +218,7 @@ func main() {
 	url := "https://api.trigger.dev/api/v1/waitpoints/tokens/{tokenId}/complete"
 
 	payload := map[string]interface{}{
-		"output": map[string]interface{}{
+		"data": map[string]interface{}{
 			"status": "approved",
 		},
 	}
@@ -268,24 +263,6 @@ Wait for a token to be completed.
   The token to wait for.
 </ParamField>
 
-<ParamField query="options" type="object" optional>
-  Options for the wait.
-
-  <Expandable title="properties">
-    <ParamField query="releaseConcurrency" type="boolean" optional>
-      If set to true, this will cause the waitpoint to release the current run from the queue's concurrency.
-
-      This is useful if you want to allow other runs to execute while waiting
-
-      Note: It's possible that this run will not be able to resume when the waitpoint is complete if this is set to true.
-      It will go back in the queue and will resume once concurrency becomes available.
-
-      The default is `false`.
-    </ParamField>
-
-  </Expandable>
-</ParamField>
-
 ### returns
 
 The `forToken` function returns a result object with the following properties:
@@ -496,3 +473,15 @@ const token = await wait.retrieveToken(tokenId);
 
 console.log(token);
 ```
+
+## Wait idempotency
+
+You can pass an idempotency key to any wait function, allowing you to skip waits if the same idempotency key is used again. This can be useful if you want to skip waits when retrying a task, for example:
+
+```ts
+// Specify the idempotency key and TTL when creating a wait token
+const token = await wait.createToken({
+  idempotencyKey: "my-idempotency-key",
+  idempotencyKeyTTL: "1h",
+});
+```
diff --git a/docs/wait-for.mdx b/docs/wait-for.mdx
index f8c1ea10c88..ab212f573e0 100644
--- a/docs/wait-for.mdx
+++ b/docs/wait-for.mdx
@@ -31,3 +31,12 @@ export const veryLongTask = task({
 This allows you to write linear code without having to worry about the complexity of scheduling or managing cron jobs.
 
 <PausedExecutionFree />
+
+## Wait idempotency
+
+You can pass an idempotency key to any wait function, allowing you to skip waits if the same idempotency key is used again. This can be useful if you want to skip waits when retrying a task, for example:
+
+```ts
+// Specify the idempotency key and TTL when waiting for a duration:
+await wait.for({ seconds: 10 }, { idempotencyKey: "my-idempotency-key", idempotencyKeyTTL: "1h" });
+```
\ No newline at end of file
diff --git a/docs/wait-until.mdx b/docs/wait-until.mdx
index adfb983b8a7..0fb641ec2eb 100644
--- a/docs/wait-until.mdx
+++ b/docs/wait-until.mdx
@@ -38,3 +38,16 @@ await wait.until({ date: new Date(date), throwIfInThePast: true });
 ```
 
 You can of course use try/catch if you want to do something special in this case.
+
+## Wait idempotency
+
+You can pass an idempotency key to any wait function, allowing you to skip waits if the same idempotency key is used again. This can be useful if you want to skip waits when retrying a task, for example:
+
+```ts
+// Specify the idempotency key and TTL when waiting until a date:
+await wait.until({
+  date: futureDate,
+  idempotencyKey: "my-idempotency-key",
+  idempotencyKeyTTL: "1h",
+});
+```
\ No newline at end of file
diff --git a/docs/writing-tasks-introduction.mdx b/docs/writing-tasks-introduction.mdx
index c296140ef8a..5f0bc330912 100644
--- a/docs/writing-tasks-introduction.mdx
+++ b/docs/writing-tasks-introduction.mdx
@@ -27,5 +27,7 @@ Before digging deeper into the details of writing tasks, you should read the [fu
 | [Usage](/run-usage)                          | Get compute duration and cost from inside a run, or for a specific block of code.                   |
 | [Context](/context)                          | Access the context of the task run.                                                                 |
 | [Bulk actions](/bulk-actions)                | Run actions on many task runs at once.                                                              |
+| [Priority](/runs/priority)                   | Specify a priority when triggering a task.                                                          |
+| [Hidden tasks](/hidden-tasks)                | Create tasks that are not exported from your trigger files but can still be executed.               |
 
 <ExamplesCards />
diff --git a/hosting/docker/.env.example b/hosting/docker/.env.example
index 1f50e5e7030..1fe7f6323f7 100644
--- a/hosting/docker/.env.example
+++ b/hosting/docker/.env.example
@@ -72,6 +72,9 @@ RUN_REPLICATION_CLICKHOUSE_URL=http://default:password@clickhouse:8123
 DOCKER_REGISTRY_URL=localhost:5000
 DOCKER_REGISTRY_USERNAME=registry-user
 DOCKER_REGISTRY_PASSWORD=very-secure-indeed
+# When using an external registry you will have to change this
+# On Docker Hub it should generally be the same as your username
+DOCKER_REGISTRY_NAMESPACE=trigger
 
 # Object store
 # - You need to log into the Minio dashboard and create a bucket called "packets" 
diff --git a/hosting/docker/webapp/docker-compose.yml b/hosting/docker/webapp/docker-compose.yml
index 5b3968d11f1..d246babf953 100644
--- a/hosting/docker/webapp/docker-compose.yml
+++ b/hosting/docker/webapp/docker-compose.yml
@@ -28,7 +28,13 @@ services:
     # Only needed for bootstrap
     command: sh -c "chown -R node:node /home/node/shared && exec ./scripts/entrypoint.sh"
     healthcheck:
-      test: ["CMD", "node", "-e", "http.get('http://localhost:3000/healthcheck', res => process.exit(res.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))"]
+      test:
+        [
+          "CMD",
+          "node",
+          "-e",
+          "http.get('http://localhost:3000/healthcheck', res => process.exit(res.statusCode === 200 ? 0 : 1)).on('error', () => process.exit(1))",
+        ]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -50,6 +56,7 @@ services:
       APP_LOG_LEVEL: info
       DEV_OTEL_EXPORTER_OTLP_ENDPOINT: ${DEV_OTEL_EXPORTER_OTLP_ENDPOINT:-http://localhost:8030/otel}
       DEPLOY_REGISTRY_HOST: ${DOCKER_REGISTRY_URL:-localhost:5000}
+      DEPLOY_REGISTRY_NAMESPACE: ${DOCKER_REGISTRY_NAMESPACE:-trigger}
       OBJECT_STORE_BASE_URL: ${OBJECT_STORE_BASE_URL:-http://minio:9000}
       OBJECT_STORE_ACCESS_KEY_ID: ${OBJECT_STORE_ACCESS_KEY_ID}
       OBJECT_STORE_SECRET_ACCESS_KEY: ${OBJECT_STORE_SECRET_ACCESS_KEY}
@@ -76,7 +83,6 @@ services:
       # DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT: 100
       # Internal OTEL configuration
       INTERNAL_OTEL_TRACE_LOGGING_ENABLED: ${INTERNAL_OTEL_TRACE_LOGGING_ENABLED:-0}
-      TRIGGER_CLI_TAG: ${TRIGGER_CLI_TAG:-v4-beta}
 
   postgres:
     image: postgres:${POSTGRES_IMAGE_TAG:-14}
@@ -120,7 +126,7 @@ services:
       start_period: 10s
 
   electric:
-    image: electricsql/electric:${ELECTRIC_IMAGE_TAG:-1.0.24}
+    image: electricsql/electric:${ELECTRIC_IMAGE_TAG:-1.2.4}
     restart: ${RESTART_POLICY:-unless-stopped}
     logging: *logging-config
     depends_on:
@@ -139,7 +145,7 @@ services:
       start_period: 10s
 
   clickhouse:
-    image: bitnami/clickhouse:${CLICKHOUSE_IMAGE_TAG:-latest}
+    image: bitnamilegacy/clickhouse:${CLICKHOUSE_IMAGE_TAG:-latest}
     restart: ${RESTART_POLICY:-unless-stopped}
     logging: *logging-config
     ports:
@@ -154,7 +160,21 @@ services:
     networks:
       - webapp
     healthcheck:
-      test: ["CMD", "clickhouse-client", "--host", "localhost", "--port", "9000", "--user", "default", "--password", "password", "--query", "SELECT 1"]
+      test:
+        [
+          "CMD",
+          "clickhouse-client",
+          "--host",
+          "localhost",
+          "--port",
+          "9000",
+          "--user",
+          "${CLICKHOUSE_USER:-default}",
+          "--password",
+          "${CLICKHOUSE_PASSWORD:-password}",
+          "--query",
+          "SELECT 1",
+        ]
       interval: 5s
       timeout: 5s
       retries: 5
@@ -183,7 +203,7 @@ services:
       start_period: 10s
 
   minio:
-    image: bitnami/minio:${MINIO_IMAGE_TAG:-latest}
+    image: bitnamilegacy/minio:${MINIO_IMAGE_TAG:-latest}
     restart: ${RESTART_POLICY:-unless-stopped}
     logging: *logging-config
     ports:
diff --git a/hosting/k8s/helm/Chart.yaml b/hosting/k8s/helm/Chart.yaml
index 0eb99f68f6c..155dc1bf771 100644
--- a/hosting/k8s/helm/Chart.yaml
+++ b/hosting/k8s/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: trigger
 description: The official Trigger.dev Helm chart
 type: application
-version: 4.0.0-beta.18
-appVersion: v4.0.0-v4-beta.23
+version: 4.0.5
+appVersion: v4.0.4
 home: https://trigger.dev
 sources:
   - https://github.com/triggerdotdev/trigger.dev
diff --git a/hosting/k8s/helm/README.md b/hosting/k8s/helm/README.md
index 17b8bfde701..4b54b52af76 100644
--- a/hosting/k8s/helm/README.md
+++ b/hosting/k8s/helm/README.md
@@ -52,7 +52,7 @@ Dashboard: http://localhost:3040/
 
 ```bash
 # The --push arg is required when testing locally
-npx trigger.dev@v4-beta deploy --push
+npx trigger.dev@latest deploy --push
 ```
 
 ## ⚠️ Security Requirements
@@ -537,7 +537,7 @@ kubectl port-forward svc/trigger.dev-webapp 3040:3030 --address 0.0.0.0
 2. **Database connection**: Check PostgreSQL is ready before webapp starts
 3. **Resource limits**: Increase limits for ClickHouse in constrained environments
 4. **Config not applying**: Use the pod restart technique above to force config reload
-5. **Image pull errors**: When testing locally, deploy with `npx trigger.dev@v4-beta deploy --push`
+5. **Image pull errors**: When testing locally, deploy with `npx trigger.dev@latest deploy --push`
 
 ## Examples
 
@@ -656,14 +656,16 @@ helm upgrade --install trigger . \
           cpu: 250m
           memory: 512Mi
   
+  # ClickHouse can be very resource intensive, so we recommend setting limits and requests accordingly
+  # Note: not doing this can cause OOM crashes which will cause issues across many different features
   clickhouse:
     resources:
       limits:
-        cpu: 1000m
-        memory: 2Gi
+        cpu: 4000m
+        memory: 16Gi
       requests:
-        cpu: 500m
-        memory: 1Gi
+        cpu: 2000m
+        memory: 8Gi
   
   supervisor:
     resources:
diff --git a/hosting/k8s/helm/templates/_helpers.tpl b/hosting/k8s/helm/templates/_helpers.tpl
index 6d2f5fdb57e..cb148678c92 100644
--- a/hosting/k8s/helm/templates/_helpers.tpl
+++ b/hosting/k8s/helm/templates/_helpers.tpl
@@ -95,6 +95,34 @@ Get the full image name for supervisor
 {{- end }}
 {{- end }}
 
+{{/*
+Get the full image name for webapp volumePermissions init container
+*/}}
+{{- define "trigger-v4.webapp.volumePermissions.image" -}}
+{{- $registry := .Values.global.imageRegistry | default .Values.webapp.volumePermissions.image.registry -}}
+{{- $repository := .Values.webapp.volumePermissions.image.repository -}}
+{{- $tag := .Values.webapp.volumePermissions.image.tag -}}
+{{- if $registry }}
+{{- printf "%s/%s:%s" $registry $repository $tag }}
+{{- else }}
+{{- printf "%s:%s" $repository $tag }}
+{{- end }}
+{{- end }}
+
+{{/*
+Get the full image name for webapp tokenSyncer sidecar
+*/}}
+{{- define "trigger-v4.webapp.tokenSyncer.image" -}}
+{{- $registry := .Values.global.imageRegistry | default .Values.webapp.tokenSyncer.image.registry -}}
+{{- $repository := .Values.webapp.tokenSyncer.image.repository -}}
+{{- $tag := .Values.webapp.tokenSyncer.image.tag -}}
+{{- if $registry }}
+{{- printf "%s/%s:%s" $registry $repository $tag }}
+{{- else }}
+{{- printf "%s:%s" $repository $tag }}
+{{- end }}
+{{- end }}
+
 {{/*
 PostgreSQL hostname (deprecated - used only for legacy DATABASE_HOST env var)
 */}}
diff --git a/hosting/k8s/helm/templates/supervisor.yaml b/hosting/k8s/helm/templates/supervisor.yaml
index 119c6281e70..6eaa1d0cd83 100644
--- a/hosting/k8s/helm/templates/supervisor.yaml
+++ b/hosting/k8s/helm/templates/supervisor.yaml
@@ -151,7 +151,7 @@ spec:
               {{- else }}
               value: {{ .Values.supervisor.bootstrap.workerToken.value | quote }}
               {{- end }}
-            {{- if .Values.secrets.enabled }}
+            {{- if or .Values.secrets.enabled .Values.secrets.existingSecret }}
             - name: MANAGED_WORKER_SECRET
               valueFrom:
                 secretKeyRef:
diff --git a/hosting/k8s/helm/templates/webapp.yaml b/hosting/k8s/helm/templates/webapp.yaml
index 9a0794ce69c..0dd1bddbc41 100644
--- a/hosting/k8s/helm/templates/webapp.yaml
+++ b/hosting/k8s/helm/templates/webapp.yaml
@@ -67,8 +67,9 @@ spec:
         {{- toYaml . | nindent 8 }}
         {{- end }}
       initContainers:
-        - name: init-shared
-          image: busybox:1.35
+        - name: volume-permissions
+          image: {{ include "trigger-v4.webapp.volumePermissions.image" . }}
+          imagePullPolicy: {{ .Values.webapp.volumePermissions.image.pullPolicy }}
           command: ['sh', '-c', 'mkdir -p /home/node/shared']
           securityContext:
             runAsUser: 1000
@@ -77,7 +78,8 @@ spec:
               mountPath: /home/node/shared
       containers:
         - name: token-syncer
-          image: bitnami/kubectl:1.28
+          image: {{ include "trigger-v4.webapp.tokenSyncer.image" . }}
+          imagePullPolicy: {{ .Values.webapp.tokenSyncer.image.pullPolicy }}
           securityContext:
             runAsUser: 1000
             runAsNonRoot: true
@@ -229,8 +231,6 @@ spec:
               value: {{ include "trigger-v4.s3.url" . | quote }}
             - name: GRACEFUL_SHUTDOWN_TIMEOUT
               value: {{ .Values.webapp.gracefulShutdownTimeout | quote }}
-            - name: TRIGGER_CLI_TAG
-              value: "v4-beta"
             {{- if .Values.webapp.bootstrap.enabled }}
             - name: TRIGGER_BOOTSTRAP_ENABLED
               value: "1"
@@ -263,7 +263,7 @@ spec:
             - name: DEFAULT_ORG_EXECUTION_CONCURRENCY_LIMIT
               value: {{ .Values.webapp.limits.defaultOrgExecutionConcurrencyLimit | quote }}
             {{- end }}
-            {{- if .Values.secrets.enabled }}
+            {{- if or .Values.secrets.enabled .Values.secrets.existingSecret }}
             - name: SESSION_SECRET
               valueFrom:
                 secretKeyRef:
@@ -421,6 +421,10 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.webapp.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- tpl (toYaml .) $ | nindent 8 }}
+      {{- end }}
 ---
 apiVersion: v1
 kind: Service
diff --git a/hosting/k8s/helm/values-production-example.yaml b/hosting/k8s/helm/values-production-example.yaml
index 0ba12be7124..65bdc0a6fc5 100644
--- a/hosting/k8s/helm/values-production-example.yaml
+++ b/hosting/k8s/helm/values-production-example.yaml
@@ -7,10 +7,6 @@ secrets:
   magicLinkSecret: "YOUR_32_CHAR_HEX_SECRET_HERE_002"
   encryptionKey: "YOUR_32_CHAR_HEX_SECRET_HERE_003"
   managedWorkerSecret: "YOUR_32_CHAR_HEX_SECRET_HERE_004"
-  # Object store credentials (customize for your setup)
-  objectStore:
-    accessKeyId: "your-access-key"
-    secretAccessKey: "your-secret-key"
 
 # Production webapp configuration
 webapp:
@@ -82,19 +78,24 @@ clickhouse:
     enabled: true
     size: 100Gi
     storageClass: "fast-ssd"
+  # ClickHouse can be very resource intensive, so we recommend setting limits and requests accordingly
+  # Note: not doing this can cause OOM crashes which will cause issues across many different
   resources:
     limits:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: 4000m
+      memory: 16Gi
     requests:
-      cpu: 500m
-      memory: 1Gi
+      cpu: 2000m
+      memory: 8Gi
 
 # Production S3-compatible object storage
 s3:
   auth:
     rootUser: "admin"
     rootPassword: "your-strong-s3-password"
+    # Webapp credentials for S3 access (can be different from root)
+    accessKeyId: "your-access-key"
+    secretAccessKey: "your-secret-key"
   persistence:
     enabled: true
     size: 500Gi
@@ -140,14 +141,22 @@ supervisor:
 # Example: Use external PostgreSQL instead
 # postgres:
 #   deploy: false
-#   external:
-#     host: "your-postgres-host.rds.amazonaws.com"
-#     port: 5432
-#     database: "trigger"
-#     username: "trigger_user"
-#     password: "your-db-password"
-#     schema: "public"
+#   connection:
 #     sslMode: "require"  # Use 'require' or 'verify-full' for production
+#   external:
+#     # Database URL configuration - simplified approach using URLs
+#     databaseUrl: "postgresql://trigger_user:your-db-password@your-postgres-host.rds.amazonaws.com:5432/trigger?schema=public&sslmode=require"
+#     directUrl: ""  # Optional: Direct URL for migrations (if not set, databaseUrl will be used)
+#     #
+#     # Optional: Connectivity check configuration during webapp startup
+#     connectivityCheck:
+#       host: "your-postgres-host.rds.amazonaws.com:5432"
+#     #
+#     # Secure credential management (recommended for production)
+#     # existingSecret: "postgres-credentials"  # Name of existing secret containing DATABASE_URL
+#     # secretKeys:
+#     #   databaseUrlKey: "postgres-database-url"  # Key in existing secret
+#     #   directUrlKey: "postgres-direct-url"  # Key in existing secret (optional)
 
 # Example: Use external Redis instead
 # redis:
@@ -155,7 +164,13 @@ supervisor:
 #   external:
 #     host: "your-redis-cluster.cache.amazonaws.com"
 #     port: 6379
-#     password: "your-redis-password"
+#     password: "your-redis-password"  # Optional - ignored if existingSecret is set
+#     tls:
+#       enabled: true  # Set to true for Redis instances requiring TLS (e.g., AWS ElastiCache)
+#     #
+#     # Secure credential management (recommended for production)
+#     # existingSecret: "redis-credentials"  # Name of existing secret containing password
+#     # existingSecretPasswordKey: "redis-password"  # Key in existing secret containing password
 
 # Example: Use external ClickHouse instead
 # clickhouse:
@@ -165,5 +180,22 @@ supervisor:
 #     httpPort: 8443  # Use 8443 for HTTPS
 #     nativePort: 9440  # Use 9440 for secure native connections
 #     username: "trigger_user"
-#     password: "your-clickhouse-password"
+#     password: "your-clickhouse-password"  # Optional - ignored if existingSecret is set
 #     secure: true  # Use true for TLS/secure connections
+#     #
+#     # Secure credential management (recommended for production)
+#     # existingSecret: "clickhouse-credentials"  # Name of existing secret containing password
+#     # existingSecretKey: "clickhouse-password"  # Key in existing secret containing password
+
+# Example: Use external S3-compatible storage instead
+# s3:
+#   deploy: false
+#   external:
+#     endpoint: "https://s3.amazonaws.com"  # or your S3-compatible endpoint
+#     accessKeyId: "your-access-key"
+#     secretAccessKey: "your-secret-key"
+#     #
+#     # Secure credential management (recommended for production)
+#     # existingSecret: "s3-credentials"  # Name of existing secret containing S3 credentials
+#     # existingSecretAccessKeyIdKey: "access-key-id"  # Key in existing secret containing access key ID
+#     # existingSecretSecretAccessKeyKey: "secret-access-key"  # Key in existing secret containing secret access key
diff --git a/hosting/k8s/helm/values.yaml b/hosting/k8s/helm/values.yaml
index cd87777709c..a8c1d2b302a 100644
--- a/hosting/k8s/helm/values.yaml
+++ b/hosting/k8s/helm/values.yaml
@@ -2,6 +2,9 @@ global:
   imageRegistry: ""
   imagePullSecrets: []
   storageClass: ""
+  security:
+    # Required when using bitnami legacy images
+    allowInsecureImages: true
 
 nameOverride: ""
 fullnameOverride: ""
@@ -45,6 +48,22 @@ webapp:
     tag: "" # Defaults to Chart.appVersion when empty
     pullPolicy: IfNotPresent
 
+  # Init container for shared directory setup
+  volumePermissions:
+    image:
+      registry: docker.io
+      repository: busybox
+      tag: "1.35"
+      pullPolicy: IfNotPresent
+
+  # Sidecar for token syncing
+  tokenSyncer:
+    image:
+      registry: docker.io
+      repository: bitnamilegacy/kubectl
+      tag: "1.28"
+      pullPolicy: IfNotPresent
+
   # Origin configuration
   appOrigin: "http://localhost:3040"
   loginOrigin: "http://localhost:3040"
@@ -69,6 +88,8 @@ webapp:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+  # Topology Spread Constraints for pod assignment spread across your cluster among failure-domains. Evaluated as a template
+  topologySpreadConstraints: []
 
   logLevel: "info"
   gracefulShutdownTimeout: 1000
@@ -373,6 +394,11 @@ worker:
 postgres:
   deploy: true
 
+  image:
+    # Use bitnami legacy repo
+    repository: bitnamilegacy/postgresql
+    # image: docker.io/bitnamilegacy/postgresql:17.5.0-debian-12-r12
+
   # Bitnami PostgreSQL chart configuration (when deploy: true)
   auth:
     enablePostgresUser: true
@@ -423,6 +449,11 @@ postgres:
 redis:
   deploy: true
 
+  image:
+    # Use bitnami legacy repo
+    repository: bitnamilegacy/redis
+    # image: docker.io/bitnamilegacy/redis:8.0.2-debian-12-r4
+
   # Bitnami Redis chart configuration (when deploy: true)
   auth:
     enabled: false
@@ -454,7 +485,7 @@ electric:
   image:
     registry: docker.io
     repository: electricsql/electric
-    tag: "1.0.24"
+    tag: "1.2.4"
     pullPolicy: IfNotPresent
   config:
     insecure: true
@@ -513,6 +544,11 @@ electric:
 clickhouse:
   deploy: true
 
+  image:
+    # Use bitnami legacy repo
+    repository: bitnamilegacy/clickhouse
+    # image: docker.io/bitnamilegacy/clickhouse:25.6.1-debian-12-r0
+
   # TLS/Secure connection configuration
   secure: false # Set to true to use HTTPS and secure connections
 
@@ -531,6 +567,12 @@ clickhouse:
   persistence:
     enabled: true
     size: 10Gi
+
+  ## ClickHouse resource requests and limits
+  ## ref: http://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/
+  ## @param resourcesPreset Set container resources according to one common preset (allowed values: none, nano, micro, small, medium, large, xlarge, 2xlarge). This is ignored if resources is set (resources is recommended for production).
+  ## More information: https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15
+  resourcesPreset: "xlarge"
   resources: {}
 
   # External ClickHouse connection (when deploy: false)
@@ -575,6 +617,17 @@ s3:
   # Set to true to deploy internal MinIO (default)
   deploy: true
 
+  image:
+    # Use bitnami legacy repo
+    repository: bitnamilegacy/minio
+    # image: docker.io/bitnamilegacy/minio:2025.6.13-debian-12-r0
+
+  # MinIO Console (Browser UI) configuration
+  console:
+    image:
+      repository: bitnamilegacy/minio-object-browser
+      # image: docker.io/bitnamilegacy/minio-object-browser:2025.1.10-debian-12-r1
+
   # Bitnami MinIO chart configuration (when deploy: true)
   # MinIO provides S3-compatible storage when deployed internally
   auth:
diff --git a/internal-packages/cache/README.md b/internal-packages/cache/README.md
new file mode 100644
index 00000000000..e0f344f7885
--- /dev/null
+++ b/internal-packages/cache/README.md
@@ -0,0 +1,3 @@
+# Redis
+
+This is a simple package that is used to return a valid Redis client and provides an error callback. It will log and swallow errors if they're not handled.
diff --git a/internal-packages/cache/package.json b/internal-packages/cache/package.json
new file mode 100644
index 00000000000..02ba86e1fd6
--- /dev/null
+++ b/internal-packages/cache/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@internal/cache",
+  "private": true,
+  "version": "0.0.1",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "type": "module",
+  "dependencies": {
+    "@internal/redis": "workspace:*",
+    "@trigger.dev/core": "workspace:*",
+    "@unkey/cache": "^1.5.0",
+    "@unkey/error": "^0.2.0",
+    "lru-cache": "^11.2.4",
+    "superjson": "^2.2.1"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "test": "vitest",
+    "test:watch": "vitest"
+  }
+}
\ No newline at end of file
diff --git a/internal-packages/cache/src/index.ts b/internal-packages/cache/src/index.ts
new file mode 100644
index 00000000000..c0064a08f0e
--- /dev/null
+++ b/internal-packages/cache/src/index.ts
@@ -0,0 +1,15 @@
+export {
+  createCache,
+  DefaultStatefulContext,
+  Namespace,
+  type Cache as UnkeyCache,
+  type CacheError,
+} from "@unkey/cache";
+export { type Result, Ok, Err } from "@unkey/error";
+export { RedisCacheStore } from "./stores/redis.js";
+export { createMemoryStore, type MemoryStore } from "./stores/memory.js";
+export {
+  LRUMemoryStore,
+  createLRUMemoryStore,
+  type LRUMemoryStoreConfig,
+} from "./stores/lruMemory.js";
diff --git a/internal-packages/cache/src/stores/lruMemory.test.ts b/internal-packages/cache/src/stores/lruMemory.test.ts
new file mode 100644
index 00000000000..7b9580a19ff
--- /dev/null
+++ b/internal-packages/cache/src/stores/lruMemory.test.ts
@@ -0,0 +1,333 @@
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import { LRUMemoryStore, createLRUMemoryStore } from "./lruMemory.js";
+import type { Entry } from "@unkey/cache/stores";
+
+function createEntry<T>(value: T, freshUntil: number, staleUntil: number): Entry<T> {
+  return { value, freshUntil, staleUntil };
+}
+
+describe("LRUMemoryStore", () => {
+  let store: LRUMemoryStore<string, string>;
+
+  beforeEach(() => {
+    store = new LRUMemoryStore({ max: 5, name: "test-store" });
+  });
+
+  describe("basic operations", () => {
+    it("should set and get a value", async () => {
+      const entry = createEntry("test-value", Date.now() + 60000, Date.now() + 120000);
+
+      const setResult = await store.set("ns", "key1", entry);
+      expect(setResult.err).toBeUndefined();
+
+      const getResult = await store.get("ns", "key1");
+      expect(getResult.err).toBeUndefined();
+      expect(getResult.val).toEqual(entry);
+    });
+
+    it("should return undefined for missing keys", async () => {
+      const result = await store.get("ns", "nonexistent");
+      expect(result.err).toBeUndefined();
+      expect(result.val).toBeUndefined();
+    });
+
+    it("should remove a single key", async () => {
+      const entry = createEntry("value", Date.now() + 60000, Date.now() + 120000);
+      await store.set("ns", "key1", entry);
+
+      const removeResult = await store.remove("ns", "key1");
+      expect(removeResult.err).toBeUndefined();
+
+      const getResult = await store.get("ns", "key1");
+      expect(getResult.val).toBeUndefined();
+    });
+
+    it("should remove multiple keys", async () => {
+      const entry = createEntry("value", Date.now() + 60000, Date.now() + 120000);
+      await store.set("ns", "key1", entry);
+      await store.set("ns", "key2", entry);
+      await store.set("ns", "key3", entry);
+
+      const removeResult = await store.remove("ns", ["key1", "key2"]);
+      expect(removeResult.err).toBeUndefined();
+
+      expect((await store.get("ns", "key1")).val).toBeUndefined();
+      expect((await store.get("ns", "key2")).val).toBeUndefined();
+      expect((await store.get("ns", "key3")).val).not.toBeUndefined();
+    });
+  });
+
+  describe("namespace isolation", () => {
+    it("should isolate keys by namespace", async () => {
+      const entry1 = createEntry("value1", Date.now() + 60000, Date.now() + 120000);
+      const entry2 = createEntry("value2", Date.now() + 60000, Date.now() + 120000);
+
+      await store.set("ns1", "key", entry1);
+      await store.set("ns2", "key", entry2);
+
+      const result1 = await store.get("ns1", "key");
+      const result2 = await store.get("ns2", "key");
+
+      expect(result1.val?.value).toBe("value1");
+      expect(result2.val?.value).toBe("value2");
+    });
+  });
+
+  describe("TTL expiration", () => {
+    it("should return undefined for expired entries (past staleUntil)", async () => {
+      const entry = createEntry("value", Date.now() - 2000, Date.now() - 1000); // Already expired
+
+      await store.set("ns", "expired-key", entry);
+
+      const result = await store.get("ns", "expired-key");
+      expect(result.val).toBeUndefined();
+    });
+
+    it("should return entry that is stale but not expired", async () => {
+      const now = Date.now();
+      // Fresh until 1 second ago, stale until 1 hour from now
+      const entry = createEntry("value", now - 1000, now + 3600000);
+
+      await store.set("ns", "stale-key", entry);
+
+      const result = await store.get("ns", "stale-key");
+      expect(result.val).not.toBeUndefined();
+      expect(result.val?.value).toBe("value");
+    });
+
+    it("should delete expired entry on get", async () => {
+      const entry = createEntry("value", Date.now() - 2000, Date.now() - 1000);
+      await store.set("ns", "key", entry);
+
+      // First get should return undefined and delete
+      await store.get("ns", "key");
+
+      // Size should reflect deletion
+      expect(store.size).toBe(0);
+    });
+  });
+
+  describe("LRU eviction", () => {
+    it("should evict least recently used items when at capacity", async () => {
+      const entry = (val: string) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Fill the cache (max: 5)
+      await store.set("ns", "key1", entry("value1"));
+      await store.set("ns", "key2", entry("value2"));
+      await store.set("ns", "key3", entry("value3"));
+      await store.set("ns", "key4", entry("value4"));
+      await store.set("ns", "key5", entry("value5"));
+
+      expect(store.size).toBe(5);
+
+      // Add one more - should evict key1 (least recently used)
+      await store.set("ns", "key6", entry("value6"));
+
+      expect(store.size).toBe(5);
+      expect((await store.get("ns", "key1")).val).toBeUndefined(); // Evicted
+      expect((await store.get("ns", "key6")).val?.value).toBe("value6"); // Present
+    });
+
+    it("should update LRU order on get", async () => {
+      const entry = (val: string) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Fill the cache
+      await store.set("ns", "key1", entry("value1"));
+      await store.set("ns", "key2", entry("value2"));
+      await store.set("ns", "key3", entry("value3"));
+      await store.set("ns", "key4", entry("value4"));
+      await store.set("ns", "key5", entry("value5"));
+
+      // Access key1 to make it recently used
+      await store.get("ns", "key1");
+
+      // Add new item - should evict key2 (now least recently used)
+      await store.set("ns", "key6", entry("value6"));
+
+      expect((await store.get("ns", "key1")).val?.value).toBe("value1"); // Still present
+      expect((await store.get("ns", "key2")).val).toBeUndefined(); // Evicted
+    });
+
+    it("should update LRU order on set (update existing)", async () => {
+      const entry = (val: string) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Fill the cache
+      await store.set("ns", "key1", entry("value1"));
+      await store.set("ns", "key2", entry("value2"));
+      await store.set("ns", "key3", entry("value3"));
+      await store.set("ns", "key4", entry("value4"));
+      await store.set("ns", "key5", entry("value5"));
+
+      // Update key1 to make it recently used
+      await store.set("ns", "key1", entry("updated-value1"));
+
+      // Add new item - should evict key2 (now least recently used)
+      await store.set("ns", "key6", entry("value6"));
+
+      expect((await store.get("ns", "key1")).val?.value).toBe("updated-value1");
+      expect((await store.get("ns", "key2")).val).toBeUndefined(); // Evicted
+    });
+  });
+
+  describe("hard limit enforcement", () => {
+    it("should never exceed max size regardless of write rate", async () => {
+      const smallStore = new LRUMemoryStore<string, number>({ max: 10 });
+      const entry = (val: number) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Write 1000 items rapidly
+      for (let i = 0; i < 1000; i++) {
+        await smallStore.set("ns", `key${i}`, entry(i));
+        // Verify size never exceeds max
+        expect(smallStore.size).toBeLessThanOrEqual(10);
+      }
+
+      expect(smallStore.size).toBe(10);
+    });
+
+    it("should maintain most recent items when at capacity", async () => {
+      const smallStore = new LRUMemoryStore<string, number>({ max: 3 });
+      const entry = (val: number) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Write items sequentially
+      await smallStore.set("ns", "key1", entry(1));
+      await smallStore.set("ns", "key2", entry(2));
+      await smallStore.set("ns", "key3", entry(3));
+      await smallStore.set("ns", "key4", entry(4));
+      await smallStore.set("ns", "key5", entry(5));
+
+      // Only the 3 most recent should remain
+      expect((await smallStore.get("ns", "key1")).val).toBeUndefined();
+      expect((await smallStore.get("ns", "key2")).val).toBeUndefined();
+      expect((await smallStore.get("ns", "key3")).val?.value).toBe(3);
+      expect((await smallStore.get("ns", "key4")).val?.value).toBe(4);
+      expect((await smallStore.get("ns", "key5")).val?.value).toBe(5);
+    });
+  });
+
+  describe("utility methods", () => {
+    it("should report correct size", async () => {
+      const entry = createEntry("value", Date.now() + 60000, Date.now() + 120000);
+
+      expect(store.size).toBe(0);
+
+      await store.set("ns", "key1", entry);
+      expect(store.size).toBe(1);
+
+      await store.set("ns", "key2", entry);
+      expect(store.size).toBe(2);
+
+      await store.remove("ns", "key1");
+      expect(store.size).toBe(1);
+    });
+
+    it("should clear all items", async () => {
+      const entry = createEntry("value", Date.now() + 60000, Date.now() + 120000);
+
+      await store.set("ns1", "key1", entry);
+      await store.set("ns2", "key2", entry);
+      await store.set("ns3", "key3", entry);
+
+      expect(store.size).toBe(3);
+
+      store.clear();
+
+      expect(store.size).toBe(0);
+      expect((await store.get("ns1", "key1")).val).toBeUndefined();
+    });
+
+    it("should use custom name", () => {
+      const customStore = new LRUMemoryStore({ max: 10, name: "custom-name" });
+      expect(customStore.name).toBe("custom-name");
+    });
+
+    it("should use default name when not provided", () => {
+      const defaultStore = new LRUMemoryStore({ max: 10 });
+      expect(defaultStore.name).toBe("lru-memory");
+    });
+  });
+
+  describe("createLRUMemoryStore helper", () => {
+    it("should create a store with specified max size", async () => {
+      const helperStore = createLRUMemoryStore(3);
+      const entry = (val: number) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      await helperStore.set("ns", "key1", entry(1));
+      await helperStore.set("ns", "key2", entry(2));
+      await helperStore.set("ns", "key3", entry(3));
+      await helperStore.set("ns", "key4", entry(4));
+
+      expect(helperStore.size).toBe(3);
+      expect((await helperStore.get("ns", "key1")).val).toBeUndefined();
+    });
+
+    it("should accept custom name", () => {
+      const namedStore = createLRUMemoryStore(10, "my-cache");
+      expect(namedStore.name).toBe("my-cache");
+    });
+  });
+
+  describe("complex value types", () => {
+    it("should handle object values", async () => {
+      const objectStore = new LRUMemoryStore<string, { id: number; data: string[] }>({ max: 5 });
+      const complexValue = { id: 123, data: ["a", "b", "c"] };
+      const entry = createEntry(complexValue, Date.now() + 60000, Date.now() + 120000);
+
+      await objectStore.set("ns", "obj-key", entry);
+
+      const result = await objectStore.get("ns", "obj-key");
+      expect(result.val?.value).toEqual(complexValue);
+    });
+
+    it("should handle null and undefined values", async () => {
+      const nullStore = new LRUMemoryStore<string, null | undefined>({ max: 5 });
+
+      const nullEntry = createEntry(null, Date.now() + 60000, Date.now() + 120000);
+      const undefinedEntry = createEntry(undefined, Date.now() + 60000, Date.now() + 120000);
+
+      await nullStore.set("ns", "null-key", nullEntry);
+      await nullStore.set("ns", "undefined-key", undefinedEntry);
+
+      expect((await nullStore.get("ns", "null-key")).val?.value).toBeNull();
+      expect((await nullStore.get("ns", "undefined-key")).val?.value).toBeUndefined();
+    });
+  });
+
+  describe("concurrent operations", () => {
+    it("should handle concurrent writes safely", async () => {
+      const concurrentStore = new LRUMemoryStore<string, number>({ max: 100 });
+      const entry = (val: number) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Simulate concurrent writes
+      const writes = Array.from({ length: 50 }, (_, i) =>
+        concurrentStore.set("ns", `key${i}`, entry(i))
+      );
+
+      await Promise.all(writes);
+
+      expect(concurrentStore.size).toBe(50);
+    });
+
+    it("should handle concurrent reads and writes", async () => {
+      const concurrentStore = new LRUMemoryStore<string, number>({ max: 100 });
+      const entry = (val: number) => createEntry(val, Date.now() + 60000, Date.now() + 120000);
+
+      // Pre-populate
+      for (let i = 0; i < 50; i++) {
+        await concurrentStore.set("ns", `key${i}`, entry(i));
+      }
+
+      // Mix of reads and writes
+      const operations = [
+        ...Array.from({ length: 25 }, (_, i) => concurrentStore.get("ns", `key${i}`)),
+        ...Array.from({ length: 25 }, (_, i) =>
+          concurrentStore.set("ns", `new-key${i}`, entry(i + 100))
+        ),
+      ];
+
+      await Promise.all(operations);
+
+      // Should not exceed max
+      expect(concurrentStore.size).toBeLessThanOrEqual(100);
+    });
+  });
+});
diff --git a/internal-packages/cache/src/stores/lruMemory.ts b/internal-packages/cache/src/stores/lruMemory.ts
new file mode 100644
index 00000000000..63b1d5cd4b5
--- /dev/null
+++ b/internal-packages/cache/src/stores/lruMemory.ts
@@ -0,0 +1,167 @@
+import { LRUCache } from "lru-cache";
+import { CacheError } from "@unkey/cache";
+import type { Store, Entry } from "@unkey/cache/stores";
+import { Ok, Err, type Result } from "@unkey/error";
+
+export type LRUMemoryStoreConfig = {
+  /**
+   * Maximum number of items to store in the cache.
+   * This is a hard limit - the cache will never exceed this size.
+   */
+  max: number;
+
+  /**
+   * Name for metrics/tracing.
+   * @default "lru-memory"
+   */
+  name?: string;
+};
+
+/**
+ * A memory store implementation using lru-cache.
+ *
+ * This provides O(1) get/set/delete operations and automatic LRU eviction
+ * without blocking the event loop (unlike @unkey/cache's MemoryStore which
+ * uses O(n) synchronous iteration for eviction).
+ *
+ * TTL is checked lazily on get() - expired items are not proactively removed
+ * but will be evicted by LRU when the cache is full.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export class LRUMemoryStore<TNamespace extends string, TValue = any>
+  implements Store<TNamespace, TValue>
+{
+  readonly name: string;
+  private readonly cache: LRUCache<string, Entry<TValue>>;
+
+  constructor(config: LRUMemoryStoreConfig) {
+    this.name = config.name ?? "lru-memory";
+    this.cache = new LRUCache<string, Entry<TValue>>({
+      max: config.max,
+      // Don't use ttlAutopurge - it creates a setTimeout per item which
+      // doesn't scale well at high throughput (thousands of items/second).
+      // Instead, we check TTL lazily on get().
+      ttlAutopurge: false,
+      // Allow returning stale values - the cache layer handles SWR semantics
+      allowStale: true,
+      // Use the staleUntil timestamp for TTL calculation
+      ttl: 1, // Placeholder, we set per-item TTL in set()
+    });
+  }
+
+  private buildCacheKey(namespace: TNamespace, key: string): string {
+    return `${namespace}::${key}`;
+  }
+
+  async get(
+    namespace: TNamespace,
+    key: string
+  ): Promise<Result<Entry<TValue> | undefined, CacheError>> {
+    try {
+      const cacheKey = this.buildCacheKey(namespace, key);
+      const entry = this.cache.get(cacheKey);
+
+      if (!entry) {
+        return Ok(undefined);
+      }
+
+      // Check if entry is expired (past staleUntil)
+      // The cache layer will handle fresh vs stale semantics
+      if (entry.staleUntil <= Date.now()) {
+        // Remove expired entry
+        this.cache.delete(cacheKey);
+        return Ok(undefined);
+      }
+
+      return Ok(entry);
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key,
+          message: err instanceof Error ? err.message : String(err),
+        })
+      );
+    }
+  }
+
+  async set(
+    namespace: TNamespace,
+    key: string,
+    entry: Entry<TValue>
+  ): Promise<Result<void, CacheError>> {
+    try {
+      const cacheKey = this.buildCacheKey(namespace, key);
+
+      // Calculate TTL from staleUntil timestamp
+      const ttl = Math.max(0, entry.staleUntil - Date.now());
+
+      this.cache.set(cacheKey, entry, { ttl });
+
+      return Ok(undefined as void);
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key,
+          message: err instanceof Error ? err.message : String(err),
+        })
+      );
+    }
+  }
+
+  async remove(
+    namespace: TNamespace,
+    keys: string | string[]
+  ): Promise<Result<void, CacheError>> {
+    try {
+      const keyArray = Array.isArray(keys) ? keys : [keys];
+
+      for (const key of keyArray) {
+        const cacheKey = this.buildCacheKey(namespace, key);
+        this.cache.delete(cacheKey);
+      }
+
+      return Ok(undefined as void);
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key: Array.isArray(keys) ? keys.join(",") : keys,
+          message: err instanceof Error ? err.message : String(err),
+        })
+      );
+    }
+  }
+
+  /**
+   * Returns the current number of items in the cache.
+   */
+  get size(): number {
+    return this.cache.size;
+  }
+
+  /**
+   * Clears all items from the cache.
+   */
+  clear(): void {
+    this.cache.clear();
+  }
+}
+
+/**
+ * Creates an LRU memory store with the specified maximum size.
+ *
+ * This is a drop-in replacement for createMemoryStore() that uses lru-cache
+ * instead of @unkey/cache's MemoryStore, providing:
+ * - O(1) operations (vs O(n) eviction in MemoryStore)
+ * - No event loop blocking
+ * - Strict memory bounds (hard max vs soft cap)
+ *
+ * @param maxItems Maximum number of items to store
+ * @param name Optional name for metrics/tracing (default: "lru-memory")
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createLRUMemoryStore(maxItems: number, name?: string): LRUMemoryStore<string, any> {
+  return new LRUMemoryStore({ max: maxItems, name });
+}
diff --git a/internal-packages/cache/src/stores/memory.ts b/internal-packages/cache/src/stores/memory.ts
new file mode 100644
index 00000000000..76c1fc3d2d2
--- /dev/null
+++ b/internal-packages/cache/src/stores/memory.ts
@@ -0,0 +1,13 @@
+import { MemoryStore } from "@unkey/cache/stores";
+
+export type { MemoryStore };
+
+export function createMemoryStore(maxItems: number, frequency: number = 0.01) {
+  return new MemoryStore({
+    persistentMap: new Map(),
+    unstableEvictOnSet: {
+      frequency,
+      maxItems,
+    },
+  });
+}
diff --git a/internal-packages/cache/src/stores/redis.ts b/internal-packages/cache/src/stores/redis.ts
new file mode 100644
index 00000000000..4f40133a4fc
--- /dev/null
+++ b/internal-packages/cache/src/stores/redis.ts
@@ -0,0 +1,105 @@
+import { CacheError } from "@unkey/cache";
+import type { Entry, Store } from "@unkey/cache/stores";
+import { Err, Ok, type Result } from "@unkey/error";
+import { createRedisClient, Redis, RedisOptions } from "@internal/redis";
+
+export type RedisCacheStoreConfig = {
+  connection: RedisOptions;
+  name?: string;
+  useModernCacheKeyBuilder?: boolean;
+};
+
+export class RedisCacheStore<TNamespace extends string, TValue = any>
+  implements Store<TNamespace, TValue>
+{
+  public readonly name = "redis";
+  private readonly redis: Redis;
+
+  constructor(private readonly config: RedisCacheStoreConfig) {
+    this.redis = createRedisClient({
+      ...config.connection,
+      name: config.name ?? "trigger:cacheStore",
+    });
+  }
+
+  private buildCacheKey(namespace: TNamespace, key: string): string {
+    if (this.config.useModernCacheKeyBuilder) {
+      return [namespace, key].join(":");
+    }
+
+    return [namespace, key].join("::");
+  }
+
+  public async get(
+    namespace: TNamespace,
+    key: string
+  ): Promise<Result<Entry<TValue> | undefined, CacheError>> {
+    let raw: string | null;
+    try {
+      raw = await this.redis.get(this.buildCacheKey(namespace, key));
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key,
+          message: (err as Error).message,
+        })
+      );
+    }
+
+    if (!raw) {
+      return Promise.resolve(Ok(undefined));
+    }
+
+    try {
+      const superjson = await import("superjson");
+      const entry = superjson.parse(raw) as Entry<TValue>;
+      return Ok(entry);
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key,
+          message: (err as Error).message,
+        })
+      );
+    }
+  }
+
+  public async set(
+    namespace: TNamespace,
+    key: string,
+    entry: Entry<TValue>
+  ): Promise<Result<void, CacheError>> {
+    const cacheKey = this.buildCacheKey(namespace, key);
+    try {
+      const superjson = await import("superjson");
+      await this.redis.set(cacheKey, superjson.stringify(entry), "PXAT", entry.staleUntil);
+      return Ok();
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key,
+          message: (err as Error).message,
+        })
+      );
+    }
+  }
+
+  public async remove(namespace: TNamespace, key: string): Promise<Result<void, CacheError>> {
+    try {
+      const cacheKey = this.buildCacheKey(namespace, key);
+      await this.redis.del(cacheKey);
+      return Promise.resolve(Ok());
+    } catch (err) {
+      return Err(
+        new CacheError({
+          tier: this.name,
+          key,
+          message: (err as Error).message,
+        })
+      );
+    }
+  }
+}
diff --git a/internal-packages/cache/tsconfig.json b/internal-packages/cache/tsconfig.json
new file mode 100644
index 00000000000..0104339620f
--- /dev/null
+++ b/internal-packages/cache/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "compilerOptions": {
+    "target": "ES2019",
+    "lib": ["ES2019", "DOM", "DOM.Iterable", "DOM.AsyncIterable"],
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "moduleDetection": "force",
+    "verbatimModuleSyntax": false,
+    "types": ["vitest/globals"],
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "preserveWatchOutput": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "strict": true,
+    "paths": {
+      "@trigger.dev/core": ["../../packages/core/src/index"],
+      "@trigger.dev/core/*": ["../../packages/core/src/*"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/internal-packages/cache/vitest.config.ts b/internal-packages/cache/vitest.config.ts
new file mode 100644
index 00000000000..e07f05e842b
--- /dev/null
+++ b/internal-packages/cache/vitest.config.ts
@@ -0,0 +1,10 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["**/*.test.ts"],
+    globals: true,
+    isolate: true,
+    testTimeout: 10_000,
+  },
+});
diff --git a/internal-packages/clickhouse/package.json b/internal-packages/clickhouse/package.json
index d85051b5065..846ded63f1f 100644
--- a/internal-packages/clickhouse/package.json
+++ b/internal-packages/clickhouse/package.json
@@ -6,10 +6,11 @@
   "types": "./dist/src/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@clickhouse/client": "^1.11.1",
+    "@clickhouse/client": "^1.12.1",
     "@internal/tracing": "workspace:*",
+    "@internal/tsql": "workspace:*",
     "@trigger.dev/core": "workspace:*",
-    "zod": "3.23.8",
+    "zod": "3.25.76",
     "zod-error": "1.5.0"
   },
   "devDependencies": {
diff --git a/internal-packages/clickhouse/schema/006_add_task_runs_v2_workerqueue.sql b/internal-packages/clickhouse/schema/006_add_task_runs_v2_workerqueue.sql
new file mode 100644
index 00000000000..840ab78575f
--- /dev/null
+++ b/internal-packages/clickhouse/schema/006_add_task_runs_v2_workerqueue.sql
@@ -0,0 +1,10 @@
+-- +goose Up
+/*
+Add worker_queue column.
+ */
+ALTER TABLE trigger_dev.task_runs_v2
+ADD COLUMN worker_queue String DEFAULT '';
+
+-- +goose Down
+ALTER TABLE trigger_dev.task_runs_v2
+DROP COLUMN worker_queue;
\ No newline at end of file
diff --git a/internal-packages/clickhouse/schema/007_add_task_events_v1.sql b/internal-packages/clickhouse/schema/007_add_task_events_v1.sql
new file mode 100644
index 00000000000..7d8e7b68d33
--- /dev/null
+++ b/internal-packages/clickhouse/schema/007_add_task_events_v1.sql
@@ -0,0 +1,52 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS trigger_dev.task_events_v1
+(
+  -- This the main "tenant" ID
+  environment_id String,
+  -- The organization ID here so we can do MV rollups of usage
+  organization_id String,
+  -- The project ID here so we can do MV rollups of usage
+  project_id String,
+  -- The task slug (e.g. "my-task")
+  task_identifier String CODEC(ZSTD(1)),
+  -- The non-friendly ID for the run
+  run_id String CODEC(ZSTD(1)),
+  -- nanoseconds since the epoch
+  start_time DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+  trace_id   String CODEC(ZSTD(1)),
+  span_id    String CODEC(ZSTD(1)),
+  -- will be an empty string for root spans
+  parent_span_id String CODEC(ZSTD(1)),
+  -- Log body, event name, or span name
+  message String CODEC(ZSTD(1)),
+  -- this is the new level column, can be
+  -- SPAN, SPAN_EVENT, DEBUG_EVENT, LOG_DEBUG, LOG_LOG, LOG_SUCCESS, LOG_INFO, LOG_WARN, LOG_ERROR, ANCESTOR_OVERRIDE
+  kind LowCardinality(String) CODEC(ZSTD(1)),
+  -- isError, isPartial, isCancelled will now be in this status column
+  -- OK, ERROR, PARTIAL, CANCELLED
+  status LowCardinality(String) CODEC(ZSTD(1)),
+  -- span/log/event attributes and resource attributes
+  -- includes error attributes, gen_ai attributes, and other attributes
+  attributes JSON CODEC(ZSTD(1)),
+  attributes_text String MATERIALIZED toJSONString(attributes),
+  -- This is the metadata column, includes style for styling the event in the UI
+  -- is a JSON stringified object, e.g. {"style":{"icon":"play","variant":"primary"},"error":{"message":"Error message","attributes":{"error.type":"ErrorType","error.code":"123"}}}
+  metadata String CODEC(ZSTD(1)),
+  -- nanoseconds since the start time, only non-zero for spans
+  duration UInt64 CODEC(ZSTD(1)),
+  -- The TTL for the event, will be deleted 7 days after the event expires
+  expires_at DateTime64(3),
+
+  INDEX idx_run_id run_id TYPE bloom_filter(0.001) GRANULARITY 1,
+  INDEX idx_span_id span_id TYPE bloom_filter(0.001) GRANULARITY 1,
+  INDEX idx_duration duration TYPE minmax GRANULARITY 1,
+  INDEX idx_attributes_text attributes_text TYPE tokenbf_v1(32768, 3, 0) GRANULARITY 8
+)
+ENGINE = MergeTree
+PARTITION BY toDate(start_time)
+ORDER BY (environment_id, toUnixTimestamp(start_time), trace_id)
+TTL toDateTime(expires_at) + INTERVAL 7 DAY
+SETTINGS ttl_only_drop_parts = 1;
+
+-- +goose Down
+DROP TABLE IF EXISTS trigger_dev.task_events_v1;
\ No newline at end of file
diff --git a/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql b/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql
new file mode 100644
index 00000000000..63de335b3b2
--- /dev/null
+++ b/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql
@@ -0,0 +1,55 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS trigger_dev.task_event_usage_by_minute_v1
+(
+  organization_id String,
+  project_id String,
+  environment_id String,
+  bucket_start DateTime,
+  event_count UInt64
+)
+ENGINE = SummingMergeTree()
+PARTITION BY toYYYYMM(bucket_start)
+ORDER BY (organization_id, project_id, environment_id, bucket_start)
+TTL bucket_start + INTERVAL 8 DAY;
+
+CREATE TABLE IF NOT EXISTS trigger_dev.task_event_usage_by_hour_v1
+(
+  organization_id String,
+  project_id String,
+  environment_id String,
+  bucket_start DateTime,
+  event_count UInt64
+)
+ENGINE = SummingMergeTree()
+PARTITION BY toYYYYMM(bucket_start)
+ORDER BY (organization_id, project_id, environment_id, bucket_start)
+TTL bucket_start + INTERVAL 400 DAY;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_usage_by_minute_v1
+TO trigger_dev.task_event_usage_by_minute_v1 AS
+SELECT
+  organization_id,
+  project_id,
+  environment_id,
+  toStartOfMinute(start_time) AS bucket_start,
+  count() AS event_count
+FROM trigger_dev.task_events_v1
+GROUP BY organization_id, project_id, environment_id, bucket_start;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_usage_by_hour_v1
+TO trigger_dev.task_event_usage_by_hour_v1 AS
+SELECT
+  organization_id,
+  project_id,
+  environment_id,
+  toStartOfHour(bucket_start) AS bucket_start,
+  sum(event_count) AS event_count
+FROM trigger_dev.task_event_usage_by_minute_v1
+GROUP BY organization_id, project_id, environment_id, bucket_start;
+
+
+-- +goose Down
+DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v1;
+DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_hour_v1;
+DROP TABLE IF EXISTS trigger_dev.task_event_usage_by_hour_v1;
+DROP TABLE IF EXISTS trigger_dev.task_event_usage_by_minute_v1;
\ No newline at end of file
diff --git a/internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql b/internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql
new file mode 100644
index 00000000000..7ebb640ebd0
--- /dev/null
+++ b/internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql
@@ -0,0 +1,29 @@
+-- +goose Up
+DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v1;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_usage_by_minute_v2
+TO trigger_dev.task_event_usage_by_minute_v1 AS
+SELECT
+  organization_id,
+  project_id,
+  environment_id,
+  toStartOfMinute(start_time) AS bucket_start,
+  count() AS event_count
+FROM trigger_dev.task_events_v1
+WHERE kind != 'DEBUG_EVENT' AND kind != 'ANCESTOR_OVERRIDE' AND status != 'PARTIAL'
+GROUP BY organization_id, project_id, environment_id, bucket_start;
+
+
+-- +goose Down
+DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v2;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_usage_by_minute_v1
+TO trigger_dev.task_event_usage_by_minute_v1 AS
+SELECT
+  organization_id,
+  project_id,
+  environment_id,
+  toStartOfMinute(start_time) AS bucket_start,
+  count() AS event_count
+FROM trigger_dev.task_events_v1
+GROUP BY organization_id, project_id, environment_id, bucket_start;
diff --git a/internal-packages/clickhouse/schema/010_add_task_events_v2.sql b/internal-packages/clickhouse/schema/010_add_task_events_v2.sql
new file mode 100644
index 00000000000..04279b80cb9
--- /dev/null
+++ b/internal-packages/clickhouse/schema/010_add_task_events_v2.sql
@@ -0,0 +1,55 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS trigger_dev.task_events_v2
+(
+  -- This the main "tenant" ID
+  environment_id String,
+  -- The organization ID here so we can do MV rollups of usage
+  organization_id String,
+  -- The project ID here so we can do MV rollups of usage
+  project_id String,
+  -- The task slug (e.g. "my-task")
+  task_identifier String CODEC(ZSTD(1)),
+  -- The non-friendly ID for the run
+  run_id String CODEC(ZSTD(1)),
+  -- nanoseconds since the epoch
+  start_time DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+  trace_id   String CODEC(ZSTD(1)),
+  span_id    String CODEC(ZSTD(1)),
+  -- will be an empty string for root spans
+  parent_span_id String CODEC(ZSTD(1)),
+  -- Log body, event name, or span name
+  message String CODEC(ZSTD(1)),
+  -- this is the new level column, can be
+  -- SPAN, SPAN_EVENT, DEBUG_EVENT, LOG_DEBUG, LOG_LOG, LOG_SUCCESS, LOG_INFO, LOG_WARN, LOG_ERROR, ANCESTOR_OVERRIDE
+  kind LowCardinality(String) CODEC(ZSTD(1)),
+  -- isError, isPartial, isCancelled will now be in this status column
+  -- OK, ERROR, PARTIAL, CANCELLED
+  status LowCardinality(String) CODEC(ZSTD(1)),
+  -- span/log/event attributes and resource attributes
+  -- includes error attributes, gen_ai attributes, and other attributes
+  attributes JSON CODEC(ZSTD(1)),
+  attributes_text String MATERIALIZED toJSONString(attributes),
+  -- This is the metadata column, includes style for styling the event in the UI
+  -- is a JSON stringified object, e.g. {"style":{"icon":"play","variant":"primary"},"error":{"message":"Error message","attributes":{"error.type":"ErrorType","error.code":"123"}}}
+  metadata String CODEC(ZSTD(1)),
+  -- nanoseconds since the start time, only non-zero for spans
+  duration UInt64 CODEC(ZSTD(1)),
+  -- The TTL for the event, will be deleted 7 days after the event expires
+  expires_at DateTime64(3),
+  -- NEW: Insert timestamp for partitioning (avoids "too many parts" errors from late-arriving events)
+  inserted_at DateTime64(3) DEFAULT now64(3),
+
+  INDEX idx_run_id run_id TYPE bloom_filter(0.001) GRANULARITY 1,
+  INDEX idx_span_id span_id TYPE bloom_filter(0.001) GRANULARITY 1,
+  INDEX idx_duration duration TYPE minmax GRANULARITY 1,
+  INDEX idx_attributes_text attributes_text TYPE tokenbf_v1(32768, 3, 0) GRANULARITY 8
+)
+ENGINE = MergeTree
+PARTITION BY toDate(inserted_at)
+ORDER BY (environment_id, toUnixTimestamp(start_time), trace_id)
+TTL toDateTime(expires_at) + INTERVAL 7 DAY
+SETTINGS ttl_only_drop_parts = 1;
+
+-- +goose Down
+DROP TABLE IF EXISTS trigger_dev.task_events_v2;
+
diff --git a/internal-packages/clickhouse/schema/011_add_task_events_v2_table_mvs.sql b/internal-packages/clickhouse/schema/011_add_task_events_v2_table_mvs.sql
new file mode 100644
index 00000000000..33f19926a37
--- /dev/null
+++ b/internal-packages/clickhouse/schema/011_add_task_events_v2_table_mvs.sql
@@ -0,0 +1,19 @@
+-- +goose Up
+-- Create materialized views for task_events_v2 table (partitioned by inserted_at)
+-- These write to the same target tables as the v1 MVs so usage is aggregated across both tables
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_v2_usage_by_minute
+TO trigger_dev.task_event_usage_by_minute_v1 AS
+SELECT
+  organization_id,
+  project_id,
+  environment_id,
+  toStartOfMinute(start_time) AS bucket_start,
+  count() AS event_count
+FROM trigger_dev.task_events_v2
+WHERE kind != 'DEBUG_EVENT' AND kind != 'ANCESTOR_OVERRIDE' AND status != 'PARTIAL'
+GROUP BY organization_id, project_id, environment_id, bucket_start;
+
+-- +goose Down
+DROP VIEW IF EXISTS trigger_dev.mv_task_event_v2_usage_by_minute;
+
diff --git a/internal-packages/clickhouse/schema/012_add_task_runs_v2_max_duration.sql b/internal-packages/clickhouse/schema/012_add_task_runs_v2_max_duration.sql
new file mode 100644
index 00000000000..b4263e76541
--- /dev/null
+++ b/internal-packages/clickhouse/schema/012_add_task_runs_v2_max_duration.sql
@@ -0,0 +1,10 @@
+-- +goose Up
+/*
+Add max_duration_in_seconds column.
+ */
+ALTER TABLE trigger_dev.task_runs_v2
+ADD COLUMN max_duration_in_seconds Nullable (UInt32) DEFAULT NULL;
+
+-- +goose Down
+ALTER TABLE trigger_dev.task_runs_v2
+DROP COLUMN max_duration_in_seconds;
\ No newline at end of file
diff --git a/internal-packages/clickhouse/schema/013_add_task_runs_v2_idempotency_key_options.sql b/internal-packages/clickhouse/schema/013_add_task_runs_v2_idempotency_key_options.sql
new file mode 100644
index 00000000000..345e393afa4
--- /dev/null
+++ b/internal-packages/clickhouse/schema/013_add_task_runs_v2_idempotency_key_options.sql
@@ -0,0 +1,16 @@
+-- +goose Up
+
+-- Add columns for storing user-provided idempotency key and scope for searching
+ALTER TABLE trigger_dev.task_runs_v2
+ADD COLUMN idempotency_key_user String DEFAULT '';
+
+ALTER TABLE trigger_dev.task_runs_v2
+ADD COLUMN idempotency_key_scope String DEFAULT '';
+
+-- +goose Down
+
+ALTER TABLE trigger_dev.task_runs_v2
+DROP COLUMN idempotency_key_user;
+
+ALTER TABLE trigger_dev.task_runs_v2
+DROP COLUMN idempotency_key_scope;
diff --git a/internal-packages/clickhouse/schema/014_update_output_error_text_to_extract_data.sql b/internal-packages/clickhouse/schema/014_update_output_error_text_to_extract_data.sql
new file mode 100644
index 00000000000..c66a1492a55
--- /dev/null
+++ b/internal-packages/clickhouse/schema/014_update_output_error_text_to_extract_data.sql
@@ -0,0 +1,45 @@
+-- +goose Up
+-- Update the materialized columns to extract the 'data' field if it exists
+-- This avoids the {"data": ...} wrapper in the text representation
+-- Note: Direct JSON path access (output.data) returns null for nested objects,
+-- so we use JSONExtractRaw on the stringified JSON instead
+ALTER TABLE trigger_dev.task_runs_v2
+ADD COLUMN output_text String MATERIALIZED if (
+  toJSONString (output) = '{}',
+  '',
+  if (
+    length (JSONExtractRaw (toJSONString (output), 'data')) > 0,
+    JSONExtractRaw (toJSONString (output), 'data'),
+    toJSONString (output)
+  )
+);
+
+-- For error: extract error.data if it exists
+ALTER TABLE trigger_dev.task_runs_v2
+ADD COLUMN error_text String MATERIALIZED if (
+  toJSONString (error) = '{}',
+  '',
+  if (
+    length (JSONExtractRaw (toJSONString (error), 'data')) > 0,
+    JSONExtractRaw (toJSONString (error), 'data'),
+    toJSONString (error)
+  )
+);
+
+-- Add the indexes
+ALTER TABLE trigger_dev.task_runs_v2 ADD INDEX idx_output_text output_text TYPE ngrambf_v1 (3, 131072, 3, 0) GRANULARITY 4;
+
+ALTER TABLE trigger_dev.task_runs_v2 ADD INDEX idx_error_text error_text TYPE ngrambf_v1 (3, 131072, 3, 0) GRANULARITY 4;
+
+-- +goose Down
+ALTER TABLE trigger_dev.task_runs_v2
+DROP INDEX IF EXISTS idx_output_text;
+
+ALTER TABLE trigger_dev.task_runs_v2
+DROP INDEX IF EXISTS idx_error_text;
+
+ALTER TABLE trigger_dev.task_runs_v2
+DROP COLUMN IF EXISTS output_text;
+
+ALTER TABLE trigger_dev.task_runs_v2
+DROP COLUMN IF EXISTS error_text;
\ No newline at end of file
diff --git a/internal-packages/clickhouse/schema/015_add_task_runs_v2_search_indexes.sql b/internal-packages/clickhouse/schema/015_add_task_runs_v2_search_indexes.sql
new file mode 100644
index 00000000000..1d6af329451
--- /dev/null
+++ b/internal-packages/clickhouse/schema/015_add_task_runs_v2_search_indexes.sql
@@ -0,0 +1,20 @@
+-- +goose Up
+
+-- Add indexes for text search on task task_events_v2 tables for message and attributes fields
+ALTER TABLE trigger_dev.task_events_v2
+    ADD INDEX IF NOT EXISTS idx_attributes_text_search lower(attributes_text)
+    TYPE ngrambf_v1(3, 32768, 2, 0)
+    GRANULARITY 1;
+
+ALTER TABLE trigger_dev.task_events_v2
+    ADD INDEX IF NOT EXISTS idx_message_text_search lower(message)
+    TYPE ngrambf_v1(3, 32768, 2, 0)
+    GRANULARITY 1;
+
+-- +goose Down
+
+ALTER TABLE trigger_dev.task_events_v2
+DROP INDEX idx_attributes_text_search;
+
+ALTER TABLE trigger_dev.task_events_v2
+DROP INDEX idx_message_text_search;
diff --git a/internal-packages/clickhouse/schema/016_add_task_events_search_v1.sql b/internal-packages/clickhouse/schema/016_add_task_events_search_v1.sql
new file mode 100644
index 00000000000..60ed1eb1fc5
--- /dev/null
+++ b/internal-packages/clickhouse/schema/016_add_task_events_search_v1.sql
@@ -0,0 +1,63 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS trigger_dev.task_events_search_v1
+(
+  environment_id String,
+  organization_id String,
+  project_id String,
+  triggered_timestamp DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+  trace_id String CODEC(ZSTD(1)),
+  span_id String CODEC(ZSTD(1)),
+  run_id String CODEC(ZSTD(1)),
+  task_identifier String CODEC(ZSTD(1)),
+  start_time DateTime64(9) CODEC(Delta(8), ZSTD(1)),
+  inserted_at DateTime64(3),
+  message String CODEC(ZSTD(1)),
+  kind LowCardinality(String) CODEC(ZSTD(1)),
+  status LowCardinality(String) CODEC(ZSTD(1)),
+  duration UInt64 CODEC(ZSTD(1)),
+  parent_span_id String CODEC(ZSTD(1)),
+  attributes_text String CODEC(ZSTD(1)),
+
+  INDEX idx_run_id run_id TYPE bloom_filter(0.001) GRANULARITY 1,
+  INDEX idx_message_text_search lower(message) TYPE ngrambf_v1(3, 32768, 2, 0) GRANULARITY 1,
+  INDEX idx_attributes_text_search lower(attributes_text) TYPE ngrambf_v1(3, 32768, 2, 0) GRANULARITY 1
+)
+ENGINE = MergeTree
+PARTITION BY toDate(triggered_timestamp)
+ORDER BY (organization_id, environment_id, triggered_timestamp, trace_id)
+--Right now we have maximum retention of up to 30 days based on plan.
+--We put a logical limit for now, the 90 DAY TTL is just a backup
+--This might need to be updated for longer retention periods
+TTL toDateTime(triggered_timestamp) + INTERVAL 90 DAY
+SETTINGS ttl_only_drop_parts = 1;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.task_events_search_mv_v1
+TO trigger_dev.task_events_search_v1 AS
+SELECT
+  environment_id,
+  organization_id,
+  project_id,
+  trace_id,
+  span_id,
+  run_id,
+  task_identifier,
+  start_time,
+  inserted_at,
+  message,
+  kind,
+  status,
+  duration,
+  parent_span_id,
+  attributes_text,
+  fromUnixTimestamp64Nano(toUnixTimestamp64Nano(start_time) + toInt64(duration)) AS triggered_timestamp
+FROM trigger_dev.task_events_v2
+WHERE
+    kind != 'DEBUG_EVENT'
+    AND status != 'PARTIAL'
+    AND NOT (kind = 'SPAN_EVENT' AND attributes_text = '{}')
+    AND kind != 'ANCESTOR_OVERRIDE'
+    AND message != 'trigger.dev/start';
+
+-- +goose Down
+DROP VIEW IF EXISTS trigger_dev.task_events_search_mv_v1;
+DROP TABLE IF EXISTS trigger_dev.task_events_search_v1;
diff --git a/internal-packages/clickhouse/schema/017_update_materialized_conditions_to_task_events_search_v1.sql b/internal-packages/clickhouse/schema/017_update_materialized_conditions_to_task_events_search_v1.sql
new file mode 100644
index 00000000000..3f84cf555f2
--- /dev/null
+++ b/internal-packages/clickhouse/schema/017_update_materialized_conditions_to_task_events_search_v1.sql
@@ -0,0 +1,62 @@
+-- +goose Up
+-- We drop the existing MV and recreate it with the new filter condition
+DROP VIEW IF EXISTS trigger_dev.task_events_search_mv_v1;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.task_events_search_mv_v1
+TO trigger_dev.task_events_search_v1 AS
+SELECT
+    environment_id,
+    organization_id,
+    project_id,
+    trace_id,
+    span_id,
+    run_id,
+    task_identifier,
+    start_time,
+    inserted_at,
+    message,
+    kind,
+    status,
+    duration,
+    parent_span_id,
+    attributes_text,
+    fromUnixTimestamp64Nano(toUnixTimestamp64Nano(start_time) + toInt64(duration)) AS triggered_timestamp
+FROM trigger_dev.task_events_v2
+WHERE
+    trace_id != '' -- New condition added here
+    AND kind != 'DEBUG_EVENT'
+    AND status != 'PARTIAL'
+    AND NOT (kind = 'SPAN_EVENT' AND attributes_text = '{}')
+    AND kind != 'ANCESTOR_OVERRIDE'
+    AND message != 'trigger.dev/start';
+
+-- +goose Down
+-- In the down migration, we revert to the previous filter set
+DROP VIEW IF EXISTS trigger_dev.task_events_search_mv_v1;
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.task_events_search_mv_v1
+TO trigger_dev.task_events_search_v1 AS
+SELECT
+    environment_id,
+    organization_id,
+    project_id,
+    trace_id,
+    span_id,
+    run_id,
+    task_identifier,
+    start_time,
+    inserted_at,
+    message,
+    kind,
+    status,
+    duration,
+    parent_span_id,
+    attributes_text,
+    fromUnixTimestamp64Nano(toUnixTimestamp64Nano(start_time) + toInt64(duration)) AS triggered_timestamp
+FROM trigger_dev.task_events_v2
+WHERE
+    kind != 'DEBUG_EVENT'
+    AND status != 'PARTIAL'
+    AND NOT (kind = 'SPAN_EVENT' AND attributes_text = '{}')
+    AND kind != 'ANCESTOR_OVERRIDE'
+    AND message != 'trigger.dev/start';
\ No newline at end of file
diff --git a/internal-packages/clickhouse/schema/018_drop_unused_task_events_v2_indexes.sql b/internal-packages/clickhouse/schema/018_drop_unused_task_events_v2_indexes.sql
new file mode 100644
index 00000000000..81e3dbab61c
--- /dev/null
+++ b/internal-packages/clickhouse/schema/018_drop_unused_task_events_v2_indexes.sql
@@ -0,0 +1,22 @@
+-- +goose Up
+
+-- These indexes are not used in any WHERE clause.
+-- idx_duration: duration is only written/read as a column, never filtered on.
+-- idx_attributes_text: search queries use the task_events_search_v1 table instead.
+ALTER TABLE trigger_dev.task_events_v2
+    DROP INDEX IF EXISTS idx_duration;
+
+ALTER TABLE trigger_dev.task_events_v2
+    DROP INDEX IF EXISTS idx_attributes_text;
+
+-- +goose Down
+
+ALTER TABLE trigger_dev.task_events_v2
+    ADD INDEX IF NOT EXISTS idx_duration duration
+    TYPE minmax
+    GRANULARITY 1;
+
+ALTER TABLE trigger_dev.task_events_v2
+    ADD INDEX IF NOT EXISTS idx_attributes_text attributes_text
+    TYPE tokenbf_v1(32768, 3, 0)
+    GRANULARITY 8;
diff --git a/internal-packages/clickhouse/schema/019_create_metrics_v1.sql b/internal-packages/clickhouse/schema/019_create_metrics_v1.sql
new file mode 100644
index 00000000000..b4a808f1896
--- /dev/null
+++ b/internal-packages/clickhouse/schema/019_create_metrics_v1.sql
@@ -0,0 +1,44 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS trigger_dev.metrics_v1
+(
+  organization_id     LowCardinality(String),
+  project_id          LowCardinality(String),
+  environment_id      String CODEC(ZSTD(1)),
+  metric_name         LowCardinality(String),
+  metric_type         LowCardinality(String),
+  metric_subject      String CODEC(ZSTD(1)),
+  bucket_start        DateTime CODEC(Delta(4), ZSTD(1)),
+  value               Float64 DEFAULT 0 CODEC(ZSTD(1)),
+  attributes          JSON(
+    `trigger.run_id` String,
+    `trigger.task_slug` String,
+    `trigger.attempt_number` Int64,
+    `trigger.environment_type` LowCardinality(String),
+    `trigger.machine_id` String,
+    `trigger.machine_name` LowCardinality(String),
+    `trigger.worker_id` String,
+    `trigger.worker_version` String,
+    `system.cpu.logical_number` String,
+    `system.cpu.state` LowCardinality(String),
+    `system.memory.state` LowCardinality(String),
+    `system.device` String,
+    `system.filesystem.type` LowCardinality(String),
+    `system.filesystem.mountpoint` String,
+    `system.filesystem.mode` LowCardinality(String),
+    `system.filesystem.state` LowCardinality(String),
+    `disk.io.direction` LowCardinality(String),
+    `process.cpu.state` LowCardinality(String),
+    `network.io.direction` LowCardinality(String),
+    max_dynamic_paths=8
+  ),
+  INDEX idx_run_id attributes.trigger.run_id TYPE bloom_filter(0.001) GRANULARITY 1,
+  INDEX idx_task_slug attributes.trigger.task_slug TYPE bloom_filter(0.001) GRANULARITY 1
+)
+ENGINE = MergeTree()
+PARTITION BY toDate(bucket_start)
+ORDER BY (organization_id, project_id, environment_id, metric_name, metric_subject, bucket_start)
+TTL bucket_start + INTERVAL 60 DAY
+SETTINGS ttl_only_drop_parts = 1;
+
+-- +goose Down
+DROP TABLE IF EXISTS trigger_dev.metrics_v1;
diff --git a/internal-packages/clickhouse/schema/020_add_machine_id_to_task_events_v2.sql b/internal-packages/clickhouse/schema/020_add_machine_id_to_task_events_v2.sql
new file mode 100644
index 00000000000..69af257afdd
--- /dev/null
+++ b/internal-packages/clickhouse/schema/020_add_machine_id_to_task_events_v2.sql
@@ -0,0 +1,7 @@
+-- +goose Up
+ALTER TABLE trigger_dev.task_events_v2
+ADD COLUMN machine_id String DEFAULT '' CODEC(ZSTD(1));
+
+-- +goose Down
+ALTER TABLE trigger_dev.task_events_v2
+DROP COLUMN machine_id;
diff --git a/internal-packages/clickhouse/src/client/client.ts b/internal-packages/clickhouse/src/client/client.ts
index 99fff592673..5a4118934e7 100644
--- a/internal-packages/clickhouse/src/client/client.ts
+++ b/internal-packages/clickhouse/src/client/client.ts
@@ -4,23 +4,31 @@ import {
   ClickHouseLogLevel,
   type ClickHouseSettings,
   createClient,
+  type ResultSet,
+  type Row,
+  type BaseQueryParams,
+  type InsertResult,
 } from "@clickhouse/client";
 import { recordSpanError, Span, startSpan, trace, Tracer } from "@internal/tracing";
-import { flattenAttributes, tryCatch } from "@trigger.dev/core/v3";
+import { flattenAttributes, tryCatch, type Result } from "@trigger.dev/core/v3";
 import { z } from "zod";
 import { InsertError, QueryError } from "./errors.js";
 import type {
   ClickhouseInsertFunction,
+  ClickhouseQueryBuilderFastFunction,
   ClickhouseQueryBuilderFunction,
   ClickhouseQueryFunction,
+  ClickhouseQueryWithStatsFunction,
   ClickhouseReader,
   ClickhouseWriter,
+  ColumnExpression,
+  QueryStats,
 } from "./types.js";
 import { generateErrorMessage } from "zod-error";
 import { Logger, type LogLevel } from "@trigger.dev/core/logger";
 import type { Agent as HttpAgent } from "http";
 import type { Agent as HttpsAgent } from "https";
-import { ClickhouseQueryBuilder } from "./queryBuilder.js";
+import { ClickhouseQueryBuilder, ClickhouseQueryFastBuilder } from "./queryBuilder.js";
 import { randomUUID } from "node:crypto";
 
 export type ClickhouseConfig = {
@@ -62,6 +70,7 @@ export class ClickhouseClient implements ClickhouseReader, ClickhouseWriter {
         ...config.clickhouseSettings,
         output_format_json_quote_64bit_integers: 0,
         output_format_json_quote_64bit_floats: 0,
+        cancel_http_readonly_queries_on_client_close: 1,
       },
       log: {
         level: convertLogLevelToClickhouseLogLevel(config.logLevel),
@@ -224,6 +233,290 @@ export class ClickhouseClient implements ClickhouseReader, ClickhouseWriter {
     };
   }
 
+  public queryWithStats<TIn extends z.ZodSchema<any>, TOut extends z.ZodSchema<any>>(req: {
+    /**
+     * The name of the operation.
+     * This will be used to identify the operation in the span.
+     */
+    name: string;
+    /**
+     * The SQL query to run.
+     * Use {paramName: Type} to define parameters
+     * Example: `SELECT * FROM table WHERE id = {id: String}`
+     */
+    query: string;
+    /**
+     * The schema of the parameters
+     * Example: z.object({ id: z.string() })
+     */
+    params?: TIn;
+    /**
+     * The schema of the output of each row
+     * Example: z.object({ id: z.string() })
+     */
+    schema: TOut;
+    /**
+     * The settings to use for the query.
+     * These will be merged with the default settings.
+     */
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryWithStatsFunction<z.input<TIn>, z.output<TOut>> {
+    return async (params, options) => {
+      const queryId = randomUUID();
+
+      return await startSpan(this.tracer, "queryWithStats", async (span) => {
+        this.logger.debug("Querying clickhouse with stats", {
+          name: req.name,
+          query: req.query.replace(/\s+/g, " "),
+          params,
+          settings: req.settings,
+          attributes: options?.attributes,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.clientName": this.name,
+          "clickhouse.operationName": req.name,
+          "clickhouse.queryId": queryId,
+          ...flattenAttributes(req.settings, "clickhouse.settings"),
+          ...flattenAttributes(options?.attributes),
+        });
+
+        const validParams = req.params?.safeParse(params);
+
+        if (validParams?.error) {
+          recordSpanError(span, validParams.error);
+
+          this.logger.error("Error parsing query params", {
+            name: req.name,
+            error: validParams.error,
+            query: req.query,
+            params,
+            queryId,
+          });
+
+          return [
+            new QueryError(`Bad params: ${generateErrorMessage(validParams.error.issues)}`, {
+              query: req.query,
+            }),
+            null,
+          ];
+        }
+
+        let unparsedRows: Array<TOut> = [];
+
+        const [clickhouseError, res] = await tryCatch(
+          this.client.query({
+            query: req.query,
+            query_params: validParams?.data,
+            format: "JSONEachRow",
+            query_id: queryId,
+            ...options?.params,
+            clickhouse_settings: {
+              ...req.settings,
+              ...options?.params?.clickhouse_settings,
+            },
+          })
+        );
+
+        if (clickhouseError) {
+          this.logger.error("Error querying clickhouse", {
+            name: req.name,
+            error: clickhouseError,
+            query: req.query,
+            params,
+            queryId,
+          });
+
+          recordClickhouseError(span, clickhouseError);
+
+          return [
+            new QueryError(`Unable to query clickhouse: ${clickhouseError.message}`, {
+              query: req.query,
+            }),
+            null,
+          ];
+        }
+
+        unparsedRows = await res.json();
+
+        span.setAttributes({
+          "clickhouse.query_id": res.query_id,
+          ...flattenAttributes(res.response_headers, "clickhouse.response_headers"),
+        });
+
+        // Parse the summary header to get stats
+        const summaryHeader = res.response_headers["x-clickhouse-summary"];
+        let stats: QueryStats = {
+          read_rows: "0",
+          read_bytes: "0",
+          written_rows: "0",
+          written_bytes: "0",
+          total_rows_to_read: "0",
+          result_rows: "0",
+          result_bytes: "0",
+          elapsed_ns: "0",
+          byte_seconds: "0",
+        };
+
+        if (typeof summaryHeader === "string") {
+          const parsedSummary = JSON.parse(summaryHeader);
+          this.logger.debug("parsedSummary", parsedSummary);
+          const readBytes = parsedSummary.read_bytes ? parseInt(parsedSummary.read_bytes, 10) : 0;
+          const elapsedNs = parsedSummary.elapsed_ns ? parseInt(parsedSummary.elapsed_ns, 10) : 0;
+          const elapsedSeconds = elapsedNs / 1_000_000_000;
+          const byteSeconds = elapsedSeconds > 0 ? readBytes / elapsedSeconds : 0;
+          stats = {
+            read_rows: parsedSummary.read_rows ?? "0",
+            read_bytes: parsedSummary.read_bytes ?? "0",
+            written_rows: parsedSummary.written_rows ?? "0",
+            written_bytes: parsedSummary.written_bytes ?? "0",
+            total_rows_to_read: parsedSummary.total_rows_to_read ?? "0",
+            result_rows: parsedSummary.result_rows ?? "0",
+            result_bytes: parsedSummary.result_bytes ?? "0",
+            elapsed_ns: parsedSummary.elapsed_ns ?? "0",
+            byte_seconds: byteSeconds.toString(),
+          };
+          span.setAttributes({
+            ...flattenAttributes(parsedSummary, "clickhouse.summary"),
+          });
+        }
+
+        const parsed = z.array(req.schema).safeParse(unparsedRows);
+
+        if (parsed.error) {
+          this.logger.error("Error parsing clickhouse query result", {
+            name: req.name,
+            error: parsed.error,
+            query: req.query,
+            params,
+            queryId,
+          });
+
+          const queryError = new QueryError(generateErrorMessage(parsed.error.issues), {
+            query: req.query,
+          });
+
+          recordSpanError(span, queryError);
+
+          return [queryError, null];
+        }
+
+        span.setAttributes({
+          "clickhouse.rows": unparsedRows.length,
+        });
+
+        return [null, { rows: parsed.data, stats }];
+      });
+    };
+  }
+
+  public queryFast<TOut extends Record<string, any>, TParams extends Record<string, any>>(req: {
+    name: string;
+    query: string;
+    columns: Array<string | ColumnExpression>;
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryFunction<TParams, TOut> {
+    return async (params, options) => {
+      const queryId = randomUUID();
+
+      return await startSpan(this.tracer, "queryFast", async (span) => {
+        this.logger.debug("Querying clickhouse fast", {
+          name: req.name,
+          query: req.query.replace(/\s+/g, " "),
+          params,
+          settings: req.settings,
+          attributes: options?.attributes,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.clientName": this.name,
+          "clickhouse.operationName": req.name,
+          "clickhouse.queryId": queryId,
+          ...flattenAttributes(req.settings, "clickhouse.settings"),
+          ...flattenAttributes(options?.attributes),
+        });
+
+        const [clickhouseError, resultSet] = await tryCatch(
+          this.client.query({
+            query: req.query,
+            query_params: params,
+            format: "JSONCompactEachRow",
+            query_id: queryId,
+            ...options?.params,
+            clickhouse_settings: {
+              ...req.settings,
+              ...options?.params?.clickhouse_settings,
+            },
+          })
+        );
+
+        if (clickhouseError) {
+          this.logger.error("Error querying clickhouse", {
+            name: req.name,
+            error: clickhouseError,
+            query: req.query,
+            params,
+            queryId,
+          });
+
+          recordClickhouseError(span, clickhouseError);
+
+          return [
+            new QueryError(`Unable to query clickhouse: ${clickhouseError.message}`, {
+              query: req.query,
+            }),
+            null,
+          ];
+        }
+
+        span.setAttributes({
+          "clickhouse.query_id": resultSet.query_id,
+          ...flattenAttributes(resultSet.response_headers, "clickhouse.response_headers"),
+        });
+
+        const summaryHeader = resultSet.response_headers["x-clickhouse-summary"];
+
+        if (typeof summaryHeader === "string") {
+          span.setAttributes({
+            ...flattenAttributes(JSON.parse(summaryHeader), "clickhouse.summary"),
+          });
+        }
+
+        const resultRows: Array<TOut> = [];
+
+        for await (const rows of resultSet.stream()) {
+          if (rows.length === 0) {
+            continue;
+          }
+
+          for (const row of rows) {
+            const rowData = row.json();
+
+            const hydratedRow: Record<string, any> = {};
+            for (let i = 0; i < req.columns.length; i++) {
+              const column = req.columns[i];
+
+              if (typeof column === "string") {
+                hydratedRow[column] = rowData[i];
+              } else {
+                hydratedRow[column.name] = rowData[i];
+              }
+            }
+            resultRows.push(hydratedRow as TOut);
+          }
+        }
+
+        span.setAttributes({
+          "clickhouse.rows": resultRows.length,
+        });
+
+        return [null, resultRows];
+      });
+    };
+  }
+
   public queryBuilder<TOut extends z.ZodSchema<any>>(req: {
     name: string;
     baseQuery: string;
@@ -237,6 +530,19 @@ export class ClickhouseClient implements ClickhouseReader, ClickhouseWriter {
       });
   }
 
+  public queryBuilderFast<TOut extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    columns: string[];
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryBuilderFastFunction<TOut> {
+    return (chSettings) =>
+      new ClickhouseQueryFastBuilder(req.name, req.table, req.columns, this, {
+        ...req.settings,
+        ...chSettings?.settings,
+      });
+  }
+
   public insert<TSchema extends z.ZodSchema<any>>(req: {
     name: string;
     table: string;
@@ -340,26 +646,272 @@ export class ClickhouseClient implements ClickhouseReader, ClickhouseWriter {
       });
     };
   }
+
+  public insertCompact<TRecord extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    columns: readonly string[];
+    toArray: (record: TRecord) => any[];
+    settings?: ClickHouseSettings;
+  }): ClickhouseInsertFunction<TRecord> {
+    return async (events, options) => {
+      const queryId = randomUUID();
+
+      return await startSpan(this.tracer, "insert", async (span) => {
+        const eventsArray = Array.isArray(events) ? events : [events];
+
+        this.logger.debug("Inserting into clickhouse (compact)", {
+          clientName: this.name,
+          name: req.name,
+          table: req.table,
+          events: eventsArray.length,
+          settings: req.settings,
+          attributes: options?.attributes,
+          options,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.clientName": this.name,
+          "clickhouse.tableName": req.table,
+          "clickhouse.operationName": req.name,
+          "clickhouse.queryId": queryId,
+          "clickhouse.format": "JSONCompactEachRowWithNames",
+          ...flattenAttributes(req.settings, "clickhouse.settings"),
+          ...flattenAttributes(options?.attributes),
+        });
+
+        // Build compact format: [columns, ...rows]
+        const compactData: any[] = [Array.from(req.columns)];
+        for (let i = 0; i < eventsArray.length; i++) {
+          compactData.push(req.toArray(eventsArray[i]));
+        }
+
+        const [clickhouseError, result] = await tryCatch(
+          this.client.insert({
+            table: req.table,
+            format: "JSONCompactEachRowWithNames",
+            values: compactData,
+            query_id: queryId,
+            ...options?.params,
+            clickhouse_settings: {
+              ...req.settings,
+              ...options?.params?.clickhouse_settings,
+            },
+          })
+        );
+
+        if (clickhouseError) {
+          this.logger.error("Error inserting into clickhouse", {
+            name: req.name,
+            error: clickhouseError,
+            table: req.table,
+          });
+
+          recordClickhouseError(span, clickhouseError);
+          return [new InsertError(clickhouseError.message), null];
+        }
+
+        return [null, result];
+      });
+    };
+  }
+
+  public insertUnsafe<TRecord extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    settings?: ClickHouseSettings;
+  }): ClickhouseInsertFunction<TRecord> {
+    return async (events, options) => {
+      const queryId = randomUUID();
+
+      return await startSpan(this.tracer, "insert", async (span) => {
+        const eventsArray = Array.isArray(events) ? events : [events];
+
+        this.logger.debug("Inserting into clickhouse", {
+          clientName: this.name,
+          name: req.name,
+          table: req.table,
+          events: eventsArray.length,
+          settings: req.settings,
+          attributes: options?.attributes,
+          options,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.clientName": this.name,
+          "clickhouse.tableName": req.table,
+          "clickhouse.operationName": req.name,
+          "clickhouse.queryId": queryId,
+          ...flattenAttributes(req.settings, "clickhouse.settings"),
+          ...flattenAttributes(options?.attributes),
+        });
+
+        const [clickhouseError, result] = await tryCatch(
+          this.client.insert({
+            table: req.table,
+            format: "JSONEachRow",
+            values: eventsArray,
+            query_id: queryId,
+            ...options?.params,
+            clickhouse_settings: {
+              ...req.settings,
+              ...options?.params?.clickhouse_settings,
+            },
+          })
+        );
+
+        if (clickhouseError) {
+          this.logger.error("Error inserting into clickhouse", {
+            name: req.name,
+            error: clickhouseError,
+            table: req.table,
+          });
+
+          recordClickhouseError(span, clickhouseError);
+
+          return [new InsertError(clickhouseError.message), null];
+        }
+
+        this.logger.debug("Inserted into clickhouse", {
+          clientName: this.name,
+          name: req.name,
+          table: req.table,
+          result,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.query_id": result.query_id,
+          "clickhouse.executed": result.executed,
+          "clickhouse.summary.read_rows": result.summary?.read_rows,
+          "clickhouse.summary.read_bytes": result.summary?.read_bytes,
+          "clickhouse.summary.written_rows": result.summary?.written_rows,
+          "clickhouse.summary.written_bytes": result.summary?.written_bytes,
+          "clickhouse.summary.total_rows_to_read": result.summary?.total_rows_to_read,
+          "clickhouse.summary.result_rows": result.summary?.result_rows,
+          "clickhouse.summary.result_bytes": result.summary?.result_bytes,
+          "clickhouse.summary.elapsed_ns": result.summary?.elapsed_ns,
+        });
+
+        return [null, result];
+      });
+    };
+  }
+
+  public insertCompactRaw(req: {
+    name: string;
+    table: string;
+    columns: readonly string[];
+    settings?: ClickHouseSettings;
+  }): (
+    events: readonly any[][] | any[],
+    options?: {
+      attributes?: Record<string, string | number | boolean>;
+      params?: BaseQueryParams;
+    }
+  ) => Promise<Result<InsertResult, InsertError>> {
+    return async (events, options) => {
+      const queryId = randomUUID();
+
+      return await startSpan(this.tracer, "insert", async (span) => {
+        // Check if events is a single row (array) or multiple rows (array of arrays)
+        // If first element is not an array, treat as single row
+        const isSingleRow = events.length > 0 && !Array.isArray(events[0]);
+        const eventsArray: readonly any[][] = isSingleRow
+          ? [events as any[]]
+          : (events as readonly any[][]);
+
+        this.logger.debug("Inserting into clickhouse (compact raw)", {
+          clientName: this.name,
+          name: req.name,
+          table: req.table,
+          events: eventsArray.length,
+          settings: req.settings,
+          attributes: options?.attributes,
+          options,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.clientName": this.name,
+          "clickhouse.tableName": req.table,
+          "clickhouse.operationName": req.name,
+          "clickhouse.queryId": queryId,
+          "clickhouse.format": "JSONCompactEachRowWithNames",
+          ...flattenAttributes(req.settings, "clickhouse.settings"),
+          ...flattenAttributes(options?.attributes),
+        });
+
+        // Build compact format: [columns, ...rows]
+        // Data is already in array format, no conversion needed
+        const compactData: any[] = [Array.from(req.columns), ...eventsArray];
+
+        const [clickhouseError, result] = await tryCatch(
+          this.client.insert({
+            table: req.table,
+            format: "JSONCompactEachRowWithNames",
+            values: compactData,
+            query_id: queryId,
+            ...options?.params,
+            clickhouse_settings: {
+              ...req.settings,
+              ...options?.params?.clickhouse_settings,
+            },
+          })
+        );
+
+        if (clickhouseError) {
+          this.logger.error("Error inserting into clickhouse", {
+            name: req.name,
+            error: clickhouseError,
+            table: req.table,
+          });
+
+          recordClickhouseError(span, clickhouseError);
+          return [new InsertError(clickhouseError.message), null];
+        }
+
+        this.logger.debug("Inserted into clickhouse", {
+          clientName: this.name,
+          name: req.name,
+          table: req.table,
+          result,
+          queryId,
+        });
+
+        span.setAttributes({
+          "clickhouse.query_id": result.query_id,
+          "clickhouse.executed": result.executed,
+          "clickhouse.summary.read_rows": result.summary?.read_rows,
+          "clickhouse.summary.read_bytes": result.summary?.read_bytes,
+          "clickhouse.summary.written_rows": result.summary?.written_rows,
+          "clickhouse.summary.written_bytes": result.summary?.written_bytes,
+          "clickhouse.summary.total_rows_to_read": result.summary?.total_rows_to_read,
+          "clickhouse.summary.result_rows": result.summary?.result_rows,
+          "clickhouse.summary.result_bytes": result.summary?.result_bytes,
+          "clickhouse.summary.elapsed_ns": result.summary?.elapsed_ns,
+        });
+
+        return [null, result];
+      });
+    };
+  }
 }
 
-function recordClickhouseError(span: Span, error: Error) {
+function recordClickhouseError(span: Span, error: Error): void {
   if (error instanceof ClickHouseError) {
     span.setAttributes({
       "clickhouse.error.code": error.code,
       "clickhouse.error.message": error.message,
       "clickhouse.error.type": error.type,
     });
-    recordSpanError(span, error);
-  } else {
-    recordSpanError(span, error);
   }
+  recordSpanError(span, error);
 }
 
-function convertLogLevelToClickhouseLogLevel(logLevel?: LogLevel) {
-  if (!logLevel) {
-    return ClickHouseLogLevel.INFO;
-  }
-
+function convertLogLevelToClickhouseLogLevel(logLevel?: LogLevel): ClickHouseLogLevel {
   switch (logLevel) {
     case "debug":
       return ClickHouseLogLevel.DEBUG;
diff --git a/internal-packages/clickhouse/src/client/noop.ts b/internal-packages/clickhouse/src/client/noop.ts
index 99524af6c39..e0872cada6a 100644
--- a/internal-packages/clickhouse/src/client/noop.ts
+++ b/internal-packages/clickhouse/src/client/noop.ts
@@ -1,10 +1,15 @@
 import { Result } from "@trigger.dev/core/v3";
 import { InsertError, QueryError } from "./errors.js";
-import { ClickhouseQueryBuilderFunction, ClickhouseWriter } from "./types.js";
-import { ClickhouseReader } from "./types.js";
+import {
+  ClickhouseQueryBuilderFastFunction,
+  ClickhouseQueryBuilderFunction,
+  ClickhouseReader,
+  ClickhouseWriter,
+  QueryResultWithStats,
+} from "./types.js";
 import { z } from "zod";
 import { ClickHouseSettings, InsertResult } from "@clickhouse/client";
-import { ClickhouseQueryBuilder } from "./queryBuilder.js";
+import { ClickhouseQueryBuilder, ClickhouseQueryFastBuilder } from "./queryBuilder.js";
 
 export class NoopClient implements ClickhouseReader, ClickhouseWriter {
   public async close() {
@@ -21,6 +26,16 @@ export class NoopClient implements ClickhouseReader, ClickhouseWriter {
       new ClickhouseQueryBuilder(req.name, req.baseQuery, this, req.schema, req.settings);
   }
 
+  public queryBuilderFast<TOut extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    columns: string[];
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryBuilderFastFunction<TOut> {
+    return () =>
+      new ClickhouseQueryFastBuilder(req.name, req.table, req.columns, this, req.settings);
+  }
+
   public query<TIn extends z.ZodSchema<any>, TOut extends z.ZodSchema<any>>(req: {
     query: string;
     params?: TIn;
@@ -37,6 +52,49 @@ export class NoopClient implements ClickhouseReader, ClickhouseWriter {
     };
   }
 
+  public queryWithStats<TIn extends z.ZodSchema<any>, TOut extends z.ZodSchema<any>>(req: {
+    query: string;
+    params?: TIn;
+    schema: TOut;
+  }): (params: z.input<TIn>) => Promise<Result<QueryResultWithStats<z.output<TOut>>, QueryError>> {
+    return async (params: z.input<TIn>) => {
+      const validParams = req.params?.safeParse(params);
+
+      if (validParams?.error) {
+        return [new QueryError(`Bad params: ${validParams.error.message}`, { query: "" }), null];
+      }
+
+      return [
+        null,
+        {
+          rows: [],
+          stats: {
+            read_rows: "0",
+            read_bytes: "0",
+            written_rows: "0",
+            written_bytes: "0",
+            total_rows_to_read: "0",
+            result_rows: "0",
+            result_bytes: "0",
+            elapsed_ns: "0",
+            byte_seconds: "0",
+          },
+        },
+      ];
+    };
+  }
+
+  public queryFast<TOut extends Record<string, any>, TParams extends Record<string, any>>(req: {
+    name: string;
+    query: string;
+    columns: string[];
+    settings?: ClickHouseSettings;
+  }): (params: TParams) => Promise<Result<TOut[], QueryError>> {
+    return async (params: TParams) => {
+      return [null, []];
+    };
+  }
+
   public insert<TSchema extends z.ZodSchema<any>>(req: {
     name: string;
     table: string;
@@ -74,4 +132,88 @@ export class NoopClient implements ClickhouseReader, ClickhouseWriter {
       ];
     };
   }
+
+  public insertUnsafe<TRecord extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    settings?: ClickHouseSettings;
+  }): (events: TRecord | TRecord[]) => Promise<Result<InsertResult, InsertError>> {
+    return async (events: TRecord | TRecord[]) => {
+      return [
+        null,
+        {
+          executed: true,
+          query_id: "noop",
+          summary: {
+            read_rows: "0",
+            read_bytes: "0",
+            written_rows: "0",
+            written_bytes: "0",
+            total_rows_to_read: "0",
+            result_rows: "0",
+            result_bytes: "0",
+            elapsed_ns: "0",
+          },
+          response_headers: {},
+        },
+      ];
+    };
+  }
+
+  public insertCompact<TRecord extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    columns: readonly string[];
+    toArray: (record: TRecord) => any[];
+    settings?: ClickHouseSettings;
+  }): (events: TRecord | TRecord[]) => Promise<Result<InsertResult, InsertError>> {
+    return async (events: TRecord | TRecord[]) => {
+      return [
+        null,
+        {
+          executed: true,
+          query_id: "noop",
+          summary: {
+            read_rows: "0",
+            read_bytes: "0",
+            written_rows: "0",
+            written_bytes: "0",
+            total_rows_to_read: "0",
+            result_rows: "0",
+            result_bytes: "0",
+            elapsed_ns: "0",
+          },
+          response_headers: {},
+        },
+      ];
+    };
+  }
+
+  public insertCompactRaw(req: {
+    name: string;
+    table: string;
+    columns: readonly string[];
+    settings?: ClickHouseSettings;
+  }): (events: readonly any[][] | any[]) => Promise<Result<InsertResult, InsertError>> {
+    return async (events: readonly any[][] | any[]) => {
+      return [
+        null,
+        {
+          executed: true,
+          query_id: "noop",
+          summary: {
+            read_rows: "0",
+            read_bytes: "0",
+            written_rows: "0",
+            written_bytes: "0",
+            total_rows_to_read: "0",
+            result_rows: "0",
+            result_bytes: "0",
+            elapsed_ns: "0",
+          },
+          response_headers: {},
+        },
+      ];
+    };
+  }
 }
diff --git a/internal-packages/clickhouse/src/client/queryBuilder.ts b/internal-packages/clickhouse/src/client/queryBuilder.ts
index d944a07bccf..e802fc11bf3 100644
--- a/internal-packages/clickhouse/src/client/queryBuilder.ts
+++ b/internal-packages/clickhouse/src/client/queryBuilder.ts
@@ -1,9 +1,14 @@
 import { z } from "zod";
-import { ClickhouseQueryFunction, ClickhouseReader } from "./types.js";
+import { ClickhouseQueryFunction, ClickhouseReader, ColumnExpression } from "./types.js";
 import { ClickHouseSettings } from "@clickhouse/client";
 export type QueryParamValue = string | number | boolean | Array<string | number | boolean> | null;
 export type QueryParams = Record<string, QueryParamValue>;
 
+export type WhereCondition = {
+  clause: string;
+  params?: QueryParams;
+};
+
 export class ClickhouseQueryBuilder<TOutput> {
   private name: string;
   private baseQuery: string;
@@ -45,6 +50,20 @@ export class ClickhouseQueryBuilder<TOutput> {
     return this;
   }
 
+  whereOr(conditions: WhereCondition[]): this {
+    if (conditions.length === 0) {
+      return this;
+    }
+    const combinedClause = conditions.map((c) => `(${c.clause})`).join(" OR ");
+    this.whereClauses.push(`(${combinedClause})`);
+    for (const condition of conditions) {
+      if (condition.params) {
+        Object.assign(this.params, condition.params);
+      }
+    }
+    return this;
+  }
+
   groupBy(clause: string): this {
     this.groupByClause = clause;
     return this;
@@ -91,3 +110,136 @@ export class ClickhouseQueryBuilder<TOutput> {
     return { query, params: this.params };
   }
 }
+
+export class ClickhouseQueryFastBuilder<TOutput extends Record<string, any>> {
+  private name: string;
+  private table: string;
+  private columns: Array<string | ColumnExpression>;
+  private reader: ClickhouseReader;
+  private settings: ClickHouseSettings | undefined;
+  private prewhereClauses: string[] = [];
+  private whereClauses: string[] = [];
+  private params: QueryParams = {};
+  private orderByClause: string | null = null;
+  private limitClause: string | null = null;
+  private groupByClause: string | null = null;
+
+  constructor(
+    name: string,
+    table: string,
+    columns: Array<string | ColumnExpression>,
+    reader: ClickhouseReader,
+    settings?: ClickHouseSettings
+  ) {
+    this.name = name;
+    this.table = table;
+    this.columns = columns;
+    this.reader = reader;
+    this.settings = settings;
+  }
+
+  /**
+   * Add a PREWHERE clause - filters applied before reading columns.
+   * Use for primary key columns (environment_id, start_time) to reduce I/O.
+   */
+  prewhere(clause: string, params?: QueryParams): this {
+    this.prewhereClauses.push(clause);
+    if (params) {
+      Object.assign(this.params, params);
+    }
+    return this;
+  }
+
+  prewhereIf(condition: any, clause: string, params?: QueryParams): this {
+    if (condition) {
+      this.prewhere(clause, params);
+    }
+    return this;
+  }
+
+  where(clause: string, params?: QueryParams): this {
+    this.whereClauses.push(clause);
+    if (params) {
+      Object.assign(this.params, params);
+    }
+    return this;
+  }
+
+  whereIf(condition: any, clause: string, params?: QueryParams): this {
+    if (condition) {
+      this.where(clause, params);
+    }
+    return this;
+  }
+
+  whereOr(conditions: WhereCondition[]): this {
+    if (conditions.length === 0) {
+      return this;
+    }
+    const combinedClause = conditions.map((c) => `(${c.clause})`).join(" OR ");
+    this.whereClauses.push(`(${combinedClause})`);
+    for (const condition of conditions) {
+      if (condition.params) {
+        Object.assign(this.params, condition.params);
+      }
+    }
+    return this;
+  }
+
+  groupBy(clause: string): this {
+    this.groupByClause = clause;
+    return this;
+  }
+
+  orderBy(clause: string): this {
+    this.orderByClause = clause;
+    return this;
+  }
+
+  limit(limit: number): this {
+    this.limitClause = `LIMIT ${limit}`;
+    return this;
+  }
+
+  execute(): ReturnType<ClickhouseQueryFunction<void, TOutput>> {
+    const { query, params } = this.build();
+
+    const queryFunction = this.reader.queryFast<TOutput, Record<string, any>>({
+      name: this.name,
+      query,
+      columns: this.columns,
+      settings: this.settings,
+    });
+
+    return queryFunction(params);
+  }
+
+  build(): { query: string; params: QueryParams } {
+    let query = `SELECT ${this.buildColumns().join(", ")} FROM ${this.table}`;
+    if (this.prewhereClauses.length > 0) {
+      query += " PREWHERE " + this.prewhereClauses.join(" AND ");
+    }
+    if (this.whereClauses.length > 0) {
+      query += " WHERE " + this.whereClauses.join(" AND ");
+    }
+    if (this.groupByClause) {
+      query += ` GROUP BY ${this.groupByClause}`;
+    }
+    if (this.orderByClause) {
+      query += ` ORDER BY ${this.orderByClause}`;
+    }
+    if (this.limitClause) {
+      query += ` ${this.limitClause}`;
+    }
+    return { query, params: this.params };
+  }
+
+  buildColumns(): string[] {
+    return this.columns.map((column) => {
+      if (typeof column === "string") {
+        return column;
+      }
+      return [column.expression, column.name].join(" AS ");
+    });
+  }
+}
diff --git a/internal-packages/clickhouse/src/client/tsql.ts b/internal-packages/clickhouse/src/client/tsql.ts
new file mode 100644
index 00000000000..0a8367e7173
--- /dev/null
+++ b/internal-packages/clickhouse/src/client/tsql.ts
@@ -0,0 +1,345 @@
+/**
+ * TSQL Query Execution for ClickHouse
+ *
+ * This module provides a safe interface for executing TSQL queries against ClickHouse
+ * with enforced WHERE clause conditions (tenant isolation + plan limits) and SQL injection protection.
+ */
+
+import type { ClickHouseSettings } from "@clickhouse/client";
+import { z } from "zod";
+import {
+  compileTSQL,
+  sanitizeErrorMessage,
+  transformResults,
+  type TableSchema,
+  type QuerySettings,
+  type FieldMappings,
+  type TimeRange,
+  type WhereClauseCondition
+} from "@internal/tsql";
+import type { ClickhouseReader, QueryStats } from "./types.js";
+import { QueryError } from "./errors.js";
+import type { OutputColumnMetadata } from "@internal/tsql";
+import { Logger } from "@trigger.dev/core/logger";
+
+const logger = new Logger("tsql", "info");
+
+export type { QueryStats };
+
+export type { TableSchema, QuerySettings, FieldMappings, TimeRange, WhereClauseCondition };
+
+/**
+ * Options for executing a TSQL query
+ */
+export interface ExecuteTSQLOptions<TOut extends z.ZodSchema> {
+  /** The name of the operation (for logging/tracing) */
+  name: string;
+  /** The TSQL query string to execute */
+  query: string;
+  /** The Zod schema for validating output rows */
+  schema: TOut;
+  /** Schema registry defining allowed tables and columns */
+  tableSchema: TableSchema[];
+  /**
+   * REQUIRED: Conditions always applied at the table level.
+   * Must include tenant columns (e.g., organization_id) for multi-tenant tables.
+   * Applied to every table reference including subqueries, CTEs, and JOINs.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   // Tenant isolation
+   *   organization_id: { op: "eq", value: "org_123" },
+   *   project_id: { op: "eq", value: "proj_456" },
+   *   environment_id: { op: "eq", value: "env_789" },
+   *   // Plan-based time limit
+   *   triggered_at: { op: "gte", value: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000) }
+   * }
+   * ```
+   */
+  enforcedWhereClause: Record<string, WhereClauseCondition | undefined>;
+  /** Optional ClickHouse query settings */
+  clickhouseSettings?: ClickHouseSettings;
+  /** Optional TSQL query settings (maxRows, timezone, etc.) */
+  querySettings?: Partial<QuerySettings>;
+  /**
+   * Whether to transform result values using the schema's valueMap
+   * When enabled, internal ClickHouse values (e.g., 'COMPLETED_SUCCESSFULLY')
+   * are converted to user-friendly display names (e.g., 'Completed')
+   * @default true
+   */
+  transformValues?: boolean;
+  /**
+   * Runtime field mappings for dynamic value translation.
+   * Maps internal ClickHouse values to external user-facing values.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   project: { "cm12345": "my-project-ref" },
+   * }
+   * ```
+   */
+  fieldMappings?: FieldMappings;
+  /**
+   * Run EXPLAIN instead of executing the query.
+   * Returns the ClickHouse execution plan with index information.
+   * Should only be used by admins for debugging query performance.
+   * @default false
+   */
+  explain?: boolean;
+  /**
+   * Fallback WHERE conditions to apply when the user hasn't filtered on a column.
+   * Key is the column name, value is the fallback condition.
+   * These are applied at the AST level (top-level query only).
+   *
+   * @example
+   * ```typescript
+   * // Apply triggered_at >= 7 days ago if user doesn't filter on triggered_at
+   * whereClauseFallback: {
+   *   triggered_at: { op: 'gte', value: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000) }
+   * }
+   * ```
+   */
+  whereClauseFallback?: Record<string, WhereClauseCondition>;
+  /**
+   * Time range for `timeBucket()` interval calculation.
+   * When provided, `timeBucket()` uses this to determine the appropriate bucket size
+   * based on the span of the time range.
+   */
+  timeRange?: TimeRange;
+}
+
+/**
+ * Successful result from TSQL query execution
+ */
+export interface TSQLQuerySuccess<T> {
+  rows: T[];
+  columns: OutputColumnMetadata[];
+  stats: QueryStats;
+  /**
+   * Columns that were hidden when SELECT * was used.
+   * Only populated when SELECT * is transformed to core columns only.
+   */
+  hiddenColumns?: string[];
+  /**
+   * Whether the result count equals the maxRows limit.
+   * When true, the results may be truncated and more rows may exist.
+   */
+  reachedMaxRows: boolean;
+  /**
+   * The raw EXPLAIN output from ClickHouse.
+   * Only populated when `explain: true` is passed.
+   */
+  explainOutput?: string;
+  /**
+   * The generated ClickHouse SQL query.
+   * Only populated when `explain: true` is passed.
+   */
+  generatedSql?: string;
+}
+
+/**
+ * Result type for TSQL query execution
+ */
+export type TSQLQueryResult<T> = [QueryError, null] | [null, TSQLQuerySuccess<T>];
+
+/**
+ * Execute a TSQL query against ClickHouse
+ *
+ * This function:
+ * 1. Compiles the TSQL query to ClickHouse SQL (parse, validate, inject enforced WHERE clauses)
+ * 2. Executes the query and returns validated results
+ *
+ * @example
+ * ```typescript
+ * const [error, rows] = await executeTSQL(reader, {
+ *   name: "get_task_runs",
+ *   query: "SELECT id, status FROM task_runs WHERE status = 'completed' ORDER BY created_at DESC LIMIT 100",
+ *   schema: z.object({ id: z.string(), status: z.string() }),
+ *   tableSchema: [taskRunsSchema],
+ *   enforcedWhereClause: {
+ *     organization_id: { op: "eq", value: "org_123" },
+ *     project_id: { op: "eq", value: "proj_456" },
+ *     environment_id: { op: "eq", value: "env_789" },
+ *   },
+ * });
+ * ```
+ */
+export async function executeTSQL<TOut extends z.ZodSchema>(
+  reader: ClickhouseReader,
+  options: ExecuteTSQLOptions<TOut>
+): Promise<TSQLQueryResult<z.output<TOut>>> {
+  const shouldTransformValues = options.transformValues ?? true;
+  const isExplain = options.explain ?? false;
+  const maxRows = options.querySettings?.maxRows;
+
+  let generatedSql: string | undefined;
+  let generatedParams: Record<string, unknown> | undefined;
+
+  try {
+    // 1. Compile the TSQL query to ClickHouse SQL
+    // Pass maxRows + 1 to fetch one extra row for overflow detection
+    const compiledSettings = maxRows !== undefined
+      ? { ...options.querySettings, maxRows: maxRows + 1 }
+      : options.querySettings;
+
+    const { sql, params, columns, hiddenColumns } = compileTSQL(options.query, {
+      tableSchema: options.tableSchema,
+      enforcedWhereClause: options.enforcedWhereClause,
+      settings: compiledSettings,
+      fieldMappings: options.fieldMappings,
+      whereClauseFallback: options.whereClauseFallback,
+      timeRange: options.timeRange,
+    });
+
+    generatedSql = sql;
+    generatedParams = params;
+
+    // 2. Execute the query (or EXPLAIN) with stats
+    const queryToExecute = isExplain ? `EXPLAIN indexes = 1 ${sql}` : sql;
+
+    const queryFn = reader.queryWithStats({
+      name: isExplain ? `${options.name}-explain` : options.name,
+      query: queryToExecute,
+      params: z.record(z.any()),
+      // EXPLAIN returns rows with an 'explain' column
+      schema: isExplain ? z.object({ explain: z.string() }) : options.schema,
+      settings: options.clickhouseSettings,
+    });
+
+    const [error, result] = await queryFn(params);
+
+    if (error) {
+      // Sanitize error message to show TSQL names instead of ClickHouse internals
+      const sanitizedMessage = sanitizeErrorMessage(error.message, options.tableSchema);
+      return [new QueryError(sanitizedMessage, { query: options.query }), null];
+    }
+
+    const { rows, stats } = result;
+
+    // Handle EXPLAIN mode - run multiple explain types and combine outputs
+    if (isExplain) {
+      const explainRows = rows as Array<{ explain: string }>;
+      const indexesOutput = explainRows.map((r) => r.explain).join("\n");
+
+      // Run additional explain queries for more comprehensive output
+      const explainTypes = [
+        { name: "ESTIMATE", query: `EXPLAIN ESTIMATE ${sql}` },
+        { name: "PIPELINE", query: `EXPLAIN PIPELINE ${sql}` },
+      ];
+
+      const additionalOutputs: string[] = [];
+
+      for (const explainType of explainTypes) {
+        try {
+          const additionalQueryFn = reader.queryWithStats({
+            name: `${options.name}-explain-${explainType.name.toLowerCase()}`,
+            query: explainType.query,
+            params: z.record(z.any()),
+            schema: z.object({ explain: z.string() }),
+            settings: options.clickhouseSettings,
+          });
+
+          const [additionalError, additionalResult] = await additionalQueryFn(params);
+
+          if (!additionalError && additionalResult) {
+            const additionalRows = additionalResult.rows as Array<{ explain: string }>;
+            const output = additionalRows.map((r) => r.explain).join("\n");
+            additionalOutputs.push(`── ${explainType.name} ──\n${output}`);
+          }
+        } catch {
+          // Ignore errors from additional explain queries
+        }
+      }
+
+      // Combine all explain outputs
+      const combinedOutput = ["── INDEXES ──", indexesOutput, "", ...additionalOutputs].join("\n");
+
+      return [
+        null,
+        {
+          rows: [] as z.output<TOut>[],
+          columns: [],
+          stats,
+          hiddenColumns,
+          reachedMaxRows: false,
+          explainOutput: combinedOutput,
+          generatedSql,
+        },
+      ];
+    }
+
+    // Determine if we exceeded maxRows (we fetched maxRows + 1 to detect overflow)
+    const reachedMaxRows = maxRows !== undefined && rows !== undefined && rows.length > maxRows;
+
+    // Remove the overflow row if we got one (pop is O(1), slice would be O(n))
+    const finalRows = rows ?? [];
+    if (reachedMaxRows) {
+      finalRows.pop();
+    }
+
+    // Build the result, including hiddenColumns if present
+    const baseResult = { columns, stats, hiddenColumns, reachedMaxRows };
+
+    // 3. Transform result values if enabled
+    if (shouldTransformValues && finalRows.length > 0) {
+      const transformedRows = transformResults(
+        finalRows as Record<string, unknown>[],
+        options.tableSchema,
+        { fieldMappings: options.fieldMappings }
+      );
+      return [null, { rows: transformedRows as z.output<TOut>[], ...baseResult }];
+    }
+
+    return [null, { rows: finalRows as z.output<TOut>[], ...baseResult }];
+  } catch (error) {
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
+
+    // Log TSQL compilation or unexpected errors (with original message for debugging)
+    logger.error("[TSQL] Query error", {
+      name: options.name,
+      error: errorMessage,
+      tsql: options.query,
+      generatedSql: generatedSql ?? "(compilation failed)",
+      generatedParams: generatedParams ?? {},
+    });
+
+    // Sanitize error message to show TSQL names instead of ClickHouse internals
+    const sanitizedMessage = sanitizeErrorMessage(errorMessage, options.tableSchema);
+
+    if (error instanceof Error) {
+      return [new QueryError(sanitizedMessage, { query: options.query }), null];
+    }
+    return [new QueryError("Unknown error executing TSQL query", { query: options.query }), null];
+  }
+}
+
+/**
+ * Create a reusable TSQL query executor bound to specific table schemas
+ *
+ * @example
+ * ```typescript
+ * const tsqlExecutor = createTSQLExecutor(reader, [taskRunsSchema, taskEventsSchema]);
+ *
+ * const [error, rows] = await tsqlExecutor.execute({
+ *   name: "get_task_runs",
+ *   query: "SELECT * FROM task_runs LIMIT 10",
+ *   schema: taskRunRowSchema,
+ *   enforcedWhereClause: {
+ *     organization_id: { op: "eq", value: "org_123" },
+ *     project_id: { op: "eq", value: "proj_456" },
+ *     environment_id: { op: "eq", value: "env_789" },
+ *   },
+ * });
+ * ```
+ */
+export function createTSQLExecutor(reader: ClickhouseReader, tableSchema: TableSchema[]) {
+  return {
+    execute: <TOut extends z.ZodSchema>(
+      options: Omit<ExecuteTSQLOptions<TOut>, "tableSchema">
+    ): Promise<TSQLQueryResult<z.output<TOut>>> => {
+      return executeTSQL(reader, { ...options, tableSchema });
+    },
+  };
+}
diff --git a/internal-packages/clickhouse/src/client/types.ts b/internal-packages/clickhouse/src/client/types.ts
index 02ad3de5d0b..71204225081 100644
--- a/internal-packages/clickhouse/src/client/types.ts
+++ b/internal-packages/clickhouse/src/client/types.ts
@@ -3,7 +3,7 @@ import type { z } from "zod";
 import type { InsertError, QueryError } from "./errors.js";
 import { ClickHouseSettings } from "@clickhouse/client";
 import type { BaseQueryParams, InsertResult } from "@clickhouse/client";
-import { ClickhouseQueryBuilder } from "./queryBuilder.js";
+import { ClickhouseQueryBuilder, ClickhouseQueryFastBuilder } from "./queryBuilder.js";
 
 export type ClickhouseQueryFunction<TInput, TOutput> = (
   params: TInput,
@@ -13,10 +13,50 @@ export type ClickhouseQueryFunction<TInput, TOutput> = (
   }
 ) => Promise<Result<TOutput[], QueryError>>;
 
+/**
+ * Query statistics returned by ClickHouse
+ */
+export interface QueryStats {
+  read_rows: string;
+  read_bytes: string;
+  written_rows: string;
+  written_bytes: string;
+  total_rows_to_read: string;
+  result_rows: string;
+  result_bytes: string;
+  elapsed_ns: string;
+  byte_seconds: string;
+}
+
+/**
+ * Result type for queries that include stats
+ */
+export interface QueryResultWithStats<TOutput> {
+  rows: TOutput[];
+  stats: QueryStats;
+}
+
+export type ClickhouseQueryWithStatsFunction<TInput, TOutput> = (
+  params: TInput,
+  options?: {
+    attributes?: Record<string, string | number | boolean>;
+    params?: BaseQueryParams;
+  }
+) => Promise<Result<QueryResultWithStats<TOutput>, QueryError>>;
+
 export type ClickhouseQueryBuilderFunction<TOutput> = (options?: {
   settings?: ClickHouseSettings;
 }) => ClickhouseQueryBuilder<TOutput>;
 
+export type ClickhouseQueryBuilderFastFunction<TOutput extends Record<string, any>> = (options?: {
+  settings?: ClickHouseSettings;
+}) => ClickhouseQueryFastBuilder<TOutput>;
+
+export type ColumnExpression = {
+  name: string;
+  expression: string;
+};
+
 export interface ClickhouseReader {
   query<TIn extends z.ZodSchema<any>, TOut extends z.ZodSchema<any>>(req: {
     /**
@@ -47,6 +87,65 @@ export interface ClickhouseReader {
     settings?: ClickHouseSettings;
   }): ClickhouseQueryFunction<z.input<TIn>, z.output<TOut>>;
 
+  /**
+   * Execute a query and return both rows and query statistics.
+   * Same as `query` but includes ClickHouse query stats in the result.
+   */
+  queryWithStats<TIn extends z.ZodSchema<any>, TOut extends z.ZodSchema<any>>(req: {
+    /**
+     * The name of the operation.
+     * This will be used to identify the operation in the span.
+     */
+    name: string;
+    /**
+     * The SQL query to run.
+     * Use {paramName: Type} to define parameters
+     * Example: `SELECT * FROM table WHERE id = {id: String}`
+     */
+    query: string;
+    /**
+     * The schema of the parameters
+     * Example: z.object({ id: z.string() })
+     */
+    params?: TIn;
+    /**
+     * The schema of the output of each row
+     * Example: z.object({ id: z.string() })
+     */
+    schema: TOut;
+    /**
+     * The settings to use for the query.
+     * These will be merged with the default settings.
+     */
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryWithStatsFunction<z.input<TIn>, z.output<TOut>>;
+
+  queryFast<TOut extends Record<string, any>, TParams extends Record<string, any>>(req: {
+    /**
+     * The name of the operation.
+     * This will be used to identify the operation in the span.
+     */
+    name: string;
+    /**
+     * The SQL query to run.
+     * Use {paramName: Type} to define parameters
+     * Example: `SELECT * FROM table WHERE id = {id: String}`
+     */
+    query: string;
+
+    /**
+     * The columns returned by the query, in the order
+     *
+     * @example ["run_id", "created_at", "updated_at"]
+     */
+    columns: Array<string | ColumnExpression>;
+    /**
+     * The settings to use for the query.
+     * These will be merged with the default settings.
+     */
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryFunction<TParams, TOut>;
+
   queryBuilder<TOut extends z.ZodSchema<any>>(req: {
     /**
      * The name of the operation.
@@ -71,6 +170,31 @@ export interface ClickhouseReader {
     settings?: ClickHouseSettings;
   }): ClickhouseQueryBuilderFunction<z.input<TOut>>;
 
+  queryBuilderFast<TOut extends Record<string, any>>(req: {
+    /**
+     * The name of the operation.
+     * This will be used to identify the operation in the span.
+     */
+    name: string;
+    /**
+     * The table to query
+     *
+     * @example trigger_dev.task_runs_v1
+     */
+    table: string;
+    /**
+     * The columns to query
+     *
+     * @example ["run_id", "created_at", "updated_at"]
+     */
+    columns: Array<string | ColumnExpression>;
+    /**
+     * The settings to use for the query.
+     * These will be merged with the default settings.
+     */
+    settings?: ClickHouseSettings;
+  }): ClickhouseQueryBuilderFastFunction<TOut>;
+
   close(): Promise<void>;
 }
 
@@ -90,5 +214,32 @@ export interface ClickhouseWriter {
     settings?: ClickHouseSettings;
   }): ClickhouseInsertFunction<z.input<TSchema>>;
 
+  insertUnsafe<TRecord extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    settings?: ClickHouseSettings;
+  }): ClickhouseInsertFunction<TRecord>;
+
+  insertCompact<TRecord extends Record<string, any>>(req: {
+    name: string;
+    table: string;
+    columns: readonly string[];
+    toArray: (record: TRecord) => any[];
+    settings?: ClickHouseSettings;
+  }): ClickhouseInsertFunction<TRecord>;
+
+  insertCompactRaw(req: {
+    name: string;
+    table: string;
+    columns: readonly string[];
+    settings?: ClickHouseSettings;
+  }): (
+    events: readonly any[][] | any[],
+    options?: {
+      attributes?: Record<string, string | number | boolean>;
+      params?: BaseQueryParams;
+    }
+  ) => Promise<Result<InsertResult, InsertError>>;
+
   close(): Promise<void>;
 }
diff --git a/internal-packages/clickhouse/src/index.ts b/internal-packages/clickhouse/src/index.ts
index 599492eb533..b66ce8e3ed6 100644
--- a/internal-packages/clickhouse/src/index.ts
+++ b/internal-packages/clickhouse/src/index.ts
@@ -1,24 +1,68 @@
-import { ClickHouseSettings } from "@clickhouse/client";
+import type { ClickHouseSettings } from "@clickhouse/client";
+export type { ClickHouseSettings };
 import { ClickhouseClient } from "./client/client.js";
 import { ClickhouseReader, ClickhouseWriter } from "./client/types.js";
 import { NoopClient } from "./client/noop.js";
 import {
-  insertTaskRuns,
-  insertRawTaskRunPayloads,
+  insertTaskRunsCompactArrays,
+  insertRawTaskRunPayloadsCompactArrays,
   getTaskRunsQueryBuilder,
   getTaskActivityQueryBuilder,
   getCurrentRunningStats,
   getAverageDurations,
   getTaskUsageByOrganization,
   getTaskRunsCountQueryBuilder,
+  getTaskRunTagsQueryBuilder,
 } from "./taskRuns.js";
+import {
+  getSpanDetailsQueryBuilder,
+  getSpanDetailsQueryBuilderV2,
+  getTraceDetailedSummaryQueryBuilder,
+  getTraceDetailedSummaryQueryBuilderV2,
+  getTraceSummaryQueryBuilder,
+  getTraceSummaryQueryBuilderV2,
+  insertTaskEvents,
+  insertTaskEventsV2,
+  getLogDetailQueryBuilderV2,
+  getLogsSearchListQueryBuilder,
+} from "./taskEvents.js";
+import { insertMetrics } from "./metrics.js";
 import { Logger, type LogLevel } from "@trigger.dev/core/logger";
 import type { Agent as HttpAgent } from "http";
 import type { Agent as HttpsAgent } from "https";
 
 export type * from "./taskRuns.js";
+export type * from "./taskEvents.js";
+export type * from "./metrics.js";
 export type * from "./client/queryBuilder.js";
 
+// Re-export column constants, indices, and type-safe accessors
+export {
+  TASK_RUN_COLUMNS,
+  TASK_RUN_INDEX,
+  PAYLOAD_COLUMNS,
+  PAYLOAD_INDEX,
+  getTaskRunField,
+  getPayloadField,
+} from "./taskRuns.js";
+
+// TSQL query execution
+export {
+  executeTSQL,
+  createTSQLExecutor,
+  type ExecuteTSQLOptions,
+  type TableSchema,
+  type TSQLQueryResult,
+  type TSQLQuerySuccess,
+  type QueryStats,
+  type FieldMappings,
+  type WhereClauseCondition,
+} from "./client/tsql.js";
+export type { ColumnFormatType, OutputColumnMetadata } from "@internal/tsql";
+
+// Errors
+export { QueryError } from "./client/errors.js";
+
 export type ClickhouseCommonConfig = {
   keepAlive?: {
     enabled?: boolean;
@@ -143,14 +187,46 @@ export class ClickHouse {
 
   get taskRuns() {
     return {
-      insert: insertTaskRuns(this.writer),
-      insertPayloads: insertRawTaskRunPayloads(this.writer),
+      insertCompactArrays: insertTaskRunsCompactArrays(this.writer),
+      insertPayloadsCompactArrays: insertRawTaskRunPayloadsCompactArrays(this.writer),
       queryBuilder: getTaskRunsQueryBuilder(this.reader),
       countQueryBuilder: getTaskRunsCountQueryBuilder(this.reader),
+      tagQueryBuilder: getTaskRunTagsQueryBuilder(this.reader),
       getTaskActivity: getTaskActivityQueryBuilder(this.reader),
       getCurrentRunningStats: getCurrentRunningStats(this.reader),
       getAverageDurations: getAverageDurations(this.reader),
       getTaskUsageByOrganization: getTaskUsageByOrganization(this.reader),
     };
   }
+
+  get taskEvents() {
+    return {
+      insert: insertTaskEvents(this.writer),
+      traceSummaryQueryBuilder: getTraceSummaryQueryBuilder(this.reader),
+      traceDetailedSummaryQueryBuilder: getTraceDetailedSummaryQueryBuilder(this.reader),
+      spanDetailsQueryBuilder: getSpanDetailsQueryBuilder(this.reader),
+    };
+  }
+
+  get metrics() {
+    return {
+      insert: insertMetrics(this.writer),
+    };
+  }
+
+  get taskEventsV2() {
+    return {
+      insert: insertTaskEventsV2(this.writer),
+      traceSummaryQueryBuilder: getTraceSummaryQueryBuilderV2(this.reader),
+      traceDetailedSummaryQueryBuilder: getTraceDetailedSummaryQueryBuilderV2(this.reader),
+      spanDetailsQueryBuilder: getSpanDetailsQueryBuilderV2(this.reader),
+      logDetailQueryBuilder: getLogDetailQueryBuilderV2(this.reader),
+    };
+  }
+
+  get taskEventsSearch() {
+    return {
+      logsListQueryBuilder: getLogsSearchListQueryBuilder(this.reader),
+    };
+  }
 }
diff --git a/internal-packages/clickhouse/src/metrics.ts b/internal-packages/clickhouse/src/metrics.ts
new file mode 100644
index 00000000000..0367280f8d6
--- /dev/null
+++ b/internal-packages/clickhouse/src/metrics.ts
@@ -0,0 +1,29 @@
+import { z } from "zod";
+import { ClickhouseWriter } from "./client/types.js";
+
+export const MetricsV1Input = z.object({
+  organization_id: z.string(),
+  project_id: z.string(),
+  environment_id: z.string(),
+  metric_name: z.string(),
+  metric_type: z.string(),
+  metric_subject: z.string(),
+  bucket_start: z.string(),
+  value: z.number(),
+  attributes: z.unknown(),
+});
+
+export type MetricsV1Input = z.input<typeof MetricsV1Input>;
+
+export function insertMetrics(ch: ClickhouseWriter) {
+  return ch.insertUnsafe<MetricsV1Input>({
+    name: "insertMetrics",
+    table: "trigger_dev.metrics_v1",
+    settings: {
+      enable_json_type: 1,
+      type_json_skip_duplicated_paths: 1,
+      input_format_json_throw_on_bad_escape_sequence: 0,
+      input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects: 1,
+    },
+  });
+}
diff --git a/internal-packages/clickhouse/src/taskEvents.ts b/internal-packages/clickhouse/src/taskEvents.ts
new file mode 100644
index 00000000000..bcb96f03a28
--- /dev/null
+++ b/internal-packages/clickhouse/src/taskEvents.ts
@@ -0,0 +1,326 @@
+import { ClickHouseSettings } from "@clickhouse/client";
+import { z } from "zod";
+import { ClickhouseReader, ClickhouseWriter } from "./client/types.js";
+
+export const TaskEventV1Input = z.object({
+  environment_id: z.string(),
+  organization_id: z.string(),
+  project_id: z.string(),
+  task_identifier: z.string(),
+  run_id: z.string(),
+  start_time: z.string(),
+  duration: z.string(),
+  trace_id: z.string(),
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  message: z.string(),
+  kind: z.string(),
+  status: z.string(),
+  attributes: z.unknown(),
+  metadata: z.string(),
+  expires_at: z.string(),
+  machine_id: z.string().optional(),
+});
+
+export type TaskEventV1Input = z.input<typeof TaskEventV1Input>;
+
+export function insertTaskEvents(ch: ClickhouseWriter, settings?: ClickHouseSettings) {
+  return ch.insertUnsafe<TaskEventV1Input>({
+    name: "insertTaskEvents",
+    table: "trigger_dev.task_events_v1",
+    settings: {
+      enable_json_type: 1,
+      type_json_skip_duplicated_paths: 1,
+      input_format_json_throw_on_bad_escape_sequence: 0,
+      input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects: 1,
+      ...settings,
+    },
+  });
+}
+
+export const TaskEventSummaryV1Result = z.object({
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  run_id: z.string(),
+  start_time: z.string(),
+  duration: z.number().or(z.string()),
+  status: z.string(),
+  kind: z.string(),
+  metadata: z.string(),
+  message: z.string(),
+});
+
+export type TaskEventSummaryV1Result = z.output<typeof TaskEventSummaryV1Result>;
+
+export function getTraceSummaryQueryBuilder(ch: ClickhouseReader, settings?: ClickHouseSettings) {
+  return ch.queryBuilderFast<TaskEventSummaryV1Result>({
+    name: "getTraceEvents",
+    table: "trigger_dev.task_events_v1",
+    columns: [
+      "span_id",
+      "parent_span_id",
+      "run_id",
+      "start_time",
+      "duration",
+      "status",
+      "kind",
+      "metadata",
+      { name: "message", expression: "LEFT(message, 256)" },
+    ],
+    settings,
+  });
+}
+
+export const TaskEventDetailedSummaryV1Result = z.object({
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  run_id: z.string(),
+  start_time: z.string(),
+  duration: z.number().or(z.string()),
+  status: z.string(),
+  kind: z.string(),
+  metadata: z.string(),
+  message: z.string(),
+  attributes_text: z.string(),
+});
+
+export type TaskEventDetailedSummaryV1Result = z.output<typeof TaskEventDetailedSummaryV1Result>;
+
+export function getTraceDetailedSummaryQueryBuilder(
+  ch: ClickhouseReader,
+  settings?: ClickHouseSettings
+) {
+  return ch.queryBuilderFast<TaskEventDetailedSummaryV1Result>({
+    name: "getTaskEventDetailedSummary",
+    table: "trigger_dev.task_events_v1",
+    columns: [
+      "span_id",
+      "parent_span_id",
+      "run_id",
+      "start_time",
+      "duration",
+      "status",
+      "kind",
+      "metadata",
+      { name: "message", expression: "LEFT(message, 256)" },
+      "attributes_text",
+    ],
+    settings,
+  });
+}
+
+export const TaskEventDetailsV1Result = z.object({
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  start_time: z.string(),
+  duration: z.number().or(z.string()),
+  status: z.string(),
+  kind: z.string(),
+  metadata: z.string(),
+  message: z.string(),
+  attributes_text: z.string(),
+});
+
+export type TaskEventDetailsV1Result = z.input<typeof TaskEventDetailsV1Result>;
+
+export function getSpanDetailsQueryBuilder(ch: ClickhouseReader, settings?: ClickHouseSettings) {
+  return ch.queryBuilder({
+    name: "getSpanDetails",
+    baseQuery:
+      "SELECT span_id, parent_span_id, start_time, duration, status, kind, metadata, message, attributes_text FROM trigger_dev.task_events_v1",
+    schema: TaskEventDetailsV1Result,
+    settings,
+  });
+}
+
+// ============================================================================
+// V2 Table Functions (partitioned by inserted_at instead of start_time)
+// ============================================================================
+
+export const TaskEventV2Input = z.object({
+  environment_id: z.string(),
+  organization_id: z.string(),
+  project_id: z.string(),
+  task_identifier: z.string(),
+  run_id: z.string(),
+  start_time: z.string(),
+  duration: z.string(),
+  trace_id: z.string(),
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  message: z.string(),
+  kind: z.string(),
+  status: z.string(),
+  attributes: z.unknown(),
+  metadata: z.string(),
+  expires_at: z.string(),
+  machine_id: z.string().optional(),
+  // inserted_at has a default value in the table, so it's optional for inserts
+  inserted_at: z.string().optional(),
+});
+
+export type TaskEventV2Input = z.input<typeof TaskEventV2Input>;
+
+export function insertTaskEventsV2(ch: ClickhouseWriter, settings?: ClickHouseSettings) {
+  return ch.insertUnsafe<TaskEventV2Input>({
+    name: "insertTaskEventsV2",
+    table: "trigger_dev.task_events_v2",
+    settings: {
+      enable_json_type: 1,
+      type_json_skip_duplicated_paths: 1,
+      input_format_json_throw_on_bad_escape_sequence: 0,
+      input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects: 1,
+      ...settings,
+    },
+  });
+}
+
+export function getTraceSummaryQueryBuilderV2(
+  ch: ClickhouseReader,
+  settings?: ClickHouseSettings
+) {
+  return ch.queryBuilderFast<TaskEventSummaryV1Result>({
+    name: "getTraceEventsV2",
+    table: "trigger_dev.task_events_v2",
+    columns: [
+      "span_id",
+      "parent_span_id",
+      "run_id",
+      "start_time",
+      "duration",
+      "status",
+      "kind",
+      "metadata",
+      { name: "message", expression: "LEFT(message, 256)" },
+    ],
+    settings,
+  });
+}
+
+export function getTraceDetailedSummaryQueryBuilderV2(
+  ch: ClickhouseReader,
+  settings?: ClickHouseSettings
+) {
+  return ch.queryBuilderFast<TaskEventDetailedSummaryV1Result>({
+    name: "getTaskEventDetailedSummaryV2",
+    table: "trigger_dev.task_events_v2",
+    columns: [
+      "span_id",
+      "parent_span_id",
+      "run_id",
+      "start_time",
+      "duration",
+      "status",
+      "kind",
+      "metadata",
+      { name: "message", expression: "LEFT(message, 256)" },
+      "attributes_text",
+    ],
+    settings,
+  });
+}
+
+export function getSpanDetailsQueryBuilderV2(
+  ch: ClickhouseReader,
+  settings?: ClickHouseSettings
+) {
+  return ch.queryBuilder({
+    name: "getSpanDetailsV2",
+    baseQuery:
+      "SELECT span_id, parent_span_id, start_time, duration, status, kind, metadata, message, attributes_text FROM trigger_dev.task_events_v2",
+    schema: TaskEventDetailsV1Result,
+    settings,
+  });
+}
+
+
+// ============================================================================
+// Search Table Query Builders (for logs page, using task_events_search_v1)
+// ============================================================================
+
+export const LogsSearchListResult = z.object({
+  environment_id: z.string(),
+  organization_id: z.string(),
+  project_id: z.string(),
+  task_identifier: z.string(),
+  run_id: z.string(),
+  start_time: z.string(),
+  trace_id: z.string(),
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  message: z.string(),
+  kind: z.string(),
+  status: z.string(),
+  duration: z.number().or(z.string()),
+  attributes_text: z.string(),
+  triggered_timestamp: z.string(),
+});
+
+export type LogsSearchListResult = z.output<typeof LogsSearchListResult>;
+
+export function getLogsSearchListQueryBuilder(ch: ClickhouseReader) {
+  return ch.queryBuilderFast<LogsSearchListResult>({
+    name: "getLogsSearchList",
+    table: "trigger_dev.task_events_search_v1",
+    columns: [
+      "environment_id",
+      "organization_id",
+      "project_id",
+      "task_identifier",
+      "run_id",
+      "start_time",
+      "trace_id",
+      "span_id",
+      "parent_span_id",
+      { name: "message", expression: "LEFT(message, 512)" },
+      "kind",
+      "status",
+      "duration",
+      "attributes_text",
+      "triggered_timestamp",
+    ],
+  });
+}
+
+// Single log detail query builder (for side panel)
+export const LogDetailV2Result = z.object({
+  environment_id: z.string(),
+  organization_id: z.string(),
+  project_id: z.string(),
+  task_identifier: z.string(),
+  run_id: z.string(),
+  start_time: z.string(),
+  trace_id: z.string(),
+  span_id: z.string(),
+  parent_span_id: z.string(),
+  message: z.string(),
+  kind: z.string(),
+  status: z.string(),
+  duration: z.number().or(z.string()),
+  attributes_text: z.string()
+});
+
+export type LogDetailV2Result = z.output<typeof LogDetailV2Result>;
+
+export function getLogDetailQueryBuilderV2(ch: ClickhouseReader) {
+  return ch.queryBuilderFast<LogDetailV2Result>({
+    name: "getLogDetail",
+    table: "trigger_dev.task_events_v2",
+    columns: [
+      "environment_id",
+      "organization_id",
+      "project_id",
+      "task_identifier",
+      "run_id",
+      "start_time",
+      "trace_id",
+      "span_id",
+      "parent_span_id",
+      "message",
+      "kind",
+      "status",
+      "duration",
+      "attributes_text",
+    ],
+  });
+}
\ No newline at end of file
diff --git a/internal-packages/clickhouse/src/taskRuns.test.ts b/internal-packages/clickhouse/src/taskRuns.test.ts
index b51c9f38c01..ea218d4bc0d 100644
--- a/internal-packages/clickhouse/src/taskRuns.test.ts
+++ b/internal-packages/clickhouse/src/taskRuns.test.ts
@@ -1,7 +1,13 @@
 import { clickhouseTest } from "@internal/testcontainers";
 import { z } from "zod";
 import { ClickhouseClient } from "./client/client.js";
-import { getTaskRunsQueryBuilder, insertRawTaskRunPayloads, insertTaskRuns } from "./taskRuns.js";
+import {
+  getTaskRunsQueryBuilder,
+  insertRawTaskRunPayloadsCompactArrays,
+  insertTaskRunsCompactArrays,
+  type TaskRunInsertArray,
+  type PayloadInsertArray,
+} from "./taskRuns.js";
 
 describe("Task Runs V2", () => {
   clickhouseTest("should be able to insert task runs", async ({ clickhouseContainer }) => {
@@ -11,61 +17,66 @@ describe("Task Runs V2", () => {
       logLevel: "debug",
     });
 
-    const insert = insertTaskRuns(client, {
+    const insert = insertTaskRunsCompactArrays(client, {
       async_insert: 0, // turn off async insert for this test
     });
 
-    const insertPayloads = insertRawTaskRunPayloads(client, {
+    const insertPayloads = insertRawTaskRunPayloadsCompactArrays(client, {
       async_insert: 0, // turn off async insert for this test
     });
 
-    const [insertError, insertResult] = await insert([
-      {
-        environment_id: "env_1234",
-        environment_type: "DEVELOPMENT",
-        organization_id: "org_1234",
-        project_id: "project_1234",
-        run_id: "run_1234",
-        friendly_id: "friendly_1234",
-        attempt: 1,
-        engine: "V2",
-        status: "PENDING",
-        task_identifier: "my-task",
-        queue: "my-queue",
-        schedule_id: "schedule_1234",
-        batch_id: "batch_1234",
-        created_at: Date.now(),
-        updated_at: Date.now(),
-        completed_at: undefined,
-        tags: ["tag1", "tag2"],
-        output: {
-          key: "value",
-        },
-        error: {
-          type: "BUILT_IN_ERROR",
-          name: "Error",
-          message: "error",
-          stackTrace: "stack trace",
-        },
-        usage_duration_ms: 1000,
-        cost_in_cents: 100,
-        task_version: "1.0.0",
-        sdk_version: "1.0.0",
-        cli_version: "1.0.0",
-        machine_preset: "small-1x",
-        is_test: true,
-        span_id: "span_1234",
-        trace_id: "trace_1234",
-        idempotency_key: "idempotency_key_1234",
-        expiration_ttl: "1h",
-        root_run_id: "root_run_1234",
-        parent_run_id: "parent_run_1234",
-        depth: 1,
-        concurrency_key: "concurrency_key_1234",
-        bulk_action_group_ids: ["bulk_action_group_id_1234", "bulk_action_group_id_1235"],
-        _version: "1",
-      },
-    ]);
+    const now = Date.now();
+    const taskRunData: TaskRunInsertArray = [
+      "env_1234", // environment_id
+      "org_1234", // organization_id
+      "project_1234", // project_id
+      "run_1234", // run_id
+      now, // updated_at
+      now, // created_at
+      "PENDING", // status
+      "DEVELOPMENT", // environment_type
+      "friendly_1234", // friendly_id
+      1, // attempt
+      "V2", // engine
+      "my-task", // task_identifier
+      "my-queue", // queue
+      "schedule_1234", // schedule_id
+      "batch_1234", // batch_id
+      null, // completed_at
+      null, // started_at
+      null, // executed_at
+      null, // delay_until
+      null, // queued_at
+      null, // expired_at
+      1000, // usage_duration_ms
+      100, // cost_in_cents
+      0, // base_cost_in_cents
+      { data: { key: "value" } }, // output
+      { data: { type: "BUILT_IN_ERROR", name: "Error", message: "error", stackTrace: "stack trace" } }, // error
+      ["tag1", "tag2"], // tags
+      "1.0.0", // task_version
+      "1.0.0", // sdk_version
+      "1.0.0", // cli_version
+      "small-1x", // machine_preset
+      "root_run_1234", // root_run_id
+      "parent_run_1234", // parent_run_id
+      1, // depth
+      "span_1234", // span_id
+      "trace_1234", // trace_id
+      "idempotency_key_1234", // idempotency_key
+      "my-user-key", // idempotency_key_user
+      "run", // idempotency_key_scope
+      "1h", // expiration_ttl
+      true, // is_test
+      "1", // _version
+      0, // _is_deleted
+      "concurrency_key_1234", // concurrency_key
+      ["bulk_action_group_id_1234", "bulk_action_group_id_1235"], // bulk_action_group_ids
+      "", // worker_queue
+      null, // max_duration_in_seconds
+    ];
+
+    const [insertError, insertResult] = await insert([taskRunData]);
 
     expect(insertError).toBeNull();
     expect(insertResult).toEqual(expect.objectContaining({ executed: true }));
@@ -99,15 +110,13 @@ describe("Task Runs V2", () => {
       ])
     );
 
-    const [insertPayloadsError, insertPayloadsResult] = await insertPayloads([
-      {
-        run_id: "run_1234",
-        created_at: Date.now(),
-        payload: {
-          key: "value",
-        },
-      },
-    ]);
+    const payloadData: PayloadInsertArray = [
+      "run_1234", // run_id
+      Date.now(), // created_at
+      { data: { key: "value" } }, // payload
+    ];
+
+    const [insertPayloadsError, insertPayloadsResult] = await insertPayloads([payloadData]);
 
     expect(insertPayloadsError).toBeNull();
     expect(insertPayloadsResult).toEqual(expect.objectContaining({ executed: true }));
@@ -137,96 +146,114 @@ describe("Task Runs V2", () => {
       url: clickhouseContainer.getConnectionUrl(),
     });
 
-    const insert = insertTaskRuns(client, {
+    const insert = insertTaskRunsCompactArrays(client, {
       async_insert: 0, // turn off async insert for this test
     });
 
-    const [insertError, insertResult] = await insert([
-      {
-        environment_id: "cm9kddfcs01zqdy88ld9mmrli",
-        organization_id: "cm8zs78wb0002dy616dg75tv3",
-        project_id: "cm9kddfbz01zpdy88t9dstecu",
-        run_id: "cma45oli70002qrdy47w0j4n7",
-        environment_type: "PRODUCTION",
-        friendly_id: "run_cma45oli70002qrdy47w0j4n7",
-        attempt: 1,
-        engine: "V2",
-        status: "PENDING",
-        task_identifier: "retry-task",
-        queue: "task/retry-task",
-        schedule_id: "",
-        batch_id: "",
-        root_run_id: "",
-        parent_run_id: "",
-        depth: 0,
-        span_id: "538677637f937f54",
-        trace_id: "20a28486b0b9f50c647b35e8863e36a5",
-        idempotency_key: "",
-        created_at: new Date("2025-04-30 16:34:04.312").getTime(),
-        updated_at: new Date("2025-04-30 16:34:04.312").getTime(),
-        started_at: null,
-        executed_at: null,
-        completed_at: null,
-        delay_until: null,
-        queued_at: new Date("2025-04-30 16:34:04.311").getTime(),
-        expired_at: null,
-        expiration_ttl: "",
-        usage_duration_ms: 0,
-        cost_in_cents: 0,
-        base_cost_in_cents: 0,
-        output: null,
-        error: null,
-        tags: [],
-        task_version: "",
-        sdk_version: "",
-        cli_version: "",
-        machine_preset: "",
-        is_test: true,
-        _version: "1",
-      },
-      {
-        environment_id: "cm9kddfcs01zqdy88ld9mmrli",
-        organization_id: "cm8zs78wb0002dy616dg75tv3",
-        project_id: "cm9kddfbz01zpdy88t9dstecu",
-        run_id: "cma45oli70002qrdy47w0j4n7",
-        environment_type: "PRODUCTION",
-        friendly_id: "run_cma45oli70002qrdy47w0j4n7",
-        attempt: 1,
-        engine: "V2",
-        status: "COMPLETED_SUCCESSFULLY",
-        task_identifier: "retry-task",
-        queue: "task/retry-task",
-        schedule_id: "",
-        batch_id: "",
-        root_run_id: "",
-        parent_run_id: "",
-        depth: 0,
-        span_id: "538677637f937f54",
-        trace_id: "20a28486b0b9f50c647b35e8863e36a5",
-        idempotency_key: "",
-        created_at: new Date("2025-04-30 16:34:04.312").getTime(),
-        updated_at: new Date("2025-04-30 16:34:04.312").getTime(),
-        started_at: null,
-        executed_at: null,
-        completed_at: null,
-        delay_until: null,
-        queued_at: new Date("2025-04-30 16:34:04.311").getTime(),
-        expired_at: null,
-        expiration_ttl: "",
-        usage_duration_ms: 0,
-        cost_in_cents: 0,
-        base_cost_in_cents: 0,
-        output: null,
-        error: null,
-        tags: [],
-        task_version: "",
-        sdk_version: "",
-        cli_version: "",
-        machine_preset: "",
-        is_test: true,
-        _version: "2",
-      },
-    ]);
+    const createdAt = new Date("2025-04-30 16:34:04.312").getTime();
+    const queuedAt = new Date("2025-04-30 16:34:04.311").getTime();
+
+    const run1: TaskRunInsertArray = [
+      "cm9kddfcs01zqdy88ld9mmrli", // environment_id
+      "cm8zs78wb0002dy616dg75tv3", // organization_id
+      "cm9kddfbz01zpdy88t9dstecu", // project_id
+      "cma45oli70002qrdy47w0j4n7", // run_id
+      createdAt, // updated_at
+      createdAt, // created_at
+      "PENDING", // status
+      "PRODUCTION", // environment_type
+      "run_cma45oli70002qrdy47w0j4n7", // friendly_id
+      1, // attempt
+      "V2", // engine
+      "retry-task", // task_identifier
+      "task/retry-task", // queue
+      "", // schedule_id
+      "", // batch_id
+      null, // completed_at
+      null, // started_at
+      null, // executed_at
+      null, // delay_until
+      queuedAt, // queued_at
+      null, // expired_at
+      0, // usage_duration_ms
+      0, // cost_in_cents
+      0, // base_cost_in_cents
+      { data: null }, // output
+      { data: null }, // error
+      [], // tags
+      "", // task_version
+      "", // sdk_version
+      "", // cli_version
+      "", // machine_preset
+      "", // root_run_id
+      "", // parent_run_id
+      0, // depth
+      "538677637f937f54", // span_id
+      "20a28486b0b9f50c647b35e8863e36a5", // trace_id
+      "", // idempotency_key
+      "", // idempotency_key_user
+      "", // idempotency_key_scope
+      "", // expiration_ttl
+      true, // is_test
+      "1", // _version
+      0, // _is_deleted
+      "", // concurrency_key
+      [], // bulk_action_group_ids
+      "", // worker_queue
+      null, // max_duration_in_seconds
+    ];
+
+    const run2: TaskRunInsertArray = [
+      "cm9kddfcs01zqdy88ld9mmrli", // environment_id
+      "cm8zs78wb0002dy616dg75tv3", // organization_id
+      "cm9kddfbz01zpdy88t9dstecu", // project_id
+      "cma45oli70002qrdy47w0j4n7", // run_id
+      createdAt, // updated_at
+      createdAt, // created_at
+      "COMPLETED_SUCCESSFULLY", // status
+      "PRODUCTION", // environment_type
+      "run_cma45oli70002qrdy47w0j4n7", // friendly_id
+      1, // attempt
+      "V2", // engine
+      "retry-task", // task_identifier
+      "task/retry-task", // queue
+      "", // schedule_id
+      "", // batch_id
+      null, // completed_at
+      null, // started_at
+      null, // executed_at
+      null, // delay_until
+      queuedAt, // queued_at
+      null, // expired_at
+      0, // usage_duration_ms
+      0, // cost_in_cents
+      0, // base_cost_in_cents
+      { data: null }, // output
+      { data: null }, // error
+      [], // tags
+      "", // task_version
+      "", // sdk_version
+      "", // cli_version
+      "", // machine_preset
+      "", // root_run_id
+      "", // parent_run_id
+      0, // depth
+      "538677637f937f54", // span_id
+      "20a28486b0b9f50c647b35e8863e36a5", // trace_id
+      "", // idempotency_key
+      "", // idempotency_key_user
+      "", // idempotency_key_scope
+      "", // expiration_ttl
+      true, // is_test
+      "2", // _version
+      0, // _is_deleted
+      "", // concurrency_key
+      [], // bulk_action_group_ids
+      "", // worker_queue
+      null, // max_duration_in_seconds
+    ];
+
+    const [insertError, insertResult] = await insert([run1, run2]);
 
     expect(insertError).toBeNull();
     expect(insertResult).toEqual(expect.objectContaining({ executed: true }));
@@ -266,54 +293,64 @@ describe("Task Runs V2", () => {
         url: clickhouseContainer.getConnectionUrl(),
       });
 
-      const insert = insertTaskRuns(client, {
+      const insert = insertTaskRunsCompactArrays(client, {
         async_insert: 0, // turn off async insert for this test
       });
 
-      const [insertError, insertResult] = await insert([
-        {
-          environment_id: "cm9kddfcs01zqdy88ld9mmrli",
-          organization_id: "cm8zs78wb0002dy616dg75tv3",
-          project_id: "cm9kddfbz01zpdy88t9dstecu",
-          run_id: "cma45oli70002qrdy47w0j4n7",
-          environment_type: "PRODUCTION",
-          friendly_id: "run_cma45oli70002qrdy47w0j4n7",
-          attempt: 1,
-          engine: "V2",
-          status: "PENDING",
-          task_identifier: "retry-task",
-          queue: "task/retry-task",
-          schedule_id: "",
-          batch_id: "",
-          root_run_id: "",
-          parent_run_id: "",
-          depth: 0,
-          span_id: "538677637f937f54",
-          trace_id: "20a28486b0b9f50c647b35e8863e36a5",
-          idempotency_key: "",
-          created_at: new Date("2025-04-30 16:34:04.312").getTime(),
-          updated_at: new Date("2025-04-30 16:34:04.312").getTime(),
-          started_at: null,
-          executed_at: null,
-          completed_at: null,
-          delay_until: null,
-          queued_at: new Date("2025-04-30 16:34:04.311").getTime(),
-          expired_at: null,
-          expiration_ttl: "",
-          usage_duration_ms: 0,
-          cost_in_cents: 0,
-          base_cost_in_cents: 0,
-          output: null,
-          error: null,
-          tags: [],
-          task_version: "",
-          sdk_version: "",
-          cli_version: "",
-          machine_preset: "",
-          is_test: true,
-          _version: "1",
-        },
-      ]);
+      const createdAt = new Date("2025-04-30 16:34:04.312").getTime();
+      const queuedAt = new Date("2025-04-30 16:34:04.311").getTime();
+
+      const taskRun: TaskRunInsertArray = [
+        "cm9kddfcs01zqdy88ld9mmrli", // environment_id
+        "cm8zs78wb0002dy616dg75tv3", // organization_id
+        "cm9kddfbz01zpdy88t9dstecu", // project_id
+        "cma45oli70002qrdy47w0j4n7", // run_id
+        createdAt, // updated_at
+        createdAt, // created_at
+        "PENDING", // status
+        "PRODUCTION", // environment_type
+        "run_cma45oli70002qrdy47w0j4n7", // friendly_id
+        1, // attempt
+        "V2", // engine
+        "retry-task", // task_identifier
+        "task/retry-task", // queue
+        "", // schedule_id
+        "", // batch_id
+        null, // completed_at
+        null, // started_at
+        null, // executed_at
+        null, // delay_until
+        queuedAt, // queued_at
+        null, // expired_at
+        0, // usage_duration_ms
+        0, // cost_in_cents
+        0, // base_cost_in_cents
+        { data: null }, // output
+        { data: null }, // error
+        [], // tags
+        "", // task_version
+        "", // sdk_version
+        "", // cli_version
+        "", // machine_preset
+        "", // root_run_id
+        "", // parent_run_id
+        0, // depth
+        "538677637f937f54", // span_id
+        "20a28486b0b9f50c647b35e8863e36a5", // trace_id
+        "", // idempotency_key
+        "", // idempotency_key_user
+        "", // idempotency_key_scope
+        "", // expiration_ttl
+        true, // is_test
+        "1", // _version
+        0, // _is_deleted
+        "", // concurrency_key
+        [], // bulk_action_group_ids
+        "", // worker_queue
+        null, // max_duration_in_seconds
+      ];
+
+      const [insertError, insertResult] = await insert([taskRun]);
 
       const queryBuilder = getTaskRunsQueryBuilder(client)();
       queryBuilder.where("environment_id = {environmentId: String}", {
@@ -360,15 +397,15 @@ describe("Task Runs V2", () => {
         url: clickhouseContainer.getConnectionUrl(),
       });
 
-      const insertPayloads = insertRawTaskRunPayloads(client, {
+      const insertPayloads = insertRawTaskRunPayloadsCompactArrays(client, {
         async_insert: 0, // turn off async insert for this test
       });
 
-      const [insertPayloadsError, insertPayloadsResult] = await insertPayloads([
+      const payloadData: PayloadInsertArray = [
+        "run_1234", // run_id
+        Date.now(), // created_at
         {
-          run_id: "run_1234",
-          created_at: Date.now(),
-          payload: {
+          data: {
             data: {
               title: {
                 id: "123",
@@ -376,8 +413,10 @@ describe("Task Runs V2", () => {
               "title.id": 123,
             },
           },
-        },
-      ]);
+        }, // payload
+      ];
+
+      const [insertPayloadsError, insertPayloadsResult] = await insertPayloads([payloadData]);
 
       expect(insertPayloadsError).toBeNull();
       expect(insertPayloadsResult).toEqual(expect.objectContaining({ executed: true }));
diff --git a/internal-packages/clickhouse/src/taskRuns.ts b/internal-packages/clickhouse/src/taskRuns.ts
index e30affaf84c..8c1d29ac162 100644
--- a/internal-packages/clickhouse/src/taskRuns.ts
+++ b/internal-packages/clickhouse/src/taskRuns.ts
@@ -40,26 +40,168 @@ export const TaskRunV2 = z.object({
   span_id: z.string(),
   trace_id: z.string(),
   idempotency_key: z.string(),
+  idempotency_key_user: z.string().default(""),
+  idempotency_key_scope: z.string().default(""),
   expiration_ttl: z.string(),
   is_test: z.boolean().default(false),
   concurrency_key: z.string().default(""),
   bulk_action_group_ids: z.array(z.string()).default([]),
+  worker_queue: z.string().default(""),
+  max_duration_in_seconds: z.number().int().nullish(),
   _version: z.string(),
   _is_deleted: z.number().int().default(0),
 });
 
 export type TaskRunV2 = z.input<typeof TaskRunV2>;
 
+// Column order for compact format - must match ClickHouse table schema
+export const TASK_RUN_COLUMNS = [
+  "environment_id",
+  "organization_id",
+  "project_id",
+  "run_id",
+  "updated_at",
+  "created_at",
+  "status",
+  "environment_type",
+  "friendly_id",
+  "attempt",
+  "engine",
+  "task_identifier",
+  "queue",
+  "schedule_id",
+  "batch_id",
+  "completed_at",
+  "started_at",
+  "executed_at",
+  "delay_until",
+  "queued_at",
+  "expired_at",
+  "usage_duration_ms",
+  "cost_in_cents",
+  "base_cost_in_cents",
+  "output",
+  "error",
+  "tags",
+  "task_version",
+  "sdk_version",
+  "cli_version",
+  "machine_preset",
+  "root_run_id",
+  "parent_run_id",
+  "depth",
+  "span_id",
+  "trace_id",
+  "idempotency_key",
+  "idempotency_key_user",
+  "idempotency_key_scope",
+  "expiration_ttl",
+  "is_test",
+  "_version",
+  "_is_deleted",
+  "concurrency_key",
+  "bulk_action_group_ids",
+  "worker_queue",
+  "max_duration_in_seconds",
+] as const;
+
+export type TaskRunColumnName = (typeof TASK_RUN_COLUMNS)[number];
+
+// Type-safe column indices generated from TASK_RUN_COLUMNS
+// This ensures indices stay in sync with column order automatically
+export const TASK_RUN_INDEX = Object.fromEntries(
+  TASK_RUN_COLUMNS.map((col, idx) => [col, idx])
+) as { readonly [K in TaskRunColumnName]: number };
+
+/**
+ * Type mapping from column name to its type in TaskRunInsertArray.
+ * This enables type-safe field access without manual casting.
+ */
+export type TaskRunFieldTypes = {
+  environment_id: string;
+  organization_id: string;
+  project_id: string;
+  run_id: string;
+  updated_at: number;
+  created_at: number;
+  status: string;
+  environment_type: string;
+  friendly_id: string;
+  attempt: number;
+  engine: string;
+  task_identifier: string;
+  queue: string;
+  schedule_id: string;
+  batch_id: string;
+  completed_at: number | null;
+  started_at: number | null;
+  executed_at: number | null;
+  delay_until: number | null;
+  queued_at: number | null;
+  expired_at: number | null;
+  usage_duration_ms: number;
+  cost_in_cents: number;
+  base_cost_in_cents: number;
+  output: { data: unknown };
+  error: { data: unknown };
+  tags: string[];
+  task_version: string;
+  sdk_version: string;
+  cli_version: string;
+  machine_preset: string;
+  root_run_id: string;
+  parent_run_id: string;
+  depth: number;
+  span_id: string;
+  trace_id: string;
+  idempotency_key: string;
+  idempotency_key_user: string;
+  idempotency_key_scope: string;
+  expiration_ttl: string;
+  is_test: boolean;
+  _version: string;
+  _is_deleted: number;
+  concurrency_key: string;
+  bulk_action_group_ids: string[];
+  worker_queue: string;
+  max_duration_in_seconds: number | null;
+};
+
+/**
+ * Type-safe accessor for TaskRunInsertArray fields.
+ * Returns the correct type for each field without manual casting.
+ *
+ * @example
+ * const orgId = getTaskRunField(run, "organization_id"); // type: string
+ * const createdAt = getTaskRunField(run, "created_at"); // type: number
+ */
+export function getTaskRunField<K extends TaskRunColumnName>(
+  run: TaskRunInsertArray,
+  field: K
+): TaskRunFieldTypes[K] {
+  return run[TASK_RUN_INDEX[field]] as TaskRunFieldTypes[K];
+}
+
+export function insertTaskRunsCompactArrays(ch: ClickhouseWriter, settings?: ClickHouseSettings) {
+  return ch.insertCompactRaw({
+    name: "insertTaskRunsCompactArrays",
+    table: "trigger_dev.task_runs_v2",
+    columns: TASK_RUN_COLUMNS,
+    settings: {
+      enable_json_type: 1,
+      type_json_skip_duplicated_paths: 1,
+      ...settings,
+    },
+  });
+}
+
+// Object-based insert function for tests and non-performance-critical code
 export function insertTaskRuns(ch: ClickhouseWriter, settings?: ClickHouseSettings) {
   return ch.insert({
     name: "insertTaskRuns",
     table: "trigger_dev.task_runs_v2",
     schema: TaskRunV2,
     settings: {
-      async_insert: 1,
-      wait_for_async_insert: 0,
-      async_insert_max_data_size: "1000000",
-      async_insert_busy_timeout_ms: 1000,
       enable_json_type: 1,
       type_json_skip_duplicated_paths: 1,
       ...settings,
@@ -75,6 +217,116 @@ export const RawTaskRunPayloadV1 = z.object({
 
 export type RawTaskRunPayloadV1 = z.infer<typeof RawTaskRunPayloadV1>;
 
+export const PAYLOAD_COLUMNS = ["run_id", "created_at", "payload"] as const;
+
+export type PayloadColumnName = (typeof PAYLOAD_COLUMNS)[number];
+
+// Type-safe column indices generated from PAYLOAD_COLUMNS
+export const PAYLOAD_INDEX = Object.fromEntries(PAYLOAD_COLUMNS.map((col, idx) => [col, idx])) as {
+  readonly [K in PayloadColumnName]: number;
+};
+
+/**
+ * Type mapping from column name to its type in PayloadInsertArray.
+ */
+export type PayloadFieldTypes = {
+  run_id: string;
+  created_at: number;
+  payload: { data: unknown };
+};
+
+/**
+ * Type-safe accessor for PayloadInsertArray fields.
+ * Returns the correct type for each field without manual casting.
+ */
+export function getPayloadField<K extends PayloadColumnName>(
+  payload: PayloadInsertArray,
+  field: K
+): PayloadFieldTypes[K] {
+  return payload[PAYLOAD_INDEX[field]] as PayloadFieldTypes[K];
+}
+
+/**
+ * Type-safe tuple representing a task run insert array.
+ * Order matches TASK_RUN_COLUMNS exactly.
+ */
+export type TaskRunInsertArray = [
+  environment_id: string,
+  organization_id: string,
+  project_id: string,
+  run_id: string,
+  updated_at: number,
+  created_at: number,
+  status: string,
+  environment_type: string,
+  friendly_id: string,
+  attempt: number,
+  engine: string,
+  task_identifier: string,
+  queue: string,
+  schedule_id: string,
+  batch_id: string,
+  completed_at: number | null,
+  started_at: number | null,
+  executed_at: number | null,
+  delay_until: number | null,
+  queued_at: number | null,
+  expired_at: number | null,
+  usage_duration_ms: number,
+  cost_in_cents: number,
+  base_cost_in_cents: number,
+  output: { data: unknown },
+  error: { data: unknown },
+  tags: string[],
+  task_version: string,
+  sdk_version: string,
+  cli_version: string,
+  machine_preset: string,
+  root_run_id: string,
+  parent_run_id: string,
+  depth: number,
+  span_id: string,
+  trace_id: string,
+  idempotency_key: string,
+  idempotency_key_user: string,
+  idempotency_key_scope: string,
+  expiration_ttl: string,
+  is_test: boolean,
+  _version: string,
+  _is_deleted: number,
+  concurrency_key: string,
+  bulk_action_group_ids: string[],
+  worker_queue: string,
+  max_duration_in_seconds: number | null,
+];
+
+/**
+ * Type-safe tuple representing a payload insert array.
+ * Order matches PAYLOAD_COLUMNS exactly.
+ */
+export type PayloadInsertArray = [run_id: string, created_at: number, payload: { data: unknown }];
+
+export function insertRawTaskRunPayloadsCompactArrays(
+  ch: ClickhouseWriter,
+  settings?: ClickHouseSettings
+) {
+  return ch.insertCompactRaw({
+    name: "insertRawTaskRunPayloadsCompactArrays",
+    table: "trigger_dev.raw_task_runs_payload_v1",
+    columns: PAYLOAD_COLUMNS,
+    settings: {
+      async_insert: 1,
+      wait_for_async_insert: 0,
+      async_insert_max_data_size: "1000000",
+      async_insert_busy_timeout_ms: 1000,
+      enable_json_type: 1,
+      type_json_skip_duplicated_paths: 1,
+      ...settings,
+    },
+  });
+}
+
+// Object-based insert function for tests and non-performance-critical code
 export function insertRawTaskRunPayloads(ch: ClickhouseWriter, settings?: ClickHouseSettings) {
   return ch.insert({
     name: "insertRawTaskRunPayloads",
@@ -118,6 +370,21 @@ export function getTaskRunsCountQueryBuilder(ch: ClickhouseReader, settings?: Cl
   });
 }
 
+export const TaskRunTagsQueryResult = z.object({
+  tag: z.string(),
+});
+
+export type TaskRunTagsQueryResult = z.infer<typeof TaskRunTagsQueryResult>;
+
+export function getTaskRunTagsQueryBuilder(ch: ClickhouseReader, settings?: ClickHouseSettings) {
+  return ch.queryBuilder({
+    name: "getTaskRunTags",
+    baseQuery: "SELECT DISTINCT arrayJoin(tags) as tag FROM trigger_dev.task_runs_v2",
+    schema: TaskRunTagsQueryResult,
+    settings,
+  });
+}
+
 export const TaskActivityQueryResult = z.object({
   task_identifier: z.string(),
   status: z.string(),
diff --git a/internal-packages/clickhouse/src/tsql.test.ts b/internal-packages/clickhouse/src/tsql.test.ts
new file mode 100644
index 00000000000..5c1d6ed8022
--- /dev/null
+++ b/internal-packages/clickhouse/src/tsql.test.ts
@@ -0,0 +1,1614 @@
+import { clickhouseTest } from "@internal/testcontainers";
+import { z } from "zod";
+import { ClickhouseClient } from "./client/client.js";
+import { executeTSQL, createTSQLExecutor, type TableSchema } from "./client/tsql.js";
+import { insertTaskRuns } from "./taskRuns.js";
+import { column } from "@internal/tsql";
+
+/**
+ * Schema definition for task_runs table used in TSQL tests
+ */
+const taskRunsSchema: TableSchema = {
+  name: "task_runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  columns: {
+    run_id: { name: "run_id", ...column("String") },
+    friendly_id: { name: "friendly_id", ...column("String") },
+    status: { name: "status", ...column("String") },
+    task_identifier: { name: "task_identifier", ...column("String") },
+    queue: { name: "queue", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+    environment_type: { name: "environment_type", ...column("String") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    created_at: { name: "created_at", ...column("DateTime") },
+    updated_at: { name: "updated_at", ...column("DateTime") },
+    is_test: { name: "is_test", ...column("Bool") },
+    tags: { name: "tags", ...column("Array(String)") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+const defaultTaskRun = {
+  environment_id: "env_tenant1",
+  environment_type: "DEVELOPMENT",
+  organization_id: "org_tenant1",
+  project_id: "proj_tenant1",
+  run_id: `run_${Math.random().toString(36).slice(2)}`,
+  friendly_id: `friendly_${Math.random().toString(36).slice(2)}`,
+  attempt: 1,
+  engine: "V2",
+  status: "PENDING",
+  task_identifier: "my-task",
+  queue: "my-queue",
+  schedule_id: "",
+  batch_id: "",
+  created_at: Date.now(),
+  updated_at: Date.now(),
+  started_at: null as number | null,
+  completed_at: null as number | null,
+  tags: [] as string[],
+  output: null,
+  error: null,
+  usage_duration_ms: 0,
+  cost_in_cents: 0,
+  base_cost_in_cents: 0,
+  task_version: "",
+  sdk_version: "",
+  cli_version: "",
+  machine_preset: "",
+  is_test: false,
+  span_id: "",
+  trace_id: "",
+  idempotency_key: "",
+  expiration_ttl: "",
+  root_run_id: "",
+  parent_run_id: "",
+  depth: 0,
+  concurrency_key: "",
+  bulk_action_group_ids: [] as string[],
+  _version: "1",
+};
+
+/**
+ * Helper to create test task run data
+ */
+function createTaskRun(overrides: Partial<typeof defaultTaskRun> = {}) {
+  return {
+    ...defaultTaskRun,
+    ...overrides,
+  };
+}
+
+describe("TSQL Integration Tests", () => {
+  clickhouseTest("should execute a simple SELECT query", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    // Insert test data
+    const [insertError] = await insert([
+      createTaskRun({ run_id: "run_test1", status: "COMPLETED_SUCCESSFULLY" }),
+      createTaskRun({ run_id: "run_test2", status: "PENDING" }),
+      createTaskRun({ run_id: "run_test3", status: "COMPLETED_SUCCESSFULLY" }),
+    ]);
+    expect(insertError).toBeNull();
+
+    // Execute TSQL query
+    const [error, result] = await executeTSQL(client, {
+      name: "test-simple-select",
+      query: "SELECT run_id, status FROM task_runs",
+      schema: z.object({ run_id: z.string(), status: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(3);
+    expect(result?.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ run_id: "run_test1", status: "COMPLETED_SUCCESSFULLY" }),
+        expect.objectContaining({ run_id: "run_test2", status: "PENDING" }),
+        expect.objectContaining({ run_id: "run_test3", status: "COMPLETED_SUCCESSFULLY" }),
+      ])
+    );
+    // Verify stats are returned
+    expect(result?.stats).toBeDefined();
+    expect(result?.stats.read_rows).toBeDefined();
+    expect(result?.stats.elapsed_ns).toBeDefined();
+  });
+
+  clickhouseTest("should filter with WHERE clause", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    await insert([
+      createTaskRun({ run_id: "run_filter1", status: "COMPLETED_SUCCESSFULLY" }),
+      createTaskRun({ run_id: "run_filter2", status: "PENDING" }),
+      createTaskRun({ run_id: "run_filter3", status: "COMPLETED_SUCCESSFULLY" }),
+    ]);
+
+    const [error, result] = await executeTSQL(client, {
+      name: "test-where-clause",
+      query: "SELECT run_id, status FROM task_runs WHERE status = 'COMPLETED_SUCCESSFULLY'",
+      schema: z.object({ run_id: z.string(), status: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(2);
+    expect(result?.rows?.every((r) => r.status === "COMPLETED_SUCCESSFULLY")).toBe(true);
+  });
+
+  clickhouseTest("should enforce tenant isolation", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    // Insert data for two different tenants
+    await insert([
+      createTaskRun({
+        run_id: "run_tenant1_a",
+        organization_id: "org_tenant1",
+        project_id: "proj_tenant1",
+        environment_id: "env_tenant1",
+      }),
+      createTaskRun({
+        run_id: "run_tenant1_b",
+        organization_id: "org_tenant1",
+        project_id: "proj_tenant1",
+        environment_id: "env_tenant1",
+      }),
+      createTaskRun({
+        run_id: "run_tenant2_a",
+        organization_id: "org_tenant2",
+        project_id: "proj_tenant2",
+        environment_id: "env_tenant2",
+      }),
+      createTaskRun({
+        run_id: "run_tenant2_b",
+        organization_id: "org_tenant2",
+        project_id: "proj_tenant2",
+        environment_id: "env_tenant2",
+      }),
+    ]);
+
+    // Query as tenant1 - should only see tenant1's data
+    const [error1, result1] = await executeTSQL(client, {
+      name: "test-tenant-isolation-1",
+      query: "SELECT run_id FROM task_runs",
+      schema: z.object({ run_id: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error1).toBeNull();
+    expect(result1?.rows).toHaveLength(2);
+    expect(result1?.rows?.map((r) => r.run_id).sort()).toEqual(["run_tenant1_a", "run_tenant1_b"]);
+
+    // Query as tenant2 - should only see tenant2's data
+    const [error2, result2] = await executeTSQL(client, {
+      name: "test-tenant-isolation-2",
+      query: "SELECT run_id FROM task_runs",
+      schema: z.object({ run_id: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant2" },
+        project_id: { op: "eq", value: "proj_tenant2" },
+        environment_id: { op: "eq", value: "env_tenant2" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error2).toBeNull();
+    expect(result2?.rows).toHaveLength(2);
+    expect(result2?.rows?.map((r) => r.run_id).sort()).toEqual(["run_tenant2_a", "run_tenant2_b"]);
+  });
+
+  clickhouseTest(
+    "should not allow cross-tenant access even with malicious WHERE",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_secret",
+          organization_id: "org_victim",
+          project_id: "proj_victim",
+          environment_id: "env_victim",
+          status: "SECRET_DATA",
+        }),
+        createTaskRun({
+          run_id: "run_attacker",
+          organization_id: "org_attacker",
+          project_id: "proj_attacker",
+          environment_id: "env_attacker",
+        }),
+      ]);
+
+      // Attacker tries to access victim's data with OR 1=1
+      const [error, result] = await executeTSQL(client, {
+        name: "test-cross-tenant-attack",
+        query: "SELECT run_id, status FROM task_runs WHERE status = 'COMPLETED' OR 1=1",
+        schema: z.object({ run_id: z.string(), status: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_attacker" },
+          project_id: { op: "eq", value: "proj_attacker" },
+          environment_id: { op: "eq", value: "env_attacker" },
+        },
+        tableSchema: [taskRunsSchema],
+      });
+
+      expect(error).toBeNull();
+      // Should only get attacker's own data, not victim's
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_attacker");
+      expect(result?.rows?.find((r) => r.run_id === "run_secret")).toBeUndefined();
+    }
+  );
+
+  clickhouseTest("should handle aggregations", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    await insert([
+      createTaskRun({ run_id: "run_agg1", status: "COMPLETED_SUCCESSFULLY" }),
+      createTaskRun({ run_id: "run_agg2", status: "COMPLETED_SUCCESSFULLY" }),
+      createTaskRun({ run_id: "run_agg3", status: "PENDING" }),
+      createTaskRun({ run_id: "run_agg4", status: "FAILED" }),
+    ]);
+
+    const [error, result] = await executeTSQL(client, {
+      name: "test-aggregation",
+      query:
+        "SELECT status, count(*) as cnt FROM task_runs GROUP BY status ORDER BY cnt DESC, status ASC",
+      schema: z.object({ status: z.string(), cnt: z.coerce.number() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(3);
+    expect(result?.rows?.[0]).toEqual({ status: "COMPLETED_SUCCESSFULLY", cnt: 2 });
+    // The remaining rows have cnt=1, check they're both present
+    expect(result?.rows).toEqual(
+      expect.arrayContaining([
+        { status: "PENDING", cnt: 1 },
+        { status: "FAILED", cnt: 1 },
+      ])
+    );
+  });
+
+  clickhouseTest("should handle ORDER BY and LIMIT", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    const now = Date.now();
+    await insert([
+      createTaskRun({ run_id: "run_order1", created_at: now - 3000 }),
+      createTaskRun({ run_id: "run_order2", created_at: now - 1000 }),
+      createTaskRun({ run_id: "run_order3", created_at: now - 2000 }),
+    ]);
+
+    const [error, result] = await executeTSQL(client, {
+      name: "test-order-limit",
+      query: "SELECT run_id FROM task_runs ORDER BY created_at DESC LIMIT 2",
+      schema: z.object({ run_id: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(2);
+    expect(result?.rows?.[0].run_id).toBe("run_order2"); // Most recent
+    expect(result?.rows?.[1].run_id).toBe("run_order3"); // Second most recent
+  });
+
+  clickhouseTest("should reject unknown tables", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const [error, result] = await executeTSQL(client, {
+      name: "test-unknown-table",
+      query: "SELECT * FROM unknown_table",
+      schema: z.object({ id: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).not.toBeNull();
+    expect(error?.message).toContain("unknown_table");
+    expect(result).toBeNull();
+  });
+
+  clickhouseTest("should work with createTSQLExecutor", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    await insert([
+      createTaskRun({ run_id: "run_executor1", status: "COMPLETED_SUCCESSFULLY" }),
+      createTaskRun({ run_id: "run_executor2", status: "PENDING" }),
+    ]);
+
+    // Create a reusable executor
+    const tsql = createTSQLExecutor(client, [taskRunsSchema]);
+
+    const [error, result] = await tsql.execute({
+      name: "test-executor",
+      query: "SELECT run_id, status FROM task_runs WHERE status = 'PENDING'",
+      schema: z.object({ run_id: z.string(), status: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(1);
+    expect(result?.rows?.[0]).toEqual({ run_id: "run_executor2", status: "PENDING" });
+  });
+
+  clickhouseTest("should handle string injection attempts", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    await insert([
+      createTaskRun({ run_id: "run_inject1", status: "NORMAL" }),
+      createTaskRun({ run_id: "run_inject2", status: "DROP TABLE task_runs" }),
+    ]);
+
+    // Query with a "malicious" value that looks like SQL
+    const [error, result] = await executeTSQL(client, {
+      name: "test-injection",
+      query: "SELECT run_id, status FROM task_runs WHERE status = 'DROP TABLE task_runs'",
+      schema: z.object({ run_id: z.string(), status: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    // Should find the row with the literal string value, not execute SQL
+    expect(result?.rows).toHaveLength(1);
+    expect(result?.rows?.[0].status).toBe("DROP TABLE task_runs");
+  });
+
+  clickhouseTest("should handle IN queries", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    await insert([
+      createTaskRun({ run_id: "run_in1", status: "COMPLETED_SUCCESSFULLY" }),
+      createTaskRun({ run_id: "run_in2", status: "PENDING" }),
+      createTaskRun({ run_id: "run_in3", status: "FAILED" }),
+      createTaskRun({ run_id: "run_in4", status: "CANCELLED" }),
+    ]);
+
+    const [error, result] = await executeTSQL(client, {
+      name: "test-in-query",
+      query:
+        "SELECT run_id, status FROM task_runs WHERE status IN ('COMPLETED_SUCCESSFULLY', 'FAILED')",
+      schema: z.object({ run_id: z.string(), status: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(2);
+    expect(result?.rows?.map((r) => r.status).sort()).toEqual(["COMPLETED_SUCCESSFULLY", "FAILED"]);
+  });
+
+  clickhouseTest("should handle LIKE queries", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    await insert([
+      createTaskRun({ run_id: "run_like1", task_identifier: "email/send" }),
+      createTaskRun({ run_id: "run_like2", task_identifier: "email/receive" }),
+      createTaskRun({ run_id: "run_like3", task_identifier: "sms/send" }),
+    ]);
+
+    const [error, result] = await executeTSQL(client, {
+      name: "test-like-query",
+      query: "SELECT run_id, task_identifier FROM task_runs WHERE task_identifier LIKE 'email%'",
+      schema: z.object({ run_id: z.string(), task_identifier: z.string() }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [taskRunsSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(2);
+    expect(result?.rows?.every((r) => r.task_identifier.startsWith("email"))).toBe(true);
+  });
+});
+
+describe("TSQL Optional Tenant Filter Tests", () => {
+  clickhouseTest(
+    "should query across all projects when projectId is omitted",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert data across multiple projects in the same org
+      await insert([
+        createTaskRun({
+          run_id: "run_proj1_a",
+          organization_id: "org_multi",
+          project_id: "proj_1",
+          environment_id: "env_dev",
+        }),
+        createTaskRun({
+          run_id: "run_proj1_b",
+          organization_id: "org_multi",
+          project_id: "proj_1",
+          environment_id: "env_dev",
+        }),
+        createTaskRun({
+          run_id: "run_proj2_a",
+          organization_id: "org_multi",
+          project_id: "proj_2",
+          environment_id: "env_dev",
+        }),
+        createTaskRun({
+          run_id: "run_proj3_a",
+          organization_id: "org_multi",
+          project_id: "proj_3",
+          environment_id: "env_prod",
+        }),
+        // Different org - should not be returned
+        createTaskRun({
+          run_id: "run_other_org",
+          organization_id: "org_other",
+          project_id: "proj_other",
+          environment_id: "env_other",
+        }),
+      ]);
+
+      // Query across all projects (omit projectId and environmentId)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-cross-project-query",
+        query: "SELECT run_id FROM task_runs",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_multi" },
+          // project_id and environment_id omitted - query across all
+        },
+        tableSchema: [taskRunsSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(4); // All runs from org_multi
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual([
+        "run_proj1_a",
+        "run_proj1_b",
+        "run_proj2_a",
+        "run_proj3_a",
+      ]);
+    }
+  );
+
+  clickhouseTest(
+    "should query across all environments in a project when environmentId is omitted",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert data across multiple environments in the same project
+      await insert([
+        createTaskRun({
+          run_id: "run_dev_1",
+          organization_id: "org_envtest",
+          project_id: "proj_envtest",
+          environment_id: "env_development",
+        }),
+        createTaskRun({
+          run_id: "run_staging_1",
+          organization_id: "org_envtest",
+          project_id: "proj_envtest",
+          environment_id: "env_staging",
+        }),
+        createTaskRun({
+          run_id: "run_prod_1",
+          organization_id: "org_envtest",
+          project_id: "proj_envtest",
+          environment_id: "env_production",
+        }),
+        // Different project - should not be returned
+        createTaskRun({
+          run_id: "run_other_proj",
+          organization_id: "org_envtest",
+          project_id: "proj_other",
+          environment_id: "env_development",
+        }),
+      ]);
+
+      // Query across all environments (omit environmentId only)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-cross-env-query",
+        query: "SELECT run_id FROM task_runs",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_envtest" },
+          project_id: { op: "eq", value: "proj_envtest" },
+          // environment_id omitted - query across all environments
+        },
+        tableSchema: [taskRunsSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(3); // All runs from proj_envtest across all envs
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual([
+        "run_dev_1",
+        "run_prod_1",
+        "run_staging_1",
+      ]);
+    }
+  );
+
+  clickhouseTest(
+    "should still enforce org isolation when querying across projects",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert data for multiple orgs
+      await insert([
+        createTaskRun({
+          run_id: "run_org1_a",
+          organization_id: "org_isolation_1",
+          project_id: "proj_a",
+          environment_id: "env_a",
+        }),
+        createTaskRun({
+          run_id: "run_org1_b",
+          organization_id: "org_isolation_1",
+          project_id: "proj_b",
+          environment_id: "env_b",
+        }),
+        createTaskRun({
+          run_id: "run_org2_a",
+          organization_id: "org_isolation_2",
+          project_id: "proj_c",
+          environment_id: "env_c",
+        }),
+        createTaskRun({
+          run_id: "run_org2_b",
+          organization_id: "org_isolation_2",
+          project_id: "proj_d",
+          environment_id: "env_d",
+        }),
+      ]);
+
+      // Query org1 across all projects - should NOT see org2's data
+      const [error1, result1] = await executeTSQL(client, {
+        name: "test-org-isolation-1",
+        query: "SELECT run_id FROM task_runs",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_isolation_1" },
+          // project_id and environment_id omitted
+        },
+        tableSchema: [taskRunsSchema],
+      });
+
+      expect(error1).toBeNull();
+      expect(result1?.rows).toHaveLength(2);
+      expect(result1?.rows?.map((r) => r.run_id).sort()).toEqual(["run_org1_a", "run_org1_b"]);
+
+      // Query org2 across all projects - should NOT see org1's data
+      const [error2, result2] = await executeTSQL(client, {
+        name: "test-org-isolation-2",
+        query: "SELECT run_id FROM task_runs",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_isolation_2" },
+          // project_id and environment_id omitted
+        },
+        tableSchema: [taskRunsSchema],
+      });
+
+      expect(error2).toBeNull();
+      expect(result2?.rows).toHaveLength(2);
+      expect(result2?.rows?.map((r) => r.run_id).sort()).toEqual(["run_org2_a", "run_org2_b"]);
+    }
+  );
+
+  clickhouseTest(
+    "should prevent OR clause bypass with org-only filter",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_victim",
+          organization_id: "org_victim",
+          project_id: "proj_victim",
+          environment_id: "env_victim",
+          status: "SECRET",
+        }),
+        createTaskRun({
+          run_id: "run_attacker",
+          organization_id: "org_attacker",
+          project_id: "proj_attacker",
+          environment_id: "env_attacker",
+          status: "PUBLIC",
+        }),
+      ]);
+
+      // Attacker tries to use OR 1=1 to bypass org filter
+      const [error, result] = await executeTSQL(client, {
+        name: "test-or-bypass-attempt",
+        query: "SELECT run_id, status FROM task_runs WHERE status = 'COMPLETED' OR 1=1",
+        schema: z.object({ run_id: z.string(), status: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_attacker" },
+          // No project/env filter - but org filter should still protect
+        },
+        tableSchema: [taskRunsSchema],
+      });
+
+      expect(error).toBeNull();
+      // Should only get attacker's data, not victim's
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_attacker");
+      expect(result?.rows?.find((r) => r.run_id === "run_victim")).toBeUndefined();
+    }
+  );
+
+  clickhouseTest(
+    "should work with createTSQLExecutor and optional filters",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_exec_1",
+          organization_id: "org_executor_test",
+          project_id: "proj_1",
+          environment_id: "env_1",
+        }),
+        createTaskRun({
+          run_id: "run_exec_2",
+          organization_id: "org_executor_test",
+          project_id: "proj_2",
+          environment_id: "env_2",
+        }),
+      ]);
+
+      const tsql = createTSQLExecutor(client, [taskRunsSchema]);
+
+      // Use executor with org-only filter
+      const [error, result] = await tsql.execute({
+        name: "test-executor-optional",
+        query: "SELECT run_id FROM task_runs",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_executor_test" },
+          // project_id and environment_id omitted
+        },
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(2);
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual(["run_exec_1", "run_exec_2"]);
+    }
+  );
+});
+
+describe("TSQL Virtual Column Tests", () => {
+  /**
+   * Schema with virtual (computed) columns
+   */
+  const virtualColumnSchema: TableSchema = {
+    name: "task_runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      friendly_id: { name: "friendly_id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      task_identifier: { name: "task_identifier", ...column("String") },
+      queue: { name: "queue", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+      environment_type: { name: "environment_type", ...column("String") },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      created_at: { name: "created_at", ...column("DateTime") },
+      updated_at: { name: "updated_at", ...column("DateTime") },
+      started_at: { name: "started_at", ...column("Nullable(DateTime64)") },
+      completed_at: { name: "completed_at", ...column("Nullable(DateTime64)") },
+      usage_duration_ms: { name: "usage_duration_ms", ...column("UInt32") },
+      is_test: { name: "is_test", ...column("Bool") },
+      tags: { name: "tags", ...column("Array(String)") },
+      // Virtual column: execution_duration computes milliseconds between started_at and completed_at
+      execution_duration: {
+        name: "execution_duration",
+        ...column("Nullable(Int64)"),
+        expression: "dateDiff('millisecond', started_at, completed_at)",
+        description: "Time between started_at and completed_at in milliseconds",
+      },
+      // Virtual column: usage_duration_seconds converts ms to seconds
+      usage_duration_seconds: {
+        name: "usage_duration_seconds",
+        ...column("Float64"),
+        expression: "usage_duration_ms / 1000.0",
+        description: "Usage duration in seconds",
+      },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  clickhouseTest(
+    "should select virtual column and compute correct value",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      const now = Date.now();
+      const startedAt = now - 5000; // 5 seconds ago
+      const completedAt = now;
+
+      await insert([
+        createTaskRun({
+          run_id: "run_virtual_1",
+          started_at: startedAt,
+          completed_at: completedAt,
+          usage_duration_ms: 3500,
+        }),
+      ]);
+
+      const [error, result] = await executeTSQL(client, {
+        name: "test-virtual-column-select",
+        query: "SELECT run_id, execution_duration, usage_duration_seconds FROM task_runs",
+        schema: z.object({
+          run_id: z.string(),
+          execution_duration: z.number().nullable(),
+          usage_duration_seconds: z.number(),
+        }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [virtualColumnSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      // execution_duration should be approximately 5000ms (difference between started_at and completed_at)
+      expect(result?.rows?.[0].execution_duration).toBeCloseTo(5000, -2); // within 100ms tolerance
+      // usage_duration_seconds should be 3.5 (3500ms / 1000)
+      expect(result?.rows?.[0].usage_duration_seconds).toBeCloseTo(3.5, 1);
+    }
+  );
+
+  clickhouseTest(
+    "should filter by virtual column in WHERE clause",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      const now = Date.now();
+
+      await insert([
+        createTaskRun({
+          run_id: "run_short",
+          started_at: now - 1000, // 1 second duration
+          completed_at: now,
+        }),
+        createTaskRun({
+          run_id: "run_long",
+          started_at: now - 10000, // 10 second duration
+          completed_at: now,
+        }),
+        createTaskRun({
+          run_id: "run_very_long",
+          started_at: now - 60000, // 60 second duration
+          completed_at: now,
+        }),
+      ]);
+
+      // Query runs with execution_duration > 5000ms (5 seconds)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-virtual-column-where",
+        query: "SELECT run_id FROM task_runs WHERE execution_duration > 5000",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [virtualColumnSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(2);
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual(["run_long", "run_very_long"]);
+    }
+  );
+
+  clickhouseTest("should order by virtual column", async ({ clickhouseContainer }) => {
+    const client = new ClickhouseClient({
+      name: "test",
+      url: clickhouseContainer.getConnectionUrl(),
+    });
+
+    const insert = insertTaskRuns(client, { async_insert: 0 });
+
+    const now = Date.now();
+
+    await insert([
+      createTaskRun({
+        run_id: "run_order_a",
+        usage_duration_ms: 1000,
+      }),
+      createTaskRun({
+        run_id: "run_order_b",
+        usage_duration_ms: 3000,
+      }),
+      createTaskRun({
+        run_id: "run_order_c",
+        usage_duration_ms: 2000,
+      }),
+    ]);
+
+    // Order by usage_duration_seconds descending (virtual column)
+    const [error, result] = await executeTSQL(client, {
+      name: "test-virtual-column-order",
+      query:
+        "SELECT run_id, usage_duration_seconds FROM task_runs ORDER BY usage_duration_seconds DESC",
+      schema: z.object({
+        run_id: z.string(),
+        usage_duration_seconds: z.number(),
+      }),
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_tenant1" },
+        project_id: { op: "eq", value: "proj_tenant1" },
+        environment_id: { op: "eq", value: "env_tenant1" },
+      },
+      tableSchema: [virtualColumnSchema],
+    });
+
+    expect(error).toBeNull();
+    expect(result?.rows).toHaveLength(3);
+    // Should be ordered by usage_duration_seconds DESC: b (3), c (2), a (1)
+    expect(result?.rows?.[0].run_id).toBe("run_order_b");
+    expect(result?.rows?.[0].usage_duration_seconds).toBeCloseTo(3.0, 1);
+    expect(result?.rows?.[1].run_id).toBe("run_order_c");
+    expect(result?.rows?.[1].usage_duration_seconds).toBeCloseTo(2.0, 1);
+    expect(result?.rows?.[2].run_id).toBe("run_order_a");
+    expect(result?.rows?.[2].usage_duration_seconds).toBeCloseTo(1.0, 1);
+  });
+
+  clickhouseTest(
+    "should use virtual column with explicit alias",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_alias_test",
+          usage_duration_ms: 5000,
+        }),
+      ]);
+
+      // Use virtual column with custom alias
+      const [error, result] = await executeTSQL(client, {
+        name: "test-virtual-column-alias",
+        query: "SELECT run_id, usage_duration_seconds AS dur_sec FROM task_runs",
+        schema: z.object({
+          run_id: z.string(),
+          dur_sec: z.number(),
+        }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [virtualColumnSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].dur_sec).toBeCloseTo(5.0, 1);
+    }
+  );
+
+  clickhouseTest(
+    "should handle null values in virtual column expression",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_null_times",
+          // started_at and completed_at will be null
+        }),
+      ]);
+
+      const [error, result] = await executeTSQL(client, {
+        name: "test-virtual-column-null",
+        query: "SELECT run_id, execution_duration FROM task_runs",
+        schema: z.object({
+          run_id: z.string(),
+          execution_duration: z.number().nullable(),
+        }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [virtualColumnSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      // execution_duration should be null when started_at or completed_at is null
+      expect(result?.rows?.[0].execution_duration).toBeNull();
+    }
+  );
+
+  /**
+   * Schema with cost-based virtual columns that use division expressions
+   * This mimics the real runsSchema where invocation_cost = base_cost_in_cents / 100.0
+   */
+  const costExpressionSchema: TableSchema = {
+    name: "task_runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      friendly_id: { name: "friendly_id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      task_identifier: { name: "task_identifier", ...column("String") },
+      queue: { name: "queue", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+      environment_type: { name: "environment_type", ...column("String") },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      created_at: { name: "created_at", ...column("DateTime") },
+      updated_at: { name: "updated_at", ...column("DateTime") },
+      is_test: { name: "is_test", ...column("Bool") },
+      tags: { name: "tags", ...column("Array(String)") },
+      // Raw cost columns stored in ClickHouse
+      cost_in_cents: { name: "cost_in_cents", ...column("Float64") },
+      base_cost_in_cents: { name: "base_cost_in_cents", ...column("Float64") },
+      // Virtual column: compute_cost = cost_in_cents / 100.0
+      compute_cost: {
+        name: "compute_cost",
+        ...column("Float64"),
+        expression: "cost_in_cents / 100.0",
+        description: "Compute cost in dollars (cost_in_cents / 100)",
+      },
+      // Virtual column: invocation_cost = base_cost_in_cents / 100.0
+      invocation_cost: {
+        name: "invocation_cost",
+        ...column("Float64"),
+        expression: "base_cost_in_cents / 100.0",
+        description: "Invocation cost in dollars (base_cost_in_cents / 100)",
+      },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  clickhouseTest(
+    "should filter by expression column with division in WHERE clause",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert runs with different cost values
+      // invocation_cost = base_cost_in_cents / 100.0
+      // So base_cost_in_cents of 500 = invocation_cost of 5.0
+      // And base_cost_in_cents of 50 = invocation_cost of 0.5
+      await insert([
+        createTaskRun({
+          run_id: "run_cheap",
+          base_cost_in_cents: 50, // invocation_cost = 0.5
+          cost_in_cents: 100,
+        }),
+        createTaskRun({
+          run_id: "run_medium",
+          base_cost_in_cents: 200, // invocation_cost = 2.0
+          cost_in_cents: 300,
+        }),
+        createTaskRun({
+          run_id: "run_expensive",
+          base_cost_in_cents: 500, // invocation_cost = 5.0
+          cost_in_cents: 800,
+        }),
+      ]);
+
+      // Query runs where invocation_cost > 1.0 (base_cost_in_cents > 100)
+      // Should return run_medium (2.0) and run_expensive (5.0)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-expression-division-where",
+        query: "SELECT run_id, invocation_cost FROM task_runs WHERE invocation_cost > 1.0",
+        schema: z.object({ run_id: z.string(), invocation_cost: z.number() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [costExpressionSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(2);
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual(["run_expensive", "run_medium"]);
+    }
+  );
+
+  clickhouseTest(
+    "should filter by expression column with greater-than-or-equals comparison",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_1",
+          base_cost_in_cents: 100, // invocation_cost = 1.0
+        }),
+        createTaskRun({
+          run_id: "run_2",
+          base_cost_in_cents: 200, // invocation_cost = 2.0
+        }),
+        createTaskRun({
+          run_id: "run_3",
+          base_cost_in_cents: 50, // invocation_cost = 0.5
+        }),
+      ]);
+
+      // Query runs where invocation_cost >= 1.0
+      // Should return run_1 (1.0) and run_2 (2.0)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-expression-gte-where",
+        query: "SELECT run_id, invocation_cost FROM task_runs WHERE invocation_cost >= 1.0",
+        schema: z.object({ run_id: z.string(), invocation_cost: z.number() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [costExpressionSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(2);
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual(["run_1", "run_2"]);
+    }
+  );
+
+  clickhouseTest(
+    "should filter by expression column with less-than comparison",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_small",
+          base_cost_in_cents: 50, // invocation_cost = 0.5
+        }),
+        createTaskRun({
+          run_id: "run_large",
+          base_cost_in_cents: 300, // invocation_cost = 3.0
+        }),
+      ]);
+
+      // Query runs where invocation_cost < 1.0
+      // Should return only run_small (0.5)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-expression-lt-where",
+        query: "SELECT run_id, invocation_cost FROM task_runs WHERE invocation_cost < 1.0",
+        schema: z.object({ run_id: z.string(), invocation_cost: z.number() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [costExpressionSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_small");
+    }
+  );
+
+  clickhouseTest(
+    "should filter by expression column with BETWEEN comparison",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_low",
+          base_cost_in_cents: 50, // invocation_cost = 0.5
+        }),
+        createTaskRun({
+          run_id: "run_mid",
+          base_cost_in_cents: 150, // invocation_cost = 1.5
+        }),
+        createTaskRun({
+          run_id: "run_high",
+          base_cost_in_cents: 500, // invocation_cost = 5.0
+        }),
+      ]);
+
+      // Query runs where invocation_cost is between 1.0 and 2.0
+      // Should return only run_mid (1.5)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-expression-between-where",
+        query:
+          "SELECT run_id, invocation_cost FROM task_runs WHERE invocation_cost BETWEEN 1.0 AND 2.0",
+        schema: z.object({ run_id: z.string(), invocation_cost: z.number() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [costExpressionSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_mid");
+    }
+  );
+
+  clickhouseTest(
+    "should use expression column in complex WHERE with AND/OR",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      await insert([
+        createTaskRun({
+          run_id: "run_a",
+          status: "COMPLETED_SUCCESSFULLY",
+          base_cost_in_cents: 100, // invocation_cost = 1.0
+        }),
+        createTaskRun({
+          run_id: "run_b",
+          status: "FAILED",
+          base_cost_in_cents: 300, // invocation_cost = 3.0
+        }),
+        createTaskRun({
+          run_id: "run_c",
+          status: "COMPLETED_SUCCESSFULLY",
+          base_cost_in_cents: 300, // invocation_cost = 3.0
+        }),
+      ]);
+
+      // Query completed runs with invocation_cost > 2.0
+      const [error, result] = await executeTSQL(client, {
+        name: "test-expression-complex-where",
+        query:
+          "SELECT run_id FROM task_runs WHERE status = 'COMPLETED_SUCCESSFULLY' AND invocation_cost > 2.0",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [costExpressionSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_c");
+    }
+  );
+
+  clickhouseTest(
+    "should filter by expression column comparing with large integer value",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert runs with large base_cost_in_cents values
+      // So invocation_cost = base_cost_in_cents / 100.0
+      // To get invocation_cost > 100, we need base_cost_in_cents > 10000
+      await insert([
+        createTaskRun({
+          run_id: "run_small_cost",
+          base_cost_in_cents: 500, // invocation_cost = 5.0
+        }),
+        createTaskRun({
+          run_id: "run_medium_cost",
+          base_cost_in_cents: 5000, // invocation_cost = 50.0
+        }),
+        createTaskRun({
+          run_id: "run_large_cost",
+          base_cost_in_cents: 15000, // invocation_cost = 150.0
+        }),
+      ]);
+
+      // Query runs where invocation_cost > 100
+      // Should only return run_large_cost (150.0)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-expression-large-integer-where",
+        query: "SELECT run_id, invocation_cost FROM task_runs WHERE invocation_cost > 100",
+        schema: z.object({ run_id: z.string(), invocation_cost: z.number() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [costExpressionSchema],
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_large_cost");
+      expect(result?.rows?.[0].invocation_cost).toBeCloseTo(150.0, 1);
+    }
+  );
+});
+
+describe("Field Mapping Tests", () => {
+  /**
+   * Schema with a field mapping column (project_ref → project_id)
+   */
+  const fieldMappingSchema: TableSchema = {
+    name: "task_runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      project_ref: {
+        name: "project_ref",
+        clickhouseName: "project_id",
+        ...column("String"),
+        fieldMapping: "project",
+      },
+      environment_id: { name: "environment_id", ...column("String") },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  clickhouseTest(
+    "should transform field mapping values in SELECT results",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert test runs with known project_id values
+      await insert([
+        createTaskRun({
+          run_id: "run_fm1",
+          project_id: "proj_tenant1",
+          status: "COMPLETED_SUCCESSFULLY",
+        }),
+      ]);
+
+      // Execute TSQL query with field mappings
+      const [error, result] = await executeTSQL(client, {
+        name: "test-field-mapping-select",
+        query: "SELECT run_id, project_ref FROM task_runs",
+        schema: z.object({ run_id: z.string(), project_ref: z.string().nullable() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [fieldMappingSchema],
+        fieldMappings: {
+          project: {
+            proj_tenant1: "my-project-ref",
+          },
+        },
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].project_ref).toBe("my-project-ref");
+    }
+  );
+
+  clickhouseTest(
+    "should return null for unmapped values in field mapping",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert test run with a project_id that's NOT in the mapping
+      await insert([
+        createTaskRun({
+          run_id: "run_fm_unmapped",
+          project_id: "proj_tenant1", // This ID exists but won't be in our mapping
+          status: "PENDING",
+        }),
+      ]);
+
+      // Execute with an empty mapping (no project_id mapped)
+      const [error, result] = await executeTSQL(client, {
+        name: "test-field-mapping-unmapped",
+        query: "SELECT run_id, project_ref FROM task_runs WHERE run_id = 'run_fm_unmapped'",
+        schema: z.object({ run_id: z.string(), project_ref: z.string().nullable() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [fieldMappingSchema],
+        fieldMappings: {
+          project: {
+            some_other_id: "other-ref",
+          },
+        },
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].project_ref).toBeNull();
+    }
+  );
+
+  clickhouseTest(
+    "should transform field mapping values in WHERE clause",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert test runs
+      await insert([
+        createTaskRun({
+          run_id: "run_fm_where1",
+          project_id: "proj_tenant1",
+          status: "COMPLETED_SUCCESSFULLY",
+        }),
+        createTaskRun({
+          run_id: "run_fm_where2",
+          project_id: "proj_other",
+          organization_id: "org_tenant1",
+          status: "PENDING",
+        }),
+      ]);
+
+      // Query using external project_ref value in WHERE clause
+      const [error, result] = await executeTSQL(client, {
+        name: "test-field-mapping-where",
+        query: "SELECT run_id FROM task_runs WHERE project_ref = 'my-project-ref'",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          environment_id: { op: "eq", value: "env_tenant1" },
+        },
+        tableSchema: [fieldMappingSchema],
+        fieldMappings: {
+          project: {
+            proj_tenant1: "my-project-ref",
+            proj_other: "other-project",
+          },
+        },
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(1);
+      expect(result?.rows?.[0].run_id).toBe("run_fm_where1");
+    }
+  );
+
+  clickhouseTest(
+    "should handle field mapping with IN clause",
+    async ({ clickhouseContainer }) => {
+      const client = new ClickhouseClient({
+        name: "test",
+        url: clickhouseContainer.getConnectionUrl(),
+      });
+
+      const insert = insertTaskRuns(client, { async_insert: 0 });
+
+      // Insert test runs with different projects
+      await insert([
+        createTaskRun({
+          run_id: "run_fm_in1",
+          project_id: "proj_tenant1",
+          status: "COMPLETED_SUCCESSFULLY",
+        }),
+        createTaskRun({
+          run_id: "run_fm_in2",
+          project_id: "proj_other",
+          organization_id: "org_tenant1",
+          status: "PENDING",
+        }),
+      ]);
+
+      // Query using IN clause with external project_ref values
+      const [error, result] = await executeTSQL(client, {
+        name: "test-field-mapping-in",
+        query:
+          "SELECT run_id FROM task_runs WHERE project_ref IN ('my-project-ref', 'other-project')",
+        schema: z.object({ run_id: z.string() }),
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+        },
+        tableSchema: [fieldMappingSchema],
+        fieldMappings: {
+          project: {
+            proj_tenant1: "my-project-ref",
+            proj_other: "other-project",
+          },
+        },
+      });
+
+      expect(error).toBeNull();
+      expect(result?.rows).toHaveLength(2);
+      expect(result?.rows?.map((r) => r.run_id).sort()).toEqual(["run_fm_in1", "run_fm_in2"]);
+    }
+  );
+});
diff --git a/internal-packages/clickhouse/tsconfig.build.json b/internal-packages/clickhouse/tsconfig.build.json
index 619461da80d..6a71c854eef 100644
--- a/internal-packages/clickhouse/tsconfig.build.json
+++ b/internal-packages/clickhouse/tsconfig.build.json
@@ -6,8 +6,8 @@
     "target": "ES2019",
     "lib": ["ES2019", "DOM", "DOM.Iterable", "DOM.AsyncIterable"],
     "outDir": "dist",
-    "module": "Node16",
-    "moduleResolution": "Node16",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
     "moduleDetection": "force",
     "verbatimModuleSyntax": false,
     "esModuleInterop": true,
@@ -16,6 +16,7 @@
     "preserveWatchOutput": true,
     "skipLibCheck": true,
     "strict": true,
+    "noImplicitAny": false,
     "declaration": true
   }
 }
diff --git a/internal-packages/database/.gitignore b/internal-packages/database/.gitignore
index 586a9f721be..74ffb04b149 100644
--- a/internal-packages/database/.gitignore
+++ b/internal-packages/database/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 # Ensure the .env symlink is not removed by accident
 !.env
+
+generated/prisma
\ No newline at end of file
diff --git a/internal-packages/database/README.md b/internal-packages/database/README.md
index 8dcb9c2dacd..62260d17982 100644
--- a/internal-packages/database/README.md
+++ b/internal-packages/database/README.md
@@ -23,7 +23,7 @@ pnpm run docker
 ### How to add a new index on a large table
 
 1. Modify the Prisma.schema with a single index change (no other changes, just one index at a time)
-2. Create a Prisma migration using `cd internal-packages/database && pnpm run db:migrate:dev --create-only`
+2. Create a Prisma migration using `cd internal-packages/database && pnpm run db:migrate:dev:create`
 3. Modify the SQL file: add IF NOT EXISTS to it and CONCURRENTLY:
 
 ```sql
diff --git a/internal-packages/database/package.json b/internal-packages/database/package.json
index be3a505fdb6..cd9b40db95d 100644
--- a/internal-packages/database/package.json
+++ b/internal-packages/database/package.json
@@ -5,10 +5,12 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@prisma/client": "5.4.1"
+    "@prisma/client": "6.14.0",
+    "decimal.js": "^10.6.0"
   },
   "devDependencies": {
-    "prisma": "5.4.1",
+    "@types/decimal.js": "^7.4.3",
+    "prisma": "6.14.0",
     "rimraf": "6.0.1"
   },
   "scripts": {
diff --git a/internal-packages/database/prisma/migrations/20250729155415_runtime_environment_add_organization_id_index/migration.sql b/internal-packages/database/prisma/migrations/20250729155415_runtime_environment_add_organization_id_index/migration.sql
new file mode 100644
index 00000000000..aed11ac9ee2
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250729155415_runtime_environment_add_organization_id_index/migration.sql
@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "RuntimeEnvironment_organizationId_idx" ON "RuntimeEnvironment" ("organizationId");
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250730084611_add_payload_schema_to_background_worker_task/migration.sql b/internal-packages/database/prisma/migrations/20250730084611_add_payload_schema_to_background_worker_task/migration.sql
new file mode 100644
index 00000000000..bbbb6694fd0
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250730084611_add_payload_schema_to_background_worker_task/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "BackgroundWorkerTask" ADD COLUMN     "payloadSchema" JSONB;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250805161650_worker_instance_group_added_cloud_provider_location_static_ips_columns/migration.sql b/internal-packages/database/prisma/migrations/20250805161650_worker_instance_group_added_cloud_provider_location_static_ips_columns/migration.sql
new file mode 100644
index 00000000000..d1509fea9a1
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250805161650_worker_instance_group_added_cloud_provider_location_static_ips_columns/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "WorkerInstanceGroup"
+ADD COLUMN "cloudProvider" TEXT,
+ADD COLUMN "location" TEXT,
+ADD COLUMN "staticIPs" TEXT;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250806124301_project_allowed_master_queues_column/migration.sql b/internal-packages/database/prisma/migrations/20250806124301_project_allowed_master_queues_column/migration.sql
new file mode 100644
index 00000000000..4a1d3b9403a
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250806124301_project_allowed_master_queues_column/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Project" ADD COLUMN     "allowedMasterQueues" TEXT[] DEFAULT ARRAY[]::TEXT[];
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250814092224_add_task_run_plan_type/migration.sql b/internal-packages/database/prisma/migrations/20250814092224_add_task_run_plan_type/migration.sql
new file mode 100644
index 00000000000..2513c026228
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250814092224_add_task_run_plan_type/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "TaskRun" ADD COLUMN     "planType" TEXT;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250814144649_add_organization_access_tokens/migration.sql b/internal-packages/database/prisma/migrations/20250814144649_add_organization_access_tokens/migration.sql
new file mode 100644
index 00000000000..d931607ec4e
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250814144649_add_organization_access_tokens/migration.sql
@@ -0,0 +1,22 @@
+CREATE TYPE "OrganizationAccessTokenType" AS ENUM ('USER', 'SYSTEM');
+
+CREATE TABLE "OrganizationAccessToken" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "type" "OrganizationAccessTokenType" NOT NULL DEFAULT 'USER',
+    "hashedToken" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+    "expiresAt" TIMESTAMP(3),
+    "revokedAt" TIMESTAMP(3),
+    "lastAccessedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "OrganizationAccessToken_pkey" PRIMARY KEY ("id")
+);
+
+CREATE UNIQUE INDEX "OrganizationAccessToken_hashedToken_key" ON "OrganizationAccessToken"("hashedToken");
+
+CREATE INDEX "OrganizationAccessToken_organizationId_type_createdAt_idx" ON "OrganizationAccessToken"("organizationId", "type", "createdAt" DESC);
+
+ALTER TABLE "OrganizationAccessToken" ADD CONSTRAINT "OrganizationAccessToken_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/internal-packages/database/prisma/migrations/20250902112516_add_locked_retry_config_to_task_run/migration.sql b/internal-packages/database/prisma/migrations/20250902112516_add_locked_retry_config_to_task_run/migration.sql
new file mode 100644
index 00000000000..22cde96c6d5
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250902112516_add_locked_retry_config_to_task_run/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."TaskRun" ADD COLUMN     "lockedRetryConfig" JSONB;
diff --git a/internal-packages/database/prisma/migrations/20250902133449_add_gh_installation_schema/migration.sql b/internal-packages/database/prisma/migrations/20250902133449_add_gh_installation_schema/migration.sql
new file mode 100644
index 00000000000..78b5e6bf2c2
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250902133449_add_gh_installation_schema/migration.sql
@@ -0,0 +1,46 @@
+CREATE TYPE "public"."GithubRepositorySelection" AS ENUM ('ALL', 'SELECTED');
+
+CREATE TABLE "public"."GithubAppInstallation" (
+    "id" TEXT NOT NULL,
+    "appInstallationId" BIGINT NOT NULL,
+    "targetId" BIGINT NOT NULL,
+    "targetType" TEXT NOT NULL,
+    "accountHandle" TEXT NOT NULL,
+    "permissions" JSONB,
+    "repositorySelection" "public"."GithubRepositorySelection" NOT NULL,
+    "installedBy" TEXT,
+    "organizationId" TEXT NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+    "suspendedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "GithubAppInstallation_pkey" PRIMARY KEY ("id")
+);
+
+CREATE TABLE "public"."GithubRepository" (
+    "id" TEXT NOT NULL,
+    "githubId" BIGINT NOT NULL,
+    "name" TEXT NOT NULL,
+    "fullName" TEXT NOT NULL,
+    "htmlUrl" TEXT NOT NULL,
+    "private" BOOLEAN NOT NULL,
+    "defaultBranch" TEXT NOT NULL,
+    "installationId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "GithubRepository_pkey" PRIMARY KEY ("id")
+);
+
+CREATE UNIQUE INDEX "GithubAppInstallation_appInstallationId_key" ON "public"."GithubAppInstallation"("appInstallationId");
+
+CREATE INDEX "GithubAppInstallation_organizationId_idx" ON "public"."GithubAppInstallation"("organizationId");
+
+CREATE INDEX "GithubRepository_installationId_idx" ON "public"."GithubRepository"("installationId");
+
+CREATE UNIQUE INDEX "GithubRepository_installationId_githubId_key" ON "public"."GithubRepository"("installationId", "githubId");
+
+ALTER TABLE "public"."GithubAppInstallation" ADD CONSTRAINT "GithubAppInstallation_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "public"."Organization"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+ALTER TABLE "public"."GithubRepository" ADD CONSTRAINT "GithubRepository_installationId_fkey" FOREIGN KEY ("installationId") REFERENCES "public"."GithubAppInstallation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/internal-packages/database/prisma/migrations/20250902135000_add_gh_connected_repo_schema/migration.sql b/internal-packages/database/prisma/migrations/20250902135000_add_gh_connected_repo_schema/migration.sql
new file mode 100644
index 00000000000..b3e170bdbb4
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250902135000_add_gh_connected_repo_schema/migration.sql
@@ -0,0 +1,19 @@
+CREATE TABLE "public"."ConnectedGithubRepository" (
+    "id" TEXT NOT NULL,
+    "projectId" TEXT NOT NULL,
+    "repositoryId" TEXT NOT NULL,
+    "branchTracking" JSONB NOT NULL,
+    "previewDeploymentsEnabled" BOOLEAN NOT NULL DEFAULT true,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "ConnectedGithubRepository_pkey" PRIMARY KEY ("id")
+);
+
+CREATE INDEX "ConnectedGithubRepository_repositoryId_idx" ON "public"."ConnectedGithubRepository"("repositoryId");
+
+CREATE UNIQUE INDEX "ConnectedGithubRepository_projectId_key" ON "public"."ConnectedGithubRepository"("projectId");
+
+ALTER TABLE "public"."ConnectedGithubRepository" ADD CONSTRAINT "ConnectedGithubRepository_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "public"."Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "public"."ConnectedGithubRepository" ADD CONSTRAINT "ConnectedGithubRepository_repositoryId_fkey" FOREIGN KEY ("repositoryId") REFERENCES "public"."GithubRepository"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/internal-packages/database/prisma/migrations/20250912153951_add_waitpoint_dashboard_index/migration.sql b/internal-packages/database/prisma/migrations/20250912153951_add_waitpoint_dashboard_index/migration.sql
new file mode 100644
index 00000000000..4b6df3fa491
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250912153951_add_waitpoint_dashboard_index/migration.sql
@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "Waitpoint_environmentId_type_id_idx" ON "public"."Waitpoint"("environmentId", "type", "id" DESC);
diff --git a/internal-packages/database/prisma/migrations/20250912155941_add_batch_task_run_dashboard_index/migration.sql b/internal-packages/database/prisma/migrations/20250912155941_add_batch_task_run_dashboard_index/migration.sql
new file mode 100644
index 00000000000..b19c6e0641e
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250912155941_add_batch_task_run_dashboard_index/migration.sql
@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "BatchTaskRun_runtimeEnvironmentId_id_idx" ON "public"."BatchTaskRun"("runtimeEnvironmentId", "id" DESC);
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250915141201_add_build_settings_to_project/migration.sql b/internal-packages/database/prisma/migrations/20250915141201_add_build_settings_to_project/migration.sql
new file mode 100644
index 00000000000..30ca3a4c9b5
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250915141201_add_build_settings_to_project/migration.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."Project" ADD COLUMN     "buildSettings" JSONB;
+
diff --git a/internal-packages/database/prisma/migrations/20250918122438_add_started_at_to_deployment_schema/migration.sql b/internal-packages/database/prisma/migrations/20250918122438_add_started_at_to_deployment_schema/migration.sql
new file mode 100644
index 00000000000..83a251cd126
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250918122438_add_started_at_to_deployment_schema/migration.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."WorkerDeployment" ADD COLUMN     "startedAt" TIMESTAMP(3);
diff --git a/internal-packages/database/prisma/migrations/20250919123905_remove_unnecessary_foreign_key_constraints_task_run_execution_snapshot/migration.sql b/internal-packages/database/prisma/migrations/20250919123905_remove_unnecessary_foreign_key_constraints_task_run_execution_snapshot/migration.sql
new file mode 100644
index 00000000000..3328c148a98
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250919123905_remove_unnecessary_foreign_key_constraints_task_run_execution_snapshot/migration.sql
@@ -0,0 +1,14 @@
+-- DropForeignKey
+ALTER TABLE "public"."TaskRunExecutionSnapshot" DROP CONSTRAINT IF EXISTS "TaskRunExecutionSnapshot_batchId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "public"."TaskRunExecutionSnapshot" DROP CONSTRAINT IF EXISTS "TaskRunExecutionSnapshot_environmentId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "public"."TaskRunExecutionSnapshot" DROP CONSTRAINT IF EXISTS "TaskRunExecutionSnapshot_organizationId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "public"."TaskRunExecutionSnapshot" DROP CONSTRAINT IF EXISTS "TaskRunExecutionSnapshot_projectId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "public"."TaskRunExecutionSnapshot" DROP CONSTRAINT IF EXISTS "TaskRunExecutionSnapshot_workerId_fkey";
diff --git a/internal-packages/database/prisma/migrations/20250922145116_add_feature_flags_to_organizations/migration.sql b/internal-packages/database/prisma/migrations/20250922145116_add_feature_flags_to_organizations/migration.sql
new file mode 100644
index 00000000000..afbbc1ccf61
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250922145116_add_feature_flags_to_organizations/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."Organization" ADD COLUMN     "featureFlags" JSONB;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250923182708_add_installing_status_to_deployments/migration.sql b/internal-packages/database/prisma/migrations/20250923182708_add_installing_status_to_deployments/migration.sql
new file mode 100644
index 00000000000..705623a9333
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250923182708_add_installing_status_to_deployments/migration.sql
@@ -0,0 +1,3 @@
+ALTER TYPE "public"."WorkerDeploymentStatus" ADD VALUE 'INSTALLING';
+
+ALTER TABLE "public"."WorkerDeployment" ADD COLUMN     "installedAt" TIMESTAMP(3);
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20250923192901_add_canceled_at_to_deployments/migration.sql b/internal-packages/database/prisma/migrations/20250923192901_add_canceled_at_to_deployments/migration.sql
new file mode 100644
index 00000000000..c279f9dd32b
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20250923192901_add_canceled_at_to_deployments/migration.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "public"."WorkerDeployment" ADD COLUMN     "canceledAt" TIMESTAMP(3),
+ADD COLUMN     "canceledReason" TEXT;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251009140053_add_task_queue_concurrency_limit_base_column/migration.sql b/internal-packages/database/prisma/migrations/20251009140053_add_task_queue_concurrency_limit_base_column/migration.sql
new file mode 100644
index 00000000000..825ef02b8d9
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251009140053_add_task_queue_concurrency_limit_base_column/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."TaskQueue" ADD COLUMN     "concurrencyLimitBase" INTEGER;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251010102348_add_concurrency_limit_overriden_at_to_task_queue/migration.sql b/internal-packages/database/prisma/migrations/20251010102348_add_concurrency_limit_overriden_at_to_task_queue/migration.sql
new file mode 100644
index 00000000000..13e5af08f52
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251010102348_add_concurrency_limit_overriden_at_to_task_queue/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "public"."TaskQueue" ADD COLUMN     "concurrencyLimitOverriddenAt" TIMESTAMP(3);
+
diff --git a/internal-packages/database/prisma/migrations/20251010114444_add_concurrency_limit_overridden_by_to_task_queue/migration.sql b/internal-packages/database/prisma/migrations/20251010114444_add_concurrency_limit_overridden_by_to_task_queue/migration.sql
new file mode 100644
index 00000000000..d8a81ce1754
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251010114444_add_concurrency_limit_overridden_by_to_task_queue/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."TaskQueue" ADD COLUMN     "concurrencyLimitOverriddenBy" TEXT;
diff --git a/internal-packages/database/prisma/migrations/20251020121543_add_realtime_streams_version_to_task_run/migration.sql b/internal-packages/database/prisma/migrations/20251020121543_add_realtime_streams_version_to_task_run/migration.sql
new file mode 100644
index 00000000000..ac9a88675e6
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251020121543_add_realtime_streams_version_to_task_run/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."TaskRun" ADD COLUMN     "realtimeStreamsVersion" TEXT NOT NULL DEFAULT 'v1';
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251020163612_add_realtime_streams_to_task_run/migration.sql b/internal-packages/database/prisma/migrations/20251020163612_add_realtime_streams_to_task_run/migration.sql
new file mode 100644
index 00000000000..844419c4c21
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251020163612_add_realtime_streams_to_task_run/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."TaskRun" ADD COLUMN     "realtimeStreams" TEXT[] DEFAULT ARRAY[]::TEXT[];
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251113152235_maximum_project_count/migration.sql b/internal-packages/database/prisma/migrations/20251113152235_maximum_project_count/migration.sql
new file mode 100644
index 00000000000..9135c3a4c10
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251113152235_maximum_project_count/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "public"."Organization"
+ADD COLUMN "maximumProjectCount" INTEGER NOT NULL DEFAULT 10;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251204143136_add_google_auth_method/migration.sql b/internal-packages/database/prisma/migrations/20251204143136_add_google_auth_method/migration.sql
new file mode 100644
index 00000000000..51b5a9d0dfe
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251204143136_add_google_auth_method/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "public"."AuthenticationMethod" ADD VALUE 'GOOGLE';
diff --git a/internal-packages/database/prisma/migrations/20251205135152_add_columns_for_run_engine_batch_trigger_v2/migration.sql b/internal-packages/database/prisma/migrations/20251205135152_add_columns_for_run_engine_batch_trigger_v2/migration.sql
new file mode 100644
index 00000000000..b18f35b5b1c
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251205135152_add_columns_for_run_engine_batch_trigger_v2/migration.sql
@@ -0,0 +1,36 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "public"."BatchTaskRunStatus" ADD VALUE 'PROCESSING';
+ALTER TYPE "public"."BatchTaskRunStatus" ADD VALUE 'PARTIAL_FAILED';
+
+-- AlterTable
+ALTER TABLE "public"."BatchTaskRun" ADD COLUMN     "failedRunCount" INTEGER,
+ADD COLUMN     "processingStartedAt" TIMESTAMP(3),
+ADD COLUMN     "successfulRunCount" INTEGER;
+
+-- CreateTable
+CREATE TABLE "public"."BatchTaskRunError" (
+    "id" TEXT NOT NULL,
+    "batchTaskRunId" TEXT NOT NULL,
+    "index" INTEGER NOT NULL,
+    "taskIdentifier" TEXT NOT NULL,
+    "payload" TEXT,
+    "options" JSONB,
+    "error" TEXT NOT NULL,
+    "errorCode" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "BatchTaskRunError_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "BatchTaskRunError_batchTaskRunId_idx" ON "public"."BatchTaskRunError"("batchTaskRunId");
+
+-- AddForeignKey
+ALTER TABLE "public"."BatchTaskRunError" ADD CONSTRAINT "BatchTaskRunError_batchTaskRunId_fkey" FOREIGN KEY ("batchTaskRunId") REFERENCES "public"."BatchTaskRun"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/internal-packages/database/prisma/migrations/20251208112409_add_build_server_meta_to_deployments/migration.sql b/internal-packages/database/prisma/migrations/20251208112409_add_build_server_meta_to_deployments/migration.sql
new file mode 100644
index 00000000000..1356966cc87
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251208112409_add_build_server_meta_to_deployments/migration.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."WorkerDeployment" ADD COLUMN     "buildServerMetadata" JSONB;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251208144643_add_triggered_via_to_deployments/migration.sql b/internal-packages/database/prisma/migrations/20251208144643_add_triggered_via_to_deployments/migration.sql
new file mode 100644
index 00000000000..7e6218ea7c1
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251208144643_add_triggered_via_to_deployments/migration.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."WorkerDeployment" ADD COLUMN     "triggeredVia" TEXT;
diff --git a/internal-packages/database/prisma/migrations/20251209155209_add_processing_completed_at_to_batch_task_run/migration.sql b/internal-packages/database/prisma/migrations/20251209155209_add_processing_completed_at_to_batch_task_run/migration.sql
new file mode 100644
index 00000000000..169638e57d4
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251209155209_add_processing_completed_at_to_batch_task_run/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."BatchTaskRun" ADD COLUMN     "processingCompletedAt" TIMESTAMP(3);
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251210112915_add_organization_batch_limiter_columns/migration.sql b/internal-packages/database/prisma/migrations/20251210112915_add_organization_batch_limiter_columns/migration.sql
new file mode 100644
index 00000000000..766c38f4a6a
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251210112915_add_organization_batch_limiter_columns/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "public"."Organization" ADD COLUMN     "batchQueueConcurrencyConfig" JSONB,
+ADD COLUMN     "batchRateLimitConfig" JSONB;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251213093011_add_batch_task_run_error_unique_index/migration.sql b/internal-packages/database/prisma/migrations/20251213093011_add_batch_task_run_error_unique_index/migration.sql
new file mode 100644
index 00000000000..38f20f534e0
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251213093011_add_batch_task_run_error_unique_index/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[batchTaskRunId,index]` on the table `BatchTaskRunError` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "BatchTaskRunError_batchTaskRunId_index_key" ON "public"."BatchTaskRunError"("batchTaskRunId", "index");
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251216225303_add_debounce_and_delayed_status/migration.sql b/internal-packages/database/prisma/migrations/20251216225303_add_debounce_and_delayed_status/migration.sql
new file mode 100644
index 00000000000..407c3c856d5
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251216225303_add_debounce_and_delayed_status/migration.sql
@@ -0,0 +1,5 @@
+-- AlterEnum
+ALTER TYPE "public"."TaskRunExecutionStatus" ADD VALUE 'DELAYED';
+
+-- AlterTable
+ALTER TABLE "public"."TaskRun" ADD COLUMN     "debounce" JSONB;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20251220201230_add_customer_query/migration.sql b/internal-packages/database/prisma/migrations/20251220201230_add_customer_query/migration.sql
new file mode 100644
index 00000000000..1216962abd7
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20251220201230_add_customer_query/migration.sql
@@ -0,0 +1,40 @@
+-- CreateEnum
+CREATE TYPE "public"."CustomerQuerySource" AS ENUM ('DASHBOARD', 'API');
+
+-- CreateEnum
+CREATE TYPE "public"."CustomerQueryScope" AS ENUM ('ORGANIZATION', 'PROJECT', 'ENVIRONMENT');
+
+-- CreateTable
+CREATE TABLE
+    "public"."CustomerQuery" (
+        "id" TEXT NOT NULL,
+        "query" TEXT NOT NULL,
+        "scope" "public"."CustomerQueryScope" NOT NULL,
+        "stats" JSONB NOT NULL,
+        "costInCents" DOUBLE PRECISION NOT NULL DEFAULT 0,
+        "source" "public"."CustomerQuerySource" NOT NULL DEFAULT 'DASHBOARD',
+        "organizationId" TEXT NOT NULL,
+        "projectId" TEXT,
+        "environmentId" TEXT,
+        "userId" TEXT,
+        "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        CONSTRAINT "CustomerQuery_pkey" PRIMARY KEY ("id")
+    );
+
+-- CreateIndex
+CREATE INDEX "CustomerQuery_organizationId_createdAt_idx" ON "public"."CustomerQuery" ("organizationId", "createdAt" DESC);
+
+-- CreateIndex
+CREATE INDEX "CustomerQuery_createdAt_idx" ON "public"."CustomerQuery" ("createdAt");
+
+-- AddForeignKey
+ALTER TABLE "public"."CustomerQuery" ADD CONSTRAINT "CustomerQuery_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "public"."Organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."CustomerQuery" ADD CONSTRAINT "CustomerQuery_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "public"."Project" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."CustomerQuery" ADD CONSTRAINT "CustomerQuery_environmentId_fkey" FOREIGN KEY ("environmentId") REFERENCES "public"."RuntimeEnvironment" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."CustomerQuery" ADD CONSTRAINT "CustomerQuery_userId_fkey" FOREIGN KEY ("userId") REFERENCES "public"."User" ("id") ON DELETE SET NULL ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260108164613_add_impersonation_audit_log/migration.sql b/internal-packages/database/prisma/migrations/20260108164613_add_impersonation_audit_log/migration.sql
new file mode 100644
index 00000000000..ca89a8d9d7f
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260108164613_add_impersonation_audit_log/migration.sql
@@ -0,0 +1,29 @@
+-- CreateEnum
+CREATE TYPE "public"."ImpersonationAuditLogAction" AS ENUM ('START', 'STOP');
+
+-- CreateTable
+CREATE TABLE "public"."ImpersonationAuditLog" (
+    "id" TEXT NOT NULL,
+    "action" "public"."ImpersonationAuditLogAction" NOT NULL,
+    "adminId" TEXT NOT NULL,
+    "targetId" TEXT NOT NULL,
+    "ipAddress" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "ImpersonationAuditLog_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "ImpersonationAuditLog_adminId_idx" ON "public"."ImpersonationAuditLog"("adminId");
+
+-- CreateIndex
+CREATE INDEX "ImpersonationAuditLog_targetId_idx" ON "public"."ImpersonationAuditLog"("targetId");
+
+-- CreateIndex
+CREATE INDEX "ImpersonationAuditLog_createdAt_idx" ON "public"."ImpersonationAuditLog"("createdAt");
+
+-- AddForeignKey
+ALTER TABLE "public"."ImpersonationAuditLog" ADD CONSTRAINT "ImpersonationAuditLog_adminId_fkey" FOREIGN KEY ("adminId") REFERENCES "public"."User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."ImpersonationAuditLog" ADD CONSTRAINT "ImpersonationAuditLog_targetId_fkey" FOREIGN KEY ("targetId") REFERENCES "public"."User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/internal-packages/database/prisma/migrations/20260113182122_add_timestamps_to_feature_flag/migration.sql b/internal-packages/database/prisma/migrations/20260113182122_add_timestamps_to_feature_flag/migration.sql
new file mode 100644
index 00000000000..2cd32655394
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260113182122_add_timestamps_to_feature_flag/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "public"."FeatureFlag" ADD COLUMN     "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
diff --git a/internal-packages/database/prisma/migrations/20260115125846_add_project_id_to_task_schedule_instance/migration.sql b/internal-packages/database/prisma/migrations/20260115125846_add_project_id_to_task_schedule_instance/migration.sql
new file mode 100644
index 00000000000..59f75a93772
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260115125846_add_project_id_to_task_schedule_instance/migration.sql
@@ -0,0 +1,16 @@
+-- AlterTable
+ALTER TABLE "public"."TaskScheduleInstance"
+ADD COLUMN IF NOT EXISTS "projectId" TEXT;
+
+-- AddForeignKey
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_constraint WHERE conname = 'TaskScheduleInstance_projectId_fkey'
+  ) THEN
+    ALTER TABLE "public"."TaskScheduleInstance"
+    ADD CONSTRAINT "TaskScheduleInstance_projectId_fkey"
+    FOREIGN KEY ("projectId") REFERENCES "public"."Project" ("id")
+    ON DELETE CASCADE ON UPDATE CASCADE;
+  END IF;
+END $$;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260115130417_taskscheduleinstance_environmentid_index/migration.sql b/internal-packages/database/prisma/migrations/20260115130417_taskscheduleinstance_environmentid_index/migration.sql
new file mode 100644
index 00000000000..c88056b784b
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260115130417_taskscheduleinstance_environmentid_index/migration.sql
@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "TaskScheduleInstance_environmentId_idx" ON "public"."TaskScheduleInstance" ("environmentId");
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260115154554_taskscheduleinstance_required_projectid/migration.sql b/internal-packages/database/prisma/migrations/20260115154554_taskscheduleinstance_required_projectid/migration.sql
new file mode 100644
index 00000000000..584b0b438a0
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260115154554_taskscheduleinstance_required_projectid/migration.sql
@@ -0,0 +1,21 @@
+/*
+Warnings:
+
+- Made the column `projectId` on table `TaskScheduleInstance` required. This step will fail if there are existing NULL values in that column.
+
+ */
+-- Backfill from TaskSchedule
+UPDATE "TaskScheduleInstance" tsi
+SET
+  "projectId" = ts."projectId"
+FROM
+  "TaskSchedule" ts
+WHERE
+  tsi."taskScheduleId" = ts."id"
+  AND tsi."projectId" IS NULL;
+
+-- AlterTable
+ALTER TABLE "public"."TaskScheduleInstance"
+ALTER COLUMN "projectId"
+SET
+  NOT NULL;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260115164415_taskscheduleinstance_required_projectid_index/migration.sql b/internal-packages/database/prisma/migrations/20260115164415_taskscheduleinstance_required_projectid_index/migration.sql
new file mode 100644
index 00000000000..cb130c04007
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260115164415_taskscheduleinstance_required_projectid_index/migration.sql
@@ -0,0 +1,2 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "TaskScheduleInstance_projectId_active_idx" ON "public"."TaskScheduleInstance" ("projectId", "active");
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260116154810_add_idempotency_key_options_to_task_run/migration.sql b/internal-packages/database/prisma/migrations/20260116154810_add_idempotency_key_options_to_task_run/migration.sql
new file mode 100644
index 00000000000..330f42dfaf9
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260116154810_add_idempotency_key_options_to_task_run/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "TaskRun" ADD COLUMN IF NOT EXISTS "idempotencyKeyOptions" JSONB;
diff --git a/internal-packages/database/prisma/migrations/20260120115732_add_time_filter_to_customer_query/migration.sql b/internal-packages/database/prisma/migrations/20260120115732_add_time_filter_to_customer_query/migration.sql
new file mode 100644
index 00000000000..c30e72d52b1
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260120115732_add_time_filter_to_customer_query/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "public"."CustomerQuery"
+ADD COLUMN "filterFrom" TIMESTAMP(3),
+ADD COLUMN "filterPeriod" TEXT,
+ADD COLUMN "filterTo" TIMESTAMP(3);
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260124203524_customer_query_add_title_remove_cost/migration.sql b/internal-packages/database/prisma/migrations/20260124203524_customer_query_add_title_remove_cost/migration.sql
new file mode 100644
index 00000000000..ab542e6090d
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260124203524_customer_query_add_title_remove_cost/migration.sql
@@ -0,0 +1,7 @@
+-- AlterTable
+ALTER TABLE "CustomerQuery"
+ADD COLUMN IF NOT EXISTS "title" TEXT;
+
+-- AlterTable
+ALTER TABLE "CustomerQuery"
+DROP COLUMN IF EXISTS "costInCents";
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260126175159_add_environment_variable_versioning/migration.sql b/internal-packages/database/prisma/migrations/20260126175159_add_environment_variable_versioning/migration.sql
new file mode 100644
index 00000000000..17f013f388b
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260126175159_add_environment_variable_versioning/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "public"."EnvironmentVariableValue" ADD COLUMN     "lastUpdatedBy" JSONB,
+ADD COLUMN     "version" INTEGER NOT NULL DEFAULT 1;
diff --git a/internal-packages/database/prisma/migrations/20260129162621_add_organization_project_integration/migration.sql b/internal-packages/database/prisma/migrations/20260129162621_add_organization_project_integration/migration.sql
new file mode 100644
index 00000000000..2c18bd2e1da
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260129162621_add_organization_project_integration/migration.sql
@@ -0,0 +1,29 @@
+-- CreateTable
+CREATE TABLE "public"."OrganizationProjectIntegration" (
+    "id" TEXT NOT NULL,
+    "organizationIntegrationId" TEXT NOT NULL,
+    "projectId" TEXT NOT NULL,
+    "externalEntityId" TEXT NOT NULL,
+    "integrationData" JSONB NOT NULL,
+    "installedBy" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+
+    CONSTRAINT "OrganizationProjectIntegration_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "OrganizationProjectIntegration_projectId_idx" ON "public"."OrganizationProjectIntegration"("projectId");
+
+-- CreateIndex
+CREATE INDEX "OrganizationProjectIntegration_projectId_organizationIntegr_idx" ON "public"."OrganizationProjectIntegration"("projectId", "organizationIntegrationId");
+
+-- CreateIndex
+CREATE INDEX "OrganizationProjectIntegration_externalEntityId_idx" ON "public"."OrganizationProjectIntegration"("externalEntityId");
+
+-- AddForeignKey
+ALTER TABLE "public"."OrganizationProjectIntegration" ADD CONSTRAINT "OrganizationProjectIntegration_organizationIntegrationId_fkey" FOREIGN KEY ("organizationIntegrationId") REFERENCES "public"."OrganizationIntegration"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."OrganizationProjectIntegration" ADD CONSTRAINT "OrganizationProjectIntegration_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "public"."Project"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/internal-packages/database/prisma/migrations/20260129162810_add_integration_deployment/migration.sql b/internal-packages/database/prisma/migrations/20260129162810_add_integration_deployment/migration.sql
new file mode 100644
index 00000000000..987d643810c
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260129162810_add_integration_deployment/migration.sql
@@ -0,0 +1,22 @@
+-- CreateTable
+CREATE TABLE "public"."IntegrationDeployment" (
+    "id" TEXT NOT NULL,
+    "integrationName" TEXT NOT NULL,
+    "integrationDeploymentId" TEXT NOT NULL,
+    "commitSHA" TEXT NOT NULL,
+    "deploymentId" TEXT,
+    "status" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "IntegrationDeployment_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "IntegrationDeployment_deploymentId_idx" ON "public"."IntegrationDeployment"("deploymentId");
+
+-- CreateIndex
+CREATE INDEX "IntegrationDeployment_commitSHA_idx" ON "public"."IntegrationDeployment"("commitSHA");
+
+-- AddForeignKey
+ALTER TABLE "public"."IntegrationDeployment" ADD CONSTRAINT "IntegrationDeployment_deploymentId_fkey" FOREIGN KEY ("deploymentId") REFERENCES "public"."WorkerDeployment"("id") ON DELETE SET NULL ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260129162946_alter_tables_for_integrations_data/migration.sql b/internal-packages/database/prisma/migrations/20260129162946_alter_tables_for_integrations_data/migration.sql
new file mode 100644
index 00000000000..345d337f187
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260129162946_alter_tables_for_integrations_data/migration.sql
@@ -0,0 +1,9 @@
+-- AlterEnum
+ALTER TYPE "public"."IntegrationService" ADD VALUE 'VERCEL';
+
+-- AlterTable
+ALTER TABLE "public"."OrganizationIntegration" ADD COLUMN     "deletedAt" TIMESTAMP(3),
+ADD COLUMN     "externalOrganizationId" TEXT;
+
+-- AlterTable
+ALTER TABLE "public"."WorkerDeployment" ADD COLUMN     "commitSHA" TEXT;
diff --git a/internal-packages/database/prisma/migrations/20260129165555_add_organization_integration_idx/migration.sql b/internal-packages/database/prisma/migrations/20260129165555_add_organization_integration_idx/migration.sql
new file mode 100644
index 00000000000..ac24fc4bdb0
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260129165555_add_organization_integration_idx/migration.sql
@@ -0,0 +1,3 @@
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "OrganizationIntegration_externalOrganizationId_idx" ON "public"."OrganizationIntegration"("externalOrganizationId");
+
diff --git a/internal-packages/database/prisma/migrations/20260129165809_add_worker_deployment_idx/migration.sql b/internal-packages/database/prisma/migrations/20260129165809_add_worker_deployment_idx/migration.sql
new file mode 100644
index 00000000000..fcf74c0d978
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260129165809_add_worker_deployment_idx/migration.sql
@@ -0,0 +1,3 @@
+
+-- CreateIndex
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "WorkerDeployment_commitSHA_idx" ON "public"."WorkerDeployment"("commitSHA");
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260201130503_metrics_dashboard_table_created/migration.sql b/internal-packages/database/prisma/migrations/20260201130503_metrics_dashboard_table_created/migration.sql
new file mode 100644
index 00000000000..321b3148ca0
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260201130503_metrics_dashboard_table_created/migration.sql
@@ -0,0 +1,25 @@
+-- CreateTable
+CREATE TABLE
+    "public"."MetricsDashboard" (
+        "id" TEXT NOT NULL,
+        "title" TEXT NOT NULL,
+        "organizationId" TEXT NOT NULL,
+        "projectId" TEXT,
+        "ownerId" TEXT NOT NULL,
+        "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+        "updatedAt" TIMESTAMP(3) NOT NULL,
+        "layout" TEXT NOT NULL,
+        CONSTRAINT "MetricsDashboard_pkey" PRIMARY KEY ("id")
+    );
+
+-- CreateIndex
+CREATE INDEX "MetricsDashboard_projectId_createdAt_idx" ON "public"."MetricsDashboard" ("projectId", "createdAt" DESC);
+
+-- AddForeignKey
+ALTER TABLE "public"."MetricsDashboard" ADD CONSTRAINT "MetricsDashboard_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "public"."Organization" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."MetricsDashboard" ADD CONSTRAINT "MetricsDashboard_projectId_fkey" FOREIGN KEY ("projectId") REFERENCES "public"."Project" ("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."MetricsDashboard" ADD CONSTRAINT "MetricsDashboard_ownerId_fkey" FOREIGN KEY ("ownerId") REFERENCES "public"."User" ("id") ON DELETE SET NULL ON UPDATE CASCADE;
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260202044337_metrics_dashboard_description/migration.sql b/internal-packages/database/prisma/migrations/20260202044337_metrics_dashboard_description/migration.sql
new file mode 100644
index 00000000000..d7c25db8b80
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260202044337_metrics_dashboard_description/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "public"."MetricsDashboard"
+ADD COLUMN "description" TEXT NOT NULL DEFAULT '';
\ No newline at end of file
diff --git a/internal-packages/database/prisma/migrations/20260202100000_add_friendlyid_to_metrics_dashboard/migration.sql b/internal-packages/database/prisma/migrations/20260202100000_add_friendlyid_to_metrics_dashboard/migration.sql
new file mode 100644
index 00000000000..6e48faf18f6
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260202100000_add_friendlyid_to_metrics_dashboard/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "public"."MetricsDashboard" ADD COLUMN "friendlyId" TEXT NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "MetricsDashboard_friendlyId_key" ON "public"."MetricsDashboard"("friendlyId");
diff --git a/internal-packages/database/prisma/migrations/20260211120000_make_metrics_dashboard_owner_nullable/migration.sql b/internal-packages/database/prisma/migrations/20260211120000_make_metrics_dashboard_owner_nullable/migration.sql
new file mode 100644
index 00000000000..5ea906c4ee2
--- /dev/null
+++ b/internal-packages/database/prisma/migrations/20260211120000_make_metrics_dashboard_owner_nullable/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable: make ownerId nullable to match ON DELETE SET NULL foreign key
+ALTER TABLE "public"."MetricsDashboard" ALTER COLUMN "ownerId" DROP NOT NULL;
diff --git a/internal-packages/database/prisma/migrations/migration_lock.toml b/internal-packages/database/prisma/migrations/migration_lock.toml
index fbffa92c2bb..044d57cdb0d 100644
--- a/internal-packages/database/prisma/migrations/migration_lock.toml
+++ b/internal-packages/database/prisma/migrations/migration_lock.toml
@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "postgresql"
\ No newline at end of file
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/internal-packages/database/prisma/schema.prisma b/internal-packages/database/prisma/schema.prisma
index 58e1b11003b..e28b951f05d 100644
--- a/internal-packages/database/prisma/schema.prisma
+++ b/internal-packages/database/prisma/schema.prisma
@@ -6,8 +6,9 @@ datasource db {
 
 generator client {
   provider        = "prisma-client-js"
+  output          = "../generated/prisma"
   binaryTargets   = ["native", "debian-openssl-1.1.x"]
-  previewFeatures = ["tracing", "metrics"]
+  previewFeatures = ["metrics"]
 }
 
 model User {
@@ -58,6 +59,11 @@ model User {
   deployments          WorkerDeployment[]
   backupCodes          MfaBackupCode[]
   bulkActions          BulkActionGroup[]
+
+  impersonationsPerformed ImpersonationAuditLog[] @relation("ImpersonationAdmin")
+  impersonationsReceived  ImpersonationAuditLog[] @relation("ImpersonationTarget")
+  customerQueries         CustomerQuery[]
+  metricsDashboards       MetricsDashboard[]
 }
 
 model MfaBackupCode {
@@ -90,6 +96,7 @@ model InvitationCode {
 enum AuthenticationMethod {
   GITHUB
   MAGIC_LINK
+  GOOGLE
 }
 
 /// Used to generate PersonalAccessTokens, they're one-time use
@@ -133,6 +140,37 @@ model PersonalAccessToken {
   authorizationCodes AuthorizationCode[]
 }
 
+enum OrganizationAccessTokenType {
+  USER
+  SYSTEM
+}
+
+model OrganizationAccessToken {
+  id String @id @default(cuid())
+
+  /// User-provided name for the token
+  name String
+
+  /// Used to differentiate between user-generated and system-generated tokens
+  type OrganizationAccessTokenType @default(USER)
+
+  /// This is used to find the token in the database
+  hashedToken String @unique
+
+  organization   Organization @relation(fields: [organizationId], references: [id])
+  organizationId String
+
+  /// Optional expiration date for the token
+  expiresAt      DateTime?
+  revokedAt      DateTime?
+  lastAccessedAt DateTime?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([organizationId, type, createdAt(sort: Desc)])
+}
+
 model Organization {
   id    String @id @default(cuid())
   slug  String @unique
@@ -170,13 +208,23 @@ model Organization {
   apiRateLimiterConfig      Json?
   realtimeRateLimiterConfig Json?
 
+  batchRateLimitConfig        Json?
+  batchQueueConcurrencyConfig Json?
+
+  featureFlags Json?
+
+  maximumProjectCount Int @default(10)
+
   projects                 Project[]
   members                  OrgMember[]
   invites                  OrgMemberInvite[]
   organizationIntegrations OrganizationIntegration[]
+  organizationAccessTokens OrganizationAccessToken[]
   workerGroups             WorkerInstanceGroup[]
   workerInstances          WorkerInstance[]
-  executionSnapshots       TaskRunExecutionSnapshot[]
+  githubAppInstallations   GithubAppInstallation[]
+  customerQueries          CustomerQuery[]
+  metricsDashboards        MetricsDashboard[]
 }
 
 model OrgMember {
@@ -292,14 +340,15 @@ model RuntimeEnvironment {
   taskRunCheckpoints   TaskRunCheckpoint[]
   waitpoints           Waitpoint[]
   workerInstances      WorkerInstance[]
-  executionSnapshots   TaskRunExecutionSnapshot[]
   waitpointTags        WaitpointTag[]
   BulkActionGroup      BulkActionGroup[]
+  customerQueries      CustomerQuery[]
 
   @@unique([projectId, slug, orgMemberId])
   @@unique([projectId, shortcode])
   @@index([parentEnvironmentId])
   @@index([projectId])
+  @@index([organizationId])
 }
 
 enum RuntimeEnvironmentType {
@@ -334,27 +383,36 @@ model Project {
   defaultWorkerGroup   WorkerInstanceGroup? @relation("ProjectDefaultWorkerGroup", fields: [defaultWorkerGroupId], references: [id])
   defaultWorkerGroupId String?
 
-  environments           RuntimeEnvironment[]
-  backgroundWorkers      BackgroundWorker[]
-  backgroundWorkerTasks  BackgroundWorkerTask[]
-  taskRuns               TaskRun[]
-  runTags                TaskRunTag[]
-  taskQueues             TaskQueue[]
-  environmentVariables   EnvironmentVariable[]
-  checkpoints            Checkpoint[]
-  WorkerDeployment       WorkerDeployment[]
-  CheckpointRestoreEvent CheckpointRestoreEvent[]
-  taskSchedules          TaskSchedule[]
-  alertChannels          ProjectAlertChannel[]
-  alerts                 ProjectAlert[]
-  alertStorages          ProjectAlertStorage[]
-  bulkActionGroups       BulkActionGroup[]
-  BackgroundWorkerFile   BackgroundWorkerFile[]
-  waitpoints             Waitpoint[]
-  taskRunWaitpoints      TaskRunWaitpoint[]
-  taskRunCheckpoints     TaskRunCheckpoint[]
-  executionSnapshots     TaskRunExecutionSnapshot[]
-  waitpointTags          WaitpointTag[]
+  /// The master queues they are allowed to use (impacts what they can set as default and trigger runs with)
+  allowedWorkerQueues String[] @default([]) @map("allowedMasterQueues")
+
+  environments                   RuntimeEnvironment[]
+  backgroundWorkers              BackgroundWorker[]
+  backgroundWorkerTasks          BackgroundWorkerTask[]
+  taskRuns                       TaskRun[]
+  runTags                        TaskRunTag[]
+  taskQueues                     TaskQueue[]
+  environmentVariables           EnvironmentVariable[]
+  checkpoints                    Checkpoint[]
+  WorkerDeployment               WorkerDeployment[]
+  CheckpointRestoreEvent         CheckpointRestoreEvent[]
+  taskSchedules                  TaskSchedule[]
+  alertChannels                  ProjectAlertChannel[]
+  alerts                         ProjectAlert[]
+  alertStorages                  ProjectAlertStorage[]
+  bulkActionGroups               BulkActionGroup[]
+  BackgroundWorkerFile           BackgroundWorkerFile[]
+  waitpoints                     Waitpoint[]
+  taskRunWaitpoints              TaskRunWaitpoint[]
+  taskRunCheckpoints             TaskRunCheckpoint[]
+  waitpointTags                  WaitpointTag[]
+  connectedGithubRepository      ConnectedGithubRepository?
+  organizationProjectIntegration OrganizationProjectIntegration[]
+  customerQueries                CustomerQuery[]
+
+  buildSettings         Json?
+  taskScheduleInstances TaskScheduleInstance[]
+  metricsDashboards     MetricsDashboard[]
 }
 
 enum ProjectVersion {
@@ -509,6 +567,8 @@ model BackgroundWorkerTask {
 
   triggerSource TaskTriggerSource @default(STANDARD)
 
+  payloadSchema Json?
+
   @@unique([workerId, slug])
   // Quick lookup of task identifiers
   @@index([projectId, slug])
@@ -533,7 +593,13 @@ model TaskRun {
 
   idempotencyKey          String?
   idempotencyKeyExpiresAt DateTime?
-  taskIdentifier          String
+  /// Stores the user-provided key and scope: { key: string, scope: "run" | "attempt" | "global" }
+  idempotencyKeyOptions   Json?
+
+  /// Debounce options: { key: string, delay: string, createdAt: Date }
+  debounce Json?
+
+  taskIdentifier String
 
   isTest Boolean @default(false)
 
@@ -609,11 +675,12 @@ model TaskRun {
 
   concurrencyKey String?
 
-  delayUntil  DateTime?
-  queuedAt    DateTime?
-  ttl         String?
-  expiredAt   DateTime?
-  maxAttempts Int?
+  delayUntil        DateTime?
+  queuedAt          DateTime?
+  ttl               String?
+  expiredAt         DateTime?
+  maxAttempts       Int?
+  lockedRetryConfig Json?
 
   /// optional token that can be used to authenticate the task run
   oneTimeUseToken String?
@@ -701,8 +768,16 @@ model TaskRun {
   /// Run error
   error Json?
 
+  /// Organization's billing plan type (cached for fallback when billing API fails)
+  planType String?
+
   maxDurationInSeconds Int?
 
+  /// The version of the realtime streams implementation used by the run
+  realtimeStreamsVersion String   @default("v1")
+  /// Store the stream keys that are being used by the run
+  realtimeStreams        String[] @default([])
+
   @@unique([oneTimeUseToken])
   @@unique([runtimeEnvironmentId, taskIdentifier, idempotencyKey])
   // Finding child runs
@@ -851,21 +926,15 @@ model TaskRunExecutionSnapshot {
 
   // Batch
   batchId String?
-  batch   BatchTaskRun? @relation(fields: [batchId], references: [id])
 
   /// This is the current run attempt number. Users can define how many attempts they want for a run.
   attemptNumber Int?
 
   /// Environment
   environmentId   String
-  environment     RuntimeEnvironment     @relation(fields: [environmentId], references: [id])
   environmentType RuntimeEnvironmentType
-
-  projectId String
-  project   Project @relation(fields: [projectId], references: [id])
-
-  organizationId String
-  organization   Organization @relation(fields: [organizationId], references: [id])
+  projectId       String
+  organizationId  String
 
   /// Waitpoints that have been completed for this execution
   completedWaitpoints Waitpoint[] @relation("completedWaitpoints")
@@ -879,8 +948,6 @@ model TaskRunExecutionSnapshot {
 
   /// Worker
   workerId String?
-  worker   WorkerInstance? @relation(fields: [workerId], references: [id])
-
   runnerId String?
 
   createdAt DateTime @default(now())
@@ -898,6 +965,8 @@ model TaskRunExecutionSnapshot {
 enum TaskRunExecutionStatus {
   /// Run has been created
   RUN_CREATED
+  /// Run is delayed, waiting to be enqueued
+  DELAYED
   /// Run is in the RunQueue
   QUEUED
   /// Run is in the RunQueue, and is also executing. This happens when a run is continued cannot reacquire concurrency
@@ -1017,6 +1086,8 @@ model Waitpoint {
   @@index([environmentId, type, createdAt(sort: Desc)])
   /// Status filtering
   @@index([environmentId, type, status])
+  /// For the waitpoint token dashboard page
+  @@index([environmentId, type, id(sort: Desc)])
 }
 
 enum WaitpointType {
@@ -1083,6 +1154,9 @@ model FeatureFlag {
 
   key   String @unique
   value Json?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
 }
 
 model WorkerInstance {
@@ -1100,8 +1174,6 @@ model WorkerInstance {
   workerGroup   WorkerInstanceGroup @relation(fields: [workerGroupId], references: [id])
   workerGroupId String
 
-  TaskRunExecutionSnapshot TaskRunExecutionSnapshot[]
-
   organization   Organization? @relation(fields: [organizationId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   organizationId String?
 
@@ -1139,6 +1211,7 @@ model WorkerInstanceGroup {
   /// If unmanged, it will be prefixed with the project ID e.g. "project_1-us-east-1"
   masterQueue String @unique
 
+  /// "N. Virginia, USA", "Frankfurt, Germany", etc. Used for display purposes
   description String?
   hidden      Boolean @default(false)
 
@@ -1156,6 +1229,11 @@ model WorkerInstanceGroup {
   project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   projectId String?
 
+  cloudProvider String?
+  /// "usa", "europe", etc. Used like a pseudo enum for things like flags
+  location      String?
+  staticIPs     String?
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 }
@@ -1438,8 +1516,15 @@ model TaskQueue {
   runtimeEnvironment   RuntimeEnvironment @relation(fields: [runtimeEnvironmentId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   runtimeEnvironmentId String
 
-  concurrencyLimit Int?
-  rateLimit        Json?
+  /// Represents the current concurrency limit for the queue
+  concurrencyLimit             Int?
+  /// When the concurrency limit was overridden
+  concurrencyLimitOverriddenAt DateTime?
+  /// Who overrode the concurrency limit (will be null if overridden via the API)
+  concurrencyLimitOverriddenBy String?
+  /// If concurrencyLimit is overridden, this is the overridden value
+  concurrencyLimitBase         Int?
+  rateLimit                    Json?
 
   paused Boolean @default(false)
 
@@ -1486,13 +1571,11 @@ model BatchTaskRun {
   batchVersion String   @default("v1")
 
   //engine v2
-  /// Snapshots that reference this batch
-  executionSnapshots TaskRunExecutionSnapshot[]
   /// Specific run blockers,
-  runsBlocked        TaskRunWaitpoint[]
+  runsBlocked TaskRunWaitpoint[]
   /// Waitpoints that are blocked by this batch.
   /// When a Batch is created it blocks execution of the associated parent run (for andWait)
-  waitpoints         Waitpoint[]
+  waitpoints  Waitpoint[]
 
   // This is for v3 batches
   /// sealed is set to true once no more items can be added to the batch
@@ -1512,6 +1595,18 @@ model BatchTaskRun {
   /// optional token that can be used to authenticate the task run
   oneTimeUseToken String?
 
+  // Run Engine v2 batch queue fields
+  /// When processing started (status changed to PROCESSING)
+  processingStartedAt   DateTime?
+  /// When processing completed (all items processed)
+  processingCompletedAt DateTime?
+  /// Count of successfully created runs
+  successfulRunCount    Int?
+  /// Count of failed run creations
+  failedRunCount        Int?
+  /// Detailed failure records
+  errors                BatchTaskRunError[]
+
   ///all the below properties are engine v1 only
   items                  BatchTaskRunItem[]
   taskIdentifier         String?
@@ -1525,11 +1620,15 @@ model BatchTaskRun {
   ///this is used for all engine versions
   @@unique([runtimeEnvironmentId, idempotencyKey])
   @@index([dependentTaskAttemptId])
+  // This is for the batch list dashboard page
+  @@index([runtimeEnvironmentId, id(sort: Desc)])
 }
 
 enum BatchTaskRunStatus {
   PENDING
+  PROCESSING
   COMPLETED
+  PARTIAL_FAILED
   ABORTED
 }
 
@@ -1564,6 +1663,31 @@ enum BatchTaskRunItemStatus {
   COMPLETED
 }
 
+/// Track individual run creation failures in batch processing (Run Engine v2)
+model BatchTaskRunError {
+  id             String       @id @default(cuid())
+  batchTaskRun   BatchTaskRun @relation(fields: [batchTaskRunId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  batchTaskRunId String
+
+  /// Which item in the batch (0-based index)
+  index          Int
+  /// The task identifier that was being triggered
+  taskIdentifier String
+  /// The payload that failed (JSON, may be truncated)
+  payload        String?
+  /// The options that were used
+  options        Json?
+  /// Error message
+  error          String
+  /// Error code if available
+  errorCode      String?
+
+  createdAt DateTime @default(now())
+
+  @@unique([batchTaskRunId, index])
+  @@index([batchTaskRunId])
+}
+
 model EnvironmentVariable {
   id         String                     @id @default(cuid())
   friendlyId String                     @unique
@@ -1592,6 +1716,9 @@ model EnvironmentVariableValue {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
+  version       Int   @default(1)
+  lastUpdatedBy Json?
+
   @@unique([variableId, environmentId])
 }
 
@@ -1690,7 +1817,8 @@ model WorkerDeployment {
   imageReference String?
   imagePlatform  String  @default("linux/amd64")
 
-  externalBuildData Json?
+  externalBuildData   Json?
+  buildServerMetadata Json?
 
   status WorkerDeploymentStatus @default(PENDING)
   type   WorkerDeploymentType   @default(V1)
@@ -1706,29 +1834,39 @@ model WorkerDeployment {
 
   triggeredBy   User?   @relation(fields: [triggeredById], references: [id], onDelete: SetNull, onUpdate: Cascade)
   triggeredById String?
+  triggeredVia  String?
+  commitSHA     String?
 
-  builtAt    DateTime?
-  deployedAt DateTime?
+  startedAt   DateTime?
+  installedAt DateTime?
+  builtAt     DateTime?
+  deployedAt  DateTime?
 
   failedAt  DateTime?
   errorData Json?
 
+  canceledAt     DateTime?
+  canceledReason String?
+
   // This is GitMeta type
   git Json?
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  promotions     WorkerDeploymentPromotion[]
-  alerts         ProjectAlert[]
-  workerInstance WorkerInstance[]
+  promotions             WorkerDeploymentPromotion[]
+  alerts                 ProjectAlert[]
+  workerInstance         WorkerInstance[]
+  integrationDeployments IntegrationDeployment[]
 
   @@unique([projectId, shortCode])
   @@unique([environmentId, version])
+  @@index([commitSHA])
 }
 
 enum WorkerDeploymentStatus {
   PENDING
+  INSTALLING
   /// This is the status when the image is being built
   BUILDING
   /// This is the status when the image is built and we are waiting for the indexing to finish
@@ -1823,6 +1961,9 @@ model TaskScheduleInstance {
   environment   RuntimeEnvironment @relation(fields: [environmentId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   environmentId String
 
+  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  projectId String
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
@@ -1833,6 +1974,8 @@ model TaskScheduleInstance {
 
   //you can only have a schedule attached to each environment once
   @@unique([taskScheduleId, environmentId])
+  @@index([environmentId])
+  @@index([projectId, active])
 }
 
 model RuntimeEnvironmentSession {
@@ -1955,7 +2098,8 @@ model OrganizationIntegration {
 
   friendlyId String @unique
 
-  service IntegrationService
+  service                IntegrationService
+  externalOrganizationId String? /// Identifier for external, integration's organization (e.g. Vercel's team)
 
   integrationData Json
 
@@ -1965,14 +2109,41 @@ model OrganizationIntegration {
   organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   organizationId String
 
-  createdAt DateTime @default(now())
-  updatedAt DateTime @updatedAt
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+
+  alertChannels                  ProjectAlertChannel[]
+  organizationProjectIntegration OrganizationProjectIntegration[]
 
-  alertChannels ProjectAlertChannel[]
+  @@index([externalOrganizationId])
+}
+
+model OrganizationProjectIntegration {
+  id String @id @default(cuid())
+
+  organizationIntegration   OrganizationIntegration @relation(fields: [organizationIntegrationId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  organizationIntegrationId String
+
+  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  projectId String
+
+  externalEntityId String /// Identifier for webhooks, for example Vercel's projectId
+  integrationData  Json /// Save useful data like config or external entity name
+  installedBy      String? /// UserId who installed the integration
+
+  createdAt DateTime  @default(now())
+  updatedAt DateTime  @updatedAt
+  deletedAt DateTime?
+
+  @@index([projectId])
+  @@index([projectId, organizationIntegrationId])
+  @@index([externalEntityId])
 }
 
 enum IntegrationService {
   SLACK
+  VERCEL
 }
 
 /// Bulk actions, like canceling and replaying runs
@@ -2189,3 +2360,215 @@ model TaskEventPartitioned {
   // Used for getting all logs for a run
   @@index([runId])
 }
+
+enum GithubRepositorySelection {
+  ALL
+  SELECTED
+}
+
+model GithubAppInstallation {
+  id String @id @default(cuid())
+
+  appInstallationId   BigInt                    @unique
+  targetId            BigInt
+  targetType          String
+  accountHandle       String
+  permissions         Json?
+  repositorySelection GithubRepositorySelection
+  installedBy         String?
+
+  organization   Organization @relation(fields: [organizationId], references: [id])
+  organizationId String
+
+  repositories GithubRepository[]
+
+  deletedAt   DateTime?
+  suspendedAt DateTime?
+  createdAt   DateTime  @default(now())
+  updatedAt   DateTime  @updatedAt
+
+  @@index([organizationId])
+}
+
+model GithubRepository {
+  id String @id @default(cuid())
+
+  githubId      BigInt
+  name          String
+  fullName      String
+  htmlUrl       String
+  private       Boolean
+  defaultBranch String
+
+  installation   GithubAppInstallation @relation(fields: [installationId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  installationId String
+
+  createdAt                 DateTime                    @default(now())
+  updatedAt                 DateTime                    @updatedAt
+  ConnectedGithubRepository ConnectedGithubRepository[]
+
+  @@unique([installationId, githubId])
+  @@index([installationId])
+}
+
+model ConnectedGithubRepository {
+  id String @id @default(cuid())
+
+  project   Project @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  projectId String
+
+  repository   GithubRepository @relation(fields: [repositoryId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  repositoryId String
+
+  // Branch configuration by environment slug, stored as JSON
+  // Example: {
+  //   "prod": { "branch": "main" },
+  //   "staging": { "branch": "staging" },
+  // }
+  // We could alternatively store tracking branch configurations in a separate table and reference the runtime environments properly.
+  // We don't need that functionality currently so it's simpler to store it here.
+  // Should we need to introduce such functionality in the future, e.g., supporting custom environments, the migration should be straightforward.
+  branchTracking Json
+
+  previewDeploymentsEnabled Boolean @default(true)
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  // A project can only be connected to one repository
+  @@unique([projectId])
+  @@index([repositoryId])
+}
+
+enum ImpersonationAuditLogAction {
+  START
+  STOP
+}
+
+model ImpersonationAuditLog {
+  id String @id @default(cuid())
+
+  action ImpersonationAuditLogAction
+
+  /// The admin user who initiated/ended the impersonation
+  admin   User   @relation("ImpersonationAdmin", fields: [adminId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  adminId String
+
+  /// The user being impersonated
+  target   User   @relation("ImpersonationTarget", fields: [targetId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  targetId String
+
+  ipAddress String?
+
+  createdAt DateTime @default(now())
+
+  @@index([adminId])
+  @@index([targetId])
+  @@index([createdAt])
+}
+
+enum CustomerQuerySource {
+  DASHBOARD
+  API
+}
+
+enum CustomerQueryScope {
+  ORGANIZATION
+  PROJECT
+  ENVIRONMENT
+}
+
+model CustomerQuery {
+  id String @id @default(cuid())
+
+  /// The TSQL query text that was executed
+  query String
+
+  /// The scope of the query (determines which tenant IDs were used)
+  scope CustomerQueryScope
+
+  /// Query execution statistics from ClickHouse
+  stats Json
+
+  /// AI-generated title summarizing the query
+  title String?
+
+  /// Where the query originated from
+  source CustomerQuerySource @default(DASHBOARD)
+
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  organizationId String
+
+  project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  projectId String?
+
+  environment   RuntimeEnvironment? @relation(fields: [environmentId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  environmentId String?
+
+  /// Optional user who executed the query (null for API calls)
+  user   User?   @relation(fields: [userId], references: [id], onDelete: SetNull, onUpdate: Cascade)
+  userId String?
+
+  /// Time filter settings used when the query was executed
+  /// Period like "7d", "24h", etc.
+  filterPeriod String?
+  /// Custom start date (ISO 8601)
+  filterFrom   DateTime?
+  /// Custom end date (ISO 8601)
+  filterTo     DateTime?
+
+  createdAt DateTime @default(now())
+
+  /// Fast lookup for history menu (most recent 20 per org)
+  @@index([organizationId, createdAt(sort: Desc)])
+  /// For Stripe metering job - find unprocessed queries
+  @@index([createdAt])
+}
+
+model IntegrationDeployment {
+  id String @id @default(cuid())
+
+  integrationName         String /// For example Vercel
+  integrationDeploymentId String /// External ID
+  commitSHA               String
+  deploymentId            String?
+  status                  String? /// External deployment status
+
+  workerDeployment WorkerDeployment? @relation(fields: [deploymentId], references: [id], onDelete: SetNull, onUpdate: Cascade)
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([commitSHA])
+  @@index([deploymentId])
+}
+
+/// A user-defined metrics dashboard
+model MetricsDashboard {
+  id String @id @default(cuid())
+
+  friendlyId String @unique
+
+  title       String
+  description String @default("")
+
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  organizationId String
+
+  project   Project? @relation(fields: [projectId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  projectId String?
+
+  /// Who created the dashboard
+  owner   User?   @relation(fields: [ownerId], references: [id], onDelete: SetNull, onUpdate: Cascade)
+  ownerId String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  /// JSON that defines the config, queries, layout and config of all widgets. 
+  /// There will be a version field for the format.
+  layout String
+
+  /// Fast lookup for the list
+  @@index([projectId, createdAt(sort: Desc)])
+}
diff --git a/internal-packages/database/src/index.ts b/internal-packages/database/src/index.ts
index cb0f9d4eb9e..94e211e91aa 100644
--- a/internal-packages/database/src/index.ts
+++ b/internal-packages/database/src/index.ts
@@ -1,2 +1,2 @@
-export * from "@prisma/client";
+export * from "../generated/prisma";
 export * from "./transaction";
diff --git a/internal-packages/database/src/transaction.ts b/internal-packages/database/src/transaction.ts
index ac671a6f8e0..5d0cdb85f0e 100644
--- a/internal-packages/database/src/transaction.ts
+++ b/internal-packages/database/src/transaction.ts
@@ -1,4 +1,13 @@
-import { Prisma, PrismaClient } from "@prisma/client";
+import { PrismaClient } from "../generated/prisma";
+import { Decimal } from "decimal.js";
+import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library";
+
+// Define the isolation levels manually
+type TransactionIsolationLevel =
+  | "ReadUncommitted"
+  | "ReadCommitted"
+  | "RepeatableRead"
+  | "Serializable";
 
 export type PrismaTransactionClient = Omit<
   PrismaClient,
@@ -9,13 +18,13 @@ export type PrismaClientOrTransaction = PrismaClient | PrismaTransactionClient;
 
 export type PrismaReplicaClient = Omit<PrismaClient, "$transaction">;
 
-export const Decimal = Prisma.Decimal;
+export { Decimal };
 
 function isTransactionClient(prisma: PrismaClientOrTransaction): prisma is PrismaTransactionClient {
   return !("$transaction" in prisma);
 }
 
-export function isPrismaKnownError(error: unknown): error is Prisma.PrismaClientKnownRequestError {
+export function isPrismaKnownError(error: unknown): error is PrismaClientKnownRequestError {
   return (
     typeof error === "object" && error !== null && "code" in error && typeof error.code === "string"
   );
@@ -55,7 +64,7 @@ export type PrismaTransactionOptions = {
   timeout?: number;
 
   /**  Sets the transaction isolation level. By default this is set to the value currently configured in your database. */
-  isolationLevel?: Prisma.TransactionIsolationLevel;
+  isolationLevel?: TransactionIsolationLevel;
 
   swallowPrismaErrors?: boolean;
 
@@ -70,7 +79,7 @@ export type PrismaTransactionOptions = {
 export async function $transaction<R>(
   prisma: PrismaClientOrTransaction,
   fn: (prisma: PrismaTransactionClient) => Promise<R>,
-  prismaError: (error: Prisma.PrismaClientKnownRequestError) => void,
+  prismaError: (error: PrismaClientKnownRequestError) => void,
   options?: PrismaTransactionOptions,
   attempt = 0
 ): Promise<R | undefined> {
diff --git a/internal-packages/emails/package.json b/internal-packages/emails/package.json
index 85cb7abe014..68b01563b81 100644
--- a/internal-packages/emails/package.json
+++ b/internal-packages/emails/package.json
@@ -6,21 +6,22 @@
   "main": "./src/index.tsx",
   "types": "./src/index.tsx",
   "scripts": {
-    "dev": "PORT=3080 email dev"
+    "dev": "PORT=3080 email dev",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-sdk/client-ses": "^3.716.0",
+    "@aws-sdk/client-sesv2": "^3.716.0",
     "@react-email/components": "0.0.16",
     "@react-email/render": "^0.0.12",
-    "nodemailer": "^6.9.16",
+    "nodemailer": "^7.0.11",
     "react": "^18.2.0",
     "react-email": "^2.1.1",
     "resend": "^3.2.0",
     "tiny-invariant": "^1.2.0",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
-    "@types/nodemailer": "^6.4.17",
+    "@types/nodemailer": "^7.0.4",
     "@types/react": "18.2.69"
   },
   "engines": {
diff --git a/internal-packages/emails/src/transports/aws-ses.ts b/internal-packages/emails/src/transports/aws-ses.ts
index 58a136e1d6d..d1572d5c1ef 100644
--- a/internal-packages/emails/src/transports/aws-ses.ts
+++ b/internal-packages/emails/src/transports/aws-ses.ts
@@ -1,7 +1,7 @@
 import { render } from "@react-email/render";
 import { EmailError, MailMessage, MailTransport, PlainTextMailMessage } from "./index";
 import nodemailer from "nodemailer"
-import * as awsSes from "@aws-sdk/client-ses"
+import { SESv2Client, SendEmailCommand } from "@aws-sdk/client-sesv2"
 
 export type AwsSesMailTransportOptions = {
   type: 'aws-ses',
@@ -11,13 +11,10 @@ export class AwsSesMailTransport implements MailTransport {
   #client: nodemailer.Transporter;
 
   constructor(options: AwsSesMailTransportOptions) {
-    const ses = new awsSes.SESClient()
+    const sesClient = new SESv2Client()
 
     this.#client = nodemailer.createTransport({
-      SES: {
-        aws: awsSes,
-        ses
-      }
+      SES: { sesClient, SendEmailCommand }
     })
   }
 
diff --git a/internal-packages/otlp-importer/src/index.ts b/internal-packages/otlp-importer/src/index.ts
index 7401431a847..3a70776ddff 100644
--- a/internal-packages/otlp-importer/src/index.ts
+++ b/internal-packages/otlp-importer/src/index.ts
@@ -10,6 +10,12 @@ import {
   ExportLogsServiceResponse,
 } from "./generated/opentelemetry/proto/collector/logs/v1/logs_service";
 
+import {
+  ExportMetricsPartialSuccess,
+  ExportMetricsServiceRequest,
+  ExportMetricsServiceResponse,
+} from "./generated/opentelemetry/proto/collector/metrics/v1/metrics_service";
+
 import type {
   AnyValue,
   KeyValue,
@@ -33,6 +39,21 @@ import {
   Status,
   Status_StatusCode,
 } from "./generated/opentelemetry/proto/trace/v1/trace";
+import {
+  ResourceMetrics,
+  ScopeMetrics,
+  Metric,
+  Gauge,
+  Sum,
+  Histogram,
+  ExponentialHistogram,
+  Summary,
+  NumberDataPoint,
+  HistogramDataPoint,
+  ExponentialHistogramDataPoint,
+  SummaryDataPoint,
+  AggregationTemporality,
+} from "./generated/opentelemetry/proto/metrics/v1/metrics";
 
 export {
   LogRecord,
@@ -57,3 +78,21 @@ export {
 export { ExportTracePartialSuccess, ExportTraceServiceRequest, ExportTraceServiceResponse };
 
 export { ExportLogsPartialSuccess, ExportLogsServiceRequest, ExportLogsServiceResponse };
+
+export { ExportMetricsPartialSuccess, ExportMetricsServiceRequest, ExportMetricsServiceResponse };
+
+export {
+  ResourceMetrics,
+  ScopeMetrics,
+  Metric,
+  Gauge,
+  Sum,
+  Histogram,
+  ExponentialHistogram,
+  Summary,
+  NumberDataPoint,
+  HistogramDataPoint,
+  ExponentialHistogramDataPoint,
+  SummaryDataPoint,
+  AggregationTemporality,
+};
diff --git a/internal-packages/replication/src/client.ts b/internal-packages/replication/src/client.ts
index 0dfbe1c026a..1a7ddb27236 100644
--- a/internal-packages/replication/src/client.ts
+++ b/internal-packages/replication/src/client.ts
@@ -413,7 +413,31 @@ export class LogicalReplicationClient {
       return false;
     }
 
-    if (await this.#doesPublicationExist()) {
+    const publicationExists = await this.#doesPublicationExist();
+
+    if (publicationExists) {
+      // Validate the existing publication is correctly configured
+      const validationError = await this.#validatePublicationConfiguration();
+
+      if (validationError) {
+        this.logger.error("Publication exists but is misconfigured", {
+          name: this.options.name,
+          table: this.options.table,
+          slotName: this.options.slotName,
+          publicationName: this.options.publicationName,
+          error: validationError,
+        });
+
+        this.events.emit("error", new LogicalReplicationClientError(validationError));
+        return false;
+      }
+
+      this.logger.info("Publication exists and is correctly configured", {
+        name: this.options.name,
+        table: this.options.table,
+        publicationName: this.options.publicationName,
+      });
+
       return true;
     }
 
@@ -459,6 +483,90 @@ export class LogicalReplicationClient {
     return res.rows[0].exists;
   }
 
+  async #validatePublicationConfiguration(): Promise<string | null> {
+    if (!this.client) {
+      return "Cannot validate publication configuration: client not connected";
+    }
+
+    // Check if the publication has the correct table
+    const tablesRes = await this.client.query(
+      `SELECT schemaname, tablename 
+       FROM pg_publication_tables 
+       WHERE pubname = '${this.options.publicationName}';`
+    );
+
+    const tables = tablesRes.rows;
+    const expectedTable = this.options.table;
+
+    // Check if the table is in the publication
+    const hasTable = tables.some(
+      (row) => row.tablename === expectedTable && row.schemaname === "public"
+    );
+
+    if (!hasTable) {
+      if (tables.length === 0) {
+        return `Publication '${this.options.publicationName}' exists but has NO TABLES configured. Expected table: "public.${expectedTable}". Run: ALTER PUBLICATION ${this.options.publicationName} ADD TABLE "${expectedTable}";`;
+      } else {
+        const tableList = tables.map((t) => `"${t.schemaname}"."${t.tablename}"`).join(", ");
+        return `Publication '${this.options.publicationName}' exists but does not include the required table "public.${expectedTable}". Current tables: ${tableList}. Run: ALTER PUBLICATION ${this.options.publicationName} ADD TABLE "${expectedTable}";`;
+      }
+    }
+
+    // Check if the publication has the correct actions configured
+    if (this.options.publicationActions && this.options.publicationActions.length > 0) {
+      const actionsRes = await this.client.query(
+        `SELECT pubinsert, pubupdate, pubdelete, pubtruncate 
+         FROM pg_publication 
+         WHERE pubname = '${this.options.publicationName}';`
+      );
+
+      if (actionsRes.rows.length === 0) {
+        return `Publication '${this.options.publicationName}' not found when checking actions`;
+      }
+
+      const actualActions = actionsRes.rows[0];
+      const missingActions: string[] = [];
+
+      for (const action of this.options.publicationActions) {
+        switch (action) {
+          case "insert":
+            if (!actualActions.pubinsert) missingActions.push("insert");
+            break;
+          case "update":
+            if (!actualActions.pubupdate) missingActions.push("update");
+            break;
+          case "delete":
+            if (!actualActions.pubdelete) missingActions.push("delete");
+            break;
+          case "truncate":
+            if (!actualActions.pubtruncate) missingActions.push("truncate");
+            break;
+        }
+      }
+
+      if (missingActions.length > 0) {
+        const currentActions: string[] = [];
+        if (actualActions.pubinsert) currentActions.push("insert");
+        if (actualActions.pubupdate) currentActions.push("update");
+        if (actualActions.pubdelete) currentActions.push("delete");
+        if (actualActions.pubtruncate) currentActions.push("truncate");
+
+        return `Publication '${
+          this.options.publicationName
+        }' is missing required actions. Expected: [${this.options.publicationActions.join(
+          ", "
+        )}], Current: [${currentActions.join(", ")}], Missing: [${missingActions.join(
+          ", "
+        )}]. Run: ALTER PUBLICATION ${
+          this.options.publicationName
+        } SET (publish = '${this.options.publicationActions.join(", ")}');`;
+      }
+    }
+
+    // All validations passed
+    return null;
+  }
+
   async #createSlot(): Promise<boolean> {
     if (!this.client) {
       this.events.emit("error", new LogicalReplicationClientError("Cannot create slot"));
diff --git a/internal-packages/replication/src/pgoutput.ts b/internal-packages/replication/src/pgoutput.ts
index 0e75a697f4e..809ad877581 100644
--- a/internal-packages/replication/src/pgoutput.ts
+++ b/internal-packages/replication/src/pgoutput.ts
@@ -20,6 +20,18 @@ export type PgoutputMessage =
   | MessageType
   | MessageUpdate;
 
+export type PgoutputMessageArray =
+  | MessageBegin
+  | MessageCommit
+  | MessageDeleteArray
+  | MessageInsertArray
+  | MessageMessage
+  | MessageOrigin
+  | MessageRelation
+  | MessageTruncate
+  | MessageType
+  | MessageUpdateArray;
+
 export interface MessageBegin {
   tag: "begin";
   commitLsn: string | null;
@@ -95,6 +107,26 @@ export interface MessageUpdate {
   new: Record<string, any>;
 }
 
+// Array variants for zero-copy performance
+export interface MessageInsertArray {
+  tag: "insert";
+  relation: MessageRelation;
+  new: any[];
+}
+export interface MessageUpdateArray {
+  tag: "update";
+  relation: MessageRelation;
+  key: any[] | null;
+  old: any[] | null;
+  new: any[];
+}
+export interface MessageDeleteArray {
+  tag: "delete";
+  relation: MessageRelation;
+  key: any[] | null;
+  old: any[] | null;
+}
+
 class BinaryReader {
   private offset = 0;
   constructor(private buf: Buffer) {}
@@ -193,6 +225,35 @@ export class PgoutputParser {
     }
   }
 
+  public parseArray(buf: Buffer): PgoutputMessageArray {
+    const reader = new BinaryReader(buf);
+    const tag = reader.readUint8();
+    switch (tag) {
+      case 0x42:
+        return this.msgBegin(reader);
+      case 0x4f:
+        return this.msgOrigin(reader);
+      case 0x59:
+        return this.msgType(reader);
+      case 0x52:
+        return this.msgRelation(reader);
+      case 0x49:
+        return this.msgInsertArray(reader);
+      case 0x55:
+        return this.msgUpdateArray(reader);
+      case 0x44:
+        return this.msgDeleteArray(reader);
+      case 0x54:
+        return this.msgTruncate(reader);
+      case 0x4d:
+        return this.msgMessage(reader);
+      case 0x43:
+        return this.msgCommit(reader);
+      default:
+        throw Error("unknown pgoutput message");
+    }
+  }
+
   private msgBegin(reader: BinaryReader): MessageBegin {
     return {
       tag: "begin",
@@ -312,6 +373,55 @@ export class PgoutputParser {
     }
     return { tag: "delete", relation, key, old };
   }
+
+  // Array variants - skip object creation for performance
+  private msgInsertArray(reader: BinaryReader): MessageInsertArray {
+    const relation = this._relationCache.get(reader.readInt32());
+    if (!relation) throw Error("missing relation");
+    reader.readUint8(); // consume the 'N' key
+    return {
+      tag: "insert",
+      relation,
+      new: this.readTupleAsArray(reader, relation),
+    };
+  }
+  private msgUpdateArray(reader: BinaryReader): MessageUpdateArray {
+    const relation = this._relationCache.get(reader.readInt32());
+    if (!relation) throw Error("missing relation");
+    let key: any[] | null = null;
+    let old: any[] | null = null;
+    let new_: any[] | null = null;
+    const subMsgKey = reader.readUint8();
+    if (subMsgKey === 0x4b) {
+      key = this.readTupleAsArray(reader, relation);
+      reader.readUint8();
+      new_ = this.readTupleAsArray(reader, relation);
+    } else if (subMsgKey === 0x4f) {
+      old = this.readTupleAsArray(reader, relation);
+      reader.readUint8();
+      new_ = this.readTupleAsArray(reader, relation, old);
+    } else if (subMsgKey === 0x4e) {
+      new_ = this.readTupleAsArray(reader, relation);
+    } else {
+      throw Error(`unknown submessage key ${String.fromCharCode(subMsgKey)}`);
+    }
+    return { tag: "update", relation, key, old, new: new_ };
+  }
+  private msgDeleteArray(reader: BinaryReader): MessageDeleteArray {
+    const relation = this._relationCache.get(reader.readInt32());
+    if (!relation) throw Error("missing relation");
+    let key: any[] | null = null;
+    let old: any[] | null = null;
+    const subMsgKey = reader.readUint8();
+    if (subMsgKey === 0x4b) {
+      key = this.readTupleAsArray(reader, relation);
+    } else if (subMsgKey === 0x4f) {
+      old = this.readTupleAsArray(reader, relation);
+    } else {
+      throw Error(`unknown submessage key ${String.fromCharCode(subMsgKey)}`);
+    }
+    return { tag: "delete", relation, key, old };
+  }
   private readKeyTuple(reader: BinaryReader, relation: MessageRelation): Record<string, any> {
     const tuple = this.readTuple(reader, relation);
     const key = Object.create(null);
@@ -354,6 +464,40 @@ export class PgoutputParser {
     }
     return tuple;
   }
+
+  private readTupleAsArray(
+    reader: BinaryReader,
+    { columns }: MessageRelation,
+    unchangedToastFallback?: any[] | null
+  ): any[] {
+    const nfields = reader.readInt16();
+    const tuple = new Array(nfields);
+    for (let i = 0; i < nfields; i++) {
+      const { parser } = columns[i];
+      const kind = reader.readUint8();
+      switch (kind) {
+        case 0x62: // 'b' binary
+          const bsize = reader.readInt32();
+          tuple[i] = reader.read(bsize);
+          break;
+        case 0x74: // 't' text
+          const valsize = reader.readInt32();
+          const valbuf = reader.read(valsize);
+          const valtext = reader.decodeText(valbuf);
+          tuple[i] = parser(valtext);
+          break;
+        case 0x6e: // 'n' null
+          tuple[i] = null;
+          break;
+        case 0x75: // 'u' unchanged toast datum
+          tuple[i] = unchangedToastFallback?.[i];
+          break;
+        default:
+          throw Error(`unknown attribute kind ${String.fromCharCode(kind)}`);
+      }
+    }
+    return tuple;
+  }
   private msgTruncate(reader: BinaryReader): MessageTruncate {
     const nrels = reader.readInt32();
     const flags = reader.readUint8();
diff --git a/internal-packages/run-engine/package.json b/internal-packages/run-engine/package.json
index e509d2dede9..680d385ca4e 100644
--- a/internal-packages/run-engine/package.json
+++ b/internal-packages/run-engine/package.json
@@ -25,12 +25,13 @@
     "@internal/tracing": "workspace:*",
     "@trigger.dev/core": "workspace:*",
     "@trigger.dev/database": "workspace:*",
-    "@unkey/cache": "^1.5.0",
+    "@internal/cache": "workspace:*",
     "assert-never": "^1.2.1",
     "nanoid": "3.3.8",
     "redlock": "5.0.0-beta.2",
     "seedrandom": "^3.0.5",
-    "zod": "3.23.8"
+    "zod": "3.25.76",
+    "p-map": "^6.0.0"
   },
   "devDependencies": {
     "@internal/testcontainers": "workspace:*",
diff --git a/internal-packages/run-engine/src/batch-queue/completionTracker.ts b/internal-packages/run-engine/src/batch-queue/completionTracker.ts
new file mode 100644
index 00000000000..f6570cfc54e
--- /dev/null
+++ b/internal-packages/run-engine/src/batch-queue/completionTracker.ts
@@ -0,0 +1,402 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import type { BatchItemFailure, BatchMeta, CompleteBatchResult } from "./types.js";
+
+/**
+ * Key constants for Redis keys used by completion tracker.
+ */
+const KEY_PREFIX = "batch";
+const META_SUFFIX = "meta";
+const RUNS_SUFFIX = "runs";
+const FAILURES_SUFFIX = "failures";
+const PROCESSED_SUFFIX = "processed";
+const PROCESSED_ITEMS_SUFFIX = "processed_items";
+const ENQUEUED_ITEMS_SUFFIX = "enqueued_items";
+
+/**
+ * BatchCompletionTracker handles batch metadata storage and completion tracking.
+ *
+ * Responsibilities:
+ * - Store and retrieve batch metadata in Redis
+ * - Track successful run IDs per batch
+ * - Track failures per batch
+ * - Atomically increment processed count (with idempotency per item)
+ * - Detect batch completion (processedCount === runCount)
+ * - Cleanup batch data after completion
+ *
+ * Idempotency:
+ * The tracker uses a set to track which item indices have been processed.
+ * This prevents double-counting if a message is redelivered due to visibility timeout.
+ */
+export class BatchCompletionTracker {
+  private redis: Redis;
+  private logger: {
+    debug: (message: string, context?: Record<string, unknown>) => void;
+    info: (message: string, context?: Record<string, unknown>) => void;
+    error: (message: string, context?: Record<string, unknown>) => void;
+  };
+
+  constructor(options: {
+    redis: RedisOptions;
+    logger?: {
+      debug: (message: string, context?: Record<string, unknown>) => void;
+      info: (message: string, context?: Record<string, unknown>) => void;
+      error: (message: string, context?: Record<string, unknown>) => void;
+    };
+  }) {
+    this.redis = createRedisClient(options.redis);
+    this.logger = options.logger ?? {
+      debug: () => {},
+      info: () => {},
+      error: () => {},
+    };
+
+    this.#registerCommands();
+  }
+
+  // ============================================================================
+  // Key Generation
+  // ============================================================================
+
+  private metaKey(batchId: string): string {
+    return `${KEY_PREFIX}:${batchId}:${META_SUFFIX}`;
+  }
+
+  private runsKey(batchId: string): string {
+    return `${KEY_PREFIX}:${batchId}:${RUNS_SUFFIX}`;
+  }
+
+  private failuresKey(batchId: string): string {
+    return `${KEY_PREFIX}:${batchId}:${FAILURES_SUFFIX}`;
+  }
+
+  private processedCountKey(batchId: string): string {
+    return `${KEY_PREFIX}:${batchId}:${PROCESSED_SUFFIX}`;
+  }
+
+  private processedItemsKey(batchId: string): string {
+    return `${KEY_PREFIX}:${batchId}:${PROCESSED_ITEMS_SUFFIX}`;
+  }
+
+  private enqueuedItemsKey(batchId: string): string {
+    return `${KEY_PREFIX}:${batchId}:${ENQUEUED_ITEMS_SUFFIX}`;
+  }
+
+  // ============================================================================
+  // Metadata Operations
+  // ============================================================================
+
+  /**
+   * Store batch metadata in Redis.
+   */
+  async storeMeta(batchId: string, meta: BatchMeta): Promise<void> {
+    const key = this.metaKey(batchId);
+    await this.redis.set(key, JSON.stringify(meta));
+
+    this.logger.debug("Stored batch metadata", { batchId, runCount: meta.runCount });
+  }
+
+  /**
+   * Retrieve batch metadata from Redis.
+   */
+  async getMeta(batchId: string): Promise<BatchMeta | null> {
+    const key = this.metaKey(batchId);
+    const metaJson = await this.redis.get(key);
+
+    if (!metaJson) {
+      return null;
+    }
+
+    return JSON.parse(metaJson) as BatchMeta;
+  }
+
+  // ============================================================================
+  // Success/Failure Recording (Idempotent)
+  // ============================================================================
+
+  /**
+   * Record a successful run and increment processed count atomically.
+   * This operation is idempotent - if the same itemIndex is processed again,
+   * it will not double-count (returns current processed count without incrementing).
+   *
+   * Returns the new processed count.
+   */
+  async recordSuccess(batchId: string, runId: string, itemIndex?: number): Promise<number> {
+    const processedItemsKey = this.processedItemsKey(batchId);
+    const runsKey = this.runsKey(batchId);
+    const processedKey = this.processedCountKey(batchId);
+
+    // Use Lua script for atomic idempotent recording
+    // Runs are stored in a sorted set with itemIndex as score to preserve ordering
+    const result = await this.redis.recordSuccessIdempotent(
+      processedItemsKey,
+      runsKey,
+      processedKey,
+      itemIndex !== undefined ? itemIndex.toString() : runId, // Use itemIndex as idempotency key if provided
+      runId,
+      itemIndex !== undefined ? itemIndex.toString() : "0" // Score for sorted set ordering
+    );
+
+    const processedCount = parseInt(result, 10);
+
+    this.logger.debug("Recorded success", { batchId, runId, itemIndex, processedCount });
+
+    return processedCount;
+  }
+
+  /**
+   * Record a failure and increment processed count atomically.
+   * This operation is idempotent - if the same itemIndex is processed again,
+   * it will not double-count (returns current processed count without incrementing).
+   *
+   * Returns the new processed count.
+   */
+  async recordFailure(
+    batchId: string,
+    failure: Omit<BatchItemFailure, "timestamp">
+  ): Promise<number> {
+    const processedItemsKey = this.processedItemsKey(batchId);
+    const failuresKey = this.failuresKey(batchId);
+    const processedKey = this.processedCountKey(batchId);
+
+    const failureRecord: BatchItemFailure = {
+      ...failure,
+      timestamp: Date.now(),
+    };
+
+    // Use Lua script for atomic idempotent recording
+    const result = await this.redis.recordFailureIdempotent(
+      processedItemsKey,
+      failuresKey,
+      processedKey,
+      failure.index.toString(), // Use itemIndex as idempotency key
+      JSON.stringify(failureRecord)
+    );
+
+    const processedCount = parseInt(result, 10);
+
+    this.logger.debug("Recorded failure", {
+      batchId,
+      index: failure.index,
+      error: failure.error,
+      processedCount,
+    });
+
+    return processedCount;
+  }
+
+  // ============================================================================
+  // Query Operations
+  // ============================================================================
+
+  /**
+   * Get all successful run IDs for a batch, ordered by original item index.
+   */
+  async getSuccessfulRuns(batchId: string): Promise<string[]> {
+    const runsKey = this.runsKey(batchId);
+    // Use ZRANGE to get runs ordered by their item index (score)
+    return await this.redis.zrange(runsKey, 0, -1);
+  }
+
+  /**
+   * Get all failures for a batch.
+   */
+  async getFailures(batchId: string): Promise<BatchItemFailure[]> {
+    const failuresKey = this.failuresKey(batchId);
+    const failureJsons = await this.redis.lrange(failuresKey, 0, -1);
+    return failureJsons.map((json) => JSON.parse(json) as BatchItemFailure);
+  }
+
+  /**
+   * Get the current processed count for a batch.
+   */
+  async getProcessedCount(batchId: string): Promise<number> {
+    const processedKey = this.processedCountKey(batchId);
+    const count = await this.redis.get(processedKey);
+    return count ? parseInt(count, 10) : 0;
+  }
+
+  /**
+   * Check if a batch is complete (all items processed).
+   */
+  async isComplete(batchId: string): Promise<boolean> {
+    const meta = await this.getMeta(batchId);
+    if (!meta) {
+      return false;
+    }
+
+    const processedCount = await this.getProcessedCount(batchId);
+    return processedCount >= meta.runCount;
+  }
+
+  // ============================================================================
+  // Enqueue Tracking (for 2-phase batch API)
+  // ============================================================================
+
+  /**
+   * Check if an item index has already been enqueued.
+   * Used for idempotency in the streaming batch items endpoint.
+   */
+  async isItemEnqueued(batchId: string, itemIndex: number): Promise<boolean> {
+    const enqueuedKey = this.enqueuedItemsKey(batchId);
+    const result = await this.redis.sismember(enqueuedKey, itemIndex.toString());
+    return result === 1;
+  }
+
+  /**
+   * Mark an item index as enqueued atomically.
+   * Returns true if the item was newly added (not a duplicate).
+   * Returns false if the item was already enqueued (deduplicated).
+   */
+  async markItemEnqueued(batchId: string, itemIndex: number): Promise<boolean> {
+    const enqueuedKey = this.enqueuedItemsKey(batchId);
+    const added = await this.redis.sadd(enqueuedKey, itemIndex.toString());
+
+    if (added === 0) {
+      this.logger.debug("Item deduplication: item already enqueued", { batchId, itemIndex });
+    }
+
+    return added === 1;
+  }
+
+  /**
+   * Get the count of enqueued items for a batch.
+   */
+  async getEnqueuedCount(batchId: string): Promise<number> {
+    const enqueuedKey = this.enqueuedItemsKey(batchId);
+    return await this.redis.scard(enqueuedKey);
+  }
+
+  // ============================================================================
+  // Completion Operations
+  // ============================================================================
+
+  /**
+   * Get the complete result for a finished batch.
+   * Gathers all run IDs and failures.
+   */
+  async getCompletionResult(batchId: string): Promise<CompleteBatchResult> {
+    const [runIds, failures] = await Promise.all([
+      this.getSuccessfulRuns(batchId),
+      this.getFailures(batchId),
+    ]);
+
+    return {
+      batchId,
+      runIds,
+      successfulRunCount: runIds.length,
+      failedRunCount: failures.length,
+      failures,
+    };
+  }
+
+  /**
+   * Clean up all Redis keys for a completed batch.
+   */
+  async cleanup(batchId: string): Promise<void> {
+    const keys = [
+      this.metaKey(batchId),
+      this.runsKey(batchId),
+      this.failuresKey(batchId),
+      this.processedCountKey(batchId),
+      this.processedItemsKey(batchId),
+      this.enqueuedItemsKey(batchId),
+    ];
+
+    await this.redis.del(...keys);
+
+    this.logger.debug("Cleaned up batch data", { batchId });
+  }
+
+  // ============================================================================
+  // Lifecycle
+  // ============================================================================
+
+  /**
+   * Close the Redis connection.
+   */
+  async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private - Redis Commands
+  // ============================================================================
+
+  #registerCommands(): void {
+    // Atomic idempotent success recording
+    // Returns the current processed count (whether incremented or not)
+    // Uses ZADD to store runs in a sorted set ordered by item index
+    this.redis.defineCommand("recordSuccessIdempotent", {
+      numberOfKeys: 3,
+      lua: `
+local processedItemsKey = KEYS[1]
+local runsKey = KEYS[2]
+local processedKey = KEYS[3]
+local itemKey = ARGV[1]
+local runId = ARGV[2]
+local itemScore = tonumber(ARGV[3]) or 0
+
+-- Check if already processed (SADD returns 0 if member already exists)
+local added = redis.call('SADD', processedItemsKey, itemKey)
+
+if added == 1 then
+  -- New item, record the success in sorted set with item index as score
+  redis.call('ZADD', runsKey, itemScore, runId)
+  redis.call('INCR', processedKey)
+end
+
+-- Return current count
+local count = redis.call('GET', processedKey)
+return count or '0'
+      `,
+    });
+
+    // Atomic idempotent failure recording
+    // Returns the current processed count (whether incremented or not)
+    this.redis.defineCommand("recordFailureIdempotent", {
+      numberOfKeys: 3,
+      lua: `
+local processedItemsKey = KEYS[1]
+local failuresKey = KEYS[2]
+local processedKey = KEYS[3]
+local itemKey = ARGV[1]
+local failureJson = ARGV[2]
+
+-- Check if already processed (SADD returns 0 if member already exists)
+local added = redis.call('SADD', processedItemsKey, itemKey)
+
+if added == 1 then
+  -- New item, record the failure
+  redis.call('RPUSH', failuresKey, failureJson)
+  redis.call('INCR', processedKey)
+end
+
+-- Return current count
+local count = redis.call('GET', processedKey)
+return count or '0'
+      `,
+    });
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    recordSuccessIdempotent(
+      processedItemsKey: string,
+      runsKey: string,
+      processedKey: string,
+      itemKey: string,
+      runId: string,
+      itemScore: string
+    ): Promise<string>;
+
+    recordFailureIdempotent(
+      processedItemsKey: string,
+      failuresKey: string,
+      processedKey: string,
+      itemKey: string,
+      failureJson: string
+    ): Promise<string>;
+  }
+}
diff --git a/internal-packages/run-engine/src/batch-queue/index.ts b/internal-packages/run-engine/src/batch-queue/index.ts
new file mode 100644
index 00000000000..6ceac2ac6b1
--- /dev/null
+++ b/internal-packages/run-engine/src/batch-queue/index.ts
@@ -0,0 +1,997 @@
+import { createRedisClient, type Redis } from "@internal/redis";
+import {
+  startSpan,
+  type Counter,
+  type Histogram,
+  type Meter,
+  type ObservableGauge,
+  type Span,
+  type Tracer,
+} from "@internal/tracing";
+import { Logger } from "@trigger.dev/core/logger";
+import {
+  BatchedSpanManager,
+  CallbackFairQueueKeyProducer,
+  DRRScheduler,
+  FairQueue,
+  isAbortError,
+  WorkerQueueManager,
+  type FairQueueOptions,
+} from "@trigger.dev/redis-worker";
+import { BatchCompletionTracker } from "./completionTracker.js";
+import type {
+  BatchCompletionCallback,
+  BatchItem,
+  BatchItemPayload,
+  BatchMeta,
+  BatchQueueOptions,
+  CompleteBatchResult,
+  InitializeBatchOptions,
+  ProcessBatchItemCallback,
+} from "./types.js";
+import { BatchItemPayload as BatchItemPayloadSchema } from "./types.js";
+
+export { BatchCompletionTracker } from "./completionTracker.js";
+export type { BatchQueueOptions, CompleteBatchResult, InitializeBatchOptions } from "./types.js";
+
+/**
+ * BatchQueue manages batch trigger processing with fair scheduling using
+ * Deficit Round Robin (DRR) algorithm.
+ *
+ * This implementation uses FairQueue from @trigger.dev/redis-worker internally
+ * for message queueing and fair scheduling. Batch completion tracking is handled
+ * separately via BatchCompletionTracker.
+ *
+ * Key features:
+ * - Fair processing across environments via DRR
+ * - Atomic operations using Lua scripts
+ * - Graceful error handling with per-item failure tracking
+ * - Each batch becomes a FairQueue "queue" (queueId = batchId, tenantId = envId)
+ * - OpenTelemetry metrics for observability
+ */
+// Redis key for environment concurrency limits
+const ENV_CONCURRENCY_KEY_PREFIX = "batch:env_concurrency";
+
+// Single worker queue ID for all batch items
+// BatchQueue uses a single shared worker queue - FairQueue handles fair scheduling,
+// then all messages are routed to this queue for BatchQueue's own consumer loop.
+const BATCH_WORKER_QUEUE_ID = "batch-worker-queue";
+
+export class BatchQueue {
+  private fairQueue: FairQueue<typeof BatchItemPayloadSchema>;
+  private workerQueueManager: WorkerQueueManager;
+  private completionTracker: BatchCompletionTracker;
+  private logger: Logger;
+  private tracer?: Tracer;
+  private concurrencyRedis: Redis;
+  private defaultConcurrency: number;
+
+  private processItemCallback?: ProcessBatchItemCallback;
+  private completionCallback?: BatchCompletionCallback;
+
+  // Consumer loop state
+  private isRunning = false;
+  private abortController: AbortController;
+  private workerQueueConsumerLoops: Promise<void>[] = [];
+  private workerQueueBlockingTimeoutSeconds: number;
+  private batchedSpanManager: BatchedSpanManager;
+
+  // Metrics
+  private batchesEnqueuedCounter?: Counter;
+  private itemsEnqueuedCounter?: Counter;
+  private itemsProcessedCounter?: Counter;
+  private itemsFailedCounter?: Counter;
+  private batchCompletedCounter?: Counter;
+  private batchProcessingDurationHistogram?: Histogram;
+  private itemQueueTimeHistogram?: Histogram;
+  private workerQueueLengthGauge?: ObservableGauge;
+
+  constructor(private options: BatchQueueOptions) {
+    this.logger = options.logger ?? new Logger("BatchQueue", options.logLevel ?? "info");
+    this.tracer = options.tracer;
+    this.defaultConcurrency = options.defaultConcurrency ?? 10;
+    this.abortController = new AbortController();
+    this.workerQueueBlockingTimeoutSeconds = options.workerQueueBlockingTimeoutSeconds ?? 10;
+
+    // Initialize metrics if meter is provided
+    if (options.meter) {
+      this.#initializeMetrics(options.meter);
+    }
+
+    // Create key producer that extracts envId as tenantId from batchId
+    // Queue IDs are formatted as: env:{envId}:batch:{batchId}
+    const keyProducer = new CallbackFairQueueKeyProducer({
+      prefix: "batch",
+      extractTenantId: (queueId: string) => {
+        // Format: env:{envId}:batch:{batchId}
+        const parts = queueId.split(":");
+        if (parts.length >= 2 && parts[0] === "env" && parts[1]) {
+          return parts[1];
+        }
+        return queueId;
+      },
+      extractGroupId: (groupName: string, queueId: string) => {
+        const parts = queueId.split(":");
+        // Extract envId for the "tenant" concurrency group
+        if (groupName === "tenant" && parts.length >= 2 && parts[0] === "env" && parts[1]) {
+          return parts[1];
+        }
+        return "";
+      },
+    });
+
+    // Create a separate Redis client for concurrency lookups
+    this.concurrencyRedis = createRedisClient(options.redis);
+
+    const scheduler = new DRRScheduler({
+      redis: options.redis,
+      keys: keyProducer,
+      quantum: options.drr.quantum,
+      maxDeficit: options.drr.maxDeficit,
+      masterQueueLimit: options.drr.masterQueueLimit,
+      logger: {
+        debug: (msg, ctx) => this.logger.debug(msg, ctx),
+        error: (msg, ctx) => this.logger.error(msg, ctx),
+      },
+    });
+
+    // Create FairQueue with telemetry and environment-based concurrency limiting
+    // FairQueue handles fair scheduling and routes messages to the batch worker queue
+    // BatchQueue runs its own consumer loop to process messages from the worker queue
+    const fairQueueOptions: FairQueueOptions<typeof BatchItemPayloadSchema> = {
+      redis: options.redis,
+      keys: keyProducer,
+      scheduler,
+      payloadSchema: BatchItemPayloadSchema,
+      validateOnEnqueue: false, // We control the payload
+      shardCount: options.shardCount ?? 1,
+      consumerCount: options.consumerCount,
+      consumerIntervalMs: options.consumerIntervalMs,
+      visibilityTimeoutMs: 60_000, // 1 minute for batch item processing
+      startConsumers: false, // We control when to start
+      cooloff: {
+        enabled: true,
+        threshold: 5,
+        periodMs: 5_000,
+      },
+      // Worker queue configuration - FairQueue routes all messages to our single worker queue
+      workerQueue: {
+        // All batch items go to the same worker queue - BatchQueue handles consumption
+        resolveWorkerQueue: () => BATCH_WORKER_QUEUE_ID,
+      },
+      // Concurrency group based on tenant (environment)
+      // This limits how many batch items can be processed concurrently per environment
+      // Items wait in queue until capacity frees up
+      // Note: Must use "tenant" as the group name - this is what FairQueue expects
+      concurrencyGroups: [
+        {
+          name: "tenant",
+          extractGroupId: (queue) => queue.tenantId, // tenantId = envId
+          defaultLimit: this.defaultConcurrency,
+          getLimit: async (envId: string) => {
+            return this.getEnvConcurrency(envId);
+          },
+        },
+      ],
+      // Optional global rate limiter to limit max items/sec across all consumers
+      globalRateLimiter: options.globalRateLimiter,
+      // No retry for batch items - failures are recorded and batch completes
+      // Omit retry config entirely to disable retry and DLQ
+      logger: this.logger,
+      tracer: options.tracer,
+      meter: options.meter,
+      name: "batch-queue",
+    };
+
+    this.fairQueue = new FairQueue(fairQueueOptions);
+
+    // Create worker queue manager for consuming from the batch worker queue
+    this.workerQueueManager = new WorkerQueueManager({
+      redis: options.redis,
+      keys: keyProducer,
+      logger: {
+        debug: (msg, ctx) => this.logger.debug(msg, ctx),
+        error: (msg, ctx) => this.logger.error(msg, ctx),
+      },
+    });
+
+    // Initialize batched span manager for worker queue consumer tracing
+    this.batchedSpanManager = new BatchedSpanManager({
+      tracer: options.tracer,
+      name: "batch-queue-worker",
+      maxIterations: options.consumerTraceMaxIterations ?? 1000,
+      timeoutSeconds: options.consumerTraceTimeoutSeconds ?? 60,
+    });
+
+    // Create completion tracker
+    this.completionTracker = new BatchCompletionTracker({
+      redis: options.redis,
+      logger: {
+        debug: (msg, ctx) => this.logger.debug(msg, ctx),
+        info: (msg, ctx) => this.logger.info(msg, ctx),
+        error: (msg, ctx) => this.logger.error(msg, ctx),
+      },
+    });
+
+    // Register telemetry gauge callbacks for observable metrics
+    // Note: observedTenants is not provided since tenant list is dynamic
+    this.fairQueue.registerTelemetryGauges();
+
+    if (options.startConsumers !== false) {
+      this.start();
+    }
+  }
+
+  // ============================================================================
+  // Public API - Callbacks
+  // ============================================================================
+
+  /**
+   * Set the callback for processing batch items.
+   * This is called for each item dequeued from the batch queue.
+   */
+  onProcessItem(callback: ProcessBatchItemCallback): void {
+    this.processItemCallback = callback;
+  }
+
+  /**
+   * Set the callback for batch completion.
+   * This is called when all items in a batch have been processed.
+   */
+  onBatchComplete(callback: BatchCompletionCallback): void {
+    this.completionCallback = callback;
+  }
+
+  // ============================================================================
+  // Public API - Enqueueing (2-Phase API)
+  // ============================================================================
+
+  /**
+   * Initialize a batch for 2-phase processing (Phase 1).
+   *
+   * This stores batch metadata in the completion tracker WITHOUT enqueueing
+   * any items. Items are streamed separately via enqueueBatchItem().
+   *
+   * Use this for the v3 streaming batch API where items are sent via NDJSON stream.
+   */
+  async initializeBatch(options: InitializeBatchOptions): Promise<void> {
+    const now = Date.now();
+
+    // Prepare batch metadata
+    const meta: BatchMeta = {
+      batchId: options.batchId,
+      friendlyId: options.friendlyId,
+      environmentId: options.environmentId,
+      environmentType: options.environmentType,
+      organizationId: options.organizationId,
+      projectId: options.projectId,
+      runCount: options.runCount,
+      createdAt: now,
+      parentRunId: options.parentRunId,
+      resumeParentOnCompletion: options.resumeParentOnCompletion,
+      triggerVersion: options.triggerVersion,
+      traceContext: options.traceContext,
+      spanParentAsLink: options.spanParentAsLink,
+      realtimeStreamsVersion: options.realtimeStreamsVersion,
+      idempotencyKey: options.idempotencyKey,
+      processingConcurrency: options.processingConcurrency,
+    };
+
+    // Store metadata in completion tracker
+    await this.completionTracker.storeMeta(options.batchId, meta);
+
+    // Store per-environment concurrency limit if provided
+    // This is used by the ConcurrencyManager to limit concurrent processing
+    if (options.processingConcurrency !== undefined) {
+      await this.storeEnvConcurrency(options.environmentId, options.processingConcurrency);
+    }
+
+    // Record metric
+    this.batchesEnqueuedCounter?.add(1, {
+      environment_type: options.environmentType,
+      streaming: true,
+    });
+
+    this.logger.debug("Batch initialized for streaming", {
+      batchId: options.batchId,
+      friendlyId: options.friendlyId,
+      envId: options.environmentId,
+      runCount: options.runCount,
+      processingConcurrency: options.processingConcurrency,
+    });
+  }
+
+  /**
+   * Enqueue a single item to an existing batch (Phase 2).
+   *
+   * This is used for streaming batch item ingestion in the v3 API.
+   * Returns whether the item was enqueued (true) or deduplicated (false).
+   *
+   * @param batchId - The batch ID (internal format)
+   * @param envId - The environment ID (needed for queue routing)
+   * @param itemIndex - Zero-based index of this item
+   * @param item - The batch item to enqueue
+   * @returns Object with enqueued status
+   */
+  async enqueueBatchItem(
+    batchId: string,
+    envId: string,
+    itemIndex: number,
+    item: BatchItem
+  ): Promise<{ enqueued: boolean }> {
+    // Get batch metadata to verify it exists and get friendlyId
+    const meta = await this.completionTracker.getMeta(batchId);
+    if (!meta) {
+      throw new Error(`Batch ${batchId} not found or not initialized`);
+    }
+
+    // Atomically check and mark as enqueued for idempotency
+    const isNewItem = await this.completionTracker.markItemEnqueued(batchId, itemIndex);
+    if (!isNewItem) {
+      // Item was already enqueued, deduplicate
+      this.logger.debug("Batch item deduplicated", { batchId, itemIndex });
+      return { enqueued: false };
+    }
+
+    // Create queue ID in format: env:{envId}:batch:{batchId}
+    const queueId = this.#makeQueueId(envId, batchId);
+
+    // Build message payload
+    const payload: BatchItemPayload = {
+      batchId,
+      friendlyId: meta.friendlyId,
+      itemIndex,
+      item,
+    };
+
+    // Enqueue single message
+    await this.fairQueue.enqueue({
+      queueId,
+      tenantId: envId,
+      payload,
+      timestamp: meta.createdAt + itemIndex, // Preserve ordering by index
+      metadata: {
+        batchId,
+        friendlyId: meta.friendlyId,
+        envId,
+      },
+    });
+
+    // Record metric
+    this.itemsEnqueuedCounter?.add(1, { environment_type: meta.environmentType });
+
+    this.logger.debug("Batch item enqueued", {
+      batchId,
+      itemIndex,
+      task: item.task,
+    });
+
+    return { enqueued: true };
+  }
+
+  /**
+   * Get the count of items that have been enqueued for a batch.
+   * Useful for progress tracking during streaming ingestion.
+   */
+  async getEnqueuedCount(batchId: string): Promise<number> {
+    return this.completionTracker.getEnqueuedCount(batchId);
+  }
+
+  // ============================================================================
+  // Public API - Query
+  // ============================================================================
+
+  /**
+   * Get batch metadata.
+   */
+  async getBatchMeta(batchId: string): Promise<BatchMeta | null> {
+    return this.completionTracker.getMeta(batchId);
+  }
+
+  /**
+   * Get the number of remaining items in a batch.
+   */
+  async getBatchRemainingCount(batchId: string): Promise<number> {
+    const meta = await this.completionTracker.getMeta(batchId);
+    if (!meta) return 0;
+
+    const processedCount = await this.completionTracker.getProcessedCount(batchId);
+    return Math.max(0, meta.runCount - processedCount);
+  }
+
+  /**
+   * Get the successful runs for a batch.
+   */
+  async getBatchRuns(batchId: string): Promise<string[]> {
+    return this.completionTracker.getSuccessfulRuns(batchId);
+  }
+
+  /**
+   * Get the failures for a batch.
+   */
+  async getBatchFailures(batchId: string): Promise<CompleteBatchResult["failures"]> {
+    return this.completionTracker.getFailures(batchId);
+  }
+
+  /**
+   * Get the live processed count for a batch from Redis.
+   * This is useful for displaying real-time progress in the UI.
+   */
+  async getBatchProcessedCount(batchId: string): Promise<number> {
+    return this.completionTracker.getProcessedCount(batchId);
+  }
+
+  /**
+   * Get the live progress for a batch from Redis.
+   * Returns success count, failure count, and processed count.
+   * This is useful for displaying real-time progress in the UI.
+   */
+  async getBatchProgress(batchId: string): Promise<{
+    successCount: number;
+    failureCount: number;
+    processedCount: number;
+  }> {
+    const [successfulRuns, failures, processedCount] = await Promise.all([
+      this.completionTracker.getSuccessfulRuns(batchId),
+      this.completionTracker.getFailures(batchId),
+      this.completionTracker.getProcessedCount(batchId),
+    ]);
+
+    return {
+      successCount: successfulRuns.length,
+      failureCount: failures.length,
+      processedCount,
+    };
+  }
+
+  // ============================================================================
+  // Public API - Lifecycle
+  // ============================================================================
+
+  /**
+   * Start the consumer loops.
+   * FairQueue runs the master queue consumer loop (claim and push to worker queue).
+   * BatchQueue runs its own worker queue consumer loops to process messages.
+   */
+  start(): void {
+    if (this.isRunning) {
+      return;
+    }
+
+    this.isRunning = true;
+    this.abortController = new AbortController();
+
+    // Start FairQueue's master queue consumers (routes messages to worker queue)
+    this.fairQueue.start();
+
+    // Start worker queue consumer loops
+    for (let consumerId = 0; consumerId < this.options.consumerCount; consumerId++) {
+      const loop = this.#runWorkerQueueConsumerLoop(consumerId);
+      this.workerQueueConsumerLoops.push(loop);
+    }
+
+    this.logger.info("BatchQueue consumers started", {
+      consumerCount: this.options.consumerCount,
+      intervalMs: this.options.consumerIntervalMs,
+      drrQuantum: this.options.drr.quantum,
+      workerQueueId: BATCH_WORKER_QUEUE_ID,
+    });
+  }
+
+  /**
+   * Stop the consumer loops gracefully.
+   */
+  async stop(): Promise<void> {
+    if (!this.isRunning) {
+      return;
+    }
+
+    this.isRunning = false;
+    this.abortController.abort();
+
+    // Stop FairQueue's master queue consumers
+    await this.fairQueue.stop();
+
+    // Wait for worker queue consumer loops to finish
+    await Promise.allSettled(this.workerQueueConsumerLoops);
+    this.workerQueueConsumerLoops = [];
+
+    this.logger.info("BatchQueue consumers stopped");
+  }
+
+  /**
+   * Close the BatchQueue and all Redis connections.
+   */
+  async close(): Promise<void> {
+    await this.stop();
+
+    // Clean up any remaining batched spans (safety net for spans not cleaned up by consumer loops)
+    this.batchedSpanManager.cleanupAll();
+
+    await this.fairQueue.close();
+    await this.workerQueueManager.close();
+    await this.completionTracker.close();
+    await this.concurrencyRedis.quit();
+  }
+
+  // ============================================================================
+  // Private - Environment Concurrency Management
+  // ============================================================================
+
+  /**
+   * Store the concurrency limit for an environment.
+   * This is called when a batch is initialized with a specific concurrency limit.
+   * The limit expires after 24 hours to prevent stale data.
+   */
+  private async storeEnvConcurrency(envId: string, concurrency: number): Promise<void> {
+    const key = `${ENV_CONCURRENCY_KEY_PREFIX}:${envId}`;
+    // Set with 24 hour expiry - batches should complete well before this
+    await this.concurrencyRedis.set(key, concurrency.toString(), "EX", 86400);
+
+    this.logger.debug("Stored environment concurrency limit", { envId, concurrency });
+  }
+
+  /**
+   * Get the concurrency limit for an environment.
+   * Returns the stored limit or the default if not set.
+   */
+  private async getEnvConcurrency(envId: string): Promise<number> {
+    const key = `${ENV_CONCURRENCY_KEY_PREFIX}:${envId}`;
+    const stored = await this.concurrencyRedis.get(key);
+
+    if (stored) {
+      const limit = parseInt(stored, 10);
+      if (!isNaN(limit) && limit > 0) {
+        return limit;
+      }
+    }
+
+    return this.defaultConcurrency;
+  }
+
+  // ============================================================================
+  // Private - Metrics Initialization
+  // ============================================================================
+
+  #initializeMetrics(meter: Meter): void {
+    this.batchesEnqueuedCounter = meter.createCounter("batch_queue.batches_enqueued", {
+      description: "Number of batches enqueued",
+      unit: "batches",
+    });
+
+    this.itemsProcessedCounter = meter.createCounter("batch_queue.items_processed", {
+      description: "Number of batch items successfully processed",
+      unit: "items",
+    });
+
+    this.itemsFailedCounter = meter.createCounter("batch_queue.items_failed", {
+      description: "Number of batch items that failed processing",
+      unit: "items",
+    });
+
+    this.batchCompletedCounter = meter.createCounter("batch_queue.batches_completed", {
+      description: "Number of batches completed",
+      unit: "batches",
+    });
+
+    this.batchProcessingDurationHistogram = meter.createHistogram(
+      "batch_queue.batch_processing_duration",
+      {
+        description: "Duration from batch creation to completion",
+        unit: "ms",
+      }
+    );
+
+    this.itemsEnqueuedCounter = meter.createCounter("batch_queue.items_enqueued", {
+      description: "Number of batch items enqueued",
+      unit: "items",
+    });
+
+    this.itemQueueTimeHistogram = meter.createHistogram("batch_queue.item_queue_time", {
+      description: "Time from item enqueue to processing start",
+      unit: "ms",
+    });
+
+    this.workerQueueLengthGauge = meter.createObservableGauge("batch_queue.worker_queue.length", {
+      description: "Number of items waiting in the batch worker queue",
+      unit: "items",
+    });
+
+    this.workerQueueLengthGauge.addCallback(async (observableResult) => {
+      const length = await this.workerQueueManager.getLength(BATCH_WORKER_QUEUE_ID);
+      observableResult.observe(length);
+    });
+  }
+
+  // ============================================================================
+  // Private - Worker Queue Consumer Loop
+  // ============================================================================
+
+  /**
+   * Run a worker queue consumer loop.
+   * This pops messages from the batch worker queue and processes them.
+   */
+  async #runWorkerQueueConsumerLoop(consumerId: number): Promise<void> {
+    const loopId = `batch-worker-${consumerId}`;
+
+    // Initialize batched span tracking for this loop
+    this.batchedSpanManager.initializeLoop(loopId);
+
+    try {
+      while (this.isRunning) {
+        if (!this.processItemCallback) {
+          await new Promise((resolve) => setTimeout(resolve, 100));
+          continue;
+        }
+
+        try {
+          await this.batchedSpanManager.withBatchedSpan(
+            loopId,
+            async (span) => {
+              span.setAttribute("consumer_id", consumerId);
+
+              // Blocking pop from worker queue
+              const messageKey = await this.workerQueueManager.blockingPop(
+                BATCH_WORKER_QUEUE_ID,
+                this.workerQueueBlockingTimeoutSeconds,
+                this.abortController.signal
+              );
+
+              if (!messageKey) {
+                this.batchedSpanManager.incrementStat(loopId, "empty_iterations");
+                return false; // Timeout, no work
+              }
+
+              // Parse message key (format: "messageId:queueId")
+              const colonIndex = messageKey.indexOf(":");
+              if (colonIndex === -1) {
+                this.logger.error("Invalid message key format", { messageKey });
+                this.batchedSpanManager.incrementStat(loopId, "invalid_message_keys");
+                return false;
+              }
+
+              const messageId = messageKey.substring(0, colonIndex);
+              const queueId = messageKey.substring(colonIndex + 1);
+
+              await this.#handleMessage(loopId, messageId, queueId);
+              this.batchedSpanManager.incrementStat(loopId, "messages_processed");
+              return true; // Had work
+            },
+            {
+              iterationSpanName: "processWorkerQueueMessage",
+              attributes: { consumer_id: consumerId },
+            }
+          );
+        } catch (error) {
+          if (this.abortController.signal.aborted) {
+            break;
+          }
+          this.logger.error("Worker queue consumer error", {
+            loopId,
+            error: error instanceof Error ? error.message : String(error),
+          });
+          this.batchedSpanManager.markForRotation(loopId);
+        }
+      }
+    } catch (error) {
+      if (isAbortError(error)) {
+        this.logger.debug("Worker queue consumer aborted", { loopId });
+        this.batchedSpanManager.cleanup(loopId);
+        return;
+      }
+      throw error;
+    } finally {
+      this.batchedSpanManager.cleanup(loopId);
+    }
+  }
+
+  // ============================================================================
+  // Private - Message Handling
+  // ============================================================================
+
+  async #handleMessage(consumerId: string, messageId: string, queueId: string): Promise<void> {
+    // Get message data from FairQueue's in-flight storage
+    const storedMessage = await this.fairQueue.getMessageData(messageId, queueId);
+
+    if (!storedMessage) {
+      this.logger.error("Message not found in in-flight data", { messageId, queueId });
+      await this.fairQueue.completeMessage(messageId, queueId);
+      return;
+    }
+
+    const { batchId, friendlyId, itemIndex, item } = storedMessage.payload;
+
+    return this.#startSpan("BatchQueue.handleMessage", async (span) => {
+      span?.setAttributes({
+        "batch.id": batchId,
+        "batch.friendlyId": friendlyId,
+        "batch.itemIndex": itemIndex,
+        "batch.task": item.task,
+        "batch.consumerId": consumerId,
+        "batch.attempt": storedMessage.attempt,
+      });
+
+      // Calculate queue time (time from enqueue to processing)
+      const queueTimeMs = Date.now() - storedMessage.timestamp;
+      span?.setAttribute("batch.queueTimeMs", queueTimeMs);
+
+      this.logger.debug("Processing batch item", {
+        batchId,
+        friendlyId,
+        itemIndex,
+        task: item.task,
+        consumerId,
+        attempt: storedMessage.attempt,
+        queueTimeMs,
+      });
+
+      if (!this.processItemCallback) {
+        this.logger.error("No process item callback set", { batchId, itemIndex });
+        // Still complete the message to avoid blocking
+        await this.fairQueue.completeMessage(messageId, queueId);
+        return;
+      }
+
+      // Get batch metadata
+      const meta = await this.#startSpan("BatchQueue.getMeta", async () => {
+        return this.completionTracker.getMeta(batchId);
+      });
+
+      if (!meta) {
+        this.logger.error("Batch metadata not found", { batchId, itemIndex });
+        await this.fairQueue.completeMessage(messageId, queueId);
+        return;
+      }
+
+      // Record queue time metric (requires meta for environment_type)
+      this.itemQueueTimeHistogram?.record(queueTimeMs, { environment_type: meta.environmentType });
+
+      span?.setAttributes({
+        "batch.runCount": meta.runCount,
+        "batch.environmentId": meta.environmentId,
+      });
+
+      let processedCount: number;
+
+      try {
+        const result = await this.#startSpan(
+          "BatchQueue.processItemCallback",
+          async (innerSpan) => {
+            innerSpan?.setAttributes({
+              "batch.id": batchId,
+              "batch.itemIndex": itemIndex,
+              "batch.task": item.task,
+            });
+            return this.processItemCallback!({
+              batchId,
+              friendlyId,
+              itemIndex,
+              item,
+              meta,
+            });
+          }
+        );
+
+        if (result.success) {
+          span?.setAttribute("batch.result", "success");
+          span?.setAttribute("batch.runId", result.runId);
+
+          // Pass itemIndex for idempotency - prevents double-counting on redelivery
+          processedCount = await this.#startSpan("BatchQueue.recordSuccess", async () => {
+            return this.completionTracker.recordSuccess(batchId, result.runId, itemIndex);
+          });
+
+          this.itemsProcessedCounter?.add(1, { environment_type: meta.environmentType });
+          this.logger.debug("Batch item processed successfully", {
+            batchId,
+            itemIndex,
+            runId: result.runId,
+            processedCount,
+            expectedCount: meta.runCount,
+          });
+        } else {
+          span?.setAttribute("batch.result", "failure");
+          span?.setAttribute("batch.error", result.error);
+          if (result.errorCode) {
+            span?.setAttribute("batch.errorCode", result.errorCode);
+          }
+
+          // For offloaded payloads (payloadType: "application/store"), payload is already an R2 path
+          // For inline payloads, store the full payload - it's under the offload threshold anyway
+          const payloadStr = await this.#startSpan(
+            "BatchQueue.serializePayload",
+            async (innerSpan) => {
+              const str =
+                typeof item.payload === "string" ? item.payload : JSON.stringify(item.payload);
+              innerSpan?.setAttribute("batch.payloadSize", str.length);
+              return str;
+            }
+          );
+
+          processedCount = await this.#startSpan("BatchQueue.recordFailure", async () => {
+            return this.completionTracker.recordFailure(batchId, {
+              index: itemIndex,
+              taskIdentifier: item.task,
+              payload: payloadStr,
+              options: item.options,
+              error: result.error,
+              errorCode: result.errorCode,
+            });
+          });
+
+          this.itemsFailedCounter?.add(1, {
+            environment_type: meta.environmentType,
+            errorCode: result.errorCode,
+          });
+
+          this.logger.error("Batch item processing failed", {
+            batchId,
+            itemIndex,
+            error: result.error,
+            processedCount,
+            expectedCount: meta.runCount,
+          });
+        }
+      } catch (error) {
+        span?.setAttribute("batch.result", "unexpected_error");
+        span?.setAttribute("batch.error", error instanceof Error ? error.message : String(error));
+
+        // Unexpected error during processing
+        // For offloaded payloads, payload is an R2 path; for inline payloads, store full payload
+        const payloadStr = await this.#startSpan(
+          "BatchQueue.serializePayload",
+          async (innerSpan) => {
+            const str =
+              typeof item.payload === "string" ? item.payload : JSON.stringify(item.payload);
+            innerSpan?.setAttribute("batch.payloadSize", str.length);
+            return str;
+          }
+        );
+
+        processedCount = await this.#startSpan("BatchQueue.recordFailure", async () => {
+          return this.completionTracker.recordFailure(batchId, {
+            index: itemIndex,
+            taskIdentifier: item.task,
+            payload: payloadStr,
+            options: item.options,
+            error: error instanceof Error ? error.message : String(error),
+            errorCode: "UNEXPECTED_ERROR",
+          });
+        });
+
+        this.itemsFailedCounter?.add(1, {
+          environment_type: meta.environmentType,
+          errorCode: "UNEXPECTED_ERROR",
+        });
+        this.logger.error("Unexpected error processing batch item", {
+          batchId,
+          itemIndex,
+          error: error instanceof Error ? error.message : String(error),
+          processedCount,
+          expectedCount: meta.runCount,
+        });
+      }
+
+      span?.setAttribute("batch.processedCount", processedCount);
+
+      // Complete the FairQueue message (no retry for batch items)
+      // This must happen after recording success/failure to ensure the counter
+      // is updated before the message is considered done
+      await this.#startSpan("BatchQueue.completeMessage", async () => {
+        return this.fairQueue.completeMessage(messageId, queueId);
+      });
+
+      // Check if all items have been processed using atomic counter
+      // This is safe even with multiple concurrent consumers because
+      // the processedCount is atomically incremented and we only trigger
+      // finalization when we see the exact final count
+      if (processedCount === meta.runCount) {
+        this.logger.debug("All items processed, finalizing batch", {
+          batchId,
+          processedCount,
+          expectedCount: meta.runCount,
+        });
+        await this.#finalizeBatch(batchId, meta);
+      }
+    });
+  }
+
+  /**
+   * Finalize a completed batch: gather results and call completion callback.
+   */
+  async #finalizeBatch(batchId: string, meta: BatchMeta): Promise<void> {
+    return this.#startSpan("BatchQueue.finalizeBatch", async (span) => {
+      span?.setAttributes({
+        "batch.id": batchId,
+        "batch.friendlyId": meta.friendlyId,
+        "batch.runCount": meta.runCount,
+        "batch.environmentId": meta.environmentId,
+      });
+
+      const result = await this.#startSpan("BatchQueue.getCompletionResult", async (innerSpan) => {
+        const completionResult = await this.completionTracker.getCompletionResult(batchId);
+        innerSpan?.setAttributes({
+          "batch.successfulRunCount": completionResult.successfulRunCount,
+          "batch.failedRunCount": completionResult.failedRunCount,
+          "batch.runIdsCount": completionResult.runIds.length,
+          "batch.failuresCount": completionResult.failures.length,
+        });
+        return completionResult;
+      });
+
+      span?.setAttributes({
+        "batch.successfulRunCount": result.successfulRunCount,
+        "batch.failedRunCount": result.failedRunCount,
+      });
+
+      // Record metrics
+      this.batchCompletedCounter?.add(1, {
+        environment_type: meta.environmentType,
+        hasFailures: result.failedRunCount > 0,
+      });
+
+      const processingDuration = Date.now() - meta.createdAt;
+      this.batchProcessingDurationHistogram?.record(processingDuration, {
+        environment_type: meta.environmentType,
+      });
+
+      span?.setAttribute("batch.processingDurationMs", processingDuration);
+
+      this.logger.info("Batch completed", {
+        batchId,
+        friendlyId: meta.friendlyId,
+        successfulRunCount: result.successfulRunCount,
+        failedRunCount: result.failedRunCount,
+        processingDurationMs: processingDuration,
+      });
+
+      if (this.completionCallback) {
+        try {
+          await this.#startSpan("BatchQueue.completionCallback", async () => {
+            return this.completionCallback!(result);
+          });
+
+          // Only cleanup if callback succeeded - preserves Redis data for retry on failure
+          await this.#startSpan("BatchQueue.cleanup", async () => {
+            return this.completionTracker.cleanup(batchId);
+          });
+        } catch (error) {
+          this.logger.error("Error in batch completion callback", {
+            batchId,
+            error: error instanceof Error ? error.message : String(error),
+          });
+          // Re-throw to preserve Redis data and signal failure to callers
+          throw error;
+        }
+      } else {
+        // No callback, safe to cleanup
+        await this.#startSpan("BatchQueue.cleanup", async () => {
+          return this.completionTracker.cleanup(batchId);
+        });
+      }
+    });
+  }
+
+  // ============================================================================
+  // Private - Helpers
+  // ============================================================================
+
+  /**
+   * Create a queue ID from environment ID and batch ID.
+   * Format: env:{envId}:batch:{batchId}
+   */
+  #makeQueueId(envId: string, batchId: string): string {
+    return `env:${envId}:batch:${batchId}`;
+  }
+
+  /**
+   * Helper to start a span if tracer is available.
+   * If no tracer is configured, just executes the callback directly.
+   */
+  async #startSpan<T>(name: string, fn: (span: Span | undefined) => Promise<T>): Promise<T> {
+    if (!this.tracer) {
+      return fn(undefined);
+    }
+    return startSpan(this.tracer, name, fn);
+  }
+}
diff --git a/internal-packages/run-engine/src/batch-queue/tests/index.test.ts b/internal-packages/run-engine/src/batch-queue/tests/index.test.ts
new file mode 100644
index 00000000000..98c7b0401f6
--- /dev/null
+++ b/internal-packages/run-engine/src/batch-queue/tests/index.test.ts
@@ -0,0 +1,661 @@
+import { redisTest } from "@internal/testcontainers";
+import { describe, expect, vi } from "vitest";
+import { BatchQueue } from "../index.js";
+import type { CompleteBatchResult, InitializeBatchOptions, BatchItem } from "../types.js";
+
+vi.setConfig({ testTimeout: 60_000 });
+
+describe("BatchQueue", () => {
+  function createBatchQueue(
+    redisContainer: { getHost: () => string; getPort: () => number },
+    options?: { startConsumers?: boolean }
+  ) {
+    return new BatchQueue({
+      redis: {
+        host: redisContainer.getHost(),
+        port: redisContainer.getPort(),
+        keyPrefix: "test:",
+      },
+      drr: {
+        quantum: 5,
+        maxDeficit: 50,
+      },
+      consumerCount: 1,
+      consumerIntervalMs: 50,
+      startConsumers: options?.startConsumers ?? false, // Don't start by default in tests
+    });
+  }
+
+  function createInitOptions(
+    batchId: string,
+    envId: string,
+    runCount: number
+  ): InitializeBatchOptions {
+    return {
+      batchId,
+      friendlyId: `friendly_${batchId}`,
+      environmentId: envId,
+      environmentType: "DEVELOPMENT",
+      organizationId: "org123",
+      projectId: "proj123",
+      runCount,
+    };
+  }
+
+  function createBatchItems(count: number): BatchItem[] {
+    return Array.from({ length: count }, (_, i) => ({
+      task: `task-${i}`,
+      payload: JSON.stringify({ index: i }),
+      payloadType: "application/json",
+      options: { tags: [`tag-${i}`] },
+    }));
+  }
+
+  async function enqueueItems(
+    queue: BatchQueue,
+    batchId: string,
+    envId: string,
+    items: BatchItem[]
+  ): Promise<void> {
+    for (let i = 0; i < items.length; i++) {
+      await queue.enqueueBatchItem(batchId, envId, i, items[i]);
+    }
+  }
+
+  describe("initializeBatch + enqueueBatchItem (2-phase API)", () => {
+    redisTest("should initialize a batch successfully", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer);
+      try {
+        const options = createInitOptions("batch1", "env1", 5);
+        await queue.initializeBatch(options);
+
+        // Verify batch metadata was stored
+        const meta = await queue.getBatchMeta("batch1");
+        expect(meta).not.toBeNull();
+        expect(meta?.batchId).toBe("batch1");
+        expect(meta?.environmentId).toBe("env1");
+        expect(meta?.runCount).toBe(5);
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest("should enqueue items and track remaining count", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer);
+      try {
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 10));
+        const items = createBatchItems(10);
+        await enqueueItems(queue, "batch1", "env1", items);
+
+        const count = await queue.getBatchRemainingCount("batch1");
+        expect(count).toBe(10);
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest("should enqueue multiple batches", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer);
+      try {
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 5));
+        await queue.initializeBatch(createInitOptions("batch2", "env1", 3));
+        await queue.initializeBatch(createInitOptions("batch3", "env2", 7));
+
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(5));
+        await enqueueItems(queue, "batch2", "env1", createBatchItems(3));
+        await enqueueItems(queue, "batch3", "env2", createBatchItems(7));
+
+        expect(await queue.getBatchRemainingCount("batch1")).toBe(5);
+        expect(await queue.getBatchRemainingCount("batch2")).toBe(3);
+        expect(await queue.getBatchRemainingCount("batch3")).toBe(7);
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest("should store batch metadata correctly", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer);
+      try {
+        const options: InitializeBatchOptions = {
+          batchId: "batch1",
+          friendlyId: "batch_abc123",
+          environmentId: "env1",
+          environmentType: "PRODUCTION",
+          organizationId: "org456",
+          projectId: "proj789",
+          runCount: 1,
+          parentRunId: "run_parent",
+          resumeParentOnCompletion: true,
+          triggerVersion: "1.0.0",
+          spanParentAsLink: true,
+          idempotencyKey: "idem123",
+        };
+
+        await queue.initializeBatch(options);
+        await queue.enqueueBatchItem("batch1", "env1", 0, {
+          task: "my-task",
+          payload: '{"data": true}',
+        });
+
+        const meta = await queue.getBatchMeta("batch1");
+        expect(meta).not.toBeNull();
+        expect(meta?.friendlyId).toBe("batch_abc123");
+        expect(meta?.environmentType).toBe("PRODUCTION");
+        expect(meta?.organizationId).toBe("org456");
+        expect(meta?.projectId).toBe("proj789");
+        expect(meta?.parentRunId).toBe("run_parent");
+        expect(meta?.resumeParentOnCompletion).toBe(true);
+        expect(meta?.triggerVersion).toBe("1.0.0");
+        expect(meta?.spanParentAsLink).toBe(true);
+        expect(meta?.idempotencyKey).toBe("idem123");
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest("should deduplicate items with same index", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer);
+      try {
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 2));
+
+        const item: BatchItem = { task: "task-0", payload: '{"index": 0}' };
+
+        // First enqueue should succeed
+        const result1 = await queue.enqueueBatchItem("batch1", "env1", 0, item);
+        expect(result1.enqueued).toBe(true);
+
+        // Second enqueue with same index should be deduplicated
+        const result2 = await queue.enqueueBatchItem("batch1", "env1", 0, item);
+        expect(result2.enqueued).toBe(false);
+
+        // Different index should succeed
+        const result3 = await queue.enqueueBatchItem("batch1", "env1", 1, item);
+        expect(result3.enqueued).toBe(true);
+      } finally {
+        await queue.close();
+      }
+    });
+  });
+
+  describe("processing callbacks", () => {
+    redisTest("should call process callback for each item", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: true });
+      const processedItems: Array<{ batchId: string; itemIndex: number; task: string }> = [];
+      let completionResult: CompleteBatchResult | null = null;
+
+      try {
+        // Set up callbacks
+        queue.onProcessItem(async ({ batchId, itemIndex, item }) => {
+          processedItems.push({ batchId, itemIndex, task: item.task });
+          return { success: true, runId: `run_${itemIndex}` };
+        });
+
+        queue.onBatchComplete(async (result) => {
+          completionResult = result;
+        });
+
+        // Initialize and enqueue a small batch
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 3));
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(3));
+
+        // Wait for processing
+        await vi.waitFor(
+          () => {
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 5000 }
+        );
+
+        // Verify all items were processed
+        expect(processedItems).toHaveLength(3);
+        expect(processedItems.map((p) => p.itemIndex).sort()).toEqual([0, 1, 2]);
+
+        // Verify completion result
+        expect(completionResult!.batchId).toBe("batch1");
+        expect(completionResult!.successfulRunCount).toBe(3);
+        expect(completionResult!.failedRunCount).toBe(0);
+        expect(completionResult!.runIds).toEqual(["run_0", "run_1", "run_2"]);
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest("should handle processing failures", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: true });
+      let completionResult: CompleteBatchResult | null = null;
+
+      try {
+        // Set up callbacks - fail item 1
+        queue.onProcessItem(async ({ itemIndex }) => {
+          if (itemIndex === 1) {
+            return { success: false, error: "Task failed", errorCode: "TASK_ERROR" };
+          }
+          return { success: true, runId: `run_${itemIndex}` };
+        });
+
+        queue.onBatchComplete(async (result) => {
+          completionResult = result;
+        });
+
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 3));
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(3));
+
+        await vi.waitFor(
+          () => {
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 5000 }
+        );
+
+        // Verify mixed results
+        expect(completionResult!.successfulRunCount).toBe(2);
+        expect(completionResult!.failedRunCount).toBe(1);
+        expect(completionResult!.failures).toHaveLength(1);
+        expect(completionResult!.failures[0].index).toBe(1);
+        expect(completionResult!.failures[0].error).toBe("Task failed");
+        expect(completionResult!.failures[0].errorCode).toBe("TASK_ERROR");
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest("should handle callback exceptions", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: true });
+      let completionResult: CompleteBatchResult | null = null;
+
+      try {
+        // Set up callbacks - throw exception on item 0
+        queue.onProcessItem(async ({ itemIndex }) => {
+          if (itemIndex === 0) {
+            throw new Error("Unexpected error");
+          }
+          return { success: true, runId: `run_${itemIndex}` };
+        });
+
+        queue.onBatchComplete(async (result) => {
+          completionResult = result;
+        });
+
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 2));
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(2));
+
+        await vi.waitFor(
+          () => {
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 5000 }
+        );
+
+        // Exception should be recorded as failure
+        expect(completionResult!.failedRunCount).toBe(1);
+        expect(completionResult!.failures[0].error).toBe("Unexpected error");
+        expect(completionResult!.failures[0].errorCode).toBe("UNEXPECTED_ERROR");
+      } finally {
+        await queue.close();
+      }
+    });
+  });
+
+  describe("consumer lifecycle", () => {
+    redisTest("should start and stop consumers", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: false });
+
+      try {
+        // Start consumers
+        queue.start();
+
+        // Should be able to stop without error
+        await queue.stop();
+
+        // Should be able to start again
+        queue.start();
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest(
+      "should process items only when consumers are started",
+      async ({ redisContainer }) => {
+        const queue = createBatchQueue(redisContainer, { startConsumers: false });
+        const processedItems: number[] = [];
+        let completionCalled = false;
+
+        try {
+          queue.onProcessItem(async ({ itemIndex }) => {
+            processedItems.push(itemIndex);
+            return { success: true, runId: `run_${itemIndex}` };
+          });
+
+          queue.onBatchComplete(async () => {
+            completionCalled = true;
+          });
+
+          // Enqueue batch without starting consumers
+          await queue.initializeBatch(createInitOptions("batch1", "env1", 3));
+          await enqueueItems(queue, "batch1", "env1", createBatchItems(3));
+
+          // Wait a bit - nothing should be processed
+          await new Promise((resolve) => setTimeout(resolve, 200));
+          expect(processedItems).toHaveLength(0);
+
+          // Now start consumers
+          queue.start();
+
+          // Wait for processing
+          await vi.waitFor(
+            () => {
+              expect(completionCalled).toBe(true);
+            },
+            { timeout: 5000 }
+          );
+
+          expect(processedItems).toHaveLength(3);
+        } finally {
+          await queue.close();
+        }
+      }
+    );
+  });
+
+  describe("fair scheduling (DRR)", () => {
+    redisTest(
+      "should process batches from multiple environments fairly",
+      async ({ redisContainer }) => {
+        const queue = createBatchQueue(redisContainer, { startConsumers: true });
+        const processedByEnv: Record<string, number[]> = { env1: [], env2: [] };
+        const completedBatches: string[] = [];
+
+        try {
+          queue.onProcessItem(async ({ itemIndex, meta }) => {
+            processedByEnv[meta.environmentId].push(itemIndex);
+            return { success: true, runId: `run_${meta.environmentId}_${itemIndex}` };
+          });
+
+          queue.onBatchComplete(async (result) => {
+            completedBatches.push(result.batchId);
+          });
+
+          // Initialize and enqueue batches for two environments
+          await queue.initializeBatch(createInitOptions("batch1", "env1", 20));
+          await queue.initializeBatch(createInitOptions("batch2", "env2", 20));
+          await enqueueItems(queue, "batch1", "env1", createBatchItems(20));
+          await enqueueItems(queue, "batch2", "env2", createBatchItems(20));
+
+          // Wait for both to complete
+          await vi.waitFor(
+            () => {
+              expect(completedBatches).toHaveLength(2);
+            },
+            { timeout: 10000 }
+          );
+
+          // Both environments should have been processed
+          expect(processedByEnv.env1).toHaveLength(20);
+          expect(processedByEnv.env2).toHaveLength(20);
+        } finally {
+          await queue.close();
+        }
+      }
+    );
+
+    redisTest("should not let one environment monopolize", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: true });
+      const processOrder: string[] = [];
+
+      try {
+        queue.onProcessItem(async ({ meta }) => {
+          processOrder.push(meta.environmentId);
+          // Small delay to simulate work
+          await new Promise((resolve) => setTimeout(resolve, 5));
+          return { success: true, runId: `run_${Date.now()}` };
+        });
+
+        // Initialize and enqueue env1 with many items first
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 30));
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(30));
+
+        // Small delay then enqueue env2
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        await queue.initializeBatch(createInitOptions("batch2", "env2", 10));
+        await enqueueItems(queue, "batch2", "env2", createBatchItems(10));
+
+        // Wait for env2 batch to complete
+        await vi.waitFor(
+          () => {
+            const env2Count = processOrder.filter((e) => e === "env2").length;
+            expect(env2Count).toBe(10);
+          },
+          { timeout: 10000 }
+        );
+
+        // Check that env2 items were interleaved, not all at the end
+        // Find first env2 item position
+        const firstEnv2Index = processOrder.indexOf("env2");
+        // Env2 should appear before all env1 items are processed
+        expect(firstEnv2Index).toBeLessThan(30);
+      } finally {
+        await queue.close();
+      }
+    });
+  });
+
+  describe("batch results", () => {
+    redisTest("should track successful runs in completion result", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: true });
+      let completionResult: CompleteBatchResult | null = null;
+
+      try {
+        queue.onProcessItem(async ({ itemIndex }) => {
+          return { success: true, runId: `run_${itemIndex}` };
+        });
+
+        queue.onBatchComplete(async (result) => {
+          completionResult = result;
+        });
+
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 5));
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(5));
+
+        await vi.waitFor(
+          () => {
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 5000 }
+        );
+
+        // Verify completion result contains all runs
+        // Note: After completion, batch data is cleaned up from Redis
+        expect(completionResult!.batchId).toBe("batch1");
+        expect(completionResult!.successfulRunCount).toBe(5);
+        expect(completionResult!.failedRunCount).toBe(0);
+        expect(completionResult!.runIds).toHaveLength(5);
+        expect(completionResult!.runIds).toContain("run_0");
+        expect(completionResult!.runIds).toContain("run_4");
+      } finally {
+        await queue.close();
+      }
+    });
+
+    redisTest(
+      "should track failures with details in completion result",
+      async ({ redisContainer }) => {
+        const queue = createBatchQueue(redisContainer, { startConsumers: true });
+        let completionResult: CompleteBatchResult | null = null;
+
+        try {
+          queue.onProcessItem(async ({ itemIndex, item }) => {
+            if (itemIndex % 2 === 0) {
+              return {
+                success: false,
+                error: `Error on ${item.task}`,
+                errorCode: "VALIDATION_ERROR",
+              };
+            }
+            return { success: true, runId: `run_${itemIndex}` };
+          });
+
+          queue.onBatchComplete(async (result) => {
+            completionResult = result;
+          });
+
+          await queue.initializeBatch(createInitOptions("batch1", "env1", 4));
+          await enqueueItems(queue, "batch1", "env1", createBatchItems(4));
+
+          await vi.waitFor(
+            () => {
+              expect(completionResult).not.toBeNull();
+            },
+            { timeout: 5000 }
+          );
+
+          // Verify completion result has failure details
+          // Note: After completion, batch data is cleaned up from Redis
+          expect(completionResult!.batchId).toBe("batch1");
+          expect(completionResult!.successfulRunCount).toBe(2); // Items 1 and 3 succeeded
+          expect(completionResult!.failedRunCount).toBe(2); // Items 0 and 2 failed
+          expect(completionResult!.failures).toHaveLength(2);
+
+          for (const failure of completionResult!.failures) {
+            expect(failure.errorCode).toBe("VALIDATION_ERROR");
+            expect(failure.taskIdentifier).toMatch(/^task-\d+$/);
+            expect(failure.error).toMatch(/^Error on task-\d+$/);
+            expect([0, 2]).toContain(failure.index); // Even indices failed
+          }
+        } finally {
+          await queue.close();
+        }
+      }
+    );
+
+    redisTest("should preserve order of successful runs", async ({ redisContainer }) => {
+      const queue = createBatchQueue(redisContainer, { startConsumers: true });
+      let completionResult: CompleteBatchResult | null = null;
+
+      try {
+        queue.onProcessItem(async ({ itemIndex }) => {
+          return { success: true, runId: `run_${itemIndex}` };
+        });
+
+        queue.onBatchComplete(async (result) => {
+          completionResult = result;
+        });
+
+        await queue.initializeBatch(createInitOptions("batch1", "env1", 10));
+        await enqueueItems(queue, "batch1", "env1", createBatchItems(10));
+
+        await vi.waitFor(
+          () => {
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 5000 }
+        );
+
+        // Runs should be in order since items are processed sequentially
+        expect(completionResult!.runIds).toEqual([
+          "run_0",
+          "run_1",
+          "run_2",
+          "run_3",
+          "run_4",
+          "run_5",
+          "run_6",
+          "run_7",
+          "run_8",
+          "run_9",
+        ]);
+      } finally {
+        await queue.close();
+      }
+    });
+  });
+
+  describe("completion callback error handling", () => {
+    redisTest(
+      "should preserve Redis data when completion callback throws an error",
+      async ({ redisContainer }) => {
+        const queue = createBatchQueue(redisContainer, { startConsumers: true });
+        let callbackCallCount = 0;
+        let lastCompletionResult: CompleteBatchResult | null = null;
+
+        try {
+          queue.onProcessItem(async ({ itemIndex }) => {
+            return { success: true, runId: `run_${itemIndex}` };
+          });
+
+          queue.onBatchComplete(async (result) => {
+            callbackCallCount++;
+            lastCompletionResult = result;
+            // Simulate database failure on first attempt
+            if (callbackCallCount === 1) {
+              throw new Error("Database temporarily unavailable");
+            }
+          });
+
+          await queue.initializeBatch(createInitOptions("batch1", "env1", 3));
+          await enqueueItems(queue, "batch1", "env1", createBatchItems(3));
+
+          // Wait for completion callback to be called (and fail)
+          await vi.waitFor(
+            () => {
+              expect(callbackCallCount).toBeGreaterThanOrEqual(1);
+            },
+            { timeout: 5000 }
+          );
+
+          // Redis data should still exist after callback failure
+          const meta = await queue.getBatchMeta("batch1");
+          expect(meta).not.toBeNull();
+          expect(meta?.batchId).toBe("batch1");
+
+          // Verify the completion result was correct
+          expect(lastCompletionResult).not.toBeNull();
+          expect(lastCompletionResult!.batchId).toBe("batch1");
+          expect(lastCompletionResult!.successfulRunCount).toBe(3);
+          expect(lastCompletionResult!.runIds).toHaveLength(3);
+        } finally {
+          await queue.close();
+        }
+      }
+    );
+
+    redisTest(
+      "should cleanup Redis data when completion callback succeeds",
+      async ({ redisContainer }) => {
+        const queue = createBatchQueue(redisContainer, { startConsumers: true });
+        let completionCalled = false;
+
+        try {
+          queue.onProcessItem(async ({ itemIndex }) => {
+            return { success: true, runId: `run_${itemIndex}` };
+          });
+
+          queue.onBatchComplete(async () => {
+            completionCalled = true;
+            // Callback succeeds - no error thrown
+          });
+
+          await queue.initializeBatch(createInitOptions("batch1", "env1", 3));
+          await enqueueItems(queue, "batch1", "env1", createBatchItems(3));
+
+          // Wait for completion
+          await vi.waitFor(
+            () => {
+              expect(completionCalled).toBe(true);
+            },
+            { timeout: 5000 }
+          );
+
+          // Small delay to ensure cleanup has occurred
+          await new Promise((resolve) => setTimeout(resolve, 100));
+
+          // Redis data should be cleaned up after successful callback
+          const meta = await queue.getBatchMeta("batch1");
+          expect(meta).toBeNull();
+        } finally {
+          await queue.close();
+        }
+      }
+    );
+  });
+});
diff --git a/internal-packages/run-engine/src/batch-queue/types.ts b/internal-packages/run-engine/src/batch-queue/types.ts
new file mode 100644
index 00000000000..3ff34fd4a65
--- /dev/null
+++ b/internal-packages/run-engine/src/batch-queue/types.ts
@@ -0,0 +1,267 @@
+import { z } from "zod";
+import { RuntimeEnvironmentType } from "@trigger.dev/database";
+import { Logger, LogLevel } from "@trigger.dev/core/logger";
+import { GlobalRateLimiter } from "@trigger.dev/redis-worker";
+import { Meter, Tracer } from "@internal/tracing";
+import { RedisOptions } from "@internal/redis";
+
+// ============================================================================
+// Batch Item Schemas
+// ============================================================================
+
+/**
+ * A single item in a batch trigger request.
+ * Kept permissive to accept various input formats from the API.
+ *
+ * Payload handling:
+ * - For small payloads: `payload` contains the actual data, `payloadType` is "application/json" (default)
+ * - For large payloads (offloaded to R2): `payload` is the R2 path string, `payloadType` is "application/store"
+ *
+ * When `payloadType` is "application/store", the payload is an R2 object path (e.g., "batch_xxx/item_0/payload.json")
+ * that will be resolved by the run engine when the task executes.
+ */
+export const BatchItem = z.object({
+  /** The task identifier to trigger */
+  task: z.string(),
+  /**
+   * The payload for this item.
+   * - If payloadType is "application/json": Contains the actual payload data
+   * - If payloadType is "application/store": Contains the R2 path to the offloaded payload
+   */
+  payload: z.unknown().optional(),
+  /**
+   * The payload type.
+   * - "application/json" (default): Payload is inline JSON data
+   * - "application/store": Payload is an R2 object path (large payload was offloaded)
+   * - Other types supported for non-JSON payloads
+   */
+  payloadType: z.string().optional(),
+  /** Options for this specific item - stored as JSON */
+  options: z.record(z.unknown()).optional(),
+});
+export type BatchItem = z.infer<typeof BatchItem>;
+
+/**
+ * Metadata stored alongside batch items in Redis
+ */
+export const BatchMeta = z.object({
+  /** The batch ID */
+  batchId: z.string(),
+  /** The friendly batch ID */
+  friendlyId: z.string(),
+  /** Environment ID */
+  environmentId: z.string(),
+  /** Environment type */
+  environmentType: z.nativeEnum(RuntimeEnvironmentType),
+  /** Organization ID */
+  organizationId: z.string(),
+  /** Project ID */
+  projectId: z.string(),
+  /** Total number of items in the batch */
+  runCount: z.number(),
+  /** Timestamp when batch was created */
+  createdAt: z.number(),
+  /** Optional parent run ID (for triggerAndWait) */
+  parentRunId: z.string().optional(),
+  /** Whether to resume parent on completion */
+  resumeParentOnCompletion: z.boolean().optional(),
+  /** Trigger version */
+  triggerVersion: z.string().optional(),
+  /** Trace context */
+  traceContext: z.record(z.unknown()).optional(),
+  /** Whether span parent should be a link */
+  spanParentAsLink: z.boolean().optional(),
+  /** Realtime streams version */
+  realtimeStreamsVersion: z.enum(["v1", "v2"]).optional(),
+  /** Idempotency key for the batch */
+  idempotencyKey: z.string().optional(),
+  /** Processing concurrency limit for this batch's environment */
+  processingConcurrency: z.number().optional(),
+  /** Plan type for billing (e.g., "free", "paid") - used when skipChecks is enabled */
+  planType: z.string().optional(),
+});
+export type BatchMeta = z.infer<typeof BatchMeta>;
+
+/**
+ * A failure record for an item that failed to create a run.
+ *
+ * Payload handling:
+ * - For small payloads: Contains the full payload as a JSON string
+ * - For large payloads (offloaded to R2): Contains the R2 path string
+ */
+export const BatchItemFailure = z.object({
+  /** Index of the item in the batch */
+  index: z.number(),
+  /** The task identifier */
+  taskIdentifier: z.string(),
+  /**
+   * The payload that failed.
+   * - For inline payloads: The full payload as a JSON string
+   * - For offloaded payloads: The R2 path (e.g., "batch_xxx/item_0/payload.json")
+   */
+  payload: z.string().optional(),
+  /** The options that were used */
+  options: z.record(z.unknown()).optional(),
+  /** Error message */
+  error: z.string(),
+  /** Error code if available */
+  errorCode: z.string().optional(),
+  /** Timestamp when the failure occurred */
+  timestamp: z.number(),
+});
+export type BatchItemFailure = z.infer<typeof BatchItemFailure>;
+
+// ============================================================================
+// DRR (Deficit Round Robin) Types
+// ============================================================================
+
+/**
+ * Configuration for the DRR scheduler
+ */
+export type DRRConfig = {
+  /** Credits allocated per environment per round */
+  quantum: number;
+  /** Maximum accumulated deficit (prevents starvation) */
+  maxDeficit: number;
+  /** Maximum queues to fetch from master queue (default: 1000) */
+  masterQueueLimit?: number;
+};
+
+// ============================================================================
+// Batch Queue Options and Results
+// ============================================================================
+
+/**
+ * Options for initializing a batch (Phase 1 of 2-phase batch API).
+ * Items are streamed separately via enqueueBatchItem().
+ */
+export type InitializeBatchOptions = {
+  /** The batch ID (internal format) */
+  batchId: string;
+  /** The friendly batch ID */
+  friendlyId: string;
+  /** Environment ID */
+  environmentId: string;
+  /** Environment type */
+  environmentType: RuntimeEnvironmentType;
+  /** Organization ID */
+  organizationId: string;
+  /** Project ID */
+  projectId: string;
+  /** Expected number of items in the batch */
+  runCount: number;
+  /** Optional parent run ID (for triggerAndWait) */
+  parentRunId?: string;
+  /** Whether to resume parent on completion */
+  resumeParentOnCompletion?: boolean;
+  /** Trigger version */
+  triggerVersion?: string;
+  /** Trace context */
+  traceContext?: Record<string, unknown>;
+  /** Whether span parent should be a link */
+  spanParentAsLink?: boolean;
+  /** Realtime streams version */
+  realtimeStreamsVersion?: "v1" | "v2";
+  /** Idempotency key for the batch */
+  idempotencyKey?: string;
+  /** Processing concurrency limit for this batch's environment */
+  processingConcurrency?: number;
+  /** Plan type for billing (e.g., "free", "paid") - used when skipChecks is enabled */
+  planType?: string;
+};
+
+/**
+ * Result of completing a batch
+ */
+export type CompleteBatchResult = {
+  /** The batch ID */
+  batchId: string;
+  /** Friendly IDs of successfully created runs */
+  runIds: string[];
+  /** Count of successful runs */
+  successfulRunCount: number;
+  /** Count of failed items */
+  failedRunCount: number;
+  /** Failure details */
+  failures: BatchItemFailure[];
+};
+
+/**
+ * Options for the BatchQueue
+ */
+export type BatchQueueOptions = {
+  /** Redis connection options */
+  redis: RedisOptions;
+  /** DRR configuration */
+  drr: DRRConfig;
+  /** Number of consumer loops to run */
+  consumerCount: number;
+  /** Interval between consumer iterations (ms) */
+  consumerIntervalMs: number;
+  /** Number of master queue shards (default: 1) */
+  shardCount?: number;
+  /** Worker queue blocking timeout in seconds (enables two-stage processing) */
+  workerQueueBlockingTimeoutSeconds?: number;
+  /** Whether to start consumers on initialization */
+  startConsumers?: boolean;
+  /**
+   * Default processing concurrency per environment.
+   * This is used when no specific concurrency is set for an environment.
+   * Items wait in queue until capacity frees up.
+   */
+  defaultConcurrency?: number;
+  /**
+   * Optional global rate limiter to limit processing across all consumers.
+   * When configured, limits the max items/second processed globally.
+   */
+  globalRateLimiter?: GlobalRateLimiter;
+  /** Logger instance */
+  logger?: Logger;
+  logLevel?: LogLevel;
+  /** OpenTelemetry tracer for distributed tracing */
+  tracer?: Tracer;
+  /** OpenTelemetry meter for metrics */
+  meter?: Meter;
+  /** Maximum iterations before rotating consumer loop trace span (default: 1000) */
+  consumerTraceMaxIterations?: number;
+  /** Maximum seconds before rotating consumer loop trace span (default: 60) */
+  consumerTraceTimeoutSeconds?: number;
+};
+
+/**
+ * Callback for processing a dequeued batch item
+ */
+export type ProcessBatchItemCallback = (params: {
+  batchId: string;
+  friendlyId: string;
+  itemIndex: number;
+  item: BatchItem;
+  meta: BatchMeta;
+}) => Promise<
+  { success: true; runId: string } | { success: false; error: string; errorCode?: string }
+>;
+
+/**
+ * Callback for handling batch completion
+ */
+export type BatchCompletionCallback = (result: CompleteBatchResult) => Promise<void>;
+
+// ============================================================================
+// FairQueue Payload Schema
+// ============================================================================
+
+/**
+ * Payload schema for FairQueue messages.
+ * Contains all data needed to process a single batch item.
+ */
+export const BatchItemPayload = z.object({
+  /** Batch internal ID */
+  batchId: z.string(),
+  /** Batch friendly ID */
+  friendlyId: z.string(),
+  /** Index of this item in the batch (0-based) */
+  itemIndex: z.number(),
+  /** The actual item data */
+  item: BatchItem,
+});
+export type BatchItemPayload = z.infer<typeof BatchItemPayload>;
diff --git a/internal-packages/run-engine/src/engine/billingCache.ts b/internal-packages/run-engine/src/engine/billingCache.ts
new file mode 100644
index 00000000000..e4bef2f4386
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/billingCache.ts
@@ -0,0 +1,91 @@
+import {
+  createCache,
+  createLRUMemoryStore,
+  DefaultStatefulContext,
+  Namespace,
+  Ok,
+  RedisCacheStore,
+  type UnkeyCache,
+  type CacheError,
+  type Result,
+} from "@internal/cache";
+import type { RedisOptions } from "@internal/redis";
+import type { Logger } from "@trigger.dev/core/logger";
+import type { RunEngineOptions } from "./types.js";
+
+// Cache TTLs for billing information - shorter than other caches since billing can change
+const BILLING_FRESH_TTL = 60000 * 5; // 5 minutes
+const BILLING_STALE_TTL = 60000 * 10; // 10 minutes
+
+export type BillingPlan = {
+  isPaying: boolean;
+  type: "free" | "paid" | "enterprise";
+};
+
+export type BillingCacheOptions = {
+  billingOptions?: RunEngineOptions["billing"];
+  redisOptions: RedisOptions;
+  logger: Logger;
+};
+
+export class BillingCache {
+  private readonly cache: UnkeyCache<{
+    currentPlan: BillingPlan;
+  }>;
+  private readonly logger: Logger;
+  private readonly billingOptions?: RunEngineOptions["billing"];
+
+  constructor(options: BillingCacheOptions) {
+    this.logger = options.logger;
+    this.billingOptions = options.billingOptions;
+
+    // Initialize cache
+    const ctx = new DefaultStatefulContext();
+    const redisCacheStore = new RedisCacheStore({
+      name: "billing-cache",
+      connection: {
+        ...options.redisOptions,
+        keyPrefix: "engine:billing:cache:",
+      },
+      useModernCacheKeyBuilder: true,
+    });
+
+    this.cache = createCache({
+      currentPlan: new Namespace<BillingPlan>(ctx, {
+        stores: [createLRUMemoryStore(1000), redisCacheStore],
+        fresh: BILLING_FRESH_TTL,
+        stale: BILLING_STALE_TTL,
+      }),
+    });
+  }
+
+  /**
+   * Gets the current billing plan for an organization
+   * Returns a Result that allows the caller to handle errors and missing values
+   */
+  async getCurrentPlan(orgId: string): Promise<Result<BillingPlan | undefined, CacheError>> {
+    if (!this.billingOptions?.getCurrentPlan) {
+      // Return a successful result with default free plan
+      return Ok({ isPaying: false, type: "free" });
+    }
+
+    return await this.cache.currentPlan.swr(orgId, async () => {
+      // This is safe because options can't change at runtime
+      const planResult = await this.billingOptions!.getCurrentPlan(orgId);
+      return { isPaying: planResult.isPaying, type: planResult.type };
+    });
+  }
+
+  /**
+   * Invalidates the billing cache for an organization when their plan changes
+   * Runs in background and handles all errors internally
+   */
+  invalidate(orgId: string): void {
+    this.cache.currentPlan.remove(orgId).catch((error) => {
+      this.logger.warn("Failed to invalidate billing cache", {
+        orgId,
+        error: error instanceof Error ? error.message : String(error),
+      });
+    });
+  }
+}
diff --git a/internal-packages/run-engine/src/engine/db/worker.ts b/internal-packages/run-engine/src/engine/db/worker.ts
deleted file mode 100644
index 6b89eacbafc..00000000000
--- a/internal-packages/run-engine/src/engine/db/worker.ts
+++ /dev/null
@@ -1,342 +0,0 @@
-import {
-  BackgroundWorker,
-  BackgroundWorkerTask,
-  Prisma,
-  PrismaClientOrTransaction,
-  TaskQueue,
-  WorkerDeployment,
-} from "@trigger.dev/database";
-import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
-
-type RunWithMininimalEnvironment = Prisma.TaskRunGetPayload<{
-  include: {
-    runtimeEnvironment: {
-      select: {
-        id: true;
-        type: true;
-      };
-    };
-  };
-}>;
-
-type RunWithBackgroundWorkerTasksResult =
-  | {
-      success: false;
-      code: "NO_RUN";
-      message: string;
-    }
-  | {
-      success: false;
-      code:
-        | "NO_WORKER"
-        | "TASK_NOT_IN_LATEST"
-        | "TASK_NEVER_REGISTERED"
-        | "BACKGROUND_WORKER_MISMATCH"
-        | "QUEUE_NOT_FOUND"
-        | "RUN_ENVIRONMENT_ARCHIVED";
-      message: string;
-      run: RunWithMininimalEnvironment;
-    }
-  | {
-      success: false;
-      code: "BACKGROUND_WORKER_MISMATCH";
-      message: string;
-      backgroundWorker: {
-        expected: string;
-        received: string;
-      };
-      run: RunWithMininimalEnvironment;
-    }
-  | {
-      success: true;
-      run: RunWithMininimalEnvironment;
-      worker: BackgroundWorker;
-      task: BackgroundWorkerTask;
-      queue: TaskQueue;
-      deployment: WorkerDeployment | null;
-    };
-
-export async function getRunWithBackgroundWorkerTasks(
-  prisma: PrismaClientOrTransaction,
-  runId: string,
-  backgroundWorkerId?: string
-): Promise<RunWithBackgroundWorkerTasksResult> {
-  const run = await prisma.taskRun.findFirst({
-    where: {
-      id: runId,
-    },
-    include: {
-      runtimeEnvironment: {
-        select: {
-          id: true,
-          type: true,
-          archivedAt: true,
-        },
-      },
-      lockedToVersion: {
-        include: {
-          deployment: true,
-          tasks: true,
-        },
-      },
-    },
-  });
-
-  if (!run) {
-    return {
-      success: false as const,
-      code: "NO_RUN",
-      message: `No run found with id: ${runId}`,
-    };
-  }
-
-  if (run.runtimeEnvironment.archivedAt) {
-    return {
-      success: false as const,
-      code: "RUN_ENVIRONMENT_ARCHIVED",
-      message: `Run is on an archived environment: ${run.id}`,
-      run,
-    };
-  }
-
-  const workerId = run.lockedToVersionId ?? backgroundWorkerId;
-
-  //get the relevant BackgroundWorker with tasks and deployment (if not DEV)
-  let workerWithTasks: WorkerDeploymentWithWorkerTasks | null = null;
-
-  if (run.runtimeEnvironment.type === "DEVELOPMENT") {
-    workerWithTasks = workerId
-      ? await getWorkerById(prisma, workerId)
-      : await getMostRecentWorker(prisma, run.runtimeEnvironmentId);
-  } else {
-    workerWithTasks = workerId
-      ? await getWorkerDeploymentFromWorker(prisma, workerId)
-      : await getManagedWorkerFromCurrentlyPromotedDeployment(prisma, run.runtimeEnvironmentId);
-  }
-
-  if (!workerWithTasks) {
-    return {
-      success: false as const,
-      code: "NO_WORKER",
-      message: `No worker found for run: ${run.id}`,
-      run,
-    };
-  }
-
-  if (backgroundWorkerId) {
-    if (backgroundWorkerId !== workerWithTasks.worker.id) {
-      return {
-        success: false as const,
-        code: "BACKGROUND_WORKER_MISMATCH",
-        message: `Background worker mismatch for run: ${run.id}`,
-        backgroundWorker: {
-          expected: backgroundWorkerId,
-          received: workerWithTasks.worker.id,
-        },
-        run,
-      };
-    }
-  }
-
-  const backgroundTask = workerWithTasks.tasks.find((task) => task.slug === run.taskIdentifier);
-
-  if (!backgroundTask) {
-    const nonCurrentTask = await prisma.backgroundWorkerTask.findFirst({
-      where: {
-        slug: run.taskIdentifier,
-        projectId: run.projectId,
-        runtimeEnvironmentId: run.runtimeEnvironmentId,
-      },
-      include: {
-        worker: true,
-      },
-      orderBy: {
-        createdAt: "desc",
-      },
-    });
-
-    if (nonCurrentTask) {
-      return {
-        success: false as const,
-        code: "TASK_NOT_IN_LATEST",
-        message: `Task not found in latest version: ${run.taskIdentifier}. Found in ${nonCurrentTask.worker.version}`,
-        run,
-      };
-    } else {
-      return {
-        success: false as const,
-        code: "TASK_NEVER_REGISTERED",
-        message: `Task has never been registered (in dev or deployed): ${run.taskIdentifier}`,
-        run,
-      };
-    }
-  }
-
-  const queue = workerWithTasks.queues.find((queue) =>
-    run.lockedQueueId ? queue.id === run.lockedQueueId : queue.name === run.queue
-  );
-
-  if (!queue) {
-    return {
-      success: false as const,
-      code: "QUEUE_NOT_FOUND",
-      message: `Queue not found for run: ${run.id}`,
-      run,
-    };
-  }
-
-  return {
-    success: true as const,
-    run,
-    worker: workerWithTasks.worker,
-    task: backgroundTask,
-    queue,
-    deployment: workerWithTasks.deployment,
-  };
-}
-
-type WorkerDeploymentWithWorkerTasks = {
-  worker: BackgroundWorker;
-  tasks: BackgroundWorkerTask[];
-  queues: TaskQueue[];
-  deployment: WorkerDeployment | null;
-};
-
-export async function getWorkerDeploymentFromWorker(
-  prisma: PrismaClientOrTransaction,
-  workerId: string
-): Promise<WorkerDeploymentWithWorkerTasks | null> {
-  const worker = await prisma.backgroundWorker.findFirst({
-    where: {
-      id: workerId,
-    },
-    include: {
-      deployment: true,
-      tasks: true,
-      queues: true,
-    },
-  });
-
-  if (!worker) {
-    return null;
-  }
-
-  return { worker, tasks: worker.tasks, queues: worker.queues, deployment: worker.deployment };
-}
-
-export async function getMostRecentWorker(
-  prisma: PrismaClientOrTransaction,
-  environmentId: string
-): Promise<WorkerDeploymentWithWorkerTasks | null> {
-  const worker = await prisma.backgroundWorker.findFirst({
-    where: {
-      runtimeEnvironmentId: environmentId,
-    },
-    include: {
-      tasks: true,
-      queues: true,
-    },
-    orderBy: {
-      id: "desc",
-    },
-  });
-
-  if (!worker) {
-    return null;
-  }
-
-  return { worker, tasks: worker.tasks, queues: worker.queues, deployment: null };
-}
-
-export async function getWorkerById(
-  prisma: PrismaClientOrTransaction,
-  workerId: string
-): Promise<WorkerDeploymentWithWorkerTasks | null> {
-  const worker = await prisma.backgroundWorker.findFirst({
-    where: {
-      id: workerId,
-    },
-    include: {
-      deployment: true,
-      tasks: true,
-      queues: true,
-    },
-    orderBy: {
-      id: "desc",
-    },
-  });
-
-  if (!worker) {
-    return null;
-  }
-
-  return { worker, tasks: worker.tasks, queues: worker.queues, deployment: worker.deployment };
-}
-
-export async function getManagedWorkerFromCurrentlyPromotedDeployment(
-  prisma: PrismaClientOrTransaction,
-  environmentId: string
-): Promise<WorkerDeploymentWithWorkerTasks | null> {
-  const promotion = await prisma.workerDeploymentPromotion.findFirst({
-    where: {
-      environmentId,
-      label: CURRENT_DEPLOYMENT_LABEL,
-    },
-    include: {
-      deployment: {
-        include: {
-          worker: {
-            include: {
-              tasks: true,
-              queues: true,
-            },
-          },
-        },
-      },
-    },
-  });
-
-  if (!promotion || !promotion.deployment.worker) {
-    return null;
-  }
-
-  if (promotion.deployment.type === "MANAGED") {
-    // This is a run engine v2 deployment, so return it
-    return {
-      worker: promotion.deployment.worker,
-      tasks: promotion.deployment.worker.tasks,
-      queues: promotion.deployment.worker.queues,
-      deployment: promotion.deployment,
-    };
-  }
-
-  // We need to get the latest run engine v2 deployment
-  const latestV2Deployment = await prisma.workerDeployment.findFirst({
-    where: {
-      environmentId,
-      type: "MANAGED",
-    },
-    orderBy: {
-      id: "desc",
-    },
-    include: {
-      worker: {
-        include: {
-          tasks: true,
-          queues: true,
-        },
-      },
-    },
-  });
-
-  if (!latestV2Deployment?.worker) {
-    return null;
-  }
-
-  return {
-    worker: latestV2Deployment.worker,
-    tasks: latestV2Deployment.worker.tasks,
-    queues: latestV2Deployment.worker.queues,
-    deployment: latestV2Deployment,
-  };
-}
diff --git a/internal-packages/run-engine/src/engine/errors.ts b/internal-packages/run-engine/src/engine/errors.ts
index 9e7c4c40c8d..cfc12e1b958 100644
--- a/internal-packages/run-engine/src/engine/errors.ts
+++ b/internal-packages/run-engine/src/engine/errors.ts
@@ -1,8 +1,11 @@
 import { assertExhaustive } from "@trigger.dev/core";
 import { TaskRunError } from "@trigger.dev/core/v3";
-import { TaskRunStatus } from "@trigger.dev/database";
+import { RuntimeEnvironmentType, TaskRunStatus } from "@trigger.dev/database";
 
-export function runStatusFromError(error: TaskRunError): TaskRunStatus {
+export function runStatusFromError(
+  error: TaskRunError,
+  environmentType: RuntimeEnvironmentType
+): TaskRunStatus {
   if (error.type !== "INTERNAL_ERROR") {
     return "COMPLETED_WITH_ERRORS";
   }
@@ -21,6 +24,15 @@ export function runStatusFromError(error: TaskRunError): TaskRunStatus {
       return "CANCELED";
     case "MAX_DURATION_EXCEEDED":
       return "TIMED_OUT";
+    case "TASK_RUN_STALLED_EXECUTING":
+    case "TASK_RUN_STALLED_EXECUTING_WITH_WAITPOINTS": {
+      if (environmentType === "DEVELOPMENT") {
+        return "CANCELED";
+      }
+
+      return "COMPLETED_WITH_ERRORS";
+    }
+
     case "TASK_PROCESS_OOM_KILLED":
     case "TASK_PROCESS_MAYBE_OOM_KILLED":
     case "TASK_PROCESS_SIGSEGV":
@@ -40,8 +52,6 @@ export function runStatusFromError(error: TaskRunError): TaskRunStatus {
     case "TASK_DEQUEUED_INVALID_STATE":
     case "TASK_DEQUEUED_QUEUE_NOT_FOUND":
     case "TASK_RUN_DEQUEUED_MAX_RETRIES":
-    case "TASK_RUN_STALLED_EXECUTING":
-    case "TASK_RUN_STALLED_EXECUTING_WITH_WAITPOINTS":
     case "TASK_HAS_N0_EXECUTION_SNAPSHOT":
     case "GRACEFUL_EXIT_TIMEOUT":
     case "POD_EVICTED":
@@ -59,7 +69,8 @@ export function runStatusFromError(error: TaskRunError): TaskRunStatus {
 export class ServiceValidationError extends Error {
   constructor(
     message: string,
-    public status?: number
+    public status?: number,
+    public metadata?: Record<string, unknown>
   ) {
     super(message);
     this.name = "ServiceValidationError";
diff --git a/internal-packages/run-engine/src/engine/eventBus.ts b/internal-packages/run-engine/src/engine/eventBus.ts
index 178bdd5b3b0..2e4adeed4b1 100644
--- a/internal-packages/run-engine/src/engine/eventBus.ts
+++ b/internal-packages/run-engine/src/engine/eventBus.ts
@@ -244,6 +244,7 @@ export type EventBusEvents = {
         updatedAt: Date;
         createdAt: Date;
         error: TaskRunError;
+        taskEventStore?: string;
       };
       organization: {
         id: string;
@@ -287,6 +288,7 @@ export type EventBusEvents = {
       };
       hasError: boolean;
       blockedRunId: string;
+      cachedRunId?: string;
     },
   ];
   runMetadataUpdated: [
diff --git a/internal-packages/run-engine/src/engine/index.ts b/internal-packages/run-engine/src/engine/index.ts
index 8fa677a1c12..9e81c99132d 100644
--- a/internal-packages/run-engine/src/engine/index.ts
+++ b/internal-packages/run-engine/src/engine/index.ts
@@ -7,9 +7,12 @@ import {
   CreateCheckpointResult,
   DequeuedMessage,
   ExecutionResult,
+  formatDurationMilliseconds,
   RunExecutionData,
   StartRunAttemptResult,
+  TaskRunContext,
   TaskRunExecutionResult,
+  TaskRunInternalError,
 } from "@trigger.dev/core/v3";
 import { RunId, WaitpointId } from "@trigger.dev/core/v3/isomorphic";
 import {
@@ -17,6 +20,7 @@ import {
   PrismaClient,
   PrismaClientOrTransaction,
   PrismaReplicaClient,
+  RuntimeEnvironmentType,
   TaskRun,
   TaskRunExecutionSnapshot,
   Waitpoint,
@@ -24,16 +28,26 @@ import {
 import { Worker } from "@trigger.dev/redis-worker";
 import { assertNever } from "assert-never";
 import { EventEmitter } from "node:events";
+import { BatchQueue } from "../batch-queue/index.js";
+import type {
+  BatchItem,
+  CompleteBatchResult,
+  InitializeBatchOptions,
+  ProcessBatchItemCallback,
+  BatchCompletionCallback,
+} from "../batch-queue/types.js";
 import { FairQueueSelectionStrategy } from "../run-queue/fairQueueSelectionStrategy.js";
 import { RunQueue } from "../run-queue/index.js";
 import { RunQueueFullKeyProducer } from "../run-queue/keyProducer.js";
-import { MinimalAuthenticatedEnvironment } from "../shared/index.js";
+import { AuthenticatedEnvironment, MinimalAuthenticatedEnvironment } from "../shared/index.js";
+import { BillingCache } from "./billingCache.js";
 import { NotImplementedError, RunDuplicateIdempotencyKeyError } from "./errors.js";
 import { EventBus, EventBusEvents } from "./eventBus.js";
 import { RunLocker } from "./locking.js";
 import { getFinalRunStatuses } from "./statuses.js";
 import { BatchSystem } from "./systems/batchSystem.js";
 import { CheckpointSystem } from "./systems/checkpointSystem.js";
+import { DebounceSystem } from "./systems/debounceSystem.js";
 import { DelayedRunSystem } from "./systems/delayedRunSystem.js";
 import { DequeueSystem } from "./systems/dequeueSystem.js";
 import { EnqueueSystem } from "./systems/enqueueSystem.js";
@@ -49,8 +63,15 @@ import { RunAttemptSystem } from "./systems/runAttemptSystem.js";
 import { SystemResources } from "./systems/systems.js";
 import { TtlSystem } from "./systems/ttlSystem.js";
 import { WaitpointSystem } from "./systems/waitpointSystem.js";
-import { EngineWorker, HeartbeatTimeouts, RunEngineOptions, TriggerParams } from "./types.js";
+import {
+  EngineWorker,
+  HeartbeatTimeouts,
+  ReportableQueue,
+  RunEngineOptions,
+  TriggerParams,
+} from "./types.js";
 import { workerCatalog } from "./workerCatalog.js";
+import pMap from "p-map";
 
 export class RunEngine {
   private runLockRedis: Redis;
@@ -60,6 +81,8 @@ export class RunEngine {
   private tracer: Tracer;
   private meter: Meter;
   private heartbeatTimeouts: HeartbeatTimeouts;
+  private repairSnapshotTimeoutMs: number;
+  private batchQueue: BatchQueue;
 
   prisma: PrismaClient;
   readOnlyPrisma: PrismaReplicaClient;
@@ -73,10 +96,13 @@ export class RunEngine {
   enqueueSystem: EnqueueSystem;
   checkpointSystem: CheckpointSystem;
   delayedRunSystem: DelayedRunSystem;
+  debounceSystem: DebounceSystem;
   ttlSystem: TtlSystem;
   pendingVersionSystem: PendingVersionSystem;
   raceSimulationSystem: RaceSimulationSystem = new RaceSimulationSystem();
 
+  private readonly billingCache: BillingCache;
+
   constructor(private readonly options: RunEngineOptions) {
     this.logger = options.logger ?? new Logger("RunEngine", this.options.logLevel ?? "info");
     this.prisma = options.prisma;
@@ -115,15 +141,22 @@ export class RunEngine {
 
     const keys = new RunQueueFullKeyProducer();
 
+    const queueSelectionStrategyOptions = {
+      keys,
+      redis: { ...options.queue.redis, keyPrefix: `${options.queue.redis.keyPrefix}runqueue:` },
+      defaultEnvConcurrencyLimit: options.queue?.defaultEnvConcurrency ?? 10,
+      ...options.queue?.queueSelectionStrategyOptions,
+    };
+
+    this.logger.log("RunEngine FairQueueSelectionStrategy queueSelectionStrategyOptions", {
+      options: queueSelectionStrategyOptions,
+    });
+
     this.runQueue = new RunQueue({
       name: "rq",
       tracer: trace.getTracer("rq"),
       keys,
-      queueSelectionStrategy: new FairQueueSelectionStrategy({
-        keys,
-        redis: { ...options.queue.redis, keyPrefix: `${options.queue.redis.keyPrefix}runqueue:` },
-        defaultEnvConcurrencyLimit: options.queue?.defaultEnvConcurrency ?? 10,
-      }),
+      queueSelectionStrategy: new FairQueueSelectionStrategy(queueSelectionStrategyOptions),
       defaultEnvConcurrency: options.queue?.defaultEnvConcurrency ?? 10,
       defaultEnvConcurrencyBurstFactor: options.queue?.defaultEnvConcurrencyBurstFactor,
       logger: new Logger("RunQueue", options.queue?.logLevel ?? "info"),
@@ -169,15 +202,18 @@ export class RunEngine {
             id: payload.waitpointId,
             output: payload.error
               ? {
-                  value: payload.error,
-                  isError: true,
-                }
+                value: payload.error,
+                isError: true,
+              }
               : undefined,
           });
         },
         heartbeatSnapshot: async ({ payload }) => {
           await this.#handleStalledSnapshot(payload);
         },
+        repairSnapshot: async ({ payload }) => {
+          await this.#handleRepairSnapshot(payload);
+        },
         expireRun: async ({ payload }) => {
           await this.ttlSystem.expireRun({ runId: payload.runId });
         },
@@ -208,6 +244,8 @@ export class RunEngine {
     });
 
     if (!options.worker.disabled) {
+      console.log("✅ Starting run engine worker");
+
       this.worker.start();
     }
 
@@ -226,8 +264,11 @@ export class RunEngine {
       ...(options.heartbeatTimeoutsMs ?? {}),
     };
 
+    this.repairSnapshotTimeoutMs = options.repairSnapshotTimeoutMs ?? 60_000;
+
     const resources: SystemResources = {
       prisma: this.prisma,
+      readOnlyPrisma: this.readOnlyPrisma,
       worker: this.worker,
       eventBus: this.eventBus,
       logger: this.logger,
@@ -259,6 +300,14 @@ export class RunEngine {
       enqueueSystem: this.enqueueSystem,
     });
 
+    this.debounceSystem = new DebounceSystem({
+      resources,
+      redis: options.debounce?.redis ?? options.runLock.redis,
+      executionSnapshotSystem: this.executionSnapshotSystem,
+      delayedRunSystem: this.delayedRunSystem,
+      maxDebounceDurationMs: options.debounce?.maxDebounceDurationMs ?? 60 * 60 * 1000, // Default 1 hour
+    });
+
     this.pendingVersionSystem = new PendingVersionSystem({
       resources,
       enqueueSystem: this.enqueueSystem,
@@ -280,6 +329,38 @@ export class RunEngine {
       waitpointSystem: this.waitpointSystem,
     });
 
+    // Initialize BatchQueue for DRR-based batch processing (if configured)
+    // Only start consumers if consumerDisabled is not set or is false
+    const startBatchQueueConsumers = options.batchQueue?.consumerEnabled ?? true;
+
+    this.batchQueue = new BatchQueue({
+      redis: {
+        keyPrefix: `${options.batchQueue?.redis.keyPrefix ?? ""}batch-queue:`,
+        ...options.batchQueue?.redis,
+      },
+      drr: {
+        quantum: options.batchQueue?.drr?.quantum ?? 5,
+        maxDeficit: options.batchQueue?.drr?.maxDeficit ?? 50,
+        masterQueueLimit: options.batchQueue?.drr?.masterQueueLimit,
+      },
+      shardCount: options.batchQueue?.shardCount,
+      workerQueueBlockingTimeoutSeconds: options.batchQueue?.workerQueueBlockingTimeoutSeconds,
+      consumerCount: options.batchQueue?.consumerCount ?? 2,
+      consumerIntervalMs: options.batchQueue?.consumerIntervalMs ?? 100,
+      defaultConcurrency: options.batchQueue?.defaultConcurrency ?? 10,
+      globalRateLimiter: options.batchQueue?.globalRateLimiter,
+      startConsumers: startBatchQueueConsumers,
+      tracer: options.tracer,
+      meter: options.meter,
+    });
+
+    this.logger.info("BatchQueue initialized", {
+      consumerCount: options.batchQueue?.consumerCount ?? 2,
+      drrQuantum: options.batchQueue?.drr?.quantum ?? 5,
+      defaultConcurrency: options.batchQueue?.defaultConcurrency ?? 10,
+      consumersEnabled: startBatchQueueConsumers,
+    });
+
     this.runAttemptSystem = new RunAttemptSystem({
       resources,
       executionSnapshotSystem: this.executionSnapshotSystem,
@@ -288,6 +369,13 @@ export class RunEngine {
       delayedRunSystem: this.delayedRunSystem,
       machines: this.options.machines,
       retryWarmStartThresholdMs: this.options.retryWarmStartThresholdMs,
+      redisOptions: this.options.cache?.redis ?? this.options.runLock.redis,
+    });
+
+    this.billingCache = new BillingCache({
+      billingOptions: this.options.billing,
+      redisOptions: this.options.cache?.redis ?? this.options.runLock.redis,
+      logger: this.logger,
     });
 
     this.dequeueSystem = new DequeueSystem({
@@ -295,6 +383,7 @@ export class RunEngine {
       executionSnapshotSystem: this.executionSnapshotSystem,
       runAttemptSystem: this.runAttemptSystem,
       machines: this.options.machines,
+      billingCache: this.billingCache,
     });
   }
 
@@ -304,10 +393,10 @@ export class RunEngine {
   async trigger(
     {
       friendlyId,
-      number,
       environment,
       idempotencyKey,
       idempotencyKeyExpiresAt,
+      idempotencyKeyOptions,
       taskIdentifier,
       payload,
       payloadType,
@@ -352,6 +441,10 @@ export class RunEngine {
       scheduleInstanceId,
       createdAt,
       bulkActionId,
+      planType,
+      realtimeStreamsVersion,
+      debounce,
+      onDebounced,
     }: TriggerParams,
     tx?: PrismaClientOrTransaction
   ): Promise<TaskRun> {
@@ -361,17 +454,91 @@ export class RunEngine {
       this.tracer,
       "trigger",
       async (span) => {
+        // Handle debounce before creating a new run
+        // Store claimId if we successfully claimed the debounce key
+        let debounceClaimId: string | undefined;
+
+        if (debounce) {
+          const debounceResult = await this.debounceSystem.handleDebounce({
+            environmentId: environment.id,
+            taskIdentifier,
+            debounce:
+              debounce.mode === "trailing"
+                ? {
+                  ...debounce,
+                  updateData: {
+                    payload,
+                    payloadType,
+                    metadata,
+                    metadataType,
+                    tags,
+                    maxAttempts,
+                    maxDurationInSeconds,
+                    machine,
+                  },
+                }
+                : debounce,
+            tx: prisma,
+          });
+
+          if (debounceResult.status === "existing") {
+            span.setAttribute("debounced", true);
+            span.setAttribute("existingRunId", debounceResult.run.id);
+
+            // For triggerAndWait, block the parent run with the existing run's waitpoint
+            if (resumeParentOnCompletion && parentTaskRunId && debounceResult.waitpoint) {
+              // Call the onDebounced callback to create a span and get spanIdToComplete
+              let spanIdToComplete: string | undefined;
+              if (onDebounced) {
+                spanIdToComplete = await onDebounced({
+                  existingRun: debounceResult.run,
+                  waitpoint: debounceResult.waitpoint,
+                  debounceKey: debounce.key,
+                });
+              }
+
+              await this.waitpointSystem.blockRunWithWaitpoint({
+                runId: parentTaskRunId,
+                waitpoints: debounceResult.waitpoint.id,
+                spanIdToComplete,
+                projectId: environment.project.id,
+                organizationId: environment.organization.id,
+                batch,
+                workerId,
+                runnerId,
+                tx: prisma,
+              });
+            }
+
+            return debounceResult.run;
+          }
+
+          // If max_duration_exceeded, we continue to create a new run without debouncing
+          if (debounceResult.status === "max_duration_exceeded") {
+            span.setAttribute("debounceMaxDurationExceeded", true);
+          }
+
+          // Store the claimId for later registration
+          if (debounceResult.status === "new" && debounceResult.claimId) {
+            debounceClaimId = debounceResult.claimId;
+            span.setAttribute("debounceClaimId", debounceClaimId);
+          }
+        }
+
         const status = delayUntil ? "DELAYED" : "PENDING";
 
         //create run
-        let taskRun: TaskRun;
+        let taskRun: TaskRun & { associatedWaitpoint: Waitpoint | null };
+        const taskRunId = RunId.fromFriendlyId(friendlyId);
         try {
           taskRun = await prisma.taskRun.create({
+            include: {
+              associatedWaitpoint: true,
+            },
             data: {
-              id: RunId.fromFriendlyId(friendlyId),
+              id: taskRunId,
               engine: "V2",
               status,
-              number,
               friendlyId,
               runtimeEnvironmentId: environment.id,
               environmentType: environment.type,
@@ -379,6 +546,7 @@ export class RunEngine {
               projectId: environment.project.id,
               idempotencyKey,
               idempotencyKeyExpiresAt,
+              idempotencyKeyOptions,
               taskIdentifier,
               payload,
               payloadType,
@@ -407,8 +575,8 @@ export class RunEngine {
                 tags.length === 0
                   ? undefined
                   : {
-                      connect: tags,
-                    },
+                    connect: tags,
+                  },
               runTags: tags.length === 0 ? undefined : tags.map((tag) => tag.name),
               oneTimeUseToken,
               parentTaskRunId,
@@ -427,11 +595,20 @@ export class RunEngine {
               scheduleInstanceId,
               createdAt,
               bulkActionGroupIds: bulkActionId ? [bulkActionId] : undefined,
+              planType,
+              realtimeStreamsVersion,
+              debounce: debounce
+                ? {
+                  key: debounce.key,
+                  delay: debounce.delay,
+                  createdAt: new Date(),
+                }
+                : undefined,
               executionSnapshots: {
                 create: {
                   engine: "V2",
-                  executionStatus: "RUN_CREATED",
-                  description: "Run was created",
+                  executionStatus: delayUntil ? "DELAYED" : "RUN_CREATED",
+                  description: delayUntil ? "Run is delayed" : "Run was created",
                   runStatus: status,
                   environmentId: environment.id,
                   environmentType: environment.type,
@@ -441,6 +618,12 @@ export class RunEngine {
                   runnerId,
                 },
               },
+              associatedWaitpoint: {
+                create: this.waitpointSystem.buildRunAssociatedWaitpoint({
+                  projectId: environment.project.id,
+                  environmentId: environment.id,
+                }),
+              },
             },
           });
         } catch (error) {
@@ -474,23 +657,13 @@ export class RunEngine {
 
         span.setAttribute("runId", taskRun.id);
 
-        //create associated waitpoint (this completes when the run completes)
-        const associatedWaitpoint = await this.waitpointSystem.createRunAssociatedWaitpoint(
-          prisma,
-          {
-            projectId: environment.project.id,
-            environmentId: environment.id,
-            completedByTaskRunId: taskRun.id,
-          }
-        );
-
         //triggerAndWait or batchTriggerAndWait
-        if (resumeParentOnCompletion && parentTaskRunId) {
+        if (resumeParentOnCompletion && parentTaskRunId && taskRun.associatedWaitpoint) {
           //this will block the parent run from continuing until this waitpoint is completed (and removed)
           await this.waitpointSystem.blockRunWithWaitpoint({
             runId: parentTaskRunId,
-            waitpoints: associatedWaitpoint.id,
-            projectId: associatedWaitpoint.projectId,
+            waitpoints: taskRun.associatedWaitpoint.id,
+            projectId: taskRun.associatedWaitpoint.projectId,
             organizationId: environment.organization.id,
             batch,
             workerId,
@@ -505,6 +678,27 @@ export class RunEngine {
             runId: taskRun.id,
             delayUntil: taskRun.delayUntil,
           });
+
+          // Register debounced run in Redis for future lookups
+          if (debounce) {
+            const registered = await this.debounceSystem.registerDebouncedRun({
+              runId: taskRun.id,
+              environmentId: environment.id,
+              taskIdentifier,
+              debounceKey: debounce.key,
+              delayUntil: taskRun.delayUntil,
+              claimId: debounceClaimId,
+            });
+
+            if (!registered) {
+              // We lost the claim - this shouldn't normally happen, but log it
+              this.logger.warn("trigger: lost debounce claim after creating run", {
+                runId: taskRun.id,
+                debounceKey: debounce.key,
+                claimId: debounceClaimId,
+              });
+            }
+          }
         } else {
           if (taskRun.ttl) {
             await this.ttlSystem.scheduleExpireRun({ runId: taskRun.id, ttl: taskRun.ttl });
@@ -551,6 +745,9 @@ export class RunEngine {
     workerId,
     runnerId,
     tx,
+    skipObserving,
+    blockingPop,
+    blockingPopTimeoutSeconds,
   }: {
     consumerId: string;
     workerQueue: string;
@@ -558,9 +755,14 @@ export class RunEngine {
     workerId?: string;
     runnerId?: string;
     tx?: PrismaClientOrTransaction;
+    skipObserving?: boolean;
+    blockingPop?: boolean;
+    blockingPopTimeoutSeconds?: number;
   }): Promise<DequeuedMessage[]> {
-    // We only do this with "prod" worker queues because we don't want to observe dev (e.g. environment) worker queues
-    this.runQueue.registerObservableWorkerQueue(workerQueue);
+    if (!skipObserving) {
+      // We only do this with "prod" worker queues because we don't want to observe dev (e.g. environment) worker queues
+      this.runQueue.registerObservableWorkerQueue(workerQueue);
+    }
 
     const dequeuedMessage = await this.dequeueSystem.dequeueFromWorkerQueue({
       consumerId,
@@ -569,6 +771,8 @@ export class RunEngine {
       workerId,
       runnerId,
       tx,
+      blockingPop,
+      blockingPopTimeoutSeconds,
     });
 
     if (!dequeuedMessage) {
@@ -600,6 +804,9 @@ export class RunEngine {
       workerId,
       runnerId,
       tx,
+      skipObserving: true,
+      blockingPop: true,
+      blockingPopTimeoutSeconds: 10,
     });
   }
 
@@ -866,6 +1073,92 @@ export class RunEngine {
     return this.batchSystem.scheduleCompleteBatch({ batchId });
   }
 
+  // ============================================================================
+  // BatchQueue methods (DRR-based batch processing)
+  // ============================================================================
+
+  /**
+   * Set the callback for processing batch items.
+   * This is called for each item dequeued from the batch queue.
+   */
+  setBatchProcessItemCallback(callback: ProcessBatchItemCallback): void {
+    this.batchQueue.onProcessItem(callback);
+  }
+
+  /**
+   * Set the callback for batch completion.
+   * This is called when all items in a batch have been processed.
+   */
+  setBatchCompletionCallback(callback: BatchCompletionCallback): void {
+    this.batchQueue.onBatchComplete(callback);
+  }
+
+  /**
+   * Get the remaining count of items in a batch.
+   */
+  async getBatchQueueRemainingCount(batchId: string): Promise<number> {
+    return this.batchQueue.getBatchRemainingCount(batchId);
+  }
+
+  /**
+   * Get the live progress for a batch from Redis.
+   * Returns success count, failure count, and processed count.
+   * This is useful for displaying real-time progress in the UI without
+   * hitting the database.
+   */
+  async getBatchQueueProgress(batchId: string): Promise<{
+    successCount: number;
+    failureCount: number;
+    processedCount: number;
+  } | null> {
+    return this.batchQueue.getBatchProgress(batchId);
+  }
+
+  // ============================================================================
+  // Batch Queue - 2-Phase API (v3)
+  // ============================================================================
+
+  /**
+   * Initialize a batch for 2-phase processing (Phase 1).
+   *
+   * This stores batch metadata in Redis WITHOUT enqueueing any items.
+   * Items are streamed separately via enqueueBatchItem().
+   *
+   * Use this for the v3 streaming batch API where items are sent via NDJSON stream.
+   */
+  async initializeBatch(options: InitializeBatchOptions): Promise<void> {
+    return this.batchQueue.initializeBatch(options);
+  }
+
+  /**
+   * Enqueue a single item to an existing batch (Phase 2).
+   *
+   * This is used for streaming batch item ingestion in the v3 API.
+   * Returns whether the item was enqueued (true) or deduplicated (false).
+   *
+   * @param batchId - The batch ID (internal format)
+   * @param envId - The environment ID (needed for queue routing)
+   * @param itemIndex - Zero-based index of this item
+   * @param item - The batch item to enqueue
+   * @returns Object with enqueued status
+   */
+  async enqueueBatchItem(
+    batchId: string,
+    envId: string,
+    itemIndex: number,
+    item: BatchItem
+  ): Promise<{ enqueued: boolean }> {
+    return this.batchQueue.enqueueBatchItem(batchId, envId, itemIndex, item);
+  }
+
+  /**
+   * Get the count of items that have been enqueued for a batch.
+   * Useful for progress tracking during streaming ingestion.
+   */
+  async getBatchEnqueuedCount(batchId: string): Promise<number> {
+    return this.batchQueue.getEnqueuedCount(batchId);
+  }
+
   async getWaitpoint({
     waitpointId,
     environmentId,
@@ -1054,6 +1347,10 @@ export class RunEngine {
     }
   }
 
+  async resolveTaskRunContext(runId: string): Promise<TaskRunContext> {
+    return this.runAttemptSystem.resolveTaskRunContext(runId);
+  }
+
   async getSnapshotsSince({
     runId,
     snapshotId,
@@ -1071,6 +1368,8 @@ export class RunEngine {
     } catch (e) {
       this.logger.error("Failed to getSnapshotsSince", {
         message: e instanceof Error ? e.message : e,
+        runId,
+        snapshotId,
       });
       return null;
     }
@@ -1122,18 +1421,222 @@ export class RunEngine {
 
       // This is just a failsafe
       await this.runLockRedis.quit();
+
+      // Close the batch queue and its Redis connections
+      await this.batchQueue.close();
+
+      // Close the debounce system Redis connection
+      await this.debounceSystem.quit();
     } catch (error) {
       // And should always throw
     }
   }
 
+  async repairEnvironment(environment: AuthenticatedEnvironment, dryRun: boolean) {
+    const runIds = await this.runQueue.getCurrentConcurrencyOfEnvironment(environment);
+
+    return this.#repairRuns(runIds, dryRun);
+  }
+
+  async repairQueue(
+    environment: AuthenticatedEnvironment,
+    queue: string,
+    dryRun: boolean,
+    ignoreRunIds: string[]
+  ) {
+    const runIds = await this.runQueue.getCurrentConcurrencyOfQueue(environment, queue);
+
+    const runIdsToRepair = runIds.filter((runId) => !ignoreRunIds.includes(runId));
+
+    return this.#repairRuns(runIdsToRepair, dryRun);
+  }
+
+  async #repairRuns(runIds: string[], dryRun: boolean) {
+    if (runIds.length === 0) {
+      return {
+        runIds,
+        repairs: [],
+        dryRun,
+      };
+    }
+
+    const repairs = await pMap(
+      runIds,
+      async (runId) => {
+        return this.#repairRun(runId, dryRun);
+      },
+      { concurrency: 5 }
+    );
+
+    return {
+      runIds,
+      repairs,
+      dryRun,
+    };
+  }
+
+  async #repairRun(runId: string, dryRun: boolean) {
+    const snapshot = await getLatestExecutionSnapshot(this.prisma, runId);
+
+    if (
+      snapshot.executionStatus === "QUEUED" ||
+      snapshot.executionStatus === "SUSPENDED" ||
+      snapshot.executionStatus === "FINISHED"
+    ) {
+      if (!dryRun) {
+        // Schedule the repair job
+        await this.worker.enqueueOnce({
+          id: `repair-in-progress-run:${runId}`,
+          job: "repairSnapshot",
+          payload: { runId, snapshotId: snapshot.id, executionStatus: snapshot.executionStatus },
+          availableAt: new Date(Date.now() + this.repairSnapshotTimeoutMs),
+        });
+      }
+
+      return {
+        action: "repairSnapshot",
+        runId,
+        snapshotStatus: snapshot.executionStatus,
+        snapshotId: snapshot.id,
+      };
+    }
+
+    return {
+      action: "ignore",
+      runId,
+      snapshotStatus: snapshot.executionStatus,
+      snapshotId: snapshot.id,
+    };
+  }
+
+  async generateEnvironmentReport(
+    environment: AuthenticatedEnvironment,
+    queues: ReportableQueue[],
+    verbose: boolean
+  ) {
+    const [
+      concurrencyLimit, // env limit (no burst)
+      concurrencyLimitWithBurstFactor, // env limit * burst
+      currentDequeued,
+      currentConcurrency,
+      burstFactor,
+    ] = await Promise.all([
+      this.runQueue.getEnvConcurrencyLimit(environment),
+      this.runQueue.getEnvConcurrencyLimitWithBurstFactor(environment),
+      this.runQueue.currentConcurrencyOfEnvironment(environment), // "currentDequeued" in your label terminology
+      this.runQueue.operationalCurrentConcurrencyOfEnvironment(environment),
+      this.runQueue.getEnvConcurrencyBurstFactor(environment),
+    ]);
+
+    const envMetrics = {
+      envCurrent: currentConcurrency,
+      envLimit: concurrencyLimit,
+      envLimitWithBurst: concurrencyLimitWithBurstFactor,
+      burstFactor,
+    };
+
+    const envAnalysis = analyzeEnvironment(envMetrics);
+
+    const queueReports = await pMap(
+      queues,
+      async (queue) => {
+        return this.#generateReportForQueue(environment, queue, envMetrics, verbose);
+      },
+      { concurrency: 5 }
+    );
+
+    return {
+      concurrencyLimit: {
+        value: concurrencyLimit,
+        key: verbose ? this.runQueue.keys.envConcurrencyLimitKey(environment) : undefined,
+      },
+      concurrencyLimitWithBurstFactor: {
+        value: concurrencyLimitWithBurstFactor,
+        key: verbose
+          ? this.runQueue.keys.envConcurrencyLimitBurstFactorKey(environment)
+          : undefined,
+      },
+      currentDequeued: {
+        value: currentDequeued,
+        key: verbose ? this.runQueue.keys.envCurrentDequeuedKey(environment) : undefined,
+        label: "Env current dequeued, this is what is displayed to the user",
+      },
+      currentConcurrency: {
+        value: currentConcurrency,
+        key: verbose ? this.runQueue.keys.envCurrentConcurrencyKey(environment) : undefined,
+        label:
+          "Env current concurrency, this is what is used to determine if the environment can be dequeued from",
+      },
+      analysis: envAnalysis,
+      queues: queueReports,
+    };
+  }
+
+  async #generateReportForQueue(
+    environment: AuthenticatedEnvironment,
+    queue: ReportableQueue,
+    envMetrics: EnvInputs,
+    verbose: boolean
+  ) {
+    const currentConcurrency = await this.runQueue.currentConcurrencyOfQueue(
+      environment,
+      queue.name
+    );
+    const currentDequeued = await this.runQueue.currentDequeuedOfQueue(environment, queue.name);
+    const concurrencyLimit = await this.runQueue.getQueueConcurrencyLimit(environment, queue.name);
+    const messagesDueCount = await this.runQueue.lengthOfQueueAvailableMessages(
+      environment,
+      queue.name
+    );
+
+    const queueAnalysis = analyzeQueue({
+      paused: queue.paused === true,
+      envLimit: envMetrics.envLimit,
+      envLimitWithBurst: envMetrics.envLimitWithBurst,
+      queueLimit: typeof concurrencyLimit === "number" ? concurrencyLimit : undefined,
+      queueCurrent: currentConcurrency,
+      envCurrent: envMetrics.envCurrent,
+      dueCount: messagesDueCount,
+    });
+
+    return {
+      name: queue.name,
+      friendlyId: queue.friendlyId,
+      type: queue.type,
+      paused: queue.paused,
+      dbConcurrencyLimit: queue.concurrencyLimit,
+      key: this.runQueue.keys.queueKey(environment, queue.name),
+      analysis: queueAnalysis,
+      concurrencyLimit: {
+        value: typeof concurrencyLimit === "number" ? concurrencyLimit : null,
+        key: verbose
+          ? this.runQueue.keys.queueConcurrencyLimitKey(environment, queue.name)
+          : undefined,
+      },
+      currentConcurrency: {
+        value: currentConcurrency,
+        key: verbose
+          ? this.runQueue.keys.queueCurrentConcurrencyKey(environment, queue.name)
+          : undefined,
+      },
+      currentDequeued: {
+        value: currentDequeued,
+        key: verbose
+          ? this.runQueue.keys.queueCurrentDequeuedKey(environment, queue.name)
+          : undefined,
+      },
+    };
+  }
+
   async #handleStalledSnapshot({
     runId,
     snapshotId,
+    restartAttempt,
     tx,
   }: {
     runId: string;
     snapshotId: string;
+    restartAttempt?: number;
     tx?: PrismaClientOrTransaction;
   }) {
     const prisma = tx ?? this.prisma;
@@ -1149,7 +1652,6 @@ export class RunEngine {
           }
         );
 
-        await this.worker.ack(`heartbeatSnapshot.${runId}`);
         return;
       }
 
@@ -1158,23 +1660,6 @@ export class RunEngine {
         snapshot: latestSnapshot,
       });
 
-      // For dev, we just cancel runs that are stuck
-      if (latestSnapshot.environmentType === "DEVELOPMENT") {
-        this.logger.log("RunEngine.#handleStalledSnapshot() cancelling DEV run", {
-          runId,
-          snapshot: latestSnapshot,
-        });
-
-        await this.cancelRun({
-          runId: latestSnapshot.runId,
-          finalizeRun: true,
-          reason:
-            "Run was disconnected, check you're running the CLI dev command and your network connection is healthy.",
-          tx,
-        });
-        return;
-      }
-
       switch (latestSnapshot.executionStatus) {
         case "RUN_CREATED": {
           throw new NotImplementedError("There shouldn't be a heartbeat for RUN_CREATED");
@@ -1186,6 +1671,11 @@ export class RunEngine {
           throw new NotImplementedError("There shouldn't be a heartbeat for QUEUED_EXECUTING");
         }
         case "PENDING_EXECUTING": {
+          this.logger.log("RunEngine stalled snapshot PENDING_EXECUTING", {
+            runId,
+            snapshotId: latestSnapshot.id,
+          });
+
           //the run didn't start executing, we need to requeue it
           const run = await prisma.taskRun.findFirst({
             where: { id: runId },
@@ -1219,6 +1709,9 @@ export class RunEngine {
             },
             orgId: latestSnapshot.organizationId,
             projectId: latestSnapshot.projectId,
+            checkpointId: latestSnapshot.checkpointId ?? undefined,
+            completedWaitpoints: latestSnapshot.completedWaitpoints,
+            batchId: latestSnapshot.batchId ?? undefined,
             error: {
               type: "INTERNAL_ERROR",
               code: "TASK_RUN_DEQUEUED_MAX_RETRIES",
@@ -1230,28 +1723,64 @@ export class RunEngine {
         }
         case "EXECUTING":
         case "EXECUTING_WITH_WAITPOINTS": {
+          // Stalls for production runs should start being treated as an OOM error.
+          // We should calculate the retry delay using the retry settings on the run/task instead of hardcoding it.
+          // Stalls for dev runs should keep being treated as a timeout error because the vast majority of the time these snapshots stall because
+          // they have quit the CLI
+
           const retryDelay = 250;
 
-          //todo call attemptFailed and force requeuing
+          const timeoutDuration =
+            latestSnapshot.executionStatus === "EXECUTING"
+              ? formatDurationMilliseconds(this.heartbeatTimeouts.EXECUTING)
+              : formatDurationMilliseconds(this.heartbeatTimeouts.EXECUTING_WITH_WAITPOINTS);
+
+          // Dev runs don't retry, because the vast majority of the time these snapshots stall because
+          // they have quit the CLI
+          const shouldRetry = latestSnapshot.environmentType !== "DEVELOPMENT";
+          const errorMessage =
+            latestSnapshot.environmentType === "DEVELOPMENT"
+              ? `Run timed out after ${timeoutDuration} due to missing heartbeats (sent every 30s). Check if your \`trigger.dev dev\` CLI is still running, or if CPU-heavy work is blocking the main thread.`
+              : `Run timed out after ${timeoutDuration} due to missing heartbeats (sent every 30s). This typically happens when CPU-heavy work blocks the main thread.`;
+
+          const taskStalledErrorCode =
+            latestSnapshot.executionStatus === "EXECUTING"
+              ? "TASK_RUN_STALLED_EXECUTING"
+              : "TASK_RUN_STALLED_EXECUTING_WITH_WAITPOINTS";
+
+          const error =
+            latestSnapshot.environmentType === "DEVELOPMENT"
+              ? ({
+                type: "INTERNAL_ERROR",
+                code: taskStalledErrorCode,
+                message: errorMessage,
+              } satisfies TaskRunInternalError)
+              : this.options.treatProductionExecutionStallsAsOOM
+                ? ({
+                  type: "INTERNAL_ERROR",
+                  code: "TASK_PROCESS_OOM_KILLED",
+                  message: "Run was terminated due to running out of memory",
+                } satisfies TaskRunInternalError)
+                : ({
+                  type: "INTERNAL_ERROR",
+                  code: taskStalledErrorCode,
+                  message: errorMessage,
+                } satisfies TaskRunInternalError);
+
           await this.runAttemptSystem.attemptFailed({
             runId,
             snapshotId: latestSnapshot.id,
             completion: {
               ok: false,
               id: runId,
-              error: {
-                type: "INTERNAL_ERROR",
-                code:
-                  latestSnapshot.executionStatus === "EXECUTING"
-                    ? "TASK_RUN_STALLED_EXECUTING"
-                    : "TASK_RUN_STALLED_EXECUTING_WITH_WAITPOINTS",
-                message: `Run stalled while executing. This can happen when the run becomes unresponsive, for example because the CPU is overloaded.`,
-              },
-              retry: {
-                //250ms in the future
-                timestamp: Date.now() + retryDelay,
-                delay: retryDelay,
-              },
+              error,
+              retry: shouldRetry
+                ? {
+                  //250ms in the future
+                  timestamp: Date.now() + retryDelay,
+                  delay: retryDelay,
+                }
+                : undefined,
             },
             forceRequeue: true,
             tx: prisma,
@@ -1267,11 +1796,86 @@ export class RunEngine {
             snapshotId: latestSnapshot.id,
           });
 
-          switch (result) {
+          switch (result.status) {
             case "blocked": {
+              if (!this.options.suspendedHeartbeatRetriesConfig) {
+                break;
+              }
+
+              if (result.waitpoints.length === 0) {
+                this.logger.info("handleStalledSnapshot SUSPENDED blocked but no waitpoints", {
+                  runId,
+                  result,
+                  snapshotId: latestSnapshot.id,
+                });
+                // If the run is blocked but there are no waitpoints, we don't restart the heartbeat
+                break;
+              }
+
+              const hasRunOrBatchWaitpoints = result.waitpoints.some(
+                (w) => w.type === "RUN" || w.type === "BATCH"
+              );
+
+              if (!hasRunOrBatchWaitpoints) {
+                this.logger.info(
+                  "handleStalledSnapshot SUSPENDED blocked but no run or batch waitpoints",
+                  {
+                    runId,
+                    result,
+                    snapshotId: latestSnapshot.id,
+                  }
+                );
+                // If the run is blocked by waitpoints that are not RUN or BATCH, we don't restart the heartbeat
+                break;
+              }
+
+              const initialDelayMs =
+                this.options.suspendedHeartbeatRetriesConfig.initialDelayMs ?? 60_000;
+              const $restartAttempt = (restartAttempt ?? 0) + 1; // Start at 1
+              const maxDelayMs =
+                this.options.suspendedHeartbeatRetriesConfig.maxDelayMs ?? 60_000 * 60 * 6; // 6 hours
+              const factor = this.options.suspendedHeartbeatRetriesConfig.factor ?? 2;
+              const maxCount = this.options.suspendedHeartbeatRetriesConfig.maxCount ?? 12;
+
+              if ($restartAttempt >= maxCount) {
+                this.logger.info(
+                  "handleStalledSnapshot SUSPENDED blocked with waitpoints, max retries reached",
+                  {
+                    runId,
+                    result,
+                    snapshotId: latestSnapshot.id,
+                    restartAttempt: $restartAttempt,
+                    maxCount,
+                    config: this.options.suspendedHeartbeatRetriesConfig,
+                  }
+                );
+
+                break;
+              }
+
+              // Calculate the delay based on the retry attempt
+              const delayMs = Math.min(
+                initialDelayMs * Math.pow(factor, $restartAttempt - 1),
+                maxDelayMs
+              );
+
+              this.logger.info(
+                "handleStalledSnapshot SUSPENDED blocked with waitpoints, restarting heartbeat",
+                {
+                  runId,
+                  result,
+                  snapshotId: latestSnapshot.id,
+                  delayMs,
+                  restartAttempt: $restartAttempt,
+                }
+              );
+
               // Reschedule the heartbeat
               await this.executionSnapshotSystem.restartHeartbeatForRun({
                 runId,
+                delayMs,
+                restartAttempt: $restartAttempt,
+                tx,
               });
               break;
             }
@@ -1296,6 +1900,124 @@ export class RunEngine {
         case "FINISHED": {
           throw new NotImplementedError("There shouldn't be a heartbeat for FINISHED");
         }
+        case "DELAYED": {
+          throw new NotImplementedError("There shouldn't be a heartbeat for DELAYED");
+        }
+        default: {
+          assertNever(latestSnapshot.executionStatus);
+        }
+      }
+    });
+  }
+
+  async #handleRepairSnapshot({
+    runId,
+    snapshotId,
+    executionStatus,
+  }: {
+    runId: string;
+    snapshotId: string;
+    executionStatus: string;
+  }) {
+    return await this.runLock.lock("handleRepairSnapshot", [runId], async () => {
+      const latestSnapshot = await getLatestExecutionSnapshot(this.prisma, runId);
+
+      if (latestSnapshot.id !== snapshotId) {
+        this.logger.log(
+          "RunEngine.handleRepairSnapshot no longer the latest snapshot, stopping the repair.",
+          {
+            runId,
+            snapshotId,
+            latestSnapshotExecutionStatus: latestSnapshot.executionStatus,
+            repairExecutionStatus: executionStatus,
+          }
+        );
+
+        return;
+      }
+
+      // Okay, so this means we haven't transitioned to a new status yes, so we need to do something
+      switch (latestSnapshot.executionStatus) {
+        case "EXECUTING":
+        case "EXECUTING_WITH_WAITPOINTS":
+        case "PENDING_CANCEL":
+        case "PENDING_EXECUTING":
+        case "QUEUED_EXECUTING":
+        case "RUN_CREATED":
+        case "DELAYED": {
+          // Do nothing;
+          return;
+        }
+        case "QUEUED": {
+          this.logger.log("RunEngine.handleRepairSnapshot QUEUED", {
+            runId,
+            snapshotId,
+          });
+
+          //it will automatically be requeued X times depending on the queue retry settings
+          const gotRequeued = await this.runQueue.nackMessage({
+            orgId: latestSnapshot.organizationId,
+            messageId: runId,
+          });
+
+          if (!gotRequeued) {
+            this.logger.error("RunEngine.handleRepairSnapshot QUEUED repair failed", {
+              runId,
+              snapshot: latestSnapshot,
+            });
+          } else {
+            this.logger.log("RunEngine.handleRepairSnapshot QUEUED repair successful", {
+              runId,
+              snapshot: latestSnapshot,
+            });
+          }
+
+          break;
+        }
+        case "FINISHED":
+        case "SUSPENDED": {
+          this.logger.log("RunEngine.handleRepairSnapshot SUSPENDED/FINISHED", {
+            runId,
+            snapshotId,
+          });
+
+          const taskRun = await this.prisma.taskRun.findFirst({
+            where: { id: runId },
+            select: {
+              queue: true,
+            },
+          });
+
+          if (!taskRun) {
+            this.logger.error(
+              "RunEngine.handleRepairSnapshot SUSPENDED/FINISHED task run not found",
+              {
+                runId,
+                snapshotId,
+              }
+            );
+            return;
+          }
+
+          // We need to clear this run from the current concurrency sets
+          await this.runQueue.clearMessageFromConcurrencySets({
+            runId,
+            orgId: latestSnapshot.organizationId,
+            queue: taskRun.queue,
+            env: {
+              id: latestSnapshot.environmentId,
+              type: latestSnapshot.environmentType,
+              project: {
+                id: latestSnapshot.projectId,
+              },
+              organization: {
+                id: latestSnapshot.organizationId,
+              },
+            },
+          });
+
+          break;
+        }
         default: {
           assertNever(latestSnapshot.executionStatus);
         }
@@ -1304,13 +2026,14 @@ export class RunEngine {
   }
 
   async #concurrencySweeperCallback(
-    runIds: string[]
+    runIds: string[],
+    completedAtOffsetMs: number = 1000 * 60 * 10
   ): Promise<Array<{ id: string; orgId: string }>> {
     const runs = await this.readOnlyPrisma.taskRun.findMany({
       where: {
         id: { in: runIds },
         completedAt: {
-          lte: new Date(Date.now() - 1000 * 60 * 10), // This only finds runs that were completed more than 10 minutes ago
+          lte: new Date(Date.now() - completedAtOffsetMs), // This only finds runs that were completed more than 10 minutes ago
         },
         organizationId: {
           not: null,
@@ -1342,4 +2065,107 @@ export class RunEngine {
         orgId: run.organizationId!,
       }));
   }
+
+  /**
+   * Invalidates the billing cache for an organization when their plan changes
+   * Runs in background and handles all errors internally
+   */
+  invalidateBillingCache(orgId: string): void {
+    this.billingCache.invalidate(orgId);
+  }
+}
+
+type EnvInputs = {
+  envCurrent: number;
+  envLimit: number;
+  envLimitWithBurst: number;
+  burstFactor?: number;
+};
+
+function analyzeEnvironment(inputs: EnvInputs) {
+  const { envCurrent, envLimit, envLimitWithBurst, burstFactor } = inputs;
+
+  const reasons: string[] = [];
+  const envAvailableCapacity = Math.max(0, envLimitWithBurst - envCurrent);
+  const canDequeue = envAvailableCapacity > 0;
+
+  if (!canDequeue) {
+    reasons.push(
+      `Environment concurrency (${envCurrent}) has reached the limit with burst (${envLimitWithBurst}).`
+    );
+  }
+
+  return {
+    canDequeue,
+    reasons,
+    metrics: {
+      envAvailableCapacity,
+    },
+  };
+}
+
+type QueueInputs = {
+  paused?: boolean;
+  envLimit: number;
+  envLimitWithBurst: number;
+  queueLimit?: number; // undefined => no explicit queue limit (Lua uses a huge default)
+  queueCurrent: number;
+  envCurrent: number;
+  dueCount?: number; // optional (if you implement countDueMessages)
+};
+
+function analyzeQueue(inputs: QueueInputs) {
+  const { paused, envLimit, envLimitWithBurst, queueLimit, queueCurrent, envCurrent, dueCount } =
+    inputs;
+
+  const reasons: string[] = [];
+
+  // Effective queue limit mirrors the Lua: min(queueLimit || 1_000_000, envLimit)
+  const queueLimitCapped = typeof queueLimit === "number" ? queueLimit : 1_000_000;
+  const effectiveQueueLimit = Math.min(queueLimitCapped, envLimit);
+
+  const envAvailable = Math.max(0, envLimitWithBurst - envCurrent);
+  const queueAvailable = Math.max(0, effectiveQueueLimit - queueCurrent);
+
+  // Mirror Lua's actualMaxCount = min(maxCount, envAvailable, queueAvailable).
+  // Here we only need to know if capacity exists at all (maxCount >= 1 assumed).
+  const hasCapacity = envAvailable > 0 && queueAvailable > 0;
+
+  // High-signal reasons (ordered)
+  if (paused) {
+    reasons.push("Queue is paused.");
+  }
+
+  if (envAvailable <= 0) {
+    reasons.push(
+      `Environment concurrency (${envCurrent}) has reached the limit with burst (${envLimitWithBurst}).`
+    );
+  }
+
+  if (queueAvailable <= 0) {
+    reasons.push(
+      `Queue concurrency (${queueCurrent}) has reached the effective queue limit (${effectiveQueueLimit}).`
+    );
+  }
+
+  // Optional visibility: no due messages (score > now or empty queue)
+  if (typeof dueCount === "number" && dueCount <= 0) {
+    reasons.push("No due messages in the queue (nothing scored ≤ now).");
+  }
+
+  // Final decision:
+  // - Not paused
+  // - Has capacity (both env and queue)
+  // - And (optionally) has work due
+  const canDequeue = !paused && hasCapacity && (typeof dueCount === "number" ? dueCount > 0 : true);
+
+  return {
+    canDequeue,
+    reasons: canDequeue ? [] : reasons,
+    metrics: {
+      effectiveQueueLimit,
+      queueAvailableCapacity: queueAvailable,
+      messagesDueCount: typeof dueCount === "number" ? dueCount : null,
+    },
+  };
 }
diff --git a/internal-packages/run-engine/src/engine/locking.ts b/internal-packages/run-engine/src/engine/locking.ts
index a58c0dcfdc7..299969a65e7 100644
--- a/internal-packages/run-engine/src/engine/locking.ts
+++ b/internal-packages/run-engine/src/engine/locking.ts
@@ -15,6 +15,7 @@ import {
   Attributes,
   Histogram,
 } from "@internal/tracing";
+import { ServiceValidationError } from "./errors.js";
 
 const SemanticAttributes = {
   LOCK_TYPE: "run_engine.lock.type",
@@ -144,7 +145,12 @@ export class RunLocker {
   }
 
   /** Locks resources using RedLock. It won't lock again if we're already inside a lock with the same resources. */
-  async lock<T>(name: string, resources: string[], routine: () => Promise<T>): Promise<T> {
+  async lock<T>(
+    name: string,
+    resources: string[],
+    routine: () => Promise<T>,
+    attributes?: Attributes
+  ): Promise<T> {
     const currentContext = this.asyncLocalStorage.getStore();
     const joinedResources = [...resources].sort().join(",");
 
@@ -169,6 +175,10 @@ export class RunLocker {
         );
 
         if (error) {
+          if (error instanceof ServiceValidationError) {
+            throw error;
+          }
+
           // Record failed lock acquisition
           const lockDuration = performance.now() - lockStartTime;
           this.lockDurationHistogram.record(lockDuration, {
@@ -181,13 +191,14 @@ export class RunLocker {
             resources,
             duration: this.duration,
           });
+
           throw error;
         }
 
         return result;
       },
       {
-        attributes: { name, resources, timeout: this.duration },
+        attributes: { name, resources, timeout: this.duration, ...attributes },
       }
     );
   }
@@ -217,7 +228,16 @@ export class RunLocker {
     let lastError: Error | undefined;
 
     for (let attempt = 0; attempt <= maxAttempts; attempt++) {
-      const [error, acquiredLock] = await tryCatch(this.redlock.acquire(sortedResources, duration));
+      const [error, acquiredLock] = await tryCatch(
+        startSpan(this.tracer, "RunLocker.acquireLock", async (span) => {
+          span.setAttributes({
+            resources: joinedResources,
+            attempt,
+            totalWaitTime,
+          });
+          return await this.redlock.acquire(sortedResources, duration);
+        })
+      );
 
       if (!error && acquiredLock) {
         lock = acquiredLock;
@@ -390,7 +410,15 @@ export class RunLocker {
       this.#cleanupExtension(manualContext);
 
       // Release the lock using tryCatch
-      const [releaseError] = await tryCatch(lock.release());
+      const [releaseError] = await tryCatch(
+        startSpan(this.tracer, "RunLocker.releaseLock", async (span) => {
+          span.setAttributes({
+            resources: joinedResources,
+            lockValue: lock.value,
+          });
+          return await lock.release();
+        })
+      );
       if (releaseError) {
         this.logger.warn("[RunLocker] Error releasing lock", {
           error: releaseError,
diff --git a/internal-packages/run-engine/src/engine/machinePresets.ts b/internal-packages/run-engine/src/engine/machinePresets.ts
index 4c526942a75..a2edf5b1b12 100644
--- a/internal-packages/run-engine/src/engine/machinePresets.ts
+++ b/internal-packages/run-engine/src/engine/machinePresets.ts
@@ -26,7 +26,7 @@ export function getMachinePreset({
   const parsedConfig = MachineConfig.safeParse(config);
 
   if (!parsedConfig.success) {
-    logger.error("Failed to parse machine config", { config });
+    logger.info("Failed to parse machine config", { config });
 
     return machinePresetFromName(machines, "small-1x");
   }
diff --git a/internal-packages/run-engine/src/engine/retrying.ts b/internal-packages/run-engine/src/engine/retrying.ts
index a621552e927..6099d5b649b 100644
--- a/internal-packages/run-engine/src/engine/retrying.ts
+++ b/internal-packages/run-engine/src/engine/retrying.ts
@@ -3,6 +3,7 @@ import {
   isOOMRunError,
   RetryOptions,
   sanitizeError,
+  shouldLookupRetrySettings,
   shouldRetryError,
   TaskRunError,
   taskRunErrorEnhancer,
@@ -36,6 +37,10 @@ export type RetryOutcome =
       settings: TaskRunExecutionRetry;
       machine?: string;
       wasOOMError?: boolean;
+      // Current usage values for calculating updated totals
+      usageDurationMs: number;
+      costInCents: number;
+      machinePreset: string | null;
     };
 
 export async function retryOutcomeFromCompletion(
@@ -69,16 +74,17 @@ export async function retryOutcomeFromCompletion(
       machine: oomResult.machine,
       settings: { timestamp: Date.now() + delay, delay },
       wasOOMError: true,
+      usageDurationMs: oomResult.usageDurationMs,
+      costInCents: oomResult.costInCents,
+      machinePreset: oomResult.machinePreset,
     };
   }
 
-  // No retry settings
-  if (!retrySettings) {
-    return { outcome: "fail_run", sanitizedError };
-  }
+  const enhancedError = taskRunErrorEnhancer(error);
 
   // Not a retriable error: fail
-  const retriableError = shouldRetryError(taskRunErrorEnhancer(error));
+  const retriableError = shouldRetryError(enhancedError);
+
   if (!retriableError) {
     return { outcome: "fail_run", sanitizedError };
   }
@@ -88,13 +94,17 @@ export async function retryOutcomeFromCompletion(
     return { outcome: "fail_run", sanitizedError };
   }
 
-  // Get the run settings
+  // Get the run settings and current usage values
   const run = await prisma.taskRun.findFirst({
     where: {
       id: runId,
     },
     select: {
       maxAttempts: true,
+      lockedRetryConfig: true,
+      usageDurationMs: true,
+      costInCents: true,
+      machinePreset: true,
     },
   });
 
@@ -112,17 +122,71 @@ export async function retryOutcomeFromCompletion(
     return { outcome: "fail_run", sanitizedError };
   }
 
+  // No retry settings
+  if (!retrySettings) {
+    const shouldLookup = shouldLookupRetrySettings(enhancedError);
+
+    if (!shouldLookup) {
+      return { outcome: "fail_run", sanitizedError };
+    }
+
+    const retryConfig = run.lockedRetryConfig;
+
+    if (!retryConfig) {
+      return { outcome: "fail_run", sanitizedError };
+    }
+
+    const parsedRetryConfig = RetryOptions.nullish().safeParse(retryConfig);
+
+    if (!parsedRetryConfig.success) {
+      return { outcome: "fail_run", sanitizedError };
+    }
+
+    if (!parsedRetryConfig.data) {
+      return { outcome: "fail_run", sanitizedError };
+    }
+
+    const nextDelay = calculateNextRetryDelay(parsedRetryConfig.data, attemptNumber ?? 1);
+
+    if (!nextDelay) {
+      return { outcome: "fail_run", sanitizedError };
+    }
+
+    const retrySettings = {
+      timestamp: Date.now() + nextDelay,
+      delay: nextDelay,
+    };
+
+    return {
+      outcome: "retry",
+      method: "queue", // we'll always retry on the queue because usually having no settings means something bad happened
+      settings: retrySettings,
+      usageDurationMs: run.usageDurationMs,
+      costInCents: run.costInCents,
+      machinePreset: run.machinePreset,
+    };
+  }
+
   return {
     outcome: "retry",
     method: retryUsingQueue ? "queue" : "immediate",
     settings: retrySettings,
+    usageDurationMs: run.usageDurationMs,
+    costInCents: run.costInCents,
+    machinePreset: run.machinePreset,
   };
 }
 
 async function retryOOMOnMachine(
   prisma: PrismaClientOrTransaction,
   runId: string
-): Promise<{ machine: string; retrySettings: RetryOptions } | undefined> {
+): Promise<{
+  machine: string;
+  retrySettings: RetryOptions;
+  usageDurationMs: number;
+  costInCents: number;
+  machinePreset: string | null;
+} | undefined> {
   try {
     const run = await prisma.taskRun.findFirst({
       where: {
@@ -130,19 +194,17 @@ async function retryOOMOnMachine(
       },
       select: {
         machinePreset: true,
-        lockedBy: {
-          select: {
-            retryConfig: true,
-          },
-        },
+        lockedRetryConfig: true,
+        usageDurationMs: true,
+        costInCents: true,
       },
     });
 
-    if (!run || !run.lockedBy || !run.machinePreset) {
+    if (!run || !run.lockedRetryConfig || !run.machinePreset) {
       return;
     }
 
-    const retryConfig = run.lockedBy?.retryConfig;
+    const retryConfig = run.lockedRetryConfig;
     const parsedRetryConfig = RetryOptions.nullish().safeParse(retryConfig);
 
     if (!parsedRetryConfig.success) {
@@ -163,7 +225,13 @@ async function retryOOMOnMachine(
       return;
     }
 
-    return { machine: retryMachine, retrySettings: parsedRetryConfig.data };
+    return {
+      machine: retryMachine,
+      retrySettings: parsedRetryConfig.data,
+      usageDurationMs: run.usageDurationMs,
+      costInCents: run.costInCents,
+      machinePreset: run.machinePreset,
+    };
   } catch (error) {
     console.error("[FailedTaskRunRetryHelper] Failed to get execution retry", {
       runId,
diff --git a/internal-packages/run-engine/src/engine/statuses.ts b/internal-packages/run-engine/src/engine/statuses.ts
index ce7e9c8129a..8483225623c 100644
--- a/internal-packages/run-engine/src/engine/statuses.ts
+++ b/internal-packages/run-engine/src/engine/statuses.ts
@@ -37,7 +37,7 @@ export function isFinishedOrPendingFinished(status: TaskRunExecutionStatus): boo
 }
 
 export function isInitialState(status: TaskRunExecutionStatus): boolean {
-  const startedStatuses: TaskRunExecutionStatus[] = ["RUN_CREATED"];
+  const startedStatuses: TaskRunExecutionStatus[] = ["RUN_CREATED", "DELAYED"];
   return startedStatuses.includes(status);
 }
 
diff --git a/internal-packages/run-engine/src/engine/systems/batchSystem.ts b/internal-packages/run-engine/src/engine/systems/batchSystem.ts
index 439c1acb865..9933a715162 100644
--- a/internal-packages/run-engine/src/engine/systems/batchSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/batchSystem.ts
@@ -44,6 +44,9 @@ export class BatchSystem {
           runtimeEnvironmentId: true,
           processingJobsCount: true,
           runCount: true,
+          batchVersion: true,
+          successfulRunCount: true,
+          failedRunCount: true,
         },
         where: {
           id: batchId,
@@ -60,11 +63,26 @@ export class BatchSystem {
         return;
       }
 
-      if (batch.processingJobsCount < batch.runCount) {
-        this.$.logger.debug("#tryCompleteBatch: Not all runs are created yet", {
+      // Check if all runs are created (or accounted for with failures)
+      // v2 batches use successfulRunCount + failedRunCount, v1 uses processingJobsCount
+      const isNewBatch = batch.batchVersion === "runengine:v2";
+
+      let processedRunCount: number;
+      if (isNewBatch) {
+        // For v2/v3 batches, we need to count both successful and failed runs
+        const successfulCount = batch.successfulRunCount ?? 0;
+        const failedCount = batch.failedRunCount ?? 0;
+        processedRunCount = successfulCount + failedCount;
+      } else {
+        processedRunCount = batch.processingJobsCount;
+      }
+
+      if (processedRunCount < batch.runCount) {
+        this.$.logger.debug("#tryCompleteBatch: Not all runs are processed yet", {
           batchId,
-          processingJobsCount: batch.processingJobsCount,
+          processedRunCount,
           runCount: batch.runCount,
+          isNewBatch,
         });
         return;
       }
diff --git a/internal-packages/run-engine/src/engine/systems/checkpointSystem.ts b/internal-packages/run-engine/src/engine/systems/checkpointSystem.ts
index 5c6cf2aa571..384384fd8c7 100644
--- a/internal-packages/run-engine/src/engine/systems/checkpointSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/checkpointSystem.ts
@@ -62,7 +62,7 @@ export class CheckpointSystem {
           snapshot.executionStatus === "QUEUED_EXECUTING");
 
       if (!isValidSnapshot) {
-        this.$.logger.error("Tried to createCheckpoint on an invalid snapshot", {
+        this.$.logger.info("Tried to createCheckpoint on an invalid snapshot", {
           snapshot,
           snapshotId,
         });
@@ -270,11 +270,25 @@ export class CheckpointSystem {
       const snapshot = await getLatestExecutionSnapshot(prisma, runId);
 
       if (snapshot.id !== snapshotId) {
-        throw new ServiceValidationError("Snapshot ID doesn't match the latest snapshot", 400);
+        throw new ServiceValidationError(
+          "Snapshot ID doesn't match the latest snapshot in continueRunExecution",
+          400,
+          {
+            snapshotId,
+            latestSnapshotId: snapshot.id,
+          }
+        );
       }
 
       if (!isPendingExecuting(snapshot.executionStatus)) {
-        throw new ServiceValidationError("Snapshot is not in a valid state to continue", 400);
+        throw new ServiceValidationError(
+          "Snapshot is not in a valid state to continue in continueRunExecution",
+          400,
+          {
+            snapshotId,
+            snapshotStatus: snapshot.executionStatus,
+          }
+        );
       }
 
       // Get the run and update the status
diff --git a/internal-packages/run-engine/src/engine/systems/debounceSystem.ts b/internal-packages/run-engine/src/engine/systems/debounceSystem.ts
new file mode 100644
index 00000000000..8cd06d07732
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/systems/debounceSystem.ts
@@ -0,0 +1,930 @@
+import {
+  createRedisClient,
+  Redis,
+  RedisOptions,
+  type Callback,
+  type Result,
+} from "@internal/redis";
+import { startSpan } from "@internal/tracing";
+import {
+  parseNaturalLanguageDuration,
+  parseNaturalLanguageDurationInMs,
+} from "@trigger.dev/core/v3/isomorphic";
+import { PrismaClientOrTransaction, TaskRun, Waitpoint } from "@trigger.dev/database";
+import { nanoid } from "nanoid";
+import { SystemResources } from "./systems.js";
+import { ExecutionSnapshotSystem, getLatestExecutionSnapshot } from "./executionSnapshotSystem.js";
+import { DelayedRunSystem } from "./delayedRunSystem.js";
+
+export type DebounceOptions = {
+  key: string;
+  delay: string;
+  mode?: "leading" | "trailing";
+  /**
+   * Maximum total delay before the run must execute, regardless of subsequent triggers.
+   * This prevents indefinite delays when continuous triggers keep pushing the execution time.
+   * If not specified, falls back to the server's maxDebounceDurationMs config.
+   */
+  maxDelay?: string;
+  /** When mode: "trailing", these fields will be used to update the existing run */
+  updateData?: {
+    payload: string;
+    payloadType: string;
+    metadata?: string;
+    metadataType?: string;
+    tags?: { id: string; name: string }[];
+    maxAttempts?: number;
+    maxDurationInSeconds?: number;
+    machine?: string;
+  };
+};
+
+export type DebounceSystemOptions = {
+  resources: SystemResources;
+  redis: RedisOptions;
+  executionSnapshotSystem: ExecutionSnapshotSystem;
+  delayedRunSystem: DelayedRunSystem;
+  maxDebounceDurationMs: number;
+};
+
+export type DebounceResult =
+  | {
+      status: "new";
+      claimId?: string; // Present when we claimed the key atomically
+    }
+  | {
+      status: "existing";
+      run: TaskRun;
+      waitpoint: Waitpoint | null;
+    }
+  | {
+      status: "max_duration_exceeded";
+    };
+
+// TTL for the pending claim state (30 seconds)
+const CLAIM_TTL_MS = 30_000;
+// Max retries when waiting for another server to complete its claim
+const MAX_CLAIM_RETRIES = 10;
+// Delay between retries when waiting for pending claim
+const CLAIM_RETRY_DELAY_MS = 50;
+
+export type DebounceData = {
+  key: string;
+  delay: string;
+  createdAt: Date;
+};
+
+/**
+ * DebounceSystem handles debouncing of task triggers.
+ *
+ * When a run is triggered with a debounce key, if an existing run with the same key
+ * is still in the DELAYED execution status, the new trigger "pushes" the existing
+ * run's execution time later rather than creating a new run.
+ *
+ * The debounce key mapping is stored in Redis for fast lookups (to avoid database indexes).
+ */
+export class DebounceSystem {
+  private readonly $: SystemResources;
+  private readonly redis: Redis;
+  private readonly executionSnapshotSystem: ExecutionSnapshotSystem;
+  private readonly delayedRunSystem: DelayedRunSystem;
+  private readonly maxDebounceDurationMs: number;
+
+  constructor(options: DebounceSystemOptions) {
+    this.$ = options.resources;
+    this.redis = createRedisClient(
+      {
+        ...options.redis,
+        keyPrefix: `${options.redis.keyPrefix ?? ""}debounce:`,
+      },
+      {
+        onError: (error) => {
+          this.$.logger.error("DebounceSystem redis client error:", { error });
+        },
+      }
+    );
+    this.executionSnapshotSystem = options.executionSnapshotSystem;
+    this.delayedRunSystem = options.delayedRunSystem;
+    this.maxDebounceDurationMs = options.maxDebounceDurationMs;
+
+    this.#registerCommands();
+  }
+
+  #registerCommands() {
+    // Atomically deletes a key only if its value starts with "pending:".
+    // Returns [1, nil] if deleted (was pending or didn't exist)
+    // Returns [0, value] if not deleted (has a run ID)
+    // This prevents the race condition where between checking "still pending?"
+    // and calling DEL, the original server could complete and register a valid run ID.
+    this.redis.defineCommand("conditionallyDeletePendingKey", {
+      numberOfKeys: 1,
+      lua: `
+local value = redis.call('GET', KEYS[1])
+if not value then
+  return { 1, nil }
+end
+if string.sub(value, 1, 8) == 'pending:' then
+  redis.call('DEL', KEYS[1])
+  return { 1, nil }
+end
+return { 0, value }
+      `,
+    });
+
+    // Atomically sets runId only if current value equals expected pending claim.
+    // This prevents the TOCTOU race condition where between GET (check claim) and SET (register),
+    // another server could claim and register a different run, which would get overwritten.
+    // Returns 1 if set succeeded, 0 if claim mismatch (lost the claim).
+    this.redis.defineCommand("registerIfClaimOwned", {
+      numberOfKeys: 1,
+      lua: `
+local value = redis.call('GET', KEYS[1])
+if value == ARGV[1] then
+  redis.call('SET', KEYS[1], ARGV[2], 'PX', ARGV[3])
+  return 1
+end
+return 0
+      `,
+    });
+  }
+
+  /**
+   * Gets the Redis key for a debounce lookup.
+   * Key pattern: {envId}:{taskId}:{debounceKey}
+   */
+  private getDebounceRedisKey(envId: string, taskId: string, debounceKey: string): string {
+    return `${envId}:${taskId}:${debounceKey}`;
+  }
+
+  /**
+   * Atomically deletes a key only if its value still starts with "pending:".
+   * This prevents the race condition where between the final GET check and DEL,
+   * the original server could complete and register a valid run ID.
+   *
+   * @returns { deleted: true } if the key was deleted or didn't exist
+   * @returns { deleted: false, existingRunId: string } if the key has a valid run ID
+   */
+  private async conditionallyDeletePendingKey(
+    redisKey: string
+  ): Promise<{ deleted: true } | { deleted: false; existingRunId: string }> {
+    const result = await this.redis.conditionallyDeletePendingKey(redisKey);
+
+    if (!result) {
+      // Should not happen, but treat as deleted if no result
+      return { deleted: true };
+    }
+
+    const [wasDeleted, currentValue] = result;
+
+    if (wasDeleted === 1) {
+      return { deleted: true };
+    }
+
+    // Key exists with a valid run ID
+    return { deleted: false, existingRunId: currentValue! };
+  }
+
+  /**
+   * Atomically claims a debounce key using SET NX.
+   * This prevents the race condition where two servers both check for an existing
+   * run, find none, and both create new runs.
+   *
+   * Returns:
+   * - { claimed: true } if we successfully claimed the key
+   * - { claimed: false, existingRunId: string } if key exists with a run ID
+   * - { claimed: false, existingRunId: null } if key exists but is pending (another server is creating)
+   */
+  private async claimDebounceKey({
+    environmentId,
+    taskIdentifier,
+    debounceKey,
+    claimId,
+    ttlMs,
+  }: {
+    environmentId: string;
+    taskIdentifier: string;
+    debounceKey: string;
+    claimId: string;
+    ttlMs: number;
+  }): Promise<{ claimed: true } | { claimed: false; existingRunId: string | null }> {
+    const redisKey = this.getDebounceRedisKey(environmentId, taskIdentifier, debounceKey);
+
+    // Try to claim with SET NX (only succeeds if key doesn't exist)
+    const result = await this.redis.set(redisKey, `pending:${claimId}`, "PX", ttlMs, "NX");
+
+    if (result === "OK") {
+      this.$.logger.debug("claimDebounceKey: claimed key", {
+        redisKey,
+        claimId,
+        debounceKey,
+      });
+      return { claimed: true };
+    }
+
+    // Claim failed - get existing value
+    const existingValue = await this.redis.get(redisKey);
+
+    if (!existingValue) {
+      // Key expired between SET and GET - rare race, return null to trigger retry
+      this.$.logger.debug("claimDebounceKey: key expired between SET and GET", {
+        redisKey,
+        debounceKey,
+      });
+      return { claimed: false, existingRunId: null };
+    }
+
+    if (existingValue.startsWith("pending:")) {
+      // Another server is creating the run - return null to trigger wait/retry
+      this.$.logger.debug("claimDebounceKey: key is pending (another server is creating)", {
+        redisKey,
+        debounceKey,
+        existingValue,
+      });
+      return { claimed: false, existingRunId: null };
+    }
+
+    // It's a run ID
+    this.$.logger.debug("claimDebounceKey: found existing run", {
+      redisKey,
+      debounceKey,
+      existingRunId: existingValue,
+    });
+    return { claimed: false, existingRunId: existingValue };
+  }
+
+  /**
+   * Atomically claims the debounce key before returning "new".
+   * This prevents the race condition where returning "new" without a claimId
+   * allows registerDebouncedRun to do a plain SET that can overwrite another server's registration.
+   *
+   * This method is called when we've determined there's no valid existing run but need
+   * to safely claim the key before creating a new one.
+   */
+  private async claimKeyForNewRun({
+    environmentId,
+    taskIdentifier,
+    debounce,
+    tx,
+  }: {
+    environmentId: string;
+    taskIdentifier: string;
+    debounce: DebounceOptions;
+    tx?: PrismaClientOrTransaction;
+  }): Promise<DebounceResult> {
+    const redisKey = this.getDebounceRedisKey(environmentId, taskIdentifier, debounce.key);
+    const claimId = nanoid(16);
+
+    const claimResult = await this.claimDebounceKey({
+      environmentId,
+      taskIdentifier,
+      debounceKey: debounce.key,
+      claimId,
+      ttlMs: CLAIM_TTL_MS,
+    });
+
+    if (claimResult.claimed) {
+      this.$.logger.debug("claimKeyForNewRun: claimed key, returning new", {
+        debounceKey: debounce.key,
+        taskIdentifier,
+        environmentId,
+        claimId,
+      });
+      return { status: "new", claimId };
+    }
+
+    if (claimResult.existingRunId) {
+      // Another server registered a run while we were processing - handle it
+      this.$.logger.debug("claimKeyForNewRun: found existing run, handling it", {
+        debounceKey: debounce.key,
+        existingRunId: claimResult.existingRunId,
+      });
+      return await this.handleExistingRun({
+        existingRunId: claimResult.existingRunId,
+        redisKey,
+        environmentId,
+        taskIdentifier,
+        debounce,
+        tx,
+      });
+    }
+
+    // Another server is creating (pending state) - wait for it
+    this.$.logger.debug("claimKeyForNewRun: key is pending, waiting for existing run", {
+      debounceKey: debounce.key,
+    });
+    return await this.waitForExistingRun({
+      environmentId,
+      taskIdentifier,
+      debounce,
+      tx,
+    });
+  }
+
+  /**
+   * Waits for another server to complete its claim and register a run ID.
+   * Used when we detect a "pending" state, meaning another server has claimed
+   * the key but hasn't yet created the run.
+   */
+  private async waitForExistingRun({
+    environmentId,
+    taskIdentifier,
+    debounce,
+    tx,
+  }: {
+    environmentId: string;
+    taskIdentifier: string;
+    debounce: DebounceOptions;
+    tx?: PrismaClientOrTransaction;
+  }): Promise<DebounceResult> {
+    const redisKey = this.getDebounceRedisKey(environmentId, taskIdentifier, debounce.key);
+
+    for (let i = 0; i < MAX_CLAIM_RETRIES; i++) {
+      await new Promise((resolve) => setTimeout(resolve, CLAIM_RETRY_DELAY_MS));
+
+      const value = await this.redis.get(redisKey);
+
+      if (!value) {
+        // Key expired or was deleted - atomically claim before returning "new"
+        this.$.logger.debug("waitForExistingRun: key expired/deleted, claiming key", {
+          redisKey,
+          debounceKey: debounce.key,
+          attempt: i + 1,
+        });
+        return await this.claimKeyForNewRun({
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      }
+
+      if (!value.startsWith("pending:")) {
+        // It's a run ID now - proceed with reschedule logic
+        this.$.logger.debug("waitForExistingRun: found run ID, handling existing run", {
+          redisKey,
+          debounceKey: debounce.key,
+          existingRunId: value,
+          attempt: i + 1,
+        });
+        return await this.handleExistingRun({
+          existingRunId: value,
+          redisKey,
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      }
+
+      this.$.logger.debug("waitForExistingRun: still pending, retrying", {
+        redisKey,
+        debounceKey: debounce.key,
+        attempt: i + 1,
+        value,
+      });
+    }
+
+    // Timed out waiting - the other server may have failed
+    // Conditionally delete the key only if it's still pending
+    // This prevents the race where the original server completed between our last check and now
+    this.$.logger.warn(
+      "waitForExistingRun: timed out waiting for pending claim, attempting conditional delete",
+      {
+        redisKey,
+        debounceKey: debounce.key,
+      }
+    );
+
+    const deleteResult = await this.conditionallyDeletePendingKey(redisKey);
+
+    if (deleteResult.deleted) {
+      // Key was pending (or didn't exist) - atomically claim before returning "new"
+      this.$.logger.debug("waitForExistingRun: stale pending key deleted, claiming key", {
+        redisKey,
+        debounceKey: debounce.key,
+      });
+      return await this.claimKeyForNewRun({
+        environmentId,
+        taskIdentifier,
+        debounce,
+        tx,
+      });
+    }
+
+    // Key now has a valid run ID - the original server completed!
+    // Handle the existing run instead of creating a duplicate
+    this.$.logger.debug(
+      "waitForExistingRun: original server completed during timeout, handling existing run",
+      {
+        redisKey,
+        debounceKey: debounce.key,
+        existingRunId: deleteResult.existingRunId,
+      }
+    );
+    return await this.handleExistingRun({
+      existingRunId: deleteResult.existingRunId,
+      redisKey,
+      environmentId,
+      taskIdentifier,
+      debounce,
+      tx,
+    });
+  }
+
+  /**
+   * Handles an existing debounced run by locking it and rescheduling.
+   * Extracted to be reusable by both handleDebounce and waitForExistingRun.
+   */
+  private async handleExistingRun({
+    existingRunId,
+    redisKey,
+    environmentId,
+    taskIdentifier,
+    debounce,
+    tx,
+  }: {
+    existingRunId: string;
+    redisKey: string;
+    environmentId: string;
+    taskIdentifier: string;
+    debounce: DebounceOptions;
+    tx?: PrismaClientOrTransaction;
+  }): Promise<DebounceResult> {
+    return await this.$.runLock.lock("handleDebounce", [existingRunId], async () => {
+      const prisma = tx ?? this.$.prisma;
+
+      // Get the latest execution snapshot
+      let snapshot;
+      try {
+        snapshot = await getLatestExecutionSnapshot(prisma, existingRunId);
+      } catch (error) {
+        // Run no longer exists or has no snapshot
+        this.$.logger.debug("handleExistingRun: existing run not found or has no snapshot", {
+          existingRunId,
+          debounceKey: debounce.key,
+          error,
+        });
+        // Clean up stale Redis key and atomically claim before returning "new"
+        await this.redis.del(redisKey);
+        return await this.claimKeyForNewRun({
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      }
+
+      // Check if run is still in DELAYED status (or legacy RUN_CREATED for older runs)
+      if (snapshot.executionStatus !== "DELAYED" && snapshot.executionStatus !== "RUN_CREATED") {
+        this.$.logger.debug("handleExistingRun: existing run is no longer delayed", {
+          existingRunId,
+          executionStatus: snapshot.executionStatus,
+          debounceKey: debounce.key,
+        });
+        // Clean up Redis key and atomically claim before returning "new"
+        await this.redis.del(redisKey);
+        return await this.claimKeyForNewRun({
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      }
+
+      // Get the run to check debounce metadata and createdAt
+      const existingRun = await prisma.taskRun.findFirst({
+        where: { id: existingRunId },
+        include: {
+          associatedWaitpoint: true,
+        },
+      });
+
+      if (!existingRun) {
+        this.$.logger.debug("handleExistingRun: existing run not found in database", {
+          existingRunId,
+          debounceKey: debounce.key,
+        });
+        // Clean up stale Redis key and atomically claim before returning "new"
+        await this.redis.del(redisKey);
+        return await this.claimKeyForNewRun({
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      }
+
+      // Calculate new delay - parseNaturalLanguageDuration returns a Date (now + duration)
+      const newDelayUntil = parseNaturalLanguageDuration(debounce.delay);
+      if (!newDelayUntil) {
+        this.$.logger.error("handleExistingRun: invalid delay duration", {
+          delay: debounce.delay,
+        });
+        // Invalid delay but we still need to atomically claim before returning "new"
+        return await this.claimKeyForNewRun({
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      }
+
+      // Check if max debounce duration would be exceeded
+      // Use per-trigger maxDelay if provided, otherwise use global config
+      let maxDurationMs = this.maxDebounceDurationMs;
+      if (debounce.maxDelay) {
+        const parsedMaxDelay = parseNaturalLanguageDurationInMs(debounce.maxDelay);
+        if (parsedMaxDelay !== undefined) {
+          maxDurationMs = parsedMaxDelay;
+        } else {
+          this.$.logger.warn("handleExistingRun: invalid maxDelay duration, using global config", {
+            maxDelay: debounce.maxDelay,
+            fallbackMs: this.maxDebounceDurationMs,
+          });
+        }
+      }
+
+      const runCreatedAt = existingRun.createdAt;
+      const maxDelayUntil = new Date(runCreatedAt.getTime() + maxDurationMs);
+
+      if (newDelayUntil > maxDelayUntil) {
+        this.$.logger.debug("handleExistingRun: max debounce duration would be exceeded", {
+          existingRunId,
+          debounceKey: debounce.key,
+          runCreatedAt,
+          newDelayUntil,
+          maxDelayUntil,
+          maxDurationMs,
+          maxDelayProvided: debounce.maxDelay,
+        });
+        // Clean up Redis key since this debounce window is closed
+        await this.redis.del(redisKey);
+        return { status: "max_duration_exceeded" };
+      }
+
+      // Only reschedule if the new delay would push the run later
+      // This ensures debounce always "pushes later", never earlier
+      const currentDelayUntil = existingRun.delayUntil;
+      const shouldReschedule = !currentDelayUntil || newDelayUntil > currentDelayUntil;
+
+      if (shouldReschedule) {
+        // Reschedule the delayed run
+        await this.delayedRunSystem.rescheduleDelayedRun({
+          runId: existingRunId,
+          delayUntil: newDelayUntil,
+          tx: prisma,
+        });
+
+        // Update Redis TTL
+        const ttlMs = Math.max(
+          newDelayUntil.getTime() - Date.now() + 60_000, // Add 1 minute buffer
+          60_000
+        );
+        await this.redis.pexpire(redisKey, ttlMs);
+
+        this.$.logger.debug("handleExistingRun: rescheduled existing debounced run", {
+          existingRunId,
+          debounceKey: debounce.key,
+          newDelayUntil,
+        });
+      } else {
+        this.$.logger.debug(
+          "handleExistingRun: skipping reschedule, new delay is not later than current",
+          {
+            existingRunId,
+            debounceKey: debounce.key,
+            currentDelayUntil,
+            newDelayUntil,
+          }
+        );
+      }
+
+      // Update run data when mode is "trailing"
+      let updatedRun = existingRun;
+      if (debounce.mode === "trailing" && debounce.updateData) {
+        updatedRun = await this.#updateRunForTrailingMode({
+          runId: existingRunId,
+          updateData: debounce.updateData,
+          tx: prisma,
+        });
+
+        this.$.logger.debug("handleExistingRun: updated run data for trailing mode", {
+          existingRunId,
+          debounceKey: debounce.key,
+        });
+      }
+
+      return {
+        status: "existing",
+        run: updatedRun,
+        waitpoint: existingRun.associatedWaitpoint,
+      };
+    });
+  }
+
+  /**
+   * Called during trigger to check for an existing debounced run.
+   * If found and still in DELAYED status, reschedules it and returns the existing run.
+   *
+   * Uses atomic SET NX to prevent the distributed race condition where two servers
+   * both check for an existing run, find none, and both create new runs.
+   *
+   * Note: This method does NOT handle blocking parent runs for triggerAndWait.
+   * The caller (RunEngine.trigger) is responsible for blocking using waitpointSystem.blockRunWithWaitpoint().
+   */
+  async handleDebounce({
+    environmentId,
+    taskIdentifier,
+    debounce,
+    tx,
+  }: {
+    environmentId: string;
+    taskIdentifier: string;
+    debounce: DebounceOptions;
+    tx?: PrismaClientOrTransaction;
+  }): Promise<DebounceResult> {
+    return startSpan(
+      this.$.tracer,
+      "handleDebounce",
+      async (span) => {
+        span.setAttribute("debounceKey", debounce.key);
+        span.setAttribute("taskIdentifier", taskIdentifier);
+        span.setAttribute("environmentId", environmentId);
+
+        const redisKey = this.getDebounceRedisKey(environmentId, taskIdentifier, debounce.key);
+        const claimId = nanoid(16); // Unique ID for this claim attempt
+
+        // Try to atomically claim the debounce key
+        const claimResult = await this.claimDebounceKey({
+          environmentId,
+          taskIdentifier,
+          debounceKey: debounce.key,
+          claimId,
+          ttlMs: CLAIM_TTL_MS,
+        });
+
+        if (claimResult.claimed) {
+          // We successfully claimed the key - return "new" to create the run
+          // Caller will call registerDebouncedRun after creating the run
+          this.$.logger.debug("handleDebounce: claimed key, returning new", {
+            debounceKey: debounce.key,
+            taskIdentifier,
+            environmentId,
+            claimId,
+          });
+          span.setAttribute("claimed", true);
+          span.setAttribute("claimId", claimId);
+          return { status: "new", claimId };
+        }
+
+        if (!claimResult.existingRunId) {
+          // Another server is creating - wait and retry to get the run ID
+          this.$.logger.debug("handleDebounce: key is pending, waiting for existing run", {
+            debounceKey: debounce.key,
+            taskIdentifier,
+            environmentId,
+          });
+          span.setAttribute("waitingForPending", true);
+          return await this.waitForExistingRun({
+            environmentId,
+            taskIdentifier,
+            debounce,
+            tx,
+          });
+        }
+
+        // Found existing run - lock and reschedule
+        span.setAttribute("existingRunId", claimResult.existingRunId);
+        return await this.handleExistingRun({
+          existingRunId: claimResult.existingRunId,
+          redisKey,
+          environmentId,
+          taskIdentifier,
+          debounce,
+          tx,
+        });
+      },
+      {
+        attributes: {
+          environmentId,
+          taskIdentifier,
+          debounceKey: debounce.key,
+        },
+      }
+    );
+  }
+
+  /**
+   * Stores the debounce key -> runId mapping after creating a new debounced run.
+   *
+   * If claimId is provided, verifies we still own the pending claim before registering.
+   * This prevents a race where our claim expired and another server took over.
+   *
+   * @returns true if registration succeeded, false if we lost the claim
+   */
+  async registerDebouncedRun({
+    runId,
+    environmentId,
+    taskIdentifier,
+    debounceKey,
+    delayUntil,
+    claimId,
+  }: {
+    runId: string;
+    environmentId: string;
+    taskIdentifier: string;
+    debounceKey: string;
+    delayUntil: Date;
+    claimId?: string;
+  }): Promise<boolean> {
+    return startSpan(
+      this.$.tracer,
+      "registerDebouncedRun",
+      async (span) => {
+        const redisKey = this.getDebounceRedisKey(environmentId, taskIdentifier, debounceKey);
+
+        // Calculate TTL: delay until + buffer
+        const ttlMs = Math.max(
+          delayUntil.getTime() - Date.now() + 60_000, // Add 1 minute buffer
+          60_000
+        );
+
+        if (claimId) {
+          // Use atomic Lua script to verify claim and set runId in one operation.
+          // This prevents the TOCTOU race where another server could claim and register
+          // between our GET check and SET.
+          const result = await this.redis.registerIfClaimOwned(
+            redisKey,
+            `pending:${claimId}`,
+            runId,
+            ttlMs.toString()
+          );
+
+          if (result === 0) {
+            // We lost the claim - another server took over or it expired
+            this.$.logger.warn("registerDebouncedRun: lost claim, not registering", {
+              runId,
+              environmentId,
+              taskIdentifier,
+              debounceKey,
+              claimId,
+            });
+            span.setAttribute("claimLost", true);
+            return false;
+          }
+        } else {
+          // No claim to verify, just set directly
+          await this.redis.set(redisKey, runId, "PX", ttlMs);
+        }
+
+        this.$.logger.debug("registerDebouncedRun: stored debounce key mapping", {
+          runId,
+          environmentId,
+          taskIdentifier,
+          debounceKey,
+          delayUntil,
+          ttlMs,
+          claimId,
+        });
+
+        span.setAttribute("registered", true);
+        return true;
+      },
+      {
+        attributes: {
+          runId,
+          environmentId,
+          taskIdentifier,
+          debounceKey,
+          claimId: claimId ?? "none",
+        },
+      }
+    );
+  }
+
+  /**
+   * Clears the debounce key when a run is enqueued or completed.
+   */
+  async clearDebounceKey({
+    environmentId,
+    taskIdentifier,
+    debounceKey,
+  }: {
+    environmentId: string;
+    taskIdentifier: string;
+    debounceKey: string;
+  }): Promise<void> {
+    const redisKey = this.getDebounceRedisKey(environmentId, taskIdentifier, debounceKey);
+    await this.redis.del(redisKey);
+
+    this.$.logger.debug("clearDebounceKey: cleared debounce key mapping", {
+      environmentId,
+      taskIdentifier,
+      debounceKey,
+    });
+  }
+
+  /**
+   * Updates a run's data for trailing mode debounce.
+   * Updates: payload, metadata, tags, maxAttempts, maxDurationInSeconds, machinePreset
+   */
+  async #updateRunForTrailingMode({
+    runId,
+    updateData,
+    tx,
+  }: {
+    runId: string;
+    updateData: NonNullable<DebounceOptions["updateData"]>;
+    tx?: PrismaClientOrTransaction;
+  }): Promise<TaskRun & { associatedWaitpoint: Waitpoint | null }> {
+    const prisma = tx ?? this.$.prisma;
+
+    // Build the update object
+    const updatePayload: {
+      payload: string;
+      payloadType: string;
+      metadata?: string;
+      metadataType?: string;
+      maxAttempts?: number;
+      maxDurationInSeconds?: number;
+      machinePreset?: string;
+      runTags?: string[];
+      tags?: {
+        set: { id: string }[];
+      };
+    } = {
+      payload: updateData.payload,
+      payloadType: updateData.payloadType,
+    };
+
+    if (updateData.metadata !== undefined) {
+      updatePayload.metadata = updateData.metadata;
+      updatePayload.metadataType = updateData.metadataType ?? "application/json";
+    }
+
+    if (updateData.maxAttempts !== undefined) {
+      updatePayload.maxAttempts = updateData.maxAttempts;
+    }
+
+    if (updateData.maxDurationInSeconds !== undefined) {
+      updatePayload.maxDurationInSeconds = updateData.maxDurationInSeconds;
+    }
+
+    if (updateData.machine !== undefined) {
+      updatePayload.machinePreset = updateData.machine;
+    }
+
+    // Handle tags update - replace existing tags
+    if (updateData.tags !== undefined) {
+      updatePayload.runTags = updateData.tags.map((t) => t.name);
+      updatePayload.tags = {
+        set: updateData.tags.map((t) => ({ id: t.id })),
+      };
+    }
+
+    const updatedRun = await prisma.taskRun.update({
+      where: { id: runId },
+      data: updatePayload,
+      include: {
+        associatedWaitpoint: true,
+      },
+    });
+
+    return updatedRun;
+  }
+
+  async quit(): Promise<void> {
+    await this.redis.quit();
+  }
+}
+
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    /**
+     * Atomically deletes a key only if its value starts with "pending:".
+     * @returns [1, nil] if deleted (was pending or didn't exist)
+     * @returns [0, value] if not deleted (has a run ID)
+     */
+    conditionallyDeletePendingKey(
+      key: string,
+      callback?: Callback<[number, string | null]>
+    ): Result<[number, string | null], Context>;
+
+    /**
+     * Atomically sets runId only if current value equals expected pending claim.
+     * Prevents TOCTOU race condition between claim verification and registration.
+     * @param key - The Redis key
+     * @param expectedClaim - Expected value "pending:{claimId}"
+     * @param runId - The new value (run ID) to set
+     * @param ttlMs - TTL in milliseconds
+     * @returns 1 if set succeeded, 0 if claim mismatch
+     */
+    registerIfClaimOwned(
+      key: string,
+      expectedClaim: string,
+      runId: string,
+      ttlMs: string,
+      callback?: Callback<number>
+    ): Result<number, Context>;
+  }
+}
diff --git a/internal-packages/run-engine/src/engine/systems/delayedRunSystem.ts b/internal-packages/run-engine/src/engine/systems/delayedRunSystem.ts
index e3dca4b5449..740ce1a849f 100644
--- a/internal-packages/run-engine/src/engine/systems/delayedRunSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/delayedRunSystem.ts
@@ -40,8 +40,11 @@ export class DelayedRunSystem {
         return await this.$.runLock.lock("rescheduleDelayedRun", [runId], async () => {
           const snapshot = await getLatestExecutionSnapshot(prisma, runId);
 
-          //if the run isn't just created then we can't reschedule it
-          if (snapshot.executionStatus !== "RUN_CREATED") {
+          // Check if the run is still in DELAYED status (or legacy RUN_CREATED for older runs)
+          if (
+            snapshot.executionStatus !== "DELAYED" &&
+            snapshot.executionStatus !== "RUN_CREATED"
+          ) {
             throw new ServiceValidationError("Cannot reschedule a run that is not delayed");
           }
 
@@ -54,9 +57,9 @@ export class DelayedRunSystem {
               executionSnapshots: {
                 create: {
                   engine: "V2",
-                  executionStatus: "RUN_CREATED",
+                  executionStatus: "DELAYED",
                   description: "Delayed run was rescheduled to a future date",
-                  runStatus: "EXPIRED",
+                  runStatus: "DELAYED",
                   environmentId: snapshot.environmentId,
                   environmentType: snapshot.environmentType,
                   projectId: snapshot.projectId,
@@ -98,71 +101,101 @@ export class DelayedRunSystem {
   }
 
   async enqueueDelayedRun({ runId }: { runId: string }) {
-    const run = await this.$.prisma.taskRun.findFirst({
-      where: { id: runId },
-      include: {
-        runtimeEnvironment: {
-          include: {
-            project: true,
-            organization: true,
+    // Use lock to prevent race with debounce rescheduling
+    return await this.$.runLock.lock("enqueueDelayedRun", [runId], async () => {
+      // Check if run is still in DELAYED status before enqueuing
+      // This prevents a race where debounce reschedules the run while we're about to enqueue it
+      const snapshot = await getLatestExecutionSnapshot(this.$.prisma, runId);
+
+      if (snapshot.executionStatus !== "DELAYED" && snapshot.executionStatus !== "RUN_CREATED") {
+        this.$.logger.debug("enqueueDelayedRun: run is no longer delayed, skipping enqueue", {
+          runId,
+          executionStatus: snapshot.executionStatus,
+        });
+        return;
+      }
+
+      const run = await this.$.prisma.taskRun.findFirst({
+        where: { id: runId },
+        include: {
+          runtimeEnvironment: {
+            include: {
+              project: true,
+              organization: true,
+            },
           },
         },
-      },
-    });
-
-    if (!run) {
-      throw new Error(`#enqueueDelayedRun: run not found: ${runId}`);
-    }
+      });
 
-    // Now we need to enqueue the run into the RunQueue
-    await this.enqueueSystem.enqueueRun({
-      run,
-      env: run.runtimeEnvironment,
-      batchId: run.batchId ?? undefined,
-    });
-
-    const queuedAt = new Date();
+      if (!run) {
+        throw new Error(`#enqueueDelayedRun: run not found: ${runId}`);
+      }
 
-    const updatedRun = await this.$.prisma.taskRun.update({
-      where: { id: runId },
-      data: {
-        status: "PENDING",
-        queuedAt,
-      },
-    });
+      // Check if delayUntil has been rescheduled to the future (e.g., by debounce)
+      // If so, don't enqueue - the rescheduled worker job will handle it
+      if (run.delayUntil && run.delayUntil > new Date()) {
+        this.$.logger.debug(
+          "enqueueDelayedRun: delay was rescheduled to the future, skipping enqueue",
+          {
+            runId,
+            delayUntil: run.delayUntil,
+          }
+        );
+        return;
+      }
 
-    this.$.eventBus.emit("runEnqueuedAfterDelay", {
-      time: new Date(),
-      run: {
-        id: runId,
-        status: "PENDING",
-        queuedAt,
-        updatedAt: updatedRun.updatedAt,
-        createdAt: updatedRun.createdAt,
-      },
-      organization: {
-        id: run.runtimeEnvironment.organizationId,
-      },
-      project: {
-        id: run.runtimeEnvironment.projectId,
-      },
-      environment: {
-        id: run.runtimeEnvironmentId,
-      },
-    });
+      // Now we need to enqueue the run into the RunQueue
+      // Skip the lock in enqueueRun since we already hold it
+      await this.enqueueSystem.enqueueRun({
+        run,
+        env: run.runtimeEnvironment,
+        batchId: run.batchId ?? undefined,
+        skipRunLock: true,
+      });
+
+      const queuedAt = new Date();
+
+      const updatedRun = await this.$.prisma.taskRun.update({
+        where: { id: runId },
+        data: {
+          status: "PENDING",
+          queuedAt,
+        },
+      });
+
+      this.$.eventBus.emit("runEnqueuedAfterDelay", {
+        time: new Date(),
+        run: {
+          id: runId,
+          status: "PENDING",
+          queuedAt,
+          updatedAt: updatedRun.updatedAt,
+          createdAt: updatedRun.createdAt,
+        },
+        organization: {
+          id: run.runtimeEnvironment.organizationId,
+        },
+        project: {
+          id: run.runtimeEnvironment.projectId,
+        },
+        environment: {
+          id: run.runtimeEnvironmentId,
+        },
+      });
 
-    if (run.ttl) {
-      const expireAt = parseNaturalLanguageDuration(run.ttl);
+      if (run.ttl) {
+        const expireAt = parseNaturalLanguageDuration(run.ttl);
 
-      if (expireAt) {
-        await this.$.worker.enqueue({
-          id: `expireRun:${runId}`,
-          job: "expireRun",
-          payload: { runId },
-          availableAt: expireAt,
-        });
+        if (expireAt) {
+          await this.$.worker.enqueue({
+            id: `expireRun:${runId}`,
+            job: "expireRun",
+            payload: { runId },
+            availableAt: expireAt,
+          });
+        }
       }
-    }
+    });
   }
 
   async scheduleDelayedRunEnqueuing({ runId, delayUntil }: { runId: string; delayUntil: Date }) {
diff --git a/internal-packages/run-engine/src/engine/systems/dequeueSystem.ts b/internal-packages/run-engine/src/engine/systems/dequeueSystem.ts
index 8ce967ccb6f..e8333bcce70 100644
--- a/internal-packages/run-engine/src/engine/systems/dequeueSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/dequeueSystem.ts
@@ -1,12 +1,22 @@
+import type { BillingCache } from "../billingCache.js";
 import { startSpan } from "@internal/tracing";
-import { assertExhaustive } from "@trigger.dev/core";
+import { assertExhaustive, tryCatch } from "@trigger.dev/core";
 import { DequeuedMessage, RetryOptions } from "@trigger.dev/core/v3";
+import { placementTag } from "@trigger.dev/core/v3/serverOnly";
 import { getMaxDuration } from "@trigger.dev/core/v3/isomorphic";
-import { PrismaClientOrTransaction } from "@trigger.dev/database";
-import { getRunWithBackgroundWorkerTasks } from "../db/worker.js";
+import {
+  BackgroundWorker,
+  BackgroundWorkerTask,
+  Prisma,
+  PrismaClientOrTransaction,
+  TaskQueue,
+  WorkerDeployment,
+} from "@trigger.dev/database";
+import { CURRENT_DEPLOYMENT_LABEL } from "@trigger.dev/core/v3/isomorphic";
+
 import { sendNotificationToWorker } from "../eventBus.js";
 import { getMachinePreset } from "../machinePresets.js";
-import { isDequeueableExecutionStatus } from "../statuses.js";
+import { isDequeueableExecutionStatus, isExecuting } from "../statuses.js";
 import { RunEngineOptions } from "../types.js";
 import { ExecutionSnapshotSystem, getLatestExecutionSnapshot } from "./executionSnapshotSystem.js";
 import { RunAttemptSystem } from "./runAttemptSystem.js";
@@ -17,6 +27,62 @@ export type DequeueSystemOptions = {
   machines: RunEngineOptions["machines"];
   executionSnapshotSystem: ExecutionSnapshotSystem;
   runAttemptSystem: RunAttemptSystem;
+  billingCache: BillingCache;
+};
+
+type RunWithMininimalEnvironment = Prisma.TaskRunGetPayload<{
+  include: {
+    runtimeEnvironment: {
+      select: {
+        id: true;
+        type: true;
+      };
+    };
+  };
+}>;
+
+type RunWithBackgroundWorkerTasksResult =
+  | {
+      success: false;
+      code: "NO_RUN";
+      message: string;
+    }
+  | {
+      success: false;
+      code:
+        | "NO_WORKER"
+        | "TASK_NOT_IN_LATEST"
+        | "TASK_NEVER_REGISTERED"
+        | "BACKGROUND_WORKER_MISMATCH"
+        | "QUEUE_NOT_FOUND"
+        | "RUN_ENVIRONMENT_ARCHIVED";
+      message: string;
+      run: RunWithMininimalEnvironment;
+    }
+  | {
+      success: false;
+      code: "BACKGROUND_WORKER_MISMATCH";
+      message: string;
+      backgroundWorker: {
+        expected: string;
+        received: string;
+      };
+      run: RunWithMininimalEnvironment;
+    }
+  | {
+      success: true;
+      run: RunWithMininimalEnvironment;
+      worker: BackgroundWorker;
+      task: BackgroundWorkerTask;
+      queue: TaskQueue;
+      deployment: WorkerDeployment | null;
+    };
+
+type WorkerDeploymentWithWorkerTasks = {
+  worker: BackgroundWorker;
+  tasks: BackgroundWorkerTask[];
+  queues: TaskQueue[];
+  deployment: WorkerDeployment | null;
 };
 
 export class DequeueSystem {
@@ -43,6 +109,8 @@ export class DequeueSystem {
     workerId,
     runnerId,
     tx,
+    blockingPop,
+    blockingPopTimeoutSeconds,
   }: {
     consumerId: string;
     workerQueue: string;
@@ -50,6 +118,8 @@ export class DequeueSystem {
     workerId?: string;
     runnerId?: string;
     tx?: PrismaClientOrTransaction;
+    blockingPop?: boolean;
+    blockingPopTimeoutSeconds?: number;
   }): Promise<DequeuedMessage | undefined> {
     const prisma = tx ?? this.$.prisma;
 
@@ -60,7 +130,11 @@ export class DequeueSystem {
         //gets multiple runs from the queue
         const message = await this.$.runQueue.dequeueMessageFromWorkerQueue(
           consumerId,
-          workerQueue
+          workerQueue,
+          {
+            blockingPop,
+            blockingPopTimeoutSeconds,
+          }
         );
         if (!message) {
           return;
@@ -69,7 +143,23 @@ export class DequeueSystem {
         const orgId = message.message.orgId;
         const runId = message.messageId;
 
-        span.setAttribute("runId", runId);
+        this.$.logger.info("DequeueSystem.dequeueFromWorkerQueue dequeued message", {
+          runId,
+          orgId,
+          environmentId: message.message.environmentId,
+          environmentType: message.message.environmentType,
+          workerQueueLength: message.workerQueueLength ?? 0,
+          workerQueue,
+        });
+
+        span.setAttribute("run_id", runId);
+        span.setAttribute("org_id", orgId);
+        span.setAttribute("environment_id", message.message.environmentId);
+        span.setAttribute("environment_type", message.message.environmentType);
+        span.setAttribute("worker_queue_length", message.workerQueueLength ?? 0);
+        span.setAttribute("consumer_id", consumerId);
+        span.setAttribute("worker_queue", workerQueue);
+        span.setAttribute("blocking_pop", blockingPop ?? true);
 
         //lock the run so nothing else can modify it
         try {
@@ -129,9 +219,26 @@ export class DequeueSystem {
                   },
                   tx: prisma,
                 });
-                this.$.logger.error(
-                  `RunEngine.dequeueFromWorkerQueue(): Run is not in a valid state to be dequeued: ${runId}\n ${snapshot.id}:${snapshot.executionStatus}`
-                );
+
+                if (isExecuting(snapshot.executionStatus)) {
+                  this.$.logger.error(
+                    `RunEngine.dequeueFromWorkerQueue(): Run is not in a valid state to be dequeued`,
+                    {
+                      runId,
+                      snapshotId: snapshot.id,
+                      executionStatus: snapshot.executionStatus,
+                    }
+                  );
+                } else {
+                  this.$.logger.warn(
+                    `RunEngine.dequeueFromWorkerQueue(): Run is in an expected not valid state to be dequeued`,
+                    {
+                      runId,
+                      snapshotId: snapshot.id,
+                      executionStatus: snapshot.executionStatus,
+                    }
+                  );
+                }
 
                 return;
               }
@@ -171,7 +278,7 @@ export class DequeueSystem {
                 return;
               }
 
-              const result = await getRunWithBackgroundWorkerTasks(
+              const result = await this.#getRunWithBackgroundWorkerTasks(
                 prisma,
                 runId,
                 backgroundWorkerId
@@ -305,6 +412,9 @@ export class DequeueSystem {
                 result.run.maxDurationInSeconds,
                 result.task.maxDurationInSeconds
               );
+              const lockedRetryConfig = result.run.lockedRetryConfig
+                ? undefined
+                : result.task.retryConfig;
 
               const lockedTaskRun = await prisma.taskRun.update({
                 where: {
@@ -315,6 +425,7 @@ export class DequeueSystem {
                   lockedById: result.task.id,
                   lockedToVersionId: result.worker.id,
                   lockedQueueId: result.queue.id,
+                  lockedRetryConfig: lockedRetryConfig ?? undefined,
                   status: "DEQUEUED",
                   startedAt,
                   baseCostInCents: this.options.machines.baseCostInCents,
@@ -380,12 +491,36 @@ export class DequeueSystem {
               const currentAttemptNumber = lockedTaskRun.attemptNumber ?? 0;
               const nextAttemptNumber = currentAttemptNumber + 1;
 
+              // Get billing information if available, with fallback to TaskRun.planType
+              const billingResult = await this.options.billingCache.getCurrentPlan(orgId);
+
+              let isPaying: boolean;
+              if (billingResult.err || !billingResult.val) {
+                // Fallback to stored planType on TaskRun if billing cache fails or returns no value
+                this.$.logger.warn(
+                  "Billing cache failed or returned no value, falling back to TaskRun.planType",
+                  {
+                    orgId,
+                    runId,
+                    error:
+                      billingResult.err instanceof Error
+                        ? billingResult.err.message
+                        : String(billingResult.err),
+                    currentPlan: billingResult.val,
+                  }
+                );
+
+                isPaying = (lockedTaskRun.planType ?? "free") !== "free";
+              } else {
+                isPaying = billingResult.val.isPaying;
+              }
+
               const newSnapshot = await this.executionSnapshotSystem.createExecutionSnapshot(
                 prisma,
                 {
                   run: {
                     id: runId,
-                    status: snapshot.runStatus,
+                    status: lockedTaskRun.status,
                     attemptNumber: lockedTaskRun.attemptNumber,
                   },
                   snapshot: {
@@ -408,6 +543,7 @@ export class DequeueSystem {
               return {
                 version: "1" as const,
                 dequeuedAt: new Date(),
+                workerQueueLength: message.workerQueueLength,
                 snapshot: {
                   id: newSnapshot.id,
                   friendlyId: newSnapshot.friendlyId,
@@ -423,6 +559,8 @@ export class DequeueSystem {
                   friendlyId: result.worker.friendlyId,
                   version: result.worker.version,
                 },
+                // TODO: use a discriminated union schema to differentiate between dequeued runs in dev and in deployed environments.
+                // Would help make the typechecking stricter
                 deployment: {
                   id: result.deployment?.id,
                   friendlyId: result.deployment?.friendlyId,
@@ -448,7 +586,18 @@ export class DequeueSystem {
                 project: {
                   id: lockedTaskRun.projectId,
                 },
+                placementTags: [placementTag("paid", isPaying ? "true" : "false")],
               } satisfies DequeuedMessage;
+            },
+            {
+              run_id: runId,
+              org_id: orgId,
+              environment_id: message.message.environmentId,
+              environment_type: message.message.environmentType,
+              worker_queue_length: message.workerQueueLength ?? 0,
+              consumer_id: consumerId,
+              worker_queue: workerQueue,
+              blocking_pop: blockingPop ?? true,
             }
           );
 
@@ -462,20 +611,24 @@ export class DequeueSystem {
             }
           );
 
-          const run = await prisma.taskRun.findFirst({
-            where: { id: runId },
-            include: {
-              runtimeEnvironment: true,
-            },
-          });
+          // Wrap the Prisma call with tryCatch - if DB is unavailable, we still want to nack via Redis
+          const [findError, run] = await tryCatch(
+            prisma.taskRun.findFirst({
+              where: { id: runId },
+              include: {
+                runtimeEnvironment: true,
+              },
+            })
+          );
 
-          if (!run) {
-            //this isn't ideal because we're not creating a snapshot… but we can't do much else
+          // If DB is unavailable or run not found, just nack directly via Redis
+          if (findError || !run) {
             this.$.logger.error(
-              "RunEngine.dequeueFromWorkerQueue(): Thrown error, then run not found. Nacking.",
+              "RunEngine.dequeueFromWorkerQueue(): Failed to find run, nacking directly via Redis",
               {
                 runId,
                 orgId,
+                findError,
               }
             );
             await this.$.runQueue.nackMessage({ orgId, messageId: runId });
@@ -612,4 +765,337 @@ export class DequeueSystem {
       });
     });
   }
+
+  async #getRunWithBackgroundWorkerTasks(
+    prisma: PrismaClientOrTransaction,
+    runId: string,
+    backgroundWorkerId?: string
+  ): Promise<RunWithBackgroundWorkerTasksResult> {
+    return startSpan(this.$.tracer, "getRunWithBackgroundWorkerTasks", async (span) => {
+      span.setAttribute("run_id", runId);
+
+      const run = await prisma.taskRun.findFirst({
+        where: {
+          id: runId,
+        },
+        include: {
+          runtimeEnvironment: {
+            select: {
+              id: true,
+              type: true,
+              archivedAt: true,
+            },
+          },
+          lockedToVersion: {
+            include: {
+              deployment: true,
+              tasks: true,
+            },
+          },
+        },
+      });
+
+      if (!run) {
+        span.setAttribute("result", "NO_RUN");
+        return {
+          success: false as const,
+          code: "NO_RUN",
+          message: `No run found with id: ${runId}`,
+        };
+      }
+
+      span.setAttribute("environment_type", run.runtimeEnvironment.type);
+
+      if (run.runtimeEnvironment.archivedAt) {
+        span.setAttribute("result", "RUN_ENVIRONMENT_ARCHIVED");
+        return {
+          success: false as const,
+          code: "RUN_ENVIRONMENT_ARCHIVED",
+          message: `Run is on an archived environment: ${run.id}`,
+          run,
+        };
+      }
+
+      const workerId = run.lockedToVersionId ?? backgroundWorkerId;
+
+      //get the relevant BackgroundWorker with tasks and deployment (if not DEV)
+      let workerWithTasks: WorkerDeploymentWithWorkerTasks | null = null;
+
+      if (run.runtimeEnvironment.type === "DEVELOPMENT") {
+        workerWithTasks = workerId
+          ? await this.#getWorkerById(prisma, workerId)
+          : await this.#getMostRecentWorker(prisma, run.runtimeEnvironmentId);
+      } else {
+        workerWithTasks = workerId
+          ? await this.#getWorkerDeploymentFromWorker(prisma, workerId)
+          : await this.#getManagedWorkerFromCurrentlyPromotedDeployment(
+              prisma,
+              run.runtimeEnvironmentId
+            );
+      }
+
+      if (!workerWithTasks) {
+        span.setAttribute("result", "NO_WORKER");
+        return {
+          success: false as const,
+          code: "NO_WORKER",
+          message: `No worker found for run: ${run.id}`,
+          run,
+        };
+      }
+
+      if (backgroundWorkerId) {
+        if (backgroundWorkerId !== workerWithTasks.worker.id) {
+          span.setAttribute("result", "BACKGROUND_WORKER_MISMATCH");
+          return {
+            success: false as const,
+            code: "BACKGROUND_WORKER_MISMATCH",
+            message: `Background worker mismatch for run: ${run.id}`,
+            backgroundWorker: {
+              expected: backgroundWorkerId,
+              received: workerWithTasks.worker.id,
+            },
+            run,
+          };
+        }
+      }
+
+      const backgroundTask = workerWithTasks.tasks.find((task) => task.slug === run.taskIdentifier);
+
+      if (!backgroundTask) {
+        const nonCurrentTask = await prisma.backgroundWorkerTask.findFirst({
+          where: {
+            slug: run.taskIdentifier,
+            projectId: run.projectId,
+            runtimeEnvironmentId: run.runtimeEnvironmentId,
+          },
+          include: {
+            worker: true,
+          },
+          orderBy: {
+            createdAt: "desc",
+          },
+        });
+
+        if (nonCurrentTask) {
+          span.setAttribute("result", "TASK_NOT_IN_LATEST");
+          return {
+            success: false as const,
+            code: "TASK_NOT_IN_LATEST",
+            message: `Task not found in latest version: ${run.taskIdentifier}. Found in ${nonCurrentTask.worker.version}`,
+            run,
+          };
+        } else {
+          span.setAttribute("result", "TASK_NEVER_REGISTERED");
+          return {
+            success: false as const,
+            code: "TASK_NEVER_REGISTERED",
+            message: `Task has never been registered (in dev or deployed): ${run.taskIdentifier}`,
+            run,
+          };
+        }
+      }
+
+      const queue = workerWithTasks.queues.find((queue) =>
+        run.lockedQueueId ? queue.id === run.lockedQueueId : queue.name === run.queue
+      );
+
+      if (!queue) {
+        span.setAttribute("result", "QUEUE_NOT_FOUND");
+        return {
+          success: false as const,
+          code: "QUEUE_NOT_FOUND",
+          message: `Queue not found for run: ${run.id}`,
+          run,
+        };
+      }
+
+      span.setAttribute("result", "SUCCESS");
+
+      return {
+        success: true as const,
+        run,
+        worker: workerWithTasks.worker,
+        task: backgroundTask,
+        queue,
+        deployment: workerWithTasks.deployment,
+      };
+    });
+  }
+
+  async #getWorkerDeploymentFromWorker(
+    prisma: PrismaClientOrTransaction,
+    workerId: string
+  ): Promise<WorkerDeploymentWithWorkerTasks | null> {
+    return startSpan(this.$.tracer, "getWorkerDeploymentFromWorker", async (span) => {
+      const worker = await prisma.backgroundWorker.findFirst({
+        where: {
+          id: workerId,
+        },
+        include: {
+          deployment: true,
+          tasks: true,
+          queues: true,
+        },
+      });
+
+      if (!worker) {
+        span.setAttribute("result", "NOT_FOUND");
+        return null;
+      }
+
+      span.setAttribute("result", "SUCCESS");
+
+      return {
+        worker,
+        tasks: worker.tasks,
+        queues: worker.queues,
+        deployment: worker.deployment,
+      };
+    });
+  }
+
+  async #getMostRecentWorker(
+    prisma: PrismaClientOrTransaction,
+    environmentId: string
+  ): Promise<WorkerDeploymentWithWorkerTasks | null> {
+    return startSpan(this.$.tracer, "getMostRecentWorker", async (span) => {
+      const worker = await prisma.backgroundWorker.findFirst({
+        where: {
+          runtimeEnvironmentId: environmentId,
+        },
+        include: {
+          tasks: true,
+          queues: true,
+        },
+        orderBy: {
+          id: "desc",
+        },
+      });
+
+      if (!worker) {
+        span.setAttribute("result", "NOT_FOUND");
+        return null;
+      }
+
+      span.setAttribute("result", "SUCCESS");
+
+      return { worker, tasks: worker.tasks, queues: worker.queues, deployment: null };
+    });
+  }
+
+  async #getWorkerById(
+    prisma: PrismaClientOrTransaction,
+    workerId: string
+  ): Promise<WorkerDeploymentWithWorkerTasks | null> {
+    return startSpan(this.$.tracer, "getWorkerById", async (span) => {
+      const worker = await prisma.backgroundWorker.findFirst({
+        where: {
+          id: workerId,
+        },
+        include: {
+          deployment: true,
+          tasks: true,
+          queues: true,
+        },
+        orderBy: {
+          id: "desc",
+        },
+      });
+
+      if (!worker) {
+        span.setAttribute("result", "NOT_FOUND");
+        return null;
+      }
+
+      span.setAttribute("result", "SUCCESS");
+
+      return {
+        worker,
+        tasks: worker.tasks,
+        queues: worker.queues,
+        deployment: worker.deployment,
+      };
+    });
+  }
+
+  async #getManagedWorkerFromCurrentlyPromotedDeployment(
+    prisma: PrismaClientOrTransaction,
+    environmentId: string
+  ): Promise<WorkerDeploymentWithWorkerTasks | null> {
+    return startSpan(
+      this.$.tracer,
+      "getManagedWorkerFromCurrentlyPromotedDeployment",
+      async (span) => {
+        const promotion = await prisma.workerDeploymentPromotion.findFirst({
+          where: {
+            environmentId,
+            label: CURRENT_DEPLOYMENT_LABEL,
+          },
+          include: {
+            deployment: {
+              include: {
+                worker: {
+                  include: {
+                    tasks: true,
+                    queues: true,
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        if (!promotion || !promotion.deployment.worker) {
+          span.setAttribute("result", "NO_PROMOTION_OR_WORKER");
+          return null;
+        }
+
+        if (promotion.deployment.type === "MANAGED") {
+          // This is a run engine v2 deployment, so return it
+          span.setAttribute("result", "SUCCESS_CURRENT_MANAGED");
+
+          return {
+            worker: promotion.deployment.worker,
+            tasks: promotion.deployment.worker.tasks,
+            queues: promotion.deployment.worker.queues,
+            deployment: promotion.deployment,
+          };
+        }
+
+        // We need to get the latest run engine v2 deployment
+        const latestV2Deployment = await prisma.workerDeployment.findFirst({
+          where: {
+            environmentId,
+            type: "MANAGED",
+          },
+          orderBy: {
+            id: "desc",
+          },
+          include: {
+            worker: {
+              include: {
+                tasks: true,
+                queues: true,
+              },
+            },
+          },
+        });
+
+        if (!latestV2Deployment?.worker) {
+          span.setAttribute("result", "NO_V2_DEPLOYMENT");
+          return null;
+        }
+
+        span.setAttribute("result", "SUCCESS_LATEST_V2");
+
+        return {
+          worker: latestV2Deployment.worker,
+          tasks: latestV2Deployment.worker.tasks,
+          queues: latestV2Deployment.worker.queues,
+          deployment: latestV2Deployment,
+        };
+      }
+    );
+  }
 }
diff --git a/internal-packages/run-engine/src/engine/systems/executionSnapshotSystem.ts b/internal-packages/run-engine/src/engine/systems/executionSnapshotSystem.ts
index 8ab2de2da04..a224e5a86b0 100644
--- a/internal-packages/run-engine/src/engine/systems/executionSnapshotSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/executionSnapshotSystem.ts
@@ -8,10 +8,14 @@ import {
   TaskRunExecutionSnapshot,
   TaskRunExecutionStatus,
   TaskRunStatus,
+  Waitpoint,
 } from "@trigger.dev/database";
 import { HeartbeatTimeouts } from "../types.js";
 import { SystemResources } from "./systems.js";
 
+/** Chunk size for fetching waitpoints to avoid NAPI string conversion limits */
+const WAITPOINT_CHUNK_SIZE = 100;
+
 export type ExecutionSnapshotSystemOptions = {
   resources: SystemResources;
   heartbeatTimeouts: HeartbeatTimeouts;
@@ -31,19 +35,41 @@ type ExecutionSnapshotWithCheckAndWaitpoints = Prisma.TaskRunExecutionSnapshotGe
   };
 }>;
 
+type ExecutionSnapshotWithCheckpoint = Prisma.TaskRunExecutionSnapshotGetPayload<{
+  include: {
+    checkpoint: true;
+  };
+}>;
+
 function enhanceExecutionSnapshot(
   snapshot: ExecutionSnapshotWithCheckAndWaitpoints
+): EnhancedExecutionSnapshot {
+  return enhanceExecutionSnapshotWithWaitpoints(
+    snapshot,
+    snapshot.completedWaitpoints,
+    snapshot.completedWaitpointOrder
+  );
+}
+
+/**
+ * Transforms a snapshot (with checkpoint but without waitpoints) into an EnhancedExecutionSnapshot
+ * by combining it with pre-fetched waitpoints.
+ */
+function enhanceExecutionSnapshotWithWaitpoints(
+  snapshot: ExecutionSnapshotWithCheckpoint,
+  waitpoints: Waitpoint[],
+  completedWaitpointOrder: string[]
 ): EnhancedExecutionSnapshot {
   return {
     ...snapshot,
     friendlyId: SnapshotId.toFriendlyId(snapshot.id),
     runFriendlyId: RunId.toFriendlyId(snapshot.runId),
-    completedWaitpoints: snapshot.completedWaitpoints.flatMap((w) => {
-      //get all indexes of the waitpoint in the completedWaitpointOrder
-      //we do this because the same run can be in a batch multiple times (i.e. same idempotencyKey)
+    completedWaitpoints: waitpoints.flatMap((w) => {
+      // Get all indexes of the waitpoint in the completedWaitpointOrder
+      // We do this because the same run can be in a batch multiple times (i.e. same idempotencyKey)
       let indexes: (number | undefined)[] = [];
-      for (let i = 0; i < snapshot.completedWaitpointOrder.length; i++) {
-        if (snapshot.completedWaitpointOrder[i] === w.id) {
+      for (let i = 0; i < completedWaitpointOrder.length; i++) {
+        if (completedWaitpointOrder[i] === w.id) {
           indexes.push(i);
         }
       }
@@ -60,9 +86,7 @@ function enhanceExecutionSnapshot(
           type: w.type,
           completedAt: w.completedAt ?? new Date(),
           idempotencyKey:
-            w.userProvidedIdempotencyKey && !w.inactiveIdempotencyKey
-              ? w.idempotencyKey
-              : undefined,
+            w.userProvidedIdempotencyKey && !w.inactiveIdempotencyKey ? w.idempotencyKey : undefined,
           completedByTaskRun: w.completedByTaskRunId
             ? {
                 id: w.completedByTaskRunId,
@@ -91,6 +115,42 @@ function enhanceExecutionSnapshot(
   };
 }
 
+/**
+ * Gets the waitpoint IDs linked to a snapshot via the _completedWaitpoints join table.
+ * Uses raw SQL to avoid fetching full waitpoint data.
+ */
+async function getSnapshotWaitpointIds(
+  prisma: PrismaClientOrTransaction,
+  snapshotId: string
+): Promise<string[]> {
+  const result = await prisma.$queryRaw<{ B: string }[]>`
+    SELECT "B" FROM "_completedWaitpoints" WHERE "A" = ${snapshotId}
+  `;
+  return result.map((r) => r.B);
+}
+
+/**
+ * Fetches waitpoints in chunks to avoid NAPI string conversion limits.
+ * This is necessary because waitpoints can have large outputs (100KB+),
+ * and fetching many at once can exceed Node.js string limits.
+ */
+async function fetchWaitpointsInChunks(
+  prisma: PrismaClientOrTransaction,
+  waitpointIds: string[]
+): Promise<Waitpoint[]> {
+  if (waitpointIds.length === 0) return [];
+
+  const allWaitpoints: Waitpoint[] = [];
+  for (let i = 0; i < waitpointIds.length; i += WAITPOINT_CHUNK_SIZE) {
+    const chunk = waitpointIds.slice(i, i + WAITPOINT_CHUNK_SIZE);
+    const waitpoints = await prisma.waitpoint.findMany({
+      where: { id: { in: chunk } },
+    });
+    allWaitpoints.push(...waitpoints);
+  }
+  return allWaitpoints;
+}
+
 /* Gets the most recent valid snapshot for a run */
 export async function getLatestExecutionSnapshot(
   prisma: PrismaClientOrTransaction,
@@ -191,12 +251,27 @@ export function executionDataFromSnapshot(snapshot: EnhancedExecutionSnapshot):
   };
 }
 
+/**
+ * Gets execution snapshots created after the specified snapshot.
+ *
+ * IMPORTANT: This function is optimized to avoid N×M data explosion when runs have many
+ * completed waitpoints. Due to the many-to-many relation, once waitpoints complete,
+ * all subsequent snapshots have the same waitpoints linked. For a run with 24 snapshots
+ * and 236 waitpoints with 100KB outputs each, fetching all waitpoints for all snapshots
+ * would result in ~570MB of data, causing "Failed to convert rust String into napi string" errors.
+ *
+ * Solution: Only the LATEST snapshot's waitpoints are fetched and included. The runner's
+ * SnapshotManager only processes completedWaitpoints from the latest snapshot anyway -
+ * intermediate snapshots' waitpoints are ignored. This reduces data from N×M to just M.
+ *
+ * Waitpoints are fetched in chunks (100 at a time) to handle batches up to 1000 items.
+ */
 export async function getExecutionSnapshotsSince(
   prisma: PrismaClientOrTransaction,
   runId: string,
   sinceSnapshotId: string
 ): Promise<EnhancedExecutionSnapshot[]> {
-  // Find the createdAt of the sinceSnapshotId
+  // Step 1: Find the createdAt of the sinceSnapshotId
   const sinceSnapshot = await prisma.taskRunExecutionSnapshot.findFirst({
     where: { id: sinceSnapshotId },
     select: { createdAt: true },
@@ -206,6 +281,7 @@ export async function getExecutionSnapshotsSince(
     throw new Error(`No execution snapshot found for id ${sinceSnapshotId}`);
   }
 
+  // Step 2: Fetch snapshots WITHOUT waitpoints to avoid N×M data explosion
   const snapshots = await prisma.taskRunExecutionSnapshot.findMany({
     where: {
       runId,
@@ -213,13 +289,32 @@ export async function getExecutionSnapshotsSince(
       createdAt: { gt: sinceSnapshot.createdAt },
     },
     include: {
-      completedWaitpoints: true,
       checkpoint: true,
+      // DO NOT include completedWaitpoints here - this causes the N×M explosion
     },
-    orderBy: { createdAt: "asc" },
+    orderBy: { createdAt: "desc" },
+    take: 50,
   });
 
-  return snapshots.map(enhanceExecutionSnapshot);
+  if (snapshots.length === 0) return [];
+
+  // Step 3: Get waitpoint IDs for the LATEST snapshot only (first in desc order)
+  const latestSnapshot = snapshots[0];
+  const waitpointIds = await getSnapshotWaitpointIds(prisma, latestSnapshot.id);
+
+  // Step 4: Fetch waitpoints in chunks to avoid NAPI string conversion limits
+  const waitpoints = await fetchWaitpointsInChunks(prisma, waitpointIds);
+
+  // Step 5: Build enhanced snapshots - only latest gets waitpoints, others get empty arrays
+  // The runner only uses completedWaitpoints from the latest snapshot anyway
+  return snapshots.reverse().map((snapshot) => {
+    const isLatest = snapshot.id === latestSnapshot.id;
+    return enhanceExecutionSnapshotWithWaitpoints(
+      snapshot,
+      isLatest ? waitpoints : [],
+      latestSnapshot.completedWaitpointOrder
+    );
+  });
 }
 
 export class ExecutionSnapshotSystem {
@@ -277,7 +372,8 @@ export class ExecutionSnapshotSystem {
         description: snapshot.description,
         previousSnapshotId,
         runId: run.id,
-        runStatus: run.status,
+        // We can't set the runStatus to DEQUEUED because it will break older runners
+        runStatus: run.status === "DEQUEUED" ? "PENDING" : run.status,
         attemptNumber: run.attemptNumber ?? undefined,
         batchId,
         environmentId,
@@ -360,7 +456,6 @@ export class ExecutionSnapshotSystem {
         runnerId,
       });
 
-      await this.$.worker.ack(`heartbeatSnapshot.${runId}`);
       return executionResultFromSnapshot(latestSnapshot);
     }
 
@@ -374,12 +469,10 @@ export class ExecutionSnapshotSystem {
       });
     }
 
-    //update the snapshot heartbeat time
-    await prisma.taskRunExecutionSnapshot.update({
-      where: { id: latestSnapshot.id },
-      data: {
-        lastHeartbeatAt: new Date(),
-      },
+    this.$.logger.info("heartbeatRun snapshot heartbeat updated", {
+      id: latestSnapshot.id,
+      runId: latestSnapshot.runId,
+      lastHeartbeatAt: new Date(),
     });
 
     //extending the heartbeat
@@ -396,32 +489,31 @@ export class ExecutionSnapshotSystem {
 
   public async restartHeartbeatForRun({
     runId,
+    delayMs,
+    restartAttempt,
     tx,
   }: {
     runId: string;
+    delayMs: number;
+    restartAttempt: number;
     tx?: PrismaClientOrTransaction;
   }): Promise<ExecutionResult> {
     const prisma = tx ?? this.$.prisma;
 
     const latestSnapshot = await getLatestExecutionSnapshot(prisma, runId);
 
-    //extending the heartbeat
-    const intervalMs = this.#getHeartbeatIntervalMs(latestSnapshot.executionStatus);
-
-    if (intervalMs !== null) {
-      this.$.logger.debug("restartHeartbeatForRun: enqueuing heartbeat", {
-        runId,
-        snapshotId: latestSnapshot.id,
-        intervalMs,
-      });
+    this.$.logger.debug("restartHeartbeatForRun: enqueuing heartbeat", {
+      runId,
+      snapshotId: latestSnapshot.id,
+      delayMs,
+    });
 
-      await this.$.worker.enqueue({
-        id: `heartbeatSnapshot.${runId}`,
-        job: "heartbeatSnapshot",
-        payload: { snapshotId: latestSnapshot.id, runId },
-        availableAt: new Date(Date.now() + intervalMs),
-      });
-    }
+    await this.$.worker.enqueue({
+      id: `heartbeatSnapshot.${runId}`,
+      job: "heartbeatSnapshot",
+      payload: { snapshotId: latestSnapshot.id, runId, restartAttempt },
+      availableAt: new Date(Date.now() + delayMs),
+    });
 
     return executionResultFromSnapshot(latestSnapshot);
   }
diff --git a/internal-packages/run-engine/src/engine/systems/pendingVersionSystem.ts b/internal-packages/run-engine/src/engine/systems/pendingVersionSystem.ts
index 6dcb4f6eb04..c22429ac0c9 100644
--- a/internal-packages/run-engine/src/engine/systems/pendingVersionSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/pendingVersionSystem.ts
@@ -50,7 +50,7 @@ export class PendingVersionSystem {
       queues: backgroundWorker.queues.map((queue) => queue.name),
     });
 
-    const pendingRuns = await this.$.prisma.taskRun.findMany({
+    const pendingRuns = await this.$.readOnlyPrisma.taskRun.findMany({
       where: {
         runtimeEnvironmentId: backgroundWorker.runtimeEnvironmentId,
         projectId: backgroundWorker.projectId,
diff --git a/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts b/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts
index f56c9a6ebb3..a8fe3ccdc03 100644
--- a/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts
@@ -1,3 +1,12 @@
+import {
+  createCache,
+  createLRUMemoryStore,
+  DefaultStatefulContext,
+  Namespace,
+  RedisCacheStore,
+  UnkeyCache,
+} from "@internal/cache";
+import { RedisOptions } from "@internal/redis";
 import { startSpan } from "@internal/tracing";
 import { tryCatch } from "@trigger.dev/core/utils";
 import {
@@ -5,14 +14,25 @@ import {
   ExecutionResult,
   FlushedRunMetadata,
   GitMeta,
+  MachinePreset,
+  MachinePresetName,
   StartRunAttemptResult,
+  TaskRunContext,
   TaskRunError,
   TaskRunExecution,
+  TaskRunExecutionDeployment,
+  TaskRunExecutionOrganization,
+  TaskRunExecutionProject,
+  TaskRunExecutionQueue,
   TaskRunExecutionResult,
   TaskRunFailedExecutionResult,
   TaskRunInternalError,
   TaskRunSuccessfulExecutionResult,
 } from "@trigger.dev/core/v3/schemas";
+import {
+  extractIdempotencyKeyScope,
+  getUserProvidedIdempotencyKey,
+} from "@trigger.dev/core/v3/serverOnly";
 import { parsePacket } from "@trigger.dev/core/v3/utils/ioSerialization";
 import {
   $transaction,
@@ -23,19 +43,26 @@ import {
 import { MAX_TASK_RUN_ATTEMPTS } from "../consts.js";
 import { runStatusFromError, ServiceValidationError } from "../errors.js";
 import { sendNotificationToWorker } from "../eventBus.js";
-import { getMachinePreset } from "../machinePresets.js";
+import { getMachinePreset, machinePresetFromName } from "../machinePresets.js";
 import { retryOutcomeFromCompletion } from "../retrying.js";
-import { isExecuting, isInitialState } from "../statuses.js";
+import {
+  isExecuting,
+  isFinishedOrPendingFinished,
+  isInitialState,
+  isPendingExecuting,
+} from "../statuses.js";
 import { RunEngineOptions } from "../types.js";
 import { BatchSystem } from "./batchSystem.js";
 import { DelayedRunSystem } from "./delayedRunSystem.js";
 import {
+  EnhancedExecutionSnapshot,
   executionResultFromSnapshot,
   ExecutionSnapshotSystem,
   getLatestExecutionSnapshot,
 } from "./executionSnapshotSystem.js";
 import { SystemResources } from "./systems.js";
 import { WaitpointSystem } from "./waitpointSystem.js";
+import { BatchId, RunId } from "@trigger.dev/core/v3/isomorphic";
 
 export type RunAttemptSystemOptions = {
   resources: SystemResources;
@@ -45,14 +72,54 @@ export type RunAttemptSystemOptions = {
   delayedRunSystem: DelayedRunSystem;
   retryWarmStartThresholdMs?: number;
   machines: RunEngineOptions["machines"];
+  redisOptions: RedisOptions;
+};
+
+type BackwardsCompatibleTaskRunExecution = Omit<TaskRunExecution, "task" | "attempt" | "run"> & {
+  task: TaskRunExecution["task"] & {
+    exportName: string | undefined;
+  };
+  attempt: TaskRunExecution["attempt"] & {
+    id: string;
+    backgroundWorkerId: string;
+    backgroundWorkerTaskId: string;
+    status: string;
+  };
+  run: TaskRunExecution["run"] & {
+    context: undefined;
+    durationMs: number;
+    costInCents: number;
+    baseCostInCents: number;
+  };
 };
 
+const ORG_FRESH_TTL = 60000 * 60 * 24; // 1 day
+const ORG_STALE_TTL = 60000 * 60 * 24 * 2; // 2 days
+const PROJECT_FRESH_TTL = 60000 * 60 * 24; // 1 day
+const PROJECT_STALE_TTL = 60000 * 60 * 24 * 2; // 2 days
+const TASK_FRESH_TTL = 60000 * 60 * 24; // 1 day
+const TASK_STALE_TTL = 60000 * 60 * 24 * 2; // 2 days
+const MACHINE_PRESET_FRESH_TTL = 60000 * 60 * 24; // 1 day
+const MACHINE_PRESET_STALE_TTL = 60000 * 60 * 24 * 2; // 2 days
+const DEPLOYMENT_FRESH_TTL = 60000 * 60 * 24; // 1 day
+const DEPLOYMENT_STALE_TTL = 60000 * 60 * 24 * 2; // 2 days
+const QUEUE_FRESH_TTL = 60000 * 60; // 1 hour
+const QUEUE_STALE_TTL = 60000 * 60 * 2; // 2 hours
+
 export class RunAttemptSystem {
   private readonly $: SystemResources;
   private readonly executionSnapshotSystem: ExecutionSnapshotSystem;
   private readonly batchSystem: BatchSystem;
   private readonly waitpointSystem: WaitpointSystem;
   private readonly delayedRunSystem: DelayedRunSystem;
+  private readonly cache: UnkeyCache<{
+    tasks: BackwardsCompatibleTaskRunExecution["task"];
+    machinePresets: MachinePreset;
+    deployments: TaskRunExecutionDeployment;
+    queues: TaskRunExecutionQueue;
+    projects: TaskRunExecutionProject;
+    orgs: TaskRunExecutionOrganization;
+  }>;
 
   constructor(private readonly options: RunAttemptSystemOptions) {
     this.$ = options.resources;
@@ -60,6 +127,172 @@ export class RunAttemptSystem {
     this.batchSystem = options.batchSystem;
     this.waitpointSystem = options.waitpointSystem;
     this.delayedRunSystem = options.delayedRunSystem;
+
+    const ctx = new DefaultStatefulContext();
+    const memory = createLRUMemoryStore(5000);
+    const redisCacheStore = new RedisCacheStore({
+      name: "run-attempt-system",
+      connection: {
+        ...options.redisOptions,
+        keyPrefix: "engine:run-attempt-system:cache:",
+      },
+      useModernCacheKeyBuilder: true,
+    });
+
+    this.cache = createCache({
+      orgs: new Namespace<TaskRunExecutionOrganization>(ctx, {
+        stores: [memory, redisCacheStore],
+        fresh: ORG_FRESH_TTL,
+        stale: ORG_STALE_TTL,
+      }),
+      projects: new Namespace<TaskRunExecutionProject>(ctx, {
+        stores: [memory, redisCacheStore],
+        fresh: PROJECT_FRESH_TTL,
+        stale: PROJECT_STALE_TTL,
+      }),
+      tasks: new Namespace<BackwardsCompatibleTaskRunExecution["task"]>(ctx, {
+        stores: [memory, redisCacheStore],
+        fresh: TASK_FRESH_TTL,
+        stale: TASK_STALE_TTL,
+      }),
+      machinePresets: new Namespace<MachinePreset>(ctx, {
+        stores: [memory, redisCacheStore],
+        fresh: MACHINE_PRESET_FRESH_TTL,
+        stale: MACHINE_PRESET_STALE_TTL,
+      }),
+      deployments: new Namespace<TaskRunExecutionDeployment>(ctx, {
+        stores: [memory, redisCacheStore],
+        fresh: DEPLOYMENT_FRESH_TTL,
+        stale: DEPLOYMENT_STALE_TTL,
+      }),
+      queues: new Namespace<TaskRunExecutionQueue>(ctx, {
+        stores: [memory, redisCacheStore],
+        fresh: QUEUE_FRESH_TTL,
+        stale: QUEUE_STALE_TTL,
+      }),
+    });
+  }
+
+  public async resolveTaskRunContext(runId: string): Promise<TaskRunContext> {
+    const run = await this.$.readOnlyPrisma.taskRun.findFirst({
+      where: {
+        id: runId,
+      },
+      select: {
+        id: true,
+        createdAt: true,
+        updatedAt: true,
+        executedAt: true,
+        baseCostInCents: true,
+        projectId: true,
+        organizationId: true,
+        friendlyId: true,
+        lockedById: true,
+        lockedQueueId: true,
+        queue: true,
+        attemptNumber: true,
+        status: true,
+        ttl: true,
+        machinePreset: true,
+        runTags: true,
+        isTest: true,
+        idempotencyKey: true,
+        idempotencyKeyOptions: true,
+        startedAt: true,
+        maxAttempts: true,
+        taskVersion: true,
+        maxDurationInSeconds: true,
+        usageDurationMs: true,
+        costInCents: true,
+        traceContext: true,
+        priorityMs: true,
+        taskIdentifier: true,
+        runtimeEnvironment: {
+          select: {
+            id: true,
+            slug: true,
+            type: true,
+            branchName: true,
+            git: true,
+            organizationId: true,
+          },
+        },
+        parentTaskRunId: true,
+        rootTaskRunId: true,
+        batchId: true,
+        workerQueue: true,
+      },
+    });
+
+    if (!run) {
+      throw new ServiceValidationError("Task run not found", 404);
+    }
+
+    const [task, queue, organization, project, machinePreset, deployment] = await Promise.all([
+      run.lockedById
+        ? this.#resolveTaskRunExecutionTask(run.lockedById)
+        : Promise.resolve({
+          id: run.taskIdentifier,
+          filePath: "unknown",
+        }),
+      this.#resolveTaskRunExecutionQueue({
+        lockedQueueId: run.lockedQueueId ?? undefined,
+        queueName: run.queue,
+        runtimeEnvironmentId: run.runtimeEnvironment.id,
+      }),
+      this.#resolveTaskRunExecutionOrganization(run.runtimeEnvironment.organizationId),
+      this.#resolveTaskRunExecutionProjectByRuntimeEnvironmentId(run.runtimeEnvironment.id),
+      run.lockedById
+        ? this.#resolveTaskRunExecutionMachinePreset(run.lockedById, run.machinePreset)
+        : Promise.resolve(
+          getMachinePreset({
+            defaultMachine: this.options.machines.defaultMachine,
+            machines: this.options.machines.machines,
+            config: undefined,
+            run,
+          })
+        ),
+      run.lockedById
+        ? this.#resolveTaskRunExecutionDeployment(run.lockedById)
+        : Promise.resolve(undefined),
+    ]);
+
+    return {
+      run: {
+        id: run.friendlyId,
+        tags: run.runTags,
+        isTest: run.isTest,
+        createdAt: run.createdAt,
+        startedAt: run.startedAt ?? run.createdAt,
+        idempotencyKey: getUserProvidedIdempotencyKey(run) ?? undefined,
+        idempotencyKeyScope: extractIdempotencyKeyScope(run),
+        maxAttempts: run.maxAttempts ?? undefined,
+        version: run.taskVersion ?? "unknown",
+        maxDuration: run.maxDurationInSeconds ?? undefined,
+        priority: run.priorityMs === 0 ? undefined : run.priorityMs / 1_000,
+        parentTaskRunId: run.parentTaskRunId ? RunId.toFriendlyId(run.parentTaskRunId) : undefined,
+        rootTaskRunId: run.rootTaskRunId ? RunId.toFriendlyId(run.rootTaskRunId) : undefined,
+        region: run.runtimeEnvironment.type !== "DEVELOPMENT" ? run.workerQueue : undefined,
+      },
+      attempt: {
+        number: run.attemptNumber ?? 1,
+        startedAt: run.startedAt ?? new Date(),
+      },
+      task,
+      queue,
+      organization,
+      project,
+      machine: machinePreset,
+      deployment,
+      environment: {
+        id: run.runtimeEnvironment.id,
+        slug: run.runtimeEnvironment.slug,
+        type: run.runtimeEnvironment.type,
+        branchName: run.runtimeEnvironment.branchName ?? undefined,
+        git: safeParseGitMeta(run.runtimeEnvironment.git),
+      },
+      batch: run.batchId ? { id: BatchId.toFriendlyId(run.batchId) } : undefined,
+    };
   }
 
   public async startRunAttempt({
@@ -90,40 +323,31 @@ export class RunAttemptSystem {
             //if there is a big delay between the snapshot and the attempt, the snapshot might have changed
             //we just want to log because elsewhere it should have been put back into a state where it can be attempted
             this.$.logger.warn(
-              "RunEngine.createRunAttempt(): snapshot has changed since the attempt was created, ignoring."
+              "RunEngine.createRunAttempt(): snapshot has changed since the attempt was created, ignoring.",
+              {
+                snapshotId,
+                latestSnapshotId: latestSnapshot.id,
+              }
             );
-            throw new ServiceValidationError("Snapshot changed", 409);
-          }
-
-          const environment = await this.#getAuthenticatedEnvironmentFromRun(runId, prisma);
-          if (!environment) {
-            throw new ServiceValidationError("Environment not found", 404);
+            throw new ServiceValidationError("Snapshot changed inside startRunAttempt", 409, {
+              snapshotId,
+              latestSnapshotId: latestSnapshot.id,
+            });
           }
 
-          const taskRun = await prisma.taskRun.findFirst({
+          const taskRun = await this.$.readOnlyPrisma.taskRun.findFirst({
             where: {
               id: runId,
             },
-            include: {
-              tags: true,
-              lockedBy: {
-                include: {
-                  worker: {
-                    select: {
-                      id: true,
-                      version: true,
-                      sdkVersion: true,
-                      cliVersion: true,
-                      supportsLazyAttempts: true,
-                    },
-                  },
-                },
-              },
-              batchItems: {
-                include: {
-                  batchTaskRun: true,
-                },
-              },
+            select: {
+              id: true,
+              friendlyId: true,
+              attemptNumber: true,
+              projectId: true,
+              runtimeEnvironmentId: true,
+              status: true,
+              lockedById: true,
+              ttl: true,
             },
           });
 
@@ -138,25 +362,14 @@ export class RunAttemptSystem {
           span.setAttribute("taskRunId", taskRun.id);
           span.setAttribute("taskRunFriendlyId", taskRun.friendlyId);
 
-          if (taskRun.status === "CANCELED") {
-            throw new ServiceValidationError("Task run is cancelled", 400);
+          if (isFinishedOrPendingFinished(latestSnapshot.executionStatus)) {
+            throw new ServiceValidationError("Task run is already finished", 400);
           }
 
-          if (!taskRun.lockedBy) {
+          if (!taskRun.lockedById) {
             throw new ServiceValidationError("Task run is not locked", 400);
           }
 
-          const queue = await prisma.taskQueue.findFirst({
-            where: {
-              runtimeEnvironmentId: environment.id,
-              name: taskRun.queue,
-            },
-          });
-
-          if (!queue) {
-            throw new ServiceValidationError("Queue not found", 404);
-          }
-
           //increment the attempt number (start at 1)
           const nextAttemptNumber = (taskRun.attemptNumber ?? 0) + 1;
 
@@ -190,11 +403,54 @@ export class RunAttemptSystem {
                   attemptNumber: nextAttemptNumber,
                   executedAt: taskRun.attemptNumber === null ? new Date() : undefined,
                 },
-                include: {
-                  tags: true,
-                  lockedBy: {
-                    include: { worker: true },
+                select: {
+                  id: true,
+                  createdAt: true,
+                  updatedAt: true,
+                  executedAt: true,
+                  baseCostInCents: true,
+                  projectId: true,
+                  organizationId: true,
+                  friendlyId: true,
+                  lockedById: true,
+                  lockedQueueId: true,
+                  queue: true,
+                  attemptNumber: true,
+                  status: true,
+                  ttl: true,
+                  metadata: true,
+                  metadataType: true,
+                  machinePreset: true,
+                  payload: true,
+                  payloadType: true,
+                  runTags: true,
+                  isTest: true,
+                  idempotencyKey: true,
+                  idempotencyKeyOptions: true,
+                  startedAt: true,
+                  maxAttempts: true,
+                  taskVersion: true,
+                  maxDurationInSeconds: true,
+                  usageDurationMs: true,
+                  costInCents: true,
+                  traceContext: true,
+                  priorityMs: true,
+                  batchId: true,
+                  realtimeStreamsVersion: true,
+                  runtimeEnvironment: {
+                    select: {
+                      id: true,
+                      slug: true,
+                      type: true,
+                      branchName: true,
+                      git: true,
+                      organizationId: true,
+                    },
                   },
+                  parentTaskRunId: true,
+                  rootTaskRunId: true,
+                  workerQueue: true,
+                  taskEventStore: true,
                 },
               });
 
@@ -202,9 +458,8 @@ export class RunAttemptSystem {
                 run,
                 snapshot: {
                   executionStatus: "EXECUTING",
-                  description: `Attempt created, starting execution${
-                    isWarmStart ? " (warm start)" : ""
-                  }`,
+                  description: `Attempt created, starting execution${isWarmStart ? " (warm start)" : ""
+                    }`,
                 },
                 previousSnapshotId: latestSnapshot.id,
                 environmentId: latestSnapshot.environmentId,
@@ -222,7 +477,7 @@ export class RunAttemptSystem {
                 await this.$.worker.ack(`expireRun:${taskRun.id}`);
               }
 
-              return { run, snapshot: newSnapshot };
+              return { updatedRun: run, snapshot: newSnapshot };
             },
             (error) => {
               this.$.logger.error("RunEngine.createRunAttempt(): prisma.$transaction error", {
@@ -247,56 +502,58 @@ export class RunAttemptSystem {
             throw new ServiceValidationError("Failed to create task run attempt", 500);
           }
 
-          const { run, snapshot } = result;
+          const { updatedRun, snapshot } = result;
 
           this.$.eventBus.emit("runAttemptStarted", {
             time: new Date(),
             run: {
-              id: run.id,
-              status: run.status,
-              createdAt: run.createdAt,
-              updatedAt: run.updatedAt,
+              id: updatedRun.id,
+              status: updatedRun.status,
+              createdAt: updatedRun.createdAt,
+              updatedAt: updatedRun.updatedAt,
               attemptNumber: nextAttemptNumber,
-              baseCostInCents: run.baseCostInCents,
-              executedAt: run.executedAt ?? undefined,
+              baseCostInCents: updatedRun.baseCostInCents,
+              executedAt: updatedRun.executedAt ?? undefined,
             },
             organization: {
-              id: environment.organization.id,
+              id: updatedRun.runtimeEnvironment.organizationId,
             },
             project: {
-              id: environment.project.id,
+              id: updatedRun.projectId,
             },
             environment: {
-              id: environment.id,
+              id: updatedRun.runtimeEnvironment.id,
             },
           });
 
-          const machinePreset = getMachinePreset({
-            machines: this.options.machines.machines,
-            defaultMachine: this.options.machines.defaultMachine,
-            config: taskRun.lockedBy.machineConfig ?? {},
-            run: taskRun,
-          });
-
-          const metadata = await parsePacket({
-            data: taskRun.metadata ?? undefined,
-            dataType: taskRun.metadataType,
-          });
-
-          let git: GitMeta | undefined = undefined;
-          if (environment.git) {
-            const parsed = GitMeta.safeParse(environment.git);
-            if (parsed.success) {
-              git = parsed.data;
-            }
-          }
-
-          const execution: TaskRunExecution = {
-            task: {
-              id: run.lockedBy!.slug,
-              filePath: run.lockedBy!.filePath,
-              exportName: run.lockedBy!.exportName ?? undefined,
-            },
+          const environmentGit = safeParseGitMeta(updatedRun.runtimeEnvironment.git);
+
+          const [metadata, task, queue, organization, project, machinePreset, deployment] =
+            await Promise.all([
+              parsePacket({
+                data: updatedRun.metadata ?? undefined,
+                dataType: updatedRun.metadataType,
+              }),
+              this.#resolveTaskRunExecutionTask(taskRun.lockedById),
+              this.#resolveTaskRunExecutionQueue({
+                lockedQueueId: updatedRun.lockedQueueId ?? undefined,
+                queueName: updatedRun.queue,
+                runtimeEnvironmentId: updatedRun.runtimeEnvironment.id,
+              }),
+              this.#resolveTaskRunExecutionOrganization(
+                updatedRun.runtimeEnvironment.organizationId
+              ),
+              this.#resolveTaskRunExecutionProjectByRuntimeEnvironmentId(
+                updatedRun.runtimeEnvironment.id
+              ),
+              this.#resolveTaskRunExecutionMachinePreset(
+                taskRun.lockedById,
+                updatedRun.machinePreset
+              ),
+              this.#resolveTaskRunExecutionDeployment(taskRun.lockedById),
+            ]);
+
+          const execution: BackwardsCompatibleTaskRunExecution = {
             attempt: {
               number: nextAttemptNumber,
               startedAt: latestSnapshot.updatedAt,
@@ -310,59 +567,62 @@ export class RunAttemptSystem {
               status: "deprecated",
             },
             run: {
-              id: run.friendlyId,
-              payload: run.payload,
-              payloadType: run.payloadType,
-              createdAt: run.createdAt,
-              tags: run.tags.map((tag) => tag.name),
-              isTest: run.isTest,
-              idempotencyKey: run.idempotencyKey ?? undefined,
-              startedAt: run.startedAt ?? run.createdAt,
-              maxAttempts: run.maxAttempts ?? undefined,
-              version: run.lockedBy!.worker.version,
+              id: updatedRun.friendlyId,
+              payload: updatedRun.payload,
+              payloadType: updatedRun.payloadType,
+              createdAt: updatedRun.createdAt,
+              tags: updatedRun.runTags,
+              isTest: updatedRun.isTest,
+              idempotencyKey: getUserProvidedIdempotencyKey(updatedRun) ?? undefined,
+              idempotencyKeyScope: extractIdempotencyKeyScope(updatedRun),
+              startedAt: updatedRun.startedAt ?? updatedRun.createdAt,
+              maxAttempts: updatedRun.maxAttempts ?? undefined,
+              version: updatedRun.taskVersion ?? "unknown",
               metadata,
-              maxDuration: run.maxDurationInSeconds ?? undefined,
+              maxDuration: updatedRun.maxDurationInSeconds ?? undefined,
               /** @deprecated */
               context: undefined,
               /** @deprecated */
-              durationMs: run.usageDurationMs,
+              durationMs: updatedRun.usageDurationMs,
               /** @deprecated */
-              costInCents: run.costInCents,
+              costInCents: updatedRun.costInCents,
               /** @deprecated */
-              baseCostInCents: run.baseCostInCents,
-              traceContext: run.traceContext as Record<string, string | undefined>,
-              priority: run.priorityMs === 0 ? undefined : run.priorityMs / 1_000,
-            },
-            queue: {
-              id: queue.friendlyId,
-              name: queue.name,
+              baseCostInCents: updatedRun.baseCostInCents,
+              traceContext: updatedRun.traceContext as Record<string, string | undefined>,
+              priority: updatedRun.priorityMs === 0 ? undefined : updatedRun.priorityMs / 1_000,
+              parentTaskRunId: updatedRun.parentTaskRunId
+                ? RunId.toFriendlyId(updatedRun.parentTaskRunId)
+                : undefined,
+              rootTaskRunId: updatedRun.rootTaskRunId
+                ? RunId.toFriendlyId(updatedRun.rootTaskRunId)
+                : undefined,
+              region:
+                updatedRun.runtimeEnvironment.type !== "DEVELOPMENT"
+                  ? updatedRun.workerQueue
+                  : undefined,
+              realtimeStreamsVersion: updatedRun.realtimeStreamsVersion ?? undefined,
             },
+            task,
+            queue,
             environment: {
-              id: environment.id,
-              slug: environment.slug,
-              type: environment.type,
-              branchName: environment.branchName ?? undefined,
-              git,
+              id: updatedRun.runtimeEnvironment.id,
+              slug: updatedRun.runtimeEnvironment.slug,
+              type: updatedRun.runtimeEnvironment.type,
+              branchName: updatedRun.runtimeEnvironment.branchName ?? undefined,
+              git: environmentGit,
             },
-            organization: {
-              id: environment.organization.id,
-              slug: environment.organization.slug,
-              name: environment.organization.title,
-            },
-            project: {
-              id: environment.project.id,
-              ref: environment.project.externalRef,
-              slug: environment.project.slug,
-              name: environment.project.name,
-            },
-            batch:
-              taskRun.batchItems[0] && taskRun.batchItems[0].batchTaskRun
-                ? { id: taskRun.batchItems[0].batchTaskRun.friendlyId }
-                : undefined,
+            organization,
+            project,
             machine: machinePreset,
+            deployment,
+            batch: updatedRun.batchId
+              ? {
+                id: BatchId.toFriendlyId(updatedRun.batchId),
+              }
+              : undefined,
           };
 
-          return { run, snapshot, execution };
+          return { run: updatedRun, snapshot, execution };
         });
       },
       {
@@ -438,10 +698,39 @@ export class RunAttemptSystem {
             throw new ServiceValidationError("Snapshot ID doesn't match the latest snapshot", 400);
           }
 
+          if (latestSnapshot.executionStatus === "FINISHED") {
+            throw new ServiceValidationError("Run is already finished", 400);
+          }
+
           span.setAttribute("completionStatus", completion.ok);
+          span.setAttribute("runId", runId);
 
           const completedAt = new Date();
 
+          // Read current usage values to calculate new totals (safe under runLock)
+          const currentRun = await this.$.readOnlyPrisma.taskRun.findFirst({
+            where: { id: runId },
+            select: {
+              usageDurationMs: true,
+              costInCents: true,
+              machinePreset: true,
+            },
+          });
+
+          if (!currentRun) {
+            throw new ServiceValidationError("Run not found", 404);
+          }
+
+          // Calculate new usage totals
+          const updatedUsage = this.#calculateUpdatedUsage({
+            runId,
+            currentUsageDurationMs: currentRun.usageDurationMs,
+            currentCostInCents: currentRun.costInCents,
+            attemptDurationMs: completion.usage?.durationMs ?? 0,
+            machinePresetName: currentRun.machinePreset,
+            environmentType: latestSnapshot.environmentType,
+          });
+
           const run = await prisma.taskRun.update({
             where: { id: runId },
             data: {
@@ -449,6 +738,8 @@ export class RunAttemptSystem {
               completedAt,
               output: completion.output,
               outputType: completion.outputType,
+              usageDurationMs: updatedUsage.usageDurationMs,
+              costInCents: updatedUsage.costInCents,
               executionSnapshots: {
                 create: {
                   executionStatus: "FINISHED",
@@ -591,6 +882,10 @@ export class RunAttemptSystem {
             throw new ServiceValidationError("Snapshot ID doesn't match the latest snapshot", 400);
           }
 
+          if (latestSnapshot.executionStatus === "FINISHED") {
+            throw new ServiceValidationError("Run is already finished", 400);
+          }
+
           span.setAttribute("completionStatus", completion.ok);
 
           //remove waitpoints blocking the run
@@ -601,7 +896,7 @@ export class RunAttemptSystem {
 
           const failedAt = new Date();
 
-          const retryResult = await retryOutcomeFromCompletion(prisma, {
+          const retryResult = await retryOutcomeFromCompletion(this.$.readOnlyPrisma, {
             runId,
             error: completion.error,
             retryUsingQueue: forceRequeue ?? false,
@@ -611,7 +906,7 @@ export class RunAttemptSystem {
 
           // Force requeue means it was crashed so the attempt span needs to be closed
           if (forceRequeue) {
-            const minimalRun = await prisma.taskRun.findFirst({
+            const minimalRun = await this.$.readOnlyPrisma.taskRun.findFirst({
               where: {
                 id: runId,
               },
@@ -658,6 +953,7 @@ export class RunAttemptSystem {
                 completedAt: failedAt,
                 reason: retryResult.reason,
                 finalizeRun: true,
+                attemptDurationMs: completion.usage?.durationMs,
                 tx: prisma,
               });
               return {
@@ -671,23 +967,36 @@ export class RunAttemptSystem {
             case "fail_run": {
               return await this.#permanentlyFailRun({
                 runId,
-                snapshotId,
+                latestSnapshot,
                 failedAt,
                 error: retryResult.sanitizedError,
                 workerId,
                 runnerId,
+                attemptDurationMs: completion.usage?.durationMs,
               });
             }
             case "retry": {
               const retryAt = new Date(retryResult.settings.timestamp);
 
+              // Calculate new usage totals using the current machine's rate
+              // (retryResult includes current usage values from the read in retryOutcomeFromCompletion)
+              const updatedUsage = this.#calculateUpdatedUsage({
+                runId,
+                currentUsageDurationMs: retryResult.usageDurationMs,
+                currentCostInCents: retryResult.costInCents,
+                attemptDurationMs: completion.usage?.durationMs ?? 0,
+                machinePresetName: retryResult.machinePreset,
+                environmentType: latestSnapshot.environmentType,
+              });
+
               const run = await prisma.taskRun.update({
                 where: {
                   id: runId,
                 },
                 data: {
-                  status: "RETRYING_AFTER_FAILURE",
                   machinePreset: retryResult.machine,
+                  usageDurationMs: updatedUsage.usageDurationMs,
+                  costInCents: updatedUsage.costInCents,
                 },
                 include: {
                   runtimeEnvironment: {
@@ -736,6 +1045,7 @@ export class RunAttemptSystem {
                   updatedAt: run.updatedAt,
                   error: completion.error,
                   createdAt: run.createdAt,
+                  taskEventStore: run.taskEventStore,
                 },
                 organization: {
                   id: run.runtimeEnvironment.organizationId,
@@ -878,6 +1188,9 @@ export class RunAttemptSystem {
     error,
     workerId,
     runnerId,
+    checkpointId,
+    completedWaitpoints,
+    batchId,
     tx,
   }: {
     run: TaskRun;
@@ -891,12 +1204,18 @@ export class RunAttemptSystem {
     error: TaskRunInternalError;
     workerId?: string;
     runnerId?: string;
+    checkpointId?: string;
     tx?: PrismaClientOrTransaction;
+    completedWaitpoints?: {
+      id: string;
+      index?: number;
+    }[];
+    batchId?: string;
   }): Promise<{ wasRequeued: boolean } & ExecutionResult> {
     const prisma = tx ?? this.$.prisma;
 
     return await this.$.runLock.lock("tryNackAndRequeue", [run.id], async () => {
-      //we nack the message, this allows another work to pick up the run
+      //we nack the message, this allows another worker to pick up the run
       const gotRequeued = await this.$.runQueue.nackMessage({
         orgId,
         messageId: run.id,
@@ -912,8 +1231,22 @@ export class RunAttemptSystem {
         return { wasRequeued: false, ...result };
       }
 
+      const requeuedRun = await prisma.taskRun.update({
+        where: {
+          id: run.id,
+        },
+        data: {
+          status: "PENDING",
+        },
+        select: {
+          id: true,
+          status: true,
+          attemptNumber: true,
+        },
+      });
+
       const newSnapshot = await this.executionSnapshotSystem.createExecutionSnapshot(prisma, {
-        run: run,
+        run: requeuedRun,
         snapshot: {
           executionStatus: "QUEUED",
           description: "Requeued the run after a failure",
@@ -924,6 +1257,9 @@ export class RunAttemptSystem {
         organizationId: orgId,
         workerId,
         runnerId,
+        checkpointId,
+        completedWaitpoints,
+        batchId,
       });
 
       return {
@@ -950,6 +1286,7 @@ export class RunAttemptSystem {
   If the run is in-progress it will change it's state to PENDING_CANCEL and notify the worker.
   If the run is not in-progress it will finish it.
   You can pass `finalizeRun` in if you know it's no longer running, e.g. the worker has messaged to say it's done.
+  You can optionally pass `attemptDurationMs` if you have completion data with usage info.
   */
   async cancelRun({
     runId,
@@ -959,6 +1296,7 @@ export class RunAttemptSystem {
     reason,
     finalizeRun,
     bulkActionId,
+    attemptDurationMs,
     tx,
   }: {
     runId: string;
@@ -968,10 +1306,11 @@ export class RunAttemptSystem {
     reason?: string;
     finalizeRun?: boolean;
     bulkActionId?: string;
+    attemptDurationMs?: number;
     tx?: PrismaClientOrTransaction;
   }): Promise<ExecutionResult & { alreadyFinished: boolean }> {
     const prisma = tx ?? this.$.prisma;
-    reason = reason ?? "Cancelled by user";
+    reason = reason ?? "Canceled by user";
 
     return startSpan(this.$.tracer, "cancelRun", async (span) => {
       return this.$.runLock.lock("cancelRun", [runId], async () => {
@@ -1014,6 +1353,32 @@ export class RunAttemptSystem {
           raw: reason,
         };
 
+        // Calculate updated usage if we have attempt duration data
+        let usageUpdate: { usageDurationMs: number; costInCents: number } | undefined;
+        if (attemptDurationMs !== undefined) {
+          const currentRun = await this.$.readOnlyPrisma.taskRun.findFirst({
+            where: { id: runId },
+            select: {
+              usageDurationMs: true,
+              costInCents: true,
+              machinePreset: true,
+            },
+          });
+
+          if (!currentRun) {
+            throw new ServiceValidationError("Run not found", 404);
+          }
+
+          usageUpdate = this.#calculateUpdatedUsage({
+            runId,
+            currentUsageDurationMs: currentRun.usageDurationMs,
+            currentCostInCents: currentRun.costInCents,
+            attemptDurationMs,
+            machinePresetName: currentRun.machinePreset,
+            environmentType: latestSnapshot.environmentType,
+          });
+        }
+
         const run = await prisma.taskRun.update({
           where: { id: runId },
           data: {
@@ -1022,9 +1387,13 @@ export class RunAttemptSystem {
             error,
             bulkActionGroupIds: bulkActionId
               ? {
-                  push: bulkActionId,
-                }
+                push: bulkActionId,
+              }
               : undefined,
+            ...(usageUpdate && {
+              usageDurationMs: usageUpdate.usageDurationMs,
+              costInCents: usageUpdate.costInCents,
+            }),
           },
           select: {
             id: true,
@@ -1068,7 +1437,10 @@ export class RunAttemptSystem {
         });
 
         //if executing, we need to message the worker to cancel the run and put it into `PENDING_CANCEL` status
-        if (isExecuting(latestSnapshot.executionStatus)) {
+        if (
+          isExecuting(latestSnapshot.executionStatus) ||
+          isPendingExecuting(latestSnapshot.executionStatus)
+        ) {
           const newSnapshot = await this.executionSnapshotSystem.createExecutionSnapshot(prisma, {
             run,
             snapshot: {
@@ -1172,23 +1544,51 @@ export class RunAttemptSystem {
 
   async #permanentlyFailRun({
     runId,
-    snapshotId,
+    latestSnapshot,
     failedAt,
     error,
     workerId,
     runnerId,
+    attemptDurationMs,
   }: {
     runId: string;
-    snapshotId?: string;
+    latestSnapshot: EnhancedExecutionSnapshot;
     failedAt: Date;
     error: TaskRunError;
     workerId?: string;
     runnerId?: string;
+    attemptDurationMs?: number;
   }): Promise<CompleteRunAttemptResult> {
     const prisma = this.$.prisma;
 
     return startSpan(this.$.tracer, "permanentlyFailRun", async (span) => {
-      const status = runStatusFromError(error);
+      const status = runStatusFromError(error, latestSnapshot.environmentType);
+
+      const truncatedError = this.#truncateTaskRunError(error);
+
+      // Read current usage values to calculate new totals
+      const currentRun = await this.$.readOnlyPrisma.taskRun.findFirst({
+        where: { id: runId },
+        select: {
+          usageDurationMs: true,
+          costInCents: true,
+          machinePreset: true,
+        },
+      });
+
+      if (!currentRun) {
+        throw new ServiceValidationError("Run not found", 404);
+      }
+
+      // Calculate new usage totals
+      const updatedUsage = this.#calculateUpdatedUsage({
+        runId,
+        currentUsageDurationMs: currentRun.usageDurationMs,
+        currentCostInCents: currentRun.costInCents,
+        attemptDurationMs: attemptDurationMs ?? 0,
+        machinePresetName: currentRun.machinePreset,
+        environmentType: latestSnapshot.environmentType,
+      });
 
       //run permanently failed
       const run = await prisma.taskRun.update({
@@ -1198,7 +1598,9 @@ export class RunAttemptSystem {
         data: {
           status,
           completedAt: failedAt,
-          error,
+          error: truncatedError,
+          usageDurationMs: updatedUsage.usageDurationMs,
+          costInCents: updatedUsage.costInCents,
         },
         select: {
           id: true,
@@ -1241,7 +1643,7 @@ export class RunAttemptSystem {
           executionStatus: "FINISHED",
           description: "Run failed",
         },
-        previousSnapshotId: snapshotId,
+        previousSnapshotId: latestSnapshot.id,
         environmentId: run.runtimeEnvironment.id,
         environmentType: run.runtimeEnvironment.type,
         projectId: run.runtimeEnvironment.project.id,
@@ -1260,7 +1662,7 @@ export class RunAttemptSystem {
 
       await this.waitpointSystem.completeWaitpoint({
         id: run.associatedWaitpoint.id,
-        output: { value: JSON.stringify(error), isError: true },
+        output: { value: JSON.stringify(truncatedError), isError: true },
       });
 
       this.$.eventBus.emit("runFailed", {
@@ -1311,27 +1713,250 @@ export class RunAttemptSystem {
     await this.$.worker.ack(`heartbeatSnapshot.${id}`);
   }
 
-  async #getAuthenticatedEnvironmentFromRun(runId: string, tx?: PrismaClientOrTransaction) {
-    const prisma = tx ?? this.$.prisma;
-    const taskRun = await prisma.taskRun.findFirst({
-      where: {
-        id: runId,
-      },
-      include: {
-        runtimeEnvironment: {
-          include: {
-            organization: true,
-            project: true,
+  async #resolveTaskRunExecutionTask(
+    backgroundWorkerTaskId: string
+  ): Promise<BackwardsCompatibleTaskRunExecution["task"]> {
+    const result = await this.cache.tasks.swr(backgroundWorkerTaskId, async () => {
+      const task = await this.$.readOnlyPrisma.backgroundWorkerTask.findFirstOrThrow({
+        where: {
+          id: backgroundWorkerTaskId,
+        },
+        select: {
+          id: true,
+          slug: true,
+          filePath: true,
+          exportName: true,
+        },
+      });
+
+      return {
+        id: task.slug,
+        filePath: task.filePath,
+        exportName: task.exportName ?? undefined,
+      };
+    });
+
+    if (result.err) {
+      throw result.err;
+    }
+
+    if (!result.val) {
+      throw new ServiceValidationError(
+        `Could not resolve task execution data for task ${backgroundWorkerTaskId}`
+      );
+    }
+
+    return result.val;
+  }
+
+  async #resolveTaskRunExecutionOrganization(
+    organizationId: string
+  ): Promise<TaskRunExecutionOrganization> {
+    const result = await this.cache.orgs.swr(organizationId, async () => {
+      const organization = await this.$.readOnlyPrisma.organization.findFirstOrThrow({
+        where: { id: organizationId },
+        select: {
+          id: true,
+          title: true,
+          slug: true,
+        },
+      });
+
+      return {
+        id: organization.id,
+        name: organization.title,
+        slug: organization.slug,
+      };
+    });
+
+    if (result.err) {
+      throw result.err;
+    }
+
+    if (!result.val) {
+      throw new ServiceValidationError(
+        `Could not resolve organization data for organization ${organizationId}`
+      );
+    }
+
+    return result.val;
+  }
+
+  async #resolveTaskRunExecutionProjectByRuntimeEnvironmentId(
+    runtimeEnvironmentId: string
+  ): Promise<TaskRunExecutionProject> {
+    const result = await this.cache.projects.swr(runtimeEnvironmentId, async () => {
+      const { project } = await this.$.readOnlyPrisma.runtimeEnvironment.findFirstOrThrow({
+        where: { id: runtimeEnvironmentId },
+        select: {
+          id: true,
+          project: {
+            select: {
+              id: true,
+              name: true,
+              slug: true,
+              externalRef: true,
+            },
           },
         },
-      },
+      });
+
+      return {
+        id: project.id,
+        name: project.name,
+        slug: project.slug,
+        ref: project.externalRef,
+      };
     });
 
-    if (!taskRun) {
-      return;
+    if (result.err) {
+      throw result.err;
+    }
+
+    if (!result.val) {
+      throw new ServiceValidationError(
+        `Could not resolve project data for project ${runtimeEnvironmentId}`
+      );
+    }
+
+    return result.val;
+  }
+
+  async #resolveTaskRunExecutionMachinePreset(
+    backgroundWorkerTaskId: string,
+    runMachinePreset: string | null
+  ): Promise<MachinePreset> {
+    if (runMachinePreset) {
+      return machinePresetFromName(
+        this.options.machines.machines,
+        runMachinePreset as MachinePresetName
+      );
+    }
+
+    const result = await this.cache.machinePresets.swr(backgroundWorkerTaskId, async () => {
+      const { machineConfig } = await this.$.readOnlyPrisma.backgroundWorkerTask.findFirstOrThrow({
+        where: {
+          id: backgroundWorkerTaskId,
+        },
+        select: {
+          machineConfig: true,
+        },
+      });
+
+      return getMachinePreset({
+        machines: this.options.machines.machines,
+        defaultMachine: this.options.machines.defaultMachine,
+        config: machineConfig,
+        run: { machinePreset: null },
+      });
+    });
+
+    if (result.err) {
+      throw result.err;
+    }
+
+    if (!result.val) {
+      throw new ServiceValidationError(
+        `Could not resolve machine preset for task ${backgroundWorkerTaskId}`
+      );
+    }
+
+    return result.val;
+  }
+
+  async #resolveTaskRunExecutionQueue(params: {
+    lockedQueueId?: string;
+    queueName: string;
+    runtimeEnvironmentId: string;
+  }): Promise<TaskRunExecutionQueue> {
+    // Cache key should be based on queue identity, not run ID
+    // Using lockedQueueId if available, otherwise environment + queue name
+    const cacheKey = params.lockedQueueId ?? `${params.runtimeEnvironmentId}:${params.queueName}`;
+    const result = await this.cache.queues.swr(cacheKey, async () => {
+      const queue = params.lockedQueueId
+        ? await this.$.readOnlyPrisma.taskQueue.findFirst({
+          where: {
+            id: params.lockedQueueId,
+          },
+          select: {
+            id: true,
+            friendlyId: true,
+            name: true,
+          },
+        })
+        : await this.$.readOnlyPrisma.taskQueue.findFirst({
+          where: {
+            runtimeEnvironmentId: params.runtimeEnvironmentId,
+            name: params.queueName,
+          },
+          select: {
+            id: true,
+            friendlyId: true,
+            name: true,
+          },
+        });
+
+      if (!queue) {
+        throw new ServiceValidationError(
+          `Could not resolve queue data for queue ${params.queueName}`,
+          404
+        );
+      }
+
+      return {
+        id: queue.friendlyId,
+        name: queue.name,
+      };
+    });
+
+    if (result.err) {
+      throw result.err;
+    }
+
+    if (!result.val) {
+      throw new ServiceValidationError(
+        `Could not resolve queue data for queue ${params.queueName}`,
+        404
+      );
+    }
+
+    return result.val;
+  }
+
+  async #resolveTaskRunExecutionDeployment(
+    backgroundWorkerTaskId: string
+  ): Promise<TaskRunExecutionDeployment | undefined> {
+    const result = await this.cache.deployments.swr(backgroundWorkerTaskId, async () => {
+      const { worker } = await this.$.readOnlyPrisma.backgroundWorkerTask.findFirstOrThrow({
+        where: { id: backgroundWorkerTaskId },
+        select: {
+          worker: {
+            select: {
+              deployment: true,
+            },
+          },
+        },
+      });
+
+      if (!worker.deployment) {
+        return undefined;
+      }
+
+      return {
+        id: worker.deployment.friendlyId,
+        shortCode: worker.deployment.shortCode,
+        version: worker.deployment.version,
+        runtime: worker.deployment.runtime ?? "unknown",
+        runtimeVersion: worker.deployment.runtimeVersion ?? "unknown",
+        git: safeParseGitMeta(worker.deployment.git),
+      };
+    });
+
+    if (result.err) {
+      throw result.err;
     }
 
-    return taskRun?.runtimeEnvironment;
+    return result.val;
   }
 
   async #notifyMetadataUpdated(runId: string, completion: TaskRunExecutionResult) {
@@ -1385,4 +2010,93 @@ export class RunAttemptSystem {
       });
     }
   }
+
+  #truncateTaskRunError(error: TaskRunError): TaskRunError {
+    if (error.type !== "BUILT_IN_ERROR") {
+      return error;
+    }
+
+    return {
+      type: "BUILT_IN_ERROR",
+      name: truncateString(error.name, 1024),
+      message: truncateString(error.message, 1024 * 16), // 16kb
+      stackTrace: truncateString(error.stackTrace, 1024 * 16), // 16kb
+    };
+  }
+
+  // PostgreSQL int4 max value (~24.85 days in milliseconds)
+  static readonly MAX_INT4 = 2_147_483_647;
+
+  /**
+   * Calculates the updated usage values for a run by adding the attempt's usage to the current totals.
+   * This should be called under the runLock to ensure safe read-modify-write.
+   * Cost is only calculated for non-dev environments.
+   */
+  #calculateUpdatedUsage({
+    runId,
+    currentUsageDurationMs,
+    currentCostInCents,
+    attemptDurationMs,
+    machinePresetName,
+    environmentType,
+  }: {
+    runId: string;
+    currentUsageDurationMs: number;
+    currentCostInCents: number;
+    attemptDurationMs: number;
+    machinePresetName: string | null;
+    environmentType: RuntimeEnvironmentType;
+  }): { usageDurationMs: number; costInCents: number } {
+    let usageDurationMs = currentUsageDurationMs + attemptDurationMs;
+
+    // Overflow protection: cap at PostgreSQL int4 max value
+    if (usageDurationMs > RunAttemptSystem.MAX_INT4) {
+      this.$.logger.error("usageDurationMs overflow detected, capping at max int4 value", {
+        runId,
+        currentUsageDurationMs,
+        attemptDurationMs,
+        calculatedTotal: usageDurationMs,
+        cappedAt: RunAttemptSystem.MAX_INT4,
+      });
+      usageDurationMs = RunAttemptSystem.MAX_INT4;
+    }
+
+    // Only calculate cost for non-dev environments
+    let costInCents = currentCostInCents;
+    if (environmentType !== "DEVELOPMENT") {
+      const machinePreset = machinePresetName
+        ? machinePresetFromName(
+          this.options.machines.machines,
+          machinePresetName as MachinePresetName
+        )
+        : machinePresetFromName(
+          this.options.machines.machines,
+          this.options.machines.defaultMachine
+        );
+
+      costInCents = currentCostInCents + attemptDurationMs * machinePreset.centsPerMs;
+    }
+
+    return {
+      usageDurationMs,
+      costInCents,
+    };
+  }
+
+}
+
+export function safeParseGitMeta(git: unknown): GitMeta | undefined {
+  const parsed = GitMeta.safeParse(git);
+  if (parsed.success) {
+    return parsed.data;
+  }
+  return undefined;
+}
+
+function truncateString(str: string | undefined, maxLength: number): string {
+  if (!str) {
+    return "";
+  }
+
+  return str.slice(0, maxLength);
 }
diff --git a/internal-packages/run-engine/src/engine/systems/systems.ts b/internal-packages/run-engine/src/engine/systems/systems.ts
index 35790259b44..909df712105 100644
--- a/internal-packages/run-engine/src/engine/systems/systems.ts
+++ b/internal-packages/run-engine/src/engine/systems/systems.ts
@@ -1,6 +1,6 @@
 import { Meter, Tracer } from "@internal/tracing";
 import { Logger } from "@trigger.dev/core/logger";
-import { PrismaClient } from "@trigger.dev/database";
+import { PrismaClient, PrismaReplicaClient } from "@trigger.dev/database";
 import { RunQueue } from "../../run-queue/index.js";
 import { EventBus } from "../eventBus.js";
 import { RunLocker } from "../locking.js";
@@ -9,6 +9,7 @@ import { RaceSimulationSystem } from "./raceSimulationSystem.js";
 
 export type SystemResources = {
   prisma: PrismaClient;
+  readOnlyPrisma: PrismaReplicaClient;
   worker: EngineWorker;
   eventBus: EventBus;
   logger: Logger;
diff --git a/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts b/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
index 236afe008c6..40a92abb550 100644
--- a/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
+++ b/internal-packages/run-engine/src/engine/systems/waitpointSystem.ts
@@ -21,6 +21,22 @@ export type WaitpointSystemOptions = {
   enqueueSystem: EnqueueSystem;
 };
 
+type WaitpointContinuationWaitpoint = Pick<Waitpoint, "id" | "type" | "completedAfter" | "status">;
+
+export type WaitpointContinuationResult =
+  | {
+      status: "unblocked";
+      waitpoints: Array<WaitpointContinuationWaitpoint>;
+    }
+  | {
+      status: "skipped";
+      reason: string;
+    }
+  | {
+      status: "blocked";
+      waitpoints: Array<WaitpointContinuationWaitpoint>;
+    };
+
 export class WaitpointSystem {
   private readonly $: SystemResources;
   private readonly executionSnapshotSystem: ExecutionSnapshotSystem;
@@ -63,8 +79,8 @@ export class WaitpointSystem {
     };
   }): Promise<Waitpoint> {
     // 1. Complete the Waitpoint (if not completed)
-    let [waitpointError, waitpoint] = await tryCatch(
-      this.$.prisma.waitpoint.update({
+    const [updateError, updateResult] = await tryCatch(
+      this.$.prisma.waitpoint.updateMany({
         where: { id, status: "PENDING" },
         data: {
           status: "COMPLETED",
@@ -76,29 +92,32 @@ export class WaitpointSystem {
       })
     );
 
-    if (waitpointError) {
-      if (
-        waitpointError instanceof Prisma.PrismaClientKnownRequestError &&
-        waitpointError.code === "P2025"
-      ) {
-        waitpoint = await this.$.prisma.waitpoint.findFirst({
-          where: { id },
-        });
-      } else {
-        this.$.logger.log("completeWaitpoint: error updating waitpoint:", { waitpointError });
-        throw waitpointError;
-      }
+    if (updateError) {
+      this.$.logger.error("completeWaitpoint: error updating waitpoint:", { updateError });
+      throw updateError;
+    }
+
+    if (updateResult.count === 0) {
+      this.$.logger.info(
+        "completeWaitpoint: attempted to complete a waitpoint that is not PENDING",
+        { waitpointId: id }
+      );
     }
 
+    const waitpoint = await this.$.prisma.waitpoint.findFirst({
+      where: { id },
+    });
+
     if (!waitpoint) {
-      throw new Error(`Waitpoint ${id} not found`);
+      this.$.logger.error("completeWaitpoint: waitpoint not found", { waitpointId: id });
+      throw new Error("Waitpoint not found");
     }
 
     if (waitpoint.status !== "COMPLETED") {
       this.$.logger.error(`completeWaitpoint: waitpoint is not completed`, {
         waitpointId: id,
       });
-      throw new Error(`Waitpoint ${id} is not completed`);
+      throw new Error("Waitpoint not completed");
     }
 
     // 2. Find the TaskRuns blocked by this waitpoint
@@ -144,6 +163,7 @@ export class WaitpointSystem {
           },
           blockedRunId: run.taskRunId,
           hasError: output?.isError ?? false,
+          cachedRunId: waitpoint.completedByTaskRunId ?? undefined,
         });
       }
     }
@@ -480,7 +500,7 @@ export class WaitpointSystem {
     runId,
   }: {
     runId: string;
-  }): Promise<"blocked" | "unblocked" | "skipped"> {
+  }): Promise<WaitpointContinuationResult> {
     this.$.logger.debug(`continueRunIfUnblocked: start`, {
       runId,
     });
@@ -496,7 +516,7 @@ export class WaitpointSystem {
           batchId: true,
           batchIndex: true,
           waitpoint: {
-            select: { id: true, status: true },
+            select: { id: true, status: true, type: true, completedAfter: true },
           },
         },
       });
@@ -507,7 +527,11 @@ export class WaitpointSystem {
           runId,
           blockingWaitpoints,
         });
-        return "blocked";
+
+        return {
+          status: "blocked",
+          waitpoints: blockingWaitpoints.map((w) => w.waitpoint),
+        };
       }
 
       // 3. Get the run with environment
@@ -547,7 +571,22 @@ export class WaitpointSystem {
             executionStatus: snapshot.executionStatus,
           });
 
-          return "skipped";
+          return {
+            status: "skipped",
+            reason: "run is already executing",
+          };
+        }
+        case "DELAYED": {
+          this.$.logger.debug(`continueRunIfUnblocked: run is delayed, skipping`, {
+            runId,
+            snapshot,
+            executionStatus: snapshot.executionStatus,
+          });
+
+          return {
+            status: "skipped",
+            reason: "run is delayed",
+          };
         }
         case "QUEUED": {
           this.$.logger.info(`continueRunIfUnblocked: run is queued, skipping`, {
@@ -556,7 +595,10 @@ export class WaitpointSystem {
             executionStatus: snapshot.executionStatus,
           });
 
-          return "skipped";
+          return {
+            status: "skipped",
+            reason: "run is already queued",
+          };
         }
         case "PENDING_EXECUTING": {
           this.$.logger.info(`continueRunIfUnblocked: run is pending executing, skipping`, {
@@ -565,7 +607,10 @@ export class WaitpointSystem {
             executionStatus: snapshot.executionStatus,
           });
 
-          return "skipped";
+          return {
+            status: "skipped",
+            reason: "run is already pending executing",
+          };
         }
         case "QUEUED_EXECUTING": {
           this.$.logger.info(`continueRunIfUnblocked: run is already queued executing, skipping`, {
@@ -574,7 +619,10 @@ export class WaitpointSystem {
             executionStatus: snapshot.executionStatus,
           });
 
-          return "skipped";
+          return {
+            status: "skipped",
+            reason: "run is already queued executing",
+          };
         }
         case "EXECUTING": {
           this.$.logger.info(`continueRunIfUnblocked: run is already executing, skipping`, {
@@ -583,7 +631,10 @@ export class WaitpointSystem {
             executionStatus: snapshot.executionStatus,
           });
 
-          return "skipped";
+          return {
+            status: "skipped",
+            reason: "run is already executing",
+          };
         }
         case "PENDING_CANCEL":
         case "FINISHED": {
@@ -592,7 +643,10 @@ export class WaitpointSystem {
             snapshot,
             executionStatus: snapshot.executionStatus,
           });
-          return "skipped";
+          return {
+            status: "skipped",
+            reason: "run is finished",
+          };
         }
         case "EXECUTING_WITH_WAITPOINTS": {
           const newSnapshot = await this.executionSnapshotSystem.createExecutionSnapshot(
@@ -693,29 +747,28 @@ export class WaitpointSystem {
         });
       }
 
-      return "unblocked";
+      return {
+        status: "unblocked",
+        waitpoints: blockingWaitpoints.map((w) => w.waitpoint),
+      };
     }); // end of runlock
   }
 
-  public async createRunAssociatedWaitpoint(
-    tx: PrismaClientOrTransaction,
-    {
+  public buildRunAssociatedWaitpoint({
+    projectId,
+    environmentId,
+  }: {
+    projectId: string;
+    environmentId: string;
+  }) {
+    return {
+      ...WaitpointId.generate(),
+      type: "RUN" as const,
+      status: "PENDING" as const,
+      idempotencyKey: nanoid(24),
+      userProvidedIdempotencyKey: false,
       projectId,
       environmentId,
-      completedByTaskRunId,
-    }: { projectId: string; environmentId: string; completedByTaskRunId: string }
-  ) {
-    return tx.waitpoint.create({
-      data: {
-        ...WaitpointId.generate(),
-        type: "RUN",
-        status: "PENDING",
-        idempotencyKey: nanoid(24),
-        userProvidedIdempotencyKey: false,
-        projectId,
-        environmentId,
-        completedByTaskRunId,
-      },
-    });
+    };
   }
 }
diff --git a/internal-packages/run-engine/src/engine/tests/attemptFailures.test.ts b/internal-packages/run-engine/src/engine/tests/attemptFailures.test.ts
index 2e71d92815c..55c0c8996d9 100644
--- a/internal-packages/run-engine/src/engine/tests/attemptFailures.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/attemptFailures.test.ts
@@ -107,7 +107,7 @@ describe("RunEngine attempt failures", () => {
       });
       expect(result.attemptStatus).toBe("RETRY_IMMEDIATELY");
       expect(result.snapshot.executionStatus).toBe("EXECUTING");
-      expect(result.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(result.run.status).toBe("EXECUTING");
 
       //state should be pending
       const executionData3 = await engine.getRunExecutionData({ runId: run.id });
@@ -115,7 +115,7 @@ describe("RunEngine attempt failures", () => {
       expect(executionData3.snapshot.executionStatus).toBe("EXECUTING");
       //only when the new attempt is created, should the attempt be increased
       expect(executionData3.run.attemptNumber).toBe(1);
-      expect(executionData3.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(executionData3.run.status).toBe("EXECUTING");
 
       //create a second attempt
       const attemptResult2 = await engine.startRunAttempt({
@@ -600,14 +600,14 @@ describe("RunEngine attempt failures", () => {
       // The run should be retried with a larger machine
       expect(result.attemptStatus).toBe("RETRY_QUEUED");
       expect(result.snapshot.executionStatus).toBe("QUEUED");
-      expect(result.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(result.run.status).toBe("PENDING");
 
       //state should be pending
       const executionData = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData);
       expect(executionData.snapshot.executionStatus).toBe("QUEUED");
       expect(executionData.run.attemptNumber).toBe(1);
-      expect(executionData.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(executionData.run.status).toBe("PENDING");
 
       //create a second attempt
       const attemptResult2 = await engine.startRunAttempt({
@@ -761,14 +761,14 @@ describe("RunEngine attempt failures", () => {
       // The run should be retried with a larger machine
       expect(result.attemptStatus).toBe("RETRY_QUEUED");
       expect(result.snapshot.executionStatus).toBe("QUEUED");
-      expect(result.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(result.run.status).toBe("PENDING");
 
       //state should be queued
       const executionData = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData);
       expect(executionData.snapshot.executionStatus).toBe("QUEUED");
       expect(executionData.run.attemptNumber).toBe(1);
-      expect(executionData.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(executionData.run.status).toBe("PENDING");
 
       await engine.runQueue.processMasterQueueForEnvironment(authenticatedEnvironment.id);
 
diff --git a/internal-packages/run-engine/src/engine/tests/batchTriggerAndWait.test.ts b/internal-packages/run-engine/src/engine/tests/batchTriggerAndWait.test.ts
index 5811b081df0..3fe9d3348a0 100644
--- a/internal-packages/run-engine/src/engine/tests/batchTriggerAndWait.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/batchTriggerAndWait.test.ts
@@ -3,8 +3,9 @@ import { trace } from "@internal/tracing";
 import { expect, describe } from "vitest";
 import { RunEngine } from "../index.js";
 import { setTimeout } from "node:timers/promises";
-import { generateFriendlyId } from "@trigger.dev/core/v3/isomorphic";
+import { generateFriendlyId, BatchId } from "@trigger.dev/core/v3/isomorphic";
 import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "./setup.js";
+import type { CompleteBatchResult, BatchItem } from "../../batch-queue/types.js";
 
 vi.setConfig({ testTimeout: 60_000 });
 
@@ -576,4 +577,646 @@ describe("RunEngine batchTriggerAndWait", () => {
       }
     }
   );
+
+  containerTest(
+    "batchTriggerAndWait v2 - all runs created and completed successfully",
+    async ({ prisma, redisOptions }) => {
+      // Create environment
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 20,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+        batchQueue: {
+          redis: redisOptions,
+          drr: {
+            quantum: 5,
+            maxDeficit: 50,
+          },
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+        },
+      });
+
+      // Track created runs
+      const createdRuns: Array<{ index: number; runId: string }> = [];
+      let completionResult: CompleteBatchResult | null = null;
+
+      // Set up batch processing callback - creates runs via engine.trigger
+      engine.setBatchProcessItemCallback(async ({ batchId, itemIndex, item, meta }) => {
+        try {
+          const friendlyId = generateFriendlyId("run");
+          const run = await engine.trigger(
+            {
+              number: itemIndex + 1,
+              friendlyId,
+              environment: authenticatedEnvironment,
+              taskIdentifier: item.task,
+              payload:
+                typeof item.payload === "string" ? item.payload : JSON.stringify(item.payload),
+              payloadType: item.payloadType ?? "application/json",
+              context: {},
+              traceContext: {},
+              traceId: `t${batchId}${itemIndex}`,
+              spanId: `s${batchId}${itemIndex}`,
+              workerQueue: "main",
+              queue: `task/${item.task}`,
+              isTest: false,
+              tags: [],
+              resumeParentOnCompletion: meta.resumeParentOnCompletion,
+              parentTaskRunId: meta.parentRunId,
+              batch: { id: batchId, index: itemIndex },
+            },
+            prisma
+          );
+
+          createdRuns.push({ index: itemIndex, runId: run.id });
+          return { success: true as const, runId: friendlyId };
+        } catch (error) {
+          return {
+            success: false as const,
+            error: error instanceof Error ? error.message : String(error),
+            errorCode: "TRIGGER_ERROR",
+          };
+        }
+      });
+
+      // Set up completion callback
+      engine.setBatchCompletionCallback(async (result) => {
+        completionResult = result;
+
+        // Update batch in database
+        await prisma.batchTaskRun.update({
+          where: { id: result.batchId },
+          data: {
+            status: result.failedRunCount > 0 ? "PARTIAL_FAILED" : "PENDING",
+            runIds: result.runIds,
+            successfulRunCount: result.successfulRunCount,
+            failedRunCount: result.failedRunCount,
+          },
+        });
+
+        // Try to complete the batch (this will check if all runs are done)
+        await engine.tryCompleteBatch({ batchId: result.batchId });
+      });
+
+      try {
+        const parentTask = "parent-task";
+        const childTask = "child-task";
+
+        // Create background worker
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, childTask]);
+
+        // Create a batch record with v2 version
+        const { id: batchId, friendlyId: batchFriendlyId } = BatchId.generate();
+        const batch = await prisma.batchTaskRun.create({
+          data: {
+            id: batchId,
+            friendlyId: batchFriendlyId,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+            status: "PROCESSING",
+            runCount: 2,
+            batchVersion: "runengine:v2",
+          },
+        });
+
+        // Trigger the parent run
+        const parentRun = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_parent",
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t_parent",
+            spanId: "s_parent",
+            workerQueue: "main",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        // Dequeue parent
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        expect(dequeued.length).toBe(1);
+
+        // Start parent attempt
+        const initialExecutionData = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(initialExecutionData);
+        await engine.startRunAttempt({
+          runId: parentRun.id,
+          snapshotId: initialExecutionData.snapshot.id,
+        });
+
+        // Block parent using the batch
+        await engine.blockRunWithCreatedBatch({
+          runId: parentRun.id,
+          batchId: batch.id,
+          environmentId: authenticatedEnvironment.id,
+          projectId: authenticatedEnvironment.projectId,
+          organizationId: authenticatedEnvironment.organizationId,
+        });
+
+        const afterBlockedByBatch = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(afterBlockedByBatch);
+        expect(afterBlockedByBatch.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Initialize batch metadata in Redis (Phase 1)
+        await engine.initializeBatch({
+          batchId: batch.id,
+          friendlyId: batch.friendlyId,
+          environmentId: authenticatedEnvironment.id,
+          environmentType: authenticatedEnvironment.type,
+          organizationId: authenticatedEnvironment.organizationId,
+          projectId: authenticatedEnvironment.projectId,
+          runCount: 2,
+          parentRunId: parentRun.id,
+          resumeParentOnCompletion: true,
+        });
+
+        // Enqueue batch items (Phase 2)
+        const batchItems: BatchItem[] = [
+          { task: childTask, payload: '{"item": 0}', payloadType: "application/json" },
+          { task: childTask, payload: '{"item": 1}', payloadType: "application/json" },
+        ];
+
+        for (let i = 0; i < batchItems.length; i++) {
+          await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, i, batchItems[i]);
+        }
+
+        // Wait for BatchQueue consumers to process items AND database to be updated
+        await vi.waitFor(
+          async () => {
+            expect(createdRuns.length).toBe(2);
+            expect(completionResult).not.toBeNull();
+            // Also wait for the database update to complete
+            const batchRecord = await prisma.batchTaskRun.findUnique({
+              where: { id: batch.id },
+            });
+            expect(batchRecord?.successfulRunCount).toBe(2);
+          },
+          { timeout: 10000 }
+        );
+
+        // Verify completion result (type assertion needed due to async closure)
+        const finalResult = completionResult!;
+        expect(finalResult.batchId).toBe(batch.id);
+        expect(finalResult.successfulRunCount).toBe(2);
+        expect(finalResult.failedRunCount).toBe(0);
+        expect(finalResult.failures).toHaveLength(0);
+
+        // Verify batch record updated
+        const batchAfterProcessing = await prisma.batchTaskRun.findUnique({
+          where: { id: batch.id },
+        });
+        expect(batchAfterProcessing?.successfulRunCount).toBe(2);
+        expect(batchAfterProcessing?.failedRunCount).toBe(0);
+
+        // Parent should still be waiting for runs to complete
+        const parentAfterProcessing = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentAfterProcessing);
+        expect(parentAfterProcessing.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Now complete the child runs
+        for (const { runId } of createdRuns) {
+          // Dequeue and start child
+          await setTimeout(300);
+          const dequeuedChild = await engine.dequeueFromWorkerQueue({
+            consumerId: "test_12345",
+            workerQueue: "main",
+          });
+
+          if (dequeuedChild.length === 0) continue;
+
+          const childAttempt = await engine.startRunAttempt({
+            runId: dequeuedChild[0].run.id,
+            snapshotId: dequeuedChild[0].snapshot.id,
+          });
+
+          // Complete the child
+          await engine.completeRunAttempt({
+            runId: childAttempt.run.id,
+            snapshotId: childAttempt.snapshot.id,
+            completion: {
+              id: runId,
+              ok: true,
+              output: '{"result":"success"}',
+              outputType: "application/json",
+            },
+          });
+        }
+
+        // Wait for parent to be unblocked (use waitFor since tryCompleteBatch runs as background job)
+        await vi.waitFor(
+          async () => {
+            const waitpoints = await prisma.taskRunWaitpoint.findMany({
+              where: { taskRunId: parentRun.id },
+            });
+            expect(waitpoints.length).toBe(0);
+          },
+          { timeout: 10000 }
+        );
+
+        // Parent should now be executing
+        const parentAfterCompletion = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentAfterCompletion);
+        expect(parentAfterCompletion.snapshot.executionStatus).toBe("EXECUTING");
+        expect(parentAfterCompletion.completedWaitpoints.length).toBe(3); // 2 run waitpoints + 1 batch waitpoint
+
+        // Wait for batch to be marked COMPLETED (runs in background)
+        await vi.waitFor(
+          async () => {
+            const batchRecord = await prisma.batchTaskRun.findUnique({
+              where: { id: batch.id },
+            });
+            expect(batchRecord?.status).toBe("COMPLETED");
+          },
+          { timeout: 10000 }
+        );
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "batchTriggerAndWait v2 - some runs fail to be created, remaining runs complete successfully",
+    async ({ prisma, redisOptions }) => {
+      // Create environment
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 20,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+        batchQueue: {
+          redis: redisOptions,
+          drr: {
+            quantum: 5,
+            maxDeficit: 50,
+          },
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+        },
+      });
+
+      // Track created runs and failures
+      const createdRuns: Array<{ index: number; runId: string }> = [];
+      let completionResult: CompleteBatchResult | null = null;
+      const failingIndices = [1]; // Index 1 will fail to be triggered
+
+      // Set up batch processing callback - simulates some items failing
+      engine.setBatchProcessItemCallback(async ({ batchId, itemIndex, item, meta }) => {
+        // Simulate failure for specific indices
+        if (failingIndices.includes(itemIndex)) {
+          return {
+            success: false as const,
+            error: "Simulated trigger failure",
+            errorCode: "SIMULATED_FAILURE",
+          };
+        }
+
+        try {
+          const friendlyId = generateFriendlyId("run");
+          const run = await engine.trigger(
+            {
+              number: itemIndex + 1,
+              friendlyId,
+              environment: authenticatedEnvironment,
+              taskIdentifier: item.task,
+              payload:
+                typeof item.payload === "string" ? item.payload : JSON.stringify(item.payload),
+              payloadType: item.payloadType ?? "application/json",
+              context: {},
+              traceContext: {},
+              traceId: `t${batchId}${itemIndex}`,
+              spanId: `s${batchId}${itemIndex}`,
+              workerQueue: "main",
+              queue: `task/${item.task}`,
+              isTest: false,
+              tags: [],
+              resumeParentOnCompletion: meta.resumeParentOnCompletion,
+              parentTaskRunId: meta.parentRunId,
+              batch: { id: batchId, index: itemIndex },
+            },
+            prisma
+          );
+
+          createdRuns.push({ index: itemIndex, runId: run.id });
+          return { success: true as const, runId: friendlyId };
+        } catch (error) {
+          return {
+            success: false as const,
+            error: error instanceof Error ? error.message : String(error),
+            errorCode: "TRIGGER_ERROR",
+          };
+        }
+      });
+
+      // Set up completion callback
+      engine.setBatchCompletionCallback(async (result) => {
+        completionResult = result;
+
+        // Determine status: PARTIAL_FAILED if some failed
+        const status =
+          result.failedRunCount > 0 && result.successfulRunCount === 0
+            ? "ABORTED"
+            : result.failedRunCount > 0
+            ? "PARTIAL_FAILED"
+            : "PENDING";
+
+        // Update batch in database
+        await prisma.batchTaskRun.update({
+          where: { id: result.batchId },
+          data: {
+            status,
+            runIds: result.runIds,
+            successfulRunCount: result.successfulRunCount,
+            failedRunCount: result.failedRunCount,
+          },
+        });
+
+        // Create error records for failures
+        for (const failure of result.failures) {
+          await prisma.batchTaskRunError.create({
+            data: {
+              batchTaskRunId: result.batchId,
+              index: failure.index,
+              taskIdentifier: failure.taskIdentifier,
+              payload: failure.payload,
+              options: failure.options ? JSON.parse(JSON.stringify(failure.options)) : undefined,
+              error: failure.error,
+              errorCode: failure.errorCode,
+            },
+          });
+        }
+
+        // Try to complete the batch (only if not aborted)
+        if (status !== "ABORTED") {
+          await engine.tryCompleteBatch({ batchId: result.batchId });
+        }
+      });
+
+      try {
+        const parentTask = "parent-task";
+        const childTask = "child-task";
+
+        // Create background worker
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, childTask]);
+
+        // Create a batch record with v2 version
+        const { id: batchId, friendlyId: batchFriendlyId } = BatchId.generate();
+        const batch = await prisma.batchTaskRun.create({
+          data: {
+            id: batchId,
+            friendlyId: batchFriendlyId,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+            status: "PROCESSING",
+            runCount: 3, // 3 items, 1 will fail
+            batchVersion: "runengine:v2",
+          },
+        });
+
+        // Trigger the parent run
+        const parentRun = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: generateFriendlyId("run"),
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "tparentpartial",
+            spanId: "sparentpartial",
+            workerQueue: "main",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        // Dequeue parent
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        expect(dequeued.length).toBe(1);
+
+        // Start parent attempt
+        const initialExecutionData = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(initialExecutionData);
+        await engine.startRunAttempt({
+          runId: parentRun.id,
+          snapshotId: initialExecutionData.snapshot.id,
+        });
+
+        // Block parent using the batch
+        await engine.blockRunWithCreatedBatch({
+          runId: parentRun.id,
+          batchId: batch.id,
+          environmentId: authenticatedEnvironment.id,
+          projectId: authenticatedEnvironment.projectId,
+          organizationId: authenticatedEnvironment.organizationId,
+        });
+
+        const afterBlockedByBatch = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(afterBlockedByBatch);
+        expect(afterBlockedByBatch.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Initialize batch metadata in Redis (Phase 1)
+        await engine.initializeBatch({
+          batchId: batch.id,
+          friendlyId: batch.friendlyId,
+          environmentId: authenticatedEnvironment.id,
+          environmentType: authenticatedEnvironment.type,
+          organizationId: authenticatedEnvironment.organizationId,
+          projectId: authenticatedEnvironment.projectId,
+          runCount: 3,
+          parentRunId: parentRun.id,
+          resumeParentOnCompletion: true,
+        });
+
+        // Enqueue batch items (Phase 2) - index 1 will fail
+        const batchItems: BatchItem[] = [
+          { task: childTask, payload: '{"item": 0}', payloadType: "application/json" },
+          { task: childTask, payload: '{"item": 1}', payloadType: "application/json" }, // Will fail
+          { task: childTask, payload: '{"item": 2}', payloadType: "application/json" },
+        ];
+
+        for (let i = 0; i < batchItems.length; i++) {
+          await engine.enqueueBatchItem(batch.id, authenticatedEnvironment.id, i, batchItems[i]);
+        }
+
+        // Wait for BatchQueue consumers to process items AND database to be updated
+        await vi.waitFor(
+          async () => {
+            expect(completionResult).not.toBeNull();
+            // Also wait for the database update to complete
+            const batchRecord = await prisma.batchTaskRun.findUnique({
+              where: { id: batch.id },
+            });
+            expect(batchRecord?.status).toBe("PARTIAL_FAILED");
+          },
+          { timeout: 10000 }
+        );
+
+        // Verify completion result (type assertion needed due to async closure)
+        const finalResult = completionResult!;
+        expect(finalResult.batchId).toBe(batch.id);
+        expect(finalResult.successfulRunCount).toBe(2); // 2 succeeded
+        expect(finalResult.failedRunCount).toBe(1); // 1 failed
+        expect(finalResult.failures).toHaveLength(1);
+        expect(finalResult.failures[0].index).toBe(1);
+        expect(finalResult.failures[0].error).toBe("Simulated trigger failure");
+        expect(finalResult.failures[0].errorCode).toBe("SIMULATED_FAILURE");
+
+        // Verify batch record updated with PARTIAL_FAILED status
+        const batchAfterProcessing = await prisma.batchTaskRun.findUnique({
+          where: { id: batch.id },
+          include: { errors: true },
+        });
+        expect(batchAfterProcessing?.status).toBe("PARTIAL_FAILED");
+        expect(batchAfterProcessing?.successfulRunCount).toBe(2);
+        expect(batchAfterProcessing?.failedRunCount).toBe(1);
+        expect(batchAfterProcessing?.errors).toHaveLength(1);
+        expect(batchAfterProcessing?.errors[0].index).toBe(1);
+        expect(batchAfterProcessing?.errors[0].error).toBe("Simulated trigger failure");
+
+        // Only 2 runs should have been created (indices 0 and 2)
+        expect(createdRuns.length).toBe(2);
+        expect(createdRuns.map((r) => r.index).sort()).toEqual([0, 2]);
+
+        // Parent should still be waiting for the created runs to complete
+        const parentAfterProcessing = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentAfterProcessing);
+        expect(parentAfterProcessing.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Now complete the successfully created child runs
+        for (const { runId } of createdRuns) {
+          // Dequeue and start child
+          await setTimeout(300);
+          const dequeuedChild = await engine.dequeueFromWorkerQueue({
+            consumerId: "test_12345",
+            workerQueue: "main",
+          });
+
+          if (dequeuedChild.length === 0) continue;
+
+          const childAttempt = await engine.startRunAttempt({
+            runId: dequeuedChild[0].run.id,
+            snapshotId: dequeuedChild[0].snapshot.id,
+          });
+
+          // Complete the child
+          await engine.completeRunAttempt({
+            runId: childAttempt.run.id,
+            snapshotId: childAttempt.snapshot.id,
+            completion: {
+              id: runId,
+              ok: true,
+              output: '{"result":"success"}',
+              outputType: "application/json",
+            },
+          });
+        }
+
+        // Wait for parent to be unblocked (use waitFor since tryCompleteBatch runs as background job)
+        await vi.waitFor(
+          async () => {
+            const waitpoints = await prisma.taskRunWaitpoint.findMany({
+              where: { taskRunId: parentRun.id },
+            });
+            expect(waitpoints.length).toBe(0);
+          },
+          { timeout: 10000 }
+        );
+
+        // Parent should now be executing (resumed even though some runs failed to trigger)
+        const parentAfterCompletion = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentAfterCompletion);
+        expect(parentAfterCompletion.snapshot.executionStatus).toBe("EXECUTING");
+
+        // Should have 3 completed waitpoints: 2 run waitpoints + 1 batch waitpoint
+        // (even though 1 run failed to trigger, the batch waitpoint is still completed)
+        expect(parentAfterCompletion.completedWaitpoints.length).toBe(3);
+
+        // Wait for batch to be marked COMPLETED (runs in background)
+        await vi.waitFor(
+          async () => {
+            const batchRecord = await prisma.batchTaskRun.findUnique({
+              where: { id: batch.id },
+            });
+            expect(batchRecord?.status).toBe("COMPLETED");
+          },
+          { timeout: 10000 }
+        );
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
 });
diff --git a/internal-packages/run-engine/src/engine/tests/batchTwoPhase.test.ts b/internal-packages/run-engine/src/engine/tests/batchTwoPhase.test.ts
new file mode 100644
index 00000000000..6208560a56a
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/tests/batchTwoPhase.test.ts
@@ -0,0 +1,625 @@
+import { assertNonNullable, containerTest } from "@internal/testcontainers";
+import { trace } from "@internal/tracing";
+import { expect, describe, vi } from "vitest";
+import { RunEngine } from "../index.js";
+import { setTimeout } from "node:timers/promises";
+import { generateFriendlyId, BatchId } from "@trigger.dev/core/v3/isomorphic";
+import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "./setup.js";
+import type {
+  CompleteBatchResult,
+  BatchItem,
+  InitializeBatchOptions,
+} from "../../batch-queue/types.js";
+
+vi.setConfig({ testTimeout: 60_000 });
+
+describe("RunEngine 2-Phase Batch API", () => {
+  containerTest(
+    "2-phase batch: initialize batch, stream items one by one, items get processed",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 20,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        batchQueue: {
+          redis: redisOptions,
+          consumerCount: 2,
+          consumerIntervalMs: 50,
+          drr: {
+            quantum: 10,
+            maxDeficit: 100,
+          },
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const createdRuns: Array<{ runId: string; itemIndex: number }> = [];
+      let completionResult: CompleteBatchResult | null = null;
+
+      // Set up callbacks
+      engine.setBatchProcessItemCallback(async ({ batchId, itemIndex, item, meta }) => {
+        // Simulate creating a run
+        const friendlyId = generateFriendlyId("run");
+        const run = await engine.trigger(
+          {
+            friendlyId,
+            environment: authenticatedEnvironment,
+            taskIdentifier: item.task,
+            payload: typeof item.payload === "string" ? item.payload : JSON.stringify(item.payload),
+            payloadType: item.payloadType ?? "application/json",
+            context: {},
+            traceContext: {},
+            traceId: `t_${batchId}_${itemIndex}`,
+            spanId: `s_${batchId}_${itemIndex}`,
+            workerQueue: "main",
+            queue: `task/${item.task}`,
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        createdRuns.push({ runId: run.id, itemIndex });
+        return { success: true, runId: run.friendlyId };
+      });
+
+      engine.setBatchCompletionCallback(async (result) => {
+        completionResult = result;
+      });
+
+      try {
+        const childTask = "child-task";
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [childTask]);
+
+        // Phase 1: Initialize batch
+        const { id: batchId, friendlyId: batchFriendlyId } = BatchId.generate();
+        const runCount = 3;
+
+        const initOptions: InitializeBatchOptions = {
+          batchId,
+          friendlyId: batchFriendlyId,
+          environmentId: authenticatedEnvironment.id,
+          environmentType: authenticatedEnvironment.type,
+          organizationId: authenticatedEnvironment.organizationId,
+          projectId: authenticatedEnvironment.projectId,
+          runCount,
+        };
+
+        await engine.initializeBatch(initOptions);
+
+        // Verify batch metadata is stored
+        const progress = await engine.getBatchQueueProgress(batchId);
+        expect(progress).not.toBeNull();
+        expect(progress!.processedCount).toBe(0);
+        expect(progress!.successCount).toBe(0);
+        expect(progress!.failureCount).toBe(0);
+
+        // Phase 2: Stream items one by one
+        const items: BatchItem[] = [
+          { task: childTask, payload: '{"item": 0}', payloadType: "application/json" },
+          { task: childTask, payload: '{"item": 1}', payloadType: "application/json" },
+          { task: childTask, payload: '{"item": 2}', payloadType: "application/json" },
+        ];
+
+        for (let i = 0; i < items.length; i++) {
+          const result = await engine.enqueueBatchItem(
+            batchId,
+            authenticatedEnvironment.id,
+            i,
+            items[i]
+          );
+          expect(result.enqueued).toBe(true);
+        }
+
+        // Verify enqueued count
+        const enqueuedCount = await engine.getBatchEnqueuedCount(batchId);
+        expect(enqueuedCount).toBe(3);
+
+        // Wait for all items to be processed
+        await vi.waitFor(
+          async () => {
+            expect(createdRuns.length).toBe(3);
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 15000 }
+        );
+
+        // Verify completion result
+        expect(completionResult!.batchId).toBe(batchId);
+        expect(completionResult!.successfulRunCount).toBe(3);
+        expect(completionResult!.failedRunCount).toBe(0);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "2-phase batch: items with same index are deduplicated",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 20,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        batchQueue: {
+          redis: redisOptions,
+          consumerCount: 2,
+          consumerIntervalMs: 50,
+          drr: {
+            quantum: 10,
+            maxDeficit: 100,
+          },
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      let processCount = 0;
+
+      // Set up callbacks
+      engine.setBatchProcessItemCallback(async ({ batchId, itemIndex, item, meta }) => {
+        processCount++;
+        return { success: true, runId: `run_${itemIndex}` };
+      });
+
+      engine.setBatchCompletionCallback(async () => {});
+
+      try {
+        const childTask = "child-task";
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [childTask]);
+
+        // Initialize batch with 2 items
+        const { id: batchId, friendlyId: batchFriendlyId } = BatchId.generate();
+
+        await engine.initializeBatch({
+          batchId,
+          friendlyId: batchFriendlyId,
+          environmentId: authenticatedEnvironment.id,
+          environmentType: authenticatedEnvironment.type,
+          organizationId: authenticatedEnvironment.organizationId,
+          projectId: authenticatedEnvironment.projectId,
+          runCount: 2,
+        });
+
+        const item: BatchItem = {
+          task: childTask,
+          payload: '{"item": 0}',
+          payloadType: "application/json",
+        };
+
+        // Enqueue item at index 0
+        const result1 = await engine.enqueueBatchItem(
+          batchId,
+          authenticatedEnvironment.id,
+          0,
+          item
+        );
+        expect(result1.enqueued).toBe(true);
+
+        // Try to enqueue same index again - should be deduplicated
+        const result2 = await engine.enqueueBatchItem(
+          batchId,
+          authenticatedEnvironment.id,
+          0,
+          item
+        );
+        expect(result2.enqueued).toBe(false);
+
+        // Enqueue item at index 1
+        const result3 = await engine.enqueueBatchItem(
+          batchId,
+          authenticatedEnvironment.id,
+          1,
+          item
+        );
+        expect(result3.enqueued).toBe(true);
+
+        // Try to enqueue index 1 again - should be deduplicated
+        const result4 = await engine.enqueueBatchItem(
+          batchId,
+          authenticatedEnvironment.id,
+          1,
+          item
+        );
+        expect(result4.enqueued).toBe(false);
+
+        // Verify enqueued count shows 2 (not 4)
+        const enqueuedCount = await engine.getBatchEnqueuedCount(batchId);
+        expect(enqueuedCount).toBe(2);
+
+        // Wait for processing to complete
+        await vi.waitFor(
+          async () => {
+            expect(processCount).toBe(2);
+          },
+          { timeout: 15000 }
+        );
+
+        // Should have only processed 2 items total (not 4)
+        expect(processCount).toBe(2);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "2-phase batch with parent blocking: parent is resumed when batch completes",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 20,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        batchQueue: {
+          redis: redisOptions,
+          consumerCount: 2,
+          consumerIntervalMs: 50,
+          drr: {
+            quantum: 10,
+            maxDeficit: 100,
+          },
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      const createdRuns: Array<{ runId: string; itemIndex: number }> = [];
+      let completionResult: CompleteBatchResult | null = null;
+
+      // Set up callbacks
+      engine.setBatchProcessItemCallback(async ({ batchId, itemIndex, item, meta }) => {
+        const friendlyId = generateFriendlyId("run");
+        const run = await engine.trigger(
+          {
+            friendlyId,
+            environment: authenticatedEnvironment,
+            taskIdentifier: item.task,
+            payload: typeof item.payload === "string" ? item.payload : JSON.stringify(item.payload),
+            payloadType: item.payloadType ?? "application/json",
+            context: {},
+            traceContext: {},
+            traceId: `t_${batchId}_${itemIndex}`,
+            spanId: `s_${batchId}_${itemIndex}`,
+            workerQueue: "main",
+            queue: `task/${item.task}`,
+            isTest: false,
+            tags: [],
+            batch: {
+              id: batchId,
+              index: itemIndex,
+            },
+            resumeParentOnCompletion: meta.resumeParentOnCompletion,
+          },
+          prisma
+        );
+
+        // Update batch with run ID
+        await prisma.batchTaskRun.update({
+          where: { id: batchId },
+          data: { runIds: { push: run.friendlyId } },
+        });
+
+        createdRuns.push({ runId: run.id, itemIndex });
+        return { success: true, runId: run.friendlyId };
+      });
+
+      engine.setBatchCompletionCallback(async (result) => {
+        completionResult = result;
+
+        // Update batch in database
+        await prisma.batchTaskRun.update({
+          where: { id: result.batchId },
+          data: {
+            status: result.failedRunCount > 0 ? "PARTIAL_FAILED" : "PENDING",
+            successfulRunCount: result.successfulRunCount,
+            failedRunCount: result.failedRunCount,
+          },
+        });
+
+        // Try to complete the batch
+        await engine.tryCompleteBatch({ batchId: result.batchId });
+      });
+
+      try {
+        const parentTask = "parent-task";
+        const childTask = "child-task";
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, childTask]);
+
+        // Create the batch record in database
+        const { id: batchId, friendlyId: batchFriendlyId } = BatchId.generate();
+
+        const batch = await prisma.batchTaskRun.create({
+          data: {
+            id: batchId,
+            friendlyId: batchFriendlyId,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+            status: "PENDING",
+            runCount: 2,
+            expectedCount: 2,
+            batchVersion: "runengine:v2",
+          },
+        });
+
+        // Trigger the parent run
+        const parentRun = await engine.trigger(
+          {
+            friendlyId: generateFriendlyId("run"),
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t_parent",
+            spanId: "s_parent",
+            workerQueue: "main",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        // Dequeue parent
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        expect(dequeued.length).toBe(1);
+
+        // Start parent attempt
+        const initialExecutionData = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(initialExecutionData);
+        await engine.startRunAttempt({
+          runId: parentRun.id,
+          snapshotId: initialExecutionData.snapshot.id,
+        });
+
+        // Block parent using the batch (Phase 1)
+        await engine.blockRunWithCreatedBatch({
+          runId: parentRun.id,
+          batchId: batch.id,
+          environmentId: authenticatedEnvironment.id,
+          projectId: authenticatedEnvironment.projectId,
+          organizationId: authenticatedEnvironment.organizationId,
+        });
+
+        const afterBlockedByBatch = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(afterBlockedByBatch);
+        expect(afterBlockedByBatch.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Initialize batch metadata in Redis
+        await engine.initializeBatch({
+          batchId,
+          friendlyId: batchFriendlyId,
+          environmentId: authenticatedEnvironment.id,
+          environmentType: authenticatedEnvironment.type,
+          organizationId: authenticatedEnvironment.organizationId,
+          projectId: authenticatedEnvironment.projectId,
+          runCount: 2,
+          parentRunId: parentRun.id,
+          resumeParentOnCompletion: true,
+        });
+
+        // Phase 2: Stream items
+        const items: BatchItem[] = [
+          { task: childTask, payload: '{"item": 0}', payloadType: "application/json" },
+          { task: childTask, payload: '{"item": 1}', payloadType: "application/json" },
+        ];
+
+        for (let i = 0; i < items.length; i++) {
+          await engine.enqueueBatchItem(batchId, authenticatedEnvironment.id, i, items[i]);
+        }
+
+        // Update batch status to PROCESSING
+        await prisma.batchTaskRun.update({
+          where: { id: batchId },
+          data: { status: "PROCESSING", sealed: true, sealedAt: new Date() },
+        });
+
+        // Wait for items to be processed
+        await vi.waitFor(
+          async () => {
+            expect(createdRuns.length).toBe(2);
+            expect(completionResult).not.toBeNull();
+          },
+          { timeout: 15000 }
+        );
+
+        // Complete child runs
+        for (const { runId, itemIndex } of createdRuns) {
+          await setTimeout(300);
+          const dequeuedChild = await engine.dequeueFromWorkerQueue({
+            consumerId: "test_12345",
+            workerQueue: "main",
+          });
+
+          if (dequeuedChild.length === 0) continue;
+
+          const childAttempt = await engine.startRunAttempt({
+            runId: dequeuedChild[0].run.id,
+            snapshotId: dequeuedChild[0].snapshot.id,
+          });
+
+          await engine.completeRunAttempt({
+            runId: childAttempt.run.id,
+            snapshotId: childAttempt.snapshot.id,
+            completion: {
+              id: runId,
+              ok: true,
+              output: `{"result":"success_${itemIndex}"}`,
+              outputType: "application/json",
+            },
+          });
+        }
+
+        // Wait for parent to be unblocked
+        await vi.waitFor(
+          async () => {
+            const waitpoints = await prisma.taskRunWaitpoint.findMany({
+              where: { taskRunId: parentRun.id },
+            });
+            expect(waitpoints.length).toBe(0);
+          },
+          { timeout: 15000 }
+        );
+
+        // Parent should now be executing
+        const parentAfterCompletion = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentAfterCompletion);
+        expect(parentAfterCompletion.snapshot.executionStatus).toBe("EXECUTING");
+
+        // Wait for batch to be marked COMPLETED
+        await vi.waitFor(
+          async () => {
+            const batchRecord = await prisma.batchTaskRun.findUnique({
+              where: { id: batch.id },
+            });
+            expect(batchRecord?.status).toBe("COMPLETED");
+          },
+          { timeout: 15000 }
+        );
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "2-phase batch: error if batch not initialized",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 20,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        batchQueue: {
+          redis: redisOptions,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          drr: {
+            quantum: 10,
+            maxDeficit: 100,
+          },
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const { id: batchId } = BatchId.generate();
+
+        // Try to enqueue item for non-existent batch
+        await expect(
+          engine.enqueueBatchItem(batchId, authenticatedEnvironment.id, 0, {
+            task: "test-task",
+            payload: "{}",
+            payloadType: "application/json",
+          })
+        ).rejects.toThrow(/not found or not initialized/);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+});
diff --git a/internal-packages/run-engine/src/engine/tests/cancelling.test.ts b/internal-packages/run-engine/src/engine/tests/cancelling.test.ts
index 5fb4fc345e4..1e5947cfbc1 100644
--- a/internal-packages/run-engine/src/engine/tests/cancelling.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/cancelling.test.ts
@@ -150,7 +150,7 @@ describe("RunEngine cancelling", () => {
           cancelledEventData.push(result);
         });
 
-        //todo call completeAttempt (this will happen from the worker)
+        // call completeAttempt manually (this will happen from the worker)
         const completeResult = await engine.completeRunAttempt({
           runId: parentRun.id,
           snapshotId: executionData!.snapshot.id,
@@ -289,13 +289,6 @@ describe("RunEngine cancelling", () => {
         prisma
       );
 
-      //dequeue the run
-      await setTimeout(500);
-      const dequeued = await engine.dequeueFromWorkerQueue({
-        consumerId: "test_12345",
-        workerQueue: "main",
-      });
-
       let cancelledEventData: EventBusEventArgs<"runCancelled">[0][] = [];
       engine.eventBus.on("runCancelled", (result) => {
         cancelledEventData.push(result);
diff --git a/internal-packages/run-engine/src/engine/tests/debounce.test.ts b/internal-packages/run-engine/src/engine/tests/debounce.test.ts
new file mode 100644
index 00000000000..1c201c4b4c4
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/tests/debounce.test.ts
@@ -0,0 +1,2501 @@
+import { containerTest, assertNonNullable } from "@internal/testcontainers";
+import { trace } from "@internal/tracing";
+import { expect } from "vitest";
+import { RunEngine } from "../index.js";
+import { setTimeout } from "timers/promises";
+import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "./setup.js";
+
+vi.setConfig({ testTimeout: 60_000 });
+
+describe("RunEngine debounce", () => {
+  containerTest("Basic debounce: first trigger creates run", async ({ prisma, redisOptions }) => {
+    const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+    const engine = new RunEngine({
+      prisma,
+      worker: {
+        redis: redisOptions,
+        workers: 1,
+        tasksPerWorker: 10,
+        pollIntervalMs: 100,
+      },
+      queue: {
+        redis: redisOptions,
+      },
+      runLock: {
+        redis: redisOptions,
+      },
+      machines: {
+        defaultMachine: "small-1x",
+        machines: {
+          "small-1x": {
+            name: "small-1x" as const,
+            cpu: 0.5,
+            memory: 0.5,
+            centsPerMs: 0.0001,
+          },
+        },
+        baseCostInCents: 0.0001,
+      },
+      debounce: {
+        maxDebounceDurationMs: 60_000, // 1 minute max debounce
+      },
+      tracer: trace.getTracer("test", "0.0.0"),
+    });
+
+    try {
+      const taskIdentifier = "test-task";
+
+      await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+      // Trigger with debounce
+      const run = await engine.trigger(
+        {
+          number: 1,
+          friendlyId: "run_deb1",
+          environment: authenticatedEnvironment,
+          taskIdentifier,
+          payload: '{"data": "first"}',
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t12345",
+          spanId: "s12345",
+          workerQueue: "main",
+          queue: "task/test-task",
+          isTest: false,
+          tags: [],
+          delayUntil: new Date(Date.now() + 5000),
+          debounce: {
+            key: "user-123",
+            delay: "5s",
+          },
+        },
+        prisma
+      );
+
+      expect(run.friendlyId).toBe("run_deb1");
+      expect(run.status).toBe("DELAYED");
+
+      // Verify debounce is stored in the run
+      const dbRun = await prisma.taskRun.findFirst({
+        where: { id: run.id },
+      });
+      assertNonNullable(dbRun);
+      const debounce = dbRun.debounce as { key: string; delay: string } | null;
+      expect(debounce?.key).toBe("user-123");
+      expect(debounce?.delay).toBe("5s");
+
+      // Verify execution status is DELAYED
+      const executionData = await engine.getRunExecutionData({ runId: run.id });
+      assertNonNullable(executionData);
+      expect(executionData.snapshot.executionStatus).toBe("DELAYED");
+    } finally {
+      await engine.quit();
+    }
+  });
+
+  containerTest(
+    "Debounce: multiple triggers return same run",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger creates run
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_deb1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-123",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Second trigger should return same run
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_deb2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-123",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Both should return the same run (first run wins)
+        expect(run2.id).toBe(run1.id);
+        expect(run2.friendlyId).toBe(run1.friendlyId);
+
+        // Only one run should exist in DB
+        const runs = await prisma.taskRun.findMany({
+          where: {
+            taskIdentifier,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+          },
+        });
+        expect(runs.length).toBe(1);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: delay extension on subsequent triggers",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        const initialDelay = 1000;
+        const initialDelayUntil = new Date(Date.now() + initialDelay);
+
+        // First trigger
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_deb1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: initialDelayUntil,
+            debounce: {
+              key: "user-123",
+              delay: "1s",
+            },
+          },
+          prisma
+        );
+
+        const originalDelayUntil = run1.delayUntil;
+        assertNonNullable(originalDelayUntil);
+
+        // Wait a bit then trigger again
+        await setTimeout(300);
+
+        // Second trigger should extend the delay
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_deb2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 1000),
+            debounce: {
+              key: "user-123",
+              delay: "1s",
+            },
+          },
+          prisma
+        );
+
+        // Same run returned
+        expect(run2.id).toBe(run1.id);
+
+        // delayUntil should have been extended
+        const updatedRun = await prisma.taskRun.findFirst({
+          where: { id: run1.id },
+        });
+        assertNonNullable(updatedRun);
+        assertNonNullable(updatedRun.delayUntil);
+
+        // The new delayUntil should be later than the original
+        expect(updatedRun.delayUntil.getTime()).toBeGreaterThan(originalDelayUntil.getTime());
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: different keys create separate runs",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // Trigger with key "user-123"
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_deb1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-123",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Trigger with different key "user-456"
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_deb2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-456",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Different keys should create different runs
+        expect(run2.id).not.toBe(run1.id);
+
+        const runs = await prisma.taskRun.findMany({
+          where: {
+            taskIdentifier,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+          },
+        });
+        expect(runs.length).toBe(2);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: run executes after final delay",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger with 1s delay
+        const run = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_deb1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 1000),
+            debounce: {
+              key: "user-123",
+              delay: "1s",
+            },
+          },
+          prisma
+        );
+
+        // Verify it's in DELAYED status
+        let executionData = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionData);
+        expect(executionData.snapshot.executionStatus).toBe("DELAYED");
+
+        // Wait for delay to pass
+        await setTimeout(1500);
+
+        // Should now be QUEUED
+        executionData = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionData);
+        expect(executionData.snapshot.executionStatus).toBe("QUEUED");
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: no longer works after run is enqueued",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger with short delay
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_deb1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 300),
+            debounce: {
+              key: "user-123",
+              delay: "300ms",
+            },
+          },
+          prisma
+        );
+
+        // Wait for run to be enqueued
+        await setTimeout(800);
+
+        // Verify first run is now QUEUED
+        const executionData = await engine.getRunExecutionData({ runId: run1.id });
+        assertNonNullable(executionData);
+        expect(executionData.snapshot.executionStatus).toBe("QUEUED");
+
+        // New trigger with same key should create a NEW run
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_deb2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-123",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Should be a different run
+        expect(run2.id).not.toBe(run1.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: max duration exceeded creates new run",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Set a very short max debounce duration
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 500, // Very short max duration
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_deb1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 2000),
+            debounce: {
+              key: "user-123",
+              delay: "2s",
+            },
+          },
+          prisma
+        );
+
+        // Wait for max duration to be exceeded
+        await setTimeout(700);
+
+        // Second trigger should create a new run because max duration exceeded
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_deb2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 2000),
+            debounce: {
+              key: "user-123",
+              delay: "2s",
+            },
+          },
+          prisma
+        );
+
+        // Should be a different run because max duration exceeded
+        expect(run2.id).not.toBe(run1.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce keys are scoped to task identifier",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier1 = "test-task-1";
+        const taskIdentifier2 = "test-task-2";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier1);
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier2);
+
+        // Trigger task 1 with debounce key
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_task1",
+            environment: authenticatedEnvironment,
+            taskIdentifier: taskIdentifier1,
+            payload: '{"data": "task1"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: `task/${taskIdentifier1}`,
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "shared-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Trigger task 2 with same debounce key - should create separate run
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_task2",
+            environment: authenticatedEnvironment,
+            taskIdentifier: taskIdentifier2,
+            payload: '{"data": "task2"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: `task/${taskIdentifier2}`,
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "shared-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Should be different runs (debounce scoped to task)
+        expect(run2.id).not.toBe(run1.id);
+        expect(run1.taskIdentifier).toBe(taskIdentifier1);
+        expect(run2.taskIdentifier).toBe(taskIdentifier2);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce with triggerAndWait: parent blocked by debounced child run",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const parentTask = "parent-task";
+        const childTask = "child-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, childTask]);
+
+        // Trigger parent run
+        const parentRun = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_parent1",
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+          },
+          prisma
+        );
+
+        // Dequeue parent and create the attempt
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        await engine.startRunAttempt({
+          runId: parentRun.id,
+          snapshotId: dequeued[0].snapshot.id,
+        });
+
+        // First triggerAndWait with debounce - creates child run
+        const childRun1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_child1",
+            environment: authenticatedEnvironment,
+            taskIdentifier: childTask,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            queue: `task/${childTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+            resumeParentOnCompletion: true,
+            parentTaskRunId: parentRun.id,
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-123",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Verify parent is blocked
+        const parentExecData1 = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentExecData1);
+        expect(parentExecData1.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Verify child run is in DELAYED status
+        const childExecData1 = await engine.getRunExecutionData({ runId: childRun1.id });
+        assertNonNullable(childExecData1);
+        expect(childExecData1.snapshot.executionStatus).toBe("DELAYED");
+
+        // Check that parent is blocked by the child's waitpoint
+        const runWaitpoint = await prisma.taskRunWaitpoint.findFirst({
+          where: {
+            taskRunId: parentRun.id,
+          },
+          include: {
+            waitpoint: true,
+          },
+        });
+        assertNonNullable(runWaitpoint);
+        expect(runWaitpoint.waitpoint.type).toBe("RUN");
+        expect(runWaitpoint.waitpoint.completedByTaskRunId).toBe(childRun1.id);
+
+        // Second triggerAndWait with same debounce key should return same child run
+        const childRun2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_child2",
+            environment: authenticatedEnvironment,
+            taskIdentifier: childTask,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12347",
+            spanId: "s12347",
+            queue: `task/${childTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+            resumeParentOnCompletion: true,
+            parentTaskRunId: parentRun.id,
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "user-123",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Should return the same child run (debounced)
+        expect(childRun2.id).toBe(childRun1.id);
+
+        // Only one child run should exist
+        const childRuns = await prisma.taskRun.findMany({
+          where: {
+            taskIdentifier: childTask,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+          },
+        });
+        expect(childRuns.length).toBe(1);
+
+        // Parent should still be blocked by the same child run's waitpoint
+        const parentExecData2 = await engine.getRunExecutionData({ runId: parentRun.id });
+        assertNonNullable(parentExecData2);
+        expect(parentExecData2.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce with triggerAndWait: second parent also blocked by same child",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const parentTask = "parent-task";
+        const childTask = "child-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, childTask]);
+
+        // Trigger first parent run
+        const parentRun1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_parent1",
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+          },
+          prisma
+        );
+
+        // Dequeue first parent and start attempt
+        await setTimeout(500);
+        const dequeued1 = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        await engine.startRunAttempt({
+          runId: parentRun1.id,
+          snapshotId: dequeued1[0].snapshot.id,
+        });
+
+        // First parent triggers child with debounce
+        const childRun1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_child1",
+            environment: authenticatedEnvironment,
+            taskIdentifier: childTask,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            queue: `task/${childTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+            resumeParentOnCompletion: true,
+            parentTaskRunId: parentRun1.id,
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "shared-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Verify first parent is blocked
+        const parent1ExecData = await engine.getRunExecutionData({ runId: parentRun1.id });
+        assertNonNullable(parent1ExecData);
+        expect(parent1ExecData.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Trigger second parent run
+        const parentRun2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_parent2",
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12347",
+            spanId: "s12347",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+          },
+          prisma
+        );
+
+        // Dequeue second parent and start attempt
+        await setTimeout(500);
+        const dequeued2 = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12346",
+          workerQueue: "main",
+        });
+        await engine.startRunAttempt({
+          runId: parentRun2.id,
+          snapshotId: dequeued2[0].snapshot.id,
+        });
+
+        // Second parent triggers same child with debounce - should return existing child
+        const childRun2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_child2",
+            environment: authenticatedEnvironment,
+            taskIdentifier: childTask,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12348",
+            spanId: "s12348",
+            queue: `task/${childTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+            resumeParentOnCompletion: true,
+            parentTaskRunId: parentRun2.id,
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "shared-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Should return the same child run
+        expect(childRun2.id).toBe(childRun1.id);
+
+        // Second parent should also be blocked by the same child run
+        const parent2ExecData = await engine.getRunExecutionData({ runId: parentRun2.id });
+        assertNonNullable(parent2ExecData);
+        expect(parent2ExecData.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Both parents should have waitpoints pointing to the same child
+        const waitpoints = await prisma.taskRunWaitpoint.findMany({
+          where: {
+            taskRunId: { in: [parentRun1.id, parentRun2.id] },
+          },
+          include: {
+            waitpoint: true,
+          },
+        });
+        expect(waitpoints.length).toBe(2);
+        expect(waitpoints[0].waitpoint.completedByTaskRunId).toBe(childRun1.id);
+        expect(waitpoints[1].waitpoint.completedByTaskRunId).toBe(childRun1.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: keys scoped to environment",
+    async ({ prisma, redisOptions }) => {
+      // Create production environment (also creates org and project)
+      const prodEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Create a second environment (development) within the same org/project
+      const devEnvironment = await prisma.runtimeEnvironment.create({
+        data: {
+          type: "DEVELOPMENT",
+          slug: "dev-slug",
+          projectId: prodEnvironment.projectId,
+          organizationId: prodEnvironment.organizationId,
+          apiKey: "dev_api_key",
+          pkApiKey: "dev_pk_api_key",
+          shortcode: "dev_short",
+          maximumConcurrencyLimit: 10,
+        },
+        include: {
+          project: true,
+          organization: true,
+          orgMember: true,
+        },
+      });
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, prodEnvironment, taskIdentifier);
+        await setupBackgroundWorker(engine, devEnvironment, taskIdentifier);
+
+        // Trigger in production environment
+        const runProd = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_prod1",
+            environment: prodEnvironment,
+            taskIdentifier,
+            payload: '{"env": "prod"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: `task/${taskIdentifier}`,
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "same-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Trigger in development environment with same key - should create separate run
+        const runDev = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_dev1",
+            environment: devEnvironment,
+            taskIdentifier,
+            payload: '{"env": "dev"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: `task/${taskIdentifier}`,
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "same-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Should be different runs (debounce scoped to environment)
+        expect(runDev.id).not.toBe(runProd.id);
+        expect(runProd.runtimeEnvironmentId).toBe(prodEnvironment.id);
+        expect(runDev.runtimeEnvironmentId).toBe(devEnvironment.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: concurrent triggers only create one run (distributed race protection)",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // Trigger multiple runs concurrently with the same debounce key
+        // This simulates the distributed race condition where multiple servers
+        // try to create runs at the exact same time
+        const concurrentTriggers = Promise.all([
+          engine.trigger(
+            {
+              number: 1,
+              friendlyId: "run_conc1",
+              environment: authenticatedEnvironment,
+              taskIdentifier,
+              payload: '{"data": "first"}',
+              payloadType: "application/json",
+              context: {},
+              traceContext: {},
+              traceId: "t12345",
+              spanId: "s12345",
+              workerQueue: "main",
+              queue: "task/test-task",
+              isTest: false,
+              tags: [],
+              delayUntil: new Date(Date.now() + 5000),
+              debounce: {
+                key: "concurrent-key",
+                delay: "5s",
+              },
+            },
+            prisma
+          ),
+          engine.trigger(
+            {
+              number: 2,
+              friendlyId: "run_conc2",
+              environment: authenticatedEnvironment,
+              taskIdentifier,
+              payload: '{"data": "second"}',
+              payloadType: "application/json",
+              context: {},
+              traceContext: {},
+              traceId: "t12346",
+              spanId: "s12346",
+              workerQueue: "main",
+              queue: "task/test-task",
+              isTest: false,
+              tags: [],
+              delayUntil: new Date(Date.now() + 5000),
+              debounce: {
+                key: "concurrent-key",
+                delay: "5s",
+              },
+            },
+            prisma
+          ),
+          engine.trigger(
+            {
+              number: 3,
+              friendlyId: "run_conc3",
+              environment: authenticatedEnvironment,
+              taskIdentifier,
+              payload: '{"data": "third"}',
+              payloadType: "application/json",
+              context: {},
+              traceContext: {},
+              traceId: "t12347",
+              spanId: "s12347",
+              workerQueue: "main",
+              queue: "task/test-task",
+              isTest: false,
+              tags: [],
+              delayUntil: new Date(Date.now() + 5000),
+              debounce: {
+                key: "concurrent-key",
+                delay: "5s",
+              },
+            },
+            prisma
+          ),
+        ]);
+
+        const [run1, run2, run3] = await concurrentTriggers;
+
+        // All should return the same run (one won the claim, others waited and got it)
+        expect(run2.id).toBe(run1.id);
+        expect(run3.id).toBe(run1.id);
+
+        // Only one run should exist in DB
+        const runs = await prisma.taskRun.findMany({
+          where: {
+            taskIdentifier,
+            runtimeEnvironmentId: authenticatedEnvironment.id,
+          },
+        });
+        expect(runs.length).toBe(1);
+
+        // The run should be in DELAYED status
+        const executionData = await engine.getRunExecutionData({ runId: run1.id });
+        assertNonNullable(executionData);
+        expect(executionData.snapshot.executionStatus).toBe("DELAYED");
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce trailing mode: updates payload on subsequent triggers",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger creates run with trailing mode
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_trailing1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "trailing-key",
+              delay: "5s",
+              mode: "trailing",
+            },
+          },
+          prisma
+        );
+
+        expect(run1.friendlyId).toBe("run_trailing1");
+        expect(run1.payload).toBe('{"data": "first"}');
+
+        // Second trigger with trailing mode should update the payload
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_trailing2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "trailing-key",
+              delay: "5s",
+              mode: "trailing",
+            },
+          },
+          prisma
+        );
+
+        // Should return the same run
+        expect(run2.id).toBe(run1.id);
+
+        // Verify the payload was updated to the second trigger's payload
+        const dbRun = await prisma.taskRun.findFirst({
+          where: { id: run1.id },
+        });
+        assertNonNullable(dbRun);
+        expect(dbRun.payload).toBe('{"data": "second"}');
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce trailing mode: updates metadata on subsequent triggers",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger with metadata
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_trailingmeta1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            metadata: '{"version": 1}',
+            metadataType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "trailing-meta-key",
+              delay: "5s",
+              mode: "trailing",
+            },
+          },
+          prisma
+        );
+
+        // Second trigger with different metadata
+        await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_trailingmeta2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            metadata: '{"version": 2, "extra": "field"}',
+            metadataType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "trailing-meta-key",
+              delay: "5s",
+              mode: "trailing",
+            },
+          },
+          prisma
+        );
+
+        // Verify metadata was updated
+        const dbRun = await prisma.taskRun.findFirst({
+          where: { id: run1.id },
+        });
+        assertNonNullable(dbRun);
+        expect(dbRun.metadata).toBe('{"version": 2, "extra": "field"}');
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce trailing mode: updates maxAttempts and maxDuration",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger with maxAttempts and maxDuration
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_trailingopts1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            maxAttempts: 3,
+            maxDurationInSeconds: 60,
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "trailing-opts-key",
+              delay: "5s",
+              mode: "trailing",
+            },
+          },
+          prisma
+        );
+
+        // Verify initial values
+        let dbRun = await prisma.taskRun.findFirst({
+          where: { id: run1.id },
+        });
+        assertNonNullable(dbRun);
+        expect(dbRun.maxAttempts).toBe(3);
+        expect(dbRun.maxDurationInSeconds).toBe(60);
+
+        // Second trigger with different maxAttempts and maxDuration
+        await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_trailingopts2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            maxAttempts: 5,
+            maxDurationInSeconds: 120,
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "trailing-opts-key",
+              delay: "5s",
+              mode: "trailing",
+            },
+          },
+          prisma
+        );
+
+        // Verify values were updated
+        dbRun = await prisma.taskRun.findFirst({
+          where: { id: run1.id },
+        });
+        assertNonNullable(dbRun);
+        expect(dbRun.maxAttempts).toBe(5);
+        expect(dbRun.maxDurationInSeconds).toBe(120);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce leading mode (default): does NOT update payload",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger creates run (leading mode - default)
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_leading1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "leading-key",
+              delay: "5s",
+              // mode: "leading" is default, not specifying it
+            },
+          },
+          prisma
+        );
+
+        // Second trigger should NOT update the payload (leading mode)
+        await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_leading2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "leading-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Verify the payload is still the first trigger's payload
+        const dbRun = await prisma.taskRun.findFirst({
+          where: { id: run1.id },
+        });
+        assertNonNullable(dbRun);
+        expect(dbRun.payload).toBe('{"data": "first"}');
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "registerDebouncedRun: atomic claim prevents overwrite when claim is lost",
+    async ({ prisma, redisOptions }) => {
+      // This test verifies the fix for the TOCTOU race condition in registerDebouncedRun.
+      // The race occurs when:
+      // 1. Server A claims debounce key with claimId-A
+      // 2. Server B claims same key with claimId-B (after A's claim expires)
+      // 3. Server B registers runId-B successfully
+      // 4. Server A attempts to register runId-A with stale claimId-A
+      // Without the fix, step 4 would overwrite runId-B. With the fix, it fails atomically.
+
+      const { createRedisClient } = await import("@internal/redis");
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      // Create a separate Redis client to simulate "another server" modifying keys directly
+      const simulatedServerRedis = createRedisClient({
+        ...redisOptions,
+        keyPrefix: `${redisOptions.keyPrefix ?? ""}debounce:`,
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+        const debounceKey = "race-test-key";
+        const environmentId = authenticatedEnvironment.id;
+        const delayUntil = new Date(Date.now() + 60_000);
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // Construct the Redis key (same format as DebounceSystem.getDebounceRedisKey)
+        const redisKey = `${environmentId}:${taskIdentifier}:${debounceKey}`;
+
+        // Step 1: Server A claims the key with claimId-A
+        const claimIdA = "claim-server-A";
+        await simulatedServerRedis.set(redisKey, `pending:${claimIdA}`, "PX", 60_000);
+
+        // Step 2 & 3: Simulate Server B claiming and registering (after A's claim "expires")
+        // In reality, this simulates the race where B's claim overwrites A's pending claim
+        const runIdB = "run_server_B";
+        await simulatedServerRedis.set(redisKey, runIdB, "PX", 60_000);
+
+        // Verify Server B's registration is in place
+        const valueAfterB = await simulatedServerRedis.get(redisKey);
+        expect(valueAfterB).toBe(runIdB);
+
+        // Step 4: Server A attempts to register with its stale claimId-A
+        // This should FAIL because the key no longer contains "pending:claim-server-A"
+        const runIdA = "run_server_A";
+        const registered = await engine.debounceSystem.registerDebouncedRun({
+          runId: runIdA,
+          environmentId,
+          taskIdentifier,
+          debounceKey,
+          delayUntil,
+          claimId: claimIdA, // Stale claim ID
+        });
+
+        // Step 5: Verify Server A's registration failed
+        expect(registered).toBe(false);
+
+        // Step 6: Verify Redis still contains runId-B (not overwritten by Server A)
+        const finalValue = await simulatedServerRedis.get(redisKey);
+        expect(finalValue).toBe(runIdB);
+      } finally {
+        await simulatedServerRedis.quit();
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "waitForExistingRun: returns claimId when key expires during wait",
+    async ({ prisma, redisOptions }) => {
+      // This test verifies the fix for the race condition where waitForExistingRun
+      // returns { status: "new" } without a claimId. Without the fix:
+      // 1. Server A's pending claim expires
+      // 2. Server B's waitForExistingRun detects key is gone, returns { status: "new" } (no claimId)
+      // 3. Server C atomically claims the key and registers runId-C
+      // 4. Server B calls registerDebouncedRun without claimId, does plain SET, overwrites runId-C
+      //
+      // With the fix, step 2 atomically claims the key before returning, preventing step 4's overwrite.
+
+      const { createRedisClient } = await import("@internal/redis");
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      // Create a separate Redis client to simulate "another server" modifying keys directly
+      const simulatedServerRedis = createRedisClient({
+        ...redisOptions,
+        keyPrefix: `${redisOptions.keyPrefix ?? ""}debounce:`,
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+        const debounceKey = "wait-race-test-key";
+        const environmentId = authenticatedEnvironment.id;
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // Construct the Redis key (same format as DebounceSystem.getDebounceRedisKey)
+        const redisKey = `${environmentId}:${taskIdentifier}:${debounceKey}`;
+
+        // Step 1: Server A claims the key with a pending claim
+        const claimIdA = "claim-server-A";
+        await simulatedServerRedis.set(redisKey, `pending:${claimIdA}`, "PX", 60_000);
+
+        // Step 2: Delete the key to simulate Server A's claim expiring
+        await simulatedServerRedis.del(redisKey);
+
+        // Step 3: Server B calls handleDebounce - since key is gone, it should atomically claim
+        const debounceResult = await engine.debounceSystem.handleDebounce({
+          environmentId,
+          taskIdentifier,
+          debounce: {
+            key: debounceKey,
+            delay: "5s",
+          },
+        });
+
+        // Step 4: Verify result is { status: "new" } WITH a claimId
+        expect(debounceResult.status).toBe("new");
+        if (debounceResult.status === "new") {
+          expect(debounceResult.claimId).toBeDefined();
+          expect(typeof debounceResult.claimId).toBe("string");
+          expect(debounceResult.claimId!.length).toBeGreaterThan(0);
+
+          // Step 5: Verify the key now contains Server B's pending claim
+          const valueAfterB = await simulatedServerRedis.get(redisKey);
+          expect(valueAfterB).toBe(`pending:${debounceResult.claimId}`);
+
+          // Step 6: Server C tries to claim the same key - should fail
+          const claimIdC = "claim-server-C";
+          const claimResultC = await simulatedServerRedis.set(
+            redisKey,
+            `pending:${claimIdC}`,
+            "PX",
+            60_000,
+            "NX"
+          );
+          expect(claimResultC).toBeNull(); // NX fails because key exists
+
+          // Step 7: Server B registers its run using its claimId
+          const runIdB = "run_server_B";
+          const delayUntil = new Date(Date.now() + 60_000);
+          const registered = await engine.debounceSystem.registerDebouncedRun({
+            runId: runIdB,
+            environmentId,
+            taskIdentifier,
+            debounceKey,
+            delayUntil,
+            claimId: debounceResult.claimId,
+          });
+
+          // Step 8: Verify Server B's registration succeeded
+          expect(registered).toBe(true);
+
+          // Step 9: Verify Redis contains Server B's run ID
+          const finalValue = await simulatedServerRedis.get(redisKey);
+          expect(finalValue).toBe(runIdB);
+        }
+      } finally {
+        await simulatedServerRedis.quit();
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: per-trigger maxDelay overrides global maxDebounceDuration",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Set a long global max debounce duration (1 minute)
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 60_000, // 1 minute global max
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger with a very short per-trigger maxDelay (1 second)
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_maxwait1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "maxwait-key",
+              delay: "5s",
+              maxDelay: "1s", // Very short per-trigger maxDelay (1 second)
+            },
+          },
+          prisma
+        );
+
+        expect(run1.friendlyId).toBe("run_maxwait1");
+
+        // Wait for the per-trigger maxDelay to be exceeded (1.5s > 1s)
+        await setTimeout(1500);
+
+        // Second trigger should create a new run because per-trigger maxDelay exceeded
+        // (even though global maxDebounceDurationMs is 60 seconds)
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_maxwait2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "maxwait-key",
+              delay: "5s",
+              maxDelay: "1s",
+            },
+          },
+          prisma
+        );
+
+        // Should be a different run because per-trigger maxDelay was exceeded
+        expect(run2.id).not.toBe(run1.id);
+        expect(run2.friendlyId).toBe("run_maxwait2");
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: falls back to global config when maxDelay not specified",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Set a very short global max debounce duration (1 second)
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 1000, // 1 second global max
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger without maxDelay - should use global config
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_noglobal1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "global-fallback-key",
+              delay: "5s",
+              // No maxDelay specified - should use global maxDebounceDurationMs
+            },
+          },
+          prisma
+        );
+
+        // Wait for global maxDebounceDurationMs to be exceeded (1.5s > 1s)
+        await setTimeout(1500);
+
+        // Second trigger should create a new run because global max exceeded
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_noglobal2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 5000),
+            debounce: {
+              key: "global-fallback-key",
+              delay: "5s",
+            },
+          },
+          prisma
+        );
+
+        // Should be a different run because global max exceeded
+        expect(run2.id).not.toBe(run1.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "Debounce: long maxDelay allows more debounce time than global config",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Set a short global max debounce duration (1 second)
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        debounce: {
+          maxDebounceDurationMs: 1000, // 1 second global max
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // First trigger with long maxDelay that overrides the short global config
+        const run1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_longmax1",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "first"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 2000),
+            debounce: {
+              key: "long-maxwait-key",
+              delay: "2s",
+              maxDelay: "60s", // Long per-trigger maxDelay overrides short global config
+            },
+          },
+          prisma
+        );
+
+        // Wait past the global maxDebounceDurationMs (1s) but within our per-trigger maxDelay (60s)
+        await setTimeout(1500);
+
+        // Second trigger should return SAME run because per-trigger maxDelay is 60s
+        const run2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_longmax2",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: '{"data": "second"}',
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 2000),
+            debounce: {
+              key: "long-maxwait-key",
+              delay: "2s",
+              maxDelay: "60s",
+            },
+          },
+          prisma
+        );
+
+        // Should be the SAME run because per-trigger maxDelay allows it
+        expect(run2.id).toBe(run1.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+});
+
diff --git a/internal-packages/run-engine/src/engine/tests/delays.test.ts b/internal-packages/run-engine/src/engine/tests/delays.test.ts
index 162967e9e95..8a93aa1ad14 100644
--- a/internal-packages/run-engine/src/engine/tests/delays.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/delays.test.ts
@@ -73,10 +73,10 @@ describe("RunEngine delays", () => {
         prisma
       );
 
-      //should be created but not queued yet
+      //should be delayed but not queued yet
       const executionData = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData);
-      expect(executionData.snapshot.executionStatus).toBe("RUN_CREATED");
+      expect(executionData.snapshot.executionStatus).toBe("DELAYED");
 
       //wait for 1 seconds
       await setTimeout(1_000);
@@ -155,10 +155,10 @@ describe("RunEngine delays", () => {
         prisma
       );
 
-      //should be created but not queued yet
+      //should be delayed but not queued yet
       const executionData = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData);
-      expect(executionData.snapshot.executionStatus).toBe("RUN_CREATED");
+      expect(executionData.snapshot.executionStatus).toBe("DELAYED");
 
       const rescheduleTo = new Date(Date.now() + 1_500);
       const updatedRun = await engine.rescheduleDelayedRun({
@@ -170,10 +170,10 @@ describe("RunEngine delays", () => {
       //wait so the initial delay passes
       await setTimeout(1_000);
 
-      //should still be created
+      //should still be delayed (rescheduled)
       const executionData2 = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData2);
-      expect(executionData2.snapshot.executionStatus).toBe("RUN_CREATED");
+      expect(executionData2.snapshot.executionStatus).toBe("DELAYED");
 
       //wait so the updated delay passes
       await setTimeout(1_750);
@@ -253,10 +253,10 @@ describe("RunEngine delays", () => {
         prisma
       );
 
-      //should be created but not queued yet
+      //should be delayed but not queued yet
       const executionData = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData);
-      expect(executionData.snapshot.executionStatus).toBe("RUN_CREATED");
+      expect(executionData.snapshot.executionStatus).toBe("DELAYED");
       expect(run.status).toBe("DELAYED");
 
       //wait for 1 seconds
@@ -356,10 +356,10 @@ describe("RunEngine delays", () => {
         prisma
       );
 
-      //verify it's created but not queued
+      //verify it's delayed but not queued
       const executionData = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData);
-      expect(executionData.snapshot.executionStatus).toBe("RUN_CREATED");
+      expect(executionData.snapshot.executionStatus).toBe("DELAYED");
       expect(run.status).toBe("DELAYED");
 
       //cancel the run
@@ -401,4 +401,110 @@ describe("RunEngine delays", () => {
       await engine.quit();
     }
   });
+
+  containerTest(
+    "enqueueDelayedRun respects rescheduled delayUntil",
+    async ({ prisma, redisOptions }) => {
+      // This test verifies the race condition fix where if delayUntil is updated
+      // (e.g., by debounce reschedule) while the worker job is executing,
+      // the run should NOT be enqueued at the original time.
+      //
+      // The race condition occurs when:
+      // 1. Worker job is scheduled for T1
+      // 2. rescheduleDelayedRun updates delayUntil to T2 in DB
+      // 3. worker.reschedule() tries to update the job, but it's already dequeued
+      // 4. Original worker job fires and calls enqueueDelayedRun
+      //
+      // Without the fix: Run would be enqueued at T1 (wrong!)
+      // With the fix: enqueueDelayedRun checks delayUntil > now and skips
+
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // Create a delayed run with a short delay (300ms)
+        const run = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_1235",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+            delayUntil: new Date(Date.now() + 300),
+          },
+          prisma
+        );
+
+        // Verify it's delayed
+        const executionData = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionData);
+        expect(executionData.snapshot.executionStatus).toBe("DELAYED");
+
+        // Simulate race condition: directly update delayUntil in the database to a future time
+        // This simulates what happens when rescheduleDelayedRun updates the DB but the
+        // worker.reschedule() call doesn't affect the already-dequeued job
+        const newDelayUntil = new Date(Date.now() + 10_000); // 10 seconds in the future
+        await prisma.taskRun.update({
+          where: { id: run.id },
+          data: { delayUntil: newDelayUntil },
+        });
+
+        // Wait past the original delay (500ms) so the worker job fires
+        await setTimeout(500);
+
+        // KEY ASSERTION: The run should still be DELAYED because the fix checks delayUntil > now
+        // Without the fix, the run would be QUEUED here (wrong!)
+        const executionData2 = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionData2);
+        expect(executionData2.snapshot.executionStatus).toBe("DELAYED");
+
+        // Note: We don't test the run eventually becoming QUEUED here because we only
+        // updated the DB (simulating the race). In the real scenario, rescheduleDelayedRun
+        // would also reschedule the worker job to fire at the new delayUntil time.
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
 });
diff --git a/internal-packages/run-engine/src/engine/tests/dequeuing.test.ts b/internal-packages/run-engine/src/engine/tests/dequeuing.test.ts
index 8ea142f630a..5871bee832b 100644
--- a/internal-packages/run-engine/src/engine/tests/dequeuing.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/dequeuing.test.ts
@@ -1,9 +1,10 @@
-import { containerTest } from "@internal/testcontainers";
+import { assertNonNullable, containerTest } from "@internal/testcontainers";
 import { trace } from "@internal/tracing";
 import { DequeuedMessage } from "@trigger.dev/core/v3";
 import { generateFriendlyId } from "@trigger.dev/core/v3/isomorphic";
 import { PrismaClientOrTransaction } from "@trigger.dev/database";
 import { expect } from "vitest";
+import { setTimeout } from "node:timers/promises";
 import { MinimalAuthenticatedEnvironment } from "../../shared/index.js";
 import { RunEngine } from "../index.js";
 import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "./setup.js";
@@ -79,6 +80,137 @@ describe("RunEngine dequeuing", () => {
       await engine.quit();
     }
   });
+
+  containerTest(
+    "Direct nack after dequeue clears concurrency and allows recovery",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      // Use a short heartbeat timeout so the stalled system recovers the run quickly
+      const pendingExecutingTimeout = 1000;
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0005,
+        },
+        heartbeatTimeoutsMs: {
+          PENDING_EXECUTING: pendingExecutingTimeout,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        // Setup background worker
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        // Trigger a single run
+        const runs = await triggerRuns({
+          engine,
+          environment: authenticatedEnvironment,
+          taskIdentifier,
+          prisma,
+          count: 1,
+        });
+        expect(runs.length).toBe(1);
+        const run = runs[0];
+
+        // Process master queue to move run to worker queue
+        await engine.runQueue.processMasterQueueForEnvironment(authenticatedEnvironment.id, 1);
+
+        // Wait for processing
+        await setTimeout(500);
+
+        // Dequeue from worker queue - this puts run in concurrency sets and creates PENDING_EXECUTING snapshot
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        expect(dequeued.length).toBe(1);
+        assertNonNullable(dequeued[0]);
+
+        // Verify run is in PENDING_EXECUTING state
+        const executionDataBefore = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionDataBefore);
+        expect(executionDataBefore.snapshot.executionStatus).toBe("PENDING_EXECUTING");
+
+        // Verify run is in concurrency
+        const envConcurrencyBefore = await engine.runQueue.currentConcurrencyOfEnvironment(
+          authenticatedEnvironment
+        );
+        expect(envConcurrencyBefore).toBe(1);
+
+        // Simulate DB failure fallback: call nackMessage directly via Redis
+        // This is what happens when the catch block can't read from Postgres
+        await engine.runQueue.nackMessage({
+          orgId: authenticatedEnvironment.organization.id,
+          messageId: run.id,
+        });
+
+        // Verify concurrency is cleared - this is the key fix!
+        // Without this fix, the run would stay in concurrency sets forever
+        const envConcurrencyAfter = await engine.runQueue.currentConcurrencyOfEnvironment(
+          authenticatedEnvironment
+        );
+        expect(envConcurrencyAfter).toBe(0);
+
+        // Verify the message is back in the queue
+        const envQueueLength = await engine.runQueue.lengthOfEnvQueue(authenticatedEnvironment);
+        expect(envQueueLength).toBe(1);
+
+        // Wait for the stalled system to detect and recover the PENDING_EXECUTING run
+        // The stalled system will call tryNackAndRequeue which updates Postgres state to QUEUED
+        await setTimeout(pendingExecutingTimeout * 5);
+
+        // Verify the stalled system recovered the run to QUEUED state
+        const executionDataAfterStall = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionDataAfterStall);
+        expect(executionDataAfterStall.snapshot.executionStatus).toBe("QUEUED");
+
+        // Process master queue to move the run from env queue to worker queue
+        await engine.runQueue.processMasterQueueForEnvironment(authenticatedEnvironment.id, 1);
+
+        // Wait for processing
+        await setTimeout(500);
+
+        // Dequeue from worker queue - the run should now be available
+        const dequeuedAgain = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        expect(dequeuedAgain.length).toBe(1);
+        assertNonNullable(dequeuedAgain[0]);
+        expect(dequeuedAgain[0].run.id).toBe(run.id);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
 });
 
 async function triggerRuns({
diff --git a/internal-packages/run-engine/src/engine/tests/getSnapshotsSince.test.ts b/internal-packages/run-engine/src/engine/tests/getSnapshotsSince.test.ts
new file mode 100644
index 00000000000..53db6ab1e52
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/tests/getSnapshotsSince.test.ts
@@ -0,0 +1,680 @@
+import { containerTest } from "@internal/testcontainers";
+import { trace } from "@internal/tracing";
+import { expect, describe } from "vitest";
+import { RunEngine } from "../index.js";
+import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "./setup.js";
+import { setTimeout } from "node:timers/promises";
+import {
+  generateTestScenarios,
+  type SnapshotTestScenario,
+} from "./helpers/executionStateMachine.js";
+import {
+  createWaitpointsWithOutput,
+  setupTestScenario,
+  generateLargeOutput,
+} from "./helpers/snapshotTestHelpers.js";
+import { generateFriendlyId } from "@trigger.dev/core/v3/isomorphic";
+
+vi.setConfig({ testTimeout: 120_000 });
+
+describe("RunEngine getSnapshotsSince", () => {
+  containerTest(
+    "returns empty array when querying from latest snapshot",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        const runFriendlyId = generateFriendlyId("run");
+        const run = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: runFriendlyId,
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t_empty",
+            spanId: "s_empty",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_empty",
+          workerQueue: "main",
+        });
+
+        // Get all snapshots
+        const allSnapshots = await prisma.taskRunExecutionSnapshot.findMany({
+          where: { runId: run.id, isValid: true },
+          orderBy: { createdAt: "asc" },
+        });
+
+        expect(allSnapshots.length).toBeGreaterThan(0);
+
+        // Query from the last snapshot
+        const lastSnapshot = allSnapshots[allSnapshots.length - 1];
+        const result = await engine.getSnapshotsSince({
+          runId: run.id,
+          snapshotId: lastSnapshot.id,
+        });
+
+        expect(result).not.toBeNull();
+        expect(result!.length).toBe(0);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "returns snapshots after the specified one with waitpoints only on latest",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        const runFriendlyId = generateFriendlyId("run");
+        const run = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: runFriendlyId,
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t_wp",
+            spanId: "s_wp",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_wp",
+          workerQueue: "main",
+        });
+
+        // Start attempt
+        await engine.startRunAttempt({
+          runId: dequeued[0].run.id,
+          snapshotId: dequeued[0].snapshot.id,
+        });
+
+        // Create and block with a waitpoint
+        const { waitpoint } = await engine.createDateTimeWaitpoint({
+          projectId: authenticatedEnvironment.project.id,
+          environmentId: authenticatedEnvironment.id,
+          completedAfter: new Date(Date.now() + 50),
+        });
+
+        await engine.blockRunWithWaitpoint({
+          runId: run.id,
+          waitpoints: [waitpoint.id],
+          projectId: authenticatedEnvironment.project.id,
+          organizationId: authenticatedEnvironment.organization.id,
+        });
+
+        // Poll until the waitpoint is completed by the background worker
+        for (let i = 0; i < 50; i++) {
+          await setTimeout(100);
+          const wp = await prisma.waitpoint.findFirst({
+            where: { id: waitpoint.id },
+            select: { status: true },
+          });
+          if (wp?.status === "COMPLETED") break;
+        }
+
+        // Allow time for the snapshot to be created after waitpoint completion
+        await setTimeout(200);
+
+        // Get all snapshots
+        const allSnapshots = await prisma.taskRunExecutionSnapshot.findMany({
+          where: { runId: run.id, isValid: true },
+          orderBy: { createdAt: "asc" },
+        });
+
+        expect(allSnapshots.length).toBeGreaterThanOrEqual(3);
+
+        // Query from the first snapshot
+        const result = await engine.getSnapshotsSince({
+          runId: run.id,
+          snapshotId: allSnapshots[0].id,
+        });
+
+        expect(result).not.toBeNull();
+        expect(result!.length).toBeGreaterThanOrEqual(2);
+
+        // The latest snapshot should have completedWaitpoints
+        const latest = result![result!.length - 1];
+        expect(latest.completedWaitpoints.length).toBeGreaterThan(0);
+
+        // Earlier snapshots should have empty waitpoints (optimization)
+        for (let i = 0; i < result!.length - 1; i++) {
+          expect(result![i].completedWaitpoints.length).toBe(0);
+        }
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "handles multiple waitpoints correctly - only latest has them",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+        await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+        const runFriendlyId = generateFriendlyId("run");
+        const run = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: runFriendlyId,
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t_mwp",
+            spanId: "s_mwp",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_mwp",
+          workerQueue: "main",
+        });
+
+        await engine.startRunAttempt({
+          runId: dequeued[0].run.id,
+          snapshotId: dequeued[0].snapshot.id,
+        });
+
+        // Create multiple waitpoints
+        const waitpointCount = 5;
+        const waitpointPromises = Array.from({ length: waitpointCount }).map(() =>
+          engine.createManualWaitpoint({
+            environmentId: authenticatedEnvironment.id,
+            projectId: authenticatedEnvironment.projectId,
+          })
+        );
+        const waitpoints = await Promise.all(waitpointPromises);
+
+        // Block the run with all waitpoints
+        for (const { waitpoint } of waitpoints) {
+          await engine.blockRunWithWaitpoint({
+            runId: run.id,
+            waitpoints: waitpoint.id,
+            projectId: authenticatedEnvironment.projectId,
+            organizationId: authenticatedEnvironment.organizationId,
+          });
+        }
+
+        // Complete all waitpoints
+        for (const { waitpoint } of waitpoints) {
+          await engine.completeWaitpoint({ id: waitpoint.id });
+        }
+
+        await setTimeout(500);
+
+        // Get all snapshots
+        const allSnapshots = await prisma.taskRunExecutionSnapshot.findMany({
+          where: { runId: run.id, isValid: true },
+          orderBy: { createdAt: "asc" },
+        });
+
+        // Query from early in the sequence
+        const result = await engine.getSnapshotsSince({
+          runId: run.id,
+          snapshotId: allSnapshots[0].id,
+        });
+
+        expect(result).not.toBeNull();
+        expect(result!.length).toBeGreaterThan(0);
+
+        // Only the latest should have waitpoints
+        const latest = result![result!.length - 1];
+
+        // Earlier snapshots must have empty completedWaitpoints
+        for (let i = 0; i < result!.length - 1; i++) {
+          expect(result![i].completedWaitpoints.length).toBe(0);
+        }
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest("returns null for invalid snapshot ID", async ({ prisma, redisOptions }) => {
+    const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+    const engine = new RunEngine({
+      prisma,
+      worker: {
+        redis: redisOptions,
+        workers: 1,
+        tasksPerWorker: 10,
+        pollIntervalMs: 100,
+      },
+      queue: {
+        redis: redisOptions,
+      },
+      runLock: {
+        redis: redisOptions,
+      },
+      machines: {
+        defaultMachine: "small-1x",
+        machines: {
+          "small-1x": {
+            name: "small-1x" as const,
+            cpu: 0.5,
+            memory: 0.5,
+            centsPerMs: 0.0001,
+          },
+        },
+        baseCostInCents: 0.0001,
+      },
+      tracer: trace.getTracer("test", "0.0.0"),
+    });
+
+    try {
+      const taskIdentifier = "test-task";
+      await setupBackgroundWorker(engine, authenticatedEnvironment, taskIdentifier);
+
+      const runFriendlyId = generateFriendlyId("run");
+      const run = await engine.trigger(
+        {
+          number: 1,
+          friendlyId: runFriendlyId,
+          environment: authenticatedEnvironment,
+          taskIdentifier,
+          payload: "{}",
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t_invalid",
+          spanId: "s_invalid",
+          workerQueue: "main",
+          queue: "task/test-task",
+          isTest: false,
+          tags: [],
+        },
+        prisma
+      );
+
+      // Query with invalid snapshot ID
+      const result = await engine.getSnapshotsSince({
+        runId: run.id,
+        snapshotId: "invalid-snapshot-id",
+      });
+
+      // Should return null (caught by getSnapshotsSince error handler)
+      expect(result).toBeNull();
+    } finally {
+      await engine.quit();
+    }
+  });
+
+  // Direct database tests for the core function
+  containerTest(
+    "direct test: large waitpoint scenario - 100 waitpoints with 10KB outputs",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        // Create scenario directly in database
+        const scenario = await setupTestScenario(prisma, authenticatedEnvironment, {
+          totalWaitpoints: 100,
+          outputSizeKB: 10,
+          snapshotConfigs: [
+            { status: "RUN_CREATED", completedWaitpointCount: 0 },
+            { status: "QUEUED", completedWaitpointCount: 0 },
+            { status: "PENDING_EXECUTING", completedWaitpointCount: 0 },
+            { status: "EXECUTING", completedWaitpointCount: 0 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 50 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 100 },
+            { status: "EXECUTING", completedWaitpointCount: 100 },
+            { status: "FINISHED", completedWaitpointCount: 100 },
+          ],
+        });
+
+        // Query from early snapshot
+        const result = await engine.getSnapshotsSince({
+          runId: scenario.run.id,
+          snapshotId: scenario.snapshots[2].id, // After PENDING_EXECUTING
+        });
+
+        expect(result).not.toBeNull();
+        expect(result!.length).toBe(6); // EXECUTING through FINISHED
+
+        // Latest should have all 100 waitpoints
+        const latest = result![result!.length - 1];
+        expect(latest.completedWaitpoints.length).toBe(100);
+
+        // Verify all earlier snapshots have empty waitpoints
+        for (let i = 0; i < result!.length - 1; i++) {
+          expect(result![i].completedWaitpoints.length).toBe(0);
+        }
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "direct test: zombie run scenario - 236 waitpoints with 100KB outputs, 24 snapshots",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        // This scenario matches the exact conditions that caused the NAPI error
+        // 24 snapshots × 236 waitpoints × 100KB = ~570MB if not optimized
+        const scenario = await setupTestScenario(prisma, authenticatedEnvironment, {
+          totalWaitpoints: 236,
+          outputSizeKB: 100,
+          snapshotConfigs: [
+            { status: "RUN_CREATED", completedWaitpointCount: 0 },
+            { status: "QUEUED", completedWaitpointCount: 0 },
+            { status: "PENDING_EXECUTING", completedWaitpointCount: 0 },
+            { status: "EXECUTING", completedWaitpointCount: 0 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 100 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 200 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+            { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+            { status: "QUEUED", completedWaitpointCount: 236 },
+            { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+            { status: "EXECUTING", completedWaitpointCount: 236 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+            { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+            { status: "QUEUED", completedWaitpointCount: 236 },
+            { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+            { status: "EXECUTING", completedWaitpointCount: 236 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+            { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+            { status: "QUEUED", completedWaitpointCount: 236 },
+            { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+            { status: "EXECUTING", completedWaitpointCount: 236 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+            { status: "EXECUTING", completedWaitpointCount: 236 },
+          ],
+        });
+
+        expect(scenario.snapshots.length).toBe(24);
+        expect(scenario.waitpoints.length).toBe(236);
+
+        // Query from the 6th snapshot (after waitpoints start completing)
+        const queryFromIndex = 5;
+        const result = await engine.getSnapshotsSince({
+          runId: scenario.run.id,
+          snapshotId: scenario.snapshots[queryFromIndex].id,
+        });
+
+        expect(result).not.toBeNull();
+        // Should return snapshots after index 5, which is 24 - 6 = 18 snapshots
+        expect(result!.length).toBe(24 - queryFromIndex - 1);
+
+        // Latest should have all 236 waitpoints
+        const latest = result![result!.length - 1];
+        expect(latest.completedWaitpoints.length).toBe(236);
+
+        // All other snapshots should have 0 waitpoints (optimization)
+        for (let i = 0; i < result!.length - 1; i++) {
+          expect(result![i].completedWaitpoints.length).toBe(0);
+        }
+
+        // Verify the outputs are present and correct size
+        for (const wp of latest.completedWaitpoints) {
+          expect(wp.output).toBeDefined();
+          // ~100KB output as JSON string
+          expect(typeof wp.output).toBe("string");
+        }
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest(
+    "direct test: verifies chunked fetching works with 500+ waitpoints",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        // 500 waitpoints requires 5 chunks (100 per chunk)
+        const scenario = await setupTestScenario(prisma, authenticatedEnvironment, {
+          totalWaitpoints: 500,
+          outputSizeKB: 10, // Smaller outputs for faster test
+          snapshotConfigs: [
+            { status: "RUN_CREATED", completedWaitpointCount: 0 },
+            { status: "QUEUED", completedWaitpointCount: 0 },
+            { status: "EXECUTING", completedWaitpointCount: 0 },
+            { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 500 },
+            { status: "EXECUTING", completedWaitpointCount: 500 },
+          ],
+        });
+
+        const result = await engine.getSnapshotsSince({
+          runId: scenario.run.id,
+          snapshotId: scenario.snapshots[0].id,
+        });
+
+        expect(result).not.toBeNull();
+        expect(result!.length).toBe(4);
+
+        const latest = result![result!.length - 1];
+        expect(latest.completedWaitpoints.length).toBe(500);
+
+        // All other snapshots should be empty
+        for (let i = 0; i < result!.length - 1; i++) {
+          expect(result![i].completedWaitpoints.length).toBe(0);
+        }
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+});
diff --git a/internal-packages/run-engine/src/engine/tests/heartbeats.test.ts b/internal-packages/run-engine/src/engine/tests/heartbeats.test.ts
index 9983415f514..3fe05289c49 100644
--- a/internal-packages/run-engine/src/engine/tests/heartbeats.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/heartbeats.test.ts
@@ -490,7 +490,162 @@ describe("RunEngine heartbeats", () => {
     }
   });
 
-  containerTest("Suspended", async ({ prisma, redisOptions }) => {
+  containerTest(
+    "Suspended when blocked by a manual waitpoint",
+    async ({ prisma, redisOptions }) => {
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const heartbeatTimeout = 1000;
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        heartbeatTimeoutsMs: {
+          SUSPENDED: heartbeatTimeout,
+        },
+        suspendedHeartbeatRetriesConfig: {
+          maxCount: 10,
+          maxDelayMs: 1000,
+          initialDelayMs: 1000,
+          factor: 2,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const taskIdentifier = "test-task";
+
+        //create background worker
+        const backgroundWorker = await setupBackgroundWorker(
+          engine,
+          authenticatedEnvironment,
+          taskIdentifier
+        );
+
+        //trigger the run
+        const run = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_1234",
+            environment: authenticatedEnvironment,
+            taskIdentifier,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            workerQueue: "main",
+            queue: "task/test-task",
+            isTest: false,
+            tags: [],
+          },
+          prisma
+        );
+
+        await setTimeout(500);
+
+        //dequeue the run
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+
+        //create an attempt
+        await engine.startRunAttempt({
+          runId: dequeued[0].run.id,
+          snapshotId: dequeued[0].snapshot.id,
+        });
+
+        //cancel run
+        //create a manual waitpoint
+        const waitpointResult = await engine.createManualWaitpoint({
+          environmentId: authenticatedEnvironment.id,
+          projectId: authenticatedEnvironment.projectId,
+        });
+        expect(waitpointResult.waitpoint.status).toBe("PENDING");
+
+        //block the run
+        const blockedResult = await engine.blockRunWithWaitpoint({
+          runId: run.id,
+          waitpoints: waitpointResult.waitpoint.id,
+          projectId: authenticatedEnvironment.projectId,
+          organizationId: authenticatedEnvironment.organizationId,
+        });
+
+        const blockedExecutionData = await engine.getRunExecutionData({ runId: run.id });
+        expect(blockedExecutionData?.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
+
+        // Create a checkpoint
+        const checkpointResult = await engine.createCheckpoint({
+          runId: run.id,
+          snapshotId: blockedResult.id,
+          checkpoint: {
+            type: "DOCKER",
+            reason: "TEST_CHECKPOINT",
+            location: "test-location",
+            imageRef: "test-image-ref",
+          },
+        });
+
+        expect(checkpointResult.ok).toBe(true);
+
+        const snapshot = checkpointResult.ok ? checkpointResult.snapshot : null;
+
+        assertNonNullable(snapshot);
+
+        // Verify checkpoint creation
+        expect(snapshot.executionStatus).toBe("SUSPENDED");
+
+        // Now wait for the heartbeat to timeout, but it should retry later
+        await setTimeout(heartbeatTimeout * 1.5);
+
+        // Simulate a suspended run without any blocking waitpoints by deleting any blocking task run waitpoints
+        await prisma.taskRunWaitpoint.deleteMany({
+          where: {
+            taskRunId: run.id,
+          },
+        });
+
+        // Now wait for the heartbeat to timeout again
+        await setTimeout(heartbeatTimeout * 2);
+
+        // We don't restart the heartbeat because there are no run or batch waitpoints
+        const executionData2 = await engine.getRunExecutionData({ runId: run.id });
+        assertNonNullable(executionData2);
+        expect(executionData2.snapshot.executionStatus).toBe("SUSPENDED");
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
+
+  containerTest("Suspended when blocked by a run waitpoint", async ({ prisma, redisOptions }) => {
     const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
 
     const heartbeatTimeout = 1000;
@@ -526,6 +681,12 @@ describe("RunEngine heartbeats", () => {
       heartbeatTimeoutsMs: {
         SUSPENDED: heartbeatTimeout,
       },
+      suspendedHeartbeatRetriesConfig: {
+        maxCount: 10,
+        maxDelayMs: heartbeatTimeout,
+        initialDelayMs: heartbeatTimeout,
+        factor: 2,
+      },
       tracer: trace.getTracer("test", "0.0.0"),
     });
 
@@ -533,11 +694,10 @@ describe("RunEngine heartbeats", () => {
       const taskIdentifier = "test-task";
 
       //create background worker
-      const backgroundWorker = await setupBackgroundWorker(
-        engine,
-        authenticatedEnvironment,
-        taskIdentifier
-      );
+      const backgroundWorker = await setupBackgroundWorker(engine, authenticatedEnvironment, [
+        taskIdentifier,
+        "child-task",
+      ]);
 
       //trigger the run
       const run = await engine.trigger(
@@ -574,21 +734,27 @@ describe("RunEngine heartbeats", () => {
         snapshotId: dequeued[0].snapshot.id,
       });
 
-      //cancel run
-      //create a manual waitpoint
-      const waitpointResult = await engine.createManualWaitpoint({
-        environmentId: authenticatedEnvironment.id,
-        projectId: authenticatedEnvironment.projectId,
-      });
-      expect(waitpointResult.waitpoint.status).toBe("PENDING");
-
-      //block the run
-      const blockedResult = await engine.blockRunWithWaitpoint({
-        runId: run.id,
-        waitpoints: waitpointResult.waitpoint.id,
-        projectId: authenticatedEnvironment.projectId,
-        organizationId: authenticatedEnvironment.organizationId,
-      });
+      const childRun = await engine.trigger(
+        {
+          number: 1,
+          friendlyId: "run_c1234",
+          environment: authenticatedEnvironment,
+          taskIdentifier: "child-task",
+          payload: "{}",
+          payloadType: "application/json",
+          context: {},
+          traceContext: {},
+          traceId: "t12345",
+          spanId: "s12345",
+          queue: `task/child-task`,
+          isTest: false,
+          tags: [],
+          resumeParentOnCompletion: true,
+          parentTaskRunId: run.id,
+          workerQueue: "main",
+        },
+        prisma
+      );
 
       const blockedExecutionData = await engine.getRunExecutionData({ runId: run.id });
       expect(blockedExecutionData?.snapshot.executionStatus).toBe("EXECUTING_WITH_WAITPOINTS");
@@ -596,7 +762,7 @@ describe("RunEngine heartbeats", () => {
       // Create a checkpoint
       const checkpointResult = await engine.createCheckpoint({
         runId: run.id,
-        snapshotId: blockedResult.id,
+        snapshotId: blockedExecutionData!.snapshot.id,
         checkpoint: {
           type: "DOCKER",
           reason: "TEST_CHECKPOINT",
@@ -627,7 +793,7 @@ describe("RunEngine heartbeats", () => {
       // Now wait for the heartbeat to timeout again
       await setTimeout(heartbeatTimeout * 2);
 
-      // Expect the run to be queued
+      // We don't restart the heartbeat because there are no run or batch waitpoints
       const executionData2 = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData2);
       expect(executionData2.snapshot.executionStatus).toBe("QUEUED");
@@ -639,7 +805,7 @@ describe("RunEngine heartbeats", () => {
   containerTest("Heartbeat keeps run alive", async ({ prisma, redisOptions }) => {
     const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
 
-    const executingTimeout = 100;
+    const executingTimeout = 500;
 
     const engine = new RunEngine({
       prisma,
@@ -726,24 +892,23 @@ describe("RunEngine heartbeats", () => {
       expect(executionData.snapshot.executionStatus).toBe("EXECUTING");
       expect(executionData.run.status).toBe("EXECUTING");
 
-      // Send heartbeats every 50ms (half the timeout)
-      for (let i = 0; i < 6; i++) {
-        await setTimeout(50);
+      // Send heartbeats every 100ms (to make sure we're not timing out)
+      for (let i = 0; i < 5; i++) {
+        await setTimeout(100);
         await engine.heartbeatRun({
           runId: run.id,
           snapshotId: attempt.snapshot.id,
         });
       }
 
-      // After 300ms (3x the timeout) the run should still be executing
-      // because we've been sending heartbeats
+      // Should still be executing because we're sending heartbeats
       const executionData2 = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData2);
       expect(executionData2.snapshot.executionStatus).toBe("EXECUTING");
       expect(executionData2.run.status).toBe("EXECUTING");
 
       // Stop sending heartbeats and wait for timeout
-      await setTimeout(executingTimeout * 3);
+      await setTimeout(executingTimeout * 2);
 
       // Now it should have timed out and be queued
       const executionData3 = await engine.getRunExecutionData({ runId: run.id });
diff --git a/internal-packages/run-engine/src/engine/tests/helpers/executionStateMachine.ts b/internal-packages/run-engine/src/engine/tests/helpers/executionStateMachine.ts
new file mode 100644
index 00000000000..4dd92cdbd41
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/tests/helpers/executionStateMachine.ts
@@ -0,0 +1,257 @@
+import { TaskRunExecutionStatus } from "@trigger.dev/database";
+
+/**
+ * Defines valid execution status transitions for the Run Engine 2.0.
+ * This is a model of the state machine that governs run execution.
+ */
+export const EXECUTION_STATUS_TRANSITIONS: Record<
+  TaskRunExecutionStatus,
+  TaskRunExecutionStatus[]
+> = {
+  RUN_CREATED: ["QUEUED", "DELAYED"],
+  DELAYED: ["QUEUED"],
+  QUEUED: ["PENDING_EXECUTING", "QUEUED_EXECUTING"],
+  QUEUED_EXECUTING: ["PENDING_EXECUTING", "QUEUED"],
+  PENDING_EXECUTING: ["EXECUTING", "PENDING_CANCEL", "FINISHED", "QUEUED"],
+  EXECUTING: ["EXECUTING_WITH_WAITPOINTS", "FINISHED", "PENDING_CANCEL", "QUEUED"],
+  EXECUTING_WITH_WAITPOINTS: ["EXECUTING", "SUSPENDED", "FINISHED", "PENDING_CANCEL"],
+  SUSPENDED: ["QUEUED", "PENDING_CANCEL", "FINISHED"],
+  PENDING_CANCEL: ["FINISHED"],
+  FINISHED: ["QUEUED"], // Retry case
+};
+
+/**
+ * Validates if a transition from one status to another is valid.
+ */
+export function isValidTransition(
+  from: TaskRunExecutionStatus,
+  to: TaskRunExecutionStatus
+): boolean {
+  return EXECUTION_STATUS_TRANSITIONS[from]?.includes(to) ?? false;
+}
+
+/**
+ * Configuration for a snapshot in a test scenario.
+ */
+export interface SnapshotConfig {
+  /** The execution status for this snapshot */
+  status: TaskRunExecutionStatus;
+  /** Number of waitpoints completed at this snapshot (cumulative) */
+  completedWaitpointCount: number;
+  /** Whether this snapshot has a checkpoint */
+  hasCheckpoint?: boolean;
+  /** Description for the snapshot */
+  description?: string;
+}
+
+/**
+ * A test scenario for getSnapshotsSince testing.
+ */
+export interface SnapshotTestScenario {
+  /** Unique name for the scenario */
+  name: string;
+  /** Description of what this scenario tests */
+  description: string;
+  /** Total number of waitpoints to create */
+  totalWaitpoints: number;
+  /** Size of each waitpoint's output in KB */
+  outputSizeKB: number;
+  /** Configuration for each snapshot to create */
+  snapshots: SnapshotConfig[];
+  /** Which snapshot index to query "since" (0-based) */
+  queryFromIndex: number;
+  /** Expected number of waitpoints on the latest snapshot returned */
+  expectedWaitpointsOnLatest: number;
+}
+
+/**
+ * Generates test scenarios for comprehensive getSnapshotsSince testing.
+ * These scenarios cover various edge cases and stress tests.
+ */
+export function generateTestScenarios(): SnapshotTestScenario[] {
+  return [
+    {
+      name: "simple_no_waitpoints",
+      description: "Basic run without any waitpoints",
+      totalWaitpoints: 0,
+      outputSizeKB: 0,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "FINISHED", completedWaitpointCount: 0 },
+      ],
+      queryFromIndex: 0,
+      expectedWaitpointsOnLatest: 0,
+    },
+    {
+      name: "single_small_waitpoint",
+      description: "Single waitpoint with small output",
+      totalWaitpoints: 1,
+      outputSizeKB: 1,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 1 },
+      ],
+      queryFromIndex: 2,
+      expectedWaitpointsOnLatest: 1,
+    },
+    {
+      name: "batch_100_medium",
+      description: "Medium batch with 100 waitpoints and medium outputs",
+      totalWaitpoints: 100,
+      outputSizeKB: 10,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 50 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 100 },
+        { status: "SUSPENDED", completedWaitpointCount: 100, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 100 },
+        { status: "EXECUTING", completedWaitpointCount: 100 },
+        { status: "FINISHED", completedWaitpointCount: 100 },
+      ],
+      queryFromIndex: 3,
+      expectedWaitpointsOnLatest: 100,
+    },
+    {
+      name: "batch_236_large_zombie_scenario",
+      description:
+        "Matches the zombie run scenario: 24 snapshots, 236 waitpoints, 100KB outputs each",
+      totalWaitpoints: 236,
+      outputSizeKB: 100,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 50 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 100 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 150 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 200 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+        { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 236 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+        { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 236 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+        { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 236 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING", completedWaitpointCount: 236 },
+      ],
+      queryFromIndex: 6,
+      expectedWaitpointsOnLatest: 236,
+    },
+    {
+      name: "batch_500_large",
+      description: "Large batch requiring chunked fetching",
+      totalWaitpoints: 500,
+      outputSizeKB: 50,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 100 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 250 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 400 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 500 },
+        { status: "SUSPENDED", completedWaitpointCount: 500, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 500 },
+        { status: "EXECUTING", completedWaitpointCount: 500 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 500 },
+        { status: "SUSPENDED", completedWaitpointCount: 500, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 500 },
+        { status: "EXECUTING", completedWaitpointCount: 500 },
+      ],
+      queryFromIndex: 5,
+      expectedWaitpointsOnLatest: 500,
+    },
+    {
+      name: "system_failure_finished",
+      description: "Latest snapshot is FINISHED status with completed waitpoints",
+      totalWaitpoints: 100,
+      outputSizeKB: 50,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 50 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 100 },
+        { status: "EXECUTING", completedWaitpointCount: 100 },
+        { status: "FINISHED", completedWaitpointCount: 100 },
+      ],
+      queryFromIndex: 3,
+      expectedWaitpointsOnLatest: 100,
+    },
+    {
+      name: "query_from_latest",
+      description: "Querying from the latest snapshot should return empty array",
+      totalWaitpoints: 10,
+      outputSizeKB: 10,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 10 },
+      ],
+      queryFromIndex: 4, // The last snapshot
+      expectedWaitpointsOnLatest: 0, // No snapshots returned, so no waitpoints
+    },
+    {
+      name: "requeue_loop",
+      description: "Multiple QUEUED->PENDING_EXECUTING cycles with waitpoints",
+      totalWaitpoints: 236,
+      outputSizeKB: 100,
+      snapshots: [
+        { status: "RUN_CREATED", completedWaitpointCount: 0 },
+        { status: "QUEUED", completedWaitpointCount: 0 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 0 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+        { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 236 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "QUEUED", completedWaitpointCount: 236 }, // Requeued
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "QUEUED", completedWaitpointCount: 236 }, // Requeued again
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+        { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 236 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "QUEUED", completedWaitpointCount: 236 }, // Requeued
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "QUEUED", completedWaitpointCount: 236 }, // Requeued again
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING_WITH_WAITPOINTS", completedWaitpointCount: 236 },
+        { status: "SUSPENDED", completedWaitpointCount: 236, hasCheckpoint: true },
+        { status: "QUEUED", completedWaitpointCount: 236 },
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "QUEUED", completedWaitpointCount: 236 }, // Requeued
+        { status: "PENDING_EXECUTING", completedWaitpointCount: 236 },
+        { status: "EXECUTING", completedWaitpointCount: 236 },
+      ],
+      queryFromIndex: 7,
+      expectedWaitpointsOnLatest: 236,
+    },
+  ];
+}
diff --git a/internal-packages/run-engine/src/engine/tests/helpers/snapshotTestHelpers.ts b/internal-packages/run-engine/src/engine/tests/helpers/snapshotTestHelpers.ts
new file mode 100644
index 00000000000..f981f35145f
--- /dev/null
+++ b/internal-packages/run-engine/src/engine/tests/helpers/snapshotTestHelpers.ts
@@ -0,0 +1,322 @@
+import { generateFriendlyId, WaitpointId } from "@trigger.dev/core/v3/isomorphic";
+import {
+  PrismaClient,
+  TaskRunExecutionSnapshot,
+  TaskRunExecutionStatus,
+  Waitpoint,
+  WaitpointStatus,
+} from "@trigger.dev/database";
+import type { AuthenticatedEnvironment } from "../setup.js";
+
+/**
+ * Generates a large output string of the specified size in KB.
+ * The output is a valid JSON string to simulate realistic waitpoint output.
+ */
+export function generateLargeOutput(sizeKB: number): string {
+  if (sizeKB <= 0) return JSON.stringify({ data: "" });
+
+  // Create a string that's approximately the target size
+  // Account for JSON wrapper overhead
+  const targetBytes = sizeKB * 1024;
+  const overhead = JSON.stringify({ data: "" }).length;
+  const payloadSize = Math.max(0, targetBytes - overhead);
+
+  // Generate a payload of repeating 'x' characters
+  const payload = "x".repeat(payloadSize);
+  return JSON.stringify({ data: payload });
+}
+
+/**
+ * Creates waitpoints with specified output sizes for testing.
+ */
+export async function createWaitpointsWithOutput(
+  prisma: PrismaClient,
+  count: number,
+  outputSizeKB: number,
+  environmentId: string,
+  projectId: string
+): Promise<Waitpoint[]> {
+  if (count === 0) return [];
+
+  const output = generateLargeOutput(outputSizeKB);
+  const waitpoints: Waitpoint[] = [];
+
+  // Create waitpoints in batches to avoid overwhelming the database
+  const batchSize = 50;
+  for (let i = 0; i < count; i += batchSize) {
+    const batchCount = Math.min(batchSize, count - i);
+    const batch = await Promise.all(
+      Array.from({ length: batchCount }).map(async (_, j) => {
+        const waitpointIds = WaitpointId.generate();
+        return prisma.waitpoint.create({
+          data: {
+            id: waitpointIds.id,
+            friendlyId: waitpointIds.friendlyId,
+            type: "MANUAL",
+            status: "COMPLETED" as WaitpointStatus,
+            idempotencyKey: `test-idempotency-${waitpointIds.id}`,
+            userProvidedIdempotencyKey: false,
+            completedAt: new Date(),
+            output,
+            outputType: "application/json",
+            outputIsError: false,
+            environmentId,
+            projectId,
+          },
+        });
+      })
+    );
+    waitpoints.push(...batch);
+  }
+
+  return waitpoints;
+}
+
+/**
+ * Creates a snapshot directly in the database for testing purposes.
+ * This bypasses the normal engine flow to allow creating specific test scenarios.
+ */
+export async function createTestSnapshot(
+  prisma: PrismaClient,
+  {
+    runId,
+    status,
+    environmentId,
+    environmentType,
+    projectId,
+    organizationId,
+    completedWaitpointIds,
+    checkpointId,
+    previousSnapshotId,
+    batchId,
+    workerId,
+    runnerId,
+    attemptNumber,
+  }: {
+    runId: string;
+    status: TaskRunExecutionStatus;
+    environmentId: string;
+    environmentType: "PRODUCTION" | "STAGING" | "DEVELOPMENT" | "PREVIEW";
+    projectId: string;
+    organizationId: string;
+    completedWaitpointIds?: string[];
+    checkpointId?: string;
+    previousSnapshotId?: string;
+    batchId?: string;
+    workerId?: string;
+    runnerId?: string;
+    attemptNumber?: number;
+  }
+): Promise<TaskRunExecutionSnapshot> {
+  // Determine run status based on execution status
+  const runStatus = getRunStatusFromExecutionStatus(status);
+
+  const snapshot = await prisma.taskRunExecutionSnapshot.create({
+    data: {
+      engine: "V2",
+      executionStatus: status,
+      description: `Test snapshot: ${status}`,
+      previousSnapshotId,
+      runId,
+      runStatus,
+      attemptNumber,
+      batchId,
+      environmentId,
+      environmentType,
+      projectId,
+      organizationId,
+      checkpointId,
+      workerId,
+      runnerId,
+      isValid: true,
+      completedWaitpoints: completedWaitpointIds
+        ? {
+            connect: completedWaitpointIds.map((id) => ({ id })),
+          }
+        : undefined,
+      completedWaitpointOrder: completedWaitpointIds ?? [],
+    },
+  });
+
+  // Small delay to ensure different createdAt timestamps
+  await new Promise((resolve) => setTimeout(resolve, 5));
+
+  return snapshot;
+}
+
+/**
+ * Maps execution status to run status for test snapshot creation.
+ */
+function getRunStatusFromExecutionStatus(
+  status: TaskRunExecutionStatus
+): "PENDING" | "EXECUTING" | "WAITING_FOR_DEPLOY" | "COMPLETED_SUCCESSFULLY" | "SYSTEM_FAILURE" {
+  switch (status) {
+    case "RUN_CREATED":
+    case "QUEUED":
+    case "QUEUED_EXECUTING":
+    case "PENDING_EXECUTING":
+    case "DELAYED":
+      return "PENDING";
+    case "EXECUTING":
+    case "EXECUTING_WITH_WAITPOINTS":
+    case "SUSPENDED":
+    case "PENDING_CANCEL":
+      return "EXECUTING";
+    case "FINISHED":
+      return "COMPLETED_SUCCESSFULLY";
+    default:
+      return "PENDING";
+  }
+}
+
+/**
+ * Creates a checkpoint for testing suspended snapshots.
+ */
+export async function createTestCheckpoint(
+  prisma: PrismaClient,
+  {
+    runId,
+    environmentId,
+    projectId,
+  }: {
+    runId: string;
+    environmentId: string;
+    projectId: string;
+  }
+) {
+  return prisma.taskRunCheckpoint.create({
+    data: {
+      friendlyId: generateFriendlyId("checkpoint"),
+      type: "DOCKER",
+      location: `s3://test-bucket/checkpoints/${runId}`,
+      imageRef: `test-image:${runId}`,
+      reason: "WAIT_FOR_DURATION",
+      runtimeEnvironment: {
+        connect: { id: environmentId },
+      },
+      project: {
+        connect: { id: projectId },
+      },
+    },
+  });
+}
+
+/**
+ * Interface for a complete test scenario setup result.
+ */
+export interface TestScenarioResult {
+  run: {
+    id: string;
+    friendlyId: string;
+  };
+  snapshots: TaskRunExecutionSnapshot[];
+  waitpoints: Waitpoint[];
+  checkpoints: Array<{ id: string }>;
+}
+
+/**
+ * Sets up a complete test scenario with run, snapshots, waitpoints, and checkpoints.
+ * This creates the full database state needed for testing getSnapshotsSince.
+ */
+export async function setupTestScenario(
+  prisma: PrismaClient,
+  environment: AuthenticatedEnvironment,
+  {
+    totalWaitpoints,
+    outputSizeKB,
+    snapshotConfigs,
+  }: {
+    totalWaitpoints: number;
+    outputSizeKB: number;
+    snapshotConfigs: Array<{
+      status: TaskRunExecutionStatus;
+      completedWaitpointCount: number;
+      hasCheckpoint?: boolean;
+    }>;
+  }
+): Promise<TestScenarioResult> {
+  // Create waitpoints first
+  const waitpoints = await createWaitpointsWithOutput(
+    prisma,
+    totalWaitpoints,
+    outputSizeKB,
+    environment.id,
+    environment.project.id
+  );
+
+  // Create the run
+  const runFriendlyId = generateFriendlyId("run");
+  const run = await prisma.taskRun.create({
+    data: {
+      friendlyId: runFriendlyId,
+      engine: "V2",
+      status: "PENDING",
+      runtimeEnvironmentId: environment.id,
+      environmentType: environment.type,
+      organizationId: environment.organization.id,
+      projectId: environment.project.id,
+      taskIdentifier: "test-task",
+      payload: "{}",
+      payloadType: "application/json",
+      traceId: `trace_${runFriendlyId}`,
+      spanId: `span_${runFriendlyId}`,
+      context: {},
+      traceContext: {},
+      isTest: false,
+      queue: "task/test-task",
+      workerQueue: "main",
+    },
+  });
+
+  // Create snapshots in order
+  const snapshots: TaskRunExecutionSnapshot[] = [];
+  const checkpoints: Array<{ id: string }> = [];
+  let previousSnapshotId: string | undefined;
+  let attemptNumber = 0;
+
+  for (const config of snapshotConfigs) {
+    // Create checkpoint if needed
+    let checkpointId: string | undefined;
+    if (config.hasCheckpoint) {
+      const checkpoint = await createTestCheckpoint(prisma, {
+        runId: run.id,
+        environmentId: environment.id,
+        projectId: environment.project.id,
+      });
+      checkpointId = checkpoint.id;
+      checkpoints.push({ id: checkpoint.id });
+    }
+
+    // Increment attempt number when entering a new execution attempt
+    // PENDING_EXECUTING is the entry point - EXECUTING follows within the same attempt
+    if (config.status === "PENDING_EXECUTING") {
+      attemptNumber++;
+    }
+
+    // Get the waitpoint IDs that should be "completed" at this snapshot
+    const completedWaitpointIds = waitpoints.slice(0, config.completedWaitpointCount).map((w) => w.id);
+
+    const snapshot = await createTestSnapshot(prisma, {
+      runId: run.id,
+      status: config.status,
+      environmentId: environment.id,
+      environmentType: environment.type,
+      projectId: environment.project.id,
+      organizationId: environment.organization.id,
+      completedWaitpointIds,
+      checkpointId,
+      previousSnapshotId,
+      attemptNumber,
+    });
+
+    snapshots.push(snapshot);
+    previousSnapshotId = snapshot.id;
+  }
+
+  return {
+    run: { id: run.id, friendlyId: runFriendlyId },
+    snapshots,
+    waitpoints,
+    checkpoints,
+  };
+}
diff --git a/internal-packages/run-engine/src/engine/tests/triggerAndWait.test.ts b/internal-packages/run-engine/src/engine/tests/triggerAndWait.test.ts
index 101314e86de..b874d3f4cac 100644
--- a/internal-packages/run-engine/src/engine/tests/triggerAndWait.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/triggerAndWait.test.ts
@@ -4,6 +4,7 @@ import { expect } from "vitest";
 import { RunEngine } from "../index.js";
 import { setTimeout } from "node:timers/promises";
 import { setupAuthenticatedEnvironment, setupBackgroundWorker } from "./setup.js";
+import { RunDuplicateIdempotencyKeyError } from "../errors.js";
 
 vi.setConfig({ testTimeout: 60_000 });
 
@@ -453,4 +454,164 @@ describe("RunEngine triggerAndWait", () => {
       }
     }
   );
+  containerTest(
+    "triggerAndWait two parent runs triggering the same child run with the same idempotency key",
+    async ({ prisma, redisOptions }) => {
+      //create environment
+      const authenticatedEnvironment = await setupAuthenticatedEnvironment(prisma, "PRODUCTION");
+
+      const engine = new RunEngine({
+        prisma,
+        worker: {
+          redis: redisOptions,
+          workers: 1,
+          tasksPerWorker: 10,
+          pollIntervalMs: 100,
+        },
+        queue: {
+          redis: redisOptions,
+          masterQueueConsumersDisabled: true,
+          processWorkerQueueDebounceMs: 50,
+        },
+        runLock: {
+          redis: redisOptions,
+        },
+        machines: {
+          defaultMachine: "small-1x",
+          machines: {
+            "small-1x": {
+              name: "small-1x" as const,
+              cpu: 0.5,
+              memory: 0.5,
+              centsPerMs: 0.0001,
+            },
+          },
+          baseCostInCents: 0.0001,
+        },
+        tracer: trace.getTracer("test", "0.0.0"),
+      });
+
+      try {
+        const parentTask = "parent-task";
+        const childTask = "child-task";
+        const idempotencyKey = "a-key";
+
+        //create background worker
+        await setupBackgroundWorker(engine, authenticatedEnvironment, [parentTask, childTask]);
+
+        //trigger the run
+        const parentRun1 = await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_p1234",
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+          },
+          prisma
+        );
+
+        //dequeue parent and create the attempt
+        await setTimeout(500);
+        const dequeued = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        await engine.startRunAttempt({
+          runId: parentRun1.id,
+          snapshotId: dequeued[0].snapshot.id,
+        });
+
+        const parentRun2 = await engine.trigger(
+          {
+            number: 2,
+            friendlyId: "run_p12345",
+            environment: authenticatedEnvironment,
+            taskIdentifier: parentTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12346",
+            spanId: "s12346",
+            queue: `task/${parentTask}`,
+            isTest: false,
+            tags: [],
+            workerQueue: "main",
+          },
+          prisma
+        );
+
+        await setTimeout(500);
+        const dequeued2 = await engine.dequeueFromWorkerQueue({
+          consumerId: "test_12345",
+          workerQueue: "main",
+        });
+        await engine.startRunAttempt({
+          runId: parentRun2.id,
+          snapshotId: dequeued2[0].snapshot.id,
+        });
+
+        await engine.trigger(
+          {
+            number: 1,
+            friendlyId: "run_c1234",
+            environment: authenticatedEnvironment,
+            taskIdentifier: childTask,
+            payload: "{}",
+            payloadType: "application/json",
+            context: {},
+            traceContext: {},
+            traceId: "t12345",
+            spanId: "s12345",
+            queue: `task/${childTask}`,
+            isTest: false,
+            tags: [],
+            resumeParentOnCompletion: true,
+            parentTaskRunId: parentRun1.id,
+            workerQueue: "main",
+            idempotencyKey,
+          },
+          prisma
+        );
+
+        // This should throw a RunDuplicateIdempotencyKeyError
+        await expect(
+          engine.trigger(
+            {
+              number: 2,
+              friendlyId: "run_c12345",
+              environment: authenticatedEnvironment,
+              taskIdentifier: childTask,
+              payload: "{}",
+              payloadType: "application/json",
+              context: {},
+              traceContext: {},
+              traceId: "t123455",
+              spanId: "s123455",
+              queue: `task/${childTask}`,
+              isTest: false,
+              tags: [],
+              resumeParentOnCompletion: true,
+              parentTaskRunId: parentRun2.id,
+              workerQueue: "main",
+              idempotencyKey,
+            },
+            prisma
+          )
+        ).rejects.toThrow(RunDuplicateIdempotencyKeyError);
+      } finally {
+        await engine.quit();
+      }
+    }
+  );
 });
diff --git a/internal-packages/run-engine/src/engine/tests/waitpoints.test.ts b/internal-packages/run-engine/src/engine/tests/waitpoints.test.ts
index 544c11e6d0d..9937314d799 100644
--- a/internal-packages/run-engine/src/engine/tests/waitpoints.test.ts
+++ b/internal-packages/run-engine/src/engine/tests/waitpoints.test.ts
@@ -240,13 +240,13 @@ describe("RunEngine Waitpoints", () => {
       expect(failResult.attemptStatus).toBe("RETRY_IMMEDIATELY");
       expect(failResult.snapshot.executionStatus).toBe("EXECUTING");
       expect(failResult.run.attemptNumber).toBe(1);
-      expect(failResult.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(failResult.run.status).toBe("EXECUTING");
 
       const executionData2 = await engine.getRunExecutionData({ runId: run.id });
       assertNonNullable(executionData2);
       expect(executionData2.snapshot.executionStatus).toBe("EXECUTING");
       expect(executionData2.run.attemptNumber).toBe(1);
-      expect(executionData2.run.status).toBe("RETRYING_AFTER_FAILURE");
+      expect(executionData2.run.status).toBe("EXECUTING");
       expect(executionData2.completedWaitpoints.length).toBe(0);
 
       //check there are no waitpoints blocking the parent run
diff --git a/internal-packages/run-engine/src/engine/types.ts b/internal-packages/run-engine/src/engine/types.ts
index 5884e0ab9bf..2adc63415fb 100644
--- a/internal-packages/run-engine/src/engine/types.ts
+++ b/internal-packages/run-engine/src/engine/types.ts
@@ -5,14 +5,20 @@ import {
   MachinePreset,
   MachinePresetName,
   RetryOptions,
-  RunChainState,
+  TriggerTraceContext,
 } from "@trigger.dev/core/v3";
-import { PrismaClient, PrismaReplicaClient } from "@trigger.dev/database";
-import { Worker, type WorkerConcurrencyOptions } from "@trigger.dev/redis-worker";
+import { PrismaClient, PrismaReplicaClient, TaskRun, Waitpoint } from "@trigger.dev/database";
+import {
+  Worker,
+  type WorkerConcurrencyOptions,
+  type GlobalRateLimiter,
+} from "@trigger.dev/redis-worker";
 import { FairQueueSelectionStrategyOptions } from "../run-queue/fairQueueSelectionStrategy.js";
 import { MinimalAuthenticatedEnvironment } from "../shared/index.js";
 import { LockRetryConfig } from "./locking.js";
 import { workerCatalog } from "./workerCatalog.js";
+import { type BillingPlan } from "./billingCache.js";
+import type { DRRConfig } from "../batch-queue/types.js";
 
 export type RunEngineOptions = {
   prisma: PrismaClient;
@@ -29,12 +35,18 @@ export type RunEngineOptions = {
     machines: Record<string, MachinePreset>;
     baseCostInCents: number;
   };
+  billing?: {
+    getCurrentPlan: (orgId: string) => Promise<BillingPlan>;
+  };
   queue: {
     redis: RedisOptions;
     shardCount?: number;
     masterQueueConsumersDisabled?: boolean;
     processWorkerQueueDebounceMs?: number;
     masterQueueConsumersIntervalMs?: number;
+    masterQueueCooloffPeriodMs?: number;
+    masterQueueCooloffCountThreshold?: number;
+    masterQueueConsumerDequeueCount?: number;
     workerOptions?: WorkerConcurrencyOptions;
     retryOptions?: RetryOptions;
     defaultEnvConcurrency?: number;
@@ -58,9 +70,40 @@ export type RunEngineOptions = {
     automaticExtensionThreshold?: number;
     retryConfig?: LockRetryConfig;
   };
+  cache?: {
+    redis: RedisOptions;
+  };
+  batchQueue?: {
+    redis: RedisOptions;
+    drr?: Partial<DRRConfig>;
+    /** Number of master queue shards (default: 1) */
+    shardCount?: number;
+    /** Worker queue blocking timeout in seconds (enables two-stage processing) */
+    workerQueueBlockingTimeoutSeconds?: number;
+    consumerEnabled?: boolean;
+    consumerCount?: number;
+    consumerIntervalMs?: number;
+    /** Default processing concurrency per environment when no specific limit is set */
+    defaultConcurrency?: number;
+    /** Optional global rate limiter to limit processing across all consumers */
+    globalRateLimiter?: GlobalRateLimiter;
+  };
+  debounce?: {
+    redis?: RedisOptions;
+    /** Maximum duration in milliseconds that a run can be debounced. Default: 1 hour */
+    maxDebounceDurationMs?: number;
+  };
   /** If not set then checkpoints won't ever be used */
   retryWarmStartThresholdMs?: number;
   heartbeatTimeoutsMs?: Partial<HeartbeatTimeouts>;
+  repairSnapshotTimeoutMs?: number;
+  treatProductionExecutionStallsAsOOM?: boolean;
+  suspendedHeartbeatRetriesConfig?: {
+    maxCount?: number;
+    maxDelayMs?: number;
+    initialDelayMs?: number;
+    factor?: number;
+  };
   queueRunsWaitingForWorkerBatchSize?: number;
   tracer: Tracer;
   meter?: Meter;
@@ -77,16 +120,18 @@ export type HeartbeatTimeouts = {
 };
 
 export type TriggerParams = {
+  number?: number;
   friendlyId: string;
-  number: number;
   environment: MinimalAuthenticatedEnvironment;
   idempotencyKey?: string;
   idempotencyKeyExpiresAt?: Date;
+  /** The original user-provided idempotency key and scope */
+  idempotencyKeyOptions?: { key: string; scope: "run" | "attempt" | "global" };
   taskIdentifier: string;
   payload: string;
   payloadType: string;
   context: any;
-  traceContext: Record<string, string | undefined>;
+  traceContext: TriggerTraceContext;
   traceId: string;
   spanId: string;
   parentSpanId?: string;
@@ -129,6 +174,32 @@ export type TriggerParams = {
   scheduleInstanceId?: string;
   createdAt?: Date;
   bulkActionId?: string;
+  planType?: string;
+  realtimeStreamsVersion?: string;
+  debounce?: {
+    key: string;
+    delay: string;
+    mode?: "leading" | "trailing";
+    maxDelay?: string;
+  };
+  /**
+   * Called when a run is debounced (existing delayed run found with triggerAndWait).
+   * Return spanIdToComplete to enable span closing when the run completes.
+   * This allows the webapp to create a trace span for the debounced trigger.
+   */
+  onDebounced?: (params: {
+    existingRun: TaskRun;
+    waitpoint: Waitpoint;
+    debounceKey: string;
+  }) => Promise<string | undefined>;
 };
 
 export type EngineWorker = Worker<typeof workerCatalog>;
+
+export type ReportableQueue = {
+  name: string;
+  concurrencyLimit: number | null;
+  type: string;
+  paused: boolean;
+  friendlyId: string;
+};
diff --git a/internal-packages/run-engine/src/engine/workerCatalog.ts b/internal-packages/run-engine/src/engine/workerCatalog.ts
index f3900d0f8f5..2ed6f5076b2 100644
--- a/internal-packages/run-engine/src/engine/workerCatalog.ts
+++ b/internal-packages/run-engine/src/engine/workerCatalog.ts
@@ -12,6 +12,15 @@ export const workerCatalog = {
     schema: z.object({
       runId: z.string(),
       snapshotId: z.string(),
+      restartAttempt: z.number().optional(),
+    }),
+    visibilityTimeoutMs: 30_000,
+  },
+  repairSnapshot: {
+    schema: z.object({
+      runId: z.string(),
+      snapshotId: z.string(),
+      executionStatus: z.string(),
     }),
     visibilityTimeoutMs: 30_000,
   },
diff --git a/internal-packages/run-engine/src/index.ts b/internal-packages/run-engine/src/index.ts
index 845fb48e6ec..3f96045c13f 100644
--- a/internal-packages/run-engine/src/index.ts
+++ b/internal-packages/run-engine/src/index.ts
@@ -1,4 +1,22 @@
 export { RunEngine } from "./engine/index.js";
-export { RunDuplicateIdempotencyKeyError, RunOneTimeUseTokenError } from "./engine/errors.js";
+export {
+  RunDuplicateIdempotencyKeyError,
+  RunOneTimeUseTokenError,
+  ServiceValidationError as EngineServiceValidationError,
+} from "./engine/errors.js";
 export type { EventBusEventArgs, EventBusEvents } from "./engine/eventBus.js";
 export type { AuthenticatedEnvironment } from "./shared/index.js";
+
+// Batch Queue exports
+export { BatchQueue, BatchCompletionTracker } from "./batch-queue/index.js";
+export type {
+  BatchQueueOptions,
+  InitializeBatchOptions,
+  CompleteBatchResult,
+  BatchItem,
+  BatchMeta,
+  BatchItemFailure,
+  BatchItemPayload,
+  ProcessBatchItemCallback,
+  BatchCompletionCallback,
+} from "./batch-queue/types.js";
diff --git a/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts b/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts
index 5f2f031bdba..0e2205e413a 100644
--- a/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts
+++ b/internal-packages/run-engine/src/run-queue/fairQueueSelectionStrategy.ts
@@ -1,7 +1,12 @@
 import { createRedisClient, Redis, type RedisOptions } from "@internal/redis";
 import { startSpan, type Tracer } from "@internal/tracing";
-import { createCache, DefaultStatefulContext, Namespace, Cache as UnkeyCache } from "@unkey/cache";
-import { MemoryStore } from "@unkey/cache/stores";
+import {
+  createCache,
+  createLRUMemoryStore,
+  DefaultStatefulContext,
+  Namespace,
+  type UnkeyCache,
+} from "@internal/cache";
 import { randomUUID } from "crypto";
 import seedrandom from "seedrandom";
 import {
@@ -101,7 +106,7 @@ export class FairQueueSelectionStrategy implements RunQueueSelectionStrategy {
 
   constructor(private options: FairQueueSelectionStrategyOptions) {
     const ctx = new DefaultStatefulContext();
-    const memory = new MemoryStore({ persistentMap: new Map() });
+    const memory = createLRUMemoryStore(1000);
 
     this._cache = createCache({
       concurrencyLimit: new Namespace<number>(ctx, {
diff --git a/internal-packages/run-engine/src/run-queue/index.ts b/internal-packages/run-engine/src/run-queue/index.ts
index 1afd7b41b13..5127ec3c756 100644
--- a/internal-packages/run-engine/src/run-queue/index.ts
+++ b/internal-packages/run-engine/src/run-queue/index.ts
@@ -35,14 +35,15 @@ import {
   attributesFromAuthenticatedEnv,
   MinimalAuthenticatedEnvironment,
 } from "../shared/index.js";
-import { MessageNotFoundError } from "./errors.js";
 import {
   InputPayload,
   OutputPayload,
   OutputPayloadV2,
   RunQueueKeyProducer,
+  RunQueueKeyProducerEnvironment,
   RunQueueSelectionStrategy,
 } from "./types.js";
+import { WorkerQueueResolver } from "./workerQueueResolver.js";
 
 const SemanticAttributes = {
   QUEUE: "runqueue.queue",
@@ -71,6 +72,9 @@ export type RunQueueOptions = {
   shardCount?: number;
   masterQueueConsumersDisabled?: boolean;
   masterQueueConsumersIntervalMs?: number;
+  masterQueueCooloffPeriodMs?: number;
+  masterQueueCooloffCountThreshold?: number;
+  masterQueueConsumerDequeueCount?: number;
   processWorkerQueueDebounceMs?: number;
   workerOptions?: {
     pollIntervalMs?: number;
@@ -98,6 +102,7 @@ type DequeuedMessage = {
   messageId: string;
   messageScore: string;
   message: OutputPayload;
+  workerQueueLength?: number;
 };
 
 type MarkedRun = {
@@ -142,6 +147,16 @@ const workerCatalog = {
   },
 };
 
+type QueueCooloffState =
+  | {
+      _tag: "normal";
+      consecutiveFailures: number;
+    }
+  | {
+      _tag: "cooloff";
+      cooloffExpiresAt: number;
+    };
+
 /**
  * RunQueue – the queue that's used to process runs
  */
@@ -156,8 +171,10 @@ export class RunQueue {
   private shardCount: number;
   private abortController: AbortController;
   private worker: Worker<typeof workerCatalog>;
+  private workerQueueResolver: WorkerQueueResolver;
   private _observableWorkerQueues: Set<string> = new Set();
   private _meter: Meter;
+  private _queueCooloffStates: Map<string, QueueCooloffState> = new Map();
 
   constructor(public readonly options: RunQueueOptions) {
     this.shardCount = options.shardCount ?? 2;
@@ -171,6 +188,8 @@ export class RunQueue {
       },
     });
     this.logger = options.logger ?? new Logger("RunQueue", options.logLevel ?? "info");
+
+    this.workerQueueResolver = new WorkerQueueResolver({ logger: this.logger });
     this._meter = options.meter ?? getMeter("run-queue");
 
     const workerQueueObservableGauge = this._meter.createObservableGauge(
@@ -337,6 +356,24 @@ export class RunQueue {
     return Math.floor(limit * burstFactor);
   }
 
+  public async getEnvConcurrencyBurstFactor(env: MinimalAuthenticatedEnvironment) {
+    const result = await this.redis.get(this.keys.envConcurrencyLimitBurstFactorKey(env));
+
+    const burstFactor = result
+      ? Number(result)
+      : this.options.defaultEnvConcurrencyBurstFactor ?? 1;
+
+    return burstFactor;
+  }
+
+  public async getCurrentConcurrencyOfEnvironment(env: MinimalAuthenticatedEnvironment) {
+    return this.redis.smembers(this.keys.envCurrentConcurrencyKey(env));
+  }
+
+  public async getCurrentConcurrencyOfQueue(env: MinimalAuthenticatedEnvironment, queue: string) {
+    return this.redis.smembers(this.keys.queueCurrentConcurrencyKey(env, queue));
+  }
+
   public async lengthOfQueue(
     env: MinimalAuthenticatedEnvironment,
     queue: string,
@@ -345,6 +382,19 @@ export class RunQueue {
     return this.redis.zcard(this.keys.queueKey(env, queue, concurrencyKey));
   }
 
+  public async lengthOfQueueAvailableMessages(
+    env: MinimalAuthenticatedEnvironment,
+    queue: string,
+    currentTime: Date = new Date(),
+    concurrencyKey?: string
+  ) {
+    return this.redis.zcount(
+      this.keys.queueKey(env, queue, concurrencyKey),
+      "-inf",
+      String(currentTime.getTime())
+    );
+  }
+
   public async lengthOfEnvQueue(env: MinimalAuthenticatedEnvironment) {
     return this.redis.zcard(this.keys.envQueueKey(env));
   }
@@ -401,6 +451,14 @@ export class RunQueue {
     return this.redis.scard(this.keys.queueCurrentConcurrencyKey(env, queue, concurrencyKey));
   }
 
+  public async currentDequeuedOfQueue(
+    env: MinimalAuthenticatedEnvironment,
+    queue: string,
+    concurrencyKey?: string
+  ) {
+    return this.redis.scard(this.keys.queueCurrentDequeuedKey(env, queue, concurrencyKey));
+  }
+
   public async currentConcurrencyOfQueues(
     env: MinimalAuthenticatedEnvironment,
     queues: string[]
@@ -484,6 +542,15 @@ export class RunQueue {
     return this.redis.scard(this.keys.envCurrentDequeuedKey(env));
   }
 
+  /**
+   * Get the operational current concurrency of the environment
+   * @param env - The environment to get the current concurrency of
+   * @returns The current concurrency of the environment
+   */
+  public async operationalCurrentConcurrencyOfEnvironment(env: MinimalAuthenticatedEnvironment) {
+    return this.redis.scard(this.keys.envCurrentConcurrencyKey(env));
+  }
+
   public async messageExists(orgId: string, messageId: string) {
     return this.redis.exists(this.keys.messageKey(orgId, messageId));
   }
@@ -602,13 +669,20 @@ export class RunQueue {
    */
   public async dequeueMessageFromWorkerQueue(
     consumerId: string,
-    workerQueue: string
+    workerQueue: string,
+    options?: {
+      blockingPop?: boolean;
+      blockingPopTimeoutSeconds?: number;
+    }
   ): Promise<DequeuedMessage | undefined> {
     return this.#trace(
       "dequeueMessageFromWorkerQueue",
       async (span) => {
         const dequeuedMessage = await this.#callDequeueMessageFromWorkerQueue({
           workerQueue,
+          blockingPop: options?.blockingPop ?? true,
+          blockingPopTimeoutSeconds:
+            options?.blockingPopTimeoutSeconds ?? this.options.dequeueBlockingTimeoutSeconds ?? 10,
         });
 
         if (!dequeuedMessage) {
@@ -857,6 +931,15 @@ export class RunQueue {
     });
   }
 
+  public async clearMessageFromConcurrencySets(params: {
+    runId: string;
+    orgId: string;
+    queue: string;
+    env: RunQueueKeyProducerEnvironment;
+  }) {
+    return this.#callClearMessageFromConcurrencySets(params);
+  }
+
   async quit() {
     this.abortController.abort();
 
@@ -1078,7 +1161,13 @@ export class RunQueue {
 
         const now = performance.now();
 
-        const [error, results] = await tryCatch(this.#processMasterQueueShard(shard, consumerId));
+        const [error, results] = await tryCatch(
+          this.#processMasterQueueShard(
+            shard,
+            consumerId,
+            this.options.masterQueueConsumerDequeueCount ?? 10
+          )
+        );
 
         if (error) {
           this.logger.error(`Failed to process master queue shard ${shard}`, {
@@ -1190,7 +1279,9 @@ export class RunQueue {
           consumerId
         );
 
+        span.setAttribute("master_queue_key", masterQueueKey);
         span.setAttribute("environment_count", envQueues.length);
+        span.setAttribute("max_count", maxCount);
 
         if (envQueues.length === 0) {
           return [];
@@ -1198,11 +1289,27 @@ export class RunQueue {
 
         let attemptedEnvs = 0;
         let attemptedQueues = 0;
+        let messagesDequeued = 0;
+        let cooloffPeriodCount = 0;
 
         for (const env of envQueues) {
           attemptedEnvs++;
 
           for (const queue of env.queues) {
+            const cooloffState = this._queueCooloffStates.get(queue) ?? {
+              _tag: "normal",
+              consecutiveFailures: 0,
+            };
+
+            if (cooloffState._tag === "cooloff") {
+              if (cooloffState.cooloffExpiresAt > Date.now()) {
+                cooloffPeriodCount++;
+                continue;
+              } else {
+                this._queueCooloffStates.delete(queue);
+              }
+            }
+
             attemptedQueues++;
 
             // Attempt to dequeue from this queue
@@ -1217,9 +1324,10 @@ export class RunQueue {
 
             if (error) {
               this.logger.error(
-                `[processMasterQueueShard][${this.name}] Failed to dequeue from queue ${queue}`,
+                `[processMasterQueueShard][${this.name}] Failed to dequeue from queue`,
                 {
                   error,
+                  queue,
                 }
               );
 
@@ -1227,12 +1335,55 @@ export class RunQueue {
             }
 
             if (messages.length === 0) {
+              if (cooloffState._tag === "normal") {
+                const cooloffCountThreshold = Math.max(
+                  1,
+                  this.options.masterQueueCooloffCountThreshold ?? 10
+                ); // Don't let the cooloff count be less than 1
+
+                this.logger.debug("Evaluating cooloff state", {
+                  queue,
+                  cooloffState,
+                  cooloffCountThreshold,
+                  consecutiveFailures: cooloffState.consecutiveFailures,
+                });
+
+                if (cooloffState.consecutiveFailures >= cooloffCountThreshold) {
+                  this.logger.debug("Setting cooloff state", {
+                    queue,
+                    cooloffState,
+                    cooloffCountThreshold,
+                    consecutiveFailures: cooloffState.consecutiveFailures,
+                    cooloffExpiresAt: new Date(
+                      Date.now() + (this.options.masterQueueCooloffPeriodMs ?? 10_000)
+                    ),
+                  });
+
+                  this._queueCooloffStates.set(queue, {
+                    _tag: "cooloff",
+                    cooloffExpiresAt:
+                      Date.now() + (this.options.masterQueueCooloffPeriodMs ?? 10_000),
+                  });
+                } else {
+                  this._queueCooloffStates.set(queue, {
+                    _tag: "normal",
+                    consecutiveFailures: cooloffState.consecutiveFailures + 1,
+                  });
+                }
+              }
+
               continue;
             }
 
+            messagesDequeued += messages.length;
+
             await this.#enqueueMessagesToWorkerQueues(messages);
           }
         }
+
+        span.setAttribute("attempted_envs", attemptedEnvs);
+        span.setAttribute("attempted_queues", attemptedQueues);
+        span.setAttribute("messages_dequeued", messagesDequeued);
       },
       {
         kind: SpanKind.CONSUMER,
@@ -1259,7 +1410,15 @@ export class RunQueue {
       maxCount: 10,
     });
 
+    if (messages.length === 0) {
+      return;
+    }
+
     await this.#enqueueMessagesToWorkerQueues(messages);
+
+    if (messages.length === 10) {
+      await this.#processQueueForWorkerQueue(queueKey, environmentId);
+    }
   }
 
   async #enqueueMessagesToWorkerQueues(messages: DequeuedMessage[]) {
@@ -1268,27 +1427,28 @@ export class RunQueue {
 
       const pipeline = this.redis.pipeline();
 
-      const workerQueueKeys = new Set<string>();
+      const operations = [];
 
       for (const message of messages) {
         const workerQueueKey = this.keys.workerQueueKey(
           this.#getWorkerQueueFromMessage(message.message)
         );
 
-        workerQueueKeys.add(workerQueueKey);
-
         const messageKeyValue = this.keys.messageKey(message.message.orgId, message.messageId);
 
+        operations.push({
+          workerQueueKey: workerQueueKey,
+          messageId: message.messageId,
+        });
+
         pipeline.rpush(workerQueueKey, messageKeyValue);
       }
 
-      span.setAttribute("worker_queue_count", workerQueueKeys.size);
-      span.setAttribute("worker_queue_keys", Array.from(workerQueueKeys));
+      span.setAttribute("operations_count", operations.length);
 
-      this.logger.debug("enqueueMessagesToWorkerQueues pipeline", {
+      this.logger.info("enqueueMessagesToWorkerQueues", {
         service: this.name,
-        messages,
-        workerQueueKeys: Array.from(workerQueueKeys),
+        operations,
       });
 
       await pipeline.exec();
@@ -1354,170 +1514,250 @@ export class RunQueue {
     shard: number;
     maxCount: number;
   }): Promise<DequeuedMessage[]> {
-    const queueConcurrencyLimitKey = this.keys.queueConcurrencyLimitKeyFromQueue(messageQueue);
-    const queueCurrentConcurrencyKey = this.keys.queueCurrentConcurrencyKeyFromQueue(messageQueue);
-    const envConcurrencyLimitKey = this.keys.envConcurrencyLimitKeyFromQueue(messageQueue);
-    const envConcurrencyLimitBurstFactorKey =
-      this.keys.envConcurrencyLimitBurstFactorKeyFromQueue(messageQueue);
-    const envCurrentConcurrencyKey = this.keys.envCurrentConcurrencyKeyFromQueue(messageQueue);
-    const messageKeyPrefix = this.keys.messageKeyPrefixFromQueue(messageQueue);
-    const envQueueKey = this.keys.envQueueKeyFromQueue(messageQueue);
-    const masterQueueKey = this.keys.masterQueueKeyForShard(shard);
-
-    this.logger.debug("#callDequeueMessagesFromQueue", {
-      messageQueue,
-      queueConcurrencyLimitKey,
-      envConcurrencyLimitKey,
-      envConcurrencyLimitBurstFactorKey,
-      queueCurrentConcurrencyKey,
-      envCurrentConcurrencyKey,
-      messageKeyPrefix,
-      envQueueKey,
-      masterQueueKey,
-      shard,
-      maxCount,
-    });
+    return this.#trace("callDequeueMessagesFromQueue", async (span) => {
+      span.setAttributes({
+        messageQueue,
+        shard,
+        maxCount,
+      });
 
-    const result = await this.redis.dequeueMessagesFromQueue(
-      //keys
-      messageQueue,
-      queueConcurrencyLimitKey,
-      envConcurrencyLimitKey,
-      envConcurrencyLimitBurstFactorKey,
-      queueCurrentConcurrencyKey,
-      envCurrentConcurrencyKey,
-      messageKeyPrefix,
-      envQueueKey,
-      masterQueueKey,
-      //args
-      messageQueue,
-      String(Date.now()),
-      String(this.options.defaultEnvConcurrency),
-      String(this.options.defaultEnvConcurrencyBurstFactor ?? 1),
-      this.options.redis.keyPrefix ?? "",
-      String(maxCount)
-    );
+      const queueConcurrencyLimitKey = this.keys.queueConcurrencyLimitKeyFromQueue(messageQueue);
+      const queueCurrentConcurrencyKey =
+        this.keys.queueCurrentConcurrencyKeyFromQueue(messageQueue);
+      const envConcurrencyLimitKey = this.keys.envConcurrencyLimitKeyFromQueue(messageQueue);
+      const envConcurrencyLimitBurstFactorKey =
+        this.keys.envConcurrencyLimitBurstFactorKeyFromQueue(messageQueue);
+      const envCurrentConcurrencyKey = this.keys.envCurrentConcurrencyKeyFromQueue(messageQueue);
+      const messageKeyPrefix = this.keys.messageKeyPrefixFromQueue(messageQueue);
+      const envQueueKey = this.keys.envQueueKeyFromQueue(messageQueue);
+      const masterQueueKey = this.keys.masterQueueKeyForShard(shard);
 
-    if (!result) {
-      return [];
-    }
+      this.logger.debug("#callDequeueMessagesFromQueue", {
+        messageQueue,
+        queueConcurrencyLimitKey,
+        envConcurrencyLimitKey,
+        envConcurrencyLimitBurstFactorKey,
+        queueCurrentConcurrencyKey,
+        envCurrentConcurrencyKey,
+        messageKeyPrefix,
+        envQueueKey,
+        masterQueueKey,
+        shard,
+        maxCount,
+      });
 
-    this.logger.debug("dequeueMessagesFromQueue raw result", {
-      result,
-      service: this.name,
-    });
+      const result = await this.redis.dequeueMessagesFromQueue(
+        //keys
+        messageQueue,
+        queueConcurrencyLimitKey,
+        envConcurrencyLimitKey,
+        envConcurrencyLimitBurstFactorKey,
+        queueCurrentConcurrencyKey,
+        envCurrentConcurrencyKey,
+        messageKeyPrefix,
+        envQueueKey,
+        masterQueueKey,
+        //args
+        messageQueue,
+        String(Date.now()),
+        String(this.options.defaultEnvConcurrency),
+        String(this.options.defaultEnvConcurrencyBurstFactor ?? 1),
+        this.options.redis.keyPrefix ?? "",
+        String(maxCount)
+      );
 
-    const messages = [];
-    for (let i = 0; i < result.length; i += 3) {
-      const messageId = result[i];
-      const messageScore = result[i + 1];
-      const rawMessage = result[i + 2];
+      if (!result) {
+        span.setAttribute("message_count", 0);
 
-      //read message
-      const parsedMessage = OutputPayload.safeParse(JSON.parse(rawMessage));
-      if (!parsedMessage.success) {
-        this.logger.error(`[${this.name}] Failed to parse message`, {
+        return [];
+      }
+
+      this.logger.debug("dequeueMessagesFromQueue raw result", {
+        result,
+        service: this.name,
+      });
+
+      const messages = [];
+      for (let i = 0; i < result.length; i += 3) {
+        const messageId = result[i];
+        const messageScore = result[i + 1];
+        const rawMessage = result[i + 2];
+
+        //read message
+        const parsedMessage = OutputPayload.safeParse(JSON.parse(rawMessage));
+        if (!parsedMessage.success) {
+          this.logger.error(`[${this.name}] Failed to parse message`, {
+            messageId,
+            error: parsedMessage.error,
+            service: this.name,
+          });
+
+          continue;
+        }
+
+        const message = parsedMessage.data;
+
+        messages.push({
           messageId,
-          error: parsedMessage.error,
-          service: this.name,
+          messageScore,
+          message,
         });
-
-        continue;
       }
 
-      const message = parsedMessage.data;
-
-      messages.push({
-        messageId,
-        messageScore,
-        message,
+      this.logger.debug("dequeueMessagesFromQueue parsed result", {
+        messages,
+        service: this.name,
       });
-    }
 
-    this.logger.debug("dequeueMessagesFromQueue parsed result", {
-      messages,
-      service: this.name,
-    });
+      const filteredMessages = messages.filter(Boolean) as DequeuedMessage[];
 
-    return messages.filter(Boolean) as DequeuedMessage[];
+      span.setAttribute("message_count", filteredMessages.length);
+
+      return filteredMessages;
+    });
   }
 
   async #callDequeueMessageFromWorkerQueue({
     workerQueue,
+    blockingPop,
+    blockingPopTimeoutSeconds,
   }: {
     workerQueue: string;
+    blockingPop: boolean;
+    blockingPopTimeoutSeconds: number;
   }): Promise<DequeuedMessage | undefined> {
     const workerQueueKey = this.keys.workerQueueKey(workerQueue);
 
-    this.logger.debug("#callDequeueMessageFromWorkerQueue", {
-      workerQueue,
-      workerQueueKey,
-    });
-
-    if (this.abortController.signal.aborted) {
-      return;
-    }
+    if (blockingPop) {
+      this.logger.debug("#callDequeueMessageFromWorkerQueue blocking pop", {
+        workerQueue,
+        workerQueueKey,
+        blockingPopTimeoutSeconds,
+      });
 
-    const blockingClient = this.#createBlockingDequeueClient();
+      if (this.abortController.signal.aborted) {
+        return;
+      }
 
-    async function cleanup() {
-      await blockingClient.quit();
-    }
+      const blockingClient = this.#createBlockingDequeueClient();
 
-    this.abortController.signal.addEventListener("abort", cleanup);
+      async function cleanup() {
+        await blockingClient.quit();
+      }
 
-    const result = await blockingClient.blpop(
-      workerQueueKey,
-      this.options.dequeueBlockingTimeoutSeconds ?? 10
-    );
+      this.abortController.signal.addEventListener("abort", cleanup);
 
-    this.abortController.signal.removeEventListener("abort", cleanup);
+      const result = await this.#trace("popMessageFromWorkerQueue", async (span) => {
+        span.setAttributes({
+          workerQueue,
+          workerQueueKey,
+          blockingPopTimeoutSeconds,
+          blocking: true,
+        });
 
-    cleanup().then(() => {
-      this.logger.debug("dequeueMessageFromWorkerQueue cleanup", {
-        service: this.name,
+        return await blockingClient.blpop(workerQueueKey, blockingPopTimeoutSeconds);
       });
-    });
 
-    if (!result) {
-      return;
-    }
+      this.abortController.signal.removeEventListener("abort", cleanup);
 
-    this.logger.debug("dequeueMessageFromWorkerQueue raw result", {
-      result,
-      service: this.name,
-    });
+      cleanup().then(() => {
+        this.logger.debug("dequeueMessageFromWorkerQueue cleanup", {
+          service: this.name,
+        });
+      });
 
-    if (result.length !== 2) {
-      this.logger.error("Invalid dequeue message from worker queue result", {
+      if (!result) {
+        return;
+      }
+
+      this.logger.debug("dequeueMessageFromWorkerQueue raw result", {
         result,
         service: this.name,
       });
-      return;
-    }
 
-    // Make sure they are both strings
-    if (typeof result[0] !== "string" || typeof result[1] !== "string") {
-      this.logger.error("Invalid dequeue message from worker queue result", {
-        result,
-        service: this.name,
+      if (result.length !== 2) {
+        this.logger.error("Invalid dequeue message from worker queue result", {
+          result,
+          service: this.name,
+        });
+        return;
+      }
+
+      // Make sure they are both strings
+      if (typeof result[0] !== "string" || typeof result[1] !== "string") {
+        this.logger.error("Invalid dequeue message from worker queue result", {
+          result,
+          service: this.name,
+        });
+        return;
+      }
+
+      const [, messageKey] = result;
+
+      const workerQueueLength = await this.#trace("getWorkerQueueLength", async (span) => {
+        span.setAttributes({
+          workerQueue,
+          workerQueueKey,
+        });
+
+        return await this.redis.llen(workerQueueKey);
       });
-      return;
-    }
 
-    const [, messageKey] = result;
+      const message = await this.#dequeueMessageFromKey(messageKey);
 
-    const message = await this.#dequeueMessageFromKey(messageKey);
+      if (!message) {
+        this.logger.error("Failed to dequeue message from worker queue", {
+          messageKey,
+          workerQueue,
+          workerQueueKey,
+          workerQueueLength,
+          service: this.name,
+        });
 
-    if (!message) {
-      return;
-    }
+        return;
+      }
 
-    return {
-      messageId: message.runId,
-      messageScore: String(message.timestamp),
-      message,
-    };
+      return {
+        messageId: message.runId,
+        messageScore: String(message.timestamp),
+        message,
+        workerQueueLength,
+      };
+    } else {
+      this.logger.debug("#callDequeueMessageFromWorkerQueue non-blocking pop", {
+        workerQueue,
+        workerQueueKey,
+      });
+
+      const result = await this.#trace("popMessageFromWorkerQueue", async (span) => {
+        span.setAttributes({
+          workerQueue,
+          workerQueueKey,
+          blocking: false,
+        });
+
+        return await this.redis.dequeueMessageFromWorkerQueueNonBlocking(workerQueueKey);
+      });
+
+      if (!result) {
+        return;
+      }
+
+      const [messageKey, workerQueueLength] = result;
+
+      const message = await this.#dequeueMessageFromKey(messageKey);
+
+      if (!message) {
+        return;
+      }
+
+      return {
+        messageId: message.runId,
+        messageScore: String(message.timestamp),
+        message,
+        workerQueueLength: Number(workerQueueLength),
+      };
+    }
   }
 
   async #callAcknowledgeMessage({
@@ -1577,6 +1817,45 @@ export class RunQueue {
     );
   }
 
+  async #callClearMessageFromConcurrencySets({
+    runId,
+    orgId,
+    queue,
+    env,
+  }: {
+    runId: string;
+    orgId: string;
+    queue: string;
+    env: RunQueueKeyProducerEnvironment;
+  }) {
+    const messageId = runId;
+    const messageKey = this.keys.messageKey(orgId, messageId);
+    const queueCurrentConcurrencyKey = this.keys.queueCurrentConcurrencyKey(env, queue);
+    const envCurrentConcurrencyKey = this.keys.envCurrentConcurrencyKey(env);
+    const queueCurrentDequeuedKey = this.keys.queueCurrentDequeuedKey(env, queue);
+    const envCurrentDequeuedKey = this.keys.envCurrentDequeuedKey(env);
+
+    this.logger.debug("Calling clearMessageFromConcurrencySets", {
+      messageKey,
+      queue,
+      env,
+      queueCurrentConcurrencyKey,
+      envCurrentConcurrencyKey,
+      queueCurrentDequeuedKey,
+      envCurrentDequeuedKey,
+      messageId,
+      service: this.name,
+    });
+
+    return this.redis.clearMessageFromConcurrencySets(
+      queueCurrentConcurrencyKey,
+      envCurrentConcurrencyKey,
+      queueCurrentDequeuedKey,
+      envCurrentDequeuedKey,
+      messageId
+    );
+  }
+
   async #callNackMessage({ message, retryAt }: { message: OutputPayload; retryAt?: number }) {
     const messageId = message.runId;
     const messageKey = this.keys.messageKey(message.orgId, message.runId);
@@ -1676,19 +1955,8 @@ export class RunQueue {
     );
   }
 
-  #getWorkerQueueFromMessage(message: OutputPayload) {
-    if (message.version === "2") {
-      return message.workerQueue;
-    }
-
-    // In v2, if the environment is development, the worker queue is the environment id.
-    if (message.environmentType === "DEVELOPMENT") {
-      return message.environmentId;
-    }
-
-    // In v1, the master queue is something like us-nyc-3,
-    // which in v2 is the worker queue.
-    return message.masterQueues[0];
+  #getWorkerQueueFromMessage(message: OutputPayload): string {
+    return this.workerQueueResolver.getWorkerQueueFromMessage(message);
   }
 
   #createBlockingDequeueClient() {
@@ -1700,10 +1968,12 @@ export class RunQueue {
   // Call this every 10 minutes
   private async scanConcurrencySets() {
     if (this.abortController.signal.aborted) {
+      this.logger.info("Abort signal received, skipping concurrency scan");
+
       return;
     }
 
-    this.logger.debug("Scanning concurrency sets for completed runs");
+    this.logger.info("Scanning concurrency sets for completed runs");
 
     const stats = {
       streamCallbacks: 0,
@@ -1756,7 +2026,7 @@ export class RunQueue {
         return;
       }
 
-      this.logger.debug("Processing concurrency keys from stream", {
+      this.logger.info("Processing concurrency keys from stream", {
         keys: uniqueKeys,
       });
 
@@ -1826,27 +2096,29 @@ export class RunQueue {
   }
 
   private async processCurrentConcurrencyRunIds(concurrencyKey: string, runIds: string[]) {
-    this.logger.debug(`Processing concurrency set with ${runIds.length} runs`, {
+    this.logger.info("Processing concurrency set with runs", {
       concurrencyKey,
-      runIds: runIds.slice(0, 5), // Log first 5 for debugging
+      runIds: runIds.slice(0, 5), // Log first 5 for debugging,
+      runIdsLength: runIds.length,
     });
 
     // Call the callback to determine which runs are completed
     const completedRuns = await this.options.concurrencySweeper?.callback(runIds);
 
     if (!completedRuns) {
-      this.logger.debug("No completed runs found in concurrency set", { concurrencyKey });
+      this.logger.info("No completed runs found in concurrency set", { concurrencyKey });
       return;
     }
 
     if (completedRuns.length === 0) {
-      this.logger.debug("No completed runs found in concurrency set", { concurrencyKey });
+      this.logger.info("No completed runs found in concurrency set", { concurrencyKey });
       return;
     }
 
-    this.logger.debug(`Found ${completedRuns.length} completed runs to mark for ack`, {
+    this.logger.info("Found completed runs to mark for ack", {
       concurrencyKey,
       completedRunIds: completedRuns.map((r) => r.id).slice(0, 5),
+      completedRunIdsLength: completedRuns.length,
     });
 
     // Mark the completed runs for acknowledgment
@@ -1870,7 +2142,7 @@ export class RunQueue {
 
     const count = await this.redis.zadd(markedForAckKey, ...args);
 
-    this.logger.debug(`Marked ${count} runs for acknowledgment`, {
+    this.logger.info("Marked runs for acknowledgment", {
       markedForAckKey,
       count,
     });
@@ -1941,27 +2213,42 @@ export class RunQueue {
   }
 
   async #dequeueMessageFromKey(messageKey: string) {
-    const rawMessage = await this.redis.dequeueMessageFromKey(
-      messageKey,
-      this.options.redis.keyPrefix ?? ""
-    );
+    return this.#trace("dequeueMessageFromKey", async (span) => {
+      span.setAttributes({
+        messageKey,
+      });
 
-    if (!rawMessage) {
-      return;
-    }
+      const rawMessage = await this.redis.dequeueMessageFromKey(
+        messageKey,
+        this.options.redis.keyPrefix ?? ""
+      );
 
-    const [error, message] = parseRawMessage(rawMessage);
+      if (!rawMessage) {
+        span.setAttribute("result", "NO_MESSAGE");
 
-    if (error) {
-      this.logger.error(`[${this.name}] Failed to parse message`, {
-        messageKey,
-        error,
-        service: this.name,
-        message: message ?? rawMessage,
-      });
-    }
+        return;
+      }
+
+      const [error, message] = parseRawMessage(rawMessage);
+
+      if (error) {
+        this.logger.error(`[${this.name}] Failed to parse message`, {
+          messageKey,
+          error,
+          service: this.name,
+          message: message ?? rawMessage,
+        });
+      }
+
+      if (message) {
+        span.setAttribute("result", "SUCCESS");
+        span.setAttribute("messageId", message.runId);
+      } else {
+        span.setAttribute("result", "NO_MESSAGE");
+      }
 
-    return message;
+      return message;
+    });
   }
 
   #registerCommands() {
@@ -2129,6 +2416,26 @@ return results
       `,
     });
 
+    this.redis.defineCommand("dequeueMessageFromWorkerQueueNonBlocking", {
+      numberOfKeys: 1,
+      lua: `
+local workerQueueKey = KEYS[1]
+
+-- lpop the first message from the worker queue
+local messageId = redis.call('LPOP', workerQueueKey)
+
+-- if there is no messageId, return nil
+if not messageId then
+    return nil
+end
+
+-- get the length of the worker queue
+local queueLength = tonumber(redis.call('LLEN', workerQueueKey) or '0')
+
+return {messageId, queueLength} -- Return message details
+      `,
+    });
+
     this.redis.defineCommand("dequeueMessageFromKey", {
       numberOfKeys: 1,
       lua: `
@@ -2390,6 +2697,26 @@ end
 return results
       `,
     });
+
+    this.redis.defineCommand("clearMessageFromConcurrencySets", {
+      numberOfKeys: 4,
+      lua: `
+-- Keys:
+local queueCurrentConcurrencyKey = KEYS[1]
+local envCurrentConcurrencyKey = KEYS[2]
+local queueCurrentDequeuedKey = KEYS[3]
+local envCurrentDequeuedKey = KEYS[4]
+
+-- Args:
+local messageId = ARGV[1]
+
+-- Update the concurrency keys
+redis.call('SREM', queueCurrentConcurrencyKey, messageId)
+redis.call('SREM', envCurrentConcurrencyKey, messageId)
+redis.call('SREM', queueCurrentDequeuedKey, messageId)
+redis.call('SREM', envCurrentDequeuedKey, messageId)
+`,
+    });
   }
 }
 
@@ -2442,6 +2769,11 @@ declare module "@internal/redis" {
       callback?: Callback<string[]>
     ): Result<string[], Context>;
 
+    dequeueMessageFromWorkerQueueNonBlocking(
+      workerQueueKey: string,
+      callback?: Callback<[string, string] | undefined>
+    ): Result<[string, string] | undefined, Context>;
+
     dequeueMessageFromKey(
       // keys
       messageKey: string,
@@ -2469,6 +2801,17 @@ declare module "@internal/redis" {
       callback?: Callback<void>
     ): Result<void, Context>;
 
+    clearMessageFromConcurrencySets(
+      // keys
+      queueCurrentConcurrencyKey: string,
+      envCurrentConcurrencyKey: string,
+      queueCurrentDequeuedKey: string,
+      envCurrentDequeuedKey: string,
+      // args
+      messageId: string,
+      callback?: Callback<void>
+    ): Result<void, Context>;
+
     nackMessage(
       // keys
       masterQueueKey: string,
diff --git a/internal-packages/run-engine/src/run-queue/tests/dequeueMessageFromWorkerQueue.test.ts b/internal-packages/run-engine/src/run-queue/tests/dequeueMessageFromWorkerQueue.test.ts
index 08cea00cc16..cc7485483aa 100644
--- a/internal-packages/run-engine/src/run-queue/tests/dequeueMessageFromWorkerQueue.test.ts
+++ b/internal-packages/run-engine/src/run-queue/tests/dequeueMessageFromWorkerQueue.test.ts
@@ -468,4 +468,91 @@ describe("RunQueue.dequeueMessageFromWorkerQueue", () => {
       }
     }
   );
+
+  redisTest(
+    "should put the queue in a cooloff state when it fails to dequeue after a certain number of consecutive failures",
+    async ({ redisContainer }) => {
+      const queue = new RunQueue({
+        ...testOptions,
+        logLevel: "debug",
+        queueSelectionStrategy: new FairQueueSelectionStrategy({
+          redis: {
+            keyPrefix: "runqueue:test:",
+            host: redisContainer.getHost(),
+            port: redisContainer.getPort(),
+          },
+          keys: testOptions.keys,
+        }),
+        redis: {
+          keyPrefix: "runqueue:test:",
+          host: redisContainer.getHost(),
+          port: redisContainer.getPort(),
+        },
+        masterQueueCooloffPeriodMs: 10_000,
+        masterQueueCooloffCountThreshold: 1,
+        masterQueueConsumersIntervalMs: 500,
+        masterQueueConsumerDequeueCount: 1,
+        dequeueBlockingTimeoutSeconds: 1,
+      });
+
+      try {
+        // Set queue concurrency limit to 1
+        await queue.updateQueueConcurrencyLimits(authenticatedEnvDev, messageDev.queue, 1);
+
+        // Enqueue two messages
+        await queue.enqueueMessage({
+          env: authenticatedEnvDev,
+          message: messageDev,
+          workerQueue: "main",
+        });
+
+        await queue.enqueueMessage({
+          env: authenticatedEnvDev,
+          message: { ...messageDev, runId: "r4322" },
+          workerQueue: "main",
+        });
+
+        await setTimeout(1000);
+
+        // Dequeue first message
+        const dequeued1 = await queue.dequeueMessageFromWorkerQueue("test_12345", "main");
+        expect(dequeued1).toBeDefined();
+        assertNonNullable(dequeued1);
+
+        // Try to dequeue second message
+        const dequeued2 = await queue.dequeueMessageFromWorkerQueue("test_12345", "main");
+        expect(dequeued2).toBeUndefined();
+
+        const queueConcurrency = await queue.currentConcurrencyOfQueue(
+          authenticatedEnvDev,
+          messageDev.queue
+        );
+        expect(queueConcurrency).toBe(1);
+
+        // Now lets ack the first message (and skip dequeue processing so we can test the cooloff state)
+        await queue.acknowledgeMessage(dequeued1.message.orgId, dequeued1.messageId, {
+          skipDequeueProcessing: true,
+        });
+
+        await setTimeout(1000);
+
+        // Try and dequeue the second message again (should still be in the cooloff state)
+        const dequeued3 = await queue.dequeueMessageFromWorkerQueue("test_12345", "main");
+        expect(dequeued3).toBeUndefined();
+
+        // Wait for the cooloff period to end
+        await setTimeout(10_000);
+
+        // Try and dequeue the second message again (should be dequeued now)
+        const dequeued4 = await queue.dequeueMessageFromWorkerQueue("test_12345", "main");
+        expect(dequeued4).toBeDefined();
+        assertNonNullable(dequeued4);
+        expect(dequeued4.messageId).toEqual("r4322");
+        expect(dequeued4.message.orgId).toEqual(messageDev.orgId);
+        expect(dequeued4.message.version).toEqual("2");
+      } finally {
+        await queue.quit();
+      }
+    }
+  );
 });
diff --git a/internal-packages/run-engine/src/run-queue/tests/workerQueueResolver.test.ts b/internal-packages/run-engine/src/run-queue/tests/workerQueueResolver.test.ts
new file mode 100644
index 00000000000..3ea8f0ce714
--- /dev/null
+++ b/internal-packages/run-engine/src/run-queue/tests/workerQueueResolver.test.ts
@@ -0,0 +1,484 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { Logger } from "@trigger.dev/core/logger";
+import { WorkerQueueResolver, type WorkerQueueOverrides } from "../workerQueueResolver.js";
+import { OutputPayload, OutputPayloadV1, OutputPayloadV2 } from "../types.js";
+import { RuntimeEnvironmentType } from "@trigger.dev/core/v3";
+
+vi.setConfig({ testTimeout: 5_000 });
+
+describe("WorkerQueueOverrideResolver", () => {
+  const createTestMessage = (overrides?: Partial<OutputPayloadV2>): OutputPayloadV2 => ({
+    version: "2",
+    runId: "run_123",
+    taskIdentifier: "task_123",
+    orgId: "org_123",
+    projectId: "proj_123",
+    environmentId: "env_123",
+    environmentType: RuntimeEnvironmentType.PRODUCTION,
+    queue: "test-queue",
+    timestamp: Date.now(),
+    attempt: 0,
+    workerQueue: "default-queue",
+    ...overrides,
+  });
+
+  describe("No overrides", () => {
+    it("should return original workerQueue when no overrides are set", () => {
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger });
+      const message = createTestMessage({ workerQueue: "original-queue" });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("original-queue");
+    });
+  });
+
+  describe("Environment ID overrides", () => {
+    it("should override based on environmentId", () => {
+      const overrideConfig = JSON.stringify({
+        environmentId: {
+          env_special: "special-env-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage({
+        environmentId: "env_special",
+        workerQueue: "original-queue",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("special-env-queue");
+    });
+
+    it("should not override when environmentId doesn't match", () => {
+      const overrideConfig = JSON.stringify({
+        environmentId: {
+          env_other: "other-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage({
+        environmentId: "env_123",
+        workerQueue: "original-queue",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("original-queue");
+    });
+  });
+
+  describe("Project ID overrides", () => {
+    it("should override based on projectId", () => {
+      const overrideConfig = JSON.stringify({
+        projectId: {
+          proj_special: "special-project-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage({
+        projectId: "proj_special",
+        workerQueue: "original-queue",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("special-project-queue");
+    });
+  });
+
+  describe("Organization ID overrides", () => {
+    it("should override based on orgId", () => {
+      const overrideConfig = JSON.stringify({
+        orgId: {
+          org_special: "special-org-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage({
+        orgId: "org_special",
+        workerQueue: "original-queue",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("special-org-queue");
+    });
+  });
+
+  describe("Worker Queue overrides", () => {
+    it("should override based on workerQueue", () => {
+      const overrideConfig = JSON.stringify({
+        workerQueue: {
+          "us-east-1": "us-west-1",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage({
+        workerQueue: "us-east-1",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("us-west-1");
+    });
+  });
+
+  describe("Priority order", () => {
+    it("should prioritize environmentId over projectId", () => {
+      const overrideConfig = JSON.stringify({
+        environmentId: {
+          env_123: "env-queue",
+        },
+        projectId: {
+          proj_123: "project-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("env-queue");
+    });
+
+    it("should prioritize projectId over orgId", () => {
+      const overrideConfig = JSON.stringify({
+        projectId: {
+          proj_123: "project-queue",
+        },
+        orgId: {
+          org_123: "org-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("project-queue");
+    });
+
+    it("should prioritize orgId over workerQueue", () => {
+      const overrideConfig = JSON.stringify({
+        orgId: {
+          org_123: "org-queue",
+        },
+        workerQueue: {
+          "default-queue": "worker-override-queue",
+        },
+      } satisfies WorkerQueueOverrides);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("org-queue");
+    });
+  });
+
+  describe("Configuration parsing", () => {
+    it("should handle invalid JSON gracefully", () => {
+      const loggerSpy = vi.spyOn(Logger.prototype, "error");
+
+      const overrideConfig = "invalid json {";
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("default-queue");
+      expect(loggerSpy).toHaveBeenCalledWith(
+        "Failed to parse worker queue overrides json",
+        expect.any(Object)
+      );
+
+      loggerSpy.mockRestore();
+    });
+
+    it("should handle non-object JSON gracefully", () => {
+      const loggerSpy = vi.spyOn(Logger.prototype, "error");
+
+      const overrideConfig = JSON.stringify("not an object");
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("default-queue");
+      expect(loggerSpy).toHaveBeenCalledWith(
+        "Invalid worker queue overrides format",
+        expect.any(Object)
+      );
+
+      loggerSpy.mockRestore();
+    });
+
+    it("should handle null JSON gracefully", () => {
+      const loggerSpy = vi.spyOn(Logger.prototype, "error");
+
+      const overrideConfig = JSON.stringify(null);
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("default-queue");
+      expect(loggerSpy).toHaveBeenCalledWith(
+        "Invalid worker queue overrides format",
+        expect.any(Object)
+      );
+
+      loggerSpy.mockRestore();
+    });
+
+    it("should log when overrides are enabled", () => {
+      const loggerSpy = vi.spyOn(Logger.prototype, "info");
+
+      const overrides: WorkerQueueOverrides = {
+        orgId: { org_123: "dedicated-queue" },
+      };
+
+      const overrideConfig = JSON.stringify(overrides);
+
+      const logger = new Logger("test", "info");
+      new WorkerQueueResolver({ logger, overrideConfig });
+
+      expect(loggerSpy).toHaveBeenCalledWith("🎯 Worker queue overrides enabled", { overrides });
+
+      loggerSpy.mockRestore();
+    });
+
+    it("should validate schema and reject invalid structure", () => {
+      const loggerSpy = vi.spyOn(Logger.prototype, "error");
+
+      // Invalid structure - numbers instead of strings in the record
+      const overrideConfig = JSON.stringify({
+        orgId: {
+          org_123: 12345, // Should be string, not number
+        },
+      });
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("default-queue");
+      expect(loggerSpy).toHaveBeenCalledWith(
+        "Invalid worker queue overrides format",
+        expect.any(Object)
+      );
+
+      loggerSpy.mockRestore();
+    });
+  });
+
+  describe("Complex scenarios", () => {
+    it("should handle multiple override types simultaneously", () => {
+      const overrideConfig = JSON.stringify({
+        environmentId: {
+          env_special: "special-env-queue",
+        },
+        projectId: {
+          proj_other: "other-project-queue",
+        },
+        orgId: {
+          org_123: "org-queue",
+        },
+        workerQueue: {
+          "fallback-queue": "redirected-queue",
+        },
+      });
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+
+      // Should use orgId override since env and project don't match
+      const message1 = createTestMessage({
+        environmentId: "env_123",
+        projectId: "proj_123",
+        orgId: "org_123",
+        workerQueue: "original-queue",
+      });
+
+      const result1 = resolver.getWorkerQueueFromMessage(message1);
+      expect(result1).toBe("org-queue");
+
+      // Should use environmentId override since it matches
+      const message2 = createTestMessage({
+        environmentId: "env_special",
+        projectId: "proj_123",
+        orgId: "org_456",
+        workerQueue: "original-queue",
+      });
+
+      const result2 = resolver.getWorkerQueueFromMessage(message2);
+      expect(result2).toBe("special-env-queue");
+
+      // Should use workerQueue override as fallback
+      const message3 = createTestMessage({
+        environmentId: "env_unknown",
+        projectId: "proj_unknown",
+        orgId: "org_unknown",
+        workerQueue: "fallback-queue",
+      });
+
+      const result3 = resolver.getWorkerQueueFromMessage(message3);
+      expect(result3).toBe("redirected-queue");
+    });
+
+    it("should handle empty override sections", () => {
+      const overrideConfig = JSON.stringify({
+        environmentId: {},
+        projectId: {},
+        orgId: {
+          org_123: "org-queue",
+        },
+        workerQueue: {},
+      });
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage();
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("org-queue");
+    });
+  });
+
+  describe("V1 message handling", () => {
+    it("should handle v1 development messages", () => {
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger });
+
+      const v1DevMessage: OutputPayloadV1 = {
+        version: "1",
+        runId: "run_123",
+        taskIdentifier: "task_123",
+        orgId: "org_123",
+        projectId: "proj_123",
+        environmentId: "env_dev",
+        environmentType: RuntimeEnvironmentType.DEVELOPMENT,
+        queue: "test-queue",
+        timestamp: Date.now(),
+        attempt: 0,
+        masterQueues: ["us-east-1", "us-west-1"],
+      };
+
+      const result = resolver.getWorkerQueueFromMessage(v1DevMessage);
+
+      expect(result).toBe("env_dev");
+    });
+
+    it("should handle v1 production messages", () => {
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger });
+
+      const v1ProdMessage: OutputPayloadV1 = {
+        version: "1",
+        runId: "run_123",
+        taskIdentifier: "task_123",
+        orgId: "org_123",
+        projectId: "proj_123",
+        environmentId: "env_prod",
+        environmentType: RuntimeEnvironmentType.PRODUCTION,
+        queue: "test-queue",
+        timestamp: Date.now(),
+        attempt: 0,
+        masterQueues: ["us-east-1", "us-west-1"],
+      };
+
+      const result = resolver.getWorkerQueueFromMessage(v1ProdMessage);
+
+      expect(result).toBe("us-east-1");
+    });
+  });
+
+  describe("Environment variable fallback", () => {
+    let originalEnv: string | undefined;
+
+    beforeEach(() => {
+      originalEnv = process.env.RUN_ENGINE_WORKER_QUEUE_OVERRIDES;
+    });
+
+    afterEach(() => {
+      if (originalEnv === undefined) {
+        delete process.env.RUN_ENGINE_WORKER_QUEUE_OVERRIDES;
+      } else {
+        process.env.RUN_ENGINE_WORKER_QUEUE_OVERRIDES = originalEnv;
+      }
+    });
+
+    it("should fall back to environment variable when no overrideConfig provided", () => {
+      // Set environment variable
+      process.env.RUN_ENGINE_WORKER_QUEUE_OVERRIDES = JSON.stringify({
+        orgId: {
+          org_from_env: "env-based-queue",
+        },
+      });
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger }); // No overrideConfig
+      const message = createTestMessage({
+        orgId: "org_from_env",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("env-based-queue");
+    });
+
+    it("should prioritize overrideConfig over environment variable", () => {
+      // Set environment variable
+      process.env.RUN_ENGINE_WORKER_QUEUE_OVERRIDES = JSON.stringify({
+        orgId: {
+          org_123: "env-queue",
+        },
+      });
+
+      // Pass config directly (should take precedence)
+      const overrideConfig = JSON.stringify({
+        orgId: {
+          org_123: "config-queue",
+        },
+      });
+
+      const logger = new Logger("test", "error");
+      const resolver = new WorkerQueueResolver({ logger, overrideConfig });
+      const message = createTestMessage({
+        orgId: "org_123",
+      });
+
+      const result = resolver.getWorkerQueueFromMessage(message);
+
+      expect(result).toBe("config-queue");
+    });
+  });
+});
diff --git a/internal-packages/run-engine/src/run-queue/workerQueueResolver.ts b/internal-packages/run-engine/src/run-queue/workerQueueResolver.ts
new file mode 100644
index 00000000000..5c83d3de6ff
--- /dev/null
+++ b/internal-packages/run-engine/src/run-queue/workerQueueResolver.ts
@@ -0,0 +1,100 @@
+import type { Logger } from "@trigger.dev/core/logger";
+import type { OutputPayload, OutputPayloadV2 } from "./types.js";
+import { z } from "zod";
+
+const WorkerQueueOverrides = z.object({
+  environmentId: z.record(z.string(), z.string()).optional(),
+  projectId: z.record(z.string(), z.string()).optional(),
+  orgId: z.record(z.string(), z.string()).optional(),
+  workerQueue: z.record(z.string(), z.string()).optional(),
+});
+
+export type WorkerQueueOverrides = z.infer<typeof WorkerQueueOverrides>;
+
+export type WorkerQueueResolverOptions = {
+  logger: Logger;
+  overrideConfig?: string;
+};
+
+export class WorkerQueueResolver {
+  private overrides: WorkerQueueOverrides | null;
+  private logger: Logger;
+
+  constructor(opts: WorkerQueueResolverOptions) {
+    this.logger = opts.logger;
+    this.overrides = this.parseOverrides(opts.overrideConfig);
+  }
+
+  private parseOverrides(overrideConfig?: string): WorkerQueueOverrides | null {
+    const overridesJson = overrideConfig ?? process.env.RUN_ENGINE_WORKER_QUEUE_OVERRIDES;
+
+    if (!overridesJson) {
+      return null;
+    }
+
+    try {
+      const parsed = JSON.parse(overridesJson);
+      const result = WorkerQueueOverrides.safeParse(parsed);
+
+      if (!result.success) {
+        this.logger.error("Invalid worker queue overrides format", {
+          error: result.error.format(),
+        });
+        return null;
+      }
+
+      this.logger.info("🎯 Worker queue overrides enabled", { overrides: result.data });
+
+      return result.data;
+    } catch (error) {
+      this.logger.error("Failed to parse worker queue overrides json", {
+        error,
+      });
+      return null;
+    }
+  }
+
+  public getWorkerQueueFromMessage(message: OutputPayload): string {
+    if (message.version === "2") {
+      // Check overrides in priority order
+      const override = this.#getOverride(message);
+      if (override) return override;
+
+      return message.workerQueue;
+    }
+
+    // In v2, if the environment is development, the worker queue is the environment id.
+    if (message.environmentType === "DEVELOPMENT") {
+      return message.environmentId;
+    }
+
+    // In v1, the master queue is something like us-nyc-3,
+    // which in v2 is the worker queue.
+    return message.masterQueues[0];
+  }
+
+  #getOverride(message: OutputPayloadV2): string | null {
+    if (!this.overrides) {
+      return null;
+    }
+
+    // Priority: environmentId > projectId > orgId > workerQueue
+    if (this.overrides.environmentId?.[message.environmentId]) {
+      return this.overrides.environmentId[message.environmentId];
+    }
+
+    if (this.overrides.projectId?.[message.projectId]) {
+      return this.overrides.projectId[message.projectId];
+    }
+
+    if (this.overrides.orgId?.[message.orgId]) {
+      return this.overrides.orgId[message.orgId];
+    }
+
+    if (this.overrides.workerQueue?.[message.workerQueue]) {
+      return this.overrides.workerQueue[message.workerQueue];
+    }
+
+    return null;
+  }
+}
diff --git a/internal-packages/schedule-engine/package.json b/internal-packages/schedule-engine/package.json
index ecdf151247e..86929a39341 100644
--- a/internal-packages/schedule-engine/package.json
+++ b/internal-packages/schedule-engine/package.json
@@ -22,7 +22,7 @@
     "cron-parser": "^4.9.0",
     "cronstrue": "^2.50.0",
     "nanoid": "3.3.8",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@internal/testcontainers": "workspace:*",
diff --git a/internal-packages/schedule-engine/test/scheduleEngine.test.ts b/internal-packages/schedule-engine/test/scheduleEngine.test.ts
index fdc05e25747..99bac0936df 100644
--- a/internal-packages/schedule-engine/test/scheduleEngine.test.ts
+++ b/internal-packages/schedule-engine/test/scheduleEngine.test.ts
@@ -93,6 +93,7 @@ describe("ScheduleEngine Integration", () => {
           data: {
             taskScheduleId: taskSchedule.id,
             environmentId: environment.id,
+            projectId: project.id,
             active: true,
           },
         });
diff --git a/internal-packages/schedule-engine/test/scheduleRecovery.test.ts b/internal-packages/schedule-engine/test/scheduleRecovery.test.ts
index 9ad345101ec..99a3351aed7 100644
--- a/internal-packages/schedule-engine/test/scheduleRecovery.test.ts
+++ b/internal-packages/schedule-engine/test/scheduleRecovery.test.ts
@@ -79,6 +79,7 @@ describe("Schedule Recovery", () => {
           data: {
             taskScheduleId: taskSchedule.id,
             environmentId: environment.id,
+            projectId: project.id,
             active: true,
           },
         });
@@ -184,6 +185,7 @@ describe("Schedule Recovery", () => {
           data: {
             taskScheduleId: taskSchedule.id,
             environmentId: environment.id,
+            projectId: project.id,
             active: true,
           },
         });
@@ -293,6 +295,7 @@ describe("Schedule Recovery", () => {
             data: {
               taskScheduleId: taskSchedule.id,
               environmentId: environment.id,
+              projectId: project.id,
               active: true,
             },
           });
diff --git a/internal-packages/sdk-compat-tests/package.json b/internal-packages/sdk-compat-tests/package.json
new file mode 100644
index 00000000000..e903e69f3f1
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "@internal/sdk-compat-tests",
+  "private": true,
+  "version": "0.0.1",
+  "type": "module",
+  "scripts": {
+    "test": "vitest",
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit"
+  },
+  "dependencies": {
+    "@trigger.dev/sdk": "workspace:*"
+  },
+  "devDependencies": {
+    "esbuild": "^0.24.0",
+    "execa": "^9.3.0",
+    "typescript": "^5.5.0",
+    "vitest": "3.1.4"
+  }
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/bun/package.json b/internal-packages/sdk-compat-tests/src/fixtures/bun/package.json
new file mode 100644
index 00000000000..c69e2dd23e3
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/bun/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "bun-fixture",
+  "private": true,
+  "type": "module"
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/bun/test.ts b/internal-packages/sdk-compat-tests/src/fixtures/bun/test.ts
new file mode 100644
index 00000000000..853869304f4
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/bun/test.ts
@@ -0,0 +1,62 @@
+/**
+ * Bun Import Test Fixture
+ *
+ * Tests that the SDK works correctly with Bun runtime.
+ * Bun has high Node.js compatibility but uses its own module resolver.
+ */
+
+import { task, logger, schedules, runs, configure, queue, retry, wait } from "@trigger.dev/sdk";
+
+// Validate exports exist
+const checks: [string, boolean][] = [
+  ["task", typeof task === "function"],
+  ["logger", typeof logger === "object" && typeof logger.info === "function"],
+  ["schedules", typeof schedules === "object"],
+  ["runs", typeof runs === "object"],
+  ["configure", typeof configure === "function"],
+  ["queue", typeof queue === "function"],
+  ["retry", typeof retry === "object"],
+  ["wait", typeof wait === "object"],
+];
+
+let failed = false;
+for (const [name, passed] of checks) {
+  if (!passed) {
+    console.error(`FAIL: ${name} export check failed`);
+    failed = true;
+  }
+}
+
+// Test task definition with types
+interface Payload {
+  message: string;
+}
+
+const myTask = task({
+  id: "bun-test-task",
+  run: async (payload: Payload) => {
+    return { received: payload.message };
+  },
+});
+
+if (myTask.id !== "bun-test-task") {
+  console.error(`FAIL: task.id mismatch`);
+  failed = true;
+}
+
+// Test queue definition
+const myQueue = queue({
+  name: "bun-test-queue",
+  concurrencyLimit: 5,
+});
+
+if (!myQueue) {
+  console.error(`FAIL: queue creation failed`);
+  failed = true;
+}
+
+if (failed) {
+  process.exit(1);
+}
+
+console.log("SUCCESS: Bun imports validated");
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/cjs-require/package.json b/internal-packages/sdk-compat-tests/src/fixtures/cjs-require/package.json
new file mode 100644
index 00000000000..953ed7d2db7
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/cjs-require/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "cjs-require-fixture",
+  "private": true
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/cjs-require/test.cjs b/internal-packages/sdk-compat-tests/src/fixtures/cjs-require/test.cjs
new file mode 100644
index 00000000000..447d03970aa
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/cjs-require/test.cjs
@@ -0,0 +1,57 @@
+/**
+ * CJS Require Test Fixture
+ *
+ * This file validates that the SDK can be required using CommonJS syntax.
+ * This is critical for:
+ * - Node.js < 22.12.0 (where require(ESM) is not enabled by default)
+ * - AWS Lambda (intentionally disables require(ESM))
+ * - Legacy Node.js applications
+ */
+
+// Test main export
+const sdk = require("@trigger.dev/sdk");
+
+// Test /v3 subpath
+const sdkV3 = require("@trigger.dev/sdk/v3");
+
+// Validate exports exist
+const checks = [
+  ["task", typeof sdk.task === "function"],
+  ["taskV3", typeof sdkV3.task === "function"],
+  ["logger", typeof sdk.logger === "object" && typeof sdk.logger.info === "function"],
+  ["schedules", typeof sdk.schedules === "object"],
+  ["runs", typeof sdk.runs === "object"],
+  ["configure", typeof sdk.configure === "function"],
+  ["queue", typeof sdk.queue === "function"],
+  ["retry", typeof sdk.retry === "object"],
+  ["wait", typeof sdk.wait === "object"],
+  ["metadata", typeof sdk.metadata === "object"],
+  ["tags", typeof sdk.tags === "object"],
+];
+
+let failed = false;
+for (const [name, passed] of checks) {
+  if (!passed) {
+    console.error(`FAIL: ${name} export check failed`);
+    failed = true;
+  }
+}
+
+// Test task definition works
+const myTask = sdk.task({
+  id: "cjs-test-task",
+  run: async (payload) => {
+    return { received: payload };
+  },
+});
+
+if (myTask.id !== "cjs-test-task") {
+  console.error(`FAIL: task.id mismatch: expected "cjs-test-task", got "${myTask.id}"`);
+  failed = true;
+}
+
+if (failed) {
+  process.exit(1);
+}
+
+console.log("SUCCESS: All CJS requires validated");
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/package.json b/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/package.json
new file mode 100644
index 00000000000..d9fca987c33
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "cloudflare-worker-fixture",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "build": "wrangler deploy --dry-run --outdir dist"
+  },
+  "devDependencies": {
+    "wrangler": "^3.0.0"
+  }
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/src/index.ts b/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/src/index.ts
new file mode 100644
index 00000000000..30b5fcc79ef
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/src/index.ts
@@ -0,0 +1,41 @@
+/**
+ * Cloudflare Worker Test Fixture
+ *
+ * Tests that the SDK can be bundled for Cloudflare Workers (workerd runtime).
+ * This validates the bundling process works - actual execution would require
+ * a Trigger.dev API connection.
+ */
+
+import { task, runs, configure } from "@trigger.dev/sdk";
+
+// Define a task (won't execute in worker, but validates import)
+const myTask = task({
+  id: "cloudflare-test-task",
+  run: async (payload: { message: string }) => {
+    return { received: payload.message };
+  },
+});
+
+export default {
+  async fetch(request: Request, env: unknown, ctx: ExecutionContext): Promise<Response> {
+    // Validate SDK imports work
+    const checks = {
+      taskDefined: typeof task === "function",
+      runsDefined: typeof runs === "object",
+      configureDefined: typeof configure === "function",
+      taskIdCorrect: myTask.id === "cloudflare-test-task",
+    };
+
+    const allPassed = Object.values(checks).every((v) => v === true);
+
+    return new Response(
+      JSON.stringify({
+        success: allPassed,
+        checks,
+      }),
+      {
+        headers: { "Content-Type": "application/json" },
+      }
+    );
+  },
+};
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/wrangler.toml b/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/wrangler.toml
new file mode 100644
index 00000000000..f038e47bb6f
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/cloudflare-worker/wrangler.toml
@@ -0,0 +1,4 @@
+name = "sdk-compat-test"
+main = "src/index.ts"
+compatibility_date = "2024-01-01"
+compatibility_flags = ["nodejs_compat"]
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/deno/deno.json b/internal-packages/sdk-compat-tests/src/fixtures/deno/deno.json
new file mode 100644
index 00000000000..4525b34d3e2
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/deno/deno.json
@@ -0,0 +1,6 @@
+{
+  "tasks": {
+    "test": "deno run --allow-read --allow-env --allow-sys test.ts"
+  },
+  "nodeModulesDir": "manual"
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/deno/test.ts b/internal-packages/sdk-compat-tests/src/fixtures/deno/test.ts
new file mode 100644
index 00000000000..6894606fd0a
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/deno/test.ts
@@ -0,0 +1,65 @@
+/**
+ * Deno Import Test Fixture
+ *
+ * Tests that the SDK can be imported in Deno using Node.js compatibility.
+ * The CI workflow installs the SDK into node_modules via npm for local resolution.
+ */
+
+// Use bare specifier - resolved via node_modules when nodeModulesDir is enabled
+import { task, logger, schedules, runs, configure, queue, retry, wait, metadata, tags } from "@trigger.dev/sdk";
+
+// Validate exports exist
+const checks: [string, boolean][] = [
+  ["task", typeof task === "function"],
+  ["logger", typeof logger === "object" && typeof logger.info === "function"],
+  ["schedules", typeof schedules === "object"],
+  ["runs", typeof runs === "object"],
+  ["configure", typeof configure === "function"],
+  ["queue", typeof queue === "function"],
+  ["retry", typeof retry === "object"],
+  ["wait", typeof wait === "object"],
+  ["metadata", typeof metadata === "object"],
+  ["tags", typeof tags === "object"],
+];
+
+let failed = false;
+for (const [name, passed] of checks) {
+  if (!passed) {
+    console.error(`FAIL: ${name} export check failed`);
+    failed = true;
+  }
+}
+
+// Test task definition with types
+interface Payload {
+  message: string;
+}
+
+const myTask = task({
+  id: "deno-test-task",
+  run: async (payload: Payload) => {
+    return { received: payload.message };
+  },
+});
+
+if (myTask.id !== "deno-test-task") {
+  console.error(`FAIL: task.id mismatch`);
+  failed = true;
+}
+
+// Test queue definition
+const myQueue = queue({
+  name: "deno-test-queue",
+  concurrencyLimit: 5,
+});
+
+if (!myQueue) {
+  console.error(`FAIL: queue creation failed`);
+  failed = true;
+}
+
+if (failed) {
+  Deno.exit(1);
+}
+
+console.log("SUCCESS: Deno imports validated");
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/esm-import/package.json b/internal-packages/sdk-compat-tests/src/fixtures/esm-import/package.json
new file mode 100644
index 00000000000..c0d56cd02fa
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/esm-import/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "esm-import-fixture",
+  "private": true,
+  "type": "module"
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/esm-import/superjson-test.mjs b/internal-packages/sdk-compat-tests/src/fixtures/esm-import/superjson-test.mjs
new file mode 100644
index 00000000000..fc034de19e0
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/esm-import/superjson-test.mjs
@@ -0,0 +1,59 @@
+/**
+ * SuperJSON Serialization Test
+ *
+ * This validates the fix for #2937 - ESM/CJS compatibility with superjson.
+ * Tests that complex types (Date, Set, Map, BigInt) serialize correctly.
+ */
+
+import { task, logger } from "@trigger.dev/sdk";
+
+// The SDK uses superjson internally for serialization
+// This test ensures the vendored superjson works correctly
+
+const complexData = {
+  date: new Date("2024-01-15T12:00:00Z"),
+  set: new Set([1, 2, 3]),
+  map: new Map([
+    ["key1", "value1"],
+    ["key2", "value2"],
+  ]),
+  bigint: BigInt("9007199254740991"),
+  nested: {
+    innerDate: new Date("2024-06-01"),
+    innerSet: new Set(["a", "b"]),
+  },
+};
+
+// Create a task that uses complex types
+const complexTask = task({
+  id: "superjson-test-task",
+  run: async (payload) => {
+    // Just verify the payload structure matches expectations
+    return {
+      hasDate: payload.date instanceof Date,
+      hasSet: payload.set instanceof Set,
+      hasMap: payload.map instanceof Map,
+      hasBigInt: typeof payload.bigint === "bigint",
+      hasNestedDate: payload.nested?.innerDate instanceof Date,
+    };
+  },
+});
+
+// Verify task was created successfully
+if (!complexTask.id) {
+  console.error("FAIL: Task creation failed");
+  process.exit(1);
+}
+
+// Test that logger works (it uses superjson for structured logging)
+try {
+  logger.info("Testing superjson serialization", {
+    complexData,
+    timestamp: new Date(),
+  });
+} catch (error) {
+  console.error("FAIL: Logger with complex data failed:", error);
+  process.exit(1);
+}
+
+console.log("SUCCESS: SuperJSON serialization validated");
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/esm-import/test.mjs b/internal-packages/sdk-compat-tests/src/fixtures/esm-import/test.mjs
new file mode 100644
index 00000000000..70b055aaa2f
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/esm-import/test.mjs
@@ -0,0 +1,54 @@
+/**
+ * ESM Import Test Fixture
+ *
+ * This file validates that the SDK can be imported using ESM syntax.
+ * It tests all major export paths and verifies runtime functionality.
+ */
+
+// Test main export
+import { task, logger, schedules, runs, configure, queue, retry, wait, metadata, tags } from "@trigger.dev/sdk";
+
+// Test /v3 subpath (legacy, but should still work)
+import { task as taskV3 } from "@trigger.dev/sdk/v3";
+
+// Validate exports are functions/objects
+const checks = [
+  ["task", typeof task === "function"],
+  ["taskV3", typeof taskV3 === "function"],
+  ["logger", typeof logger === "object" && typeof logger.info === "function"],
+  ["schedules", typeof schedules === "object"],
+  ["runs", typeof runs === "object"],
+  ["configure", typeof configure === "function"],
+  ["queue", typeof queue === "function"],
+  ["retry", typeof retry === "object"],
+  ["wait", typeof wait === "object"],
+  ["metadata", typeof metadata === "object"],
+  ["tags", typeof tags === "object"],
+];
+
+let failed = false;
+for (const [name, passed] of checks) {
+  if (!passed) {
+    console.error(`FAIL: ${name} export check failed`);
+    failed = true;
+  }
+}
+
+// Test task definition works
+const myTask = task({
+  id: "esm-test-task",
+  run: async (payload) => {
+    return { received: payload };
+  },
+});
+
+if (myTask.id !== "esm-test-task") {
+  console.error(`FAIL: task.id mismatch: expected "esm-test-task", got "${myTask.id}"`);
+  failed = true;
+}
+
+if (failed) {
+  process.exit(1);
+}
+
+console.log("SUCCESS: All ESM imports validated");
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/typescript/package.json b/internal-packages/sdk-compat-tests/src/fixtures/typescript/package.json
new file mode 100644
index 00000000000..7663bc7aca3
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/typescript/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "typescript-fixture",
+  "private": true,
+  "type": "module"
+}
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/typescript/test.ts b/internal-packages/sdk-compat-tests/src/fixtures/typescript/test.ts
new file mode 100644
index 00000000000..bfcb4892abe
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/typescript/test.ts
@@ -0,0 +1,74 @@
+/**
+ * TypeScript Import Test Fixture
+ *
+ * This file validates that the SDK types work correctly with TypeScript.
+ * It tests type inference, generics, and type-only imports.
+ */
+
+import {
+  task,
+  logger,
+  schedules,
+  runs,
+  configure,
+  queue,
+  retry,
+  wait,
+  metadata,
+  tags,
+  type Context,
+  type RetryOptions,
+} from "@trigger.dev/sdk";
+
+// Type-only import test
+import type { ApiClientConfiguration } from "@trigger.dev/sdk";
+
+// Test typed task with payload
+interface MyPayload {
+  message: string;
+  count: number;
+}
+
+interface MyOutput {
+  processed: boolean;
+  result: string;
+}
+
+const typedTask = task({
+  id: "typescript-test-task",
+  run: async (payload: MyPayload, { ctx }): Promise<MyOutput> => {
+    // Verify context type
+    const runId: string = ctx.run.id;
+
+    return {
+      processed: true,
+      result: `Processed ${payload.message} with count ${payload.count}`,
+    };
+  },
+});
+
+// Verify task type inference
+type TaskPayload = Parameters<typeof typedTask.trigger>[0];
+type _PayloadCheck = TaskPayload extends MyPayload ? true : never;
+
+// Test queue definition
+const myQueue = queue({
+  name: "test-queue",
+  concurrencyLimit: 10,
+});
+
+// Test retry options type
+const retryOpts: RetryOptions = {
+  maxAttempts: 3,
+  factor: 2,
+  minTimeoutInMs: 1000,
+  maxTimeoutInMs: 30000,
+};
+
+// Validate runtime
+if (typedTask.id !== "typescript-test-task") {
+  console.error(`FAIL: task.id mismatch`);
+  process.exit(1);
+}
+
+console.log("SUCCESS: TypeScript types validated");
diff --git a/internal-packages/sdk-compat-tests/src/fixtures/typescript/tsconfig.json b/internal-packages/sdk-compat-tests/src/fixtures/typescript/tsconfig.json
new file mode 100644
index 00000000000..432fff32ade
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/fixtures/typescript/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "noEmit": true
+  },
+  "include": ["test.ts"]
+}
diff --git a/internal-packages/sdk-compat-tests/src/tests/bundler.test.ts b/internal-packages/sdk-compat-tests/src/tests/bundler.test.ts
new file mode 100644
index 00000000000..e3e18c49f37
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/tests/bundler.test.ts
@@ -0,0 +1,117 @@
+/**
+ * Bundler Compatibility Tests
+ *
+ * These tests validate that the SDK can be bundled correctly using
+ * common bundlers like esbuild.
+ */
+
+import { describe, it, expect } from "vitest";
+import * as esbuild from "esbuild";
+import { resolve, dirname } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const fixturesDir = resolve(__dirname, "../fixtures");
+
+describe("esbuild Bundling Tests", () => {
+  it("should bundle ESM entrypoint without errors", async () => {
+    const result = await esbuild.build({
+      entryPoints: [resolve(fixturesDir, "esm-import/test.mjs")],
+      bundle: true,
+      format: "esm",
+      platform: "node",
+      target: "node18",
+      write: false,
+      external: ["@trigger.dev/sdk", "@trigger.dev/sdk/*"],
+      logLevel: "silent",
+    });
+
+    expect(result.errors).toHaveLength(0);
+    expect(result.outputFiles).toHaveLength(1);
+  });
+
+  it("should bundle CJS entrypoint without errors", async () => {
+    const result = await esbuild.build({
+      entryPoints: [resolve(fixturesDir, "cjs-require/test.cjs")],
+      bundle: true,
+      format: "cjs",
+      platform: "node",
+      target: "node18",
+      write: false,
+      external: ["@trigger.dev/sdk", "@trigger.dev/sdk/*"],
+      logLevel: "silent",
+    });
+
+    expect(result.errors).toHaveLength(0);
+    expect(result.outputFiles).toHaveLength(1);
+  });
+
+  it("should bundle SDK inline (simulating production build)", async () => {
+    // This simulates what happens when a user bundles their app with the SDK included
+    const entryContent = `
+      import { task, logger } from "@trigger.dev/sdk";
+
+      export const myTask = task({
+        id: "bundled-task",
+        run: async (payload) => {
+          logger.info("Processing", { payload });
+          return { success: true };
+        },
+      });
+    `;
+
+    const result = await esbuild.build({
+      stdin: {
+        contents: entryContent,
+        loader: "ts",
+        resolveDir: resolve(__dirname, "../../"),
+      },
+      bundle: true,
+      format: "esm",
+      platform: "node",
+      target: "node18",
+      write: false,
+      // Don't externalize SDK - bundle it inline
+      logLevel: "silent",
+      metafile: true,
+    });
+
+    expect(result.errors).toHaveLength(0);
+    expect(result.outputFiles).toHaveLength(1);
+
+    // Verify the bundle contains the SDK code
+    const bundleContent = result.outputFiles[0].text;
+    expect(bundleContent).toBeTruthy();
+    expect(bundleContent.length).toBeGreaterThan(1000); // Should be substantial
+  });
+
+  it("should handle tree-shaking correctly", async () => {
+    // Import only specific functions to test tree-shaking
+    const entryContent = `
+      import { task } from "@trigger.dev/sdk";
+
+      export const myTask = task({
+        id: "tree-shake-task",
+        run: async () => ({ done: true }),
+      });
+    `;
+
+    const result = await esbuild.build({
+      stdin: {
+        contents: entryContent,
+        loader: "ts",
+        resolveDir: resolve(__dirname, "../../"),
+      },
+      bundle: true,
+      format: "esm",
+      platform: "node",
+      target: "node18",
+      write: false,
+      treeShaking: true,
+      logLevel: "silent",
+    });
+
+    expect(result.errors).toHaveLength(0);
+    expect(result.outputFiles).toHaveLength(1);
+  });
+});
diff --git a/internal-packages/sdk-compat-tests/src/tests/import.test.ts b/internal-packages/sdk-compat-tests/src/tests/import.test.ts
new file mode 100644
index 00000000000..7d81ccce259
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/src/tests/import.test.ts
@@ -0,0 +1,84 @@
+/**
+ * Import Validation Tests
+ *
+ * These tests validate that the SDK can be imported correctly across
+ * different module systems (ESM and CJS).
+ */
+
+import { describe, it, expect, beforeAll } from "vitest";
+import { execa, type Options as ExecaOptions } from "execa";
+import { resolve, dirname } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const fixturesDir = resolve(__dirname, "../fixtures");
+
+// Find the SDK package in the monorepo
+const sdkDir = resolve(__dirname, "../../../../packages/trigger-sdk");
+
+// Common execa options
+const execaOpts: ExecaOptions = {
+  env: {
+    ...process.env,
+    // Ensure Node.js can resolve workspace packages
+    NODE_PATH: resolve(__dirname, "../../../../node_modules"),
+  },
+  timeout: 30_000,
+};
+
+describe("ESM Import Tests", () => {
+  it("should import SDK using ESM syntax", async () => {
+    const result = await execa("node", ["test.mjs"], {
+      ...execaOpts,
+      cwd: resolve(fixturesDir, "esm-import"),
+    });
+
+    expect(result.stdout).toContain("SUCCESS");
+    expect(result.exitCode).toBe(0);
+  });
+
+  it("should validate superjson serialization in ESM", async () => {
+    const result = await execa("node", ["superjson-test.mjs"], {
+      ...execaOpts,
+      cwd: resolve(fixturesDir, "esm-import"),
+    });
+
+    expect(result.stdout).toContain("SUCCESS");
+    expect(result.exitCode).toBe(0);
+  });
+});
+
+describe("CJS Require Tests", () => {
+  it("should require SDK using CommonJS syntax", async () => {
+    const result = await execa("node", ["test.cjs"], {
+      ...execaOpts,
+      cwd: resolve(fixturesDir, "cjs-require"),
+    });
+
+    expect(result.stdout).toContain("SUCCESS");
+    expect(result.exitCode).toBe(0);
+  });
+
+  it("should work with --experimental-require-module flag on older Node", async () => {
+    // This flag is needed for Node < 22.12.0 to require ESM modules
+    // On newer Node.js, it's a no-op
+    const result = await execa("node", ["--experimental-require-module", "test.cjs"], {
+      ...execaOpts,
+      cwd: resolve(fixturesDir, "cjs-require"),
+    });
+
+    expect(result.stdout).toContain("SUCCESS");
+    expect(result.exitCode).toBe(0);
+  });
+});
+
+describe("TypeScript Compilation Tests", () => {
+  it("should typecheck SDK imports successfully", async () => {
+    const result = await execa("npx", ["tsc", "--noEmit"], {
+      ...execaOpts,
+      cwd: resolve(fixturesDir, "typescript"),
+    });
+
+    expect(result.exitCode).toBe(0);
+  });
+});
diff --git a/internal-packages/sdk-compat-tests/tsconfig.json b/internal-packages/sdk-compat-tests/tsconfig.json
new file mode 100644
index 00000000000..05afb6f355a
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "declaration": false,
+    "outDir": "dist",
+    "rootDir": "src",
+    "types": ["vitest/globals"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules", "dist", "src/fixtures"]
+}
diff --git a/internal-packages/sdk-compat-tests/vitest.config.ts b/internal-packages/sdk-compat-tests/vitest.config.ts
new file mode 100644
index 00000000000..2617dd10185
--- /dev/null
+++ b/internal-packages/sdk-compat-tests/vitest.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["src/tests/**/*.test.ts"],
+    globals: true,
+    isolate: true,
+    testTimeout: 120_000, // Some framework builds can take time
+    hookTimeout: 60_000,
+  },
+});
diff --git a/internal-packages/testcontainers/src/utils.ts b/internal-packages/testcontainers/src/utils.ts
index fd3077d163b..11bedef1fdd 100644
--- a/internal-packages/testcontainers/src/utils.ts
+++ b/internal-packages/testcontainers/src/utils.ts
@@ -154,7 +154,7 @@ export async function createElectricContainer(
   )}:5432/${postgresContainer.getDatabase()}?sslmode=disable`;
 
   const container = await new GenericContainer(
-    "electricsql/electric:1.0.13@sha256:4e69c4a6ec3e976efbdd8b7e6de427e771aeacdbc0c8c7ca22eb0ca6ab1611ff"
+    "electricsql/electric:1.2.4@sha256:20da3d0b0e74926c5623392db67fd56698b9e374c4aeb6cb5cadeb8fea171c36"
   )
     .withExposedPorts(3000)
     .withNetwork(network)
diff --git a/internal-packages/tracing/src/index.ts b/internal-packages/tracing/src/index.ts
index 8d01bdaed5c..d6795091886 100644
--- a/internal-packages/tracing/src/index.ts
+++ b/internal-packages/tracing/src/index.ts
@@ -25,7 +25,16 @@ export type {
   ObservableResult,
 } from "@opentelemetry/api";
 
-import { trace, context, propagation, SpanKind, metrics, ValueType } from "@opentelemetry/api";
+import {
+  trace,
+  context,
+  propagation,
+  SpanKind,
+  metrics,
+  ValueType,
+  ROOT_CONTEXT,
+} from "@opentelemetry/api";
+import type { Context } from "@opentelemetry/api";
 export {
   trace,
   context,
@@ -36,6 +45,8 @@ export {
   SpanStatusCode,
   metrics,
   ValueType,
+  ROOT_CONTEXT,
+  type Context,
 };
 
 export function getTracer(name: string): Tracer {
diff --git a/internal-packages/tsql/.gitignore b/internal-packages/tsql/.gitignore
new file mode 100644
index 00000000000..05262c5eda7
--- /dev/null
+++ b/internal-packages/tsql/.gitignore
@@ -0,0 +1,3 @@
+# ANTLR intermediate build files
+src/grammar/.antlr/
+
diff --git a/internal-packages/tsql/NOTICE.md b/internal-packages/tsql/NOTICE.md
new file mode 100644
index 00000000000..efb4563d7b8
--- /dev/null
+++ b/internal-packages/tsql/NOTICE.md
@@ -0,0 +1,22 @@
+Portions of this package are derived from PostHog (MIT License).
+Copyright (c) 2020-2025 PostHog Inc.
+
+The original license is reproduced below:
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+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.
diff --git a/internal-packages/tsql/README.md b/internal-packages/tsql/README.md
new file mode 100644
index 00000000000..2e4992c6cb2
--- /dev/null
+++ b/internal-packages/tsql/README.md
@@ -0,0 +1,19 @@
+# TSQL (TriggerSQL)
+
+TriggerSQL is a DSL that is safely converted into ClickHouse SQL queries with protection against SQL injection and it's tenant-safe (users can only query their own data).
+
+## Attribution
+
+This package is derived from [PostHog's HogQL](https://github.com/PostHog/posthog/tree/master/posthog/hogql) (MIT License). See [NOTICE.md](./NOTICE.md) for the full copyright notice.
+
+## ANTLR Grammar
+
+The ANTLR grammar is heavily inspired by PostHog's HogQL.
+
+These are found in [./src/grammar](./src/grammar) and are the `.g4` files.
+
+## Generating the source code
+
+```sh
+pnpm run grammar:build
+```
diff --git a/internal-packages/tsql/package.json b/internal-packages/tsql/package.json
new file mode 100644
index 00000000000..0cac36e7b27
--- /dev/null
+++ b/internal-packages/tsql/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@internal/tsql",
+  "private": true,
+  "version": "0.0.1",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
+  "type": "module",
+  "dependencies": {
+    "@trigger.dev/core": "workspace:*",
+    "antlr4ts": "0.5.0-alpha.4",
+    "zod": "3.25.76"
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "grammar:build": "pnpm grammar:build:typescript",
+    "grammar:build:typescript": "cat src/grammar/TSQLLexer.typescript.g4 > src/grammar/TSQLLexer.g4 && tail -n +2 src/grammar/TSQLLexer.common.g4 |sed s/isOpeningTag/self.isOpeningTag/ >> src/grammar/TSQLLexer.g4 && antlr4ts src/grammar/TSQLLexer.g4 && rm src/grammar/TSQLLexer.g4 && antlr4ts -visitor -no-listener -Dlanguage=TypeScript src/grammar/TSQLParser.g4",
+    "test": "vitest --sequence.concurrent=false --no-file-parallelism",
+    "test:coverage": "vitest --sequence.concurrent=false --no-file-parallelism --coverage.enabled"
+  },
+  "devDependencies": {
+    "antlr4ts-cli": "0.5.0-alpha.4"
+  }
+}
diff --git a/internal-packages/tsql/src/grammar/TSQLLexer.common.g4 b/internal-packages/tsql/src/grammar/TSQLLexer.common.g4
new file mode 100644
index 00000000000..7988b54eba5
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLLexer.common.g4
@@ -0,0 +1,288 @@
+lexer grammar TSQLLexer;
+
+// NB! We cat TSQLLexter.typescript.g4 when generating the grammar.
+
+// NOTE: don't forget to add new keywords to the parser rule "keyword"!
+
+// Keywords
+
+ALL: A L L;
+AND: A N D;
+ANTI: A N T I;
+ANY: A N Y;
+ARRAY: A R R A Y;
+AS: A S;
+ASCENDING: A S C | A S C E N D I N G;
+ASOF: A S O F;
+BETWEEN: B E T W E E N;
+BOTH: B O T H;
+BY: B Y;
+CASE: C A S E;
+CAST: C A S T;
+CATCH: C A T C H;
+COHORT: C O H O R T;
+COLLATE: C O L L A T E;
+CROSS: C R O S S;
+CUBE: C U B E;
+CURRENT: C U R R E N T;
+DATE: D A T E;
+DAY: D A Y;
+DESC: D E S C;
+DESCENDING: D E S C E N D I N G;
+DISTINCT: D I S T I N C T;
+ELSE: E L S E;
+END: E N D;
+EXCEPT: E X C E P T;
+EXTRACT: E X T R A C T;
+FINAL: F I N A L;
+FINALLY: F I N A L L Y;
+FIRST: F I R S T;
+FN: F N;
+FOLLOWING: F O L L O W I N G;
+FOR: F O R;
+FROM: F R O M;
+FULL: F U L L;
+FUN: F U N;
+GROUP: G R O U P;
+HAVING: H A V I N G;
+HOUR: H O U R;
+ID: I D;
+IF: I F;
+ILIKE: I L I K E;
+IN: I N;
+INF: I N F | I N F I N I T Y;
+INNER: I N N E R;
+INTERSECT: I N T E R S E C T;
+INTERVAL: I N T E R V A L;
+IS: I S;
+JOIN: J O I N;
+KEY: K E Y;
+LAST: L A S T;
+LEADING: L E A D I N G;
+LEFT: L E F T;
+LET: L E T;
+LIKE: L I K E;
+LIMIT: L I M I T;
+MINUTE: M I N U T E;
+MONTH: M O N T H;
+NAN_SQL: N A N; // conflicts with macro NAN
+NOT: N O T;
+NULL_SQL: N U L L; // conflicts with macro NULL
+NULLS: N U L L S;
+OFFSET: O F F S E T;
+ON: O N;
+OR: O R;
+ORDER: O R D E R;
+OUTER: O U T E R;
+OVER: O V E R;
+PARTITION: P A R T I T I O N;
+PRECEDING: P R E C E D I N G;
+PREWHERE: P R E W H E R E;
+QUARTER: Q U A R T E R;
+RANGE: R A N G E;
+RETURN: R E T U R N;
+RIGHT: R I G H T;
+ROLLUP: R O L L U P;
+ROW: R O W;
+ROWS: R O W S;
+SAMPLE: S A M P L E;
+SECOND: S E C O N D;
+SELECT: S E L E C T;
+SEMI: S E M I;
+SETTINGS: S E T T I N G S;
+SUBSTRING: S U B S T R I N G;
+THEN: T H E N;
+THROW: T H R O W;
+TIES: T I E S;
+TIMESTAMP: T I M E S T A M P;
+TO: T O;
+TOP: T O P;
+TOTALS: T O T A L S;
+TRAILING: T R A I L I N G;
+TRIM: T R I M;
+TRUNCATE: T R U N C A T E;
+TRY: T R Y;
+UNBOUNDED: U N B O U N D E D;
+UNION: U N I O N;
+USING: U S I N G;
+WEEK: W E E K;
+WHEN: W H E N;
+WHERE: W H E R E;
+WHILE: W H I L E;
+WINDOW: W I N D O W;
+WITH: W I T H;
+YEAR: Y E A R | Y Y Y Y;
+
+// Tokens
+
+// copied from clickhouse_driver/util/escape.py
+ESCAPE_CHAR_COMMON
+    : BACKSLASH B
+    | BACKSLASH F
+    | BACKSLASH R
+    | BACKSLASH N
+    | BACKSLASH T
+    | BACKSLASH '0'
+    | BACKSLASH A
+    | BACKSLASH V
+    | BACKSLASH BACKSLASH;
+
+IDENTIFIER
+    : (LETTER | UNDERSCORE | DOLLAR) (LETTER | UNDERSCORE | DEC_DIGIT | DOLLAR)*
+    | BACKQUOTE ( ~([\\`]) | ESCAPE_CHAR_COMMON | BACKSLASH QUOTE_SINGLE | (BACKQUOTE BACKQUOTE) )* BACKQUOTE
+    | QUOTE_DOUBLE ( ~([\\"]) | ESCAPE_CHAR_COMMON | BACKSLASH QUOTE_DOUBLE | (QUOTE_DOUBLE QUOTE_DOUBLE) )* QUOTE_DOUBLE
+    ;
+FLOATING_LITERAL
+    : HEXADECIMAL_LITERAL DOT HEX_DIGIT* (P | E) (PLUS | DASH)? DEC_DIGIT+
+    | HEXADECIMAL_LITERAL (P | E) (PLUS | DASH)? DEC_DIGIT+
+    | DECIMAL_LITERAL DOT DEC_DIGIT* E (PLUS | DASH)? DEC_DIGIT+
+    | DOT DECIMAL_LITERAL E (PLUS | DASH)? DEC_DIGIT+
+    | DECIMAL_LITERAL E (PLUS | DASH)? DEC_DIGIT+
+    ;
+OCTAL_LITERAL: '0' OCT_DIGIT+;
+DECIMAL_LITERAL: DEC_DIGIT+;
+HEXADECIMAL_LITERAL: '0' X HEX_DIGIT+;
+
+// It's important that quote-symbol is a single character.
+STRING_LITERAL: QUOTE_SINGLE ( ~([\\']) | ESCAPE_CHAR_COMMON | BACKSLASH QUOTE_SINGLE | (QUOTE_SINGLE QUOTE_SINGLE) )* QUOTE_SINGLE;
+
+
+// Alphabet and allowed symbols
+
+fragment A: [aA];
+fragment B: [bB];
+fragment C: [cC];
+fragment D: [dD];
+fragment E: [eE];
+fragment F: [fF];
+fragment G: [gG];
+fragment H: [hH];
+fragment I: [iI];
+fragment J: [jJ];
+fragment K: [kK];
+fragment L: [lL];
+fragment M: [mM];
+fragment N: [nN];
+fragment O: [oO];
+fragment P: [pP];
+fragment Q: [qQ];
+fragment R: [rR];
+fragment S: [sS];
+fragment T: [tT];
+fragment U: [uU];
+fragment V: [vV];
+fragment W: [wW];
+fragment X: [xX];
+fragment Y: [yY];
+fragment Z: [zZ];
+
+fragment LETTER: [a-zA-Z];
+fragment OCT_DIGIT: [0-7];
+fragment DEC_DIGIT: [0-9];
+fragment HEX_DIGIT: [0-9a-fA-F];
+
+ARROW: '->';
+ASTERISK: '*';
+BACKQUOTE: '`';
+BACKSLASH: '\\';
+COLON: ':';
+COMMA: ',';
+CONCAT: '||';
+DASH: '-';
+DOLLAR: '$';
+DOT: '.';
+EQ_DOUBLE: '==';
+EQ_SINGLE: '=';
+GT_EQ: '>=';
+GT: '>';
+HASH: '#';
+IREGEX_SINGLE: '~*';
+IREGEX_DOUBLE: '=~*';
+LBRACE: '{' -> pushMode(DEFAULT_MODE);
+LBRACKET: '[';
+LPAREN: '(';
+LT_EQ: '<=';
+TAG_LT_SLASH: '</' -> type(LT_SLASH), pushMode(TSQLX_TAG_CLOSE);
+TAG_LT_OPEN: '<' {isOpeningTag()}? -> type(LT), pushMode(TSQLX_TAG_OPEN);
+LT: '<';
+LT_SLASH: '</';
+NOT_EQ: '!=' | '<>';
+NOT_IREGEX: '!~*';
+NOT_REGEX: '!~';
+NULL_PROPERTY: '?.';
+NULLISH: '??';
+PERCENT: '%';
+PLUS: '+';
+QUERY: '?';
+QUOTE_DOUBLE: '"';
+QUOTE_SINGLE_TEMPLATE: 'f\'' -> pushMode(IN_TEMPLATE_STRING); // start of regular f'' template strings
+QUOTE_SINGLE_TEMPLATE_FULL: 'F\'' -> pushMode(IN_FULL_TEMPLATE_STRING); // magic F' symbol used to parse "full text" templates
+QUOTE_SINGLE: '\'';
+REGEX_SINGLE: '~';
+REGEX_DOUBLE: '=~';
+RBRACE: '}' -> popMode;
+RBRACKET: ']';
+RPAREN: ')';
+SEMICOLON: ';';
+SLASH: '/';
+SLASH_GT: '/>';
+UNDERSCORE: '_';
+
+// Comments and whitespace
+MULTI_LINE_COMMENT: '/*' .*? '*/' -> skip;
+SINGLE_LINE_COMMENT: ('--' | '//') ~('\n'|'\r')* ('\n' | '\r' | EOF) -> skip;
+// whitespace is hidden and not skipped so that it's preserved in ANTLR errors like "no viable alternative"
+WHITESPACE: [ \u000B\u000C\t\r\n] -> channel(HIDDEN);
+
+// ───────── f' TEMPLATE STRING MODE ─────────
+mode IN_TEMPLATE_STRING;
+STRING_TEXT: ((~([\\'{])) | ESCAPE_CHAR_COMMON | BACKSLASH QUOTE_SINGLE | (BACKSLASH LBRACE) | (QUOTE_SINGLE QUOTE_SINGLE))+;
+STRING_ESCAPE_TRIGGER: LBRACE -> pushMode(DEFAULT_MODE);
+STRING_QUOTE_SINGLE: QUOTE_SINGLE -> type(QUOTE_SINGLE), popMode;
+
+// ───────── F' FULL TEMPLATE STRING MODE ─────────
+// a magic F' takes us to "full template strings" mode, where we don't need to escape single quotes and parse until EOF
+// this can't be used within a normal columnExpr, but has to be parsed for separately
+mode IN_FULL_TEMPLATE_STRING;
+FULL_STRING_TEXT: ((~([{])) | ESCAPE_CHAR_COMMON | (BACKSLASH LBRACE))+;
+FULL_STRING_ESCAPE_TRIGGER: LBRACE -> pushMode(DEFAULT_MODE);
+
+// ───────── TSQLX TAG MODE for opening/self-closing tags ─────────
+mode TSQLX_TAG_OPEN;
+
+TAG_SELF_CLOSE_GT : '/>' -> type(SLASH_GT), popMode;   // <tag …/>
+TAG_OPEN_GT       :  '>' -> type(GT), popMode, pushMode(TSQLX_TEXT);   // <tag …>
+
+// minimal token set; map everything back to the default token types
+TAG_IDENT   : [a-zA-Z_][a-zA-Z0-9_-]* -> type(IDENTIFIER);
+TAG_EQ      : '='                     -> type(EQ_SINGLE);
+TAG_STRING  : STRING_LITERAL          -> type(STRING_LITERAL);
+TAG_WS      : [ \t\r\n]+              -> channel(HIDDEN);
+TAG_LBRACE  : '{'                     -> type(LBRACE), pushMode(DEFAULT_MODE);
+
+
+// ───────── TSQLX TAG MODE for closing tags ─────────
+mode TSQLX_TAG_CLOSE;
+
+TAGC_GT     :  '>' -> type(GT), popMode;                // *** no TEXT push ***
+TAGC_IDENT  : [a-zA-Z_][a-zA-Z0-9_-]* -> type(IDENTIFIER);
+TAGC_WS     : [ \t\r\n]+              -> channel(HIDDEN);
+
+
+// ───────── TSQLX TEXT MODE ─────────
+mode TSQLX_TEXT;
+
+TSQLX_TEXT_TEXT
+    : ~[<{]+ ; // everything except “{” or “<”
+
+TSQLX_TEXT_LBRACE
+    : '{' -> type(LBRACE), pushMode(DEFAULT_MODE);
+
+TSQLX_TEXT_LT_SLASH
+    : '</' -> type(LT_SLASH), popMode, pushMode(TSQLX_TAG_CLOSE);
+
+TSQLX_TEXT_LT
+    : '<' -> type(LT), pushMode(TSQLX_TAG_OPEN);
+
+TSQLX_TEXT_WS
+    : [ \t\r\n]+ -> channel(HIDDEN);
diff --git a/internal-packages/tsql/src/grammar/TSQLLexer.interp b/internal-packages/tsql/src/grammar/TSQLLexer.interp
new file mode 100644
index 00000000000..21517b3322f
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLLexer.interp
@@ -0,0 +1,570 @@
+token literal names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+'->'
+'*'
+'`'
+'\\'
+':'
+','
+'||'
+'-'
+'$'
+'.'
+'=='
+null
+'>='
+null
+'#'
+'~*'
+'=~*'
+'{'
+'['
+'('
+'<='
+'<'
+'</'
+null
+'!~*'
+'!~'
+'?.'
+'??'
+'%'
+'+'
+'?'
+'"'
+'f\''
+'F\''
+'\''
+'~'
+'=~'
+'}'
+']'
+')'
+';'
+'/'
+null
+'_'
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+
+token symbolic names:
+null
+ALL
+AND
+ANTI
+ANY
+ARRAY
+AS
+ASCENDING
+ASOF
+BETWEEN
+BOTH
+BY
+CASE
+CAST
+CATCH
+COHORT
+COLLATE
+CROSS
+CUBE
+CURRENT
+DATE
+DAY
+DESC
+DESCENDING
+DISTINCT
+ELSE
+END
+EXCEPT
+EXTRACT
+FINAL
+FINALLY
+FIRST
+FN
+FOLLOWING
+FOR
+FROM
+FULL
+FUN
+GROUP
+HAVING
+HOUR
+ID
+IF
+ILIKE
+IN
+INF
+INNER
+INTERSECT
+INTERVAL
+IS
+JOIN
+KEY
+LAST
+LEADING
+LEFT
+LET
+LIKE
+LIMIT
+MINUTE
+MONTH
+NAN_SQL
+NOT
+NULL_SQL
+NULLS
+OFFSET
+ON
+OR
+ORDER
+OUTER
+OVER
+PARTITION
+PRECEDING
+PREWHERE
+QUARTER
+RANGE
+RETURN
+RIGHT
+ROLLUP
+ROW
+ROWS
+SAMPLE
+SECOND
+SELECT
+SEMI
+SETTINGS
+SUBSTRING
+THEN
+THROW
+TIES
+TIMESTAMP
+TO
+TOP
+TOTALS
+TRAILING
+TRIM
+TRUNCATE
+TRY
+UNBOUNDED
+UNION
+USING
+WEEK
+WHEN
+WHERE
+WHILE
+WINDOW
+WITH
+YEAR
+ESCAPE_CHAR_COMMON
+IDENTIFIER
+FLOATING_LITERAL
+OCTAL_LITERAL
+DECIMAL_LITERAL
+HEXADECIMAL_LITERAL
+STRING_LITERAL
+ARROW
+ASTERISK
+BACKQUOTE
+BACKSLASH
+COLON
+COMMA
+CONCAT
+DASH
+DOLLAR
+DOT
+EQ_DOUBLE
+EQ_SINGLE
+GT_EQ
+GT
+HASH
+IREGEX_SINGLE
+IREGEX_DOUBLE
+LBRACE
+LBRACKET
+LPAREN
+LT_EQ
+LT
+LT_SLASH
+NOT_EQ
+NOT_IREGEX
+NOT_REGEX
+NULL_PROPERTY
+NULLISH
+PERCENT
+PLUS
+QUERY
+QUOTE_DOUBLE
+QUOTE_SINGLE_TEMPLATE
+QUOTE_SINGLE_TEMPLATE_FULL
+QUOTE_SINGLE
+REGEX_SINGLE
+REGEX_DOUBLE
+RBRACE
+RBRACKET
+RPAREN
+SEMICOLON
+SLASH
+SLASH_GT
+UNDERSCORE
+MULTI_LINE_COMMENT
+SINGLE_LINE_COMMENT
+WHITESPACE
+STRING_TEXT
+STRING_ESCAPE_TRIGGER
+FULL_STRING_TEXT
+FULL_STRING_ESCAPE_TRIGGER
+TAG_WS
+TAGC_WS
+TSQLX_TEXT_TEXT
+TSQLX_TEXT_WS
+
+rule names:
+ALL
+AND
+ANTI
+ANY
+ARRAY
+AS
+ASCENDING
+ASOF
+BETWEEN
+BOTH
+BY
+CASE
+CAST
+CATCH
+COHORT
+COLLATE
+CROSS
+CUBE
+CURRENT
+DATE
+DAY
+DESC
+DESCENDING
+DISTINCT
+ELSE
+END
+EXCEPT
+EXTRACT
+FINAL
+FINALLY
+FIRST
+FN
+FOLLOWING
+FOR
+FROM
+FULL
+FUN
+GROUP
+HAVING
+HOUR
+ID
+IF
+ILIKE
+IN
+INF
+INNER
+INTERSECT
+INTERVAL
+IS
+JOIN
+KEY
+LAST
+LEADING
+LEFT
+LET
+LIKE
+LIMIT
+MINUTE
+MONTH
+NAN_SQL
+NOT
+NULL_SQL
+NULLS
+OFFSET
+ON
+OR
+ORDER
+OUTER
+OVER
+PARTITION
+PRECEDING
+PREWHERE
+QUARTER
+RANGE
+RETURN
+RIGHT
+ROLLUP
+ROW
+ROWS
+SAMPLE
+SECOND
+SELECT
+SEMI
+SETTINGS
+SUBSTRING
+THEN
+THROW
+TIES
+TIMESTAMP
+TO
+TOP
+TOTALS
+TRAILING
+TRIM
+TRUNCATE
+TRY
+UNBOUNDED
+UNION
+USING
+WEEK
+WHEN
+WHERE
+WHILE
+WINDOW
+WITH
+YEAR
+ESCAPE_CHAR_COMMON
+IDENTIFIER
+FLOATING_LITERAL
+OCTAL_LITERAL
+DECIMAL_LITERAL
+HEXADECIMAL_LITERAL
+STRING_LITERAL
+A
+B
+C
+D
+E
+F
+G
+H
+I
+J
+K
+L
+M
+N
+O
+P
+Q
+R
+S
+T
+U
+V
+W
+X
+Y
+Z
+LETTER
+OCT_DIGIT
+DEC_DIGIT
+HEX_DIGIT
+ARROW
+ASTERISK
+BACKQUOTE
+BACKSLASH
+COLON
+COMMA
+CONCAT
+DASH
+DOLLAR
+DOT
+EQ_DOUBLE
+EQ_SINGLE
+GT_EQ
+GT
+HASH
+IREGEX_SINGLE
+IREGEX_DOUBLE
+LBRACE
+LBRACKET
+LPAREN
+LT_EQ
+TAG_LT_SLASH
+TAG_LT_OPEN
+LT
+LT_SLASH
+NOT_EQ
+NOT_IREGEX
+NOT_REGEX
+NULL_PROPERTY
+NULLISH
+PERCENT
+PLUS
+QUERY
+QUOTE_DOUBLE
+QUOTE_SINGLE_TEMPLATE
+QUOTE_SINGLE_TEMPLATE_FULL
+QUOTE_SINGLE
+REGEX_SINGLE
+REGEX_DOUBLE
+RBRACE
+RBRACKET
+RPAREN
+SEMICOLON
+SLASH
+SLASH_GT
+UNDERSCORE
+MULTI_LINE_COMMENT
+SINGLE_LINE_COMMENT
+WHITESPACE
+STRING_TEXT
+STRING_ESCAPE_TRIGGER
+STRING_QUOTE_SINGLE
+FULL_STRING_TEXT
+FULL_STRING_ESCAPE_TRIGGER
+TAG_SELF_CLOSE_GT
+TAG_OPEN_GT
+TAG_IDENT
+TAG_EQ
+TAG_STRING
+TAG_WS
+TAG_LBRACE
+TAGC_GT
+TAGC_IDENT
+TAGC_WS
+TSQLX_TEXT_TEXT
+TSQLX_TEXT_LBRACE
+TSQLX_TEXT_LT_SLASH
+TSQLX_TEXT_LT
+TSQLX_TEXT_WS
+
+channel names:
+DEFAULT_TOKEN_CHANNEL
+HIDDEN
+
+mode names:
+DEFAULT_MODE
+IN_TEMPLATE_STRING
+IN_FULL_TEMPLATE_STRING
+TSQLX_TAG_OPEN
+TSQLX_TAG_CLOSE
+TSQLX_TEXT
+
+atn:
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 2, 170, 1628, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 4, 77, 9, 77, 4, 78, 9, 78, 4, 79, 9, 79, 4, 80, 9, 80, 4, 81, 9, 81, 4, 82, 9, 82, 4, 83, 9, 83, 4, 84, 9, 84, 4, 85, 9, 85, 4, 86, 9, 86, 4, 87, 9, 87, 4, 88, 9, 88, 4, 89, 9, 89, 4, 90, 9, 90, 4, 91, 9, 91, 4, 92, 9, 92, 4, 93, 9, 93, 4, 94, 9, 94, 4, 95, 9, 95, 4, 96, 9, 96, 4, 97, 9, 97, 4, 98, 9, 98, 4, 99, 9, 99, 4, 100, 9, 100, 4, 101, 9, 101, 4, 102, 9, 102, 4, 103, 9, 103, 4, 104, 9, 104, 4, 105, 9, 105, 4, 106, 9, 106, 4, 107, 9, 107, 4, 108, 9, 108, 4, 109, 9, 109, 4, 110, 9, 110, 4, 111, 9, 111, 4, 112, 9, 112, 4, 113, 9, 113, 4, 114, 9, 114, 4, 115, 9, 115, 4, 116, 9, 116, 4, 117, 9, 117, 4, 118, 9, 118, 4, 119, 9, 119, 4, 120, 9, 120, 4, 121, 9, 121, 4, 122, 9, 122, 4, 123, 9, 123, 4, 124, 9, 124, 4, 125, 9, 125, 4, 126, 9, 126, 4, 127, 9, 127, 4, 128, 9, 128, 4, 129, 9, 129, 4, 130, 9, 130, 4, 131, 9, 131, 4, 132, 9, 132, 4, 133, 9, 133, 4, 134, 9, 134, 4, 135, 9, 135, 4, 136, 9, 136, 4, 137, 9, 137, 4, 138, 9, 138, 4, 139, 9, 139, 4, 140, 9, 140, 4, 141, 9, 141, 4, 142, 9, 142, 4, 143, 9, 143, 4, 144, 9, 144, 4, 145, 9, 145, 4, 146, 9, 146, 4, 147, 9, 147, 4, 148, 9, 148, 4, 149, 9, 149, 4, 150, 9, 150, 4, 151, 9, 151, 4, 152, 9, 152, 4, 153, 9, 153, 4, 154, 9, 154, 4, 155, 9, 155, 4, 156, 9, 156, 4, 157, 9, 157, 4, 158, 9, 158, 4, 159, 9, 159, 4, 160, 9, 160, 4, 161, 9, 161, 4, 162, 9, 162, 4, 163, 9, 163, 4, 164, 9, 164, 4, 165, 9, 165, 4, 166, 9, 166, 4, 167, 9, 167, 4, 168, 9, 168, 4, 169, 9, 169, 4, 170, 9, 170, 4, 171, 9, 171, 4, 172, 9, 172, 4, 173, 9, 173, 4, 174, 9, 174, 4, 175, 9, 175, 4, 176, 9, 176, 4, 177, 9, 177, 4, 178, 9, 178, 4, 179, 9, 179, 4, 180, 9, 180, 4, 181, 9, 181, 4, 182, 9, 182, 4, 183, 9, 183, 4, 184, 9, 184, 4, 185, 9, 185, 4, 186, 9, 186, 4, 187, 9, 187, 4, 188, 9, 188, 4, 189, 9, 189, 4, 190, 9, 190, 4, 191, 9, 191, 4, 192, 9, 192, 4, 193, 9, 193, 4, 194, 9, 194, 4, 195, 9, 195, 4, 196, 9, 196, 4, 197, 9, 197, 4, 198, 9, 198, 4, 199, 9, 199, 4, 200, 9, 200, 4, 201, 9, 201, 4, 202, 9, 202, 4, 203, 9, 203, 4, 204, 9, 204, 4, 205, 9, 205, 4, 206, 9, 206, 4, 207, 9, 207, 4, 208, 9, 208, 4, 209, 9, 209, 4, 210, 9, 210, 4, 211, 9, 211, 4, 212, 9, 212, 4, 213, 9, 213, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 5, 8, 473, 10, 8, 3, 9, 3, 9, 3, 9, 3, 9, 3, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 3, 11, 3, 12, 3, 12, 3, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 3, 22, 3, 23, 3, 23, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 3, 26, 3, 26, 3, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 29, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 30, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 40, 3, 41, 3, 41, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 44, 3, 45, 3, 45, 3, 45, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 5, 46, 701, 10, 46, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 47, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 48, 3, 49, 3, 49, 3, 49, 3, 49, 3, 49, 3, 49, 3, 49, 3, 49, 3, 49, 3, 50, 3, 50, 3, 50, 3, 51, 3, 51, 3, 51, 3, 51, 3, 51, 3, 52, 3, 52, 3, 52, 3, 52, 3, 53, 3, 53, 3, 53, 3, 53, 3, 53, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 62, 3, 62, 3, 62, 3, 62, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 66, 3, 66, 3, 66, 3, 67, 3, 67, 3, 67, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 70, 3, 70, 3, 70, 3, 70, 3, 70, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 71, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 73, 3, 73, 3, 73, 3, 73, 3, 73, 3, 73, 3, 73, 3, 73, 3, 73, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 3, 75, 3, 75, 3, 75, 3, 76, 3, 76, 3, 76, 3, 76, 3, 76, 3, 76, 3, 76, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 79, 3, 79, 3, 79, 3, 79, 3, 80, 3, 80, 3, 80, 3, 80, 3, 80, 3, 81, 3, 81, 3, 81, 3, 81, 3, 81, 3, 81, 3, 81, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 82, 3, 83, 3, 83, 3, 83, 3, 83, 3, 83, 3, 83, 3, 83, 3, 84, 3, 84, 3, 84, 3, 84, 3, 84, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 85, 3, 86, 3, 86, 3, 86, 3, 86, 3, 86, 3, 86, 3, 86, 3, 86, 3, 86, 3, 86, 3, 87, 3, 87, 3, 87, 3, 87, 3, 87, 3, 88, 3, 88, 3, 88, 3, 88, 3, 88, 3, 88, 3, 89, 3, 89, 3, 89, 3, 89, 3, 89, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 90, 3, 91, 3, 91, 3, 91, 3, 92, 3, 92, 3, 92, 3, 92, 3, 93, 3, 93, 3, 93, 3, 93, 3, 93, 3, 93, 3, 93, 3, 94, 3, 94, 3, 94, 3, 94, 3, 94, 3, 94, 3, 94, 3, 94, 3, 94, 3, 95, 3, 95, 3, 95, 3, 95, 3, 95, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 96, 3, 97, 3, 97, 3, 97, 3, 97, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 98, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 99, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 100, 3, 101, 3, 101, 3, 101, 3, 101, 3, 101, 3, 102, 3, 102, 3, 102, 3, 102, 3, 102, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 103, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 3, 104, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 105, 3, 106, 3, 106, 3, 106, 3, 106, 3, 106, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 3, 107, 5, 107, 1085, 10, 107, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 3, 108, 5, 108, 1114, 10, 108, 3, 109, 3, 109, 3, 109, 5, 109, 1119, 10, 109, 3, 109, 3, 109, 3, 109, 3, 109, 7, 109, 1125, 10, 109, 12, 109, 14, 109, 1128, 11, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 7, 109, 1139, 10, 109, 12, 109, 14, 109, 1142, 11, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 3, 109, 7, 109, 1155, 10, 109, 12, 109, 14, 109, 1158, 11, 109, 3, 109, 3, 109, 5, 109, 1162, 10, 109, 3, 110, 3, 110, 3, 110, 7, 110, 1167, 10, 110, 12, 110, 14, 110, 1170, 11, 110, 3, 110, 3, 110, 5, 110, 1174, 10, 110, 3, 110, 3, 110, 5, 110, 1178, 10, 110, 3, 110, 6, 110, 1181, 10, 110, 13, 110, 14, 110, 1182, 3, 110, 3, 110, 3, 110, 5, 110, 1188, 10, 110, 3, 110, 3, 110, 5, 110, 1192, 10, 110, 3, 110, 6, 110, 1195, 10, 110, 13, 110, 14, 110, 1196, 3, 110, 3, 110, 3, 110, 7, 110, 1202, 10, 110, 12, 110, 14, 110, 1205, 11, 110, 3, 110, 3, 110, 3, 110, 5, 110, 1210, 10, 110, 3, 110, 6, 110, 1213, 10, 110, 13, 110, 14, 110, 1214, 3, 110, 3, 110, 3, 110, 3, 110, 3, 110, 5, 110, 1222, 10, 110, 3, 110, 6, 110, 1225, 10, 110, 13, 110, 14, 110, 1226, 3, 110, 3, 110, 3, 110, 3, 110, 5, 110, 1233, 10, 110, 3, 110, 6, 110, 1236, 10, 110, 13, 110, 14, 110, 1237, 5, 110, 1240, 10, 110, 3, 111, 3, 111, 6, 111, 1244, 10, 111, 13, 111, 14, 111, 1245, 3, 112, 6, 112, 1249, 10, 112, 13, 112, 14, 112, 1250, 3, 113, 3, 113, 3, 113, 6, 113, 1256, 10, 113, 13, 113, 14, 113, 1257, 3, 114, 3, 114, 3, 114, 3, 114, 3, 114, 3, 114, 3, 114, 3, 114, 3, 114, 7, 114, 1269, 10, 114, 12, 114, 14, 114, 1272, 11, 114, 3, 114, 3, 114, 3, 115, 3, 115, 3, 116, 3, 116, 3, 117, 3, 117, 3, 118, 3, 118, 3, 119, 3, 119, 3, 120, 3, 120, 3, 121, 3, 121, 3, 122, 3, 122, 3, 123, 3, 123, 3, 124, 3, 124, 3, 125, 3, 125, 3, 126, 3, 126, 3, 127, 3, 127, 3, 128, 3, 128, 3, 129, 3, 129, 3, 130, 3, 130, 3, 131, 3, 131, 3, 132, 3, 132, 3, 133, 3, 133, 3, 134, 3, 134, 3, 135, 3, 135, 3, 136, 3, 136, 3, 137, 3, 137, 3, 138, 3, 138, 3, 139, 3, 139, 3, 140, 3, 140, 3, 141, 3, 141, 3, 142, 3, 142, 3, 143, 3, 143, 3, 144, 3, 144, 3, 145, 3, 145, 3, 145, 3, 146, 3, 146, 3, 147, 3, 147, 3, 148, 3, 148, 3, 149, 3, 149, 3, 150, 3, 150, 3, 151, 3, 151, 3, 151, 3, 152, 3, 152, 3, 153, 3, 153, 3, 154, 3, 154, 3, 155, 3, 155, 3, 155, 3, 156, 3, 156, 3, 157, 3, 157, 3, 157, 3, 158, 3, 158, 3, 159, 3, 159, 3, 160, 3, 160, 3, 160, 3, 161, 3, 161, 3, 161, 3, 161, 3, 162, 3, 162, 3, 162, 3, 162, 3, 163, 3, 163, 3, 164, 3, 164, 3, 165, 3, 165, 3, 165, 3, 166, 3, 166, 3, 166, 3, 166, 3, 166, 3, 166, 3, 167, 3, 167, 3, 167, 3, 167, 3, 167, 3, 167, 3, 168, 3, 168, 3, 169, 3, 169, 3, 169, 3, 170, 3, 170, 3, 170, 3, 170, 5, 170, 1409, 10, 170, 3, 171, 3, 171, 3, 171, 3, 171, 3, 172, 3, 172, 3, 172, 3, 173, 3, 173, 3, 173, 3, 174, 3, 174, 3, 174, 3, 175, 3, 175, 3, 176, 3, 176, 3, 177, 3, 177, 3, 178, 3, 178, 3, 179, 3, 179, 3, 179, 3, 179, 3, 179, 3, 180, 3, 180, 3, 180, 3, 180, 3, 180, 3, 181, 3, 181, 3, 182, 3, 182, 3, 183, 3, 183, 3, 183, 3, 184, 3, 184, 3, 184, 3, 184, 3, 185, 3, 185, 3, 186, 3, 186, 3, 187, 3, 187, 3, 188, 3, 188, 3, 189, 3, 189, 3, 189, 3, 190, 3, 190, 3, 191, 3, 191, 3, 191, 3, 191, 7, 191, 1470, 10, 191, 12, 191, 14, 191, 1473, 11, 191, 3, 191, 3, 191, 3, 191, 3, 191, 3, 191, 3, 192, 3, 192, 3, 192, 3, 192, 5, 192, 1484, 10, 192, 3, 192, 7, 192, 1487, 10, 192, 12, 192, 14, 192, 1490, 11, 192, 3, 192, 5, 192, 1493, 10, 192, 3, 192, 3, 192, 3, 193, 3, 193, 3, 193, 3, 193, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 3, 194, 6, 194, 1512, 10, 194, 13, 194, 14, 194, 1513, 3, 195, 3, 195, 3, 195, 3, 195, 3, 196, 3, 196, 3, 196, 3, 196, 3, 196, 3, 197, 3, 197, 3, 197, 3, 197, 3, 197, 6, 197, 1530, 10, 197, 13, 197, 14, 197, 1531, 3, 198, 3, 198, 3, 198, 3, 198, 3, 199, 3, 199, 3, 199, 3, 199, 3, 199, 3, 199, 3, 200, 3, 200, 3, 200, 3, 200, 3, 200, 3, 200, 3, 201, 3, 201, 7, 201, 1552, 10, 201, 12, 201, 14, 201, 1555, 11, 201, 3, 201, 3, 201, 3, 202, 3, 202, 3, 202, 3, 202, 3, 203, 3, 203, 3, 203, 3, 203, 3, 204, 6, 204, 1568, 10, 204, 13, 204, 14, 204, 1569, 3, 204, 3, 204, 3, 205, 3, 205, 3, 205, 3, 205, 3, 205, 3, 206, 3, 206, 3, 206, 3, 206, 3, 206, 3, 207, 3, 207, 7, 207, 1586, 10, 207, 12, 207, 14, 207, 1589, 11, 207, 3, 207, 3, 207, 3, 208, 6, 208, 1594, 10, 208, 13, 208, 14, 208, 1595, 3, 208, 3, 208, 3, 209, 6, 209, 1601, 10, 209, 13, 209, 14, 209, 1602, 3, 210, 3, 210, 3, 210, 3, 210, 3, 210, 3, 211, 3, 211, 3, 211, 3, 211, 3, 211, 3, 211, 3, 211, 3, 212, 3, 212, 3, 212, 3, 212, 3, 212, 3, 213, 6, 213, 1623, 10, 213, 13, 213, 14, 213, 1624, 3, 213, 3, 213, 3, 1471, 2, 2, 214, 8, 2, 3, 10, 2, 4, 12, 2, 5, 14, 2, 6, 16, 2, 7, 18, 2, 8, 20, 2, 9, 22, 2, 10, 24, 2, 11, 26, 2, 12, 28, 2, 13, 30, 2, 14, 32, 2, 15, 34, 2, 16, 36, 2, 17, 38, 2, 18, 40, 2, 19, 42, 2, 20, 44, 2, 21, 46, 2, 22, 48, 2, 23, 50, 2, 24, 52, 2, 25, 54, 2, 26, 56, 2, 27, 58, 2, 28, 60, 2, 29, 62, 2, 30, 64, 2, 31, 66, 2, 32, 68, 2, 33, 70, 2, 34, 72, 2, 35, 74, 2, 36, 76, 2, 37, 78, 2, 38, 80, 2, 39, 82, 2, 40, 84, 2, 41, 86, 2, 42, 88, 2, 43, 90, 2, 44, 92, 2, 45, 94, 2, 46, 96, 2, 47, 98, 2, 48, 100, 2, 49, 102, 2, 50, 104, 2, 51, 106, 2, 52, 108, 2, 53, 110, 2, 54, 112, 2, 55, 114, 2, 56, 116, 2, 57, 118, 2, 58, 120, 2, 59, 122, 2, 60, 124, 2, 61, 126, 2, 62, 128, 2, 63, 130, 2, 64, 132, 2, 65, 134, 2, 66, 136, 2, 67, 138, 2, 68, 140, 2, 69, 142, 2, 70, 144, 2, 71, 146, 2, 72, 148, 2, 73, 150, 2, 74, 152, 2, 75, 154, 2, 76, 156, 2, 77, 158, 2, 78, 160, 2, 79, 162, 2, 80, 164, 2, 81, 166, 2, 82, 168, 2, 83, 170, 2, 84, 172, 2, 85, 174, 2, 86, 176, 2, 87, 178, 2, 88, 180, 2, 89, 182, 2, 90, 184, 2, 91, 186, 2, 92, 188, 2, 93, 190, 2, 94, 192, 2, 95, 194, 2, 96, 196, 2, 97, 198, 2, 98, 200, 2, 99, 202, 2, 100, 204, 2, 101, 206, 2, 102, 208, 2, 103, 210, 2, 104, 212, 2, 105, 214, 2, 106, 216, 2, 107, 218, 2, 108, 220, 2, 109, 222, 2, 110, 224, 2, 111, 226, 2, 112, 228, 2, 113, 230, 2, 114, 232, 2, 115, 234, 2, 2, 236, 2, 2, 238, 2, 2, 240, 2, 2, 242, 2, 2, 244, 2, 2, 246, 2, 2, 248, 2, 2, 250, 2, 2, 252, 2, 2, 254, 2, 2, 256, 2, 2, 258, 2, 2, 260, 2, 2, 262, 2, 2, 264, 2, 2, 266, 2, 2, 268, 2, 2, 270, 2, 2, 272, 2, 2, 274, 2, 2, 276, 2, 2, 278, 2, 2, 280, 2, 2, 282, 2, 2, 284, 2, 2, 286, 2, 2, 288, 2, 2, 290, 2, 2, 292, 2, 2, 294, 2, 116, 296, 2, 117, 298, 2, 118, 300, 2, 119, 302, 2, 120, 304, 2, 121, 306, 2, 122, 308, 2, 123, 310, 2, 124, 312, 2, 125, 314, 2, 126, 316, 2, 127, 318, 2, 128, 320, 2, 129, 322, 2, 130, 324, 2, 131, 326, 2, 132, 328, 2, 133, 330, 2, 134, 332, 2, 135, 334, 2, 136, 336, 2, 2, 338, 2, 2, 340, 2, 137, 342, 2, 138, 344, 2, 139, 346, 2, 140, 348, 2, 141, 350, 2, 142, 352, 2, 143, 354, 2, 144, 356, 2, 145, 358, 2, 146, 360, 2, 147, 362, 2, 148, 364, 2, 149, 366, 2, 150, 368, 2, 151, 370, 2, 152, 372, 2, 153, 374, 2, 154, 376, 2, 155, 378, 2, 156, 380, 2, 157, 382, 2, 158, 384, 2, 159, 386, 2, 160, 388, 2, 161, 390, 2, 162, 392, 2, 163, 394, 2, 164, 396, 2, 2, 398, 2, 165, 400, 2, 166, 402, 2, 2, 404, 2, 2, 406, 2, 2, 408, 2, 2, 410, 2, 2, 412, 2, 167, 414, 2, 2, 416, 2, 2, 418, 2, 2, 420, 2, 168, 422, 2, 169, 424, 2, 2, 426, 2, 2, 428, 2, 2, 430, 2, 170, 8, 2, 3, 4, 5, 6, 7, 44, 4, 2, 94, 94, 98, 98, 4, 2, 36, 36, 94, 94, 4, 2, 41, 41, 94, 94, 4, 2, 67, 67, 99, 99, 4, 2, 68, 68, 100, 100, 4, 2, 69, 69, 101, 101, 4, 2, 70, 70, 102, 102, 4, 2, 71, 71, 103, 103, 4, 2, 72, 72, 104, 104, 4, 2, 73, 73, 105, 105, 4, 2, 74, 74, 106, 106, 4, 2, 75, 75, 107, 107, 4, 2, 76, 76, 108, 108, 4, 2, 77, 77, 109, 109, 4, 2, 78, 78, 110, 110, 4, 2, 79, 79, 111, 111, 4, 2, 80, 80, 112, 112, 4, 2, 81, 81, 113, 113, 4, 2, 82, 82, 114, 114, 4, 2, 83, 83, 115, 115, 4, 2, 84, 84, 116, 116, 4, 2, 85, 85, 117, 117, 4, 2, 86, 86, 118, 118, 4, 2, 87, 87, 119, 119, 4, 2, 88, 88, 120, 120, 4, 2, 89, 89, 121, 121, 4, 2, 90, 90, 122, 122, 4, 2, 91, 91, 123, 123, 4, 2, 92, 92, 124, 124, 4, 2, 67, 92, 99, 124, 3, 2, 50, 57, 3, 2, 50, 59, 5, 2, 50, 59, 67, 72, 99, 104, 4, 2, 12, 12, 15, 15, 4, 3, 12, 12, 15, 15, 4, 2, 11, 15, 34, 34, 5, 2, 41, 41, 94, 94, 125, 125, 3, 2, 125, 125, 5, 2, 67, 92, 97, 97, 99, 124, 7, 2, 47, 47, 50, 59, 67, 92, 97, 97, 99, 124, 5, 2, 11, 12, 15, 15, 34, 34, 4, 2, 62, 62, 125, 125, 2, 1667, 2, 8, 3, 2, 2, 2, 2, 10, 3, 2, 2, 2, 2, 12, 3, 2, 2, 2, 2, 14, 3, 2, 2, 2, 2, 16, 3, 2, 2, 2, 2, 18, 3, 2, 2, 2, 2, 20, 3, 2, 2, 2, 2, 22, 3, 2, 2, 2, 2, 24, 3, 2, 2, 2, 2, 26, 3, 2, 2, 2, 2, 28, 3, 2, 2, 2, 2, 30, 3, 2, 2, 2, 2, 32, 3, 2, 2, 2, 2, 34, 3, 2, 2, 2, 2, 36, 3, 2, 2, 2, 2, 38, 3, 2, 2, 2, 2, 40, 3, 2, 2, 2, 2, 42, 3, 2, 2, 2, 2, 44, 3, 2, 2, 2, 2, 46, 3, 2, 2, 2, 2, 48, 3, 2, 2, 2, 2, 50, 3, 2, 2, 2, 2, 52, 3, 2, 2, 2, 2, 54, 3, 2, 2, 2, 2, 56, 3, 2, 2, 2, 2, 58, 3, 2, 2, 2, 2, 60, 3, 2, 2, 2, 2, 62, 3, 2, 2, 2, 2, 64, 3, 2, 2, 2, 2, 66, 3, 2, 2, 2, 2, 68, 3, 2, 2, 2, 2, 70, 3, 2, 2, 2, 2, 72, 3, 2, 2, 2, 2, 74, 3, 2, 2, 2, 2, 76, 3, 2, 2, 2, 2, 78, 3, 2, 2, 2, 2, 80, 3, 2, 2, 2, 2, 82, 3, 2, 2, 2, 2, 84, 3, 2, 2, 2, 2, 86, 3, 2, 2, 2, 2, 88, 3, 2, 2, 2, 2, 90, 3, 2, 2, 2, 2, 92, 3, 2, 2, 2, 2, 94, 3, 2, 2, 2, 2, 96, 3, 2, 2, 2, 2, 98, 3, 2, 2, 2, 2, 100, 3, 2, 2, 2, 2, 102, 3, 2, 2, 2, 2, 104, 3, 2, 2, 2, 2, 106, 3, 2, 2, 2, 2, 108, 3, 2, 2, 2, 2, 110, 3, 2, 2, 2, 2, 112, 3, 2, 2, 2, 2, 114, 3, 2, 2, 2, 2, 116, 3, 2, 2, 2, 2, 118, 3, 2, 2, 2, 2, 120, 3, 2, 2, 2, 2, 122, 3, 2, 2, 2, 2, 124, 3, 2, 2, 2, 2, 126, 3, 2, 2, 2, 2, 128, 3, 2, 2, 2, 2, 130, 3, 2, 2, 2, 2, 132, 3, 2, 2, 2, 2, 134, 3, 2, 2, 2, 2, 136, 3, 2, 2, 2, 2, 138, 3, 2, 2, 2, 2, 140, 3, 2, 2, 2, 2, 142, 3, 2, 2, 2, 2, 144, 3, 2, 2, 2, 2, 146, 3, 2, 2, 2, 2, 148, 3, 2, 2, 2, 2, 150, 3, 2, 2, 2, 2, 152, 3, 2, 2, 2, 2, 154, 3, 2, 2, 2, 2, 156, 3, 2, 2, 2, 2, 158, 3, 2, 2, 2, 2, 160, 3, 2, 2, 2, 2, 162, 3, 2, 2, 2, 2, 164, 3, 2, 2, 2, 2, 166, 3, 2, 2, 2, 2, 168, 3, 2, 2, 2, 2, 170, 3, 2, 2, 2, 2, 172, 3, 2, 2, 2, 2, 174, 3, 2, 2, 2, 2, 176, 3, 2, 2, 2, 2, 178, 3, 2, 2, 2, 2, 180, 3, 2, 2, 2, 2, 182, 3, 2, 2, 2, 2, 184, 3, 2, 2, 2, 2, 186, 3, 2, 2, 2, 2, 188, 3, 2, 2, 2, 2, 190, 3, 2, 2, 2, 2, 192, 3, 2, 2, 2, 2, 194, 3, 2, 2, 2, 2, 196, 3, 2, 2, 2, 2, 198, 3, 2, 2, 2, 2, 200, 3, 2, 2, 2, 2, 202, 3, 2, 2, 2, 2, 204, 3, 2, 2, 2, 2, 206, 3, 2, 2, 2, 2, 208, 3, 2, 2, 2, 2, 210, 3, 2, 2, 2, 2, 212, 3, 2, 2, 2, 2, 214, 3, 2, 2, 2, 2, 216, 3, 2, 2, 2, 2, 218, 3, 2, 2, 2, 2, 220, 3, 2, 2, 2, 2, 222, 3, 2, 2, 2, 2, 224, 3, 2, 2, 2, 2, 226, 3, 2, 2, 2, 2, 228, 3, 2, 2, 2, 2, 230, 3, 2, 2, 2, 2, 232, 3, 2, 2, 2, 2, 294, 3, 2, 2, 2, 2, 296, 3, 2, 2, 2, 2, 298, 3, 2, 2, 2, 2, 300, 3, 2, 2, 2, 2, 302, 3, 2, 2, 2, 2, 304, 3, 2, 2, 2, 2, 306, 3, 2, 2, 2, 2, 308, 3, 2, 2, 2, 2, 310, 3, 2, 2, 2, 2, 312, 3, 2, 2, 2, 2, 314, 3, 2, 2, 2, 2, 316, 3, 2, 2, 2, 2, 318, 3, 2, 2, 2, 2, 320, 3, 2, 2, 2, 2, 322, 3, 2, 2, 2, 2, 324, 3, 2, 2, 2, 2, 326, 3, 2, 2, 2, 2, 328, 3, 2, 2, 2, 2, 330, 3, 2, 2, 2, 2, 332, 3, 2, 2, 2, 2, 334, 3, 2, 2, 2, 2, 336, 3, 2, 2, 2, 2, 338, 3, 2, 2, 2, 2, 340, 3, 2, 2, 2, 2, 342, 3, 2, 2, 2, 2, 344, 3, 2, 2, 2, 2, 346, 3, 2, 2, 2, 2, 348, 3, 2, 2, 2, 2, 350, 3, 2, 2, 2, 2, 352, 3, 2, 2, 2, 2, 354, 3, 2, 2, 2, 2, 356, 3, 2, 2, 2, 2, 358, 3, 2, 2, 2, 2, 360, 3, 2, 2, 2, 2, 362, 3, 2, 2, 2, 2, 364, 3, 2, 2, 2, 2, 366, 3, 2, 2, 2, 2, 368, 3, 2, 2, 2, 2, 370, 3, 2, 2, 2, 2, 372, 3, 2, 2, 2, 2, 374, 3, 2, 2, 2, 2, 376, 3, 2, 2, 2, 2, 378, 3, 2, 2, 2, 2, 380, 3, 2, 2, 2, 2, 382, 3, 2, 2, 2, 2, 384, 3, 2, 2, 2, 2, 386, 3, 2, 2, 2, 2, 388, 3, 2, 2, 2, 2, 390, 3, 2, 2, 2, 3, 392, 3, 2, 2, 2, 3, 394, 3, 2, 2, 2, 3, 396, 3, 2, 2, 2, 4, 398, 3, 2, 2, 2, 4, 400, 3, 2, 2, 2, 5, 402, 3, 2, 2, 2, 5, 404, 3, 2, 2, 2, 5, 406, 3, 2, 2, 2, 5, 408, 3, 2, 2, 2, 5, 410, 3, 2, 2, 2, 5, 412, 3, 2, 2, 2, 5, 414, 3, 2, 2, 2, 6, 416, 3, 2, 2, 2, 6, 418, 3, 2, 2, 2, 6, 420, 3, 2, 2, 2, 7, 422, 3, 2, 2, 2, 7, 424, 3, 2, 2, 2, 7, 426, 3, 2, 2, 2, 7, 428, 3, 2, 2, 2, 7, 430, 3, 2, 2, 2, 8, 432, 3, 2, 2, 2, 10, 436, 3, 2, 2, 2, 12, 440, 3, 2, 2, 2, 14, 445, 3, 2, 2, 2, 16, 449, 3, 2, 2, 2, 18, 455, 3, 2, 2, 2, 20, 472, 3, 2, 2, 2, 22, 474, 3, 2, 2, 2, 24, 479, 3, 2, 2, 2, 26, 487, 3, 2, 2, 2, 28, 492, 3, 2, 2, 2, 30, 495, 3, 2, 2, 2, 32, 500, 3, 2, 2, 2, 34, 505, 3, 2, 2, 2, 36, 511, 3, 2, 2, 2, 38, 518, 3, 2, 2, 2, 40, 526, 3, 2, 2, 2, 42, 532, 3, 2, 2, 2, 44, 537, 3, 2, 2, 2, 46, 545, 3, 2, 2, 2, 48, 550, 3, 2, 2, 2, 50, 554, 3, 2, 2, 2, 52, 559, 3, 2, 2, 2, 54, 570, 3, 2, 2, 2, 56, 579, 3, 2, 2, 2, 58, 584, 3, 2, 2, 2, 60, 588, 3, 2, 2, 2, 62, 595, 3, 2, 2, 2, 64, 603, 3, 2, 2, 2, 66, 609, 3, 2, 2, 2, 68, 617, 3, 2, 2, 2, 70, 623, 3, 2, 2, 2, 72, 626, 3, 2, 2, 2, 74, 636, 3, 2, 2, 2, 76, 640, 3, 2, 2, 2, 78, 645, 3, 2, 2, 2, 80, 650, 3, 2, 2, 2, 82, 654, 3, 2, 2, 2, 84, 660, 3, 2, 2, 2, 86, 667, 3, 2, 2, 2, 88, 672, 3, 2, 2, 2, 90, 675, 3, 2, 2, 2, 92, 678, 3, 2, 2, 2, 94, 684, 3, 2, 2, 2, 96, 700, 3, 2, 2, 2, 98, 702, 3, 2, 2, 2, 100, 708, 3, 2, 2, 2, 102, 718, 3, 2, 2, 2, 104, 727, 3, 2, 2, 2, 106, 730, 3, 2, 2, 2, 108, 735, 3, 2, 2, 2, 110, 739, 3, 2, 2, 2, 112, 744, 3, 2, 2, 2, 114, 752, 3, 2, 2, 2, 116, 757, 3, 2, 2, 2, 118, 761, 3, 2, 2, 2, 120, 766, 3, 2, 2, 2, 122, 772, 3, 2, 2, 2, 124, 779, 3, 2, 2, 2, 126, 785, 3, 2, 2, 2, 128, 789, 3, 2, 2, 2, 130, 793, 3, 2, 2, 2, 132, 798, 3, 2, 2, 2, 134, 804, 3, 2, 2, 2, 136, 811, 3, 2, 2, 2, 138, 814, 3, 2, 2, 2, 140, 817, 3, 2, 2, 2, 142, 823, 3, 2, 2, 2, 144, 829, 3, 2, 2, 2, 146, 834, 3, 2, 2, 2, 148, 844, 3, 2, 2, 2, 150, 854, 3, 2, 2, 2, 152, 863, 3, 2, 2, 2, 154, 871, 3, 2, 2, 2, 156, 877, 3, 2, 2, 2, 158, 884, 3, 2, 2, 2, 160, 890, 3, 2, 2, 2, 162, 897, 3, 2, 2, 2, 164, 901, 3, 2, 2, 2, 166, 906, 3, 2, 2, 2, 168, 913, 3, 2, 2, 2, 170, 920, 3, 2, 2, 2, 172, 927, 3, 2, 2, 2, 174, 932, 3, 2, 2, 2, 176, 941, 3, 2, 2, 2, 178, 951, 3, 2, 2, 2, 180, 956, 3, 2, 2, 2, 182, 962, 3, 2, 2, 2, 184, 967, 3, 2, 2, 2, 186, 977, 3, 2, 2, 2, 188, 980, 3, 2, 2, 2, 190, 984, 3, 2, 2, 2, 192, 991, 3, 2, 2, 2, 194, 1000, 3, 2, 2, 2, 196, 1005, 3, 2, 2, 2, 198, 1014, 3, 2, 2, 2, 200, 1018, 3, 2, 2, 2, 202, 1028, 3, 2, 2, 2, 204, 1034, 3, 2, 2, 2, 206, 1040, 3, 2, 2, 2, 208, 1045, 3, 2, 2, 2, 210, 1050, 3, 2, 2, 2, 212, 1056, 3, 2, 2, 2, 214, 1062, 3, 2, 2, 2, 216, 1069, 3, 2, 2, 2, 218, 1084, 3, 2, 2, 2, 220, 1113, 3, 2, 2, 2, 222, 1161, 3, 2, 2, 2, 224, 1239, 3, 2, 2, 2, 226, 1241, 3, 2, 2, 2, 228, 1248, 3, 2, 2, 2, 230, 1252, 3, 2, 2, 2, 232, 1259, 3, 2, 2, 2, 234, 1275, 3, 2, 2, 2, 236, 1277, 3, 2, 2, 2, 238, 1279, 3, 2, 2, 2, 240, 1281, 3, 2, 2, 2, 242, 1283, 3, 2, 2, 2, 244, 1285, 3, 2, 2, 2, 246, 1287, 3, 2, 2, 2, 248, 1289, 3, 2, 2, 2, 250, 1291, 3, 2, 2, 2, 252, 1293, 3, 2, 2, 2, 254, 1295, 3, 2, 2, 2, 256, 1297, 3, 2, 2, 2, 258, 1299, 3, 2, 2, 2, 260, 1301, 3, 2, 2, 2, 262, 1303, 3, 2, 2, 2, 264, 1305, 3, 2, 2, 2, 266, 1307, 3, 2, 2, 2, 268, 1309, 3, 2, 2, 2, 270, 1311, 3, 2, 2, 2, 272, 1313, 3, 2, 2, 2, 274, 1315, 3, 2, 2, 2, 276, 1317, 3, 2, 2, 2, 278, 1319, 3, 2, 2, 2, 280, 1321, 3, 2, 2, 2, 282, 1323, 3, 2, 2, 2, 284, 1325, 3, 2, 2, 2, 286, 1327, 3, 2, 2, 2, 288, 1329, 3, 2, 2, 2, 290, 1331, 3, 2, 2, 2, 292, 1333, 3, 2, 2, 2, 294, 1335, 3, 2, 2, 2, 296, 1338, 3, 2, 2, 2, 298, 1340, 3, 2, 2, 2, 300, 1342, 3, 2, 2, 2, 302, 1344, 3, 2, 2, 2, 304, 1346, 3, 2, 2, 2, 306, 1348, 3, 2, 2, 2, 308, 1351, 3, 2, 2, 2, 310, 1353, 3, 2, 2, 2, 312, 1355, 3, 2, 2, 2, 314, 1357, 3, 2, 2, 2, 316, 1360, 3, 2, 2, 2, 318, 1362, 3, 2, 2, 2, 320, 1365, 3, 2, 2, 2, 322, 1367, 3, 2, 2, 2, 324, 1369, 3, 2, 2, 2, 326, 1372, 3, 2, 2, 2, 328, 1376, 3, 2, 2, 2, 330, 1380, 3, 2, 2, 2, 332, 1382, 3, 2, 2, 2, 334, 1384, 3, 2, 2, 2, 336, 1387, 3, 2, 2, 2, 338, 1393, 3, 2, 2, 2, 340, 1399, 3, 2, 2, 2, 342, 1401, 3, 2, 2, 2, 344, 1408, 3, 2, 2, 2, 346, 1410, 3, 2, 2, 2, 348, 1414, 3, 2, 2, 2, 350, 1417, 3, 2, 2, 2, 352, 1420, 3, 2, 2, 2, 354, 1423, 3, 2, 2, 2, 356, 1425, 3, 2, 2, 2, 358, 1427, 3, 2, 2, 2, 360, 1429, 3, 2, 2, 2, 362, 1431, 3, 2, 2, 2, 364, 1436, 3, 2, 2, 2, 366, 1441, 3, 2, 2, 2, 368, 1443, 3, 2, 2, 2, 370, 1445, 3, 2, 2, 2, 372, 1448, 3, 2, 2, 2, 374, 1452, 3, 2, 2, 2, 376, 1454, 3, 2, 2, 2, 378, 1456, 3, 2, 2, 2, 380, 1458, 3, 2, 2, 2, 382, 1460, 3, 2, 2, 2, 384, 1463, 3, 2, 2, 2, 386, 1465, 3, 2, 2, 2, 388, 1483, 3, 2, 2, 2, 390, 1496, 3, 2, 2, 2, 392, 1511, 3, 2, 2, 2, 394, 1515, 3, 2, 2, 2, 396, 1519, 3, 2, 2, 2, 398, 1529, 3, 2, 2, 2, 400, 1533, 3, 2, 2, 2, 402, 1537, 3, 2, 2, 2, 404, 1543, 3, 2, 2, 2, 406, 1549, 3, 2, 2, 2, 408, 1558, 3, 2, 2, 2, 410, 1562, 3, 2, 2, 2, 412, 1567, 3, 2, 2, 2, 414, 1573, 3, 2, 2, 2, 416, 1578, 3, 2, 2, 2, 418, 1583, 3, 2, 2, 2, 420, 1593, 3, 2, 2, 2, 422, 1600, 3, 2, 2, 2, 424, 1604, 3, 2, 2, 2, 426, 1609, 3, 2, 2, 2, 428, 1616, 3, 2, 2, 2, 430, 1622, 3, 2, 2, 2, 432, 433, 5, 234, 115, 2, 433, 434, 5, 256, 126, 2, 434, 435, 5, 256, 126, 2, 435, 9, 3, 2, 2, 2, 436, 437, 5, 234, 115, 2, 437, 438, 5, 260, 128, 2, 438, 439, 5, 240, 118, 2, 439, 11, 3, 2, 2, 2, 440, 441, 5, 234, 115, 2, 441, 442, 5, 260, 128, 2, 442, 443, 5, 272, 134, 2, 443, 444, 5, 250, 123, 2, 444, 13, 3, 2, 2, 2, 445, 446, 5, 234, 115, 2, 446, 447, 5, 260, 128, 2, 447, 448, 5, 282, 139, 2, 448, 15, 3, 2, 2, 2, 449, 450, 5, 234, 115, 2, 450, 451, 5, 268, 132, 2, 451, 452, 5, 268, 132, 2, 452, 453, 5, 234, 115, 2, 453, 454, 5, 282, 139, 2, 454, 17, 3, 2, 2, 2, 455, 456, 5, 234, 115, 2, 456, 457, 5, 270, 133, 2, 457, 19, 3, 2, 2, 2, 458, 459, 5, 234, 115, 2, 459, 460, 5, 270, 133, 2, 460, 461, 5, 238, 117, 2, 461, 473, 3, 2, 2, 2, 462, 463, 5, 234, 115, 2, 463, 464, 5, 270, 133, 2, 464, 465, 5, 238, 117, 2, 465, 466, 5, 242, 119, 2, 466, 467, 5, 260, 128, 2, 467, 468, 5, 240, 118, 2, 468, 469, 5, 250, 123, 2, 469, 470, 5, 260, 128, 2, 470, 471, 5, 246, 121, 2, 471, 473, 3, 2, 2, 2, 472, 458, 3, 2, 2, 2, 472, 462, 3, 2, 2, 2, 473, 21, 3, 2, 2, 2, 474, 475, 5, 234, 115, 2, 475, 476, 5, 270, 133, 2, 476, 477, 5, 262, 129, 2, 477, 478, 5, 244, 120, 2, 478, 23, 3, 2, 2, 2, 479, 480, 5, 236, 116, 2, 480, 481, 5, 242, 119, 2, 481, 482, 5, 272, 134, 2, 482, 483, 5, 278, 137, 2, 483, 484, 5, 242, 119, 2, 484, 485, 5, 242, 119, 2, 485, 486, 5, 260, 128, 2, 486, 25, 3, 2, 2, 2, 487, 488, 5, 236, 116, 2, 488, 489, 5, 262, 129, 2, 489, 490, 5, 272, 134, 2, 490, 491, 5, 248, 122, 2, 491, 27, 3, 2, 2, 2, 492, 493, 5, 236, 116, 2, 493, 494, 5, 282, 139, 2, 494, 29, 3, 2, 2, 2, 495, 496, 5, 238, 117, 2, 496, 497, 5, 234, 115, 2, 497, 498, 5, 270, 133, 2, 498, 499, 5, 242, 119, 2, 499, 31, 3, 2, 2, 2, 500, 501, 5, 238, 117, 2, 501, 502, 5, 234, 115, 2, 502, 503, 5, 270, 133, 2, 503, 504, 5, 272, 134, 2, 504, 33, 3, 2, 2, 2, 505, 506, 5, 238, 117, 2, 506, 507, 5, 234, 115, 2, 507, 508, 5, 272, 134, 2, 508, 509, 5, 238, 117, 2, 509, 510, 5, 248, 122, 2, 510, 35, 3, 2, 2, 2, 511, 512, 5, 238, 117, 2, 512, 513, 5, 262, 129, 2, 513, 514, 5, 248, 122, 2, 514, 515, 5, 262, 129, 2, 515, 516, 5, 268, 132, 2, 516, 517, 5, 272, 134, 2, 517, 37, 3, 2, 2, 2, 518, 519, 5, 238, 117, 2, 519, 520, 5, 262, 129, 2, 520, 521, 5, 256, 126, 2, 521, 522, 5, 256, 126, 2, 522, 523, 5, 234, 115, 2, 523, 524, 5, 272, 134, 2, 524, 525, 5, 242, 119, 2, 525, 39, 3, 2, 2, 2, 526, 527, 5, 238, 117, 2, 527, 528, 5, 268, 132, 2, 528, 529, 5, 262, 129, 2, 529, 530, 5, 270, 133, 2, 530, 531, 5, 270, 133, 2, 531, 41, 3, 2, 2, 2, 532, 533, 5, 238, 117, 2, 533, 534, 5, 274, 135, 2, 534, 535, 5, 236, 116, 2, 535, 536, 5, 242, 119, 2, 536, 43, 3, 2, 2, 2, 537, 538, 5, 238, 117, 2, 538, 539, 5, 274, 135, 2, 539, 540, 5, 268, 132, 2, 540, 541, 5, 268, 132, 2, 541, 542, 5, 242, 119, 2, 542, 543, 5, 260, 128, 2, 543, 544, 5, 272, 134, 2, 544, 45, 3, 2, 2, 2, 545, 546, 5, 240, 118, 2, 546, 547, 5, 234, 115, 2, 547, 548, 5, 272, 134, 2, 548, 549, 5, 242, 119, 2, 549, 47, 3, 2, 2, 2, 550, 551, 5, 240, 118, 2, 551, 552, 5, 234, 115, 2, 552, 553, 5, 282, 139, 2, 553, 49, 3, 2, 2, 2, 554, 555, 5, 240, 118, 2, 555, 556, 5, 242, 119, 2, 556, 557, 5, 270, 133, 2, 557, 558, 5, 238, 117, 2, 558, 51, 3, 2, 2, 2, 559, 560, 5, 240, 118, 2, 560, 561, 5, 242, 119, 2, 561, 562, 5, 270, 133, 2, 562, 563, 5, 238, 117, 2, 563, 564, 5, 242, 119, 2, 564, 565, 5, 260, 128, 2, 565, 566, 5, 240, 118, 2, 566, 567, 5, 250, 123, 2, 567, 568, 5, 260, 128, 2, 568, 569, 5, 246, 121, 2, 569, 53, 3, 2, 2, 2, 570, 571, 5, 240, 118, 2, 571, 572, 5, 250, 123, 2, 572, 573, 5, 270, 133, 2, 573, 574, 5, 272, 134, 2, 574, 575, 5, 250, 123, 2, 575, 576, 5, 260, 128, 2, 576, 577, 5, 238, 117, 2, 577, 578, 5, 272, 134, 2, 578, 55, 3, 2, 2, 2, 579, 580, 5, 242, 119, 2, 580, 581, 5, 256, 126, 2, 581, 582, 5, 270, 133, 2, 582, 583, 5, 242, 119, 2, 583, 57, 3, 2, 2, 2, 584, 585, 5, 242, 119, 2, 585, 586, 5, 260, 128, 2, 586, 587, 5, 240, 118, 2, 587, 59, 3, 2, 2, 2, 588, 589, 5, 242, 119, 2, 589, 590, 5, 280, 138, 2, 590, 591, 5, 238, 117, 2, 591, 592, 5, 242, 119, 2, 592, 593, 5, 264, 130, 2, 593, 594, 5, 272, 134, 2, 594, 61, 3, 2, 2, 2, 595, 596, 5, 242, 119, 2, 596, 597, 5, 280, 138, 2, 597, 598, 5, 272, 134, 2, 598, 599, 5, 268, 132, 2, 599, 600, 5, 234, 115, 2, 600, 601, 5, 238, 117, 2, 601, 602, 5, 272, 134, 2, 602, 63, 3, 2, 2, 2, 603, 604, 5, 244, 120, 2, 604, 605, 5, 250, 123, 2, 605, 606, 5, 260, 128, 2, 606, 607, 5, 234, 115, 2, 607, 608, 5, 256, 126, 2, 608, 65, 3, 2, 2, 2, 609, 610, 5, 244, 120, 2, 610, 611, 5, 250, 123, 2, 611, 612, 5, 260, 128, 2, 612, 613, 5, 234, 115, 2, 613, 614, 5, 256, 126, 2, 614, 615, 5, 256, 126, 2, 615, 616, 5, 282, 139, 2, 616, 67, 3, 2, 2, 2, 617, 618, 5, 244, 120, 2, 618, 619, 5, 250, 123, 2, 619, 620, 5, 268, 132, 2, 620, 621, 5, 270, 133, 2, 621, 622, 5, 272, 134, 2, 622, 69, 3, 2, 2, 2, 623, 624, 5, 244, 120, 2, 624, 625, 5, 260, 128, 2, 625, 71, 3, 2, 2, 2, 626, 627, 5, 244, 120, 2, 627, 628, 5, 262, 129, 2, 628, 629, 5, 256, 126, 2, 629, 630, 5, 256, 126, 2, 630, 631, 5, 262, 129, 2, 631, 632, 5, 278, 137, 2, 632, 633, 5, 250, 123, 2, 633, 634, 5, 260, 128, 2, 634, 635, 5, 246, 121, 2, 635, 73, 3, 2, 2, 2, 636, 637, 5, 244, 120, 2, 637, 638, 5, 262, 129, 2, 638, 639, 5, 268, 132, 2, 639, 75, 3, 2, 2, 2, 640, 641, 5, 244, 120, 2, 641, 642, 5, 268, 132, 2, 642, 643, 5, 262, 129, 2, 643, 644, 5, 258, 127, 2, 644, 77, 3, 2, 2, 2, 645, 646, 5, 244, 120, 2, 646, 647, 5, 274, 135, 2, 647, 648, 5, 256, 126, 2, 648, 649, 5, 256, 126, 2, 649, 79, 3, 2, 2, 2, 650, 651, 5, 244, 120, 2, 651, 652, 5, 274, 135, 2, 652, 653, 5, 260, 128, 2, 653, 81, 3, 2, 2, 2, 654, 655, 5, 246, 121, 2, 655, 656, 5, 268, 132, 2, 656, 657, 5, 262, 129, 2, 657, 658, 5, 274, 135, 2, 658, 659, 5, 264, 130, 2, 659, 83, 3, 2, 2, 2, 660, 661, 5, 248, 122, 2, 661, 662, 5, 234, 115, 2, 662, 663, 5, 276, 136, 2, 663, 664, 5, 250, 123, 2, 664, 665, 5, 260, 128, 2, 665, 666, 5, 246, 121, 2, 666, 85, 3, 2, 2, 2, 667, 668, 5, 248, 122, 2, 668, 669, 5, 262, 129, 2, 669, 670, 5, 274, 135, 2, 670, 671, 5, 268, 132, 2, 671, 87, 3, 2, 2, 2, 672, 673, 5, 250, 123, 2, 673, 674, 5, 240, 118, 2, 674, 89, 3, 2, 2, 2, 675, 676, 5, 250, 123, 2, 676, 677, 5, 244, 120, 2, 677, 91, 3, 2, 2, 2, 678, 679, 5, 250, 123, 2, 679, 680, 5, 256, 126, 2, 680, 681, 5, 250, 123, 2, 681, 682, 5, 254, 125, 2, 682, 683, 5, 242, 119, 2, 683, 93, 3, 2, 2, 2, 684, 685, 5, 250, 123, 2, 685, 686, 5, 260, 128, 2, 686, 95, 3, 2, 2, 2, 687, 688, 5, 250, 123, 2, 688, 689, 5, 260, 128, 2, 689, 690, 5, 244, 120, 2, 690, 701, 3, 2, 2, 2, 691, 692, 5, 250, 123, 2, 692, 693, 5, 260, 128, 2, 693, 694, 5, 244, 120, 2, 694, 695, 5, 250, 123, 2, 695, 696, 5, 260, 128, 2, 696, 697, 5, 250, 123, 2, 697, 698, 5, 272, 134, 2, 698, 699, 5, 282, 139, 2, 699, 701, 3, 2, 2, 2, 700, 687, 3, 2, 2, 2, 700, 691, 3, 2, 2, 2, 701, 97, 3, 2, 2, 2, 702, 703, 5, 250, 123, 2, 703, 704, 5, 260, 128, 2, 704, 705, 5, 260, 128, 2, 705, 706, 5, 242, 119, 2, 706, 707, 5, 268, 132, 2, 707, 99, 3, 2, 2, 2, 708, 709, 5, 250, 123, 2, 709, 710, 5, 260, 128, 2, 710, 711, 5, 272, 134, 2, 711, 712, 5, 242, 119, 2, 712, 713, 5, 268, 132, 2, 713, 714, 5, 270, 133, 2, 714, 715, 5, 242, 119, 2, 715, 716, 5, 238, 117, 2, 716, 717, 5, 272, 134, 2, 717, 101, 3, 2, 2, 2, 718, 719, 5, 250, 123, 2, 719, 720, 5, 260, 128, 2, 720, 721, 5, 272, 134, 2, 721, 722, 5, 242, 119, 2, 722, 723, 5, 268, 132, 2, 723, 724, 5, 276, 136, 2, 724, 725, 5, 234, 115, 2, 725, 726, 5, 256, 126, 2, 726, 103, 3, 2, 2, 2, 727, 728, 5, 250, 123, 2, 728, 729, 5, 270, 133, 2, 729, 105, 3, 2, 2, 2, 730, 731, 5, 252, 124, 2, 731, 732, 5, 262, 129, 2, 732, 733, 5, 250, 123, 2, 733, 734, 5, 260, 128, 2, 734, 107, 3, 2, 2, 2, 735, 736, 5, 254, 125, 2, 736, 737, 5, 242, 119, 2, 737, 738, 5, 282, 139, 2, 738, 109, 3, 2, 2, 2, 739, 740, 5, 256, 126, 2, 740, 741, 5, 234, 115, 2, 741, 742, 5, 270, 133, 2, 742, 743, 5, 272, 134, 2, 743, 111, 3, 2, 2, 2, 744, 745, 5, 256, 126, 2, 745, 746, 5, 242, 119, 2, 746, 747, 5, 234, 115, 2, 747, 748, 5, 240, 118, 2, 748, 749, 5, 250, 123, 2, 749, 750, 5, 260, 128, 2, 750, 751, 5, 246, 121, 2, 751, 113, 3, 2, 2, 2, 752, 753, 5, 256, 126, 2, 753, 754, 5, 242, 119, 2, 754, 755, 5, 244, 120, 2, 755, 756, 5, 272, 134, 2, 756, 115, 3, 2, 2, 2, 757, 758, 5, 256, 126, 2, 758, 759, 5, 242, 119, 2, 759, 760, 5, 272, 134, 2, 760, 117, 3, 2, 2, 2, 761, 762, 5, 256, 126, 2, 762, 763, 5, 250, 123, 2, 763, 764, 5, 254, 125, 2, 764, 765, 5, 242, 119, 2, 765, 119, 3, 2, 2, 2, 766, 767, 5, 256, 126, 2, 767, 768, 5, 250, 123, 2, 768, 769, 5, 258, 127, 2, 769, 770, 5, 250, 123, 2, 770, 771, 5, 272, 134, 2, 771, 121, 3, 2, 2, 2, 772, 773, 5, 258, 127, 2, 773, 774, 5, 250, 123, 2, 774, 775, 5, 260, 128, 2, 775, 776, 5, 274, 135, 2, 776, 777, 5, 272, 134, 2, 777, 778, 5, 242, 119, 2, 778, 123, 3, 2, 2, 2, 779, 780, 5, 258, 127, 2, 780, 781, 5, 262, 129, 2, 781, 782, 5, 260, 128, 2, 782, 783, 5, 272, 134, 2, 783, 784, 5, 248, 122, 2, 784, 125, 3, 2, 2, 2, 785, 786, 5, 260, 128, 2, 786, 787, 5, 234, 115, 2, 787, 788, 5, 260, 128, 2, 788, 127, 3, 2, 2, 2, 789, 790, 5, 260, 128, 2, 790, 791, 5, 262, 129, 2, 791, 792, 5, 272, 134, 2, 792, 129, 3, 2, 2, 2, 793, 794, 5, 260, 128, 2, 794, 795, 5, 274, 135, 2, 795, 796, 5, 256, 126, 2, 796, 797, 5, 256, 126, 2, 797, 131, 3, 2, 2, 2, 798, 799, 5, 260, 128, 2, 799, 800, 5, 274, 135, 2, 800, 801, 5, 256, 126, 2, 801, 802, 5, 256, 126, 2, 802, 803, 5, 270, 133, 2, 803, 133, 3, 2, 2, 2, 804, 805, 5, 262, 129, 2, 805, 806, 5, 244, 120, 2, 806, 807, 5, 244, 120, 2, 807, 808, 5, 270, 133, 2, 808, 809, 5, 242, 119, 2, 809, 810, 5, 272, 134, 2, 810, 135, 3, 2, 2, 2, 811, 812, 5, 262, 129, 2, 812, 813, 5, 260, 128, 2, 813, 137, 3, 2, 2, 2, 814, 815, 5, 262, 129, 2, 815, 816, 5, 268, 132, 2, 816, 139, 3, 2, 2, 2, 817, 818, 5, 262, 129, 2, 818, 819, 5, 268, 132, 2, 819, 820, 5, 240, 118, 2, 820, 821, 5, 242, 119, 2, 821, 822, 5, 268, 132, 2, 822, 141, 3, 2, 2, 2, 823, 824, 5, 262, 129, 2, 824, 825, 5, 274, 135, 2, 825, 826, 5, 272, 134, 2, 826, 827, 5, 242, 119, 2, 827, 828, 5, 268, 132, 2, 828, 143, 3, 2, 2, 2, 829, 830, 5, 262, 129, 2, 830, 831, 5, 276, 136, 2, 831, 832, 5, 242, 119, 2, 832, 833, 5, 268, 132, 2, 833, 145, 3, 2, 2, 2, 834, 835, 5, 264, 130, 2, 835, 836, 5, 234, 115, 2, 836, 837, 5, 268, 132, 2, 837, 838, 5, 272, 134, 2, 838, 839, 5, 250, 123, 2, 839, 840, 5, 272, 134, 2, 840, 841, 5, 250, 123, 2, 841, 842, 5, 262, 129, 2, 842, 843, 5, 260, 128, 2, 843, 147, 3, 2, 2, 2, 844, 845, 5, 264, 130, 2, 845, 846, 5, 268, 132, 2, 846, 847, 5, 242, 119, 2, 847, 848, 5, 238, 117, 2, 848, 849, 5, 242, 119, 2, 849, 850, 5, 240, 118, 2, 850, 851, 5, 250, 123, 2, 851, 852, 5, 260, 128, 2, 852, 853, 5, 246, 121, 2, 853, 149, 3, 2, 2, 2, 854, 855, 5, 264, 130, 2, 855, 856, 5, 268, 132, 2, 856, 857, 5, 242, 119, 2, 857, 858, 5, 278, 137, 2, 858, 859, 5, 248, 122, 2, 859, 860, 5, 242, 119, 2, 860, 861, 5, 268, 132, 2, 861, 862, 5, 242, 119, 2, 862, 151, 3, 2, 2, 2, 863, 864, 5, 266, 131, 2, 864, 865, 5, 274, 135, 2, 865, 866, 5, 234, 115, 2, 866, 867, 5, 268, 132, 2, 867, 868, 5, 272, 134, 2, 868, 869, 5, 242, 119, 2, 869, 870, 5, 268, 132, 2, 870, 153, 3, 2, 2, 2, 871, 872, 5, 268, 132, 2, 872, 873, 5, 234, 115, 2, 873, 874, 5, 260, 128, 2, 874, 875, 5, 246, 121, 2, 875, 876, 5, 242, 119, 2, 876, 155, 3, 2, 2, 2, 877, 878, 5, 268, 132, 2, 878, 879, 5, 242, 119, 2, 879, 880, 5, 272, 134, 2, 880, 881, 5, 274, 135, 2, 881, 882, 5, 268, 132, 2, 882, 883, 5, 260, 128, 2, 883, 157, 3, 2, 2, 2, 884, 885, 5, 268, 132, 2, 885, 886, 5, 250, 123, 2, 886, 887, 5, 246, 121, 2, 887, 888, 5, 248, 122, 2, 888, 889, 5, 272, 134, 2, 889, 159, 3, 2, 2, 2, 890, 891, 5, 268, 132, 2, 891, 892, 5, 262, 129, 2, 892, 893, 5, 256, 126, 2, 893, 894, 5, 256, 126, 2, 894, 895, 5, 274, 135, 2, 895, 896, 5, 264, 130, 2, 896, 161, 3, 2, 2, 2, 897, 898, 5, 268, 132, 2, 898, 899, 5, 262, 129, 2, 899, 900, 5, 278, 137, 2, 900, 163, 3, 2, 2, 2, 901, 902, 5, 268, 132, 2, 902, 903, 5, 262, 129, 2, 903, 904, 5, 278, 137, 2, 904, 905, 5, 270, 133, 2, 905, 165, 3, 2, 2, 2, 906, 907, 5, 270, 133, 2, 907, 908, 5, 234, 115, 2, 908, 909, 5, 258, 127, 2, 909, 910, 5, 264, 130, 2, 910, 911, 5, 256, 126, 2, 911, 912, 5, 242, 119, 2, 912, 167, 3, 2, 2, 2, 913, 914, 5, 270, 133, 2, 914, 915, 5, 242, 119, 2, 915, 916, 5, 238, 117, 2, 916, 917, 5, 262, 129, 2, 917, 918, 5, 260, 128, 2, 918, 919, 5, 240, 118, 2, 919, 169, 3, 2, 2, 2, 920, 921, 5, 270, 133, 2, 921, 922, 5, 242, 119, 2, 922, 923, 5, 256, 126, 2, 923, 924, 5, 242, 119, 2, 924, 925, 5, 238, 117, 2, 925, 926, 5, 272, 134, 2, 926, 171, 3, 2, 2, 2, 927, 928, 5, 270, 133, 2, 928, 929, 5, 242, 119, 2, 929, 930, 5, 258, 127, 2, 930, 931, 5, 250, 123, 2, 931, 173, 3, 2, 2, 2, 932, 933, 5, 270, 133, 2, 933, 934, 5, 242, 119, 2, 934, 935, 5, 272, 134, 2, 935, 936, 5, 272, 134, 2, 936, 937, 5, 250, 123, 2, 937, 938, 5, 260, 128, 2, 938, 939, 5, 246, 121, 2, 939, 940, 5, 270, 133, 2, 940, 175, 3, 2, 2, 2, 941, 942, 5, 270, 133, 2, 942, 943, 5, 274, 135, 2, 943, 944, 5, 236, 116, 2, 944, 945, 5, 270, 133, 2, 945, 946, 5, 272, 134, 2, 946, 947, 5, 268, 132, 2, 947, 948, 5, 250, 123, 2, 948, 949, 5, 260, 128, 2, 949, 950, 5, 246, 121, 2, 950, 177, 3, 2, 2, 2, 951, 952, 5, 272, 134, 2, 952, 953, 5, 248, 122, 2, 953, 954, 5, 242, 119, 2, 954, 955, 5, 260, 128, 2, 955, 179, 3, 2, 2, 2, 956, 957, 5, 272, 134, 2, 957, 958, 5, 248, 122, 2, 958, 959, 5, 268, 132, 2, 959, 960, 5, 262, 129, 2, 960, 961, 5, 278, 137, 2, 961, 181, 3, 2, 2, 2, 962, 963, 5, 272, 134, 2, 963, 964, 5, 250, 123, 2, 964, 965, 5, 242, 119, 2, 965, 966, 5, 270, 133, 2, 966, 183, 3, 2, 2, 2, 967, 968, 5, 272, 134, 2, 968, 969, 5, 250, 123, 2, 969, 970, 5, 258, 127, 2, 970, 971, 5, 242, 119, 2, 971, 972, 5, 270, 133, 2, 972, 973, 5, 272, 134, 2, 973, 974, 5, 234, 115, 2, 974, 975, 5, 258, 127, 2, 975, 976, 5, 264, 130, 2, 976, 185, 3, 2, 2, 2, 977, 978, 5, 272, 134, 2, 978, 979, 5, 262, 129, 2, 979, 187, 3, 2, 2, 2, 980, 981, 5, 272, 134, 2, 981, 982, 5, 262, 129, 2, 982, 983, 5, 264, 130, 2, 983, 189, 3, 2, 2, 2, 984, 985, 5, 272, 134, 2, 985, 986, 5, 262, 129, 2, 986, 987, 5, 272, 134, 2, 987, 988, 5, 234, 115, 2, 988, 989, 5, 256, 126, 2, 989, 990, 5, 270, 133, 2, 990, 191, 3, 2, 2, 2, 991, 992, 5, 272, 134, 2, 992, 993, 5, 268, 132, 2, 993, 994, 5, 234, 115, 2, 994, 995, 5, 250, 123, 2, 995, 996, 5, 256, 126, 2, 996, 997, 5, 250, 123, 2, 997, 998, 5, 260, 128, 2, 998, 999, 5, 246, 121, 2, 999, 193, 3, 2, 2, 2, 1000, 1001, 5, 272, 134, 2, 1001, 1002, 5, 268, 132, 2, 1002, 1003, 5, 250, 123, 2, 1003, 1004, 5, 258, 127, 2, 1004, 195, 3, 2, 2, 2, 1005, 1006, 5, 272, 134, 2, 1006, 1007, 5, 268, 132, 2, 1007, 1008, 5, 274, 135, 2, 1008, 1009, 5, 260, 128, 2, 1009, 1010, 5, 238, 117, 2, 1010, 1011, 5, 234, 115, 2, 1011, 1012, 5, 272, 134, 2, 1012, 1013, 5, 242, 119, 2, 1013, 197, 3, 2, 2, 2, 1014, 1015, 5, 272, 134, 2, 1015, 1016, 5, 268, 132, 2, 1016, 1017, 5, 282, 139, 2, 1017, 199, 3, 2, 2, 2, 1018, 1019, 5, 274, 135, 2, 1019, 1020, 5, 260, 128, 2, 1020, 1021, 5, 236, 116, 2, 1021, 1022, 5, 262, 129, 2, 1022, 1023, 5, 274, 135, 2, 1023, 1024, 5, 260, 128, 2, 1024, 1025, 5, 240, 118, 2, 1025, 1026, 5, 242, 119, 2, 1026, 1027, 5, 240, 118, 2, 1027, 201, 3, 2, 2, 2, 1028, 1029, 5, 274, 135, 2, 1029, 1030, 5, 260, 128, 2, 1030, 1031, 5, 250, 123, 2, 1031, 1032, 5, 262, 129, 2, 1032, 1033, 5, 260, 128, 2, 1033, 203, 3, 2, 2, 2, 1034, 1035, 5, 274, 135, 2, 1035, 1036, 5, 270, 133, 2, 1036, 1037, 5, 250, 123, 2, 1037, 1038, 5, 260, 128, 2, 1038, 1039, 5, 246, 121, 2, 1039, 205, 3, 2, 2, 2, 1040, 1041, 5, 278, 137, 2, 1041, 1042, 5, 242, 119, 2, 1042, 1043, 5, 242, 119, 2, 1043, 1044, 5, 254, 125, 2, 1044, 207, 3, 2, 2, 2, 1045, 1046, 5, 278, 137, 2, 1046, 1047, 5, 248, 122, 2, 1047, 1048, 5, 242, 119, 2, 1048, 1049, 5, 260, 128, 2, 1049, 209, 3, 2, 2, 2, 1050, 1051, 5, 278, 137, 2, 1051, 1052, 5, 248, 122, 2, 1052, 1053, 5, 242, 119, 2, 1053, 1054, 5, 268, 132, 2, 1054, 1055, 5, 242, 119, 2, 1055, 211, 3, 2, 2, 2, 1056, 1057, 5, 278, 137, 2, 1057, 1058, 5, 248, 122, 2, 1058, 1059, 5, 250, 123, 2, 1059, 1060, 5, 256, 126, 2, 1060, 1061, 5, 242, 119, 2, 1061, 213, 3, 2, 2, 2, 1062, 1063, 5, 278, 137, 2, 1063, 1064, 5, 250, 123, 2, 1064, 1065, 5, 260, 128, 2, 1065, 1066, 5, 240, 118, 2, 1066, 1067, 5, 262, 129, 2, 1067, 1068, 5, 278, 137, 2, 1068, 215, 3, 2, 2, 2, 1069, 1070, 5, 278, 137, 2, 1070, 1071, 5, 250, 123, 2, 1071, 1072, 5, 272, 134, 2, 1072, 1073, 5, 248, 122, 2, 1073, 217, 3, 2, 2, 2, 1074, 1075, 5, 282, 139, 2, 1075, 1076, 5, 242, 119, 2, 1076, 1077, 5, 234, 115, 2, 1077, 1078, 5, 268, 132, 2, 1078, 1085, 3, 2, 2, 2, 1079, 1080, 5, 282, 139, 2, 1080, 1081, 5, 282, 139, 2, 1081, 1082, 5, 282, 139, 2, 1082, 1083, 5, 282, 139, 2, 1083, 1085, 3, 2, 2, 2, 1084, 1074, 3, 2, 2, 2, 1084, 1079, 3, 2, 2, 2, 1085, 219, 3, 2, 2, 2, 1086, 1087, 5, 300, 148, 2, 1087, 1088, 5, 236, 116, 2, 1088, 1114, 3, 2, 2, 2, 1089, 1090, 5, 300, 148, 2, 1090, 1091, 5, 244, 120, 2, 1091, 1114, 3, 2, 2, 2, 1092, 1093, 5, 300, 148, 2, 1093, 1094, 5, 268, 132, 2, 1094, 1114, 3, 2, 2, 2, 1095, 1096, 5, 300, 148, 2, 1096, 1097, 5, 260, 128, 2, 1097, 1114, 3, 2, 2, 2, 1098, 1099, 5, 300, 148, 2, 1099, 1100, 5, 272, 134, 2, 1100, 1114, 3, 2, 2, 2, 1101, 1102, 5, 300, 148, 2, 1102, 1103, 7, 50, 2, 2, 1103, 1114, 3, 2, 2, 2, 1104, 1105, 5, 300, 148, 2, 1105, 1106, 5, 234, 115, 2, 1106, 1114, 3, 2, 2, 2, 1107, 1108, 5, 300, 148, 2, 1108, 1109, 5, 276, 136, 2, 1109, 1114, 3, 2, 2, 2, 1110, 1111, 5, 300, 148, 2, 1111, 1112, 5, 300, 148, 2, 1112, 1114, 3, 2, 2, 2, 1113, 1086, 3, 2, 2, 2, 1113, 1089, 3, 2, 2, 2, 1113, 1092, 3, 2, 2, 2, 1113, 1095, 3, 2, 2, 2, 1113, 1098, 3, 2, 2, 2, 1113, 1101, 3, 2, 2, 2, 1113, 1104, 3, 2, 2, 2, 1113, 1107, 3, 2, 2, 2, 1113, 1110, 3, 2, 2, 2, 1114, 221, 3, 2, 2, 2, 1115, 1119, 5, 286, 141, 2, 1116, 1119, 5, 384, 190, 2, 1117, 1119, 5, 310, 153, 2, 1118, 1115, 3, 2, 2, 2, 1118, 1116, 3, 2, 2, 2, 1118, 1117, 3, 2, 2, 2, 1119, 1126, 3, 2, 2, 2, 1120, 1125, 5, 286, 141, 2, 1121, 1125, 5, 384, 190, 2, 1122, 1125, 5, 290, 143, 2, 1123, 1125, 5, 310, 153, 2, 1124, 1120, 3, 2, 2, 2, 1124, 1121, 3, 2, 2, 2, 1124, 1122, 3, 2, 2, 2, 1124, 1123, 3, 2, 2, 2, 1125, 1128, 3, 2, 2, 2, 1126, 1124, 3, 2, 2, 2, 1126, 1127, 3, 2, 2, 2, 1127, 1162, 3, 2, 2, 2, 1128, 1126, 3, 2, 2, 2, 1129, 1140, 5, 298, 147, 2, 1130, 1139, 10, 2, 2, 2, 1131, 1139, 5, 220, 108, 2, 1132, 1133, 5, 300, 148, 2, 1133, 1134, 5, 366, 181, 2, 1134, 1139, 3, 2, 2, 2, 1135, 1136, 5, 298, 147, 2, 1136, 1137, 5, 298, 147, 2, 1137, 1139, 3, 2, 2, 2, 1138, 1130, 3, 2, 2, 2, 1138, 1131, 3, 2, 2, 2, 1138, 1132, 3, 2, 2, 2, 1138, 1135, 3, 2, 2, 2, 1139, 1142, 3, 2, 2, 2, 1140, 1138, 3, 2, 2, 2, 1140, 1141, 3, 2, 2, 2, 1141, 1143, 3, 2, 2, 2, 1142, 1140, 3, 2, 2, 2, 1143, 1144, 5, 298, 147, 2, 1144, 1162, 3, 2, 2, 2, 1145, 1156, 5, 360, 178, 2, 1146, 1155, 10, 3, 2, 2, 1147, 1155, 5, 220, 108, 2, 1148, 1149, 5, 300, 148, 2, 1149, 1150, 5, 360, 178, 2, 1150, 1155, 3, 2, 2, 2, 1151, 1152, 5, 360, 178, 2, 1152, 1153, 5, 360, 178, 2, 1153, 1155, 3, 2, 2, 2, 1154, 1146, 3, 2, 2, 2, 1154, 1147, 3, 2, 2, 2, 1154, 1148, 3, 2, 2, 2, 1154, 1151, 3, 2, 2, 2, 1155, 1158, 3, 2, 2, 2, 1156, 1154, 3, 2, 2, 2, 1156, 1157, 3, 2, 2, 2, 1157, 1159, 3, 2, 2, 2, 1158, 1156, 3, 2, 2, 2, 1159, 1160, 5, 360, 178, 2, 1160, 1162, 3, 2, 2, 2, 1161, 1118, 3, 2, 2, 2, 1161, 1129, 3, 2, 2, 2, 1161, 1145, 3, 2, 2, 2, 1162, 223, 3, 2, 2, 2, 1163, 1164, 5, 230, 113, 2, 1164, 1168, 5, 312, 154, 2, 1165, 1167, 5, 292, 144, 2, 1166, 1165, 3, 2, 2, 2, 1167, 1170, 3, 2, 2, 2, 1168, 1166, 3, 2, 2, 2, 1168, 1169, 3, 2, 2, 2, 1169, 1173, 3, 2, 2, 2, 1170, 1168, 3, 2, 2, 2, 1171, 1174, 5, 264, 130, 2, 1172, 1174, 5, 242, 119, 2, 1173, 1171, 3, 2, 2, 2, 1173, 1172, 3, 2, 2, 2, 1174, 1177, 3, 2, 2, 2, 1175, 1178, 5, 356, 176, 2, 1176, 1178, 5, 308, 152, 2, 1177, 1175, 3, 2, 2, 2, 1177, 1176, 3, 2, 2, 2, 1177, 1178, 3, 2, 2, 2, 1178, 1180, 3, 2, 2, 2, 1179, 1181, 5, 290, 143, 2, 1180, 1179, 3, 2, 2, 2, 1181, 1182, 3, 2, 2, 2, 1182, 1180, 3, 2, 2, 2, 1182, 1183, 3, 2, 2, 2, 1183, 1240, 3, 2, 2, 2, 1184, 1187, 5, 230, 113, 2, 1185, 1188, 5, 264, 130, 2, 1186, 1188, 5, 242, 119, 2, 1187, 1185, 3, 2, 2, 2, 1187, 1186, 3, 2, 2, 2, 1188, 1191, 3, 2, 2, 2, 1189, 1192, 5, 356, 176, 2, 1190, 1192, 5, 308, 152, 2, 1191, 1189, 3, 2, 2, 2, 1191, 1190, 3, 2, 2, 2, 1191, 1192, 3, 2, 2, 2, 1192, 1194, 3, 2, 2, 2, 1193, 1195, 5, 290, 143, 2, 1194, 1193, 3, 2, 2, 2, 1195, 1196, 3, 2, 2, 2, 1196, 1194, 3, 2, 2, 2, 1196, 1197, 3, 2, 2, 2, 1197, 1240, 3, 2, 2, 2, 1198, 1199, 5, 228, 112, 2, 1199, 1203, 5, 312, 154, 2, 1200, 1202, 5, 290, 143, 2, 1201, 1200, 3, 2, 2, 2, 1202, 1205, 3, 2, 2, 2, 1203, 1201, 3, 2, 2, 2, 1203, 1204, 3, 2, 2, 2, 1204, 1206, 3, 2, 2, 2, 1205, 1203, 3, 2, 2, 2, 1206, 1209, 5, 242, 119, 2, 1207, 1210, 5, 356, 176, 2, 1208, 1210, 5, 308, 152, 2, 1209, 1207, 3, 2, 2, 2, 1209, 1208, 3, 2, 2, 2, 1209, 1210, 3, 2, 2, 2, 1210, 1212, 3, 2, 2, 2, 1211, 1213, 5, 290, 143, 2, 1212, 1211, 3, 2, 2, 2, 1213, 1214, 3, 2, 2, 2, 1214, 1212, 3, 2, 2, 2, 1214, 1215, 3, 2, 2, 2, 1215, 1240, 3, 2, 2, 2, 1216, 1217, 5, 312, 154, 2, 1217, 1218, 5, 228, 112, 2, 1218, 1221, 5, 242, 119, 2, 1219, 1222, 5, 356, 176, 2, 1220, 1222, 5, 308, 152, 2, 1221, 1219, 3, 2, 2, 2, 1221, 1220, 3, 2, 2, 2, 1221, 1222, 3, 2, 2, 2, 1222, 1224, 3, 2, 2, 2, 1223, 1225, 5, 290, 143, 2, 1224, 1223, 3, 2, 2, 2, 1225, 1226, 3, 2, 2, 2, 1226, 1224, 3, 2, 2, 2, 1226, 1227, 3, 2, 2, 2, 1227, 1240, 3, 2, 2, 2, 1228, 1229, 5, 228, 112, 2, 1229, 1232, 5, 242, 119, 2, 1230, 1233, 5, 356, 176, 2, 1231, 1233, 5, 308, 152, 2, 1232, 1230, 3, 2, 2, 2, 1232, 1231, 3, 2, 2, 2, 1232, 1233, 3, 2, 2, 2, 1233, 1235, 3, 2, 2, 2, 1234, 1236, 5, 290, 143, 2, 1235, 1234, 3, 2, 2, 2, 1236, 1237, 3, 2, 2, 2, 1237, 1235, 3, 2, 2, 2, 1237, 1238, 3, 2, 2, 2, 1238, 1240, 3, 2, 2, 2, 1239, 1163, 3, 2, 2, 2, 1239, 1184, 3, 2, 2, 2, 1239, 1198, 3, 2, 2, 2, 1239, 1216, 3, 2, 2, 2, 1239, 1228, 3, 2, 2, 2, 1240, 225, 3, 2, 2, 2, 1241, 1243, 7, 50, 2, 2, 1242, 1244, 5, 288, 142, 2, 1243, 1242, 3, 2, 2, 2, 1244, 1245, 3, 2, 2, 2, 1245, 1243, 3, 2, 2, 2, 1245, 1246, 3, 2, 2, 2, 1246, 227, 3, 2, 2, 2, 1247, 1249, 5, 290, 143, 2, 1248, 1247, 3, 2, 2, 2, 1249, 1250, 3, 2, 2, 2, 1250, 1248, 3, 2, 2, 2, 1250, 1251, 3, 2, 2, 2, 1251, 229, 3, 2, 2, 2, 1252, 1253, 7, 50, 2, 2, 1253, 1255, 5, 280, 138, 2, 1254, 1256, 5, 292, 144, 2, 1255, 1254, 3, 2, 2, 2, 1256, 1257, 3, 2, 2, 2, 1257, 1255, 3, 2, 2, 2, 1257, 1258, 3, 2, 2, 2, 1258, 231, 3, 2, 2, 2, 1259, 1270, 5, 366, 181, 2, 1260, 1269, 10, 4, 2, 2, 1261, 1269, 5, 220, 108, 2, 1262, 1263, 5, 300, 148, 2, 1263, 1264, 5, 366, 181, 2, 1264, 1269, 3, 2, 2, 2, 1265, 1266, 5, 366, 181, 2, 1266, 1267, 5, 366, 181, 2, 1267, 1269, 3, 2, 2, 2, 1268, 1260, 3, 2, 2, 2, 1268, 1261, 3, 2, 2, 2, 1268, 1262, 3, 2, 2, 2, 1268, 1265, 3, 2, 2, 2, 1269, 1272, 3, 2, 2, 2, 1270, 1268, 3, 2, 2, 2, 1270, 1271, 3, 2, 2, 2, 1271, 1273, 3, 2, 2, 2, 1272, 1270, 3, 2, 2, 2, 1273, 1274, 5, 366, 181, 2, 1274, 233, 3, 2, 2, 2, 1275, 1276, 9, 5, 2, 2, 1276, 235, 3, 2, 2, 2, 1277, 1278, 9, 6, 2, 2, 1278, 237, 3, 2, 2, 2, 1279, 1280, 9, 7, 2, 2, 1280, 239, 3, 2, 2, 2, 1281, 1282, 9, 8, 2, 2, 1282, 241, 3, 2, 2, 2, 1283, 1284, 9, 9, 2, 2, 1284, 243, 3, 2, 2, 2, 1285, 1286, 9, 10, 2, 2, 1286, 245, 3, 2, 2, 2, 1287, 1288, 9, 11, 2, 2, 1288, 247, 3, 2, 2, 2, 1289, 1290, 9, 12, 2, 2, 1290, 249, 3, 2, 2, 2, 1291, 1292, 9, 13, 2, 2, 1292, 251, 3, 2, 2, 2, 1293, 1294, 9, 14, 2, 2, 1294, 253, 3, 2, 2, 2, 1295, 1296, 9, 15, 2, 2, 1296, 255, 3, 2, 2, 2, 1297, 1298, 9, 16, 2, 2, 1298, 257, 3, 2, 2, 2, 1299, 1300, 9, 17, 2, 2, 1300, 259, 3, 2, 2, 2, 1301, 1302, 9, 18, 2, 2, 1302, 261, 3, 2, 2, 2, 1303, 1304, 9, 19, 2, 2, 1304, 263, 3, 2, 2, 2, 1305, 1306, 9, 20, 2, 2, 1306, 265, 3, 2, 2, 2, 1307, 1308, 9, 21, 2, 2, 1308, 267, 3, 2, 2, 2, 1309, 1310, 9, 22, 2, 2, 1310, 269, 3, 2, 2, 2, 1311, 1312, 9, 23, 2, 2, 1312, 271, 3, 2, 2, 2, 1313, 1314, 9, 24, 2, 2, 1314, 273, 3, 2, 2, 2, 1315, 1316, 9, 25, 2, 2, 1316, 275, 3, 2, 2, 2, 1317, 1318, 9, 26, 2, 2, 1318, 277, 3, 2, 2, 2, 1319, 1320, 9, 27, 2, 2, 1320, 279, 3, 2, 2, 2, 1321, 1322, 9, 28, 2, 2, 1322, 281, 3, 2, 2, 2, 1323, 1324, 9, 29, 2, 2, 1324, 283, 3, 2, 2, 2, 1325, 1326, 9, 30, 2, 2, 1326, 285, 3, 2, 2, 2, 1327, 1328, 9, 31, 2, 2, 1328, 287, 3, 2, 2, 2, 1329, 1330, 9, 32, 2, 2, 1330, 289, 3, 2, 2, 2, 1331, 1332, 9, 33, 2, 2, 1332, 291, 3, 2, 2, 2, 1333, 1334, 9, 34, 2, 2, 1334, 293, 3, 2, 2, 2, 1335, 1336, 7, 47, 2, 2, 1336, 1337, 7, 64, 2, 2, 1337, 295, 3, 2, 2, 2, 1338, 1339, 7, 44, 2, 2, 1339, 297, 3, 2, 2, 2, 1340, 1341, 7, 98, 2, 2, 1341, 299, 3, 2, 2, 2, 1342, 1343, 7, 94, 2, 2, 1343, 301, 3, 2, 2, 2, 1344, 1345, 7, 60, 2, 2, 1345, 303, 3, 2, 2, 2, 1346, 1347, 7, 46, 2, 2, 1347, 305, 3, 2, 2, 2, 1348, 1349, 7, 126, 2, 2, 1349, 1350, 7, 126, 2, 2, 1350, 307, 3, 2, 2, 2, 1351, 1352, 7, 47, 2, 2, 1352, 309, 3, 2, 2, 2, 1353, 1354, 7, 38, 2, 2, 1354, 311, 3, 2, 2, 2, 1355, 1356, 7, 48, 2, 2, 1356, 313, 3, 2, 2, 2, 1357, 1358, 7, 63, 2, 2, 1358, 1359, 7, 63, 2, 2, 1359, 315, 3, 2, 2, 2, 1360, 1361, 7, 63, 2, 2, 1361, 317, 3, 2, 2, 2, 1362, 1363, 7, 64, 2, 2, 1363, 1364, 7, 63, 2, 2, 1364, 319, 3, 2, 2, 2, 1365, 1366, 7, 64, 2, 2, 1366, 321, 3, 2, 2, 2, 1367, 1368, 7, 37, 2, 2, 1368, 323, 3, 2, 2, 2, 1369, 1370, 7, 128, 2, 2, 1370, 1371, 7, 44, 2, 2, 1371, 325, 3, 2, 2, 2, 1372, 1373, 7, 63, 2, 2, 1373, 1374, 7, 128, 2, 2, 1374, 1375, 7, 44, 2, 2, 1375, 327, 3, 2, 2, 2, 1376, 1377, 7, 125, 2, 2, 1377, 1378, 3, 2, 2, 2, 1378, 1379, 8, 162, 2, 2, 1379, 329, 3, 2, 2, 2, 1380, 1381, 7, 93, 2, 2, 1381, 331, 3, 2, 2, 2, 1382, 1383, 7, 42, 2, 2, 1383, 333, 3, 2, 2, 2, 1384, 1385, 7, 62, 2, 2, 1385, 1386, 7, 63, 2, 2, 1386, 335, 3, 2, 2, 2, 1387, 1388, 7, 62, 2, 2, 1388, 1389, 7, 49, 2, 2, 1389, 1390, 3, 2, 2, 2, 1390, 1391, 8, 166, 3, 2, 1391, 1392, 8, 166, 4, 2, 1392, 337, 3, 2, 2, 2, 1393, 1394, 7, 62, 2, 2, 1394, 1395, 6, 167, 2, 2, 1395, 1396, 3, 2, 2, 2, 1396, 1397, 8, 167, 5, 2, 1397, 1398, 8, 167, 6, 2, 1398, 339, 3, 2, 2, 2, 1399, 1400, 7, 62, 2, 2, 1400, 341, 3, 2, 2, 2, 1401, 1402, 7, 62, 2, 2, 1402, 1403, 7, 49, 2, 2, 1403, 343, 3, 2, 2, 2, 1404, 1405, 7, 35, 2, 2, 1405, 1409, 7, 63, 2, 2, 1406, 1407, 7, 62, 2, 2, 1407, 1409, 7, 64, 2, 2, 1408, 1404, 3, 2, 2, 2, 1408, 1406, 3, 2, 2, 2, 1409, 345, 3, 2, 2, 2, 1410, 1411, 7, 35, 2, 2, 1411, 1412, 7, 128, 2, 2, 1412, 1413, 7, 44, 2, 2, 1413, 347, 3, 2, 2, 2, 1414, 1415, 7, 35, 2, 2, 1415, 1416, 7, 128, 2, 2, 1416, 349, 3, 2, 2, 2, 1417, 1418, 7, 65, 2, 2, 1418, 1419, 7, 48, 2, 2, 1419, 351, 3, 2, 2, 2, 1420, 1421, 7, 65, 2, 2, 1421, 1422, 7, 65, 2, 2, 1422, 353, 3, 2, 2, 2, 1423, 1424, 7, 39, 2, 2, 1424, 355, 3, 2, 2, 2, 1425, 1426, 7, 45, 2, 2, 1426, 357, 3, 2, 2, 2, 1427, 1428, 7, 65, 2, 2, 1428, 359, 3, 2, 2, 2, 1429, 1430, 7, 36, 2, 2, 1430, 361, 3, 2, 2, 2, 1431, 1432, 7, 104, 2, 2, 1432, 1433, 7, 41, 2, 2, 1433, 1434, 3, 2, 2, 2, 1434, 1435, 8, 179, 7, 2, 1435, 363, 3, 2, 2, 2, 1436, 1437, 7, 72, 2, 2, 1437, 1438, 7, 41, 2, 2, 1438, 1439, 3, 2, 2, 2, 1439, 1440, 8, 180, 8, 2, 1440, 365, 3, 2, 2, 2, 1441, 1442, 7, 41, 2, 2, 1442, 367, 3, 2, 2, 2, 1443, 1444, 7, 128, 2, 2, 1444, 369, 3, 2, 2, 2, 1445, 1446, 7, 63, 2, 2, 1446, 1447, 7, 128, 2, 2, 1447, 371, 3, 2, 2, 2, 1448, 1449, 7, 127, 2, 2, 1449, 1450, 3, 2, 2, 2, 1450, 1451, 8, 184, 9, 2, 1451, 373, 3, 2, 2, 2, 1452, 1453, 7, 95, 2, 2, 1453, 375, 3, 2, 2, 2, 1454, 1455, 7, 43, 2, 2, 1455, 377, 3, 2, 2, 2, 1456, 1457, 7, 61, 2, 2, 1457, 379, 3, 2, 2, 2, 1458, 1459, 7, 49, 2, 2, 1459, 381, 3, 2, 2, 2, 1460, 1461, 7, 49, 2, 2, 1461, 1462, 7, 64, 2, 2, 1462, 383, 3, 2, 2, 2, 1463, 1464, 7, 97, 2, 2, 1464, 385, 3, 2, 2, 2, 1465, 1466, 7, 49, 2, 2, 1466, 1467, 7, 44, 2, 2, 1467, 1471, 3, 2, 2, 2, 1468, 1470, 11, 2, 2, 2, 1469, 1468, 3, 2, 2, 2, 1470, 1473, 3, 2, 2, 2, 1471, 1472, 3, 2, 2, 2, 1471, 1469, 3, 2, 2, 2, 1472, 1474, 3, 2, 2, 2, 1473, 1471, 3, 2, 2, 2, 1474, 1475, 7, 44, 2, 2, 1475, 1476, 7, 49, 2, 2, 1476, 1477, 3, 2, 2, 2, 1477, 1478, 8, 191, 10, 2, 1478, 387, 3, 2, 2, 2, 1479, 1480, 7, 47, 2, 2, 1480, 1484, 7, 47, 2, 2, 1481, 1482, 7, 49, 2, 2, 1482, 1484, 7, 49, 2, 2, 1483, 1479, 3, 2, 2, 2, 1483, 1481, 3, 2, 2, 2, 1484, 1488, 3, 2, 2, 2, 1485, 1487, 10, 35, 2, 2, 1486, 1485, 3, 2, 2, 2, 1487, 1490, 3, 2, 2, 2, 1488, 1486, 3, 2, 2, 2, 1488, 1489, 3, 2, 2, 2, 1489, 1492, 3, 2, 2, 2, 1490, 1488, 3, 2, 2, 2, 1491, 1493, 9, 36, 2, 2, 1492, 1491, 3, 2, 2, 2, 1493, 1494, 3, 2, 2, 2, 1494, 1495, 8, 192, 10, 2, 1495, 389, 3, 2, 2, 2, 1496, 1497, 9, 37, 2, 2, 1497, 1498, 3, 2, 2, 2, 1498, 1499, 8, 193, 11, 2, 1499, 391, 3, 2, 2, 2, 1500, 1512, 10, 38, 2, 2, 1501, 1512, 5, 220, 108, 2, 1502, 1503, 5, 300, 148, 2, 1503, 1504, 5, 366, 181, 2, 1504, 1512, 3, 2, 2, 2, 1505, 1506, 5, 300, 148, 2, 1506, 1507, 5, 328, 162, 2, 1507, 1512, 3, 2, 2, 2, 1508, 1509, 5, 366, 181, 2, 1509, 1510, 5, 366, 181, 2, 1510, 1512, 3, 2, 2, 2, 1511, 1500, 3, 2, 2, 2, 1511, 1501, 3, 2, 2, 2, 1511, 1502, 3, 2, 2, 2, 1511, 1505, 3, 2, 2, 2, 1511, 1508, 3, 2, 2, 2, 1512, 1513, 3, 2, 2, 2, 1513, 1511, 3, 2, 2, 2, 1513, 1514, 3, 2, 2, 2, 1514, 393, 3, 2, 2, 2, 1515, 1516, 5, 328, 162, 2, 1516, 1517, 3, 2, 2, 2, 1517, 1518, 8, 195, 2, 2, 1518, 395, 3, 2, 2, 2, 1519, 1520, 5, 366, 181, 2, 1520, 1521, 3, 2, 2, 2, 1521, 1522, 8, 196, 12, 2, 1522, 1523, 8, 196, 9, 2, 1523, 397, 3, 2, 2, 2, 1524, 1530, 10, 39, 2, 2, 1525, 1530, 5, 220, 108, 2, 1526, 1527, 5, 300, 148, 2, 1527, 1528, 5, 328, 162, 2, 1528, 1530, 3, 2, 2, 2, 1529, 1524, 3, 2, 2, 2, 1529, 1525, 3, 2, 2, 2, 1529, 1526, 3, 2, 2, 2, 1530, 1531, 3, 2, 2, 2, 1531, 1529, 3, 2, 2, 2, 1531, 1532, 3, 2, 2, 2, 1532, 399, 3, 2, 2, 2, 1533, 1534, 5, 328, 162, 2, 1534, 1535, 3, 2, 2, 2, 1535, 1536, 8, 198, 2, 2, 1536, 401, 3, 2, 2, 2, 1537, 1538, 7, 49, 2, 2, 1538, 1539, 7, 64, 2, 2, 1539, 1540, 3, 2, 2, 2, 1540, 1541, 8, 199, 13, 2, 1541, 1542, 8, 199, 9, 2, 1542, 403, 3, 2, 2, 2, 1543, 1544, 7, 64, 2, 2, 1544, 1545, 3, 2, 2, 2, 1545, 1546, 8, 200, 14, 2, 1546, 1547, 8, 200, 9, 2, 1547, 1548, 8, 200, 15, 2, 1548, 405, 3, 2, 2, 2, 1549, 1553, 9, 40, 2, 2, 1550, 1552, 9, 41, 2, 2, 1551, 1550, 3, 2, 2, 2, 1552, 1555, 3, 2, 2, 2, 1553, 1551, 3, 2, 2, 2, 1553, 1554, 3, 2, 2, 2, 1554, 1556, 3, 2, 2, 2, 1555, 1553, 3, 2, 2, 2, 1556, 1557, 8, 201, 16, 2, 1557, 407, 3, 2, 2, 2, 1558, 1559, 7, 63, 2, 2, 1559, 1560, 3, 2, 2, 2, 1560, 1561, 8, 202, 17, 2, 1561, 409, 3, 2, 2, 2, 1562, 1563, 5, 232, 114, 2, 1563, 1564, 3, 2, 2, 2, 1564, 1565, 8, 203, 18, 2, 1565, 411, 3, 2, 2, 2, 1566, 1568, 9, 42, 2, 2, 1567, 1566, 3, 2, 2, 2, 1568, 1569, 3, 2, 2, 2, 1569, 1567, 3, 2, 2, 2, 1569, 1570, 3, 2, 2, 2, 1570, 1571, 3, 2, 2, 2, 1571, 1572, 8, 204, 11, 2, 1572, 413, 3, 2, 2, 2, 1573, 1574, 7, 125, 2, 2, 1574, 1575, 3, 2, 2, 2, 1575, 1576, 8, 205, 19, 2, 1576, 1577, 8, 205, 2, 2, 1577, 415, 3, 2, 2, 2, 1578, 1579, 7, 64, 2, 2, 1579, 1580, 3, 2, 2, 2, 1580, 1581, 8, 206, 14, 2, 1581, 1582, 8, 206, 9, 2, 1582, 417, 3, 2, 2, 2, 1583, 1587, 9, 40, 2, 2, 1584, 1586, 9, 41, 2, 2, 1585, 1584, 3, 2, 2, 2, 1586, 1589, 3, 2, 2, 2, 1587, 1585, 3, 2, 2, 2, 1587, 1588, 3, 2, 2, 2, 1588, 1590, 3, 2, 2, 2, 1589, 1587, 3, 2, 2, 2, 1590, 1591, 8, 207, 16, 2, 1591, 419, 3, 2, 2, 2, 1592, 1594, 9, 42, 2, 2, 1593, 1592, 3, 2, 2, 2, 1594, 1595, 3, 2, 2, 2, 1595, 1593, 3, 2, 2, 2, 1595, 1596, 3, 2, 2, 2, 1596, 1597, 3, 2, 2, 2, 1597, 1598, 8, 208, 11, 2, 1598, 421, 3, 2, 2, 2, 1599, 1601, 10, 43, 2, 2, 1600, 1599, 3, 2, 2, 2, 1601, 1602, 3, 2, 2, 2, 1602, 1600, 3, 2, 2, 2, 1602, 1603, 3, 2, 2, 2, 1603, 423, 3, 2, 2, 2, 1604, 1605, 7, 125, 2, 2, 1605, 1606, 3, 2, 2, 2, 1606, 1607, 8, 210, 19, 2, 1607, 1608, 8, 210, 2, 2, 1608, 425, 3, 2, 2, 2, 1609, 1610, 7, 62, 2, 2, 1610, 1611, 7, 49, 2, 2, 1611, 1612, 3, 2, 2, 2, 1612, 1613, 8, 211, 3, 2, 1613, 1614, 8, 211, 9, 2, 1614, 1615, 8, 211, 4, 2, 1615, 427, 3, 2, 2, 2, 1616, 1617, 7, 62, 2, 2, 1617, 1618, 3, 2, 2, 2, 1618, 1619, 8, 212, 5, 2, 1619, 1620, 8, 212, 6, 2, 1620, 429, 3, 2, 2, 2, 1621, 1623, 9, 42, 2, 2, 1622, 1621, 3, 2, 2, 2, 1623, 1624, 3, 2, 2, 2, 1624, 1622, 3, 2, 2, 2, 1624, 1625, 3, 2, 2, 2, 1625, 1626, 3, 2, 2, 2, 1626, 1627, 8, 213, 11, 2, 1627, 431, 3, 2, 2, 2, 55, 2, 3, 4, 5, 6, 7, 472, 700, 1084, 1113, 1118, 1124, 1126, 1138, 1140, 1154, 1156, 1161, 1168, 1173, 1177, 1182, 1187, 1191, 1196, 1203, 1209, 1214, 1221, 1226, 1232, 1237, 1239, 1245, 1250, 1257, 1268, 1270, 1408, 1471, 1483, 1488, 1492, 1511, 1513, 1529, 1531, 1553, 1569, 1587, 1595, 1602, 1624, 20, 7, 2, 2, 9, 138, 2, 7, 6, 2, 9, 137, 2, 7, 5, 2, 7, 3, 2, 7, 4, 2, 6, 2, 2, 8, 2, 2, 2, 3, 2, 9, 150, 2, 9, 158, 2, 9, 129, 2, 7, 7, 2, 9, 110, 2, 9, 127, 2, 9, 115, 2, 9, 133, 2]
\ No newline at end of file
diff --git a/internal-packages/tsql/src/grammar/TSQLLexer.tokens b/internal-packages/tsql/src/grammar/TSQLLexer.tokens
new file mode 100644
index 00000000000..f94f7b27168
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLLexer.tokens
@@ -0,0 +1,208 @@
+ALL=1
+AND=2
+ANTI=3
+ANY=4
+ARRAY=5
+AS=6
+ASCENDING=7
+ASOF=8
+BETWEEN=9
+BOTH=10
+BY=11
+CASE=12
+CAST=13
+CATCH=14
+COHORT=15
+COLLATE=16
+CROSS=17
+CUBE=18
+CURRENT=19
+DATE=20
+DAY=21
+DESC=22
+DESCENDING=23
+DISTINCT=24
+ELSE=25
+END=26
+EXCEPT=27
+EXTRACT=28
+FINAL=29
+FINALLY=30
+FIRST=31
+FN=32
+FOLLOWING=33
+FOR=34
+FROM=35
+FULL=36
+FUN=37
+GROUP=38
+HAVING=39
+HOUR=40
+ID=41
+IF=42
+ILIKE=43
+IN=44
+INF=45
+INNER=46
+INTERSECT=47
+INTERVAL=48
+IS=49
+JOIN=50
+KEY=51
+LAST=52
+LEADING=53
+LEFT=54
+LET=55
+LIKE=56
+LIMIT=57
+MINUTE=58
+MONTH=59
+NAN_SQL=60
+NOT=61
+NULL_SQL=62
+NULLS=63
+OFFSET=64
+ON=65
+OR=66
+ORDER=67
+OUTER=68
+OVER=69
+PARTITION=70
+PRECEDING=71
+PREWHERE=72
+QUARTER=73
+RANGE=74
+RETURN=75
+RIGHT=76
+ROLLUP=77
+ROW=78
+ROWS=79
+SAMPLE=80
+SECOND=81
+SELECT=82
+SEMI=83
+SETTINGS=84
+SUBSTRING=85
+THEN=86
+THROW=87
+TIES=88
+TIMESTAMP=89
+TO=90
+TOP=91
+TOTALS=92
+TRAILING=93
+TRIM=94
+TRUNCATE=95
+TRY=96
+UNBOUNDED=97
+UNION=98
+USING=99
+WEEK=100
+WHEN=101
+WHERE=102
+WHILE=103
+WINDOW=104
+WITH=105
+YEAR=106
+ESCAPE_CHAR_COMMON=107
+IDENTIFIER=108
+FLOATING_LITERAL=109
+OCTAL_LITERAL=110
+DECIMAL_LITERAL=111
+HEXADECIMAL_LITERAL=112
+STRING_LITERAL=113
+ARROW=114
+ASTERISK=115
+BACKQUOTE=116
+BACKSLASH=117
+COLON=118
+COMMA=119
+CONCAT=120
+DASH=121
+DOLLAR=122
+DOT=123
+EQ_DOUBLE=124
+EQ_SINGLE=125
+GT_EQ=126
+GT=127
+HASH=128
+IREGEX_SINGLE=129
+IREGEX_DOUBLE=130
+LBRACE=131
+LBRACKET=132
+LPAREN=133
+LT_EQ=134
+LT=135
+LT_SLASH=136
+NOT_EQ=137
+NOT_IREGEX=138
+NOT_REGEX=139
+NULL_PROPERTY=140
+NULLISH=141
+PERCENT=142
+PLUS=143
+QUERY=144
+QUOTE_DOUBLE=145
+QUOTE_SINGLE_TEMPLATE=146
+QUOTE_SINGLE_TEMPLATE_FULL=147
+QUOTE_SINGLE=148
+REGEX_SINGLE=149
+REGEX_DOUBLE=150
+RBRACE=151
+RBRACKET=152
+RPAREN=153
+SEMICOLON=154
+SLASH=155
+SLASH_GT=156
+UNDERSCORE=157
+MULTI_LINE_COMMENT=158
+SINGLE_LINE_COMMENT=159
+WHITESPACE=160
+STRING_TEXT=161
+STRING_ESCAPE_TRIGGER=162
+FULL_STRING_TEXT=163
+FULL_STRING_ESCAPE_TRIGGER=164
+TAG_WS=165
+TAGC_WS=166
+TSQLX_TEXT_TEXT=167
+TSQLX_TEXT_WS=168
+'->'=114
+'*'=115
+'`'=116
+'\\'=117
+':'=118
+','=119
+'||'=120
+'-'=121
+'$'=122
+'.'=123
+'=='=124
+'>='=126
+'#'=128
+'~*'=129
+'=~*'=130
+'{'=131
+'['=132
+'('=133
+'<='=134
+'<'=135
+'</'=136
+'!~*'=138
+'!~'=139
+'?.'=140
+'??'=141
+'%'=142
+'+'=143
+'?'=144
+'"'=145
+'f\''=146
+'F\''=147
+'\''=148
+'~'=149
+'=~'=150
+'}'=151
+']'=152
+')'=153
+';'=154
+'/'=155
+'_'=157
diff --git a/internal-packages/tsql/src/grammar/TSQLLexer.ts b/internal-packages/tsql/src/grammar/TSQLLexer.ts
new file mode 100644
index 00000000000..df2a081794a
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLLexer.ts
@@ -0,0 +1,1730 @@
+// Generated from src/grammar/TSQLLexer.g4 by ANTLR 4.9.0-SNAPSHOT
+
+// put any global imports you need here
+
+import { ATN } from "antlr4ts/atn/ATN";
+import { ATNDeserializer } from "antlr4ts/atn/ATNDeserializer";
+import { CharStream } from "antlr4ts/CharStream";
+import { Lexer } from "antlr4ts/Lexer";
+import { LexerATNSimulator } from "antlr4ts/atn/LexerATNSimulator";
+import { NotNull } from "antlr4ts/Decorators";
+import { Override } from "antlr4ts/Decorators";
+import { RuleContext } from "antlr4ts/RuleContext";
+import { Vocabulary } from "antlr4ts/Vocabulary";
+import { VocabularyImpl } from "antlr4ts/VocabularyImpl";
+
+import * as Utils from "antlr4ts/misc/Utils";
+
+export class TSQLLexer extends Lexer {
+  public static readonly ALL = 1;
+  public static readonly AND = 2;
+  public static readonly ANTI = 3;
+  public static readonly ANY = 4;
+  public static readonly ARRAY = 5;
+  public static readonly AS = 6;
+  public static readonly ASCENDING = 7;
+  public static readonly ASOF = 8;
+  public static readonly BETWEEN = 9;
+  public static readonly BOTH = 10;
+  public static readonly BY = 11;
+  public static readonly CASE = 12;
+  public static readonly CAST = 13;
+  public static readonly CATCH = 14;
+  public static readonly COHORT = 15;
+  public static readonly COLLATE = 16;
+  public static readonly CROSS = 17;
+  public static readonly CUBE = 18;
+  public static readonly CURRENT = 19;
+  public static readonly DATE = 20;
+  public static readonly DAY = 21;
+  public static readonly DESC = 22;
+  public static readonly DESCENDING = 23;
+  public static readonly DISTINCT = 24;
+  public static readonly ELSE = 25;
+  public static readonly END = 26;
+  public static readonly EXCEPT = 27;
+  public static readonly EXTRACT = 28;
+  public static readonly FINAL = 29;
+  public static readonly FINALLY = 30;
+  public static readonly FIRST = 31;
+  public static readonly FN = 32;
+  public static readonly FOLLOWING = 33;
+  public static readonly FOR = 34;
+  public static readonly FROM = 35;
+  public static readonly FULL = 36;
+  public static readonly FUN = 37;
+  public static readonly GROUP = 38;
+  public static readonly HAVING = 39;
+  public static readonly HOUR = 40;
+  public static readonly ID = 41;
+  public static readonly IF = 42;
+  public static readonly ILIKE = 43;
+  public static readonly IN = 44;
+  public static readonly INF = 45;
+  public static readonly INNER = 46;
+  public static readonly INTERSECT = 47;
+  public static readonly INTERVAL = 48;
+  public static readonly IS = 49;
+  public static readonly JOIN = 50;
+  public static readonly KEY = 51;
+  public static readonly LAST = 52;
+  public static readonly LEADING = 53;
+  public static readonly LEFT = 54;
+  public static readonly LET = 55;
+  public static readonly LIKE = 56;
+  public static readonly LIMIT = 57;
+  public static readonly MINUTE = 58;
+  public static readonly MONTH = 59;
+  public static readonly NAN_SQL = 60;
+  public static readonly NOT = 61;
+  public static readonly NULL_SQL = 62;
+  public static readonly NULLS = 63;
+  public static readonly OFFSET = 64;
+  public static readonly ON = 65;
+  public static readonly OR = 66;
+  public static readonly ORDER = 67;
+  public static readonly OUTER = 68;
+  public static readonly OVER = 69;
+  public static readonly PARTITION = 70;
+  public static readonly PRECEDING = 71;
+  public static readonly PREWHERE = 72;
+  public static readonly QUARTER = 73;
+  public static readonly RANGE = 74;
+  public static readonly RETURN = 75;
+  public static readonly RIGHT = 76;
+  public static readonly ROLLUP = 77;
+  public static readonly ROW = 78;
+  public static readonly ROWS = 79;
+  public static readonly SAMPLE = 80;
+  public static readonly SECOND = 81;
+  public static readonly SELECT = 82;
+  public static readonly SEMI = 83;
+  public static readonly SETTINGS = 84;
+  public static readonly SUBSTRING = 85;
+  public static readonly THEN = 86;
+  public static readonly THROW = 87;
+  public static readonly TIES = 88;
+  public static readonly TIMESTAMP = 89;
+  public static readonly TO = 90;
+  public static readonly TOP = 91;
+  public static readonly TOTALS = 92;
+  public static readonly TRAILING = 93;
+  public static readonly TRIM = 94;
+  public static readonly TRUNCATE = 95;
+  public static readonly TRY = 96;
+  public static readonly UNBOUNDED = 97;
+  public static readonly UNION = 98;
+  public static readonly USING = 99;
+  public static readonly WEEK = 100;
+  public static readonly WHEN = 101;
+  public static readonly WHERE = 102;
+  public static readonly WHILE = 103;
+  public static readonly WINDOW = 104;
+  public static readonly WITH = 105;
+  public static readonly YEAR = 106;
+  public static readonly ESCAPE_CHAR_COMMON = 107;
+  public static readonly IDENTIFIER = 108;
+  public static readonly FLOATING_LITERAL = 109;
+  public static readonly OCTAL_LITERAL = 110;
+  public static readonly DECIMAL_LITERAL = 111;
+  public static readonly HEXADECIMAL_LITERAL = 112;
+  public static readonly STRING_LITERAL = 113;
+  public static readonly ARROW = 114;
+  public static readonly ASTERISK = 115;
+  public static readonly BACKQUOTE = 116;
+  public static readonly BACKSLASH = 117;
+  public static readonly COLON = 118;
+  public static readonly COMMA = 119;
+  public static readonly CONCAT = 120;
+  public static readonly DASH = 121;
+  public static readonly DOLLAR = 122;
+  public static readonly DOT = 123;
+  public static readonly EQ_DOUBLE = 124;
+  public static readonly EQ_SINGLE = 125;
+  public static readonly GT_EQ = 126;
+  public static readonly GT = 127;
+  public static readonly HASH = 128;
+  public static readonly IREGEX_SINGLE = 129;
+  public static readonly IREGEX_DOUBLE = 130;
+  public static readonly LBRACE = 131;
+  public static readonly LBRACKET = 132;
+  public static readonly LPAREN = 133;
+  public static readonly LT_EQ = 134;
+  public static readonly LT = 135;
+  public static readonly LT_SLASH = 136;
+  public static readonly NOT_EQ = 137;
+  public static readonly NOT_IREGEX = 138;
+  public static readonly NOT_REGEX = 139;
+  public static readonly NULL_PROPERTY = 140;
+  public static readonly NULLISH = 141;
+  public static readonly PERCENT = 142;
+  public static readonly PLUS = 143;
+  public static readonly QUERY = 144;
+  public static readonly QUOTE_DOUBLE = 145;
+  public static readonly QUOTE_SINGLE_TEMPLATE = 146;
+  public static readonly QUOTE_SINGLE_TEMPLATE_FULL = 147;
+  public static readonly QUOTE_SINGLE = 148;
+  public static readonly REGEX_SINGLE = 149;
+  public static readonly REGEX_DOUBLE = 150;
+  public static readonly RBRACE = 151;
+  public static readonly RBRACKET = 152;
+  public static readonly RPAREN = 153;
+  public static readonly SEMICOLON = 154;
+  public static readonly SLASH = 155;
+  public static readonly SLASH_GT = 156;
+  public static readonly UNDERSCORE = 157;
+  public static readonly MULTI_LINE_COMMENT = 158;
+  public static readonly SINGLE_LINE_COMMENT = 159;
+  public static readonly WHITESPACE = 160;
+  public static readonly STRING_TEXT = 161;
+  public static readonly STRING_ESCAPE_TRIGGER = 162;
+  public static readonly FULL_STRING_TEXT = 163;
+  public static readonly FULL_STRING_ESCAPE_TRIGGER = 164;
+  public static readonly TAG_WS = 165;
+  public static readonly TAGC_WS = 166;
+  public static readonly TSQLX_TEXT_TEXT = 167;
+  public static readonly TSQLX_TEXT_WS = 168;
+  public static readonly IN_TEMPLATE_STRING = 1;
+  public static readonly IN_FULL_TEMPLATE_STRING = 2;
+  public static readonly TSQLX_TAG_OPEN = 3;
+  public static readonly TSQLX_TAG_CLOSE = 4;
+  public static readonly TSQLX_TEXT = 5;
+
+  // tslint:disable:no-trailing-whitespace
+  public static readonly channelNames: string[] = ["DEFAULT_TOKEN_CHANNEL", "HIDDEN"];
+
+  // tslint:disable:no-trailing-whitespace
+  public static readonly modeNames: string[] = [
+    "DEFAULT_MODE",
+    "IN_TEMPLATE_STRING",
+    "IN_FULL_TEMPLATE_STRING",
+    "TSQLX_TAG_OPEN",
+    "TSQLX_TAG_CLOSE",
+    "TSQLX_TEXT",
+  ];
+
+  public static readonly ruleNames: string[] = [
+    "ALL",
+    "AND",
+    "ANTI",
+    "ANY",
+    "ARRAY",
+    "AS",
+    "ASCENDING",
+    "ASOF",
+    "BETWEEN",
+    "BOTH",
+    "BY",
+    "CASE",
+    "CAST",
+    "CATCH",
+    "COHORT",
+    "COLLATE",
+    "CROSS",
+    "CUBE",
+    "CURRENT",
+    "DATE",
+    "DAY",
+    "DESC",
+    "DESCENDING",
+    "DISTINCT",
+    "ELSE",
+    "END",
+    "EXCEPT",
+    "EXTRACT",
+    "FINAL",
+    "FINALLY",
+    "FIRST",
+    "FN",
+    "FOLLOWING",
+    "FOR",
+    "FROM",
+    "FULL",
+    "FUN",
+    "GROUP",
+    "HAVING",
+    "HOUR",
+    "ID",
+    "IF",
+    "ILIKE",
+    "IN",
+    "INF",
+    "INNER",
+    "INTERSECT",
+    "INTERVAL",
+    "IS",
+    "JOIN",
+    "KEY",
+    "LAST",
+    "LEADING",
+    "LEFT",
+    "LET",
+    "LIKE",
+    "LIMIT",
+    "MINUTE",
+    "MONTH",
+    "NAN_SQL",
+    "NOT",
+    "NULL_SQL",
+    "NULLS",
+    "OFFSET",
+    "ON",
+    "OR",
+    "ORDER",
+    "OUTER",
+    "OVER",
+    "PARTITION",
+    "PRECEDING",
+    "PREWHERE",
+    "QUARTER",
+    "RANGE",
+    "RETURN",
+    "RIGHT",
+    "ROLLUP",
+    "ROW",
+    "ROWS",
+    "SAMPLE",
+    "SECOND",
+    "SELECT",
+    "SEMI",
+    "SETTINGS",
+    "SUBSTRING",
+    "THEN",
+    "THROW",
+    "TIES",
+    "TIMESTAMP",
+    "TO",
+    "TOP",
+    "TOTALS",
+    "TRAILING",
+    "TRIM",
+    "TRUNCATE",
+    "TRY",
+    "UNBOUNDED",
+    "UNION",
+    "USING",
+    "WEEK",
+    "WHEN",
+    "WHERE",
+    "WHILE",
+    "WINDOW",
+    "WITH",
+    "YEAR",
+    "ESCAPE_CHAR_COMMON",
+    "IDENTIFIER",
+    "FLOATING_LITERAL",
+    "OCTAL_LITERAL",
+    "DECIMAL_LITERAL",
+    "HEXADECIMAL_LITERAL",
+    "STRING_LITERAL",
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+    "LETTER",
+    "OCT_DIGIT",
+    "DEC_DIGIT",
+    "HEX_DIGIT",
+    "ARROW",
+    "ASTERISK",
+    "BACKQUOTE",
+    "BACKSLASH",
+    "COLON",
+    "COMMA",
+    "CONCAT",
+    "DASH",
+    "DOLLAR",
+    "DOT",
+    "EQ_DOUBLE",
+    "EQ_SINGLE",
+    "GT_EQ",
+    "GT",
+    "HASH",
+    "IREGEX_SINGLE",
+    "IREGEX_DOUBLE",
+    "LBRACE",
+    "LBRACKET",
+    "LPAREN",
+    "LT_EQ",
+    "TAG_LT_SLASH",
+    "TAG_LT_OPEN",
+    "LT",
+    "LT_SLASH",
+    "NOT_EQ",
+    "NOT_IREGEX",
+    "NOT_REGEX",
+    "NULL_PROPERTY",
+    "NULLISH",
+    "PERCENT",
+    "PLUS",
+    "QUERY",
+    "QUOTE_DOUBLE",
+    "QUOTE_SINGLE_TEMPLATE",
+    "QUOTE_SINGLE_TEMPLATE_FULL",
+    "QUOTE_SINGLE",
+    "REGEX_SINGLE",
+    "REGEX_DOUBLE",
+    "RBRACE",
+    "RBRACKET",
+    "RPAREN",
+    "SEMICOLON",
+    "SLASH",
+    "SLASH_GT",
+    "UNDERSCORE",
+    "MULTI_LINE_COMMENT",
+    "SINGLE_LINE_COMMENT",
+    "WHITESPACE",
+    "STRING_TEXT",
+    "STRING_ESCAPE_TRIGGER",
+    "STRING_QUOTE_SINGLE",
+    "FULL_STRING_TEXT",
+    "FULL_STRING_ESCAPE_TRIGGER",
+    "TAG_SELF_CLOSE_GT",
+    "TAG_OPEN_GT",
+    "TAG_IDENT",
+    "TAG_EQ",
+    "TAG_STRING",
+    "TAG_WS",
+    "TAG_LBRACE",
+    "TAGC_GT",
+    "TAGC_IDENT",
+    "TAGC_WS",
+    "TSQLX_TEXT_TEXT",
+    "TSQLX_TEXT_LBRACE",
+    "TSQLX_TEXT_LT_SLASH",
+    "TSQLX_TEXT_LT",
+    "TSQLX_TEXT_WS",
+  ];
+
+  private static readonly _LITERAL_NAMES: Array<string | undefined> = [
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    "'->'",
+    "'*'",
+    "'`'",
+    "'\\'",
+    "':'",
+    "','",
+    "'||'",
+    "'-'",
+    "'$'",
+    "'.'",
+    "'=='",
+    undefined,
+    "'>='",
+    undefined,
+    "'#'",
+    "'~*'",
+    "'=~*'",
+    "'{'",
+    "'['",
+    "'('",
+    "'<='",
+    "'<'",
+    "'</'",
+    undefined,
+    "'!~*'",
+    "'!~'",
+    "'?.'",
+    "'??'",
+    "'%'",
+    "'+'",
+    "'?'",
+    "'\"'",
+    "'f''",
+    "'F''",
+    "'''",
+    "'~'",
+    "'=~'",
+    "'}'",
+    "']'",
+    "')'",
+    "';'",
+    "'/'",
+    undefined,
+    "'_'",
+  ];
+  private static readonly _SYMBOLIC_NAMES: Array<string | undefined> = [
+    undefined,
+    "ALL",
+    "AND",
+    "ANTI",
+    "ANY",
+    "ARRAY",
+    "AS",
+    "ASCENDING",
+    "ASOF",
+    "BETWEEN",
+    "BOTH",
+    "BY",
+    "CASE",
+    "CAST",
+    "CATCH",
+    "COHORT",
+    "COLLATE",
+    "CROSS",
+    "CUBE",
+    "CURRENT",
+    "DATE",
+    "DAY",
+    "DESC",
+    "DESCENDING",
+    "DISTINCT",
+    "ELSE",
+    "END",
+    "EXCEPT",
+    "EXTRACT",
+    "FINAL",
+    "FINALLY",
+    "FIRST",
+    "FN",
+    "FOLLOWING",
+    "FOR",
+    "FROM",
+    "FULL",
+    "FUN",
+    "GROUP",
+    "HAVING",
+    "HOUR",
+    "ID",
+    "IF",
+    "ILIKE",
+    "IN",
+    "INF",
+    "INNER",
+    "INTERSECT",
+    "INTERVAL",
+    "IS",
+    "JOIN",
+    "KEY",
+    "LAST",
+    "LEADING",
+    "LEFT",
+    "LET",
+    "LIKE",
+    "LIMIT",
+    "MINUTE",
+    "MONTH",
+    "NAN_SQL",
+    "NOT",
+    "NULL_SQL",
+    "NULLS",
+    "OFFSET",
+    "ON",
+    "OR",
+    "ORDER",
+    "OUTER",
+    "OVER",
+    "PARTITION",
+    "PRECEDING",
+    "PREWHERE",
+    "QUARTER",
+    "RANGE",
+    "RETURN",
+    "RIGHT",
+    "ROLLUP",
+    "ROW",
+    "ROWS",
+    "SAMPLE",
+    "SECOND",
+    "SELECT",
+    "SEMI",
+    "SETTINGS",
+    "SUBSTRING",
+    "THEN",
+    "THROW",
+    "TIES",
+    "TIMESTAMP",
+    "TO",
+    "TOP",
+    "TOTALS",
+    "TRAILING",
+    "TRIM",
+    "TRUNCATE",
+    "TRY",
+    "UNBOUNDED",
+    "UNION",
+    "USING",
+    "WEEK",
+    "WHEN",
+    "WHERE",
+    "WHILE",
+    "WINDOW",
+    "WITH",
+    "YEAR",
+    "ESCAPE_CHAR_COMMON",
+    "IDENTIFIER",
+    "FLOATING_LITERAL",
+    "OCTAL_LITERAL",
+    "DECIMAL_LITERAL",
+    "HEXADECIMAL_LITERAL",
+    "STRING_LITERAL",
+    "ARROW",
+    "ASTERISK",
+    "BACKQUOTE",
+    "BACKSLASH",
+    "COLON",
+    "COMMA",
+    "CONCAT",
+    "DASH",
+    "DOLLAR",
+    "DOT",
+    "EQ_DOUBLE",
+    "EQ_SINGLE",
+    "GT_EQ",
+    "GT",
+    "HASH",
+    "IREGEX_SINGLE",
+    "IREGEX_DOUBLE",
+    "LBRACE",
+    "LBRACKET",
+    "LPAREN",
+    "LT_EQ",
+    "LT",
+    "LT_SLASH",
+    "NOT_EQ",
+    "NOT_IREGEX",
+    "NOT_REGEX",
+    "NULL_PROPERTY",
+    "NULLISH",
+    "PERCENT",
+    "PLUS",
+    "QUERY",
+    "QUOTE_DOUBLE",
+    "QUOTE_SINGLE_TEMPLATE",
+    "QUOTE_SINGLE_TEMPLATE_FULL",
+    "QUOTE_SINGLE",
+    "REGEX_SINGLE",
+    "REGEX_DOUBLE",
+    "RBRACE",
+    "RBRACKET",
+    "RPAREN",
+    "SEMICOLON",
+    "SLASH",
+    "SLASH_GT",
+    "UNDERSCORE",
+    "MULTI_LINE_COMMENT",
+    "SINGLE_LINE_COMMENT",
+    "WHITESPACE",
+    "STRING_TEXT",
+    "STRING_ESCAPE_TRIGGER",
+    "FULL_STRING_TEXT",
+    "FULL_STRING_ESCAPE_TRIGGER",
+    "TAG_WS",
+    "TAGC_WS",
+    "TSQLX_TEXT_TEXT",
+    "TSQLX_TEXT_WS",
+  ];
+  public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(
+    TSQLLexer._LITERAL_NAMES,
+    TSQLLexer._SYMBOLIC_NAMES,
+    []
+  );
+
+  // @Override
+  // @NotNull
+  public get vocabulary(): Vocabulary {
+    return TSQLLexer.VOCABULARY;
+  }
+  // tslint:enable:no-trailing-whitespace
+
+  private _peekChar(k: number): string {
+    // Return the k-th look-ahead as a *single-char string* or '\0' at EOF.
+    const c = this._input.LA(k); // int code point or IntStream.EOF (-1)
+    if (c < 0 || c > 0x10ffff) {
+      // EOF or out-of-range → sentinel
+      return "\0";
+    }
+    return String.fromCharCode(c);
+  }
+
+  private _skipWsAndComments(idx: number): number {
+    // Return the first index ≥ idx that is *not* whitespace / single-line comment.
+    while (true) {
+      const ch = this._peekChar(idx);
+      if (/\s/.test(ch)) {
+        // spaces, newlines, tabs …
+        idx++;
+        continue;
+      }
+
+      // single-line comments
+      if (ch === "/" && this._peekChar(idx + 1) === "/") {
+        // //
+        idx += 2;
+      } else if (ch === "-" && this._peekChar(idx + 1) === "-") {
+        // --
+        idx += 2;
+      } else if (ch === "#") {
+        // #
+        idx++;
+      } else {
+        break; // no ws / comment
+      }
+      // consume until EOL / EOF
+      while (!["\0", "\n", "\r"].includes(this._peekChar(idx))) {
+        idx++;
+      }
+    }
+    return idx;
+  }
+
+  // ───── opening tag test ─────
+  isOpeningTag(): boolean {
+    const ch1 = this._peekChar(1);
+    if (!(/[a-zA-Z]/.test(ch1) || ch1 === "_")) {
+      return false; // not a tag name start
+    }
+
+    // skip tag name
+    let i = 2;
+    while (true) {
+      const ch = this._peekChar(i);
+      if (/[a-zA-Z0-9]/.test(ch) || ch === "_" || ch === "-") {
+        i++;
+      } else {
+        break;
+      }
+    }
+
+    let ch = this._peekChar(i);
+
+    // immediate delimiter → tag
+    if (ch === ">" || ch === "/") {
+      return true;
+    }
+
+    // need to look beyond whitespace
+    if (/\s/.test(ch)) {
+      i = this._skipWsAndComments(i + 1);
+      ch = this._peekChar(i);
+      return ch === ">" || ch === "/" || /[a-zA-Z0-9]/.test(ch) || ch === "_";
+    }
+
+    // anything else → not a tag
+    return false;
+  }
+
+  constructor(input: CharStream) {
+    super(input);
+    this._interp = new LexerATNSimulator(TSQLLexer._ATN, this);
+  }
+
+  // @Override
+  public get grammarFileName(): string {
+    return "TSQLLexer.g4";
+  }
+
+  // @Override
+  public get ruleNames(): string[] {
+    return TSQLLexer.ruleNames;
+  }
+
+  // @Override
+  public get serializedATN(): string {
+    return TSQLLexer._serializedATN;
+  }
+
+  // @Override
+  public get channelNames(): string[] {
+    return TSQLLexer.channelNames;
+  }
+
+  // @Override
+  public get modeNames(): string[] {
+    return TSQLLexer.modeNames;
+  }
+
+  // @Override
+  public sempred(_localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
+    switch (ruleIndex) {
+      case 165:
+        return this.TAG_LT_OPEN_sempred(_localctx, predIndex);
+    }
+    return true;
+  }
+  private TAG_LT_OPEN_sempred(_localctx: RuleContext, predIndex: number): boolean {
+    switch (predIndex) {
+      case 0:
+        return this.isOpeningTag();
+    }
+    return true;
+  }
+
+  private static readonly _serializedATNSegments: number = 3;
+  private static readonly _serializedATNSegment0: string =
+    "\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x02\xAA\u065C\b\x01" +
+    "\b\x01\b\x01\b\x01\b\x01\b\x01\x04\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04" +
+    "\x04\x05\t\x05\x04\x06\t\x06\x04\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t" +
+    "\n\x04\v\t\v\x04\f\t\f\x04\r\t\r\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t" +
+    "\x10\x04\x11\t\x11\x04\x12\t\x12\x04\x13\t\x13\x04\x14\t\x14\x04\x15\t" +
+    "\x15\x04\x16\t\x16\x04\x17\t\x17\x04\x18\t\x18\x04\x19\t\x19\x04\x1A\t" +
+    "\x1A\x04\x1B\t\x1B\x04\x1C\t\x1C\x04\x1D\t\x1D\x04\x1E\t\x1E\x04\x1F\t" +
+    '\x1F\x04 \t \x04!\t!\x04"\t"\x04#\t#\x04$\t$\x04%\t%\x04&\t&\x04\'\t' +
+    "'\x04(\t(\x04)\t)\x04*\t*\x04+\t+\x04,\t,\x04-\t-\x04.\t.\x04/\t/\x04" +
+    "0\t0\x041\t1\x042\t2\x043\t3\x044\t4\x045\t5\x046\t6\x047\t7\x048\t8\x04" +
+    "9\t9\x04:\t:\x04;\t;\x04<\t<\x04=\t=\x04>\t>\x04?\t?\x04@\t@\x04A\tA\x04" +
+    "B\tB\x04C\tC\x04D\tD\x04E\tE\x04F\tF\x04G\tG\x04H\tH\x04I\tI\x04J\tJ\x04" +
+    "K\tK\x04L\tL\x04M\tM\x04N\tN\x04O\tO\x04P\tP\x04Q\tQ\x04R\tR\x04S\tS\x04" +
+    "T\tT\x04U\tU\x04V\tV\x04W\tW\x04X\tX\x04Y\tY\x04Z\tZ\x04[\t[\x04\\\t\\" +
+    "\x04]\t]\x04^\t^\x04_\t_\x04`\t`\x04a\ta\x04b\tb\x04c\tc\x04d\td\x04e" +
+    "\te\x04f\tf\x04g\tg\x04h\th\x04i\ti\x04j\tj\x04k\tk\x04l\tl\x04m\tm\x04" +
+    "n\tn\x04o\to\x04p\tp\x04q\tq\x04r\tr\x04s\ts\x04t\tt\x04u\tu\x04v\tv\x04" +
+    "w\tw\x04x\tx\x04y\ty\x04z\tz\x04{\t{\x04|\t|\x04}\t}\x04~\t~\x04\x7F\t" +
+    "\x7F\x04\x80\t\x80\x04\x81\t\x81\x04\x82\t\x82\x04\x83\t\x83\x04\x84\t" +
+    "\x84\x04\x85\t\x85\x04\x86\t\x86\x04\x87\t\x87\x04\x88\t\x88\x04\x89\t" +
+    "\x89\x04\x8A\t\x8A\x04\x8B\t\x8B\x04\x8C\t\x8C\x04\x8D\t\x8D\x04\x8E\t" +
+    "\x8E\x04\x8F\t\x8F\x04\x90\t\x90\x04\x91\t\x91\x04\x92\t\x92\x04\x93\t" +
+    "\x93\x04\x94\t\x94\x04\x95\t\x95\x04\x96\t\x96\x04\x97\t\x97\x04\x98\t" +
+    "\x98\x04\x99\t\x99\x04\x9A\t\x9A\x04\x9B\t\x9B\x04\x9C\t\x9C\x04\x9D\t" +
+    "\x9D\x04\x9E\t\x9E\x04\x9F\t\x9F\x04\xA0\t\xA0\x04\xA1\t\xA1\x04\xA2\t" +
+    "\xA2\x04\xA3\t\xA3\x04\xA4\t\xA4\x04\xA5\t\xA5\x04\xA6\t\xA6\x04\xA7\t" +
+    "\xA7\x04\xA8\t\xA8\x04\xA9\t\xA9\x04\xAA\t\xAA\x04\xAB\t\xAB\x04\xAC\t" +
+    "\xAC\x04\xAD\t\xAD\x04\xAE\t\xAE\x04\xAF\t\xAF\x04\xB0\t\xB0\x04\xB1\t" +
+    "\xB1\x04\xB2\t\xB2\x04\xB3\t\xB3\x04\xB4\t\xB4\x04\xB5\t\xB5\x04\xB6\t" +
+    "\xB6\x04\xB7\t\xB7\x04\xB8\t\xB8\x04\xB9\t\xB9\x04\xBA\t\xBA\x04\xBB\t" +
+    "\xBB\x04\xBC\t\xBC\x04\xBD\t\xBD\x04\xBE\t\xBE\x04\xBF\t\xBF\x04\xC0\t" +
+    "\xC0\x04\xC1\t\xC1\x04\xC2\t\xC2\x04\xC3\t\xC3\x04\xC4\t\xC4\x04\xC5\t" +
+    "\xC5\x04\xC6\t\xC6\x04\xC7\t\xC7\x04\xC8\t\xC8\x04\xC9\t\xC9\x04\xCA\t" +
+    "\xCA\x04\xCB\t\xCB\x04\xCC\t\xCC\x04\xCD\t\xCD\x04\xCE\t\xCE\x04\xCF\t" +
+    "\xCF\x04\xD0\t\xD0\x04\xD1\t\xD1\x04\xD2\t\xD2\x04\xD3\t\xD3\x04\xD4\t" +
+    "\xD4\x04\xD5\t\xD5\x03\x02\x03\x02\x03\x02\x03\x02\x03\x03\x03\x03\x03" +
+    "\x03\x03\x03\x03\x04\x03\x04\x03\x04\x03\x04\x03\x04\x03\x05\x03\x05\x03" +
+    "\x05\x03\x05\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x06\x03\x07\x03" +
+    "\x07\x03\x07\x03\b\x03\b\x03\b\x03\b\x03\b\x03\b\x03\b\x03\b\x03\b\x03" +
+    "\b\x03\b\x03\b\x03\b\x03\b\x05\b\u01D9\n\b\x03\t\x03\t\x03\t\x03\t\x03" +
+    "\t\x03\n\x03\n\x03\n\x03\n\x03\n\x03\n\x03\n\x03\n\x03\v\x03\v\x03\v\x03" +
+    "\v\x03\v\x03\f\x03\f\x03\f\x03\r\x03\r\x03\r\x03\r\x03\r\x03\x0E\x03\x0E" +
+    "\x03\x0E\x03\x0E\x03\x0E\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F" +
+    "\x03\x10\x03\x10\x03\x10\x03\x10\x03\x10\x03\x10\x03\x10\x03\x11\x03\x11" +
+    "\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11\x03\x12\x03\x12\x03\x12" +
+    "\x03\x12\x03\x12\x03\x12\x03\x13\x03\x13\x03\x13\x03\x13\x03\x13\x03\x14" +
+    "\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x14\x03\x15\x03\x15" +
+    "\x03\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x03\x16\x03\x17\x03\x17" +
+    "\x03\x17\x03\x17\x03\x17\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18" +
+    "\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x03\x19\x03\x19\x03\x19\x03\x19" +
+    "\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x1A\x03\x1A\x03\x1A\x03\x1A" +
+    "\x03\x1A\x03\x1B\x03\x1B\x03\x1B\x03\x1B\x03\x1C\x03\x1C\x03\x1C\x03\x1C" +
+    "\x03\x1C\x03\x1C\x03\x1C\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x03\x1D" +
+    "\x03\x1D\x03\x1D\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1E\x03\x1F" +
+    "\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03\x1F\x03 \x03 \x03" +
+    ' \x03 \x03 \x03 \x03!\x03!\x03!\x03"\x03"\x03"\x03"\x03"\x03"\x03' +
+    '"\x03"\x03"\x03"\x03#\x03#\x03#\x03#\x03$\x03$\x03$\x03$\x03$\x03' +
+    "%\x03%\x03%\x03%\x03%\x03&\x03&\x03&\x03&\x03'\x03'\x03'\x03'\x03" +
+    "'\x03'\x03(\x03(\x03(\x03(\x03(\x03(\x03(\x03)\x03)\x03)\x03)\x03)\x03" +
+    "*\x03*\x03*\x03+\x03+\x03+\x03,\x03,\x03,\x03,\x03,\x03,\x03-\x03-\x03" +
+    "-\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x05" +
+    ".\u02BD\n.\x03/\x03/\x03/\x03/\x03/\x03/\x030\x030\x030\x030\x030\x03" +
+    "0\x030\x030\x030\x030\x031\x031\x031\x031\x031\x031\x031\x031\x031\x03" +
+    "2\x032\x032\x033\x033\x033\x033\x033\x034\x034\x034\x034\x035\x035\x03" +
+    "5\x035\x035\x036\x036\x036\x036\x036\x036\x036\x036\x037\x037\x037\x03" +
+    "7\x037\x038\x038\x038\x038\x039\x039\x039\x039\x039\x03:\x03:\x03:\x03" +
+    ":\x03:\x03:\x03;\x03;\x03;\x03;\x03;\x03;\x03;\x03<\x03<\x03<\x03<\x03" +
+    "<\x03<\x03=\x03=\x03=\x03=\x03>\x03>\x03>\x03>\x03?\x03?\x03?\x03?\x03" +
+    "?\x03@\x03@\x03@\x03@\x03@\x03@\x03A\x03A\x03A\x03A\x03A\x03A\x03A\x03" +
+    "B\x03B\x03B\x03C\x03C\x03C\x03D\x03D\x03D\x03D\x03D\x03D\x03E\x03E\x03" +
+    "E\x03E\x03E\x03E\x03F\x03F\x03F\x03F\x03F\x03G\x03G\x03G\x03G\x03G\x03" +
+    "G\x03G\x03G\x03G\x03G\x03H\x03H\x03H\x03H\x03H\x03H\x03H\x03H\x03H\x03" +
+    "H\x03I\x03I\x03I\x03I\x03I\x03I\x03I\x03I\x03I\x03J\x03J\x03J\x03J\x03" +
+    "J\x03J\x03J\x03J\x03K\x03K\x03K\x03K\x03K\x03K\x03L\x03L\x03L\x03L\x03" +
+    "L\x03L\x03L\x03M\x03M\x03M\x03M\x03M\x03M\x03N\x03N\x03N\x03N\x03N\x03" +
+    "N\x03N\x03O\x03O\x03O\x03O\x03P\x03P\x03P\x03P\x03P\x03Q\x03Q\x03Q\x03" +
+    "Q\x03Q\x03Q\x03Q\x03R\x03R\x03R\x03R\x03R\x03R\x03R\x03S\x03S\x03S\x03" +
+    "S\x03S\x03S\x03S\x03T\x03T\x03T\x03T\x03T\x03U\x03U\x03U\x03U\x03U\x03" +
+    "U\x03U\x03U\x03U\x03V\x03V\x03V\x03V\x03V\x03V\x03V\x03V\x03V\x03V\x03" +
+    "W\x03W\x03W\x03W\x03W\x03X\x03X\x03X\x03X\x03X\x03X\x03Y\x03Y\x03Y\x03" +
+    "Y\x03Y\x03Z\x03Z\x03Z\x03Z\x03Z\x03Z\x03Z\x03Z\x03Z\x03Z\x03[\x03[\x03" +
+    "[\x03\\\x03\\\x03\\\x03\\\x03]\x03]\x03]\x03]\x03]\x03]\x03]\x03^\x03" +
+    "^\x03^\x03^\x03^\x03^\x03^\x03^\x03^\x03_\x03_\x03_\x03_\x03_\x03`\x03" +
+    "`\x03`\x03`\x03`\x03`\x03`\x03`\x03`\x03a\x03a\x03a\x03a\x03b\x03b\x03" +
+    "b\x03b\x03b\x03b\x03b\x03b\x03b\x03b\x03c\x03c\x03c\x03c\x03c\x03c\x03" +
+    "d\x03d\x03d\x03d\x03d\x03d\x03e\x03e\x03e\x03e\x03e\x03f\x03f\x03f\x03" +
+    "f\x03f\x03g\x03g\x03g\x03g\x03g\x03g\x03h\x03h\x03h\x03h\x03h\x03h\x03" +
+    "i\x03i\x03i\x03i\x03i\x03i\x03i\x03j\x03j\x03j\x03j\x03j\x03k\x03k\x03" +
+    "k\x03k\x03k\x03k\x03k\x03k\x03k\x03k\x05k\u043D\nk\x03l\x03l\x03l\x03" +
+    "l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03" +
+    "l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x03l\x05l\u045A\nl\x03m\x03" +
+    "m\x03m\x05m\u045F\nm\x03m\x03m\x03m\x03m\x07m\u0465\nm\fm\x0Em\u0468\v" +
+    "m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x07m\u0473\nm\fm\x0Em\u0476" +
+    "\vm\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x03m\x07m\u0483" +
+    "\nm\fm\x0Em\u0486\vm\x03m\x03m\x05m\u048A\nm\x03n\x03n\x03n\x07n\u048F" +
+    "\nn\fn\x0En\u0492\vn\x03n\x03n\x05n\u0496\nn\x03n\x03n\x05n\u049A\nn\x03" +
+    "n\x06n\u049D\nn\rn\x0En\u049E\x03n\x03n\x03n\x05n\u04A4\nn\x03n\x03n\x05" +
+    "n\u04A8\nn\x03n\x06n\u04AB\nn\rn\x0En\u04AC\x03n\x03n\x03n\x07n\u04B2" +
+    "\nn\fn\x0En\u04B5\vn\x03n\x03n\x03n\x05n\u04BA\nn\x03n\x06n\u04BD\nn\r" +
+    "n\x0En\u04BE\x03n\x03n\x03n\x03n\x03n\x05n\u04C6\nn\x03n\x06n\u04C9\n" +
+    "n\rn\x0En\u04CA\x03n\x03n\x03n\x03n\x05n\u04D1\nn\x03n\x06n\u04D4\nn\r" +
+    "n\x0En\u04D5\x05n\u04D8\nn\x03o\x03o\x06o\u04DC\no\ro\x0Eo\u04DD\x03p" +
+    "\x06p\u04E1\np\rp\x0Ep\u04E2\x03q\x03q\x03q\x06q\u04E8\nq\rq\x0Eq\u04E9" +
+    "\x03r\x03r\x03r\x03r\x03r\x03r\x03r\x03r\x03r\x07r\u04F5\nr\fr\x0Er\u04F8" +
+    "\vr\x03r\x03r\x03s\x03s\x03t\x03t\x03u\x03u\x03v\x03v\x03w\x03w\x03x\x03" +
+    "x\x03y\x03y\x03z\x03z\x03{\x03{\x03|\x03|\x03}\x03}\x03~\x03~\x03\x7F" +
+    "\x03\x7F\x03\x80\x03\x80\x03\x81\x03\x81\x03\x82\x03\x82\x03\x83\x03\x83" +
+    "\x03\x84\x03\x84\x03\x85\x03\x85\x03\x86\x03\x86\x03\x87\x03\x87\x03\x88" +
+    "\x03\x88\x03\x89\x03\x89\x03\x8A\x03\x8A\x03\x8B\x03\x8B\x03\x8C\x03\x8C" +
+    "\x03\x8D\x03\x8D\x03\x8E\x03\x8E\x03\x8F\x03\x8F\x03\x90\x03\x90\x03\x91" +
+    "\x03\x91\x03\x91\x03\x92\x03\x92\x03\x93\x03\x93\x03\x94\x03\x94\x03\x95" +
+    "\x03\x95\x03\x96\x03\x96\x03\x97\x03\x97\x03\x97\x03\x98\x03\x98\x03\x99" +
+    "\x03\x99\x03\x9A\x03\x9A\x03\x9B\x03\x9B\x03\x9B\x03\x9C\x03\x9C\x03\x9D" +
+    "\x03\x9D\x03\x9D\x03\x9E\x03\x9E\x03\x9F\x03\x9F\x03\xA0\x03\xA0\x03\xA0" +
+    "\x03\xA1\x03\xA1\x03\xA1\x03\xA1\x03\xA2\x03\xA2\x03\xA2\x03\xA2\x03\xA3" +
+    "\x03\xA3\x03\xA4\x03\xA4\x03\xA5\x03\xA5\x03\xA5\x03\xA6\x03\xA6\x03\xA6" +
+    "\x03\xA6\x03\xA6\x03\xA6\x03\xA7\x03\xA7\x03\xA7\x03\xA7\x03\xA7\x03\xA7" +
+    "\x03\xA8\x03\xA8\x03\xA9\x03\xA9\x03\xA9\x03\xAA\x03\xAA\x03\xAA\x03\xAA" +
+    "\x05\xAA\u0581\n\xAA\x03\xAB\x03\xAB\x03\xAB\x03\xAB\x03\xAC\x03\xAC\x03" +
+    "\xAC\x03\xAD\x03\xAD\x03\xAD\x03\xAE\x03\xAE\x03\xAE\x03\xAF\x03\xAF\x03" +
+    "\xB0\x03\xB0\x03\xB1\x03\xB1\x03\xB2\x03\xB2\x03\xB3\x03\xB3\x03\xB3\x03" +
+    "\xB3\x03\xB3\x03\xB4\x03\xB4\x03\xB4\x03\xB4\x03\xB4\x03\xB5\x03\xB5\x03" +
+    "\xB6\x03\xB6\x03\xB7\x03\xB7\x03\xB7\x03\xB8\x03\xB8\x03\xB8\x03\xB8\x03" +
+    "\xB9\x03\xB9\x03\xBA\x03\xBA\x03\xBB\x03\xBB\x03\xBC\x03\xBC\x03\xBD\x03" +
+    "\xBD\x03\xBD\x03\xBE\x03\xBE\x03\xBF\x03\xBF\x03\xBF\x03\xBF\x07\xBF\u05BE" +
+    "\n\xBF\f\xBF\x0E\xBF\u05C1\v\xBF\x03\xBF\x03\xBF\x03\xBF\x03\xBF\x03\xBF" +
+    "\x03\xC0\x03\xC0\x03\xC0\x03\xC0\x05\xC0\u05CC\n\xC0\x03\xC0\x07\xC0\u05CF" +
+    "\n\xC0\f\xC0\x0E\xC0\u05D2\v\xC0\x03\xC0\x05\xC0\u05D5\n\xC0\x03\xC0\x03" +
+    "\xC0\x03\xC1\x03\xC1\x03\xC1\x03\xC1\x03\xC2\x03\xC2\x03\xC2\x03\xC2\x03" +
+    "\xC2\x03\xC2\x03\xC2\x03\xC2\x03\xC2\x03\xC2\x03\xC2\x06\xC2\u05E8\n\xC2" +
+    "\r\xC2\x0E\xC2\u05E9\x03\xC3\x03\xC3\x03\xC3\x03\xC3\x03\xC4\x03\xC4\x03" +
+    "\xC4\x03\xC4\x03\xC4\x03\xC5\x03\xC5\x03\xC5\x03\xC5\x03\xC5\x06\xC5\u05FA" +
+    "\n\xC5\r\xC5\x0E\xC5\u05FB\x03\xC6\x03\xC6\x03\xC6\x03\xC6\x03\xC7\x03" +
+    "\xC7\x03\xC7\x03\xC7\x03\xC7\x03\xC7\x03\xC8\x03\xC8\x03\xC8\x03\xC8\x03" +
+    "\xC8\x03\xC8\x03\xC9\x03\xC9\x07\xC9\u0610\n\xC9\f\xC9\x0E\xC9\u0613\v" +
+    "\xC9\x03\xC9\x03\xC9\x03\xCA\x03\xCA\x03\xCA\x03\xCA\x03\xCB\x03\xCB\x03" +
+    "\xCB\x03\xCB\x03\xCC\x06\xCC\u0620\n\xCC\r\xCC\x0E\xCC\u0621\x03\xCC\x03" +
+    "\xCC\x03\xCD\x03\xCD\x03\xCD\x03\xCD\x03\xCD\x03\xCE\x03\xCE\x03\xCE\x03" +
+    "\xCE\x03\xCE\x03\xCF\x03\xCF\x07\xCF\u0632\n\xCF\f\xCF\x0E\xCF\u0635\v" +
+    "\xCF\x03\xCF\x03\xCF\x03\xD0\x06\xD0\u063A\n\xD0\r\xD0\x0E\xD0\u063B\x03" +
+    "\xD0\x03\xD0\x03\xD1\x06\xD1\u0641\n\xD1\r\xD1\x0E\xD1\u0642\x03\xD2\x03" +
+    "\xD2\x03\xD2\x03\xD2\x03\xD2\x03\xD3\x03\xD3\x03\xD3\x03\xD3\x03\xD3\x03" +
+    "\xD3\x03\xD3\x03\xD4\x03\xD4\x03\xD4\x03\xD4\x03\xD4\x03\xD5\x06\xD5\u0657" +
+    "\n\xD5\r\xD5\x0E\xD5\u0658\x03\xD5\x03\xD5\x03\u05BF\x02\x02\xD6\b\x02" +
+    "\x03\n\x02\x04\f\x02\x05\x0E\x02\x06\x10\x02\x07\x12\x02\b\x14\x02\t\x16" +
+    '\x02\n\x18\x02\v\x1A\x02\f\x1C\x02\r\x1E\x02\x0E \x02\x0F"\x02\x10$\x02' +
+    "\x11&\x02\x12(\x02\x13*\x02\x14,\x02\x15.\x02\x160\x02\x172\x02\x184\x02" +
+    "\x196\x02\x1A8\x02\x1B:\x02\x1C<\x02\x1D>\x02\x1E@\x02\x1FB\x02 D\x02" +
+    "!F\x02\"H\x02#J\x02$L\x02%N\x02&P\x02'R\x02(T\x02)V\x02*X\x02+Z\x02," +
+    "\\\x02-^\x02.`\x02/b\x020d\x021f\x022h\x023j\x024l\x025n\x026p\x027r\x02" +
+    "8t\x029v\x02:x\x02;z\x02<|\x02=~\x02>\x80\x02?\x82\x02@\x84\x02A\x86\x02" +
+    "B\x88\x02C\x8A\x02D\x8C\x02E\x8E\x02F\x90\x02G\x92\x02H\x94\x02I\x96\x02" +
+    "J\x98\x02K\x9A\x02L\x9C\x02M\x9E\x02N\xA0\x02O\xA2\x02P\xA4\x02Q\xA6\x02" +
+    "R\xA8\x02S\xAA\x02T\xAC\x02U\xAE\x02V\xB0\x02W\xB2\x02X\xB4\x02Y\xB6\x02" +
+    "Z\xB8\x02[\xBA\x02\\\xBC\x02]\xBE\x02^\xC0\x02_\xC2\x02`\xC4\x02a\xC6" +
+    "\x02b\xC8\x02c\xCA\x02d\xCC\x02e\xCE\x02f\xD0\x02g\xD2\x02h\xD4\x02i\xD6" +
+    "\x02j\xD8\x02k\xDA\x02l\xDC\x02m\xDE\x02n\xE0\x02o\xE2\x02p\xE4\x02q\xE6" +
+    "\x02r\xE8\x02s\xEA\x02\x02\xEC\x02\x02\xEE\x02\x02\xF0\x02\x02\xF2\x02" +
+    "\x02\xF4\x02\x02\xF6\x02\x02\xF8\x02\x02\xFA\x02\x02\xFC\x02\x02\xFE\x02" +
+    "\x02\u0100\x02\x02\u0102\x02\x02\u0104\x02\x02\u0106\x02\x02\u0108\x02" +
+    "\x02\u010A\x02\x02\u010C\x02\x02\u010E\x02\x02\u0110\x02\x02\u0112\x02" +
+    "\x02\u0114\x02\x02\u0116\x02\x02\u0118\x02\x02\u011A\x02\x02\u011C\x02" +
+    "\x02\u011E\x02\x02\u0120\x02\x02\u0122\x02\x02\u0124\x02\x02\u0126\x02" +
+    "t\u0128\x02u\u012A\x02v\u012C\x02w\u012E\x02x\u0130\x02y\u0132\x02z\u0134" +
+    "\x02{\u0136\x02|\u0138\x02}\u013A\x02~\u013C\x02\x7F\u013E\x02\x80\u0140" +
+    "\x02\x81\u0142\x02\x82\u0144\x02\x83\u0146\x02\x84\u0148\x02\x85\u014A" +
+    "\x02\x86\u014C\x02\x87\u014E\x02\x88\u0150\x02\x02\u0152\x02\x02\u0154" +
+    "\x02\x89\u0156\x02\x8A\u0158\x02\x8B\u015A\x02\x8C\u015C\x02\x8D\u015E" +
+    "\x02\x8E\u0160\x02\x8F\u0162\x02\x90\u0164\x02\x91\u0166\x02\x92\u0168" +
+    "\x02\x93\u016A\x02\x94\u016C\x02\x95\u016E\x02\x96\u0170\x02\x97\u0172" +
+    "\x02\x98\u0174\x02\x99\u0176\x02\x9A\u0178\x02\x9B\u017A\x02\x9C\u017C" +
+    "\x02\x9D\u017E\x02\x9E\u0180\x02\x9F\u0182\x02\xA0\u0184\x02\xA1\u0186" +
+    "\x02\xA2\u0188\x02\xA3\u018A\x02\xA4\u018C\x02\x02\u018E\x02\xA5\u0190" +
+    "\x02\xA6\u0192\x02\x02\u0194\x02\x02\u0196\x02\x02\u0198\x02\x02\u019A" +
+    "\x02\x02\u019C\x02\xA7\u019E\x02\x02\u01A0\x02\x02\u01A2\x02\x02\u01A4" +
+    "\x02\xA8\u01A6\x02\xA9\u01A8\x02\x02\u01AA\x02\x02\u01AC\x02\x02\u01AE" +
+    "\x02\xAA\b\x02\x03\x04\x05\x06\x07,\x04\x02^^bb\x04\x02$$^^\x04\x02))" +
+    "^^\x04\x02CCcc\x04\x02DDdd\x04\x02EEee\x04\x02FFff\x04\x02GGgg\x04\x02" +
+    "HHhh\x04\x02IIii\x04\x02JJjj\x04\x02KKkk\x04\x02LLll\x04\x02MMmm\x04\x02" +
+    "NNnn\x04\x02OOoo\x04\x02PPpp\x04\x02QQqq\x04\x02RRrr\x04\x02SSss\x04\x02" +
+    "TTtt\x04\x02UUuu\x04\x02VVvv\x04\x02WWww\x04\x02XXxx\x04\x02YYyy\x04\x02" +
+    "ZZzz\x04\x02[[{{\x04\x02\\\\||\x04\x02C\\c|\x03\x0229\x03\x022;\x05\x02" +
+    '2;CHch\x04\x02\f\f\x0F\x0F\x04\x03\f\f\x0F\x0F\x04\x02\v\x0F""\x05\x02' +
+    "))^^}}\x03\x02}}\x05\x02C\\aac|\x07\x02//2;C\\aac|\x05\x02\v\f\x0F\x0F" +
+    '""\x04\x02>>}}\x02\u0683\x02\b\x03\x02\x02\x02\x02\n\x03\x02\x02\x02' +
+    "\x02\f\x03\x02\x02\x02\x02\x0E\x03\x02\x02\x02\x02\x10\x03\x02\x02\x02" +
+    "\x02\x12\x03\x02\x02\x02\x02\x14\x03\x02\x02\x02\x02\x16\x03\x02\x02\x02" +
+    "\x02\x18\x03\x02\x02\x02\x02\x1A\x03\x02\x02\x02\x02\x1C\x03\x02\x02\x02" +
+    '\x02\x1E\x03\x02\x02\x02\x02 \x03\x02\x02\x02\x02"\x03\x02\x02\x02\x02' +
+    "$\x03\x02\x02\x02\x02&\x03\x02\x02\x02\x02(\x03\x02\x02\x02\x02*\x03\x02" +
+    "\x02\x02\x02,\x03\x02\x02\x02\x02.\x03\x02\x02\x02\x020\x03\x02\x02\x02" +
+    "\x022\x03\x02\x02\x02\x024\x03\x02\x02\x02\x026\x03\x02\x02\x02\x028\x03" +
+    "\x02\x02\x02\x02:\x03\x02\x02\x02\x02<\x03\x02\x02\x02\x02>\x03\x02\x02" +
+    "\x02\x02@\x03\x02\x02\x02\x02B\x03\x02\x02\x02\x02D\x03\x02\x02\x02\x02" +
+    "F\x03\x02\x02\x02\x02H\x03\x02\x02\x02\x02J\x03\x02\x02\x02\x02L\x03\x02" +
+    "\x02\x02\x02N\x03\x02\x02\x02\x02P\x03\x02\x02\x02\x02R\x03\x02\x02\x02" +
+    "\x02T\x03\x02\x02\x02\x02V\x03\x02\x02\x02\x02X\x03\x02\x02\x02\x02Z\x03" +
+    "\x02\x02\x02\x02\\\x03\x02\x02\x02\x02^\x03\x02\x02\x02\x02`\x03\x02\x02" +
+    "\x02\x02b\x03\x02\x02\x02\x02d\x03\x02\x02\x02\x02f\x03\x02\x02\x02\x02" +
+    "h\x03\x02\x02\x02\x02j\x03\x02\x02\x02\x02l\x03\x02\x02\x02\x02n\x03\x02" +
+    "\x02\x02\x02p\x03\x02\x02\x02\x02r\x03\x02\x02\x02\x02t\x03\x02\x02\x02" +
+    "\x02v\x03\x02\x02\x02\x02x\x03\x02\x02\x02\x02z\x03\x02\x02\x02\x02|\x03" +
+    "\x02\x02\x02\x02~\x03\x02\x02\x02\x02\x80\x03\x02\x02\x02\x02\x82\x03" +
+    "\x02\x02\x02\x02\x84\x03\x02\x02\x02\x02\x86\x03\x02\x02\x02\x02\x88\x03" +
+    "\x02\x02\x02\x02\x8A\x03\x02\x02\x02\x02\x8C\x03\x02\x02\x02\x02\x8E\x03" +
+    "\x02\x02\x02\x02\x90\x03\x02\x02\x02\x02\x92\x03\x02\x02\x02\x02\x94\x03" +
+    "\x02\x02\x02\x02\x96\x03\x02\x02\x02\x02\x98\x03\x02\x02\x02\x02\x9A\x03" +
+    "\x02\x02\x02\x02\x9C\x03\x02\x02\x02\x02\x9E\x03\x02\x02\x02\x02\xA0\x03" +
+    "\x02\x02\x02\x02\xA2\x03\x02\x02\x02\x02\xA4\x03\x02\x02\x02\x02\xA6\x03" +
+    "\x02\x02\x02\x02\xA8\x03\x02\x02\x02\x02\xAA\x03\x02\x02\x02\x02\xAC\x03" +
+    "\x02\x02\x02\x02\xAE\x03\x02\x02\x02\x02\xB0\x03\x02\x02\x02\x02\xB2\x03" +
+    "\x02\x02\x02\x02\xB4\x03\x02\x02\x02\x02\xB6\x03\x02\x02\x02\x02\xB8\x03" +
+    "\x02\x02\x02\x02\xBA\x03\x02\x02\x02\x02\xBC\x03\x02\x02\x02\x02\xBE\x03" +
+    "\x02\x02\x02\x02\xC0\x03\x02\x02\x02\x02\xC2\x03\x02\x02\x02\x02\xC4\x03" +
+    "\x02\x02\x02\x02\xC6\x03\x02\x02\x02\x02\xC8\x03\x02\x02\x02\x02\xCA\x03" +
+    "\x02\x02\x02\x02\xCC\x03\x02\x02\x02\x02\xCE\x03\x02\x02\x02\x02\xD0\x03" +
+    "\x02\x02\x02\x02\xD2\x03\x02\x02\x02\x02\xD4\x03\x02\x02\x02\x02\xD6\x03" +
+    "\x02\x02\x02\x02\xD8\x03\x02\x02\x02\x02\xDA\x03\x02\x02\x02\x02\xDC\x03" +
+    "\x02\x02\x02\x02\xDE\x03\x02\x02\x02\x02\xE0\x03\x02\x02\x02\x02\xE2\x03" +
+    "\x02\x02\x02\x02\xE4\x03\x02\x02\x02\x02\xE6\x03\x02\x02\x02\x02\xE8\x03" +
+    "\x02\x02\x02\x02\u0126\x03\x02\x02\x02\x02\u0128\x03\x02\x02\x02\x02\u012A" +
+    "\x03\x02\x02\x02\x02\u012C\x03\x02\x02\x02\x02\u012E\x03\x02\x02\x02\x02" +
+    "\u0130\x03\x02\x02\x02\x02\u0132\x03\x02\x02\x02\x02\u0134\x03\x02\x02" +
+    "\x02\x02\u0136\x03\x02\x02\x02\x02\u0138\x03\x02\x02\x02\x02\u013A\x03" +
+    "\x02\x02\x02\x02\u013C\x03\x02\x02\x02\x02\u013E\x03\x02\x02\x02\x02\u0140" +
+    "\x03\x02";
+  private static readonly _serializedATNSegment1: string =
+    "\x02\x02\x02\u0142\x03\x02\x02\x02\x02\u0144\x03\x02\x02\x02\x02\u0146" +
+    "\x03\x02\x02\x02\x02\u0148\x03\x02\x02\x02\x02\u014A\x03\x02\x02\x02\x02" +
+    "\u014C\x03\x02\x02\x02\x02\u014E\x03\x02\x02\x02\x02\u0150\x03\x02\x02" +
+    "\x02\x02\u0152\x03\x02\x02\x02\x02\u0154\x03\x02\x02\x02\x02\u0156\x03" +
+    "\x02\x02\x02\x02\u0158\x03\x02\x02\x02\x02\u015A\x03\x02\x02\x02\x02\u015C" +
+    "\x03\x02\x02\x02\x02\u015E\x03\x02\x02\x02\x02\u0160\x03\x02\x02\x02\x02" +
+    "\u0162\x03\x02\x02\x02\x02\u0164\x03\x02\x02\x02\x02\u0166\x03\x02\x02" +
+    "\x02\x02\u0168\x03\x02\x02\x02\x02\u016A\x03\x02\x02\x02\x02\u016C\x03" +
+    "\x02\x02\x02\x02\u016E\x03\x02\x02\x02\x02\u0170\x03\x02\x02\x02\x02\u0172" +
+    "\x03\x02\x02\x02\x02\u0174\x03\x02\x02\x02\x02\u0176\x03\x02\x02\x02\x02" +
+    "\u0178\x03\x02\x02\x02\x02\u017A\x03\x02\x02\x02\x02\u017C\x03\x02\x02" +
+    "\x02\x02\u017E\x03\x02\x02\x02\x02\u0180\x03\x02\x02\x02\x02\u0182\x03" +
+    "\x02\x02\x02\x02\u0184\x03\x02\x02\x02\x02\u0186\x03\x02\x02\x02\x03\u0188" +
+    "\x03\x02\x02\x02\x03\u018A\x03\x02\x02\x02\x03\u018C\x03\x02\x02\x02\x04" +
+    "\u018E\x03\x02\x02\x02\x04\u0190\x03\x02\x02\x02\x05\u0192\x03\x02\x02" +
+    "\x02\x05\u0194\x03\x02\x02\x02\x05\u0196\x03\x02\x02\x02\x05\u0198\x03" +
+    "\x02\x02\x02\x05\u019A\x03\x02\x02\x02\x05\u019C\x03\x02\x02\x02\x05\u019E" +
+    "\x03\x02\x02\x02\x06\u01A0\x03\x02\x02\x02\x06\u01A2\x03\x02\x02\x02\x06" +
+    "\u01A4\x03\x02\x02\x02\x07\u01A6\x03\x02\x02\x02\x07\u01A8\x03\x02\x02" +
+    "\x02\x07\u01AA\x03\x02\x02\x02\x07\u01AC\x03\x02\x02\x02\x07\u01AE\x03" +
+    "\x02\x02\x02\b\u01B0\x03\x02\x02\x02\n\u01B4\x03\x02\x02\x02\f\u01B8\x03" +
+    "\x02\x02\x02\x0E\u01BD\x03\x02\x02\x02\x10\u01C1\x03\x02\x02\x02\x12\u01C7" +
+    "\x03\x02\x02\x02\x14\u01D8\x03\x02\x02\x02\x16\u01DA\x03\x02\x02\x02\x18" +
+    "\u01DF\x03\x02\x02\x02\x1A\u01E7\x03\x02\x02\x02\x1C\u01EC\x03\x02\x02" +
+    '\x02\x1E\u01EF\x03\x02\x02\x02 \u01F4\x03\x02\x02\x02"\u01F9\x03\x02' +
+    "\x02\x02$\u01FF\x03\x02\x02\x02&\u0206\x03\x02\x02\x02(\u020E\x03\x02" +
+    "\x02\x02*\u0214\x03\x02\x02\x02,\u0219\x03\x02\x02\x02.\u0221\x03\x02" +
+    "\x02\x020\u0226\x03\x02\x02\x022\u022A\x03\x02\x02\x024\u022F\x03\x02" +
+    "\x02\x026\u023A\x03\x02\x02\x028\u0243\x03\x02\x02\x02:\u0248\x03\x02" +
+    "\x02\x02<\u024C\x03\x02\x02\x02>\u0253\x03\x02\x02\x02@\u025B\x03\x02" +
+    "\x02\x02B\u0261\x03\x02\x02\x02D\u0269\x03\x02\x02\x02F\u026F\x03\x02" +
+    "\x02\x02H\u0272\x03\x02\x02\x02J\u027C\x03\x02\x02\x02L\u0280\x03\x02" +
+    "\x02\x02N\u0285\x03\x02\x02\x02P\u028A\x03\x02\x02\x02R\u028E\x03\x02" +
+    "\x02\x02T\u0294\x03\x02\x02\x02V\u029B\x03\x02\x02\x02X\u02A0\x03\x02" +
+    "\x02\x02Z\u02A3\x03\x02\x02\x02\\\u02A6\x03\x02\x02\x02^\u02AC\x03\x02" +
+    "\x02\x02`\u02BC\x03\x02\x02\x02b\u02BE\x03\x02\x02\x02d\u02C4\x03\x02" +
+    "\x02\x02f\u02CE\x03\x02\x02\x02h\u02D7\x03\x02\x02\x02j\u02DA\x03\x02" +
+    "\x02\x02l\u02DF\x03\x02\x02\x02n\u02E3\x03\x02\x02\x02p\u02E8\x03\x02" +
+    "\x02\x02r\u02F0\x03\x02\x02\x02t\u02F5\x03\x02\x02\x02v\u02F9\x03\x02" +
+    "\x02\x02x\u02FE\x03\x02\x02\x02z\u0304\x03\x02\x02\x02|\u030B\x03\x02" +
+    "\x02\x02~\u0311\x03\x02\x02\x02\x80\u0315\x03\x02\x02\x02\x82\u0319\x03" +
+    "\x02\x02\x02\x84\u031E\x03\x02\x02\x02\x86\u0324\x03\x02\x02\x02\x88\u032B" +
+    "\x03\x02\x02\x02\x8A\u032E\x03\x02\x02\x02\x8C\u0331\x03\x02\x02\x02\x8E" +
+    "\u0337\x03\x02\x02\x02\x90\u033D\x03\x02\x02\x02\x92\u0342\x03\x02\x02" +
+    "\x02\x94\u034C\x03\x02\x02\x02\x96\u0356\x03\x02\x02\x02\x98\u035F\x03" +
+    "\x02\x02\x02\x9A\u0367\x03\x02\x02\x02\x9C\u036D\x03\x02\x02\x02\x9E\u0374" +
+    "\x03\x02\x02\x02\xA0\u037A\x03\x02\x02\x02\xA2\u0381\x03\x02\x02\x02\xA4" +
+    "\u0385\x03\x02\x02\x02\xA6\u038A\x03\x02\x02\x02\xA8\u0391\x03\x02\x02" +
+    "\x02\xAA\u0398\x03\x02\x02\x02\xAC\u039F\x03\x02\x02\x02\xAE\u03A4\x03" +
+    "\x02\x02\x02\xB0\u03AD\x03\x02\x02\x02\xB2\u03B7\x03\x02\x02\x02\xB4\u03BC" +
+    "\x03\x02\x02\x02\xB6\u03C2\x03\x02\x02\x02\xB8\u03C7\x03\x02\x02\x02\xBA" +
+    "\u03D1\x03\x02\x02\x02\xBC\u03D4\x03\x02\x02\x02\xBE\u03D8\x03\x02\x02" +
+    "\x02\xC0\u03DF\x03\x02\x02\x02\xC2\u03E8\x03\x02\x02\x02\xC4\u03ED\x03" +
+    "\x02\x02\x02\xC6\u03F6\x03\x02\x02\x02\xC8\u03FA\x03\x02\x02\x02\xCA\u0404" +
+    "\x03\x02\x02\x02\xCC\u040A\x03\x02\x02\x02\xCE\u0410\x03\x02\x02\x02\xD0" +
+    "\u0415\x03\x02\x02\x02\xD2\u041A\x03\x02\x02\x02\xD4\u0420\x03\x02\x02" +
+    "\x02\xD6\u0426\x03\x02\x02\x02\xD8\u042D\x03\x02\x02\x02\xDA\u043C\x03" +
+    "\x02\x02\x02\xDC\u0459\x03\x02\x02\x02\xDE\u0489\x03\x02\x02\x02\xE0\u04D7" +
+    "\x03\x02\x02\x02\xE2\u04D9\x03\x02\x02\x02\xE4\u04E0\x03\x02\x02\x02\xE6" +
+    "\u04E4\x03\x02\x02\x02\xE8\u04EB\x03\x02\x02\x02\xEA\u04FB\x03\x02\x02" +
+    "\x02\xEC\u04FD\x03\x02\x02\x02\xEE\u04FF\x03\x02\x02\x02\xF0\u0501\x03" +
+    "\x02\x02\x02\xF2\u0503\x03\x02\x02\x02\xF4\u0505\x03\x02\x02\x02\xF6\u0507" +
+    "\x03\x02\x02\x02\xF8\u0509\x03\x02\x02\x02\xFA\u050B\x03\x02\x02\x02\xFC" +
+    "\u050D\x03\x02\x02\x02\xFE\u050F\x03\x02\x02\x02\u0100\u0511\x03\x02\x02" +
+    "\x02\u0102\u0513\x03\x02\x02\x02\u0104\u0515\x03\x02\x02\x02\u0106\u0517" +
+    "\x03\x02\x02\x02\u0108\u0519\x03\x02\x02\x02\u010A\u051B\x03\x02\x02\x02" +
+    "\u010C\u051D\x03\x02\x02\x02\u010E\u051F\x03\x02\x02\x02\u0110\u0521\x03" +
+    "\x02\x02\x02\u0112\u0523\x03\x02\x02\x02\u0114\u0525\x03\x02\x02\x02\u0116" +
+    "\u0527\x03\x02\x02\x02\u0118\u0529\x03\x02\x02\x02\u011A\u052B\x03\x02" +
+    "\x02\x02\u011C\u052D\x03\x02\x02\x02\u011E\u052F\x03\x02\x02\x02\u0120" +
+    "\u0531\x03\x02\x02\x02\u0122\u0533\x03\x02\x02\x02\u0124\u0535\x03\x02" +
+    "\x02\x02\u0126\u0537\x03\x02\x02\x02\u0128\u053A\x03\x02\x02\x02\u012A" +
+    "\u053C\x03\x02\x02\x02\u012C\u053E\x03\x02\x02\x02\u012E\u0540\x03\x02" +
+    "\x02\x02\u0130\u0542\x03\x02\x02\x02\u0132\u0544\x03\x02\x02\x02\u0134" +
+    "\u0547\x03\x02\x02\x02\u0136\u0549\x03\x02\x02\x02\u0138\u054B\x03\x02" +
+    "\x02\x02\u013A\u054D\x03\x02\x02\x02\u013C\u0550\x03\x02\x02\x02\u013E" +
+    "\u0552\x03\x02\x02\x02\u0140\u0555\x03\x02\x02\x02\u0142\u0557\x03\x02" +
+    "\x02\x02\u0144\u0559\x03\x02\x02\x02\u0146\u055C\x03\x02\x02\x02\u0148" +
+    "\u0560\x03\x02\x02\x02\u014A\u0564\x03\x02\x02\x02\u014C\u0566\x03\x02" +
+    "\x02\x02\u014E\u0568\x03\x02\x02\x02\u0150\u056B\x03\x02\x02\x02\u0152" +
+    "\u0571\x03\x02\x02\x02\u0154\u0577\x03\x02\x02\x02\u0156\u0579\x03\x02" +
+    "\x02\x02\u0158\u0580\x03\x02\x02\x02\u015A\u0582\x03\x02\x02\x02\u015C" +
+    "\u0586\x03\x02\x02\x02\u015E\u0589\x03\x02\x02\x02\u0160\u058C\x03\x02" +
+    "\x02\x02\u0162\u058F\x03\x02\x02\x02\u0164\u0591\x03\x02\x02\x02\u0166" +
+    "\u0593\x03\x02\x02\x02\u0168\u0595\x03\x02\x02\x02\u016A\u0597\x03\x02" +
+    "\x02\x02\u016C\u059C\x03\x02\x02\x02\u016E\u05A1\x03\x02\x02\x02\u0170" +
+    "\u05A3\x03\x02\x02\x02\u0172\u05A5\x03\x02\x02\x02\u0174\u05A8\x03\x02" +
+    "\x02\x02\u0176\u05AC\x03\x02\x02\x02\u0178\u05AE\x03\x02\x02\x02\u017A" +
+    "\u05B0\x03\x02\x02\x02\u017C\u05B2\x03\x02\x02\x02\u017E\u05B4\x03\x02" +
+    "\x02\x02\u0180\u05B7\x03\x02\x02\x02\u0182\u05B9\x03\x02\x02\x02\u0184" +
+    "\u05CB\x03\x02\x02\x02\u0186\u05D8\x03\x02\x02\x02\u0188\u05E7\x03\x02" +
+    "\x02\x02\u018A\u05EB\x03\x02\x02\x02\u018C\u05EF\x03\x02\x02\x02\u018E" +
+    "\u05F9\x03\x02\x02\x02\u0190\u05FD\x03\x02\x02\x02\u0192\u0601\x03\x02" +
+    "\x02\x02\u0194\u0607\x03\x02\x02\x02\u0196\u060D\x03\x02\x02\x02\u0198" +
+    "\u0616\x03\x02\x02\x02\u019A\u061A\x03\x02\x02\x02\u019C\u061F\x03\x02" +
+    "\x02\x02\u019E\u0625\x03\x02\x02\x02\u01A0\u062A\x03\x02\x02\x02\u01A2" +
+    "\u062F\x03\x02\x02\x02\u01A4\u0639\x03\x02\x02\x02\u01A6\u0640\x03\x02" +
+    "\x02\x02\u01A8\u0644\x03\x02\x02\x02\u01AA\u0649\x03\x02\x02\x02\u01AC" +
+    "\u0650\x03\x02\x02\x02\u01AE\u0656\x03\x02\x02\x02\u01B0\u01B1\x05\xEA" +
+    "s\x02\u01B1\u01B2\x05\u0100~\x02\u01B2\u01B3\x05\u0100~\x02\u01B3\t\x03" +
+    "\x02\x02\x02\u01B4\u01B5\x05\xEAs\x02\u01B5\u01B6\x05\u0104\x80\x02\u01B6" +
+    "\u01B7\x05\xF0v\x02\u01B7\v\x03\x02\x02\x02\u01B8\u01B9\x05\xEAs\x02\u01B9" +
+    "\u01BA\x05\u0104\x80\x02\u01BA\u01BB\x05\u0110\x86\x02\u01BB\u01BC\x05" +
+    "\xFA{\x02\u01BC\r\x03\x02\x02\x02\u01BD\u01BE\x05\xEAs\x02\u01BE\u01BF" +
+    "\x05\u0104\x80\x02\u01BF\u01C0\x05\u011A\x8B\x02\u01C0\x0F\x03\x02\x02" +
+    "\x02\u01C1\u01C2\x05\xEAs\x02\u01C2\u01C3\x05\u010C\x84\x02\u01C3\u01C4" +
+    "\x05\u010C\x84\x02\u01C4\u01C5\x05\xEAs\x02\u01C5\u01C6\x05\u011A\x8B" +
+    "\x02\u01C6\x11\x03\x02\x02\x02\u01C7\u01C8\x05\xEAs\x02\u01C8\u01C9\x05" +
+    "\u010E\x85\x02\u01C9\x13\x03\x02\x02\x02\u01CA\u01CB\x05\xEAs\x02\u01CB" +
+    "\u01CC\x05\u010E\x85\x02\u01CC\u01CD\x05\xEEu\x02\u01CD\u01D9\x03\x02" +
+    "\x02\x02\u01CE\u01CF\x05\xEAs\x02\u01CF\u01D0\x05\u010E\x85\x02\u01D0" +
+    "\u01D1\x05\xEEu\x02\u01D1\u01D2\x05\xF2w\x02\u01D2\u01D3\x05\u0104\x80" +
+    "\x02\u01D3\u01D4\x05\xF0v\x02\u01D4\u01D5\x05\xFA{\x02\u01D5\u01D6\x05" +
+    "\u0104\x80\x02\u01D6\u01D7\x05\xF6y\x02\u01D7\u01D9\x03\x02\x02\x02\u01D8" +
+    "\u01CA\x03\x02\x02\x02\u01D8\u01CE\x03\x02\x02\x02\u01D9\x15\x03\x02\x02" +
+    "\x02\u01DA\u01DB\x05\xEAs\x02\u01DB\u01DC\x05\u010E\x85\x02\u01DC\u01DD" +
+    "\x05\u0106\x81\x02\u01DD\u01DE\x05\xF4x\x02\u01DE\x17\x03\x02\x02\x02" +
+    "\u01DF\u01E0\x05\xECt\x02\u01E0\u01E1\x05\xF2w\x02\u01E1\u01E2\x05\u0110" +
+    "\x86\x02\u01E2\u01E3\x05\u0116\x89\x02\u01E3\u01E4\x05\xF2w\x02\u01E4" +
+    "\u01E5\x05\xF2w\x02\u01E5\u01E6\x05\u0104\x80\x02\u01E6\x19\x03\x02\x02" +
+    "\x02\u01E7\u01E8\x05\xECt\x02\u01E8\u01E9\x05\u0106\x81\x02\u01E9\u01EA" +
+    "\x05\u0110\x86\x02\u01EA\u01EB\x05\xF8z\x02\u01EB\x1B\x03\x02\x02\x02" +
+    "\u01EC\u01ED\x05\xECt\x02\u01ED\u01EE\x05\u011A\x8B\x02\u01EE\x1D\x03" +
+    "\x02\x02\x02\u01EF\u01F0\x05\xEEu\x02\u01F0\u01F1\x05\xEAs\x02\u01F1\u01F2" +
+    "\x05\u010E\x85\x02\u01F2\u01F3\x05\xF2w\x02\u01F3\x1F\x03\x02\x02\x02" +
+    "\u01F4\u01F5\x05\xEEu\x02\u01F5\u01F6\x05\xEAs\x02\u01F6\u01F7\x05\u010E" +
+    "\x85\x02\u01F7\u01F8\x05\u0110\x86\x02\u01F8!\x03\x02\x02\x02\u01F9\u01FA" +
+    "\x05\xEEu\x02\u01FA\u01FB\x05\xEAs\x02\u01FB\u01FC\x05\u0110\x86\x02\u01FC" +
+    "\u01FD\x05\xEEu\x02\u01FD\u01FE\x05\xF8z\x02\u01FE#\x03\x02\x02\x02\u01FF" +
+    "\u0200\x05\xEEu\x02\u0200\u0201\x05\u0106\x81\x02\u0201\u0202\x05\xF8" +
+    "z\x02\u0202\u0203\x05\u0106\x81\x02\u0203\u0204\x05\u010C\x84\x02\u0204" +
+    "\u0205\x05\u0110\x86\x02\u0205%\x03\x02\x02\x02\u0206\u0207\x05\xEEu\x02" +
+    "\u0207\u0208\x05\u0106\x81\x02\u0208\u0209\x05\u0100~\x02\u0209\u020A" +
+    "\x05\u0100~\x02\u020A\u020B\x05\xEAs\x02\u020B\u020C\x05\u0110\x86\x02" +
+    "\u020C\u020D\x05\xF2w\x02\u020D'\x03\x02\x02\x02\u020E\u020F\x05\xEE" +
+    "u\x02\u020F\u0210\x05\u010C\x84\x02\u0210\u0211\x05\u0106\x81\x02\u0211" +
+    "\u0212\x05\u010E\x85\x02\u0212\u0213\x05\u010E\x85\x02\u0213)\x03\x02" +
+    "\x02\x02\u0214\u0215\x05\xEEu\x02\u0215\u0216\x05\u0112\x87\x02\u0216" +
+    "\u0217\x05\xECt\x02\u0217\u0218\x05\xF2w\x02\u0218+\x03\x02\x02\x02\u0219" +
+    "\u021A\x05\xEEu\x02\u021A\u021B\x05\u0112\x87\x02\u021B\u021C\x05\u010C" +
+    "\x84\x02\u021C\u021D\x05\u010C\x84\x02\u021D\u021E\x05\xF2w\x02\u021E" +
+    "\u021F\x05\u0104\x80\x02\u021F\u0220\x05\u0110\x86\x02\u0220-\x03\x02" +
+    "\x02\x02\u0221\u0222\x05\xF0v\x02\u0222\u0223\x05\xEAs\x02\u0223\u0224" +
+    "\x05\u0110\x86\x02\u0224\u0225\x05\xF2w\x02\u0225/\x03\x02\x02\x02\u0226" +
+    "\u0227\x05\xF0v\x02\u0227\u0228\x05\xEAs\x02\u0228\u0229\x05\u011A\x8B" +
+    "\x02\u02291\x03\x02\x02\x02\u022A\u022B\x05\xF0v\x02\u022B\u022C\x05\xF2" +
+    "w\x02\u022C\u022D\x05\u010E\x85\x02\u022D\u022E\x05\xEEu\x02\u022E3\x03" +
+    "\x02\x02\x02\u022F\u0230\x05\xF0v\x02\u0230\u0231\x05\xF2w\x02\u0231\u0232" +
+    "\x05\u010E\x85\x02\u0232\u0233\x05\xEEu\x02\u0233\u0234\x05\xF2w\x02\u0234" +
+    "\u0235\x05\u0104\x80\x02\u0235\u0236\x05\xF0v\x02\u0236\u0237\x05\xFA" +
+    "{\x02\u0237\u0238\x05\u0104\x80\x02\u0238\u0239\x05\xF6y\x02\u02395\x03" +
+    "\x02\x02\x02\u023A\u023B\x05\xF0v\x02\u023B\u023C\x05\xFA{\x02\u023C\u023D" +
+    "\x05\u010E\x85\x02\u023D\u023E\x05\u0110\x86\x02\u023E\u023F\x05\xFA{" +
+    "\x02\u023F\u0240\x05\u0104\x80\x02\u0240\u0241\x05\xEEu\x02\u0241\u0242" +
+    "\x05\u0110\x86\x02\u02427\x03\x02\x02\x02\u0243\u0244\x05\xF2w\x02\u0244" +
+    "\u0245\x05\u0100~\x02\u0245\u0246\x05\u010E\x85\x02\u0246\u0247\x05\xF2" +
+    "w\x02\u02479\x03\x02\x02\x02\u0248\u0249\x05\xF2w\x02\u0249\u024A\x05" +
+    "\u0104\x80\x02\u024A\u024B\x05\xF0v\x02\u024B;\x03\x02\x02\x02\u024C\u024D" +
+    "\x05\xF2w\x02\u024D\u024E\x05\u0118\x8A\x02\u024E\u024F\x05\xEEu\x02\u024F" +
+    "\u0250\x05\xF2w\x02\u0250\u0251\x05\u0108\x82\x02\u0251\u0252\x05\u0110" +
+    "\x86\x02\u0252=\x03\x02\x02\x02\u0253\u0254\x05\xF2w\x02\u0254\u0255\x05" +
+    "\u0118\x8A\x02\u0255\u0256\x05\u0110\x86\x02\u0256\u0257\x05\u010C\x84" +
+    "\x02\u0257\u0258\x05\xEAs\x02\u0258\u0259\x05\xEEu\x02\u0259\u025A\x05" +
+    "\u0110\x86\x02\u025A?\x03\x02\x02\x02\u025B\u025C\x05\xF4x\x02\u025C\u025D" +
+    "\x05\xFA{\x02\u025D\u025E\x05\u0104\x80\x02\u025E\u025F\x05\xEAs\x02\u025F" +
+    "\u0260\x05\u0100~\x02\u0260A\x03\x02\x02\x02\u0261\u0262\x05\xF4x\x02" +
+    "\u0262\u0263\x05\xFA{\x02\u0263\u0264\x05\u0104\x80\x02\u0264\u0265\x05" +
+    "\xEAs\x02\u0265\u0266\x05\u0100~\x02\u0266\u0267\x05\u0100~\x02\u0267" +
+    "\u0268\x05\u011A\x8B\x02\u0268C\x03\x02\x02\x02\u0269\u026A\x05\xF4x\x02" +
+    "\u026A\u026B\x05\xFA{\x02\u026B\u026C\x05\u010C\x84\x02\u026C\u026D\x05" +
+    "\u010E\x85\x02\u026D\u026E\x05\u0110\x86\x02\u026EE\x03\x02\x02\x02\u026F" +
+    "\u0270\x05\xF4x\x02\u0270\u0271\x05\u0104\x80\x02\u0271G\x03\x02\x02\x02" +
+    "\u0272\u0273\x05\xF4x\x02\u0273\u0274\x05\u0106\x81\x02\u0274\u0275\x05" +
+    "\u0100~\x02\u0275\u0276\x05\u0100~\x02\u0276\u0277\x05\u0106\x81\x02\u0277" +
+    "\u0278\x05\u0116\x89\x02\u0278\u0279\x05\xFA{\x02\u0279\u027A\x05\u0104" +
+    "\x80\x02\u027A\u027B\x05\xF6y\x02\u027BI\x03\x02\x02\x02\u027C\u027D\x05" +
+    "\xF4x\x02\u027D\u027E\x05\u0106\x81\x02\u027E\u027F\x05\u010C\x84\x02" +
+    "\u027FK\x03\x02\x02\x02\u0280\u0281\x05\xF4x\x02\u0281\u0282\x05\u010C" +
+    "\x84\x02\u0282\u0283\x05\u0106\x81\x02\u0283\u0284\x05\u0102\x7F\x02\u0284" +
+    "M\x03\x02\x02\x02\u0285\u0286\x05\xF4x\x02\u0286\u0287\x05\u0112\x87\x02" +
+    "\u0287\u0288\x05\u0100~\x02\u0288\u0289\x05\u0100~\x02\u0289O\x03\x02" +
+    "\x02\x02\u028A\u028B\x05\xF4x\x02\u028B\u028C\x05\u0112\x87\x02\u028C" +
+    "\u028D\x05\u0104\x80\x02\u028DQ\x03\x02\x02\x02\u028E\u028F\x05\xF6y\x02" +
+    "\u028F\u0290\x05\u010C\x84\x02\u0290\u0291\x05\u0106\x81\x02\u0291\u0292" +
+    "\x05\u0112\x87\x02\u0292\u0293\x05\u0108\x82\x02\u0293S\x03\x02\x02\x02" +
+    "\u0294\u0295\x05\xF8z\x02\u0295\u0296\x05\xEAs\x02\u0296\u0297\x05\u0114" +
+    "\x88\x02\u0297\u0298\x05\xFA{\x02\u0298\u0299\x05\u0104\x80\x02\u0299" +
+    "\u029A\x05\xF6y\x02\u029AU\x03\x02\x02\x02\u029B\u029C\x05\xF8z\x02\u029C" +
+    "\u029D\x05\u0106\x81\x02\u029D\u029E\x05\u0112\x87\x02\u029E\u029F\x05" +
+    "\u010C\x84\x02\u029FW\x03\x02\x02\x02\u02A0\u02A1\x05\xFA{\x02\u02A1\u02A2" +
+    "\x05\xF0v\x02\u02A2Y\x03\x02\x02\x02\u02A3\u02A4\x05\xFA{\x02\u02A4\u02A5" +
+    "\x05\xF4x\x02\u02A5[\x03\x02\x02\x02\u02A6\u02A7\x05\xFA{\x02\u02A7\u02A8" +
+    "\x05\u0100~\x02\u02A8\u02A9\x05\xFA{\x02\u02A9\u02AA\x05\xFE}\x02\u02AA" +
+    "\u02AB\x05\xF2w\x02\u02AB]\x03\x02\x02\x02\u02AC\u02AD\x05\xFA{\x02\u02AD" +
+    "\u02AE\x05\u0104\x80\x02\u02AE_\x03\x02\x02\x02\u02AF\u02B0\x05\xFA{\x02" +
+    "\u02B0\u02B1\x05\u0104\x80\x02\u02B1\u02B2\x05\xF4x\x02\u02B2\u02BD\x03" +
+    "\x02\x02\x02\u02B3\u02B4\x05\xFA{\x02\u02B4\u02B5\x05\u0104\x80\x02\u02B5" +
+    "\u02B6\x05\xF4x\x02\u02B6\u02B7\x05\xFA{\x02\u02B7\u02B8\x05\u0104\x80" +
+    "\x02\u02B8\u02B9\x05\xFA{\x02\u02B9\u02BA\x05\u0110\x86\x02\u02BA\u02BB" +
+    "\x05\u011A\x8B\x02\u02BB\u02BD\x03\x02\x02\x02\u02BC\u02AF\x03\x02\x02" +
+    "\x02\u02BC\u02B3\x03\x02\x02\x02\u02BDa\x03\x02\x02\x02\u02BE\u02BF\x05" +
+    "\xFA{\x02\u02BF\u02C0\x05\u0104\x80\x02\u02C0\u02C1\x05\u0104\x80\x02" +
+    "\u02C1\u02C2\x05\xF2w\x02\u02C2\u02C3\x05\u010C\x84\x02\u02C3c\x03\x02" +
+    "\x02\x02\u02C4\u02C5\x05\xFA{\x02\u02C5\u02C6\x05\u0104\x80\x02\u02C6" +
+    "\u02C7\x05\u0110\x86\x02\u02C7\u02C8\x05\xF2w\x02\u02C8\u02C9\x05\u010C" +
+    "\x84\x02\u02C9\u02CA\x05\u010E\x85\x02\u02CA\u02CB\x05\xF2w\x02\u02CB" +
+    "\u02CC\x05\xEEu\x02\u02CC\u02CD\x05\u0110\x86\x02\u02CDe\x03\x02\x02\x02" +
+    "\u02CE\u02CF\x05\xFA{\x02\u02CF\u02D0\x05\u0104\x80\x02\u02D0\u02D1\x05" +
+    "\u0110\x86\x02\u02D1\u02D2\x05\xF2w\x02\u02D2\u02D3\x05\u010C\x84\x02" +
+    "\u02D3\u02D4\x05\u0114\x88\x02\u02D4\u02D5\x05\xEAs\x02\u02D5\u02D6\x05" +
+    "\u0100~\x02\u02D6g\x03\x02\x02\x02\u02D7\u02D8\x05\xFA{\x02\u02D8\u02D9" +
+    "\x05\u010E\x85\x02\u02D9i\x03\x02\x02\x02\u02DA\u02DB\x05\xFC|\x02\u02DB" +
+    "\u02DC\x05\u0106\x81\x02\u02DC\u02DD\x05\xFA{\x02\u02DD\u02DE\x05\u0104" +
+    "\x80\x02\u02DEk\x03\x02\x02\x02\u02DF\u02E0\x05\xFE}\x02\u02E0\u02E1\x05" +
+    "\xF2w\x02\u02E1\u02E2\x05\u011A\x8B\x02\u02E2m\x03\x02\x02\x02\u02E3\u02E4" +
+    "\x05\u0100~\x02\u02E4\u02E5\x05\xEAs\x02\u02E5\u02E6\x05\u010E\x85\x02" +
+    "\u02E6\u02E7\x05\u0110\x86\x02\u02E7o\x03\x02\x02\x02\u02E8\u02E9\x05" +
+    "\u0100~\x02\u02E9\u02EA\x05\xF2w\x02\u02EA\u02EB\x05\xEAs\x02\u02EB\u02EC" +
+    "\x05\xF0v\x02\u02EC\u02ED\x05\xFA{\x02\u02ED\u02EE\x05\u0104\x80\x02\u02EE" +
+    "\u02EF\x05\xF6y\x02\u02EFq\x03\x02\x02\x02\u02F0\u02F1\x05\u0100~\x02" +
+    "\u02F1\u02F2\x05\xF2w\x02\u02F2\u02F3\x05\xF4x\x02\u02F3\u02F4\x05\u0110" +
+    "\x86\x02\u02F4s\x03\x02\x02\x02\u02F5\u02F6\x05\u0100~\x02\u02F6\u02F7" +
+    "\x05\xF2w\x02\u02F7\u02F8\x05\u0110\x86\x02\u02F8u\x03\x02\x02\x02\u02F9" +
+    "\u02FA\x05\u0100~\x02\u02FA\u02FB\x05\xFA{\x02\u02FB\u02FC\x05\xFE}\x02" +
+    "\u02FC\u02FD\x05\xF2w\x02\u02FDw\x03\x02\x02\x02\u02FE\u02FF\x05\u0100" +
+    "~\x02\u02FF\u0300\x05\xFA{\x02\u0300\u0301\x05\u0102\x7F\x02\u0301\u0302" +
+    "\x05\xFA{\x02\u0302\u0303\x05\u0110\x86\x02\u0303y\x03\x02\x02\x02\u0304" +
+    "\u0305\x05\u0102\x7F\x02\u0305\u0306\x05\xFA{\x02\u0306\u0307\x05\u0104" +
+    "\x80\x02\u0307\u0308\x05\u0112\x87\x02\u0308\u0309\x05\u0110\x86\x02\u0309" +
+    "\u030A\x05\xF2w\x02\u030A{\x03\x02\x02\x02\u030B\u030C\x05\u0102\x7F\x02" +
+    "\u030C\u030D\x05\u0106\x81\x02\u030D\u030E\x05\u0104\x80\x02\u030E\u030F" +
+    "\x05\u0110\x86\x02\u030F\u0310\x05\xF8z\x02\u0310}\x03\x02\x02\x02\u0311" +
+    "\u0312\x05\u0104\x80\x02\u0312\u0313\x05\xEAs\x02\u0313\u0314\x05\u0104" +
+    "\x80\x02\u0314\x7F\x03\x02\x02\x02\u0315\u0316\x05\u0104\x80\x02\u0316" +
+    "\u0317\x05\u0106\x81\x02\u0317\u0318\x05\u0110\x86\x02\u0318\x81\x03\x02" +
+    "\x02\x02\u0319\u031A\x05\u0104\x80\x02\u031A\u031B\x05\u0112\x87\x02\u031B" +
+    "\u031C\x05\u0100~\x02\u031C\u031D\x05\u0100~\x02\u031D\x83\x03\x02\x02" +
+    "\x02\u031E\u031F\x05\u0104\x80\x02\u031F\u0320\x05\u0112\x87\x02\u0320" +
+    "\u0321\x05\u0100~\x02\u0321\u0322\x05\u0100~\x02\u0322\u0323\x05\u010E" +
+    "\x85\x02\u0323\x85\x03\x02\x02\x02\u0324\u0325\x05\u0106\x81\x02\u0325" +
+    "\u0326\x05\xF4x\x02\u0326\u0327\x05\xF4x\x02\u0327\u0328\x05\u010E\x85" +
+    "\x02\u0328\u0329\x05\xF2w\x02\u0329\u032A\x05\u0110\x86\x02\u032A\x87" +
+    "\x03\x02\x02\x02\u032B\u032C\x05\u0106\x81\x02\u032C\u032D\x05\u0104\x80" +
+    "\x02\u032D\x89\x03\x02\x02\x02\u032E\u032F\x05\u0106\x81\x02\u032F\u0330" +
+    "\x05\u010C\x84\x02\u0330\x8B\x03\x02\x02\x02\u0331\u0332\x05\u0106\x81" +
+    "\x02\u0332\u0333\x05\u010C\x84\x02\u0333\u0334\x05\xF0v\x02\u0334\u0335" +
+    "\x05\xF2w\x02\u0335\u0336\x05\u010C\x84\x02\u0336\x8D\x03\x02\x02\x02" +
+    "\u0337\u0338\x05\u0106\x81\x02\u0338\u0339\x05\u0112\x87\x02\u0339\u033A" +
+    "\x05\u0110\x86\x02\u033A\u033B\x05\xF2w\x02\u033B\u033C\x05\u010C\x84" +
+    "\x02\u033C\x8F\x03\x02\x02\x02\u033D\u033E\x05\u0106\x81\x02\u033E\u033F" +
+    "\x05\u0114\x88\x02\u033F\u0340\x05\xF2w\x02\u0340\u0341\x05\u010C\x84" +
+    "\x02\u0341\x91\x03\x02\x02\x02\u0342\u0343\x05\u0108\x82\x02\u0343\u0344" +
+    "\x05\xEAs\x02\u0344\u0345\x05\u010C\x84\x02\u0345\u0346\x05\u0110\x86" +
+    "\x02\u0346\u0347\x05\xFA{\x02\u0347\u0348\x05\u0110\x86\x02\u0348\u0349" +
+    "\x05\xFA{\x02\u0349\u034A\x05\u0106\x81\x02\u034A\u034B\x05\u0104\x80" +
+    "\x02\u034B\x93\x03\x02\x02\x02\u034C\u034D\x05\u0108\x82\x02\u034D\u034E" +
+    "\x05\u010C\x84\x02\u034E\u034F\x05\xF2w\x02\u034F\u0350\x05\xEEu\x02\u0350" +
+    "\u0351\x05\xF2w\x02\u0351\u0352\x05\xF0v\x02\u0352\u0353\x05\xFA{\x02" +
+    "\u0353\u0354\x05\u0104\x80\x02\u0354\u0355\x05\xF6y\x02\u0355\x95\x03" +
+    "\x02\x02\x02\u0356\u0357\x05\u0108\x82\x02\u0357\u0358\x05\u010C\x84\x02" +
+    "\u0358\u0359\x05\xF2w\x02\u0359\u035A\x05\u0116\x89\x02\u035A\u035B\x05" +
+    "\xF8z\x02\u035B\u035C\x05\xF2w\x02\u035C\u035D\x05\u010C\x84\x02\u035D" +
+    "\u035E\x05\xF2w\x02\u035E\x97\x03\x02\x02\x02\u035F\u0360\x05\u010A\x83" +
+    "\x02\u0360\u0361\x05\u0112\x87\x02\u0361\u0362\x05\xEAs\x02\u0362\u0363" +
+    "\x05\u010C\x84\x02\u0363\u0364\x05\u0110\x86\x02\u0364\u0365\x05\xF2w" +
+    "\x02\u0365\u0366\x05\u010C\x84\x02\u0366\x99\x03\x02\x02\x02\u0367\u0368" +
+    "\x05\u010C\x84\x02\u0368\u0369\x05\xEAs\x02\u0369\u036A\x05\u0104\x80" +
+    "\x02\u036A\u036B\x05\xF6y\x02\u036B\u036C\x05\xF2w\x02\u036C\x9B\x03\x02" +
+    "\x02\x02\u036D\u036E\x05\u010C\x84\x02\u036E\u036F\x05\xF2w\x02\u036F" +
+    "\u0370\x05\u0110\x86\x02\u0370\u0371\x05\u0112\x87\x02\u0371\u0372\x05" +
+    "\u010C\x84\x02\u0372\u0373\x05\u0104\x80\x02\u0373\x9D\x03\x02\x02\x02" +
+    "\u0374\u0375\x05\u010C\x84\x02\u0375\u0376\x05\xFA{\x02\u0376\u0377\x05" +
+    "\xF6y\x02\u0377\u0378\x05\xF8z\x02\u0378\u0379\x05\u0110\x86\x02\u0379" +
+    "\x9F\x03\x02\x02\x02\u037A\u037B\x05\u010C\x84\x02\u037B\u037C\x05\u0106" +
+    "\x81\x02\u037C\u037D\x05\u0100~\x02\u037D\u037E\x05\u0100~\x02\u037E\u037F" +
+    "\x05\u0112\x87\x02\u037F\u0380\x05\u0108\x82\x02\u0380\xA1\x03\x02\x02" +
+    "\x02\u0381\u0382\x05\u010C\x84\x02\u0382\u0383\x05\u0106\x81\x02\u0383" +
+    "\u0384\x05\u0116\x89\x02\u0384\xA3\x03\x02\x02\x02\u0385\u0386\x05\u010C" +
+    "\x84\x02\u0386\u0387\x05\u0106\x81\x02\u0387\u0388\x05\u0116\x89\x02\u0388" +
+    "\u0389\x05\u010E\x85\x02\u0389\xA5\x03\x02\x02\x02\u038A\u038B\x05\u010E" +
+    "\x85\x02\u038B\u038C\x05\xEAs\x02\u038C\u038D\x05\u0102\x7F\x02\u038D" +
+    "\u038E\x05\u0108\x82\x02\u038E\u038F\x05\u0100~\x02\u038F\u0390\x05\xF2" +
+    "w\x02\u0390\xA7\x03\x02\x02\x02\u0391\u0392\x05\u010E\x85\x02\u0392\u0393" +
+    "\x05\xF2w\x02\u0393\u0394\x05\xEEu\x02\u0394\u0395\x05\u0106\x81\x02\u0395" +
+    "\u0396\x05\u0104\x80\x02\u0396\u0397\x05\xF0v\x02\u0397\xA9\x03\x02\x02" +
+    "\x02\u0398\u0399\x05\u010E\x85\x02\u0399\u039A\x05\xF2w\x02\u039A\u039B" +
+    "\x05\u0100~\x02\u039B\u039C\x05\xF2w\x02\u039C\u039D\x05\xEEu\x02\u039D" +
+    "\u039E\x05\u0110\x86\x02\u039E\xAB\x03\x02\x02\x02\u039F\u03A0\x05\u010E" +
+    "\x85\x02\u03A0\u03A1\x05\xF2w\x02\u03A1\u03A2\x05\u0102\x7F\x02\u03A2" +
+    "\u03A3\x05\xFA{\x02\u03A3\xAD\x03\x02\x02\x02\u03A4\u03A5\x05\u010E\x85" +
+    "\x02\u03A5\u03A6\x05\xF2w\x02\u03A6\u03A7\x05\u0110\x86\x02\u03A7\u03A8" +
+    "\x05\u0110\x86\x02\u03A8\u03A9\x05\xFA{\x02\u03A9\u03AA\x05\u0104\x80" +
+    "\x02\u03AA\u03AB\x05\xF6y\x02\u03AB\u03AC\x05\u010E\x85\x02\u03AC\xAF" +
+    "\x03\x02\x02\x02\u03AD\u03AE\x05\u010E\x85\x02\u03AE\u03AF\x05\u0112\x87" +
+    "\x02\u03AF\u03B0\x05\xECt\x02\u03B0\u03B1\x05\u010E\x85\x02\u03B1\u03B2" +
+    "\x05\u0110\x86\x02\u03B2\u03B3\x05\u010C\x84\x02\u03B3\u03B4\x05\xFA{" +
+    "\x02\u03B4\u03B5\x05\u0104\x80\x02\u03B5\u03B6\x05\xF6y\x02\u03B6\xB1" +
+    "\x03\x02\x02\x02\u03B7\u03B8\x05\u0110\x86\x02\u03B8\u03B9\x05\xF8z\x02" +
+    "\u03B9\u03BA\x05\xF2w\x02\u03BA\u03BB\x05\u0104\x80\x02\u03BB\xB3\x03" +
+    "\x02\x02\x02\u03BC\u03BD\x05\u0110\x86\x02\u03BD\u03BE\x05\xF8z\x02\u03BE" +
+    "\u03BF\x05\u010C\x84\x02\u03BF\u03C0\x05\u0106\x81\x02\u03C0\u03C1\x05" +
+    "\u0116\x89\x02\u03C1\xB5\x03\x02\x02\x02\u03C2\u03C3\x05\u0110\x86\x02" +
+    "\u03C3\u03C4\x05\xFA{\x02\u03C4\u03C5\x05\xF2w\x02\u03C5\u03C6\x05\u010E" +
+    "\x85\x02\u03C6\xB7\x03\x02\x02\x02\u03C7\u03C8\x05\u0110\x86\x02\u03C8" +
+    "\u03C9\x05\xFA{\x02\u03C9\u03CA\x05\u0102\x7F\x02\u03CA\u03CB\x05\xF2" +
+    "w\x02\u03CB\u03CC\x05\u010E\x85\x02\u03CC\u03CD\x05\u0110\x86\x02\u03CD" +
+    "\u03CE\x05\xEAs\x02\u03CE\u03CF\x05\u0102\x7F\x02\u03CF\u03D0\x05\u0108" +
+    "\x82\x02\u03D0\xB9\x03\x02\x02\x02\u03D1\u03D2\x05\u0110\x86\x02\u03D2" +
+    "\u03D3\x05\u0106\x81\x02\u03D3\xBB\x03\x02\x02\x02\u03D4\u03D5\x05\u0110" +
+    "\x86\x02\u03D5\u03D6\x05\u0106\x81\x02\u03D6\u03D7\x05\u0108\x82\x02\u03D7" +
+    "\xBD\x03\x02\x02\x02\u03D8\u03D9\x05\u0110\x86\x02\u03D9\u03DA\x05\u0106" +
+    "\x81\x02\u03DA\u03DB\x05\u0110\x86\x02\u03DB\u03DC\x05\xEAs\x02\u03DC" +
+    "\u03DD\x05\u0100~\x02\u03DD\u03DE\x05\u010E\x85\x02\u03DE\xBF\x03\x02" +
+    "\x02\x02\u03DF\u03E0\x05\u0110\x86\x02\u03E0\u03E1\x05\u010C\x84\x02\u03E1" +
+    "\u03E2\x05\xEAs\x02\u03E2\u03E3\x05\xFA{\x02\u03E3\u03E4\x05\u0100~\x02";
+  private static readonly _serializedATNSegment2: string =
+    "\u03E4\u03E5\x05\xFA{\x02\u03E5\u03E6\x05\u0104\x80\x02\u03E6\u03E7\x05" +
+    "\xF6y\x02\u03E7\xC1\x03\x02\x02\x02\u03E8\u03E9\x05\u0110\x86\x02\u03E9" +
+    "\u03EA\x05\u010C\x84\x02\u03EA\u03EB\x05\xFA{\x02\u03EB\u03EC\x05\u0102" +
+    "\x7F\x02\u03EC\xC3\x03\x02\x02\x02\u03ED\u03EE\x05\u0110\x86\x02\u03EE" +
+    "\u03EF\x05\u010C\x84\x02\u03EF\u03F0\x05\u0112\x87\x02\u03F0\u03F1\x05" +
+    "\u0104\x80\x02\u03F1\u03F2\x05\xEEu\x02\u03F2\u03F3\x05\xEAs\x02\u03F3" +
+    "\u03F4\x05\u0110\x86\x02\u03F4\u03F5\x05\xF2w\x02\u03F5\xC5\x03\x02\x02" +
+    "\x02\u03F6\u03F7\x05\u0110\x86\x02\u03F7\u03F8\x05\u010C\x84\x02\u03F8" +
+    "\u03F9\x05\u011A\x8B\x02\u03F9\xC7\x03\x02\x02\x02\u03FA\u03FB\x05\u0112" +
+    "\x87\x02\u03FB\u03FC\x05\u0104\x80\x02\u03FC\u03FD\x05\xECt\x02\u03FD" +
+    "\u03FE\x05\u0106\x81\x02\u03FE\u03FF\x05\u0112\x87\x02\u03FF\u0400\x05" +
+    "\u0104\x80\x02\u0400\u0401\x05\xF0v\x02\u0401\u0402\x05\xF2w\x02\u0402" +
+    "\u0403\x05\xF0v\x02\u0403\xC9\x03\x02\x02\x02\u0404\u0405\x05\u0112\x87" +
+    "\x02\u0405\u0406\x05\u0104\x80\x02\u0406\u0407\x05\xFA{\x02\u0407\u0408" +
+    "\x05\u0106\x81\x02\u0408\u0409\x05\u0104\x80\x02\u0409\xCB\x03\x02\x02" +
+    "\x02\u040A\u040B\x05\u0112\x87\x02\u040B\u040C\x05\u010E\x85\x02\u040C" +
+    "\u040D\x05\xFA{\x02\u040D\u040E\x05\u0104\x80\x02\u040E\u040F\x05\xF6" +
+    "y\x02\u040F\xCD\x03\x02\x02\x02\u0410\u0411\x05\u0116\x89\x02\u0411\u0412" +
+    "\x05\xF2w\x02\u0412\u0413\x05\xF2w\x02\u0413\u0414\x05\xFE}\x02\u0414" +
+    "\xCF\x03\x02\x02\x02\u0415\u0416\x05\u0116\x89\x02\u0416\u0417\x05\xF8" +
+    "z\x02\u0417\u0418\x05\xF2w\x02\u0418\u0419\x05\u0104\x80\x02\u0419\xD1" +
+    "\x03\x02\x02\x02\u041A\u041B\x05\u0116\x89\x02\u041B\u041C\x05\xF8z\x02" +
+    "\u041C\u041D\x05\xF2w\x02\u041D\u041E\x05\u010C\x84\x02\u041E\u041F\x05" +
+    "\xF2w\x02\u041F\xD3\x03\x02\x02\x02\u0420\u0421\x05\u0116\x89\x02\u0421" +
+    "\u0422\x05\xF8z\x02\u0422\u0423\x05\xFA{\x02\u0423\u0424\x05\u0100~\x02" +
+    "\u0424\u0425\x05\xF2w\x02\u0425\xD5\x03\x02\x02\x02\u0426\u0427\x05\u0116" +
+    "\x89\x02\u0427\u0428\x05\xFA{\x02\u0428\u0429\x05\u0104\x80\x02\u0429" +
+    "\u042A\x05\xF0v\x02\u042A\u042B\x05\u0106\x81\x02\u042B\u042C\x05\u0116" +
+    "\x89\x02\u042C\xD7\x03\x02\x02\x02\u042D\u042E\x05\u0116\x89\x02\u042E" +
+    "\u042F\x05\xFA{\x02\u042F\u0430\x05\u0110\x86\x02\u0430\u0431\x05\xF8" +
+    "z\x02\u0431\xD9\x03\x02\x02\x02\u0432\u0433\x05\u011A\x8B\x02\u0433\u0434" +
+    "\x05\xF2w\x02\u0434\u0435\x05\xEAs\x02\u0435\u0436\x05\u010C\x84\x02\u0436" +
+    "\u043D\x03\x02\x02\x02\u0437\u0438\x05\u011A\x8B\x02\u0438\u0439\x05\u011A" +
+    "\x8B\x02\u0439\u043A\x05\u011A\x8B\x02\u043A\u043B\x05\u011A\x8B\x02\u043B" +
+    "\u043D\x03\x02\x02\x02\u043C\u0432\x03\x02\x02\x02\u043C\u0437\x03\x02" +
+    "\x02\x02\u043D\xDB\x03\x02\x02\x02\u043E\u043F\x05\u012C\x94\x02\u043F" +
+    "\u0440\x05\xECt\x02\u0440\u045A\x03\x02\x02\x02\u0441\u0442\x05\u012C" +
+    "\x94\x02\u0442\u0443\x05\xF4x\x02\u0443\u045A\x03\x02\x02\x02\u0444\u0445" +
+    "\x05\u012C\x94\x02\u0445\u0446\x05\u010C\x84\x02\u0446\u045A\x03\x02\x02" +
+    "\x02\u0447\u0448\x05\u012C\x94\x02\u0448\u0449\x05\u0104\x80\x02\u0449" +
+    "\u045A\x03\x02\x02\x02\u044A\u044B\x05\u012C\x94\x02\u044B\u044C\x05\u0110" +
+    "\x86\x02\u044C\u045A\x03\x02\x02\x02\u044D\u044E\x05\u012C\x94\x02\u044E" +
+    "\u044F\x072\x02\x02\u044F\u045A\x03\x02\x02\x02\u0450\u0451\x05\u012C" +
+    "\x94\x02\u0451\u0452\x05\xEAs\x02\u0452\u045A\x03\x02\x02\x02\u0453\u0454" +
+    "\x05\u012C\x94\x02\u0454\u0455\x05\u0114\x88\x02\u0455\u045A\x03\x02\x02" +
+    "\x02\u0456\u0457\x05\u012C\x94\x02\u0457\u0458\x05\u012C\x94\x02\u0458" +
+    "\u045A\x03\x02\x02\x02\u0459\u043E\x03\x02\x02\x02\u0459\u0441\x03\x02" +
+    "\x02\x02\u0459\u0444\x03\x02\x02\x02\u0459\u0447\x03\x02\x02\x02\u0459" +
+    "\u044A\x03\x02\x02\x02\u0459\u044D\x03\x02\x02\x02\u0459\u0450\x03\x02" +
+    "\x02\x02\u0459\u0453\x03\x02\x02\x02\u0459\u0456\x03\x02\x02\x02\u045A" +
+    "\xDD\x03\x02\x02\x02\u045B\u045F\x05\u011E\x8D\x02\u045C\u045F\x05\u0180" +
+    "\xBE\x02\u045D\u045F\x05\u0136\x99\x02\u045E\u045B\x03\x02\x02\x02\u045E" +
+    "\u045C\x03\x02\x02\x02\u045E\u045D\x03\x02\x02\x02\u045F\u0466\x03\x02" +
+    "\x02\x02\u0460\u0465\x05\u011E\x8D\x02\u0461\u0465\x05\u0180\xBE\x02\u0462" +
+    "\u0465\x05\u0122\x8F\x02\u0463\u0465\x05\u0136\x99\x02\u0464\u0460\x03" +
+    "\x02\x02\x02\u0464\u0461\x03\x02\x02\x02\u0464\u0462\x03\x02\x02\x02\u0464" +
+    "\u0463\x03\x02\x02\x02\u0465\u0468\x03\x02\x02\x02\u0466\u0464\x03\x02" +
+    "\x02\x02\u0466\u0467\x03\x02\x02\x02\u0467\u048A\x03\x02\x02\x02\u0468" +
+    "\u0466\x03\x02\x02\x02\u0469\u0474\x05\u012A\x93\x02\u046A\u0473\n\x02" +
+    "\x02\x02\u046B\u0473\x05\xDCl\x02\u046C\u046D\x05\u012C\x94\x02\u046D" +
+    "\u046E\x05\u016E\xB5\x02\u046E\u0473\x03\x02\x02\x02\u046F\u0470\x05\u012A" +
+    "\x93\x02\u0470\u0471\x05\u012A\x93\x02\u0471\u0473\x03\x02\x02\x02\u0472" +
+    "\u046A\x03\x02\x02\x02\u0472\u046B\x03\x02\x02\x02\u0472\u046C\x03\x02" +
+    "\x02\x02\u0472\u046F\x03\x02\x02\x02\u0473\u0476\x03\x02\x02\x02\u0474" +
+    "\u0472\x03\x02\x02\x02\u0474\u0475\x03\x02\x02\x02\u0475\u0477\x03\x02" +
+    "\x02\x02\u0476\u0474\x03\x02\x02\x02\u0477\u0478\x05\u012A\x93\x02\u0478" +
+    "\u048A\x03\x02\x02\x02\u0479\u0484\x05\u0168\xB2\x02\u047A\u0483\n\x03" +
+    "\x02\x02\u047B\u0483\x05\xDCl\x02\u047C\u047D\x05\u012C\x94\x02\u047D" +
+    "\u047E\x05\u0168\xB2\x02\u047E\u0483\x03\x02\x02\x02\u047F\u0480\x05\u0168" +
+    "\xB2\x02\u0480\u0481\x05\u0168\xB2\x02\u0481\u0483\x03\x02\x02\x02\u0482" +
+    "\u047A\x03\x02\x02\x02\u0482\u047B\x03\x02\x02\x02\u0482\u047C\x03\x02" +
+    "\x02\x02\u0482\u047F\x03\x02\x02\x02\u0483\u0486\x03\x02\x02\x02\u0484" +
+    "\u0482\x03\x02\x02\x02\u0484\u0485\x03\x02\x02\x02\u0485\u0487\x03\x02" +
+    "\x02\x02\u0486\u0484\x03\x02\x02\x02\u0487\u0488\x05\u0168\xB2\x02\u0488" +
+    "\u048A\x03\x02\x02\x02\u0489\u045E\x03\x02\x02\x02\u0489\u0469\x03\x02" +
+    "\x02\x02\u0489\u0479\x03\x02\x02\x02\u048A\xDF\x03\x02\x02\x02\u048B\u048C" +
+    "\x05\xE6q\x02\u048C\u0490\x05\u0138\x9A\x02\u048D\u048F\x05\u0124\x90" +
+    "\x02\u048E\u048D\x03\x02\x02\x02\u048F\u0492\x03\x02\x02\x02\u0490\u048E" +
+    "\x03\x02\x02\x02\u0490\u0491\x03\x02\x02\x02\u0491\u0495\x03\x02\x02\x02" +
+    "\u0492\u0490\x03\x02\x02\x02\u0493\u0496\x05\u0108\x82\x02\u0494\u0496" +
+    "\x05\xF2w\x02\u0495\u0493\x03\x02\x02\x02\u0495\u0494\x03\x02\x02\x02" +
+    "\u0496\u0499\x03\x02\x02\x02\u0497\u049A\x05\u0164\xB0\x02\u0498\u049A" +
+    "\x05\u0134\x98\x02\u0499\u0497\x03\x02\x02\x02\u0499\u0498\x03\x02\x02" +
+    "\x02\u0499\u049A\x03\x02\x02\x02\u049A\u049C\x03\x02\x02\x02\u049B\u049D" +
+    "\x05\u0122\x8F\x02\u049C\u049B\x03\x02\x02\x02\u049D\u049E\x03\x02\x02" +
+    "\x02\u049E\u049C\x03\x02\x02\x02\u049E\u049F\x03\x02\x02\x02\u049F\u04D8" +
+    "\x03\x02\x02\x02\u04A0\u04A3\x05\xE6q\x02\u04A1\u04A4\x05\u0108\x82\x02" +
+    "\u04A2\u04A4\x05\xF2w\x02\u04A3\u04A1\x03\x02\x02\x02\u04A3\u04A2\x03" +
+    "\x02\x02\x02\u04A4\u04A7\x03\x02\x02\x02\u04A5\u04A8\x05\u0164\xB0\x02" +
+    "\u04A6\u04A8\x05\u0134\x98\x02\u04A7\u04A5\x03\x02\x02\x02\u04A7\u04A6" +
+    "\x03\x02\x02\x02\u04A7\u04A8\x03\x02\x02\x02\u04A8\u04AA\x03\x02\x02\x02" +
+    "\u04A9\u04AB\x05\u0122\x8F\x02\u04AA\u04A9\x03\x02\x02\x02\u04AB\u04AC" +
+    "\x03\x02\x02\x02\u04AC\u04AA\x03\x02\x02\x02\u04AC\u04AD\x03\x02\x02\x02" +
+    "\u04AD\u04D8\x03\x02\x02\x02\u04AE\u04AF\x05\xE4p\x02\u04AF\u04B3\x05" +
+    "\u0138\x9A\x02\u04B0\u04B2\x05\u0122\x8F\x02\u04B1\u04B0\x03\x02\x02\x02" +
+    "\u04B2\u04B5\x03\x02\x02\x02\u04B3\u04B1\x03\x02\x02\x02\u04B3\u04B4\x03" +
+    "\x02\x02\x02\u04B4\u04B6\x03\x02\x02\x02\u04B5\u04B3\x03\x02\x02\x02\u04B6" +
+    "\u04B9\x05\xF2w\x02\u04B7\u04BA\x05\u0164\xB0\x02\u04B8\u04BA\x05\u0134" +
+    "\x98\x02\u04B9\u04B7\x03\x02\x02\x02\u04B9\u04B8\x03\x02\x02\x02\u04B9" +
+    "\u04BA\x03\x02\x02\x02\u04BA\u04BC\x03\x02\x02\x02\u04BB\u04BD\x05\u0122" +
+    "\x8F\x02\u04BC\u04BB\x03\x02\x02\x02\u04BD\u04BE\x03\x02\x02\x02\u04BE" +
+    "\u04BC\x03\x02\x02\x02\u04BE\u04BF\x03\x02\x02\x02\u04BF\u04D8\x03\x02" +
+    "\x02\x02\u04C0\u04C1\x05\u0138\x9A\x02\u04C1\u04C2\x05\xE4p\x02\u04C2" +
+    "\u04C5\x05\xF2w\x02\u04C3\u04C6\x05\u0164\xB0\x02\u04C4\u04C6\x05\u0134" +
+    "\x98\x02\u04C5\u04C3\x03\x02\x02\x02\u04C5\u04C4\x03\x02\x02\x02\u04C5" +
+    "\u04C6\x03\x02\x02\x02\u04C6\u04C8\x03\x02\x02\x02\u04C7\u04C9\x05\u0122" +
+    "\x8F\x02\u04C8\u04C7\x03\x02\x02\x02\u04C9\u04CA\x03\x02\x02\x02\u04CA" +
+    "\u04C8\x03\x02\x02\x02\u04CA\u04CB\x03\x02\x02\x02\u04CB\u04D8\x03\x02" +
+    "\x02\x02\u04CC\u04CD\x05\xE4p\x02\u04CD\u04D0\x05\xF2w\x02\u04CE\u04D1" +
+    "\x05\u0164\xB0\x02\u04CF\u04D1\x05\u0134\x98\x02\u04D0\u04CE\x03\x02\x02" +
+    "\x02\u04D0\u04CF\x03\x02\x02\x02\u04D0\u04D1\x03\x02\x02\x02\u04D1\u04D3" +
+    "\x03\x02\x02\x02\u04D2\u04D4\x05\u0122\x8F\x02\u04D3\u04D2\x03\x02\x02" +
+    "\x02\u04D4\u04D5\x03\x02\x02\x02\u04D5\u04D3\x03\x02\x02\x02\u04D5\u04D6" +
+    "\x03\x02\x02\x02\u04D6\u04D8\x03\x02\x02\x02\u04D7\u048B\x03\x02\x02\x02" +
+    "\u04D7\u04A0\x03\x02\x02\x02\u04D7\u04AE\x03\x02\x02\x02\u04D7\u04C0\x03" +
+    "\x02\x02\x02\u04D7\u04CC\x03\x02\x02\x02\u04D8\xE1\x03\x02\x02\x02\u04D9" +
+    "\u04DB\x072\x02\x02\u04DA\u04DC\x05\u0120\x8E\x02\u04DB\u04DA\x03\x02" +
+    "\x02\x02\u04DC\u04DD\x03\x02\x02\x02\u04DD\u04DB\x03\x02\x02\x02\u04DD" +
+    "\u04DE\x03\x02\x02\x02\u04DE\xE3\x03\x02\x02\x02\u04DF\u04E1\x05\u0122" +
+    "\x8F\x02\u04E0\u04DF\x03\x02\x02\x02\u04E1\u04E2\x03\x02\x02\x02\u04E2" +
+    "\u04E0\x03\x02\x02\x02\u04E2\u04E3\x03\x02\x02\x02\u04E3\xE5\x03\x02\x02" +
+    "\x02\u04E4\u04E5\x072\x02\x02\u04E5\u04E7\x05\u0118\x8A\x02\u04E6\u04E8" +
+    "\x05\u0124\x90\x02\u04E7\u04E6\x03\x02\x02\x02\u04E8\u04E9\x03\x02\x02" +
+    "\x02\u04E9\u04E7\x03\x02\x02\x02\u04E9\u04EA\x03\x02\x02\x02\u04EA\xE7" +
+    "\x03\x02\x02\x02\u04EB\u04F6\x05\u016E\xB5\x02\u04EC\u04F5\n\x04\x02\x02" +
+    "\u04ED\u04F5\x05\xDCl\x02\u04EE\u04EF\x05\u012C\x94\x02\u04EF\u04F0\x05" +
+    "\u016E\xB5\x02\u04F0\u04F5\x03\x02\x02\x02\u04F1\u04F2\x05\u016E\xB5\x02" +
+    "\u04F2\u04F3\x05\u016E\xB5\x02\u04F3\u04F5\x03\x02\x02\x02\u04F4\u04EC" +
+    "\x03\x02\x02\x02\u04F4\u04ED\x03\x02\x02\x02\u04F4\u04EE\x03\x02\x02\x02" +
+    "\u04F4\u04F1\x03\x02\x02\x02\u04F5\u04F8\x03\x02\x02\x02\u04F6\u04F4\x03" +
+    "\x02\x02\x02\u04F6\u04F7\x03\x02\x02\x02\u04F7\u04F9\x03\x02\x02\x02\u04F8" +
+    "\u04F6\x03\x02\x02\x02\u04F9\u04FA\x05\u016E\xB5\x02\u04FA\xE9\x03\x02" +
+    "\x02\x02\u04FB\u04FC\t\x05\x02\x02\u04FC\xEB\x03\x02\x02\x02\u04FD\u04FE" +
+    "\t\x06\x02\x02\u04FE\xED\x03\x02\x02\x02\u04FF\u0500\t\x07\x02\x02\u0500" +
+    "\xEF\x03\x02\x02\x02\u0501\u0502\t\b\x02\x02\u0502\xF1\x03\x02\x02\x02" +
+    "\u0503\u0504\t\t\x02\x02\u0504\xF3\x03\x02\x02\x02\u0505\u0506\t\n\x02" +
+    "\x02\u0506\xF5\x03\x02\x02\x02\u0507\u0508\t\v\x02\x02\u0508\xF7\x03\x02" +
+    "\x02\x02\u0509\u050A\t\f\x02\x02\u050A\xF9\x03\x02\x02\x02\u050B\u050C" +
+    "\t\r\x02\x02\u050C\xFB\x03\x02\x02\x02\u050D\u050E\t\x0E\x02\x02\u050E" +
+    "\xFD\x03\x02\x02\x02\u050F\u0510\t\x0F\x02\x02\u0510\xFF\x03\x02\x02\x02" +
+    "\u0511\u0512\t\x10\x02\x02\u0512\u0101\x03\x02\x02\x02\u0513\u0514\t\x11" +
+    "\x02\x02\u0514\u0103\x03\x02\x02\x02\u0515\u0516\t\x12\x02\x02\u0516\u0105" +
+    "\x03\x02\x02\x02\u0517\u0518\t\x13\x02\x02\u0518\u0107\x03\x02\x02\x02" +
+    "\u0519\u051A\t\x14\x02\x02\u051A\u0109\x03\x02\x02\x02\u051B\u051C\t\x15" +
+    "\x02\x02\u051C\u010B\x03\x02\x02\x02\u051D\u051E\t\x16\x02\x02\u051E\u010D" +
+    "\x03\x02\x02\x02\u051F\u0520\t\x17\x02\x02\u0520\u010F\x03\x02\x02\x02" +
+    "\u0521\u0522\t\x18\x02\x02\u0522\u0111\x03\x02\x02\x02\u0523\u0524\t\x19" +
+    "\x02\x02\u0524\u0113\x03\x02\x02\x02\u0525\u0526\t\x1A\x02\x02\u0526\u0115" +
+    "\x03\x02\x02\x02\u0527\u0528\t\x1B\x02\x02\u0528\u0117\x03\x02\x02\x02" +
+    "\u0529\u052A\t\x1C\x02\x02\u052A\u0119\x03\x02\x02\x02\u052B\u052C\t\x1D" +
+    "\x02\x02\u052C\u011B\x03\x02\x02\x02\u052D\u052E\t\x1E\x02\x02\u052E\u011D" +
+    "\x03\x02\x02\x02\u052F\u0530\t\x1F\x02\x02\u0530\u011F\x03\x02\x02\x02" +
+    "\u0531\u0532\t \x02\x02\u0532\u0121\x03\x02\x02\x02\u0533\u0534\t!\x02" +
+    '\x02\u0534\u0123\x03\x02\x02\x02\u0535\u0536\t"\x02\x02\u0536\u0125\x03' +
+    "\x02\x02\x02\u0537\u0538\x07/\x02\x02\u0538\u0539\x07@\x02\x02\u0539\u0127" +
+    "\x03\x02\x02\x02\u053A\u053B\x07,\x02\x02\u053B\u0129\x03\x02\x02\x02" +
+    "\u053C\u053D\x07b\x02\x02\u053D\u012B\x03\x02\x02\x02\u053E\u053F\x07" +
+    "^\x02\x02\u053F\u012D\x03\x02\x02\x02\u0540\u0541\x07<\x02\x02\u0541\u012F" +
+    "\x03\x02\x02\x02\u0542\u0543\x07.\x02\x02\u0543\u0131\x03\x02\x02\x02" +
+    "\u0544\u0545\x07~\x02\x02\u0545\u0546\x07~\x02\x02\u0546\u0133\x03\x02" +
+    "\x02\x02\u0547\u0548\x07/\x02\x02\u0548\u0135\x03\x02\x02\x02\u0549\u054A" +
+    "\x07&\x02\x02\u054A\u0137\x03\x02\x02\x02\u054B\u054C\x070\x02\x02\u054C" +
+    "\u0139\x03\x02\x02\x02\u054D\u054E\x07?\x02\x02\u054E\u054F\x07?\x02\x02" +
+    "\u054F\u013B\x03\x02\x02\x02\u0550\u0551\x07?\x02\x02\u0551\u013D\x03" +
+    "\x02\x02\x02\u0552\u0553\x07@\x02\x02\u0553\u0554\x07?\x02\x02\u0554\u013F" +
+    "\x03\x02\x02\x02\u0555\u0556\x07@\x02\x02\u0556\u0141\x03\x02\x02\x02" +
+    "\u0557\u0558\x07%\x02\x02\u0558\u0143\x03\x02\x02\x02\u0559\u055A\x07" +
+    "\x80\x02\x02\u055A\u055B\x07,\x02\x02\u055B\u0145\x03\x02\x02\x02\u055C" +
+    "\u055D\x07?\x02\x02\u055D\u055E\x07\x80\x02\x02\u055E\u055F\x07,\x02\x02" +
+    "\u055F\u0147\x03\x02\x02\x02\u0560\u0561\x07}\x02\x02\u0561\u0562\x03" +
+    "\x02\x02\x02\u0562\u0563\b\xA2\x02\x02\u0563\u0149\x03\x02\x02\x02\u0564" +
+    "\u0565\x07]\x02\x02\u0565\u014B\x03\x02\x02\x02\u0566\u0567\x07*\x02\x02" +
+    "\u0567\u014D\x03\x02\x02\x02\u0568\u0569\x07>\x02\x02\u0569\u056A\x07" +
+    "?\x02\x02\u056A\u014F\x03\x02\x02\x02\u056B\u056C\x07>\x02\x02\u056C\u056D" +
+    "\x071\x02\x02\u056D\u056E\x03\x02\x02\x02\u056E\u056F\b\xA6\x03\x02\u056F" +
+    "\u0570\b\xA6\x04\x02\u0570\u0151\x03\x02\x02\x02\u0571\u0572\x07>\x02" +
+    "\x02\u0572\u0573\x06\xA7\x02\x02\u0573\u0574\x03\x02\x02\x02\u0574\u0575" +
+    "\b\xA7\x05\x02\u0575\u0576\b\xA7\x06\x02\u0576\u0153\x03\x02\x02\x02\u0577" +
+    "\u0578\x07>\x02\x02\u0578\u0155\x03\x02\x02\x02\u0579\u057A\x07>\x02\x02" +
+    "\u057A\u057B\x071\x02\x02\u057B\u0157\x03\x02\x02\x02\u057C\u057D\x07" +
+    "#\x02\x02\u057D\u0581\x07?\x02\x02\u057E\u057F\x07>\x02\x02\u057F\u0581" +
+    "\x07@\x02\x02\u0580\u057C\x03\x02\x02\x02\u0580\u057E\x03\x02\x02\x02" +
+    "\u0581\u0159\x03\x02\x02\x02\u0582\u0583\x07#\x02\x02\u0583\u0584\x07" +
+    "\x80\x02\x02\u0584\u0585\x07,\x02\x02\u0585\u015B\x03\x02\x02\x02\u0586" +
+    "\u0587\x07#\x02\x02\u0587\u0588\x07\x80\x02\x02\u0588\u015D\x03\x02\x02" +
+    "\x02\u0589\u058A\x07A\x02\x02\u058A\u058B\x070\x02\x02\u058B\u015F\x03" +
+    "\x02\x02\x02\u058C\u058D\x07A\x02\x02\u058D\u058E\x07A\x02\x02\u058E\u0161" +
+    "\x03\x02\x02\x02\u058F\u0590\x07'\x02\x02\u0590\u0163\x03\x02\x02\x02" +
+    "\u0591\u0592\x07-\x02\x02\u0592\u0165\x03\x02\x02\x02\u0593\u0594\x07" +
+    "A\x02\x02\u0594\u0167\x03\x02\x02\x02\u0595\u0596\x07$\x02\x02\u0596\u0169" +
+    "\x03\x02\x02\x02\u0597\u0598\x07h\x02\x02\u0598\u0599\x07)\x02\x02\u0599" +
+    "\u059A\x03\x02\x02\x02\u059A\u059B\b\xB3\x07\x02\u059B\u016B\x03\x02\x02" +
+    "\x02\u059C\u059D\x07H\x02\x02\u059D\u059E\x07)\x02\x02\u059E\u059F\x03" +
+    "\x02\x02\x02\u059F\u05A0\b\xB4\b\x02\u05A0\u016D\x03\x02\x02\x02\u05A1" +
+    "\u05A2\x07)\x02\x02\u05A2\u016F\x03\x02\x02\x02\u05A3\u05A4\x07\x80\x02" +
+    "\x02\u05A4\u0171\x03\x02\x02\x02\u05A5\u05A6\x07?\x02\x02\u05A6\u05A7" +
+    "\x07\x80\x02\x02\u05A7\u0173\x03\x02\x02\x02\u05A8\u05A9\x07\x7F\x02\x02" +
+    "\u05A9\u05AA\x03\x02\x02\x02\u05AA\u05AB\b\xB8\t\x02\u05AB\u0175\x03\x02" +
+    "\x02\x02\u05AC\u05AD\x07_\x02\x02\u05AD\u0177\x03\x02\x02\x02\u05AE\u05AF" +
+    "\x07+\x02\x02\u05AF\u0179\x03\x02\x02\x02\u05B0\u05B1\x07=\x02\x02\u05B1" +
+    "\u017B\x03\x02\x02\x02\u05B2\u05B3\x071\x02\x02\u05B3\u017D\x03\x02\x02" +
+    "\x02\u05B4\u05B5\x071\x02\x02\u05B5\u05B6\x07@\x02\x02\u05B6\u017F\x03" +
+    "\x02\x02\x02\u05B7\u05B8\x07a\x02\x02\u05B8\u0181\x03\x02\x02\x02\u05B9" +
+    "\u05BA\x071\x02\x02\u05BA\u05BB\x07,\x02\x02\u05BB\u05BF\x03\x02\x02\x02" +
+    "\u05BC\u05BE\v\x02\x02\x02\u05BD\u05BC\x03\x02\x02\x02\u05BE\u05C1\x03" +
+    "\x02\x02\x02\u05BF\u05C0\x03\x02\x02\x02\u05BF\u05BD\x03\x02\x02\x02\u05C0" +
+    "\u05C2\x03\x02\x02\x02\u05C1\u05BF\x03\x02\x02\x02\u05C2\u05C3\x07,\x02" +
+    "\x02\u05C3\u05C4\x071\x02\x02\u05C4\u05C5\x03\x02\x02\x02\u05C5\u05C6" +
+    "\b\xBF\n\x02\u05C6\u0183\x03\x02\x02\x02\u05C7\u05C8\x07/\x02\x02\u05C8" +
+    "\u05CC\x07/\x02\x02\u05C9\u05CA\x071\x02\x02\u05CA\u05CC\x071\x02\x02" +
+    "\u05CB\u05C7\x03\x02\x02\x02\u05CB\u05C9\x03\x02\x02\x02\u05CC\u05D0\x03" +
+    "\x02\x02\x02\u05CD\u05CF\n#\x02\x02\u05CE\u05CD\x03\x02\x02\x02\u05CF" +
+    "\u05D2\x03\x02\x02\x02\u05D0\u05CE\x03\x02\x02\x02\u05D0\u05D1\x03\x02" +
+    "\x02\x02\u05D1\u05D4\x03\x02\x02\x02\u05D2\u05D0\x03\x02\x02\x02\u05D3" +
+    "\u05D5\t$\x02\x02\u05D4\u05D3\x03\x02\x02\x02\u05D5\u05D6\x03\x02\x02" +
+    "\x02\u05D6\u05D7\b\xC0\n\x02\u05D7\u0185\x03\x02\x02\x02\u05D8\u05D9\t" +
+    "%\x02\x02\u05D9\u05DA\x03\x02\x02\x02\u05DA\u05DB\b\xC1\v\x02\u05DB\u0187" +
+    "\x03\x02\x02\x02\u05DC\u05E8\n&\x02\x02\u05DD\u05E8\x05\xDCl\x02\u05DE" +
+    "\u05DF\x05\u012C\x94\x02\u05DF\u05E0\x05\u016E\xB5\x02\u05E0\u05E8\x03" +
+    "\x02\x02\x02\u05E1\u05E2\x05\u012C\x94\x02\u05E2\u05E3\x05\u0148\xA2\x02" +
+    "\u05E3\u05E8\x03\x02\x02\x02\u05E4\u05E5\x05\u016E\xB5\x02\u05E5\u05E6" +
+    "\x05\u016E\xB5\x02\u05E6\u05E8\x03\x02\x02\x02\u05E7\u05DC\x03\x02\x02" +
+    "\x02\u05E7\u05DD\x03\x02\x02\x02\u05E7\u05DE\x03\x02\x02\x02\u05E7\u05E1" +
+    "\x03\x02\x02\x02\u05E7\u05E4\x03\x02\x02\x02\u05E8\u05E9\x03\x02\x02\x02" +
+    "\u05E9\u05E7\x03\x02\x02\x02\u05E9\u05EA\x03\x02\x02\x02\u05EA\u0189\x03" +
+    "\x02\x02\x02\u05EB\u05EC\x05\u0148\xA2\x02\u05EC\u05ED\x03\x02\x02\x02" +
+    "\u05ED\u05EE\b\xC3\x02\x02\u05EE\u018B\x03\x02\x02\x02\u05EF\u05F0\x05" +
+    "\u016E\xB5\x02\u05F0\u05F1\x03\x02\x02\x02\u05F1\u05F2\b\xC4\f\x02\u05F2" +
+    "\u05F3\b\xC4\t\x02\u05F3\u018D\x03\x02\x02\x02\u05F4\u05FA\n'\x02\x02" +
+    "\u05F5\u05FA\x05\xDCl\x02\u05F6\u05F7\x05\u012C\x94\x02\u05F7\u05F8\x05" +
+    "\u0148\xA2\x02\u05F8\u05FA\x03\x02\x02\x02\u05F9\u05F4\x03\x02\x02\x02" +
+    "\u05F9\u05F5\x03\x02\x02\x02\u05F9\u05F6\x03\x02\x02\x02\u05FA\u05FB\x03" +
+    "\x02\x02\x02\u05FB\u05F9\x03\x02\x02\x02\u05FB\u05FC\x03\x02\x02\x02\u05FC" +
+    "\u018F\x03\x02\x02\x02\u05FD\u05FE\x05\u0148\xA2\x02\u05FE\u05FF\x03\x02" +
+    "\x02\x02\u05FF\u0600\b\xC6\x02\x02\u0600\u0191\x03\x02\x02\x02\u0601\u0602" +
+    "\x071\x02\x02\u0602\u0603\x07@\x02\x02\u0603\u0604\x03\x02\x02\x02\u0604" +
+    "\u0605\b\xC7\r\x02\u0605\u0606\b\xC7\t\x02\u0606\u0193\x03\x02\x02\x02" +
+    "\u0607\u0608\x07@\x02\x02\u0608\u0609\x03\x02\x02\x02\u0609\u060A\b\xC8" +
+    "\x0E\x02\u060A\u060B\b\xC8\t\x02\u060B\u060C\b\xC8\x0F\x02\u060C\u0195" +
+    "\x03\x02\x02\x02\u060D\u0611\t(\x02\x02\u060E\u0610\t)\x02\x02\u060F\u060E" +
+    "\x03\x02\x02\x02\u0610\u0613\x03\x02\x02\x02\u0611\u060F\x03\x02\x02\x02" +
+    "\u0611\u0612\x03\x02\x02\x02\u0612\u0614\x03\x02\x02\x02\u0613\u0611\x03" +
+    "\x02\x02\x02\u0614\u0615\b\xC9\x10\x02\u0615\u0197\x03\x02\x02\x02\u0616" +
+    "\u0617\x07?\x02\x02\u0617\u0618\x03\x02\x02\x02\u0618\u0619\b\xCA\x11" +
+    "\x02\u0619\u0199\x03\x02\x02\x02\u061A\u061B\x05\xE8r\x02\u061B\u061C" +
+    "\x03\x02\x02\x02\u061C\u061D\b\xCB\x12\x02\u061D\u019B\x03\x02\x02\x02" +
+    "\u061E\u0620\t*\x02\x02\u061F\u061E\x03\x02\x02\x02\u0620\u0621\x03\x02" +
+    "\x02\x02\u0621\u061F\x03\x02\x02\x02\u0621\u0622\x03\x02\x02\x02\u0622" +
+    "\u0623\x03\x02\x02\x02\u0623\u0624\b\xCC\v\x02\u0624\u019D\x03\x02\x02" +
+    "\x02\u0625\u0626\x07}\x02\x02\u0626\u0627\x03\x02\x02\x02\u0627\u0628" +
+    "\b\xCD\x13\x02\u0628\u0629\b\xCD\x02\x02\u0629\u019F\x03\x02\x02\x02\u062A" +
+    "\u062B\x07@\x02\x02\u062B\u062C\x03\x02\x02\x02\u062C\u062D\b\xCE\x0E" +
+    "\x02\u062D\u062E\b\xCE\t\x02\u062E\u01A1\x03\x02\x02\x02\u062F\u0633\t" +
+    "(\x02\x02\u0630\u0632\t)\x02\x02\u0631\u0630\x03\x02\x02\x02\u0632\u0635" +
+    "\x03\x02\x02\x02\u0633\u0631\x03\x02\x02\x02\u0633\u0634\x03\x02\x02\x02" +
+    "\u0634\u0636\x03\x02\x02\x02\u0635\u0633\x03\x02\x02\x02\u0636\u0637\b" +
+    "\xCF\x10\x02\u0637\u01A3\x03\x02\x02\x02\u0638\u063A\t*\x02\x02\u0639" +
+    "\u0638\x03\x02\x02\x02\u063A\u063B\x03\x02\x02\x02\u063B\u0639\x03\x02" +
+    "\x02\x02\u063B\u063C\x03\x02\x02\x02\u063C\u063D\x03\x02\x02\x02\u063D" +
+    "\u063E\b\xD0\v\x02\u063E\u01A5\x03\x02\x02\x02\u063F\u0641\n+\x02\x02" +
+    "\u0640\u063F\x03\x02\x02\x02\u0641\u0642\x03\x02\x02\x02\u0642\u0640\x03" +
+    "\x02\x02\x02\u0642\u0643\x03\x02\x02\x02\u0643\u01A7\x03\x02\x02\x02\u0644" +
+    "\u0645\x07}\x02\x02\u0645\u0646\x03\x02\x02\x02\u0646\u0647\b\xD2\x13" +
+    "\x02\u0647\u0648\b\xD2\x02\x02\u0648\u01A9\x03\x02\x02\x02\u0649\u064A" +
+    "\x07>\x02\x02\u064A\u064B\x071\x02\x02\u064B\u064C\x03\x02\x02\x02\u064C" +
+    "\u064D\b\xD3\x03\x02\u064D\u064E\b\xD3\t\x02\u064E\u064F\b\xD3\x04\x02" +
+    "\u064F\u01AB\x03\x02\x02\x02\u0650\u0651\x07>\x02\x02\u0651\u0652\x03" +
+    "\x02\x02\x02\u0652\u0653\b\xD4\x05\x02\u0653\u0654\b\xD4\x06\x02\u0654" +
+    "\u01AD\x03\x02\x02\x02\u0655\u0657\t*\x02\x02\u0656\u0655\x03\x02\x02" +
+    "\x02\u0657\u0658\x03\x02\x02\x02\u0658\u0656\x03\x02\x02\x02\u0658\u0659" +
+    "\x03\x02\x02\x02\u0659\u065A\x03\x02\x02\x02\u065A\u065B\b\xD5\v\x02\u065B" +
+    "\u01AF\x03\x02\x02\x027\x02\x03\x04\x05\x06\x07\u01D8\u02BC\u043C\u0459" +
+    "\u045E\u0464\u0466\u0472\u0474\u0482\u0484\u0489\u0490\u0495\u0499\u049E" +
+    "\u04A3\u04A7\u04AC\u04B3\u04B9\u04BE\u04C5\u04CA\u04D0\u04D5\u04D7\u04DD" +
+    "\u04E2\u04E9\u04F4\u04F6\u0580\u05BF\u05CB\u05D0\u05D4\u05E7\u05E9\u05F9" +
+    "\u05FB\u0611\u0621\u0633\u063B\u0642\u0658\x14\x07\x02\x02\t\x8A\x02\x07" +
+    "\x06\x02\t\x89\x02\x07\x05\x02\x07\x03\x02\x07\x04\x02\x06\x02\x02\b\x02" +
+    "\x02\x02\x03\x02\t\x96\x02\t\x9E\x02\t\x81\x02\x07\x07\x02\tn\x02\t\x7F" +
+    "\x02\ts\x02\t\x85\x02";
+  public static readonly _serializedATN: string = Utils.join(
+    [
+      TSQLLexer._serializedATNSegment0,
+      TSQLLexer._serializedATNSegment1,
+      TSQLLexer._serializedATNSegment2,
+    ],
+    ""
+  );
+  public static __ATN: ATN;
+  public static get _ATN(): ATN {
+    if (!TSQLLexer.__ATN) {
+      TSQLLexer.__ATN = new ATNDeserializer().deserialize(
+        Utils.toCharArray(TSQLLexer._serializedATN)
+      );
+    }
+
+    return TSQLLexer.__ATN;
+  }
+}
diff --git a/internal-packages/tsql/src/grammar/TSQLLexer.typescript.g4 b/internal-packages/tsql/src/grammar/TSQLLexer.typescript.g4
new file mode 100644
index 00000000000..f09eb2aaae7
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLLexer.typescript.g4
@@ -0,0 +1,81 @@
+lexer grammar TSQLLexer;
+
+@header {
+// put any global imports you need here
+}
+
+@members {
+
+private _peekChar(k: number): string {
+    // Return the k-th look-ahead as a *single-char string* or '\0' at EOF.
+    const c = this._input.LA(k);          // int code point or IntStream.EOF (-1)
+    if (c < 0 || c > 0x10FFFF) {         // EOF or out-of-range → sentinel
+        return '\0';
+    }
+    return String.fromCharCode(c);
+}
+
+private _skipWsAndComments(idx: number): number {
+    // Return the first index ≥ idx that is *not* whitespace / single-line comment.
+    while (true) {
+        const ch = this._peekChar(idx);
+        if (/\s/.test(ch)) {                  // spaces, newlines, tabs …
+            idx++;
+            continue;
+        }
+
+        // single-line comments
+        if (ch === '/' && this._peekChar(idx + 1) === '/') {     // //
+            idx += 2;
+        } else if (ch === '-' && this._peekChar(idx + 1) === '-') {   // --
+            idx += 2;
+        } else if (ch === '#') {                                       // #
+            idx++;
+        } else {
+            break;                                             // no ws / comment
+        }
+        // consume until EOL / EOF
+        while (!['\0', '\n', '\r'].includes(this._peekChar(idx))) {
+            idx++;
+        }
+    }
+    return idx;
+}
+
+// ───── opening tag test ─────
+isOpeningTag(): boolean {
+    const ch1 = this._peekChar(1);
+    if (!(/[a-zA-Z]/.test(ch1) || ch1 === '_')) {
+        return false;                           // not a tag name start
+    }
+
+    // skip tag name
+    let i = 2;
+    while (true) {
+        const ch = this._peekChar(i);
+        if (/[a-zA-Z0-9]/.test(ch) || ch === '_' || ch === '-') {
+            i++;
+        } else {
+            break;
+        }
+    }
+
+    let ch = this._peekChar(i);
+
+    // immediate delimiter → tag
+    if (ch === '>' || ch === '/') {
+        return true;
+    }
+
+    // need to look beyond whitespace
+    if (/\s/.test(ch)) {
+        i = this._skipWsAndComments(i + 1);
+        ch = this._peekChar(i);
+        return ch === '>' || ch === '/' || /[a-zA-Z0-9]/.test(ch) || ch === '_';
+    }
+
+    // anything else → not a tag
+    return false;
+}
+
+}
\ No newline at end of file
diff --git a/internal-packages/tsql/src/grammar/TSQLParser.g4 b/internal-packages/tsql/src/grammar/TSQLParser.g4
new file mode 100644
index 00000000000..62d24d8a366
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLParser.g4
@@ -0,0 +1,315 @@
+parser grammar TSQLParser;
+
+options {
+    tokenVocab = TSQLLexer;
+}
+
+
+program: declaration* EOF;
+
+declaration: varDecl | statement ;
+
+expression: columnExpr;
+
+varDecl: LET identifier ( COLON EQ_SINGLE expression )? ;
+identifierList: identifier (COMMA identifier)* COMMA?;
+
+statement      : returnStmt
+               | throwStmt
+               | tryCatchStmt
+               | ifStmt
+               | whileStmt
+               | forInStmt
+               | forStmt
+               | funcStmt
+               | varAssignment
+               | block
+               | exprStmt
+               | emptyStmt
+               ;
+
+returnStmt     : RETURN expression? SEMICOLON?;
+throwStmt      : THROW expression? SEMICOLON?;
+catchBlock     : CATCH (LPAREN catchVar=identifier (COLON catchType=identifier)? RPAREN)? catchStmt=block;
+tryCatchStmt   : TRY tryStmt=block catchBlock* (FINALLY finallyStmt=block)?;
+ifStmt         : IF LPAREN expression RPAREN statement ( ELSE statement )? ;
+whileStmt      : WHILE LPAREN expression RPAREN statement SEMICOLON?;
+forStmt        : FOR LPAREN
+                 (initializerVarDeclr=varDecl | initializerVarAssignment=varAssignment | initializerExpression=expression)? SEMICOLON
+                 condition=expression? SEMICOLON
+                 (incrementVarDeclr=varDecl | incrementVarAssignment=varAssignment | incrementExpression=expression)?
+                 RPAREN statement SEMICOLON?;
+forInStmt      : FOR LPAREN LET identifier (COMMA identifier)? IN expression RPAREN statement SEMICOLON?;
+funcStmt       : (FN | FUN) identifier LPAREN identifierList? RPAREN block;
+varAssignment  : expression COLON EQ_SINGLE expression ;
+exprStmt       : expression SEMICOLON?;
+emptyStmt      : SEMICOLON ;
+block          : LBRACE declaration* RBRACE ;
+
+kvPair: expression ':' expression ;
+kvPairList: kvPair (COMMA kvPair)* COMMA?;
+
+
+// SELECT statement
+select: (selectSetStmt | selectStmt | tSQLxTagElement) SEMICOLON? EOF;
+
+selectStmtWithParens: selectStmt | LPAREN selectSetStmt RPAREN | placeholder;
+
+subsequentSelectSetClause: (EXCEPT | UNION ALL | UNION DISTINCT | INTERSECT | INTERSECT DISTINCT) selectStmtWithParens;
+selectSetStmt: selectStmtWithParens (subsequentSelectSetClause)*;
+
+selectStmt:
+    with=withClause?
+    SELECT DISTINCT? topClause?
+    columns=columnExprList
+    from=fromClause?
+    arrayJoinClause?
+    prewhereClause?
+    where=whereClause?
+    groupByClause? (WITH (CUBE | ROLLUP))? (WITH TOTALS)?
+    havingClause?
+    windowClause?
+    orderByClause?
+    limitByClause?
+    (limitAndOffsetClause | offsetOnlyClause)?
+    settingsClause?
+    ;
+
+withClause: WITH withExprList;
+topClause: TOP DECIMAL_LITERAL (WITH TIES)?;
+fromClause: FROM joinExpr;
+arrayJoinClause: (LEFT | INNER)? ARRAY JOIN columnExprList;
+windowClause: WINDOW identifier AS LPAREN windowExpr RPAREN (COMMA identifier AS LPAREN windowExpr RPAREN)*;
+prewhereClause: PREWHERE columnExpr;
+whereClause: WHERE columnExpr;
+groupByClause: GROUP BY ((CUBE | ROLLUP) LPAREN columnExprList RPAREN | columnExprList);
+havingClause: HAVING columnExpr;
+orderByClause: ORDER BY orderExprList;
+projectionOrderByClause: ORDER BY columnExprList;
+limitByClause: LIMIT limitExpr BY columnExprList;
+limitAndOffsetClause
+    : LIMIT columnExpr (COMMA columnExpr)? (WITH TIES)? // compact OFFSET-optional form
+    | LIMIT columnExpr (WITH TIES)? OFFSET columnExpr // verbose OFFSET-included form with WITH TIES
+    ;
+offsetOnlyClause: OFFSET columnExpr;
+settingsClause: SETTINGS settingExprList;
+
+joinExpr
+    : joinExpr joinOp? JOIN joinExpr joinConstraintClause  # JoinExprOp
+    | joinExpr joinOpCross joinExpr                                          # JoinExprCrossOp
+    | tableExpr FINAL? sampleClause?                                         # JoinExprTable
+    | LPAREN joinExpr RPAREN                                                 # JoinExprParens
+    ;
+joinOp
+    : ((ALL | ANY | ASOF)? INNER | INNER (ALL | ANY | ASOF)? | (ALL | ANY | ASOF))  # JoinOpInner
+    | ( (SEMI | ALL | ANTI | ANY | ASOF)? (LEFT | RIGHT) OUTER?
+      | (LEFT | RIGHT) OUTER? (SEMI | ALL | ANTI | ANY | ASOF)?
+      )                                                                             # JoinOpLeftRight
+    | ((ALL | ANY)? FULL OUTER? | FULL OUTER? (ALL | ANY)?)                         # JoinOpFull
+    ;
+joinOpCross
+    : CROSS JOIN
+    | COMMA
+    ;
+joinConstraintClause
+    : ON columnExprList
+    | USING LPAREN columnExprList RPAREN
+    | USING columnExprList
+    ;
+
+sampleClause: SAMPLE ratioExpr (OFFSET ratioExpr)?;
+limitExpr: columnExpr ((COMMA | OFFSET) columnExpr)?;
+orderExprList: orderExpr (COMMA orderExpr)*;
+orderExpr: columnExpr (ASCENDING | DESCENDING | DESC)? (NULLS (FIRST | LAST))? (COLLATE STRING_LITERAL)?;
+ratioExpr: placeholder | numberLiteral (SLASH numberLiteral)?;
+settingExprList: settingExpr (COMMA settingExpr)*;
+settingExpr: identifier EQ_SINGLE literal;
+
+windowExpr: winPartitionByClause? winOrderByClause? winFrameClause?;
+winPartitionByClause: PARTITION BY columnExprList;
+winOrderByClause: ORDER BY orderExprList;
+winFrameClause: (ROWS | RANGE) winFrameExtend;
+winFrameExtend
+    : winFrameBound                             # frameStart
+    | BETWEEN winFrameBound AND winFrameBound   # frameBetween
+    ;
+winFrameBound: (CURRENT ROW | UNBOUNDED PRECEDING | UNBOUNDED FOLLOWING | numberLiteral PRECEDING | numberLiteral FOLLOWING);
+//rangeClause: RANGE LPAREN (MIN identifier MAX identifier | MAX identifier MIN identifier) RPAREN;
+
+// Columns
+expr: columnExpr EOF;
+columnTypeExpr
+    : identifier                                                                             # ColumnTypeExprSimple   // UInt64
+    | identifier LPAREN identifier columnTypeExpr (COMMA identifier columnTypeExpr)* COMMA? RPAREN  # ColumnTypeExprNested   // Nested
+    | identifier LPAREN enumValue (COMMA enumValue)* COMMA? RPAREN                                  # ColumnTypeExprEnum     // Enum
+    | identifier LPAREN columnTypeExpr (COMMA columnTypeExpr)* COMMA? RPAREN                        # ColumnTypeExprComplex  // Array, Tuple
+    | identifier LPAREN columnExprList? RPAREN                                               # ColumnTypeExprParam    // FixedString(N)
+    ;
+columnExprList: columnExpr (COMMA columnExpr)* COMMA?;
+columnExpr
+    : CASE caseExpr=columnExpr? (WHEN whenExpr=columnExpr THEN thenExpr=columnExpr)+ (ELSE elseExpr=columnExpr)? END          # ColumnExprCase
+    | CAST LPAREN columnExpr AS columnTypeExpr RPAREN                                     # ColumnExprCast
+    | DATE STRING_LITERAL                                                                 # ColumnExprDate
+//    | EXTRACT LPAREN interval FROM columnExpr RPAREN                                      # ColumnExprExtract   // Interferes with a function call
+    | INTERVAL STRING_LITERAL                                                             # ColumnExprIntervalString
+    | INTERVAL columnExpr interval                                                        # ColumnExprInterval
+    | SUBSTRING LPAREN columnExpr FROM columnExpr (FOR columnExpr)? RPAREN                # ColumnExprSubstring
+    | TIMESTAMP STRING_LITERAL                                                            # ColumnExprTimestamp
+    | TRIM LPAREN (BOTH | LEADING | TRAILING) string FROM columnExpr RPAREN               # ColumnExprTrim
+    | identifier (LPAREN columnExprs=columnExprList? RPAREN) (LPAREN DISTINCT? columnArgList=columnExprList? RPAREN)? OVER LPAREN windowExpr RPAREN # ColumnExprWinFunction
+    | identifier (LPAREN columnExprs=columnExprList? RPAREN) (LPAREN DISTINCT? columnArgList=columnExprList? RPAREN)? OVER identifier               # ColumnExprWinFunctionTarget
+    | identifier (LPAREN columnExprs=columnExprList? RPAREN)? LPAREN DISTINCT? columnArgList=columnExprList? RPAREN                                 # ColumnExprFunction
+    | columnExpr LPAREN selectSetStmt RPAREN                                              # ColumnExprCallSelect
+    | columnExpr LPAREN columnExprList? RPAREN                                            # ColumnExprCall
+    | tSQLxTagElement                                                                    # ColumnExprTagElement
+    | templateString                                                                      # ColumnExprTemplateString
+    | literal                                                                             # ColumnExprLiteral
+
+    // FIXME(ilezhankin): this part looks very ugly, maybe there is another way to express it
+    | columnExpr LBRACKET columnExpr RBRACKET                                             # ColumnExprArrayAccess
+    | columnExpr DOT DECIMAL_LITERAL                                                      # ColumnExprTupleAccess
+    | columnExpr DOT identifier                                                           # ColumnExprPropertyAccess
+    | columnExpr NULL_PROPERTY LBRACKET columnExpr RBRACKET                               # ColumnExprNullArrayAccess
+    | columnExpr NULL_PROPERTY DECIMAL_LITERAL                                            # ColumnExprNullTupleAccess
+    | columnExpr NULL_PROPERTY identifier                                                 # ColumnExprNullPropertyAccess
+    | DASH columnExpr                                                                     # ColumnExprNegate
+    | left=columnExpr ( operator=ASTERISK                                                 // *
+                 | operator=SLASH                                                         // /
+                 | operator=PERCENT                                                       // %
+                 ) right=columnExpr                                                       # ColumnExprPrecedence1
+    | left=columnExpr ( operator=PLUS                                                     // +
+                 | operator=DASH                                                          // -
+                 | operator=CONCAT                                                        // ||
+                 ) right=columnExpr                                                       # ColumnExprPrecedence2
+    | left=columnExpr ( operator=EQ_DOUBLE                                                // =
+                 | operator=EQ_SINGLE                                                     // ==
+                 | operator=NOT_EQ                                                        // !=
+                 | operator=LT_EQ                                                         // <=
+                 | operator=LT                                                            // <
+                 | operator=GT_EQ                                                         // >=
+                 | operator=GT                                                            // >
+                 | operator=NOT? IN COHORT?                                               // in, not in; in cohort; not in cohort
+                 | operator=NOT? (LIKE | ILIKE)                                           // like, not like, ilike, not ilike
+                 | operator=REGEX_SINGLE                                                  // ~
+                 | operator=REGEX_DOUBLE                                                  // =~
+                 | operator=NOT_REGEX                                                     // !~
+                 | operator=IREGEX_SINGLE                                                 // ~*
+                 | operator=IREGEX_DOUBLE                                                 // =~*
+                 | operator=NOT_IREGEX                                                    // !~*
+                 ) right=columnExpr                                                       # ColumnExprPrecedence3
+    | columnExpr IS NOT? NULL_SQL                                                         # ColumnExprIsNull
+    | columnExpr NULLISH columnExpr                                                       # ColumnExprNullish
+    | NOT columnExpr                                                                      # ColumnExprNot
+    | columnExpr AND columnExpr                                                           # ColumnExprAnd
+    | columnExpr OR columnExpr                                                            # ColumnExprOr
+    // TODO(ilezhankin): `BETWEEN a AND b AND c` is parsed in a wrong way: `BETWEEN (a AND b) AND c`
+    | columnExpr NOT? BETWEEN columnExpr AND columnExpr                                   # ColumnExprBetween
+    | <assoc=right> columnExpr QUERY columnExpr COLON columnExpr                          # ColumnExprTernaryOp
+    | columnExpr (AS identifier | AS STRING_LITERAL)                                      # ColumnExprAlias
+    | (tableIdentifier DOT)? ASTERISK                                                     # ColumnExprAsterisk  // single-column only
+    | LPAREN selectSetStmt RPAREN                                                         # ColumnExprSubquery  // single-column only
+    | LPAREN columnExpr RPAREN                                                            # ColumnExprParens    // single-column only
+    | LPAREN columnExprList RPAREN                                                        # ColumnExprTuple
+    | LBRACKET columnExprList? RBRACKET                                                   # ColumnExprArray
+    | LBRACE (kvPairList)? RBRACE                                                         # ColumnExprDict
+    | columnLambdaExpr                                                                    # ColumnExprLambda
+    | columnIdentifier                                                                    # ColumnExprIdentifier
+    ;
+
+columnLambdaExpr:
+    ( LPAREN identifier (COMMA identifier)* COMMA? RPAREN
+    |        identifier (COMMA identifier)* COMMA?
+    | LPAREN RPAREN
+    )
+    ARROW (columnExpr | block)
+    ;
+
+tSQLxChildElement
+    : tSQLxTagElement
+    | TSQLX_TEXT_TEXT
+    | LBRACE columnExpr RBRACE;
+
+tSQLxTagElement
+    : LT identifier tSQLxTagAttribute* SLASH_GT                                          
+    | LT identifier tSQLxTagAttribute* GT tSQLxChildElement* LT_SLASH identifier GT     
+    ;
+tSQLxTagAttribute
+    :   identifier EQ_SINGLE string
+    |   identifier EQ_SINGLE LBRACE columnExpr RBRACE
+    |   identifier
+    ;
+
+withExprList: withExpr (COMMA withExpr)* COMMA?;
+withExpr
+    : identifier AS LPAREN selectSetStmt RPAREN    # WithExprSubquery
+    // NOTE: asterisk and subquery goes before |columnExpr| so that we can mark them as multi-column expressions.
+    | columnExpr AS identifier                       # WithExprColumn
+    ;
+
+
+// This is slightly different in TSQL compared to ClickHouse SQL
+// TSQL allows unlimited ("*") nestedIdentifier-s "properties.b.a.a.w.a.s".
+// We parse and convert "databaseIdentifier.tableIdentifier.columnIdentifier.nestedIdentifier.*"
+// to just one ast.Field(chain=['a','b','columnIdentifier','on','and','on']).
+columnIdentifier: placeholder | ((tableIdentifier DOT)? nestedIdentifier);
+nestedIdentifier: identifier (DOT identifier)*;
+tableExpr
+    : tableIdentifier                    # TableExprIdentifier
+    | tableFunctionExpr                  # TableExprFunction
+    | LPAREN selectSetStmt RPAREN      # TableExprSubquery
+    | tableExpr (alias | AS identifier)  # TableExprAlias
+    | tSQLxTagElement                   # TableExprTag
+    | placeholder                        # TableExprPlaceholder
+    ;
+tableFunctionExpr: identifier LPAREN tableArgList? RPAREN;
+tableIdentifier: (databaseIdentifier DOT)? nestedIdentifier;
+tableArgList: columnExpr (COMMA columnExpr)* COMMA?;
+
+// Databases
+
+databaseIdentifier: identifier;
+
+// Basics
+
+floatingLiteral
+    : FLOATING_LITERAL
+    | DOT (DECIMAL_LITERAL | OCTAL_LITERAL)
+    | DECIMAL_LITERAL DOT (DECIMAL_LITERAL | OCTAL_LITERAL)?  // can't move this to the lexer or it will break nested tuple access: t.1.2
+    ;
+numberLiteral: (PLUS | DASH)? (floatingLiteral | OCTAL_LITERAL | DECIMAL_LITERAL | HEXADECIMAL_LITERAL | INF | NAN_SQL);
+literal
+    : numberLiteral
+    | STRING_LITERAL
+    | NULL_SQL
+    ;
+interval: SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR;
+keyword
+    // except NULL_SQL, INF, NAN_SQL
+    : ALL | AND | ANTI | ANY | ARRAY | AS | ASCENDING | ASOF | BETWEEN | BOTH | BY | CASE
+    | CAST | COHORT | COLLATE | CROSS | CUBE | CURRENT | DATE | DESC | DESCENDING
+    | DISTINCT | ELSE | END | EXTRACT | FINAL | FIRST
+    | FOR | FOLLOWING | FROM | FULL | GROUP | HAVING | ID | IS
+    | IF | ILIKE | IN | INNER | INTERVAL | JOIN | KEY
+    | LAST | LEADING | LEFT | LIKE | LIMIT
+    | NOT | NULLS | OFFSET | ON | OR | ORDER | OUTER | OVER | PARTITION
+    | PRECEDING | PREWHERE | RANGE | RETURN | RIGHT | ROLLUP | ROW
+    | ROWS | SAMPLE | SELECT | SEMI | SETTINGS | SUBSTRING
+    | THEN | TIES | TIMESTAMP | TOTALS | TRAILING | TRIM | TRUNCATE | TO | TOP
+    | UNBOUNDED | UNION | USING | WHEN | WHERE | WINDOW | WITH
+    ;
+keywordForAlias
+    : DATE | FIRST | ID | KEY
+    ;
+alias: IDENTIFIER | keywordForAlias;  // |interval| can't be an alias, otherwise 'INTERVAL 1 SOMETHING' becomes ambiguous.
+identifier: IDENTIFIER | interval | keyword;
+enumValue: string EQ_SINGLE numberLiteral;
+placeholder: LBRACE columnExpr RBRACE;
+
+string: STRING_LITERAL | templateString;
+templateString : QUOTE_SINGLE_TEMPLATE stringContents* QUOTE_SINGLE ;
+stringContents : STRING_ESCAPE_TRIGGER columnExpr RBRACE | STRING_TEXT;
+
+// These are magic "full template strings", which are used to parse "full text field" templates without the surrounding SQL.
+// We will need to add F' to the start of the string to change the lexer's mode.
+fullTemplateString: QUOTE_SINGLE_TEMPLATE_FULL stringContentsFull* EOF ;
+stringContentsFull : FULL_STRING_ESCAPE_TRIGGER columnExpr RBRACE | FULL_STRING_TEXT;
\ No newline at end of file
diff --git a/internal-packages/tsql/src/grammar/TSQLParser.interp b/internal-packages/tsql/src/grammar/TSQLParser.interp
new file mode 100644
index 00000000000..3ad726c89dd
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLParser.interp
@@ -0,0 +1,437 @@
+token literal names:
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+'->'
+'*'
+'`'
+'\\'
+':'
+','
+'||'
+'-'
+'$'
+'.'
+'=='
+null
+'>='
+null
+'#'
+'~*'
+'=~*'
+'{'
+'['
+'('
+'<='
+'<'
+'</'
+null
+'!~*'
+'!~'
+'?.'
+'??'
+'%'
+'+'
+'?'
+'"'
+'f\''
+'F\''
+'\''
+'~'
+'=~'
+'}'
+']'
+')'
+';'
+'/'
+null
+'_'
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+null
+
+token symbolic names:
+null
+ALL
+AND
+ANTI
+ANY
+ARRAY
+AS
+ASCENDING
+ASOF
+BETWEEN
+BOTH
+BY
+CASE
+CAST
+CATCH
+COHORT
+COLLATE
+CROSS
+CUBE
+CURRENT
+DATE
+DAY
+DESC
+DESCENDING
+DISTINCT
+ELSE
+END
+EXCEPT
+EXTRACT
+FINAL
+FINALLY
+FIRST
+FN
+FOLLOWING
+FOR
+FROM
+FULL
+FUN
+GROUP
+HAVING
+HOUR
+ID
+IF
+ILIKE
+IN
+INF
+INNER
+INTERSECT
+INTERVAL
+IS
+JOIN
+KEY
+LAST
+LEADING
+LEFT
+LET
+LIKE
+LIMIT
+MINUTE
+MONTH
+NAN_SQL
+NOT
+NULL_SQL
+NULLS
+OFFSET
+ON
+OR
+ORDER
+OUTER
+OVER
+PARTITION
+PRECEDING
+PREWHERE
+QUARTER
+RANGE
+RETURN
+RIGHT
+ROLLUP
+ROW
+ROWS
+SAMPLE
+SECOND
+SELECT
+SEMI
+SETTINGS
+SUBSTRING
+THEN
+THROW
+TIES
+TIMESTAMP
+TO
+TOP
+TOTALS
+TRAILING
+TRIM
+TRUNCATE
+TRY
+UNBOUNDED
+UNION
+USING
+WEEK
+WHEN
+WHERE
+WHILE
+WINDOW
+WITH
+YEAR
+ESCAPE_CHAR_COMMON
+IDENTIFIER
+FLOATING_LITERAL
+OCTAL_LITERAL
+DECIMAL_LITERAL
+HEXADECIMAL_LITERAL
+STRING_LITERAL
+ARROW
+ASTERISK
+BACKQUOTE
+BACKSLASH
+COLON
+COMMA
+CONCAT
+DASH
+DOLLAR
+DOT
+EQ_DOUBLE
+EQ_SINGLE
+GT_EQ
+GT
+HASH
+IREGEX_SINGLE
+IREGEX_DOUBLE
+LBRACE
+LBRACKET
+LPAREN
+LT_EQ
+LT
+LT_SLASH
+NOT_EQ
+NOT_IREGEX
+NOT_REGEX
+NULL_PROPERTY
+NULLISH
+PERCENT
+PLUS
+QUERY
+QUOTE_DOUBLE
+QUOTE_SINGLE_TEMPLATE
+QUOTE_SINGLE_TEMPLATE_FULL
+QUOTE_SINGLE
+REGEX_SINGLE
+REGEX_DOUBLE
+RBRACE
+RBRACKET
+RPAREN
+SEMICOLON
+SLASH
+SLASH_GT
+UNDERSCORE
+MULTI_LINE_COMMENT
+SINGLE_LINE_COMMENT
+WHITESPACE
+STRING_TEXT
+STRING_ESCAPE_TRIGGER
+FULL_STRING_TEXT
+FULL_STRING_ESCAPE_TRIGGER
+TAG_WS
+TAGC_WS
+TSQLX_TEXT_TEXT
+TSQLX_TEXT_WS
+
+rule names:
+program
+declaration
+expression
+varDecl
+identifierList
+statement
+returnStmt
+throwStmt
+catchBlock
+tryCatchStmt
+ifStmt
+whileStmt
+forStmt
+forInStmt
+funcStmt
+varAssignment
+exprStmt
+emptyStmt
+block
+kvPair
+kvPairList
+select
+selectStmtWithParens
+subsequentSelectSetClause
+selectSetStmt
+selectStmt
+withClause
+topClause
+fromClause
+arrayJoinClause
+windowClause
+prewhereClause
+whereClause
+groupByClause
+havingClause
+orderByClause
+projectionOrderByClause
+limitByClause
+limitAndOffsetClause
+offsetOnlyClause
+settingsClause
+joinExpr
+joinOp
+joinOpCross
+joinConstraintClause
+sampleClause
+limitExpr
+orderExprList
+orderExpr
+ratioExpr
+settingExprList
+settingExpr
+windowExpr
+winPartitionByClause
+winOrderByClause
+winFrameClause
+winFrameExtend
+winFrameBound
+expr
+columnTypeExpr
+columnExprList
+columnExpr
+columnLambdaExpr
+tSQLxChildElement
+tSQLxTagElement
+tSQLxTagAttribute
+withExprList
+withExpr
+columnIdentifier
+nestedIdentifier
+tableExpr
+tableFunctionExpr
+tableIdentifier
+tableArgList
+databaseIdentifier
+floatingLiteral
+numberLiteral
+literal
+interval
+keyword
+keywordForAlias
+alias
+identifier
+enumValue
+placeholder
+string
+templateString
+stringContents
+fullTemplateString
+stringContentsFull
+
+
+atn:
+[3, 51485, 51898, 1421, 44986, 20307, 1543, 60043, 49729, 3, 170, 1341, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 4, 37, 9, 37, 4, 38, 9, 38, 4, 39, 9, 39, 4, 40, 9, 40, 4, 41, 9, 41, 4, 42, 9, 42, 4, 43, 9, 43, 4, 44, 9, 44, 4, 45, 9, 45, 4, 46, 9, 46, 4, 47, 9, 47, 4, 48, 9, 48, 4, 49, 9, 49, 4, 50, 9, 50, 4, 51, 9, 51, 4, 52, 9, 52, 4, 53, 9, 53, 4, 54, 9, 54, 4, 55, 9, 55, 4, 56, 9, 56, 4, 57, 9, 57, 4, 58, 9, 58, 4, 59, 9, 59, 4, 60, 9, 60, 4, 61, 9, 61, 4, 62, 9, 62, 4, 63, 9, 63, 4, 64, 9, 64, 4, 65, 9, 65, 4, 66, 9, 66, 4, 67, 9, 67, 4, 68, 9, 68, 4, 69, 9, 69, 4, 70, 9, 70, 4, 71, 9, 71, 4, 72, 9, 72, 4, 73, 9, 73, 4, 74, 9, 74, 4, 75, 9, 75, 4, 76, 9, 76, 4, 77, 9, 77, 4, 78, 9, 78, 4, 79, 9, 79, 4, 80, 9, 80, 4, 81, 9, 81, 4, 82, 9, 82, 4, 83, 9, 83, 4, 84, 9, 84, 4, 85, 9, 85, 4, 86, 9, 86, 4, 87, 9, 87, 4, 88, 9, 88, 4, 89, 9, 89, 4, 90, 9, 90, 4, 91, 9, 91, 3, 2, 7, 2, 184, 10, 2, 12, 2, 14, 2, 187, 11, 2, 3, 2, 3, 2, 3, 3, 3, 3, 5, 3, 193, 10, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 5, 5, 202, 10, 5, 3, 6, 3, 6, 3, 6, 7, 6, 207, 10, 6, 12, 6, 14, 6, 210, 11, 6, 3, 6, 5, 6, 213, 10, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 5, 7, 227, 10, 7, 3, 8, 3, 8, 5, 8, 231, 10, 8, 3, 8, 5, 8, 234, 10, 8, 3, 9, 3, 9, 5, 9, 238, 10, 9, 3, 9, 5, 9, 241, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 10, 5, 10, 248, 10, 10, 3, 10, 3, 10, 5, 10, 252, 10, 10, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 7, 11, 259, 10, 11, 12, 11, 14, 11, 262, 11, 11, 3, 11, 3, 11, 5, 11, 266, 10, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 5, 12, 275, 10, 12, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 3, 13, 5, 13, 283, 10, 13, 3, 14, 3, 14, 3, 14, 3, 14, 3, 14, 5, 14, 290, 10, 14, 3, 14, 3, 14, 5, 14, 294, 10, 14, 3, 14, 3, 14, 3, 14, 3, 14, 5, 14, 300, 10, 14, 3, 14, 3, 14, 3, 14, 5, 14, 305, 10, 14, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 5, 15, 313, 10, 15, 3, 15, 3, 15, 3, 15, 3, 15, 3, 15, 5, 15, 320, 10, 15, 3, 16, 3, 16, 3, 16, 3, 16, 5, 16, 326, 10, 16, 3, 16, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 5, 18, 338, 10, 18, 3, 19, 3, 19, 3, 20, 3, 20, 7, 20, 344, 10, 20, 12, 20, 14, 20, 347, 11, 20, 3, 20, 3, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 3, 22, 3, 22, 7, 22, 358, 10, 22, 12, 22, 14, 22, 361, 11, 22, 3, 22, 5, 22, 364, 10, 22, 3, 23, 3, 23, 3, 23, 5, 23, 369, 10, 23, 3, 23, 5, 23, 372, 10, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 3, 24, 5, 24, 382, 10, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 3, 25, 5, 25, 392, 10, 25, 3, 25, 3, 25, 3, 26, 3, 26, 7, 26, 398, 10, 26, 12, 26, 14, 26, 401, 11, 26, 3, 27, 5, 27, 404, 10, 27, 3, 27, 3, 27, 5, 27, 408, 10, 27, 3, 27, 5, 27, 411, 10, 27, 3, 27, 3, 27, 5, 27, 415, 10, 27, 3, 27, 5, 27, 418, 10, 27, 3, 27, 5, 27, 421, 10, 27, 3, 27, 5, 27, 424, 10, 27, 3, 27, 5, 27, 427, 10, 27, 3, 27, 3, 27, 5, 27, 431, 10, 27, 3, 27, 3, 27, 5, 27, 435, 10, 27, 3, 27, 5, 27, 438, 10, 27, 3, 27, 5, 27, 441, 10, 27, 3, 27, 5, 27, 444, 10, 27, 3, 27, 5, 27, 447, 10, 27, 3, 27, 3, 27, 5, 27, 451, 10, 27, 3, 27, 5, 27, 454, 10, 27, 3, 28, 3, 28, 3, 28, 3, 29, 3, 29, 3, 29, 3, 29, 5, 29, 463, 10, 29, 3, 30, 3, 30, 3, 30, 3, 31, 5, 31, 469, 10, 31, 3, 31, 3, 31, 3, 31, 3, 31, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 3, 32, 7, 32, 488, 10, 32, 12, 32, 14, 32, 491, 11, 32, 3, 33, 3, 33, 3, 33, 3, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 3, 35, 5, 35, 507, 10, 35, 3, 36, 3, 36, 3, 36, 3, 37, 3, 37, 3, 37, 3, 37, 3, 38, 3, 38, 3, 38, 3, 38, 3, 39, 3, 39, 3, 39, 3, 39, 3, 39, 3, 40, 3, 40, 3, 40, 3, 40, 5, 40, 529, 10, 40, 3, 40, 3, 40, 5, 40, 533, 10, 40, 3, 40, 3, 40, 3, 40, 3, 40, 5, 40, 539, 10, 40, 3, 40, 3, 40, 3, 40, 5, 40, 544, 10, 40, 3, 41, 3, 41, 3, 41, 3, 42, 3, 42, 3, 42, 3, 43, 3, 43, 3, 43, 5, 43, 555, 10, 43, 3, 43, 5, 43, 558, 10, 43, 3, 43, 3, 43, 3, 43, 3, 43, 5, 43, 564, 10, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 3, 43, 5, 43, 572, 10, 43, 3, 43, 3, 43, 3, 43, 3, 43, 7, 43, 578, 10, 43, 12, 43, 14, 43, 581, 11, 43, 3, 44, 5, 44, 584, 10, 44, 3, 44, 3, 44, 3, 44, 5, 44, 589, 10, 44, 3, 44, 5, 44, 592, 10, 44, 3, 44, 5, 44, 595, 10, 44, 3, 44, 3, 44, 5, 44, 599, 10, 44, 3, 44, 3, 44, 5, 44, 603, 10, 44, 3, 44, 5, 44, 606, 10, 44, 5, 44, 608, 10, 44, 3, 44, 5, 44, 611, 10, 44, 3, 44, 3, 44, 5, 44, 615, 10, 44, 3, 44, 3, 44, 5, 44, 619, 10, 44, 3, 44, 5, 44, 622, 10, 44, 5, 44, 624, 10, 44, 5, 44, 626, 10, 44, 3, 45, 3, 45, 3, 45, 5, 45, 631, 10, 45, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 3, 46, 5, 46, 642, 10, 46, 3, 47, 3, 47, 3, 47, 3, 47, 5, 47, 648, 10, 47, 3, 48, 3, 48, 3, 48, 5, 48, 653, 10, 48, 3, 49, 3, 49, 3, 49, 7, 49, 658, 10, 49, 12, 49, 14, 49, 661, 11, 49, 3, 50, 3, 50, 5, 50, 665, 10, 50, 3, 50, 3, 50, 5, 50, 669, 10, 50, 3, 50, 3, 50, 5, 50, 673, 10, 50, 3, 51, 3, 51, 3, 51, 3, 51, 5, 51, 679, 10, 51, 5, 51, 681, 10, 51, 3, 52, 3, 52, 3, 52, 7, 52, 686, 10, 52, 12, 52, 14, 52, 689, 11, 52, 3, 53, 3, 53, 3, 53, 3, 53, 3, 54, 5, 54, 696, 10, 54, 3, 54, 5, 54, 699, 10, 54, 3, 54, 5, 54, 702, 10, 54, 3, 55, 3, 55, 3, 55, 3, 55, 3, 56, 3, 56, 3, 56, 3, 56, 3, 57, 3, 57, 3, 57, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 3, 58, 5, 58, 721, 10, 58, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 3, 59, 5, 59, 735, 10, 59, 3, 60, 3, 60, 3, 60, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 7, 61, 749, 10, 61, 12, 61, 14, 61, 752, 11, 61, 3, 61, 5, 61, 755, 10, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 7, 61, 764, 10, 61, 12, 61, 14, 61, 767, 11, 61, 3, 61, 5, 61, 770, 10, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 7, 61, 779, 10, 61, 12, 61, 14, 61, 782, 11, 61, 3, 61, 5, 61, 785, 10, 61, 3, 61, 3, 61, 3, 61, 3, 61, 3, 61, 5, 61, 792, 10, 61, 3, 61, 3, 61, 5, 61, 796, 10, 61, 3, 62, 3, 62, 3, 62, 7, 62, 801, 10, 62, 12, 62, 14, 62, 804, 11, 62, 3, 62, 5, 62, 807, 10, 62, 3, 63, 3, 63, 3, 63, 5, 63, 812, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 6, 63, 819, 10, 63, 13, 63, 14, 63, 820, 3, 63, 3, 63, 5, 63, 825, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 851, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 868, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 874, 10, 63, 3, 63, 5, 63, 877, 10, 63, 3, 63, 5, 63, 880, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 890, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 896, 10, 63, 3, 63, 5, 63, 899, 10, 63, 3, 63, 5, 63, 902, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 910, 10, 63, 3, 63, 5, 63, 913, 10, 63, 3, 63, 3, 63, 5, 63, 917, 10, 63, 3, 63, 5, 63, 920, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 934, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 951, 10, 63, 3, 63, 3, 63, 3, 63, 5, 63, 956, 10, 63, 3, 63, 3, 63, 3, 63, 5, 63, 961, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 967, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 974, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 986, 10, 63, 3, 63, 3, 63, 5, 63, 990, 10, 63, 3, 63, 5, 63, 993, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 1002, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 1016, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 1037, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 1066, 10, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 3, 63, 5, 63, 1074, 10, 63, 7, 63, 1076, 10, 63, 12, 63, 14, 63, 1079, 11, 63, 3, 64, 3, 64, 3, 64, 3, 64, 7, 64, 1085, 10, 64, 12, 64, 14, 64, 1088, 11, 64, 3, 64, 5, 64, 1091, 10, 64, 3, 64, 3, 64, 3, 64, 3, 64, 3, 64, 7, 64, 1098, 10, 64, 12, 64, 14, 64, 1101, 11, 64, 3, 64, 5, 64, 1104, 10, 64, 3, 64, 3, 64, 5, 64, 1108, 10, 64, 3, 64, 3, 64, 3, 64, 5, 64, 1113, 10, 64, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 3, 65, 5, 65, 1121, 10, 65, 3, 66, 3, 66, 3, 66, 7, 66, 1126, 10, 66, 12, 66, 14, 66, 1129, 11, 66, 3, 66, 3, 66, 3, 66, 3, 66, 3, 66, 7, 66, 1136, 10, 66, 12, 66, 14, 66, 1139, 11, 66, 3, 66, 3, 66, 7, 66, 1143, 10, 66, 12, 66, 14, 66, 1146, 11, 66, 3, 66, 3, 66, 3, 66, 3, 66, 5, 66, 1152, 10, 66, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 3, 67, 5, 67, 1165, 10, 67, 3, 68, 3, 68, 3, 68, 7, 68, 1170, 10, 68, 12, 68, 14, 68, 1173, 11, 68, 3, 68, 5, 68, 1176, 10, 68, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 3, 69, 5, 69, 1188, 10, 69, 3, 70, 3, 70, 3, 70, 3, 70, 5, 70, 1194, 10, 70, 3, 70, 5, 70, 1197, 10, 70, 3, 71, 3, 71, 3, 71, 7, 71, 1202, 10, 71, 12, 71, 14, 71, 1205, 11, 71, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 3, 72, 5, 72, 1216, 10, 72, 3, 72, 3, 72, 3, 72, 3, 72, 5, 72, 1222, 10, 72, 7, 72, 1224, 10, 72, 12, 72, 14, 72, 1227, 11, 72, 3, 73, 3, 73, 3, 73, 5, 73, 1232, 10, 73, 3, 73, 3, 73, 3, 74, 3, 74, 3, 74, 5, 74, 1239, 10, 74, 3, 74, 3, 74, 3, 75, 3, 75, 3, 75, 7, 75, 1246, 10, 75, 12, 75, 14, 75, 1249, 11, 75, 3, 75, 5, 75, 1252, 10, 75, 3, 76, 3, 76, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 3, 77, 5, 77, 1262, 10, 77, 5, 77, 1264, 10, 77, 3, 78, 5, 78, 1267, 10, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 3, 78, 5, 78, 1275, 10, 78, 3, 79, 3, 79, 3, 79, 5, 79, 1280, 10, 79, 3, 80, 3, 80, 3, 81, 3, 81, 3, 82, 3, 82, 3, 83, 3, 83, 5, 83, 1290, 10, 83, 3, 84, 3, 84, 3, 84, 5, 84, 1295, 10, 84, 3, 85, 3, 85, 3, 85, 3, 85, 3, 86, 3, 86, 3, 86, 3, 86, 3, 87, 3, 87, 5, 87, 1307, 10, 87, 3, 88, 3, 88, 7, 88, 1311, 10, 88, 12, 88, 14, 88, 1314, 11, 88, 3, 88, 3, 88, 3, 89, 3, 89, 3, 89, 3, 89, 3, 89, 5, 89, 1323, 10, 89, 3, 90, 3, 90, 7, 90, 1327, 10, 90, 12, 90, 14, 90, 1330, 11, 90, 3, 90, 3, 90, 3, 91, 3, 91, 3, 91, 3, 91, 3, 91, 5, 91, 1339, 10, 91, 3, 91, 2, 2, 5, 84, 124, 142, 92, 2, 2, 4, 2, 6, 2, 8, 2, 10, 2, 12, 2, 14, 2, 16, 2, 18, 2, 20, 2, 22, 2, 24, 2, 26, 2, 28, 2, 30, 2, 32, 2, 34, 2, 36, 2, 38, 2, 40, 2, 42, 2, 44, 2, 46, 2, 48, 2, 50, 2, 52, 2, 54, 2, 56, 2, 58, 2, 60, 2, 62, 2, 64, 2, 66, 2, 68, 2, 70, 2, 72, 2, 74, 2, 76, 2, 78, 2, 80, 2, 82, 2, 84, 2, 86, 2, 88, 2, 90, 2, 92, 2, 94, 2, 96, 2, 98, 2, 100, 2, 102, 2, 104, 2, 106, 2, 108, 2, 110, 2, 112, 2, 114, 2, 116, 2, 118, 2, 120, 2, 122, 2, 124, 2, 126, 2, 128, 2, 130, 2, 132, 2, 134, 2, 136, 2, 138, 2, 140, 2, 142, 2, 144, 2, 146, 2, 148, 2, 150, 2, 152, 2, 154, 2, 156, 2, 158, 2, 160, 2, 162, 2, 164, 2, 166, 2, 168, 2, 170, 2, 172, 2, 174, 2, 176, 2, 178, 2, 180, 2, 2, 20, 4, 2, 34, 34, 39, 39, 4, 2, 20, 20, 79, 79, 4, 2, 48, 48, 56, 56, 5, 2, 3, 3, 6, 6, 10, 10, 6, 2, 3, 3, 5, 6, 10, 10, 85, 85, 4, 2, 56, 56, 78, 78, 4, 2, 3, 3, 6, 6, 4, 2, 66, 66, 121, 121, 4, 2, 9, 9, 24, 25, 4, 2, 33, 33, 54, 54, 4, 2, 76, 76, 81, 81, 5, 2, 12, 12, 55, 55, 95, 95, 4, 2, 45, 45, 58, 58, 3, 2, 112, 113, 4, 2, 123, 123, 145, 145, 9, 2, 23, 23, 42, 42, 60, 61, 75, 75, 83, 83, 102, 102, 108, 108, 21, 2, 3, 15, 17, 22, 24, 28, 30, 31, 33, 33, 35, 38, 40, 41, 43, 46, 48, 48, 50, 56, 58, 59, 63, 63, 65, 74, 76, 82, 84, 88, 90, 97, 99, 101, 103, 104, 106, 107, 6, 2, 22, 22, 33, 33, 43, 43, 53, 53, 2, 1516, 2, 185, 3, 2, 2, 2, 4, 192, 3, 2, 2, 2, 6, 194, 3, 2, 2, 2, 8, 196, 3, 2, 2, 2, 10, 203, 3, 2, 2, 2, 12, 226, 3, 2, 2, 2, 14, 228, 3, 2, 2, 2, 16, 235, 3, 2, 2, 2, 18, 242, 3, 2, 2, 2, 20, 255, 3, 2, 2, 2, 22, 267, 3, 2, 2, 2, 24, 276, 3, 2, 2, 2, 26, 284, 3, 2, 2, 2, 28, 306, 3, 2, 2, 2, 30, 321, 3, 2, 2, 2, 32, 330, 3, 2, 2, 2, 34, 335, 3, 2, 2, 2, 36, 339, 3, 2, 2, 2, 38, 341, 3, 2, 2, 2, 40, 350, 3, 2, 2, 2, 42, 354, 3, 2, 2, 2, 44, 368, 3, 2, 2, 2, 46, 381, 3, 2, 2, 2, 48, 391, 3, 2, 2, 2, 50, 395, 3, 2, 2, 2, 52, 403, 3, 2, 2, 2, 54, 455, 3, 2, 2, 2, 56, 458, 3, 2, 2, 2, 58, 464, 3, 2, 2, 2, 60, 468, 3, 2, 2, 2, 62, 474, 3, 2, 2, 2, 64, 492, 3, 2, 2, 2, 66, 495, 3, 2, 2, 2, 68, 498, 3, 2, 2, 2, 70, 508, 3, 2, 2, 2, 72, 511, 3, 2, 2, 2, 74, 515, 3, 2, 2, 2, 76, 519, 3, 2, 2, 2, 78, 543, 3, 2, 2, 2, 80, 545, 3, 2, 2, 2, 82, 548, 3, 2, 2, 2, 84, 563, 3, 2, 2, 2, 86, 625, 3, 2, 2, 2, 88, 630, 3, 2, 2, 2, 90, 641, 3, 2, 2, 2, 92, 643, 3, 2, 2, 2, 94, 649, 3, 2, 2, 2, 96, 654, 3, 2, 2, 2, 98, 662, 3, 2, 2, 2, 100, 680, 3, 2, 2, 2, 102, 682, 3, 2, 2, 2, 104, 690, 3, 2, 2, 2, 106, 695, 3, 2, 2, 2, 108, 703, 3, 2, 2, 2, 110, 707, 3, 2, 2, 2, 112, 711, 3, 2, 2, 2, 114, 720, 3, 2, 2, 2, 116, 734, 3, 2, 2, 2, 118, 736, 3, 2, 2, 2, 120, 795, 3, 2, 2, 2, 122, 797, 3, 2, 2, 2, 124, 960, 3, 2, 2, 2, 126, 1107, 3, 2, 2, 2, 128, 1120, 3, 2, 2, 2, 130, 1151, 3, 2, 2, 2, 132, 1164, 3, 2, 2, 2, 134, 1166, 3, 2, 2, 2, 136, 1187, 3, 2, 2, 2, 138, 1196, 3, 2, 2, 2, 140, 1198, 3, 2, 2, 2, 142, 1215, 3, 2, 2, 2, 144, 1228, 3, 2, 2, 2, 146, 1238, 3, 2, 2, 2, 148, 1242, 3, 2, 2, 2, 150, 1253, 3, 2, 2, 2, 152, 1263, 3, 2, 2, 2, 154, 1266, 3, 2, 2, 2, 156, 1279, 3, 2, 2, 2, 158, 1281, 3, 2, 2, 2, 160, 1283, 3, 2, 2, 2, 162, 1285, 3, 2, 2, 2, 164, 1289, 3, 2, 2, 2, 166, 1294, 3, 2, 2, 2, 168, 1296, 3, 2, 2, 2, 170, 1300, 3, 2, 2, 2, 172, 1306, 3, 2, 2, 2, 174, 1308, 3, 2, 2, 2, 176, 1322, 3, 2, 2, 2, 178, 1324, 3, 2, 2, 2, 180, 1338, 3, 2, 2, 2, 182, 184, 5, 4, 3, 2, 183, 182, 3, 2, 2, 2, 184, 187, 3, 2, 2, 2, 185, 183, 3, 2, 2, 2, 185, 186, 3, 2, 2, 2, 186, 188, 3, 2, 2, 2, 187, 185, 3, 2, 2, 2, 188, 189, 7, 2, 2, 3, 189, 3, 3, 2, 2, 2, 190, 193, 5, 8, 5, 2, 191, 193, 5, 12, 7, 2, 192, 190, 3, 2, 2, 2, 192, 191, 3, 2, 2, 2, 193, 5, 3, 2, 2, 2, 194, 195, 5, 124, 63, 2, 195, 7, 3, 2, 2, 2, 196, 197, 7, 57, 2, 2, 197, 201, 5, 166, 84, 2, 198, 199, 7, 120, 2, 2, 199, 200, 7, 127, 2, 2, 200, 202, 5, 6, 4, 2, 201, 198, 3, 2, 2, 2, 201, 202, 3, 2, 2, 2, 202, 9, 3, 2, 2, 2, 203, 208, 5, 166, 84, 2, 204, 205, 7, 121, 2, 2, 205, 207, 5, 166, 84, 2, 206, 204, 3, 2, 2, 2, 207, 210, 3, 2, 2, 2, 208, 206, 3, 2, 2, 2, 208, 209, 3, 2, 2, 2, 209, 212, 3, 2, 2, 2, 210, 208, 3, 2, 2, 2, 211, 213, 7, 121, 2, 2, 212, 211, 3, 2, 2, 2, 212, 213, 3, 2, 2, 2, 213, 11, 3, 2, 2, 2, 214, 227, 5, 14, 8, 2, 215, 227, 5, 16, 9, 2, 216, 227, 5, 20, 11, 2, 217, 227, 5, 22, 12, 2, 218, 227, 5, 24, 13, 2, 219, 227, 5, 28, 15, 2, 220, 227, 5, 26, 14, 2, 221, 227, 5, 30, 16, 2, 222, 227, 5, 32, 17, 2, 223, 227, 5, 38, 20, 2, 224, 227, 5, 34, 18, 2, 225, 227, 5, 36, 19, 2, 226, 214, 3, 2, 2, 2, 226, 215, 3, 2, 2, 2, 226, 216, 3, 2, 2, 2, 226, 217, 3, 2, 2, 2, 226, 218, 3, 2, 2, 2, 226, 219, 3, 2, 2, 2, 226, 220, 3, 2, 2, 2, 226, 221, 3, 2, 2, 2, 226, 222, 3, 2, 2, 2, 226, 223, 3, 2, 2, 2, 226, 224, 3, 2, 2, 2, 226, 225, 3, 2, 2, 2, 227, 13, 3, 2, 2, 2, 228, 230, 7, 77, 2, 2, 229, 231, 5, 6, 4, 2, 230, 229, 3, 2, 2, 2, 230, 231, 3, 2, 2, 2, 231, 233, 3, 2, 2, 2, 232, 234, 7, 156, 2, 2, 233, 232, 3, 2, 2, 2, 233, 234, 3, 2, 2, 2, 234, 15, 3, 2, 2, 2, 235, 237, 7, 89, 2, 2, 236, 238, 5, 6, 4, 2, 237, 236, 3, 2, 2, 2, 237, 238, 3, 2, 2, 2, 238, 240, 3, 2, 2, 2, 239, 241, 7, 156, 2, 2, 240, 239, 3, 2, 2, 2, 240, 241, 3, 2, 2, 2, 241, 17, 3, 2, 2, 2, 242, 251, 7, 16, 2, 2, 243, 244, 7, 135, 2, 2, 244, 247, 5, 166, 84, 2, 245, 246, 7, 120, 2, 2, 246, 248, 5, 166, 84, 2, 247, 245, 3, 2, 2, 2, 247, 248, 3, 2, 2, 2, 248, 249, 3, 2, 2, 2, 249, 250, 7, 155, 2, 2, 250, 252, 3, 2, 2, 2, 251, 243, 3, 2, 2, 2, 251, 252, 3, 2, 2, 2, 252, 253, 3, 2, 2, 2, 253, 254, 5, 38, 20, 2, 254, 19, 3, 2, 2, 2, 255, 256, 7, 98, 2, 2, 256, 260, 5, 38, 20, 2, 257, 259, 5, 18, 10, 2, 258, 257, 3, 2, 2, 2, 259, 262, 3, 2, 2, 2, 260, 258, 3, 2, 2, 2, 260, 261, 3, 2, 2, 2, 261, 265, 3, 2, 2, 2, 262, 260, 3, 2, 2, 2, 263, 264, 7, 32, 2, 2, 264, 266, 5, 38, 20, 2, 265, 263, 3, 2, 2, 2, 265, 266, 3, 2, 2, 2, 266, 21, 3, 2, 2, 2, 267, 268, 7, 44, 2, 2, 268, 269, 7, 135, 2, 2, 269, 270, 5, 6, 4, 2, 270, 271, 7, 155, 2, 2, 271, 274, 5, 12, 7, 2, 272, 273, 7, 27, 2, 2, 273, 275, 5, 12, 7, 2, 274, 272, 3, 2, 2, 2, 274, 275, 3, 2, 2, 2, 275, 23, 3, 2, 2, 2, 276, 277, 7, 105, 2, 2, 277, 278, 7, 135, 2, 2, 278, 279, 5, 6, 4, 2, 279, 280, 7, 155, 2, 2, 280, 282, 5, 12, 7, 2, 281, 283, 7, 156, 2, 2, 282, 281, 3, 2, 2, 2, 282, 283, 3, 2, 2, 2, 283, 25, 3, 2, 2, 2, 284, 285, 7, 36, 2, 2, 285, 289, 7, 135, 2, 2, 286, 290, 5, 8, 5, 2, 287, 290, 5, 32, 17, 2, 288, 290, 5, 6, 4, 2, 289, 286, 3, 2, 2, 2, 289, 287, 3, 2, 2, 2, 289, 288, 3, 2, 2, 2, 289, 290, 3, 2, 2, 2, 290, 291, 3, 2, 2, 2, 291, 293, 7, 156, 2, 2, 292, 294, 5, 6, 4, 2, 293, 292, 3, 2, 2, 2, 293, 294, 3, 2, 2, 2, 294, 295, 3, 2, 2, 2, 295, 299, 7, 156, 2, 2, 296, 300, 5, 8, 5, 2, 297, 300, 5, 32, 17, 2, 298, 300, 5, 6, 4, 2, 299, 296, 3, 2, 2, 2, 299, 297, 3, 2, 2, 2, 299, 298, 3, 2, 2, 2, 299, 300, 3, 2, 2, 2, 300, 301, 3, 2, 2, 2, 301, 302, 7, 155, 2, 2, 302, 304, 5, 12, 7, 2, 303, 305, 7, 156, 2, 2, 304, 303, 3, 2, 2, 2, 304, 305, 3, 2, 2, 2, 305, 27, 3, 2, 2, 2, 306, 307, 7, 36, 2, 2, 307, 308, 7, 135, 2, 2, 308, 309, 7, 57, 2, 2, 309, 312, 5, 166, 84, 2, 310, 311, 7, 121, 2, 2, 311, 313, 5, 166, 84, 2, 312, 310, 3, 2, 2, 2, 312, 313, 3, 2, 2, 2, 313, 314, 3, 2, 2, 2, 314, 315, 7, 46, 2, 2, 315, 316, 5, 6, 4, 2, 316, 317, 7, 155, 2, 2, 317, 319, 5, 12, 7, 2, 318, 320, 7, 156, 2, 2, 319, 318, 3, 2, 2, 2, 319, 320, 3, 2, 2, 2, 320, 29, 3, 2, 2, 2, 321, 322, 9, 2, 2, 2, 322, 323, 5, 166, 84, 2, 323, 325, 7, 135, 2, 2, 324, 326, 5, 10, 6, 2, 325, 324, 3, 2, 2, 2, 325, 326, 3, 2, 2, 2, 326, 327, 3, 2, 2, 2, 327, 328, 7, 155, 2, 2, 328, 329, 5, 38, 20, 2, 329, 31, 3, 2, 2, 2, 330, 331, 5, 6, 4, 2, 331, 332, 7, 120, 2, 2, 332, 333, 7, 127, 2, 2, 333, 334, 5, 6, 4, 2, 334, 33, 3, 2, 2, 2, 335, 337, 5, 6, 4, 2, 336, 338, 7, 156, 2, 2, 337, 336, 3, 2, 2, 2, 337, 338, 3, 2, 2, 2, 338, 35, 3, 2, 2, 2, 339, 340, 7, 156, 2, 2, 340, 37, 3, 2, 2, 2, 341, 345, 7, 133, 2, 2, 342, 344, 5, 4, 3, 2, 343, 342, 3, 2, 2, 2, 344, 347, 3, 2, 2, 2, 345, 343, 3, 2, 2, 2, 345, 346, 3, 2, 2, 2, 346, 348, 3, 2, 2, 2, 347, 345, 3, 2, 2, 2, 348, 349, 7, 153, 2, 2, 349, 39, 3, 2, 2, 2, 350, 351, 5, 6, 4, 2, 351, 352, 7, 120, 2, 2, 352, 353, 5, 6, 4, 2, 353, 41, 3, 2, 2, 2, 354, 359, 5, 40, 21, 2, 355, 356, 7, 121, 2, 2, 356, 358, 5, 40, 21, 2, 357, 355, 3, 2, 2, 2, 358, 361, 3, 2, 2, 2, 359, 357, 3, 2, 2, 2, 359, 360, 3, 2, 2, 2, 360, 363, 3, 2, 2, 2, 361, 359, 3, 2, 2, 2, 362, 364, 7, 121, 2, 2, 363, 362, 3, 2, 2, 2, 363, 364, 3, 2, 2, 2, 364, 43, 3, 2, 2, 2, 365, 369, 5, 50, 26, 2, 366, 369, 5, 52, 27, 2, 367, 369, 5, 130, 66, 2, 368, 365, 3, 2, 2, 2, 368, 366, 3, 2, 2, 2, 368, 367, 3, 2, 2, 2, 369, 371, 3, 2, 2, 2, 370, 372, 7, 156, 2, 2, 371, 370, 3, 2, 2, 2, 371, 372, 3, 2, 2, 2, 372, 373, 3, 2, 2, 2, 373, 374, 7, 2, 2, 3, 374, 45, 3, 2, 2, 2, 375, 382, 5, 52, 27, 2, 376, 377, 7, 135, 2, 2, 377, 378, 5, 50, 26, 2, 378, 379, 7, 155, 2, 2, 379, 382, 3, 2, 2, 2, 380, 382, 5, 170, 86, 2, 381, 375, 3, 2, 2, 2, 381, 376, 3, 2, 2, 2, 381, 380, 3, 2, 2, 2, 382, 47, 3, 2, 2, 2, 383, 392, 7, 29, 2, 2, 384, 385, 7, 100, 2, 2, 385, 392, 7, 3, 2, 2, 386, 387, 7, 100, 2, 2, 387, 392, 7, 26, 2, 2, 388, 392, 7, 49, 2, 2, 389, 390, 7, 49, 2, 2, 390, 392, 7, 26, 2, 2, 391, 383, 3, 2, 2, 2, 391, 384, 3, 2, 2, 2, 391, 386, 3, 2, 2, 2, 391, 388, 3, 2, 2, 2, 391, 389, 3, 2, 2, 2, 392, 393, 3, 2, 2, 2, 393, 394, 5, 46, 24, 2, 394, 49, 3, 2, 2, 2, 395, 399, 5, 46, 24, 2, 396, 398, 5, 48, 25, 2, 397, 396, 3, 2, 2, 2, 398, 401, 3, 2, 2, 2, 399, 397, 3, 2, 2, 2, 399, 400, 3, 2, 2, 2, 400, 51, 3, 2, 2, 2, 401, 399, 3, 2, 2, 2, 402, 404, 5, 54, 28, 2, 403, 402, 3, 2, 2, 2, 403, 404, 3, 2, 2, 2, 404, 405, 3, 2, 2, 2, 405, 407, 7, 84, 2, 2, 406, 408, 7, 26, 2, 2, 407, 406, 3, 2, 2, 2, 407, 408, 3, 2, 2, 2, 408, 410, 3, 2, 2, 2, 409, 411, 5, 56, 29, 2, 410, 409, 3, 2, 2, 2, 410, 411, 3, 2, 2, 2, 411, 412, 3, 2, 2, 2, 412, 414, 5, 122, 62, 2, 413, 415, 5, 58, 30, 2, 414, 413, 3, 2, 2, 2, 414, 415, 3, 2, 2, 2, 415, 417, 3, 2, 2, 2, 416, 418, 5, 60, 31, 2, 417, 416, 3, 2, 2, 2, 417, 418, 3, 2, 2, 2, 418, 420, 3, 2, 2, 2, 419, 421, 5, 64, 33, 2, 420, 419, 3, 2, 2, 2, 420, 421, 3, 2, 2, 2, 421, 423, 3, 2, 2, 2, 422, 424, 5, 66, 34, 2, 423, 422, 3, 2, 2, 2, 423, 424, 3, 2, 2, 2, 424, 426, 3, 2, 2, 2, 425, 427, 5, 68, 35, 2, 426, 425, 3, 2, 2, 2, 426, 427, 3, 2, 2, 2, 427, 430, 3, 2, 2, 2, 428, 429, 7, 107, 2, 2, 429, 431, 9, 3, 2, 2, 430, 428, 3, 2, 2, 2, 430, 431, 3, 2, 2, 2, 431, 434, 3, 2, 2, 2, 432, 433, 7, 107, 2, 2, 433, 435, 7, 94, 2, 2, 434, 432, 3, 2, 2, 2, 434, 435, 3, 2, 2, 2, 435, 437, 3, 2, 2, 2, 436, 438, 5, 70, 36, 2, 437, 436, 3, 2, 2, 2, 437, 438, 3, 2, 2, 2, 438, 440, 3, 2, 2, 2, 439, 441, 5, 62, 32, 2, 440, 439, 3, 2, 2, 2, 440, 441, 3, 2, 2, 2, 441, 443, 3, 2, 2, 2, 442, 444, 5, 72, 37, 2, 443, 442, 3, 2, 2, 2, 443, 444, 3, 2, 2, 2, 444, 446, 3, 2, 2, 2, 445, 447, 5, 76, 39, 2, 446, 445, 3, 2, 2, 2, 446, 447, 3, 2, 2, 2, 447, 450, 3, 2, 2, 2, 448, 451, 5, 78, 40, 2, 449, 451, 5, 80, 41, 2, 450, 448, 3, 2, 2, 2, 450, 449, 3, 2, 2, 2, 450, 451, 3, 2, 2, 2, 451, 453, 3, 2, 2, 2, 452, 454, 5, 82, 42, 2, 453, 452, 3, 2, 2, 2, 453, 454, 3, 2, 2, 2, 454, 53, 3, 2, 2, 2, 455, 456, 7, 107, 2, 2, 456, 457, 5, 134, 68, 2, 457, 55, 3, 2, 2, 2, 458, 459, 7, 93, 2, 2, 459, 462, 7, 113, 2, 2, 460, 461, 7, 107, 2, 2, 461, 463, 7, 90, 2, 2, 462, 460, 3, 2, 2, 2, 462, 463, 3, 2, 2, 2, 463, 57, 3, 2, 2, 2, 464, 465, 7, 37, 2, 2, 465, 466, 5, 84, 43, 2, 466, 59, 3, 2, 2, 2, 467, 469, 9, 4, 2, 2, 468, 467, 3, 2, 2, 2, 468, 469, 3, 2, 2, 2, 469, 470, 3, 2, 2, 2, 470, 471, 7, 7, 2, 2, 471, 472, 7, 52, 2, 2, 472, 473, 5, 122, 62, 2, 473, 61, 3, 2, 2, 2, 474, 475, 7, 106, 2, 2, 475, 476, 5, 166, 84, 2, 476, 477, 7, 8, 2, 2, 477, 478, 7, 135, 2, 2, 478, 479, 5, 106, 54, 2, 479, 489, 7, 155, 2, 2, 480, 481, 7, 121, 2, 2, 481, 482, 5, 166, 84, 2, 482, 483, 7, 8, 2, 2, 483, 484, 7, 135, 2, 2, 484, 485, 5, 106, 54, 2, 485, 486, 7, 155, 2, 2, 486, 488, 3, 2, 2, 2, 487, 480, 3, 2, 2, 2, 488, 491, 3, 2, 2, 2, 489, 487, 3, 2, 2, 2, 489, 490, 3, 2, 2, 2, 490, 63, 3, 2, 2, 2, 491, 489, 3, 2, 2, 2, 492, 493, 7, 74, 2, 2, 493, 494, 5, 124, 63, 2, 494, 65, 3, 2, 2, 2, 495, 496, 7, 104, 2, 2, 496, 497, 5, 124, 63, 2, 497, 67, 3, 2, 2, 2, 498, 499, 7, 40, 2, 2, 499, 506, 7, 13, 2, 2, 500, 501, 9, 3, 2, 2, 501, 502, 7, 135, 2, 2, 502, 503, 5, 122, 62, 2, 503, 504, 7, 155, 2, 2, 504, 507, 3, 2, 2, 2, 505, 507, 5, 122, 62, 2, 506, 500, 3, 2, 2, 2, 506, 505, 3, 2, 2, 2, 507, 69, 3, 2, 2, 2, 508, 509, 7, 41, 2, 2, 509, 510, 5, 124, 63, 2, 510, 71, 3, 2, 2, 2, 511, 512, 7, 69, 2, 2, 512, 513, 7, 13, 2, 2, 513, 514, 5, 96, 49, 2, 514, 73, 3, 2, 2, 2, 515, 516, 7, 69, 2, 2, 516, 517, 7, 13, 2, 2, 517, 518, 5, 122, 62, 2, 518, 75, 3, 2, 2, 2, 519, 520, 7, 59, 2, 2, 520, 521, 5, 94, 48, 2, 521, 522, 7, 13, 2, 2, 522, 523, 5, 122, 62, 2, 523, 77, 3, 2, 2, 2, 524, 525, 7, 59, 2, 2, 525, 528, 5, 124, 63, 2, 526, 527, 7, 121, 2, 2, 527, 529, 5, 124, 63, 2, 528, 526, 3, 2, 2, 2, 528, 529, 3, 2, 2, 2, 529, 532, 3, 2, 2, 2, 530, 531, 7, 107, 2, 2, 531, 533, 7, 90, 2, 2, 532, 530, 3, 2, 2, 2, 532, 533, 3, 2, 2, 2, 533, 544, 3, 2, 2, 2, 534, 535, 7, 59, 2, 2, 535, 538, 5, 124, 63, 2, 536, 537, 7, 107, 2, 2, 537, 539, 7, 90, 2, 2, 538, 536, 3, 2, 2, 2, 538, 539, 3, 2, 2, 2, 539, 540, 3, 2, 2, 2, 540, 541, 7, 66, 2, 2, 541, 542, 5, 124, 63, 2, 542, 544, 3, 2, 2, 2, 543, 524, 3, 2, 2, 2, 543, 534, 3, 2, 2, 2, 544, 79, 3, 2, 2, 2, 545, 546, 7, 66, 2, 2, 546, 547, 5, 124, 63, 2, 547, 81, 3, 2, 2, 2, 548, 549, 7, 86, 2, 2, 549, 550, 5, 102, 52, 2, 550, 83, 3, 2, 2, 2, 551, 552, 8, 43, 1, 2, 552, 554, 5, 142, 72, 2, 553, 555, 7, 31, 2, 2, 554, 553, 3, 2, 2, 2, 554, 555, 3, 2, 2, 2, 555, 557, 3, 2, 2, 2, 556, 558, 5, 92, 47, 2, 557, 556, 3, 2, 2, 2, 557, 558, 3, 2, 2, 2, 558, 564, 3, 2, 2, 2, 559, 560, 7, 135, 2, 2, 560, 561, 5, 84, 43, 2, 561, 562, 7, 155, 2, 2, 562, 564, 3, 2, 2, 2, 563, 551, 3, 2, 2, 2, 563, 559, 3, 2, 2, 2, 564, 579, 3, 2, 2, 2, 565, 566, 12, 5, 2, 2, 566, 567, 5, 88, 45, 2, 567, 568, 5, 84, 43, 6, 568, 578, 3, 2, 2, 2, 569, 571, 12, 6, 2, 2, 570, 572, 5, 86, 44, 2, 571, 570, 3, 2, 2, 2, 571, 572, 3, 2, 2, 2, 572, 573, 3, 2, 2, 2, 573, 574, 7, 52, 2, 2, 574, 575, 5, 84, 43, 2, 575, 576, 5, 90, 46, 2, 576, 578, 3, 2, 2, 2, 577, 565, 3, 2, 2, 2, 577, 569, 3, 2, 2, 2, 578, 581, 3, 2, 2, 2, 579, 577, 3, 2, 2, 2, 579, 580, 3, 2, 2, 2, 580, 85, 3, 2, 2, 2, 581, 579, 3, 2, 2, 2, 582, 584, 9, 5, 2, 2, 583, 582, 3, 2, 2, 2, 583, 584, 3, 2, 2, 2, 584, 585, 3, 2, 2, 2, 585, 592, 7, 48, 2, 2, 586, 588, 7, 48, 2, 2, 587, 589, 9, 5, 2, 2, 588, 587, 3, 2, 2, 2, 588, 589, 3, 2, 2, 2, 589, 592, 3, 2, 2, 2, 590, 592, 9, 5, 2, 2, 591, 583, 3, 2, 2, 2, 591, 586, 3, 2, 2, 2, 591, 590, 3, 2, 2, 2, 592, 626, 3, 2, 2, 2, 593, 595, 9, 6, 2, 2, 594, 593, 3, 2, 2, 2, 594, 595, 3, 2, 2, 2, 595, 596, 3, 2, 2, 2, 596, 598, 9, 7, 2, 2, 597, 599, 7, 70, 2, 2, 598, 597, 3, 2, 2, 2, 598, 599, 3, 2, 2, 2, 599, 608, 3, 2, 2, 2, 600, 602, 9, 7, 2, 2, 601, 603, 7, 70, 2, 2, 602, 601, 3, 2, 2, 2, 602, 603, 3, 2, 2, 2, 603, 605, 3, 2, 2, 2, 604, 606, 9, 6, 2, 2, 605, 604, 3, 2, 2, 2, 605, 606, 3, 2, 2, 2, 606, 608, 3, 2, 2, 2, 607, 594, 3, 2, 2, 2, 607, 600, 3, 2, 2, 2, 608, 626, 3, 2, 2, 2, 609, 611, 9, 8, 2, 2, 610, 609, 3, 2, 2, 2, 610, 611, 3, 2, 2, 2, 611, 612, 3, 2, 2, 2, 612, 614, 7, 38, 2, 2, 613, 615, 7, 70, 2, 2, 614, 613, 3, 2, 2, 2, 614, 615, 3, 2, 2, 2, 615, 624, 3, 2, 2, 2, 616, 618, 7, 38, 2, 2, 617, 619, 7, 70, 2, 2, 618, 617, 3, 2, 2, 2, 618, 619, 3, 2, 2, 2, 619, 621, 3, 2, 2, 2, 620, 622, 9, 8, 2, 2, 621, 620, 3, 2, 2, 2, 621, 622, 3, 2, 2, 2, 622, 624, 3, 2, 2, 2, 623, 610, 3, 2, 2, 2, 623, 616, 3, 2, 2, 2, 624, 626, 3, 2, 2, 2, 625, 591, 3, 2, 2, 2, 625, 607, 3, 2, 2, 2, 625, 623, 3, 2, 2, 2, 626, 87, 3, 2, 2, 2, 627, 628, 7, 19, 2, 2, 628, 631, 7, 52, 2, 2, 629, 631, 7, 121, 2, 2, 630, 627, 3, 2, 2, 2, 630, 629, 3, 2, 2, 2, 631, 89, 3, 2, 2, 2, 632, 633, 7, 67, 2, 2, 633, 642, 5, 122, 62, 2, 634, 635, 7, 101, 2, 2, 635, 636, 7, 135, 2, 2, 636, 637, 5, 122, 62, 2, 637, 638, 7, 155, 2, 2, 638, 642, 3, 2, 2, 2, 639, 640, 7, 101, 2, 2, 640, 642, 5, 122, 62, 2, 641, 632, 3, 2, 2, 2, 641, 634, 3, 2, 2, 2, 641, 639, 3, 2, 2, 2, 642, 91, 3, 2, 2, 2, 643, 644, 7, 82, 2, 2, 644, 647, 5, 100, 51, 2, 645, 646, 7, 66, 2, 2, 646, 648, 5, 100, 51, 2, 647, 645, 3, 2, 2, 2, 647, 648, 3, 2, 2, 2, 648, 93, 3, 2, 2, 2, 649, 652, 5, 124, 63, 2, 650, 651, 9, 9, 2, 2, 651, 653, 5, 124, 63, 2, 652, 650, 3, 2, 2, 2, 652, 653, 3, 2, 2, 2, 653, 95, 3, 2, 2, 2, 654, 659, 5, 98, 50, 2, 655, 656, 7, 121, 2, 2, 656, 658, 5, 98, 50, 2, 657, 655, 3, 2, 2, 2, 658, 661, 3, 2, 2, 2, 659, 657, 3, 2, 2, 2, 659, 660, 3, 2, 2, 2, 660, 97, 3, 2, 2, 2, 661, 659, 3, 2, 2, 2, 662, 664, 5, 124, 63, 2, 663, 665, 9, 10, 2, 2, 664, 663, 3, 2, 2, 2, 664, 665, 3, 2, 2, 2, 665, 668, 3, 2, 2, 2, 666, 667, 7, 65, 2, 2, 667, 669, 9, 11, 2, 2, 668, 666, 3, 2, 2, 2, 668, 669, 3, 2, 2, 2, 669, 672, 3, 2, 2, 2, 670, 671, 7, 18, 2, 2, 671, 673, 7, 115, 2, 2, 672, 670, 3, 2, 2, 2, 672, 673, 3, 2, 2, 2, 673, 99, 3, 2, 2, 2, 674, 681, 5, 170, 86, 2, 675, 678, 5, 154, 78, 2, 676, 677, 7, 157, 2, 2, 677, 679, 5, 154, 78, 2, 678, 676, 3, 2, 2, 2, 678, 679, 3, 2, 2, 2, 679, 681, 3, 2, 2, 2, 680, 674, 3, 2, 2, 2, 680, 675, 3, 2, 2, 2, 681, 101, 3, 2, 2, 2, 682, 687, 5, 104, 53, 2, 683, 684, 7, 121, 2, 2, 684, 686, 5, 104, 53, 2, 685, 683, 3, 2, 2, 2, 686, 689, 3, 2, 2, 2, 687, 685, 3, 2, 2, 2, 687, 688, 3, 2, 2, 2, 688, 103, 3, 2, 2, 2, 689, 687, 3, 2, 2, 2, 690, 691, 5, 166, 84, 2, 691, 692, 7, 127, 2, 2, 692, 693, 5, 156, 79, 2, 693, 105, 3, 2, 2, 2, 694, 696, 5, 108, 55, 2, 695, 694, 3, 2, 2, 2, 695, 696, 3, 2, 2, 2, 696, 698, 3, 2, 2, 2, 697, 699, 5, 110, 56, 2, 698, 697, 3, 2, 2, 2, 698, 699, 3, 2, 2, 2, 699, 701, 3, 2, 2, 2, 700, 702, 5, 112, 57, 2, 701, 700, 3, 2, 2, 2, 701, 702, 3, 2, 2, 2, 702, 107, 3, 2, 2, 2, 703, 704, 7, 72, 2, 2, 704, 705, 7, 13, 2, 2, 705, 706, 5, 122, 62, 2, 706, 109, 3, 2, 2, 2, 707, 708, 7, 69, 2, 2, 708, 709, 7, 13, 2, 2, 709, 710, 5, 96, 49, 2, 710, 111, 3, 2, 2, 2, 711, 712, 9, 12, 2, 2, 712, 713, 5, 114, 58, 2, 713, 113, 3, 2, 2, 2, 714, 721, 5, 116, 59, 2, 715, 716, 7, 11, 2, 2, 716, 717, 5, 116, 59, 2, 717, 718, 7, 4, 2, 2, 718, 719, 5, 116, 59, 2, 719, 721, 3, 2, 2, 2, 720, 714, 3, 2, 2, 2, 720, 715, 3, 2, 2, 2, 721, 115, 3, 2, 2, 2, 722, 723, 7, 21, 2, 2, 723, 735, 7, 80, 2, 2, 724, 725, 7, 99, 2, 2, 725, 735, 7, 73, 2, 2, 726, 727, 7, 99, 2, 2, 727, 735, 7, 35, 2, 2, 728, 729, 5, 154, 78, 2, 729, 730, 7, 73, 2, 2, 730, 735, 3, 2, 2, 2, 731, 732, 5, 154, 78, 2, 732, 733, 7, 35, 2, 2, 733, 735, 3, 2, 2, 2, 734, 722, 3, 2, 2, 2, 734, 724, 3, 2, 2, 2, 734, 726, 3, 2, 2, 2, 734, 728, 3, 2, 2, 2, 734, 731, 3, 2, 2, 2, 735, 117, 3, 2, 2, 2, 736, 737, 5, 124, 63, 2, 737, 738, 7, 2, 2, 3, 738, 119, 3, 2, 2, 2, 739, 796, 5, 166, 84, 2, 740, 741, 5, 166, 84, 2, 741, 742, 7, 135, 2, 2, 742, 743, 5, 166, 84, 2, 743, 750, 5, 120, 61, 2, 744, 745, 7, 121, 2, 2, 745, 746, 5, 166, 84, 2, 746, 747, 5, 120, 61, 2, 747, 749, 3, 2, 2, 2, 748, 744, 3, 2, 2, 2, 749, 752, 3, 2, 2, 2, 750, 748, 3, 2, 2, 2, 750, 751, 3, 2, 2, 2, 751, 754, 3, 2, 2, 2, 752, 750, 3, 2, 2, 2, 753, 755, 7, 121, 2, 2, 754, 753, 3, 2, 2, 2, 754, 755, 3, 2, 2, 2, 755, 756, 3, 2, 2, 2, 756, 757, 7, 155, 2, 2, 757, 796, 3, 2, 2, 2, 758, 759, 5, 166, 84, 2, 759, 760, 7, 135, 2, 2, 760, 765, 5, 168, 85, 2, 761, 762, 7, 121, 2, 2, 762, 764, 5, 168, 85, 2, 763, 761, 3, 2, 2, 2, 764, 767, 3, 2, 2, 2, 765, 763, 3, 2, 2, 2, 765, 766, 3, 2, 2, 2, 766, 769, 3, 2, 2, 2, 767, 765, 3, 2, 2, 2, 768, 770, 7, 121, 2, 2, 769, 768, 3, 2, 2, 2, 769, 770, 3, 2, 2, 2, 770, 771, 3, 2, 2, 2, 771, 772, 7, 155, 2, 2, 772, 796, 3, 2, 2, 2, 773, 774, 5, 166, 84, 2, 774, 775, 7, 135, 2, 2, 775, 780, 5, 120, 61, 2, 776, 777, 7, 121, 2, 2, 777, 779, 5, 120, 61, 2, 778, 776, 3, 2, 2, 2, 779, 782, 3, 2, 2, 2, 780, 778, 3, 2, 2, 2, 780, 781, 3, 2, 2, 2, 781, 784, 3, 2, 2, 2, 782, 780, 3, 2, 2, 2, 783, 785, 7, 121, 2, 2, 784, 783, 3, 2, 2, 2, 784, 785, 3, 2, 2, 2, 785, 786, 3, 2, 2, 2, 786, 787, 7, 155, 2, 2, 787, 796, 3, 2, 2, 2, 788, 789, 5, 166, 84, 2, 789, 791, 7, 135, 2, 2, 790, 792, 5, 122, 62, 2, 791, 790, 3, 2, 2, 2, 791, 792, 3, 2, 2, 2, 792, 793, 3, 2, 2, 2, 793, 794, 7, 155, 2, 2, 794, 796, 3, 2, 2, 2, 795, 739, 3, 2, 2, 2, 795, 740, 3, 2, 2, 2, 795, 758, 3, 2, 2, 2, 795, 773, 3, 2, 2, 2, 795, 788, 3, 2, 2, 2, 796, 121, 3, 2, 2, 2, 797, 802, 5, 124, 63, 2, 798, 799, 7, 121, 2, 2, 799, 801, 5, 124, 63, 2, 800, 798, 3, 2, 2, 2, 801, 804, 3, 2, 2, 2, 802, 800, 3, 2, 2, 2, 802, 803, 3, 2, 2, 2, 803, 806, 3, 2, 2, 2, 804, 802, 3, 2, 2, 2, 805, 807, 7, 121, 2, 2, 806, 805, 3, 2, 2, 2, 806, 807, 3, 2, 2, 2, 807, 123, 3, 2, 2, 2, 808, 809, 8, 63, 1, 2, 809, 811, 7, 14, 2, 2, 810, 812, 5, 124, 63, 2, 811, 810, 3, 2, 2, 2, 811, 812, 3, 2, 2, 2, 812, 818, 3, 2, 2, 2, 813, 814, 7, 103, 2, 2, 814, 815, 5, 124, 63, 2, 815, 816, 7, 88, 2, 2, 816, 817, 5, 124, 63, 2, 817, 819, 3, 2, 2, 2, 818, 813, 3, 2, 2, 2, 819, 820, 3, 2, 2, 2, 820, 818, 3, 2, 2, 2, 820, 821, 3, 2, 2, 2, 821, 824, 3, 2, 2, 2, 822, 823, 7, 27, 2, 2, 823, 825, 5, 124, 63, 2, 824, 822, 3, 2, 2, 2, 824, 825, 3, 2, 2, 2, 825, 826, 3, 2, 2, 2, 826, 827, 7, 28, 2, 2, 827, 961, 3, 2, 2, 2, 828, 829, 7, 15, 2, 2, 829, 830, 7, 135, 2, 2, 830, 831, 5, 124, 63, 2, 831, 832, 7, 8, 2, 2, 832, 833, 5, 120, 61, 2, 833, 834, 7, 155, 2, 2, 834, 961, 3, 2, 2, 2, 835, 836, 7, 22, 2, 2, 836, 961, 7, 115, 2, 2, 837, 838, 7, 50, 2, 2, 838, 961, 7, 115, 2, 2, 839, 840, 7, 50, 2, 2, 840, 841, 5, 124, 63, 2, 841, 842, 5, 158, 80, 2, 842, 961, 3, 2, 2, 2, 843, 844, 7, 87, 2, 2, 844, 845, 7, 135, 2, 2, 845, 846, 5, 124, 63, 2, 846, 847, 7, 37, 2, 2, 847, 850, 5, 124, 63, 2, 848, 849, 7, 36, 2, 2, 849, 851, 5, 124, 63, 2, 850, 848, 3, 2, 2, 2, 850, 851, 3, 2, 2, 2, 851, 852, 3, 2, 2, 2, 852, 853, 7, 155, 2, 2, 853, 961, 3, 2, 2, 2, 854, 855, 7, 91, 2, 2, 855, 961, 7, 115, 2, 2, 856, 857, 7, 96, 2, 2, 857, 858, 7, 135, 2, 2, 858, 859, 9, 13, 2, 2, 859, 860, 5, 172, 87, 2, 860, 861, 7, 37, 2, 2, 861, 862, 5, 124, 63, 2, 862, 863, 7, 155, 2, 2, 863, 961, 3, 2, 2, 2, 864, 865, 5, 166, 84, 2, 865, 867, 7, 135, 2, 2, 866, 868, 5, 122, 62, 2, 867, 866, 3, 2, 2, 2, 867, 868, 3, 2, 2, 2, 868, 869, 3, 2, 2, 2, 869, 870, 7, 155, 2, 2, 870, 879, 3, 2, 2, 2, 871, 873, 7, 135, 2, 2, 872, 874, 7, 26, 2, 2, 873, 872, 3, 2, 2, 2, 873, 874, 3, 2, 2, 2, 874, 876, 3, 2, 2, 2, 875, 877, 5, 122, 62, 2, 876, 875, 3, 2, 2, 2, 876, 877, 3, 2, 2, 2, 877, 878, 3, 2, 2, 2, 878, 880, 7, 155, 2, 2, 879, 871, 3, 2, 2, 2, 879, 880, 3, 2, 2, 2, 880, 881, 3, 2, 2, 2, 881, 882, 7, 71, 2, 2, 882, 883, 7, 135, 2, 2, 883, 884, 5, 106, 54, 2, 884, 885, 7, 155, 2, 2, 885, 961, 3, 2, 2, 2, 886, 887, 5, 166, 84, 2, 887, 889, 7, 135, 2, 2, 888, 890, 5, 122, 62, 2, 889, 888, 3, 2, 2, 2, 889, 890, 3, 2, 2, 2, 890, 891, 3, 2, 2, 2, 891, 892, 7, 155, 2, 2, 892, 901, 3, 2, 2, 2, 893, 895, 7, 135, 2, 2, 894, 896, 7, 26, 2, 2, 895, 894, 3, 2, 2, 2, 895, 896, 3, 2, 2, 2, 896, 898, 3, 2, 2, 2, 897, 899, 5, 122, 62, 2, 898, 897, 3, 2, 2, 2, 898, 899, 3, 2, 2, 2, 899, 900, 3, 2, 2, 2, 900, 902, 7, 155, 2, 2, 901, 893, 3, 2, 2, 2, 901, 902, 3, 2, 2, 2, 902, 903, 3, 2, 2, 2, 903, 904, 7, 71, 2, 2, 904, 905, 5, 166, 84, 2, 905, 961, 3, 2, 2, 2, 906, 912, 5, 166, 84, 2, 907, 909, 7, 135, 2, 2, 908, 910, 5, 122, 62, 2, 909, 908, 3, 2, 2, 2, 909, 910, 3, 2, 2, 2, 910, 911, 3, 2, 2, 2, 911, 913, 7, 155, 2, 2, 912, 907, 3, 2, 2, 2, 912, 913, 3, 2, 2, 2, 913, 914, 3, 2, 2, 2, 914, 916, 7, 135, 2, 2, 915, 917, 7, 26, 2, 2, 916, 915, 3, 2, 2, 2, 916, 917, 3, 2, 2, 2, 917, 919, 3, 2, 2, 2, 918, 920, 5, 122, 62, 2, 919, 918, 3, 2, 2, 2, 919, 920, 3, 2, 2, 2, 920, 921, 3, 2, 2, 2, 921, 922, 7, 155, 2, 2, 922, 961, 3, 2, 2, 2, 923, 961, 5, 130, 66, 2, 924, 961, 5, 174, 88, 2, 925, 961, 5, 156, 79, 2, 926, 927, 7, 123, 2, 2, 927, 961, 5, 124, 63, 22, 928, 929, 7, 63, 2, 2, 929, 961, 5, 124, 63, 16, 930, 931, 5, 146, 74, 2, 931, 932, 7, 125, 2, 2, 932, 934, 3, 2, 2, 2, 933, 930, 3, 2, 2, 2, 933, 934, 3, 2, 2, 2, 934, 935, 3, 2, 2, 2, 935, 961, 7, 117, 2, 2, 936, 937, 7, 135, 2, 2, 937, 938, 5, 50, 26, 2, 938, 939, 7, 155, 2, 2, 939, 961, 3, 2, 2, 2, 940, 941, 7, 135, 2, 2, 941, 942, 5, 124, 63, 2, 942, 943, 7, 155, 2, 2, 943, 961, 3, 2, 2, 2, 944, 945, 7, 135, 2, 2, 945, 946, 5, 122, 62, 2, 946, 947, 7, 155, 2, 2, 947, 961, 3, 2, 2, 2, 948, 950, 7, 134, 2, 2, 949, 951, 5, 122, 62, 2, 950, 949, 3, 2, 2, 2, 950, 951, 3, 2, 2, 2, 951, 952, 3, 2, 2, 2, 952, 961, 7, 154, 2, 2, 953, 955, 7, 133, 2, 2, 954, 956, 5, 42, 22, 2, 955, 954, 3, 2, 2, 2, 955, 956, 3, 2, 2, 2, 956, 957, 3, 2, 2, 2, 957, 961, 7, 153, 2, 2, 958, 961, 5, 126, 64, 2, 959, 961, 5, 138, 70, 2, 960, 808, 3, 2, 2, 2, 960, 828, 3, 2, 2, 2, 960, 835, 3, 2, 2, 2, 960, 837, 3, 2, 2, 2, 960, 839, 3, 2, 2, 2, 960, 843, 3, 2, 2, 2, 960, 854, 3, 2, 2, 2, 960, 856, 3, 2, 2, 2, 960, 864, 3, 2, 2, 2, 960, 886, 3, 2, 2, 2, 960, 906, 3, 2, 2, 2, 960, 923, 3, 2, 2, 2, 960, 924, 3, 2, 2, 2, 960, 925, 3, 2, 2, 2, 960, 926, 3, 2, 2, 2, 960, 928, 3, 2, 2, 2, 960, 933, 3, 2, 2, 2, 960, 936, 3, 2, 2, 2, 960, 940, 3, 2, 2, 2, 960, 944, 3, 2, 2, 2, 960, 948, 3, 2, 2, 2, 960, 953, 3, 2, 2, 2, 960, 958, 3, 2, 2, 2, 960, 959, 3, 2, 2, 2, 961, 1077, 3, 2, 2, 2, 962, 966, 12, 21, 2, 2, 963, 967, 7, 117, 2, 2, 964, 967, 7, 157, 2, 2, 965, 967, 7, 144, 2, 2, 966, 963, 3, 2, 2, 2, 966, 964, 3, 2, 2, 2, 966, 965, 3, 2, 2, 2, 967, 968, 3, 2, 2, 2, 968, 1076, 5, 124, 63, 22, 969, 973, 12, 20, 2, 2, 970, 974, 7, 145, 2, 2, 971, 974, 7, 123, 2, 2, 972, 974, 7, 122, 2, 2, 973, 970, 3, 2, 2, 2, 973, 971, 3, 2, 2, 2, 973, 972, 3, 2, 2, 2, 974, 975, 3, 2, 2, 2, 975, 1076, 5, 124, 63, 21, 976, 1001, 12, 19, 2, 2, 977, 1002, 7, 126, 2, 2, 978, 1002, 7, 127, 2, 2, 979, 1002, 7, 139, 2, 2, 980, 1002, 7, 136, 2, 2, 981, 1002, 7, 137, 2, 2, 982, 1002, 7, 128, 2, 2, 983, 1002, 7, 129, 2, 2, 984, 986, 7, 63, 2, 2, 985, 984, 3, 2, 2, 2, 985, 986, 3, 2, 2, 2, 986, 987, 3, 2, 2, 2, 987, 989, 7, 46, 2, 2, 988, 990, 7, 17, 2, 2, 989, 988, 3, 2, 2, 2, 989, 990, 3, 2, 2, 2, 990, 1002, 3, 2, 2, 2, 991, 993, 7, 63, 2, 2, 992, 991, 3, 2, 2, 2, 992, 993, 3, 2, 2, 2, 993, 994, 3, 2, 2, 2, 994, 1002, 9, 14, 2, 2, 995, 1002, 7, 151, 2, 2, 996, 1002, 7, 152, 2, 2, 997, 1002, 7, 141, 2, 2, 998, 1002, 7, 131, 2, 2, 999, 1002, 7, 132, 2, 2, 1000, 1002, 7, 140, 2, 2, 1001, 977, 3, 2, 2, 2, 1001, 978, 3, 2, 2, 2, 1001, 979, 3, 2, 2, 2, 1001, 980, 3, 2, 2, 2, 1001, 981, 3, 2, 2, 2, 1001, 982, 3, 2, 2, 2, 1001, 983, 3, 2, 2, 2, 1001, 985, 3, 2, 2, 2, 1001, 992, 3, 2, 2, 2, 1001, 995, 3, 2, 2, 2, 1001, 996, 3, 2, 2, 2, 1001, 997, 3, 2, 2, 2, 1001, 998, 3, 2, 2, 2, 1001, 999, 3, 2, 2, 2, 1001, 1000, 3, 2, 2, 2, 1002, 1003, 3, 2, 2, 2, 1003, 1076, 5, 124, 63, 20, 1004, 1005, 12, 17, 2, 2, 1005, 1006, 7, 143, 2, 2, 1006, 1076, 5, 124, 63, 18, 1007, 1008, 12, 15, 2, 2, 1008, 1009, 7, 4, 2, 2, 1009, 1076, 5, 124, 63, 16, 1010, 1011, 12, 14, 2, 2, 1011, 1012, 7, 68, 2, 2, 1012, 1076, 5, 124, 63, 15, 1013, 1015, 12, 13, 2, 2, 1014, 1016, 7, 63, 2, 2, 1015, 1014, 3, 2, 2, 2, 1015, 1016, 3, 2, 2, 2, 1016, 1017, 3, 2, 2, 2, 1017, 1018, 7, 11, 2, 2, 1018, 1019, 5, 124, 63, 2, 1019, 1020, 7, 4, 2, 2, 1020, 1021, 5, 124, 63, 14, 1021, 1076, 3, 2, 2, 2, 1022, 1023, 12, 12, 2, 2, 1023, 1024, 7, 146, 2, 2, 1024, 1025, 5, 124, 63, 2, 1025, 1026, 7, 120, 2, 2, 1026, 1027, 5, 124, 63, 12, 1027, 1076, 3, 2, 2, 2, 1028, 1029, 12, 33, 2, 2, 1029, 1030, 7, 135, 2, 2, 1030, 1031, 5, 50, 26, 2, 1031, 1032, 7, 155, 2, 2, 1032, 1076, 3, 2, 2, 2, 1033, 1034, 12, 32, 2, 2, 1034, 1036, 7, 135, 2, 2, 1035, 1037, 5, 122, 62, 2, 1036, 1035, 3, 2, 2, 2, 1036, 1037, 3, 2, 2, 2, 1037, 1038, 3, 2, 2, 2, 1038, 1076, 7, 155, 2, 2, 1039, 1040, 12, 28, 2, 2, 1040, 1041, 7, 134, 2, 2, 1041, 1042, 5, 124, 63, 2, 1042, 1043, 7, 154, 2, 2, 1043, 1076, 3, 2, 2, 2, 1044, 1045, 12, 27, 2, 2, 1045, 1046, 7, 125, 2, 2, 1046, 1076, 7, 113, 2, 2, 1047, 1048, 12, 26, 2, 2, 1048, 1049, 7, 125, 2, 2, 1049, 1076, 5, 166, 84, 2, 1050, 1051, 12, 25, 2, 2, 1051, 1052, 7, 142, 2, 2, 1052, 1053, 7, 134, 2, 2, 1053, 1054, 5, 124, 63, 2, 1054, 1055, 7, 154, 2, 2, 1055, 1076, 3, 2, 2, 2, 1056, 1057, 12, 24, 2, 2, 1057, 1058, 7, 142, 2, 2, 1058, 1076, 7, 113, 2, 2, 1059, 1060, 12, 23, 2, 2, 1060, 1061, 7, 142, 2, 2, 1061, 1076, 5, 166, 84, 2, 1062, 1063, 12, 18, 2, 2, 1063, 1065, 7, 51, 2, 2, 1064, 1066, 7, 63, 2, 2, 1065, 1064, 3, 2, 2, 2, 1065, 1066, 3, 2, 2, 2, 1066, 1067, 3, 2, 2, 2, 1067, 1076, 7, 64, 2, 2, 1068, 1073, 12, 11, 2, 2, 1069, 1070, 7, 8, 2, 2, 1070, 1074, 5, 166, 84, 2, 1071, 1072, 7, 8, 2, 2, 1072, 1074, 7, 115, 2, 2, 1073, 1069, 3, 2, 2, 2, 1073, 1071, 3, 2, 2, 2, 1074, 1076, 3, 2, 2, 2, 1075, 962, 3, 2, 2, 2, 1075, 969, 3, 2, 2, 2, 1075, 976, 3, 2, 2, 2, 1075, 1004, 3, 2, 2, 2, 1075, 1007, 3, 2, 2, 2, 1075, 1010, 3, 2, 2, 2, 1075, 1013, 3, 2, 2, 2, 1075, 1022, 3, 2, 2, 2, 1075, 1028, 3, 2, 2, 2, 1075, 1033, 3, 2, 2, 2, 1075, 1039, 3, 2, 2, 2, 1075, 1044, 3, 2, 2, 2, 1075, 1047, 3, 2, 2, 2, 1075, 1050, 3, 2, 2, 2, 1075, 1056, 3, 2, 2, 2, 1075, 1059, 3, 2, 2, 2, 1075, 1062, 3, 2, 2, 2, 1075, 1068, 3, 2, 2, 2, 1076, 1079, 3, 2, 2, 2, 1077, 1075, 3, 2, 2, 2, 1077, 1078, 3, 2, 2, 2, 1078, 125, 3, 2, 2, 2, 1079, 1077, 3, 2, 2, 2, 1080, 1081, 7, 135, 2, 2, 1081, 1086, 5, 166, 84, 2, 1082, 1083, 7, 121, 2, 2, 1083, 1085, 5, 166, 84, 2, 1084, 1082, 3, 2, 2, 2, 1085, 1088, 3, 2, 2, 2, 1086, 1084, 3, 2, 2, 2, 1086, 1087, 3, 2, 2, 2, 1087, 1090, 3, 2, 2, 2, 1088, 1086, 3, 2, 2, 2, 1089, 1091, 7, 121, 2, 2, 1090, 1089, 3, 2, 2, 2, 1090, 1091, 3, 2, 2, 2, 1091, 1092, 3, 2, 2, 2, 1092, 1093, 7, 155, 2, 2, 1093, 1108, 3, 2, 2, 2, 1094, 1099, 5, 166, 84, 2, 1095, 1096, 7, 121, 2, 2, 1096, 1098, 5, 166, 84, 2, 1097, 1095, 3, 2, 2, 2, 1098, 1101, 3, 2, 2, 2, 1099, 1097, 3, 2, 2, 2, 1099, 1100, 3, 2, 2, 2, 1100, 1103, 3, 2, 2, 2, 1101, 1099, 3, 2, 2, 2, 1102, 1104, 7, 121, 2, 2, 1103, 1102, 3, 2, 2, 2, 1103, 1104, 3, 2, 2, 2, 1104, 1108, 3, 2, 2, 2, 1105, 1106, 7, 135, 2, 2, 1106, 1108, 7, 155, 2, 2, 1107, 1080, 3, 2, 2, 2, 1107, 1094, 3, 2, 2, 2, 1107, 1105, 3, 2, 2, 2, 1108, 1109, 3, 2, 2, 2, 1109, 1112, 7, 116, 2, 2, 1110, 1113, 5, 124, 63, 2, 1111, 1113, 5, 38, 20, 2, 1112, 1110, 3, 2, 2, 2, 1112, 1111, 3, 2, 2, 2, 1113, 127, 3, 2, 2, 2, 1114, 1121, 5, 130, 66, 2, 1115, 1121, 7, 169, 2, 2, 1116, 1117, 7, 133, 2, 2, 1117, 1118, 5, 124, 63, 2, 1118, 1119, 7, 153, 2, 2, 1119, 1121, 3, 2, 2, 2, 1120, 1114, 3, 2, 2, 2, 1120, 1115, 3, 2, 2, 2, 1120, 1116, 3, 2, 2, 2, 1121, 129, 3, 2, 2, 2, 1122, 1123, 7, 137, 2, 2, 1123, 1127, 5, 166, 84, 2, 1124, 1126, 5, 132, 67, 2, 1125, 1124, 3, 2, 2, 2, 1126, 1129, 3, 2, 2, 2, 1127, 1125, 3, 2, 2, 2, 1127, 1128, 3, 2, 2, 2, 1128, 1130, 3, 2, 2, 2, 1129, 1127, 3, 2, 2, 2, 1130, 1131, 7, 158, 2, 2, 1131, 1152, 3, 2, 2, 2, 1132, 1133, 7, 137, 2, 2, 1133, 1137, 5, 166, 84, 2, 1134, 1136, 5, 132, 67, 2, 1135, 1134, 3, 2, 2, 2, 1136, 1139, 3, 2, 2, 2, 1137, 1135, 3, 2, 2, 2, 1137, 1138, 3, 2, 2, 2, 1138, 1140, 3, 2, 2, 2, 1139, 1137, 3, 2, 2, 2, 1140, 1144, 7, 129, 2, 2, 1141, 1143, 5, 128, 65, 2, 1142, 1141, 3, 2, 2, 2, 1143, 1146, 3, 2, 2, 2, 1144, 1142, 3, 2, 2, 2, 1144, 1145, 3, 2, 2, 2, 1145, 1147, 3, 2, 2, 2, 1146, 1144, 3, 2, 2, 2, 1147, 1148, 7, 138, 2, 2, 1148, 1149, 5, 166, 84, 2, 1149, 1150, 7, 129, 2, 2, 1150, 1152, 3, 2, 2, 2, 1151, 1122, 3, 2, 2, 2, 1151, 1132, 3, 2, 2, 2, 1152, 131, 3, 2, 2, 2, 1153, 1154, 5, 166, 84, 2, 1154, 1155, 7, 127, 2, 2, 1155, 1156, 5, 172, 87, 2, 1156, 1165, 3, 2, 2, 2, 1157, 1158, 5, 166, 84, 2, 1158, 1159, 7, 127, 2, 2, 1159, 1160, 7, 133, 2, 2, 1160, 1161, 5, 124, 63, 2, 1161, 1162, 7, 153, 2, 2, 1162, 1165, 3, 2, 2, 2, 1163, 1165, 5, 166, 84, 2, 1164, 1153, 3, 2, 2, 2, 1164, 1157, 3, 2, 2, 2, 1164, 1163, 3, 2, 2, 2, 1165, 133, 3, 2, 2, 2, 1166, 1171, 5, 136, 69, 2, 1167, 1168, 7, 121, 2, 2, 1168, 1170, 5, 136, 69, 2, 1169, 1167, 3, 2, 2, 2, 1170, 1173, 3, 2, 2, 2, 1171, 1169, 3, 2, 2, 2, 1171, 1172, 3, 2, 2, 2, 1172, 1175, 3, 2, 2, 2, 1173, 1171, 3, 2, 2, 2, 1174, 1176, 7, 121, 2, 2, 1175, 1174, 3, 2, 2, 2, 1175, 1176, 3, 2, 2, 2, 1176, 135, 3, 2, 2, 2, 1177, 1178, 5, 166, 84, 2, 1178, 1179, 7, 8, 2, 2, 1179, 1180, 7, 135, 2, 2, 1180, 1181, 5, 50, 26, 2, 1181, 1182, 7, 155, 2, 2, 1182, 1188, 3, 2, 2, 2, 1183, 1184, 5, 124, 63, 2, 1184, 1185, 7, 8, 2, 2, 1185, 1186, 5, 166, 84, 2, 1186, 1188, 3, 2, 2, 2, 1187, 1177, 3, 2, 2, 2, 1187, 1183, 3, 2, 2, 2, 1188, 137, 3, 2, 2, 2, 1189, 1197, 5, 170, 86, 2, 1190, 1191, 5, 146, 74, 2, 1191, 1192, 7, 125, 2, 2, 1192, 1194, 3, 2, 2, 2, 1193, 1190, 3, 2, 2, 2, 1193, 1194, 3, 2, 2, 2, 1194, 1195, 3, 2, 2, 2, 1195, 1197, 5, 140, 71, 2, 1196, 1189, 3, 2, 2, 2, 1196, 1193, 3, 2, 2, 2, 1197, 139, 3, 2, 2, 2, 1198, 1203, 5, 166, 84, 2, 1199, 1200, 7, 125, 2, 2, 1200, 1202, 5, 166, 84, 2, 1201, 1199, 3, 2, 2, 2, 1202, 1205, 3, 2, 2, 2, 1203, 1201, 3, 2, 2, 2, 1203, 1204, 3, 2, 2, 2, 1204, 141, 3, 2, 2, 2, 1205, 1203, 3, 2, 2, 2, 1206, 1207, 8, 72, 1, 2, 1207, 1216, 5, 146, 74, 2, 1208, 1216, 5, 144, 73, 2, 1209, 1210, 7, 135, 2, 2, 1210, 1211, 5, 50, 26, 2, 1211, 1212, 7, 155, 2, 2, 1212, 1216, 3, 2, 2, 2, 1213, 1216, 5, 130, 66, 2, 1214, 1216, 5, 170, 86, 2, 1215, 1206, 3, 2, 2, 2, 1215, 1208, 3, 2, 2, 2, 1215, 1209, 3, 2, 2, 2, 1215, 1213, 3, 2, 2, 2, 1215, 1214, 3, 2, 2, 2, 1216, 1225, 3, 2, 2, 2, 1217, 1221, 12, 5, 2, 2, 1218, 1222, 5, 164, 83, 2, 1219, 1220, 7, 8, 2, 2, 1220, 1222, 5, 166, 84, 2, 1221, 1218, 3, 2, 2, 2, 1221, 1219, 3, 2, 2, 2, 1222, 1224, 3, 2, 2, 2, 1223, 1217, 3, 2, 2, 2, 1224, 1227, 3, 2, 2, 2, 1225, 1223, 3, 2, 2, 2, 1225, 1226, 3, 2, 2, 2, 1226, 143, 3, 2, 2, 2, 1227, 1225, 3, 2, 2, 2, 1228, 1229, 5, 166, 84, 2, 1229, 1231, 7, 135, 2, 2, 1230, 1232, 5, 148, 75, 2, 1231, 1230, 3, 2, 2, 2, 1231, 1232, 3, 2, 2, 2, 1232, 1233, 3, 2, 2, 2, 1233, 1234, 7, 155, 2, 2, 1234, 145, 3, 2, 2, 2, 1235, 1236, 5, 150, 76, 2, 1236, 1237, 7, 125, 2, 2, 1237, 1239, 3, 2, 2, 2, 1238, 1235, 3, 2, 2, 2, 1238, 1239, 3, 2, 2, 2, 1239, 1240, 3, 2, 2, 2, 1240, 1241, 5, 140, 71, 2, 1241, 147, 3, 2, 2, 2, 1242, 1247, 5, 124, 63, 2, 1243, 1244, 7, 121, 2, 2, 1244, 1246, 5, 124, 63, 2, 1245, 1243, 3, 2, 2, 2, 1246, 1249, 3, 2, 2, 2, 1247, 1245, 3, 2, 2, 2, 1247, 1248, 3, 2, 2, 2, 1248, 1251, 3, 2, 2, 2, 1249, 1247, 3, 2, 2, 2, 1250, 1252, 7, 121, 2, 2, 1251, 1250, 3, 2, 2, 2, 1251, 1252, 3, 2, 2, 2, 1252, 149, 3, 2, 2, 2, 1253, 1254, 5, 166, 84, 2, 1254, 151, 3, 2, 2, 2, 1255, 1264, 7, 111, 2, 2, 1256, 1257, 7, 125, 2, 2, 1257, 1264, 9, 15, 2, 2, 1258, 1259, 7, 113, 2, 2, 1259, 1261, 7, 125, 2, 2, 1260, 1262, 9, 15, 2, 2, 1261, 1260, 3, 2, 2, 2, 1261, 1262, 3, 2, 2, 2, 1262, 1264, 3, 2, 2, 2, 1263, 1255, 3, 2, 2, 2, 1263, 1256, 3, 2, 2, 2, 1263, 1258, 3, 2, 2, 2, 1264, 153, 3, 2, 2, 2, 1265, 1267, 9, 16, 2, 2, 1266, 1265, 3, 2, 2, 2, 1266, 1267, 3, 2, 2, 2, 1267, 1274, 3, 2, 2, 2, 1268, 1275, 5, 152, 77, 2, 1269, 1275, 7, 112, 2, 2, 1270, 1275, 7, 113, 2, 2, 1271, 1275, 7, 114, 2, 2, 1272, 1275, 7, 47, 2, 2, 1273, 1275, 7, 62, 2, 2, 1274, 1268, 3, 2, 2, 2, 1274, 1269, 3, 2, 2, 2, 1274, 1270, 3, 2, 2, 2, 1274, 1271, 3, 2, 2, 2, 1274, 1272, 3, 2, 2, 2, 1274, 1273, 3, 2, 2, 2, 1275, 155, 3, 2, 2, 2, 1276, 1280, 5, 154, 78, 2, 1277, 1280, 7, 115, 2, 2, 1278, 1280, 7, 64, 2, 2, 1279, 1276, 3, 2, 2, 2, 1279, 1277, 3, 2, 2, 2, 1279, 1278, 3, 2, 2, 2, 1280, 157, 3, 2, 2, 2, 1281, 1282, 9, 17, 2, 2, 1282, 159, 3, 2, 2, 2, 1283, 1284, 9, 18, 2, 2, 1284, 161, 3, 2, 2, 2, 1285, 1286, 9, 19, 2, 2, 1286, 163, 3, 2, 2, 2, 1287, 1290, 7, 110, 2, 2, 1288, 1290, 5, 162, 82, 2, 1289, 1287, 3, 2, 2, 2, 1289, 1288, 3, 2, 2, 2, 1290, 165, 3, 2, 2, 2, 1291, 1295, 7, 110, 2, 2, 1292, 1295, 5, 158, 80, 2, 1293, 1295, 5, 160, 81, 2, 1294, 1291, 3, 2, 2, 2, 1294, 1292, 3, 2, 2, 2, 1294, 1293, 3, 2, 2, 2, 1295, 167, 3, 2, 2, 2, 1296, 1297, 5, 172, 87, 2, 1297, 1298, 7, 127, 2, 2, 1298, 1299, 5, 154, 78, 2, 1299, 169, 3, 2, 2, 2, 1300, 1301, 7, 133, 2, 2, 1301, 1302, 5, 124, 63, 2, 1302, 1303, 7, 153, 2, 2, 1303, 171, 3, 2, 2, 2, 1304, 1307, 7, 115, 2, 2, 1305, 1307, 5, 174, 88, 2, 1306, 1304, 3, 2, 2, 2, 1306, 1305, 3, 2, 2, 2, 1307, 173, 3, 2, 2, 2, 1308, 1312, 7, 148, 2, 2, 1309, 1311, 5, 176, 89, 2, 1310, 1309, 3, 2, 2, 2, 1311, 1314, 3, 2, 2, 2, 1312, 1310, 3, 2, 2, 2, 1312, 1313, 3, 2, 2, 2, 1313, 1315, 3, 2, 2, 2, 1314, 1312, 3, 2, 2, 2, 1315, 1316, 7, 150, 2, 2, 1316, 175, 3, 2, 2, 2, 1317, 1318, 7, 164, 2, 2, 1318, 1319, 5, 124, 63, 2, 1319, 1320, 7, 153, 2, 2, 1320, 1323, 3, 2, 2, 2, 1321, 1323, 7, 163, 2, 2, 1322, 1317, 3, 2, 2, 2, 1322, 1321, 3, 2, 2, 2, 1323, 177, 3, 2, 2, 2, 1324, 1328, 7, 149, 2, 2, 1325, 1327, 5, 180, 91, 2, 1326, 1325, 3, 2, 2, 2, 1327, 1330, 3, 2, 2, 2, 1328, 1326, 3, 2, 2, 2, 1328, 1329, 3, 2, 2, 2, 1329, 1331, 3, 2, 2, 2, 1330, 1328, 3, 2, 2, 2, 1331, 1332, 7, 2, 2, 3, 1332, 179, 3, 2, 2, 2, 1333, 1334, 7, 166, 2, 2, 1334, 1335, 5, 124, 63, 2, 1335, 1336, 7, 153, 2, 2, 1336, 1339, 3, 2, 2, 2, 1337, 1339, 7, 165, 2, 2, 1338, 1333, 3, 2, 2, 2, 1338, 1337, 3, 2, 2, 2, 1339, 181, 3, 2, 2, 2, 173, 185, 192, 201, 208, 212, 226, 230, 233, 237, 240, 247, 251, 260, 265, 274, 282, 289, 293, 299, 304, 312, 319, 325, 337, 345, 359, 363, 368, 371, 381, 391, 399, 403, 407, 410, 414, 417, 420, 423, 426, 430, 434, 437, 440, 443, 446, 450, 453, 462, 468, 489, 506, 528, 532, 538, 543, 554, 557, 563, 571, 577, 579, 583, 588, 591, 594, 598, 602, 605, 607, 610, 614, 618, 621, 623, 625, 630, 641, 647, 652, 659, 664, 668, 672, 678, 680, 687, 695, 698, 701, 720, 734, 750, 754, 765, 769, 780, 784, 791, 795, 802, 806, 811, 820, 824, 850, 867, 873, 876, 879, 889, 895, 898, 901, 909, 912, 916, 919, 933, 950, 955, 960, 966, 973, 985, 989, 992, 1001, 1015, 1036, 1065, 1073, 1075, 1077, 1086, 1090, 1099, 1103, 1107, 1112, 1120, 1127, 1137, 1144, 1151, 1164, 1171, 1175, 1187, 1193, 1196, 1203, 1215, 1221, 1225, 1231, 1238, 1247, 1251, 1261, 1263, 1266, 1274, 1279, 1289, 1294, 1306, 1312, 1322, 1328, 1338]
\ No newline at end of file
diff --git a/internal-packages/tsql/src/grammar/TSQLParser.tokens b/internal-packages/tsql/src/grammar/TSQLParser.tokens
new file mode 100644
index 00000000000..f94f7b27168
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLParser.tokens
@@ -0,0 +1,208 @@
+ALL=1
+AND=2
+ANTI=3
+ANY=4
+ARRAY=5
+AS=6
+ASCENDING=7
+ASOF=8
+BETWEEN=9
+BOTH=10
+BY=11
+CASE=12
+CAST=13
+CATCH=14
+COHORT=15
+COLLATE=16
+CROSS=17
+CUBE=18
+CURRENT=19
+DATE=20
+DAY=21
+DESC=22
+DESCENDING=23
+DISTINCT=24
+ELSE=25
+END=26
+EXCEPT=27
+EXTRACT=28
+FINAL=29
+FINALLY=30
+FIRST=31
+FN=32
+FOLLOWING=33
+FOR=34
+FROM=35
+FULL=36
+FUN=37
+GROUP=38
+HAVING=39
+HOUR=40
+ID=41
+IF=42
+ILIKE=43
+IN=44
+INF=45
+INNER=46
+INTERSECT=47
+INTERVAL=48
+IS=49
+JOIN=50
+KEY=51
+LAST=52
+LEADING=53
+LEFT=54
+LET=55
+LIKE=56
+LIMIT=57
+MINUTE=58
+MONTH=59
+NAN_SQL=60
+NOT=61
+NULL_SQL=62
+NULLS=63
+OFFSET=64
+ON=65
+OR=66
+ORDER=67
+OUTER=68
+OVER=69
+PARTITION=70
+PRECEDING=71
+PREWHERE=72
+QUARTER=73
+RANGE=74
+RETURN=75
+RIGHT=76
+ROLLUP=77
+ROW=78
+ROWS=79
+SAMPLE=80
+SECOND=81
+SELECT=82
+SEMI=83
+SETTINGS=84
+SUBSTRING=85
+THEN=86
+THROW=87
+TIES=88
+TIMESTAMP=89
+TO=90
+TOP=91
+TOTALS=92
+TRAILING=93
+TRIM=94
+TRUNCATE=95
+TRY=96
+UNBOUNDED=97
+UNION=98
+USING=99
+WEEK=100
+WHEN=101
+WHERE=102
+WHILE=103
+WINDOW=104
+WITH=105
+YEAR=106
+ESCAPE_CHAR_COMMON=107
+IDENTIFIER=108
+FLOATING_LITERAL=109
+OCTAL_LITERAL=110
+DECIMAL_LITERAL=111
+HEXADECIMAL_LITERAL=112
+STRING_LITERAL=113
+ARROW=114
+ASTERISK=115
+BACKQUOTE=116
+BACKSLASH=117
+COLON=118
+COMMA=119
+CONCAT=120
+DASH=121
+DOLLAR=122
+DOT=123
+EQ_DOUBLE=124
+EQ_SINGLE=125
+GT_EQ=126
+GT=127
+HASH=128
+IREGEX_SINGLE=129
+IREGEX_DOUBLE=130
+LBRACE=131
+LBRACKET=132
+LPAREN=133
+LT_EQ=134
+LT=135
+LT_SLASH=136
+NOT_EQ=137
+NOT_IREGEX=138
+NOT_REGEX=139
+NULL_PROPERTY=140
+NULLISH=141
+PERCENT=142
+PLUS=143
+QUERY=144
+QUOTE_DOUBLE=145
+QUOTE_SINGLE_TEMPLATE=146
+QUOTE_SINGLE_TEMPLATE_FULL=147
+QUOTE_SINGLE=148
+REGEX_SINGLE=149
+REGEX_DOUBLE=150
+RBRACE=151
+RBRACKET=152
+RPAREN=153
+SEMICOLON=154
+SLASH=155
+SLASH_GT=156
+UNDERSCORE=157
+MULTI_LINE_COMMENT=158
+SINGLE_LINE_COMMENT=159
+WHITESPACE=160
+STRING_TEXT=161
+STRING_ESCAPE_TRIGGER=162
+FULL_STRING_TEXT=163
+FULL_STRING_ESCAPE_TRIGGER=164
+TAG_WS=165
+TAGC_WS=166
+TSQLX_TEXT_TEXT=167
+TSQLX_TEXT_WS=168
+'->'=114
+'*'=115
+'`'=116
+'\\'=117
+':'=118
+','=119
+'||'=120
+'-'=121
+'$'=122
+'.'=123
+'=='=124
+'>='=126
+'#'=128
+'~*'=129
+'=~*'=130
+'{'=131
+'['=132
+'('=133
+'<='=134
+'<'=135
+'</'=136
+'!~*'=138
+'!~'=139
+'?.'=140
+'??'=141
+'%'=142
+'+'=143
+'?'=144
+'"'=145
+'f\''=146
+'F\''=147
+'\''=148
+'~'=149
+'=~'=150
+'}'=151
+']'=152
+')'=153
+';'=154
+'/'=155
+'_'=157
diff --git a/internal-packages/tsql/src/grammar/TSQLParser.ts b/internal-packages/tsql/src/grammar/TSQLParser.ts
new file mode 100644
index 00000000000..4e2b482a53b
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLParser.ts
@@ -0,0 +1,11732 @@
+// Generated from src/grammar/TSQLParser.g4 by ANTLR 4.9.0-SNAPSHOT
+
+
+import { ATN } from "antlr4ts/atn/ATN";
+import { ATNDeserializer } from "antlr4ts/atn/ATNDeserializer";
+import { FailedPredicateException } from "antlr4ts/FailedPredicateException";
+import { NotNull } from "antlr4ts/Decorators";
+import { NoViableAltException } from "antlr4ts/NoViableAltException";
+import { Override } from "antlr4ts/Decorators";
+import { Parser } from "antlr4ts/Parser";
+import { ParserRuleContext } from "antlr4ts/ParserRuleContext";
+import { ParserATNSimulator } from "antlr4ts/atn/ParserATNSimulator";
+import { ParseTreeListener } from "antlr4ts/tree/ParseTreeListener";
+import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
+import { RecognitionException } from "antlr4ts/RecognitionException";
+import { RuleContext } from "antlr4ts/RuleContext";
+//import { RuleVersion } from "antlr4ts/RuleVersion";
+import { TerminalNode } from "antlr4ts/tree/TerminalNode";
+import { Token } from "antlr4ts/Token";
+import { TokenStream } from "antlr4ts/TokenStream";
+import { Vocabulary } from "antlr4ts/Vocabulary";
+import { VocabularyImpl } from "antlr4ts/VocabularyImpl";
+
+import * as Utils from "antlr4ts/misc/Utils";
+
+import { TSQLParserVisitor } from "./TSQLParserVisitor";
+
+
+export class TSQLParser extends Parser {
+	public static readonly ALL = 1;
+	public static readonly AND = 2;
+	public static readonly ANTI = 3;
+	public static readonly ANY = 4;
+	public static readonly ARRAY = 5;
+	public static readonly AS = 6;
+	public static readonly ASCENDING = 7;
+	public static readonly ASOF = 8;
+	public static readonly BETWEEN = 9;
+	public static readonly BOTH = 10;
+	public static readonly BY = 11;
+	public static readonly CASE = 12;
+	public static readonly CAST = 13;
+	public static readonly CATCH = 14;
+	public static readonly COHORT = 15;
+	public static readonly COLLATE = 16;
+	public static readonly CROSS = 17;
+	public static readonly CUBE = 18;
+	public static readonly CURRENT = 19;
+	public static readonly DATE = 20;
+	public static readonly DAY = 21;
+	public static readonly DESC = 22;
+	public static readonly DESCENDING = 23;
+	public static readonly DISTINCT = 24;
+	public static readonly ELSE = 25;
+	public static readonly END = 26;
+	public static readonly EXCEPT = 27;
+	public static readonly EXTRACT = 28;
+	public static readonly FINAL = 29;
+	public static readonly FINALLY = 30;
+	public static readonly FIRST = 31;
+	public static readonly FN = 32;
+	public static readonly FOLLOWING = 33;
+	public static readonly FOR = 34;
+	public static readonly FROM = 35;
+	public static readonly FULL = 36;
+	public static readonly FUN = 37;
+	public static readonly GROUP = 38;
+	public static readonly HAVING = 39;
+	public static readonly HOUR = 40;
+	public static readonly ID = 41;
+	public static readonly IF = 42;
+	public static readonly ILIKE = 43;
+	public static readonly IN = 44;
+	public static readonly INF = 45;
+	public static readonly INNER = 46;
+	public static readonly INTERSECT = 47;
+	public static readonly INTERVAL = 48;
+	public static readonly IS = 49;
+	public static readonly JOIN = 50;
+	public static readonly KEY = 51;
+	public static readonly LAST = 52;
+	public static readonly LEADING = 53;
+	public static readonly LEFT = 54;
+	public static readonly LET = 55;
+	public static readonly LIKE = 56;
+	public static readonly LIMIT = 57;
+	public static readonly MINUTE = 58;
+	public static readonly MONTH = 59;
+	public static readonly NAN_SQL = 60;
+	public static readonly NOT = 61;
+	public static readonly NULL_SQL = 62;
+	public static readonly NULLS = 63;
+	public static readonly OFFSET = 64;
+	public static readonly ON = 65;
+	public static readonly OR = 66;
+	public static readonly ORDER = 67;
+	public static readonly OUTER = 68;
+	public static readonly OVER = 69;
+	public static readonly PARTITION = 70;
+	public static readonly PRECEDING = 71;
+	public static readonly PREWHERE = 72;
+	public static readonly QUARTER = 73;
+	public static readonly RANGE = 74;
+	public static readonly RETURN = 75;
+	public static readonly RIGHT = 76;
+	public static readonly ROLLUP = 77;
+	public static readonly ROW = 78;
+	public static readonly ROWS = 79;
+	public static readonly SAMPLE = 80;
+	public static readonly SECOND = 81;
+	public static readonly SELECT = 82;
+	public static readonly SEMI = 83;
+	public static readonly SETTINGS = 84;
+	public static readonly SUBSTRING = 85;
+	public static readonly THEN = 86;
+	public static readonly THROW = 87;
+	public static readonly TIES = 88;
+	public static readonly TIMESTAMP = 89;
+	public static readonly TO = 90;
+	public static readonly TOP = 91;
+	public static readonly TOTALS = 92;
+	public static readonly TRAILING = 93;
+	public static readonly TRIM = 94;
+	public static readonly TRUNCATE = 95;
+	public static readonly TRY = 96;
+	public static readonly UNBOUNDED = 97;
+	public static readonly UNION = 98;
+	public static readonly USING = 99;
+	public static readonly WEEK = 100;
+	public static readonly WHEN = 101;
+	public static readonly WHERE = 102;
+	public static readonly WHILE = 103;
+	public static readonly WINDOW = 104;
+	public static readonly WITH = 105;
+	public static readonly YEAR = 106;
+	public static readonly ESCAPE_CHAR_COMMON = 107;
+	public static readonly IDENTIFIER = 108;
+	public static readonly FLOATING_LITERAL = 109;
+	public static readonly OCTAL_LITERAL = 110;
+	public static readonly DECIMAL_LITERAL = 111;
+	public static readonly HEXADECIMAL_LITERAL = 112;
+	public static readonly STRING_LITERAL = 113;
+	public static readonly ARROW = 114;
+	public static readonly ASTERISK = 115;
+	public static readonly BACKQUOTE = 116;
+	public static readonly BACKSLASH = 117;
+	public static readonly COLON = 118;
+	public static readonly COMMA = 119;
+	public static readonly CONCAT = 120;
+	public static readonly DASH = 121;
+	public static readonly DOLLAR = 122;
+	public static readonly DOT = 123;
+	public static readonly EQ_DOUBLE = 124;
+	public static readonly EQ_SINGLE = 125;
+	public static readonly GT_EQ = 126;
+	public static readonly GT = 127;
+	public static readonly HASH = 128;
+	public static readonly IREGEX_SINGLE = 129;
+	public static readonly IREGEX_DOUBLE = 130;
+	public static readonly LBRACE = 131;
+	public static readonly LBRACKET = 132;
+	public static readonly LPAREN = 133;
+	public static readonly LT_EQ = 134;
+	public static readonly LT = 135;
+	public static readonly LT_SLASH = 136;
+	public static readonly NOT_EQ = 137;
+	public static readonly NOT_IREGEX = 138;
+	public static readonly NOT_REGEX = 139;
+	public static readonly NULL_PROPERTY = 140;
+	public static readonly NULLISH = 141;
+	public static readonly PERCENT = 142;
+	public static readonly PLUS = 143;
+	public static readonly QUERY = 144;
+	public static readonly QUOTE_DOUBLE = 145;
+	public static readonly QUOTE_SINGLE_TEMPLATE = 146;
+	public static readonly QUOTE_SINGLE_TEMPLATE_FULL = 147;
+	public static readonly QUOTE_SINGLE = 148;
+	public static readonly REGEX_SINGLE = 149;
+	public static readonly REGEX_DOUBLE = 150;
+	public static readonly RBRACE = 151;
+	public static readonly RBRACKET = 152;
+	public static readonly RPAREN = 153;
+	public static readonly SEMICOLON = 154;
+	public static readonly SLASH = 155;
+	public static readonly SLASH_GT = 156;
+	public static readonly UNDERSCORE = 157;
+	public static readonly MULTI_LINE_COMMENT = 158;
+	public static readonly SINGLE_LINE_COMMENT = 159;
+	public static readonly WHITESPACE = 160;
+	public static readonly STRING_TEXT = 161;
+	public static readonly STRING_ESCAPE_TRIGGER = 162;
+	public static readonly FULL_STRING_TEXT = 163;
+	public static readonly FULL_STRING_ESCAPE_TRIGGER = 164;
+	public static readonly TAG_WS = 165;
+	public static readonly TAGC_WS = 166;
+	public static readonly TSQLX_TEXT_TEXT = 167;
+	public static readonly TSQLX_TEXT_WS = 168;
+	public static readonly RULE_program = 0;
+	public static readonly RULE_declaration = 1;
+	public static readonly RULE_expression = 2;
+	public static readonly RULE_varDecl = 3;
+	public static readonly RULE_identifierList = 4;
+	public static readonly RULE_statement = 5;
+	public static readonly RULE_returnStmt = 6;
+	public static readonly RULE_throwStmt = 7;
+	public static readonly RULE_catchBlock = 8;
+	public static readonly RULE_tryCatchStmt = 9;
+	public static readonly RULE_ifStmt = 10;
+	public static readonly RULE_whileStmt = 11;
+	public static readonly RULE_forStmt = 12;
+	public static readonly RULE_forInStmt = 13;
+	public static readonly RULE_funcStmt = 14;
+	public static readonly RULE_varAssignment = 15;
+	public static readonly RULE_exprStmt = 16;
+	public static readonly RULE_emptyStmt = 17;
+	public static readonly RULE_block = 18;
+	public static readonly RULE_kvPair = 19;
+	public static readonly RULE_kvPairList = 20;
+	public static readonly RULE_select = 21;
+	public static readonly RULE_selectStmtWithParens = 22;
+	public static readonly RULE_subsequentSelectSetClause = 23;
+	public static readonly RULE_selectSetStmt = 24;
+	public static readonly RULE_selectStmt = 25;
+	public static readonly RULE_withClause = 26;
+	public static readonly RULE_topClause = 27;
+	public static readonly RULE_fromClause = 28;
+	public static readonly RULE_arrayJoinClause = 29;
+	public static readonly RULE_windowClause = 30;
+	public static readonly RULE_prewhereClause = 31;
+	public static readonly RULE_whereClause = 32;
+	public static readonly RULE_groupByClause = 33;
+	public static readonly RULE_havingClause = 34;
+	public static readonly RULE_orderByClause = 35;
+	public static readonly RULE_projectionOrderByClause = 36;
+	public static readonly RULE_limitByClause = 37;
+	public static readonly RULE_limitAndOffsetClause = 38;
+	public static readonly RULE_offsetOnlyClause = 39;
+	public static readonly RULE_settingsClause = 40;
+	public static readonly RULE_joinExpr = 41;
+	public static readonly RULE_joinOp = 42;
+	public static readonly RULE_joinOpCross = 43;
+	public static readonly RULE_joinConstraintClause = 44;
+	public static readonly RULE_sampleClause = 45;
+	public static readonly RULE_limitExpr = 46;
+	public static readonly RULE_orderExprList = 47;
+	public static readonly RULE_orderExpr = 48;
+	public static readonly RULE_ratioExpr = 49;
+	public static readonly RULE_settingExprList = 50;
+	public static readonly RULE_settingExpr = 51;
+	public static readonly RULE_windowExpr = 52;
+	public static readonly RULE_winPartitionByClause = 53;
+	public static readonly RULE_winOrderByClause = 54;
+	public static readonly RULE_winFrameClause = 55;
+	public static readonly RULE_winFrameExtend = 56;
+	public static readonly RULE_winFrameBound = 57;
+	public static readonly RULE_expr = 58;
+	public static readonly RULE_columnTypeExpr = 59;
+	public static readonly RULE_columnExprList = 60;
+	public static readonly RULE_columnExpr = 61;
+	public static readonly RULE_columnLambdaExpr = 62;
+	public static readonly RULE_tSQLxChildElement = 63;
+	public static readonly RULE_tSQLxTagElement = 64;
+	public static readonly RULE_tSQLxTagAttribute = 65;
+	public static readonly RULE_withExprList = 66;
+	public static readonly RULE_withExpr = 67;
+	public static readonly RULE_columnIdentifier = 68;
+	public static readonly RULE_nestedIdentifier = 69;
+	public static readonly RULE_tableExpr = 70;
+	public static readonly RULE_tableFunctionExpr = 71;
+	public static readonly RULE_tableIdentifier = 72;
+	public static readonly RULE_tableArgList = 73;
+	public static readonly RULE_databaseIdentifier = 74;
+	public static readonly RULE_floatingLiteral = 75;
+	public static readonly RULE_numberLiteral = 76;
+	public static readonly RULE_literal = 77;
+	public static readonly RULE_interval = 78;
+	public static readonly RULE_keyword = 79;
+	public static readonly RULE_keywordForAlias = 80;
+	public static readonly RULE_alias = 81;
+	public static readonly RULE_identifier = 82;
+	public static readonly RULE_enumValue = 83;
+	public static readonly RULE_placeholder = 84;
+	public static readonly RULE_string = 85;
+	public static readonly RULE_templateString = 86;
+	public static readonly RULE_stringContents = 87;
+	public static readonly RULE_fullTemplateString = 88;
+	public static readonly RULE_stringContentsFull = 89;
+	// tslint:disable:no-trailing-whitespace
+	public static readonly ruleNames: string[] = [
+		"program", "declaration", "expression", "varDecl", "identifierList", "statement", 
+		"returnStmt", "throwStmt", "catchBlock", "tryCatchStmt", "ifStmt", "whileStmt", 
+		"forStmt", "forInStmt", "funcStmt", "varAssignment", "exprStmt", "emptyStmt", 
+		"block", "kvPair", "kvPairList", "select", "selectStmtWithParens", "subsequentSelectSetClause", 
+		"selectSetStmt", "selectStmt", "withClause", "topClause", "fromClause", 
+		"arrayJoinClause", "windowClause", "prewhereClause", "whereClause", "groupByClause", 
+		"havingClause", "orderByClause", "projectionOrderByClause", "limitByClause", 
+		"limitAndOffsetClause", "offsetOnlyClause", "settingsClause", "joinExpr", 
+		"joinOp", "joinOpCross", "joinConstraintClause", "sampleClause", "limitExpr", 
+		"orderExprList", "orderExpr", "ratioExpr", "settingExprList", "settingExpr", 
+		"windowExpr", "winPartitionByClause", "winOrderByClause", "winFrameClause", 
+		"winFrameExtend", "winFrameBound", "expr", "columnTypeExpr", "columnExprList", 
+		"columnExpr", "columnLambdaExpr", "tSQLxChildElement", "tSQLxTagElement", 
+		"tSQLxTagAttribute", "withExprList", "withExpr", "columnIdentifier", "nestedIdentifier", 
+		"tableExpr", "tableFunctionExpr", "tableIdentifier", "tableArgList", "databaseIdentifier", 
+		"floatingLiteral", "numberLiteral", "literal", "interval", "keyword", 
+		"keywordForAlias", "alias", "identifier", "enumValue", "placeholder", 
+		"string", "templateString", "stringContents", "fullTemplateString", "stringContentsFull",
+	];
+
+	private static readonly _LITERAL_NAMES: Array<string | undefined> = [
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, undefined, undefined, undefined, undefined, undefined, 
+		undefined, undefined, "'->'", "'*'", "'`'", "'\\'", "':'", "','", "'||'", 
+		"'-'", "'$'", "'.'", "'=='", undefined, "'>='", undefined, "'#'", "'~*'", 
+		"'=~*'", "'{'", "'['", "'('", "'<='", "'<'", "'</'", undefined, "'!~*'", 
+		"'!~'", "'?.'", "'??'", "'%'", "'+'", "'?'", "'\"'", "'f''", "'F''", "'''", 
+		"'~'", "'=~'", "'}'", "']'", "')'", "';'", "'/'", undefined, "'_'",
+	];
+	private static readonly _SYMBOLIC_NAMES: Array<string | undefined> = [
+		undefined, "ALL", "AND", "ANTI", "ANY", "ARRAY", "AS", "ASCENDING", "ASOF", 
+		"BETWEEN", "BOTH", "BY", "CASE", "CAST", "CATCH", "COHORT", "COLLATE", 
+		"CROSS", "CUBE", "CURRENT", "DATE", "DAY", "DESC", "DESCENDING", "DISTINCT", 
+		"ELSE", "END", "EXCEPT", "EXTRACT", "FINAL", "FINALLY", "FIRST", "FN", 
+		"FOLLOWING", "FOR", "FROM", "FULL", "FUN", "GROUP", "HAVING", "HOUR", 
+		"ID", "IF", "ILIKE", "IN", "INF", "INNER", "INTERSECT", "INTERVAL", "IS", 
+		"JOIN", "KEY", "LAST", "LEADING", "LEFT", "LET", "LIKE", "LIMIT", "MINUTE", 
+		"MONTH", "NAN_SQL", "NOT", "NULL_SQL", "NULLS", "OFFSET", "ON", "OR", 
+		"ORDER", "OUTER", "OVER", "PARTITION", "PRECEDING", "PREWHERE", "QUARTER", 
+		"RANGE", "RETURN", "RIGHT", "ROLLUP", "ROW", "ROWS", "SAMPLE", "SECOND", 
+		"SELECT", "SEMI", "SETTINGS", "SUBSTRING", "THEN", "THROW", "TIES", "TIMESTAMP", 
+		"TO", "TOP", "TOTALS", "TRAILING", "TRIM", "TRUNCATE", "TRY", "UNBOUNDED", 
+		"UNION", "USING", "WEEK", "WHEN", "WHERE", "WHILE", "WINDOW", "WITH", 
+		"YEAR", "ESCAPE_CHAR_COMMON", "IDENTIFIER", "FLOATING_LITERAL", "OCTAL_LITERAL", 
+		"DECIMAL_LITERAL", "HEXADECIMAL_LITERAL", "STRING_LITERAL", "ARROW", "ASTERISK", 
+		"BACKQUOTE", "BACKSLASH", "COLON", "COMMA", "CONCAT", "DASH", "DOLLAR", 
+		"DOT", "EQ_DOUBLE", "EQ_SINGLE", "GT_EQ", "GT", "HASH", "IREGEX_SINGLE", 
+		"IREGEX_DOUBLE", "LBRACE", "LBRACKET", "LPAREN", "LT_EQ", "LT", "LT_SLASH", 
+		"NOT_EQ", "NOT_IREGEX", "NOT_REGEX", "NULL_PROPERTY", "NULLISH", "PERCENT", 
+		"PLUS", "QUERY", "QUOTE_DOUBLE", "QUOTE_SINGLE_TEMPLATE", "QUOTE_SINGLE_TEMPLATE_FULL", 
+		"QUOTE_SINGLE", "REGEX_SINGLE", "REGEX_DOUBLE", "RBRACE", "RBRACKET", 
+		"RPAREN", "SEMICOLON", "SLASH", "SLASH_GT", "UNDERSCORE", "MULTI_LINE_COMMENT", 
+		"SINGLE_LINE_COMMENT", "WHITESPACE", "STRING_TEXT", "STRING_ESCAPE_TRIGGER", 
+		"FULL_STRING_TEXT", "FULL_STRING_ESCAPE_TRIGGER", "TAG_WS", "TAGC_WS", 
+		"TSQLX_TEXT_TEXT", "TSQLX_TEXT_WS",
+	];
+	public static readonly VOCABULARY: Vocabulary = new VocabularyImpl(TSQLParser._LITERAL_NAMES, TSQLParser._SYMBOLIC_NAMES, []);
+
+	// @Override
+	// @NotNull
+	public get vocabulary(): Vocabulary {
+		return TSQLParser.VOCABULARY;
+	}
+	// tslint:enable:no-trailing-whitespace
+
+	// @Override
+	public get grammarFileName(): string { return "TSQLParser.g4"; }
+
+	// @Override
+	public get ruleNames(): string[] { return TSQLParser.ruleNames; }
+
+	// @Override
+	public get serializedATN(): string { return TSQLParser._serializedATN; }
+
+	protected createFailedPredicateException(predicate?: string, message?: string): FailedPredicateException {
+		return new FailedPredicateException(this, predicate, message);
+	}
+
+	constructor(input: TokenStream) {
+		super(input);
+		this._interp = new ParserATNSimulator(TSQLParser._ATN, this);
+	}
+	// @RuleVersion(0)
+	public program(): ProgramContext {
+		let _localctx: ProgramContext = new ProgramContext(this._ctx, this.state);
+		this.enterRule(_localctx, 0, TSQLParser.RULE_program);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 183;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (TSQLParser.FN - 32)) | (1 << (TSQLParser.FOLLOWING - 32)) | (1 << (TSQLParser.FOR - 32)) | (1 << (TSQLParser.FROM - 32)) | (1 << (TSQLParser.FULL - 32)) | (1 << (TSQLParser.FUN - 32)) | (1 << (TSQLParser.GROUP - 32)) | (1 << (TSQLParser.HAVING - 32)) | (1 << (TSQLParser.HOUR - 32)) | (1 << (TSQLParser.ID - 32)) | (1 << (TSQLParser.IF - 32)) | (1 << (TSQLParser.ILIKE - 32)) | (1 << (TSQLParser.IN - 32)) | (1 << (TSQLParser.INF - 32)) | (1 << (TSQLParser.INNER - 32)) | (1 << (TSQLParser.INTERVAL - 32)) | (1 << (TSQLParser.IS - 32)) | (1 << (TSQLParser.JOIN - 32)) | (1 << (TSQLParser.KEY - 32)) | (1 << (TSQLParser.LAST - 32)) | (1 << (TSQLParser.LEADING - 32)) | (1 << (TSQLParser.LEFT - 32)) | (1 << (TSQLParser.LET - 32)) | (1 << (TSQLParser.LIKE - 32)) | (1 << (TSQLParser.LIMIT - 32)) | (1 << (TSQLParser.MINUTE - 32)) | (1 << (TSQLParser.MONTH - 32)) | (1 << (TSQLParser.NAN_SQL - 32)) | (1 << (TSQLParser.NOT - 32)) | (1 << (TSQLParser.NULL_SQL - 32)) | (1 << (TSQLParser.NULLS - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (TSQLParser.OFFSET - 64)) | (1 << (TSQLParser.ON - 64)) | (1 << (TSQLParser.OR - 64)) | (1 << (TSQLParser.ORDER - 64)) | (1 << (TSQLParser.OUTER - 64)) | (1 << (TSQLParser.OVER - 64)) | (1 << (TSQLParser.PARTITION - 64)) | (1 << (TSQLParser.PRECEDING - 64)) | (1 << (TSQLParser.PREWHERE - 64)) | (1 << (TSQLParser.QUARTER - 64)) | (1 << (TSQLParser.RANGE - 64)) | (1 << (TSQLParser.RETURN - 64)) | (1 << (TSQLParser.RIGHT - 64)) | (1 << (TSQLParser.ROLLUP - 64)) | (1 << (TSQLParser.ROW - 64)) | (1 << (TSQLParser.ROWS - 64)) | (1 << (TSQLParser.SAMPLE - 64)) | (1 << (TSQLParser.SECOND - 64)) | (1 << (TSQLParser.SELECT - 64)) | (1 << (TSQLParser.SEMI - 64)) | (1 << (TSQLParser.SETTINGS - 64)) | (1 << (TSQLParser.SUBSTRING - 64)) | (1 << (TSQLParser.THEN - 64)) | (1 << (TSQLParser.THROW - 64)) | (1 << (TSQLParser.TIES - 64)) | (1 << (TSQLParser.TIMESTAMP - 64)) | (1 << (TSQLParser.TO - 64)) | (1 << (TSQLParser.TOP - 64)) | (1 << (TSQLParser.TOTALS - 64)) | (1 << (TSQLParser.TRAILING - 64)) | (1 << (TSQLParser.TRIM - 64)) | (1 << (TSQLParser.TRUNCATE - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (TSQLParser.TRY - 96)) | (1 << (TSQLParser.UNBOUNDED - 96)) | (1 << (TSQLParser.UNION - 96)) | (1 << (TSQLParser.USING - 96)) | (1 << (TSQLParser.WEEK - 96)) | (1 << (TSQLParser.WHEN - 96)) | (1 << (TSQLParser.WHERE - 96)) | (1 << (TSQLParser.WHILE - 96)) | (1 << (TSQLParser.WINDOW - 96)) | (1 << (TSQLParser.WITH - 96)) | (1 << (TSQLParser.YEAR - 96)) | (1 << (TSQLParser.IDENTIFIER - 96)) | (1 << (TSQLParser.FLOATING_LITERAL - 96)) | (1 << (TSQLParser.OCTAL_LITERAL - 96)) | (1 << (TSQLParser.DECIMAL_LITERAL - 96)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 96)) | (1 << (TSQLParser.STRING_LITERAL - 96)) | (1 << (TSQLParser.ASTERISK - 96)) | (1 << (TSQLParser.DASH - 96)) | (1 << (TSQLParser.DOT - 96)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)) | (1 << (TSQLParser.SEMICOLON - 131)))) !== 0)) {
+				{
+				{
+				this.state = 180;
+				this.declaration();
+				}
+				}
+				this.state = 185;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			this.state = 186;
+			this.match(TSQLParser.EOF);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public declaration(): DeclarationContext {
+		let _localctx: DeclarationContext = new DeclarationContext(this._ctx, this.state);
+		this.enterRule(_localctx, 2, TSQLParser.RULE_declaration);
+		try {
+			this.state = 190;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.LET:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 188;
+				this.varDecl();
+				}
+				break;
+			case TSQLParser.ALL:
+			case TSQLParser.AND:
+			case TSQLParser.ANTI:
+			case TSQLParser.ANY:
+			case TSQLParser.ARRAY:
+			case TSQLParser.AS:
+			case TSQLParser.ASCENDING:
+			case TSQLParser.ASOF:
+			case TSQLParser.BETWEEN:
+			case TSQLParser.BOTH:
+			case TSQLParser.BY:
+			case TSQLParser.CASE:
+			case TSQLParser.CAST:
+			case TSQLParser.COHORT:
+			case TSQLParser.COLLATE:
+			case TSQLParser.CROSS:
+			case TSQLParser.CUBE:
+			case TSQLParser.CURRENT:
+			case TSQLParser.DATE:
+			case TSQLParser.DAY:
+			case TSQLParser.DESC:
+			case TSQLParser.DESCENDING:
+			case TSQLParser.DISTINCT:
+			case TSQLParser.ELSE:
+			case TSQLParser.END:
+			case TSQLParser.EXTRACT:
+			case TSQLParser.FINAL:
+			case TSQLParser.FIRST:
+			case TSQLParser.FN:
+			case TSQLParser.FOLLOWING:
+			case TSQLParser.FOR:
+			case TSQLParser.FROM:
+			case TSQLParser.FULL:
+			case TSQLParser.FUN:
+			case TSQLParser.GROUP:
+			case TSQLParser.HAVING:
+			case TSQLParser.HOUR:
+			case TSQLParser.ID:
+			case TSQLParser.IF:
+			case TSQLParser.ILIKE:
+			case TSQLParser.IN:
+			case TSQLParser.INF:
+			case TSQLParser.INNER:
+			case TSQLParser.INTERVAL:
+			case TSQLParser.IS:
+			case TSQLParser.JOIN:
+			case TSQLParser.KEY:
+			case TSQLParser.LAST:
+			case TSQLParser.LEADING:
+			case TSQLParser.LEFT:
+			case TSQLParser.LIKE:
+			case TSQLParser.LIMIT:
+			case TSQLParser.MINUTE:
+			case TSQLParser.MONTH:
+			case TSQLParser.NAN_SQL:
+			case TSQLParser.NOT:
+			case TSQLParser.NULL_SQL:
+			case TSQLParser.NULLS:
+			case TSQLParser.OFFSET:
+			case TSQLParser.ON:
+			case TSQLParser.OR:
+			case TSQLParser.ORDER:
+			case TSQLParser.OUTER:
+			case TSQLParser.OVER:
+			case TSQLParser.PARTITION:
+			case TSQLParser.PRECEDING:
+			case TSQLParser.PREWHERE:
+			case TSQLParser.QUARTER:
+			case TSQLParser.RANGE:
+			case TSQLParser.RETURN:
+			case TSQLParser.RIGHT:
+			case TSQLParser.ROLLUP:
+			case TSQLParser.ROW:
+			case TSQLParser.ROWS:
+			case TSQLParser.SAMPLE:
+			case TSQLParser.SECOND:
+			case TSQLParser.SELECT:
+			case TSQLParser.SEMI:
+			case TSQLParser.SETTINGS:
+			case TSQLParser.SUBSTRING:
+			case TSQLParser.THEN:
+			case TSQLParser.THROW:
+			case TSQLParser.TIES:
+			case TSQLParser.TIMESTAMP:
+			case TSQLParser.TO:
+			case TSQLParser.TOP:
+			case TSQLParser.TOTALS:
+			case TSQLParser.TRAILING:
+			case TSQLParser.TRIM:
+			case TSQLParser.TRUNCATE:
+			case TSQLParser.TRY:
+			case TSQLParser.UNBOUNDED:
+			case TSQLParser.UNION:
+			case TSQLParser.USING:
+			case TSQLParser.WEEK:
+			case TSQLParser.WHEN:
+			case TSQLParser.WHERE:
+			case TSQLParser.WHILE:
+			case TSQLParser.WINDOW:
+			case TSQLParser.WITH:
+			case TSQLParser.YEAR:
+			case TSQLParser.IDENTIFIER:
+			case TSQLParser.FLOATING_LITERAL:
+			case TSQLParser.OCTAL_LITERAL:
+			case TSQLParser.DECIMAL_LITERAL:
+			case TSQLParser.HEXADECIMAL_LITERAL:
+			case TSQLParser.STRING_LITERAL:
+			case TSQLParser.ASTERISK:
+			case TSQLParser.DASH:
+			case TSQLParser.DOT:
+			case TSQLParser.LBRACE:
+			case TSQLParser.LBRACKET:
+			case TSQLParser.LPAREN:
+			case TSQLParser.LT:
+			case TSQLParser.PLUS:
+			case TSQLParser.QUOTE_SINGLE_TEMPLATE:
+			case TSQLParser.SEMICOLON:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 189;
+				this.statement();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public expression(): ExpressionContext {
+		let _localctx: ExpressionContext = new ExpressionContext(this._ctx, this.state);
+		this.enterRule(_localctx, 4, TSQLParser.RULE_expression);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 192;
+			this.columnExpr(0);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public varDecl(): VarDeclContext {
+		let _localctx: VarDeclContext = new VarDeclContext(this._ctx, this.state);
+		this.enterRule(_localctx, 6, TSQLParser.RULE_varDecl);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 194;
+			this.match(TSQLParser.LET);
+			this.state = 195;
+			this.identifier();
+			this.state = 199;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COLON) {
+				{
+				this.state = 196;
+				this.match(TSQLParser.COLON);
+				this.state = 197;
+				this.match(TSQLParser.EQ_SINGLE);
+				this.state = 198;
+				this.expression();
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public identifierList(): IdentifierListContext {
+		let _localctx: IdentifierListContext = new IdentifierListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 8, TSQLParser.RULE_identifierList);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 201;
+			this.identifier();
+			this.state = 206;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 3, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 202;
+					this.match(TSQLParser.COMMA);
+					this.state = 203;
+					this.identifier();
+					}
+					}
+				}
+				this.state = 208;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 3, this._ctx);
+			}
+			this.state = 210;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COMMA) {
+				{
+				this.state = 209;
+				this.match(TSQLParser.COMMA);
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public statement(): StatementContext {
+		let _localctx: StatementContext = new StatementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 10, TSQLParser.RULE_statement);
+		try {
+			this.state = 224;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 5, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 212;
+				this.returnStmt();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 213;
+				this.throwStmt();
+				}
+				break;
+
+			case 3:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 214;
+				this.tryCatchStmt();
+				}
+				break;
+
+			case 4:
+				this.enterOuterAlt(_localctx, 4);
+				{
+				this.state = 215;
+				this.ifStmt();
+				}
+				break;
+
+			case 5:
+				this.enterOuterAlt(_localctx, 5);
+				{
+				this.state = 216;
+				this.whileStmt();
+				}
+				break;
+
+			case 6:
+				this.enterOuterAlt(_localctx, 6);
+				{
+				this.state = 217;
+				this.forInStmt();
+				}
+				break;
+
+			case 7:
+				this.enterOuterAlt(_localctx, 7);
+				{
+				this.state = 218;
+				this.forStmt();
+				}
+				break;
+
+			case 8:
+				this.enterOuterAlt(_localctx, 8);
+				{
+				this.state = 219;
+				this.funcStmt();
+				}
+				break;
+
+			case 9:
+				this.enterOuterAlt(_localctx, 9);
+				{
+				this.state = 220;
+				this.varAssignment();
+				}
+				break;
+
+			case 10:
+				this.enterOuterAlt(_localctx, 10);
+				{
+				this.state = 221;
+				this.block();
+				}
+				break;
+
+			case 11:
+				this.enterOuterAlt(_localctx, 11);
+				{
+				this.state = 222;
+				this.exprStmt();
+				}
+				break;
+
+			case 12:
+				this.enterOuterAlt(_localctx, 12);
+				{
+				this.state = 223;
+				this.emptyStmt();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public returnStmt(): ReturnStmtContext {
+		let _localctx: ReturnStmtContext = new ReturnStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 12, TSQLParser.RULE_returnStmt);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 226;
+			this.match(TSQLParser.RETURN);
+			this.state = 228;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 6, this._ctx) ) {
+			case 1:
+				{
+				this.state = 227;
+				this.expression();
+				}
+				break;
+			}
+			this.state = 231;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 7, this._ctx) ) {
+			case 1:
+				{
+				this.state = 230;
+				this.match(TSQLParser.SEMICOLON);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public throwStmt(): ThrowStmtContext {
+		let _localctx: ThrowStmtContext = new ThrowStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 14, TSQLParser.RULE_throwStmt);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 233;
+			this.match(TSQLParser.THROW);
+			this.state = 235;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 8, this._ctx) ) {
+			case 1:
+				{
+				this.state = 234;
+				this.expression();
+				}
+				break;
+			}
+			this.state = 238;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 9, this._ctx) ) {
+			case 1:
+				{
+				this.state = 237;
+				this.match(TSQLParser.SEMICOLON);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public catchBlock(): CatchBlockContext {
+		let _localctx: CatchBlockContext = new CatchBlockContext(this._ctx, this.state);
+		this.enterRule(_localctx, 16, TSQLParser.RULE_catchBlock);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 240;
+			this.match(TSQLParser.CATCH);
+			this.state = 249;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.LPAREN) {
+				{
+				this.state = 241;
+				this.match(TSQLParser.LPAREN);
+				this.state = 242;
+				_localctx._catchVar = this.identifier();
+				this.state = 245;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COLON) {
+					{
+					this.state = 243;
+					this.match(TSQLParser.COLON);
+					this.state = 244;
+					_localctx._catchType = this.identifier();
+					}
+				}
+
+				this.state = 247;
+				this.match(TSQLParser.RPAREN);
+				}
+			}
+
+			this.state = 251;
+			_localctx._catchStmt = this.block();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tryCatchStmt(): TryCatchStmtContext {
+		let _localctx: TryCatchStmtContext = new TryCatchStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 18, TSQLParser.RULE_tryCatchStmt);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 253;
+			this.match(TSQLParser.TRY);
+			this.state = 254;
+			_localctx._tryStmt = this.block();
+			this.state = 258;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.CATCH) {
+				{
+				{
+				this.state = 255;
+				this.catchBlock();
+				}
+				}
+				this.state = 260;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			this.state = 263;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.FINALLY) {
+				{
+				this.state = 261;
+				this.match(TSQLParser.FINALLY);
+				this.state = 262;
+				_localctx._finallyStmt = this.block();
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public ifStmt(): IfStmtContext {
+		let _localctx: IfStmtContext = new IfStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 20, TSQLParser.RULE_ifStmt);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 265;
+			this.match(TSQLParser.IF);
+			this.state = 266;
+			this.match(TSQLParser.LPAREN);
+			this.state = 267;
+			this.expression();
+			this.state = 268;
+			this.match(TSQLParser.RPAREN);
+			this.state = 269;
+			this.statement();
+			this.state = 272;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 14, this._ctx) ) {
+			case 1:
+				{
+				this.state = 270;
+				this.match(TSQLParser.ELSE);
+				this.state = 271;
+				this.statement();
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public whileStmt(): WhileStmtContext {
+		let _localctx: WhileStmtContext = new WhileStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 22, TSQLParser.RULE_whileStmt);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 274;
+			this.match(TSQLParser.WHILE);
+			this.state = 275;
+			this.match(TSQLParser.LPAREN);
+			this.state = 276;
+			this.expression();
+			this.state = 277;
+			this.match(TSQLParser.RPAREN);
+			this.state = 278;
+			this.statement();
+			this.state = 280;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 15, this._ctx) ) {
+			case 1:
+				{
+				this.state = 279;
+				this.match(TSQLParser.SEMICOLON);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public forStmt(): ForStmtContext {
+		let _localctx: ForStmtContext = new ForStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 24, TSQLParser.RULE_forStmt);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 282;
+			this.match(TSQLParser.FOR);
+			this.state = 283;
+			this.match(TSQLParser.LPAREN);
+			this.state = 287;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 16, this._ctx) ) {
+			case 1:
+				{
+				this.state = 284;
+				_localctx._initializerVarDeclr = this.varDecl();
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 285;
+				_localctx._initializerVarAssignment = this.varAssignment();
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 286;
+				_localctx._initializerExpression = this.expression();
+				}
+				break;
+			}
+			this.state = 289;
+			this.match(TSQLParser.SEMICOLON);
+			this.state = 291;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+				{
+				this.state = 290;
+				_localctx._condition = this.expression();
+				}
+			}
+
+			this.state = 293;
+			this.match(TSQLParser.SEMICOLON);
+			this.state = 297;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 18, this._ctx) ) {
+			case 1:
+				{
+				this.state = 294;
+				_localctx._incrementVarDeclr = this.varDecl();
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 295;
+				_localctx._incrementVarAssignment = this.varAssignment();
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 296;
+				_localctx._incrementExpression = this.expression();
+				}
+				break;
+			}
+			this.state = 299;
+			this.match(TSQLParser.RPAREN);
+			this.state = 300;
+			this.statement();
+			this.state = 302;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 19, this._ctx) ) {
+			case 1:
+				{
+				this.state = 301;
+				this.match(TSQLParser.SEMICOLON);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public forInStmt(): ForInStmtContext {
+		let _localctx: ForInStmtContext = new ForInStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 26, TSQLParser.RULE_forInStmt);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 304;
+			this.match(TSQLParser.FOR);
+			this.state = 305;
+			this.match(TSQLParser.LPAREN);
+			this.state = 306;
+			this.match(TSQLParser.LET);
+			this.state = 307;
+			this.identifier();
+			this.state = 310;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COMMA) {
+				{
+				this.state = 308;
+				this.match(TSQLParser.COMMA);
+				this.state = 309;
+				this.identifier();
+				}
+			}
+
+			this.state = 312;
+			this.match(TSQLParser.IN);
+			this.state = 313;
+			this.expression();
+			this.state = 314;
+			this.match(TSQLParser.RPAREN);
+			this.state = 315;
+			this.statement();
+			this.state = 317;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 21, this._ctx) ) {
+			case 1:
+				{
+				this.state = 316;
+				this.match(TSQLParser.SEMICOLON);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public funcStmt(): FuncStmtContext {
+		let _localctx: FuncStmtContext = new FuncStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 28, TSQLParser.RULE_funcStmt);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 319;
+			_la = this._input.LA(1);
+			if (!(_la === TSQLParser.FN || _la === TSQLParser.FUN)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			this.state = 320;
+			this.identifier();
+			this.state = 321;
+			this.match(TSQLParser.LPAREN);
+			this.state = 323;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)))) !== 0)) {
+				{
+				this.state = 322;
+				this.identifierList();
+				}
+			}
+
+			this.state = 325;
+			this.match(TSQLParser.RPAREN);
+			this.state = 326;
+			this.block();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public varAssignment(): VarAssignmentContext {
+		let _localctx: VarAssignmentContext = new VarAssignmentContext(this._ctx, this.state);
+		this.enterRule(_localctx, 30, TSQLParser.RULE_varAssignment);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 328;
+			this.expression();
+			this.state = 329;
+			this.match(TSQLParser.COLON);
+			this.state = 330;
+			this.match(TSQLParser.EQ_SINGLE);
+			this.state = 331;
+			this.expression();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public exprStmt(): ExprStmtContext {
+		let _localctx: ExprStmtContext = new ExprStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 32, TSQLParser.RULE_exprStmt);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 333;
+			this.expression();
+			this.state = 335;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 23, this._ctx) ) {
+			case 1:
+				{
+				this.state = 334;
+				this.match(TSQLParser.SEMICOLON);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public emptyStmt(): EmptyStmtContext {
+		let _localctx: EmptyStmtContext = new EmptyStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 34, TSQLParser.RULE_emptyStmt);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 337;
+			this.match(TSQLParser.SEMICOLON);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public block(): BlockContext {
+		let _localctx: BlockContext = new BlockContext(this._ctx, this.state);
+		this.enterRule(_localctx, 36, TSQLParser.RULE_block);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 339;
+			this.match(TSQLParser.LBRACE);
+			this.state = 343;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 32)) & ~0x1F) === 0 && ((1 << (_la - 32)) & ((1 << (TSQLParser.FN - 32)) | (1 << (TSQLParser.FOLLOWING - 32)) | (1 << (TSQLParser.FOR - 32)) | (1 << (TSQLParser.FROM - 32)) | (1 << (TSQLParser.FULL - 32)) | (1 << (TSQLParser.FUN - 32)) | (1 << (TSQLParser.GROUP - 32)) | (1 << (TSQLParser.HAVING - 32)) | (1 << (TSQLParser.HOUR - 32)) | (1 << (TSQLParser.ID - 32)) | (1 << (TSQLParser.IF - 32)) | (1 << (TSQLParser.ILIKE - 32)) | (1 << (TSQLParser.IN - 32)) | (1 << (TSQLParser.INF - 32)) | (1 << (TSQLParser.INNER - 32)) | (1 << (TSQLParser.INTERVAL - 32)) | (1 << (TSQLParser.IS - 32)) | (1 << (TSQLParser.JOIN - 32)) | (1 << (TSQLParser.KEY - 32)) | (1 << (TSQLParser.LAST - 32)) | (1 << (TSQLParser.LEADING - 32)) | (1 << (TSQLParser.LEFT - 32)) | (1 << (TSQLParser.LET - 32)) | (1 << (TSQLParser.LIKE - 32)) | (1 << (TSQLParser.LIMIT - 32)) | (1 << (TSQLParser.MINUTE - 32)) | (1 << (TSQLParser.MONTH - 32)) | (1 << (TSQLParser.NAN_SQL - 32)) | (1 << (TSQLParser.NOT - 32)) | (1 << (TSQLParser.NULL_SQL - 32)) | (1 << (TSQLParser.NULLS - 32)))) !== 0) || ((((_la - 64)) & ~0x1F) === 0 && ((1 << (_la - 64)) & ((1 << (TSQLParser.OFFSET - 64)) | (1 << (TSQLParser.ON - 64)) | (1 << (TSQLParser.OR - 64)) | (1 << (TSQLParser.ORDER - 64)) | (1 << (TSQLParser.OUTER - 64)) | (1 << (TSQLParser.OVER - 64)) | (1 << (TSQLParser.PARTITION - 64)) | (1 << (TSQLParser.PRECEDING - 64)) | (1 << (TSQLParser.PREWHERE - 64)) | (1 << (TSQLParser.QUARTER - 64)) | (1 << (TSQLParser.RANGE - 64)) | (1 << (TSQLParser.RETURN - 64)) | (1 << (TSQLParser.RIGHT - 64)) | (1 << (TSQLParser.ROLLUP - 64)) | (1 << (TSQLParser.ROW - 64)) | (1 << (TSQLParser.ROWS - 64)) | (1 << (TSQLParser.SAMPLE - 64)) | (1 << (TSQLParser.SECOND - 64)) | (1 << (TSQLParser.SELECT - 64)) | (1 << (TSQLParser.SEMI - 64)) | (1 << (TSQLParser.SETTINGS - 64)) | (1 << (TSQLParser.SUBSTRING - 64)) | (1 << (TSQLParser.THEN - 64)) | (1 << (TSQLParser.THROW - 64)) | (1 << (TSQLParser.TIES - 64)) | (1 << (TSQLParser.TIMESTAMP - 64)) | (1 << (TSQLParser.TO - 64)) | (1 << (TSQLParser.TOP - 64)) | (1 << (TSQLParser.TOTALS - 64)) | (1 << (TSQLParser.TRAILING - 64)) | (1 << (TSQLParser.TRIM - 64)) | (1 << (TSQLParser.TRUNCATE - 64)))) !== 0) || ((((_la - 96)) & ~0x1F) === 0 && ((1 << (_la - 96)) & ((1 << (TSQLParser.TRY - 96)) | (1 << (TSQLParser.UNBOUNDED - 96)) | (1 << (TSQLParser.UNION - 96)) | (1 << (TSQLParser.USING - 96)) | (1 << (TSQLParser.WEEK - 96)) | (1 << (TSQLParser.WHEN - 96)) | (1 << (TSQLParser.WHERE - 96)) | (1 << (TSQLParser.WHILE - 96)) | (1 << (TSQLParser.WINDOW - 96)) | (1 << (TSQLParser.WITH - 96)) | (1 << (TSQLParser.YEAR - 96)) | (1 << (TSQLParser.IDENTIFIER - 96)) | (1 << (TSQLParser.FLOATING_LITERAL - 96)) | (1 << (TSQLParser.OCTAL_LITERAL - 96)) | (1 << (TSQLParser.DECIMAL_LITERAL - 96)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 96)) | (1 << (TSQLParser.STRING_LITERAL - 96)) | (1 << (TSQLParser.ASTERISK - 96)) | (1 << (TSQLParser.DASH - 96)) | (1 << (TSQLParser.DOT - 96)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)) | (1 << (TSQLParser.SEMICOLON - 131)))) !== 0)) {
+				{
+				{
+				this.state = 340;
+				this.declaration();
+				}
+				}
+				this.state = 345;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			this.state = 346;
+			this.match(TSQLParser.RBRACE);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public kvPair(): KvPairContext {
+		let _localctx: KvPairContext = new KvPairContext(this._ctx, this.state);
+		this.enterRule(_localctx, 38, TSQLParser.RULE_kvPair);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 348;
+			this.expression();
+			this.state = 349;
+			this.match(TSQLParser.COLON);
+			this.state = 350;
+			this.expression();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public kvPairList(): KvPairListContext {
+		let _localctx: KvPairListContext = new KvPairListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 40, TSQLParser.RULE_kvPairList);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 352;
+			this.kvPair();
+			this.state = 357;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 25, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 353;
+					this.match(TSQLParser.COMMA);
+					this.state = 354;
+					this.kvPair();
+					}
+					}
+				}
+				this.state = 359;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 25, this._ctx);
+			}
+			this.state = 361;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COMMA) {
+				{
+				this.state = 360;
+				this.match(TSQLParser.COMMA);
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public select(): SelectContext {
+		let _localctx: SelectContext = new SelectContext(this._ctx, this.state);
+		this.enterRule(_localctx, 42, TSQLParser.RULE_select);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 366;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 27, this._ctx) ) {
+			case 1:
+				{
+				this.state = 363;
+				this.selectSetStmt();
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 364;
+				this.selectStmt();
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 365;
+				this.tSQLxTagElement();
+				}
+				break;
+			}
+			this.state = 369;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.SEMICOLON) {
+				{
+				this.state = 368;
+				this.match(TSQLParser.SEMICOLON);
+				}
+			}
+
+			this.state = 371;
+			this.match(TSQLParser.EOF);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public selectStmtWithParens(): SelectStmtWithParensContext {
+		let _localctx: SelectStmtWithParensContext = new SelectStmtWithParensContext(this._ctx, this.state);
+		this.enterRule(_localctx, 44, TSQLParser.RULE_selectStmtWithParens);
+		try {
+			this.state = 379;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.SELECT:
+			case TSQLParser.WITH:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 373;
+				this.selectStmt();
+				}
+				break;
+			case TSQLParser.LPAREN:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 374;
+				this.match(TSQLParser.LPAREN);
+				this.state = 375;
+				this.selectSetStmt();
+				this.state = 376;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+			case TSQLParser.LBRACE:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 378;
+				this.placeholder();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public subsequentSelectSetClause(): SubsequentSelectSetClauseContext {
+		let _localctx: SubsequentSelectSetClauseContext = new SubsequentSelectSetClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 46, TSQLParser.RULE_subsequentSelectSetClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 389;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 30, this._ctx) ) {
+			case 1:
+				{
+				this.state = 381;
+				this.match(TSQLParser.EXCEPT);
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 382;
+				this.match(TSQLParser.UNION);
+				this.state = 383;
+				this.match(TSQLParser.ALL);
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 384;
+				this.match(TSQLParser.UNION);
+				this.state = 385;
+				this.match(TSQLParser.DISTINCT);
+				}
+				break;
+
+			case 4:
+				{
+				this.state = 386;
+				this.match(TSQLParser.INTERSECT);
+				}
+				break;
+
+			case 5:
+				{
+				this.state = 387;
+				this.match(TSQLParser.INTERSECT);
+				this.state = 388;
+				this.match(TSQLParser.DISTINCT);
+				}
+				break;
+			}
+			this.state = 391;
+			this.selectStmtWithParens();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public selectSetStmt(): SelectSetStmtContext {
+		let _localctx: SelectSetStmtContext = new SelectSetStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 48, TSQLParser.RULE_selectSetStmt);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 393;
+			this.selectStmtWithParens();
+			this.state = 397;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.EXCEPT || _la === TSQLParser.INTERSECT || _la === TSQLParser.UNION) {
+				{
+				{
+				this.state = 394;
+				this.subsequentSelectSetClause();
+				}
+				}
+				this.state = 399;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public selectStmt(): SelectStmtContext {
+		let _localctx: SelectStmtContext = new SelectStmtContext(this._ctx, this.state);
+		this.enterRule(_localctx, 50, TSQLParser.RULE_selectStmt);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 401;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.WITH) {
+				{
+				this.state = 400;
+				_localctx._with = this.withClause();
+				}
+			}
+
+			this.state = 403;
+			this.match(TSQLParser.SELECT);
+			this.state = 405;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 33, this._ctx) ) {
+			case 1:
+				{
+				this.state = 404;
+				this.match(TSQLParser.DISTINCT);
+				}
+				break;
+			}
+			this.state = 408;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 34, this._ctx) ) {
+			case 1:
+				{
+				this.state = 407;
+				this.topClause();
+				}
+				break;
+			}
+			this.state = 410;
+			_localctx._columns = this.columnExprList();
+			this.state = 412;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.FROM) {
+				{
+				this.state = 411;
+				_localctx._from = this.fromClause();
+				}
+			}
+
+			this.state = 415;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.ARRAY || _la === TSQLParser.INNER || _la === TSQLParser.LEFT) {
+				{
+				this.state = 414;
+				this.arrayJoinClause();
+				}
+			}
+
+			this.state = 418;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.PREWHERE) {
+				{
+				this.state = 417;
+				this.prewhereClause();
+				}
+			}
+
+			this.state = 421;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.WHERE) {
+				{
+				this.state = 420;
+				_localctx._where = this.whereClause();
+				}
+			}
+
+			this.state = 424;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.GROUP) {
+				{
+				this.state = 423;
+				this.groupByClause();
+				}
+			}
+
+			this.state = 428;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 40, this._ctx) ) {
+			case 1:
+				{
+				this.state = 426;
+				this.match(TSQLParser.WITH);
+				this.state = 427;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.CUBE || _la === TSQLParser.ROLLUP)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+				break;
+			}
+			this.state = 432;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.WITH) {
+				{
+				this.state = 430;
+				this.match(TSQLParser.WITH);
+				this.state = 431;
+				this.match(TSQLParser.TOTALS);
+				}
+			}
+
+			this.state = 435;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.HAVING) {
+				{
+				this.state = 434;
+				this.havingClause();
+				}
+			}
+
+			this.state = 438;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.WINDOW) {
+				{
+				this.state = 437;
+				this.windowClause();
+				}
+			}
+
+			this.state = 441;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.ORDER) {
+				{
+				this.state = 440;
+				this.orderByClause();
+				}
+			}
+
+			this.state = 444;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 45, this._ctx) ) {
+			case 1:
+				{
+				this.state = 443;
+				this.limitByClause();
+				}
+				break;
+			}
+			this.state = 448;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.LIMIT:
+				{
+				this.state = 446;
+				this.limitAndOffsetClause();
+				}
+				break;
+			case TSQLParser.OFFSET:
+				{
+				this.state = 447;
+				this.offsetOnlyClause();
+				}
+				break;
+			case TSQLParser.EOF:
+			case TSQLParser.EXCEPT:
+			case TSQLParser.INTERSECT:
+			case TSQLParser.SETTINGS:
+			case TSQLParser.UNION:
+			case TSQLParser.RPAREN:
+			case TSQLParser.SEMICOLON:
+				break;
+			default:
+				break;
+			}
+			this.state = 451;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.SETTINGS) {
+				{
+				this.state = 450;
+				this.settingsClause();
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public withClause(): WithClauseContext {
+		let _localctx: WithClauseContext = new WithClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 52, TSQLParser.RULE_withClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 453;
+			this.match(TSQLParser.WITH);
+			this.state = 454;
+			this.withExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public topClause(): TopClauseContext {
+		let _localctx: TopClauseContext = new TopClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 54, TSQLParser.RULE_topClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 456;
+			this.match(TSQLParser.TOP);
+			this.state = 457;
+			this.match(TSQLParser.DECIMAL_LITERAL);
+			this.state = 460;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 48, this._ctx) ) {
+			case 1:
+				{
+				this.state = 458;
+				this.match(TSQLParser.WITH);
+				this.state = 459;
+				this.match(TSQLParser.TIES);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public fromClause(): FromClauseContext {
+		let _localctx: FromClauseContext = new FromClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 56, TSQLParser.RULE_fromClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 462;
+			this.match(TSQLParser.FROM);
+			this.state = 463;
+			this.joinExpr(0);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public arrayJoinClause(): ArrayJoinClauseContext {
+		let _localctx: ArrayJoinClauseContext = new ArrayJoinClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 58, TSQLParser.RULE_arrayJoinClause);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 466;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.INNER || _la === TSQLParser.LEFT) {
+				{
+				this.state = 465;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.INNER || _la === TSQLParser.LEFT)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+			}
+
+			this.state = 468;
+			this.match(TSQLParser.ARRAY);
+			this.state = 469;
+			this.match(TSQLParser.JOIN);
+			this.state = 470;
+			this.columnExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public windowClause(): WindowClauseContext {
+		let _localctx: WindowClauseContext = new WindowClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 60, TSQLParser.RULE_windowClause);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 472;
+			this.match(TSQLParser.WINDOW);
+			this.state = 473;
+			this.identifier();
+			this.state = 474;
+			this.match(TSQLParser.AS);
+			this.state = 475;
+			this.match(TSQLParser.LPAREN);
+			this.state = 476;
+			this.windowExpr();
+			this.state = 477;
+			this.match(TSQLParser.RPAREN);
+			this.state = 487;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.COMMA) {
+				{
+				{
+				this.state = 478;
+				this.match(TSQLParser.COMMA);
+				this.state = 479;
+				this.identifier();
+				this.state = 480;
+				this.match(TSQLParser.AS);
+				this.state = 481;
+				this.match(TSQLParser.LPAREN);
+				this.state = 482;
+				this.windowExpr();
+				this.state = 483;
+				this.match(TSQLParser.RPAREN);
+				}
+				}
+				this.state = 489;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public prewhereClause(): PrewhereClauseContext {
+		let _localctx: PrewhereClauseContext = new PrewhereClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 62, TSQLParser.RULE_prewhereClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 490;
+			this.match(TSQLParser.PREWHERE);
+			this.state = 491;
+			this.columnExpr(0);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public whereClause(): WhereClauseContext {
+		let _localctx: WhereClauseContext = new WhereClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 64, TSQLParser.RULE_whereClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 493;
+			this.match(TSQLParser.WHERE);
+			this.state = 494;
+			this.columnExpr(0);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public groupByClause(): GroupByClauseContext {
+		let _localctx: GroupByClauseContext = new GroupByClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 66, TSQLParser.RULE_groupByClause);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 496;
+			this.match(TSQLParser.GROUP);
+			this.state = 497;
+			this.match(TSQLParser.BY);
+			this.state = 504;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 51, this._ctx) ) {
+			case 1:
+				{
+				this.state = 498;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.CUBE || _la === TSQLParser.ROLLUP)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 499;
+				this.match(TSQLParser.LPAREN);
+				this.state = 500;
+				this.columnExprList();
+				this.state = 501;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 503;
+				this.columnExprList();
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public havingClause(): HavingClauseContext {
+		let _localctx: HavingClauseContext = new HavingClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 68, TSQLParser.RULE_havingClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 506;
+			this.match(TSQLParser.HAVING);
+			this.state = 507;
+			this.columnExpr(0);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public orderByClause(): OrderByClauseContext {
+		let _localctx: OrderByClauseContext = new OrderByClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 70, TSQLParser.RULE_orderByClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 509;
+			this.match(TSQLParser.ORDER);
+			this.state = 510;
+			this.match(TSQLParser.BY);
+			this.state = 511;
+			this.orderExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public projectionOrderByClause(): ProjectionOrderByClauseContext {
+		let _localctx: ProjectionOrderByClauseContext = new ProjectionOrderByClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 72, TSQLParser.RULE_projectionOrderByClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 513;
+			this.match(TSQLParser.ORDER);
+			this.state = 514;
+			this.match(TSQLParser.BY);
+			this.state = 515;
+			this.columnExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public limitByClause(): LimitByClauseContext {
+		let _localctx: LimitByClauseContext = new LimitByClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 74, TSQLParser.RULE_limitByClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 517;
+			this.match(TSQLParser.LIMIT);
+			this.state = 518;
+			this.limitExpr();
+			this.state = 519;
+			this.match(TSQLParser.BY);
+			this.state = 520;
+			this.columnExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public limitAndOffsetClause(): LimitAndOffsetClauseContext {
+		let _localctx: LimitAndOffsetClauseContext = new LimitAndOffsetClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 76, TSQLParser.RULE_limitAndOffsetClause);
+		let _la: number;
+		try {
+			this.state = 541;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 55, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 522;
+				this.match(TSQLParser.LIMIT);
+				this.state = 523;
+				this.columnExpr(0);
+				this.state = 526;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COMMA) {
+					{
+					this.state = 524;
+					this.match(TSQLParser.COMMA);
+					this.state = 525;
+					this.columnExpr(0);
+					}
+				}
+
+				this.state = 530;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.WITH) {
+					{
+					this.state = 528;
+					this.match(TSQLParser.WITH);
+					this.state = 529;
+					this.match(TSQLParser.TIES);
+					}
+				}
+
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 532;
+				this.match(TSQLParser.LIMIT);
+				this.state = 533;
+				this.columnExpr(0);
+				this.state = 536;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.WITH) {
+					{
+					this.state = 534;
+					this.match(TSQLParser.WITH);
+					this.state = 535;
+					this.match(TSQLParser.TIES);
+					}
+				}
+
+				this.state = 538;
+				this.match(TSQLParser.OFFSET);
+				this.state = 539;
+				this.columnExpr(0);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public offsetOnlyClause(): OffsetOnlyClauseContext {
+		let _localctx: OffsetOnlyClauseContext = new OffsetOnlyClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 78, TSQLParser.RULE_offsetOnlyClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 543;
+			this.match(TSQLParser.OFFSET);
+			this.state = 544;
+			this.columnExpr(0);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public settingsClause(): SettingsClauseContext {
+		let _localctx: SettingsClauseContext = new SettingsClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 80, TSQLParser.RULE_settingsClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 546;
+			this.match(TSQLParser.SETTINGS);
+			this.state = 547;
+			this.settingExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+
+	public joinExpr(): JoinExprContext;
+	public joinExpr(_p: number): JoinExprContext;
+	// @RuleVersion(0)
+	public joinExpr(_p?: number): JoinExprContext {
+		if (_p === undefined) {
+			_p = 0;
+		}
+
+		let _parentctx: ParserRuleContext = this._ctx;
+		let _parentState: number = this.state;
+		let _localctx: JoinExprContext = new JoinExprContext(this._ctx, _parentState);
+		let _prevctx: JoinExprContext = _localctx;
+		let _startState: number = 82;
+		this.enterRecursionRule(_localctx, 82, TSQLParser.RULE_joinExpr, _p);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 561;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 58, this._ctx) ) {
+			case 1:
+				{
+				_localctx = new JoinExprTableContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+
+				this.state = 550;
+				this.tableExpr(0);
+				this.state = 552;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 56, this._ctx) ) {
+				case 1:
+					{
+					this.state = 551;
+					this.match(TSQLParser.FINAL);
+					}
+					break;
+				}
+				this.state = 555;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 57, this._ctx) ) {
+				case 1:
+					{
+					this.state = 554;
+					this.sampleClause();
+					}
+					break;
+				}
+				}
+				break;
+
+			case 2:
+				{
+				_localctx = new JoinExprParensContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 557;
+				this.match(TSQLParser.LPAREN);
+				this.state = 558;
+				this.joinExpr(0);
+				this.state = 559;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+			}
+			this._ctx._stop = this._input.tryLT(-1);
+			this.state = 577;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 61, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					if (this._parseListeners != null) {
+						this.triggerExitRuleEvent();
+					}
+					_prevctx = _localctx;
+					{
+					this.state = 575;
+					this._errHandler.sync(this);
+					switch ( this.interpreter.adaptivePredict(this._input, 60, this._ctx) ) {
+					case 1:
+						{
+						_localctx = new JoinExprCrossOpContext(new JoinExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_joinExpr);
+						this.state = 563;
+						if (!(this.precpred(this._ctx, 3))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
+						}
+						this.state = 564;
+						this.joinOpCross();
+						this.state = 565;
+						this.joinExpr(4);
+						}
+						break;
+
+					case 2:
+						{
+						_localctx = new JoinExprOpContext(new JoinExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_joinExpr);
+						this.state = 567;
+						if (!(this.precpred(this._ctx, 4))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
+						}
+						this.state = 569;
+						this._errHandler.sync(this);
+						_la = this._input.LA(1);
+						if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0) || ((((_la - 36)) & ~0x1F) === 0 && ((1 << (_la - 36)) & ((1 << (TSQLParser.FULL - 36)) | (1 << (TSQLParser.INNER - 36)) | (1 << (TSQLParser.LEFT - 36)))) !== 0) || _la === TSQLParser.RIGHT || _la === TSQLParser.SEMI) {
+							{
+							this.state = 568;
+							this.joinOp();
+							}
+						}
+
+						this.state = 571;
+						this.match(TSQLParser.JOIN);
+						this.state = 572;
+						this.joinExpr(0);
+						this.state = 573;
+						this.joinConstraintClause();
+						}
+						break;
+					}
+					}
+				}
+				this.state = 579;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 61, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.unrollRecursionContexts(_parentctx);
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public joinOp(): JoinOpContext {
+		let _localctx: JoinOpContext = new JoinOpContext(this._ctx, this.state);
+		this.enterRule(_localctx, 84, TSQLParser.RULE_joinOp);
+		let _la: number;
+		try {
+			this.state = 623;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 75, this._ctx) ) {
+			case 1:
+				_localctx = new JoinOpInnerContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 589;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 64, this._ctx) ) {
+				case 1:
+					{
+					this.state = 581;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0)) {
+						{
+						this.state = 580;
+						_la = this._input.LA(1);
+						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0))) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						}
+					}
+
+					this.state = 583;
+					this.match(TSQLParser.INNER);
+					}
+					break;
+
+				case 2:
+					{
+					this.state = 584;
+					this.match(TSQLParser.INNER);
+					this.state = 586;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0)) {
+						{
+						this.state = 585;
+						_la = this._input.LA(1);
+						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0))) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						}
+					}
+
+					}
+					break;
+
+				case 3:
+					{
+					this.state = 588;
+					_la = this._input.LA(1);
+					if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0))) {
+					this._errHandler.recoverInline(this);
+					} else {
+						if (this._input.LA(1) === Token.EOF) {
+							this.matchedEOF = true;
+						}
+
+						this._errHandler.reportMatch(this);
+						this.consume();
+					}
+					}
+					break;
+				}
+				}
+				break;
+
+			case 2:
+				_localctx = new JoinOpLeftRightContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 605;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 69, this._ctx) ) {
+				case 1:
+					{
+					this.state = 592;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0) || _la === TSQLParser.SEMI) {
+						{
+						this.state = 591;
+						_la = this._input.LA(1);
+						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0) || _la === TSQLParser.SEMI)) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						}
+					}
+
+					this.state = 594;
+					_la = this._input.LA(1);
+					if (!(_la === TSQLParser.LEFT || _la === TSQLParser.RIGHT)) {
+					this._errHandler.recoverInline(this);
+					} else {
+						if (this._input.LA(1) === Token.EOF) {
+							this.matchedEOF = true;
+						}
+
+						this._errHandler.reportMatch(this);
+						this.consume();
+					}
+					this.state = 596;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if (_la === TSQLParser.OUTER) {
+						{
+						this.state = 595;
+						this.match(TSQLParser.OUTER);
+						}
+					}
+
+					}
+					break;
+
+				case 2:
+					{
+					this.state = 598;
+					_la = this._input.LA(1);
+					if (!(_la === TSQLParser.LEFT || _la === TSQLParser.RIGHT)) {
+					this._errHandler.recoverInline(this);
+					} else {
+						if (this._input.LA(1) === Token.EOF) {
+							this.matchedEOF = true;
+						}
+
+						this._errHandler.reportMatch(this);
+						this.consume();
+					}
+					this.state = 600;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if (_la === TSQLParser.OUTER) {
+						{
+						this.state = 599;
+						this.match(TSQLParser.OUTER);
+						}
+					}
+
+					this.state = 603;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0) || _la === TSQLParser.SEMI) {
+						{
+						this.state = 602;
+						_la = this._input.LA(1);
+						if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ASOF))) !== 0) || _la === TSQLParser.SEMI)) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						}
+					}
+
+					}
+					break;
+				}
+				}
+				break;
+
+			case 3:
+				_localctx = new JoinOpFullContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 621;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 74, this._ctx) ) {
+				case 1:
+					{
+					this.state = 608;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if (_la === TSQLParser.ALL || _la === TSQLParser.ANY) {
+						{
+						this.state = 607;
+						_la = this._input.LA(1);
+						if (!(_la === TSQLParser.ALL || _la === TSQLParser.ANY)) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						}
+					}
+
+					this.state = 610;
+					this.match(TSQLParser.FULL);
+					this.state = 612;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if (_la === TSQLParser.OUTER) {
+						{
+						this.state = 611;
+						this.match(TSQLParser.OUTER);
+						}
+					}
+
+					}
+					break;
+
+				case 2:
+					{
+					this.state = 614;
+					this.match(TSQLParser.FULL);
+					this.state = 616;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if (_la === TSQLParser.OUTER) {
+						{
+						this.state = 615;
+						this.match(TSQLParser.OUTER);
+						}
+					}
+
+					this.state = 619;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if (_la === TSQLParser.ALL || _la === TSQLParser.ANY) {
+						{
+						this.state = 618;
+						_la = this._input.LA(1);
+						if (!(_la === TSQLParser.ALL || _la === TSQLParser.ANY)) {
+						this._errHandler.recoverInline(this);
+						} else {
+							if (this._input.LA(1) === Token.EOF) {
+								this.matchedEOF = true;
+							}
+
+							this._errHandler.reportMatch(this);
+							this.consume();
+						}
+						}
+					}
+
+					}
+					break;
+				}
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public joinOpCross(): JoinOpCrossContext {
+		let _localctx: JoinOpCrossContext = new JoinOpCrossContext(this._ctx, this.state);
+		this.enterRule(_localctx, 86, TSQLParser.RULE_joinOpCross);
+		try {
+			this.state = 628;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.CROSS:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 625;
+				this.match(TSQLParser.CROSS);
+				this.state = 626;
+				this.match(TSQLParser.JOIN);
+				}
+				break;
+			case TSQLParser.COMMA:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 627;
+				this.match(TSQLParser.COMMA);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public joinConstraintClause(): JoinConstraintClauseContext {
+		let _localctx: JoinConstraintClauseContext = new JoinConstraintClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 88, TSQLParser.RULE_joinConstraintClause);
+		try {
+			this.state = 639;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 77, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 630;
+				this.match(TSQLParser.ON);
+				this.state = 631;
+				this.columnExprList();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 632;
+				this.match(TSQLParser.USING);
+				this.state = 633;
+				this.match(TSQLParser.LPAREN);
+				this.state = 634;
+				this.columnExprList();
+				this.state = 635;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 3:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 637;
+				this.match(TSQLParser.USING);
+				this.state = 638;
+				this.columnExprList();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public sampleClause(): SampleClauseContext {
+		let _localctx: SampleClauseContext = new SampleClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 90, TSQLParser.RULE_sampleClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 641;
+			this.match(TSQLParser.SAMPLE);
+			this.state = 642;
+			this.ratioExpr();
+			this.state = 645;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 78, this._ctx) ) {
+			case 1:
+				{
+				this.state = 643;
+				this.match(TSQLParser.OFFSET);
+				this.state = 644;
+				this.ratioExpr();
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public limitExpr(): LimitExprContext {
+		let _localctx: LimitExprContext = new LimitExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 92, TSQLParser.RULE_limitExpr);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 647;
+			this.columnExpr(0);
+			this.state = 650;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.OFFSET || _la === TSQLParser.COMMA) {
+				{
+				this.state = 648;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.OFFSET || _la === TSQLParser.COMMA)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 649;
+				this.columnExpr(0);
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public orderExprList(): OrderExprListContext {
+		let _localctx: OrderExprListContext = new OrderExprListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 94, TSQLParser.RULE_orderExprList);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 652;
+			this.orderExpr();
+			this.state = 657;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.COMMA) {
+				{
+				{
+				this.state = 653;
+				this.match(TSQLParser.COMMA);
+				this.state = 654;
+				this.orderExpr();
+				}
+				}
+				this.state = 659;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public orderExpr(): OrderExprContext {
+		let _localctx: OrderExprContext = new OrderExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 96, TSQLParser.RULE_orderExpr);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 660;
+			this.columnExpr(0);
+			this.state = 662;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ASCENDING) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING))) !== 0)) {
+				{
+				this.state = 661;
+				_la = this._input.LA(1);
+				if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ASCENDING) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING))) !== 0))) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+			}
+
+			this.state = 666;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.NULLS) {
+				{
+				this.state = 664;
+				this.match(TSQLParser.NULLS);
+				this.state = 665;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.FIRST || _la === TSQLParser.LAST)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+			}
+
+			this.state = 670;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COLLATE) {
+				{
+				this.state = 668;
+				this.match(TSQLParser.COLLATE);
+				this.state = 669;
+				this.match(TSQLParser.STRING_LITERAL);
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public ratioExpr(): RatioExprContext {
+		let _localctx: RatioExprContext = new RatioExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 98, TSQLParser.RULE_ratioExpr);
+		try {
+			this.state = 678;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.LBRACE:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 672;
+				this.placeholder();
+				}
+				break;
+			case TSQLParser.INF:
+			case TSQLParser.NAN_SQL:
+			case TSQLParser.FLOATING_LITERAL:
+			case TSQLParser.OCTAL_LITERAL:
+			case TSQLParser.DECIMAL_LITERAL:
+			case TSQLParser.HEXADECIMAL_LITERAL:
+			case TSQLParser.DASH:
+			case TSQLParser.DOT:
+			case TSQLParser.PLUS:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 673;
+				this.numberLiteral();
+				this.state = 676;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 84, this._ctx) ) {
+				case 1:
+					{
+					this.state = 674;
+					this.match(TSQLParser.SLASH);
+					this.state = 675;
+					this.numberLiteral();
+					}
+					break;
+				}
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public settingExprList(): SettingExprListContext {
+		let _localctx: SettingExprListContext = new SettingExprListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 100, TSQLParser.RULE_settingExprList);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 680;
+			this.settingExpr();
+			this.state = 685;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.COMMA) {
+				{
+				{
+				this.state = 681;
+				this.match(TSQLParser.COMMA);
+				this.state = 682;
+				this.settingExpr();
+				}
+				}
+				this.state = 687;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public settingExpr(): SettingExprContext {
+		let _localctx: SettingExprContext = new SettingExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 102, TSQLParser.RULE_settingExpr);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 688;
+			this.identifier();
+			this.state = 689;
+			this.match(TSQLParser.EQ_SINGLE);
+			this.state = 690;
+			this.literal();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public windowExpr(): WindowExprContext {
+		let _localctx: WindowExprContext = new WindowExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 104, TSQLParser.RULE_windowExpr);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 693;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.PARTITION) {
+				{
+				this.state = 692;
+				this.winPartitionByClause();
+				}
+			}
+
+			this.state = 696;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.ORDER) {
+				{
+				this.state = 695;
+				this.winOrderByClause();
+				}
+			}
+
+			this.state = 699;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.RANGE || _la === TSQLParser.ROWS) {
+				{
+				this.state = 698;
+				this.winFrameClause();
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public winPartitionByClause(): WinPartitionByClauseContext {
+		let _localctx: WinPartitionByClauseContext = new WinPartitionByClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 106, TSQLParser.RULE_winPartitionByClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 701;
+			this.match(TSQLParser.PARTITION);
+			this.state = 702;
+			this.match(TSQLParser.BY);
+			this.state = 703;
+			this.columnExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public winOrderByClause(): WinOrderByClauseContext {
+		let _localctx: WinOrderByClauseContext = new WinOrderByClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 108, TSQLParser.RULE_winOrderByClause);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 705;
+			this.match(TSQLParser.ORDER);
+			this.state = 706;
+			this.match(TSQLParser.BY);
+			this.state = 707;
+			this.orderExprList();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public winFrameClause(): WinFrameClauseContext {
+		let _localctx: WinFrameClauseContext = new WinFrameClauseContext(this._ctx, this.state);
+		this.enterRule(_localctx, 110, TSQLParser.RULE_winFrameClause);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 709;
+			_la = this._input.LA(1);
+			if (!(_la === TSQLParser.RANGE || _la === TSQLParser.ROWS)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			this.state = 710;
+			this.winFrameExtend();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public winFrameExtend(): WinFrameExtendContext {
+		let _localctx: WinFrameExtendContext = new WinFrameExtendContext(this._ctx, this.state);
+		this.enterRule(_localctx, 112, TSQLParser.RULE_winFrameExtend);
+		try {
+			this.state = 718;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.CURRENT:
+			case TSQLParser.INF:
+			case TSQLParser.NAN_SQL:
+			case TSQLParser.UNBOUNDED:
+			case TSQLParser.FLOATING_LITERAL:
+			case TSQLParser.OCTAL_LITERAL:
+			case TSQLParser.DECIMAL_LITERAL:
+			case TSQLParser.HEXADECIMAL_LITERAL:
+			case TSQLParser.DASH:
+			case TSQLParser.DOT:
+			case TSQLParser.PLUS:
+				_localctx = new FrameStartContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 712;
+				this.winFrameBound();
+				}
+				break;
+			case TSQLParser.BETWEEN:
+				_localctx = new FrameBetweenContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 713;
+				this.match(TSQLParser.BETWEEN);
+				this.state = 714;
+				this.winFrameBound();
+				this.state = 715;
+				this.match(TSQLParser.AND);
+				this.state = 716;
+				this.winFrameBound();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public winFrameBound(): WinFrameBoundContext {
+		let _localctx: WinFrameBoundContext = new WinFrameBoundContext(this._ctx, this.state);
+		this.enterRule(_localctx, 114, TSQLParser.RULE_winFrameBound);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 732;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 91, this._ctx) ) {
+			case 1:
+				{
+				this.state = 720;
+				this.match(TSQLParser.CURRENT);
+				this.state = 721;
+				this.match(TSQLParser.ROW);
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 722;
+				this.match(TSQLParser.UNBOUNDED);
+				this.state = 723;
+				this.match(TSQLParser.PRECEDING);
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 724;
+				this.match(TSQLParser.UNBOUNDED);
+				this.state = 725;
+				this.match(TSQLParser.FOLLOWING);
+				}
+				break;
+
+			case 4:
+				{
+				this.state = 726;
+				this.numberLiteral();
+				this.state = 727;
+				this.match(TSQLParser.PRECEDING);
+				}
+				break;
+
+			case 5:
+				{
+				this.state = 729;
+				this.numberLiteral();
+				this.state = 730;
+				this.match(TSQLParser.FOLLOWING);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public expr(): ExprContext {
+		let _localctx: ExprContext = new ExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 116, TSQLParser.RULE_expr);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 734;
+			this.columnExpr(0);
+			this.state = 735;
+			this.match(TSQLParser.EOF);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public columnTypeExpr(): ColumnTypeExprContext {
+		let _localctx: ColumnTypeExprContext = new ColumnTypeExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 118, TSQLParser.RULE_columnTypeExpr);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.state = 793;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 99, this._ctx) ) {
+			case 1:
+				_localctx = new ColumnTypeExprSimpleContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 737;
+				this.identifier();
+				}
+				break;
+
+			case 2:
+				_localctx = new ColumnTypeExprNestedContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 738;
+				this.identifier();
+				this.state = 739;
+				this.match(TSQLParser.LPAREN);
+				this.state = 740;
+				this.identifier();
+				this.state = 741;
+				this.columnTypeExpr();
+				this.state = 748;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 92, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 742;
+						this.match(TSQLParser.COMMA);
+						this.state = 743;
+						this.identifier();
+						this.state = 744;
+						this.columnTypeExpr();
+						}
+						}
+					}
+					this.state = 750;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 92, this._ctx);
+				}
+				this.state = 752;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COMMA) {
+					{
+					this.state = 751;
+					this.match(TSQLParser.COMMA);
+					}
+				}
+
+				this.state = 754;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 3:
+				_localctx = new ColumnTypeExprEnumContext(_localctx);
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 756;
+				this.identifier();
+				this.state = 757;
+				this.match(TSQLParser.LPAREN);
+				this.state = 758;
+				this.enumValue();
+				this.state = 763;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 94, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 759;
+						this.match(TSQLParser.COMMA);
+						this.state = 760;
+						this.enumValue();
+						}
+						}
+					}
+					this.state = 765;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 94, this._ctx);
+				}
+				this.state = 767;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COMMA) {
+					{
+					this.state = 766;
+					this.match(TSQLParser.COMMA);
+					}
+				}
+
+				this.state = 769;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 4:
+				_localctx = new ColumnTypeExprComplexContext(_localctx);
+				this.enterOuterAlt(_localctx, 4);
+				{
+				this.state = 771;
+				this.identifier();
+				this.state = 772;
+				this.match(TSQLParser.LPAREN);
+				this.state = 773;
+				this.columnTypeExpr();
+				this.state = 778;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 96, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 774;
+						this.match(TSQLParser.COMMA);
+						this.state = 775;
+						this.columnTypeExpr();
+						}
+						}
+					}
+					this.state = 780;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 96, this._ctx);
+				}
+				this.state = 782;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COMMA) {
+					{
+					this.state = 781;
+					this.match(TSQLParser.COMMA);
+					}
+				}
+
+				this.state = 784;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 5:
+				_localctx = new ColumnTypeExprParamContext(_localctx);
+				this.enterOuterAlt(_localctx, 5);
+				{
+				this.state = 786;
+				this.identifier();
+				this.state = 787;
+				this.match(TSQLParser.LPAREN);
+				this.state = 789;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+					{
+					this.state = 788;
+					this.columnExprList();
+					}
+				}
+
+				this.state = 791;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public columnExprList(): ColumnExprListContext {
+		let _localctx: ColumnExprListContext = new ColumnExprListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 120, TSQLParser.RULE_columnExprList);
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 795;
+			this.columnExpr(0);
+			this.state = 800;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 100, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 796;
+					this.match(TSQLParser.COMMA);
+					this.state = 797;
+					this.columnExpr(0);
+					}
+					}
+				}
+				this.state = 802;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 100, this._ctx);
+			}
+			this.state = 804;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 101, this._ctx) ) {
+			case 1:
+				{
+				this.state = 803;
+				this.match(TSQLParser.COMMA);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+
+	public columnExpr(): ColumnExprContext;
+	public columnExpr(_p: number): ColumnExprContext;
+	// @RuleVersion(0)
+	public columnExpr(_p?: number): ColumnExprContext {
+		if (_p === undefined) {
+			_p = 0;
+		}
+
+		let _parentctx: ParserRuleContext = this._ctx;
+		let _parentState: number = this.state;
+		let _localctx: ColumnExprContext = new ColumnExprContext(this._ctx, _parentState);
+		let _prevctx: ColumnExprContext = _localctx;
+		let _startState: number = 122;
+		this.enterRecursionRule(_localctx, 122, TSQLParser.RULE_columnExpr, _p);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 958;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 121, this._ctx) ) {
+			case 1:
+				{
+				_localctx = new ColumnExprCaseContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+
+				this.state = 807;
+				this.match(TSQLParser.CASE);
+				this.state = 809;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 102, this._ctx) ) {
+				case 1:
+					{
+					this.state = 808;
+					(_localctx as ColumnExprCaseContext)._caseExpr = this.columnExpr(0);
+					}
+					break;
+				}
+				this.state = 816;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				do {
+					{
+					{
+					this.state = 811;
+					this.match(TSQLParser.WHEN);
+					this.state = 812;
+					(_localctx as ColumnExprCaseContext)._whenExpr = this.columnExpr(0);
+					this.state = 813;
+					this.match(TSQLParser.THEN);
+					this.state = 814;
+					(_localctx as ColumnExprCaseContext)._thenExpr = this.columnExpr(0);
+					}
+					}
+					this.state = 818;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				} while (_la === TSQLParser.WHEN);
+				this.state = 822;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.ELSE) {
+					{
+					this.state = 820;
+					this.match(TSQLParser.ELSE);
+					this.state = 821;
+					(_localctx as ColumnExprCaseContext)._elseExpr = this.columnExpr(0);
+					}
+				}
+
+				this.state = 824;
+				this.match(TSQLParser.END);
+				}
+				break;
+
+			case 2:
+				{
+				_localctx = new ColumnExprCastContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 826;
+				this.match(TSQLParser.CAST);
+				this.state = 827;
+				this.match(TSQLParser.LPAREN);
+				this.state = 828;
+				this.columnExpr(0);
+				this.state = 829;
+				this.match(TSQLParser.AS);
+				this.state = 830;
+				this.columnTypeExpr();
+				this.state = 831;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 3:
+				{
+				_localctx = new ColumnExprDateContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 833;
+				this.match(TSQLParser.DATE);
+				this.state = 834;
+				this.match(TSQLParser.STRING_LITERAL);
+				}
+				break;
+
+			case 4:
+				{
+				_localctx = new ColumnExprIntervalStringContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 835;
+				this.match(TSQLParser.INTERVAL);
+				this.state = 836;
+				this.match(TSQLParser.STRING_LITERAL);
+				}
+				break;
+
+			case 5:
+				{
+				_localctx = new ColumnExprIntervalContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 837;
+				this.match(TSQLParser.INTERVAL);
+				this.state = 838;
+				this.columnExpr(0);
+				this.state = 839;
+				this.interval();
+				}
+				break;
+
+			case 6:
+				{
+				_localctx = new ColumnExprSubstringContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 841;
+				this.match(TSQLParser.SUBSTRING);
+				this.state = 842;
+				this.match(TSQLParser.LPAREN);
+				this.state = 843;
+				this.columnExpr(0);
+				this.state = 844;
+				this.match(TSQLParser.FROM);
+				this.state = 845;
+				this.columnExpr(0);
+				this.state = 848;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.FOR) {
+					{
+					this.state = 846;
+					this.match(TSQLParser.FOR);
+					this.state = 847;
+					this.columnExpr(0);
+					}
+				}
+
+				this.state = 850;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 7:
+				{
+				_localctx = new ColumnExprTimestampContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 852;
+				this.match(TSQLParser.TIMESTAMP);
+				this.state = 853;
+				this.match(TSQLParser.STRING_LITERAL);
+				}
+				break;
+
+			case 8:
+				{
+				_localctx = new ColumnExprTrimContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 854;
+				this.match(TSQLParser.TRIM);
+				this.state = 855;
+				this.match(TSQLParser.LPAREN);
+				this.state = 856;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.BOTH || _la === TSQLParser.LEADING || _la === TSQLParser.TRAILING)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				this.state = 857;
+				this.string();
+				this.state = 858;
+				this.match(TSQLParser.FROM);
+				this.state = 859;
+				this.columnExpr(0);
+				this.state = 860;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 9:
+				{
+				_localctx = new ColumnExprWinFunctionContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 862;
+				this.identifier();
+				{
+				this.state = 863;
+				this.match(TSQLParser.LPAREN);
+				this.state = 865;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+					{
+					this.state = 864;
+					(_localctx as ColumnExprWinFunctionContext)._columnExprs = this.columnExprList();
+					}
+				}
+
+				this.state = 867;
+				this.match(TSQLParser.RPAREN);
+				}
+				this.state = 877;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.LPAREN) {
+					{
+					this.state = 869;
+					this.match(TSQLParser.LPAREN);
+					this.state = 871;
+					this._errHandler.sync(this);
+					switch ( this.interpreter.adaptivePredict(this._input, 107, this._ctx) ) {
+					case 1:
+						{
+						this.state = 870;
+						this.match(TSQLParser.DISTINCT);
+						}
+						break;
+					}
+					this.state = 874;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+						{
+						this.state = 873;
+						(_localctx as ColumnExprWinFunctionContext)._columnArgList = this.columnExprList();
+						}
+					}
+
+					this.state = 876;
+					this.match(TSQLParser.RPAREN);
+					}
+				}
+
+				this.state = 879;
+				this.match(TSQLParser.OVER);
+				this.state = 880;
+				this.match(TSQLParser.LPAREN);
+				this.state = 881;
+				this.windowExpr();
+				this.state = 882;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 10:
+				{
+				_localctx = new ColumnExprWinFunctionTargetContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 884;
+				this.identifier();
+				{
+				this.state = 885;
+				this.match(TSQLParser.LPAREN);
+				this.state = 887;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+					{
+					this.state = 886;
+					(_localctx as ColumnExprWinFunctionTargetContext)._columnExprs = this.columnExprList();
+					}
+				}
+
+				this.state = 889;
+				this.match(TSQLParser.RPAREN);
+				}
+				this.state = 899;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.LPAREN) {
+					{
+					this.state = 891;
+					this.match(TSQLParser.LPAREN);
+					this.state = 893;
+					this._errHandler.sync(this);
+					switch ( this.interpreter.adaptivePredict(this._input, 111, this._ctx) ) {
+					case 1:
+						{
+						this.state = 892;
+						this.match(TSQLParser.DISTINCT);
+						}
+						break;
+					}
+					this.state = 896;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+						{
+						this.state = 895;
+						(_localctx as ColumnExprWinFunctionTargetContext)._columnArgList = this.columnExprList();
+						}
+					}
+
+					this.state = 898;
+					this.match(TSQLParser.RPAREN);
+					}
+				}
+
+				this.state = 901;
+				this.match(TSQLParser.OVER);
+				this.state = 902;
+				this.identifier();
+				}
+				break;
+
+			case 11:
+				{
+				_localctx = new ColumnExprFunctionContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 904;
+				this.identifier();
+				this.state = 910;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 115, this._ctx) ) {
+				case 1:
+					{
+					this.state = 905;
+					this.match(TSQLParser.LPAREN);
+					this.state = 907;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+					if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+						{
+						this.state = 906;
+						(_localctx as ColumnExprFunctionContext)._columnExprs = this.columnExprList();
+						}
+					}
+
+					this.state = 909;
+					this.match(TSQLParser.RPAREN);
+					}
+					break;
+				}
+				this.state = 912;
+				this.match(TSQLParser.LPAREN);
+				this.state = 914;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 116, this._ctx) ) {
+				case 1:
+					{
+					this.state = 913;
+					this.match(TSQLParser.DISTINCT);
+					}
+					break;
+				}
+				this.state = 917;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+					{
+					this.state = 916;
+					(_localctx as ColumnExprFunctionContext)._columnArgList = this.columnExprList();
+					}
+				}
+
+				this.state = 919;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 12:
+				{
+				_localctx = new ColumnExprTagElementContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 921;
+				this.tSQLxTagElement();
+				}
+				break;
+
+			case 13:
+				{
+				_localctx = new ColumnExprTemplateStringContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 922;
+				this.templateString();
+				}
+				break;
+
+			case 14:
+				{
+				_localctx = new ColumnExprLiteralContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 923;
+				this.literal();
+				}
+				break;
+
+			case 15:
+				{
+				_localctx = new ColumnExprNegateContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 924;
+				this.match(TSQLParser.DASH);
+				this.state = 925;
+				this.columnExpr(20);
+				}
+				break;
+
+			case 16:
+				{
+				_localctx = new ColumnExprNotContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 926;
+				this.match(TSQLParser.NOT);
+				this.state = 927;
+				this.columnExpr(14);
+				}
+				break;
+
+			case 17:
+				{
+				_localctx = new ColumnExprAsteriskContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 931;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)))) !== 0)) {
+					{
+					this.state = 928;
+					this.tableIdentifier();
+					this.state = 929;
+					this.match(TSQLParser.DOT);
+					}
+				}
+
+				this.state = 933;
+				this.match(TSQLParser.ASTERISK);
+				}
+				break;
+
+			case 18:
+				{
+				_localctx = new ColumnExprSubqueryContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 934;
+				this.match(TSQLParser.LPAREN);
+				this.state = 935;
+				this.selectSetStmt();
+				this.state = 936;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 19:
+				{
+				_localctx = new ColumnExprParensContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 938;
+				this.match(TSQLParser.LPAREN);
+				this.state = 939;
+				this.columnExpr(0);
+				this.state = 940;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 20:
+				{
+				_localctx = new ColumnExprTupleContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 942;
+				this.match(TSQLParser.LPAREN);
+				this.state = 943;
+				this.columnExprList();
+				this.state = 944;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 21:
+				{
+				_localctx = new ColumnExprArrayContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 946;
+				this.match(TSQLParser.LBRACKET);
+				this.state = 948;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+					{
+					this.state = 947;
+					this.columnExprList();
+					}
+				}
+
+				this.state = 950;
+				this.match(TSQLParser.RBRACKET);
+				}
+				break;
+
+			case 22:
+				{
+				_localctx = new ColumnExprDictContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 951;
+				this.match(TSQLParser.LBRACE);
+				this.state = 953;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+					{
+					this.state = 952;
+					this.kvPairList();
+					}
+				}
+
+				this.state = 955;
+				this.match(TSQLParser.RBRACE);
+				}
+				break;
+
+			case 23:
+				{
+				_localctx = new ColumnExprLambdaContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 956;
+				this.columnLambdaExpr();
+				}
+				break;
+
+			case 24:
+				{
+				_localctx = new ColumnExprIdentifierContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 957;
+				this.columnIdentifier();
+				}
+				break;
+			}
+			this._ctx._stop = this._input.tryLT(-1);
+			this.state = 1075;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 133, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					if (this._parseListeners != null) {
+						this.triggerExitRuleEvent();
+					}
+					_prevctx = _localctx;
+					{
+					this.state = 1073;
+					this._errHandler.sync(this);
+					switch ( this.interpreter.adaptivePredict(this._input, 132, this._ctx) ) {
+					case 1:
+						{
+						_localctx = new ColumnExprPrecedence1Context(new ColumnExprContext(_parentctx, _parentState));
+						(_localctx as ColumnExprPrecedence1Context)._left = _prevctx;
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 960;
+						if (!(this.precpred(this._ctx, 19))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 19)");
+						}
+						this.state = 964;
+						this._errHandler.sync(this);
+						switch (this._input.LA(1)) {
+						case TSQLParser.ASTERISK:
+							{
+							this.state = 961;
+							(_localctx as ColumnExprPrecedence1Context)._operator = this.match(TSQLParser.ASTERISK);
+							}
+							break;
+						case TSQLParser.SLASH:
+							{
+							this.state = 962;
+							(_localctx as ColumnExprPrecedence1Context)._operator = this.match(TSQLParser.SLASH);
+							}
+							break;
+						case TSQLParser.PERCENT:
+							{
+							this.state = 963;
+							(_localctx as ColumnExprPrecedence1Context)._operator = this.match(TSQLParser.PERCENT);
+							}
+							break;
+						default:
+							throw new NoViableAltException(this);
+						}
+						this.state = 966;
+						(_localctx as ColumnExprPrecedence1Context)._right = this.columnExpr(20);
+						}
+						break;
+
+					case 2:
+						{
+						_localctx = new ColumnExprPrecedence2Context(new ColumnExprContext(_parentctx, _parentState));
+						(_localctx as ColumnExprPrecedence2Context)._left = _prevctx;
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 967;
+						if (!(this.precpred(this._ctx, 18))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 18)");
+						}
+						this.state = 971;
+						this._errHandler.sync(this);
+						switch (this._input.LA(1)) {
+						case TSQLParser.PLUS:
+							{
+							this.state = 968;
+							(_localctx as ColumnExprPrecedence2Context)._operator = this.match(TSQLParser.PLUS);
+							}
+							break;
+						case TSQLParser.DASH:
+							{
+							this.state = 969;
+							(_localctx as ColumnExprPrecedence2Context)._operator = this.match(TSQLParser.DASH);
+							}
+							break;
+						case TSQLParser.CONCAT:
+							{
+							this.state = 970;
+							(_localctx as ColumnExprPrecedence2Context)._operator = this.match(TSQLParser.CONCAT);
+							}
+							break;
+						default:
+							throw new NoViableAltException(this);
+						}
+						this.state = 973;
+						(_localctx as ColumnExprPrecedence2Context)._right = this.columnExpr(19);
+						}
+						break;
+
+					case 3:
+						{
+						_localctx = new ColumnExprPrecedence3Context(new ColumnExprContext(_parentctx, _parentState));
+						(_localctx as ColumnExprPrecedence3Context)._left = _prevctx;
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 974;
+						if (!(this.precpred(this._ctx, 17))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 17)");
+						}
+						this.state = 999;
+						this._errHandler.sync(this);
+						switch ( this.interpreter.adaptivePredict(this._input, 127, this._ctx) ) {
+						case 1:
+							{
+							this.state = 975;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.EQ_DOUBLE);
+							}
+							break;
+
+						case 2:
+							{
+							this.state = 976;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.EQ_SINGLE);
+							}
+							break;
+
+						case 3:
+							{
+							this.state = 977;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.NOT_EQ);
+							}
+							break;
+
+						case 4:
+							{
+							this.state = 978;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.LT_EQ);
+							}
+							break;
+
+						case 5:
+							{
+							this.state = 979;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.LT);
+							}
+							break;
+
+						case 6:
+							{
+							this.state = 980;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.GT_EQ);
+							}
+							break;
+
+						case 7:
+							{
+							this.state = 981;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.GT);
+							}
+							break;
+
+						case 8:
+							{
+							this.state = 983;
+							this._errHandler.sync(this);
+							_la = this._input.LA(1);
+							if (_la === TSQLParser.NOT) {
+								{
+								this.state = 982;
+								(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.NOT);
+								}
+							}
+
+							this.state = 985;
+							this.match(TSQLParser.IN);
+							this.state = 987;
+							this._errHandler.sync(this);
+							switch ( this.interpreter.adaptivePredict(this._input, 125, this._ctx) ) {
+							case 1:
+								{
+								this.state = 986;
+								this.match(TSQLParser.COHORT);
+								}
+								break;
+							}
+							}
+							break;
+
+						case 9:
+							{
+							this.state = 990;
+							this._errHandler.sync(this);
+							_la = this._input.LA(1);
+							if (_la === TSQLParser.NOT) {
+								{
+								this.state = 989;
+								(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.NOT);
+								}
+							}
+
+							this.state = 992;
+							_la = this._input.LA(1);
+							if (!(_la === TSQLParser.ILIKE || _la === TSQLParser.LIKE)) {
+							this._errHandler.recoverInline(this);
+							} else {
+								if (this._input.LA(1) === Token.EOF) {
+									this.matchedEOF = true;
+								}
+
+								this._errHandler.reportMatch(this);
+								this.consume();
+							}
+							}
+							break;
+
+						case 10:
+							{
+							this.state = 993;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.REGEX_SINGLE);
+							}
+							break;
+
+						case 11:
+							{
+							this.state = 994;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.REGEX_DOUBLE);
+							}
+							break;
+
+						case 12:
+							{
+							this.state = 995;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.NOT_REGEX);
+							}
+							break;
+
+						case 13:
+							{
+							this.state = 996;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.IREGEX_SINGLE);
+							}
+							break;
+
+						case 14:
+							{
+							this.state = 997;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.IREGEX_DOUBLE);
+							}
+							break;
+
+						case 15:
+							{
+							this.state = 998;
+							(_localctx as ColumnExprPrecedence3Context)._operator = this.match(TSQLParser.NOT_IREGEX);
+							}
+							break;
+						}
+						this.state = 1001;
+						(_localctx as ColumnExprPrecedence3Context)._right = this.columnExpr(18);
+						}
+						break;
+
+					case 4:
+						{
+						_localctx = new ColumnExprNullishContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1002;
+						if (!(this.precpred(this._ctx, 15))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 15)");
+						}
+						this.state = 1003;
+						this.match(TSQLParser.NULLISH);
+						this.state = 1004;
+						this.columnExpr(16);
+						}
+						break;
+
+					case 5:
+						{
+						_localctx = new ColumnExprAndContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1005;
+						if (!(this.precpred(this._ctx, 13))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 13)");
+						}
+						this.state = 1006;
+						this.match(TSQLParser.AND);
+						this.state = 1007;
+						this.columnExpr(14);
+						}
+						break;
+
+					case 6:
+						{
+						_localctx = new ColumnExprOrContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1008;
+						if (!(this.precpred(this._ctx, 12))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 12)");
+						}
+						this.state = 1009;
+						this.match(TSQLParser.OR);
+						this.state = 1010;
+						this.columnExpr(13);
+						}
+						break;
+
+					case 7:
+						{
+						_localctx = new ColumnExprBetweenContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1011;
+						if (!(this.precpred(this._ctx, 11))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 11)");
+						}
+						this.state = 1013;
+						this._errHandler.sync(this);
+						_la = this._input.LA(1);
+						if (_la === TSQLParser.NOT) {
+							{
+							this.state = 1012;
+							this.match(TSQLParser.NOT);
+							}
+						}
+
+						this.state = 1015;
+						this.match(TSQLParser.BETWEEN);
+						this.state = 1016;
+						this.columnExpr(0);
+						this.state = 1017;
+						this.match(TSQLParser.AND);
+						this.state = 1018;
+						this.columnExpr(12);
+						}
+						break;
+
+					case 8:
+						{
+						_localctx = new ColumnExprTernaryOpContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1020;
+						if (!(this.precpred(this._ctx, 10))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 10)");
+						}
+						this.state = 1021;
+						this.match(TSQLParser.QUERY);
+						this.state = 1022;
+						this.columnExpr(0);
+						this.state = 1023;
+						this.match(TSQLParser.COLON);
+						this.state = 1024;
+						this.columnExpr(10);
+						}
+						break;
+
+					case 9:
+						{
+						_localctx = new ColumnExprCallSelectContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1026;
+						if (!(this.precpred(this._ctx, 31))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 31)");
+						}
+						this.state = 1027;
+						this.match(TSQLParser.LPAREN);
+						this.state = 1028;
+						this.selectSetStmt();
+						this.state = 1029;
+						this.match(TSQLParser.RPAREN);
+						}
+						break;
+
+					case 10:
+						{
+						_localctx = new ColumnExprCallContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1031;
+						if (!(this.precpred(this._ctx, 30))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 30)");
+						}
+						this.state = 1032;
+						this.match(TSQLParser.LPAREN);
+						this.state = 1034;
+						this._errHandler.sync(this);
+						_la = this._input.LA(1);
+						if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+							{
+							this.state = 1033;
+							this.columnExprList();
+							}
+						}
+
+						this.state = 1036;
+						this.match(TSQLParser.RPAREN);
+						}
+						break;
+
+					case 11:
+						{
+						_localctx = new ColumnExprArrayAccessContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1037;
+						if (!(this.precpred(this._ctx, 26))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 26)");
+						}
+						this.state = 1038;
+						this.match(TSQLParser.LBRACKET);
+						this.state = 1039;
+						this.columnExpr(0);
+						this.state = 1040;
+						this.match(TSQLParser.RBRACKET);
+						}
+						break;
+
+					case 12:
+						{
+						_localctx = new ColumnExprTupleAccessContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1042;
+						if (!(this.precpred(this._ctx, 25))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 25)");
+						}
+						this.state = 1043;
+						this.match(TSQLParser.DOT);
+						this.state = 1044;
+						this.match(TSQLParser.DECIMAL_LITERAL);
+						}
+						break;
+
+					case 13:
+						{
+						_localctx = new ColumnExprPropertyAccessContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1045;
+						if (!(this.precpred(this._ctx, 24))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 24)");
+						}
+						this.state = 1046;
+						this.match(TSQLParser.DOT);
+						this.state = 1047;
+						this.identifier();
+						}
+						break;
+
+					case 14:
+						{
+						_localctx = new ColumnExprNullArrayAccessContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1048;
+						if (!(this.precpred(this._ctx, 23))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 23)");
+						}
+						this.state = 1049;
+						this.match(TSQLParser.NULL_PROPERTY);
+						this.state = 1050;
+						this.match(TSQLParser.LBRACKET);
+						this.state = 1051;
+						this.columnExpr(0);
+						this.state = 1052;
+						this.match(TSQLParser.RBRACKET);
+						}
+						break;
+
+					case 15:
+						{
+						_localctx = new ColumnExprNullTupleAccessContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1054;
+						if (!(this.precpred(this._ctx, 22))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 22)");
+						}
+						this.state = 1055;
+						this.match(TSQLParser.NULL_PROPERTY);
+						this.state = 1056;
+						this.match(TSQLParser.DECIMAL_LITERAL);
+						}
+						break;
+
+					case 16:
+						{
+						_localctx = new ColumnExprNullPropertyAccessContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1057;
+						if (!(this.precpred(this._ctx, 21))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 21)");
+						}
+						this.state = 1058;
+						this.match(TSQLParser.NULL_PROPERTY);
+						this.state = 1059;
+						this.identifier();
+						}
+						break;
+
+					case 17:
+						{
+						_localctx = new ColumnExprIsNullContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1060;
+						if (!(this.precpred(this._ctx, 16))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 16)");
+						}
+						this.state = 1061;
+						this.match(TSQLParser.IS);
+						this.state = 1063;
+						this._errHandler.sync(this);
+						_la = this._input.LA(1);
+						if (_la === TSQLParser.NOT) {
+							{
+							this.state = 1062;
+							this.match(TSQLParser.NOT);
+							}
+						}
+
+						this.state = 1065;
+						this.match(TSQLParser.NULL_SQL);
+						}
+						break;
+
+					case 18:
+						{
+						_localctx = new ColumnExprAliasContext(new ColumnExprContext(_parentctx, _parentState));
+						this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_columnExpr);
+						this.state = 1066;
+						if (!(this.precpred(this._ctx, 9))) {
+							throw this.createFailedPredicateException("this.precpred(this._ctx, 9)");
+						}
+						this.state = 1071;
+						this._errHandler.sync(this);
+						switch ( this.interpreter.adaptivePredict(this._input, 131, this._ctx) ) {
+						case 1:
+							{
+							this.state = 1067;
+							this.match(TSQLParser.AS);
+							this.state = 1068;
+							this.identifier();
+							}
+							break;
+
+						case 2:
+							{
+							this.state = 1069;
+							this.match(TSQLParser.AS);
+							this.state = 1070;
+							this.match(TSQLParser.STRING_LITERAL);
+							}
+							break;
+						}
+						}
+						break;
+					}
+					}
+				}
+				this.state = 1077;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 133, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.unrollRecursionContexts(_parentctx);
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public columnLambdaExpr(): ColumnLambdaExprContext {
+		let _localctx: ColumnLambdaExprContext = new ColumnLambdaExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 124, TSQLParser.RULE_columnLambdaExpr);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1105;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 138, this._ctx) ) {
+			case 1:
+				{
+				this.state = 1078;
+				this.match(TSQLParser.LPAREN);
+				this.state = 1079;
+				this.identifier();
+				this.state = 1084;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 134, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 1080;
+						this.match(TSQLParser.COMMA);
+						this.state = 1081;
+						this.identifier();
+						}
+						}
+					}
+					this.state = 1086;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 134, this._ctx);
+				}
+				this.state = 1088;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COMMA) {
+					{
+					this.state = 1087;
+					this.match(TSQLParser.COMMA);
+					}
+				}
+
+				this.state = 1090;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 1092;
+				this.identifier();
+				this.state = 1097;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 136, this._ctx);
+				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+					if (_alt === 1) {
+						{
+						{
+						this.state = 1093;
+						this.match(TSQLParser.COMMA);
+						this.state = 1094;
+						this.identifier();
+						}
+						}
+					}
+					this.state = 1099;
+					this._errHandler.sync(this);
+					_alt = this.interpreter.adaptivePredict(this._input, 136, this._ctx);
+				}
+				this.state = 1101;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				if (_la === TSQLParser.COMMA) {
+					{
+					this.state = 1100;
+					this.match(TSQLParser.COMMA);
+					}
+				}
+
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 1103;
+				this.match(TSQLParser.LPAREN);
+				this.state = 1104;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+			}
+			this.state = 1107;
+			this.match(TSQLParser.ARROW);
+			this.state = 1110;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 139, this._ctx) ) {
+			case 1:
+				{
+				this.state = 1108;
+				this.columnExpr(0);
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 1109;
+				this.block();
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tSQLxChildElement(): TSQLxChildElementContext {
+		let _localctx: TSQLxChildElementContext = new TSQLxChildElementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 126, TSQLParser.RULE_tSQLxChildElement);
+		try {
+			this.state = 1118;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.LT:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1112;
+				this.tSQLxTagElement();
+				}
+				break;
+			case TSQLParser.TSQLX_TEXT_TEXT:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1113;
+				this.match(TSQLParser.TSQLX_TEXT_TEXT);
+				}
+				break;
+			case TSQLParser.LBRACE:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 1114;
+				this.match(TSQLParser.LBRACE);
+				this.state = 1115;
+				this.columnExpr(0);
+				this.state = 1116;
+				this.match(TSQLParser.RBRACE);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tSQLxTagElement(): TSQLxTagElementContext {
+		let _localctx: TSQLxTagElementContext = new TSQLxTagElementContext(this._ctx, this.state);
+		this.enterRule(_localctx, 128, TSQLParser.RULE_tSQLxTagElement);
+		let _la: number;
+		try {
+			this.state = 1149;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 144, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1120;
+				this.match(TSQLParser.LT);
+				this.state = 1121;
+				this.identifier();
+				this.state = 1125;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)))) !== 0)) {
+					{
+					{
+					this.state = 1122;
+					this.tSQLxTagAttribute();
+					}
+					}
+					this.state = 1127;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				this.state = 1128;
+				this.match(TSQLParser.SLASH_GT);
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1130;
+				this.match(TSQLParser.LT);
+				this.state = 1131;
+				this.identifier();
+				this.state = 1135;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)))) !== 0)) {
+					{
+					{
+					this.state = 1132;
+					this.tSQLxTagAttribute();
+					}
+					}
+					this.state = 1137;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				this.state = 1138;
+				this.match(TSQLParser.GT);
+				this.state = 1142;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+				while (_la === TSQLParser.LBRACE || _la === TSQLParser.LT || _la === TSQLParser.TSQLX_TEXT_TEXT) {
+					{
+					{
+					this.state = 1139;
+					this.tSQLxChildElement();
+					}
+					}
+					this.state = 1144;
+					this._errHandler.sync(this);
+					_la = this._input.LA(1);
+				}
+				this.state = 1145;
+				this.match(TSQLParser.LT_SLASH);
+				this.state = 1146;
+				this.identifier();
+				this.state = 1147;
+				this.match(TSQLParser.GT);
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tSQLxTagAttribute(): TSQLxTagAttributeContext {
+		let _localctx: TSQLxTagAttributeContext = new TSQLxTagAttributeContext(this._ctx, this.state);
+		this.enterRule(_localctx, 130, TSQLParser.RULE_tSQLxTagAttribute);
+		try {
+			this.state = 1162;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 145, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1151;
+				this.identifier();
+				this.state = 1152;
+				this.match(TSQLParser.EQ_SINGLE);
+				this.state = 1153;
+				this.string();
+				}
+				break;
+
+			case 2:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1155;
+				this.identifier();
+				this.state = 1156;
+				this.match(TSQLParser.EQ_SINGLE);
+				this.state = 1157;
+				this.match(TSQLParser.LBRACE);
+				this.state = 1158;
+				this.columnExpr(0);
+				this.state = 1159;
+				this.match(TSQLParser.RBRACE);
+				}
+				break;
+
+			case 3:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 1161;
+				this.identifier();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public withExprList(): WithExprListContext {
+		let _localctx: WithExprListContext = new WithExprListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 132, TSQLParser.RULE_withExprList);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1164;
+			this.withExpr();
+			this.state = 1169;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 146, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 1165;
+					this.match(TSQLParser.COMMA);
+					this.state = 1166;
+					this.withExpr();
+					}
+					}
+				}
+				this.state = 1171;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 146, this._ctx);
+			}
+			this.state = 1173;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COMMA) {
+				{
+				this.state = 1172;
+				this.match(TSQLParser.COMMA);
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public withExpr(): WithExprContext {
+		let _localctx: WithExprContext = new WithExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 134, TSQLParser.RULE_withExpr);
+		try {
+			this.state = 1185;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 148, this._ctx) ) {
+			case 1:
+				_localctx = new WithExprSubqueryContext(_localctx);
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1175;
+				this.identifier();
+				this.state = 1176;
+				this.match(TSQLParser.AS);
+				this.state = 1177;
+				this.match(TSQLParser.LPAREN);
+				this.state = 1178;
+				this.selectSetStmt();
+				this.state = 1179;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 2:
+				_localctx = new WithExprColumnContext(_localctx);
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1181;
+				this.columnExpr(0);
+				this.state = 1182;
+				this.match(TSQLParser.AS);
+				this.state = 1183;
+				this.identifier();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public columnIdentifier(): ColumnIdentifierContext {
+		let _localctx: ColumnIdentifierContext = new ColumnIdentifierContext(this._ctx, this.state);
+		this.enterRule(_localctx, 136, TSQLParser.RULE_columnIdentifier);
+		try {
+			this.state = 1194;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.LBRACE:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1187;
+				this.placeholder();
+				}
+				break;
+			case TSQLParser.ALL:
+			case TSQLParser.AND:
+			case TSQLParser.ANTI:
+			case TSQLParser.ANY:
+			case TSQLParser.ARRAY:
+			case TSQLParser.AS:
+			case TSQLParser.ASCENDING:
+			case TSQLParser.ASOF:
+			case TSQLParser.BETWEEN:
+			case TSQLParser.BOTH:
+			case TSQLParser.BY:
+			case TSQLParser.CASE:
+			case TSQLParser.CAST:
+			case TSQLParser.COHORT:
+			case TSQLParser.COLLATE:
+			case TSQLParser.CROSS:
+			case TSQLParser.CUBE:
+			case TSQLParser.CURRENT:
+			case TSQLParser.DATE:
+			case TSQLParser.DAY:
+			case TSQLParser.DESC:
+			case TSQLParser.DESCENDING:
+			case TSQLParser.DISTINCT:
+			case TSQLParser.ELSE:
+			case TSQLParser.END:
+			case TSQLParser.EXTRACT:
+			case TSQLParser.FINAL:
+			case TSQLParser.FIRST:
+			case TSQLParser.FOLLOWING:
+			case TSQLParser.FOR:
+			case TSQLParser.FROM:
+			case TSQLParser.FULL:
+			case TSQLParser.GROUP:
+			case TSQLParser.HAVING:
+			case TSQLParser.HOUR:
+			case TSQLParser.ID:
+			case TSQLParser.IF:
+			case TSQLParser.ILIKE:
+			case TSQLParser.IN:
+			case TSQLParser.INNER:
+			case TSQLParser.INTERVAL:
+			case TSQLParser.IS:
+			case TSQLParser.JOIN:
+			case TSQLParser.KEY:
+			case TSQLParser.LAST:
+			case TSQLParser.LEADING:
+			case TSQLParser.LEFT:
+			case TSQLParser.LIKE:
+			case TSQLParser.LIMIT:
+			case TSQLParser.MINUTE:
+			case TSQLParser.MONTH:
+			case TSQLParser.NOT:
+			case TSQLParser.NULLS:
+			case TSQLParser.OFFSET:
+			case TSQLParser.ON:
+			case TSQLParser.OR:
+			case TSQLParser.ORDER:
+			case TSQLParser.OUTER:
+			case TSQLParser.OVER:
+			case TSQLParser.PARTITION:
+			case TSQLParser.PRECEDING:
+			case TSQLParser.PREWHERE:
+			case TSQLParser.QUARTER:
+			case TSQLParser.RANGE:
+			case TSQLParser.RETURN:
+			case TSQLParser.RIGHT:
+			case TSQLParser.ROLLUP:
+			case TSQLParser.ROW:
+			case TSQLParser.ROWS:
+			case TSQLParser.SAMPLE:
+			case TSQLParser.SECOND:
+			case TSQLParser.SELECT:
+			case TSQLParser.SEMI:
+			case TSQLParser.SETTINGS:
+			case TSQLParser.SUBSTRING:
+			case TSQLParser.THEN:
+			case TSQLParser.TIES:
+			case TSQLParser.TIMESTAMP:
+			case TSQLParser.TO:
+			case TSQLParser.TOP:
+			case TSQLParser.TOTALS:
+			case TSQLParser.TRAILING:
+			case TSQLParser.TRIM:
+			case TSQLParser.TRUNCATE:
+			case TSQLParser.UNBOUNDED:
+			case TSQLParser.UNION:
+			case TSQLParser.USING:
+			case TSQLParser.WEEK:
+			case TSQLParser.WHEN:
+			case TSQLParser.WHERE:
+			case TSQLParser.WINDOW:
+			case TSQLParser.WITH:
+			case TSQLParser.YEAR:
+			case TSQLParser.IDENTIFIER:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				{
+				this.state = 1191;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 149, this._ctx) ) {
+				case 1:
+					{
+					this.state = 1188;
+					this.tableIdentifier();
+					this.state = 1189;
+					this.match(TSQLParser.DOT);
+					}
+					break;
+				}
+				this.state = 1193;
+				this.nestedIdentifier();
+				}
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public nestedIdentifier(): NestedIdentifierContext {
+		let _localctx: NestedIdentifierContext = new NestedIdentifierContext(this._ctx, this.state);
+		this.enterRule(_localctx, 138, TSQLParser.RULE_nestedIdentifier);
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1196;
+			this.identifier();
+			this.state = 1201;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 151, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 1197;
+					this.match(TSQLParser.DOT);
+					this.state = 1198;
+					this.identifier();
+					}
+					}
+				}
+				this.state = 1203;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 151, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+
+	public tableExpr(): TableExprContext;
+	public tableExpr(_p: number): TableExprContext;
+	// @RuleVersion(0)
+	public tableExpr(_p?: number): TableExprContext {
+		if (_p === undefined) {
+			_p = 0;
+		}
+
+		let _parentctx: ParserRuleContext = this._ctx;
+		let _parentState: number = this.state;
+		let _localctx: TableExprContext = new TableExprContext(this._ctx, _parentState);
+		let _prevctx: TableExprContext = _localctx;
+		let _startState: number = 140;
+		this.enterRecursionRule(_localctx, 140, TSQLParser.RULE_tableExpr, _p);
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1213;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 152, this._ctx) ) {
+			case 1:
+				{
+				_localctx = new TableExprIdentifierContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+
+				this.state = 1205;
+				this.tableIdentifier();
+				}
+				break;
+
+			case 2:
+				{
+				_localctx = new TableExprFunctionContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 1206;
+				this.tableFunctionExpr();
+				}
+				break;
+
+			case 3:
+				{
+				_localctx = new TableExprSubqueryContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 1207;
+				this.match(TSQLParser.LPAREN);
+				this.state = 1208;
+				this.selectSetStmt();
+				this.state = 1209;
+				this.match(TSQLParser.RPAREN);
+				}
+				break;
+
+			case 4:
+				{
+				_localctx = new TableExprTagContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 1211;
+				this.tSQLxTagElement();
+				}
+				break;
+
+			case 5:
+				{
+				_localctx = new TableExprPlaceholderContext(_localctx);
+				this._ctx = _localctx;
+				_prevctx = _localctx;
+				this.state = 1212;
+				this.placeholder();
+				}
+				break;
+			}
+			this._ctx._stop = this._input.tryLT(-1);
+			this.state = 1223;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 154, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					if (this._parseListeners != null) {
+						this.triggerExitRuleEvent();
+					}
+					_prevctx = _localctx;
+					{
+					{
+					_localctx = new TableExprAliasContext(new TableExprContext(_parentctx, _parentState));
+					this.pushNewRecursionContext(_localctx, _startState, TSQLParser.RULE_tableExpr);
+					this.state = 1215;
+					if (!(this.precpred(this._ctx, 3))) {
+						throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
+					}
+					this.state = 1219;
+					this._errHandler.sync(this);
+					switch (this._input.LA(1)) {
+					case TSQLParser.DATE:
+					case TSQLParser.FIRST:
+					case TSQLParser.ID:
+					case TSQLParser.KEY:
+					case TSQLParser.IDENTIFIER:
+						{
+						this.state = 1216;
+						this.alias();
+						}
+						break;
+					case TSQLParser.AS:
+						{
+						this.state = 1217;
+						this.match(TSQLParser.AS);
+						this.state = 1218;
+						this.identifier();
+						}
+						break;
+					default:
+						throw new NoViableAltException(this);
+					}
+					}
+					}
+				}
+				this.state = 1225;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 154, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.unrollRecursionContexts(_parentctx);
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tableFunctionExpr(): TableFunctionExprContext {
+		let _localctx: TableFunctionExprContext = new TableFunctionExprContext(this._ctx, this.state);
+		this.enterRule(_localctx, 142, TSQLParser.RULE_tableFunctionExpr);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1226;
+			this.identifier();
+			this.state = 1227;
+			this.match(TSQLParser.LPAREN);
+			this.state = 1229;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if ((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DAY) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.HOUR - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INF - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.MINUTE - 33)) | (1 << (TSQLParser.MONTH - 33)) | (1 << (TSQLParser.NAN_SQL - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULL_SQL - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.QUARTER - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SECOND - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WEEK - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)) | (1 << (TSQLParser.YEAR - 97)) | (1 << (TSQLParser.IDENTIFIER - 97)) | (1 << (TSQLParser.FLOATING_LITERAL - 97)) | (1 << (TSQLParser.OCTAL_LITERAL - 97)) | (1 << (TSQLParser.DECIMAL_LITERAL - 97)) | (1 << (TSQLParser.HEXADECIMAL_LITERAL - 97)) | (1 << (TSQLParser.STRING_LITERAL - 97)) | (1 << (TSQLParser.ASTERISK - 97)) | (1 << (TSQLParser.DASH - 97)) | (1 << (TSQLParser.DOT - 97)))) !== 0) || ((((_la - 131)) & ~0x1F) === 0 && ((1 << (_la - 131)) & ((1 << (TSQLParser.LBRACE - 131)) | (1 << (TSQLParser.LBRACKET - 131)) | (1 << (TSQLParser.LPAREN - 131)) | (1 << (TSQLParser.LT - 131)) | (1 << (TSQLParser.PLUS - 131)) | (1 << (TSQLParser.QUOTE_SINGLE_TEMPLATE - 131)))) !== 0)) {
+				{
+				this.state = 1228;
+				this.tableArgList();
+				}
+			}
+
+			this.state = 1231;
+			this.match(TSQLParser.RPAREN);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tableIdentifier(): TableIdentifierContext {
+		let _localctx: TableIdentifierContext = new TableIdentifierContext(this._ctx, this.state);
+		this.enterRule(_localctx, 144, TSQLParser.RULE_tableIdentifier);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1236;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 156, this._ctx) ) {
+			case 1:
+				{
+				this.state = 1233;
+				this.databaseIdentifier();
+				this.state = 1234;
+				this.match(TSQLParser.DOT);
+				}
+				break;
+			}
+			this.state = 1238;
+			this.nestedIdentifier();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public tableArgList(): TableArgListContext {
+		let _localctx: TableArgListContext = new TableArgListContext(this._ctx, this.state);
+		this.enterRule(_localctx, 146, TSQLParser.RULE_tableArgList);
+		let _la: number;
+		try {
+			let _alt: number;
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1240;
+			this.columnExpr(0);
+			this.state = 1245;
+			this._errHandler.sync(this);
+			_alt = this.interpreter.adaptivePredict(this._input, 157, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 1241;
+					this.match(TSQLParser.COMMA);
+					this.state = 1242;
+					this.columnExpr(0);
+					}
+					}
+				}
+				this.state = 1247;
+				this._errHandler.sync(this);
+				_alt = this.interpreter.adaptivePredict(this._input, 157, this._ctx);
+			}
+			this.state = 1249;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.COMMA) {
+				{
+				this.state = 1248;
+				this.match(TSQLParser.COMMA);
+				}
+			}
+
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public databaseIdentifier(): DatabaseIdentifierContext {
+		let _localctx: DatabaseIdentifierContext = new DatabaseIdentifierContext(this._ctx, this.state);
+		this.enterRule(_localctx, 148, TSQLParser.RULE_databaseIdentifier);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1251;
+			this.identifier();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public floatingLiteral(): FloatingLiteralContext {
+		let _localctx: FloatingLiteralContext = new FloatingLiteralContext(this._ctx, this.state);
+		this.enterRule(_localctx, 150, TSQLParser.RULE_floatingLiteral);
+		let _la: number;
+		try {
+			this.state = 1261;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.FLOATING_LITERAL:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1253;
+				this.match(TSQLParser.FLOATING_LITERAL);
+				}
+				break;
+			case TSQLParser.DOT:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1254;
+				this.match(TSQLParser.DOT);
+				this.state = 1255;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.OCTAL_LITERAL || _la === TSQLParser.DECIMAL_LITERAL)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+				break;
+			case TSQLParser.DECIMAL_LITERAL:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 1256;
+				this.match(TSQLParser.DECIMAL_LITERAL);
+				this.state = 1257;
+				this.match(TSQLParser.DOT);
+				this.state = 1259;
+				this._errHandler.sync(this);
+				switch ( this.interpreter.adaptivePredict(this._input, 159, this._ctx) ) {
+				case 1:
+					{
+					this.state = 1258;
+					_la = this._input.LA(1);
+					if (!(_la === TSQLParser.OCTAL_LITERAL || _la === TSQLParser.DECIMAL_LITERAL)) {
+					this._errHandler.recoverInline(this);
+					} else {
+						if (this._input.LA(1) === Token.EOF) {
+							this.matchedEOF = true;
+						}
+
+						this._errHandler.reportMatch(this);
+						this.consume();
+					}
+					}
+					break;
+				}
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public numberLiteral(): NumberLiteralContext {
+		let _localctx: NumberLiteralContext = new NumberLiteralContext(this._ctx, this.state);
+		this.enterRule(_localctx, 152, TSQLParser.RULE_numberLiteral);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1264;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			if (_la === TSQLParser.DASH || _la === TSQLParser.PLUS) {
+				{
+				this.state = 1263;
+				_la = this._input.LA(1);
+				if (!(_la === TSQLParser.DASH || _la === TSQLParser.PLUS)) {
+				this._errHandler.recoverInline(this);
+				} else {
+					if (this._input.LA(1) === Token.EOF) {
+						this.matchedEOF = true;
+					}
+
+					this._errHandler.reportMatch(this);
+					this.consume();
+				}
+				}
+			}
+
+			this.state = 1272;
+			this._errHandler.sync(this);
+			switch ( this.interpreter.adaptivePredict(this._input, 162, this._ctx) ) {
+			case 1:
+				{
+				this.state = 1266;
+				this.floatingLiteral();
+				}
+				break;
+
+			case 2:
+				{
+				this.state = 1267;
+				this.match(TSQLParser.OCTAL_LITERAL);
+				}
+				break;
+
+			case 3:
+				{
+				this.state = 1268;
+				this.match(TSQLParser.DECIMAL_LITERAL);
+				}
+				break;
+
+			case 4:
+				{
+				this.state = 1269;
+				this.match(TSQLParser.HEXADECIMAL_LITERAL);
+				}
+				break;
+
+			case 5:
+				{
+				this.state = 1270;
+				this.match(TSQLParser.INF);
+				}
+				break;
+
+			case 6:
+				{
+				this.state = 1271;
+				this.match(TSQLParser.NAN_SQL);
+				}
+				break;
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public literal(): LiteralContext {
+		let _localctx: LiteralContext = new LiteralContext(this._ctx, this.state);
+		this.enterRule(_localctx, 154, TSQLParser.RULE_literal);
+		try {
+			this.state = 1277;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.INF:
+			case TSQLParser.NAN_SQL:
+			case TSQLParser.FLOATING_LITERAL:
+			case TSQLParser.OCTAL_LITERAL:
+			case TSQLParser.DECIMAL_LITERAL:
+			case TSQLParser.HEXADECIMAL_LITERAL:
+			case TSQLParser.DASH:
+			case TSQLParser.DOT:
+			case TSQLParser.PLUS:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1274;
+				this.numberLiteral();
+				}
+				break;
+			case TSQLParser.STRING_LITERAL:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1275;
+				this.match(TSQLParser.STRING_LITERAL);
+				}
+				break;
+			case TSQLParser.NULL_SQL:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 1276;
+				this.match(TSQLParser.NULL_SQL);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public interval(): IntervalContext {
+		let _localctx: IntervalContext = new IntervalContext(this._ctx, this.state);
+		this.enterRule(_localctx, 156, TSQLParser.RULE_interval);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1279;
+			_la = this._input.LA(1);
+			if (!(_la === TSQLParser.DAY || _la === TSQLParser.HOUR || ((((_la - 58)) & ~0x1F) === 0 && ((1 << (_la - 58)) & ((1 << (TSQLParser.MINUTE - 58)) | (1 << (TSQLParser.MONTH - 58)) | (1 << (TSQLParser.QUARTER - 58)) | (1 << (TSQLParser.SECOND - 58)))) !== 0) || _la === TSQLParser.WEEK || _la === TSQLParser.YEAR)) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public keyword(): KeywordContext {
+		let _localctx: KeywordContext = new KeywordContext(this._ctx, this.state);
+		this.enterRule(_localctx, 158, TSQLParser.RULE_keyword);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1281;
+			_la = this._input.LA(1);
+			if (!((((_la) & ~0x1F) === 0 && ((1 << _la) & ((1 << TSQLParser.ALL) | (1 << TSQLParser.AND) | (1 << TSQLParser.ANTI) | (1 << TSQLParser.ANY) | (1 << TSQLParser.ARRAY) | (1 << TSQLParser.AS) | (1 << TSQLParser.ASCENDING) | (1 << TSQLParser.ASOF) | (1 << TSQLParser.BETWEEN) | (1 << TSQLParser.BOTH) | (1 << TSQLParser.BY) | (1 << TSQLParser.CASE) | (1 << TSQLParser.CAST) | (1 << TSQLParser.COHORT) | (1 << TSQLParser.COLLATE) | (1 << TSQLParser.CROSS) | (1 << TSQLParser.CUBE) | (1 << TSQLParser.CURRENT) | (1 << TSQLParser.DATE) | (1 << TSQLParser.DESC) | (1 << TSQLParser.DESCENDING) | (1 << TSQLParser.DISTINCT) | (1 << TSQLParser.ELSE) | (1 << TSQLParser.END) | (1 << TSQLParser.EXTRACT) | (1 << TSQLParser.FINAL) | (1 << TSQLParser.FIRST))) !== 0) || ((((_la - 33)) & ~0x1F) === 0 && ((1 << (_la - 33)) & ((1 << (TSQLParser.FOLLOWING - 33)) | (1 << (TSQLParser.FOR - 33)) | (1 << (TSQLParser.FROM - 33)) | (1 << (TSQLParser.FULL - 33)) | (1 << (TSQLParser.GROUP - 33)) | (1 << (TSQLParser.HAVING - 33)) | (1 << (TSQLParser.ID - 33)) | (1 << (TSQLParser.IF - 33)) | (1 << (TSQLParser.ILIKE - 33)) | (1 << (TSQLParser.IN - 33)) | (1 << (TSQLParser.INNER - 33)) | (1 << (TSQLParser.INTERVAL - 33)) | (1 << (TSQLParser.IS - 33)) | (1 << (TSQLParser.JOIN - 33)) | (1 << (TSQLParser.KEY - 33)) | (1 << (TSQLParser.LAST - 33)) | (1 << (TSQLParser.LEADING - 33)) | (1 << (TSQLParser.LEFT - 33)) | (1 << (TSQLParser.LIKE - 33)) | (1 << (TSQLParser.LIMIT - 33)) | (1 << (TSQLParser.NOT - 33)) | (1 << (TSQLParser.NULLS - 33)) | (1 << (TSQLParser.OFFSET - 33)))) !== 0) || ((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & ((1 << (TSQLParser.ON - 65)) | (1 << (TSQLParser.OR - 65)) | (1 << (TSQLParser.ORDER - 65)) | (1 << (TSQLParser.OUTER - 65)) | (1 << (TSQLParser.OVER - 65)) | (1 << (TSQLParser.PARTITION - 65)) | (1 << (TSQLParser.PRECEDING - 65)) | (1 << (TSQLParser.PREWHERE - 65)) | (1 << (TSQLParser.RANGE - 65)) | (1 << (TSQLParser.RETURN - 65)) | (1 << (TSQLParser.RIGHT - 65)) | (1 << (TSQLParser.ROLLUP - 65)) | (1 << (TSQLParser.ROW - 65)) | (1 << (TSQLParser.ROWS - 65)) | (1 << (TSQLParser.SAMPLE - 65)) | (1 << (TSQLParser.SELECT - 65)) | (1 << (TSQLParser.SEMI - 65)) | (1 << (TSQLParser.SETTINGS - 65)) | (1 << (TSQLParser.SUBSTRING - 65)) | (1 << (TSQLParser.THEN - 65)) | (1 << (TSQLParser.TIES - 65)) | (1 << (TSQLParser.TIMESTAMP - 65)) | (1 << (TSQLParser.TO - 65)) | (1 << (TSQLParser.TOP - 65)) | (1 << (TSQLParser.TOTALS - 65)) | (1 << (TSQLParser.TRAILING - 65)) | (1 << (TSQLParser.TRIM - 65)) | (1 << (TSQLParser.TRUNCATE - 65)))) !== 0) || ((((_la - 97)) & ~0x1F) === 0 && ((1 << (_la - 97)) & ((1 << (TSQLParser.UNBOUNDED - 97)) | (1 << (TSQLParser.UNION - 97)) | (1 << (TSQLParser.USING - 97)) | (1 << (TSQLParser.WHEN - 97)) | (1 << (TSQLParser.WHERE - 97)) | (1 << (TSQLParser.WINDOW - 97)) | (1 << (TSQLParser.WITH - 97)))) !== 0))) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public keywordForAlias(): KeywordForAliasContext {
+		let _localctx: KeywordForAliasContext = new KeywordForAliasContext(this._ctx, this.state);
+		this.enterRule(_localctx, 160, TSQLParser.RULE_keywordForAlias);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1283;
+			_la = this._input.LA(1);
+			if (!(((((_la - 20)) & ~0x1F) === 0 && ((1 << (_la - 20)) & ((1 << (TSQLParser.DATE - 20)) | (1 << (TSQLParser.FIRST - 20)) | (1 << (TSQLParser.ID - 20)) | (1 << (TSQLParser.KEY - 20)))) !== 0))) {
+			this._errHandler.recoverInline(this);
+			} else {
+				if (this._input.LA(1) === Token.EOF) {
+					this.matchedEOF = true;
+				}
+
+				this._errHandler.reportMatch(this);
+				this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public alias(): AliasContext {
+		let _localctx: AliasContext = new AliasContext(this._ctx, this.state);
+		this.enterRule(_localctx, 162, TSQLParser.RULE_alias);
+		try {
+			this.state = 1287;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.IDENTIFIER:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1285;
+				this.match(TSQLParser.IDENTIFIER);
+				}
+				break;
+			case TSQLParser.DATE:
+			case TSQLParser.FIRST:
+			case TSQLParser.ID:
+			case TSQLParser.KEY:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1286;
+				this.keywordForAlias();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public identifier(): IdentifierContext {
+		let _localctx: IdentifierContext = new IdentifierContext(this._ctx, this.state);
+		this.enterRule(_localctx, 164, TSQLParser.RULE_identifier);
+		try {
+			this.state = 1292;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.IDENTIFIER:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1289;
+				this.match(TSQLParser.IDENTIFIER);
+				}
+				break;
+			case TSQLParser.DAY:
+			case TSQLParser.HOUR:
+			case TSQLParser.MINUTE:
+			case TSQLParser.MONTH:
+			case TSQLParser.QUARTER:
+			case TSQLParser.SECOND:
+			case TSQLParser.WEEK:
+			case TSQLParser.YEAR:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1290;
+				this.interval();
+				}
+				break;
+			case TSQLParser.ALL:
+			case TSQLParser.AND:
+			case TSQLParser.ANTI:
+			case TSQLParser.ANY:
+			case TSQLParser.ARRAY:
+			case TSQLParser.AS:
+			case TSQLParser.ASCENDING:
+			case TSQLParser.ASOF:
+			case TSQLParser.BETWEEN:
+			case TSQLParser.BOTH:
+			case TSQLParser.BY:
+			case TSQLParser.CASE:
+			case TSQLParser.CAST:
+			case TSQLParser.COHORT:
+			case TSQLParser.COLLATE:
+			case TSQLParser.CROSS:
+			case TSQLParser.CUBE:
+			case TSQLParser.CURRENT:
+			case TSQLParser.DATE:
+			case TSQLParser.DESC:
+			case TSQLParser.DESCENDING:
+			case TSQLParser.DISTINCT:
+			case TSQLParser.ELSE:
+			case TSQLParser.END:
+			case TSQLParser.EXTRACT:
+			case TSQLParser.FINAL:
+			case TSQLParser.FIRST:
+			case TSQLParser.FOLLOWING:
+			case TSQLParser.FOR:
+			case TSQLParser.FROM:
+			case TSQLParser.FULL:
+			case TSQLParser.GROUP:
+			case TSQLParser.HAVING:
+			case TSQLParser.ID:
+			case TSQLParser.IF:
+			case TSQLParser.ILIKE:
+			case TSQLParser.IN:
+			case TSQLParser.INNER:
+			case TSQLParser.INTERVAL:
+			case TSQLParser.IS:
+			case TSQLParser.JOIN:
+			case TSQLParser.KEY:
+			case TSQLParser.LAST:
+			case TSQLParser.LEADING:
+			case TSQLParser.LEFT:
+			case TSQLParser.LIKE:
+			case TSQLParser.LIMIT:
+			case TSQLParser.NOT:
+			case TSQLParser.NULLS:
+			case TSQLParser.OFFSET:
+			case TSQLParser.ON:
+			case TSQLParser.OR:
+			case TSQLParser.ORDER:
+			case TSQLParser.OUTER:
+			case TSQLParser.OVER:
+			case TSQLParser.PARTITION:
+			case TSQLParser.PRECEDING:
+			case TSQLParser.PREWHERE:
+			case TSQLParser.RANGE:
+			case TSQLParser.RETURN:
+			case TSQLParser.RIGHT:
+			case TSQLParser.ROLLUP:
+			case TSQLParser.ROW:
+			case TSQLParser.ROWS:
+			case TSQLParser.SAMPLE:
+			case TSQLParser.SELECT:
+			case TSQLParser.SEMI:
+			case TSQLParser.SETTINGS:
+			case TSQLParser.SUBSTRING:
+			case TSQLParser.THEN:
+			case TSQLParser.TIES:
+			case TSQLParser.TIMESTAMP:
+			case TSQLParser.TO:
+			case TSQLParser.TOP:
+			case TSQLParser.TOTALS:
+			case TSQLParser.TRAILING:
+			case TSQLParser.TRIM:
+			case TSQLParser.TRUNCATE:
+			case TSQLParser.UNBOUNDED:
+			case TSQLParser.UNION:
+			case TSQLParser.USING:
+			case TSQLParser.WHEN:
+			case TSQLParser.WHERE:
+			case TSQLParser.WINDOW:
+			case TSQLParser.WITH:
+				this.enterOuterAlt(_localctx, 3);
+				{
+				this.state = 1291;
+				this.keyword();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public enumValue(): EnumValueContext {
+		let _localctx: EnumValueContext = new EnumValueContext(this._ctx, this.state);
+		this.enterRule(_localctx, 166, TSQLParser.RULE_enumValue);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1294;
+			this.string();
+			this.state = 1295;
+			this.match(TSQLParser.EQ_SINGLE);
+			this.state = 1296;
+			this.numberLiteral();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public placeholder(): PlaceholderContext {
+		let _localctx: PlaceholderContext = new PlaceholderContext(this._ctx, this.state);
+		this.enterRule(_localctx, 168, TSQLParser.RULE_placeholder);
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1298;
+			this.match(TSQLParser.LBRACE);
+			this.state = 1299;
+			this.columnExpr(0);
+			this.state = 1300;
+			this.match(TSQLParser.RBRACE);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public string(): StringContext {
+		let _localctx: StringContext = new StringContext(this._ctx, this.state);
+		this.enterRule(_localctx, 170, TSQLParser.RULE_string);
+		try {
+			this.state = 1304;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.STRING_LITERAL:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1302;
+				this.match(TSQLParser.STRING_LITERAL);
+				}
+				break;
+			case TSQLParser.QUOTE_SINGLE_TEMPLATE:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1303;
+				this.templateString();
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public templateString(): TemplateStringContext {
+		let _localctx: TemplateStringContext = new TemplateStringContext(this._ctx, this.state);
+		this.enterRule(_localctx, 172, TSQLParser.RULE_templateString);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1306;
+			this.match(TSQLParser.QUOTE_SINGLE_TEMPLATE);
+			this.state = 1310;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.STRING_TEXT || _la === TSQLParser.STRING_ESCAPE_TRIGGER) {
+				{
+				{
+				this.state = 1307;
+				this.stringContents();
+				}
+				}
+				this.state = 1312;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			this.state = 1313;
+			this.match(TSQLParser.QUOTE_SINGLE);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public stringContents(): StringContentsContext {
+		let _localctx: StringContentsContext = new StringContentsContext(this._ctx, this.state);
+		this.enterRule(_localctx, 174, TSQLParser.RULE_stringContents);
+		try {
+			this.state = 1320;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.STRING_ESCAPE_TRIGGER:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1315;
+				this.match(TSQLParser.STRING_ESCAPE_TRIGGER);
+				this.state = 1316;
+				this.columnExpr(0);
+				this.state = 1317;
+				this.match(TSQLParser.RBRACE);
+				}
+				break;
+			case TSQLParser.STRING_TEXT:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1319;
+				this.match(TSQLParser.STRING_TEXT);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public fullTemplateString(): FullTemplateStringContext {
+		let _localctx: FullTemplateStringContext = new FullTemplateStringContext(this._ctx, this.state);
+		this.enterRule(_localctx, 176, TSQLParser.RULE_fullTemplateString);
+		let _la: number;
+		try {
+			this.enterOuterAlt(_localctx, 1);
+			{
+			this.state = 1322;
+			this.match(TSQLParser.QUOTE_SINGLE_TEMPLATE_FULL);
+			this.state = 1326;
+			this._errHandler.sync(this);
+			_la = this._input.LA(1);
+			while (_la === TSQLParser.FULL_STRING_TEXT || _la === TSQLParser.FULL_STRING_ESCAPE_TRIGGER) {
+				{
+				{
+				this.state = 1323;
+				this.stringContentsFull();
+				}
+				}
+				this.state = 1328;
+				this._errHandler.sync(this);
+				_la = this._input.LA(1);
+			}
+			this.state = 1329;
+			this.match(TSQLParser.EOF);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+	// @RuleVersion(0)
+	public stringContentsFull(): StringContentsFullContext {
+		let _localctx: StringContentsFullContext = new StringContentsFullContext(this._ctx, this.state);
+		this.enterRule(_localctx, 178, TSQLParser.RULE_stringContentsFull);
+		try {
+			this.state = 1336;
+			this._errHandler.sync(this);
+			switch (this._input.LA(1)) {
+			case TSQLParser.FULL_STRING_ESCAPE_TRIGGER:
+				this.enterOuterAlt(_localctx, 1);
+				{
+				this.state = 1331;
+				this.match(TSQLParser.FULL_STRING_ESCAPE_TRIGGER);
+				this.state = 1332;
+				this.columnExpr(0);
+				this.state = 1333;
+				this.match(TSQLParser.RBRACE);
+				}
+				break;
+			case TSQLParser.FULL_STRING_TEXT:
+				this.enterOuterAlt(_localctx, 2);
+				{
+				this.state = 1335;
+				this.match(TSQLParser.FULL_STRING_TEXT);
+				}
+				break;
+			default:
+				throw new NoViableAltException(this);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				_localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return _localctx;
+	}
+
+	public sempred(_localctx: RuleContext, ruleIndex: number, predIndex: number): boolean {
+		switch (ruleIndex) {
+		case 41:
+			return this.joinExpr_sempred(_localctx as JoinExprContext, predIndex);
+
+		case 61:
+			return this.columnExpr_sempred(_localctx as ColumnExprContext, predIndex);
+
+		case 70:
+			return this.tableExpr_sempred(_localctx as TableExprContext, predIndex);
+		}
+		return true;
+	}
+	private joinExpr_sempred(_localctx: JoinExprContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 0:
+			return this.precpred(this._ctx, 3);
+
+		case 1:
+			return this.precpred(this._ctx, 4);
+		}
+		return true;
+	}
+	private columnExpr_sempred(_localctx: ColumnExprContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 2:
+			return this.precpred(this._ctx, 19);
+
+		case 3:
+			return this.precpred(this._ctx, 18);
+
+		case 4:
+			return this.precpred(this._ctx, 17);
+
+		case 5:
+			return this.precpred(this._ctx, 15);
+
+		case 6:
+			return this.precpred(this._ctx, 13);
+
+		case 7:
+			return this.precpred(this._ctx, 12);
+
+		case 8:
+			return this.precpred(this._ctx, 11);
+
+		case 9:
+			return this.precpred(this._ctx, 10);
+
+		case 10:
+			return this.precpred(this._ctx, 31);
+
+		case 11:
+			return this.precpred(this._ctx, 30);
+
+		case 12:
+			return this.precpred(this._ctx, 26);
+
+		case 13:
+			return this.precpred(this._ctx, 25);
+
+		case 14:
+			return this.precpred(this._ctx, 24);
+
+		case 15:
+			return this.precpred(this._ctx, 23);
+
+		case 16:
+			return this.precpred(this._ctx, 22);
+
+		case 17:
+			return this.precpred(this._ctx, 21);
+
+		case 18:
+			return this.precpred(this._ctx, 16);
+
+		case 19:
+			return this.precpred(this._ctx, 9);
+		}
+		return true;
+	}
+	private tableExpr_sempred(_localctx: TableExprContext, predIndex: number): boolean {
+		switch (predIndex) {
+		case 20:
+			return this.precpred(this._ctx, 3);
+		}
+		return true;
+	}
+
+	private static readonly _serializedATNSegments: number = 3;
+	private static readonly _serializedATNSegment0: string =
+		"\x03\uC91D\uCABA\u058D\uAFBA\u4F53\u0607\uEA8B\uC241\x03\xAA\u053D\x04" +
+		"\x02\t\x02\x04\x03\t\x03\x04\x04\t\x04\x04\x05\t\x05\x04\x06\t\x06\x04" +
+		"\x07\t\x07\x04\b\t\b\x04\t\t\t\x04\n\t\n\x04\v\t\v\x04\f\t\f\x04\r\t\r" +
+		"\x04\x0E\t\x0E\x04\x0F\t\x0F\x04\x10\t\x10\x04\x11\t\x11\x04\x12\t\x12" +
+		"\x04\x13\t\x13\x04\x14\t\x14\x04\x15\t\x15\x04\x16\t\x16\x04\x17\t\x17" +
+		"\x04\x18\t\x18\x04\x19\t\x19\x04\x1A\t\x1A\x04\x1B\t\x1B\x04\x1C\t\x1C" +
+		"\x04\x1D\t\x1D\x04\x1E\t\x1E\x04\x1F\t\x1F\x04 \t \x04!\t!\x04\"\t\"\x04" +
+		"#\t#\x04$\t$\x04%\t%\x04&\t&\x04\'\t\'\x04(\t(\x04)\t)\x04*\t*\x04+\t" +
+		"+\x04,\t,\x04-\t-\x04.\t.\x04/\t/\x040\t0\x041\t1\x042\t2\x043\t3\x04" +
+		"4\t4\x045\t5\x046\t6\x047\t7\x048\t8\x049\t9\x04:\t:\x04;\t;\x04<\t<\x04" +
+		"=\t=\x04>\t>\x04?\t?\x04@\t@\x04A\tA\x04B\tB\x04C\tC\x04D\tD\x04E\tE\x04" +
+		"F\tF\x04G\tG\x04H\tH\x04I\tI\x04J\tJ\x04K\tK\x04L\tL\x04M\tM\x04N\tN\x04" +
+		"O\tO\x04P\tP\x04Q\tQ\x04R\tR\x04S\tS\x04T\tT\x04U\tU\x04V\tV\x04W\tW\x04" +
+		"X\tX\x04Y\tY\x04Z\tZ\x04[\t[\x03\x02\x07\x02\xB8\n\x02\f\x02\x0E\x02\xBB" +
+		"\v\x02\x03\x02\x03\x02\x03\x03\x03\x03\x05\x03\xC1\n\x03\x03\x04\x03\x04" +
+		"\x03\x05\x03\x05\x03\x05\x03\x05\x03\x05\x05\x05\xCA\n\x05\x03\x06\x03" +
+		"\x06\x03\x06\x07\x06\xCF\n\x06\f\x06\x0E\x06\xD2\v\x06\x03\x06\x05\x06" +
+		"\xD5\n\x06\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03\x07\x03" +
+		"\x07\x03\x07\x03\x07\x03\x07\x03\x07\x05\x07\xE3\n\x07\x03\b\x03\b\x05" +
+		"\b\xE7\n\b\x03\b\x05\b\xEA\n\b\x03\t\x03\t\x05\t\xEE\n\t\x03\t\x05\t\xF1" +
+		"\n\t\x03\n\x03\n\x03\n\x03\n\x03\n\x05\n\xF8\n\n\x03\n\x03\n\x05\n\xFC" +
+		"\n\n\x03\n\x03\n\x03\v\x03\v\x03\v\x07\v\u0103\n\v\f\v\x0E\v\u0106\v\v" +
+		"\x03\v\x03\v\x05\v\u010A\n\v\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f\x03\f" +
+		"\x05\f\u0113\n\f\x03\r\x03\r\x03\r\x03\r\x03\r\x03\r\x05\r\u011B\n\r\x03" +
+		"\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x05\x0E\u0122\n\x0E\x03\x0E\x03\x0E" +
+		"\x05\x0E\u0126\n\x0E\x03\x0E\x03\x0E\x03\x0E\x03\x0E\x05\x0E\u012C\n\x0E" +
+		"\x03\x0E\x03\x0E\x03\x0E\x05\x0E\u0131\n\x0E\x03\x0F\x03\x0F\x03\x0F\x03" +
+		"\x0F\x03\x0F\x03\x0F\x05\x0F\u0139\n\x0F\x03\x0F\x03\x0F\x03\x0F\x03\x0F" +
+		"\x03\x0F\x05\x0F\u0140\n\x0F\x03\x10\x03\x10\x03\x10\x03\x10\x05\x10\u0146" +
+		"\n\x10\x03\x10\x03\x10\x03\x10\x03\x11\x03\x11\x03\x11\x03\x11\x03\x11" +
+		"\x03\x12\x03\x12\x05\x12\u0152\n\x12\x03\x13\x03\x13\x03\x14\x03\x14\x07" +
+		"\x14\u0158\n\x14\f\x14\x0E\x14\u015B\v\x14\x03\x14\x03\x14\x03\x15\x03" +
+		"\x15\x03\x15\x03\x15\x03\x16\x03\x16\x03\x16\x07\x16\u0166\n\x16\f\x16" +
+		"\x0E\x16\u0169\v\x16\x03\x16\x05\x16\u016C\n\x16\x03\x17\x03\x17\x03\x17" +
+		"\x05\x17\u0171\n\x17\x03\x17\x05\x17\u0174\n\x17\x03\x17\x03\x17\x03\x18" +
+		"\x03\x18\x03\x18\x03\x18\x03\x18\x03\x18\x05\x18\u017E\n\x18\x03\x19\x03" +
+		"\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x03\x19\x05\x19\u0188\n\x19" +
+		"\x03\x19\x03\x19\x03\x1A\x03\x1A\x07\x1A\u018E\n\x1A\f\x1A\x0E\x1A\u0191" +
+		"\v\x1A\x03\x1B\x05\x1B\u0194\n\x1B\x03\x1B\x03\x1B\x05\x1B\u0198\n\x1B" +
+		"\x03\x1B\x05\x1B\u019B\n\x1B\x03\x1B\x03\x1B\x05\x1B\u019F\n\x1B\x03\x1B" +
+		"\x05\x1B\u01A2\n\x1B\x03\x1B\x05\x1B\u01A5\n\x1B\x03\x1B\x05\x1B\u01A8" +
+		"\n\x1B\x03\x1B\x05\x1B\u01AB\n\x1B\x03\x1B\x03\x1B\x05\x1B\u01AF\n\x1B" +
+		"\x03\x1B\x03\x1B\x05\x1B\u01B3\n\x1B\x03\x1B\x05\x1B\u01B6\n\x1B\x03\x1B" +
+		"\x05\x1B\u01B9\n\x1B\x03\x1B\x05\x1B\u01BC\n\x1B\x03\x1B\x05\x1B\u01BF" +
+		"\n\x1B\x03\x1B\x03\x1B\x05\x1B\u01C3\n\x1B\x03\x1B\x05\x1B\u01C6\n\x1B" +
+		"\x03\x1C\x03\x1C\x03\x1C\x03\x1D\x03\x1D\x03\x1D\x03\x1D\x05\x1D\u01CF" +
+		"\n\x1D\x03\x1E\x03\x1E\x03\x1E\x03\x1F\x05\x1F\u01D5\n\x1F\x03\x1F\x03" +
+		"\x1F\x03\x1F\x03\x1F\x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03 \x03" +
+		" \x03 \x03 \x03 \x07 \u01E8\n \f \x0E \u01EB\v \x03!\x03!\x03!\x03\"\x03" +
+		"\"\x03\"\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x03#\x05#\u01FB\n#\x03$\x03" +
+		"$\x03$\x03%\x03%\x03%\x03%\x03&\x03&\x03&\x03&\x03\'\x03\'\x03\'\x03\'" +
+		"\x03\'\x03(\x03(\x03(\x03(\x05(\u0211\n(\x03(\x03(\x05(\u0215\n(\x03(" +
+		"\x03(\x03(\x03(\x05(\u021B\n(\x03(\x03(\x03(\x05(\u0220\n(\x03)\x03)\x03" +
+		")\x03*\x03*\x03*\x03+\x03+\x03+\x05+\u022B\n+\x03+\x05+\u022E\n+\x03+" +
+		"\x03+\x03+\x03+\x05+\u0234\n+\x03+\x03+\x03+\x03+\x03+\x03+\x05+\u023C" +
+		"\n+\x03+\x03+\x03+\x03+\x07+\u0242\n+\f+\x0E+\u0245\v+\x03,\x05,\u0248" +
+		"\n,\x03,\x03,\x03,\x05,\u024D\n,\x03,\x05,\u0250\n,\x03,\x05,\u0253\n" +
+		",\x03,\x03,\x05,\u0257\n,\x03,\x03,\x05,\u025B\n,\x03,\x05,\u025E\n,\x05" +
+		",\u0260\n,\x03,\x05,\u0263\n,\x03,\x03,\x05,\u0267\n,\x03,\x03,\x05,\u026B" +
+		"\n,\x03,\x05,\u026E\n,\x05,\u0270\n,\x05,\u0272\n,\x03-\x03-\x03-\x05" +
+		"-\u0277\n-\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x03.\x05.\u0282\n." +
+		"\x03/\x03/\x03/\x03/\x05/\u0288\n/\x030\x030\x030\x050\u028D\n0\x031\x03" +
+		"1\x031\x071\u0292\n1\f1\x0E1\u0295\v1\x032\x032\x052\u0299\n2\x032\x03" +
+		"2\x052\u029D\n2\x032\x032\x052\u02A1\n2\x033\x033\x033\x033\x053\u02A7" +
+		"\n3\x053\u02A9\n3\x034\x034\x034\x074\u02AE\n4\f4\x0E4\u02B1\v4\x035\x03" +
+		"5\x035\x035\x036\x056\u02B8\n6\x036\x056\u02BB\n6\x036\x056\u02BE\n6\x03" +
+		"7\x037\x037\x037\x038\x038\x038\x038\x039\x039\x039\x03:\x03:\x03:\x03" +
+		":\x03:\x03:\x05:\u02D1\n:\x03;\x03;\x03;\x03;\x03;\x03;\x03;\x03;\x03" +
+		";\x03;\x03;\x03;\x05;\u02DF\n;\x03<\x03<\x03<\x03=\x03=\x03=\x03=\x03" +
+		"=\x03=\x03=\x03=\x03=\x07=\u02ED\n=\f=\x0E=\u02F0\v=\x03=\x05=\u02F3\n" +
+		"=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x07=\u02FC\n=\f=\x0E=\u02FF\v=\x03" +
+		"=\x05=\u0302\n=\x03=\x03=\x03=\x03=\x03=\x03=\x03=\x07=\u030B\n=\f=\x0E" +
+		"=\u030E\v=\x03=\x05=\u0311\n=\x03=\x03=\x03=\x03=\x03=\x05=\u0318\n=\x03" +
+		"=\x03=\x05=\u031C\n=\x03>\x03>\x03>\x07>\u0321\n>\f>\x0E>\u0324\v>\x03" +
+		">\x05>\u0327\n>\x03?\x03?\x03?\x05?\u032C\n?\x03?\x03?\x03?\x03?\x03?" +
+		"\x06?\u0333\n?\r?\x0E?\u0334\x03?\x03?\x05?\u0339\n?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u0353\n?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u0364\n?\x03" +
+		"?\x03?\x03?\x03?\x05?\u036A\n?\x03?\x05?\u036D\n?\x03?\x05?\u0370\n?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u037A\n?\x03?\x03?\x03?\x03" +
+		"?\x05?\u0380\n?\x03?\x05?\u0383\n?\x03?\x05?\u0386\n?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x05?\u038E\n?\x03?\x05?\u0391\n?\x03?\x03?\x05?\u0395\n?\x03" +
+		"?\x05?\u0398\n?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x05?\u03A6\n?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x05?\u03B7\n?\x03?\x03?\x03?\x05?\u03BC\n?" +
+		"\x03?\x03?\x03?\x05?\u03C1\n?\x03?\x03?\x03?\x03?\x05?\u03C7\n?\x03?\x03" +
+		"?\x03?\x03?\x03?\x05?\u03CE\n?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x05?\u03DA\n?\x03?\x03?\x05?\u03DE\n?\x03?\x05?\u03E1\n?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u03EA\n?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u03F8\n?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x05?\u040D\n?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03?\x03" +
+		"?\x03?\x03?\x03?\x05?\u042A\n?\x03?\x03?\x03?\x03?\x03?\x03?\x05?\u0432" +
+		"\n?\x07?\u0434\n?\f?\x0E?\u0437\v?\x03@\x03@\x03@\x03@\x07@\u043D\n@\f" +
+		"@\x0E@\u0440\v@\x03@\x05@\u0443\n@\x03@\x03@\x03@\x03@\x03@\x07@\u044A" +
+		"\n@\f@\x0E@\u044D\v@\x03@\x05@\u0450\n@\x03@\x03@\x05@\u0454\n@\x03@\x03" +
+		"@\x03@\x05@\u0459\n@\x03A\x03A\x03A\x03A\x03A\x03A\x05A\u0461\nA\x03B" +
+		"\x03B\x03B\x07B\u0466\nB\fB\x0EB\u0469\vB\x03B\x03B\x03B\x03B\x03B\x07" +
+		"B\u0470\nB\fB\x0EB\u0473\vB\x03B\x03B\x07B\u0477\nB\fB\x0EB\u047A\vB\x03" +
+		"B\x03B\x03B\x03B\x05B\u0480\nB\x03C\x03C\x03C\x03C\x03C\x03C\x03C\x03" +
+		"C\x03C\x03C\x03C\x05C\u048D\nC\x03D\x03D\x03D\x07D\u0492\nD\fD\x0ED\u0495" +
+		"\vD\x03D\x05D\u0498\nD\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03E\x03" +
+		"E\x05E\u04A4\nE\x03F\x03F\x03F\x03F\x05F\u04AA\nF\x03F\x05F\u04AD\nF\x03" +
+		"G\x03G\x03G\x07G\u04B2\nG\fG\x0EG\u04B5\vG\x03H\x03H\x03H\x03H\x03H\x03" +
+		"H\x03H\x03H\x03H\x05H\u04C0\nH\x03H\x03H\x03H\x03H\x05H\u04C6\nH\x07H" +
+		"\u04C8\nH\fH\x0EH\u04CB\vH\x03I\x03I\x03I\x05I\u04D0\nI\x03I\x03I\x03" +
+		"J\x03J\x03J\x05J\u04D7\nJ\x03J\x03J\x03K\x03K\x03K\x07K\u04DE\nK\fK\x0E" +
+		"K\u04E1\vK\x03K\x05K\u04E4\nK\x03L\x03L\x03M\x03M\x03M\x03M\x03M\x03M" +
+		"\x05M\u04EE\nM\x05M\u04F0\nM\x03N\x05N\u04F3\nN\x03N\x03N\x03N\x03N\x03" +
+		"N\x03N\x05N\u04FB\nN\x03O\x03O\x03O\x05O\u0500\nO\x03P\x03P\x03Q\x03Q" +
+		"\x03R\x03R\x03S\x03S\x05S\u050A\nS\x03T\x03T\x03T\x05T\u050F\nT\x03U\x03" +
+		"U\x03U\x03U\x03V\x03V\x03V\x03V\x03W\x03W\x05W\u051B\nW\x03X\x03X\x07" +
+		"X\u051F\nX\fX\x0EX\u0522\vX\x03X\x03X\x03Y\x03Y\x03Y\x03Y\x03Y\x05Y\u052B" +
+		"\nY\x03Z\x03Z\x07Z\u052F\nZ\fZ\x0EZ\u0532\vZ\x03Z\x03Z\x03[\x03[\x03[" +
+		"\x03[\x03[\x05[\u053B\n[\x03[\x02\x02\x05T|\x8E\\\x02\x02\x04\x02\x06" +
+		"\x02\b\x02\n\x02\f\x02\x0E\x02\x10\x02\x12\x02\x14\x02\x16\x02\x18\x02" +
+		"\x1A\x02\x1C\x02\x1E\x02 \x02\"\x02$\x02&\x02(\x02*\x02,\x02.\x020\x02" +
+		"2\x024\x026\x028\x02:\x02<\x02>\x02@\x02B\x02D\x02F\x02H\x02J\x02L\x02" +
+		"N\x02P\x02R\x02T\x02V\x02X\x02Z\x02\\\x02^\x02`\x02b\x02d\x02f\x02h\x02" +
+		"j\x02l\x02n\x02p\x02r\x02t\x02v\x02x\x02z\x02|\x02~\x02\x80\x02\x82\x02" +
+		"\x84\x02\x86\x02\x88\x02\x8A\x02\x8C\x02\x8E\x02\x90\x02\x92\x02\x94\x02" +
+		"\x96\x02\x98\x02\x9A\x02\x9C\x02\x9E\x02\xA0\x02\xA2\x02\xA4\x02\xA6\x02" +
+		"\xA8\x02\xAA\x02\xAC\x02\xAE\x02\xB0\x02\xB2\x02\xB4\x02\x02\x14\x04\x02" +
+		"\"\"\'\'\x04\x02\x14\x14OO\x04\x020088\x05\x02\x03\x03\x06\x06\n\n\x06" +
+		"\x02\x03\x03\x05\x06\n\nUU\x04\x0288NN\x04\x02\x03\x03\x06\x06\x04\x02" +
+		"BByy\x04\x02\t\t\x18\x19\x04\x02!!66\x04\x02LLQQ\x05\x02\f\f77__\x04\x02" +
+		"--::\x03\x02pq\x04\x02{{\x91\x91\t\x02\x17\x17**<=KKSSffll\x15\x02\x03" +
+		"\x0F\x11\x16\x18\x1C\x1E\x1F!!#&()+.0028:;??AJLRTXZaceghjk\x06\x02\x16" +
+		"\x16!!++55\x02\u05EC\x02\xB9\x03\x02\x02\x02\x04\xC0\x03\x02\x02\x02\x06" +
+		"\xC2\x03\x02\x02\x02\b\xC4\x03\x02\x02\x02\n\xCB\x03\x02\x02\x02\f\xE2" +
+		"\x03\x02\x02\x02\x0E\xE4\x03\x02\x02\x02\x10\xEB\x03\x02\x02\x02\x12\xF2" +
+		"\x03\x02\x02\x02\x14\xFF\x03\x02\x02\x02\x16\u010B\x03\x02\x02\x02\x18" +
+		"\u0114\x03\x02\x02\x02\x1A\u011C\x03\x02\x02\x02\x1C\u0132\x03\x02\x02" +
+		"\x02\x1E\u0141\x03\x02\x02\x02 \u014A\x03\x02\x02\x02\"\u014F\x03\x02" +
+		"\x02\x02$\u0153\x03\x02\x02\x02&\u0155\x03\x02\x02\x02(\u015E\x03\x02" +
+		"\x02\x02*\u0162\x03\x02\x02\x02,\u0170\x03\x02\x02\x02.\u017D\x03\x02" +
+		"\x02\x020\u0187\x03\x02\x02\x022\u018B\x03\x02\x02\x024\u0193\x03\x02" +
+		"\x02\x026\u01C7\x03\x02\x02\x028\u01CA\x03\x02\x02\x02:\u01D0\x03\x02" +
+		"\x02\x02<\u01D4\x03\x02\x02\x02>\u01DA\x03\x02\x02\x02@\u01EC\x03\x02" +
+		"\x02\x02B\u01EF\x03\x02\x02\x02D\u01F2\x03\x02\x02\x02F\u01FC\x03\x02" +
+		"\x02\x02H\u01FF\x03\x02\x02\x02J\u0203\x03\x02\x02\x02L\u0207\x03\x02" +
+		"\x02\x02N\u021F\x03\x02\x02\x02P\u0221\x03\x02\x02\x02R\u0224\x03\x02" +
+		"\x02\x02T\u0233\x03\x02\x02\x02V\u0271\x03\x02\x02\x02X\u0276\x03\x02" +
+		"\x02\x02Z\u0281\x03\x02\x02\x02\\\u0283\x03\x02\x02\x02^\u0289\x03\x02" +
+		"\x02\x02`\u028E\x03\x02\x02\x02b\u0296\x03\x02\x02\x02d\u02A8\x03\x02" +
+		"\x02\x02f\u02AA\x03\x02\x02\x02h\u02B2\x03\x02\x02\x02j\u02B7\x03\x02" +
+		"\x02\x02l\u02BF\x03\x02\x02\x02n\u02C3\x03\x02\x02\x02p\u02C7\x03\x02" +
+		"\x02\x02r\u02D0\x03\x02\x02\x02t\u02DE\x03\x02\x02\x02v\u02E0\x03\x02" +
+		"\x02\x02x\u031B\x03\x02\x02\x02z\u031D\x03\x02\x02\x02|\u03C0\x03\x02" +
+		"\x02\x02~\u0453\x03\x02\x02\x02\x80\u0460\x03\x02\x02\x02\x82\u047F\x03" +
+		"\x02\x02\x02\x84\u048C\x03\x02\x02\x02\x86\u048E\x03\x02\x02\x02\x88\u04A3" +
+		"\x03\x02\x02\x02\x8A\u04AC\x03\x02\x02\x02\x8C\u04AE\x03\x02\x02\x02\x8E" +
+		"\u04BF\x03\x02\x02\x02\x90\u04CC\x03\x02\x02\x02\x92\u04D6\x03\x02\x02" +
+		"\x02\x94\u04DA\x03\x02\x02\x02\x96\u04E5\x03\x02\x02\x02\x98\u04EF\x03" +
+		"\x02\x02\x02\x9A\u04F2\x03\x02\x02\x02\x9C\u04FF\x03\x02\x02\x02\x9E\u0501" +
+		"\x03\x02\x02\x02\xA0\u0503\x03\x02\x02\x02\xA2\u0505\x03\x02\x02\x02\xA4" +
+		"\u0509\x03\x02\x02\x02\xA6\u050E\x03\x02\x02\x02\xA8\u0510\x03\x02\x02" +
+		"\x02\xAA\u0514\x03\x02\x02\x02\xAC\u051A\x03\x02\x02\x02\xAE\u051C\x03" +
+		"\x02\x02\x02\xB0\u052A\x03\x02\x02\x02\xB2\u052C\x03\x02\x02\x02\xB4\u053A" +
+		"\x03\x02\x02\x02\xB6\xB8\x05\x04\x03\x02\xB7\xB6\x03\x02\x02\x02\xB8\xBB" +
+		"\x03\x02\x02\x02\xB9\xB7\x03\x02\x02\x02\xB9\xBA\x03\x02\x02\x02\xBA\xBC" +
+		"\x03\x02\x02\x02\xBB\xB9\x03\x02\x02\x02\xBC\xBD\x07\x02\x02\x03\xBD\x03" +
+		"\x03\x02\x02\x02\xBE\xC1\x05\b\x05\x02\xBF\xC1\x05\f\x07\x02\xC0\xBE\x03" +
+		"\x02\x02\x02\xC0\xBF\x03\x02\x02\x02\xC1\x05\x03\x02\x02\x02\xC2\xC3\x05" +
+		"|?\x02\xC3\x07\x03\x02\x02\x02\xC4\xC5\x079\x02\x02\xC5\xC9\x05\xA6T\x02" +
+		"\xC6\xC7\x07x\x02\x02\xC7\xC8\x07\x7F\x02\x02\xC8\xCA\x05\x06\x04\x02" +
+		"\xC9\xC6\x03\x02\x02\x02\xC9\xCA\x03\x02\x02\x02\xCA\t\x03\x02\x02\x02" +
+		"\xCB\xD0\x05\xA6T\x02\xCC\xCD\x07y\x02\x02\xCD\xCF\x05\xA6T\x02\xCE\xCC" +
+		"\x03\x02\x02\x02\xCF\xD2\x03\x02\x02\x02\xD0\xCE\x03\x02\x02\x02\xD0\xD1" +
+		"\x03\x02\x02\x02\xD1\xD4\x03\x02\x02\x02\xD2\xD0\x03\x02\x02\x02\xD3\xD5" +
+		"\x07y\x02\x02\xD4\xD3\x03\x02\x02\x02\xD4\xD5\x03\x02\x02\x02\xD5\v\x03" +
+		"\x02\x02\x02\xD6\xE3\x05\x0E\b\x02\xD7\xE3\x05\x10\t\x02\xD8\xE3\x05\x14" +
+		"\v\x02\xD9\xE3\x05\x16\f\x02\xDA\xE3\x05\x18\r\x02\xDB\xE3\x05\x1C\x0F" +
+		"\x02\xDC\xE3\x05\x1A\x0E\x02\xDD\xE3\x05\x1E\x10\x02\xDE\xE3\x05 \x11" +
+		"\x02\xDF\xE3\x05&\x14\x02\xE0\xE3\x05\"\x12\x02\xE1\xE3\x05$\x13\x02\xE2" +
+		"\xD6\x03\x02\x02\x02\xE2\xD7\x03\x02\x02\x02\xE2\xD8\x03\x02\x02\x02\xE2" +
+		"\xD9\x03\x02\x02\x02\xE2\xDA\x03\x02\x02\x02\xE2\xDB\x03\x02\x02\x02\xE2" +
+		"\xDC\x03\x02\x02\x02\xE2\xDD\x03\x02\x02\x02\xE2\xDE\x03\x02\x02\x02\xE2" +
+		"\xDF\x03\x02\x02\x02\xE2\xE0\x03\x02\x02\x02\xE2\xE1\x03\x02\x02\x02\xE3" +
+		"\r\x03\x02\x02\x02\xE4\xE6\x07M\x02\x02\xE5\xE7\x05\x06\x04\x02\xE6\xE5" +
+		"\x03\x02\x02\x02\xE6\xE7\x03\x02\x02\x02\xE7\xE9\x03\x02\x02\x02\xE8\xEA" +
+		"\x07\x9C\x02\x02\xE9\xE8\x03\x02\x02\x02\xE9\xEA\x03\x02\x02\x02\xEA\x0F" +
+		"\x03\x02\x02\x02\xEB\xED\x07Y\x02\x02\xEC\xEE\x05\x06\x04\x02\xED\xEC" +
+		"\x03\x02\x02\x02\xED\xEE\x03\x02\x02\x02\xEE\xF0\x03\x02\x02\x02\xEF\xF1" +
+		"\x07\x9C\x02\x02\xF0\xEF\x03\x02\x02\x02\xF0\xF1\x03\x02\x02\x02\xF1\x11" +
+		"\x03\x02\x02\x02\xF2\xFB\x07\x10\x02\x02\xF3\xF4\x07\x87\x02\x02\xF4\xF7" +
+		"\x05\xA6T\x02\xF5\xF6\x07x\x02\x02\xF6\xF8\x05\xA6T\x02\xF7\xF5\x03\x02" +
+		"\x02\x02\xF7\xF8\x03\x02\x02\x02\xF8\xF9\x03\x02\x02\x02\xF9\xFA\x07\x9B" +
+		"\x02\x02\xFA\xFC\x03\x02\x02\x02\xFB\xF3\x03\x02\x02\x02\xFB\xFC\x03\x02" +
+		"\x02\x02\xFC\xFD\x03\x02\x02\x02\xFD\xFE\x05&\x14\x02\xFE\x13\x03\x02" +
+		"\x02\x02\xFF\u0100\x07b\x02\x02\u0100\u0104\x05&\x14\x02\u0101\u0103\x05" +
+		"\x12\n\x02\u0102\u0101\x03\x02\x02\x02\u0103\u0106\x03\x02\x02\x02\u0104" +
+		"\u0102\x03\x02\x02\x02\u0104\u0105\x03\x02\x02\x02\u0105\u0109\x03\x02" +
+		"\x02\x02\u0106\u0104\x03\x02\x02\x02\u0107\u0108\x07 \x02\x02\u0108\u010A" +
+		"\x05&\x14\x02\u0109\u0107\x03\x02\x02\x02\u0109\u010A\x03\x02\x02\x02" +
+		"\u010A\x15\x03\x02\x02\x02\u010B\u010C\x07,\x02\x02\u010C\u010D\x07\x87" +
+		"\x02\x02\u010D\u010E\x05\x06\x04\x02\u010E\u010F\x07\x9B\x02\x02\u010F" +
+		"\u0112\x05\f\x07\x02\u0110\u0111\x07\x1B\x02\x02\u0111\u0113\x05\f\x07" +
+		"\x02\u0112\u0110\x03\x02\x02\x02\u0112\u0113\x03\x02\x02\x02\u0113\x17" +
+		"\x03\x02\x02\x02\u0114\u0115\x07i\x02\x02\u0115\u0116\x07\x87\x02\x02" +
+		"\u0116\u0117\x05\x06\x04\x02\u0117\u0118\x07\x9B\x02\x02\u0118\u011A\x05" +
+		"\f\x07\x02\u0119\u011B\x07\x9C\x02\x02\u011A\u0119\x03\x02\x02\x02\u011A" +
+		"\u011B\x03\x02\x02\x02\u011B\x19\x03\x02\x02\x02\u011C\u011D\x07$\x02" +
+		"\x02\u011D\u0121\x07\x87\x02\x02\u011E\u0122\x05\b\x05\x02\u011F\u0122" +
+		"\x05 \x11\x02\u0120\u0122\x05\x06\x04\x02\u0121\u011E\x03\x02\x02\x02" +
+		"\u0121\u011F\x03\x02\x02\x02\u0121\u0120\x03\x02\x02\x02\u0121\u0122\x03" +
+		"\x02\x02\x02\u0122\u0123\x03\x02\x02\x02\u0123\u0125\x07\x9C\x02\x02\u0124" +
+		"\u0126\x05\x06\x04\x02\u0125\u0124\x03\x02\x02\x02\u0125\u0126\x03\x02" +
+		"\x02\x02\u0126\u0127\x03\x02\x02\x02\u0127\u012B\x07\x9C\x02\x02\u0128" +
+		"\u012C\x05\b\x05\x02\u0129\u012C\x05 \x11\x02\u012A\u012C\x05\x06\x04" +
+		"\x02\u012B\u0128\x03\x02\x02\x02\u012B\u0129\x03\x02\x02\x02\u012B\u012A" +
+		"\x03\x02\x02\x02\u012B\u012C\x03\x02\x02\x02\u012C\u012D\x03\x02\x02\x02" +
+		"\u012D\u012E\x07\x9B\x02\x02\u012E\u0130\x05\f\x07\x02\u012F\u0131\x07" +
+		"\x9C\x02\x02\u0130\u012F\x03\x02\x02\x02\u0130\u0131\x03\x02\x02\x02\u0131" +
+		"\x1B\x03\x02\x02\x02\u0132\u0133\x07$\x02\x02\u0133\u0134\x07\x87\x02" +
+		"\x02\u0134\u0135\x079\x02\x02\u0135\u0138\x05\xA6T\x02\u0136\u0137\x07" +
+		"y\x02\x02\u0137\u0139\x05\xA6T\x02\u0138\u0136\x03\x02\x02\x02\u0138\u0139" +
+		"\x03\x02\x02\x02\u0139\u013A\x03\x02\x02\x02\u013A\u013B\x07.\x02\x02" +
+		"\u013B\u013C\x05\x06\x04\x02\u013C\u013D\x07\x9B\x02\x02\u013D\u013F\x05" +
+		"\f\x07\x02\u013E\u0140\x07\x9C\x02\x02\u013F\u013E\x03\x02\x02\x02\u013F" +
+		"\u0140\x03\x02\x02\x02\u0140\x1D\x03\x02\x02\x02\u0141\u0142\t\x02\x02" +
+		"\x02\u0142\u0143\x05\xA6T\x02\u0143\u0145\x07\x87\x02\x02\u0144\u0146" +
+		"\x05\n\x06\x02\u0145\u0144\x03\x02\x02\x02\u0145\u0146\x03\x02\x02\x02" +
+		"\u0146\u0147\x03\x02\x02\x02\u0147\u0148\x07\x9B\x02\x02\u0148\u0149\x05" +
+		"&\x14\x02\u0149\x1F\x03\x02\x02\x02\u014A\u014B\x05\x06\x04\x02\u014B" +
+		"\u014C\x07x\x02\x02\u014C\u014D\x07\x7F\x02\x02\u014D\u014E\x05\x06\x04" +
+		"\x02\u014E!\x03\x02\x02\x02\u014F\u0151\x05\x06\x04\x02\u0150\u0152\x07" +
+		"\x9C\x02\x02\u0151\u0150\x03\x02\x02\x02\u0151\u0152\x03\x02\x02\x02\u0152" +
+		"#\x03\x02\x02\x02\u0153\u0154\x07\x9C\x02\x02\u0154%\x03\x02\x02\x02\u0155" +
+		"\u0159\x07\x85\x02\x02\u0156\u0158\x05\x04\x03\x02\u0157\u0156\x03\x02" +
+		"\x02\x02\u0158\u015B\x03\x02\x02\x02\u0159\u0157\x03\x02\x02\x02\u0159" +
+		"\u015A\x03\x02\x02\x02\u015A\u015C\x03";
+	private static readonly _serializedATNSegment1: string =
+		"\x02\x02\x02\u015B\u0159\x03\x02\x02\x02\u015C\u015D\x07\x99\x02\x02\u015D" +
+		"\'\x03\x02\x02\x02\u015E\u015F\x05\x06\x04\x02\u015F\u0160\x07x\x02\x02" +
+		"\u0160\u0161\x05\x06\x04\x02\u0161)\x03\x02\x02\x02\u0162\u0167\x05(\x15" +
+		"\x02\u0163\u0164\x07y\x02\x02\u0164\u0166\x05(\x15\x02\u0165\u0163\x03" +
+		"\x02\x02\x02\u0166\u0169\x03\x02\x02\x02\u0167\u0165\x03\x02\x02\x02\u0167" +
+		"\u0168\x03\x02\x02\x02\u0168\u016B\x03\x02\x02\x02\u0169\u0167\x03\x02" +
+		"\x02\x02\u016A\u016C\x07y\x02\x02\u016B\u016A\x03\x02\x02\x02\u016B\u016C" +
+		"\x03\x02\x02\x02\u016C+\x03\x02\x02\x02\u016D\u0171\x052\x1A\x02\u016E" +
+		"\u0171\x054\x1B\x02\u016F\u0171\x05\x82B\x02\u0170\u016D\x03\x02\x02\x02" +
+		"\u0170\u016E\x03\x02\x02\x02\u0170\u016F\x03\x02\x02\x02\u0171\u0173\x03" +
+		"\x02\x02\x02\u0172\u0174\x07\x9C\x02\x02\u0173\u0172\x03\x02\x02\x02\u0173" +
+		"\u0174\x03\x02\x02\x02\u0174\u0175\x03\x02\x02\x02\u0175\u0176\x07\x02" +
+		"\x02\x03\u0176-\x03\x02\x02\x02\u0177\u017E\x054\x1B\x02\u0178\u0179\x07" +
+		"\x87\x02\x02\u0179\u017A\x052\x1A\x02\u017A\u017B\x07\x9B\x02\x02\u017B" +
+		"\u017E\x03\x02\x02\x02\u017C\u017E\x05\xAAV\x02\u017D\u0177\x03\x02\x02" +
+		"\x02\u017D\u0178\x03\x02\x02\x02\u017D\u017C\x03\x02\x02\x02\u017E/\x03" +
+		"\x02\x02\x02\u017F\u0188\x07\x1D\x02\x02\u0180\u0181\x07d\x02\x02\u0181" +
+		"\u0188\x07\x03\x02\x02\u0182\u0183\x07d\x02\x02\u0183\u0188\x07\x1A\x02" +
+		"\x02\u0184\u0188\x071\x02\x02\u0185\u0186\x071\x02\x02\u0186\u0188\x07" +
+		"\x1A\x02\x02\u0187\u017F\x03\x02\x02\x02\u0187\u0180\x03\x02\x02\x02\u0187" +
+		"\u0182\x03\x02\x02\x02\u0187\u0184\x03\x02\x02\x02\u0187\u0185\x03\x02" +
+		"\x02\x02\u0188\u0189\x03\x02\x02\x02\u0189\u018A\x05.\x18\x02\u018A1\x03" +
+		"\x02\x02\x02\u018B\u018F\x05.\x18\x02\u018C\u018E\x050\x19\x02\u018D\u018C" +
+		"\x03\x02\x02\x02\u018E\u0191\x03\x02\x02\x02\u018F\u018D\x03\x02\x02\x02" +
+		"\u018F\u0190\x03\x02\x02\x02\u01903\x03\x02\x02\x02\u0191\u018F\x03\x02" +
+		"\x02\x02\u0192\u0194\x056\x1C\x02\u0193\u0192\x03\x02\x02\x02\u0193\u0194" +
+		"\x03\x02\x02\x02\u0194\u0195\x03\x02\x02\x02\u0195\u0197\x07T\x02\x02" +
+		"\u0196\u0198\x07\x1A\x02\x02\u0197\u0196\x03\x02\x02\x02\u0197\u0198\x03" +
+		"\x02\x02\x02\u0198\u019A\x03\x02\x02\x02\u0199\u019B\x058\x1D\x02\u019A" +
+		"\u0199\x03\x02\x02\x02\u019A\u019B\x03\x02\x02\x02\u019B\u019C\x03\x02" +
+		"\x02\x02\u019C\u019E\x05z>\x02\u019D\u019F\x05:\x1E\x02\u019E\u019D\x03" +
+		"\x02\x02\x02\u019E\u019F\x03\x02\x02\x02\u019F\u01A1\x03\x02\x02\x02\u01A0" +
+		"\u01A2\x05<\x1F\x02\u01A1\u01A0\x03\x02\x02\x02\u01A1\u01A2\x03\x02\x02" +
+		"\x02\u01A2\u01A4\x03\x02\x02\x02\u01A3\u01A5\x05@!\x02\u01A4\u01A3\x03" +
+		"\x02\x02\x02\u01A4\u01A5\x03\x02\x02\x02\u01A5\u01A7\x03\x02\x02\x02\u01A6" +
+		"\u01A8\x05B\"\x02\u01A7\u01A6\x03\x02\x02\x02\u01A7\u01A8\x03\x02\x02" +
+		"\x02\u01A8\u01AA\x03\x02\x02\x02\u01A9\u01AB\x05D#\x02\u01AA\u01A9\x03" +
+		"\x02\x02\x02\u01AA\u01AB\x03\x02\x02\x02\u01AB\u01AE\x03\x02\x02\x02\u01AC" +
+		"\u01AD\x07k\x02\x02\u01AD\u01AF\t\x03\x02\x02\u01AE\u01AC\x03\x02\x02" +
+		"\x02\u01AE\u01AF\x03\x02\x02\x02\u01AF\u01B2\x03\x02\x02\x02\u01B0\u01B1" +
+		"\x07k\x02\x02\u01B1\u01B3\x07^\x02\x02\u01B2\u01B0\x03\x02\x02\x02\u01B2" +
+		"\u01B3\x03\x02\x02\x02\u01B3\u01B5\x03\x02\x02\x02\u01B4\u01B6\x05F$\x02" +
+		"\u01B5\u01B4\x03\x02\x02\x02\u01B5\u01B6\x03\x02\x02\x02\u01B6\u01B8\x03" +
+		"\x02\x02\x02\u01B7\u01B9\x05> \x02\u01B8\u01B7\x03\x02\x02\x02\u01B8\u01B9" +
+		"\x03\x02\x02\x02\u01B9\u01BB\x03\x02\x02\x02\u01BA\u01BC\x05H%\x02\u01BB" +
+		"\u01BA\x03\x02\x02\x02\u01BB\u01BC\x03\x02\x02\x02\u01BC\u01BE\x03\x02" +
+		"\x02\x02\u01BD\u01BF\x05L\'\x02\u01BE\u01BD\x03\x02\x02\x02\u01BE\u01BF" +
+		"\x03\x02\x02\x02\u01BF\u01C2\x03\x02\x02\x02\u01C0\u01C3\x05N(\x02\u01C1" +
+		"\u01C3\x05P)\x02\u01C2\u01C0\x03\x02\x02\x02\u01C2\u01C1\x03\x02\x02\x02" +
+		"\u01C2\u01C3\x03\x02\x02\x02\u01C3\u01C5\x03\x02\x02\x02\u01C4\u01C6\x05" +
+		"R*\x02\u01C5\u01C4\x03\x02\x02\x02\u01C5\u01C6\x03\x02\x02\x02\u01C65" +
+		"\x03\x02\x02\x02\u01C7\u01C8\x07k\x02\x02\u01C8\u01C9\x05\x86D\x02\u01C9" +
+		"7\x03\x02\x02\x02\u01CA\u01CB\x07]\x02\x02\u01CB\u01CE\x07q\x02\x02\u01CC" +
+		"\u01CD\x07k\x02\x02\u01CD\u01CF\x07Z\x02\x02\u01CE\u01CC\x03\x02\x02\x02" +
+		"\u01CE\u01CF\x03\x02\x02\x02\u01CF9\x03\x02\x02\x02\u01D0\u01D1\x07%\x02" +
+		"\x02\u01D1\u01D2\x05T+\x02\u01D2;\x03\x02\x02\x02\u01D3\u01D5\t\x04\x02" +
+		"\x02\u01D4\u01D3\x03\x02\x02\x02\u01D4\u01D5\x03\x02\x02\x02\u01D5\u01D6" +
+		"\x03\x02\x02\x02\u01D6\u01D7\x07\x07\x02\x02\u01D7\u01D8\x074\x02\x02" +
+		"\u01D8\u01D9\x05z>\x02\u01D9=\x03\x02\x02\x02\u01DA\u01DB\x07j\x02\x02" +
+		"\u01DB\u01DC\x05\xA6T\x02\u01DC\u01DD\x07\b\x02\x02\u01DD\u01DE\x07\x87" +
+		"\x02\x02\u01DE\u01DF\x05j6\x02\u01DF\u01E9\x07\x9B\x02\x02\u01E0\u01E1" +
+		"\x07y\x02\x02\u01E1\u01E2\x05\xA6T\x02\u01E2\u01E3\x07\b\x02\x02\u01E3" +
+		"\u01E4\x07\x87\x02\x02\u01E4\u01E5\x05j6\x02\u01E5\u01E6\x07\x9B\x02\x02" +
+		"\u01E6\u01E8\x03\x02\x02\x02\u01E7\u01E0\x03\x02\x02\x02\u01E8\u01EB\x03" +
+		"\x02\x02\x02\u01E9\u01E7\x03\x02\x02\x02\u01E9\u01EA\x03\x02\x02\x02\u01EA" +
+		"?\x03\x02\x02\x02\u01EB\u01E9\x03\x02\x02\x02\u01EC\u01ED\x07J\x02\x02" +
+		"\u01ED\u01EE\x05|?\x02\u01EEA\x03\x02\x02\x02\u01EF\u01F0\x07h\x02\x02" +
+		"\u01F0\u01F1\x05|?\x02\u01F1C\x03\x02\x02\x02\u01F2\u01F3\x07(\x02\x02" +
+		"\u01F3\u01FA\x07\r\x02\x02\u01F4\u01F5\t\x03\x02\x02\u01F5\u01F6\x07\x87" +
+		"\x02\x02\u01F6\u01F7\x05z>\x02\u01F7\u01F8\x07\x9B\x02\x02\u01F8\u01FB" +
+		"\x03\x02\x02\x02\u01F9\u01FB\x05z>\x02\u01FA\u01F4\x03\x02\x02\x02\u01FA" +
+		"\u01F9\x03\x02\x02\x02\u01FBE\x03\x02\x02\x02\u01FC\u01FD\x07)\x02\x02" +
+		"\u01FD\u01FE\x05|?\x02\u01FEG\x03\x02\x02\x02\u01FF\u0200\x07E\x02\x02" +
+		"\u0200\u0201\x07\r\x02\x02\u0201\u0202\x05`1\x02\u0202I\x03\x02\x02\x02" +
+		"\u0203\u0204\x07E\x02\x02\u0204\u0205\x07\r\x02\x02\u0205\u0206\x05z>" +
+		"\x02\u0206K\x03\x02\x02\x02\u0207\u0208\x07;\x02\x02\u0208\u0209\x05^" +
+		"0\x02\u0209\u020A\x07\r\x02\x02\u020A\u020B\x05z>\x02\u020BM\x03\x02\x02" +
+		"\x02\u020C\u020D\x07;\x02\x02\u020D\u0210\x05|?\x02\u020E\u020F\x07y\x02" +
+		"\x02\u020F\u0211\x05|?\x02\u0210\u020E\x03\x02\x02\x02\u0210\u0211\x03" +
+		"\x02\x02\x02\u0211\u0214\x03\x02\x02\x02\u0212\u0213\x07k\x02\x02\u0213" +
+		"\u0215\x07Z\x02\x02\u0214\u0212\x03\x02\x02\x02\u0214\u0215\x03\x02\x02" +
+		"\x02\u0215\u0220\x03\x02\x02\x02\u0216\u0217\x07;\x02\x02\u0217\u021A" +
+		"\x05|?\x02\u0218\u0219\x07k\x02\x02\u0219\u021B\x07Z\x02\x02\u021A\u0218" +
+		"\x03\x02\x02\x02\u021A\u021B\x03\x02\x02\x02\u021B\u021C\x03\x02\x02\x02" +
+		"\u021C\u021D\x07B\x02\x02\u021D\u021E\x05|?\x02\u021E\u0220\x03\x02\x02" +
+		"\x02\u021F\u020C\x03\x02\x02\x02\u021F\u0216\x03\x02\x02\x02\u0220O\x03" +
+		"\x02\x02\x02\u0221\u0222\x07B\x02\x02\u0222\u0223\x05|?\x02\u0223Q\x03" +
+		"\x02\x02\x02\u0224\u0225\x07V\x02\x02\u0225\u0226\x05f4\x02\u0226S\x03" +
+		"\x02\x02\x02\u0227\u0228\b+\x01\x02\u0228\u022A\x05\x8EH\x02\u0229\u022B" +
+		"\x07\x1F\x02\x02\u022A\u0229\x03\x02\x02\x02\u022A\u022B\x03\x02\x02\x02" +
+		"\u022B\u022D\x03\x02\x02\x02\u022C\u022E\x05\\/\x02\u022D\u022C\x03\x02" +
+		"\x02\x02\u022D\u022E\x03\x02\x02\x02\u022E\u0234\x03\x02\x02\x02\u022F" +
+		"\u0230\x07\x87\x02\x02\u0230\u0231\x05T+\x02\u0231\u0232\x07\x9B\x02\x02" +
+		"\u0232\u0234\x03\x02\x02\x02\u0233\u0227\x03\x02\x02\x02\u0233\u022F\x03" +
+		"\x02\x02\x02\u0234\u0243\x03\x02\x02\x02\u0235\u0236\f\x05\x02\x02\u0236" +
+		"\u0237\x05X-\x02\u0237\u0238\x05T+\x06\u0238\u0242\x03\x02\x02\x02\u0239" +
+		"\u023B\f\x06\x02\x02\u023A\u023C\x05V,\x02\u023B\u023A\x03\x02\x02\x02" +
+		"\u023B\u023C\x03\x02\x02\x02\u023C\u023D\x03\x02\x02\x02\u023D\u023E\x07" +
+		"4\x02\x02\u023E\u023F\x05T+\x02\u023F\u0240\x05Z.\x02\u0240\u0242\x03" +
+		"\x02\x02\x02\u0241\u0235\x03\x02\x02\x02\u0241\u0239\x03\x02\x02\x02\u0242" +
+		"\u0245\x03\x02\x02\x02\u0243\u0241\x03\x02\x02\x02\u0243\u0244\x03\x02" +
+		"\x02\x02\u0244U\x03\x02\x02\x02\u0245\u0243\x03\x02\x02\x02\u0246\u0248" +
+		"\t\x05\x02\x02\u0247\u0246\x03\x02\x02\x02\u0247\u0248\x03\x02\x02\x02" +
+		"\u0248\u0249\x03\x02\x02\x02\u0249\u0250\x070\x02\x02\u024A\u024C\x07" +
+		"0\x02\x02\u024B\u024D\t\x05\x02\x02\u024C\u024B\x03\x02\x02\x02\u024C" +
+		"\u024D\x03\x02\x02\x02\u024D\u0250\x03\x02\x02\x02\u024E\u0250\t\x05\x02" +
+		"\x02\u024F\u0247\x03\x02\x02\x02\u024F\u024A\x03\x02\x02\x02\u024F\u024E" +
+		"\x03\x02\x02\x02\u0250\u0272\x03\x02\x02\x02\u0251\u0253\t\x06\x02\x02" +
+		"\u0252\u0251\x03\x02\x02\x02\u0252\u0253\x03\x02\x02\x02\u0253\u0254\x03" +
+		"\x02\x02\x02\u0254\u0256\t\x07\x02\x02\u0255\u0257\x07F\x02\x02\u0256" +
+		"\u0255\x03\x02\x02\x02\u0256\u0257\x03\x02\x02\x02\u0257\u0260\x03\x02" +
+		"\x02\x02\u0258\u025A\t\x07\x02\x02\u0259\u025B\x07F\x02\x02\u025A\u0259" +
+		"\x03\x02\x02\x02\u025A\u025B\x03\x02\x02\x02\u025B\u025D\x03\x02\x02\x02" +
+		"\u025C\u025E\t\x06\x02\x02\u025D\u025C\x03\x02\x02\x02\u025D\u025E\x03" +
+		"\x02\x02\x02\u025E\u0260\x03\x02\x02\x02\u025F\u0252\x03\x02\x02\x02\u025F" +
+		"\u0258\x03\x02\x02\x02\u0260\u0272\x03\x02\x02\x02\u0261\u0263\t\b\x02" +
+		"\x02\u0262\u0261\x03\x02\x02\x02\u0262\u0263\x03\x02\x02\x02\u0263\u0264" +
+		"\x03\x02\x02\x02\u0264\u0266\x07&\x02\x02\u0265\u0267\x07F\x02\x02\u0266" +
+		"\u0265\x03\x02\x02\x02\u0266\u0267\x03\x02\x02\x02\u0267\u0270\x03\x02" +
+		"\x02\x02\u0268\u026A\x07&\x02\x02\u0269\u026B\x07F\x02\x02\u026A\u0269" +
+		"\x03\x02\x02\x02\u026A\u026B\x03\x02\x02\x02\u026B\u026D\x03\x02\x02\x02" +
+		"\u026C\u026E\t\b\x02\x02\u026D\u026C\x03\x02\x02\x02\u026D\u026E\x03\x02" +
+		"\x02\x02\u026E\u0270\x03\x02\x02\x02\u026F\u0262\x03\x02\x02\x02\u026F" +
+		"\u0268\x03\x02\x02\x02\u0270\u0272\x03\x02\x02\x02\u0271\u024F\x03\x02" +
+		"\x02\x02\u0271\u025F\x03\x02\x02\x02\u0271\u026F\x03\x02\x02\x02\u0272" +
+		"W\x03\x02\x02\x02\u0273\u0274\x07\x13\x02\x02\u0274\u0277\x074\x02\x02" +
+		"\u0275\u0277\x07y\x02\x02\u0276\u0273\x03\x02\x02\x02\u0276\u0275\x03" +
+		"\x02\x02\x02\u0277Y\x03\x02\x02\x02\u0278\u0279\x07C\x02\x02\u0279\u0282" +
+		"\x05z>\x02\u027A\u027B\x07e\x02\x02\u027B\u027C\x07\x87\x02\x02\u027C" +
+		"\u027D\x05z>\x02\u027D\u027E\x07\x9B\x02\x02\u027E\u0282\x03\x02\x02\x02" +
+		"\u027F\u0280\x07e\x02\x02\u0280\u0282\x05z>\x02\u0281\u0278\x03\x02\x02" +
+		"\x02\u0281\u027A\x03\x02\x02\x02\u0281\u027F\x03\x02\x02\x02\u0282[\x03" +
+		"\x02\x02\x02\u0283\u0284\x07R\x02\x02\u0284\u0287\x05d3\x02\u0285\u0286" +
+		"\x07B\x02\x02\u0286\u0288\x05d3\x02\u0287\u0285\x03\x02\x02\x02\u0287" +
+		"\u0288\x03\x02\x02\x02\u0288]\x03\x02\x02\x02\u0289\u028C\x05|?\x02\u028A" +
+		"\u028B\t\t\x02\x02\u028B\u028D\x05|?\x02\u028C\u028A\x03\x02\x02\x02\u028C" +
+		"\u028D\x03\x02\x02\x02\u028D_\x03\x02\x02\x02\u028E\u0293\x05b2\x02\u028F" +
+		"\u0290\x07y\x02\x02\u0290\u0292\x05b2\x02\u0291\u028F\x03\x02\x02\x02" +
+		"\u0292\u0295\x03\x02\x02\x02\u0293\u0291\x03\x02\x02\x02\u0293\u0294\x03" +
+		"\x02\x02\x02\u0294a\x03\x02\x02\x02\u0295\u0293\x03\x02\x02\x02\u0296" +
+		"\u0298\x05|?\x02\u0297\u0299\t\n\x02\x02\u0298\u0297\x03\x02\x02\x02\u0298" +
+		"\u0299\x03\x02\x02\x02\u0299\u029C\x03\x02\x02\x02\u029A\u029B\x07A\x02" +
+		"\x02\u029B\u029D\t\v\x02\x02\u029C\u029A\x03\x02\x02\x02\u029C\u029D\x03" +
+		"\x02\x02\x02\u029D\u02A0\x03\x02\x02\x02\u029E\u029F\x07\x12\x02\x02\u029F" +
+		"\u02A1\x07s\x02\x02\u02A0\u029E\x03\x02\x02\x02\u02A0\u02A1\x03\x02\x02" +
+		"\x02\u02A1c\x03\x02\x02\x02\u02A2\u02A9\x05\xAAV\x02\u02A3\u02A6\x05\x9A" +
+		"N\x02\u02A4\u02A5\x07\x9D\x02\x02\u02A5\u02A7\x05\x9AN\x02\u02A6\u02A4" +
+		"\x03\x02\x02\x02\u02A6\u02A7\x03\x02\x02\x02\u02A7\u02A9\x03\x02\x02\x02" +
+		"\u02A8\u02A2\x03\x02\x02\x02\u02A8\u02A3\x03\x02\x02\x02\u02A9e\x03\x02" +
+		"\x02\x02\u02AA\u02AF\x05h5\x02\u02AB\u02AC\x07y\x02\x02\u02AC\u02AE\x05" +
+		"h5\x02\u02AD\u02AB\x03\x02\x02\x02\u02AE\u02B1\x03\x02\x02\x02\u02AF\u02AD" +
+		"\x03\x02\x02\x02\u02AF\u02B0\x03\x02\x02\x02\u02B0g\x03\x02\x02\x02\u02B1" +
+		"\u02AF\x03\x02\x02\x02\u02B2\u02B3\x05\xA6T\x02\u02B3\u02B4\x07\x7F\x02" +
+		"\x02\u02B4\u02B5\x05\x9CO\x02\u02B5i\x03\x02\x02\x02\u02B6\u02B8\x05l" +
+		"7\x02\u02B7\u02B6\x03\x02\x02\x02\u02B7\u02B8\x03\x02\x02\x02\u02B8\u02BA" +
+		"\x03\x02\x02\x02\u02B9\u02BB\x05n8\x02\u02BA\u02B9\x03\x02\x02\x02\u02BA" +
+		"\u02BB\x03\x02\x02\x02\u02BB\u02BD\x03\x02\x02\x02\u02BC\u02BE\x05p9\x02" +
+		"\u02BD\u02BC\x03\x02\x02\x02\u02BD\u02BE\x03\x02\x02\x02\u02BEk\x03\x02" +
+		"\x02\x02\u02BF\u02C0\x07H\x02\x02\u02C0\u02C1\x07\r\x02\x02\u02C1\u02C2" +
+		"\x05z>\x02\u02C2m\x03\x02\x02\x02\u02C3\u02C4\x07E\x02\x02\u02C4\u02C5" +
+		"\x07\r\x02\x02\u02C5\u02C6\x05`1\x02\u02C6o\x03\x02\x02\x02\u02C7\u02C8" +
+		"\t\f\x02\x02\u02C8\u02C9\x05r:\x02\u02C9q\x03\x02\x02\x02\u02CA\u02D1" +
+		"\x05t;\x02\u02CB\u02CC\x07\v\x02\x02\u02CC\u02CD\x05t;\x02\u02CD\u02CE" +
+		"\x07\x04\x02\x02\u02CE\u02CF\x05t;\x02\u02CF\u02D1\x03\x02\x02\x02\u02D0" +
+		"\u02CA\x03\x02\x02\x02\u02D0\u02CB\x03\x02\x02\x02\u02D1s\x03\x02\x02" +
+		"\x02\u02D2\u02D3\x07\x15\x02\x02\u02D3\u02DF\x07P\x02\x02\u02D4\u02D5" +
+		"\x07c\x02\x02\u02D5\u02DF\x07I\x02\x02\u02D6\u02D7\x07c\x02\x02\u02D7" +
+		"\u02DF\x07#\x02\x02\u02D8\u02D9\x05\x9AN\x02\u02D9\u02DA\x07I\x02\x02" +
+		"\u02DA\u02DF\x03\x02\x02\x02\u02DB\u02DC\x05\x9AN\x02\u02DC\u02DD\x07" +
+		"#\x02\x02\u02DD\u02DF\x03\x02\x02\x02\u02DE\u02D2\x03\x02\x02\x02\u02DE" +
+		"\u02D4\x03\x02\x02\x02\u02DE\u02D6\x03\x02\x02\x02\u02DE\u02D8\x03\x02" +
+		"\x02\x02\u02DE\u02DB\x03\x02\x02\x02\u02DFu\x03\x02\x02\x02\u02E0\u02E1" +
+		"\x05|?\x02\u02E1\u02E2\x07\x02\x02\x03\u02E2w\x03\x02\x02\x02\u02E3\u031C" +
+		"\x05\xA6T\x02\u02E4\u02E5\x05\xA6T\x02\u02E5\u02E6\x07\x87\x02\x02\u02E6" +
+		"\u02E7\x05\xA6T\x02\u02E7\u02EE\x05x=\x02\u02E8\u02E9\x07y\x02\x02\u02E9" +
+		"\u02EA\x05\xA6T\x02\u02EA\u02EB\x05x=\x02\u02EB\u02ED\x03\x02\x02\x02" +
+		"\u02EC\u02E8\x03\x02\x02\x02\u02ED\u02F0\x03\x02\x02\x02\u02EE\u02EC\x03" +
+		"\x02\x02\x02\u02EE\u02EF\x03\x02\x02\x02\u02EF\u02F2\x03\x02\x02\x02\u02F0" +
+		"\u02EE\x03\x02\x02\x02\u02F1\u02F3\x07y\x02\x02\u02F2\u02F1\x03\x02\x02" +
+		"\x02\u02F2\u02F3\x03\x02\x02\x02\u02F3\u02F4\x03\x02\x02\x02\u02F4\u02F5" +
+		"\x07\x9B\x02\x02\u02F5\u031C\x03\x02\x02\x02\u02F6\u02F7\x05\xA6T\x02" +
+		"\u02F7\u02F8\x07\x87\x02\x02\u02F8\u02FD\x05\xA8U\x02\u02F9\u02FA\x07" +
+		"y\x02\x02\u02FA\u02FC\x05\xA8U\x02\u02FB\u02F9\x03\x02\x02\x02\u02FC\u02FF" +
+		"\x03\x02\x02\x02\u02FD\u02FB\x03\x02\x02\x02\u02FD\u02FE\x03\x02\x02\x02" +
+		"\u02FE\u0301\x03\x02\x02\x02\u02FF\u02FD\x03\x02\x02\x02\u0300\u0302\x07" +
+		"y\x02\x02\u0301\u0300\x03\x02\x02\x02\u0301\u0302\x03\x02\x02\x02\u0302" +
+		"\u0303\x03\x02\x02\x02\u0303\u0304\x07\x9B\x02\x02\u0304\u031C\x03\x02" +
+		"\x02\x02\u0305\u0306\x05\xA6T\x02\u0306\u0307\x07\x87\x02\x02\u0307\u030C" +
+		"\x05x=\x02\u0308\u0309\x07y\x02\x02\u0309\u030B\x05x=\x02\u030A\u0308" +
+		"\x03\x02\x02\x02\u030B\u030E\x03\x02\x02\x02\u030C\u030A\x03\x02\x02\x02" +
+		"\u030C\u030D\x03\x02\x02\x02\u030D\u0310\x03\x02\x02\x02\u030E\u030C\x03" +
+		"\x02\x02\x02\u030F\u0311\x07y\x02\x02\u0310\u030F\x03\x02\x02\x02\u0310" +
+		"\u0311\x03\x02\x02\x02\u0311\u0312\x03\x02\x02\x02\u0312\u0313\x07\x9B" +
+		"\x02\x02\u0313\u031C\x03\x02\x02\x02\u0314\u0315\x05\xA6T\x02\u0315\u0317" +
+		"\x07\x87\x02\x02\u0316\u0318\x05z>\x02\u0317\u0316\x03\x02\x02\x02\u0317" +
+		"\u0318\x03\x02\x02\x02\u0318\u0319\x03\x02\x02\x02\u0319\u031A\x07\x9B" +
+		"\x02\x02\u031A\u031C\x03\x02\x02\x02\u031B\u02E3\x03\x02\x02\x02\u031B" +
+		"\u02E4\x03\x02\x02\x02\u031B\u02F6\x03\x02\x02\x02\u031B\u0305\x03\x02" +
+		"\x02\x02\u031B\u0314\x03\x02\x02\x02\u031Cy\x03\x02\x02\x02\u031D\u0322" +
+		"\x05|?\x02\u031E\u031F\x07y\x02\x02\u031F\u0321\x05|?\x02\u0320\u031E" +
+		"\x03\x02\x02\x02\u0321\u0324\x03\x02\x02\x02\u0322\u0320\x03\x02\x02\x02" +
+		"\u0322\u0323\x03\x02\x02\x02\u0323\u0326\x03\x02\x02\x02\u0324\u0322\x03" +
+		"\x02\x02\x02\u0325\u0327\x07y\x02\x02\u0326\u0325\x03\x02\x02\x02\u0326" +
+		"\u0327\x03\x02\x02\x02\u0327{\x03\x02\x02\x02\u0328\u0329\b?\x01\x02\u0329" +
+		"\u032B\x07\x0E\x02\x02\u032A\u032C\x05|?\x02\u032B\u032A\x03\x02\x02\x02" +
+		"\u032B\u032C\x03\x02\x02\x02\u032C\u0332\x03\x02\x02\x02\u032D\u032E\x07" +
+		"g\x02\x02\u032E\u032F\x05|?\x02\u032F\u0330\x07X\x02\x02\u0330\u0331\x05" +
+		"|?\x02\u0331\u0333\x03\x02\x02\x02\u0332\u032D\x03\x02\x02\x02\u0333\u0334" +
+		"\x03\x02\x02\x02\u0334\u0332\x03\x02\x02\x02\u0334\u0335\x03\x02\x02\x02" +
+		"\u0335\u0338\x03\x02\x02\x02\u0336\u0337\x07\x1B\x02\x02\u0337\u0339\x05" +
+		"|?\x02\u0338\u0336\x03\x02\x02\x02\u0338\u0339\x03\x02\x02\x02\u0339\u033A" +
+		"\x03\x02\x02\x02\u033A\u033B\x07\x1C\x02\x02\u033B\u03C1\x03\x02\x02\x02" +
+		"\u033C\u033D\x07\x0F\x02\x02\u033D\u033E\x07\x87\x02\x02\u033E\u033F\x05" +
+		"|?\x02\u033F\u0340\x07\b\x02\x02\u0340\u0341\x05x=\x02\u0341\u0342\x07" +
+		"\x9B\x02\x02\u0342\u03C1\x03\x02\x02\x02\u0343\u0344\x07\x16\x02\x02\u0344" +
+		"\u03C1\x07s\x02\x02\u0345\u0346\x072\x02\x02\u0346\u03C1\x07s\x02\x02" +
+		"\u0347\u0348\x072\x02\x02\u0348\u0349\x05|?\x02\u0349\u034A\x05\x9EP\x02" +
+		"\u034A\u03C1\x03\x02\x02\x02\u034B\u034C\x07W\x02\x02\u034C\u034D\x07" +
+		"\x87\x02\x02\u034D\u034E\x05|?\x02\u034E\u034F\x07%\x02\x02\u034F\u0352" +
+		"\x05|?\x02\u0350\u0351\x07$\x02\x02\u0351\u0353\x05|?\x02\u0352\u0350" +
+		"\x03\x02\x02\x02\u0352\u0353\x03\x02\x02\x02\u0353\u0354\x03\x02\x02\x02" +
+		"\u0354\u0355\x07\x9B\x02\x02\u0355\u03C1\x03\x02\x02\x02\u0356\u0357\x07" +
+		"[\x02\x02\u0357\u03C1\x07s\x02\x02\u0358\u0359\x07`\x02\x02\u0359\u035A" +
+		"\x07\x87\x02\x02\u035A\u035B\t\r\x02\x02\u035B\u035C\x05\xACW\x02\u035C" +
+		"\u035D\x07%\x02\x02\u035D\u035E\x05|?\x02\u035E\u035F\x07\x9B\x02\x02" +
+		"\u035F\u03C1\x03\x02\x02\x02\u0360\u0361\x05\xA6T\x02\u0361\u0363\x07" +
+		"\x87\x02\x02\u0362\u0364\x05z>\x02\u0363\u0362\x03\x02\x02\x02\u0363\u0364" +
+		"\x03\x02\x02\x02\u0364\u0365\x03\x02\x02\x02\u0365\u0366\x07\x9B\x02\x02" +
+		"\u0366\u036F\x03\x02\x02\x02\u0367\u0369\x07\x87\x02\x02\u0368\u036A\x07" +
+		"\x1A\x02\x02\u0369\u0368\x03\x02\x02\x02\u0369\u036A\x03\x02\x02\x02\u036A" +
+		"\u036C\x03\x02\x02\x02\u036B\u036D\x05z>\x02\u036C\u036B\x03\x02\x02\x02" +
+		"\u036C\u036D\x03\x02\x02\x02\u036D\u036E\x03\x02\x02\x02\u036E\u0370\x07" +
+		"\x9B\x02\x02\u036F\u0367\x03\x02\x02\x02\u036F\u0370\x03\x02\x02\x02\u0370" +
+		"\u0371\x03\x02\x02\x02\u0371\u0372\x07G\x02\x02\u0372\u0373\x07\x87\x02" +
+		"\x02\u0373\u0374\x05j6\x02\u0374\u0375\x07\x9B\x02\x02\u0375\u03C1\x03" +
+		"\x02\x02\x02\u0376\u0377\x05\xA6T\x02\u0377\u0379\x07\x87\x02\x02\u0378" +
+		"\u037A\x05z>\x02\u0379\u0378\x03\x02\x02\x02\u0379\u037A\x03\x02\x02\x02" +
+		"\u037A\u037B\x03\x02\x02\x02\u037B\u037C\x07\x9B\x02\x02\u037C\u0385\x03" +
+		"\x02\x02\x02\u037D\u037F\x07\x87\x02\x02\u037E\u0380\x07\x1A\x02\x02\u037F" +
+		"\u037E\x03\x02\x02\x02\u037F\u0380\x03\x02\x02\x02\u0380\u0382\x03\x02" +
+		"\x02\x02\u0381\u0383\x05z>\x02\u0382\u0381\x03\x02\x02\x02\u0382\u0383" +
+		"\x03\x02\x02\x02\u0383\u0384\x03\x02\x02\x02\u0384\u0386\x07\x9B\x02\x02" +
+		"\u0385\u037D\x03\x02\x02\x02\u0385\u0386\x03\x02\x02\x02\u0386\u0387\x03" +
+		"\x02\x02\x02\u0387\u0388\x07G\x02\x02\u0388\u0389\x05\xA6T\x02\u0389\u03C1" +
+		"\x03\x02\x02\x02\u038A\u0390\x05\xA6T\x02\u038B\u038D\x07\x87\x02\x02" +
+		"\u038C\u038E\x05z>\x02\u038D\u038C\x03\x02\x02\x02\u038D\u038E\x03\x02" +
+		"\x02\x02\u038E\u038F\x03\x02\x02\x02\u038F\u0391\x07\x9B\x02\x02\u0390" +
+		"\u038B\x03\x02\x02\x02\u0390\u0391\x03\x02\x02\x02\u0391\u0392\x03\x02" +
+		"\x02\x02\u0392\u0394\x07\x87\x02\x02\u0393\u0395\x07\x1A\x02\x02\u0394" +
+		"\u0393\x03\x02\x02\x02\u0394\u0395\x03\x02\x02\x02\u0395\u0397\x03\x02" +
+		"\x02\x02\u0396\u0398\x05z>\x02\u0397\u0396\x03\x02\x02\x02\u0397\u0398" +
+		"\x03\x02\x02\x02\u0398\u0399\x03\x02\x02\x02\u0399\u039A\x07\x9B\x02\x02" +
+		"\u039A\u03C1\x03\x02\x02\x02\u039B\u03C1\x05\x82B\x02\u039C\u03C1\x05" +
+		"\xAEX\x02\u039D\u03C1\x05\x9CO\x02\u039E\u039F\x07{\x02\x02\u039F\u03C1" +
+		"\x05|?\x16\u03A0\u03A1\x07?\x02\x02\u03A1\u03C1\x05|?\x10\u03A2\u03A3" +
+		"\x05\x92J\x02\u03A3\u03A4\x07}\x02\x02\u03A4\u03A6\x03\x02\x02\x02\u03A5" +
+		"\u03A2\x03\x02\x02\x02\u03A5\u03A6\x03\x02\x02\x02\u03A6\u03A7\x03\x02" +
+		"\x02\x02\u03A7\u03C1\x07u\x02\x02\u03A8\u03A9\x07\x87\x02\x02\u03A9\u03AA" +
+		"\x052\x1A\x02\u03AA\u03AB\x07\x9B\x02\x02\u03AB\u03C1\x03\x02\x02\x02" +
+		"\u03AC\u03AD\x07\x87\x02\x02\u03AD\u03AE\x05|?\x02\u03AE\u03AF\x07\x9B" +
+		"\x02\x02\u03AF\u03C1\x03\x02\x02\x02\u03B0\u03B1\x07\x87\x02\x02\u03B1" +
+		"\u03B2\x05z>\x02\u03B2\u03B3\x07\x9B\x02\x02\u03B3\u03C1\x03\x02\x02\x02" +
+		"\u03B4\u03B6\x07\x86\x02\x02\u03B5\u03B7\x05z>\x02\u03B6\u03B5\x03\x02" +
+		"\x02\x02\u03B6\u03B7\x03\x02\x02\x02\u03B7\u03B8\x03\x02\x02\x02\u03B8" +
+		"\u03C1\x07\x9A\x02\x02\u03B9\u03BB\x07\x85\x02\x02\u03BA\u03BC\x05*\x16" +
+		"\x02\u03BB\u03BA\x03\x02\x02\x02\u03BB\u03BC\x03\x02\x02\x02\u03BC\u03BD" +
+		"\x03\x02\x02\x02\u03BD\u03C1\x07\x99\x02\x02\u03BE\u03C1\x05~@\x02\u03BF" +
+		"\u03C1\x05\x8AF\x02\u03C0\u0328\x03\x02\x02\x02\u03C0\u033C\x03\x02\x02" +
+		"\x02\u03C0\u0343\x03\x02\x02\x02\u03C0\u0345\x03\x02\x02\x02\u03C0\u0347" +
+		"\x03\x02\x02\x02\u03C0\u034B\x03\x02\x02\x02\u03C0\u0356\x03\x02\x02\x02" +
+		"\u03C0\u0358\x03\x02\x02\x02\u03C0\u0360\x03\x02\x02\x02\u03C0\u0376\x03" +
+		"\x02\x02\x02\u03C0\u038A\x03\x02\x02\x02\u03C0\u039B\x03\x02\x02\x02\u03C0" +
+		"\u039C\x03\x02\x02\x02\u03C0\u039D\x03\x02\x02\x02\u03C0\u039E\x03\x02" +
+		"\x02\x02\u03C0\u03A0\x03\x02\x02\x02\u03C0\u03A5\x03\x02\x02\x02\u03C0" +
+		"\u03A8\x03\x02\x02\x02\u03C0\u03AC\x03\x02\x02\x02\u03C0\u03B0\x03\x02" +
+		"\x02\x02\u03C0\u03B4\x03\x02\x02\x02\u03C0\u03B9\x03\x02\x02\x02\u03C0" +
+		"\u03BE\x03\x02\x02\x02\u03C0\u03BF\x03\x02\x02\x02\u03C1\u0435\x03\x02" +
+		"\x02\x02\u03C2\u03C6\f\x15\x02\x02\u03C3\u03C7\x07u\x02\x02\u03C4\u03C7" +
+		"\x07\x9D\x02\x02\u03C5\u03C7\x07\x90\x02\x02\u03C6\u03C3\x03\x02\x02\x02" +
+		"\u03C6\u03C4\x03\x02\x02\x02\u03C6\u03C5\x03\x02\x02\x02\u03C7\u03C8\x03" +
+		"\x02\x02\x02\u03C8\u0434\x05|?\x16\u03C9\u03CD\f\x14\x02\x02\u03CA\u03CE" +
+		"\x07\x91\x02\x02\u03CB\u03CE\x07{\x02\x02\u03CC\u03CE\x07z\x02\x02\u03CD" +
+		"\u03CA\x03\x02\x02\x02\u03CD\u03CB\x03\x02\x02\x02\u03CD\u03CC\x03\x02" +
+		"\x02\x02\u03CE\u03CF\x03\x02\x02\x02\u03CF\u0434\x05|?\x15\u03D0\u03E9" +
+		"\f\x13\x02\x02\u03D1\u03EA\x07~\x02\x02\u03D2\u03EA\x07\x7F\x02\x02\u03D3" +
+		"\u03EA\x07\x8B\x02\x02\u03D4\u03EA\x07\x88\x02\x02\u03D5\u03EA\x07\x89" +
+		"\x02\x02\u03D6\u03EA\x07\x80\x02\x02\u03D7\u03EA\x07\x81\x02\x02\u03D8" +
+		"\u03DA\x07?\x02\x02\u03D9\u03D8\x03\x02\x02\x02\u03D9\u03DA\x03\x02\x02" +
+		"\x02\u03DA\u03DB\x03\x02\x02\x02\u03DB\u03DD\x07.\x02\x02\u03DC\u03DE" +
+		"\x07\x11\x02\x02\u03DD\u03DC\x03\x02\x02\x02\u03DD\u03DE\x03\x02\x02\x02" +
+		"\u03DE\u03EA\x03\x02\x02\x02\u03DF\u03E1\x07?\x02\x02\u03E0\u03DF\x03" +
+		"\x02\x02\x02\u03E0\u03E1\x03\x02\x02\x02\u03E1\u03E2\x03\x02\x02\x02\u03E2" +
+		"\u03EA\t\x0E\x02\x02\u03E3\u03EA\x07\x97\x02\x02\u03E4\u03EA\x07\x98\x02" +
+		"\x02\u03E5\u03EA\x07\x8D\x02\x02\u03E6\u03EA\x07\x83\x02\x02\u03E7\u03EA" +
+		"\x07\x84\x02\x02\u03E8\u03EA\x07\x8C\x02\x02\u03E9\u03D1\x03\x02\x02\x02" +
+		"\u03E9\u03D2\x03\x02\x02\x02\u03E9\u03D3\x03\x02\x02\x02\u03E9\u03D4\x03" +
+		"\x02\x02\x02\u03E9\u03D5\x03\x02\x02\x02\u03E9\u03D6\x03\x02\x02\x02\u03E9" +
+		"\u03D7\x03\x02\x02\x02\u03E9\u03D9\x03\x02\x02\x02\u03E9\u03E0\x03\x02" +
+		"\x02\x02\u03E9\u03E3\x03\x02\x02\x02\u03E9\u03E4\x03\x02\x02\x02\u03E9" +
+		"\u03E5\x03\x02\x02\x02\u03E9\u03E6\x03\x02\x02\x02\u03E9\u03E7\x03\x02" +
+		"\x02\x02\u03E9\u03E8\x03\x02\x02\x02\u03EA\u03EB\x03\x02\x02\x02\u03EB" +
+		"\u0434\x05|?\x14\u03EC\u03ED\f\x11\x02\x02\u03ED\u03EE\x07\x8F\x02\x02" +
+		"\u03EE\u0434\x05|?\x12\u03EF\u03F0\f\x0F\x02\x02\u03F0\u03F1\x07\x04\x02" +
+		"\x02\u03F1\u0434\x05|?\x10\u03F2\u03F3\f\x0E\x02\x02\u03F3\u03F4\x07D" +
+		"\x02\x02\u03F4\u0434\x05|?\x0F\u03F5\u03F7\f\r\x02\x02\u03F6\u03F8\x07" +
+		"?\x02\x02\u03F7\u03F6\x03\x02\x02\x02\u03F7\u03F8\x03\x02\x02\x02\u03F8" +
+		"\u03F9\x03\x02\x02\x02\u03F9\u03FA\x07\v\x02\x02\u03FA\u03FB\x05|?\x02" +
+		"\u03FB\u03FC\x07\x04\x02\x02\u03FC\u03FD\x05|?\x0E\u03FD\u0434\x03\x02" +
+		"\x02\x02\u03FE\u03FF\f\f\x02\x02\u03FF\u0400\x07\x92\x02";
+	private static readonly _serializedATNSegment2: string =
+		"\x02\u0400\u0401\x05|?\x02\u0401\u0402\x07x\x02\x02\u0402\u0403\x05|?" +
+		"\f\u0403\u0434\x03\x02\x02\x02\u0404\u0405\f!\x02\x02\u0405\u0406\x07" +
+		"\x87\x02\x02\u0406\u0407\x052\x1A\x02\u0407\u0408\x07\x9B\x02\x02\u0408" +
+		"\u0434\x03\x02\x02\x02\u0409\u040A\f \x02\x02\u040A\u040C\x07\x87\x02" +
+		"\x02\u040B\u040D\x05z>\x02\u040C\u040B\x03\x02\x02\x02\u040C\u040D\x03" +
+		"\x02\x02\x02\u040D\u040E\x03\x02\x02\x02\u040E\u0434\x07\x9B\x02\x02\u040F" +
+		"\u0410\f\x1C\x02\x02\u0410\u0411\x07\x86\x02\x02\u0411\u0412\x05|?\x02" +
+		"\u0412\u0413\x07\x9A\x02\x02\u0413\u0434\x03\x02\x02\x02\u0414\u0415\f" +
+		"\x1B\x02\x02\u0415\u0416\x07}\x02\x02\u0416\u0434\x07q\x02\x02\u0417\u0418" +
+		"\f\x1A\x02\x02\u0418\u0419\x07}\x02\x02\u0419\u0434\x05\xA6T\x02\u041A" +
+		"\u041B\f\x19\x02\x02\u041B\u041C\x07\x8E\x02\x02\u041C\u041D\x07\x86\x02" +
+		"\x02\u041D\u041E\x05|?\x02\u041E\u041F\x07\x9A\x02\x02\u041F\u0434\x03" +
+		"\x02\x02\x02\u0420\u0421\f\x18\x02\x02\u0421\u0422\x07\x8E\x02\x02\u0422" +
+		"\u0434\x07q\x02\x02\u0423\u0424\f\x17\x02\x02\u0424\u0425\x07\x8E\x02" +
+		"\x02\u0425\u0434\x05\xA6T\x02\u0426\u0427\f\x12\x02\x02\u0427\u0429\x07" +
+		"3\x02\x02\u0428\u042A\x07?\x02\x02\u0429\u0428\x03\x02\x02\x02\u0429\u042A" +
+		"\x03\x02\x02\x02\u042A\u042B\x03\x02\x02\x02\u042B\u0434\x07@\x02\x02" +
+		"\u042C\u0431\f\v\x02\x02\u042D\u042E\x07\b\x02\x02\u042E\u0432\x05\xA6" +
+		"T\x02\u042F\u0430\x07\b\x02\x02\u0430\u0432\x07s\x02\x02\u0431\u042D\x03" +
+		"\x02\x02\x02\u0431\u042F\x03\x02\x02\x02\u0432\u0434\x03\x02\x02\x02\u0433" +
+		"\u03C2\x03\x02\x02\x02\u0433\u03C9\x03\x02\x02\x02\u0433\u03D0\x03\x02" +
+		"\x02\x02\u0433\u03EC\x03\x02\x02\x02\u0433\u03EF\x03\x02\x02\x02\u0433" +
+		"\u03F2\x03\x02\x02\x02\u0433\u03F5\x03\x02\x02\x02\u0433\u03FE\x03\x02" +
+		"\x02\x02\u0433\u0404\x03\x02\x02\x02\u0433\u0409\x03\x02\x02\x02\u0433" +
+		"\u040F\x03\x02\x02\x02\u0433\u0414\x03\x02\x02\x02\u0433\u0417\x03\x02" +
+		"\x02\x02\u0433\u041A\x03\x02\x02\x02\u0433\u0420\x03\x02\x02\x02\u0433" +
+		"\u0423\x03\x02\x02\x02\u0433\u0426\x03\x02\x02\x02\u0433\u042C\x03\x02" +
+		"\x02\x02\u0434\u0437\x03\x02\x02\x02\u0435\u0433\x03\x02\x02\x02\u0435" +
+		"\u0436\x03\x02\x02\x02\u0436}\x03\x02\x02\x02\u0437\u0435\x03\x02\x02" +
+		"\x02\u0438\u0439\x07\x87\x02\x02\u0439\u043E\x05\xA6T\x02\u043A\u043B" +
+		"\x07y\x02\x02\u043B\u043D\x05\xA6T\x02\u043C\u043A\x03\x02\x02\x02\u043D" +
+		"\u0440\x03\x02\x02\x02\u043E\u043C\x03\x02\x02\x02\u043E\u043F\x03\x02" +
+		"\x02\x02\u043F\u0442\x03\x02\x02\x02\u0440\u043E\x03\x02\x02\x02\u0441" +
+		"\u0443\x07y\x02\x02\u0442\u0441\x03\x02\x02\x02\u0442\u0443\x03\x02\x02" +
+		"\x02\u0443\u0444\x03\x02\x02\x02\u0444\u0445\x07\x9B\x02\x02\u0445\u0454" +
+		"\x03\x02\x02\x02\u0446\u044B\x05\xA6T\x02\u0447\u0448\x07y\x02\x02\u0448" +
+		"\u044A\x05\xA6T\x02\u0449\u0447\x03\x02\x02\x02\u044A\u044D\x03\x02\x02" +
+		"\x02\u044B\u0449\x03\x02\x02\x02\u044B\u044C\x03\x02\x02\x02\u044C\u044F" +
+		"\x03\x02\x02\x02\u044D\u044B\x03\x02\x02\x02\u044E\u0450\x07y\x02\x02" +
+		"\u044F\u044E\x03\x02\x02\x02\u044F\u0450\x03\x02\x02\x02\u0450\u0454\x03" +
+		"\x02\x02\x02\u0451\u0452\x07\x87\x02\x02\u0452\u0454\x07\x9B\x02\x02\u0453" +
+		"\u0438\x03\x02\x02\x02\u0453\u0446\x03\x02\x02\x02\u0453\u0451\x03\x02" +
+		"\x02\x02\u0454\u0455\x03\x02\x02\x02\u0455\u0458\x07t\x02\x02\u0456\u0459" +
+		"\x05|?\x02\u0457\u0459\x05&\x14\x02\u0458\u0456\x03\x02\x02\x02\u0458" +
+		"\u0457\x03\x02\x02\x02\u0459\x7F\x03\x02\x02\x02\u045A\u0461\x05\x82B" +
+		"\x02\u045B\u0461\x07\xA9\x02\x02\u045C\u045D\x07\x85\x02\x02\u045D\u045E" +
+		"\x05|?\x02\u045E\u045F\x07\x99\x02\x02\u045F\u0461\x03\x02\x02\x02\u0460" +
+		"\u045A\x03\x02\x02\x02\u0460\u045B\x03\x02\x02\x02\u0460\u045C\x03\x02" +
+		"\x02\x02\u0461\x81\x03\x02\x02\x02\u0462\u0463\x07\x89\x02\x02\u0463\u0467" +
+		"\x05\xA6T\x02\u0464\u0466\x05\x84C\x02\u0465\u0464\x03\x02\x02\x02\u0466" +
+		"\u0469\x03\x02\x02\x02\u0467\u0465\x03\x02\x02\x02\u0467\u0468\x03\x02" +
+		"\x02\x02\u0468\u046A\x03\x02\x02\x02\u0469\u0467\x03\x02\x02\x02\u046A" +
+		"\u046B\x07\x9E\x02\x02\u046B\u0480\x03\x02\x02\x02\u046C\u046D\x07\x89" +
+		"\x02\x02\u046D\u0471\x05\xA6T\x02\u046E\u0470\x05\x84C\x02\u046F\u046E" +
+		"\x03\x02\x02\x02\u0470\u0473\x03\x02\x02\x02\u0471\u046F\x03\x02\x02\x02" +
+		"\u0471\u0472\x03\x02\x02\x02\u0472\u0474\x03\x02\x02\x02\u0473\u0471\x03" +
+		"\x02\x02\x02\u0474\u0478\x07\x81\x02\x02\u0475\u0477\x05\x80A\x02\u0476" +
+		"\u0475\x03\x02\x02\x02\u0477\u047A\x03\x02\x02\x02\u0478\u0476\x03\x02" +
+		"\x02\x02\u0478\u0479\x03\x02\x02\x02\u0479\u047B\x03\x02\x02\x02\u047A" +
+		"\u0478\x03\x02\x02\x02\u047B\u047C\x07\x8A\x02\x02\u047C\u047D\x05\xA6" +
+		"T\x02\u047D\u047E\x07\x81\x02\x02\u047E\u0480\x03\x02\x02\x02\u047F\u0462" +
+		"\x03\x02\x02\x02\u047F\u046C\x03\x02\x02\x02\u0480\x83\x03\x02\x02\x02" +
+		"\u0481\u0482\x05\xA6T\x02\u0482\u0483\x07\x7F\x02\x02\u0483\u0484\x05" +
+		"\xACW\x02\u0484\u048D\x03\x02\x02\x02\u0485\u0486\x05\xA6T\x02\u0486\u0487" +
+		"\x07\x7F\x02\x02\u0487\u0488\x07\x85\x02\x02\u0488\u0489\x05|?\x02\u0489" +
+		"\u048A\x07\x99\x02\x02\u048A\u048D\x03\x02\x02\x02\u048B\u048D\x05\xA6" +
+		"T\x02\u048C\u0481\x03\x02\x02\x02\u048C\u0485\x03\x02\x02\x02\u048C\u048B" +
+		"\x03\x02\x02\x02\u048D\x85\x03\x02\x02\x02\u048E\u0493\x05\x88E\x02\u048F" +
+		"\u0490\x07y\x02\x02\u0490\u0492\x05\x88E\x02\u0491\u048F\x03\x02\x02\x02" +
+		"\u0492\u0495\x03\x02\x02\x02\u0493\u0491\x03\x02\x02\x02\u0493\u0494\x03" +
+		"\x02\x02\x02\u0494\u0497\x03\x02\x02\x02\u0495\u0493\x03\x02\x02\x02\u0496" +
+		"\u0498\x07y\x02\x02\u0497\u0496\x03\x02\x02\x02\u0497\u0498\x03\x02\x02" +
+		"\x02\u0498\x87\x03\x02\x02\x02\u0499\u049A\x05\xA6T\x02\u049A\u049B\x07" +
+		"\b\x02\x02\u049B\u049C\x07\x87\x02\x02\u049C\u049D\x052\x1A\x02\u049D" +
+		"\u049E\x07\x9B\x02\x02\u049E\u04A4\x03\x02\x02\x02\u049F\u04A0\x05|?\x02" +
+		"\u04A0\u04A1\x07\b\x02\x02\u04A1\u04A2\x05\xA6T\x02\u04A2\u04A4\x03\x02" +
+		"\x02\x02\u04A3\u0499\x03\x02\x02\x02\u04A3\u049F\x03\x02\x02\x02\u04A4" +
+		"\x89\x03\x02\x02\x02\u04A5\u04AD\x05\xAAV\x02\u04A6\u04A7\x05\x92J\x02" +
+		"\u04A7\u04A8\x07}\x02\x02\u04A8\u04AA\x03\x02\x02\x02\u04A9\u04A6\x03" +
+		"\x02\x02\x02\u04A9\u04AA\x03\x02\x02\x02\u04AA\u04AB\x03\x02\x02\x02\u04AB" +
+		"\u04AD\x05\x8CG\x02\u04AC\u04A5\x03\x02\x02\x02\u04AC\u04A9\x03\x02\x02" +
+		"\x02\u04AD\x8B\x03\x02\x02\x02\u04AE\u04B3\x05\xA6T\x02\u04AF\u04B0\x07" +
+		"}\x02\x02\u04B0\u04B2\x05\xA6T\x02\u04B1\u04AF\x03\x02\x02\x02\u04B2\u04B5" +
+		"\x03\x02\x02\x02\u04B3\u04B1\x03\x02\x02\x02\u04B3\u04B4\x03\x02\x02\x02" +
+		"\u04B4\x8D\x03\x02\x02\x02\u04B5\u04B3\x03\x02\x02\x02\u04B6\u04B7\bH" +
+		"\x01\x02\u04B7\u04C0\x05\x92J\x02\u04B8\u04C0\x05\x90I\x02\u04B9\u04BA" +
+		"\x07\x87\x02\x02\u04BA\u04BB\x052\x1A\x02\u04BB\u04BC\x07\x9B\x02\x02" +
+		"\u04BC\u04C0\x03\x02\x02\x02\u04BD\u04C0\x05\x82B\x02\u04BE\u04C0\x05" +
+		"\xAAV\x02\u04BF\u04B6\x03\x02\x02\x02\u04BF\u04B8\x03\x02\x02\x02\u04BF" +
+		"\u04B9\x03\x02\x02\x02\u04BF\u04BD\x03\x02\x02\x02\u04BF\u04BE\x03\x02" +
+		"\x02\x02\u04C0\u04C9\x03\x02\x02\x02\u04C1\u04C5\f\x05\x02\x02\u04C2\u04C6" +
+		"\x05\xA4S\x02\u04C3\u04C4\x07\b\x02\x02\u04C4\u04C6\x05\xA6T\x02\u04C5" +
+		"\u04C2\x03\x02\x02\x02\u04C5\u04C3\x03\x02\x02\x02\u04C6\u04C8\x03\x02" +
+		"\x02\x02\u04C7\u04C1\x03\x02\x02\x02\u04C8\u04CB\x03\x02\x02\x02\u04C9" +
+		"\u04C7\x03\x02\x02\x02\u04C9\u04CA\x03\x02\x02\x02\u04CA\x8F\x03\x02\x02" +
+		"\x02\u04CB\u04C9\x03\x02\x02\x02\u04CC\u04CD\x05\xA6T\x02\u04CD\u04CF" +
+		"\x07\x87\x02\x02\u04CE\u04D0\x05\x94K\x02\u04CF\u04CE\x03\x02\x02\x02" +
+		"\u04CF\u04D0\x03\x02\x02\x02\u04D0\u04D1\x03\x02\x02\x02\u04D1\u04D2\x07" +
+		"\x9B\x02\x02\u04D2\x91\x03\x02\x02\x02\u04D3\u04D4\x05\x96L\x02\u04D4" +
+		"\u04D5\x07}\x02\x02\u04D5\u04D7\x03\x02\x02\x02\u04D6\u04D3\x03\x02\x02" +
+		"\x02\u04D6\u04D7\x03\x02\x02\x02\u04D7\u04D8\x03\x02\x02\x02\u04D8\u04D9" +
+		"\x05\x8CG\x02\u04D9\x93\x03\x02\x02\x02\u04DA\u04DF\x05|?\x02\u04DB\u04DC" +
+		"\x07y\x02\x02\u04DC\u04DE\x05|?\x02\u04DD\u04DB\x03\x02\x02\x02\u04DE" +
+		"\u04E1\x03\x02\x02\x02\u04DF\u04DD\x03\x02\x02\x02\u04DF\u04E0\x03\x02" +
+		"\x02\x02\u04E0\u04E3\x03\x02\x02\x02\u04E1\u04DF\x03\x02\x02\x02\u04E2" +
+		"\u04E4\x07y\x02\x02\u04E3\u04E2\x03\x02\x02\x02\u04E3\u04E4\x03\x02\x02" +
+		"\x02\u04E4\x95\x03\x02\x02\x02\u04E5\u04E6\x05\xA6T\x02\u04E6\x97\x03" +
+		"\x02\x02\x02\u04E7\u04F0\x07o\x02\x02\u04E8\u04E9\x07}\x02\x02\u04E9\u04F0" +
+		"\t\x0F\x02\x02\u04EA\u04EB\x07q\x02\x02\u04EB\u04ED\x07}\x02\x02\u04EC" +
+		"\u04EE\t\x0F\x02\x02\u04ED\u04EC\x03\x02\x02\x02\u04ED\u04EE\x03\x02\x02" +
+		"\x02\u04EE\u04F0\x03\x02\x02\x02\u04EF\u04E7\x03\x02\x02\x02\u04EF\u04E8" +
+		"\x03\x02\x02\x02\u04EF\u04EA\x03\x02\x02\x02\u04F0\x99\x03\x02\x02\x02" +
+		"\u04F1\u04F3\t\x10\x02\x02\u04F2\u04F1\x03\x02\x02\x02\u04F2\u04F3\x03" +
+		"\x02\x02\x02\u04F3\u04FA\x03\x02\x02\x02\u04F4\u04FB\x05\x98M\x02\u04F5" +
+		"\u04FB\x07p\x02\x02\u04F6\u04FB\x07q\x02\x02\u04F7\u04FB\x07r\x02\x02" +
+		"\u04F8\u04FB\x07/\x02\x02\u04F9\u04FB\x07>\x02\x02\u04FA\u04F4\x03\x02" +
+		"\x02\x02\u04FA\u04F5\x03\x02\x02\x02\u04FA\u04F6\x03\x02\x02\x02\u04FA" +
+		"\u04F7\x03\x02\x02\x02\u04FA\u04F8\x03\x02\x02\x02\u04FA\u04F9\x03\x02" +
+		"\x02\x02\u04FB\x9B\x03\x02\x02\x02\u04FC\u0500\x05\x9AN\x02\u04FD\u0500" +
+		"\x07s\x02\x02\u04FE\u0500\x07@\x02\x02\u04FF\u04FC\x03\x02\x02\x02\u04FF" +
+		"\u04FD\x03\x02\x02\x02\u04FF\u04FE\x03\x02\x02\x02\u0500\x9D\x03\x02\x02" +
+		"\x02\u0501\u0502\t\x11\x02\x02\u0502\x9F\x03\x02\x02\x02\u0503\u0504\t" +
+		"\x12\x02\x02\u0504\xA1\x03\x02\x02\x02\u0505\u0506\t\x13\x02\x02\u0506" +
+		"\xA3\x03\x02\x02\x02\u0507\u050A\x07n\x02\x02\u0508\u050A\x05\xA2R\x02" +
+		"\u0509\u0507\x03\x02\x02\x02\u0509\u0508\x03\x02\x02\x02\u050A\xA5\x03" +
+		"\x02\x02\x02\u050B\u050F\x07n\x02\x02\u050C\u050F\x05\x9EP\x02\u050D\u050F" +
+		"\x05\xA0Q\x02\u050E\u050B\x03\x02\x02\x02\u050E\u050C\x03\x02\x02\x02" +
+		"\u050E\u050D\x03\x02\x02\x02\u050F\xA7\x03\x02\x02\x02\u0510\u0511\x05" +
+		"\xACW\x02\u0511\u0512\x07\x7F\x02\x02\u0512\u0513\x05\x9AN\x02\u0513\xA9" +
+		"\x03\x02\x02\x02\u0514\u0515\x07\x85\x02\x02\u0515\u0516\x05|?\x02\u0516" +
+		"\u0517\x07\x99\x02\x02\u0517\xAB\x03\x02\x02\x02\u0518\u051B\x07s\x02" +
+		"\x02\u0519\u051B\x05\xAEX\x02\u051A\u0518\x03\x02\x02\x02\u051A\u0519" +
+		"\x03\x02\x02\x02\u051B\xAD\x03\x02\x02\x02\u051C\u0520\x07\x94\x02\x02" +
+		"\u051D\u051F\x05\xB0Y\x02\u051E\u051D\x03\x02\x02\x02\u051F\u0522\x03" +
+		"\x02\x02\x02\u0520\u051E\x03\x02\x02\x02\u0520\u0521\x03\x02\x02\x02\u0521" +
+		"\u0523\x03\x02\x02\x02\u0522\u0520\x03\x02\x02\x02\u0523\u0524\x07\x96" +
+		"\x02\x02\u0524\xAF\x03\x02\x02\x02\u0525\u0526\x07\xA4\x02\x02\u0526\u0527" +
+		"\x05|?\x02\u0527\u0528\x07\x99\x02\x02\u0528\u052B\x03\x02\x02\x02\u0529" +
+		"\u052B\x07\xA3\x02\x02\u052A\u0525\x03\x02\x02\x02\u052A\u0529\x03\x02" +
+		"\x02\x02\u052B\xB1\x03\x02\x02\x02\u052C\u0530\x07\x95\x02\x02\u052D\u052F" +
+		"\x05\xB4[\x02\u052E\u052D\x03\x02\x02\x02\u052F\u0532\x03\x02\x02\x02" +
+		"\u0530\u052E\x03\x02\x02\x02\u0530\u0531\x03\x02\x02\x02\u0531\u0533\x03" +
+		"\x02\x02\x02\u0532\u0530\x03\x02\x02\x02\u0533\u0534\x07\x02\x02\x03\u0534" +
+		"\xB3\x03\x02\x02\x02\u0535\u0536\x07\xA6\x02\x02\u0536\u0537\x05|?\x02" +
+		"\u0537\u0538\x07\x99\x02\x02\u0538\u053B\x03\x02\x02\x02\u0539\u053B\x07" +
+		"\xA5\x02\x02\u053A\u0535\x03\x02\x02\x02\u053A\u0539\x03\x02\x02\x02\u053B" +
+		"\xB5\x03\x02\x02\x02\xAD\xB9\xC0\xC9\xD0\xD4\xE2\xE6\xE9\xED\xF0\xF7\xFB" +
+		"\u0104\u0109\u0112\u011A\u0121\u0125\u012B\u0130\u0138\u013F\u0145\u0151" +
+		"\u0159\u0167\u016B\u0170\u0173\u017D\u0187\u018F\u0193\u0197\u019A\u019E" +
+		"\u01A1\u01A4\u01A7\u01AA\u01AE\u01B2\u01B5\u01B8\u01BB\u01BE\u01C2\u01C5" +
+		"\u01CE\u01D4\u01E9\u01FA\u0210\u0214\u021A\u021F\u022A\u022D\u0233\u023B" +
+		"\u0241\u0243\u0247\u024C\u024F\u0252\u0256\u025A\u025D\u025F\u0262\u0266" +
+		"\u026A\u026D\u026F\u0271\u0276\u0281\u0287\u028C\u0293\u0298\u029C\u02A0" +
+		"\u02A6\u02A8\u02AF\u02B7\u02BA\u02BD\u02D0\u02DE\u02EE\u02F2\u02FD\u0301" +
+		"\u030C\u0310\u0317\u031B\u0322\u0326\u032B\u0334\u0338\u0352\u0363\u0369" +
+		"\u036C\u036F\u0379\u037F\u0382\u0385\u038D\u0390\u0394\u0397\u03A5\u03B6" +
+		"\u03BB\u03C0\u03C6\u03CD\u03D9\u03DD\u03E0\u03E9\u03F7\u040C\u0429\u0431" +
+		"\u0433\u0435\u043E\u0442\u044B\u044F\u0453\u0458\u0460\u0467\u0471\u0478" +
+		"\u047F\u048C\u0493\u0497\u04A3\u04A9\u04AC\u04B3\u04BF\u04C5\u04C9\u04CF" +
+		"\u04D6\u04DF\u04E3\u04ED\u04EF\u04F2\u04FA\u04FF\u0509\u050E\u051A\u0520" +
+		"\u052A\u0530\u053A";
+	public static readonly _serializedATN: string = Utils.join(
+		[
+			TSQLParser._serializedATNSegment0,
+			TSQLParser._serializedATNSegment1,
+			TSQLParser._serializedATNSegment2,
+		],
+		"",
+	);
+	public static __ATN: ATN;
+	public static get _ATN(): ATN {
+		if (!TSQLParser.__ATN) {
+			TSQLParser.__ATN = new ATNDeserializer().deserialize(Utils.toCharArray(TSQLParser._serializedATN));
+		}
+
+		return TSQLParser.__ATN;
+	}
+
+}
+
+export class ProgramContext extends ParserRuleContext {
+	public EOF(): TerminalNode { return this.getToken(TSQLParser.EOF, 0); }
+	public declaration(): DeclarationContext[];
+	public declaration(i: number): DeclarationContext;
+	public declaration(i?: number): DeclarationContext | DeclarationContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(DeclarationContext);
+		} else {
+			return this.getRuleContext(i, DeclarationContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_program; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitProgram) {
+			return visitor.visitProgram(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class DeclarationContext extends ParserRuleContext {
+	public varDecl(): VarDeclContext | undefined {
+		return this.tryGetRuleContext(0, VarDeclContext);
+	}
+	public statement(): StatementContext | undefined {
+		return this.tryGetRuleContext(0, StatementContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_declaration; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitDeclaration) {
+			return visitor.visitDeclaration(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ExpressionContext extends ParserRuleContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_expression; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitExpression) {
+			return visitor.visitExpression(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class VarDeclContext extends ParserRuleContext {
+	public LET(): TerminalNode { return this.getToken(TSQLParser.LET, 0); }
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public COLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COLON, 0); }
+	public EQ_SINGLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.EQ_SINGLE, 0); }
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_varDecl; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitVarDecl) {
+			return visitor.visitVarDecl(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class IdentifierListContext extends ParserRuleContext {
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_identifierList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitIdentifierList) {
+			return visitor.visitIdentifierList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class StatementContext extends ParserRuleContext {
+	public returnStmt(): ReturnStmtContext | undefined {
+		return this.tryGetRuleContext(0, ReturnStmtContext);
+	}
+	public throwStmt(): ThrowStmtContext | undefined {
+		return this.tryGetRuleContext(0, ThrowStmtContext);
+	}
+	public tryCatchStmt(): TryCatchStmtContext | undefined {
+		return this.tryGetRuleContext(0, TryCatchStmtContext);
+	}
+	public ifStmt(): IfStmtContext | undefined {
+		return this.tryGetRuleContext(0, IfStmtContext);
+	}
+	public whileStmt(): WhileStmtContext | undefined {
+		return this.tryGetRuleContext(0, WhileStmtContext);
+	}
+	public forInStmt(): ForInStmtContext | undefined {
+		return this.tryGetRuleContext(0, ForInStmtContext);
+	}
+	public forStmt(): ForStmtContext | undefined {
+		return this.tryGetRuleContext(0, ForStmtContext);
+	}
+	public funcStmt(): FuncStmtContext | undefined {
+		return this.tryGetRuleContext(0, FuncStmtContext);
+	}
+	public varAssignment(): VarAssignmentContext | undefined {
+		return this.tryGetRuleContext(0, VarAssignmentContext);
+	}
+	public block(): BlockContext | undefined {
+		return this.tryGetRuleContext(0, BlockContext);
+	}
+	public exprStmt(): ExprStmtContext | undefined {
+		return this.tryGetRuleContext(0, ExprStmtContext);
+	}
+	public emptyStmt(): EmptyStmtContext | undefined {
+		return this.tryGetRuleContext(0, EmptyStmtContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_statement; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitStatement) {
+			return visitor.visitStatement(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ReturnStmtContext extends ParserRuleContext {
+	public RETURN(): TerminalNode { return this.getToken(TSQLParser.RETURN, 0); }
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_returnStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitReturnStmt) {
+			return visitor.visitReturnStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ThrowStmtContext extends ParserRuleContext {
+	public THROW(): TerminalNode { return this.getToken(TSQLParser.THROW, 0); }
+	public expression(): ExpressionContext | undefined {
+		return this.tryGetRuleContext(0, ExpressionContext);
+	}
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_throwStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitThrowStmt) {
+			return visitor.visitThrowStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class CatchBlockContext extends ParserRuleContext {
+	public _catchVar!: IdentifierContext;
+	public _catchType!: IdentifierContext;
+	public _catchStmt!: BlockContext;
+	public CATCH(): TerminalNode { return this.getToken(TSQLParser.CATCH, 0); }
+	public block(): BlockContext {
+		return this.getRuleContext(0, BlockContext);
+	}
+	public LPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LPAREN, 0); }
+	public RPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RPAREN, 0); }
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public COLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_catchBlock; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitCatchBlock) {
+			return visitor.visitCatchBlock(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TryCatchStmtContext extends ParserRuleContext {
+	public _tryStmt!: BlockContext;
+	public _finallyStmt!: BlockContext;
+	public TRY(): TerminalNode { return this.getToken(TSQLParser.TRY, 0); }
+	public block(): BlockContext[];
+	public block(i: number): BlockContext;
+	public block(i?: number): BlockContext | BlockContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(BlockContext);
+		} else {
+			return this.getRuleContext(i, BlockContext);
+		}
+	}
+	public catchBlock(): CatchBlockContext[];
+	public catchBlock(i: number): CatchBlockContext;
+	public catchBlock(i?: number): CatchBlockContext | CatchBlockContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(CatchBlockContext);
+		} else {
+			return this.getRuleContext(i, CatchBlockContext);
+		}
+	}
+	public FINALLY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FINALLY, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tryCatchStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTryCatchStmt) {
+			return visitor.visitTryCatchStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class IfStmtContext extends ParserRuleContext {
+	public IF(): TerminalNode { return this.getToken(TSQLParser.IF, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public statement(): StatementContext[];
+	public statement(i: number): StatementContext;
+	public statement(i?: number): StatementContext | StatementContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(StatementContext);
+		} else {
+			return this.getRuleContext(i, StatementContext);
+		}
+	}
+	public ELSE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ELSE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_ifStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitIfStmt) {
+			return visitor.visitIfStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WhileStmtContext extends ParserRuleContext {
+	public WHILE(): TerminalNode { return this.getToken(TSQLParser.WHILE, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public statement(): StatementContext {
+		return this.getRuleContext(0, StatementContext);
+	}
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_whileStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWhileStmt) {
+			return visitor.visitWhileStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ForStmtContext extends ParserRuleContext {
+	public _initializerVarDeclr!: VarDeclContext;
+	public _initializerVarAssignment!: VarAssignmentContext;
+	public _initializerExpression!: ExpressionContext;
+	public _condition!: ExpressionContext;
+	public _incrementVarDeclr!: VarDeclContext;
+	public _incrementVarAssignment!: VarAssignmentContext;
+	public _incrementExpression!: ExpressionContext;
+	public FOR(): TerminalNode { return this.getToken(TSQLParser.FOR, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public SEMICOLON(): TerminalNode[];
+	public SEMICOLON(i: number): TerminalNode;
+	public SEMICOLON(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.SEMICOLON);
+		} else {
+			return this.getToken(TSQLParser.SEMICOLON, i);
+		}
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public statement(): StatementContext {
+		return this.getRuleContext(0, StatementContext);
+	}
+	public varDecl(): VarDeclContext[];
+	public varDecl(i: number): VarDeclContext;
+	public varDecl(i?: number): VarDeclContext | VarDeclContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(VarDeclContext);
+		} else {
+			return this.getRuleContext(i, VarDeclContext);
+		}
+	}
+	public varAssignment(): VarAssignmentContext[];
+	public varAssignment(i: number): VarAssignmentContext;
+	public varAssignment(i?: number): VarAssignmentContext | VarAssignmentContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(VarAssignmentContext);
+		} else {
+			return this.getRuleContext(i, VarAssignmentContext);
+		}
+	}
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_forStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitForStmt) {
+			return visitor.visitForStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ForInStmtContext extends ParserRuleContext {
+	public FOR(): TerminalNode { return this.getToken(TSQLParser.FOR, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public LET(): TerminalNode { return this.getToken(TSQLParser.LET, 0); }
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public IN(): TerminalNode { return this.getToken(TSQLParser.IN, 0); }
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public statement(): StatementContext {
+		return this.getRuleContext(0, StatementContext);
+	}
+	public COMMA(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COMMA, 0); }
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_forInStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitForInStmt) {
+			return visitor.visitForInStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class FuncStmtContext extends ParserRuleContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public block(): BlockContext {
+		return this.getRuleContext(0, BlockContext);
+	}
+	public FN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FN, 0); }
+	public FUN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FUN, 0); }
+	public identifierList(): IdentifierListContext | undefined {
+		return this.tryGetRuleContext(0, IdentifierListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_funcStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitFuncStmt) {
+			return visitor.visitFuncStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class VarAssignmentContext extends ParserRuleContext {
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public COLON(): TerminalNode { return this.getToken(TSQLParser.COLON, 0); }
+	public EQ_SINGLE(): TerminalNode { return this.getToken(TSQLParser.EQ_SINGLE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_varAssignment; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitVarAssignment) {
+			return visitor.visitVarAssignment(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ExprStmtContext extends ParserRuleContext {
+	public expression(): ExpressionContext {
+		return this.getRuleContext(0, ExpressionContext);
+	}
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_exprStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitExprStmt) {
+			return visitor.visitExprStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class EmptyStmtContext extends ParserRuleContext {
+	public SEMICOLON(): TerminalNode { return this.getToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_emptyStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitEmptyStmt) {
+			return visitor.visitEmptyStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class BlockContext extends ParserRuleContext {
+	public LBRACE(): TerminalNode { return this.getToken(TSQLParser.LBRACE, 0); }
+	public RBRACE(): TerminalNode { return this.getToken(TSQLParser.RBRACE, 0); }
+	public declaration(): DeclarationContext[];
+	public declaration(i: number): DeclarationContext;
+	public declaration(i?: number): DeclarationContext | DeclarationContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(DeclarationContext);
+		} else {
+			return this.getRuleContext(i, DeclarationContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_block; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitBlock) {
+			return visitor.visitBlock(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class KvPairContext extends ParserRuleContext {
+	public expression(): ExpressionContext[];
+	public expression(i: number): ExpressionContext;
+	public expression(i?: number): ExpressionContext | ExpressionContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ExpressionContext);
+		} else {
+			return this.getRuleContext(i, ExpressionContext);
+		}
+	}
+	public COLON(): TerminalNode { return this.getToken(TSQLParser.COLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_kvPair; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitKvPair) {
+			return visitor.visitKvPair(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class KvPairListContext extends ParserRuleContext {
+	public kvPair(): KvPairContext[];
+	public kvPair(i: number): KvPairContext;
+	public kvPair(i?: number): KvPairContext | KvPairContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(KvPairContext);
+		} else {
+			return this.getRuleContext(i, KvPairContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_kvPairList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitKvPairList) {
+			return visitor.visitKvPairList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SelectContext extends ParserRuleContext {
+	public EOF(): TerminalNode { return this.getToken(TSQLParser.EOF, 0); }
+	public selectSetStmt(): SelectSetStmtContext | undefined {
+		return this.tryGetRuleContext(0, SelectSetStmtContext);
+	}
+	public selectStmt(): SelectStmtContext | undefined {
+		return this.tryGetRuleContext(0, SelectStmtContext);
+	}
+	public tSQLxTagElement(): TSQLxTagElementContext | undefined {
+		return this.tryGetRuleContext(0, TSQLxTagElementContext);
+	}
+	public SEMICOLON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMICOLON, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_select; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSelect) {
+			return visitor.visitSelect(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SelectStmtWithParensContext extends ParserRuleContext {
+	public selectStmt(): SelectStmtContext | undefined {
+		return this.tryGetRuleContext(0, SelectStmtContext);
+	}
+	public LPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LPAREN, 0); }
+	public selectSetStmt(): SelectSetStmtContext | undefined {
+		return this.tryGetRuleContext(0, SelectSetStmtContext);
+	}
+	public RPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RPAREN, 0); }
+	public placeholder(): PlaceholderContext | undefined {
+		return this.tryGetRuleContext(0, PlaceholderContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_selectStmtWithParens; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSelectStmtWithParens) {
+			return visitor.visitSelectStmtWithParens(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SubsequentSelectSetClauseContext extends ParserRuleContext {
+	public selectStmtWithParens(): SelectStmtWithParensContext {
+		return this.getRuleContext(0, SelectStmtWithParensContext);
+	}
+	public EXCEPT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.EXCEPT, 0); }
+	public UNION(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.UNION, 0); }
+	public ALL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ALL, 0); }
+	public DISTINCT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DISTINCT, 0); }
+	public INTERSECT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.INTERSECT, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_subsequentSelectSetClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSubsequentSelectSetClause) {
+			return visitor.visitSubsequentSelectSetClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SelectSetStmtContext extends ParserRuleContext {
+	public selectStmtWithParens(): SelectStmtWithParensContext {
+		return this.getRuleContext(0, SelectStmtWithParensContext);
+	}
+	public subsequentSelectSetClause(): SubsequentSelectSetClauseContext[];
+	public subsequentSelectSetClause(i: number): SubsequentSelectSetClauseContext;
+	public subsequentSelectSetClause(i?: number): SubsequentSelectSetClauseContext | SubsequentSelectSetClauseContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(SubsequentSelectSetClauseContext);
+		} else {
+			return this.getRuleContext(i, SubsequentSelectSetClauseContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_selectSetStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSelectSetStmt) {
+			return visitor.visitSelectSetStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SelectStmtContext extends ParserRuleContext {
+	public _with!: WithClauseContext;
+	public _columns!: ColumnExprListContext;
+	public _from!: FromClauseContext;
+	public _where!: WhereClauseContext;
+	public SELECT(): TerminalNode { return this.getToken(TSQLParser.SELECT, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	public DISTINCT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DISTINCT, 0); }
+	public topClause(): TopClauseContext | undefined {
+		return this.tryGetRuleContext(0, TopClauseContext);
+	}
+	public arrayJoinClause(): ArrayJoinClauseContext | undefined {
+		return this.tryGetRuleContext(0, ArrayJoinClauseContext);
+	}
+	public prewhereClause(): PrewhereClauseContext | undefined {
+		return this.tryGetRuleContext(0, PrewhereClauseContext);
+	}
+	public groupByClause(): GroupByClauseContext | undefined {
+		return this.tryGetRuleContext(0, GroupByClauseContext);
+	}
+	public WITH(): TerminalNode[];
+	public WITH(i: number): TerminalNode;
+	public WITH(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.WITH);
+		} else {
+			return this.getToken(TSQLParser.WITH, i);
+		}
+	}
+	public TOTALS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TOTALS, 0); }
+	public havingClause(): HavingClauseContext | undefined {
+		return this.tryGetRuleContext(0, HavingClauseContext);
+	}
+	public windowClause(): WindowClauseContext | undefined {
+		return this.tryGetRuleContext(0, WindowClauseContext);
+	}
+	public orderByClause(): OrderByClauseContext | undefined {
+		return this.tryGetRuleContext(0, OrderByClauseContext);
+	}
+	public limitByClause(): LimitByClauseContext | undefined {
+		return this.tryGetRuleContext(0, LimitByClauseContext);
+	}
+	public limitAndOffsetClause(): LimitAndOffsetClauseContext | undefined {
+		return this.tryGetRuleContext(0, LimitAndOffsetClauseContext);
+	}
+	public offsetOnlyClause(): OffsetOnlyClauseContext | undefined {
+		return this.tryGetRuleContext(0, OffsetOnlyClauseContext);
+	}
+	public settingsClause(): SettingsClauseContext | undefined {
+		return this.tryGetRuleContext(0, SettingsClauseContext);
+	}
+	public withClause(): WithClauseContext | undefined {
+		return this.tryGetRuleContext(0, WithClauseContext);
+	}
+	public fromClause(): FromClauseContext | undefined {
+		return this.tryGetRuleContext(0, FromClauseContext);
+	}
+	public whereClause(): WhereClauseContext | undefined {
+		return this.tryGetRuleContext(0, WhereClauseContext);
+	}
+	public CUBE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CUBE, 0); }
+	public ROLLUP(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROLLUP, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_selectStmt; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSelectStmt) {
+			return visitor.visitSelectStmt(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WithClauseContext extends ParserRuleContext {
+	public WITH(): TerminalNode { return this.getToken(TSQLParser.WITH, 0); }
+	public withExprList(): WithExprListContext {
+		return this.getRuleContext(0, WithExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_withClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWithClause) {
+			return visitor.visitWithClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TopClauseContext extends ParserRuleContext {
+	public TOP(): TerminalNode { return this.getToken(TSQLParser.TOP, 0); }
+	public DECIMAL_LITERAL(): TerminalNode { return this.getToken(TSQLParser.DECIMAL_LITERAL, 0); }
+	public WITH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WITH, 0); }
+	public TIES(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TIES, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_topClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTopClause) {
+			return visitor.visitTopClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class FromClauseContext extends ParserRuleContext {
+	public FROM(): TerminalNode { return this.getToken(TSQLParser.FROM, 0); }
+	public joinExpr(): JoinExprContext {
+		return this.getRuleContext(0, JoinExprContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_fromClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitFromClause) {
+			return visitor.visitFromClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ArrayJoinClauseContext extends ParserRuleContext {
+	public ARRAY(): TerminalNode { return this.getToken(TSQLParser.ARRAY, 0); }
+	public JOIN(): TerminalNode { return this.getToken(TSQLParser.JOIN, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	public LEFT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LEFT, 0); }
+	public INNER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.INNER, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_arrayJoinClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitArrayJoinClause) {
+			return visitor.visitArrayJoinClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WindowClauseContext extends ParserRuleContext {
+	public WINDOW(): TerminalNode { return this.getToken(TSQLParser.WINDOW, 0); }
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public AS(): TerminalNode[];
+	public AS(i: number): TerminalNode;
+	public AS(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.AS);
+		} else {
+			return this.getToken(TSQLParser.AS, i);
+		}
+	}
+	public LPAREN(): TerminalNode[];
+	public LPAREN(i: number): TerminalNode;
+	public LPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.LPAREN);
+		} else {
+			return this.getToken(TSQLParser.LPAREN, i);
+		}
+	}
+	public windowExpr(): WindowExprContext[];
+	public windowExpr(i: number): WindowExprContext;
+	public windowExpr(i?: number): WindowExprContext | WindowExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(WindowExprContext);
+		} else {
+			return this.getRuleContext(i, WindowExprContext);
+		}
+	}
+	public RPAREN(): TerminalNode[];
+	public RPAREN(i: number): TerminalNode;
+	public RPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.RPAREN);
+		} else {
+			return this.getToken(TSQLParser.RPAREN, i);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_windowClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWindowClause) {
+			return visitor.visitWindowClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class PrewhereClauseContext extends ParserRuleContext {
+	public PREWHERE(): TerminalNode { return this.getToken(TSQLParser.PREWHERE, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_prewhereClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitPrewhereClause) {
+			return visitor.visitPrewhereClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WhereClauseContext extends ParserRuleContext {
+	public WHERE(): TerminalNode { return this.getToken(TSQLParser.WHERE, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_whereClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWhereClause) {
+			return visitor.visitWhereClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class GroupByClauseContext extends ParserRuleContext {
+	public GROUP(): TerminalNode { return this.getToken(TSQLParser.GROUP, 0); }
+	public BY(): TerminalNode { return this.getToken(TSQLParser.BY, 0); }
+	public LPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LPAREN, 0); }
+	public columnExprList(): ColumnExprListContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprListContext);
+	}
+	public RPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RPAREN, 0); }
+	public CUBE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CUBE, 0); }
+	public ROLLUP(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROLLUP, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_groupByClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitGroupByClause) {
+			return visitor.visitGroupByClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class HavingClauseContext extends ParserRuleContext {
+	public HAVING(): TerminalNode { return this.getToken(TSQLParser.HAVING, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_havingClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitHavingClause) {
+			return visitor.visitHavingClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class OrderByClauseContext extends ParserRuleContext {
+	public ORDER(): TerminalNode { return this.getToken(TSQLParser.ORDER, 0); }
+	public BY(): TerminalNode { return this.getToken(TSQLParser.BY, 0); }
+	public orderExprList(): OrderExprListContext {
+		return this.getRuleContext(0, OrderExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_orderByClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitOrderByClause) {
+			return visitor.visitOrderByClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ProjectionOrderByClauseContext extends ParserRuleContext {
+	public ORDER(): TerminalNode { return this.getToken(TSQLParser.ORDER, 0); }
+	public BY(): TerminalNode { return this.getToken(TSQLParser.BY, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_projectionOrderByClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitProjectionOrderByClause) {
+			return visitor.visitProjectionOrderByClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class LimitByClauseContext extends ParserRuleContext {
+	public LIMIT(): TerminalNode { return this.getToken(TSQLParser.LIMIT, 0); }
+	public limitExpr(): LimitExprContext {
+		return this.getRuleContext(0, LimitExprContext);
+	}
+	public BY(): TerminalNode { return this.getToken(TSQLParser.BY, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_limitByClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitLimitByClause) {
+			return visitor.visitLimitByClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class LimitAndOffsetClauseContext extends ParserRuleContext {
+	public LIMIT(): TerminalNode { return this.getToken(TSQLParser.LIMIT, 0); }
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public COMMA(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COMMA, 0); }
+	public WITH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WITH, 0); }
+	public TIES(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TIES, 0); }
+	public OFFSET(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OFFSET, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_limitAndOffsetClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitLimitAndOffsetClause) {
+			return visitor.visitLimitAndOffsetClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class OffsetOnlyClauseContext extends ParserRuleContext {
+	public OFFSET(): TerminalNode { return this.getToken(TSQLParser.OFFSET, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_offsetOnlyClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitOffsetOnlyClause) {
+			return visitor.visitOffsetOnlyClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SettingsClauseContext extends ParserRuleContext {
+	public SETTINGS(): TerminalNode { return this.getToken(TSQLParser.SETTINGS, 0); }
+	public settingExprList(): SettingExprListContext {
+		return this.getRuleContext(0, SettingExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_settingsClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSettingsClause) {
+			return visitor.visitSettingsClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class JoinExprContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_joinExpr; }
+	public copyFrom(ctx: JoinExprContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class JoinExprOpContext extends JoinExprContext {
+	public joinExpr(): JoinExprContext[];
+	public joinExpr(i: number): JoinExprContext;
+	public joinExpr(i?: number): JoinExprContext | JoinExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(JoinExprContext);
+		} else {
+			return this.getRuleContext(i, JoinExprContext);
+		}
+	}
+	public JOIN(): TerminalNode { return this.getToken(TSQLParser.JOIN, 0); }
+	public joinConstraintClause(): JoinConstraintClauseContext {
+		return this.getRuleContext(0, JoinConstraintClauseContext);
+	}
+	public joinOp(): JoinOpContext | undefined {
+		return this.tryGetRuleContext(0, JoinOpContext);
+	}
+	constructor(ctx: JoinExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinExprOp) {
+			return visitor.visitJoinExprOp(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class JoinExprCrossOpContext extends JoinExprContext {
+	public joinExpr(): JoinExprContext[];
+	public joinExpr(i: number): JoinExprContext;
+	public joinExpr(i?: number): JoinExprContext | JoinExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(JoinExprContext);
+		} else {
+			return this.getRuleContext(i, JoinExprContext);
+		}
+	}
+	public joinOpCross(): JoinOpCrossContext {
+		return this.getRuleContext(0, JoinOpCrossContext);
+	}
+	constructor(ctx: JoinExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinExprCrossOp) {
+			return visitor.visitJoinExprCrossOp(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class JoinExprTableContext extends JoinExprContext {
+	public tableExpr(): TableExprContext {
+		return this.getRuleContext(0, TableExprContext);
+	}
+	public FINAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FINAL, 0); }
+	public sampleClause(): SampleClauseContext | undefined {
+		return this.tryGetRuleContext(0, SampleClauseContext);
+	}
+	constructor(ctx: JoinExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinExprTable) {
+			return visitor.visitJoinExprTable(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class JoinExprParensContext extends JoinExprContext {
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public joinExpr(): JoinExprContext {
+		return this.getRuleContext(0, JoinExprContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: JoinExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinExprParens) {
+			return visitor.visitJoinExprParens(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class JoinOpContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_joinOp; }
+	public copyFrom(ctx: JoinOpContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class JoinOpInnerContext extends JoinOpContext {
+	public INNER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.INNER, 0); }
+	public ALL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ALL, 0); }
+	public ANY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ANY, 0); }
+	public ASOF(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ASOF, 0); }
+	constructor(ctx: JoinOpContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinOpInner) {
+			return visitor.visitJoinOpInner(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class JoinOpLeftRightContext extends JoinOpContext {
+	public LEFT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LEFT, 0); }
+	public RIGHT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RIGHT, 0); }
+	public OUTER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OUTER, 0); }
+	public SEMI(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMI, 0); }
+	public ALL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ALL, 0); }
+	public ANTI(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ANTI, 0); }
+	public ANY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ANY, 0); }
+	public ASOF(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ASOF, 0); }
+	constructor(ctx: JoinOpContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinOpLeftRight) {
+			return visitor.visitJoinOpLeftRight(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class JoinOpFullContext extends JoinOpContext {
+	public FULL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FULL, 0); }
+	public OUTER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OUTER, 0); }
+	public ALL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ALL, 0); }
+	public ANY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ANY, 0); }
+	constructor(ctx: JoinOpContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinOpFull) {
+			return visitor.visitJoinOpFull(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class JoinOpCrossContext extends ParserRuleContext {
+	public CROSS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CROSS, 0); }
+	public JOIN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.JOIN, 0); }
+	public COMMA(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COMMA, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_joinOpCross; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinOpCross) {
+			return visitor.visitJoinOpCross(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class JoinConstraintClauseContext extends ParserRuleContext {
+	public ON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ON, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	public USING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.USING, 0); }
+	public LPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LPAREN, 0); }
+	public RPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RPAREN, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_joinConstraintClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitJoinConstraintClause) {
+			return visitor.visitJoinConstraintClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SampleClauseContext extends ParserRuleContext {
+	public SAMPLE(): TerminalNode { return this.getToken(TSQLParser.SAMPLE, 0); }
+	public ratioExpr(): RatioExprContext[];
+	public ratioExpr(i: number): RatioExprContext;
+	public ratioExpr(i?: number): RatioExprContext | RatioExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(RatioExprContext);
+		} else {
+			return this.getRuleContext(i, RatioExprContext);
+		}
+	}
+	public OFFSET(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OFFSET, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_sampleClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSampleClause) {
+			return visitor.visitSampleClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class LimitExprContext extends ParserRuleContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public COMMA(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COMMA, 0); }
+	public OFFSET(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OFFSET, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_limitExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitLimitExpr) {
+			return visitor.visitLimitExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class OrderExprListContext extends ParserRuleContext {
+	public orderExpr(): OrderExprContext[];
+	public orderExpr(i: number): OrderExprContext;
+	public orderExpr(i?: number): OrderExprContext | OrderExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(OrderExprContext);
+		} else {
+			return this.getRuleContext(i, OrderExprContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_orderExprList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitOrderExprList) {
+			return visitor.visitOrderExprList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class OrderExprContext extends ParserRuleContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public NULLS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NULLS, 0); }
+	public COLLATE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COLLATE, 0); }
+	public STRING_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.STRING_LITERAL, 0); }
+	public ASCENDING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ASCENDING, 0); }
+	public DESCENDING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DESCENDING, 0); }
+	public DESC(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DESC, 0); }
+	public FIRST(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FIRST, 0); }
+	public LAST(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LAST, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_orderExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitOrderExpr) {
+			return visitor.visitOrderExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class RatioExprContext extends ParserRuleContext {
+	public placeholder(): PlaceholderContext | undefined {
+		return this.tryGetRuleContext(0, PlaceholderContext);
+	}
+	public numberLiteral(): NumberLiteralContext[];
+	public numberLiteral(i: number): NumberLiteralContext;
+	public numberLiteral(i?: number): NumberLiteralContext | NumberLiteralContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(NumberLiteralContext);
+		} else {
+			return this.getRuleContext(i, NumberLiteralContext);
+		}
+	}
+	public SLASH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SLASH, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_ratioExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitRatioExpr) {
+			return visitor.visitRatioExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SettingExprListContext extends ParserRuleContext {
+	public settingExpr(): SettingExprContext[];
+	public settingExpr(i: number): SettingExprContext;
+	public settingExpr(i?: number): SettingExprContext | SettingExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(SettingExprContext);
+		} else {
+			return this.getRuleContext(i, SettingExprContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_settingExprList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSettingExprList) {
+			return visitor.visitSettingExprList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class SettingExprContext extends ParserRuleContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public EQ_SINGLE(): TerminalNode { return this.getToken(TSQLParser.EQ_SINGLE, 0); }
+	public literal(): LiteralContext {
+		return this.getRuleContext(0, LiteralContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_settingExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitSettingExpr) {
+			return visitor.visitSettingExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WindowExprContext extends ParserRuleContext {
+	public winPartitionByClause(): WinPartitionByClauseContext | undefined {
+		return this.tryGetRuleContext(0, WinPartitionByClauseContext);
+	}
+	public winOrderByClause(): WinOrderByClauseContext | undefined {
+		return this.tryGetRuleContext(0, WinOrderByClauseContext);
+	}
+	public winFrameClause(): WinFrameClauseContext | undefined {
+		return this.tryGetRuleContext(0, WinFrameClauseContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_windowExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWindowExpr) {
+			return visitor.visitWindowExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WinPartitionByClauseContext extends ParserRuleContext {
+	public PARTITION(): TerminalNode { return this.getToken(TSQLParser.PARTITION, 0); }
+	public BY(): TerminalNode { return this.getToken(TSQLParser.BY, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_winPartitionByClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWinPartitionByClause) {
+			return visitor.visitWinPartitionByClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WinOrderByClauseContext extends ParserRuleContext {
+	public ORDER(): TerminalNode { return this.getToken(TSQLParser.ORDER, 0); }
+	public BY(): TerminalNode { return this.getToken(TSQLParser.BY, 0); }
+	public orderExprList(): OrderExprListContext {
+		return this.getRuleContext(0, OrderExprListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_winOrderByClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWinOrderByClause) {
+			return visitor.visitWinOrderByClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WinFrameClauseContext extends ParserRuleContext {
+	public winFrameExtend(): WinFrameExtendContext {
+		return this.getRuleContext(0, WinFrameExtendContext);
+	}
+	public ROWS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROWS, 0); }
+	public RANGE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RANGE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_winFrameClause; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWinFrameClause) {
+			return visitor.visitWinFrameClause(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WinFrameExtendContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_winFrameExtend; }
+	public copyFrom(ctx: WinFrameExtendContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class FrameStartContext extends WinFrameExtendContext {
+	public winFrameBound(): WinFrameBoundContext {
+		return this.getRuleContext(0, WinFrameBoundContext);
+	}
+	constructor(ctx: WinFrameExtendContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitFrameStart) {
+			return visitor.visitFrameStart(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class FrameBetweenContext extends WinFrameExtendContext {
+	public BETWEEN(): TerminalNode { return this.getToken(TSQLParser.BETWEEN, 0); }
+	public winFrameBound(): WinFrameBoundContext[];
+	public winFrameBound(i: number): WinFrameBoundContext;
+	public winFrameBound(i?: number): WinFrameBoundContext | WinFrameBoundContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(WinFrameBoundContext);
+		} else {
+			return this.getRuleContext(i, WinFrameBoundContext);
+		}
+	}
+	public AND(): TerminalNode { return this.getToken(TSQLParser.AND, 0); }
+	constructor(ctx: WinFrameExtendContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitFrameBetween) {
+			return visitor.visitFrameBetween(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WinFrameBoundContext extends ParserRuleContext {
+	public CURRENT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CURRENT, 0); }
+	public ROW(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROW, 0); }
+	public UNBOUNDED(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.UNBOUNDED, 0); }
+	public PRECEDING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PRECEDING, 0); }
+	public FOLLOWING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FOLLOWING, 0); }
+	public numberLiteral(): NumberLiteralContext | undefined {
+		return this.tryGetRuleContext(0, NumberLiteralContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_winFrameBound; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWinFrameBound) {
+			return visitor.visitWinFrameBound(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ExprContext extends ParserRuleContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public EOF(): TerminalNode { return this.getToken(TSQLParser.EOF, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_expr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitExpr) {
+			return visitor.visitExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ColumnTypeExprContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_columnTypeExpr; }
+	public copyFrom(ctx: ColumnTypeExprContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class ColumnTypeExprSimpleContext extends ColumnTypeExprContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	constructor(ctx: ColumnTypeExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnTypeExprSimple) {
+			return visitor.visitColumnTypeExprSimple(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnTypeExprNestedContext extends ColumnTypeExprContext {
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public columnTypeExpr(): ColumnTypeExprContext[];
+	public columnTypeExpr(i: number): ColumnTypeExprContext;
+	public columnTypeExpr(i?: number): ColumnTypeExprContext | ColumnTypeExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnTypeExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnTypeExprContext);
+		}
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(ctx: ColumnTypeExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnTypeExprNested) {
+			return visitor.visitColumnTypeExprNested(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnTypeExprEnumContext extends ColumnTypeExprContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public enumValue(): EnumValueContext[];
+	public enumValue(i: number): EnumValueContext;
+	public enumValue(i?: number): EnumValueContext | EnumValueContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(EnumValueContext);
+		} else {
+			return this.getRuleContext(i, EnumValueContext);
+		}
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(ctx: ColumnTypeExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnTypeExprEnum) {
+			return visitor.visitColumnTypeExprEnum(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnTypeExprComplexContext extends ColumnTypeExprContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public columnTypeExpr(): ColumnTypeExprContext[];
+	public columnTypeExpr(i: number): ColumnTypeExprContext;
+	public columnTypeExpr(i?: number): ColumnTypeExprContext | ColumnTypeExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnTypeExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnTypeExprContext);
+		}
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(ctx: ColumnTypeExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnTypeExprComplex) {
+			return visitor.visitColumnTypeExprComplex(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnTypeExprParamContext extends ColumnTypeExprContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public columnExprList(): ColumnExprListContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprListContext);
+	}
+	constructor(ctx: ColumnTypeExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnTypeExprParam) {
+			return visitor.visitColumnTypeExprParam(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ColumnExprListContext extends ParserRuleContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_columnExprList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprList) {
+			return visitor.visitColumnExprList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ColumnExprContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_columnExpr; }
+	public copyFrom(ctx: ColumnExprContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class ColumnExprCaseContext extends ColumnExprContext {
+	public _caseExpr!: ColumnExprContext;
+	public _whenExpr!: ColumnExprContext;
+	public _thenExpr!: ColumnExprContext;
+	public _elseExpr!: ColumnExprContext;
+	public CASE(): TerminalNode { return this.getToken(TSQLParser.CASE, 0); }
+	public END(): TerminalNode { return this.getToken(TSQLParser.END, 0); }
+	public WHEN(): TerminalNode[];
+	public WHEN(i: number): TerminalNode;
+	public WHEN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.WHEN);
+		} else {
+			return this.getToken(TSQLParser.WHEN, i);
+		}
+	}
+	public THEN(): TerminalNode[];
+	public THEN(i: number): TerminalNode;
+	public THEN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.THEN);
+		} else {
+			return this.getToken(TSQLParser.THEN, i);
+		}
+	}
+	public ELSE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ELSE, 0); }
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprCase) {
+			return visitor.visitColumnExprCase(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprCastContext extends ColumnExprContext {
+	public CAST(): TerminalNode { return this.getToken(TSQLParser.CAST, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public AS(): TerminalNode { return this.getToken(TSQLParser.AS, 0); }
+	public columnTypeExpr(): ColumnTypeExprContext {
+		return this.getRuleContext(0, ColumnTypeExprContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprCast) {
+			return visitor.visitColumnExprCast(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprDateContext extends ColumnExprContext {
+	public DATE(): TerminalNode { return this.getToken(TSQLParser.DATE, 0); }
+	public STRING_LITERAL(): TerminalNode { return this.getToken(TSQLParser.STRING_LITERAL, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprDate) {
+			return visitor.visitColumnExprDate(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprIntervalStringContext extends ColumnExprContext {
+	public INTERVAL(): TerminalNode { return this.getToken(TSQLParser.INTERVAL, 0); }
+	public STRING_LITERAL(): TerminalNode { return this.getToken(TSQLParser.STRING_LITERAL, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprIntervalString) {
+			return visitor.visitColumnExprIntervalString(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprIntervalContext extends ColumnExprContext {
+	public INTERVAL(): TerminalNode { return this.getToken(TSQLParser.INTERVAL, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public interval(): IntervalContext {
+		return this.getRuleContext(0, IntervalContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprInterval) {
+			return visitor.visitColumnExprInterval(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprSubstringContext extends ColumnExprContext {
+	public SUBSTRING(): TerminalNode { return this.getToken(TSQLParser.SUBSTRING, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public FROM(): TerminalNode { return this.getToken(TSQLParser.FROM, 0); }
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public FOR(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FOR, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprSubstring) {
+			return visitor.visitColumnExprSubstring(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTimestampContext extends ColumnExprContext {
+	public TIMESTAMP(): TerminalNode { return this.getToken(TSQLParser.TIMESTAMP, 0); }
+	public STRING_LITERAL(): TerminalNode { return this.getToken(TSQLParser.STRING_LITERAL, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTimestamp) {
+			return visitor.visitColumnExprTimestamp(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTrimContext extends ColumnExprContext {
+	public TRIM(): TerminalNode { return this.getToken(TSQLParser.TRIM, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public string(): StringContext {
+		return this.getRuleContext(0, StringContext);
+	}
+	public FROM(): TerminalNode { return this.getToken(TSQLParser.FROM, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public BOTH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.BOTH, 0); }
+	public LEADING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LEADING, 0); }
+	public TRAILING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TRAILING, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTrim) {
+			return visitor.visitColumnExprTrim(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprWinFunctionContext extends ColumnExprContext {
+	public _columnExprs!: ColumnExprListContext;
+	public _columnArgList!: ColumnExprListContext;
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public OVER(): TerminalNode { return this.getToken(TSQLParser.OVER, 0); }
+	public LPAREN(): TerminalNode[];
+	public LPAREN(i: number): TerminalNode;
+	public LPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.LPAREN);
+		} else {
+			return this.getToken(TSQLParser.LPAREN, i);
+		}
+	}
+	public windowExpr(): WindowExprContext {
+		return this.getRuleContext(0, WindowExprContext);
+	}
+	public RPAREN(): TerminalNode[];
+	public RPAREN(i: number): TerminalNode;
+	public RPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.RPAREN);
+		} else {
+			return this.getToken(TSQLParser.RPAREN, i);
+		}
+	}
+	public columnExprList(): ColumnExprListContext[];
+	public columnExprList(i: number): ColumnExprListContext;
+	public columnExprList(i?: number): ColumnExprListContext | ColumnExprListContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprListContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprListContext);
+		}
+	}
+	public DISTINCT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DISTINCT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprWinFunction) {
+			return visitor.visitColumnExprWinFunction(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprWinFunctionTargetContext extends ColumnExprContext {
+	public _columnExprs!: ColumnExprListContext;
+	public _columnArgList!: ColumnExprListContext;
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public OVER(): TerminalNode { return this.getToken(TSQLParser.OVER, 0); }
+	public LPAREN(): TerminalNode[];
+	public LPAREN(i: number): TerminalNode;
+	public LPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.LPAREN);
+		} else {
+			return this.getToken(TSQLParser.LPAREN, i);
+		}
+	}
+	public RPAREN(): TerminalNode[];
+	public RPAREN(i: number): TerminalNode;
+	public RPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.RPAREN);
+		} else {
+			return this.getToken(TSQLParser.RPAREN, i);
+		}
+	}
+	public columnExprList(): ColumnExprListContext[];
+	public columnExprList(i: number): ColumnExprListContext;
+	public columnExprList(i?: number): ColumnExprListContext | ColumnExprListContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprListContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprListContext);
+		}
+	}
+	public DISTINCT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DISTINCT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprWinFunctionTarget) {
+			return visitor.visitColumnExprWinFunctionTarget(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprFunctionContext extends ColumnExprContext {
+	public _columnExprs!: ColumnExprListContext;
+	public _columnArgList!: ColumnExprListContext;
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public LPAREN(): TerminalNode[];
+	public LPAREN(i: number): TerminalNode;
+	public LPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.LPAREN);
+		} else {
+			return this.getToken(TSQLParser.LPAREN, i);
+		}
+	}
+	public RPAREN(): TerminalNode[];
+	public RPAREN(i: number): TerminalNode;
+	public RPAREN(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.RPAREN);
+		} else {
+			return this.getToken(TSQLParser.RPAREN, i);
+		}
+	}
+	public DISTINCT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DISTINCT, 0); }
+	public columnExprList(): ColumnExprListContext[];
+	public columnExprList(i: number): ColumnExprListContext;
+	public columnExprList(i?: number): ColumnExprListContext | ColumnExprListContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprListContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprListContext);
+		}
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprFunction) {
+			return visitor.visitColumnExprFunction(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprCallSelectContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public selectSetStmt(): SelectSetStmtContext {
+		return this.getRuleContext(0, SelectSetStmtContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprCallSelect) {
+			return visitor.visitColumnExprCallSelect(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprCallContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public columnExprList(): ColumnExprListContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprListContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprCall) {
+			return visitor.visitColumnExprCall(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTagElementContext extends ColumnExprContext {
+	public tSQLxTagElement(): TSQLxTagElementContext {
+		return this.getRuleContext(0, TSQLxTagElementContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTagElement) {
+			return visitor.visitColumnExprTagElement(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTemplateStringContext extends ColumnExprContext {
+	public templateString(): TemplateStringContext {
+		return this.getRuleContext(0, TemplateStringContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTemplateString) {
+			return visitor.visitColumnExprTemplateString(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprLiteralContext extends ColumnExprContext {
+	public literal(): LiteralContext {
+		return this.getRuleContext(0, LiteralContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprLiteral) {
+			return visitor.visitColumnExprLiteral(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprArrayAccessContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public LBRACKET(): TerminalNode { return this.getToken(TSQLParser.LBRACKET, 0); }
+	public RBRACKET(): TerminalNode { return this.getToken(TSQLParser.RBRACKET, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprArrayAccess) {
+			return visitor.visitColumnExprArrayAccess(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTupleAccessContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public DOT(): TerminalNode { return this.getToken(TSQLParser.DOT, 0); }
+	public DECIMAL_LITERAL(): TerminalNode { return this.getToken(TSQLParser.DECIMAL_LITERAL, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTupleAccess) {
+			return visitor.visitColumnExprTupleAccess(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprPropertyAccessContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public DOT(): TerminalNode { return this.getToken(TSQLParser.DOT, 0); }
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprPropertyAccess) {
+			return visitor.visitColumnExprPropertyAccess(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprNullArrayAccessContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public NULL_PROPERTY(): TerminalNode { return this.getToken(TSQLParser.NULL_PROPERTY, 0); }
+	public LBRACKET(): TerminalNode { return this.getToken(TSQLParser.LBRACKET, 0); }
+	public RBRACKET(): TerminalNode { return this.getToken(TSQLParser.RBRACKET, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprNullArrayAccess) {
+			return visitor.visitColumnExprNullArrayAccess(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprNullTupleAccessContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public NULL_PROPERTY(): TerminalNode { return this.getToken(TSQLParser.NULL_PROPERTY, 0); }
+	public DECIMAL_LITERAL(): TerminalNode { return this.getToken(TSQLParser.DECIMAL_LITERAL, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprNullTupleAccess) {
+			return visitor.visitColumnExprNullTupleAccess(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprNullPropertyAccessContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public NULL_PROPERTY(): TerminalNode { return this.getToken(TSQLParser.NULL_PROPERTY, 0); }
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprNullPropertyAccess) {
+			return visitor.visitColumnExprNullPropertyAccess(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprNegateContext extends ColumnExprContext {
+	public DASH(): TerminalNode { return this.getToken(TSQLParser.DASH, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprNegate) {
+			return visitor.visitColumnExprNegate(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprPrecedence1Context extends ColumnExprContext {
+	public _left!: ColumnExprContext;
+	public _operator!: Token;
+	public _right!: ColumnExprContext;
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public ASTERISK(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ASTERISK, 0); }
+	public SLASH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SLASH, 0); }
+	public PERCENT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PERCENT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprPrecedence1) {
+			return visitor.visitColumnExprPrecedence1(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprPrecedence2Context extends ColumnExprContext {
+	public _left!: ColumnExprContext;
+	public _operator!: Token;
+	public _right!: ColumnExprContext;
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public PLUS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PLUS, 0); }
+	public DASH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DASH, 0); }
+	public CONCAT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CONCAT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprPrecedence2) {
+			return visitor.visitColumnExprPrecedence2(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprPrecedence3Context extends ColumnExprContext {
+	public _left!: ColumnExprContext;
+	public _operator!: Token;
+	public _right!: ColumnExprContext;
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public IN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IN, 0); }
+	public EQ_DOUBLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.EQ_DOUBLE, 0); }
+	public EQ_SINGLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.EQ_SINGLE, 0); }
+	public NOT_EQ(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT_EQ, 0); }
+	public LT_EQ(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LT_EQ, 0); }
+	public LT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LT, 0); }
+	public GT_EQ(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.GT_EQ, 0); }
+	public GT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.GT, 0); }
+	public LIKE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LIKE, 0); }
+	public ILIKE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ILIKE, 0); }
+	public REGEX_SINGLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.REGEX_SINGLE, 0); }
+	public REGEX_DOUBLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.REGEX_DOUBLE, 0); }
+	public NOT_REGEX(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT_REGEX, 0); }
+	public IREGEX_SINGLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IREGEX_SINGLE, 0); }
+	public IREGEX_DOUBLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IREGEX_DOUBLE, 0); }
+	public NOT_IREGEX(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT_IREGEX, 0); }
+	public COHORT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COHORT, 0); }
+	public NOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprPrecedence3) {
+			return visitor.visitColumnExprPrecedence3(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprIsNullContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public IS(): TerminalNode { return this.getToken(TSQLParser.IS, 0); }
+	public NULL_SQL(): TerminalNode { return this.getToken(TSQLParser.NULL_SQL, 0); }
+	public NOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprIsNull) {
+			return visitor.visitColumnExprIsNull(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprNullishContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public NULLISH(): TerminalNode { return this.getToken(TSQLParser.NULLISH, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprNullish) {
+			return visitor.visitColumnExprNullish(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprNotContext extends ColumnExprContext {
+	public NOT(): TerminalNode { return this.getToken(TSQLParser.NOT, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprNot) {
+			return visitor.visitColumnExprNot(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprAndContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public AND(): TerminalNode { return this.getToken(TSQLParser.AND, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprAnd) {
+			return visitor.visitColumnExprAnd(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprOrContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public OR(): TerminalNode { return this.getToken(TSQLParser.OR, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprOr) {
+			return visitor.visitColumnExprOr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprBetweenContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public BETWEEN(): TerminalNode { return this.getToken(TSQLParser.BETWEEN, 0); }
+	public AND(): TerminalNode { return this.getToken(TSQLParser.AND, 0); }
+	public NOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprBetween) {
+			return visitor.visitColumnExprBetween(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTernaryOpContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public QUERY(): TerminalNode { return this.getToken(TSQLParser.QUERY, 0); }
+	public COLON(): TerminalNode { return this.getToken(TSQLParser.COLON, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTernaryOp) {
+			return visitor.visitColumnExprTernaryOp(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprAliasContext extends ColumnExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public AS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.AS, 0); }
+	public identifier(): IdentifierContext | undefined {
+		return this.tryGetRuleContext(0, IdentifierContext);
+	}
+	public STRING_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.STRING_LITERAL, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprAlias) {
+			return visitor.visitColumnExprAlias(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprAsteriskContext extends ColumnExprContext {
+	public ASTERISK(): TerminalNode { return this.getToken(TSQLParser.ASTERISK, 0); }
+	public tableIdentifier(): TableIdentifierContext | undefined {
+		return this.tryGetRuleContext(0, TableIdentifierContext);
+	}
+	public DOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DOT, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprAsterisk) {
+			return visitor.visitColumnExprAsterisk(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprSubqueryContext extends ColumnExprContext {
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public selectSetStmt(): SelectSetStmtContext {
+		return this.getRuleContext(0, SelectSetStmtContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprSubquery) {
+			return visitor.visitColumnExprSubquery(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprParensContext extends ColumnExprContext {
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprParens) {
+			return visitor.visitColumnExprParens(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprTupleContext extends ColumnExprContext {
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public columnExprList(): ColumnExprListContext {
+		return this.getRuleContext(0, ColumnExprListContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprTuple) {
+			return visitor.visitColumnExprTuple(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprArrayContext extends ColumnExprContext {
+	public LBRACKET(): TerminalNode { return this.getToken(TSQLParser.LBRACKET, 0); }
+	public RBRACKET(): TerminalNode { return this.getToken(TSQLParser.RBRACKET, 0); }
+	public columnExprList(): ColumnExprListContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprListContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprArray) {
+			return visitor.visitColumnExprArray(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprDictContext extends ColumnExprContext {
+	public LBRACE(): TerminalNode { return this.getToken(TSQLParser.LBRACE, 0); }
+	public RBRACE(): TerminalNode { return this.getToken(TSQLParser.RBRACE, 0); }
+	public kvPairList(): KvPairListContext | undefined {
+		return this.tryGetRuleContext(0, KvPairListContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprDict) {
+			return visitor.visitColumnExprDict(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprLambdaContext extends ColumnExprContext {
+	public columnLambdaExpr(): ColumnLambdaExprContext {
+		return this.getRuleContext(0, ColumnLambdaExprContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprLambda) {
+			return visitor.visitColumnExprLambda(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class ColumnExprIdentifierContext extends ColumnExprContext {
+	public columnIdentifier(): ColumnIdentifierContext {
+		return this.getRuleContext(0, ColumnIdentifierContext);
+	}
+	constructor(ctx: ColumnExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnExprIdentifier) {
+			return visitor.visitColumnExprIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ColumnLambdaExprContext extends ParserRuleContext {
+	public ARROW(): TerminalNode { return this.getToken(TSQLParser.ARROW, 0); }
+	public LPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LPAREN, 0); }
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public RPAREN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RPAREN, 0); }
+	public columnExpr(): ColumnExprContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprContext);
+	}
+	public block(): BlockContext | undefined {
+		return this.tryGetRuleContext(0, BlockContext);
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_columnLambdaExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnLambdaExpr) {
+			return visitor.visitColumnLambdaExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TSQLxChildElementContext extends ParserRuleContext {
+	public tSQLxTagElement(): TSQLxTagElementContext | undefined {
+		return this.tryGetRuleContext(0, TSQLxTagElementContext);
+	}
+	public TSQLX_TEXT_TEXT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TSQLX_TEXT_TEXT, 0); }
+	public LBRACE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LBRACE, 0); }
+	public columnExpr(): ColumnExprContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprContext);
+	}
+	public RBRACE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RBRACE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tSQLxChildElement; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTSQLxChildElement) {
+			return visitor.visitTSQLxChildElement(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TSQLxTagElementContext extends ParserRuleContext {
+	public LT(): TerminalNode { return this.getToken(TSQLParser.LT, 0); }
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public SLASH_GT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SLASH_GT, 0); }
+	public tSQLxTagAttribute(): TSQLxTagAttributeContext[];
+	public tSQLxTagAttribute(i: number): TSQLxTagAttributeContext;
+	public tSQLxTagAttribute(i?: number): TSQLxTagAttributeContext | TSQLxTagAttributeContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(TSQLxTagAttributeContext);
+		} else {
+			return this.getRuleContext(i, TSQLxTagAttributeContext);
+		}
+	}
+	public GT(): TerminalNode[];
+	public GT(i: number): TerminalNode;
+	public GT(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.GT);
+		} else {
+			return this.getToken(TSQLParser.GT, i);
+		}
+	}
+	public LT_SLASH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LT_SLASH, 0); }
+	public tSQLxChildElement(): TSQLxChildElementContext[];
+	public tSQLxChildElement(i: number): TSQLxChildElementContext;
+	public tSQLxChildElement(i?: number): TSQLxChildElementContext | TSQLxChildElementContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(TSQLxChildElementContext);
+		} else {
+			return this.getRuleContext(i, TSQLxChildElementContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tSQLxTagElement; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTSQLxTagElement) {
+			return visitor.visitTSQLxTagElement(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TSQLxTagAttributeContext extends ParserRuleContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public EQ_SINGLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.EQ_SINGLE, 0); }
+	public string(): StringContext | undefined {
+		return this.tryGetRuleContext(0, StringContext);
+	}
+	public LBRACE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LBRACE, 0); }
+	public columnExpr(): ColumnExprContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprContext);
+	}
+	public RBRACE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RBRACE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tSQLxTagAttribute; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTSQLxTagAttribute) {
+			return visitor.visitTSQLxTagAttribute(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WithExprListContext extends ParserRuleContext {
+	public withExpr(): WithExprContext[];
+	public withExpr(i: number): WithExprContext;
+	public withExpr(i?: number): WithExprContext | WithExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(WithExprContext);
+		} else {
+			return this.getRuleContext(i, WithExprContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_withExprList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWithExprList) {
+			return visitor.visitWithExprList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class WithExprContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_withExpr; }
+	public copyFrom(ctx: WithExprContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class WithExprSubqueryContext extends WithExprContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public AS(): TerminalNode { return this.getToken(TSQLParser.AS, 0); }
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public selectSetStmt(): SelectSetStmtContext {
+		return this.getRuleContext(0, SelectSetStmtContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: WithExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWithExprSubquery) {
+			return visitor.visitWithExprSubquery(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class WithExprColumnContext extends WithExprContext {
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public AS(): TerminalNode { return this.getToken(TSQLParser.AS, 0); }
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	constructor(ctx: WithExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitWithExprColumn) {
+			return visitor.visitWithExprColumn(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class ColumnIdentifierContext extends ParserRuleContext {
+	public placeholder(): PlaceholderContext | undefined {
+		return this.tryGetRuleContext(0, PlaceholderContext);
+	}
+	public nestedIdentifier(): NestedIdentifierContext | undefined {
+		return this.tryGetRuleContext(0, NestedIdentifierContext);
+	}
+	public tableIdentifier(): TableIdentifierContext | undefined {
+		return this.tryGetRuleContext(0, TableIdentifierContext);
+	}
+	public DOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DOT, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_columnIdentifier; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitColumnIdentifier) {
+			return visitor.visitColumnIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class NestedIdentifierContext extends ParserRuleContext {
+	public identifier(): IdentifierContext[];
+	public identifier(i: number): IdentifierContext;
+	public identifier(i?: number): IdentifierContext | IdentifierContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(IdentifierContext);
+		} else {
+			return this.getRuleContext(i, IdentifierContext);
+		}
+	}
+	public DOT(): TerminalNode[];
+	public DOT(i: number): TerminalNode;
+	public DOT(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.DOT);
+		} else {
+			return this.getToken(TSQLParser.DOT, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_nestedIdentifier; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitNestedIdentifier) {
+			return visitor.visitNestedIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TableExprContext extends ParserRuleContext {
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tableExpr; }
+	public copyFrom(ctx: TableExprContext): void {
+		super.copyFrom(ctx);
+	}
+}
+export class TableExprIdentifierContext extends TableExprContext {
+	public tableIdentifier(): TableIdentifierContext {
+		return this.getRuleContext(0, TableIdentifierContext);
+	}
+	constructor(ctx: TableExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableExprIdentifier) {
+			return visitor.visitTableExprIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class TableExprFunctionContext extends TableExprContext {
+	public tableFunctionExpr(): TableFunctionExprContext {
+		return this.getRuleContext(0, TableFunctionExprContext);
+	}
+	constructor(ctx: TableExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableExprFunction) {
+			return visitor.visitTableExprFunction(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class TableExprSubqueryContext extends TableExprContext {
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public selectSetStmt(): SelectSetStmtContext {
+		return this.getRuleContext(0, SelectSetStmtContext);
+	}
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	constructor(ctx: TableExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableExprSubquery) {
+			return visitor.visitTableExprSubquery(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class TableExprAliasContext extends TableExprContext {
+	public tableExpr(): TableExprContext {
+		return this.getRuleContext(0, TableExprContext);
+	}
+	public alias(): AliasContext | undefined {
+		return this.tryGetRuleContext(0, AliasContext);
+	}
+	public AS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.AS, 0); }
+	public identifier(): IdentifierContext | undefined {
+		return this.tryGetRuleContext(0, IdentifierContext);
+	}
+	constructor(ctx: TableExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableExprAlias) {
+			return visitor.visitTableExprAlias(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class TableExprTagContext extends TableExprContext {
+	public tSQLxTagElement(): TSQLxTagElementContext {
+		return this.getRuleContext(0, TSQLxTagElementContext);
+	}
+	constructor(ctx: TableExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableExprTag) {
+			return visitor.visitTableExprTag(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+export class TableExprPlaceholderContext extends TableExprContext {
+	public placeholder(): PlaceholderContext {
+		return this.getRuleContext(0, PlaceholderContext);
+	}
+	constructor(ctx: TableExprContext) {
+		super(ctx.parent, ctx.invokingState);
+		this.copyFrom(ctx);
+	}
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableExprPlaceholder) {
+			return visitor.visitTableExprPlaceholder(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TableFunctionExprContext extends ParserRuleContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	public LPAREN(): TerminalNode { return this.getToken(TSQLParser.LPAREN, 0); }
+	public RPAREN(): TerminalNode { return this.getToken(TSQLParser.RPAREN, 0); }
+	public tableArgList(): TableArgListContext | undefined {
+		return this.tryGetRuleContext(0, TableArgListContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tableFunctionExpr; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableFunctionExpr) {
+			return visitor.visitTableFunctionExpr(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TableIdentifierContext extends ParserRuleContext {
+	public nestedIdentifier(): NestedIdentifierContext {
+		return this.getRuleContext(0, NestedIdentifierContext);
+	}
+	public databaseIdentifier(): DatabaseIdentifierContext | undefined {
+		return this.tryGetRuleContext(0, DatabaseIdentifierContext);
+	}
+	public DOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DOT, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tableIdentifier; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableIdentifier) {
+			return visitor.visitTableIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TableArgListContext extends ParserRuleContext {
+	public columnExpr(): ColumnExprContext[];
+	public columnExpr(i: number): ColumnExprContext;
+	public columnExpr(i?: number): ColumnExprContext | ColumnExprContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(ColumnExprContext);
+		} else {
+			return this.getRuleContext(i, ColumnExprContext);
+		}
+	}
+	public COMMA(): TerminalNode[];
+	public COMMA(i: number): TerminalNode;
+	public COMMA(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.COMMA);
+		} else {
+			return this.getToken(TSQLParser.COMMA, i);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_tableArgList; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTableArgList) {
+			return visitor.visitTableArgList(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class DatabaseIdentifierContext extends ParserRuleContext {
+	public identifier(): IdentifierContext {
+		return this.getRuleContext(0, IdentifierContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_databaseIdentifier; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitDatabaseIdentifier) {
+			return visitor.visitDatabaseIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class FloatingLiteralContext extends ParserRuleContext {
+	public FLOATING_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FLOATING_LITERAL, 0); }
+	public DOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DOT, 0); }
+	public DECIMAL_LITERAL(): TerminalNode[];
+	public DECIMAL_LITERAL(i: number): TerminalNode;
+	public DECIMAL_LITERAL(i?: number): TerminalNode | TerminalNode[] {
+		if (i === undefined) {
+			return this.getTokens(TSQLParser.DECIMAL_LITERAL);
+		} else {
+			return this.getToken(TSQLParser.DECIMAL_LITERAL, i);
+		}
+	}
+	public OCTAL_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OCTAL_LITERAL, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_floatingLiteral; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitFloatingLiteral) {
+			return visitor.visitFloatingLiteral(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class NumberLiteralContext extends ParserRuleContext {
+	public floatingLiteral(): FloatingLiteralContext | undefined {
+		return this.tryGetRuleContext(0, FloatingLiteralContext);
+	}
+	public OCTAL_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OCTAL_LITERAL, 0); }
+	public DECIMAL_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DECIMAL_LITERAL, 0); }
+	public HEXADECIMAL_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.HEXADECIMAL_LITERAL, 0); }
+	public INF(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.INF, 0); }
+	public NAN_SQL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NAN_SQL, 0); }
+	public PLUS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PLUS, 0); }
+	public DASH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DASH, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_numberLiteral; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitNumberLiteral) {
+			return visitor.visitNumberLiteral(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class LiteralContext extends ParserRuleContext {
+	public numberLiteral(): NumberLiteralContext | undefined {
+		return this.tryGetRuleContext(0, NumberLiteralContext);
+	}
+	public STRING_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.STRING_LITERAL, 0); }
+	public NULL_SQL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NULL_SQL, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_literal; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitLiteral) {
+			return visitor.visitLiteral(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class IntervalContext extends ParserRuleContext {
+	public SECOND(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SECOND, 0); }
+	public MINUTE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.MINUTE, 0); }
+	public HOUR(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.HOUR, 0); }
+	public DAY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DAY, 0); }
+	public WEEK(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WEEK, 0); }
+	public MONTH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.MONTH, 0); }
+	public QUARTER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.QUARTER, 0); }
+	public YEAR(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.YEAR, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_interval; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitInterval) {
+			return visitor.visitInterval(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class KeywordContext extends ParserRuleContext {
+	public ALL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ALL, 0); }
+	public AND(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.AND, 0); }
+	public ANTI(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ANTI, 0); }
+	public ANY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ANY, 0); }
+	public ARRAY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ARRAY, 0); }
+	public AS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.AS, 0); }
+	public ASCENDING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ASCENDING, 0); }
+	public ASOF(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ASOF, 0); }
+	public BETWEEN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.BETWEEN, 0); }
+	public BOTH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.BOTH, 0); }
+	public BY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.BY, 0); }
+	public CASE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CASE, 0); }
+	public CAST(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CAST, 0); }
+	public COHORT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COHORT, 0); }
+	public COLLATE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.COLLATE, 0); }
+	public CROSS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CROSS, 0); }
+	public CUBE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CUBE, 0); }
+	public CURRENT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.CURRENT, 0); }
+	public DATE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DATE, 0); }
+	public DESC(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DESC, 0); }
+	public DESCENDING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DESCENDING, 0); }
+	public DISTINCT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DISTINCT, 0); }
+	public ELSE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ELSE, 0); }
+	public END(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.END, 0); }
+	public EXTRACT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.EXTRACT, 0); }
+	public FINAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FINAL, 0); }
+	public FIRST(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FIRST, 0); }
+	public FOR(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FOR, 0); }
+	public FOLLOWING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FOLLOWING, 0); }
+	public FROM(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FROM, 0); }
+	public FULL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FULL, 0); }
+	public GROUP(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.GROUP, 0); }
+	public HAVING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.HAVING, 0); }
+	public ID(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ID, 0); }
+	public IS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IS, 0); }
+	public IF(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IF, 0); }
+	public ILIKE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ILIKE, 0); }
+	public IN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IN, 0); }
+	public INNER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.INNER, 0); }
+	public INTERVAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.INTERVAL, 0); }
+	public JOIN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.JOIN, 0); }
+	public KEY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.KEY, 0); }
+	public LAST(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LAST, 0); }
+	public LEADING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LEADING, 0); }
+	public LEFT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LEFT, 0); }
+	public LIKE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LIKE, 0); }
+	public LIMIT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.LIMIT, 0); }
+	public NOT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NOT, 0); }
+	public NULLS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.NULLS, 0); }
+	public OFFSET(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OFFSET, 0); }
+	public ON(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ON, 0); }
+	public OR(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OR, 0); }
+	public ORDER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ORDER, 0); }
+	public OUTER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OUTER, 0); }
+	public OVER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.OVER, 0); }
+	public PARTITION(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PARTITION, 0); }
+	public PRECEDING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PRECEDING, 0); }
+	public PREWHERE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.PREWHERE, 0); }
+	public RANGE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RANGE, 0); }
+	public RETURN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RETURN, 0); }
+	public RIGHT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RIGHT, 0); }
+	public ROLLUP(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROLLUP, 0); }
+	public ROW(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROW, 0); }
+	public ROWS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ROWS, 0); }
+	public SAMPLE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SAMPLE, 0); }
+	public SELECT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SELECT, 0); }
+	public SEMI(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SEMI, 0); }
+	public SETTINGS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SETTINGS, 0); }
+	public SUBSTRING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.SUBSTRING, 0); }
+	public THEN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.THEN, 0); }
+	public TIES(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TIES, 0); }
+	public TIMESTAMP(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TIMESTAMP, 0); }
+	public TOTALS(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TOTALS, 0); }
+	public TRAILING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TRAILING, 0); }
+	public TRIM(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TRIM, 0); }
+	public TRUNCATE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TRUNCATE, 0); }
+	public TO(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TO, 0); }
+	public TOP(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.TOP, 0); }
+	public UNBOUNDED(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.UNBOUNDED, 0); }
+	public UNION(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.UNION, 0); }
+	public USING(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.USING, 0); }
+	public WHEN(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WHEN, 0); }
+	public WHERE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WHERE, 0); }
+	public WINDOW(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WINDOW, 0); }
+	public WITH(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.WITH, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_keyword; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitKeyword) {
+			return visitor.visitKeyword(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class KeywordForAliasContext extends ParserRuleContext {
+	public DATE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.DATE, 0); }
+	public FIRST(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FIRST, 0); }
+	public ID(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.ID, 0); }
+	public KEY(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.KEY, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_keywordForAlias; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitKeywordForAlias) {
+			return visitor.visitKeywordForAlias(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class AliasContext extends ParserRuleContext {
+	public IDENTIFIER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IDENTIFIER, 0); }
+	public keywordForAlias(): KeywordForAliasContext | undefined {
+		return this.tryGetRuleContext(0, KeywordForAliasContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_alias; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitAlias) {
+			return visitor.visitAlias(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class IdentifierContext extends ParserRuleContext {
+	public IDENTIFIER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.IDENTIFIER, 0); }
+	public interval(): IntervalContext | undefined {
+		return this.tryGetRuleContext(0, IntervalContext);
+	}
+	public keyword(): KeywordContext | undefined {
+		return this.tryGetRuleContext(0, KeywordContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_identifier; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitIdentifier) {
+			return visitor.visitIdentifier(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class EnumValueContext extends ParserRuleContext {
+	public string(): StringContext {
+		return this.getRuleContext(0, StringContext);
+	}
+	public EQ_SINGLE(): TerminalNode { return this.getToken(TSQLParser.EQ_SINGLE, 0); }
+	public numberLiteral(): NumberLiteralContext {
+		return this.getRuleContext(0, NumberLiteralContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_enumValue; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitEnumValue) {
+			return visitor.visitEnumValue(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class PlaceholderContext extends ParserRuleContext {
+	public LBRACE(): TerminalNode { return this.getToken(TSQLParser.LBRACE, 0); }
+	public columnExpr(): ColumnExprContext {
+		return this.getRuleContext(0, ColumnExprContext);
+	}
+	public RBRACE(): TerminalNode { return this.getToken(TSQLParser.RBRACE, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_placeholder; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitPlaceholder) {
+			return visitor.visitPlaceholder(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class StringContext extends ParserRuleContext {
+	public STRING_LITERAL(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.STRING_LITERAL, 0); }
+	public templateString(): TemplateStringContext | undefined {
+		return this.tryGetRuleContext(0, TemplateStringContext);
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_string; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitString) {
+			return visitor.visitString(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class TemplateStringContext extends ParserRuleContext {
+	public QUOTE_SINGLE_TEMPLATE(): TerminalNode { return this.getToken(TSQLParser.QUOTE_SINGLE_TEMPLATE, 0); }
+	public QUOTE_SINGLE(): TerminalNode { return this.getToken(TSQLParser.QUOTE_SINGLE, 0); }
+	public stringContents(): StringContentsContext[];
+	public stringContents(i: number): StringContentsContext;
+	public stringContents(i?: number): StringContentsContext | StringContentsContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(StringContentsContext);
+		} else {
+			return this.getRuleContext(i, StringContentsContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_templateString; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitTemplateString) {
+			return visitor.visitTemplateString(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class StringContentsContext extends ParserRuleContext {
+	public STRING_ESCAPE_TRIGGER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.STRING_ESCAPE_TRIGGER, 0); }
+	public columnExpr(): ColumnExprContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprContext);
+	}
+	public RBRACE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RBRACE, 0); }
+	public STRING_TEXT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.STRING_TEXT, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_stringContents; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitStringContents) {
+			return visitor.visitStringContents(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class FullTemplateStringContext extends ParserRuleContext {
+	public QUOTE_SINGLE_TEMPLATE_FULL(): TerminalNode { return this.getToken(TSQLParser.QUOTE_SINGLE_TEMPLATE_FULL, 0); }
+	public EOF(): TerminalNode { return this.getToken(TSQLParser.EOF, 0); }
+	public stringContentsFull(): StringContentsFullContext[];
+	public stringContentsFull(i: number): StringContentsFullContext;
+	public stringContentsFull(i?: number): StringContentsFullContext | StringContentsFullContext[] {
+		if (i === undefined) {
+			return this.getRuleContexts(StringContentsFullContext);
+		} else {
+			return this.getRuleContext(i, StringContentsFullContext);
+		}
+	}
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_fullTemplateString; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitFullTemplateString) {
+			return visitor.visitFullTemplateString(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
+export class StringContentsFullContext extends ParserRuleContext {
+	public FULL_STRING_ESCAPE_TRIGGER(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FULL_STRING_ESCAPE_TRIGGER, 0); }
+	public columnExpr(): ColumnExprContext | undefined {
+		return this.tryGetRuleContext(0, ColumnExprContext);
+	}
+	public RBRACE(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.RBRACE, 0); }
+	public FULL_STRING_TEXT(): TerminalNode | undefined { return this.tryGetToken(TSQLParser.FULL_STRING_TEXT, 0); }
+	constructor(parent: ParserRuleContext | undefined, invokingState: number) {
+		super(parent, invokingState);
+	}
+	// @Override
+	public get ruleIndex(): number { return TSQLParser.RULE_stringContentsFull; }
+	// @Override
+	public accept<Result>(visitor: TSQLParserVisitor<Result>): Result {
+		if (visitor.visitStringContentsFull) {
+			return visitor.visitStringContentsFull(this);
+		} else {
+			return visitor.visitChildren(this);
+		}
+	}
+}
+
+
diff --git a/internal-packages/tsql/src/grammar/TSQLParserVisitor.ts b/internal-packages/tsql/src/grammar/TSQLParserVisitor.ts
new file mode 100644
index 00000000000..a562330bc58
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/TSQLParserVisitor.ts
@@ -0,0 +1,1312 @@
+// Generated from src/grammar/TSQLParser.g4 by ANTLR 4.9.0-SNAPSHOT
+
+
+import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
+
+import { JoinOpInnerContext } from "./TSQLParser";
+import { JoinOpLeftRightContext } from "./TSQLParser";
+import { JoinOpFullContext } from "./TSQLParser";
+import { ColumnExprCaseContext } from "./TSQLParser";
+import { ColumnExprCastContext } from "./TSQLParser";
+import { ColumnExprDateContext } from "./TSQLParser";
+import { ColumnExprIntervalStringContext } from "./TSQLParser";
+import { ColumnExprIntervalContext } from "./TSQLParser";
+import { ColumnExprSubstringContext } from "./TSQLParser";
+import { ColumnExprTimestampContext } from "./TSQLParser";
+import { ColumnExprTrimContext } from "./TSQLParser";
+import { ColumnExprWinFunctionContext } from "./TSQLParser";
+import { ColumnExprWinFunctionTargetContext } from "./TSQLParser";
+import { ColumnExprFunctionContext } from "./TSQLParser";
+import { ColumnExprCallSelectContext } from "./TSQLParser";
+import { ColumnExprCallContext } from "./TSQLParser";
+import { ColumnExprTagElementContext } from "./TSQLParser";
+import { ColumnExprTemplateStringContext } from "./TSQLParser";
+import { ColumnExprLiteralContext } from "./TSQLParser";
+import { ColumnExprArrayAccessContext } from "./TSQLParser";
+import { ColumnExprTupleAccessContext } from "./TSQLParser";
+import { ColumnExprPropertyAccessContext } from "./TSQLParser";
+import { ColumnExprNullArrayAccessContext } from "./TSQLParser";
+import { ColumnExprNullTupleAccessContext } from "./TSQLParser";
+import { ColumnExprNullPropertyAccessContext } from "./TSQLParser";
+import { ColumnExprNegateContext } from "./TSQLParser";
+import { ColumnExprPrecedence1Context } from "./TSQLParser";
+import { ColumnExprPrecedence2Context } from "./TSQLParser";
+import { ColumnExprPrecedence3Context } from "./TSQLParser";
+import { ColumnExprIsNullContext } from "./TSQLParser";
+import { ColumnExprNullishContext } from "./TSQLParser";
+import { ColumnExprNotContext } from "./TSQLParser";
+import { ColumnExprAndContext } from "./TSQLParser";
+import { ColumnExprOrContext } from "./TSQLParser";
+import { ColumnExprBetweenContext } from "./TSQLParser";
+import { ColumnExprTernaryOpContext } from "./TSQLParser";
+import { ColumnExprAliasContext } from "./TSQLParser";
+import { ColumnExprAsteriskContext } from "./TSQLParser";
+import { ColumnExprSubqueryContext } from "./TSQLParser";
+import { ColumnExprParensContext } from "./TSQLParser";
+import { ColumnExprTupleContext } from "./TSQLParser";
+import { ColumnExprArrayContext } from "./TSQLParser";
+import { ColumnExprDictContext } from "./TSQLParser";
+import { ColumnExprLambdaContext } from "./TSQLParser";
+import { ColumnExprIdentifierContext } from "./TSQLParser";
+import { TableExprIdentifierContext } from "./TSQLParser";
+import { TableExprFunctionContext } from "./TSQLParser";
+import { TableExprSubqueryContext } from "./TSQLParser";
+import { TableExprAliasContext } from "./TSQLParser";
+import { TableExprTagContext } from "./TSQLParser";
+import { TableExprPlaceholderContext } from "./TSQLParser";
+import { WithExprSubqueryContext } from "./TSQLParser";
+import { WithExprColumnContext } from "./TSQLParser";
+import { JoinExprOpContext } from "./TSQLParser";
+import { JoinExprCrossOpContext } from "./TSQLParser";
+import { JoinExprTableContext } from "./TSQLParser";
+import { JoinExprParensContext } from "./TSQLParser";
+import { FrameStartContext } from "./TSQLParser";
+import { FrameBetweenContext } from "./TSQLParser";
+import { ColumnTypeExprSimpleContext } from "./TSQLParser";
+import { ColumnTypeExprNestedContext } from "./TSQLParser";
+import { ColumnTypeExprEnumContext } from "./TSQLParser";
+import { ColumnTypeExprComplexContext } from "./TSQLParser";
+import { ColumnTypeExprParamContext } from "./TSQLParser";
+import { ProgramContext } from "./TSQLParser";
+import { DeclarationContext } from "./TSQLParser";
+import { ExpressionContext } from "./TSQLParser";
+import { VarDeclContext } from "./TSQLParser";
+import { IdentifierListContext } from "./TSQLParser";
+import { StatementContext } from "./TSQLParser";
+import { ReturnStmtContext } from "./TSQLParser";
+import { ThrowStmtContext } from "./TSQLParser";
+import { CatchBlockContext } from "./TSQLParser";
+import { TryCatchStmtContext } from "./TSQLParser";
+import { IfStmtContext } from "./TSQLParser";
+import { WhileStmtContext } from "./TSQLParser";
+import { ForStmtContext } from "./TSQLParser";
+import { ForInStmtContext } from "./TSQLParser";
+import { FuncStmtContext } from "./TSQLParser";
+import { VarAssignmentContext } from "./TSQLParser";
+import { ExprStmtContext } from "./TSQLParser";
+import { EmptyStmtContext } from "./TSQLParser";
+import { BlockContext } from "./TSQLParser";
+import { KvPairContext } from "./TSQLParser";
+import { KvPairListContext } from "./TSQLParser";
+import { SelectContext } from "./TSQLParser";
+import { SelectStmtWithParensContext } from "./TSQLParser";
+import { SubsequentSelectSetClauseContext } from "./TSQLParser";
+import { SelectSetStmtContext } from "./TSQLParser";
+import { SelectStmtContext } from "./TSQLParser";
+import { WithClauseContext } from "./TSQLParser";
+import { TopClauseContext } from "./TSQLParser";
+import { FromClauseContext } from "./TSQLParser";
+import { ArrayJoinClauseContext } from "./TSQLParser";
+import { WindowClauseContext } from "./TSQLParser";
+import { PrewhereClauseContext } from "./TSQLParser";
+import { WhereClauseContext } from "./TSQLParser";
+import { GroupByClauseContext } from "./TSQLParser";
+import { HavingClauseContext } from "./TSQLParser";
+import { OrderByClauseContext } from "./TSQLParser";
+import { ProjectionOrderByClauseContext } from "./TSQLParser";
+import { LimitByClauseContext } from "./TSQLParser";
+import { LimitAndOffsetClauseContext } from "./TSQLParser";
+import { OffsetOnlyClauseContext } from "./TSQLParser";
+import { SettingsClauseContext } from "./TSQLParser";
+import { JoinExprContext } from "./TSQLParser";
+import { JoinOpContext } from "./TSQLParser";
+import { JoinOpCrossContext } from "./TSQLParser";
+import { JoinConstraintClauseContext } from "./TSQLParser";
+import { SampleClauseContext } from "./TSQLParser";
+import { LimitExprContext } from "./TSQLParser";
+import { OrderExprListContext } from "./TSQLParser";
+import { OrderExprContext } from "./TSQLParser";
+import { RatioExprContext } from "./TSQLParser";
+import { SettingExprListContext } from "./TSQLParser";
+import { SettingExprContext } from "./TSQLParser";
+import { WindowExprContext } from "./TSQLParser";
+import { WinPartitionByClauseContext } from "./TSQLParser";
+import { WinOrderByClauseContext } from "./TSQLParser";
+import { WinFrameClauseContext } from "./TSQLParser";
+import { WinFrameExtendContext } from "./TSQLParser";
+import { WinFrameBoundContext } from "./TSQLParser";
+import { ExprContext } from "./TSQLParser";
+import { ColumnTypeExprContext } from "./TSQLParser";
+import { ColumnExprListContext } from "./TSQLParser";
+import { ColumnExprContext } from "./TSQLParser";
+import { ColumnLambdaExprContext } from "./TSQLParser";
+import { TSQLxChildElementContext } from "./TSQLParser";
+import { TSQLxTagElementContext } from "./TSQLParser";
+import { TSQLxTagAttributeContext } from "./TSQLParser";
+import { WithExprListContext } from "./TSQLParser";
+import { WithExprContext } from "./TSQLParser";
+import { ColumnIdentifierContext } from "./TSQLParser";
+import { NestedIdentifierContext } from "./TSQLParser";
+import { TableExprContext } from "./TSQLParser";
+import { TableFunctionExprContext } from "./TSQLParser";
+import { TableIdentifierContext } from "./TSQLParser";
+import { TableArgListContext } from "./TSQLParser";
+import { DatabaseIdentifierContext } from "./TSQLParser";
+import { FloatingLiteralContext } from "./TSQLParser";
+import { NumberLiteralContext } from "./TSQLParser";
+import { LiteralContext } from "./TSQLParser";
+import { IntervalContext } from "./TSQLParser";
+import { KeywordContext } from "./TSQLParser";
+import { KeywordForAliasContext } from "./TSQLParser";
+import { AliasContext } from "./TSQLParser";
+import { IdentifierContext } from "./TSQLParser";
+import { EnumValueContext } from "./TSQLParser";
+import { PlaceholderContext } from "./TSQLParser";
+import { StringContext } from "./TSQLParser";
+import { TemplateStringContext } from "./TSQLParser";
+import { StringContentsContext } from "./TSQLParser";
+import { FullTemplateStringContext } from "./TSQLParser";
+import { StringContentsFullContext } from "./TSQLParser";
+
+
+/**
+ * This interface defines a complete generic visitor for a parse tree produced
+ * by `TSQLParser`.
+ *
+ * @param <Result> The return type of the visit operation. Use `void` for
+ * operations with no return type.
+ */
+export interface TSQLParserVisitor<Result> extends ParseTreeVisitor<Result> {
+	/**
+	 * Visit a parse tree produced by the `JoinOpInner`
+	 * labeled alternative in `TSQLParser.joinOp`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinOpInner?: (ctx: JoinOpInnerContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `JoinOpLeftRight`
+	 * labeled alternative in `TSQLParser.joinOp`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinOpLeftRight?: (ctx: JoinOpLeftRightContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `JoinOpFull`
+	 * labeled alternative in `TSQLParser.joinOp`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinOpFull?: (ctx: JoinOpFullContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprCase`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprCase?: (ctx: ColumnExprCaseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprCast`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprCast?: (ctx: ColumnExprCastContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprDate`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprDate?: (ctx: ColumnExprDateContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprIntervalString`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprIntervalString?: (ctx: ColumnExprIntervalStringContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprInterval`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprInterval?: (ctx: ColumnExprIntervalContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprSubstring`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprSubstring?: (ctx: ColumnExprSubstringContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTimestamp`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTimestamp?: (ctx: ColumnExprTimestampContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTrim`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTrim?: (ctx: ColumnExprTrimContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprWinFunction`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprWinFunction?: (ctx: ColumnExprWinFunctionContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprWinFunctionTarget`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprWinFunctionTarget?: (ctx: ColumnExprWinFunctionTargetContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprFunction`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprFunction?: (ctx: ColumnExprFunctionContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprCallSelect`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprCallSelect?: (ctx: ColumnExprCallSelectContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprCall`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprCall?: (ctx: ColumnExprCallContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTagElement`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTagElement?: (ctx: ColumnExprTagElementContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTemplateString`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTemplateString?: (ctx: ColumnExprTemplateStringContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprLiteral`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprLiteral?: (ctx: ColumnExprLiteralContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprArrayAccess`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprArrayAccess?: (ctx: ColumnExprArrayAccessContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTupleAccess`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTupleAccess?: (ctx: ColumnExprTupleAccessContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprPropertyAccess`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprPropertyAccess?: (ctx: ColumnExprPropertyAccessContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprNullArrayAccess`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprNullArrayAccess?: (ctx: ColumnExprNullArrayAccessContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprNullTupleAccess`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprNullTupleAccess?: (ctx: ColumnExprNullTupleAccessContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprNullPropertyAccess`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprNullPropertyAccess?: (ctx: ColumnExprNullPropertyAccessContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprNegate`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprNegate?: (ctx: ColumnExprNegateContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprPrecedence1`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprPrecedence1?: (ctx: ColumnExprPrecedence1Context) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprPrecedence2`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprPrecedence2?: (ctx: ColumnExprPrecedence2Context) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprPrecedence3`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprPrecedence3?: (ctx: ColumnExprPrecedence3Context) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprIsNull`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprIsNull?: (ctx: ColumnExprIsNullContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprNullish`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprNullish?: (ctx: ColumnExprNullishContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprNot`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprNot?: (ctx: ColumnExprNotContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprAnd`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprAnd?: (ctx: ColumnExprAndContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprOr`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprOr?: (ctx: ColumnExprOrContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprBetween`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprBetween?: (ctx: ColumnExprBetweenContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTernaryOp`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTernaryOp?: (ctx: ColumnExprTernaryOpContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprAlias`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprAlias?: (ctx: ColumnExprAliasContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprAsterisk`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprAsterisk?: (ctx: ColumnExprAsteriskContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprSubquery`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprSubquery?: (ctx: ColumnExprSubqueryContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprParens`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprParens?: (ctx: ColumnExprParensContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprTuple`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprTuple?: (ctx: ColumnExprTupleContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprArray`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprArray?: (ctx: ColumnExprArrayContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprDict`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprDict?: (ctx: ColumnExprDictContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprLambda`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprLambda?: (ctx: ColumnExprLambdaContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnExprIdentifier`
+	 * labeled alternative in `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprIdentifier?: (ctx: ColumnExprIdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `TableExprIdentifier`
+	 * labeled alternative in `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExprIdentifier?: (ctx: TableExprIdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `TableExprFunction`
+	 * labeled alternative in `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExprFunction?: (ctx: TableExprFunctionContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `TableExprSubquery`
+	 * labeled alternative in `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExprSubquery?: (ctx: TableExprSubqueryContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `TableExprAlias`
+	 * labeled alternative in `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExprAlias?: (ctx: TableExprAliasContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `TableExprTag`
+	 * labeled alternative in `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExprTag?: (ctx: TableExprTagContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `TableExprPlaceholder`
+	 * labeled alternative in `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExprPlaceholder?: (ctx: TableExprPlaceholderContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `WithExprSubquery`
+	 * labeled alternative in `TSQLParser.withExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWithExprSubquery?: (ctx: WithExprSubqueryContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `WithExprColumn`
+	 * labeled alternative in `TSQLParser.withExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWithExprColumn?: (ctx: WithExprColumnContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `JoinExprOp`
+	 * labeled alternative in `TSQLParser.joinExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinExprOp?: (ctx: JoinExprOpContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `JoinExprCrossOp`
+	 * labeled alternative in `TSQLParser.joinExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinExprCrossOp?: (ctx: JoinExprCrossOpContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `JoinExprTable`
+	 * labeled alternative in `TSQLParser.joinExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinExprTable?: (ctx: JoinExprTableContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `JoinExprParens`
+	 * labeled alternative in `TSQLParser.joinExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinExprParens?: (ctx: JoinExprParensContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `frameStart`
+	 * labeled alternative in `TSQLParser.winFrameExtend`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitFrameStart?: (ctx: FrameStartContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `frameBetween`
+	 * labeled alternative in `TSQLParser.winFrameExtend`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitFrameBetween?: (ctx: FrameBetweenContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnTypeExprSimple`
+	 * labeled alternative in `TSQLParser.columnTypeExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnTypeExprSimple?: (ctx: ColumnTypeExprSimpleContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnTypeExprNested`
+	 * labeled alternative in `TSQLParser.columnTypeExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnTypeExprNested?: (ctx: ColumnTypeExprNestedContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnTypeExprEnum`
+	 * labeled alternative in `TSQLParser.columnTypeExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnTypeExprEnum?: (ctx: ColumnTypeExprEnumContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnTypeExprComplex`
+	 * labeled alternative in `TSQLParser.columnTypeExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnTypeExprComplex?: (ctx: ColumnTypeExprComplexContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by the `ColumnTypeExprParam`
+	 * labeled alternative in `TSQLParser.columnTypeExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnTypeExprParam?: (ctx: ColumnTypeExprParamContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.program`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitProgram?: (ctx: ProgramContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.declaration`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitDeclaration?: (ctx: DeclarationContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.expression`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitExpression?: (ctx: ExpressionContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.varDecl`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitVarDecl?: (ctx: VarDeclContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.identifierList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitIdentifierList?: (ctx: IdentifierListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.statement`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitStatement?: (ctx: StatementContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.returnStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitReturnStmt?: (ctx: ReturnStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.throwStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitThrowStmt?: (ctx: ThrowStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.catchBlock`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitCatchBlock?: (ctx: CatchBlockContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tryCatchStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTryCatchStmt?: (ctx: TryCatchStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.ifStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitIfStmt?: (ctx: IfStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.whileStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWhileStmt?: (ctx: WhileStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.forStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitForStmt?: (ctx: ForStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.forInStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitForInStmt?: (ctx: ForInStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.funcStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitFuncStmt?: (ctx: FuncStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.varAssignment`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitVarAssignment?: (ctx: VarAssignmentContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.exprStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitExprStmt?: (ctx: ExprStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.emptyStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitEmptyStmt?: (ctx: EmptyStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.block`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitBlock?: (ctx: BlockContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.kvPair`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitKvPair?: (ctx: KvPairContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.kvPairList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitKvPairList?: (ctx: KvPairListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.select`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSelect?: (ctx: SelectContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.selectStmtWithParens`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSelectStmtWithParens?: (ctx: SelectStmtWithParensContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.subsequentSelectSetClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSubsequentSelectSetClause?: (ctx: SubsequentSelectSetClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.selectSetStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSelectSetStmt?: (ctx: SelectSetStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.selectStmt`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSelectStmt?: (ctx: SelectStmtContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.withClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWithClause?: (ctx: WithClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.topClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTopClause?: (ctx: TopClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.fromClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitFromClause?: (ctx: FromClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.arrayJoinClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitArrayJoinClause?: (ctx: ArrayJoinClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.windowClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWindowClause?: (ctx: WindowClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.prewhereClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitPrewhereClause?: (ctx: PrewhereClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.whereClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWhereClause?: (ctx: WhereClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.groupByClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitGroupByClause?: (ctx: GroupByClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.havingClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitHavingClause?: (ctx: HavingClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.orderByClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitOrderByClause?: (ctx: OrderByClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.projectionOrderByClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitProjectionOrderByClause?: (ctx: ProjectionOrderByClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.limitByClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitLimitByClause?: (ctx: LimitByClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.limitAndOffsetClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitLimitAndOffsetClause?: (ctx: LimitAndOffsetClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.offsetOnlyClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitOffsetOnlyClause?: (ctx: OffsetOnlyClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.settingsClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSettingsClause?: (ctx: SettingsClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.joinExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinExpr?: (ctx: JoinExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.joinOp`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinOp?: (ctx: JoinOpContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.joinOpCross`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinOpCross?: (ctx: JoinOpCrossContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.joinConstraintClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitJoinConstraintClause?: (ctx: JoinConstraintClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.sampleClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSampleClause?: (ctx: SampleClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.limitExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitLimitExpr?: (ctx: LimitExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.orderExprList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitOrderExprList?: (ctx: OrderExprListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.orderExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitOrderExpr?: (ctx: OrderExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.ratioExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitRatioExpr?: (ctx: RatioExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.settingExprList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSettingExprList?: (ctx: SettingExprListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.settingExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitSettingExpr?: (ctx: SettingExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.windowExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWindowExpr?: (ctx: WindowExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.winPartitionByClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWinPartitionByClause?: (ctx: WinPartitionByClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.winOrderByClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWinOrderByClause?: (ctx: WinOrderByClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.winFrameClause`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWinFrameClause?: (ctx: WinFrameClauseContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.winFrameExtend`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWinFrameExtend?: (ctx: WinFrameExtendContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.winFrameBound`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWinFrameBound?: (ctx: WinFrameBoundContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.expr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitExpr?: (ctx: ExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.columnTypeExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnTypeExpr?: (ctx: ColumnTypeExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.columnExprList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExprList?: (ctx: ColumnExprListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.columnExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnExpr?: (ctx: ColumnExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.columnLambdaExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnLambdaExpr?: (ctx: ColumnLambdaExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tSQLxChildElement`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTSQLxChildElement?: (ctx: TSQLxChildElementContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tSQLxTagElement`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTSQLxTagElement?: (ctx: TSQLxTagElementContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tSQLxTagAttribute`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTSQLxTagAttribute?: (ctx: TSQLxTagAttributeContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.withExprList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWithExprList?: (ctx: WithExprListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.withExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitWithExpr?: (ctx: WithExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.columnIdentifier`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitColumnIdentifier?: (ctx: ColumnIdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.nestedIdentifier`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitNestedIdentifier?: (ctx: NestedIdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tableExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableExpr?: (ctx: TableExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tableFunctionExpr`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableFunctionExpr?: (ctx: TableFunctionExprContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tableIdentifier`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableIdentifier?: (ctx: TableIdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.tableArgList`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTableArgList?: (ctx: TableArgListContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.databaseIdentifier`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitDatabaseIdentifier?: (ctx: DatabaseIdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.floatingLiteral`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitFloatingLiteral?: (ctx: FloatingLiteralContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.numberLiteral`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitNumberLiteral?: (ctx: NumberLiteralContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.literal`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitLiteral?: (ctx: LiteralContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.interval`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitInterval?: (ctx: IntervalContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.keyword`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitKeyword?: (ctx: KeywordContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.keywordForAlias`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitKeywordForAlias?: (ctx: KeywordForAliasContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.alias`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitAlias?: (ctx: AliasContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.identifier`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitIdentifier?: (ctx: IdentifierContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.enumValue`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitEnumValue?: (ctx: EnumValueContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.placeholder`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitPlaceholder?: (ctx: PlaceholderContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.string`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitString?: (ctx: StringContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.templateString`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitTemplateString?: (ctx: TemplateStringContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.stringContents`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitStringContents?: (ctx: StringContentsContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.fullTemplateString`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitFullTemplateString?: (ctx: FullTemplateStringContext) => Result;
+
+	/**
+	 * Visit a parse tree produced by `TSQLParser.stringContentsFull`.
+	 * @param ctx the parse tree
+	 * @return the visitor result
+	 */
+	visitStringContentsFull?: (ctx: StringContentsFullContext) => Result;
+}
+
diff --git a/internal-packages/tsql/src/grammar/parser.test.ts b/internal-packages/tsql/src/grammar/parser.test.ts
new file mode 100644
index 00000000000..fed698130f0
--- /dev/null
+++ b/internal-packages/tsql/src/grammar/parser.test.ts
@@ -0,0 +1,166 @@
+import { describe, it, expect } from "vitest";
+import { CharStreams, CommonTokenStream } from "antlr4ts";
+import { TSQLLexer } from "./TSQLLexer.js";
+import { TSQLParser } from "./TSQLParser.js";
+
+describe("TSQLParser", () => {
+  function parse(input: string) {
+    const inputStream = CharStreams.fromString(input);
+    const lexer = new TSQLLexer(inputStream);
+    const tokenStream = new CommonTokenStream(lexer);
+    const parser = new TSQLParser(tokenStream);
+    return parser;
+  }
+
+  describe("select statements", () => {
+    it("should parse a simple SELECT statement", () => {
+      const parser = parse("SELECT * FROM users;");
+      const tree = parser.select();
+
+      expect(tree).toBeDefined();
+      // The select rule can return selectStmt, selectSetStmt, or tSQLxTagElement
+      // Most SELECT statements are wrapped in selectSetStmt
+      const selectSetStmt = tree.selectSetStmt();
+      expect(selectSetStmt).toBeDefined();
+
+      // Get the underlying selectStmt from selectSetStmt -> selectStmtWithParens
+      const selectStmtWithParens = selectSetStmt!.selectStmtWithParens();
+      const selectStmt = selectStmtWithParens.selectStmt();
+
+      expect(selectStmt).toBeDefined();
+      expect(selectStmt!.SELECT()).toBeDefined();
+      expect(selectStmt!.columnExprList()).toBeDefined();
+      expect(selectStmt!.fromClause()).toBeDefined();
+    });
+
+    it("should parse SELECT with WHERE clause", () => {
+      const parser = parse("SELECT id, name FROM users WHERE id = 1;");
+      const tree = parser.select();
+
+      expect(tree).toBeDefined();
+      const selectSetStmt = tree.selectSetStmt();
+      const selectStmt = selectSetStmt!.selectStmtWithParens().selectStmt()!;
+
+      expect(selectStmt.whereClause()).toBeDefined();
+      expect(selectStmt.whereClause()!.WHERE()).toBeDefined();
+      expect(selectStmt.whereClause()!.columnExpr()).toBeDefined();
+    });
+
+    it("should parse SELECT with multiple columns", () => {
+      const parser = parse("SELECT id, name, email FROM users;");
+      const tree = parser.select();
+
+      expect(tree).toBeDefined();
+      const selectSetStmt = tree.selectSetStmt();
+      const selectStmt = selectSetStmt!.selectStmtWithParens().selectStmt()!;
+
+      const columnList = selectStmt.columnExprList();
+      expect(columnList).toBeDefined();
+      // columnExprList contains comma-separated expressions
+      expect(columnList.columnExpr().length).toBeGreaterThanOrEqual(1);
+    });
+
+    it("should parse SELECT with DISTINCT", () => {
+      const parser = parse("SELECT DISTINCT id FROM users;");
+      const tree = parser.select();
+
+      expect(tree).toBeDefined();
+      const selectSetStmt = tree.selectSetStmt();
+      const selectStmt = selectSetStmt!.selectStmtWithParens().selectStmt()!;
+
+      expect(selectStmt.DISTINCT()).toBeDefined();
+    });
+  });
+
+  describe("expressions", () => {
+    it("should parse a simple addition expression", () => {
+      const parser = parse("1 + 2");
+      const tree = parser.expr();
+
+      expect(tree).toBeDefined();
+      const columnExpr = tree.columnExpr();
+      expect(columnExpr).toBeDefined();
+      // Check that the expression has children (the operands and operator)
+      expect(columnExpr.text).toBeDefined();
+      const text = columnExpr.text;
+      expect(text).toContain("1");
+      expect(text).toContain("2");
+      expect(text).toContain("+");
+    });
+
+    it("should parse arithmetic expressions with parentheses", () => {
+      const parser = parse("(1 + 2) * 3");
+      const tree = parser.expr();
+
+      expect(tree).toBeDefined();
+      const columnExpr = tree.columnExpr();
+      expect(columnExpr).toBeDefined();
+      // The expression should contain the operators
+      const text = columnExpr.text;
+      expect(text).toContain("+");
+      expect(text).toContain("*");
+      expect(text).toContain("1");
+      expect(text).toContain("2");
+      expect(text).toContain("3");
+    });
+
+    it("should parse string literals", () => {
+      const parser = parse("'hello world'");
+      const tree = parser.expr();
+
+      expect(tree).toBeDefined();
+      const columnExpr = tree.columnExpr();
+      expect(columnExpr).toBeDefined();
+      const text = columnExpr.text;
+      expect(text).toContain("hello");
+      expect(text).toContain("world");
+    });
+
+    it("should parse numeric literals", () => {
+      const parser = parse("42");
+      const tree = parser.expr();
+
+      expect(tree).toBeDefined();
+      const columnExpr = tree.columnExpr();
+      expect(columnExpr).toBeDefined();
+      expect(columnExpr.text).toContain("42");
+    });
+  });
+
+  describe("program", () => {
+    it("should parse an empty program", () => {
+      const parser = parse("");
+      const tree = parser.program();
+
+      expect(tree).toBeDefined();
+      expect(tree.EOF()).toBeDefined();
+      expect(tree.declaration().length).toBe(0);
+    });
+
+    it("should parse variable declarations", () => {
+      const parser = parse("let x := 1");
+      const tree = parser.program();
+
+      expect(tree).toBeDefined();
+      expect(tree.declaration().length).toBe(1);
+      const declaration = tree.declaration(0);
+
+      // Check if it's a varDecl
+      const varDecl = declaration.varDecl();
+      expect(varDecl).toBeDefined();
+      expect(varDecl!.LET()).toBeDefined();
+      expect(varDecl!.identifier()).toBeDefined();
+      expect(varDecl!.expression()).toBeDefined();
+    });
+
+    it("should parse multiple declarations", () => {
+      const parser = parse("let x := 1; let y := 2");
+      const tree = parser.program();
+
+      expect(tree).toBeDefined();
+      // Count only non-empty declarations (varDecl or non-empty statements)
+      const varDecls = tree.declaration().filter((d) => d.varDecl() !== undefined);
+      expect(varDecls.length).toBe(2);
+    });
+  });
+});
diff --git a/internal-packages/tsql/src/index.test.ts b/internal-packages/tsql/src/index.test.ts
new file mode 100644
index 00000000000..7a5182668d9
--- /dev/null
+++ b/internal-packages/tsql/src/index.test.ts
@@ -0,0 +1,829 @@
+import { describe, it, expect } from "vitest";
+import {
+  compileTSQL,
+  parseTSQLSelect,
+  isColumnReferencedInExpression,
+  createFallbackExpression,
+  injectFallbackConditions,
+  type WhereClauseCondition,
+} from "./index.js";
+import { column, type TableSchema } from "./query/schema.js";
+
+/**
+ * Test table schema for enforcedWhereClause tests
+ */
+const taskRunsSchema: TableSchema = {
+  name: "task_runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    status: { name: "status", ...column("String") },
+    created_at: { name: "created_at", ...column("DateTime64") },
+    updated_at: { name: "updated_at", ...column("DateTime64") },
+    time: { name: "time", ...column("DateTime64") },
+    triggered_at: { name: "triggered_at", ...column("DateTime64") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+/**
+ * Test table schema with tenant columns (lookup table with tenant isolation)
+ */
+const lookupTableSchema: TableSchema = {
+  name: "lookup_table",
+  clickhouseName: "trigger_dev.lookup_table",
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+  columns: {
+    id: { name: "id", ...column("String") },
+    name: { name: "name", ...column("String") },
+  },
+};
+
+/**
+ * Test table schema WITHOUT tenant columns (e.g., global reference data)
+ */
+// @ts-expect-error - tenant columns are required but not set
+const nonTenantTableSchema: TableSchema = {
+  name: "reference_data",
+  clickhouseName: "trigger_dev.reference_data",
+  // No tenantColumns - this is a global table
+  columns: {
+    id: { name: "id", ...column("String") },
+    value: { name: "value", ...column("String") },
+  },
+};
+
+/**
+ * Base options with tenant isolation for tests
+ */
+const baseEnforcedWhereClause: Record<string, WhereClauseCondition> = {
+  organization_id: { op: "eq", value: "org_test123" },
+  project_id: { op: "eq", value: "proj_test456" },
+  environment_id: { op: "eq", value: "env_test789" },
+};
+
+describe("isColumnReferencedInExpression", () => {
+  it("should detect column in simple WHERE clause", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs WHERE time > '2024-01-01'");
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(true);
+      expect(isColumnReferencedInExpression(ast.where, "status")).toBe(false);
+    }
+  });
+
+  it("should detect column in AND expression", () => {
+    const ast = parseTSQLSelect(
+      "SELECT * FROM task_runs WHERE time > '2024-01-01' AND status = 'completed'"
+    );
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(true);
+      expect(isColumnReferencedInExpression(ast.where, "status")).toBe(true);
+      expect(isColumnReferencedInExpression(ast.where, "id")).toBe(false);
+    }
+  });
+
+  it("should detect column in OR expression", () => {
+    const ast = parseTSQLSelect(
+      "SELECT * FROM task_runs WHERE time > '2024-01-01' OR status = 'completed'"
+    );
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(true);
+      expect(isColumnReferencedInExpression(ast.where, "status")).toBe(true);
+    }
+  });
+
+  it("should detect column in BETWEEN expression", () => {
+    const ast = parseTSQLSelect(
+      "SELECT * FROM task_runs WHERE time BETWEEN '2024-01-01' AND '2024-12-31'"
+    );
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(true);
+      expect(isColumnReferencedInExpression(ast.where, "status")).toBe(false);
+    }
+  });
+
+  it("should detect column in qualified reference (table.column)", () => {
+    const ast = parseTSQLSelect(
+      "SELECT * FROM task_runs WHERE task_runs.time > '2024-01-01'"
+    );
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(true);
+    }
+  });
+
+  it("should return false for empty WHERE clause", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs");
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(false);
+    }
+  });
+
+  it("should detect column in nested NOT expression", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs WHERE NOT time > '2024-01-01'");
+    if (ast.expression_type === "select_query") {
+      expect(isColumnReferencedInExpression(ast.where, "time")).toBe(true);
+    }
+  });
+});
+
+describe("createFallbackExpression", () => {
+  it("should create a simple comparison expression (gt)", () => {
+    const expr = createFallbackExpression("time", { op: "gt", value: "2024-01-01" });
+    expect(expr.expression_type).toBe("compare_operation");
+  });
+
+  it("should create a simple comparison expression (eq)", () => {
+    const expr = createFallbackExpression("status", { op: "eq", value: "completed" });
+    expect(expr.expression_type).toBe("compare_operation");
+  });
+
+  it("should create a between expression", () => {
+    const expr = createFallbackExpression("time", {
+      op: "between",
+      low: "2024-01-01",
+      high: "2024-12-31",
+    });
+    expect(expr.expression_type).toBe("between_expr");
+  });
+
+  it("should convert Date values to ISO strings", () => {
+    const date = new Date("2024-06-15T12:00:00Z");
+    const expr = createFallbackExpression("time", { op: "gte", value: date });
+    expect(expr.expression_type).toBe("compare_operation");
+  });
+});
+
+describe("injectFallbackConditions", () => {
+  it("should inject fallback when column is not in WHERE", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs WHERE status = 'completed'");
+    const fallbacks: Record<string, WhereClauseCondition> = {
+      time: { op: "gte", value: "2024-01-01" },
+    };
+
+    const modified = injectFallbackConditions(ast, fallbacks);
+    if (modified.expression_type === "select_query") {
+      expect(modified.where).toBeDefined();
+      expect(isColumnReferencedInExpression(modified.where, "time")).toBe(true);
+      expect(isColumnReferencedInExpression(modified.where, "status")).toBe(true);
+    }
+  });
+
+  it("should NOT inject fallback when column is already in WHERE", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs WHERE time > '2024-06-01'");
+    const fallbacks: Record<string, WhereClauseCondition> = {
+      time: { op: "gte", value: "2024-01-01" },
+    };
+
+    const modified = injectFallbackConditions(ast, fallbacks);
+    // The WHERE clause should remain as is (no additional time condition)
+    if (modified.expression_type === "select_query" && modified.where) {
+      // It should not be an AND expression - it should be the original compare_operation
+      expect(modified.where.expression_type).toBe("compare_operation");
+    }
+  });
+
+  it("should inject fallback when query has no WHERE clause", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs LIMIT 10");
+    const fallbacks: Record<string, WhereClauseCondition> = {
+      time: { op: "gte", value: "2024-01-01" },
+    };
+
+    const modified = injectFallbackConditions(ast, fallbacks);
+    if (modified.expression_type === "select_query") {
+      expect(modified.where).toBeDefined();
+      expect(isColumnReferencedInExpression(modified.where, "time")).toBe(true);
+    }
+  });
+
+  it("should inject multiple fallbacks", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs LIMIT 10");
+    const fallbacks: Record<string, WhereClauseCondition> = {
+      time: { op: "gte", value: "2024-01-01" },
+      status: { op: "eq", value: "completed" },
+    };
+
+    const modified = injectFallbackConditions(ast, fallbacks);
+    if (modified.expression_type === "select_query") {
+      expect(modified.where).toBeDefined();
+      expect(isColumnReferencedInExpression(modified.where, "time")).toBe(true);
+      expect(isColumnReferencedInExpression(modified.where, "status")).toBe(true);
+    }
+  });
+
+  it("should only inject fallbacks for unreferenced columns", () => {
+    const ast = parseTSQLSelect("SELECT * FROM task_runs WHERE time > '2024-06-01'");
+    const fallbacks: Record<string, WhereClauseCondition> = {
+      time: { op: "gte", value: "2024-01-01" }, // Should NOT be injected
+      status: { op: "eq", value: "completed" }, // Should be injected
+    };
+
+    const modified = injectFallbackConditions(ast, fallbacks);
+    if (modified.expression_type === "select_query" && modified.where) {
+      // Should be an AND expression combining fallback status with original time
+      expect(modified.where.expression_type).toBe("and");
+    }
+  });
+});
+
+describe("compileTSQL with whereClauseFallback", () => {
+  const baseOptions = {
+    tableSchema: [taskRunsSchema],
+    enforcedWhereClause: baseEnforcedWhereClause,
+  };
+
+  describe("simple comparison fallbacks", () => {
+    it("should apply gt fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT * FROM task_runs WHERE status = 'completed'", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "gt", value: "2024-01-01" },
+        },
+      });
+
+      // Should contain a time comparison
+      expect(sql).toContain("time");
+      expect(sql).toContain("greater(");
+    });
+
+    it("should apply gte fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "gte", value: "2024-01-01" },
+        },
+      });
+
+      expect(sql).toContain("greaterOrEquals(");
+    });
+
+    it("should apply lt fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "lt", value: "2024-12-31" },
+        },
+      });
+
+      expect(sql).toContain("less(");
+    });
+
+    it("should apply lte fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "lte", value: "2024-12-31" },
+        },
+      });
+
+      expect(sql).toContain("lessOrEquals(");
+    });
+
+    it("should apply eq fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          status: { op: "eq", value: "completed" },
+        },
+      });
+
+      expect(sql).toContain("equals(");
+      expect(sql).toContain("status");
+    });
+
+    it("should apply neq fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          status: { op: "neq", value: "failed" },
+        },
+      });
+
+      expect(sql).toContain("notEquals(");
+      expect(sql).toContain("status");
+    });
+  });
+
+  describe("between fallback", () => {
+    it("should apply BETWEEN fallback when column not in WHERE", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs WHERE status = 'completed'", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "between", low: "2024-01-01", high: "2024-12-31" },
+        },
+      });
+
+      expect(sql).toContain("time BETWEEN");
+    });
+
+    it("should apply BETWEEN fallback with Date values", () => {
+      const startDate = new Date("2024-01-01T00:00:00Z");
+      const endDate = new Date("2024-12-31T23:59:59Z");
+
+      const { sql, params } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "between", low: startDate, high: endDate },
+        },
+      });
+
+      expect(sql).toContain("time BETWEEN");
+      // The dates should be converted to ISO strings and parameterized
+      expect(Object.values(params).some((v) => typeof v === "string" && v.includes("2024"))).toBe(
+        true
+      );
+    });
+  });
+
+  describe("fallback NOT applied when column already filtered", () => {
+    it("should NOT apply fallback when column is in simple WHERE", () => {
+      const { sql } = compileTSQL("SELECT * FROM task_runs WHERE time > '2024-06-01'", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "gte", value: "2024-01-01" },
+        },
+      });
+
+      // Should only have the user's time condition, not the fallback
+      // Count occurrences of time comparison - should be 1 (just the user's)
+      const timeMatches = sql.match(/greater\(.*?time/g) || [];
+      expect(timeMatches.length).toBe(1);
+    });
+
+    it("should NOT apply fallback when column is in BETWEEN expression", () => {
+      const { sql } = compileTSQL(
+        "SELECT * FROM task_runs WHERE time BETWEEN '2024-06-01' AND '2024-06-30'",
+        {
+          ...baseOptions,
+          whereClauseFallback: {
+            time: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Should have the user's BETWEEN, not the fallback gte
+      expect(sql).toContain("time BETWEEN");
+      expect(sql).not.toContain("greaterOrEquals(");
+    });
+
+    it("should NOT apply fallback when column is in AND expression", () => {
+      const { sql } = compileTSQL(
+        "SELECT * FROM task_runs WHERE status = 'completed' AND time > '2024-06-01'",
+        {
+          ...baseOptions,
+          whereClauseFallback: {
+            time: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Should only have one time comparison
+      const timeMatches = sql.match(/greater\(.*?time/g) || [];
+      expect(timeMatches.length).toBe(1);
+    });
+
+    it("should NOT apply fallback when column is in OR expression", () => {
+      const { sql } = compileTSQL(
+        "SELECT * FROM task_runs WHERE status = 'completed' OR time > '2024-06-01'",
+        {
+          ...baseOptions,
+          whereClauseFallback: {
+            time: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Fallback should not be applied since time is mentioned in OR
+      const timeGreaterMatches = sql.match(/greater\(.*?time/g) || [];
+      expect(timeGreaterMatches.length).toBe(1);
+    });
+
+    it("should NOT apply fallback when column is in qualified reference", () => {
+      const { sql } = compileTSQL(
+        "SELECT * FROM task_runs WHERE task_runs.time > '2024-06-01'",
+        {
+          ...baseOptions,
+          whereClauseFallback: {
+            time: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Fallback should not be applied
+      const timeGreaterMatches = sql.match(/greater.*time/g) || [];
+      expect(timeGreaterMatches.length).toBe(1);
+    });
+  });
+
+  describe("multiple fallbacks", () => {
+    it("should apply multiple fallbacks for different unreferenced columns", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "gte", value: "2024-01-01" },
+          status: { op: "eq", value: "completed" },
+        },
+      });
+
+      expect(sql).toContain("greaterOrEquals(");
+      expect(sql).toContain("time");
+      expect(sql).toContain("equals(");
+      expect(sql).toContain("status");
+    });
+
+    it("should only apply fallbacks for unreferenced columns when some are filtered", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs WHERE time > '2024-06-01'", {
+        ...baseOptions,
+        whereClauseFallback: {
+          time: { op: "gte", value: "2024-01-01" }, // Should NOT be applied
+          status: { op: "eq", value: "completed" }, // Should be applied
+        },
+      });
+
+      // Status fallback should be applied
+      expect(sql).toContain("equals(");
+      expect(sql).toContain("status");
+
+      // Time should only have user's condition
+      const timeGreaterMatches = sql.match(/greater\(.*?time/g) || [];
+      expect(timeGreaterMatches.length).toBe(1);
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle empty whereClauseFallback", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {},
+      });
+
+      // Should just compile normally without errors
+      expect(sql).toContain("SELECT");
+      expect(sql).toContain("FROM");
+    });
+
+    it("should handle undefined whereClauseFallback", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        // whereClauseFallback is undefined
+      });
+
+      // Should just compile normally without errors
+      expect(sql).toContain("SELECT");
+      expect(sql).toContain("FROM");
+    });
+
+    it("should work with UNION queries", () => {
+      const { sql } = compileTSQL(
+        "SELECT id FROM task_runs WHERE status = 'completed' UNION ALL SELECT id FROM task_runs WHERE status = 'failed'",
+        {
+          ...baseOptions,
+          whereClauseFallback: {
+            time: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Both queries in the UNION should have the time fallback
+      const timeMatches = sql.match(/greaterOrEquals\(.*?time/g) || [];
+      expect(timeMatches.length).toBe(2);
+    });
+
+    it("should handle numeric values in fallback", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        ...baseOptions,
+        whereClauseFallback: {
+          id: { op: "gt", value: 100 },
+        },
+      });
+
+      expect(sql).toContain("greater(");
+      expect(sql).toContain("100");
+    });
+  });
+});
+
+describe("compileTSQL with enforcedWhereClause", () => {
+  describe("validation tests", () => {
+    it("should throw error when required tenant column is missing", () => {
+      expect(() =>
+        compileTSQL("SELECT id FROM task_runs", {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {}, // Missing organization_id
+        })
+      ).toThrow("Table 'task_runs' requires 'organization_id' in enforcedWhereClause");
+    });
+
+    it("should throw error when organization_id is missing but other tenant columns are present", () => {
+      expect(() =>
+        compileTSQL("SELECT id FROM task_runs", {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {
+            project_id: { op: "eq", value: "proj_123" },
+            environment_id: { op: "eq", value: "env_456" },
+          },
+        })
+      ).toThrow("Table 'task_runs' requires 'organization_id' in enforcedWhereClause");
+    });
+
+    it("should work with non-tenant table and empty enforcedWhereClause", () => {
+      const { sql } = compileTSQL("SELECT id FROM reference_data", {
+        tableSchema: [nonTenantTableSchema],
+        enforcedWhereClause: {},
+      });
+
+      expect(sql).toContain("SELECT");
+      expect(sql).toContain("FROM");
+    });
+
+    it("should work with only organization_id (project and env are optional)", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+        },
+      });
+
+      expect(sql).toContain("organization_id");
+      expect(sql).not.toContain("project_id");
+      expect(sql).not.toContain("environment_id");
+    });
+  });
+
+  describe("basic functionality", () => {
+    it("should apply single enforced condition", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+        },
+      });
+
+      expect(sql).toContain("equals(");
+      expect(sql).toContain("organization_id");
+    });
+
+    it("should apply multiple enforced conditions", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          project_id: { op: "eq", value: "proj_456" },
+          environment_id: { op: "eq", value: "env_789" },
+        },
+      });
+
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("project_id");
+      expect(sql).toContain("environment_id");
+    });
+
+    it("should apply enforced condition even when user filters on same field", () => {
+      const { sql } = compileTSQL(
+        "SELECT id FROM task_runs WHERE triggered_at > '2025-01-01'",
+        {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_123" },
+            triggered_at: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Should have BOTH the user's condition AND the enforced condition
+      // User's condition: greater(triggered_at, '2025-01-01')
+      // Enforced condition: greaterOrEquals(triggered_at, '2024-01-01')
+      const triggeredAtMatches = sql.match(/triggered_at/g) || [];
+      expect(triggeredAtMatches.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it("should apply different comparison operators", () => {
+      const { sql: sqlGt } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          time: { op: "gt", value: "2024-01-01" },
+        },
+      });
+      expect(sqlGt).toContain("greater(");
+
+      const { sql: sqlLt } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          time: { op: "lt", value: "2024-12-31" },
+        },
+      });
+      expect(sqlLt).toContain("less(");
+
+      const { sql: sqlNeq } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          status: { op: "neq", value: "deleted" },
+        },
+      });
+      expect(sqlNeq).toContain("notEquals(");
+    });
+
+    it("should apply BETWEEN condition", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          time: { op: "between", low: "2024-01-01", high: "2024-12-31" },
+        },
+      });
+
+      expect(sql).toContain("time BETWEEN");
+    });
+
+    it("should handle Date values in enforced conditions", () => {
+      const sevenDaysAgo = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000);
+      const { sql, params } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          triggered_at: { op: "gte", value: sevenDaysAgo },
+        },
+      });
+
+      expect(sql).toContain("triggered_at");
+      expect(sql).toContain("toDateTime64");
+    });
+  });
+
+  describe("enforcedWhereClause + whereClauseFallback interaction", () => {
+    it("should apply both enforced and fallback conditions when user doesn't filter", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          triggered_at: { op: "gte", value: "2024-01-01" },
+        },
+        whereClauseFallback: {
+          status: { op: "eq", value: "completed" },
+        },
+      });
+
+      // Should have both enforced (triggered_at) and fallback (status)
+      expect(sql).toContain("triggered_at");
+      expect(sql).toContain("status");
+    });
+
+    it("should apply enforced but not fallback when user filters on fallback column", () => {
+      const { sql, params } = compileTSQL(
+        "SELECT id FROM task_runs WHERE status = 'failed'",
+        {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_123" },
+            triggered_at: { op: "gte", value: "2024-01-01" },
+          },
+          whereClauseFallback: {
+            status: { op: "eq", value: "completed" },
+          },
+        }
+      );
+
+      // Enforced triggered_at should be applied
+      expect(sql).toContain("triggered_at");
+      // User's status = 'failed' should be there (as a parameter)
+      expect(Object.values(params)).toContain("failed");
+      // The fallback 'completed' should NOT be applied since user filtered on status
+      expect(Object.values(params)).not.toContain("completed");
+    });
+
+    it("should apply both enforced and fallback on same field (enforced always, fallback only if not filtered)", () => {
+      // User doesn't filter on triggered_at, so BOTH enforced AND fallback apply
+      const { sql } = compileTSQL("SELECT id FROM task_runs WHERE status = 'completed'", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          triggered_at: { op: "gte", value: "2024-06-01" }, // Enforced: last 6 months
+        },
+        whereClauseFallback: {
+          triggered_at: { op: "gte", value: "2024-01-01" }, // Fallback: last year
+        },
+      });
+
+      // Both should be applied (enforced at printer level, fallback at AST level)
+      const triggeredAtMatches = sql.match(/triggered_at/g) || [];
+      expect(triggeredAtMatches.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it("should skip fallback but keep enforced when user filters on same field", () => {
+      const { sql } = compileTSQL(
+        "SELECT id FROM task_runs WHERE triggered_at > '2025-01-01'",
+        {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_123" },
+            triggered_at: { op: "gte", value: "2024-06-01" }, // Enforced: always applied
+          },
+          whereClauseFallback: {
+            triggered_at: { op: "gte", value: "2024-01-01" }, // Fallback: skipped since user filtered
+          },
+        }
+      );
+
+      // User's condition + enforced should be present
+      // Fallback should NOT be applied since user filtered on triggered_at
+      // Count distinct triggered_at conditions
+      const triggeredAtMatches = sql.match(/triggered_at/g) || [];
+      // Should be 2: user's condition + enforced condition (NOT 3, no fallback)
+      expect(triggeredAtMatches.length).toBe(2);
+    });
+  });
+
+  describe("security tests", () => {
+    it("should apply enforced conditions to UNION queries", () => {
+      const { sql } = compileTSQL(
+        "SELECT id FROM task_runs WHERE status = 'completed' UNION ALL SELECT id FROM task_runs WHERE status = 'failed'",
+        {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_123" },
+            triggered_at: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // Both parts of the UNION should have the enforced conditions
+      const orgMatches = sql.match(/organization_id/g) || [];
+      expect(orgMatches.length).toBe(2);
+
+      const triggeredAtMatches = sql.match(/triggered_at/g) || [];
+      expect(triggeredAtMatches.length).toBe(2);
+    });
+
+    it("should NOT be bypassable via OR clause", () => {
+      const { sql } = compileTSQL(
+        "SELECT id FROM task_runs WHERE status = 'completed' OR 1=1",
+        {
+          tableSchema: [taskRunsSchema],
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_123" },
+            triggered_at: { op: "gte", value: "2024-01-01" },
+          },
+        }
+      );
+
+      // The enforced conditions should be ANDed with the entire user WHERE clause
+      // So the structure should be: (enforced AND enforced AND ...) AND (user_where)
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("triggered_at");
+      // The 1=1 should be within the user's OR clause, not affecting enforced conditions
+    });
+
+    it("should skip enforced conditions for columns that don't exist in table", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+          nonexistent_column: { op: "eq", value: "test" },
+        },
+      });
+
+      // Should not contain nonexistent_column
+      expect(sql).not.toContain("nonexistent_column");
+      // Should still have organization_id
+      expect(sql).toContain("organization_id");
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle empty enforced conditions for non-tenant table", () => {
+      const { sql } = compileTSQL("SELECT id FROM reference_data", {
+        tableSchema: [nonTenantTableSchema],
+        enforcedWhereClause: {},
+      });
+
+      expect(sql).toContain("SELECT");
+      expect(sql).not.toContain("WHERE"); // No WHERE clause needed
+    });
+
+    it("should properly format numeric values", () => {
+      const { sql } = compileTSQL("SELECT id FROM task_runs", {
+        tableSchema: [taskRunsSchema],
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_123" },
+        },
+      });
+
+      // org_123 should be parameterized, not inlined
+      expect(sql).toContain("tsql_val_");
+    });
+  });
+});
+
diff --git a/internal-packages/tsql/src/index.ts b/internal-packages/tsql/src/index.ts
new file mode 100644
index 00000000000..923d8b8829f
--- /dev/null
+++ b/internal-packages/tsql/src/index.ts
@@ -0,0 +1,607 @@
+// TSQL - Type-Safe SQL Query Language for ClickHouse
+// Originally derived from PostHog's HogQL (see NOTICE.md for attribution)
+
+import type { ANTLRErrorListener, RecognitionException, Recognizer } from "antlr4ts";
+import { CharStreams, CommonTokenStream } from "antlr4ts";
+import type { Token } from "antlr4ts/Token";
+import { TSQLLexer } from "./grammar/TSQLLexer.js";
+import { TSQLParser } from "./grammar/TSQLParser.js";
+import type {
+  And,
+  BetweenExpr,
+  Call,
+  CompareOperation,
+  Constant,
+  Expression,
+  Field,
+  Not,
+  Or,
+  SelectQuery,
+  SelectSetQuery,
+  Tuple,
+} from "./query/ast.js";
+import { CompareOperationOp } from "./query/ast.js";
+import { SyntaxError as TSQLSyntaxError } from "./query/errors.js";
+import { TSQLParseTreeConverter } from "./query/parser.js";
+import { printToClickHouse, type PrintResult } from "./query/printer.js";
+import {
+  createPrinterContext,
+  type BetweenCondition,
+  type QuerySettings,
+  type SimpleComparisonCondition,
+  type TimeRange,
+  type WhereClauseCondition,
+} from "./query/printer_context.js";
+import { createSchemaRegistry, type FieldMappings, type TableSchema } from "./query/schema.js";
+
+/**
+ * Simple error listener that captures syntax errors
+ */
+class TSQLErrorListener implements ANTLRErrorListener<Token> {
+  public error: string | null = null;
+
+  syntaxError(
+    _recognizer: Recognizer<Token, any>,
+    _offendingSymbol: Token | undefined,
+    line: number,
+    charPositionInLine: number,
+    msg: string,
+    _e: RecognitionException | undefined
+  ): void {
+    this.error = `Syntax error at line ${line}:${charPositionInLine}: ${msg}`;
+  }
+}
+
+// Re-export AST types
+export * from "./query/ast.js";
+
+// Re-export errors
+export * from "./query/errors.js";
+
+// Re-export escape utilities
+export {
+  escapeClickHouseIdentifier,
+  escapeClickHouseString,
+  escapeTSQLIdentifier,
+  escapeTSQLString,
+  getClickHouseType,
+} from "./query/escape.js";
+
+// Re-export function definitions
+export {
+  findTSQLAggregation,
+  findTSQLFunction,
+  getAllExposedFunctionNames,
+  TSQL_AGGREGATIONS,
+  TSQL_CLICKHOUSE_FUNCTIONS,
+  TSQL_COMPARISON_MAPPING,
+  type TSQLFunctionMeta,
+} from "./query/functions.js";
+
+// Re-export schema types and functions
+export {
+  column,
+  createSchemaRegistry,
+  findColumn,
+  findTable,
+  getAllowedUserValues,
+  // Core column utilities
+  getCoreColumns,
+  getExternalValue,
+  getInternalValue,
+  getInternalValueFromMapping,
+  getInternalValueFromMappingCaseInsensitive,
+  // Value mapping utilities
+  getUserFriendlyValue,
+  getVirtualColumnExpression,
+  // Field mapping utilities (runtime dynamic mappings)
+  hasFieldMapping,
+  isValidUserValue,
+  // Virtual column utilities
+  isVirtualColumn,
+  // Error message sanitization
+  sanitizeErrorMessage,
+  validateFilterColumn,
+  validateGroupColumn,
+  validateSelectColumn,
+  validateSortColumn,
+  validateTable,
+  type ClickHouseType,
+  type ColumnSchema,
+  type FieldMappings,
+  type ColumnFormatType,
+  type OutputColumnMetadata,
+  type RequiredFilter,
+  type SchemaRegistry,
+  type TableSchema,
+  type TenantColumnConfig,
+} from "./query/schema.js";
+
+// Re-export printer context
+export {
+  createPrinterContext,
+  DEFAULT_QUERY_SETTINGS,
+  PrinterContext,
+  type BetweenCondition,
+  type InCondition,
+  type PrinterContextOptions,
+  type QueryNotice,
+  type QuerySettings,
+  type SimpleComparisonCondition,
+  type TimeRange,
+  type WhereClauseCondition,
+} from "./query/printer_context.js";
+
+// Re-export time bucket utilities
+export {
+  BUCKET_THRESHOLDS,
+  calculateTimeBucketInterval,
+  type BucketThreshold,
+  type TimeBucketInterval,
+} from "./query/time_buckets.js";
+
+// Re-export printer
+export { ClickHousePrinter, printToClickHouse, type PrintResult } from "./query/printer.js";
+
+// Re-export parser converter for advanced usage
+export { TSQLParseTreeConverter } from "./query/parser.js";
+
+// Re-export validator
+export {
+  validateQuery,
+  type ValidationIssue,
+  type ValidationResult,
+  type ValidationSeverity,
+} from "./query/validator.js";
+
+// Re-export result transformation utilities
+export {
+  createResultTransformer,
+  transformResults,
+  type TransformResultsOptions,
+} from "./query/results.js";
+
+/**
+ * Parse a TSQL SELECT query string into an AST
+ *
+ * @param query - The TSQL query string to parse
+ * @returns The parsed AST (SelectQuery or SelectSetQuery)
+ * @throws TSQLSyntaxError if the query is invalid
+ *
+ * @example
+ * ```typescript
+ * const ast = parseTSQLSelect("SELECT * FROM users WHERE id = 1");
+ * ```
+ */
+export function parseTSQLSelect(query: string): SelectQuery | SelectSetQuery {
+  const inputStream = CharStreams.fromString(query);
+  const lexer = new TSQLLexer(inputStream);
+  const tokenStream = new CommonTokenStream(lexer);
+  const parser = new TSQLParser(tokenStream);
+
+  // Remove default error listeners and add custom one
+  parser.removeErrorListeners();
+  const errorListener = new TSQLErrorListener();
+  parser.addErrorListener(errorListener);
+
+  const parseTree = parser.select();
+
+  if (errorListener.error) {
+    throw new TSQLSyntaxError(errorListener.error);
+  }
+
+  const converter = new TSQLParseTreeConverter();
+  const ast = converter.visit(parseTree);
+
+  // Validate the result is a select query
+  if (typeof ast === "string" || !("expression_type" in ast)) {
+    throw new TSQLSyntaxError("Failed to parse SELECT query");
+  }
+
+  if (ast.expression_type !== "select_query" && ast.expression_type !== "select_set_query") {
+    throw new TSQLSyntaxError(`Expected SELECT query, got ${ast.expression_type}`);
+  }
+
+  return ast as SelectQuery | SelectSetQuery;
+}
+
+/**
+ * Parse a TSQL expression string into an AST
+ *
+ * @param expr - The TSQL expression string to parse
+ * @returns The parsed expression AST
+ * @throws TSQLSyntaxError if the expression is invalid
+ *
+ * @example
+ * ```typescript
+ * const ast = parseTSQLExpr("id = 1 AND name = 'test'");
+ * ```
+ */
+export function parseTSQLExpr(expr: string): Expression {
+  const inputStream = CharStreams.fromString(expr);
+  const lexer = new TSQLLexer(inputStream);
+  const tokenStream = new CommonTokenStream(lexer);
+  const parser = new TSQLParser(tokenStream);
+
+  // Remove default error listeners and add custom one
+  parser.removeErrorListeners();
+  const errorListener = new TSQLErrorListener();
+  parser.addErrorListener(errorListener);
+
+  const parseTree = parser.columnExpr(0);
+
+  if (errorListener.error) {
+    throw new TSQLSyntaxError(errorListener.error);
+  }
+
+  const converter = new TSQLParseTreeConverter();
+  return converter.visit(parseTree) as Expression;
+}
+
+/**
+ * Check if a column is referenced in an expression (for WHERE clause detection).
+ * Recursively traverses And, Or, CompareOperation, BetweenExpr, and Field nodes.
+ *
+ * @param expr - The expression to search
+ * @param column - The column name to look for
+ * @returns true if the column is referenced in the expression
+ */
+export function isColumnReferencedInExpression(
+  expr: Expression | undefined,
+  column: string
+): boolean {
+  if (!expr) return false;
+
+  const exprType = (expr as Expression).expression_type;
+
+  switch (exprType) {
+    case "and": {
+      const andExpr = expr as And;
+      return andExpr.exprs.some((e) => isColumnReferencedInExpression(e, column));
+    }
+    case "or": {
+      const orExpr = expr as Or;
+      return orExpr.exprs.some((e) => isColumnReferencedInExpression(e, column));
+    }
+    case "compare_operation": {
+      const compareExpr = expr as CompareOperation;
+      return (
+        isColumnReferencedInExpression(compareExpr.left, column) ||
+        isColumnReferencedInExpression(compareExpr.right, column)
+      );
+    }
+    case "between_expr": {
+      const betweenExpr = expr as BetweenExpr;
+      return isColumnReferencedInExpression(betweenExpr.expr, column);
+    }
+    case "field": {
+      const fieldExpr = expr as Field;
+      // Check if any part of the chain matches the column name
+      // Handles both unqualified (column) and qualified (table.column) references
+      return fieldExpr.chain.some((part) => part === column);
+    }
+    case "not": {
+      const notExpr = expr as Not;
+      return isColumnReferencedInExpression(notExpr.expr, column);
+    }
+    default:
+      return false;
+  }
+}
+
+/**
+ * Format a Date as a ClickHouse-compatible DateTime64 string.
+ * ClickHouse expects format: 'YYYY-MM-DD HH:MM:SS.mmm' (in UTC)
+ */
+function formatDateForClickHouse(date: Date): string {
+  const year = date.getUTCFullYear();
+  const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+  const day = String(date.getUTCDate()).padStart(2, "0");
+  const hours = String(date.getUTCHours()).padStart(2, "0");
+  const minutes = String(date.getUTCMinutes()).padStart(2, "0");
+  const seconds = String(date.getUTCSeconds()).padStart(2, "0");
+  const ms = String(date.getUTCMilliseconds()).padStart(3, "0");
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${ms}`;
+}
+
+/**
+ * Create an AST expression for a fallback value.
+ * Date values are wrapped in toDateTime64() for ClickHouse compatibility.
+ */
+function createValueExpression(value: Date | string | number): Expression {
+  if (value instanceof Date) {
+    // Wrap Date in toDateTime64(formatted_string, 3) for ClickHouse DateTime64(3) columns
+    return {
+      expression_type: "call",
+      name: "toDateTime64",
+      args: [
+        { expression_type: "constant", value: formatDateForClickHouse(value) } as Constant,
+        { expression_type: "constant", value: 3 } as Constant,
+      ],
+    } as Call;
+  }
+  return { expression_type: "constant", value } as Constant;
+}
+
+/**
+ * Map fallback operator to CompareOperationOp
+ */
+function mapFallbackOpToCompareOp(op: SimpleComparisonCondition["op"]): CompareOperationOp {
+  switch (op) {
+    case "eq":
+      return CompareOperationOp.Eq;
+    case "neq":
+      return CompareOperationOp.NotEq;
+    case "gt":
+      return CompareOperationOp.Gt;
+    case "gte":
+      return CompareOperationOp.GtEq;
+    case "lt":
+      return CompareOperationOp.Lt;
+    case "lte":
+      return CompareOperationOp.LtEq;
+  }
+}
+
+/**
+ * Create an AST expression from a fallback condition
+ *
+ * @param column - The column name
+ * @param fallback - The fallback condition
+ * @returns The AST expression for the fallback condition
+ */
+export function createFallbackExpression(
+  column: string,
+  fallback: WhereClauseCondition
+): Expression {
+  const fieldExpr: Field = {
+    expression_type: "field",
+    chain: [column],
+  };
+
+  if (fallback.op === "between") {
+    const betweenExpr: BetweenExpr = {
+      expression_type: "between_expr",
+      expr: fieldExpr,
+      low: createValueExpression(fallback.low),
+      high: createValueExpression(fallback.high),
+    };
+    return betweenExpr;
+  }
+
+  if (fallback.op === "in") {
+    // Create a tuple of values for the IN clause
+    const tupleExpr: Tuple = {
+      expression_type: "tuple",
+      exprs: fallback.values.map((value) => createValueExpression(value)),
+    };
+    const inExpr: CompareOperation = {
+      expression_type: "compare_operation",
+      left: fieldExpr,
+      right: tupleExpr,
+      op: CompareOperationOp.In,
+    };
+    return inExpr;
+  }
+
+  // Simple comparison
+  const compareExpr: CompareOperation = {
+    expression_type: "compare_operation",
+    left: fieldExpr,
+    right: createValueExpression(fallback.value),
+    op: mapFallbackOpToCompareOp(fallback.op),
+  };
+  return compareExpr;
+}
+
+/**
+ * Inject fallback WHERE conditions into a parsed AST.
+ * Only adds fallback conditions for columns not already referenced in the WHERE clause.
+ *
+ * @param ast - The parsed SELECT query AST
+ * @param fallbacks - The fallback conditions to potentially inject
+ * @returns The modified AST with fallback conditions injected
+ */
+export function injectFallbackConditions(
+  ast: SelectQuery | SelectSetQuery,
+  fallbacks: Record<string, WhereClauseCondition>
+): SelectQuery | SelectSetQuery {
+  // Handle SelectSetQuery (UNION, etc.) - apply to each query in the set
+  if (ast.expression_type === "select_set_query") {
+    const setQuery = ast as SelectSetQuery;
+    // Process the initial select query
+    const modifiedInitial = injectFallbackConditions(
+      setQuery.initial_select_query,
+      fallbacks
+    ) as SelectQuery;
+
+    // Process subsequent queries
+    const modifiedSubsequent = setQuery.subsequent_select_queries.map((sq) => ({
+      ...sq,
+      select_query: injectFallbackConditions(sq.select_query, fallbacks) as SelectQuery,
+    }));
+
+    return {
+      ...setQuery,
+      initial_select_query: modifiedInitial,
+      subsequent_select_queries: modifiedSubsequent,
+    };
+  }
+
+  // Handle SelectQuery
+  const selectQuery = ast as SelectQuery;
+  const existingWhere = selectQuery.where;
+
+  // Collect fallback expressions for columns not already in WHERE
+  const fallbackExprs: Expression[] = [];
+  for (const [column, fallback] of Object.entries(fallbacks)) {
+    if (!isColumnReferencedInExpression(existingWhere, column)) {
+      fallbackExprs.push(createFallbackExpression(column, fallback));
+    }
+  }
+
+  // If no fallbacks to add, return original AST
+  if (fallbackExprs.length === 0) {
+    return ast;
+  }
+
+  // Combine fallbacks with existing WHERE using AND
+  let newWhere: Expression;
+  if (!existingWhere) {
+    // No existing WHERE - just use fallbacks
+    if (fallbackExprs.length === 1) {
+      newWhere = fallbackExprs[0];
+    } else {
+      newWhere = {
+        expression_type: "and",
+        exprs: fallbackExprs,
+      } as And;
+    }
+  } else {
+    // Combine existing WHERE with fallbacks
+    newWhere = {
+      expression_type: "and",
+      exprs: [...fallbackExprs, existingWhere],
+    } as And;
+  }
+
+  return {
+    ...selectQuery,
+    where: newWhere,
+  };
+}
+
+/**
+ * Options for compiling a TSQL query to ClickHouse SQL
+ */
+export interface CompileTSQLOptions {
+  /** Schema definitions for allowed tables and columns */
+  tableSchema: TableSchema[];
+  /**
+   * REQUIRED: Conditions always applied at the table level.
+   * Must include tenant columns (e.g., organization_id) for multi-tenant tables.
+   * Applied to every table reference including subqueries, CTEs, and JOINs.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   // Tenant isolation
+   *   organization_id: { op: "eq", value: "org_123" },
+   *   project_id: { op: "eq", value: "proj_456" },
+   *   environment_id: { op: "eq", value: "env_789" },
+   *   // Plan-based time limit
+   *   triggered_at: { op: "gte", value: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000) }
+   * }
+   * ```
+   */
+  enforcedWhereClause: Record<string, WhereClauseCondition | undefined>;
+  /** Optional query settings */
+  settings?: Partial<QuerySettings>;
+  /**
+   * Runtime field mappings for dynamic value translation.
+   * Maps internal ClickHouse values to external user-facing values.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   project: { "cm12345": "my-project-ref" },
+   * }
+   * ```
+   */
+  fieldMappings?: FieldMappings;
+  /**
+   * Fallback WHERE conditions to apply when the user hasn't filtered on a column.
+   * Key is the column name, value is the fallback condition.
+   * These are applied at the AST level (top-level query only).
+   *
+   * @example
+   * ```typescript
+   * // Apply time > 7 days ago if user doesn't filter on time
+   * whereClauseFallback: {
+   *   time: { op: 'gte', value: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000) }
+   * }
+   *
+   * // Apply time BETWEEN two dates if user doesn't filter on time
+   * whereClauseFallback: {
+   *   time: { op: 'between', low: startDate, high: endDate }
+   * }
+   * ```
+   */
+  whereClauseFallback?: Record<string, WhereClauseCondition>;
+  /**
+   * Time range for `timeBucket()` interval calculation.
+   * When provided, `timeBucket()` uses this to determine the appropriate bucket size
+   * based on the span of the time range.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   from: new Date('2024-01-01'),
+   *   to: new Date('2024-01-08'),
+   * }
+   * ```
+   */
+  timeRange?: TimeRange;
+}
+
+/**
+ * Compile a TSQL query string to ClickHouse SQL with parameters
+ *
+ * This function:
+ * 1. Parses the TSQL query into an AST
+ * 2. Validates tables and columns against the schema
+ * 3. Injects enforced WHERE clauses (tenant isolation + plan limits) at printer level
+ * 4. Optionally injects fallback WHERE conditions at AST level
+ * 5. Generates parameterized ClickHouse SQL
+ *
+ * @param query - The TSQL query string to compile
+ * @param options - Compilation options including enforcedWhereClause and schema
+ * @returns The compiled SQL and parameters
+ * @throws TSQLSyntaxError if the query is invalid
+ * @throws QueryError if tables/columns are not allowed or required tenant columns are missing
+ *
+ * @example
+ * ```typescript
+ * const { sql, params } = compileTSQL(
+ *   "SELECT * FROM task_runs WHERE status = 'completed' LIMIT 100",
+ *   {
+ *     tableSchema: [taskRunsSchema],
+ *     enforcedWhereClause: {
+ *       organization_id: { op: "eq", value: "org_123" },
+ *       project_id: { op: "eq", value: "proj_456" },
+ *       environment_id: { op: "eq", value: "env_789" },
+ *       triggered_at: { op: "gte", value: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000) },
+ *     },
+ *   }
+ * );
+ * ```
+ */
+export function compileTSQL(query: string, options: CompileTSQLOptions): PrintResult {
+  // 1. Parse the TSQL query
+  let ast = parseTSQLSelect(query);
+
+  // 2. Inject fallback WHERE conditions if provided (applied at AST level - top-level query only)
+  if (options.whereClauseFallback && Object.keys(options.whereClauseFallback).length > 0) {
+    ast = injectFallbackConditions(ast, options.whereClauseFallback);
+  }
+
+  // 3. Create schema registry from table schemas
+  const schemaRegistry = createSchemaRegistry(options.tableSchema);
+
+  // 4. Strip undefined values from enforcedWhereClause
+  const enforcedWhereClause = Object.fromEntries(
+    Object.entries(options.enforcedWhereClause).filter(([_, value]) => value !== undefined)
+  ) as Record<string, WhereClauseCondition>;
+
+  // 5. Create printer context with enforced WHERE clause and field mappings
+  const context = createPrinterContext({
+    schema: schemaRegistry,
+    settings: options.settings,
+    fieldMappings: options.fieldMappings,
+    enforcedWhereClause,
+    timeRange: options.timeRange,
+  });
+
+  // 6. Print the AST to ClickHouse SQL (enforced conditions applied at printer level)
+  return printToClickHouse(ast, context);
+}
diff --git a/internal-packages/tsql/src/query/ast.ts b/internal-packages/tsql/src/query/ast.ts
new file mode 100644
index 00000000000..4ef1e7e2d8c
--- /dev/null
+++ b/internal-packages/tsql/src/query/ast.ts
@@ -0,0 +1,672 @@
+// TypeScript translation of posthog/hogql/ast.py
+
+import type { TSQLContext } from "./context";
+import type {
+  DatabaseField,
+  ExpressionField,
+  FieldOrTable,
+  FieldTraverser,
+  LazyJoin,
+  LazyTable,
+  StringArrayDatabaseField,
+  StringJSONDatabaseField,
+  Table,
+  UnknownDatabaseField,
+  VirtualTable,
+} from "./models";
+import type { ConstantDataType, TSQLQuerySettings } from "./constants";
+
+// Base types
+export interface AST {
+  start?: number;
+  end?: number;
+  accept?(visitor: any): any;
+}
+
+export interface Type extends AST {
+  get_child?(name: string, context: TSQLContext): Type;
+  has_child?(name: string, context: TSQLContext): boolean;
+  resolve_constant_type?(context: TSQLContext): ConstantType;
+  resolve_column_constant_type?(name: string, context: TSQLContext): ConstantType;
+}
+
+export interface Expr extends AST {
+  type?: Type;
+}
+
+export interface ConstantType extends Type {
+  data_type: ConstantDataType;
+  nullable?: boolean;
+  print_type?(): string;
+}
+
+export interface UnknownType extends ConstantType {
+  data_type: "unknown";
+}
+
+export type Expression =
+  | CTE
+  | Alias
+  | ArithmeticOperation
+  | And
+  | Or
+  | CompareOperation
+  | Not
+  | BetweenExpr
+  | OrderExpr
+  | ArrayAccess
+  | Array
+  | Dict
+  | TupleAccess
+  | Tuple
+  | Lambda
+  | Constant
+  | Field
+  | Placeholder
+  | Call
+  | ExprCall
+  | JoinConstraint
+  | JoinExpr
+  | WindowFrameExpr
+  | WindowExpr
+  | WindowFunction
+  | LimitByExpr
+  | SelectQuery
+  | SelectSetQuery
+  | RatioExpr
+  | SampleExpr
+  | TSQLXTag;
+
+export interface CTE extends Expr {
+  expression_type: "cte";
+  name: string;
+  expr: Expression;
+  cte_type: "column" | "subquery";
+}
+
+// Type system
+export type TableOrSelectType =
+  | BaseTableType
+  | SelectSetQueryType
+  | SelectQueryType
+  | SelectQueryAliasType;
+
+export interface FieldAliasType extends Type {
+  alias: string;
+  type: Type;
+}
+
+export interface BaseTableType extends Type {
+  resolve_database_table?(context: TSQLContext): Table;
+}
+
+export interface TableType extends BaseTableType {
+  table: Table;
+}
+
+export interface LazyJoinType extends BaseTableType {
+  table_type: TableOrSelectType;
+  field: string;
+  lazy_join: LazyJoin;
+}
+
+export interface LazyTableType extends BaseTableType {
+  table: LazyTable;
+}
+
+export interface TableAliasType extends BaseTableType {
+  alias: string;
+  table_type: TableType | LazyTableType;
+}
+
+export interface VirtualTableType extends BaseTableType {
+  table_type: TableOrSelectType;
+  field: string;
+  virtual_table: VirtualTable;
+}
+
+export interface SelectQueryType extends Type {
+  aliases: Record<string, FieldAliasType>;
+  columns: Record<string, Type>;
+  tables: Record<string, TableOrSelectType>;
+  ctes: Record<string, CTE>;
+  anonymous_tables: (SelectQueryType | SelectSetQueryType)[];
+  parent?: SelectQueryType | SelectSetQueryType;
+  is_lambda_type?: boolean;
+}
+
+export interface SelectSetQueryType extends Type {
+  types: (SelectQueryType | SelectSetQueryType)[];
+}
+
+export interface SelectViewType extends BaseTableType {
+  view_name: string;
+  alias: string;
+  select_query_type: SelectQueryType | SelectSetQueryType;
+}
+
+export interface SelectQueryAliasType extends Type {
+  alias: string;
+  select_query_type: SelectQueryType | SelectSetQueryType;
+}
+
+export interface IntegerType extends ConstantType {
+  data_type: "int";
+}
+
+export interface DecimalType extends ConstantType {
+  data_type: "unknown";
+}
+
+export interface FloatType extends ConstantType {
+  data_type: "float";
+}
+
+export interface StringType extends ConstantType {
+  data_type: "str";
+}
+
+export interface StringJSONType extends StringType {}
+
+export interface StringArrayType extends StringType {}
+
+export interface BooleanType extends ConstantType {
+  data_type: "bool";
+}
+
+export interface DateType extends ConstantType {
+  data_type: "date";
+}
+
+export interface DateTimeType extends ConstantType {
+  data_type: "datetime";
+}
+
+export interface IntervalType extends ConstantType {
+  data_type: "unknown";
+}
+
+export interface UUIDType extends ConstantType {
+  data_type: "uuid";
+}
+
+export interface ArrayType extends ConstantType {
+  data_type: "array";
+  item_type: ConstantType;
+}
+
+export interface TupleType extends ConstantType {
+  data_type: "tuple";
+  item_types: ConstantType[];
+  repeat?: boolean;
+}
+
+export interface CallType extends Type {
+  name: string;
+  arg_types: ConstantType[];
+  param_types?: ConstantType[];
+  return_type: ConstantType;
+}
+
+export interface AsteriskType extends Type {
+  table_type: TableOrSelectType;
+}
+
+export interface FieldTraverserType extends Type {
+  chain: (string | number)[];
+  table_type: TableOrSelectType;
+}
+
+export interface ExpressionFieldType extends Type {
+  name: string;
+  expr: Expression;
+  table_type: TableOrSelectType;
+  isolate_scope?: boolean;
+}
+
+export interface FieldType extends Type {
+  name: string;
+  table_type: TableOrSelectType;
+}
+
+export interface UnresolvedFieldType extends Type {
+  name: string;
+}
+
+export interface PropertyType extends Type {
+  chain: (string | number)[];
+  field_type: FieldType;
+  joined_subquery?: SelectQueryAliasType;
+  joined_subquery_field_name?: string;
+}
+
+export interface LambdaArgumentType extends Type {
+  name: string;
+}
+
+// Enums
+export enum ArithmeticOperationOp {
+  Add = "+",
+  Sub = "-",
+  Mult = "*",
+  Div = "/",
+  Mod = "%",
+}
+
+export enum CompareOperationOp {
+  Eq = "==",
+  NotEq = "!=",
+  Gt = ">",
+  GtEq = ">=",
+  Lt = "<",
+  LtEq = "<=",
+  Like = "like",
+  ILike = "ilike",
+  NotLike = "not like",
+  NotILike = "not ilike",
+  In = "in",
+  GlobalIn = "global in",
+  NotIn = "not in",
+  GlobalNotIn = "global not in",
+  InCohort = "in cohort",
+  NotInCohort = "not in cohort",
+  Regex = "=~",
+  IRegex = "=~*",
+  NotRegex = "!~",
+  NotIRegex = "!~*",
+}
+
+export const NEGATED_COMPARE_OPS: CompareOperationOp[] = [
+  CompareOperationOp.NotEq,
+  CompareOperationOp.NotLike,
+  CompareOperationOp.NotILike,
+  CompareOperationOp.NotIn,
+  CompareOperationOp.GlobalNotIn,
+  CompareOperationOp.NotInCohort,
+  CompareOperationOp.NotRegex,
+  CompareOperationOp.NotIRegex,
+];
+
+export type SetOperator =
+  | "UNION ALL"
+  | "UNION DISTINCT"
+  | "INTERSECT"
+  | "INTERSECT DISTINCT"
+  | "EXCEPT";
+
+export type ParseResult = Expression | Declaration | string;
+
+// Declaration and Statement types
+export interface Declaration extends AST {}
+
+export interface VariableAssignment extends Declaration {
+  left: Expression;
+  right: Expression;
+}
+
+export interface VariableDeclaration extends Declaration {
+  name: string;
+  expr?: Expression;
+}
+
+export interface Statement extends Declaration {}
+
+export interface ExprStatement extends Statement {
+  expr?: Expression;
+}
+
+export interface ReturnStatement extends Statement {
+  expr?: Expression;
+}
+
+export interface ThrowStatement extends Statement {
+  expr?: Expression;
+}
+
+export interface TryCatchStatement extends Statement {
+  try_stmt: Statement;
+  catches: [string | null, string | null, Statement][];
+  finally_stmt?: Statement;
+}
+
+export interface IfStatement extends Statement {
+  expr: Expression;
+  then: Statement;
+  else_?: Statement;
+}
+
+export interface WhileStatement extends Statement {
+  expr: Expression;
+  body: Statement;
+}
+
+export interface ForStatement extends Statement {
+  initializer?: VariableDeclaration | VariableAssignment | Expression;
+  condition?: Expression;
+  increment?: VariableDeclaration;
+  body: Statement;
+}
+
+export interface ForInStatement extends Statement {
+  keyVar?: string;
+  valueVar: string;
+  expr: Expression;
+  body: Statement;
+}
+
+export interface Function extends Statement {
+  name: string;
+  params: string[];
+  body: Statement;
+}
+
+export interface Block extends Statement {
+  declarations: Declaration[];
+}
+
+export interface Program extends AST {
+  declarations: Declaration[];
+}
+
+// Expression types
+export interface Alias extends Expr {
+  expression_type: "alias";
+  alias: string;
+  expr: Expression;
+  hidden?: boolean;
+  from_asterisk?: boolean;
+}
+
+export interface ArithmeticOperation extends Expr {
+  expression_type: "arithmetic_operation";
+  left: Expression;
+  right: Expression;
+  op: ArithmeticOperationOp;
+}
+
+export interface And extends Expr {
+  expression_type: "and";
+  type?: ConstantType;
+  exprs: Expression[];
+}
+
+export interface Or extends Expr {
+  expression_type: "or";
+  exprs: Expression[];
+  type?: ConstantType;
+}
+
+export interface CompareOperation extends Expr {
+  expression_type: "compare_operation";
+  left: Expression;
+  right: Expression;
+  op: CompareOperationOp;
+  type?: ConstantType;
+}
+
+export interface Not extends Expr {
+  expression_type: "not";
+  expr: Expression;
+  type?: ConstantType;
+}
+
+export interface BetweenExpr extends Expr {
+  expression_type: "between_expr";
+  expr: Expression;
+  low: Expression;
+  high: Expression;
+  negated?: boolean;
+  type?: ConstantType;
+}
+
+export interface OrderExpr extends Expr {
+  expression_type: "order_expr";
+  expr: Expression;
+  order?: "ASC" | "DESC";
+}
+
+export interface ArrayAccess extends Expr {
+  expression_type: "array_access";
+  array: Expression;
+  property: Expression;
+  nullish?: boolean;
+}
+
+export interface Array extends Expr {
+  expression_type: "array";
+  exprs: Expression[];
+}
+
+export interface Dict extends Expr {
+  expression_type: "dict";
+  items: [Expression, Expression][];
+}
+
+export interface TupleAccess extends Expr {
+  expression_type: "tuple_access";
+  tuple: Expression;
+  index: number;
+  nullish?: boolean;
+}
+
+export interface Tuple extends Expr {
+  expression_type: "tuple";
+  exprs: Expression[];
+}
+
+export interface Lambda extends Expr {
+  expression_type: "lambda";
+  args: string[];
+  expr: Expression | Block;
+}
+
+export interface Constant extends Expr {
+  expression_type: "constant";
+  value: any;
+}
+
+export interface Field extends Expr {
+  expression_type: "field";
+  chain: (string | number)[];
+  from_asterisk?: boolean;
+}
+
+export interface Placeholder extends Expr {
+  expression_type: "placeholder";
+  expr: Expression;
+  // Computed properties
+  chain?: (string | number)[] | null;
+  field?: string | null;
+}
+
+export interface Call extends Expr {
+  expression_type: "call";
+  name: string;
+  args: Expression[];
+  params?: Expression[];
+  distinct?: boolean;
+}
+
+export interface ExprCall extends Expr {
+  expression_type: "expr_call";
+  expr: Expression;
+  args: Expression[];
+}
+
+export interface JoinConstraint extends Expr {
+  expression_type: "join_constraint";
+  expr: Expression;
+  constraint_type: "ON" | "USING";
+}
+
+export interface JoinExpr extends Expr {
+  expression_type: "join_expr";
+  type?: TableOrSelectType;
+  join_type?: string;
+  table?: SelectQuery | SelectSetQuery | Placeholder | TSQLXTag | Field;
+  table_args?: Expression[];
+  alias?: string;
+  table_final?: boolean;
+  constraint?: JoinConstraint;
+  next_join?: JoinExpr;
+  sample?: SampleExpr;
+}
+
+export interface WindowFrameExpr extends Expr {
+  expression_type: "window_frame_expr";
+  frame_type?: "CURRENT ROW" | "PRECEDING" | "FOLLOWING";
+  frame_value?: number;
+}
+
+export interface WindowExpr extends Expr {
+  expression_type: "window_expr";
+  partition_by?: Expression[];
+  order_by?: OrderExpr[];
+  frame_method?: "ROWS" | "RANGE";
+  frame_start?: WindowFrameExpr;
+  frame_end?: WindowFrameExpr;
+}
+
+export interface WindowFunction extends Expr {
+  expression_type: "window_function";
+  name: string;
+  args?: Expression[];
+  exprs?: Expression[];
+  over_expr?: WindowExpr;
+  over_identifier?: string;
+}
+
+export interface LimitByExpr extends Expr {
+  expression_type: "limit_by_expr";
+  n: Expression;
+  exprs: Expression[];
+  offset_value?: Expression;
+}
+
+export interface SelectQuery extends Expr {
+  expression_type: "select_query";
+  type?: SelectQueryType;
+  ctes?: Record<string, CTE>;
+  select: Expression[];
+  distinct?: boolean;
+  select_from?: JoinExpr;
+  array_join_op?: string;
+  array_join_list?: Expression[];
+  window_exprs?: Record<string, WindowExpr>;
+  where?: Expression;
+  prewhere?: Expression;
+  having?: Expression;
+  group_by?: Expression[];
+  order_by?: OrderExpr[];
+  limit?: Expression;
+  limit_by?: LimitByExpr;
+  limit_with_ties?: boolean;
+  offset?: Expression;
+  settings?: TSQLQuerySettings;
+  view_name?: string;
+}
+
+export interface SelectSetNode extends AST {
+  select_query: SelectQuery | SelectSetQuery;
+  set_operator: SetOperator;
+}
+
+export interface SelectSetQuery extends Expr {
+  expression_type: "select_set_query";
+  type?: SelectSetQueryType;
+  initial_select_query: SelectQuery | SelectSetQuery;
+  subsequent_select_queries: SelectSetNode[];
+  // Equivalent to select_queries() method
+  select_queries?(): (SelectQuery | SelectSetQuery)[];
+}
+
+// Add static method equivalent for SelectSetQuery.create_from_queries()
+export namespace SelectSetQuery {
+  export function createFromQueries(
+    queries: (SelectQuery | SelectSetQuery)[],
+    set_operator: SetOperator
+  ): SelectQuery | SelectSetQuery {
+    return createSelectSetQueryFromQueries(queries, set_operator);
+  }
+}
+
+export interface RatioExpr extends Expr {
+  expression_type: "ratio_expr";
+  left: Constant;
+  right?: Constant;
+}
+
+export interface SampleExpr extends Expr {
+  expression_type: "sample_expr";
+  sample_value: RatioExpr;
+  offset_value?: RatioExpr;
+}
+
+export interface TSQLXAttribute extends AST {
+  name: string;
+  value: any;
+}
+
+export interface TSQLXTag extends Expr {
+  expression_type: "tsqlx_tag";
+  kind: string;
+  attributes: TSQLXAttribute[];
+  // Equivalent to to_dict() method
+  to_dict?(): Record<string, any>;
+}
+
+// Helper function to create empty SelectQuery (equivalent to SelectQuery.empty())
+export function createEmptySelectQuery(columns?: Record<string, FieldOrTable>): SelectQuery {
+  if (!columns) {
+    columns = { _: { name: "_" } as UnknownDatabaseField };
+  }
+
+  return {
+    expression_type: "select_query",
+    select: Object.entries(columns).map(([column, field]) => ({
+      expression_type: "alias" as const,
+      alias: column,
+      expr: {
+        expression_type: "constant",
+        value: (field as DatabaseField).default_value?.() ?? null,
+      } as Constant,
+    })),
+    where: { expression_type: "constant", value: false } as Constant,
+  };
+}
+
+// Add static method equivalent for SelectQuery.empty()
+export namespace SelectQuery {
+  export function empty(columns?: Record<string, FieldOrTable>): SelectQuery {
+    return createEmptySelectQuery(columns);
+  }
+}
+
+// Helper function for SelectSetQuery.select_queries()
+export function selectQueries(query: SelectSetQuery): (SelectQuery | SelectSetQuery)[] {
+  return [
+    query.initial_select_query,
+    ...query.subsequent_select_queries.map((node) => node.select_query),
+  ];
+}
+
+// Helper function to create SelectSetQuery from multiple queries
+export function createSelectSetQueryFromQueries(
+  queries: (SelectQuery | SelectSetQuery)[],
+  set_operator: SetOperator
+): SelectQuery | SelectSetQuery {
+  if (queries.length === 0) {
+    throw new Error("Cannot create a SelectSetQuery from an empty list of queries");
+  } else if (queries.length === 1) {
+    return queries[0];
+  }
+
+  return {
+    expression_type: "select_set_query",
+    initial_select_query: queries[0],
+    subsequent_select_queries: queries.slice(1).map((query) => ({
+      select_query: query,
+      set_operator,
+    })) as SelectSetNode[],
+  } as SelectSetQuery;
+}
diff --git a/internal-packages/tsql/src/query/constants.ts b/internal-packages/tsql/src/query/constants.ts
new file mode 100644
index 00000000000..f698d3cc7aa
--- /dev/null
+++ b/internal-packages/tsql/src/query/constants.ts
@@ -0,0 +1,71 @@
+// TypeScript translation of posthog/hogql/constants.py
+
+export type ConstantDataType =
+  | "int"
+  | "float"
+  | "str"
+  | "bool"
+  | "array"
+  | "tuple"
+  | "date"
+  | "datetime"
+  | "uuid"
+  | "unknown";
+
+export type ConstantSupportedPrimitive = number | string | boolean | Date | null;
+export type ConstantSupportedData =
+  | ConstantSupportedPrimitive
+  | ConstantSupportedPrimitive[]
+  | [ConstantSupportedPrimitive, ...ConstantSupportedPrimitive[]];
+
+export const KEYWORDS = ["true", "false", "null"] as const;
+export const RESERVED_KEYWORDS = [...KEYWORDS, "team_id"] as const;
+
+export const DEFAULT_RETURNED_ROWS = 100;
+export const MAX_SELECT_RETURNED_ROWS = 50000;
+export const MAX_SELECT_RETENTION_LIMIT = 100000;
+export const MAX_SELECT_HEATMAPS_LIMIT = 1000000;
+export const MAX_SELECT_COHORT_CALCULATION_LIMIT = 1000000000;
+export const MAX_BYTES_BEFORE_EXTERNAL_GROUP_BY = 22 * 1024 * 1024 * 1024;
+export const CSV_EXPORT_LIMIT = 300000;
+export const CSV_EXPORT_BREAKDOWN_LIMIT_INITIAL = 512;
+export const CSV_EXPORT_BREAKDOWN_LIMIT_LOW = 64;
+export const BREAKDOWN_VALUES_LIMIT = 25;
+export const BREAKDOWN_VALUES_LIMIT_FOR_COUNTRIES = 300;
+
+export enum LimitContext {
+  QUERY = "query",
+  QUERY_ASYNC = "query_async",
+  EXPORT = "export",
+  COHORT_CALCULATION = "cohort_calculation",
+  HEATMAPS = "heatmaps",
+  SAVED_QUERY = "saved_query",
+  RETENTION = "retention",
+}
+
+// Settings applied at the SELECT level
+export interface TSQLQuerySettings {
+  optimize_aggregation_in_order?: boolean;
+  date_time_output_format?: string;
+  date_time_input_format?: string;
+  join_algorithm?: string;
+}
+
+// Settings applied on top of all TSQL queries
+export interface TSQLGlobalSettings extends TSQLQuerySettings {
+  readonly?: number;
+  max_execution_time?: number;
+  max_memory_usage?: number;
+  max_threads?: number;
+  allow_experimental_object_type?: boolean;
+  format_csv_allow_double_quotes?: boolean;
+  max_ast_elements?: number;
+  max_expanded_ast_elements?: number;
+  max_bytes_before_external_group_by?: number;
+  allow_experimental_analyzer?: boolean;
+  transform_null_in?: boolean;
+  optimize_min_equality_disjunction_chain_length?: number;
+  allow_experimental_join_condition?: boolean;
+  preferred_block_size_bytes?: number;
+  use_hive_partitioning?: number;
+}
diff --git a/internal-packages/tsql/src/query/context.ts b/internal-packages/tsql/src/query/context.ts
new file mode 100644
index 00000000000..249d3faa282
--- /dev/null
+++ b/internal-packages/tsql/src/query/context.ts
@@ -0,0 +1,56 @@
+// TypeScript translation of posthog/hogql/context.py
+
+import type { LimitContext } from "./constants";
+import type { Database } from "./database";
+import type { PropertySwapper } from "./property_types";
+import type { TSQLTimings } from "./timings";
+
+export interface TSQLNotice {
+  start?: number;
+  end?: number;
+  message: string;
+  fix?: string;
+}
+
+export interface TSQLQueryModifiers {
+  optimizeJoinedFilters?: boolean;
+  debug?: boolean;
+  timings?: boolean;
+  useMaterializedViews?: boolean;
+  formatCsvAllowDoubleQuotes?: boolean;
+  convertToProjectTimezone?: boolean;
+  usePreaggregatedTableTransforms?: boolean;
+  optimizeProjections?: boolean;
+}
+
+export interface TSQLFieldAccess {
+  input: string[];
+  type?: "run";
+  field?: string;
+  sql: string;
+}
+
+export interface Team {
+  id: number;
+  project_id: number;
+}
+
+export interface TSQLContext {
+  team_id?: number;
+  team?: Team;
+  database?: Database;
+  values: Record<string, any>;
+  within_non_tsql_query?: boolean;
+  enable_select_queries?: boolean;
+  limit_top_select?: boolean;
+  limit_context?: LimitContext;
+  output_format?: string | null;
+  globals?: Record<string, any>;
+  warnings: TSQLNotice[];
+  notices: TSQLNotice[];
+  errors: TSQLNotice[];
+  timings: TSQLTimings;
+  modifiers: TSQLQueryModifiers;
+  debug?: boolean;
+  property_swapper?: PropertySwapper;
+}
diff --git a/internal-packages/tsql/src/query/database.ts b/internal-packages/tsql/src/query/database.ts
new file mode 100644
index 00000000000..e91e0132c53
--- /dev/null
+++ b/internal-packages/tsql/src/query/database.ts
@@ -0,0 +1,585 @@
+// TypeScript translation of posthog/hogql/database/database.py
+//
+// NOTE: This implementation requires database/ORM access for:
+// - serialize() method (needs DataWarehouseTable, DataWarehouseSavedQuery queries)
+// - create_for() method (needs Team, DataWarehouseJoin, DataWarehouseSavedQuery queries)
+// Adapt these methods to your database/ORM setup
+
+import type { ConstantType } from "./ast";
+import type { TSQLContext, TSQLQueryModifiers, Team } from "./context";
+import type {
+  DatabaseField,
+  ExpressionField,
+  FieldOrTable,
+  FieldTraverser,
+  LazyJoin,
+  Table,
+  TableNode,
+  VirtualTable,
+} from "./models";
+import type { TSQLTimings } from "./timings";
+import { QueryError, ResolutionError } from "./errors";
+import { TSQLTimings as TSQLTimingsClass } from "./timings";
+
+// Type definitions for schema serialization (adapt to your schema types)
+export interface DatabaseSchemaTable {
+  fields: Record<string, DatabaseSchemaField>;
+  id: string;
+  name: string;
+}
+
+export interface DatabaseSchemaSystemTable extends DatabaseSchemaTable {
+  fields: Record<string, DatabaseSchemaField>;
+  id: string;
+  name: string;
+}
+
+export interface DatabaseSchemaDataWarehouseTable extends DatabaseSchemaTable {
+  fields: Record<string, DatabaseSchemaField>;
+  id: string;
+  name: string;
+  format?: string;
+  url_pattern?: string;
+  schema?: DatabaseSchemaSchema;
+  source?: DatabaseSchemaSource;
+  row_count?: number;
+}
+
+export interface DatabaseSchemaViewTable extends DatabaseSchemaTable {
+  fields: Record<string, DatabaseSchemaField>;
+  id: string;
+  name: string;
+  query: { query: string };
+  row_count?: number;
+}
+
+export interface DatabaseSchemaManagedViewTable extends DatabaseSchemaTable {
+  fields: Record<string, DatabaseSchemaField>;
+  id: string;
+  name: string;
+  kind: string;
+  source_id?: string;
+  query: { query: string };
+}
+
+export interface DatabaseSchemaEndpointTable extends DatabaseSchemaTable {
+  fields: Record<string, DatabaseSchemaField>;
+  id: string;
+  name: string;
+  query: { query: string };
+  row_count?: number;
+  status?: string;
+}
+
+export interface DatabaseSchemaField {
+  name: string;
+  tsql_value: string;
+  type: DatabaseSerializedFieldType;
+  schema_valid: boolean;
+  fields?: string[];
+  table?: string;
+  chain?: Array<string | number>;
+  id?: string;
+}
+
+export interface DatabaseSchemaSchema {
+  id: string;
+  name: string;
+  should_sync: boolean;
+  incremental: boolean;
+  status: string;
+  last_synced_at: string;
+}
+
+export interface DatabaseSchemaSource {
+  id: string;
+  status: string;
+  source_type: string;
+  prefix: string;
+  last_synced_at?: string | null;
+}
+
+export enum DatabaseSerializedFieldType {
+  STRING = "string",
+  INTEGER = "integer",
+  FLOAT = "float",
+  DECIMAL = "decimal",
+  BOOLEAN = "boolean",
+  DATE = "date",
+  DATETIME = "datetime",
+  UUID = "uuid",
+  ARRAY = "array",
+  JSON = "json",
+  TUPLE = "tuple",
+  UNKNOWN = "unknown",
+  EXPRESSION = "expression",
+  VIEW = "view",
+  LAZY_TABLE = "lazy_table",
+  VIRTUAL_TABLE = "virtual_table",
+  FIELD_TRAVERSER = "field_traverser",
+}
+
+export interface SerializedField {
+  key: string;
+  name: string;
+  type: DatabaseSerializedFieldType;
+  schema_valid: boolean;
+  fields?: string[];
+  table?: string;
+  chain?: Array<string | number>;
+}
+
+import { TableNodeImpl } from "./models";
+
+export class Database {
+  // Users can query from the tables below
+  tables: TableNode;
+
+  private _warehouseTableNames: string[] = [];
+  private _warehouseSelfManagedTableNames: string[] = [];
+  private _viewTableNames: string[] = [];
+  private _coreTableNames: string[] = [];
+
+  private _timezone?: string | null;
+  private _weekStartDay?: string | null; // WeekStartDay enum
+
+  private _serializationErrors: Record<string, string> = {};
+
+  constructor(timezone?: string | null, weekStartDay?: string | null) {
+    // Initialize with root TableNode
+    this.tables = new TableNodeImpl("root");
+    this._timezone = timezone || null;
+    this._weekStartDay = weekStartDay || null;
+  }
+
+  getTimezone(): string {
+    return this._timezone || "UTC";
+  }
+
+  getWeekStartDay(): string {
+    return this._weekStartDay || "sunday"; // Adapt to your WeekStartDay enum
+  }
+
+  getSerializationErrors(): Record<string, string> {
+    /** Return any errors encountered during serialization. */
+    return { ...this._serializationErrors };
+  }
+
+  hasTable(tableName: string | string[]): boolean {
+    const path = typeof tableName === "string" ? tableName.split(".") : tableName;
+    return this.tables.has_child ? this.tables.has_child(path) : false;
+  }
+
+  getTableNode(tableName: string | string[]): TableNode {
+    let path: string[];
+    if (typeof tableName === "string") {
+      path = tableName.split(".");
+    } else {
+      path = tableName;
+    }
+
+    // Handle edge case where tableName is a list with a single string containing dots
+    if (path.length === 1 && path[0].includes(".")) {
+      path = path[0].split(".");
+    }
+
+    if (!this.tables.get_child) {
+      throw new ResolutionError(`TableNode.get_child not implemented`);
+    }
+    return this.tables.get_child(path);
+  }
+
+  getTable(tableName: string | string[]): Table {
+    try {
+      const node = this.getTableNode(tableName);
+      if (!node.get) {
+        throw new ResolutionError("TableNode.get not implemented");
+      }
+      const table = node.get();
+      if (!table || typeof table !== "object" || !("fields" in table)) {
+        throw new ResolutionError("Table is not set");
+      }
+      return table as Table;
+    } catch (e) {
+      const name = Array.isArray(tableName) ? tableName.join(".") : tableName;
+      if (e instanceof ResolutionError) {
+        throw new QueryError(`Unknown table \`${name}\`.`);
+      }
+      throw e;
+    }
+  }
+
+  getAllTableNames(): string[] {
+    const warehouseTableNames = this._warehouseTableNames.filter((x) => x.includes("."));
+
+    return [
+      ...this._coreTableNames,
+      ...warehouseTableNames,
+      ...this._warehouseSelfManagedTableNames,
+      ...this._viewTableNames,
+    ];
+  }
+
+  // Core tables exposed via SQL editor autocomplete and data management
+  getCoreTableNames(): string[] {
+    return [...this._coreTableNames, ...this.getSystemTableNames()];
+  }
+
+  getSystemTableNames(): string[] {
+    const systemNode = this.tables.children["system"];
+    if (systemNode && systemNode.resolve_all_table_names) {
+      return ["query_log", ...systemNode.resolve_all_table_names()];
+    }
+    return ["query_log"];
+  }
+
+  getWarehouseTableNames(): string[] {
+    return [...this._warehouseTableNames, ...this._warehouseSelfManagedTableNames];
+  }
+
+  getViewNames(): string[] {
+    return this._viewTableNames;
+  }
+
+  addCoreTable(tableName: string, node: TableNode): void {
+    if (this.tables.add_child) {
+      this.tables.add_child(node);
+    }
+    this._coreTableNames.push(tableName);
+  }
+
+  private _addWarehouseTables(node: TableNode): void {
+    if (this.tables.merge_with) {
+      this.tables.merge_with(node);
+    }
+    if (node.resolve_all_table_names) {
+      const names = node.resolve_all_table_names();
+      this._warehouseTableNames.push(...names.sort());
+    }
+  }
+
+  private _addWarehouseSelfManagedTables(node: TableNode): void {
+    if (this.tables.merge_with) {
+      this.tables.merge_with(node);
+    }
+    if (node.resolve_all_table_names) {
+      const names = node.resolve_all_table_names();
+      this._warehouseSelfManagedTableNames.push(...names.sort());
+    }
+  }
+
+  private _addViews(node: TableNode): void {
+    if (this.tables.merge_with) {
+      this.tables.merge_with(node);
+    }
+    if (node.resolve_all_table_names) {
+      const names = node.resolve_all_table_names();
+      this._viewTableNames.push(...names.sort());
+    }
+  }
+
+  serialize(context: TSQLContext, includeOnly?: Set<string>): Record<string, DatabaseSchemaTable> {
+    // NOTE: This method requires database queries to fetch:
+    // - DataWarehouseTable objects
+    // - DataWarehouseSavedQuery objects
+    // - External data sources and schemas
+    //
+    // Adapt this to your database/ORM setup
+
+    const tables: Record<string, DatabaseSchemaTable> = {};
+
+    if (!context.team_id) {
+      throw new ResolutionError("Must provide team_id to serialize database");
+    }
+
+    // Core tables
+    const coreTableNames = this.getCoreTableNames();
+    for (const tableName of coreTableNames) {
+      if (includeOnly && !includeOnly.has(tableName)) {
+        continue;
+      }
+
+      let fieldInput: Record<string, FieldOrTable> = {};
+      const table = this.getTable(tableName);
+      if ("get_asterisk" in table && typeof table.get_asterisk === "function") {
+        fieldInput = table.get_asterisk() || {};
+      } else if ("fields" in table) {
+        fieldInput = table.fields;
+      }
+
+      const fields = serializeFields(fieldInput, context, tableName.split("."), undefined);
+      const fieldsDict: Record<string, DatabaseSchemaField> = {};
+      for (const field of fields) {
+        fieldsDict[field.name] = field;
+      }
+      tables[tableName] = {
+        fields: fieldsDict,
+        id: tableName,
+        name: tableName,
+      } as DatabaseSchemaTable;
+    }
+
+    // System tables
+    const systemTables = this.getSystemTableNames();
+    for (const tableKey of systemTables) {
+      if (includeOnly && !includeOnly.has(tableKey)) {
+        continue;
+      }
+
+      let systemFieldInput: Record<string, FieldOrTable> = {};
+      const table = this.getTable(tableKey);
+      if ("get_asterisk" in table && typeof table.get_asterisk === "function") {
+        systemFieldInput = table.get_asterisk() || {};
+      } else if ("fields" in table) {
+        systemFieldInput = table.fields;
+      }
+
+      const fields = serializeFields(systemFieldInput, context, tableKey.split("."), undefined);
+      const fieldsDict: Record<string, DatabaseSchemaField> = {};
+      for (const field of fields) {
+        fieldsDict[field.name] = field;
+      }
+      tables[tableKey] = {
+        fields: fieldsDict,
+        id: tableKey,
+        name: tableKey,
+      } as DatabaseSchemaSystemTable;
+    }
+
+    // NOTE: Data Warehouse Tables and Views processing requires database queries
+    // Implement based on your database/ORM setup:
+    // - Fetch DataWarehouseTable objects
+    // - Fetch DataWarehouseSavedQuery objects
+    // - Process and serialize them
+
+    return tables;
+  }
+
+  static createFor(
+    teamId?: number,
+    options?: {
+      team?: Team;
+      modifiers?: TSQLQueryModifiers;
+      timings?: TSQLTimings;
+    }
+  ): Database {
+    // NOTE: This method requires extensive database/ORM access:
+    // - Team model queries
+    // - DataWarehouseTable queries
+    // - DataWarehouseSavedQuery queries
+    // - DataWarehouseJoin queries
+    // - GroupTypeMapping queries
+    // - Feature flag checks
+    //
+    // This is a skeleton structure - adapt to your setup
+
+    const timings = options?.timings || new TSQLTimingsClass();
+    const { team, modifiers } = options || {};
+
+    // Validate team/teamId
+    if (!teamId && !team) {
+      throw new Error("Either team_id or team must be provided");
+    }
+
+    if (team && teamId && team.id !== teamId) {
+      throw new Error("team_id and team must be the same");
+    }
+
+    // NOTE: Fetch team from database if not provided
+    // const fetchedTeam = team || await Team.findById(teamId);
+
+    // Create database instance
+    const database = timings.measure("database", () => {
+      // NOTE: Get timezone and week_start_day from team
+      // const timezone = fetchedTeam.timezone;
+      // const weekStartDay = fetchedTeam.week_start_day;
+      return new Database(undefined, undefined);
+    });
+
+    // NOTE: Apply modifiers, setup tables, etc.
+    // This requires extensive database access and table setup logic
+
+    return database;
+  }
+}
+
+// Helper functions
+
+const TSQL_CHARACTERS_TO_BE_WRAPPED = ["@", "-", "!", "$", "+"];
+
+function constantTypeToSerializedFieldType(
+  constantType: ConstantType
+): DatabaseSerializedFieldType | null {
+  // Type checking for ConstantType subtypes
+  // NOTE: In TypeScript, we need to check properties rather than instanceof
+  // since these are interfaces, not classes
+
+  if ("data_type" in constantType) {
+    const dataType = constantType.data_type;
+    if (dataType === "str") {
+      return DatabaseSerializedFieldType.STRING;
+    }
+    if (dataType === "bool") {
+      return DatabaseSerializedFieldType.BOOLEAN;
+    }
+    if (dataType === "date") {
+      return DatabaseSerializedFieldType.DATE;
+    }
+    if (dataType === "datetime") {
+      return DatabaseSerializedFieldType.DATETIME;
+    }
+    if (dataType === "uuid") {
+      return DatabaseSerializedFieldType.STRING;
+    }
+    if (dataType === "array") {
+      return DatabaseSerializedFieldType.ARRAY;
+    }
+    if (dataType === "tuple") {
+      return DatabaseSerializedFieldType.JSON;
+    }
+    if (dataType === "int") {
+      return DatabaseSerializedFieldType.INTEGER;
+    }
+    if (dataType === "float") {
+      return DatabaseSerializedFieldType.FLOAT;
+    }
+  }
+
+  // Fallback: check print_type if available
+  if ("print_type" in constantType && typeof constantType.print_type === "function") {
+    const printed = constantType.print_type();
+    if (printed === "String" || printed === "JSON" || printed === "Array") {
+      return printed === "String"
+        ? DatabaseSerializedFieldType.STRING
+        : printed === "JSON"
+        ? DatabaseSerializedFieldType.JSON
+        : DatabaseSerializedFieldType.ARRAY;
+    }
+    if (printed === "Boolean") return DatabaseSerializedFieldType.BOOLEAN;
+    if (printed === "Date") return DatabaseSerializedFieldType.DATE;
+    if (printed === "DateTime") return DatabaseSerializedFieldType.DATETIME;
+    if (printed === "UUID") return DatabaseSerializedFieldType.STRING;
+    if (printed === "Integer") return DatabaseSerializedFieldType.INTEGER;
+    if (printed === "Float") return DatabaseSerializedFieldType.FLOAT;
+    if (printed === "Decimal") return DatabaseSerializedFieldType.DECIMAL;
+  }
+
+  return null;
+}
+
+export function serializeFields(
+  fieldInput: Record<string, FieldOrTable>,
+  context: TSQLContext,
+  tableChain: string[],
+  dbColumns?: Record<string, any> // DataWarehouseTableColumns
+): DatabaseSchemaField[] {
+  // NOTE: This requires resolve_types_from_table from resolver
+  // Import as needed: import { resolveTypesFromTable } from '../resolver';
+
+  const fieldOutput: DatabaseSchemaField[] = [];
+
+  for (const [fieldKey, field] of Object.entries(fieldInput)) {
+    let schemaValid = true;
+
+    if (dbColumns) {
+      const column = dbColumns[fieldKey];
+      if (typeof column === "string") {
+        schemaValid = true;
+      } else if (column && typeof column === "object") {
+        schemaValid = column.valid !== false;
+      }
+    }
+
+    let tsqlValue: string;
+    if (TSQL_CHARACTERS_TO_BE_WRAPPED.some((char) => fieldKey.includes(char))) {
+      tsqlValue = `\`${fieldKey}\``;
+    } else {
+      tsqlValue = fieldKey;
+    }
+
+    if ("hidden" in field && field.hidden) {
+      continue;
+    }
+
+    if ("name" in field && "get_constant_type" in field) {
+      // DatabaseField
+      const dbField = field as DatabaseField;
+      let fieldType: DatabaseSerializedFieldType;
+
+      // Determine field type based on DatabaseField subclass
+      // NOTE: You'll need to check instanceof or use type guards
+      // For now, using a simplified approach
+      if (dbField.get_constant_type) {
+        const constantType = dbField.get_constant_type();
+        fieldType =
+          constantTypeToSerializedFieldType(constantType) || DatabaseSerializedFieldType.UNKNOWN;
+      } else {
+        fieldType = DatabaseSerializedFieldType.UNKNOWN;
+      }
+
+      fieldOutput.push({
+        name: fieldKey,
+        tsql_value: tsqlValue,
+        type: fieldType,
+        schema_valid: schemaValid,
+      });
+    } else if ("expr" in field) {
+      // ExpressionField
+      const exprField = field as ExpressionField;
+      // NOTE: Requires resolve_types_from_table
+      // const resolvedExpr = resolveTypesFromTable(exprField.expr, tableChain, context, 'tsql');
+      // const constantType = resolvedExpr.type?.resolve_constant_type(context);
+      // const fieldType = constantTypeToSerializedFieldType(constantType) || DatabaseSerializedFieldType.EXPRESSION;
+
+      fieldOutput.push({
+        name: fieldKey,
+        tsql_value: tsqlValue,
+        type: DatabaseSerializedFieldType.EXPRESSION,
+        schema_valid: schemaValid,
+      });
+    } else if ("resolve_table" in field) {
+      // LazyJoin
+      const lazyJoin = field as LazyJoin;
+      if (lazyJoin.resolve_table) {
+        const resolvedTable = lazyJoin.resolve_table(context);
+        const type =
+          "id" in resolvedTable && resolvedTable.id
+            ? DatabaseSerializedFieldType.VIEW
+            : DatabaseSerializedFieldType.LAZY_TABLE;
+
+        fieldOutput.push({
+          name: fieldKey,
+          tsql_value: tsqlValue,
+          type,
+          schema_valid: schemaValid,
+          table: resolvedTable.to_printed_tsql ? resolvedTable.to_printed_tsql() : fieldKey,
+          fields: "fields" in resolvedTable ? Object.keys(resolvedTable.fields) : [],
+          id: "id" in resolvedTable && resolvedTable.id ? String(resolvedTable.id) : fieldKey,
+        });
+      }
+    } else if ("fields" in field && !("resolve_table" in field)) {
+      // VirtualTable
+      const virtualTable = field as VirtualTable;
+      fieldOutput.push({
+        name: fieldKey,
+        tsql_value: tsqlValue,
+        type: DatabaseSerializedFieldType.VIRTUAL_TABLE,
+        schema_valid: schemaValid,
+        table: virtualTable.to_printed_tsql ? virtualTable.to_printed_tsql() : fieldKey,
+        fields: Object.keys(virtualTable.fields),
+      });
+    } else if ("chain" in field) {
+      // FieldTraverser
+      const traverser = field as FieldTraverser;
+      fieldOutput.push({
+        name: fieldKey,
+        tsql_value: tsqlValue,
+        type: DatabaseSerializedFieldType.FIELD_TRAVERSER,
+        schema_valid: schemaValid,
+        chain: traverser.chain,
+      });
+    }
+  }
+
+  return fieldOutput;
+}
diff --git a/internal-packages/tsql/src/query/errors.ts b/internal-packages/tsql/src/query/errors.ts
new file mode 100644
index 00000000000..c0da0d3cefb
--- /dev/null
+++ b/internal-packages/tsql/src/query/errors.ts
@@ -0,0 +1,61 @@
+// TypeScript translation of posthog/hogql/errors.py
+
+import type { Expr } from "./ast";
+
+export class BaseTSQLError extends Error {
+  message: string;
+  start?: number;
+  end?: number;
+
+  constructor(
+    message: string,
+    options?: {
+      start?: number;
+      end?: number;
+      node?: Expr;
+    }
+  ) {
+    super(message);
+    this.message = message;
+
+    if (options?.node && options.node.start !== undefined && options.node.end !== undefined) {
+      this.start = options.node.start;
+      this.end = options.node.end;
+    } else {
+      this.start = options?.start;
+      this.end = options?.end;
+    }
+  }
+}
+
+export class ExposedTSQLError extends BaseTSQLError {
+  /** An exception that can be exposed to the user. */
+}
+
+export class InternalTSQLError extends BaseTSQLError {
+  /** An internal exception in the TSQL engine. */
+}
+
+export class SyntaxError extends ExposedTSQLError {
+  /** The input does not conform to TSQL syntax. */
+}
+
+export class QueryError extends ExposedTSQLError {
+  /** The query is invalid, though correct syntactically. */
+}
+
+export class NotImplementedError extends InternalTSQLError {
+  /** This feature isn't implemented in TSQL (yet). */
+}
+
+export class ParsingError extends InternalTSQLError {
+  /** Parsing failed. */
+}
+
+export class ImpossibleASTError extends InternalTSQLError {
+  /** Parsing or resolution resulted in an impossible AST. */
+}
+
+export class ResolutionError extends InternalTSQLError {
+  /** Resolution of a table/field/expression failed. */
+}
diff --git a/internal-packages/tsql/src/query/escape.test.ts b/internal-packages/tsql/src/query/escape.test.ts
new file mode 100644
index 00000000000..5a74926dbb4
--- /dev/null
+++ b/internal-packages/tsql/src/query/escape.test.ts
@@ -0,0 +1,241 @@
+import { describe, it, expect } from "vitest";
+import {
+  escapeClickHouseIdentifier,
+  escapeTSQLIdentifier,
+  escapeClickHouseString,
+  escapeTSQLString,
+  getClickHouseType,
+  SQLValueEscaper,
+  safeIdentifier,
+} from "./escape.js";
+import { QueryError } from "./errors.js";
+
+describe("escapeClickHouseIdentifier", () => {
+  it("should pass through simple identifiers", () => {
+    expect(escapeClickHouseIdentifier("id")).toBe("id");
+    expect(escapeClickHouseIdentifier("user_name")).toBe("user_name");
+    expect(escapeClickHouseIdentifier("Column1")).toBe("Column1");
+    expect(escapeClickHouseIdentifier("_private")).toBe("_private");
+  });
+
+  it("should escape identifiers with special characters", () => {
+    expect(escapeClickHouseIdentifier("my column")).toBe("`my column`");
+    expect(escapeClickHouseIdentifier("table-name")).toBe("`table-name`");
+    expect(escapeClickHouseIdentifier("column.with.dots")).toBe("`column.with.dots`");
+  });
+
+  it("should escape identifiers starting with numbers", () => {
+    expect(escapeClickHouseIdentifier("1column")).toBe("`1column`");
+    expect(escapeClickHouseIdentifier("123")).toBe("`123`");
+  });
+
+  it("should escape backticks in identifiers", () => {
+    expect(escapeClickHouseIdentifier("column`name")).toBe("`column\\`name`");
+  });
+
+  it("should escape control characters", () => {
+    expect(escapeClickHouseIdentifier("col\nname")).toBe("`col\\nname`");
+    expect(escapeClickHouseIdentifier("col\tname")).toBe("`col\\tname`");
+  });
+
+  it("should throw for identifiers containing %", () => {
+    expect(() => escapeClickHouseIdentifier("column%name")).toThrow(QueryError);
+  });
+});
+
+describe("escapeTSQLIdentifier", () => {
+  it("should pass through simple identifiers", () => {
+    expect(escapeTSQLIdentifier("id")).toBe("id");
+    expect(escapeTSQLIdentifier("user_name")).toBe("user_name");
+  });
+
+  it("should allow dollar signs in identifiers", () => {
+    expect(escapeTSQLIdentifier("$property")).toBe("$property");
+    expect(escapeTSQLIdentifier("property$value")).toBe("property$value");
+  });
+
+  it("should handle numeric identifiers", () => {
+    expect(escapeTSQLIdentifier(0)).toBe("0");
+    expect(escapeTSQLIdentifier(123)).toBe("123");
+  });
+
+  it("should throw for identifiers containing %", () => {
+    expect(() => escapeTSQLIdentifier("column%name")).toThrow(QueryError);
+  });
+});
+
+describe("SQLValueEscaper", () => {
+  describe("ClickHouse dialect", () => {
+    const escaper = new SQLValueEscaper({ dialect: "clickhouse" });
+
+    it("should escape null", () => {
+      expect(escaper.visit(null)).toBe("NULL");
+      expect(escaper.visit(undefined)).toBe("NULL");
+    });
+
+    it("should escape booleans as numbers", () => {
+      expect(escaper.visit(true)).toBe("1");
+      expect(escaper.visit(false)).toBe("0");
+    });
+
+    it("should escape integers", () => {
+      expect(escaper.visit(0)).toBe("0");
+      expect(escaper.visit(42)).toBe("42");
+      expect(escaper.visit(-100)).toBe("-100");
+    });
+
+    it("should escape floats", () => {
+      expect(escaper.visit(3.14)).toBe("3.14");
+      expect(escaper.visit(-0.5)).toBe("-0.5");
+    });
+
+    it("should escape special floats", () => {
+      expect(escaper.visit(NaN)).toBe("NaN");
+      expect(escaper.visit(Infinity)).toBe("Inf");
+      expect(escaper.visit(-Infinity)).toBe("-Inf");
+    });
+
+    it("should escape strings with quotes", () => {
+      expect(escaper.visit("hello")).toBe("'hello'");
+      expect(escaper.visit("hello'world")).toBe("'hello\\'world'");
+    });
+
+    it("should escape strings with control characters", () => {
+      expect(escaper.visit("line1\nline2")).toBe("'line1\\nline2'");
+      expect(escaper.visit("col1\tcol2")).toBe("'col1\\tcol2'");
+    });
+
+    it("should escape arrays", () => {
+      expect(escaper.visit([1, 2, 3])).toBe("[1, 2, 3]");
+      expect(escaper.visit(["a", "b"])).toBe("['a', 'b']");
+      expect(escaper.visit(["hello", "world"])).toBe("['hello', 'world']");
+    });
+
+    it("should escape nested arrays", () => {
+      expect(
+        escaper.visit([
+          [1, 2],
+          [3, 4],
+        ])
+      ).toBe("[[1, 2], [3, 4]]");
+    });
+
+    it("should escape dates with toDateTime64 and default UTC timezone", () => {
+      const date = new Date("2024-01-15T10:30:00.500Z");
+      const result = escaper.visit(date);
+      expect(result).toBe("toDateTime64('2024-01-15 10:30:00.500000', 6, 'UTC')");
+    });
+
+    it("should escape dates with custom timezone", () => {
+      const escaperWithTz = new SQLValueEscaper({
+        dialect: "clickhouse",
+        timezone: "America/New_York",
+      });
+      const date = new Date("2024-01-15T10:30:00.500Z");
+      const result = escaperWithTz.visit(date);
+      expect(result).toBe("toDateTime64('2024-01-15 10:30:00.500000', 6, 'America/New_York')");
+    });
+  });
+
+  describe("TSQL dialect", () => {
+    const escaper = new SQLValueEscaper({ dialect: "tsql" });
+
+    it("should escape booleans as keywords", () => {
+      expect(escaper.visit(true)).toBe("true");
+      expect(escaper.visit(false)).toBe("false");
+    });
+
+    it("should escape dates with toDateTime and default UTC timezone", () => {
+      const date = new Date("2024-01-15T10:30:00.500Z");
+      const result = escaper.visit(date);
+      expect(result).toBe("toDateTime('2024-01-15 10:30:00.500000', 'UTC')");
+    });
+
+    it("should escape dates with custom timezone", () => {
+      const escaperWithTz = new SQLValueEscaper({
+        dialect: "tsql",
+        timezone: "Europe/London",
+      });
+      const date = new Date("2024-01-15T10:30:00.500Z");
+      const result = escaperWithTz.visit(date);
+      expect(result).toBe("toDateTime('2024-01-15 10:30:00.500000', 'Europe/London')");
+    });
+  });
+});
+
+describe("escapeClickHouseString", () => {
+  it("should escape string values", () => {
+    expect(escapeClickHouseString("test")).toBe("'test'");
+  });
+
+  it("should handle null", () => {
+    expect(escapeClickHouseString(null)).toBe("NULL");
+  });
+
+  it("should handle numbers", () => {
+    expect(escapeClickHouseString(42)).toBe("42");
+  });
+});
+
+describe("escapeTSQLString", () => {
+  it("should escape string values", () => {
+    expect(escapeTSQLString("test")).toBe("'test'");
+  });
+
+  it("should handle booleans differently from ClickHouse", () => {
+    expect(escapeTSQLString(true)).toBe("true");
+    expect(escapeTSQLString(false)).toBe("false");
+  });
+});
+
+describe("getClickHouseType", () => {
+  it("should return String for strings", () => {
+    expect(getClickHouseType("hello")).toBe("String");
+  });
+
+  it("should return UInt8 for booleans", () => {
+    expect(getClickHouseType(true)).toBe("UInt8");
+    expect(getClickHouseType(false)).toBe("UInt8");
+  });
+
+  it("should return Int32 for small integers", () => {
+    expect(getClickHouseType(42)).toBe("Int32");
+    expect(getClickHouseType(-100)).toBe("Int32");
+  });
+
+  it("should return Int64 for large integers", () => {
+    expect(getClickHouseType(3000000000)).toBe("Int64");
+    expect(getClickHouseType(-3000000000)).toBe("Int64");
+  });
+
+  it("should return Float64 for floats", () => {
+    expect(getClickHouseType(3.14)).toBe("Float64");
+  });
+
+  it("should return DateTime64(6) for dates", () => {
+    expect(getClickHouseType(new Date())).toBe("DateTime64(6)");
+  });
+
+  it("should return Array type for arrays", () => {
+    expect(getClickHouseType(["a", "b"])).toBe("Array(String)");
+    expect(getClickHouseType([1, 2])).toBe("Array(Int32)");
+    expect(getClickHouseType([])).toBe("Array(String)");
+  });
+
+  it("should return Nullable(String) for null", () => {
+    expect(getClickHouseType(null)).toBe("Nullable(String)");
+    expect(getClickHouseType(undefined)).toBe("Nullable(String)");
+  });
+});
+
+describe("safeIdentifier", () => {
+  it("should return identifier unchanged if no %", () => {
+    expect(safeIdentifier("column")).toBe("column");
+    expect(safeIdentifier("table_name")).toBe("table_name");
+  });
+
+  it("should remove % characters", () => {
+    expect(safeIdentifier("column%name")).toBe("columnname");
+    expect(safeIdentifier("%%test%%")).toBe("test");
+  });
+});
diff --git a/internal-packages/tsql/src/query/escape.ts b/internal-packages/tsql/src/query/escape.ts
new file mode 100644
index 00000000000..c0762d365bf
--- /dev/null
+++ b/internal-packages/tsql/src/query/escape.ts
@@ -0,0 +1,265 @@
+// TypeScript port of posthog/hogql/escape_sql.py
+// Keep this file in sync with the Python version
+
+import { QueryError } from "./errors";
+
+/**
+ * Character escape maps for ClickHouse string escaping
+ * Copied from clickhouse_driver.util.escape
+ *
+ * Note: In JavaScript, \a and \v are not recognized escape sequences like in Python.
+ * We use the actual ASCII codes: \x07 for bell (Python's \a) and \x0B for vertical tab.
+ */
+const escapeCharsMap: Record<string, string> = {
+  "\b": "\\b",
+  "\f": "\\f",
+  "\r": "\\r",
+  "\n": "\\n",
+  "\t": "\\t",
+  "\0": "\\0",
+  "\x07": "\\a", // Bell character (ASCII 7) - Python's \a
+  "\x0B": "\\v", // Vertical tab (ASCII 11) - use explicit code since JS \v may not work in all contexts
+  "\\": "\\\\",
+};
+
+const singlequoteEscapeCharsMap: Record<string, string> = {
+  ...escapeCharsMap,
+  "'": "\\'",
+};
+
+const backquoteEscapeCharsMap: Record<string, string> = {
+  ...escapeCharsMap,
+  "`": "\\`",
+};
+
+/**
+ * Sanitize an identifier by removing % characters
+ */
+export function safeIdentifier(identifier: string): string {
+  if (identifier.includes("%")) {
+    return identifier.replace(/%/g, "");
+  }
+  return identifier;
+}
+
+/**
+ * Escape a string value for use as a parameter in ClickHouse
+ * Copied from clickhouse_driver.util.escape_param
+ */
+export function escapeParamClickhouse(value: string): string {
+  const escaped = value
+    .split("")
+    .map((c) => singlequoteEscapeCharsMap[c] || c)
+    .join("");
+  return `'${escaped}'`;
+}
+
+/**
+ * Escape an identifier for use in TSQL/HogQL queries
+ * Adapted from clickhouse_driver.util.escape with support for $ in identifiers
+ */
+export function escapeTSQLIdentifier(identifier: string | number): string {
+  if (typeof identifier === "number") {
+    // In TSQL we allow integers as identifiers to access array elements
+    return String(identifier);
+  }
+
+  if (identifier.includes("%")) {
+    throw new QueryError(
+      `The TSQL identifier "${identifier}" is not permitted as it contains the "%" character`
+    );
+  }
+
+  // TSQL allows dollars in the identifier (same regex as frontend escapePropertyAsTSQLIdentifier)
+  if (/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(identifier)) {
+    return identifier;
+  }
+
+  const escaped = identifier
+    .split("")
+    .map((c) => backquoteEscapeCharsMap[c] || c)
+    .join("");
+  return `\`${escaped}\``;
+}
+
+/**
+ * Escape an identifier for use in ClickHouse queries
+ * Copied from clickhouse_driver.util.escape, adapted from single quotes to backquotes
+ */
+export function escapeClickHouseIdentifier(identifier: string): string {
+  if (identifier.includes("%")) {
+    throw new QueryError(
+      `The identifier "${identifier}" is not permitted as it contains the "%" character`
+    );
+  }
+
+  if (/^[A-Za-z_][A-Za-z0-9_]*$/.test(identifier)) {
+    return identifier;
+  }
+
+  const escaped = identifier
+    .split("")
+    .map((c) => backquoteEscapeCharsMap[c] || c)
+    .join("");
+  return `\`${escaped}\``;
+}
+
+/**
+ * Type for values that can be escaped as SQL strings
+ */
+export type EscapableValue =
+  | null
+  | undefined
+  | string
+  | number
+  | boolean
+  | Date
+  | EscapableValue[]
+  | [EscapableValue, ...EscapableValue[]];
+
+/**
+ * SQL Value Escaper class that handles different types of values
+ * Port of SQLValueEscaper from escape_sql.py
+ */
+export class SQLValueEscaper {
+  private timezone: string;
+  private dialect: "tsql" | "clickhouse";
+
+  constructor(options: { timezone?: string; dialect?: "tsql" | "clickhouse" } = {}) {
+    this.timezone = options.timezone || "UTC";
+    this.dialect = options.dialect || "clickhouse";
+  }
+
+  visit(value: EscapableValue): string {
+    if (value === null || value === undefined) {
+      return this.visitNull();
+    }
+    if (typeof value === "string") {
+      return this.visitString(value);
+    }
+    if (typeof value === "boolean") {
+      return this.visitBoolean(value);
+    }
+    if (typeof value === "number") {
+      if (Number.isInteger(value)) {
+        return this.visitInt(value);
+      }
+      return this.visitFloat(value);
+    }
+    if (value instanceof Date) {
+      return this.visitDateTime(value);
+    }
+    if (Array.isArray(value)) {
+      return this.visitArray(value);
+    }
+
+    throw new QueryError(`SQLValueEscaper cannot handle value of type ${typeof value}`);
+  }
+
+  private visitNull(): string {
+    return "NULL";
+  }
+
+  private visitString(value: string): string {
+    return escapeParamClickhouse(value);
+  }
+
+  private visitBoolean(value: boolean): string {
+    if (this.dialect === "clickhouse") {
+      return value ? "1" : "0";
+    }
+    return value ? "true" : "false";
+  }
+
+  private visitInt(value: number): string {
+    return String(value);
+  }
+
+  private visitFloat(value: number): string {
+    if (Number.isNaN(value)) {
+      return "NaN";
+    }
+    if (!Number.isFinite(value)) {
+      return value < 0 ? "-Inf" : "Inf";
+    }
+    return String(value);
+  }
+
+  private visitDateTime(value: Date): string {
+    // Format: YYYY-MM-DD HH:MM:SS.ffffff
+    const pad = (n: number, len: number = 2) => String(n).padStart(len, "0");
+
+    const year = value.getUTCFullYear();
+    const month = pad(value.getUTCMonth() + 1);
+    const day = pad(value.getUTCDate());
+    const hours = pad(value.getUTCHours());
+    const minutes = pad(value.getUTCMinutes());
+    const seconds = pad(value.getUTCSeconds());
+    const ms = pad(value.getUTCMilliseconds(), 3);
+
+    const datetimeString = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${ms}000`;
+
+    if (this.dialect === "tsql") {
+      return `toDateTime(${this.visitString(datetimeString)}, ${this.visitString(this.timezone)})`;
+    }
+    return `toDateTime64(${this.visitString(datetimeString)}, 6, ${this.visitString(
+      this.timezone
+    )})`;
+  }
+
+  private visitArray(value: EscapableValue[]): string {
+    return `[${value.map((x) => this.visit(x)).join(", ")}]`;
+  }
+}
+
+/**
+ * Escape a value for use in a TSQL/HogQL query string
+ */
+export function escapeTSQLString(value: EscapableValue, timezone?: string): string {
+  return new SQLValueEscaper({ timezone, dialect: "tsql" }).visit(value);
+}
+
+/**
+ * Escape a value for use in a ClickHouse query string
+ */
+export function escapeClickHouseString(value: EscapableValue, timezone?: string): string {
+  return new SQLValueEscaper({ timezone, dialect: "clickhouse" }).visit(value);
+}
+
+/**
+ * Get the ClickHouse type string for a value
+ * Used when creating parameterized query placeholders like {param: Type}
+ */
+export function getClickHouseType(value: unknown): string {
+  if (value === null || value === undefined) {
+    return "Nullable(String)";
+  }
+  if (typeof value === "string") {
+    return "String";
+  }
+  if (typeof value === "boolean") {
+    return "UInt8";
+  }
+  if (typeof value === "number") {
+    if (Number.isInteger(value)) {
+      // Use Int64 for large integers, Int32 for smaller ones
+      if (value > 2147483647 || value < -2147483648) {
+        return "Int64";
+      }
+      return "Int32";
+    }
+    return "Float64";
+  }
+  if (value instanceof Date) {
+    return "DateTime64(6)";
+  }
+  if (Array.isArray(value)) {
+    if (value.length === 0) {
+      return "Array(String)";
+    }
+    const itemType = getClickHouseType(value[0]);
+    return `Array(${itemType})`;
+  }
+  // Default to String for unknown types
+  return "String";
+}
diff --git a/internal-packages/tsql/src/query/functions.ts b/internal-packages/tsql/src/query/functions.ts
new file mode 100644
index 00000000000..d150b0636dd
--- /dev/null
+++ b/internal-packages/tsql/src/query/functions.ts
@@ -0,0 +1,648 @@
+// TypeScript port of posthog/hogql/functions/mapping.py and aggregations.py
+// Keep this file in sync with the Python version
+
+import { CompareOperationOp } from "./ast";
+
+/**
+ * Metadata for a TSQL function
+ */
+export interface TSQLFunctionMeta {
+  /** The ClickHouse function name to use */
+  clickhouseName: string;
+  /** Minimum number of arguments */
+  minArgs: number;
+  /** Maximum number of arguments (undefined means unlimited) */
+  maxArgs?: number;
+  /** Minimum number of parameters (for parametric functions) */
+  minParams?: number;
+  /** Maximum number of parameters */
+  maxParams?: number;
+  /** Whether this is an aggregate function */
+  aggregate?: boolean;
+  /** Whether function is case-sensitive */
+  caseSensitive?: boolean;
+  /** Whether function is timezone-aware (will append timezone as last arg) */
+  tzAware?: boolean;
+  /** Whether the function uses placeholder arguments like {} */
+  usingPlaceholderArguments?: boolean;
+}
+
+/**
+ * Comparison function mappings from function names to CompareOperationOp
+ */
+export const TSQL_COMPARISON_MAPPING: Record<string, CompareOperationOp> = {
+  equals: CompareOperationOp.Eq,
+  notEquals: CompareOperationOp.NotEq,
+  less: CompareOperationOp.Lt,
+  greater: CompareOperationOp.Gt,
+  lessOrEquals: CompareOperationOp.LtEq,
+  greaterOrEquals: CompareOperationOp.GtEq,
+  like: CompareOperationOp.Like,
+  ilike: CompareOperationOp.ILike,
+  notLike: CompareOperationOp.NotLike,
+  notILike: CompareOperationOp.NotILike,
+  in: CompareOperationOp.In,
+  notIn: CompareOperationOp.NotIn,
+};
+
+/**
+ * ClickHouse functions available in TSQL
+ * Port of HOGQL_CLICKHOUSE_FUNCTIONS from mapping.py
+ */
+export const TSQL_CLICKHOUSE_FUNCTIONS: Record<string, TSQLFunctionMeta> = {
+  // Comparison
+  equals: { clickhouseName: "equals", minArgs: 2, maxArgs: 2 },
+  notEquals: { clickhouseName: "notEquals", minArgs: 2, maxArgs: 2 },
+  less: { clickhouseName: "less", minArgs: 2, maxArgs: 2 },
+  greater: { clickhouseName: "greater", minArgs: 2, maxArgs: 2 },
+  lessOrEquals: { clickhouseName: "lessOrEquals", minArgs: 2, maxArgs: 2 },
+  greaterOrEquals: { clickhouseName: "greaterOrEquals", minArgs: 2, maxArgs: 2 },
+
+  // Logical
+  and: { clickhouseName: "and", minArgs: 2 },
+  or: { clickhouseName: "or", minArgs: 2 },
+  xor: { clickhouseName: "xor", minArgs: 2 },
+  not: { clickhouseName: "not", minArgs: 1, maxArgs: 1, caseSensitive: false },
+
+  // Conditional
+  if: { clickhouseName: "if", minArgs: 3, maxArgs: 3, caseSensitive: false },
+  multiIf: { clickhouseName: "multiIf", minArgs: 3 },
+
+  // In
+  in: { clickhouseName: "in", minArgs: 2, maxArgs: 2 },
+  notIn: { clickhouseName: "notIn", minArgs: 2, maxArgs: 2 },
+
+  // Arithmetic
+  plus: { clickhouseName: "plus", minArgs: 2, maxArgs: 2 },
+  minus: { clickhouseName: "minus", minArgs: 2, maxArgs: 2 },
+  multiply: { clickhouseName: "multiply", minArgs: 2, maxArgs: 2 },
+  divide: { clickhouseName: "divide", minArgs: 2, maxArgs: 2 },
+  intDiv: { clickhouseName: "intDiv", minArgs: 2, maxArgs: 2 },
+  intDivOrZero: { clickhouseName: "intDivOrZero", minArgs: 2, maxArgs: 2 },
+  modulo: { clickhouseName: "modulo", minArgs: 2, maxArgs: 2 },
+  moduloOrZero: { clickhouseName: "moduloOrZero", minArgs: 2, maxArgs: 2 },
+  positiveModulo: { clickhouseName: "positiveModulo", minArgs: 2, maxArgs: 2 },
+  negate: { clickhouseName: "negate", minArgs: 1, maxArgs: 1 },
+  abs: { clickhouseName: "abs", minArgs: 1, maxArgs: 1 },
+  gcd: { clickhouseName: "gcd", minArgs: 2, maxArgs: 2 },
+  lcm: { clickhouseName: "lcm", minArgs: 2, maxArgs: 2 },
+
+  // Mathematical
+  exp: { clickhouseName: "exp", minArgs: 1, maxArgs: 1 },
+  log: { clickhouseName: "log", minArgs: 1, maxArgs: 1 },
+  ln: { clickhouseName: "log", minArgs: 1, maxArgs: 1 },
+  exp2: { clickhouseName: "exp2", minArgs: 1, maxArgs: 1 },
+  log2: { clickhouseName: "log2", minArgs: 1, maxArgs: 1 },
+  exp10: { clickhouseName: "exp10", minArgs: 1, maxArgs: 1 },
+  log10: { clickhouseName: "log10", minArgs: 1, maxArgs: 1 },
+  sqrt: { clickhouseName: "sqrt", minArgs: 1, maxArgs: 1 },
+  cbrt: { clickhouseName: "cbrt", minArgs: 1, maxArgs: 1 },
+  erf: { clickhouseName: "erf", minArgs: 1, maxArgs: 1 },
+  erfc: { clickhouseName: "erfc", minArgs: 1, maxArgs: 1 },
+  lgamma: { clickhouseName: "lgamma", minArgs: 1, maxArgs: 1 },
+  tgamma: { clickhouseName: "tgamma", minArgs: 1, maxArgs: 1 },
+  sin: { clickhouseName: "sin", minArgs: 1, maxArgs: 1 },
+  cos: { clickhouseName: "cos", minArgs: 1, maxArgs: 1 },
+  tan: { clickhouseName: "tan", minArgs: 1, maxArgs: 1 },
+  asin: { clickhouseName: "asin", minArgs: 1, maxArgs: 1 },
+  acos: { clickhouseName: "acos", minArgs: 1, maxArgs: 1 },
+  atan: { clickhouseName: "atan", minArgs: 1, maxArgs: 1 },
+  pow: { clickhouseName: "pow", minArgs: 2, maxArgs: 2 },
+  power: { clickhouseName: "power", minArgs: 2, maxArgs: 2 },
+  round: { clickhouseName: "round", minArgs: 1, maxArgs: 2 },
+  floor: { clickhouseName: "floor", minArgs: 1, maxArgs: 2 },
+  ceil: { clickhouseName: "ceil", minArgs: 1, maxArgs: 2 },
+  ceiling: { clickhouseName: "ceiling", minArgs: 1, maxArgs: 2 },
+  trunc: { clickhouseName: "trunc", minArgs: 1, maxArgs: 2 },
+  truncate: { clickhouseName: "truncate", minArgs: 1, maxArgs: 2 },
+  sign: { clickhouseName: "sign", minArgs: 1, maxArgs: 1 },
+
+  // String functions
+  empty: { clickhouseName: "empty", minArgs: 1, maxArgs: 1 },
+  notEmpty: { clickhouseName: "notEmpty", minArgs: 1, maxArgs: 1 },
+  length: { clickhouseName: "length", minArgs: 1, maxArgs: 1 },
+  lengthUTF8: { clickhouseName: "lengthUTF8", minArgs: 1, maxArgs: 1 },
+  char_length: { clickhouseName: "char_length", minArgs: 1, maxArgs: 1 },
+  character_length: { clickhouseName: "character_length", minArgs: 1, maxArgs: 1 },
+  lower: { clickhouseName: "lower", minArgs: 1, maxArgs: 1 },
+  upper: { clickhouseName: "upper", minArgs: 1, maxArgs: 1 },
+  lowerUTF8: { clickhouseName: "lowerUTF8", minArgs: 1, maxArgs: 1 },
+  upperUTF8: { clickhouseName: "upperUTF8", minArgs: 1, maxArgs: 1 },
+  reverse: { clickhouseName: "reverse", minArgs: 1, maxArgs: 1 },
+  reverseUTF8: { clickhouseName: "reverseUTF8", minArgs: 1, maxArgs: 1 },
+  concat: { clickhouseName: "concat", minArgs: 1 },
+  concatAssumeInjective: { clickhouseName: "concatAssumeInjective", minArgs: 1 },
+  substring: { clickhouseName: "substring", minArgs: 2, maxArgs: 3 },
+  substr: { clickhouseName: "substring", minArgs: 2, maxArgs: 3 },
+  mid: { clickhouseName: "substring", minArgs: 2, maxArgs: 3 },
+  substringUTF8: { clickhouseName: "substringUTF8", minArgs: 2, maxArgs: 3 },
+  appendTrailingCharIfAbsent: { clickhouseName: "appendTrailingCharIfAbsent", minArgs: 2, maxArgs: 2 },
+  convertCharset: { clickhouseName: "convertCharset", minArgs: 3, maxArgs: 3 },
+  base58Encode: { clickhouseName: "base58Encode", minArgs: 1, maxArgs: 1 },
+  base58Decode: { clickhouseName: "base58Decode", minArgs: 1, maxArgs: 1 },
+  base64Encode: { clickhouseName: "base64Encode", minArgs: 1, maxArgs: 1 },
+  base64Decode: { clickhouseName: "base64Decode", minArgs: 1, maxArgs: 1 },
+  tryBase64Decode: { clickhouseName: "tryBase64Decode", minArgs: 1, maxArgs: 1 },
+  endsWith: { clickhouseName: "endsWith", minArgs: 2, maxArgs: 2 },
+  startsWith: { clickhouseName: "startsWith", minArgs: 2, maxArgs: 2 },
+  trim: { clickhouseName: "trim", minArgs: 1, maxArgs: 2 },
+  trimLeft: { clickhouseName: "trimLeft", minArgs: 1, maxArgs: 2 },
+  trimRight: { clickhouseName: "trimRight", minArgs: 1, maxArgs: 2 },
+  ltrim: { clickhouseName: "trimLeft", minArgs: 1, maxArgs: 1 },
+  rtrim: { clickhouseName: "trimRight", minArgs: 1, maxArgs: 1 },
+  leftPad: { clickhouseName: "leftPad", minArgs: 2, maxArgs: 3 },
+  rightPad: { clickhouseName: "rightPad", minArgs: 2, maxArgs: 3 },
+  leftPadUTF8: { clickhouseName: "leftPadUTF8", minArgs: 2, maxArgs: 3 },
+  rightPadUTF8: { clickhouseName: "rightPadUTF8", minArgs: 2, maxArgs: 3 },
+  left: { clickhouseName: "left", minArgs: 2, maxArgs: 2 },
+  right: { clickhouseName: "right", minArgs: 2, maxArgs: 2 },
+  repeat: { clickhouseName: "repeat", minArgs: 2, maxArgs: 2 },
+  space: { clickhouseName: "space", minArgs: 1, maxArgs: 1 },
+  replace: { clickhouseName: "replace", minArgs: 3, maxArgs: 3 },
+  replaceOne: { clickhouseName: "replaceOne", minArgs: 3, maxArgs: 3 },
+  replaceAll: { clickhouseName: "replaceAll", minArgs: 3, maxArgs: 3 },
+  replaceRegexpOne: { clickhouseName: "replaceRegexpOne", minArgs: 3, maxArgs: 3 },
+  replaceRegexpAll: { clickhouseName: "replaceRegexpAll", minArgs: 3, maxArgs: 3 },
+  position: { clickhouseName: "position", minArgs: 2, maxArgs: 2 },
+  positionCaseInsensitive: { clickhouseName: "positionCaseInsensitive", minArgs: 2, maxArgs: 2 },
+  positionUTF8: { clickhouseName: "positionUTF8", minArgs: 2, maxArgs: 2 },
+  positionCaseInsensitiveUTF8: { clickhouseName: "positionCaseInsensitiveUTF8", minArgs: 2, maxArgs: 2 },
+  locate: { clickhouseName: "locate", minArgs: 2, maxArgs: 2 },
+  match: { clickhouseName: "match", minArgs: 2, maxArgs: 2 },
+  multiMatchAny: { clickhouseName: "multiMatchAny", minArgs: 2, maxArgs: 2 },
+  multiMatchAnyIndex: { clickhouseName: "multiMatchAnyIndex", minArgs: 2, maxArgs: 2 },
+  multiMatchAllIndices: { clickhouseName: "multiMatchAllIndices", minArgs: 2, maxArgs: 2 },
+  multiSearchFirstPosition: { clickhouseName: "multiSearchFirstPosition", minArgs: 2, maxArgs: 2 },
+  multiSearchFirstIndex: { clickhouseName: "multiSearchFirstIndex", minArgs: 2, maxArgs: 2 },
+  multiSearchAny: { clickhouseName: "multiSearchAny", minArgs: 2, maxArgs: 2 },
+  extract: { clickhouseName: "extract", minArgs: 2, maxArgs: 2 },
+  extractAll: { clickhouseName: "extractAll", minArgs: 2, maxArgs: 2 },
+  extractAllGroupsHorizontal: { clickhouseName: "extractAllGroupsHorizontal", minArgs: 2, maxArgs: 2 },
+  extractAllGroupsVertical: { clickhouseName: "extractAllGroupsVertical", minArgs: 2, maxArgs: 2 },
+  like: { clickhouseName: "like", minArgs: 2, maxArgs: 2 },
+  ilike: { clickhouseName: "ilike", minArgs: 2, maxArgs: 2 },
+  notLike: { clickhouseName: "notLike", minArgs: 2, maxArgs: 2 },
+  notILike: { clickhouseName: "notILike", minArgs: 2, maxArgs: 2 },
+  splitByChar: { clickhouseName: "splitByChar", minArgs: 2, maxArgs: 3 },
+  splitByString: { clickhouseName: "splitByString", minArgs: 2, maxArgs: 3 },
+  splitByRegexp: { clickhouseName: "splitByRegexp", minArgs: 2, maxArgs: 3 },
+  arrayStringConcat: { clickhouseName: "arrayStringConcat", minArgs: 1, maxArgs: 2 },
+  format: { clickhouseName: "format", minArgs: 1 },
+  coalesce: { clickhouseName: "coalesce", minArgs: 1 },
+  ifNull: { clickhouseName: "ifNull", minArgs: 2, maxArgs: 2 },
+  nullIf: { clickhouseName: "nullIf", minArgs: 2, maxArgs: 2 },
+  assumeNotNull: { clickhouseName: "assumeNotNull", minArgs: 1, maxArgs: 1 },
+  toNullable: { clickhouseName: "toNullable", minArgs: 1, maxArgs: 1 },
+  isNull: { clickhouseName: "isNull", minArgs: 1, maxArgs: 1 },
+  isNotNull: { clickhouseName: "isNotNull", minArgs: 1, maxArgs: 1 },
+
+  // Type conversions
+  toString: { clickhouseName: "toString", minArgs: 1, maxArgs: 1 },
+  toFixedString: { clickhouseName: "toFixedString", minArgs: 2, maxArgs: 2 },
+  toUInt8: { clickhouseName: "toUInt8", minArgs: 1, maxArgs: 1 },
+  toUInt16: { clickhouseName: "toUInt16", minArgs: 1, maxArgs: 1 },
+  toUInt32: { clickhouseName: "toUInt32", minArgs: 1, maxArgs: 1 },
+  toUInt64: { clickhouseName: "toUInt64", minArgs: 1, maxArgs: 1 },
+  toInt8: { clickhouseName: "toInt8", minArgs: 1, maxArgs: 1 },
+  toInt16: { clickhouseName: "toInt16", minArgs: 1, maxArgs: 1 },
+  toInt32: { clickhouseName: "toInt32", minArgs: 1, maxArgs: 1 },
+  toInt64: { clickhouseName: "toInt64", minArgs: 1, maxArgs: 1 },
+  toInt128: { clickhouseName: "toInt128", minArgs: 1, maxArgs: 1 },
+  toInt256: { clickhouseName: "toInt256", minArgs: 1, maxArgs: 1 },
+  toUInt128: { clickhouseName: "toUInt128", minArgs: 1, maxArgs: 1 },
+  toUInt256: { clickhouseName: "toUInt256", minArgs: 1, maxArgs: 1 },
+  toFloat32: { clickhouseName: "toFloat32", minArgs: 1, maxArgs: 1 },
+  toFloat64: { clickhouseName: "toFloat64", minArgs: 1, maxArgs: 1 },
+  toDecimal32: { clickhouseName: "toDecimal32", minArgs: 2, maxArgs: 2 },
+  toDecimal64: { clickhouseName: "toDecimal64", minArgs: 2, maxArgs: 2 },
+  toDecimal128: { clickhouseName: "toDecimal128", minArgs: 2, maxArgs: 2 },
+  toDecimal256: { clickhouseName: "toDecimal256", minArgs: 2, maxArgs: 2 },
+  toDate: { clickhouseName: "toDate", minArgs: 1, maxArgs: 2 },
+  toDateOrNull: { clickhouseName: "toDateOrNull", minArgs: 1, maxArgs: 2 },
+  toDateOrZero: { clickhouseName: "toDateOrZero", minArgs: 1, maxArgs: 2 },
+  toDate32: { clickhouseName: "toDate32", minArgs: 1, maxArgs: 2 },
+  toDate32OrNull: { clickhouseName: "toDate32OrNull", minArgs: 1, maxArgs: 2 },
+  toDate32OrZero: { clickhouseName: "toDate32OrZero", minArgs: 1, maxArgs: 2 },
+  toDateTime: { clickhouseName: "toDateTime", minArgs: 1, maxArgs: 2 },
+  toDateTimeOrNull: { clickhouseName: "toDateTimeOrNull", minArgs: 1, maxArgs: 2 },
+  toDateTimeOrZero: { clickhouseName: "toDateTimeOrZero", minArgs: 1, maxArgs: 2 },
+  toDateTime64: { clickhouseName: "toDateTime64", minArgs: 1, maxArgs: 3 },
+  toDateTime64OrNull: { clickhouseName: "toDateTime64OrNull", minArgs: 1, maxArgs: 3 },
+  toDateTime64OrZero: { clickhouseName: "toDateTime64OrZero", minArgs: 1, maxArgs: 3 },
+  toUUID: { clickhouseName: "toUUID", minArgs: 1, maxArgs: 1 },
+  toUUIDOrNull: { clickhouseName: "toUUIDOrNull", minArgs: 1, maxArgs: 1 },
+  toUUIDOrZero: { clickhouseName: "toUUIDOrZero", minArgs: 1, maxArgs: 1 },
+  toTypeName: { clickhouseName: "toTypeName", minArgs: 1, maxArgs: 1 },
+
+  // Date/time functions
+  now: { clickhouseName: "now", minArgs: 0, maxArgs: 1, tzAware: true },
+  now64: { clickhouseName: "now64", minArgs: 0, maxArgs: 2, tzAware: true },
+  today: { clickhouseName: "today", minArgs: 0, maxArgs: 0 },
+  yesterday: { clickhouseName: "yesterday", minArgs: 0, maxArgs: 0 },
+  toYear: { clickhouseName: "toYear", minArgs: 1, maxArgs: 1 },
+  toQuarter: { clickhouseName: "toQuarter", minArgs: 1, maxArgs: 1 },
+  toMonth: { clickhouseName: "toMonth", minArgs: 1, maxArgs: 1 },
+  toDayOfYear: { clickhouseName: "toDayOfYear", minArgs: 1, maxArgs: 1 },
+  toDayOfMonth: { clickhouseName: "toDayOfMonth", minArgs: 1, maxArgs: 1 },
+  toDayOfWeek: { clickhouseName: "toDayOfWeek", minArgs: 1, maxArgs: 3 },
+  toHour: { clickhouseName: "toHour", minArgs: 1, maxArgs: 1 },
+  toMinute: { clickhouseName: "toMinute", minArgs: 1, maxArgs: 1 },
+  toSecond: { clickhouseName: "toSecond", minArgs: 1, maxArgs: 1 },
+  toUnixTimestamp: { clickhouseName: "toUnixTimestamp", minArgs: 1, maxArgs: 2 },
+  toStartOfYear: { clickhouseName: "toStartOfYear", minArgs: 1, maxArgs: 1 },
+  toStartOfQuarter: { clickhouseName: "toStartOfQuarter", minArgs: 1, maxArgs: 1 },
+  toStartOfMonth: { clickhouseName: "toStartOfMonth", minArgs: 1, maxArgs: 1 },
+  toMonday: { clickhouseName: "toMonday", minArgs: 1, maxArgs: 1 },
+  toStartOfWeek: { clickhouseName: "toStartOfWeek", minArgs: 1, maxArgs: 2 },
+  toStartOfDay: { clickhouseName: "toStartOfDay", minArgs: 1, maxArgs: 1 },
+  toStartOfHour: { clickhouseName: "toStartOfHour", minArgs: 1, maxArgs: 1 },
+  toStartOfMinute: { clickhouseName: "toStartOfMinute", minArgs: 1, maxArgs: 1 },
+  toStartOfSecond: { clickhouseName: "toStartOfSecond", minArgs: 1, maxArgs: 1 },
+  toStartOfFiveMinutes: { clickhouseName: "toStartOfFiveMinutes", minArgs: 1, maxArgs: 1 },
+  toStartOfTenMinutes: { clickhouseName: "toStartOfTenMinutes", minArgs: 1, maxArgs: 1 },
+  toStartOfFifteenMinutes: { clickhouseName: "toStartOfFifteenMinutes", minArgs: 1, maxArgs: 1 },
+  toStartOfInterval: { clickhouseName: "toStartOfInterval", minArgs: 2, maxArgs: 4 },
+  toTime: { clickhouseName: "toTime", minArgs: 1, maxArgs: 2 },
+  toISOYear: { clickhouseName: "toISOYear", minArgs: 1, maxArgs: 1 },
+  toISOWeek: { clickhouseName: "toISOWeek", minArgs: 1, maxArgs: 1 },
+  toWeek: { clickhouseName: "toWeek", minArgs: 1, maxArgs: 3 },
+  toYearWeek: { clickhouseName: "toYearWeek", minArgs: 1, maxArgs: 3 },
+  date_add: { clickhouseName: "date_add", minArgs: 3, maxArgs: 3 },
+  date_diff: { clickhouseName: "date_diff", minArgs: 3, maxArgs: 4 },
+  date_sub: { clickhouseName: "date_sub", minArgs: 3, maxArgs: 3 },
+  date_trunc: { clickhouseName: "date_trunc", minArgs: 2, maxArgs: 3 },
+  dateDiff: { clickhouseName: "dateDiff", minArgs: 3, maxArgs: 4 },
+  dateAdd: { clickhouseName: "dateAdd", minArgs: 3, maxArgs: 3 },
+  dateSub: { clickhouseName: "dateSub", minArgs: 3, maxArgs: 3 },
+  dateTrunc: { clickhouseName: "dateTrunc", minArgs: 2, maxArgs: 3 },
+  addSeconds: { clickhouseName: "addSeconds", minArgs: 2, maxArgs: 2 },
+  addMinutes: { clickhouseName: "addMinutes", minArgs: 2, maxArgs: 2 },
+  addHours: { clickhouseName: "addHours", minArgs: 2, maxArgs: 2 },
+  addDays: { clickhouseName: "addDays", minArgs: 2, maxArgs: 2 },
+  addWeeks: { clickhouseName: "addWeeks", minArgs: 2, maxArgs: 2 },
+  addMonths: { clickhouseName: "addMonths", minArgs: 2, maxArgs: 2 },
+  addQuarters: { clickhouseName: "addQuarters", minArgs: 2, maxArgs: 2 },
+  addYears: { clickhouseName: "addYears", minArgs: 2, maxArgs: 2 },
+  subtractSeconds: { clickhouseName: "subtractSeconds", minArgs: 2, maxArgs: 2 },
+  subtractMinutes: { clickhouseName: "subtractMinutes", minArgs: 2, maxArgs: 2 },
+  subtractHours: { clickhouseName: "subtractHours", minArgs: 2, maxArgs: 2 },
+  subtractDays: { clickhouseName: "subtractDays", minArgs: 2, maxArgs: 2 },
+  subtractWeeks: { clickhouseName: "subtractWeeks", minArgs: 2, maxArgs: 2 },
+  subtractMonths: { clickhouseName: "subtractMonths", minArgs: 2, maxArgs: 2 },
+  subtractQuarters: { clickhouseName: "subtractQuarters", minArgs: 2, maxArgs: 2 },
+  subtractYears: { clickhouseName: "subtractYears", minArgs: 2, maxArgs: 2 },
+  toTimeZone: { clickhouseName: "toTimeZone", minArgs: 2, maxArgs: 2 },
+  formatDateTime: { clickhouseName: "formatDateTime", minArgs: 2, maxArgs: 3 },
+  parseDateTime: { clickhouseName: "parseDateTime", minArgs: 2, maxArgs: 3 },
+  parseDateTimeBestEffort: { clickhouseName: "parseDateTimeBestEffort", minArgs: 1, maxArgs: 2, tzAware: true },
+  parseDateTimeBestEffortOrNull: { clickhouseName: "parseDateTimeBestEffortOrNull", minArgs: 1, maxArgs: 2, tzAware: true },
+  parseDateTimeBestEffortOrZero: { clickhouseName: "parseDateTimeBestEffortOrZero", minArgs: 1, maxArgs: 2, tzAware: true },
+  parseDateTime64BestEffort: { clickhouseName: "parseDateTime64BestEffort", minArgs: 1, maxArgs: 3, tzAware: true },
+  parseDateTime64BestEffortOrNull: { clickhouseName: "parseDateTime64BestEffortOrNull", minArgs: 1, maxArgs: 3, tzAware: true },
+  parseDateTime64BestEffortOrZero: { clickhouseName: "parseDateTime64BestEffortOrZero", minArgs: 1, maxArgs: 3, tzAware: true },
+
+  // Interval functions
+  toIntervalSecond: { clickhouseName: "toIntervalSecond", minArgs: 1, maxArgs: 1 },
+  toIntervalMinute: { clickhouseName: "toIntervalMinute", minArgs: 1, maxArgs: 1 },
+  toIntervalHour: { clickhouseName: "toIntervalHour", minArgs: 1, maxArgs: 1 },
+  toIntervalDay: { clickhouseName: "toIntervalDay", minArgs: 1, maxArgs: 1 },
+  toIntervalWeek: { clickhouseName: "toIntervalWeek", minArgs: 1, maxArgs: 1 },
+  toIntervalMonth: { clickhouseName: "toIntervalMonth", minArgs: 1, maxArgs: 1 },
+  toIntervalQuarter: { clickhouseName: "toIntervalQuarter", minArgs: 1, maxArgs: 1 },
+  toIntervalYear: { clickhouseName: "toIntervalYear", minArgs: 1, maxArgs: 1 },
+
+  // Array functions
+  array: { clickhouseName: "array", minArgs: 0 },
+  range: { clickhouseName: "range", minArgs: 1, maxArgs: 3 },
+  arrayElement: { clickhouseName: "arrayElement", minArgs: 2, maxArgs: 2 },
+  has: { clickhouseName: "has", minArgs: 2, maxArgs: 2 },
+  hasAll: { clickhouseName: "hasAll", minArgs: 2, maxArgs: 2 },
+  hasAny: { clickhouseName: "hasAny", minArgs: 2, maxArgs: 2 },
+  hasSubstr: { clickhouseName: "hasSubstr", minArgs: 2, maxArgs: 2 },
+  indexOf: { clickhouseName: "indexOf", minArgs: 2, maxArgs: 2 },
+  arrayCount: { clickhouseName: "arrayCount", minArgs: 1, maxArgs: 2 },
+  countEqual: { clickhouseName: "countEqual", minArgs: 2, maxArgs: 2 },
+  arrayEnumerate: { clickhouseName: "arrayEnumerate", minArgs: 1, maxArgs: 1 },
+  arrayEnumerateDense: { clickhouseName: "arrayEnumerateDense", minArgs: 1 },
+  arrayEnumerateUniq: { clickhouseName: "arrayEnumerateUniq", minArgs: 1 },
+  arrayEnumerateUniqRanked: { clickhouseName: "arrayEnumerateUniqRanked", minArgs: 1 },
+  arrayPopBack: { clickhouseName: "arrayPopBack", minArgs: 1, maxArgs: 1 },
+  arrayPopFront: { clickhouseName: "arrayPopFront", minArgs: 1, maxArgs: 1 },
+  arrayPushBack: { clickhouseName: "arrayPushBack", minArgs: 2, maxArgs: 2 },
+  arrayPushFront: { clickhouseName: "arrayPushFront", minArgs: 2, maxArgs: 2 },
+  arrayResize: { clickhouseName: "arrayResize", minArgs: 2, maxArgs: 3 },
+  arraySlice: { clickhouseName: "arraySlice", minArgs: 2, maxArgs: 3 },
+  arraySort: { clickhouseName: "arraySort", minArgs: 1, maxArgs: 2 },
+  arrayPartialSort: { clickhouseName: "arrayPartialSort", minArgs: 2, maxArgs: 3 },
+  arrayReverseSort: { clickhouseName: "arrayReverseSort", minArgs: 1, maxArgs: 2 },
+  arrayPartialReverseSort: { clickhouseName: "arrayPartialReverseSort", minArgs: 2, maxArgs: 3 },
+  arrayShuffle: { clickhouseName: "arrayShuffle", minArgs: 1, maxArgs: 2 },
+  arrayUniq: { clickhouseName: "arrayUniq", minArgs: 1 },
+  arrayJoin: { clickhouseName: "arrayJoin", minArgs: 1, maxArgs: 1 },
+  arrayDifference: { clickhouseName: "arrayDifference", minArgs: 1, maxArgs: 1 },
+  arrayDistinct: { clickhouseName: "arrayDistinct", minArgs: 1, maxArgs: 1 },
+  arrayIntersect: { clickhouseName: "arrayIntersect", minArgs: 1 },
+  arrayReduce: { clickhouseName: "arrayReduce", minArgs: 2 },
+  arrayReverse: { clickhouseName: "arrayReverse", minArgs: 1, maxArgs: 1 },
+  arrayFlatten: { clickhouseName: "arrayFlatten", minArgs: 1, maxArgs: 1 },
+  arrayCompact: { clickhouseName: "arrayCompact", minArgs: 1, maxArgs: 1 },
+  arrayZip: { clickhouseName: "arrayZip", minArgs: 1 },
+  arrayMap: { clickhouseName: "arrayMap", minArgs: 2, maxArgs: 2 },
+  arrayFilter: { clickhouseName: "arrayFilter", minArgs: 2, maxArgs: 2 },
+  arrayFill: { clickhouseName: "arrayFill", minArgs: 2, maxArgs: 2 },
+  arrayReverseFill: { clickhouseName: "arrayReverseFill", minArgs: 2, maxArgs: 2 },
+  arraySplit: { clickhouseName: "arraySplit", minArgs: 2, maxArgs: 2 },
+  arrayReverseSplit: { clickhouseName: "arrayReverseSplit", minArgs: 2, maxArgs: 2 },
+  arrayExists: { clickhouseName: "arrayExists", minArgs: 1, maxArgs: 2 },
+  arrayAll: { clickhouseName: "arrayAll", minArgs: 1, maxArgs: 2 },
+  arrayFirst: { clickhouseName: "arrayFirst", minArgs: 1, maxArgs: 2 },
+  arrayLast: { clickhouseName: "arrayLast", minArgs: 1, maxArgs: 2 },
+  arrayFirstIndex: { clickhouseName: "arrayFirstIndex", minArgs: 1, maxArgs: 2 },
+  arrayLastIndex: { clickhouseName: "arrayLastIndex", minArgs: 1, maxArgs: 2 },
+  arrayMin: { clickhouseName: "arrayMin", minArgs: 1, maxArgs: 2 },
+  arrayMax: { clickhouseName: "arrayMax", minArgs: 1, maxArgs: 2 },
+  arraySum: { clickhouseName: "arraySum", minArgs: 1, maxArgs: 2 },
+  arrayAvg: { clickhouseName: "arrayAvg", minArgs: 1, maxArgs: 2 },
+  arrayCumSum: { clickhouseName: "arrayCumSum", minArgs: 1, maxArgs: 2 },
+  arrayCumSumNonNegative: { clickhouseName: "arrayCumSumNonNegative", minArgs: 1, maxArgs: 2 },
+  arrayProduct: { clickhouseName: "arrayProduct", minArgs: 1, maxArgs: 1 },
+
+  // JSON functions
+  JSONHas: { clickhouseName: "JSONHas", minArgs: 1 },
+  JSONLength: { clickhouseName: "JSONLength", minArgs: 1 },
+  JSONType: { clickhouseName: "JSONType", minArgs: 1 },
+  JSONExtractUInt: { clickhouseName: "JSONExtractUInt", minArgs: 1 },
+  JSONExtractInt: { clickhouseName: "JSONExtractInt", minArgs: 1 },
+  JSONExtractFloat: { clickhouseName: "JSONExtractFloat", minArgs: 1 },
+  JSONExtractBool: { clickhouseName: "JSONExtractBool", minArgs: 1 },
+  JSONExtractString: { clickhouseName: "JSONExtractString", minArgs: 1 },
+  JSONExtract: { clickhouseName: "JSONExtract", minArgs: 2 },
+  JSONExtractRaw: { clickhouseName: "JSONExtractRaw", minArgs: 1 },
+  JSONExtractArrayRaw: { clickhouseName: "JSONExtractArrayRaw", minArgs: 1 },
+  JSONExtractKeysAndValues: { clickhouseName: "JSONExtractKeysAndValues", minArgs: 2, maxArgs: 2 },
+  JSONExtractKeys: { clickhouseName: "JSONExtractKeys", minArgs: 1 },
+  toJSONString: { clickhouseName: "toJSONString", minArgs: 1, maxArgs: 1 },
+
+  // Tuple functions
+  tuple: { clickhouseName: "tuple", minArgs: 0 },
+  tupleElement: { clickhouseName: "tupleElement", minArgs: 2, maxArgs: 3 },
+  untuple: { clickhouseName: "untuple", minArgs: 1, maxArgs: 1 },
+
+  // Map functions
+  map: { clickhouseName: "map", minArgs: 0 },
+  mapFromArrays: { clickhouseName: "mapFromArrays", minArgs: 2, maxArgs: 2 },
+  mapContains: { clickhouseName: "mapContains", minArgs: 2, maxArgs: 2 },
+  mapKeys: { clickhouseName: "mapKeys", minArgs: 1, maxArgs: 1 },
+  mapValues: { clickhouseName: "mapValues", minArgs: 1, maxArgs: 1 },
+
+  // Hash functions
+  MD5: { clickhouseName: "MD5", minArgs: 1, maxArgs: 1 },
+  SHA1: { clickhouseName: "SHA1", minArgs: 1, maxArgs: 1 },
+  SHA224: { clickhouseName: "SHA224", minArgs: 1, maxArgs: 1 },
+  SHA256: { clickhouseName: "SHA256", minArgs: 1, maxArgs: 1 },
+  SHA384: { clickhouseName: "SHA384", minArgs: 1, maxArgs: 1 },
+  SHA512: { clickhouseName: "SHA512", minArgs: 1, maxArgs: 1 },
+  sipHash64: { clickhouseName: "sipHash64", minArgs: 1 },
+  sipHash128: { clickhouseName: "sipHash128", minArgs: 1 },
+  cityHash64: { clickhouseName: "cityHash64", minArgs: 1 },
+  intHash32: { clickhouseName: "intHash32", minArgs: 1, maxArgs: 1 },
+  intHash64: { clickhouseName: "intHash64", minArgs: 1, maxArgs: 1 },
+  farmHash64: { clickhouseName: "farmHash64", minArgs: 1 },
+  farmFingerprint64: { clickhouseName: "farmFingerprint64", minArgs: 1 },
+  xxHash32: { clickhouseName: "xxHash32", minArgs: 1 },
+  xxHash64: { clickhouseName: "xxHash64", minArgs: 1 },
+  murmurHash2_32: { clickhouseName: "murmurHash2_32", minArgs: 1 },
+  murmurHash2_64: { clickhouseName: "murmurHash2_64", minArgs: 1 },
+  murmurHash3_32: { clickhouseName: "murmurHash3_32", minArgs: 1 },
+  murmurHash3_64: { clickhouseName: "murmurHash3_64", minArgs: 1 },
+  murmurHash3_128: { clickhouseName: "murmurHash3_128", minArgs: 1 },
+  hex: { clickhouseName: "hex", minArgs: 1, maxArgs: 1 },
+  unhex: { clickhouseName: "unhex", minArgs: 1, maxArgs: 1 },
+
+  // URL functions
+  protocol: { clickhouseName: "protocol", minArgs: 1, maxArgs: 1 },
+  domain: { clickhouseName: "domain", minArgs: 1, maxArgs: 1 },
+  domainWithoutWWW: { clickhouseName: "domainWithoutWWW", minArgs: 1, maxArgs: 1 },
+  topLevelDomain: { clickhouseName: "topLevelDomain", minArgs: 1, maxArgs: 1 },
+  firstSignificantSubdomain: { clickhouseName: "firstSignificantSubdomain", minArgs: 1, maxArgs: 1 },
+  cutToFirstSignificantSubdomain: { clickhouseName: "cutToFirstSignificantSubdomain", minArgs: 1, maxArgs: 1 },
+  cutToFirstSignificantSubdomainWithWWW: { clickhouseName: "cutToFirstSignificantSubdomainWithWWW", minArgs: 1, maxArgs: 1 },
+  port: { clickhouseName: "port", minArgs: 1, maxArgs: 2 },
+  path: { clickhouseName: "path", minArgs: 1, maxArgs: 1 },
+  pathFull: { clickhouseName: "pathFull", minArgs: 1, maxArgs: 1 },
+  queryString: { clickhouseName: "queryString", minArgs: 1, maxArgs: 1 },
+  fragment: { clickhouseName: "fragment", minArgs: 1, maxArgs: 1 },
+  extractURLParameter: { clickhouseName: "extractURLParameter", minArgs: 2, maxArgs: 2 },
+  extractURLParameters: { clickhouseName: "extractURLParameters", minArgs: 1, maxArgs: 1 },
+  encodeURLComponent: { clickhouseName: "encodeURLComponent", minArgs: 1, maxArgs: 1 },
+  decodeURLComponent: { clickhouseName: "decodeURLComponent", minArgs: 1, maxArgs: 1 },
+
+  // UUID functions
+  generateUUIDv4: { clickhouseName: "generateUUIDv4", minArgs: 0, maxArgs: 0 },
+  UUIDStringToNum: { clickhouseName: "UUIDStringToNum", minArgs: 1, maxArgs: 1 },
+  UUIDNumToString: { clickhouseName: "UUIDNumToString", minArgs: 1, maxArgs: 1 },
+
+  // Other functions
+  isFinite: { clickhouseName: "isFinite", minArgs: 1, maxArgs: 1 },
+  isInfinite: { clickhouseName: "isInfinite", minArgs: 1, maxArgs: 1 },
+  ifNotFinite: { clickhouseName: "ifNotFinite", minArgs: 1, maxArgs: 1 },
+  isNaN: { clickhouseName: "isNaN", minArgs: 1, maxArgs: 1 },
+  bar: { clickhouseName: "bar", minArgs: 4, maxArgs: 4 },
+  transform: { clickhouseName: "transform", minArgs: 3, maxArgs: 4 },
+  formatReadableDecimalSize: { clickhouseName: "formatReadableDecimalSize", minArgs: 1, maxArgs: 1 },
+  formatReadableSize: { clickhouseName: "formatReadableSize", minArgs: 1, maxArgs: 1 },
+  formatReadableQuantity: { clickhouseName: "formatReadableQuantity", minArgs: 1, maxArgs: 1 },
+  formatReadableTimeDelta: { clickhouseName: "formatReadableTimeDelta", minArgs: 1, maxArgs: 2 },
+  least: { clickhouseName: "least", minArgs: 2, maxArgs: 2, caseSensitive: false },
+  greatest: { clickhouseName: "greatest", minArgs: 2, maxArgs: 2, caseSensitive: false },
+  min2: { clickhouseName: "min2", minArgs: 2, maxArgs: 2 },
+  max2: { clickhouseName: "max2", minArgs: 2, maxArgs: 2 },
+  runningDifference: { clickhouseName: "runningDifference", minArgs: 1, maxArgs: 1 },
+  runningDifferenceStartingWithFirstValue: { clickhouseName: "runningDifferenceStartingWithFirstValue", minArgs: 1, maxArgs: 1 },
+  neighbor: { clickhouseName: "neighbor", minArgs: 2, maxArgs: 3 },
+
+  // Window functions
+  rank: { clickhouseName: "rank", minArgs: 0, maxArgs: 0 },
+  dense_rank: { clickhouseName: "dense_rank", minArgs: 0, maxArgs: 0 },
+  row_number: { clickhouseName: "row_number", minArgs: 0, maxArgs: 0 },
+  first_value: { clickhouseName: "first_value", minArgs: 1, maxArgs: 1 },
+  last_value: { clickhouseName: "last_value", minArgs: 1, maxArgs: 1 },
+  nth_value: { clickhouseName: "nth_value", minArgs: 2, maxArgs: 2 },
+  lagInFrame: { clickhouseName: "lagInFrame", minArgs: 1, maxArgs: 3 },
+  leadInFrame: { clickhouseName: "leadInFrame", minArgs: 1, maxArgs: 3 },
+  lag: { clickhouseName: "lagInFrame", minArgs: 1, maxArgs: 3 },
+  lead: { clickhouseName: "leadInFrame", minArgs: 1, maxArgs: 3 },
+};
+
+/**
+ * Aggregate functions available in TSQL
+ * Port of HOGQL_AGGREGATIONS from aggregations.py
+ */
+export const TSQL_AGGREGATIONS: Record<string, TSQLFunctionMeta> = {
+  // Standard aggregate functions
+  count: { clickhouseName: "count", minArgs: 0, maxArgs: 1, aggregate: true, caseSensitive: false },
+  countIf: { clickhouseName: "countIf", minArgs: 1, maxArgs: 2, aggregate: true },
+  countDistinct: { clickhouseName: "countDistinct", minArgs: 1, maxArgs: 1, aggregate: true },
+  countDistinctIf: { clickhouseName: "countDistinctIf", minArgs: 1, maxArgs: 2, aggregate: true },
+  min: { clickhouseName: "min", minArgs: 1, maxArgs: 1, aggregate: true, caseSensitive: false },
+  minIf: { clickhouseName: "minIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  max: { clickhouseName: "max", minArgs: 1, maxArgs: 1, aggregate: true, caseSensitive: false },
+  maxIf: { clickhouseName: "maxIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  sum: { clickhouseName: "sum", minArgs: 1, maxArgs: 1, aggregate: true, caseSensitive: false },
+  sumIf: { clickhouseName: "sumIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  avg: { clickhouseName: "avg", minArgs: 1, maxArgs: 1, aggregate: true, caseSensitive: false },
+  avgIf: { clickhouseName: "avgIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  any: { clickhouseName: "any", minArgs: 1, maxArgs: 1, aggregate: true },
+  anyIf: { clickhouseName: "anyIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  anyLast: { clickhouseName: "anyLast", minArgs: 1, maxArgs: 1, aggregate: true },
+  anyLastIf: { clickhouseName: "anyLastIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  anyHeavy: { clickhouseName: "anyHeavy", minArgs: 1, maxArgs: 1, aggregate: true },
+  anyHeavyIf: { clickhouseName: "anyHeavyIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  argMin: { clickhouseName: "argMin", minArgs: 2, maxArgs: 2, aggregate: true },
+  argMinIf: { clickhouseName: "argMinIf", minArgs: 3, maxArgs: 3, aggregate: true },
+  argMax: { clickhouseName: "argMax", minArgs: 2, maxArgs: 2, aggregate: true },
+  argMaxIf: { clickhouseName: "argMaxIf", minArgs: 3, maxArgs: 3, aggregate: true },
+  stddevPop: { clickhouseName: "stddevPop", minArgs: 1, maxArgs: 1, aggregate: true },
+  stddevSamp: { clickhouseName: "stddevSamp", minArgs: 1, maxArgs: 1, aggregate: true },
+  varPop: { clickhouseName: "varPop", minArgs: 1, maxArgs: 1, aggregate: true },
+  varSamp: { clickhouseName: "varSamp", minArgs: 1, maxArgs: 1, aggregate: true },
+  covarPop: { clickhouseName: "covarPop", minArgs: 2, maxArgs: 2, aggregate: true },
+  covarSamp: { clickhouseName: "covarSamp", minArgs: 2, maxArgs: 2, aggregate: true },
+  corr: { clickhouseName: "corr", minArgs: 2, maxArgs: 2, aggregate: true },
+
+  // Array aggregations
+  groupArray: { clickhouseName: "groupArray", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupArrayIf: { clickhouseName: "groupArrayIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  groupUniqArray: { clickhouseName: "groupUniqArray", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupUniqArrayIf: { clickhouseName: "groupUniqArrayIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  groupArrayInsertAt: { clickhouseName: "groupArrayInsertAt", minArgs: 2, maxArgs: 2, aggregate: true },
+  groupArrayMovingAvg: { clickhouseName: "groupArrayMovingAvg", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupArrayMovingSum: { clickhouseName: "groupArrayMovingSum", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupArraySample: { clickhouseName: "groupArraySample", minArgs: 1, maxArgs: 1, minParams: 1, maxParams: 2, aggregate: true },
+  array_agg: { clickhouseName: "groupArray", minArgs: 1, maxArgs: 1, aggregate: true },
+
+  // Bitmap aggregations
+  groupBitmap: { clickhouseName: "groupBitmap", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupBitmapAnd: { clickhouseName: "groupBitmapAnd", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupBitmapOr: { clickhouseName: "groupBitmapOr", minArgs: 1, maxArgs: 1, aggregate: true },
+  groupBitmapXor: { clickhouseName: "groupBitmapXor", minArgs: 1, maxArgs: 1, aggregate: true },
+
+  // Uniq functions
+  uniq: { clickhouseName: "uniq", minArgs: 1, aggregate: true },
+  uniqIf: { clickhouseName: "uniqIf", minArgs: 2, aggregate: true },
+  uniqExact: { clickhouseName: "uniqExact", minArgs: 1, aggregate: true },
+  uniqExactIf: { clickhouseName: "uniqExactIf", minArgs: 2, aggregate: true },
+  uniqHLL12: { clickhouseName: "uniqHLL12", minArgs: 1, aggregate: true },
+  uniqTheta: { clickhouseName: "uniqTheta", minArgs: 1, aggregate: true },
+
+  // Quantile functions
+  median: { clickhouseName: "median", minArgs: 1, maxArgs: 1, aggregate: true },
+  medianIf: { clickhouseName: "medianIf", minArgs: 2, maxArgs: 2, aggregate: true },
+  medianExact: { clickhouseName: "medianExact", minArgs: 1, maxArgs: 1, aggregate: true },
+  quantile: { clickhouseName: "quantile", minArgs: 1, maxArgs: 1, minParams: 1, maxParams: 1, aggregate: true },
+  quantileIf: { clickhouseName: "quantileIf", minArgs: 2, maxArgs: 2, minParams: 1, maxParams: 1, aggregate: true },
+  quantiles: { clickhouseName: "quantiles", minArgs: 1, aggregate: true },
+
+  // Statistical functions
+  simpleLinearRegression: { clickhouseName: "simpleLinearRegression", minArgs: 2, maxArgs: 2, aggregate: true },
+  contingency: { clickhouseName: "contingency", minArgs: 2, maxArgs: 2, aggregate: true },
+  cramersV: { clickhouseName: "cramersV", minArgs: 2, maxArgs: 2, aggregate: true },
+  theilsU: { clickhouseName: "theilsU", minArgs: 2, maxArgs: 2, aggregate: true },
+
+  // Sum/Map variants
+  sumMap: { clickhouseName: "sumMap", minArgs: 1, maxArgs: 2, aggregate: true },
+  minMap: { clickhouseName: "minMap", minArgs: 1, maxArgs: 2, aggregate: true },
+  maxMap: { clickhouseName: "maxMap", minArgs: 1, maxArgs: 2, aggregate: true },
+
+  // TopK
+  topK: { clickhouseName: "topK", minArgs: 1, maxArgs: 1, minParams: 1, maxParams: 1, aggregate: true },
+
+  // Funnel
+  windowFunnel: { clickhouseName: "windowFunnel", minArgs: 1, maxArgs: 99, aggregate: true },
+};
+
+/**
+ * Find a function in the TSQL functions map
+ * Supports case-insensitive lookup for non-case-sensitive functions
+ */
+function findFunction(
+  name: string,
+  functions: Record<string, TSQLFunctionMeta>
+): TSQLFunctionMeta | undefined {
+  const func = functions[name];
+  if (func !== undefined) {
+    return func;
+  }
+
+  const lowerFunc = functions[name.toLowerCase()];
+  if (lowerFunc === undefined) {
+    return undefined;
+  }
+
+  // If we haven't found a function with the case preserved, but we have found it in lowercase,
+  // then the function names are different case-wise only.
+  if (lowerFunc.caseSensitive) {
+    return undefined;
+  }
+
+  return lowerFunc;
+}
+
+/**
+ * Find a TSQL aggregation function by name
+ */
+export function findTSQLAggregation(name: string): TSQLFunctionMeta | undefined {
+  return findFunction(name, TSQL_AGGREGATIONS);
+}
+
+/**
+ * Find a TSQL function by name
+ */
+export function findTSQLFunction(name: string): TSQLFunctionMeta | undefined {
+  return findFunction(name, TSQL_CLICKHOUSE_FUNCTIONS);
+}
+
+/**
+ * Get all exposed function names (for autocomplete, suggestions, etc.)
+ */
+export function getAllExposedFunctionNames(): string[] {
+  const functionNames = Object.keys(TSQL_CLICKHOUSE_FUNCTIONS).filter((name) => !name.startsWith("_"));
+  const aggregationNames = Object.keys(TSQL_AGGREGATIONS).filter((name) => !name.startsWith("_"));
+  return [...functionNames, ...aggregationNames];
+}
+
+/**
+ * Validate function arguments
+ */
+export function validateFunctionArgs(
+  args: unknown[],
+  minArgs: number,
+  maxArgs: number | undefined,
+  functionName: string,
+  options: {
+    functionTerm?: string;
+    argumentTerm?: string;
+  } = {}
+): void {
+  const { functionTerm = "function", argumentTerm = "argument" } = options;
+
+  const tooFew = args.length < minArgs;
+  const tooMany = maxArgs !== undefined && args.length > maxArgs;
+
+  if (minArgs === maxArgs && (tooFew || tooMany)) {
+    throw new Error(
+      `${functionTerm.charAt(0).toUpperCase() + functionTerm.slice(1)} '${functionName}' expects ${minArgs} ${argumentTerm}${minArgs !== 1 ? "s" : ""}, found ${args.length}`
+    );
+  }
+  if (tooFew) {
+    throw new Error(
+      `${functionTerm.charAt(0).toUpperCase() + functionTerm.slice(1)} '${functionName}' expects at least ${minArgs} ${argumentTerm}${minArgs !== 1 ? "s" : ""}, found ${args.length}`
+    );
+  }
+  if (tooMany) {
+    throw new Error(
+      `${functionTerm.charAt(0).toUpperCase() + functionTerm.slice(1)} '${functionName}' expects at most ${maxArgs} ${argumentTerm}${maxArgs !== 1 ? "s" : ""}, found ${args.length}`
+    );
+  }
+}
+
diff --git a/internal-packages/tsql/src/query/models.ts b/internal-packages/tsql/src/query/models.ts
new file mode 100644
index 00000000000..49c8bd4f3c5
--- /dev/null
+++ b/internal-packages/tsql/src/query/models.ts
@@ -0,0 +1,253 @@
+// TypeScript translation of posthog/hogql/database/models.py
+
+import type { Expr, ConstantType } from "./ast";
+import type { TSQLContext } from "./context";
+
+export interface FieldOrTable {
+  hidden?: boolean;
+}
+
+export interface DatabaseField extends FieldOrTable {
+  name: string;
+  array?: boolean;
+  nullable?: boolean;
+  is_nullable?(): boolean;
+  get_constant_type?(): ConstantType;
+  default_value?(): any;
+}
+
+export interface IntegerDatabaseField extends DatabaseField {}
+export interface FloatDatabaseField extends DatabaseField {}
+export interface DecimalDatabaseField extends DatabaseField {}
+export interface StringDatabaseField extends DatabaseField {}
+export interface UnknownDatabaseField extends DatabaseField {}
+export interface StringJSONDatabaseField extends DatabaseField {}
+export interface StringArrayDatabaseField extends DatabaseField {}
+export interface FloatArrayDatabaseField extends DatabaseField {}
+export interface DateDatabaseField extends DatabaseField {}
+export interface DateTimeDatabaseField extends DatabaseField {}
+export interface BooleanDatabaseField extends DatabaseField {}
+export interface UUIDDatabaseField extends DatabaseField {}
+
+export interface ExpressionField extends DatabaseField {
+  expr: Expr;
+  isolate_scope?: boolean;
+}
+
+export interface FieldTraverser extends FieldOrTable {
+  chain: Array<string | number>;
+}
+
+export interface Table extends FieldOrTable {
+  fields: Record<string, FieldOrTable>;
+  has_field?(name: string | number): boolean;
+  get_field?(name: string | number): FieldOrTable;
+  to_printed_clickhouse?(context: TSQLContext): string;
+  to_printed_tsql?(): string;
+  avoid_asterisk_fields?(): string[];
+  get_asterisk?(): Record<string, FieldOrTable>;
+}
+
+export interface LazyJoin extends FieldOrTable {
+  join_function?(from_table: Table, to_table: Table, requesting_table: Table): Expr;
+  resolve_table?(context: TSQLContext): Table;
+}
+
+export interface LazyTable extends Table {}
+
+export interface VirtualTable extends Table {}
+
+export interface SavedQuery extends Table {
+  query: Expr;
+}
+
+export interface FunctionCallTable extends Table {
+  call_function?(context: TSQLContext): Expr;
+}
+
+export interface TableNode {
+  name: "root" | string;
+  table?: FieldOrTable | null;
+  children: Record<string, TableNode>;
+  get?(): FieldOrTable;
+  has_child?(path: string[]): boolean;
+  get_child?(path: string[]): TableNode;
+  add_child?(
+    child: TableNode,
+    options?: {
+      table_conflict_mode?: "override" | "ignore";
+      children_conflict_mode?: "override" | "merge" | "ignore";
+    }
+  ): void;
+  merge_with?(
+    other: TableNode,
+    options?: {
+      table_conflict_mode?: "override" | "ignore";
+      children_conflict_mode?: "override" | "merge" | "ignore";
+    }
+  ): void;
+  resolve_all_table_names?(): string[];
+}
+
+// Basic TableNode implementation class
+export class TableNodeImpl implements TableNode {
+  name: "root" | string;
+  table?: FieldOrTable | null;
+  children: Record<string, TableNode>;
+
+  constructor(name: "root" | string = "root", table?: FieldOrTable | null) {
+    this.name = name;
+    this.table = table || null;
+    this.children = {};
+  }
+
+  get(): FieldOrTable {
+    if (this.table === null || this.table === undefined) {
+      throw new Error(`Table is not set at \`${this.name}\``);
+    }
+    return this.table;
+  }
+
+  has_child(path: string[]): boolean {
+    if (path.length === 0) {
+      return this.table !== null && this.table !== undefined;
+    }
+
+    const [first, ...restOfPath] = path;
+    if (!(first in this.children)) {
+      return false;
+    }
+
+    return this.children[first].has_child ? this.children[first].has_child!(restOfPath) : false;
+  }
+
+  get_child(path: string[]): TableNode {
+    if (path.length === 0) {
+      return this;
+    }
+
+    const [first, ...restOfPath] = path;
+    if (!(first in this.children)) {
+      throw new Error(`Unknown child \`${first}\` at \`${this.name}\`.`);
+    }
+
+    return this.children[first].get_child
+      ? this.children[first].get_child!(restOfPath)
+      : this.children[first];
+  }
+
+  add_child(
+    child: TableNode,
+    options?: {
+      table_conflict_mode?: "override" | "ignore";
+      children_conflict_mode?: "override" | "merge" | "ignore";
+    }
+  ): void {
+    const tableConflictMode = options?.table_conflict_mode || "ignore";
+    const childrenConflictMode = options?.children_conflict_mode || "merge";
+
+    if (child.name in this.children) {
+      if (childrenConflictMode === "override") {
+        this.children[child.name] = child;
+      } else if (childrenConflictMode === "merge") {
+        const existing = this.children[child.name];
+        if (existing.merge_with) {
+          existing.merge_with(child, {
+            table_conflict_mode: tableConflictMode,
+            children_conflict_mode: childrenConflictMode,
+          });
+        }
+      }
+      // ignore mode: do nothing
+      return;
+    }
+
+    this.children[child.name] = child;
+  }
+
+  merge_with(
+    other: TableNode,
+    options?: {
+      table_conflict_mode?: "override" | "ignore";
+      children_conflict_mode?: "override" | "merge" | "ignore";
+    }
+  ): void {
+    const tableConflictMode = options?.table_conflict_mode || "ignore";
+    const childrenConflictMode = options?.children_conflict_mode || "merge";
+
+    if (other.table !== null && other.table !== undefined) {
+      if (this.table === null || this.table === undefined) {
+        this.table = other.table;
+      } else {
+        // Conflict - check conflict mode
+        if (tableConflictMode === "override") {
+          this.table = other.table;
+        }
+        // ignore mode: do nothing
+      }
+    }
+
+    for (const child of Object.values(other.children)) {
+      this.add_child(child, {
+        table_conflict_mode: tableConflictMode,
+        children_conflict_mode: childrenConflictMode,
+      });
+    }
+  }
+
+  resolve_all_table_names(): string[] {
+    const names: string[] = [];
+
+    if (this.table !== null && this.table !== undefined) {
+      names.push(this.name);
+    }
+
+    for (const child of Object.values(this.children)) {
+      const childNames = child.resolve_all_table_names ? child.resolve_all_table_names() : [];
+
+      // The root node should NOT include itself in the names
+      if (this.name === "root") {
+        names.push(...childNames);
+      } else {
+        names.push(...childNames.map((x) => `${this.name}.${x}`));
+      }
+    }
+
+    return names;
+  }
+
+  static createNestedForChain(chain: string[], table: Table): TableNode {
+    if (chain.length === 0) {
+      throw new Error("Chain must have at least one element");
+    }
+
+    const start = new TableNodeImpl(chain[0]);
+    let current: TableNode = start;
+
+    for (let i = 1; i < chain.length; i++) {
+      const child = new TableNodeImpl(chain[i]);
+      if (current.add_child) {
+        current.add_child(child);
+      } else {
+        current.children[child.name] = child;
+      }
+      current = child;
+    }
+
+    current.table = table;
+    return start;
+  }
+}
+
+export interface LazyTableToAdd {
+  lazy_table: LazyTable;
+  fields_accessed: Record<string, Array<string | number>>;
+}
+
+export interface LazyJoinToAdd {
+  from_table: string;
+  to_table: string;
+  lazy_join: LazyJoin;
+  lazy_join_type: any; // LazyJoinType from ast.ts
+  fields_accessed: Record<string, Array<string | number>>;
+}
diff --git a/internal-packages/tsql/src/query/parse_string.ts b/internal-packages/tsql/src/query/parse_string.ts
new file mode 100644
index 00000000000..be38f752dd2
--- /dev/null
+++ b/internal-packages/tsql/src/query/parse_string.ts
@@ -0,0 +1,65 @@
+// TypeScript translation of posthog/hogql/parse_string.py
+// Keep this file in sync with the Python version
+
+import { SyntaxError } from './errors';
+
+function replaceCommonEscapeCharacters(text: string): string {
+    // copied from clickhouse_driver/util/escape.py
+    // Note: \a (bell) and \v (vertical tab) are not directly supported in JavaScript strings
+    // but we handle them as escape sequences that get replaced
+    text = text.replace(/\\b/g, '\b');
+    text = text.replace(/\\f/g, '\f');
+    text = text.replace(/\\r/g, '\r');
+    text = text.replace(/\\n/g, '\n');
+    text = text.replace(/\\t/g, '\t');
+    text = text.replace(/\\0/g, ''); // NUL characters are ignored
+    text = text.replace(/\\a/g, '\x07'); // Bell character (ASCII 7)
+    text = text.replace(/\\v/g, '\x0B'); // Vertical tab (ASCII 11)
+    text = text.replace(/\\\\/g, '\\');
+    return text;
+}
+
+export function parseStringLiteralText(text: string): string {
+    /** Converts a string received from antlr via ctx.getText() into a JavaScript string */
+    let result: string;
+    
+    if (text.startsWith("'") && text.endsWith("'")) {
+        result = text.slice(1, -1);
+        result = result.replace(/''/g, "'");
+        result = result.replace(/\\'/g, "'");
+    } else if (text.startsWith('"') && text.endsWith('"')) {
+        result = text.slice(1, -1);
+        result = result.replace(/""/g, '"');
+        result = result.replace(/\\"/g, '"');
+    } else if (text.startsWith('`') && text.endsWith('`')) {
+        result = text.slice(1, -1);
+        result = result.replace(/``/g, '`');
+        result = result.replace(/\\`/g, '`');
+    } else if (text.startsWith('{') && text.endsWith('}')) {
+        result = text.slice(1, -1);
+        result = result.replace(/{{/g, '{');
+        result = result.replace(/\\{/g, '{');
+    } else {
+        throw new SyntaxError(`Invalid string literal, must start and end with the same quote type: ${text}`);
+    }
+
+    return replaceCommonEscapeCharacters(result);
+}
+
+export function parseStringLiteralCtx(ctx: { getText(): string }): string {
+    /** Converts a STRING_LITERAL received from antlr via ctx.getText() into a JavaScript string */
+    const text = ctx.getText();
+    return parseStringLiteralText(text);
+}
+
+export function parseStringTextCtx(ctx: { getText(): string }, escapeQuotes: boolean = true): string {
+    /** Converts a STRING_TEXT received from antlr via ctx.getText() into a JavaScript string */
+    let text = ctx.getText();
+    if (escapeQuotes) {
+        text = text.replace(/''/g, "'");
+        text = text.replace(/\\'/g, "'");
+    }
+    text = text.replace(/\\{/g, '{');
+    return replaceCommonEscapeCharacters(text);
+}
+
diff --git a/internal-packages/tsql/src/query/parser.test.ts b/internal-packages/tsql/src/query/parser.test.ts
new file mode 100644
index 00000000000..a3ba292a6f3
--- /dev/null
+++ b/internal-packages/tsql/src/query/parser.test.ts
@@ -0,0 +1,629 @@
+import { describe, it, expect } from "vitest";
+import { CharStreams, CommonTokenStream } from "antlr4ts";
+import { TSQLLexer } from "../grammar/TSQLLexer.js";
+import { TSQLParser } from "../grammar/TSQLParser.js";
+import { TSQLParseTreeConverter } from "./parser.js";
+import { ArithmeticOperationOp, CompareOperationOp } from "./ast.js";
+import { SyntaxError } from "./errors.js";
+
+/**
+ * Helper function to parse TSQL input and convert to AST
+ */
+function parseAndConvert(input: string) {
+  const inputStream = CharStreams.fromString(input);
+  const lexer = new TSQLLexer(inputStream);
+  const tokenStream = new CommonTokenStream(lexer);
+  const parser = new TSQLParser(tokenStream);
+  const parseTree = parser.select();
+  const converter = new TSQLParseTreeConverter();
+  return converter.visit(parseTree);
+}
+
+describe("TSQLParseTreeConverter", () => {
+  describe("SELECT statements", () => {
+    it("should convert a simple SELECT statement", () => {
+      const ast = parseAndConvert("SELECT * FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+        },
+      });
+    });
+
+    it("should convert SELECT with multiple columns", () => {
+      const ast = parseAndConvert("SELECT id, name, email FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          { expression_type: "field", chain: ["id"] },
+          { expression_type: "field", chain: ["name"] },
+          { expression_type: "field", chain: ["email"] },
+        ],
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+        },
+      });
+    });
+
+    it("should convert SELECT with DISTINCT", () => {
+      const ast = parseAndConvert("SELECT DISTINCT id FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        distinct: true,
+        select: [{ expression_type: "field", chain: ["id"] }],
+      });
+    });
+
+    it("should convert SELECT with WHERE clause", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE id = 1");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+        },
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Eq,
+          left: { expression_type: "field", chain: ["id"] },
+          right: { expression_type: "constant", value: 1 },
+        },
+      });
+    });
+
+    it("should convert SELECT with ORDER BY", () => {
+      const ast = parseAndConvert("SELECT * FROM users ORDER BY id DESC");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        order_by: [
+          {
+            expression_type: "order_expr",
+            order: "DESC",
+            expr: { expression_type: "field", chain: ["id"] },
+          },
+        ],
+      });
+    });
+
+    it("should convert SELECT with LIMIT", () => {
+      const ast = parseAndConvert("SELECT * FROM users LIMIT 10");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        limit: { expression_type: "constant", value: 10 },
+      });
+    });
+
+    it("should convert SELECT with LIMIT and OFFSET", () => {
+      const ast = parseAndConvert("SELECT * FROM users LIMIT 10 OFFSET 5");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        limit: { expression_type: "constant", value: 10 },
+        offset: { expression_type: "constant", value: 5 },
+      });
+    });
+
+    it("should convert SELECT with GROUP BY", () => {
+      const ast = parseAndConvert("SELECT category, COUNT(*) FROM products GROUP BY category");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          { expression_type: "field", chain: ["category"] },
+          { expression_type: "call", name: "COUNT" },
+        ],
+        group_by: [{ expression_type: "field", chain: ["category"] }],
+      });
+    });
+
+    it("should convert SELECT with HAVING", () => {
+      const ast = parseAndConvert(
+        "SELECT category FROM products GROUP BY category HAVING COUNT(*) > 10"
+      );
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["category"] }],
+        group_by: [{ expression_type: "field", chain: ["category"] }],
+        having: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Gt,
+          left: { expression_type: "call", name: "COUNT" },
+          right: { expression_type: "constant", value: 10 },
+        },
+      });
+    });
+  });
+
+  describe("expressions", () => {
+    it("should convert numeric constants", () => {
+      const ast = parseAndConvert("SELECT 42 FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "constant", value: 42 }],
+      });
+    });
+
+    it("should convert string constants", () => {
+      const ast = parseAndConvert("SELECT 'hello' FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "constant", value: "hello" }],
+      });
+    });
+
+    it("should convert boolean constants", () => {
+      const ast = parseAndConvert("SELECT true FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "constant", value: true }],
+      });
+    });
+
+    it("should convert arithmetic addition", () => {
+      const ast = parseAndConvert("SELECT 1 + 2 FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          {
+            expression_type: "arithmetic_operation",
+            op: ArithmeticOperationOp.Add,
+            left: { expression_type: "constant", value: 1 },
+            right: { expression_type: "constant", value: 2 },
+          },
+        ],
+      });
+    });
+
+    it("should convert arithmetic subtraction", () => {
+      const ast = parseAndConvert("SELECT 5 - 3 FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          {
+            expression_type: "arithmetic_operation",
+            op: ArithmeticOperationOp.Sub,
+            left: { expression_type: "constant", value: 5 },
+            right: { expression_type: "constant", value: 3 },
+          },
+        ],
+      });
+    });
+
+    it("should convert arithmetic multiplication", () => {
+      const ast = parseAndConvert("SELECT 2 * 3 FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          {
+            expression_type: "arithmetic_operation",
+            op: ArithmeticOperationOp.Mult,
+            left: { expression_type: "constant", value: 2 },
+            right: { expression_type: "constant", value: 3 },
+          },
+        ],
+      });
+    });
+
+    it("should convert arithmetic division", () => {
+      const ast = parseAndConvert("SELECT 10 / 2 FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          {
+            expression_type: "arithmetic_operation",
+            op: ArithmeticOperationOp.Div,
+            left: { expression_type: "constant", value: 10 },
+            right: { expression_type: "constant", value: 2 },
+          },
+        ],
+      });
+    });
+
+    it("should convert comparison equals", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE id = 1");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Eq,
+          left: { expression_type: "field", chain: ["id"] },
+          right: { expression_type: "constant", value: 1 },
+        },
+      });
+    });
+
+    it("should convert comparison not equals", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE id != 1");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.NotEq,
+          left: { expression_type: "field", chain: ["id"] },
+          right: { expression_type: "constant", value: 1 },
+        },
+      });
+    });
+
+    it("should convert comparison less than", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE id < 10");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Lt,
+          left: { expression_type: "field", chain: ["id"] },
+          right: { expression_type: "constant", value: 10 },
+        },
+      });
+    });
+
+    it("should convert comparison greater than", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE id > 5");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Gt,
+          left: { expression_type: "field", chain: ["id"] },
+          right: { expression_type: "constant", value: 5 },
+        },
+      });
+    });
+
+    it("should convert LIKE comparison", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE name LIKE '%john%'");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Like,
+          left: { expression_type: "field", chain: ["name"] },
+          right: { expression_type: "constant", value: "%john%" },
+        },
+      });
+    });
+
+    it("should convert IN comparison", () => {
+      const ast = parseAndConvert("SELECT * FROM users WHERE id IN (1, 2, 3)");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.In,
+          left: { expression_type: "field", chain: ["id"] },
+          right: {
+            expression_type: "tuple",
+            exprs: [
+              { expression_type: "constant", value: 1 },
+              { expression_type: "constant", value: 2 },
+              { expression_type: "constant", value: 3 },
+            ],
+          },
+        },
+      });
+    });
+
+    it("should convert function calls", () => {
+      const ast = parseAndConvert("SELECT COUNT(*) FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          {
+            expression_type: "call",
+            name: "COUNT",
+            args: [{ expression_type: "field", chain: ["*"] }],
+          },
+        ],
+      });
+    });
+
+    it("should convert nested field access", () => {
+      const ast = parseAndConvert("SELECT user.profile.name FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["user", "profile", "name"] }],
+      });
+    });
+
+    it("should convert aliased expressions", () => {
+      const ast = parseAndConvert("SELECT id AS user_id FROM users");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          {
+            expression_type: "alias",
+            alias: "user_id",
+            expr: { expression_type: "field", chain: ["id"] },
+          },
+        ],
+      });
+    });
+  });
+
+  describe("JOINs", () => {
+    it("should convert INNER JOIN", () => {
+      const ast = parseAndConvert(
+        "SELECT * FROM users INNER JOIN orders ON users.id = orders.user_id"
+      );
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+          next_join: {
+            expression_type: "join_expr",
+            join_type: "INNER JOIN",
+            table: { expression_type: "field", chain: ["orders"] },
+            constraint: {
+              expression_type: "join_constraint",
+              constraint_type: "ON",
+              expr: {
+                expression_type: "compare_operation",
+                op: CompareOperationOp.Eq,
+              },
+            },
+          },
+        },
+      });
+    });
+
+    it("should convert LEFT JOIN", () => {
+      const ast = parseAndConvert(
+        "SELECT * FROM users LEFT JOIN orders ON users.id = orders.user_id"
+      );
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+          next_join: {
+            expression_type: "join_expr",
+            join_type: "LEFT JOIN",
+            table: { expression_type: "field", chain: ["orders"] },
+            constraint: { constraint_type: "ON" },
+          },
+        },
+      });
+    });
+
+    it("should convert CROSS JOIN", () => {
+      const ast = parseAndConvert("SELECT * FROM users CROSS JOIN orders");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+          next_join: {
+            expression_type: "join_expr",
+            join_type: "CROSS JOIN",
+            table: { expression_type: "field", chain: ["orders"] },
+          },
+        },
+      });
+    });
+  });
+
+  describe("UNION queries", () => {
+    it("should convert UNION DISTINCT query", () => {
+      // Grammar supports UNION ALL, UNION DISTINCT, INTERSECT, INTERSECT DISTINCT, EXCEPT
+      // Bare UNION (without ALL/DISTINCT) is not supported
+      const ast = parseAndConvert("SELECT id FROM users UNION DISTINCT SELECT id FROM customers");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_set_query",
+        initial_select_query: {
+          expression_type: "select_query",
+          select: [{ expression_type: "field", chain: ["id"] }],
+          select_from: {
+            table: { expression_type: "field", chain: ["users"] },
+          },
+        },
+        subsequent_select_queries: [
+          {
+            set_operator: "UNION DISTINCT",
+            select_query: {
+              expression_type: "select_query",
+              select: [{ expression_type: "field", chain: ["id"] }],
+              select_from: {
+                table: { expression_type: "field", chain: ["customers"] },
+              },
+            },
+          },
+        ],
+      });
+    });
+
+    it("should convert UNION ALL query", () => {
+      const ast = parseAndConvert("SELECT id FROM users UNION ALL SELECT id FROM customers");
+
+      expect(ast).toMatchObject({
+        expression_type: "select_set_query",
+        initial_select_query: {
+          expression_type: "select_query",
+          select: [{ expression_type: "field", chain: ["id"] }],
+        },
+        subsequent_select_queries: [
+          {
+            set_operator: "UNION ALL",
+            select_query: {
+              expression_type: "select_query",
+              select: [{ expression_type: "field", chain: ["id"] }],
+            },
+          },
+        ],
+      });
+    });
+  });
+
+  describe("WITH clauses (CTEs)", () => {
+    it("should convert SELECT with WITH clause", () => {
+      const ast = parseAndConvert(
+        "WITH recent_users AS (SELECT * FROM users WHERE created_at > '2024-01-01') SELECT * FROM recent_users"
+      );
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        ctes: {
+          recent_users: {
+            expression_type: "cte",
+            name: "recent_users",
+            cte_type: "subquery",
+            expr: {
+              expression_type: "select_query",
+              select: [{ expression_type: "field", chain: ["*"] }],
+              select_from: {
+                table: { expression_type: "field", chain: ["users"] },
+              },
+              where: {
+                expression_type: "compare_operation",
+                op: CompareOperationOp.Gt,
+              },
+            },
+          },
+        },
+        select: [{ expression_type: "field", chain: ["*"] }],
+        select_from: {
+          table: { expression_type: "field", chain: ["recent_users"] },
+        },
+      });
+    });
+  });
+
+  describe("error handling", () => {
+    it("should preserve position information in errors", () => {
+      const input = "SELECT * FROM users WHERE invalid syntax";
+      const inputStream = CharStreams.fromString(input);
+      const lexer = new TSQLLexer(inputStream);
+      const tokenStream = new CommonTokenStream(lexer);
+      const parser = new TSQLParser(tokenStream);
+
+      // This might not parse correctly, but if it does and we visit an error node,
+      // it should throw with position info
+      try {
+        const parseTree = parser.select();
+        const converter = new TSQLParseTreeConverter();
+        converter.visit(parseTree);
+      } catch (error) {
+        if (error instanceof SyntaxError) {
+          // Error should have position information if available
+          expect(error).toBeInstanceOf(SyntaxError);
+        }
+      }
+    });
+  });
+
+  describe("complex queries", () => {
+    it("should convert a complex query with multiple clauses", () => {
+      const ast = parseAndConvert(
+        "SELECT category, COUNT(*) as count " +
+          "FROM products " +
+          "WHERE price > 100 " +
+          "GROUP BY category " +
+          "HAVING COUNT(*) > 5 " +
+          "ORDER BY count DESC " +
+          "LIMIT 10"
+      );
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [
+          { expression_type: "field", chain: ["category"] },
+          {
+            expression_type: "alias",
+            alias: "count",
+            expr: { expression_type: "call", name: "COUNT" },
+          },
+        ],
+        select_from: {
+          table: { expression_type: "field", chain: ["products"] },
+        },
+        where: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Gt,
+          left: { expression_type: "field", chain: ["price"] },
+          right: { expression_type: "constant", value: 100 },
+        },
+        group_by: [{ expression_type: "field", chain: ["category"] }],
+        having: {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Gt,
+          left: { expression_type: "call", name: "COUNT" },
+          right: { expression_type: "constant", value: 5 },
+        },
+        order_by: [
+          {
+            expression_type: "order_expr",
+            order: "DESC",
+            expr: { expression_type: "field", chain: ["count"] },
+          },
+        ],
+        limit: { expression_type: "constant", value: 10 },
+      });
+    });
+
+    it("should convert query with multiple JOINs", () => {
+      const ast = parseAndConvert(
+        "SELECT * FROM users " +
+          "INNER JOIN orders ON users.id = orders.user_id " +
+          "LEFT JOIN products ON orders.product_id = products.id"
+      );
+
+      expect(ast).toMatchObject({
+        expression_type: "select_query",
+        select: [{ expression_type: "field", chain: ["*"] }],
+        select_from: {
+          expression_type: "join_expr",
+          table: { expression_type: "field", chain: ["users"] },
+          next_join: {
+            expression_type: "join_expr",
+            join_type: "INNER JOIN",
+            table: { expression_type: "field", chain: ["orders"] },
+            constraint: { constraint_type: "ON" },
+            next_join: {
+              expression_type: "join_expr",
+              join_type: "LEFT JOIN",
+              table: { expression_type: "field", chain: ["products"] },
+              constraint: { constraint_type: "ON" },
+            },
+          },
+        },
+      });
+    });
+  });
+});
diff --git a/internal-packages/tsql/src/query/parser.ts b/internal-packages/tsql/src/query/parser.ts
new file mode 100644
index 00000000000..05b1df052ba
--- /dev/null
+++ b/internal-packages/tsql/src/query/parser.ts
@@ -0,0 +1,1845 @@
+import { ParserRuleContext } from "antlr4ts/ParserRuleContext";
+import { Token } from "antlr4ts/Token";
+import { ErrorNode } from "antlr4ts/tree/ErrorNode";
+import { ParseTree } from "antlr4ts/tree/ParseTree";
+import { TerminalNode } from "antlr4ts/tree/TerminalNode";
+import {
+  AliasContext,
+  BlockContext,
+  CatchBlockContext,
+  ColumnExprAliasContext,
+  ColumnExprAndContext,
+  ColumnExprArrayAccessContext,
+  ColumnExprArrayContext,
+  ColumnExprAsteriskContext,
+  ColumnExprBetweenContext,
+  ColumnExprCallContext,
+  ColumnExprCallSelectContext,
+  ColumnExprCaseContext,
+  ColumnExprDictContext,
+  ColumnExprFunctionContext,
+  ColumnExprIdentifierContext,
+  ColumnExprIntervalContext,
+  ColumnExprIsNullContext,
+  ColumnExprListContext,
+  ColumnExprLiteralContext,
+  ColumnExprNegateContext,
+  ColumnExprNotContext,
+  ColumnExprNullArrayAccessContext,
+  ColumnExprNullishContext,
+  ColumnExprNullPropertyAccessContext,
+  ColumnExprNullTupleAccessContext,
+  ColumnExprOrContext,
+  ColumnExprParensContext,
+  ColumnExprPrecedence1Context,
+  ColumnExprPrecedence2Context,
+  ColumnExprPrecedence3Context,
+  ColumnExprPropertyAccessContext,
+  ColumnExprSubqueryContext,
+  ColumnExprTemplateStringContext,
+  ColumnExprTernaryOpContext,
+  ColumnExprTupleAccessContext,
+  ColumnExprTupleContext,
+  ColumnExprWinFunctionContext,
+  ColumnExprWinFunctionTargetContext,
+  ColumnIdentifierContext,
+  ColumnLambdaExprContext,
+  DatabaseIdentifierContext,
+  DeclarationContext,
+  EmptyStmtContext,
+  ExpressionContext,
+  ExprStmtContext,
+  ForInStmtContext,
+  ForStmtContext,
+  FrameBetweenContext,
+  FrameStartContext,
+  FromClauseContext,
+  FullTemplateStringContext,
+  FuncStmtContext,
+  GroupByClauseContext,
+  HavingClauseContext,
+  IdentifierContext,
+  IdentifierListContext,
+  IfStmtContext,
+  JoinConstraintClauseContext,
+  JoinExprCrossOpContext,
+  JoinExprOpContext,
+  JoinExprParensContext,
+  JoinExprTableContext,
+  JoinOpFullContext,
+  JoinOpInnerContext,
+  JoinOpLeftRightContext,
+  KvPairContext,
+  KvPairListContext,
+  LimitByClauseContext,
+  LimitExprContext,
+  LiteralContext,
+  NestedIdentifierContext,
+  NumberLiteralContext,
+  OrderByClauseContext,
+  OrderExprContext,
+  OrderExprListContext,
+  PlaceholderContext,
+  PrewhereClauseContext,
+  ProgramContext,
+  RatioExprContext,
+  ReturnStmtContext,
+  SampleClauseContext,
+  SelectContext,
+  SelectSetStmtContext,
+  SelectStmtContext,
+  SelectStmtWithParensContext,
+  StatementContext,
+  StringContentsContext,
+  StringContentsFullContext,
+  StringContext,
+  TableArgListContext,
+  TableExprAliasContext,
+  TableExprFunctionContext,
+  TableExprIdentifierContext,
+  TableExprPlaceholderContext,
+  TableExprSubqueryContext,
+  TableExprTagContext,
+  TableFunctionExprContext,
+  TableIdentifierContext,
+  TemplateStringContext,
+  ThrowStmtContext,
+  TryCatchStmtContext,
+  TSQLxChildElementContext,
+  TSQLxTagAttributeContext,
+  TSQLxTagElementContext,
+  VarAssignmentContext,
+  VarDeclContext,
+  WhereClauseContext,
+  WhileStmtContext,
+  WindowExprContext,
+  WinFrameBoundContext,
+  WinFrameClauseContext,
+  WinOrderByClauseContext,
+  WinPartitionByClauseContext,
+  WithClauseContext,
+  WithExprColumnContext,
+  WithExprListContext,
+  WithExprSubqueryContext,
+} from "../grammar/TSQLParser.js";
+import { TSQLParserVisitor } from "../grammar/TSQLParserVisitor.js";
+import {
+  Alias,
+  And,
+  ArithmeticOperation,
+  ArithmeticOperationOp,
+  ArrayAccess,
+  Array as ArrayExpression,
+  AST,
+  BetweenExpr,
+  Block,
+  Call,
+  CompareOperation,
+  CompareOperationOp,
+  Constant,
+  CTE,
+  Declaration,
+  Dict,
+  Expr,
+  ExprCall,
+  Expression,
+  ExprStatement,
+  Field,
+  ForInStatement,
+  ForStatement,
+  Function,
+  TSQLXAttribute,
+  TSQLXTag,
+  IfStatement,
+  JoinConstraint,
+  JoinExpr,
+  Lambda,
+  LimitByExpr,
+  Not,
+  Or,
+  OrderExpr,
+  ParseResult,
+  Placeholder,
+  Program,
+  RatioExpr,
+  ReturnStatement,
+  SampleExpr,
+  SelectQuery,
+  SelectSetNode,
+  SelectSetQuery,
+  SetOperator,
+  Statement,
+  ThrowStatement,
+  TryCatchStatement,
+  Tuple,
+  TupleAccess,
+  VariableAssignment,
+  VariableDeclaration,
+  WhileStatement,
+  WindowExpr,
+  WindowFrameExpr,
+  WindowFunction,
+} from "./ast";
+import { RESERVED_KEYWORDS } from "./constants";
+import { BaseTSQLError, NotImplementedError, SyntaxError } from "./errors";
+import { parseStringLiteralText } from "./parse_string";
+
+/**
+ * Token with position information.
+ * antlr4ts Token interface has startIndex/stopIndex, but runtime may also expose start/stop.
+ * This type represents the union of both possibilities.
+ */
+type TokenWithPosition = Token & {
+  start?: number;
+  stop?: number;
+};
+
+/**
+ * Extract start position from a token, handling both start and startIndex properties.
+ */
+function getTokenStart(token: Token | undefined): number | undefined {
+  if (!token) return undefined;
+  const tokenWithPos = token as TokenWithPosition;
+  // Try start first (runtime property), then fall back to startIndex (type-safe property)
+  return tokenWithPos.start ?? tokenWithPos.startIndex;
+}
+
+/**
+ * Extract stop position from a token, handling both stop and stopIndex properties.
+ */
+function getTokenStop(token: Token | undefined): number | undefined {
+  if (!token) return undefined;
+  const tokenWithPos = token as TokenWithPosition;
+  // Try stop first (runtime property), then fall back to stopIndex (type-safe property)
+  return tokenWithPos.stop ?? tokenWithPos.stopIndex;
+}
+
+/**
+ * Visitor that converts TSQL AST to a QueryConfig
+ * The QueryConfig can then be used to build a ClickhouseQueryBuilder
+ */
+export class TSQLParseTreeConverter implements TSQLParserVisitor<any> {
+  start?: number;
+
+  constructor(start?: number) {
+    this.start = start;
+  }
+
+  // ─────────────────────────────────────────────────────────────────────────────
+  // Typed visit helpers - these provide type-safe wrappers around the generic visit()
+  // ─────────────────────────────────────────────────────────────────────────────
+
+  /** Visit a column expression and return an Expression */
+  private visitAsExpr(ctx: ParserRuleContext): Expression {
+    return this.visit(ctx) as Expression;
+  }
+
+  /** Visit a join expression context */
+  private visitJoin(ctx: ParserRuleContext): JoinExpr {
+    return this.visit(ctx) as JoinExpr;
+  }
+
+  /** Visit an order expression list */
+  private visitOrderList(ctx: ParserRuleContext): OrderExpr[] {
+    return this.visit(ctx) as OrderExpr[];
+  }
+
+  /** Visit a window expression */
+  private visitWindow(ctx: ParserRuleContext): WindowExpr {
+    return this.visit(ctx) as WindowExpr;
+  }
+
+  /** Visit a ratio expression */
+  private visitRatio(ctx: ParserRuleContext): RatioExpr {
+    return this.visit(ctx) as RatioExpr;
+  }
+
+  /** Visit a CTE list */
+  private visitCTEs(ctx: ParserRuleContext): Record<string, CTE> {
+    return this.visit(ctx) as Record<string, CTE>;
+  }
+
+  /** Visit an expression list */
+  private visitExprList(ctx: ParserRuleContext): Expression[] {
+    return this.visit(ctx) as Expression[];
+  }
+
+  /** Visit a select statement */
+  private visitSelectQuery(ctx: ParserRuleContext): SelectQuery | SelectSetQuery {
+    return this.visit(ctx) as SelectQuery | SelectSetQuery;
+  }
+
+  /** Visit a placeholder */
+  private visitPlaceholderExpr(ctx: ParserRuleContext): Placeholder {
+    return this.visit(ctx) as Placeholder;
+  }
+
+  /** Visit and return a string (for identifiers, aliases) */
+  private visitAsString(ctx: ParserRuleContext): string {
+    return this.visit(ctx) as string;
+  }
+
+  /** Visit and return string array (for table identifiers, nested identifiers) */
+  private visitStringArray(ctx: ParserRuleContext): string[] {
+    return this.visit(ctx) as string[];
+  }
+
+  /** Visit a limit by expression */
+  private visitLimitBy(ctx: ParserRuleContext): LimitByExpr {
+    return this.visit(ctx) as LimitByExpr;
+  }
+
+  /** Visit a join operator and return the type string */
+  private visitJoinOpString(ctx: ParserRuleContext): string {
+    return this.visit(ctx) as string;
+  }
+
+  /** Visit a join constraint */
+  private visitConstraint(ctx: ParserRuleContext): JoinConstraint {
+    return this.visit(ctx) as JoinConstraint;
+  }
+
+  /** Visit a sample expression */
+  private visitSample(ctx: ParserRuleContext): SampleExpr {
+    return this.visit(ctx) as SampleExpr;
+  }
+
+  /** Visit a window frame expression */
+  private visitFrame(ctx: ParserRuleContext): WindowFrameExpr | [WindowFrameExpr, WindowFrameExpr] {
+    return this.visit(ctx) as WindowFrameExpr | [WindowFrameExpr, WindowFrameExpr];
+  }
+
+  /** Visit and return a Constant */
+  private visitConst(ctx: ParserRuleContext): Constant {
+    return this.visit(ctx) as Constant;
+  }
+
+  // ─────────────────────────────────────────────────────────────────────────────
+  // Core visitor methods
+  // ─────────────────────────────────────────────────────────────────────────────
+
+  visit(ctx: ParserRuleContext): ParseResult {
+    const start = getTokenStart(ctx.start);
+    const stop = getTokenStop(ctx.stop);
+    const end = stop !== undefined ? stop + 1 : undefined;
+    try {
+      // Use accept() for proper visitor dispatch - this calls the correct visitXxx method
+      // based on the runtime type of the context
+      const node = ctx.accept(this);
+      // Only set position if node is a valid object and we have position info
+      if (
+        node &&
+        typeof node === "object" &&
+        node !== null &&
+        "start" in node &&
+        this.start !== undefined
+      ) {
+        node.start = start;
+        node.end = end;
+      }
+      return node;
+    } catch (e: any) {
+      if (e instanceof BaseTSQLError) {
+        if (
+          start !== undefined &&
+          end !== undefined &&
+          (e.start === undefined || e.end === undefined)
+        ) {
+          e.start = start;
+          e.end = end;
+        }
+      }
+      throw e;
+    }
+  }
+
+  /**
+   * Visit a parse tree node, dispatching to the appropriate visitor method.
+   * Uses the accept method for proper double dispatch, which handles ErrorNode vs TerminalNode correctly.
+   */
+  private visitParseTree(node: ParseTree): any {
+    // Use accept method for double dispatch - this will call the correct visit method
+    // based on the actual runtime type of the node
+    return node.accept(this);
+  }
+
+  visitChildren(ctx: ParserRuleContext): any {
+    if (!ctx.children || ctx.children.length === 0) {
+      return null;
+    }
+
+    const results: any[] = [];
+    for (const child of ctx.children) {
+      results.push(this.visitParseTree(child));
+    }
+
+    // Return single result if only one child, otherwise return array
+    return results.length === 1 ? results[0] : results;
+  }
+
+  visitTerminal(node: TerminalNode): any {
+    // Terminal nodes are leaf nodes (tokens) in the parse tree
+    // Typically not needed for AST conversion, but required by interface
+    return null;
+  }
+
+  visitErrorNode(node: ErrorNode): any {
+    // Error nodes represent syntax errors in the parse tree
+    // Throw a syntax error with position information
+    const symbol = node.symbol;
+    // ErrorNode has a symbol property with text
+    const text = symbol?.text || "";
+    const start = getTokenStart(symbol);
+    const end = symbol ? (getTokenStop(symbol) ?? -1) + 1 : undefined;
+    throw new SyntaxError(`Syntax error: ${text}`, {
+      start,
+      end,
+    });
+  }
+
+  // Program and declarations
+  visitProgram(ctx: ProgramContext): Program {
+    const declarations: Declaration[] = [];
+    // Implement based on your parser context structure
+    throw new NotImplementedError("visitProgram not implemented");
+  }
+
+  visitDeclaration(ctx: DeclarationContext): Declaration {
+    return this.visitChildren(ctx);
+  }
+
+  visitExpression(ctx: ExpressionContext): Expression {
+    return this.visitChildren(ctx);
+  }
+
+  visitVarDecl(ctx: VarDeclContext): VariableDeclaration {
+    const expr = ctx.expression();
+    return {
+      name: this.visitIdentifier(ctx.identifier()),
+      expr: expr ? this.visitExpression(expr) : undefined,
+    };
+  }
+
+  visitVarAssignment(ctx: VarAssignmentContext): VariableAssignment {
+    return {
+      left: this.visitExpression(ctx.expression(0)),
+      right: this.visitExpression(ctx.expression(1)),
+    };
+  }
+
+  visitStatement(ctx: StatementContext): Statement {
+    return this.visitChildren(ctx);
+  }
+
+  visitExprStmt(ctx: ExprStmtContext): ExprStatement {
+    return {
+      expr: this.visitExpression(ctx.expression()),
+    };
+  }
+
+  visitReturnStmt(ctx: ReturnStmtContext): ReturnStatement {
+    const expr = ctx.expression();
+    return {
+      expr: expr ? this.visitExpression(expr) : undefined,
+    };
+  }
+
+  visitThrowStmt(ctx: ThrowStmtContext): ThrowStatement {
+    const expr = ctx.expression();
+    return {
+      expr: expr ? this.visitExpression(expr) : undefined,
+    };
+  }
+
+  visitCatchBlock(ctx: CatchBlockContext): [string | null, string | null, Statement] {
+    const catchVar = ctx._catchVar;
+    const catchType = ctx._catchType;
+    const catchStmt = ctx._catchStmt;
+    if (!catchStmt) {
+      throw new SyntaxError("Catch statement is required");
+    }
+    return [
+      catchVar ? this.visitIdentifier(catchVar) : null,
+      catchType ? this.visitIdentifier(catchType) : null,
+      this.visitBlock(catchStmt),
+    ];
+  }
+
+  visitTryCatchStmt(ctx: TryCatchStmtContext): TryCatchStatement {
+    const tryStmt = ctx._tryStmt;
+    const catchBlocks = ctx.catchBlock();
+    const finallyStmt = ctx._finallyStmt;
+    if (!tryStmt) {
+      throw new SyntaxError("Try statement is required");
+    }
+    return {
+      try_stmt: this.visitBlock(tryStmt),
+      catches: catchBlocks.map((c: CatchBlockContext) => this.visitCatchBlock(c)),
+      finally_stmt: finallyStmt ? this.visitBlock(finallyStmt) : undefined,
+    };
+  }
+
+  visitIfStmt(ctx: IfStmtContext): IfStatement {
+    return {
+      expr: this.visitExpression(ctx.expression()),
+      then: this.visitStatement(ctx.statement(0)),
+      else_: ctx.statement(1) ? this.visitStatement(ctx.statement(1)) : undefined,
+    };
+  }
+
+  visitWhileStmt(ctx: WhileStmtContext): WhileStatement {
+    const statement = ctx.statement();
+    if (!statement) {
+      throw new SyntaxError("While statement body is required");
+    }
+    return {
+      expr: this.visitExpression(ctx.expression()),
+      body: this.visitStatement(statement),
+    };
+  }
+
+  visitForInStmt(ctx: ForInStmtContext): ForInStatement {
+    const firstIdentifier = this.visitIdentifier(ctx.identifier(0));
+    const secondIdentifier = ctx.identifier(1) ? this.visitIdentifier(ctx.identifier(1)) : null;
+    const statement = ctx.statement();
+    if (!statement) {
+      throw new SyntaxError("For in statement body is required");
+    }
+    return {
+      valueVar: secondIdentifier ?? firstIdentifier,
+      keyVar: secondIdentifier ? firstIdentifier : undefined,
+      expr: this.visitExpression(ctx.expression()),
+      body: this.visitStatement(statement),
+    };
+  }
+
+  visitForStmt(ctx: ForStmtContext): ForStatement {
+    const initializer =
+      ctx._initializerVarDeclr || ctx._initializerVarAssignment || ctx._initializerExpression;
+    const increment =
+      ctx._incrementVarDeclr || ctx._incrementVarAssignment || ctx._incrementExpression;
+
+    const statement = ctx.statement();
+    if (!statement) {
+      throw new SyntaxError("For statement body is required");
+    }
+    return {
+      initializer: initializer ? this.visitVarDecl(initializer as any) : undefined,
+      condition: this.visitExpression(ctx._condition),
+      increment: this.visitVarDecl(increment as any),
+      body: this.visitStatement(statement),
+    };
+  }
+
+  visitFuncStmt(ctx: FuncStmtContext): Function {
+    const params = ctx.identifierList();
+
+    return {
+      name: this.visitIdentifier(ctx.identifier()),
+      params: params ? this.visitIdentifierList(params) : [],
+      body: this.visitBlock(ctx.block()),
+    };
+  }
+
+  visitKvPairList(ctx: KvPairListContext): [Expression, Expression][] {
+    return ctx
+      .kvPair()
+      .map((kv: any) => [
+        this.visitExpression(kv.expression(0)),
+        this.visitExpression(kv.expression(1)),
+      ]);
+  }
+
+  visitKvPair(ctx: KvPairContext): [Expression, Expression] {
+    const exprs = ctx.expression();
+    return [this.visitExpression(exprs[0]), this.visitExpression(exprs[1])];
+  }
+
+  visitIdentifierList(ctx: IdentifierListContext): string[] {
+    return ctx.identifier().map((ident: any) => this.visitIdentifier(ident));
+  }
+
+  visitEmptyStmt(ctx: EmptyStmtContext): ExprStatement {
+    return { expr: undefined };
+  }
+
+  visitBlock(ctx: BlockContext): Block {
+    const declarations: Declaration[] = [];
+    // Implement based on your parser structure
+    throw new NotImplementedError("visitBlock not implemented");
+  }
+
+  // SELECT statements
+  visitSelect(ctx: SelectContext): SelectQuery | SelectSetQuery | TSQLXTag {
+    const selectSetStmt = ctx.selectSetStmt();
+    const selectStmt = ctx.selectStmt();
+    const tSQLxTagElement = ctx.tSQLxTagElement();
+    if (selectSetStmt) {
+      return this.visitSelectSetStmt(selectSetStmt);
+    } else if (selectStmt) {
+      return this.visitSelectStmt(selectStmt);
+    } else if (tSQLxTagElement) {
+      return this.visitTsqlxTagElementNested(tSQLxTagElement);
+    }
+    throw new SyntaxError(
+      "Select statement must be either a select set statement, a select statement, or a tSQLx tag element"
+    );
+  }
+
+  visitSelectSetStmt(ctx: SelectSetStmtContext): SelectQuery | SelectSetQuery {
+    const selectQueries: SelectSetNode[] = [];
+    const initialQuery = this.visitSelectStmtWithParens(ctx.selectStmtWithParens());
+
+    for (const subsequent of ctx.subsequentSelectSetClause()) {
+      let unionType: SetOperator;
+      if (subsequent.UNION() && subsequent.ALL()) {
+        unionType = "UNION ALL";
+      } else if (subsequent.UNION() && subsequent.DISTINCT()) {
+        unionType = "UNION DISTINCT";
+      } else if (subsequent.INTERSECT() && subsequent.DISTINCT()) {
+        unionType = "INTERSECT DISTINCT";
+      } else if (subsequent.INTERSECT()) {
+        unionType = "INTERSECT";
+      } else if (subsequent.EXCEPT()) {
+        unionType = "EXCEPT";
+      } else {
+        throw new SyntaxError(
+          "Set operator must be one of UNION ALL, UNION DISTINCT, INTERSECT, INTERSECT DISTINCT, and EXCEPT"
+        );
+      }
+      const selectQuery = this.visitSelectStmtWithParens(subsequent.selectStmtWithParens());
+      // SelectSetNode expects SelectQuery | SelectSetQuery, but visitSelectStmtWithParens may return Placeholder
+      // In practice, a Placeholder in this position would be substituted at runtime
+      selectQueries.push({
+        select_query: selectQuery as SelectQuery | SelectSetQuery,
+        set_operator: unionType,
+      });
+    }
+
+    if (selectQueries.length === 0) {
+      // initialQuery may be Placeholder but we cast since SelectSetQuery expects SelectQuery | SelectSetQuery
+      return initialQuery as SelectQuery | SelectSetQuery;
+    }
+    return {
+      expression_type: "select_set_query",
+      initial_select_query: initialQuery as SelectQuery | SelectSetQuery,
+      subsequent_select_queries: selectQueries,
+    };
+  }
+
+  visitSelectStmtWithParens(
+    ctx: SelectStmtWithParensContext
+  ): SelectQuery | SelectSetQuery | Placeholder {
+    const selectStmt = ctx.selectStmt();
+    const selectSetStmt = ctx.selectSetStmt();
+    const placeholder = ctx.placeholder();
+    if (selectStmt) {
+      return this.visitSelectStmt(selectStmt);
+    } else if (selectSetStmt) {
+      return this.visitSelectSetStmt(selectSetStmt);
+    } else if (placeholder) {
+      return this.visitPlaceholder(placeholder);
+    }
+    throw new SyntaxError(
+      "Select statement must be either a select statement, a select set statement, or a placeholder"
+    );
+  }
+
+  visitSelectStmt(ctx: SelectStmtContext): SelectQuery {
+    const withClause = ctx.withClause();
+    const columnExprList = ctx.columnExprList();
+    const fromClause = ctx.fromClause();
+    const whereClause = ctx.whereClause();
+    const prewhereClause = ctx.prewhereClause();
+    const havingClause = ctx.havingClause();
+    const groupByClause = ctx.groupByClause();
+    const orderByClause = ctx.orderByClause();
+    const limitByClause = ctx.limitByClause();
+    const selectQuery: SelectQuery = {
+      expression_type: "select_query",
+      ctes: withClause ? this.visitWithClause(withClause) : undefined,
+      select: columnExprList ? this.visitColumnExprList(columnExprList) : [],
+      distinct: ctx.DISTINCT() ? true : undefined,
+      select_from: fromClause ? this.visitJoin(fromClause) : undefined,
+      where: whereClause ? this.visitAsExpr(whereClause) : undefined,
+      prewhere: prewhereClause ? this.visitAsExpr(prewhereClause) : undefined,
+      having: havingClause ? this.visitAsExpr(havingClause) : undefined,
+      group_by: groupByClause ? this.visitExprList(groupByClause) : undefined,
+      order_by: orderByClause ? this.visitOrderList(orderByClause) : undefined,
+      limit_by: limitByClause ? this.visitLimitBy(limitByClause) : undefined,
+    };
+
+    const windowClause = ctx.windowClause();
+    if (windowClause) {
+      selectQuery.window_exprs = {};
+      for (let index = 0; index < windowClause.windowExpr().length; index++) {
+        const name = this.visitAsString(windowClause.identifier()[index]);
+        selectQuery.window_exprs![name] = this.visitWindow(windowClause.windowExpr()[index]);
+      }
+    }
+
+    const limitAndOffsetClause = ctx.limitAndOffsetClause();
+    const offsetOnlyClause = ctx.offsetOnlyClause();
+    if (limitAndOffsetClause) {
+      // Use array access to avoid getRuleContext throwing when index is out of bounds
+      const columnExprs = limitAndOffsetClause.columnExpr();
+      if (columnExprs.length > 0) {
+        selectQuery.limit = this.visitAsExpr(columnExprs[0]);
+      }
+      if (columnExprs.length > 1) {
+        selectQuery.offset = this.visitAsExpr(columnExprs[1]);
+      }
+      if (limitAndOffsetClause.WITH() && limitAndOffsetClause.TIES()) {
+        selectQuery.limit_with_ties = true;
+      }
+    } else if (offsetOnlyClause) {
+      selectQuery.offset = this.visitAsExpr(offsetOnlyClause.columnExpr());
+    }
+
+    const arrayJoinClause = ctx.arrayJoinClause();
+    if (arrayJoinClause) {
+      if (!selectQuery.select_from) {
+        throw new SyntaxError("Using ARRAY JOIN without a FROM clause is not permitted");
+      }
+      if (arrayJoinClause.LEFT()) {
+        selectQuery.array_join_op = "LEFT ARRAY JOIN";
+      } else if (arrayJoinClause.INNER()) {
+        selectQuery.array_join_op = "INNER ARRAY JOIN";
+      } else {
+        selectQuery.array_join_op = "ARRAY JOIN";
+      }
+      selectQuery.array_join_list = this.visitExprList(arrayJoinClause.columnExprList());
+      if (selectQuery.array_join_list) {
+        for (const expr of selectQuery.array_join_list) {
+          if (!("alias" in expr)) {
+            throw new SyntaxError("ARRAY JOIN arrays must have an alias", {
+              start: expr.start,
+              end: expr.end,
+            });
+          }
+        }
+      }
+    }
+
+    if (ctx.topClause()) {
+      throw new NotImplementedError("Unsupported: SelectStmt.topClause()");
+    }
+    if (ctx.settingsClause()) {
+      throw new NotImplementedError("Unsupported: SelectStmt.settingsClause()");
+    }
+
+    return selectQuery;
+  }
+
+  visitWithClause(ctx: WithClauseContext): Record<string, CTE> {
+    return this.visitCTEs(ctx.withExprList());
+  }
+
+  visitFromClause(ctx: FromClauseContext): JoinExpr {
+    return this.visitJoin(ctx.joinExpr());
+  }
+
+  visitPrewhereClause(ctx: PrewhereClauseContext): Expr {
+    return this.visitAsExpr(ctx.columnExpr());
+  }
+
+  visitWhereClause(ctx: WhereClauseContext): Expr {
+    return this.visitAsExpr(ctx.columnExpr());
+  }
+
+  visitGroupByClause(ctx: GroupByClauseContext): Expr[] {
+    const columnExprList = ctx.columnExprList();
+    if (!columnExprList) {
+      throw new SyntaxError("GROUP BY clause must have a column expression list");
+    }
+    return this.visitExprList(columnExprList);
+  }
+
+  visitHavingClause(ctx: HavingClauseContext): Expr {
+    return this.visitAsExpr(ctx.columnExpr());
+  }
+
+  visitOrderByClause(ctx: OrderByClauseContext): OrderExpr[] {
+    return this.visitOrderList(ctx.orderExprList());
+  }
+
+  visitLimitByClause(ctx: LimitByClauseContext): LimitByExpr {
+    const limitExpr = this.visitLimitExprResult(ctx.limitExpr());
+
+    // If limitExpr is a tuple (n, offset), split it
+    if (Array.isArray(limitExpr)) {
+      const [n, offsetValue] = limitExpr;
+      return {
+        expression_type: "limit_by_expr",
+        n,
+        offset_value: offsetValue,
+        exprs: this.visitExprList(ctx.columnExprList()),
+      };
+    }
+
+    // If no offset, just use limitExpr as n (TypeScript now knows it's Expression)
+    return {
+      expression_type: "limit_by_expr",
+      n: limitExpr,
+      offset_value: undefined,
+      exprs: this.visitExprList(ctx.columnExprList()),
+    };
+  }
+
+  /** Helper for visitLimitExpr which returns Expression | [Expression, Expression] */
+  private visitLimitExprResult(ctx: LimitExprContext): Expression | [Expression, Expression] {
+    return this.visitLimitExpr(ctx);
+  }
+
+  visitLimitExpr(ctx: LimitExprContext): Expression | [Expression, Expression] {
+    const n = this.visitAsExpr(ctx.columnExpr(0));
+
+    // Check if we have an offset (second expression)
+    if (ctx.columnExpr(1)) {
+      const offsetValue = this.visitAsExpr(ctx.columnExpr(1));
+      // For "LIMIT a, b" syntax: a is offset, b is limit
+      if (ctx.COMMA()) {
+        return [offsetValue, n]; // Return tuple as (offset, limit)
+      }
+      // For "LIMIT a OFFSET b" syntax: a is limit, b is offset
+      return [n, offsetValue];
+    }
+
+    return n;
+  }
+
+  // JOIN expressions
+  visitJoinExprOp(ctx: JoinExprOpContext): JoinExpr {
+    const join1: JoinExpr = this.visitJoin(ctx.joinExpr(0));
+    const join2: JoinExpr = this.visitJoin(ctx.joinExpr(1));
+
+    const joinOp = ctx.joinOp();
+    if (joinOp) {
+      join2.join_type = `${this.visitJoinOpString(joinOp)} JOIN`;
+    } else {
+      join2.join_type = "JOIN";
+    }
+    join2.constraint = this.visitConstraint(ctx.joinConstraintClause());
+
+    let lastJoin = join1;
+    while (lastJoin.next_join) {
+      lastJoin = lastJoin.next_join;
+    }
+    lastJoin.next_join = join2;
+
+    return join1;
+  }
+
+  visitJoinExprTable(ctx: JoinExprTableContext): JoinExpr {
+    const sampleClause = ctx.sampleClause();
+    const sample = sampleClause ? this.visitSample(sampleClause) : undefined;
+    const tableResult = this.visitTableExprResult(ctx.tableExpr());
+    const tableFinal = ctx.FINAL() ? true : undefined;
+    // Check if result is already a JoinExpr (from visitTableExprAlias or visitTableExprFunction)
+    if ("expression_type" in tableResult && tableResult.expression_type === "join_expr") {
+      // visitTableExprAlias returns a JoinExpr to pass the alias
+      // visitTableExprFunction returns a JoinExpr to pass the args
+      tableResult.table_final = tableFinal;
+      tableResult.sample = sample;
+      return tableResult;
+    }
+    // Otherwise, wrap the table expression in a JoinExpr
+    const table = tableResult as SelectQuery | SelectSetQuery | Placeholder | TSQLXTag | Field;
+    return {
+      expression_type: "join_expr",
+      table,
+      table_final: tableFinal,
+      sample,
+    };
+  }
+
+  /** Helper for visiting table expressions that may return JoinExpr or table types */
+  private visitTableExprResult(
+    ctx: ParserRuleContext
+  ): JoinExpr | SelectQuery | SelectSetQuery | Placeholder | TSQLXTag | Field {
+    return this.visit(ctx) as
+      | JoinExpr
+      | SelectQuery
+      | SelectSetQuery
+      | Placeholder
+      | TSQLXTag
+      | Field;
+  }
+
+  visitJoinExprParens(ctx: JoinExprParensContext): JoinExpr {
+    return this.visitJoin(ctx.joinExpr());
+  }
+
+  visitJoinExprCrossOp(ctx: JoinExprCrossOpContext): JoinExpr {
+    const join1: JoinExpr = this.visitJoin(ctx.joinExpr(0));
+    const join2: JoinExpr = this.visitJoin(ctx.joinExpr(1));
+    join2.join_type = "CROSS JOIN";
+    let lastJoin = join1;
+    while (lastJoin.next_join) {
+      lastJoin = lastJoin.next_join;
+    }
+    lastJoin.next_join = join2;
+    return join1;
+  }
+
+  visitJoinOpInner(ctx: JoinOpInnerContext): string {
+    const tokens: string[] = [];
+    if (ctx.ALL()) tokens.push("ALL");
+    if (ctx.ANY()) tokens.push("ANY");
+    if (ctx.ASOF()) tokens.push("ASOF");
+    tokens.push("INNER");
+    return tokens.join(" ");
+  }
+
+  visitJoinOpLeftRight(ctx: JoinOpLeftRightContext): string {
+    const tokens: string[] = [];
+    if (ctx.LEFT()) tokens.push("LEFT");
+    if (ctx.RIGHT()) tokens.push("RIGHT");
+    if (ctx.OUTER()) tokens.push("OUTER");
+    if (ctx.SEMI()) tokens.push("SEMI");
+    if (ctx.ALL()) tokens.push("ALL");
+    if (ctx.ANTI()) tokens.push("ANTI");
+    if (ctx.ANY()) tokens.push("ANY");
+    if (ctx.ASOF()) tokens.push("ASOF");
+    return tokens.join(" ");
+  }
+
+  visitJoinOpFull(ctx: JoinOpFullContext): string {
+    const tokens: string[] = [];
+    if (ctx.FULL()) tokens.push("FULL");
+    if (ctx.OUTER()) tokens.push("OUTER");
+    if (ctx.ALL()) tokens.push("ALL");
+    if (ctx.ANY()) tokens.push("ANY");
+    return tokens.join(" ");
+  }
+
+  visitJoinConstraintClause(ctx: JoinConstraintClauseContext): JoinConstraint {
+    const columnExprList = this.visitExprList(ctx.columnExprList());
+    if (columnExprList.length !== 1) {
+      throw new NotImplementedError("Unsupported: JOIN ... ON with multiple expressions");
+    }
+    return {
+      expression_type: "join_constraint",
+      expr: columnExprList[0],
+      constraint_type: ctx.USING() ? "USING" : "ON",
+    };
+  }
+
+  visitSampleClause(ctx: SampleClauseContext): SampleExpr {
+    const ratioExpressions = ctx.ratioExpr();
+    const sampleRatioExpr = this.visitRatio(ratioExpressions[0]);
+    const offsetRatioExpr =
+      ratioExpressions.length > 1 && ctx.OFFSET()
+        ? this.visitRatio(ratioExpressions[1])
+        : undefined;
+
+    return {
+      expression_type: "sample_expr",
+      sample_value: sampleRatioExpr,
+      offset_value: offsetRatioExpr,
+    };
+  }
+
+  visitOrderExprList(ctx: OrderExprListContext): OrderExpr[] {
+    return ctx.orderExpr().map((expr: OrderExprContext) => this.visitOrderExpr(expr));
+  }
+
+  visitOrderExpr(ctx: OrderExprContext): OrderExpr {
+    const order = ctx.DESC() || ctx.DESCENDING() ? "DESC" : "ASC";
+    return {
+      expression_type: "order_expr",
+      expr: this.visitAsExpr(ctx.columnExpr()),
+      order: order as "ASC" | "DESC",
+    };
+  }
+
+  visitRatioExpr(ctx: RatioExprContext): RatioExpr {
+    const placeholder = ctx.placeholder();
+    if (placeholder) {
+      return this.visitPlaceholderExpr(placeholder) as unknown as RatioExpr;
+    }
+
+    const numberLiterals = ctx.numberLiteral();
+    const left = numberLiterals[0];
+    const right = ctx.SLASH() && numberLiterals.length > 1 ? numberLiterals[1] : null;
+
+    return {
+      expression_type: "ratio_expr",
+      left: this.visitNumberLiteral(left),
+      right: right ? this.visitNumberLiteral(right) : undefined,
+    };
+  }
+
+  visitWindowExpr(ctx: WindowExprContext): WindowExpr {
+    const frame = ctx.winFrameClause();
+    const visitedFrame = frame ? this.visitFrame(frame) : undefined;
+    const partitionByClause = ctx.winPartitionByClause();
+    const orderByClause = ctx.winOrderByClause();
+    return {
+      expression_type: "window_expr",
+      partition_by: partitionByClause ? this.visitExprList(partitionByClause) : undefined,
+      order_by: orderByClause ? this.visitOrderList(orderByClause) : undefined,
+      frame_method: frame && frame.RANGE() ? "RANGE" : frame && frame.ROWS() ? "ROWS" : undefined,
+      frame_start: Array.isArray(visitedFrame) ? visitedFrame[0] : visitedFrame,
+      frame_end: Array.isArray(visitedFrame) ? visitedFrame[1] : undefined,
+    };
+  }
+
+  visitWinPartitionByClause(ctx: WinPartitionByClauseContext): Expr[] {
+    return this.visitExprList(ctx.columnExprList());
+  }
+
+  visitWinOrderByClause(ctx: WinOrderByClauseContext): OrderExpr[] {
+    return this.visitOrderList(ctx.orderExprList());
+  }
+
+  visitWinFrameClause(
+    ctx: WinFrameClauseContext
+  ): WindowFrameExpr | [WindowFrameExpr, WindowFrameExpr] {
+    return this.visitFrame(ctx.winFrameExtend());
+  }
+
+  visitFrameStart(ctx: FrameStartContext): WindowFrameExpr {
+    return this.visitFrameBound(ctx.winFrameBound());
+  }
+
+  visitFrameBetween(ctx: FrameBetweenContext): [WindowFrameExpr, WindowFrameExpr] {
+    return [this.visitFrameBound(ctx.winFrameBound(0)), this.visitFrameBound(ctx.winFrameBound(1))];
+  }
+
+  /** Helper for visiting a single frame bound */
+  private visitFrameBound(ctx: WinFrameBoundContext): WindowFrameExpr {
+    return this.visitWinFrameBound(ctx);
+  }
+
+  visitWinFrameBound(ctx: WinFrameBoundContext): WindowFrameExpr {
+    if (ctx.PRECEDING()) {
+      const numberLiteral = ctx.numberLiteral();
+      return {
+        expression_type: "window_frame_expr",
+        frame_type: "PRECEDING",
+        frame_value: numberLiteral ? this.visitNumberLiteral(numberLiteral).value : undefined,
+      };
+    }
+    if (ctx.FOLLOWING()) {
+      const numberLiteral = ctx.numberLiteral();
+      return {
+        expression_type: "window_frame_expr",
+        frame_type: "FOLLOWING",
+        frame_value: numberLiteral ? this.visitNumberLiteral(numberLiteral).value : undefined,
+      };
+    }
+    return { expression_type: "window_frame_expr", frame_type: "CURRENT ROW" };
+  }
+
+  // Column expressions
+  visitColumnExprList(ctx: ColumnExprListContext): Expression[] {
+    return ctx.columnExpr().map((c: ParserRuleContext) => this.visitAsExpr(c));
+  }
+
+  visitColumnExprTernaryOp(ctx: ColumnExprTernaryOpContext): Call {
+    return {
+      expression_type: "call",
+      name: "if",
+      args: [
+        this.visitAsExpr(ctx.columnExpr(0)),
+        this.visitAsExpr(ctx.columnExpr(1)),
+        this.visitAsExpr(ctx.columnExpr(2)),
+      ],
+    };
+  }
+
+  visitColumnExprAlias(ctx: ColumnExprAliasContext): Alias {
+    let alias: string;
+    const identifier = ctx.identifier();
+    const stringLiteral = ctx.STRING_LITERAL();
+    if (identifier) {
+      alias = this.visitIdentifier(identifier);
+    } else if (stringLiteral) {
+      alias = parseStringLiteralText(stringLiteral.text);
+    } else {
+      throw new SyntaxError("Must specify an alias");
+    }
+    const expr = this.visitAsExpr(ctx.columnExpr());
+
+    if (RESERVED_KEYWORDS.includes(alias.toLowerCase() as any)) {
+      throw new SyntaxError(
+        `"${alias}" cannot be an alias or identifier, as it's a reserved keyword`
+      );
+    }
+
+    return { expression_type: "alias", expr, alias };
+  }
+
+  visitColumnExprNegate(ctx: ColumnExprNegateContext): ArithmeticOperation {
+    return {
+      expression_type: "arithmetic_operation",
+      op: ArithmeticOperationOp.Sub,
+      left: { value: 0 } as Constant,
+      right: this.visitAsExpr(ctx.columnExpr()),
+    };
+  }
+
+  visitColumnExprDict(ctx: ColumnExprDictContext): Dict {
+    const kvPairList = ctx.kvPairList();
+    return {
+      expression_type: "dict",
+      items: kvPairList ? this.visitKvPairList(kvPairList) : [],
+    };
+  }
+
+  visitColumnExprSubquery(ctx: ColumnExprSubqueryContext): SelectQuery | SelectSetQuery {
+    return this.visitSelectQuery(ctx.selectSetStmt());
+  }
+
+  visitColumnExprLiteral(ctx: ColumnExprLiteralContext): Expr {
+    return this.visitChildren(ctx);
+  }
+
+  visitColumnExprArray(ctx: ColumnExprArrayContext): ArrayExpression {
+    const columnExprList = ctx.columnExprList();
+    return {
+      expression_type: "array",
+      exprs: columnExprList ? this.visitExprList(columnExprList) : [],
+    };
+  }
+
+  visitColumnExprPrecedence1(ctx: ColumnExprPrecedence1Context): ArithmeticOperation {
+    let op: ArithmeticOperationOp;
+    if (ctx.SLASH()) {
+      op = ArithmeticOperationOp.Div;
+    } else if (ctx.ASTERISK()) {
+      op = ArithmeticOperationOp.Mult;
+    } else if (ctx.PERCENT()) {
+      op = ArithmeticOperationOp.Mod;
+    } else {
+      throw new NotImplementedError(`Unsupported ColumnExprPrecedence1: ${ctx.text}`);
+    }
+    // Use columnExpr() method to get left and right operands
+    const left = this.visitAsExpr(ctx.columnExpr(0));
+    const right = this.visitAsExpr(ctx.columnExpr(1));
+    return { expression_type: "arithmetic_operation", left, right, op };
+  }
+
+  visitColumnExprPrecedence2(ctx: ColumnExprPrecedence2Context): ArithmeticOperation | Call {
+    // Use columnExpr() method to get left and right operands
+    const left = this.visitAsExpr(ctx.columnExpr(0));
+    const right = this.visitAsExpr(ctx.columnExpr(1));
+
+    if (ctx.PLUS()) {
+      return {
+        expression_type: "arithmetic_operation",
+        left,
+        right,
+        op: ArithmeticOperationOp.Add,
+      };
+    } else if (ctx.DASH()) {
+      return {
+        expression_type: "arithmetic_operation",
+        left,
+        right,
+        op: ArithmeticOperationOp.Sub,
+      };
+    } else if (ctx.CONCAT()) {
+      const args: Expression[] = [];
+      if ("name" in left && left.name === "concat" && "args" in left && left.args) {
+        args.push(...left.args);
+      } else {
+        args.push(left);
+      }
+
+      if ("name" in right && right.name === "concat" && "args" in right && right.args) {
+        args.push(...right.args);
+      } else {
+        args.push(right);
+      }
+
+      return { expression_type: "call", name: "concat", args };
+    } else {
+      throw new NotImplementedError(`Unsupported ColumnExprPrecedence2: ${ctx.text}`);
+    }
+  }
+
+  visitColumnExprPrecedence3(ctx: ColumnExprPrecedence3Context): CompareOperation {
+    // Use columnExpr() method to get left and right operands
+    const left = this.visitAsExpr(ctx.columnExpr(0));
+    const right = this.visitAsExpr(ctx.columnExpr(1));
+
+    let op: CompareOperationOp;
+    if (ctx.EQ_SINGLE() || ctx.EQ_DOUBLE()) {
+      op = CompareOperationOp.Eq;
+    } else if (ctx.NOT_EQ()) {
+      op = CompareOperationOp.NotEq;
+    } else if (ctx.LT()) {
+      op = CompareOperationOp.Lt;
+    } else if (ctx.LT_EQ()) {
+      op = CompareOperationOp.LtEq;
+    } else if (ctx.GT()) {
+      op = CompareOperationOp.Gt;
+    } else if (ctx.GT_EQ()) {
+      op = CompareOperationOp.GtEq;
+    } else if (ctx.LIKE()) {
+      op = ctx.NOT() ? CompareOperationOp.NotLike : CompareOperationOp.Like;
+    } else if (ctx.ILIKE()) {
+      op = ctx.NOT() ? CompareOperationOp.NotILike : CompareOperationOp.ILike;
+    } else if (ctx.REGEX_SINGLE() || ctx.REGEX_DOUBLE()) {
+      op = CompareOperationOp.Regex;
+    } else if (ctx.NOT_REGEX()) {
+      op = CompareOperationOp.NotRegex;
+    } else if (ctx.IREGEX_SINGLE() || ctx.IREGEX_DOUBLE()) {
+      op = CompareOperationOp.IRegex;
+    } else if (ctx.NOT_IREGEX()) {
+      op = CompareOperationOp.NotIRegex;
+    } else if (ctx.IN()) {
+      if (ctx.COHORT()) {
+        op = ctx.NOT() ? CompareOperationOp.NotInCohort : CompareOperationOp.InCohort;
+      } else {
+        op = ctx.NOT() ? CompareOperationOp.NotIn : CompareOperationOp.In;
+      }
+    } else {
+      throw new NotImplementedError(`Unsupported ColumnExprPrecedence3: ${ctx.text}`);
+    }
+
+    return { expression_type: "compare_operation", left, right, op };
+  }
+
+  visitColumnExprInterval(ctx: ColumnExprIntervalContext): Call {
+    let name: string;
+    const interval = ctx.interval();
+    if (interval.SECOND()) {
+      name = "toIntervalSecond";
+    } else if (interval.MINUTE()) {
+      name = "toIntervalMinute";
+    } else if (interval.HOUR()) {
+      name = "toIntervalHour";
+    } else if (interval.DAY()) {
+      name = "toIntervalDay";
+    } else if (interval.WEEK()) {
+      name = "toIntervalWeek";
+    } else if (interval.MONTH()) {
+      name = "toIntervalMonth";
+    } else if (interval.QUARTER()) {
+      name = "toIntervalQuarter";
+    } else if (interval.YEAR()) {
+      name = "toIntervalYear";
+    } else {
+      throw new NotImplementedError(`Unsupported interval type: ${interval.text}`);
+    }
+
+    return { expression_type: "call", name, args: [this.visitAsExpr(ctx.columnExpr())] };
+  }
+
+  visitColumnExprIsNull(ctx: ColumnExprIsNullContext): CompareOperation {
+    return {
+      expression_type: "compare_operation",
+      left: this.visitAsExpr(ctx.columnExpr()),
+      right: { expression_type: "constant", value: null } as Constant,
+      op: ctx.NOT() ? CompareOperationOp.NotEq : CompareOperationOp.Eq,
+    };
+  }
+
+  visitColumnExprTuple(ctx: ColumnExprTupleContext): Tuple {
+    const columnExprList = ctx.columnExprList();
+    return {
+      expression_type: "tuple",
+      exprs: columnExprList ? this.visitExprList(columnExprList) : [],
+    };
+  }
+
+  visitColumnExprArrayAccess(ctx: ColumnExprArrayAccessContext): ArrayAccess {
+    const object: Expression = this.visitAsExpr(ctx.columnExpr(0));
+    const property: Expression = this.visitAsExpr(ctx.columnExpr(1));
+    return { expression_type: "array_access", array: object, property };
+  }
+
+  visitColumnExprNullArrayAccess(ctx: ColumnExprNullArrayAccessContext): ArrayAccess {
+    const object: Expression = this.visitAsExpr(ctx.columnExpr(0));
+    const property: Expression = this.visitAsExpr(ctx.columnExpr(1));
+    return { expression_type: "array_access", array: object, property, nullish: true };
+  }
+
+  visitColumnExprPropertyAccess(ctx: ColumnExprPropertyAccessContext): ArrayAccess {
+    const object = this.visitAsExpr(ctx.columnExpr());
+    const property: Constant = {
+      expression_type: "constant",
+      value: this.visitIdentifier(ctx.identifier()),
+    };
+    return { expression_type: "array_access", array: object, property };
+  }
+
+  visitColumnExprNullPropertyAccess(ctx: ColumnExprNullPropertyAccessContext): ArrayAccess {
+    const object = this.visitAsExpr(ctx.columnExpr());
+    const property: Constant = {
+      expression_type: "constant",
+      value: this.visitIdentifier(ctx.identifier()),
+    };
+    return { expression_type: "array_access", array: object, property, nullish: true };
+  }
+
+  visitColumnExprBetween(ctx: ColumnExprBetweenContext): BetweenExpr {
+    return {
+      expression_type: "between_expr",
+      expr: this.visitAsExpr(ctx.columnExpr(0)),
+      low: this.visitAsExpr(ctx.columnExpr(1)),
+      high: this.visitAsExpr(ctx.columnExpr(2)),
+      negated: !!ctx.NOT(),
+    };
+  }
+
+  visitColumnExprParens(ctx: ColumnExprParensContext): Expr {
+    return this.visitAsExpr(ctx.columnExpr());
+  }
+
+  visitColumnExprAnd(ctx: ColumnExprAndContext): And {
+    const left = this.visitAsExpr(ctx.columnExpr(0));
+    const leftArray = "exprs" in left && left.exprs ? left.exprs : [left];
+
+    const right = this.visitAsExpr(ctx.columnExpr(1));
+    const rightArray = "exprs" in right && right.exprs ? right.exprs : [right];
+
+    return { expression_type: "and", exprs: [...leftArray, ...rightArray] };
+  }
+
+  visitColumnExprOr(ctx: ColumnExprOrContext): Or {
+    const left = this.visitAsExpr(ctx.columnExpr(0));
+    const leftArray = "exprs" in left && left.exprs ? left.exprs : [left];
+
+    const right = this.visitAsExpr(ctx.columnExpr(1));
+    const rightArray = "exprs" in right && right.exprs ? right.exprs : [right];
+
+    return { expression_type: "or", exprs: [...leftArray, ...rightArray] };
+  }
+
+  visitColumnExprTupleAccess(ctx: ColumnExprTupleAccessContext): TupleAccess {
+    const tuple = this.visitAsExpr(ctx.columnExpr());
+    const index = parseInt(ctx.DECIMAL_LITERAL().text);
+    return { expression_type: "tuple_access", tuple, index };
+  }
+
+  visitColumnExprNullTupleAccess(ctx: ColumnExprNullTupleAccessContext): TupleAccess {
+    const tuple = this.visitAsExpr(ctx.columnExpr());
+    const index = parseInt(ctx.DECIMAL_LITERAL().text);
+    return { expression_type: "tuple_access", tuple, index, nullish: true };
+  }
+
+  visitColumnExprCase(ctx: ColumnExprCaseContext): Call {
+    const columns = ctx
+      .columnExpr()
+      .map((column: ParserRuleContext) => this.visitAsExpr(column) as Expression);
+    if (ctx._caseExpr) {
+      const args: (Expression | undefined)[] = [
+        columns[0],
+        { expression_type: "array", exprs: [] },
+        { expression_type: "array", exprs: [] },
+        undefined,
+        columns[columns.length - 1],
+      ];
+      for (let index = 1; index < columns.length - 1; index++) {
+        const arrayIndex = ((index - 1) % 2) + 1;
+        (args[arrayIndex] as ArrayExpression).exprs.push(columns[index]);
+      }
+      return { expression_type: "call", name: "transform", args: args as Expression[] };
+    } else if (columns.length === 3) {
+      return { expression_type: "call", name: "if", args: columns };
+    } else {
+      return { expression_type: "call", name: "multiIf", args: columns };
+    }
+  }
+
+  visitColumnExprNot(ctx: ColumnExprNotContext): Not {
+    return { expression_type: "not", expr: this.visitAsExpr(ctx.columnExpr()) };
+  }
+
+  visitColumnExprWinFunctionTarget(ctx: ColumnExprWinFunctionTargetContext): WindowFunction {
+    return {
+      expression_type: "window_function",
+      name: this.visitIdentifier(ctx.identifier(0)),
+      exprs: ctx._columnExprs ? this.visitExprList(ctx._columnExprs) : [],
+      args: ctx._columnArgList ? this.visitExprList(ctx._columnArgList) : [],
+      over_identifier: this.visitIdentifier(ctx.identifier(1)),
+    };
+  }
+
+  visitColumnExprWinFunction(ctx: ColumnExprWinFunctionContext): WindowFunction {
+    const windowExpr = ctx.windowExpr();
+    return {
+      expression_type: "window_function",
+      name: this.visitIdentifier(ctx.identifier()),
+      exprs: ctx._columnExprs ? this.visitExprList(ctx._columnExprs) : [],
+      args: ctx._columnArgList ? this.visitExprList(ctx._columnArgList) : [],
+      over_expr: windowExpr ? this.visitWindowExpr(windowExpr) : undefined,
+    };
+  }
+
+  visitColumnExprIdentifier(ctx: ColumnExprIdentifierContext): Expr {
+    return this.visitColumnIdentifier(ctx.columnIdentifier());
+  }
+
+  visitColumnExprFunction(ctx: ColumnExprFunctionContext): Call {
+    const name = this.visitIdentifier(ctx.identifier());
+
+    let parameters: Expression[] | undefined = ctx._columnExprs
+      ? this.visitExprList(ctx._columnExprs)
+      : undefined;
+    // two sets of parameters fn()(), return an empty list for the first even if no parameters
+    if (ctx.LPAREN && ctx.LPAREN().length > 1 && parameters === undefined) {
+      parameters = [];
+    }
+
+    const args: Expression[] = ctx._columnArgList ? this.visitExprList(ctx._columnArgList) : [];
+    const distinct = ctx.DISTINCT() ? true : false;
+    return { expression_type: "call", name, params: parameters, args, distinct };
+  }
+
+  visitColumnExprAsterisk(ctx: ColumnExprAsteriskContext): Field {
+    const tableIdentifier = ctx.tableIdentifier();
+    if (tableIdentifier) {
+      const table = this.visitStringArray(tableIdentifier);
+      return { expression_type: "field", chain: [...table, "*"] };
+    }
+    return { expression_type: "field", chain: ["*"] };
+  }
+
+  visitColumnLambdaExpr(ctx: ColumnLambdaExprContext): Lambda {
+    const columnExpr = ctx.columnExpr();
+    const block = ctx.block();
+    let expr: Expression | Block;
+    if (columnExpr) {
+      expr = this.visitAsExpr(columnExpr);
+    } else if (block) {
+      expr = this.visitBlock(block) as Block;
+    } else {
+      throw new SyntaxError("Lambda expression must have either an expression or a block");
+    }
+    return {
+      expression_type: "lambda",
+      args: ctx
+        .identifier()
+        .map((identifier: IdentifierContext) => this.visitIdentifier(identifier)),
+      expr,
+    };
+  }
+
+  visitWithExprList(ctx: WithExprListContext): Record<string, CTE> {
+    const ctes: Record<string, CTE> = {};
+    for (const expr of ctx.withExpr()) {
+      const cte = this.visitCTE(expr);
+      ctes[cte.name] = cte;
+    }
+    return ctes;
+  }
+
+  /** Helper to visit a CTE expression */
+  private visitCTE(ctx: ParserRuleContext): CTE {
+    return this.visit(ctx) as CTE;
+  }
+
+  visitWithExprSubquery(ctx: WithExprSubqueryContext): CTE {
+    const subquery = this.visitSelectQuery(ctx.selectSetStmt());
+    const name = this.visitIdentifier(ctx.identifier());
+    return { expression_type: "cte", name, expr: subquery, cte_type: "subquery" };
+  }
+
+  visitWithExprColumn(ctx: WithExprColumnContext): CTE {
+    const expr = this.visitAsExpr(ctx.columnExpr());
+    const name = this.visitIdentifier(ctx.identifier());
+    return { expression_type: "cte", name, expr, cte_type: "column" };
+  }
+
+  visitColumnIdentifier(ctx: ColumnIdentifierContext): Expression {
+    const placeholder = ctx.placeholder();
+    if (placeholder) {
+      return this.visitPlaceholder(placeholder);
+    }
+
+    const tableIdentifier = ctx.tableIdentifier();
+    const table = tableIdentifier ? this.visitTableIdentifier(tableIdentifier) : [];
+
+    const nestedIdentifier = ctx.nestedIdentifier();
+    const nested = nestedIdentifier ? this.visitNestedIdentifier(nestedIdentifier) : [];
+
+    if (table.length === 0 && nested.length > 0) {
+      const text = ctx.text.toLowerCase();
+      if (text === "true") {
+        return { expression_type: "constant", value: true };
+      }
+      if (text === "false") {
+        return { expression_type: "constant", value: false };
+      }
+      return { expression_type: "field", chain: nested };
+    }
+
+    return { expression_type: "field", chain: [...table, ...nested] };
+  }
+
+  visitNestedIdentifier(ctx: NestedIdentifierContext): string[] {
+    return ctx
+      .identifier()
+      .map((identifier: IdentifierContext) => this.visitIdentifier(identifier));
+  }
+
+  visitTableExprIdentifier(ctx: TableExprIdentifierContext): Field {
+    const chain = this.visitTableIdentifier(ctx.tableIdentifier());
+    return { expression_type: "field", chain };
+  }
+
+  visitTableExprSubquery(ctx: TableExprSubqueryContext): SelectQuery | SelectSetQuery {
+    return this.visitSelectQuery(ctx.selectSetStmt());
+  }
+
+  visitTableExprPlaceholder(ctx: TableExprPlaceholderContext): Placeholder {
+    return this.visitPlaceholder(ctx.placeholder());
+  }
+
+  visitTableExprAlias(ctx: TableExprAliasContext): JoinExpr {
+    const exp = ctx.alias() || ctx.identifier();
+    if (!exp) {
+      throw new SyntaxError("Must specify an alias");
+    }
+    const alias: string =
+      exp instanceof AliasContext
+        ? this.visitAlias(exp)
+        : this.visitIdentifier(exp as IdentifierContext);
+    if (RESERVED_KEYWORDS.includes(alias.toLowerCase() as any)) {
+      throw new SyntaxError(
+        `"${alias}" cannot be an alias or identifier, as it's a reserved keyword`
+      );
+    }
+    const tableResult = this.visitTableExprResult(ctx.tableExpr());
+    // Check if result is already a JoinExpr
+    if ("expression_type" in tableResult && tableResult.expression_type === "join_expr") {
+      tableResult.alias = alias;
+      return tableResult;
+    }
+    // Otherwise, wrap in a JoinExpr
+    const table = tableResult as SelectQuery | SelectSetQuery | Placeholder | TSQLXTag | Field;
+    return { expression_type: "join_expr", table, alias };
+  }
+
+  visitTableExprFunction(ctx: TableExprFunctionContext): JoinExpr {
+    return this.visitTableFunctionExpr(ctx.tableFunctionExpr());
+  }
+
+  visitTableExprTag(ctx: TableExprTagContext): TSQLXTag {
+    return this.visitTsqlxTagElementNested(ctx.tSQLxTagElement());
+  }
+
+  visitTableFunctionExpr(ctx: TableFunctionExprContext): JoinExpr {
+    const name = this.visitIdentifier(ctx.identifier());
+    const tableArgList = ctx.tableArgList();
+    const args = tableArgList ? this.visitTableArgList(tableArgList) : [];
+    return {
+      expression_type: "join_expr",
+      table: { expression_type: "field", chain: [name] },
+      table_args: args,
+    };
+  }
+
+  visitTableIdentifier(ctx: TableIdentifierContext): string[] {
+    const nestedIdentifier = ctx.nestedIdentifier();
+    const nested = nestedIdentifier ? this.visitNestedIdentifier(nestedIdentifier) : [];
+    // Ensure nested is always an array
+    const nestedArray = Array.isArray(nested) ? nested : nested ? [nested] : [];
+
+    const databaseIdentifier = ctx.databaseIdentifier();
+    if (databaseIdentifier) {
+      const dbId = this.visitDatabaseIdentifier(databaseIdentifier);
+      return [dbId, ...nestedArray];
+    }
+
+    return nestedArray;
+  }
+
+  visitTableArgList(ctx: TableArgListContext): Expression[] {
+    return ctx.columnExpr().map((arg: ParserRuleContext) => this.visitAsExpr(arg));
+  }
+
+  visitDatabaseIdentifier(ctx: DatabaseIdentifierContext): string {
+    return this.visitIdentifier(ctx.identifier());
+  }
+
+  visitNumberLiteral(ctx: NumberLiteralContext): Constant {
+    const text = ctx.text.toLowerCase();
+    if (
+      text.includes(".") ||
+      text.includes("e") ||
+      text === "-inf" ||
+      text === "inf" ||
+      text === "nan"
+    ) {
+      return { expression_type: "constant", value: parseFloat(text) };
+    }
+    return { expression_type: "constant", value: parseInt(text) };
+  }
+
+  visitLiteral(ctx: LiteralContext): Constant {
+    if (ctx.NULL_SQL()) {
+      return { expression_type: "constant", value: null };
+    }
+
+    const stringLiteral = ctx.STRING_LITERAL();
+    if (stringLiteral) {
+      // STRING_LITERAL() returns a TerminalNode, which has getText()
+      const text = parseStringLiteralText(stringLiteral.text);
+      return { expression_type: "constant", value: text };
+    }
+
+    const numberLiteral = ctx.numberLiteral();
+    if (numberLiteral) {
+      return this.visitNumberLiteral(numberLiteral);
+    }
+    return this.visitChildren(ctx);
+  }
+
+  visitAlias(ctx: AliasContext): string {
+    let text = ctx.text;
+    if (
+      text.length >= 2 &&
+      ((text.startsWith("`") && text.endsWith("`")) || (text.startsWith('"') && text.endsWith('"')))
+    ) {
+      text = parseStringLiteralText(text);
+    }
+    return text;
+  }
+
+  visitIdentifier(ctx: IdentifierContext): string {
+    // IdentifierContext is a ParserRuleContext that has IDENTIFIER() method returning TerminalNode
+    // If ctx has IDENTIFIER() method, extract the terminal node
+    if (ctx.IDENTIFIER && typeof ctx.IDENTIFIER === "function") {
+      const terminalNode = ctx.IDENTIFIER();
+      if (terminalNode) {
+        // TerminalNode has getText() at runtime but types don't expose it
+        // Use symbol.text as fallback
+        let text = (terminalNode as any).getText?.() || terminalNode.symbol?.text || "";
+        if (
+          text.length >= 2 &&
+          ((text.startsWith("`") && text.endsWith("`")) ||
+            (text.startsWith('"') && text.endsWith('"')))
+        ) {
+          text = parseStringLiteralText(text);
+        }
+        return text;
+      }
+    }
+
+    // If it's already a string
+    if (typeof ctx === "string") {
+      return ctx;
+    }
+    // Fallback: if it's a ParserRuleContext, use getText()
+    let text = ctx.text;
+    if (
+      text.length >= 2 &&
+      ((text.startsWith("`") && text.endsWith("`")) || (text.startsWith('"') && text.endsWith('"')))
+    ) {
+      text = parseStringLiteralText(text);
+    }
+    return text;
+  }
+
+  visitColumnExprNullish(ctx: ColumnExprNullishContext): Call {
+    return {
+      expression_type: "call",
+      name: "ifNull",
+      args: [this.visitAsExpr(ctx.columnExpr(0)), this.visitAsExpr(ctx.columnExpr(1))],
+    };
+  }
+
+  visitColumnExprCall(ctx: ColumnExprCallContext): ExprCall {
+    const columnExprList = ctx.columnExprList();
+    return {
+      expression_type: "expr_call",
+      expr: this.visitAsExpr(ctx.columnExpr()),
+      args: columnExprList ? this.visitExprList(columnExprList) : [],
+    };
+  }
+
+  visitColumnExprCallSelect(ctx: ColumnExprCallSelectContext): Call | ExprCall {
+    const expr = this.visitAsExpr(ctx.columnExpr());
+    if ("chain" in expr && expr.chain && expr.chain.length === 1) {
+      return {
+        expression_type: "call",
+        name: String(expr.chain[0]),
+        args: [this.visitSelectQuery(ctx.selectSetStmt())],
+      };
+    }
+    return {
+      expression_type: "expr_call",
+      expr,
+      args: [this.visitSelectQuery(ctx.selectSetStmt())],
+    };
+  }
+
+  visitTsqlxChildElement(ctx: TSQLxChildElementContext): Expression {
+    const tSQLxTagElement = ctx.tSQLxTagElement();
+    if (tSQLxTagElement) {
+      return this.visitTsqlxTagElementNested(tSQLxTagElement);
+    }
+    if (ctx.TSQLX_TEXT_TEXT()) {
+      return this.visitTsqlxText(ctx);
+    }
+    return this.visitAsExpr(ctx.columnExpr()!);
+  }
+
+  visitTsqlxText(ctx: TSQLxChildElementContext): Constant {
+    const text = ctx.TSQLX_TEXT_TEXT();
+    return { expression_type: "constant", value: text ? text.text : "" };
+  }
+
+  visitTsqlxTagElementClosed(ctx: TSQLxTagElementContext): TSQLXTag {
+    const kind = this.visitIdentifier(ctx.identifier()[0]);
+    const attributes = ctx.tSQLxTagAttribute()
+      ? ctx
+          .tSQLxTagAttribute()
+          .map((a: TSQLxTagAttributeContext) => this.visitTsqlxTagAttribute(a))
+      : [];
+    return { expression_type: "tsqlx_tag", kind, attributes };
+  }
+
+  visitTsqlxTagElementNested(ctx: TSQLxTagElementContext): TSQLXTag {
+    const opening = this.visitIdentifier(ctx.identifier(0));
+    const closing = this.visitIdentifier(ctx.identifier(1));
+    if (opening !== closing) {
+      throw new SyntaxError(
+        `Opening and closing TSQLX tags must match. Got ${opening} and ${closing}`
+      );
+    }
+
+    const attributes = ctx.tSQLxTagAttribute()
+      ? ctx
+          .tSQLxTagAttribute()
+          .map((a: TSQLxTagAttributeContext) => this.visitTsqlxTagAttribute(a))
+      : [];
+
+    // ── collect child nodes, discarding pure-indentation whitespace ──
+    const keptChildren: Expression[] = [];
+    for (const element of ctx.tSQLxChildElement()) {
+      const child = this.visitTsqlxChildElement(element);
+
+      if ("value" in child && typeof child.value === "string") {
+        const v = child.value;
+        const onlyWs = /^\s*$/.test(v);
+        const hasNl = v.includes("\n") || v.includes("\r");
+        if (onlyWs && hasNl) {
+          continue; // drop indentation text node
+        }
+      }
+
+      keptChildren.push(child);
+    }
+
+    if (keptChildren.length > 0) {
+      if (attributes.some((a: TSQLXAttribute) => a.name === "children")) {
+        throw new SyntaxError(
+          "Can't have a TSQLX tag with both children and a 'children' attribute"
+        );
+      }
+      attributes.push({ name: "children", value: keptChildren });
+    }
+
+    return { expression_type: "tsqlx_tag", kind: opening, attributes };
+  }
+
+  visitTsqlxTagAttribute(ctx: TSQLxTagAttributeContext): TSQLXAttribute {
+    const name = this.visitIdentifier(ctx.identifier());
+    const columnExpr = ctx.columnExpr();
+    const string = ctx.string();
+    if (columnExpr) {
+      return { name, value: this.visitAsExpr(columnExpr) };
+    } else if (string) {
+      return { name, value: this.visitStringExpr(string) };
+    } else {
+      return { name, value: { expression_type: "constant", value: true } as Constant };
+    }
+  }
+
+  visitPlaceholder(ctx: PlaceholderContext): Placeholder {
+    return { expression_type: "placeholder", expr: this.visitAsExpr(ctx.columnExpr()) };
+  }
+
+  visitColumnExprTemplateString(ctx: ColumnExprTemplateStringContext): Expr {
+    return this.visitTemplateString(ctx.templateString());
+  }
+
+  /** Helper to visit a string context that returns Constant | Expr */
+  private visitStringExpr(ctx: StringContext): Constant | Expr {
+    return this.visitStringLiteral(ctx);
+  }
+
+  visitStringLiteral(ctx: StringContext): Constant | Expr {
+    const stringLiteral = ctx.STRING_LITERAL();
+    if (stringLiteral) {
+      return { expression_type: "constant", value: parseStringLiteralText(stringLiteral.text) };
+    }
+    const templateString = ctx.templateString();
+    if (templateString) {
+      return this.visitTemplateString(templateString);
+    }
+    return { expression_type: "constant", value: "" };
+  }
+
+  visitTemplateString(ctx: TemplateStringContext): Constant | Call {
+    const pieces: Expression[] = [];
+    for (const chunk of ctx.stringContents()) {
+      pieces.push(this.visitStringContents(chunk));
+    }
+
+    if (pieces.length === 0) {
+      return { expression_type: "constant", value: "" };
+    } else if (pieces.length === 1) {
+      const first = pieces[0];
+      // If it's already a Constant or Call, return as-is, otherwise wrap in Call
+      if ("value" in first || "name" in first) {
+        return first as Constant | Call;
+      }
+      return { expression_type: "call", name: "concat", args: [first] };
+    }
+
+    return { expression_type: "call", name: "concat", args: pieces };
+  }
+
+  visitFullTemplateString(ctx: FullTemplateStringContext): Constant | Call {
+    const pieces: Expression[] = [];
+    for (const chunk of ctx.stringContentsFull()) {
+      pieces.push(this.visitStringContentsFull(chunk));
+    }
+
+    if (pieces.length === 0) {
+      return { expression_type: "constant", value: "" };
+    } else if (pieces.length === 1) {
+      const first = pieces[0];
+      // If it's already a Constant or Call, return as-is, otherwise wrap in Call
+      if ("value" in first || "name" in first) {
+        return first as Constant | Call;
+      }
+      return { expression_type: "call", name: "concat", args: [first] };
+    }
+
+    return { expression_type: "call", name: "concat", args: pieces };
+  }
+
+  visitStringContents(ctx: StringContentsContext): Constant | Expression {
+    const stringText = ctx.STRING_TEXT();
+    const columnExpr = ctx.columnExpr();
+    if (stringText) {
+      return { expression_type: "constant", value: parseStringLiteralText(stringText.text) };
+    } else if (columnExpr) {
+      return this.visitAsExpr(columnExpr);
+    }
+    return { expression_type: "constant", value: "" };
+  }
+
+  visitStringContentsFull(ctx: StringContentsFullContext): Constant | Expression {
+    const fullStringText = ctx.FULL_STRING_TEXT();
+    const columnExpr = ctx.columnExpr();
+    if (fullStringText) {
+      return {
+        expression_type: "constant",
+        value: parseStringLiteralText(fullStringText.text),
+      };
+    } else if (columnExpr) {
+      return this.visitAsExpr(columnExpr);
+    }
+    return { expression_type: "constant", value: "" };
+  }
+}
diff --git a/internal-packages/tsql/src/query/printer.test.ts b/internal-packages/tsql/src/query/printer.test.ts
new file mode 100644
index 00000000000..7349a7bd270
--- /dev/null
+++ b/internal-packages/tsql/src/query/printer.test.ts
@@ -0,0 +1,3778 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { parseTSQLSelect, parseTSQLExpr, compileTSQL } from "../index.js";
+import { ClickHousePrinter, printToClickHouse, type PrintResult } from "./printer.js";
+import { createPrinterContext, PrinterContext } from "./printer_context.js";
+import {
+  createSchemaRegistry,
+  column,
+  type TableSchema,
+  type SchemaRegistry,
+} from "./schema.js";
+import type { BucketThreshold } from "./time_buckets.js";
+import { QueryError, SyntaxError } from "./errors.js";
+
+/**
+ * Test table schemas
+ */
+const taskRunsSchema: TableSchema = {
+  name: "task_runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    status: { name: "status", ...column("String") },
+    task_identifier: { name: "task_identifier", ...column("String") },
+    created_at: { name: "created_at", ...column("DateTime64") },
+    updated_at: { name: "updated_at", ...column("DateTime64") },
+    started_at: { name: "started_at", ...column("Nullable(DateTime64)") },
+    completed_at: { name: "completed_at", ...column("Nullable(DateTime64)") },
+    duration_ms: { name: "duration_ms", ...column("Nullable(UInt64)") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+    queue_name: { name: "queue_name", ...column("String") },
+    is_test: { name: "is_test", ...column("UInt8") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+const taskEventsSchema: TableSchema = {
+  name: "task_events",
+  clickhouseName: "trigger_dev.task_events_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    run_id: { name: "run_id", ...column("String") },
+    event_type: { name: "event_type", ...column("String") },
+    timestamp: { name: "timestamp", ...column("DateTime64") },
+    payload: { name: "payload", ...column("String") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+/**
+ * Schema with user-friendly names that map to internal ClickHouse names
+ */
+const runsSchema: TableSchema = {
+  name: "runs", // User writes: FROM runs
+  clickhouseName: "trigger_dev.task_runs_v2", // ClickHouse sees this
+  columns: {
+    id: { name: "id", clickhouseName: "run_id", ...column("String") },
+    friendly_id: { name: "friendly_id", ...column("String") }, // No mapping
+    created: { name: "created", clickhouseName: "created_at", ...column("DateTime64") },
+    updated: { name: "updated", clickhouseName: "updated_at", ...column("DateTime64") },
+    status: { name: "status", ...column("String") },
+    task: { name: "task", clickhouseName: "task_identifier", ...column("String") },
+    org_id: { name: "org_id", clickhouseName: "organization_id", ...column("String") },
+    proj_id: { name: "proj_id", clickhouseName: "project_id", ...column("String") },
+    env_id: { name: "env_id", clickhouseName: "environment_id", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+/**
+ * Helper to create a test context
+ */
+function createTestContext(
+  overrides: Partial<Parameters<typeof createPrinterContext>[0]> = {}
+): PrinterContext {
+  const schema = createSchemaRegistry([taskRunsSchema, taskEventsSchema]);
+  return createPrinterContext({
+    schema,
+    enforcedWhereClause: {
+      organization_id: { op: "eq", value: "org_test123" },
+      project_id: { op: "eq", value: "proj_test456" },
+      environment_id: { op: "eq", value: "env_test789" },
+    },
+    ...overrides,
+  });
+}
+
+/**
+ * Helper to print a query and get SQL + params
+ */
+function printQuery(query: string, context?: PrinterContext) {
+  const ast = parseTSQLSelect(query);
+  const ctx = context ?? createTestContext();
+  return printToClickHouse(ast, ctx);
+}
+
+describe("ClickHousePrinter", () => {
+  describe("Basic SELECT statements", () => {
+    it("should expand SELECT * to individual columns", () => {
+      const { sql, params, columns } = printQuery("SELECT * FROM task_runs");
+
+      // SELECT * should be expanded to individual columns
+      expect(sql).toContain("SELECT ");
+      expect(sql).not.toContain("SELECT *"); // Should NOT contain literal *
+      expect(sql).toContain("FROM trigger_dev.task_runs_v2");
+
+      // Should include all columns from the schema
+      expect(sql).toContain("id");
+      expect(sql).toContain("status");
+      expect(sql).toContain("task_identifier");
+      expect(sql).toContain("created_at");
+      expect(sql).toContain("is_test");
+
+      // Should include tenant guards in WHERE
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("project_id");
+      expect(sql).toContain("environment_id");
+
+      // Should return column metadata for all expanded columns
+      expect(columns.length).toBeGreaterThan(0);
+      expect(columns.some((c) => c.name === "id")).toBe(true);
+      expect(columns.some((c) => c.name === "status")).toBe(true);
+    });
+
+    it("should print SELECT with specific columns", () => {
+      const { sql, params } = printQuery("SELECT id, status, created_at FROM task_runs");
+
+      expect(sql).toContain("SELECT id, status, created_at");
+      expect(sql).toContain("FROM trigger_dev.task_runs_v2");
+    });
+
+    it("should print SELECT DISTINCT", () => {
+      const { sql } = printQuery("SELECT DISTINCT status FROM task_runs");
+
+      expect(sql).toContain("SELECT DISTINCT status");
+    });
+
+    it("should print SELECT with aliases", () => {
+      const { sql } = printQuery("SELECT id AS run_id, status AS run_status FROM task_runs");
+
+      expect(sql).toContain("id AS run_id");
+      expect(sql).toContain("status AS run_status");
+    });
+
+    it("should expand SELECT * with column name mapping", () => {
+      const schema = createSchemaRegistry([runsSchema]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test" },
+          project_id: { op: "eq", value: "proj_test" },
+          environment_id: { op: "eq", value: "env_test" },
+        },
+      });
+
+      const { sql, columns } = printQuery("SELECT * FROM runs", ctx);
+
+      // Should expand to all columns from runsSchema with proper aliases
+      expect(sql).not.toContain("SELECT *");
+      // Should have AS clauses for columns with different clickhouseName
+      expect(sql).toContain("run_id AS id"); // id -> run_id with alias back to id
+      expect(sql).toContain("created_at AS created"); // created -> created_at with alias back
+      expect(sql).toContain("status"); // status stays as-is
+
+      // Should return column metadata with user-facing names
+      expect(columns.length).toBeGreaterThan(0);
+      expect(columns.some((c) => c.name === "id")).toBe(true);
+      expect(columns.some((c) => c.name === "created")).toBe(true);
+      expect(columns.some((c) => c.name === "status")).toBe(true);
+    });
+
+    it("should expand table.* for specific table", () => {
+      const { sql, columns } = printQuery("SELECT task_runs.* FROM task_runs");
+
+      // Should expand to all columns from task_runs
+      expect(sql).not.toContain("task_runs.*");
+      expect(sql).toContain("id");
+      expect(sql).toContain("status");
+
+      // Should return column metadata
+      expect(columns.length).toBeGreaterThan(0);
+    });
+
+    it("should include virtual columns in SELECT * expansion", () => {
+      // Schema with virtual columns
+      const schemaWithVirtual: TableSchema = {
+        name: "runs",
+        clickhouseName: "trigger_dev.task_runs_v2",
+        columns: {
+          id: { name: "id", ...column("String") },
+          started_at: { name: "started_at", ...column("Nullable(DateTime64)") },
+          completed_at: { name: "completed_at", ...column("Nullable(DateTime64)") },
+          // Virtual column with expression
+          duration: {
+            name: "duration",
+            ...column("Nullable(Int64)"),
+            expression: "dateDiff('millisecond', started_at, completed_at)",
+            description: "Execution duration in ms",
+          },
+          org_id: { name: "org_id", clickhouseName: "organization_id", ...column("String") },
+          proj_id: { name: "proj_id", clickhouseName: "project_id", ...column("String") },
+          env_id: { name: "env_id", clickhouseName: "environment_id", ...column("String") },
+        },
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+      };
+
+      const schema = createSchemaRegistry([schemaWithVirtual]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test" },
+          project_id: { op: "eq", value: "proj_test" },
+          environment_id: { op: "eq", value: "env_test" },
+        },
+      });
+
+      const { sql, columns } = printQuery("SELECT * FROM runs", ctx);
+
+      // Should include virtual column with its expression
+      expect(sql).toContain("dateDiff('millisecond', started_at, completed_at)");
+      expect(sql).toContain("AS duration");
+
+      // Should include regular columns
+      expect(sql).toContain("id");
+
+      // Metadata should include the virtual column
+      expect(columns.some((c) => c.name === "duration")).toBe(true);
+      const durationCol = columns.find((c) => c.name === "duration");
+      expect(durationCol?.description).toBe("Execution duration in ms");
+    });
+  });
+
+  describe("Table and column name mapping", () => {
+    function createMappedContext() {
+      const schema = createSchemaRegistry([runsSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test" },
+        project_id: { op: "eq", value: "proj_test" },
+        environment_id: { op: "eq", value: "env_test" },
+      },
+    });
+  }
+
+  it("should map user-friendly table name to ClickHouse name", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT * FROM runs", ctx);
+
+      // Table name should be mapped
+      expect(sql).toContain("FROM trigger_dev.task_runs_v2");
+      expect(sql).not.toContain("FROM runs");
+    });
+
+    it("should map user-friendly column names to ClickHouse names", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT id, created, status FROM runs", ctx);
+
+      // id -> run_id, created -> created_at, status stays as status
+      expect(sql).toContain("run_id");
+      expect(sql).toContain("created_at");
+      expect(sql).toContain("status");
+    });
+
+    it("should map column names in WHERE clause", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE task = 'my-task'", ctx);
+
+      // task -> task_identifier
+      expect(sql).toContain("task_identifier");
+      expect(sql).not.toMatch(/\btask\b.*=/); // task should not appear as column
+    });
+
+    it("should map column names in ORDER BY", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT * FROM runs ORDER BY created DESC", ctx);
+
+      // created -> created_at
+      expect(sql).toContain("ORDER BY created_at DESC");
+    });
+
+    it("should map column names in GROUP BY", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT task, count(*) FROM runs GROUP BY task", ctx);
+
+      // task -> task_identifier in both SELECT and GROUP BY
+      expect(sql).toContain("task_identifier");
+      expect(sql).toContain("GROUP BY task_identifier");
+    });
+
+    it("should preserve unmapped column names", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT friendly_id, status FROM runs", ctx);
+
+      // friendly_id has no clickhouseName, should stay as-is
+      expect(sql).toContain("friendly_id");
+      expect(sql).toContain("status");
+    });
+
+    it("should handle qualified column references (table.column)", () => {
+      const ctx = createMappedContext();
+      const { sql } = printQuery("SELECT runs.id, runs.created FROM runs", ctx);
+
+      // Should still map the column names
+      expect(sql).toContain("run_id");
+      expect(sql).toContain("created_at");
+    });
+
+    it("should add AS alias for columns with different clickhouseName to preserve user-facing name in results", () => {
+      const ctx = createMappedContext();
+      const { sql, columns } = printQuery("SELECT id, created, status FROM runs", ctx);
+
+      // Columns with clickhouseName should be aliased back to user-facing name
+      // id -> run_id AS id, created -> created_at AS created
+      expect(sql).toContain("run_id AS id");
+      expect(sql).toContain("created_at AS created");
+      // status has no clickhouseName mapping, should not have alias
+      expect(sql).not.toContain("status AS");
+
+      // Column metadata should use user-facing names
+      expect(columns.map((c) => c.name)).toEqual(["id", "created", "status"]);
+    });
+
+    it("should add AS alias for qualified column references with different clickhouseName", () => {
+      const ctx = createMappedContext();
+      const { sql, columns } = printQuery("SELECT runs.id, runs.task FROM runs", ctx);
+
+      // Should add aliases to preserve user-facing names
+      expect(sql).toContain("run_id AS id");
+      expect(sql).toContain("task_identifier AS task");
+
+      // Column metadata should use user-facing names
+      expect(columns.map((c) => c.name)).toEqual(["id", "task"]);
+    });
+
+    it("should not add redundant alias when user provides explicit AS", () => {
+      const ctx = createMappedContext();
+      const { sql, columns } = printQuery("SELECT id AS my_id FROM runs", ctx);
+
+      // Should use the clickhouse name with user's explicit alias
+      expect(sql).toContain("run_id AS my_id");
+      // Should NOT have double aliasing
+      expect(sql).not.toContain("run_id AS id AS my_id");
+
+      // Column metadata should use the explicit alias
+      expect(columns.map((c) => c.name)).toEqual(["my_id"]);
+    });
+  });
+
+  describe("WHERE clauses", () => {
+    it("should print WHERE with equality comparison", () => {
+      const { sql, params } = printQuery("SELECT * FROM task_runs WHERE status = 'completed'");
+
+      expect(sql).toContain("WHERE");
+      expect(sql).toContain("equals(");
+      // Value should be parameterized
+      expect(Object.values(params)).toContain("completed");
+    });
+
+    it("should print WHERE with multiple conditions", () => {
+      const { sql } = printQuery(
+        "SELECT * FROM task_runs WHERE status = 'completed' AND is_test = 0"
+      );
+
+      expect(sql).toContain("and(");
+      expect(sql).toContain("equals(");
+    });
+
+    it("should print WHERE with OR conditions", () => {
+      const { sql } = printQuery(
+        "SELECT * FROM task_runs WHERE status = 'completed' OR status = 'failed'"
+      );
+
+      expect(sql).toContain("or(");
+    });
+
+    it("should print WHERE with NOT", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE NOT status = 'pending'");
+
+      expect(sql).toContain("not(");
+    });
+
+    it("should print WHERE with BETWEEN", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE duration_ms BETWEEN 100 AND 1000");
+
+      expect(sql).toContain("BETWEEN");
+    });
+
+    it("should print WHERE with IN", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE status IN ('completed', 'failed')");
+
+      expect(sql).toContain("in(");
+    });
+
+    it("should print WHERE with NOT IN", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE status NOT IN ('pending')");
+
+      expect(sql).toContain("notIn(");
+    });
+
+    it("should print WHERE with LIKE", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE task_identifier LIKE 'email%'");
+
+      expect(sql).toContain("like(");
+    });
+
+    it("should print WHERE with ILIKE", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE task_identifier ILIKE '%Email%'");
+
+      expect(sql).toContain("ilike(");
+    });
+
+    it("should handle NULL comparisons", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE started_at = NULL");
+
+      expect(sql).toContain("isNull(");
+    });
+
+    it("should handle != NULL comparisons", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE started_at != NULL");
+
+      expect(sql).toContain("isNotNull(");
+    });
+
+    it("should handle IS NULL syntax", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE started_at IS NULL");
+
+      expect(sql).toContain("isNull(started_at)");
+    });
+
+    it("should handle IS NOT NULL syntax", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE started_at IS NOT NULL");
+
+      expect(sql).toContain("isNotNull(started_at)");
+    });
+  });
+
+  describe("nullValue transformation for JSON columns", () => {
+    // Create a schema with JSON columns that have nullValue set
+    const jsonSchema: TableSchema = {
+      name: "runs",
+      clickhouseName: "trigger_dev.task_runs_v2",
+      columns: {
+        id: { name: "id", ...column("String") },
+        error: {
+          name: "error",
+          ...column("JSON"),
+          nullValue: "'{}'", // Empty object represents NULL
+        },
+        output: {
+          name: "output",
+          ...column("JSON"),
+          nullValue: "'{}'", // Empty object represents NULL
+        },
+        status: { name: "status", ...column("String") },
+        organization_id: { name: "organization_id", ...column("String") },
+        project_id: { name: "project_id", ...column("String") },
+        environment_id: { name: "environment_id", ...column("String") },
+      },
+      tenantColumns: {
+        organizationId: "organization_id",
+        projectId: "project_id",
+        environmentId: "environment_id",
+      },
+    };
+
+    function createJsonContext() {
+      const schema = createSchemaRegistry([jsonSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test" },
+        project_id: { op: "eq", value: "proj_test" },
+        environment_id: { op: "eq", value: "env_test" },
+      },
+    });
+  }
+
+  it("should transform IS NULL to equals empty object for JSON columns with nullValue", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE error IS NULL", ctx);
+
+      // Should use equals with '{}' instead of isNull
+      expect(sql).toContain("equals(error, '{}')");
+      expect(sql).not.toContain("isNull(error)");
+    });
+
+    it("should transform IS NOT NULL to notEquals empty object for JSON columns with nullValue", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE error IS NOT NULL", ctx);
+
+      // Should use notEquals with '{}' instead of isNotNull
+      expect(sql).toContain("notEquals(error, '{}')");
+      expect(sql).not.toContain("isNotNull(error)");
+    });
+
+    it("should transform = NULL to equals empty object for JSON columns with nullValue", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE error = NULL", ctx);
+
+      expect(sql).toContain("equals(error, '{}')");
+      expect(sql).not.toContain("isNull(error)");
+    });
+
+    it("should transform != NULL to notEquals empty object for JSON columns with nullValue", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE error != NULL", ctx);
+
+      expect(sql).toContain("notEquals(error, '{}')");
+      expect(sql).not.toContain("isNotNull(error)");
+    });
+
+    it("should not affect regular columns without nullValue", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE status IS NULL", ctx);
+
+      // Regular column should still use isNull
+      expect(sql).toContain("isNull(status)");
+    });
+
+    it("should work with multiple JSON column NULL checks", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery(
+        "SELECT * FROM runs WHERE error IS NOT NULL AND output IS NULL",
+        ctx
+      );
+
+      expect(sql).toContain("notEquals(error, '{}')");
+      expect(sql).toContain("equals(output, '{}')");
+    });
+
+    it("should allow GROUP BY on JSON columns without error", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery(
+        "SELECT error, count() AS error_count FROM runs WHERE error IS NOT NULL GROUP BY error",
+        ctx
+      );
+
+      // Should filter with notEquals
+      expect(sql).toContain("notEquals(error, '{}')");
+      // Should group by the raw column
+      expect(sql).toContain("GROUP BY error");
+    });
+
+    it("should cast JSON subfield to String with underscore alias in SELECT and GROUP BY", () => {
+      const ctx = createJsonContext();
+      const { sql, columns } = printQuery(
+        "SELECT error.data.name, count() AS error_count FROM runs GROUP BY error.data.name",
+        ctx
+      );
+
+      // SELECT should use .:String type hint with underscore alias
+      expect(sql).toContain("error.data.name.:String AS error_data_name");
+      // GROUP BY should use .:String type hint (no alias needed)
+      expect(sql).toContain("GROUP BY error.data.name.:String");
+
+      // Column metadata should have the underscore alias name
+      expect(columns).toContainEqual(
+        expect.objectContaining({ name: "error_data_name", type: "String" })
+      );
+      expect(columns).toContainEqual(
+        expect.objectContaining({ name: "error_count", type: "UInt64" })
+      );
+    });
+
+    it("should cast JSON subfield to String with multiple fields and underscore aliases", () => {
+      const ctx = createJsonContext();
+      const { sql, columns } = printQuery(
+        "SELECT error.name, error.message, count() AS cnt FROM runs GROUP BY error.name, error.message",
+        ctx
+      );
+
+      // SELECT should have type hints with underscore aliases
+      expect(sql).toContain("error.name.:String AS error_name");
+      expect(sql).toContain("error.message.:String AS error_message");
+      // GROUP BY should have type hints
+      expect(sql).toContain("GROUP BY error.name.:String, error.message.:String");
+
+      // Column metadata should have correct names
+      expect(columns).toContainEqual(
+        expect.objectContaining({ name: "error_name", type: "String" })
+      );
+      expect(columns).toContainEqual(
+        expect.objectContaining({ name: "error_message", type: "String" })
+      );
+    });
+
+    it("should not cast non-JSON columns in GROUP BY", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery("SELECT status, count() AS cnt FROM runs GROUP BY status", ctx);
+
+      // Regular columns should not have type hints
+      expect(sql).toContain("GROUP BY status");
+      expect(sql).not.toContain(".:String");
+    });
+
+    it("should NOT add .:String type hint for JSON subfield in WHERE comparison", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery(
+        "SELECT id FROM runs WHERE error.data.name = 'test'",
+        ctx
+      );
+
+      // WHERE clause should NOT have .:String type hint (it breaks the query)
+      expect(sql).toContain("equals(error.data.name,");
+      expect(sql).not.toContain("error.data.name.:String");
+    });
+
+    it("should NOT add .:String for JSON subfield in WHERE with LIKE", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery(
+        "SELECT id FROM runs WHERE error.message LIKE '%error%'",
+        ctx
+      );
+
+      // WHERE clause should NOT have .:String type hint
+      expect(sql).toContain("like(error.message,");
+      expect(sql).not.toContain("error.message.:String");
+    });
+
+    it("should NOT add .:String in SELECT or WHERE when no GROUP BY", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery(
+        "SELECT error.data.name FROM runs WHERE error.data.name = 'test'",
+        ctx
+      );
+
+      // SELECT should NOT have .:String (no GROUP BY, so no need for type hint)
+      expect(sql).toContain("error.data.name AS error_data_name");
+      expect(sql).not.toContain(".:String");
+      // WHERE should NOT have .:String
+      expect(sql).toContain("equals(error.data.name,");
+    });
+
+    it("should add .:String in GROUP BY but not in WHERE for same query", () => {
+      const ctx = createJsonContext();
+      const { sql } = printQuery(
+        "SELECT error.data.name, count() AS cnt FROM runs WHERE error.data.name = 'test' GROUP BY error.data.name",
+        ctx
+      );
+
+      // SELECT should have .:String
+      expect(sql).toContain("error.data.name.:String AS error_data_name");
+      // GROUP BY should have .:String
+      expect(sql).toContain("GROUP BY error.data.name.:String");
+      // WHERE should NOT have .:String
+      expect(sql).toContain("equals(error.data.name,");
+      expect(sql).not.toMatch(/equals\(error\.data\.name\.:String/);
+    });
+  });
+
+  describe("textColumn optimization for JSON columns", () => {
+    // Create a schema with JSON columns that have textColumn set
+    const textColumnSchema: TableSchema = {
+      name: "runs",
+      clickhouseName: "trigger_dev.task_runs_v2",
+      columns: {
+        id: { name: "id", ...column("String") },
+        output: {
+          name: "output",
+          ...column("JSON"),
+          nullValue: "'{}'",
+          textColumn: "output_text",
+        },
+        error: {
+          name: "error",
+          ...column("JSON"),
+          nullValue: "'{}'",
+          textColumn: "error_text",
+        },
+        status: { name: "status", ...column("String") },
+        organization_id: { name: "organization_id", ...column("String") },
+        project_id: { name: "project_id", ...column("String") },
+        environment_id: { name: "environment_id", ...column("String") },
+      },
+      tenantColumns: {
+        organizationId: "organization_id",
+        projectId: "project_id",
+        environmentId: "environment_id",
+      },
+    };
+
+    function createTextColumnContext() {
+      const schema = createSchemaRegistry([textColumnSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test" },
+        project_id: { op: "eq", value: "proj_test" },
+        environment_id: { op: "eq", value: "env_test" },
+      },
+    });
+  }
+
+  describe("SELECT clause", () => {
+    it("should use text column when selecting bare JSON column", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT output FROM runs", ctx);
+
+        // Should use the text column with an alias to preserve the column name
+        expect(sql).toContain("output_text AS output");
+      });
+
+      it("should use text column for multiple JSON columns", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT output, error FROM runs", ctx);
+
+        expect(sql).toContain("output_text AS output");
+        expect(sql).toContain("error_text AS error");
+      });
+
+      it("should use JSON column for subfield access without .:String when no GROUP BY", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT output.data.name FROM runs", ctx);
+
+        // Should use the original JSON column without .:String (no GROUP BY)
+        expect(sql).toContain("output.data.name AS output_data_name");
+        expect(sql).not.toContain("output_text");
+        expect(sql).not.toContain(".:String");
+      });
+    });
+
+    describe("SELECT * expansion", () => {
+      it("should use text columns when expanding SELECT *", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT * FROM runs", ctx);
+
+        // Should use text columns for JSON columns
+        expect(sql).toContain("output_text AS output");
+        expect(sql).toContain("error_text AS error");
+      });
+    });
+
+    describe("WHERE clause", () => {
+      it("should use text column for exact equality comparison", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE output = '{}'", ctx);
+
+        expect(sql).toContain("equals(output_text,");
+        expect(sql).not.toMatch(/equals\(output,/);
+      });
+
+      it("should use text column for inequality comparison", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE output != '{}'", ctx);
+
+        expect(sql).toContain("notEquals(output_text,");
+      });
+
+      it("should use text column for LIKE comparison", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE output LIKE '%error%'", ctx);
+
+        expect(sql).toContain("like(output_text,");
+        expect(sql).not.toMatch(/like\(output,/);
+      });
+
+      it("should use text column for ILIKE comparison", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE error ILIKE '%failed%'", ctx);
+
+        expect(sql).toContain("ilike(error_text,");
+      });
+
+      it("should use text column for NOT LIKE comparison", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE output NOT LIKE '%test%'", ctx);
+
+        expect(sql).toContain("notLike(output_text,");
+      });
+
+      it("should use JSON column for subfield comparison without .:String", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery(
+          "SELECT id FROM runs WHERE output.data.name = 'test'",
+          ctx
+        );
+
+        // Should use the original JSON column, not the text column
+        // And should NOT have .:String in WHERE (breaks the query)
+        expect(sql).toContain("equals(output.data.name,");
+        expect(sql).not.toContain("output_text");
+        expect(sql).not.toContain("output.data.name.:String");
+      });
+
+      it("should still use nullValue transformation for IS NULL", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE output IS NULL", ctx);
+
+        // NULL check should use the text column with nullValue
+        expect(sql).toContain("equals(output_text, '{}')");
+      });
+
+      it("should still use nullValue transformation for IS NOT NULL", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT id FROM runs WHERE error IS NOT NULL", ctx);
+
+        expect(sql).toContain("notEquals(error_text, '{}')");
+      });
+    });
+
+    describe("edge cases", () => {
+      it("should work with columns without textColumn defined", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT status FROM runs WHERE status = 'completed'", ctx);
+
+        // Regular column should work as before
+        expect(sql).toContain("status");
+        expect(sql).not.toContain("status_text");
+      });
+
+      it("should use text column for aliased JSON columns in SELECT", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT output AS result FROM runs", ctx);
+
+        // Should use text column with user's alias
+        expect(sql).toContain("output_text AS result");
+      });
+
+      it("should use text column for table-qualified JSON columns in SELECT", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery("SELECT runs.output FROM runs", ctx);
+
+        // Should use text column
+        expect(sql).toContain("output_text AS output");
+      });
+
+      it("should use text column in both SELECT and WHERE for same query", () => {
+        const ctx = createTextColumnContext();
+        const { sql } = printQuery(
+          "SELECT output FROM runs WHERE output LIKE '%test%'",
+          ctx
+        );
+
+        // SELECT should use text column
+        expect(sql).toContain("output_text AS output");
+        // WHERE should use text column
+        expect(sql).toContain("like(output_text,");
+      });
+    });
+
+    describe("JOINs with textColumn", () => {
+      // Create a second schema with the same JSON column names to test JOIN ambiguity
+      const runsSchemaWithTextColumn: TableSchema = {
+        name: "runs",
+        clickhouseName: "trigger_dev.task_runs_v2",
+        columns: {
+          id: { name: "id", ...column("String") },
+          output: {
+            name: "output",
+            ...column("JSON"),
+            nullValue: "'{}'",
+            textColumn: "output_text",
+          },
+          organization_id: { name: "organization_id", ...column("String") },
+          project_id: { name: "project_id", ...column("String") },
+          environment_id: { name: "environment_id", ...column("String") },
+        },
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+      };
+
+      const eventsSchemaWithTextColumn: TableSchema = {
+        name: "events",
+        clickhouseName: "trigger_dev.task_events_v2",
+        columns: {
+          id: { name: "id", ...column("String") },
+          run_id: { name: "run_id", ...column("String") },
+          output: {
+            name: "output",
+            ...column("JSON"),
+            nullValue: "'{}'",
+            textColumn: "output_text",
+          },
+          organization_id: { name: "organization_id", ...column("String") },
+          project_id: { name: "project_id", ...column("String") },
+          environment_id: { name: "environment_id", ...column("String") },
+        },
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+      };
+
+      function createJoinTextColumnContext() {
+        const schema = createSchemaRegistry([runsSchemaWithTextColumn, eventsSchemaWithTextColumn]);
+        return createPrinterContext({
+          schema,
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_test" },
+            project_id: { op: "eq", value: "proj_test" },
+            environment_id: { op: "eq", value: "env_test" },
+          },
+        });
+      }
+
+      it("should qualify text column with table alias in JOIN WHERE clause to avoid ambiguity", () => {
+        const ctx = createJoinTextColumnContext();
+        const { sql } = printQuery(
+          `SELECT r.id FROM runs r JOIN events e ON r.id = e.run_id WHERE r.output = '{}'`,
+          ctx
+        );
+
+        // The text column should be table-qualified to avoid ambiguity
+        // since both tables have an output_text column
+        expect(sql).toContain("equals(r.output_text,");
+        // Should NOT have unqualified output_text in the comparison
+        expect(sql).not.toMatch(/equals\(output_text,/);
+      });
+
+      it("should qualify text column with table alias for LIKE in JOIN", () => {
+        const ctx = createJoinTextColumnContext();
+        const { sql } = printQuery(
+          `SELECT r.id FROM runs r JOIN events e ON r.id = e.run_id WHERE e.output LIKE '%error%'`,
+          ctx
+        );
+
+        // Should use table-qualified text column
+        expect(sql).toContain("like(e.output_text,");
+        expect(sql).not.toMatch(/like\(output_text,/);
+      });
+
+      it("should handle multiple qualified text column comparisons in JOIN", () => {
+        const ctx = createJoinTextColumnContext();
+        const { sql } = printQuery(
+          `SELECT r.id FROM runs r JOIN events e ON r.id = e.run_id WHERE r.output = '{}' AND e.output != '{}'`,
+          ctx
+        );
+
+        // Both comparisons should be table-qualified
+        expect(sql).toContain("equals(r.output_text,");
+        expect(sql).toContain("notEquals(e.output_text,");
+      });
+    });
+  });
+
+  describe("dataPrefix for JSON columns", () => {
+    // Create a schema with JSON columns that have dataPrefix set
+    const dataPrefixSchema: TableSchema = {
+      name: "runs",
+      clickhouseName: "trigger_dev.task_runs_v2",
+      columns: {
+        id: { name: "id", ...column("String") },
+        output: {
+          name: "output",
+          ...column("JSON"),
+          nullValue: "'{}'",
+          dataPrefix: "data",
+        },
+        error: {
+          name: "error",
+          ...column("JSON"),
+          nullValue: "'{}'",
+          dataPrefix: "data",
+        },
+        status: { name: "status", ...column("String") },
+        organization_id: { name: "organization_id", ...column("String") },
+        project_id: { name: "project_id", ...column("String") },
+        environment_id: { name: "environment_id", ...column("String") },
+      },
+      tenantColumns: {
+        organizationId: "organization_id",
+        projectId: "project_id",
+        environmentId: "environment_id",
+      },
+    };
+
+    function createDataPrefixContext() {
+      const schema = createSchemaRegistry([dataPrefixSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test" },
+        project_id: { op: "eq", value: "proj_test" },
+        environment_id: { op: "eq", value: "env_test" },
+      },
+    });
+  }
+
+  describe("SELECT clause", () => {
+    it("should inject dataPrefix into JSON subfield path", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery("SELECT output.message FROM runs", ctx);
+
+        // Should transform output.message to output.data.message
+        expect(sql).toContain("output.data.message");
+      });
+
+      it("should generate clean alias without dataPrefix", () => {
+        const ctx = createDataPrefixContext();
+        const { sql, columns } = printQuery("SELECT output.message FROM runs", ctx);
+
+        // Alias should be output_message, not output_data_message
+        expect(sql).toContain("AS output_message");
+        expect(sql).not.toContain("AS output_data_message");
+        expect(columns).toContainEqual(
+          expect.objectContaining({ name: "output_message" })
+        );
+      });
+
+      it("should handle nested paths with dataPrefix", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery("SELECT output.user.name FROM runs", ctx);
+
+        // Should transform output.user.name to output.data.user.name
+        expect(sql).toContain("output.data.user.name");
+        // Alias should be output_user_name
+        expect(sql).toContain("AS output_user_name");
+      });
+
+      it("should work with multiple JSON columns with dataPrefix", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery("SELECT output.msg, error.code FROM runs", ctx);
+
+        expect(sql).toContain("output.data.msg");
+        expect(sql).toContain("error.data.code");
+        expect(sql).toContain("AS output_msg");
+        expect(sql).toContain("AS error_code");
+      });
+
+      it("should not affect bare JSON column selection", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery("SELECT output FROM runs", ctx);
+
+        // Bare column should not have dataPrefix injected
+        expect(sql).not.toContain("output.data");
+        expect(sql).toMatch(/SELECT\s+output[\s,]/);
+      });
+    });
+
+    describe("WHERE clause", () => {
+      it("should inject dataPrefix into WHERE comparison", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery(
+          "SELECT id FROM runs WHERE output.status = 'success'",
+          ctx
+        );
+
+        // Should transform output.status to output.data.status
+        expect(sql).toContain("output.data.status");
+      });
+
+      it("should inject dataPrefix into LIKE comparison", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery(
+          "SELECT id FROM runs WHERE error.message LIKE '%failed%'",
+          ctx
+        );
+
+        expect(sql).toContain("error.data.message");
+      });
+    });
+
+    describe("GROUP BY clause", () => {
+      it("should inject dataPrefix into GROUP BY", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery(
+          "SELECT output.type, count() AS cnt FROM runs GROUP BY output.type",
+          ctx
+        );
+
+        // Should inject dataPrefix in both SELECT and GROUP BY
+        expect(sql).toContain("output.data.type");
+        expect(sql).toContain("GROUP BY output.data.type");
+      });
+    });
+
+    describe("edge cases", () => {
+      it("should not affect columns without dataPrefix", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery("SELECT status FROM runs", ctx);
+
+        // Regular column should not be affected
+        expect(sql).toContain("status");
+        expect(sql).not.toContain("status.data");
+      });
+
+      it("should work with explicit alias on JSON subfield", () => {
+        const ctx = createDataPrefixContext();
+        const { sql } = printQuery("SELECT output.message AS msg FROM runs", ctx);
+
+        // Should inject dataPrefix but use user's alias
+        expect(sql).toContain("output.data.message");
+        expect(sql).toContain("AS msg");
+      });
+    });
+  });
+
+  describe("ORDER BY clauses", () => {
+    it("should print ORDER BY ASC", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs ORDER BY created_at ASC");
+
+      expect(sql).toContain("ORDER BY created_at ASC");
+    });
+
+    it("should print ORDER BY DESC", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs ORDER BY created_at DESC");
+
+      expect(sql).toContain("ORDER BY created_at DESC");
+    });
+
+    it("should print ORDER BY with multiple columns", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs ORDER BY status ASC, created_at DESC");
+
+      expect(sql).toContain("ORDER BY status ASC, created_at DESC");
+    });
+  });
+
+  describe("LIMIT and OFFSET", () => {
+    it("should print LIMIT", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs LIMIT 10");
+
+      expect(sql).toContain("LIMIT 10");
+    });
+
+    it("should print LIMIT with OFFSET", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs LIMIT 10 OFFSET 20");
+
+      expect(sql).toContain("LIMIT 10");
+      expect(sql).toContain("OFFSET 20");
+    });
+
+    it("should cap LIMIT to maxRows setting", () => {
+      const context = createTestContext({ settings: { maxRows: 100 } });
+      const { sql } = printQuery("SELECT * FROM task_runs LIMIT 1000", context);
+
+      expect(sql).toContain("LIMIT 100");
+    });
+
+    it("should add default LIMIT when none specified", () => {
+      const context = createTestContext({ settings: { maxRows: 10000 } });
+      const { sql } = printQuery("SELECT * FROM task_runs", context);
+
+      expect(sql).toContain("LIMIT 10000");
+    });
+  });
+
+  describe("GROUP BY clauses", () => {
+    it("should print GROUP BY", () => {
+      const { sql } = printQuery("SELECT status, count(*) FROM task_runs GROUP BY status");
+
+      expect(sql).toContain("GROUP BY status");
+    });
+
+    it("should print GROUP BY with multiple columns", () => {
+      const { sql } = printQuery(
+        "SELECT status, queue_name, count(*) FROM task_runs GROUP BY status, queue_name"
+      );
+
+      expect(sql).toContain("GROUP BY status, queue_name");
+    });
+
+    it("should print GROUP BY with HAVING", () => {
+      const { sql } = printQuery(
+        "SELECT status, count(*) as cnt FROM task_runs GROUP BY status HAVING cnt > 10"
+      );
+
+      expect(sql).toContain("GROUP BY status");
+      expect(sql).toContain("HAVING");
+      expect(sql).toContain("greater(");
+    });
+  });
+
+  describe("Aggregate functions", () => {
+    it("should print COUNT", () => {
+      const { sql } = printQuery("SELECT count(*) FROM task_runs");
+
+      expect(sql).toContain("count(*)");
+    });
+
+    it("should print COUNT DISTINCT", () => {
+      const { sql } = printQuery("SELECT count(DISTINCT status) FROM task_runs");
+
+      expect(sql).toContain("count(DISTINCT status)");
+    });
+
+    it("should print SUM", () => {
+      const { sql } = printQuery("SELECT sum(duration_ms) FROM task_runs");
+
+      expect(sql).toContain("sum(duration_ms)");
+    });
+
+    it("should print AVG", () => {
+      const { sql } = printQuery("SELECT avg(duration_ms) FROM task_runs");
+
+      expect(sql).toContain("avg(duration_ms)");
+    });
+
+    it("should print MIN and MAX", () => {
+      const { sql } = printQuery("SELECT min(created_at), max(created_at) FROM task_runs");
+
+      expect(sql).toContain("min(created_at)");
+      expect(sql).toContain("max(created_at)");
+    });
+  });
+
+  describe("Arithmetic operations", () => {
+    it("should print addition", () => {
+      const { sql } = printQuery("SELECT duration_ms + 100 FROM task_runs");
+
+      expect(sql).toContain("plus(duration_ms, 100)");
+    });
+
+    it("should print subtraction", () => {
+      const { sql } = printQuery("SELECT duration_ms - 100 FROM task_runs");
+
+      expect(sql).toContain("minus(duration_ms, 100)");
+    });
+
+    it("should print multiplication", () => {
+      const { sql } = printQuery("SELECT duration_ms * 2 FROM task_runs");
+
+      expect(sql).toContain("multiply(duration_ms, 2)");
+    });
+
+    it("should print division", () => {
+      const { sql } = printQuery("SELECT duration_ms / 1000 FROM task_runs");
+
+      expect(sql).toContain("divide(duration_ms, 1000)");
+    });
+
+    it("should print modulo", () => {
+      const { sql } = printQuery("SELECT duration_ms % 60 FROM task_runs");
+
+      expect(sql).toContain("modulo(duration_ms, 60)");
+    });
+  });
+
+  describe("Tenant isolation", () => {
+    it("should inject tenant guards for single table", () => {
+      const context = createTestContext({
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_abc" },
+          project_id: { op: "eq", value: "proj_def" },
+          environment_id: { op: "eq", value: "env_ghi" },
+        },
+      });
+      const { sql, params } = printQuery("SELECT * FROM task_runs", context);
+
+      // Should have WHERE clause with tenant columns
+      expect(sql).toContain("WHERE");
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("project_id");
+      expect(sql).toContain("environment_id");
+
+      // Values should be parameterized
+      expect(Object.values(params)).toContain("org_abc");
+      expect(Object.values(params)).toContain("proj_def");
+      expect(Object.values(params)).toContain("env_ghi");
+    });
+
+    it("should combine tenant guards with user WHERE clause", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE status = 'completed'");
+
+      // Should have both tenant guard AND user condition
+      expect(sql).toContain("and(");
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("equals(");
+    });
+  });
+
+  describe("SQL injection prevention", () => {
+    it("should parameterize string values", () => {
+      const { sql, params } = printQuery(
+        "SELECT * FROM task_runs WHERE status = 'DROP TABLE users'"
+      );
+
+      // The malicious string should be in params, not in SQL
+      expect(sql).not.toContain("DROP TABLE");
+      expect(Object.values(params)).toContain("DROP TABLE users");
+    });
+
+    it("should safely handle identifiers with special characters", () => {
+      // This should either escape or reject
+      expect(() => {
+        printQuery("SELECT * FROM task_runs WHERE `weird`column` = 'test'");
+      }).toThrow();
+    });
+
+    it("should only allow tables defined in schema", () => {
+      // Users cannot query arbitrary tables - only those in the schema
+      expect(() => {
+        printQuery("SELECT * FROM system_tables");
+      }).toThrow();
+
+      expect(() => {
+        printQuery("SELECT * FROM unknown_table");
+      }).toThrow();
+    });
+
+    it("should parameterize numeric values inline", () => {
+      const { sql, params } = printQuery("SELECT * FROM task_runs WHERE duration_ms > 1000");
+
+      // Numbers can be inlined safely
+      expect(sql).toContain("1000");
+    });
+
+    it("should handle boolean values safely", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE is_test = 1");
+
+      expect(sql).toContain("equals(is_test, 1)");
+    });
+  });
+
+  describe("Subqueries", () => {
+    it("should print subquery in FROM clause", () => {
+      const { sql } = printQuery(`
+        SELECT status, cnt
+        FROM (
+          SELECT status, count(*) as cnt
+          FROM task_runs
+          GROUP BY status
+        )
+      `);
+
+      expect(sql).toContain("SELECT status, cnt");
+      expect(sql).toContain("FROM (");
+      expect(sql).toContain("count(*)");
+    });
+
+    it("should print subquery in WHERE clause", () => {
+      const { sql } = printQuery(`
+        SELECT * FROM task_runs
+        WHERE id IN (SELECT run_id FROM task_events WHERE event_type = 'completed')
+      `);
+
+      expect(sql).toContain("in(id,");
+      expect(sql).toContain("SELECT run_id FROM");
+    });
+  });
+
+  describe("UNION queries", () => {
+    it("should print UNION ALL", () => {
+      const { sql } = printQuery(`
+        SELECT id, status FROM task_runs WHERE status = 'completed'
+        UNION ALL
+        SELECT id, status FROM task_runs WHERE status = 'failed'
+      `);
+
+      expect(sql).toContain("UNION ALL");
+    });
+  });
+
+  describe("Window functions", () => {
+    it("should print ROW_NUMBER", () => {
+      const { sql } = printQuery(`
+        SELECT id, status, row_number() OVER (PARTITION BY status ORDER BY created_at DESC) as rn
+        FROM task_runs
+      `);
+
+      expect(sql).toContain("row_number()");
+      expect(sql).toContain("OVER (");
+      expect(sql).toContain("PARTITION BY status");
+      expect(sql).toContain("ORDER BY created_at DESC");
+    });
+  });
+
+  describe("Functions", () => {
+    it("should print toDateTime with column argument", () => {
+      const { sql } = printQuery("SELECT toDateTime(created_at) FROM task_runs");
+
+      expect(sql).toContain("toDateTime(created_at)");
+    });
+
+    it("should print toDateTime with string and timezone arguments", () => {
+      const { sql, params } = printQuery(
+        "SELECT toDateTime('2024-01-15 10:30:00', 'UTC') FROM task_runs"
+      );
+
+      // String values are parameterized for security
+      expect(sql).toContain("toDateTime(");
+      expect(sql).toMatch(/toDateTime\(\{tsql_val_\d+: String\}, \{tsql_val_\d+: String\}\)/);
+      expect(Object.values(params)).toContain("2024-01-15 10:30:00");
+      expect(Object.values(params)).toContain("UTC");
+    });
+
+    it("should print toDateTime with timezone containing special characters", () => {
+      const { sql, params } = printQuery(
+        "SELECT toDateTime('2024-01-15 10:30:00', 'America/New_York') FROM task_runs"
+      );
+
+      // String values are parameterized for security
+      expect(sql).toContain("toDateTime(");
+      expect(sql).toMatch(/toDateTime\(\{tsql_val_\d+: String\}, \{tsql_val_\d+: String\}\)/);
+      expect(Object.values(params)).toContain("2024-01-15 10:30:00");
+      expect(Object.values(params)).toContain("America/New_York");
+    });
+
+    it("should print toDateTime64 with precision and timezone", () => {
+      const { sql, params } = printQuery(
+        "SELECT toDateTime64('2024-01-15 10:30:00.500000', 6, 'Europe/London') FROM task_runs"
+      );
+
+      // String values are parameterized, but numeric precision is inline
+      expect(sql).toContain("toDateTime64(");
+      expect(sql).toMatch(/toDateTime64\(\{tsql_val_\d+: String\}, 6, \{tsql_val_\d+: String\}\)/);
+      expect(Object.values(params)).toContain("2024-01-15 10:30:00.500000");
+      expect(Object.values(params)).toContain("Europe/London");
+    });
+
+    it("should print now()", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE created_at > now()");
+
+      expect(sql).toContain("now()");
+    });
+
+    it("should print string functions", () => {
+      const { sql } = printQuery("SELECT lower(status), upper(queue_name) FROM task_runs");
+
+      expect(sql).toContain("lower(status)");
+      expect(sql).toContain("upper(queue_name)");
+    });
+
+    it("should print conditional functions", () => {
+      const { sql } = printQuery("SELECT if(is_test = 1, 'test', 'prod') FROM task_runs");
+
+      expect(sql).toContain("if(");
+    });
+
+    it("should print coalesce", () => {
+      const { sql } = printQuery("SELECT coalesce(started_at, created_at) FROM task_runs");
+
+      expect(sql).toContain("coalesce(started_at, created_at)");
+    });
+  });
+
+  describe("Arrays and tuples", () => {
+    it("should print array literals", () => {
+      const { sql } = printQuery("SELECT * FROM task_runs WHERE status IN ['completed', 'failed']");
+
+      expect(sql).toContain("[");
+      expect(sql).toContain("]");
+    });
+
+    it("should print tuple", () => {
+      const { sql } = printQuery("SELECT tuple(id, status) FROM task_runs");
+
+      expect(sql).toContain("tuple(id, status)");
+    });
+  });
+
+  describe("Error handling", () => {
+    it("should throw QueryError for unknown tables", () => {
+      expect(() => {
+        printQuery("SELECT * FROM unknown_table");
+      }).toThrow(QueryError);
+    });
+
+    it("should throw QueryError for unknown functions", () => {
+      expect(() => {
+        printQuery("SELECT unknown_function(id) FROM task_runs");
+      }).toThrow(QueryError);
+    });
+
+    it("should throw QueryError for nested aggregations", () => {
+      expect(() => {
+        printQuery("SELECT sum(count(*)) FROM task_runs");
+      }).toThrow(QueryError);
+    });
+
+    it("should throw SyntaxError for malformed queries", () => {
+      expect(() => {
+        parseTSQLSelect("SELECT * FORM task_runs"); // typo: FORM instead of FROM
+      }).toThrow();
+    });
+  });
+
+  describe("Pretty printing", () => {
+    it("should format SQL with newlines when pretty=true", () => {
+      const ast = parseTSQLSelect(
+        "SELECT id, status FROM task_runs WHERE status = 'completed' ORDER BY created_at"
+      );
+      const context = createTestContext();
+      const printer = new ClickHousePrinter(context, { pretty: true });
+      const { sql } = printer.print(ast);
+
+      expect(sql).toContain("\n");
+    });
+
+    it("should produce single-line SQL when pretty=false", () => {
+      const ast = parseTSQLSelect(
+        "SELECT id, status FROM task_runs WHERE status = 'completed' ORDER BY created_at"
+      );
+      const context = createTestContext();
+      const printer = new ClickHousePrinter(context, { pretty: false });
+      const { sql } = printer.print(ast);
+
+      // Count newlines - there should be very few or none in the main query structure
+      const newlineCount = (sql.match(/\n/g) || []).length;
+      expect(newlineCount).toBeLessThan(3);
+    });
+  });
+
+  describe("Parameter generation", () => {
+    it("should generate unique parameter names", () => {
+      const { params } = printQuery(`
+        SELECT * FROM task_runs
+        WHERE status = 'completed' AND queue_name = 'email' AND task_identifier = 'send'
+      `);
+
+      // Should have multiple unique parameter keys
+      const keys = Object.keys(params);
+      expect(new Set(keys).size).toBe(keys.length);
+    });
+
+    it("should include correct types in placeholders", () => {
+      const { sql, params } = printQuery("SELECT * FROM task_runs WHERE status = 'test'");
+
+      // Should have String type in placeholder
+      expect(sql).toMatch(/\{tsql_val_\d+: String\}/);
+    });
+  });
+});
+
+describe("Value mapping (valueMap)", () => {
+  /**
+   * Schema with valueMap for status column
+   */
+  const statusMappedSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      id: { name: "id", ...column("String") },
+      status: {
+        name: "status",
+        ...column("String"),
+        valueMap: {
+          COMPLETED_SUCCESSFULLY: "Completed",
+          COMPLETED_WITH_ERRORS: "Completed with errors",
+          SYSTEM_FAILURE: "System failure",
+          PENDING: "Pending",
+          EXECUTING: "Running",
+          FAILED: "Failed",
+        },
+      },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  function createValueMapContext() {
+    const schema = createSchemaRegistry([statusMappedSchema]);
+  return createPrinterContext({
+    schema,
+    enforcedWhereClause: {
+      organization_id: { op: "eq", value: "org_test" },
+      project_id: { op: "eq", value: "proj_test" },
+      environment_id: { op: "eq", value: "env_test" },
+    },
+  });
+}
+
+it("should transform user-friendly value to internal value in equality comparison", () => {
+    const ctx = createValueMapContext();
+    const { sql, params } = printQuery("SELECT * FROM runs WHERE status = 'Completed'", ctx);
+
+    // The user-friendly value "Completed" should be transformed to "COMPLETED_SUCCESSFULLY"
+    expect(Object.values(params)).toContain("COMPLETED_SUCCESSFULLY");
+    expect(Object.values(params)).not.toContain("Completed");
+  });
+
+  it("should transform user-friendly values in IN clause", () => {
+    const ctx = createValueMapContext();
+    const { sql, params } = printQuery(
+      "SELECT * FROM runs WHERE status IN ('Completed', 'Failed', 'Running')",
+      ctx
+    );
+
+    // All user-friendly values should be transformed
+    expect(Object.values(params)).toContain("COMPLETED_SUCCESSFULLY");
+    expect(Object.values(params)).toContain("FAILED");
+    expect(Object.values(params)).toContain("EXECUTING");
+    expect(Object.values(params)).not.toContain("Completed");
+    expect(Object.values(params)).not.toContain("Failed");
+    expect(Object.values(params)).not.toContain("Running");
+  });
+
+  it("should handle case-insensitive value matching", () => {
+    const ctx = createValueMapContext();
+    const { params: params1 } = printQuery("SELECT * FROM runs WHERE status = 'completed'", ctx);
+    const { params: params2 } = printQuery("SELECT * FROM runs WHERE status = 'COMPLETED'", ctx);
+    const { params: params3 } = printQuery("SELECT * FROM runs WHERE status = 'Completed'", ctx);
+
+    // All variations should map to the same internal value
+    expect(Object.values(params1)).toContain("COMPLETED_SUCCESSFULLY");
+    expect(Object.values(params2)).toContain("COMPLETED_SUCCESSFULLY");
+    expect(Object.values(params3)).toContain("COMPLETED_SUCCESSFULLY");
+  });
+
+  it("should pass through values without mapping if not in valueMap", () => {
+    const ctx = createValueMapContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE status = 'UNKNOWN_STATUS'", ctx);
+
+    // Value not in valueMap should pass through unchanged
+    expect(Object.values(params)).toContain("UNKNOWN_STATUS");
+  });
+
+  it("should transform values in NOT IN clause", () => {
+    const ctx = createValueMapContext();
+    const { sql, params } = printQuery(
+      "SELECT * FROM runs WHERE status NOT IN ('Pending', 'System failure')",
+      ctx
+    );
+
+    expect(Object.values(params)).toContain("PENDING");
+    expect(Object.values(params)).toContain("SYSTEM_FAILURE");
+  });
+
+  it("should transform values in != comparison", () => {
+    const ctx = createValueMapContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE status != 'Failed'", ctx);
+
+    expect(Object.values(params)).toContain("FAILED");
+  });
+
+  it("should not transform values for columns without valueMap", () => {
+    const ctx = createValueMapContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE id = 'Completed'", ctx);
+
+    // 'id' column has no valueMap, so "Completed" should pass through unchanged
+    expect(Object.values(params)).toContain("Completed");
+  });
+});
+
+describe("WHERE transform (whereTransform)", () => {
+  /**
+   * Schema with whereTransform for batch_id column (strips prefix)
+   */
+  const prefixedIdSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      id: { name: "id", ...column("String") },
+      batch_id: {
+        name: "batch_id",
+        ...column("String"),
+        // Transform strips the "batch_" prefix from user input
+        whereTransform: (value: string) => value.replace(/^batch_/, ""),
+        // Expression adds the prefix back in SELECT
+        expression: "if(batch_id = '', NULL, concat('batch_', batch_id))",
+      },
+      schedule_id: {
+        name: "schedule_id",
+        ...column("String"),
+        // Transform strips the "sched_" prefix
+        whereTransform: (value: string) => value.replace(/^sched_/, ""),
+      },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  function createPrefixedContext() {
+    const schema = createSchemaRegistry([prefixedIdSchema]);
+  return createPrinterContext({
+    schema,
+    enforcedWhereClause: {
+      organization_id: { op: "eq", value: "org_test123" },
+      project_id: { op: "eq", value: "proj_test456" },
+      environment_id: { op: "eq", value: "env_test789" },
+    },
+  });
+}
+
+it("should strip prefix from value in equality comparison", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE batch_id = 'batch_abc123'", ctx);
+
+    // The "batch_" prefix should be stripped, leaving just "abc123"
+    expect(Object.values(params)).toContain("abc123");
+    expect(Object.values(params)).not.toContain("batch_abc123");
+  });
+
+  it("should strip prefix from values in IN clause", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery(
+      "SELECT * FROM runs WHERE batch_id IN ('batch_abc', 'batch_def', 'batch_ghi')",
+      ctx
+    );
+
+    // All prefixes should be stripped
+    expect(Object.values(params)).toContain("abc");
+    expect(Object.values(params)).toContain("def");
+    expect(Object.values(params)).toContain("ghi");
+    expect(Object.values(params)).not.toContain("batch_abc");
+  });
+
+  it("should strip prefix from value in NOT IN clause", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE batch_id NOT IN ('batch_xyz')", ctx);
+
+    expect(Object.values(params)).toContain("xyz");
+    expect(Object.values(params)).not.toContain("batch_xyz");
+  });
+
+  it("should strip prefix from value in != comparison", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE batch_id != 'batch_test'", ctx);
+
+    expect(Object.values(params)).toContain("test");
+    expect(Object.values(params)).not.toContain("batch_test");
+  });
+
+  it("should handle values without the prefix (pass through unchanged)", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE batch_id = 'raw_value'", ctx);
+
+    // If no prefix to strip, the value passes through unchanged
+    expect(Object.values(params)).toContain("raw_value");
+  });
+
+  it("should not transform values for columns without whereTransform", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE id = 'batch_abc123'", ctx);
+
+    // 'id' column has no whereTransform, so value passes through unchanged
+    expect(Object.values(params)).toContain("batch_abc123");
+  });
+
+  it("should use expression for SELECT output (virtual column)", () => {
+    const ctx = createPrefixedContext();
+    const { sql } = printQuery("SELECT batch_id FROM runs", ctx);
+
+    // The expression should be used in SELECT
+    expect(sql).toContain("if(batch_id = '', NULL, concat('batch_', batch_id))");
+  });
+
+  it("should use raw column in WHERE but expression in SELECT", () => {
+    const ctx = createPrefixedContext();
+    const { sql, params } = printQuery(
+      "SELECT batch_id FROM runs WHERE batch_id = 'batch_abc123'",
+      ctx
+    );
+
+    // SELECT should use the expression (adds prefix)
+    expect(sql).toContain("if(batch_id = '', NULL, concat('batch_', batch_id))");
+
+    // WHERE should use table-qualified raw column (not the expression), and value should be stripped
+    // The WHERE clause should compare `runs.batch_id` directly (table-qualified to avoid alias conflict)
+    expect(sql).toMatch(/WHERE.*equals\(`?runs`?\.`?batch_id`?,/);
+    expect(sql).not.toMatch(/WHERE.*concat\('batch_'/);
+
+    // The value should have prefix stripped
+    expect(Object.values(params)).toContain("abc123");
+  });
+
+  it("should work with different prefix patterns", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery("SELECT * FROM runs WHERE schedule_id = 'sched_xyz789'", ctx);
+
+    // The "sched_" prefix should be stripped
+    expect(Object.values(params)).toContain("xyz789");
+    expect(Object.values(params)).not.toContain("sched_xyz789");
+  });
+
+  it("should transform values in tuple/array for IN expressions", () => {
+    const ctx = createPrefixedContext();
+    const { params } = printQuery(
+      "SELECT * FROM runs WHERE batch_id IN ['batch_a', 'batch_b']",
+      ctx
+    );
+
+    // Both prefixes should be stripped
+    expect(Object.values(params)).toContain("a");
+    expect(Object.values(params)).toContain("b");
+  });
+
+  it("should use raw column in GROUP BY for columns with whereTransform", () => {
+    const ctx = createPrefixedContext();
+    const { sql } = printQuery(
+      "SELECT batch_id, COUNT() as count FROM runs GROUP BY batch_id",
+      ctx
+    );
+
+    // SELECT should use the expression (adds prefix)
+    expect(sql).toContain("if(batch_id = '', NULL, concat('batch_', batch_id))");
+
+    // GROUP BY should use table-qualified raw column (not the expression)
+    // This avoids the "not in GROUP BY keys" error from ClickHouse
+    expect(sql).toMatch(/GROUP BY.*`?runs`?\.`?batch_id`?/);
+    expect(sql).not.toMatch(/GROUP BY.*concat\('batch_'/);
+  });
+
+  it("should work with GROUP BY and WHERE together", () => {
+    const ctx = createPrefixedContext();
+    const { sql, params } = printQuery(
+      "SELECT batch_id, COUNT() as count FROM runs WHERE batch_id != NULL GROUP BY batch_id",
+      ctx
+    );
+
+    // SELECT should use expression
+    expect(sql).toContain("if(batch_id = '', NULL, concat('batch_', batch_id))");
+
+    // Both WHERE and GROUP BY should use raw column
+    expect(sql).toMatch(/WHERE.*`?runs`?\.`?batch_id`?/);
+    expect(sql).toMatch(/GROUP BY.*`?runs`?\.`?batch_id`?/);
+  });
+});
+
+describe("Edge cases", () => {
+  it("should handle empty string values", () => {
+    const { sql, params } = printQuery("SELECT * FROM task_runs WHERE status = ''");
+
+    expect(Object.values(params)).toContain("");
+  });
+
+  it("should handle special characters in strings", () => {
+    const { sql, params } = printQuery("SELECT * FROM task_runs WHERE status = 'test\nvalue'");
+
+    // The string value should be parameterized
+    expect(Object.keys(params).length).toBeGreaterThan(0);
+  });
+
+  it("should handle large numbers", () => {
+    // Use a number that JavaScript can safely represent
+    const { sql } = printQuery("SELECT * FROM task_runs WHERE duration_ms > 1000000000000");
+
+    expect(sql).toContain("1000000000000");
+  });
+
+  it("should handle negative numbers", () => {
+    const { sql } = printQuery("SELECT * FROM task_runs WHERE duration_ms > -1000");
+
+    // Negative numbers might be expressed as subtraction or negate
+    expect(sql).toMatch(/-1000|minus|negate/);
+  });
+
+  it("should handle floating point numbers", () => {
+    const { sql } = printQuery("SELECT * FROM task_runs WHERE duration_ms > 1.5");
+
+    expect(sql).toContain("1.5");
+  });
+});
+
+describe("Virtual columns", () => {
+  /**
+   * Schema with virtual (computed) columns
+   */
+  const virtualColumnSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      started_at: { name: "started_at", ...column("Nullable(DateTime64)") },
+      completed_at: { name: "completed_at", ...column("Nullable(DateTime64)") },
+      usage_duration_ms: { name: "usage_duration_ms", ...column("UInt32") },
+      // Virtual column: execution_duration computes the time between started_at and completed_at
+      execution_duration: {
+        name: "execution_duration",
+        ...column("Nullable(Int64)"),
+        expression: "dateDiff('millisecond', started_at, completed_at)",
+        description: "Time between started_at and completed_at in milliseconds",
+      },
+      // Virtual column: is_long_running checks if execution took more than 60 seconds
+      is_long_running: {
+        name: "is_long_running",
+        ...column("UInt8"),
+        expression:
+          "if(completed_at IS NOT NULL AND started_at IS NOT NULL, dateDiff('second', started_at, completed_at) > 60, 0)",
+      },
+      // Virtual column with simple arithmetic
+      usage_duration_seconds: {
+        name: "usage_duration_seconds",
+        ...column("Float64"),
+        expression: "usage_duration_ms / 1000.0",
+      },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  function createVirtualColumnContext() {
+    const schema = createSchemaRegistry([virtualColumnSchema]);
+  return createPrinterContext({
+    schema,
+    enforcedWhereClause: {
+      organization_id: { op: "eq", value: "org_test" },
+      project_id: { op: "eq", value: "proj_test" },
+      environment_id: { op: "eq", value: "env_test" },
+    },
+  });
+}
+
+describe("SELECT clause", () => {
+  it("should expand bare virtual column to expression with alias", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT execution_duration FROM runs", ctx);
+
+      // Virtual column should be expanded to its expression with AS alias
+      expect(sql).toContain("(dateDiff('millisecond', started_at, completed_at))");
+      expect(sql).toContain("AS execution_duration");
+    });
+
+    it("should expand virtual column with explicit alias", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT execution_duration AS dur FROM runs", ctx);
+
+      // Virtual column should use the user-provided alias
+      expect(sql).toContain("(dateDiff('millisecond', started_at, completed_at))");
+      expect(sql).toContain("AS dur");
+      expect(sql).not.toContain("AS execution_duration");
+    });
+
+    it("should expand qualified virtual column reference", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT runs.execution_duration FROM runs", ctx);
+
+      // Qualified reference should also expand
+      expect(sql).toContain("(dateDiff('millisecond', started_at, completed_at))");
+      expect(sql).toContain("AS execution_duration");
+    });
+
+    it("should handle multiple virtual columns in SELECT", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery(
+        "SELECT run_id, execution_duration, is_long_running FROM runs",
+        ctx
+      );
+
+      expect(sql).toContain("run_id");
+      expect(sql).toContain("(dateDiff('millisecond', started_at, completed_at))");
+      expect(sql).toContain("AS execution_duration");
+      expect(sql).toContain(
+        "(if(completed_at IS NOT NULL AND started_at IS NOT NULL, dateDiff('second', started_at, completed_at) > 60, 0))"
+      );
+      expect(sql).toContain("AS is_long_running");
+    });
+
+    it("should mix regular and virtual columns correctly", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery(
+        "SELECT run_id, status, execution_duration, started_at FROM runs",
+        ctx
+      );
+
+      // Regular columns should be normal
+      expect(sql).toMatch(/\brun_id\b/);
+      expect(sql).toMatch(/\bstatus\b/);
+      expect(sql).toMatch(/\bstarted_at\b/);
+      // Virtual column should be expanded
+      expect(sql).toContain(
+        "(dateDiff('millisecond', started_at, completed_at)) AS execution_duration"
+      );
+    });
+  });
+
+  describe("WHERE clause", () => {
+    it("should expand virtual column in WHERE equality", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE execution_duration > 1000", ctx);
+
+      // Virtual column in WHERE should expand without AS
+      expect(sql).toContain("greater((dateDiff('millisecond', started_at, completed_at)), 1000)");
+    });
+
+    it("should expand virtual column in WHERE with comparison operators", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE execution_duration >= 5000", ctx);
+
+      expect(sql).toContain(
+        "greaterOrEquals((dateDiff('millisecond', started_at, completed_at)), 5000)"
+      );
+    });
+
+    it("should expand virtual column in WHERE with multiple conditions", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery(
+        "SELECT * FROM runs WHERE execution_duration > 1000 AND is_long_running = 1",
+        ctx
+      );
+
+      expect(sql).toContain("(dateDiff('millisecond', started_at, completed_at))");
+      expect(sql).toContain(
+        "(if(completed_at IS NOT NULL AND started_at IS NOT NULL, dateDiff('second', started_at, completed_at) > 60, 0))"
+      );
+    });
+
+    it("should expand qualified virtual column in WHERE", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE runs.execution_duration > 1000", ctx);
+
+      expect(sql).toContain("greater((dateDiff('millisecond', started_at, completed_at)), 1000)");
+    });
+  });
+
+  describe("ORDER BY clause", () => {
+    it("should expand virtual column in ORDER BY", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT * FROM runs ORDER BY execution_duration DESC", ctx);
+
+      expect(sql).toContain("ORDER BY (dateDiff('millisecond', started_at, completed_at)) DESC");
+    });
+
+    it("should expand virtual column in ORDER BY with multiple columns", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery(
+        "SELECT * FROM runs ORDER BY status ASC, execution_duration DESC",
+        ctx
+      );
+
+      expect(sql).toContain("status ASC");
+      expect(sql).toContain("(dateDiff('millisecond', started_at, completed_at)) DESC");
+    });
+  });
+
+  describe("GROUP BY clause", () => {
+    it("should use alias for virtual column in GROUP BY", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery(
+        "SELECT is_long_running, count(*) FROM runs GROUP BY is_long_running",
+        ctx
+      );
+
+      // SELECT should have the expression with alias
+      expect(sql).toContain(
+        "(if(completed_at IS NOT NULL AND started_at IS NOT NULL, dateDiff('second', started_at, completed_at) > 60, 0)) AS is_long_running"
+      );
+      // GROUP BY should use the alias, not the expression (ClickHouse allows this)
+      expect(sql).toContain("GROUP BY is_long_running");
+      // Should NOT have the expression in GROUP BY
+      expect(sql).not.toContain("GROUP BY (if(completed_at IS NOT NULL AND started_at IS NOT NULL");
+    });
+
+    it("should use alias for virtual column in GROUP BY with WHERE and aggregation", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery(
+        "SELECT execution_duration, count() AS duration_count FROM runs WHERE execution_duration IS NOT NULL GROUP BY execution_duration ORDER BY duration_count DESC LIMIT 100",
+        ctx
+      );
+
+      // SELECT should have the expression with alias
+      expect(sql).toContain(
+        "(dateDiff('millisecond', started_at, completed_at)) AS execution_duration"
+      );
+      // GROUP BY should use the alias, not the expression
+      expect(sql).toContain("GROUP BY execution_duration");
+      // Should NOT have the expression in GROUP BY
+      expect(sql).not.toContain("GROUP BY (dateDiff('millisecond'");
+      // WHERE should still use the expression
+      expect(sql).toContain("isNotNull((dateDiff('millisecond', started_at, completed_at)))");
+    });
+  });
+
+  describe("Complex expressions", () => {
+    it("should handle arithmetic virtual columns", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT usage_duration_seconds FROM runs", ctx);
+
+      expect(sql).toContain("(usage_duration_ms / 1000.0)");
+      expect(sql).toContain("AS usage_duration_seconds");
+    });
+
+    it("should handle virtual column in arithmetic expression", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT execution_duration / 1000 AS dur_seconds FROM runs", ctx);
+
+      // The virtual column expression should be wrapped in the arithmetic
+      expect(sql).toContain("divide((dateDiff('millisecond', started_at, completed_at)), 1000)");
+      expect(sql).toContain("AS dur_seconds");
+    });
+  });
+
+  describe("Regular columns unchanged", () => {
+    it("should not affect regular columns without expression", () => {
+      const ctx = createVirtualColumnContext();
+      const { sql } = printQuery("SELECT run_id, status, started_at FROM runs", ctx);
+
+      // Regular columns should appear as-is
+      expect(sql).toContain("run_id, status, started_at");
+      // No extra parentheses or AS for regular columns in basic SELECT
+      expect(sql).not.toMatch(/\(run_id\)/);
+      expect(sql).not.toMatch(/\(status\)/);
+    });
+  });
+});
+
+describe("Expression columns with division (cost/invocation_cost pattern)", () => {
+  /**
+   * Schema mimicking the real runsSchema with cost-based expression columns
+   * These use division expressions like base_cost_in_cents / 100.0
+   */
+  const costExpressionSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      cost_in_cents: { name: "cost_in_cents", ...column("Float64") },
+      base_cost_in_cents: { name: "base_cost_in_cents", ...column("Float64") },
+      // Virtual column: compute_cost = cost_in_cents / 100.0
+      compute_cost: {
+        name: "compute_cost",
+        ...column("Float64"),
+        expression: "cost_in_cents / 100.0",
+        description: "Compute cost in dollars",
+      },
+      // Virtual column: invocation_cost = base_cost_in_cents / 100.0
+      invocation_cost: {
+        name: "invocation_cost",
+        ...column("Float64"),
+        expression: "base_cost_in_cents / 100.0",
+        description: "Invocation cost in dollars",
+      },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  function createCostExpressionContext() {
+    const schema = createSchemaRegistry([costExpressionSchema]);
+  return createPrinterContext({
+    schema,
+    enforcedWhereClause: {
+      organization_id: { op: "eq", value: "org_test" },
+      project_id: { op: "eq", value: "proj_test" },
+      environment_id: { op: "eq", value: "env_test" },
+    },
+  });
+}
+
+describe("WHERE clause with division expression columns", () => {
+  it("should expand invocation_cost > 100 to (base_cost_in_cents / 100.0) > 100", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE invocation_cost > 100", ctx);
+
+      // Virtual column should be expanded to its expression in the comparison
+      expect(sql).toContain("greater((base_cost_in_cents / 100.0), 100)");
+    });
+
+    it("should expand invocation_cost >= 0.01 correctly", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE invocation_cost >= 0.01", ctx);
+
+      expect(sql).toContain("greaterOrEquals((base_cost_in_cents / 100.0), 0.01)");
+    });
+
+    it("should expand invocation_cost < 1.5 correctly", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE invocation_cost < 1.5", ctx);
+
+      expect(sql).toContain("less((base_cost_in_cents / 100.0), 1.5)");
+    });
+
+    it("should expand invocation_cost = 0 correctly", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE invocation_cost = 0", ctx);
+
+      expect(sql).toContain("equals((base_cost_in_cents / 100.0), 0)");
+    });
+
+    it("should expand compute_cost in BETWEEN correctly", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs WHERE compute_cost BETWEEN 1.0 AND 10.0", ctx);
+
+      expect(sql).toContain("(cost_in_cents / 100.0) BETWEEN 1 AND 10");
+    });
+
+    it("should handle multiple expression columns in WHERE with AND", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery(
+        "SELECT * FROM runs WHERE invocation_cost > 0.5 AND compute_cost < 5.0",
+        ctx
+      );
+
+      expect(sql).toContain("greater((base_cost_in_cents / 100.0), 0.5)");
+      expect(sql).toContain("less((cost_in_cents / 100.0), 5)");
+    });
+
+    it("should handle expression column with OR condition", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery(
+        "SELECT * FROM runs WHERE invocation_cost > 10 OR status = 'COMPLETED'",
+        ctx
+      );
+
+      expect(sql).toContain("or(");
+      expect(sql).toContain("greater((base_cost_in_cents / 100.0), 10)");
+    });
+  });
+
+  describe("SELECT clause with division expression columns", () => {
+    it("should expand invocation_cost in SELECT with alias", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT run_id, invocation_cost FROM runs", ctx);
+
+      expect(sql).toContain("(base_cost_in_cents / 100.0) AS invocation_cost");
+    });
+
+    it("should expand both cost columns correctly", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT compute_cost, invocation_cost FROM runs", ctx);
+
+      expect(sql).toContain("(cost_in_cents / 100.0) AS compute_cost");
+      expect(sql).toContain("(base_cost_in_cents / 100.0) AS invocation_cost");
+    });
+  });
+
+  describe("ORDER BY clause with division expression columns", () => {
+    it("should expand invocation_cost in ORDER BY DESC", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs ORDER BY invocation_cost DESC", ctx);
+
+      expect(sql).toContain("ORDER BY (base_cost_in_cents / 100.0) DESC");
+    });
+
+    it("should expand compute_cost in ORDER BY ASC", () => {
+      const ctx = createCostExpressionContext();
+      const { sql } = printQuery("SELECT * FROM runs ORDER BY compute_cost ASC", ctx);
+
+      expect(sql).toContain("ORDER BY (cost_in_cents / 100.0) ASC");
+    });
+  });
+});
+
+describe("Column metadata", () => {
+  /**
+   * Schema with customRenderType for testing
+   */
+  const schemaWithRenderTypes: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      friendly_id: { name: "friendly_id", ...column("String") },
+      status: {
+        name: "status",
+        ...column("LowCardinality(String)"),
+        customRenderType: "runStatus",
+      },
+      created_at: { name: "created_at", ...column("DateTime64") },
+      started_at: { name: "started_at", ...column("Nullable(DateTime64)") },
+      completed_at: { name: "completed_at", ...column("Nullable(DateTime64)") },
+      usage_duration_ms: {
+        name: "usage_duration_ms",
+        ...column("UInt32"),
+        customRenderType: "duration",
+      },
+      cost_in_cents: {
+        name: "cost_in_cents",
+        ...column("Float64"),
+        customRenderType: "cost",
+      },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+      is_test: { name: "is_test", ...column("UInt8") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  function createMetadataTestContext() {
+    const schema = createSchemaRegistry([schemaWithRenderTypes]);
+  return createPrinterContext({
+    schema,
+    enforcedWhereClause: {
+      organization_id: { op: "eq", value: "org_test" },
+      project_id: { op: "eq", value: "proj_test" },
+      environment_id: { op: "eq", value: "env_test" },
+    },
+  });
+}
+
+describe("Basic column metadata", () => {
+  it("should return column metadata for simple field references", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT run_id, created_at FROM runs", ctx);
+
+      expect(columns).toHaveLength(2);
+      expect(columns[0]).toEqual({
+        name: "run_id",
+        type: "String",
+      });
+      expect(columns[1]).toEqual({
+        name: "created_at",
+        type: "DateTime64",
+      });
+    });
+
+    it("should include customRenderType when defined in schema", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT status, usage_duration_ms, cost_in_cents FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(3);
+      expect(columns[0]).toEqual({
+        name: "status",
+        type: "LowCardinality(String)",
+        customRenderType: "runStatus",
+        format: "runStatus",
+      });
+      expect(columns[1]).toEqual({
+        name: "usage_duration_ms",
+        type: "UInt32",
+        customRenderType: "duration",
+        format: "duration",
+      });
+      expect(columns[2]).toEqual({
+        name: "cost_in_cents",
+        type: "Float64",
+        customRenderType: "cost",
+        format: "cost",
+      });
+    });
+
+    it("should use alias as output name when AS is used", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT run_id AS id, status AS run_status FROM runs", ctx);
+
+      expect(columns).toHaveLength(2);
+      expect(columns[0].name).toBe("id");
+      expect(columns[0].type).toBe("String");
+      expect(columns[1].name).toBe("run_status");
+      expect(columns[1].type).toBe("LowCardinality(String)");
+      expect(columns[1].customRenderType).toBe("runStatus");
+    });
+  });
+
+  describe("Type inference for aggregations", () => {
+    it("should infer UInt64 for COUNT", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT COUNT(*) AS total FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("total");
+      expect(columns[0].type).toBe("UInt64");
+    });
+
+    it("should infer UInt64 for COUNT with column", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT COUNT(run_id) AS run_count FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("run_count");
+      expect(columns[0].type).toBe("UInt64");
+    });
+
+    it("should infer Float64 for AVG", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT AVG(usage_duration_ms) AS avg_duration FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("avg_duration");
+      expect(columns[0].type).toBe("Float64");
+    });
+
+    it("should infer Int64 for SUM", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT SUM(usage_duration_ms) AS total_duration FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("total_duration");
+      expect(columns[0].type).toBe("Int64");
+    });
+
+    it("should preserve column type for MIN/MAX", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT MIN(created_at) AS first_run, MAX(created_at) AS last_run FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(2);
+      expect(columns[0].name).toBe("first_run");
+      expect(columns[0].type).toBe("DateTime64");
+      expect(columns[1].name).toBe("last_run");
+      expect(columns[1].type).toBe("DateTime64");
+    });
+  });
+
+  describe("Type inference for computed expressions", () => {
+    it("should infer Int64 for dateDiff", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT dateDiff('millisecond', started_at, completed_at) AS duration FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("duration");
+      expect(columns[0].type).toBe("Int64");
+    });
+
+    it("should infer Float64 for division", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT usage_duration_ms / 1000 AS duration_seconds FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("duration_seconds");
+      expect(columns[0].type).toBe("Float64");
+    });
+
+    it("should infer Int64 for integer arithmetic", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT usage_duration_ms + 100 AS adjusted_duration FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("adjusted_duration");
+      // UInt32 + Int64 constant = Int64
+      expect(columns[0].type).toBe("Int64");
+    });
+
+    it("should infer String for string functions", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT concat(run_id, '-', status) AS combined FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("combined");
+      expect(columns[0].type).toBe("String");
+    });
+  });
+
+  describe("Mixed columns with and without customRenderType", () => {
+    it("should handle a mix of regular and custom-rendered columns", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT run_id, status, created_at, usage_duration_ms, cost_in_cents FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(5);
+
+      // run_id - no customRenderType
+      expect(columns[0].name).toBe("run_id");
+      expect(columns[0].type).toBe("String");
+      expect(columns[0].customRenderType).toBeUndefined();
+
+      // status - has customRenderType
+      expect(columns[1].name).toBe("status");
+      expect(columns[1].customRenderType).toBe("runStatus");
+
+      // created_at - no customRenderType
+      expect(columns[2].name).toBe("created_at");
+      expect(columns[2].type).toBe("DateTime64");
+      expect(columns[2].customRenderType).toBeUndefined();
+
+      // usage_duration_ms - has customRenderType
+      expect(columns[3].name).toBe("usage_duration_ms");
+      expect(columns[3].customRenderType).toBe("duration");
+
+      // cost_in_cents - has customRenderType
+      expect(columns[4].name).toBe("cost_in_cents");
+      expect(columns[4].customRenderType).toBe("cost");
+    });
+
+    it("should handle aggregations mixed with regular columns", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT status, COUNT(*) AS count, AVG(usage_duration_ms) AS avg_duration FROM runs GROUP BY status",
+        ctx
+      );
+
+      expect(columns).toHaveLength(3);
+
+      // status - from schema with customRenderType
+      expect(columns[0].name).toBe("status");
+      expect(columns[0].customRenderType).toBe("runStatus");
+
+      // count - aggregation inferred type, COUNT doesn't preserve customRenderType
+      expect(columns[1].name).toBe("count");
+      expect(columns[1].type).toBe("UInt64");
+      expect(columns[1].customRenderType).toBeUndefined();
+
+      // avg_duration - aggregation inferred type, AVG preserves customRenderType from source column
+      // (average duration is still a duration)
+      expect(columns[2].name).toBe("avg_duration");
+      expect(columns[2].type).toBe("Float64");
+      expect(columns[2].customRenderType).toBe("duration");
+    });
+
+    it("should propagate customRenderType for value-preserving aggregates (SUM, AVG, MIN, MAX)", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT SUM(usage_duration_ms) AS total_duration, AVG(cost_in_cents) AS avg_cost, MIN(usage_duration_ms) AS min_duration, MAX(cost_in_cents) AS max_cost FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(4);
+
+      // SUM preserves customRenderType
+      expect(columns[0].name).toBe("total_duration");
+      expect(columns[0].customRenderType).toBe("duration");
+
+      // AVG preserves customRenderType
+      expect(columns[1].name).toBe("avg_cost");
+      expect(columns[1].customRenderType).toBe("cost");
+
+      // MIN preserves customRenderType
+      expect(columns[2].name).toBe("min_duration");
+      expect(columns[2].customRenderType).toBe("duration");
+
+      // MAX preserves customRenderType
+      expect(columns[3].name).toBe("max_cost");
+      expect(columns[3].customRenderType).toBe("cost");
+    });
+
+    it("should NOT propagate customRenderType for COUNT aggregates", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT COUNT(*), COUNT(usage_duration_ms), COUNT(DISTINCT status) FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(3);
+
+      // COUNT(*) - no customRenderType
+      expect(columns[0].customRenderType).toBeUndefined();
+
+      // COUNT(duration_column) - still no customRenderType (it's a count, not a duration)
+      expect(columns[1].customRenderType).toBeUndefined();
+
+      // COUNT(DISTINCT ...) - no customRenderType
+      expect(columns[2].customRenderType).toBeUndefined();
+    });
+  });
+
+  describe("Implicit column names for expressions without aliases", () => {
+    it("should generate implicit name for COUNT()", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT COUNT() FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("count");
+      expect(columns[0].type).toBe("UInt64");
+    });
+
+    it("should generate implicit name for COUNT(*)", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT COUNT(*) FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("count");
+      expect(columns[0].type).toBe("UInt64");
+    });
+
+    it("should generate implicit name for COUNT with column argument", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT COUNT(run_id) FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("count");
+      expect(columns[0].type).toBe("UInt64");
+    });
+
+    it("should generate implicit name for SUM", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT SUM(usage_duration_ms) FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("sum");
+      expect(columns[0].type).toBe("Int64");
+    });
+
+    it("should generate implicit name for AVG", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT AVG(usage_duration_ms) FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("avg");
+      expect(columns[0].type).toBe("Float64");
+    });
+
+    it("should generate implicit names for multiple aggregations without aliases", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT COUNT(), status FROM runs GROUP BY status", ctx);
+
+      expect(columns).toHaveLength(2);
+      expect(columns[0].name).toBe("count");
+      expect(columns[0].type).toBe("UInt64");
+      expect(columns[1].name).toBe("status");
+      expect(columns[1].type).toBe("LowCardinality(String)");
+    });
+
+    it("should generate implicit name for arithmetic expressions", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT usage_duration_ms + 100 FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("plus");
+    });
+
+    it("should generate implicit name for constant values", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT 42, 'hello' FROM runs", ctx);
+
+      expect(columns).toHaveLength(2);
+      expect(columns[0].name).toBe("42");
+      expect(columns[1].name).toBe("'hello'");
+    });
+
+    it("should mix explicit aliases with implicit names", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT COUNT() AS total, AVG(usage_duration_ms), status AS run_status FROM runs GROUP BY status",
+        ctx
+      );
+
+      expect(columns).toHaveLength(3);
+      expect(columns[0].name).toBe("total");
+      expect(columns[1].name).toBe("avg");
+      expect(columns[2].name).toBe("run_status");
+    });
+
+    it("should add AS clause to generated SQL for implicit names", () => {
+      const ctx = createMetadataTestContext();
+      const { sql, columns } = printQuery("SELECT COUNT(), status FROM runs GROUP BY status", ctx);
+
+      // The SQL should include an explicit AS clause for the COUNT()
+      expect(sql).toContain("count() AS count");
+      expect(columns[0].name).toBe("count");
+    });
+
+    it("should add AS clause for multiple aggregations", () => {
+      const ctx = createMetadataTestContext();
+      const { sql, columns } = printQuery(
+        "SELECT COUNT(), SUM(usage_duration_ms), AVG(usage_duration_ms) FROM runs",
+        ctx
+      );
+
+      // All aggregations should have AS clauses
+      expect(sql).toContain("count() AS count");
+      expect(sql).toContain("sum(usage_duration_ms) AS sum");
+      expect(sql).toContain("avg(usage_duration_ms) AS avg");
+      expect(columns).toHaveLength(3);
+      expect(columns[0].name).toBe("count");
+      expect(columns[1].name).toBe("sum");
+      expect(columns[2].name).toBe("avg");
+    });
+  });
+
+  describe("prettyFormat()", () => {
+    it("should strip prettyFormat from SQL and attach format to column metadata", () => {
+      const ctx = createMetadataTestContext();
+      const { sql, columns } = printQuery(
+        "SELECT prettyFormat(usage_duration_ms, 'bytes') AS memory FROM runs",
+        ctx
+      );
+
+      // SQL should not contain prettyFormat
+      expect(sql).not.toContain("prettyFormat");
+      expect(sql).toContain("usage_duration_ms");
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("memory");
+      expect(columns[0].format).toBe("bytes");
+    });
+
+    it("should work with aggregation wrapping", () => {
+      const ctx = createMetadataTestContext();
+      const { sql, columns } = printQuery(
+        "SELECT prettyFormat(avg(usage_duration_ms), 'bytes') AS avg_memory FROM runs",
+        ctx
+      );
+
+      expect(sql).not.toContain("prettyFormat");
+      expect(sql).toContain("avg(usage_duration_ms)");
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("avg_memory");
+      expect(columns[0].format).toBe("bytes");
+      expect(columns[0].type).toBe("Float64");
+    });
+
+    it("should work without explicit alias", () => {
+      const ctx = createMetadataTestContext();
+      const { sql, columns } = printQuery(
+        "SELECT prettyFormat(usage_duration_ms, 'percent') FROM runs",
+        ctx
+      );
+
+      expect(sql).not.toContain("prettyFormat");
+      expect(columns).toHaveLength(1);
+      expect(columns[0].name).toBe("usage_duration_ms");
+      expect(columns[0].format).toBe("percent");
+    });
+
+    it("should throw for invalid format type", () => {
+      const ctx = createMetadataTestContext();
+      expect(() => {
+        printQuery(
+          "SELECT prettyFormat(usage_duration_ms, 'invalid') FROM runs",
+          ctx
+        );
+      }).toThrow(QueryError);
+      expect(() => {
+        printQuery(
+          "SELECT prettyFormat(usage_duration_ms, 'invalid') FROM runs",
+          ctx
+        );
+      }).toThrow(/Unknown format type/);
+    });
+
+    it("should throw for wrong argument count", () => {
+      const ctx = createMetadataTestContext();
+      expect(() => {
+        printQuery("SELECT prettyFormat(usage_duration_ms) FROM runs", ctx);
+      }).toThrow(QueryError);
+      expect(() => {
+        printQuery("SELECT prettyFormat(usage_duration_ms) FROM runs", ctx);
+      }).toThrow(/requires exactly 2 arguments/);
+    });
+
+    it("should throw when second argument is not a string literal", () => {
+      const ctx = createMetadataTestContext();
+      expect(() => {
+        printQuery(
+          "SELECT prettyFormat(usage_duration_ms, 123) FROM runs",
+          ctx
+        );
+      }).toThrow(QueryError);
+      expect(() => {
+        printQuery(
+          "SELECT prettyFormat(usage_duration_ms, 123) FROM runs",
+          ctx
+        );
+      }).toThrow(/must be a string literal/);
+    });
+
+    it("should override schema-level customRenderType", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT prettyFormat(usage_duration_ms, 'bytes') AS mem FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(1);
+      // prettyFormat's format should take precedence
+      expect(columns[0].format).toBe("bytes");
+      // customRenderType from schema should NOT be set since prettyFormat overrides
+      // The source column had customRenderType: "duration" but prettyFormat replaces it
+    });
+
+    it("should auto-populate format from customRenderType when not explicitly set", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery(
+        "SELECT usage_duration_ms, cost_in_cents FROM runs",
+        ctx
+      );
+
+      expect(columns).toHaveLength(2);
+      // customRenderType should auto-populate format
+      expect(columns[0].customRenderType).toBe("duration");
+      expect(columns[0].format).toBe("duration");
+      expect(columns[1].customRenderType).toBe("cost");
+      expect(columns[1].format).toBe("cost");
+    });
+
+    it("should not set format when column has no customRenderType", () => {
+      const ctx = createMetadataTestContext();
+      const { columns } = printQuery("SELECT run_id FROM runs", ctx);
+
+      expect(columns).toHaveLength(1);
+      expect(columns[0].format).toBeUndefined();
+      expect(columns[0].customRenderType).toBeUndefined();
+    });
+  });
+});
+
+describe("Unknown column blocking", () => {
+  /**
+   * These tests verify that unknown columns are blocked at compile time,
+   * preventing access to internal ClickHouse columns that aren't exposed in the schema.
+   */
+
+  describe("should block unknown columns in SELECT", () => {
+    it("should throw error for unknown column in SELECT list", () => {
+      expect(() => {
+        printQuery("SELECT id, unknown_column FROM task_runs");
+      }).toThrow(QueryError);
+      expect(() => {
+        printQuery("SELECT id, unknown_column FROM task_runs");
+      }).toThrow(/unknown.*column.*unknown_column/i);
+    });
+
+    it("should throw error for internal ClickHouse column name not in schema", () => {
+      // The schema exposes 'created' but the internal ClickHouse column is 'created_at'
+      // Using the internal name directly should be blocked
+      const schema = createSchemaRegistry([runsSchema]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test" },
+          project_id: { op: "eq", value: "proj_test" },
+          environment_id: { op: "eq", value: "env_test" },
+        },
+      });
+
+      // 'created_at' is not in runsSchema - only 'created' which maps to 'created_at'
+      expect(() => {
+        printQuery("SELECT id, created_at FROM runs", ctx);
+      }).toThrow(QueryError);
+    });
+
+    it("should suggest TSQL column name when user types ClickHouse column name", () => {
+      // The schema exposes 'created' but the internal ClickHouse column is 'created_at'
+      // When user types 'created_at', we should suggest 'created'
+      const schema = createSchemaRegistry([runsSchema]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test" },
+          project_id: { op: "eq", value: "proj_test" },
+          environment_id: { op: "eq", value: "env_test" },
+        },
+      });
+
+      expect(() => {
+        printQuery("SELECT id, created_at FROM runs", ctx);
+      }).toThrow(/Did you mean "created"/);
+    });
+
+    it("should throw error for unknown qualified column (table.column)", () => {
+      expect(() => {
+        printQuery("SELECT task_runs.unknown_column FROM task_runs");
+      }).toThrow(QueryError);
+    });
+  });
+
+  describe("should block unknown columns in WHERE", () => {
+    it("should throw error for unknown column in WHERE clause", () => {
+      expect(() => {
+        printQuery("SELECT id FROM task_runs WHERE unknown_column = 'test'");
+      }).toThrow(QueryError);
+    });
+
+    it("should throw error for unknown column in complex WHERE", () => {
+      expect(() => {
+        printQuery("SELECT id FROM task_runs WHERE status = 'completed' AND unknown_column > 10");
+      }).toThrow(QueryError);
+    });
+  });
+
+  describe("should block unknown columns in ORDER BY", () => {
+    it("should throw error for unknown column in ORDER BY", () => {
+      expect(() => {
+        printQuery("SELECT id, status FROM task_runs ORDER BY unknown_column DESC");
+      }).toThrow(QueryError);
+    });
+  });
+
+  describe("should block unknown columns in GROUP BY", () => {
+    it("should throw error for unknown column in GROUP BY", () => {
+      expect(() => {
+        printQuery("SELECT count(*) FROM task_runs GROUP BY unknown_column");
+      }).toThrow(QueryError);
+    });
+  });
+
+  describe("should allow SELECT aliases", () => {
+    it("should allow ORDER BY to reference aliased columns", () => {
+      // This should NOT throw - 'cnt' is a valid alias from SELECT
+      const { sql } = printQuery(
+        "SELECT status, count(*) AS cnt FROM task_runs GROUP BY status ORDER BY cnt DESC"
+      );
+      expect(sql).toContain("ORDER BY cnt DESC");
+    });
+
+    it("should allow HAVING to reference aliased columns", () => {
+      const { sql } = printQuery(
+        "SELECT status, count(*) AS cnt FROM task_runs GROUP BY status HAVING cnt > 10"
+      );
+      expect(sql).toContain("HAVING");
+    });
+
+    it("should allow ORDER BY to reference implicit aggregation names", () => {
+      // COUNT() without alias gets implicit name 'count'
+      const { sql } = printQuery(
+        "SELECT status, count() FROM task_runs GROUP BY status ORDER BY count DESC"
+      );
+      expect(sql).toContain("ORDER BY count DESC");
+    });
+  });
+
+  // Note: CTE support is limited - CTEs are not added to the table context,
+  // so CTE column references are treated as unknown. This is a pre-existing limitation.
+  // The tests below verify that unknown column blocking doesn't break existing behavior.
+
+  describe("should allow subquery alias references", () => {
+    it("should allow referencing columns from subquery in FROM clause", () => {
+      const { sql } = printQuery(`
+        SELECT sub.status_name, sub.total
+        FROM (
+          SELECT status AS status_name, count(*) AS total
+          FROM task_runs
+          GROUP BY status
+        ) AS sub
+        ORDER BY sub.total DESC
+      `);
+      expect(sql).toContain("status_name");
+      expect(sql).toContain("total");
+    });
+
+    it("should allow unqualified references to subquery columns", () => {
+      const { sql } = printQuery(`
+        SELECT status_name, total
+        FROM (
+          SELECT status AS status_name, count(*) AS total
+          FROM task_runs
+          GROUP BY status
+        )
+        WHERE total > 10
+      `);
+      expect(sql).toContain("status_name");
+      expect(sql).toContain("total");
+    });
+  });
+});
+
+describe("Field Mapping Value Transformation", () => {
+  // Test schema with a field mapping column
+  const fieldMappingSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      run_id: { name: "run_id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      project_ref: {
+        name: "project_ref",
+        clickhouseName: "project_id",
+        ...column("String"),
+        fieldMapping: "project",
+      },
+      environment_id: { name: "environment_id", ...column("String") },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  function createFieldMappingContext(): PrinterContext {
+    const schemaRegistry = createSchemaRegistry([fieldMappingSchema]);
+    return new PrinterContext(
+      schemaRegistry,
+      {},
+      {
+        project: {
+          proj_tenant1: "my-project-ref",
+          proj_other: "other-project",
+        },
+      },
+      {
+        organization_id: { op: "eq", value: "org_123" },
+        project_id: { op: "eq", value: "proj_456" },
+        environment_id: { op: "eq", value: "env_789" },
+      }
+    );
+  }
+
+  function printQuery(query: string, ctx: PrinterContext): PrintResult {
+    const ast = parseTSQLSelect(query);
+    const printer = new ClickHousePrinter(ctx);
+    return printer.print(ast);
+  }
+
+  it("should transform field mapping values in WHERE clause with equals", () => {
+    const ctx = createFieldMappingContext();
+    const { sql, params } = printQuery(
+      "SELECT run_id FROM runs WHERE project_ref = 'my-project-ref'",
+      ctx
+    );
+
+    // The value should be transformed to the internal value
+    expect(sql).toContain("project_id");
+    expect(Object.values(params)).toContain("proj_tenant1");
+    expect(Object.values(params)).not.toContain("my-project-ref");
+  });
+
+  it("should transform field mapping values in WHERE clause with IN list", () => {
+    const ctx = createFieldMappingContext();
+    const { sql, params } = printQuery(
+      "SELECT run_id FROM runs WHERE project_ref IN ('my-project-ref', 'other-project')",
+      ctx
+    );
+
+    expect(sql).toContain("project_id");
+    const paramValues = Object.values(params);
+    expect(paramValues).toContain("proj_tenant1");
+    expect(paramValues).toContain("proj_other");
+    expect(paramValues).not.toContain("my-project-ref");
+    expect(paramValues).not.toContain("other-project");
+  });
+
+  it("should be case-insensitive when transforming field mapping values", () => {
+    const ctx = createFieldMappingContext();
+    // Using uppercase version of the external value
+    const { params } = printQuery(
+      "SELECT run_id FROM runs WHERE project_ref = 'MY-PROJECT-REF'",
+      ctx
+    );
+
+    // Should still transform to the internal value
+    expect(Object.values(params)).toContain("proj_tenant1");
+  });
+
+  it("should pass through unmapped values unchanged", () => {
+    const ctx = createFieldMappingContext();
+    // Using a value that's not in the mapping
+    const { params } = printQuery("SELECT run_id FROM runs WHERE project_ref = 'unknown-ref'", ctx);
+
+    // Value should remain unchanged since it's not in the mapping
+    expect(Object.values(params)).toContain("unknown-ref");
+  });
+
+  it("should use clickhouseName when selecting field mapping column", () => {
+    const ctx = createFieldMappingContext();
+    const { sql } = printQuery("SELECT project_ref FROM runs", ctx);
+
+    // Should use the actual ClickHouse column name (project_id) in the SQL
+    expect(sql).toContain("project_id");
+    // But the column metadata should use the exposed name
+  });
+});
+
+describe("Internal-only column blocking", () => {
+  /**
+   * These tests verify that internal columns (tenant columns, required filter columns)
+   * that are NOT exposed in tableSchema.columns are blocked from user queries in
+   * SELECT, ORDER BY, GROUP BY, and HAVING clauses, but allowed in system-generated
+   * tenant isolation guards.
+   */
+
+  // Schema with hidden tenant columns (not exposed in public columns)
+  const hiddenTenantSchema: TableSchema = {
+    name: "hidden_tenant_runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      // Public columns - these are exposed to users
+      id: { name: "id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      task_identifier: { name: "task_identifier", ...column("String") },
+      created_at: { name: "created_at", ...column("DateTime64") },
+    },
+    // Tenant columns are NOT in the public columns above
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  // Schema with hidden required filter column
+  const hiddenFilterSchema: TableSchema = {
+    name: "hidden_filter_runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    columns: {
+      id: { name: "id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      created_at: { name: "created_at", ...column("DateTime64") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+    requiredFilters: [
+      { column: "engine", value: "V2" }, // 'engine' is not in public columns
+    ],
+  };
+
+  function createHiddenTenantContext(): PrinterContext {
+    const schema = createSchemaRegistry([hiddenTenantSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test" },
+        project_id: { op: "eq", value: "proj_test" },
+        environment_id: { op: "eq", value: "env_test" },
+      },
+    });
+  }
+
+  function createHiddenFilterContext(): PrinterContext {
+    const schema = createSchemaRegistry([hiddenFilterSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test" },
+        project_id: { op: "eq", value: "proj_test" },
+        environment_id: { op: "eq", value: "env_test" },
+      },
+    });
+  }
+
+  describe("should block internal-only columns in SELECT", () => {
+    it("should throw error when selecting hidden tenant column (organization_id)", () => {
+      const ctx = createHiddenTenantContext();
+      expect(() => {
+        printQuery("SELECT id, organization_id FROM hidden_tenant_runs", ctx);
+      }).toThrow(QueryError);
+      expect(() => {
+        printQuery("SELECT id, organization_id FROM hidden_tenant_runs", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+
+    it("should throw error when selecting hidden tenant column (project_id)", () => {
+      const ctx = createHiddenTenantContext();
+      expect(() => {
+        printQuery("SELECT project_id FROM hidden_tenant_runs", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+
+    it("should throw error when selecting hidden tenant column (environment_id)", () => {
+      const ctx = createHiddenTenantContext();
+      expect(() => {
+        printQuery("SELECT environment_id FROM hidden_tenant_runs", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+
+    it("should throw error when selecting hidden required filter column", () => {
+      const ctx = createHiddenFilterContext();
+      expect(() => {
+        printQuery("SELECT id, engine FROM hidden_filter_runs", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+  });
+
+  describe("should block internal-only columns in ORDER BY", () => {
+    it("should throw error when ordering by hidden tenant column", () => {
+      const ctx = createHiddenTenantContext();
+      expect(() => {
+        printQuery("SELECT id, status FROM hidden_tenant_runs ORDER BY organization_id", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+
+    it("should throw error when ordering by hidden required filter column", () => {
+      const ctx = createHiddenFilterContext();
+      expect(() => {
+        printQuery("SELECT id, status FROM hidden_filter_runs ORDER BY engine", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+  });
+
+  describe("should block internal-only columns in GROUP BY", () => {
+    it("should throw error when grouping by hidden tenant column", () => {
+      const ctx = createHiddenTenantContext();
+      expect(() => {
+        printQuery("SELECT count(*) FROM hidden_tenant_runs GROUP BY organization_id", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+
+    it("should throw error when grouping by hidden required filter column", () => {
+      const ctx = createHiddenFilterContext();
+      expect(() => {
+        printQuery("SELECT count(*) FROM hidden_filter_runs GROUP BY engine", ctx);
+      }).toThrow(/not available for querying/i);
+    });
+  });
+
+  describe("should block internal-only columns in HAVING", () => {
+    it("should throw error when using hidden column in HAVING", () => {
+      const ctx = createHiddenTenantContext();
+      expect(() => {
+        printQuery(
+          "SELECT status, count(*) as cnt FROM hidden_tenant_runs GROUP BY status HAVING organization_id = 'x'",
+          ctx
+        );
+      }).toThrow(/not available for querying/i);
+    });
+  });
+
+  describe("should allow tenant guard in WHERE clause", () => {
+    it("should successfully execute query with tenant isolation (hidden tenant columns work internally)", () => {
+      const ctx = createHiddenTenantContext();
+      // This should succeed - the tenant guard is injected internally and should work
+      const { sql } = printQuery("SELECT id, status FROM hidden_tenant_runs", ctx);
+
+      // Verify tenant guards are present in WHERE clause
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("project_id");
+      expect(sql).toContain("environment_id");
+      // But NOT in SELECT
+      expect(sql).toMatch(/SELECT\s+id,\s*status\s+FROM/i);
+    });
+
+    it("should successfully execute query with required filter (hidden filter columns work internally)", () => {
+      const ctx = createHiddenFilterContext();
+      const { sql, params } = printQuery("SELECT id, status FROM hidden_filter_runs", ctx);
+
+      // Verify required filter is present in WHERE clause
+      expect(sql).toContain("engine");
+      // The value V2 is parameterized, check that it's in the params
+      expect(Object.values(params)).toContain("V2");
+    });
+  });
+
+  describe("should allow exposed tenant columns", () => {
+    // In task_runs schema, tenant columns ARE exposed in the public columns
+    it("should allow selecting exposed tenant column", () => {
+      // task_runs schema exposes organization_id in its columns
+      const { sql } = printQuery("SELECT id, organization_id FROM task_runs");
+      expect(sql).toContain("SELECT id, organization_id");
+    });
+
+    it("should allow ordering by exposed tenant column", () => {
+      const { sql } = printQuery("SELECT id, status FROM task_runs ORDER BY organization_id");
+      expect(sql).toContain("ORDER BY organization_id");
+    });
+
+    it("should allow grouping by exposed tenant column", () => {
+      const { sql } = printQuery("SELECT organization_id, count(*) FROM task_runs GROUP BY organization_id");
+      expect(sql).toContain("GROUP BY organization_id");
+    });
+  });
+});
+
+describe("Required Filters", () => {
+  /**
+   * Tests for tables with requiredFilters, which inject internal ClickHouse
+   * column conditions (like engine = 'V2') that aren't exposed in the schema.
+   */
+
+  const schemaWithRequiredFilters: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    description: "Task runs table with required filters",
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+    requiredFilters: [{ column: "engine", value: "V2" }],
+    columns: {
+      run_id: {
+        name: "run_id",
+        clickhouseName: "friendly_id",
+        ...column("String", { description: "Run ID", coreColumn: true }),
+      },
+      status: {
+        name: "status",
+        ...column("String", { description: "Status" }),
+      },
+      triggered_at: {
+        name: "triggered_at",
+        clickhouseName: "created_at",
+        ...column("DateTime64", { description: "When the run was triggered", coreColumn: true }),
+      },
+      total_cost: {
+        name: "total_cost",
+        ...column("Float64", { description: "Total cost" }),
+        expression: "(cost_in_cents + base_cost_in_cents) / 100.0",
+      },
+    },
+  };
+
+  function createRequiredFiltersContext(): PrinterContext {
+    const schemaRegistry = createSchemaRegistry([schemaWithRequiredFilters]);
+    return createPrinterContext({
+      schema: schemaRegistry,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test123" },
+        project_id: { op: "eq", value: "proj_test456" },
+        environment_id: { op: "eq", value: "env_test789" },
+      },
+    });
+  }
+
+  function printQueryWithFilters(query: string): PrintResult {
+    const ctx = createRequiredFiltersContext();
+    const ast = parseTSQLSelect(query);
+    const printer = new ClickHousePrinter(ctx);
+    return printer.print(ast);
+  }
+
+  it("should NOT throw for internal engine column from requiredFilters", () => {
+    // This query should work even though 'engine' is not in the schema
+    // because it's automatically injected by requiredFilters
+    const { sql, params } = printQueryWithFilters("SELECT run_id, status FROM runs LIMIT 10");
+
+    // The engine filter should be in the WHERE clause
+    expect(sql).toContain("engine");
+    // The V2 value is parameterized, so check the params
+    expect(Object.values(params)).toContain("V2");
+  });
+
+  it("should allow TSQL column names that map to different ClickHouse names", () => {
+    // User writes 'triggered_at' but it maps to 'created_at' in ClickHouse
+    const { sql } = printQueryWithFilters(`
+      SELECT run_id, status, triggered_at
+      FROM runs
+      WHERE triggered_at > now() - INTERVAL 14 DAY
+      ORDER BY triggered_at DESC
+      LIMIT 100
+    `);
+
+    // The ClickHouse SQL should use 'created_at' instead of 'triggered_at'
+    expect(sql).toContain("created_at");
+    // The result should still have the alias for the user-friendly name
+    expect(sql).toContain("AS triggered_at");
+  });
+
+  it("should allow filtering by mapped column name", () => {
+    const { sql } = printQueryWithFilters(`
+      SELECT run_id FROM runs WHERE triggered_at > '2024-01-01' LIMIT 10
+    `);
+
+    // Should use the ClickHouse column name in the WHERE clause
+    expect(sql).toContain("created_at");
+  });
+
+  it("should allow ORDER BY on mapped column name", () => {
+    const { sql } = printQueryWithFilters(`
+      SELECT run_id FROM runs ORDER BY triggered_at DESC LIMIT 10
+    `);
+
+    // ORDER BY should use the ClickHouse column name
+    expect(sql).toContain("ORDER BY");
+    expect(sql).toContain("created_at");
+  });
+
+  it("should handle virtual columns with expressions", () => {
+    const { sql } = printQueryWithFilters(`
+      SELECT run_id, total_cost FROM runs ORDER BY total_cost DESC LIMIT 10
+    `);
+
+    // Virtual column should be expanded to its expression with an alias
+    expect(sql).toContain("cost_in_cents");
+    expect(sql).toContain("base_cost_in_cents");
+    expect(sql).toContain("AS total_cost");
+  });
+
+  it("should combine tenant guards with required filters", () => {
+    const { sql, params } = printQueryWithFilters("SELECT run_id FROM runs LIMIT 10");
+
+    // Should have all tenant columns AND the engine filter
+    expect(sql).toContain("organization_id");
+    expect(sql).toContain("project_id");
+    expect(sql).toContain("environment_id");
+    expect(sql).toContain("engine");
+    // The V2 value is parameterized, so check the params
+    expect(Object.values(params)).toContain("V2");
+  });
+
+  it("should allow complex queries with mapped columns", () => {
+    // This query is similar to what a user might write
+    const { sql } = printQueryWithFilters(`
+      SELECT
+        run_id,
+        status,
+        total_cost,
+        triggered_at
+      FROM runs
+      WHERE triggered_at > now() - INTERVAL 14 DAY
+      ORDER BY total_cost DESC
+      LIMIT 100
+    `);
+
+    // All should work without errors
+    expect(sql).toContain("friendly_id");  // run_id maps to friendly_id
+    expect(sql).toContain("status");
+    expect(sql).toContain("created_at");   // triggered_at maps to created_at
+    expect(sql).toContain("cost_in_cents"); // total_cost is a virtual column
+  });
+});
+
+// ============================================================
+// timeBucket() Tests
+// ============================================================
+
+describe("timeBucket()", () => {
+  /**
+   * Schema with timeConstraint for timeBucket() tests.
+   * Uses column mapping: TSQL "triggered_at" → ClickHouse "created_at"
+   */
+  const timeBucketSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    timeConstraint: "triggered_at",
+    columns: {
+      id: { name: "id", ...column("String") },
+      status: { name: "status", ...column("String") },
+      triggered_at: {
+        name: "triggered_at",
+        clickhouseName: "created_at",
+        ...column("DateTime64"),
+      },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  /**
+   * Schema without timeConstraint (for error tests)
+   */
+  const noTimeConstraintSchema: TableSchema = {
+    name: "events",
+    clickhouseName: "trigger_dev.events_v1",
+    columns: {
+      id: { name: "id", ...column("String") },
+      event_type: { name: "event_type", ...column("String") },
+      organization_id: { name: "organization_id", ...column("String") },
+      project_id: { name: "project_id", ...column("String") },
+      environment_id: { name: "environment_id", ...column("String") },
+    },
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+
+  /** 7-day time range: should produce 6 HOUR buckets */
+  const sevenDayRange = {
+    from: new Date("2024-01-01T00:00:00Z"),
+    to: new Date("2024-01-08T00:00:00Z"),
+  };
+
+  /** 1-hour time range: should produce 1 MINUTE buckets */
+  const oneHourRange = {
+    from: new Date("2024-01-01T00:00:00Z"),
+    to: new Date("2024-01-01T01:00:00Z"),
+  };
+
+  function createTimeBucketContext(
+    overrides: Partial<Parameters<typeof createPrinterContext>[0]> = {}
+  ): PrinterContext {
+    const schema = createSchemaRegistry([timeBucketSchema]);
+    return createPrinterContext({
+      schema,
+      enforcedWhereClause: {
+        organization_id: { op: "eq", value: "org_test123" },
+        project_id: { op: "eq", value: "proj_test456" },
+        environment_id: { op: "eq", value: "env_test789" },
+      },
+      timeRange: sevenDayRange,
+      ...overrides,
+    });
+  }
+
+  function printTimeBucketQuery(query: string, context?: PrinterContext) {
+    const ast = parseTSQLSelect(query);
+    const ctx = context ?? createTimeBucketContext();
+    return printToClickHouse(ast, ctx);
+  }
+
+  describe("SELECT with timeBucket()", () => {
+    it("should compile timeBucket() to toStartOfInterval with correct column and interval", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket"
+      );
+
+      // Should use ClickHouse column name (created_at), not TSQL name (triggered_at)
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+      expect(sql).toContain("count()");
+    });
+
+    it("should use 1 MINUTE interval for 1-hour time range", () => {
+      const ctx = createTimeBucketContext({ timeRange: oneHourRange });
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket",
+        ctx
+      );
+
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 1 MINUTE)");
+    });
+
+    it("should work with other selected columns", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), status, count() FROM runs GROUP BY timeBucket, status"
+      );
+
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+      expect(sql).toContain("status");
+      expect(sql).toContain("count()");
+    });
+  });
+
+  describe("GROUP BY with timeBucket alias", () => {
+    it("should allow GROUP BY timeBucket (bare identifier, matching implicit alias)", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket"
+      );
+
+      // The GROUP BY should reference the alias, not re-expand
+      expect(sql).toContain("GROUP BY");
+      // The SELECT should have the toStartOfInterval call
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+    });
+
+    it("should allow GROUP BY timebucket (all lowercase)", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timebucket"
+      );
+
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+    });
+
+    it("should allow GROUP BY TIMEBUCKET (all uppercase)", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY TIMEBUCKET"
+      );
+
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+    });
+  });
+
+  describe("ORDER BY with timeBucket alias", () => {
+    it("should allow ORDER BY timeBucket", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket ORDER BY timeBucket"
+      );
+
+      expect(sql).toContain("ORDER BY timebucket");
+    });
+
+    it("should allow ORDER BY timeBucket DESC", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket ORDER BY timeBucket DESC"
+      );
+
+      expect(sql).toContain("ORDER BY timebucket DESC");
+    });
+  });
+
+  describe("error handling", () => {
+    it("should throw when timeBucket() is called with arguments", () => {
+      expect(() =>
+        printTimeBucketQuery("SELECT timeBucket(triggered_at) FROM runs")
+      ).toThrow("timeBucket() does not accept arguments");
+    });
+
+    it("should throw when table has no timeConstraint", () => {
+      const schema = createSchemaRegistry([noTimeConstraintSchema]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test123" },
+          project_id: { op: "eq", value: "proj_test456" },
+          environment_id: { op: "eq", value: "env_test789" },
+        },
+        timeRange: sevenDayRange,
+      });
+
+      expect(() =>
+        printTimeBucketQuery("SELECT timeBucket(), count() FROM events GROUP BY timeBucket", ctx)
+      ).toThrow("timeConstraint");
+    });
+
+    it("should throw when no timeRange is provided", () => {
+      const ctx = createTimeBucketContext({ timeRange: undefined });
+
+      expect(() =>
+        printTimeBucketQuery("SELECT timeBucket(), count() FROM runs GROUP BY timeBucket", ctx)
+      ).toThrow("time range");
+    });
+  });
+
+  describe("column name mapping", () => {
+    it("should resolve timeConstraint through column mapping (TSQL → ClickHouse)", () => {
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket"
+      );
+
+      // timeConstraint is "triggered_at" which maps to CH "created_at"
+      expect(sql).toContain("created_at");
+      expect(sql).not.toContain("triggered_at");
+    });
+
+    it("should work with timeConstraint column that has no clickhouseName mapping", () => {
+      const schemaNoMapping: TableSchema = {
+        name: "logs",
+        clickhouseName: "trigger_dev.logs_v1",
+        timeConstraint: "timestamp",
+        columns: {
+          id: { name: "id", ...column("String") },
+          timestamp: { name: "timestamp", ...column("DateTime64") },
+          organization_id: { name: "organization_id", ...column("String") },
+          project_id: { name: "project_id", ...column("String") },
+          environment_id: { name: "environment_id", ...column("String") },
+        },
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+      };
+
+      const schema = createSchemaRegistry([schemaNoMapping]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test123" },
+          project_id: { op: "eq", value: "proj_test456" },
+          environment_id: { op: "eq", value: "env_test789" },
+        },
+        timeRange: sevenDayRange,
+      });
+
+      const { sql } = printTimeBucketQuery(
+        "SELECT timeBucket(), count() FROM logs GROUP BY timeBucket",
+        ctx
+      );
+
+      // No clickhouseName, so uses the TSQL name "timestamp" directly
+      expect(sql).toContain("toStartOfInterval(timestamp, INTERVAL 6 HOUR)");
+    });
+  });
+
+  describe("case insensitivity", () => {
+    it("should handle timeBucket() case-insensitively in SELECT", () => {
+      // The parser preserves case, but visitCall checks case-insensitively
+      const { sql } = printTimeBucketQuery(
+        "SELECT TIMEBUCKET(), count() FROM runs GROUP BY timeBucket"
+      );
+
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+    });
+  });
+
+  describe("integration with compileTSQL", () => {
+    it("should work through the full compileTSQL pipeline", () => {
+      const { sql, params } = compileTSQL(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket",
+        {
+          tableSchema: [timeBucketSchema],
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_test123" },
+            project_id: { op: "eq", value: "proj_test456" },
+            environment_id: { op: "eq", value: "env_test789" },
+          },
+          timeRange: sevenDayRange,
+        }
+      );
+
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 6 HOUR)");
+      expect(sql).toContain("count()");
+      // Tenant isolation should still be applied
+      expect(Object.values(params)).toContain("org_test123");
+    });
+  });
+
+  describe("per-table timeBucketThresholds", () => {
+    const customThresholds: BucketThreshold[] = [
+      // 10-second minimum granularity (e.g., for pre-aggregated metrics)
+      { maxRangeSeconds: 10 * 60, interval: { value: 10, unit: "SECOND" } },
+      { maxRangeSeconds: 30 * 60, interval: { value: 30, unit: "SECOND" } },
+      { maxRangeSeconds: 2 * 60 * 60, interval: { value: 1, unit: "MINUTE" } },
+    ];
+
+    const schemaWithCustomThresholds: TableSchema = {
+      ...timeBucketSchema,
+      name: "metrics",
+      timeBucketThresholds: customThresholds,
+    };
+
+    it("should use custom thresholds when defined on the table schema", () => {
+      // 3-minute range: global default would give 5 SECOND, custom gives 10 SECOND
+      const threeMinuteRange = {
+        from: new Date("2024-01-01T00:00:00Z"),
+        to: new Date("2024-01-01T00:03:00Z"),
+      };
+
+      const schema = createSchemaRegistry([schemaWithCustomThresholds]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test123" },
+          project_id: { op: "eq", value: "proj_test456" },
+          environment_id: { op: "eq", value: "env_test789" },
+        },
+        timeRange: threeMinuteRange,
+      });
+
+      const ast = parseTSQLSelect(
+        "SELECT timeBucket(), count() FROM metrics GROUP BY timeBucket"
+      );
+      const { sql } = printToClickHouse(ast, ctx);
+
+      // Custom thresholds: under 10 min → 10 SECOND (not the global 5 SECOND)
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 10 SECOND)");
+    });
+
+    it("should fall back to global defaults when no custom thresholds are defined", () => {
+      // 3-minute range with standard schema (no custom thresholds)
+      const threeMinuteRange = {
+        from: new Date("2024-01-01T00:00:00Z"),
+        to: new Date("2024-01-01T00:03:00Z"),
+      };
+
+      const schema = createSchemaRegistry([timeBucketSchema]);
+      const ctx = createPrinterContext({
+        schema,
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_test123" },
+          project_id: { op: "eq", value: "proj_test456" },
+          environment_id: { op: "eq", value: "env_test789" },
+        },
+        timeRange: threeMinuteRange,
+      });
+
+      const ast = parseTSQLSelect(
+        "SELECT timeBucket(), count() FROM runs GROUP BY timeBucket"
+      );
+      const { sql } = printToClickHouse(ast, ctx);
+
+      // Global default: under 5 min → 5 SECOND
+      expect(sql).toContain("toStartOfInterval(created_at, INTERVAL 5 SECOND)");
+    });
+  });
+});
diff --git a/internal-packages/tsql/src/query/printer.ts b/internal-packages/tsql/src/query/printer.ts
new file mode 100644
index 00000000000..155c5352e91
--- /dev/null
+++ b/internal-packages/tsql/src/query/printer.ts
@@ -0,0 +1,3133 @@
+// TypeScript port of posthog/hogql/printer.py
+// ClickHouse SQL printer with tenant isolation and schema validation
+
+import {
+  And,
+  Alias,
+  ArithmeticOperation,
+  ArithmeticOperationOp,
+  Array as ASTArray,
+  ArrayAccess,
+  AST,
+  BetweenExpr,
+  Call,
+  CompareOperation,
+  CompareOperationOp,
+  Constant,
+  CTE,
+  Dict,
+  Expression,
+  Field,
+  JoinConstraint,
+  JoinExpr,
+  Lambda,
+  LimitByExpr,
+  Not,
+  Or,
+  OrderExpr,
+  Placeholder,
+  RatioExpr,
+  SampleExpr,
+  SelectQuery,
+  SelectSetQuery,
+  Tuple,
+  TupleAccess,
+  WindowExpr,
+  WindowFrameExpr,
+  WindowFunction,
+} from "./ast";
+import { escapeClickHouseIdentifier, escapeTSQLIdentifier, escapeClickHouseString } from "./escape";
+import { ImpossibleASTError, NotImplementedError, QueryError } from "./errors";
+import {
+  TSQL_CLICKHOUSE_FUNCTIONS,
+  TSQL_AGGREGATIONS,
+  TSQL_COMPARISON_MAPPING,
+  findTSQLAggregation,
+  findTSQLFunction,
+  validateFunctionArgs,
+} from "./functions";
+import { PrinterContext, WhereClauseCondition } from "./printer_context";
+import { calculateTimeBucketInterval } from "./time_buckets";
+import {
+  findTable,
+  validateTable,
+  TableSchema,
+  ColumnSchema,
+  getInternalValue,
+  isVirtualColumn,
+  OutputColumnMetadata,
+  ClickHouseType,
+  hasFieldMapping,
+  getInternalValueFromMappingCaseInsensitive,
+  type ColumnFormatType,
+} from "./schema";
+
+/**
+ * Result of printing an AST to ClickHouse SQL
+ */
+export interface PrintResult {
+  /** The generated ClickHouse SQL query */
+  sql: string;
+  /** Parameter values for parameterized query execution */
+  params: Record<string, unknown>;
+  /** Metadata for each column in the SELECT clause, in order */
+  columns: OutputColumnMetadata[];
+  /**
+   * Columns that were hidden when SELECT * was used.
+   * Only populated when SELECT * is transformed to core columns only.
+   */
+  hiddenColumns?: string[];
+}
+
+/**
+ * Response from visiting a JoinExpr node
+ */
+interface JoinExprResponse {
+  /** The printed SQL for the JOIN */
+  printedSql: string;
+  /** Additional WHERE clause to add (e.g., tenant isolation guards) */
+  where: Expression | null;
+}
+
+/**
+ * ClickHouse SQL Printer
+ *
+ * Converts a TSQL AST to a parameterized ClickHouse SQL query with:
+ * - Automatic tenant isolation (organization_id, project_id, environment_id)
+ * - Schema-based table/column validation
+ * - SQL injection protection via parameterized queries
+ * - Table and column name mapping (user-friendly → internal ClickHouse names)
+ */
+export class ClickHousePrinter {
+  /** Stack of AST nodes being visited (for context) */
+  private stack: AST[] = [];
+  /** Indent level for pretty printing */
+  private indentLevel = -1;
+  /** Tab size for pretty printing */
+  private tabSize = 4;
+  /** Whether to pretty print output */
+  private pretty: boolean;
+  /**
+   * Map of table aliases to their schemas (for column name resolution)
+   * Key is the alias/name used in the query, value is the TableSchema
+   */
+  private tableContexts: Map<string, TableSchema> = new Map();
+  /** Column metadata collected during SELECT processing */
+  private outputColumns: OutputColumnMetadata[] = [];
+  /** Whether we're currently processing GROUP BY expressions */
+  private inGroupByContext = false;
+  /** Whether the current query has a GROUP BY clause (used for JSON subfield type hints) */
+  private queryHasGroupBy = false;
+  /** Columns hidden when SELECT * is expanded to core columns only */
+  private hiddenColumns: string[] = [];
+  /**
+   * Map of column aliases defined in the current SELECT clause.
+   * Key is the lowercase alias (for case-insensitive lookup),
+   * value is the canonical form (as it appears in the generated SQL).
+   * Used to allow ORDER BY/HAVING to reference aliased columns.
+   */
+  private selectAliases: Map<string, string> = new Map();
+  /**
+   * Set of internal ClickHouse column names that are allowed (e.g., tenant columns).
+   * These are populated from tableSchema.tenantColumns when processing joins.
+   */
+  private allowedInternalColumns: Set<string> = new Set();
+  /**
+   * Set of internal-only column names that are NOT user-queryable.
+   * These are tenant columns and required filter columns that are not exposed in tableSchema.columns.
+   * Used to block user queries from accessing internal columns in SELECT, ORDER BY, GROUP BY, HAVING.
+   */
+  private internalOnlyColumns: Set<string> = new Set();
+  /**
+   * Whether we're currently processing user projection clauses (SELECT, ORDER BY, GROUP BY, HAVING).
+   * When true, internal-only columns will be rejected.
+   */
+  private inProjectionContext = false;
+
+  constructor(
+    private context: PrinterContext,
+    options: { pretty?: boolean } = {}
+  ) {
+    this.pretty = options.pretty ?? false;
+  }
+
+  /**
+   * Print an AST node to ClickHouse SQL
+   */
+  print(node: SelectQuery | SelectSetQuery): PrintResult {
+    this.outputColumns = [];
+    this.hiddenColumns = [];
+    const sql = this.visit(node);
+    const result: PrintResult = {
+      sql,
+      params: this.context.getParams(),
+      columns: this.outputColumns,
+    };
+    if (this.hiddenColumns.length > 0) {
+      result.hiddenColumns = this.hiddenColumns;
+    }
+    return result;
+  }
+
+  /**
+   * Get current indentation string
+   */
+  private indent(extra = 0): string {
+    return " ".repeat(this.tabSize * (this.indentLevel + extra));
+  }
+
+  /**
+   * Visit an AST node and return its SQL representation
+   */
+  private visit(node: AST | null | undefined): string {
+    if (node === null || node === undefined) {
+      return "";
+    }
+
+    this.stack.push(node);
+    this.indentLevel++;
+
+    let response: string;
+
+    // Type-based dispatch
+    const nodeType = (node as Expression).expression_type;
+
+    switch (nodeType) {
+      case "select_set_query":
+        response = this.visitSelectSetQuery(node as SelectSetQuery);
+        break;
+      case "select_query":
+        response = this.visitSelectQuery(node as SelectQuery);
+        break;
+      case "cte":
+        response = this.visitCTE(node as CTE);
+        break;
+      case "alias":
+        response = this.visitAlias(node as Alias);
+        break;
+      case "arithmetic_operation":
+        response = this.visitArithmeticOperation(node as ArithmeticOperation);
+        break;
+      case "and":
+        response = this.visitAnd(node as And);
+        break;
+      case "or":
+        response = this.visitOr(node as Or);
+        break;
+      case "compare_operation":
+        response = this.visitCompareOperation(node as CompareOperation);
+        break;
+      case "not":
+        response = this.visitNot(node as Not);
+        break;
+      case "between_expr":
+        response = this.visitBetweenExpr(node as BetweenExpr);
+        break;
+      case "order_expr":
+        response = this.visitOrderExpr(node as OrderExpr);
+        break;
+      case "array_access":
+        response = this.visitArrayAccess(node as ArrayAccess);
+        break;
+      case "array":
+        response = this.visitArray(node as ASTArray);
+        break;
+      case "dict":
+        response = this.visitDict(node as Dict);
+        break;
+      case "tuple_access":
+        response = this.visitTupleAccess(node as TupleAccess);
+        break;
+      case "tuple":
+        response = this.visitTuple(node as Tuple);
+        break;
+      case "lambda":
+        response = this.visitLambda(node as Lambda);
+        break;
+      case "constant":
+        response = this.visitConstant(node as Constant);
+        break;
+      case "field":
+        response = this.visitField(node as Field);
+        break;
+      case "placeholder":
+        response = this.visitPlaceholder(node as Placeholder);
+        break;
+      case "call":
+        response = this.visitCall(node as Call);
+        break;
+      case "join_expr":
+        // JoinExpr is handled specially since it returns more than just SQL
+        throw new ImpossibleASTError("JoinExpr should be handled via visitJoinExpr");
+      case "join_constraint":
+        response = this.visitJoinConstraint(node as JoinConstraint);
+        break;
+      case "window_frame_expr":
+        response = this.visitWindowFrameExpr(node as WindowFrameExpr);
+        break;
+      case "window_expr":
+        response = this.visitWindowExpr(node as WindowExpr);
+        break;
+      case "window_function":
+        response = this.visitWindowFunction(node as WindowFunction);
+        break;
+      case "limit_by_expr":
+        response = this.visitLimitByExpr(node as LimitByExpr);
+        break;
+      case "ratio_expr":
+        response = this.visitRatioExpr(node as RatioExpr);
+        break;
+      case "sample_expr":
+        response = this.visitSampleExpr(node as SampleExpr);
+        break;
+      default:
+        throw new NotImplementedError(
+          `Unknown expression type: ${nodeType}. Node: ${JSON.stringify(node, null, 2).slice(
+            0,
+            200
+          )}`
+        );
+    }
+
+    this.indentLevel--;
+    this.stack.pop();
+
+    return response;
+  }
+
+  // ============================================================
+  // SELECT Query Visitors
+  // ============================================================
+
+  private visitSelectSetQuery(node: SelectSetQuery): string {
+    this.indentLevel--;
+    let ret = this.visit(node.initial_select_query);
+    if (this.pretty) {
+      ret = ret.trim();
+    }
+
+    for (const expr of node.subsequent_select_queries) {
+      let query = this.visit(expr.select_query);
+      if (this.pretty) {
+        query = query.trim();
+      }
+      if (expr.set_operator !== undefined) {
+        if (this.pretty) {
+          ret += `\n${this.indent(1)}${expr.set_operator}\n${this.indent(1)}`;
+        } else {
+          ret += ` ${expr.set_operator} `;
+        }
+      }
+      ret += query;
+    }
+
+    this.indentLevel++;
+
+    // Wrap in parentheses if not top level
+    if (this.stack.length > 1) {
+      return `(${ret.trim()})`;
+    }
+    return ret;
+  }
+
+  private visitSelectQuery(node: SelectQuery): string {
+    // Determine if this is a top-level query
+    const partOfSelectUnion =
+      this.stack.length >= 2 && this.isSelectSetQuery(this.stack[this.stack.length - 2]);
+    const isTopLevelQuery =
+      this.stack.length <= 1 || (this.stack.length === 2 && partOfSelectUnion);
+
+    // Save and clear table contexts
+    // Top-level queries clear contexts; subqueries save parent context and create fresh context
+    const savedTableContexts = new Map(this.tableContexts);
+    const savedInternalColumns = new Set(this.allowedInternalColumns);
+    const savedInternalOnlyColumns = new Set(this.internalOnlyColumns);
+    if (isTopLevelQuery) {
+      this.tableContexts.clear();
+      this.allowedInternalColumns.clear();
+      this.internalOnlyColumns.clear();
+    } else {
+      // Subqueries get fresh contexts - they don't inherit parent tables
+      // (the parent will restore its context after the subquery is processed)
+      this.tableContexts = new Map();
+      this.allowedInternalColumns = new Set();
+      this.internalOnlyColumns = new Set();
+    }
+
+    // Build WHERE clause starting with any existing where
+    let where: Expression | undefined = node.where;
+
+    // Process CTEs
+    const cteStrings: string[] = [];
+    if (node.ctes) {
+      for (const [name, cte] of Object.entries(node.ctes)) {
+        cteStrings.push(`${this.printIdentifier(name)} AS (${this.visit(cte.expr)})`);
+      }
+    }
+
+    // Process joins and collect tenant guards
+    const joinedTables: string[] = [];
+    let nextJoin: JoinExpr | undefined = node.select_from;
+
+    while (nextJoin) {
+      const visitedJoin = this.visitJoinExpr(nextJoin);
+      joinedTables.push(visitedJoin.printedSql);
+
+      // Add tenant guard to WHERE clause
+      const extraWhere = visitedJoin.where;
+      if (extraWhere !== null) {
+        if (where === undefined) {
+          where = extraWhere;
+        } else if ((where as And).expression_type === "and") {
+          where = { expression_type: "and", exprs: [extraWhere, ...(where as And).exprs] } as And;
+        } else {
+          where = { expression_type: "and", exprs: [extraWhere, where] } as And;
+        }
+      }
+
+      nextJoin = nextJoin.next_join;
+    }
+
+    // Extract SELECT column aliases BEFORE visiting columns
+    // This allows ORDER BY/HAVING to reference aliased columns
+    const savedAliases = this.selectAliases;
+    this.selectAliases = new Map();
+    if (node.select) {
+      for (const col of node.select) {
+        this.extractSelectAlias(col);
+      }
+    }
+
+    // Track if query has GROUP BY for JSON subfield type hint decisions
+    // (ClickHouse requires .:String for Dynamic types in GROUP BY, and SELECT must match)
+    const savedQueryHasGroupBy = this.queryHasGroupBy;
+    this.queryHasGroupBy = !!node.group_by;
+
+    // Process SELECT columns and collect metadata
+    // Using flatMap because asterisk expansion can return multiple columns
+    // Set inProjectionContext to block internal-only columns in user projections
+    let columns: string[];
+    if (node.select && node.select.length > 0) {
+      // Only collect metadata for top-level queries (not subqueries)
+      if (isTopLevelQuery) {
+        this.outputColumns = [];
+      }
+      this.inProjectionContext = true;
+      columns = node.select.flatMap((col) =>
+        this.visitSelectColumnWithMetadata(col, isTopLevelQuery)
+      );
+      this.inProjectionContext = false;
+    } else {
+      columns = ["1"];
+    }
+
+    // Process WINDOW definitions
+    let windowClause: string | null = null;
+    if (node.window_exprs && Object.keys(node.window_exprs).length > 0) {
+      const windowDefs = Object.entries(node.window_exprs).map(
+        ([name, expr]) => `${this.printIdentifier(name)} AS (${this.visit(expr)})`
+      );
+      windowClause = windowDefs.join(", ");
+    }
+
+    // Process other clauses
+    const prewhere = node.prewhere ? this.visit(node.prewhere) : null;
+    const whereStr = where ? this.visit(where) : null;
+
+    // Process GROUP BY with context flags:
+    // - inGroupByContext: use raw columns for whereTransform columns
+    // - inProjectionContext: block internal-only columns
+    let groupBy: string[] | null = null;
+    if (node.group_by) {
+      this.inGroupByContext = true;
+      this.inProjectionContext = true;
+      groupBy = node.group_by.map((col) => this.visit(col));
+      this.inProjectionContext = false;
+      this.inGroupByContext = false;
+    }
+
+    // Process HAVING with inProjectionContext to block internal-only columns
+    let having: string | null = null;
+    if (node.having) {
+      this.inProjectionContext = true;
+      having = this.visit(node.having);
+      this.inProjectionContext = false;
+    }
+
+    // Process ORDER BY with inProjectionContext to block internal-only columns
+    let orderBy: string[] | null = null;
+    if (node.order_by) {
+      this.inProjectionContext = true;
+      orderBy = node.order_by.map((col) => this.visit(col));
+      this.inProjectionContext = false;
+    }
+
+    // Process ARRAY JOIN
+    let arrayJoin = "";
+    if (node.array_join_op) {
+      if (!["ARRAY JOIN", "LEFT ARRAY JOIN", "INNER ARRAY JOIN"].includes(node.array_join_op)) {
+        throw new ImpossibleASTError(`Invalid ARRAY JOIN operation: ${node.array_join_op}`);
+      }
+      arrayJoin = node.array_join_op;
+      if (!node.array_join_list || node.array_join_list.length === 0) {
+        throw new ImpossibleASTError("Invalid ARRAY JOIN without an array");
+      }
+      arrayJoin += ` ${node.array_join_list.map((expr) => this.visit(expr)).join(", ")}`;
+    }
+
+    // Format spacing
+    const space = this.pretty ? `\n${this.indent(1)}` : " ";
+    const comma = this.pretty ? `,\n${this.indent(1)}` : ", ";
+
+    // Build SQL clauses
+    const clauses: (string | null)[] = [
+      `SELECT${space}${node.distinct ? "DISTINCT " : ""}${columns.join(comma)}`,
+      joinedTables.length > 0 ? `FROM${space}${joinedTables.join(space)}` : null,
+      arrayJoin || null,
+      prewhere ? `PREWHERE${space}${prewhere}` : null,
+      whereStr ? `WHERE${space}${whereStr}` : null,
+      groupBy && groupBy.length > 0 ? `GROUP BY${space}${groupBy.join(comma)}` : null,
+      having ? `HAVING${space}${having}` : null,
+      windowClause ? `WINDOW${space}${windowClause}` : null,
+      orderBy && orderBy.length > 0 ? `ORDER BY${space}${orderBy.join(comma)}` : null,
+    ];
+
+    // Process LIMIT
+    let limit = node.limit;
+    if (isTopLevelQuery && this.context.maxRows) {
+      const maxLimit = this.context.maxRows;
+      if (limit !== undefined) {
+        // Cap the limit to maxRows
+        if ((limit as Constant).expression_type === "constant") {
+          const constLimit = limit as Constant;
+          if (typeof constLimit.value === "number") {
+            constLimit.value = Math.min(constLimit.value, maxLimit);
+          }
+        }
+      } else {
+        // Add default limit
+        limit = { expression_type: "constant", value: maxLimit } as Constant;
+      }
+    }
+
+    // Add LIMIT BY
+    if (node.limit_by) {
+      const limitByExprs = node.limit_by.exprs.map((e) => this.visit(e)).join(", ");
+      const offsetPart = node.limit_by.offset_value
+        ? ` OFFSET ${this.visit(node.limit_by.offset_value)}`
+        : "";
+      clauses.push(`LIMIT ${this.visit(node.limit_by.n)}${offsetPart} BY ${limitByExprs}`);
+    }
+
+    // Add LIMIT/OFFSET
+    if (limit !== undefined) {
+      clauses.push(`LIMIT ${this.visit(limit)}`);
+      if (node.limit_with_ties) {
+        clauses.push("WITH TIES");
+      }
+      if (node.offset !== undefined) {
+        clauses.push(`OFFSET ${this.visit(node.offset)}`);
+      }
+    }
+
+    // Add CTEs
+    let response: string;
+    if (this.pretty) {
+      response = clauses
+        .filter((c) => c !== null)
+        .map((c) => `${this.indent()}${c}`)
+        .join("\n");
+    } else {
+      response = clauses.filter((c) => c !== null).join(" ");
+    }
+
+    // Add WITH clause for CTEs
+    if (cteStrings.length > 0) {
+      const ctePrefix = `WITH ${cteStrings.join(", ")}`;
+      response = `${ctePrefix} ${response}`;
+    }
+
+    // Wrap subqueries in parentheses
+    if (!partOfSelectUnion && !isTopLevelQuery) {
+      response = this.pretty ? `(${response.trim()})` : `(${response})`;
+    }
+
+    // Restore saved contexts (for nested queries)
+    this.selectAliases = savedAliases;
+    this.queryHasGroupBy = savedQueryHasGroupBy;
+    this.tableContexts = savedTableContexts;
+    this.allowedInternalColumns = savedInternalColumns;
+    this.internalOnlyColumns = savedInternalOnlyColumns;
+
+    return response;
+  }
+
+  /**
+   * Extract column aliases from a SELECT expression.
+   * Handles explicit aliases (AS name) and implicit names from aggregations/functions.
+   *
+   * NOTE: We intentionally do NOT add field names as aliases here.
+   * Field names (e.g., SELECT status) are columns from the table, not aliases.
+   * Only explicit aliases (SELECT x AS name) and implicit function names
+   * (SELECT COUNT() → 'count') should be added.
+   */
+  private extractSelectAlias(expr: Expression): void {
+    // Handle explicit Alias: SELECT ... AS name
+    // Key is lowercase for case-insensitive lookup, value is the original casing
+    // so that ORDER BY/GROUP BY output matches the alias in the generated SQL.
+    if ((expr as Alias).expression_type === "alias") {
+      const alias = (expr as Alias).alias;
+      this.selectAliases.set(alias.toLowerCase(), alias);
+      return;
+    }
+
+    // Handle implicit names from function calls (e.g., COUNT() → 'count')
+    // ClickHouse generates implicit aliases as lowercase
+    if ((expr as Call).expression_type === "call") {
+      const call = expr as Call;
+      const canonicalName = call.name.toLowerCase();
+      this.selectAliases.set(canonicalName, canonicalName);
+      return;
+    }
+
+    // Handle implicit names from arithmetic operations (e.g., a + b → 'plus')
+    // ClickHouse generates these as lowercase
+    if ((expr as ArithmeticOperation).expression_type === "arithmetic_operation") {
+      const op = expr as ArithmeticOperation;
+      const opNames: Record<ArithmeticOperationOp, string> = {
+        [ArithmeticOperationOp.Add]: "plus",
+        [ArithmeticOperationOp.Sub]: "minus",
+        [ArithmeticOperationOp.Mult]: "multiply",
+        [ArithmeticOperationOp.Div]: "divide",
+        [ArithmeticOperationOp.Mod]: "modulo",
+      };
+      const canonicalName = opNames[op.op];
+      this.selectAliases.set(canonicalName, canonicalName);
+      return;
+    }
+
+    // Field references (e.g., SELECT status) are NOT aliases - they're columns
+    // that will be validated against the table schema. Don't add them here.
+  }
+
+  /**
+   * Visit a SELECT column expression with metadata collection
+   *
+   * For bare Field expressions that reference virtual columns, we need to add
+   * an AS alias to preserve the column name in the result set.
+   *
+   * Examples:
+   * - `SELECT execution_duration` → `SELECT (expr) AS execution_duration`
+   * - `SELECT execution_duration AS dur` → `SELECT (expr) AS dur` (Alias handles it)
+   * - `SELECT run_id` → `SELECT run_id` (not a virtual column)
+   * - `SELECT *` → Expands to all selectable columns from the table(s)
+   *
+   * @param col - The column expression
+   * @param collectMetadata - Whether to collect column metadata (only for top-level queries)
+   * @returns Array of SQL column strings (usually one, but multiple for asterisk expansion)
+   */
+  private visitSelectColumnWithMetadata(col: Expression, collectMetadata: boolean): string[] {
+    // Check for asterisk expansion first
+    if ((col as Field).expression_type === "field") {
+      const field = col as Field;
+      const asteriskExpansion = this.expandAsterisk(field.chain, collectMetadata);
+      if (asteriskExpansion !== null) {
+        return asteriskExpansion;
+      }
+    }
+
+    // Extract output name and source column before visiting
+    const { outputName, sourceColumn, inferredType } = this.analyzeSelectColumn(col);
+    // effectiveOutputName may be overridden for JSON subfields
+    let effectiveOutputName = outputName;
+
+    // Check if this is a bare Field (not wrapped in Alias)
+    let sqlResult: string;
+    if ((col as Field).expression_type === "field") {
+      const field = col as Field;
+
+      // Check if this is a bare JSON field that should use a text column
+      const textColumn = this.getTextColumnForField(field.chain);
+      if (textColumn !== null && outputName) {
+        // Use the text column instead of the JSON column, with alias to preserve name
+        sqlResult = `${this.printIdentifier(textColumn)} AS ${this.printIdentifier(outputName)}`;
+      } else {
+        const virtualColumnName = this.getVirtualColumnNameForField(field.chain);
+
+        if (virtualColumnName !== null) {
+          // Visit the field (which will return the expression)
+          const visited = this.visit(col);
+          // Add the alias to preserve the column name
+          sqlResult = `${visited} AS ${this.printIdentifier(virtualColumnName)}`;
+        } else {
+          // Visit the field to get the ClickHouse SQL
+          const visited = this.visit(col);
+
+          // Check if this is a JSON subfield access (will have .:String type hint)
+          // If so, add an alias to preserve the nice column name (dots → underscores)
+          const isJsonSubfield = this.isJsonSubfieldAccess(field.chain);
+          if (isJsonSubfield) {
+            // Build the alias using underscores, excluding any dataPrefix
+            // e.g., output.message -> "output_message" (not "output_data_message")
+            const dataPrefix = this.getDataPrefixForField(field.chain);
+            const aliasName = this.buildAliasWithoutDataPrefix(field.chain, dataPrefix);
+            sqlResult = `${visited} AS ${this.printIdentifier(aliasName)}`;
+            // Override output name for metadata
+            effectiveOutputName = aliasName;
+          }
+          // Check if the column has a different clickhouseName - if so, add an alias
+          // to ensure results come back with the user-facing name
+          else if (
+            outputName &&
+            sourceColumn?.clickhouseName &&
+            sourceColumn.clickhouseName !== outputName
+          ) {
+            sqlResult = `${visited} AS ${this.printIdentifier(outputName)}`;
+          } else {
+            sqlResult = visited;
+          }
+        }
+      }
+    } else if (
+      // Handle expressions that need implicit aliases (Call, ArithmeticOperation, Constant)
+      // These expressions get implicit names and need AS clauses so results match metadata
+      (col as Alias).expression_type !== "alias" &&
+      ((col as Call).expression_type === "call" ||
+        (col as ArithmeticOperation).expression_type === "arithmetic_operation" ||
+        (col as Constant).expression_type === "constant")
+    ) {
+      const visited = this.visit(col);
+      // Add explicit AS clause with the implicit name so ClickHouse results match our metadata
+      if (outputName) {
+        sqlResult = `${visited} AS ${this.printIdentifier(outputName)}`;
+      } else {
+        sqlResult = visited;
+      }
+    } else if ((col as Alias).expression_type === "alias") {
+      // Handle Alias expressions - check if inner expression is a bare JSON field with textColumn
+      const alias = col as Alias;
+      if ((alias.expr as Field).expression_type === "field") {
+        const innerField = alias.expr as Field;
+        const textColumn = this.getTextColumnForField(innerField.chain);
+        if (textColumn !== null) {
+          // Use the text column with the user's explicit alias
+          sqlResult = `${this.printIdentifier(textColumn)} AS ${this.printIdentifier(alias.alias)}`;
+        } else {
+          sqlResult = this.visit(col);
+        }
+      } else {
+        sqlResult = this.visit(col);
+      }
+    } else {
+      // For other types, visit normally
+      sqlResult = this.visit(col);
+    }
+
+    // Collect metadata for top-level queries
+    if (collectMetadata && effectiveOutputName) {
+      const metadata: OutputColumnMetadata = {
+        name: effectiveOutputName,
+        type: sourceColumn?.type ?? inferredType ?? "String",
+      };
+
+      // Only add customRenderType if specified in schema
+      if (sourceColumn?.customRenderType) {
+        metadata.customRenderType = sourceColumn.customRenderType;
+      }
+
+      // Only add description if specified in schema (columns and virtual columns)
+      if (sourceColumn?.description) {
+        metadata.description = sourceColumn.description;
+      }
+
+      // Set format hint from prettyFormat() or auto-populate from customRenderType
+      const sourceWithFormat = sourceColumn as (Partial<ColumnSchema> & { format?: ColumnFormatType }) | null;
+      if (sourceWithFormat?.format) {
+        metadata.format = sourceWithFormat.format;
+      } else if (sourceColumn?.customRenderType) {
+        metadata.format = sourceColumn.customRenderType as ColumnFormatType;
+      }
+
+      this.outputColumns.push(metadata);
+    }
+
+    return [sqlResult];
+  }
+
+  /**
+   * Expand an asterisk field to all selectable columns from the table(s)
+   *
+   * @param chain - The field chain (["*"] for SELECT *, [tableName, "*"] for table.*)
+   * @param collectMetadata - Whether to collect column metadata
+   * @returns Array of SQL column strings, or null if not an asterisk
+   */
+  private expandAsterisk(chain: Array<string | number>, collectMetadata: boolean): string[] | null {
+    // Check for SELECT * (chain: ["*"])
+    if (chain.length === 1 && chain[0] === "*") {
+      return this.expandAllTableColumns(collectMetadata);
+    }
+
+    // Check for table.* (chain: [tableName, "*"])
+    if (chain.length === 2 && chain[1] === "*") {
+      const tableAlias = chain[0];
+      if (typeof tableAlias === "string") {
+        return this.expandTableColumns(tableAlias, collectMetadata);
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Expand SELECT * to core columns only from all tables in context.
+   * Non-core columns are tracked in hiddenColumns for user notification.
+   */
+  private expandAllTableColumns(collectMetadata: boolean): string[] {
+    const results: string[] = [];
+
+    // Iterate through all tables in the context
+    for (const [tableAlias, tableSchema] of this.tableContexts.entries()) {
+      const tableColumns = this.getSelectableColumnsFromSchema(
+        tableSchema,
+        tableAlias,
+        collectMetadata,
+        true // onlyCoreColumns - SELECT * only returns core columns
+      );
+      results.push(...tableColumns);
+    }
+
+    // If no tables in context, fall back to literal *
+    if (results.length === 0) {
+      return ["*"];
+    }
+
+    return results;
+  }
+
+  /**
+   * Expand table.* to core columns only from a specific table.
+   * Non-core columns are tracked in hiddenColumns for user notification.
+   */
+  private expandTableColumns(tableAlias: string, collectMetadata: boolean): string[] {
+    const tableSchema = this.tableContexts.get(tableAlias);
+
+    if (!tableSchema) {
+      // Table not found in context, fall back to literal table.*
+      return [`${this.printIdentifier(tableAlias)}.*`];
+    }
+
+    return this.getSelectableColumnsFromSchema(
+      tableSchema,
+      tableAlias,
+      collectMetadata,
+      true // onlyCoreColumns - table.* only returns core columns
+    );
+  }
+
+  /**
+   * Get selectable columns from a table schema as SQL strings
+   *
+   * @param tableSchema - The table schema
+   * @param tableAlias - The alias used for the table in the query (for table-qualified columns)
+   * @param collectMetadata - Whether to collect column metadata
+   * @param onlyCoreColumns - If true, only return core columns and track hidden columns (but falls back to all columns if no core columns are defined)
+   * @returns Array of SQL column strings
+   */
+  private getSelectableColumnsFromSchema(
+    tableSchema: TableSchema,
+    tableAlias: string,
+    collectMetadata: boolean,
+    onlyCoreColumns = false
+  ): string[] {
+    const results: string[] = [];
+
+    // Check if any core columns exist - if not, we'll return all columns as a fallback
+    const hasCoreColumns = Object.values(tableSchema.columns).some(
+      (col) => col.coreColumn === true && col.selectable !== false
+    );
+
+    // Only filter to core columns if the schema defines some core columns
+    const shouldFilterToCoreOnly = onlyCoreColumns && hasCoreColumns;
+
+    for (const [columnName, columnSchema] of Object.entries(tableSchema.columns)) {
+      // Skip non-selectable columns
+      if (columnSchema.selectable === false) {
+        continue;
+      }
+
+      // If filtering to core columns only, skip non-core and track them
+      if (shouldFilterToCoreOnly && !columnSchema.coreColumn) {
+        this.hiddenColumns.push(columnName);
+        continue;
+      }
+
+      // Build the SQL for this column
+      let sqlResult: string;
+
+      // Check if this is a virtual column (has expression)
+      if (isVirtualColumn(columnSchema)) {
+        // Virtual column: use the expression with an alias
+        sqlResult = `(${columnSchema.expression}) AS ${this.printIdentifier(columnName)}`;
+      } else if (columnSchema.textColumn) {
+        // JSON column with text column optimization: use the text column with alias
+        sqlResult = `${this.printIdentifier(columnSchema.textColumn)} AS ${this.printIdentifier(
+          columnName
+        )}`;
+      } else {
+        // Regular column: use the actual ClickHouse column name
+        const clickhouseName = columnSchema.clickhouseName ?? columnName;
+
+        // If the column has a different internal name, add an alias
+        if (clickhouseName !== columnName) {
+          sqlResult = `${this.printIdentifier(clickhouseName)} AS ${this.printIdentifier(
+            columnName
+          )}`;
+        } else {
+          sqlResult = this.printIdentifier(columnName);
+        }
+      }
+
+      results.push(sqlResult);
+
+      // Collect metadata if requested
+      if (collectMetadata) {
+        const metadata: OutputColumnMetadata = {
+          name: columnName,
+          type: columnSchema.type,
+        };
+
+        if (columnSchema.customRenderType) {
+          metadata.customRenderType = columnSchema.customRenderType;
+        }
+
+        if (columnSchema.description) {
+          metadata.description = columnSchema.description;
+        }
+
+        this.outputColumns.push(metadata);
+      }
+    }
+
+    return results;
+  }
+
+  /**
+   * Analyze a SELECT column expression to extract output name, source column, and type
+   */
+  private analyzeSelectColumn(col: Expression): {
+    outputName: string | null;
+    sourceColumn: Partial<ColumnSchema> | null;
+    inferredType: ClickHouseType | null;
+  } {
+    // Handle Alias - the output name is the alias
+    if ((col as Alias).expression_type === "alias") {
+      const alias = col as Alias;
+      const innerAnalysis = this.analyzeSelectColumn(alias.expr);
+      return {
+        outputName: alias.alias,
+        sourceColumn: innerAnalysis.sourceColumn,
+        inferredType: innerAnalysis.inferredType,
+      };
+    }
+
+    // Handle Field - the output name is the column name
+    if ((col as Field).expression_type === "field") {
+      const field = col as Field;
+      const columnInfo = this.resolveFieldToColumn(field.chain);
+      return {
+        outputName: columnInfo.outputName,
+        sourceColumn: columnInfo.column,
+        inferredType: columnInfo.column?.type ?? null,
+      };
+    }
+
+    // Handle prettyFormat(expr, 'formatType') — metadata-only wrapper
+    if ((col as Call).expression_type === "call") {
+      const call = col as Call;
+      if (call.name.toLowerCase() === "prettyformat") {
+        if (call.args.length !== 2) {
+          throw new QueryError(
+            "prettyFormat() requires exactly 2 arguments: prettyFormat(expression, 'formatType')"
+          );
+        }
+        const formatArg = call.args[1];
+        if (
+          (formatArg as Constant).expression_type !== "constant" ||
+          typeof (formatArg as Constant).value !== "string"
+        ) {
+          throw new QueryError(
+            "prettyFormat() second argument must be a string literal format type"
+          );
+        }
+        const formatType = (formatArg as Constant).value as string;
+        const validFormats = [
+          "bytes",
+          "decimalBytes",
+          "quantity",
+          "percent",
+          "duration",
+          "durationSeconds",
+          "costInDollars",
+          "cost",
+        ];
+        if (!validFormats.includes(formatType)) {
+          throw new QueryError(
+            `Unknown format type '${formatType}'. Valid types: ${validFormats.join(", ")}`
+          );
+        }
+        const innerAnalysis = this.analyzeSelectColumn(call.args[0]);
+        return {
+          outputName: innerAnalysis.outputName,
+          sourceColumn: {
+            ...(innerAnalysis.sourceColumn ?? {}),
+            type: innerAnalysis.sourceColumn?.type ?? innerAnalysis.inferredType ?? undefined,
+            format: formatType as ColumnFormatType,
+          } as Partial<ColumnSchema> & { format?: ColumnFormatType },
+          inferredType: innerAnalysis.inferredType,
+        };
+      }
+    }
+
+    // Handle Call (function/aggregation) - infer type from function
+    if ((col as Call).expression_type === "call") {
+      const call = col as Call;
+      const inferredType = this.inferCallType(call);
+
+      // For value-preserving aggregates (SUM, AVG, MIN, MAX), propagate customRenderType
+      // from the source column. COUNT and other aggregates return counts, not values,
+      // so they shouldn't inherit the source column's render type.
+      const valuePreservingAggregates = [
+        "sum",
+        "sumif",
+        "avg",
+        "avgif",
+        "min",
+        "minif",
+        "max",
+        "maxif",
+        "quantile",
+      ];
+      const funcName = call.name.toLowerCase();
+      let sourceColumn: Partial<ColumnSchema> | null = null;
+
+      if (valuePreservingAggregates.includes(funcName) && call.args.length > 0) {
+        const firstArg = call.args[0];
+        if ((firstArg as Field).expression_type === "field") {
+          const field = firstArg as Field;
+          const columnInfo = this.resolveFieldToColumn(field.chain);
+          // Only propagate customRenderType, not the full column schema
+          if (columnInfo.column?.customRenderType) {
+            sourceColumn = {
+              type: inferredType,
+              customRenderType: columnInfo.column.customRenderType,
+            };
+          }
+        }
+      }
+
+      return {
+        outputName: this.generateImplicitName(call),
+        sourceColumn,
+        inferredType,
+      };
+    }
+
+    // Handle ArithmeticOperation - infer type
+    if ((col as ArithmeticOperation).expression_type === "arithmetic_operation") {
+      const arith = col as ArithmeticOperation;
+      const inferredType = this.inferArithmeticType(arith);
+      return {
+        outputName: this.generateImplicitName(arith),
+        sourceColumn: null,
+        inferredType,
+      };
+    }
+
+    // Handle Constant
+    if ((col as Constant).expression_type === "constant") {
+      const constant = col as Constant;
+      const inferredType = this.inferConstantType(constant);
+      return {
+        outputName: this.generateImplicitName(constant),
+        sourceColumn: null,
+        inferredType,
+      };
+    }
+
+    // Default for other expression types
+    return {
+      outputName: null,
+      sourceColumn: null,
+      inferredType: null,
+    };
+  }
+
+  /**
+   * Generate an implicit column name for an expression without an explicit alias.
+   * This matches how Postgres auto-names result columns (just the function name).
+   *
+   * Examples:
+   * - COUNT() -> "count"
+   * - COUNT(id) -> "count"
+   * - SUM(duration_ms) -> "sum"
+   * - 1 + 2 -> "plus"
+   */
+  private generateImplicitName(expr: Expression): string {
+    // Handle Call (function/aggregation)
+    if ((expr as Call).expression_type === "call") {
+      const call = expr as Call;
+      // Use lowercase function name without parentheses, like Postgres does
+      // This allows users to reference the column in WHERE/HAVING without issues
+      return call.name.toLowerCase();
+    }
+
+    // Handle Field
+    if ((expr as Field).expression_type === "field") {
+      const field = expr as Field;
+      // Return the last part of the chain (column name)
+      const parts = field.chain.filter((p): p is string => typeof p === "string");
+      return parts.length > 0 ? parts[parts.length - 1] : "*";
+    }
+
+    // Handle ArithmeticOperation - use operator function name without args
+    if ((expr as ArithmeticOperation).expression_type === "arithmetic_operation") {
+      const arith = expr as ArithmeticOperation;
+
+      switch (arith.op) {
+        case ArithmeticOperationOp.Add:
+          return "plus";
+        case ArithmeticOperationOp.Sub:
+          return "minus";
+        case ArithmeticOperationOp.Mult:
+          return "multiply";
+        case ArithmeticOperationOp.Div:
+          return "divide";
+        case ArithmeticOperationOp.Mod:
+          return "modulo";
+        default:
+          return "expression";
+      }
+    }
+
+    // Handle Constant
+    if ((expr as Constant).expression_type === "constant") {
+      const constant = expr as Constant;
+      if (constant.value === null) {
+        return "NULL";
+      }
+      if (typeof constant.value === "string") {
+        return `'${constant.value}'`;
+      }
+      return String(constant.value);
+    }
+
+    // Handle Alias (shouldn't normally reach here since aliases have explicit names)
+    if ((expr as Alias).expression_type === "alias") {
+      const alias = expr as Alias;
+      return alias.alias;
+    }
+
+    // Default fallback
+    return "expression";
+  }
+
+  /**
+   * Resolve a field chain to its column schema and output name
+   */
+  private resolveFieldToColumn(chain: Array<string | number>): {
+    outputName: string | null;
+    column: ColumnSchema | null;
+  } {
+    if (chain.length === 0) {
+      return { outputName: null, column: null };
+    }
+
+    // Handle asterisk
+    if (chain[0] === "*" || (chain.length === 2 && chain[1] === "*")) {
+      return { outputName: null, column: null };
+    }
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") {
+      return { outputName: null, column: null };
+    }
+
+    // Case 1: Qualified reference like table.column
+    if (chain.length >= 2) {
+      const tableAlias = firstPart;
+      const tableSchema = this.tableContexts.get(tableAlias);
+      if (!tableSchema) {
+        return { outputName: firstPart, column: null };
+      }
+
+      const columnName = chain[1];
+      if (typeof columnName !== "string") {
+        return { outputName: null, column: null };
+      }
+
+      const columnSchema = tableSchema.columns[columnName];
+      return {
+        outputName: columnName,
+        column: columnSchema || null,
+      };
+    }
+
+    // Case 2: Unqualified reference like just "column"
+    const columnName = firstPart;
+    for (const tableSchema of this.tableContexts.values()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema) {
+        return {
+          outputName: columnName,
+          column: columnSchema,
+        };
+      }
+    }
+
+    // Column not found in any table context
+    return {
+      outputName: columnName,
+      column: null,
+    };
+  }
+
+  // ============================================================
+  // Type Inference for Computed Expressions
+  // ============================================================
+
+  /**
+   * Infer the ClickHouse type for a function call expression
+   */
+  private inferCallType(call: Call): ClickHouseType {
+    const name = call.name.toLowerCase();
+
+    // Count functions always return UInt64
+    if (
+      name === "count" ||
+      name === "countif" ||
+      name === "countdistinct" ||
+      name === "countdistinctif"
+    ) {
+      return "UInt64";
+    }
+
+    // Uniq functions return UInt64
+    if (name.startsWith("uniq")) {
+      return "UInt64";
+    }
+
+    // Sum returns Int64 by default (could be more specific based on input)
+    if (name === "sum" || name === "sumif") {
+      return "Int64";
+    }
+
+    // Avg returns Float64
+    if (name === "avg" || name === "avgif") {
+      return "Float64";
+    }
+
+    // Quantile functions return Float64
+    if (name === "quantile" || name === "quantileif" || name.startsWith("quantile")) {
+      return "Float64";
+    }
+
+    // Min/Max preserve the input type - try to infer from first arg
+    if (name === "min" || name === "max" || name === "minif" || name === "maxif") {
+      if (call.args.length > 0) {
+        const argType = this.inferExpressionType(call.args[0]);
+        if (argType) return argType;
+      }
+      return "Float64"; // Default
+    }
+
+    // dateDiff returns Int64 (signed difference)
+    if (name === "datediff" || name === "date_diff") {
+      return "Int64";
+    }
+
+    // String functions
+    if (
+      name === "concat" ||
+      name === "substring" ||
+      name === "substr" ||
+      name === "lower" ||
+      name === "upper" ||
+      name === "trim" ||
+      name === "replace" ||
+      name === "tostring"
+    ) {
+      return "String";
+    }
+
+    // Date/DateTime conversion functions
+    if (name === "todate" || name === "todate32") {
+      return "Date";
+    }
+    if (name === "todatetime") {
+      return "DateTime";
+    }
+    if (name === "todatetime64") {
+      return "DateTime64";
+    }
+
+    // Date extraction functions return UInt8/UInt16
+    if (
+      name === "toyear" ||
+      name === "tomonth" ||
+      name === "todayofmonth" ||
+      name === "todayofweek" ||
+      name === "todayofyear" ||
+      name === "tohour" ||
+      name === "tominute" ||
+      name === "tosecond"
+    ) {
+      return "UInt16";
+    }
+
+    // toUnixTimestamp returns UInt32
+    if (name === "tounixtimestamp") {
+      return "UInt32";
+    }
+
+    // Numeric conversion functions
+    if (name === "toint8") return "Int8";
+    if (name === "toint16") return "Int16";
+    if (name === "toint32") return "Int32";
+    if (name === "toint64") return "Int64";
+    if (name === "touint8") return "UInt8";
+    if (name === "touint16") return "UInt16";
+    if (name === "touint32") return "UInt32";
+    if (name === "touint64") return "UInt64";
+    if (name === "tofloat32") return "Float32";
+    if (name === "tofloat64") return "Float64";
+
+    // Boolean functions
+    if (
+      name === "empty" ||
+      name === "notempty" ||
+      name === "isnull" ||
+      name === "isnotnull" ||
+      name === "in" ||
+      name === "notin"
+    ) {
+      return "UInt8"; // ClickHouse uses UInt8 for booleans
+    }
+
+    // If/multiIf - try to infer from result expressions
+    if (name === "if" && call.args.length >= 2) {
+      const thenType = this.inferExpressionType(call.args[1]);
+      if (thenType) return thenType;
+    }
+
+    // Array functions that return arrays
+    if (name === "grouparray" || name === "groupuniqarray" || name === "array") {
+      return "Array(String)"; // Simplified - could be more specific
+    }
+
+    // Length functions return UInt64
+    if (name === "length" || name === "lengthutf8" || name === "char_length") {
+      return "UInt64";
+    }
+
+    // Default to String for unknown functions
+    return "String";
+  }
+
+  /**
+   * Infer the ClickHouse type for an arithmetic operation
+   */
+  private inferArithmeticType(arith: ArithmeticOperation): ClickHouseType {
+    const leftType = this.inferExpressionType(arith.left);
+    const rightType = this.inferExpressionType(arith.right);
+
+    // DateTime minus DateTime could produce an interval/Int64
+    if (this.isDateTimeType(leftType) && this.isDateTimeType(rightType)) {
+      return "Int64"; // Seconds difference
+    }
+
+    // If either is Float, result is Float
+    if (this.isFloatType(leftType) || this.isFloatType(rightType)) {
+      return "Float64";
+    }
+
+    // Division always produces Float64
+    if (arith.op === ArithmeticOperationOp.Div) {
+      return "Float64";
+    }
+
+    // Integer arithmetic stays integer
+    if (this.isIntType(leftType) && this.isIntType(rightType)) {
+      // Return the wider type
+      return this.widerIntType(leftType, rightType);
+    }
+
+    // Default to Float64 for mixed or unknown types
+    return "Float64";
+  }
+
+  /**
+   * Infer the ClickHouse type for a constant value
+   */
+  private inferConstantType(constant: Constant): ClickHouseType {
+    const value = constant.value;
+
+    if (value === null) {
+      return "Nullable(String)";
+    }
+    if (typeof value === "boolean") {
+      return "UInt8";
+    }
+    if (typeof value === "number") {
+      if (Number.isInteger(value)) {
+        return "Int64";
+      }
+      return "Float64";
+    }
+    if (typeof value === "string") {
+      // Check if it looks like a date/datetime
+      if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(value)) {
+        return "DateTime64";
+      }
+      if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+        return "Date";
+      }
+      return "String";
+    }
+
+    return "String";
+  }
+
+  /**
+   * Infer the ClickHouse type for any expression
+   */
+  private inferExpressionType(expr: Expression): ClickHouseType | null {
+    if ((expr as Field).expression_type === "field") {
+      const field = expr as Field;
+      const { column } = this.resolveFieldToColumn(field.chain);
+      return column?.type ?? null;
+    }
+
+    if ((expr as Call).expression_type === "call") {
+      return this.inferCallType(expr as Call);
+    }
+
+    if ((expr as ArithmeticOperation).expression_type === "arithmetic_operation") {
+      return this.inferArithmeticType(expr as ArithmeticOperation);
+    }
+
+    if ((expr as Constant).expression_type === "constant") {
+      return this.inferConstantType(expr as Constant);
+    }
+
+    return null;
+  }
+
+  /**
+   * Check if a type is a DateTime type
+   */
+  private isDateTimeType(type: ClickHouseType | null): boolean {
+    if (!type) return false;
+    return (
+      type === "DateTime" ||
+      type === "DateTime64" ||
+      type === "Date" ||
+      type === "Date32" ||
+      type.startsWith("Nullable(DateTime") ||
+      type.startsWith("Nullable(Date")
+    );
+  }
+
+  /**
+   * Check if a type is a Float type
+   */
+  private isFloatType(type: ClickHouseType | null): boolean {
+    if (!type) return false;
+    return (
+      type === "Float32" ||
+      type === "Float64" ||
+      type === "Nullable(Float32)" ||
+      type === "Nullable(Float64)"
+    );
+  }
+
+  /**
+   * Check if a type is an integer type
+   */
+  private isIntType(type: ClickHouseType | null): boolean {
+    if (!type) return false;
+    return (
+      type.startsWith("Int") ||
+      type.startsWith("UInt") ||
+      type.startsWith("Nullable(Int") ||
+      type.startsWith("Nullable(UInt")
+    );
+  }
+
+  /**
+   * Return the wider of two integer types
+   */
+  private widerIntType(left: ClickHouseType | null, right: ClickHouseType | null): ClickHouseType {
+    // Simple heuristic: prefer Int64 for safety
+    if (left === "Int64" || right === "Int64") return "Int64";
+    if (left === "UInt64" || right === "UInt64") return "UInt64";
+    if (left === "Int32" || right === "Int32") return "Int32";
+    if (left === "UInt32" || right === "UInt32") return "UInt32";
+    return "Int64";
+  }
+
+  /**
+   * Get the virtual column name if a field chain references a virtual column
+   * @returns The column name (as exposed in TSQL), or null if not a virtual column
+   */
+  private getVirtualColumnNameForField(chain: Array<string | number>): string | null {
+    if (chain.length === 0) return null;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return null;
+
+    // Case 1: Qualified reference like table.column
+    if (chain.length >= 2) {
+      const tableAlias = firstPart;
+      const tableSchema = this.tableContexts.get(tableAlias);
+      if (!tableSchema) return null;
+
+      const columnName = chain[1];
+      if (typeof columnName !== "string") return null;
+
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema && isVirtualColumn(columnSchema)) {
+        return columnName;
+      }
+      return null;
+    }
+
+    // Case 2: Unqualified reference like just "column"
+    const columnName = firstPart;
+    for (const tableSchema of this.tableContexts.values()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema && isVirtualColumn(columnSchema)) {
+        return columnName;
+      }
+    }
+
+    return null;
+  }
+
+  // ============================================================
+  // JOIN Expression Visitor
+  // ============================================================
+
+  private visitJoinExpr(node: JoinExpr): JoinExprResponse {
+    let extraWhere: Expression | null = null;
+    const joinStrings: string[] = [];
+
+    // Add join type
+    if (node.join_type) {
+      joinStrings.push(node.join_type);
+    }
+
+    // Handle table reference
+    if (node.table) {
+      const tableExpr = node.table;
+
+      if ((tableExpr as Field).expression_type === "field") {
+        // Direct table reference
+        const field = tableExpr as Field;
+        const tableName = field.chain[0];
+        if (typeof tableName !== "string") {
+          throw new QueryError("Table name must be a string");
+        }
+
+        // Look up table schema and get ClickHouse table name
+        const tableSchema = this.lookupTable(tableName);
+
+        // Validate that required tenant columns are present in enforcedWhereClause
+        this.validateRequiredTenantColumns(tableSchema);
+
+        // Always add the TSQL table name as an alias if no explicit alias is provided
+        // This ensures table-qualified column references work in WHERE clauses
+        // (needed to avoid alias conflicts when columns have expressions)
+        const effectiveAlias = node.alias || tableName;
+        joinStrings.push(
+          `${tableSchema.clickhouseName} AS ${this.printIdentifier(effectiveAlias)}`
+        );
+
+        // Register this table context for column name resolution
+        this.tableContexts.set(effectiveAlias, tableSchema);
+
+        // Register tenant columns as allowed internal columns
+        // These are ClickHouse column names used for tenant isolation
+        // Also mark them as internal-only if they're not exposed in tableSchema.columns
+        if (tableSchema.tenantColumns) {
+          const { organizationId, projectId, environmentId } = tableSchema.tenantColumns;
+          if (organizationId) {
+            this.allowedInternalColumns.add(organizationId);
+            if (!this.isColumnExposedInSchema(tableSchema, organizationId)) {
+              this.internalOnlyColumns.add(organizationId);
+            }
+          }
+          if (projectId) {
+            this.allowedInternalColumns.add(projectId);
+            if (!this.isColumnExposedInSchema(tableSchema, projectId)) {
+              this.internalOnlyColumns.add(projectId);
+            }
+          }
+          if (environmentId) {
+            this.allowedInternalColumns.add(environmentId);
+            if (!this.isColumnExposedInSchema(tableSchema, environmentId)) {
+              this.internalOnlyColumns.add(environmentId);
+            }
+          }
+        }
+
+        // Register required filter columns as allowed internal columns
+        // These are ClickHouse columns used for internal filtering (e.g., engine = 'V2')
+        // Also mark them as internal-only if they're not exposed in tableSchema.columns
+        if (tableSchema.requiredFilters) {
+          for (const filter of tableSchema.requiredFilters) {
+            this.allowedInternalColumns.add(filter.column);
+            if (!this.isColumnExposedInSchema(tableSchema, filter.column)) {
+              this.internalOnlyColumns.add(filter.column);
+            }
+          }
+        }
+
+        // Add enforced WHERE clause guard (tenant isolation + plan limits)
+        extraWhere = this.createEnforcedGuard(tableSchema, effectiveAlias);
+      } else if (
+        (tableExpr as SelectQuery).expression_type === "select_query" ||
+        (tableExpr as SelectSetQuery).expression_type === "select_set_query"
+      ) {
+        // Subquery
+        joinStrings.push(this.visit(tableExpr));
+      } else if ((tableExpr as Placeholder).expression_type === "placeholder") {
+        // Placeholder - visit inner expression
+        joinStrings.push(this.visit(tableExpr));
+      } else {
+        throw new QueryError(
+          `Unsupported table expression type: ${(tableExpr as Expression).expression_type}`
+        );
+      }
+    }
+
+    // Add alias
+    if (node.alias) {
+      joinStrings.push(`AS ${this.printIdentifier(node.alias)}`);
+    }
+
+    // Add FINAL for direct table references to ReplacingMergeTree tables
+    // to ensure deduplicated results. Only applied when the table schema
+    // opts in via `useFinal: true` (not needed for plain MergeTree tables).
+    if (node.table) {
+      const tableExpr = node.table;
+      if ((tableExpr as Field).expression_type === "field") {
+        const field = tableExpr as Field;
+        const tableName = field.chain[0];
+        if (typeof tableName === "string") {
+          const tableSchema = this.lookupTable(tableName);
+          if (tableSchema.useFinal) {
+            joinStrings.push("FINAL");
+          }
+        }
+      }
+    }
+
+    // Add SAMPLE
+    if (node.sample) {
+      const sampleClause = this.visitSampleExpr(node.sample);
+      if (sampleClause) {
+        joinStrings.push(sampleClause);
+      }
+    }
+
+    // Add constraint
+    if (node.constraint) {
+      joinStrings.push(`${node.constraint.constraint_type} ${this.visit(node.constraint)}`);
+    }
+
+    return {
+      printedSql: joinStrings.join(" "),
+      where: extraWhere,
+    };
+  }
+
+  // ============================================================
+  // Enforced WHERE Clause
+  // ============================================================
+
+  /**
+   * Validate that required tenant columns are present in enforcedWhereClause.
+   *
+   * If a table defines `tenantColumns.organizationId`, the `enforcedWhereClause`
+   * MUST include that column to ensure tenant isolation. This prevents accidental
+   * data leaks when the caller forgets to include tenant isolation conditions.
+   *
+   * @throws QueryError if a required tenant column is missing
+   */
+  private validateRequiredTenantColumns(tableSchema: TableSchema): void {
+    const { tenantColumns } = tableSchema;
+    if (!tenantColumns) return;
+
+    // Organization ID is always required if the table defines it
+    if (tenantColumns.organizationId) {
+      const orgColumn = tenantColumns.organizationId;
+      if (!this.context.enforcedWhereClause[orgColumn]) {
+        throw new QueryError(
+          `Table '${tableSchema.name}' requires '${orgColumn}' in enforcedWhereClause for tenant isolation`
+        );
+      }
+    }
+    // Note: projectId and environmentId are optional - no validation needed
+  }
+
+  /**
+   * Format a Date as a ClickHouse-compatible DateTime64 string.
+   * ClickHouse expects format: 'YYYY-MM-DD HH:MM:SS.mmm' (in UTC)
+   */
+  private formatDateForClickHouse(date: Date): string {
+    const year = date.getUTCFullYear();
+    const month = String(date.getUTCMonth() + 1).padStart(2, "0");
+    const day = String(date.getUTCDate()).padStart(2, "0");
+    const hours = String(date.getUTCHours()).padStart(2, "0");
+    const minutes = String(date.getUTCMinutes()).padStart(2, "0");
+    const seconds = String(date.getUTCSeconds()).padStart(2, "0");
+    const ms = String(date.getUTCMilliseconds()).padStart(3, "0");
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}.${ms}`;
+  }
+
+  /**
+   * Create an AST expression for a value.
+   * Date values are wrapped in toDateTime64() for ClickHouse compatibility.
+   */
+  private createValueExpression(value: Date | string | number): Expression {
+    if (value instanceof Date) {
+      // Wrap Date in toDateTime64(formatted_string, 3) for ClickHouse DateTime64(3) columns
+      return {
+        expression_type: "call",
+        name: "toDateTime64",
+        args: [
+          { expression_type: "constant", value: this.formatDateForClickHouse(value) } as Constant,
+          { expression_type: "constant", value: 3 } as Constant,
+        ],
+      } as Call;
+    }
+    return { expression_type: "constant", value } as Constant;
+  }
+
+  /**
+   * Map condition operator to CompareOperationOp
+   */
+  private mapConditionOpToCompareOp(
+    op: "eq" | "neq" | "gt" | "gte" | "lt" | "lte"
+  ): CompareOperationOp {
+    switch (op) {
+      case "eq":
+        return CompareOperationOp.Eq;
+      case "neq":
+        return CompareOperationOp.NotEq;
+      case "gt":
+        return CompareOperationOp.Gt;
+      case "gte":
+        return CompareOperationOp.GtEq;
+      case "lt":
+        return CompareOperationOp.Lt;
+      case "lte":
+        return CompareOperationOp.LtEq;
+    }
+  }
+
+  /**
+   * Create an AST expression from a WhereClauseCondition
+   *
+   * @param column - The column name
+   * @param condition - The condition to apply
+   * @param tableAlias - Optional table alias to qualify the column reference.
+   *                     When provided, constructs the field chain as [tableAlias, column]
+   *                     so resolveFieldChain will resolve to the correct table in multi-join queries.
+   * @returns The AST expression for the condition
+   */
+  private createConditionExpression(
+    column: string,
+    condition: WhereClauseCondition,
+    tableAlias?: string
+  ): Expression {
+    // When tableAlias is provided, qualify the field chain to ensure it binds
+    // to the correct table in multi-join queries
+    const fieldExpr: Field = {
+      expression_type: "field",
+      chain: tableAlias ? [tableAlias, column] : [column],
+    };
+
+    if (condition.op === "between") {
+      const betweenExpr: BetweenExpr = {
+        expression_type: "between_expr",
+        expr: fieldExpr,
+        low: this.createValueExpression(condition.low),
+        high: this.createValueExpression(condition.high),
+      };
+      return betweenExpr;
+    }
+
+    if (condition.op === "in") {
+      // Create a tuple of values for the IN clause
+      const tupleExpr: Tuple = {
+        expression_type: "tuple",
+        exprs: condition.values.map((value) => this.createValueExpression(value)),
+      };
+      const inExpr: CompareOperation = {
+        expression_type: "compare_operation",
+        left: fieldExpr,
+        right: tupleExpr,
+        op: CompareOperationOp.In,
+      };
+      return inExpr;
+    }
+
+    // Simple comparison
+    const compareExpr: CompareOperation = {
+      expression_type: "compare_operation",
+      left: fieldExpr,
+      right: this.createValueExpression(condition.value),
+      op: this.mapConditionOpToCompareOp(condition.op),
+    };
+    return compareExpr;
+  }
+
+  /**
+   * Create a WHERE clause expression for enforced conditions and required filters.
+   *
+   * This method applies:
+   * 1. All conditions from enforcedWhereClause (tenant isolation + plan limits)
+   * 2. Required filters from the table schema (e.g., engine = 'V2')
+   *
+   * Conditions are applied if the column exists in either:
+   * - The exposed columns (tableSchema.columns)
+   * - The tenant columns (tableSchema.tenantColumns)
+   *
+   * This ensures the same enforcedWhereClause can be used across different tables.
+   *
+   * All guard expressions are qualified with the table alias to ensure they bind
+   * to the correct table in multi-join queries, preventing potential security
+   * issues where an unqualified column reference could bind to the wrong table.
+   */
+  private createEnforcedGuard(tableSchema: TableSchema, tableAlias: string): Expression | null {
+    const { requiredFilters, tenantColumns } = tableSchema;
+    const guards: Expression[] = [];
+
+    // Build a set of valid columns for this table (exposed + tenant columns)
+    const validColumns = new Set<string>(Object.keys(tableSchema.columns));
+    if (tenantColumns) {
+      if (tenantColumns.organizationId) validColumns.add(tenantColumns.organizationId);
+      if (tenantColumns.projectId) validColumns.add(tenantColumns.projectId);
+      if (tenantColumns.environmentId) validColumns.add(tenantColumns.environmentId);
+    }
+
+    // Apply all enforced conditions for columns that exist in this table
+    // Pass tableAlias to ensure guards are qualified and bind to the correct table
+    for (const [column, condition] of Object.entries(this.context.enforcedWhereClause)) {
+      // Skip undefined/null conditions (allows conditional inclusion like project_id?: condition)
+      if (condition === undefined || condition === null) {
+        continue;
+      }
+      // Only apply if column exists in this table's schema or is a tenant column
+      if (validColumns.has(column)) {
+        guards.push(this.createConditionExpression(column, condition, tableAlias));
+      }
+    }
+
+    // Add required filters from the table schema (e.g., engine = 'V2')
+    // Also qualified with table alias to ensure correct binding in multi-join queries
+    if (requiredFilters && requiredFilters.length > 0) {
+      for (const filter of requiredFilters) {
+        const filterGuard: CompareOperation = {
+          expression_type: "compare_operation",
+          op: CompareOperationOp.Eq,
+          left: { expression_type: "field", chain: [tableAlias, filter.column] } as Field,
+          right: { expression_type: "constant", value: filter.value } as Constant,
+        };
+        guards.push(filterGuard);
+      }
+    }
+
+    // Return null if no guards (empty enforcedWhereClause and no requiredFilters)
+    if (guards.length === 0) {
+      return null;
+    }
+
+    // If only one guard, return it directly (no need for AND wrapper)
+    if (guards.length === 1) {
+      return guards[0];
+    }
+
+    return {
+      expression_type: "and",
+      exprs: guards,
+    } as And;
+  }
+
+  // ============================================================
+  // Expression Visitors
+  // ============================================================
+
+  private visitCTE(node: CTE): string {
+    return this.visit(node.expr);
+  }
+
+  private visitAlias(node: Alias): string {
+    const expr = this.visit(node.expr);
+    if (node.hidden) {
+      return expr;
+    }
+    return `${expr} AS ${this.printIdentifier(node.alias)}`;
+  }
+
+  private visitArithmeticOperation(node: ArithmeticOperation): string {
+    const left = this.visit(node.left);
+    const right = this.visit(node.right);
+
+    switch (node.op) {
+      case ArithmeticOperationOp.Add:
+        return `plus(${left}, ${right})`;
+      case ArithmeticOperationOp.Sub:
+        return `minus(${left}, ${right})`;
+      case ArithmeticOperationOp.Mult:
+        return `multiply(${left}, ${right})`;
+      case ArithmeticOperationOp.Div:
+        return `divide(${left}, ${right})`;
+      case ArithmeticOperationOp.Mod:
+        return `modulo(${left}, ${right})`;
+      default:
+        throw new ImpossibleASTError(`Unknown ArithmeticOperationOp: ${node.op}`);
+    }
+  }
+
+  private visitAnd(node: And): string {
+    if (node.exprs.length === 1) {
+      return this.visit(node.exprs[0]);
+    }
+
+    // Optimization: filter out constant true values, short-circuit on false
+    const exprs: string[] = [];
+    for (const expr of node.exprs) {
+      const printed = this.visit(expr);
+      if (printed === "0") {
+        // Short-circuit: and(..., 0, ...) => 0
+        return "0";
+      }
+      if (printed !== "1") {
+        // Skip constant true values
+        exprs.push(printed);
+      }
+    }
+
+    if (exprs.length === 0) {
+      return "1";
+    }
+    if (exprs.length === 1) {
+      return exprs[0];
+    }
+    return `and(${exprs.join(", ")})`;
+  }
+
+  private visitOr(node: Or): string {
+    if (node.exprs.length === 1) {
+      return this.visit(node.exprs[0]);
+    }
+
+    // Optimization: filter out constant false values, short-circuit on true
+    const exprs: string[] = [];
+    for (const expr of node.exprs) {
+      const printed = this.visit(expr);
+      if (printed === "1") {
+        // Short-circuit: or(..., 1, ...) => 1
+        return "1";
+      }
+      if (printed !== "0") {
+        // Skip constant false values
+        exprs.push(printed);
+      }
+    }
+
+    if (exprs.length === 0) {
+      return "0";
+    }
+    if (exprs.length === 1) {
+      return exprs[0];
+    }
+    return `or(${exprs.join(", ")})`;
+  }
+
+  private visitNot(node: Not): string {
+    return `not(${this.visit(node.expr)})`;
+  }
+
+  private visitCompareOperation(node: CompareOperation): string {
+    // Check if we need to transform values using valueMap
+    const columnSchema = this.extractColumnSchemaFromExpression(node.left);
+    const rightColumnSchema = this.extractColumnSchemaFromExpression(node.right);
+
+    // Transform the right side if it contains user-friendly values
+    const transformedRight = this.transformValueMapExpression(node.right, columnSchema);
+
+    // Check if we should use a text column for bare JSON field comparisons
+    // This applies to: Eq, NotEq, Like, ILike, NotLike, NotILike
+    const textColumnOps = [
+      CompareOperationOp.Eq,
+      CompareOperationOp.NotEq,
+      CompareOperationOp.Like,
+      CompareOperationOp.ILike,
+      CompareOperationOp.NotLike,
+      CompareOperationOp.NotILike,
+    ];
+    const useTextColumn = textColumnOps.includes(node.op);
+    const leftTextColumn = useTextColumn ? this.getTextColumnForExpression(node.left) : null;
+
+    // Build the left side, qualifying the text column with table alias if present
+    let left: string;
+    if (leftTextColumn) {
+      // Check if the field is qualified with a table alias (e.g., r.output)
+      // and prepend that alias to the text column to avoid ambiguity in JOINs
+      const fieldNode = node.left as Field;
+      if (fieldNode.expression_type === "field" && fieldNode.chain.length >= 2) {
+        const firstPart = fieldNode.chain[0];
+        if (typeof firstPart === "string" && this.tableContexts.has(firstPart)) {
+          // The field is qualified with a table alias, prepend it to the text column
+          left = this.printIdentifier(firstPart) + "." + this.printIdentifier(leftTextColumn);
+        } else {
+          left = this.printIdentifier(leftTextColumn);
+        }
+      } else {
+        left = this.printIdentifier(leftTextColumn);
+      }
+    } else {
+      left = this.visit(node.left);
+    }
+    const right = this.visit(transformedRight);
+
+    switch (node.op) {
+      case CompareOperationOp.Eq:
+        // Handle NULL comparison
+        if (
+          (transformedRight as Constant).expression_type === "constant" &&
+          (transformedRight as Constant).value === null
+        ) {
+          // Check if the column has a custom nullValue (e.g., '{}' for JSON columns)
+          if (columnSchema?.nullValue) {
+            return `equals(${left}, ${columnSchema.nullValue})`;
+          }
+          return `isNull(${left})`;
+        }
+        if (
+          (node.left as Constant).expression_type === "constant" &&
+          (node.left as Constant).value === null
+        ) {
+          // Check if the column has a custom nullValue (e.g., '{}' for JSON columns)
+          if (rightColumnSchema?.nullValue) {
+            return `equals(${right}, ${rightColumnSchema.nullValue})`;
+          }
+          return `isNull(${right})`;
+        }
+        return `equals(${left}, ${right})`;
+
+      case CompareOperationOp.NotEq:
+        // Handle NULL comparison
+        if (
+          (transformedRight as Constant).expression_type === "constant" &&
+          (transformedRight as Constant).value === null
+        ) {
+          // Check if the column has a custom nullValue (e.g., '{}' for JSON columns)
+          if (columnSchema?.nullValue) {
+            return `notEquals(${left}, ${columnSchema.nullValue})`;
+          }
+          return `isNotNull(${left})`;
+        }
+        if (
+          (node.left as Constant).expression_type === "constant" &&
+          (node.left as Constant).value === null
+        ) {
+          // Check if the column has a custom nullValue (e.g., '{}' for JSON columns)
+          if (rightColumnSchema?.nullValue) {
+            return `notEquals(${right}, ${rightColumnSchema.nullValue})`;
+          }
+          return `isNotNull(${right})`;
+        }
+        return `notEquals(${left}, ${right})`;
+
+      case CompareOperationOp.Lt:
+        return `less(${left}, ${right})`;
+      case CompareOperationOp.LtEq:
+        return `lessOrEquals(${left}, ${right})`;
+      case CompareOperationOp.Gt:
+        return `greater(${left}, ${right})`;
+      case CompareOperationOp.GtEq:
+        return `greaterOrEquals(${left}, ${right})`;
+      case CompareOperationOp.Like:
+        return `like(${left}, ${right})`;
+      case CompareOperationOp.ILike:
+        return `ilike(${left}, ${right})`;
+      case CompareOperationOp.NotLike:
+        return `notLike(${left}, ${right})`;
+      case CompareOperationOp.NotILike:
+        return `notILike(${left}, ${right})`;
+      case CompareOperationOp.In:
+        return `in(${left}, ${right})`;
+      case CompareOperationOp.NotIn:
+        return `notIn(${left}, ${right})`;
+      case CompareOperationOp.GlobalIn:
+        return `globalIn(${left}, ${right})`;
+      case CompareOperationOp.GlobalNotIn:
+        return `globalNotIn(${left}, ${right})`;
+      case CompareOperationOp.Regex:
+        return `match(${left}, ${right})`;
+      case CompareOperationOp.NotRegex:
+        return `not(match(${left}, ${right}))`;
+      case CompareOperationOp.IRegex:
+        return `match(${left}, concat('(?i)', ${right}))`;
+      case CompareOperationOp.NotIRegex:
+        return `not(match(${left}, concat('(?i)', ${right})))`;
+      default:
+        throw new ImpossibleASTError(`Unknown CompareOperationOp: ${node.op}`);
+    }
+  }
+
+  /**
+   * Extract column schema from a field expression if it references a known column
+   */
+  private extractColumnSchemaFromExpression(expr: Expression): ColumnSchema | null {
+    if ((expr as Field).expression_type !== "field") return null;
+
+    const field = expr as Field;
+    const chain = field.chain;
+
+    if (chain.length === 0) return null;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return null;
+
+    // Qualified reference: table.column
+    if (chain.length >= 2) {
+      const tableAlias = firstPart;
+      const tableSchema = this.tableContexts.get(tableAlias);
+      if (!tableSchema) return null;
+
+      const columnName = chain[1];
+      if (typeof columnName !== "string") return null;
+
+      return tableSchema.columns[columnName] || null;
+    }
+
+    // Unqualified reference
+    const columnName = firstPart;
+    for (const tableSchema of this.tableContexts.values()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema) {
+        return columnSchema;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Transform a single string value using whereTransform, valueMap, or fieldMapping
+   * Returns the transformed value, or the original value if no transformation applies
+   */
+  private transformSingleValue(columnSchema: ColumnSchema, value: string): string {
+    // First try whereTransform function (highest priority)
+    if (columnSchema.whereTransform) {
+      return columnSchema.whereTransform(value);
+    }
+
+    // Then try static valueMap
+    if (columnSchema.valueMap) {
+      const internalValue = getInternalValue(columnSchema, value);
+      if (internalValue !== value) {
+        return internalValue;
+      }
+    }
+
+    // Then try runtime fieldMapping
+    if (hasFieldMapping(columnSchema) && columnSchema.fieldMapping) {
+      const internalValue = getInternalValueFromMappingCaseInsensitive(
+        this.context.fieldMappings,
+        columnSchema.fieldMapping,
+        value
+      );
+      if (internalValue !== null) {
+        return internalValue;
+      }
+    }
+
+    return value;
+  }
+
+  /**
+   * Transform an expression's values using the column's whereTransform, valueMap, or fieldMapping if applicable
+   * Returns the original expression if no transformation is needed
+   */
+  private transformValueMapExpression(
+    expr: Expression,
+    columnSchema: ColumnSchema | null
+  ): Expression {
+    // No column schema, return as-is
+    if (!columnSchema) {
+      return expr;
+    }
+
+    // Check if column has any transformation mechanism
+    const hasWhereTransform = columnSchema.whereTransform !== undefined;
+    const hasValueMap = columnSchema.valueMap && Object.keys(columnSchema.valueMap).length > 0;
+    const hasFieldMap = hasFieldMapping(columnSchema);
+    if (!hasWhereTransform && !hasValueMap && !hasFieldMap) {
+      return expr;
+    }
+
+    // Handle constant string values
+    if ((expr as Constant).expression_type === "constant") {
+      const constant = expr as Constant;
+      if (typeof constant.value === "string") {
+        const internalValue = this.transformSingleValue(columnSchema, constant.value);
+        if (internalValue !== constant.value) {
+          // Return a new constant with the transformed value
+          return {
+            expression_type: "constant",
+            value: internalValue,
+          } as Constant;
+        }
+      }
+      return expr;
+    }
+
+    // Handle arrays (for IN expressions with [...])
+    if ((expr as ASTArray).expression_type === "array") {
+      const array = expr as ASTArray;
+      const transformedExprs = array.exprs.map((e) =>
+        this.transformValueMapExpression(e, columnSchema)
+      );
+
+      // Check if any expressions were actually transformed
+      const hasChanges = transformedExprs.some((e, i) => e !== array.exprs[i]);
+      if (hasChanges) {
+        return {
+          expression_type: "array",
+          exprs: transformedExprs,
+        } as ASTArray;
+      }
+      return expr;
+    }
+
+    // Handle tuples (for IN expressions with (...))
+    if ((expr as Tuple).expression_type === "tuple") {
+      const tuple = expr as Tuple;
+      const transformedExprs = tuple.exprs.map((e) =>
+        this.transformValueMapExpression(e, columnSchema)
+      );
+
+      // Check if any expressions were actually transformed
+      const hasChanges = transformedExprs.some((e, i) => e !== tuple.exprs[i]);
+      if (hasChanges) {
+        return {
+          expression_type: "tuple",
+          exprs: transformedExprs,
+        } as Tuple;
+      }
+      return expr;
+    }
+
+    // Other expression types, return as-is
+    return expr;
+  }
+
+  private visitBetweenExpr(node: BetweenExpr): string {
+    const expr = this.visit(node.expr);
+    const low = this.visit(node.low);
+    const high = this.visit(node.high);
+    const notKw = node.negated ? " NOT" : "";
+    return `${expr}${notKw} BETWEEN ${low} AND ${high}`;
+  }
+
+  private visitOrderExpr(node: OrderExpr): string {
+    const expr = this.visit(node.expr);
+    return `${expr} ${node.order || "ASC"}`;
+  }
+
+  private visitArrayAccess(node: ArrayAccess): string {
+    const array = this.visit(node.array);
+    const property = this.visit(node.property);
+    return `${array}[${property}]`;
+  }
+
+  private visitArray(node: ASTArray): string {
+    const elements = node.exprs.map((e) => this.visit(e));
+    return `[${elements.join(", ")}]`;
+  }
+
+  private visitDict(node: Dict): string {
+    // Convert dict to tuple format for ClickHouse
+    let str = "tuple('__hx_tag', '__hx_obj'";
+    for (const [key, value] of node.items) {
+      str += `, ${this.visit(key)}, ${this.visit(value)}`;
+    }
+    return str + ")";
+  }
+
+  private visitTupleAccess(node: TupleAccess): string {
+    const tuple = this.visit(node.tuple);
+    const index = node.index;
+    const isSimple =
+      (node.tuple as Field).expression_type === "field" ||
+      (node.tuple as Tuple).expression_type === "tuple" ||
+      (node.tuple as Call).expression_type === "call";
+    return isSimple ? `${tuple}.${index}` : `(${tuple}).${index}`;
+  }
+
+  private visitTuple(node: Tuple): string {
+    const elements = node.exprs.map((e) => this.visit(e));
+    return `tuple(${elements.join(", ")})`;
+  }
+
+  private visitLambda(node: Lambda): string {
+    const identifiers = node.args.map((arg) => this.printIdentifier(arg));
+    if (identifiers.length === 0) {
+      throw new QueryError("Lambdas require at least one argument");
+    }
+    const args = identifiers.length === 1 ? identifiers[0] : `(${identifiers.join(", ")})`;
+    return `${args} -> ${this.visit(node.expr as Expression)}`;
+  }
+
+  private visitConstant(node: Constant): string {
+    const value = node.value;
+
+    // Inline simple constants
+    if (value === null) {
+      return "NULL";
+    }
+    if (typeof value === "boolean") {
+      return value ? "1" : "0";
+    }
+    if (typeof value === "number") {
+      if (!Number.isFinite(value)) {
+        if (Number.isNaN(value)) return "nan";
+        return value > 0 ? "inf" : "-inf";
+      }
+      return String(value);
+    }
+
+    // Use parameterized query for strings and other types
+    return this.context.addValue(value);
+  }
+
+  private visitField(node: Field): string {
+    if (node.chain.length === 0) {
+      throw new ImpossibleASTError("Field chain is empty");
+    }
+
+    // Handle asterisk
+    if (node.chain.length === 1 && node.chain[0] === "*") {
+      return "*";
+    }
+
+    // Handle table.* asterisk
+    if (node.chain.length === 2 && node.chain[1] === "*") {
+      const tableAlias = node.chain[0];
+      if (typeof tableAlias === "string") {
+        return `${this.printIdentifier(tableAlias)}.*`;
+      }
+    }
+
+    // Check if this field is a virtual column
+    // BUT: if the column has whereTransform and we're in a comparison context,
+    // use the raw column instead of the expression (for efficient index usage)
+    const columnSchema = this.resolveFieldToColumnSchema(node.chain);
+    const inComparisonContext = this.isInComparisonContext();
+
+    if (columnSchema?.whereTransform && inComparisonContext) {
+      // Use raw column for WHERE comparisons when whereTransform is defined
+      // Must table-qualify to avoid alias conflicts with SELECT expressions
+      const tableQualifiedChain = this.resolveFieldChainWithTableAlias(node.chain);
+      return tableQualifiedChain.map((part) => this.printIdentifierOrIndex(part)).join(".");
+    }
+
+    // In GROUP BY context, for virtual columns (columns with expressions),
+    // use the alias name instead of the expression. ClickHouse allows
+    // referencing SELECT aliases in GROUP BY.
+    if (this.inGroupByContext) {
+      const virtualColumnName = this.getVirtualColumnNameForField(node.chain);
+      if (virtualColumnName !== null) {
+        return this.printIdentifier(virtualColumnName);
+      }
+    }
+
+    const virtualExpression = this.getVirtualColumnExpressionForField(node.chain);
+    if (virtualExpression !== null) {
+      // Return the expression wrapped in parentheses
+      return `(${virtualExpression})`;
+    }
+
+    // Inject dataPrefix for JSON columns if needed (e.g., output.message -> output.data.message)
+    const chainWithPrefix = this.injectDataPrefix(node.chain);
+
+    // Try to resolve column names through table context
+    const resolvedChain = this.resolveFieldChain(chainWithPrefix);
+
+    // Print each chain element
+    let result = resolvedChain.map((part) => this.printIdentifierOrIndex(part)).join(".");
+
+    // For JSON column subfield access (e.g., error.data.name), add .:String type hint
+    // This is ONLY required when the query has GROUP BY, because:
+    // 1. ClickHouse's Dynamic/Variant types are not allowed in GROUP BY without type casting
+    // 2. SELECT/GROUP BY expressions must match
+    // For queries without GROUP BY, the .:String type hint actually breaks the query
+    // (returns NULL instead of the actual value)
+    // We also skip this in WHERE comparisons where it breaks the query
+    if (resolvedChain.length > 1) {
+      // Check if the root column (first part) is a JSON column
+      const rootColumnSchema = this.resolveFieldToColumnSchema([node.chain[0]]);
+      // Add .:String ONLY for GROUP BY queries, and NOT in WHERE comparisons
+      if (
+        rootColumnSchema?.type === "JSON" &&
+        this.queryHasGroupBy &&
+        !this.isInWhereComparisonContext()
+      ) {
+        // Add .:String type hint for JSON subfield access
+        result = `${result}.:String`;
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Check if we're in a context where we should use raw column names
+   * instead of virtual column expressions (WHERE comparisons or GROUP BY)
+   */
+  private isInComparisonContext(): boolean {
+    // Check if we're in GROUP BY context
+    if (this.inGroupByContext) {
+      return true;
+    }
+
+    // Check if we're inside a comparison operation (WHERE/HAVING context)
+    for (const node of this.stack) {
+      if ((node as CompareOperation).expression_type === "compare_operation") {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Check if we're inside a WHERE/HAVING comparison operation.
+   * Unlike isInComparisonContext(), this does NOT include GROUP BY context.
+   * Used to skip .:String type hints in WHERE clauses where they break queries.
+   */
+  private isInWhereComparisonContext(): boolean {
+    for (const node of this.stack) {
+      if ((node as CompareOperation).expression_type === "compare_operation") {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Resolve field chain with table alias prefix to avoid alias conflicts.
+   * This is used in WHERE clauses when a column has whereTransform to ensure
+   * we reference the raw column, not a SELECT alias with the same name.
+   */
+  private resolveFieldChainWithTableAlias(chain: Array<string | number>): Array<string | number> {
+    if (chain.length === 0) return chain;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return chain;
+
+    // If already qualified (table.column), use normal resolution
+    if (chain.length >= 2) {
+      return this.resolveFieldChain(chain);
+    }
+
+    // Unqualified reference - need to find the table and add its alias
+    const columnName = firstPart;
+    for (const [tableAlias, tableSchema] of this.tableContexts.entries()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema) {
+        const resolvedColumnName = columnSchema.clickhouseName || columnSchema.name;
+        return [tableAlias, resolvedColumnName, ...chain.slice(1)];
+      }
+    }
+
+    // Not found in any table - return as-is
+    return chain;
+  }
+
+  /**
+   * Check if a field chain represents JSON subfield access (e.g., error.data.name)
+   * Returns true if the root column is JSON type and there are additional path parts
+   */
+  private isJsonSubfieldAccess(chain: Array<string | number>): boolean {
+    if (chain.length <= 1) return false;
+
+    const rootColumnSchema = this.resolveFieldToColumnSchema([chain[0]]);
+    return rootColumnSchema?.type === "JSON";
+  }
+
+  /**
+   * Check if a field should use a text column instead of the JSON column.
+   * Returns the text column name if the field is a bare JSON field with textColumn defined,
+   * or null if the original column should be used.
+   *
+   * A "bare" JSON field means selecting the entire column (e.g., SELECT output)
+   * rather than accessing a subfield (e.g., SELECT output.data.name).
+   */
+  private getTextColumnForField(chain: Array<string | number>): string | null {
+    if (chain.length === 0) return null;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return null;
+
+    let columnSchema: ColumnSchema | null = null;
+
+    if (chain.length === 1) {
+      // Unqualified: just column name
+      columnSchema = this.resolveFieldToColumnSchema(chain);
+    } else if (chain.length === 2) {
+      // Could be table.column (qualified) - check if first part is a table alias
+      const tableSchema = this.tableContexts.get(firstPart);
+      if (tableSchema) {
+        const columnName = chain[1];
+        if (typeof columnName === "string") {
+          columnSchema = tableSchema.columns[columnName] || null;
+        }
+      }
+      // If not a table alias, it's JSON path access (e.g., output.data) - return null
+    }
+    // chain.length > 2 means JSON path access - return null
+
+    return columnSchema?.textColumn ?? null;
+  }
+
+  /**
+   * Get the text column for an expression if it's a bare JSON field.
+   * Returns null if the expression is not a field or doesn't have a textColumn.
+   */
+  private getTextColumnForExpression(expr: Expression): string | null {
+    if ((expr as Field).expression_type !== "field") return null;
+    return this.getTextColumnForField((expr as Field).chain);
+  }
+
+  /**
+   * Get the dataPrefix for a field chain if the root column has one defined.
+   * Returns null if the column doesn't have a dataPrefix or if this isn't a subfield access.
+   */
+  private getDataPrefixForField(chain: Array<string | number>): string | null {
+    if (chain.length < 2) return null; // Need at least column.subfield
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return null;
+
+    // Check if first part is a table alias (table.column.subfield)
+    const tableSchema = this.tableContexts.get(firstPart);
+    if (tableSchema) {
+      // Qualified: table.column.subfield - need at least 3 parts
+      if (chain.length < 3) return null;
+      const columnName = chain[1];
+      if (typeof columnName !== "string") return null;
+      const columnSchema = tableSchema.columns[columnName];
+      return columnSchema?.dataPrefix ?? null;
+    }
+
+    // Unqualified: column.subfield
+    const columnSchema = this.resolveFieldToColumnSchema([firstPart]);
+    return columnSchema?.dataPrefix ?? null;
+  }
+
+  /**
+   * Inject dataPrefix into a field chain if the root column has one defined.
+   * e.g., [output, message] -> [output, data, message] when dataPrefix is "data"
+   * Returns the original chain if no dataPrefix applies.
+   */
+  private injectDataPrefix(chain: Array<string | number>): Array<string | number> {
+    const dataPrefix = this.getDataPrefixForField(chain);
+    if (!dataPrefix) return chain;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return chain;
+
+    // Check if first part is a table alias
+    const tableSchema = this.tableContexts.get(firstPart);
+    if (tableSchema) {
+      // Qualified: table.column.subfield -> table.column.dataPrefix.subfield
+      // [table, column, subfield] -> [table, column, dataPrefix, subfield]
+      return [chain[0], chain[1], dataPrefix, ...chain.slice(2)];
+    }
+
+    // Unqualified: column.subfield -> column.dataPrefix.subfield
+    // [column, subfield] -> [column, dataPrefix, subfield]
+    return [chain[0], dataPrefix, ...chain.slice(1)];
+  }
+
+  /**
+   * Build an alias name for a field chain, excluding the dataPrefix if present.
+   * e.g., [output, message] with dataPrefix "data" -> "output_message"
+   * This gives users clean column names without the internal data wrapper.
+   */
+  private buildAliasWithoutDataPrefix(
+    chain: Array<string | number>,
+    dataPrefix: string | null
+  ): string {
+    // Filter to just string parts and join with underscores
+    const parts = chain.filter((p): p is string => typeof p === "string");
+
+    if (dataPrefix) {
+      // Remove the dataPrefix from the parts (it's an implementation detail)
+      const prefixIndex = parts.indexOf(dataPrefix);
+      if (prefixIndex > 0) {
+        // Only remove if it's not the first element (column name)
+        parts.splice(prefixIndex, 1);
+      }
+    }
+
+    return parts.join("_");
+  }
+
+  /**
+   * Resolve a field chain to its column schema (if it references a known column)
+   */
+  private resolveFieldToColumnSchema(chain: Array<string | number>): ColumnSchema | null {
+    if (chain.length === 0) return null;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return null;
+
+    // Qualified reference: table.column
+    if (chain.length >= 2) {
+      const tableAlias = firstPart;
+      const tableSchema = this.tableContexts.get(tableAlias);
+      if (!tableSchema) return null;
+
+      const columnName = chain[1];
+      if (typeof columnName !== "string") return null;
+
+      return tableSchema.columns[columnName] || null;
+    }
+
+    // Unqualified reference
+    const columnName = firstPart;
+    for (const tableSchema of this.tableContexts.values()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema) {
+        return columnSchema;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Check if a field chain references a virtual column and return its expression
+   * @returns The virtual column expression, or null if not a virtual column
+   */
+  private getVirtualColumnExpressionForField(chain: Array<string | number>): string | null {
+    if (chain.length === 0) return null;
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") return null;
+
+    // Case 1: Qualified reference like table.column
+    if (chain.length >= 2) {
+      const tableAlias = firstPart;
+      const tableSchema = this.tableContexts.get(tableAlias);
+      if (!tableSchema) return null;
+
+      const columnName = chain[1];
+      if (typeof columnName !== "string") return null;
+
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema && isVirtualColumn(columnSchema)) {
+        return columnSchema.expression!;
+      }
+      return null;
+    }
+
+    // Case 2: Unqualified reference like just "column"
+    const columnName = firstPart;
+    for (const tableSchema of this.tableContexts.values()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema && isVirtualColumn(columnSchema)) {
+        return columnSchema.expression!;
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Resolve field chain to use ClickHouse column names where applicable
+   * Handles both qualified (table.column) and unqualified (column) references
+   *
+   * @throws QueryError if the column is not found in any table schema and is not a SELECT alias
+   */
+  private resolveFieldChain(chain: Array<string | number>): Array<string | number> {
+    if (chain.length === 0) {
+      return chain;
+    }
+
+    const firstPart = chain[0];
+    if (typeof firstPart !== "string") {
+      return chain; // Index access, return as-is
+    }
+
+    // Case 1: Qualified reference like table.column or table.column.nested
+    if (chain.length >= 2) {
+      const tableAlias = firstPart;
+      const tableSchema = this.tableContexts.get(tableAlias);
+
+      if (tableSchema) {
+        // This is a table.column reference
+        const columnName = chain[1];
+        if (typeof columnName === "string") {
+          const resolvedColumn = this.resolveColumnName(tableSchema, columnName, tableAlias);
+          return [tableAlias, resolvedColumn, ...chain.slice(2)];
+        }
+      }
+      // Not a known table alias, might be a nested field or JSON path - return as-is
+      return chain;
+    }
+
+    // Case 2: Unqualified reference like just "column"
+    // Try to find the column in any table context
+    const columnName = firstPart;
+    for (const tableSchema of this.tableContexts.values()) {
+      const columnSchema = tableSchema.columns[columnName];
+      if (columnSchema) {
+        return [columnSchema.clickhouseName || columnSchema.name, ...chain.slice(1)];
+      }
+    }
+
+    // Check if it's a SELECT alias (e.g., from COUNT() or explicit AS)
+    // Case-insensitive lookup: map key is lowercase, value is the canonical form
+    // that matches the alias as it appears in the generated SQL
+    const canonicalAlias = this.selectAliases.get(columnName.toLowerCase());
+    if (canonicalAlias !== undefined) {
+      return [canonicalAlias, ...chain.slice(1)];
+    }
+
+    // Check if this is an internal-only column being accessed in a user projection context
+    // (SELECT, ORDER BY, GROUP BY, HAVING). These columns are used internally for
+    // tenant isolation but should not be user-queryable unless explicitly exposed.
+    if (this.inProjectionContext && this.internalOnlyColumns.has(columnName)) {
+      const availableColumns = this.getAvailableColumnNames();
+      throw new QueryError(
+        `Column "${columnName}" is not available for querying. Available columns: ${availableColumns.join(
+          ", "
+        )}`
+      );
+    }
+
+    // Check if this is an allowed internal column (e.g., tenant columns)
+    // These are ClickHouse column names that are allowed for internal use only
+    // (e.g., in WHERE clauses for tenant isolation)
+    if (this.allowedInternalColumns.has(columnName)) {
+      return chain;
+    }
+
+    // Column not found in any table context and not a SELECT alias
+    // This is a security issue - block access to unknown columns
+    if (this.tableContexts.size > 0) {
+      // Only throw if we have tables in context (otherwise might be subquery)
+      // Check if the user typed a ClickHouse column name instead of the TSQL name
+      const suggestion = this.findTSQLNameForClickHouseName(columnName);
+      if (suggestion) {
+        throw new QueryError(`Unknown column "${columnName}". Did you mean "${suggestion}"?`);
+      }
+
+      const availableColumns = this.getAvailableColumnNames();
+      throw new QueryError(
+        `Unknown column "${columnName}". Available columns: ${availableColumns.join(", ")}`
+      );
+    }
+
+    // No tables in context (might be FROM subquery without alias) - return as-is
+    return chain;
+  }
+
+  /**
+   * Get list of available column names from all tables in context
+   */
+  private getAvailableColumnNames(): string[] {
+    const columns: string[] = [];
+    for (const tableSchema of this.tableContexts.values()) {
+      columns.push(...Object.keys(tableSchema.columns));
+    }
+    return [...new Set(columns)].sort();
+  }
+
+  /**
+   * Check if a ClickHouse column name is exposed in the table schema's public columns.
+   * A column is considered exposed if:
+   * - It exists as a column name in tableSchema.columns, OR
+   * - It is the clickhouseName of a column in tableSchema.columns
+   *
+   * @param tableSchema The table schema to check
+   * @param clickhouseColumnName The ClickHouse column name to check
+   * @returns true if the column is exposed to users, false if it's internal-only
+   */
+  private isColumnExposedInSchema(tableSchema: TableSchema, clickhouseColumnName: string): boolean {
+    for (const [tsqlName, columnSchema] of Object.entries(tableSchema.columns)) {
+      // Check if the ClickHouse column name matches either:
+      // 1. The TSQL name (if no clickhouseName mapping exists)
+      // 2. The explicit clickhouseName mapping
+      const actualClickhouseName = columnSchema.clickhouseName || tsqlName;
+      if (actualClickhouseName === clickhouseColumnName) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Find the TSQL column name for a given ClickHouse column name.
+   * This is used to provide helpful suggestions when users accidentally
+   * use internal ClickHouse column names instead of TSQL names.
+   *
+   * @returns The TSQL column name if found, null otherwise
+   */
+  private findTSQLNameForClickHouseName(clickhouseName: string): string | null {
+    for (const tableSchema of this.tableContexts.values()) {
+      for (const [tsqlName, columnSchema] of Object.entries(tableSchema.columns)) {
+        if (columnSchema.clickhouseName === clickhouseName) {
+          return tsqlName;
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Resolve a column name to its ClickHouse name using the table schema
+   *
+   * @throws QueryError if the column is not found in the table schema
+   */
+  private resolveColumnName(
+    tableSchema: TableSchema,
+    columnName: string,
+    tableAlias?: string
+  ): string {
+    const columnSchema = tableSchema.columns[columnName];
+    if (columnSchema) {
+      return columnSchema.clickhouseName || columnSchema.name;
+    }
+
+    // Check if this is a tenant column that's not exposed in the schema's columns
+    // These are internal columns used for tenant isolation guards
+    const { tenantColumns, requiredFilters } = tableSchema;
+    if (tenantColumns) {
+      if (
+        columnName === tenantColumns.organizationId ||
+        columnName === tenantColumns.projectId ||
+        columnName === tenantColumns.environmentId
+      ) {
+        // Tenant columns are already ClickHouse column names, return as-is
+        return columnName;
+      }
+    }
+
+    // Check if this is a required filter column (e.g., engine = 'V2')
+    // These are internal columns used for enforced filters
+    if (requiredFilters) {
+      for (const filter of requiredFilters) {
+        if (columnName === filter.column) {
+          // Required filter columns are already ClickHouse column names, return as-is
+          return columnName;
+        }
+      }
+    }
+
+    // Column not in schema - this is a security issue, block access
+    // Check if the user typed a ClickHouse column name instead of the TSQL name
+    for (const [tsqlName, colSchema] of Object.entries(tableSchema.columns)) {
+      if (colSchema.clickhouseName === columnName) {
+        throw new QueryError(`Unknown column "${columnName}". Did you mean "${tsqlName}"?`);
+      }
+    }
+
+    const availableColumns = Object.keys(tableSchema.columns).sort().join(", ");
+    const tableName = tableAlias || tableSchema.name;
+    throw new QueryError(
+      `Unknown column "${columnName}" on table "${tableName}". Available columns: ${availableColumns}`
+    );
+  }
+
+  private visitPlaceholder(node: Placeholder): string {
+    return this.visit(node.expr);
+  }
+
+  private visitCall(node: Call): string {
+    const name = node.name;
+
+    // Handle prettyFormat() — strip wrapper, only emit the inner expression
+    if (name.toLowerCase() === "prettyformat") {
+      if (node.args.length !== 2) {
+        throw new QueryError("prettyFormat() requires exactly 2 arguments");
+      }
+      return this.visit(node.args[0]);
+    }
+
+    // Handle timeBucket() - special TSQL function for automatic time bucketing
+    if (name.toLowerCase() === "timebucket") {
+      return this.visitTimeBucket(node);
+    }
+
+    // Check if this is a comparison function
+    if (name in TSQL_COMPARISON_MAPPING) {
+      const op = TSQL_COMPARISON_MAPPING[name];
+      if (node.args.length !== 2) {
+        throw new QueryError(`Comparison '${name}' requires exactly two arguments`);
+      }
+      return this.visitCompareOperation({
+        expression_type: "compare_operation",
+        left: node.args[0],
+        right: node.args[1],
+        op,
+      });
+    }
+
+    // Check for aggregation function
+    const aggMeta = findTSQLAggregation(name);
+    if (aggMeta) {
+      validateFunctionArgs(node.args, aggMeta.minArgs, aggMeta.maxArgs, name, {
+        functionTerm: "aggregation",
+      });
+
+      // Check for nested aggregations
+      for (const stackNode of this.stack.slice().reverse()) {
+        if ((stackNode as SelectQuery).expression_type === "select_query") {
+          break;
+        }
+        if ((stackNode as Call).expression_type === "call" && stackNode !== node) {
+          const stackCall = stackNode as Call;
+          if (findTSQLAggregation(stackCall.name)) {
+            throw new QueryError(
+              `Aggregation '${name}' cannot be nested inside another aggregation '${stackCall.name}'`
+            );
+          }
+        }
+      }
+
+      const args = node.args.map((arg) => this.visit(arg));
+      const params = node.params ? node.params.map((p) => this.visit(p)) : null;
+      const paramsPart = params ? `(${params.join(", ")})` : "";
+      const distinctPart = node.distinct ? "DISTINCT " : "";
+      return `${aggMeta.clickhouseName}${paramsPart}(${distinctPart}${args.join(", ")})`;
+    }
+
+    // Check for regular function
+    const funcMeta = findTSQLFunction(name);
+    if (funcMeta) {
+      validateFunctionArgs(node.args, funcMeta.minArgs, funcMeta.maxArgs, name);
+
+      const args = node.args.map((arg) => this.visit(arg));
+      const params = node.params ? node.params.map((p) => this.visit(p)) : null;
+      const paramsPart = params ? `(${params.join(", ")})` : "";
+      return `${funcMeta.clickhouseName}${paramsPart}(${args.join(", ")})`;
+    }
+
+    // Unknown function - throw error
+    throw new QueryError(`Unknown function: ${name}`);
+  }
+
+  private visitJoinConstraint(node: JoinConstraint): string {
+    return this.visit(node.expr);
+  }
+
+  private visitWindowFrameExpr(node: WindowFrameExpr): string {
+    if (node.frame_type === "CURRENT ROW") {
+      return "CURRENT ROW";
+    }
+    if (node.frame_value !== undefined) {
+      return `${node.frame_value} ${node.frame_type}`;
+    }
+    return `UNBOUNDED ${node.frame_type}`;
+  }
+
+  private visitWindowExpr(node: WindowExpr): string {
+    const parts: string[] = [];
+
+    if (node.partition_by && node.partition_by.length > 0) {
+      parts.push(`PARTITION BY ${node.partition_by.map((e) => this.visit(e)).join(", ")}`);
+    }
+
+    if (node.order_by && node.order_by.length > 0) {
+      parts.push(`ORDER BY ${node.order_by.map((e) => this.visit(e)).join(", ")}`);
+    }
+
+    if (node.frame_method && node.frame_start) {
+      let frameStr = `${node.frame_method} `;
+      if (node.frame_end) {
+        frameStr += `BETWEEN ${this.visit(node.frame_start)} AND ${this.visit(node.frame_end)}`;
+      } else {
+        frameStr += this.visit(node.frame_start);
+      }
+      parts.push(frameStr);
+    }
+
+    return parts.join(" ");
+  }
+
+  private visitWindowFunction(node: WindowFunction): string {
+    const args = node.args ? node.args.map((a) => this.visit(a)) : [];
+    const funcCall = `${node.name}(${args.join(", ")})`;
+
+    if (node.over_identifier) {
+      return `${funcCall} OVER ${this.printIdentifier(node.over_identifier)}`;
+    }
+    if (node.over_expr) {
+      return `${funcCall} OVER (${this.visit(node.over_expr)})`;
+    }
+    return funcCall;
+  }
+
+  private visitLimitByExpr(node: LimitByExpr): string {
+    const exprs = node.exprs.map((e) => this.visit(e)).join(", ");
+    const offsetPart = node.offset_value ? ` OFFSET ${this.visit(node.offset_value)}` : "";
+    return `LIMIT ${this.visit(node.n)}${offsetPart} BY ${exprs}`;
+  }
+
+  private visitRatioExpr(node: RatioExpr): string {
+    const left = this.visit(node.left);
+    if (node.right) {
+      return `${left}/${this.visit(node.right)}`;
+    }
+    return left;
+  }
+
+  private visitSampleExpr(node: SampleExpr): string {
+    const sample = this.visitRatioExpr(node.sample_value);
+    if (node.offset_value) {
+      return `SAMPLE ${sample} OFFSET ${this.visitRatioExpr(node.offset_value)}`;
+    }
+    return `SAMPLE ${sample}`;
+  }
+
+  // ============================================================
+  // timeBucket() Support
+  // ============================================================
+
+  /**
+   * Handle the `timeBucket()` TSQL function.
+   *
+   * Resolves the table's timeConstraint column to its ClickHouse name,
+   * calculates an appropriate interval from the query's time range,
+   * and emits `toStartOfInterval(column, INTERVAL N UNIT)`.
+   *
+   * @throws QueryError if timeBucket() is called with arguments, or if the table
+   *   has no timeConstraint, or if no timeRange is provided in the context.
+   */
+  private visitTimeBucket(node: Call): string {
+    // Validate: timeBucket() takes no arguments
+    if (node.args.length > 0) {
+      throw new QueryError(
+        "timeBucket() does not accept arguments. It automatically uses the table's time constraint column."
+      );
+    }
+
+    // Find the table with a timeConstraint
+    const tableWithConstraint = this.findTimeConstraintTable();
+    if (!tableWithConstraint) {
+      throw new QueryError(
+        "timeBucket() requires a table with a timeConstraint defined in its schema."
+      );
+    }
+
+    const { tableSchema, clickhouseColumnName } = tableWithConstraint;
+
+    // Get the time range from context
+    const timeRange = this.context.timeRange;
+    if (!timeRange) {
+      throw new QueryError(
+        "timeBucket() requires a time range to be provided. Pass a timeRange option when compiling the query."
+      );
+    }
+
+    // Calculate the appropriate interval (use table-specific thresholds if defined)
+    const interval = calculateTimeBucketInterval(
+      timeRange.from,
+      timeRange.to,
+      tableSchema.timeBucketThresholds
+    );
+
+    // Emit toStartOfInterval(column, INTERVAL N UNIT)
+    return `toStartOfInterval(${escapeClickHouseIdentifier(clickhouseColumnName)}, INTERVAL ${interval.value} ${interval.unit})`;
+  }
+
+  /**
+   * Find a table in the current query context that has a timeConstraint defined.
+   * Returns the table schema and the resolved ClickHouse column name for the constraint.
+   */
+  private findTimeConstraintTable(): {
+    tableSchema: TableSchema;
+    clickhouseColumnName: string;
+  } | null {
+    for (const tableSchema of this.tableContexts.values()) {
+      if (tableSchema.timeConstraint) {
+        const columnSchema = tableSchema.columns[tableSchema.timeConstraint];
+        if (columnSchema) {
+          const clickhouseColumnName = columnSchema.clickhouseName || columnSchema.name;
+          return { tableSchema, clickhouseColumnName };
+        }
+      }
+    }
+    return null;
+  }
+
+  // ============================================================
+  // Helper Methods
+  // ============================================================
+
+  /**
+   * Print an identifier safely escaped for ClickHouse
+   */
+  private printIdentifier(name: string): string {
+    return escapeClickHouseIdentifier(name);
+  }
+
+  /**
+   * Print an identifier or array index
+   */
+  private printIdentifierOrIndex(part: string | number): string {
+    if (typeof part === "number") {
+      return String(part);
+    }
+    return escapeClickHouseIdentifier(part);
+  }
+
+  /**
+   * Check if a node is a SelectSetQuery
+   */
+  private isSelectSetQuery(node: AST): boolean {
+    return (node as SelectSetQuery).expression_type === "select_set_query";
+  }
+
+  /**
+   * Look up a table in the schema registry
+   */
+  private lookupTable(tableName: string): TableSchema {
+    return validateTable(this.context.schema, tableName);
+  }
+}
+
+// ============================================================
+// Public API
+// ============================================================
+
+/**
+ * Print a TSQL AST to ClickHouse SQL
+ */
+export function printToClickHouse(
+  node: SelectQuery | SelectSetQuery,
+  context: PrinterContext,
+  options: { pretty?: boolean } = {}
+): PrintResult {
+  const printer = new ClickHousePrinter(context, options);
+  return printer.print(node);
+}
diff --git a/internal-packages/tsql/src/query/printer_context.ts b/internal-packages/tsql/src/query/printer_context.ts
new file mode 100644
index 00000000000..54203cfa292
--- /dev/null
+++ b/internal-packages/tsql/src/query/printer_context.ts
@@ -0,0 +1,292 @@
+// TypeScript port of posthog/hogql/context.py
+// Adapted for ClickHouse client's {param: Type} syntax
+
+import { getClickHouseType } from "./escape";
+import { SchemaRegistry, FieldMappings } from "./schema";
+
+/**
+ * Settings that control query execution behavior
+ */
+export interface QuerySettings {
+  /** Maximum number of rows to return */
+  maxRows?: number;
+  /** Timezone for date/time operations */
+  timezone?: string;
+  /** Whether to allow full table scans */
+  allowFullTableScans?: boolean;
+  /** Query timeout in seconds */
+  timeoutSeconds?: number;
+}
+
+/**
+ * A simple comparison condition (e.g., column > value)
+ */
+export interface SimpleComparisonCondition {
+  /** The comparison operator */
+  op: "eq" | "neq" | "gt" | "gte" | "lt" | "lte";
+  /** The value to compare against */
+  value: Date | string | number;
+}
+
+/**
+ * A between condition (e.g., column BETWEEN low AND high)
+ */
+export interface BetweenCondition {
+  /** The between operator */
+  op: "between";
+  /** The low bound of the range */
+  low: Date | string | number;
+  /** The high bound of the range */
+  high: Date | string | number;
+}
+
+/**
+ * An IN condition (e.g., column IN ('a', 'b', 'c'))
+ */
+export interface InCondition {
+  /** The in operator */
+  op: "in";
+  /** The values to check against */
+  values: (string | number)[];
+}
+
+/**
+ * A WHERE clause condition that can be either a simple comparison, a BETWEEN, or an IN.
+ * Used for both enforcedWhereClause (always applied) and whereClauseFallback (default when user doesn't filter).
+ */
+export type WhereClauseCondition = SimpleComparisonCondition | BetweenCondition | InCondition;
+
+/**
+ * A time range used by `timeBucket()` to determine the appropriate bucket interval.
+ */
+export interface TimeRange {
+  /** Start of the time range (inclusive) */
+  from: Date;
+  /** End of the time range (inclusive) */
+  to: Date;
+}
+
+/**
+ * Default query settings
+ */
+export const DEFAULT_QUERY_SETTINGS: Required<QuerySettings> = {
+  maxRows: 10000,
+  timezone: "UTC",
+  allowFullTableScans: false,
+  timeoutSeconds: 60,
+};
+
+/**
+ * A warning or notice collected during query printing
+ */
+export interface QueryNotice {
+  code: string;
+  message: string;
+  start?: number;
+  end?: number;
+}
+
+/**
+ * Context for the TSQL to ClickHouse printer
+ *
+ * Holds:
+ * - Enforced WHERE conditions for tenant isolation and plan limits
+ * - Schema registry for table/column validation
+ * - Parameter accumulator for SQL injection safety
+ * - Query settings and execution options
+ * - Field mappings for runtime value translation
+ */
+export class PrinterContext {
+  /** Accumulated parameter values for parameterized query */
+  private values: Record<string, unknown> = {};
+
+  /** Counter for generating unique parameter names */
+  private paramCounter = 0;
+
+  /** Warnings collected during printing */
+  readonly warnings: QueryNotice[] = [];
+
+  /** Errors collected during printing */
+  readonly errors: QueryNotice[] = [];
+
+  /** Runtime field mappings for dynamic value translation */
+  readonly fieldMappings: FieldMappings;
+
+  /**
+   * Enforced WHERE conditions that are ALWAYS applied at the table level.
+   * Used for tenant isolation (org_id, project_id, env_id) and plan-based limits.
+   * Applied to every table reference including subqueries, CTEs, and JOINs.
+   */
+  readonly enforcedWhereClause: Record<string, WhereClauseCondition>;
+
+  /**
+   * Time range for `timeBucket()` interval calculation.
+   * When provided, `timeBucket()` uses this to determine the appropriate bucket size.
+   */
+  readonly timeRange?: TimeRange;
+
+  constructor(
+    /** Schema registry containing allowed tables and columns */
+    public readonly schema: SchemaRegistry,
+    /** Query execution settings */
+    public readonly settings: QuerySettings = {},
+    /** Runtime field mappings for dynamic value translation */
+    fieldMappings: FieldMappings = {},
+    /**
+     * Enforced WHERE conditions that are ALWAYS applied at the table level.
+     * Must include tenant columns (e.g., organization_id) for multi-tenant tables.
+     */
+    enforcedWhereClause: Record<string, WhereClauseCondition> = {},
+    /** Time range for timeBucket() interval calculation */
+    timeRange?: TimeRange
+  ) {
+    // Initialize with default settings
+    this.settings = { ...DEFAULT_QUERY_SETTINGS, ...settings };
+    this.fieldMappings = fieldMappings;
+    this.enforcedWhereClause = enforcedWhereClause;
+    this.timeRange = timeRange;
+  }
+
+  /**
+   * Get the timezone setting
+   */
+  get timezone(): string {
+    return this.settings.timezone ?? DEFAULT_QUERY_SETTINGS.timezone;
+  }
+
+  /**
+   * Get the max rows setting
+   */
+  get maxRows(): number {
+    return this.settings.maxRows ?? DEFAULT_QUERY_SETTINGS.maxRows;
+  }
+
+  /**
+   * Add a value to the parameter map and return a ClickHouse placeholder
+   *
+   * @param value The value to parameterize
+   * @returns A placeholder string like "{tsql_val_0: String}"
+   */
+  addValue(value: unknown): string {
+    const key = `tsql_val_${this.paramCounter++}`;
+    this.values[key] = value;
+    const chType = getClickHouseType(value);
+    return `{${key}: ${chType}}`;
+  }
+
+  /**
+   * Add a value with a specific key (for named parameters)
+   *
+   * @param key The parameter name
+   * @param value The value
+   * @returns A placeholder string like "{key: Type}"
+   */
+  addNamedValue(key: string, value: unknown): string {
+    this.values[key] = value;
+    const chType = getClickHouseType(value);
+    return `{${key}: ${chType}}`;
+  }
+
+  /**
+   * Get all accumulated parameter values
+   */
+  getParams(): Record<string, unknown> {
+    return { ...this.values };
+  }
+
+  /**
+   * Add a warning notice
+   */
+  addWarning(code: string, message: string, start?: number, end?: number): void {
+    this.warnings.push({ code, message, start, end });
+  }
+
+  /**
+   * Add an error notice
+   */
+  addError(code: string, message: string, start?: number, end?: number): void {
+    this.errors.push({ code, message, start, end });
+  }
+
+  /**
+   * Check if any errors were collected
+   */
+  hasErrors(): boolean {
+    return this.errors.length > 0;
+  }
+
+  /**
+   * Create a child context that shares the same parameter accumulator
+   * Useful for handling subqueries while keeping parameters unified
+   */
+  createChildContext(): PrinterContext {
+    const child = new PrinterContext(
+      this.schema,
+      this.settings,
+      this.fieldMappings,
+      this.enforcedWhereClause,
+      this.timeRange
+    );
+    // Share the same values map so parameters are unified
+    child.values = this.values;
+    // Share the same counter reference via closure
+    const parentThis = this;
+    Object.defineProperty(child, "paramCounter", {
+      get() {
+        return parentThis.paramCounter;
+      },
+      set(v: number) {
+        parentThis.paramCounter = v;
+      },
+    });
+    return child;
+  }
+}
+
+/**
+ * Options for creating a printer context
+ */
+export interface PrinterContextOptions {
+  /** Schema registry containing allowed tables and columns */
+  schema: SchemaRegistry;
+  /** Query execution settings */
+  settings?: QuerySettings;
+  /**
+   * Runtime field mappings for dynamic value translation.
+   * Maps internal ClickHouse values to external user-facing values.
+   */
+  fieldMappings?: FieldMappings;
+  /**
+   * REQUIRED: Conditions always applied at the table level.
+   * Must include tenant columns (e.g., organization_id) for multi-tenant tables.
+   * Applied to every table reference including subqueries, CTEs, and JOINs.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   organization_id: { op: "eq", value: "org_123" },
+   *   project_id: { op: "eq", value: "proj_456" },
+   *   triggered_at: { op: "gte", value: new Date(Date.now() - 7 * 24 * 60 * 60 * 1000) }
+   * }
+   * ```
+   */
+  enforcedWhereClause: Record<string, WhereClauseCondition>;
+  /**
+   * Time range for `timeBucket()` interval calculation.
+   * When provided, `timeBucket()` uses this to determine the appropriate bucket size.
+   */
+  timeRange?: TimeRange;
+}
+
+/**
+ * Create a new PrinterContext
+ */
+export function createPrinterContext(options: PrinterContextOptions): PrinterContext {
+  return new PrinterContext(
+    options.schema,
+    options.settings,
+    options.fieldMappings,
+    options.enforcedWhereClause,
+    options.timeRange
+  );
+}
diff --git a/internal-packages/tsql/src/query/property_types.ts b/internal-packages/tsql/src/query/property_types.ts
new file mode 100644
index 00000000000..ff2d74c8ef6
--- /dev/null
+++ b/internal-packages/tsql/src/query/property_types.ts
@@ -0,0 +1,720 @@
+// TypeScript translation of posthog/hogql/transforms/property_types.py
+
+import type {
+  AST,
+  Expr,
+  Field,
+  PropertyType,
+  FieldType,
+  BaseTableType,
+  VirtualTableType,
+  LazyJoinType,
+  LazyTableType,
+  Call,
+  Constant,
+  CallType,
+  DateTimeType,
+} from "./ast";
+import type { TSQLContext } from "./context";
+import type { BooleanDatabaseField, DateTimeDatabaseField, Table } from "./models";
+
+// Helper function to escape TSQL identifiers
+function escapeTSQLIdentifier(identifier: string | number): string {
+  if (typeof identifier === "number") {
+    return String(identifier);
+  }
+  if (identifier.includes("%")) {
+    throw new Error(
+      `The TSQL identifier "${identifier}" is not permitted as it contains the "%" character`
+    );
+  }
+  // TSQL allows dollars in the identifier
+  if (/^[A-Za-z_$][A-Za-z0-9_$]*$/.test(identifier)) {
+    return identifier;
+  }
+  // Escape backticks and other special characters
+  const backquoteEscapeChars: Record<string, string> = {
+    "\b": "\\b",
+    "\f": "\\f",
+    "\r": "\\r",
+    "\n": "\\n",
+    "\t": "\\t",
+    "\0": "\\0",
+    a: "\\a",
+    "\v": "\\v",
+    "\\": "\\\\",
+    "`": "\\`",
+  };
+  return `\`${identifier
+    .split("")
+    .map((c) => backquoteEscapeChars[c] || c)
+    .join("")}\``;
+}
+
+// Visitor dispatcher - converts node type to visitor method name
+// Matches Python's camel_case_pattern.sub("_", class_name).lower() logic
+function getVisitorMethodName(node: AST): string {
+  // Get the constructor name or use a type guard to determine the type
+  const nodeType = (node as any).constructor?.name || detectNodeType(node);
+
+  if (!nodeType) {
+    return "visit_unknown";
+  }
+
+  // Convert CamelCase to snake_case (e.g., "PropertyType" -> "property_type")
+  const snakeCase = nodeType
+    .replace(/([A-Z])/g, "_$1")
+    .toLowerCase()
+    .replace(/^_/, "");
+
+  // Handle special cases (matching Python replacements)
+  const replacements: Record<string, string> = {
+    tsqlxtag: "tsqlx_tag",
+    tsqlxattribute: "tsqlx_attribute",
+    uuidtype: "uuid_type",
+    string_jsontype: "string_json_type",
+  };
+
+  return replacements[snakeCase] || snakeCase;
+}
+
+// Type detection helper (since we can't use instanceof with interfaces)
+function detectNodeType(node: AST): string {
+  // Use property presence to detect node types
+  if ("chain" in node && "type" in node && !("name" in node)) {
+    return "Field";
+  }
+  if ("chain" in node && "field_type" in node) {
+    return "PropertyType";
+  }
+  if ("name" in node && "args" in node && !("expr" in node)) {
+    return "Call";
+  }
+  if ("value" in node && !("name" in node) && !("args" in node)) {
+    return "Constant";
+  }
+  // Add more type detection as needed
+  return "";
+}
+
+// Base visitor class - matches Python Visitor pattern
+abstract class Visitor<T> {
+  visit(node: AST | null | undefined): T {
+    if (node === null || node === undefined) {
+      return node as T;
+    }
+
+    // Try using accept method if available (double dispatch)
+    if (node.accept) {
+      return node.accept(this) as T;
+    }
+
+    // Fallback: use dispatcher
+    const methodName = getVisitorMethodName(node);
+    const method = (this as any)[methodName];
+
+    if (method && typeof method === "function") {
+      return method.call(this, node) as T;
+    }
+
+    // Try visit_unknown as fallback
+    if ((this as any).visit_unknown) {
+      return (this as any).visit_unknown(node) as T;
+    }
+
+    throw new Error(`${this.constructor.name} has no method ${methodName} or visit_unknown`);
+  }
+}
+
+// TraversingVisitor - matches Python TraversingVisitor
+class TraversingVisitor extends Visitor<void> {
+  visitPropertyType(node: PropertyType): void {
+    this.visit(node.field_type);
+  }
+
+  visitField(node: Field): void {
+    if (node.type) {
+      this.visit(node.type as any);
+    }
+  }
+
+  visitCall(node: Call): void {
+    for (const arg of node.args) {
+      this.visit(arg);
+    }
+    if (node.params) {
+      for (const param of node.params) {
+        this.visit(param);
+      }
+    }
+  }
+
+  visitConstant(node: Constant): void {
+    if (node.type) {
+      this.visit(node.type as any);
+    }
+  }
+
+  // Default handler for unknown types - traverse common properties
+  visit_unknown(node: AST): void {
+    // Traverse children based on common AST node properties
+    if ("expr" in node) {
+      this.visit((node as any).expr);
+    }
+    if ("exprs" in node) {
+      for (const expr of (node as any).exprs) {
+        this.visit(expr);
+      }
+    }
+    if ("left" in node && "right" in node) {
+      this.visit((node as any).left);
+      this.visit((node as any).right);
+    }
+    if ("args" in node) {
+      for (const arg of (node as any).args) {
+        this.visit(arg);
+      }
+    }
+    if ("type" in node) {
+      this.visit((node as any).type);
+    }
+  }
+}
+
+// CloningVisitor - matches Python CloningVisitor
+class CloningVisitor extends Visitor<any> {
+  protected clearTypes: boolean;
+  protected clearLocations: boolean;
+
+  constructor(clearTypes: boolean = true, clearLocations: boolean = false) {
+    super();
+    this.clearTypes = clearTypes;
+    this.clearLocations = clearLocations;
+  }
+
+  visitField(node: Field): Field {
+    return {
+      ...node,
+      type: this.clearTypes ? undefined : node.type ? this.visit(node.type as any) : node.type,
+      start: this.clearLocations ? undefined : node.start,
+      end: this.clearLocations ? undefined : node.end,
+    };
+  }
+
+  visitPropertyType(node: PropertyType): PropertyType {
+    return {
+      ...node,
+      field_type: this.visit(node.field_type) as FieldType,
+      start: this.clearLocations ? undefined : node.start,
+      end: this.clearLocations ? undefined : node.end,
+    };
+  }
+
+  visitCall(node: Call): Call {
+    return {
+      ...node,
+      args: node.args.map((arg) => this.visit(arg)),
+      params: node.params ? node.params.map((param) => this.visit(param)) : undefined,
+      start: this.clearLocations ? undefined : node.start,
+      end: this.clearLocations ? undefined : node.end,
+      type: this.clearTypes ? undefined : node.type,
+    };
+  }
+
+  visitConstant(node: Constant): Constant {
+    return {
+      ...node,
+      start: this.clearLocations ? undefined : node.start,
+      end: this.clearLocations ? undefined : node.end,
+      type: this.clearTypes ? undefined : node.type,
+    };
+  }
+
+  // Default handler for unknown types - shallow clone
+  visit_unknown(node: AST): any {
+    const cloned: any = { ...node };
+
+    // Clone common properties
+    if ("expr" in node) {
+      cloned.expr = this.visit((node as any).expr);
+    }
+    if ("exprs" in node) {
+      cloned.exprs = (node as any).exprs.map((e: any) => this.visit(e));
+    }
+    if ("left" in node && "right" in node) {
+      cloned.left = this.visit((node as any).left);
+      cloned.right = this.visit((node as any).right);
+    }
+    if ("args" in node) {
+      cloned.args = (node as any).args.map((a: any) => this.visit(a));
+    }
+    if ("type" in node) {
+      cloned.type = this.clearTypes ? undefined : this.visit((node as any).type);
+    }
+
+    if (this.clearLocations) {
+      cloned.start = undefined;
+      cloned.end = undefined;
+    }
+
+    return cloned;
+  }
+}
+
+// PropertyFinder: Traverses AST to find all property references
+class PropertyFinder extends TraversingVisitor {
+  context: TSQLContext;
+  personProperties: Set<string> = new Set();
+  eventProperties: Set<string> = new Set();
+  groupProperties: Map<number, Set<string>> = new Map();
+  foundTimestamps: boolean = false;
+
+  constructor(context: TSQLContext) {
+    super();
+    this.context = context;
+  }
+
+  visitPropertyType(node: PropertyType): void {
+    if (node.field_type.name === "properties" && node.chain.length === 1) {
+      const tableType = node.field_type.table_type;
+      if (this.isBaseTableType(tableType)) {
+        const table = tableType.resolve_database_table?.(this.context);
+        if (table) {
+          const tableName = table.to_printed_tsql?.() || "";
+          const propertyName = String(node.chain[0]);
+
+          if (tableName === "persons" || tableName === "raw_persons") {
+            this.personProperties.add(propertyName);
+          } else if (tableName === "groups") {
+            if (this.isLazyJoinType(tableType)) {
+              if (tableType.field.startsWith("group_")) {
+                const groupId = parseInt(tableType.field.split("_")[1], 10);
+                if (!this.groupProperties.has(groupId)) {
+                  this.groupProperties.set(groupId, new Set());
+                }
+                this.groupProperties.get(groupId)!.add(propertyName);
+              }
+            } else if (this.isLazyTableType(tableType)) {
+              const globalGroupId = this.context.globals?.group_id;
+              if (typeof globalGroupId === "number") {
+                if (!this.groupProperties.has(globalGroupId)) {
+                  this.groupProperties.set(globalGroupId, new Set());
+                }
+                this.groupProperties.get(globalGroupId)!.add(propertyName);
+              }
+            }
+          } else if (tableName === "events") {
+            if (this.isVirtualTableType(tableType) && tableType.field === "poe") {
+              this.personProperties.add(propertyName);
+            } else {
+              this.eventProperties.add(propertyName);
+            }
+          }
+        }
+      }
+    }
+    super.visitPropertyType(node);
+  }
+
+  visitField(node: Field): void {
+    super.visitField(node);
+    if (this.isFieldType(node.type)) {
+      const dbField = (node.type as any).resolve_database_field?.(this.context);
+      if (this.isDateTimeDatabaseField(dbField)) {
+        this.foundTimestamps = true;
+      }
+    }
+  }
+
+  private isBaseTableType(type: any): type is BaseTableType {
+    return type && typeof type.resolve_database_table === "function";
+  }
+
+  private isLazyJoinType(type: any): type is LazyJoinType {
+    return type && "lazy_join" in type && "field" in type;
+  }
+
+  private isLazyTableType(type: any): type is LazyTableType {
+    return type && "table" in type && !("lazy_join" in type);
+  }
+
+  private isVirtualTableType(type: any): type is VirtualTableType {
+    return type && "virtual_table" in type && "field" in type;
+  }
+
+  private isFieldType(type: any): type is FieldType {
+    return type && typeof type.resolve_database_field === "function";
+  }
+
+  private isDateTimeDatabaseField(field: any): field is DateTimeDatabaseField {
+    return field && "name" in field; // Simplified check
+  }
+}
+
+// PropertySwapper: Transforms property accesses with type conversions
+export class PropertySwapper extends CloningVisitor {
+  timezone: string;
+  eventProperties: Map<string, string>;
+  personProperties: Map<string, string>;
+  groupProperties: Map<string, string>;
+  context: TSQLContext;
+  setTimeZones: boolean;
+
+  constructor(
+    timezone: string,
+    eventProperties: Map<string, string> | Record<string, string>,
+    personProperties: Map<string, string> | Record<string, string>,
+    groupProperties: Map<string, string> | Record<string, string>,
+    context: TSQLContext,
+    setTimeZones: boolean
+  ) {
+    super(false); // Don't clear types
+    this.timezone = timezone;
+    this.eventProperties =
+      eventProperties instanceof Map ? eventProperties : new Map(Object.entries(eventProperties));
+    this.personProperties =
+      personProperties instanceof Map
+        ? personProperties
+        : new Map(Object.entries(personProperties));
+    this.groupProperties =
+      groupProperties instanceof Map ? groupProperties : new Map(Object.entries(groupProperties));
+    this.context = context;
+    this.setTimeZones = setTimeZones;
+  }
+
+  visitField(node: Field): any {
+    if (this.isFieldType(node.type)) {
+      if (this.setTimeZones) {
+        const dbField = (node.type as any).resolve_database_field?.(this.context);
+        if (this.isDateTimeDatabaseField(dbField)) {
+          return this.createToTimeZoneCall(node);
+        }
+      }
+
+      if (this.isLazyJoinType(node.type.table_type)) {
+        const lazyJoinType = node.type.table_type;
+        const resolvedTable = lazyJoinType.lazy_join.resolve_table?.(this.context);
+        // Check if it's an S3Table-like table (has fields property)
+        if (resolvedTable && "fields" in resolvedTable) {
+          const field = node.chain[node.chain.length - 1];
+          const fieldType = resolvedTable.fields[String(field)];
+          let propType = "String";
+
+          if (this.isDateTimeDatabaseField(fieldType)) {
+            propType = "DateTime";
+          } else if (this.isBooleanDatabaseField(fieldType)) {
+            propType = "Boolean";
+          }
+
+          return this.fieldTypeToPropertyCall(node, propType);
+        }
+      }
+    }
+
+    const type = node.type;
+    if (
+      this.isPropertyType(type) &&
+      type.field_type.name === "properties" &&
+      type.chain.length === 1
+    ) {
+      const propertyName = String(type.chain[0]);
+      const tableType = type.field_type.table_type;
+
+      if (this.isVirtualTableType(tableType) && tableType.field === "poe") {
+        if (this.personProperties.has(propertyName)) {
+          return this.convertStringPropertyToType(node, "person", propertyName);
+        }
+      } else if (this.isBaseTableType(tableType)) {
+        const table = tableType.resolve_database_table?.(this.context);
+        if (table) {
+          const tableName = table.to_printed_tsql?.() || "";
+
+          if (tableName === "persons" || tableName === "raw_persons") {
+            if (this.personProperties.has(propertyName)) {
+              return this.convertStringPropertyToType(node, "person", propertyName);
+            }
+          } else if (tableName === "groups") {
+            if (this.isLazyJoinType(tableType)) {
+              if (tableType.field.startsWith("group_")) {
+                const groupId = parseInt(tableType.field.split("_")[1], 10);
+                const groupKey = `${groupId}_${propertyName}`;
+                if (this.groupProperties.has(groupKey)) {
+                  return this.convertStringPropertyToType(node, "group", groupKey);
+                }
+              }
+            } else if (this.isLazyTableType(tableType)) {
+              const globalGroupId = this.context.globals?.group_id;
+              if (typeof globalGroupId === "number") {
+                const groupKey = `${globalGroupId}_${propertyName}`;
+                if (this.groupProperties.has(groupKey)) {
+                  return this.convertStringPropertyToType(node, "group", groupKey);
+                }
+              }
+            }
+          } else if (tableName === "events") {
+            if (this.eventProperties.has(propertyName)) {
+              return this.convertStringPropertyToType(node, "event", propertyName);
+            }
+          }
+        }
+      }
+    }
+
+    if (
+      this.isPropertyType(type) &&
+      type.field_type.name === "person_properties" &&
+      type.chain.length === 1
+    ) {
+      const propertyName = String(type.chain[0]);
+      const tableType = type.field_type.table_type;
+
+      if (this.isBaseTableType(tableType)) {
+        const table = tableType.resolve_database_table?.(this.context);
+        if (table) {
+          const tableName = table.to_printed_tsql?.() || "";
+          if (tableName === "events") {
+            if (this.personProperties.has(propertyName)) {
+              return this.convertStringPropertyToType(node, "person", propertyName);
+            }
+          }
+        }
+      }
+    }
+
+    return super.visitField(node);
+  }
+
+  private convertStringPropertyToType(
+    node: Field,
+    propertyType: "event" | "person" | "group",
+    propertyName: string
+  ): Expr {
+    let fieldTypeValue: string | undefined;
+    if (propertyType === "person") {
+      fieldTypeValue = this.personProperties.get(propertyName);
+    } else if (propertyType === "group") {
+      fieldTypeValue = this.groupProperties.get(propertyName);
+    } else {
+      fieldTypeValue = this.eventProperties.get(propertyName);
+    }
+
+    const fieldType = fieldTypeValue === "Numeric" ? "Float" : fieldTypeValue || "String";
+    this.addPropertyNotice(node, propertyType, fieldType);
+
+    return this.fieldTypeToPropertyCall(node, fieldType);
+  }
+
+  private fieldTypeToPropertyCall(node: Field, fieldType: string): Expr {
+    if (fieldType === "DateTime") {
+      return this.createToDateTimeCall(node);
+    }
+    if (fieldType === "Float") {
+      return this.createToFloatCall(node);
+    }
+    if (fieldType === "Boolean") {
+      return this.createToBoolCall(node);
+    }
+    return node;
+  }
+
+  private createToTimeZoneCall(node: Field): Call {
+    return {
+      expression_type: "call",
+      name: "toTimeZone",
+      args: [node, this.createConstant(this.timezone)],
+      type: {
+        name: "toTimeZone",
+        arg_types: [{ data_type: "datetime" } as DateTimeType],
+        return_type: { data_type: "datetime" } as DateTimeType,
+      } as CallType,
+      start: node.start,
+      end: node.end,
+    } as Call;
+  }
+
+  private createToDateTimeCall(node: Field): Call {
+    return {
+      expression_type: "call",
+      name: "toDateTime",
+      args: [node],
+      start: node.start,
+      end: node.end,
+    };
+  }
+
+  private createToFloatCall(node: Field): Call {
+    return {
+      expression_type: "call",
+      name: "toFloat",
+      args: [node],
+      start: node.start,
+      end: node.end,
+    };
+  }
+
+  private createToBoolCall(node: Field): Call {
+    return {
+      expression_type: "call",
+      name: "toBool",
+      args: [
+        {
+          name: "transform",
+          args: [
+            {
+              name: "toString",
+              args: [node],
+              start: node.start,
+              end: node.end,
+            } as Call,
+            this.createConstant(["true", "false"]),
+            this.createConstant([1, 0]),
+            this.createConstant(null),
+          ],
+          start: node.start,
+          end: node.end,
+        } as Call,
+      ],
+      start: node.start,
+      end: node.end,
+    } as Call;
+  }
+
+  private createConstant(value: any): Constant {
+    return {
+      expression_type: "constant",
+      value,
+    };
+  }
+
+  private addPropertyNotice(
+    node: Field,
+    propertyType: "event" | "person" | "group",
+    fieldType: string
+  ): void {
+    let propertyName = String(node.chain[node.chain.length - 1]);
+    let materializedColumn: any = null; // MaterializedColumn type not yet defined
+
+    if (propertyType === "person") {
+      //   if (this.context.modifiers.personsOnEventsMode !== "disabled") {
+      // materializedColumn = getMaterializedColumnForProperty('events', propertyName, 'person_properties');
+      //   } else {
+      // materializedColumn = getMaterializedColumnForProperty('person', propertyName, 'properties');
+      //   }
+    } else if (propertyType === "group") {
+      const nameParts = propertyName.split("_");
+      nameParts.shift();
+      propertyName = nameParts.join("_");
+      // materializedColumn = getMaterializedColumnForProperty('groups', propertyName, 'properties');
+    } else {
+      // materializedColumn = getMaterializedColumnForProperty('events', propertyName, 'properties');
+    }
+
+    let message = `${
+      propertyType.charAt(0).toUpperCase() + propertyType.slice(1)
+    } property '${propertyName}' is of type '${fieldType}'.`;
+    if (this.context.debug) {
+      if (materializedColumn !== null) {
+        message += " This property is materialized ⚡️.";
+      } else {
+        message += " This property is not materialized 🐢.";
+      }
+    }
+
+    this.addNotice(node, message);
+  }
+
+  private addNotice(node: Field, message: string): void {
+    if (node.start === undefined || node.end === undefined) {
+      return; // Don't add notices for nodes without location
+    }
+    // Only highlight the last part of the chain
+    const lastPart = node.chain[node.chain.length - 1];
+    const identifierLength = escapeTSQLIdentifier(lastPart).length;
+    this.context.notices.push({
+      start: Math.max(node.start, node.end - identifierLength),
+      end: node.end,
+      message,
+    });
+  }
+
+  private isFieldType(type: any): type is FieldType {
+    return type && typeof type.resolve_database_field === "function";
+  }
+
+  private isPropertyType(type: any): type is PropertyType {
+    return type && "field_type" in type && "chain" in type;
+  }
+
+  private isBaseTableType(type: any): type is BaseTableType {
+    return type && typeof type.resolve_database_table === "function";
+  }
+
+  private isLazyJoinType(type: any): type is LazyJoinType {
+    return type && "lazy_join" in type && "field" in type;
+  }
+
+  private isLazyTableType(type: any): type is LazyTableType {
+    return type && "table" in type && !("lazy_join" in type);
+  }
+
+  private isVirtualTableType(type: any): type is VirtualTableType {
+    return type && "virtual_table" in type && "field" in type;
+  }
+
+  private isDateTimeDatabaseField(field: any): field is DateTimeDatabaseField {
+    return field && "name" in field; // Simplified check
+  }
+
+  private isBooleanDatabaseField(field: any): field is BooleanDatabaseField {
+    return field && "name" in field; // Simplified check
+  }
+}
+
+// Main function to build property swapper
+export function buildPropertySwapper(node: AST, context: TSQLContext): void {
+  if (!context || !context.team_id) {
+    return;
+  }
+
+  // NOTE: In TypeScript, you'll need to fetch the team from your database/ORM
+  // This is a placeholder - replace with your actual team fetching logic
+  // if (!context.team) {
+  //     context.team = await Team.findById(context.team_id);
+  // }
+
+  if (!context.team) {
+    return;
+  }
+
+  // Find all properties
+  const propertyFinder = new PropertyFinder(context);
+  propertyFinder.visit(node);
+
+  // NOTE: In TypeScript, you'll need to query PropertyDefinition from your database
+  // This is a placeholder - replace with your actual property definition fetching logic
+  // const eventPropertyValues = await PropertyDefinition.find({
+  //     project_id: context.team.project_id,
+  //     name: { $in: Array.from(propertyFinder.eventProperties) },
+  //     type: { $in: [null, 'event'] },
+  // }).select('name property_type');
+  // const eventProperties = new Map(
+  //     eventPropertyValues.filter((p: any) => p.property_type).map((p: any) => [p.name, p.property_type])
+  // );
+
+  const eventProperties = new Map<string, string>();
+  const personProperties = new Map<string, string>();
+  const groupProperties = new Map<string, string>();
+
+  // TODO: Implement actual property definition fetching from database
+  // For now, these are empty maps
+
+  const timezone = (context.database as any)?._timezone || "UTC";
+  context.property_swapper = new PropertySwapper(
+    timezone,
+    eventProperties,
+    personProperties,
+    groupProperties,
+    context,
+    true
+  );
+}
diff --git a/internal-packages/tsql/src/query/results.test.ts b/internal-packages/tsql/src/query/results.test.ts
new file mode 100644
index 00000000000..49216992cf1
--- /dev/null
+++ b/internal-packages/tsql/src/query/results.test.ts
@@ -0,0 +1,234 @@
+import { describe, it, expect } from "vitest";
+import { transformResults, createResultTransformer } from "./results.js";
+import { column, type TableSchema } from "./schema.js";
+
+/**
+ * Test schema with valueMap
+ */
+const taskRunsSchema: TableSchema = {
+  name: "task_runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    status: {
+      name: "status",
+      ...column("String"),
+      valueMap: {
+        COMPLETED_SUCCESSFULLY: "Completed",
+        COMPLETED_WITH_ERRORS: "Completed with errors",
+        SYSTEM_FAILURE: "System failure",
+        PENDING: "Pending",
+        EXECUTING: "Running",
+        FAILED: "Failed",
+        CANCELLED: "Cancelled",
+      },
+    },
+    environment_type: {
+      name: "environment_type",
+      ...column("String"),
+      valueMap: {
+        DEVELOPMENT: "Development",
+        STAGING: "Staging",
+        PRODUCTION: "Production",
+      },
+    },
+    task_identifier: { name: "task_identifier", ...column("String") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+/**
+ * Schema without valueMap
+ */
+const simpleSchema: TableSchema = {
+  name: "simple",
+  clickhouseName: "trigger_dev.simple",
+  columns: {
+    id: { name: "id", ...column("String") },
+    name: { name: "name", ...column("String") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+describe("transformResults", () => {
+  it("should transform internal values to user-friendly values", () => {
+    const rows = [
+      { id: "run_1", status: "COMPLETED_SUCCESSFULLY", task_identifier: "my-task" },
+      { id: "run_2", status: "PENDING", task_identifier: "other-task" },
+      { id: "run_3", status: "FAILED", task_identifier: "my-task" },
+    ];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    expect(transformed[0].status).toBe("Completed");
+    expect(transformed[1].status).toBe("Pending");
+    expect(transformed[2].status).toBe("Failed");
+  });
+
+  it("should transform multiple columns with valueMaps", () => {
+    const rows = [
+      { id: "run_1", status: "COMPLETED_SUCCESSFULLY", environment_type: "PRODUCTION" },
+      { id: "run_2", status: "PENDING", environment_type: "DEVELOPMENT" },
+    ];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    expect(transformed[0].status).toBe("Completed");
+    expect(transformed[0].environment_type).toBe("Production");
+    expect(transformed[1].status).toBe("Pending");
+    expect(transformed[1].environment_type).toBe("Development");
+  });
+
+  it("should not modify columns without valueMap", () => {
+    const rows = [
+      { id: "run_1", status: "COMPLETED_SUCCESSFULLY", task_identifier: "my-task" },
+    ];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    // id and task_identifier should be unchanged
+    expect(transformed[0].id).toBe("run_1");
+    expect(transformed[0].task_identifier).toBe("my-task");
+  });
+
+  it("should pass through values not in valueMap unchanged", () => {
+    const rows = [{ id: "run_1", status: "UNKNOWN_STATUS", task_identifier: "my-task" }];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    // UNKNOWN_STATUS is not in the valueMap, should be passed through
+    expect(transformed[0].status).toBe("UNKNOWN_STATUS");
+  });
+
+  it("should return original rows if no columns have valueMap", () => {
+    const rows = [
+      { id: "run_1", name: "test" },
+      { id: "run_2", name: "other" },
+    ];
+
+    const transformed = transformResults(rows, [simpleSchema]);
+
+    // Should return the same array (reference equality)
+    expect(transformed).toBe(rows);
+  });
+
+  it("should handle empty rows array", () => {
+    const rows: Array<{ id: string; status: string }> = [];
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    expect(transformed).toEqual([]);
+  });
+
+  it("should handle case-insensitive internal value matching", () => {
+    const rows = [
+      { id: "run_1", status: "completed_successfully" },
+      { id: "run_2", status: "COMPLETED_SUCCESSFULLY" },
+      { id: "run_3", status: "Completed_Successfully" },
+    ];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    // All should map to "Completed"
+    expect(transformed[0].status).toBe("Completed");
+    expect(transformed[1].status).toBe("Completed");
+    expect(transformed[2].status).toBe("Completed");
+  });
+
+  it("should preserve non-string column values", () => {
+    const rows = [{ id: "run_1", status: "COMPLETED_SUCCESSFULLY", count: 42, active: true }];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    expect(transformed[0].count).toBe(42);
+    expect(transformed[0].active).toBe(true);
+    expect(transformed[0].status).toBe("Completed");
+  });
+
+  it("should preserve row reference if no changes made", () => {
+    const rows = [{ id: "run_1", status: "UNKNOWN_STATUS" }];
+
+    const transformed = transformResults(rows, [taskRunsSchema]);
+
+    // The row has status that doesn't match any valueMap entry
+    // But the column does have a valueMap, so we still check it
+    // Since the value doesn't change, the row reference should be preserved
+    expect(transformed[0]).toBe(rows[0]);
+  });
+
+  it("should handle multiple table schemas", () => {
+    const anotherSchema: TableSchema = {
+      name: "events",
+      clickhouseName: "trigger_dev.events",
+      columns: {
+        id: { name: "id", ...column("String") },
+        event_type: {
+          name: "event_type",
+          ...column("String"),
+          valueMap: {
+            TASK_START: "Started",
+            TASK_END: "Ended",
+          },
+        },
+        organization_id: { name: "organization_id", ...column("String") },
+        project_id: { name: "project_id", ...column("String") },
+        environment_id: { name: "environment_id", ...column("String") },
+      },
+      tenantColumns: {
+        organizationId: "organization_id",
+        projectId: "project_id",
+        environmentId: "environment_id",
+      },
+    };
+
+    const rows = [
+      { status: "COMPLETED_SUCCESSFULLY", event_type: "TASK_START" },
+      { status: "PENDING", event_type: "TASK_END" },
+    ];
+
+    const transformed = transformResults(rows, [taskRunsSchema, anotherSchema]);
+
+    expect(transformed[0].status).toBe("Completed");
+    expect(transformed[0].event_type).toBe("Started");
+    expect(transformed[1].status).toBe("Pending");
+    expect(transformed[1].event_type).toBe("Ended");
+  });
+});
+
+describe("createResultTransformer", () => {
+  it("should create a reusable transformer function", () => {
+    const transform = createResultTransformer([taskRunsSchema]);
+
+    const rows1 = [{ id: "1", status: "COMPLETED_SUCCESSFULLY" }];
+    const rows2 = [{ id: "2", status: "FAILED" }];
+
+    const transformed1 = transform(rows1);
+    const transformed2 = transform(rows2);
+
+    expect(transformed1[0].status).toBe("Completed");
+    expect(transformed2[0].status).toBe("Failed");
+  });
+
+  it("should return original rows if no valueMap columns exist", () => {
+    const transform = createResultTransformer([simpleSchema]);
+
+    const rows = [{ id: "1", name: "test" }];
+    const transformed = transform(rows);
+
+    expect(transformed).toBe(rows);
+  });
+});
+
diff --git a/internal-packages/tsql/src/query/results.ts b/internal-packages/tsql/src/query/results.ts
new file mode 100644
index 00000000000..8edeb8f54e4
--- /dev/null
+++ b/internal-packages/tsql/src/query/results.ts
@@ -0,0 +1,201 @@
+/**
+ * Result transformation utilities for TSQL queries
+ *
+ * Transforms query result values from internal ClickHouse values
+ * to user-friendly display names using the column valueMap or fieldMapping.
+ */
+
+import type { TableSchema, ColumnSchema, FieldMappings } from "./schema.js";
+import { getUserFriendlyValue, hasFieldMapping, getExternalValue } from "./schema.js";
+
+/**
+ * Options for transforming query results
+ */
+export interface TransformResultsOptions {
+  /**
+   * If true, transform values even if the column was aliased (e.g., SELECT status AS s)
+   * Default: false (aliased columns are not transformed since the user explicitly chose a different name)
+   */
+  transformAliased?: boolean;
+  /**
+   * Runtime field mappings for dynamic value translation.
+   * Maps internal ClickHouse values to external user-facing values.
+   * Values not found in the mapping will be returned as null.
+   */
+  fieldMappings?: FieldMappings;
+}
+
+/**
+ * Transform query result rows, mapping internal values to user-friendly display names
+ *
+ * This function iterates over result rows and transforms any column values that have
+ * a `valueMap` or `fieldMapping` defined in their schema, converting internal ClickHouse values
+ * (e.g., 'COMPLETED_SUCCESSFULLY') back to user-friendly display names (e.g., 'Completed').
+ *
+ * For columns with `fieldMapping`, values not found in the mapping will be returned as null.
+ *
+ * @param rows - Array of result rows to transform
+ * @param schema - Array of table schemas containing column definitions with valueMaps
+ * @param options - Optional transformation options
+ * @returns New array of rows with transformed values
+ *
+ * @example
+ * ```typescript
+ * const schema: TableSchema[] = [{
+ *   name: "task_runs",
+ *   clickhouseName: "trigger_dev.task_runs_v2",
+ *   columns: {
+ *     status: {
+ *       name: "status",
+ *       type: "String",
+ *       valueMap: {
+ *         "COMPLETED_SUCCESSFULLY": "Completed",
+ *         "PENDING": "Pending",
+ *       },
+ *     },
+ *     project_ref: {
+ *       name: "project_ref",
+ *       clickhouseName: "project_id",
+ *       type: "String",
+ *       fieldMapping: "project",
+ *     },
+ *   },
+ *   tenantColumns: { organizationId: "organization_id", projectId: "project_id", environmentId: "environment_id" },
+ * }];
+ *
+ * const results = [{ status: "COMPLETED_SUCCESSFULLY", project_ref: "cm12345" }];
+ * const transformed = transformResults(results, schema, {
+ *   fieldMappings: { project: { "cm12345": "my-project-ref" } },
+ * });
+ * // transformed = [{ status: "Completed", project_ref: "my-project-ref" }]
+ * ```
+ */
+export function transformResults<T extends Record<string, unknown>>(
+  rows: T[],
+  schema: TableSchema[],
+  options: TransformResultsOptions = {}
+): T[] {
+  // Build a map of column names to their schemas (for columns that have transformations)
+  const columnTransformMaps = buildColumnTransformMaps(schema);
+
+  // If no columns have transformations, return the original rows unchanged
+  if (columnTransformMaps.size === 0) {
+    return rows;
+  }
+
+  // Transform each row
+  return rows.map((row) => transformRow(row, columnTransformMaps, options.fieldMappings));
+}
+
+/**
+ * Build a map of column names to their schemas for columns that have transformations
+ * (either valueMap or fieldMapping)
+ */
+function buildColumnTransformMaps(schema: TableSchema[]): Map<string, ColumnSchema> {
+  const columnMaps = new Map<string, ColumnSchema>();
+
+  for (const table of schema) {
+    for (const [columnName, columnSchema] of Object.entries(table.columns)) {
+      const hasValueMap = columnSchema.valueMap && Object.keys(columnSchema.valueMap).length > 0;
+      const hasFieldMap = hasFieldMapping(columnSchema);
+
+      if (hasValueMap || hasFieldMap) {
+        // Use the TSQL-exposed column name (not the ClickHouse name)
+        columnMaps.set(columnName, columnSchema);
+      }
+    }
+  }
+
+  return columnMaps;
+}
+
+/**
+ * Transform a single value using the column's valueMap or fieldMapping
+ * Returns the transformed value, or the original value if no transformation applies
+ * For fieldMapping, returns null if the value is not found in the mapping
+ */
+function transformSingleValue(
+  columnSchema: ColumnSchema,
+  value: string,
+  fieldMappings?: FieldMappings
+): string | null {
+  // First try static valueMap (always returns the original if no match)
+  if (columnSchema.valueMap && Object.keys(columnSchema.valueMap).length > 0) {
+    return getUserFriendlyValue(columnSchema, value);
+  }
+
+  // Then try runtime fieldMapping (returns null if not found)
+  if (hasFieldMapping(columnSchema) && columnSchema.fieldMapping && fieldMappings) {
+    const externalValue = getExternalValue(fieldMappings, columnSchema.fieldMapping, value);
+    // For fieldMapping, return null if not found (per user requirement)
+    return externalValue;
+  }
+
+  return value;
+}
+
+/**
+ * Transform a single row's values using the column valueMaps and fieldMappings
+ */
+function transformRow<T extends Record<string, unknown>>(
+  row: T,
+  columnTransformMaps: Map<string, ColumnSchema>,
+  fieldMappings?: FieldMappings
+): T {
+  const transformedRow: Record<string, unknown> = {};
+  let hasChanges = false;
+
+  for (const [key, value] of Object.entries(row)) {
+    const columnSchema = columnTransformMaps.get(key);
+
+    if (columnSchema && typeof value === "string") {
+      const transformedValue = transformSingleValue(columnSchema, value, fieldMappings);
+      transformedRow[key] = transformedValue;
+      if (transformedValue !== value) {
+        hasChanges = true;
+      }
+    } else {
+      transformedRow[key] = value;
+    }
+  }
+
+  // Return original row if no changes were made (preserves reference equality)
+  return hasChanges ? (transformedRow as T) : row;
+}
+
+/**
+ * Create a result transformer bound to a specific schema
+ *
+ * Useful when you need to transform multiple result sets with the same schema.
+ *
+ * @param schema - Array of table schemas
+ * @param options - Optional transformation options (including fieldMappings)
+ * @returns A function that transforms result rows
+ *
+ * @example
+ * ```typescript
+ * const transform = createResultTransformer(schema, {
+ *   fieldMappings: { project: { "cm12345": "my-project-ref" } },
+ * });
+ *
+ * const results1 = await query1();
+ * const transformed1 = transform(results1);
+ *
+ * const results2 = await query2();
+ * const transformed2 = transform(results2);
+ * ```
+ */
+export function createResultTransformer(
+  schema: TableSchema[],
+  options: TransformResultsOptions = {}
+): <T extends Record<string, unknown>>(rows: T[]) => T[] {
+  const columnTransformMaps = buildColumnTransformMaps(schema);
+
+  return <T extends Record<string, unknown>>(rows: T[]): T[] => {
+    if (columnTransformMaps.size === 0) {
+      return rows;
+    }
+    return rows.map((row) => transformRow(row, columnTransformMaps, options.fieldMappings));
+  };
+}
+
diff --git a/internal-packages/tsql/src/query/schema.test.ts b/internal-packages/tsql/src/query/schema.test.ts
new file mode 100644
index 00000000000..29656b1cb29
--- /dev/null
+++ b/internal-packages/tsql/src/query/schema.test.ts
@@ -0,0 +1,792 @@
+import { describe, it, expect } from "vitest";
+import {
+  column,
+  getUserFriendlyValue,
+  getInternalValue,
+  getAllowedUserValues,
+  isValidUserValue,
+  isVirtualColumn,
+  getVirtualColumnExpression,
+  hasFieldMapping,
+  getExternalValue,
+  getInternalValueFromMapping,
+  getInternalValueFromMappingCaseInsensitive,
+  sanitizeErrorMessage,
+  type ColumnSchema,
+  type FieldMappings,
+  type TableSchema,
+} from "./schema.js";
+
+describe("Value mapping helper functions", () => {
+  const columnWithValueMap: ColumnSchema = {
+    name: "status",
+    ...column("String"),
+    valueMap: {
+      COMPLETED_SUCCESSFULLY: "Completed",
+      COMPLETED_WITH_ERRORS: "Completed with errors",
+      SYSTEM_FAILURE: "System failure",
+      PENDING: "Pending",
+      EXECUTING: "Running",
+      FAILED: "Failed",
+    },
+  };
+
+  const columnWithAllowedValues: ColumnSchema = {
+    name: "status",
+    ...column("String"),
+    allowedValues: ["completed", "pending", "failed"],
+  };
+
+  const columnWithNoRestrictions: ColumnSchema = {
+    name: "task_identifier",
+    ...column("String"),
+  };
+
+  describe("getUserFriendlyValue", () => {
+    it("should return user-friendly value for internal value", () => {
+      expect(getUserFriendlyValue(columnWithValueMap, "COMPLETED_SUCCESSFULLY")).toBe("Completed");
+      expect(getUserFriendlyValue(columnWithValueMap, "PENDING")).toBe("Pending");
+      expect(getUserFriendlyValue(columnWithValueMap, "EXECUTING")).toBe("Running");
+    });
+
+    it("should be case-insensitive for internal value lookup", () => {
+      expect(getUserFriendlyValue(columnWithValueMap, "completed_successfully")).toBe("Completed");
+      expect(getUserFriendlyValue(columnWithValueMap, "Completed_Successfully")).toBe("Completed");
+      expect(getUserFriendlyValue(columnWithValueMap, "COMPLETED_SUCCESSFULLY")).toBe("Completed");
+    });
+
+    it("should return original value if no mapping exists", () => {
+      expect(getUserFriendlyValue(columnWithValueMap, "UNKNOWN_STATUS")).toBe("UNKNOWN_STATUS");
+    });
+
+    it("should return original value if column has no valueMap", () => {
+      expect(getUserFriendlyValue(columnWithNoRestrictions, "any_value")).toBe("any_value");
+    });
+  });
+
+  describe("getInternalValue", () => {
+    it("should return internal value for user-friendly value", () => {
+      expect(getInternalValue(columnWithValueMap, "Completed")).toBe("COMPLETED_SUCCESSFULLY");
+      expect(getInternalValue(columnWithValueMap, "Pending")).toBe("PENDING");
+      expect(getInternalValue(columnWithValueMap, "Running")).toBe("EXECUTING");
+    });
+
+    it("should be case-insensitive for user-friendly value lookup", () => {
+      expect(getInternalValue(columnWithValueMap, "completed")).toBe("COMPLETED_SUCCESSFULLY");
+      expect(getInternalValue(columnWithValueMap, "COMPLETED")).toBe("COMPLETED_SUCCESSFULLY");
+      expect(getInternalValue(columnWithValueMap, "Completed")).toBe("COMPLETED_SUCCESSFULLY");
+    });
+
+    it("should return original value if no mapping exists", () => {
+      expect(getInternalValue(columnWithValueMap, "Unknown")).toBe("Unknown");
+    });
+
+    it("should return original value if column has no valueMap", () => {
+      expect(getInternalValue(columnWithNoRestrictions, "any_value")).toBe("any_value");
+    });
+
+    it("should handle multi-word user-friendly values", () => {
+      expect(getInternalValue(columnWithValueMap, "Completed with errors")).toBe(
+        "COMPLETED_WITH_ERRORS"
+      );
+      expect(getInternalValue(columnWithValueMap, "completed with errors")).toBe(
+        "COMPLETED_WITH_ERRORS"
+      );
+      expect(getInternalValue(columnWithValueMap, "System failure")).toBe("SYSTEM_FAILURE");
+    });
+  });
+
+  describe("getAllowedUserValues", () => {
+    it("should return user-friendly values from valueMap", () => {
+      const values = getAllowedUserValues(columnWithValueMap);
+
+      expect(values).toContain("Completed");
+      expect(values).toContain("Pending");
+      expect(values).toContain("Running");
+      expect(values).toContain("Failed");
+      expect(values).toContain("Completed with errors");
+      expect(values).toContain("System failure");
+      expect(values).toHaveLength(6);
+    });
+
+    it("should return allowedValues if no valueMap exists", () => {
+      const values = getAllowedUserValues(columnWithAllowedValues);
+
+      expect(values).toEqual(["completed", "pending", "failed"]);
+    });
+
+    it("should prefer valueMap over allowedValues", () => {
+      const columnWithBoth: ColumnSchema = {
+        name: "status",
+        ...column("String"),
+        allowedValues: ["internal1", "internal2"],
+        valueMap: {
+          internal1: "User 1",
+          internal2: "User 2",
+        },
+      };
+
+      const values = getAllowedUserValues(columnWithBoth);
+
+      expect(values).toEqual(["User 1", "User 2"]);
+    });
+
+    it("should return empty array for column with no restrictions", () => {
+      const values = getAllowedUserValues(columnWithNoRestrictions);
+
+      expect(values).toEqual([]);
+    });
+  });
+
+  describe("isValidUserValue", () => {
+    it("should return true for valid user-friendly values", () => {
+      expect(isValidUserValue(columnWithValueMap, "Completed")).toBe(true);
+      expect(isValidUserValue(columnWithValueMap, "Pending")).toBe(true);
+      expect(isValidUserValue(columnWithValueMap, "Running")).toBe(true);
+    });
+
+    it("should be case-insensitive", () => {
+      expect(isValidUserValue(columnWithValueMap, "completed")).toBe(true);
+      expect(isValidUserValue(columnWithValueMap, "COMPLETED")).toBe(true);
+      expect(isValidUserValue(columnWithValueMap, "running")).toBe(true);
+    });
+
+    it("should return false for invalid values", () => {
+      expect(isValidUserValue(columnWithValueMap, "Unknown")).toBe(false);
+      expect(isValidUserValue(columnWithValueMap, "COMPLETED_SUCCESSFULLY")).toBe(false); // internal value, not user-friendly
+    });
+
+    it("should return true for any value if column has no restrictions", () => {
+      expect(isValidUserValue(columnWithNoRestrictions, "any_value")).toBe(true);
+      expect(isValidUserValue(columnWithNoRestrictions, "another")).toBe(true);
+    });
+
+    it("should validate against allowedValues if no valueMap", () => {
+      expect(isValidUserValue(columnWithAllowedValues, "completed")).toBe(true);
+      expect(isValidUserValue(columnWithAllowedValues, "COMPLETED")).toBe(true);
+      expect(isValidUserValue(columnWithAllowedValues, "unknown")).toBe(false);
+    });
+
+    it("should handle multi-word values", () => {
+      expect(isValidUserValue(columnWithValueMap, "Completed with errors")).toBe(true);
+      expect(isValidUserValue(columnWithValueMap, "completed with errors")).toBe(true);
+      expect(isValidUserValue(columnWithValueMap, "System failure")).toBe(true);
+    });
+  });
+});
+
+describe("Virtual column helper functions", () => {
+  const virtualColumn: ColumnSchema = {
+    name: "execution_duration",
+    ...column("Nullable(Int64)"),
+    expression: "dateDiff('millisecond', started_at, completed_at)",
+    description: "Time between started_at and completed_at in milliseconds",
+  };
+
+  const regularColumn: ColumnSchema = {
+    name: "status",
+    ...column("String"),
+  };
+
+  const columnWithEmptyExpression: ColumnSchema = {
+    name: "bad_column",
+    ...column("String"),
+    expression: "",
+  };
+
+  describe("isVirtualColumn", () => {
+    it("should return true for columns with expression defined", () => {
+      expect(isVirtualColumn(virtualColumn)).toBe(true);
+    });
+
+    it("should return false for regular columns without expression", () => {
+      expect(isVirtualColumn(regularColumn)).toBe(false);
+    });
+
+    it("should return false for columns with empty expression", () => {
+      expect(isVirtualColumn(columnWithEmptyExpression)).toBe(false);
+    });
+
+    it("should return false for columns with undefined expression", () => {
+      const col: ColumnSchema = {
+        name: "test",
+        ...column("String"),
+        expression: undefined,
+      };
+      expect(isVirtualColumn(col)).toBe(false);
+    });
+  });
+
+  describe("getVirtualColumnExpression", () => {
+    it("should return the expression for virtual columns", () => {
+      expect(getVirtualColumnExpression(virtualColumn)).toBe(
+        "dateDiff('millisecond', started_at, completed_at)"
+      );
+    });
+
+    it("should return undefined for regular columns", () => {
+      expect(getVirtualColumnExpression(regularColumn)).toBeUndefined();
+    });
+
+    it("should return undefined for columns with empty expression", () => {
+      expect(getVirtualColumnExpression(columnWithEmptyExpression)).toBeUndefined();
+    });
+  });
+
+  describe("virtual column schema definition", () => {
+    it("should allow defining virtual columns with all standard column options", () => {
+      const virtualWithOptions: ColumnSchema = {
+        name: "computed_value",
+        type: "Float64",
+        expression: "usage_duration_ms / 1000.0",
+        selectable: true,
+        filterable: true,
+        sortable: true,
+        groupable: false, // Might not want to group by computed values
+        description: "Usage duration in seconds",
+      };
+
+      expect(isVirtualColumn(virtualWithOptions)).toBe(true);
+      expect(virtualWithOptions.groupable).toBe(false);
+      expect(virtualWithOptions.selectable).toBe(true);
+    });
+
+    it("should support complex expressions with ClickHouse functions", () => {
+      const complexVirtual: ColumnSchema = {
+        name: "is_long_running",
+        ...column("UInt8"),
+        expression:
+          "if(completed_at IS NOT NULL AND started_at IS NOT NULL, dateDiff('second', started_at, completed_at) > 60, 0)",
+      };
+
+      expect(isVirtualColumn(complexVirtual)).toBe(true);
+      expect(getVirtualColumnExpression(complexVirtual)).toContain("dateDiff");
+      expect(getVirtualColumnExpression(complexVirtual)).toContain("if(");
+    });
+  });
+});
+
+describe("Field mapping helper functions (runtime dynamic mappings)", () => {
+  const fieldMappings: FieldMappings = {
+    project: {
+      cm12345: "my-project-ref",
+      cm67890: "other-project",
+      cmABCDE: "Mixed-Case-Project",
+    },
+    environment: {
+      env123: "production",
+      env456: "staging",
+    },
+  };
+
+  const columnWithFieldMapping: ColumnSchema = {
+    name: "project_ref",
+    clickhouseName: "project_id",
+    ...column("String"),
+    fieldMapping: "project",
+  };
+
+  const columnWithoutFieldMapping: ColumnSchema = {
+    name: "status",
+    ...column("String"),
+  };
+
+  const columnWithEmptyFieldMapping: ColumnSchema = {
+    name: "test",
+    ...column("String"),
+    fieldMapping: "",
+  };
+
+  describe("hasFieldMapping", () => {
+    it("should return true for columns with fieldMapping defined", () => {
+      expect(hasFieldMapping(columnWithFieldMapping)).toBe(true);
+    });
+
+    it("should return false for columns without fieldMapping", () => {
+      expect(hasFieldMapping(columnWithoutFieldMapping)).toBe(false);
+    });
+
+    it("should return false for columns with empty fieldMapping", () => {
+      expect(hasFieldMapping(columnWithEmptyFieldMapping)).toBe(false);
+    });
+
+    it("should return false for columns with undefined fieldMapping", () => {
+      const col: ColumnSchema = {
+        name: "test",
+        ...column("String"),
+        fieldMapping: undefined,
+      };
+      expect(hasFieldMapping(col)).toBe(false);
+    });
+  });
+
+  describe("getExternalValue", () => {
+    it("should return external value for internal value", () => {
+      expect(getExternalValue(fieldMappings, "project", "cm12345")).toBe("my-project-ref");
+      expect(getExternalValue(fieldMappings, "project", "cm67890")).toBe("other-project");
+      expect(getExternalValue(fieldMappings, "environment", "env123")).toBe("production");
+    });
+
+    it("should return null if internal value is not found in mapping", () => {
+      expect(getExternalValue(fieldMappings, "project", "unknown_id")).toBeNull();
+      expect(getExternalValue(fieldMappings, "environment", "unknown_env")).toBeNull();
+    });
+
+    it("should return null if mapping name does not exist", () => {
+      expect(getExternalValue(fieldMappings, "nonexistent", "cm12345")).toBeNull();
+    });
+
+    it("should return null for empty mappings", () => {
+      expect(getExternalValue({}, "project", "cm12345")).toBeNull();
+    });
+
+    it("should be case-sensitive for internal values", () => {
+      // Internal IDs should be matched exactly
+      expect(getExternalValue(fieldMappings, "project", "CM12345")).toBeNull();
+      expect(getExternalValue(fieldMappings, "project", "cm12345")).toBe("my-project-ref");
+    });
+  });
+
+  describe("getInternalValueFromMapping", () => {
+    it("should return internal value for external value", () => {
+      expect(getInternalValueFromMapping(fieldMappings, "project", "my-project-ref")).toBe(
+        "cm12345"
+      );
+      expect(getInternalValueFromMapping(fieldMappings, "project", "other-project")).toBe(
+        "cm67890"
+      );
+      expect(getInternalValueFromMapping(fieldMappings, "environment", "production")).toBe(
+        "env123"
+      );
+    });
+
+    it("should return null if external value is not found", () => {
+      expect(getInternalValueFromMapping(fieldMappings, "project", "unknown-ref")).toBeNull();
+    });
+
+    it("should return null if mapping name does not exist", () => {
+      expect(
+        getInternalValueFromMapping(fieldMappings, "nonexistent", "my-project-ref")
+      ).toBeNull();
+    });
+
+    it("should return null for empty mappings", () => {
+      expect(getInternalValueFromMapping({}, "project", "my-project-ref")).toBeNull();
+    });
+
+    it("should be case-sensitive for external values", () => {
+      // This is the case-sensitive version
+      expect(getInternalValueFromMapping(fieldMappings, "project", "MY-PROJECT-REF")).toBeNull();
+      expect(getInternalValueFromMapping(fieldMappings, "project", "my-project-ref")).toBe(
+        "cm12345"
+      );
+    });
+  });
+
+  describe("getInternalValueFromMappingCaseInsensitive", () => {
+    it("should return internal value for external value (case-insensitive)", () => {
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "project", "my-project-ref")
+      ).toBe("cm12345");
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "project", "MY-PROJECT-REF")
+      ).toBe("cm12345");
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "project", "My-Project-Ref")
+      ).toBe("cm12345");
+    });
+
+    it("should return null if external value is not found (even case-insensitive)", () => {
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "project", "unknown-ref")
+      ).toBeNull();
+    });
+
+    it("should return null if mapping name does not exist", () => {
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "nonexistent", "my-project-ref")
+      ).toBeNull();
+    });
+
+    it("should return null for empty mappings", () => {
+      expect(
+        getInternalValueFromMappingCaseInsensitive({}, "project", "my-project-ref")
+      ).toBeNull();
+    });
+
+    it("should handle mixed case external values correctly", () => {
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "project", "mixed-case-project")
+      ).toBe("cmABCDE");
+      expect(
+        getInternalValueFromMappingCaseInsensitive(fieldMappings, "project", "MIXED-CASE-PROJECT")
+      ).toBe("cmABCDE");
+    });
+  });
+
+  describe("field mapping column schema definition", () => {
+    it("should allow defining columns with fieldMapping", () => {
+      const col: ColumnSchema = {
+        name: "project_ref",
+        clickhouseName: "project_id",
+        type: "String",
+        fieldMapping: "project",
+        description: "Project reference (external identifier)",
+      };
+
+      expect(hasFieldMapping(col)).toBe(true);
+      expect(col.clickhouseName).toBe("project_id");
+      expect(col.fieldMapping).toBe("project");
+    });
+
+    it("should allow fieldMapping with all standard column options", () => {
+      const col: ColumnSchema = {
+        name: "project_ref",
+        clickhouseName: "project_id",
+        ...column("String"),
+        fieldMapping: "project",
+        selectable: true,
+        filterable: true,
+        sortable: true,
+        groupable: true,
+      };
+
+      expect(hasFieldMapping(col)).toBe(true);
+      expect(col.selectable).toBe(true);
+      expect(col.filterable).toBe(true);
+    });
+  });
+});
+
+describe("Error message sanitization", () => {
+  // Test schema mimicking the real runs schema
+  const runsSchema: TableSchema = {
+    name: "runs",
+    clickhouseName: "trigger_dev.task_runs_v2",
+    description: "Task runs table",
+    tenantColumns: {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+    columns: {
+      run_id: {
+        name: "run_id",
+        clickhouseName: "friendly_id",
+        ...column("String"),
+      },
+      triggered_at: {
+        name: "triggered_at",
+        clickhouseName: "created_at",
+        ...column("DateTime64"),
+      },
+      machine: {
+        name: "machine",
+        clickhouseName: "machine_preset",
+        ...column("String"),
+      },
+      status: {
+        name: "status",
+        // No clickhouseName - same as name
+        ...column("String"),
+      },
+      task_identifier: {
+        name: "task_identifier",
+        // No clickhouseName - same as name
+        ...column("String"),
+      },
+    },
+  };
+
+  describe("sanitizeErrorMessage", () => {
+    it("should replace fully qualified table.column references", () => {
+      const error = "Missing column trigger_dev.task_runs_v2.friendly_id in query";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Missing column runs.run_id in query");
+    });
+
+    it("should replace standalone table names", () => {
+      const error = "Table trigger_dev.task_runs_v2 does not exist";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Table runs does not exist");
+    });
+
+    it("should replace standalone column names with different clickhouseName", () => {
+      const error = "Unknown identifier: friendly_id";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Unknown identifier: run_id");
+    });
+
+    it("should replace multiple occurrences in the same message", () => {
+      const error =
+        "Cannot compare friendly_id with created_at: incompatible types in trigger_dev.task_runs_v2";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Cannot compare run_id with triggered_at: incompatible types in runs");
+    });
+
+    it("should not replace column names that have no clickhouseName mapping", () => {
+      const error = "Invalid value for column status";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Invalid value for column status");
+    });
+
+    it("should handle error messages with quoted identifiers", () => {
+      const error = "Column 'machine_preset' is not of type String";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Column 'machine' is not of type String");
+    });
+
+    it("should handle error messages with backtick identifiers", () => {
+      const error = "Unknown column `friendly_id` in table";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Unknown column `run_id` in table");
+    });
+
+    it("should not replace partial matches within larger identifiers", () => {
+      const error = "Column my_friendly_id_column not found";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      // Should not replace "friendly_id" within "my_friendly_id_column"
+      expect(sanitized).toBe("Column my_friendly_id_column not found");
+    });
+
+    it("should return original message if no schemas provided", () => {
+      const error = "Some error with trigger_dev.task_runs_v2";
+      const sanitized = sanitizeErrorMessage(error, []);
+      expect(sanitized).toBe("Some error with trigger_dev.task_runs_v2");
+    });
+
+    it("should return original message if no matches found", () => {
+      const error = "Generic database error occurred";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Generic database error occurred");
+    });
+
+    it("should handle multiple tables", () => {
+      const eventsSchema: TableSchema = {
+        name: "events",
+        clickhouseName: "trigger_dev.task_events",
+        description: "Task events table",
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+        columns: {
+          event_id: {
+            name: "event_id",
+            clickhouseName: "internal_event_id",
+            ...column("String"),
+          },
+        },
+      };
+
+      const error =
+        "Cannot join trigger_dev.task_runs_v2 with trigger_dev.task_events on internal_event_id";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema, eventsSchema]);
+      expect(sanitized).toBe("Cannot join runs with events on event_id");
+    });
+
+    it("should handle real ClickHouse error format", () => {
+      const error =
+        "Unable to query clickhouse: Code: 47. DB::Exception: Missing columns: 'friendly_id' while processing query";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      // Should remove the "Unable to query clickhouse:" prefix
+      expect(sanitized).toBe(
+        "Code: 47. DB::Exception: Missing columns: 'run_id' while processing query"
+      );
+    });
+
+    it("should remove 'Unable to query clickhouse:' prefix", () => {
+      const error = "Unable to query clickhouse: Something went wrong";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Something went wrong");
+      expect(sanitized).not.toContain("Unable to query clickhouse");
+    });
+
+    it("should handle error with column in parentheses", () => {
+      const error = "Function count(friendly_id) expects different arguments";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Function count(run_id) expects different arguments");
+    });
+
+    it("should handle error with column after comma", () => {
+      const error = "SELECT friendly_id, created_at FROM table";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("SELECT run_id, triggered_at FROM table");
+    });
+
+    it("should NOT replace column names in 'Did you mean' error messages", () => {
+      // When a user types an internal ClickHouse column name, we show "Did you mean X?"
+      // The sanitizer should NOT replace the column name in this case, as it would
+      // turn "Unknown column 'created_at'. Did you mean 'triggered_at'?" into
+      // "Unknown column 'triggered_at'. Did you mean 'triggered_at'?" which is confusing
+      const error = 'Unknown column "created_at". Did you mean "triggered_at"?';
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      // Should preserve both the original column name AND the suggestion
+      expect(sanitized).toBe('Unknown column "created_at". Did you mean "triggered_at"?');
+    });
+
+    it("should prioritize longer matches (table.column before standalone column)", () => {
+      // This tests that we replace "trigger_dev.task_runs_v2.friendly_id" as a unit,
+      // not "trigger_dev.task_runs_v2" and then "friendly_id" separately
+      const error = "Error in trigger_dev.task_runs_v2.friendly_id";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Error in runs.run_id");
+    });
+
+    it("should remove tenant isolation filters from error messages", () => {
+      const error =
+        "Unknown identifier in scope SELECT run_id FROM runs WHERE ((organization_id = 'org123') AND (project_id = 'proj456') AND (environment_id = 'env789')) AND (status = 'Failed')";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).not.toContain("organization_id");
+      expect(sanitized).not.toContain("project_id");
+      expect(sanitized).not.toContain("environment_id");
+      expect(sanitized).toContain("status = 'Failed'");
+    });
+
+    it("should remove redundant column aliases like 'run_id AS run_id'", () => {
+      const error = "Error in SELECT run_id AS run_id, machine AS machine FROM runs";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Error in SELECT run_id, machine FROM runs");
+    });
+
+    it("should remove redundant table aliases like 'runs AS runs'", () => {
+      const error = "Error in SELECT * FROM runs AS runs WHERE status = 'Failed'";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+      expect(sanitized).toBe("Error in SELECT * FROM runs WHERE status = 'Failed'");
+    });
+
+    it("should handle real error with tenant filters and aliases", () => {
+      const error =
+        "Unable to query clickhouse: Unknown expression identifier `triggered_ata` in scope SELECT run_id AS run_id, machine AS machine FROM runs AS runs WHERE ((organization_id = 'cm5qtzpb800007cp7h6ebwt2i') AND (project_id = 'cme2p1yep00007calt8ugarkr') AND (environment_id = 'cme2p1ygj00027caln51kyiwl')) AND (status = 'Complted') ORDER BY triggered_ata DESC LIMIT 100.";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+
+      // Should not contain internal prefix
+      expect(sanitized).not.toContain("Unable to query clickhouse");
+
+      // Should not contain internal IDs
+      expect(sanitized).not.toContain("cm5qtzpb800007cp7h6ebwt2i");
+      expect(sanitized).not.toContain("cme2p1yep00007calt8ugarkr");
+      expect(sanitized).not.toContain("cme2p1ygj00027caln51kyiwl");
+      expect(sanitized).not.toContain("organization_id");
+      expect(sanitized).not.toContain("project_id");
+      expect(sanitized).not.toContain("environment_id");
+
+      // Should not have redundant aliases
+      expect(sanitized).not.toContain("run_id AS run_id");
+      expect(sanitized).not.toContain("machine AS machine");
+      expect(sanitized).not.toContain("runs AS runs");
+
+      // Should still have the user's query parts
+      expect(sanitized).toContain("status = 'Complted'");
+      expect(sanitized).toContain("triggered_ata");
+      expect(sanitized).toContain("LIMIT 100");
+    });
+
+    it("should remove required filters like engine = 'V2'", () => {
+      // Schema with required filters
+      const schemaWithRequiredFilters: TableSchema = {
+        name: "runs",
+        clickhouseName: "trigger_dev.task_runs_v2",
+        description: "Task runs table",
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+        requiredFilters: [{ column: "engine", value: "V2" }],
+        columns: {
+          run_id: {
+            name: "run_id",
+            ...column("String"),
+          },
+        },
+      };
+
+      const error =
+        "Error in SELECT run_id FROM runs WHERE ((organization_id = 'org1') AND (engine = 'V2')) AND (status = 'Failed')";
+      const sanitized = sanitizeErrorMessage(error, [schemaWithRequiredFilters]);
+
+      expect(sanitized).not.toContain("engine = 'V2'");
+      expect(sanitized).not.toContain("organization_id");
+      expect(sanitized).toContain("status = 'Failed'");
+    });
+
+    it("should handle project and environment field mappings in tenant columns", () => {
+      // The schema uses 'project' and 'environment' as column names with field mappings
+      const schemaWithFieldMappedTenants: TableSchema = {
+        name: "runs",
+        clickhouseName: "trigger_dev.task_runs_v2",
+        description: "Task runs table",
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project",
+          environmentId: "environment",
+        },
+        columns: {
+          run_id: {
+            name: "run_id",
+            ...column("String"),
+          },
+        },
+      };
+
+      const error =
+        "Error WHERE ((organization_id = 'org1') AND (project = 'proj1') AND (environment = 'env1')) AND (status = 'ok')";
+      const sanitized = sanitizeErrorMessage(error, [schemaWithFieldMappedTenants]);
+
+      expect(sanitized).not.toContain("organization_id = 'org1'");
+      expect(sanitized).not.toContain("project = 'proj1'");
+      expect(sanitized).not.toContain("environment = 'env1'");
+      expect(sanitized).toContain("status = 'ok'");
+    });
+
+    it("should handle queries with only automatic WHERE filters (no user WHERE clause)", () => {
+      // When user writes: SELECT * FROM runs LIMIT 10
+      // The compiled query becomes: SELECT * FROM runs WHERE (org_id = '...') AND (proj_id = '...') AND (env_id = '...')
+      const error =
+        "Unable to query clickhouse: Some error in SELECT run_id FROM runs WHERE ((organization_id = 'org1') AND (project_id = 'proj1') AND (environment_id = 'env1')) LIMIT 10";
+      const sanitized = sanitizeErrorMessage(error, [runsSchema]);
+
+      expect(sanitized).not.toContain("Unable to query clickhouse");
+      expect(sanitized).not.toContain("organization_id");
+      expect(sanitized).not.toContain("project_id");
+      expect(sanitized).not.toContain("environment_id");
+      expect(sanitized).not.toContain("WHERE");
+      expect(sanitized).toContain("SELECT run_id FROM runs");
+      expect(sanitized).toContain("LIMIT 10");
+    });
+
+    it("should handle queries with only automatic filters including engine filter", () => {
+      const schemaWithEngine: TableSchema = {
+        name: "runs",
+        clickhouseName: "trigger_dev.task_runs_v2",
+        description: "Task runs table",
+        tenantColumns: {
+          organizationId: "organization_id",
+          projectId: "project_id",
+          environmentId: "environment_id",
+        },
+        requiredFilters: [{ column: "engine", value: "V2" }],
+        columns: {
+          run_id: {
+            name: "run_id",
+            ...column("String"),
+          },
+        },
+      };
+
+      const error =
+        "Error in SELECT * FROM runs WHERE ((organization_id = 'org1') AND (project_id = 'proj1') AND (environment_id = 'env1') AND (engine = 'V2')) ORDER BY run_id";
+      const sanitized = sanitizeErrorMessage(error, [schemaWithEngine]);
+
+      expect(sanitized).not.toContain("organization_id");
+      expect(sanitized).not.toContain("project_id");
+      expect(sanitized).not.toContain("environment_id");
+      expect(sanitized).not.toContain("engine");
+      expect(sanitized).not.toContain("WHERE");
+      expect(sanitized).toContain("SELECT * FROM runs");
+      expect(sanitized).toContain("ORDER BY run_id");
+    });
+  });
+});
diff --git a/internal-packages/tsql/src/query/schema.ts b/internal-packages/tsql/src/query/schema.ts
new file mode 100644
index 00000000000..2ea81091aad
--- /dev/null
+++ b/internal-packages/tsql/src/query/schema.ts
@@ -0,0 +1,1007 @@
+// Schema definitions for TSQL query validation
+// Defines allowed tables, columns, and tenant isolation configuration
+
+import { QueryError } from "./errors";
+import type { BucketThreshold } from "./time_buckets";
+
+/**
+ * ClickHouse data types supported by TSQL
+ */
+export type ClickHouseType =
+  | "String"
+  | "UInt8"
+  | "UInt16"
+  | "UInt32"
+  | "UInt64"
+  | "Int8"
+  | "Int16"
+  | "Int32"
+  | "Int64"
+  | "Float32"
+  | "Float64"
+  | "Date"
+  | "Date32"
+  | "DateTime"
+  | "DateTime64"
+  | "UUID"
+  | "Bool"
+  | "JSON"
+  | "Nullable(String)"
+  | "Nullable(UInt8)"
+  | "Nullable(UInt16)"
+  | "Nullable(UInt32)"
+  | "Nullable(UInt64)"
+  | "Nullable(Int8)"
+  | "Nullable(Int16)"
+  | "Nullable(Int32)"
+  | "Nullable(Int64)"
+  | "Nullable(Float32)"
+  | "Nullable(Float64)"
+  | "Nullable(Date)"
+  | "Nullable(Date32)"
+  | "Nullable(DateTime)"
+  | "Nullable(DateTime64)"
+  | "Nullable(UUID)"
+  | "Nullable(Bool)"
+  | "LowCardinality(String)"
+  | `Array(${string})`
+  | `Map(${string}, ${string})`;
+
+/**
+ * Schema definition for a single column
+ */
+export interface ColumnSchema {
+  /** The name of the column as exposed to TSQL queries */
+  name: string;
+  /** The actual ClickHouse column name (if different from `name`) */
+  clickhouseName?: string;
+  /** The ClickHouse data type */
+  type: ClickHouseType;
+  /** Whether this column can be selected */
+  selectable?: boolean;
+  /** Whether this column can be used in WHERE clauses */
+  filterable?: boolean;
+  /** Whether this column can be used in ORDER BY clauses */
+  sortable?: boolean;
+  /** Whether this column can be used in GROUP BY clauses */
+  groupable?: boolean;
+  /** Description of the column for documentation/autocomplete */
+  description?: string;
+  /** Allowed values for this column (for enum-like columns) */
+  allowedValues?: string[];
+  /**
+   * Map of internal values to user-friendly display names (for enum-like columns)
+   * Key: internal ClickHouse value (e.g., "COMPLETED_SUCCESSFULLY")
+   * Value: user-friendly display name (e.g., "Completed")
+   *
+   * When set, users can write queries using the user-friendly names,
+   * and results will display user-friendly names instead of internal values.
+   */
+  valueMap?: Record<string, string>;
+  /**
+   * For virtual (computed) columns: the raw ClickHouse SQL expression.
+   * Use actual ClickHouse column names in the expression.
+   *
+   * When set, this column becomes a virtual column that doesn't exist in the
+   * underlying table but is computed from the expression at query time.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "execution_duration",
+   *   type: "Nullable(Int64)",
+   *   expression: "dateDiff('millisecond', started_at, completed_at)",
+   *   description: "Time between started_at and completed_at in milliseconds"
+   * }
+   * ```
+   */
+  expression?: string;
+  /**
+   * Custom render type for UI display.
+   *
+   * When set, the UI can use this to render the column with a custom component
+   * instead of the default renderer based on ClickHouseType.
+   *
+   * Common custom render types:
+   * - "runStatus" - Task run status badges
+   * - "cost" - Cost formatting (cents to dollars)
+   * - "duration" - Duration formatting (ms to human-readable)
+   *
+   * Custom types can be defined by consumers without modifying this package.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "status",
+   *   type: "LowCardinality(String)",
+   *   customRenderType: "runStatus",
+   * }
+   * ```
+   */
+  customRenderType?: string;
+  /**
+   * Example value for documentation purposes.
+   *
+   * Used in help/documentation UI to show users what values look like.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "run_id",
+   *   type: "String",
+   *   example: "run_abc123",
+   * }
+   * ```
+   */
+  example?: string;
+  /**
+   * Whether this is a core column that should be included in default queries.
+   *
+   * Core columns represent the essential information for a table and are suggested
+   * as alternatives when users attempt to use SELECT * (which has poor performance
+   * in columnar databases like ClickHouse).
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "run_id",
+   *   type: "String",
+   *   coreColumn: true,
+   * }
+   * ```
+   */
+  coreColumn?: boolean;
+  /**
+   * Name of the runtime field mapping to use for value translation.
+   * When set, values are translated using the mapping provided at query time.
+   *
+   * Unlike `valueMap` which is static and defined in the schema, `fieldMapping`
+   * references a mapping that is provided at runtime via `FieldMappings`.
+   *
+   * - During query compilation: external values → internal values
+   * - During result transformation: internal values → external values (or null if unmapped)
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "project_ref",
+   *   clickhouseName: "project_id",  // Maps to actual CH column
+   *   type: "String",
+   *   fieldMapping: "project",  // Uses runtime "project" mapping
+   * }
+   * ```
+   */
+  fieldMapping?: string;
+  /**
+   * Transform function for user input values in WHERE clauses.
+   *
+   * When set, this function is called to transform user-provided values before
+   * they are used in comparisons. This is useful for columns where:
+   * - Users query with prefixed IDs (e.g., "batch_xyz") but the column stores raw values ("xyz")
+   * - Values need normalization before comparison
+   *
+   * The function receives the user's input string and returns the transformed value
+   * to use in the actual ClickHouse query.
+   *
+   * For output transformation (adding prefixes in SELECT), use `expression` instead.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "batch_id",
+   *   type: "String",
+   *   // Strip "batch_" prefix from user input in WHERE clauses
+   *   whereTransform: (value) => value.replace(/^batch_/, ""),
+   *   // Add prefix back in SELECT output
+   *   expression: "if(batch_id = '', NULL, concat('batch_', batch_id))",
+   * }
+   * ```
+   */
+  whereTransform?: (value: string) => string;
+  /**
+   * Value to use when comparing to NULL for this column.
+   *
+   * When set, NULL comparisons (IS NULL, IS NOT NULL, = NULL, != NULL) are
+   * transformed to compare against this value instead. This is useful for
+   * JSON/Object columns where "empty" is represented as '{}' rather than NULL.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "error",
+   *   type: "JSON",
+   *   nullValue: "'{}'",  // error IS NULL → error = '{}'
+   * }
+   * ```
+   */
+  nullValue?: string;
+  /**
+   * Alternative text column to use when selecting or comparing the full JSON value.
+   *
+   * For JSON columns, this allows using a pre-materialized string column
+   * which is more efficient than reading from the JSON column directly.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "output",
+   *   type: "JSON",
+   *   textColumn: "output_text",
+   * }
+   * ```
+   */
+  textColumn?: string;
+  /**
+   * Prefix path for JSON column data access.
+   *
+   * When set, user paths like `output.message` are automatically transformed
+   * to `output.data.message` in the actual query, and result aliases exclude
+   * the prefix (e.g., `output_message` instead of `output_data_message`).
+   *
+   * This is useful when JSON data is stored wrapped in a container object
+   * (e.g., `{"data": actualData}`) to handle arrays and primitives.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "output",
+   *   type: "JSON",
+   *   dataPrefix: "data",  // output.message → output.data.message
+   * }
+   * ```
+   */
+  dataPrefix?: string;
+}
+
+/**
+ * Runtime field mappings for dynamic value translation.
+ *
+ * Structure: mappingName → (internalValue → externalValue)
+ *
+ * @example
+ * ```typescript
+ * const fieldMappings: FieldMappings = {
+ *   project: {
+ *     "cm12345": "my-project-ref",
+ *     "cm67890": "other-project-ref",
+ *   },
+ * };
+ * ```
+ */
+export type FieldMappings = Record<string, Record<string, string>>;
+
+/**
+ * Display format types for column values.
+ *
+ * These tell the UI how to render values without changing the underlying data type.
+ * Includes both existing custom render types and new format hint types.
+ */
+export type ColumnFormatType =
+  // Existing custom render types
+  | "runId"
+  | "runStatus"
+  | "duration"
+  | "durationSeconds"
+  | "costInDollars"
+  | "cost"
+  | "machine"
+  | "environment"
+  | "environmentType"
+  | "project"
+  | "queue"
+  | "tags"
+  | "number"
+  // Format hint types (used by prettyFormat())
+  | "bytes"
+  | "decimalBytes"
+  | "quantity"
+  | "percent";
+
+/**
+ * Metadata for a column in query results.
+ *
+ * This is returned by the TSQL compiler to describe each column in the SELECT clause,
+ * allowing the UI to render columns appropriately without inspecting result values.
+ */
+export interface OutputColumnMetadata {
+  /** Column name in the result set (after AS aliasing) */
+  name: string;
+  /** ClickHouse data type (from schema or inferred for computed expressions) */
+  type: ClickHouseType;
+  /**
+   * Custom render type from schema, if specified.
+   * When set, the UI should use a custom renderer instead of the default for the ClickHouseType.
+   */
+  customRenderType?: string;
+  /**
+   * Description from the schema column definition, if available.
+   * Only present for columns or virtual columns defined in the table schema.
+   */
+  description?: string;
+  /**
+   * Display format hint — tells the UI how to render numeric values.
+   *
+   * Set by `prettyFormat(expr, 'formatType')` in TSQL queries.
+   * The underlying value remains numeric (for charts), but the UI uses this
+   * hint for axis labels, table cells, and tooltips.
+   *
+   * Also auto-populated from `customRenderType` when not explicitly set.
+   */
+  format?: ColumnFormatType;
+}
+
+/**
+ * Configuration for tenant isolation columns
+ * These columns are automatically added to WHERE clauses
+ */
+export interface TenantColumnConfig {
+  /** The column name for organization ID filtering */
+  organizationId: string;
+  /** The column name for project ID filtering */
+  projectId: string;
+  /** The column name for environment ID filtering */
+  environmentId: string;
+}
+
+/**
+ * Required filter that is always applied to queries on a table
+ */
+export interface RequiredFilter {
+  /** The ClickHouse column name to filter on */
+  column: string;
+  /** The value the column must equal */
+  value: string;
+}
+
+/**
+ * Schema definition for a table
+ */
+export interface TableSchema {
+  /** The name of the table as exposed to TSQL queries */
+  name: string;
+  /** The fully qualified ClickHouse table name (e.g., "trigger_dev.task_runs_v2") */
+  clickhouseName: string;
+  /** Column definitions for this table */
+  columns: Record<string, ColumnSchema>;
+  /** Tenant isolation column configuration */
+  tenantColumns: TenantColumnConfig;
+  /** Description of the table for documentation/autocomplete */
+  description?: string;
+  /** Whether this table can be joined to other tables */
+  joinable?: boolean;
+  /**
+   * Required filters that are always applied to queries on this table.
+   * These are injected into the WHERE clause automatically, similar to tenant isolation.
+   */
+  requiredFilters?: RequiredFilter[];
+  /**
+   * The TSQL column name used as the time constraint for `timeBucket()`.
+   *
+   * When set, `timeBucket()` resolves to `toStartOfInterval(clickhouse_column, INTERVAL ...)`,
+   * using the ClickHouse column name mapped from this TSQL column.
+   *
+   * @example
+   * ```typescript
+   * {
+   *   name: "runs",
+   *   timeConstraint: "triggered_at", // TSQL column name; maps to CH column "created_at"
+   *   columns: {
+   *     triggered_at: { name: "triggered_at", clickhouseName: "created_at", ...column("DateTime64") },
+   *   },
+   * }
+   * ```
+   */
+  timeConstraint?: string;
+  /**
+   * Custom time bucket thresholds for this table.
+   * When set, timeBucket() uses these instead of the global defaults.
+   * Useful when the table's time granularity differs from the standard (e.g., metrics
+   * pre-aggregated into 10-second buckets shouldn't go below 10-second intervals).
+   */
+  timeBucketThresholds?: BucketThreshold[];
+  /**
+   * Whether to add the FINAL keyword when querying this table.
+   * This should be set to `true` for ReplacingMergeTree tables where deduplication
+   * is needed to get correct results. Not needed for plain MergeTree tables.
+   */
+  useFinal?: boolean;
+}
+
+/**
+ * Schema registry containing all allowed tables
+ */
+export interface SchemaRegistry {
+  /** Map of table names to their schemas */
+  tables: Record<string, TableSchema>;
+  /** Default tenant column names (used when a table doesn't specify its own) */
+  defaultTenantColumns: TenantColumnConfig;
+}
+
+/**
+ * Create a basic column schema with common defaults
+ */
+export function column(
+  type: ClickHouseType,
+  options: Partial<Omit<ColumnSchema, "name" | "type">> = {}
+): Omit<ColumnSchema, "name"> {
+  return {
+    type,
+    selectable: true,
+    filterable: true,
+    sortable: true,
+    groupable: true,
+    ...options,
+  };
+}
+
+/**
+ * Create a schema registry from a list of table schemas
+ */
+export function createSchemaRegistry(
+  tables: TableSchema[],
+  defaultTenantColumns?: TenantColumnConfig
+): SchemaRegistry {
+  const tableMap: Record<string, TableSchema> = {};
+  for (const table of tables) {
+    tableMap[table.name] = table;
+  }
+  return {
+    tables: tableMap,
+    defaultTenantColumns: defaultTenantColumns ?? {
+      organizationId: "organization_id",
+      projectId: "project_id",
+      environmentId: "environment_id",
+    },
+  };
+}
+
+/**
+ * Look up a table schema by name
+ */
+export function findTable(schema: SchemaRegistry, tableName: string): TableSchema | undefined {
+  return schema.tables[tableName];
+}
+
+/**
+ * Look up a column schema by table and column name
+ */
+export function findColumn(
+  schema: SchemaRegistry,
+  tableName: string,
+  columnName: string
+): ColumnSchema | undefined {
+  const table = findTable(schema, tableName);
+  if (!table) return undefined;
+  return table.columns[columnName];
+}
+
+/**
+ * Validate that a table exists in the schema
+ * @throws QueryError if the table is not found
+ */
+export function validateTable(schema: SchemaRegistry, tableName: string): TableSchema {
+  const table = findTable(schema, tableName);
+  if (!table) {
+    const availableTables = Object.keys(schema.tables).join(", ");
+    throw new QueryError(
+      `Table "${tableName}" is not accessible. Available tables: ${availableTables || "(none)"}`
+    );
+  }
+  return table;
+}
+
+/**
+ * Validate that a column exists in a table and can be selected
+ * @throws QueryError if the column is not found or not selectable
+ */
+export function validateSelectColumn(
+  schema: SchemaRegistry,
+  tableName: string,
+  columnName: string
+): ColumnSchema {
+  const table = validateTable(schema, tableName);
+  const col = table.columns[columnName];
+  if (!col) {
+    const availableColumns = Object.keys(table.columns).join(", ");
+    throw new QueryError(
+      `Column "${columnName}" does not exist on table "${tableName}". Available columns: ${availableColumns}`
+    );
+  }
+  if (col.selectable === false) {
+    throw new QueryError(`Column "${columnName}" on table "${tableName}" is not selectable`);
+  }
+  return col;
+}
+
+/**
+ * Validate that a column can be used in a WHERE clause
+ * @throws QueryError if the column is not filterable
+ */
+export function validateFilterColumn(
+  schema: SchemaRegistry,
+  tableName: string,
+  columnName: string
+): ColumnSchema {
+  const table = validateTable(schema, tableName);
+  const col = table.columns[columnName];
+  if (!col) {
+    throw new QueryError(`Column "${columnName}" does not exist on table "${tableName}"`);
+  }
+  if (col.filterable === false) {
+    throw new QueryError(`Column "${columnName}" on table "${tableName}" cannot be used in WHERE`);
+  }
+  return col;
+}
+
+/**
+ * Validate that a column can be used in ORDER BY
+ * @throws QueryError if the column is not sortable
+ */
+export function validateSortColumn(
+  schema: SchemaRegistry,
+  tableName: string,
+  columnName: string
+): ColumnSchema {
+  const table = validateTable(schema, tableName);
+  const col = table.columns[columnName];
+  if (!col) {
+    throw new QueryError(`Column "${columnName}" does not exist on table "${tableName}"`);
+  }
+  if (col.sortable === false) {
+    throw new QueryError(
+      `Column "${columnName}" on table "${tableName}" cannot be used in ORDER BY`
+    );
+  }
+  return col;
+}
+
+/**
+ * Validate that a column can be used in GROUP BY
+ * @throws QueryError if the column is not groupable
+ */
+export function validateGroupColumn(
+  schema: SchemaRegistry,
+  tableName: string,
+  columnName: string
+): ColumnSchema {
+  const table = validateTable(schema, tableName);
+  const col = table.columns[columnName];
+  if (!col) {
+    throw new QueryError(`Column "${columnName}" does not exist on table "${tableName}"`);
+  }
+  if (col.groupable === false) {
+    throw new QueryError(
+      `Column "${columnName}" on table "${tableName}" cannot be used in GROUP BY`
+    );
+  }
+  return col;
+}
+
+/**
+ * Get the actual ClickHouse column name (handles aliasing)
+ */
+export function getClickHouseColumnName(col: ColumnSchema): string {
+  return col.clickhouseName ?? col.name;
+}
+
+/**
+ * Check if a column is a virtual (computed) column
+ *
+ * Virtual columns have an expression property that defines how they are computed
+ * from other columns. They don't exist in the underlying table.
+ *
+ * @param col - The column schema to check
+ * @returns true if the column is virtual, false otherwise
+ */
+export function isVirtualColumn(col: ColumnSchema): boolean {
+  return col.expression !== undefined && col.expression.length > 0;
+}
+
+/**
+ * Get the expression for a virtual column
+ *
+ * @param col - The column schema
+ * @returns The expression string, or undefined if not a virtual column
+ */
+export function getVirtualColumnExpression(col: ColumnSchema): string | undefined {
+  return isVirtualColumn(col) ? col.expression : undefined;
+}
+
+/**
+ * Get the user-friendly display value for an internal value (case-insensitive)
+ * Used for transforming query results back to user-friendly format
+ *
+ * @param col - The column schema
+ * @param internalValue - The internal ClickHouse value
+ * @returns The user-friendly display value, or the original value if no mapping exists
+ */
+export function getUserFriendlyValue(col: ColumnSchema, internalValue: string): string {
+  if (!col.valueMap) {
+    return internalValue;
+  }
+
+  // Direct lookup first (case-sensitive for exact match)
+  if (col.valueMap[internalValue] !== undefined) {
+    return col.valueMap[internalValue];
+  }
+
+  // Case-insensitive fallback
+  const lowerValue = internalValue.toLowerCase();
+  for (const [internal, friendly] of Object.entries(col.valueMap)) {
+    if (internal.toLowerCase() === lowerValue) {
+      return friendly;
+    }
+  }
+
+  return internalValue;
+}
+
+/**
+ * Get the internal ClickHouse value for a user-friendly value (case-insensitive)
+ * Used for transforming user queries to internal format
+ *
+ * @param col - The column schema
+ * @param userValue - The user-friendly display value
+ * @returns The internal ClickHouse value, or the original value if no mapping exists
+ */
+export function getInternalValue(col: ColumnSchema, userValue: string): string {
+  if (!col.valueMap) {
+    return userValue;
+  }
+
+  const lowerUserValue = userValue.toLowerCase();
+
+  // Search for matching user-friendly value (case-insensitive)
+  for (const [internal, friendly] of Object.entries(col.valueMap)) {
+    if (friendly.toLowerCase() === lowerUserValue) {
+      return internal;
+    }
+  }
+
+  return userValue;
+}
+
+/**
+ * Get all allowed user-friendly values for a column
+ * Used for validation and autocomplete
+ *
+ * @param col - The column schema
+ * @returns Array of allowed user-friendly values, or allowedValues if no valueMap exists
+ */
+export function getAllowedUserValues(col: ColumnSchema): string[] {
+  if (col.valueMap) {
+    return Object.values(col.valueMap);
+  }
+  return col.allowedValues ?? [];
+}
+
+/**
+ * Check if a user-provided value is valid for a column (case-insensitive)
+ *
+ * @param col - The column schema
+ * @param userValue - The user-provided value to validate
+ * @returns true if the value is valid, false otherwise
+ */
+export function isValidUserValue(col: ColumnSchema, userValue: string): boolean {
+  const allowedValues = getAllowedUserValues(col);
+  if (allowedValues.length === 0) {
+    return true; // No restrictions
+  }
+
+  const lowerUserValue = userValue.toLowerCase();
+  return allowedValues.some((v) => v.toLowerCase() === lowerUserValue);
+}
+
+// ============================================================
+// Field Mapping Utilities (Runtime Dynamic Mappings)
+// ============================================================
+
+/**
+ * Check if a column uses a runtime field mapping
+ *
+ * @param col - The column schema to check
+ * @returns true if the column has a fieldMapping defined
+ */
+export function hasFieldMapping(col: ColumnSchema): boolean {
+  return col.fieldMapping !== undefined && col.fieldMapping.length > 0;
+}
+
+/**
+ * Get the external (user-facing) value for an internal ClickHouse value
+ * using a runtime field mapping.
+ *
+ * @param mappings - The runtime field mappings
+ * @param mappingName - The name of the mapping to use (from column's fieldMapping)
+ * @param internalValue - The internal ClickHouse value
+ * @returns The external value, or null if not found in the mapping
+ */
+export function getExternalValue(
+  mappings: FieldMappings,
+  mappingName: string,
+  internalValue: string
+): string | null {
+  const mapping = mappings[mappingName];
+  if (!mapping) {
+    return null;
+  }
+
+  const externalValue = mapping[internalValue];
+  return externalValue !== undefined ? externalValue : null;
+}
+
+/**
+ * Get the internal ClickHouse value for an external (user-facing) value
+ * using a runtime field mapping. This performs a reverse lookup.
+ *
+ * @param mappings - The runtime field mappings
+ * @param mappingName - The name of the mapping to use (from column's fieldMapping)
+ * @param externalValue - The external (user-facing) value
+ * @returns The internal value, or null if not found in the mapping
+ */
+export function getInternalValueFromMapping(
+  mappings: FieldMappings,
+  mappingName: string,
+  externalValue: string
+): string | null {
+  const mapping = mappings[mappingName];
+  if (!mapping) {
+    return null;
+  }
+
+  // Reverse lookup: find internal value by external value
+  for (const [internal, external] of Object.entries(mapping)) {
+    if (external === externalValue) {
+      return internal;
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Get the internal ClickHouse value for an external value (case-insensitive)
+ * using a runtime field mapping.
+ *
+ * @param mappings - The runtime field mappings
+ * @param mappingName - The name of the mapping to use
+ * @param externalValue - The external (user-facing) value
+ * @returns The internal value, or null if not found
+ */
+export function getInternalValueFromMappingCaseInsensitive(
+  mappings: FieldMappings,
+  mappingName: string,
+  externalValue: string
+): string | null {
+  const mapping = mappings[mappingName];
+  if (!mapping) {
+    return null;
+  }
+
+  const lowerExternal = externalValue.toLowerCase();
+
+  // Case-insensitive reverse lookup
+  for (const [internal, external] of Object.entries(mapping)) {
+    if (external.toLowerCase() === lowerExternal) {
+      return internal;
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Get all column names available for autocomplete
+ */
+export function getTableColumnNames(schema: SchemaRegistry, tableName: string): string[] {
+  const table = findTable(schema, tableName);
+  if (!table) return [];
+  return Object.keys(table.columns);
+}
+
+/**
+ * Get all table names available for autocomplete
+ */
+export function getAllTableNames(schema: SchemaRegistry): string[] {
+  return Object.keys(schema.tables);
+}
+
+/**
+ * Get the names of core columns for a table.
+ *
+ * Core columns are the essential columns that should be used when users
+ * need a default set of columns (e.g., as an alternative to SELECT *).
+ *
+ * @param table - The table schema
+ * @returns Array of core column names, empty if none are marked as core
+ */
+export function getCoreColumns(table: TableSchema): string[] {
+  return Object.values(table.columns)
+    .filter((col) => col.coreColumn === true)
+    .map((col) => col.name);
+}
+
+// ============================================================
+// Error Message Sanitization
+// ============================================================
+
+/**
+ * Sanitize a ClickHouse error message by replacing internal ClickHouse names
+ * with their user-facing TSQL equivalents and removing internal implementation details.
+ *
+ * This function handles:
+ * - Fully qualified table names (e.g., `trigger_dev.task_runs_v2` → `runs`)
+ * - Column names with table prefix (e.g., `trigger_dev.task_runs_v2.friendly_id` → `runs.run_id`)
+ * - Standalone column names (e.g., `friendly_id` → `run_id`)
+ * - Removes tenant isolation filters (organization_id, project_id, environment_id)
+ * - Removes required filters (e.g., engine = 'V2')
+ * - Removes redundant aliases (e.g., `run_id AS run_id` → `run_id`)
+ *
+ * @param message - The error message from ClickHouse
+ * @param schemas - The table schemas defining name mappings
+ * @returns The sanitized error message with TSQL names
+ *
+ * @example
+ * ```typescript
+ * const sanitized = sanitizeErrorMessage(
+ *   "Missing column trigger_dev.task_runs_v2.friendly_id",
+ *   [runsSchema]
+ * );
+ * // Returns: "Missing column runs.run_id"
+ * ```
+ */
+export function sanitizeErrorMessage(message: string, schemas: TableSchema[]): string {
+  // Build reverse lookup maps
+  const tableNameMap = new Map<string, string>(); // clickhouseName -> tsqlName
+  const columnNameMap = new Map<string, { tsqlName: string; tableTsqlName: string }>(); // clickhouseName -> { tsqlName, tableTsqlName }
+
+  // Collect tenant column names and required filter columns to strip from errors
+  const columnsToStrip: string[] = [];
+  const tableAliasPatterns: RegExp[] = [];
+
+  for (const table of schemas) {
+    // Map table names
+    tableNameMap.set(table.clickhouseName, table.name);
+
+    // Collect tenant column names to strip
+    const tenantCols = table.tenantColumns;
+    columnsToStrip.push(tenantCols.organizationId, tenantCols.projectId, tenantCols.environmentId);
+
+    // Collect required filter columns to strip
+    if (table.requiredFilters) {
+      for (const filter of table.requiredFilters) {
+        columnsToStrip.push(filter.column);
+      }
+    }
+
+    // Build pattern to remove table aliases like "FROM runs AS runs"
+    tableAliasPatterns.push(
+      new RegExp(`\\b${escapeRegex(table.name)}\\s+AS\\s+${escapeRegex(table.name)}\\b`, "gi")
+    );
+
+    // Map column names
+    for (const col of Object.values(table.columns)) {
+      const clickhouseColName = col.clickhouseName ?? col.name;
+      if (clickhouseColName !== col.name) {
+        // Only add to map if there's actually a different ClickHouse name
+        columnNameMap.set(clickhouseColName, {
+          tsqlName: col.name,
+          tableTsqlName: table.name,
+        });
+      }
+    }
+  }
+
+  let result = message;
+
+  // Step 0: Remove internal prefixes that leak implementation details
+  result = result.replace(/^Unable to query clickhouse:\s*/i, "");
+
+  // Step 1: Remove tenant isolation and required filter conditions
+  // We need to handle multiple patterns:
+  // - (column = 'value') AND ...
+  // - ... AND (column = 'value')
+  // - (column = 'value') at end of expression
+  for (const colName of columnsToStrip) {
+    const escaped = escapeRegex(colName);
+    // Match: (column = 'value') AND  (with optional surrounding parens)
+    result = result.replace(new RegExp(`\\(${escaped}\\s*=\\s*'[^']*'\\)\\s*AND\\s*`, "gi"), "");
+    // Match: AND (column = 'value') (handles middle/end conditions)
+    result = result.replace(new RegExp(`\\s*AND\\s*\\(${escaped}\\s*=\\s*'[^']*'\\)`, "gi"), "");
+    // Match standalone: (column = 'value') with no AND (for when it's the only/last condition)
+    result = result.replace(new RegExp(`\\(${escaped}\\s*=\\s*'[^']*'\\)`, "gi"), "");
+  }
+
+  // Step 2: Clean up any leftover empty WHERE conditions or double parentheses
+  // Clean up empty nested parens: "(())" or "( () )" -> ""
+  result = result.replace(/\(\s*\(\s*\)\s*\)/g, "");
+  // Clean up empty parens: "()" -> ""
+  result = result.replace(/\(\s*\)/g, "");
+  // Clean up "WHERE  AND" -> "WHERE"
+  result = result.replace(/\bWHERE\s+AND\b/gi, "WHERE");
+  // Clean up double ANDs: "AND AND" -> "AND"
+  result = result.replace(/\bAND\s+AND\b/gi, "AND");
+  // Clean up "WHERE ((" with user condition "))" -> "WHERE (condition)"
+  // First normalize: "(( (condition) ))" patterns
+  result = result.replace(/\(\(\s*\(/g, "(");
+  result = result.replace(/\)\s*\)\)/g, ")");
+  // Clean double parens around single condition
+  result = result.replace(/\(\(([^()]+)\)\)/g, "($1)");
+  // Remove "WHERE ()" if the whole WHERE is now empty
+  result = result.replace(/\bWHERE\s*\(\s*\)\s*/gi, "");
+  // Clean up trailing " )" before ORDER/LIMIT/etc
+  result = result.replace(/\s+\)\s*(ORDER|LIMIT|GROUP|HAVING)/gi, " $1");
+  // Remove empty WHERE clause: "WHERE  ORDER" or "WHERE  LIMIT" -> just "ORDER" or "LIMIT"
+  result = result.replace(/\bWHERE\s+(ORDER|LIMIT|GROUP|HAVING)\b/gi, "$1");
+  // Remove empty WHERE at end of string: "WHERE " at end -> ""
+  result = result.replace(/\bWHERE\s*$/gi, "");
+  // Clean up multiple spaces
+  result = result.replace(/\s{2,}/g, " ");
+
+  // Step 3: Replace fully qualified column references first (table.column)
+  // This handles patterns like: trigger_dev.task_runs_v2.friendly_id
+  for (const table of schemas) {
+    for (const col of Object.values(table.columns)) {
+      const clickhouseColName = col.clickhouseName ?? col.name;
+      const fullyQualified = `${table.clickhouseName}.${clickhouseColName}`;
+      const tsqlQualified = `${table.name}.${col.name}`;
+
+      if (fullyQualified !== tsqlQualified) {
+        // Use word boundary-aware replacement
+        result = replaceAllOccurrences(result, fullyQualified, tsqlQualified);
+      }
+    }
+  }
+
+  // Step 4: Replace standalone table names (after column references to avoid partial matches)
+  // Sort by length descending to replace longer names first
+  const sortedTableNames = [...tableNameMap.entries()].sort((a, b) => b[0].length - a[0].length);
+  for (const [clickhouseName, tsqlName] of sortedTableNames) {
+    if (clickhouseName !== tsqlName) {
+      result = replaceAllOccurrences(result, clickhouseName, tsqlName);
+    }
+  }
+
+  // Step 5: Replace standalone column names (for unqualified references)
+  // Skip column replacement for "Did you mean" errors - these already have the correct names
+  // and replacing would turn "Unknown column 'created_at'. Did you mean 'triggered_at'?"
+  // into "Unknown column 'triggered_at'. Did you mean 'triggered_at'?" which is confusing
+  if (!result.includes('Did you mean "')) {
+    // Sort by length descending to replace longer names first
+    const sortedColumnNames = [...columnNameMap.entries()].sort(
+      (a, b) => b[0].length - a[0].length
+    );
+    for (const [clickhouseName, { tsqlName }] of sortedColumnNames) {
+      result = replaceAllOccurrences(result, clickhouseName, tsqlName);
+    }
+  }
+
+  // Step 6: Remove redundant column aliases like "run_id AS run_id"
+  result = result.replace(/\b(\w+)\s+AS\s+\1\b/gi, "$1");
+
+  // Step 7: Remove table aliases like "runs AS runs"
+  for (const pattern of tableAliasPatterns) {
+    result = result.replace(pattern, (match) => match.split(/\s+AS\s+/i)[0]);
+  }
+
+  return result;
+}
+
+/**
+ * Escape special regex characters in a string
+ */
+function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+/**
+ * Replace all occurrences of a string, respecting word boundaries where sensible.
+ * Uses word-boundary matching to avoid replacing substrings within larger identifiers.
+ */
+function replaceAllOccurrences(text: string, search: string, replacement: string): string {
+  // Use word boundary matching - identifiers are typically surrounded by
+  // non-identifier characters (spaces, quotes, parentheses, operators, etc.)
+  // We use a pattern that matches the identifier when it's not part of a larger identifier
+  const pattern = new RegExp(`(?<![a-zA-Z0-9_])${escapeRegex(search)}(?![a-zA-Z0-9_])`, "g");
+
+  return text.replace(pattern, replacement);
+}
diff --git a/internal-packages/tsql/src/query/security.test.ts b/internal-packages/tsql/src/query/security.test.ts
new file mode 100644
index 00000000000..2fcca477770
--- /dev/null
+++ b/internal-packages/tsql/src/query/security.test.ts
@@ -0,0 +1,710 @@
+/**
+ * Security Tests for TSQL
+ *
+ * These tests verify that the TSQL parser and printer correctly prevent:
+ * 1. Cross-tenant data access
+ * 2. SQL injection attacks
+ */
+import { describe, expect, it } from "vitest";
+import { compileTSQL, type CompileTSQLOptions } from "../index.js";
+import { column, type TableSchema } from "./schema.js";
+
+/**
+ * Test schemas
+ */
+const taskRunsSchema: TableSchema = {
+  name: "task_runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    status: { name: "status", ...column("String") },
+    task_identifier: { name: "task_identifier", ...column("String") },
+    created_at: { name: "created_at", ...column("DateTime64") },
+    duration_ms: { name: "duration_ms", ...column("Nullable(UInt64)") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+    payload: { name: "payload", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+const taskEventsSchema: TableSchema = {
+  name: "task_events",
+  clickhouseName: "trigger_dev.task_events_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    run_id: { name: "run_id", ...column("String") },
+    event_type: { name: "event_type", ...column("String") },
+    timestamp: { name: "timestamp", ...column("DateTime64") },
+    organization_id: { name: "organization_id", ...column("String") },
+    project_id: { name: "project_id", ...column("String") },
+    environment_id: { name: "environment_id", ...column("String") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+const defaultOptions: CompileTSQLOptions = {
+  tableSchema: [taskRunsSchema, taskEventsSchema],
+  enforcedWhereClause: {
+    organization_id: { op: "eq", value: "org_tenant1" },
+    project_id: { op: "eq", value: "proj_tenant1" },
+    environment_id: { op: "eq", value: "env_tenant1" },
+  },
+};
+
+function compile(query: string, options: Partial<CompileTSQLOptions> = {}) {
+  return compileTSQL(query, { ...defaultOptions, ...options });
+}
+
+describe("Cross-Tenant Security", () => {
+  describe("Tenant guards are always injected", () => {
+    it("should inject tenant guards on simple SELECT", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs");
+
+      // Must contain all three tenant columns
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("project_id");
+      expect(sql).toContain("environment_id");
+
+      // Tenant values must be parameterized
+      expect(Object.values(params)).toContain("org_tenant1");
+      expect(Object.values(params)).toContain("proj_tenant1");
+      expect(Object.values(params)).toContain("env_tenant1");
+    });
+
+    it("should inject tenant guards even with user WHERE clause", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'completed'");
+
+      // Must still have tenant guards
+      expect(sql).toContain("organization_id");
+      expect(sql).toContain("project_id");
+      expect(sql).toContain("environment_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+    });
+
+    it("should inject tenant guards on all tables in JOIN", () => {
+      const { sql } = compile(`
+        SELECT r.id, e.event_type 
+        FROM task_runs r 
+        JOIN task_events e ON r.id = e.run_id
+      `);
+
+      // Both tables should have tenant guards
+      // Count occurrences of organization_id - should appear twice (once per table)
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it("should inject tenant guards in subqueries", () => {
+      const { sql } = compile(`
+        SELECT * FROM task_runs 
+        WHERE id IN (SELECT run_id FROM task_events WHERE event_type = 'completed')
+      `);
+
+      // Should have tenant guards in both main query and subquery
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it("should inject tenant guards on UNION queries", () => {
+      const { sql } = compile(`
+        SELECT id, status FROM task_runs WHERE status = 'completed'
+        UNION ALL
+        SELECT id, status FROM task_runs WHERE status = 'failed'
+      `);
+
+      // Both sides of UNION should have tenant guards
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+  });
+
+  describe("Cannot bypass tenant guards", () => {
+    it("should not allow OR clause to bypass tenant guard", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'completed' OR 1=1");
+
+      // The tenant guards should be ANDed with the entire WHERE clause
+      // So even with OR 1=1, the tenant guard still applies
+      expect(sql).toContain("organization_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+
+      // The structure should be: and(tenant_guards, or(user_conditions))
+      // The user's OR should be nested inside the outer AND with tenant guards
+      // This ensures tenant_guard AND (status='completed' OR 1=1)
+      // NOT: tenant_guard AND status='completed' OR 1=1 (which would bypass)
+
+      // Verify the OR is contained within an outer AND structure
+      // The tenant guards use and() and the user's OR uses or()
+      expect(sql).toContain("or(");
+      expect(sql).toContain("and(");
+
+      // The and() should wrap everything - find where tenant columns appear
+      // They should be at the same level as the user's condition, both inside and()
+      const whereClause = sql.substring(sql.indexOf("WHERE"));
+      expect(whereClause).toMatch(/and\([^)]*organization_id/);
+    });
+
+    it("should not allow accessing other tenant's data via explicit condition", () => {
+      const { sql, params } = compile(
+        "SELECT * FROM task_runs WHERE organization_id = 'org_other_tenant'"
+      );
+
+      // Even if user specifies a different org_id, our tenant guard should override
+      // The compiled SQL should still use our tenant's ID
+      expect(Object.values(params)).toContain("org_tenant1");
+    });
+
+    it("should not allow UNION with unguarded query", () => {
+      // This should be rejected or the second part should still be guarded
+      const { sql } = compile(`
+        SELECT id FROM task_runs
+        UNION ALL
+        SELECT id FROM task_runs
+      `);
+
+      // Both parts must have tenant guards
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it("should not allow subquery to access other tenants", () => {
+      const { sql, params } = compile(`
+        SELECT * FROM task_runs 
+        WHERE id IN (
+          SELECT run_id FROM task_events
+        )
+      `);
+
+      // Subquery must also have tenant guards
+      expect(Object.values(params)).toContain("org_tenant1");
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+  });
+
+  describe("Table allowlisting", () => {
+    it("should reject queries to unknown tables", () => {
+      expect(() => {
+        compile("SELECT * FROM users");
+      }).toThrow();
+    });
+
+    it("should reject queries to system tables", () => {
+      expect(() => {
+        compile("SELECT * FROM system.tables");
+      }).toThrow();
+    });
+
+    it("should reject queries trying to use database prefix", () => {
+      expect(() => {
+        compile("SELECT * FROM other_database.task_runs");
+      }).toThrow();
+    });
+  });
+});
+
+describe("SQL Injection Prevention", () => {
+  describe("String value injection", () => {
+    it("should reject queries with stacked statements in strings", () => {
+      // The parser correctly rejects this at parse time
+      expect(() => {
+        compile("SELECT * FROM task_runs WHERE status = 'completed'; DROP TABLE task_runs; --'");
+      }).toThrow();
+    });
+
+    it("should parameterize malicious-looking string values", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'DROP TABLE users'");
+
+      // The malicious payload should be in params, not in SQL
+      expect(sql).not.toContain("DROP TABLE");
+      expect(Object.values(params)).toContain("DROP TABLE users");
+    });
+
+    it("should handle quote escape attempts", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'test''injection'");
+
+      // Should be safely parameterized
+      expect(Object.values(params).some((v) => typeof v === "string")).toBe(true);
+    });
+
+    it("should handle backslash escape attempts", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'test\\'injection'");
+
+      // Should be safely parameterized
+      expect(sql).not.toContain("injection'");
+    });
+
+    it("should handle unicode characters in strings", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'test™injection'");
+
+      // Should be safely parameterized
+      expect(Object.values(params).some((v) => typeof v === "string")).toBe(true);
+    });
+
+    it("should handle null byte injection", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'test\\0injection'");
+
+      expect(Object.values(params).some((v) => typeof v === "string")).toBe(true);
+    });
+  });
+
+  describe("Comment injection", () => {
+    it("should not allow -- comments to truncate query", () => {
+      // The parser should either reject this or handle it safely
+      const result = compile("SELECT * FROM task_runs WHERE status = 'completed'");
+
+      // Tenant guards must still be present
+      expect(result.sql).toContain("organization_id");
+    });
+
+    it("should not allow /* */ comments for injection", () => {
+      const result = compile("SELECT * FROM task_runs WHERE status = 'completed'");
+
+      // Tenant guards must still be present
+      expect(result.sql).toContain("organization_id");
+    });
+  });
+
+  describe("Identifier injection", () => {
+    it("should reject identifiers with backtick injection", () => {
+      expect(() => {
+        compile("SELECT * FROM task_runs WHERE `status`; DROP TABLE users; --` = 'test'");
+      }).toThrow();
+    });
+
+    it("should not expose column names that could be used for injection", () => {
+      // Column names in the output are validated identifiers from the schema
+      // Malicious column names would need to be in the schema first
+      const { sql } = compile("SELECT id, status FROM task_runs");
+
+      // Column names should be simple identifiers without injection
+      expect(sql).toContain("id");
+      expect(sql).toContain("status");
+      expect(sql).not.toContain(";");
+    });
+
+    it("should reject table names with special characters", () => {
+      expect(() => {
+        compile("SELECT * FROM `task_runs; DROP TABLE users`");
+      }).toThrow();
+    });
+  });
+
+  describe("Numeric injection", () => {
+    it("should handle numeric values safely", () => {
+      const { sql } = compile("SELECT * FROM task_runs WHERE duration_ms > 1000");
+
+      // Numbers should be safely inlined or parameterized
+      expect(sql).toContain("1000");
+      expect(sql).not.toContain(";");
+    });
+
+    it("should handle negative numbers safely", () => {
+      const { sql } = compile("SELECT * FROM task_runs WHERE duration_ms > -1");
+
+      expect(sql).not.toContain(";");
+    });
+
+    it("should handle floating point safely", () => {
+      const { sql } = compile("SELECT * FROM task_runs WHERE duration_ms > 1.5");
+
+      expect(sql).toContain("1.5");
+    });
+  });
+
+  describe("Function injection", () => {
+    it("should only allow known safe functions", () => {
+      // Unknown functions should be rejected
+      expect(() => {
+        compile("SELECT file('/etc/passwd') FROM task_runs");
+      }).toThrow();
+    });
+
+    it("should reject system functions", () => {
+      expect(() => {
+        compile("SELECT system.tables() FROM task_runs");
+      }).toThrow();
+    });
+
+    it("should allow known aggregate functions", () => {
+      const { sql } = compile("SELECT count(*), sum(duration_ms) FROM task_runs");
+
+      expect(sql).toContain("count(*)");
+      expect(sql).toContain("sum(duration_ms)");
+    });
+  });
+
+  describe("Stacked query prevention", () => {
+    it("should not allow semicolon to start new statement", () => {
+      expect(() => {
+        compile("SELECT * FROM task_runs; DELETE FROM task_runs");
+      }).toThrow();
+    });
+
+    it("should not allow multiple statements", () => {
+      expect(() => {
+        compile("SELECT * FROM task_runs; SELECT * FROM task_events");
+      }).toThrow();
+    });
+  });
+
+  describe("UNION-based injection", () => {
+    it("should apply tenant guards to all UNION parts", () => {
+      const { sql, params } = compile(`
+        SELECT id, status FROM task_runs WHERE status = 'a'
+        UNION ALL
+        SELECT id, status FROM task_runs WHERE status = 'b'
+      `);
+
+      // Both parts should have tenant guards
+      expect(Object.values(params)).toContain("org_tenant1");
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+  });
+});
+
+describe("Parameter Safety", () => {
+  it("should use typed parameters", () => {
+    const { sql } = compile("SELECT * FROM task_runs WHERE status = 'test'");
+
+    // Parameters should have type annotations like {param: String}
+    expect(sql).toMatch(/\{tsql_\w+: \w+\}/);
+  });
+
+  it("should generate unique parameter names", () => {
+    const { params } = compile(`
+      SELECT * FROM task_runs 
+      WHERE status = 'a' AND task_identifier = 'b' AND payload = 'c'
+    `);
+
+    // All parameter keys should be unique
+    const keys = Object.keys(params);
+    expect(new Set(keys).size).toBe(keys.length);
+  });
+
+  it("should not include raw values in SQL for strings", () => {
+    const { sql } = compile("SELECT * FROM task_runs WHERE status = 'user_provided_value'");
+
+    // The literal string should not appear in SQL
+    expect(sql).not.toContain("user_provided_value");
+  });
+});
+
+describe("Optional Tenant Filters", () => {
+  /**
+   * Helper to extract the WHERE clause from SQL for more precise testing.
+   * This is needed because SELECT * expansion includes all columns,
+   * but we only want to check what's in the WHERE clause for tenant filtering.
+   */
+  function getWhereClause(sql: string): string {
+    const whereMatch = sql.match(/WHERE\s+(.*?)(?:\s+(?:ORDER|GROUP|LIMIT|$))/is);
+    return whereMatch ? whereMatch[1] : "";
+  }
+
+  describe("Organization ID is always required", () => {
+    it("should always inject organization guard even with optional project/env", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs", {
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          // project_id and environment_id omitted
+        },
+      });
+
+      const whereClause = getWhereClause(sql);
+
+      // Must contain organization_id in WHERE clause
+      expect(whereClause).toContain("organization_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+
+      // Should NOT contain project_id or environment_id guards in WHERE clause
+      expect(whereClause).not.toContain("project_id");
+      expect(whereClause).not.toContain("environment_id");
+    });
+  });
+
+  describe("Project ID is optional", () => {
+    it("should inject org and project guards when project is provided", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs", {
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          // environment_id omitted
+        },
+      });
+
+      const whereClause = getWhereClause(sql);
+
+      // Must contain organization_id and project_id in WHERE clause
+      expect(whereClause).toContain("organization_id");
+      expect(whereClause).toContain("project_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+      expect(Object.values(params)).toContain("proj_tenant1");
+
+      // Should NOT contain environment_id guard in WHERE clause
+      expect(whereClause).not.toContain("environment_id");
+    });
+
+    it("should allow querying across all projects when projectId is omitted", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs", {
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          // project_id and environment_id omitted
+        },
+      });
+
+      const whereClause = getWhereClause(sql);
+
+      // Only org guard should be present in WHERE clause
+      expect(whereClause).toContain("organization_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+      expect(whereClause).not.toContain("project_id");
+    });
+  });
+
+  describe("Environment ID is optional", () => {
+    it("should inject org, project, and env guards when all provided", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs");
+
+      const whereClause = getWhereClause(sql);
+
+      // All three should be present in WHERE clause (default options include all)
+      expect(whereClause).toContain("organization_id");
+      expect(whereClause).toContain("project_id");
+      expect(whereClause).toContain("environment_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+      expect(Object.values(params)).toContain("proj_tenant1");
+      expect(Object.values(params)).toContain("env_tenant1");
+    });
+
+    it("should allow querying across all environments when environmentId is omitted", () => {
+      const { sql, params } = compile("SELECT * FROM task_runs", {
+        enforcedWhereClause: {
+          organization_id: { op: "eq", value: "org_tenant1" },
+          project_id: { op: "eq", value: "proj_tenant1" },
+          // environment_id omitted
+        },
+      });
+
+      const whereClause = getWhereClause(sql);
+
+      // Org and project guards should be present in WHERE clause
+      expect(whereClause).toContain("organization_id");
+      expect(whereClause).toContain("project_id");
+      expect(Object.values(params)).toContain("org_tenant1");
+      expect(Object.values(params)).toContain("proj_tenant1");
+
+      // Environment guard should NOT be present in WHERE clause
+      expect(whereClause).not.toContain("environment_id");
+    });
+  });
+
+  describe("Cross-tenant security with optional filters", () => {
+    it("should still prevent cross-org access with org-only filter", () => {
+      const { sql, params } = compile(
+        "SELECT * FROM task_runs WHERE organization_id = 'org_other'",
+        {
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_tenant1" },
+            // project_id and environment_id omitted
+          },
+        }
+      );
+
+      // Our org guard should still be enforced
+      expect(Object.values(params)).toContain("org_tenant1");
+    });
+
+    it("should apply org guard to all tables in JOIN when using org-only filter", () => {
+      const { sql } = compile(
+        `
+        SELECT r.id, e.event_type 
+        FROM task_runs r 
+        JOIN task_events e ON r.id = e.run_id
+      `,
+        {
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_tenant1" },
+            // project_id and environment_id omitted
+          },
+        }
+      );
+
+      // Both tables should have org guards
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+
+      // Project and environment should NOT appear
+      expect(sql).not.toContain("project_id");
+      expect(sql).not.toContain("environment_id");
+    });
+
+    it("should apply org guard to UNION queries when using org-only filter", () => {
+      const { sql } = compile(
+        `
+        SELECT id, status FROM task_runs WHERE status = 'completed'
+        UNION ALL
+        SELECT id, status FROM task_runs WHERE status = 'failed'
+      `,
+        {
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_tenant1" },
+            // project_id and environment_id omitted
+          },
+        }
+      );
+
+      // Both parts should have org guards
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+
+    it("should apply org guard to subqueries when using org-only filter", () => {
+      const { sql, params } = compile(
+        `
+        SELECT * FROM task_runs 
+        WHERE id IN (SELECT run_id FROM task_events)
+      `,
+        {
+          enforcedWhereClause: {
+            organization_id: { op: "eq", value: "org_tenant1" },
+            // project_id and environment_id omitted
+          },
+        }
+      );
+
+      // Both main query and subquery should have org guards
+      expect(Object.values(params)).toContain("org_tenant1");
+      const orgIdMatches = sql.match(/organization_id/g) || [];
+      expect(orgIdMatches.length).toBeGreaterThanOrEqual(2);
+    });
+  });
+});
+
+describe("Multi-join Tenant Guard Qualification", () => {
+  /**
+   * Security Test: Verifies that tenant guards are properly table-qualified in multi-join queries.
+   *
+   * The bug: createEnforcedGuard was building unqualified guard expressions like:
+   *   organization_id = 'org_tenant1'
+   *
+   * In a multi-table join where both tables have the same column (organization_id),
+   * an unqualified reference could potentially bind to the wrong table during resolution,
+   * or be ambiguous. The guards should be qualified like:
+   *   r.organization_id = 'org_tenant1' AND e.organization_id = 'org_tenant1'
+   *
+   * This ensures each table's guard binds to the correct table, not just any matching column.
+   */
+  it("should qualify tenant guards with table alias in JOIN queries", () => {
+    const { sql } = compile(`
+      SELECT r.id, e.event_type 
+      FROM task_runs r 
+      JOIN task_events e ON r.id = e.run_id
+    `);
+
+    // The guards should be table-qualified to prevent binding to the wrong table
+    // Look for pattern like: r.organization_id and e.organization_id (with table alias prefix)
+    // The exact format in ClickHouse SQL is just "alias.column" after resolution
+    
+    // Count qualified organization_id references (should have table prefixes)
+    // In the WHERE clause, we should see both r.organization_id and e.organization_id
+    const whereClause = sql.substring(sql.indexOf("WHERE"));
+    
+    // Both tables should have their own qualified tenant guards
+    // The pattern should be: table_alias.organization_id for each table
+    expect(whereClause).toMatch(/\br\b[^,]*organization_id/);
+    expect(whereClause).toMatch(/\be\b[^,]*organization_id/);
+  });
+
+  it("should qualify tenant guards with table alias in LEFT JOIN queries", () => {
+    const { sql } = compile(`
+      SELECT r.id, e.event_type 
+      FROM task_runs r 
+      LEFT JOIN task_events e ON r.id = e.run_id
+    `);
+
+    const whereClause = sql.substring(sql.indexOf("WHERE"));
+    
+    // Both tables should have qualified guards
+    expect(whereClause).toMatch(/\br\b[^,]*organization_id/);
+    expect(whereClause).toMatch(/\be\b[^,]*organization_id/);
+  });
+
+  it("should qualify tenant guards in multi-way JOIN queries", () => {
+    const { sql } = compile(`
+      SELECT r.id, e1.event_type, e2.event_type
+      FROM task_runs r 
+      JOIN task_events e1 ON r.id = e1.run_id
+      JOIN task_events e2 ON r.id = e2.run_id
+    `);
+
+    const whereClause = sql.substring(sql.indexOf("WHERE"));
+    
+    // All three table aliases should have qualified guards
+    expect(whereClause).toMatch(/\br\b[^,]*organization_id/);
+    expect(whereClause).toMatch(/\be1\b[^,]*organization_id/);
+    expect(whereClause).toMatch(/\be2\b[^,]*organization_id/);
+  });
+
+  it("should ensure guards cannot bind to wrong table by verifying separate qualifications", () => {
+    const { sql, params } = compile(`
+      SELECT r.id, e.event_type 
+      FROM task_runs r 
+      JOIN task_events e ON r.id = e.run_id
+      WHERE r.status = 'completed'
+    `);
+
+    // Count organization_id occurrences with different table prefixes
+    // This ensures each table gets its own guard, not shared/ambiguous references
+    const orgIdPattern = /(\w+)\.organization_id/g;
+    const matches = [...sql.matchAll(orgIdPattern)];
+    const tableAliases = matches.map(m => m[1]);
+    
+    // Should have at least 2 different table aliases for organization_id
+    // (one for task_runs alias 'r' and one for task_events alias 'e')
+    expect(tableAliases).toContain("r");
+    expect(tableAliases).toContain("e");
+    
+    // Both should use the same tenant value (parameterized)
+    expect(Object.values(params)).toContain("org_tenant1");
+  });
+});
+
+describe("Edge Cases", () => {
+  it("should handle empty string values", () => {
+    const { params } = compile("SELECT * FROM task_runs WHERE status = ''");
+
+    expect(Object.values(params)).toContain("");
+  });
+
+  it("should handle very long strings", () => {
+    const longString = "a".repeat(10000);
+    const { params } = compile(`SELECT * FROM task_runs WHERE status = '${longString}'`);
+
+    expect(Object.values(params)).toContain(longString);
+  });
+
+  it("should handle strings with newlines", () => {
+    const { params } = compile("SELECT * FROM task_runs WHERE status = 'line1\nline2'");
+
+    // Should handle newlines safely
+    expect(Object.values(params).some((v) => typeof v === "string" && v.includes("\n"))).toBe(true);
+  });
+
+  it("should handle special SQL keywords in strings", () => {
+    const { sql, params } = compile("SELECT * FROM task_runs WHERE status = 'SELECT * FROM users'");
+
+    // The SQL keywords should be in params, not interpreted
+    expect(sql).not.toMatch(/SELECT \* FROM users/);
+    expect(Object.values(params)).toContain("SELECT * FROM users");
+  });
+});
diff --git a/internal-packages/tsql/src/query/time_buckets.test.ts b/internal-packages/tsql/src/query/time_buckets.test.ts
new file mode 100644
index 00000000000..451e74bccc1
--- /dev/null
+++ b/internal-packages/tsql/src/query/time_buckets.test.ts
@@ -0,0 +1,181 @@
+import { describe, it, expect } from "vitest";
+import { calculateTimeBucketInterval, type TimeBucketInterval } from "./time_buckets.js";
+
+/**
+ * Helper to create a Date range from a start date and a duration
+ */
+function makeRange(from: Date, durationMs: number): { from: Date; to: Date } {
+  return { from, to: new Date(from.getTime() + durationMs) };
+}
+
+const SECOND = 1000;
+const MINUTE = 60 * SECOND;
+const HOUR = 60 * MINUTE;
+const DAY = 24 * HOUR;
+
+describe("calculateTimeBucketInterval", () => {
+  describe("small ranges (seconds-level buckets)", () => {
+    it("should return 5 SECOND for a 1-minute range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 1 * MINUTE);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 5,
+        unit: "SECOND",
+      });
+    });
+
+    it("should return 5 SECOND for a 4-minute range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 4 * MINUTE);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 5,
+        unit: "SECOND",
+      });
+    });
+
+    it("should return 30 SECOND for a 10-minute range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 10 * MINUTE);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 30,
+        unit: "SECOND",
+      });
+    });
+
+    it("should return 30 SECOND for a 29-minute range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 29 * MINUTE);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 30,
+        unit: "SECOND",
+      });
+    });
+  });
+
+  describe("medium ranges (minute-level buckets)", () => {
+    it("should return 1 MINUTE for a 45-minute range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 45 * MINUTE);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "MINUTE",
+      });
+    });
+
+    it("should return 1 MINUTE for a 1-hour range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 1 * HOUR);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "MINUTE",
+      });
+    });
+
+    it("should return 5 MINUTE for a 3-hour range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 3 * HOUR);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 5,
+        unit: "MINUTE",
+      });
+    });
+
+    it("should return 15 MINUTE for a 12-hour range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 12 * HOUR);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 15,
+        unit: "MINUTE",
+      });
+    });
+  });
+
+  describe("large ranges (hour/day-level buckets)", () => {
+    it("should return 1 HOUR for a 2-day range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 2 * DAY);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "HOUR",
+      });
+    });
+
+    it("should return 6 HOUR for a 7-day range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 7 * DAY);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 6,
+        unit: "HOUR",
+      });
+    });
+
+    it("should return 1 DAY for a 30-day range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 30 * DAY);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "DAY",
+      });
+    });
+
+    it("should return 1 WEEK for a 90-day range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 90 * DAY);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "WEEK",
+      });
+    });
+  });
+
+  describe("very large ranges (month-level buckets)", () => {
+    it("should return 1 MONTH for a 365-day range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 365 * DAY);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "MONTH",
+      });
+    });
+
+    it("should return 1 MONTH for a 2-year range", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 730 * DAY);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "MONTH",
+      });
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle zero-length range (from === to)", () => {
+      const date = new Date("2024-01-01T00:00:00Z");
+      const result = calculateTimeBucketInterval(date, date);
+      // Zero range is under 5 minutes, so 5 SECOND
+      expect(result).toEqual<TimeBucketInterval>({ value: 5, unit: "SECOND" });
+    });
+
+    it("should handle reversed dates (to < from) using absolute difference", () => {
+      const from = new Date("2024-01-08T00:00:00Z");
+      const to = new Date("2024-01-01T00:00:00Z");
+      // 7 days reversed → same as 7 days forward
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 6,
+        unit: "HOUR",
+      });
+    });
+
+    it("should handle boundary exactly at 5 minutes", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 5 * MINUTE);
+      // Exactly 5 minutes is NOT under 5 minutes, so should be 30 SECOND
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 30,
+        unit: "SECOND",
+      });
+    });
+
+    it("should handle boundary exactly at 24 hours", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 24 * HOUR);
+      // Exactly 24 hours is NOT under 24 hours, so should be 1 HOUR
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 1,
+        unit: "HOUR",
+      });
+    });
+
+    it("should handle very small range (1 second)", () => {
+      const { from, to } = makeRange(new Date("2024-01-01T00:00:00Z"), 1 * SECOND);
+      expect(calculateTimeBucketInterval(from, to)).toEqual<TimeBucketInterval>({
+        value: 5,
+        unit: "SECOND",
+      });
+    });
+  });
+});
diff --git a/internal-packages/tsql/src/query/time_buckets.ts b/internal-packages/tsql/src/query/time_buckets.ts
new file mode 100644
index 00000000000..04edde007d3
--- /dev/null
+++ b/internal-packages/tsql/src/query/time_buckets.ts
@@ -0,0 +1,100 @@
+/**
+ * Time bucket interval calculation for the `timeBucket()` TSQL function.
+ *
+ * Given a time range, determines the most appropriate bucket interval
+ * to produce a reasonable number of data points (~50-100 buckets).
+ */
+
+/**
+ * A time bucket interval with a numeric value and time unit.
+ * Used to generate ClickHouse `INTERVAL N UNIT` syntax.
+ */
+export interface TimeBucketInterval {
+  /** The numeric value of the interval (e.g., 5 for "5 MINUTE") */
+  value: number;
+  /** The time unit */
+  unit: "SECOND" | "MINUTE" | "HOUR" | "DAY" | "WEEK" | "MONTH";
+}
+
+/**
+ * A threshold mapping a maximum time range duration to a bucket interval.
+ */
+export interface BucketThreshold {
+  /** Maximum range duration in seconds for this threshold to apply */
+  maxRangeSeconds: number;
+  /** The bucket interval to use when the range is under maxRangeSeconds */
+  interval: TimeBucketInterval;
+}
+
+/**
+ * Default time bucket thresholds: each entry defines a maximum time range duration (in seconds)
+ * and the corresponding bucket interval to use.
+ *
+ * The intervals are chosen to produce roughly 50-100 data points for the given range.
+ * Entries are ordered from smallest to largest range.
+ */
+export const BUCKET_THRESHOLDS: BucketThreshold[] = [
+  // Under 5 minutes → 5 second buckets (max 60 buckets)
+  { maxRangeSeconds: 5 * 60, interval: { value: 5, unit: "SECOND" } },
+  // Under 30 minutes → 30 second buckets (max 60 buckets)
+  { maxRangeSeconds: 30 * 60, interval: { value: 30, unit: "SECOND" } },
+  // Under 2 hours → 1 minute buckets (max 120 buckets)
+  { maxRangeSeconds: 2 * 60 * 60, interval: { value: 1, unit: "MINUTE" } },
+  // Under 6 hours → 5 minute buckets (max 72 buckets)
+  { maxRangeSeconds: 6 * 60 * 60, interval: { value: 5, unit: "MINUTE" } },
+  // Under 24 hours → 15 minute buckets (max 96 buckets)
+  { maxRangeSeconds: 24 * 60 * 60, interval: { value: 15, unit: "MINUTE" } },
+  // Under 3 days → 1 hour buckets (max 72 buckets)
+  { maxRangeSeconds: 3 * 24 * 60 * 60, interval: { value: 1, unit: "HOUR" } },
+  // Under 14 days → 6 hour buckets (max 56 buckets)
+  { maxRangeSeconds: 14 * 24 * 60 * 60, interval: { value: 6, unit: "HOUR" } },
+  // Under 60 days → 1 day buckets (max 60 buckets)
+  { maxRangeSeconds: 60 * 24 * 60 * 60, interval: { value: 1, unit: "DAY" } },
+  // Under 365 days → 1 week buckets (max ~52 buckets)
+  { maxRangeSeconds: 365 * 24 * 60 * 60, interval: { value: 1, unit: "WEEK" } },
+];
+
+/** Default interval for very large ranges (365+ days) */
+const DEFAULT_LARGE_INTERVAL: TimeBucketInterval = { value: 1, unit: "MONTH" };
+
+/**
+ * Calculate the most appropriate time bucket interval for a given time range.
+ *
+ * The interval is chosen to produce a reasonable number of data points (~50-100 buckets).
+ * For very small ranges (< 5 minutes), uses 5-second buckets.
+ * For very large ranges (> 365 days), uses 1-month buckets.
+ *
+ * @param from - Start of the time range
+ * @param to - End of the time range
+ * @returns The recommended bucket interval
+ *
+ * @example
+ * ```typescript
+ * // 1 hour range → 1 minute buckets
+ * calculateTimeBucketInterval(
+ *   new Date("2024-01-01T00:00:00Z"),
+ *   new Date("2024-01-01T01:00:00Z"),
+ * ); // { value: 1, unit: "MINUTE" }
+ *
+ * // 7 day range → 6 hour buckets
+ * calculateTimeBucketInterval(
+ *   new Date("2024-01-01"),
+ *   new Date("2024-01-08"),
+ * ); // { value: 6, unit: "HOUR" }
+ * ```
+ */
+export function calculateTimeBucketInterval(
+  from: Date,
+  to: Date,
+  thresholds?: BucketThreshold[]
+): TimeBucketInterval {
+  const rangeSeconds = Math.abs(to.getTime() - from.getTime()) / 1000;
+
+  for (const threshold of thresholds ?? BUCKET_THRESHOLDS) {
+    if (rangeSeconds < threshold.maxRangeSeconds) {
+      return threshold.interval;
+    }
+  }
+
+  return DEFAULT_LARGE_INTERVAL;
+}
diff --git a/internal-packages/tsql/src/query/timings.ts b/internal-packages/tsql/src/query/timings.ts
new file mode 100644
index 00000000000..d868fe06671
--- /dev/null
+++ b/internal-packages/tsql/src/query/timings.ts
@@ -0,0 +1,107 @@
+// TypeScript translation of posthog/hogql/timings.py
+
+/**
+ * Get performance counter in milliseconds (Node.js equivalent of perf_counter)
+ * Uses performance.now() which is available in:
+ * - Node.js 18+ (global)
+ * - Browser (global)
+ * - Node.js <18 via perf_hooks module
+ */
+function getPerformanceNow(): number {
+    // Check for global performance (Node.js 18+ or browser)
+    if (typeof globalThis !== 'undefined' && 'performance' in globalThis) {
+        const perf = (globalThis as any).performance;
+        if (perf && typeof perf.now === 'function') {
+            return perf.now();
+        }
+    }
+    
+    // Fallback to Date.now() if performance API is not available
+    // Note: This is less precise but works everywhere
+    return Date.now();
+}
+
+export interface QueryTiming {
+    key: string; // Key identifying the timing measurement
+    time: number; // Time in seconds
+}
+
+const TIMING_DECIMAL_PLACES = 3; // round to milliseconds
+
+// Not thread safe.
+// See trends_query_runner for an example of how to use for multithreaded queries
+export class TSQLTimings {
+    // Completed time in seconds for different parts of the TSQL query
+    timings: Record<string, number> = {};
+
+    // Used for housekeeping
+    private _timingPointer: string;
+    private _timingStarts: Record<string, number> = {};
+
+    constructor(_timingPointer: string = '.') {
+        this._timingPointer = _timingPointer;
+        this._timingStarts[this._timingPointer] = this.perfCounter();
+    }
+
+    cloneForSubquery(seriesIndex: number): TSQLTimings {
+        return new TSQLTimings(`${this._timingPointer}/series_${seriesIndex}`);
+    }
+
+    clearTimings(): void {
+        this.timings = {};
+    }
+
+    /**
+     * Measure execution time of a function.
+     * Usage: timings.measure('operation', () => { ... });
+     */
+    measure<T>(key: string, fn: () => T): T {
+        const lastKey = this._timingPointer;
+        const fullKey = `${this._timingPointer}/${key}`;
+        this._timingPointer = fullKey;
+        this._timingStarts[fullKey] = this.perfCounter();
+
+        try {
+            return fn();
+        } finally {
+            const duration = (this.perfCounter() - this._timingStarts[fullKey]) / 1000; // Convert to seconds
+            this.timings[fullKey] = (this.timings[fullKey] || 0.0) + duration;
+            delete this._timingStarts[fullKey];
+            this._timingPointer = lastKey;
+        }
+    }
+
+    /**
+     * Get performance counter in milliseconds (Node.js equivalent of perf_counter)
+     */
+    private perfCounter(): number {
+        return getPerformanceNow();
+    }
+
+    toDict(): Record<string, number> {
+        const timings = { ...this.timings };
+        // Process in reverse order to handle nested timings correctly
+        const keys = Object.keys(this._timingStarts).reverse();
+        for (const key of keys) {
+            const start = this._timingStarts[key];
+            const elapsed = (this.perfCounter() - start) / 1000; // Convert to seconds
+            timings[key] = this.round((timings[key] || 0.0) + elapsed);
+        }
+        return timings;
+    }
+
+    toList(backOutStack: boolean = true): QueryTiming[] {
+        const timingDict = backOutStack ? this.toDict() : this.timings;
+        return Object.entries(timingDict).map(([key, time]) => ({
+            key: key,
+            time: this.round(time),
+        }));
+    }
+
+    /**
+     * Round to specified decimal places (milliseconds precision)
+     */
+    private round(value: number): number {
+        return Math.round(value * Math.pow(10, TIMING_DECIMAL_PLACES)) / Math.pow(10, TIMING_DECIMAL_PLACES);
+    }
+}
diff --git a/internal-packages/tsql/src/query/validator.test.ts b/internal-packages/tsql/src/query/validator.test.ts
new file mode 100644
index 00000000000..11e90c70ad1
--- /dev/null
+++ b/internal-packages/tsql/src/query/validator.test.ts
@@ -0,0 +1,128 @@
+import { describe, it, expect } from "vitest";
+import { validateQuery } from "./validator.js";
+import { parseTSQLSelect } from "../index.js";
+import { column, type TableSchema } from "./schema.js";
+
+const runsSchema: TableSchema = {
+  name: "runs",
+  clickhouseName: "trigger_dev.task_runs_v2",
+  columns: {
+    id: { name: "id", ...column("String") },
+    status: {
+      name: "status",
+      ...column("String", {
+        allowedValues: ["PENDING", "COMPLETED", "FAILED"],
+      }),
+    },
+    task_id: { name: "task_id", ...column("String") },
+    created_at: { name: "created_at", ...column("DateTime64") },
+  },
+  tenantColumns: {
+    organizationId: "organization_id",
+    projectId: "project_id",
+    environmentId: "environment_id",
+  },
+};
+
+function validateSQL(query: string, schema: TableSchema[] = [runsSchema]) {
+  const ast = parseTSQLSelect(query);
+  return validateQuery(ast, schema);
+}
+
+describe("validateQuery", () => {
+  describe("SELECT aliases", () => {
+    it("should allow ORDER BY to reference aliased columns", () => {
+      const result = validateSQL(
+        "SELECT status, count(*) as count FROM runs GROUP BY status ORDER BY count DESC"
+      );
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should allow ORDER BY to reference multiple aliased columns", () => {
+      const result = validateSQL(
+        "SELECT status, count(*) as total, avg(created_at) as avg_time FROM runs GROUP BY status ORDER BY total DESC, avg_time ASC"
+      );
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should report unknown columns that are not aliases as errors", () => {
+      const result = validateSQL(
+        "SELECT status, count(*) as count FROM runs GROUP BY status ORDER BY unknown_col DESC"
+      );
+      expect(result.valid).toBe(false); // unknown column is now an error
+      expect(result.issues).toHaveLength(1);
+      expect(result.issues[0].type).toBe("unknown_column");
+      expect(result.issues[0].severity).toBe("error");
+      expect(result.issues[0].columnName).toBe("unknown_col");
+    });
+
+    it("should allow ORDER BY to reference both aliases and real columns", () => {
+      const result = validateSQL(
+        "SELECT status, count(*) as count FROM runs GROUP BY status ORDER BY status ASC, count DESC"
+      );
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should allow HAVING to reference implicit column names from aggregations", () => {
+      const result = validateSQL(
+        "SELECT COUNT(), status FROM runs GROUP BY status HAVING count > 20"
+      );
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should allow HAVING to reference implicit names from multiple aggregations", () => {
+      const result = validateSQL(
+        "SELECT COUNT(), SUM(created_at), status FROM runs GROUP BY status HAVING count > 10 AND sum > 100"
+      );
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should allow ORDER BY to reference implicit column names", () => {
+      const result = validateSQL(
+        "SELECT COUNT(), status FROM runs GROUP BY status ORDER BY count DESC"
+      );
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+  });
+
+  describe("column validation", () => {
+    it("should validate known columns", () => {
+      const result = validateSQL("SELECT id, status FROM runs LIMIT 10");
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should error on unknown columns", () => {
+      const result = validateSQL("SELECT id, unknown_column FROM runs LIMIT 10");
+      expect(result.valid).toBe(false); // unknown columns are now errors
+      expect(result.issues).toHaveLength(1);
+      expect(result.issues[0].type).toBe("unknown_column");
+      expect(result.issues[0].severity).toBe("error");
+      expect(result.issues[0].columnName).toBe("unknown_column");
+    });
+  });
+
+  describe("enum validation", () => {
+    it("should validate enum values", () => {
+      const result = validateSQL("SELECT id, status FROM runs WHERE status = 'COMPLETED' LIMIT 10");
+      expect(result.valid).toBe(true);
+      expect(result.issues).toHaveLength(0);
+    });
+
+    it("should error on invalid enum values", () => {
+      const result = validateSQL(
+        "SELECT id, status FROM runs WHERE status = 'INVALID_STATUS' LIMIT 10"
+      );
+      expect(result.valid).toBe(false);
+      expect(result.issues).toHaveLength(1);
+      expect(result.issues[0].type).toBe("invalid_enum_value");
+      expect(result.issues[0].invalidValue).toBe("INVALID_STATUS");
+    });
+  });
+});
diff --git a/internal-packages/tsql/src/query/validator.ts b/internal-packages/tsql/src/query/validator.ts
new file mode 100644
index 00000000000..eb8591c8546
--- /dev/null
+++ b/internal-packages/tsql/src/query/validator.ts
@@ -0,0 +1,596 @@
+// Schema validation for TSQL queries
+// Validates column names and enum values against the schema
+
+import type {
+  SelectQuery,
+  SelectSetQuery,
+  Expression,
+  Field,
+  CompareOperation,
+  Constant,
+  And,
+  Or,
+  Not,
+  Alias,
+  OrderExpr,
+  Call,
+  JoinExpr,
+  BetweenExpr,
+  Array as ASTArray,
+  ArithmeticOperation,
+} from "./ast.js";
+import type { TableSchema, ColumnSchema } from "./schema.js";
+import { getAllowedUserValues, getCoreColumns, isValidUserValue } from "./schema.js";
+import { CompareOperationOp, ArithmeticOperationOp } from "./ast.js";
+
+/**
+ * Severity of a validation issue
+ */
+export type ValidationSeverity = "error" | "warning" | "info";
+
+/**
+ * A validation issue found in the query
+ */
+export interface ValidationIssue {
+  /** The error/warning message */
+  message: string;
+  /** Severity of the issue */
+  severity: ValidationSeverity;
+  /** The type of issue */
+  type: "unknown_column" | "unknown_table" | "invalid_enum_value" | "select_star";
+  /** Optional: the column name that caused the issue */
+  columnName?: string;
+  /** Optional: the table name that caused the issue */
+  tableName?: string;
+  /** Optional: the invalid value */
+  invalidValue?: string;
+  /** Optional: list of allowed values */
+  allowedValues?: string[];
+  /** Optional: suggested columns to use instead (for select_star) */
+  suggestedColumns?: string[];
+}
+
+/**
+ * Result of validating a query
+ */
+export interface ValidationResult {
+  /** Whether the query is valid */
+  valid: boolean;
+  /** List of issues found */
+  issues: ValidationIssue[];
+}
+
+/**
+ * Context for tracking tables and columns during validation
+ */
+interface ValidationContext {
+  /** Map of table aliases/names to their schemas */
+  tables: Map<string, TableSchema>;
+  /** The schema array for lookups */
+  schema: TableSchema[];
+  /** Accumulated issues */
+  issues: ValidationIssue[];
+  /** Set of column aliases defined in the SELECT clause */
+  selectAliases: Set<string>;
+}
+
+/**
+ * Validate a parsed TSQL query against a schema
+ *
+ * @param ast - The parsed query AST
+ * @param schema - Array of table schemas to validate against
+ * @returns Validation result with any issues found
+ */
+export function validateQuery(
+  ast: SelectQuery | SelectSetQuery,
+  schema: TableSchema[]
+): ValidationResult {
+  const context: ValidationContext = {
+    tables: new Map(),
+    schema,
+    issues: [],
+    selectAliases: new Set(),
+  };
+
+  if (ast.expression_type === "select_set_query") {
+    validateSelectSetQuery(ast, context);
+  } else {
+    validateSelectQuery(ast, context);
+  }
+
+  return {
+    valid: context.issues.filter((i) => i.severity === "error").length === 0,
+    issues: context.issues,
+  };
+}
+
+/**
+ * Get the implicit column name for an expression without an explicit alias.
+ * This matches the naming used in the printer for result columns.
+ *
+ * @param expr - The SELECT expression
+ * @returns The implicit name, or null if no implicit name applies
+ */
+function getImplicitName(expr: Expression): string | null {
+  // Handle Call (function/aggregation) - use lowercase function name
+  if ((expr as Call).expression_type === "call") {
+    const call = expr as Call;
+    return call.name.toLowerCase();
+  }
+
+  // Handle ArithmeticOperation - use operator function name
+  if ((expr as ArithmeticOperation).expression_type === "arithmetic_operation") {
+    const arith = expr as ArithmeticOperation;
+    switch (arith.op) {
+      case ArithmeticOperationOp.Add:
+        return "plus";
+      case ArithmeticOperationOp.Sub:
+        return "minus";
+      case ArithmeticOperationOp.Mult:
+        return "multiply";
+      case ArithmeticOperationOp.Div:
+        return "divide";
+      case ArithmeticOperationOp.Mod:
+        return "modulo";
+      default:
+        return "expression";
+    }
+  }
+
+  // Handle Constant - use string representation
+  if ((expr as Constant).expression_type === "constant") {
+    const constant = expr as Constant;
+    if (constant.value === null) {
+      return "NULL";
+    }
+    if (typeof constant.value === "string") {
+      return `'${constant.value}'`;
+    }
+    return String(constant.value);
+  }
+
+  // Field expressions don't get implicit names (they use the column name directly)
+  return null;
+}
+
+/**
+ * Validate a SELECT SET query (UNION, INTERSECT, etc.)
+ */
+function validateSelectSetQuery(node: SelectSetQuery, context: ValidationContext): void {
+  if (node.initial_select_query.expression_type === "select_set_query") {
+    validateSelectSetQuery(node.initial_select_query, context);
+  } else {
+    validateSelectQuery(node.initial_select_query, context);
+  }
+
+  for (const subsequent of node.subsequent_select_queries) {
+    if (subsequent.select_query.expression_type === "select_set_query") {
+      validateSelectSetQuery(subsequent.select_query as SelectSetQuery, context);
+    } else {
+      validateSelectQuery(subsequent.select_query as SelectQuery, context);
+    }
+  }
+}
+
+/**
+ * Check if an expression is a SELECT * (asterisk)
+ */
+function isSelectStar(expr: Expression): boolean {
+  if ((expr as Field).expression_type !== "field") return false;
+  const field = expr as Field;
+  // SELECT * or SELECT table.*
+  return (
+    (field.chain.length === 1 && field.chain[0] === "*") ||
+    (field.chain.length === 2 && field.chain[1] === "*")
+  );
+}
+
+/**
+ * Validate a SELECT query
+ */
+function validateSelectQuery(node: SelectQuery, context: ValidationContext): void {
+  // Save parent aliases and create fresh set for this query
+  const parentAliases = context.selectAliases;
+  context.selectAliases = new Set();
+
+  // First, extract tables from FROM clause to build context
+  if (node.select_from) {
+    extractTablesFromJoin(node.select_from, context);
+  }
+
+  // Check for SELECT * and emit warning
+  if (node.select) {
+    const hasSelectStar = node.select.some(isSelectStar);
+    if (hasSelectStar) {
+      // Collect core columns from all tables in context
+      const coreColumns: string[] = [];
+      for (const tableSchema of context.tables.values()) {
+        const tableCoreColumns = getCoreColumns(tableSchema);
+        coreColumns.push(...tableCoreColumns);
+      }
+
+      // Build info message about SELECT * behavior
+      let suggestionMsg = "SELECT * doesn't return all columns.";
+      if (coreColumns.length > 0) {
+        suggestionMsg += `It will return: ${coreColumns.join(", ")}. `;
+      }
+      suggestionMsg += "Specify columns explicitly to include other columns.";
+
+      context.issues.push({
+        message: suggestionMsg,
+        severity: "info",
+        type: "select_star",
+        suggestedColumns: coreColumns.length > 0 ? coreColumns : undefined,
+      });
+    }
+  }
+
+  // Extract column aliases from SELECT clause before validation
+  // This allows ORDER BY and HAVING to reference aliased columns
+  if (node.select) {
+    for (const expr of node.select) {
+      if ((expr as Alias).expression_type === "alias") {
+        // Explicit alias: SELECT ... AS name (stored lowercase for case-insensitive lookup)
+        context.selectAliases.add((expr as Alias).alias.toLowerCase());
+      } else {
+        // Check for implicit aliases from expressions without AS
+        const implicitName = getImplicitName(expr);
+        if (implicitName) {
+          context.selectAliases.add(implicitName);
+        }
+      }
+    }
+  }
+
+  // Validate SELECT columns
+  if (node.select) {
+    for (const expr of node.select) {
+      validateExpression(expr, context);
+    }
+  }
+
+  // Validate WHERE clause
+  if (node.where) {
+    validateExpression(node.where, context);
+  }
+
+  // Validate GROUP BY
+  if (node.group_by) {
+    for (const expr of node.group_by) {
+      validateExpression(expr, context);
+    }
+  }
+
+  // Validate HAVING
+  if (node.having) {
+    validateExpression(node.having, context);
+  }
+
+  // Validate ORDER BY
+  if (node.order_by) {
+    for (const expr of node.order_by) {
+      validateExpression(expr, context);
+    }
+  }
+
+  // Restore parent aliases
+  context.selectAliases = parentAliases;
+}
+
+/**
+ * Extract table schemas from JOIN expressions
+ */
+function extractTablesFromJoin(node: JoinExpr, context: ValidationContext): void {
+  if (node.table) {
+    const tableExpr = node.table;
+
+    if ((tableExpr as Field).expression_type === "field") {
+      const field = tableExpr as Field;
+      const tableName = field.chain[0];
+
+      if (typeof tableName === "string") {
+        // Find the table schema
+        const tableSchema = context.schema.find(
+          (t) => t.name.toLowerCase() === tableName.toLowerCase()
+        );
+
+        if (tableSchema) {
+          // Register with alias if provided, otherwise use table name
+          const key = node.alias || tableName;
+          context.tables.set(key.toLowerCase(), tableSchema);
+        } else {
+          // Unknown table
+          context.issues.push({
+            message: `Unknown table "${tableName}". Available tables: ${
+              context.schema.map((t) => t.name).join(", ") || "(none)"
+            }`,
+            severity: "warning",
+            type: "unknown_table",
+            tableName,
+          });
+        }
+      }
+    } else if (
+      (tableExpr as SelectQuery).expression_type === "select_query" ||
+      (tableExpr as SelectSetQuery).expression_type === "select_set_query"
+    ) {
+      // Subquery - validate it recursively
+      if ((tableExpr as SelectSetQuery).expression_type === "select_set_query") {
+        validateSelectSetQuery(tableExpr as SelectSetQuery, context);
+      } else {
+        validateSelectQuery(tableExpr as SelectQuery, context);
+      }
+    }
+  }
+
+  // Process next join in chain
+  if (node.next_join) {
+    extractTablesFromJoin(node.next_join, context);
+  }
+}
+
+/**
+ * Validate an expression and its children
+ */
+function validateExpression(expr: Expression, context: ValidationContext): void {
+  if (!expr || typeof expr !== "object") return;
+
+  const exprType = expr.expression_type;
+
+  switch (exprType) {
+    case "field":
+      validateField(expr as Field, context);
+      break;
+
+    case "compare_operation":
+      validateCompareOperation(expr as CompareOperation, context);
+      break;
+
+    case "and":
+      for (const e of (expr as And).exprs) {
+        validateExpression(e, context);
+      }
+      break;
+
+    case "or":
+      for (const e of (expr as Or).exprs) {
+        validateExpression(e, context);
+      }
+      break;
+
+    case "not":
+      validateExpression((expr as Not).expr, context);
+      break;
+
+    case "alias":
+      validateExpression((expr as Alias).expr, context);
+      break;
+
+    case "order_expr":
+      validateExpression((expr as OrderExpr).expr, context);
+      break;
+
+    case "call":
+      for (const arg of (expr as Call).args) {
+        validateExpression(arg, context);
+      }
+      break;
+
+    case "between_expr":
+      validateExpression((expr as BetweenExpr).expr, context);
+      validateExpression((expr as BetweenExpr).low, context);
+      validateExpression((expr as BetweenExpr).high, context);
+      break;
+
+    case "array":
+      for (const e of (expr as ASTArray).exprs) {
+        validateExpression(e, context);
+      }
+      break;
+
+    // Other expression types that we don't need to deeply validate
+    case "constant":
+    case "select_query":
+    case "select_set_query":
+      // Skip - constants don't need validation, subqueries are handled separately
+      break;
+  }
+}
+
+/**
+ * Validate a field reference
+ */
+function validateField(field: Field, context: ValidationContext): void {
+  const chain = field.chain;
+  if (chain.length === 0) return;
+
+  // Handle asterisk
+  if (chain[0] === "*") return;
+  if (chain.length === 2 && chain[1] === "*") return;
+
+  const firstPart = chain[0];
+  if (typeof firstPart !== "string") return;
+
+  // Case 1: Qualified reference like table.column
+  if (chain.length >= 2) {
+    const tableAlias = firstPart.toLowerCase();
+    const columnName = chain[1];
+
+    if (typeof columnName !== "string") return;
+
+    const tableSchema = context.tables.get(tableAlias);
+    if (tableSchema) {
+      // Check if column exists
+      if (!tableSchema.columns[columnName]) {
+        const availableColumns = Object.keys(tableSchema.columns).join(", ");
+        context.issues.push({
+          message: `Unknown column "${columnName}" on table "${tableAlias}". Available columns: ${availableColumns}`,
+          severity: "error",
+          type: "unknown_column",
+          columnName,
+          tableName: tableAlias,
+        });
+      }
+    }
+    return;
+  }
+
+  // Case 2: Unqualified reference - try to find in any table or SELECT alias
+  const columnName = firstPart;
+
+  // Check if it's a SELECT alias (e.g., from "count(*) as count")
+  // Case-insensitive: aliases are stored lowercase
+  if (context.selectAliases.has(columnName.toLowerCase())) {
+    return;
+  }
+
+  let found = false;
+
+  for (const tableSchema of context.tables.values()) {
+    if (tableSchema.columns[columnName]) {
+      found = true;
+      break;
+    }
+  }
+
+  if (!found && context.tables.size > 0) {
+    // Only report if we have tables to check against
+    const allColumns = new Set<string>();
+    for (const tableSchema of context.tables.values()) {
+      for (const col of Object.keys(tableSchema.columns)) {
+        allColumns.add(col);
+      }
+    }
+    context.issues.push({
+      message: `Unknown column "${columnName}". Available columns: ${Array.from(allColumns).join(
+        ", "
+      )}`,
+      severity: "error",
+      type: "unknown_column",
+      columnName,
+    });
+  }
+}
+
+/**
+ * Validate a comparison operation, including enum value checks
+ */
+function validateCompareOperation(op: CompareOperation, context: ValidationContext): void {
+  // Validate both sides recursively
+  validateExpression(op.left, context);
+  validateExpression(op.right, context);
+
+  // Check for enum value validation
+  // We look for patterns like: column = 'value' or column IN ('value1', 'value2')
+  const columnInfo = extractColumnFromExpression(op.left, context);
+  if (!columnInfo) return;
+
+  const { columnSchema, columnName, tableName } = columnInfo;
+
+  // Only validate if the column has allowedValues or valueMap
+  const allowedValues = getAllowedUserValues(columnSchema);
+  if (allowedValues.length === 0) return;
+
+  // Check the comparison type
+  switch (op.op) {
+    case CompareOperationOp.Eq:
+    case CompareOperationOp.NotEq:
+      // Single value comparison
+      validateEnumValue(op.right, columnSchema, columnName, tableName, context);
+      break;
+
+    case CompareOperationOp.In:
+    case CompareOperationOp.NotIn:
+    case CompareOperationOp.GlobalIn:
+    case CompareOperationOp.GlobalNotIn:
+      // Array of values
+      if ((op.right as ASTArray).expression_type === "array") {
+        for (const elem of (op.right as ASTArray).exprs) {
+          validateEnumValue(elem, columnSchema, columnName, tableName, context);
+        }
+      }
+      break;
+  }
+}
+
+/**
+ * Extract column information from an expression if it's a simple column reference
+ */
+function extractColumnFromExpression(
+  expr: Expression,
+  context: ValidationContext
+): { columnSchema: ColumnSchema; columnName: string; tableName?: string } | null {
+  if ((expr as Field).expression_type !== "field") return null;
+
+  const field = expr as Field;
+  const chain = field.chain;
+
+  if (chain.length === 0) return null;
+
+  const firstPart = chain[0];
+  if (typeof firstPart !== "string") return null;
+
+  // Qualified reference: table.column
+  if (chain.length >= 2) {
+    const tableAlias = firstPart.toLowerCase();
+    const columnName = chain[1];
+
+    if (typeof columnName !== "string") return null;
+
+    const tableSchema = context.tables.get(tableAlias);
+    if (!tableSchema) return null;
+
+    const columnSchema = tableSchema.columns[columnName];
+    if (!columnSchema) return null;
+
+    return { columnSchema, columnName, tableName: tableAlias };
+  }
+
+  // Unqualified reference
+  const columnName = firstPart;
+  for (const [tableName, tableSchema] of context.tables.entries()) {
+    const columnSchema = tableSchema.columns[columnName];
+    if (columnSchema) {
+      return { columnSchema, columnName, tableName };
+    }
+  }
+
+  return null;
+}
+
+/**
+ * Validate that a value matches the allowed enum values for a column
+ * Supports both allowedValues and valueMap, with case-insensitive matching
+ */
+function validateEnumValue(
+  expr: Expression,
+  columnSchema: ColumnSchema,
+  columnName: string,
+  tableName: string | undefined,
+  context: ValidationContext
+): void {
+  if ((expr as Constant).expression_type !== "constant") return;
+
+  const constant = expr as Constant;
+  if (typeof constant.value !== "string") return;
+
+  const value = constant.value;
+
+  // Use isValidUserValue for case-insensitive validation against user-friendly values
+  if (!isValidUserValue(columnSchema, value)) {
+    const columnRef = tableName ? `${tableName}.${columnName}` : columnName;
+    // Show user-friendly values in the error message
+    const allowedValues = getAllowedUserValues(columnSchema);
+    context.issues.push({
+      message: `Invalid value "${value}" for column "${columnRef}". Allowed values: ${allowedValues.join(
+        ", "
+      )}`,
+      severity: "error",
+      type: "invalid_enum_value",
+      columnName,
+      tableName,
+      invalidValue: value,
+      allowedValues,
+    });
+  }
+}
diff --git a/internal-packages/tsql/tsconfig.json b/internal-packages/tsql/tsconfig.json
new file mode 100644
index 00000000000..98c833a1892
--- /dev/null
+++ b/internal-packages/tsql/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+    "target": "ES2019",
+    "lib": ["ES2019", "DOM", "DOM.Iterable", "DOM.AsyncIterable"],
+    "module": "ESNext",
+    "moduleResolution": "node",
+    "moduleDetection": "force",
+    "verbatimModuleSyntax": false,
+    "types": ["vitest/globals"],
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "isolatedModules": true,
+    "preserveWatchOutput": true,
+    "skipLibCheck": true,
+    "noEmit": true,
+    "strict": true,
+    "paths": {
+      "@trigger.dev/core": ["../../packages/core/src/index"],
+      "@trigger.dev/core/*": ["../../packages/core/src/*"],
+      "@internal/clickhouse": ["../clickhouse/src/index"],
+      "@internal/clickhouse/*": ["../clickhouse/src/*"]
+    }
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/internal-packages/tsql/vitest.config.ts b/internal-packages/tsql/vitest.config.ts
new file mode 100644
index 00000000000..1d779c09577
--- /dev/null
+++ b/internal-packages/tsql/vitest.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["**/*.test.ts"],
+    globals: true,
+    isolate: true,
+    fileParallelism: false,
+    poolOptions: {
+      threads: {
+        singleThread: true,
+      },
+    },
+    testTimeout: 60_000,
+    coverage: {
+      provider: "v8",
+    },
+  },
+});
diff --git a/internal-packages/zod-worker/package.json b/internal-packages/zod-worker/package.json
index 1d9cbad93cd..352fa945293 100644
--- a/internal-packages/zod-worker/package.json
+++ b/internal-packages/zod-worker/package.json
@@ -10,7 +10,7 @@
     "@trigger.dev/database": "workspace:*",
     "graphile-worker": "0.16.6",
     "lodash.omit": "^4.5.0",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@types/lodash.omit": "^4.5.7",
diff --git a/package.json b/package.json
index 3394cc3ee56..2d03bd362a1 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
     "db:populate": "turbo run db:populate",
     "dev": "turbo run dev",
     "i:dev": "infisical run -- turbo run dev",
-    "format": "prettier . --write --config prettier.config.js",
     "generate": "turbo run generate",
     "lint": "turbo run lint",
     "docker": "docker compose -p triggerdotdev-docker -f docker/docker-compose.yml up -d --build --remove-orphans",
@@ -63,11 +62,11 @@
     "tsx": "^3.7.1",
     "turbo": "^1.10.3",
     "typescript": "5.5.4",
-    "vite": "^4.1.1",
+    "vite": "^5.4.21",
     "vite-tsconfig-paths": "^4.0.5",
     "vitest": "3.1.4"
   },
-  "packageManager": "pnpm@9.15.0",
+  "packageManager": "pnpm@10.23.0",
   "dependencies": {
     "@changesets/cli": "2.26.2",
     "@remix-run/changelog-github": "^0.0.5",
@@ -82,17 +81,48 @@
       "engine.io-parser@5.2.2": "patches/engine.io-parser@5.2.2.patch",
       "graphile-worker@0.16.6": "patches/graphile-worker@0.16.6.patch",
       "redlock@5.0.0-beta.2": "patches/redlock@5.0.0-beta.2.patch",
-      "@kubernetes/client-node@1.0.0": "patches/@kubernetes__client-node@1.0.0.patch"
+      "@kubernetes/client-node@1.0.0": "patches/@kubernetes__client-node@1.0.0.patch",
+      "@sentry/remix@9.46.0": "patches/@sentry__remix@9.46.0.patch",
+      "@upstash/ratelimit@1.1.3": "patches/@upstash__ratelimit.patch",
+      "antlr4ts@0.5.0-alpha.4": "patches/antlr4ts@0.5.0-alpha.4.patch"
     },
     "overrides": {
+      "typescript": "5.5.4",
+      "@types/node": "20.14.14",
       "express@^4>body-parser": "1.20.3",
       "@remix-run/dev@2.1.0>tar-fs": "2.1.3",
       "testcontainers@10.28.0>tar-fs": "3.0.9",
-      "form-data": "4.0.4",
+      "form-data@^2": "2.5.4",
+      "form-data@^3": "3.0.4",
+      "form-data@^4": "4.0.4",
       "ws": "8.17.1",
       "semver": "5.7.2",
       "cross-spawn": "7.0.5",
-      "@babel/runtime": "7.27.0"
-    }
+      "@babel/runtime": "7.27.0",
+      "axios@1.9.0": ">=1.12.0",
+      "js-yaml@>=3.0.0 <3.14.2": "3.14.2",
+      "js-yaml@>=4.0.0 <4.1.1": "4.1.1",
+      "jws@<3.2.3": "3.2.3",
+      "qs@>=6.0.0 <6.14.1": "6.14.1",
+      "systeminformation@>=5.0.0 <5.27.14": "5.27.14",
+      "lodash@>=4.0.0 <4.17.23": "4.17.23"
+    },
+    "onlyBuiltDependencies": [
+      "@depot/cli",
+      "@fingerprintjs/fingerprintjs-pro-react",
+      "@prisma/client",
+      "@prisma/engines",
+      "@sentry/cli",
+      "@swc/core",
+      "better-sqlite3",
+      "cpu-features",
+      "esbuild",
+      "lefthook",
+      "prisma",
+      "protobufjs",
+      "sharp",
+      "ssh2",
+      "turbo"
+    ]
   }
 }
\ No newline at end of file
diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md
index 6c26678b7c5..6b4efd15639 100644
--- a/packages/build/CHANGELOG.md
+++ b/packages/build/CHANGELOG.md
@@ -1,5 +1,554 @@
 # @trigger.dev/build
 
+## 4.4.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- syncVercelEnvVars to skip API and read env vars directly from env.process for Vercel build environments. New syncNeonEnvVars build extension for syncing environment variablesfrom Neon database projects to Trigger.dev. The extension automatically detects branches and builds appropriate PostgreSQL connection strings for non-production, non-dev environments (staging, preview). ([#2729](https://github.com/triggerdotdev/trigger.dev/pull/2729))
+- Updated dependencies:
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- The `prismaExtension` has been completely redesigned to support multiple Prisma versions and deployment strategies. This update introduces **three distinct modes** to handle the evolving Prisma ecosystem, from legacy setups to the upcoming Prisma 7. ([#2689](https://github.com/triggerdotdev/trigger.dev/pull/2689))
+
+  **Highlights:**
+
+  - 🎯 Three modes: Legacy, Engine-Only, and Modern
+  - 🎉 **NEW:** Support for `prisma.config.ts` files (Legacy Mode)
+  - 🔍 **NEW:** Enhanced version detection with filesystem fallback
+
+  ## Breaking Changes
+
+  ⚠️ **MIGRATION REQUIRED**: The `prismaExtension` now requires an explicit `mode` parameter. Existing configurations without a `mode` will need to be updated.
+
+  **Note:** All other existing options remain backward compatible. The new `configFile` option is optional and doesn't affect existing setups using the `schema` option.
+
+  ### Before (Old API)
+
+  ```ts
+  import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+  extensions: [
+    prismaExtension({
+      schema: "prisma/schema.prisma",
+      migrate: true,
+      typedSql: true,
+      directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+    }),
+  ];
+  ```
+
+  ### After (New API)
+
+  ```ts
+  import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+  extensions: [
+    prismaExtension({
+      mode: "legacy", // ← MODE IS NOW REQUIRED
+      schema: "prisma/schema.prisma",
+      migrate: true,
+      typedSql: true,
+      directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+    }),
+  ];
+  ```
+
+  ## New Features
+
+  ### 1. Legacy Mode
+
+  **Use when:** You're using Prisma 6.x or earlier with the `prisma-client-js` provider.
+
+  **Features:**
+
+  - Automatic `prisma generate` during deployment
+  - Supports single-file schemas (`prisma/schema.prisma`)
+  - Supports multi-file schemas (Prisma 6.7+, directory-based schemas)
+  - **NEW:** Supports Prisma config files (`prisma.config.ts`) via `@prisma/config` package
+  - Migration support with `migrate: true`
+  - TypedSQL support with `typedSql: true`
+  - Custom generator selection
+  - Handles Prisma client versioning automatically (with filesystem fallback detection)
+  - Automatic extraction of schema and migrations paths from config files
+
+  **Schema Configuration:**
+
+  ```prisma
+  generator client {
+    provider        = "prisma-client-js"
+    previewFeatures = ["typedSql"]
+  }
+
+  datasource db {
+    provider  = "postgresql"
+    url       = env("DATABASE_URL")
+    directUrl = env("DATABASE_URL_UNPOOLED")
+  }
+  ```
+
+  **Extension Configuration:**
+
+  ```ts
+  // Single-file schema
+  prismaExtension({
+    mode: "legacy",
+    schema: "prisma/schema.prisma",
+    migrate: true,
+    typedSql: true,
+    directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+  });
+
+  // Multi-file schema (Prisma 6.7+)
+  prismaExtension({
+    mode: "legacy",
+    schema: "./prisma", // ← Point to directory
+    migrate: true,
+    typedSql: true,
+    directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+  });
+  ```
+
+  **Tested Versions:**
+
+  - Prisma 6.14.0 ✅
+  - Prisma 6.7.0+ (multi-file schema support) ✅
+  - Prisma 5.x ✅
+
+  ***
+
+  ### 2. Engine-Only Mode
+
+  **Use when:** You have a custom Prisma client output path and want to manage `prisma generate` yourself.
+
+  **Features:**
+
+  - Only installs Prisma engine binaries (no client generation)
+  - Automatic version detection from `@prisma/client`
+  - Manual override of version and binary target
+  - Minimal overhead - just ensures engines are available
+  - You control when and how `prisma generate` runs
+
+  **Schema Configuration:**
+
+  ```prisma
+  generator client {
+    provider      = "prisma-client-js"
+    output        = "../src/generated/prisma"
+    // Ensure the "debian-openssl-3.0.x" binary target is included for deployment to the trigger.dev cloud
+    binaryTargets = ["native", "debian-openssl-3.0.x"]
+  }
+
+  datasource db {
+    provider  = "postgresql"
+    url       = env("DATABASE_URL")
+    directUrl = env("DATABASE_URL_UNPOOLED")
+  }
+  ```
+
+  **Extension Configuration:**
+
+  ```ts
+  // Auto-detect version
+  prismaExtension({
+    mode: "engine-only",
+  });
+
+  // Explicit version (recommended for reproducible builds)
+  prismaExtension({
+    mode: "engine-only",
+    version: "6.19.0",
+  });
+  ```
+
+  **Important Notes:**
+
+  - You **must** run `prisma generate` yourself (typically in a prebuild script)
+  - Your schema **must** include the correct `binaryTargets` for deployment to the trigger.dev cloud. The binary target is `debian-openssl-3.0.x`.
+  - The extension sets `PRISMA_QUERY_ENGINE_LIBRARY` and `PRISMA_QUERY_ENGINE_SCHEMA_ENGINE` environment variables to the correct paths for the binary targets.
+
+  **package.json Example:**
+
+  ```json
+  {
+    "scripts": {
+      "prebuild": "prisma generate",
+      "dev": "trigger dev",
+      "deploy": "trigger deploy"
+    }
+  }
+  ```
+
+  **Tested Versions:**
+
+  - Prisma 6.19.0 ✅
+  - Prisma 6.16.0+ ✅
+
+  ***
+
+  ### 3. Modern Mode
+
+  **Use when:** You're using Prisma 6.16+ with the new `prisma-client` provider (with `engineType = "client"`) or preparing for Prisma 7.
+
+  **Features:**
+
+  - Designed for the new Prisma architecture
+  - Zero configuration required
+  - Automatically marks `@prisma/client` as external
+  - Works with Prisma 7 beta releases & Prisma 7 when released
+  - You manage client generation (like engine-only mode)
+
+  **Schema Configuration (Prisma 6.16+ with engineType):**
+
+  ```prisma
+  generator client {
+    provider        = "prisma-client"
+    output          = "../src/generated/prisma"
+    engineType      = "client"
+    previewFeatures = ["views"]
+  }
+
+  datasource db {
+    provider  = "postgresql"
+    url       = env("DATABASE_URL")
+    directUrl = env("DATABASE_URL_UNPOOLED")
+  }
+  ```
+
+  **Schema Configuration (Prisma 7):**
+
+  ```prisma
+  generator client {
+    provider = "prisma-client"
+    output   = "../src/generated/prisma"
+  }
+
+  datasource db {
+    provider = "postgresql"
+  }
+  ```
+
+  **Extension Configuration:**
+
+  ```ts
+  prismaExtension({
+    mode: "modern",
+  });
+  ```
+
+  **Prisma Config (Prisma 7):**
+
+  ```ts
+  // prisma.config.ts
+  import { defineConfig, env } from "prisma/config";
+  import "dotenv/config";
+
+  export default defineConfig({
+    schema: "prisma/schema.prisma",
+    migrations: {
+      path: "prisma/migrations",
+    },
+    datasource: {
+      url: env("DATABASE_URL"),
+    },
+  });
+  ```
+
+  **Important Notes:**
+
+  - You **must** run `prisma generate` yourself
+  - Requires Prisma 6.16.0+ or Prisma 7 beta
+  - The new `prisma-client` provider generates plain TypeScript (no Rust binaries)
+  - Requires database adapters (e.g., `@prisma/adapter-pg` for PostgreSQL)
+
+  **Tested Versions:**
+
+  - Prisma 6.16.0 with `engineType = "client"` ✅
+  - Prisma 6.20.0-integration-next.8 (Prisma 7 beta) ✅
+
+  ***
+
+  ## Migration Guide
+
+  ### From Old prismaExtension to Legacy Mode
+
+  If you were using the previous `prismaExtension`, migrate to **Legacy Mode**:
+
+  ```ts
+  // Old
+  prismaExtension({
+    schema: "prisma/schema.prisma",
+    migrate: true,
+  });
+
+  // New
+  prismaExtension({
+    mode: "legacy", // ← Add this
+    schema: "prisma/schema.prisma",
+    migrate: true,
+  });
+  ```
+
+  ### From Managing Your Own Prisma Setup
+
+  If you previously handled Prisma generation yourself and just needed engine binaries, use **Engine-Only Mode**:
+
+  ```ts
+  prismaExtension({
+    mode: "engine-only",
+    version: "6.19.0", // Match your @prisma/client version
+  });
+  ```
+
+  ### Preparing for Prisma 7
+
+  If you want to adopt the new Prisma architecture, use **Modern Mode**:
+
+  1. Update your schema to use `prisma-client` provider
+  2. Add database adapters to your dependencies
+  3. Configure the extension:
+
+  ```ts
+  prismaExtension({
+    mode: "modern",
+  });
+  ```
+
+  ***
+
+  ## Version Compatibility Matrix
+
+  | Prisma Version   | Recommended Mode      | Notes                                        |
+  | ---------------- | --------------------- | -------------------------------------------- |
+  | < 5.0            | Legacy                | Older Prisma versions                        |
+  | 5.0 - 6.15       | Legacy                | Standard Prisma setup                        |
+  | 6.7+             | Legacy                | Multi-file schema support                    |
+  | 6.16+            | Engine-Only or Modern | Modern mode requires `engineType = "client"` |
+  | 6.20+ (7.0 beta) | Modern                | Prisma 7 with new architecture               |
+
+  ***
+
+  ## Prisma Config File Support (Prisma 6+)
+
+  **NEW:** Legacy Mode now supports loading configuration from a `prisma.config.ts` file using the official `@prisma/config` package.
+
+  **Use when:** You want to use Prisma's new config file format (Prisma 6+) to centralize your Prisma configuration.
+
+  **Benefits:**
+
+  - Single source of truth for Prisma configuration
+  - Automatic extraction of schema location and migrations path
+  - Type-safe configuration with TypeScript
+  - Works seamlessly with Prisma 7's config-first approach
+
+  **prisma.config.ts:**
+
+  ```ts
+  import { defineConfig, env } from "prisma/config";
+  import "dotenv/config";
+
+  export default defineConfig({
+    schema: "prisma/schema.prisma",
+    migrations: {
+      path: "prisma/migrations",
+    },
+    datasource: {
+      url: env("DATABASE_URL"),
+      directUrl: env("DATABASE_URL_UNPOOLED"),
+    },
+  });
+  ```
+
+  **trigger.config.ts:**
+
+  ```ts
+  import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+  prismaExtension({
+    mode: "legacy",
+    configFile: "./prisma.config.ts", // ← Use config file instead of schema
+    migrate: true,
+    directUrlEnvVarName: "DATABASE_URL_UNPOOLED", // For migrations
+  });
+  ```
+
+  **What gets extracted:**
+
+  - `schema` - The schema file or directory path
+  - `migrations.path` - The migrations directory path (if specified)
+
+  **Note:** Either `schema` or `configFile` must be specified, but not both.
+
+  **When to use which:**
+
+  | Use `schema` option          | Use `configFile` option           |
+  | ---------------------------- | --------------------------------- |
+  | Standard Prisma setup        | Using Prisma 6+ with config files |
+  | Single or multi-file schemas | Preparing for Prisma 7            |
+  | No `prisma.config.ts` file   | Centralized configuration needed  |
+  | Simple setup                 | Want migrations path in config    |
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.1`
+
+## 4.1.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Fix broken audiowaveform extension ([#2643](https://github.com/triggerdotdev/trigger.dev/pull/2643))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- Run Engine 2.0 (alpha) ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575))
+- syncVercelEnvVars() fix for syncing the wrong preview branch env vars ([#2141](https://github.com/triggerdotdev/trigger.dev/pull/2141))
+- Add Lightpanda extension ([#2192](https://github.com/triggerdotdev/trigger.dev/pull/2192))
+- - Improve playwright non-headless chrome installation ([#2347](https://github.com/triggerdotdev/trigger.dev/pull/2347))
+  - Prevent spinner message duplication in narrow terminals
+- Add ffmpeg v7 support to existing extension: `ffmpeg({ version: "7" })` ([#1777](https://github.com/triggerdotdev/trigger.dev/pull/1777))
+- Add playwright extension ([#1764](https://github.com/triggerdotdev/trigger.dev/pull/1764))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- - Improve playwright non-headless chrome installation ([#2347](https://github.com/triggerdotdev/trigger.dev/pull/2347))
+  - Prevent spinner message duplication in narrow terminals
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- Add Lightpanda extension ([#2192](https://github.com/triggerdotdev/trigger.dev/pull/2192))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
diff --git a/packages/build/package.json b/packages/build/package.json
index 9e9ef7e6a13..92cc4331520 100644
--- a/packages/build/package.json
+++ b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -30,7 +30,8 @@
       "./extensions/audioWaveform": "./src/extensions/audioWaveform.ts",
       "./extensions/typescript": "./src/extensions/typescript.ts",
       "./extensions/puppeteer": "./src/extensions/puppeteer.ts",
-      "./extensions/playwright": "./src/extensions/playwright.ts"
+      "./extensions/playwright": "./src/extensions/playwright.ts",
+      "./extensions/lightpanda": "./src/extensions/lightpanda.ts"
     },
     "sourceDialects": [
       "@triggerdotdev/source"
@@ -61,6 +62,9 @@
       ],
       "extensions/playwright": [
         "dist/commonjs/extensions/playwright.d.ts"
+      ],
+      "extensions/lightpanda": [
+        "dist/commonjs/extensions/lightpanda.d.ts"
       ]
     }
   },
@@ -73,17 +77,21 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.24",
+    "@prisma/config": "^6.10.0",
+    "@trigger.dev/core": "workspace:4.4.1",
+    "mlly": "^1.7.1",
     "pkg-types": "^1.1.3",
+    "resolve": "^1.22.8",
     "tinyglobby": "^0.2.2",
     "tsconfck": "3.1.3"
   },
   "devDependencies": {
+    "@arethetypeswrong/cli": "^0.15.4",
+    "@types/resolve": "^1.20.6",
+    "esbuild": "^0.23.0",
     "rimraf": "6.0.1",
     "tshy": "^3.0.2",
-    "tsx": "4.17.0",
-    "esbuild": "^0.23.0",
-    "@arethetypeswrong/cli": "^0.15.4"
+    "tsx": "4.17.0"
   },
   "engines": {
     "node": ">=18.20.0"
@@ -188,6 +196,17 @@
         "types": "./dist/commonjs/extensions/playwright.d.ts",
         "default": "./dist/commonjs/extensions/playwright.js"
       }
+    },
+    "./extensions/lightpanda": {
+      "import": {
+        "@triggerdotdev/source": "./src/extensions/lightpanda.ts",
+        "types": "./dist/esm/extensions/lightpanda.d.ts",
+        "default": "./dist/esm/extensions/lightpanda.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/extensions/lightpanda.d.ts",
+        "default": "./dist/commonjs/extensions/lightpanda.js"
+      }
     }
   },
   "main": "./dist/commonjs/index.js",
diff --git a/packages/build/src/extensions/audioWaveform.ts b/packages/build/src/extensions/audioWaveform.ts
index 19227c6e793..0bf6e4e0fa1 100644
--- a/packages/build/src/extensions/audioWaveform.ts
+++ b/packages/build/src/extensions/audioWaveform.ts
@@ -46,7 +46,6 @@ class AudioWaveformExtension implements BuildExtension {
       }-1-12_amd64.deb .`,
       `RUN dpkg -i audiowaveform_${opts.version}-1-12_amd64.deb || true`,
       `RUN rm audiowaveform*.deb`,
-      `RUN apt-get install -y --fix-broken`,
     ];
 
     context.addLayer({
diff --git a/packages/build/src/extensions/core.ts b/packages/build/src/extensions/core.ts
index d9ed52b5a0f..62671dfd571 100644
--- a/packages/build/src/extensions/core.ts
+++ b/packages/build/src/extensions/core.ts
@@ -3,4 +3,5 @@ export * from "./core/additionalPackages.js";
 export * from "./core/syncEnvVars.js";
 export * from "./core/aptGet.js";
 export * from "./core/ffmpeg.js";
+export * from "./core/neonSyncEnvVars.js";
 export * from "./core/vercelSyncEnvVars.js";
diff --git a/packages/build/src/extensions/core/neonSyncEnvVars.ts b/packages/build/src/extensions/core/neonSyncEnvVars.ts
new file mode 100644
index 00000000000..2e0dde31431
--- /dev/null
+++ b/packages/build/src/extensions/core/neonSyncEnvVars.ts
@@ -0,0 +1,298 @@
+import { BuildExtension } from "@trigger.dev/core/v3/build";
+import { syncEnvVars } from "../core.js";
+
+type EnvVar = { name: string; value: string; isParentEnv?: boolean };
+
+type NeonBranch = {
+  id: string;
+  name: string;
+};
+
+type NeonEndpoint = {
+  id: string;
+  host: string;
+  type: string;
+};
+
+type NeonDatabase = {
+  id: number;
+  name: string;
+  owner_name: string;
+};
+
+type NeonRole = {
+  name: string;
+  password?: string;
+};
+
+// List of Neon DB related environment variables to sync
+export const NEON_ENV_VARS = [
+  "PGUSER",
+  "POSTGRES_URL_NO_SSL",
+  "POSTGRES_HOST",
+  "POSTGRES_URL",
+  "POSTGRES_PRISMA_URL",
+  "DATABASE_URL_UNPOOLED",
+  "POSTGRES_URL_NON_POOLING",
+  "PGHOST",
+  "POSTGRES_USER",
+  "DATABASE_URL",
+  "POSTGRES_PASSWORD",
+  "POSTGRES_DATABASE",
+  "PGPASSWORD",
+  "PGDATABASE",
+  "PGHOST_UNPOOLED",
+];
+
+function buildNeonEnvVarMappings(options: {
+  user: string;
+  password: string;
+  database: string;
+  host: string;
+  poolerHost: string;
+}): Record<string, string> {
+  const { user, password, database, host, poolerHost } = options;
+
+  return {
+    PGUSER: user,
+    PGPASSWORD: password,
+    PGDATABASE: database,
+    PGHOST: poolerHost,
+    PGHOST_UNPOOLED: host,
+    POSTGRES_USER: user,
+    POSTGRES_PASSWORD: password,
+    POSTGRES_DATABASE: database,
+    POSTGRES_HOST: poolerHost,
+    DATABASE_URL: `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${poolerHost}/${database}?sslmode=require`,
+    DATABASE_URL_UNPOOLED: `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${host}/${database}?sslmode=require`,
+    POSTGRES_URL: `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${poolerHost}/${database}?sslmode=require`,
+    POSTGRES_URL_NO_SSL: `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${poolerHost}/${database}`,
+    POSTGRES_URL_NON_POOLING: `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${host}/${database}?sslmode=require`,
+    POSTGRES_PRISMA_URL: `postgresql://${encodeURIComponent(user)}:${encodeURIComponent(password)}@${poolerHost}/${database}?sslmode=require&pgbouncer=true&connect_timeout=15`,
+  };
+}
+
+export function syncNeonEnvVars(options?: {
+  projectId?: string;
+  /**
+   * Neon API access token for authentication.
+   * It's recommended to use the NEON_ACCESS_TOKEN environment variable instead of hardcoding this value.
+   */
+  neonAccessToken?: string;
+  branch?: string;
+  databaseName?: string;
+  roleName?: string;
+  envVarPrefix?: string;
+}): BuildExtension {
+  const sync = syncEnvVars(async (ctx) => {
+    const projectId =
+      options?.projectId ?? process.env.NEON_PROJECT_ID ?? ctx.env.NEON_PROJECT_ID;
+    const neonAccessToken =
+      options?.neonAccessToken ?? process.env.NEON_ACCESS_TOKEN ?? ctx.env.NEON_ACCESS_TOKEN;
+    const branch = options?.branch ?? ctx.branch;
+    const envVarPrefix = options?.envVarPrefix ?? "";
+    const outputEnvVars = NEON_ENV_VARS;
+
+    // Skip the whole process for Vercel environments
+    if (ctx.env.VERCEL) {
+      return [];
+    }
+
+    if (!projectId) {
+      throw new Error(
+        "syncNeonEnvVars: you did not pass in a projectId or set the NEON_PROJECT_ID env var."
+      );
+    }
+
+    if (!neonAccessToken) {
+      throw new Error(
+        "syncNeonEnvVars: you did not pass in an neonAccessToken or set the NEON_ACCESS_TOKEN env var."
+      );
+    }
+
+    // Skip branch-specific logic for production environment
+    if (ctx.environment === "prod") {
+      return [];
+    }
+
+    if (!branch) {
+      throw new Error(
+        "syncNeonEnvVars: you did not pass in a branch and no branch was detected from context."
+      );
+    }
+
+    const environmentMap = {
+      prod: "production",
+      staging: "preview",
+      dev: "development",
+      preview: "preview",
+    } as const;
+
+    const environment = environmentMap[ctx.environment as keyof typeof environmentMap];
+
+    if (!environment) {
+      throw new Error(
+        `Invalid environment '${ctx.environment}'. Expected 'prod', 'staging', 'dev', or 'preview'.`
+      );
+    }
+
+    if (environment === "development") {
+      // Skip syncing for development environment
+      return [];
+    }
+
+    try {
+      // Step 1: Search for the branch in Neon
+      const branchSearchParams = new URLSearchParams({ search: branch });
+      const branchesUrl = `https://console.neon.tech/api/v2/projects/${projectId}/branches?${branchSearchParams}`;
+      const branchesResponse = await fetch(branchesUrl, {
+        headers: {
+          Authorization: `Bearer ${neonAccessToken}`,
+        },
+      });
+
+      if (!branchesResponse.ok) {
+        throw new Error(`Failed to fetch Neon branches: ${branchesResponse.status}`);
+      }
+
+      const branchesData = await branchesResponse.json();
+      const branches: NeonBranch[] = branchesData.branches || [];
+
+      if (branches.length === 0) {
+        // No matching branch found
+        return [];
+      }
+
+      // Neon branch names are prefixed with environment (e.g., "preview/branch-name")
+      const expectedBranchName = `${environment}/${branch}`;
+      const matchingBranch = branches.find(
+        (b) => b.name === expectedBranchName || b.name === branch
+      );
+
+      if (!matchingBranch) {
+        // No exact match found
+        return [];
+      }
+
+      const neonBranchId = matchingBranch.id;
+
+      // Step 2: Get endpoints for the branch
+      const endpointsUrl = `https://console.neon.tech/api/v2/projects/${projectId}/branches/${neonBranchId}/endpoints`;
+      const endpointsResponse = await fetch(endpointsUrl, {
+        headers: {
+          Authorization: `Bearer ${neonAccessToken}`,
+        },
+      });
+
+      if (!endpointsResponse.ok) {
+        throw new Error(`Failed to fetch Neon branch endpoints: ${endpointsResponse.status}`);
+      }
+
+      const endpointsData = await endpointsResponse.json();
+      const endpoints: NeonEndpoint[] = endpointsData.endpoints || [];
+
+      if (endpoints.length === 0) {
+        return [];
+      }
+
+      // Find an endpoint with type containing 'write', or take the first one
+      const writeEndpoint = endpoints.find((ep) => ep.type.includes("write"));
+      const endpoint = writeEndpoint || endpoints[0];
+
+      if (!endpoint) {
+        return [];
+      }
+
+      // Step 3: Get databases for the branch
+      const databasesUrl = `https://console.neon.tech/api/v2/projects/${projectId}/branches/${neonBranchId}/databases`;
+      const databasesResponse = await fetch(databasesUrl, {
+        headers: {
+          Authorization: `Bearer ${neonAccessToken}`,
+        },
+      });
+
+      if (!databasesResponse.ok) {
+        throw new Error(`Failed to fetch Neon branch databases: ${databasesResponse.status}`);
+      }
+
+      const databasesData = await databasesResponse.json();
+      const databases: NeonDatabase[] = databasesData.databases || [];
+
+      if (databases.length === 0) {
+        return [];
+      }
+
+      // Find the specified database or use the first one
+      const targetDatabase = options?.databaseName
+        ? databases.find((db) => db.name === options.databaseName)
+        : databases[0];
+
+      if (!targetDatabase) {
+        throw new Error(
+          `syncNeonEnvVars: Database '${options?.databaseName}' not found in branch.`
+        );
+      }
+
+      // Step 4: Get the role (user) and password
+      const targetRoleName = options?.roleName ?? targetDatabase.owner_name;
+      const rolePasswordUrl = `https://console.neon.tech/api/v2/projects/${projectId}/branches/${neonBranchId}/roles/${targetRoleName}/reveal_password`;
+      const rolePasswordResponse = await fetch(rolePasswordUrl, {
+        headers: {
+          Authorization: `Bearer ${neonAccessToken}`,
+        },
+      });
+
+      if (!rolePasswordResponse.ok) {
+        throw new Error(
+          `Failed to fetch Neon role password: ${rolePasswordResponse.status}. Make sure the role '${targetRoleName}' exists and has a password.`
+        );
+      }
+
+      const rolePasswordData: NeonRole = await rolePasswordResponse.json();
+      const password = rolePasswordData.password;
+
+      if (!password) {
+        throw new Error(
+          `syncNeonEnvVars: No password found for role '${targetRoleName}'. The role may not have a password set.`
+        );
+      }
+
+      // Step 5: Build new environment variables based on the endpoint host
+      const newHost = endpoint.host;
+      const poolerHost = newHost.replace(/^([^.]+)\./, "$1-pooler.");
+
+      const envVarMappings = buildNeonEnvVarMappings({
+        user: targetRoleName,
+        password,
+        database: targetDatabase.name,
+        host: newHost,
+        poolerHost,
+      });
+
+      // Build output env vars
+      const newEnvVars: EnvVar[] = [];
+
+      for (const neonEnvVar of outputEnvVars) {
+        const prefixedKey = `${envVarPrefix}${neonEnvVar}`;
+        if (envVarMappings[neonEnvVar]) {
+          newEnvVars.push({
+            name: prefixedKey,
+            value: envVarMappings[neonEnvVar],
+          });
+        }
+      }
+
+      return newEnvVars;
+    } catch (error) {
+      console.error("Error fetching Neon branch environment variables:", error);
+      throw error;
+    }
+  });
+
+  return {
+    name: "SyncNeonEnvVarsExtension",
+    async onBuildComplete(context, manifest) {
+      await sync.onBuildComplete?.(context, manifest);
+    },
+  };
+}
diff --git a/packages/build/src/extensions/core/vercelSyncEnvVars.ts b/packages/build/src/extensions/core/vercelSyncEnvVars.ts
index 7f58e8a1208..ce79841e66d 100644
--- a/packages/build/src/extensions/core/vercelSyncEnvVars.ts
+++ b/packages/build/src/extensions/core/vercelSyncEnvVars.ts
@@ -13,6 +13,10 @@ type VercelEnvVar = {
 
 export function syncVercelEnvVars(options?: {
   projectId?: string;
+  /**
+   * Vercel API access token for authentication.
+   * It's recommended to use the VERCEL_ACCESS_TOKEN environment variable instead of hardcoding this value.
+   */
   vercelAccessToken?: string;
   vercelTeamId?: string;
   branch?: string;
@@ -32,6 +36,7 @@ export function syncVercelEnvVars(options?: {
       process.env.VERCEL_PREVIEW_BRANCH ??
       ctx.env.VERCEL_PREVIEW_BRANCH ??
       ctx.branch;
+    const isVercelEnv = !!(ctx.env.VERCEL);
 
     if (!projectId) {
       throw new Error(
@@ -81,15 +86,19 @@ export function syncVercelEnvVars(options?: {
 
       const filteredEnvs: EnvVar[] = data.envs
         .filter((env: VercelEnvVar) => {
-          if (!env.value) return false;
           if (!env.target.includes(vercelEnvironment)) return false;
           if (isBranchable && env.gitBranch && env.gitBranch !== branch) return false;
+          // When running in Vercel, prefer process.env but fall back to API value
+          const value = isVercelEnv ? (process.env[env.key] ?? env.value) : env.value;
+          if (!value) return false;
           return true;
         })
         .map((env: VercelEnvVar) => {
+          // When running in Vercel, prefer process.env but fall back to API value
+          const value = isVercelEnv ? (process.env[env.key] ?? env.value) : env.value;
           return {
             name: env.key,
-            value: env.value,
+            value,
             isParentEnv: isBranchable && !env.gitBranch,
           };
         });
diff --git a/packages/build/src/extensions/lightpanda.ts b/packages/build/src/extensions/lightpanda.ts
new file mode 100644
index 00000000000..16c62a08b4f
--- /dev/null
+++ b/packages/build/src/extensions/lightpanda.ts
@@ -0,0 +1,38 @@
+import type { BuildExtension } from "@trigger.dev/core/v3/build";
+
+type LightpandaOpts = {
+  version?: "nightly" | "latest";
+  disableTelemetry?: boolean;
+};
+
+export const lightpanda = ({
+  version = "latest",
+  disableTelemetry = false,
+}: LightpandaOpts = {}): BuildExtension => ({
+  name: "lightpanda",
+  onBuildComplete: async (context) => {
+    if (context.target === "dev") {
+      return;
+    }
+
+    context.logger.debug(`Adding lightpanda`, { version, disableTelemetry });
+
+    const instructions = [
+      `COPY --from=lightpanda/browser:${version} /usr/bin/lightpanda /usr/local/bin/lightpanda`,
+      `RUN /usr/local/bin/lightpanda version || (echo "lightpanda binary is not functional" && exit 1)`,
+    ] satisfies string[];
+
+    context.addLayer({
+      id: "lightpanda",
+      image: {
+        instructions,
+      },
+      deploy: {
+        env: {
+          ...(disableTelemetry ? { LIGHTPANDA_DISABLE_TELEMETRY: "true" } : {}),
+        },
+        override: true,
+      },
+    });
+  },
+});
diff --git a/packages/build/src/extensions/playwright.ts b/packages/build/src/extensions/playwright.ts
index 0f675d85ed1..0931a4855c7 100644
--- a/packages/build/src/extensions/playwright.ts
+++ b/packages/build/src/extensions/playwright.ts
@@ -295,10 +295,29 @@ class PlaywrightExtension implements BuildExtension {
      * We save this output to a file and then parse it to get the download urls for the browsers.
      */
     instructions.push(`RUN npx playwright install --dry-run > /tmp/browser-info.txt`);
+
+    // Determine which browsers to actually install
+    const browsersToInstall = new Set<PlaywrightBrowser | "chromium-headless-shell">();
+
     this.options.browsers.forEach((browser) => {
-      const browserType = browser === "chromium" ? "chromium-headless-shell" : browser;
+      if (browser === "chromium") {
+        if (this.options.headless) {
+          // For headless mode, only install chromium-headless-shell
+          browsersToInstall.add("chromium-headless-shell");
+        } else {
+          // For non-headless mode, install both chromium and chromium-headless-shell
+          // This allows users to easily switch between headless and non-headless mode
+          browsersToInstall.add("chromium");
+          browsersToInstall.add("chromium-headless-shell");
+        }
+      } else {
+        browsersToInstall.add(browser);
+      }
+    });
+
+    Array.from(browsersToInstall).forEach((browser) => {
       instructions.push(
-        `RUN grep -A5 "browser: ${browserType}" /tmp/browser-info.txt > /tmp/${browser}-info.txt`,
+        `RUN grep -A5 -m1 "browser: ${browser}" /tmp/browser-info.txt > /tmp/${browser}-info.txt`,
 
         `RUN INSTALL_DIR=$(grep "Install location:" /tmp/${browser}-info.txt | cut -d':' -f2- | xargs) && \
           DIR_NAME=$(basename "$INSTALL_DIR") && \
diff --git a/packages/build/src/extensions/prisma.ts b/packages/build/src/extensions/prisma.ts
index b67adc7efc1..35589eeca5b 100644
--- a/packages/build/src/extensions/prisma.ts
+++ b/packages/build/src/extensions/prisma.ts
@@ -1,63 +1,418 @@
 import { BuildManifest, BuildTarget } from "@trigger.dev/core/v3";
 import { binaryForRuntime, BuildContext, BuildExtension } from "@trigger.dev/core/v3/build";
 import assert from "node:assert";
-import { existsSync } from "node:fs";
-import { cp, readdir } from "node:fs/promises";
+import { existsSync, statSync } from "node:fs";
+import { cp, readdir, readFile } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
+import { resolvePathSync as esmResolveSync } from "../imports/mlly.js";
+import { resolvePackageJSON } from "pkg-types";
+import { LoadConfigFromFileError } from "@prisma/config";
 
-export type PrismaExtensionOptions = {
-  schema: string;
-  migrate?: boolean;
-  version?: string;
-  /**
-   * Adds the `--sql` flag to the `prisma generate` command. This will generate the SQL files for the Prisma schema. Requires the `typedSql preview feature and prisma 5.19.0 or later.
-   */
-  typedSql?: boolean;
+export type PrismaLegacyModeExtensionOptions = {
   /**
-   * The client generator to use. Set this param to prevent all generators in the prisma schema from being generated.
+   * Legacy mode configuration for Prisma 5.x/6.x with the `prisma-client-js` provider.
    *
-   * @example
+   * **Use this mode when:**
+   * - Using Prisma 5.x or 6.x with `prisma-client-js` provider
+   * - You want automatic `prisma generate` during deployment
+   * - You need migration support
    *
-   * ### Prisma schema
+   * **Key features:**
+   * - Automatic client generation
+   * - Multi-file schema support (Prisma 6.7+)
+   * - Config file support (`prisma.config.ts`)
+   * - TypedSQL support
+   * - Automatic version detection
+   */
+  mode: "legacy";
+  /**
+   * Path to your Prisma schema file or directory.
    *
-   * ```prisma
-   * generator client {
-   *  provider = "prisma-client-js"
-   * }
+   * **Examples:**
+   * - Single file: `"./prisma/schema.prisma"`
+   * - Multi-file (Prisma 6.7+): `"./prisma"`
    *
-   * generator typegraphql {
-   *  provider = "typegraphql-prisma"
-   *  output = "./generated/type-graphql"
-   * }
-   * ```
+   * **Note:** Either `schema` or `configFile` must be specified, but not both.
+   */
+  schema?: string;
+  /**
+   * Path to your Prisma config file (`prisma.config.ts`).
    *
-   * ### PrismaExtension
+   * Uses `@prisma/config` to automatically extract schema and migrations paths.
+   * Requires Prisma 6+ with config file support.
    *
+   * **Example:**
    * ```ts
    * prismaExtension({
-   *  schema: "./prisma/schema.prisma",
-   *  clientGenerator: "client"
+   *   mode: "legacy",
+   *   configFile: "./prisma.config.ts",
+   *   migrate: true,
    * });
    * ```
+   *
+   * **Note:** Either `schema` or `configFile` must be specified, but not both.
+   */
+  configFile?: string;
+  /**
+   * Enable automatic database migrations during deployment.
+   *
+   * Runs `prisma migrate deploy` before generating the client.
+   * Requires `directUrlEnvVarName` to be set.
+   */
+  migrate?: boolean;
+  /**
+   * Override the auto-detected Prisma version.
+   *
+   * **Auto-detection:** Checks externals, then `@prisma/client` in node_modules, then `prisma` package.
+   */
+  version?: string;
+  /**
+   * Enable TypedSQL support. Adds `--sql` flag to `prisma generate`.
+   *
+   * Requires Prisma 5.19+ and `previewFeatures = ["typedSql"]` in your schema.
+   */
+  typedSql?: boolean;
+  /**
+   * Specify which generator to use when you have multiple generators.
+   *
+   * Adds `--generator=<name>` to only generate the specified generator.
+   * Useful for skipping extra generators like `typegraphql-prisma`.
    */
   clientGenerator?: string;
+  /**
+   * Environment variable name for the direct (unpooled) database connection.
+   *
+   * Required for migrations. Common values: `"DATABASE_URL_UNPOOLED"`, `"DIRECT_URL"`.
+   */
   directUrlEnvVarName?: string;
 };
 
+export type PrismaEngineOnlyModeExtensionOptions = {
+  /**
+   * Engine-only mode for custom Prisma client output paths.
+   *
+   * **Use this mode when:**
+   * - You're using a custom output path for Prisma Client
+   * - You want to control when `prisma generate` runs
+   * - You run `prisma generate` in your build pipeline
+   *
+   * **What it does:**
+   * - Installs engine binaries only (no client generation)
+   * - Sets `PRISMA_QUERY_ENGINE_LIBRARY` and `PRISMA_QUERY_ENGINE_SCHEMA_ENGINE` env vars
+   * - Auto-detects version from filesystem
+   *
+   * **You must:** Run `prisma generate` yourself and include correct `binaryTargets` in your schema.
+   */
+  mode: "engine-only";
+  /**
+   * Prisma version to use. Auto-detected from `@prisma/client` or `prisma` package if omitted.
+   *
+   * **Recommended:** Specify explicitly for reproducible builds.
+   */
+  version?: string;
+
+  /**
+   * Binary target platform for Prisma engines.
+   *
+   * **Default:** `"debian-openssl-3.0.x"` (for Trigger.dev Cloud)
+   * **Local Docker on ARM:** `"linux-arm64-openssl-3.0.x"`
+   */
+  binaryTarget?: string;
+
+  /**
+   * Suppress progress messages during the build.
+   */
+  silent?: boolean;
+};
+
+export type PrismaEngineModernModeExtensionOptions = {
+  /**
+   * Modern mode for Prisma 6.16+ (with `prisma-client` provider) and Prisma 7.
+   *
+   * **Use this mode when:**
+   * - Using Prisma 6.16+ with `provider = "prisma-client"` and `engineType = "client"`
+   * - Using Prisma 7 beta or later
+   * - Using database adapters (e.g., `@prisma/adapter-pg`)
+   *
+   * **What it does:**
+   * - Marks `@prisma/client` as external (zero config)
+   * - Works with TypeScript-only client (no Rust binaries)
+   *
+   * **You must:** Run `prisma generate` yourself and install database adapters.
+   */
+  mode: "modern";
+};
+
+export type PrismaExtensionOptions =
+  | PrismaLegacyModeExtensionOptions
+  | PrismaEngineOnlyModeExtensionOptions
+  | PrismaEngineModernModeExtensionOptions;
+
 const BINARY_TARGET = "linux-arm64-openssl-3.0.x";
 
-export function prismaExtension(options: PrismaExtensionOptions): PrismaExtension {
-  return new PrismaExtension(options);
+/**
+ * Attempts to resolve the Prisma client version from the project.
+ * Tries @prisma/client first, then falls back to the prisma package.
+ */
+async function resolvePrismaClientVersion(
+  workingDir: string,
+  logger: {
+    debug: (message: string, data?: any) => void;
+  }
+): Promise<string | undefined> {
+  // Try @prisma/client first
+  const clientVersion = await tryResolvePrismaPackageVersion("@prisma/client", workingDir, logger);
+  if (clientVersion) {
+    return clientVersion;
+  }
+
+  // Fall back to prisma package
+  const prismaVersion = await tryResolvePrismaPackageVersion("prisma", workingDir, logger);
+  if (prismaVersion) {
+    return prismaVersion;
+  }
+
+  return undefined;
+}
+
+/**
+ * Attempts to resolve a specific Prisma package and extract its version
+ */
+async function tryResolvePrismaPackageVersion(
+  packageName: string,
+  workingDir: string,
+  logger: {
+    debug: (message: string, data?: any) => void;
+  }
+): Promise<string | undefined> {
+  try {
+    // Try to resolve the package using esmResolveSync
+    const resolvedPath = esmResolveSync(packageName, {
+      url: workingDir,
+    });
+
+    logger.debug(`Resolved ${packageName} module path`, {
+      resolvedPath,
+      workingDir,
+      packageName,
+    });
+
+    // Find the package.json for this resolved module
+    const packageJsonPath = await resolvePackageJSON(dirname(resolvedPath), {
+      test: async (filePath) => {
+        try {
+          const content = await readFile(filePath, "utf-8");
+          const candidate = JSON.parse(content);
+
+          // Exclude esm type markers
+          return Object.keys(candidate).length > 1 || !candidate.type;
+        } catch (error) {
+          logger.debug("Error during package.json test", {
+            error: error instanceof Error ? error.message : error,
+            filePath,
+          });
+
+          return false;
+        }
+      },
+    });
+
+    if (!packageJsonPath) {
+      logger.debug(`No package.json found for ${packageName}`, {
+        resolvedPath,
+      });
+      return undefined;
+    }
+
+    logger.debug(`Found package.json for ${packageName}`, {
+      packageJsonPath,
+    });
+
+    // Read and parse the package.json
+    const packageJsonContent = await readFile(packageJsonPath, "utf-8");
+    const packageJson = JSON.parse(packageJsonContent);
+
+    if (packageJson.name === packageName && packageJson.version) {
+      logger.debug(`Detected ${packageName} version`, {
+        version: packageJson.version,
+      });
+      return packageJson.version;
+    }
+
+    logger.debug(`Package name mismatch or no version in package.json for ${packageName}`, {
+      expectedName: packageName,
+      actualName: packageJson.name,
+      version: packageJson.version,
+    });
+
+    return undefined;
+  } catch (error) {
+    logger.debug(`Failed to resolve ${packageName}`, {
+      error: error instanceof Error ? error.message : error,
+      workingDir,
+    });
+
+    return undefined;
+  }
+}
+
+/**
+ * Loads a Prisma config file using @prisma/config and extracts the schema path and other configuration
+ */
+async function loadPrismaConfig(
+  configFilePath: string,
+  workingDir: string,
+  logger: {
+    debug: (message: string, data?: any) => void;
+  }
+): Promise<{
+  schema: string;
+  migrationsPath?: string;
+}> {
+  try {
+    // Resolve the config file path relative to the working directory
+    const resolvedConfigPath = resolve(workingDir, configFilePath);
+
+    logger.debug(`[PrismaExtension] loadPrismaConfig called`, {
+      configFilePath,
+      resolvedConfigPath,
+      workingDir,
+    });
+
+    // Check that the config file exists
+    if (!existsSync(resolvedConfigPath)) {
+      throw new Error(
+        `Prisma config file not found at ${resolvedConfigPath}. Make sure the path is correct: ${configFilePath}, relative to the working dir ${workingDir}`
+      );
+    }
+
+    logger.debug(`[PrismaExtension] Config file exists, loading with @prisma/config`);
+
+    // Dynamically import @prisma/config
+    const { loadConfigFromFile } = await import("@prisma/config");
+
+    // Load the config using @prisma/config
+    const configResult = await loadConfigFromFile({
+      configFile: resolvedConfigPath,
+      configRoot: workingDir,
+    });
+
+    logger.debug(`[PrismaExtension] loadConfigFromFile completed`, {
+      hasError: !!configResult.error,
+      errorTag: configResult.error?._tag,
+    });
+
+    function prettyConfigError(error: LoadConfigFromFileError): string {
+      switch (error._tag) {
+        case "ConfigFileNotFound":
+          return `Config file not found at ${resolvedConfigPath}`;
+        case "ConfigLoadError":
+          return `Config file parse error: ${error.error.message}`;
+        case "ConfigFileSyntaxError":
+          return `Config file syntax error: ${error.error.message}`;
+        default:
+          return `Unknown config error: ${String(error.error.message)}`;
+      }
+    }
+
+    if (configResult.error) {
+      throw new Error(
+        `Failed to load Prisma config from ${resolvedConfigPath}: ${prettyConfigError(
+          configResult.error
+        )}`
+      );
+    }
+
+    logger.debug(`[PrismaExtension] Config parsed successfully`, {
+      schema: configResult.config.schema,
+      migrationsPath: configResult.config.migrations?.path,
+      fullMigrations: configResult.config.migrations,
+    });
+
+    // Extract the schema path
+    if (!configResult.config.schema) {
+      throw new Error(`Prisma config file at ${resolvedConfigPath} does not specify a schema path`);
+    }
+
+    const result = {
+      schema: configResult.config.schema,
+      migrationsPath: configResult.config.migrations?.path,
+    };
+
+    logger.debug(`[PrismaExtension] Returning config result`, result);
+
+    return result;
+  } catch (error) {
+    logger.debug(`[PrismaExtension] Error loading config`, {
+      error: error instanceof Error ? error.message : error,
+      stack: error instanceof Error ? error.stack : undefined,
+    });
+    throw new Error(
+      `Failed to load Prisma config from ${configFilePath}: ${
+        error instanceof Error ? error.message : error
+      }`
+    );
+  }
+}
+
+/**
+ * Prisma build extension for Trigger.dev deployments.
+ *
+ * **Three modes available:**
+ * - `"legacy"` - Prisma 5.x/6.x with `prisma-client-js`, automatic generation
+ * - `"engine-only"` - Custom output paths, manual generation control
+ * - `"modern"` - Prisma 6.16+/7.x with `prisma-client` provider
+ *
+ * @example Legacy mode (most common)
+ * ```ts
+ * prismaExtension({
+ *   mode: "legacy",
+ *   schema: "prisma/schema.prisma",
+ *   migrate: true,
+ *   typedSql: true,
+ * });
+ * ```
+ *
+ * @example Engine-only mode (custom output)
+ * ```ts
+ * prismaExtension({
+ *   mode: "engine-only",
+ *   version: "6.19.0",
+ * });
+ * ```
+ *
+ * @example Modern mode (Prisma 7)
+ * ```ts
+ * prismaExtension({
+ *   mode: "modern",
+ * });
+ * ```
+ */
+export function prismaExtension(options: PrismaExtensionOptions): BuildExtension {
+  switch (options.mode) {
+    case "legacy":
+      return new PrismaLegacyModeExtension(options);
+    case "engine-only":
+      return new PrismaEngineOnlyModeExtension(options);
+    case "modern":
+      return new PrismaEngineModernModeExtension(options);
+    default:
+      return new PrismaLegacyModeExtension(options);
+  }
 }
 
-export class PrismaExtension implements BuildExtension {
+export class PrismaLegacyModeExtension implements BuildExtension {
   moduleExternals: string[];
 
   public readonly name = "PrismaExtension";
 
   private _resolvedSchemaPath?: string;
+  private _loadedConfig?: {
+    schema: string;
+    migrationsPath?: string;
+  };
 
-  constructor(private options: PrismaExtensionOptions) {
+  constructor(private options: PrismaLegacyModeExtensionOptions) {
     this.moduleExternals = ["@prisma/client", "@prisma/engines"];
   }
 
@@ -74,17 +429,74 @@ export class PrismaExtension implements BuildExtension {
       return;
     }
 
+    context.logger.debug(`[PrismaExtension] onBuildStart called`, {
+      workingDir: context.workingDir,
+      options: {
+        schema: this.options.schema,
+        configFile: this.options.configFile,
+        migrate: this.options.migrate,
+        version: this.options.version,
+        typedSql: this.options.typedSql,
+        clientGenerator: this.options.clientGenerator,
+        directUrlEnvVarName: this.options.directUrlEnvVarName,
+      },
+    });
+
+    // Validate that either schema or configFile is provided, but not both
+    if (!this.options.schema && !this.options.configFile) {
+      throw new Error(
+        `PrismaExtension requires either 'schema' or 'configFile' to be specified in the options`
+      );
+    }
+
+    if (this.options.schema && this.options.configFile) {
+      throw new Error(
+        `PrismaExtension cannot have both 'schema' and 'configFile' specified. Please use only one.`
+      );
+    }
+
+    let schemaPath: string;
+
+    // If configFile is specified, load it and extract the schema path
+    if (this.options.configFile) {
+      context.logger.debug(
+        `[PrismaExtension] Loading Prisma config from ${this.options.configFile}`
+      );
+
+      this._loadedConfig = await loadPrismaConfig(
+        this.options.configFile,
+        context.workingDir,
+        context.logger
+      );
+
+      schemaPath = this._loadedConfig.schema;
+
+      context.logger.debug(`[PrismaExtension] Config loaded successfully`, {
+        schema: this._loadedConfig.schema,
+        migrationsPath: this._loadedConfig.migrationsPath,
+      });
+    } else {
+      schemaPath = this.options.schema!;
+      context.logger.debug(`[PrismaExtension] Using schema from options: ${schemaPath}`);
+    }
+
     // Resolve the path to the prisma schema, relative to the config.directory
-    this._resolvedSchemaPath = resolve(context.workingDir, this.options.schema);
+    this._resolvedSchemaPath = resolve(context.workingDir, schemaPath);
 
-    context.logger.debug(`Resolved the prisma schema to: ${this._resolvedSchemaPath}`);
+    context.logger.debug(`[PrismaExtension] Resolved schema path`, {
+      schemaPath,
+      resolvedSchemaPath: this._resolvedSchemaPath,
+      workingDir: context.workingDir,
+    });
 
     // Check that the prisma schema exists
     if (!existsSync(this._resolvedSchemaPath)) {
       throw new Error(
-        `PrismaExtension could not find the prisma schema at ${this._resolvedSchemaPath}. Make sure the path is correct: ${this.options.schema}, relative to the working dir ${context.workingDir}`
+        `PrismaExtension could not find the prisma schema at ${this._resolvedSchemaPath}. Make sure the path is correct: ${schemaPath}, relative to the working dir ${context.workingDir}`
       );
     }
+
+    context.logger.debug(`[PrismaExtension] Schema file exists at ${this._resolvedSchemaPath}`);
   }
 
   async onBuildComplete(context: BuildContext, manifest: BuildManifest) {
@@ -92,9 +504,11 @@ export class PrismaExtension implements BuildExtension {
       return;
     }
 
+    context.logger.debug(`[PrismaExtension] onBuildComplete called`);
+
     assert(this._resolvedSchemaPath, "Resolved schema path is not set");
 
-    context.logger.debug("Looking for @prisma/client in the externals", {
+    context.logger.debug(`[PrismaExtension] Looking for @prisma/client in the externals`, {
       externals: manifest.externals,
     });
 
@@ -102,7 +516,20 @@ export class PrismaExtension implements BuildExtension {
       (external) => external.name === "@prisma/client"
     );
 
-    const version = prismaExternal?.version ?? this.options.version;
+    let version = prismaExternal?.version ?? this.options.version;
+
+    // If we couldn't find the version in externals or options, try to resolve it from the filesystem
+    if (!version) {
+      context.logger.debug(
+        `[PrismaExtension] Version not found in externals, attempting to detect from filesystem`
+      );
+
+      version = await resolvePrismaClientVersion(context.workingDir, context.logger);
+
+      if (version) {
+        context.logger.debug(`[PrismaExtension] Detected version from filesystem: ${version}`);
+      }
+    }
 
     if (!version) {
       throw new Error(
@@ -110,11 +537,22 @@ export class PrismaExtension implements BuildExtension {
       );
     }
 
-    context.logger.debug(`PrismaExtension is generating the Prisma client for version ${version}`);
+    context.logger.debug(`[PrismaExtension] Using Prisma version ${version}`, {
+      source: prismaExternal ? "externals" : this.options.version ? "options" : "filesystem",
+    });
+
+    // Detect if this is a multi-file schema (directory) or single file schema
+    const isMultiFileSchema = statSync(this._resolvedSchemaPath).isDirectory();
+    const usingSchemaFolder =
+      !isMultiFileSchema && dirname(this._resolvedSchemaPath).endsWith("schema");
 
-    const usingSchemaFolder = dirname(this._resolvedSchemaPath).endsWith("schema");
+    context.logger.debug(`Schema detection`, {
+      isMultiFileSchema,
+      usingSchemaFolder,
+      resolvedSchemaPath: this._resolvedSchemaPath,
+    });
 
-    const commands: string[] = [];
+    let commands: string[] = [];
 
     let prismaDir: string | undefined;
 
@@ -127,14 +565,25 @@ export class PrismaExtension implements BuildExtension {
     if (this.options.typedSql) {
       generatorFlags.push(`--sql`);
 
-      const prismaDir = usingSchemaFolder
-        ? dirname(dirname(this._resolvedSchemaPath))
-        : dirname(this._resolvedSchemaPath);
+      // Determine the prisma directory based on the schema structure
+      let prismaDirForSql: string;
+      if (isMultiFileSchema) {
+        // For multi-file schemas, the resolved path IS the prisma directory
+        prismaDirForSql = this._resolvedSchemaPath;
+      } else if (usingSchemaFolder) {
+        // For schema folders (e.g., prisma/schema/*.prisma), go up two levels
+        prismaDirForSql = dirname(dirname(this._resolvedSchemaPath));
+      } else {
+        // For single file schemas (e.g., prisma/schema.prisma), go up one level
+        prismaDirForSql = dirname(this._resolvedSchemaPath);
+      }
 
-      context.logger.debug(`Using typedSql`);
+      context.logger.debug(`Using typedSql`, {
+        prismaDirForSql,
+      });
 
       // Find all the files prisma/sql/*.sql
-      const sqlFiles = await readdir(join(prismaDir, "sql")).then((files) =>
+      const sqlFiles = await readdir(join(prismaDirForSql, "sql")).then((files) =>
         files.filter((file) => file.endsWith(".sql"))
       );
 
@@ -146,7 +595,7 @@ export class PrismaExtension implements BuildExtension {
 
       for (const file of sqlFiles) {
         const destination = join(sqlDestinationPath, file);
-        const source = join(prismaDir, "sql", file);
+        const source = join(prismaDirForSql, "sql", file);
 
         context.logger.debug(`Copying the sql from ${source} to ${destination}`);
 
@@ -154,7 +603,36 @@ export class PrismaExtension implements BuildExtension {
       }
     }
 
-    if (usingSchemaFolder) {
+    if (isMultiFileSchema) {
+      // For multi-file schemas, the resolved path IS the prisma directory
+      prismaDir = this._resolvedSchemaPath;
+
+      context.logger.debug(`Using multi-file schema directory: ${prismaDir}`);
+
+      // Copy the entire prisma directory to the build output path
+      const prismaDestinationPath = join(manifest.outputPath, "prisma");
+
+      context.logger.debug(
+        `Copying the prisma directory from ${prismaDir} to ${prismaDestinationPath}`
+      );
+
+      const prismaDirForFilter = prismaDir;
+      await cp(prismaDir, prismaDestinationPath, {
+        recursive: true,
+        // Filter out migrations and sql directories as they're handled separately if needed
+        filter: (source) => {
+          const relativePath = source.replace(prismaDirForFilter, "");
+          // Skip migrations and sql directories during initial copy
+          return !relativePath.startsWith("/migrations") && !relativePath.startsWith("/sql");
+        },
+      });
+
+      commands.push(
+        `${binaryForRuntime(
+          manifest.runtime
+        )} node_modules/prisma/build/index.js generate ${generatorFlags.join(" ")}` // Don't add the --schema flag when using directory
+      );
+    } else if (usingSchemaFolder) {
       const schemaDir = dirname(this._resolvedSchemaPath);
 
       prismaDir = dirname(schemaDir);
@@ -213,24 +691,73 @@ export class PrismaExtension implements BuildExtension {
 
     const env: Record<string, string | undefined> = {};
 
-    if (this.options.migrate) {
-      // Copy the migrations directory to the build output path
-      const migrationsDir = join(prismaDir, "migrations");
-      const migrationsDestinationPath = join(manifest.outputPath, "prisma", "migrations");
+    context.logger.debug(`[PrismaExtension] Checking if migrations are enabled`, {
+      migrate: this.options.migrate,
+      loadedConfigMigrationsPath: this._loadedConfig?.migrationsPath,
+      prismaDir,
+    });
 
+    if (this.options.migrate) {
       context.logger.debug(
-        `Copying the prisma migrations from ${migrationsDir} to ${migrationsDestinationPath}`
+        `[PrismaExtension] Migrations enabled, determining migrations directory`
       );
 
-      await cp(migrationsDir, migrationsDestinationPath, { recursive: true });
+      // Determine the migrations directory path
+      let migrationsDir: string;
+
+      if (this._loadedConfig?.migrationsPath) {
+        // Use the migrations path from the config file
+        migrationsDir = resolve(context.workingDir, this._loadedConfig.migrationsPath);
+        context.logger.debug(`[PrismaExtension] Using migrations path from config`, {
+          configMigrationsPath: this._loadedConfig.migrationsPath,
+          resolvedMigrationsDir: migrationsDir,
+          workingDir: context.workingDir,
+        });
+      } else {
+        // Fall back to the default migrations directory
+        migrationsDir = join(prismaDir, "migrations");
+        context.logger.debug(`[PrismaExtension] Using default migrations path`, {
+          prismaDir,
+          migrationsDir,
+        });
+      }
 
-      commands.push(
-        `${binaryForRuntime(manifest.runtime)} node_modules/prisma/build/index.js migrate deploy`
+      const migrationsDestinationPath = join(manifest.outputPath, "prisma", "migrations");
+
+      context.logger.debug(`[PrismaExtension] Checking if migrations directory exists`, {
+        migrationsDir,
+        exists: existsSync(migrationsDir),
+      });
+
+      if (!existsSync(migrationsDir)) {
+        context.logger.warn(
+          `[PrismaExtension] Migrations directory not found at ${migrationsDir}. Skipping migrations copy.`
+        );
+      } else {
+        context.logger.debug(
+          `[PrismaExtension] Copying prisma migrations from ${migrationsDir} to ${migrationsDestinationPath}`
+        );
+
+        await cp(migrationsDir, migrationsDestinationPath, { recursive: true });
+
+        context.logger.debug(`[PrismaExtension] Migrations copied successfully`);
+
+        commands = [
+          `${binaryForRuntime(manifest.runtime)} node_modules/prisma/build/index.js migrate deploy`,
+          ...commands,
+        ];
+
+        context.logger.debug(`[PrismaExtension] Added migrate deploy command to commands array`);
+      }
+    } else {
+      context.logger.debug(
+        `[PrismaExtension] Migrations not enabled (migrate: ${this.options.migrate})`
       );
     }
 
     env.DATABASE_URL = manifest.deploy.env?.DATABASE_URL;
 
+    // Handle directUrl environment variable configuration
     if (this.options.directUrlEnvVarName) {
       env[this.options.directUrlEnvVarName] =
         manifest.deploy.env?.[this.options.directUrlEnvVarName] ??
@@ -252,14 +779,19 @@ export class PrismaExtension implements BuildExtension {
       );
     }
 
-    context.logger.debug(`Adding the prisma layer with the following commands`, {
+    context.logger.debug(`[PrismaExtension] Final layer configuration`, {
       commands,
-      env,
+      commandsCount: commands.length,
+      env: Object.keys(env),
       dependencies: {
         prisma: version,
       },
     });
 
+    context.logger.debug(`[PrismaExtension] Commands to be executed:`, {
+      commands: commands.map((cmd, idx) => `${idx + 1}. ${cmd}`),
+    });
+
     context.addLayer({
       id: "prisma",
       commands,
@@ -270,5 +802,97 @@ export class PrismaExtension implements BuildExtension {
         env,
       },
     });
+
+    context.logger.debug(`[PrismaExtension] Layer added successfully`);
+  }
+}
+
+export class PrismaEngineOnlyModeExtension implements BuildExtension {
+  public readonly name = "PrismaEngineOnlyModeExtension";
+  private _binaryTarget: string;
+
+  constructor(private options: PrismaEngineOnlyModeExtensionOptions) {
+    this._binaryTarget = options.binaryTarget ?? "debian-openssl-3.0.x";
+  }
+
+  async onBuildComplete(context: BuildContext, manifest: BuildManifest) {
+    if (context.target === "dev") {
+      return;
+    }
+
+    // Try to detect the version if not provided
+    let version = this.options.version;
+
+    if (!version) {
+      context.logger.debug("Attempting to detect @prisma/client version from the project");
+
+      version = await resolvePrismaClientVersion(context.workingDir, context.logger);
+
+      if (version) {
+        // Log a nice message to the user which version was detected, and give them instructions on how to override it
+        context.logger.progress(
+          `prismaExtension: detected prisma ${version}. Override via prismaExtension({ mode: "engine-only", version: "6.19.0" })`
+        );
+      }
+    }
+
+    if (!version) {
+      throw new Error(
+        `PrismaEngineOnlyModeExtension could not determine the version of @prisma/client. Please provide a version in the PrismaExtension options: prismaExtension({ mode: "engine-only", version: "6.19.0" })`
+      );
+    }
+
+    context.logger.debug(
+      `PrismaEngineOnlyModeExtension is installing engines for version ${version}`
+    );
+
+    const commands: string[] = [
+      // Install the engines package
+      `npm install @prisma/engines@${version}`,
+      ...generateCpCommandsForLocation("/app/prisma-engines", this._binaryTarget),
+    ];
+
+    context.addLayer({
+      id: "prisma-engines",
+      commands,
+      deploy: {
+        env: {
+          PRISMA_QUERY_ENGINE_LIBRARY: `/app/prisma-engines/libquery_engine-${this._binaryTarget}.so.node`,
+          PRISMA_QUERY_ENGINE_SCHEMA_ENGINE: `/app/prisma-engines/schema-engine-${this._binaryTarget}`,
+        },
+      },
+    });
+
+    if (!this.options.silent) {
+      context.logger.progress(
+        "prismaExtension: setting PRISMA_QUERY_ENGINE_LIBRARY and PRISMA_QUERY_ENGINE_SCHEMA_ENGINE env variables"
+      );
+      // Now logs output a pretty message to the user that they need to make sure they have already run `prisma generate` and they also have added
+      // the binary target to the prisma schema file like so: binaryTargets = ["native", "debian-openssl-3.0.x"]
+      context.logger.progress(
+        `prismaExtension: in engine-only mode you are required to run \`prisma generate\` and ensure your schema.prisma file has binaryTargets = ["native", "${this._binaryTarget}"]`
+      );
+    }
+  }
+}
+
+function generateCpCommandsForLocation(location: string, binaryTarget: string) {
+  return [
+    `mkdir -p ${location} && cp node_modules/@prisma/engines/libquery_engine-${binaryTarget}.so.node ${location}/`,
+    `mkdir -p ${location} && cp node_modules/@prisma/engines/schema-engine-${binaryTarget} ${location}/`,
+  ];
+}
+
+export class PrismaEngineModernModeExtension implements BuildExtension {
+  moduleExternals: string[];
+
+  public readonly name = "PrismaEngineModernModeExtension";
+
+  constructor(private options: PrismaEngineModernModeExtensionOptions) {
+    this.moduleExternals = ["@prisma/client"];
+  }
+
+  externalsForTarget(target: BuildTarget) {
+    return this.moduleExternals;
   }
 }
diff --git a/packages/build/src/imports/mlly-cjs.cts b/packages/build/src/imports/mlly-cjs.cts
new file mode 100644
index 00000000000..cd89f8df66c
--- /dev/null
+++ b/packages/build/src/imports/mlly-cjs.cts
@@ -0,0 +1,5 @@
+// @ts-ignore
+const { resolvePathSync } = require("mlly");
+
+// @ts-ignore
+module.exports.resolvePathSync = resolvePathSync;
diff --git a/packages/build/src/imports/mlly.ts b/packages/build/src/imports/mlly.ts
new file mode 100644
index 00000000000..d0bf9ffb85e
--- /dev/null
+++ b/packages/build/src/imports/mlly.ts
@@ -0,0 +1,5 @@
+// @ts-ignore
+import { resolvePathSync } from "mlly";
+
+// @ts-ignore
+export { resolvePathSync };
diff --git a/packages/cli-v3/CHANGELOG.md b/packages/cli-v3/CHANGELOG.md
index be6392c8b9d..162302ed099 100644
--- a/packages/cli-v3/CHANGELOG.md
+++ b/packages/cli-v3/CHANGELOG.md
@@ -1,5 +1,337 @@
 # trigger.dev
 
+## 4.4.1
+
+### Patch Changes
+
+- Add OTEL metrics pipeline for task workers. Workers collect process CPU/memory, Node.js runtime metrics (event loop utilization, event loop delay, heap usage), and user-defined custom metrics via `otel.metrics.getMeter()`. Metrics are exported to ClickHouse with 10-second aggregation buckets and 1m/5m rollups, and are queryable through the dashboard query engine with typed attribute columns, `prettyFormat()` for human-readable values, and AI query support. ([#3061](https://github.com/triggerdotdev/trigger.dev/pull/3061))
+- Updated dependencies:
+  - `@trigger.dev/build@4.4.1`
+  - `@trigger.dev/core@4.4.1`
+  - `@trigger.dev/schema-to-json@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Fix runner getting stuck indefinitely when `execute()` is called on a dead child process. ([#2978](https://github.com/triggerdotdev/trigger.dev/pull/2978))
+- Add optional `timeoutInSeconds` parameter to the `wait_for_run_to_complete` MCP tool. Defaults to 60 seconds. If the run doesn't complete within the timeout, the current state of the run is returned instead of waiting indefinitely. ([#3035](https://github.com/triggerdotdev/trigger.dev/pull/3035))
+- Fixed a minor issue in the deployment command on distinguishing between local builds for the cloud vs local builds for self-hosting setups. ([#3070](https://github.com/triggerdotdev/trigger.dev/pull/3070))
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+  - `@trigger.dev/build@4.4.0`
+  - `@trigger.dev/schema-to-json@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+  - `@trigger.dev/build@4.3.3`
+  - `@trigger.dev/schema-to-json@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- fix(cli): update command should preserve existing package.json order ([#2810](https://github.com/triggerdotdev/trigger.dev/pull/2810))
+- Updated dependencies:
+  - `@trigger.dev/build@4.3.2`
+  - `@trigger.dev/core@4.3.2`
+  - `@trigger.dev/schema-to-json@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+  - `@trigger.dev/build@4.3.1`
+  - `@trigger.dev/schema-to-json@4.3.1`
+
+## 4.3.0
+
+### Minor Changes
+
+- feat(cli): deterministic image builds for deployments ([#2778](https://github.com/triggerdotdev/trigger.dev/pull/2778))
+- feat(cli): enable zstd compression for deployment images ([#2773](https://github.com/triggerdotdev/trigger.dev/pull/2773))
+
+### Patch Changes
+
+- The new `triggeredVia` field is now populated in deployments via the CLI. ([#2767](https://github.com/triggerdotdev/trigger.dev/pull/2767))
+- fix(dev): stop max listeners exceeded warning messages when running more than 10 runs concurrently ([#2771](https://github.com/triggerdotdev/trigger.dev/pull/2771))
+- Upgrade @modelcontextprotocol/sdk to 1.24.3 ([#2768](https://github.com/triggerdotdev/trigger.dev/pull/2768))
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+  - `@trigger.dev/build@4.3.0`
+  - `@trigger.dev/schema-to-json@4.3.0`
+
+## 4.2.0
+
+### Minor Changes
+
+- feat(cli): upgrade bun deployments to v1.3.3 ([#2756](https://github.com/triggerdotdev/trigger.dev/pull/2756))
+
+### Patch Changes
+
+- fix(otel): exported logs and spans will now have matching trace IDs ([#2724](https://github.com/triggerdotdev/trigger.dev/pull/2724))
+- The `--force-local-build` flag is now renamed to just `--local-build` ([#2702](https://github.com/triggerdotdev/trigger.dev/pull/2702))
+- fix(cli): header will always print the correct profile ([#2728](https://github.com/triggerdotdev/trigger.dev/pull/2728))
+- feat: add ability to set custom resource properties through trigger.config.ts or via the OTEL_RESOURCE_ATTRIBUTES env var ([#2704](https://github.com/triggerdotdev/trigger.dev/pull/2704))
+- feat(cli): implements content-addressable store for the dev CLI build outputs, reducing disk usage ([#2725](https://github.com/triggerdotdev/trigger.dev/pull/2725))
+- Added support for native build server builds in the deploy command (`--native-build-server`) ([#2702](https://github.com/triggerdotdev/trigger.dev/pull/2702))
+- Updated dependencies:
+  - `@trigger.dev/build@4.2.0`
+  - `@trigger.dev/core@4.2.0`
+  - `@trigger.dev/schema-to-json@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- - dev runs will no longer get stuck in DEQUEUED status ([#2699](https://github.com/triggerdotdev/trigger.dev/pull/2699))
+  - prevent an ENOENT "System failure" in some dev runs when making the first change after running the dev CLI.
+- Updated dependencies:
+  - `@trigger.dev/build@4.1.2`
+  - `@trigger.dev/core@4.1.2`
+  - `@trigger.dev/schema-to-json@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.1.1`
+  - `@trigger.dev/core@4.1.1`
+  - `@trigger.dev/schema-to-json@4.1.1`
+
+## 4.1.0
+
+### Patch Changes
+
+- Added external cache support for local image builds ([#2682](https://github.com/triggerdotdev/trigger.dev/pull/2682))
+- Updated dependencies:
+  - `@trigger.dev/build@4.1.0`
+  - `@trigger.dev/core@4.1.0`
+  - `@trigger.dev/schema-to-json@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Fix for the MCP tool that gets run logs to help debugging ([#2653](https://github.com/triggerdotdev/trigger.dev/pull/2653))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.7`
+  - `@trigger.dev/core@4.0.7`
+  - `@trigger.dev/schema-to-json@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Added a hint about the `--force-local-build` flag on failed deployments due to upstream provider outages. ([#2646](https://github.com/triggerdotdev/trigger.dev/pull/2646))
+- Fixed misleading error message in the CLI when config file is missing ("maxDuration" is now required). A useful error message is now shown, including a hint about the `--config` flag. ([#2650](https://github.com/triggerdotdev/trigger.dev/pull/2650))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+  - `@trigger.dev/build@4.0.6`
+  - `@trigger.dev/schema-to-json@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Stop failing attempt spans when a run is cancelled ([#2530](https://github.com/triggerdotdev/trigger.dev/pull/2530))
+- Move max duration handling into the parent process ([#2637](https://github.com/triggerdotdev/trigger.dev/pull/2637))
+- Added INSTALLING status to the deployment status enum. ([#2544](https://github.com/triggerdotdev/trigger.dev/pull/2544))
+- Fix SIGTERM handling during warm start long poll ([#2593](https://github.com/triggerdotdev/trigger.dev/pull/2593))
+- Added support for deployments with local builds. ([#2628](https://github.com/triggerdotdev/trigger.dev/pull/2628))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+  - `@trigger.dev/build@4.0.5`
+  - `@trigger.dev/schema-to-json@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/schema-to-json@4.0.4`
+  - `@trigger.dev/build@4.0.4`
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Improves our schema to JSON Schema conversion, fixes zod 4 and a few other schema libraries, also correctly sets the dependencies ([#2483](https://github.com/triggerdotdev/trigger.dev/pull/2483))
+- Add the mcpName property to the CLI package.json to allow publishing our MCP server to the Anthropic MCP registry ([#2510](https://github.com/triggerdotdev/trigger.dev/pull/2510))
+- Added new CLI command to list and view environment variables ([#2485](https://github.com/triggerdotdev/trigger.dev/pull/2485))
+- Attach to existing deployment for deployments triggered in the build server. If `TRIGGER_EXISTING_DEPLOYMENT_ID` env var is set, the `deploy` command now skips the deployment initialization. ([#2501](https://github.com/triggerdotdev/trigger.dev/pull/2501))
+- - Reduce restore times by 5s due to immediate polling ([#2516](https://github.com/triggerdotdev/trigger.dev/pull/2516))
+  - Fix `s is not a function` and surface underlying error messages
+- Reduce restore recovery time and fix deprecated runner false positives ([#2523](https://github.com/triggerdotdev/trigger.dev/pull/2523))
+- Added the heartbeats.yield utility to allow tasks that do continuous CPU-heavy work to heartbeat and continue running ([#2489](https://github.com/triggerdotdev/trigger.dev/pull/2489))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+  - `@trigger.dev/build@4.0.3`
+  - `@trigger.dev/schema-to-json@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- add wait_for_run_to_complete tool so agents don't spam the get_run_details call after triggering ([#2445](https://github.com/triggerdotdev/trigger.dev/pull/2445))
+- fix(mcp): don't require a trigger.config.ts file to be present when installing rules ([#2453](https://github.com/triggerdotdev/trigger.dev/pull/2453))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.2`
+  - `@trigger.dev/core@4.0.2`
+  - `@trigger.dev/schema-to-json@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- feat: Add official MCP server, install MCP and rules CLI commands and wizards ([#2384](https://github.com/triggerdotdev/trigger.dev/pull/2384))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.1`
+  - `@trigger.dev/core@4.0.1`
+  - `@trigger.dev/schema-to-json@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- Make the default of legacyDevProcessCwdBehaviour true instead of false (prevents breaking prismaExtension) ([#2387](https://github.com/triggerdotdev/trigger.dev/pull/2387))
+- Added experimental_devProcessCwdInBuildDir config option to opt-in to new process.cwd behavior when executing tasks in the dev CLI. Currently process.cwd maps to the "root" of your trigger.dev project (the directory that contains your trigger.config.ts file). Setting experimental_devProcessCwdInBuildDir to true changes process.cwd to instead be the temporary build directory inside of the .trigger directory. ([#2269](https://github.com/triggerdotdev/trigger.dev/pull/2269))
+- Fix dev runs ([#2094](https://github.com/triggerdotdev/trigger.dev/pull/2094))
+- The dev command will now use the platform-provided engine URL ([#1949](https://github.com/triggerdotdev/trigger.dev/pull/1949))
+- Run Engine 2.0 (alpha) ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575))
+- Fix update command version mismatch detection ([#2199](https://github.com/triggerdotdev/trigger.dev/pull/2199))
+- fix: prevent circular reference errors on task indexing when using schemaTask ([#2383](https://github.com/triggerdotdev/trigger.dev/pull/2383))
+- Add external log exporters and fix missing external trace exporters in deployed tasks ([#2038](https://github.com/triggerdotdev/trigger.dev/pull/2038))
+- Allow any runs to finish after SIGTERM but disable warm starts ([#2316](https://github.com/triggerdotdev/trigger.dev/pull/2316))
+- Gracefully shutdown task run processes using SIGTERM followed by SIGKILL after a 1s timeout. This also prevents cancelled or completed runs from leaving orphaned Ttask run processes behind ([#2299](https://github.com/triggerdotdev/trigger.dev/pull/2299))
+- Enhance deploy command output to better distinguish between local and remote builds ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
+- Switch to profile after successful login ([#2192](https://github.com/triggerdotdev/trigger.dev/pull/2192))
+- Fixes a bug that would allow processes that had OOM errors to be incorrectly reused when experimental_processKeepAlive was enabled ([#2261](https://github.com/triggerdotdev/trigger.dev/pull/2261))
+- Runtime agnostic SDK config via env vars ([#2132](https://github.com/triggerdotdev/trigger.dev/pull/2132))
+- improve contrast for chalkWorker in light mode ([#2239](https://github.com/triggerdotdev/trigger.dev/pull/2239))
+- Expose esbuild `keepNames` option (experimental) ([#2091](https://github.com/triggerdotdev/trigger.dev/pull/2091))
+- Add `experimental_autoDetectExternal` trigger config option ([#2083](https://github.com/triggerdotdev/trigger.dev/pull/2083))
+- Add project details to the whoami command ([#2231](https://github.com/triggerdotdev/trigger.dev/pull/2231))
+- fix: waitUntil now correctly waits for metadata.streams to finish ([#2399](https://github.com/triggerdotdev/trigger.dev/pull/2399))
+- Log images sizes for self-hosted deploys ([#1764](https://github.com/triggerdotdev/trigger.dev/pull/1764))
+- Display clickable links in Cursor terminal ([#1998](https://github.com/triggerdotdev/trigger.dev/pull/1998))
+- Fix init.ts in custom trigger dirs ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Add import timings and bundle size analysis, the dev command will now warn about slow imports ([#2114](https://github.com/triggerdotdev/trigger.dev/pull/2114))
+- Fix update command version range handling ([#2153](https://github.com/triggerdotdev/trigger.dev/pull/2153))
+- All experimental flags have been promoted to non-experimental, but the experimental ones still work (for now). keepNames and autoDetectExternal now default to true. ([#2371](https://github.com/triggerdotdev/trigger.dev/pull/2371))
+- fix(runner): prevent retry immediately race condition which can cause stuck runs that end up being system failures ([#2402](https://github.com/triggerdotdev/trigger.dev/pull/2402))
+- Upgrade to bun v1.2.20 ([#2398](https://github.com/triggerdotdev/trigger.dev/pull/2398))
+- Init command will now correctly install v4-beta packages ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Fix metadata collapsing correctness ([#2115](https://github.com/triggerdotdev/trigger.dev/pull/2115))
+- Improve warm start times by eagerly creating the child TaskRunProcess when a previous run as completed ([#1879](https://github.com/triggerdotdev/trigger.dev/pull/1879))
+- - Resolve issue where CLI could get stuck during deploy finalization ([#2138](https://github.com/triggerdotdev/trigger.dev/pull/2138))
+  - Unify local and remote build logic, with multi-platform build support
+  - Improve switch command; now accepts profile name as an argument
+  - Registry configuration is now fully managed by the webapp
+  - The deploy `--self-hosted` flag is no longer required
+  - Enhance deployment error reporting and image digest retrieval
+- Fix init.ts detection when using the sentry esbuild plugin ([#2051](https://github.com/triggerdotdev/trigger.dev/pull/2051))
+- - Correctly resolve waitpoints that come in early ([#2006](https://github.com/triggerdotdev/trigger.dev/pull/2006))
+  - Ensure correct state before requesting suspension
+  - Fix race conditions in snapshot processing
+- experimental processKeepAlive ([#2183](https://github.com/triggerdotdev/trigger.dev/pull/2183))
+- Fixes runLimiter check on #dequeueRuns ([#1953](https://github.com/triggerdotdev/trigger.dev/pull/1953))
+- Update nypm package to support test-based bun.lock files ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- Added AI assistance link when you have build errors ([#1925](https://github.com/triggerdotdev/trigger.dev/pull/1925))
+- Handle flush errors gracefully in dev ([#1914](https://github.com/triggerdotdev/trigger.dev/pull/1914))
+- - Improve playwright non-headless chrome installation ([#2347](https://github.com/triggerdotdev/trigger.dev/pull/2347))
+  - Prevent spinner message duplication in narrow terminals
+- Added support for Preview branches in v4 projects ([#2086](https://github.com/triggerdotdev/trigger.dev/pull/2086))
+- Can now set project ref using the TRIGGER_PROJECT_REF env var ([#2109](https://github.com/triggerdotdev/trigger.dev/pull/2109))
+- Add runtime version detection for display in the dashboard ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
+- Update profile switcher ([#2150](https://github.com/triggerdotdev/trigger.dev/pull/2150))
+- Update base images to latest compatible versions. The `node-22` runtime now uses v22.16.0 and `bun` uses the latest v1.2.18 release. The default `node` runtime is unchanged and points at v21.7.3. ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
+- Improve usage flushing ([#1931](https://github.com/triggerdotdev/trigger.dev/pull/1931))
+- fix: default machine config indexing now works ([#1979](https://github.com/triggerdotdev/trigger.dev/pull/1979))
+- Prevent large outputs from overwriting each other ([#1971](https://github.com/triggerdotdev/trigger.dev/pull/1971))
+- Fail fast in CI when running deploy with missing `TRIGGER_ACCESS_TOKEN` and add useful error message with link to docs ([#2258](https://github.com/triggerdotdev/trigger.dev/pull/2258))
+- Always print full deploy logs in CI ([#2006](https://github.com/triggerdotdev/trigger.dev/pull/2006))
+- Upgrade to zod 3.25.76 ([#2352](https://github.com/triggerdotdev/trigger.dev/pull/2352))
+- TriggerApiError 4xx errors will no longer cause tasks to be retried ([#1970](https://github.com/triggerdotdev/trigger.dev/pull/1970))
+- - Fix polling interval reset bug that could create duplicate intervals ([#1987](https://github.com/triggerdotdev/trigger.dev/pull/1987))
+  - Protect against unexpected attempt number changes
+  - Prevent run execution zombies after warm starts
+- Fix stalled run detection ([#1934](https://github.com/triggerdotdev/trigger.dev/pull/1934))
+- Managed run controller performance and reliability improvements ([#1927](https://github.com/triggerdotdev/trigger.dev/pull/1927))
+- Fix init.ts auto-import for deployed workers ([#2041](https://github.com/triggerdotdev/trigger.dev/pull/2041))
+- fix: external traces now respect parent sampling, and prevent broken traces when there is no external trace context ([#2395](https://github.com/triggerdotdev/trigger.dev/pull/2395))
+- v4: New lifecycle hooks ([#1817](https://github.com/triggerdotdev/trigger.dev/pull/1817))
+- Output esbuild metafile, can be inspected after `deploy --dry run` ([#2087](https://github.com/triggerdotdev/trigger.dev/pull/2087))
+- Fix QUEUED status snapshot handler ([#1963](https://github.com/triggerdotdev/trigger.dev/pull/1963))
+- Serialize metadata to prevent invalid metadata from breaking run completions ([#2219](https://github.com/triggerdotdev/trigger.dev/pull/2219))
+- If you pass a directory when calling deploy we validate it exists and give helpful hints ([#2013](https://github.com/triggerdotdev/trigger.dev/pull/2013))
+- Expose esbuild `minify` option (experimental) ([#2091](https://github.com/triggerdotdev/trigger.dev/pull/2091))
+- Fix `syncEnvVars` for non-preview deployments ([#2131](https://github.com/triggerdotdev/trigger.dev/pull/2131))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+  - `@trigger.dev/build@4.0.0`
+  - `@trigger.dev/schema-to-json@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Make the default of legacyDevProcessCwdBehaviour true instead of false (prevents breaking prismaExtension) ([#2387](https://github.com/triggerdotdev/trigger.dev/pull/2387))
+- fix: prevent circular reference errors on task indexing when using schemaTask ([#2383](https://github.com/triggerdotdev/trigger.dev/pull/2383))
+- fix: waitUntil now correctly waits for metadata.streams to finish ([#2399](https://github.com/triggerdotdev/trigger.dev/pull/2399))
+- fix(runner): prevent retry immediately race condition which can cause stuck runs that end up being system failures ([#2402](https://github.com/triggerdotdev/trigger.dev/pull/2402))
+- Upgrade to bun v1.2.20 ([#2398](https://github.com/triggerdotdev/trigger.dev/pull/2398))
+- fix: external traces now respect parent sampling, and prevent broken traces when there is no external trace context ([#2395](https://github.com/triggerdotdev/trigger.dev/pull/2395))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+  - `@trigger.dev/build@4.0.0-v4-beta.28`
+  - `@trigger.dev/schema-to-json@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- improve contrast for chalkWorker in light mode ([#2239](https://github.com/triggerdotdev/trigger.dev/pull/2239))
+- All experimental flags have been promoted to non-experimental, but the experimental ones still work (for now). keepNames and autoDetectExternal now default to true. ([#2371](https://github.com/triggerdotdev/trigger.dev/pull/2371))
+- - Improve playwright non-headless chrome installation ([#2347](https://github.com/triggerdotdev/trigger.dev/pull/2347))
+  - Prevent spinner message duplication in narrow terminals
+- Upgrade to zod 3.25.76 ([#2352](https://github.com/triggerdotdev/trigger.dev/pull/2352))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.0-v4-beta.27`
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+  - `@trigger.dev/schema-to-json@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- Allow any runs to finish after SIGTERM but disable warm starts ([#2316](https://github.com/triggerdotdev/trigger.dev/pull/2316))
+- Switch to profile after successful login ([#2192](https://github.com/triggerdotdev/trigger.dev/pull/2192))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.0-v4-beta.26`
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Gracefully shutdown task run processes using SIGTERM followed by SIGKILL after a 1s timeout. This also prevents cancelled or completed runs from leaving orphaned Ttask run processes behind ([#2299](https://github.com/triggerdotdev/trigger.dev/pull/2299))
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.0-v4-beta.25`
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
@@ -811,7 +1143,7 @@
     port: 5432,
     username: "postgres",
     password: "postgres",
-    database: "v3-catalog",
+    database: "hello-world",
     entities: [Photo],
     synchronize: true,
     logging: false,
@@ -1447,7 +1779,7 @@
     port: 5432,
     username: "postgres",
     password: "postgres",
-    database: "v3-catalog",
+    database: "hello-world",
     entities: [Photo],
     synchronize: true,
     logging: false,
diff --git a/packages/cli-v3/README.md b/packages/cli-v3/README.md
index d7fba79d547..84fc2a79113 100644
--- a/packages/cli-v3/README.md
+++ b/packages/cli-v3/README.md
@@ -1,10 +1,30 @@
+<div align="center">
+<picture>
+  <source media="(prefers-color-scheme: dark)" srcset="https://imagedelivery.net/3TbraffuDZ4aEf8KWOmI_w/a45d1fa2-0ae8-4a39-4409-f4f934bfae00/public">
+  <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>
+
+[![npm version](https://img.shields.io/npm/v/trigger.dev.svg)](https://www.npmjs.com/package/trigger.dev)
+[![npm downloads](https://img.shields.io/npm/dm/trigger.dev.svg)](https://www.npmjs.com/package/trigger.dev)
+[![GitHub stars](https://img.shields.io/github/stars/triggerdotdev/trigger.dev?style=social)](https://github.com/triggerdotdev/trigger.dev)
+[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](https://www.typescriptlang.org/)
+[![License: ](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Open Source](https://img.shields.io/badge/Open%20Source-%E2%9D%A4-red)](https://github.com/triggerdotdev/trigger.dev)
+
+[Discord](https://trigger.dev/discord) | [Website](https://trigger.dev) | [Issues](https://github.com/triggerdotdev/trigger.dev/issues) | [Docs](https://trigger.dev/docs) | [Examples](https://trigger.dev/docs/examples)
+
+</div>
+
 # Trigger.dev CLI
 
 A CLI that allows you to create, run locally and deploy Trigger.dev background tasks.
 
 Note: this only works with Trigger.dev v3 projects and later. For older projects use the [@trigger.dev/cli](https://www.npmjs.com/package/@trigger.dev/cli) package.
 
-Trigger.dev is an open source platform that makes it easy to create event-driven background tasks directly in your existing project.
+## About Trigger.dev
+
+Trigger.dev is an open source platform for building and deploying fully-managed AI agents and workflows. Write workflows in normal async TypeScript for everything from simple tasks to long-running AI agents, heavy media processing, complex real-time systems and more. Complete with full observability, managed queues, and elastic infrastructure which handles the horizontal scaling.
 
 ## Commands
 
@@ -17,38 +37,14 @@ Trigger.dev is an open source platform that makes it easy to create event-driven
 | [whoami](https://trigger.dev/docs/cli-whoami-commands)               | Display the current logged in user and project details.            |
 | [logout](https://trigger.dev/docs/cli-logout-commands)               | Logout of Trigger.dev.                                             |
 | [list-profiles](https://trigger.dev/docs/cli-list-profiles-commands) | List all of your CLI profiles.                                     |
+| [preview archive](https://trigger.dev/docs/cli-preview-archive)      | Archive a preview branch.                                          |
+| [promote](https://trigger.dev/docs/cli-promote-commands)             | Promote a previously deployed version to the current version.      |
+| [switch](https://trigger.dev/docs/cli-switch)                        | Switch between CLI profiles.                                       |
 | [update](https://trigger.dev/docs/cli-update-commands)               | Updates all `@trigger.dev/*` packages to match the CLI version.    |
 
-## MCP Server
-
-The [Model Context Protocol (MCP)](https://modelcontextprotocol.io/introduction) is an open protocol that allows you to provide custom tools
-to agentic LLM clients, like [Claude for Desktop](https://docs.anthropic.com/en/docs/claude-for-desktop/overview), [Cursor](https://www.cursor.com/), [Windsurf](https://windsurf.com/), etc...
-
-The Trigger.dev CLI can expose an MCP server and enable you interact with Trigger.dev in agentic LLM workflows. For example, you can use
-it to trigger tasks via natural language, view task runs, view logs, debug issues with task runs, etc...
-
-### Starting the Trigger.dev MCP Server
-
-To start the Trigger.dev MCP server, simply pass the `--mcp` flag to the `dev` command:
-
-```bash
-trigger dev --mcp
-```
-
-By default it runs on port `3333`. You can change this by passing the `--mcp-port` flag:
-
-```bash
-trigger dev --mcp --mcp-port 3334
-```
-
-### Configuring your MCP client
-
-This depends on what tool you are using. For Cursor, the configuration is in the [.cursor/mcp.json](../../.cursor/mcp.json) file
-and should be good to go as long as you use the default MCP server port.
-
-Check out [Cursor's docs](https://docs.cursor.com/context/model-context-protocol) for further details.
+## CLI documentation
 
-Tip: try out [Cursor's YOLO mode](https://docs.cursor.com/context/model-context-protocol#yolo-mode) for a seamless experience :D
+For more information on the CLI, please refer to our [docs](https://trigger.dev/docs/cli-introduction).
 
 ## Support
 
diff --git a/packages/cli-v3/install-mcp.sh b/packages/cli-v3/install-mcp.sh
new file mode 100755
index 00000000000..e2612a34e58
--- /dev/null
+++ b/packages/cli-v3/install-mcp.sh
@@ -0,0 +1,582 @@
+#!/bin/bash
+
+set -e  # Exit on error
+
+# Default target
+TARGET="all"
+
+# Parse command line arguments
+show_help() {
+    echo "🚀 Trigger.dev MCP Server Installer"
+    echo ""
+    echo "Usage: $0 [OPTIONS]"
+    echo ""
+    echo "Options:"
+    echo "  -t, --target TARGET    Install target: claude, claude-desktop, cursor, vscode, crush, windsurf, or all (default: all)"
+    echo "  -h, --help            Show this help message"
+    echo ""
+    echo "Targets:"
+    echo "  claude         Install for Claude Code (~/.claude.json)"
+    echo "  claude-desktop Install for Claude Desktop (~/Library/Application Support/Claude/claude_desktop_config.json)"
+    echo "  cursor         Install for Cursor (~/.cursor/mcp.json)"
+    echo "  vscode         Install for VS Code (~/Library/Application Support/Code/User/mcp.json)"
+    echo "  crush          Install for Crush (~/.config/crush/crush.json)"
+    echo "  windsurf       Install for Windsurf (~/.codeium/windsurf/mcp_config.json)"
+    echo "  all            Install for all supported targets"
+    echo ""
+    echo "Examples:"
+    echo "  $0                         # Install for all targets"
+    echo "  $0 -t claude              # Install only for Claude Code"
+    echo "  $0 -t claude-desktop      # Install only for Claude Desktop"
+    echo "  $0 -t cursor              # Install only for Cursor"
+    echo "  $0 -t vscode              # Install only for VS Code"
+    echo "  $0 -t crush               # Install only for Crush"
+    echo "  $0 -t windsurf            # Install only for Windsurf"
+}
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        -t|--target)
+            TARGET="$2"
+            shift 2
+            ;;
+        -h|--help)
+            show_help
+            exit 0
+            ;;
+        *)
+            echo "❌ Unknown option: $1"
+            echo "Use -h or --help for usage information"
+            exit 1
+            ;;
+    esac
+done
+
+# Validate target
+case $TARGET in
+    claude|claude-desktop|cursor|vscode|crush|windsurf|all)
+        ;;
+    *)
+        echo "❌ Invalid target: $TARGET"
+        echo "Valid targets are: claude, claude-desktop, cursor, vscode, crush, windsurf, all"
+        exit 1
+        ;;
+esac
+
+echo "🚀 Installing Trigger.dev MCP Server for target: $TARGET"
+
+# Get the absolute path to the node binary
+NODE_PATH=$(which node)
+if [ -z "$NODE_PATH" ]; then
+    echo "❌ Error: Node.js not found in PATH"
+    echo "Please ensure Node.js is installed and available in your PATH"
+    exit 1
+fi
+
+# Get the directory where this script is located
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+# Construct the path to the CLI index.js file
+CLI_PATH="$SCRIPT_DIR/dist/esm/index.js"
+
+# Construct the path to the MCP log file
+MCP_LOG_FILE="$SCRIPT_DIR/.mcp.log"
+
+# Make sure the MCP log file exists
+touch "$MCP_LOG_FILE"
+
+# Check if the CLI file exists
+if [ ! -f "$CLI_PATH" ]; then
+    echo "❌ Error: CLI file not found at $CLI_PATH"
+    echo "Make sure to build the CLI first with: pnpm run build"
+    exit 1
+fi
+
+# Ensure the CLI is executable
+chmod +x "$CLI_PATH"
+
+echo "✅ Found Node.js at: $NODE_PATH"
+echo "✅ Found CLI at: $CLI_PATH"
+
+# Function to install for Claude Code
+install_claude() {
+    echo ""
+    echo "🔧 Installing for Claude Code..."
+    
+    local CLAUDE_CONFIG="$HOME/.claude.json"
+    echo "📁 Claude configuration file: $CLAUDE_CONFIG"
+
+    # Check if Claude config exists, create if it doesn't
+    if [ ! -f "$CLAUDE_CONFIG" ]; then
+        echo "📝 Creating new Claude configuration file..."
+        echo '{"mcpServers": {}}' > "$CLAUDE_CONFIG"
+    fi
+
+    # Use Node.js to manipulate the JSON
+    echo "🔧 Updating Claude configuration..."
+
+    node -e "
+    const fs = require('fs');
+    const path = require('path');
+
+    const configPath = '$CLAUDE_CONFIG';
+    const nodePath = '$NODE_PATH';
+    const cliPath = '$CLI_PATH';
+    const logFile = '$MCP_LOG_FILE';
+
+    try {
+        // Read existing config
+        let config;
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf8');
+            config = JSON.parse(configContent);
+        } catch (error) {
+            console.log('📝 Creating new configuration structure...');
+            config = {};
+        }
+
+        // Ensure mcpServers object exists
+        if (!config.mcpServers) {
+            config.mcpServers = {};
+        }
+
+        // Add/update trigger.dev entry
+        config.mcpServers['trigger'] = {
+            command: nodePath,
+            args: [cliPath, 'mcp', '--log-file', logFile, '--api-url', 'http://localhost:3030']
+        };
+
+        // Write back to file with proper formatting
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        
+        console.log('✅ Successfully installed Trigger.dev MCP server to Claude Code');
+        console.log('');
+        console.log('📋 Claude Code Configuration:');
+        console.log('   • Config file:', configPath);
+        console.log('   • Node.js path:', nodePath);
+        console.log('   • CLI path:', cliPath);
+        console.log('');
+        console.log('💡 Try typing @ in Claude Code and select \"triggerdev\" to get started.');
+        
+    } catch (error) {
+        console.error('❌ Error updating Claude configuration:', error.message);
+        process.exit(1);
+    }
+    "
+}
+
+# Function to install for Claude Desktop
+install_claude_desktop() {
+    echo ""
+    echo "🔧 Installing for Claude Desktop..."
+    
+    local CLAUDE_DESKTOP_DIR="$HOME/Library/Application Support/Claude"
+    local CLAUDE_DESKTOP_CONFIG="$CLAUDE_DESKTOP_DIR/claude_desktop_config.json"
+    
+    echo "📁 Claude Desktop configuration file: $CLAUDE_DESKTOP_CONFIG"
+
+    # Create Claude Desktop directory if it doesn't exist
+    if [ ! -d "$CLAUDE_DESKTOP_DIR" ]; then
+        echo "📝 Creating Claude Desktop configuration directory..."
+        mkdir -p "$CLAUDE_DESKTOP_DIR"
+    fi
+
+    # Check if Claude Desktop config exists, create if it doesn't
+    if [ ! -f "$CLAUDE_DESKTOP_CONFIG" ]; then
+        echo "📝 Creating new Claude Desktop configuration file..."
+        echo '{"mcpServers": {}}' > "$CLAUDE_DESKTOP_CONFIG"
+    fi
+
+    # Use Node.js to manipulate the JSON
+    echo "🔧 Updating Claude Desktop configuration..."
+
+    node -e "
+    const fs = require('fs');
+    const path = require('path');
+
+    const configPath = '$CLAUDE_DESKTOP_CONFIG';
+    const nodePath = '$NODE_PATH';
+    const cliPath = '$CLI_PATH';
+    const logFile = '$MCP_LOG_FILE';
+
+    try {
+        // Read existing config
+        let config;
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf8');
+            config = JSON.parse(configContent);
+        } catch (error) {
+            console.log('📝 Creating new configuration structure...');
+            config = {};
+        }
+
+        // Ensure mcpServers object exists
+        if (!config.mcpServers) {
+            config.mcpServers = {};
+        }
+
+        // Add/update trigger.dev entry
+        config.mcpServers['trigger'] = {
+            command: nodePath,
+            args: [cliPath, 'mcp', '--log-file', logFile, '--api-url', 'http://localhost:3030']
+        };
+
+        // Write back to file with proper formatting
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        
+        console.log('✅ Successfully installed Trigger.dev MCP server to Claude Desktop');
+        console.log('');
+        console.log('📋 Claude Desktop Configuration:');
+        console.log('   • Config file:', configPath);
+        console.log('   • Node.js path:', nodePath);
+        console.log('   • CLI path:', cliPath);
+        console.log('');
+        console.log('💡 You can now use Trigger.dev MCP commands in Claude Desktop.');
+        
+    } catch (error) {
+        console.error('❌ Error updating Claude Desktop configuration:', error.message);
+        process.exit(1);
+    }
+    "
+}
+
+# Function to install for Cursor
+install_cursor() {
+    echo ""
+    echo "🔧 Installing for Cursor..."
+    
+    local CURSOR_DIR="$HOME/.cursor"
+    local CURSOR_CONFIG="$CURSOR_DIR/mcp.json"
+    
+    echo "📁 Cursor configuration file: $CURSOR_CONFIG"
+
+    # Create Cursor directory if it doesn't exist
+    if [ ! -d "$CURSOR_DIR" ]; then
+        echo "📝 Creating Cursor configuration directory..."
+        mkdir -p "$CURSOR_DIR"
+    fi
+
+    # Check if Cursor config exists, create if it doesn't
+    if [ ! -f "$CURSOR_CONFIG" ]; then
+        echo "📝 Creating new Cursor configuration file..."
+        echo '{"mcpServers": {}}' > "$CURSOR_CONFIG"
+    fi
+
+    # Use Node.js to manipulate the JSON
+    echo "🔧 Updating Cursor configuration..."
+
+    node -e "
+    const fs = require('fs');
+    const path = require('path');
+
+    const configPath = '$CURSOR_CONFIG';
+    const nodePath = '$NODE_PATH';
+    const cliPath = '$CLI_PATH';
+    const logFile = '$MCP_LOG_FILE';
+
+    try {
+        // Read existing config
+        let config;
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf8');
+            config = JSON.parse(configContent);
+        } catch (error) {
+            console.log('📝 Creating new configuration structure...');
+            config = {};
+        }
+
+        // Ensure mcpServers object exists
+        if (!config.mcpServers) {
+            config.mcpServers = {};
+        }
+
+        // Add/update trigger.dev entry
+        config.mcpServers['trigger'] = {
+            command: nodePath,
+            args: [cliPath, 'mcp', '--log-file', logFile, '--api-url', 'http://localhost:3030']
+        };
+
+        // Write back to file with proper formatting
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        
+        console.log('✅ Successfully installed Trigger.dev MCP server to Cursor');
+        console.log('');
+        console.log('📋 Cursor Configuration:');
+        console.log('   • Config file:', configPath);
+        console.log('   • Node.js path:', nodePath);
+        console.log('   • CLI path:', cliPath);
+        console.log('');
+        console.log('💡 You can now use Trigger.dev MCP commands in Cursor.');
+        
+    } catch (error) {
+        console.error('❌ Error updating Cursor configuration:', error.message);
+        process.exit(1);
+    }
+    "
+}
+
+# Function to install for VS Code
+install_vscode() {
+    echo ""
+    echo "🔧 Installing for VS Code..."
+    
+    local VSCODE_DIR="$HOME/Library/Application Support/Code/User"
+    local VSCODE_CONFIG="$VSCODE_DIR/mcp.json"
+    
+    echo "📁 VS Code configuration file: $VSCODE_CONFIG"
+
+    # Create VS Code User directory if it doesn't exist
+    if [ ! -d "$VSCODE_DIR" ]; then
+        echo "📝 Creating VS Code User configuration directory..."
+        mkdir -p "$VSCODE_DIR"
+    fi
+
+    # Check if VS Code config exists, create if it doesn't
+    if [ ! -f "$VSCODE_CONFIG" ]; then
+        echo "📝 Creating new VS Code configuration file..."
+        echo '{"servers": {}}' > "$VSCODE_CONFIG"
+    fi
+
+    # Use Node.js to manipulate the JSON
+    echo "🔧 Updating VS Code configuration..."
+
+    node -e "
+    const fs = require('fs');
+    const path = require('path');
+
+    const configPath = '$VSCODE_CONFIG';
+    const nodePath = '$NODE_PATH';
+    const cliPath = '$CLI_PATH';
+    const logFile = '$MCP_LOG_FILE';
+
+    try {
+        // Read existing config
+        let config;
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf8');
+            config = JSON.parse(configContent);
+        } catch (error) {
+            console.log('📝 Creating new configuration structure...');
+            config = {};
+        }
+
+        // Ensure servers object exists
+        if (!config.servers) {
+            config.servers = {};
+        }
+
+        // Add/update trigger.dev entry
+        config.servers['trigger'] = {
+            command: nodePath,
+            args: [cliPath, 'mcp', '--log-file', logFile, '--api-url', 'http://localhost:3030']
+        };
+
+        // Write back to file with proper formatting
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        
+        console.log('✅ Successfully installed Trigger.dev MCP server to VS Code');
+        console.log('');
+        console.log('📋 VS Code Configuration:');
+        console.log('   • Config file:', configPath);
+        console.log('   • Node.js path:', nodePath);
+        console.log('   • CLI path:', cliPath);
+        console.log('');
+        console.log('💡 You can now use Trigger.dev MCP commands in VS Code.');
+        
+    } catch (error) {
+        console.error('❌ Error updating VS Code configuration:', error.message);
+        process.exit(1);
+    }
+    "
+}
+
+# Function to install for Crush
+install_crush() {
+    echo ""
+    echo "🔧 Installing for Crush..."
+    
+    local CRUSH_DIR="$HOME/.config/crush"
+    local CRUSH_CONFIG="$CRUSH_DIR/crush.json"
+    
+    echo "📁 Crush configuration file: $CRUSH_CONFIG"
+
+    # Create Crush config directory if it doesn't exist
+    if [ ! -d "$CRUSH_DIR" ]; then
+        echo "📝 Creating Crush configuration directory..."
+        mkdir -p "$CRUSH_DIR"
+    fi
+
+    # Check if Crush config exists, create if it doesn't
+    if [ ! -f "$CRUSH_CONFIG" ]; then
+        echo "📝 Creating new Crush configuration file..."
+        echo '{"$schema": "https://charm.land/crush.json", "mcp": {}}' > "$CRUSH_CONFIG"
+    fi
+
+    # Use Node.js to manipulate the JSON
+    echo "🔧 Updating Crush configuration..."
+
+    node -e "
+    const fs = require('fs');
+    const path = require('path');
+
+    const configPath = '$CRUSH_CONFIG';
+    const nodePath = '$NODE_PATH';
+    const cliPath = '$CLI_PATH';
+    const logFile = '$MCP_LOG_FILE';
+
+    try {
+        // Read existing config
+        let config;
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf8');
+            config = JSON.parse(configContent);
+        } catch (error) {
+            console.log('📝 Creating new configuration structure...');
+            config = {};
+        }
+
+        // Ensure schema and mcp object exists
+        if (!config['\$schema']) {
+            config['\$schema'] = 'https://charm.land/crush.json';
+        }
+        if (!config.mcp) {
+            config.mcp = {};
+        }
+
+        // Add/update trigger.dev entry
+        config.mcp['trigger'] = {
+            type: 'stdio',
+            command: nodePath,
+            args: [cliPath, 'mcp', '--log-file', logFile, '--api-url', 'http://localhost:3030']
+        };
+
+        // Write back to file with proper formatting
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        
+        console.log('✅ Successfully installed Trigger.dev MCP server to Crush');
+        console.log('');
+        console.log('📋 Crush Configuration:');
+        console.log('   • Config file:', configPath);
+        console.log('   • Node.js path:', nodePath);
+        console.log('   • CLI path:', cliPath);
+        console.log('');
+        console.log('💡 You can now use Trigger.dev MCP commands in Crush.');
+        
+    } catch (error) {
+        console.error('❌ Error updating Crush configuration:', error.message);
+        process.exit(1);
+    }
+    "
+}
+
+# Function to install for Windsurf
+install_windsurf() {
+    echo ""
+    echo "🔧 Installing for Windsurf..."
+    
+    local WINDSURF_DIR="$HOME/.codeium/windsurf"
+    local WINDSURF_CONFIG="$WINDSURF_DIR/mcp_config.json"
+    
+    echo "📁 Windsurf configuration file: $WINDSURF_CONFIG"
+
+    # Create Windsurf config directory if it doesn't exist
+    if [ ! -d "$WINDSURF_DIR" ]; then
+        echo "📝 Creating Windsurf configuration directory..."
+        mkdir -p "$WINDSURF_DIR"
+    fi
+
+    # Check if Windsurf config exists, create if it doesn't
+    if [ ! -f "$WINDSURF_CONFIG" ]; then
+        echo "📝 Creating new Windsurf configuration file..."
+        echo '{"mcpServers": {}}' > "$WINDSURF_CONFIG"
+    fi
+
+    # Use Node.js to manipulate the JSON
+    echo "🔧 Updating Windsurf configuration..."
+
+    node -e "
+    const fs = require('fs');
+    const path = require('path');
+
+    const configPath = '$WINDSURF_CONFIG';
+    const nodePath = '$NODE_PATH';
+    const cliPath = '$CLI_PATH';
+    const logFile = '$MCP_LOG_FILE';
+
+    try {
+        // Read existing config
+        let config;
+        try {
+            const configContent = fs.readFileSync(configPath, 'utf8');
+            config = JSON.parse(configContent);
+        } catch (error) {
+            console.log('📝 Creating new configuration structure...');
+            config = {};
+        }
+
+        // Ensure mcpServers object exists
+        if (!config.mcpServers) {
+            config.mcpServers = {};
+        }
+
+        // Add/update trigger.dev entry
+        config.mcpServers['trigger'] = {
+            command: nodePath,
+            args: [cliPath, 'mcp', '--log-file', logFile, '--api-url', 'http://localhost:3030']
+        };
+
+        // Write back to file with proper formatting
+        fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+        
+        console.log('✅ Successfully installed Trigger.dev MCP server to Windsurf');
+        console.log('');
+        console.log('📋 Windsurf Configuration:');
+        console.log('   • Config file:', configPath);
+        console.log('   • Node.js path:', nodePath);
+        console.log('   • CLI path:', cliPath);
+        console.log('');
+        console.log('💡 You can now use Trigger.dev MCP commands in Windsurf.');
+        
+    } catch (error) {
+        console.error('❌ Error updating Windsurf configuration:', error.message);
+        process.exit(1);
+    }
+    "
+}
+
+# Install based on target
+case $TARGET in
+    claude)
+        install_claude
+        ;;
+    claude-desktop)
+        install_claude_desktop
+        ;;
+    cursor)
+        install_cursor
+        ;;
+    vscode)
+        install_vscode
+        ;;
+    crush)
+        install_crush
+        ;;
+    windsurf)
+        install_windsurf
+        ;;
+    all)
+        install_claude
+        install_claude_desktop
+        install_cursor
+        install_vscode
+        install_crush
+        install_windsurf
+        ;;
+esac
+
+echo ""
+echo "🎉 Installation complete!"
+echo ""
+echo "🔍 You can test the MCP server with:"
+echo "   pnpm run inspector"
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
index d61340cb530..2ed11d197f0 100644
--- a/packages/cli-v3/package.json
+++ b/packages/cli-v3/package.json
@@ -1,7 +1,7 @@
 {
   "name": "trigger.dev",
-  "version": "4.0.0-v4-beta.24",
-  "description": "A Command-Line Interface for Trigger.dev (v3) projects",
+  "version": "4.4.1",
+  "description": "A Command-Line Interface for Trigger.dev projects",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -12,6 +12,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "mcpName": "io.github.triggerdotdev/trigger.dev",
   "keywords": [
     "typescript",
     "trigger.dev",
@@ -75,26 +76,26 @@
     "dev": "tshy --watch",
     "test": "vitest",
     "test:e2e": "vitest --run -c ./e2e/vitest.config.ts",
-    "update-version": "tsx ../../scripts/updateVersion.ts"
+    "update-version": "tsx ../../scripts/updateVersion.ts",
+    "install-mcp": "./install-mcp.sh",
+    "inspector": "npx @modelcontextprotocol/inspector dist/esm/index.js mcp --log-file .mcp.log --api-url http://localhost:3030"
   },
   "dependencies": {
-    "@clack/prompts": "^0.10.0",
+    "@clack/prompts": "0.11.0",
     "@depot/cli": "0.0.1-cli.2.80.0",
-    "@modelcontextprotocol/sdk": "^1.6.1",
+    "@modelcontextprotocol/sdk": "^1.25.2",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.52.1",
-    "@opentelemetry/exporter-logs-otlp-http": "0.52.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/instrumentation-fetch": "0.52.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/sdk-logs": "0.52.1",
-    "@opentelemetry/sdk-node": "0.52.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/sdk-trace-node": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/build": "workspace:4.0.0-v4-beta.24",
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.24",
+    "@opentelemetry/api-logs": "0.203.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
+    "@opentelemetry/instrumentation": "0.203.0",
+    "@opentelemetry/instrumentation-fetch": "0.203.0",
+    "@opentelemetry/resources": "2.0.1",
+    "@opentelemetry/sdk-trace-node": "2.0.1",
+    "@opentelemetry/semantic-conventions": "1.36.0",
+    "@s2-dev/streamstore": "^0.17.6",
+    "@trigger.dev/build": "workspace:4.4.1",
+    "@trigger.dev/core": "workspace:4.4.1",
+    "@trigger.dev/schema-to-json": "workspace:4.4.1",
     "ansi-escapes": "^7.0.0",
     "braces": "^3.0.3",
     "c12": "^1.11.1",
@@ -102,6 +103,7 @@
     "chokidar": "^3.6.0",
     "cli-table3": "^0.6.3",
     "commander": "^9.4.1",
+    "confbox": "^0.2.2",
     "defu": "^6.1.4",
     "dotenv": "^16.4.5",
     "esbuild": "^0.23.0",
@@ -111,9 +113,11 @@
     "git-last-commit": "^1.0.1",
     "gradient-string": "^2.0.2",
     "has-flag": "^5.0.1",
+    "ignore": "^7.0.5",
     "import-in-the-middle": "1.11.0",
     "import-meta-resolve": "^4.1.0",
     "ini": "^5.0.0",
+    "json-stable-stringify": "^1.3.0",
     "jsonc-parser": "3.2.1",
     "magicast": "^0.3.4",
     "minimatch": "^10.0.1",
@@ -132,13 +136,15 @@
     "socket.io-client": "4.7.5",
     "source-map-support": "0.5.21",
     "std-env": "^3.7.0",
+    "strip-ansi": "^7.1.0",
     "supports-color": "^10.0.0",
+    "tar": "^7.5.4",
     "tiny-invariant": "^1.2.0",
     "tinyexec": "^0.3.1",
     "tinyglobby": "^0.2.10",
     "ws": "^8.18.0",
     "xdg-app-paths": "^8.3.0",
-    "zod": "3.23.8",
+    "zod": "3.25.76",
     "zod-validation-error": "^1.5.0"
   },
   "engines": {
diff --git a/packages/cli-v3/src/apiClient.ts b/packages/cli-v3/src/apiClient.ts
index 5056c1c47a3..e099260203f 100644
--- a/packages/cli-v3/src/apiClient.ts
+++ b/packages/cli-v3/src/apiClient.ts
@@ -1,5 +1,7 @@
 import {
   CreateAuthorizationCodeResponseSchema,
+  CreateArtifactRequestBody,
+  CreateArtifactResponseBody,
   CreateBackgroundWorkerRequestBody,
   CreateBackgroundWorkerResponse,
   DevConfigResponseBody,
@@ -22,7 +24,6 @@ import {
   PromoteDeploymentResponseBody,
   StartDeploymentIndexingRequestBody,
   StartDeploymentIndexingResponseBody,
-  TaskRunExecution,
   TriggerTaskRequestBody,
   TriggerTaskResponse,
   UpsertBranchRequestBody,
@@ -31,6 +32,14 @@ import {
   WorkersCreateRequestBody,
   WorkersCreateResponseBody,
   WorkersListResponseBody,
+  CreateProjectRequestBody,
+  GetOrgsResponseBody,
+  GetWorkerByTagResponse,
+  GetJWTRequestBody,
+  GetJWTResponse,
+  ApiBranchListResponseBody,
+  GenerateRegistryCredentialsResponseBody,
+  RemoteBuildProviderStatusResponseBody,
 } from "@trigger.dev/core/v3";
 import {
   WorkloadDebugLogRequestBody,
@@ -45,6 +54,7 @@ import { ApiResult, wrapZodFetch, zodfetchSSE } from "@trigger.dev/core/v3/zodfe
 import { EventSource } from "eventsource";
 import { z } from "zod";
 import { logger } from "./utilities/logger.js";
+import { VERSION } from "./version.js";
 
 export class CliApiClient {
   private engineURL: string;
@@ -136,6 +146,75 @@ export class CliApiClient {
     });
   }
 
+  async getOrgs() {
+    if (!this.accessToken) {
+      throw new Error("getOrgs: No access token");
+    }
+
+    return wrapZodFetch(GetOrgsResponseBody, `${this.apiURL}/api/v1/orgs`, {
+      headers: {
+        Authorization: `Bearer ${this.accessToken}`,
+        "Content-Type": "application/json",
+      },
+    });
+  }
+
+  async createProject(orgParam: string, body: CreateProjectRequestBody) {
+    if (!this.accessToken) {
+      throw new Error("createProject: No access token");
+    }
+
+    return wrapZodFetch(GetProjectResponseBody, `${this.apiURL}/api/v1/orgs/${orgParam}/projects`, {
+      method: "POST",
+      headers: this.getHeaders(),
+      body: JSON.stringify(body),
+    });
+  }
+
+  async getWorkerByTag(projectRef: string, envName: string, tagName: string = "current") {
+    if (!this.accessToken) {
+      throw new Error("getWorkerByTag: No access token");
+    }
+
+    return wrapZodFetch(
+      GetWorkerByTagResponse,
+      `${this.apiURL}/api/v1/projects/${projectRef}/${envName}/workers/${tagName}`,
+      {
+        headers: this.getHeaders(),
+      }
+    );
+  }
+
+  async getJWT(projectRef: string, envName: string, body: GetJWTRequestBody) {
+    if (!this.accessToken) {
+      throw new Error("getJWT: No access token");
+    }
+
+    return wrapZodFetch(
+      GetJWTResponse,
+      `${this.apiURL}/api/v1/projects/${projectRef}/${envName}/jwt`,
+      {
+        method: "POST",
+        headers: this.getHeaders(),
+        body: JSON.stringify(body),
+      }
+    );
+  }
+
+  async getDevStatus(projectRef: string) {
+    if (!this.accessToken) {
+      throw new Error("getDevStatus: No access token");
+    }
+
+    return wrapZodFetch(
+      z.object({ isConnected: z.boolean() }),
+      `${this.apiURL}/api/v1/projects/${projectRef}/dev-status`,
+      {
+        headers: this.getHeaders(),
+      }
+    );
+  }
+
   async createBackgroundWorker(projectRef: string, body: CreateBackgroundWorkerRequestBody) {
     if (!this.accessToken) {
       throw new Error("createBackgroundWorker: No access token");
@@ -204,6 +283,20 @@ export class CliApiClient {
     );
   }
 
+  async listBranches(projectRef: string) {
+    if (!this.accessToken) {
+      throw new Error("listBranches: No access token");
+    }
+
+    return wrapZodFetch(
+      ApiBranchListResponseBody,
+      `${this.apiURL}/api/v1/projects/${projectRef}/branches`,
+      {
+        headers: this.getHeaders(),
+      }
+    );
+  }
+
   async getEnvironmentVariables(projectRef: string) {
     if (!this.accessToken) {
       throw new Error("getEnvironmentVariables: No access token");
@@ -238,6 +331,49 @@ export class CliApiClient {
     );
   }
 
+  async getRemoteBuildProviderStatus() {
+    return wrapZodFetch(
+      RemoteBuildProviderStatusResponseBody,
+      `${this.apiURL}/api/v1/remote-build-provider-status`,
+      {
+        method: "GET",
+        headers: {
+          ...this.getHeaders(),
+          // probably a good idea to add this to the other requests too
+          "x-trigger-cli-version": VERSION,
+        },
+      }
+    );
+  }
+
+  async generateRegistryCredentials(deploymentId: string) {
+    if (!this.accessToken) {
+      throw new Error("generateRegistryCredentials: No access token");
+    }
+
+    return wrapZodFetch(
+      GenerateRegistryCredentialsResponseBody,
+      `${this.apiURL}/api/v1/deployments/${deploymentId}/generate-registry-credentials`,
+      {
+        method: "POST",
+        headers: this.getHeaders(),
+        body: "{}",
+      }
+    );
+  }
+
+  async createArtifact(body: CreateArtifactRequestBody) {
+    if (!this.accessToken) {
+      throw new Error("createArtifact: No access token");
+    }
+
+    return wrapZodFetch(CreateArtifactResponseBody, `${this.apiURL}/api/v1/artifacts`, {
+      method: "POST",
+      headers: this.getHeaders(),
+      body: JSON.stringify(body),
+    });
+  }
+
   async initializeDeployment(body: InitializeDeploymentRequestBody) {
     if (!this.accessToken) {
       throw new Error("initializeDeployment: No access token");
diff --git a/packages/cli-v3/src/build/buildWorker.ts b/packages/cli-v3/src/build/buildWorker.ts
index dd1a8ef0eef..b1ae5209eef 100644
--- a/packages/cli-v3/src/build/buildWorker.ts
+++ b/packages/cli-v3/src/build/buildWorker.ts
@@ -12,12 +12,13 @@ import { join, relative, sep } from "node:path";
 import { generateContainerfile } from "../deploy/buildImage.js";
 import { writeFile } from "node:fs/promises";
 import { buildManifestToJSON } from "../utilities/buildManifest.js";
-import { readPackageJSON, writePackageJSON } from "pkg-types";
+import { readPackageJSON } from "pkg-types";
 import { writeJSONFile } from "../utilities/fileSystem.js";
 import { isWindows } from "std-env";
 import { pathToFileURL } from "node:url";
 import { logger } from "../utilities/logger.js";
 import { SdkVersionExtractor } from "./plugins.js";
+import { spinner } from "../utilities/windows.js";
 
 export type BuildWorkerEventListener = {
   onBundleStart?: () => void;
@@ -36,6 +37,7 @@ export type BuildWorkerOptions = {
   forcedExternals?: string[];
   baseImageNode?: string;
   containerfileModule?: string;
+  plain?: boolean;
 };
 
 export async function buildWorker(options: BuildWorkerOptions) {
@@ -50,7 +52,21 @@ export async function buildWorker(options: BuildWorkerOptions) {
     resolvedConfig,
     options.forcedExternals
   );
-  const buildContext = createBuildContext(options.target, resolvedConfig);
+  const buildContext = createBuildContext(options.target, resolvedConfig, {
+    logger: options.plain
+      ? {
+          debug: (...args) => console.log(...args),
+          log: (...args) => console.log(...args),
+          warn: (...args) => console.log(...args),
+          progress: (message) => console.log(message),
+          spinner: (message) => {
+            const $spinner = spinner({ plain: true });
+            $spinner.start(message);
+            return $spinner;
+          },
+        }
+      : undefined,
+  });
   buildContext.prependExtension(externalsExtension);
   await notifyExtensionOnBuildStart(buildContext);
   const pluginsFromExtensions = resolvePluginsForContext(buildContext);
@@ -184,17 +200,21 @@ async function writeDeployFiles({
     ) ?? {};
 
   // Step 3: Write the resolved dependencies to the package.json file
-  await writePackageJSON(join(outputPath, "package.json"), {
-    ...packageJson,
-    name: packageJson.name ?? "trigger-project",
-    dependencies: {
-      ...dependencies,
+  await writeJSONFile(
+    join(outputPath, "package.json"),
+    {
+      ...packageJson,
+      name: packageJson.name ?? "trigger-project",
+      dependencies: {
+        ...dependencies,
+      },
+      trustedDependencies: Object.keys(dependencies).sort(),
+      devDependencies: {},
+      peerDependencies: {},
+      scripts: {},
     },
-    trustedDependencies: Object.keys(dependencies),
-    devDependencies: {},
-    peerDependencies: {},
-    scripts: {},
-  });
+    true
+  );
 
   await writeJSONFile(join(outputPath, "build.json"), buildManifestToJSON(buildManifest));
   await writeJSONFile(join(outputPath, "metafile.json"), bundleResult.metafile);
diff --git a/packages/cli-v3/src/build/bundle.ts b/packages/cli-v3/src/build/bundle.ts
index d8687922d15..4d1cfd53f86 100644
--- a/packages/cli-v3/src/build/bundle.ts
+++ b/packages/cli-v3/src/build/bundle.ts
@@ -3,8 +3,8 @@ import { DEFAULT_RUNTIME, ResolvedConfig } from "@trigger.dev/core/v3/build";
 import { BuildManifest, BuildTarget, TaskFile } from "@trigger.dev/core/v3/schemas";
 import * as esbuild from "esbuild";
 import { createHash } from "node:crypto";
-import { join, relative, resolve } from "node:path";
-import { createFile } from "../utilities/fileSystem.js";
+import { basename, join, relative, resolve } from "node:path";
+import { createFile, createFileWithStore } from "../utilities/fileSystem.js";
 import { logger } from "../utilities/logger.js";
 import { resolveFileSources } from "../utilities/sourceFiles.js";
 import { VERSION } from "../version.js";
@@ -37,6 +37,8 @@ export interface BundleOptions {
   jsxAutomatic?: boolean;
   watch?: boolean;
   plugins?: esbuild.Plugin[];
+  /** Shared store directory for deduplicating chunk files via hardlinks */
+  storeDir?: string;
 }
 
 export type BundleResult = {
@@ -51,6 +53,8 @@ export type BundleResult = {
   indexControllerEntryPoint: string | undefined;
   initEntryPoint: string | undefined;
   stop: (() => Promise<void>) | undefined;
+  /** Maps output file paths to their content hashes for deduplication */
+  outputHashes: Record<string, string>;
 };
 
 export class BundleError extends Error {
@@ -159,7 +163,8 @@ export async function bundleWorker(options: BundleOptions): Promise<BundleResult
     options.target,
     options.cwd,
     options.resolvedConfig,
-    result
+    result,
+    options.storeDir
   );
 
   if (!bundleResult) {
@@ -176,8 +181,14 @@ async function createBuildOptions(
   const customConditions = options.resolvedConfig.build?.conditions ?? [];
   const conditions = [...customConditions, "trigger.dev", "module", "node"];
 
-  const keepNames = options.resolvedConfig.build?.experimental_keepNames ?? false;
-  const minify = options.resolvedConfig.build?.experimental_minify ?? false;
+  const keepNames =
+    options.resolvedConfig.build?.keepNames ??
+    options.resolvedConfig.build?.experimental_keepNames ??
+    true;
+  const minify =
+    options.resolvedConfig.build?.minify ??
+    options.resolvedConfig.build?.experimental_minify ??
+    false;
 
   const $buildPlugins = await buildPlugins(options.target, options.resolvedConfig);
 
@@ -227,14 +238,23 @@ export async function getBundleResultFromBuild(
   target: BuildTarget,
   workingDir: string,
   resolvedConfig: ResolvedConfig,
-  result: esbuild.BuildResult<{ metafile: true; write: false }>
+  result: esbuild.BuildResult<{ metafile: true; write: false }>,
+  storeDir?: string
 ): Promise<Omit<BundleResult, "stop"> | undefined> {
   const hasher = createHash("md5");
+  const outputHashes: Record<string, string> = {};
 
   for (const outputFile of result.outputFiles) {
     hasher.update(outputFile.hash);
-
-    await createFile(outputFile.path, outputFile.contents);
+    // Store the hash for each output file (keyed by path)
+    outputHashes[outputFile.path] = outputFile.hash;
+
+    if (storeDir) {
+      // Use content-addressable store with esbuild's built-in hash for ALL files
+      await createFileWithStore(outputFile.path, outputFile.contents, storeDir, outputFile.hash);
+    } else {
+      await createFile(outputFile.path, outputFile.contents);
+    }
   }
 
   const files: Array<{ entry: string; out: string }> = [];
@@ -302,6 +322,7 @@ export async function getBundleResultFromBuild(
     initEntryPoint,
     contentHash: hasher.digest("hex"),
     metafile: result.metafile,
+    outputHashes,
   };
 }
 
@@ -348,6 +369,7 @@ export async function createBuildManifestFromBundle({
   target,
   envVars,
   sdkVersion,
+  storeDir,
 }: {
   bundle: BundleResult;
   destination: string;
@@ -358,6 +380,7 @@ export async function createBuildManifestFromBundle({
   target: BuildTarget;
   envVars?: Record<string, string>;
   sdkVersion?: string;
+  storeDir?: string;
 }): Promise<BuildManifest> {
   const buildManifest: BuildManifest = {
     contentHash: bundle.contentHash,
@@ -391,11 +414,14 @@ export async function createBuildManifestFromBundle({
     otelImportHook: {
       include: resolvedConfig.instrumentedPackageNames ?? [],
     },
+    // `outputHashes` is only needed for dev builds for the deduplication mechanism during rebuilds.
+    // For deploys builds, we omit it to ensure deterministic builds
+    outputHashes: target === "dev" ? bundle.outputHashes : {},
   };
 
   if (!workerDir) {
     return buildManifest;
   }
 
-  return copyManifestToDir(buildManifest, destination, workerDir);
+  return copyManifestToDir(buildManifest, destination, workerDir, storeDir);
 }
diff --git a/packages/cli-v3/src/build/extensions.ts b/packages/cli-v3/src/build/extensions.ts
index 7114da03e37..e38fe903d84 100644
--- a/packages/cli-v3/src/build/extensions.ts
+++ b/packages/cli-v3/src/build/extensions.ts
@@ -1,4 +1,5 @@
 import {
+  type BuildLogger,
   BuildContext,
   BuildExtension,
   BuildLayer,
@@ -9,7 +10,8 @@ import { BuildManifest, BuildTarget } from "@trigger.dev/core/v3/schemas";
 import * as esbuild from "esbuild";
 import { logger } from "../utilities/logger.js";
 import { resolveModule } from "./resolveModule.js";
-import { log, spinner } from "@clack/prompts";
+import { log } from "@clack/prompts";
+import { spinner } from "../utilities/windows.js";
 
 export interface InternalBuildContext extends BuildContext {
   getLayers(): BuildLayer[];
@@ -54,12 +56,25 @@ export async function notifyExtensionOnBuildComplete(
 
 export function createBuildContext(
   target: BuildTarget,
-  config: ResolvedConfig
+  config: ResolvedConfig,
+  options?: { logger?: BuildLogger }
 ): InternalBuildContext {
   const layers: BuildLayer[] = [];
   const registeredPlugins: RegisteredPlugin[] = [];
   const extensions: BuildExtension[] = config.build.extensions ?? [];
 
+  const buildLogger = options?.logger ?? {
+    debug: (...args) => logger.debug(...args),
+    log: (...args) => logger.log(...args),
+    warn: (...args) => logger.warn(...args),
+    progress: (message) => log.message(message),
+    spinner: (message) => {
+      const $spinner = spinner();
+      $spinner.start(message);
+      return $spinner;
+    },
+  };
+
   return {
     target,
     config: config,
@@ -99,17 +114,7 @@ export function createBuildContext(
     prependExtension(extension) {
       extensions.unshift(extension);
     },
-    logger: {
-      debug: (...args) => logger.debug(...args),
-      log: (...args) => logger.log(...args),
-      warn: (...args) => logger.warn(...args),
-      progress: (message) => log.message(message),
-      spinner: (message) => {
-        const $spinner = spinner();
-        $spinner.start(message);
-        return $spinner;
-      },
-    },
+    logger: buildLogger,
   };
 }
 
diff --git a/packages/cli-v3/src/build/externals.ts b/packages/cli-v3/src/build/externals.ts
index 90a2e075144..c35f90cf182 100644
--- a/packages/cli-v3/src/build/externals.ts
+++ b/packages/cli-v3/src/build/externals.ts
@@ -159,11 +159,16 @@ function createExternalsCollector(
           isExternalCache.clear();
         });
 
+        const autoDetectExternal =
+          resolvedConfig.build?.autoDetectExternal ??
+          resolvedConfig.build?.experimental_autoDetectExternal ??
+          true;
+
         build.onEnd(async () => {
           logger.debug("[externals][onEnd] Collected externals", {
             externals,
             maybeExternals,
-            autoDetectExternal: !!resolvedConfig.build?.experimental_autoDetectExternal,
+            autoDetectExternal,
             packageJsonCache: packageJsonCache.size,
             isExternalCache: isExternalCache.size,
           });
@@ -265,7 +270,7 @@ function createExternalsCollector(
           });
         });
 
-        if (resolvedConfig.build?.experimental_autoDetectExternal) {
+        if (autoDetectExternal) {
           build.onResolve(
             { filter: /.*/, namespace: "file" },
             async (args: esbuild.OnResolveArgs): Promise<esbuild.OnResolveResult | undefined> => {
diff --git a/packages/cli-v3/src/build/manifests.ts b/packages/cli-v3/src/build/manifests.ts
index 04fe2e3f6c0..f1188233a5f 100644
--- a/packages/cli-v3/src/build/manifests.ts
+++ b/packages/cli-v3/src/build/manifests.ts
@@ -1,16 +1,26 @@
 import { BuildManifest } from "@trigger.dev/core/v3/schemas";
-import { cp } from "node:fs/promises";
+import { cp, link, mkdir, readdir, readFile } from "node:fs/promises";
+import { createHash } from "node:crypto";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
 import { logger } from "../utilities/logger.js";
+import { sanitizeHashForFilename } from "../utilities/fileSystem.js";
 
 export async function copyManifestToDir(
   manifest: BuildManifest,
   source: string,
-  destination: string
+  destination: string,
+  storeDir?: string
 ): Promise<BuildManifest> {
-  // Copy the dir in destination to workerDir
-  await cp(source, destination, { recursive: true });
+  // Copy the dir from source to destination
+  // If storeDir is provided, create hardlinks for files that exist in the store
+  if (storeDir) {
+    await copyDirWithStore(source, destination, storeDir, manifest.outputHashes);
+  } else {
+    await cp(source, destination, { recursive: true });
+  }
 
-  logger.debug("Copied manifest to dir", { source, destination });
+  logger.debug("Copied manifest to dir", { source, destination, storeDir });
 
   // Then update the manifest to point to the new workerDir
   const updatedManifest = { ...manifest };
@@ -37,3 +47,68 @@ export async function copyManifestToDir(
 
   return updatedManifest;
 }
+
+/**
+ * Computes a hash of file contents to use as content-addressable key.
+ * This is a fallback for when outputHashes is not available.
+ */
+async function computeFileHash(filePath: string): Promise<string> {
+  const contents = await readFile(filePath);
+  return createHash("sha256").update(contents as Uint8Array).digest("hex").slice(0, 16);
+}
+
+/**
+ * Recursively copies a directory, using hardlinks for files that exist in the store.
+ * This preserves disk space savings from the content-addressable store.
+ *
+ * @param source - Source directory path
+ * @param destination - Destination directory path
+ * @param storeDir - Content-addressable store directory
+ * @param outputHashes - Optional map of file paths to their content hashes (from BuildManifest)
+ */
+async function copyDirWithStore(
+  source: string,
+  destination: string,
+  storeDir: string,
+  outputHashes?: Record<string, string>
+): Promise<void> {
+  await mkdir(destination, { recursive: true });
+
+  const entries = await readdir(source, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const sourcePath = join(source, entry.name);
+    const destPath = join(destination, entry.name);
+
+    if (entry.isDirectory()) {
+      // Recursively copy subdirectories
+      await copyDirWithStore(sourcePath, destPath, storeDir, outputHashes);
+    } else if (entry.isFile()) {
+      // Try to get hash from manifest first, otherwise compute it
+      const contentHash = outputHashes?.[sourcePath] ?? (await computeFileHash(sourcePath));
+      // Sanitize hash to be filesystem-safe (base64 can contain / and +)
+      const safeHash = sanitizeHashForFilename(contentHash);
+      const storePath = join(storeDir, safeHash);
+
+      if (existsSync(storePath)) {
+        // Create hardlink to store file
+        // Fall back to copy if hardlink fails (e.g., on Windows or cross-device)
+        try {
+          await link(storePath, destPath);
+        } catch (linkError) {
+          try {
+            await cp(storePath, destPath);
+          } catch (copyError) {
+            throw linkError; // Rethrow original error if copy also fails
+          }
+        }
+      } else {
+        // File wasn't in the store - copy normally
+        await cp(sourcePath, destPath);
+      }
+    } else if (entry.isSymbolicLink()) {
+      // Preserve symbolic links (e.g., node_modules links)
+      await cp(sourcePath, destPath, { verbatimSymlinks: true });
+    }
+  }
+}
diff --git a/packages/cli-v3/src/cli/common.ts b/packages/cli-v3/src/cli/common.ts
index b607ca07ff5..f251e4e5ef4 100644
--- a/packages/cli-v3/src/cli/common.ts
+++ b/packages/cli-v3/src/cli/common.ts
@@ -1,15 +1,13 @@
-import { flattenAttributes } from "@trigger.dev/core/v3";
-import { recordSpanException } from "@trigger.dev/core/v3/workers";
+import { outro } from "@clack/prompts";
 import { Command } from "commander";
 import { z } from "zod";
-import { getTracer, provider } from "../telemetry/tracing.js";
 import { fromZodError } from "zod-validation-error";
-import { logger } from "../utilities/logger.js";
-import { outro } from "@clack/prompts";
-import { chalkError } from "../utilities/cliOutput.js";
+import { BundleError } from "../build/bundle.js";
 import { CLOUD_API_URL } from "../consts.js";
+import { chalkError } from "../utilities/cliOutput.js";
 import { readAuthConfigCurrentProfileName } from "../utilities/configFiles.js";
-import { BundleError } from "../build/bundle.js";
+import { logger } from "../utilities/logger.js";
+import { trace } from "@opentelemetry/api";
 
 export const CommonCommandOptions = z.object({
   apiUrl: z.string().optional(),
@@ -39,69 +37,53 @@ export class OutroCommandError extends SkipCommandError {}
 export async function handleTelemetry(action: () => Promise<void>) {
   try {
     await action();
-
-    await provider?.forceFlush();
   } catch (e) {
-    await provider?.forceFlush();
-
     process.exitCode = 1;
   }
 }
 
-export const tracer = getTracer();
-
 export async function wrapCommandAction<T extends z.AnyZodObject, TResult>(
   name: string,
   schema: T,
   options: unknown,
   action: (opts: z.output<T>) => Promise<TResult>
 ): Promise<TResult | undefined> {
-  return await tracer.startActiveSpan(name, async (span) => {
-    try {
-      const parsedOptions = schema.safeParse(options);
-
-      if (!parsedOptions.success) {
-        throw new Error(fromZodError(parsedOptions.error).toString());
-      }
-
-      span.setAttributes({
-        ...flattenAttributes(parsedOptions.data, "cli.options"),
-      });
-
-      logger.loggerLevel = parsedOptions.data.logLevel;
-
-      logger.debug(`Running "${name}" with the following options`, {
-        options: options,
-        spanContext: span?.spanContext(),
-      });
-
-      const result = await action(parsedOptions.data);
+  try {
+    const parsedOptions = schema.safeParse(options);
 
-      span.end();
+    if (!parsedOptions.success) {
+      throw new Error(fromZodError(parsedOptions.error).toString());
+    }
 
-      return result;
-    } catch (e) {
-      if (e instanceof SkipLoggingError) {
-        recordSpanException(span, e);
-      } else if (e instanceof OutroCommandError) {
-        outro("Operation cancelled");
-      } else if (e instanceof SkipCommandError) {
-        // do nothing
-      } else if (e instanceof BundleError) {
-        process.exit(1);
-      } else {
-        recordSpanException(span, e);
+    logger.loggerLevel = parsedOptions.data.logLevel;
 
-        logger.log(`${chalkError("X Error:")} ${e instanceof Error ? e.message : String(e)}`);
-      }
+    logger.debug(`Running "${name}" with the following options`, {
+      options: options,
+    });
 
-      span.end();
+    const result = await action(parsedOptions.data);
 
-      throw e;
+    return result;
+  } catch (e) {
+    if (e instanceof SkipLoggingError) {
+      // do nothing
+    } else if (e instanceof OutroCommandError) {
+      outro(e.message ?? "Operation cancelled");
+      process.exit(1);
+    } else if (e instanceof SkipCommandError) {
+      // do nothing
+    } else if (e instanceof BundleError) {
+      process.exit(1);
+    } else {
+      logger.log(`${chalkError("X Error:")} ${e instanceof Error ? e.message : String(e)}`);
     }
-  });
+
+    throw e;
+  }
 }
 
+export const tracer = trace.getTracer("trigger.dev/cli");
+
 export function installExitHandler() {
   process.on("SIGINT", () => {
     process.exit(0);
diff --git a/packages/cli-v3/src/cli/index.ts b/packages/cli-v3/src/cli/index.ts
index 4a575831a52..fc482224e58 100644
--- a/packages/cli-v3/src/cli/index.ts
+++ b/packages/cli-v3/src/cli/index.ts
@@ -1,21 +1,23 @@
 import { Command } from "commander";
+import { configureAnalyzeCommand } from "../commands/analyze.js";
+import { configureDeployCommand } from "../commands/deploy.js";
 import { configureDevCommand } from "../commands/dev.js";
+import { configureEnvCommand } from "../commands/env.js";
 import { configureInitCommand } from "../commands/init.js";
+import { configureListProfilesCommand } from "../commands/list-profiles.js";
 import { configureLoginCommand } from "../commands/login.js";
 import { configureLogoutCommand } from "../commands/logout.js";
+import { configurePreviewCommand } from "../commands/preview.js";
+import { configurePromoteCommand } from "../commands/promote.js";
+import { configureSwitchProfilesCommand } from "../commands/switch.js";
+import { configureUpdateCommand } from "../commands/update.js";
 import { configureWhoamiCommand } from "../commands/whoami.js";
+import { configureMcpCommand } from "../commands/mcp.js";
 import { COMMAND_NAME } from "../consts.js";
-import { configureListProfilesCommand } from "../commands/list-profiles.js";
-import { configureAnalyzeCommand } from "../commands/analyze.js";
-import { configureUpdateCommand } from "../commands/update.js";
 import { VERSION } from "../version.js";
-import { configureDeployCommand } from "../commands/deploy.js";
 import { installExitHandler } from "./common.js";
-import { configureWorkersCommand } from "../commands/workers/index.js";
-import { configureSwitchProfilesCommand } from "../commands/switch.js";
-import { configureTriggerTaskCommand } from "../commands/trigger.js";
-import { configurePromoteCommand } from "../commands/promote.js";
-import { configurePreviewCommand } from "../commands/preview.js";
+import { configureInstallMcpCommand } from "../commands/install-mcp.js";
+import { configureInstallRulesCommand } from "../commands/install-rules.js";
 
 export const program = new Command();
 
@@ -27,6 +29,7 @@ program
 configureLoginCommand(program);
 configureInitCommand(program);
 configureDevCommand(program);
+configureEnvCommand(program);
 configureDeployCommand(program);
 configurePromoteCommand(program);
 configureWhoamiCommand(program);
@@ -36,7 +39,8 @@ configureSwitchProfilesCommand(program);
 configureUpdateCommand(program);
 configurePreviewCommand(program);
 configureAnalyzeCommand(program);
-// configureWorkersCommand(program);
-// configureTriggerTaskCommand(program);
+configureMcpCommand(program);
+configureInstallMcpCommand(program);
+configureInstallRulesCommand(program);
 
 installExitHandler();
diff --git a/packages/cli-v3/src/commands/deploy.ts b/packages/cli-v3/src/commands/deploy.ts
index c7f613d35c1..f68c1a5e3df 100644
--- a/packages/cli-v3/src/commands/deploy.ts
+++ b/packages/cli-v3/src/commands/deploy.ts
@@ -1,19 +1,31 @@
 import { intro, log, outro } from "@clack/prompts";
 import { getBranch, prepareDeploymentError, tryCatch } from "@trigger.dev/core/v3";
-import { InitializeDeploymentResponseBody, CreateBackgroundWorkerRequestBody } from "@trigger.dev/core/v3/schemas";
+import {
+  InitializeDeploymentRequestBody,
+  InitializeDeploymentResponseBody,
+  CreateBackgroundWorkerRequestBody,
+  GitMeta,
+  DeploymentFinalizedEvent,
+  DeploymentEventFromString,
+  DeploymentTriggeredVia,
+} from "@trigger.dev/core/v3/schemas";
 import { Command, Option as CommandOption } from "commander";
-import { resolve, join } from "node:path";
-// import { readdir } from "node:fs/promises";
+import { join, relative, resolve } from "node:path";
 import { isCI } from "std-env";
 import { x } from "tinyexec";
 import { z } from "zod";
+import chalk from "chalk";
 import { CliApiClient } from "../apiClient.js";
 import { buildWorker } from "../build/buildWorker.js";
 import { resolveAlwaysExternal } from "../build/externals.js";
+import { createContextArchive, getArchiveSize } from "../deploy/archiveContext.js";
+import { S2 } from "@s2-dev/streamstore";
+import { mkdir, readFile, unlink } from "node:fs/promises";
 import {
   CommonCommandOptions,
   commonOptions,
   handleTelemetry,
+  OutroCommandError,
   SkipLoggingError,
   wrapCommandAction,
 } from "../cli/common.js";
@@ -26,11 +38,19 @@ import {
   printWarnings,
   saveLogs,
 } from "../deploy/logs.js";
-import { chalkError, cliLink, isLinksSupported, prettyError } from "../utilities/cliOutput.js";
+import {
+  chalkError,
+  chalkGrey,
+  chalkWarning,
+  cliLink,
+  isLinksSupported,
+  prettyError,
+  prettyWarning,
+} from "../utilities/cliOutput.js";
 import { loadDotEnvVars } from "../utilities/dotEnv.js";
 import { isDirectory } from "../utilities/fileSystem.js";
 import { setGithubActionsOutputAndEnvVars } from "../utilities/githubActions.js";
-import { createGitMeta } from "../utilities/gitMeta.js";
+import { createGitMeta, isGitHubActions } from "../utilities/gitMeta.js";
 import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
 import { resolveLocalEnvVars } from "../utilities/localEnvVars.js";
 import { logger } from "../utilities/logger.js";
@@ -55,9 +75,12 @@ const DeployCommandOptions = CommonCommandOptions.extend({
   saveLogs: z.boolean().default(false),
   skipUpdateCheck: z.boolean().default(false),
   skipPromotion: z.boolean().default(false),
-  noCache: z.boolean().default(false),
+  cache: z.boolean().default(true),
   envFile: z.string().optional(),
   // Local build options
+  forceLocalBuild: z.boolean().optional(),
+  localBuild: z.boolean().optional(),
+  useRegistryCache: z.boolean().default(false),
   network: z.enum(["default", "none", "host"]).optional(),
   push: z.boolean().optional(),
   builder: z.string().default("trigger"),
@@ -68,6 +91,13 @@ const DeployCommandOptions = CommonCommandOptions.extend({
   baseImageNode: z.string().optional(),
   containerfileModule: z.string().optional(),
   skipDigest: z.boolean().default(false),
+  nativeBuildServer: z.boolean().default(false),
+  detach: z.boolean().default(false),
+  plain: z.boolean().default(false),
+  compression: z.enum(["zstd", "gzip"]).default("zstd"),
+  cacheCompression: z.enum(["zstd", "gzip"]).default("zstd"),
+  compressionLevel: z.number().optional(),
+  forceCompression: z.boolean().default(true),
 });
 
 type DeployCommandOptions = z.infer<typeof DeployCommandOptions>;
@@ -79,7 +109,7 @@ export function configureDeployCommand(program: Command) {
     commonOptions(
       program
         .command("deploy")
-        .description("Deploy your Trigger.dev v3 project to the cloud.")
+        .description("Deploy your Trigger.dev project to the cloud.")
         .argument("[path]", "The path to the project", ".")
         .option(
           "-e, --env <env>",
@@ -135,11 +165,19 @@ export function configureDeployCommand(program: Command) {
           "Skip sending the image digest when registering (for register-only mode)"
         )
     )
+      .addOption(
+        new CommandOption(
+          "--use-registry-cache",
+          "Use the registry cache when building the image. The registry must be supported as a cache storage backend."
+        ).hideHelp()
+      )
       .addOption(
         new CommandOption(
           "--no-cache",
           "Do not use the cache when building the image. This will slow down the build process but can be useful if you are experiencing issues with the cache."
-        ).hideHelp()
+        )
+          .conflicts("useRegistryCache")
+          .hideHelp()
       )
       .addOption(
         new CommandOption("--load", "Load the built image into your local docker").hideHelp()
@@ -156,7 +194,54 @@ export function configureDeployCommand(program: Command) {
           "If provided, will save logs even for successful builds"
         ).hideHelp()
       )
+      .addOption(
+        new CommandOption(
+          "--compression <algorithm>",
+          "Compression algorithm for image layers: zstd or gzip (default: zstd)"
+        )
+          .choices(["zstd", "gzip"])
+          .hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--cache-compression <algorithm>",
+          "Compression algorithm for build cache: zstd or gzip (default: zstd)"
+        )
+          .choices(["zstd", "gzip"])
+          .hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--compression-level <level>",
+          "The compression level to use when building the image."
+        ).hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--force-compression",
+          "Force recompression of all layers. Enabled by default when using zstd."
+        ).hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--no-force-compression",
+          "Disable forced recompression of layers."
+        ).hideHelp()
+      )
       // Local build options
+      .addOption(
+        new CommandOption("--force-local-build", "Deprecated alias for --local-build")
+          .implies({
+            localBuild: true,
+          })
+          .conflicts("nativeBuildServer")
+          .hideHelp()
+      )
+      .addOption(
+        new CommandOption("--local-build", "Build the deployment image locally").conflicts(
+          "nativeBuildServer"
+        )
+      )
       .addOption(new CommandOption("--push", "Push the image after local builds").hideHelp())
       .addOption(
         new CommandOption("--no-push", "Do not push the image after local builds").hideHelp()
@@ -173,9 +258,22 @@ export function configureDeployCommand(program: Command) {
           "The builder to use when building locally"
         ).hideHelp()
       )
+      .addOption(
+        new CommandOption(
+          "--native-build-server",
+          "Use the native build server for building the image"
+        )
+      )
+      .addOption(
+        new CommandOption(
+          "--detach",
+          "Return immediately after the deployment is queued, do not wait for the build to complete. Implies using the native build server."
+        ).implies({ nativeBuildServer: true })
+      )
+      .addOption(new CommandOption("--plain", "Plain output").hideHelp())
       .action(async (path, options) => {
         await handleTelemetry(async () => {
-          await printStandloneInitialBanner(true);
+          await printStandloneInitialBanner(true, options.profile);
           await deployCommand(path, options);
         });
       })
@@ -189,7 +287,9 @@ export async function deployCommand(dir: string, options: unknown) {
 }
 
 async function _deployCommand(dir: string, options: DeployCommandOptions) {
-  intro(`Deploying project${options.skipPromotion ? " (without promotion)" : ""}`);
+  if (!options.plain) {
+    intro(`Deploying project${options.skipPromotion ? " (without promotion)" : ""}`);
+  }
 
   if (options.buildOnly && options.registerOnly) {
     throw new Error("--build-only and --register-only cannot be used together");
@@ -218,6 +318,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     embedded: true,
     defaultApiUrl: options.apiUrl,
     profile: options.profile,
+    silent: options.plain,
   });
 
   if (!authorization.ok) {
@@ -307,12 +408,24 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     throw new Error("Failed to get project client");
   }
 
+  if (options.nativeBuildServer) {
+    await handleNativeBuildServerDeploy({
+      apiClient: projectClient.client,
+      config: resolvedConfig,
+      dashboardUrl: authorization.dashboardUrl,
+      options,
+      userId: authorization.auth.tokenType === "personal" ? authorization.userId : undefined,
+      gitMeta,
+    });
+    return;
+  }
+
   const serverEnvVars = await projectClient.client.getEnvironmentVariables(resolvedConfig.project);
   loadDotEnvVars(resolvedConfig.workingDir, options.envFile);
 
   const destination = getTmpDir(resolvedConfig.workingDir, "build", options.dryRun);
 
-  const $buildSpinner = spinner();
+  const $buildSpinner = spinner({ plain: options.plain });
 
   const forcedExternals = await resolveAlwaysExternal(projectClient.client);
 
@@ -330,13 +443,13 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
       forcedExternals,
       baseImageNode: options.baseImageNode,
       containerfileModule: options.containerfileModule,
+      plain: options.plain,
       listener: {
         onBundleStart() {
           $buildSpinner.start("Building trigger code");
         },
         onBundleComplete(result) {
-          $buildSpinner.stop("Successfully built code.");
-
+          $buildSpinner.stop("Successfully built code");
           logger.debug("Bundle result", result);
         },
       },
@@ -355,20 +468,27 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     return;
   }
 
-  const deploymentResponse = await projectClient.client.initializeDeployment({
-    contentHash: buildManifest.contentHash,
-    userId: authorization.userId,
-    gitMeta,
-    type: features.run_engine_v2 ? "MANAGED" : "V1",
-    runtime: buildManifest.runtime,
-  });
-
-  if (!deploymentResponse.success) {
-    throw new Error(`Failed to start deployment: ${deploymentResponse.error}`);
-  }
+  const deployment = await initializeOrAttachDeployment(
+    projectClient.client,
+    {
+      contentHash: buildManifest.contentHash,
+      userId: authorization.auth.tokenType === "personal" ? authorization.userId : undefined,
+      gitMeta,
+      type: features.run_engine_v2 ? "MANAGED" : "V1",
+      runtime: buildManifest.runtime,
+      isLocalBuild: options.localBuild,
+      isNativeBuild: false,
+      triggeredVia: getTriggeredVia(),
+    },
+    envVars.TRIGGER_EXISTING_DEPLOYMENT_ID
+  );
 
-  const deployment = deploymentResponse.data;
-  const isLocalBuild = !deployment.externalBuildData;
+  // When `externalBuildData` is not present the deployment implicitly goes into the local build path
+  // which is used in self-hosted setups. There are a few subtle differences between local builds for the cloud
+  // and local builds for self-hosted setups. We need to make the separation of the two paths clearer to avoid confusion.
+  const isLocalBuild = options.localBuild || !deployment.externalBuildData;
+  const authenticateToTriggerRegistry = options.localBuild;
+  const skipServerSideRegistryPush = options.localBuild;
 
   // Fail fast if we know local builds will fail
   if (isLocalBuild) {
@@ -395,7 +515,7 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     const vars = numberOfEnvVars === 1 ? "var" : "vars";
 
     if (!options.skipSyncEnvVars) {
-      const $spinner = spinner();
+      const $spinner = spinner({ plain: options.plain });
       $spinner.start(`Syncing ${numberOfEnvVars} env ${vars} with the server`);
 
       const uploadResult = await syncEnvVarsWithServer(
@@ -437,12 +557,16 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
   const deploymentLink = cliLink("View deployment", rawDeploymentLink);
   const testLink = cliLink("Test tasks", rawTestLink);
 
-  const $spinner = spinner();
+  const $spinner = spinner({ plain: options.plain });
 
-  const buildSuffix = isLocalBuild ? " (local)" : "";
-  const deploySuffix = isLocalBuild ? " (local build)" : "";
+  const buildSuffix =
+    isLocalBuild && process.env.TRIGGER_LOCAL_BUILD_LABEL_DISABLED !== "1" ? " (local)" : "";
+  const deploySuffix =
+    isLocalBuild && process.env.TRIGGER_LOCAL_BUILD_LABEL_DISABLED !== "1" ? " (local build)" : "";
 
-  if (isCI) {
+  if (options.plain) {
+    $spinner.start(`Building version ${version}${buildSuffix}`);
+  } else if (isCI) {
     log.step(`Building version ${version}\n`);
   } else {
     if (isLinksSupported) {
@@ -454,7 +578,8 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
 
   const buildResult = await buildImage({
     isLocalBuild,
-    noCache: options.noCache,
+    useRegistryCache: options.useRegistryCache,
+    noCache: !options.cache,
     deploymentId: deployment.id,
     deploymentVersion: deployment.version,
     imageTag: deployment.imageTag,
@@ -468,13 +593,18 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     projectRef: resolvedConfig.project,
     apiUrl: projectClient.client.apiURL,
     apiKey: projectClient.client.accessToken!,
+    apiClient: projectClient.client,
     branchName: branch,
     authAccessToken: authorization.auth.accessToken,
     compilationPath: destination.path,
     buildEnvVars: buildManifest.build.env,
     indexEnvVars: serverEnvVars.success ? serverEnvVars.data.variables : {},
+    compression: options.compression,
+    cacheCompression: options.cacheCompression,
+    compressionLevel: options.compressionLevel,
+    forceCompression: options.forceCompression,
     onLog: (logMessage) => {
-      if (isCI) {
+      if (options.plain || isCI) {
         console.log(logMessage);
         return;
       }
@@ -491,12 +621,25 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     network: options.network,
     builder: options.builder,
     push: options.push,
+    authenticateToRegistry: authenticateToTriggerRegistry,
   });
 
   logger.debug("Build result", buildResult);
 
   const warnings = checkLogsForWarnings(buildResult.logs);
 
+  const canShowLocalBuildHint =
+    !isLocalBuild && process.env.TRIGGER_LOCAL_BUILD_HINT_DISABLED !== "1";
+  const buildFailed = !warnings.ok || !buildResult.ok;
+
+  if (buildFailed && canShowLocalBuildHint) {
+    const providerStatus = await projectClient.client.getRemoteBuildProviderStatus();
+
+    if (providerStatus.success && providerStatus.data.status === "degraded") {
+      prettyWarning(providerStatus.data.message + "\n");
+    }
+  }
+
   if (!warnings.ok) {
     await failDeploy(
       projectClient.client,
@@ -671,7 +814,9 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     throw new SkipLoggingError(errorData?.message ?? "Failed to get deployment with worker");
   }
 
-  if (isCI) {
+  if (options.plain) {
+    $spinner.message(`Deploying version ${version}${deploySuffix}`);
+  } else if (isCI) {
     log.step(`Deploying version ${version}${deploySuffix}\n`);
   } else {
     if (isLinksSupported) {
@@ -686,9 +831,10 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     {
       imageDigest: buildResult.digest,
       skipPromotion: options.skipPromotion,
+      skipPushToRegistry: skipServerSideRegistryPush,
     },
     (logMessage) => {
-      if (isCI) {
+      if (options.plain || isCI) {
         console.log(logMessage);
         return;
       }
@@ -715,7 +861,9 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
     throw new SkipLoggingError("Failed to finalize deployment");
   }
 
-  if (isCI) {
+  if (options.plain) {
+    console.log(`Successfully deployed version ${version}${deploySuffix}`);
+  } else if (isCI) {
     log.step(`Successfully deployed version ${version}${deploySuffix}`);
   } else {
     $spinner.stop(`Successfully deployed version ${version}${deploySuffix}`);
@@ -723,18 +871,29 @@ async function _deployCommand(dir: string, options: DeployCommandOptions) {
 
   const taskCount = deploymentWithWorker.worker?.tasks.length ?? 0;
 
-  outro(
-    `Version ${version} deployed with ${taskCount} detected task${taskCount === 1 ? "" : "s"} ${
-      isLinksSupported ? `| ${deploymentLink} | ${testLink}` : ""
-    }`
-  );
+  if (options.plain) {
+    console.log(
+      `Version ${version} deployed with ${taskCount} detected task${taskCount === 1 ? "" : "s"}`
+    );
 
-  if (!isLinksSupported) {
-    console.log("View deployment");
-    console.log(rawDeploymentLink);
-    console.log(); // new line
-    console.log("Test tasks");
-    console.log(rawTestLink);
+    if (process.env.TRIGGER_DEPLOYMENT_LINK_OUTPUT_DISABLED !== "1") {
+      console.log(`Deployment: ${rawDeploymentLink}`);
+      console.log(`Test: ${rawTestLink}`);
+    }
+  } else {
+    outro(
+      `Version ${version} deployed with ${taskCount} detected task${taskCount === 1 ? "" : "s"} ${
+        isLinksSupported ? `| ${deploymentLink} | ${testLink}` : ""
+      }`
+    );
+
+    if (!isLinksSupported) {
+      console.log("View deployment");
+      console.log(rawDeploymentLink);
+      console.log(); // new line
+      console.log("Test tasks");
+      console.log(rawTestLink);
+    }
   }
 
   if (options.saveLogs) {
@@ -781,7 +940,7 @@ export async function syncEnvVarsWithServer(
 
 async function failDeploy(
   client: CliApiClient,
-  deployment: Deployment,
+  deployment: Pick<Deployment, "id" | "shortCode">,
   error: { name: string; message: string },
   logs: string,
   $spinner: ReturnType<typeof spinner>,
@@ -837,6 +996,7 @@ async function failDeploy(
 
     switch (serverDeployment.status) {
       case "PENDING":
+      case "INSTALLING":
       case "DEPLOYING":
       case "BUILDING": {
         await doOutputLogs();
@@ -1414,6 +1574,506 @@ async function registerOnlyDeploy(projectPath: string, dir: string, options: Dep
   });
 }
 
+async function initializeOrAttachDeployment(
+  apiClient: CliApiClient,
+  data: InitializeDeploymentRequestBody,
+  existingDeploymentId?: string
+): Promise<InitializeDeploymentResponseBody> {
+  if (existingDeploymentId) {
+    // In the build server we initialize the deployment before installing the project dependencies,
+    // so that the status is correctly reflected in the dashboard. In this case, we need to attach
+    // to the existing deployment and continue with the remote build process.
+    // This is a workaround to avoid major changes in the deploy command and workflow. In the future,
+    // we'll likely make the build server the entry point of the flow for building and deploying and also
+    // adapt the related deployment API endpoints.
+
+    const existingDeploymentOrError = await apiClient.getDeployment(existingDeploymentId);
+
+    if (!existingDeploymentOrError.success) {
+      throw new Error(
+        `Failed to attach to existing deployment: ${existingDeploymentOrError.error}`
+      );
+    }
+
+    const { imageReference, status } = existingDeploymentOrError.data;
+    if (!imageReference) {
+      // this is just an artifact of our current DB schema
+      // `imageReference` is stored as nullable, but it should always exist
+      throw new Error("Existing deployment does not have an image reference");
+    }
+
+    if (
+      status === "CANCELED" ||
+      status === "FAILED" ||
+      status === "TIMED_OUT" ||
+      status === "DEPLOYED"
+    ) {
+      throw new Error(`Existing deployment is in an unexpected state: ${status}`);
+    }
+
+    return {
+      ...existingDeploymentOrError.data,
+      imageTag: imageReference,
+    };
+  }
+
+  const newDeploymentOrError = await apiClient.initializeDeployment({
+    ...data,
+  });
+
+  if (!newDeploymentOrError.success) {
+    throw new Error(`Failed to start deployment: ${newDeploymentOrError.error}`);
+  }
+
+  return newDeploymentOrError.data;
+}
+
+function getTriggeredVia(): DeploymentTriggeredVia {
+  // Check specific CI providers first (most specific to least specific)
+  if (isGitHubActions()) {
+    return "cli:github_actions";
+  }
+  if (process.env.GITLAB_CI === "true") {
+    return "cli:gitlab_ci";
+  }
+  if (process.env.CIRCLECI === "true") {
+    return "cli:circleci";
+  }
+  if (process.env.JENKINS_URL) {
+    return "cli:jenkins";
+  }
+  if (process.env.TF_BUILD === "True") {
+    return "cli:azure_pipelines";
+  }
+  if (process.env.BITBUCKET_BUILD_NUMBER) {
+    return "cli:bitbucket_pipelines";
+  }
+  if (process.env.TRAVIS === "true") {
+    return "cli:travis_ci";
+  }
+  if (process.env.BUILDKITE === "true") {
+    return "cli:buildkite";
+  }
+  // Fallback for other/unknown CI environments
+  if (isCI) {
+    return "cli:ci_other";
+  }
+
+  return "cli:manual";
+}
+
+async function handleNativeBuildServerDeploy({
+  apiClient,
+  options,
+  config,
+  dashboardUrl,
+  userId,
+  gitMeta,
+}: {
+  apiClient: CliApiClient;
+  config: Awaited<ReturnType<typeof loadConfig>>;
+  dashboardUrl: string;
+  options: DeployCommandOptions;
+  userId?: string;
+  gitMeta?: GitMeta;
+}) {
+  const tmpDir = join(config.workingDir, ".trigger", "tmp");
+  await mkdir(tmpDir, { recursive: true });
+
+  const archivePath = join(tmpDir, `deploy-${Date.now()}.tar.gz`);
+
+  const $deploymentSpinner = spinner();
+  $deploymentSpinner.start("Preparing deployment files");
+
+  await createContextArchive(config.workspaceDir, archivePath);
+
+  const archiveSize = await getArchiveSize(archivePath);
+  const sizeMB = (archiveSize / 1024 / 1024).toFixed(2);
+  $deploymentSpinner.message(`Deployment files ready (${sizeMB} MB)`);
+
+  const artifactResult = await apiClient.createArtifact({
+    type: "deployment_context",
+    contentType: "application/gzip",
+    contentLength: archiveSize,
+  });
+
+  if (!artifactResult.success) {
+    $deploymentSpinner.stop("Failed creating deployment artifact");
+    log.error(chalk.bold(chalkError(artifactResult.error)));
+    throw new OutroCommandError(`Deployment failed`);
+  }
+
+  const { artifactKey, uploadUrl, uploadFields } = artifactResult.data;
+
+  logger.debug("Artifact created", { artifactKey });
+
+  $deploymentSpinner.message("Uploading deployment files");
+
+  const [readError, fileBuffer] = await tryCatch(readFile(archivePath));
+
+  if (readError) {
+    $deploymentSpinner.stop("Failed reading deployment archive");
+    log.error(chalk.bold(chalkError(readError.message)));
+    throw new OutroCommandError(`Deployment failed`);
+  }
+
+  const formData = new FormData();
+
+  for (const [key, value] of Object.entries(uploadFields)) {
+    formData.append(key, value);
+  }
+
+  const blob = new Blob([new Uint8Array(fileBuffer)], { type: "application/gzip" });
+  formData.append("file", blob, "deployment.tar.gz");
+
+  const [uploadError, uploadResponse] = await tryCatch(
+    fetch(uploadUrl, {
+      method: "POST",
+      body: formData,
+    })
+  );
+
+  if (uploadError || !uploadResponse?.ok) {
+    $deploymentSpinner.stop("Failed to upload deployment files");
+    log.error(
+      chalk.bold(
+        chalkError(
+          `${uploadError?.message} (${uploadResponse?.statusText} ${uploadResponse?.status})`
+        )
+      )
+    );
+    throw new OutroCommandError(`Deployment failed`);
+  }
+
+  const [unlinkError] = await tryCatch(unlink(archivePath));
+  if (unlinkError) {
+    logger.debug("Failed to delete deployment artifact file", { archivePath, error: unlinkError });
+  }
+
+  $deploymentSpinner.message("Deployment files uploaded");
+
+  const configFilePath =
+    config.configFile !== undefined
+      ? relative(config.workspaceDir, config.configFile).replace(/\\/g, "/")
+      : undefined;
+
+  const initializeDeploymentResult = await apiClient.initializeDeployment({
+    contentHash: "-",
+    userId,
+    gitMeta,
+    type: config.features.run_engine_v2 ? "MANAGED" : "V1",
+    runtime: config.runtime,
+    isNativeBuild: true,
+    artifactKey,
+    skipPromotion: options.skipPromotion,
+    configFilePath,
+    triggeredVia: getTriggeredVia(),
+  });
+
+  if (!initializeDeploymentResult.success) {
+    $deploymentSpinner.stop("Failed to initialize deployment");
+    log.error(chalk.bold(chalkError(initializeDeploymentResult.error)));
+    throw new OutroCommandError(`Deployment failed`);
+  }
+
+  const deployment = initializeDeploymentResult.data;
+
+  const rawDeploymentLink = `${dashboardUrl}/projects/v3/${config.project}/deployments/${deployment.shortCode}`;
+  const rawTestLink = `${dashboardUrl}/projects/v3/${config.project}/test?environment=${
+    options.env === "prod" ? "prod" : "stg"
+  }`;
+
+  const exposedDeploymentLink = isLinksSupported
+    ? cliLink(chalk.bold(rawDeploymentLink), rawDeploymentLink)
+    : chalk.bold(rawDeploymentLink);
+  $deploymentSpinner.stop("Deployment initialized");
+  log.info(`View deployment: ${exposedDeploymentLink}`);
+
+  setGithubActionsOutputAndEnvVars({
+    envVars: {
+      TRIGGER_DEPLOYMENT_VERSION: deployment.version,
+      TRIGGER_VERSION: deployment.version,
+      TRIGGER_DEPLOYMENT_SHORT_CODE: deployment.shortCode,
+      TRIGGER_DEPLOYMENT_URL: rawDeploymentLink,
+      TRIGGER_TEST_URL: rawTestLink,
+    },
+    outputs: {
+      deploymentVersion: deployment.version,
+      workerVersion: deployment.version,
+      deploymentShortCode: deployment.shortCode,
+      deploymentUrl: rawDeploymentLink,
+      testUrl: rawTestLink,
+      needsPromotion: options.skipPromotion ? "true" : "false",
+    },
+  });
+
+  if (options.detach) {
+    outro(`Version ${deployment.version} is being deployed`);
+    return;
+  }
+
+  const { eventStream } = deployment;
+
+  if (!eventStream) {
+    log.warn(`Failed streaming build logs, open the deployment in the dashboard to view the logs`);
+
+    outro(`Version ${deployment.version} is being deployed`);
+
+    return process.exit(0);
+  }
+
+  const $queuedSpinner = spinner();
+  $queuedSpinner.start("Build queued");
+
+  const abortController = new AbortController();
+
+  const s2 = new S2({ accessToken: eventStream.s2.accessToken });
+  const basin = s2.basin(eventStream.s2.basin);
+  const stream = basin.stream(eventStream.s2.stream);
+
+  const [readSessionError, readSession] = await tryCatch(
+    stream.readSession(
+      {
+        seq_num: 0,
+        wait: 60 * 20, // 20 minutes
+        as: "bytes",
+      },
+      { signal: abortController.signal }
+    )
+  );
+
+  if (readSessionError) {
+    $queuedSpinner.stop("Failed to query build progress");
+    log.warn(`Failed streaming build logs, open the deployment in the dashboard to view the logs`);
+
+    outro(
+      `Version ${deployment.version} is being deployed ${
+        isLinksSupported ? `| ${cliLink("View deployment", rawDeploymentLink)}` : ""
+      }`
+    );
+
+    return process.exit(0);
+  }
+
+  const decoder = new TextDecoder();
+  let finalDeploymentEvent: DeploymentFinalizedEvent["data"] | undefined;
+  let queuedSpinnerStopped = false;
+
+  for await (const record of readSession) {
+    const decoded = decoder.decode(record.body);
+    const result = DeploymentEventFromString.safeParse(decoded);
+    if (!result.success) {
+      logger.debug("Failed to parse deployment event, skipping", {
+        error: result.error,
+        record: decoded,
+      });
+      continue;
+    }
+
+    const event = result.data;
+
+    switch (event.type) {
+      case "log": {
+        if (record.seq_num === 0) {
+          $queuedSpinner.stop("Build started");
+          console.log("│");
+          queuedSpinnerStopped = true;
+        }
+
+        const formattedTimestamp = chalkGrey(
+          new Date(record.timestamp).toLocaleTimeString("en-US", {
+            hour12: false,
+            hour: "2-digit",
+            minute: "2-digit",
+            second: "2-digit",
+            fractionalSecondDigits: 3,
+          })
+        );
+
+        const { level, message } = event.data;
+        const formattedMessage =
+          level === "error"
+            ? chalk.bold(chalkError(message))
+            : level === "warn"
+            ? chalkWarning(message)
+            : level === "debug"
+            ? chalkGrey(message)
+            : message;
+
+        // We use console.log here instead of clack's logger as the current version does not support changing the line spacing.
+        // And the logs look verbose with the default spacing.
+        // We cannot upgrade because the newer versions introduced some weird issues with the spinner.
+        // Ideally, we'd use clack's `taskLog` to only show the recent n lines of logs as they are streamed, but that also seems brittle
+        // and has some issues with cursor movements/clearing lines that it shouldn't clear.
+        // We can revisit this on future versions of `@clack/prompts`.
+        console.log(`│  ${formattedTimestamp}  ${formattedMessage}`);
+        break;
+      }
+      case "finalized": {
+        finalDeploymentEvent = event.data;
+        abortController.abort(); // stop the stream
+        break;
+      }
+      default: {
+        event satisfies never;
+        logger.debug("Unknown deployment event, skipping", { event });
+        continue;
+      }
+    }
+  }
+
+  if (!queuedSpinnerStopped && !finalDeploymentEvent) {
+    // unlikely that it happens in practice, only in rare corner cases
+    // the timeout would kick in earlier if the build server fails to dequeue the build
+
+    $queuedSpinner.stop("Log stream stopped");
+
+    log.error("Failed dequeueing build, please try again shortly");
+
+    throw new OutroCommandError(
+      `Version ${deployment.version} ${
+        isLinksSupported ? `| ${cliLink("View deployment", rawDeploymentLink)}` : ""
+      }`
+    );
+  }
+
+  if (!finalDeploymentEvent) {
+    log.error(
+      "Stopped receiving updates from the build server, please check the deployment status in the dashboard"
+    );
+
+    if (!isLinksSupported) {
+      log.info(`View deployment: ${rawDeploymentLink}`);
+    }
+
+    throw new OutroCommandError(
+      `Version ${deployment.version} ${
+        isLinksSupported ? `| ${cliLink("View deployment", rawDeploymentLink)}` : ""
+      }`
+    );
+  }
+
+  switch (finalDeploymentEvent.result) {
+    case "succeeded": {
+      queuedSpinnerStopped
+        ? log.success("Deployment completed successfully")
+        : $queuedSpinner.stop("Deployment completed successfully");
+
+      if (finalDeploymentEvent.message) {
+        log.success(finalDeploymentEvent.message);
+      }
+
+      if (options.skipPromotion) {
+        log.info(
+          `This deployment was not automatically promoted. You can promote in the dashboard or via the promote command, e.g, \`npx trigger.dev promote ${deployment.version}\`.`
+        );
+      }
+
+      if (!isLinksSupported) {
+        log.info(`Test tasks: ${rawTestLink}`);
+      }
+
+      outro(
+        `Version ${deployment.version} was deployed ${
+          isLinksSupported
+            ? `| ${cliLink("Test tasks", rawTestLink)} | ${cliLink(
+                "View deployment",
+                rawDeploymentLink
+              )}`
+            : ""
+        }`
+      );
+      return process.exit(0);
+    }
+    case "failed": {
+      if (!queuedSpinnerStopped) {
+        $queuedSpinner.stop("Deployment failed");
+      }
+
+      log.error(
+        chalk.bold(
+          chalkError(
+            "Deployment failed" +
+              (finalDeploymentEvent.message ? `: ${finalDeploymentEvent.message}` : "")
+          )
+        )
+      );
+
+      throw new OutroCommandError(
+        `Version ${deployment.version} deployment failed ${
+          isLinksSupported ? `| ${cliLink("View deployment", rawDeploymentLink)}` : ""
+        }`
+      );
+    }
+    case "timed_out": {
+      if (!queuedSpinnerStopped) {
+        $queuedSpinner.stop("Deployment timed out");
+      }
+
+      log.error(
+        chalk.bold(
+          chalkError(
+            "Deployment timed out" +
+              (finalDeploymentEvent.message ? `: ${finalDeploymentEvent.message}` : "")
+          )
+        )
+      );
+
+      throw new OutroCommandError(
+        `Version ${deployment.version} deployment timed out ${
+          isLinksSupported ? `| ${cliLink("View deployment", rawDeploymentLink)}` : ""
+        }`
+      );
+    }
+    case "canceled": {
+      if (!queuedSpinnerStopped) {
+        $queuedSpinner.stop("Deployment was canceled");
+      }
+
+      log.error(
+        chalk.bold(
+          chalkError(
+            "Deployment was canceled" +
+              (finalDeploymentEvent.message ? `: ${finalDeploymentEvent.message}` : "")
+          )
+        )
+      );
+
+      throw new OutroCommandError(
+        `Version ${deployment.version} deployment canceled ${
+          isLinksSupported ? `| ${cliLink("View deployment", rawDeploymentLink)}` : ""
+        }`
+      );
+    }
+    default: {
+      // This case is only relevant in case we extend the enum in the future.
+      // New enum values will not be treated as errors in older cli versions.
+      queuedSpinnerStopped
+        ? log.success("Log stream finished")
+        : $queuedSpinner.stop("Log stream finished");
+      if (finalDeploymentEvent.message) {
+        log.message(finalDeploymentEvent.message);
+      }
+
+      if (!isLinksSupported) {
+        log.info(`Test tasks: ${rawTestLink}`);
+      }
+
+      outro(
+        `Version ${deployment.version} ${
+          isLinksSupported
+            ? `| ${cliLink("Test tasks", rawTestLink)} | ${cliLink(
+                "View deployment",
+                rawDeploymentLink
+              )}`
+            : ""
+        }`
+      );
+      return process.exit(0);
+    }
+  }
+}
+
 export function verifyDirectory(dir: string, projectPath: string) {
   if (dir !== "." && !isDirectory(projectPath)) {
     if (dir === "staging" || dir === "prod" || dir === "preview") {
diff --git a/packages/cli-v3/src/commands/dev.ts b/packages/cli-v3/src/commands/dev.ts
index d3041ba0f88..5557e595817 100644
--- a/packages/cli-v3/src/commands/dev.ts
+++ b/packages/cli-v3/src/commands/dev.ts
@@ -13,6 +13,15 @@ import { runtimeChecks } from "../utilities/runtimeCheck.js";
 import { getProjectClient, LoginResultOk } from "../utilities/session.js";
 import { login } from "./login.js";
 import { updateTriggerPackages } from "./update.js";
+import {
+  readConfigHasSeenMCPInstallPrompt,
+  writeConfigHasSeenMCPInstallPrompt,
+} from "../utilities/configFiles.js";
+import { confirm, isCancel, log } from "@clack/prompts";
+import { installMcpServer } from "./install-mcp.js";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { VERSION } from "@trigger.dev/core";
+import { initiateRulesInstallWizard } from "./install-rules.js";
 
 const DevCommandOptions = CommonCommandOptions.extend({
   debugOtel: z.boolean().default(false),
@@ -26,6 +35,10 @@ const DevCommandOptions = CommonCommandOptions.extend({
   mcpPort: z.coerce.number().optional().default(3333),
   analyze: z.boolean().default(false),
   disableWarnings: z.boolean().default(false),
+  skipMCPInstall: z.boolean().default(false),
+  skipRulesInstall: z.boolean().default(false),
+  rulesInstallManifestPath: z.string().optional(),
+  rulesInstallBranch: z.string().optional(),
 });
 
 export type DevCommandOptions = z.infer<typeof DevCommandOptions>;
@@ -59,6 +72,30 @@ export function configureDevCommand(program: Command) {
       .addOption(
         new CommandOption("--analyze", "Analyze the build output and import timings").hideHelp()
       )
+      .addOption(
+        new CommandOption(
+          "--skip-mcp-install",
+          "Skip the Trigger.dev MCP server install wizard"
+        ).hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--skip-rules-install",
+          "Skip the Trigger.dev Agent rules install wizard"
+        ).hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--rules-install-manifest-path <path>",
+          "The path to the rules install manifest"
+        ).hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--rules-install-branch <branch>",
+          "The branch to install the rules from"
+        ).hideHelp()
+      )
       .addOption(new CommandOption("--disable-warnings", "Suppress warnings output").hideHelp())
   ).action(async (options) => {
     wrapCommandAction("dev", DevCommandOptions, options, async (opts) => {
@@ -70,6 +107,54 @@ export function configureDevCommand(program: Command) {
 export async function devCommand(options: DevCommandOptions) {
   runtimeChecks();
 
+  // Only show these install prompts if the user is in a terminal (not in a Coding Agent)
+  if (process.stdout.isTTY) {
+    const skipMCPInstall = typeof options.skipMCPInstall === "boolean" && options.skipMCPInstall;
+
+    if (!skipMCPInstall) {
+      const hasSeenMCPInstallPrompt = readConfigHasSeenMCPInstallPrompt();
+
+      if (!hasSeenMCPInstallPrompt) {
+        const installChoice = await confirm({
+          message: "Would you like to install the Trigger.dev MCP server?",
+          initialValue: true,
+        });
+
+        writeConfigHasSeenMCPInstallPrompt(true);
+
+        const skipInstall = isCancel(installChoice) || !installChoice;
+
+        if (!skipInstall) {
+          log.step("Welcome to the Trigger.dev MCP server install wizard 🧙");
+
+          const [installError] = await tryCatch(
+            installMcpServer({
+              yolo: false,
+              tag: VERSION as string,
+              logLevel: options.logLevel,
+            })
+          );
+
+          if (installError) {
+            log.error(`Failed to install MCP server: ${installError.message}`);
+          }
+        }
+      }
+    }
+
+    const skipRulesInstall =
+      typeof options.skipRulesInstall === "boolean" && options.skipRulesInstall;
+
+    if (!skipRulesInstall) {
+      await tryCatch(
+        initiateRulesInstallWizard({
+          manifestPath: options.rulesInstallManifestPath,
+          branch: options.rulesInstallBranch,
+        })
+      );
+    }
+  }
+
   const authorization = await login({
     embedded: true,
     silent: true,
@@ -120,7 +205,7 @@ async function startDev(options: StartDevOptions) {
       logger.loggerLevel = options.logLevel;
     }
 
-    await printStandloneInitialBanner(true);
+    await printStandloneInitialBanner(true, options.profile);
 
     let displayedUpdateMessage = false;
 
diff --git a/packages/cli-v3/src/commands/env.ts b/packages/cli-v3/src/commands/env.ts
new file mode 100644
index 00000000000..ac9b5f774c9
--- /dev/null
+++ b/packages/cli-v3/src/commands/env.ts
@@ -0,0 +1,441 @@
+import { Command } from "commander";
+import { z } from "zod";
+import { printInitialBanner } from "../utilities/initialBanner.js";
+import {
+  CommonCommandOptions,
+  commonOptions,
+  handleTelemetry,
+  wrapCommandAction,
+} from "../cli/common.js";
+import { intro, outro, log, confirm, isCancel } from "@clack/prompts";
+import chalk from "chalk";
+import Table from "cli-table3";
+import { logger } from "../utilities/logger.js";
+import { login } from "./login.js";
+import { getProjectClient, upsertBranch } from "../utilities/session.js";
+import { loadConfig } from "../config.js";
+import { spinner } from "../utilities/windows.js";
+import { writeFile } from "node:fs/promises";
+import { resolve } from "node:path";
+import { tryCatch } from "@trigger.dev/core";
+
+const EnvListOptions = CommonCommandOptions.extend({
+  config: z.string().optional(),
+  projectRef: z.string().optional(),
+  showValues: z.boolean().default(false),
+  env: z.enum(["prod", "staging", "preview", "production"]).default("prod"),
+  branch: z.string().optional(),
+});
+
+const EnvGetOptions = CommonCommandOptions.extend({
+  config: z.string().optional(),
+  projectRef: z.string().optional(),
+  name: z.string(),
+  raw: z.boolean().default(false),
+  env: z.enum(["prod", "staging", "preview", "production"]).default("prod"),
+  branch: z.string().optional(),
+});
+
+const EnvPullOptions = CommonCommandOptions.extend({
+  config: z.string().optional(),
+  projectRef: z.string().optional(),
+  output: z.string().default(".env.local"),
+  force: z.boolean().default(false),
+  env: z.enum(["prod", "staging", "preview", "production"]).default("prod"),
+  branch: z.string().optional(),
+});
+
+export function configureEnvCommand(program: Command) {
+  const envCommand = program
+    .command("env")
+    .description("Manage environment variables for your Trigger.dev project");
+
+  commonOptions(
+    envCommand
+      .command("list")
+      .description("List all environment variables for your project")
+      .option("-c, --config <config file>", "The name of the config file")
+      .option(
+        "-p, --project-ref <project ref>",
+        "The project ref. Required if there is no config file."
+      )
+      .option(
+        "-e, --env <env>",
+        "The environment to list variables from (prod, staging, preview)",
+        "prod"
+      )
+      .option("-b, --branch <branch>", "The preview branch when using --env preview")
+      .option(
+        "--show-values",
+        "Show the actual values of environment variables, including secret values"
+      )
+  ).action(async (options) => {
+    await handleTelemetry(async () => {
+      await printInitialBanner(false, options.profile);
+      await envListCommand(options);
+    });
+  });
+
+  commonOptions(
+    envCommand
+      .command("get <name>")
+      .description("Get the value of a specific environment variable")
+      .option("-c, --config <config file>", "The name of the config file")
+      .option(
+        "-p, --project-ref <project ref>",
+        "The project ref. Required if there is no config file"
+      )
+      .option(
+        "-e, --env <env>",
+        "The environment to get the variable from (prod, staging, preview)",
+        "prod"
+      )
+      .option("-b, --branch <branch>", "The preview branch when using --env preview")
+      .option("--raw", "Only output the raw value without any formatting or additional information")
+  ).action(async (name, options) => {
+    await handleTelemetry(async () => {
+      if (!options.raw) {
+        await printInitialBanner(false, options.profile);
+      }
+      await envGetCommand({ ...options, name });
+    });
+  });
+
+  commonOptions(
+    envCommand
+      .command("pull")
+      .description("Pull environment variables from your project to a local file")
+      .option("-c, --config <config file>", "The name of the config file")
+      .option(
+        "-p, --project-ref <project ref>",
+        "The project ref. Required if there is no config file"
+      )
+      .option(
+        "-e, --env <env>",
+        "The environment to pull variables from (prod, staging, preview)",
+        "prod"
+      )
+      .option("-b, --branch <branch>", "The preview branch when using --env preview")
+      .option("-o, --output <file>", "Output file path", ".env.local")
+      .option("--force", "Overwrite the output file if it exists")
+  ).action(async (options) => {
+    await handleTelemetry(async () => {
+      await printInitialBanner(false, options.profile);
+      await envPullCommand(options);
+    });
+  });
+
+  return envCommand;
+}
+
+async function envListCommand(options: unknown) {
+  return await wrapCommandAction(
+    "envList",
+    EnvListOptions,
+    options,
+    async (opts: z.infer<typeof EnvListOptions>) => {
+      return await _envListCommand(opts);
+    }
+  );
+}
+
+async function envGetCommand(options: unknown) {
+  return await wrapCommandAction(
+    "envGet",
+    EnvGetOptions,
+    options,
+    async (opts: z.infer<typeof EnvGetOptions>) => {
+      return await _envGetCommand(opts);
+    }
+  );
+}
+
+async function envPullCommand(options: unknown) {
+  return await wrapCommandAction(
+    "envPull",
+    EnvPullOptions,
+    options,
+    async (opts: z.infer<typeof EnvPullOptions>) => {
+      return await _envPullCommand(opts);
+    }
+  );
+}
+
+async function resolveProjectEnv(
+  options:
+    | z.infer<typeof EnvListOptions>
+    | z.infer<typeof EnvGetOptions>
+    | z.infer<typeof EnvPullOptions>
+) {
+  const authorization = await login({
+    embedded: true,
+    defaultApiUrl: options.apiUrl,
+    profile: options.profile,
+    silent: "raw" in options ? options.raw : false,
+  });
+
+  if (!authorization.ok) {
+    if (authorization.error === "fetch failed") {
+      throw new Error(
+        `Failed to connect to ${authorization.auth?.apiUrl}. Are you sure it's the correct URL?`
+      );
+    }
+
+    throw new Error(`You must login first. Use the \`login\` CLI command.`);
+  }
+
+  const resolvedConfig = await loadConfig({
+    overrides: { project: options.projectRef },
+    configFile: options.config,
+  });
+
+  logger.debug("Resolved config", resolvedConfig);
+
+  // Coerce production to prod
+  const env = options.env === "production" ? "prod" : options.env;
+
+  if (env === "preview" && !options.branch) {
+    throw new Error("Missing branch for the preview environment.");
+  }
+
+  const projectClient = await getProjectClient({
+    accessToken: authorization.auth.accessToken,
+    apiUrl: authorization.auth.apiUrl,
+    projectRef: resolvedConfig.project,
+    env,
+    branch: options.branch,
+    profile: options.profile,
+  });
+
+  if (!projectClient) {
+    throw new Error("Failed to get project client");
+  }
+
+  return {
+    projectClient,
+    projectRef: resolvedConfig.project,
+    env,
+    branch: options.branch,
+  };
+}
+
+async function _envListCommand(options: z.infer<typeof EnvListOptions>) {
+  intro("Environment Variables");
+
+  const $spinner = spinner();
+
+  const { projectClient, projectRef, env, branch } = await resolveProjectEnv(options);
+
+  $spinner.start("Loading environment variables from project");
+  const envVars = await projectClient.client.getEnvironmentVariables(projectRef);
+
+  if (!envVars.success) {
+    $spinner.stop("Failed loading environment variables");
+    throw envVars.error;
+  }
+
+  $spinner.stop("Environment variables loaded");
+
+  const variables = envVars.data.variables;
+
+  // Filter out TRIGGER_ system variables to only show user-set variables.
+  // The current envvars endpoint doesn't support filtering, so we just do basic filtering on the client side.
+  // We'll soon add a v2 of this endpoint which supports filtering and also includes more info about the variables.
+  const userVariables = Object.entries(variables).filter(([key]) => !key.startsWith("TRIGGER_"));
+
+  if (userVariables.length === 0) {
+    log.info("No environment variables found");
+    const envInfo = branch ? `${env} (${branch})` : env;
+    outro(`Project: ${projectRef} | Environment: ${envInfo}`);
+    return;
+  }
+
+  const table = new Table({
+    head: ["Variable", options.showValues ? "Value" : "Value (hidden)"],
+    style: {
+      head: ["yellow"],
+    },
+    chars: {
+      top: "",
+      "top-mid": "",
+      "top-left": "",
+      "top-right": "",
+      bottom: "",
+      "bottom-mid": "",
+      "bottom-left": "",
+      "bottom-right": "",
+      left: "",
+      "left-mid": "",
+      mid: "",
+      "mid-mid": "",
+      right: "",
+      "right-mid": "",
+      middle: " ",
+    },
+  });
+
+  for (const [key, value] of userVariables) {
+    table.push([key, options.showValues ? value : "******"]);
+  }
+
+  console.log();
+  console.log(table.toString());
+  console.log();
+
+  if (!options.showValues) {
+    log.info(chalk.dim("Use --show-values to display the actual values"));
+  }
+
+  const envInfo = branch ? `${env} (${branch})` : env;
+  outro(
+    `Found ${userVariables.length} environment variable${
+      userVariables.length === 1 ? "" : "s"
+    } | Project: ${projectRef} | Environment: ${envInfo}`
+  );
+}
+
+async function _envGetCommand(options: z.infer<typeof EnvGetOptions>) {
+  const $spinner = options.raw ? null : spinner();
+
+  if (!options.raw) {
+    intro(`Getting environment variable: ${options.name}`);
+  }
+
+  const { projectClient, projectRef, env, branch } = await resolveProjectEnv(options);
+
+  $spinner?.start("Loading environment variables from project");
+  const envVars = await projectClient.client.getEnvironmentVariables(projectRef);
+
+  if (!envVars.success) {
+    $spinner?.stop("Failed loading environment variables");
+    throw new Error(`Failed to load environment variables: ${envVars.error}`);
+  }
+
+  $spinner?.stop("Environment variables loaded");
+
+  const variables = envVars.data.variables;
+
+  const value = variables[options.name];
+
+  if (value === undefined) {
+    if (options.raw) {
+      throw new Error(`Environment variable "${options.name}" not found`);
+    }
+
+    log.error(chalk.red(`Environment variable '${options.name}' not found`));
+
+    // Suggest similar variables if any exist
+    const keys = Object.keys(variables);
+    const similar = keys.filter(
+      (k: string) =>
+        k.toLowerCase().includes(options.name.toLowerCase()) ||
+        options.name.toLowerCase().includes(k.toLowerCase())
+    );
+
+    if (similar.length > 0) {
+      log.info(chalk.dim("Did you mean one of these?"));
+      similar.forEach((s: string) => log.info(chalk.dim(`  - ${s}`)));
+    }
+
+    const envInfo = branch ? `${env} (${branch})` : env;
+    outro(`Project: ${projectRef} | Environment: ${envInfo}`);
+    process.exit(1);
+  }
+
+  if (options.raw) {
+    console.log(value || "");
+    return;
+  }
+
+  log.success(chalk.green(`${options.name}=${value}`));
+
+  const envInfo = branch ? `${env} (${branch})` : env;
+  outro(`Project: ${projectRef} | Environment: ${envInfo}`);
+}
+
+async function _envPullCommand(options: z.infer<typeof EnvPullOptions>) {
+  intro("Pull Environment Variables");
+  const $spinner = spinner();
+
+  const { projectClient, projectRef, env, branch } = await resolveProjectEnv(options);
+
+  $spinner.start("Loading environment variables from project");
+
+  const envVars = await projectClient.client.getEnvironmentVariables(projectRef);
+
+  if (!envVars.success) {
+    $spinner.stop("Failed loading environment variables");
+    throw envVars.error;
+  }
+
+  $spinner.stop("Environment variables loaded");
+
+  const variables = envVars.data.variables;
+  // Filter out TRIGGER_ system variables to only show user-set variables.
+  // The current envvars endpoint doesn't support filtering, so we just do basic filtering on the client side.
+  // We'll soon add a v2 of this endpoint which supports filtering and also includes more info about the variables.
+  const userVariables = Object.entries(variables).filter(([key]) => !key.startsWith("TRIGGER_"));
+
+  if (userVariables.length === 0) {
+    log.info("No environment variables found");
+    const envInfo = branch ? `${env} (${branch})` : env;
+    outro(`Project: ${projectRef} | Environment: ${envInfo}`);
+    return;
+  }
+
+  const outputPath = resolve(process.cwd(), options.output);
+
+  const [error] = await tryCatch(writeFile(outputPath, "", { flag: "wx", mode: 0o600 }));
+
+  if (error && "code" in error && error.code !== "EEXIST") {
+    throw error;
+  }
+
+  if (error && "code" in error && error.code === "EEXIST" && !options.force) {
+    const shouldOverwrite = await confirm({
+      message: `File ${options.output} already exists. Overwrite?`,
+      initialValue: false,
+    });
+
+    if (isCancel(shouldOverwrite) || !shouldOverwrite) {
+      outro("Cancelled");
+      return;
+    }
+  }
+
+  const envContent = userVariables
+    .map(([key, value]) => `${key}=${serializeDotenvValue(value)}`)
+    .join("\n");
+
+  $spinner.start(`Writing to ${options.output}`);
+  const [writeError] = await tryCatch(
+    writeFile(outputPath, envContent + "\n", { encoding: "utf-8", mode: 0o600 })
+  );
+
+  if (writeError) {
+    $spinner.stop(`Failed to write to ${options.output}`);
+    throw writeError;
+  }
+
+  $spinner.stop(`Written to ${options.output}`);
+
+  log.success(
+    chalk.green(
+      `Pulled ${userVariables.length} environment variable${
+        userVariables.length === 1 ? "" : "s"
+      } into ${options.output}`
+    )
+  );
+
+  const envInfo = branch ? `${env} (${branch})` : env;
+  outro(`Project: ${projectRef} | Environment: ${envInfo}`);
+}
+
+const serializeDotenvValue = (v: unknown): string => {
+  if (v == null || v === undefined) return "";
+
+  const s = String(v);
+  // Quote when unsafe chars present: whitespace, equals, newlines, comments, quotes, backslashes
+  const needsQuotes = /[\s#"'`\\=\n\r]/.test(s) || s === "";
+  return needsQuotes ? JSON.stringify(s) : s;
+};
diff --git a/packages/cli-v3/src/commands/init.ts b/packages/cli-v3/src/commands/init.ts
index fcae774961d..82c4d0e4e09 100644
--- a/packages/cli-v3/src/commands/init.ts
+++ b/packages/cli-v3/src/commands/init.ts
@@ -1,13 +1,18 @@
 import { intro, isCancel, log, outro, select, text } from "@clack/prompts";
 import { context, trace } from "@opentelemetry/api";
-import { GetProjectResponseBody, flattenAttributes } from "@trigger.dev/core/v3";
+import {
+  GetProjectResponseBody,
+  LogLevel,
+  flattenAttributes,
+  tryCatch,
+} from "@trigger.dev/core/v3";
 import { recordSpanException } from "@trigger.dev/core/v3/workers";
 import chalk from "chalk";
 import { Command, Option as CommandOption } from "commander";
 import { applyEdits, findNodeAtLocation, getNodeValue, modify, parseTree } from "jsonc-parser";
 import { writeFile } from "node:fs/promises";
 import { join, relative, resolve } from "node:path";
-import { addDependency, addDevDependency, detectPackageManager } from "nypm";
+import { addDependency, addDevDependency } from "nypm";
 import { resolveTSConfig } from "pkg-types";
 import { z } from "zod";
 import { CliApiClient } from "../apiClient.js";
@@ -31,8 +36,13 @@ import { createFile, pathExists, readFile } from "../utilities/fileSystem.js";
 import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
 import { logger } from "../utilities/logger.js";
 import { spinner } from "../utilities/windows.js";
-import { login } from "./login.js";
 import { VERSION } from "../version.js";
+import { login } from "./login.js";
+import {
+  readConfigHasSeenMCPInstallPrompt,
+  writeConfigHasSeenMCPInstallPrompt,
+} from "../utilities/configFiles.js";
+import { installMcpServer } from "./install-mcp.js";
 
 const cliVersion = VERSION as string;
 const cliTag = cliVersion.includes("v4-beta") ? "v4-beta" : "latest";
@@ -46,6 +56,7 @@ const InitCommandOptions = CommonCommandOptions.extend({
   pkgArgs: z.string().optional(),
   gitRef: z.string().default("main"),
   javascript: z.boolean().default(false),
+  yes: z.boolean().default(false),
 });
 
 type InitCommandOptions = z.infer<typeof InitCommandOptions>;
@@ -77,6 +88,7 @@ export function configureInitCommand(program: Command) {
         "--pkg-args <args>",
         "Additional arguments to pass to the package manager, accepts CSV for multiple args"
       )
+      .option("-y, --yes", "Skip all prompts and use defaults (requires --project-ref)")
   )
     .addOption(
       new CommandOption(
@@ -86,7 +98,7 @@ export function configureInitCommand(program: Command) {
     )
     .action(async (path, options) => {
       await handleTelemetry(async () => {
-        await printStandloneInitialBanner(true);
+        await printStandloneInitialBanner(true, options.profile);
         await initCommand(path, options);
       });
     });
@@ -101,6 +113,50 @@ export async function initCommand(dir: string, options: unknown) {
 async function _initCommand(dir: string, options: InitCommandOptions) {
   const span = trace.getSpan(context.active());
 
+  // Validate --yes flag requirements
+  if (options.yes && !options.projectRef) {
+    throw new Error("--project-ref is required when using --yes flag");
+  }
+
+  const hasSeenMCPInstallPrompt = readConfigHasSeenMCPInstallPrompt();
+
+  if (!hasSeenMCPInstallPrompt) {
+    const installChoice = await select({
+      message: "Choose how you want to initialize your project:",
+      options: [
+        {
+          value: "mcp",
+          label: "Trigger.dev MCP",
+          hint: "Automatically install the Trigger.dev MCP server and then vibe your way to a new project.",
+        },
+        { value: "cli", label: "CLI", hint: "Continue with the CLI" },
+      ],
+    });
+
+    writeConfigHasSeenMCPInstallPrompt(true);
+
+    const continueWithCLI = isCancel(installChoice) || installChoice === "cli";
+
+    if (!continueWithCLI) {
+      log.step("Welcome to the Trigger.dev MCP server install wizard 🧙");
+
+      const [installError] = await tryCatch(
+        installMcpServer({
+          yolo: false,
+          tag: options.tag,
+          logLevel: options.logLevel,
+        })
+      );
+
+      if (installError) {
+        outro(`Failed to install MCP server: ${installError.message}`);
+        return;
+      }
+
+      return;
+    }
+  }
+
   intro("Initializing project");
 
   const cwd = resolve(process.cwd(), dir);
@@ -167,7 +223,11 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
 
   // Install @trigger.dev/sdk package
   if (!options.skipPackageInstall) {
-    await installPackages(dir, options);
+    await installPackages(
+      cwd,
+      options.tag,
+      new CLIInstallPackagesOutputter(options.logLevel, options.tag)
+    );
   } else {
     log.info("Skipping package installation");
   }
@@ -193,7 +253,7 @@ async function _initCommand(dir: string, options: InitCommandOptions) {
     `${authorization.dashboardUrl}/projects/v3/${selectedProject.externalRef}`
   );
 
-  log.success("Successfully initialized project for Trigger.dev v3 🫡");
+  log.success("Successfully initialized your Trigger.dev project 🫡");
   log.info("Next steps:");
   log.info(
     `   1. To start developing, run ${chalk.green(
@@ -223,14 +283,44 @@ async function createTriggerDir(
     try {
       const defaultValue = join(dir, "src", "trigger");
 
-      const location = await text({
-        message: "Where would you like to create the Trigger.dev directory?",
-        defaultValue: defaultValue,
-        placeholder: defaultValue,
-      });
+      let location: string;
+      let example: string;
 
-      if (isCancel(location)) {
-        throw new OutroCommandError();
+      if (options.yes) {
+        // Use defaults when --yes flag is set
+        location = defaultValue;
+        example = "simple";
+      } else {
+        const locationPrompt = await text({
+          message: "Where would you like to create the Trigger.dev directory?",
+          defaultValue: defaultValue,
+          placeholder: defaultValue,
+        });
+
+        if (isCancel(locationPrompt)) {
+          throw new OutroCommandError();
+        }
+
+        location = locationPrompt;
+
+        const exampleSelection = await select({
+          message: `Choose an example to create in the ${location} directory`,
+          options: [
+            { value: "simple", label: "Simple (Hello World)" },
+            { value: "schedule", label: "Scheduled Task" },
+            {
+              value: "none",
+              label: "None",
+              hint: "skip creating an example",
+            },
+          ],
+        });
+
+        if (isCancel(exampleSelection)) {
+          throw new OutroCommandError();
+        }
+
+        example = exampleSelection as string;
       }
 
       // Ensure that the path is always relative by stripping leading '/' if present
@@ -248,25 +338,6 @@ async function createTriggerDir(
         throw new Error(`Directory already exists at ${triggerDir}`);
       }
 
-      const exampleSelection = await select({
-        message: `Choose an example to create in the ${location} directory`,
-        options: [
-          { value: "simple", label: "Simple (Hello World)" },
-          { value: "schedule", label: "Scheduled Task" },
-          {
-            value: "none",
-            label: "None",
-            hint: "skip creating an example",
-          },
-        ],
-      });
-
-      if (isCancel(exampleSelection)) {
-        throw new OutroCommandError();
-      }
-
-      const example = exampleSelection as string;
-
       span.setAttributes({
         "cli.example": example,
       });
@@ -424,54 +495,84 @@ async function addConfigFileToTsConfig(tsconfigPath: string, options: InitComman
   });
 }
 
-async function installPackages(dir: string, options: InitCommandOptions) {
-  return await tracer.startActiveSpan("installPackages", async (span) => {
-    const projectDir = resolve(process.cwd(), dir);
+export interface InstallPackagesOutputter {
+  startSDK: () => void;
+  installedSDK: () => void;
+  startBuild: () => void;
+  installedBuild: () => void;
+  stoppedWithError: () => void;
+}
 
-    const installSpinner = spinner();
-    const packageManager = await detectPackageManager(projectDir);
+class CLIInstallPackagesOutputter implements InstallPackagesOutputter {
+  private installSpinner: ReturnType<typeof spinner>;
 
-    try {
-      span.setAttributes({
-        "cli.projectDir": projectDir,
-        "cli.packageManager": packageManager?.name,
-        "cli.tag": options.tag,
-      });
+  constructor(
+    private readonly logLevel: LogLevel,
+    private readonly tag: string
+  ) {
+    this.installSpinner = spinner();
+  }
 
-      installSpinner.start(`Adding @trigger.dev/sdk@${options.tag}`);
+  startSDK() {
+    this.installSpinner.start(`Adding @trigger.dev/sdk@${this.tag}`);
+  }
 
-      await addDependency(`@trigger.dev/sdk@${options.tag}`, { cwd: projectDir, silent: true });
+  installedSDK() {
+    this.installSpinner.stop(`@trigger.dev/sdk@${this.tag} installed`);
+  }
 
-      installSpinner.stop(`@trigger.dev/sdk@${options.tag} installed`);
+  startBuild() {
+    this.installSpinner.start(`Adding @trigger.dev/build@${this.tag} to devDependencies`);
+  }
 
-      installSpinner.start(`Adding @trigger.dev/build@${options.tag} to devDependencies`);
+  installedBuild() {
+    this.installSpinner.stop(`@trigger.dev/build@${this.tag} installed`);
+  }
 
-      await addDevDependency(`@trigger.dev/build@${options.tag}`, {
-        cwd: projectDir,
-        silent: true,
-      });
+  stoppedWithError() {
+    if (this.logLevel === "debug") {
+      this.installSpinner.stop(`Failed to install @trigger.dev/sdk@${this.tag}.`);
+    } else {
+      this.installSpinner.stop(
+        `Failed to install @trigger.dev/sdk@${this.tag}. Rerun command with --log-level debug for more details.`
+      );
+    }
+  }
+}
 
-      installSpinner.stop(`@trigger.dev/build@${options.tag} installed`);
+class SilentInstallPackagesOutputter implements InstallPackagesOutputter {
+  startSDK() {}
+  installedSDK() {}
+  startBuild() {}
+  installedBuild() {}
+  stoppedWithError() {}
+}
 
-      span.end();
-    } catch (e) {
-      if (options.logLevel === "debug") {
-        installSpinner.stop(`Failed to install @trigger.dev/sdk@${options.tag}.`);
-      } else {
-        installSpinner.stop(
-          `Failed to install @trigger.dev/sdk@${options.tag}. Rerun command with --log-level debug for more details.`
-        );
-      }
+export async function installPackages(
+  projectDir: string,
+  tag: string,
+  outputter: InstallPackagesOutputter = new SilentInstallPackagesOutputter()
+) {
+  try {
+    outputter.startSDK();
 
-      if (!(e instanceof SkipCommandError)) {
-        recordSpanException(span, e);
-      }
+    await addDependency(`@trigger.dev/sdk@${tag}`, { cwd: projectDir, silent: true });
 
-      span.end();
+    outputter.installedSDK();
 
-      throw e;
-    }
-  });
+    outputter.startBuild();
+
+    await addDevDependency(`@trigger.dev/build@${tag}`, {
+      cwd: projectDir,
+      silent: true,
+    });
+
+    outputter.installedBuild();
+  } catch (e) {
+    outputter.stoppedWithError();
+
+    throw e;
+  }
 }
 
 async function writeConfigFile(
diff --git a/packages/cli-v3/src/commands/install-mcp.ts b/packages/cli-v3/src/commands/install-mcp.ts
new file mode 100644
index 00000000000..545014292d0
--- /dev/null
+++ b/packages/cli-v3/src/commands/install-mcp.ts
@@ -0,0 +1,697 @@
+import { confirm, intro, isCancel, log, multiselect, select } from "@clack/prompts";
+import chalk from "chalk";
+import { Command } from "commander";
+import { extname } from "node:path";
+import { z } from "zod";
+import { OutroCommandError, wrapCommandAction } from "../cli/common.js";
+import { cliLink } from "../utilities/cliOutput.js";
+import { writeConfigHasSeenMCPInstallPrompt } from "../utilities/configFiles.js";
+import {
+  expandTilde,
+  safeReadJSONCFile,
+  safeReadTomlFile,
+  writeJSONFile,
+  writeTomlFile,
+} from "../utilities/fileSystem.js";
+import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
+import { VERSION } from "../version.js";
+
+const cliVersion = VERSION as string;
+const cliTag = cliVersion.includes("v4-beta") ? "v4-beta" : "latest";
+
+const clients = [
+  "claude-code",
+  "cursor",
+  "vscode",
+  "zed",
+  "windsurf",
+  "gemini-cli",
+  "crush",
+  "cline",
+  "openai-codex",
+  "opencode",
+  "amp",
+  "ruler",
+] as const;
+const scopes = ["user", "project", "local"] as const;
+
+type ClientScopes = {
+  [key in (typeof clients)[number]]: {
+    [key in (typeof scopes)[number]]?: string;
+  };
+};
+
+type ClientLabels = {
+  [key in (typeof clients)[number]]: string;
+};
+
+const clientScopes: ClientScopes = {
+  "claude-code": {
+    user: "~/.claude.json",
+    project: "./.mcp.json",
+    local: "~/.claude.json",
+  },
+  cursor: {
+    user: "~/.cursor/mcp.json",
+    project: "./.cursor/mcp.json",
+  },
+  vscode: {
+    user: "~/Library/Application Support/Code/User/mcp.json",
+    project: "./.vscode/mcp.json",
+  },
+  zed: {
+    user: "~/.config/zed/settings.json",
+  },
+  windsurf: {
+    user: "~/.codeium/windsurf/mcp_config.json",
+  },
+  "gemini-cli": {
+    user: "~/.gemini/settings.json",
+    project: "./.gemini/settings.json",
+  },
+  crush: {
+    user: "~/.config/crush/crush.json",
+    project: "./crush.json",
+    local: "./.crush.json",
+  },
+  cline: {
+    user: "~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json",
+  },
+  amp: {
+    user: "~/.config/amp/settings.json",
+  },
+  "openai-codex": {
+    user: "~/.codex/config.toml",
+  },
+  opencode: {
+    user: "~/.config/opencode/opencode.json",
+    project: "./opencode.json",
+  },
+  ruler: {
+    project: "./.ruler/mcp.json",
+  },
+};
+
+const clientLabels: ClientLabels = {
+  "claude-code": "Claude Code",
+  cursor: "Cursor",
+  vscode: "VSCode",
+  zed: "Zed",
+  windsurf: "Windsurf",
+  "gemini-cli": "Gemini CLI",
+  crush: "Charm Crush",
+  cline: "Cline",
+  "openai-codex": "OpenAI Codex CLI",
+  amp: "Sourcegraph AMP",
+  opencode: "opencode",
+  ruler: "Ruler",
+};
+
+type SupportedClients = (typeof clients)[number];
+type ResolvedClients = SupportedClients | "unsupported";
+
+const InstallMcpCommandOptions = z.object({
+  projectRef: z.string().optional(),
+  tag: z.string().default(cliTag),
+  devOnly: z.boolean().optional(),
+  yolo: z.boolean().default(false),
+  scope: z.enum(scopes).optional(),
+  client: z.enum(clients).array().optional(),
+  logFile: z.string().optional(),
+  apiUrl: z.string().optional(),
+  logLevel: z.enum(["debug", "info", "log", "warn", "error", "none"]).default("log"),
+});
+
+type InstallMcpCommandOptions = z.infer<typeof InstallMcpCommandOptions>;
+
+export function configureInstallMcpCommand(program: Command) {
+  return program
+    .command("install-mcp")
+    .description("Install the Trigger.dev MCP server")
+    .option(
+      "-p, --project-ref <project ref>",
+      "Scope the mcp server to a specific Trigger.dev project by providing its project ref"
+    )
+    .option(
+      "-t, --tag <package tag>",
+      "The version of the trigger.dev CLI package to use for the MCP server",
+      cliTag
+    )
+    .option("--dev-only", "Restrict the MCP server to the dev environment only")
+    .option("--yolo", "Install the MCP server into all supported clients")
+    .option("--scope <scope>", "Choose the scope of the MCP server, either user or project")
+    .option(
+      "--client <clients...>",
+      "Choose the client (or clients) to install the MCP server into. We currently support: " +
+        clients.join(", ")
+    )
+    .option("--log-file <log file>", "Configure the MCP server to write logs to a file")
+    .option(
+      "-a, --api-url <value>",
+      "Configure the MCP server to specify a custom Trigger.dev API URL"
+    )
+    .option(
+      "-l, --log-level <level>",
+      "The CLI log level to use (debug, info, log, warn, error, none). This does not effect the log level of your trigger.dev tasks.",
+      "log"
+    )
+    .action(async (options) => {
+      await printStandloneInitialBanner(true);
+      await installMcpCommand(options);
+    });
+}
+
+export async function installMcpCommand(options: unknown) {
+  return await wrapCommandAction(
+    "installMcpCommand",
+    InstallMcpCommandOptions,
+    options,
+    async (opts) => {
+      return await _installMcpCommand(opts);
+    }
+  );
+}
+
+async function _installMcpCommand(options: InstallMcpCommandOptions) {
+  intro("Welcome to the Trigger.dev MCP server install wizard 🧙");
+
+  await installMcpServer(options);
+}
+
+type InstallMcpServerResults = Array<InstallMcpServerResult>;
+
+type InstallMcpServerResult = {
+  configPath: string;
+  clientName: (typeof clients)[number];
+  scope: McpServerScope;
+};
+
+export async function installMcpServer(
+  options: InstallMcpCommandOptions
+): Promise<InstallMcpServerResults> {
+  const opts = InstallMcpCommandOptions.parse(options);
+
+  writeConfigHasSeenMCPInstallPrompt(true);
+
+  const devOnly = await resolveDevOnly(opts);
+
+  opts.devOnly = devOnly;
+
+  const clientNames = await resolveClients(opts);
+
+  if (clientNames.length === 1 && clientNames.includes("unsupported")) {
+    return handleUnsupportedClientOnly(opts);
+  }
+
+  const results = [];
+
+  for (const clientName of clientNames) {
+    const result = await installMcpServerForClient(clientName, opts);
+
+    if (result) {
+      results.push(result);
+    }
+  }
+
+  if (results.length > 0) {
+    log.step("Installed to:");
+    for (const r of results) {
+      const scopeLabel = `${r.scope.scope}`;
+      log.message(`  • ${r.clientName} (${scopeLabel}) → ${chalk.gray(r.configPath)}`);
+    }
+  }
+
+  log.info("Next steps:");
+  log.message("  1. Restart your MCP client(s) to load the new configuration.");
+  log.message(
+    '  2. In your client, look for a server named "trigger". It should connect automatically.'
+  );
+  log.message("  3. Get started with Trigger.dev");
+  log.message(
+    `     Try asking your vibe-coding friend to ${chalk.green("Add trigger.dev to my project")}`
+  );
+
+  log.info("More examples:");
+  log.message(`  • ${chalk.green('"Trigger the hello-world task"')}`);
+  log.message(`  • ${chalk.green('"Can you help me debug the prod run run_1234"')}`);
+  log.message(`  • ${chalk.green('"Deploy my trigger project to staging"')}`);
+  log.message(`  • ${chalk.green('"What trigger task handles uploading files to S3?"')}`);
+  log.message(`  • ${chalk.green('"How do I create a scheduled task in Trigger.dev?"')}`);
+  log.message(`  • ${chalk.green('"Search Trigger.dev docs for ffmpeg examples"')}`);
+
+  log.info("Helpful links:");
+  log.message(`  • ${cliLink("Trigger.dev docs", "https://trigger.dev/docs")}`);
+  log.message(`  • ${cliLink("MCP docs", "https://trigger.dev/docs/mcp")}`);
+  log.message(
+    `  • Need help? ${cliLink(
+      "Join our Discord",
+      "https://trigger.dev/discord"
+    )} or email help@trigger.dev`
+  );
+
+  return results;
+}
+
+function handleUnsupportedClientOnly(options: InstallMcpCommandOptions): InstallMcpServerResults {
+  log.info("Manual MCP server configuration");
+
+  const args = [`trigger.dev@${options.tag}`, "mcp"];
+
+  if (options.logFile) {
+    args.push("--log-file", options.logFile);
+  }
+
+  if (options.apiUrl) {
+    args.push("--api-url", options.apiUrl);
+  }
+
+  if (options.devOnly) {
+    args.push("--dev-only");
+  }
+
+  if (options.projectRef) {
+    args.push("--project-ref", options.projectRef);
+  }
+
+  if (options.logLevel && options.logLevel !== "log") {
+    args.push("--log-level", options.logLevel);
+  }
+
+  log.message(
+    "Since your client isn't directly supported yet, you'll need to configure it manually:"
+  );
+  log.message("");
+  log.message(`${chalk.yellow("Command:")} ${chalk.green("npx")}`);
+  log.message(`${chalk.yellow("Arguments:")} ${chalk.green(args.join(" "))}`);
+  log.message("");
+  log.message("Add this MCP server configuration to your client's settings:");
+  log.message(`  • ${chalk.cyan("Server name:")} trigger`);
+  log.message(`  • ${chalk.cyan("Command:")} npx`);
+  log.message(`  • ${chalk.cyan("Args:")} ${args.map((arg) => `"${arg}"`).join(", ")}`);
+  log.message("");
+  log.message("Most MCP clients use a JSON configuration format like:");
+  log.message(
+    chalk.dim(`{
+  "mcpServers": {
+    "trigger": {
+      "command": "npx",
+      "args": [${args.map((arg) => `"${arg}"`).join(", ")}]
+    }
+  }
+}`)
+  );
+
+  return [];
+}
+
+async function installMcpServerForClient(
+  clientName: ResolvedClients,
+  options: InstallMcpCommandOptions
+) {
+  if (clientName === "unsupported") {
+    // This should not happen as unsupported clients are handled separately
+    // but if it does, provide helpful output
+    log.message(
+      `${chalk.yellow("⚠")} Skipping unsupported client - see manual configuration above`
+    );
+    return;
+  }
+
+  const scope = await resolveScopeForClient(clientName, options);
+
+  // clientSpinner.message(`Installing in ${scope.scope} scope at ${scope.location}`);
+
+  const configPath = await performInstallForClient(clientName, scope, options);
+
+  // clientSpinner.stop(`Successfully installed in ${clientName} (${configPath})`);
+
+  return { configPath, clientName, scope };
+}
+
+type McpServerConfig = Record<string, string | Array<string> | boolean | undefined>;
+type McpServerScope = {
+  scope: (typeof scopes)[number];
+  location: string;
+};
+
+async function performInstallForClient(
+  clientName: (typeof clients)[number],
+  scope: McpServerScope,
+  options: InstallMcpCommandOptions
+) {
+  const config = resolveMcpServerConfig(clientName, options);
+  const pathComponents = resolveMcpServerConfigJsonPath(clientName, scope);
+
+  return await writeMcpServerConfig(scope.location, pathComponents, config);
+}
+
+async function writeMcpServerConfig(
+  location: string,
+  pathComponents: string[],
+  config: McpServerConfig
+) {
+  const fullPath = expandTilde(location);
+
+  const extension = extname(fullPath);
+
+  switch (extension) {
+    case ".json": {
+      let existingConfig = await safeReadJSONCFile(fullPath);
+
+      if (!existingConfig) {
+        existingConfig = {};
+      }
+
+      const newConfig = applyConfigToExistingConfig(existingConfig, pathComponents, config);
+
+      await writeJSONFile(fullPath, newConfig, true);
+      break;
+    }
+    case ".toml": {
+      let existingConfig = await safeReadTomlFile(fullPath);
+
+      if (!existingConfig) {
+        existingConfig = {};
+      }
+
+      const newConfig = applyConfigToExistingConfig(existingConfig, pathComponents, config);
+
+      await writeTomlFile(fullPath, newConfig);
+      break;
+    }
+  }
+
+  return fullPath;
+}
+
+function applyConfigToExistingConfig(
+  existingConfig: any,
+  pathComponents: string[],
+  config: McpServerConfig
+) {
+  const clonedConfig = structuredClone(existingConfig);
+
+  let currentValueAtPath = clonedConfig;
+
+  for (let i = 0; i < pathComponents.length; i++) {
+    const currentPathSegment = pathComponents[i];
+
+    if (!currentPathSegment) {
+      break;
+    }
+
+    if (i === pathComponents.length - 1) {
+      currentValueAtPath[currentPathSegment] = config;
+      break;
+    } else {
+      currentValueAtPath[currentPathSegment] = currentValueAtPath[currentPathSegment] || {};
+      currentValueAtPath = currentValueAtPath[currentPathSegment];
+    }
+  }
+
+  return clonedConfig;
+}
+
+function resolveMcpServerConfigJsonPath(
+  clientName: (typeof clients)[number],
+  scope: McpServerScope
+) {
+  switch (clientName) {
+    case "cursor": {
+      return ["mcpServers", "trigger"];
+    }
+    case "vscode": {
+      return ["servers", "trigger"];
+    }
+    case "crush": {
+      return ["mcp", "trigger"];
+    }
+    case "windsurf": {
+      return ["mcpServers", "trigger"];
+    }
+    case "gemini-cli": {
+      return ["mcpServers", "trigger"];
+    }
+    case "cline": {
+      return ["mcpServers", "trigger"];
+    }
+    case "amp": {
+      return ["amp.mcpServers", "trigger"];
+    }
+    case "zed": {
+      return ["context_servers", "trigger"];
+    }
+    case "claude-code": {
+      if (scope.scope === "local") {
+        const projectPath = process.cwd();
+
+        return ["projects", projectPath, "mcpServers", "trigger"];
+      } else {
+        return ["mcpServers", "trigger"];
+      }
+    }
+    case "openai-codex": {
+      return ["mcp_servers", "trigger"];
+    }
+    case "opencode": {
+      return ["mcp", "trigger"];
+    }
+    case "ruler": {
+      return ["mcpServers", "trigger"];
+    }
+  }
+}
+
+function resolveMcpServerConfig(
+  clientName: (typeof clients)[number],
+  options: InstallMcpCommandOptions
+): McpServerConfig {
+  const args = [`trigger.dev@${options.tag}`, "mcp"];
+
+  if (options.logFile) {
+    args.push("--log-file", options.logFile);
+  }
+
+  if (options.apiUrl) {
+    args.push("--api-url", options.apiUrl);
+  }
+
+  if (options.devOnly) {
+    args.push("--dev-only");
+  }
+
+  if (options.projectRef) {
+    args.push("--project-ref", options.projectRef);
+  }
+
+  switch (clientName) {
+    case "claude-code": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "cursor": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "vscode": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "crush": {
+      return {
+        type: "stdio",
+        command: "npx",
+        args,
+      };
+    }
+    case "windsurf": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "gemini-cli": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "cline": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "amp": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "openai-codex": {
+      return {
+        command: "npx",
+        args,
+      };
+    }
+    case "zed": {
+      return {
+        source: "custom",
+        command: "npx",
+        args,
+      };
+    }
+    case "opencode": {
+      return {
+        type: "local",
+        command: ["npx", ...args],
+        enabled: true,
+      };
+    }
+    case "ruler": {
+      return {
+        type: "stdio",
+        command: "npx",
+        args,
+      };
+    }
+  }
+}
+
+async function resolveScopeForClient(
+  clientName: (typeof clients)[number],
+  options: InstallMcpCommandOptions
+) {
+  if (options.scope) {
+    const location = clientScopes[clientName][options.scope];
+
+    if (!location) {
+      throw new OutroCommandError(
+        `The ${clientName} client does not support the ${
+          options.scope
+        } scope, it only supports ${Object.keys(clientScopes[clientName]).join(", ")} scopes`
+      );
+    }
+
+    return {
+      scope: options.scope,
+      location,
+    };
+  }
+
+  const scopeOptions = resolveScopeOptionsForClient(clientName);
+
+  if (scopeOptions.length === 1) {
+    return {
+      scope: scopeOptions[0]!.value.scope,
+      location: scopeOptions[0]!.value.location,
+    };
+  }
+
+  const selectedScope = await select({
+    message: `Where should the MCP server for ${clientName} be installed?`,
+    options: scopeOptions,
+  });
+
+  if (isCancel(selectedScope)) {
+    throw new OutroCommandError("No scope selected");
+  }
+
+  return selectedScope;
+}
+
+function resolveScopeOptionsForClient(clientName: (typeof clients)[number]): Array<{
+  value: { location: string; scope: (typeof scopes)[number] };
+  label: string;
+  hint: string;
+}> {
+  const $clientScopes = clientScopes[clientName];
+
+  const options = Object.entries($clientScopes).map(([scope, location]) => ({
+    value: { location, scope: scope as (typeof scopes)[number] },
+    label: scope,
+    hint: scopeHint(scope as (typeof scopes)[number], location),
+  }));
+
+  return options;
+}
+
+function scopeHint(scope: (typeof scopes)[number], location: string) {
+  switch (scope) {
+    case "user": {
+      return `Install for your user account on your machine (${location})`;
+    }
+    case "project": {
+      return `Install in the current project shared with your team (${location})`;
+    }
+    case "local": {
+      return `Install in the current project, local to you only (${location})`;
+    }
+  }
+}
+
+async function resolveClients(options: InstallMcpCommandOptions): Promise<ResolvedClients[]> {
+  if (options.client) {
+    return options.client;
+  }
+
+  if (options.yolo) {
+    return [...clients];
+  }
+
+  const selectOptions: Array<{
+    value: string;
+    label: string;
+    hint?: string;
+  }> = clients.map((client) => ({
+    value: client,
+    label: clientLabels[client],
+  }));
+
+  selectOptions.push({
+    value: "unsupported",
+    label: "Unsupported client",
+    hint: "We don't support this client yet, but you can still install the MCP server manually.",
+  });
+
+  const $selectOptions = selectOptions as Array<{
+    value: ResolvedClients;
+    label: string;
+    hint?: string;
+  }>;
+
+  const selectedClients = await multiselect({
+    message: "Select one or more clients to install the MCP server into",
+    options: $selectOptions,
+    required: true,
+  });
+
+  if (isCancel(selectedClients)) {
+    throw new OutroCommandError("No clients selected");
+  }
+
+  return selectedClients;
+}
+
+async function resolveDevOnly(options: InstallMcpCommandOptions) {
+  if (typeof options.devOnly === "boolean") {
+    return options.devOnly;
+  }
+
+  const devOnly = await confirm({
+    message: "Restrict the MCP server to the dev environment only?",
+    initialValue: false,
+  });
+
+  if (isCancel(devOnly)) {
+    return false;
+  }
+
+  return devOnly;
+}
diff --git a/packages/cli-v3/src/commands/install-rules.ts b/packages/cli-v3/src/commands/install-rules.ts
new file mode 100644
index 00000000000..7500414bed9
--- /dev/null
+++ b/packages/cli-v3/src/commands/install-rules.ts
@@ -0,0 +1,612 @@
+import { confirm, intro, isCancel, log, multiselect, outro } from "@clack/prompts";
+import { ResolvedConfig } from "@trigger.dev/core/v3/build";
+import chalk from "chalk";
+import { Command, Option as CommandOption } from "commander";
+import { join } from "node:path";
+import * as semver from "semver";
+import { z } from "zod";
+import { OutroCommandError, wrapCommandAction } from "../cli/common.js";
+import { loadConfig } from "../config.js";
+import {
+  GithubRulesManifestLoader,
+  loadRulesManifest,
+  LocalRulesManifestLoader,
+  ManifestVersion,
+  RulesManifest,
+  RulesManifestVersionOption,
+} from "../rules/manifest.js";
+import { cliLink } from "../utilities/cliOutput.js";
+import {
+  readConfigHasSeenRulesInstallPrompt,
+  readConfigLastRulesInstallPromptVersion,
+  writeConfigHasSeenRulesInstallPrompt,
+  writeConfigLastRulesInstallPromptVersion,
+} from "../utilities/configFiles.js";
+import { pathExists, readFile, safeWriteFile } from "../utilities/fileSystem.js";
+import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
+import { logger } from "../utilities/logger.js";
+import { tryCatch } from "@trigger.dev/core/utils";
+
+const targets = [
+  "claude-code",
+  "cursor",
+  "vscode",
+  "windsurf",
+  "gemini-cli",
+  "cline",
+  "agents.md",
+  "amp",
+  "kilo",
+  "ruler",
+] as const;
+
+type TargetLabels = {
+  [key in (typeof targets)[number]]: string;
+};
+
+const targetLabels: TargetLabels = {
+  "claude-code": "Claude Code",
+  cursor: "Cursor",
+  vscode: "VSCode",
+  windsurf: "Windsurf",
+  "gemini-cli": "Gemini CLI",
+  cline: "Cline",
+  "agents.md": "AGENTS.md (OpenAI Codex CLI, Jules, OpenCode)",
+  amp: "Sourcegraph AMP",
+  kilo: "Kilo Code",
+  ruler: "Ruler",
+};
+
+type SupportedTargets = (typeof targets)[number];
+type ResolvedTargets = SupportedTargets | "unsupported";
+
+const InstallRulesCommandOptions = z.object({
+  target: z.enum(targets).array().optional(),
+  manifestPath: z.string().optional(),
+  branch: z.string().optional(),
+  logLevel: z.enum(["debug", "info", "log", "warn", "error", "none"]).optional(),
+  forceWizard: z.boolean().optional(),
+});
+
+type InstallRulesCommandOptions = z.infer<typeof InstallRulesCommandOptions>;
+
+export function configureInstallRulesCommand(program: Command) {
+  return program
+    .command("install-rules")
+    .description("Install the Trigger.dev Agent rules files")
+    .option(
+      "--target <targets...>",
+      "Choose the target (or targets) to install the Trigger.dev rules into. We currently support: " +
+        targets.join(", ")
+    )
+    .option(
+      "-l, --log-level <level>",
+      "The CLI log level to use (debug, info, log, warn, error, none). This does not effect the log level of your trigger.dev tasks.",
+      "log"
+    )
+    .addOption(
+      new CommandOption(
+        "--manifest-path <path>",
+        "The path to the rules manifest file. This is useful if you want to install the rules from a local file."
+      ).hideHelp()
+    )
+    .addOption(
+      new CommandOption(
+        "--branch <branch>",
+        "The branch to install the rules from, the default is main"
+      ).hideHelp()
+    )
+    .addOption(
+      new CommandOption(
+        "--force-wizard",
+        "Force the rules install wizard to run even if the rules have already been installed."
+      ).hideHelp()
+    )
+    .action(async (options) => {
+      await printStandloneInitialBanner(true);
+      await installRulesCommand(options);
+    });
+}
+
+export async function installRulesCommand(options: unknown) {
+  return await wrapCommandAction(
+    "installRulesCommand",
+    InstallRulesCommandOptions,
+    options,
+    async (opts) => {
+      if (opts.logLevel) {
+        logger.loggerLevel = opts.logLevel;
+      }
+
+      return await _installRulesCommand(opts);
+    }
+  );
+}
+
+async function _installRulesCommand(options: InstallRulesCommandOptions) {
+  if (options.forceWizard) {
+    await initiateRulesInstallWizard(options);
+    return;
+  }
+
+  intro("Welcome to the Trigger.dev Agent rules install wizard ");
+
+  const manifestLoader = options.manifestPath
+    ? new LocalRulesManifestLoader(options.manifestPath)
+    : new GithubRulesManifestLoader(options.branch ?? "main");
+
+  const manifest = await loadRulesManifest(manifestLoader);
+
+  writeConfigLastRulesInstallPromptVersion(manifest.currentVersion);
+  writeConfigHasSeenRulesInstallPrompt(true);
+
+  await installRules(manifest, options);
+
+  outro("You're all set! ");
+}
+
+type InstallRulesResults = Array<InstallRulesResult>;
+
+type InstallRulesResult = {
+  configPath: string;
+  targetName: (typeof targets)[number];
+};
+
+export type InstallRulesWizardOptions = {
+  target?: Array<(typeof targets)[number]>;
+  manifestPath?: string;
+  branch?: string;
+};
+
+export async function initiateRulesInstallWizard(options: InstallRulesWizardOptions) {
+  const manifestLoader = options.manifestPath
+    ? new LocalRulesManifestLoader(options.manifestPath)
+    : new GithubRulesManifestLoader(options.branch ?? "main");
+
+  const manifest = await loadRulesManifest(manifestLoader);
+
+  const hasSeenRulesInstallPrompt = readConfigHasSeenRulesInstallPrompt();
+
+  if (!hasSeenRulesInstallPrompt) {
+    writeConfigHasSeenRulesInstallPrompt(true);
+    writeConfigLastRulesInstallPromptVersion(manifest.currentVersion);
+
+    const installChoice = await confirm({
+      message: "Would you like to install the Trigger.dev code agent rules?",
+      initialValue: true,
+    });
+
+    const skipInstall = isCancel(installChoice) || !installChoice;
+
+    if (skipInstall) {
+      return;
+    }
+
+    await installRules(manifest, options);
+    return;
+  }
+
+  const lastRulesInstallPromptVersion = readConfigLastRulesInstallPromptVersion();
+
+  if (!lastRulesInstallPromptVersion) {
+    writeConfigHasSeenRulesInstallPrompt(true);
+    writeConfigLastRulesInstallPromptVersion(manifest.currentVersion);
+
+    const installChoice = await confirm({
+      message: `A new version of the trigger.dev agent rules is available (${manifest.currentVersion}). Do you want to install it?`,
+      initialValue: true,
+    });
+
+    const skipInstall = isCancel(installChoice) || !installChoice;
+
+    if (skipInstall) {
+      return;
+    }
+
+    await installRules(manifest, options);
+    return;
+  }
+
+  if (semver.gt(manifest.currentVersion, lastRulesInstallPromptVersion)) {
+    writeConfigHasSeenRulesInstallPrompt(true);
+    writeConfigLastRulesInstallPromptVersion(manifest.currentVersion);
+
+    const confirmed = await confirm({
+      message: `A new version of the trigger.dev agent rules is available (${lastRulesInstallPromptVersion} → ${chalk.greenBright(
+        manifest.currentVersion
+      )}). Do you want to install it?`,
+      initialValue: true,
+    });
+
+    if (isCancel(confirmed) || !confirmed) {
+      return;
+    }
+
+    await installRules(manifest, options);
+  }
+
+  return;
+}
+
+async function installRules(manifest: RulesManifest, opts: InstallRulesWizardOptions) {
+  const [_, config] = await tryCatch(
+    loadConfig({
+      cwd: process.cwd(),
+    })
+  );
+
+  const currentVersion = await manifest.getCurrentVersion();
+
+  const targetNames = await resolveTargets(opts);
+
+  if (targetNames.length === 1 && targetNames.includes("unsupported")) {
+    handleUnsupportedTargetOnly(opts);
+    return;
+  }
+
+  const results = [];
+
+  for (const targetName of targetNames) {
+    const result = await installRulesForTarget(
+      targetName,
+      currentVersion,
+      opts,
+      config ?? undefined
+    );
+
+    if (result) {
+      results.push(result);
+    }
+  }
+
+  if (results.length > 0) {
+    log.step("Installed the following rules files:");
+
+    for (const r of results) {
+      const installationsByLocation = r.installations.reduce(
+        (acc, i) => {
+          if (!acc[i.location]) {
+            acc[i.location] = [];
+          }
+
+          acc[i.location]!.push(i.option);
+
+          return acc;
+        },
+        {} as Record<string, RulesManifestVersionOption[]>
+      );
+
+      const locationOutput = Object.entries(installationsByLocation).map(
+        ([location]) => `${chalk.greenBright(location)}`
+      );
+
+      for (const message of locationOutput) {
+        log.info(message);
+      }
+    }
+
+    log.info(
+      `${cliLink("Learn how to use our rules", "https://trigger.dev/docs/agents/rules/overview")}`
+    );
+  }
+}
+
+function handleUnsupportedTargetOnly(options: InstallRulesCommandOptions): InstallRulesResults {
+  log.info(
+    `${cliLink("Install the rules manually", "https://trigger.dev/docs/agents/rules/overview")}`
+  );
+
+  return [];
+}
+
+async function installRulesForTarget(
+  targetName: ResolvedTargets,
+  currentVersion: ManifestVersion,
+  options: InstallRulesCommandOptions,
+  config?: ResolvedConfig
+) {
+  if (targetName === "unsupported") {
+    // This should not happen as unsupported targets are handled separately
+    // but if it does, provide helpful output
+    log.message(
+      `${chalk.yellow("⚠")} Skipping unsupported target - see manual configuration above`
+    );
+    return;
+  }
+
+  const result = await performInstallForTarget(targetName, currentVersion, options, config);
+
+  return result;
+}
+
+async function performInstallForTarget(
+  targetName: (typeof targets)[number],
+  currentVersion: ManifestVersion,
+  cmdOptions: InstallRulesCommandOptions,
+  config?: ResolvedConfig
+) {
+  const options = await resolveOptionsForTarget(targetName, currentVersion, cmdOptions);
+
+  const installations = await performInstallOptionsForTarget(targetName, options, config);
+
+  return {
+    targetName,
+    installations,
+  };
+}
+
+async function performInstallOptionsForTarget(
+  targetName: (typeof targets)[number],
+  options: Array<RulesManifestVersionOption>,
+  config?: ResolvedConfig
+) {
+  const results = [];
+
+  for (const option of options) {
+    const result = await performInstallOptionForTarget(targetName, option, config);
+    results.push(result);
+  }
+
+  return results;
+}
+
+async function performInstallOptionForTarget(
+  targetName: (typeof targets)[number],
+  option: RulesManifestVersionOption,
+  config?: ResolvedConfig
+) {
+  switch (option.installStrategy) {
+    case "default": {
+      return performInstallDefaultOptionForTarget(targetName, option, config);
+    }
+    case "claude-code-subagent": {
+      return performInstallClaudeCodeSubagentOptionForTarget(option);
+    }
+    default: {
+      throw new Error(`Unknown install strategy: ${option.installStrategy}`);
+    }
+  }
+}
+
+async function performInstallDefaultOptionForTarget(
+  targetName: (typeof targets)[number],
+  option: RulesManifestVersionOption,
+  config?: ResolvedConfig
+) {
+  // Get the path to the rules file
+  const rulesFilePath = resolveRulesFilePathForTargetOption(targetName, option);
+  const rulesFileContents = await resolveRulesFileContentsForTarget(targetName, option, config);
+  const mergeStrategy = await resolveRulesFileMergeStrategyForTarget(targetName);
+
+  // Try and read the existing rules file
+  const rulesFileAbsolutePath = join(process.cwd(), rulesFilePath);
+  await writeToFile(rulesFileAbsolutePath, rulesFileContents, mergeStrategy, option.name);
+
+  return { option, location: rulesFilePath };
+}
+
+async function writeToFile(
+  path: string,
+  contents: string,
+  mergeStrategy: "overwrite" | "replace" = "overwrite",
+  sectionName: string
+) {
+  const exists = await pathExists(path);
+
+  if (exists) {
+    switch (mergeStrategy) {
+      case "overwrite": {
+        await safeWriteFile(path, contents);
+        break;
+      }
+      case "replace": {
+        const existingContents = await readFile(path);
+
+        const pattern = new RegExp(
+          `<!-- TRIGGER.DEV ${sectionName} START -->.*?<!-- TRIGGER.DEV ${sectionName} END -->`,
+          "gs"
+        );
+
+        // If the section name is not found, just append the new content
+        if (!pattern.test(existingContents)) {
+          await safeWriteFile(path, existingContents + "\n\n" + contents);
+          break;
+        }
+
+        const updatedContent = existingContents.replace(pattern, contents);
+
+        await safeWriteFile(path, updatedContent);
+        break;
+      }
+      default: {
+        throw new Error(`Unknown merge strategy: ${mergeStrategy}`);
+      }
+    }
+  } else {
+    await safeWriteFile(path, contents);
+  }
+}
+
+async function performInstallClaudeCodeSubagentOptionForTarget(option: RulesManifestVersionOption) {
+  const rulesFilePath = ".claude/agents/trigger-dev-task-writer.md";
+  const rulesFileContents = option.contents;
+
+  await writeToFile(rulesFilePath, rulesFileContents, "overwrite", option.name);
+
+  return { option, location: rulesFilePath };
+}
+
+function resolveRulesFilePathForTargetOption(
+  targetName: (typeof targets)[number],
+  option: RulesManifestVersionOption
+): string {
+  if (option.installStrategy === "claude-code-subagent") {
+    return ".claude/agents/trigger-dev-task-writer.md";
+  }
+
+  switch (targetName) {
+    case "claude-code": {
+      return "CLAUDE.md";
+    }
+    case "cursor": {
+      return `.cursor/rules/trigger.${option.name}.mdc`;
+    }
+    case "vscode": {
+      return `.github/instructions/trigger-${option.name}.instructions.md`;
+    }
+    case "windsurf": {
+      return `.windsurf/rules/trigger-${option.name}.md`;
+    }
+    case "gemini-cli": {
+      return `GEMINI.md`;
+    }
+    case "cline": {
+      return `.clinerules/trigger-${option.name}.md`;
+    }
+    case "agents.md": {
+      return "AGENTS.md";
+    }
+    case "amp": {
+      return "AGENT.md";
+    }
+    case "kilo": {
+      return `.kilocode/rules/trigger-${option.name}.md`;
+    }
+    case "ruler": {
+      return `.ruler/trigger-${option.name}.md`;
+    }
+    default: {
+      throw new Error(`Unknown target: ${targetName}`);
+    }
+  }
+}
+
+async function resolveRulesFileMergeStrategyForTarget(targetName: (typeof targets)[number]) {
+  switch (targetName) {
+    case "amp":
+    case "agents.md":
+    case "gemini-cli":
+    case "claude-code": {
+      return "replace";
+    }
+    default: {
+      return "overwrite";
+    }
+  }
+}
+
+async function resolveRulesFileContentsForTarget(
+  targetName: (typeof targets)[number],
+  option: RulesManifestVersionOption,
+  config?: ResolvedConfig
+) {
+  switch (targetName) {
+    case "cursor": {
+      return $output(
+        frontmatter({
+          description: option.label,
+          globs: option.applyTo ?? "**/trigger/**/*.ts",
+          alwaysApply: false,
+        }),
+        option.contents
+      );
+    }
+    case "vscode": {
+      return $output(
+        frontmatter({
+          applyTo: option.applyTo ?? "**/trigger/**/*.ts",
+        }),
+        option.contents
+      );
+    }
+    case "windsurf": {
+      return $output(
+        frontmatter({
+          trigger: "glob",
+          globs: option.applyTo ?? "**/trigger/**/*.ts",
+        }),
+        option.contents
+      );
+    }
+    default: {
+      return $output(
+        `<!-- TRIGGER.DEV ${option.name} START -->`,
+        option.contents,
+        `<!-- TRIGGER.DEV ${option.name} END -->`
+      );
+    }
+  }
+}
+
+function frontmatter(data: Record<string, string | boolean>) {
+  return $output("---", ...Object.entries(data).map(([key, value]) => `${key}: ${value}`), "---");
+}
+
+function $output(...strings: string[]) {
+  return strings.map((s) => s).join("\n");
+}
+
+async function resolveOptionsForTarget(
+  targetName: (typeof targets)[number],
+  currentVersion: ManifestVersion,
+  cmdOptions: InstallRulesCommandOptions
+) {
+  const possibleOptions = currentVersion.options.filter(
+    (option) => !option.client || option.client === targetName
+  );
+
+  const selectedOptions = await multiselect({
+    message: `Choose the rules you want to install for ${targetLabels[targetName]}`,
+    options: possibleOptions.map((option) => ({
+      value: option,
+      label: option.title,
+      hint: `${option.label} [~${option.tokens} tokens]`,
+    })),
+    required: true,
+  });
+
+  if (isCancel(selectedOptions)) {
+    throw new OutroCommandError("No options selected");
+  }
+
+  return selectedOptions;
+}
+
+async function resolveTargets(options: InstallRulesCommandOptions): Promise<ResolvedTargets[]> {
+  if (options.target) {
+    return options.target;
+  }
+
+  const selectOptions: Array<{
+    value: string;
+    label: string;
+    hint?: string;
+  }> = targets.map((target) => ({
+    value: target,
+    label: targetLabels[target],
+  }));
+
+  selectOptions.push({
+    value: "unsupported",
+    label: "Unsupported target",
+    hint: "We don't support this target yet, but you can still install the rules manually.",
+  });
+
+  const $selectOptions = selectOptions as Array<{
+    value: ResolvedTargets;
+    label: string;
+    hint?: string;
+  }>;
+
+  const selectedTargets = await multiselect({
+    message: "Select one or more targets to install the rules into",
+    options: $selectOptions,
+    required: true,
+  });
+
+  if (isCancel(selectedTargets)) {
+    throw new OutroCommandError("No targets selected");
+  }
+
+  return selectedTargets;
+}
diff --git a/packages/cli-v3/src/commands/login.ts b/packages/cli-v3/src/commands/login.ts
index 687b6e8f6dd..f3b46405a73 100644
--- a/packages/cli-v3/src/commands/login.ts
+++ b/packages/cli-v3/src/commands/login.ts
@@ -14,7 +14,11 @@ import {
   wrapCommandAction,
 } from "../cli/common.js";
 import { chalkLink, prettyError } from "../utilities/cliOutput.js";
-import { readAuthConfigProfile, writeAuthConfigProfile } from "../utilities/configFiles.js";
+import {
+  readAuthConfigProfile,
+  writeAuthConfigProfile,
+  writeAuthConfigCurrentProfileName,
+} from "../utilities/configFiles.js";
 import { printInitialBanner } from "../utilities/initialBanner.js";
 import { LoginResult } from "../utilities/session.js";
 import { whoAmI } from "./whoami.js";
@@ -25,9 +29,10 @@ import { VERSION } from "../version.js";
 import { env, isCI } from "std-env";
 import { CLOUD_API_URL } from "../consts.js";
 import {
-  isPersonalAccessToken,
+  validateAccessToken,
   NotPersonalAccessTokenError,
-} from "../utilities/isPersonalAccessToken.js";
+  NotAccessTokenError,
+} from "../utilities/accessTokens.js";
 import { links } from "@trigger.dev/core/v3";
 
 export const LoginCommandOptions = CommonCommandOptions.extend({
@@ -45,7 +50,7 @@ export function configureLoginCommand(program: Command) {
     .version(VERSION, "-v, --version", "Display the version number")
     .action(async (options) => {
       await handleTelemetry(async () => {
-        await printInitialBanner(false);
+        await printInitialBanner(false, options.profile);
         await loginCommand(options);
       });
     });
@@ -90,8 +95,12 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
       const accessTokenFromEnv = env.TRIGGER_ACCESS_TOKEN;
 
       if (accessTokenFromEnv) {
-        if (!isPersonalAccessToken(accessTokenFromEnv)) {
-          throw new NotPersonalAccessTokenError(
+        const validationResult = validateAccessToken(accessTokenFromEnv);
+
+        if (!validationResult.success) {
+          // We deliberately don't surface the existence of organization access tokens to the user for now, as they're only used internally.
+          // Once we expose them in the application, we should also communicate that option here.
+          throw new NotAccessTokenError(
             "Your TRIGGER_ACCESS_TOKEN is not a Personal Access Token, they start with 'tr_pat_'. You can generate one here: https://cloud.trigger.dev/account/tokens"
           );
         }
@@ -115,6 +124,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
           dashboardUrl: userData.data.dashboardUrl,
           auth: {
             accessToken: auth.accessToken,
+            tokenType: validationResult.type,
             apiUrl: auth.apiUrl,
           },
         };
@@ -184,6 +194,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
                 auth: {
                   accessToken: authConfig.accessToken,
                   apiUrl: authConfig.apiUrl ?? opts.defaultApiUrl,
+                  tokenType: "personal" as const,
                 },
               };
             }
@@ -205,6 +216,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
               auth: {
                 accessToken: authConfig.accessToken,
                 apiUrl: authConfig.apiUrl ?? opts.defaultApiUrl,
+                tokenType: "personal" as const,
               },
             };
           }
@@ -266,7 +278,10 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
         getPersonalAccessTokenSpinner.stop(`Logged in with token ${indexResult.obfuscatedToken}`);
 
         writeAuthConfigProfile(
-          { accessToken: indexResult.token, apiUrl: opts.defaultApiUrl },
+          {
+            accessToken: indexResult.token,
+            apiUrl: opts.defaultApiUrl,
+          },
           options?.profile
         );
 
@@ -283,6 +298,11 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
           throw new Error(whoAmIResult.error);
         }
 
+        const profileName = options?.profile ?? "default";
+
+        // Set this profile as the current default
+        writeAuthConfigCurrentProfileName(profileName);
+
         if (opts.embedded) {
           log.step("Logged in successfully");
         } else {
@@ -293,13 +313,14 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
 
         return {
           ok: true as const,
-          profile: options?.profile ?? "default",
+          profile: profileName,
           userId: whoAmIResult.data.userId,
           email: whoAmIResult.data.email,
           dashboardUrl: whoAmIResult.data.dashboardUrl,
           auth: {
             accessToken: indexResult.token,
             apiUrl: authConfig?.apiUrl ?? opts.defaultApiUrl,
+            tokenType: "personal" as const,
           },
         };
       } catch (e) {
@@ -337,7 +358,7 @@ export async function login(options?: LoginOptions): Promise<LoginResult> {
   });
 }
 
-async function getPersonalAccessToken(apiClient: CliApiClient, authorizationCode: string) {
+export async function getPersonalAccessToken(apiClient: CliApiClient, authorizationCode: string) {
   return await tracer.startActiveSpan("getPersonalAccessToken", async (span) => {
     try {
       const token = await apiClient.getPersonalAccessToken(authorizationCode);
diff --git a/packages/cli-v3/src/commands/logout.ts b/packages/cli-v3/src/commands/logout.ts
index 6fefa5f6344..26cc677500c 100644
--- a/packages/cli-v3/src/commands/logout.ts
+++ b/packages/cli-v3/src/commands/logout.ts
@@ -18,7 +18,7 @@ export function configureLogoutCommand(program: Command) {
   return commonOptions(program.command("logout").description("Logout of Trigger.dev")).action(
     async (options) => {
       await handleTelemetry(async () => {
-        await printInitialBanner(false);
+        await printInitialBanner(false, options.profile);
         await logoutCommand(options);
       });
     }
diff --git a/packages/cli-v3/src/commands/mcp.ts b/packages/cli-v3/src/commands/mcp.ts
new file mode 100644
index 00000000000..fd992f9059a
--- /dev/null
+++ b/packages/cli-v3/src/commands/mcp.ts
@@ -0,0 +1,119 @@
+import { intro, outro } from "@clack/prompts";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { VERSION } from "@trigger.dev/core";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { Command, Option as CommandOption } from "commander";
+import { z } from "zod";
+import { CommonCommandOptions, commonOptions, wrapCommandAction } from "../cli/common.js";
+import { CLOUD_API_URL } from "../consts.js";
+import { McpContext } from "../mcp/context.js";
+import { FileLogger } from "../mcp/logger.js";
+import { registerTools } from "../mcp/tools.js";
+import { printStandloneInitialBanner } from "../utilities/initialBanner.js";
+import { logger } from "../utilities/logger.js";
+import { installMcpServer } from "./install-mcp.js";
+import { serverMetadata } from "../mcp/config.js";
+import { initiateRulesInstallWizard } from "./install-rules.js";
+
+const McpCommandOptions = CommonCommandOptions.extend({
+  projectRef: z.string().optional(),
+  logFile: z.string().optional(),
+  devOnly: z.boolean().default(false),
+  rulesInstallManifestPath: z.string().optional(),
+  rulesInstallBranch: z.string().optional(),
+});
+
+export type McpCommandOptions = z.infer<typeof McpCommandOptions>;
+
+export function configureMcpCommand(program: Command) {
+  return commonOptions(
+    program
+      .command("mcp")
+      .description("Run the MCP server")
+      .option("-p, --project-ref <project ref>", "The project ref to use")
+      .option(
+        "--dev-only",
+        "Only run the MCP server for the dev environment. Attempts to access other environments will fail."
+      )
+      .option("--log-file <log file>", "The file to log to")
+      .addOption(
+        new CommandOption(
+          "--rules-install-manifest-path <path>",
+          "The path to the rules install manifest"
+        ).hideHelp()
+      )
+      .addOption(
+        new CommandOption(
+          "--rules-install-branch <branch>",
+          "The branch to install the rules from"
+        ).hideHelp()
+      )
+  ).action(async (options) => {
+    wrapCommandAction("mcp", McpCommandOptions, options, async (opts) => {
+      await mcpCommand(opts);
+    });
+  });
+}
+
+export async function mcpCommand(options: McpCommandOptions) {
+  if (process.stdout.isTTY) {
+    await printStandloneInitialBanner(true, options.profile);
+
+    intro("Welcome to the Trigger.dev MCP server install wizard 🧙");
+
+    const [installError] = await tryCatch(
+      installMcpServer({
+        yolo: false,
+        tag: VERSION as string,
+        logLevel: "log",
+      })
+    );
+
+    if (installError) {
+      outro(`Failed to install MCP server: ${installError.message}`);
+      return;
+    }
+
+    await initiateRulesInstallWizard({
+      manifestPath: options.rulesInstallManifestPath,
+      branch: options.rulesInstallBranch,
+    });
+
+    return;
+  }
+
+  logger.loggerLevel = "none";
+
+  const server = new McpServer(
+    {
+      name: serverMetadata.name,
+      version: serverMetadata.version,
+    },
+    {
+      instructions: serverMetadata.instructions,
+    }
+  );
+
+  server.server.oninitialized = async () => {
+    fileLogger?.log("initialized mcp command", { options, argv: process.argv });
+  };
+
+  // Start receiving messages on stdin and sending messages on stdout
+  const transport = new StdioServerTransport();
+
+  const fileLogger: FileLogger | undefined = options.logFile
+    ? new FileLogger(options.logFile, server)
+    : undefined;
+
+  const context = new McpContext(server, {
+    projectRef: options.projectRef,
+    fileLogger,
+    apiUrl: options.apiUrl ?? CLOUD_API_URL,
+    profile: options.profile,
+  });
+
+  registerTools(context);
+
+  await server.connect(transport);
+}
diff --git a/packages/cli-v3/src/commands/preview.ts b/packages/cli-v3/src/commands/preview.ts
index 2dab147a516..598d4e9ef6a 100644
--- a/packages/cli-v3/src/commands/preview.ts
+++ b/packages/cli-v3/src/commands/preview.ts
@@ -53,7 +53,7 @@ export function configurePreviewCommand(program: Command) {
       )
   ).action(async (path, options) => {
     await handleTelemetry(async () => {
-      await printStandloneInitialBanner(true);
+      await printStandloneInitialBanner(true, options.profile);
       await previewArchiveCommand(path, options);
     });
   });
diff --git a/packages/cli-v3/src/commands/promote.ts b/packages/cli-v3/src/commands/promote.ts
index 59452c9ec26..38958919227 100644
--- a/packages/cli-v3/src/commands/promote.ts
+++ b/packages/cli-v3/src/commands/promote.ts
@@ -49,7 +49,7 @@ export function configurePromoteCommand(program: Command) {
       )
   ).action(async (version, options) => {
     await handleTelemetry(async () => {
-      await printStandloneInitialBanner(true);
+      await printStandloneInitialBanner(true, options.profile);
       await promoteCommand(version, options);
     });
   });
diff --git a/packages/cli-v3/src/commands/trigger.ts b/packages/cli-v3/src/commands/trigger.ts
index 1bf6425d6a0..c030def80f7 100644
--- a/packages/cli-v3/src/commands/trigger.ts
+++ b/packages/cli-v3/src/commands/trigger.ts
@@ -48,7 +48,7 @@ export function configureTriggerTaskCommand(program: Command) {
 
 export async function triggerTaskCommand(taskName: string, options: unknown) {
   return await wrapCommandAction("trigger", TriggerTaskOptions, options, async (opts) => {
-    await printInitialBanner(false);
+    await printInitialBanner(false, opts.profile);
     return await triggerTask(taskName, opts);
   });
 }
diff --git a/packages/cli-v3/src/commands/update.ts b/packages/cli-v3/src/commands/update.ts
index 92fd2ec8f83..f94718213f7 100644
--- a/packages/cli-v3/src/commands/update.ts
+++ b/packages/cli-v3/src/commands/update.ts
@@ -1,12 +1,12 @@
 import { confirm, intro, isCancel, log, outro } from "@clack/prompts";
 import { Command } from "commander";
 import { detectPackageManager, installDependencies } from "nypm";
-import { basename, dirname, resolve } from "path";
+import { dirname, join, resolve } from "path";
 import { PackageJson, readPackageJSON, type ResolveOptions, resolvePackageJSON } from "pkg-types";
 import { z } from "zod";
 import { CommonCommandOptions, OutroCommandError, wrapCommandAction } from "../cli/common.js";
 import { chalkError, prettyError, prettyWarning } from "../utilities/cliOutput.js";
-import { removeFile, writeJSONFile } from "../utilities/fileSystem.js";
+import { removeFile, writeJSONFilePreserveOrder } from "../utilities/fileSystem.js";
 import { printStandloneInitialBanner, updateCheck } from "../utilities/initialBanner.js";
 import { logger } from "../utilities/logger.js";
 import { spinner } from "../utilities/windows.js";
@@ -227,7 +227,7 @@ export async function updateTriggerPackages(
 
   // Backup package.json
   const packageJsonBackupPath = `${packageJsonPath}.bak`;
-  await writeJSONFile(packageJsonBackupPath, readonlyPackageJson, true);
+  await writeJSONFilePreserveOrder(packageJsonBackupPath, readonlyPackageJson, true);
 
   const exitHandler = async (sig: any) => {
     log.warn(
@@ -241,10 +241,10 @@ export async function updateTriggerPackages(
 
   // Update package.json
   mutatePackageJsonWithUpdatedPackages(packageJson, mismatches, cliVersion);
-  await writeJSONFile(packageJsonPath, packageJson, true);
+  await writeJSONFilePreserveOrder(packageJsonPath, packageJson, true);
 
   async function revertPackageJsonChanges() {
-    await writeJSONFile(packageJsonPath, readonlyPackageJson, true);
+    await writeJSONFilePreserveOrder(packageJsonPath, readonlyPackageJson, true);
     await removeFile(packageJsonBackupPath);
   }
 
@@ -319,7 +319,7 @@ async function getTriggerDependencies(
         continue;
       }
 
-      const $version = await tryResolveTriggerPackageVersion(name, packageJsonPath);
+      const $version = await tryResolveTriggerPackageVersion(name, dirname(packageJsonPath));
 
       deps.push({ type, name, version: $version ?? version });
     }
@@ -328,13 +328,13 @@ async function getTriggerDependencies(
   return deps;
 }
 
-async function tryResolveTriggerPackageVersion(
+export async function tryResolveTriggerPackageVersion(
   name: string,
-  packageJsonPath: string
+  basedir?: string
 ): Promise<string | undefined> {
   try {
     const resolvedPath = nodeResolve.sync(name, {
-      basedir: dirname(packageJsonPath),
+      basedir,
     });
 
     logger.debug(`Resolved ${name} package version path`, { name, resolvedPath });
@@ -342,11 +342,11 @@ async function tryResolveTriggerPackageVersion(
     const { packageJson } = await getPackageJson(dirname(resolvedPath), {
       test: (filePath) => {
         // We need to skip any type-marker files
-        if (filePath.includes("dist/commonjs")) {
+        if (filePath.includes(join("dist", "commonjs"))) {
           return false;
         }
 
-        if (filePath.includes("dist/esm")) {
+        if (filePath.includes(join("dist", "esm"))) {
           return false;
         }
 
diff --git a/packages/cli-v3/src/commands/whoami.ts b/packages/cli-v3/src/commands/whoami.ts
index 54c5c1dea07..5f04eb67fb9 100644
--- a/packages/cli-v3/src/commands/whoami.ts
+++ b/packages/cli-v3/src/commands/whoami.ts
@@ -56,7 +56,7 @@ export function configureWhoamiCommand(program: Command) {
       )
   ).action(async (options) => {
     await handleTelemetry(async () => {
-      await printInitialBanner(false);
+      await printInitialBanner(false, options.profile);
       await whoAmICommand(options);
     });
   });
diff --git a/packages/cli-v3/src/commands/workers/build.ts b/packages/cli-v3/src/commands/workers/build.ts
index 960d94cddea..59aa8e020a7 100644
--- a/packages/cli-v3/src/commands/workers/build.ts
+++ b/packages/cli-v3/src/commands/workers/build.ts
@@ -121,7 +121,7 @@ export function configureWorkersBuildCommand(program: Command) {
     .option("--save-logs", "If provided, will save logs even for successful builds")
     .action(async (path, options) => {
       await handleTelemetry(async () => {
-        await printStandloneInitialBanner(true);
+        await printStandloneInitialBanner(true, options.profile);
         await workersBuildCommand(path, options);
       });
     });
@@ -239,6 +239,7 @@ async function _workerBuildCommand(dir: string, options: WorkersBuildCommandOpti
     userId: authorization.userId,
     selfHosted: options.local,
     type: "UNMANAGED",
+    isNativeBuild: false,
   });
 
   if (!deploymentResponse.success) {
@@ -336,6 +337,7 @@ async function _workerBuildCommand(dir: string, options: WorkersBuildCommandOpti
     projectRef: resolvedConfig.project,
     apiUrl: projectClient.client.apiURL,
     apiKey: projectClient.client.accessToken!,
+    apiClient: projectClient.client,
     branchName: branch,
     authAccessToken: authorization.auth.accessToken,
     compilationPath: destination.path,
diff --git a/packages/cli-v3/src/commands/workers/create.ts b/packages/cli-v3/src/commands/workers/create.ts
index 9f93c7ad739..dd314439e60 100644
--- a/packages/cli-v3/src/commands/workers/create.ts
+++ b/packages/cli-v3/src/commands/workers/create.ts
@@ -40,7 +40,7 @@ export function configureWorkersCreateCommand(program: Command) {
       )
       .action(async (path, options) => {
         await handleTelemetry(async () => {
-          await printStandloneInitialBanner(true);
+          await printStandloneInitialBanner(true, options.profile);
           await workersCreateCommand(path, options);
         });
       })
diff --git a/packages/cli-v3/src/commands/workers/list.ts b/packages/cli-v3/src/commands/workers/list.ts
index ae4467a107f..e2f89aef5a9 100644
--- a/packages/cli-v3/src/commands/workers/list.ts
+++ b/packages/cli-v3/src/commands/workers/list.ts
@@ -39,7 +39,7 @@ export function configureWorkersListCommand(program: Command) {
       )
       .action(async (path, options) => {
         await handleTelemetry(async () => {
-          await printStandloneInitialBanner(true);
+          await printStandloneInitialBanner(true, options.profile);
           await workersListCommand(path, options);
         });
       })
diff --git a/packages/cli-v3/src/commands/workers/run.ts b/packages/cli-v3/src/commands/workers/run.ts
index f4e9ab7c554..87b7703c454 100644
--- a/packages/cli-v3/src/commands/workers/run.ts
+++ b/packages/cli-v3/src/commands/workers/run.ts
@@ -44,7 +44,7 @@ export function configureWorkersRunCommand(program: Command) {
       .option("--network <mode>", "The networking mode for the container", "host")
       .action(async (path, options) => {
         await handleTelemetry(async () => {
-          await printStandloneInitialBanner(true);
+          await printStandloneInitialBanner(true, options.profile);
           await workersRunCommand(path, options);
         });
       })
diff --git a/packages/cli-v3/src/config.ts b/packages/cli-v3/src/config.ts
index 3e4d27d7a33..af5623e0176 100644
--- a/packages/cli-v3/src/config.ts
+++ b/packages/cli-v3/src/config.ts
@@ -22,6 +22,7 @@ import {
 import { prettyWarning } from "./utilities/cliOutput.js";
 import type { InstrumentationModuleDefinition } from "@opentelemetry/instrumentation";
 import { builtinModules } from "node:module";
+import { OutroCommandError } from "./cli/common.js";
 
 export type ResolveConfigOptions = {
   cwd?: string;
@@ -162,6 +163,21 @@ async function resolveConfig(
     ? dirname(packageJsonPath)
     : cwd;
 
+  // `trigger.config` is the fallback value set by c12
+  const missingConfigFile = !result.configFile || result.configFile === "trigger.config";
+
+  if (missingConfigFile) {
+    throw new OutroCommandError(
+      [
+        "Couldn't find your trigger.config.ts file.",
+        "",
+        "Make sure you are in the directory of your Trigger.dev project, or specify the path to your config file using the `--config <path>` flag.",
+        "",
+        "Alternatively, you can initialize a new project using `npx trigger.dev@latest init`.",
+      ].join("\n")
+    );
+  }
+
   const config =
     "config" in result.config ? (result.config.config as TriggerConfig) : result.config;
 
diff --git a/packages/cli-v3/src/deploy/archiveContext.ts b/packages/cli-v3/src/deploy/archiveContext.ts
new file mode 100644
index 00000000000..d0000d22f99
--- /dev/null
+++ b/packages/cli-v3/src/deploy/archiveContext.ts
@@ -0,0 +1,154 @@
+import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
+import { glob } from "tinyglobby";
+import * as tar from "tar";
+import ignore from "ignore";
+import { tryCatch } from "@trigger.dev/core/v3";
+import { logger } from "../utilities/logger.js";
+
+const DEFAULT_IGNORES = [
+  ".git/**",
+  "node_modules/**",
+  "**/.DS_Store",
+  "**/.git",
+  "**/node_modules",
+  "**/*.log",
+  "**/npm-debug.log*",
+  "**/yarn-debug.log*",
+  "**/yarn-error.log*",
+  "**/.npm",
+  "**/.eslintcache",
+  "**/.node_repl_history",
+  "**/.yarn-integrity",
+  "**/coverage",
+  "**/.nyc_output",
+  "**/.cache",
+  "**/.parcel-cache",
+  "**/.next",
+  "**/.nuxt",
+  "**/dist",
+  "**/.turbo",
+  "**/.vercel",
+  "**/out",
+  "**/.temp",
+  "**/.tmp",
+  "**/.trigger",
+  "**/.env",
+  "**/.env.local",
+  "**/Thumbs.db",
+  "**/.idea",
+  "**/.vscode",
+  "**/.output",
+  "**/.yarn",
+  "**/build",
+  "**/__pycache__",
+  "**/*.pyc",
+  "**/.venv",
+  "**/venv",
+];
+
+async function getGitignoreContent(gitignorePath: string): Promise<string> {
+  if (!existsSync(gitignorePath)) {
+    return "";
+  }
+
+  const [error, content] = await tryCatch(readFile(gitignorePath, "utf-8"));
+
+  if (error) {
+    throw new Error(`Failed to read .gitignore at ${gitignorePath}: ${error.message}`);
+  }
+
+  return content;
+}
+
+function gitignoreToGlobs(content: string): string[] {
+  if (content.includes("!")) {
+    return [];
+  }
+
+  return content
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((line) => line && !line.startsWith("#"))
+    .map((pattern) => {
+      if (pattern.endsWith("/")) {
+        const isAnchored = pattern.startsWith("/");
+        const cleanPattern = pattern.replace(/^\//, "");
+
+        if (isAnchored) {
+          return `${cleanPattern}**`;
+        }
+        return `**/${cleanPattern}**`;
+      }
+
+      // For files, we only pass exact root matches or simple patterns to help with root clutter
+      // complex wildcards are hard to map perfectly to fast-glob ignores without risk
+      return pattern;
+    });
+}
+
+export async function createContextArchive(workspaceDir: string, outputPath: string) {
+  logger.debug("Creating context archive", { workspaceDir, outputPath });
+
+  // read .gitignore if it exists
+  const gitignorePath = join(workspaceDir, ".gitignore");
+  const gitignoreContent = await getGitignoreContent(gitignorePath);
+
+  const ig = ignore();
+  ig.add(DEFAULT_IGNORES);
+  if (gitignoreContent) {
+    ig.add(gitignoreContent);
+  }
+
+  // performance optimization
+  const gitignoreGlobs = gitignoreToGlobs(gitignoreContent);
+  const globIgnorePatterns = [...DEFAULT_IGNORES, ...gitignoreGlobs];
+
+  logger.debug("Ignore patterns for glob", { count: globIgnorePatterns.length });
+
+  // find all files to include in the archive
+  const startTime = Date.now();
+  const allFiles = await glob(["**/*"], {
+    cwd: workspaceDir,
+    ignore: globIgnorePatterns,
+    dot: true,
+    absolute: false,
+    onlyFiles: true,
+    followSymbolicLinks: false, // don't follow symlinks to avoid infinite loops or outside access
+  });
+
+  // filter using ignore package for correctness
+  const files = allFiles.filter((file) => !ig.ignores(file));
+
+  const scanDuration = Date.now() - startTime;
+
+  logger.debug("Files to archive", {
+    count: files.length,
+    scanDurationMs: scanDuration,
+    ignoredCount: allFiles.length - files.length,
+  });
+
+  if (files.length === 0) {
+    throw new Error("No files found to archive. Check your .gitignore settings.");
+  }
+
+  await tar.create(
+    {
+      gzip: true,
+      file: outputPath,
+      cwd: workspaceDir,
+      portable: true,
+      preservePaths: false,
+      mtime: new Date(0),
+    },
+    files
+  );
+
+  logger.debug("Archive created", { outputPath, fileCount: files.length });
+}
+
+export async function getArchiveSize(archivePath: string): Promise<number> {
+  const { statSync } = await import("node:fs");
+  return statSync(archivePath).size;
+}
diff --git a/packages/cli-v3/src/deploy/buildImage.ts b/packages/cli-v3/src/deploy/buildImage.ts
index ee642578711..b81cac7a1c0 100644
--- a/packages/cli-v3/src/deploy/buildImage.ts
+++ b/packages/cli-v3/src/deploy/buildImage.ts
@@ -11,16 +11,24 @@ import { z } from "zod";
 import { assertExhaustive } from "../utilities/assertExhaustive.js";
 import { pathToFileURL } from "url";
 import type { ContainerfileTemplate } from "./containerfile-template.js";
+import { tryCatch } from "@trigger.dev/core";
+import { CliApiClient } from "../apiClient.js";
 
 export interface BuildImageOptions {
   // Common options
   isLocalBuild: boolean;
+  useRegistryCache?: boolean;
   imagePlatform: string;
   noCache?: boolean;
   load?: boolean;
+  compression?: "zstd" | "gzip";
+  cacheCompression?: "zstd" | "gzip";
+  compressionLevel?: number;
+  forceCompression?: boolean;
 
   // Local build options
   push?: boolean;
+  authenticateToRegistry?: boolean;
   network?: string;
   builder: string;
 
@@ -39,6 +47,7 @@ export interface BuildImageOptions {
   extraCACerts?: string;
   apiUrl: string;
   apiKey: string;
+  apiClient: CliApiClient;
   branchName?: string;
   buildEnvVars?: Record<string, string | undefined>;
   indexEnvVars?: Record<string, string>; // Environment variables for indexing
@@ -49,9 +58,11 @@ export interface BuildImageOptions {
 export async function buildImage(options: BuildImageOptions): Promise<BuildImageResults> {
   const {
     isLocalBuild,
+    useRegistryCache,
     imagePlatform,
     noCache,
     push,
+    authenticateToRegistry,
     load,
     authAccessToken,
     imageTag,
@@ -67,11 +78,16 @@ export async function buildImage(options: BuildImageOptions): Promise<BuildImage
     extraCACerts,
     apiUrl,
     apiKey,
+    apiClient,
     branchName,
     buildEnvVars,
     indexEnvVars,
     network,
     builder,
+    compression,
+    cacheCompression,
+    compressionLevel,
+    forceCompression,
     onLog,
     baseImageNode,
   } = options;
@@ -87,16 +103,23 @@ export async function buildImage(options: BuildImageOptions): Promise<BuildImage
       contentHash,
       projectRef,
       push,
+      authenticateToRegistry,
       load,
       noCache,
+      useRegistryCache,
       extraCACerts,
       apiUrl,
       apiKey,
+      apiClient,
       branchName,
       buildEnvVars,
       indexEnvVars,
       network,
       builder,
+      compression,
+      cacheCompression,
+      compressionLevel,
+      forceCompression,
       onLog,
       baseImageNode,
     });
@@ -128,6 +151,9 @@ export async function buildImage(options: BuildImageOptions): Promise<BuildImage
     branchName,
     buildEnvVars,
     indexEnvVars,
+    compression,
+    compressionLevel,
+    forceCompression,
     onLog,
     baseImageNode,
   });
@@ -153,6 +179,9 @@ export interface DepotBuildImageOptions {
   extraCACerts?: string;
   buildEnvVars?: Record<string, string | undefined>;
   indexEnvVars?: Record<string, string>;
+  compression?: "zstd" | "gzip";
+  compressionLevel?: number;
+  forceCompression?: boolean;
   onLog?: (log: string) => void;
   baseImageNode?: string;
 }
@@ -177,6 +206,15 @@ async function remoteBuildImage(options: DepotBuildImageOptions): Promise<BuildI
     .filter(([key, value]) => value)
     .flatMap(([key, value]) => ["--build-arg", `${key}=${value}`]);
 
+  const outputOptions = getOutputOptions({
+    imageTag: undefined, // This is already handled via the --save flag
+    push: true, // We always push the image to the registry
+    load: options.load,
+    compression: options.compression,
+    compressionLevel: options.compressionLevel,
+    forceCompression: options.forceCompression,
+  });
+
   const args = [
     "build",
     "-f",
@@ -184,18 +222,17 @@ async function remoteBuildImage(options: DepotBuildImageOptions): Promise<BuildI
     options.noCache ? "--no-cache" : undefined,
     "--platform",
     options.imagePlatform,
-    options.load ? "--load" : undefined,
     "--provenance",
     "false",
     "--metadata-file",
     "metadata.json",
     "--build-arg",
+    `SOURCE_DATE_EPOCH=0`,
+    "--build-arg",
     `TRIGGER_PROJECT_ID=${options.projectId}`,
     "--build-arg",
     `TRIGGER_DEPLOYMENT_ID=${options.deploymentId}`,
     "--build-arg",
-    `TRIGGER_DEPLOYMENT_VERSION=${options.deploymentVersion}`,
-    "--build-arg",
     `TRIGGER_CONTENT_HASH=${options.contentHash}`,
     "--build-arg",
     `TRIGGER_PROJECT_REF=${options.projectRef}`,
@@ -213,6 +250,8 @@ async function remoteBuildImage(options: DepotBuildImageOptions): Promise<BuildI
     "plain",
     ".",
     "--save",
+    "--output",
+    outputOptions.join(","),
   ].filter(Boolean) as string[];
 
   logger.debug(`depot ${args.join(" ")}`, { cwd: options.cwd });
@@ -303,22 +342,39 @@ interface SelfHostedBuildImageOptions {
   projectRef: string;
   imagePlatform: string;
   push?: boolean;
+  authenticateToRegistry?: boolean;
   apiUrl: string;
   apiKey: string;
+  apiClient: CliApiClient;
   branchName?: string;
   noCache?: boolean;
+  useRegistryCache?: boolean;
   extraCACerts?: string;
   buildEnvVars?: Record<string, string | undefined>;
   indexEnvVars?: Record<string, string>;
   network?: string;
   builder: string;
   load?: boolean;
+  compression?: "zstd" | "gzip";
+  cacheCompression?: "zstd" | "gzip";
+  compressionLevel?: number;
+  forceCompression?: boolean;
   onLog?: (log: string) => void;
   baseImageNode?: string;
 }
 
 async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<BuildImageResults> {
-  const { builder, imageTag } = options;
+  const {
+    builder,
+    imageTag,
+    deploymentId,
+    apiClient,
+    useRegistryCache,
+    compression,
+    cacheCompression,
+    compressionLevel,
+    forceCompression,
+  } = options;
 
   // Ensure multi-platform build is supported on the local machine
   let builderExists = false;
@@ -427,6 +483,75 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
 
   await ensureQemuRegistered(options.imagePlatform);
 
+  const errors: string[] = [];
+
+  let cloudRegistryHost: string | undefined;
+  if (push && options.authenticateToRegistry) {
+    cloudRegistryHost =
+      process.env.TRIGGER_DOCKER_REGISTRY ?? extractRegistryHostFromImageTag(imageTag);
+
+    if (!cloudRegistryHost) {
+      return {
+        ok: false as const,
+        error: "Failed to extract registry host from image tag",
+        logs: "",
+      };
+    }
+
+    const [credentialsError, credentials] = await tryCatch(
+      getDockerUsernameAndPassword(apiClient, deploymentId)
+    );
+
+    if (credentialsError) {
+      return {
+        ok: false as const,
+        error: `Failed to get docker credentials: ${credentialsError.message}`,
+        logs: "",
+      };
+    }
+
+    logger.debug(`Logging in to docker registry: ${cloudRegistryHost}`);
+
+    const loginProcess = x(
+      "docker",
+      ["login", "--username", credentials.username, "--password-stdin", cloudRegistryHost],
+      {
+        nodeOptions: {
+          cwd: options.cwd,
+        },
+      }
+    );
+
+    loginProcess.process?.stdin?.write(credentials.password);
+    loginProcess.process?.stdin?.end();
+
+    for await (const line of loginProcess) {
+      errors.push(line);
+      logger.debug(line);
+    }
+
+    if (loginProcess.exitCode !== 0) {
+      return {
+        ok: false as const,
+        error: `Failed to login to registry: ${cloudRegistryHost}`,
+        logs: extractLogs(errors),
+      };
+    }
+
+    options.onLog?.(`Successfully logged in to the remote registry`);
+  }
+
+  const projectCacheRef = getProjectCacheRefFromImageTag(imageTag);
+
+  const outputOptions = getOutputOptions({
+    imageTag,
+    push,
+    load,
+    compression,
+    compressionLevel,
+    forceCompression,
+  });
+
   const args = [
     "buildx",
     "build",
@@ -435,6 +560,18 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
     "-f",
     "Containerfile",
     options.noCache ? "--no-cache" : undefined,
+    ...(useRegistryCache
+      ? [
+          "--cache-to",
+          `type=registry,mode=max,image-manifest=true,oci-mediatypes=true,ref=${projectCacheRef}${
+            cacheCompression === "zstd" ? ",compression=zstd" : ""
+          }`,
+          "--cache-from",
+          `type=registry,ref=${projectCacheRef}`,
+        ]
+      : []),
+    "--output",
+    outputOptions.join(","),
     "--platform",
     options.imagePlatform,
     options.network ? `--network=${options.network}` : undefined,
@@ -445,12 +582,12 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
     "--metadata-file",
     "metadata.json",
     "--build-arg",
+    `SOURCE_DATE_EPOCH=0`,
+    "--build-arg",
     `TRIGGER_PROJECT_ID=${options.projectId}`,
     "--build-arg",
     `TRIGGER_DEPLOYMENT_ID=${options.deploymentId}`,
     "--build-arg",
-    `TRIGGER_DEPLOYMENT_VERSION=${options.deploymentVersion}`,
-    "--build-arg",
     `TRIGGER_CONTENT_HASH=${options.contentHash}`,
     "--build-arg",
     `TRIGGER_PROJECT_REF=${options.projectRef}`,
@@ -473,11 +610,10 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
 
   logger.info(`docker ${args.join(" ")}`, { cwd: options.cwd });
 
-  const errors: string[] = [];
-
-  // Build the image
   const buildProcess = x("docker", args, {
-    nodeOptions: { cwd: options.cwd },
+    nodeOptions: {
+      cwd: options.cwd,
+    },
   });
 
   for await (const line of buildProcess) {
@@ -488,6 +624,11 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
   }
 
   if (buildProcess.exitCode !== 0) {
+    if (cloudRegistryHost) {
+      logger.debug(`Logging out from docker registry: ${cloudRegistryHost}`);
+      await x("docker", ["logout", cloudRegistryHost]);
+    }
+
     return {
       ok: false as const,
       error: "Error building image",
@@ -796,6 +937,11 @@ async function localBuildImage(options: SelfHostedBuildImageOptions): Promise<Bu
     options.onLog?.(`Image size: ${(imageSizeBytes / (1024 * 1024)).toFixed(2)} MB`);
   }
 
+  if (cloudRegistryHost) {
+    logger.debug(`Logging out from docker registry: ${cloudRegistryHost}`);
+    await x("docker", ["logout", cloudRegistryHost]);
+  }
+
   return {
     ok: true as const,
     imageSizeBytes,
@@ -822,7 +968,7 @@ export type GenerateContainerfileOptions = {
 };
 
 const BASE_IMAGE: Record<BuildRuntime, string> = {
-  bun: "imbios/bun-node:1.2.18-20-slim@sha256:74067c73e7fe4a4da56f447f644e7090cec4eaf5500a0e384d15855107bea636",
+  bun: "imbios/bun-node:1.3.3-20-slim@sha256:59d84856a7e31eec83afedadb542f7306f672343b8b265c70d733404a6e8834b",
   node: "node:21.7.3-bookworm-slim@sha256:dfc05dee209a1d7adf2ef189bd97396daad4e97c6eaa85778d6f75205ba1b0fb",
   "node-22":
     "node:22.16.0-bookworm-slim@sha256:048ed02c5fd52e86fda6fbd2f6a76cf0d4492fd6c6fee9e2c463ed5108da0e34",
@@ -916,6 +1062,7 @@ export async function generateBunContainerfile(options: GenerateContainerfileOpt
     parseGenerateOptions(options);
 
   return `# syntax=docker/dockerfile:1
+# check=skip=SecretsUsedInArgOrEnv
 FROM ${baseImage} AS base
 
 ${baseInstructions}
@@ -992,15 +1139,11 @@ USER bun
 WORKDIR /app
 
 ARG TRIGGER_PROJECT_ID
-ARG TRIGGER_DEPLOYMENT_ID
-ARG TRIGGER_DEPLOYMENT_VERSION
 ARG TRIGGER_CONTENT_HASH
 ARG TRIGGER_PROJECT_REF
 ARG NODE_EXTRA_CA_CERTS
 
 ENV TRIGGER_PROJECT_ID=\${TRIGGER_PROJECT_ID} \
-    TRIGGER_DEPLOYMENT_ID=\${TRIGGER_DEPLOYMENT_ID} \
-    TRIGGER_DEPLOYMENT_VERSION=\${TRIGGER_DEPLOYMENT_VERSION} \
     TRIGGER_CONTENT_HASH=\${TRIGGER_CONTENT_HASH} \
     TRIGGER_PROJECT_REF=\${TRIGGER_PROJECT_REF} \
     UV_USE_IO_URING=0 \
@@ -1023,6 +1166,7 @@ export async function generateNodeContainerfile(options: GenerateContainerfileOp
     parseGenerateOptions(options);
 
   return `# syntax=docker/dockerfile:1
+# check=skip=SecretsUsedInArgOrEnv
 FROM ${baseImage} AS base
 
 ${baseInstructions}
@@ -1107,15 +1251,11 @@ USER node
 WORKDIR /app
 
 ARG TRIGGER_PROJECT_ID
-ARG TRIGGER_DEPLOYMENT_ID
-ARG TRIGGER_DEPLOYMENT_VERSION
 ARG TRIGGER_CONTENT_HASH
 ARG TRIGGER_PROJECT_REF
 ARG NODE_EXTRA_CA_CERTS
 
 ENV TRIGGER_PROJECT_ID=\${TRIGGER_PROJECT_ID} \
-    TRIGGER_DEPLOYMENT_ID=\${TRIGGER_DEPLOYMENT_ID} \
-    TRIGGER_DEPLOYMENT_VERSION=\${TRIGGER_DEPLOYMENT_VERSION} \
     TRIGGER_CONTENT_HASH=\${TRIGGER_CONTENT_HASH} \
     TRIGGER_PROJECT_REF=\${TRIGGER_PROJECT_REF} \
     UV_USE_IO_URING=0 \
@@ -1169,6 +1309,48 @@ function getAddHost(apiUrl: string) {
   return;
 }
 
+function extractRegistryHostFromImageTag(imageTag: string): string | undefined {
+  const host = imageTag.split("/")[0];
+
+  if (!host || !host.includes(".")) {
+    return undefined;
+  }
+
+  return host;
+}
+
+function getProjectCacheRefFromImageTag(imageTag: string): string {
+  const lastColonIndex = imageTag.lastIndexOf(":");
+  return `${imageTag.substring(0, lastColonIndex)}:cache`;
+}
+
+async function getDockerUsernameAndPassword(
+  apiClient: CliApiClient,
+  deploymentId: string
+): Promise<{ username: string; password: string }> {
+  if (process.env.TRIGGER_DOCKER_USERNAME && process.env.TRIGGER_DOCKER_PASSWORD) {
+    return {
+      username: process.env.TRIGGER_DOCKER_USERNAME,
+      password: process.env.TRIGGER_DOCKER_PASSWORD,
+    };
+  }
+
+  const result = await apiClient.generateRegistryCredentials(deploymentId);
+
+  if (!result.success) {
+    logger.debug("Failed to generate registry credentials", {
+      error: result.error,
+      deploymentId,
+    });
+    throw new Error("Failed to generate registry credentials");
+  }
+
+  return {
+    username: result.data.username,
+    password: result.data.password,
+  };
+}
+
 function isQemuRegistered() {
   try {
     // Check a single QEMU handler
@@ -1266,3 +1448,49 @@ function shouldLoad(load?: boolean, push?: boolean) {
   //   }
   // }
 }
+
+function getOutputOptions({
+  imageTag,
+  push,
+  load,
+  compression,
+  compressionLevel,
+  forceCompression,
+}: {
+  imageTag?: string;
+  push?: boolean;
+  load?: boolean;
+  compression?: "zstd" | "gzip";
+  compressionLevel?: number;
+  forceCompression?: boolean;
+}): string[] {
+  // Always use OCI media types for compatibility
+  const outputOptions: string[] = ["type=image", "oci-mediatypes=true", "rewrite-timestamp=true"];
+
+  if (imageTag) {
+    outputOptions.push(`name=${imageTag}`);
+  }
+
+  if (push) {
+    outputOptions.push("push=true");
+  }
+
+  if (load) {
+    outputOptions.push("load=true");
+  }
+
+  // Only add compression args when using zstd (gzip is the default, no args needed)
+  if (compression === "zstd") {
+    outputOptions.push("compression=zstd");
+
+    if (compressionLevel !== undefined) {
+      outputOptions.push(`compression-level=${compressionLevel}`);
+    }
+  }
+
+  if (forceCompression) {
+    outputOptions.push("force-compression=true");
+  }
+
+  return outputOptions;
+}
diff --git a/packages/cli-v3/src/dev/devOutput.ts b/packages/cli-v3/src/dev/devOutput.ts
index f53b6f0e2e9..6365eee2ed7 100644
--- a/packages/cli-v3/src/dev/devOutput.ts
+++ b/packages/cli-v3/src/dev/devOutput.ts
@@ -41,11 +41,11 @@ export function startDevOutput(options: DevOutputOptions) {
   const baseUrl = `${dashboardUrl}/projects/v3/${config.project}`;
 
   const rebuildStarted = (...[target]: EventBusEventArgs<"rebuildStarted">) => {
-    logger.log(chalkGrey("○ Rebuilding background worker…"));
+    logger.log(chalkGrey("○ Rebuilding local worker…"));
   };
 
   const buildStarted = (...[target]: EventBusEventArgs<"buildStarted">) => {
-    logger.log(chalkGrey("○ Building background worker…"));
+    logger.log(chalkGrey("○ Building local worker…"));
   };
 
   const buildFailed = (...[target, error]: EventBusEventArgs<"buildFailed">) => {
@@ -89,7 +89,7 @@ export function startDevOutput(options: DevOutputOptions) {
     const runsLink = chalkLink(cliLink("View runs", runsUrl));
 
     const runtime = chalkGrey(`[${worker.build.runtime}]`);
-    const workerStarted = chalkGrey("Background worker ready");
+    const workerStarted = chalkGrey("Local worker ready");
     const workerVersion = chalkWorker(worker.serverWorker!.version);
 
     logParts.push(workerStarted, runtime, arrow, workerVersion);
diff --git a/packages/cli-v3/src/dev/devSession.ts b/packages/cli-v3/src/dev/devSession.ts
index 6445c1f75d6..482ebf6fc17 100644
--- a/packages/cli-v3/src/dev/devSession.ts
+++ b/packages/cli-v3/src/dev/devSession.ts
@@ -1,6 +1,5 @@
 import { ResolvedConfig } from "@trigger.dev/core/v3/build";
 import * as esbuild from "esbuild";
-import { existsSync, mkdirSync, rmSync } from "node:fs";
 import { CliApiClient } from "../apiClient.js";
 import {
   BundleResult,
@@ -20,7 +19,12 @@ import { createExternalsBuildExtension, resolveAlwaysExternal } from "../build/e
 import { type DevCommandOptions } from "../commands/dev.js";
 import { eventBus } from "../utilities/eventBus.js";
 import { logger } from "../utilities/logger.js";
-import { clearTmpDirs, EphemeralDirectory, getTmpDir } from "../utilities/tempDirectories.js";
+import {
+  clearTmpDirs,
+  EphemeralDirectory,
+  getStoreDir,
+  getTmpDir,
+} from "../utilities/tempDirectories.js";
 import { startDevOutput } from "./devOutput.js";
 import { startWorkerRuntime } from "./devSupervisor.js";
 import { startMcpServer, stopMcpServer } from "./mcpServer.js";
@@ -53,6 +57,8 @@ export async function startDevSession({
 }: DevSessionOptions): Promise<DevSessionInstance> {
   clearTmpDirs(rawConfig.workingDir);
   const destination = getTmpDir(rawConfig.workingDir, "build", keepTmpFiles);
+  // Create shared store directory for deduplicating chunk files across rebuilds
+  const storeDir = getStoreDir(rawConfig.workingDir, keepTmpFiles);
 
   const runtime = await startWorkerRuntime({
     name,
@@ -102,6 +108,7 @@ export async function startDevSession({
       workerDir: workerDir?.path,
       environment: "dev",
       target: "dev",
+      storeDir,
     });
 
     logger.debug("Created build manifest from bundle", { buildManifest });
@@ -131,7 +138,13 @@ export async function startDevSession({
   }
 
   async function updateBuild(build: esbuild.BuildResult, workerDir: EphemeralDirectory) {
-    const bundle = await getBundleResultFromBuild("dev", rawConfig.workingDir, rawConfig, build);
+    const bundle = await getBundleResultFromBuild(
+      "dev",
+      rawConfig.workingDir,
+      rawConfig,
+      build,
+      storeDir
+    );
 
     if (bundle) {
       await updateBundle({ ...bundle, stop: undefined }, workerDir);
@@ -148,14 +161,6 @@ export async function startDevSession({
         if (bundled) {
           eventBus.emit("rebuildStarted", "dev");
         }
-
-        const outdir = b.initialOptions.outdir;
-        if (outdir && existsSync(outdir)) {
-          logger.debug("Removing outdir", { outdir });
-
-          rmSync(outdir, { recursive: true, force: true });
-          mkdirSync(outdir, { recursive: true });
-        }
       });
       b.onEnd(async (result: esbuild.BuildResult) => {
         const errors = result.errors;
@@ -198,6 +203,7 @@ export async function startDevSession({
         jsxFactory: rawConfig.build.jsx.factory,
         jsxFragment: rawConfig.build.jsx.fragment,
         jsxAutomatic: rawConfig.build.jsx.automatic,
+        storeDir,
       });
 
       await updateBundle(bundleResult);
diff --git a/packages/cli-v3/src/dev/devSupervisor.ts b/packages/cli-v3/src/dev/devSupervisor.ts
index e86ea4eb45a..67da7e59458 100644
--- a/packages/cli-v3/src/dev/devSupervisor.ts
+++ b/packages/cli-v3/src/dev/devSupervisor.ts
@@ -101,22 +101,21 @@ class DevSupervisor implements WorkerRuntime {
     // Initialize the task run process pool
     const env = await this.#getEnvVars();
 
+    const processKeepAlive =
+      this.options.config.processKeepAlive ?? this.options.config.experimental_processKeepAlive;
+
     const enableProcessReuse =
-      typeof this.options.config.experimental_processKeepAlive === "boolean"
-        ? this.options.config.experimental_processKeepAlive
-        : typeof this.options.config.experimental_processKeepAlive === "object"
-        ? this.options.config.experimental_processKeepAlive.enabled
+      typeof processKeepAlive === "boolean"
+        ? processKeepAlive
+        : typeof processKeepAlive === "object"
+        ? processKeepAlive.enabled
         : false;
 
     const maxPoolSize =
-      typeof this.options.config.experimental_processKeepAlive === "object"
-        ? this.options.config.experimental_processKeepAlive.devMaxPoolSize ?? 25
-        : 25;
+      typeof processKeepAlive === "object" ? processKeepAlive.devMaxPoolSize ?? 25 : 25;
 
     const maxExecutionsPerProcess =
-      typeof this.options.config.experimental_processKeepAlive === "object"
-        ? this.options.config.experimental_processKeepAlive.maxExecutionsPerProcess ?? 50
-        : 50;
+      typeof processKeepAlive === "object" ? processKeepAlive.maxExecutionsPerProcess ?? 50 : 50;
 
     if (enableProcessReuse) {
       logger.debug("[DevSupervisor] Enabling process reuse", {
@@ -139,11 +138,26 @@ class DevSupervisor implements WorkerRuntime {
     //start an SSE connection for presence
     this.disconnectPresence = await this.#startPresenceConnection();
 
+    // Handle SIGTERM to gracefully stop all run controllers
+    process.on("SIGTERM", this.#handleSigterm);
+
     //start dequeuing
     await this.#dequeueRuns();
   }
 
+  #handleSigterm = async () => {
+    logger.debug("[DevSupervisor] Received SIGTERM, stopping all run controllers");
+
+    const stopPromises = Array.from(this.runControllers.values()).map((controller) =>
+      controller.stop()
+    );
+
+    await Promise.allSettled(stopPromises);
+  };
+
   async shutdown(): Promise<void> {
+    process.off("SIGTERM", this.#handleSigterm);
+
     this.disconnectPresence?.();
     try {
       this.socket?.close();
@@ -265,15 +279,11 @@ class DevSupervisor implements WorkerRuntime {
       return;
     }
 
-    //get relevant versions
-    //ignore deprecated and the latest worker
-    const oldWorkerIds = this.#getActiveOldWorkers();
-
     try {
       //todo later we should track available resources and machines used, and pass them in here (it supports it)
       const result = await this.options.client.dev.dequeue({
         currentWorker: this.latestWorkerId,
-        oldWorkers: oldWorkerIds,
+        oldWorkers: [], // This isn't even used on the server side, so we can just pass an empty array
       });
 
       if (!result.success) {
@@ -286,10 +296,6 @@ class DevSupervisor implements WorkerRuntime {
 
       //no runs, try again later
       if (result.data.dequeuedMessages.length === 0) {
-        // logger.debug(`No dequeue runs for versions`, {
-        //   oldWorkerIds,
-        //   latestWorkerId: this.latestWorkerId,
-        // });
         setTimeout(() => this.#dequeueRuns(), this.config.dequeueIntervalWithoutRun);
         return;
       }
@@ -359,9 +365,12 @@ class DevSupervisor implements WorkerRuntime {
           config: this.options.config,
         });
 
-        const cwd = this.options.config.experimental_devProcessCwdInBuildDir
-          ? worker.build.outputPath
-          : undefined;
+        const legacyDevProcessCwdBehaviour =
+          typeof this.options.config.legacyDevProcessCwdBehaviour === "boolean"
+            ? this.options.config.legacyDevProcessCwdBehaviour
+            : true;
+
+        const cwd = legacyDevProcessCwdBehaviour === true ? undefined : worker.build.outputPath;
 
         //new run
         runController = new DevRunController({
@@ -461,9 +470,6 @@ class DevSupervisor implements WorkerRuntime {
       TRIGGER_API_URL: this.options.client.apiURL,
       TRIGGER_SECRET_KEY: this.options.client.accessToken!,
       OTEL_EXPORTER_OTLP_COMPRESSION: "none",
-      OTEL_RESOURCE_ATTRIBUTES: JSON.stringify({
-        [SemanticInternalAttributes.PROJECT_DIR]: this.options.config.workingDir,
-      }),
       OTEL_IMPORT_HOOK_INCLUDES,
     };
   }
@@ -597,42 +603,9 @@ class DevSupervisor implements WorkerRuntime {
     this.socket.emit("run:unsubscribe", { version: "1", runFriendlyIds: [friendlyId] });
   }
 
-  #getActiveOldWorkers() {
-    return Array.from(this.workers.values())
-      .filter((worker) => {
-        //exclude the latest
-        if (worker.serverWorker?.id === this.latestWorkerId) {
-          return false;
-        }
-
-        //if it's deprecated AND there are no executing runs, then filter it out
-        if (worker.deprecated && worker.serverWorker?.id) {
-          return this.#workerHasInProgressRuns(worker.serverWorker.id);
-        }
-
-        return true;
-      })
-      .map((worker) => worker.serverWorker?.id)
-      .filter((id): id is string => id !== undefined);
-  }
-
-  #workerHasInProgressRuns(friendlyId: string) {
-    for (const controller of this.runControllers.values()) {
-      logger.debug("[DevSupervisor] Checking controller", {
-        controllerFriendlyId: controller.workerFriendlyId,
-        friendlyId,
-      });
-      if (controller.workerFriendlyId === friendlyId) {
-        return true;
-      }
-    }
-
-    return false;
-  }
-
   /** Deletes the worker if there are no active runs, after a delay */
   async #tryDeleteWorker(friendlyId: string) {
-    await awaitTimeout(1_000);
+    await awaitTimeout(5_000);
     this.#deleteWorker(friendlyId);
   }
 
@@ -649,13 +622,6 @@ class DevSupervisor implements WorkerRuntime {
     if (worker.serverWorker?.version) {
       this.taskRunProcessPool?.deprecateVersion(worker.serverWorker?.version);
     }
-
-    if (this.#workerHasInProgressRuns(friendlyId)) {
-      return;
-    }
-
-    worker.stop();
-    this.workers.delete(friendlyId);
   }
 }
 
diff --git a/packages/cli-v3/src/dev/taskRunProcessPool.ts b/packages/cli-v3/src/dev/taskRunProcessPool.ts
index 1d0640e52d5..810be7acb43 100644
--- a/packages/cli-v3/src/dev/taskRunProcessPool.ts
+++ b/packages/cli-v3/src/dev/taskRunProcessPool.ts
@@ -2,6 +2,7 @@ import {
   MachinePresetResources,
   ServerBackgroundWorker,
   WorkerManifest,
+  generateFriendlyId,
 } from "@trigger.dev/core/v3";
 import { TaskRunProcess } from "../executions/taskRunProcess.js";
 import { logger } from "../utilities/logger.js";
@@ -23,6 +24,8 @@ export class TaskRunProcessPool {
   private readonly maxExecutionsPerProcess: number;
   private readonly executionCountsPerProcess: Map<number, number> = new Map();
   private readonly deprecatedVersions: Set<string> = new Set();
+  private readonly idleTimers: Map<TaskRunProcess, NodeJS.Timeout> = new Map();
+  private static readonly IDLE_TIMEOUT_MS = 30_000;
 
   constructor(options: TaskRunProcessPoolOptions) {
     this.options = options;
@@ -38,6 +41,7 @@ export class TaskRunProcessPool {
     const versionProcesses = this.availableProcessesByVersion.get(version) || [];
 
     const processesToKill = versionProcesses.filter((process) => !process.isExecuting());
+    processesToKill.forEach((process) => this.clearIdleTimer(process));
     Promise.all(processesToKill.map((process) => this.killProcess(process))).then(() => {
       this.availableProcessesByVersion.delete(version);
     });
@@ -71,6 +75,7 @@ export class TaskRunProcessPool {
           version,
           availableProcesses.filter((p) => p !== reusableProcess)
         );
+        this.clearIdleTimer(reusableProcess);
 
         if (!this.busyProcessesByVersion.has(version)) {
           this.busyProcessesByVersion.set(version, new Set());
@@ -106,6 +111,7 @@ export class TaskRunProcessPool {
       env: {
         ...this.options.env,
         ...env,
+        TRIGGER_MACHINE_ID: generateFriendlyId("machine"),
       },
       serverWorker,
       machineResources,
@@ -154,6 +160,7 @@ export class TaskRunProcessPool {
           this.availableProcessesByVersion.set(version, []);
         }
         this.availableProcessesByVersion.get(version)!.push(process);
+        this.startIdleTimer(process, version);
       } catch (error) {
         logger.debug("[TaskRunProcessPool] Failed to cleanup process for reuse, killing it", {
           error,
@@ -213,7 +220,42 @@ export class TaskRunProcessPool {
     return process.isHealthy;
   }
 
+  private startIdleTimer(process: TaskRunProcess, version: string): void {
+    this.clearIdleTimer(process);
+
+    const timer = setTimeout(() => {
+      // Synchronously remove from available pool before async kill to prevent race with getProcess()
+      const available = this.availableProcessesByVersion.get(version);
+      if (available) {
+        const index = available.indexOf(process);
+        if (index !== -1) {
+          available.splice(index, 1);
+        }
+      }
+      this.idleTimers.delete(process);
+
+      logger.debug("[TaskRunProcessPool] Idle timeout reached, killing process", {
+        pid: process.pid,
+        version,
+      });
+
+      this.killProcess(process);
+    }, TaskRunProcessPool.IDLE_TIMEOUT_MS);
+
+    this.idleTimers.set(process, timer);
+  }
+
+  private clearIdleTimer(process: TaskRunProcess): void {
+    const timer = this.idleTimers.get(process);
+    if (timer) {
+      clearTimeout(timer);
+      this.idleTimers.delete(process);
+    }
+  }
+
   private async killProcess(process: TaskRunProcess): Promise<void> {
+    this.clearIdleTimer(process);
+
     if (!process.isHealthy) {
       logger.debug("[TaskRunProcessPool] Process is not healthy, skipping cleanup", {
         processId: process.pid,
@@ -245,6 +287,12 @@ export class TaskRunProcessPool {
       versions: Array.from(this.availableProcessesByVersion.keys()),
     });
 
+    // Clear all idle timers
+    for (const timer of this.idleTimers.values()) {
+      clearTimeout(timer);
+    }
+    this.idleTimers.clear();
+
     // Kill all available processes across all versions
     const allAvailableProcesses = Array.from(this.availableProcessesByVersion.values()).flat();
     await Promise.all(allAvailableProcesses.map((process) => this.killProcess(process)));
diff --git a/packages/cli-v3/src/entryPoints/dev-index-worker.ts b/packages/cli-v3/src/entryPoints/dev-index-worker.ts
index d44ac53fe59..da5c6ee7508 100644
--- a/packages/cli-v3/src/entryPoints/dev-index-worker.ts
+++ b/packages/cli-v3/src/entryPoints/dev-index-worker.ts
@@ -18,6 +18,7 @@ import { registerResources } from "../indexing/registerResources.js";
 import { env } from "std-env";
 import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 import { detectRuntimeVersion } from "@trigger.dev/core/v3/build";
+import { schemaToJsonSchema } from "@trigger.dev/schema-to-json";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -100,7 +101,7 @@ async function bootstrap() {
 
 const { buildManifest, importErrors, config, timings } = await bootstrap();
 
-let tasks = resourceCatalog.listTaskManifests();
+let tasks = await convertSchemasToJsonSchemas(resourceCatalog.listTaskManifests());
 
 // If the config has retry defaults, we need to apply them to all tasks that don't have any retry settings
 if (config.retries?.default) {
@@ -190,3 +191,22 @@ await new Promise<void>((resolve) => {
     resolve();
   }, 10);
 });
+
+async function convertSchemasToJsonSchemas(tasks: TaskManifest[]): Promise<TaskManifest[]> {
+  const convertedTasks = tasks.map((task) => {
+    const schema = resourceCatalog.getTaskSchema(task.id);
+
+    if (schema) {
+      try {
+        const result = schemaToJsonSchema(schema);
+        return { ...task, payloadSchema: result?.jsonSchema };
+      } catch {
+        return task;
+      }
+    }
+
+    return task;
+  });
+
+  return convertedTasks;
+}
diff --git a/packages/cli-v3/src/entryPoints/dev-run-controller.ts b/packages/cli-v3/src/entryPoints/dev-run-controller.ts
index 50d9a61719e..fe486677452 100644
--- a/packages/cli-v3/src/entryPoints/dev-run-controller.ts
+++ b/packages/cli-v3/src/entryPoints/dev-run-controller.ts
@@ -4,6 +4,7 @@ import {
   IntervalService,
   LogLevel,
   RunExecutionData,
+  SuspendedProcessError,
   TaskRunExecution,
   TaskRunExecutionMetrics,
   TaskRunExecutionResult,
@@ -26,7 +27,6 @@ type DevRunControllerOptions = {
   worker: BackgroundWorker;
   httpClient: CliApiClient;
   logLevel: LogLevel;
-  heartbeatIntervalSeconds?: number;
   taskRunProcessPool: TaskRunProcessPool;
   onSubscribeToRunNotifications: (run: Run, snapshot: Snapshot) => void;
   onUnsubscribeFromRunNotifications: (run: Run, snapshot: Snapshot) => void;
@@ -47,11 +47,11 @@ export class DevRunController {
   private taskRunProcess?: TaskRunProcess;
   private readonly worker: BackgroundWorker;
   private readonly httpClient: CliApiClient;
-  private readonly runHeartbeat: IntervalService;
-  private readonly heartbeatIntervalSeconds: number;
   private readonly snapshotPoller: IntervalService;
   private readonly snapshotPollIntervalSeconds: number;
   private readonly cwd?: string;
+  private isCompletingRun = false;
+  private isShuttingDown = false;
 
   private state:
     | {
@@ -67,7 +67,6 @@ export class DevRunController {
     this.onExitRunPhase(run);
     this.state = { phase: "RUN", run, snapshot };
 
-    this.runHeartbeat.start();
     this.snapshotPoller.start();
   }
 
@@ -77,7 +76,6 @@ export class DevRunController {
     });
 
     this.worker = opts.worker;
-    this.heartbeatIntervalSeconds = opts.heartbeatIntervalSeconds || 20;
     this.snapshotPollIntervalSeconds = 5;
     this.cwd = opts.cwd;
     this.httpClient = opts.httpClient;
@@ -124,43 +122,8 @@ export class DevRunController {
         logger.debug("[DevRunController] Failed to poll for snapshot", { error });
       },
     });
-
-    this.runHeartbeat = new IntervalService({
-      onInterval: async () => {
-        if (!this.runFriendlyId || !this.snapshotFriendlyId) {
-          logger.debug("[DevRunController] Skipping heartbeat, no run ID or snapshot ID");
-          return;
-        }
-
-        logger.debug("[DevRunController] Sending heartbeat");
-
-        const response = await this.httpClient.dev.heartbeatRun(
-          this.runFriendlyId,
-          this.snapshotFriendlyId,
-          {
-            cpu: 0,
-            memory: 0,
-          }
-        );
-
-        if (!response.success) {
-          logger.debug("[DevRunController] Heartbeat failed", { error: response.error });
-        }
-      },
-      intervalMs: this.heartbeatIntervalSeconds * 1000,
-      leadingEdge: false,
-      onError: async (error) => {
-        logger.debug("[DevRunController] Failed to send heartbeat", { error });
-      },
-    });
-
-    process.on("SIGTERM", this.sigterm);
   }
 
-  private async sigterm() {
-    logger.debug("[DevRunController] Received SIGTERM, stopping worker");
-    await this.stop();
-  }
 
   // This should only be used when we're already executing a run. Attempt number changes are not allowed.
   private updateRunPhase(run: Run, snapshot: Snapshot) {
@@ -245,7 +208,6 @@ export class DevRunController {
 
     logger.debug("onExitRunPhase: Exiting run phase", { newRun });
 
-    this.runHeartbeat.stop();
     this.snapshotPoller.stop();
 
     const { run, snapshot } = this.state;
@@ -389,7 +351,15 @@ export class DevRunController {
           return;
         }
         case "FINISHED": {
-          logger.debug("Run is finished, nothing to do");
+          if (this.isCompletingRun) {
+            logger.debug("Run is finished but we're completing it, skipping");
+            return;
+          }
+
+          await this.exitTaskRunProcessWithoutFailingRun({
+            flush: true,
+            reason: "already-finished",
+          });
           return;
         }
         case "EXECUTING_WITH_WAITPOINTS": {
@@ -458,7 +428,8 @@ export class DevRunController {
         }
         case "RUN_CREATED":
         case "QUEUED_EXECUTING":
-        case "QUEUED": {
+        case "QUEUED":
+        case "DELAYED": {
           logger.debug("Status change not handled", { status: snapshot.executionStatus });
           return;
         }
@@ -549,6 +520,12 @@ export class DevRunController {
         error,
       });
 
+      if (error instanceof SuspendedProcessError) {
+        logger.debug("Attempt execution suspended", { error });
+        this.runFinished();
+        return;
+      }
+
       logger.debug("Submitting attempt completion", {
         runId: run.friendlyId,
         snapshotId: snapshot.friendlyId,
@@ -613,11 +590,13 @@ export class DevRunController {
       build: this.opts.worker.build,
     });
 
+    this.isCompletingRun = false;
+
     // Get process from pool instead of creating new one
     const { taskRunProcess, isReused } = await this.opts.taskRunProcessPool.getProcess(
       this.opts.worker.manifest,
       {
-        id: "unmanaged",
+        id: this.opts.worker.serverWorker.id,
         contentHash: this.opts.worker.build.contentHash,
         version: this.opts.worker.serverWorker?.version,
         engine: "V2",
@@ -633,6 +612,30 @@ export class DevRunController {
 
     this.taskRunProcess = taskRunProcess;
 
+    taskRunProcess.unsafeDetachEvtHandlers();
+
+    taskRunProcess.onTaskRunHeartbeat.attach(async (runId) => {
+      if (!this.runFriendlyId || !this.snapshotFriendlyId) {
+        logger.debug("[DevRunController] Skipping heartbeat, no run ID or snapshot ID");
+        return;
+      }
+
+      logger.debug("[DevRunController] Sending heartbeat");
+
+      const response = await this.httpClient.dev.heartbeatRun(
+        this.runFriendlyId,
+        this.snapshotFriendlyId,
+        {
+          cpu: 0,
+          memory: 0,
+        }
+      );
+
+      if (!response.success) {
+        logger.debug("[DevRunController] Heartbeat failed", { error: response.error });
+      }
+    });
+
     // Update the process environment for this specific run
     // Note: We may need to enhance TaskRunProcess to support updating env vars
     logger.debug("executing task run process from pool", {
@@ -659,6 +662,8 @@ export class DevRunController {
 
     logger.debug("Completed run", completion);
 
+    this.isCompletingRun = true;
+
     // Return process to pool instead of killing it
     try {
       const version = this.opts.worker.serverWorker?.version || "unknown";
@@ -779,6 +784,37 @@ export class DevRunController {
     assertExhaustive(attemptStatus);
   }
 
+  private async exitTaskRunProcessWithoutFailingRun({
+    flush,
+    reason,
+  }: {
+    flush: boolean;
+    reason: string;
+  }) {
+    await this.taskRunProcess?.suspend({ flush });
+
+    // No services should be left running after this line - let's make sure of it
+    this.shutdownExecution(`exitTaskRunProcessWithoutFailingRun: ${reason}`);
+  }
+
+  private shutdownExecution(reason: string) {
+    if (this.isShuttingDown) {
+      logger.debug(`[shutdown] ${reason} (already shutting down)`, {
+        newReason: reason,
+      });
+      return;
+    }
+
+    logger.debug(`[shutdown] ${reason}`);
+
+    this.isShuttingDown = true;
+
+    this.snapshotPoller.stop();
+
+    this.opts.onFinished();
+    this.taskRunProcess?.unsafeDetachEvtHandlers();
+  }
+
   private async runFinished() {
     // Return the process to the pool instead of killing it directly
     if (this.taskRunProcess) {
@@ -791,7 +827,6 @@ export class DevRunController {
       }
     }
 
-    this.runHeartbeat.stop();
     this.snapshotPoller.stop();
 
     this.opts.onFinished();
@@ -816,8 +851,6 @@ export class DevRunController {
   async stop() {
     logger.debug("[DevRunController] Shutting down");
 
-    process.off("SIGTERM", this.sigterm);
-
     if (this.taskRunProcess && !this.taskRunProcess.isBeingKilled) {
       try {
         const version = this.opts.worker.serverWorker?.version || "unknown";
@@ -828,7 +861,6 @@ export class DevRunController {
       }
     }
 
-    this.runHeartbeat.stop();
     this.snapshotPoller.stop();
   }
 
diff --git a/packages/cli-v3/src/entryPoints/dev-run-worker.ts b/packages/cli-v3/src/entryPoints/dev-run-worker.ts
index 4e220c9a192..0da61bfba67 100644
--- a/packages/cli-v3/src/entryPoints/dev-run-worker.ts
+++ b/packages/cli-v3/src/entryPoints/dev-run-worker.ts
@@ -21,6 +21,7 @@ import {
   runtime,
   runTimelineMetrics,
   taskContext,
+  TaskRunContext,
   TaskRunErrorCodes,
   TaskRunExecution,
   timeout,
@@ -29,6 +30,9 @@ import {
   waitUntil,
   WorkerManifest,
   WorkerToExecutorMessageCatalog,
+  traceContext,
+  heartbeats,
+  realtimeStreams,
 } from "@trigger.dev/core/v3";
 import { TriggerTracer } from "@trigger.dev/core/v3/tracer";
 import {
@@ -52,6 +56,9 @@ import {
   TracingSDK,
   usage,
   UsageTimeoutManager,
+  StandardTraceContextManager,
+  StandardHeartbeatsManager,
+  StandardRealtimeStreamsManager,
 } from "@trigger.dev/core/v3/workers";
 import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
 import { readFile } from "node:fs/promises";
@@ -123,27 +130,48 @@ usage.setGlobalUsageManager(devUsageManager);
 const usageTimeoutManager = new UsageTimeoutManager(devUsageManager);
 timeout.setGlobalManager(usageTimeoutManager);
 
+// Register listener to send IPC message when max duration is exceeded
+timeout.registerListener(async (maxDurationInSeconds, elapsedTimeInSeconds) => {
+  log(
+    `[${new Date().toISOString()}] Max duration exceeded: ${maxDurationInSeconds}s, elapsed: ${elapsedTimeInSeconds}s`
+  );
+  await zodIpc.send("MAX_DURATION_EXCEEDED", {
+    maxDurationInSeconds,
+    elapsedTimeInSeconds,
+  });
+});
+
 const standardResourceCatalog = new StandardResourceCatalog();
 resourceCatalog.setGlobalResourceCatalog(standardResourceCatalog);
 
+const standardTraceContextManager = new StandardTraceContextManager();
+traceContext.setGlobalManager(standardTraceContextManager);
+
 const durableClock = new DurableClock();
 clock.setGlobalClock(durableClock);
-const runMetadataManager = new StandardMetadataManager(
+const runMetadataManager = new StandardMetadataManager(apiClientManager.clientOrThrow());
+runMetadata.setGlobalManager(runMetadataManager);
+
+const standardRealtimeStreamsManager = new StandardRealtimeStreamsManager(
   apiClientManager.clientOrThrow(),
-  getEnvVar("TRIGGER_STREAM_URL", getEnvVar("TRIGGER_API_URL")) ?? "https://api.trigger.dev"
+  getEnvVar("TRIGGER_STREAM_URL", getEnvVar("TRIGGER_API_URL")) ?? "https://api.trigger.dev",
+  (getEnvVar("TRIGGER_STREAMS_DEBUG") === "1" || getEnvVar("TRIGGER_STREAMS_DEBUG") === "true") ??
+    false
 );
-runMetadata.setGlobalManager(runMetadataManager);
-const waitUntilManager = new StandardWaitUntilManager();
+realtimeStreams.setGlobalManager(standardRealtimeStreamsManager);
+
+const waitUntilTimeoutInMs = getNumberEnvVar("TRIGGER_WAIT_UNTIL_TIMEOUT_MS", 60_000);
+const waitUntilManager = new StandardWaitUntilManager(waitUntilTimeoutInMs);
 waitUntil.setGlobalManager(waitUntilManager);
-// Wait for all streams to finish before completing the run
-waitUntil.register({
-  requiresResolving: () => runMetadataManager.hasActiveStreams(),
-  promise: () => runMetadataManager.waitForAllStreams(),
-});
 
 const triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
 const showInternalLogs = getEnvVar("RUN_WORKER_SHOW_LOGS") === "true";
 
+const standardHeartbeatsManager = new StandardHeartbeatsManager(
+  parseInt(heartbeatIntervalMs ?? "30000", 10)
+);
+heartbeats.setGlobalManager(standardHeartbeatsManager);
+
 async function importConfig(
   configPath: string
 ): Promise<{ config: TriggerConfig; handleError?: HandleErrorFunction }> {
@@ -175,12 +203,19 @@ async function doBootstrap() {
     const { config, handleError } = await importConfig(workerManifest.configPath);
 
     const tracingSDK = new TracingSDK({
-      url: env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
+      url: env.TRIGGER_OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
+      metricsUrl: env.TRIGGER_OTEL_METRICS_ENDPOINT,
       instrumentations: config.telemetry?.instrumentations ?? config.instrumentations ?? [],
       exporters: config.telemetry?.exporters ?? [],
       logExporters: config.telemetry?.logExporters ?? [],
-      diagLogLevel: (env.OTEL_LOG_LEVEL as TracingDiagnosticLogLevel) ?? "none",
+      metricExporters: config.telemetry?.metricExporters ?? [],
+      metricReaders: config.telemetry?.metricReaders ?? [],
+      diagLogLevel: (env.TRIGGER_OTEL_LOG_LEVEL as TracingDiagnosticLogLevel) ?? "none",
       forceFlushTimeoutMillis: 30_000,
+      resource: config.telemetry?.resource,
+      hostMetrics: true,
+      hostMetricGroups: ["process.cpu", "process.memory"],
+      nodejsRuntimeMetrics: true,
     });
 
     const otelTracer: Tracer = tracingSDK.getTracer("trigger-dev-worker", VERSION);
@@ -297,10 +332,19 @@ function resetExecutionEnvironment() {
   devUsageManager.reset();
   usageTimeoutManager.reset();
   runMetadataManager.reset();
+  standardRealtimeStreamsManager.reset();
   waitUntilManager.reset();
   _sharedWorkerRuntime?.reset();
   durableClock.reset();
   taskContext.disable();
+  standardTraceContextManager.reset();
+  standardHeartbeatsManager.reset();
+
+  // Wait for all streams to finish before completing the run
+  waitUntil.register({
+    requiresResolving: () => standardRealtimeStreamsManager.hasActiveStreams(),
+    promise: (timeoutInMs) => standardRealtimeStreamsManager.waitForAllStreams(timeoutInMs),
+  });
 
   log(`[${new Date().toISOString()}] Reset execution environment`);
 }
@@ -337,6 +381,7 @@ const zodIpc = new ZodIpcConnection({
 
       resetExecutionEnvironment();
 
+      standardTraceContextManager.traceContext = traceContext;
       standardRunTimelineMetricsManager.registerMetricsFromExecution(metrics, isWarmStart);
 
       if (_isRunning) {
@@ -361,6 +406,14 @@ const zodIpc = new ZodIpcConnection({
         return;
       }
 
+      const ctx = TaskRunContext.parse(execution);
+
+      taskContext.setGlobalTaskContext({
+        ctx,
+        worker: metadata,
+        isWarmStart: isWarmStart ?? false,
+      });
+
       try {
         const { tracer, tracingSDK, consoleInterceptor, config, workerManifest } =
           await bootstrap();
@@ -484,6 +537,8 @@ const zodIpc = new ZodIpcConnection({
         }
 
         runMetadataManager.runId = execution.run.id;
+        runMetadataManager.runIdIsRoot = typeof execution.run.rootTaskRunId === "undefined";
+
         _executionCount++;
 
         const executor = new TaskExecutor(task, {
@@ -499,17 +554,24 @@ const zodIpc = new ZodIpcConnection({
           _execution = execution;
           _isRunning = true;
 
+          standardHeartbeatsManager.startHeartbeat(attemptKey(execution));
+
           runMetadataManager.startPeriodicFlush(
             getNumberEnvVar("TRIGGER_RUN_METADATA_FLUSH_INTERVAL", 1000)
           );
 
+          devUsageManager.setInitialState({
+            cpuTime: execution.run.durationMs ?? 0,
+            costInCents: execution.run.costInCents ?? 0,
+          });
+
           _executionMeasurement = usage.start();
 
           const timeoutController = timeout.abortAfterTimeout(execution.run.maxDuration);
 
           const signal = AbortSignal.any([_cancelController.signal, timeoutController.signal]);
 
-          const { result } = await executor.execute(execution, metadata, traceContext, signal);
+          const { result } = await executor.execute(execution, ctx, signal);
 
           if (_isRunning && !_isCancelled) {
             const usageSample = usage.stop(_executionMeasurement);
@@ -526,6 +588,8 @@ const zodIpc = new ZodIpcConnection({
             });
           }
         } finally {
+          standardHeartbeatsManager.stopHeartbeat();
+
           _execution = undefined;
           _isRunning = false;
           log(`[${new Date().toISOString()}] Task run completed`);
@@ -561,8 +625,11 @@ const zodIpc = new ZodIpcConnection({
       }
       await flushAll(timeoutInMs);
     },
-    FLUSH: async ({ timeoutInMs }) => {
+    FLUSH: async ({ timeoutInMs, disableContext }) => {
       await flushAll(timeoutInMs);
+      if (disableContext) {
+        taskContext.disable();
+      }
     },
     RESOLVE_WAITPOINT: async ({ waitpoint }) => {
       _sharedWorkerRuntime?.resolveWaitpoints([waitpoint]);
@@ -659,17 +726,9 @@ async function flushMetadata(timeoutInMs: number = 10_000) {
 _sharedWorkerRuntime = new SharedRuntimeManager(zodIpc, showInternalLogs);
 runtime.setGlobalRuntimeManager(_sharedWorkerRuntime);
 
-const heartbeatInterval = parseInt(heartbeatIntervalMs ?? "30000", 10);
-
-for await (const _ of setInterval(heartbeatInterval)) {
-  if (_isRunning && _execution) {
-    try {
-      await zodIpc.send("TASK_HEARTBEAT", { id: attemptKey(_execution) });
-    } catch (err) {
-      logError("Failed to send HEARTBEAT message", err);
-    }
-  }
-}
+standardHeartbeatsManager.registerListener(async (id) => {
+  await zodIpc.send("TASK_HEARTBEAT", { id });
+});
 
 function log(message: string, ...args: any[]) {
   if (!showInternalLogs) return;
diff --git a/packages/cli-v3/src/entryPoints/managed-index-controller.ts b/packages/cli-v3/src/entryPoints/managed-index-controller.ts
index 13f24331ed5..7a8039af4d8 100644
--- a/packages/cli-v3/src/entryPoints/managed-index-controller.ts
+++ b/packages/cli-v3/src/entryPoints/managed-index-controller.ts
@@ -8,6 +8,7 @@ import { env } from "std-env";
 import { indexWorkerManifest } from "../indexing/indexWorkerManifest.js";
 import { resolveSourceFiles } from "../utilities/sourceFiles.js";
 import { execOptionsForRuntime } from "@trigger.dev/core/v3/build";
+import { writeJSONFile } from "../utilities/fileSystem.js";
 
 async function loadBuildManifest() {
   const manifestContents = await readFile("./build.json", "utf-8");
@@ -82,7 +83,8 @@ async function indexDeployment({
 
     console.log("Writing index.json", process.cwd());
 
-    await writeFile(join(process.cwd(), "index.json"), JSON.stringify(workerManifest, null, 2));
+    const { timings, ...manifestWithoutTimings } = workerManifest;
+    await writeJSONFile(join(process.cwd(), "index.json"), manifestWithoutTimings, true);
 
     const sourceFiles = resolveSourceFiles(buildManifest.sources, workerManifest.tasks);
 
diff --git a/packages/cli-v3/src/entryPoints/managed-index-worker.ts b/packages/cli-v3/src/entryPoints/managed-index-worker.ts
index 845ece47afe..5ff9f1b62ed 100644
--- a/packages/cli-v3/src/entryPoints/managed-index-worker.ts
+++ b/packages/cli-v3/src/entryPoints/managed-index-worker.ts
@@ -18,6 +18,7 @@ import { registerResources } from "../indexing/registerResources.js";
 import { env } from "std-env";
 import { normalizeImportPath } from "../utilities/normalizeImportPath.js";
 import { detectRuntimeVersion } from "@trigger.dev/core/v3/build";
+import { schemaToJsonSchema } from "@trigger.dev/schema-to-json";
 
 sourceMapSupport.install({
   handleUncaughtExceptions: false,
@@ -100,7 +101,7 @@ async function bootstrap() {
 
 const { buildManifest, importErrors, config, timings } = await bootstrap();
 
-let tasks = resourceCatalog.listTaskManifests();
+let tasks = await convertSchemasToJsonSchemas(resourceCatalog.listTaskManifests());
 
 // If the config has retry defaults, we need to apply them to all tasks that don't have any retry settings
 if (config.retries?.default) {
@@ -146,6 +147,8 @@ if (typeof config.machine === "string") {
   });
 }
 
+const processKeepAlive = config.processKeepAlive ?? config.experimental_processKeepAlive;
+
 await sendMessageInCatalog(
   indexerToWorkerMessages,
   "INDEX_COMPLETE",
@@ -162,10 +165,10 @@ await sendMessageInCatalog(
       customConditions: buildManifest.customConditions,
       initEntryPoint: buildManifest.initEntryPoint,
       processKeepAlive:
-        typeof config.experimental_processKeepAlive === "object"
-          ? config.experimental_processKeepAlive
-          : typeof config.experimental_processKeepAlive === "boolean"
-          ? { enabled: config.experimental_processKeepAlive }
+        typeof processKeepAlive === "object"
+          ? processKeepAlive
+          : typeof processKeepAlive === "boolean"
+          ? { enabled: processKeepAlive }
           : undefined,
       timings,
     },
@@ -196,3 +199,22 @@ await new Promise<void>((resolve) => {
     resolve();
   }, 10);
 });
+
+async function convertSchemasToJsonSchemas(tasks: TaskManifest[]): Promise<TaskManifest[]> {
+  const convertedTasks = tasks.map((task) => {
+    const schema = resourceCatalog.getTaskSchema(task.id);
+
+    if (schema) {
+      try {
+        const result = schemaToJsonSchema(schema);
+        return { ...task, payloadSchema: result?.jsonSchema };
+      } catch {
+        return task;
+      }
+    }
+
+    return task;
+  });
+
+  return convertedTasks;
+}
diff --git a/packages/cli-v3/src/entryPoints/managed-run-worker.ts b/packages/cli-v3/src/entryPoints/managed-run-worker.ts
index 294e2c741a3..922accfa4a5 100644
--- a/packages/cli-v3/src/entryPoints/managed-run-worker.ts
+++ b/packages/cli-v3/src/entryPoints/managed-run-worker.ts
@@ -20,6 +20,7 @@ import {
   runtime,
   runTimelineMetrics,
   taskContext,
+  TaskRunContext,
   TaskRunErrorCodes,
   TaskRunExecution,
   timeout,
@@ -28,6 +29,9 @@ import {
   waitUntil,
   WorkerManifest,
   WorkerToExecutorMessageCatalog,
+  traceContext,
+  heartbeats,
+  realtimeStreams,
 } from "@trigger.dev/core/v3";
 import { TriggerTracer } from "@trigger.dev/core/v3/tracer";
 import {
@@ -52,6 +56,9 @@ import {
   TracingSDK,
   usage,
   UsageTimeoutManager,
+  StandardTraceContextManager,
+  StandardHeartbeatsManager,
+  StandardRealtimeStreamsManager,
 } from "@trigger.dev/core/v3/workers";
 import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
 import { readFile } from "node:fs/promises";
@@ -119,19 +126,28 @@ resourceCatalog.setGlobalResourceCatalog(standardResourceCatalog);
 const durableClock = new DurableClock();
 clock.setGlobalClock(durableClock);
 
-const runMetadataManager = new StandardMetadataManager(
+const standardTraceContextManager = new StandardTraceContextManager();
+traceContext.setGlobalManager(standardTraceContextManager);
+
+const runMetadataManager = new StandardMetadataManager(apiClientManager.clientOrThrow());
+runMetadata.setGlobalManager(runMetadataManager);
+
+const standardRealtimeStreamsManager = new StandardRealtimeStreamsManager(
   apiClientManager.clientOrThrow(),
-  getEnvVar("TRIGGER_STREAM_URL", getEnvVar("TRIGGER_API_URL")) ?? "https://api.trigger.dev"
+  getEnvVar("TRIGGER_STREAM_URL", getEnvVar("TRIGGER_API_URL")) ?? "https://api.trigger.dev",
+  (getEnvVar("TRIGGER_STREAMS_DEBUG") === "1" || getEnvVar("TRIGGER_STREAMS_DEBUG") === "true") ??
+    false
 );
-runMetadata.setGlobalManager(runMetadataManager);
+realtimeStreams.setGlobalManager(standardRealtimeStreamsManager);
 
-const waitUntilManager = new StandardWaitUntilManager();
+const waitUntilTimeoutInMs = getNumberEnvVar("TRIGGER_WAIT_UNTIL_TIMEOUT_MS", 60_000);
+const waitUntilManager = new StandardWaitUntilManager(waitUntilTimeoutInMs);
 waitUntil.setGlobalManager(waitUntilManager);
-// Wait for all streams to finish before completing the run
-waitUntil.register({
-  requiresResolving: () => runMetadataManager.hasActiveStreams(),
-  promise: () => runMetadataManager.waitForAllStreams(),
-});
+
+const standardHeartbeatsManager = new StandardHeartbeatsManager(
+  parseInt(heartbeatIntervalMs ?? "30000", 10)
+);
+heartbeats.setGlobalManager(standardHeartbeatsManager);
 
 const triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
 
@@ -166,12 +182,24 @@ async function doBootstrap() {
     );
 
     const tracingSDK = new TracingSDK({
-      url: env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
-      instrumentations: config.instrumentations ?? [],
-      diagLogLevel: (env.OTEL_LOG_LEVEL as TracingDiagnosticLogLevel) ?? "none",
+      url: env.TRIGGER_OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
+      metricsUrl: env.TRIGGER_OTEL_METRICS_ENDPOINT,
+      instrumentations: config.telemetry?.instrumentations ?? config.instrumentations ?? [],
+      diagLogLevel: (env.TRIGGER_OTEL_LOG_LEVEL as TracingDiagnosticLogLevel) ?? "none",
       forceFlushTimeoutMillis: 30_000,
       exporters: config.telemetry?.exporters ?? [],
       logExporters: config.telemetry?.logExporters ?? [],
+      metricExporters: config.telemetry?.metricExporters ?? [],
+      metricReaders: config.telemetry?.metricReaders ?? [],
+      resource: config.telemetry?.resource,
+      hostMetrics: true,
+      hostMetricGroups:
+        getEnvVar("TRIGGER_SYSTEM_METRICS_ENABLED") === "1"
+          ? undefined
+          : ["process.cpu", "process.memory"],
+      nodejsRuntimeMetrics: true,
+      filesystemMetrics: getEnvVar("TRIGGER_SYSTEM_METRICS_ENABLED") === "1",
+      diskIoMetrics: getEnvVar("TRIGGER_SYSTEM_METRICS_ENABLED") === "1",
     });
 
     const otelTracer: Tracer = tracingSDK.getTracer("trigger-dev-worker", VERSION);
@@ -284,9 +312,18 @@ function resetExecutionEnvironment() {
   timeout.reset();
   runMetadataManager.reset();
   waitUntilManager.reset();
+  standardRealtimeStreamsManager.reset();
   _sharedWorkerRuntime?.reset();
   durableClock.reset();
   taskContext.disable();
+  standardTraceContextManager.reset();
+  standardHeartbeatsManager.reset();
+
+  // Wait for all streams to finish before completing the run
+  waitUntil.register({
+    requiresResolving: () => standardRealtimeStreamsManager.hasActiveStreams(),
+    promise: (timeoutInMs) => standardRealtimeStreamsManager.waitForAllStreams(timeoutInMs),
+  });
 
   console.log(`[${new Date().toISOString()}] Reset execution environment`);
 }
@@ -328,12 +365,19 @@ const zodIpc = new ZodIpcConnection({
 
       resetExecutionEnvironment();
 
-      initializeUsageManager({
+      standardTraceContextManager.traceContext = traceContext;
+
+      const prodManager = initializeUsageManager({
         usageIntervalMs: getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS"),
         usageEventUrl: getEnvVar("USAGE_EVENT_URL"),
         triggerJWT: getEnvVar("TRIGGER_JWT"),
       });
 
+      prodManager.setInitialState({
+        cpuTime: execution.run.durationMs ?? 0,
+        costInCents: execution.run.costInCents ?? 0,
+      });
+
       standardRunTimelineMetricsManager.registerMetricsFromExecution(metrics, isWarmStart);
 
       console.log(`[${new Date().toISOString()}] Received EXECUTE_TASK_RUN`, execution);
@@ -360,6 +404,14 @@ const zodIpc = new ZodIpcConnection({
         return;
       }
 
+      const ctx = TaskRunContext.parse(execution);
+
+      taskContext.setGlobalTaskContext({
+        ctx,
+        worker: metadata,
+        isWarmStart: isWarmStart ?? false,
+      });
+
       try {
         const { tracer, tracingSDK, consoleInterceptor, config, workerManifest } =
           await bootstrap();
@@ -483,6 +535,7 @@ const zodIpc = new ZodIpcConnection({
         }
 
         runMetadataManager.runId = execution.run.id;
+        runMetadataManager.runIdIsRoot = typeof execution.run.rootTaskRunId === "undefined";
         _executionCount++;
 
         const executor = new TaskExecutor(task, {
@@ -498,6 +551,8 @@ const zodIpc = new ZodIpcConnection({
           _execution = execution;
           _isRunning = true;
 
+          standardHeartbeatsManager.startHeartbeat(_execution.run.id);
+
           runMetadataManager.startPeriodicFlush(
             getNumberEnvVar("TRIGGER_RUN_METADATA_FLUSH_INTERVAL", 1000)
           );
@@ -508,7 +563,7 @@ const zodIpc = new ZodIpcConnection({
 
           const signal = AbortSignal.any([_cancelController.signal, timeoutController.signal]);
 
-          const { result } = await executor.execute(execution, metadata, traceContext, signal);
+          const { result } = await executor.execute(execution, ctx, signal);
 
           if (_isRunning && !_isCancelled) {
             const usageSample = usage.stop(_executionMeasurement);
@@ -525,6 +580,8 @@ const zodIpc = new ZodIpcConnection({
             });
           }
         } finally {
+          standardHeartbeatsManager.stopHeartbeat();
+
           _execution = undefined;
           _isRunning = false;
 
@@ -561,8 +618,11 @@ const zodIpc = new ZodIpcConnection({
       }
       await flushAll(timeoutInMs);
     },
-    FLUSH: async ({ timeoutInMs }) => {
+    FLUSH: async ({ timeoutInMs, disableContext }) => {
       await flushAll(timeoutInMs);
+      if (disableContext) {
+        taskContext.disable();
+      }
     },
     RESOLVE_WAITPOINT: async ({ waitpoint }) => {
       _sharedWorkerRuntime?.resolveWaitpoints([waitpoint]);
@@ -689,6 +749,19 @@ function initializeUsageManager({
 
   usage.setGlobalUsageManager(prodUsageManager);
   timeout.setGlobalManager(new UsageTimeoutManager(devUsageManager));
+
+  // Register listener to send IPC message when max duration is exceeded
+  timeout.registerListener(async (maxDurationInSeconds, elapsedTimeInSeconds) => {
+    console.log(
+      `[${new Date().toISOString()}] Max duration exceeded: ${maxDurationInSeconds}s, elapsed: ${elapsedTimeInSeconds}s`
+    );
+    await zodIpc.send("MAX_DURATION_EXCEEDED", {
+      maxDurationInSeconds,
+      elapsedTimeInSeconds,
+    });
+  });
+
+  return prodUsageManager;
 }
 
 _sharedWorkerRuntime = new SharedRuntimeManager(zodIpc, true);
@@ -696,16 +769,8 @@ runtime.setGlobalRuntimeManager(_sharedWorkerRuntime);
 
 process.title = "trigger-managed-worker";
 
-const heartbeatInterval = parseInt(heartbeatIntervalMs ?? "30000", 10);
-
-for await (const _ of setInterval(heartbeatInterval)) {
-  if (_isRunning && _execution) {
-    try {
-      await zodIpc.send("TASK_HEARTBEAT", { id: _execution.run.id });
-    } catch (err) {
-      console.error("Failed to send HEARTBEAT message", err);
-    }
-  }
-}
+standardHeartbeatsManager.registerListener(async (id) => {
+  await zodIpc.send("TASK_HEARTBEAT", { id });
+});
 
 console.log(`[${new Date().toISOString()}] Executor started`);
diff --git a/packages/cli-v3/src/entryPoints/managed/controller.ts b/packages/cli-v3/src/entryPoints/managed/controller.ts
index 2f9542092b6..54f0dba8471 100644
--- a/packages/cli-v3/src/entryPoints/managed/controller.ts
+++ b/packages/cli-v3/src/entryPoints/managed/controller.ts
@@ -30,7 +30,9 @@ export class ManagedRunController {
   private readonly logger: RunLogger;
   private readonly taskRunProcessProvider: TaskRunProcessProvider;
 
+  private warmStartEnabled = true;
   private warmStartCount = 0;
+
   private restoreCount = 0;
 
   private notificationCount = 0;
@@ -103,7 +105,19 @@ export class ManagedRunController {
         runId: this.runFriendlyId,
         message: "Received SIGTERM, stopping worker",
       });
-      await this.stop();
+
+      // Disable warm starts - prevents new warm start requests
+      this.warmStartEnabled = false;
+
+      // Abort any ongoing warm start long poll - immediately stops waiting for next run
+      // This prevents the scenario where:
+      // 1. SIGTERM kills a prepared child process
+      // 2. Warm start poll returns a new run
+      // 3. Controller tries to use the dead child process
+      this.warmStartClient?.abort();
+
+      // Now we wait for any active runs to finish gracefully
+      // SIGKILL will handle forced termination after termination grace period
     });
   }
 
@@ -276,6 +290,14 @@ export class ManagedRunController {
    *  the process on any errors or when no runs are available after the configured duration.
    */
   private async waitForNextRun() {
+    if (!this.warmStartEnabled) {
+      this.sendDebugLog({
+        runId: this.runFriendlyId,
+        message: "waitForNextRun: warm starts disabled, shutting down",
+      });
+      this.exitProcess(this.successExitCode);
+    }
+
     this.sendDebugLog({
       runId: this.runFriendlyId,
       message: "waitForNextRun()",
@@ -446,19 +468,6 @@ export class ManagedRunController {
         runId: this.runFriendlyId,
         message: "Socket connected to supervisor",
       });
-
-      // This should handle the case where we reconnect after being restored
-      if (
-        this.runFriendlyId &&
-        this.snapshotFriendlyId &&
-        this.runFriendlyId !== this.env.TRIGGER_RUN_ID
-      ) {
-        this.sendDebugLog({
-          runId: this.runFriendlyId,
-          message: "Subscribing to notifications for in-progress run",
-        });
-        this.subscribeToRunNotifications(this.runFriendlyId, this.snapshotFriendlyId);
-      }
     });
 
     socket.on("connect_error", (error) => {
@@ -499,7 +508,7 @@ export class ManagedRunController {
           supervisorApiUrl: this.env.TRIGGER_SUPERVISOR_API_URL,
         };
 
-        await this.currentExecution.processEnvOverrides("socket disconnected");
+        const result = await this.currentExecution.processEnvOverrides("socket disconnected", true);
 
         const newEnv = {
           workerInstanceName: this.env.TRIGGER_WORKER_INSTANCE_NAME,
@@ -513,6 +522,43 @@ export class ManagedRunController {
           properties: { reason, ...parseDescription(), currentEnv, newEnv },
         });
 
+        if (!result) {
+          return;
+        }
+
+        // If runner ID changed, we detected a restore
+        if (result.runnerIdChanged) {
+          this.sendDebugLog({
+            runId: this.runFriendlyId,
+            message: "Runner ID changed - restore detected",
+            properties: {
+              supervisorChanged: result.supervisorChanged,
+            },
+          });
+
+          if (!result.supervisorChanged) {
+            return;
+          }
+
+          // Only reconnect WebSocket if supervisor URL actually changed
+          this.sendDebugLog({
+            runId: this.runFriendlyId,
+            message: "Supervisor URL changed - creating new socket connection",
+          });
+
+          // First disconnect the old socket to avoid conflicts
+          socket.removeAllListeners();
+          socket.disconnect();
+
+          // Create a new socket with the updated URL and headers
+          this.socket = this.createSupervisorSocket();
+
+          // Re-subscribe to notifications if we have an active execution
+          if (this.runFriendlyId && this.snapshotFriendlyId) {
+            this.subscribeToRunNotifications(this.runFriendlyId, this.snapshotFriendlyId);
+          }
+        }
+
         return;
       }
 
@@ -548,7 +594,7 @@ export class ManagedRunController {
     return;
   }
 
-  async stop() {
+  async cancelRunsAndExitProcess() {
     this.sendDebugLog({
       runId: this.runFriendlyId,
       message: "Shutting down",
@@ -578,6 +624,9 @@ export class ManagedRunController {
 
     // Close the socket
     this.socket.close();
+
+    // Exit the process
+    this.exitProcess(this.successExitCode);
   }
 
   sendDebugLog(opts: SendDebugLogOptions) {
diff --git a/packages/cli-v3/src/entryPoints/managed/env.ts b/packages/cli-v3/src/entryPoints/managed/env.ts
index 68a403d3da6..5e7c5b3f28b 100644
--- a/packages/cli-v3/src/entryPoints/managed/env.ts
+++ b/packages/cli-v3/src/entryPoints/managed/env.ts
@@ -12,8 +12,6 @@ const DateEnv = z
 const Env = z.object({
   // Set at build time
   TRIGGER_CONTENT_HASH: z.string(),
-  TRIGGER_DEPLOYMENT_ID: z.string(),
-  TRIGGER_DEPLOYMENT_VERSION: z.string(),
   TRIGGER_PROJECT_ID: z.string(),
   TRIGGER_PROJECT_REF: z.string(),
   NODE_ENV: z.string().default("production"),
@@ -21,6 +19,8 @@ const Env = z.object({
   UV_USE_IO_URING: z.string().optional(),
 
   // Set at runtime
+  TRIGGER_DEPLOYMENT_ID: z.string(),
+  TRIGGER_DEPLOYMENT_VERSION: z.string(),
   TRIGGER_WORKLOAD_CONTROLLER_ID: z.string().default(`controller_${randomUUID()}`),
   TRIGGER_ENV_ID: z.string(),
   OTEL_EXPORTER_OTLP_ENDPOINT: z.string().url(),
@@ -221,6 +221,7 @@ export class RunnerEnv {
       NODE_ENV: this.NODE_ENV,
       NODE_EXTRA_CA_CERTS: this.NODE_EXTRA_CA_CERTS,
       OTEL_EXPORTER_OTLP_ENDPOINT: this.OTEL_EXPORTER_OTLP_ENDPOINT,
+      TRIGGER_OTEL_EXPORTER_OTLP_ENDPOINT: this.OTEL_EXPORTER_OTLP_ENDPOINT,
       UV_USE_IO_URING: this.UV_USE_IO_URING,
     };
 
diff --git a/packages/cli-v3/src/entryPoints/managed/execution.ts b/packages/cli-v3/src/entryPoints/managed/execution.ts
index 7b0245f4783..ec927627f36 100644
--- a/packages/cli-v3/src/entryPoints/managed/execution.ts
+++ b/packages/cli-v3/src/entryPoints/managed/execution.ts
@@ -76,6 +76,9 @@ export class RunExecution {
   private isShuttingDown = false;
   private shutdownReason?: string;
 
+  private isCompletingRun = false;
+  private ignoreSnapshotChanges = false;
+
   private supervisorSocket: SupervisorSocket;
   private notifier?: RunNotifier;
   private metadataClient?: MetadataClient;
@@ -235,6 +238,16 @@ export class RunExecution {
       completedWaitpoints: completedWaitpoints.length,
     };
 
+    if (this.ignoreSnapshotChanges) {
+      this.sendDebugLog("processSnapshotChange: ignoring snapshot change", {
+        incomingSnapshotId: snapshot.friendlyId,
+        completedWaitpoints: completedWaitpoints.length,
+        currentAttemptNumber: this.currentAttemptNumber,
+        newAttemptNumber: run.attemptNumber,
+      });
+      return;
+    }
+
     if (!this.snapshotManager) {
       this.sendDebugLog("handleSnapshotChange: missing snapshot manager", snapshotMetadata);
       return;
@@ -292,7 +305,13 @@ export class RunExecution {
       case "FINISHED": {
         this.sendDebugLog("run is finished", snapshotMetadata);
 
-        // This can sometimes be called before the handleCompletionResult, so we don't need to do anything here
+        // We are finishing the run in handleCompletionResult, so we don't need to do anything here
+        if (this.isCompletingRun) {
+          this.sendDebugLog("run is finished but we're completing it, skipping", snapshotMetadata);
+          return;
+        }
+
+        await this.exitTaskRunProcessWithoutFailingRun({ flush: true, reason: "already-finished" });
         return;
       }
       case "QUEUED_EXECUTING":
@@ -353,9 +372,10 @@ export class RunExecution {
 
         return;
       }
-      case "RUN_CREATED": {
+      case "RUN_CREATED":
+      case "DELAYED": {
         this.sendDebugLog(
-          "aborting execution: invalid status change: RUN_CREATED",
+          "aborting execution: invalid status change: RUN_CREATED or DELAYED",
           snapshotMetadata
         );
 
@@ -377,6 +397,9 @@ export class RunExecution {
       throw new Error("Cannot start attempt: missing run or snapshot manager");
     }
 
+    // Reset this for the new attempt
+    this.isCompletingRun = false;
+
     this.sendDebugLog("starting attempt", { isWarmStart: String(isWarmStart) });
 
     const attemptStartedAt = Date.now();
@@ -655,6 +678,8 @@ export class RunExecution {
       throw new Error("cannot complete run: missing run or snapshot manager");
     }
 
+    this.isCompletingRun = true;
+
     const completionResult = await this.httpClient.completeRunAttempt(
       this.runFriendlyId,
       this.snapshotManager.snapshotId,
@@ -795,7 +820,9 @@ export class RunExecution {
     }
 
     // Start and execute next attempt
-    const [startError, start] = await tryCatch(this.startAttempt({ isWarmStart: true }));
+    const [startError, start] = await tryCatch(
+      this.enableIgnoreSnapshotChanges(() => this.startAttempt({ isWarmStart: true }))
+    );
 
     if (startError) {
       this.sendDebugLog("failed to start attempt for retry", { error: startError.message });
@@ -816,6 +843,15 @@ export class RunExecution {
     }
   }
 
+  private async enableIgnoreSnapshotChanges<T>(fn: () => Promise<T>): Promise<T> {
+    this.ignoreSnapshotChanges = true;
+    try {
+      return await fn();
+    } finally {
+      this.ignoreSnapshotChanges = false;
+    }
+  }
+
   /**
    * Restores a suspended execution from PENDING_EXECUTING
    */
@@ -838,7 +874,23 @@ export class RunExecution {
     );
 
     if (!continuationResult.success) {
-      throw new Error(continuationResult.error);
+      // Check if we need to refresh metadata due to connection error
+      if (continuationResult.isConnectionError) {
+        this.sendDebugLog("restore: connection error detected, refreshing metadata");
+        await this.processEnvOverrides("restore connection error");
+
+        // Retry the continuation after refreshing metadata
+        const retryResult = await this.httpClient.continueRunExecution(
+          this.runFriendlyId,
+          this.snapshotManager.snapshotId
+        );
+
+        if (!retryResult.success) {
+          throw new Error(retryResult.error);
+        }
+      } else {
+        throw new Error(continuationResult.error);
+      }
     }
 
     // Track restore count
@@ -861,11 +913,21 @@ export class RunExecution {
   /**
    * Processes env overrides from the metadata service. Generally called when we're resuming from a suspended state.
    */
-  public async processEnvOverrides(reason?: string): Promise<{ overrides: Metadata } | null> {
+  public async processEnvOverrides(
+    reason?: string,
+    shouldPollForSnapshotChanges?: boolean
+  ): Promise<{
+    overrides: Metadata;
+    runnerIdChanged?: boolean;
+    supervisorChanged?: boolean;
+  } | null> {
     if (!this.metadataClient) {
       return null;
     }
 
+    const previousRunnerId = this.env.TRIGGER_RUNNER_ID;
+    const previousSupervisorUrl = this.env.TRIGGER_SUPERVISOR_API_URL;
+
     const [error, overrides] = await this.metadataClient.getEnvOverrides();
 
     if (error) {
@@ -893,6 +955,14 @@ export class RunExecution {
     // Override the env with the new values
     this.env.override(overrides);
 
+    // Check if runner ID changed
+    const newRunnerId = this.env.TRIGGER_RUNNER_ID;
+    const runnerIdChanged = previousRunnerId !== newRunnerId;
+
+    // Check if supervisor URL changed
+    const newSupervisorUrl = this.env.TRIGGER_SUPERVISOR_API_URL;
+    const supervisorChanged = previousSupervisorUrl !== newSupervisorUrl;
+
     // Update services with new values
     if (overrides.TRIGGER_SNAPSHOT_POLL_INTERVAL_SECONDS) {
       this.snapshotPoller?.updateInterval(this.env.TRIGGER_SNAPSHOT_POLL_INTERVAL_SECONDS * 1000);
@@ -908,8 +978,16 @@ export class RunExecution {
       this.httpClient.updateRunnerId(this.env.TRIGGER_RUNNER_ID);
     }
 
+    // Poll for snapshot changes immediately
+    if (shouldPollForSnapshotChanges) {
+      this.sendDebugLog("[override] polling for snapshot changes", { reason });
+      this.fetchAndProcessSnapshotChanges("restore").catch(() => {});
+    }
+
     return {
       overrides,
+      runnerIdChanged,
+      supervisorChanged,
     };
   }
 
@@ -933,6 +1011,12 @@ export class RunExecution {
 
     if (!response.success) {
       this.sendDebugLog("heartbeat: failed", { error: response.error });
+
+      // Check if we need to refresh metadata due to connection error
+      if (response.isConnectionError) {
+        this.sendDebugLog("heartbeat: connection error detected, refreshing metadata");
+        await this.processEnvOverrides("heartbeat connection error");
+      }
     }
 
     this.lastHeartbeat = new Date();
@@ -1148,6 +1232,14 @@ export class RunExecution {
         error: response.error,
       });
 
+      if (response.isConnectionError) {
+        // Log this separately to make it more visible
+        this.sendDebugLog(
+          "fetchAndProcessSnapshotChanges: connection error detected, refreshing metadata"
+        );
+      }
+
+      // Always trigger metadata refresh on snapshot fetch errors
       await this.processEnvOverrides("snapshots since error");
       return;
     }
diff --git a/packages/cli-v3/src/entryPoints/managed/snapshot.test.ts b/packages/cli-v3/src/entryPoints/managed/snapshot.test.ts
index 05cba11f38f..a3dbab3883b 100644
--- a/packages/cli-v3/src/entryPoints/managed/snapshot.test.ts
+++ b/packages/cli-v3/src/entryPoints/managed/snapshot.test.ts
@@ -697,6 +697,65 @@ describe("SnapshotManager", () => {
       true
     );
   });
+
+  it("should handle deprecated snapshot race condition - avoid false positives from stale polls", async () => {
+    const onSnapshotChange = vi.fn();
+
+    // Mock MetadataClient to simulate runner ID change (restore detected) on first call
+    let isFirstCall = true;
+    const mockMetadataClient = {
+      getEnvOverrides: vi.fn().mockImplementation(() => {
+        if (isFirstCall) {
+          isFirstCall = false;
+          return Promise.resolve([null, { TRIGGER_RUNNER_ID: "test-runner-2" }]); // Different runner ID = restore
+        }
+        return Promise.resolve([null, { TRIGGER_RUNNER_ID: "test-runner-2" }]); // Same runner ID afterward
+      }),
+    };
+
+    const manager = new SnapshotManager({
+      runnerId: "test-runner-1",
+      runFriendlyId: "test-run-1",
+      initialSnapshotId: "snapshot-1",
+      initialStatus: "EXECUTING_WITH_WAITPOINTS",
+      logger: mockLogger,
+      metadataClient: mockMetadataClient as any,
+      onSnapshotChange,
+      onSuspendable: mockSuspendableHandler,
+    });
+
+    // First update: Process restore transition with deprecated statuses (normal case)
+    // This simulates: EXECUTING_WITH_WAITPOINTS -> [SUSPENDED, QUEUED] -> PENDING_EXECUTING
+    await manager.handleSnapshotChanges([
+      createRunExecutionData({ snapshotId: "snapshot-suspended", executionStatus: "SUSPENDED" }),
+      createRunExecutionData({ snapshotId: "snapshot-queued", executionStatus: "QUEUED" }),
+      createRunExecutionData({ snapshotId: "snapshot-2", executionStatus: "PENDING_EXECUTING" }),
+    ]);
+
+    // First call should be deprecated=false (restore detected)
+    expect(onSnapshotChange).toHaveBeenCalledWith(
+      expect.objectContaining({ snapshot: expect.objectContaining({ friendlyId: "snapshot-2" }) }),
+      false
+    );
+
+    onSnapshotChange.mockClear();
+
+    // Second update: Should only get new snapshot (race condition case)
+    // This simulates a stale poll that returns: getSnapshotsSince(snapshot-1) -> [SUSPENDED, QUEUED, snapshot-2, snapshot-3]
+    // The SUSPENDED/QUEUED should be ignored as already seen
+    await manager.handleSnapshotChanges([
+      createRunExecutionData({ snapshotId: "snapshot-suspended", executionStatus: "SUSPENDED" }), // Already seen
+      createRunExecutionData({ snapshotId: "snapshot-queued", executionStatus: "QUEUED" }), // Already seen
+      createRunExecutionData({ snapshotId: "snapshot-2", executionStatus: "PENDING_EXECUTING" }), // Already processed
+      createRunExecutionData({ snapshotId: "snapshot-3", executionStatus: "EXECUTING" }), // New
+    ]);
+
+    // Should call onSnapshotChange with deprecated = false (no new deprecated snapshots)
+    expect(onSnapshotChange).toHaveBeenCalledWith(
+      expect.objectContaining({ snapshot: expect.objectContaining({ friendlyId: "snapshot-3" }) }),
+      false
+    );
+  });
 });
 
 // Helper to generate RunExecutionData with sensible defaults
diff --git a/packages/cli-v3/src/entryPoints/managed/snapshot.ts b/packages/cli-v3/src/entryPoints/managed/snapshot.ts
index 75d3d4b0366..9703ea8f871 100644
--- a/packages/cli-v3/src/entryPoints/managed/snapshot.ts
+++ b/packages/cli-v3/src/entryPoints/managed/snapshot.ts
@@ -49,6 +49,10 @@ export class SnapshotManager {
   private changeQueue: QueuedChangeItem[] = [];
   private isProcessingQueue = false;
 
+  // Track seen deprecated snapshots to prevent false positives
+  private seenDeprecatedSnapshotIds: string[] = [];
+  private readonly maxSeenDeprecatedSnapshotIds = 50;
+
   constructor(opts: SnapshotManagerOptions) {
     this.runFriendlyId = opts.runFriendlyId;
     this.runnerId = opts.runnerId;
@@ -284,9 +288,13 @@ export class SnapshotManager {
 
         // Check if any previous snapshot is QUEUED or SUSPENDED
         const deprecatedStatus: TaskRunExecutionStatus[] = ["QUEUED", "SUSPENDED"];
-        const deprecatedSnapshots = previousSnapshots.filter((snap) =>
-          deprecatedStatus.includes(snap.snapshot.executionStatus)
-        );
+        const deprecatedSnapshots = previousSnapshots.filter((snap) => {
+          const isDeprecated = deprecatedStatus.includes(snap.snapshot.executionStatus);
+          const previouslySeen = this.seenDeprecatedSnapshotIds.some(
+            (s) => s === snap.snapshot.friendlyId
+          );
+          return isDeprecated && !previouslySeen;
+        });
 
         let deprecated = false;
         if (deprecatedSnapshots.length > 0) {
@@ -298,6 +306,18 @@ export class SnapshotManager {
           } else {
             deprecated = true;
           }
+
+          // Add the deprecated snapshot IDs to the seen list
+          this.seenDeprecatedSnapshotIds.push(
+            ...deprecatedSnapshots.map((s) => s.snapshot.friendlyId)
+          );
+
+          if (this.seenDeprecatedSnapshotIds.length > this.maxSeenDeprecatedSnapshotIds) {
+            // Only keep the latest maxSeenDeprecatedSnapshotIds
+            this.seenDeprecatedSnapshotIds = this.seenDeprecatedSnapshotIds.slice(
+              -this.maxSeenDeprecatedSnapshotIds
+            );
+          }
         }
 
         const { snapshot } = latestSnapshot;
diff --git a/packages/cli-v3/src/entryPoints/managed/taskRunProcessProvider.ts b/packages/cli-v3/src/entryPoints/managed/taskRunProcessProvider.ts
index 381dca908a8..f1bf0d6d621 100644
--- a/packages/cli-v3/src/entryPoints/managed/taskRunProcessProvider.ts
+++ b/packages/cli-v3/src/entryPoints/managed/taskRunProcessProvider.ts
@@ -1,4 +1,4 @@
-import { WorkerManifest } from "@trigger.dev/core/v3";
+import { WorkerManifest, generateFriendlyId } from "@trigger.dev/core/v3";
 import { TaskRunProcess } from "../../executions/taskRunProcess.js";
 import { RunnerEnv } from "./env.js";
 import { RunLogger, SendDebugLogOptions } from "./logger.js";
@@ -22,6 +22,7 @@ export class TaskRunProcessProvider {
   private readonly logger: RunLogger;
   private readonly processKeepAliveEnabled: boolean;
   private readonly processKeepAliveMaxExecutionCount: number;
+  private readonly machineId = generateFriendlyId("machine");
 
   // Process keep-alive state
   private persistentProcess: TaskRunProcess | null = null;
@@ -250,7 +251,7 @@ export class TaskRunProcessProvider {
       workerManifest: this.workerManifest,
       env: processEnv,
       serverWorker: {
-        id: "managed",
+        id: this.env.TRIGGER_DEPLOYMENT_ID,
         contentHash: this.env.TRIGGER_CONTENT_HASH,
         version: this.env.TRIGGER_DEPLOYMENT_VERSION,
         engine: "V2",
@@ -269,6 +270,7 @@ export class TaskRunProcessProvider {
     return {
       ...taskRunEnv,
       ...this.env.gatherProcessEnv(),
+      TRIGGER_MACHINE_ID: this.machineId,
       HEARTBEAT_INTERVAL_MS: String(this.env.TRIGGER_HEARTBEAT_INTERVAL_SECONDS * 1000),
     };
   }
diff --git a/packages/cli-v3/src/executions/taskRunProcess.test.ts b/packages/cli-v3/src/executions/taskRunProcess.test.ts
new file mode 100644
index 00000000000..82ab19639b2
--- /dev/null
+++ b/packages/cli-v3/src/executions/taskRunProcess.test.ts
@@ -0,0 +1,121 @@
+import { TaskRunProcess, type TaskRunProcessOptions } from "./taskRunProcess.js";
+import { describe, it, expect, vi } from "vitest";
+import { UnexpectedExitError } from "@trigger.dev/core/v3/errors";
+import type {
+  TaskRunExecution,
+  TaskRunExecutionPayload,
+  WorkerManifest,
+  ServerBackgroundWorker,
+  MachinePresetResources,
+} from "@trigger.dev/core/v3";
+
+function createTaskRunProcessOptions(
+  overrides: Partial<TaskRunProcessOptions> = {}
+): TaskRunProcessOptions {
+  return {
+    workerManifest: {
+      runtime: "node",
+      workerEntryPoint: "/dev/null",
+      configEntryPoint: "/dev/null",
+      otelImportHook: {},
+    } as unknown as WorkerManifest,
+    serverWorker: {} as unknown as ServerBackgroundWorker,
+    env: {},
+    machineResources: { cpu: 1, memory: 1 } as MachinePresetResources,
+    ...overrides,
+  };
+}
+
+function createExecution(runId: string, attemptNumber: number): TaskRunExecution {
+  return {
+    run: {
+      id: runId,
+      payload: "{}",
+      payloadType: "application/json",
+      tags: [],
+      isTest: false,
+      createdAt: new Date(),
+      startedAt: new Date(),
+      maxAttempts: 3,
+      version: "1",
+      durationMs: 0,
+      costInCents: 0,
+      baseCostInCents: 0,
+    },
+    attempt: {
+      number: attemptNumber,
+      startedAt: new Date(),
+      id: "deprecated",
+      backgroundWorkerId: "deprecated",
+      backgroundWorkerTaskId: "deprecated",
+      status: "deprecated" as any,
+    },
+    task: { id: "test-task", filePath: "test.ts" },
+    queue: { id: "queue-1", name: "test-queue" },
+    environment: { id: "env-1", slug: "test", type: "DEVELOPMENT" },
+    organization: { id: "org-1", slug: "test-org", name: "Test Org" },
+    project: { id: "proj-1", ref: "proj_test", slug: "test", name: "Test" },
+    machine: { name: "small-1x", cpu: 0.5, memory: 0.5, centsPerMs: 0 },
+  } as unknown as TaskRunExecution;
+}
+
+describe("TaskRunProcess", () => {
+  describe("execute() on a dead child process", () => {
+    it("should reject when child process has already exited and IPC send is skipped", async () => {
+      const proc = new TaskRunProcess(createTaskRunProcessOptions());
+
+      // Simulate a child process that has exited: _child exists but is not connected
+      const fakeChild = {
+        connected: false,
+        killed: false,
+        pid: 12345,
+        kill: vi.fn(),
+        on: vi.fn(),
+        stdout: { on: vi.fn() },
+        stderr: { on: vi.fn() },
+      };
+
+      // Set internal state to mimic a process whose child has crashed
+      (proc as any)._child = fakeChild;
+      (proc as any)._childPid = 12345;
+      (proc as any)._isBeingKilled = false;
+
+      const execution = createExecution("run-1", 2);
+
+      // This should NOT hang forever - it should reject promptly.
+      //
+      // BUG: Currently execute() creates a promise, skips the IPC send because
+      // _child.connected is false, then awaits the promise which will never
+      // resolve because the child is dead and #handleExit already ran.
+      //
+      // The Promise.race with a timeout detects the hang.
+      const result = await Promise.race([
+        proc
+          .execute(
+            {
+              payload: { execution, traceContext: {}, metrics: [] },
+              messageId: "run_run-1",
+              env: {},
+            },
+            true
+          )
+          .then(
+            (v) => ({ type: "resolved" as const, value: v }),
+            (e) => ({ type: "rejected" as const, error: e })
+          ),
+        new Promise<{ type: "hung" }>((resolve) =>
+          setTimeout(() => resolve({ type: "hung" as const }), 2000)
+        ),
+      ]);
+
+      // The test fails (proving the bug) if execute() hangs
+      expect(result.type).not.toBe("hung");
+      expect(result.type).toBe("rejected");
+
+      if (result.type === "rejected") {
+        expect(result.error).toBeInstanceOf(UnexpectedExitError);
+        expect(result.error.stderr).toContain("not connected");
+      }
+    });
+  });
+});
diff --git a/packages/cli-v3/src/executions/taskRunProcess.ts b/packages/cli-v3/src/executions/taskRunProcess.ts
index 74aecededf3..a329956c0d2 100644
--- a/packages/cli-v3/src/executions/taskRunProcess.ts
+++ b/packages/cli-v3/src/executions/taskRunProcess.ts
@@ -30,6 +30,7 @@ import {
   CleanupProcessError,
   internalErrorFromUnexpectedExit,
   GracefulExitTimeoutError,
+  MaxDurationExceededError,
   UnexpectedExitError,
   SuspendedProcessError,
 } from "@trigger.dev/core/v3/errors";
@@ -51,6 +52,7 @@ export type TaskRunProcessOptions = {
   machineResources: MachinePresetResources;
   isWarmStart?: boolean;
   cwd?: string;
+  gracefulTerminationTimeoutInMs?: number;
 };
 
 export type TaskRunProcessExecuteParams = {
@@ -73,6 +75,8 @@ export class TaskRunProcess {
   private _isBeingKilled: boolean = false;
   private _isBeingCancelled: boolean = false;
   private _isBeingSuspended: boolean = false;
+  private _isMaxDurationExceeded: boolean = false;
+  private _maxDurationInfo?: { maxDurationInSeconds: number; elapsedTimeInSeconds: number };
   private _stderr: Array<string> = [];
 
   public onTaskRunHeartbeat: Evt<string> = new Evt();
@@ -110,11 +114,9 @@ export class TaskRunProcess {
 
     try {
       await this.#cancel();
-    } catch (err) {
-      console.error("Error cancelling task run process", { err });
-    }
+    } catch (err) {}
 
-    await this.kill();
+    await this.#gracefullyTerminate(this.options.gracefulTerminationTimeoutInMs);
   }
 
   async cleanup(kill = true) {
@@ -124,14 +126,10 @@ export class TaskRunProcess {
       return;
     }
 
-    try {
-      await this.#flush();
-    } catch (err) {
-      console.error("Error flushing task run process", { err });
-    }
+    await tryCatch(this.#flush({ disableContext: !kill }));
 
     if (kill) {
-      await this.kill("SIGKILL");
+      await this.#gracefullyTerminate(this.options.gracefulTerminationTimeoutInMs);
     }
   }
 
@@ -214,20 +212,38 @@ export class TaskRunProcess {
         SET_SUSPENDABLE: async (message) => {
           this.onSetSuspendable.post(message);
         },
+        MAX_DURATION_EXCEEDED: async (message) => {
+          logger.debug("max duration exceeded, gracefully terminating child process", {
+            maxDurationInSeconds: message.maxDurationInSeconds,
+            elapsedTimeInSeconds: message.elapsedTimeInSeconds,
+            pid: this.pid,
+          });
+
+          // Set flag and store duration info for error reporting in #handleExit
+          this._isMaxDurationExceeded = true;
+          this._maxDurationInfo = {
+            maxDurationInSeconds: message.maxDurationInSeconds,
+            elapsedTimeInSeconds: message.elapsedTimeInSeconds,
+          };
+
+          // Use the same graceful termination approach as cancel
+          await this.#gracefullyTerminate(this.options.gracefulTerminationTimeoutInMs);
+        },
       },
     });
 
     this._child.on("exit", this.#handleExit.bind(this));
+    this._child.on("error", this.#handleError.bind(this));
     this._child.stdout?.on("data", this.#handleLog.bind(this));
     this._child.stderr?.on("data", this.#handleStdErr.bind(this));
 
     return this;
   }
 
-  async #flush(timeoutInMs: number = 5_000) {
+  async #flush({ timeoutInMs = 5_000, disableContext = false } = {}) {
     logger.debug("flushing task run process", { pid: this.pid });
 
-    await this._ipc?.sendWithAck("FLUSH", { timeoutInMs }, timeoutInMs + 1_000);
+    await this._ipc?.sendWithAck("FLUSH", { timeoutInMs, disableContext }, timeoutInMs + 1_000);
   }
 
   async #cancel(timeoutInMs: number = 30_000) {
@@ -281,6 +297,19 @@ export class TaskRunProcess {
         env: params.env,
         isWarmStart: isWarmStart ?? this.options.isWarmStart,
       });
+    } else {
+      // Child process is dead or disconnected — the IPC send was skipped so the attempt
+      // promise would hang forever. Reject it immediately to let the caller handle it.
+      this._attemptStatuses.set(key, "REJECTED");
+
+      // @ts-expect-error - rejecter is assigned in the promise constructor above
+      rejecter(
+        new UnexpectedExitError(
+          -1,
+          null,
+          "Child process is not connected, cannot execute task run"
+        )
+      );
     }
 
     const result = await promise;
@@ -306,6 +335,10 @@ export class TaskRunProcess {
     this._ipc?.send("RESOLVE_WAITPOINT", { waitpoint });
   }
 
+  #handleError(error: Error) {
+    logger.debug("child process error", { error, pid: this.pid });
+  }
+
   async #handleExit(code: number | null, signal: NodeJS.Signals | null) {
     logger.debug("handling child exit", { code, signal, pid: this.pid });
 
@@ -324,7 +357,25 @@ export class TaskRunProcess {
 
         const { rejecter } = attemptPromise;
 
-        if (this._isBeingCancelled) {
+        if (this._isMaxDurationExceeded) {
+          if (!this._maxDurationInfo) {
+            rejecter(
+              new UnexpectedExitError(
+                code ?? -1,
+                signal,
+                "MaxDuration flag set but duration info missing"
+              )
+            );
+            continue;
+          }
+
+          rejecter(
+            new MaxDurationExceededError(
+              this._maxDurationInfo.maxDurationInSeconds,
+              this._maxDurationInfo.elapsedTimeInSeconds
+            )
+          );
+        } else if (this._isBeingCancelled) {
           rejecter(new CancelledProcessError());
         } else if (this._gracefulExitTimeoutElapsed) {
           // Order matters, this has to be before the graceful exit timeout
@@ -395,6 +446,18 @@ export class TaskRunProcess {
     this._stderr.push(errorLine);
   }
 
+  async #gracefullyTerminate(timeoutInMs: number = 1_000) {
+    logger.debug("gracefully terminating task run process", { pid: this.pid, timeoutInMs });
+
+    await this.kill("SIGTERM", timeoutInMs);
+
+    if (this._child?.connected) {
+      logger.debug("child process is still connected, sending SIGKILL", { pid: this.pid });
+
+      await this.kill("SIGKILL");
+    }
+  }
+
   /** This will never throw. */
   async kill(signal?: number | NodeJS.Signals, timeoutInMs?: number) {
     logger.debug(`killing task run process`, {
@@ -420,7 +483,11 @@ export class TaskRunProcess {
     const [error] = await tryCatch(killTimeout);
 
     if (error) {
-      logger.debug("kill: failed to wait for child process to exit", { error });
+      logger.debug("kill: failed to wait for child process to exit", {
+        timeoutInMs,
+        signal,
+        pid: this.pid,
+      });
     }
   }
 
@@ -428,11 +495,7 @@ export class TaskRunProcess {
     this._isBeingSuspended = true;
 
     if (flush) {
-      const [error] = await tryCatch(this.#flush());
-
-      if (error) {
-        console.error("Error flushing task run process", { error });
-      }
+      await tryCatch(this.#flush());
     }
 
     await this.kill("SIGKILL");
@@ -470,6 +533,14 @@ export class TaskRunProcess {
       };
     }
 
+    if (error instanceof MaxDurationExceededError) {
+      return {
+        type: "INTERNAL_ERROR",
+        code: TaskRunErrorCodes.MAX_DURATION_EXCEEDED,
+        message: error.message,
+      };
+    }
+
     if (error instanceof CleanupProcessError) {
       return {
         type: "INTERNAL_ERROR",
diff --git a/packages/cli-v3/src/indexing/indexWorkerManifest.ts b/packages/cli-v3/src/indexing/indexWorkerManifest.ts
index ff8de685cea..e4ae72283ff 100644
--- a/packages/cli-v3/src/indexing/indexWorkerManifest.ts
+++ b/packages/cli-v3/src/indexing/indexWorkerManifest.ts
@@ -61,7 +61,7 @@ export async function indexWorkerManifest({
       }
 
       resolved = true;
-      child.kill();
+      child.kill("SIGKILL");
       reject(new Error("Worker timed out"));
     }, 20_000);
 
@@ -79,21 +79,21 @@ export async function indexWorkerManifest({
           } else {
             resolve(message.payload.manifest);
           }
-          child.kill();
+          child.kill("SIGKILL");
           break;
         }
         case "TASKS_FAILED_TO_PARSE": {
           clearTimeout(timeout);
           resolved = true;
           reject(new TaskMetadataParseError(message.payload.zodIssues, message.payload.tasks));
-          child.kill();
+          child.kill("SIGKILL");
           break;
         }
         case "UNCAUGHT_EXCEPTION": {
           clearTimeout(timeout);
           resolved = true;
           reject(new UncaughtExceptionError(message.payload.error, message.payload.origin));
-          child.kill();
+          child.kill("SIGKILL");
           break;
         }
       }
diff --git a/packages/cli-v3/src/mcp/auth.ts b/packages/cli-v3/src/mcp/auth.ts
new file mode 100644
index 00000000000..a09543874d7
--- /dev/null
+++ b/packages/cli-v3/src/mcp/auth.ts
@@ -0,0 +1,215 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { env } from "std-env";
+import { CliApiClient } from "../apiClient.js";
+import { CLOUD_API_URL } from "../consts.js";
+import { readAuthConfigProfile, writeAuthConfigProfile } from "../utilities/configFiles.js";
+import { NotAccessTokenError, validateAccessToken } from "../utilities/accessTokens.js";
+import { LoginResult, LoginResultOk } from "../utilities/session.js";
+import { getPersonalAccessToken } from "../commands/login.js";
+import open from "open";
+import pRetry from "p-retry";
+import { McpContext } from "./context.js";
+import { ApiClient } from "@trigger.dev/core/v3";
+
+export type McpAuthOptions = {
+  server: McpServer;
+  context: McpContext;
+  defaultApiUrl?: string;
+  profile?: string;
+};
+
+export async function mcpAuth(options: McpAuthOptions): Promise<LoginResult> {
+  const opts = {
+    defaultApiUrl: CLOUD_API_URL,
+    ...options,
+  };
+
+  const accessTokenFromEnv = env.TRIGGER_ACCESS_TOKEN;
+
+  if (accessTokenFromEnv) {
+    const validationResult = validateAccessToken(accessTokenFromEnv);
+
+    if (!validationResult.success) {
+      // We deliberately don't surface the existence of organization access tokens to the user for now, as they're only used internally.
+      // Once we expose them in the application, we should also communicate that option here.
+      throw new NotAccessTokenError(
+        "Your TRIGGER_ACCESS_TOKEN is not a Personal Access Token, they start with 'tr_pat_'. You can generate one here: https://cloud.trigger.dev/account/tokens"
+      );
+    }
+
+    const auth = {
+      accessToken: accessTokenFromEnv,
+      apiUrl: env.TRIGGER_API_URL ?? opts.defaultApiUrl ?? CLOUD_API_URL,
+    };
+
+    const apiClient = new CliApiClient(auth.apiUrl, auth.accessToken);
+    const userData = await apiClient.whoAmI();
+
+    if (!userData.success) {
+      throw new Error(userData.error);
+    }
+
+    return {
+      ok: true as const,
+      profile: options?.profile ?? "default",
+      userId: userData.data.userId,
+      email: userData.data.email,
+      dashboardUrl: userData.data.dashboardUrl,
+      auth: {
+        accessToken: auth.accessToken,
+        apiUrl: auth.apiUrl,
+        tokenType: validationResult.type,
+      },
+    };
+  }
+
+  const authConfig = readAuthConfigProfile(options?.profile);
+
+  if (authConfig && authConfig.accessToken) {
+    const apiClient = new CliApiClient(
+      authConfig.apiUrl ?? opts.defaultApiUrl,
+      authConfig.accessToken
+    );
+    const userData = await apiClient.whoAmI();
+
+    if (!userData.success) {
+      throw new Error(userData.error);
+    }
+
+    return {
+      ok: true as const,
+      profile: options?.profile ?? "default",
+      userId: userData.data.userId,
+      email: userData.data.email,
+      dashboardUrl: userData.data.dashboardUrl,
+      auth: {
+        accessToken: authConfig.accessToken,
+        apiUrl: authConfig.apiUrl ?? opts.defaultApiUrl,
+        tokenType: "personal" as const,
+      },
+    };
+  }
+
+  const apiClient = new CliApiClient(authConfig?.apiUrl ?? opts.defaultApiUrl);
+
+  //generate authorization code
+  const authorizationCodeResult = await createAuthorizationCode(apiClient);
+
+  const url = new URL(authorizationCodeResult.url);
+
+  url.searchParams.set("source", "mcp");
+
+  const clientName = options.server.server.getClientVersion()?.name;
+
+  if (clientName) {
+    url.searchParams.set("clientName", clientName);
+  }
+  // Only elicitInput if the client has the elicitation capability
+
+  // Elicit the user to visit the authorization code URL
+  const allowLogin = await askForLoginPermission(opts.server, url.toString());
+
+  if (!allowLogin) {
+    return {
+      ok: false as const,
+      error: "User did not allow login",
+    };
+  }
+
+  // Open the authorization code URL in the browser
+  await open(url.toString());
+
+  // Poll for the personal access token
+  const indexResult = await pRetry(
+    () => getPersonalAccessToken(apiClient, authorizationCodeResult.authorizationCode),
+    {
+      //this means we're polling, same distance between each attempt
+      factor: 1,
+      retries: 60,
+      minTimeout: 1000,
+    }
+  );
+
+  writeAuthConfigProfile(
+    { accessToken: indexResult.token, apiUrl: opts.defaultApiUrl },
+    options?.profile
+  );
+
+  const client = new CliApiClient(opts.defaultApiUrl, indexResult.token);
+  const userData = await client.whoAmI();
+
+  if (!userData.success) {
+    throw new Error(userData.error);
+  }
+
+  return {
+    ok: true as const,
+    profile: options?.profile ?? "default",
+    userId: userData.data.userId,
+    email: userData.data.email,
+    dashboardUrl: userData.data.dashboardUrl,
+    auth: {
+      accessToken: indexResult.token,
+      apiUrl: opts.defaultApiUrl,
+      tokenType: "personal" as const,
+    },
+  };
+}
+
+async function createAuthorizationCode(apiClient: CliApiClient) {
+  const authorizationCodeResult = await apiClient.createAuthorizationCode();
+
+  if (!authorizationCodeResult.success) {
+    throw new Error(`Failed to create authorization code\n${authorizationCodeResult.error}`);
+  }
+
+  return authorizationCodeResult.data;
+}
+
+async function askForLoginPermission(server: McpServer, authorizationCodeUrl: string) {
+  const capabilities = server.server.getClientCapabilities();
+
+  if (typeof capabilities?.elicitation !== "object") {
+    return true;
+  }
+
+  const result = await server.server.elicitInput({
+    message: `You are not currently logged in. Would you like to login now? We'll automatically open the authorization code URL (${authorizationCodeUrl}) in your browser.`,
+    requestedSchema: {
+      type: "object",
+      properties: {
+        allowLogin: {
+          type: "boolean",
+          default: false,
+          title: "Allow Login",
+          description: "Whether to allow the user to login",
+        },
+      },
+      required: ["allowLogin"],
+    },
+  });
+
+  return result.action === "accept" && result.content?.allowLogin;
+}
+
+export async function createApiClientWithPublicJWT(
+  auth: LoginResultOk,
+  projectRef: string,
+  envName: string,
+  scopes: string[],
+  previewBranch?: string
+) {
+  const cliApiClient = new CliApiClient(auth.auth.apiUrl, auth.auth.accessToken, previewBranch);
+
+  const jwt = await cliApiClient.getJWT(projectRef, envName, {
+    claims: {
+      scopes,
+    },
+  });
+
+  if (!jwt.success) {
+    return;
+  }
+
+  return new ApiClient(auth.auth.apiUrl, jwt.data.token);
+}
diff --git a/packages/cli-v3/src/mcp/capabilities.ts b/packages/cli-v3/src/mcp/capabilities.ts
new file mode 100644
index 00000000000..8c4e42581c9
--- /dev/null
+++ b/packages/cli-v3/src/mcp/capabilities.ts
@@ -0,0 +1,31 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+
+export function hasRootsCapability(server: McpServer) {
+  const capabilities = server.server.getClientCapabilities();
+
+  if (!capabilities) {
+    return false;
+  }
+
+  return "roots" in capabilities && typeof capabilities.roots === "object";
+}
+
+export function hasSamplingCapability(server: McpServer) {
+  const capabilities = server.server.getClientCapabilities();
+
+  if (!capabilities) {
+    return false;
+  }
+
+  return "sampling" in capabilities && typeof capabilities.sampling === "object";
+}
+
+export function hasElicitationCapability(server: McpServer) {
+  const capabilities = server.server.getClientCapabilities();
+
+  if (!capabilities) {
+    return false;
+  }
+
+  return "elicitation" in capabilities && typeof capabilities.elicitation === "object";
+}
diff --git a/packages/cli-v3/src/mcp/config.ts b/packages/cli-v3/src/mcp/config.ts
new file mode 100644
index 00000000000..5a1ec45cba1
--- /dev/null
+++ b/packages/cli-v3/src/mcp/config.ts
@@ -0,0 +1,103 @@
+import { VERSION } from "../version.js";
+
+export const serverMetadata = {
+  name: "trigger",
+  version: VERSION,
+  instructions: `Trigger.dev MCP server to automate your Trigger.dev projects and answer questions about Trigger.dev by searching the docs. 
+If you need help setting up Trigger.dev in your project please refer to https://trigger.dev/docs/manual-setup. 
+If the user asks for help with adding Trigger.dev to their project, please refer to https://trigger.dev/docs/manual-setup.
+  `,
+};
+
+export const toolsMetadata = {
+  search_docs: {
+    name: "search_docs",
+    title: "Search Docs",
+    description:
+      "Search across the Trigger.dev documentation to find relevant information, code examples, API references, and guides. Use this tool when you need to answer questions about Trigger.dev, find specific documentation, understand how features work, or locate implementation details. The search returns contextual content with titles and direct links to the documentation pages",
+  },
+  list_projects: {
+    name: "list_projects",
+    title: "List Projects",
+    description:
+      "List all projects for the current user, useful for when searching for a project and for looking up a projectRef",
+  },
+  list_orgs: {
+    name: "list_orgs",
+    title: "List Organizations",
+    description:
+      "List all organizations for the current user. Useful when looking up an org slug or ID.",
+  },
+  create_project_in_org: {
+    name: "create_project_in_org",
+    title: "Create Project in Organization",
+    description:
+      "Create a new project in an organization. Only do this if the user wants to add Trigger.dev to an existing project. If there is already a trigger.config.ts file present, then you should not create a new project.",
+  },
+  initialize_project: {
+    name: "initialize_project",
+    title: "Initialize Project",
+    description:
+      "Initialize Trigger.dev in your project. This will create a new project in the organization you select and add Trigger.dev to your project.",
+  },
+  get_tasks: {
+    name: "get_tasks",
+    title: "Get Tasks",
+    description:
+      "Get all tasks in the project. Useful when searching for a task and for looking up a task identifier/slug",
+  },
+  get_current_worker: {
+    name: "get_current_worker",
+    title: "Get Current Worker",
+    description:
+      "Get the current worker for the project. Useful when searching for a task and for looking up a task identifier/slug and payload schema, or looking for the latest version in a specific environment.",
+  },
+  trigger_task: {
+    name: "trigger_task",
+    title: "Trigger Task",
+    description:
+      "Trigger a task in the project. Use the get_tasks tool to get a list of tasks and ask the user to select one if it's not clear which one to use. Use the wait_for_run_to_complete tool to wait for the run to complete.",
+  },
+  get_run_details: {
+    name: "get_run_details",
+    title: "Get Run Details",
+    description:
+      "Get the details of a run. The run ID is the ID of the run that was triggered. It starts with run_",
+  },
+  wait_for_run_to_complete: {
+    name: "wait_for_run_to_complete",
+    title: "Wait for Run to Complete",
+    description:
+      "Wait for a run to complete. The run ID is the ID of the run that was triggered. It starts with run_. Has an optional timeoutInSeconds parameter (default 60s) - if the run doesn't complete within that time, the current state of the run will be returned.",
+  },
+  cancel_run: {
+    name: "cancel_run",
+    title: "Cancel Run",
+    description:
+      "Cancel a run. The run ID is the ID of the run that was triggered. It starts with run_",
+  },
+  list_runs: {
+    name: "list_runs",
+    title: "List Runs",
+    description:
+      "List all runs for a project. Use this tool when you need to search for a run or list all runs for a project.",
+  },
+  deploy: {
+    name: "deploy",
+    title: "Deploy",
+    description:
+      "Deploy a project. Use this tool when you need to deploy a project. This will trigger a deployment for the project. This is a long running operation and including a progress token will allow you to display the progress to the user.",
+  },
+  list_deploys: {
+    name: "list_deploys",
+    title: "List Deploys",
+    description:
+      "List all deploys for a project. Use this tool when you need to search for a deploy or list all deploys for a project.",
+  },
+  list_preview_branches: {
+    name: "list_preview_branches",
+    title: "List Preview Branches",
+    description:
+      "List all preview branches for a project. Use this tool when you need to search for a preview branch or list all preview branches for a project.",
+  },
+};
diff --git a/packages/cli-v3/src/mcp/context.ts b/packages/cli-v3/src/mcp/context.ts
new file mode 100644
index 00000000000..75f6abd2a33
--- /dev/null
+++ b/packages/cli-v3/src/mcp/context.ts
@@ -0,0 +1,187 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { tryCatch } from "@trigger.dev/core/utils";
+import { ApiClient } from "@trigger.dev/core/v3";
+import path from "node:path";
+import { CliApiClient } from "../apiClient.js";
+import { loadConfig } from "../config.js";
+import { mcpAuth } from "./auth.js";
+import {
+  hasElicitationCapability,
+  hasRootsCapability,
+  hasSamplingCapability,
+} from "./capabilities.js";
+import { FileLogger } from "./logger.js";
+import { fileURLToPath } from "node:url";
+
+export type McpContextOptions = {
+  projectRef?: string;
+  fileLogger?: FileLogger;
+  apiUrl?: string;
+  profile?: string;
+  devOnly?: boolean;
+};
+
+export class McpContext {
+  public readonly server: McpServer;
+  public readonly options: McpContextOptions;
+
+  constructor(server: McpServer, options: McpContextOptions) {
+    this.server = server;
+    this.options = options;
+  }
+
+  get logger() {
+    return this.options.fileLogger;
+  }
+
+  public async getAuth() {
+    const auth = await mcpAuth({
+      server: this.server,
+      defaultApiUrl: this.options.apiUrl,
+      profile: this.options.profile,
+      context: this,
+    });
+
+    if (!auth.ok) {
+      throw new Error(auth.error);
+    }
+
+    return auth;
+  }
+
+  public async getCliApiClient(branch?: string) {
+    const auth = await this.getAuth();
+
+    return new CliApiClient(auth.auth.apiUrl, auth.auth.accessToken, branch);
+  }
+
+  public async getApiClient(options: {
+    projectRef: string;
+    environment: string;
+    scopes: string[];
+    branch?: string;
+  }) {
+    const cliApiClient = await this.getCliApiClient(options.branch);
+
+    const jwt = await cliApiClient.getJWT(options.projectRef, options.environment, {
+      claims: {
+        scopes: options.scopes,
+      },
+    });
+
+    if (!jwt.success) {
+      throw new Error(
+        `Could not get the authentication token for the project ${options.projectRef} in the ${options.environment} environment. Please try again.`
+      );
+    }
+
+    return new ApiClient(cliApiClient.apiURL, jwt.data.token);
+  }
+
+  public async getCwd() {
+    if (!this.hasRootsCapability) {
+      return undefined;
+    }
+
+    const response = await this.server.server.listRoots();
+
+    if (response.roots.length >= 1) {
+      return response.roots[0]?.uri ? fileURLToPath(response.roots[0].uri) : undefined;
+    }
+
+    return undefined;
+  }
+
+  public async getProjectRef(options: { projectRef?: string; cwd?: string }) {
+    if (options.projectRef) {
+      return options.projectRef;
+    }
+
+    const projectDir = await this.getProjectDir({ cwd: options.cwd });
+
+    if (!projectDir.ok) {
+      throw new Error(projectDir.error);
+    }
+
+    const [_, config] = await tryCatch(loadConfig({ cwd: projectDir.cwd }));
+
+    if (
+      config?.configFile &&
+      typeof config.project === "string" &&
+      config.project.startsWith("proj_")
+    ) {
+      return config.project;
+    }
+
+    throw new Error("No project ref found. Please provide a projectRef.");
+  }
+
+  public async getProjectDir({ cwd }: { cwd?: string }) {
+    // If cwd is a path to the actual trigger.config.ts file, then we should set the cwd to the directory of the file
+    let $cwd = cwd ? (path.extname(cwd) !== "" ? path.dirname(cwd) : cwd) : undefined;
+
+    function isRelativePath(filePath: string) {
+      return !path.isAbsolute(filePath);
+    }
+
+    if (!cwd) {
+      if (!this.hasRootsCapability) {
+        return {
+          ok: false,
+          error:
+            "The current MCP server does not support the roots capability, so please call the tool again with a projectRef or an absolute path as cwd parameter",
+        };
+      }
+
+      $cwd = await this.getCwd();
+    } else if (isRelativePath(cwd)) {
+      if (!this.hasRootsCapability) {
+        return {
+          ok: false,
+          error:
+            "The current MCP server does not support the roots capability, so please call the tool again with a projectRef or an absolute path as cwd parameter",
+        };
+      }
+
+      const resolvedCwd = await this.getCwd();
+
+      if (!resolvedCwd) {
+        return {
+          ok: false,
+          error: "No current working directory found. Please provide a projectRef or a cwd.",
+        };
+      }
+
+      $cwd = path.resolve(resolvedCwd, cwd);
+    }
+
+    if (!$cwd) {
+      return {
+        ok: false,
+        error: "No current working directory found. Please provide a projectRef or a cwd.",
+      };
+    }
+
+    return {
+      ok: true,
+      cwd: $cwd,
+    };
+  }
+
+  public async getDashboardUrl(path: string) {
+    const auth = await this.getAuth();
+    return `${auth.dashboardUrl}${path}`;
+  }
+
+  public get hasRootsCapability() {
+    return hasRootsCapability(this.server);
+  }
+
+  public get hasSamplingCapability() {
+    return hasSamplingCapability(this.server);
+  }
+
+  public get hasElicitationCapability() {
+    return hasElicitationCapability(this.server);
+  }
+}
diff --git a/packages/cli-v3/src/mcp/formatters.ts b/packages/cli-v3/src/mcp/formatters.ts
new file mode 100644
index 00000000000..eee9ccf18fe
--- /dev/null
+++ b/packages/cli-v3/src/mcp/formatters.ts
@@ -0,0 +1,429 @@
+import { AnyRunShape } from "@trigger.dev/core/v3";
+import {
+  ListRunResponseItem,
+  RetrieveRunResponse,
+  RetrieveRunTraceResponseBody,
+} from "@trigger.dev/core/v3/schemas";
+import type { CursorPageResponse } from "@trigger.dev/core/v3/zodfetch";
+
+const DEFAULT_MAX_TRACE_LINES = 500;
+
+export function formatRun(run: RetrieveRunResponse): string {
+  const lines: string[] = [];
+
+  // Header with basic info
+  lines.push(`Run ${run.id}`);
+  lines.push(`Task: ${run.taskIdentifier}`);
+  lines.push(`Status: ${formatStatus(run.status)}`);
+
+  // Timing information
+  const timing = formatTiming(run);
+  if (timing) {
+    lines.push(`Timing: ${timing}`);
+  }
+
+  // Duration and cost
+  if (run.durationMs > 0) {
+    lines.push(`Duration: ${formatDuration(run.durationMs)}`);
+  }
+
+  if (run.costInCents > 0) {
+    lines.push(`Cost: $${(run.costInCents / 100).toFixed(4)}`);
+  }
+
+  // Attempt count
+  if (run.attemptCount > 1) {
+    lines.push(`Attempts: ${run.attemptCount}`);
+  }
+
+  // Version and trigger info
+  if (run.version) {
+    lines.push(`Version: ${run.version}`);
+  }
+
+  // Tags
+  if (run.tags && run.tags.length > 0) {
+    lines.push(`Tags: ${run.tags.join(", ")}`);
+  }
+
+  // Error information
+  if (run.error) {
+    lines.push(`Error: ${run.error.name || "Error"}: ${run.error.message}`);
+    if (run.error.stackTrace) {
+      lines.push(`Stack: ${run.error.stackTrace.split("\n")[0]}`); // First line only
+    }
+  }
+
+  // Related runs
+  const relatedInfo = formatRelatedRuns(run.relatedRuns);
+  if (relatedInfo) {
+    lines.push(relatedInfo);
+  }
+
+  // Schedule info
+  if (run.schedule) {
+    lines.push(`Schedule: ${run.schedule.generator.expression} (${run.schedule.id})`);
+  }
+
+  // Batch info
+  if (run.batchId) {
+    lines.push(`Batch: ${run.batchId}`);
+  }
+
+  // Test flag
+  if (run.isTest) {
+    lines.push(`Test run`);
+  }
+
+  // TTL info
+  if (run.ttl) {
+    lines.push(`TTL: ${run.ttl}`);
+  }
+
+  // Payload and Output data
+  if (run.payload) {
+    lines.push(`Payload: ${JSON.stringify(run.payload, null, 2)}`);
+  } else if (run.payloadPresignedUrl) {
+    lines.push(`Payload: (large payload available via presigned URL: ${run.payloadPresignedUrl})`);
+  }
+
+  if (run.output) {
+    lines.push(`Output: ${JSON.stringify(run.output, null, 2)}`);
+  } else if (run.outputPresignedUrl) {
+    lines.push(`Output: (large output available via presigned URL: ${run.outputPresignedUrl})`);
+  }
+
+  // Metadata
+  if (run.metadata && Object.keys(run.metadata).length > 0) {
+    lines.push(`Metadata: ${Object.keys(run.metadata).length} fields`);
+  }
+
+  return lines.join("\n");
+}
+
+export function formatRunShape(run: AnyRunShape): string {
+  const lines: string[] = [];
+
+  lines.push(`Run ${run.id}`);
+  lines.push(`Task: ${run.taskIdentifier}`);
+  lines.push(`Status: ${formatStatus(run.status)}`);
+
+  if (run.output) {
+    lines.push(`Output: ${JSON.stringify(run.output, null, 2)}`);
+  }
+
+  if (run.error) {
+    lines.push(`Error: ${run.error.name || "Error"}: ${run.error.message}`);
+  }
+
+  if (run.metadata) {
+    lines.push(`Metadata: ${JSON.stringify(run.metadata, null, 2)}`);
+  }
+
+  lines.push(`Created at: ${formatDateTime(run.createdAt)}`);
+
+  if (run.finishedAt) {
+    lines.push(`Finished at: ${formatDateTime(run.finishedAt)}`);
+  }
+
+  return lines.join("\n");
+}
+
+function formatStatus(status: string): string {
+  return status.toLowerCase().replace(/_/g, " ");
+}
+
+function formatTiming(run: RetrieveRunResponse): string | null {
+  const parts: string[] = [];
+
+  parts.push(`created ${formatDateTime(run.createdAt)}`);
+
+  if (run.startedAt) {
+    parts.push(`started ${formatDateTime(run.startedAt)}`);
+  }
+
+  if (run.finishedAt) {
+    parts.push(`finished ${formatDateTime(run.finishedAt)}`);
+  } else if (run.delayedUntil) {
+    parts.push(`delayed until ${formatDateTime(run.delayedUntil)}`);
+  }
+
+  return parts.length > 0 ? parts.join(", ") : null;
+}
+
+function formatDateTime(date: Date | undefined): string {
+  if (!date) return "unknown";
+
+  try {
+    return date
+      .toISOString()
+      .replace("T", " ")
+      .replace(/\.\d{3}Z$/, " UTC");
+  } catch {
+    return "unknown";
+  }
+}
+
+function formatDuration(durationMs: number): string {
+  if (durationMs < 1000) return `${durationMs}ms`;
+  if (durationMs < 60000) return `${(durationMs / 1000).toFixed(1)}s`;
+  if (durationMs < 3600000) return `${(durationMs / 60000).toFixed(1)}m`;
+  return `${(durationMs / 3600000).toFixed(1)}h`;
+}
+
+function formatRelatedRuns(relatedRuns: RetrieveRunResponse["relatedRuns"]): string | null {
+  const parts: string[] = [];
+
+  if (relatedRuns.parent) {
+    parts.push(`parent: ${relatedRuns.parent.id} (${relatedRuns.parent.status.toLowerCase()})`);
+  }
+
+  if (relatedRuns.root && relatedRuns.root.id !== relatedRuns.parent?.id) {
+    parts.push(`root: ${relatedRuns.root.id} (${relatedRuns.root.status.toLowerCase()})`);
+  }
+
+  if (relatedRuns.children && relatedRuns.children.length > 0) {
+    const childStatuses = relatedRuns.children.reduce(
+      (acc, child) => {
+        acc[child.status.toLowerCase()] = (acc[child.status.toLowerCase()] || 0) + 1;
+        return acc;
+      },
+      {} as Record<string, number>
+    );
+
+    const statusSummary = Object.entries(childStatuses)
+      .map(([status, count]) => `${count} ${status}`)
+      .join(", ");
+
+    parts.push(`children: ${relatedRuns.children.length} runs (${statusSummary})`);
+  }
+
+  return parts.length > 0 ? `Related: ${parts.join("; ")}` : null;
+}
+
+export function formatRunTrace(
+  trace: RetrieveRunTraceResponseBody["trace"],
+  maxTraceLines: number = DEFAULT_MAX_TRACE_LINES
+): string {
+  const lines: string[] = [];
+
+  lines.push(`Trace ID: ${trace.traceId}`);
+  lines.push("");
+
+  // Format the root span and its children recursively
+  const reachedMaxLines = formatSpan(trace.rootSpan, lines, 0, maxTraceLines);
+
+  if (reachedMaxLines) {
+    lines.push(`(truncated logs to ${maxTraceLines} lines)`);
+  }
+
+  return lines.join("\n");
+}
+
+function formatSpan(
+  span: RetrieveRunTraceResponseBody["trace"]["rootSpan"],
+  lines: string[],
+  depth: number,
+  maxLines: number
+): boolean {
+  if (lines.length >= maxLines) {
+    return true;
+  }
+
+  const indent = "  ".repeat(depth);
+  const prefix = depth === 0 ? "└─" : "├─";
+
+  // Format span header
+  const statusIndicator = getStatusIndicator(span.data);
+  const duration = formatDuration(span.data.duration);
+  const startTime = formatDateTime(span.data.startTime);
+
+  lines.push(`${indent}${prefix} ${span.data.message} ${statusIndicator}`);
+  lines.push(`${indent}   Duration: ${duration}`);
+  lines.push(`${indent}   Started: ${startTime}`);
+
+  if (span.data.taskSlug) {
+    lines.push(`${indent}   Task: ${span.data.taskSlug}`);
+  }
+
+  if (span.data.taskPath) {
+    lines.push(`${indent}   Path: ${span.data.taskPath}`);
+  }
+
+  if (span.data.queueName) {
+    lines.push(`${indent}   Queue: ${span.data.queueName}`);
+  }
+
+  if (span.data.machinePreset) {
+    lines.push(`${indent}   Machine: ${span.data.machinePreset}`);
+  }
+
+  if (span.data.workerVersion) {
+    lines.push(`${indent}   Worker: ${span.data.workerVersion}`);
+  }
+
+  // Show properties if they exist
+  if (span.data.properties && Object.keys(span.data.properties).length > 0) {
+    lines.push(
+      `${indent}   Properties: ${JSON.stringify(span.data.properties, null, 2).replace(
+        /\n/g,
+        "\n" + indent + "     "
+      )}`
+    );
+  }
+
+  // Show output if it exists
+  if (span.data.output) {
+    lines.push(
+      `${indent}   Output: ${JSON.stringify(span.data.output, null, 2).replace(
+        /\n/g,
+        "\n" + indent + "     "
+      )}`
+    );
+  }
+
+  // Show events if they exist and are meaningful
+  if (span.data.events && span.data.events.length > 0) {
+    lines.push(`${indent}   Events: ${span.data.events.length} events`);
+    // Optionally show first few events for context
+    const maxEvents = 3;
+    for (let i = 0; i < Math.min(span.data.events.length, maxEvents); i++) {
+      const event = span.data.events[i];
+      if (typeof event === "object" && event !== null) {
+        const eventStr = JSON.stringify(event, null, 2).replace(/\n/g, "\n" + indent + "       ");
+        lines.push(`${indent}     [${i + 1}] ${eventStr}`);
+      }
+    }
+    if (span.data.events.length > maxEvents) {
+      lines.push(`${indent}     ... and ${span.data.events.length - maxEvents} more events`);
+    }
+  }
+
+  // Add spacing between spans
+  if (span.children && span.children.length > 0) {
+    lines.push("");
+  }
+
+  // Recursively format children
+  if (span.children) {
+    const reachedMaxLines = span.children.some((child, index) => {
+      const reachedMaxLines = formatSpan(child, lines, depth + 1, maxLines);
+      // Add spacing between sibling spans (except for the last one)
+      if (index < span.children.length - 1 && !reachedMaxLines) {
+        lines.push("");
+      }
+
+      return reachedMaxLines;
+    });
+
+    return reachedMaxLines;
+  }
+
+  return false;
+}
+
+function getStatusIndicator(
+  spanData: RetrieveRunTraceResponseBody["trace"]["rootSpan"]["data"]
+): string {
+  if (spanData.isCancelled) return "[CANCELLED]";
+  if (spanData.isError) return "[ERROR]";
+  if (spanData.isPartial) return "[PARTIAL]";
+  return "[COMPLETED]";
+}
+
+export function formatRunList(runsPage: CursorPageResponse<ListRunResponseItem>): string {
+  const lines: string[] = [];
+
+  // Header with count info
+  const totalRuns = runsPage.data.length;
+  lines.push(`Found ${totalRuns} run${totalRuns === 1 ? "" : "s"}`);
+  lines.push("");
+
+  if (totalRuns === 0) {
+    lines.push("No runs found.");
+    return lines.join("\n");
+  }
+
+  // Format each run in a compact table-like format
+  runsPage.data.forEach((run, index) => {
+    lines.push(`${index + 1}. ${formatRunSummary(run)}`);
+  });
+
+  // Pagination info
+  lines.push("");
+  const paginationInfo = [];
+  if (runsPage.pagination.previous) {
+    paginationInfo.push("← Previous page available");
+  }
+  if (runsPage.pagination.next) {
+    paginationInfo.push("Next page available →");
+  }
+
+  if (paginationInfo.length > 0) {
+    lines.push(`Pagination: ${paginationInfo.join(" | ")}`);
+    if (runsPage.pagination.next) {
+      lines.push(`Next cursor: ${runsPage.pagination.next}`);
+    }
+    if (runsPage.pagination.previous) {
+      lines.push(`Previous cursor: ${runsPage.pagination.previous}`);
+    }
+  }
+
+  return lines.join("\n");
+}
+
+function formatRunSummary(run: ListRunResponseItem): string {
+  const parts: string[] = [];
+
+  // Basic info: ID, task, status
+  parts.push(`${run.id}`);
+  parts.push(`${run.taskIdentifier}`);
+  parts.push(`${formatStatus(run.status)}`);
+
+  // Environment
+  parts.push(`env:${run.env.name}`);
+
+  // Timing - show the most relevant time
+  let timeInfo = "";
+  if (run.finishedAt) {
+    timeInfo = `finished ${formatDateTime(run.finishedAt)}`;
+  } else if (run.startedAt) {
+    timeInfo = `started ${formatDateTime(run.startedAt)}`;
+  } else if (run.delayedUntil) {
+    timeInfo = `delayed until ${formatDateTime(run.delayedUntil)}`;
+  } else {
+    timeInfo = `created ${formatDateTime(run.createdAt)}`;
+  }
+  parts.push(timeInfo);
+
+  // Duration if available
+  if (run.durationMs > 0) {
+    parts.push(`took ${formatDuration(run.durationMs)}`);
+  }
+
+  // Cost if significant
+  if (run.costInCents > 0) {
+    parts.push(`$${(run.costInCents / 100).toFixed(4)}`);
+  }
+
+  // Tags if present
+  if (run.tags && run.tags.length > 0) {
+    const tagStr =
+      run.tags.length > 2
+        ? `${run.tags.slice(0, 2).join(", ")}+${run.tags.length - 2}`
+        : run.tags.join(", ");
+    parts.push(`tags:[${tagStr}]`);
+  }
+
+  // Test flag
+  if (run.isTest) {
+    parts.push("[TEST]");
+  }
+
+  // Version if available
+  if (run.version) {
+    parts.push(`v${run.version}`);
+  }
+
+  return parts.join(" | ");
+}
diff --git a/packages/cli-v3/src/mcp/logger.ts b/packages/cli-v3/src/mcp/logger.ts
new file mode 100644
index 00000000000..b30576a3316
--- /dev/null
+++ b/packages/cli-v3/src/mcp/logger.ts
@@ -0,0 +1,47 @@
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { appendFileSync } from "node:fs";
+import util from "node:util";
+
+export class FileLogger {
+  private filePath: string;
+  private server: McpServer;
+
+  constructor(filePath: string, server: McpServer) {
+    this.filePath = filePath;
+    this.server = server;
+  }
+
+  log(message: string, ...args: unknown[]) {
+    const logMessage = `[${new Date().toISOString()}][${this.formatServerInfo()}] ${message} - ${util.inspect(
+      args,
+      {
+        depth: null,
+        colors: false,
+      }
+    )}\n`;
+    appendFileSync(this.filePath, logMessage);
+  }
+
+  private formatServerInfo() {
+    return `${this.formatClientName()} ${this.formatClientVersion()} ${this.formatClientCapabilities()}`;
+  }
+
+  private formatClientName() {
+    const clientName = this.server.server.getClientVersion()?.name;
+    return `client=${clientName ?? "unknown"}`;
+  }
+
+  private formatClientVersion() {
+    const clientVersion = this.server.server.getClientVersion();
+
+    return `version=${clientVersion?.version ?? "unknown"}`;
+  }
+
+  private formatClientCapabilities() {
+    const clientCapabilities = this.server.server.getClientCapabilities();
+
+    const keys = Object.keys(clientCapabilities ?? {});
+
+    return `capabilities=${keys.join(",")}`;
+  }
+}
diff --git a/packages/cli-v3/src/mcp/mintlifyClient.ts b/packages/cli-v3/src/mcp/mintlifyClient.ts
new file mode 100644
index 00000000000..d7bc98c7db5
--- /dev/null
+++ b/packages/cli-v3/src/mcp/mintlifyClient.ts
@@ -0,0 +1,74 @@
+export async function performSearch(query: string, signal: AbortSignal) {
+  const body = callToolBody("SearchTriggerDev", { query });
+
+  const response = await fetch("https://trigger.dev/docs/mcp", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Accept: "application/json, text/event-stream",
+      "MCP-Protocol-Version": "2025-06-18",
+    },
+    signal,
+    body: JSON.stringify(body),
+  });
+
+  const data = await parseResponse(response);
+  return data;
+}
+
+async function parseResponse(response: Response) {
+  if (response.headers.get("content-type")?.includes("text/event-stream")) {
+    return parseSSEResponse(response);
+  } else {
+    return parseJSONResponse(response);
+  }
+}
+
+async function parseJSONResponse(response: Response) {
+  const data = await response.json();
+  return data;
+}
+
+// Get the first data: event and return the parsed JSON of the event
+async function parseSSEResponse(response: Response) {
+  const reader = response.body?.getReader();
+  const decoder = new TextDecoder();
+
+  if (!reader) {
+    throw new Error("No reader found");
+  }
+
+  let buffer = "";
+
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) throw new Error("SSE stream closed before data arrived");
+
+    buffer += decoder.decode(value, { stream: true });
+    const events = buffer.split("\n\n"); // SSE delimiter
+    buffer = events.pop()!; // keep incomplete
+
+    for (const evt of events) {
+      for (const line of evt.split("\n")) {
+        if (line.startsWith("data:")) {
+          const json = line.slice(5).trim();
+          return JSON.parse(json); // ✅ got it
+        }
+      }
+    }
+  }
+
+  throw new Error("No data: event found");
+}
+
+function callToolBody(tool: string, args: Record<string, unknown>) {
+  return {
+    jsonrpc: "2.0",
+    id: 1,
+    method: "tools/call",
+    params: {
+      name: tool,
+      arguments: args,
+    },
+  };
+}
diff --git a/packages/cli-v3/src/mcp/schemas.ts b/packages/cli-v3/src/mcp/schemas.ts
new file mode 100644
index 00000000000..8afb10f38f5
--- /dev/null
+++ b/packages/cli-v3/src/mcp/schemas.ts
@@ -0,0 +1,214 @@
+import {
+  ApiDeploymentListParams,
+  MachinePresetName,
+  RunStatus,
+} from "@trigger.dev/core/v3/schemas";
+import { z } from "zod";
+
+export const ProjectRefSchema = z
+  .string()
+  .describe(
+    "The trigger.dev project ref, starts with proj_. We will attempt to automatically detect the project ref if running inside a directory that includes a trigger.config.ts file, or if you pass the --project-ref option to the MCP server."
+  )
+  .optional();
+
+export const CreateProjectInOrgInput = z.object({
+  orgParam: z
+    .string()
+    .describe(
+      "The organization to create the project in, can either be the organization slug or the ID. Use the list_orgs tool to get a list of organizations and ask the user to select one."
+    ),
+  name: z.string().describe("The name of the project to create."),
+});
+
+export type CreateProjectInOrgInput = z.output<typeof CreateProjectInOrgInput>;
+
+export const InitializeProjectInput = z.object({
+  orgParam: z
+    .string()
+    .describe(
+      "The organization to create the project in, can either be the organization slug or the ID. Use the list_orgs tool to get a list of organizations and ask the user to select one."
+    ),
+  projectRef: ProjectRefSchema,
+  projectName: z
+    .string()
+    .describe(
+      "The name of the project to create. If projectRef is not provided, we will use this name to create a new project in the organization you select."
+    ),
+  cwd: z.string().describe("The current working directory of the project").optional(),
+});
+
+export type InitializeProjectInput = z.output<typeof InitializeProjectInput>;
+
+export const CommonProjectsInput = z.object({
+  projectRef: ProjectRefSchema,
+  configPath: z
+    .string()
+    .describe(
+      "The path to the trigger.config.ts file. Only used when the trigger.config.ts file is not at the root dir (like in a monorepo setup). If not provided, we will try to find the config file in the current working directory"
+    )
+    .optional(),
+  environment: z
+    .enum(["dev", "staging", "prod", "preview"])
+    .describe("The environment to get tasks for")
+    .default("dev"),
+  branch: z
+    .string()
+    .describe("The branch to get tasks for, only used for preview environments")
+    .optional(),
+});
+
+export type CommonProjectsInput = z.output<typeof CommonProjectsInput>;
+
+export const TriggerTaskInput = CommonProjectsInput.extend({
+  taskId: z
+    .string()
+    .describe(
+      "The ID/slug of the task to trigger. Use the get_tasks tool to get a list of tasks and ask the user to select one if it's not clear which one to use."
+    ),
+  payload: z
+    .any()
+    .describe(
+      "The payload to trigger the task with. Should match the task's payload schema. Not a JSON string, but the actual payload object"
+    ),
+  options: z
+    .object({
+      queue: z
+        .object({
+          name: z
+            .string()
+            .describe(
+              "The name of the queue to trigger the task in, by default will use the queue configured in the task"
+            ),
+        })
+        .optional(),
+      delay: z
+        .string()
+        .or(z.coerce.date())
+        .describe("The delay before the task run is executed")
+        .optional(),
+      idempotencyKey: z.string().describe("The idempotency key to use for the task run").optional(),
+      machine: MachinePresetName.describe("The machine preset to use for the task run").optional(),
+      maxAttempts: z
+        .number()
+        .int()
+        .describe("The maximum number of attempts to retry the task run")
+        .optional(),
+      maxDuration: z
+        .number()
+        .describe("The maximum duration in seconds of the task run")
+        .optional(),
+      tags: z
+        .array(z.string())
+        .describe(
+          "Tags to add to the task run. Must be less than 128 characters and cannot have more than 5"
+        )
+        .optional(),
+      ttl: z
+        .string()
+        .or(z.number().nonnegative().int())
+        .describe(
+          "The time to live of the task run. If the run doesn't start executing within this time, it will be automatically cancelled."
+        )
+        .default("10m"),
+    })
+    .optional(),
+});
+
+export type TriggerTaskInput = z.output<typeof TriggerTaskInput>;
+
+export const CommonRunsInput = CommonProjectsInput.extend({
+  runId: z.string().describe("The ID of the run to get the details of, starts with run_"),
+});
+
+export type CommonRunsInput = z.output<typeof CommonRunsInput>;
+
+export const WaitForRunInput = CommonRunsInput.extend({
+  timeoutInSeconds: z
+    .number()
+    .describe(
+      "The maximum time in seconds to wait for the run to complete. If the run doesn't complete within this time, the current state of the run will be returned. Defaults to 60 seconds."
+    )
+    .default(60),
+});
+
+export type WaitForRunInput = z.output<typeof WaitForRunInput>;
+
+export const GetRunDetailsInput = CommonRunsInput.extend({
+  maxTraceLines: z
+    .number()
+    .int()
+    .describe("The maximum number of lines to show in the trace. Defaults to 500")
+    .optional(),
+});
+
+export type GetRunDetailsInput = z.output<typeof GetRunDetailsInput>;
+
+export const ListRunsInput = CommonProjectsInput.extend({
+  cursor: z.string().describe("The cursor to use for pagination, starts with run_").optional(),
+  limit: z
+    .number()
+    .int()
+    .describe("The number of runs to list in a single page. Up to 100")
+    .optional(),
+  status: RunStatus.describe("Filter for runs with this run status").optional(),
+  taskIdentifier: z.string().describe("Filter for runs that match this task identifier").optional(),
+  version: z
+    .string()
+    .describe("Filter for runs that match this version, e.g. 20250808.3")
+    .optional(),
+  tag: z.string().describe("Filter for runs that include this tag").optional(),
+  from: z.string().describe("Filter for runs created after this ISO 8601 timestamp").optional(),
+  to: z.string().describe("Filter for runs created before this ISO 8601 timestamp").optional(),
+  period: z
+    .string()
+    .describe("Filter for runs created in the last N time period. e.g. 7d, 30d, 365d")
+    .optional(),
+  machine: MachinePresetName.describe("Filter for runs that match this machine preset").optional(),
+});
+
+export type ListRunsInput = z.output<typeof ListRunsInput>;
+
+export const CommonDeployInput = CommonProjectsInput.omit({
+  environment: true,
+}).extend({
+  environment: z
+    .enum(["staging", "prod", "preview"])
+    .describe("The environment to trigger the task in")
+    .default("prod"),
+});
+
+export type CommonDeployInput = z.output<typeof CommonDeployInput>;
+
+export const DeployInput = CommonDeployInput.extend({
+  skipPromotion: z
+    .boolean()
+    .describe("Skip promoting the deployment to the current deployment for the environment")
+    .optional(),
+  skipSyncEnvVars: z
+    .boolean()
+    .describe("Skip syncing environment variables when using the syncEnvVars extension")
+    .optional(),
+  skipUpdateCheck: z
+    .boolean()
+    .describe("Skip checking for @trigger.dev package updates")
+    .optional(),
+});
+
+export type DeployInput = z.output<typeof DeployInput>;
+
+export const ListDeploysInput = CommonDeployInput.extend(ApiDeploymentListParams);
+
+export type ListDeploysInput = z.output<typeof ListDeploysInput>;
+
+export const ListPreviewBranchesInput = z.object({
+  projectRef: ProjectRefSchema,
+  configPath: z
+    .string()
+    .describe(
+      "The path to the trigger.config.ts file. Only used when the trigger.config.ts file is not at the root dir (like in a monorepo setup). If not provided, we will try to find the config file in the current working directory"
+    )
+    .optional(),
+});
+
+export type ListPreviewBranchesInput = z.output<typeof ListPreviewBranchesInput>;
diff --git a/packages/cli-v3/src/mcp/tools.ts b/packages/cli-v3/src/mcp/tools.ts
new file mode 100644
index 00000000000..5c69bb82fe3
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools.ts
@@ -0,0 +1,55 @@
+import { McpContext } from "./context.js";
+import { deployTool, listDeploysTool } from "./tools/deploys.js";
+import { searchDocsTool } from "./tools/docs.js";
+import {
+  createProjectInOrgTool,
+  initializeProjectTool,
+  listOrgsTool,
+  listProjectsTool,
+} from "./tools/orgs.js";
+import { listPreviewBranchesTool } from "./tools/previewBranches.js";
+import {
+  cancelRunTool,
+  getRunDetailsTool,
+  listRunsTool,
+  waitForRunToCompleteTool,
+} from "./tools/runs.js";
+import { getCurrentWorker, triggerTaskTool } from "./tools/tasks.js";
+import { respondWithError } from "./utils.js";
+
+export function registerTools(context: McpContext) {
+  const tools = [
+    searchDocsTool,
+    listOrgsTool,
+    listProjectsTool,
+    createProjectInOrgTool,
+    initializeProjectTool,
+    getCurrentWorker,
+    triggerTaskTool,
+    listRunsTool,
+    getRunDetailsTool,
+    waitForRunToCompleteTool,
+    cancelRunTool,
+    deployTool,
+    listDeploysTool,
+    listPreviewBranchesTool,
+  ];
+
+  for (const tool of tools) {
+    context.server.registerTool(
+      tool.name,
+      {
+        annotations: { title: tool.title },
+        description: tool.description,
+        inputSchema: tool.inputSchema,
+      },
+      async (input, extra) => {
+        try {
+          return tool.handler(input, { ...extra, ctx: context });
+        } catch (error) {
+          return respondWithError(error);
+        }
+      }
+    );
+  }
+}
diff --git a/packages/cli-v3/src/mcp/tools/deploys.ts b/packages/cli-v3/src/mcp/tools/deploys.ts
new file mode 100644
index 00000000000..ab09659a54f
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools/deploys.ts
@@ -0,0 +1,225 @@
+import { DeployInput, ListDeploysInput } from "../schemas.js";
+import { toolsMetadata } from "../config.js";
+import { ToolMeta } from "../types.js";
+import { respondWithError, toolHandler } from "../utils.js";
+import { McpContext } from "../context.js";
+import { x } from "tinyexec";
+import { getPackageJson, tryResolveTriggerPackageVersion } from "../../commands/update.js";
+import { VERSION } from "../../version.js";
+import { resolveSync as esmResolve } from "mlly";
+import { fileURLToPath } from "node:url";
+import stripAnsi from "strip-ansi";
+
+export const deployTool = {
+  name: toolsMetadata.deploy.name,
+  title: toolsMetadata.deploy.title,
+  description: toolsMetadata.deploy.description,
+  inputSchema: DeployInput.shape,
+  handler: toolHandler(DeployInput.shape, async (input, { ctx, createProgressTracker, _meta }) => {
+    ctx.logger?.log("calling deploy", { input });
+
+    if (ctx.options.devOnly) {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. The deploy command is not allowed with the --dev-only flag.`
+      );
+    }
+
+    const cwd = await ctx.getProjectDir({ cwd: input.configPath });
+
+    if (!cwd.ok) {
+      return respondWithError(cwd.error);
+    }
+
+    const auth = await ctx.getAuth();
+
+    const args = ["deploy", "--env", input.environment, "--api-url", auth.auth.apiUrl];
+
+    if (input.environment === "preview" && input.branch) {
+      args.push("--branch", input.branch);
+    }
+
+    if (ctx.options.profile) {
+      args.push("--profile", ctx.options.profile);
+    }
+
+    if (input.skipPromotion) {
+      args.push("--skip-promotion");
+    }
+
+    if (input.skipSyncEnvVars) {
+      args.push("--skip-sync-env-vars");
+    }
+
+    if (input.skipUpdateCheck) {
+      args.push("--skip-update-check");
+    }
+
+    const [nodePath, cliPath] = await resolveCLIExec(ctx, cwd.cwd);
+
+    ctx.logger?.log("deploy process args", {
+      nodePath,
+      cliPath,
+      args,
+      meta: _meta,
+    });
+
+    const progressTracker = createProgressTracker(100);
+    await progressTracker.updateProgress(
+      5,
+      `Starting deploy to ${input.environment}${input.branch ? ` on branch ${input.branch}` : ""}`
+    );
+
+    const deployProcess = x(nodePath, [cliPath, ...args], {
+      nodeOptions: {
+        cwd: cwd.cwd,
+        env: {
+          TRIGGER_MCP_SERVER: "1",
+        },
+      },
+    });
+
+    const logs = [];
+
+    for await (const line of deployProcess) {
+      const lineWithoutAnsi = stripAnsi(line);
+
+      const buildingVersion = lineWithoutAnsi.match(/Building version (\d+\.\d+)/);
+
+      if (buildingVersion) {
+        await progressTracker.incrementProgress(1, `Building version ${buildingVersion[1]}`);
+      } else {
+        await progressTracker.incrementProgress(1);
+      }
+
+      logs.push(stripAnsi(line));
+    }
+
+    await progressTracker.complete("Deploy complete");
+
+    ctx.logger?.log("deploy deployProcess", {
+      logs,
+    });
+
+    if (deployProcess.exitCode !== 0) {
+      return respondWithError(logs.join("\n"));
+    }
+
+    return {
+      content: [{ type: "text", text: logs.join("\n") }],
+    };
+  }),
+};
+
+export const listDeploysTool = {
+  name: toolsMetadata.list_deploys.name,
+  title: toolsMetadata.list_deploys.title,
+  description: toolsMetadata.list_deploys.description,
+  inputSchema: ListDeploysInput.shape,
+  handler: toolHandler(ListDeploysInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling list_deploys", { input });
+
+    if (ctx.options.devOnly) {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const apiClient = await ctx.getApiClient({
+      projectRef,
+      environment: input.environment,
+      scopes: ["read:deployments"],
+      branch: input.branch,
+    });
+
+    const result = await apiClient.listDeployments(input);
+
+    return {
+      content: [{ type: "text", text: JSON.stringify(result, null, 2) }],
+    };
+  }),
+};
+
+async function resolveCLIExec(context: McpContext, cwd?: string): Promise<[string, string]> {
+  // Lets first try to get the version of the CLI package
+  const installedCLI = await tryResolveTriggerCLIPath(context, cwd);
+
+  if (installedCLI) {
+    context.logger?.log("resolve_cli_exec installedCLI", { installedCLI });
+
+    return [process.argv[0] ?? "node", installedCLI.path];
+  }
+
+  const sdkVersion = await tryResolveTriggerPackageVersion("@trigger.dev/sdk", cwd);
+
+  if (!sdkVersion) {
+    context.logger?.log("resolve_cli_exec no sdk version found", { cwd });
+
+    return [process.argv[0] ?? "npx", process.argv[1] ?? "trigger.dev@latest"];
+  }
+
+  if (sdkVersion === VERSION) {
+    context.logger?.log("resolve_cli_exec sdk version is the same as the current version", {
+      sdkVersion,
+    });
+
+    if (typeof process.argv[0] === "string" && typeof process.argv[1] === "string") {
+      return [process.argv[0], process.argv[1]];
+    }
+
+    return ["npx", "trigger.dev@latest"];
+  }
+
+  return ["npx", `trigger.dev@${sdkVersion}`];
+}
+
+async function tryResolveTriggerCLIPath(
+  context: McpContext,
+  basedir?: string
+): Promise<
+  | {
+      path: string;
+      version: string;
+    }
+  | undefined
+> {
+  try {
+    const resolvedPathFileURI = esmResolve("trigger.dev", {
+      url: basedir,
+    });
+
+    const resolvedPath = fileURLToPath(resolvedPathFileURI);
+
+    context.logger?.log("resolve_cli_exec resolvedPathFileURI", { resolvedPathFileURI });
+
+    const { packageJson } = await getPackageJson(resolvedPath, {
+      test: (filePath) => {
+        // We need to skip any type-marker files
+        if (filePath.includes("dist/commonjs")) {
+          return false;
+        }
+
+        if (filePath.includes("dist/esm")) {
+          return false;
+        }
+
+        return true;
+      },
+    });
+
+    if (packageJson.version) {
+      context.logger?.log("resolve_cli_exec packageJson", { packageJson });
+
+      return { path: resolvedPath, version: packageJson.version };
+    }
+
+    return;
+  } catch (error) {
+    context.logger?.log("resolve_cli_exec error", { error });
+    return undefined;
+  }
+}
diff --git a/packages/cli-v3/src/mcp/tools/docs.ts b/packages/cli-v3/src/mcp/tools/docs.ts
new file mode 100644
index 00000000000..7b5a9d27e84
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools/docs.ts
@@ -0,0 +1,20 @@
+import { z } from "zod";
+import { toolsMetadata } from "../config.js";
+import { toolHandler } from "../utils.js";
+import { performSearch } from "../mintlifyClient.js";
+
+export const searchDocsTool = {
+  name: toolsMetadata.search_docs.name,
+  title: toolsMetadata.search_docs.title,
+  description: toolsMetadata.search_docs.description,
+  inputSchema: {
+    query: z.string(),
+  },
+  handler: toolHandler({ query: z.string() }, async (input, { ctx, signal }) => {
+    ctx.logger?.log("calling search_docs", { input });
+
+    const results = await performSearch(input.query, signal);
+
+    return results.result;
+  }),
+};
diff --git a/packages/cli-v3/src/mcp/tools/orgs.ts b/packages/cli-v3/src/mcp/tools/orgs.ts
new file mode 100644
index 00000000000..9f8244b586f
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools/orgs.ts
@@ -0,0 +1,243 @@
+import { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import { GetProjectsResponseBody } from "@trigger.dev/core/v3";
+import { toolsMetadata } from "../config.js";
+import { CreateProjectInOrgInput, InitializeProjectInput } from "../schemas.js";
+import { ToolMeta } from "../types.js";
+import { respondWithError, toolHandler } from "../utils.js";
+import { loadConfig } from "../../config.js";
+import { tryCatch } from "@trigger.dev/core/utils";
+
+export const listOrgsTool = {
+  name: toolsMetadata.list_orgs.name,
+  title: toolsMetadata.list_orgs.title,
+  description: toolsMetadata.list_orgs.description,
+  inputSchema: {},
+  handler: async (input: unknown, { ctx }: ToolMeta): Promise<CallToolResult> => {
+    ctx.logger?.log("calling list_orgs", { input });
+
+    const cliApiClient = await ctx.getCliApiClient();
+
+    const orgs = await cliApiClient.getOrgs();
+
+    if (!orgs.success) {
+      return respondWithError(orgs.error);
+    }
+
+    ctx.logger?.log("list_orgs", { orgs: orgs.data });
+
+    const contents = orgs.data.map((org) => {
+      return `- ${org.title} (id=${org.id}) (slug=${org.slug}) (createdAt=${org.createdAt})`;
+    });
+
+    return {
+      content: [{ type: "text", text: contents.join("\n") }],
+    };
+  },
+};
+
+export const listProjectsTool = {
+  name: toolsMetadata.list_projects.name,
+  title: toolsMetadata.list_projects.title,
+  description: toolsMetadata.list_projects.description,
+  inputSchema: {},
+  handler: async (input: unknown, { ctx }: ToolMeta): Promise<CallToolResult> => {
+    ctx.logger?.log("calling list_projects", { input });
+
+    const cliApiClient = await ctx.getCliApiClient();
+
+    const projects = await cliApiClient.getProjects();
+
+    if (!projects.success) {
+      return respondWithError(projects.error);
+    }
+
+    ctx.logger?.log("list_projects", { projects: projects.data });
+
+    const groupedByOrg = projects.data.reduce(
+      (acc, project) => {
+        if (!project.organization) {
+          return acc;
+        }
+
+        acc[project.organization.id] = acc[project.organization.id] || {
+          organization: project.organization,
+          projects: [],
+        };
+        acc[project.organization.id]!.projects.push(project);
+
+        return acc;
+      },
+      {} as Record<
+        string,
+        {
+          organization: GetProjectsResponseBody[number]["organization"];
+          projects: GetProjectsResponseBody[number][];
+        }
+      >
+    );
+
+    const contents = Object.values(groupedByOrg)
+      .map((org) => {
+        const parts = [
+          `## Organization ${org.organization.title} (id=${org.organization.id}) (slug=${org.organization.slug}) projects:`,
+        ];
+
+        for (const project of org.projects) {
+          parts.push(
+            `- ${project.name} (projectRef=${project.externalRef}) (slug=${project.slug}) (createdAt=${project.createdAt})`
+          );
+        }
+
+        return parts.join("\n");
+      })
+      .join("\n");
+
+    return {
+      content: [
+        {
+          type: "text",
+          text: contents,
+        },
+      ],
+    };
+  },
+};
+
+export const createProjectInOrgTool = {
+  name: toolsMetadata.create_project_in_org.name,
+  title: toolsMetadata.create_project_in_org.title,
+  description: toolsMetadata.create_project_in_org.description,
+  inputSchema: CreateProjectInOrgInput.shape,
+  handler: toolHandler(CreateProjectInOrgInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling create_project_in_org", { input });
+
+    const cliApiClient = await ctx.getCliApiClient();
+
+    const project = await cliApiClient.createProject(input.orgParam, {
+      name: input.name,
+    });
+
+    if (!project.success) {
+      return respondWithError(project.error);
+    }
+
+    ctx.logger?.log("create_project_in_org", { project: project.data });
+
+    const contents = [
+      `Project created successfully: ${project.data.name} (projectRef=${project.data.externalRef}) (slug=${project.data.slug}) (createdAt=${project.data.createdAt})`,
+    ];
+
+    return {
+      content: [{ type: "text", text: contents.join("\n") }],
+    };
+  }),
+};
+
+export const initializeProjectTool = {
+  name: toolsMetadata.initialize_project.name,
+  title: toolsMetadata.initialize_project.title,
+  description: toolsMetadata.initialize_project.description,
+  inputSchema: InitializeProjectInput.shape,
+  handler: toolHandler(InitializeProjectInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling initialize_project", { input });
+
+    let projectRef: string | undefined = input.projectRef;
+
+    if (!projectRef) {
+      const cwd = input.cwd ?? (await ctx.getCwd());
+
+      if (!cwd) {
+        return respondWithError(
+          "No current working directory found. Please provide a projectRef or a cwd."
+        );
+      }
+
+      // Try to load the config file
+      const [_, config] = await tryCatch(loadConfig({ cwd }));
+
+      if (config?.configFile) {
+        if (typeof config.project === "string" && config.project.startsWith("proj_")) {
+          ctx.logger?.log("initialize_project existing project", {
+            config,
+            projectRef: config.project,
+          });
+
+          return {
+            content: [
+              {
+                type: "text",
+                text: `We found an existing trigger.config.ts file in the current working directory. Skipping initialization.`,
+              },
+            ],
+          };
+        } else {
+          return respondWithError(
+            "Could not find the project ref in the config file. Please provide a projectRef."
+          );
+        }
+      }
+
+      const cliApiClient = await ctx.getCliApiClient();
+
+      const project = await cliApiClient.createProject(input.orgParam, {
+        name: input.projectName,
+      });
+
+      if (!project.success) {
+        return respondWithError(
+          `Failed to create project ${input.projectName} in organization ${input.orgParam}: ${project.error}`
+        );
+      }
+
+      ctx.logger?.log("initialize_project new project", {
+        project: project.data,
+      });
+
+      projectRef = project.data.externalRef;
+    }
+
+    const cliApiClient = await ctx.getCliApiClient();
+
+    const projectEnv = await cliApiClient.getProjectEnv({
+      projectRef: projectRef,
+      env: "dev",
+    });
+
+    const manualSetupGuide = await getManualSetupGuide(
+      projectRef,
+      projectEnv.success ? projectEnv.data.apiKey : undefined,
+      projectEnv.success ? projectEnv.data.apiUrl : undefined
+    );
+
+    return {
+      content: [
+        {
+          type: "text",
+          text: manualSetupGuide,
+        },
+      ],
+    };
+  }),
+};
+
+async function getManualSetupGuide(projectRef: string, apiKey?: string, apiUrl?: string) {
+  const response = await fetch("https://trigger.dev/docs/manual-setup.md");
+  let text = await response.text();
+
+  text = text.replace("<your-project-ref>", projectRef);
+
+  text = text.replace("tr_dev_xxxxxxxxxx", apiKey ?? "tr_dev_xxxxxxxxxx");
+  text = text.replace(
+    "https://your-trigger-instance.com",
+    apiUrl ?? "https://your-trigger-instance.com"
+  );
+
+  return `
+Use the following manual setup guide to initialize Trigger.dev in your project. Make sure to use the correct project ref: ${projectRef}, and the following environment variables:
+
+TRIGGER_PROJECT_REF=${projectRef}
+TRIGGER_SECRET_KEY=${apiKey ?? "tr_dev_xxxxxxxxxx"}
+${apiUrl ? `TRIGGER_API_URL=${apiUrl}` : ""}
+
+${text}`;
+}
diff --git a/packages/cli-v3/src/mcp/tools/previewBranches.ts b/packages/cli-v3/src/mcp/tools/previewBranches.ts
new file mode 100644
index 00000000000..abadda29ab3
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools/previewBranches.ts
@@ -0,0 +1,35 @@
+import { ListPreviewBranchesInput } from "../schemas.js";
+import { toolsMetadata } from "../config.js";
+import { ToolMeta } from "../types.js";
+import { respondWithError, toolHandler } from "../utils.js";
+
+export const listPreviewBranchesTool = {
+  name: toolsMetadata.list_preview_branches.name,
+  title: toolsMetadata.list_preview_branches.title,
+  description: toolsMetadata.list_preview_branches.description,
+  inputSchema: ListPreviewBranchesInput.shape,
+  handler: toolHandler(ListPreviewBranchesInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling list_preview_branches", { input });
+
+    if (ctx.options.devOnly) {
+      return respondWithError(`This MCP server is only available for the dev environment. `);
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const cliApiClient = await ctx.getCliApiClient();
+
+    const branches = await cliApiClient.listBranches(projectRef);
+
+    if (!branches.success) {
+      return respondWithError(branches.error);
+    }
+
+    return {
+      content: [{ type: "text", text: JSON.stringify(branches.data, null, 2) }],
+    };
+  }),
+};
diff --git a/packages/cli-v3/src/mcp/tools/runs.ts b/packages/cli-v3/src/mcp/tools/runs.ts
new file mode 100644
index 00000000000..056544e3cdb
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools/runs.ts
@@ -0,0 +1,224 @@
+import { AnyRunShape } from "@trigger.dev/core/v3";
+import { toolsMetadata } from "../config.js";
+import { formatRun, formatRunList, formatRunShape, formatRunTrace } from "../formatters.js";
+import { CommonRunsInput, GetRunDetailsInput, ListRunsInput, WaitForRunInput } from "../schemas.js";
+import { respondWithError, toolHandler } from "../utils.js";
+
+export const getRunDetailsTool = {
+  name: toolsMetadata.get_run_details.name,
+  title: toolsMetadata.get_run_details.title,
+  description: toolsMetadata.get_run_details.description,
+  inputSchema: GetRunDetailsInput.shape,
+  handler: toolHandler(GetRunDetailsInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling get_run_details", { input });
+
+    if (ctx.options.devOnly && input.environment !== "dev") {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const apiClient = await ctx.getApiClient({
+      projectRef,
+      environment: input.environment,
+      scopes: [`read:runs:${input.runId}`],
+      branch: input.branch,
+    });
+
+    const [runResult, traceResult] = await Promise.all([
+      apiClient.retrieveRun(input.runId),
+      apiClient.retrieveRunTrace(input.runId),
+    ]);
+
+    const formattedRun = formatRun(runResult);
+    const formattedTrace = formatRunTrace(traceResult.trace, input.maxTraceLines);
+
+    const runUrl = await ctx.getDashboardUrl(`/projects/v3/${projectRef}/runs/${runResult.id}`);
+
+    const content = [
+      "## Run Details",
+      formattedRun,
+      "",
+      "## Run Trace",
+      formattedTrace,
+      "",
+      `[View in dashboard](${runUrl})`,
+    ];
+
+    return {
+      content: [
+        {
+          type: "text",
+          text: content.join("\n"),
+        },
+      ],
+    };
+  }),
+};
+
+export const waitForRunToCompleteTool = {
+  name: toolsMetadata.wait_for_run_to_complete.name,
+  title: toolsMetadata.wait_for_run_to_complete.title,
+  description: toolsMetadata.wait_for_run_to_complete.description,
+  inputSchema: WaitForRunInput.shape,
+  handler: toolHandler(WaitForRunInput.shape, async (input, { ctx, signal }) => {
+    ctx.logger?.log("calling wait_for_run_to_complete", { input });
+
+    if (ctx.options.devOnly && input.environment !== "dev") {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const apiClient = await ctx.getApiClient({
+      projectRef,
+      environment: input.environment,
+      scopes: [`read:runs:${input.runId}`],
+      branch: input.branch,
+    });
+
+    const timeoutMs = input.timeoutInSeconds * 1000;
+    const timeoutSignal = AbortSignal.timeout(timeoutMs);
+    const combinedSignal = signal
+      ? AbortSignal.any([signal, timeoutSignal])
+      : timeoutSignal;
+
+    const runSubscription = apiClient.subscribeToRun(input.runId, { signal: combinedSignal });
+    const readableStream = runSubscription.getReader();
+
+    let run: AnyRunShape | null = null;
+    let timedOut = false;
+
+    try {
+      while (true) {
+        const { done, value } = await readableStream.read();
+        if (done) {
+          break;
+        }
+        run = value;
+
+        if (value.isCompleted) {
+          break;
+        }
+      }
+    } catch (error) {
+      if (timeoutSignal.aborted) {
+        timedOut = true;
+      } else {
+        throw error;
+      }
+    }
+
+    if (!run) {
+      return respondWithError("Run not found");
+    }
+
+    const prefix = timedOut
+      ? `Timed out after ${input.timeoutInSeconds}s. Returning current run state:\n\n`
+      : "";
+
+    return {
+      content: [{ type: "text", text: prefix + formatRunShape(run) }],
+    };
+  }),
+};
+
+export const cancelRunTool = {
+  name: toolsMetadata.cancel_run.name,
+  title: toolsMetadata.cancel_run.title,
+  description: toolsMetadata.cancel_run.description,
+  inputSchema: CommonRunsInput.shape,
+  handler: toolHandler(CommonRunsInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling cancel_run", { input });
+
+    if (ctx.options.devOnly && input.environment !== "dev") {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const apiClient = await ctx.getApiClient({
+      projectRef,
+      environment: input.environment,
+      scopes: [`write:runs:${input.runId}`, `read:runs:${input.runId}`],
+      branch: input.branch,
+    });
+
+    await apiClient.cancelRun(input.runId);
+
+    const retrieveResult = await apiClient.retrieveRun(input.runId);
+
+    const runUrl = await ctx.getDashboardUrl(
+      `/projects/v3/${projectRef}/runs/${retrieveResult.id}`
+    );
+
+    return {
+      content: [{ type: "text", text: JSON.stringify({ ...retrieveResult, runUrl }, null, 2) }],
+    };
+  }),
+};
+
+export const listRunsTool = {
+  name: toolsMetadata.list_runs.name,
+  title: toolsMetadata.list_runs.title,
+  description: toolsMetadata.list_runs.description,
+  inputSchema: ListRunsInput.shape,
+  handler: toolHandler(ListRunsInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling list_runs", { input });
+
+    if (ctx.options.devOnly && input.environment !== "dev") {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const apiClient = await ctx.getApiClient({
+      projectRef,
+      environment: input.environment,
+      scopes: ["read:runs"],
+      branch: input.branch,
+    });
+
+    const $from = typeof input.from === "string" ? new Date(input.from) : undefined;
+    const $to = typeof input.to === "string" ? new Date(input.to) : undefined;
+
+    const result = await apiClient.listRuns({
+      after: input.cursor,
+      limit: input.limit,
+      status: input.status,
+      taskIdentifier: input.taskIdentifier,
+      version: input.version,
+      tag: input.tag,
+      from: $from,
+      to: $to,
+      period: input.period,
+      machine: input.machine,
+    });
+
+    const formattedRuns = formatRunList(result);
+
+    return {
+      content: [{ type: "text", text: formattedRuns }],
+    };
+  }),
+};
diff --git a/packages/cli-v3/src/mcp/tools/tasks.ts b/packages/cli-v3/src/mcp/tools/tasks.ts
new file mode 100644
index 00000000000..41c988ce1a7
--- /dev/null
+++ b/packages/cli-v3/src/mcp/tools/tasks.ts
@@ -0,0 +1,158 @@
+import { toolsMetadata } from "../config.js";
+import { CommonProjectsInput, TriggerTaskInput } from "../schemas.js";
+import { ToolMeta } from "../types.js";
+import { respondWithError, toolHandler } from "../utils.js";
+
+export const getCurrentWorker = {
+  name: toolsMetadata.get_current_worker.name,
+  title: toolsMetadata.get_current_worker.title,
+  description: toolsMetadata.get_current_worker.description,
+  inputSchema: CommonProjectsInput.shape,
+  handler: toolHandler(CommonProjectsInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling get_current_worker", { input });
+
+    if (ctx.options.devOnly && input.environment !== "dev") {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const cliApiClient = await ctx.getCliApiClient(input.branch);
+
+    const workerResult = await cliApiClient.getWorkerByTag(
+      projectRef,
+      input.environment,
+      "current"
+    );
+
+    if (!workerResult.success) {
+      return respondWithError(workerResult.error);
+    }
+
+    const { worker, urls } = workerResult.data;
+
+    const contents = [
+      `Current worker for ${input.environment} is ${worker.version} using ${worker.sdkVersion} of the SDK.`,
+    ];
+
+    if (worker.tasks.length > 0) {
+      contents.push(`The worker has ${worker.tasks.length} tasks registered:`);
+
+      for (const task of worker.tasks) {
+        if (task.payloadSchema) {
+          contents.push(
+            `- ${task.slug} in ${task.filePath} (payload schema: ${JSON.stringify(
+              task.payloadSchema
+            )})`
+          );
+        } else {
+          contents.push(`- ${task.slug} in ${task.filePath}`);
+        }
+      }
+    } else {
+      contents.push(`The worker has no tasks registered.`);
+    }
+
+    contents.push(`\n`);
+    contents.push(`URLs:`);
+    contents.push(`- Runs: ${urls.runs}`);
+    contents.push(`\n`);
+    contents.push(
+      `You can use the list_runs tool with the version ${worker.version} to get the list of runs for this worker.`
+    );
+
+    if (
+      typeof worker.sdkVersion === "string" &&
+      typeof worker.cliVersion === "string" &&
+      worker.sdkVersion !== worker.cliVersion
+    ) {
+      contents.push(
+        `WARNING: The SDK version (${worker.sdkVersion}) is different from the CLI version (${worker.cliVersion}). This might cause issues with the task execution. Make sure to pin the CLI and the SDK versions to ${worker.sdkVersion}.`
+      );
+    }
+
+    return {
+      content: [{ type: "text", text: contents.join("\n") }],
+    };
+  }),
+};
+
+export const triggerTaskTool = {
+  name: toolsMetadata.trigger_task.name,
+  title: toolsMetadata.trigger_task.title,
+  description: toolsMetadata.trigger_task.description,
+  inputSchema: TriggerTaskInput.shape,
+  handler: toolHandler(TriggerTaskInput.shape, async (input, { ctx }) => {
+    ctx.logger?.log("calling trigger_task", { input });
+
+    if (ctx.options.devOnly && input.environment !== "dev") {
+      return respondWithError(
+        `This MCP server is only available for the dev environment. You tried to access the ${input.environment} environment. Remove the --dev-only flag to access other environments.`
+      );
+    }
+
+    const projectRef = await ctx.getProjectRef({
+      projectRef: input.projectRef,
+      cwd: input.configPath,
+    });
+
+    const apiClient = await ctx.getApiClient({
+      projectRef,
+      environment: input.environment,
+      scopes: ["write:tasks"],
+      branch: input.branch,
+    });
+
+    ctx.logger?.log("triggering task", { input });
+
+    let payload = input.payload;
+
+    if (typeof payload === "string") {
+      try {
+        payload = JSON.parse(payload);
+      } catch {
+        ctx.logger?.log("payload is not a valid JSON string, using as is", { payload });
+      }
+    }
+
+    const result = await apiClient.triggerTask(input.taskId, {
+      payload,
+      options: input.options,
+    });
+
+    const taskRunUrl = await ctx.getDashboardUrl(`/projects/v3/${projectRef}/runs/${result.id}`);
+
+    const contents = [
+      `Task ${input.taskId} triggered and run with ID created: ${result.id}.`,
+      `View the run in the dashboard: ${taskRunUrl}`,
+      `Use the ${toolsMetadata.wait_for_run_to_complete.name} tool to wait for the run to complete and the ${toolsMetadata.get_run_details.name} tool to get the details of the run.`,
+    ];
+
+    if (input.environment === "dev") {
+      const cliApiClient = await ctx.getCliApiClient(input.branch);
+      const devStatus = await cliApiClient.getDevStatus(projectRef);
+      const isConnected = devStatus.success ? devStatus.data.isConnected : false;
+      const connectionMessage = isConnected
+        ? undefined
+        : "The dev CLI is not connected to this project, because it is not currently running. Make sure to run the dev command to execute triggered tasks.";
+
+      if (connectionMessage) {
+        contents.push(connectionMessage);
+      }
+    }
+
+    return {
+      content: [
+        {
+          type: "text",
+          text: contents.join("\n"),
+        },
+      ],
+    };
+  }),
+};
diff --git a/packages/cli-v3/src/mcp/types.ts b/packages/cli-v3/src/mcp/types.ts
new file mode 100644
index 00000000000..697a2d0dfcb
--- /dev/null
+++ b/packages/cli-v3/src/mcp/types.ts
@@ -0,0 +1,7 @@
+import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
+import { ServerNotification, ServerRequest } from "@modelcontextprotocol/sdk/types.js";
+import { McpContext } from "./context.js";
+
+export type ToolMeta = RequestHandlerExtra<ServerRequest, ServerNotification> & {
+  ctx: McpContext;
+};
diff --git a/packages/cli-v3/src/mcp/utils.ts b/packages/cli-v3/src/mcp/utils.ts
new file mode 100644
index 00000000000..b783365e67e
--- /dev/null
+++ b/packages/cli-v3/src/mcp/utils.ts
@@ -0,0 +1,134 @@
+import type { CallToolResult, ServerNotification } from "@modelcontextprotocol/sdk/types.js";
+import { z } from "zod";
+import { ToolMeta } from "./types.js";
+
+export function respondWithError(error: unknown): CallToolResult {
+  return {
+    isError: true,
+    content: [
+      {
+        type: "text",
+        text: JSON.stringify({ error: enumerateError(error) }),
+      },
+    ],
+  };
+}
+
+function enumerateError(error: unknown) {
+  if (!error) {
+    return error;
+  }
+
+  if (typeof error !== "object") {
+    return error;
+  }
+
+  const newError: Record<string, unknown> = {};
+
+  const errorProps = ["name", "message"] as const;
+
+  for (const prop of errorProps) {
+    if (prop in error) {
+      newError[prop] = (error as Record<string, unknown>)[prop];
+    }
+  }
+
+  return newError;
+}
+
+export type ToolHandlerMeta = ToolMeta & {
+  createProgressTracker: (total: number) => ProgressTracker;
+};
+
+export function toolHandler<TInputShape extends z.ZodRawShape>(
+  shape: TInputShape,
+  handler: (
+    input: z.output<z.ZodObject<TInputShape>>,
+    meta: ToolHandlerMeta
+  ) => Promise<CallToolResult>
+) {
+  return async (input: unknown, extra: ToolMeta) => {
+    const parsedInput = z.object(shape).safeParse(input);
+
+    if (!parsedInput.success) {
+      return respondWithError(parsedInput.error);
+    }
+
+    function createProgressTracker(total: number) {
+      return new ProgressTracker(total, extra.sendNotification, extra._meta?.progressToken);
+    }
+
+    return handler(parsedInput.data, { ...extra, createProgressTracker });
+  };
+}
+
+class ProgressTracker {
+  private progress: number = 0;
+  private progressToken: string | number | undefined;
+  private total: number;
+  private message: string;
+  private sendNotification: (notification: ServerNotification) => Promise<void>;
+
+  constructor(
+    total: number,
+    sendNotification: (notification: ServerNotification) => Promise<void>,
+    progressToken?: string | number
+  ) {
+    this.message = "";
+    this.progressToken = progressToken;
+    this.progress = 0;
+    this.total = total;
+    this.sendNotification = sendNotification;
+  }
+
+  async updateProgress(progress: number, message?: string) {
+    this.progress = progress;
+
+    if (message) {
+      this.message = message;
+    }
+
+    await this.#sendNotification(progress, this.message);
+  }
+
+  async incrementProgress(increment: number, message?: string) {
+    this.progress += increment;
+
+    // make sure the progress is never greater than the total
+    this.progress = Math.min(this.progress, this.total);
+
+    if (message) {
+      this.message = message;
+    }
+
+    await this.#sendNotification(this.progress, this.message);
+  }
+
+  async complete(message?: string) {
+    this.progress = this.total;
+    if (message) {
+      this.message = message;
+    }
+    await this.#sendNotification(this.progress, this.message);
+  }
+
+  getProgress() {
+    return this.progress;
+  }
+
+  async #sendNotification(progress: number, message: string) {
+    if (!this.progressToken) {
+      return;
+    }
+
+    await this.sendNotification({
+      method: "notifications/progress",
+      params: {
+        progress,
+        total: this.total,
+        message: this.message,
+        progressToken: this.progressToken,
+      },
+    });
+  }
+}
diff --git a/packages/cli-v3/src/rules/install.ts b/packages/cli-v3/src/rules/install.ts
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/packages/cli-v3/src/rules/install.ts
@@ -0,0 +1 @@
+
diff --git a/packages/cli-v3/src/rules/manifest.ts b/packages/cli-v3/src/rules/manifest.ts
new file mode 100644
index 00000000000..6e8e90bd9bc
--- /dev/null
+++ b/packages/cli-v3/src/rules/manifest.ts
@@ -0,0 +1,165 @@
+import { readFile } from "fs/promises";
+import { dirname, join } from "path";
+import { z } from "zod";
+import { RulesFileInstallStrategy } from "./types.js";
+
+const RulesManifestDataSchema = z.object({
+  name: z.string(),
+  description: z.string(),
+  currentVersion: z.string(),
+  versions: z.record(
+    z.string(),
+    z.object({
+      options: z.array(
+        z.object({
+          name: z.string(),
+          title: z.string(),
+          label: z.string(),
+          path: z.string(),
+          tokens: z.number(),
+          client: z.string().optional(),
+          installStrategy: z.string().optional(),
+          applyTo: z.string().optional(),
+        })
+      ),
+    })
+  ),
+});
+
+type RulesManifestData = z.infer<typeof RulesManifestDataSchema>;
+
+export type RulesManifestVersionOption = {
+  name: string;
+  title: string;
+  label: string;
+  contents: string;
+  tokens: number;
+  client: string | undefined;
+  installStrategy: RulesFileInstallStrategy;
+  applyTo: string | undefined;
+};
+
+export type ManifestVersion = {
+  version: string;
+  options: Array<RulesManifestVersionOption>;
+};
+
+export class RulesManifest {
+  constructor(
+    private readonly manifest: RulesManifestData,
+    private readonly loader: RulesManifestLoader
+  ) {}
+
+  get name() {
+    return this.manifest.name;
+  }
+
+  get description() {
+    return this.manifest.description;
+  }
+
+  get currentVersion() {
+    return this.manifest.currentVersion;
+  }
+
+  async getCurrentVersion(): Promise<ManifestVersion> {
+    const version = this.versions[this.manifest.currentVersion];
+
+    if (!version) {
+      throw new Error(`Version ${this.manifest.currentVersion} not found in manifest`);
+    }
+
+    const options = await Promise.all(
+      version.options.map(async (option) => {
+        const contents = await this.loader.loadRulesFile(option.path);
+
+        // Omit path
+        const { path, installStrategy, ...rest } = option;
+
+        const $installStrategy = RulesFileInstallStrategy.safeParse(installStrategy ?? "default");
+
+        // Skip variants with invalid install strategies
+        if (!$installStrategy.success) {
+          return;
+        }
+
+        return { ...rest, contents, installStrategy: $installStrategy.data };
+      })
+    );
+
+    return {
+      version: this.manifest.currentVersion,
+      options: options.filter(Boolean) as Array<ManifestVersion["options"][number]>,
+    };
+  }
+
+  get versions() {
+    return this.manifest.versions;
+  }
+}
+
+export async function loadRulesManifest(loader: RulesManifestLoader): Promise<RulesManifest> {
+  const content = await loader.loadManifestContent();
+
+  return new RulesManifest(RulesManifestDataSchema.parse(JSON.parse(content)), loader);
+}
+
+export interface RulesManifestLoader {
+  loadManifestContent(): Promise<string>;
+  loadRulesFile(relativePath: string): Promise<string>;
+}
+
+export class GithubRulesManifestLoader implements RulesManifestLoader {
+  constructor(private readonly branch: string = "main") {}
+
+  async loadManifestContent(): Promise<string> {
+    const response = await fetch(
+      `https://raw.githubusercontent.com/triggerdotdev/trigger.dev/refs/heads/${this.branch}/rules/manifest.json`,
+      {
+        signal: AbortSignal.timeout(5000),
+      }
+    );
+
+    if (!response.ok) {
+      throw new Error(`Failed to load rules manifest: ${response.status} ${response.statusText}`);
+    }
+
+    return response.text();
+  }
+
+  async loadRulesFile(relativePath: string): Promise<string> {
+    const response = await fetch(
+      `https://raw.githubusercontent.com/triggerdotdev/trigger.dev/refs/heads/${this.branch}/rules/${relativePath}`
+    );
+
+    if (!response.ok) {
+      throw new Error(
+        `Failed to load rules file: ${relativePath} - ${response.status} ${response.statusText}`
+      );
+    }
+
+    return response.text();
+  }
+}
+
+export class LocalRulesManifestLoader implements RulesManifestLoader {
+  constructor(private readonly path: string) {}
+
+  async loadManifestContent(): Promise<string> {
+    try {
+      return await readFile(this.path, "utf8");
+    } catch (error) {
+      throw new Error(`Failed to load rules manifest: ${this.path} - ${error}`);
+    }
+  }
+
+  async loadRulesFile(relativePath: string): Promise<string> {
+    const path = join(dirname(this.path), relativePath);
+
+    try {
+      return await readFile(path, "utf8");
+    } catch (error) {
+      throw new Error(`Failed to load rules file: ${relativePath} - ${error}`);
+    }
+  }
+}
diff --git a/packages/cli-v3/src/rules/types.ts b/packages/cli-v3/src/rules/types.ts
new file mode 100644
index 00000000000..70682c251a9
--- /dev/null
+++ b/packages/cli-v3/src/rules/types.ts
@@ -0,0 +1,4 @@
+import { z } from "zod";
+
+export const RulesFileInstallStrategy = z.enum(["default", "claude-code-subagent"]);
+export type RulesFileInstallStrategy = z.infer<typeof RulesFileInstallStrategy>;
diff --git a/packages/cli-v3/src/telemetry/tracing.ts b/packages/cli-v3/src/telemetry/tracing.ts
deleted file mode 100644
index e00e0668b59..00000000000
--- a/packages/cli-v3/src/telemetry/tracing.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { registerInstrumentations } from "@opentelemetry/instrumentation";
-import { Resource, detectResourcesSync, processDetectorSync } from "@opentelemetry/resources";
-import { NodeTracerProvider, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-node";
-import { FetchInstrumentation } from "@opentelemetry/instrumentation-fetch";
-import { DiagConsoleLogger, DiagLogLevel, diag, trace } from "@opentelemetry/api";
-import {
-  SEMRESATTRS_SERVICE_NAME,
-  SEMRESATTRS_SERVICE_VERSION,
-} from "@opentelemetry/semantic-conventions";
-import { logger } from "../utilities/logger.js";
-import { VERSION } from "../version.js";
-import { env } from "std-env";
-
-function initializeTracing(): NodeTracerProvider | undefined {
-  if (
-    process.argv.includes("--skip-telemetry") ||
-    env.TRIGGER_DEV_SKIP_TELEMETRY || // only for backwards compat
-    env.TRIGGER_TELEMETRY_DISABLED
-  ) {
-    logger.debug("📉 Telemetry disabled");
-    return;
-  }
-
-  if (env.OTEL_INTERNAL_DIAG_DEBUG) {
-    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG);
-  }
-
-  const resource = detectResourcesSync({
-    detectors: [processDetectorSync],
-  }).merge(
-    new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: "trigger.dev cli v3",
-      [SEMRESATTRS_SERVICE_VERSION]: VERSION,
-    })
-  );
-
-  const traceProvider = new NodeTracerProvider({
-    forceFlushTimeoutMillis: 30_000,
-    resource,
-    spanLimits: {
-      attributeCountLimit: 1000,
-      attributeValueLengthLimit: 2048,
-      eventCountLimit: 100,
-      attributePerEventCountLimit: 100,
-      linkCountLimit: 10,
-      attributePerLinkCountLimit: 100,
-    },
-  });
-
-  const spanExporter = new OTLPTraceExporter({
-    url: "https://otel.baselime.io/v1",
-    timeoutMillis: 5000,
-    headers: {
-      "x-api-key": "b6e0fbbaf8dc2524773d2152ae2e9eb5c7fbaa52",
-    },
-  });
-
-  const spanProcessor = new SimpleSpanProcessor(spanExporter);
-
-  traceProvider.addSpanProcessor(spanProcessor);
-  traceProvider.register();
-
-  registerInstrumentations({
-    instrumentations: [new FetchInstrumentation()],
-  });
-
-  return traceProvider;
-}
-
-export const provider = initializeTracing();
-
-export function getTracer() {
-  return trace.getTracer("trigger.dev cli v3", VERSION);
-}
diff --git a/packages/cli-v3/src/utilities/accessTokens.ts b/packages/cli-v3/src/utilities/accessTokens.ts
new file mode 100644
index 00000000000..03eba12bfab
--- /dev/null
+++ b/packages/cli-v3/src/utilities/accessTokens.ts
@@ -0,0 +1,38 @@
+const personalTokenPrefix = "tr_pat_";
+const organizationTokenPrefix = "tr_oat_";
+
+function isPersonalAccessToken(token: string) {
+  return token.startsWith(personalTokenPrefix);
+}
+
+function isOrganizationAccessToken(token: string) {
+  return token.startsWith(organizationTokenPrefix);
+}
+
+export function validateAccessToken(
+  token: string
+): { success: true; type: "personal" | "organization" } | { success: false } {
+  if (isPersonalAccessToken(token)) {
+    return { success: true, type: "personal" };
+  }
+
+  if (isOrganizationAccessToken(token)) {
+    return { success: true, type: "organization" };
+  }
+
+  return { success: false };
+}
+
+export class NotPersonalAccessTokenError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "NotPersonalAccessTokenError";
+  }
+}
+
+export class NotAccessTokenError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = "NotAccessTokenError";
+  }
+}
diff --git a/packages/cli-v3/src/utilities/buildManifest.ts b/packages/cli-v3/src/utilities/buildManifest.ts
index af80e2a0289..5cddbac71e7 100644
--- a/packages/cli-v3/src/utilities/buildManifest.ts
+++ b/packages/cli-v3/src/utilities/buildManifest.ts
@@ -1,10 +1,12 @@
 import { BuildManifest } from "@trigger.dev/core/v3/schemas";
 
 export function buildManifestToJSON(manifest: BuildManifest): BuildManifest {
-  const { deploy, build, ...rest } = manifest;
+  const { deploy, build, externals, ...rest } = manifest;
 
   return {
     ...rest,
+    // sort externals for deterministic builds
+    externals: externals?.slice().sort((a, b) => (a.name < b.name ? -1 : a.name > b.name ? 1 : 0)),
     deploy: {},
     build: {},
   };
diff --git a/packages/cli-v3/src/utilities/cliOutput.ts b/packages/cli-v3/src/utilities/cliOutput.ts
index 8b499c87c99..7d950c40a51 100644
--- a/packages/cli-v3/src/utilities/cliOutput.ts
+++ b/packages/cli-v3/src/utilities/cliOutput.ts
@@ -38,7 +38,7 @@ export function chalkLink(text: string) {
 }
 
 export function chalkWorker(text: string) {
-  return chalk.hex("#FFFF89")(text);
+  return chalk.yellowBright(text);
 }
 
 export function chalkTask(text: string) {
diff --git a/packages/cli-v3/src/utilities/configFiles.ts b/packages/cli-v3/src/utilities/configFiles.ts
index 6e1c9052e78..dfbdbf5df63 100644
--- a/packages/cli-v3/src/utilities/configFiles.ts
+++ b/packages/cli-v3/src/utilities/configFiles.ts
@@ -29,6 +29,13 @@ const CliConfigFile = z.object({
   version: z.literal(2),
   currentProfile: z.string().default(DEFFAULT_PROFILE),
   profiles: z.record(CliConfigProfileSettings),
+  settings: z
+    .object({
+      hasSeenMCPInstallPrompt: z.boolean().optional(),
+      hasSeenRulesInstallPrompt: z.boolean().optional(),
+      lastRulesInstallPromptVersion: z.string().optional(),
+    })
+    .optional(),
 });
 type CliConfigFile = z.infer<typeof CliConfigFile>;
 
@@ -50,6 +57,10 @@ function getBlankConfig(): CliConfigFile {
     version: 2,
     currentProfile: DEFFAULT_PROFILE,
     profiles: {},
+    settings: {
+      hasSeenMCPInstallPrompt: false,
+      hasSeenRulesInstallPrompt: false,
+    },
   };
 }
 
@@ -93,6 +104,52 @@ export function readAuthConfigProfile(
   }
 }
 
+export function readConfigHasSeenMCPInstallPrompt(): boolean {
+  const config = getConfig();
+  return typeof config.settings?.hasSeenMCPInstallPrompt === "boolean"
+    ? config.settings.hasSeenMCPInstallPrompt
+    : false;
+}
+
+export function writeConfigHasSeenMCPInstallPrompt(hasSeenMCPInstallPrompt: boolean) {
+  const config = getConfig();
+  config.settings = {
+    ...config.settings,
+    hasSeenMCPInstallPrompt,
+  };
+  writeAuthConfigFile(config);
+}
+
+export function readConfigHasSeenRulesInstallPrompt(): boolean {
+  const config = getConfig();
+  return typeof config.settings?.hasSeenRulesInstallPrompt === "boolean"
+    ? config.settings.hasSeenRulesInstallPrompt
+    : false;
+}
+
+export function writeConfigHasSeenRulesInstallPrompt(hasSeenRulesInstallPrompt: boolean) {
+  const config = getConfig();
+  config.settings = {
+    ...config.settings,
+    hasSeenRulesInstallPrompt,
+  };
+  writeAuthConfigFile(config);
+}
+
+export function readConfigLastRulesInstallPromptVersion(): string | undefined {
+  const config = getConfig();
+  return config.settings?.lastRulesInstallPromptVersion;
+}
+
+export function writeConfigLastRulesInstallPromptVersion(version: string) {
+  const config = getConfig();
+  config.settings = {
+    ...config.settings,
+    lastRulesInstallPromptVersion: version,
+  };
+  writeAuthConfigFile(config);
+}
+
 export function deleteAuthConfigProfile(profile: string = DEFFAULT_PROFILE) {
   const config = getConfig();
 
diff --git a/packages/cli-v3/src/utilities/dotEnv.ts b/packages/cli-v3/src/utilities/dotEnv.ts
index f50b26f5011..83cb92822ab 100644
--- a/packages/cli-v3/src/utilities/dotEnv.ts
+++ b/packages/cli-v3/src/utilities/dotEnv.ts
@@ -2,7 +2,13 @@ import dotenv from "dotenv";
 import { resolve } from "node:path";
 import { env } from "std-env";
 
-const ENVVAR_FILES = [".env", ".env.development", ".env.local", ".env.development.local", "dev.vars"];
+const ENVVAR_FILES = [
+  ".env",
+  ".env.development",
+  ".env.local",
+  ".env.development.local",
+  "dev.vars",
+];
 
 export function resolveDotEnvVars(cwd?: string, envFile?: string) {
   const result: { [key: string]: string } = {};
@@ -23,6 +29,11 @@ export function resolveDotEnvVars(cwd?: string, envFile?: string) {
   delete result.TRIGGER_SECRET_KEY;
   delete result.OTEL_EXPORTER_OTLP_ENDPOINT;
 
+  if (result.OTEL_RESOURCE_ATTRIBUTES) {
+    result.CUSTOM_OTEL_RESOURCE_ATTRIBUTES = result.OTEL_RESOURCE_ATTRIBUTES;
+    delete result.OTEL_RESOURCE_ATTRIBUTES;
+  }
+
   return result;
 }
 
diff --git a/packages/cli-v3/src/utilities/fileSystem.ts b/packages/cli-v3/src/utilities/fileSystem.ts
index b3957122fbd..e74a1184c1a 100644
--- a/packages/cli-v3/src/utilities/fileSystem.ts
+++ b/packages/cli-v3/src/utilities/fileSystem.ts
@@ -1,8 +1,10 @@
 import fsSync from "fs";
+import stringify from "json-stable-stringify";
 import fsModule, { writeFile } from "fs/promises";
 import fs from "node:fs";
-import { tmpdir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import pathModule from "node:path";
+import { parseJSONC, stringifyJSONC, parseTOML, stringifyTOML } from "confbox";
 
 // Creates a file at the given path, if the directory doesn't exist it will be created
 export async function createFile(
@@ -15,6 +17,77 @@ export async function createFile(
   return path;
 }
 
+/**
+ * Sanitizes a hash to be safe for use as a filename.
+ * esbuild's hashes are base64-encoded and may contain `/` and `+` characters.
+ */
+export function sanitizeHashForFilename(hash: string): string {
+  return hash.replace(/\//g, "_").replace(/\+/g, "-");
+}
+
+/**
+ * Creates a file using a content-addressable store for deduplication.
+ * Files are stored by their content hash, so identical content is only stored once.
+ * The build directory gets a hardlink to the stored file.
+ *
+ * @param filePath - The destination path for the file
+ * @param contents - The file contents to write
+ * @param storeDir - The shared store directory for deduplication
+ * @param contentHash - The content hash (e.g., from esbuild's outputFile.hash)
+ * @returns The destination file path
+ */
+export async function createFileWithStore(
+  filePath: string,
+  contents: string | NodeJS.ArrayBufferView,
+  storeDir: string,
+  contentHash: string
+): Promise<string> {
+  // Sanitize hash to be filesystem-safe (base64 can contain / and +)
+  const safeHash = sanitizeHashForFilename(contentHash);
+  // Store files by their content hash for true content-addressable storage
+  const storePath = pathModule.join(storeDir, safeHash);
+
+  // Ensure build directory exists
+  await fsModule.mkdir(pathModule.dirname(filePath), { recursive: true });
+
+  // Remove existing file at destination if it exists (hardlinks fail on existing files)
+  if (fsSync.existsSync(filePath)) {
+    await fsModule.unlink(filePath);
+  }
+
+  // Check if content already exists in store by hash
+  if (fsSync.existsSync(storePath)) {
+    // Create hardlink from build path to store path
+    // Fall back to copy if hardlink fails (e.g., on Windows or cross-device)
+    try {
+      await fsModule.link(storePath, filePath);
+    } catch (linkError) {
+      try {
+        await fsModule.copyFile(storePath, filePath);
+      } catch (copyError) {
+        throw linkError; // Rethrow original error if copy also fails
+      }
+    }
+    return filePath;
+  }
+
+  // Write to store first (using hash as filename)
+  await fsModule.writeFile(storePath, contents);
+  // Create hardlink in build directory (with original filename)
+  // Fall back to copy if hardlink fails (e.g., on Windows or cross-device)
+  try {
+    await fsModule.link(storePath, filePath);
+  } catch (linkError) {
+    try {
+      await fsModule.copyFile(storePath, filePath);
+    } catch (copyError) {
+      throw linkError; // Rethrow original error if copy also fails
+    }
+  }
+
+  return filePath;
+}
+
 export function isDirectory(configPath: string) {
   try {
     return fs.statSync(configPath).isDirectory();
@@ -50,6 +123,22 @@ export async function readFile(path: string) {
   return await fsModule.readFile(path, "utf8");
 }
 
+export function expandTilde(filePath: string) {
+  if (typeof filePath !== "string") {
+    throw new TypeError("Path must be a string");
+  }
+
+  if (filePath === "~") {
+    return homedir();
+  }
+
+  if (filePath.startsWith("~/")) {
+    return pathModule.resolve(homedir(), filePath.slice(2));
+  }
+
+  return pathModule.resolve(filePath);
+}
+
 export async function readJSONFile(path: string) {
   const fileContents = await fsModule.readFile(path, "utf8");
 
@@ -70,8 +159,30 @@ export async function safeReadJSONFile(path: string) {
   }
 }
 
+/**
+ * Use this for deterministic builds. Uses `json-stable-stringify` to sort keys alphabetically.
+ * @param path - The path to the file to write
+ * @param json - The JSON object to write
+ * @param pretty - Whether to pretty print the JSON
+ */
 export async function writeJSONFile(path: string, json: any, pretty = false) {
-  await writeFile(path, JSON.stringify(json, undefined, pretty ? 2 : undefined), "utf8");
+  await safeWriteFile(path, stringify(json, pretty ? { space: 2 } : undefined) ?? "");
+}
+
+/**
+ * Use this when you want to preserve the original key ordering (e.g. user's package.json)
+ * @param path - The path to the file to write
+ * @param json - The JSON object to write
+ * @param pretty - Whether to pretty print the JSON
+ */
+export async function writeJSONFilePreserveOrder(path: string, json: any, pretty = false) {
+  await safeWriteFile(path, JSON.stringify(json, undefined, pretty ? 2 : undefined));
+}
+
+// Will create the directory if it doesn't exist
+export async function safeWriteFile(path: string, contents: string) {
+  await fsModule.mkdir(pathModule.dirname(path), { recursive: true });
+  await fsModule.writeFile(path, contents);
 }
 
 export function readJSONFileSync(path: string) {
@@ -98,3 +209,31 @@ export async function createTempDir(): Promise<string> {
 
   return directory;
 }
+
+export async function safeReadTomlFile(path: string) {
+  const fileExists = await pathExists(path);
+
+  if (!fileExists) return;
+
+  const fileContents = await readFile(path);
+
+  return parseTOML(fileContents.replace(/\r\n/g, "\n"));
+}
+
+export async function writeTomlFile(path: string, toml: any) {
+  await safeWriteFile(path, stringifyTOML(toml));
+}
+
+export async function safeReadJSONCFile(path: string) {
+  const fileExists = await pathExists(path);
+
+  if (!fileExists) return;
+
+  const fileContents = await readFile(path);
+
+  return parseJSONC(fileContents.replace(/\r\n/g, "\n"));
+}
+
+export async function writeJSONCFile(path: string, json: any) {
+  await safeWriteFile(path, stringifyJSONC(json));
+}
diff --git a/packages/cli-v3/src/utilities/gitMeta.ts b/packages/cli-v3/src/utilities/gitMeta.ts
index 91e59a8781d..e3d2fc64779 100644
--- a/packages/cli-v3/src/utilities/gitMeta.ts
+++ b/packages/cli-v3/src/utilities/gitMeta.ts
@@ -6,10 +6,12 @@ import { x } from "tinyexec";
 import { GitMeta } from "@trigger.dev/core/v3";
 
 export async function createGitMeta(directory: string): Promise<GitMeta | undefined> {
-  // First try to get metadata from GitHub Actions environment
-  const githubMeta = await getGitHubActionsMeta();
-  if (githubMeta) {
-    return githubMeta;
+  if (isGitHubApp()) {
+    return getGitHubAppMeta();
+  }
+
+  if (isGitHubActions()) {
+    return getGitHubActionsMeta();
   }
 
   // Fall back to git commands for local development
@@ -31,19 +33,14 @@ export async function createGitMeta(directory: string): Promise<GitMeta | undefi
   const dirty = dirtyResult.value;
   const commit = commitResult.value;
 
-  // Get the pull request number from process.env (GitHub Actions)
-  const pullRequestNumber: number | undefined = process.env.GITHUB_PULL_REQUEST_NUMBER
-    ? parseInt(process.env.GITHUB_PULL_REQUEST_NUMBER)
-    : undefined;
-
   return {
+    source: "local",
     remoteUrl: remoteUrl ?? undefined,
     commitAuthorName: commit.author.name,
     commitMessage: commit.subject,
     commitRef: commit.branch,
     commitSha: commit.hash,
     dirty,
-    pullRequestNumber,
   };
 }
 
@@ -86,27 +83,6 @@ async function parseGitConfig(configPath: string) {
   }
 }
 
-function pluckRemoteUrls(gitConfig: { [key: string]: any }): { [key: string]: string } | undefined {
-  const remoteUrls: { [key: string]: string } = {};
-
-  for (const key of Object.keys(gitConfig)) {
-    if (key.includes("remote")) {
-      // ex. remote "origin" — matches origin
-      const remoteName = key.match(/(?<=").*(?=")/g)?.[0];
-      const remoteUrl = gitConfig[key]?.url;
-      if (remoteName && remoteUrl) {
-        remoteUrls[remoteName] = remoteUrl;
-      }
-    }
-  }
-
-  if (Object.keys(remoteUrls).length === 0) {
-    return;
-  }
-
-  return remoteUrls;
-}
-
 function pluckOriginUrl(gitConfig: { [key: string]: any }): string | undefined {
   // Assuming "origin" is the remote url that the user would want to use
   return gitConfig['remote "origin"']?.url;
@@ -129,31 +105,32 @@ function errorToString(err: unknown): string {
   return err instanceof Error ? err.message : String(err);
 }
 
-function isGitHubActions(): boolean {
-  return process.env.GITHUB_ACTIONS === "true";
+export function isGitHubActions() {
+  // GH Actions CI sets these env variables
+  return (
+    process.env.GITHUB_ACTIONS === "true" &&
+    process.env.GITHUB_SHA !== undefined &&
+    process.env.GITHUB_REF !== undefined
+  );
 }
 
-async function getGitHubActionsMeta(): Promise<GitMeta | undefined> {
-  if (!isGitHubActions()) {
-    return undefined;
-  }
-
-  // Required fields that should always be present in GitHub Actions
-  if (!process.env.GITHUB_SHA || !process.env.GITHUB_REF) {
-    return undefined;
-  }
-
+async function getGitHubActionsMeta(): Promise<GitMeta> {
   const remoteUrl =
     process.env.GITHUB_SERVER_URL && process.env.GITHUB_REPOSITORY
       ? `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}.git`
       : undefined;
 
-  let commitRef = process.env.GITHUB_REF;
+  // GITHUB_SHA and GITHUB_REF are both set in GH Actions CI
+  const githubSha = process.env.GITHUB_SHA ?? "";
+  const githubRef = process.env.GITHUB_REF ?? "";
+
+  // For push events, GITHUB_REF is fully qualified, e.g., "refs/heads/main"
+  let commitRef = githubRef.replace(/^refs\/(heads|tags)\//, "");
   let commitMessage: string | undefined;
+  let commitSha = githubSha;
   let pullRequestNumber: number | undefined;
   let pullRequestTitle: string | undefined;
   let pullRequestState: "open" | "closed" | "merged" | undefined;
-  let commitSha = process.env.GITHUB_SHA;
 
   if (process.env.GITHUB_EVENT_PATH) {
     try {
@@ -161,8 +138,6 @@ async function getGitHubActionsMeta(): Promise<GitMeta | undefined> {
 
       if (process.env.GITHUB_EVENT_NAME === "push") {
         commitMessage = eventData.head_commit?.message;
-        // For push events, GITHUB_REF will be like "refs/heads/main"
-        commitRef = process.env.GITHUB_REF.replace(/^refs\/(heads|tags)\//, "");
       } else if (process.env.GITHUB_EVENT_NAME === "pull_request") {
         // For PRs, use the head commit info
         pullRequestTitle = eventData.pull_request?.title;
@@ -189,11 +164,11 @@ async function getGitHubActionsMeta(): Promise<GitMeta | undefined> {
     }
   } else {
     console.debug("No GITHUB_EVENT_PATH found");
-    // If we can't read the event payload, at least try to clean up the ref
-    commitRef = process.env.GITHUB_REF.replace(/^refs\/(heads|tags)\//, "");
   }
 
   return {
+    provider: "github",
+    source: "github_actions",
     remoteUrl,
     commitSha,
     commitRef,
@@ -212,6 +187,36 @@ async function getGitHubActionsMeta(): Promise<GitMeta | undefined> {
   };
 }
 
+function isGitHubApp() {
+  // we set this env variable in our build server
+  return process.env.TRIGGER_GITHUB_APP === "true";
+}
+
+function getGitHubAppMeta(): GitMeta {
+  return {
+    provider: "github",
+    source: "trigger_github_app",
+    remoteUrl: process.env.GITHUB_REPOSITORY_URL,
+    commitSha: process.env.GITHUB_HEAD_COMMIT_SHA,
+    commitRef: process.env.GITHUB_REF?.replace(/^refs\/(heads|tags)\//, ""),
+    commitMessage: process.env.GITHUB_HEAD_COMMIT_MESSAGE,
+    commitAuthorName: process.env.GITHUB_HEAD_COMMIT_AUTHOR_NAME,
+    pullRequestNumber: process.env.GITHUB_PULL_REQUEST_NUMBER
+      ? parseInt(process.env.GITHUB_PULL_REQUEST_NUMBER)
+      : undefined,
+    pullRequestTitle: process.env.GITHUB_PULL_REQUEST_TITLE,
+    pullRequestState: process.env.GITHUB_PULL_REQUEST_STATE as
+      | "open"
+      | "closed"
+      | "merged"
+      | undefined,
+    // the workspace is always clean as we clone the repo in the build server
+    dirty: false,
+    ghUsername: process.env.GITHUB_USERNAME,
+    ghUserAvatarUrl: process.env.GITHUB_USER_AVATAR_URL,
+  };
+}
+
 async function getCommitMessage(
   directory: string,
   sha: string,
diff --git a/packages/cli-v3/src/utilities/initialBanner.ts b/packages/cli-v3/src/utilities/initialBanner.ts
index 20f4735597b..c30deeee7fe 100644
--- a/packages/cli-v3/src/utilities/initialBanner.ts
+++ b/packages/cli-v3/src/utilities/initialBanner.ts
@@ -11,8 +11,8 @@ import {
 } from "./configFiles.js";
 import { CLOUD_API_URL } from "../consts.js";
 
-function getProfileInfo() {
-  const currentProfile = readAuthConfigCurrentProfileName();
+function getProfileInfo(profileName?: string) {
+  const currentProfile = profileName ?? readAuthConfigCurrentProfileName();
   const profile = readAuthConfigProfile(currentProfile);
 
   if (currentProfile === DEFFAULT_PROFILE || !profile) {
@@ -24,8 +24,8 @@ function getProfileInfo() {
   }`;
 }
 
-export async function printInitialBanner(performUpdateCheck = true) {
-  const profileInfo = getProfileInfo();
+export async function printInitialBanner(performUpdateCheck = true, profile?: string) {
+  const profileInfo = getProfileInfo(profile);
 
   const text = `\n${logo()} ${chalkGrey(`(${VERSION})`)}${
     profileInfo ? chalkGrey(` | ${profileInfo}`) : ""
@@ -62,8 +62,8 @@ After installation, run Trigger.dev with \`npx trigger.dev\`.`
   }
 }
 
-export async function printStandloneInitialBanner(performUpdateCheck = true) {
-  const profileInfo = getProfileInfo();
+export async function printStandloneInitialBanner(performUpdateCheck = true, profile?: string) {
+  const profileInfo = getProfileInfo(profile);
   const profileText = profileInfo ? chalkGrey(` | ${profileInfo}`) : "";
 
   let versionText = `\n${logo()} ${chalkGrey(`(${VERSION})`)}`;
diff --git a/packages/cli-v3/src/utilities/isPersonalAccessToken.ts b/packages/cli-v3/src/utilities/isPersonalAccessToken.ts
deleted file mode 100644
index 53d9f3959da..00000000000
--- a/packages/cli-v3/src/utilities/isPersonalAccessToken.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-const tokenPrefix = "tr_pat_";
-
-export function isPersonalAccessToken(token: string) {
-  return token.startsWith(tokenPrefix);
-}
-
-export class NotPersonalAccessTokenError extends Error {
-  constructor(message: string) {
-    super(message);
-    this.name = "NotPersonalAccessTokenError";
-  }
-}
diff --git a/packages/cli-v3/src/utilities/session.ts b/packages/cli-v3/src/utilities/session.ts
index be9d9ebfd45..13e10549c22 100644
--- a/packages/cli-v3/src/utilities/session.ts
+++ b/packages/cli-v3/src/utilities/session.ts
@@ -1,12 +1,9 @@
 import { recordSpanException } from "@trigger.dev/core/v3/workers";
 import { CliApiClient } from "../apiClient.js";
 import { readAuthConfigProfile } from "./configFiles.js";
-import { getTracer } from "../telemetry/tracing.js";
 import { logger } from "./logger.js";
 import { GitMeta } from "@trigger.dev/core/v3";
 
-const tracer = getTracer();
-
 export type LoginResultOk = {
   ok: true;
   profile: string;
@@ -16,6 +13,7 @@ export type LoginResultOk = {
   auth: {
     apiUrl: string;
     accessToken: string;
+    tokenType: "personal" | "organization";
   };
 };
 
@@ -27,67 +25,51 @@ export type LoginResult =
       auth?: {
         apiUrl: string;
         accessToken: string;
+        tokenType: "personal" | "organization";
       };
     };
 
 export async function isLoggedIn(profile: string = "default"): Promise<LoginResult> {
-  return await tracer.startActiveSpan("isLoggedIn", async (span) => {
-    try {
-      const config = readAuthConfigProfile(profile);
-
-      if (!config?.accessToken || !config?.apiUrl) {
-        span.recordException(new Error("You must login first"));
-        span.end();
-        return { ok: false as const, error: "You must login first" };
-      }
-
-      const apiClient = new CliApiClient(config.apiUrl, config.accessToken);
-      const userData = await apiClient.whoAmI();
-
-      if (!userData.success) {
-        recordSpanException(span, userData.error);
-        span.end();
-
-        return {
-          ok: false as const,
-          error: userData.error,
-          auth: {
-            apiUrl: config.apiUrl,
-            accessToken: config.accessToken,
-          },
-        };
-      }
-
-      span.setAttributes({
-        "login.userId": userData.data.userId,
-        "login.email": userData.data.email,
-        "login.dashboardUrl": userData.data.dashboardUrl,
-        "login.profile": profile,
-      });
-
-      span.end();
+  try {
+    const config = readAuthConfigProfile(profile);
+
+    if (!config?.accessToken || !config?.apiUrl) {
+      return { ok: false as const, error: "You must login first" };
+    }
+
+    const apiClient = new CliApiClient(config.apiUrl, config.accessToken);
+    const userData = await apiClient.whoAmI();
 
+    if (!userData.success) {
       return {
-        ok: true as const,
-        profile,
-        userId: userData.data.userId,
-        email: userData.data.email,
-        dashboardUrl: userData.data.dashboardUrl,
+        ok: false as const,
+        error: userData.error,
         auth: {
           apiUrl: config.apiUrl,
           accessToken: config.accessToken,
+          tokenType: "personal",
         },
       };
-    } catch (e) {
-      recordSpanException(span, e);
-      span.end();
-
-      return {
-        ok: false as const,
-        error: e instanceof Error ? e.message : "Unknown error",
-      };
     }
-  });
+
+    return {
+      ok: true as const,
+      profile,
+      userId: userData.data.userId,
+      email: userData.data.email,
+      dashboardUrl: userData.data.dashboardUrl,
+      auth: {
+        apiUrl: config.apiUrl,
+        accessToken: config.accessToken,
+        tokenType: "personal",
+      },
+    };
+  } catch (e) {
+    return {
+      ok: false as const,
+      error: e instanceof Error ? e.message : "Unknown error",
+    };
+  }
 }
 
 export type GetEnvOptions = {
diff --git a/packages/cli-v3/src/utilities/tempDirectories.ts b/packages/cli-v3/src/utilities/tempDirectories.ts
index 8d36d419a51..2f3859d209e 100644
--- a/packages/cli-v3/src/utilities/tempDirectories.ts
+++ b/packages/cli-v3/src/utilities/tempDirectories.ts
@@ -58,3 +58,28 @@ export function clearTmpDirs(projectRoot: string | undefined) {
     // This sometimes fails on Windows with EBUSY
   }
 }
+
+/**
+ * Gets the shared store directory for content-addressable build outputs.
+ * This directory persists across rebuilds and is used to deduplicate
+ * identical chunk files between build versions.
+ * Automatically cleaned up when the process exits.
+ */
+export function getStoreDir(projectRoot: string | undefined, keep: boolean = false): string {
+  projectRoot ??= process.cwd();
+  const storeDir = path.join(projectRoot, ".trigger", "tmp", "store");
+  fs.mkdirSync(storeDir, { recursive: true });
+
+  // Register exit handler to clean up the store directory
+  if (!keep && !process.env.KEEP_TMP_DIRS) {
+    onExit(() => {
+      try {
+        fs.rmSync(storeDir, { recursive: true, force: true });
+      } catch (e) {
+        // This sometimes fails on Windows with EBUSY
+      }
+    });
+  }
+
+  return storeDir;
+}
diff --git a/packages/cli-v3/src/utilities/windows.ts b/packages/cli-v3/src/utilities/windows.ts
index 4e8a6ad7915..3ebf403f43b 100644
--- a/packages/cli-v3/src/utilities/windows.ts
+++ b/packages/cli-v3/src/utilities/windows.ts
@@ -7,6 +7,85 @@ export function escapeImportPath(path: string) {
   return isWindows ? path.replaceAll("\\", "\\\\") : path;
 }
 
+// Removes ANSI escape sequences to get actual visible length
+function getVisibleLength(str: string): number {
+  return (
+    str
+      // Remove terminal hyperlinks: \u001b]8;;URL\u0007TEXT\u001b]8;;\u0007
+      .replace(/\u001b]8;;[^\u0007]*\u0007/g, "")
+      // Remove standard ANSI escape sequences (colors, cursor movement, etc.)
+      .replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").length
+  );
+}
+
+function truncateMessage(msg: string, maxLength?: number): string {
+  const terminalWidth = maxLength ?? process.stdout.columns ?? 80;
+  const availableWidth = terminalWidth - 5; // Reserve some space for the spinner and padding
+  const visibleLength = getVisibleLength(msg);
+
+  if (visibleLength <= availableWidth) {
+    return msg;
+  }
+
+  // We need to truncate based on visible characters, but preserve ANSI sequences
+  // Simple approach: truncate character by character until we fit
+  let truncated = msg;
+  while (getVisibleLength(truncated) > availableWidth - 3) {
+    truncated = truncated.slice(0, -1);
+  }
+
+  return truncated + "...";
+}
+
+const wrappedClackSpinner = () => {
+  let currentMessage = "";
+  let isActive = false;
+
+  const handleResize = () => {
+    if (isActive && currentMessage) {
+      spinner.message(truncateMessage(currentMessage));
+    }
+  };
+
+  const spinner = clackSpinner();
+
+  return {
+    start: (msg?: string): void => {
+      currentMessage = msg ?? "";
+      isActive = true;
+      process.stdout.on("resize", handleResize);
+      spinner.start(truncateMessage(currentMessage));
+    },
+    stop: (msg?: string, code?: number): void => {
+      process.stdout.off("resize", handleResize);
+
+      if (!isActive) {
+        // Spinner was never started, just display the message
+        if (msg) {
+          log.message(msg);
+        }
+        return;
+      }
+
+      isActive = false;
+      spinner.stop(truncateMessage(msg ?? ""), code);
+    },
+    message: (msg?: string): void => {
+      currentMessage = msg ?? "";
+
+      if (!isActive) {
+        // Spinner was never started, just display the message
+        if (msg) {
+          log.message(msg);
+        }
+        return;
+      }
+
+      spinner.message(truncateMessage(currentMessage));
+    },
+  };
+};
+
 const ballmerSpinner = () => ({
   start: (msg?: string): void => {
     log.step(msg ?? "");
@@ -19,6 +98,19 @@ const ballmerSpinner = () => ({
   },
 });
 
+const plainSpinner = () => ({
+  start: (msg?: string): void => {
+    console.log(msg ?? "");
+  },
+  stop: (msg?: string, code?: number): void => {
+    if (msg) console.log(msg ?? "");
+  },
+  message: (msg?: string): void => {
+    if (msg) console.log(msg ?? "");
+  },
+});
+
 // This will become unecessary with the next clack release, the bug was fixed here:
 // https://github.com/natemoo-re/clack/pull/182
-export const spinner = () => (isWindows ? ballmerSpinner() : clackSpinner());
+export const spinner = (options: { plain?: boolean } = { plain: false }) =>
+  options.plain ? plainSpinner() : isWindows ? ballmerSpinner() : wrappedClackSpinner();
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index e66976d0ed9..589e6718ab6 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,168 @@
 # internal-platform
 
+## 4.4.1
+
+## 4.4.0
+
+### Patch Changes
+
+- Add `maxDelay` option to debounce feature. This allows setting a maximum time limit for how long a debounced run can be delayed, ensuring execution happens within a specified window even with continuous triggers. ([#2984](https://github.com/triggerdotdev/trigger.dev/pull/2984))
+
+  ```typescript
+  await myTask.trigger(payload, {
+    debounce: {
+      key: "my-key",
+      delay: "5s",
+      maxDelay: "30m", // Execute within 30 minutes regardless of continuous triggers
+    },
+  });
+  ```
+
+- Fixed a minor issue in the deployment command on distinguishing between local builds for the cloud vs local builds for self-hosting setups. ([#3070](https://github.com/triggerdotdev/trigger.dev/pull/3070))
+- fix: vendor superjson to fix ESM/CJS compatibility ([#2949](https://github.com/triggerdotdev/trigger.dev/pull/2949))
+
+  Bundle superjson during build to avoid `ERR_REQUIRE_ESM` errors on Node.js versions that don't support `require(ESM)` by default (< 22.12.0) and AWS Lambda which intentionally disables it.
+
+- Add Vercel integration support to API schemas: `commitSHA` and `integrationDeployments` on deployment responses, and `source` field for environment variable imports. ([#2994](https://github.com/triggerdotdev/trigger.dev/pull/2994))
+
+## 4.3.3
+
+### Patch Changes
+
+- Add support for AI SDK v6 (Vercel AI SDK) ([#2919](https://github.com/triggerdotdev/trigger.dev/pull/2919))
+
+  - Updated peer dependency to allow `ai@^6.0.0` alongside v4 and v5
+  - Updated internal code to handle async validation from AI SDK v6's Schema type
+
+- Expose user-provided idempotency key and scope in task context. `ctx.run.idempotencyKey` now returns the original key passed to `idempotencyKeys.create()` instead of the hash, and `ctx.run.idempotencyKeyScope` shows the scope ("run", "attempt", or "global"). ([#2903](https://github.com/triggerdotdev/trigger.dev/pull/2903))
+- Fix batch trigger failing with "ReadableStream is locked" error when network failures occur mid-stream. Added safe stream cancellation that gracefully handles locked streams during retry attempts. ([#2917](https://github.com/triggerdotdev/trigger.dev/pull/2917))
+- Add a maxDepth to flatten/unflattenAttributes to prevent possible issues ([#2890](https://github.com/triggerdotdev/trigger.dev/pull/2890))
+
+## 4.3.2
+
+## 4.3.1
+
+### Patch Changes
+
+- Added support for idempotency reset ([#2777](https://github.com/triggerdotdev/trigger.dev/pull/2777))
+
+## 4.3.0
+
+### Minor Changes
+
+- feat(cli): deterministic image builds for deployments ([#2778](https://github.com/triggerdotdev/trigger.dev/pull/2778))
+
+### Patch Changes
+
+- The new `triggeredVia` field is now populated in deployments via the CLI. ([#2767](https://github.com/triggerdotdev/trigger.dev/pull/2767))
+
+## 4.2.0
+
+### Patch Changes
+
+- fix: prevent ERR_IPC_CHANNEL_CLOSED errors from causing an unhandled exception on TaskRunProcess ([#2743](https://github.com/triggerdotdev/trigger.dev/pull/2743))
+- Added support for native build server builds in the deploy command (`--native-build-server`) ([#2702](https://github.com/triggerdotdev/trigger.dev/pull/2702))
+
+## 4.1.2
+
+## 4.1.1
+
+## 4.1.0
+
+## 4.0.7
+
+## 4.0.6
+
+### Patch Changes
+
+- Added a hint about the `--force-local-build` flag on failed deployments due to upstream provider outages. ([#2646](https://github.com/triggerdotdev/trigger.dev/pull/2646))
+
+## 4.0.5
+
+### Patch Changes
+
+- Move max duration handling into the parent process ([#2637](https://github.com/triggerdotdev/trigger.dev/pull/2637))
+- fix(realtime): Upgrade to @electric-sql/client@1.0.14 to prevent cached 409 Conflict errors from breaking realtime updates ([#2588](https://github.com/triggerdotdev/trigger.dev/pull/2588))
+- Added INSTALLING status to the deployment status enum. ([#2544](https://github.com/triggerdotdev/trigger.dev/pull/2544))
+- Fix SIGTERM handling during warm start long poll ([#2593](https://github.com/triggerdotdev/trigger.dev/pull/2593))
+- Added support for deployments with local builds. ([#2628](https://github.com/triggerdotdev/trigger.dev/pull/2628))
+
+## 4.0.4
+
+## 4.0.3
+
+### Patch Changes
+
+- Attach to existing deployment for deployments triggered in the build server. If `TRIGGER_EXISTING_DEPLOYMENT_ID` env var is set, the `deploy` command now skips the deployment initialization. ([#2501](https://github.com/triggerdotdev/trigger.dev/pull/2501))
+- Reduce restore recovery time and fix deprecated runner false positives ([#2523](https://github.com/triggerdotdev/trigger.dev/pull/2523))
+
+## 4.0.2
+
+## 4.0.1
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- The dev command will now use the platform-provided engine URL ([#1949](https://github.com/triggerdotdev/trigger.dev/pull/1949))
+- Run Engine 2.0 (alpha) ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575))
+- Configurable queue consumer count in supervisor session ([#1949](https://github.com/triggerdotdev/trigger.dev/pull/1949))
+- Runtime agnostic SDK config via env vars ([#2132](https://github.com/triggerdotdev/trigger.dev/pull/2132))
+- Add supervisor http client option to disable debug logs ([#2116](https://github.com/triggerdotdev/trigger.dev/pull/2116))
+- Expose esbuild `keepNames` option (experimental) ([#2091](https://github.com/triggerdotdev/trigger.dev/pull/2091))
+- Add `experimental_autoDetectExternal` trigger config option ([#2083](https://github.com/triggerdotdev/trigger.dev/pull/2083))
+- Add project details to the whoami command ([#2231](https://github.com/triggerdotdev/trigger.dev/pull/2231))
+- Add import timings and bundle size analysis, the dev command will now warn about slow imports ([#2114](https://github.com/triggerdotdev/trigger.dev/pull/2114))
+- Improve structured logs ([#2062](https://github.com/triggerdotdev/trigger.dev/pull/2062))
+- - Resolve issue where CLI could get stuck during deploy finalization ([#2138](https://github.com/triggerdotdev/trigger.dev/pull/2138))
+  - Unify local and remote build logic, with multi-platform build support
+  - Improve switch command; now accepts profile name as an argument
+  - Registry configuration is now fully managed by the webapp
+  - The deploy `--self-hosted` flag is no longer required
+  - Enhance deployment error reporting and image digest retrieval
+- - Correctly resolve waitpoints that come in early ([#2006](https://github.com/triggerdotdev/trigger.dev/pull/2006))
+  - Ensure correct state before requesting suspension
+  - Fix race conditions in snapshot processing
+- Add optional placement tags to dequeued messages for targeted scheduling ([#2390](https://github.com/triggerdotdev/trigger.dev/pull/2390))
+- Add verbose structured log level ([#2062](https://github.com/triggerdotdev/trigger.dev/pull/2062))
+- Suppress external instrumentation for fetch calls from ApiClient ([#1788](https://github.com/triggerdotdev/trigger.dev/pull/1788))
+- Add runtime version detection for display in the dashboard ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
+- Improve metadata flushing efficiency by collapsing operations ([#2106](https://github.com/triggerdotdev/trigger.dev/pull/2106))
+- fix: Realtime streams: prevent enqueuing into closed ReadableStream ([#1781](https://github.com/triggerdotdev/trigger.dev/pull/1781))
+- Improve usage flushing ([#1931](https://github.com/triggerdotdev/trigger.dev/pull/1931))
+- Prevent large outputs from overwriting each other ([#1971](https://github.com/triggerdotdev/trigger.dev/pull/1971))
+- Fail fast in CI when running deploy with missing `TRIGGER_ACCESS_TOKEN` and add useful error message with link to docs ([#2258](https://github.com/triggerdotdev/trigger.dev/pull/2258))
+- Upgrade to zod 3.25.76 ([#2352](https://github.com/triggerdotdev/trigger.dev/pull/2352))
+- - Fix polling interval reset bug that could create duplicate intervals ([#1987](https://github.com/triggerdotdev/trigger.dev/pull/1987))
+  - Protect against unexpected attempt number changes
+  - Prevent run execution zombies after warm starts
+- Managed run controller performance and reliability improvements ([#1927](https://github.com/triggerdotdev/trigger.dev/pull/1927))
+- v4: New lifecycle hooks ([#1817](https://github.com/triggerdotdev/trigger.dev/pull/1817))
+- Fix QUEUED status snapshot handler ([#1963](https://github.com/triggerdotdev/trigger.dev/pull/1963))
+- Fixes an issue with realtime when re-subscribing to a run, that would temporarily display stale data and the changes. Now when re-subscribing to a run only the latest changes will be vended ([#2162](https://github.com/triggerdotdev/trigger.dev/pull/2162))
+- Expose esbuild `minify` option (experimental) ([#2091](https://github.com/triggerdotdev/trigger.dev/pull/2091))
+- Fix Bun runtime path resolution fallback ([#2254](https://github.com/triggerdotdev/trigger.dev/pull/2254))
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Add optional placement tags to dequeued messages for targeted scheduling ([#2390](https://github.com/triggerdotdev/trigger.dev/pull/2390))
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- Upgrade to zod 3.25.76 ([#2352](https://github.com/triggerdotdev/trigger.dev/pull/2352))
+
+## 4.0.0-v4-beta.26
+
+## 4.0.0-v4-beta.25
+
 ## 4.0.0-v4-beta.24
 
 ## 4.0.0-v4-beta.23
@@ -551,7 +714,7 @@
     port: 5432,
     username: "postgres",
     password: "postgres",
-    database: "v3-catalog",
+    database: "hello-world",
     entities: [Photo],
     synchronize: true,
     logging: false,
@@ -991,7 +1154,7 @@
     port: 5432,
     username: "postgres",
     password: "postgres",
-    database: "v3-catalog",
+    database: "hello-world",
     entities: [Photo],
     synchronize: true,
     logging: false,
diff --git a/packages/core/package.json b/packages/core/package.json
index 23d2eddcf9b..369b3266c7c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/core",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "Core code used across the Trigger.dev SDK and platform",
   "license": "MIT",
   "publishConfig": {
@@ -157,47 +157,50 @@
   },
   "sideEffects": false,
   "scripts": {
-    "clean": "rimraf dist .tshy .tshy-build .turbo",
+    "clean": "rimraf dist .tshy .tshy-build .turbo src/v3/vendor",
     "update-version": "tsx ../../scripts/updateVersion.ts",
-    "build": "tshy && pnpm run update-version",
-    "dev": "tshy --watch",
-    "typecheck": "tsc --noEmit -p tsconfig.src.json",
+    "bundle-vendor": "node scripts/bundle-superjson.mjs",
+    "build": "pnpm run bundle-vendor && tshy && node scripts/bundle-superjson.mjs --copy && pnpm run update-version",
+    "dev": "pnpm run bundle-vendor && tshy --watch",
+    "typecheck": "pnpm run bundle-vendor && tsc --noEmit -p tsconfig.src.json",
+    "pretest": "pnpm run bundle-vendor",
     "test": "vitest",
     "check-exports": "attw --pack ."
   },
   "dependencies": {
     "@bugsnag/cuid": "^3.1.1",
-    "@electric-sql/client": "1.0.0-beta.1",
+    "@electric-sql/client": "1.0.14",
     "@google-cloud/precise-date": "^4.0.0",
     "@jsonhero/path": "^1.0.21",
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.52.1",
-    "@opentelemetry/core": "^1.30.1",
-    "@opentelemetry/exporter-logs-otlp-http": "0.52.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
-    "@opentelemetry/instrumentation": "0.52.1",
-    "@opentelemetry/resources": "1.25.1",
-    "@opentelemetry/sdk-logs": "0.52.1",
-    "@opentelemetry/sdk-node": "0.52.1",
-    "@opentelemetry/sdk-trace-base": "1.25.1",
-    "@opentelemetry/sdk-trace-node": "1.25.1",
-    "@opentelemetry/semantic-conventions": "1.25.1",
+    "@opentelemetry/api-logs": "0.203.0",
+    "@opentelemetry/core": "2.0.1",
+    "@opentelemetry/exporter-logs-otlp-http": "0.203.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "0.203.0",
+    "@opentelemetry/host-metrics": "^0.37.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
+    "@opentelemetry/instrumentation": "0.203.0",
+    "@opentelemetry/resources": "2.0.1",
+    "@opentelemetry/sdk-logs": "0.203.0",
+    "@opentelemetry/sdk-metrics": "2.0.1",
+    "@opentelemetry/sdk-trace-base": "2.0.1",
+    "@opentelemetry/sdk-trace-node": "2.0.1",
+    "@opentelemetry/semantic-conventions": "1.36.0",
+    "@s2-dev/streamstore": "0.17.3",
     "dequal": "^2.0.3",
     "eventsource": "^3.0.5",
     "eventsource-parser": "^3.0.0",
     "execa": "^8.0.1",
     "humanize-duration": "^3.27.3",
     "jose": "^5.4.0",
-    "lodash.get": "^4.4.2",
     "nanoid": "3.3.8",
     "prom-client": "^15.1.0",
     "socket.io": "4.7.4",
     "socket.io-client": "4.7.5",
     "std-env": "^3.8.1",
-    "superjson": "^2.2.1",
     "tinyexec": "^0.3.2",
     "uncrypto": "^0.1.3",
-    "zod": "3.23.8",
+    "zod": "3.25.76",
     "zod-error": "1.5.0",
     "zod-validation-error": "^1.5.0"
   },
@@ -209,10 +212,11 @@
     "@types/humanize-duration": "^3.27.1",
     "@types/lodash.get": "^4.4.9",
     "@types/readable-stream": "^4.0.14",
-    "ai": "^3.4.33",
+    "ai": "^6.0.0",
     "defu": "^6.1.4",
     "esbuild": "^0.23.0",
     "rimraf": "^3.0.2",
+    "superjson": "^2.2.1",
     "ts-essentials": "10.0.1",
     "tshy": "^3.0.2",
     "tsx": "4.17.0"
diff --git a/packages/core/scripts/bundle-superjson.mjs b/packages/core/scripts/bundle-superjson.mjs
new file mode 100644
index 00000000000..c4e9a7b0018
--- /dev/null
+++ b/packages/core/scripts/bundle-superjson.mjs
@@ -0,0 +1,93 @@
+#!/usr/bin/env node
+
+/**
+ * This script bundles superjson and its dependency (copy-anything) into
+ * vendored CJS and ESM bundles to avoid the ERR_REQUIRE_ESM error.
+ *
+ * superjson v2.x is ESM-only, which causes issues on:
+ * - Node.js versions before 22.12.0 (require(ESM) not enabled by default)
+ * - AWS Lambda (intentionally disables require(ESM))
+ *
+ * The output files are gitignored and regenerated during each build.
+ * This script runs automatically as part of `pnpm run build`.
+ *
+ * Usage:
+ *   node scripts/bundle-superjson.mjs          # Bundle to src/v3/vendor
+ *   node scripts/bundle-superjson.mjs --copy   # Also copy to dist directories
+ */
+
+import * as esbuild from "esbuild";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { readFileSync, mkdirSync, copyFileSync } from "node:fs";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const packageRoot = join(__dirname, "..");
+const vendorDir = join(packageRoot, "src", "v3", "vendor");
+
+// Get the installed superjson version for the banner
+const superjsonPkg = JSON.parse(
+  readFileSync(join(packageRoot, "node_modules", "superjson", "package.json"), "utf-8")
+);
+const banner = `/**
+ * Bundled superjson v${superjsonPkg.version}
+ *
+ * This file is auto-generated by scripts/bundle-superjson.mjs
+ * Do not edit directly - run the script to regenerate.
+ *
+ * Original package: https://github.com/flightcontrolhq/superjson
+ * License: MIT
+ */`;
+
+async function bundle() {
+  // Ensure vendor directory exists
+  mkdirSync(vendorDir, { recursive: true });
+
+  // Bundle for CommonJS
+  await esbuild.build({
+    entryPoints: [join(packageRoot, "node_modules", "superjson", "dist", "index.js")],
+    bundle: true,
+    format: "cjs",
+    platform: "node",
+    target: "node18",
+    outfile: join(vendorDir, "superjson.cjs"),
+    banner: { js: banner },
+    // Don't minify to keep it debuggable
+    minify: false,
+  });
+
+  // Bundle for ESM
+  await esbuild.build({
+    entryPoints: [join(packageRoot, "node_modules", "superjson", "dist", "index.js")],
+    bundle: true,
+    format: "esm",
+    platform: "node",
+    target: "node18",
+    outfile: join(vendorDir, "superjson.mjs"),
+    banner: { js: banner },
+    minify: false,
+  });
+
+  console.log("Bundled superjson v" + superjsonPkg.version);
+  console.log("  -> src/v3/vendor/superjson.cjs (CommonJS)");
+  console.log("  -> src/v3/vendor/superjson.mjs (ESM)");
+
+  // Copy to dist directories if --copy flag is passed
+  if (process.argv.includes("--copy")) {
+    const distCommonjsVendor = join(packageRoot, "dist", "commonjs", "v3", "vendor");
+    const distEsmVendor = join(packageRoot, "dist", "esm", "v3", "vendor");
+
+    mkdirSync(distCommonjsVendor, { recursive: true });
+    mkdirSync(distEsmVendor, { recursive: true });
+
+    copyFileSync(join(vendorDir, "superjson.cjs"), join(distCommonjsVendor, "superjson.cjs"));
+    copyFileSync(join(vendorDir, "superjson.mjs"), join(distEsmVendor, "superjson.mjs"));
+
+    console.log("Copied to dist directories");
+  }
+}
+
+bundle().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
diff --git a/packages/core/src/logger.ts b/packages/core/src/logger.ts
index e63987405b9..3d5620a9d23 100644
--- a/packages/core/src/logger.ts
+++ b/packages/core/src/logger.ts
@@ -23,6 +23,9 @@ export class Logger {
   #jsonReplacer?: (key: string, value: unknown) => unknown;
   #additionalFields: () => Record<string, unknown>;
 
+  // Add a static "onError" method that will be called when an error is logged
+  static onError: (message: string, ...args: Array<Record<string, unknown> | undefined>) => void;
+
   constructor(
     name: string,
     level: LogLevel = "info",
@@ -67,6 +70,12 @@ export class Logger {
     if (this.#level < 1) return;
 
     this.#structuredLog(console.error, message, "error", ...args);
+
+    const ignoreError = args.some((arg) => arg?.ignoreError);
+
+    if (Logger.onError && !ignoreError) {
+      Logger.onError(message, ...args);
+    }
   }
 
   warn(message: string, ...args: Array<Record<string, unknown> | undefined>) {
@@ -140,6 +149,7 @@ function extractStructuredErrorFromArgs(...args: Array<Record<string, unknown> |
       message: error.message,
       stack: error.stack,
       name: error.name,
+      metadata: "metadata" in error ? error.metadata : undefined,
     };
   }
 
@@ -150,6 +160,7 @@ function extractStructuredErrorFromArgs(...args: Array<Record<string, unknown> |
       message: structuredError.error.message,
       stack: structuredError.error.stack,
       name: structuredError.error.name,
+      metadata: "metadata" in structuredError.error ? structuredError.error.metadata : undefined,
     };
   }
 
diff --git a/packages/core/src/v3/apiClient/core.ts b/packages/core/src/v3/apiClient/core.ts
index ec1fe8421e0..1f3dca03feb 100644
--- a/packages/core/src/v3/apiClient/core.ts
+++ b/packages/core/src/v3/apiClient/core.ts
@@ -4,7 +4,7 @@ import { RetryOptions } from "../schemas/index.js";
 import { calculateNextRetryDelay } from "../utils/retries.js";
 import { ApiConnectionError, ApiError, ApiSchemaValidationError } from "./errors.js";
 
-import { Attributes, context, propagation, Span } from "@opentelemetry/api";
+import { Attributes, context, propagation, Span, trace } from "@opentelemetry/api";
 import { suppressTracing } from "@opentelemetry/core";
 import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
 import type { TriggerTracer } from "../tracer.js";
@@ -617,10 +617,6 @@ export function hasOwn(obj: Object, key: string): boolean {
 function injectPropagationHeadersIfInWorker(requestInit?: RequestInit): RequestInit | undefined {
   const headers = new Headers(requestInit?.headers);
 
-  if (headers.get("x-trigger-worker") !== "true") {
-    return requestInit;
-  }
-
   const headersObject = Object.fromEntries(headers.entries());
 
   propagation.inject(context.active(), headersObject);
diff --git a/packages/core/src/v3/apiClient/errors.ts b/packages/core/src/v3/apiClient/errors.ts
index 5be13b91e76..14f69b31302 100644
--- a/packages/core/src/v3/apiClient/errors.ts
+++ b/packages/core/src/v3/apiClient/errors.ts
@@ -190,6 +190,47 @@ export class ApiSchemaValidationError extends ApiError {
   }
 }
 
+/**
+ * Error thrown when a batch stream completes but the batch was not sealed.
+ * This indicates that not all expected items were received by the server.
+ * The client should retry sending all items, or investigate the mismatch.
+ */
+export class BatchNotSealedError extends Error {
+  readonly name = "BatchNotSealedError";
+
+  /** The batch ID that was not sealed */
+  readonly batchId: string;
+
+  /** Number of items currently enqueued on the server */
+  readonly enqueuedCount: number;
+
+  /** Number of items expected to complete the batch */
+  readonly expectedCount: number;
+
+  /** Number of items accepted in this request */
+  readonly itemsAccepted: number;
+
+  /** Number of items deduplicated in this request */
+  readonly itemsDeduplicated: number;
+
+  constructor(options: {
+    batchId: string;
+    enqueuedCount: number;
+    expectedCount: number;
+    itemsAccepted: number;
+    itemsDeduplicated: number;
+  }) {
+    const message = `Batch ${options.batchId} was not sealed: received ${options.enqueuedCount} of ${options.expectedCount} expected items (accepted: ${options.itemsAccepted}, deduplicated: ${options.itemsDeduplicated})`;
+    super(message);
+
+    this.batchId = options.batchId;
+    this.enqueuedCount = options.enqueuedCount;
+    this.expectedCount = options.expectedCount;
+    this.itemsAccepted = options.itemsAccepted;
+    this.itemsDeduplicated = options.itemsDeduplicated;
+  }
+}
+
 function castToError(err: any): Error {
   if (err instanceof Error) return err;
   return new Error(err);
diff --git a/packages/core/src/v3/apiClient/index.ts b/packages/core/src/v3/apiClient/index.ts
index 4eab7d00895..428493b71e2 100644
--- a/packages/core/src/v3/apiClient/index.ts
+++ b/packages/core/src/v3/apiClient/index.ts
@@ -3,14 +3,22 @@ import { VERSION } from "../../version.js";
 import { generateJWT } from "../jwt.js";
 import {
   AddTagsRequestBody,
+  ApiDeploymentListOptions,
+  ApiDeploymentListResponseItem,
+  ApiDeploymentListSearchParams,
+  AppendToStreamResponseBody,
+  BatchItemNDJSON,
   BatchTaskRunExecutionResult,
   BatchTriggerTaskV3RequestBody,
   BatchTriggerTaskV3Response,
   CanceledRunResponse,
   CompleteWaitpointTokenRequestBody,
   CompleteWaitpointTokenResponseBody,
+  CreateBatchRequestBody,
+  CreateBatchResponse,
   CreateEnvironmentVariableRequestBody,
   CreateScheduleOptions,
+  CreateStreamResponseBody,
   CreateUploadPayloadUrlResponseBody,
   CreateWaitpointTokenRequestBody,
   CreateWaitpointTokenResponseBody,
@@ -22,12 +30,18 @@ import {
   ListScheduleOptions,
   QueueItem,
   QueueTypeName,
+  QueryExecuteRequestBody,
+  QueryExecuteResponseBody,
+  QueryExecuteCSVResponseBody,
   ReplayRunResponse,
   RescheduleRunRequestBody,
+  ResetIdempotencyKeyResponse,
   RetrieveBatchV2Response,
   RetrieveQueueParam,
   RetrieveRunResponse,
+  RetrieveRunTraceResponseBody,
   ScheduleObject,
+  StreamBatchItemsResponse,
   TaskRunExecutionResult,
   TriggerTaskRequestBody,
   TriggerTaskResponse,
@@ -56,7 +70,9 @@ import {
   zodfetchCursorPage,
   zodfetchOffsetLimitPage,
 } from "./core.js";
-import { ApiError } from "./errors.js";
+import { ApiConnectionError, ApiError, BatchNotSealedError } from "./errors.js";
+import { calculateNextRetryDelay } from "../utils/retries.js";
+import { RetryOptions } from "../schemas/index.js";
 import {
   AnyRealtimeRun,
   AnyRunShape,
@@ -65,9 +81,11 @@ import {
   RunStreamCallback,
   RunSubscription,
   SSEStreamSubscriptionFactory,
+  SSEStreamSubscription,
   TaskRunShape,
   runShapeStream,
   RealtimeRunSkipColumns,
+  type SSEStreamPart,
 } from "./runStream.js";
 import {
   CreateEnvironmentVariableParams,
@@ -79,6 +97,8 @@ import {
   UpdateEnvironmentVariableParams,
 } from "./types.js";
 import { API_VERSION, API_VERSION_HEADER_NAME } from "./version.js";
+import { ApiClientConfiguration } from "../apiClientManager-api.js";
+import { getEnvVar } from "../utils/getEnv.js";
 
 export type CreateWaitpointTokenResponse = Prettify<
   CreateWaitpointTokenResponseBody & {
@@ -86,6 +106,12 @@ export type CreateWaitpointTokenResponse = Prettify<
   }
 >;
 
+export type CreateBatchApiResponse = Prettify<
+  CreateBatchResponse & {
+    publicAccessToken: string;
+  }
+>;
+
 export type {
   CreateEnvironmentVariableParams,
   ImportEnvironmentVariablesParams,
@@ -108,6 +134,7 @@ export type TriggerRequestOptions = ZodFetchOptions & {
 
 export type TriggerApiRequestOptions = ApiRequestOptions & {
   publicAccessToken?: TriggerJwtOptions;
+  clientConfig?: ApiClientConfiguration;
 };
 
 const DEFAULT_ZOD_FETCH_OPTIONS: ZodFetchOptions = {
@@ -120,7 +147,11 @@ const DEFAULT_ZOD_FETCH_OPTIONS: ZodFetchOptions = {
   },
 };
 
-export { isRequestOptions };
+export type ApiClientFutureFlags = {
+  v2RealtimeStreams?: boolean;
+};
+
+export { isRequestOptions, SSEStreamSubscription };
 export type {
   AnyRealtimeRun,
   AnyRunShape,
@@ -130,6 +161,7 @@ export type {
   RunStreamCallback,
   RunSubscription,
   TaskRunShape,
+  SSEStreamPart,
 };
 
 export * from "./getBranch.js";
@@ -141,18 +173,21 @@ export class ApiClient {
   public readonly baseUrl: string;
   public readonly accessToken: string;
   public readonly previewBranch?: string;
+  public readonly futureFlags: ApiClientFutureFlags;
   private readonly defaultRequestOptions: ZodFetchOptions;
 
   constructor(
     baseUrl: string,
     accessToken: string,
     previewBranch?: string,
-    requestOptions: ApiRequestOptions = {}
+    requestOptions: ApiRequestOptions = {},
+    futureFlags: ApiClientFutureFlags = {}
   ) {
     this.accessToken = accessToken;
     this.baseUrl = baseUrl.replace(/\/$/, "");
     this.previewBranch = previewBranch;
     this.defaultRequestOptions = mergeRequestOptions(DEFAULT_ZOD_FETCH_OPTIONS, requestOptions);
+    this.futureFlags = futureFlags;
   }
 
   get fetchClient(): typeof fetch {
@@ -303,6 +338,207 @@ export class ApiClient {
       });
   }
 
+  /**
+   * Phase 1 of 2-phase batch API: Create a batch
+   *
+   * Creates a new batch and returns its ID. For batchTriggerAndWait,
+   * the parent run is blocked immediately on batch creation.
+   *
+   * @param body - The batch creation parameters
+   * @param clientOptions - Options for trace context handling
+   * @param clientOptions.spanParentAsLink - If true, child runs will have separate trace IDs with a link to parent
+   * @param requestOptions - Optional request options
+   * @returns The created batch with ID and metadata
+   */
+  createBatch(
+    body: CreateBatchRequestBody,
+    clientOptions?: ClientTriggerOptions,
+    requestOptions?: TriggerRequestOptions
+  ) {
+    return zodfetch(
+      CreateBatchResponse,
+      `${this.baseUrl}/api/v3/batches`,
+      {
+        method: "POST",
+        headers: this.#getHeaders(clientOptions?.spanParentAsLink ?? false),
+        body: JSON.stringify(body),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    )
+      .withResponse()
+      .then(async ({ data, response }) => {
+        const claimsHeader = response.headers.get("x-trigger-jwt-claims");
+        const claims = claimsHeader ? JSON.parse(claimsHeader) : undefined;
+
+        const jwt = await generateJWT({
+          secretKey: this.accessToken,
+          payload: {
+            ...claims,
+            scopes: [`read:batch:${data.id}`],
+          },
+          expirationTime: requestOptions?.publicAccessToken?.expirationTime ?? "1h",
+        });
+
+        return {
+          ...data,
+          publicAccessToken: jwt,
+        };
+      });
+  }
+
+  /**
+   * Phase 2 of 2-phase batch API: Stream batch items
+   *
+   * Streams batch items as NDJSON to the server. Each item is enqueued
+   * as it arrives. The batch is automatically sealed when the stream completes.
+   *
+   * Includes automatic retry with exponential backoff. Since items are deduplicated
+   * by index on the server, retrying the entire stream is safe.
+   *
+   * Uses ReadableStream.tee() for retry capability without buffering all items
+   * upfront - only items consumed before a failure are buffered for retry.
+   *
+   * @param batchId - The batch ID from createBatch
+   * @param items - Array or async iterable of batch items
+   * @param requestOptions - Optional request options
+   * @returns Summary of items accepted and deduplicated
+   */
+  async streamBatchItems(
+    batchId: string,
+    items: BatchItemNDJSON[] | AsyncIterable<BatchItemNDJSON>,
+    requestOptions?: ApiRequestOptions
+  ): Promise<StreamBatchItemsResponse> {
+    // Convert input to ReadableStream for uniform handling and tee() support
+    const stream = createNdjsonStream(items);
+
+    const retryOptions = {
+      ...DEFAULT_STREAM_BATCH_RETRY_OPTIONS,
+      ...requestOptions?.retry,
+    };
+
+    return this.#streamBatchItemsWithRetry(batchId, stream, retryOptions);
+  }
+
+  async #streamBatchItemsWithRetry(
+    batchId: string,
+    stream: ReadableStream<Uint8Array>,
+    retryOptions: RetryOptions,
+    attempt: number = 1
+  ): Promise<StreamBatchItemsResponse> {
+    const headers = this.#getHeaders(false);
+    headers["Content-Type"] = "application/x-ndjson";
+
+    // Tee the stream: one branch for this attempt, one for potential retry
+    // tee() internally buffers data consumed from one branch for the other,
+    // so we only buffer what's been sent before a failure occurs
+    const [forRequest, forRetry] = stream.tee();
+
+    try {
+      const response = await fetch(`${this.baseUrl}/api/v3/batches/${batchId}/items`, {
+        method: "POST",
+        headers,
+        body: forRequest,
+        // @ts-expect-error - duplex is required for streaming body but not in types
+        duplex: "half",
+      });
+
+      if (!response.ok) {
+        const retryResult = shouldRetryStreamBatchItems(response, attempt, retryOptions);
+
+        if (retryResult.retry) {
+          // Cancel the request stream before retry to prevent tee() from buffering
+          await safeStreamCancel(forRequest);
+          await sleep(retryResult.delay);
+          // Use the backup stream for retry
+          return this.#streamBatchItemsWithRetry(batchId, forRetry, retryOptions, attempt + 1);
+        }
+
+        // Not retrying - cancel the backup stream
+        await safeStreamCancel(forRetry);
+
+        const errText = await response.text().catch((e) => (e as Error).message);
+        let errJSON: Object | undefined;
+        try {
+          errJSON = JSON.parse(errText) as Object;
+        } catch {
+          // ignore
+        }
+        const errMessage = errJSON ? undefined : errText;
+        const responseHeaders = Object.fromEntries(response.headers.entries());
+
+        throw ApiError.generate(response.status, errJSON, errMessage, responseHeaders);
+      }
+
+      const result = await response.json();
+      const parsed = StreamBatchItemsResponse.safeParse(result);
+
+      if (!parsed.success) {
+        // Cancel backup stream since we're throwing
+        await safeStreamCancel(forRetry);
+        throw new Error(
+          `Invalid response from server for batch ${batchId}: ${parsed.error.message}`
+        );
+      }
+
+      // Check if the batch was sealed
+      if (!parsed.data.sealed) {
+        // Not all items were received - treat as retryable condition
+        const delay = calculateNextRetryDelay(retryOptions, attempt);
+
+        if (delay) {
+          // Cancel the request stream before retry to prevent tee() from buffering
+          await safeStreamCancel(forRequest);
+          // Retry with the backup stream
+          await sleep(delay);
+          return this.#streamBatchItemsWithRetry(batchId, forRetry, retryOptions, attempt + 1);
+        }
+
+        // No more retries - cancel backup stream and throw descriptive error
+        await safeStreamCancel(forRetry);
+        throw new BatchNotSealedError({
+          batchId,
+          enqueuedCount: parsed.data.enqueuedCount ?? 0,
+          expectedCount: parsed.data.expectedCount ?? 0,
+          itemsAccepted: parsed.data.itemsAccepted,
+          itemsDeduplicated: parsed.data.itemsDeduplicated,
+        });
+      }
+
+      // Success - cancel the backup stream to release resources
+      await safeStreamCancel(forRetry);
+
+      return parsed.data;
+    } catch (error) {
+      // Don't retry BatchNotSealedError (retries already exhausted)
+      if (error instanceof BatchNotSealedError) {
+        throw error;
+      }
+      // Don't retry ApiErrors (already handled above with backup stream cancelled)
+      if (error instanceof ApiError) {
+        throw error;
+      }
+
+      // Retry connection errors using the backup stream
+      const delay = calculateNextRetryDelay(retryOptions, attempt);
+      if (delay) {
+        // Cancel the request stream before retry to prevent tee() from buffering
+        await safeStreamCancel(forRequest);
+        await sleep(delay);
+        return this.#streamBatchItemsWithRetry(batchId, forRetry, retryOptions, attempt + 1);
+      }
+
+      // No more retries - cancel the backup stream
+      await safeStreamCancel(forRetry);
+
+      // Wrap in a more descriptive error
+      const cause = error instanceof Error ? error : new Error(String(error));
+      throw new ApiConnectionError({
+        cause,
+        message: `Failed to stream batch items for batch ${batchId}: ${cause.message}`,
+      });
+    }
+  }
+
   createUploadPayloadUrl(filename: string, requestOptions?: ZodFetchOptions) {
     return zodfetch(
       CreateUploadPayloadUrlResponseBody,
@@ -339,6 +575,18 @@ export class ApiClient {
     );
   }
 
+  retrieveRunTrace(runId: string, requestOptions?: ZodFetchOptions) {
+    return zodfetch(
+      RetrieveRunTraceResponseBody,
+      `${this.baseUrl}/api/v1/runs/${runId}/trace`,
+      {
+        method: "GET",
+        headers: this.#getHeaders(false),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
+  }
+
   listRuns(
     query?: ListRunsQueryParams,
     requestOptions?: ZodFetchOptions
@@ -417,6 +665,23 @@ export class ApiClient {
     );
   }
 
+  resetIdempotencyKey(
+    taskIdentifier: string,
+    idempotencyKey: string,
+    requestOptions?: ZodFetchOptions
+  ) {
+    return zodfetch(
+      ResetIdempotencyKeyResponse,
+      `${this.baseUrl}/api/v1/idempotencyKeys/${encodeURIComponent(idempotencyKey)}/reset`,
+      {
+        method: "POST",
+        headers: this.#getHeaders(false),
+        body: JSON.stringify({ taskIdentifier }),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
+  }
+
   rescheduleRun(runId: string, body: RescheduleRunRequestBody, requestOptions?: ZodFetchOptions) {
     return zodfetch(
       RetrieveRunResponse,
@@ -883,6 +1148,53 @@ export class ApiClient {
     );
   }
 
+  overrideQueueConcurrencyLimit(
+    queue: RetrieveQueueParam,
+    concurrencyLimit: number,
+    requestOptions?: ZodFetchOptions
+  ) {
+    const type = typeof queue === "string" ? "id" : queue.type;
+    const value = typeof queue === "string" ? queue : queue.name;
+
+    // Explicitly encode slashes before encoding the rest of the string
+    const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+
+    return zodfetch(
+      QueueItem,
+      `${this.baseUrl}/api/v1/queues/${encodedValue}/concurrency/override`,
+      {
+        method: "POST",
+        headers: this.#getHeaders(false),
+        body: JSON.stringify({
+          type,
+          concurrencyLimit,
+        }),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
+  }
+
+  resetQueueConcurrencyLimit(queue: RetrieveQueueParam, requestOptions?: ZodFetchOptions) {
+    const type = typeof queue === "string" ? "id" : queue.type;
+    const value = typeof queue === "string" ? queue : queue.name;
+
+    // Explicitly encode slashes before encoding the rest of the string
+    const encodedValue = encodeURIComponent(value.replace(/\//g, "%2F"));
+
+    return zodfetch(
+      QueueItem,
+      `${this.baseUrl}/api/v1/queues/${encodedValue}/concurrency/reset`,
+      {
+        method: "POST",
+        headers: this.#getHeaders(false),
+        body: JSON.stringify({
+          type,
+        }),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
+  }
+
   subscribeToRun<TRunTypes extends AnyRunTypes>(
     runId: string,
     options?: {
@@ -960,21 +1272,117 @@ export class ApiClient {
     );
   }
 
+  listDeployments(options?: ApiDeploymentListOptions, requestOptions?: ZodFetchOptions) {
+    const searchParams = new URLSearchParams();
+
+    if (options?.status) {
+      searchParams.append("status", options.status);
+    }
+
+    if (options?.period) {
+      searchParams.append("period", options.period);
+    }
+
+    if (options?.from) {
+      searchParams.append("from", options.from);
+    }
+
+    if (options?.to) {
+      searchParams.append("to", options.to);
+    }
+
+    return zodfetchCursorPage(
+      ApiDeploymentListResponseItem,
+      `${this.baseUrl}/api/v1/deployments`,
+      {
+        query: searchParams,
+        after: options?.cursor,
+        limit: options?.limit,
+      },
+      {
+        method: "GET",
+        headers: this.#getHeaders(false),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
+  }
+
   async fetchStream<T>(
     runId: string,
     streamKey: string,
-    options?: { signal?: AbortSignal; baseUrl?: string }
+    options?: {
+      signal?: AbortSignal;
+      baseUrl?: string;
+      timeoutInSeconds?: number;
+      onComplete?: () => void;
+      onError?: (error: Error) => void;
+      lastEventId?: string;
+    }
   ): Promise<AsyncIterableStream<T>> {
     const streamFactory = new SSEStreamSubscriptionFactory(options?.baseUrl ?? this.baseUrl, {
       headers: this.getHeaders(),
       signal: options?.signal,
     });
 
-    const subscription = streamFactory.createSubscription(runId, streamKey);
+    const subscription = streamFactory.createSubscription(runId, streamKey, {
+      onComplete: options?.onComplete,
+      onError: options?.onError,
+      timeoutInSeconds: options?.timeoutInSeconds,
+      lastEventId: options?.lastEventId,
+    });
 
     const stream = await subscription.subscribe();
 
-    return stream as AsyncIterableStream<T>;
+    return stream.pipeThrough(
+      new TransformStream<SSEStreamPart, T>({
+        transform(chunk, controller) {
+          controller.enqueue(chunk.chunk as T);
+        },
+      })
+    );
+  }
+
+  async createStream(
+    runId: string,
+    target: string,
+    streamId: string,
+    requestOptions?: ZodFetchOptions
+  ) {
+    return zodfetch(
+      CreateStreamResponseBody,
+      `${this.baseUrl}/realtime/v1/streams/${runId}/${target}/${streamId}`,
+      {
+        method: "PUT",
+        headers: this.#getHeaders(false),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    )
+      .withResponse()
+      .then(async ({ data, response }) => {
+        return {
+          ...data,
+          headers: Object.fromEntries(response.headers.entries()),
+        };
+      });
+  }
+
+  async appendToStream<TBody extends BodyInit>(
+    runId: string,
+    target: string,
+    streamId: string,
+    part: TBody,
+    requestOptions?: ZodFetchOptions
+  ) {
+    return zodfetch(
+      AppendToStreamResponseBody,
+      `${this.baseUrl}/realtime/v1/streams/${runId}/${target}/${streamId}/append`,
+      {
+        method: "POST",
+        headers: this.#getHeaders(false),
+        body: part,
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
   }
 
   async generateJWTClaims(requestOptions?: ZodFetchOptions): Promise<Record<string, any>> {
@@ -1001,6 +1409,38 @@ export class ApiClient {
     );
   }
 
+  async executeQuery(
+    query: string,
+    options?: {
+      scope?: "environment" | "project" | "organization";
+      period?: string;
+      from?: string;
+      to?: string;
+      format?: "json" | "csv";
+    },
+    requestOptions?: ZodFetchOptions
+  ): Promise<QueryExecuteResponseBody> {
+    const body = {
+      query,
+      scope: options?.scope ?? "environment",
+      period: options?.period,
+      from: options?.from,
+      to: options?.to,
+      format: options?.format ?? "json",
+    };
+
+    return zodfetch(
+      QueryExecuteResponseBody,
+      `${this.baseUrl}/api/v1/query`,
+      {
+        method: "POST",
+        headers: this.#getHeaders(false),
+        body: JSON.stringify(body),
+      },
+      mergeRequestOptions(this.defaultRequestOptions, requestOptions)
+    );
+  }
+
   #getHeaders(spanParentAsLink: boolean, additionalHeaders?: Record<string, string | undefined>) {
     const headers: Record<string, string> = {
       "Content-Type": "application/json",
@@ -1039,6 +1479,20 @@ export class ApiClient {
 
     headers[API_VERSION_HEADER_NAME] = API_VERSION;
 
+    const streamFlag = this.futureFlags.v2RealtimeStreams ?? true;
+
+    if (
+      streamFlag === false ||
+      getEnvVar("TRIGGER_V2_REALTIME_STREAMS") === "0" ||
+      getEnvVar("TRIGGER_V2_REALTIME_STREAMS") === "false" ||
+      getEnvVar("TRIGGER_REALTIME_STREAMS_V2") === "0" ||
+      getEnvVar("TRIGGER_REALTIME_STREAMS_V2") === "false"
+    ) {
+      headers["x-trigger-realtime-streams-version"] = "v1";
+    } else {
+      headers["x-trigger-realtime-streams-version"] = "v2";
+    }
+
     return headers;
   }
 
@@ -1223,6 +1677,166 @@ function createSearchQueryForListWaitpointTokens(
   return searchParams;
 }
 
+// ============================================================================
+// Stream Batch Items Retry Helpers
+// ============================================================================
+
+/**
+ * Default retry options for streaming batch items.
+ * Uses higher values than the default zodfetch retry since batch operations
+ * are more expensive to repeat from scratch.
+ */
+const DEFAULT_STREAM_BATCH_RETRY_OPTIONS: RetryOptions = {
+  maxAttempts: 5,
+  factor: 2,
+  minTimeoutInMs: 1000,
+  maxTimeoutInMs: 30_000,
+  randomize: true,
+};
+
+type ShouldRetryResult = { retry: false } | { retry: true; delay: number };
+
+/**
+ * Determines if a failed stream batch items request should be retried.
+ * Follows similar logic to zodfetch's shouldRetry but specific to batch streaming.
+ */
+function shouldRetryStreamBatchItems(
+  response: Response,
+  attempt: number,
+  retryOptions: RetryOptions
+): ShouldRetryResult {
+  function shouldRetryForOptions(): ShouldRetryResult {
+    const delay = calculateNextRetryDelay(retryOptions, attempt);
+    if (delay) {
+      return { retry: true, delay };
+    }
+    return { retry: false };
+  }
+
+  // Check x-should-retry header - server can explicitly control retry behavior
+  const shouldRetryHeader = response.headers.get("x-should-retry");
+  if (shouldRetryHeader === "true") return shouldRetryForOptions();
+  if (shouldRetryHeader === "false") return { retry: false };
+
+  // Retry on request timeouts
+  if (response.status === 408) return shouldRetryForOptions();
+
+  // Retry on lock timeouts
+  if (response.status === 409) return shouldRetryForOptions();
+
+  // Retry on rate limits with special handling for Retry-After
+  if (response.status === 429) {
+    if (attempt >= retryOptions.maxAttempts!) {
+      return { retry: false };
+    }
+
+    // x-ratelimit-reset is the unix timestamp in milliseconds when the rate limit will reset
+    const resetAtUnixEpochMs = response.headers.get("x-ratelimit-reset");
+    if (resetAtUnixEpochMs) {
+      const resetAtUnixEpoch = parseInt(resetAtUnixEpochMs, 10);
+      const delay = resetAtUnixEpoch - Date.now() + Math.floor(Math.random() * 1000);
+      if (delay > 0) {
+        return { retry: true, delay };
+      }
+    }
+
+    // Fall back to Retry-After header (seconds)
+    const retryAfter = response.headers.get("retry-after");
+    if (retryAfter) {
+      const retryAfterSeconds = parseInt(retryAfter, 10);
+      if (!isNaN(retryAfterSeconds)) {
+        return { retry: true, delay: retryAfterSeconds * 1000 };
+      }
+    }
+
+    return shouldRetryForOptions();
+  }
+
+  // Retry on server errors (5xx)
+  if (response.status >= 500) return shouldRetryForOptions();
+
+  // Don't retry client errors (4xx) except those handled above
+  return { retry: false };
+}
+
+/**
+ * Simple sleep utility for retry delays.
+ */
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/**
+ * Safely cancels a ReadableStream, handling the case where it might be locked.
+ *
+ * When fetch uses a ReadableStream as a request body and an error occurs mid-transfer
+ * (connection reset, timeout, etc.), the stream may remain locked by fetch's internal reader.
+ * Attempting to cancel a locked stream throws "Invalid state: ReadableStream is locked".
+ *
+ * This function gracefully handles that case by catching the error and doing nothing -
+ * the stream will be cleaned up by garbage collection when the reader is released.
+ */
+async function safeStreamCancel(stream: ReadableStream<unknown>): Promise<void> {
+  try {
+    await stream.cancel();
+  } catch (error) {
+    // Ignore "locked" errors - the stream will be cleaned up when the reader is released.
+    // This happens when fetch crashes mid-read and doesn't release the reader lock.
+    if (error instanceof TypeError && String(error).includes("locked")) {
+      return;
+    }
+    // Re-throw unexpected errors
+    throw error;
+  }
+}
+
+// ============================================================================
+// NDJSON Stream Helpers
+// ============================================================================
+
+/**
+ * Creates a ReadableStream that emits NDJSON (newline-delimited JSON) from items.
+ * Handles both arrays and async iterables for streaming large batches.
+ */
+function createNdjsonStream(
+  items: BatchItemNDJSON[] | AsyncIterable<BatchItemNDJSON>
+): ReadableStream<Uint8Array> {
+  const encoder = new TextEncoder();
+
+  // Check if items is an array
+  if (Array.isArray(items)) {
+    let index = 0;
+    return new ReadableStream({
+      pull(controller) {
+        if (index >= items.length) {
+          controller.close();
+          return;
+        }
+
+        const item = items[index++];
+        const line = JSON.stringify(item) + "\n";
+        controller.enqueue(encoder.encode(line));
+      },
+    });
+  }
+
+  // Handle async iterable
+  const iterator = items[Symbol.asyncIterator]();
+  return new ReadableStream({
+    async pull(controller) {
+      const { value, done } = await iterator.next();
+
+      if (done) {
+        controller.close();
+        return;
+      }
+
+      const line = JSON.stringify(value) + "\n";
+      controller.enqueue(encoder.encode(line));
+    },
+  });
+}
+
 export function mergeRequestOptions(
   defaultOptions: AnyZodFetchOptions,
   options?: ApiRequestOptions
diff --git a/packages/core/src/v3/apiClient/runStream.ts b/packages/core/src/v3/apiClient/runStream.ts
index 43478af33f7..520ecd8dc2b 100644
--- a/packages/core/src/v3/apiClient/runStream.ts
+++ b/packages/core/src/v3/apiClient/runStream.ts
@@ -1,12 +1,12 @@
-import { EventSourceParserStream } from "eventsource-parser/stream";
+import { EventSourceMessage, EventSourceParserStream } from "eventsource-parser/stream";
 import { DeserializedJson } from "../../schemas/json.js";
 import { createJsonErrorObject } from "../errors.js";
-import {
-  RunStatus,
-  SubscribeRealtimeStreamChunkRawShape,
-  SubscribeRunRawShape,
-} from "../schemas/api.js";
+import { RunStatus, SubscribeRunRawShape } from "../schemas/api.js";
 import { SerializedError } from "../schemas/common.js";
+import {
+  AsyncIterableStream,
+  createAsyncIterableReadable,
+} from "../streams/asyncIterableStream.js";
 import { AnyRunTypes, AnyTask, InferRunTypes } from "../types/tasks.js";
 import { getEnvVar } from "../utils/getEnv.js";
 import {
@@ -16,11 +16,7 @@ import {
 } from "../utils/ioSerialization.js";
 import { ApiError } from "./errors.js";
 import { ApiClient } from "./index.js";
-import { LineTransformStream, zodShapeStream } from "./stream.js";
-import {
-  AsyncIterableStream,
-  createAsyncIterableReadable,
-} from "../streams/asyncIterableStream.js";
+import { zodShapeStream } from "./stream.js";
 
 export type RunShape<TRunTypes extends AnyRunTypes> = TRunTypes extends AnyRunTypes
   ? {
@@ -52,6 +48,7 @@ export type RunShape<TRunTypes extends AnyRunTypes> = TRunTypes extends AnyRunTy
       isFailed: boolean;
       isSuccess: boolean;
       isCancelled: boolean;
+      realtimeStreams: string[];
     }
   : never;
 
@@ -156,97 +153,260 @@ export function runShapeStream<TRunTypes extends AnyRunTypes>(
 
 // First, define interfaces for the stream handling
 export interface StreamSubscription {
-  subscribe(): Promise<ReadableStream<unknown>>;
+  subscribe(): Promise<ReadableStream<SSEStreamPart<unknown>>>;
 }
 
+export type CreateStreamSubscriptionOptions = {
+  baseUrl?: string;
+  onComplete?: () => void;
+  onError?: (error: Error) => void;
+  timeoutInSeconds?: number;
+  lastEventId?: string;
+};
+
 export interface StreamSubscriptionFactory {
-  createSubscription(runId: string, streamKey: string, baseUrl?: string): StreamSubscription;
+  createSubscription(
+    runId: string,
+    streamKey: string,
+    options?: CreateStreamSubscriptionOptions
+  ): StreamSubscription;
 }
 
+export type SSEStreamPart<TChunk = unknown> = {
+  id: string;
+  chunk: TChunk;
+  timestamp: number;
+};
+
 // Real implementation for production
 export class SSEStreamSubscription implements StreamSubscription {
+  private lastEventId: string | undefined;
+  private retryCount = 0;
+  private maxRetries = 5;
+  private retryDelayMs = 1000;
+
   constructor(
     private url: string,
-    private options: { headers?: Record<string, string>; signal?: AbortSignal }
-  ) {}
+    private options: {
+      headers?: Record<string, string>;
+      signal?: AbortSignal;
+      onComplete?: () => void;
+      onError?: (error: Error) => void;
+      timeoutInSeconds?: number;
+      lastEventId?: string;
+    }
+  ) {
+    this.lastEventId = options.lastEventId;
+  }
+
+  async subscribe(): Promise<ReadableStream<SSEStreamPart>> {
+    const self = this;
+
+    return new ReadableStream({
+      async start(controller) {
+        await self.connectStream(controller);
+      },
+      cancel(reason) {
+        self.options.onComplete?.();
+      },
+    });
+  }
 
-  async subscribe(): Promise<ReadableStream<unknown>> {
-    return fetch(this.url, {
-      headers: {
+  private async connectStream(
+    controller: ReadableStreamDefaultController<SSEStreamPart>
+  ): Promise<void> {
+    try {
+      const headers: Record<string, string> = {
         Accept: "text/event-stream",
         ...this.options.headers,
-      },
-      signal: this.options.signal,
-    }).then((response) => {
+      };
+
+      // Include Last-Event-ID header if we're resuming
+      if (this.lastEventId) {
+        headers["Last-Event-ID"] = this.lastEventId;
+      }
+
+      if (this.options.timeoutInSeconds) {
+        headers["Timeout-Seconds"] = this.options.timeoutInSeconds.toString();
+      }
+
+      const response = await fetch(this.url, {
+        headers,
+        signal: this.options.signal,
+      });
+
       if (!response.ok) {
-        throw ApiError.generate(
+        const error = ApiError.generate(
           response.status,
           {},
           "Could not subscribe to stream",
           Object.fromEntries(response.headers)
         );
+
+        this.options.onError?.(error);
+        throw error;
       }
 
       if (!response.body) {
-        throw new Error("No response body");
+        const error = new Error("No response body");
+
+        this.options.onError?.(error);
+        throw error;
       }
 
-      return response.body
+      const streamVersion = response.headers.get("X-Stream-Version") ?? "v1";
+
+      // Reset retry count on successful connection
+      this.retryCount = 0;
+
+      const seenIds = new Set<string>();
+
+      const stream = response.body
         .pipeThrough(new TextDecoderStream())
         .pipeThrough(new EventSourceParserStream())
         .pipeThrough(
-          new TransformStream({
-            transform(chunk, controller) {
-              controller.enqueue(safeParseJSON(chunk.data));
+          new TransformStream<EventSourceMessage, SSEStreamPart>({
+            transform: (chunk, chunkController) => {
+              if (streamVersion === "v1") {
+                // Track the last event ID for resume support
+                if (chunk.id) {
+                  this.lastEventId = chunk.id;
+                }
+
+                const timestamp = parseRedisStreamIdTimestamp(chunk.id);
+
+                chunkController.enqueue({
+                  id: chunk.id ?? "unknown",
+                  chunk: safeParseJSON(chunk.data),
+                  timestamp,
+                });
+              } else {
+                if (chunk.event === "batch") {
+                  const data = safeParseJSON(chunk.data) as {
+                    records: Array<{ body: string; seq_num: number; timestamp: number }>;
+                  };
+
+                  for (const record of data.records) {
+                    this.lastEventId = record.seq_num.toString();
+
+                    const parsedBody = safeParseJSON(record.body) as { data: unknown; id: string };
+                    if (seenIds.has(parsedBody.id)) {
+                      continue;
+                    }
+                    seenIds.add(parsedBody.id);
+
+                    chunkController.enqueue({
+                      id: record.seq_num.toString(),
+                      chunk: parsedBody.data,
+                      timestamp: record.timestamp,
+                    });
+                  }
+                }
+              }
             },
           })
         );
-    });
+
+      const reader = stream.getReader();
+
+      try {
+        let chunkCount = 0;
+        while (true) {
+          const { done, value } = await reader.read();
+
+          if (done) {
+            reader.releaseLock();
+            controller.close();
+            this.options.onComplete?.();
+            return;
+          }
+
+          if (this.options.signal?.aborted) {
+            reader.cancel();
+            reader.releaseLock();
+            controller.close();
+            this.options.onComplete?.();
+            return;
+          }
+
+          chunkCount++;
+          controller.enqueue(value);
+        }
+      } catch (error) {
+        reader.releaseLock();
+        throw error;
+      }
+    } catch (error) {
+      if (this.options.signal?.aborted) {
+        // Don't retry if aborted
+        controller.close();
+        this.options.onComplete?.();
+        return;
+      }
+
+      // Retry on error
+      await this.retryConnection(controller, error as Error);
+    }
+  }
+
+  private async retryConnection(
+    controller: ReadableStreamDefaultController,
+    error?: Error
+  ): Promise<void> {
+    if (this.options.signal?.aborted) {
+      controller.close();
+      this.options.onComplete?.();
+      return;
+    }
+
+    if (this.retryCount >= this.maxRetries) {
+      const finalError = error || new Error("Max retries reached");
+      controller.error(finalError);
+      this.options.onError?.(finalError);
+      return;
+    }
+
+    this.retryCount++;
+    const delay = this.retryDelayMs * Math.pow(2, this.retryCount - 1);
+
+    // Wait before retrying
+    await new Promise((resolve) => setTimeout(resolve, delay));
+
+    if (this.options.signal?.aborted) {
+      controller.close();
+      this.options.onComplete?.();
+      return;
+    }
+
+    // Reconnect
+    await this.connectStream(controller);
   }
 }
 
 export class SSEStreamSubscriptionFactory implements StreamSubscriptionFactory {
   constructor(
     private baseUrl: string,
-    private options: { headers?: Record<string, string>; signal?: AbortSignal }
+    private options: {
+      headers?: Record<string, string>;
+      signal?: AbortSignal;
+    }
   ) {}
 
-  createSubscription(runId: string, streamKey: string, baseUrl?: string): StreamSubscription {
+  createSubscription(
+    runId: string,
+    streamKey: string,
+    options?: CreateStreamSubscriptionOptions
+  ): StreamSubscription {
     if (!runId || !streamKey) {
       throw new Error("runId and streamKey are required");
     }
 
-    const url = `${baseUrl ?? this.baseUrl}/realtime/v1/streams/${runId}/${streamKey}`;
-    return new SSEStreamSubscription(url, this.options);
-  }
-}
+    const url = `${options?.baseUrl ?? this.baseUrl}/realtime/v1/streams/${runId}/${streamKey}`;
 
-// Real implementation for production
-export class ElectricStreamSubscription implements StreamSubscription {
-  constructor(
-    private url: string,
-    private options: { headers?: Record<string, string>; signal?: AbortSignal }
-  ) {}
-
-  async subscribe(): Promise<ReadableStream<unknown>> {
-    return zodShapeStream(SubscribeRealtimeStreamChunkRawShape, this.url, this.options)
-      .stream.pipeThrough(
-        new TransformStream({
-          transform(chunk, controller) {
-            controller.enqueue(chunk.value);
-          },
-        })
-      )
-      .pipeThrough(new LineTransformStream())
-      .pipeThrough(
-        new TransformStream({
-          transform(chunk, controller) {
-            for (const line of chunk) {
-              controller.enqueue(safeParseJSON(line));
-            }
-          },
-        })
-      );
+    return new SSEStreamSubscription(url, {
+      ...this.options,
+      ...options,
+    });
   }
 }
 
@@ -325,13 +485,11 @@ export class RunSubscription<TRunTypes extends AnyRunTypes> {
             run,
           });
 
+          const streams = getStreamsFromRunShape(run);
+
           // Check for stream metadata
-          if (
-            run.metadata &&
-            "$$streams" in run.metadata &&
-            Array.isArray(run.metadata.$$streams)
-          ) {
-            for (const streamKey of run.metadata.$$streams) {
+          if (streams.length > 0) {
+            for (const streamKey of streams) {
               if (typeof streamKey !== "string") {
                 continue;
               }
@@ -342,39 +500,33 @@ export class RunSubscription<TRunTypes extends AnyRunTypes> {
                 const subscription = this.options.streamFactory.createSubscription(
                   run.id,
                   streamKey,
-                  this.options.client?.baseUrl
+                  {
+                    baseUrl: this.options.client?.baseUrl,
+                  }
                 );
 
                 // Start stream processing in the background
-                subscription
-                  .subscribe()
-                  .then((stream) => {
-                    stream
-                      .pipeThrough(
-                        new TransformStream({
-                          transform(chunk, controller) {
-                            controller.enqueue({
-                              type: streamKey,
-                              chunk: chunk as TStreams[typeof streamKey],
-                              run,
-                            });
-                          },
-                        })
-                      )
-                      .pipeTo(
-                        new WritableStream({
-                          write(chunk) {
-                            controller.enqueue(chunk);
-                          },
-                        })
-                      )
-                      .catch((error) => {
-                        console.error(`Error in stream ${streamKey}:`, error);
-                      });
-                  })
-                  .catch((error) => {
-                    console.error(`Error subscribing to stream ${streamKey}:`, error);
-                  });
+                subscription.subscribe().then((stream) => {
+                  stream
+                    .pipeThrough(
+                      new TransformStream({
+                        transform(chunk, controller) {
+                          controller.enqueue({
+                            type: streamKey,
+                            chunk: chunk.chunk as TStreams[typeof streamKey],
+                            run,
+                          });
+                        },
+                      })
+                    )
+                    .pipeTo(
+                      new WritableStream({
+                        write(chunk) {
+                          controller.enqueue(chunk);
+                        },
+                      })
+                    );
+                });
               }
             }
           }
@@ -443,6 +595,7 @@ export class RunSubscription<TRunTypes extends AnyRunTypes> {
       error: row.error ? createJsonErrorObject(row.error) : undefined,
       isTest: row.isTest ?? false,
       metadata,
+      realtimeStreams: row.realtimeStreams ?? [],
       ...booleanHelpersFromRunStatus(status),
     } as RunShape<TRunTypes>;
   }
@@ -593,3 +746,34 @@ if (isSafari()) {
   // @ts-ignore-error
   ReadableStream.prototype[Symbol.asyncIterator] ??= ReadableStream.prototype.values;
 }
+
+function getStreamsFromRunShape(run: AnyRunShape): string[] {
+  const metadataStreams =
+    run.metadata &&
+    "$$streams" in run.metadata &&
+    Array.isArray(run.metadata.$$streams) &&
+    run.metadata.$$streams.length > 0 &&
+    run.metadata.$$streams.every((stream) => typeof stream === "string")
+      ? run.metadata.$$streams
+      : undefined;
+
+  if (metadataStreams) {
+    return metadataStreams;
+  }
+
+  return run.realtimeStreams;
+}
+
+// Redis stream IDs are in the format: <timestamp>-<sequence>
+function parseRedisStreamIdTimestamp(id?: string): number {
+  if (!id) {
+    return Date.now();
+  }
+
+  const timestamp = parseInt(id.split("-")[0] as string, 10);
+  if (isNaN(timestamp)) {
+    return Date.now();
+  }
+
+  return timestamp;
+}
diff --git a/packages/core/src/v3/apiClient/streamBatchItems.test.ts b/packages/core/src/v3/apiClient/streamBatchItems.test.ts
new file mode 100644
index 00000000000..23a42b57329
--- /dev/null
+++ b/packages/core/src/v3/apiClient/streamBatchItems.test.ts
@@ -0,0 +1,515 @@
+import { describe, it, expect, vi, afterEach } from "vitest";
+import { ApiClient } from "./index.js";
+import { BatchNotSealedError } from "./errors.js";
+
+vi.setConfig({ testTimeout: 10_000 });
+
+describe("streamBatchItems unsealed handling", () => {
+  const originalFetch = globalThis.fetch;
+
+  afterEach(() => {
+    globalThis.fetch = originalFetch;
+    vi.restoreAllMocks();
+  });
+
+  /**
+   * Helper to create a mock fetch that properly consumes the request body stream.
+   * This is necessary because streamBatchItems sends a ReadableStream body.
+   * Important: We must release the reader lock after consuming, just like real fetch does.
+   */
+  function createMockFetch(
+    responses: Array<{
+      id: string;
+      itemsAccepted: number;
+      itemsDeduplicated: number;
+      sealed: boolean;
+      enqueuedCount?: number;
+      expectedCount?: number;
+    }>
+  ) {
+    let callIndex = 0;
+    return vi.fn().mockImplementation(async (_url: string, init?: RequestInit) => {
+      // Consume the request body stream to prevent hanging
+      if (init?.body && init.body instanceof ReadableStream) {
+        const reader = init.body.getReader();
+        // Drain the stream
+        try {
+          while (true) {
+            const { done } = await reader.read();
+            if (done) break;
+          }
+        } finally {
+          // Release the lock so the stream can be cancelled later (like real fetch does)
+          reader.releaseLock();
+        }
+      }
+
+      const responseData = responses[Math.min(callIndex, responses.length - 1)];
+      callIndex++;
+
+      return {
+        ok: true,
+        json: () => Promise.resolve(responseData),
+      };
+    });
+  }
+
+  it("throws BatchNotSealedError when sealed=false after retries exhausted", async () => {
+    const mockFetch = createMockFetch([
+      {
+        id: "batch_test123",
+        itemsAccepted: 5,
+        itemsDeduplicated: 0,
+        sealed: false,
+        enqueuedCount: 5,
+        expectedCount: 10,
+      },
+    ]);
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const error = await client
+      .streamBatchItems("batch_test123", [{ index: 0, task: "test-task", payload: "{}" }], {
+        retry: { maxAttempts: 2, minTimeoutInMs: 10, maxTimeoutInMs: 50 },
+      })
+      .catch((e) => e);
+
+    expect(error).toBeInstanceOf(BatchNotSealedError);
+    expect((error as BatchNotSealedError).batchId).toBe("batch_test123");
+    expect((error as BatchNotSealedError).enqueuedCount).toBe(5);
+    expect((error as BatchNotSealedError).expectedCount).toBe(10);
+    expect((error as BatchNotSealedError).itemsAccepted).toBe(5);
+    expect((error as BatchNotSealedError).itemsDeduplicated).toBe(0);
+
+    // Should have retried (2 attempts total based on maxAttempts)
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+  });
+
+  it("retries when sealed=false and succeeds when sealed=true on retry", async () => {
+    const mockFetch = createMockFetch([
+      // First response: not sealed
+      {
+        id: "batch_test123",
+        itemsAccepted: 5,
+        itemsDeduplicated: 0,
+        sealed: false,
+        enqueuedCount: 5,
+        expectedCount: 10,
+      },
+      // Second response: sealed
+      {
+        id: "batch_test123",
+        itemsAccepted: 5,
+        itemsDeduplicated: 0,
+        sealed: true,
+      },
+    ]);
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const result = await client.streamBatchItems(
+      "batch_test123",
+      [{ index: 0, task: "test-task", payload: "{}" }],
+      { retry: { maxAttempts: 3, minTimeoutInMs: 10, maxTimeoutInMs: 50 } }
+    );
+
+    expect(result.sealed).toBe(true);
+    // Should have been called twice (first unsealed, second sealed)
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+  });
+
+  it("succeeds immediately when sealed=true on first attempt", async () => {
+    const mockFetch = createMockFetch([
+      {
+        id: "batch_test123",
+        itemsAccepted: 10,
+        itemsDeduplicated: 0,
+        sealed: true,
+      },
+    ]);
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const result = await client.streamBatchItems("batch_test123", [
+      { index: 0, task: "test-task", payload: "{}" },
+    ]);
+
+    expect(result.sealed).toBe(true);
+    expect(result.itemsAccepted).toBe(10);
+    // Should only be called once
+    expect(mockFetch).toHaveBeenCalledTimes(1);
+  });
+
+  it("BatchNotSealedError has descriptive message", async () => {
+    const mockFetch = createMockFetch([
+      {
+        id: "batch_abc123",
+        itemsAccepted: 7,
+        itemsDeduplicated: 2,
+        sealed: false,
+        enqueuedCount: 9,
+        expectedCount: 15,
+      },
+    ]);
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const error = await client
+      .streamBatchItems("batch_abc123", [{ index: 0, task: "test-task", payload: "{}" }], {
+        retry: { maxAttempts: 1, minTimeoutInMs: 10, maxTimeoutInMs: 50 },
+      })
+      .catch((e) => e);
+
+    expect(error).toBeInstanceOf(BatchNotSealedError);
+    expect(error.message).toContain("batch_abc123");
+    expect(error.message).toContain("9 of 15");
+    expect(error.message).toContain("accepted: 7");
+    expect(error.message).toContain("deduplicated: 2");
+  });
+
+  it("handles missing enqueuedCount and expectedCount gracefully", async () => {
+    // Simulate older server response that might not include these fields
+    const mockFetch = createMockFetch([
+      {
+        id: "batch_test123",
+        itemsAccepted: 5,
+        itemsDeduplicated: 0,
+        sealed: false,
+        // No enqueuedCount or expectedCount
+      },
+    ]);
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const error = await client
+      .streamBatchItems("batch_test123", [{ index: 0, task: "test-task", payload: "{}" }], {
+        retry: { maxAttempts: 1, minTimeoutInMs: 10, maxTimeoutInMs: 50 },
+      })
+      .catch((e) => e);
+
+    expect(error).toBeInstanceOf(BatchNotSealedError);
+    // Should default to 0 when not provided
+    expect((error as BatchNotSealedError).enqueuedCount).toBe(0);
+    expect((error as BatchNotSealedError).expectedCount).toBe(0);
+  });
+});
+
+describe("streamBatchItems stream cancellation on retry", () => {
+  const originalFetch = globalThis.fetch;
+
+  afterEach(() => {
+    globalThis.fetch = originalFetch;
+    vi.restoreAllMocks();
+  });
+
+  /**
+   * Helper to consume a stream and release the lock (simulating fetch behavior).
+   */
+  async function consumeAndRelease(stream: ReadableStream<any>) {
+    const reader = stream.getReader();
+    try {
+      while (true) {
+        const { done } = await reader.read();
+        if (done) break;
+      }
+    } finally {
+      reader.releaseLock();
+    }
+  }
+
+  it("cancels forRequest stream when retrying due to HTTP error", async () => {
+    // Track cancel calls
+    let cancelCallCount = 0;
+    let callIndex = 0;
+
+    const mockFetch = vi.fn().mockImplementation(async (_url: string, init?: RequestInit) => {
+      const currentAttempt = callIndex;
+      callIndex++;
+
+      if (init?.body && init.body instanceof ReadableStream) {
+        const originalCancel = init.body.cancel.bind(init.body);
+        init.body.cancel = async (reason?: any) => {
+          cancelCallCount++;
+          return originalCancel(reason);
+        };
+
+        // Consume stream and release lock (like real fetch does)
+        await consumeAndRelease(init.body);
+      }
+
+      // First attempt: return 500 error (retryable)
+      if (currentAttempt === 0) {
+        return {
+          ok: false,
+          status: 500,
+          text: () => Promise.resolve("Server error"),
+          headers: new Headers(),
+        };
+      }
+
+      // Second attempt: success
+      return {
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            id: "batch_test123",
+            itemsAccepted: 10,
+            itemsDeduplicated: 0,
+            sealed: true,
+          }),
+      };
+    });
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const result = await client.streamBatchItems(
+      "batch_test123",
+      [{ index: 0, task: "test-task", payload: "{}" }],
+      { retry: { maxAttempts: 3, minTimeoutInMs: 10, maxTimeoutInMs: 50 } }
+    );
+
+    expect(result.sealed).toBe(true);
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+    // forRequest should be cancelled once (before first retry)
+    // forRetry should be cancelled once (after success)
+    // Total: 2 cancel calls
+    expect(cancelCallCount).toBeGreaterThanOrEqual(1);
+  });
+
+  it("cancels forRequest stream when retrying due to batch not sealed", async () => {
+    let cancelCallCount = 0;
+    let callIndex = 0;
+
+    const mockFetch = vi.fn().mockImplementation(async (_url: string, init?: RequestInit) => {
+      const currentAttempt = callIndex;
+      callIndex++;
+
+      if (init?.body && init.body instanceof ReadableStream) {
+        const originalCancel = init.body.cancel.bind(init.body);
+        init.body.cancel = async (reason?: any) => {
+          cancelCallCount++;
+          return originalCancel(reason);
+        };
+
+        await consumeAndRelease(init.body);
+      }
+
+      // First attempt: not sealed (triggers retry)
+      if (currentAttempt === 0) {
+        return {
+          ok: true,
+          json: () =>
+            Promise.resolve({
+              id: "batch_test123",
+              itemsAccepted: 5,
+              itemsDeduplicated: 0,
+              sealed: false,
+              enqueuedCount: 5,
+              expectedCount: 10,
+            }),
+        };
+      }
+
+      // Second attempt: sealed
+      return {
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            id: "batch_test123",
+            itemsAccepted: 5,
+            itemsDeduplicated: 5,
+            sealed: true,
+          }),
+      };
+    });
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const result = await client.streamBatchItems(
+      "batch_test123",
+      [{ index: 0, task: "test-task", payload: "{}" }],
+      { retry: { maxAttempts: 3, minTimeoutInMs: 10, maxTimeoutInMs: 50 } }
+    );
+
+    expect(result.sealed).toBe(true);
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+    // forRequest cancelled before retry + forRetry cancelled after success
+    expect(cancelCallCount).toBeGreaterThanOrEqual(1);
+  });
+
+  it("cancels forRequest stream when retrying due to connection error", async () => {
+    let cancelCallCount = 0;
+    let callIndex = 0;
+
+    const mockFetch = vi.fn().mockImplementation(async (_url: string, init?: RequestInit) => {
+      const currentAttempt = callIndex;
+      callIndex++;
+
+      if (init?.body && init.body instanceof ReadableStream) {
+        const originalCancel = init.body.cancel.bind(init.body);
+        init.body.cancel = async (reason?: any) => {
+          cancelCallCount++;
+          return originalCancel(reason);
+        };
+
+        // Always consume and release - even for error case
+        // This simulates what happens when fetch partially reads before failing
+        // The important thing is the stream lock is released so cancel() can work
+        await consumeAndRelease(init.body);
+      }
+
+      // First attempt: connection error (simulate by throwing after consuming)
+      if (currentAttempt === 0) {
+        throw new TypeError("Failed to fetch");
+      }
+
+      // Second attempt: success
+      return {
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            id: "batch_test123",
+            itemsAccepted: 10,
+            itemsDeduplicated: 0,
+            sealed: true,
+          }),
+      };
+    });
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const result = await client.streamBatchItems(
+      "batch_test123",
+      [{ index: 0, task: "test-task", payload: "{}" }],
+      { retry: { maxAttempts: 3, minTimeoutInMs: 10, maxTimeoutInMs: 50 } }
+    );
+
+    expect(result.sealed).toBe(true);
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+    // forRequest should be cancelled before retry
+    expect(cancelCallCount).toBeGreaterThanOrEqual(1);
+  });
+
+  it("handles locked stream when connection error occurs mid-read", async () => {
+    // This test simulates the real-world scenario where fetch throws an error
+    // while still holding the reader lock on the request body stream.
+    // This can happen with connection resets, timeouts, or network failures.
+    let callIndex = 0;
+
+    const mockFetch = vi.fn().mockImplementation(async (_url: string, init?: RequestInit) => {
+      const currentAttempt = callIndex;
+      callIndex++;
+
+      if (init?.body && init.body instanceof ReadableStream) {
+        if (currentAttempt === 0) {
+          // First attempt: Get a reader and start reading, but throw while still holding the lock.
+          // This simulates a connection error that happens mid-transfer.
+          const reader = init.body.getReader();
+          await reader.read(); // Start reading
+          // DON'T release the lock - this simulates fetch crashing mid-read
+          throw new TypeError("Connection reset by peer");
+        }
+
+        // Subsequent attempts: consume and release normally
+        await consumeAndRelease(init.body);
+      }
+
+      // Second attempt: success
+      return {
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            id: "batch_test123",
+            itemsAccepted: 10,
+            itemsDeduplicated: 0,
+            sealed: true,
+          }),
+      };
+    });
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    // This should NOT throw "ReadableStream is locked" error
+    // Instead it should gracefully handle the locked stream and retry
+    const result = await client.streamBatchItems(
+      "batch_test123",
+      [{ index: 0, task: "test-task", payload: "{}" }],
+      { retry: { maxAttempts: 3, minTimeoutInMs: 10, maxTimeoutInMs: 50 } }
+    );
+
+    expect(result.sealed).toBe(true);
+    expect(mockFetch).toHaveBeenCalledTimes(2);
+  });
+
+  it("does not leak memory by leaving tee branches unconsumed during multiple retries", async () => {
+    let cancelCallCount = 0;
+    let callIndex = 0;
+
+    const mockFetch = vi.fn().mockImplementation(async (_url: string, init?: RequestInit) => {
+      const currentAttempt = callIndex;
+      callIndex++;
+
+      if (init?.body && init.body instanceof ReadableStream) {
+        const originalCancel = init.body.cancel.bind(init.body);
+        init.body.cancel = async (reason?: any) => {
+          cancelCallCount++;
+          return originalCancel(reason);
+        };
+
+        await consumeAndRelease(init.body);
+      }
+
+      // First two attempts: not sealed
+      if (currentAttempt < 2) {
+        return {
+          ok: true,
+          json: () =>
+            Promise.resolve({
+              id: "batch_test123",
+              itemsAccepted: 5,
+              itemsDeduplicated: 0,
+              sealed: false,
+              enqueuedCount: 5,
+              expectedCount: 10,
+            }),
+        };
+      }
+
+      // Third attempt: sealed
+      return {
+        ok: true,
+        json: () =>
+          Promise.resolve({
+            id: "batch_test123",
+            itemsAccepted: 5,
+            itemsDeduplicated: 5,
+            sealed: true,
+          }),
+      };
+    });
+    globalThis.fetch = mockFetch;
+
+    const client = new ApiClient("http://localhost:3030", "tr_test_key");
+
+    const result = await client.streamBatchItems(
+      "batch_test123",
+      [{ index: 0, task: "test-task", payload: "{}" }],
+      { retry: { maxAttempts: 5, minTimeoutInMs: 10, maxTimeoutInMs: 50 } }
+    );
+
+    expect(result.sealed).toBe(true);
+    expect(mockFetch).toHaveBeenCalledTimes(3);
+    // Each retry should cancel forRequest, plus final forRetry cancel
+    // With 2 retries: 2 forRequest cancels + 1 forRetry cancel = 3 total
+    expect(cancelCallCount).toBeGreaterThanOrEqual(2);
+  });
+});
diff --git a/packages/core/src/v3/apiClientManager/index.ts b/packages/core/src/v3/apiClientManager/index.ts
index b4e9676fd86..96a4bc8e534 100644
--- a/packages/core/src/v3/apiClientManager/index.ts
+++ b/packages/core/src/v3/apiClientManager/index.ts
@@ -59,15 +59,25 @@ export class APIClientManagerAPI {
       return undefined;
     }
 
-    return new ApiClient(this.baseURL, this.accessToken, this.branchName);
+    const requestOptions = this.#getConfig()?.requestOptions;
+    const futureFlags = this.#getConfig()?.future;
+
+    return new ApiClient(this.baseURL, this.accessToken, this.branchName, requestOptions, futureFlags);
   }
 
-  clientOrThrow(): ApiClient {
-    if (!this.baseURL || !this.accessToken) {
+  clientOrThrow(config?: ApiClientConfiguration): ApiClient {
+    const baseURL = config?.baseURL ?? this.baseURL;
+    const accessToken = config?.accessToken ?? config?.secretKey ?? this.accessToken;
+
+    if (!baseURL || !accessToken) {
       throw new ApiClientMissingError(this.apiClientMissingError());
     }
 
-    return new ApiClient(this.baseURL, this.accessToken, this.branchName);
+    const branchName = config?.previewBranch ?? this.branchName;
+    const requestOptions = config?.requestOptions ?? this.#getConfig()?.requestOptions;
+    const futureFlags = config?.future ?? this.#getConfig()?.future;
+
+    return new ApiClient(baseURL, accessToken, branchName, requestOptions, futureFlags);
   }
 
   runWithConfig<R extends (...args: any[]) => Promise<any>>(
diff --git a/packages/core/src/v3/apiClientManager/types.ts b/packages/core/src/v3/apiClientManager/types.ts
index 2905af6d8e5..8cdb185146d 100644
--- a/packages/core/src/v3/apiClientManager/types.ts
+++ b/packages/core/src/v3/apiClientManager/types.ts
@@ -1,4 +1,4 @@
-import { type ApiRequestOptions } from "../apiClient/index.js";
+import type { ApiClientFutureFlags, ApiRequestOptions } from "../apiClient/index.js";
 
 export type ApiClientConfiguration = {
   baseURL?: string;
@@ -15,4 +15,5 @@ export type ApiClientConfiguration = {
    */
   previewBranch?: string;
   requestOptions?: ApiRequestOptions;
+  future?: ApiClientFutureFlags;
 };
diff --git a/packages/core/src/v3/config.ts b/packages/core/src/v3/config.ts
index 838a464dcf4..bf1e6c687c8 100644
--- a/packages/core/src/v3/config.ts
+++ b/packages/core/src/v3/config.ts
@@ -1,5 +1,6 @@
 import type { Instrumentation } from "@opentelemetry/instrumentation";
 import type { SpanExporter } from "@opentelemetry/sdk-trace-base";
+import type { MetricReader, PushMetricExporter } from "@opentelemetry/sdk-metrics";
 import type { BuildExtension } from "./build/extensions.js";
 import type {
   AnyOnFailureHookFunction,
@@ -12,6 +13,7 @@ import type {
 import type { LogLevel } from "./logger/taskLogger.js";
 import type { MachinePresetName } from "./schemas/common.js";
 import { LogRecordExporter } from "@opentelemetry/sdk-logs";
+import type { Resource } from "@opentelemetry/resources";
 
 export type CompatibilityFlag = "run_engine_v2";
 
@@ -19,6 +21,25 @@ export type CompatibilityFlagFeatures = {
   [key in CompatibilityFlag]: boolean;
 };
 
+type ProcessKeepAlive =
+  | boolean
+  | {
+      enabled: boolean;
+      /**
+       * The maximum number of executions per process. If the process has run more than this number of times, it will be killed.
+       *
+       * @default 50
+       */
+      maxExecutionsPerProcess?: number;
+
+      /**
+       * The maximum number of processes to keep alive in dev.
+       *
+       * @default 25
+       */
+      devMaxPoolSize?: number;
+    };
+
 export type TriggerConfig = {
   /**
    * @default "node"
@@ -88,6 +109,27 @@ export type TriggerConfig = {
      * @see https://trigger.dev/docs/config/config-file#exporters
      */
     logExporters?: Array<LogRecordExporter>;
+
+    /**
+     * Metric exporters to use for OpenTelemetry. This is useful if you want to export metrics to external services.
+     * Each exporter is automatically wrapped in a PeriodicExportingMetricReader.
+     *
+     * For more control over the reader configuration, use `metricReaders` instead.
+     */
+    metricExporters?: Array<PushMetricExporter>;
+
+    /**
+     * Metric readers for OpenTelemetry. Add custom metric readers to export
+     * metrics to external services alongside the default Trigger.dev exporter.
+     */
+    metricReaders?: Array<MetricReader>;
+
+    /**
+     * Resource to use for OpenTelemetry. This is useful if you want to add custom resources to your tasks.
+     *
+     * @see https://trigger.dev/docs/config/config-file#resource
+     */
+    resource?: Resource;
   };
 
   /**
@@ -171,30 +213,43 @@ export type TriggerConfig = {
     external?: string[];
 
     /**
-     * **WARNING: This is an experimental feature and might be removed in a future version.**
+     * This still works but use `autoDetectExternal` instead.
      *
+     * @deprecated (use autoDetectExternal instead)
+     */
+    experimental_autoDetectExternal?: boolean;
+
+    /**
      * Automatically detect dependencies that shouldn't be bundled and mark them as external. For example, native modules.
      *
-     * Turning this on will not affect dependencies that were manually added to the `external` array.
-     *
-     * @default false
+     * Turn this off if you are having issues and want to manually specify all `external` dependencies.
      *
-     * @deprecated (experimental)
+     * @default true
      */
-    experimental_autoDetectExternal?: boolean;
+    autoDetectExternal?: boolean;
 
     /**
-     * **WARNING: This is an experimental feature and might be removed in a future version.**
+     * This still works but use `keepNames` instead.
      *
-     * Preserve the original names of functions and classes in the bundle. This can fix issues with frameworks that rely on the original names for registration and binding, for example MikroORM.
+     * @deprecated (use keepNames instead)
+     */
+    experimental_keepNames?: boolean;
+
+    /* Set to false to minify the original names of functions and classes in the bundle.
+     * This can make bundles smaller at the cost of compatibility with frameworks that rely on function/class/variable names.
      *
      * @link https://esbuild.github.io/api/#keep-names
      *
-     * @default false
+     * @default true
+     */
+    keepNames?: boolean;
+
+    /**
+     * This still works but use `minify` instead.
      *
-     * @deprecated (experimental)
+     * @deprecated (use minify instead)
      */
-    experimental_keepNames?: boolean;
+    experimental_minify?: boolean;
 
     /**
      * **WARNING: This is an experimental feature and might be removed in a future version.**
@@ -206,10 +261,8 @@ export type TriggerConfig = {
      * @link https://esbuild.github.io/api/#minify
      *
      * @default false
-     *
-     * @deprecated (experimental)
      */
-    experimental_minify?: boolean;
+    minify?: boolean;
 
     jsx?: {
       /**
@@ -234,38 +287,31 @@ export type TriggerConfig = {
     env?: Record<string, string>;
   };
 
+  /**
+   * This still works but use `processKeepAlive` instead.
+   *
+   * @deprecated (use processKeepAlive instead)
+   */
+  experimental_processKeepAlive?: ProcessKeepAlive;
+
   /**
    * @default false
    * @description Keep the process alive after the task has finished running so the next task doesn't have to wait for the process to start up again.
    *
    * Note that the process could be killed at any time, and we don't make any guarantees about the process being alive for a certain amount of time
    */
-  experimental_processKeepAlive?:
-    | boolean
-    | {
-        enabled: boolean;
-        /**
-         * The maximum number of executions per process. If the process has run more than this number of times, it will be killed.
-         *
-         * @default 50
-         */
-        maxExecutionsPerProcess?: number;
-
-        /**
-         * The maximum number of processes to keep alive in dev.
-         *
-         * @default 25
-         */
-        devMaxPoolSize?: number;
-      };
+  processKeepAlive?: ProcessKeepAlive;
 
   /**
-   * @default false
-   * @description When running the dev CLI, set the current working directory to the build directory.
+   * @default true
+   * @description If set to true when running the dev CLI, the current working directory will be set to where the command is run from.
+   *
+   * Setting this to `false` will set the current working directory to the build directory.
+   * This more closely matches the behavior of the CLI when running in production and is highly recommended.
    *
-   * Currently, the process.cwd() is set to the root of the project.
+   * This impacts the value of process.cwd() in your task code.
    */
-  experimental_devProcessCwdInBuildDir?: boolean;
+  legacyDevProcessCwdBehaviour?: boolean;
 
   /**
    * @deprecated Use `dirs` instead
@@ -293,7 +339,7 @@ export type TriggerConfig = {
   tsconfigPath?: string;
 
   /**
-   * CA Cert file to be added to NODE_EXTRA_CA_CERT environment variable in, useful in use with self signed cert in the trigger.dev environment.
+   * CA Cert file to be added to NODE_EXTRA_CA_CERT environment variable, useful in use with self signed cert in the trigger.dev environment.
    *
    * @example "./certs/ca.crt"
    * Note: must start with "./" and be relative to the project root.
diff --git a/packages/core/src/v3/errors.ts b/packages/core/src/v3/errors.ts
index b585b938c8e..fd03bf445fb 100644
--- a/packages/core/src/v3/errors.ts
+++ b/packages/core/src/v3/errors.ts
@@ -346,6 +346,34 @@ export function shouldRetryError(error: TaskRunError): boolean {
   }
 }
 
+export function shouldLookupRetrySettings(error: TaskRunError): boolean {
+  switch (error.type) {
+    case "INTERNAL_ERROR": {
+      switch (error.code) {
+        case "TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE":
+        case "TASK_PROCESS_SIGTERM":
+        case "TASK_PROCESS_SIGSEGV":
+          return true;
+
+        default:
+          return false;
+      }
+    }
+    case "STRING_ERROR": {
+      return false;
+    }
+    case "BUILT_IN_ERROR": {
+      return false;
+    }
+    case "CUSTOM_ERROR": {
+      return false;
+    }
+    default: {
+      assertExhaustive(error);
+    }
+  }
+}
+
 export function correctErrorStackTrace(
   stackTrace: string,
   projectDir?: string,
@@ -529,6 +557,17 @@ export class GracefulExitTimeoutError extends Error {
   }
 }
 
+export class MaxDurationExceededError extends Error {
+  constructor(
+    public readonly maxDurationInSeconds: number,
+    public readonly elapsedTimeInSeconds: number
+  ) {
+    super(`Run exceeded maximum compute time (maxDuration) of ${maxDurationInSeconds} seconds`);
+
+    this.name = "MaxDurationExceededError";
+  }
+}
+
 type ErrorLink = {
   name: string;
   href: string;
@@ -542,14 +581,14 @@ const prettyInternalErrors: Partial<
   Record<
     TaskRunInternalError["code"],
     {
-      message: string;
+      message?: string;
       link?: ErrorLink;
     }
   >
 > = {
   TASK_PROCESS_OOM_KILLED: {
     message:
-      "Your task ran out of memory. Try increasing the machine specs. If this doesn't fix it there might be a memory leak.",
+      "Your run was terminated due to exceeding the machine's memory limit. Try increasing the machine preset in your task options or replay using a larger machine.",
     link: {
       name: "Machines",
       href: links.docs.machines.home,
@@ -557,7 +596,7 @@ const prettyInternalErrors: Partial<
   },
   TASK_PROCESS_MAYBE_OOM_KILLED: {
     message:
-      "We think your task ran out of memory, but we can't be certain. If this keeps happening, try increasing the machine specs.",
+      "Your run was terminated due to exceeding the machine's memory limit. Try increasing the machine preset in your task options or replay using a larger machine.",
     link: {
       name: "Machines",
       href: links.docs.machines.home,
@@ -605,6 +644,12 @@ const prettyInternalErrors: Partial<
       href: links.docs.concurrency.recursiveDeadlock,
     },
   },
+  TASK_RUN_STALLED_EXECUTING: {
+    link: {
+      name: "Read our troubleshooting guide",
+      href: links.docs.troubleshooting.stalledExecution,
+    },
+  },
 };
 
 const getPrettyTaskRunError = (code: TaskRunInternalError["code"]): TaskRunInternalError => {
diff --git a/packages/core/src/v3/heartbeats-api.ts b/packages/core/src/v3/heartbeats-api.ts
new file mode 100644
index 00000000000..f0e9a269e5c
--- /dev/null
+++ b/packages/core/src/v3/heartbeats-api.ts
@@ -0,0 +1,5 @@
+// Split module-level variable definition into separate files to allow
+// tree-shaking on each api instance.
+import { HeartbeatsAPI } from "./heartbeats/api.js";
+/** Entrypoint for heartbeats API */
+export const heartbeats = HeartbeatsAPI.getInstance();
diff --git a/packages/core/src/v3/heartbeats/api.ts b/packages/core/src/v3/heartbeats/api.ts
new file mode 100644
index 00000000000..27dfeac213a
--- /dev/null
+++ b/packages/core/src/v3/heartbeats/api.ts
@@ -0,0 +1,73 @@
+import { getGlobal, registerGlobal, unregisterGlobal } from "../utils/globals.js";
+import { HeartbeatsManager } from "./types.js";
+
+const API_NAME = "heartbeats";
+
+class NoopHeartbeatsManager implements HeartbeatsManager {
+  startHeartbeat(id: string) {
+    return;
+  }
+
+  stopHeartbeat() {
+    return;
+  }
+
+  async yield() {
+    return;
+  }
+
+  get lastHeartbeat(): Date | undefined {
+    return undefined;
+  }
+
+  reset() {}
+}
+
+const NOOP_HEARTBEATS_MANAGER = new NoopHeartbeatsManager();
+
+export class HeartbeatsAPI implements HeartbeatsManager {
+  private static _instance?: HeartbeatsAPI;
+
+  private constructor() {}
+
+  public static getInstance(): HeartbeatsAPI {
+    if (!this._instance) {
+      this._instance = new HeartbeatsAPI();
+    }
+
+    return this._instance;
+  }
+
+  public setGlobalManager(manager: HeartbeatsManager): boolean {
+    return registerGlobal(API_NAME, manager);
+  }
+
+  public disable() {
+    unregisterGlobal(API_NAME);
+  }
+
+  public reset() {
+    this.#getManager().reset();
+    this.disable();
+  }
+
+  public get lastHeartbeat(): Date | undefined {
+    return this.#getManager().lastHeartbeat;
+  }
+
+  public startHeartbeat(id: string) {
+    return this.#getManager().startHeartbeat(id);
+  }
+
+  public stopHeartbeat() {
+    return this.#getManager().stopHeartbeat();
+  }
+
+  public yield() {
+    return this.#getManager().yield();
+  }
+
+  #getManager(): HeartbeatsManager {
+    return getGlobal(API_NAME) ?? NOOP_HEARTBEATS_MANAGER;
+  }
+}
diff --git a/packages/core/src/v3/heartbeats/manager.ts b/packages/core/src/v3/heartbeats/manager.ts
new file mode 100644
index 00000000000..2648d492565
--- /dev/null
+++ b/packages/core/src/v3/heartbeats/manager.ts
@@ -0,0 +1,78 @@
+import { tryCatch } from "../tryCatch.js";
+import { HeartbeatsManager } from "./types.js";
+import { setInterval, setImmediate, setTimeout } from "node:timers/promises";
+
+export class StandardHeartbeatsManager implements HeartbeatsManager {
+  private listener: ((id: string) => Promise<void>) | undefined = undefined;
+  private currentAbortController: AbortController | undefined = undefined;
+  private lastHeartbeatYieldTime: number | undefined = undefined;
+  private lastHeartbeatDate: Date | undefined = undefined;
+
+  constructor(private readonly intervalInMs: number) {}
+
+  registerListener(callback: (id: string) => Promise<void>) {
+    this.listener = callback;
+  }
+
+  async yield(): Promise<void> {
+    if (!this.lastHeartbeatYieldTime) {
+      return;
+    }
+
+    // Only call setImmediate if we haven't yielded in the last interval
+    if (Date.now() - this.lastHeartbeatYieldTime >= this.intervalInMs) {
+      // await setImmediate();
+      await setTimeout(24);
+
+      this.lastHeartbeatYieldTime = Date.now();
+    }
+  }
+
+  startHeartbeat(id: string) {
+    this.stopHeartbeat();
+    this.currentAbortController = new AbortController();
+    this.lastHeartbeatYieldTime = Date.now();
+
+    // Ignore errors as we expect them to be thrown when the heartbeat is stopped
+    this.startHeartbeatLoop(id, this.currentAbortController.signal).catch((error) => {});
+  }
+
+  private async startHeartbeatLoop(id: string, signal: AbortSignal) {
+    try {
+      for await (const _ of setInterval(this.intervalInMs, undefined, {
+        signal,
+      })) {
+        if (this.listener) {
+          const [error] = await tryCatch(this.listener(id));
+          this.lastHeartbeatDate = new Date();
+
+          if (error) {
+            console.error("Failed to send HEARTBEAT message", { error: String(error) });
+          }
+        }
+      }
+    } catch (error) {
+      // Ignore errors as we expect them to be thrown when the heartbeat is stopped
+      // And since we tryCatch inside the loop, we don't need to handle any other errors here
+    }
+  }
+
+  stopHeartbeat(): void {
+    this.currentAbortController?.abort();
+  }
+
+  get lastHeartbeat(): Date | undefined {
+    return this.lastHeartbeatDate;
+  }
+
+  reset() {
+    this.stopHeartbeat();
+    this.lastHeartbeatDate = undefined;
+    this.lastHeartbeatYieldTime = undefined;
+    this.currentAbortController = undefined;
+
+    // NOTE: Don't reset the listener, it's really just a single global callback,
+    // but because of the structure of the dev/managed-run-worker and the ZodIpc constructor,
+    // we have to create the StandardHeartbeatsManager instance before the ZodIpc instance is created.
+  }
+}
diff --git a/packages/core/src/v3/heartbeats/types.ts b/packages/core/src/v3/heartbeats/types.ts
new file mode 100644
index 00000000000..f93dfa514bc
--- /dev/null
+++ b/packages/core/src/v3/heartbeats/types.ts
@@ -0,0 +1,8 @@
+export interface HeartbeatsManager {
+  startHeartbeat(id: string): void;
+  stopHeartbeat(): void;
+  yield(): Promise<void>;
+  reset(): void;
+
+  get lastHeartbeat(): Date | undefined;
+}
diff --git a/packages/core/src/v3/idempotency-key-catalog-api.ts b/packages/core/src/v3/idempotency-key-catalog-api.ts
new file mode 100644
index 00000000000..d83b62d8825
--- /dev/null
+++ b/packages/core/src/v3/idempotency-key-catalog-api.ts
@@ -0,0 +1,5 @@
+// Split module-level variable definition into separate files to allow
+// tree-shaking on each api instance.
+import { IdempotencyKeyCatalogAPI } from "./idempotency-key-catalog/index.js";
+/** Entrypoint for idempotency key catalog API */
+export const idempotencyKeyCatalog = IdempotencyKeyCatalogAPI.getInstance();
diff --git a/packages/core/src/v3/idempotency-key-catalog/catalog.ts b/packages/core/src/v3/idempotency-key-catalog/catalog.ts
new file mode 100644
index 00000000000..bcc74c90c9b
--- /dev/null
+++ b/packages/core/src/v3/idempotency-key-catalog/catalog.ts
@@ -0,0 +1,11 @@
+export type IdempotencyKeyScope = "run" | "attempt" | "global";
+
+export type IdempotencyKeyOptions = {
+  key: string;
+  scope: IdempotencyKeyScope;
+};
+
+export interface IdempotencyKeyCatalog {
+  registerKeyOptions(hash: string, options: IdempotencyKeyOptions): void;
+  getKeyOptions(hash: string): IdempotencyKeyOptions | undefined;
+}
diff --git a/packages/core/src/v3/idempotency-key-catalog/index.ts b/packages/core/src/v3/idempotency-key-catalog/index.ts
new file mode 100644
index 00000000000..685639ed498
--- /dev/null
+++ b/packages/core/src/v3/idempotency-key-catalog/index.ts
@@ -0,0 +1,36 @@
+const API_NAME = "idempotency-key-catalog";
+
+import { getGlobal, registerGlobal } from "../utils/globals.js";
+import type { IdempotencyKeyCatalog, IdempotencyKeyOptions } from "./catalog.js";
+import { LRUIdempotencyKeyCatalog } from "./lruIdempotencyKeyCatalog.js";
+
+export class IdempotencyKeyCatalogAPI {
+  private static _instance?: IdempotencyKeyCatalogAPI;
+
+  private constructor() {}
+
+  public static getInstance(): IdempotencyKeyCatalogAPI {
+    if (!this._instance) {
+      this._instance = new IdempotencyKeyCatalogAPI();
+    }
+    return this._instance;
+  }
+
+  public registerKeyOptions(hash: string, options: IdempotencyKeyOptions): void {
+    this.#getCatalog().registerKeyOptions(hash, options);
+  }
+
+  public getKeyOptions(hash: string): IdempotencyKeyOptions | undefined {
+    return this.#getCatalog().getKeyOptions(hash);
+  }
+
+  #getCatalog(): IdempotencyKeyCatalog {
+    let catalog = getGlobal(API_NAME);
+    if (!catalog) {
+      // Auto-initialize with LRU catalog on first access
+      catalog = new LRUIdempotencyKeyCatalog();
+      registerGlobal(API_NAME, catalog, true);
+    }
+    return catalog;
+  }
+}
diff --git a/packages/core/src/v3/idempotency-key-catalog/lruIdempotencyKeyCatalog.test.ts b/packages/core/src/v3/idempotency-key-catalog/lruIdempotencyKeyCatalog.test.ts
new file mode 100644
index 00000000000..ba523f60407
--- /dev/null
+++ b/packages/core/src/v3/idempotency-key-catalog/lruIdempotencyKeyCatalog.test.ts
@@ -0,0 +1,209 @@
+import { describe, it, expect } from "vitest";
+import { LRUIdempotencyKeyCatalog } from "./lruIdempotencyKeyCatalog.js";
+
+describe("LRUIdempotencyKeyCatalog", () => {
+  describe("registerKeyOptions and getKeyOptions", () => {
+    it("should store and retrieve options", () => {
+      const catalog = new LRUIdempotencyKeyCatalog();
+      const options = { key: "my-key", scope: "global" as const };
+
+      catalog.registerKeyOptions("hash1", options);
+
+      expect(catalog.getKeyOptions("hash1")).toEqual(options);
+    });
+
+    it("should return undefined for non-existent keys", () => {
+      const catalog = new LRUIdempotencyKeyCatalog();
+
+      expect(catalog.getKeyOptions("non-existent")).toBeUndefined();
+    });
+
+    it("should store multiple keys", () => {
+      const catalog = new LRUIdempotencyKeyCatalog();
+      const options1 = { key: "key1", scope: "global" as const };
+      const options2 = { key: "key2", scope: "run" as const };
+      const options3 = { key: "key3", scope: "attempt" as const };
+
+      catalog.registerKeyOptions("hash1", options1);
+      catalog.registerKeyOptions("hash2", options2);
+      catalog.registerKeyOptions("hash3", options3);
+
+      expect(catalog.getKeyOptions("hash1")).toEqual(options1);
+      expect(catalog.getKeyOptions("hash2")).toEqual(options2);
+      expect(catalog.getKeyOptions("hash3")).toEqual(options3);
+    });
+
+    it("should update options when registering same key twice", () => {
+      const catalog = new LRUIdempotencyKeyCatalog();
+      const options1 = { key: "key1", scope: "global" as const };
+      const options2 = { key: "key1-updated", scope: "run" as const };
+
+      catalog.registerKeyOptions("hash1", options1);
+      catalog.registerKeyOptions("hash1", options2);
+
+      expect(catalog.getKeyOptions("hash1")).toEqual(options2);
+    });
+  });
+
+  describe("LRU eviction", () => {
+    it("should evict oldest entry when over capacity", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(3);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+      catalog.registerKeyOptions("hash3", { key: "key3", scope: "global" });
+
+      // All three should exist
+      expect(catalog.getKeyOptions("hash1")).toBeDefined();
+      expect(catalog.getKeyOptions("hash2")).toBeDefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+
+      // After the gets above, the LRU order from oldest to newest is: hash1, hash2, hash3
+      // (each get moves the key to the most recent position)
+
+      // Add a fourth - hash1 should be evicted (it was accessed first, so it's the oldest)
+      catalog.registerKeyOptions("hash4", { key: "key4", scope: "global" });
+
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash2")).toBeDefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+      expect(catalog.getKeyOptions("hash4")).toBeDefined();
+    });
+
+    it("should evict least recently registered entry when capacity exceeded", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(3);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+      catalog.registerKeyOptions("hash3", { key: "key3", scope: "global" });
+
+      // Adding fourth should evict hash1 (oldest)
+      catalog.registerKeyOptions("hash4", { key: "key4", scope: "global" });
+
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash2")).toBeDefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+      expect(catalog.getKeyOptions("hash4")).toBeDefined();
+    });
+
+    it("should evict multiple entries when adding many at once would exceed capacity", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(2);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+      catalog.registerKeyOptions("hash3", { key: "key3", scope: "global" });
+      catalog.registerKeyOptions("hash4", { key: "key4", scope: "global" });
+
+      // Only hash3 and hash4 should remain
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash2")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+      expect(catalog.getKeyOptions("hash4")).toBeDefined();
+    });
+
+    it("should work with maxSize of 1", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(1);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      expect(catalog.getKeyOptions("hash1")).toBeDefined();
+
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash2")).toBeDefined();
+    });
+  });
+
+  describe("LRU ordering", () => {
+    it("should move accessed key to most recent position", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(3);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+      catalog.registerKeyOptions("hash3", { key: "key3", scope: "global" });
+
+      // Access hash1, moving it to most recent
+      catalog.getKeyOptions("hash1");
+
+      // Add hash4 - should evict hash2 (now the oldest)
+      catalog.registerKeyOptions("hash4", { key: "key4", scope: "global" });
+
+      expect(catalog.getKeyOptions("hash1")).toBeDefined();
+      expect(catalog.getKeyOptions("hash2")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+      expect(catalog.getKeyOptions("hash4")).toBeDefined();
+    });
+
+    it("should move re-registered key to most recent position", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(3);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+      catalog.registerKeyOptions("hash3", { key: "key3", scope: "global" });
+
+      // Re-register hash1, moving it to most recent
+      catalog.registerKeyOptions("hash1", { key: "key1-updated", scope: "run" });
+
+      // Add hash4 - should evict hash2 (now the oldest)
+      catalog.registerKeyOptions("hash4", { key: "key4", scope: "global" });
+
+      expect(catalog.getKeyOptions("hash1")).toEqual({ key: "key1-updated", scope: "run" });
+      expect(catalog.getKeyOptions("hash2")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+      expect(catalog.getKeyOptions("hash4")).toBeDefined();
+    });
+
+    it("should not affect order when getting non-existent key", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(2);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+      catalog.registerKeyOptions("hash2", { key: "key2", scope: "global" });
+
+      // Try to get non-existent key
+      catalog.getKeyOptions("non-existent");
+
+      // Add hash3 - should still evict hash1 (oldest)
+      catalog.registerKeyOptions("hash3", { key: "key3", scope: "global" });
+
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+      expect(catalog.getKeyOptions("hash2")).toBeDefined();
+      expect(catalog.getKeyOptions("hash3")).toBeDefined();
+    });
+  });
+
+  describe("default maxSize", () => {
+    it("should use default maxSize of 1000", () => {
+      const catalog = new LRUIdempotencyKeyCatalog();
+
+      // Register 1001 entries
+      for (let i = 0; i < 1001; i++) {
+        catalog.registerKeyOptions(`hash${i}`, { key: `key${i}`, scope: "global" });
+      }
+
+      // First entry should be evicted
+      expect(catalog.getKeyOptions("hash0")).toBeUndefined();
+      // Last entry should exist
+      expect(catalog.getKeyOptions("hash1000")).toBeDefined();
+    });
+  });
+
+  describe("edge cases", () => {
+    it("should handle negative maxSize by clamping to 0", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(-5);
+
+      // With maxSize clamped to 0, nothing should be stored
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+
+      // Should be immediately evicted since maxSize is 0
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+    });
+
+    it("should handle maxSize of 0", () => {
+      const catalog = new LRUIdempotencyKeyCatalog(0);
+
+      catalog.registerKeyOptions("hash1", { key: "key1", scope: "global" });
+
+      // Should be immediately evicted since maxSize is 0
+      expect(catalog.getKeyOptions("hash1")).toBeUndefined();
+    });
+  });
+});
diff --git a/packages/core/src/v3/idempotency-key-catalog/lruIdempotencyKeyCatalog.ts b/packages/core/src/v3/idempotency-key-catalog/lruIdempotencyKeyCatalog.ts
new file mode 100644
index 00000000000..2fcd072d15c
--- /dev/null
+++ b/packages/core/src/v3/idempotency-key-catalog/lruIdempotencyKeyCatalog.ts
@@ -0,0 +1,36 @@
+import type { IdempotencyKeyCatalog, IdempotencyKeyOptions } from "./catalog.js";
+
+export class LRUIdempotencyKeyCatalog implements IdempotencyKeyCatalog {
+  private cache: Map<string, IdempotencyKeyOptions>;
+  private readonly maxSize: number;
+
+  constructor(maxSize: number = 1_000) {
+    this.cache = new Map();
+    // Clamp to non-negative to prevent infinite loop in eviction
+    this.maxSize = Math.max(0, maxSize);
+  }
+
+  registerKeyOptions(hash: string, options: IdempotencyKeyOptions): void {
+    // Delete and re-add to update position (most recently used)
+    this.cache.delete(hash);
+    this.cache.set(hash, options);
+
+    // Evict oldest entries if over capacity
+    while (this.cache.size > this.maxSize) {
+      const oldest = this.cache.keys().next().value;
+      if (oldest !== undefined) {
+        this.cache.delete(oldest);
+      }
+    }
+  }
+
+  getKeyOptions(hash: string): IdempotencyKeyOptions | undefined {
+    const options = this.cache.get(hash);
+    if (options) {
+      // Move to end (most recently used)
+      this.cache.delete(hash);
+      this.cache.set(hash, options);
+    }
+    return options;
+  }
+}
diff --git a/packages/core/src/v3/idempotencyKeys.ts b/packages/core/src/v3/idempotencyKeys.ts
index e19c1cfca04..3a6946ccbd0 100644
--- a/packages/core/src/v3/idempotencyKeys.ts
+++ b/packages/core/src/v3/idempotencyKeys.ts
@@ -1,12 +1,49 @@
+import { apiClientManager } from "./apiClientManager-api.js";
+import { idempotencyKeyCatalog } from "./idempotency-key-catalog-api.js";
+import type {
+  IdempotencyKeyOptions,
+  IdempotencyKeyScope,
+} from "./idempotency-key-catalog/catalog.js";
 import { taskContext } from "./task-context-api.js";
 import { IdempotencyKey } from "./types/idempotencyKeys.js";
 import { digestSHA256 } from "./utils/crypto.js";
+import type { ZodFetchOptions } from "./apiClient/core.js";
+
+// Re-export types from catalog for backwards compatibility
+export type { IdempotencyKeyScope, IdempotencyKeyOptions } from "./idempotency-key-catalog/catalog.js";
+
+/**
+ * Extracts the user-provided key and scope from an idempotency key created with `idempotencyKeys.create()`.
+ *
+ * @param idempotencyKey The idempotency key to extract options from
+ * @returns The original key and scope, or undefined if the key doesn't have attached options
+ *
+ * @example
+ * ```typescript
+ * const key = await idempotencyKeys.create("my-key", { scope: "global" });
+ * const options = getIdempotencyKeyOptions(key);
+ * // options = { key: "my-key", scope: "global" }
+ * ```
+ */
+export function getIdempotencyKeyOptions(
+  idempotencyKey: IdempotencyKey | string
+): IdempotencyKeyOptions | undefined {
+  // Look up options from the catalog using the hash string
+  if (typeof idempotencyKey === "string") {
+    return idempotencyKeyCatalog.getKeyOptions(idempotencyKey);
+  }
+  return undefined;
+}
 
 export function isIdempotencyKey(
   value: string | string[] | IdempotencyKey
 ): value is IdempotencyKey {
   // Cannot check the brand at runtime because it doesn't exist (it's a TypeScript-only construct)
-  return typeof value === "string" && value.length === 64;
+  // Check for primitive strings only (we no longer use String objects)
+  if (typeof value === "string") {
+    return value.length === 64;
+  }
+  return false;
 }
 
 export function flattenIdempotencyKey(
@@ -47,7 +84,9 @@ export async function makeIdempotencyKey(
     return idempotencyKey;
   }
 
-  return await createIdempotencyKey(idempotencyKey, { scope: "global" });
+  return await createIdempotencyKey(idempotencyKey, {
+    scope: "run",
+  });
 }
 
 /**
@@ -87,16 +126,22 @@ export async function makeIdempotencyKey(
  */
 export async function createIdempotencyKey(
   key: string | string[],
-  options?: { scope?: "run" | "attempt" | "global" }
+  options?: { scope?: IdempotencyKeyScope }
 ): Promise<IdempotencyKey> {
-  const idempotencyKey = await generateIdempotencyKey(
-    [...(Array.isArray(key) ? key : [key])].concat(injectScope(options?.scope ?? "run"))
-  );
+  const scope = options?.scope ?? "run";
+  const keyArray = Array.isArray(key) ? key : [key];
+  const userKey = keyArray.join("-");
 
+  const idempotencyKey = await generateIdempotencyKey(keyArray.concat(injectScope(scope)));
+
+  // Register the original key and scope in the catalog for later extraction
+  idempotencyKeyCatalog.registerKeyOptions(idempotencyKey, { key: userKey, scope });
+
+  // Return primitive string cast as IdempotencyKey
   return idempotencyKey as IdempotencyKey;
 }
 
-function injectScope(scope: "run" | "attempt" | "global"): string[] {
+function injectScope(scope: IdempotencyKeyScope): string[] {
   switch (scope) {
     case "run": {
       if (taskContext?.ctx) {
@@ -132,3 +177,93 @@ type AttemptKeyMaterial = {
 export function attemptKey(ctx: AttemptKeyMaterial): string {
   return `${ctx.run.id}-${ctx.attempt.number}`;
 }
+
+export type ResetIdempotencyKeyOptions = {
+  scope?: IdempotencyKeyScope;
+  /** Required if scope is "run" or "attempt" to reconstruct the hash */
+  parentRunId?: string;
+  /** Required if scope is "attempt" to reconstruct the hash */
+  attemptNumber?: number;
+};
+
+/**
+ * Resets an idempotency key, effectively deleting it from the associated task.
+ *
+ * @param taskIdentifier The task identifier (e.g., "my-task")
+ * @param idempotencyKey The idempotency key to reset. Can be:
+ *   - An `IdempotencyKey` created with `idempotencyKeys.create()` (options are extracted automatically)
+ *   - A string or string array (requires `options.scope` and potentially `options.parentRunId`)
+ * @param options Options for reconstructing the hash if needed
+ * @param requestOptions Optional fetch options
+ *
+ * @example
+ * ```typescript
+ * // Using a key created with idempotencyKeys.create() - options are extracted automatically
+ * const key = await idempotencyKeys.create("my-key", { scope: "global" });
+ * await idempotencyKeys.reset("my-task", key);
+ *
+ * // Using a raw string with global scope
+ * await idempotencyKeys.reset("my-task", "my-key", { scope: "global" });
+ *
+ * // Using a raw string with run scope (requires parentRunId)
+ * await idempotencyKeys.reset("my-task", "my-key", {
+ *   scope: "run",
+ *   parentRunId: "run_abc123"
+ * });
+ * ```
+ */
+export async function resetIdempotencyKey(
+  taskIdentifier: string,
+  idempotencyKey: IdempotencyKey | string | string[],
+  options?: ResetIdempotencyKeyOptions,
+  requestOptions?: ZodFetchOptions
+): Promise<{ id: string }> {
+  const client = apiClientManager.clientOrThrow();
+
+  // If the key is already a 64-char hash, use it directly
+  if (typeof idempotencyKey === "string" && idempotencyKey.length === 64) {
+    return client.resetIdempotencyKey(taskIdentifier, idempotencyKey, requestOptions);
+  }
+
+  // Try to extract options from an IdempotencyKey created with idempotencyKeys.create()
+  const attachedOptions =
+    typeof idempotencyKey === "string"
+      ? getIdempotencyKeyOptions(idempotencyKey)
+      : undefined;
+
+  const scope = attachedOptions?.scope ?? options?.scope ?? "run";
+  const keyArray = Array.isArray(idempotencyKey)
+    ? idempotencyKey
+    : [attachedOptions?.key ?? String(idempotencyKey)];
+
+  // Build scope suffix based on scope type
+  let scopeSuffix: string[] = [];
+  switch (scope) {
+    case "run": {
+      const parentRunId = options?.parentRunId ?? taskContext?.ctx?.run.id;
+      if (!parentRunId) {
+        throw new Error(
+          "resetIdempotencyKey: parentRunId is required for 'run' scope when called outside a task context"
+        );
+      }
+      scopeSuffix = [parentRunId];
+      break;
+    }
+    case "attempt": {
+      const parentRunId = options?.parentRunId ?? taskContext?.ctx?.run.id;
+      const attemptNumber = options?.attemptNumber ?? taskContext?.ctx?.attempt.number;
+      if (!parentRunId || attemptNumber === undefined) {
+        throw new Error(
+          "resetIdempotencyKey: parentRunId and attemptNumber are required for 'attempt' scope when called outside a task context"
+        );
+      }
+      scopeSuffix = [parentRunId, attemptNumber.toString()];
+      break;
+    }
+  }
+
+  // Generate the hash using the same algorithm as createIdempotencyKey
+  const hash = await generateIdempotencyKey(keyArray.concat(scopeSuffix));
+
+  return client.resetIdempotencyKey(taskIdentifier, hash, requestOptions);
+}
diff --git a/packages/core/src/v3/imports/superjson-cjs.cts b/packages/core/src/v3/imports/superjson-cjs.cts
new file mode 100644
index 00000000000..89ed3d2458d
--- /dev/null
+++ b/packages/core/src/v3/imports/superjson-cjs.cts
@@ -0,0 +1,17 @@
+// Use vendored superjson bundle to avoid ESM/CJS compatibility issues
+// See: https://github.com/triggerdotdev/trigger.dev/issues/2937
+// @ts-ignore
+const superjson = require("../vendor/superjson.cjs");
+
+// @ts-ignore
+superjson.default.registerCustom<Buffer, number[]>(
+  {
+    isApplicable: (v: unknown): v is Buffer => typeof Buffer === "function" && Buffer.isBuffer(v),
+    serialize: (v: Buffer) => [...v],
+    deserialize: (v: number[]) => Buffer.from(v),
+  },
+  "buffer"
+);
+
+// @ts-ignore
+module.exports.default = superjson.default;
diff --git a/packages/core/src/v3/imports/superjson.ts b/packages/core/src/v3/imports/superjson.ts
new file mode 100644
index 00000000000..1545c083e04
--- /dev/null
+++ b/packages/core/src/v3/imports/superjson.ts
@@ -0,0 +1,16 @@
+// Use vendored superjson bundle to avoid ESM/CJS compatibility issues
+// See: https://github.com/triggerdotdev/trigger.dev/issues/2937
+// @ts-ignore
+import superjson from "../vendor/superjson.mjs";
+
+superjson.registerCustom<Buffer, number[]>(
+  {
+    isApplicable: (v: unknown): v is Buffer => typeof Buffer === "function" && Buffer.isBuffer(v),
+    serialize: (v: Buffer) => [...v],
+    deserialize: (v: number[]) => Buffer.from(v),
+  },
+  "buffer"
+);
+
+// @ts-ignore
+export default superjson;
diff --git a/packages/core/src/v3/index.ts b/packages/core/src/v3/index.ts
index 3bd1fc45473..b714d8cb933 100644
--- a/packages/core/src/v3/index.ts
+++ b/packages/core/src/v3/index.ts
@@ -9,6 +9,7 @@ export * from "./limits.js";
 export * from "./logger-api.js";
 export * from "./runtime-api.js";
 export * from "./task-context-api.js";
+export * from "./trace-context-api.js";
 export * from "./apiClientManager-api.js";
 export * from "./usage-api.js";
 export * from "./run-metadata-api.js";
@@ -17,6 +18,8 @@ export * from "./timeout-api.js";
 export * from "./run-timeline-metrics-api.js";
 export * from "./lifecycle-hooks-api.js";
 export * from "./locals-api.js";
+export * from "./heartbeats-api.js";
+export * from "./realtime-streams-api.js";
 export * from "./schemas/index.js";
 export { SemanticInternalAttributes } from "./semanticInternalAttributes.js";
 export * from "./resource-catalog-api.js";
@@ -46,6 +49,7 @@ export {
   NULL_SENTINEL,
 } from "./utils/flattenAttributes.js";
 export { omit } from "./utils/omit.js";
+export { generateFriendlyId, fromFriendlyId } from "./isomorphic/friendlyId.js";
 export {
   calculateNextRetryDelay,
   calculateResetAt,
diff --git a/packages/core/src/v3/isomorphic/dates.ts b/packages/core/src/v3/isomorphic/dates.ts
new file mode 100644
index 00000000000..53a0542d7e6
--- /dev/null
+++ b/packages/core/src/v3/isomorphic/dates.ts
@@ -0,0 +1,35 @@
+/**
+ * Attempts to parse a string into a valid Date.
+ *
+ * Supported formats:
+ * - ISO and RFC date strings (e.g. "2025-08-18", "2025-08-18T12:34:56Z")
+ * - Natural language dates supported by JS Date (e.g. "August 18, 2025")
+ * - Epoch seconds (10-digit numeric string, e.g. "1629302400")
+ * - Epoch milliseconds (13-digit numeric string, e.g. "1629302400000")
+ *
+ * @param input The string to parse.
+ * @returns A valid Date object, or undefined if parsing fails.
+ */
+export function parseDate(input: string): Date | undefined {
+  if (typeof input !== "string") return undefined;
+
+  // Handle pure numeric strings as epoch values
+  if (/^\d+$/.test(input)) {
+    const num = Number(input);
+
+    if (input.length === 10) {
+      // Epoch seconds
+      return new Date(num * 1000);
+    } else if (input.length === 13) {
+      // Epoch milliseconds
+      return new Date(num);
+    } else {
+      // Unsupported numeric length
+      return undefined;
+    }
+  }
+
+  // Handle general date strings
+  const date = new Date(input);
+  return isNaN(date.getTime()) ? undefined : date;
+}
diff --git a/packages/core/src/v3/isomorphic/duration.ts b/packages/core/src/v3/isomorphic/duration.ts
index b4c5cd20d3b..9315f79683d 100644
--- a/packages/core/src/v3/isomorphic/duration.ts
+++ b/packages/core/src/v3/isomorphic/duration.ts
@@ -1,5 +1,15 @@
-export function parseNaturalLanguageDuration(duration: string): Date | undefined {
-  // Handle Code scanning alert #44 (https://github.com/triggerdotdev/trigger.dev/security/code-scanning/44) by limiting the length of the input string
+/**
+ * Parses a natural language duration string into milliseconds.
+ *
+ * @param duration - Duration string like "1s", "5m", "2h", "1d", "1w"
+ * @returns The duration in milliseconds, or undefined if invalid
+ *
+ * @example
+ * parseNaturalLanguageDurationInMs("30m") // 1800000
+ * parseNaturalLanguageDurationInMs("2h") // 7200000
+ */
+export function parseNaturalLanguageDurationInMs(duration: string): number | undefined {
+  // Handle Code scanning alert #44 by limiting the length of the input string
   if (duration.length > 100) {
     return undefined;
   }
@@ -60,11 +70,12 @@ export function parseNaturalLanguageDuration(duration: string): Date | undefined
     }
   }
 
-  if (hasMatch) {
-    return new Date(Date.now() + totalMilliseconds);
-  }
+  return hasMatch ? totalMilliseconds : undefined;
+}
 
-  return undefined;
+export function parseNaturalLanguageDuration(duration: string): Date | undefined {
+  const ms = parseNaturalLanguageDurationInMs(duration);
+  return ms !== undefined ? new Date(Date.now() + ms) : undefined;
 }
 
 export function safeParseNaturalLanguageDuration(duration: string): Date | undefined {
diff --git a/packages/core/src/v3/isomorphic/friendlyId.ts b/packages/core/src/v3/isomorphic/friendlyId.ts
index 7b4f8a7f3da..90fa31bd573 100644
--- a/packages/core/src/v3/isomorphic/friendlyId.ts
+++ b/packages/core/src/v3/isomorphic/friendlyId.ts
@@ -95,6 +95,7 @@ export const SnapshotId = new IdUtil("snapshot");
 export const WaitpointId = new IdUtil("waitpoint");
 export const BatchId = new IdUtil("batch");
 export const BulkActionId = new IdUtil("bulk");
+export const AttemptId = new IdUtil("attempt");
 
 export class IdGenerator {
   private alphabet: string;
diff --git a/packages/core/src/v3/isomorphic/index.ts b/packages/core/src/v3/isomorphic/index.ts
index 53836fb0965..d220acd515d 100644
--- a/packages/core/src/v3/isomorphic/index.ts
+++ b/packages/core/src/v3/isomorphic/index.ts
@@ -3,3 +3,5 @@ export * from "./duration.js";
 export * from "./maxDuration.js";
 export * from "./queueName.js";
 export * from "./consts.js";
+export * from "./traceContext.js";
+export * from "./dates.js";
diff --git a/packages/core/src/v3/isomorphic/traceContext.ts b/packages/core/src/v3/isomorphic/traceContext.ts
new file mode 100644
index 00000000000..b91b6619240
--- /dev/null
+++ b/packages/core/src/v3/isomorphic/traceContext.ts
@@ -0,0 +1,29 @@
+export function parseTraceparent(
+  traceparent?: string
+): { traceId: string; spanId: string; traceFlags?: string } | undefined {
+  if (!traceparent) {
+    return undefined;
+  }
+
+  const parts = traceparent.split("-");
+
+  if (parts.length !== 4) {
+    return undefined;
+  }
+
+  const [version, traceId, spanId, traceFlags] = parts;
+
+  if (version !== "00") {
+    return undefined;
+  }
+
+  if (!traceId || !spanId) {
+    return undefined;
+  }
+
+  return { traceId, spanId, traceFlags };
+}
+
+export function serializeTraceparent(traceId: string, spanId: string, traceFlags?: string) {
+  return `00-${traceId}-${spanId}-${traceFlags ?? "01"}`;
+}
diff --git a/packages/core/src/v3/lifecycle-hooks-api.ts b/packages/core/src/v3/lifecycle-hooks-api.ts
index 3c74f719cb3..e08bd66671c 100644
--- a/packages/core/src/v3/lifecycle-hooks-api.ts
+++ b/packages/core/src/v3/lifecycle-hooks-api.ts
@@ -35,4 +35,5 @@ export type {
   TaskCancelHookParams,
   OnCancelHookFunction,
   AnyOnCancelHookFunction,
+  AnyOnStartAttemptHookFunction,
 } from "./lifecycleHooks/types.js";
diff --git a/packages/core/src/v3/lifecycleHooks/index.ts b/packages/core/src/v3/lifecycleHooks/index.ts
index 99ed47ae603..0011bd5d5a7 100644
--- a/packages/core/src/v3/lifecycleHooks/index.ts
+++ b/packages/core/src/v3/lifecycleHooks/index.ts
@@ -18,6 +18,7 @@ import {
   RegisterHookFunctionParams,
   TaskWait,
   type LifecycleHooksManager,
+  AnyOnStartAttemptHookFunction,
 } from "./types.js";
 
 const NOOP_LIFECYCLE_HOOKS_MANAGER = new NoopLifecycleHooksManager();
@@ -81,6 +82,27 @@ export class LifecycleHooksAPI {
     return this.#getManager().getGlobalStartHooks();
   }
 
+  public registerTaskStartAttemptHook(
+    taskId: string,
+    hook: RegisterHookFunctionParams<AnyOnStartAttemptHookFunction>
+  ): void {
+    this.#getManager().registerTaskStartAttemptHook(taskId, hook);
+  }
+
+  public registerGlobalStartAttemptHook(
+    hook: RegisterHookFunctionParams<AnyOnStartAttemptHookFunction>
+  ): void {
+    this.#getManager().registerGlobalStartAttemptHook(hook);
+  }
+
+  public getTaskStartAttemptHook(taskId: string): AnyOnStartAttemptHookFunction | undefined {
+    return this.#getManager().getTaskStartAttemptHook(taskId);
+  }
+
+  public getGlobalStartAttemptHooks(): RegisteredHookFunction<AnyOnStartAttemptHookFunction>[] {
+    return this.#getManager().getGlobalStartAttemptHooks();
+  }
+
   public registerGlobalFailureHook(
     hook: RegisterHookFunctionParams<AnyOnFailureHookFunction>
   ): void {
diff --git a/packages/core/src/v3/lifecycleHooks/manager.ts b/packages/core/src/v3/lifecycleHooks/manager.ts
index 282d2fe16c6..e755e66d3f9 100644
--- a/packages/core/src/v3/lifecycleHooks/manager.ts
+++ b/packages/core/src/v3/lifecycleHooks/manager.ts
@@ -14,6 +14,7 @@ import {
   AnyOnCleanupHookFunction,
   TaskWait,
   AnyOnCancelHookFunction,
+  AnyOnStartAttemptHookFunction,
 } from "./types.js";
 
 export class StandardLifecycleHooksManager implements LifecycleHooksManager {
@@ -23,6 +24,15 @@ export class StandardLifecycleHooksManager implements LifecycleHooksManager {
   private globalStartHooks: Map<string, RegisteredHookFunction<AnyOnStartHookFunction>> = new Map();
   private taskStartHooks: Map<string, RegisteredHookFunction<AnyOnStartHookFunction>> = new Map();
 
+  private globalStartAttemptHooks: Map<
+    string,
+    RegisteredHookFunction<AnyOnStartAttemptHookFunction>
+  > = new Map();
+  private taskStartAttemptHooks: Map<
+    string,
+    RegisteredHookFunction<AnyOnStartAttemptHookFunction>
+  > = new Map();
+
   private globalFailureHooks: Map<string, RegisteredHookFunction<AnyOnFailureHookFunction>> =
     new Map();
   private taskFailureHooks: Map<string, RegisteredHookFunction<AnyOnFailureHookFunction>> =
@@ -129,6 +139,37 @@ export class StandardLifecycleHooksManager implements LifecycleHooksManager {
     return Array.from(this.globalStartHooks.values());
   }
 
+  registerGlobalStartAttemptHook(
+    hook: RegisterHookFunctionParams<AnyOnStartAttemptHookFunction>
+  ): void {
+    const id = generateHookId(hook);
+    this.globalStartAttemptHooks.set(id, {
+      id,
+      name: hook.id,
+      fn: hook.fn,
+    });
+  }
+
+  registerTaskStartAttemptHook(
+    taskId: string,
+    hook: RegisterHookFunctionParams<AnyOnStartAttemptHookFunction>
+  ): void {
+    const id = generateHookId(hook);
+    this.taskStartAttemptHooks.set(taskId, {
+      id,
+      name: hook.id,
+      fn: hook.fn,
+    });
+  }
+
+  getTaskStartAttemptHook(taskId: string): AnyOnStartAttemptHookFunction | undefined {
+    return this.taskStartAttemptHooks.get(taskId)?.fn;
+  }
+
+  getGlobalStartAttemptHooks(): RegisteredHookFunction<AnyOnStartAttemptHookFunction>[] {
+    return Array.from(this.globalStartAttemptHooks.values());
+  }
+
   registerGlobalInitHook(hook: RegisterHookFunctionParams<AnyOnInitHookFunction>): void {
     // if there is no id, lets generate one based on the contents of the function
     const id = generateHookId(hook);
@@ -527,6 +568,22 @@ export class NoopLifecycleHooksManager implements LifecycleHooksManager {
     return [];
   }
 
+  registerGlobalStartAttemptHook(): void {
+    // Noop
+  }
+
+  registerTaskStartAttemptHook(): void {
+    // Noop
+  }
+
+  getTaskStartAttemptHook(): undefined {
+    return undefined;
+  }
+
+  getGlobalStartAttemptHooks(): RegisteredHookFunction<AnyOnStartAttemptHookFunction>[] {
+    return [];
+  }
+
   registerGlobalFailureHook(hook: RegisterHookFunctionParams<AnyOnFailureHookFunction>): void {
     // Noop
   }
diff --git a/packages/core/src/v3/lifecycleHooks/types.ts b/packages/core/src/v3/lifecycleHooks/types.ts
index 9501216546c..51518a165a9 100644
--- a/packages/core/src/v3/lifecycleHooks/types.ts
+++ b/packages/core/src/v3/lifecycleHooks/types.ts
@@ -33,6 +33,19 @@ export type OnStartHookFunction<TPayload, TInitOutput extends TaskInitOutput = T
 
 export type AnyOnStartHookFunction = OnStartHookFunction<unknown, TaskInitOutput>;
 
+export type TaskStartAttemptHookParams<TPayload = unknown> = {
+  ctx: TaskRunContext;
+  payload: TPayload;
+  task: string;
+  signal: AbortSignal;
+};
+
+export type OnStartAttemptHookFunction<TPayload> = (
+  params: TaskStartAttemptHookParams<TPayload>
+) => undefined | void | Promise<undefined | void>;
+
+export type AnyOnStartAttemptHookFunction = OnStartAttemptHookFunction<unknown>;
+
 export type TaskWait =
   | {
       type: "duration";
@@ -268,6 +281,17 @@ export interface LifecycleHooksManager {
   ): void;
   getTaskStartHook(taskId: string): AnyOnStartHookFunction | undefined;
   getGlobalStartHooks(): RegisteredHookFunction<AnyOnStartHookFunction>[];
+
+  registerGlobalStartAttemptHook(
+    hook: RegisterHookFunctionParams<AnyOnStartAttemptHookFunction>
+  ): void;
+  registerTaskStartAttemptHook(
+    taskId: string,
+    hook: RegisterHookFunctionParams<AnyOnStartAttemptHookFunction>
+  ): void;
+  getTaskStartAttemptHook(taskId: string): AnyOnStartAttemptHookFunction | undefined;
+  getGlobalStartAttemptHooks(): RegisteredHookFunction<AnyOnStartAttemptHookFunction>[];
+
   registerGlobalFailureHook(hook: RegisterHookFunctionParams<AnyOnFailureHookFunction>): void;
   registerTaskFailureHook(
     taskId: string,
diff --git a/packages/core/src/v3/links.ts b/packages/core/src/v3/links.ts
index f514bf62f82..d04284e73fe 100644
--- a/packages/core/src/v3/links.ts
+++ b/packages/core/src/v3/links.ts
@@ -14,6 +14,7 @@ export const links = {
     },
     troubleshooting: {
       concurrentWaits: "https://trigger.dev/docs/troubleshooting#parallel-waits-are-not-supported",
+      stalledExecution: "https://trigger.dev/docs/troubleshooting#task-run-stalled-executing",
     },
     concurrency: {
       recursiveDeadlock:
diff --git a/packages/core/src/v3/otel/diskIoMetrics.ts b/packages/core/src/v3/otel/diskIoMetrics.ts
new file mode 100644
index 00000000000..4018b58e5c7
--- /dev/null
+++ b/packages/core/src/v3/otel/diskIoMetrics.ts
@@ -0,0 +1,92 @@
+import { type MeterProvider } from "@opentelemetry/sdk-metrics";
+import * as fs from "node:fs";
+import * as fsPromises from "node:fs/promises";
+
+const SECTOR_SIZE = 512;
+
+const FILTERED_DEVICE_PREFIXES = ["loop", "ram", "dm-"];
+
+type DiskStats = {
+  device: string;
+  readsCompleted: number;
+  sectorsRead: number;
+  writesCompleted: number;
+  sectorsWritten: number;
+};
+
+function parseProcDiskstats(content: string): DiskStats[] {
+  const entries: DiskStats[] = [];
+
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+
+    const fields = trimmed.split(/\s+/);
+    if (fields.length < 14) continue;
+
+    const device = fields[2]!;
+
+    if (FILTERED_DEVICE_PREFIXES.some((prefix) => device.startsWith(prefix))) {
+      continue;
+    }
+
+    entries.push({
+      device,
+      readsCompleted: parseInt(fields[3]!, 10),
+      sectorsRead: parseInt(fields[5]!, 10),
+      writesCompleted: parseInt(fields[7]!, 10),
+      sectorsWritten: parseInt(fields[9]!, 10),
+    });
+  }
+
+  return entries;
+}
+
+export function startDiskIoMetrics(meterProvider: MeterProvider) {
+  try {
+    fs.accessSync("/proc/diskstats", fs.constants.R_OK);
+  } catch {
+    return;
+  }
+
+  const meter = meterProvider.getMeter("system-disk", "1.0.0");
+
+  const ioCounter = meter.createObservableCounter("system.disk.io", {
+    description: "Disk I/O bytes read and written per device",
+    unit: "By",
+  });
+
+  const opsCounter = meter.createObservableCounter("system.disk.operations", {
+    description: "Disk read/write operation counts per device",
+    unit: "{operation}",
+  });
+
+  meter.addBatchObservableCallback(
+    async (obs) => {
+      try {
+        const content = await fsPromises.readFile("/proc/diskstats", "utf-8");
+        const stats = parseProcDiskstats(content);
+
+        for (const entry of stats) {
+          const readAttrs = {
+            "system.device": entry.device,
+            "disk.io.direction": "read",
+          };
+          const writeAttrs = {
+            "system.device": entry.device,
+            "disk.io.direction": "write",
+          };
+
+          obs.observe(ioCounter, entry.sectorsRead * SECTOR_SIZE, readAttrs);
+          obs.observe(ioCounter, entry.sectorsWritten * SECTOR_SIZE, writeAttrs);
+
+          obs.observe(opsCounter, entry.readsCompleted, readAttrs);
+          obs.observe(opsCounter, entry.writesCompleted, writeAttrs);
+        }
+      } catch {
+        // Skip entire cycle on failure
+      }
+    },
+    [ioCounter, opsCounter]
+  );
+}
diff --git a/packages/core/src/v3/otel/filesystemMetrics.ts b/packages/core/src/v3/otel/filesystemMetrics.ts
new file mode 100644
index 00000000000..aa22e9900f7
--- /dev/null
+++ b/packages/core/src/v3/otel/filesystemMetrics.ts
@@ -0,0 +1,134 @@
+import { type MeterProvider } from "@opentelemetry/sdk-metrics";
+import * as fs from "node:fs";
+import * as fsPromises from "node:fs/promises";
+
+const VIRTUAL_FS_TYPES = new Set([
+  "proc",
+  "sysfs",
+  "devpts",
+  "tmpfs",
+  "devtmpfs",
+  "cgroup",
+  "cgroup2",
+  "squashfs",
+  "autofs",
+  "debugfs",
+  "securityfs",
+  "pstore",
+  "bpf",
+  "tracefs",
+  "hugetlbfs",
+  "mqueue",
+  "fusectl",
+  "configfs",
+  "binfmt_misc",
+]);
+
+type MountEntry = {
+  device: string;
+  mountpoint: string;
+  fsType: string;
+  options: string;
+};
+
+function parseProcMounts(content: string): MountEntry[] {
+  const entries: MountEntry[] = [];
+
+  for (const line of content.split("\n")) {
+    if (!line.trim()) continue;
+
+    const parts = line.split(" ");
+    if (parts.length < 4) continue;
+
+    const fsType = parts[2]!;
+    if (VIRTUAL_FS_TYPES.has(fsType)) continue;
+
+    entries.push({
+      device: parts[0]!,
+      mountpoint: unescapeMountPath(parts[1]!),
+      fsType,
+      options: parts[3]!,
+    });
+  }
+
+  return entries;
+}
+
+function unescapeMountPath(path: string): string {
+  return path.replace(/\\040/g, " ").replace(/\\011/g, "\t");
+}
+
+export function startFilesystemMetrics(meterProvider: MeterProvider) {
+  try {
+    fs.accessSync("/proc/mounts", fs.constants.R_OK);
+  } catch {
+    return;
+  }
+
+  if (typeof fsPromises.statfs !== "function") {
+    return;
+  }
+
+  const meter = meterProvider.getMeter("system-filesystem", "1.0.0");
+
+  const usageCounter = meter.createObservableUpDownCounter("system.filesystem.usage", {
+    description: "Filesystem bytes used, free, and reserved per mountpoint",
+    unit: "By",
+  });
+
+  const utilizationGauge = meter.createObservableGauge("system.filesystem.utilization", {
+    description: "Fraction of filesystem space used (0-1)",
+    unit: "1",
+  });
+
+  meter.addBatchObservableCallback(
+    async (obs) => {
+      try {
+        const mountsContent = await fsPromises.readFile("/proc/mounts", "utf-8");
+        const mounts = parseProcMounts(mountsContent);
+
+        for (const mount of mounts) {
+          try {
+            const stats = await fsPromises.statfs(mount.mountpoint);
+            const bsize = stats.bsize;
+            const total = stats.blocks * bsize;
+            const free = stats.bavail * bsize;
+            const reserved = (stats.bfree - stats.bavail) * bsize;
+            const used = total - stats.bfree * bsize;
+
+            const mode = mount.options.startsWith("ro") ? "ro" : "rw";
+
+            const baseAttrs = {
+              "system.device": mount.device,
+              "system.filesystem.type": mount.fsType,
+              "system.filesystem.mountpoint": mount.mountpoint,
+              "system.filesystem.mode": mode,
+            };
+
+            obs.observe(usageCounter, used, {
+              ...baseAttrs,
+              "system.filesystem.state": "used",
+            });
+            obs.observe(usageCounter, free, {
+              ...baseAttrs,
+              "system.filesystem.state": "free",
+            });
+            obs.observe(usageCounter, reserved, {
+              ...baseAttrs,
+              "system.filesystem.state": "reserved",
+            });
+
+            if (total > 0) {
+              obs.observe(utilizationGauge, used / total, baseAttrs);
+            }
+          } catch {
+            // Skip this mount on statfs failure
+          }
+        }
+      } catch {
+        // Skip entire cycle on failure
+      }
+    },
+    [usageCounter, utilizationGauge]
+  );
+}
diff --git a/packages/core/src/v3/otel/machineId.ts b/packages/core/src/v3/otel/machineId.ts
new file mode 100644
index 00000000000..79f7bc4ba2a
--- /dev/null
+++ b/packages/core/src/v3/otel/machineId.ts
@@ -0,0 +1,4 @@
+import { generateFriendlyId } from "../isomorphic/friendlyId.js";
+import { getEnvVar } from "../utils/getEnv.js";
+
+export const machineId = getEnvVar("TRIGGER_MACHINE_ID") ?? generateFriendlyId("machine");
diff --git a/packages/core/src/v3/otel/nodejsRuntimeMetrics.ts b/packages/core/src/v3/otel/nodejsRuntimeMetrics.ts
new file mode 100644
index 00000000000..aeb4ce4bee5
--- /dev/null
+++ b/packages/core/src/v3/otel/nodejsRuntimeMetrics.ts
@@ -0,0 +1,81 @@
+import { type MeterProvider } from "@opentelemetry/sdk-metrics";
+import type { ObservableGauge } from "@opentelemetry/api";
+import { performance, monitorEventLoopDelay } from "node:perf_hooks";
+
+function tryMonitorEventLoopDelay() {
+  try {
+    const eld = monitorEventLoopDelay({ resolution: 20 });
+    eld.enable();
+    return eld;
+  } catch {
+    // monitorEventLoopDelay is not implemented in Bun
+    return undefined;
+  }
+}
+
+export function startNodejsRuntimeMetrics(meterProvider: MeterProvider) {
+  const meter = meterProvider.getMeter("nodejs-runtime", "1.0.0");
+
+  // Event loop utilization (diff between collection intervals)
+  let lastElu = performance.eventLoopUtilization();
+
+  const eluGauge = meter.createObservableGauge("nodejs.event_loop.utilization", {
+    description: "Event loop utilization over the last collection interval",
+    unit: "1",
+  });
+
+  // Event loop delay histogram (from perf_hooks) — not available in Bun
+  const eld = tryMonitorEventLoopDelay();
+
+  const observables: ObservableGauge[] = [eluGauge];
+
+  let eldP95: ObservableGauge | undefined;
+  let eldMax: ObservableGauge | undefined;
+
+  if (eld) {
+    eldP95 = meter.createObservableGauge("nodejs.event_loop.delay.p95", {
+      description: "p95 event loop delay",
+      unit: "s",
+    });
+    eldMax = meter.createObservableGauge("nodejs.event_loop.delay.max", {
+      description: "Max event loop delay",
+      unit: "s",
+    });
+    observables.push(eldP95, eldMax);
+  }
+
+  // Heap metrics
+  const heapUsed = meter.createObservableGauge("nodejs.heap.used", {
+    description: "V8 heap used",
+    unit: "By",
+  });
+  const heapTotal = meter.createObservableGauge("nodejs.heap.total", {
+    description: "V8 heap total allocated",
+    unit: "By",
+  });
+  observables.push(heapUsed, heapTotal);
+
+  // Single batch callback for all metrics
+  meter.addBatchObservableCallback(
+    (obs) => {
+      // ELU
+      const currentElu = performance.eventLoopUtilization();
+      const diff = performance.eventLoopUtilization(currentElu, lastElu);
+      lastElu = currentElu;
+      obs.observe(eluGauge, diff.utilization);
+
+      // Event loop delay (nanoseconds -> seconds)
+      if (eld && eldP95 && eldMax) {
+        obs.observe(eldP95, eld.percentile(95) / 1e9);
+        obs.observe(eldMax, eld.max / 1e9);
+        eld.reset();
+      }
+
+      // Heap
+      const mem = process.memoryUsage();
+      obs.observe(heapUsed, mem.heapUsed);
+      obs.observe(heapTotal, mem.heapTotal);
+    },
+    observables
+  );
+}
diff --git a/packages/core/src/v3/otel/tracingSDK.ts b/packages/core/src/v3/otel/tracingSDK.ts
index c2d7b3d3420..a301946c755 100644
--- a/packages/core/src/v3/otel/tracingSDK.ts
+++ b/packages/core/src/v3/otel/tracingSDK.ts
@@ -1,25 +1,40 @@
-import { DiagConsoleLogger, DiagLogLevel, TracerProvider, diag } from "@opentelemetry/api";
-import { RandomIdGenerator } from "@opentelemetry/sdk-trace-base";
+import {
+  DiagConsoleLogger,
+  DiagLogLevel,
+  TraceFlags,
+  TracerProvider,
+  diag,
+  metrics,
+} from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
+import { TraceState } from "@opentelemetry/core";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
+import { HostMetrics } from "@opentelemetry/host-metrics";
 import { registerInstrumentations, type Instrumentation } from "@opentelemetry/instrumentation";
 import {
-  DetectorSync,
-  IResource,
+  detectResources,
+  processDetector,
   Resource,
-  ResourceAttributes,
-  ResourceDetectionConfig,
-  detectResourcesSync,
-  processDetectorSync,
+  resourceFromAttributes,
 } from "@opentelemetry/resources";
 import {
   BatchLogRecordProcessor,
-  LoggerProvider,
   LogRecordExporter,
+  LogRecordProcessor,
+  LoggerProvider,
   ReadableLogRecord,
   SimpleLogRecordProcessor,
 } from "@opentelemetry/sdk-logs";
+import {
+  AggregationType,
+  MeterProvider,
+  PeriodicExportingMetricReader,
+  type MetricReader,
+  type PushMetricExporter,
+} from "@opentelemetry/sdk-metrics";
+import { RandomIdGenerator, SpanProcessor } from "@opentelemetry/sdk-trace-base";
 import {
   BatchSpanProcessor,
   NodeTracerProvider,
@@ -27,7 +42,6 @@ import {
   SimpleSpanProcessor,
   SpanExporter,
 } from "@opentelemetry/sdk-trace-node";
-import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
 import { VERSION } from "../../version.js";
 import {
   OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT,
@@ -40,44 +54,19 @@ import {
   OTEL_SPAN_EVENT_COUNT_LIMIT,
 } from "../limits.js";
 import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
+import { taskContext } from "../task-context-api.js";
 import {
+  BufferingMetricExporter,
   TaskContextLogProcessor,
+  TaskContextMetricExporter,
   TaskContextSpanProcessor,
 } from "../taskContext/otelProcessors.js";
+import { traceContext } from "../trace-context-api.js";
 import { getEnvVar } from "../utils/getEnv.js";
-
-class AsyncResourceDetector implements DetectorSync {
-  private _promise: Promise<ResourceAttributes>;
-  private _resolver?: (value: ResourceAttributes) => void;
-  private _resolved: boolean = false;
-
-  constructor() {
-    this._promise = new Promise((resolver) => {
-      this._resolver = resolver;
-    });
-  }
-
-  get isResolved() {
-    return this._resolved;
-  }
-
-  detect(_config?: ResourceDetectionConfig): Resource {
-    return new Resource({}, this._promise);
-  }
-
-  resolveWithAttributes(attributes: ResourceAttributes) {
-    if (!this._resolver) {
-      throw new Error("Resolver not available");
-    }
-
-    if (this._resolved) {
-      return;
-    }
-
-    this._resolved = true;
-    this._resolver(attributes);
-  }
-}
+import { machineId } from "./machineId.js";
+import { startDiskIoMetrics } from "./diskIoMetrics.js";
+import { startFilesystemMetrics } from "./filesystemMetrics.js";
+import { startNodejsRuntimeMetrics } from "./nodejsRuntimeMetrics.js";
 
 export type TracingDiagnosticLogLevel =
   | "none"
@@ -90,21 +79,35 @@ export type TracingDiagnosticLogLevel =
 
 export type TracingSDKConfig = {
   url: string;
+  metricsUrl?: string;
   forceFlushTimeoutMillis?: number;
-  resource?: IResource;
   instrumentations?: Instrumentation[];
   exporters?: SpanExporter[];
   logExporters?: LogRecordExporter[];
+  metricExporters?: PushMetricExporter[];
+  metricReaders?: MetricReader[];
   diagLogLevel?: TracingDiagnosticLogLevel;
+  resource?: Resource;
+  hostMetrics?: boolean;
+  /** Limit host metrics collection to specific groups (e.g. ["process.cpu", "process.memory"]) */
+  hostMetricGroups?: string[];
+  /** Enable Node.js runtime metrics (event loop utilization, heap usage, etc.) */
+  nodejsRuntimeMetrics?: boolean;
+  /** Enable filesystem metrics (Linux only, reads /proc/mounts + fs.statfs) */
+  filesystemMetrics?: boolean;
+  /** Enable disk I/O metrics (Linux only, reads /proc/diskstats) */
+  diskIoMetrics?: boolean;
+  /** Metric instrument name patterns to drop (supports wildcards, e.g. "system.cpu.*") */
+  droppedMetrics?: string[];
 };
 
 const idGenerator = new RandomIdGenerator();
 
 export class TracingSDK {
-  public readonly asyncResourceDetector = new AsyncResourceDetector();
   private readonly _logProvider: LoggerProvider;
   private readonly _spanExporter: SpanExporter;
   private readonly _traceProvider: NodeTracerProvider;
+  private readonly _meterProvider: MeterProvider;
 
   public readonly getLogger: LoggerProvider["getLogger"];
   public readonly getTracer: TracerProvider["getTracer"];
@@ -112,83 +115,102 @@ export class TracingSDK {
   constructor(private readonly config: TracingSDKConfig) {
     setLogLevel(config.diagLogLevel ?? "none");
 
-    const envResourceAttributesSerialized = getEnvVar("OTEL_RESOURCE_ATTRIBUTES");
+    const envResourceAttributesSerialized = getEnvVar("TRIGGER_OTEL_RESOURCE_ATTRIBUTES");
     const envResourceAttributes = envResourceAttributesSerialized
       ? JSON.parse(envResourceAttributesSerialized)
       : {};
 
-    const commonResources = detectResourcesSync({
-      detectors: [this.asyncResourceDetector, processDetectorSync],
+    const customEnvResourceAttributes = parseOtelResourceAttributes(
+      getEnvVar("CUSTOM_OTEL_RESOURCE_ATTRIBUTES")
+    );
+
+    const commonResources = detectResources({
+      detectors: [processDetector],
     })
       .merge(
-        new Resource({
-          [SemanticResourceAttributes.CLOUD_PROVIDER]: "trigger.dev",
-          [SemanticResourceAttributes.SERVICE_NAME]:
-            getEnvVar("OTEL_SERVICE_NAME") ?? "trigger.dev",
+        resourceFromAttributes({
+          "cloud.provider": "trigger.dev",
+          "service.name": getEnvVar("TRIGGER_OTEL_SERVICE_NAME") ?? "trigger.dev",
           [SemanticInternalAttributes.TRIGGER]: true,
           [SemanticInternalAttributes.CLI_VERSION]: VERSION,
           [SemanticInternalAttributes.SDK_VERSION]: VERSION,
           [SemanticInternalAttributes.SDK_LANGUAGE]: "typescript",
+          [SemanticInternalAttributes.MACHINE_ID]: machineId,
         })
       )
-      .merge(config.resource ?? new Resource({}))
-      .merge(new Resource(envResourceAttributes));
-
-    const traceProvider = new NodeTracerProvider({
-      forceFlushTimeoutMillis: config.forceFlushTimeoutMillis,
-      resource: commonResources,
-      spanLimits: {
-        attributeCountLimit: OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
-        attributeValueLengthLimit: OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT,
-        eventCountLimit: OTEL_SPAN_EVENT_COUNT_LIMIT,
-        attributePerEventCountLimit: OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT,
-        linkCountLimit: OTEL_LINK_COUNT_LIMIT,
-        attributePerLinkCountLimit: OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT,
-      },
-    });
+      .merge(resourceFromAttributes(envResourceAttributes))
+      .merge(resourceFromAttributes(customEnvResourceAttributes))
+      .merge(resourceFromAttributes(taskContext.resourceAttributes))
+      .merge(config.resource ?? resourceFromAttributes({}));
 
     const spanExporter = new OTLPTraceExporter({
       url: `${config.url}/v1/traces`,
       timeoutMillis: config.forceFlushTimeoutMillis,
     });
 
-    traceProvider.addSpanProcessor(
+    const spanProcessors: Array<SpanProcessor> = [];
+
+    spanProcessors.push(
       new TaskContextSpanProcessor(
-        traceProvider.getTracer("trigger-dev-worker", VERSION),
-        getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1"
+        VERSION,
+        getEnvVar("TRIGGER_OTEL_BATCH_PROCESSING_ENABLED") === "1"
           ? new BatchSpanProcessor(spanExporter, {
-              maxExportBatchSize: parseInt(getEnvVar("OTEL_SPAN_MAX_EXPORT_BATCH_SIZE") ?? "64"),
+              maxExportBatchSize: parseInt(
+                getEnvVar("TRIGGER_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE") ?? "64"
+              ),
               scheduledDelayMillis: parseInt(
-                getEnvVar("OTEL_SPAN_SCHEDULED_DELAY_MILLIS") ?? "200"
+                getEnvVar("TRIGGER_OTEL_SPAN_SCHEDULED_DELAY_MILLIS") ?? "200"
               ),
               exportTimeoutMillis: parseInt(
-                getEnvVar("OTEL_SPAN_EXPORT_TIMEOUT_MILLIS") ?? "30000"
+                getEnvVar("TRIGGER_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS") ?? "30000"
               ),
-              maxQueueSize: parseInt(getEnvVar("OTEL_SPAN_MAX_QUEUE_SIZE") ?? "512"),
+              maxQueueSize: parseInt(getEnvVar("TRIGGER_OTEL_SPAN_MAX_QUEUE_SIZE") ?? "512"),
             })
           : new SimpleSpanProcessor(spanExporter)
       )
     );
 
     const externalTraceId = idGenerator.generateTraceId();
+    const externalTraceContext = traceContext.getExternalTraceContext();
 
     for (const exporter of config.exporters ?? []) {
-      traceProvider.addSpanProcessor(
-        getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1"
-          ? new BatchSpanProcessor(new ExternalSpanExporterWrapper(exporter, externalTraceId), {
-              maxExportBatchSize: parseInt(getEnvVar("OTEL_SPAN_MAX_EXPORT_BATCH_SIZE") ?? "64"),
-              scheduledDelayMillis: parseInt(
-                getEnvVar("OTEL_SPAN_SCHEDULED_DELAY_MILLIS") ?? "200"
-              ),
-              exportTimeoutMillis: parseInt(
-                getEnvVar("OTEL_SPAN_EXPORT_TIMEOUT_MILLIS") ?? "30000"
-              ),
-              maxQueueSize: parseInt(getEnvVar("OTEL_SPAN_MAX_QUEUE_SIZE") ?? "512"),
-            })
-          : new SimpleSpanProcessor(new ExternalSpanExporterWrapper(exporter, externalTraceId))
+      spanProcessors.push(
+        getEnvVar("TRIGGER_OTEL_BATCH_PROCESSING_ENABLED") === "1"
+          ? new BatchSpanProcessor(
+              new ExternalSpanExporterWrapper(exporter, externalTraceId, externalTraceContext),
+              {
+                maxExportBatchSize: parseInt(
+                  getEnvVar("TRIGGER_OTEL_SPAN_MAX_EXPORT_BATCH_SIZE") ?? "64"
+                ),
+                scheduledDelayMillis: parseInt(
+                  getEnvVar("TRIGGER_OTEL_SPAN_SCHEDULED_DELAY_MILLIS") ?? "200"
+                ),
+                exportTimeoutMillis: parseInt(
+                  getEnvVar("TRIGGER_OTEL_SPAN_EXPORT_TIMEOUT_MILLIS") ?? "30000"
+                ),
+                maxQueueSize: parseInt(getEnvVar("TRIGGER_OTEL_SPAN_MAX_QUEUE_SIZE") ?? "512"),
+              }
+            )
+          : new SimpleSpanProcessor(
+              new ExternalSpanExporterWrapper(exporter, externalTraceId, externalTraceContext)
+            )
       );
     }
 
+    const traceProvider = new NodeTracerProvider({
+      forceFlushTimeoutMillis: config.forceFlushTimeoutMillis,
+      resource: commonResources,
+      spanLimits: {
+        attributeCountLimit: OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
+        attributeValueLengthLimit: OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT,
+        eventCountLimit: OTEL_SPAN_EVENT_COUNT_LIMIT,
+        attributePerEventCountLimit: OTEL_ATTRIBUTE_PER_EVENT_COUNT_LIMIT,
+        linkCountLimit: OTEL_LINK_COUNT_LIMIT,
+        attributePerLinkCountLimit: OTEL_ATTRIBUTE_PER_LINK_COUNT_LIMIT,
+      },
+      spanProcessors,
+    });
+
     traceProvider.register();
 
     registerInstrumentations({
@@ -200,66 +222,166 @@ export class TracingSDK {
       url: `${config.url}/v1/logs`,
     });
 
-    // To start a logger, you first need to initialize the Logger provider.
-    const loggerProvider = new LoggerProvider({
-      resource: commonResources,
-      logRecordLimits: {
-        attributeCountLimit: OTEL_LOG_ATTRIBUTE_COUNT_LIMIT,
-        attributeValueLengthLimit: OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT,
-      },
-    });
-
-    loggerProvider.addLogRecordProcessor(
+    const logProcessors: Array<LogRecordProcessor> = [
       new TaskContextLogProcessor(
-        getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1"
+        getEnvVar("TRIGGER_OTEL_BATCH_PROCESSING_ENABLED") === "1"
           ? new BatchLogRecordProcessor(logExporter, {
-              maxExportBatchSize: parseInt(getEnvVar("OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"),
-              scheduledDelayMillis: parseInt(getEnvVar("OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"),
-              exportTimeoutMillis: parseInt(getEnvVar("OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"),
-              maxQueueSize: parseInt(getEnvVar("OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
+              maxExportBatchSize: parseInt(
+                getEnvVar("TRIGGER_OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"
+              ),
+              scheduledDelayMillis: parseInt(
+                getEnvVar("TRIGGER_OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"
+              ),
+              exportTimeoutMillis: parseInt(
+                getEnvVar("TRIGGER_OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"
+              ),
+              maxQueueSize: parseInt(getEnvVar("TRIGGER_OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
             })
           : new SimpleLogRecordProcessor(logExporter)
-      )
-    );
+      ),
+    ];
 
     for (const externalLogExporter of config.logExporters ?? []) {
-      loggerProvider.addLogRecordProcessor(
-        getEnvVar("OTEL_BATCH_PROCESSING_ENABLED") === "1"
+      logProcessors.push(
+        getEnvVar("TRIGGER_OTEL_BATCH_PROCESSING_ENABLED") === "1"
           ? new BatchLogRecordProcessor(
-              new ExternalLogRecordExporterWrapper(externalLogExporter, externalTraceId),
+              new ExternalLogRecordExporterWrapper(
+                externalLogExporter,
+                externalTraceId,
+                externalTraceContext
+              ),
               {
-                maxExportBatchSize: parseInt(getEnvVar("OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"),
+                maxExportBatchSize: parseInt(
+                  getEnvVar("TRIGGER_OTEL_LOG_MAX_EXPORT_BATCH_SIZE") ?? "64"
+                ),
                 scheduledDelayMillis: parseInt(
-                  getEnvVar("OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"
+                  getEnvVar("TRIGGER_OTEL_LOG_SCHEDULED_DELAY_MILLIS") ?? "200"
                 ),
                 exportTimeoutMillis: parseInt(
-                  getEnvVar("OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"
+                  getEnvVar("TRIGGER_OTEL_LOG_EXPORT_TIMEOUT_MILLIS") ?? "30000"
                 ),
-                maxQueueSize: parseInt(getEnvVar("OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
+                maxQueueSize: parseInt(getEnvVar("TRIGGER_OTEL_LOG_MAX_QUEUE_SIZE") ?? "512"),
               }
             )
           : new SimpleLogRecordProcessor(
-              new ExternalLogRecordExporterWrapper(externalLogExporter, externalTraceId)
+              new ExternalLogRecordExporterWrapper(
+                externalLogExporter,
+                externalTraceId,
+                externalTraceContext
+              )
             )
       );
     }
 
+    // To start a logger, you first need to initialize the Logger provider.
+    const loggerProvider = new LoggerProvider({
+      resource: commonResources,
+      logRecordLimits: {
+        attributeCountLimit: OTEL_LOG_ATTRIBUTE_COUNT_LIMIT,
+        attributeValueLengthLimit: OTEL_LOG_ATTRIBUTE_VALUE_LENGTH_LIMIT,
+      },
+      processors: logProcessors,
+    });
+
     this._logProvider = loggerProvider;
     this._spanExporter = spanExporter;
     this._traceProvider = traceProvider;
 
     logs.setGlobalLoggerProvider(loggerProvider);
 
+    // Metrics setup
+    const metricsUrl =
+      config.metricsUrl ??
+      getEnvVar("TRIGGER_OTEL_METRICS_ENDPOINT") ??
+      `${config.url}/v1/metrics`;
+
+    const rawMetricExporter = new OTLPMetricExporter({
+      url: metricsUrl,
+      timeoutMillis: config.forceFlushTimeoutMillis,
+    });
+
+    const collectionIntervalMs = parseInt(
+      getEnvVar("TRIGGER_OTEL_METRICS_COLLECTION_INTERVAL_MILLIS") ?? "10000"
+    );
+    const exportIntervalMs = parseInt(
+      getEnvVar("TRIGGER_OTEL_METRICS_EXPORT_INTERVAL_MILLIS") ?? "30000"
+    );
+
+    // Chain: PeriodicReader(10s) → TaskContextMetricExporter → BufferingMetricExporter(30s) → OTLP
+    const bufferingExporter = new BufferingMetricExporter(rawMetricExporter, exportIntervalMs);
+    const metricExporter = new TaskContextMetricExporter(bufferingExporter);
+
+    const exportTimeoutMillis = parseInt(
+      getEnvVar("TRIGGER_OTEL_METRICS_EXPORT_TIMEOUT_MILLIS") ?? "30000"
+    );
+
+    const metricReaders: MetricReader[] = [
+      new PeriodicExportingMetricReader({
+        exporter: metricExporter,
+        exportIntervalMillis: collectionIntervalMs,
+        exportTimeoutMillis: Math.min(exportTimeoutMillis, collectionIntervalMs),
+      }),
+      ...(config.metricExporters ?? []).map(
+        (exporter) =>
+          new PeriodicExportingMetricReader({
+            exporter,
+            exportIntervalMillis: collectionIntervalMs,
+            exportTimeoutMillis: Math.min(exportTimeoutMillis, collectionIntervalMs),
+          })
+      ),
+      ...(config.metricReaders ?? []),
+    ];
+
+    const meterProvider = new MeterProvider({
+      resource: commonResources,
+      readers: metricReaders,
+      views: (config.droppedMetrics ?? []).map((pattern) => ({
+        instrumentName: pattern,
+        aggregation: { type: AggregationType.DROP },
+      })),
+    });
+
+    this._meterProvider = meterProvider;
+    metrics.setGlobalMeterProvider(meterProvider);
+
+    if (config.hostMetrics) {
+      const hostMetrics = new HostMetrics({
+        meterProvider,
+        metricGroups: config.hostMetricGroups,
+      });
+      hostMetrics.start();
+    }
+
+    if (config.nodejsRuntimeMetrics) {
+      startNodejsRuntimeMetrics(meterProvider);
+    }
+
+    if (config.filesystemMetrics) {
+      startFilesystemMetrics(meterProvider);
+    }
+
+    if (config.diskIoMetrics) {
+      startDiskIoMetrics(meterProvider);
+    }
+
     this.getLogger = loggerProvider.getLogger.bind(loggerProvider);
     this.getTracer = traceProvider.getTracer.bind(traceProvider);
   }
 
   public async flush() {
-    await Promise.all([this._traceProvider.forceFlush(), this._logProvider.forceFlush()]);
+    await Promise.all([
+      this._traceProvider.forceFlush(),
+      this._logProvider.forceFlush(),
+      this._meterProvider.forceFlush(),
+    ]);
   }
 
   public async shutdown() {
-    await Promise.all([this._traceProvider.shutdown(), this._logProvider.shutdown()]);
+    await Promise.all([
+      this._traceProvider.shutdown(),
+      this._logProvider.shutdown(),
+      this._meterProvider.shutdown(),
+    ]);
   }
 }
 
@@ -296,25 +418,63 @@ function setLogLevel(level: TracingDiagnosticLogLevel) {
 }
 
 class ExternalSpanExporterWrapper {
+  private readonly _isExternallySampled: boolean;
+
   constructor(
     private underlyingExporter: SpanExporter,
-    private externalTraceId: string
-  ) {}
+    private externalTraceId: string,
+    private externalTraceContext:
+      | { traceId: string; spanId: string; traceFlags: number; tracestate?: string }
+      | undefined
+  ) {
+    this._isExternallySampled = externalTraceContext
+      ? isTraceFlagSampled(externalTraceContext.traceFlags)
+      : !!externalTraceId;
+  }
 
   private transformSpan(span: ReadableSpan): ReadableSpan | undefined {
-    if (span.attributes[SemanticInternalAttributes.SPAN_PARTIAL]) {
-      // Skip partial spans
+    if (!this._isExternallySampled) {
       return;
     }
 
+    if (isSpanInternalOnly(span)) {
+      return;
+    }
+
+    const externalTraceId = this.externalTraceContext
+      ? this.externalTraceContext.traceId
+      : this.externalTraceId;
+
+    const isAttemptSpan = span.attributes[SemanticInternalAttributes.SPAN_ATTEMPT];
+
     const spanContext = span.spanContext();
+    let parentSpanContext = span.parentSpanContext;
+
+    if (parentSpanContext) {
+      parentSpanContext = {
+        ...parentSpanContext,
+        traceId: externalTraceId,
+      };
+    }
+
+    if (isAttemptSpan && this.externalTraceContext) {
+      parentSpanContext = {
+        ...parentSpanContext,
+        traceId: externalTraceId,
+        spanId: this.externalTraceContext.spanId,
+        traceState: this.externalTraceContext.tracestate
+          ? new TraceState(this.externalTraceContext.tracestate)
+          : undefined,
+        traceFlags: this.externalTraceContext.traceFlags,
+      };
+    } else if (isAttemptSpan) {
+      parentSpanContext = undefined;
+    }
 
     return {
       ...span,
-      spanContext: () => ({ ...spanContext, traceId: this.externalTraceId }),
-      parentSpanId: span.attributes[SemanticInternalAttributes.SPAN_ATTEMPT]
-        ? undefined
-        : span.parentSpanId,
+      spanContext: () => ({ ...spanContext, traceId: externalTraceId }),
+      parentSpanContext,
     };
   }
 
@@ -342,12 +502,27 @@ class ExternalSpanExporterWrapper {
 }
 
 class ExternalLogRecordExporterWrapper {
+  private readonly _isExternallySampled: boolean;
+
   constructor(
     private underlyingExporter: LogRecordExporter,
-    private externalTraceId: string
-  ) {}
+    private externalTraceId: string,
+    private externalTraceContext:
+      | { traceId: string; spanId: string; tracestate?: string; traceFlags: number }
+      | undefined
+  ) {
+    this._isExternallySampled = externalTraceContext
+      ? isTraceFlagSampled(externalTraceContext.traceFlags)
+      : !!externalTraceId;
+  }
 
   export(logs: any[], resultCallback: (result: any) => void): void {
+    if (!this._isExternallySampled) {
+      this.underlyingExporter.export([], resultCallback);
+
+      return;
+    }
+
     const modifiedLogs = logs.map(this.transformLogRecord.bind(this));
 
     this.underlyingExporter.export(modifiedLogs, resultCallback);
@@ -358,14 +533,17 @@ class ExternalLogRecordExporterWrapper {
   }
 
   transformLogRecord(logRecord: ReadableLogRecord): ReadableLogRecord {
+    // Capture externalTraceId for use within the proxy's scope.
+    // Use externalTraceContext.traceId if available, otherwise fall back to generated externalTraceId
+    const externalTraceId = this.externalTraceContext
+      ? this.externalTraceContext.traceId
+      : this.externalTraceId;
+
     // If there's no spanContext, or if the externalTraceId is not set, return the original logRecord.
-    if (!logRecord.spanContext || !this.externalTraceId) {
+    if (!logRecord.spanContext || !externalTraceId) {
       return logRecord;
     }
 
-    // Capture externalTraceId for use within the proxy's scope.
-    const { externalTraceId } = this;
-
     return new Proxy(logRecord, {
       get(target, prop, receiver) {
         if (prop === "spanContext") {
@@ -387,3 +565,128 @@ class ExternalLogRecordExporterWrapper {
     });
   }
 }
+
+function isSpanInternalOnly(span: ReadableSpan): boolean {
+  if (span.attributes[SemanticInternalAttributes.SPAN_PARTIAL]) {
+    // Skip partial spans
+    return true;
+  }
+
+  const urlPath = span.attributes["url.path"];
+
+  if (typeof urlPath === "string" && urlPath === "/api/v1/usage/ingest") {
+    return true;
+  }
+
+  const httpUrl = span.attributes["http.url"] ?? span.attributes["url.full"];
+
+  const url = safeParseUrl(httpUrl);
+
+  if (!url) {
+    return false;
+  }
+
+  const internalHosts = [
+    "api.trigger.dev",
+    "billing.trigger.dev",
+    "cloud.trigger.dev",
+    "engine.trigger.dev",
+    "platform.trigger.dev",
+  ];
+
+  return (
+    internalHosts.some((host) => url.hostname.includes(host)) ||
+    url.pathname.includes("/api/v1/usage/ingest")
+  );
+}
+
+function safeParseUrl(url: unknown): URL | undefined {
+  if (typeof url !== "string") {
+    return undefined;
+  }
+
+  try {
+    return new URL(url);
+  } catch (e) {
+    return undefined;
+  }
+}
+
+function isTraceFlagSampled(traceFlags?: number): boolean {
+  if (typeof traceFlags !== "number") {
+    return true;
+  }
+
+  return (traceFlags & TraceFlags.SAMPLED) === TraceFlags.SAMPLED;
+}
+
+function isPrintableAscii(str: string): boolean {
+  // printable ASCII: 0x20 (space) .. 0x7E (~)
+  for (let i = 0; i < str.length; i++) {
+    const code = str.charCodeAt(i);
+    if (code < 0x20 || code > 0x7e) return false;
+  }
+  return true;
+}
+
+function isValid(name: string | undefined): boolean {
+  if (!name) return false;
+  return typeof name === "string" && name.length <= 255 && isPrintableAscii(name);
+}
+
+function isValidAndNotEmpty(name: string | undefined): boolean {
+  if (!name) return false;
+  return isValid(name) && name.length > 0;
+}
+
+export function parseOtelResourceAttributes(
+  rawEnvAttributes: string | undefined | null
+): Record<string, string> {
+  if (!rawEnvAttributes) return {};
+
+  const COMMA = ",";
+  const KV = "=";
+  const attributes: Record<string, string> = {};
+
+  // use negative limit to support trailing empty attribute
+  const rawAttributes = rawEnvAttributes.split(COMMA, -1);
+  for (const rawAttribute of rawAttributes) {
+    const keyValuePair = rawAttribute.split(KV, -1);
+    if (keyValuePair.length !== 2) {
+      // skip invalid pair
+      continue;
+    }
+    let [key, value] = keyValuePair;
+    key = key?.trim();
+    // trim and remove surrounding double quotes
+    value = value?.trim().replace(/^"|"$/g, "");
+
+    if (!value || !key) {
+      continue;
+    }
+
+    if (!isValidAndNotEmpty(key)) {
+      throw new Error(
+        `Attribute key should be a ASCII string with a length greater than 0 and not exceed 255 characters.`
+      );
+    }
+    if (!isValid(value)) {
+      throw new Error(
+        `Attribute value should be a ASCII string with a length not exceed 255 characters.`
+      );
+    }
+
+    // decode percent-encoding (deployment%20name -> deployment name)
+    try {
+      attributes[key] = decodeURIComponent(value);
+    } catch (e: unknown) {
+      // decodeURIComponent can throw for malformed sequences; rethrow or handle
+      if (e instanceof Error) {
+        throw new Error(`Failed to decode attribute value for key ${key}: ${e.message}`);
+      }
+      throw new Error(`Failed to decode attribute value for key ${key}`);
+    }
+  }
+
+  return attributes;
+}
diff --git a/packages/core/src/v3/realtime-streams-api.ts b/packages/core/src/v3/realtime-streams-api.ts
new file mode 100644
index 00000000000..0bc0665c052
--- /dev/null
+++ b/packages/core/src/v3/realtime-streams-api.ts
@@ -0,0 +1,7 @@
+// Split module-level variable definition into separate files to allow
+// tree-shaking on each api instance.
+import { RealtimeStreamsAPI } from "./realtimeStreams/index.js";
+
+export const realtimeStreams = RealtimeStreamsAPI.getInstance();
+
+export * from "./realtimeStreams/types.js";
diff --git a/packages/core/src/v3/realtimeStreams/index.ts b/packages/core/src/v3/realtimeStreams/index.ts
new file mode 100644
index 00000000000..2a35b38befd
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/index.ts
@@ -0,0 +1,49 @@
+import { getGlobal, registerGlobal } from "../utils/globals.js";
+import { NoopRealtimeStreamsManager } from "./noopManager.js";
+import {
+  RealtimeStreamOperationOptions,
+  RealtimeStreamInstance,
+  RealtimeStreamsManager,
+} from "./types.js";
+
+const API_NAME = "realtime-streams";
+
+const NOOP_MANAGER = new NoopRealtimeStreamsManager();
+
+export class RealtimeStreamsAPI implements RealtimeStreamsManager {
+  private static _instance?: RealtimeStreamsAPI;
+
+  private constructor() {}
+
+  public static getInstance(): RealtimeStreamsAPI {
+    if (!this._instance) {
+      this._instance = new RealtimeStreamsAPI();
+    }
+
+    return this._instance;
+  }
+
+  setGlobalManager(manager: RealtimeStreamsManager): boolean {
+    return registerGlobal(API_NAME, manager);
+  }
+
+  #getManager(): RealtimeStreamsManager {
+    return getGlobal(API_NAME) ?? NOOP_MANAGER;
+  }
+
+  public pipe<T>(
+    key: string,
+    source: AsyncIterable<T> | ReadableStream<T>,
+    options?: RealtimeStreamOperationOptions
+  ): RealtimeStreamInstance<T> {
+    return this.#getManager().pipe(key, source, options);
+  }
+
+  public append<TPart extends BodyInit>(
+    key: string,
+    part: TPart,
+    options?: RealtimeStreamOperationOptions
+  ): Promise<void> {
+    return this.#getManager().append(key, part, options);
+  }
+}
diff --git a/packages/core/src/v3/realtimeStreams/manager.ts b/packages/core/src/v3/realtimeStreams/manager.ts
new file mode 100644
index 00000000000..323735df106
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/manager.ts
@@ -0,0 +1,198 @@
+import { ApiClient } from "../apiClient/index.js";
+import { ensureAsyncIterable, ensureReadableStream } from "../streams/asyncIterableStream.js";
+import { taskContext } from "../task-context-api.js";
+import { StreamInstance } from "./streamInstance.js";
+import {
+  RealtimeStreamInstance,
+  RealtimeStreamOperationOptions,
+  RealtimeStreamsManager,
+} from "./types.js";
+
+export class StandardRealtimeStreamsManager implements RealtimeStreamsManager {
+  constructor(
+    private apiClient: ApiClient,
+    private baseUrl: string,
+    private debug: boolean = false
+  ) {}
+  // Track active streams - using a Set allows multiple streams for the same key to coexist
+  private activeStreams = new Set<{
+    wait: () => Promise<void>;
+    abortController: AbortController;
+  }>();
+
+  reset(): void {
+    this.activeStreams.clear();
+  }
+
+  public pipe<T>(
+    key: string,
+    source: AsyncIterable<T> | ReadableStream<T>,
+    options?: RealtimeStreamOperationOptions
+  ): RealtimeStreamInstance<T> {
+    // Normalize ReadableStream to AsyncIterable
+    const readableStreamSource = ensureReadableStream(source);
+
+    const runId = getRunIdForOptions(options);
+
+    if (!runId) {
+      throw new Error(
+        "Could not determine the target run ID for the realtime stream. Please specify a target run ID using the `target` option."
+      );
+    }
+
+    // Create an AbortController for this stream
+    const abortController = new AbortController();
+    // Chain with user-provided signal if present
+    const combinedSignal = options?.signal
+      ? AbortSignal.any?.([options.signal, abortController.signal]) ?? abortController.signal
+      : abortController.signal;
+
+    const streamInstance = new StreamInstance({
+      apiClient: this.apiClient,
+      baseUrl: this.baseUrl,
+      runId,
+      key,
+      source: readableStreamSource,
+      signal: combinedSignal,
+      requestOptions: options?.requestOptions,
+      target: options?.target,
+      debug: this.debug,
+    });
+
+    // Register this stream
+    const streamInfo = { wait: () => streamInstance.wait(), abortController };
+    this.activeStreams.add(streamInfo);
+
+    // Clean up when stream completes
+    streamInstance.wait().finally(() => this.activeStreams.delete(streamInfo));
+
+    return {
+      wait: () => streamInstance.wait(),
+      stream: streamInstance.stream,
+    };
+  }
+
+  public async append<TPart extends BodyInit>(
+    key: string,
+    part: TPart,
+    options?: RealtimeStreamOperationOptions
+  ): Promise<void> {
+    const runId = getRunIdForOptions(options);
+
+    if (!runId) {
+      throw new Error(
+        "Could not determine the target run ID for the realtime stream. Please specify a target run ID using the `target` option."
+      );
+    }
+
+    const result = await this.apiClient.appendToStream(
+      runId,
+      "self",
+      key,
+      part,
+      options?.requestOptions
+    );
+
+    if (!result.ok) {
+      throw new Error(`Failed to append to stream: ${result.message ?? "Unknown error"}`);
+    }
+  }
+
+  public hasActiveStreams(): boolean {
+    return this.activeStreams.size > 0;
+  }
+
+  // Waits for all the streams to finish
+  public async waitForAllStreams(timeout: number = 60_000): Promise<void> {
+    if (this.activeStreams.size === 0) {
+      return;
+    }
+
+    const promises = Array.from(this.activeStreams).map((stream) => stream.wait());
+
+    // Create a timeout promise that resolves to a special sentinel value
+    const TIMEOUT_SENTINEL = Symbol("timeout");
+    const timeoutPromise = new Promise<typeof TIMEOUT_SENTINEL>((resolve) =>
+      setTimeout(() => resolve(TIMEOUT_SENTINEL), timeout)
+    );
+
+    // Race between all streams completing/rejecting and the timeout
+    const result = await Promise.race([Promise.all(promises), timeoutPromise]);
+
+    // Check if we timed out
+    if (result === TIMEOUT_SENTINEL) {
+      // Timeout occurred - abort all active streams
+      const abortedCount = this.activeStreams.size;
+      for (const streamInfo of this.activeStreams) {
+        streamInfo.abortController.abort();
+        this.activeStreams.delete(streamInfo);
+      }
+
+      throw new Error(
+        `Timeout waiting for streams to finish after ${timeout}ms. Aborted ${abortedCount} active stream(s).`
+      );
+    }
+
+    // If we reach here, Promise.all completed (either all resolved or one rejected)
+    // Any rejection from Promise.all will have already propagated
+  }
+}
+
+function getRunIdForOptions(options?: RealtimeStreamOperationOptions): string | undefined {
+  if (options?.target) {
+    if (options.target === "parent") {
+      return taskContext.ctx?.run?.parentTaskRunId ?? taskContext.ctx?.run?.id;
+    }
+
+    if (options.target === "root") {
+      return taskContext.ctx?.run?.rootTaskRunId ?? taskContext.ctx?.run?.id;
+    }
+
+    if (options.target === "self") {
+      return taskContext.ctx?.run?.id;
+    }
+
+    return options.target;
+  }
+
+  return taskContext.ctx?.run?.id;
+}
+
+type ParsedStreamResponse =
+  | {
+      version: "v1";
+    }
+  | {
+      version: "v2";
+      accessToken: string;
+      basin: string;
+      flushIntervalMs?: number;
+      maxRetries?: number;
+    };
+
+function parseCreateStreamResponse(
+  version: string,
+  headers: Record<string, string> | undefined
+): ParsedStreamResponse {
+  if (version === "v1") {
+    return { version: "v1" };
+  }
+
+  const accessToken = headers?.["x-s2-access-token"];
+  const basin = headers?.["x-s2-basin"];
+
+  if (!accessToken || !basin) {
+    return { version: "v1" };
+  }
+
+  const flushIntervalMs = headers?.["x-s2-flush-interval-ms"];
+  const maxRetries = headers?.["x-s2-max-retries"];
+
+  return {
+    version: "v2",
+    accessToken,
+    basin,
+    flushIntervalMs: flushIntervalMs ? parseInt(flushIntervalMs) : undefined,
+    maxRetries: maxRetries ? parseInt(maxRetries) : undefined,
+  };
+}
diff --git a/packages/core/src/v3/realtimeStreams/noopManager.ts b/packages/core/src/v3/realtimeStreams/noopManager.ts
new file mode 100644
index 00000000000..542e66fd53a
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/noopManager.ts
@@ -0,0 +1,30 @@
+import {
+  AsyncIterableStream,
+  createAsyncIterableStreamFromAsyncIterable,
+} from "../streams/asyncIterableStream.js";
+import {
+  RealtimeStreamOperationOptions,
+  RealtimeStreamInstance,
+  RealtimeStreamsManager,
+} from "./types.js";
+
+export class NoopRealtimeStreamsManager implements RealtimeStreamsManager {
+  public pipe<T>(
+    key: string,
+    source: AsyncIterable<T> | ReadableStream<T>,
+    options?: RealtimeStreamOperationOptions
+  ): RealtimeStreamInstance<T> {
+    return {
+      wait: () => Promise.resolve(),
+      get stream(): AsyncIterableStream<T> {
+        return createAsyncIterableStreamFromAsyncIterable(source);
+      },
+    };
+  }
+
+  public async append<TPart extends BodyInit>(
+    key: string,
+    part: TPart,
+    options?: RealtimeStreamOperationOptions
+  ): Promise<void> {}
+}
diff --git a/packages/core/src/v3/realtimeStreams/streamInstance.ts b/packages/core/src/v3/realtimeStreams/streamInstance.ts
new file mode 100644
index 00000000000..5efbcb225a3
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/streamInstance.ts
@@ -0,0 +1,157 @@
+import { ApiClient } from "../apiClient/index.js";
+import { AsyncIterableStream } from "../streams/asyncIterableStream.js";
+import { AnyZodFetchOptions } from "../zodfetch.js";
+import { StreamsWriterV1 } from "./streamsWriterV1.js";
+import { StreamsWriterV2 } from "./streamsWriterV2.js";
+import { StreamsWriter } from "./types.js";
+
+export type StreamInstanceOptions<T> = {
+  apiClient: ApiClient;
+  baseUrl: string;
+  runId: string;
+  key: string;
+  source: ReadableStream<T>;
+  signal?: AbortSignal;
+  requestOptions?: AnyZodFetchOptions;
+  target?: "self" | "parent" | "root" | string;
+  debug?: boolean;
+};
+
+type StreamsWriterInstance<T> = StreamsWriterV1<T> | StreamsWriterV2<T>;
+
+export class StreamInstance<T> implements StreamsWriter {
+  private streamPromise: Promise<StreamsWriterInstance<T>>;
+
+  constructor(private options: StreamInstanceOptions<T>) {
+    this.streamPromise = this.initializeWriter();
+  }
+
+  private async initializeWriter(): Promise<StreamsWriterInstance<T>> {
+    const { version, headers } = await this.options.apiClient.createStream(
+      this.options.runId,
+      "self",
+      this.options.key,
+      this.options?.requestOptions
+    );
+
+    const parsedResponse = parseCreateStreamResponse(version, headers);
+
+    const streamWriter =
+      parsedResponse.version === "v1"
+        ? new StreamsWriterV1({
+            key: this.options.key,
+            runId: this.options.runId,
+            source: this.options.source,
+            baseUrl: this.options.baseUrl,
+            headers: this.options.apiClient.getHeaders(),
+            signal: this.options.signal,
+            version,
+            target: "self",
+          })
+        : new StreamsWriterV2({
+            basin: parsedResponse.basin,
+            stream: parsedResponse.streamName ?? this.options.key,
+            accessToken: parsedResponse.accessToken,
+            source: this.options.source,
+            signal: this.options.signal,
+            debug: this.options.debug,
+            flushIntervalMs: parsedResponse.flushIntervalMs,
+            maxRetries: parsedResponse.maxRetries,
+          });
+
+    return streamWriter;
+  }
+
+  public async wait(): Promise<void> {
+    return this.streamPromise.then((writer) => writer.wait());
+  }
+
+  public get stream(): AsyncIterableStream<T> {
+    const self = this;
+
+    return new ReadableStream<T>({
+      async start(controller) {
+        const streamWriter = await self.streamPromise;
+
+        const iterator = streamWriter[Symbol.asyncIterator]();
+
+        while (true) {
+          if (self.options.signal?.aborted) {
+            controller.close();
+            break;
+          }
+
+          const { done, value } = await iterator.next();
+
+          if (done) {
+            controller.close();
+            break;
+          }
+
+          controller.enqueue(value);
+        }
+      },
+    });
+  }
+}
+
+type ParsedStreamResponse =
+  | {
+      version: "v1";
+    }
+  | {
+      version: "v2";
+      accessToken: string;
+      basin: string;
+      flushIntervalMs?: number;
+      maxRetries?: number;
+      streamName?: string;
+    };
+
+function parseCreateStreamResponse(
+  version: string,
+  headers: Record<string, string> | undefined
+): ParsedStreamResponse {
+  if (version === "v1") {
+    return { version: "v1" };
+  }
+
+  const accessToken = headers?.["x-s2-access-token"];
+  const basin = headers?.["x-s2-basin"];
+
+  if (!accessToken || !basin) {
+    return { version: "v1" };
+  }
+
+  const flushIntervalMs = headers?.["x-s2-flush-interval-ms"];
+  const maxRetries = headers?.["x-s2-max-retries"];
+  const streamName = headers?.["x-s2-stream-name"];
+
+  return {
+    version: "v2",
+    accessToken,
+    basin,
+    flushIntervalMs: flushIntervalMs ? parseInt(flushIntervalMs) : undefined,
+    maxRetries: maxRetries ? parseInt(maxRetries) : undefined,
+    streamName,
+  };
+}
+
+async function* streamToAsyncIterator<T>(stream: ReadableStream<T>): AsyncIterableIterator<T> {
+  const reader = stream.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) return;
+      yield value;
+    }
+  } finally {
+    safeReleaseLock(reader);
+  }
+}
+
+function safeReleaseLock(reader: ReadableStreamDefaultReader<any>) {
+  try {
+    reader.releaseLock();
+  } catch (error) {}
+}
diff --git a/packages/core/src/v3/realtimeStreams/streamsWriterV1.ts b/packages/core/src/v3/realtimeStreams/streamsWriterV1.ts
new file mode 100644
index 00000000000..2f2b4af1682
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/streamsWriterV1.ts
@@ -0,0 +1,468 @@
+import { request as httpsRequest } from "node:https";
+import { request as httpRequest } from "node:http";
+import { URL } from "node:url";
+import { randomBytes } from "node:crypto";
+import { StreamsWriter } from "./types.js";
+
+export type StreamsWriterV1Options<T> = {
+  baseUrl: string;
+  runId: string;
+  key: string;
+  source: ReadableStream<T>;
+  headers?: Record<string, string>;
+  signal?: AbortSignal;
+  version?: string;
+  target?: "self" | "parent" | "root";
+  maxRetries?: number;
+  maxBufferSize?: number; // Max number of chunks to keep in ring buffer
+  clientId?: string; // Optional client ID, auto-generated if not provided
+};
+
+interface BufferedChunk<T> {
+  index: number;
+  data: T;
+}
+
+export class StreamsWriterV1<T> implements StreamsWriter {
+  private controller = new AbortController();
+  private serverStream: ReadableStream<T>;
+  private consumerStream: ReadableStream<T>;
+  private streamPromise: Promise<void>;
+  private retryCount = 0;
+  private readonly maxRetries: number;
+  private currentChunkIndex = 0;
+  private readonly baseDelayMs = 1000; // 1 second base delay
+  private readonly maxDelayMs = 30000; // 30 seconds max delay
+  private readonly maxBufferSize: number;
+  private readonly clientId: string;
+  private ringBuffer: BufferedChunk<T>[] = []; // Ring buffer for recent chunks
+  private bufferStartIndex = 0; // Index of the oldest chunk in buffer
+  private highestBufferedIndex = -1; // Highest chunk index that's been buffered
+  private streamReader: ReadableStreamDefaultReader<T> | null = null;
+  private bufferReaderTask: Promise<void> | null = null;
+  private streamComplete = false;
+
+  constructor(private options: StreamsWriterV1Options<T>) {
+    const [serverStream, consumerStream] = this.options.source.tee();
+    this.serverStream = serverStream;
+    this.consumerStream = consumerStream;
+    this.maxRetries = options.maxRetries ?? 10;
+    this.maxBufferSize = options.maxBufferSize ?? 10000; // Default 10000 chunks
+    this.clientId = options.clientId || this.generateClientId();
+
+    // Start background task to continuously read from stream into ring buffer
+    this.startBuffering();
+
+    this.streamPromise = this.initializeServerStream();
+  }
+
+  private generateClientId(): string {
+    return randomBytes(4).toString("hex");
+  }
+
+  private startBuffering(): void {
+    this.streamReader = this.serverStream.getReader();
+
+    this.bufferReaderTask = (async () => {
+      try {
+        let chunkIndex = 0;
+        while (true) {
+          const { done, value } = await this.streamReader!.read();
+
+          if (done) {
+            this.streamComplete = true;
+            break;
+          }
+
+          // Add to ring buffer
+          this.addToRingBuffer(chunkIndex, value);
+          this.highestBufferedIndex = chunkIndex;
+          chunkIndex++;
+        }
+      } catch (error) {
+        throw error;
+      }
+    })();
+  }
+
+  private async makeRequest(startFromChunk: number = 0): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const url = new URL(this.buildUrl());
+      const timeout = 15 * 60 * 1000; // 15 minutes
+
+      const requestFn = url.protocol === "https:" ? httpsRequest : httpRequest;
+      const req = requestFn({
+        method: "POST",
+        hostname: url.hostname,
+        port: url.port || (url.protocol === "https:" ? 443 : 80),
+        path: url.pathname + url.search,
+        headers: {
+          ...this.options.headers,
+          "Content-Type": "application/json",
+          "X-Client-Id": this.clientId,
+          "X-Resume-From-Chunk": startFromChunk.toString(),
+          "X-Stream-Version": this.options.version ?? "v1",
+        },
+        timeout,
+      });
+
+      req.on("error", async (error) => {
+        const errorCode = "code" in error ? error.code : undefined;
+        const errorMsg = error instanceof Error ? error.message : String(error);
+
+        // Check if this is a retryable connection error
+        if (this.isRetryableError(error)) {
+          if (this.retryCount < this.maxRetries) {
+            this.retryCount++;
+
+            // Clean up the current request to avoid socket leaks
+            req.destroy();
+
+            const delayMs = this.calculateBackoffDelay();
+
+            await this.delay(delayMs);
+
+            // Query server to find out what the last chunk it received was
+            const serverLastChunk = await this.queryServerLastChunkIndex();
+
+            // Resume from the next chunk after what the server has
+            const resumeFromChunk = serverLastChunk + 1;
+
+            resolve(this.makeRequest(resumeFromChunk));
+            return;
+          }
+        }
+
+        reject(error);
+      });
+
+      req.on("timeout", async () => {
+        // Timeout is retryable
+        if (this.retryCount < this.maxRetries) {
+          this.retryCount++;
+
+          // Clean up the current request to avoid socket leaks
+          req.destroy();
+
+          const delayMs = this.calculateBackoffDelay();
+
+          await this.delay(delayMs);
+
+          // Query server to find where to resume
+          const serverLastChunk = await this.queryServerLastChunkIndex();
+          const resumeFromChunk = serverLastChunk + 1;
+
+          resolve(this.makeRequest(resumeFromChunk));
+          return;
+        }
+
+        req.destroy();
+        reject(new Error("Request timed out"));
+      });
+
+      req.on("response", async (res) => {
+        // Check for retryable status codes (408, 429, 5xx)
+        if (res.statusCode && this.isRetryableStatusCode(res.statusCode)) {
+          if (this.retryCount < this.maxRetries) {
+            this.retryCount++;
+
+            // Drain and destroy the response and request to avoid socket leaks
+            // We need to consume the response before destroying it
+            res.resume(); // Start draining the response
+            res.destroy(); // Destroy the response to free the socket
+            req.destroy(); // Destroy the request as well
+
+            const delayMs = this.calculateBackoffDelay();
+
+            await this.delay(delayMs);
+
+            // Query server to find where to resume (in case some data was written)
+            const serverLastChunk = await this.queryServerLastChunkIndex();
+            const resumeFromChunk = serverLastChunk + 1;
+
+            resolve(this.makeRequest(resumeFromChunk));
+            return;
+          }
+
+          res.destroy();
+          req.destroy();
+          reject(
+            new Error(`Max retries (${this.maxRetries}) exceeded for status code ${res.statusCode}`)
+          );
+          return;
+        }
+
+        // Non-retryable error status
+        if (res.statusCode && (res.statusCode < 200 || res.statusCode >= 300)) {
+          res.destroy();
+          req.destroy();
+          const error = new Error(`HTTP error! status: ${res.statusCode}`);
+          reject(error);
+          return;
+        }
+
+        // Success! Reset retry count
+        this.retryCount = 0;
+
+        res.on("end", () => {
+          resolve();
+        });
+
+        res.resume();
+      });
+
+      if (this.options.signal) {
+        this.options.signal.addEventListener("abort", () => {
+          req.destroy(new Error("Request aborted"));
+        });
+      }
+
+      const processStream = async () => {
+        try {
+          let lastSentIndex = startFromChunk - 1;
+
+          while (true) {
+            // Send all chunks that are available in buffer
+            while (lastSentIndex < this.highestBufferedIndex) {
+              lastSentIndex++;
+              const chunk = this.ringBuffer.find((c) => c.index === lastSentIndex);
+
+              if (chunk) {
+                const stringified = JSON.stringify(chunk.data) + "\n";
+                req.write(stringified);
+                this.currentChunkIndex = lastSentIndex + 1;
+              }
+            }
+
+            // If stream is complete and we've sent all buffered chunks, we're done
+            if (this.streamComplete && lastSentIndex >= this.highestBufferedIndex) {
+              req.end();
+              break;
+            }
+
+            // Wait a bit for more chunks to be buffered
+            await this.delay(10);
+          }
+        } catch (error) {
+          reject(error);
+        }
+      };
+
+      processStream().catch((error) => {
+        reject(error);
+      });
+    });
+  }
+
+  private async initializeServerStream(): Promise<void> {
+    await this.makeRequest(0);
+  }
+
+  public async wait(): Promise<void> {
+    return this.streamPromise;
+  }
+
+  public [Symbol.asyncIterator]() {
+    return streamToAsyncIterator(this.consumerStream);
+  }
+
+  private buildUrl(): string {
+    return `${this.options.baseUrl}/realtime/v1/streams/${this.options.runId}/${
+      this.options.target ?? "self"
+    }/${this.options.key}`;
+  }
+
+  private isRetryableError(error: any): boolean {
+    if (!error) return false;
+
+    // Connection errors that are safe to retry
+    const retryableErrors = [
+      "ECONNRESET", // Connection reset by peer
+      "ECONNREFUSED", // Connection refused
+      "ETIMEDOUT", // Connection timed out
+      "ENOTFOUND", // DNS lookup failed
+      "EPIPE", // Broken pipe
+      "EHOSTUNREACH", // Host unreachable
+      "ENETUNREACH", // Network unreachable
+      "socket hang up", // Socket hang up
+    ];
+
+    // Check error code
+    if (error.code && retryableErrors.includes(error.code)) {
+      return true;
+    }
+
+    // Check error message for socket hang up
+    if (error.message && error.message.includes("socket hang up")) {
+      return true;
+    }
+
+    return false;
+  }
+
+  private isRetryableStatusCode(statusCode: number): boolean {
+    // Retry on transient server errors
+    if (statusCode === 408) return true; // Request Timeout
+    if (statusCode === 429) return true; // Rate Limit
+    if (statusCode === 500) return true; // Internal Server Error
+    if (statusCode === 502) return true; // Bad Gateway
+    if (statusCode === 503) return true; // Service Unavailable
+    if (statusCode === 504) return true; // Gateway Timeout
+
+    return false;
+  }
+
+  private async delay(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
+  private calculateBackoffDelay(): number {
+    // Exponential backoff with jitter: baseDelay * 2^retryCount + random jitter
+    const exponentialDelay = this.baseDelayMs * Math.pow(2, this.retryCount);
+    const jitter = Math.random() * 1000; // 0-1000ms jitter
+    return Math.min(exponentialDelay + jitter, this.maxDelayMs);
+  }
+
+  private addToRingBuffer(index: number, data: T): void {
+    const chunk: BufferedChunk<T> = { index, data };
+
+    if (this.ringBuffer.length < this.maxBufferSize) {
+      // Buffer not full yet, just append
+      this.ringBuffer.push(chunk);
+    } else {
+      // Buffer full, replace oldest chunk (ring buffer behavior)
+      const bufferIndex = index % this.maxBufferSize;
+      this.ringBuffer[bufferIndex] = chunk;
+      this.bufferStartIndex = Math.max(this.bufferStartIndex, index - this.maxBufferSize + 1);
+    }
+  }
+
+  private getChunksFromBuffer(startIndex: number): BufferedChunk<T>[] {
+    const result: BufferedChunk<T>[] = [];
+
+    for (const chunk of this.ringBuffer) {
+      if (chunk.index >= startIndex) {
+        result.push(chunk);
+      }
+    }
+
+    // Sort by index to ensure correct order
+    result.sort((a, b) => a.index - b.index);
+    return result;
+  }
+
+  private async queryServerLastChunkIndex(attempt: number = 0): Promise<number> {
+    return new Promise((resolve, reject) => {
+      const url = new URL(this.buildUrl());
+      const maxHeadRetries = 3; // Separate retry limit for HEAD requests
+
+      const requestFn = url.protocol === "https:" ? httpsRequest : httpRequest;
+      const req = requestFn({
+        method: "HEAD",
+        hostname: url.hostname,
+        port: url.port || (url.protocol === "https:" ? 443 : 80),
+        path: url.pathname + url.search,
+        headers: {
+          ...this.options.headers,
+          "X-Client-Id": this.clientId,
+          "X-Stream-Version": this.options.version ?? "v1",
+        },
+        timeout: 5000, // 5 second timeout for HEAD request
+      });
+
+      req.on("error", async (error) => {
+        if (this.isRetryableError(error) && attempt < maxHeadRetries) {
+          // Clean up the current request to avoid socket leaks
+          req.destroy();
+
+          await this.delay(1000 * (attempt + 1)); // Simple linear backoff
+          const result = await this.queryServerLastChunkIndex(attempt + 1);
+          resolve(result);
+          return;
+        }
+
+        req.destroy();
+        // Return -1 to indicate we don't know what the server has (resume from 0)
+        resolve(-1);
+      });
+
+      req.on("timeout", async () => {
+        req.destroy();
+
+        if (attempt < maxHeadRetries) {
+          await this.delay(1000 * (attempt + 1));
+          const result = await this.queryServerLastChunkIndex(attempt + 1);
+          resolve(result);
+          return;
+        }
+
+        resolve(-1);
+      });
+
+      req.on("response", async (res) => {
+        // Retry on 5xx errors
+        if (res.statusCode && this.isRetryableStatusCode(res.statusCode)) {
+          if (attempt < maxHeadRetries) {
+            // Drain and destroy the response and request to avoid socket leaks
+            res.resume();
+            res.destroy();
+            req.destroy();
+
+            await this.delay(1000 * (attempt + 1));
+            const result = await this.queryServerLastChunkIndex(attempt + 1);
+            resolve(result);
+            return;
+          }
+
+          res.destroy();
+          req.destroy();
+          resolve(-1);
+          return;
+        }
+
+        // Non-retryable error
+        if (res.statusCode && (res.statusCode < 200 || res.statusCode >= 300)) {
+          res.destroy();
+          req.destroy();
+          resolve(-1);
+          return;
+        }
+
+        // Success - extract chunk index
+        const lastChunkHeader = res.headers["x-last-chunk-index"];
+        if (lastChunkHeader) {
+          const lastChunkIndex = parseInt(
+            Array.isArray(lastChunkHeader) ? lastChunkHeader[0] ?? "0" : lastChunkHeader ?? "0",
+            10
+          );
+          resolve(lastChunkIndex);
+        } else {
+          resolve(-1);
+        }
+
+        res.resume(); // Consume response
+      });
+
+      req.end();
+    });
+  }
+}
+
+async function* streamToAsyncIterator<T>(stream: ReadableStream<T>): AsyncIterableIterator<T> {
+  const reader = stream.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) return;
+      yield value;
+    }
+  } finally {
+    safeReleaseLock(reader);
+  }
+}
+
+function safeReleaseLock(reader: ReadableStreamDefaultReader<any>) {
+  try {
+    reader.releaseLock();
+  } catch (error) {}
+}
diff --git a/packages/core/src/v3/realtimeStreams/streamsWriterV2.ts b/packages/core/src/v3/realtimeStreams/streamsWriterV2.ts
new file mode 100644
index 00000000000..568ff5574e6
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/streamsWriterV2.ts
@@ -0,0 +1,216 @@
+import { S2, AppendRecord, BatchTransform } from "@s2-dev/streamstore";
+import { StreamsWriter } from "./types.js";
+import { nanoid } from "nanoid";
+
+export type StreamsWriterV2Options<T = any> = {
+  basin: string;
+  stream: string;
+  accessToken: string;
+  source: ReadableStream<T>;
+  signal?: AbortSignal;
+  flushIntervalMs?: number; // Used as lingerDuration for BatchTransform (default 200ms)
+  maxRetries?: number; // Not used with appendSession, kept for compatibility
+  debug?: boolean; // Enable debug logging (default false)
+  maxQueuedBytes?: number; // Max queued bytes for appendSession (default 10MB)
+};
+
+/**
+ * StreamsWriterV2 writes metadata stream data directly to S2 (https://s2.dev).
+ *
+ * Features:
+ * - Direct streaming: Uses S2's appendSession for efficient streaming
+ * - Automatic batching: Uses BatchTransform to batch records
+ * - No manual buffering: S2 handles buffering internally
+ * - Debug logging: Enable with debug: true to see detailed operation logs
+ *
+ * Example usage:
+ * ```typescript
+ * const stream = new StreamsWriterV2({
+ *   basin: "my-basin",
+ *   stream: "my-stream",
+ *   accessToken: "s2-token-here",
+ *   source: myAsyncIterable,
+ *   flushIntervalMs: 200, // Optional: batch linger duration in ms
+ *   debug: true, // Optional: enable debug logging
+ * });
+ *
+ * // Wait for streaming to complete
+ * await stream.wait();
+ *
+ * // Or consume the stream
+ * for await (const value of stream) {
+ *   console.log(value);
+ * }
+ * ```
+ */
+export class StreamsWriterV2<T = any> implements StreamsWriter {
+  private s2Client: S2;
+  private serverStream: ReadableStream<T>;
+  private consumerStream: ReadableStream<T>;
+  private streamPromise: Promise<void>;
+  private readonly flushIntervalMs: number;
+  private readonly debug: boolean;
+  private readonly maxQueuedBytes: number;
+  private aborted = false;
+  private sessionWritable: WritableStream<any> | null = null;
+
+  constructor(private options: StreamsWriterV2Options<T>) {
+    this.debug = options.debug ?? false;
+    this.s2Client = new S2({ accessToken: options.accessToken });
+    this.flushIntervalMs = options.flushIntervalMs ?? 200;
+    this.maxQueuedBytes = options.maxQueuedBytes ?? 1024 * 1024 * 10; // 10MB default
+
+    this.log(
+      `[S2MetadataStream] Initializing: basin=${options.basin}, stream=${options.stream}, flushIntervalMs=${this.flushIntervalMs}, maxQueuedBytes=${this.maxQueuedBytes}`
+    );
+
+    // Check if already aborted
+    if (options.signal?.aborted) {
+      this.aborted = true;
+      this.log("[S2MetadataStream] Signal already aborted, skipping initialization");
+      this.serverStream = new ReadableStream<T>();
+      this.consumerStream = new ReadableStream<T>();
+      this.streamPromise = Promise.resolve();
+      return;
+    }
+
+    // Set up abort signal handler
+    if (options.signal) {
+      options.signal.addEventListener("abort", () => {
+        this.log("[S2MetadataStream] Abort signal received");
+        this.handleAbort();
+      });
+    }
+
+    const [serverStream, consumerStream] = this.options.source.tee();
+    this.serverStream = serverStream;
+    this.consumerStream = consumerStream;
+
+    this.streamPromise = this.initializeServerStream();
+  }
+
+  private handleAbort(): void {
+    if (this.aborted) {
+      return; // Already aborted
+    }
+
+    this.aborted = true;
+    this.log("[S2MetadataStream] Handling abort - cleaning up resources");
+
+    // Abort the writable stream if it exists
+    if (this.sessionWritable) {
+      this.sessionWritable
+        .abort("Aborted")
+        .catch((error) => {
+          this.logError("[S2MetadataStream] Error aborting writable stream:", error);
+        })
+        .finally(() => {
+          this.log("[S2MetadataStream] Writable stream aborted");
+        });
+    }
+
+    this.log("[S2MetadataStream] Abort cleanup complete");
+  }
+
+  private async initializeServerStream(): Promise<void> {
+    try {
+      if (this.aborted) {
+        this.log("[S2MetadataStream] Stream initialization aborted");
+        return;
+      }
+
+      this.log("[S2MetadataStream] Getting S2 basin and stream");
+      const basin = this.s2Client.basin(this.options.basin);
+      const stream = basin.stream(this.options.stream);
+
+      const session = await stream.appendSession({
+        maxQueuedBytes: this.maxQueuedBytes,
+      });
+
+      this.sessionWritable = session.writable;
+
+      this.log(`[S2MetadataStream] Starting stream pipeline`);
+
+      // Convert source stream to AppendRecord format and pipe to S2
+      await this.serverStream
+        .pipeThrough(
+          new TransformStream<T, AppendRecord>({
+            transform: (chunk, controller) => {
+              if (this.aborted) {
+                controller.error(new Error("Stream aborted"));
+                return;
+              }
+              // Convert each chunk to JSON string and wrap in AppendRecord
+              controller.enqueue(AppendRecord.make(JSON.stringify({ data: chunk, id: nanoid(7) })));
+            },
+          })
+        )
+        .pipeThrough(
+          new BatchTransform({
+            lingerDurationMillis: this.flushIntervalMs,
+          })
+        )
+        .pipeTo(session.writable);
+
+      this.log("[S2MetadataStream] Stream pipeline completed successfully");
+
+      // Get final position to verify completion
+      const lastAcked = session.lastAckedPosition();
+
+      if (lastAcked?.end) {
+        const recordsWritten = lastAcked.end.seq_num;
+        this.log(
+          `[S2MetadataStream] Written ${recordsWritten} records, ending at seq_num=${lastAcked.end.seq_num}`
+        );
+      }
+    } catch (error) {
+      if (this.aborted) {
+        this.log("[S2MetadataStream] Stream error occurred but stream was aborted");
+        return;
+      }
+      this.logError("[S2MetadataStream] Error in stream pipeline:", error);
+      throw error;
+    }
+  }
+
+  public async wait(): Promise<void> {
+    await this.streamPromise;
+  }
+
+  public [Symbol.asyncIterator]() {
+    return streamToAsyncIterator(this.consumerStream);
+  }
+
+  // Helper methods
+
+  private log(message: string): void {
+    if (this.debug) {
+      console.log(message);
+    }
+  }
+
+  private logError(message: string, error?: any): void {
+    if (this.debug) {
+      console.error(message, error);
+    }
+  }
+}
+
+async function* streamToAsyncIterator<T>(stream: ReadableStream<T>): AsyncIterableIterator<T> {
+  const reader = stream.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) return;
+      yield value;
+    }
+  } finally {
+    safeReleaseLock(reader);
+  }
+}
+
+function safeReleaseLock(reader: ReadableStreamDefaultReader<any>) {
+  try {
+    reader.releaseLock();
+  } catch (error) {}
+}
diff --git a/packages/core/src/v3/realtimeStreams/types.ts b/packages/core/src/v3/realtimeStreams/types.ts
new file mode 100644
index 00000000000..25f116d5d96
--- /dev/null
+++ b/packages/core/src/v3/realtimeStreams/types.ts
@@ -0,0 +1,145 @@
+import { AnyZodFetchOptions, ApiRequestOptions } from "../apiClient/core.js";
+import { AsyncIterableStream } from "../streams/asyncIterableStream.js";
+import { Prettify } from "../types/utils.js";
+
+export type RealtimeStreamOperationOptions = {
+  signal?: AbortSignal;
+  target?: string;
+  requestOptions?: AnyZodFetchOptions;
+};
+
+export interface RealtimeStreamsManager {
+  pipe<T>(
+    key: string,
+    source: AsyncIterable<T> | ReadableStream<T>,
+    options?: RealtimeStreamOperationOptions
+  ): RealtimeStreamInstance<T>;
+
+  append<TPart extends BodyInit>(
+    key: string,
+    part: TPart,
+    options?: RealtimeStreamOperationOptions
+  ): Promise<void>;
+}
+
+export interface RealtimeStreamInstance<T> {
+  wait(): Promise<void>;
+  get stream(): AsyncIterableStream<T>;
+}
+
+export interface StreamsWriter {
+  wait(): Promise<void>;
+}
+
+export type RealtimeDefinedStream<TPart> = {
+  id: string;
+  pipe: (
+    value: AsyncIterable<TPart> | ReadableStream<TPart>,
+    options?: PipeStreamOptions
+  ) => PipeStreamResult<TPart>;
+  read: (runId: string, options?: ReadStreamOptions) => Promise<AsyncIterableStream<TPart>>;
+  append: (value: TPart, options?: AppendStreamOptions) => Promise<void>;
+  writer: (options: WriterStreamOptions<TPart>) => PipeStreamResult<TPart>;
+};
+
+export type InferStreamType<T> = T extends RealtimeDefinedStream<infer TPart> ? TPart : unknown;
+
+/**
+ * Options for appending data to a realtime stream.
+ */
+export type PipeStreamOptions = {
+  /**
+   * An AbortSignal that can be used to cancel the stream operation.
+   * If the signal is aborted, the stream will be closed.
+   */
+  signal?: AbortSignal;
+  /**
+   * The target run ID to pipe the stream to. Can be:
+   * - `"self"` - Pipe to the current run (default)
+   * - `"parent"` - Pipe to the parent run
+   * - `"root"` - Pipe to the root run
+   * - A specific run ID string
+   *
+   * If not provided and not called from within a task, an error will be thrown.
+   */
+  target?: string;
+  /**
+   * Additional request options for the API call.
+   */
+  requestOptions?: ApiRequestOptions;
+};
+
+/**
+ * The result of piping data to a realtime stream.
+ *
+ * @template T - The type of data chunks in the stream
+ */
+export type PipeStreamResult<T> = {
+  /**
+   * The original stream that was piped. You can consume this stream in your task
+   * to process the data locally while it's also being piped to the realtime stream.
+   */
+  stream: AsyncIterableStream<T>;
+  /**
+   * A function that returns a promise which resolves when all data has been piped
+   * to the realtime stream. Use this to wait for the stream to complete before
+   * finishing your task.
+   */
+  waitUntilComplete: () => Promise<void>;
+};
+
+/**
+ * Options for reading data from a realtime stream.
+ */
+export type ReadStreamOptions = {
+  /**
+   * An AbortSignal that can be used to cancel the stream reading operation.
+   * If the signal is aborted, the stream will be closed.
+   */
+  signal?: AbortSignal;
+  /**
+   * The number of seconds to wait for new data to be available.
+   * If no data arrives within the timeout, the stream will be closed.
+   *
+   * @default 60 seconds
+   */
+  timeoutInSeconds?: number;
+
+  /**
+   * The index to start reading from (1-based).
+   * If not provided, the stream will start from the beginning.
+   * Use this to resume reading from a specific position.
+   *
+   * @default 0 (start from beginning)
+   */
+  startIndex?: number;
+};
+
+/**
+ * Options for appending data to a realtime stream.
+ */
+export type AppendStreamOptions = {
+  /**
+   * The target run ID to append the stream to. Can be:
+   * - `"self"` - Pipe to the current run (default)
+   * - `"parent"` - Pipe to the parent run
+   * - `"root"` - Pipe to the root run
+   * - A specific run ID string
+   *
+   * If not provided and not called from within a task, an error will be thrown.
+   */
+  target?: string;
+  /**
+   * Additional request options for the API call.
+   */
+  requestOptions?: ApiRequestOptions;
+};
+
+export type WriterStreamOptions<TPart> = Prettify<
+  PipeStreamOptions & {
+    execute: (options: {
+      write: (part: TPart) => void;
+      merge(stream: ReadableStream<TPart>): void;
+    }) => Promise<void> | void;
+  }
+>;
diff --git a/packages/core/src/v3/resource-catalog/catalog.ts b/packages/core/src/v3/resource-catalog/catalog.ts
index 725899c0d13..9ad14dd8484 100644
--- a/packages/core/src/v3/resource-catalog/catalog.ts
+++ b/packages/core/src/v3/resource-catalog/catalog.ts
@@ -1,5 +1,5 @@
 import { QueueManifest, TaskManifest, WorkerManifest } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 
 export interface ResourceCatalog {
   setCurrentFileContext(filePath: string, entryPoint: string): void;
@@ -13,4 +13,5 @@ export interface ResourceCatalog {
   registerWorkerManifest(workerManifest: WorkerManifest): void;
   registerQueueMetadata(queue: QueueManifest): void;
   listQueueManifests(): Array<QueueManifest>;
+  getTaskSchema(id: string): TaskSchema | undefined;
 }
diff --git a/packages/core/src/v3/resource-catalog/index.ts b/packages/core/src/v3/resource-catalog/index.ts
index 6773f1b6217..a564648fcc3 100644
--- a/packages/core/src/v3/resource-catalog/index.ts
+++ b/packages/core/src/v3/resource-catalog/index.ts
@@ -1,7 +1,7 @@
 const API_NAME = "resource-catalog";
 
 import { QueueManifest, TaskManifest, WorkerManifest } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 import { getGlobal, registerGlobal, unregisterGlobal } from "../utils/globals.js";
 import { type ResourceCatalog } from "./catalog.js";
 import { NoopResourceCatalog } from "./noopResourceCatalog.js";
@@ -65,6 +65,10 @@ export class ResourceCatalogAPI {
     return this.#getCatalog().getTask(id);
   }
 
+  public getTaskSchema(id: string): TaskSchema | undefined {
+    return this.#getCatalog().getTaskSchema(id);
+  }
+
   public taskExists(id: string): boolean {
     return this.#getCatalog().taskExists(id);
   }
diff --git a/packages/core/src/v3/resource-catalog/noopResourceCatalog.ts b/packages/core/src/v3/resource-catalog/noopResourceCatalog.ts
index b0e0f73056b..53a953393aa 100644
--- a/packages/core/src/v3/resource-catalog/noopResourceCatalog.ts
+++ b/packages/core/src/v3/resource-catalog/noopResourceCatalog.ts
@@ -1,5 +1,5 @@
 import { QueueManifest, TaskManifest, WorkerManifest } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 import { ResourceCatalog } from "./catalog.js";
 
 export class NoopResourceCatalog implements ResourceCatalog {
@@ -31,6 +31,10 @@ export class NoopResourceCatalog implements ResourceCatalog {
     return undefined;
   }
 
+  getTaskSchema(id: string): TaskSchema | undefined {
+    return undefined;
+  }
+
   taskExists(id: string): boolean {
     return false;
   }
diff --git a/packages/core/src/v3/resource-catalog/standardResourceCatalog.ts b/packages/core/src/v3/resource-catalog/standardResourceCatalog.ts
index 7468b63d801..3d2f1cadfd3 100644
--- a/packages/core/src/v3/resource-catalog/standardResourceCatalog.ts
+++ b/packages/core/src/v3/resource-catalog/standardResourceCatalog.ts
@@ -5,10 +5,11 @@ import {
   WorkerManifest,
   QueueManifest,
 } from "../schemas/index.js";
-import { TaskMetadataWithFunctions } from "../types/index.js";
+import { TaskMetadataWithFunctions, TaskSchema } from "../types/index.js";
 import { ResourceCatalog } from "./catalog.js";
 
 export class StandardResourceCatalog implements ResourceCatalog {
+  private _taskSchemas: Map<string, TaskSchema> = new Map();
   private _taskMetadata: Map<string, TaskMetadata> = new Map();
   private _taskFunctions: Map<string, TaskMetadataWithFunctions["fns"]> = new Map();
   private _taskFileMetadata: Map<string, TaskFileMetadata> = new Map();
@@ -60,7 +61,7 @@ export class StandardResourceCatalog implements ResourceCatalog {
       return;
     }
 
-    const { fns, ...metadata } = task;
+    const { fns, schema, ...metadata } = task;
 
     if (!task.id) {
       return;
@@ -72,6 +73,10 @@ export class StandardResourceCatalog implements ResourceCatalog {
 
     this._taskMetadata.set(task.id, metadata);
     this._taskFunctions.set(task.id, fns);
+
+    if (schema) {
+      this._taskSchemas.set(task.id, schema);
+    }
   }
 
   updateTaskMetadata(id: string, updates: Partial<TaskMetadataWithFunctions>): void {
@@ -107,15 +112,21 @@ export class StandardResourceCatalog implements ResourceCatalog {
         continue;
       }
 
-      result.push({
+      const taskManifest = {
         ...metadata,
         ...fileMetadata,
-      });
+      };
+
+      result.push(taskManifest);
     }
 
     return result;
   }
 
+  getTaskSchema(id: string): TaskSchema | undefined {
+    return this._taskSchemas.get(id);
+  }
+
   listQueueManifests(): Array<QueueManifest> {
     return Array.from(this._queueMetadata.values());
   }
diff --git a/packages/core/src/v3/runEngineWorker/index.ts b/packages/core/src/v3/runEngineWorker/index.ts
index 98566ae225f..50617df11af 100644
--- a/packages/core/src/v3/runEngineWorker/index.ts
+++ b/packages/core/src/v3/runEngineWorker/index.ts
@@ -2,6 +2,7 @@ export * from "./consts.js";
 export * from "./supervisor/http.js";
 export * from "./supervisor/schemas.js";
 export * from "./supervisor/session.js";
+export * from "./supervisor/consumerPool.js";
 export * from "./workload/http.js";
 export * from "./workload/schemas.js";
 export * from "./types.js";
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/consumerPool.test.ts b/packages/core/src/v3/runEngineWorker/supervisor/consumerPool.test.ts
new file mode 100644
index 00000000000..5f515b95b79
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/consumerPool.test.ts
@@ -0,0 +1,721 @@
+import { describe, it, expect, beforeEach, afterEach, vi, Mock } from "vitest";
+import {
+  RunQueueConsumerPool,
+  type ConsumerPoolOptions,
+  type QueueConsumerFactory,
+} from "./consumerPool.js";
+import { SupervisorHttpClient } from "./http.js";
+import type { WorkerApiDequeueResponseBody } from "./schemas.js";
+import type { QueueConsumer } from "./queueConsumer.js";
+
+// Mock only the logger
+vi.mock("../../utils/structuredLogger.js");
+
+// Test implementation of QueueConsumer
+class TestQueueConsumer implements QueueConsumer {
+  public started = false;
+  public stopped = false;
+  public onDequeue?: (messages: WorkerApiDequeueResponseBody) => Promise<void>;
+
+  constructor(opts: any) {
+    this.onDequeue = opts.onDequeue;
+  }
+
+  start(): void {
+    this.started = true;
+    this.stopped = false;
+  }
+
+  stop(): void {
+    this.stopped = true;
+    this.started = false;
+  }
+}
+
+describe("RunQueueConsumerPool", () => {
+  let mockClient: SupervisorHttpClient;
+  let mockOnDequeue: Mock;
+  let pool: RunQueueConsumerPool;
+  let defaultOptions: Omit<ConsumerPoolOptions, "scaling">;
+  let testConsumers: TestQueueConsumer[];
+  let testConsumerFactory: QueueConsumerFactory;
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.useFakeTimers();
+
+    mockClient = {} as SupervisorHttpClient;
+    mockOnDequeue = vi.fn();
+    testConsumers = [];
+
+    testConsumerFactory = (opts) => {
+      const consumer = new TestQueueConsumer(opts);
+      testConsumers.push(consumer);
+      return consumer;
+    };
+
+    defaultOptions = {
+      consumer: {
+        client: mockClient,
+        intervalMs: 0,
+        idleIntervalMs: 1000,
+        onDequeue: mockOnDequeue,
+      },
+      consumerFactory: testConsumerFactory,
+    };
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    if (pool) {
+      pool.stop();
+    }
+  });
+
+  function advanceTimeAndProcessMetrics(ms: number) {
+    vi.advanceTimersByTime(ms);
+
+    // Trigger batch processing if ready (without adding a sample)
+    if (pool["metricsProcessor"].shouldProcessBatch()) {
+      pool["processMetricsBatch"]();
+    }
+  }
+
+  describe("Static mode (strategy='none')", () => {
+    it("should start with maxConsumerCount in static mode", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: { strategy: "none", maxConsumerCount: 5 },
+      });
+
+      await pool.start();
+
+      expect(pool.size).toBe(5);
+      expect(testConsumers.length).toBe(5);
+    });
+
+    it("should not scale in static mode even with queue length updates", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: { strategy: "none", maxConsumerCount: 3 },
+      });
+
+      await pool.start();
+      const initialCount = pool.size;
+
+      pool.updateQueueLength(100);
+      vi.advanceTimersByTime(2000);
+
+      expect(pool.size).toBe(initialCount);
+      expect(pool.size).toBe(3);
+    });
+  });
+
+  describe("Smooth scaling strategy", () => {
+    it("should scale smoothly with damping", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          scaleUpCooldownMs: 0,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(1);
+
+      pool.updateQueueLength(5);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(4); // Damped scaling
+
+      pool.updateQueueLength(5);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(5); // Gradually approaches target
+    });
+
+    it("should respect max consumer count", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 1,
+          maxConsumerCount: 5,
+          scaleUpCooldownMs: 0,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(1);
+
+      pool.updateQueueLength(100);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(5);
+
+      pool.updateQueueLength(100);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(5);
+    });
+  });
+
+  describe("Aggressive scaling strategy", () => {
+    it("should scale up quickly based on queue pressure", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 2,
+          maxConsumerCount: 10,
+          scaleUpCooldownMs: 0,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(2);
+
+      pool.updateQueueLength(10);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(3);
+
+      pool.updateQueueLength(20);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(4);
+    });
+
+    it("should scale down cautiously when queue is small", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          scaleUpCooldownMs: 0,
+          scaleDownCooldownMs: 0,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(1);
+
+      pool.updateQueueLength(10);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(2);
+
+      pool.updateQueueLength(0.5);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(3); // EWMA smoothing delays scale down
+
+      pool.updateQueueLength(0.5);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBeGreaterThanOrEqual(3); // Stays in optimal zone
+    });
+
+    it("should maintain current level in optimal zone", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 3,
+          maxConsumerCount: 10,
+          scaleUpCooldownMs: 0,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(3);
+
+      pool.updateQueueLength(3);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(3);
+
+      pool.updateQueueLength(4);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBe(3);
+    });
+  });
+
+  describe("Smooth scaling with EWMA", () => {
+    it("should use exponential smoothing for stable scaling", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      const queueLengths = [10, 2, 8, 3, 9, 1, 7];
+      for (const length of queueLengths) {
+        pool.updateQueueLength(length);
+        vi.advanceTimersByTime(200);
+      }
+      vi.advanceTimersByTime(900);
+
+      const metrics = pool.getMetrics();
+      expect(metrics.smoothedQueueLength).toBeGreaterThan(0);
+      expect(metrics.smoothedQueueLength).toBeLessThan(10);
+    });
+
+    it("should apply damping factor to avoid rapid changes", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      pool.updateQueueLength(2);
+      advanceTimeAndProcessMetrics(1100);
+      const metrics1 = pool.getMetrics();
+      expect(metrics1.smoothedQueueLength).toBe(2);
+
+      pool.updateQueueLength(20);
+      advanceTimeAndProcessMetrics(1100);
+      const metrics2 = pool.getMetrics();
+
+      expect(metrics2.smoothedQueueLength).toBeGreaterThan(2);
+      expect(metrics2.smoothedQueueLength).toBeLessThan(20);
+    });
+  });
+
+  describe("High throughput parallel dequeuing", () => {
+    it("should handle rapid parallel queue updates", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 1,
+          maxConsumerCount: 20,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      const updates: number[] = [];
+      for (let i = 0; i < 100; i++) {
+        updates.push(Math.floor(Math.random() * 50) + 10);
+      }
+
+      updates.forEach((length, index) => {
+        setTimeout(() => pool.updateQueueLength(length), index * 10);
+      });
+
+      advanceTimeAndProcessMetrics(1100);
+
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBeDefined();
+    });
+
+    it("should batch metrics updates to avoid excessive scaling", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      const evaluateScalingSpy = vi.spyOn(pool as any, "evaluateScaling");
+
+      pool.updateQueueLength(10);
+      for (let i = 1; i < 50; i++) {
+        pool.updateQueueLength(Math.floor(Math.random() * 20) + 5);
+      }
+
+      expect(evaluateScalingSpy).not.toHaveBeenCalled();
+      advanceTimeAndProcessMetrics(1000);
+      expect(evaluateScalingSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it("should use median to filter outliers in high-frequency updates", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      const updates = [10, 11, 9, 12, 10, 100, 11, 10, 9, 11, 1];
+      updates.forEach((length) => pool.updateQueueLength(length));
+      advanceTimeAndProcessMetrics(1100);
+
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBeGreaterThanOrEqual(9);
+      expect(metrics.queueLength).toBeLessThanOrEqual(12);
+    });
+  });
+
+  describe("Scaling cooldowns and jitter", () => {
+    it("should respect scale-up cooldown", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          scaleUpCooldownMs: 5000,
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      pool["scaleToTarget"](5);
+      const scaleToTargetSpy = vi.spyOn(pool as any, "scaleToTarget");
+
+      pool.updateQueueLength(10);
+      advanceTimeAndProcessMetrics(1100);
+      expect(scaleToTargetSpy).not.toHaveBeenCalled();
+
+      vi.advanceTimersByTime(10000);
+      pool.updateQueueLength(20);
+      advanceTimeAndProcessMetrics(1100);
+    });
+
+    it("should respect scale-down cooldown (longer than scale-up)", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      for (let i = 0; i < 4; i++) {
+        pool["addConsumers"](1);
+      }
+      pool["scaleToTarget"](5);
+      pool["metrics"].lastScaleTime = new Date(Date.now() - 70000);
+
+      pool.updateQueueLength(1);
+      advanceTimeAndProcessMetrics(1100);
+
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBe(1);
+    });
+
+    it("should add random jitter to prevent thundering herd", async () => {
+      const pools: RunQueueConsumerPool[] = [];
+      const scaleTimes: number[] = [];
+
+      for (let i = 0; i < 3; i++) {
+        const p = new RunQueueConsumerPool({
+          ...defaultOptions,
+          scaling: {
+            strategy: "smooth",
+            minConsumerCount: 1,
+            maxConsumerCount: 10,
+            disableJitter: true,
+          },
+        });
+
+        const originalScale = p["scaleToTarget"];
+        p["scaleToTarget"] = vi.fn(async (target: number) => {
+          scaleTimes.push(Date.now());
+          return originalScale.call(p, target);
+        });
+
+        pools.push(p);
+        await p.start();
+      }
+
+      pools.forEach((p) => p.updateQueueLength(20));
+      advanceTimeAndProcessMetrics(1100);
+      vi.advanceTimersByTime(15000);
+
+      await Promise.all(pools.map((p) => p.stop()));
+    });
+  });
+
+  describe("Consumer lifecycle management", () => {
+    it("should properly start and stop consumers", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "none",
+          maxConsumerCount: 3,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      expect(pool.size).toBe(3);
+      expect(testConsumers.length).toBe(3);
+      testConsumers.forEach((consumer) => {
+        expect(consumer.started).toBe(true);
+      });
+
+      await pool.stop();
+
+      testConsumers.forEach((consumer) => {
+        expect(consumer.stopped).toBe(true);
+      });
+    });
+
+    it("should forward dequeue messages with queue length updates", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          maxConsumerCount: 2,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      const messages: WorkerApiDequeueResponseBody = [{ workerQueueLength: 15 } as any];
+
+      if (testConsumers[0]?.onDequeue) {
+        await testConsumers[0].onDequeue(messages);
+      }
+
+      expect(mockOnDequeue).toHaveBeenCalledWith(messages);
+
+      advanceTimeAndProcessMetrics(1100);
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBe(15);
+    });
+  });
+
+  describe("Memory leak prevention", () => {
+    it("should collect all samples within batch window without limit", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      for (let i = 0; i < 100; i++) {
+        pool.updateQueueLength(i);
+      }
+
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBeUndefined();
+    });
+
+    it("should clear consumer map on stop", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "none",
+          maxConsumerCount: 5,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(5);
+
+      await pool.stop();
+      expect(pool.size).toBe(0);
+    });
+
+    it("should clear recentQueueLengths after processing batch", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: { strategy: "smooth" },
+      });
+
+      await pool.start();
+
+      for (let i = 0; i < 5; i++) {
+        pool.updateQueueLength(10 + i);
+      }
+
+      advanceTimeAndProcessMetrics(1100);
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBeDefined();
+    });
+
+    it("should not accumulate scaling operations in memory", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          scaleUpCooldownMs: 100,
+          scaleDownCooldownMs: 100,
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+
+      for (let i = 0; i < 5; i++) {
+        pool["metrics"].lastScaleTime = new Date(0);
+        pool.updateQueueLength(i % 2 === 0 ? 50 : 1);
+        vi.advanceTimersByTime(1100);
+      }
+
+      expect(pool.size).toBeGreaterThanOrEqual(1);
+      expect(pool.size).toBeLessThanOrEqual(10);
+    });
+  });
+
+  describe("Edge cases", () => {
+    it("should handle empty recent queue lengths", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: { strategy: "aggressive" },
+      });
+
+      await pool.start();
+
+      const metrics = pool.getMetrics();
+      expect(metrics.queueLength).toBeUndefined();
+    });
+
+    it("should clamp consumer count to min/max bounds", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 2,
+          maxConsumerCount: 5,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(2);
+
+      pool.updateQueueLength(100);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBeLessThanOrEqual(5);
+    });
+
+    it("should respect custom targetRatio with smooth strategy", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          targetRatio: 5,
+          scaleUpCooldownMs: 0,
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(1);
+
+      pool.updateQueueLength(10);
+      advanceTimeAndProcessMetrics(1100);
+
+      const firstSize = pool.size;
+      expect(firstSize).toBeGreaterThanOrEqual(1);
+      expect(firstSize).toBeLessThanOrEqual(2);
+
+      pool.updateQueueLength(10);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBeLessThanOrEqual(2);
+    });
+
+    it("should respect custom targetRatio with aggressive strategy", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "aggressive",
+          targetRatio: 5,
+          scaleUpCooldownMs: 0,
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(1);
+
+      pool.updateQueueLength(20);
+      advanceTimeAndProcessMetrics(1100);
+
+      const sizeAfterFirstScale = pool.size;
+      expect(sizeAfterFirstScale).toBeGreaterThanOrEqual(1);
+
+      pool.updateQueueLength(20);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBeLessThanOrEqual(6);
+    });
+
+    it("should scale down when no items are dequeued (zero queue length)", async () => {
+      pool = new RunQueueConsumerPool({
+        ...defaultOptions,
+        scaling: {
+          strategy: "smooth",
+          minConsumerCount: 1,
+          maxConsumerCount: 10,
+          scaleUpCooldownMs: 0,
+          scaleDownCooldownMs: 0,
+          disableJitter: true,
+        },
+      });
+
+      await pool.start();
+      expect(pool.size).toBe(1);
+
+      // Scale up first
+      pool.updateQueueLength(20);
+      advanceTimeAndProcessMetrics(1100);
+      expect(pool.size).toBeGreaterThan(1);
+      const sizeAfterScaleUp = pool.size;
+
+      // Now send multiple zero queue lengths to converge EWMA to 0
+      // The EWMA needs time to converge due to exponential smoothing
+      for (let i = 0; i < 5; i++) {
+        pool.updateQueueLength(0);
+        advanceTimeAndProcessMetrics(1100);
+      }
+
+      // After multiple iterations with zero queue, should scale down but not to minimum yet
+      expect(pool.size).toBeLessThan(sizeAfterScaleUp);
+      expect(pool.size).toBeGreaterThan(1);
+
+      // Continue until we reach minimum
+      for (let i = 0; i < 5; i++) {
+        pool.updateQueueLength(0);
+        advanceTimeAndProcessMetrics(1100);
+      }
+
+      // Should eventually reach minimum
+      expect(pool.size).toBe(1);
+    });
+  });
+});
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/consumerPool.ts b/packages/core/src/v3/runEngineWorker/supervisor/consumerPool.ts
new file mode 100644
index 00000000000..2dd3d1b898b
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/consumerPool.ts
@@ -0,0 +1,411 @@
+import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
+import { QueueConsumer, RunQueueConsumer, RunQueueConsumerOptions } from "./queueConsumer.js";
+import { QueueMetricsProcessor } from "./queueMetricsProcessor.js";
+import {
+  ScalingStrategy,
+  ScalingStrategyKind,
+  ScalingStrategyOptions,
+} from "./scalingStrategies.js";
+import { ConsumerPoolMetrics } from "./consumerPoolMetrics.js";
+import type { Registry } from "prom-client";
+
+export type QueueConsumerFactory = (opts: RunQueueConsumerOptions) => QueueConsumer;
+
+export type ScalingOptions = {
+  strategy?: ScalingStrategyKind;
+  minConsumerCount?: number;
+  maxConsumerCount?: number;
+  scaleUpCooldownMs?: number;
+  scaleDownCooldownMs?: number;
+  targetRatio?: number;
+  ewmaAlpha?: number;
+  batchWindowMs?: number;
+  disableJitter?: boolean;
+  dampingFactor?: number;
+};
+
+export type ConsumerPoolOptions = {
+  consumer: RunQueueConsumerOptions;
+  scaling: ScalingOptions;
+  consumerFactory?: QueueConsumerFactory;
+  metricsRegistry?: Registry;
+};
+
+type ScalingMetrics = {
+  targetConsumerCount: number;
+  queueLength?: number;
+  smoothedQueueLength: number;
+  lastScaleTime: Date;
+  lastQueueLengthUpdate: Date;
+};
+
+export class RunQueueConsumerPool {
+  private readonly consumerOptions: RunQueueConsumerOptions;
+
+  private readonly logger = new SimpleStructuredLogger("consumer-pool");
+  private readonly promMetrics?: ConsumerPoolMetrics;
+
+  private readonly minConsumerCount: number;
+  private readonly maxConsumerCount: number;
+  private readonly scalingStrategy: ScalingStrategy;
+  private readonly disableJitter: boolean;
+
+  private consumers: Map<string, QueueConsumer> = new Map();
+  private readonly consumerFactory: QueueConsumerFactory;
+  private isEnabled: boolean = false;
+  private isScaling: boolean = false;
+
+  private metrics: ScalingMetrics;
+  private readonly metricsProcessor: QueueMetricsProcessor;
+
+  // Scaling parameters
+  private readonly ewmaAlpha: number;
+  private readonly scaleUpCooldownMs: number;
+  private readonly scaleDownCooldownMs: number;
+  private readonly batchWindowMs: number;
+
+  constructor(opts: ConsumerPoolOptions) {
+    this.consumerOptions = opts.consumer;
+
+    // Initialize Prometheus metrics if registry provided
+    if (opts.metricsRegistry) {
+      this.promMetrics = new ConsumerPoolMetrics({
+        register: opts.metricsRegistry,
+      });
+    }
+
+    this.minConsumerCount = Math.max(1, opts.scaling.minConsumerCount ?? 1);
+    this.maxConsumerCount = Math.max(this.minConsumerCount, opts.scaling.maxConsumerCount ?? 10);
+    this.scaleUpCooldownMs = opts.scaling.scaleUpCooldownMs ?? 10000; // 10 seconds default
+    this.scaleDownCooldownMs = opts.scaling.scaleDownCooldownMs ?? 60000; // 60 seconds default
+    this.disableJitter = opts.scaling.disableJitter ?? false;
+
+    // Configure EWMA parameters from options
+    this.ewmaAlpha = opts.scaling.ewmaAlpha ?? 0.3;
+    this.batchWindowMs = opts.scaling.batchWindowMs ?? 1000;
+
+    // Validate EWMA parameters
+    if (this.ewmaAlpha < 0 || this.ewmaAlpha > 1) {
+      throw new Error(`ewmaAlpha must be between 0 and 1, got: ${this.ewmaAlpha}`);
+    }
+    if (this.batchWindowMs <= 0) {
+      throw new Error(`batchWindowMs must be positive, got: ${this.batchWindowMs}`);
+    }
+
+    // Initialize metrics processor
+    this.metricsProcessor = new QueueMetricsProcessor({
+      ewmaAlpha: this.ewmaAlpha,
+      batchWindowMs: this.batchWindowMs,
+    });
+
+    const targetRatio = opts.scaling.targetRatio ?? 1.0;
+    const dampingFactor = opts.scaling.dampingFactor;
+
+    // Create scaling strategy with metrics processor injected
+    this.scalingStrategy = ScalingStrategy.create(opts.scaling.strategy ?? "none", {
+      metricsProcessor: this.metricsProcessor,
+      dampingFactor,
+      targetRatio,
+      minConsumerCount: this.minConsumerCount,
+      maxConsumerCount: this.maxConsumerCount,
+    });
+
+    // Use provided factory or default to RunQueueConsumer
+    this.consumerFactory =
+      opts.consumerFactory || ((consumerOpts) => new RunQueueConsumer(consumerOpts));
+
+    this.metrics = {
+      targetConsumerCount: this.minConsumerCount,
+      queueLength: undefined,
+      smoothedQueueLength: 0,
+      lastScaleTime: new Date(0),
+      lastQueueLengthUpdate: new Date(0),
+    };
+
+    this.logger.log("Initialized consumer pool", {
+      minConsumerCount: this.minConsumerCount,
+      maxConsumerCount: this.maxConsumerCount,
+      scalingStrategy: this.scalingStrategy.name,
+      mode: this.scalingStrategy.name === "none" ? "static" : "dynamic",
+      ewmaAlpha: this.ewmaAlpha,
+      batchWindowMs: this.batchWindowMs,
+    });
+  }
+
+  async start() {
+    if (this.isEnabled) {
+      return;
+    }
+
+    this.isEnabled = true;
+
+    // For 'none' strategy, start with max consumers (static mode)
+    // For dynamic strategies, start with minimum
+    const initialCount =
+      this.scalingStrategy.name === "none" ? this.maxConsumerCount : this.minConsumerCount;
+
+    // Set initial metrics
+    this.metrics.targetConsumerCount = initialCount;
+
+    this.addConsumers(initialCount);
+
+    this.logger.log("Started dynamic consumer pool", {
+      initialConsumerCount: this.consumers.size,
+    });
+
+    // Initialize Prometheus metrics with initial state
+    this.promMetrics?.updateState({
+      consumerCount: this.consumers.size,
+      queueLength: this.metrics.queueLength,
+      smoothedQueueLength: this.metrics.smoothedQueueLength,
+      targetConsumerCount: initialCount,
+      strategy: this.scalingStrategy.name,
+    });
+  }
+
+  async stop() {
+    if (!this.isEnabled) {
+      return;
+    }
+
+    this.isEnabled = false;
+
+    // Stop all consumers
+    Array.from(this.consumers.values()).forEach((consumer) => consumer.stop());
+
+    this.consumers.clear();
+
+    this.logger.log("Stopped dynamic consumer pool");
+  }
+
+  /**
+   * Updates the queue length metric and triggers scaling decisions
+   * Uses QueueMetricsProcessor for batching and EWMA smoothing
+   */
+  updateQueueLength(queueLength: number) {
+    // Track queue length update in metrics
+    this.promMetrics?.recordQueueLengthUpdate();
+
+    // Skip metrics tracking for static mode
+    if (this.scalingStrategy.name === "none") {
+      return;
+    }
+
+    // Add sample to metrics processor
+    this.metricsProcessor.addSample(queueLength);
+
+    // Check if we should process the current batch
+    if (this.metricsProcessor.shouldProcessBatch()) {
+      this.processMetricsBatch();
+    }
+  }
+
+  private processMetricsBatch() {
+    // Process batch using the metrics processor
+    const result = this.metricsProcessor.processBatch();
+
+    if (!result) {
+      this.logger.debug("No queue length samples in batch window - skipping scaling evaluation");
+      return;
+    }
+
+    // Update metrics
+    this.metrics.queueLength = result.median;
+    this.metrics.smoothedQueueLength = result.smoothedValue;
+    this.metrics.lastQueueLengthUpdate = new Date();
+
+    this.logger.verbose("Queue metrics batch processed", {
+      samples: result.sampleCount,
+      median: result.median,
+      smoothed: result.smoothedValue,
+      currentConsumerCount: this.consumers.size,
+    });
+
+    // Make scaling decision
+    this.evaluateScaling();
+  }
+
+  private evaluateScaling() {
+    if (!this.isEnabled) {
+      return;
+    }
+
+    // No scaling in static mode
+    if (this.scalingStrategy.name === "none") {
+      return;
+    }
+
+    // Skip if already scaling
+    if (this.isScaling) {
+      this.logger.debug("Scaling blocked - operation already in progress", {
+        currentCount: this.consumers.size,
+        targetCount: this.metrics.targetConsumerCount,
+        actualCount: this.consumers.size,
+      });
+      return;
+    }
+
+    const targetCount = this.calculateTargetConsumerCount();
+
+    if (targetCount === this.consumers.size) {
+      return;
+    }
+
+    const timeSinceLastScale = Date.now() - this.metrics.lastScaleTime.getTime();
+
+    // Add random jitter to avoid thundering herd when multiple replicas exist
+    // Works without needing to know replica index or count
+    const jitterMs = this.disableJitter ? 0 : Math.random() * 3000; // 0-3 seconds random jitter
+
+    // Check cooldown periods with jitter
+    if (targetCount > this.consumers.size) {
+      // Scale up
+      const effectiveCooldown = this.scaleUpCooldownMs + jitterMs;
+      if (timeSinceLastScale < effectiveCooldown) {
+        this.logger.debug("Scale up blocked by cooldown", {
+          timeSinceLastScale,
+          cooldownMs: effectiveCooldown,
+          jitterMs,
+          remainingMs: effectiveCooldown - timeSinceLastScale,
+        });
+        this.promMetrics?.recordCooldownApplied("up");
+        return;
+      }
+    } else if (targetCount < this.consumers.size) {
+      // Scale down
+      const effectiveCooldown = this.scaleDownCooldownMs + jitterMs;
+      if (timeSinceLastScale < effectiveCooldown) {
+        this.logger.debug("Scale down blocked by cooldown", {
+          timeSinceLastScale,
+          cooldownMs: effectiveCooldown,
+          jitterMs,
+          remainingMs: effectiveCooldown - timeSinceLastScale,
+        });
+        this.promMetrics?.recordCooldownApplied("down");
+        return;
+      }
+    }
+
+    this.logger.info("Scaling consumer pool", {
+      from: this.consumers.size,
+      to: targetCount,
+      queueLength: this.metrics.queueLength,
+      smoothedQueueLength: this.metrics.smoothedQueueLength,
+      strategy: this.scalingStrategy,
+    });
+
+    // Set flag before scaling
+    this.isScaling = true;
+
+    // Update target metric for visibility
+    const previousTarget = this.metrics.targetConsumerCount;
+    this.metrics.targetConsumerCount = targetCount;
+
+    try {
+      this.scaleToTarget(targetCount);
+    } catch (error) {
+      this.logger.error("Failed to scale consumer pool", { error });
+      // Revert target on failure
+      this.metrics.targetConsumerCount = previousTarget;
+    } finally {
+      this.isScaling = false;
+    }
+  }
+
+  private calculateTargetConsumerCount(): number {
+    return this.scalingStrategy.calculateTargetCount(this.consumers.size);
+  }
+
+  private scaleToTarget(targetCount: number) {
+    const actualCurrentCount = this.consumers.size;
+
+    if (targetCount > actualCurrentCount) {
+      // Scale up
+      const count = targetCount - actualCurrentCount;
+      this.addConsumers(count);
+      this.promMetrics?.recordScalingOperation("up", this.scalingStrategy.name, count);
+    } else if (targetCount < actualCurrentCount) {
+      // Scale down
+      const count = actualCurrentCount - targetCount;
+      this.removeConsumers(count);
+      this.promMetrics?.recordScalingOperation("down", this.scalingStrategy.name, count);
+    }
+
+    this.metrics.lastScaleTime = new Date();
+
+    // Update Prometheus state metrics
+    this.promMetrics?.updateState({
+      consumerCount: this.consumers.size,
+      queueLength: this.metrics.queueLength,
+      smoothedQueueLength: this.metrics.smoothedQueueLength,
+      targetConsumerCount: targetCount,
+      strategy: this.scalingStrategy.name,
+    });
+  }
+
+  private addConsumers(count: number) {
+    const newConsumers: QueueConsumer[] = [];
+
+    for (let i = 0; i < count; i++) {
+      const consumerId = `consumer-${Date.now()}-${Math.random().toString(36).substring(2, 11)}`;
+
+      const consumer = this.consumerFactory({
+        ...this.consumerOptions,
+        onDequeue: async (messages) => {
+          // Always update queue length, default to 0 for empty dequeues or missing value
+          this.updateQueueLength(messages[0]?.workerQueueLength ?? 0);
+
+          // Forward to the original handler
+          await this.consumerOptions.onDequeue(messages);
+        },
+      });
+
+      this.consumers.set(consumerId, consumer);
+      newConsumers.push(consumer);
+    }
+
+    // Start all new consumers
+    newConsumers.forEach((c) => c.start());
+
+    this.logger.info("Added consumers", {
+      count,
+      totalConsumers: this.consumers.size,
+    });
+  }
+
+  private removeConsumers(count: number) {
+    const allIds = Array.from(this.consumers.keys());
+    const consumerIds = allIds.slice(-count); // Take from the end
+    const consumersToStop: QueueConsumer[] = [];
+
+    for (const id of consumerIds) {
+      const consumer = this.consumers.get(id);
+      if (consumer) {
+        consumersToStop.push(consumer);
+        this.consumers.delete(id);
+      }
+    }
+
+    // Stop removed consumers
+    consumersToStop.forEach((c) => c.stop());
+
+    this.logger.info("Removed consumers", {
+      count: consumersToStop.length,
+      totalConsumers: this.consumers.size,
+    });
+  }
+
+  /**
+   * Get current pool metrics for monitoring
+   */
+  getMetrics(): Readonly<ScalingMetrics> {
+    return { ...this.metrics };
+  }
+
+  /**
+   * Get current number of consumers in the pool
+   */
+  get size(): number {
+    return this.consumers.size;
+  }
+}
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/consumerPoolMetrics.ts b/packages/core/src/v3/runEngineWorker/supervisor/consumerPoolMetrics.ts
new file mode 100644
index 00000000000..8f65fa07750
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/consumerPoolMetrics.ts
@@ -0,0 +1,160 @@
+import { Counter, Gauge, Histogram, Registry } from "prom-client";
+
+export interface ConsumerPoolMetricsOptions {
+  register?: Registry;
+  prefix?: string;
+}
+
+export class ConsumerPoolMetrics {
+  private readonly register: Registry;
+  private readonly prefix: string;
+
+  // Current state metrics
+  public readonly consumerCount: Gauge;
+  public readonly queueLength: Gauge;
+  public readonly smoothedQueueLength: Gauge;
+  public readonly targetConsumerCount: Gauge;
+  public readonly scalingStrategy: Gauge;
+
+  // Scaling operation metrics
+  public readonly scalingOperationsTotal: Counter;
+  public readonly consumersAddedTotal: Counter;
+  public readonly consumersRemovedTotal: Counter;
+  public readonly scalingCooldownsApplied: Counter;
+
+  // Performance metrics
+  public readonly queueLengthUpdatesTotal: Counter;
+  public readonly batchesProcessedTotal: Counter;
+
+  constructor(opts: ConsumerPoolMetricsOptions = {}) {
+    this.register = opts.register ?? new Registry();
+    this.prefix = opts.prefix ?? "queue_consumer_pool";
+
+    // Current state metrics
+    this.consumerCount = new Gauge({
+      name: `${this.prefix}_consumer_count`,
+      help: "Current number of active queue consumers",
+      labelNames: ["strategy"],
+      registers: [this.register],
+    });
+
+    this.queueLength = new Gauge({
+      name: `${this.prefix}_queue_length`,
+      help: "Current queue length (median of recent samples)",
+      registers: [this.register],
+    });
+
+    this.smoothedQueueLength = new Gauge({
+      name: `${this.prefix}_smoothed_queue_length`,
+      help: "EWMA smoothed queue length",
+      registers: [this.register],
+    });
+
+    this.targetConsumerCount = new Gauge({
+      name: `${this.prefix}_target_consumer_count`,
+      help: "Target number of consumers calculated by scaling strategy",
+      labelNames: ["strategy"],
+      registers: [this.register],
+    });
+
+    this.scalingStrategy = new Gauge({
+      name: `${this.prefix}_scaling_strategy_info`,
+      help: "Information about the active scaling strategy (1 = active, 0 = inactive)",
+      labelNames: ["strategy"],
+      registers: [this.register],
+    });
+
+    // Scaling operation metrics
+    this.scalingOperationsTotal = new Counter({
+      name: `${this.prefix}_scaling_operations_total`,
+      help: "Total number of scaling operations performed",
+      labelNames: ["direction", "strategy"],
+      registers: [this.register],
+    });
+
+    this.consumersAddedTotal = new Counter({
+      name: `${this.prefix}_consumers_added_total`,
+      help: "Total number of consumers added",
+      registers: [this.register],
+    });
+
+    this.consumersRemovedTotal = new Counter({
+      name: `${this.prefix}_consumers_removed_total`,
+      help: "Total number of consumers removed",
+      registers: [this.register],
+    });
+
+    this.scalingCooldownsApplied = new Counter({
+      name: `${this.prefix}_scaling_cooldowns_applied_total`,
+      help: "Number of times scaling was prevented due to cooldown",
+      labelNames: ["direction"],
+      registers: [this.register],
+    });
+
+    this.queueLengthUpdatesTotal = new Counter({
+      name: `${this.prefix}_queue_length_updates_total`,
+      help: "Total number of queue length updates received",
+      registers: [this.register],
+    });
+
+    this.batchesProcessedTotal = new Counter({
+      name: `${this.prefix}_batches_processed_total`,
+      help: "Total number of metric batches processed",
+      registers: [this.register],
+    });
+  }
+
+  /**
+   * Update all gauge metrics with current state
+   */
+  updateState(state: {
+    consumerCount: number;
+    queueLength?: number;
+    smoothedQueueLength: number;
+    targetConsumerCount: number;
+    strategy: string;
+  }) {
+    this.consumerCount.set({ strategy: state.strategy }, state.consumerCount);
+
+    if (state.queueLength !== undefined) {
+      this.queueLength.set(state.queueLength);
+    }
+
+    this.smoothedQueueLength.set(state.smoothedQueueLength);
+    this.targetConsumerCount.set({ strategy: state.strategy }, state.targetConsumerCount);
+
+    // Set strategy info (1 for active strategy, 0 for others)
+    ["none", "smooth", "aggressive"].forEach((s) => {
+      this.scalingStrategy.set({ strategy: s }, s === state.strategy ? 1 : 0);
+    });
+  }
+
+  /**
+   * Record a scaling operation
+   */
+  recordScalingOperation(direction: "up" | "down" | "none", strategy: string, count: number) {
+    if (direction !== "none") {
+      this.scalingOperationsTotal.inc({ direction, strategy });
+
+      if (direction === "up") {
+        this.consumersAddedTotal.inc(count);
+      } else {
+        this.consumersRemovedTotal.inc(count);
+      }
+    }
+  }
+
+  /**
+   * Record that scaling was prevented by cooldown
+   */
+  recordCooldownApplied(direction: "up" | "down") {
+    this.scalingCooldownsApplied.inc({ direction });
+  }
+
+  /**
+   * Record a queue length update
+   */
+  recordQueueLengthUpdate() {
+    this.queueLengthUpdatesTotal.inc();
+  }
+}
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/queueConsumer.ts b/packages/core/src/v3/runEngineWorker/supervisor/queueConsumer.ts
index 6eb5572bf39..4379eb54f37 100644
--- a/packages/core/src/v3/runEngineWorker/supervisor/queueConsumer.ts
+++ b/packages/core/src/v3/runEngineWorker/supervisor/queueConsumer.ts
@@ -3,7 +3,12 @@ import { SupervisorHttpClient } from "./http.js";
 import { WorkerApiDequeueResponseBody } from "./schemas.js";
 import { PreDequeueFn, PreSkipFn } from "./types.js";
 
-type RunQueueConsumerOptions = {
+export interface QueueConsumer {
+  start(): void;
+  stop(): void;
+}
+
+export type RunQueueConsumerOptions = {
   client: SupervisorHttpClient;
   intervalMs: number;
   idleIntervalMs: number;
@@ -13,7 +18,7 @@ type RunQueueConsumerOptions = {
   onDequeue: (messages: WorkerApiDequeueResponseBody) => Promise<void>;
 };
 
-export class RunQueueConsumer {
+export class RunQueueConsumer implements QueueConsumer {
   private readonly client: SupervisorHttpClient;
   private readonly preDequeue?: PreDequeueFn;
   private readonly preSkip?: PreSkipFn;
@@ -131,7 +136,7 @@ export class RunQueueConsumer {
     this.scheduleNextDequeue(nextIntervalMs);
   }
 
-  scheduleNextDequeue(delayMs: number) {
+  private scheduleNextDequeue(delayMs: number) {
     if (delayMs === this.idleIntervalMs && this.idleIntervalMs !== this.intervalMs) {
       this.logger.verbose("scheduled dequeue with idle interval", { delayMs });
     }
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/queueMetricsProcessor.test.ts b/packages/core/src/v3/runEngineWorker/supervisor/queueMetricsProcessor.test.ts
new file mode 100644
index 00000000000..ac6a19a0484
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/queueMetricsProcessor.test.ts
@@ -0,0 +1,371 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { QueueMetricsProcessor } from "./queueMetricsProcessor.js";
+
+describe("QueueMetricsProcessor", () => {
+  let processor: QueueMetricsProcessor;
+
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  describe("Constructor validation", () => {
+    it("should throw error for invalid ewmaAlpha", () => {
+      expect(() => new QueueMetricsProcessor({ ewmaAlpha: -0.1, batchWindowMs: 1000 })).toThrow(
+        "ewmaAlpha must be between 0 and 1"
+      );
+
+      expect(() => new QueueMetricsProcessor({ ewmaAlpha: 1.1, batchWindowMs: 1000 })).toThrow(
+        "ewmaAlpha must be between 0 and 1"
+      );
+    });
+
+    it("should throw error for invalid batchWindowMs", () => {
+      expect(() => new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 0 })).toThrow(
+        "batchWindowMs must be positive"
+      );
+
+      expect(() => new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: -100 })).toThrow(
+        "batchWindowMs must be positive"
+      );
+    });
+
+    it("should accept valid parameters", () => {
+      expect(() => new QueueMetricsProcessor({ ewmaAlpha: 0, batchWindowMs: 1 })).not.toThrow();
+      expect(() => new QueueMetricsProcessor({ ewmaAlpha: 1, batchWindowMs: 5000 })).not.toThrow();
+    });
+  });
+
+  describe("Sample collection", () => {
+    beforeEach(() => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+    });
+
+    it("should collect samples without limit", () => {
+      for (let i = 0; i < 100; i++) {
+        processor.addSample(i);
+      }
+
+      expect(processor.getCurrentSampleCount()).toBe(100);
+      expect(processor.getCurrentSamples()).toHaveLength(100);
+    });
+
+    it("should throw error for negative queue lengths", () => {
+      expect(() => processor.addSample(-1)).toThrow("Queue length cannot be negative");
+    });
+
+    it("should accept zero queue length", () => {
+      expect(() => processor.addSample(0)).not.toThrow();
+      expect(processor.getCurrentSampleCount()).toBe(1);
+    });
+
+    it("should handle empty queue with all zero samples", () => {
+      processor.addSample(0);
+      processor.addSample(0);
+      processor.addSample(0);
+
+      const result = processor.processBatch();
+      expect(result).not.toBeNull();
+      expect(result!.median).toBe(0);
+      expect(result!.smoothedValue).toBe(0);
+      expect(processor.getSmoothedValue()).toBe(0);
+    });
+
+    it("should properly transition from zero to non-zero queue", () => {
+      // Start with empty queue
+      processor.addSample(0);
+      processor.addSample(0);
+      let result = processor.processBatch();
+      expect(result!.median).toBe(0);
+      expect(result!.smoothedValue).toBe(0);
+
+      // Queue starts filling
+      processor.addSample(10);
+      processor.addSample(15);
+      result = processor.processBatch();
+      expect(result!.median).toBeGreaterThan(0);
+      // EWMA: 0.3 * median + 0.7 * 0
+      expect(result!.smoothedValue).toBeGreaterThan(0);
+    });
+
+    it("should properly transition from non-zero to zero queue", () => {
+      // Start with non-empty queue
+      processor.addSample(10);
+      processor.addSample(15);
+      let result = processor.processBatch();
+      const initialSmoothed = result!.smoothedValue;
+      expect(initialSmoothed).toBeGreaterThan(0);
+
+      // Queue becomes empty
+      processor.addSample(0);
+      processor.addSample(0);
+      processor.addSample(0);
+      result = processor.processBatch();
+      expect(result!.median).toBe(0);
+      // EWMA should gradually decrease: 0.3 * 0 + 0.7 * initialSmoothed
+      expect(result!.smoothedValue).toBe(0.7 * initialSmoothed);
+    });
+  });
+
+  describe("Batch processing timing", () => {
+    beforeEach(() => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+    });
+
+    it("should not process batch before window expires", () => {
+      processor.addSample(10, 1000);
+
+      expect(processor.shouldProcessBatch(1500)).toBe(false); // 500ms later
+      expect(processor.shouldProcessBatch(1999)).toBe(false); // 999ms later
+    });
+
+    it("should process batch when window expires", () => {
+      processor.addSample(10, 1000);
+
+      expect(processor.shouldProcessBatch(2000)).toBe(true); // 1000ms later
+      expect(processor.shouldProcessBatch(2500)).toBe(true); // 1500ms later
+    });
+
+    it("should not process empty batch", () => {
+      expect(processor.shouldProcessBatch(5000)).toBe(false);
+    });
+  });
+
+  describe("EWMA calculation", () => {
+    it("should initialize with first value", () => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+
+      processor.addSample(10);
+      const result = processor.processBatch();
+
+      expect(result).not.toBeNull();
+      expect(result!.median).toBe(10);
+      expect(result!.smoothedValue).toBe(10);
+      expect(processor.getSmoothedValue()).toBe(10);
+    });
+
+    it("should apply EWMA formula correctly", () => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+
+      // First batch: smoothed = 10
+      processor.addSample(10);
+      processor.processBatch();
+      expect(processor.getSmoothedValue()).toBe(10);
+
+      // Second batch: smoothed = 0.3 * 20 + 0.7 * 10 = 6 + 7 = 13
+      processor.addSample(20);
+      processor.processBatch();
+      expect(processor.getSmoothedValue()).toBe(13);
+
+      // Third batch: smoothed = 0.3 * 5 + 0.7 * 13 = 1.5 + 9.1 = 10.6
+      processor.addSample(5);
+      processor.processBatch();
+      expect(processor.getSmoothedValue()).toBe(10.6);
+    });
+
+    it("should test different alpha values", () => {
+      // High alpha (0.8) - more responsive
+      const highAlphaProcessor = new QueueMetricsProcessor({ ewmaAlpha: 0.8, batchWindowMs: 1000 });
+      highAlphaProcessor.addSample(10);
+      highAlphaProcessor.processBatch();
+      highAlphaProcessor.addSample(20);
+      highAlphaProcessor.processBatch();
+
+      // Low alpha (0.1) - more smoothing
+      const lowAlphaProcessor = new QueueMetricsProcessor({ ewmaAlpha: 0.1, batchWindowMs: 1000 });
+      lowAlphaProcessor.addSample(10);
+      lowAlphaProcessor.processBatch();
+      lowAlphaProcessor.addSample(20);
+      lowAlphaProcessor.processBatch();
+
+      // High alpha should be closer to recent value (20)
+      expect(highAlphaProcessor.getSmoothedValue()).toBeCloseTo(18); // 0.8 * 20 + 0.2 * 10 = 18
+      // Low alpha should be closer to previous value (10)
+      expect(lowAlphaProcessor.getSmoothedValue()).toBeCloseTo(11); // 0.1 * 20 + 0.9 * 10 = 11
+    });
+  });
+
+  describe("Median filtering", () => {
+    beforeEach(() => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+    });
+
+    it("should calculate median of single sample", () => {
+      processor.addSample(42);
+
+      const result = processor.processBatch();
+      expect(result!.median).toBe(42);
+      expect(result!.sampleCount).toBe(1);
+      expect(result!.smoothedValue).toBe(42); // First batch initializes to median
+    });
+
+    it("should calculate median of odd number of samples", () => {
+      processor.addSample(1);
+      processor.addSample(10);
+      processor.addSample(5);
+
+      const result = processor.processBatch();
+      expect(result!.median).toBe(5);
+    });
+
+    it("should calculate median of even number of samples", () => {
+      processor.addSample(1);
+      processor.addSample(10);
+      processor.addSample(5);
+      processor.addSample(8);
+
+      const result = processor.processBatch();
+      // With even count, we average the two middle values
+      // Sorted: [1, 5, 8, 10], median = (5 + 8) / 2 = 6.5
+      expect(result!.median).toBe(6.5);
+    });
+
+    it("should filter outliers using median", () => {
+      // Add mostly low values with one outlier
+      processor.addSample(5);
+      processor.addSample(5);
+      processor.addSample(5);
+      processor.addSample(100); // outlier
+      processor.addSample(5);
+
+      const result = processor.processBatch();
+      // Sorted: [5, 5, 5, 5, 100], median = 5 (filters out outlier)
+      expect(result!.median).toBe(5);
+    });
+  });
+
+  describe("Batch result", () => {
+    beforeEach(() => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+    });
+
+    it("should return comprehensive batch result", () => {
+      processor.addSample(10);
+      processor.addSample(20);
+      processor.addSample(15);
+
+      const result = processor.processBatch();
+
+      expect(result).not.toBeNull();
+      expect(result!.median).toBe(15);
+      expect(result!.smoothedValue).toBe(15); // First batch
+      expect(result!.sampleCount).toBe(3);
+      expect(result!.samples).toEqual([10, 20, 15]);
+    });
+
+    it("should return null for empty batch", () => {
+      const result = processor.processBatch();
+      expect(result).toBeNull();
+    });
+
+    it("should clear samples after processing", () => {
+      processor.addSample(10);
+      processor.addSample(20);
+
+      expect(processor.getCurrentSampleCount()).toBe(2);
+
+      processor.processBatch();
+
+      expect(processor.getCurrentSampleCount()).toBe(0);
+      expect(processor.getCurrentSamples()).toHaveLength(0);
+    });
+  });
+
+  describe("Reset functionality", () => {
+    beforeEach(() => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+    });
+
+    it("should reset all state", () => {
+      processor.addSample(10);
+      processor.processBatch();
+      processor.addSample(20);
+
+      expect(processor.getSmoothedValue()).toBe(10);
+      expect(processor.getCurrentSampleCount()).toBe(1);
+
+      processor.reset();
+
+      expect(processor.getSmoothedValue()).toBe(0);
+      expect(processor.getCurrentSampleCount()).toBe(0);
+      expect(processor.getCurrentSamples()).toHaveLength(0);
+    });
+
+    it("should reinitialize correctly after reset", () => {
+      // Process some data
+      processor.addSample(10);
+      processor.processBatch();
+      processor.addSample(20);
+      processor.processBatch();
+
+      processor.reset();
+
+      // Should initialize with first value again
+      processor.addSample(30);
+      const result = processor.processBatch();
+
+      expect(result!.smoothedValue).toBe(30);
+      expect(processor.getSmoothedValue()).toBe(30);
+    });
+  });
+
+  describe("Configuration", () => {
+    it("should return configuration", () => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.5, batchWindowMs: 2000 });
+
+      const config = processor.getConfig();
+      expect(config.ewmaAlpha).toBe(0.5);
+      expect(config.batchWindowMs).toBe(2000);
+    });
+  });
+
+  describe("Real-world simulation", () => {
+    it("should handle high-frequency samples from multiple consumers", () => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+
+      // Simulate 40 consumers reporting queue lengths within 1 second
+      const baseTime = 1000;
+      for (let i = 0; i < 40; i++) {
+        const queueLength = 100 - i * 2; // Queue decreasing as consumers work
+        processor.addSample(queueLength, baseTime + i * 25); // Spread over 1 second
+      }
+
+      const result = processor.processBatch(baseTime + 1000);
+
+      expect(result).not.toBeNull();
+      expect(result!.sampleCount).toBe(40);
+      // Median should be around middle values (queue lengths 60-80)
+      expect(result!.median).toBeGreaterThanOrEqual(60);
+      expect(result!.median).toBeLessThanOrEqual(80);
+    });
+
+    it("should demonstrate EWMA smoothing over time", () => {
+      processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+
+      const results = [];
+
+      // Simulate queue spike and recovery
+      const scenarios = [
+        { samples: [5, 5, 5], expected: 5 }, // Baseline
+        { samples: [50, 50, 50], expected: 18.5 }, // Spike: 0.3 * 50 + 0.7 * 5 = 18.5
+        { samples: [5, 5, 5], expected: 10.05 }, // Recovery: 0.3 * 5 + 0.7 * 18.5 = 14.45
+      ];
+
+      for (const scenario of scenarios) {
+        for (const sample of scenario.samples) {
+          processor.addSample(sample);
+        }
+        const result = processor.processBatch();
+        results.push(result!.smoothedValue);
+      }
+
+      // Should show gradual change due to EWMA smoothing
+      expect(results[0]).toBe(5); // Initial
+      expect(results[1]).toBeCloseTo(18.5); // Spike response
+      expect(results[2]).toBeCloseTo(14.45); // Gradual recovery
+    });
+  });
+});
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/queueMetricsProcessor.ts b/packages/core/src/v3/runEngineWorker/supervisor/queueMetricsProcessor.ts
new file mode 100644
index 00000000000..5f628f432ce
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/queueMetricsProcessor.ts
@@ -0,0 +1,209 @@
+import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
+
+export interface QueueMetricsProcessorOptions {
+  /**
+   * EWMA smoothing factor (0-1)
+   * Lower values = more smoothing, less reactive
+   * Higher values = more responsive to recent changes
+   */
+  ewmaAlpha: number;
+
+  /**
+   * Batch window duration in milliseconds
+   * Samples within this window are collected and processed together
+   */
+  batchWindowMs: number;
+}
+
+export interface BatchProcessingResult {
+  /** Median of samples in the batch */
+  median: number;
+
+  /** EWMA-smoothed value after processing this batch */
+  smoothedValue: number;
+
+  /** Number of samples processed in this batch */
+  sampleCount: number;
+
+  /** Raw samples that were processed */
+  samples: readonly number[];
+}
+
+/**
+ * Processes queue length samples using exponential weighted moving average (EWMA)
+ * for smoothing and median filtering for outlier resistance.
+ *
+ * Collects samples within a batch window, calculates median to filter outliers,
+ * then applies EWMA smoothing for stable trend tracking.
+ */
+export class QueueMetricsProcessor {
+  private readonly ewmaAlpha: number;
+  private readonly batchWindowMs: number;
+  private readonly logger = new SimpleStructuredLogger("queue-metrics-processor");
+
+  private samples: number[] = [];
+  private smoothedValue: number = 0;
+  private lastBatchTime: number = 0;
+  private isInitialized: boolean = false;
+
+  constructor(options: QueueMetricsProcessorOptions) {
+    if (options.ewmaAlpha < 0 || options.ewmaAlpha > 1) {
+      throw new Error("ewmaAlpha must be between 0 and 1");
+    }
+    if (options.batchWindowMs <= 0) {
+      throw new Error("batchWindowMs must be positive");
+    }
+
+    this.ewmaAlpha = options.ewmaAlpha;
+    this.batchWindowMs = options.batchWindowMs;
+  }
+
+  /**
+   * Adds a sample to the current batch
+   */
+  addSample(value: number, timestamp: number = Date.now()): void {
+    if (value < 0) {
+      throw new Error("Queue length cannot be negative");
+    }
+
+    this.samples.push(value);
+
+    // Update last batch time on first sample
+    if (this.samples.length === 1) {
+      this.lastBatchTime = timestamp;
+    }
+  }
+
+  /**
+   * Checks if enough time has passed to process the current batch
+   */
+  shouldProcessBatch(currentTime: number = Date.now()): boolean {
+    if (this.samples.length === 0) {
+      return false;
+    }
+
+    return currentTime - this.lastBatchTime >= this.batchWindowMs;
+  }
+
+  private calculateMedian(samples: number[]): number | null {
+    const sortedSamples = [...samples].sort((a, b) => a - b);
+    const mid = Math.floor(sortedSamples.length / 2);
+
+    if (sortedSamples.length % 2 === 1) {
+      // Odd length: use middle value
+      const median = sortedSamples[mid];
+
+      if (median === undefined) {
+        this.logger.error("Invalid median calculated from odd samples", {
+          sortedSamples,
+          mid,
+          median,
+        });
+        return null;
+      }
+
+      return median;
+    } else {
+      // Even length: average two middle values
+      const lowMid = sortedSamples[mid - 1];
+      const highMid = sortedSamples[mid];
+
+      if (lowMid === undefined || highMid === undefined) {
+        this.logger.error("Invalid median calculated from even samples", {
+          sortedSamples,
+          mid,
+          lowMid,
+          highMid,
+        });
+        return null;
+      }
+
+      const median = (lowMid + highMid) / 2;
+      return median;
+    }
+  }
+
+  /**
+   * Processes the current batch of samples and returns the result.
+   * Clears the samples array and updates the smoothed value.
+   *
+   * Returns null if there are no samples to process.
+   */
+  processBatch(currentTime: number = Date.now()): BatchProcessingResult | null {
+    if (this.samples.length === 0) {
+      // No samples to process
+      return null;
+    }
+
+    // Calculate median of samples to filter outliers
+    const median = this.calculateMedian(this.samples);
+    if (median === null) {
+      // We already logged a more specific error message
+      return null;
+    }
+
+    // Update EWMA smoothed value
+    if (!this.isInitialized) {
+      // First value - initialize with median
+      this.smoothedValue = median;
+      this.isInitialized = true;
+    } else {
+      // Apply EWMA: s_t = α * x_t + (1 - α) * s_(t-1)
+      this.smoothedValue = this.ewmaAlpha * median + (1 - this.ewmaAlpha) * this.smoothedValue;
+    }
+
+    const result: BatchProcessingResult = {
+      median,
+      smoothedValue: this.smoothedValue,
+      sampleCount: this.samples.length,
+      samples: Object.freeze([...this.samples]),
+    };
+
+    // Clear samples for next batch
+    this.samples = [];
+    this.lastBatchTime = currentTime;
+
+    return result;
+  }
+
+  /**
+   * Gets the current smoothed value without processing a batch
+   */
+  getSmoothedValue(): number {
+    return this.smoothedValue;
+  }
+
+  /**
+   * Gets the number of samples in the current batch
+   */
+  getCurrentSampleCount(): number {
+    return this.samples.length;
+  }
+
+  /**
+   * Gets the current samples (for testing/debugging)
+   */
+  getCurrentSamples(): readonly number[] {
+    return Object.freeze([...this.samples]);
+  }
+
+  /**
+   * Resets the processor state
+   */
+  reset(): void {
+    this.samples = [];
+    this.smoothedValue = 0;
+    this.lastBatchTime = 0;
+    this.isInitialized = false;
+  }
+
+  /**
+   * Gets processor configuration
+   */
+  getConfig(): Readonly<QueueMetricsProcessorOptions> {
+    return {
+      ewmaAlpha: this.ewmaAlpha,
+      batchWindowMs: this.batchWindowMs,
+    };
+  }
+}
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/scalingStrategies.test.ts b/packages/core/src/v3/runEngineWorker/supervisor/scalingStrategies.test.ts
new file mode 100644
index 00000000000..3d6f4062e54
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/scalingStrategies.test.ts
@@ -0,0 +1,293 @@
+import { describe, it, expect } from "vitest";
+import {
+  NoneScalingStrategy,
+  SmoothScalingStrategy,
+  AggressiveScalingStrategy,
+  ScalingStrategyOptions,
+} from "./scalingStrategies.js";
+import { QueueMetricsProcessor } from "./queueMetricsProcessor.js";
+
+describe("Scaling Strategies", () => {
+  const baseOptions: ScalingStrategyOptions = {
+    minConsumerCount: 1,
+    maxConsumerCount: 20,
+    targetRatio: 1.0,
+  };
+
+  function createMetricsProcessor(smoothedValue: number): QueueMetricsProcessor {
+    const processor = new QueueMetricsProcessor({ ewmaAlpha: 0.3, batchWindowMs: 1000 });
+    // Initialize processor with the target smoothed value
+    processor.addSample(smoothedValue);
+    processor.processBatch();
+    return processor;
+  }
+
+  describe("NoneScalingStrategy", () => {
+    const strategy = new NoneScalingStrategy(baseOptions);
+
+    it("should always return current count (static mode)", () => {
+      expect(strategy.calculateTargetCount(5)).toBe(5);
+      expect(strategy.calculateTargetCount(1)).toBe(1);
+      expect(strategy.calculateTargetCount(10)).toBe(10);
+      // Clamping still applies
+      expect(strategy.calculateTargetCount(25)).toBe(20); // Clamped to max
+      expect(strategy.calculateTargetCount(0)).toBe(1); // Clamped to min
+    });
+
+    it("should have correct name", () => {
+      expect(strategy.name).toBe("none");
+    });
+
+    it("should handle zero current count", () => {
+      // Should clamp to minConsumerCount
+      const result = strategy.calculateTargetCount(0);
+      expect(result).toBe(1);
+    });
+  });
+
+  describe("SmoothScalingStrategy", () => {
+    it("should calculate target based on smoothed queue length", () => {
+      const metricsProcessor = createMetricsProcessor(10); // smoothed value = 10
+      const strategy = new SmoothScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      // With targetRatio=1.0, target consumers = ceil(10/1.0) = 10
+      // With dampingFactor=0.7 and currentCount=5:
+      // dampedTarget = 5 + (10 - 5) * 0.7 = 5 + 3.5 = 8.5 → 9
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBe(9);
+    });
+
+    it("should apply damping factor correctly", () => {
+      const metricsProcessor = createMetricsProcessor(20); // smoothed value = 20
+      const strategy = new SmoothScalingStrategy({
+        ...baseOptions,
+        metricsProcessor,
+        dampingFactor: 0.5,
+      }); // 50% damping
+
+      // With targetRatio=1.0, target consumers = ceil(20/1.0) = 20
+      // With dampingFactor=0.5 and currentCount=5:
+      // dampedTarget = 5 + (20 - 5) * 0.5 = 5 + 7.5 = 12.5 → 13
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBe(13);
+    });
+
+    it("should handle zero current count", () => {
+      const metricsProcessor = createMetricsProcessor(5);
+      const strategy = new SmoothScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      // With smoothedQueueLength=5, targetRatio=1.0:
+      // targetConsumers = ceil(5/1.0) = 5
+      // dampedTarget = 0 + (5 - 0) * 0.7 = 3.5 → 4
+      const result = strategy.calculateTargetCount(0);
+      expect(result).toBe(4);
+    });
+
+    it("should validate damping factor", () => {
+      const metricsProcessor = createMetricsProcessor(10);
+      expect(
+        () =>
+          new SmoothScalingStrategy({
+            ...baseOptions,
+            metricsProcessor,
+            dampingFactor: -0.1,
+          })
+      ).toThrow("dampingFactor must be between 0 and 1");
+
+      expect(
+        () =>
+          new SmoothScalingStrategy({
+            ...baseOptions,
+            metricsProcessor,
+            dampingFactor: 1.1,
+          })
+      ).toThrow("dampingFactor must be between 0 and 1");
+
+      expect(
+        () =>
+          new SmoothScalingStrategy({
+            ...baseOptions,
+            metricsProcessor,
+            dampingFactor: 0,
+          })
+      ).not.toThrow();
+
+      expect(
+        () =>
+          new SmoothScalingStrategy({
+            ...baseOptions,
+            metricsProcessor,
+            dampingFactor: 1,
+          })
+      ).not.toThrow();
+    });
+
+    it("should handle zero current count", () => {
+      const metricsProcessor = createMetricsProcessor(10);
+      const strategy = new SmoothScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      // With smoothedQueueLength=10, targetRatio=1.0:
+      // targetConsumers = ceil(10/1.0) = 10
+      // dampedTarget = 0 + (10 - 0) * 0.7 = 7
+      const result = strategy.calculateTargetCount(0);
+      expect(result).toBe(7);
+    });
+  });
+
+  describe("AggressiveScalingStrategy", () => {
+    it("should scale down when under-utilized", () => {
+      // queuePerConsumer = 2/5 = 0.4, scaleDownThreshold = 1.0 * 0.5 = 0.5
+      // Under-utilized since 0.4 < 0.5
+      const metricsProcessor = createMetricsProcessor(2);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBeLessThan(5);
+      expect(result).toBeGreaterThanOrEqual(baseOptions.minConsumerCount);
+    });
+
+    it("should maintain count when in optimal zone", () => {
+      // queuePerConsumer = 5/5 = 1.0
+      // Optimal zone: 0.5 < 1.0 < 2.0
+      const metricsProcessor = createMetricsProcessor(5);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBe(5);
+    });
+
+    it("should scale up when over-utilized", () => {
+      // queuePerConsumer = 15/5 = 3.0, scaleUpThreshold = 1.0 * 2.0 = 2.0
+      // Over-utilized since 3.0 > 2.0
+      const metricsProcessor = createMetricsProcessor(15);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBeGreaterThan(5);
+      expect(result).toBeLessThanOrEqual(baseOptions.maxConsumerCount);
+    });
+
+    it("should scale aggressively for critical load", () => {
+      // queuePerConsumer = 25/5 = 5.0 (critical: 5x target ratio)
+      const metricsProcessor = createMetricsProcessor(25);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      const result = strategy.calculateTargetCount(5);
+      // Should apply 50% scale factor: ceil(5 * 1.5) = 8
+      // But capped by 50% max increment: 5 + ceil(5 * 0.5) = 5 + 3 = 8
+      expect(result).toBe(8);
+    });
+
+    it("should respect max consumer count", () => {
+      const metricsProcessor = createMetricsProcessor(50); // Very high load
+      const strategy = new AggressiveScalingStrategy({
+        ...baseOptions,
+        maxConsumerCount: 6,
+        metricsProcessor,
+      });
+
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBeLessThanOrEqual(6);
+    });
+
+    it("should respect min consumer count", () => {
+      const metricsProcessor = createMetricsProcessor(0.1); // Very low load
+      const strategy = new AggressiveScalingStrategy({
+        ...baseOptions,
+        minConsumerCount: 3,
+        metricsProcessor,
+      });
+
+      const result = strategy.calculateTargetCount(5);
+      expect(result).toBeGreaterThanOrEqual(3);
+    });
+
+    it("should return thresholds", () => {
+      const metricsProcessor = createMetricsProcessor(10);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+      const thresholds = strategy.getThresholds(1.0);
+      expect(thresholds).toEqual({
+        scaleDownThreshold: 0.5,
+        scaleUpThreshold: 2.0,
+        criticalThreshold: 5.0,
+        highThreshold: 3.0,
+      });
+    });
+
+    it("should handle zero current count without division by zero", () => {
+      const metricsProcessor = createMetricsProcessor(10);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      // Should use (currentCount || 1) to prevent division by zero
+      // queuePerConsumer = 10 / 1 = 10 (not 10 / 0)
+      // This is over-utilized (10 > 2.0), should scale up
+      const result = strategy.calculateTargetCount(0);
+      expect(result).toBeGreaterThan(0);
+      expect(result).toBeLessThanOrEqual(baseOptions.maxConsumerCount);
+    });
+
+    it("should handle zero queue with zero consumers", () => {
+      const metricsProcessor = createMetricsProcessor(0);
+      const strategy = new AggressiveScalingStrategy({ ...baseOptions, metricsProcessor });
+
+      // queuePerConsumer = 0 / 1 = 0
+      // This is under-utilized (0 < 0.5), should scale down
+      // But already at 0, so should return minConsumerCount
+      const result = strategy.calculateTargetCount(0);
+      expect(result).toBe(baseOptions.minConsumerCount);
+    });
+  });
+
+  describe("Integration scenarios", () => {
+    it("should handle gradual load increase with smooth strategy", () => {
+      const metricsProcessor = createMetricsProcessor(2);
+      const strategy = new SmoothScalingStrategy({ ...baseOptions, metricsProcessor });
+      let currentCount = 2;
+
+      // Gradual increase: 2 → 6 → 10 → 15
+      const loads = [2, 6, 10, 15];
+      const results = [];
+
+      for (const load of loads) {
+        // Update the processor with the new load
+        metricsProcessor.addSample(load);
+        metricsProcessor.processBatch();
+        const target = strategy.calculateTargetCount(currentCount);
+        results.push(target);
+        currentCount = target;
+      }
+
+      // Should show gradual increase due to damping
+      expect(results[0]).toBeLessThan(results[1]!);
+      expect(results[1]).toBeLessThan(results[2]!);
+      expect(results[2]).toBeLessThan(results[3]!);
+
+      // But not immediate jumps due to damping
+      expect(results[1]! - results[0]!).toBeLessThan(loads[1]! - loads[0]!);
+    });
+
+    it("should handle load spike with aggressive strategy", () => {
+      let currentCount = 3;
+
+      // Sudden spike from normal to critical
+      const normalLoad = 3; // queuePerConsumer = 1.0 (optimal)
+      const spikeLoad = 15; // queuePerConsumer = 5.0 (critical)
+
+      const normalProcessor = createMetricsProcessor(normalLoad);
+      const normalStrategy = new AggressiveScalingStrategy({
+        ...baseOptions,
+        metricsProcessor: normalProcessor,
+      });
+      const normalTarget = normalStrategy.calculateTargetCount(currentCount);
+      expect(normalTarget).toBe(3); // Should maintain
+
+      const spikeProcessor = createMetricsProcessor(spikeLoad);
+      const spikeStrategy = new AggressiveScalingStrategy({
+        ...baseOptions,
+        metricsProcessor: spikeProcessor,
+      });
+      const spikeTarget = spikeStrategy.calculateTargetCount(currentCount);
+      expect(spikeTarget).toBeGreaterThan(3); // Should scale up aggressively
+    });
+  });
+});
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/scalingStrategies.ts b/packages/core/src/v3/runEngineWorker/supervisor/scalingStrategies.ts
new file mode 100644
index 00000000000..665c689d649
--- /dev/null
+++ b/packages/core/src/v3/runEngineWorker/supervisor/scalingStrategies.ts
@@ -0,0 +1,186 @@
+import { QueueMetricsProcessor } from "./queueMetricsProcessor.js";
+
+export type ScalingStrategyKind = "none" | "smooth" | "aggressive";
+
+export interface ScalingStrategyOptions {
+  metricsProcessor?: QueueMetricsProcessor;
+  dampingFactor?: number;
+  minConsumerCount: number;
+  maxConsumerCount: number;
+  targetRatio: number;
+}
+
+export abstract class ScalingStrategy {
+  abstract readonly name: string;
+
+  private readonly minConsumerCount: number;
+  private readonly maxConsumerCount: number;
+
+  protected readonly targetRatio: number;
+
+  constructor(options?: ScalingStrategyOptions) {
+    this.minConsumerCount = options?.minConsumerCount ?? 1;
+    this.maxConsumerCount = options?.maxConsumerCount ?? 10;
+    this.targetRatio = options?.targetRatio ?? 1;
+  }
+
+  /**
+   * Calculates the target consumer count with clamping to min/max bounds
+   * Uses template method pattern to ensure consistent clamping across all strategies
+   */
+  calculateTargetCount(currentCount: number): number {
+    const targetCount = this.calculateTargetCountInternal(currentCount);
+
+    // Apply consistent clamping to all strategies
+    return Math.min(Math.max(targetCount, this.minConsumerCount), this.maxConsumerCount);
+  }
+
+  /**
+   * Internal method for subclasses to implement their specific scaling logic
+   * Should return the unclamped target count
+   */
+  protected abstract calculateTargetCountInternal(currentCount: number): number;
+
+  /**
+   * Creates a scaling strategy by name
+   */
+  static create(strategy: ScalingStrategyKind, options?: ScalingStrategyOptions): ScalingStrategy {
+    switch (strategy) {
+      case "none":
+        return new NoneScalingStrategy(options);
+
+      case "smooth":
+        return new SmoothScalingStrategy(options);
+
+      case "aggressive":
+        return new AggressiveScalingStrategy(options);
+
+      default:
+        throw new Error(`Unknown scaling strategy: ${strategy}`);
+    }
+  }
+}
+
+/**
+ * Static scaling strategy - maintains a fixed number of consumers
+ */
+export class NoneScalingStrategy extends ScalingStrategy {
+  readonly name = "none";
+
+  constructor(options?: ScalingStrategyOptions) {
+    super(options);
+  }
+
+  protected calculateTargetCountInternal(currentCount: number): number {
+    return currentCount;
+  }
+}
+
+/**
+ * Smooth scaling strategy with EWMA smoothing and damping
+ * Uses exponentially weighted moving average for queue length smoothing
+ * and applies damping to prevent rapid oscillations.
+ */
+export class SmoothScalingStrategy extends ScalingStrategy {
+  readonly name = "smooth";
+  private readonly dampingFactor: number;
+  private readonly metricsProcessor: QueueMetricsProcessor;
+
+  constructor(options?: ScalingStrategyOptions) {
+    super(options);
+    const dampingFactor = options?.dampingFactor ?? 0.7;
+    if (dampingFactor < 0 || dampingFactor > 1) {
+      throw new Error("dampingFactor must be between 0 and 1");
+    }
+    if (!options?.metricsProcessor) {
+      throw new Error("metricsProcessor is required for smooth scaling strategy");
+    }
+    this.dampingFactor = dampingFactor;
+    this.metricsProcessor = options.metricsProcessor;
+  }
+
+  protected calculateTargetCountInternal(currentCount: number): number {
+    const smoothedQueueLength = this.metricsProcessor.getSmoothedValue();
+
+    // Calculate target consumers based on the configured ratio
+    const targetConsumers = Math.ceil(smoothedQueueLength / this.targetRatio);
+
+    // Apply damping factor to smooth out changes
+    // This prevents oscillation by only moving toward the target gradually
+    const dampedTarget = currentCount + (targetConsumers - currentCount) * this.dampingFactor;
+
+    // Return rounded value without clamping (handled by base class)
+    return Math.round(dampedTarget);
+  }
+}
+
+/**
+ * Aggressive scaling strategy with threshold-based zones
+ * Uses threshold-based zones for different scaling behaviors.
+ * Scales up quickly when load increases but scales down cautiously.
+ */
+export class AggressiveScalingStrategy extends ScalingStrategy {
+  readonly name = "aggressive";
+  private readonly metricsProcessor: QueueMetricsProcessor;
+
+  constructor(options?: ScalingStrategyOptions) {
+    super(options);
+    if (!options?.metricsProcessor) {
+      throw new Error("metricsProcessor is required for aggressive scaling strategy");
+    }
+    this.metricsProcessor = options.metricsProcessor;
+  }
+
+  protected calculateTargetCountInternal(currentCount: number): number {
+    const smoothedQueueLength = this.metricsProcessor.getSmoothedValue();
+
+    // Calculate queue items per consumer,
+    const queuePerConsumer = smoothedQueueLength / (currentCount || 1);
+
+    // Define zones based on targetRatio
+    // Optimal zone: 0.5x to 2x the target ratio
+    const scaleDownThreshold = this.targetRatio * 0.5;
+    const scaleUpThreshold = this.targetRatio * 2.0;
+
+    if (queuePerConsumer < scaleDownThreshold) {
+      // Zone 1: Under-utilized (< 0.5x target ratio)
+      // Scale down gradually to avoid removing too many consumers
+      const reductionFactor = Math.max(0.9, 1 - (scaleDownThreshold - queuePerConsumer) * 0.1);
+      // Return without min clamping (handled by base class)
+      return Math.floor(currentCount * reductionFactor);
+    } else if (queuePerConsumer > scaleUpThreshold) {
+      // Zone 3: Over-utilized (> 2x target ratio)
+      // Scale up aggressively based on queue pressure
+      let scaleFactor: number;
+      if (queuePerConsumer >= this.targetRatio * 5) {
+        // Critical: Queue is 5x target ratio or higher
+        scaleFactor = 1.5; // 50% increase
+      } else if (queuePerConsumer >= this.targetRatio * 3) {
+        // High: Queue is 3x target ratio
+        scaleFactor = 1.3; // 30% increase
+      } else {
+        // Moderate: Queue is 2x target ratio
+        scaleFactor = 1.1; // 10% increase
+      }
+
+      const targetCount = Math.ceil(currentCount * scaleFactor);
+      // Cap increase at 50% to prevent overshooting
+      const maxIncrement = Math.ceil(currentCount * 0.5);
+      // Return without max clamping (handled by base class)
+      return Math.min(currentCount + maxIncrement, targetCount);
+    } else {
+      // Zone 2: Optimal (0.5x - 2x target ratio)
+      // Maintain current consumer count
+      return currentCount;
+    }
+  }
+
+  getThresholds(targetRatio: number) {
+    return {
+      scaleDownThreshold: targetRatio * 0.5,
+      scaleUpThreshold: targetRatio * 2.0,
+      criticalThreshold: targetRatio * 5.0,
+      highThreshold: targetRatio * 3.0,
+    };
+  }
+}
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/session.ts b/packages/core/src/v3/runEngineWorker/supervisor/session.ts
index a458a9cd4cf..e5a783b8d41 100644
--- a/packages/core/src/v3/runEngineWorker/supervisor/session.ts
+++ b/packages/core/src/v3/runEngineWorker/supervisor/session.ts
@@ -1,7 +1,7 @@
 import { SupervisorHttpClient } from "./http.js";
 import { PreDequeueFn, PreSkipFn, SupervisorClientCommonOptions } from "./types.js";
 import { WorkerApiDequeueResponseBody, WorkerApiHeartbeatRequestBody } from "./schemas.js";
-import { RunQueueConsumer } from "./queueConsumer.js";
+import { RunQueueConsumerPool, ScalingOptions } from "./consumerPool.js";
 import { WorkerEvents } from "./events.js";
 import EventEmitter from "events";
 import { VERSION } from "../../../version.js";
@@ -10,6 +10,7 @@ import { WorkerClientToServerEvents, WorkerServerToClientEvents } from "../types
 import { getDefaultWorkerHeaders } from "./util.js";
 import { IntervalService } from "../../utils/interval.js";
 import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
+import type { Registry } from "prom-client";
 
 type SupervisorSessionOptions = SupervisorClientCommonOptions & {
   queueConsumerEnabled?: boolean;
@@ -20,8 +21,9 @@ type SupervisorSessionOptions = SupervisorClientCommonOptions & {
   preDequeue?: PreDequeueFn;
   preSkip?: PreSkipFn;
   maxRunCount?: number;
-  maxConsumerCount?: number;
   sendRunDebugLogs?: boolean;
+  scaling: ScalingOptions;
+  metricsRegistry?: Registry;
 };
 
 export class SupervisorSession extends EventEmitter<WorkerEvents> {
@@ -33,7 +35,7 @@ export class SupervisorSession extends EventEmitter<WorkerEvents> {
   private runNotificationsSocket?: Socket<WorkerServerToClientEvents, WorkerClientToServerEvents>;
 
   private readonly queueConsumerEnabled: boolean;
-  private readonly queueConsumers: RunQueueConsumer[];
+  private readonly consumerPool: RunQueueConsumerPool;
 
   private readonly heartbeat: IntervalService;
 
@@ -44,8 +46,9 @@ export class SupervisorSession extends EventEmitter<WorkerEvents> {
     this.queueConsumerEnabled = opts.queueConsumerEnabled ?? true;
 
     this.httpClient = new SupervisorHttpClient(opts);
-    this.queueConsumers = Array.from({ length: opts.maxConsumerCount ?? 1 }, () => {
-      return new RunQueueConsumer({
+
+    this.consumerPool = new RunQueueConsumerPool({
+      consumer: {
         client: this.httpClient,
         preDequeue: opts.preDequeue,
         preSkip: opts.preSkip,
@@ -53,7 +56,9 @@ export class SupervisorSession extends EventEmitter<WorkerEvents> {
         intervalMs: opts.dequeueIntervalMs,
         idleIntervalMs: opts.dequeueIdleIntervalMs,
         maxRunCount: opts.maxRunCount,
-      });
+      },
+      scaling: opts.scaling,
+      metricsRegistry: opts.metricsRegistry,
     });
 
     this.heartbeat = new IntervalService({
@@ -179,8 +184,13 @@ export class SupervisorSession extends EventEmitter<WorkerEvents> {
     });
 
     if (this.queueConsumerEnabled) {
-      this.logger.log("Queue consumer enabled");
-      await Promise.allSettled(this.queueConsumers.map(async (q) => q.start()));
+      this.logger.log("Queue consumer enabled", {
+        scalingStrategy: this.consumerPool["scalingStrategy"],
+        minConsumers: this.consumerPool["minConsumerCount"],
+        maxConsumers: this.consumerPool["maxConsumerCount"],
+      });
+
+      await this.consumerPool.start();
       this.heartbeat.start();
     } else {
       this.logger.warn("Queue consumer disabled");
@@ -195,7 +205,7 @@ export class SupervisorSession extends EventEmitter<WorkerEvents> {
   }
 
   async stop() {
-    await Promise.allSettled(this.queueConsumers.map(async (q) => q.stop()));
+    await this.consumerPool.stop();
     this.heartbeat.stop();
     this.runNotificationsSocket?.disconnect();
   }
diff --git a/packages/core/src/v3/runEngineWorker/workload/http.ts b/packages/core/src/v3/runEngineWorker/workload/http.ts
index 22978be81b8..93fa7bf03c0 100644
--- a/packages/core/src/v3/runEngineWorker/workload/http.ts
+++ b/packages/core/src/v3/runEngineWorker/workload/http.ts
@@ -5,7 +5,6 @@ import {
   WorkloadRunAttemptCompleteRequestBody,
   WorkloadRunAttemptCompleteResponseBody,
   WorkloadRunAttemptStartResponseBody,
-  WorkloadRunLatestSnapshotResponseBody,
   WorkloadDequeueFromVersionResponseBody,
   WorkloadRunAttemptStartRequestBody,
   WorkloadSuspendRunResponseBody,
@@ -53,18 +52,58 @@ export class WorkloadHttpClient {
     });
   }
 
+  private isConnectionError(error: string): boolean {
+    const connectionErrors = [
+      "Connection error",
+      "ECONNREFUSED",
+      "ETIMEDOUT",
+      "ENOTFOUND",
+      "ECONNRESET",
+      "EHOSTUNREACH",
+      "ENETUNREACH",
+      "EPIPE",
+      "ECONNABORTED",
+    ];
+    return connectionErrors.some((errType) => error.includes(errType));
+  }
+
+  private async withConnectionErrorDetection<T>(
+    operation: () => Promise<{ success: true; data: T } | { success: false; error: string }>
+  ): Promise<
+    { success: true; data: T } | { success: false; error: string; isConnectionError?: boolean }
+  > {
+    const result = await operation();
+
+    if (result.success) {
+      return result;
+    }
+
+    // Check if this is a connection error
+    if (this.isConnectionError(result.error)) {
+      return {
+        ...result,
+        isConnectionError: true,
+      };
+    }
+
+    return result;
+  }
+
   async heartbeatRun(runId: string, snapshotId: string, body?: WorkloadHeartbeatRequestBody) {
-    return wrapZodFetch(
-      WorkloadHeartbeatResponseBody,
-      `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/heartbeat`,
-      {
-        method: "POST",
-        headers: {
-          ...this.defaultHeaders(),
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(body ?? {}),
-      }
+    return this.withConnectionErrorDetection(() =>
+      wrapZodFetch(
+        WorkloadHeartbeatResponseBody,
+        `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/heartbeat`,
+        {
+          method: "POST",
+          headers: {
+            ...this.defaultHeaders(),
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(body ?? {}),
+          signal: AbortSignal.timeout(10_000), // 10 second timeout
+        }
+      )
     );
   }
 
@@ -82,15 +121,17 @@ export class WorkloadHttpClient {
   }
 
   async continueRunExecution(runId: string, snapshotId: string) {
-    return wrapZodFetch(
-      WorkloadContinueRunExecutionResponseBody,
-      `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/continue`,
-      {
-        method: "GET",
-        headers: {
-          ...this.defaultHeaders(),
-        },
-      }
+    return this.withConnectionErrorDetection(() =>
+      wrapZodFetch(
+        WorkloadContinueRunExecutionResponseBody,
+        `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/continue`,
+        {
+          method: "GET",
+          headers: {
+            ...this.defaultHeaders(),
+          },
+        }
+      )
     );
   }
 
@@ -130,29 +171,19 @@ export class WorkloadHttpClient {
     );
   }
 
-  async getRunExecutionData(runId: string) {
-    return wrapZodFetch(
-      WorkloadRunLatestSnapshotResponseBody,
-      `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/latest`,
-      {
-        method: "GET",
-        headers: {
-          ...this.defaultHeaders(),
-        },
-      }
-    );
-  }
-
   async getSnapshotsSince(runId: string, snapshotId: string) {
-    return wrapZodFetch(
-      WorkloadRunSnapshotsSinceResponseBody,
-      `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/since/${snapshotId}`,
-      {
-        method: "GET",
-        headers: {
-          ...this.defaultHeaders(),
-        },
-      }
+    return this.withConnectionErrorDetection(() =>
+      wrapZodFetch(
+        WorkloadRunSnapshotsSinceResponseBody,
+        `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/since/${snapshotId}`,
+        {
+          method: "GET",
+          headers: {
+            ...this.defaultHeaders(),
+          },
+          signal: AbortSignal.timeout(10_000), // 10 second timeout
+        }
+      )
     );
   }
 
diff --git a/packages/core/src/v3/runMetadata/manager.ts b/packages/core/src/v3/runMetadata/manager.ts
index 75cdd23500d..992c63594f5 100644
--- a/packages/core/src/v3/runMetadata/manager.ts
+++ b/packages/core/src/v3/runMetadata/manager.ts
@@ -1,43 +1,35 @@
 import { dequal } from "dequal/lite";
 import { DeserializedJson } from "../../schemas/json.js";
 import { ApiClient } from "../apiClient/index.js";
-import { FlushedRunMetadata, RunMetadataChangeOperation } from "../schemas/common.js";
-import { ApiRequestOptions } from "../zodfetch.js";
-import { MetadataStream } from "./metadataStream.js";
-import { applyMetadataOperations, collapseOperations } from "./operations.js";
-import { RunMetadataManager, RunMetadataUpdater } from "./types.js";
+import { realtimeStreams } from "../realtime-streams-api.js";
+import { RunMetadataChangeOperation } from "../schemas/common.js";
 import { AsyncIterableStream } from "../streams/asyncIterableStream.js";
 import { IOPacket, stringifyIO } from "../utils/ioSerialization.js";
-
-const MAXIMUM_ACTIVE_STREAMS = 5;
-const MAXIMUM_TOTAL_STREAMS = 10;
+import { ApiRequestOptions } from "../zodfetch.js";
+import { applyMetadataOperations, collapseOperations } from "./operations.js";
+import type { RunMetadataManager, RunMetadataUpdater } from "./types.js";
 
 export class StandardMetadataManager implements RunMetadataManager {
   private flushTimeoutId: NodeJS.Timeout | null = null;
   private isFlushing: boolean = false;
   private store: Record<string, DeserializedJson> | undefined;
-  // Add a Map to track active streams
-  private activeStreams = new Map<string, MetadataStream<any>>();
 
   private queuedOperations: Set<RunMetadataChangeOperation> = new Set();
   private queuedParentOperations: Set<RunMetadataChangeOperation> = new Set();
   private queuedRootOperations: Set<RunMetadataChangeOperation> = new Set();
 
   public runId: string | undefined;
+  public runIdIsRoot: boolean = false;
 
-  constructor(
-    private apiClient: ApiClient,
-    private streamsBaseUrl: string,
-    private streamsVersion: "v1" | "v2" = "v1"
-  ) {}
+  constructor(private apiClient: ApiClient) {}
 
   reset(): void {
     this.queuedOperations.clear();
     this.queuedParentOperations.clear();
     this.queuedRootOperations.clear();
-    this.activeStreams.clear();
     this.store = undefined;
     this.runId = undefined;
+    this.runIdIsRoot = false;
 
     if (this.flushTimeoutId) {
       clearTimeout(this.flushTimeoutId);
@@ -54,34 +46,76 @@ export class StandardMetadataManager implements RunMetadataManager {
     // Create the updater object and store it in a local variable
     const parentUpdater: RunMetadataUpdater = {
       set: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.set(key, value);
+        }
+
         self.queuedParentOperations.add({ type: "set", key, value });
         return parentUpdater;
       },
       del: (key) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.del(key);
+        }
+
         self.queuedParentOperations.add({ type: "delete", key });
         return parentUpdater;
       },
       append: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.append(key, value);
+        }
+
         self.queuedParentOperations.add({ type: "append", key, value });
         return parentUpdater;
       },
       remove: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.remove(key, value);
+        }
+
         self.queuedParentOperations.add({ type: "remove", key, value });
         return parentUpdater;
       },
       increment: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.increment(key, value);
+        }
+
         self.queuedParentOperations.add({ type: "increment", key, value });
         return parentUpdater;
       },
       decrement: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.decrement(key, value);
+        }
+
         self.queuedParentOperations.add({ type: "increment", key, value: -Math.abs(value) });
         return parentUpdater;
       },
       update: (value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.update(value);
+        }
+
         self.queuedParentOperations.add({ type: "update", value });
         return parentUpdater;
       },
-      stream: (key, value, signal) => self.doStream(key, value, "parent", parentUpdater, signal),
+      stream: (key, value, signal) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.doStream(key, value, "self", parentUpdater, signal);
+        }
+
+        return self.doStream(key, value, "parent", parentUpdater, signal);
+      },
     };
 
     return parentUpdater;
@@ -94,34 +128,76 @@ export class StandardMetadataManager implements RunMetadataManager {
     // Create the updater object and store it in a local variable
     const rootUpdater: RunMetadataUpdater = {
       set: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.set(key, value);
+        }
+
         self.queuedRootOperations.add({ type: "set", key, value });
         return rootUpdater;
       },
       del: (key) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.del(key);
+        }
+
         self.queuedRootOperations.add({ type: "delete", key });
         return rootUpdater;
       },
       append: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.append(key, value);
+        }
+
         self.queuedRootOperations.add({ type: "append", key, value });
         return rootUpdater;
       },
       remove: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.remove(key, value);
+        }
+
         self.queuedRootOperations.add({ type: "remove", key, value });
         return rootUpdater;
       },
       increment: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.increment(key, value);
+        }
+
         self.queuedRootOperations.add({ type: "increment", key, value });
         return rootUpdater;
       },
       decrement: (key, value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.decrement(key, value);
+        }
+
         self.queuedRootOperations.add({ type: "increment", key, value: -Math.abs(value) });
         return rootUpdater;
       },
       update: (value) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.update(value);
+        }
+
         self.queuedRootOperations.add({ type: "update", value });
         return rootUpdater;
       },
-      stream: (key, value, signal) => self.doStream(key, value, "root", rootUpdater, signal),
+      stream: (key, value, signal) => {
+        // We have to check runIdIsRoot here because parent/root are executed before runIdIsRoot is set
+        if (self.runIdIsRoot) {
+          return self.doStream(key, value, "self", rootUpdater, signal);
+        }
+
+        return self.doStream(key, value, "root", rootUpdater, signal);
+      },
     };
 
     return rootUpdater;
@@ -228,14 +304,14 @@ export class StandardMetadataManager implements RunMetadataManager {
 
   public async fetchStream<T>(key: string, signal?: AbortSignal): Promise<AsyncIterableStream<T>> {
     if (!this.runId) {
-      throw new Error("Run ID is required to fetch metadata streams.");
+      throw new Error("Run ID is not set. fetchStream() can only be used inside a task.");
     }
 
-    const baseUrl = this.getKey("$$streamsBaseUrl");
-
-    const $baseUrl = typeof baseUrl === "string" ? baseUrl : this.streamsBaseUrl;
-
-    return this.apiClient.fetchStream<T>(this.runId, key, { baseUrl: $baseUrl, signal });
+    return await this.apiClient.fetchStream(this.runId, key, {
+      signal,
+      timeoutInSeconds: 60,
+      lastEventId: undefined,
+    });
   }
 
   private async doStream<T>(
@@ -251,84 +327,12 @@ export class StandardMetadataManager implements RunMetadataManager {
       return $value;
     }
 
-    // Check to make sure we haven't exceeded the max number of active streams
-    if (this.activeStreams.size >= MAXIMUM_ACTIVE_STREAMS) {
-      console.warn(
-        `Exceeded the maximum number of active streams (${MAXIMUM_ACTIVE_STREAMS}). The "${key}" stream will be ignored.`
-      );
-      return $value;
-    }
-
-    // Check to make sure we haven't exceeded the max number of total streams
-    const streams = (this.store?.$$streams ?? []) as string[];
-
-    if (streams.length >= MAXIMUM_TOTAL_STREAMS) {
-      console.warn(
-        `Exceeded the maximum number of total streams (${MAXIMUM_TOTAL_STREAMS}). The "${key}" stream will be ignored.`
-      );
-      return $value;
-    }
-
-    try {
-      const streamInstance = new MetadataStream({
-        key,
-        runId: this.runId,
-        source: $value,
-        baseUrl: this.streamsBaseUrl,
-        headers: this.apiClient.getHeaders(),
-        signal,
-        version: this.streamsVersion,
-        target,
-      });
-
-      this.activeStreams.set(key, streamInstance);
-
-      // Clean up when stream completes
-      streamInstance.wait().finally(() => this.activeStreams.delete(key));
-
-      // Add the key to the special stream metadata object
-      updater
-        .append(`$$streams`, key)
-        .set("$$streamsVersion", this.streamsVersion)
-        .set("$$streamsBaseUrl", this.streamsBaseUrl);
-
-      await this.flush();
-
-      return streamInstance;
-    } catch (error) {
-      // Clean up metadata key if stream creation fails
-      updater.remove(`$$streams`, key);
-      throw error;
-    }
-  }
+    const streamInstance = realtimeStreams.pipe(key, value, {
+      signal,
+      target,
+    });
 
-  public hasActiveStreams(): boolean {
-    return this.activeStreams.size > 0;
-  }
-
-  // Waits for all the streams to finish
-  public async waitForAllStreams(timeout: number = 60_000): Promise<void> {
-    if (this.activeStreams.size === 0) {
-      return;
-    }
-
-    const promises = Array.from(this.activeStreams.values()).map((stream) => stream.wait());
-
-    try {
-      await Promise.race([
-        Promise.allSettled(promises),
-        new Promise<void>((resolve, _) => setTimeout(() => resolve(), timeout)),
-      ]);
-    } catch (error) {
-      console.error("Error waiting for streams to finish:", error);
-
-      // If we time out, abort all remaining streams
-      for (const [key, promise] of this.activeStreams.entries()) {
-        // We can add abort logic here if needed
-        this.activeStreams.delete(key);
-      }
-      throw error;
-    }
+    return streamInstance.stream;
   }
 
   public async refresh(requestOptions?: ApiRequestOptions): Promise<void> {
diff --git a/packages/core/src/v3/runMetadata/metadataStream.ts b/packages/core/src/v3/runMetadata/metadataStream.ts
deleted file mode 100644
index 86e76928557..00000000000
--- a/packages/core/src/v3/runMetadata/metadataStream.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { request as httpsRequest } from "node:https";
-import { request as httpRequest } from "node:http";
-import { URL } from "node:url";
-
-export type MetadataOptions<T> = {
-  baseUrl: string;
-  runId: string;
-  key: string;
-  source: AsyncIterable<T>;
-  headers?: Record<string, string>;
-  signal?: AbortSignal;
-  version?: "v1" | "v2";
-  target?: "self" | "parent" | "root";
-  maxRetries?: number;
-};
-
-export class MetadataStream<T> {
-  private controller = new AbortController();
-  private serverStream: ReadableStream<T>;
-  private consumerStream: ReadableStream<T>;
-  private streamPromise: Promise<void>;
-  private retryCount = 0;
-  private readonly maxRetries: number;
-  private currentChunkIndex = 0;
-
-  constructor(private options: MetadataOptions<T>) {
-    const [serverStream, consumerStream] = this.createTeeStreams();
-    this.serverStream = serverStream;
-    this.consumerStream = consumerStream;
-    this.maxRetries = options.maxRetries ?? 10;
-
-    this.streamPromise = this.initializeServerStream();
-  }
-
-  private createTeeStreams() {
-    const readableSource = new ReadableStream<T>({
-      start: async (controller) => {
-        try {
-          for await (const value of this.options.source) {
-            controller.enqueue(value);
-          }
-          controller.close();
-        } catch (error) {
-          controller.error(error);
-        }
-      },
-    });
-
-    return readableSource.tee();
-  }
-
-  private async makeRequest(startFromChunk: number = 0): Promise<void> {
-    const reader = this.serverStream.getReader();
-
-    return new Promise((resolve, reject) => {
-      const url = new URL(this.buildUrl());
-      const timeout = 15 * 60 * 1000; // 15 minutes
-
-      const requestFn = url.protocol === "https:" ? httpsRequest : httpRequest;
-      const req = requestFn({
-        method: "POST",
-        hostname: url.hostname,
-        port: url.port || (url.protocol === "https:" ? 443 : 80),
-        path: url.pathname + url.search,
-        headers: {
-          ...this.options.headers,
-          "Content-Type": "application/json",
-          "X-Resume-From-Chunk": startFromChunk.toString(),
-        },
-        timeout,
-      });
-
-      req.on("error", (error) => {
-        safeReleaseLock(reader);
-        reject(error);
-      });
-
-      req.on("timeout", () => {
-        safeReleaseLock(reader);
-
-        req.destroy(new Error("Request timed out"));
-      });
-
-      req.on("response", (res) => {
-        if (res.statusCode === 408) {
-          safeReleaseLock(reader);
-
-          if (this.retryCount < this.maxRetries) {
-            this.retryCount++;
-
-            resolve(this.makeRequest(this.currentChunkIndex));
-            return;
-          }
-          reject(new Error(`Max retries (${this.maxRetries}) exceeded after timeout`));
-          return;
-        }
-
-        if (res.statusCode && (res.statusCode < 200 || res.statusCode >= 300)) {
-          const error = new Error(`HTTP error! status: ${res.statusCode}`);
-          reject(error);
-          return;
-        }
-
-        res.on("end", () => {
-          resolve();
-        });
-
-        res.resume();
-      });
-
-      if (this.options.signal) {
-        this.options.signal.addEventListener("abort", () => {
-          req.destroy(new Error("Request aborted"));
-        });
-      }
-
-      const processStream = async () => {
-        try {
-          while (true) {
-            const { done, value } = await reader.read();
-
-            if (done) {
-              req.end();
-              break;
-            }
-
-            const stringified = JSON.stringify(value) + "\n";
-            req.write(stringified);
-            this.currentChunkIndex++;
-          }
-        } catch (error) {
-          reject(error);
-        }
-      };
-
-      processStream().catch((error) => {
-        reject(error);
-      });
-    });
-  }
-
-  private async initializeServerStream(): Promise<void> {
-    await this.makeRequest(0);
-  }
-
-  public async wait(): Promise<void> {
-    return this.streamPromise;
-  }
-
-  public [Symbol.asyncIterator]() {
-    return streamToAsyncIterator(this.consumerStream);
-  }
-
-  private buildUrl(): string {
-    switch (this.options.version ?? "v1") {
-      case "v1": {
-        return `${this.options.baseUrl}/realtime/v1/streams/${this.options.runId}/${
-          this.options.target ?? "self"
-        }/${this.options.key}`;
-      }
-      case "v2": {
-        return `${this.options.baseUrl}/realtime/v2/streams/${this.options.runId}/${this.options.key}`;
-      }
-    }
-  }
-}
-
-async function* streamToAsyncIterator<T>(stream: ReadableStream<T>): AsyncIterableIterator<T> {
-  const reader = stream.getReader();
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) return;
-      yield value;
-    }
-  } finally {
-    safeReleaseLock(reader);
-  }
-}
-
-function safeReleaseLock(reader: ReadableStreamDefaultReader<any>) {
-  try {
-    reader.releaseLock();
-  } catch (error) {}
-}
diff --git a/packages/core/src/v3/schemas/api-type.test.ts b/packages/core/src/v3/schemas/api-type.test.ts
new file mode 100644
index 00000000000..c936b3c769d
--- /dev/null
+++ b/packages/core/src/v3/schemas/api-type.test.ts
@@ -0,0 +1,141 @@
+import { describe, it, expect } from "vitest";
+import { InitializeDeploymentRequestBody } from "./api.js";
+import type { InitializeDeploymentRequestBody as InitializeDeploymentRequestBodyType } from "./api.js";
+
+describe("InitializeDeploymentRequestBody", () => {
+  const base = { contentHash: "abc123" };
+
+  describe("non-native build variant (isNativeBuild omitted or false)", () => {
+    it("parses with only required fields", () => {
+      const result = InitializeDeploymentRequestBody.safeParse(base);
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.isNativeBuild).toBe(false);
+      }
+    });
+
+    it("parses with isNativeBuild explicitly false", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({ ...base, isNativeBuild: false });
+      expect(result.success).toBe(true);
+    });
+
+    it("parses with optional base fields", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        userId: "user_1",
+        type: "MANAGED",
+        runtime: "node",
+        initialStatus: "PENDING",
+      });
+      expect(result.success).toBe(true);
+    });
+
+    it("strips native-only fields when isNativeBuild is false", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        isNativeBuild: false,
+        skipPromotion: true,
+      });
+      // Zod discriminatedUnion matches the non-native branch and strips unknown keys
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect("skipPromotion" in result.data).toBe(false);
+      }
+    });
+  });
+
+  describe("native build variant (isNativeBuild: true)", () => {
+    it("parses with isNativeBuild true", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        isNativeBuild: true,
+      });
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.isNativeBuild).toBe(true);
+      }
+    });
+
+    it("parses with native-specific optional fields", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        isNativeBuild: true,
+        skipPromotion: true,
+        artifactKey: "artifact_abc",
+        configFilePath: "trigger.config.ts",
+        skipEnqueue: true,
+      });
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.skipPromotion).toBe(true);
+        expect(result.data.artifactKey).toBe("artifact_abc");
+        expect(result.data.configFilePath).toBe("trigger.config.ts");
+        expect(result.data.skipEnqueue).toBe(true);
+      }
+    });
+
+    it("skipEnqueue defaults to false when omitted", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        isNativeBuild: true,
+      });
+      expect(result.success).toBe(true);
+      if (result.success) {
+        expect(result.data.skipEnqueue).toBe(false);
+      }
+    });
+  });
+
+  describe("rejects invalid inputs", () => {
+    it("rejects missing contentHash", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({});
+      expect(result.success).toBe(false);
+    });
+
+    it("rejects invalid type enum value", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        type: "INVALID",
+      });
+      expect(result.success).toBe(false);
+    });
+
+    it("rejects invalid initialStatus enum value", () => {
+      const result = InitializeDeploymentRequestBody.safeParse({
+        ...base,
+        initialStatus: "RUNNING",
+      });
+      expect(result.success).toBe(false);
+    });
+  });
+
+  describe("type-level checks", () => {
+    it("native variant exposes native-specific fields", () => {
+      const result = InitializeDeploymentRequestBody.parse({
+        ...base,
+        isNativeBuild: true,
+        skipPromotion: true,
+      });
+
+      if (result.isNativeBuild === true) {
+        const _skipPromotion: boolean | undefined = result.skipPromotion;
+        const _artifactKey: string | undefined = result.artifactKey;
+        const _configFilePath: string | undefined = result.configFilePath;
+        expect(_skipPromotion).toBe(true);
+        expect(_artifactKey).toBeUndefined();
+        expect(_configFilePath).toBeUndefined();
+      }
+    });
+
+    it("non-native variant narrows correctly", () => {
+      const result: InitializeDeploymentRequestBodyType =
+        InitializeDeploymentRequestBody.parse(base);
+
+      if (!result.isNativeBuild) {
+        // Should only have base fields — native-specific fields should not exist
+        const narrowed: { isNativeBuild?: false; contentHash: string } = result;
+        expect(narrowed.contentHash).toBe("abc123");
+      }
+    });
+  });
+});
diff --git a/packages/core/src/v3/schemas/api.ts b/packages/core/src/v3/schemas/api.ts
index cdf455cbfea..2a7bcb96502 100644
--- a/packages/core/src/v3/schemas/api.ts
+++ b/packages/core/src/v3/schemas/api.ts
@@ -29,7 +29,11 @@ export type WhoAmIResponse = z.infer<typeof WhoAmIResponseSchema>;
 
 export const GetProjectResponseBody = z.object({
   id: z.string(),
-  externalRef: z.string(),
+  externalRef: z
+    .string()
+    .describe(
+      "The external reference for the project, also known as the project ref, a unique identifier starting with proj_"
+    ),
   name: z.string(),
   slug: z.string(),
   createdAt: z.coerce.date(),
@@ -47,6 +51,27 @@ export const GetProjectsResponseBody = z.array(GetProjectResponseBody);
 
 export type GetProjectsResponseBody = z.infer<typeof GetProjectsResponseBody>;
 
+export const GetOrgsResponseBody = z.array(
+  z.object({
+    id: z.string(),
+    title: z.string(),
+    slug: z.string(),
+    createdAt: z.coerce.date(),
+  })
+);
+
+export type GetOrgsResponseBody = z.infer<typeof GetOrgsResponseBody>;
+
+export const CreateProjectRequestBody = z.object({
+  name: z
+    .string()
+    .trim()
+    .min(1, "Name is required")
+    .max(255, "Name must be less than 255 characters"),
+});
+
+export type CreateProjectRequestBody = z.infer<typeof CreateProjectRequestBody>;
+
 export const GetProjectEnvResponse = z.object({
   apiKey: z.string(),
   name: z.string(),
@@ -56,6 +81,49 @@ export const GetProjectEnvResponse = z.object({
 
 export type GetProjectEnvResponse = z.infer<typeof GetProjectEnvResponse>;
 
+// Zod schema for the response body type
+export const GetWorkerTaskResponse = z.object({
+  id: z.string(),
+  slug: z.string(),
+  filePath: z.string(),
+  triggerSource: z.string(),
+  createdAt: z.coerce.date(),
+  payloadSchema: z.any().nullish(),
+});
+
+export const GetWorkerByTagResponse = z.object({
+  worker: z.object({
+    id: z.string(),
+    version: z.string(),
+    engine: z.string().nullish(),
+    sdkVersion: z.string().nullish(),
+    cliVersion: z.string().nullish(),
+    tasks: z.array(GetWorkerTaskResponse),
+  }),
+  urls: z.object({
+    runs: z.string(),
+  }),
+});
+
+export type GetWorkerByTagResponse = z.infer<typeof GetWorkerByTagResponse>;
+
+export const GetJWTRequestBody = z.object({
+  claims: z
+    .object({
+      scopes: z.array(z.string()).default([]),
+    })
+    .optional(),
+  expirationTime: z.union([z.number(), z.string()]).optional(),
+});
+
+export type GetJWTRequestBody = z.infer<typeof GetJWTRequestBody>;
+
+export const GetJWTResponse = z.object({
+  token: z.string(),
+});
+
+export type GetJWTResponse = z.infer<typeof GetJWTResponse>;
+
 export const CreateBackgroundWorkerRequestBody = z.object({
   localOnly: z.boolean(),
   metadata: BackgroundWorkerMetadata,
@@ -81,6 +149,14 @@ export const RunTags = z.union([RunTag, RunTag.array()]);
 
 export type RunTags = z.infer<typeof RunTags>;
 
+/** Stores the original user-provided idempotency key and scope */
+export const IdempotencyKeyOptionsSchema = z.object({
+  key: z.string(),
+  scope: z.enum(["run", "attempt", "global"]),
+});
+
+export type IdempotencyKeyOptionsSchema = z.infer<typeof IdempotencyKeyOptionsSchema>;
+
 export const TriggerTaskRequestBody = z.object({
   payload: z.any(),
   context: z.any(),
@@ -123,6 +199,8 @@ export const TriggerTaskRequestBody = z.object({
       delay: z.string().or(z.coerce.date()).optional(),
       idempotencyKey: z.string().optional(),
       idempotencyKeyTTL: z.string().optional(),
+      /** The original user-provided idempotency key and scope */
+      idempotencyKeyOptions: IdempotencyKeyOptionsSchema.optional(),
       machine: MachinePresetName.optional(),
       maxAttempts: z.number().int().optional(),
       maxDuration: z.number().optional(),
@@ -134,6 +212,15 @@ export const TriggerTaskRequestBody = z.object({
       ttl: z.string().or(z.number().nonnegative().int()).optional(),
       priority: z.number().optional(),
       bulkActionId: z.string().optional(),
+      region: z.string().optional(),
+      debounce: z
+        .object({
+          key: z.string().max(512),
+          delay: z.string(),
+          mode: z.enum(["leading", "trailing"]).optional(),
+          maxDelay: z.string().optional(),
+        })
+        .optional(),
     })
     .optional(),
 });
@@ -164,6 +251,8 @@ export const BatchTriggerTaskItem = z.object({
       delay: z.string().or(z.coerce.date()).optional(),
       idempotencyKey: z.string().optional(),
       idempotencyKeyTTL: z.string().optional(),
+      /** The original user-provided idempotency key and scope */
+      idempotencyKeyOptions: IdempotencyKeyOptionsSchema.optional(),
       lockToVersion: z.string().optional(),
       machine: MachinePresetName.optional(),
       maxAttempts: z.number().int().optional(),
@@ -181,6 +270,15 @@ export const BatchTriggerTaskItem = z.object({
       test: z.boolean().optional(),
       ttl: z.string().or(z.number().nonnegative().int()).optional(),
       priority: z.number().optional(),
+      region: z.string().optional(),
+      debounce: z
+        .object({
+          key: z.string().max(512),
+          delay: z.string(),
+          mode: z.enum(["leading", "trailing"]).optional(),
+          maxDelay: z.string().optional(),
+        })
+        .optional(),
     })
     .optional(),
 });
@@ -244,6 +342,85 @@ export const BatchTriggerTaskV3Response = z.object({
 
 export type BatchTriggerTaskV3Response = z.infer<typeof BatchTriggerTaskV3Response>;
 
+// ============================================================================
+// 2-Phase Batch API (v3) - Streaming NDJSON Support
+// ============================================================================
+
+/**
+ * Phase 1: Create batch request body
+ * Creates the batch record and optionally blocks parent run for batchTriggerAndWait
+ */
+export const CreateBatchRequestBody = z.object({
+  /** Expected number of items in the batch */
+  runCount: z.number().int().positive(),
+  /** Parent run ID for batchTriggerAndWait (friendly ID) */
+  parentRunId: z.string().optional(),
+  /** Whether to resume parent on completion (true for batchTriggerAndWait) */
+  resumeParentOnCompletion: z.boolean().optional(),
+  /** Idempotency key for the batch */
+  idempotencyKey: z.string().optional(),
+  /** The original user-provided idempotency key and scope */
+  idempotencyKeyOptions: IdempotencyKeyOptionsSchema.optional(),
+});
+
+export type CreateBatchRequestBody = z.infer<typeof CreateBatchRequestBody>;
+
+/**
+ * Phase 1: Create batch response
+ */
+export const CreateBatchResponse = z.object({
+  /** The batch ID (friendly ID) */
+  id: z.string(),
+  /** The expected run count */
+  runCount: z.number(),
+  /** Whether this response came from a cached/idempotent batch */
+  isCached: z.boolean(),
+  /** The idempotency key if provided */
+  idempotencyKey: z.string().optional(),
+});
+
+export type CreateBatchResponse = z.infer<typeof CreateBatchResponse>;
+
+/**
+ * Phase 2: Individual item in the NDJSON stream
+ * Each line in the NDJSON body should match this schema
+ */
+export const BatchItemNDJSON = z.object({
+  /** Zero-based index of this item (used for idempotency and ordering) */
+  index: z.number().int().nonnegative(),
+  /** The task identifier to trigger */
+  task: z.string(),
+  /** The payload for this task run */
+  payload: z.unknown().optional(),
+  /** Options for this specific item */
+  options: z.record(z.unknown()).optional(),
+});
+
+export type BatchItemNDJSON = z.infer<typeof BatchItemNDJSON>;
+
+/**
+ * Phase 2: Stream items response
+ * Returned after the NDJSON stream completes
+ */
+export const StreamBatchItemsResponse = z.object({
+  /** The batch ID */
+  id: z.string(),
+  /** Number of items successfully accepted */
+  itemsAccepted: z.number(),
+  /** Number of items that were deduplicated (already enqueued) */
+  itemsDeduplicated: z.number(),
+  /** Whether the batch was sealed and is ready for processing.
+   * If false, the batch needs more items before processing can start.
+   * Clients should check this field and retry with missing items if needed. */
+  sealed: z.boolean(),
+  /** Total items currently enqueued (only present when sealed=false to help with retries) */
+  enqueuedCount: z.number().optional(),
+  /** Expected total item count (only present when sealed=false to help with retries) */
+  expectedCount: z.number().optional(),
+});
+
+export type StreamBatchItemsResponse = z.infer<typeof StreamBatchItemsResponse>;
+
 export const BatchTriggerTaskResponse = z.object({
   batchId: z.string(),
   runs: z.string().array(),
@@ -303,10 +480,37 @@ export type StartDeploymentIndexingResponseBody = z.infer<
 export const FinalizeDeploymentRequestBody = z.object({
   skipPromotion: z.boolean().optional(),
   imageDigest: z.string().optional(),
+  skipPushToRegistry: z.boolean().optional(),
 });
 
 export type FinalizeDeploymentRequestBody = z.infer<typeof FinalizeDeploymentRequestBody>;
 
+export const BuildServerMetadata = z.object({
+  buildId: z.string().optional(),
+  isNativeBuild: z.boolean().optional(),
+  artifactKey: z.string().optional(),
+  skipPromotion: z.boolean().optional(),
+  configFilePath: z.string().optional(),
+  skipEnqueue: z.boolean().optional(),
+});
+
+export type BuildServerMetadata = z.infer<typeof BuildServerMetadata>;
+
+export const ProgressDeploymentRequestBody = z.object({
+  contentHash: z.string().optional(),
+  gitMeta: GitMeta.optional(),
+  runtime: z.string().optional(),
+  buildServerMetadata: BuildServerMetadata.optional(),
+});
+
+export type ProgressDeploymentRequestBody = z.infer<typeof ProgressDeploymentRequestBody>;
+
+export const CancelDeploymentRequestBody = z.object({
+  reason: z.string().max(200, "Reason must be less than 200 characters").optional(),
+});
+
+export type CancelDeploymentRequestBody = z.infer<typeof CancelDeploymentRequestBody>;
+
 export const ExternalBuildData = z.object({
   buildId: z.string(),
   buildToken: z.string(),
@@ -315,6 +519,27 @@ export const ExternalBuildData = z.object({
 
 export type ExternalBuildData = z.infer<typeof ExternalBuildData>;
 
+const anyString = z.custom<string & {}>((v) => typeof v === "string");
+
+export const DeploymentTriggeredVia = z
+  .enum([
+    "cli:manual",
+    "cli:ci_other",
+    "cli:github_actions",
+    "cli:gitlab_ci",
+    "cli:circleci",
+    "cli:jenkins",
+    "cli:azure_pipelines",
+    "cli:bitbucket_pipelines",
+    "cli:travis_ci",
+    "cli:buildkite",
+    "git_integration:github",
+    "dashboard",
+  ])
+  .or(anyString);
+
+export type DeploymentTriggeredVia = z.infer<typeof DeploymentTriggeredVia>;
+
 export const UpsertBranchRequestBody = z.object({
   git: GitMeta.optional(),
   env: z.enum(["preview"]),
@@ -329,6 +554,23 @@ export const UpsertBranchResponseBody = z.object({
 
 export type UpsertBranchResponseBody = z.infer<typeof UpsertBranchResponseBody>;
 
+export const CreateArtifactRequestBody = z.object({
+  type: z.enum(["deployment_context"]).default("deployment_context"),
+  contentType: z.string().default("application/gzip"),
+  contentLength: z.number().optional(),
+});
+
+export type CreateArtifactRequestBody = z.infer<typeof CreateArtifactRequestBody>;
+
+export const CreateArtifactResponseBody = z.object({
+  artifactKey: z.string(),
+  uploadUrl: z.string(),
+  uploadFields: z.record(z.string()),
+  expiresAt: z.string().datetime(),
+});
+
+export type CreateArtifactResponseBody = z.infer<typeof CreateArtifactResponseBody>;
+
 export const InitializeDeploymentResponseBody = z.object({
   id: z.string(),
   contentHash: z.string(),
@@ -337,11 +579,20 @@ export const InitializeDeploymentResponseBody = z.object({
   imageTag: z.string(),
   imagePlatform: z.string(),
   externalBuildData: ExternalBuildData.optional().nullable(),
+  eventStream: z
+    .object({
+      s2: z.object({
+        basin: z.string(),
+        stream: z.string(),
+        accessToken: z.string(),
+      }),
+    })
+    .optional(),
 });
 
 export type InitializeDeploymentResponseBody = z.infer<typeof InitializeDeploymentResponseBody>;
 
-export const InitializeDeploymentRequestBody = z.object({
+const InitializeDeploymentRequestBodyBase = z.object({
   contentHash: z.string(),
   userId: z.string().optional(),
   /** @deprecated This is now determined by the webapp. This is only used to warn users with old CLI versions. */
@@ -349,10 +600,69 @@ export const InitializeDeploymentRequestBody = z.object({
   gitMeta: GitMeta.optional(),
   type: z.enum(["MANAGED", "UNMANAGED", "V1"]).optional(),
   runtime: z.string().optional(),
-});
+  initialStatus: z.enum(["PENDING", "BUILDING"]).optional(),
+  isLocalBuild: z.boolean().optional(),
+  triggeredVia: DeploymentTriggeredVia.optional(),
+  buildId: z.string().optional(),
+});
+type BaseOutput = z.output<typeof InitializeDeploymentRequestBodyBase>;
+
+type NativeBuildOutput = BaseOutput & {
+  isNativeBuild: true;
+  skipPromotion?: boolean;
+  artifactKey?: string;
+  configFilePath?: string;
+  skipEnqueue?: boolean;
+};
+
+type NonNativeBuildOutput = BaseOutput & {
+  isNativeBuild: false;
+  skipPromotion?: never;
+  artifactKey?: never;
+  configFilePath?: never;
+  skipEnqueue?: never;
+};
+
+const InitializeDeploymentRequestBodyFull = InitializeDeploymentRequestBodyBase.extend({
+  isNativeBuild: z.boolean().default(false),
+  skipPromotion: z.boolean().optional(),
+  artifactKey: z.string().optional(),
+  configFilePath: z.string().optional(),
+  skipEnqueue: z.boolean().optional().default(false),
+});
+
+export const InitializeDeploymentRequestBody = InitializeDeploymentRequestBodyFull.transform(
+  (data): NativeBuildOutput | NonNativeBuildOutput => {
+    if (data.isNativeBuild) {
+      return { ...data, isNativeBuild: true as const };
+    }
+    const { skipPromotion, artifactKey, configFilePath, skipEnqueue, ...rest } = data;
+    return { ...rest, isNativeBuild: false as const };
+  }
+);
 
 export type InitializeDeploymentRequestBody = z.infer<typeof InitializeDeploymentRequestBody>;
 
+export const RemoteBuildProviderStatusResponseBody = z.object({
+  status: z.enum(["operational", "degraded", "unknown"]),
+  message: z.string(),
+});
+
+export type RemoteBuildProviderStatusResponseBody = z.infer<
+  typeof RemoteBuildProviderStatusResponseBody
+>;
+
+export const GenerateRegistryCredentialsResponseBody = z.object({
+  username: z.string(),
+  password: z.string(),
+  expiresAt: z.string(),
+  repositoryUri: z.string(),
+});
+
+export type GenerateRegistryCredentialsResponseBody = z.infer<
+  typeof GenerateRegistryCredentialsResponseBody
+>;
+
 export const DeploymentErrorData = z.object({
   name: z.string(),
   message: z.string(),
@@ -386,6 +696,7 @@ export const GetDeploymentResponseBody = z.object({
   id: z.string(),
   status: z.enum([
     "PENDING",
+    "INSTALLING",
     "BUILDING",
     "DEPLOYING",
     "DEPLOYED",
@@ -397,6 +708,9 @@ export const GetDeploymentResponseBody = z.object({
   shortCode: z.string(),
   version: z.string(),
   imageReference: z.string().nullish(),
+  imagePlatform: z.string(),
+  commitSHA: z.string().nullish(),
+  externalBuildData: ExternalBuildData.optional().nullable(),
   errorData: DeploymentErrorData.nullish(),
   worker: z
     .object({
@@ -412,6 +726,17 @@ export const GetDeploymentResponseBody = z.object({
       ),
     })
     .optional(),
+  integrationDeployments: z
+    .array(
+      z.object({
+        id: z.string(),
+        integrationName: z.string(),
+        integrationDeploymentId: z.string(),
+        commitSHA: z.string(),
+        createdAt: z.coerce.date(),
+      })
+    )
+    .nullish(),
 });
 
 export type GetDeploymentResponseBody = z.infer<typeof GetDeploymentResponseBody>;
@@ -421,6 +746,43 @@ export const GetLatestDeploymentResponseBody = GetDeploymentResponseBody.omit({
 });
 export type GetLatestDeploymentResponseBody = z.infer<typeof GetLatestDeploymentResponseBody>;
 
+export const DeploymentLogEvent = z.object({
+  type: z.literal("log"),
+  data: z.object({
+    level: z.enum(["debug", "info", "warn", "error"]).optional().default("info"),
+    message: z.string(),
+  }),
+});
+
+export const DeploymentFinalizedEvent = z.object({
+  type: z.literal("finalized"),
+  data: z.object({
+    result: z.enum(["succeeded", "failed", "timed_out", "canceled"]).or(anyString),
+    message: z.string().optional(),
+  }),
+});
+
+export const DeploymentEvent = z.discriminatedUnion("type", [
+  DeploymentLogEvent,
+  DeploymentFinalizedEvent,
+]);
+
+export type DeploymentEvent = z.infer<typeof DeploymentEvent>;
+export type DeploymentLogEvent = z.infer<typeof DeploymentLogEvent>;
+export type DeploymentFinalizedEvent = z.infer<typeof DeploymentFinalizedEvent>;
+
+export const DeploymentEventFromString = z
+  .string()
+  .transform((s, ctx) => {
+    try {
+      return JSON.parse(s);
+    } catch {
+      ctx.addIssue({ code: z.ZodIssueCode.custom, message: "Invalid JSON" });
+      return z.NEVER;
+    }
+  })
+  .pipe(DeploymentEvent);
+
 export const CreateUploadPayloadUrlResponseBody = z.object({
   presignedUrl: z.string(),
 });
@@ -490,6 +852,12 @@ export const CanceledRunResponse = z.object({
 
 export type CanceledRunResponse = z.infer<typeof CanceledRunResponse>;
 
+export const ResetIdempotencyKeyResponse = z.object({
+  id: z.string(),
+});
+
+export type ResetIdempotencyKeyResponse = z.infer<typeof ResetIdempotencyKeyResponse>;
+
 export const ScheduleType = z.union([z.literal("DECLARATIVE"), z.literal("IMPERATIVE")]);
 
 export const ScheduledTaskPayload = z.object({
@@ -798,6 +1166,12 @@ export const ImportEnvironmentVariablesRequestBody = z.object({
   variables: z.record(z.string()),
   parentVariables: z.record(z.string()).optional(),
   override: z.boolean().optional(),
+  source: z
+    .discriminatedUnion("type", [
+      z.object({ type: z.literal("user"), userId: z.string() }),
+      z.object({ type: z.literal("integration"), integration: z.string() }),
+    ])
+    .optional(),
 });
 
 export type ImportEnvironmentVariablesRequestBody = z.infer<
@@ -887,11 +1261,18 @@ export const SubscribeRunRawShape = z.object({
   outputType: z.string().nullish(),
   runTags: z.array(z.string()).nullish().default([]),
   error: TaskRunError.nullish(),
+  realtimeStreams: z.array(z.string()).nullish().default([]),
 });
 
 export type SubscribeRunRawShape = z.infer<typeof SubscribeRunRawShape>;
 
-export const BatchStatus = z.enum(["PENDING", "COMPLETED"]);
+export const BatchStatus = z.enum([
+  "PENDING",
+  "PROCESSING",
+  "COMPLETED",
+  "PARTIAL_FAILED",
+  "ABORTED",
+]);
 
 export type BatchStatus = z.infer<typeof BatchStatus>;
 
@@ -915,6 +1296,17 @@ export const RetrieveBatchV2Response = z.object({
   updatedAt: z.coerce.date(),
   runCount: z.number(),
   runs: z.array(z.string()),
+  processing: z.object({
+    completedAt: z.coerce.date().optional(),
+    errors: z.array(
+      z.object({
+        index: z.number(),
+        taskIdentifier: z.string(),
+        error: z.string(),
+        errorCode: z.string().optional(),
+      })
+    ),
+  }),
 });
 
 export type RetrieveBatchV2Response = z.infer<typeof RetrieveBatchV2Response>;
@@ -1076,3 +1468,133 @@ export function timeoutError(timeout: Date) {
     message: `Waitpoint timed out at ${timeout.toISOString()}`,
   };
 }
+
+const ApiDeploymentCommonShape = {
+  from: z.string().describe("The date to start the search from, in ISO 8601 format").optional(),
+  to: z.string().describe("The date to end the search, in ISO 8601 format").optional(),
+  period: z.string().describe("The period to search within (e.g. 1d, 7d, 3h, etc.)").optional(),
+  status: z
+    .enum(["PENDING", "BUILDING", "DEPLOYING", "DEPLOYED", "FAILED", "CANCELED", "TIMED_OUT"])
+    .describe("Filter deployments that are in this status")
+    .optional(),
+};
+
+const ApiDeploymentListPaginationCursor = z
+  .string()
+  .describe("The deployment ID to start the search from, to get the next page")
+  .optional();
+
+const ApiDeploymentListPaginationLimit = z.coerce
+  .number()
+  .describe("The number of deployments to return, defaults to 20 (max 100)")
+  .min(1, "Limit must be at least 1")
+  .max(100, "Limit must be less than 100")
+  .optional();
+
+export const ApiDeploymentListParams = {
+  ...ApiDeploymentCommonShape,
+  cursor: ApiDeploymentListPaginationCursor,
+  limit: ApiDeploymentListPaginationLimit,
+};
+
+export const ApiDeploymentListOptions = z.object(ApiDeploymentListParams);
+
+export type ApiDeploymentListOptions = z.infer<typeof ApiDeploymentListOptions>;
+
+export const ApiDeploymentListSearchParams = z.object({
+  ...ApiDeploymentCommonShape,
+  "page[after]": ApiDeploymentListPaginationCursor,
+  "page[size]": ApiDeploymentListPaginationLimit,
+});
+
+export type ApiDeploymentListSearchParams = z.infer<typeof ApiDeploymentListSearchParams>;
+
+export const ApiDeploymentListResponseItem = z.object({
+  id: z.string(),
+  createdAt: z.coerce.date(),
+  shortCode: z.string(),
+  version: z.string(),
+  runtime: z.string(),
+  runtimeVersion: z.string(),
+  status: z.enum([
+    "PENDING",
+    "BUILDING",
+    "DEPLOYING",
+    "DEPLOYED",
+    "FAILED",
+    "CANCELED",
+    "TIMED_OUT",
+  ]),
+  deployedAt: z.coerce.date().optional(),
+  git: z.record(z.any()).optional(),
+  error: DeploymentErrorData.optional(),
+});
+
+export type ApiDeploymentListResponseItem = z.infer<typeof ApiDeploymentListResponseItem>;
+
+export const ApiBranchListResponseBody = z.object({
+  branches: z.array(
+    z.object({
+      id: z.string(),
+      name: z.string(),
+      createdAt: z.coerce.date(),
+      updatedAt: z.coerce.date(),
+      git: z.record(z.any()).optional(),
+      isPaused: z.boolean(),
+    })
+  ),
+});
+
+export type ApiBranchListResponseBody = z.infer<typeof ApiBranchListResponseBody>;
+
+export const RetrieveRunTraceSpanSchema = z.object({
+  id: z.string(),
+  parentId: z.string().optional(),
+  runId: z.string(),
+  data: z.object({
+    message: z.string(),
+    taskSlug: z.string().optional(),
+    taskPath: z.string().optional(),
+    events: z.array(z.any()).optional(),
+    startTime: z.coerce.date(),
+    duration: z.number(),
+    isError: z.boolean(),
+    isPartial: z.boolean(),
+    isCancelled: z.boolean(),
+    level: z.string(),
+    workerVersion: z.string().optional(),
+    queueName: z.string().optional(),
+    machinePreset: z.string().optional(),
+    properties: z.record(z.any()).optional(),
+    output: z.unknown().optional(),
+  }),
+});
+
+export type RetrieveRunTraceSpan = z.infer<typeof RetrieveRunTraceSpanSchema> & {
+  children: Array<RetrieveRunTraceSpan>;
+};
+
+export const RetrieveRunTraceSpan: z.ZodType<RetrieveRunTraceSpan> =
+  RetrieveRunTraceSpanSchema.extend({
+    children: z.lazy(() => RetrieveRunTraceSpan.array()),
+  });
+
+export const RetrieveRunTraceResponseBody = z.object({
+  trace: z.object({
+    traceId: z.string(),
+    rootSpan: RetrieveRunTraceSpan,
+  }),
+});
+
+export type RetrieveRunTraceResponseBody = z.infer<typeof RetrieveRunTraceResponseBody>;
+
+export const CreateStreamResponseBody = z.object({
+  version: z.string(),
+});
+export type CreateStreamResponseBody = z.infer<typeof CreateStreamResponseBody>;
+
+export const AppendToStreamResponseBody = z.object({
+  ok: z.boolean(),
+  message: z.string().optional(),
+});
+export type AppendToStreamResponseBody = z.infer<typeof AppendToStreamResponseBody>;
diff --git a/packages/core/src/v3/schemas/build.ts b/packages/core/src/v3/schemas/build.ts
index ee33bb7efb2..8eb97f0f358 100644
--- a/packages/core/src/v3/schemas/build.ts
+++ b/packages/core/src/v3/schemas/build.ts
@@ -68,6 +68,8 @@ export const BuildManifest = z.object({
       exclude: z.array(z.string()).optional(),
     })
     .optional(),
+  /** Maps output file paths to their content hashes for deduplication during dev */
+  outputHashes: z.record(z.string()).optional(),
 });
 
 export type BuildManifest = z.infer<typeof BuildManifest>;
diff --git a/packages/core/src/v3/schemas/common.ts b/packages/core/src/v3/schemas/common.ts
index e56ec8da6d0..d721910cb9e 100644
--- a/packages/core/src/v3/schemas/common.ts
+++ b/packages/core/src/v3/schemas/common.ts
@@ -214,56 +214,36 @@ export const TaskRun = z.object({
   isTest: z.boolean().default(false),
   createdAt: z.coerce.date(),
   startedAt: z.coerce.date().default(() => new Date()),
+  /** The user-provided idempotency key (not the hash) */
   idempotencyKey: z.string().optional(),
+  /** The scope of the idempotency key */
+  idempotencyKeyScope: z.enum(["run", "attempt", "global"]).optional(),
   maxAttempts: z.number().optional(),
   version: z.string().optional(),
   metadata: z.record(DeserializedJsonSchema).optional(),
   maxDuration: z.number().optional(),
-  /** @deprecated */
-  context: z.any(),
-  /**
-   * @deprecated For live values use the `usage` SDK functions
-   * @link https://trigger.dev/docs/run-usage
-   */
-  durationMs: z.number().default(0),
-  /**
-   * @deprecated For live values use the `usage` SDK functions
-   * @link https://trigger.dev/docs/run-usage
-   */
-  costInCents: z.number().default(0),
-  /**
-   * @deprecated For live values use the `usage` SDK functions
-   * @link https://trigger.dev/docs/run-usage
-   */
-  baseCostInCents: z.number().default(0),
   /** The priority of the run. Wih a value of 10 it will be dequeued before runs that were triggered 9 seconds before it (assuming they had no priority set).  */
   priority: z.number().optional(),
-});
+  baseCostInCents: z.number().optional(),
 
-export type TaskRun = z.infer<typeof TaskRun>;
+  parentTaskRunId: z.string().optional(),
+  rootTaskRunId: z.string().optional(),
 
-export const TaskRunExecutionTask = z.object({
-  id: z.string(),
-  filePath: z.string(),
-  exportName: z.string().optional(),
-});
+  // These are only used during execution, not in run.ctx
+  durationMs: z.number().optional(),
+  costInCents: z.number().optional(),
 
-export type TaskRunExecutionTask = z.infer<typeof TaskRunExecutionTask>;
-
-export const TaskRunExecutionAttempt = z.object({
-  number: z.number(),
-  startedAt: z.coerce.date(),
-  /** @deprecated */
-  id: z.string(),
-  /** @deprecated */
-  backgroundWorkerId: z.string(),
-  /** @deprecated */
-  backgroundWorkerTaskId: z.string(),
-  /** @deprecated */
-  status: z.string(),
+  region: z.string().optional(),
 });
 
+export type TaskRun = z.infer<typeof TaskRun>;
+
+// newly added fields need to be optional for backwards compatibility
 export const GitMeta = z.object({
+  provider: z.string().optional(),
+  source: z.enum(["trigger_github_app", "github_actions", "local"]).optional(),
+  ghUsername: z.string().optional(),
+  ghUserAvatarUrl: z.string().optional(),
   commitAuthorName: z.string().optional(),
   commitMessage: z.string().optional(),
   commitRef: z.string().optional(),
@@ -277,6 +257,18 @@ export const GitMeta = z.object({
 
 export type GitMeta = z.infer<typeof GitMeta>;
 
+export const TaskRunExecutionTask = z.object({
+  id: z.string(),
+  filePath: z.string(),
+});
+
+export type TaskRunExecutionTask = z.infer<typeof TaskRunExecutionTask>;
+
+export const TaskRunExecutionAttempt = z.object({
+  number: z.number(),
+  startedAt: z.coerce.date(),
+});
+
 export type TaskRunExecutionAttempt = z.infer<typeof TaskRunExecutionAttempt>;
 
 export const TaskRunExecutionEnvironment = z.object({
@@ -317,10 +309,94 @@ export const TaskRunExecutionBatch = z.object({
   id: z.string(),
 });
 
+export const TaskRunExecutionDeployment = z.object({
+  id: z.string(),
+  shortCode: z.string(),
+  version: z.string(),
+  runtime: z.string(),
+  runtimeVersion: z.string(),
+  git: GitMeta.optional(),
+});
+
+export type TaskRunExecutionDeployment = z.infer<typeof TaskRunExecutionDeployment>;
+
+const StaticTaskRunExecutionShape = {
+  // Passthrough needed for backwards compatibility
+  task: TaskRunExecutionTask.passthrough(),
+  queue: TaskRunExecutionQueue,
+  environment: TaskRunExecutionEnvironment,
+  organization: TaskRunExecutionOrganization,
+  project: TaskRunExecutionProject,
+  machine: MachinePreset,
+  batch: TaskRunExecutionBatch.optional(),
+  deployment: TaskRunExecutionDeployment.optional(),
+};
+
+export const StaticTaskRunExecution = z.object(StaticTaskRunExecutionShape);
+
+export type StaticTaskRunExecution = z.infer<typeof StaticTaskRunExecution>;
+
 export const TaskRunExecution = z.object({
-  task: TaskRunExecutionTask,
-  attempt: TaskRunExecutionAttempt,
+  // Passthrough needed for backwards compatibility
+  attempt: TaskRunExecutionAttempt.passthrough(),
   run: TaskRun.and(
+    z.object({
+      traceContext: z.record(z.unknown()).optional(),
+      realtimeStreamsVersion: z.string().optional(),
+    })
+  ),
+  ...StaticTaskRunExecutionShape,
+});
+
+export type TaskRunExecution = z.infer<typeof TaskRunExecution>;
+
+export const V3TaskRunExecutionTask = z.object({
+  id: z.string(),
+  filePath: z.string(),
+  exportName: z.string().optional(),
+});
+
+export type V3TaskRunExecutionTask = z.infer<typeof V3TaskRunExecutionTask>;
+
+export const V3TaskRunExecutionAttempt = z.object({
+  number: z.number(),
+  startedAt: z.coerce.date(),
+  id: z.string(),
+  backgroundWorkerId: z.string(),
+  backgroundWorkerTaskId: z.string(),
+  status: z.string(),
+});
+
+export type V3TaskRunExecutionAttempt = z.infer<typeof V3TaskRunExecutionAttempt>;
+
+export const V3TaskRun = z.object({
+  id: z.string(),
+  payload: z.string(),
+  payloadType: z.string(),
+  tags: z.array(z.string()),
+  isTest: z.boolean().default(false),
+  createdAt: z.coerce.date(),
+  startedAt: z.coerce.date().default(() => new Date()),
+  /** The user-provided idempotency key (not the hash) */
+  idempotencyKey: z.string().optional(),
+  /** The scope of the idempotency key */
+  idempotencyKeyScope: z.enum(["run", "attempt", "global"]).optional(),
+  maxAttempts: z.number().optional(),
+  version: z.string().optional(),
+  metadata: z.record(DeserializedJsonSchema).optional(),
+  maxDuration: z.number().optional(),
+  context: z.unknown(),
+  durationMs: z.number(),
+  costInCents: z.number(),
+  baseCostInCents: z.number(),
+});
+
+export type V3TaskRun = z.infer<typeof V3TaskRun>;
+
+export const V3TaskRunExecution = z.object({
+  task: V3TaskRunExecutionTask,
+  attempt: V3TaskRunExecutionAttempt,
+  run: V3TaskRun.and(
     z.object({
       traceContext: z.record(z.unknown()).optional(),
     })
@@ -329,28 +405,54 @@ export const TaskRunExecution = z.object({
   environment: TaskRunExecutionEnvironment,
   organization: TaskRunExecutionOrganization,
   project: TaskRunExecutionProject,
-  batch: TaskRunExecutionBatch.optional(),
   machine: MachinePreset,
+  batch: TaskRunExecutionBatch.optional(),
 });
 
-export type TaskRunExecution = z.infer<typeof TaskRunExecution>;
+export type V3TaskRunExecution = z.infer<typeof V3TaskRunExecution>;
 
 export const TaskRunContext = z.object({
-  task: TaskRunExecutionTask,
-  attempt: TaskRunExecutionAttempt.omit({
+  attempt: TaskRunExecutionAttempt,
+  run: TaskRun.omit({
+    payload: true,
+    payloadType: true,
+    metadata: true,
+    durationMs: true,
+    costInCents: true,
+  }),
+  ...StaticTaskRunExecutionShape,
+});
+
+export type TaskRunContext = z.infer<typeof TaskRunContext>;
+
+export const V3TaskRunExecutionEnvironment = z.object({
+  id: z.string(),
+  slug: z.string(),
+  type: z.enum(["PRODUCTION", "STAGING", "DEVELOPMENT", "PREVIEW"]),
+});
+
+export type V3TaskRunExecutionEnvironment = z.infer<typeof V3TaskRunExecutionEnvironment>;
+
+export const V3TaskRunContext = z.object({
+  attempt: V3TaskRunExecutionAttempt.omit({
     backgroundWorkerId: true,
     backgroundWorkerTaskId: true,
   }),
-  run: TaskRun.omit({ payload: true, payloadType: true, metadata: true }),
+  run: V3TaskRun.omit({
+    payload: true,
+    payloadType: true,
+    metadata: true,
+  }),
+  task: V3TaskRunExecutionTask,
   queue: TaskRunExecutionQueue,
-  environment: TaskRunExecutionEnvironment,
+  environment: V3TaskRunExecutionEnvironment,
   organization: TaskRunExecutionOrganization,
   project: TaskRunExecutionProject,
   batch: TaskRunExecutionBatch.optional(),
   machine: MachinePreset.optional(),
 });
 
-export type TaskRunContext = z.infer<typeof TaskRunContext>;
+export type V3TaskRunContext = z.infer<typeof V3TaskRunContext>;
 
 export const TaskRunExecutionRetry = z.object({
   timestamp: z.number(),
diff --git a/packages/core/src/v3/schemas/index.ts b/packages/core/src/v3/schemas/index.ts
index c2b17a72b65..11857d6197f 100644
--- a/packages/core/src/v3/schemas/index.ts
+++ b/packages/core/src/v3/schemas/index.ts
@@ -15,3 +15,4 @@ export * from "./webhooks.js";
 export * from "./checkpoints.js";
 export * from "./warmStart.js";
 export * from "./queues.js";
+export * from "./query.js";
diff --git a/packages/core/src/v3/schemas/messages.ts b/packages/core/src/v3/schemas/messages.ts
index 6c813b357e0..b58babba717 100644
--- a/packages/core/src/v3/schemas/messages.ts
+++ b/packages/core/src/v3/schemas/messages.ts
@@ -6,19 +6,20 @@ import {
   TaskRunExecutionResult,
   TaskRunFailedExecutionResult,
   TaskRunInternalError,
+  V3TaskRunExecution,
 } from "./common.js";
 import { TaskResource } from "./resources.js";
 import {
   EnvironmentType,
-  ProdTaskRunExecution,
-  ProdTaskRunExecutionPayload,
+  V3ProdTaskRunExecution,
+  V3ProdTaskRunExecutionPayload,
   RunEngineVersionSchema,
   TaskRunExecutionLazyAttemptPayload,
   TaskRunExecutionMetrics,
   WaitReason,
 } from "./schemas.js";
 import { CompletedWaitpoint } from "./runEngine.js";
-import { DebugLogPropertiesInput } from "../runEngineWorker/index.js";
+import { DebugLogPropertiesInput } from "../runEngineWorker/supervisor/schemas.js";
 
 export const AckCallbackResult = z.discriminatedUnion("success", [
   z.object({
@@ -83,7 +84,7 @@ export const BackgroundWorkerClientMessages = z.discriminatedUnion("type", [
     version: z.literal("v1").default("v1"),
     type: z.literal("TASK_RUN_COMPLETED"),
     completion: TaskRunExecutionResult,
-    execution: TaskRunExecution,
+    execution: V3TaskRunExecution,
   }),
   z.object({
     version: z.literal("v1").default("v1"),
@@ -188,6 +189,13 @@ export const ExecutorToWorkerMessageCatalog = {
       suspendable: z.boolean(),
     }),
   },
+  MAX_DURATION_EXCEEDED: {
+    message: z.object({
+      version: z.literal("v1").default("v1"),
+      maxDurationInSeconds: z.number(),
+      elapsedTimeInSeconds: z.number(),
+    }),
+  },
 };
 
 export const WorkerToExecutorMessageCatalog = {
@@ -205,6 +213,7 @@ export const WorkerToExecutorMessageCatalog = {
   FLUSH: {
     message: z.object({
       timeoutInMs: z.number(),
+      disableContext: z.boolean().optional(),
     }),
     callback: z.void(),
   },
@@ -368,7 +377,7 @@ export const CoordinatorToPlatformMessages = {
       }),
       z.object({
         success: z.literal(true),
-        executionPayload: ProdTaskRunExecutionPayload,
+        executionPayload: V3ProdTaskRunExecutionPayload,
       }),
     ]),
   },
@@ -385,7 +394,7 @@ export const CoordinatorToPlatformMessages = {
       }),
       z.object({
         success: z.literal(true),
-        payload: ProdTaskRunExecutionPayload,
+        payload: V3ProdTaskRunExecutionPayload,
       }),
     ]),
   },
@@ -417,7 +426,7 @@ export const CoordinatorToPlatformMessages = {
   TASK_RUN_COMPLETED: {
     message: z.object({
       version: z.enum(["v1", "v2"]).default("v1"),
-      execution: ProdTaskRunExecution,
+      execution: V3ProdTaskRunExecution,
       completion: TaskRunExecutionResult,
       checkpoint: z
         .object({
@@ -430,7 +439,7 @@ export const CoordinatorToPlatformMessages = {
   TASK_RUN_COMPLETED_WITH_ACK: {
     message: z.object({
       version: z.enum(["v1", "v2"]).default("v2"),
-      execution: ProdTaskRunExecution,
+      execution: V3ProdTaskRunExecution,
       completion: TaskRunExecutionResult,
       checkpoint: z
         .object({
@@ -720,7 +729,7 @@ export const ProdWorkerToCoordinatorMessages = {
   TASK_RUN_COMPLETED: {
     message: z.object({
       version: z.enum(["v1", "v2"]).default("v1"),
-      execution: ProdTaskRunExecution,
+      execution: V3ProdTaskRunExecution,
       completion: TaskRunExecutionResult,
     }),
     callback: z.object({
@@ -792,7 +801,7 @@ export const ProdWorkerToCoordinatorMessages = {
       }),
       z.object({
         success: z.literal(true),
-        executionPayload: ProdTaskRunExecutionPayload,
+        executionPayload: V3ProdTaskRunExecutionPayload,
       }),
     ]),
   },
@@ -835,7 +844,7 @@ export const CoordinatorToProdWorkerMessages = {
   EXECUTE_TASK_RUN: {
     message: z.object({
       version: z.literal("v1").default("v1"),
-      executionPayload: ProdTaskRunExecutionPayload,
+      executionPayload: V3ProdTaskRunExecutionPayload,
     }),
   },
   EXECUTE_TASK_RUN_LAZY_ATTEMPT: {
diff --git a/packages/core/src/v3/schemas/openTelemetry.ts b/packages/core/src/v3/schemas/openTelemetry.ts
index 140f1c45b83..47d9d9a50d9 100644
--- a/packages/core/src/v3/schemas/openTelemetry.ts
+++ b/packages/core/src/v3/schemas/openTelemetry.ts
@@ -28,6 +28,18 @@ export const CancellationSpanEvent = z.object({
 
 export type CancellationSpanEvent = z.infer<typeof CancellationSpanEvent>;
 
+export const AttemptFailedSpanEvent = z.object({
+  name: z.literal("attempt_failed"),
+  time: z.coerce.date(),
+  properties: z.object({
+    exception: ExceptionEventProperties,
+    attemptNumber: z.number(),
+    runId: z.string(),
+  }),
+});
+
+export type AttemptFailedSpanEvent = z.infer<typeof AttemptFailedSpanEvent>;
+
 export const OtherSpanEvent = z.object({
   name: z.string(),
   time: z.coerce.date(),
@@ -36,7 +48,12 @@ export const OtherSpanEvent = z.object({
 
 export type OtherSpanEvent = z.infer<typeof OtherSpanEvent>;
 
-export const SpanEvent = z.union([ExceptionSpanEvent, CancellationSpanEvent, OtherSpanEvent]);
+export const SpanEvent = z.union([
+  ExceptionSpanEvent,
+  CancellationSpanEvent,
+  AttemptFailedSpanEvent,
+  OtherSpanEvent,
+]);
 
 export type SpanEvent = z.infer<typeof SpanEvent>;
 
@@ -52,6 +69,10 @@ export function isCancellationSpanEvent(event: SpanEvent): event is Cancellation
   return event.name === "cancellation";
 }
 
+export function isAttemptFailedSpanEvent(event: SpanEvent): event is AttemptFailedSpanEvent {
+  return event.name === "attempt_failed";
+}
+
 export const SpanMessagingEvent = z.object({
   system: z.string().optional(),
   client_id: z.string().optional(),
diff --git a/packages/core/src/v3/schemas/query.ts b/packages/core/src/v3/schemas/query.ts
new file mode 100644
index 00000000000..44b771e5f12
--- /dev/null
+++ b/packages/core/src/v3/schemas/query.ts
@@ -0,0 +1,209 @@
+import { TypeOf, z } from "zod";
+import type { MachinePresetName } from "./common.js";
+import type { RuntimeEnvironmentType } from "./common.js";
+import type { IdempotencyKeyScope } from "../idempotency-key-catalog/catalog.js";
+
+/**
+ * Request body schema for executing a query
+ */
+export const QueryExecuteRequestBody = z.object({
+  query: z.string(),
+  scope: z.enum(["organization", "project", "environment"]).default("environment"),
+  period: z.string().nullish(),
+  from: z.string().nullish(),
+  to: z.string().nullish(),
+  format: z.enum(["json", "csv"]).default("json"),
+});
+
+export type QueryExecuteRequestBody = z.infer<typeof QueryExecuteRequestBody>;
+
+/**
+ * Response body schema for JSON format queries
+ */
+export const QueryExecuteJSONResponseBody = z.object({
+  format: z.literal("json"),
+  results: z.array(z.record(z.any())),
+});
+
+export type QueryExecuteJSONResponseBody = z.infer<typeof QueryExecuteJSONResponseBody>;
+
+/**
+ * Response body type for CSV format queries
+ */
+export const QueryExecuteCSVResponseBody = z.object({
+  format: z.literal("csv"),
+  results: z.string(),
+});
+
+export type QueryExecuteCSVResponseBody = z.infer<typeof QueryExecuteCSVResponseBody>;
+
+export const QueryExecuteResponseBody = z.discriminatedUnion("format", [
+  QueryExecuteJSONResponseBody,
+  QueryExecuteCSVResponseBody,
+]);
+export type QueryExecuteResponseBody = z.infer<typeof QueryExecuteResponseBody>;
+
+// ---------------------------------------------------------------------------
+// Query table row types
+// ---------------------------------------------------------------------------
+
+/**
+ * User-facing friendly run status values returned by the query system.
+ */
+export const runFriendlyStatus = [
+  "Delayed",
+  "Queued",
+  "Pending version",
+  "Dequeued",
+  "Executing",
+  "Waiting",
+  "Reattempting",
+  "Paused",
+  "Canceled",
+  "Interrupted",
+  "Completed",
+  "Failed",
+  "System failure",
+  "Crashed",
+  "Expired",
+  "Timed out",
+] as const;
+
+export type RunFriendlyStatus = (typeof runFriendlyStatus)[number];
+
+/**
+ * Full row type for the `runs` query table.
+ *
+ * Each property corresponds to a column available in TSQL queries against the
+ * `runs` table. Types are mapped from the underlying ClickHouse column types:
+ *
+ * - `String` → `string`
+ * - `UInt8` / `UInt32` / `Int64` / `Float64` → `number`
+ * - `DateTime64` → `string`
+ * - `Nullable(X)` → `X | null`
+ * - `Array(String)` → `string[]`
+ * - `JSON` → `Record<string, unknown>`
+ * - `LowCardinality(String)` with constrained values → narrow union type
+ */
+export interface RunsTableRow {
+  /** Unique run ID (e.g. `run_cm1a2b3c4d5e6f7g8h9i`) */
+  run_id: string;
+  /** Environment slug */
+  environment: string;
+  /** Project reference (e.g. `proj_howcnaxbfxdmwmxazktx`) */
+  project: string;
+  /** Environment type */
+  environment_type: RuntimeEnvironmentType;
+  /** Number of attempts (starts at 1) */
+  attempt_count: number;
+  /** Run status (friendly name) */
+  status: RunFriendlyStatus;
+  /** Whether the run is finished (0 or 1) */
+  is_finished: number;
+  /** Task identifier/slug */
+  task_identifier: string;
+  /** Queue name */
+  queue: string;
+  /** Batch ID (if part of a batch), or `null` */
+  batch_id: string | null;
+  /** Root run ID (for child runs), or `null` */
+  root_run_id: string | null;
+  /** Parent run ID (for child runs), or `null` */
+  parent_run_id: string | null;
+  /** Nesting depth (0 for root runs) */
+  depth: number;
+  /** Whether this is a root run (0 or 1) */
+  is_root_run: number;
+  /** Whether this is a child run (0 or 1) */
+  is_child_run: number;
+  /** Idempotency key */
+  idempotency_key: string;
+  /** Idempotency key scope (empty string means no idempotency key is set) */
+  idempotency_key_scope: IdempotencyKeyScope | "";
+  /** Region, or `null` */
+  region: string | null;
+  /** When the run was triggered (ISO 8601) */
+  triggered_at: string;
+  /** When the run was queued, or `null` */
+  queued_at: string | null;
+  /** When the run was dequeued, or `null` */
+  dequeued_at: string | null;
+  /** When execution began, or `null` */
+  executed_at: string | null;
+  /** When the run completed, or `null` */
+  completed_at: string | null;
+  /** Delayed execution until this time, or `null` */
+  delay_until: string | null;
+  /** Whether the run had a delay (0 or 1) */
+  has_delay: number;
+  /** When the run expired, or `null` */
+  expired_at: string | null;
+  /** TTL string for expiration (e.g. `"10m"`) */
+  ttl: string;
+  /** Time from execution start to completion in ms, or `null` */
+  execution_duration: number | null;
+  /** Time from trigger to completion in ms, or `null` */
+  total_duration: number | null;
+  /** Time from queued to dequeued in ms, or `null` */
+  queued_duration: number | null;
+  /** Compute usage duration in ms */
+  usage_duration: number;
+  /** Compute cost in dollars */
+  compute_cost: number;
+  /** Invocation cost in dollars */
+  invocation_cost: number;
+  /** Total cost in dollars (compute + invocation) */
+  total_cost: number;
+  /** The data returned from the task */
+  output: Record<string, unknown>;
+  /** Error data if the run failed */
+  error: Record<string, unknown>;
+  /** Tags added to the run */
+  tags: string[];
+  /** Code version in reverse date format (e.g. `"20240115.1"`) */
+  task_version: string;
+  /** SDK package version */
+  sdk_version: string;
+  /** CLI package version */
+  cli_version: string;
+  /** Machine preset the run executed on */
+  machine: MachinePresetName;
+  /** Whether this is a test run (0 or 1) */
+  is_test: number;
+  /** Concurrency key passed when triggering */
+  concurrency_key: string;
+  /** Max allowed compute duration in seconds, or `null` */
+  max_duration: number | null;
+  /** Bulk action group IDs that operated on this run */
+  bulk_action_group_ids: string[];
+}
+
+/** @internal Map of query table names to their full row types */
+type QueryTableMap = {
+  runs: RunsTableRow;
+};
+
+/**
+ * Type helper for Query results.
+ *
+ * @example
+ * ```typescript
+ * // All columns from the runs table
+ * type AllRuns = QueryTable<"runs">;
+ *
+ * // Only specific columns
+ * type MyResult = QueryTable<"runs", "status" | "run_id">;
+ *
+ * // Access a single field type
+ * type Status = QueryTable<"runs">["status"]; // RunFriendlyStatus
+ *
+ * // Use with query.execute
+ * const result = await query.execute<QueryTable<"runs", "status" | "run_id">>(
+ *   "SELECT status, run_id FROM runs"
+ * );
+ * ```
+ */
+export type QueryTable<
+  TTable extends keyof QueryTableMap,
+  TColumns extends keyof QueryTableMap[TTable] = keyof QueryTableMap[TTable],
+> = Pick<QueryTableMap[TTable], TColumns>;
diff --git a/packages/core/src/v3/schemas/queues.ts b/packages/core/src/v3/schemas/queues.ts
index cf42f0ed9a2..34a47b34e3e 100644
--- a/packages/core/src/v3/schemas/queues.ts
+++ b/packages/core/src/v3/schemas/queues.ts
@@ -28,10 +28,25 @@ export const QueueItem = z.object({
   running: z.number(),
   /** The number of runs currently queued */
   queued: z.number(),
-  /** The concurrency limit of the queue */
-  concurrencyLimit: z.number().nullable(),
   /** Whether the queue is paused. If it's paused, no new runs will be started. */
   paused: z.boolean(),
+  /** The concurrency limit of the queue */
+  concurrencyLimit: z.number().nullable(),
+  /** The concurrency limit of the queue */
+  concurrency: z
+    .object({
+      /** The effective/current concurrency limit */
+      current: z.number().nullable(),
+      /** The base concurrency limit (default) */
+      base: z.number().nullable(),
+      /** The effective/current concurrency limit */
+      override: z.number().nullable(),
+      /** When the override was applied */
+      overriddenAt: z.coerce.date().nullable(),
+      /** Who overrode the concurrency limit (will be null if overridden via the API) */
+      overriddenBy: z.string().nullable(),
+    })
+    .optional(),
 });
 
 export type QueueItem = z.infer<typeof QueueItem>;
diff --git a/packages/core/src/v3/schemas/resources.ts b/packages/core/src/v3/schemas/resources.ts
index ec2b180bbcd..08764906ede 100644
--- a/packages/core/src/v3/schemas/resources.ts
+++ b/packages/core/src/v3/schemas/resources.ts
@@ -13,6 +13,8 @@ export const TaskResource = z.object({
   triggerSource: z.string().optional(),
   schedule: ScheduleMetadata.optional(),
   maxDuration: z.number().optional(),
+  // JSONSchema type - using z.unknown() for runtime validation to accept JSONSchema7
+  payloadSchema: z.unknown().optional(),
 });
 
 export type TaskResource = z.infer<typeof TaskResource>;
diff --git a/packages/core/src/v3/schemas/runEngine.ts b/packages/core/src/v3/schemas/runEngine.ts
index ef6ef170ced..e4057e7ca66 100644
--- a/packages/core/src/v3/schemas/runEngine.ts
+++ b/packages/core/src/v3/schemas/runEngine.ts
@@ -13,6 +13,7 @@ export const TaskRunExecutionStatus = {
   SUSPENDED: "SUSPENDED",
   PENDING_CANCEL: "PENDING_CANCEL",
   FINISHED: "FINISHED",
+  DELAYED: "DELAYED",
 } satisfies Enum<DB_TYPES.TaskRunExecutionStatus>;
 
 export type TaskRunExecutionStatus =
@@ -118,6 +119,7 @@ const BaseRunMetadata = z.object({
   friendlyId: z.string(),
   status: z.enum(Object.values(TaskRunStatus) as [TaskRunStatus]),
   attemptNumber: z.number().nullish(),
+  taskEventStore: z.string().optional(),
 });
 
 export const ExecutionResult = z.object({
@@ -224,11 +226,18 @@ export const DequeueMessageCheckpoint = z.object({
 });
 export type DequeueMessageCheckpoint = z.infer<typeof DequeueMessageCheckpoint>;
 
+export const PlacementTag = z.object({
+  key: z.string(),
+  values: z.array(z.string()).optional(),
+});
+export type PlacementTag = z.infer<typeof PlacementTag>;
+
 /** This is sent to a Worker when a run is dequeued (a new run or continuing run) */
 export const DequeuedMessage = z.object({
   version: z.literal("1"),
   snapshot: ExecutionSnapshot,
   dequeuedAt: z.coerce.date(),
+  workerQueueLength: z.number().optional(),
   image: z.string().optional(),
   checkpoint: DequeueMessageCheckpoint.optional(),
   completedWaitpoints: z.array(CompletedWaitpoint),
@@ -261,5 +270,6 @@ export const DequeuedMessage = z.object({
   project: z.object({
     id: z.string(),
   }),
+  placementTags: z.array(PlacementTag).optional(),
 });
 export type DequeuedMessage = z.infer<typeof DequeuedMessage>;
diff --git a/packages/core/src/v3/schemas/schemas.ts b/packages/core/src/v3/schemas/schemas.ts
index 660f9dea380..233068c0b7b 100644
--- a/packages/core/src/v3/schemas/schemas.ts
+++ b/packages/core/src/v3/schemas/schemas.ts
@@ -1,6 +1,12 @@
 import { z } from "zod";
 import { RequireKeys } from "../types/index.js";
-import { MachineConfig, MachinePreset, MachinePresetName, TaskRunExecution } from "./common.js";
+import {
+  MachineConfig,
+  MachinePreset,
+  MachinePresetName,
+  TaskRunExecution,
+  V3TaskRunExecution,
+} from "./common.js";
 
 /*
     WARNING: Never import anything from ./messages here. If it's needed in both, put it here instead.
@@ -36,7 +42,7 @@ export type TaskRunExecutionPayload = z.infer<typeof TaskRunExecutionPayload>;
 // Strategies for not breaking backwards compatibility:
 // 1. Add new fields as optional
 // 2. If a field is required, add a default value
-export const ProdTaskRunExecution = TaskRunExecution.extend({
+export const V3ProdTaskRunExecution = V3TaskRunExecution.extend({
   worker: z.object({
     id: z.string(),
     contentHash: z.string(),
@@ -46,16 +52,16 @@ export const ProdTaskRunExecution = TaskRunExecution.extend({
   machine: MachinePreset.default({ name: "small-1x", cpu: 1, memory: 1, centsPerMs: 0 }),
 });
 
-export type ProdTaskRunExecution = z.infer<typeof ProdTaskRunExecution>;
+export type V3ProdTaskRunExecution = z.infer<typeof V3ProdTaskRunExecution>;
 
-export const ProdTaskRunExecutionPayload = z.object({
-  execution: ProdTaskRunExecution,
+export const V3ProdTaskRunExecutionPayload = z.object({
+  execution: V3ProdTaskRunExecution,
   traceContext: z.record(z.unknown()),
   environment: z.record(z.string()).optional(),
   metrics: TaskRunExecutionMetrics.optional(),
 });
 
-export type ProdTaskRunExecutionPayload = z.infer<typeof ProdTaskRunExecutionPayload>;
+export type V3ProdTaskRunExecutionPayload = z.infer<typeof V3ProdTaskRunExecutionPayload>;
 
 export const FixedWindowRateLimit = z.object({
   type: z.literal("fixed-window"),
@@ -183,6 +189,7 @@ const taskMetadata = {
   triggerSource: z.string().optional(),
   schedule: ScheduleMetadata.optional(),
   maxDuration: z.number().optional(),
+  payloadSchema: z.unknown().optional(),
 };
 
 export const TaskMetadata = z.object(taskMetadata);
@@ -290,3 +297,16 @@ export const RunChainState = z.object({
 });
 
 export type RunChainState = z.infer<typeof RunChainState>;
+
+export const TriggerTraceContext = z.object({
+  traceparent: z.string().optional(),
+  tracestate: z.string().optional(),
+  external: z
+    .object({
+      traceparent: z.string().optional(),
+      tracestate: z.string().optional(),
+    })
+    .optional(),
+});
+
+export type TriggerTraceContext = z.infer<typeof TriggerTraceContext>;
diff --git a/packages/core/src/v3/semanticInternalAttributes.ts b/packages/core/src/v3/semanticInternalAttributes.ts
index b5e0af63a57..3fb20a06499 100644
--- a/packages/core/src/v3/semanticInternalAttributes.ts
+++ b/packages/core/src/v3/semanticInternalAttributes.ts
@@ -19,6 +19,7 @@ export const SemanticInternalAttributes = {
   TASK_EXPORT_NAME: "ctx.task.exportName",
   QUEUE_NAME: "ctx.queue.name",
   QUEUE_ID: "ctx.queue.id",
+  MACHINE_ID: "ctx.machine.id",
   MACHINE_PRESET_NAME: "ctx.machine.name",
   MACHINE_PRESET_CPU: "ctx.machine.cpu",
   MACHINE_PRESET_MEMORY: "ctx.machine.memory",
@@ -26,8 +27,10 @@ export const SemanticInternalAttributes = {
   SKIP_SPAN_PARTIAL: "$span.skip_partial",
   SPAN_PARTIAL: "$span.partial",
   SPAN_ID: "$span.span_id",
+  SPAN: "$span",
   ENTITY_TYPE: "$entity.type",
   ENTITY_ID: "$entity.id",
+  ENTITY_METADATA: "$entity.metadata",
   OUTPUT: "$output",
   OUTPUT_TYPE: "$mime_type_output",
   STYLE: "$style",
@@ -53,6 +56,7 @@ export const SemanticInternalAttributes = {
   IDEMPOTENCY_KEY: "ctx.run.idempotencyKey",
   USAGE_DURATION_MS: "$usage.durationMs",
   USAGE_COST_IN_CENTS: "$usage.costInCents",
+  USAGE: "$usage",
   RATE_LIMIT_LIMIT: "response.rateLimit.limit",
   RATE_LIMIT_REMAINING: "response.rateLimit.remaining",
   RATE_LIMIT_RESET: "response.rateLimit.reset",
@@ -61,4 +65,6 @@ export const SemanticInternalAttributes = {
   EXECUTION_ENVIRONMENT: "exec_env",
   WARM_START: "warm_start",
   ATTEMPT_EXECUTION_COUNT: "$trigger.executionCount",
+  TASK_EVENT_STORE: "$trigger.taskEventStore",
+  RUN_TAGS: "ctx.run.tags",
 };
diff --git a/packages/core/src/v3/serverOnly/idempotencyKeys.ts b/packages/core/src/v3/serverOnly/idempotencyKeys.ts
new file mode 100644
index 00000000000..91dac04fd43
--- /dev/null
+++ b/packages/core/src/v3/serverOnly/idempotencyKeys.ts
@@ -0,0 +1,69 @@
+import { IdempotencyKeyOptionsSchema } from "../schemas/api.js";
+
+/**
+ * Safely parses idempotencyKeyOptions from a database record and extracts the user-provided key.
+ * Returns the user-provided key if valid options exist, otherwise falls back to the hash.
+ *
+ * @param run - Object containing idempotencyKey (the hash) and idempotencyKeyOptions (JSON from DB)
+ * @returns The user-provided key, the hash as fallback, or null if neither exists
+ */
+export function getUserProvidedIdempotencyKey(run: {
+  idempotencyKey: string | null | undefined;
+  idempotencyKeyOptions: unknown;
+}): string | undefined {
+  const parsed = IdempotencyKeyOptionsSchema.safeParse(run.idempotencyKeyOptions);
+  if (parsed.success) {
+    return parsed.data.key;
+  }
+  return run.idempotencyKey ?? undefined;
+}
+
+/**
+ * Safely parses idempotencyKeyOptions and extracts the scope.
+ *
+ * @param run - Object containing idempotencyKeyOptions (JSON from DB)
+ * @returns The scope if valid options exist, otherwise undefined
+ */
+export function extractIdempotencyKeyScope(run: {
+  idempotencyKeyOptions: unknown;
+}): "run" | "attempt" | "global" | undefined {
+  const parsed = IdempotencyKeyOptionsSchema.safeParse(run.idempotencyKeyOptions);
+  if (parsed.success) {
+    return parsed.data.scope;
+  }
+  return undefined;
+}
+
+export function unsafeExtractIdempotencyKeyScope(run: {
+  idempotencyKeyOptions: unknown;
+}): "run" | "attempt" | "global" | undefined {
+  const unsafe = run.idempotencyKeyOptions as { scope?: "run" | "attempt" | "global" } | undefined | null;
+  return unsafe?.scope ?? undefined;
+}
+
+/**
+ * Extracts just the user-provided key from idempotencyKeyOptions, without falling back to the hash.
+ * Useful for ClickHouse replication where we want to store only the explicit user key.
+ *
+ * @param run - Object containing idempotencyKeyOptions (JSON from DB)
+ * @returns The user-provided key if valid options exist, otherwise undefined
+ */
+export function extractIdempotencyKeyUser(run: {
+  idempotencyKeyOptions: unknown;
+}): string | undefined {
+  const parsed = IdempotencyKeyOptionsSchema.safeParse(run.idempotencyKeyOptions);
+  if (parsed.success) {
+    return parsed.data.key;
+  }
+  return undefined;
+}
+
+export function unsafeExtractIdempotencyKeyUser(run: {
+  idempotencyKeyOptions: unknown;
+}): string | undefined {
+  const unsafe = run.idempotencyKeyOptions as { key?: string } | undefined | null;
+
+  return unsafe?.key ?? undefined;
+}
+
+
diff --git a/packages/core/src/v3/serverOnly/index.ts b/packages/core/src/v3/serverOnly/index.ts
index 3b28ab95fbc..8f56f0e3307 100644
--- a/packages/core/src/v3/serverOnly/index.ts
+++ b/packages/core/src/v3/serverOnly/index.ts
@@ -6,3 +6,6 @@ export * from "./shutdownManager.js";
 export * from "./k8s.js";
 export * from "./jumpHash.js";
 export * from "../apiClient/version.js";
+export * from "./placementTags.js";
+export * from "./resourceMonitor.js";
+export * from "./idempotencyKeys.js";
diff --git a/packages/core/src/v3/serverOnly/placementTags.ts b/packages/core/src/v3/serverOnly/placementTags.ts
new file mode 100644
index 00000000000..244aad5be07
--- /dev/null
+++ b/packages/core/src/v3/serverOnly/placementTags.ts
@@ -0,0 +1,58 @@
+import { type PlacementTag } from "../schemas/index.js";
+import { SimpleStructuredLogger } from "../utils/structuredLogger.js";
+
+export interface PlacementConfig {
+  enabled: boolean;
+  prefix: string;
+}
+
+export class PlacementTagProcessor {
+  private readonly logger = new SimpleStructuredLogger("placement-tag-processor");
+
+  constructor(private readonly config: PlacementConfig) {}
+
+  /**
+   * Converts placement tags to Kubernetes nodeSelector labels
+   */
+  convertToNodeSelector(
+    placementTags?: PlacementTag[],
+    existingNodeSelector?: Record<string, string>
+  ): Record<string, string> {
+    if (!this.config.enabled || !placementTags || placementTags.length === 0) {
+      return existingNodeSelector ?? {};
+    }
+
+    const nodeSelector: Record<string, string> = { ...existingNodeSelector };
+
+    // Convert placement tags to nodeSelector labels
+    for (const tag of placementTags) {
+      const labelKey = `${this.config.prefix}/${tag.key}`;
+
+      // Print warnings (if any)
+      this.printTagWarnings(tag);
+
+      // For now we only support single values via nodeSelector
+      nodeSelector[labelKey] = tag.values?.[0] ?? "";
+    }
+
+    return nodeSelector;
+  }
+
+  private printTagWarnings(tag: PlacementTag) {
+    if (!tag.values || tag.values.length === 0) {
+      // No values provided
+      this.logger.warn("Placement tag has no values, using empty string", tag);
+    } else if (tag.values.length > 1) {
+      // Multiple values provided
+      this.logger.warn("Placement tag has multiple values, only using first one", tag);
+    }
+  }
+}
+
+/**
+ * Helper function to create a placement tag. In the future this will be able to support multiple values and operators.
+ * For now it's just a single value.
+ */
+export function placementTag(key: string, value: string): PlacementTag {
+  return { key, values: [value] };
+}
diff --git a/packages/core/src/v3/serverOnly/resourceMonitor.ts b/packages/core/src/v3/serverOnly/resourceMonitor.ts
new file mode 100644
index 00000000000..2d91d2e23d5
--- /dev/null
+++ b/packages/core/src/v3/serverOnly/resourceMonitor.ts
@@ -0,0 +1,761 @@
+import { exec } from "node:child_process";
+import { promises as fs } from "node:fs";
+import os from "node:os";
+import { PerformanceObserver, constants } from "node:perf_hooks";
+import { promisify } from "node:util";
+import { getHeapStatistics } from "node:v8";
+
+const execAsync = promisify(exec);
+
+export type DiskMetrics = {
+  total: number;
+  used: number;
+  free: number;
+  percentUsed: number;
+  warning?: string;
+};
+
+export type MemoryMetrics = {
+  total: number;
+  free: number;
+  used: number;
+  percentUsed: number;
+};
+
+export type NodeProcessMetrics = {
+  memoryUsage: number;
+  memoryUsagePercent: number;
+  heapUsed: number;
+  heapSizeLimit: number;
+  heapUsagePercent: number;
+  availableHeap: number;
+  isNearHeapLimit: boolean;
+};
+
+export type TargetProcessMetrics = {
+  method: string;
+  processName: string;
+  count: number;
+  processes: ProcessInfo[];
+  averages: {
+    cpu: number;
+    memory: number;
+    rss: number;
+    vsz: number;
+  } | null;
+  totals: {
+    cpu: number;
+    memory: number;
+    rss: number;
+    vsz: number;
+  } | null;
+};
+
+export type ProcessMetrics = {
+  node: NodeProcessMetrics;
+  targetProcess: TargetProcessMetrics | null;
+};
+
+type GCSummary = {
+  count: number;
+  totalDuration: number; // ms
+  avgDuration: number; // ms
+  maxDuration: number; // ms
+  kinds: Record<
+    string,
+    {
+      // breakdown by kind
+      count: number;
+      totalDuration: number;
+      avgDuration: number;
+      maxDuration: number;
+    }
+  >;
+};
+
+type ProcessInfo = {
+  user: string;
+  pid: number;
+  cpu: number;
+  mem: number;
+  vsz: number;
+  rss: number;
+  command: string;
+};
+
+export type SystemMetrics = {
+  disk: DiskMetrics;
+  memory: MemoryMetrics;
+};
+
+export type ResourceMonitorConfig = {
+  dirName?: string;
+  processName?: string;
+  ctx: Record<string, unknown>;
+  compactLogging?: boolean;
+  verbose?: boolean;
+};
+
+// Constants
+const DISK_LIMIT_GB = 10;
+const DISK_LIMIT_BYTES = DISK_LIMIT_GB * 1024 * 1024 * 1024; // 10Gi in bytes
+
+export class ResourceMonitor {
+  private logInterval: NodeJS.Timeout | null = null;
+  private dirName: string;
+  private processName: string | undefined;
+  private ctx: Record<string, unknown>;
+  private verbose: boolean;
+  private compactLogging: boolean;
+  private gcObserver: PerformanceObserver | null = null;
+  private bufferedGcEntries: PerformanceEntry[] = [];
+
+  constructor(config: ResourceMonitorConfig) {
+    this.dirName = config.dirName ?? "/tmp";
+    this.processName = config.processName;
+    this.ctx = config.ctx;
+    this.verbose = config.verbose ?? true;
+    this.compactLogging = config.compactLogging ?? false;
+  }
+
+  /**
+   * Start periodic resource monitoring
+   * @param intervalMs Monitoring interval in milliseconds
+   */
+  startMonitoring(intervalMs = 10000): void {
+    if (intervalMs < 1000) {
+      intervalMs = 1000;
+      console.warn("ResourceMonitor: intervalMs is less than 1000, setting to 1000");
+    }
+
+    if (this.logInterval) {
+      clearInterval(this.logInterval);
+    }
+
+    this.logInterval = setInterval(this.logResources.bind(this), intervalMs);
+
+    this.gcObserver = new PerformanceObserver((list) => {
+      this.bufferedGcEntries.push(...list.getEntries());
+    });
+
+    this.gcObserver.observe({ entryTypes: ["gc"], buffered: true });
+  }
+
+  /**
+   * Stop resource monitoring
+   */
+  stopMonitoring(): void {
+    if (this.logInterval) {
+      clearInterval(this.logInterval);
+      this.logInterval = null;
+    }
+
+    if (this.gcObserver) {
+      this.gcObserver.disconnect();
+      this.gcObserver = null;
+    }
+  }
+
+  private async logResources() {
+    try {
+      await this.logResourceSnapshot("ResourceMonitor");
+    } catch (error) {
+      console.error(
+        `Resource monitoring error: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+
+  /**
+   * Get combined system metrics (disk and memory)
+   */
+  private async getSystemMetrics(): Promise<SystemMetrics> {
+    const [disk, memory] = await Promise.all([this.getDiskMetrics(), this.getMemoryMetrics()]);
+    return { disk, memory };
+  }
+
+  /**
+   * Get disk space information
+   */
+  private async getDiskMetrics(): Promise<DiskMetrics> {
+    try {
+      // Even with permission errors, du will output a total
+      const { stdout, stderr } = await execAsync(`du -sb ${this.dirName} || true`);
+
+      // Get the last line of stdout which contains the total
+      const lastLine = stdout.split("\n").filter(Boolean).pop() || "";
+      const usedBytes = parseInt(lastLine.split("\t")[0] ?? "", 10);
+
+      const effectiveTotal = DISK_LIMIT_BYTES;
+      const effectiveUsed = Math.min(usedBytes, DISK_LIMIT_BYTES);
+      const effectiveFree = effectiveTotal - effectiveUsed;
+      const percentUsed = (effectiveUsed / effectiveTotal) * 100;
+
+      const metrics: DiskMetrics = {
+        total: effectiveTotal,
+        used: effectiveUsed,
+        free: effectiveFree,
+        percentUsed,
+      };
+
+      // If we had permission errors, add a warning
+      if (stderr.includes("Permission denied") || stderr.includes("cannot access")) {
+        metrics.warning = "Some directories were not accessible";
+      } else if (stderr.includes("No such file or directory")) {
+        metrics.warning = "The directory does not exist";
+      }
+
+      return metrics;
+    } catch (error) {
+      console.error(
+        `Error getting disk metrics: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return {
+        free: DISK_LIMIT_BYTES,
+        total: DISK_LIMIT_BYTES,
+        used: 0,
+        percentUsed: 0,
+        warning: "Failed to measure disk usage",
+      };
+    }
+  }
+
+  /**
+   * Get memory metrics
+   */
+  private getMemoryMetrics(): MemoryMetrics {
+    const total = os.totalmem();
+    const free = os.freemem();
+    const used = total - free;
+    const percentUsed = (used / total) * 100;
+
+    return { total, free, used, percentUsed };
+  }
+
+  /**
+   * Get process-specific metrics using /proc filesystem
+   */
+  private async getProcMetrics(pids: number[]): Promise<ProcessInfo[]> {
+    return Promise.all(
+      pids.map(async (pid) => {
+        try {
+          // Read process status
+          const status = await fs.readFile(`/proc/${pid}/status`, "utf8");
+          const cmdline = await fs.readFile(`/proc/${pid}/cmdline`, "utf8");
+          const stat = await fs.readFile(`/proc/${pid}/stat`, "utf8");
+
+          // Parse VmRSS (resident set size) from status
+          const rss = parseInt(status.match(/VmRSS:\s+(\d+)/)?.[1] ?? "0", 10);
+          // Parse VmSize (virtual memory size) from status
+          const vsz = parseInt(status.match(/VmSize:\s+(\d+)/)?.[1] ?? "0", 10);
+          // Get process owner
+          const user = (await fs.stat(`/proc/${pid}`)).uid.toString();
+
+          // Parse CPU stats from /proc/[pid]/stat
+          const stats = stat.split(" ");
+          const utime = parseInt(stats[13] ?? "0", 10);
+          const stime = parseInt(stats[14] ?? "0", 10);
+          const starttime = parseInt(stats[21] ?? "0", 10);
+
+          // Calculate CPU percentage
+          const totalTime = utime + stime;
+          const uptime = os.uptime();
+          const hertz = 100; // Usually 100 on Linux
+          const elapsedTime = uptime - starttime / hertz;
+          const cpuUsage = 100 * (totalTime / hertz / elapsedTime);
+
+          // Calculate memory percentage against total system memory
+          const totalMem = os.totalmem();
+          const memoryPercent = (rss * 1024 * 100) / totalMem;
+
+          return {
+            user,
+            pid,
+            cpu: cpuUsage,
+            mem: memoryPercent,
+            vsz,
+            rss,
+            command: cmdline.replace(/\0/g, " ").trim(),
+          };
+        } catch (error) {
+          return null;
+        }
+      })
+    ).then((results) => results.filter((r): r is ProcessInfo => r !== null));
+  }
+
+  /**
+   * Find PIDs for a process name using /proc filesystem
+   */
+  private async findPidsByName(processName?: string): Promise<number[]> {
+    if (!processName) {
+      return [];
+    }
+
+    try {
+      const pids: number[] = [];
+      const procDirs = await fs.readdir("/proc");
+
+      for (const dir of procDirs) {
+        if (!/^\d+$/.test(dir)) continue;
+
+        const processPid = parseInt(dir, 10);
+
+        // Ignore processes that have a lower PID than our own PID
+        if (processPid <= process.pid) {
+          continue;
+        }
+
+        try {
+          const cmdline = await fs.readFile(`/proc/${dir}/cmdline`, "utf8");
+          if (cmdline.includes(processName)) {
+            pids.push(parseInt(dir, 10));
+          }
+        } catch {
+          // Ignore errors reading individual process info
+          continue;
+        }
+      }
+
+      return pids;
+    } catch {
+      return [];
+    }
+  }
+
+  /**
+   * Get process-specific metrics
+   */
+  private async getProcessMetrics(): Promise<ProcessMetrics> {
+    // Get Node.js process metrics
+    const totalMemory = os.totalmem();
+    // Convert GB to bytes (machine.memory is in GB)
+    const machineMemoryBytes = totalMemory;
+    const nodeMemoryUsage = process.memoryUsage();
+
+    // Node process percentage is based on machine memory if available, otherwise system memory
+    const nodeMemoryPercent = (nodeMemoryUsage.rss / machineMemoryBytes) * 100;
+    const heapStats = getHeapStatistics();
+
+    const nodeMetrics: NodeProcessMetrics = {
+      memoryUsage: nodeMemoryUsage.rss,
+      memoryUsagePercent: nodeMemoryPercent,
+      heapUsed: nodeMemoryUsage.heapUsed,
+      heapSizeLimit: heapStats.heap_size_limit,
+      heapUsagePercent: (heapStats.used_heap_size / heapStats.heap_size_limit) * 100,
+      availableHeap: heapStats.total_available_size,
+      isNearHeapLimit: heapStats.used_heap_size / heapStats.heap_size_limit > 0.8,
+    };
+
+    let method = "ps";
+
+    try {
+      let processes: ProcessInfo[] = [];
+
+      // Try ps first, fall back to /proc if it fails
+      try {
+        const { stdout: psOutput } = await execAsync(
+          `ps aux | grep ${this.processName} | grep -v grep`
+        );
+
+        if (psOutput.trim()) {
+          processes = psOutput
+            .trim()
+            .split("\n")
+            .filter((line) => {
+              const parts = line.trim().split(/\s+/);
+              const pid = parseInt(parts[1] ?? "0", 10);
+
+              // Ignore processes that have a lower PID than our own PID
+              return pid > process.pid;
+            })
+            .map((line) => {
+              const parts = line.trim().split(/\s+/);
+              return {
+                user: parts[0] ?? "",
+                pid: parseInt(parts[1] ?? "0", 10),
+                cpu: parseFloat(parts[2] ?? "0"),
+                mem: parseFloat(parts[3] ?? "0"),
+                vsz: parseInt(parts[4] ?? "0", 10),
+                rss: parseInt(parts[5] ?? "0", 10),
+                command: parts.slice(10).join(" "),
+              };
+            });
+        }
+      } catch {
+        // ps failed, try /proc instead
+        method = "proc";
+        const pids = await this.findPidsByName(this.processName);
+        processes = await this.getProcMetrics(pids);
+      }
+
+      if (processes.length === 0) {
+        return {
+          node: nodeMetrics,
+          targetProcess: this.processName
+            ? {
+                method,
+                processName: this.processName,
+                count: 0,
+                processes: [],
+                averages: null,
+                totals: null,
+              }
+            : null,
+        };
+      }
+
+      // For CPU:
+      // - ps shows CPU percentage per core (e.g., 100% = 1 core)
+      // - machine.cpu is in cores (e.g., 0.5 = half a core)
+      // - we want to show percentage of allocated CPU (e.g., 100% = using all allocated CPU)
+      const availableCpu = os.cpus().length;
+      const cpuNormalizer = availableCpu * 100; // Convert to basis points for better precision with fractional CPUs
+
+      // For Memory:
+      // - ps 'mem' is already a percentage of system memory
+      // - we need to convert it to a percentage of machine memory
+      // - if machine memory is 0.5GB and system has 16GB, we multiply the percentage by 32
+      const memoryScaleFactor = this.ctx.machine ? totalMemory / machineMemoryBytes : 1;
+
+      const totals = processes.reduce(
+        (acc, proc) => ({
+          cpu: acc.cpu + proc.cpu,
+          // Scale memory percentage to machine memory
+          // TODO: test this
+          memory: acc.memory + proc.mem * memoryScaleFactor,
+          rss: acc.rss + proc.rss,
+          vsz: acc.vsz + proc.vsz,
+        }),
+        { cpu: 0, memory: 0, rss: 0, vsz: 0 }
+      );
+
+      const count = processes.length;
+
+      const averages = {
+        cpu: totals.cpu / (count * cpuNormalizer),
+        memory: totals.memory / count,
+        rss: totals.rss / count,
+        vsz: totals.vsz / count,
+      };
+
+      return {
+        node: nodeMetrics,
+        targetProcess: this.processName
+          ? {
+              method,
+              processName: this.processName,
+              count,
+              processes,
+              averages,
+              totals: {
+                cpu: totals.cpu / cpuNormalizer,
+                memory: totals.memory,
+                rss: totals.rss,
+                vsz: totals.vsz,
+              },
+            }
+          : null,
+      };
+    } catch (error) {
+      return {
+        node: nodeMetrics,
+        targetProcess: this.processName
+          ? {
+              method,
+              processName: this.processName,
+              count: 0,
+              processes: [],
+              averages: null,
+              totals: null,
+            }
+          : null,
+      };
+    }
+  }
+
+  /**
+   * Log a snapshot of current resource usage
+   */
+  async logResourceSnapshot(label = "Resource Snapshot"): Promise<void> {
+    try {
+      const payload = await this.getResourceSnapshotPayload();
+      const enhancedLabel = this.compactLogging
+        ? this.createCompactLabel(payload, label)
+        : this.createEnhancedLabel(payload, label);
+
+      if (payload.process.node.isNearHeapLimit) {
+        console.warn(`${enhancedLabel}: Node is near heap limit`);
+      } else {
+        console.log(enhancedLabel);
+      }
+
+      if (this.verbose) {
+        console.dir(payload, { depth: 6 });
+      }
+    } catch (error) {
+      console.error(
+        `Error logging resource snapshot: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+
+  /**
+   * Create an enhanced log label with key metrics for quick scanning
+   */
+  private createEnhancedLabel(payload: any, baseLabel: string): string {
+    const parts: string[] = [baseLabel];
+
+    // System resources with text indicators
+    const diskPercent = parseFloat(payload.system.disk.percentUsed);
+    const memoryPercent = parseFloat(payload.system.memory.percentUsed);
+    const diskIndicator = this.getTextIndicator(diskPercent, 80, 90);
+    const memIndicator = this.getTextIndicator(memoryPercent, 80, 90);
+    parts.push(`Disk:${diskPercent.toFixed(1).padStart(5)}%${diskIndicator}`);
+    parts.push(`Mem:${memoryPercent.toFixed(1).padStart(5)}%${memIndicator}`);
+
+    // Node process metrics with text indicators
+    const nodeMemPercent = parseFloat(payload.process.node.memoryUsagePercent);
+    const heapPercent = parseFloat(payload.process.node.heapUsagePercent);
+    const nodeIndicator = this.getTextIndicator(nodeMemPercent, 70, 85);
+    const heapIndicator = this.getTextIndicator(heapPercent, 70, 85);
+    parts.push(`Node:${nodeMemPercent.toFixed(1).padStart(4)}%${nodeIndicator}`);
+    parts.push(`Heap:${heapPercent.toFixed(1).padStart(4)}%${heapIndicator}`);
+
+    // Target process metrics (if available)
+    if (payload.process.targetProcess && payload.process.targetProcess.count > 0) {
+      const targetCpu = payload.process.targetProcess.totals?.cpuPercent || "0";
+      const targetMem = payload.process.targetProcess.totals?.memoryPercent || "0";
+      const targetCpuNum = parseFloat(targetCpu);
+      const targetMemNum = parseFloat(targetMem);
+      const cpuIndicator = this.getTextIndicator(targetCpuNum, 80, 90);
+      const memIndicator = this.getTextIndicator(targetMemNum, 80, 90);
+      parts.push(
+        `${payload.process.targetProcess.processName}:${targetCpu.padStart(
+          4
+        )}%${cpuIndicator}/${targetMem.padStart(4)}%${memIndicator}`
+      );
+    }
+
+    // GC activity with performance indicators
+    if (payload.gc && payload.gc.count > 0) {
+      const avgDuration = payload.gc.avgDuration;
+      const gcIndicator = this.getTextIndicator(avgDuration, 5, 10, true);
+      parts.push(
+        `GC:${payload.gc.count.toString().padStart(2)}(${avgDuration
+          .toFixed(1)
+          .padStart(4)}ms)${gcIndicator}`
+      );
+    }
+
+    // Machine constraints
+    if (payload.constraints) {
+      parts.push(`[${payload.constraints.cpu}CPU/${payload.constraints.memoryGB}GB]`);
+    }
+
+    // Warning indicators (only show critical ones in the main label)
+    const criticalWarnings: string[] = [];
+    if (payload.process.node.isNearHeapLimit) criticalWarnings.push("HEAP_LIMIT");
+    if (diskPercent > 90) criticalWarnings.push("DISK_CRITICAL");
+    if (memoryPercent > 95) criticalWarnings.push("MEM_CRITICAL");
+    if (payload.system.disk.warning) criticalWarnings.push("DISK_WARN");
+
+    if (criticalWarnings.length > 0) {
+      parts.push(`[${criticalWarnings.join(",")}]`);
+    }
+
+    return parts.join(" | ");
+  }
+
+  /**
+   * Get text-based indicator for percentage values
+   */
+  private getTextIndicator(
+    value: number,
+    warningThreshold: number,
+    criticalThreshold: number,
+    isDuration = false
+  ): string {
+    if (isDuration) {
+      // For duration values, higher is worse
+      if (value >= criticalThreshold) return " [CRIT]";
+      if (value >= warningThreshold) return " [WARN]";
+      return " [OK]";
+    } else {
+      // For percentage values, higher is worse
+      if (value >= criticalThreshold) return " [CRIT]";
+      if (value >= warningThreshold) return " [WARN]";
+      return " [OK]";
+    }
+  }
+
+  /**
+   * Create a compact version of the enhanced label for high-frequency logging
+   */
+  private createCompactLabel(payload: any, baseLabel: string): string {
+    const parts: string[] = [baseLabel];
+
+    // Only show critical metrics in compact mode
+    const diskPercent = parseFloat(payload.system.disk.percentUsed);
+    const memoryPercent = parseFloat(payload.system.memory.percentUsed);
+    const heapPercent = parseFloat(payload.process.node.heapUsagePercent);
+
+    // Use single character indicators for compactness
+    const diskIndicator = diskPercent > 90 ? "!" : diskPercent > 80 ? "?" : ".";
+    const memIndicator = memoryPercent > 95 ? "!" : memoryPercent > 80 ? "?" : ".";
+    const heapIndicator = heapPercent > 85 ? "!" : heapPercent > 70 ? "?" : ".";
+
+    parts.push(`D:${diskPercent.toFixed(0).padStart(2)}%${diskIndicator}`);
+    parts.push(`M:${memoryPercent.toFixed(0).padStart(2)}%${memIndicator}`);
+    parts.push(`H:${heapPercent.toFixed(0).padStart(2)}%${heapIndicator}`);
+
+    // GC activity (only if significant)
+    if (payload.gc && payload.gc.count > 0 && payload.gc.avgDuration > 2) {
+      const gcIndicator =
+        payload.gc.avgDuration > 10 ? "!" : payload.gc.avgDuration > 5 ? "?" : ".";
+      parts.push(`GC:${payload.gc.count}${gcIndicator}`);
+    }
+
+    return parts.join(" ");
+  }
+
+  async getResourceSnapshotPayload() {
+    const [systemMetrics, processMetrics] = await Promise.all([
+      this.getSystemMetrics(),
+      this.getProcessMetrics(),
+    ]);
+
+    const gcSummary = summarizeGCEntries(this.bufferedGcEntries);
+    this.bufferedGcEntries = [];
+
+    const formatBytes = (bytes: number) => (bytes / (1024 * 1024)).toFixed(2);
+    const formatPercent = (value: number) => value.toFixed(1);
+
+    return {
+      system: {
+        disk: {
+          limitGiB: DISK_LIMIT_GB,
+          dirName: this.dirName,
+          usedGiB: (systemMetrics.disk.used / (1024 * 1024 * 1024)).toFixed(2),
+          freeGiB: (systemMetrics.disk.free / (1024 * 1024 * 1024)).toFixed(2),
+          percentUsed: formatPercent(systemMetrics.disk.percentUsed),
+          warning: systemMetrics.disk.warning,
+        },
+        memory: {
+          freeGB: (systemMetrics.memory.free / (1024 * 1024 * 1024)).toFixed(2),
+          percentUsed: formatPercent(systemMetrics.memory.percentUsed),
+        },
+      },
+      gc: gcSummary,
+      constraints: {
+        cpu: os.cpus().length,
+        memoryGB: Math.floor(os.totalmem() / (1024 * 1024 * 1024)),
+        note: "Using system resources (no machine constraints specified)",
+      },
+      process: {
+        node: {
+          memoryUsageMB: formatBytes(processMetrics.node.memoryUsage),
+          memoryUsagePercent: formatPercent(processMetrics.node.memoryUsagePercent),
+          heapUsedMB: formatBytes(processMetrics.node.heapUsed),
+          heapSizeLimitMB: formatBytes(processMetrics.node.heapSizeLimit),
+          heapUsagePercent: formatPercent(processMetrics.node.heapUsagePercent),
+          availableHeapMB: formatBytes(processMetrics.node.availableHeap),
+          isNearHeapLimit: processMetrics.node.isNearHeapLimit,
+          ...(this.verbose
+            ? {
+                heapStats: getHeapStatistics(),
+              }
+            : {}),
+        },
+        targetProcess: processMetrics.targetProcess
+          ? {
+              method: processMetrics.targetProcess.method,
+              processName: processMetrics.targetProcess.processName,
+              count: processMetrics.targetProcess.count,
+              averages: processMetrics.targetProcess.averages
+                ? {
+                    cpuPercent: formatPercent(processMetrics.targetProcess.averages.cpu * 100),
+                    memoryPercent: formatPercent(processMetrics.targetProcess.averages.memory),
+                    rssMB: formatBytes(processMetrics.targetProcess.averages.rss * 1024),
+                    vszMB: formatBytes(processMetrics.targetProcess.averages.vsz * 1024),
+                  }
+                : null,
+              totals: processMetrics.targetProcess.totals
+                ? {
+                    cpuPercent: formatPercent(processMetrics.targetProcess.totals.cpu * 100),
+                    memoryPercent: formatPercent(processMetrics.targetProcess.totals.memory),
+                    rssMB: formatBytes(processMetrics.targetProcess.totals.rss * 1024),
+                    vszMB: formatBytes(processMetrics.targetProcess.totals.vsz * 1024),
+                  }
+                : null,
+            }
+          : null,
+      },
+      timestamp: new Date().toISOString(),
+    };
+  }
+}
+
+function summarizeGCEntries(entries: PerformanceEntry[]): GCSummary {
+  if (entries.length === 0) {
+    return {
+      count: 0,
+      totalDuration: 0,
+      avgDuration: 0,
+      maxDuration: 0,
+      kinds: {},
+    };
+  }
+
+  let totalDuration = 0;
+  let maxDuration = 0;
+  const kinds: Record<string, { count: number; totalDuration: number; maxDuration: number }> = {};
+
+  for (const e of entries) {
+    const duration = e.duration;
+    totalDuration += duration;
+    if (duration > maxDuration) maxDuration = duration;
+
+    const kind = kindName((e as any)?.detail?.kind ?? "unknown");
+    if (!kinds[kind]) {
+      kinds[kind] = { count: 0, totalDuration: 0, maxDuration: 0 };
+    }
+    kinds[kind].count += 1;
+    kinds[kind].totalDuration += duration;
+    if (duration > kinds[kind].maxDuration) kinds[kind].maxDuration = duration;
+  }
+
+  // finalize averages
+  const avgDuration = totalDuration / entries.length;
+  const kindsWithAvg: GCSummary["kinds"] = {};
+  for (const [kind, stats] of Object.entries(kinds)) {
+    kindsWithAvg[kind] = {
+      count: stats.count,
+      totalDuration: stats.totalDuration,
+      avgDuration: stats.totalDuration / stats.count,
+      maxDuration: stats.maxDuration,
+    };
+  }
+
+  return {
+    count: entries.length,
+    totalDuration,
+    avgDuration,
+    maxDuration,
+    kinds: kindsWithAvg,
+  };
+}
+
+const kindName = (k: number | string) => {
+  if (typeof k === "number") {
+    return (
+      {
+        [constants.NODE_PERFORMANCE_GC_MAJOR]: "major",
+        [constants.NODE_PERFORMANCE_GC_MINOR]: "minor",
+        [constants.NODE_PERFORMANCE_GC_INCREMENTAL]: "incremental",
+        [constants.NODE_PERFORMANCE_GC_WEAKCB]: "weak-cb",
+      }[k] ?? `kind:${k}`
+    );
+  }
+  return k;
+};
diff --git a/packages/core/src/v3/streams/asyncIterableStream.ts b/packages/core/src/v3/streams/asyncIterableStream.ts
index 1ca8ad6da01..b3cf1eaa091 100644
--- a/packages/core/src/v3/streams/asyncIterableStream.ts
+++ b/packages/core/src/v3/streams/asyncIterableStream.ts
@@ -103,3 +103,56 @@ export function createAsyncIterableStreamFromAsyncGenerator<T>(
 ): AsyncIterableStream<T> {
   return createAsyncIterableStreamFromAsyncIterable(asyncGenerator, transformer, signal);
 }
+
+export function ensureAsyncIterable<T>(
+  input: AsyncIterable<T> | ReadableStream<T>
+): AsyncIterable<T> {
+  // If it's already an AsyncIterable, return it as-is
+  if (Symbol.asyncIterator in input) {
+    return input as AsyncIterable<T>;
+  }
+
+  // Convert ReadableStream to AsyncIterable
+  const readableStream = input as ReadableStream<T>;
+  return {
+    async *[Symbol.asyncIterator]() {
+      const reader = readableStream.getReader();
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) {
+            break;
+          }
+          if (value !== undefined) {
+            yield value;
+          }
+        }
+      } finally {
+        reader.releaseLock();
+      }
+    },
+  };
+}
+
+export function ensureReadableStream<T>(
+  input: AsyncIterable<T> | ReadableStream<T>
+): ReadableStream<T> {
+  if ("getReader" in input) {
+    return input as ReadableStream<T>;
+  }
+
+  return new ReadableStream<T>({
+    async start(controller) {
+      const iterator = input[Symbol.asyncIterator]();
+
+      while (true) {
+        const { done, value } = await iterator.next();
+        if (done) {
+          break;
+        }
+        controller.enqueue(value);
+      }
+      controller.close();
+    },
+  });
+}
diff --git a/packages/core/src/v3/taskContext/index.ts b/packages/core/src/v3/taskContext/index.ts
index a9ef58cf6e5..f76671160a6 100644
--- a/packages/core/src/v3/taskContext/index.ts
+++ b/packages/core/src/v3/taskContext/index.ts
@@ -1,13 +1,14 @@
 import { Attributes } from "@opentelemetry/api";
 import { ServerBackgroundWorker, TaskRunContext } from "../schemas/index.js";
 import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
-import { getGlobal, registerGlobal, unregisterGlobal } from "../utils/globals.js";
+import { getGlobal, registerGlobal } from "../utils/globals.js";
 import { TaskContext } from "./types.js";
 
 const API_NAME = "task-context";
 
 export class TaskContextAPI {
   private static _instance?: TaskContextAPI;
+  private _runDisabled = false;
 
   private constructor() {}
 
@@ -23,6 +24,10 @@ export class TaskContextAPI {
     return this.#getTaskContext() !== undefined;
   }
 
+  get isRunDisabled(): boolean {
+    return this._runDisabled;
+  }
+
   get ctx(): TaskRunContext | undefined {
     return this.#getTaskContext()?.ctx;
   }
@@ -82,11 +87,9 @@ export class TaskContextAPI {
   get contextAttributes(): Attributes {
     if (this.ctx) {
       return {
-        [SemanticInternalAttributes.ATTEMPT_ID]: this.ctx.attempt.id,
         [SemanticInternalAttributes.ATTEMPT_NUMBER]: this.ctx.attempt.number,
         [SemanticInternalAttributes.TASK_SLUG]: this.ctx.task.id,
         [SemanticInternalAttributes.TASK_PATH]: this.ctx.task.filePath,
-        [SemanticInternalAttributes.TASK_EXPORT_NAME]: this.ctx.task.exportName,
         [SemanticInternalAttributes.QUEUE_NAME]: this.ctx.queue.name,
         [SemanticInternalAttributes.QUEUE_ID]: this.ctx.queue.id,
         [SemanticInternalAttributes.RUN_ID]: this.ctx.run.id,
@@ -100,11 +103,12 @@ export class TaskContextAPI {
   }
 
   public disable() {
-    unregisterGlobal(API_NAME);
+    this._runDisabled = true;
   }
 
   public setGlobalTaskContext(taskContext: TaskContext): boolean {
-    return registerGlobal(API_NAME, taskContext);
+    this._runDisabled = false;
+    return registerGlobal(API_NAME, taskContext, true);
   }
 
   #getTaskContext(): TaskContext | undefined {
diff --git a/packages/core/src/v3/taskContext/otelProcessors.ts b/packages/core/src/v3/taskContext/otelProcessors.ts
index db30624ff6e..096f7c0ce76 100644
--- a/packages/core/src/v3/taskContext/otelProcessors.ts
+++ b/packages/core/src/v3/taskContext/otelProcessors.ts
@@ -1,17 +1,26 @@
-import { LogRecord, LogRecordProcessor } from "@opentelemetry/sdk-logs";
+import { Attributes, Context, trace, Tracer } from "@opentelemetry/api";
+import { ExportResult, ExportResultCode } from "@opentelemetry/core";
+import { LogRecordProcessor, SdkLogRecord } from "@opentelemetry/sdk-logs";
+import type {
+  AggregationOption,
+  AggregationTemporality,
+  InstrumentType,
+  MetricData,
+  PushMetricExporter,
+  ResourceMetrics,
+  ScopeMetrics,
+} from "@opentelemetry/sdk-metrics";
 import { Span, SpanProcessor } from "@opentelemetry/sdk-trace-base";
 import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
-import { Context } from "@opentelemetry/api";
-import { flattenAttributes } from "../utils/flattenAttributes.js";
 import { taskContext } from "../task-context-api.js";
-import { Tracer } from "@opentelemetry/api";
+import { flattenAttributes } from "../utils/flattenAttributes.js";
 
 export class TaskContextSpanProcessor implements SpanProcessor {
   private _innerProcessor: SpanProcessor;
   private _tracer: Tracer;
 
-  constructor(tracer: Tracer, innerProcessor: SpanProcessor) {
-    this._tracer = tracer;
+  constructor(version: string, innerProcessor: SpanProcessor) {
+    this._tracer = trace.getTracer("trigger-dev-worker", version);
     this._innerProcessor = innerProcessor;
   }
 
@@ -91,7 +100,7 @@ export class TaskContextLogProcessor implements LogRecordProcessor {
   forceFlush(): Promise<void> {
     return this._innerProcessor.forceFlush();
   }
-  onEmit(logRecord: LogRecord, context?: Context | undefined): void {
+  onEmit(logRecord: SdkLogRecord, context?: Context | undefined): void {
     // Adds in the context attributes to the log record
     if (taskContext.ctx) {
       logRecord.setAttributes(
@@ -105,3 +114,194 @@ export class TaskContextLogProcessor implements LogRecordProcessor {
     return this._innerProcessor.shutdown();
   }
 }
+
+export class TaskContextMetricExporter implements PushMetricExporter {
+  selectAggregationTemporality?: (instrumentType: InstrumentType) => AggregationTemporality;
+  selectAggregation?: (instrumentType: InstrumentType) => AggregationOption;
+
+  constructor(private _innerExporter: PushMetricExporter) {
+    if (_innerExporter.selectAggregationTemporality) {
+      this.selectAggregationTemporality =
+        _innerExporter.selectAggregationTemporality.bind(_innerExporter);
+    }
+    if (_innerExporter.selectAggregation) {
+      this.selectAggregation = _innerExporter.selectAggregation.bind(_innerExporter);
+    }
+  }
+
+  export(metrics: ResourceMetrics, resultCallback: (result: ExportResult) => void): void {
+    if (!taskContext.ctx) {
+      // No task context yet — pass through without adding context attributes
+      this._innerExporter.export(metrics, resultCallback);
+      return;
+    }
+
+    const ctx = taskContext.ctx;
+
+    let contextAttrs: Attributes;
+
+    if (taskContext.isRunDisabled) {
+      // Between runs: keep environment/project/org/machine attrs, strip run-specific ones
+      contextAttrs = {
+        [SemanticInternalAttributes.ENVIRONMENT_ID]: ctx.environment.id,
+        [SemanticInternalAttributes.ENVIRONMENT_TYPE]: ctx.environment.type,
+        [SemanticInternalAttributes.ORGANIZATION_ID]: ctx.organization.id,
+        [SemanticInternalAttributes.PROJECT_ID]: ctx.project.id,
+        [SemanticInternalAttributes.MACHINE_PRESET_NAME]: ctx.machine?.name,
+      };
+    } else {
+      // During a run: full context attrs
+      contextAttrs = {
+        [SemanticInternalAttributes.RUN_ID]: ctx.run.id,
+        [SemanticInternalAttributes.TASK_SLUG]: ctx.task.id,
+        [SemanticInternalAttributes.ATTEMPT_NUMBER]: ctx.attempt.number,
+        [SemanticInternalAttributes.ENVIRONMENT_ID]: ctx.environment.id,
+        [SemanticInternalAttributes.ORGANIZATION_ID]: ctx.organization.id,
+        [SemanticInternalAttributes.PROJECT_ID]: ctx.project.id,
+        [SemanticInternalAttributes.MACHINE_PRESET_NAME]: ctx.machine?.name,
+        [SemanticInternalAttributes.ENVIRONMENT_TYPE]: ctx.environment.type,
+      };
+    }
+
+    if (taskContext.worker) {
+      contextAttrs[SemanticInternalAttributes.WORKER_ID] = taskContext.worker.id;
+      contextAttrs[SemanticInternalAttributes.WORKER_VERSION] = taskContext.worker.version;
+    }
+
+    if (!taskContext.isRunDisabled && ctx.run.tags?.length) {
+      contextAttrs[SemanticInternalAttributes.RUN_TAGS] = ctx.run.tags;
+    }
+
+    const modified: ResourceMetrics = {
+      resource: metrics.resource,
+      scopeMetrics: metrics.scopeMetrics.map((scope) => ({
+        ...scope,
+        metrics: scope.metrics.map(
+          (metric) =>
+            ({
+              ...metric,
+              dataPoints: metric.dataPoints.map((dp) => ({
+                ...dp,
+                attributes: { ...dp.attributes, ...contextAttrs },
+              })),
+            }) as MetricData
+        ),
+      })),
+    };
+
+    this._innerExporter.export(modified, resultCallback);
+  }
+
+  forceFlush(): Promise<void> {
+    return this._innerExporter.forceFlush();
+  }
+
+  shutdown(): Promise<void> {
+    return this._innerExporter.shutdown();
+  }
+}
+
+export class BufferingMetricExporter implements PushMetricExporter {
+  selectAggregationTemporality?: (instrumentType: InstrumentType) => AggregationTemporality;
+  selectAggregation?: (instrumentType: InstrumentType) => AggregationOption;
+
+  private _buffer: ResourceMetrics[] = [];
+  private _lastFlushTime = Date.now();
+
+  constructor(
+    private _innerExporter: PushMetricExporter,
+    private _flushIntervalMs: number
+  ) {
+    if (_innerExporter.selectAggregationTemporality) {
+      this.selectAggregationTemporality =
+        _innerExporter.selectAggregationTemporality.bind(_innerExporter);
+    }
+    if (_innerExporter.selectAggregation) {
+      this.selectAggregation = _innerExporter.selectAggregation.bind(_innerExporter);
+    }
+  }
+
+  export(metrics: ResourceMetrics, resultCallback: (result: ExportResult) => void): void {
+    this._buffer.push(metrics);
+
+    const now = Date.now();
+    if (now - this._lastFlushTime >= this._flushIntervalMs) {
+      this._lastFlushTime = now;
+      const merged = this._mergeBuffer();
+      this._innerExporter.export(merged, resultCallback);
+    } else {
+      resultCallback({ code: ExportResultCode.SUCCESS });
+    }
+  }
+
+  forceFlush(): Promise<void> {
+    if (this._buffer.length > 0) {
+      this._lastFlushTime = Date.now();
+      const merged = this._mergeBuffer();
+      return new Promise<void>((resolve, reject) => {
+        this._innerExporter.export(merged, (result) => {
+          if (result.code === ExportResultCode.SUCCESS) {
+            resolve();
+          } else {
+            reject(result.error ?? new Error("Export failed"));
+          }
+        });
+      }).then(() => this._innerExporter.forceFlush());
+    }
+    return this._innerExporter.forceFlush();
+  }
+
+  shutdown(): Promise<void> {
+    return this.forceFlush().then(() => this._innerExporter.shutdown());
+  }
+
+  private _mergeBuffer(): ResourceMetrics {
+    const batch = this._buffer;
+    this._buffer = [];
+
+    if (batch.length === 1) {
+      return batch[0]!;
+    }
+
+    const base = batch[0]!;
+
+    // Merge all scopeMetrics by scope name, then metrics by descriptor name
+    const scopeMap = new Map<string, { scope: ScopeMetrics["scope"]; metricsMap: Map<string, MetricData> }>();
+
+    for (const rm of batch) {
+      for (const sm of rm.scopeMetrics) {
+        const scopeKey = sm.scope.name;
+        let scopeEntry = scopeMap.get(scopeKey);
+        if (!scopeEntry) {
+          scopeEntry = { scope: sm.scope, metricsMap: new Map() };
+          scopeMap.set(scopeKey, scopeEntry);
+        }
+
+        for (const metric of sm.metrics) {
+          const metricKey = metric.descriptor.name;
+          const existing = scopeEntry.metricsMap.get(metricKey);
+          if (existing) {
+            // Append data points from this collection to the existing metric
+            scopeEntry.metricsMap.set(metricKey, {
+              ...existing,
+              dataPoints: [...existing.dataPoints, ...metric.dataPoints],
+            } as MetricData);
+          } else {
+            scopeEntry.metricsMap.set(metricKey, {
+              ...metric,
+              dataPoints: [...metric.dataPoints],
+            } as MetricData);
+          }
+        }
+      }
+    }
+
+    return {
+      resource: base.resource,
+      scopeMetrics: Array.from(scopeMap.values()).map(({ scope, metricsMap }) => ({
+        scope,
+        metrics: Array.from(metricsMap.values()),
+      })),
+    };
+  }
+}
diff --git a/packages/core/src/v3/timeout/api.ts b/packages/core/src/v3/timeout/api.ts
index 63ddb48db33..dd211bc42c0 100644
--- a/packages/core/src/v3/timeout/api.ts
+++ b/packages/core/src/v3/timeout/api.ts
@@ -47,6 +47,13 @@ export class TimeoutAPI implements TimeoutManager {
     this.disable();
   }
 
+  public registerListener(listener: (timeoutInSeconds: number, elapsedTimeInSeconds: number) => void | Promise<void>) {
+    const manager = this.#getManager();
+    if (manager.registerListener) {
+      manager.registerListener(listener);
+    }
+  }
+
   #getManager(): TimeoutManager {
     return getGlobal(API_NAME) ?? NOOP_TIMEOUT_MANAGER;
   }
diff --git a/packages/core/src/v3/timeout/types.ts b/packages/core/src/v3/timeout/types.ts
index 0ea0b8fe34b..69786896768 100644
--- a/packages/core/src/v3/timeout/types.ts
+++ b/packages/core/src/v3/timeout/types.ts
@@ -2,6 +2,7 @@ export interface TimeoutManager {
   abortAfterTimeout: (timeoutInSeconds?: number) => AbortController;
   signal?: AbortSignal;
   reset: () => void;
+  registerListener?: (listener: (timeoutInSeconds: number, elapsedTimeInSeconds: number) => void | Promise<void>) => void;
 }
 
 export class TaskRunExceededMaxDuration extends Error {
diff --git a/packages/core/src/v3/timeout/usageTimeoutManager.ts b/packages/core/src/v3/timeout/usageTimeoutManager.ts
index ec14ffe6cca..3a6a196dcee 100644
--- a/packages/core/src/v3/timeout/usageTimeoutManager.ts
+++ b/packages/core/src/v3/timeout/usageTimeoutManager.ts
@@ -5,11 +5,21 @@ export class UsageTimeoutManager implements TimeoutManager {
   private _abortController: AbortController;
   private _abortSignal: AbortSignal | undefined;
   private _intervalId: NodeJS.Timeout | undefined;
+  private _listener?: (
+    timeoutInSeconds: number,
+    elapsedTimeInSeconds: number
+  ) => void | Promise<void>;
 
   constructor(private readonly usageManager: UsageManager) {
     this._abortController = new AbortController();
   }
 
+  registerListener(
+    listener: (timeoutInSeconds: number, elapsedTimeInSeconds: number) => void | Promise<void>
+  ): void {
+    this._listener = listener;
+  }
+
   get signal(): AbortSignal | undefined {
     return this._abortSignal;
   }
@@ -42,8 +52,15 @@ export class UsageTimeoutManager implements TimeoutManager {
         if (sample.cpuTime > timeoutInSeconds * 1000) {
           clearInterval(this._intervalId);
 
+          const elapsedTimeInSeconds = sample.cpuTime / 1000;
+
+          // Call the listener if registered
+          if (this._listener) {
+            void this._listener(timeoutInSeconds, elapsedTimeInSeconds);
+          }
+
           this._abortController.abort(
-            new TaskRunExceededMaxDuration(timeoutInSeconds, sample.cpuTime / 1000)
+            new TaskRunExceededMaxDuration(timeoutInSeconds, elapsedTimeInSeconds)
           );
         }
       }
diff --git a/packages/core/src/v3/trace-context-api.ts b/packages/core/src/v3/trace-context-api.ts
new file mode 100644
index 00000000000..1a4333fbe20
--- /dev/null
+++ b/packages/core/src/v3/trace-context-api.ts
@@ -0,0 +1,5 @@
+// Split module-level variable definition into separate files to allow
+// tree-shaking on each api instance.
+import { TraceContextAPI } from "./traceContext/api.js";
+/** Entrypoint for trace context API */
+export const traceContext = TraceContextAPI.getInstance();
diff --git a/packages/core/src/v3/traceContext/api.ts b/packages/core/src/v3/traceContext/api.ts
new file mode 100644
index 00000000000..3b21e0668a1
--- /dev/null
+++ b/packages/core/src/v3/traceContext/api.ts
@@ -0,0 +1,74 @@
+import { context, Context } from "@opentelemetry/api";
+import { getGlobal, registerGlobal, unregisterGlobal } from "../utils/globals.js";
+import { TraceContextManager } from "./types.js";
+
+const API_NAME = "trace-context";
+
+class NoopTraceContextManager implements TraceContextManager {
+  getTraceContext() {
+    return {};
+  }
+
+  reset() {}
+
+  getExternalTraceContext() {
+    return undefined;
+  }
+
+  extractContext(): Context {
+    return context.active();
+  }
+
+  withExternalTrace<T>(fn: () => T): T {
+    return fn();
+  }
+}
+
+const NOOP_TRACE_CONTEXT_MANAGER = new NoopTraceContextManager();
+
+export class TraceContextAPI implements TraceContextManager {
+  private static _instance?: TraceContextAPI;
+
+  private constructor() {}
+
+  public static getInstance(): TraceContextAPI {
+    if (!this._instance) {
+      this._instance = new TraceContextAPI();
+    }
+
+    return this._instance;
+  }
+
+  public setGlobalManager(manager: TraceContextManager): boolean {
+    return registerGlobal(API_NAME, manager);
+  }
+
+  public disable() {
+    unregisterGlobal(API_NAME);
+  }
+
+  public reset() {
+    this.#getManager().reset();
+    this.disable();
+  }
+
+  public getTraceContext() {
+    return this.#getManager().getTraceContext();
+  }
+
+  public getExternalTraceContext() {
+    return this.#getManager().getExternalTraceContext();
+  }
+
+  public extractContext() {
+    return this.#getManager().extractContext();
+  }
+
+  public withExternalTrace<T>(fn: () => T): T {
+    return this.#getManager().withExternalTrace(fn);
+  }
+
+  #getManager(): TraceContextManager {
+    return getGlobal(API_NAME) ?? NOOP_TRACE_CONTEXT_MANAGER;
+  }
+}
diff --git a/packages/core/src/v3/traceContext/manager.ts b/packages/core/src/v3/traceContext/manager.ts
new file mode 100644
index 00000000000..f61b7c7af71
--- /dev/null
+++ b/packages/core/src/v3/traceContext/manager.ts
@@ -0,0 +1,79 @@
+import { Context, context, propagation, trace, TraceFlags } from "@opentelemetry/api";
+import { TraceContextManager } from "./types.js";
+import { parseTraceParent } from "@opentelemetry/core";
+
+export class StandardTraceContextManager implements TraceContextManager {
+  public traceContext: Record<string, unknown> = {};
+
+  getTraceContext() {
+    return this.traceContext;
+  }
+
+  reset() {
+    this.traceContext = {};
+  }
+
+  getExternalTraceContext() {
+    return extractExternalTraceContext(this.traceContext?.external);
+  }
+
+  extractContext(): Context {
+    return propagation.extract(context.active(), this.traceContext ?? {});
+  }
+
+  withExternalTrace<T>(fn: () => T): T {
+    const externalTraceContext = this.getExternalTraceContext();
+
+    if (!externalTraceContext) {
+      return fn();
+    }
+
+    // Get the current active span context to extract the span ID
+    const currentSpanContext = trace.getActiveSpan()?.spanContext();
+
+    if (!currentSpanContext) {
+      throw new Error(
+        "No active span found. withExternalSpan must be called within an active span context."
+      );
+    }
+
+    const spanContext = {
+      traceId: externalTraceContext.traceId,
+      spanId: currentSpanContext.spanId,
+      traceFlags: externalTraceContext.traceFlags,
+      isRemote: true,
+    };
+
+    const contextWithSpan = trace.setSpanContext(context.active(), spanContext);
+
+    return context.with(contextWithSpan, fn);
+  }
+}
+
+function extractExternalTraceContext(traceContext: unknown) {
+  if (typeof traceContext !== "object" || traceContext === null) {
+    return undefined;
+  }
+
+  const tracestate =
+    "tracestate" in traceContext && typeof traceContext.tracestate === "string"
+      ? traceContext.tracestate
+      : undefined;
+
+  if ("traceparent" in traceContext && typeof traceContext.traceparent === "string") {
+    const externalSpanContext = parseTraceParent(traceContext.traceparent);
+
+    if (!externalSpanContext) {
+      return undefined;
+    }
+
+    return {
+      traceId: externalSpanContext.traceId,
+      spanId: externalSpanContext.spanId,
+      traceFlags: externalSpanContext.traceFlags,
+      tracestate: tracestate,
+    };
+  }
+
+  return undefined;
+}
diff --git a/packages/core/src/v3/traceContext/types.ts b/packages/core/src/v3/traceContext/types.ts
new file mode 100644
index 00000000000..dc30cf6f479
--- /dev/null
+++ b/packages/core/src/v3/traceContext/types.ts
@@ -0,0 +1,16 @@
+import { Context } from "@opentelemetry/api";
+
+export interface TraceContextManager {
+  getTraceContext(): Record<string, unknown>;
+  extractContext(): Context;
+  reset(): void;
+  getExternalTraceContext():
+    | {
+        traceId: string;
+        spanId: string;
+        traceFlags: number;
+        tracestate?: string;
+      }
+    | undefined;
+  withExternalTrace<T>(fn: () => T): T;
+}
diff --git a/packages/core/src/v3/tracer.ts b/packages/core/src/v3/tracer.ts
index 4adf8268b56..5b213917592 100644
--- a/packages/core/src/v3/tracer.ts
+++ b/packages/core/src/v3/tracer.ts
@@ -63,10 +63,6 @@ export class TriggerTracer {
     return this._logger;
   }
 
-  extractContext(traceContext?: Record<string, unknown>) {
-    return propagation.extract(context.active(), traceContext ?? {});
-  }
-
   startActiveSpan<T>(
     name: string,
     fn: (span: Span) => Promise<T>,
diff --git a/packages/core/src/v3/types/index.ts b/packages/core/src/v3/types/index.ts
index 55cc4d3a122..ea2bc8d5580 100644
--- a/packages/core/src/v3/types/index.ts
+++ b/packages/core/src/v3/types/index.ts
@@ -7,6 +7,7 @@ export * from "./tasks.js";
 export * from "./idempotencyKeys.js";
 export * from "./tools.js";
 export * from "./queues.js";
+export * from "./jsonSchema.js";
 
 type ResolveEnvironmentVariablesOptions = {
   variables: Record<string, string> | Array<{ name: string; value: string }>;
diff --git a/packages/core/src/v3/types/jsonSchema.ts b/packages/core/src/v3/types/jsonSchema.ts
new file mode 100644
index 00000000000..7abf241a662
--- /dev/null
+++ b/packages/core/src/v3/types/jsonSchema.ts
@@ -0,0 +1,76 @@
+/**
+ * JSON Schema type definition - compatible with JSON Schema Draft 7
+ * Based on the JSONSchema7 type from @types/json-schema but defined inline to avoid import issues
+ */
+export interface JSONSchema {
+  $id?: string;
+  $ref?: string;
+  $schema?: string;
+  $comment?: string;
+
+  type?: JSONSchemaType | JSONSchemaType[];
+  enum?: any[];
+  const?: any;
+
+  // Number/Integer validations
+  multipleOf?: number;
+  maximum?: number;
+  exclusiveMaximum?: number;
+  minimum?: number;
+  exclusiveMinimum?: number;
+
+  // String validations
+  maxLength?: number;
+  minLength?: number;
+  pattern?: string;
+  format?: string;
+
+  // Array validations
+  items?: JSONSchema | JSONSchema[];
+  additionalItems?: JSONSchema | boolean;
+  maxItems?: number;
+  minItems?: number;
+  uniqueItems?: boolean;
+  contains?: JSONSchema;
+
+  // Object validations
+  maxProperties?: number;
+  minProperties?: number;
+  required?: string[];
+  properties?: Record<string, JSONSchema>;
+  patternProperties?: Record<string, JSONSchema>;
+  additionalProperties?: JSONSchema | boolean;
+  dependencies?: Record<string, JSONSchema | string[]>;
+  propertyNames?: JSONSchema;
+
+  // Conditional schemas
+  if?: JSONSchema;
+  then?: JSONSchema;
+  else?: JSONSchema;
+
+  // Boolean logic
+  allOf?: JSONSchema[];
+  anyOf?: JSONSchema[];
+  oneOf?: JSONSchema[];
+  not?: JSONSchema;
+
+  // Metadata
+  title?: string;
+  description?: string;
+  default?: any;
+  readOnly?: boolean;
+  writeOnly?: boolean;
+  examples?: any[];
+
+  // Additional properties for extensibility
+  [key: string]: any;
+}
+
+export type JSONSchemaType =
+  | "string"
+  | "number"
+  | "integer"
+  | "boolean"
+  | "object"
+  | "array"
+  | "null";
diff --git a/packages/core/src/v3/types/tasks.ts b/packages/core/src/v3/types/tasks.ts
index f9595b51e67..3b8b2e9ecdd 100644
--- a/packages/core/src/v3/types/tasks.ts
+++ b/packages/core/src/v3/types/tasks.ts
@@ -13,6 +13,7 @@ import {
   OnSuccessHookFunction,
   OnWaitHookFunction,
   OnCancelHookFunction,
+  OnStartAttemptHookFunction,
 } from "../lifecycleHooks/types.js";
 import { RunTags } from "../schemas/api.js";
 import {
@@ -28,6 +29,7 @@ import { QueueOptions } from "./queues.js";
 import { AnySchemaParseFn, inferSchemaIn, inferSchemaOut, Schema } from "./schemas.js";
 import { inferToolParameters, ToolTaskParameters } from "./tools.js";
 import { Prettify } from "./utils.js";
+import { JSONSchema } from "./jsonSchema.js";
 
 export type Queue = QueueOptions;
 export type TaskSchema = Schema;
@@ -113,6 +115,13 @@ export type StartFnParams = Prettify<{
   signal: AbortSignal;
 }>;
 
+export type StartAttemptFnParams = Prettify<{
+  ctx: Context;
+  init?: InitOutput;
+  /** Abort signal that is aborted when a task run exceeds it's maxDuration or if the task run is cancelled. Can be used to automatically cancel downstream requests */
+  signal: AbortSignal;
+}>;
+
 export type CancelFnParams = Prettify<{
   ctx: Context;
   /** Abort signal that is aborted when a task run exceeds it's maxDuration or if the task run is cancelled. Can be used to automatically cancel downstream requests */
@@ -327,9 +336,18 @@ type CommonTaskOptions<
 
   /**
    * onStart is called the first time a task is executed in a run (not before every retry)
+   *
+   * @deprecated Use onStartAttempt instead
    */
   onStart?: OnStartHookFunction<TPayload, TInitOutput>;
 
+  /**
+   * onStartAttempt is called before each attempt of a task is executed.
+   *
+   * You can detect the first attempt by checking `ctx.attempt.number === 1`.
+   */
+  onStartAttempt?: OnStartAttemptHookFunction<TPayload>;
+
   /**
    * onSuccess is called after the run function has successfully completed.
    */
@@ -339,6 +357,12 @@ type CommonTaskOptions<
    * onFailure is called after a task run has failed (meaning the run function threw an error and won't be retried anymore)
    */
   onFailure?: OnFailureHookFunction<TPayload, TInitOutput>;
+
+  /**
+   * JSON Schema for the task payload. This will be synced to the server during indexing.
+   * Should be a valid JSON Schema Draft 7 object.
+   */
+  jsonSchema?: JSONSchema;
 };
 
 export type TaskOptions<
@@ -348,6 +372,15 @@ export type TaskOptions<
   TInitOutput extends InitOutput = any,
 > = CommonTaskOptions<TIdentifier, TPayload, TOutput, TInitOutput>;
 
+// Task options when payloadSchema is provided - payload should be any
+export type TaskOptionsWithSchema<
+  TIdentifier extends string,
+  TOutput = unknown,
+  TInitOutput extends InitOutput = any,
+> = CommonTaskOptions<TIdentifier, any, TOutput, TInitOutput> & {
+  jsonSchema: JSONSchema;
+};
+
 export type TaskWithSchemaOptions<
   TIdentifier extends string,
   TSchema extends TaskSchema | undefined = undefined,
@@ -531,6 +564,8 @@ export interface Task<TIdentifier extends string, TInput = void, TOutput = any>
 
   description?: string;
 
+  jsonSchema?: JSONSchema;
+
   /**
    * Trigger a task with the given payload, and continue without waiting for the result. If you want to wait for the result, use `triggerAndWait`. Returns the id of the triggered task run.
    * @param payload
@@ -546,13 +581,16 @@ export interface Task<TIdentifier extends string, TInput = void, TOutput = any>
 
   /**
    * Batch trigger multiple task runs with the given payloads, and continue without waiting for the results. If you want to wait for the results, use `batchTriggerAndWait`. Returns the id of the triggered batch.
-   * @param items
+   * @param items - Array, AsyncIterable, or ReadableStream of batch items
    * @returns InvokeBatchHandle
    * - `batchId` - The id of the triggered batch.
    * - `runs` - The ids of the triggered task runs.
    */
   batchTrigger: (
-    items: Array<BatchItem<TInput>>,
+    items:
+      | Array<BatchItem<TInput>>
+      | AsyncIterable<BatchItem<TInput>>
+      | ReadableStream<BatchItem<TInput>>,
     options?: BatchTriggerOptions,
     requestOptions?: TriggerApiRequestOptions
   ) => Promise<BatchRunHandle<TIdentifier, TInput, TOutput>>;
@@ -575,12 +613,13 @@ export interface Task<TIdentifier extends string, TInput = void, TOutput = any>
    */
   triggerAndWait: (
     payload: TInput,
-    options?: TriggerAndWaitOptions
+    options?: TriggerAndWaitOptions,
+    requestOptions?: TriggerApiRequestOptions
   ) => TaskRunPromise<TIdentifier, TOutput>;
 
   /**
    * Batch trigger multiple task runs with the given payloads, and wait for the results. Returns the results of the task runs.
-   * @param items
+   * @param items - Array, AsyncIterable, or ReadableStream of batch items
    * @returns BatchResult
    * @example
    * ```
@@ -599,7 +638,10 @@ export interface Task<TIdentifier extends string, TInput = void, TOutput = any>
    * ```
    */
   batchTriggerAndWait: (
-    items: Array<BatchTriggerAndWaitItem<TInput>>,
+    items:
+      | Array<BatchTriggerAndWaitItem<TInput>>
+      | AsyncIterable<BatchTriggerAndWaitItem<TInput>>
+      | ReadableStream<BatchTriggerAndWaitItem<TInput>>,
     options?: BatchTriggerAndWaitOptions
   ) => Promise<BatchResult<TIdentifier, TOutput>>;
 }
@@ -839,6 +881,87 @@ export type TriggerOptions = {
    * to the same version as the parent task that is triggering the child tasks.
    */
   version?: string;
+
+  /**
+   * Specify the region to run the task in. This overrides the default region set for your project in the dashboard.
+   *
+   * Check the Regions page in the dashboard for regions that are available to you.
+   *
+   * In DEV this won't do anything, so it's fine to set it in your code.
+   *
+   * @example
+   *
+   * ```ts
+   * await myTask.trigger({ foo: "bar" }, { region: "us-east-1" });
+   * ```
+   */
+  region?: string;
+
+  /**
+   * Debounce settings for consolidating multiple trigger calls into a single delayed run.
+   *
+   * When a run with the same debounce key already exists in the delayed state, subsequent triggers
+   * "push" the existing run's execution time later rather than creating new runs.
+   *
+   * The debounce key is scoped to the task identifier, so different tasks can use the same key without conflicts.
+   *
+   * @example
+   *
+   * ```ts
+   * // Leading mode (default): executes with the FIRST payload
+   * await myTask.trigger({ some: "data1" }, { debounce: { key: "user-123", delay: "5s" } });
+   * await myTask.trigger({ some: "data2" }, { debounce: { key: "user-123", delay: "5s" } });
+   * // After 5 seconds, runs with { some: "data1" }
+   *
+   * // Trailing mode: executes with the LAST payload
+   * await myTask.trigger({ some: "data1" }, { debounce: { key: "user-123", delay: "5s", mode: "trailing" } });
+   * await myTask.trigger({ some: "data2" }, { debounce: { key: "user-123", delay: "5s", mode: "trailing" } });
+   * // After 5 seconds, runs with { some: "data2" }
+   * ```
+   */
+  debounce?: {
+    /**
+     * Unique key scoped to the task identifier. Runs with the same key will be debounced together.
+     * Maximum length is 512 characters.
+     */
+    key: string;
+    /**
+     * Duration string specifying how long to delay the run. If another trigger with the same key
+     * occurs within this duration, the delay is extended.
+     *
+     * Supported formats: `{number}s` (seconds), `{number}m` (minutes), `{number}h` (hours),
+     * `{number}d` (days), `{number}w` (weeks). Minimum delay is 1 second.
+     *
+     * @example "1s", "5s", "1m", "30m", "1h"
+     */
+    delay: string;
+    /**
+     * Controls which trigger's data is used when the debounced run finally executes.
+     *
+     * - `"leading"` (default): Use data from the first trigger (payload, metadata, tags, etc.)
+     * - `"trailing"`: Use data from the last trigger. Each subsequent trigger updates the run's
+     *   payload, metadata, tags, maxAttempts, maxDuration, and machine preset.
+     *
+     * @default "leading"
+     */
+    mode?: "leading" | "trailing";
+    /**
+     * Maximum total delay before the run must execute, regardless of subsequent triggers.
+     * This prevents indefinite delays when continuous triggers keep pushing the execution time.
+     *
+     * When specified, if a new trigger would push the execution time beyond this limit
+     * (measured from the first trigger), the current debounced run will be allowed to execute
+     * and a new run will be created for subsequent triggers.
+     *
+     * If not specified, falls back to the server's default maximum (typically 1 hour).
+     *
+     * Supported formats: `{number}s` (seconds), `{number}m` (minutes), `{number}h` (hours),
+     * `{number}d` (days), `{number}w` (weeks).
+     *
+     * @example "30m", "2h", "1d"
+     */
+    maxDelay?: string;
+  };
 };
 
 export type TriggerAndWaitOptions = Omit<TriggerOptions, "version">;
@@ -879,8 +1002,10 @@ export type TaskMetadataWithFunctions = TaskMetadata & {
     onSuccess?: (payload: any, output: any, params: SuccessFnParams<any>) => Promise<void>;
     onFailure?: (payload: any, error: unknown, params: FailureFnParams<any>) => Promise<void>;
     onStart?: (payload: any, params: StartFnParams) => Promise<void>;
+    onStartAttempt?: (payload: any, params: StartAttemptFnParams) => Promise<void>;
     parsePayload?: AnySchemaParseFn;
   };
+  schema?: TaskSchema;
 };
 
 export type RunTypes<TTaskIdentifier extends string, TPayload, TOutput> = {
diff --git a/packages/core/src/v3/types/tools.ts b/packages/core/src/v3/types/tools.ts
index 078c52feb6c..8c3aac80bf1 100644
--- a/packages/core/src/v3/types/tools.ts
+++ b/packages/core/src/v3/types/tools.ts
@@ -20,8 +20,8 @@ export function convertToolParametersToSchema<TToolParameters extends ToolTaskPa
 }
 
 function convertAISchemaToTaskSchema(schema: AISchema<any>): Schema {
-  return (payload: unknown) => {
-    const result = schema.validate?.(payload);
+  return async (payload: unknown) => {
+    const result = await schema.validate?.(payload);
 
     if (!result) {
       throw new Error("Invalid payload");
diff --git a/packages/core/src/v3/usage/api.ts b/packages/core/src/v3/usage/api.ts
index e08c76929d8..c3a05fc9f3a 100644
--- a/packages/core/src/v3/usage/api.ts
+++ b/packages/core/src/v3/usage/api.ts
@@ -1,7 +1,7 @@
 const API_NAME = "usage";
 
 import { getGlobal, registerGlobal, unregisterGlobal } from "../utils/globals.js";
-import type { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
+import type { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
 import { NoopUsageManager } from "./noopUsageManager.js";
 
 const NOOP_USAGE_MANAGER = new NoopUsageManager();
@@ -53,6 +53,10 @@ export class UsageAPI implements UsageManager {
     this.disable();
   }
 
+  public getInitialState(): InitialUsageState {
+    return this.#getUsageManager().getInitialState();
+  }
+
   #getUsageManager(): UsageManager {
     return getGlobal(API_NAME) ?? NOOP_USAGE_MANAGER;
   }
diff --git a/packages/core/src/v3/usage/devUsageManager.ts b/packages/core/src/v3/usage/devUsageManager.ts
index 80e1fdde213..510213b2602 100644
--- a/packages/core/src/v3/usage/devUsageManager.ts
+++ b/packages/core/src/v3/usage/devUsageManager.ts
@@ -1,4 +1,4 @@
-import { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
+import { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
 import { clock } from "../clock-api.js";
 import { ClockTime, calculateDurationInMs } from "../clock/clock.js";
 
@@ -45,6 +45,10 @@ export class DevUsageManager implements UsageManager {
   private _firstMeasurement?: DevUsageMeasurement;
   private _currentMeasurements: Map<string, DevUsageMeasurement> = new Map();
   private _pauses: Map<string, { start: ClockTime; end?: ClockTime }> = new Map();
+  private _initialState: InitialUsageState = {
+    cpuTime: 0,
+    costInCents: 0,
+  };
 
   disable(): void {}
 
@@ -54,6 +58,18 @@ export class DevUsageManager implements UsageManager {
     this._firstMeasurement = undefined;
     this._currentMeasurements.clear();
     this._pauses.clear();
+    this._initialState = {
+      cpuTime: 0,
+      costInCents: 0,
+    };
+  }
+
+  setInitialState(state: InitialUsageState) {
+    this._initialState = state;
+  }
+
+  getInitialState(): InitialUsageState {
+    return this._initialState;
   }
 
   sample(): UsageSample | undefined {
diff --git a/packages/core/src/v3/usage/noopUsageManager.ts b/packages/core/src/v3/usage/noopUsageManager.ts
index 9e521444668..d044f1738d8 100644
--- a/packages/core/src/v3/usage/noopUsageManager.ts
+++ b/packages/core/src/v3/usage/noopUsageManager.ts
@@ -1,4 +1,4 @@
-import { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
+import { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
 
 export class NoopUsageManager implements UsageManager {
   disable(): void {
@@ -30,4 +30,11 @@ export class NoopUsageManager implements UsageManager {
   reset(): void {
     // Noop
   }
+
+  getInitialState(): InitialUsageState {
+    return {
+      cpuTime: 0,
+      costInCents: 0,
+    };
+  }
 }
diff --git a/packages/core/src/v3/usage/prodUsageManager.ts b/packages/core/src/v3/usage/prodUsageManager.ts
index 5d3d49c3d07..7cfd038d019 100644
--- a/packages/core/src/v3/usage/prodUsageManager.ts
+++ b/packages/core/src/v3/usage/prodUsageManager.ts
@@ -1,5 +1,5 @@
 import { setInterval } from "node:timers/promises";
-import { UsageManager, UsageMeasurement, UsageSample } from "./types.js";
+import { InitialUsageState, UsageManager, UsageMeasurement, UsageSample } from "./types.js";
 import { UsageClient } from "./usageClient.js";
 
 export type ProdUsageManagerOptions = {
@@ -13,6 +13,10 @@ export class ProdUsageManager implements UsageManager {
   private _abortController: AbortController | undefined;
   private _lastSample: UsageSample | undefined;
   private _usageClient: UsageClient | undefined;
+  private _initialState: InitialUsageState = {
+    cpuTime: 0,
+    costInCents: 0,
+  };
 
   constructor(
     private readonly delegageUsageManager: UsageManager,
@@ -27,6 +31,14 @@ export class ProdUsageManager implements UsageManager {
     return typeof this._usageClient !== "undefined";
   }
 
+  setInitialState(state: InitialUsageState) {
+    this._initialState = state;
+  }
+
+  getInitialState(): InitialUsageState {
+    return this._initialState;
+  }
+
   reset(): void {
     this.delegageUsageManager.reset();
     this._abortController?.abort();
@@ -34,6 +46,10 @@ export class ProdUsageManager implements UsageManager {
     this._usageClient = undefined;
     this._measurement = undefined;
     this._lastSample = undefined;
+    this._initialState = {
+      cpuTime: 0,
+      costInCents: 0,
+    };
   }
 
   disable(): void {
diff --git a/packages/core/src/v3/usage/types.ts b/packages/core/src/v3/usage/types.ts
index 8655950df31..45fd32e63b7 100644
--- a/packages/core/src/v3/usage/types.ts
+++ b/packages/core/src/v3/usage/types.ts
@@ -7,8 +7,14 @@ export interface UsageMeasurement {
   sample(): UsageSample;
 }
 
+export type InitialUsageState = {
+  cpuTime: number;
+  costInCents: number;
+};
+
 export interface UsageManager {
   disable(): void;
+  getInitialState(): InitialUsageState;
   start(): UsageMeasurement;
   stop(measurement: UsageMeasurement): UsageSample;
   sample(): UsageSample | undefined;
diff --git a/packages/core/src/v3/utils/flattenAttributes.ts b/packages/core/src/v3/utils/flattenAttributes.ts
index 78acfca262b..83d1a14f2cd 100644
--- a/packages/core/src/v3/utils/flattenAttributes.ts
+++ b/packages/core/src/v3/utils/flattenAttributes.ts
@@ -3,13 +3,16 @@ import { Attributes } from "@opentelemetry/api";
 export const NULL_SENTINEL = "$@null((";
 export const CIRCULAR_REFERENCE_SENTINEL = "$@circular((";
 
+const DEFAULT_MAX_DEPTH = 128;
+
 export function flattenAttributes(
   obj: unknown,
   prefix?: string,
-  maxAttributeCount?: number
+  maxAttributeCount?: number,
+  maxDepth: number = DEFAULT_MAX_DEPTH
 ): Attributes {
-  const flattener = new AttributeFlattener(maxAttributeCount);
-  flattener.doFlatten(obj, prefix);
+  const flattener = new AttributeFlattener(maxAttributeCount, maxDepth);
+  flattener.doFlatten(obj, prefix, 0);
   return flattener.attributes;
 }
 
@@ -18,7 +21,10 @@ class AttributeFlattener {
   private attributeCounter: number = 0;
   private result: Attributes = {};
 
-  constructor(private maxAttributeCount?: number) {}
+  constructor(
+    private maxAttributeCount?: number,
+    private maxDepth: number = DEFAULT_MAX_DEPTH
+  ) {}
 
   get attributes(): Attributes {
     return this.result;
@@ -37,11 +43,16 @@ class AttributeFlattener {
     return true;
   }
 
-  doFlatten(obj: unknown, prefix?: string) {
+  doFlatten(obj: unknown, prefix?: string, depth: number = 0) {
     if (!this.canAddMoreAttributes()) {
       return;
     }
 
+    // Check depth limit to prevent stack overflow
+    if (depth > this.maxDepth) {
+      return;
+    }
+
     // Check if obj is null or undefined
     if (obj === undefined) {
       return;
@@ -94,7 +105,7 @@ class AttributeFlattener {
       let index = 0;
       for (const item of obj) {
         if (!this.canAddMoreAttributes()) break;
-        this.#processValue(item, `${prefix || "set"}.[${index}]`);
+        this.#processValue(item, `${prefix || "set"}.[${index}]`, depth);
         index++;
       }
       return;
@@ -106,7 +117,7 @@ class AttributeFlattener {
         if (!this.canAddMoreAttributes()) break;
         // Use the key directly if it's a string, otherwise convert it
         const keyStr = typeof key === "string" ? key : String(key);
-        this.#processValue(value, `${prefix || "map"}.${keyStr}`);
+        this.#processValue(value, `${prefix || "map"}.${keyStr}`, depth);
       }
       return;
     }
@@ -196,15 +207,15 @@ class AttributeFlattener {
           if (!this.canAddMoreAttributes()) {
             break;
           }
-          this.#processValue(value[i], `${newPrefix}.[${i}]`);
+          this.#processValue(value[i], `${newPrefix}.[${i}]`, depth);
         }
       } else {
-        this.#processValue(value, newPrefix);
+        this.#processValue(value, newPrefix, depth);
       }
     }
   }
 
-  #processValue(value: unknown, prefix: string) {
+  #processValue(value: unknown, prefix: string, depth: number) {
     if (!this.canAddMoreAttributes()) {
       return;
     }
@@ -224,9 +235,9 @@ class AttributeFlattener {
       return;
     }
 
-    // Handle non-primitive values by recursing
+    // Handle non-primitive values by recursing (increment depth)
     if (typeof value === "object" || typeof value === "function") {
-      this.doFlatten(value as any, prefix);
+      this.doFlatten(value as any, prefix, depth + 1);
     } else {
       // Convert other types to strings (bigint, symbol, etc.)
       this.addAttribute(prefix, String(value));
@@ -239,7 +250,9 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 }
 
 export function unflattenAttributes(
-  obj: Attributes
+  obj: Attributes,
+  filteredKeys?: string[],
+  maxDepth: number = DEFAULT_MAX_DEPTH
 ): Record<string, unknown> | string | number | boolean | null | undefined {
   if (typeof obj !== "object" || obj === null || Array.isArray(obj)) {
     return obj;
@@ -261,6 +274,10 @@ export function unflattenAttributes(
   const result: Record<string, unknown> = {};
 
   for (const [key, value] of Object.entries(obj)) {
+    if (filteredKeys?.includes(key)) {
+      continue;
+    }
+
     const parts = key.split(".").reduce(
       (acc, part) => {
         if (part.startsWith("[") && part.endsWith("]")) {
@@ -280,6 +297,11 @@ export function unflattenAttributes(
       [] as (string | number)[]
     );
 
+    // Skip keys that exceed max depth to prevent memory exhaustion
+    if (parts.length > maxDepth) {
+      continue;
+    }
+
     let current: any = result;
     for (let i = 0; i < parts.length - 1; i++) {
       const part = parts[i];
diff --git a/packages/core/src/v3/utils/globals.ts b/packages/core/src/v3/utils/globals.ts
index e59539b343b..47cabd60808 100644
--- a/packages/core/src/v3/utils/globals.ts
+++ b/packages/core/src/v3/utils/globals.ts
@@ -1,13 +1,17 @@
 import { ApiClientConfiguration } from "../apiClientManager/types.js";
 import { Clock } from "../clock/clock.js";
+import { HeartbeatsManager } from "../heartbeats/types.js";
+import type { IdempotencyKeyCatalog } from "../idempotency-key-catalog/catalog.js";
 import { LifecycleHooksManager } from "../lifecycleHooks/types.js";
 import { LocalsManager } from "../locals/types.js";
+import { RealtimeStreamsManager } from "../realtimeStreams/types.js";
 import { ResourceCatalog } from "../resource-catalog/catalog.js";
 import { RunMetadataManager } from "../runMetadata/types.js";
 import type { RuntimeManager } from "../runtime/manager.js";
 import { RunTimelineMetricsManager } from "../runTimelineMetrics/types.js";
 import { TaskContext } from "../taskContext/types.js";
 import { TimeoutManager } from "../timeout/types.js";
+import { TraceContextManager } from "../traceContext/types.js";
 import { UsageManager } from "../usage/types.js";
 import { WaitUntilManager } from "../waitUntil/types.js";
 import { _globalThis } from "./platform.js";
@@ -58,6 +62,7 @@ type TriggerDotDevGlobalAPI = {
   clock?: Clock;
   usage?: UsageManager;
   ["resource-catalog"]?: ResourceCatalog;
+  ["idempotency-key-catalog"]?: IdempotencyKeyCatalog;
   ["task-context"]?: TaskContext;
   ["api-client"]?: ApiClientConfiguration;
   ["run-metadata"]?: RunMetadataManager;
@@ -66,4 +71,7 @@ type TriggerDotDevGlobalAPI = {
   ["run-timeline-metrics"]?: RunTimelineMetricsManager;
   ["lifecycle-hooks"]?: LifecycleHooksManager;
   ["locals"]?: LocalsManager;
+  ["trace-context"]?: TraceContextManager;
+  ["heartbeats"]?: HeartbeatsManager;
+  ["realtime-streams"]?: RealtimeStreamsManager;
 };
diff --git a/packages/core/src/v3/utils/ioSerialization.ts b/packages/core/src/v3/utils/ioSerialization.ts
index b3049187e87..ed4d2a08952 100644
--- a/packages/core/src/v3/utils/ioSerialization.ts
+++ b/packages/core/src/v3/utils/ioSerialization.ts
@@ -1,3 +1,4 @@
+import { JSONHeroPath } from "@jsonhero/path";
 import { Attributes, Span } from "@opentelemetry/api";
 import { z } from "zod";
 import { ApiClient } from "../apiClient/index.js";
@@ -12,7 +13,7 @@ import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
 import { TriggerTracer } from "../tracer.js";
 import { zodfetch } from "../zodfetch.js";
 import { flattenAttributes } from "./flattenAttributes.js";
-import get from "lodash.get";
+import superjson from "../imports/superjson.js";
 
 export type IOPacket = {
   data?: string | undefined;
@@ -32,9 +33,7 @@ export async function parsePacket(value: IOPacket, options?: ParsePacketOptions)
     case "application/json":
       return JSON.parse(value.data, makeSafeReviver(options));
     case "application/super+json":
-      const { parse } = await loadSuperJSON();
-
-      return parse(value.data);
+      return superjson.parse(value.data);
     case "text/plain":
       return value.data;
     case "application/store":
@@ -58,11 +57,9 @@ export async function parsePacketAsJson(
     case "application/json":
       return JSON.parse(value.data, makeSafeReviver(options));
     case "application/super+json":
-      const { parse, serialize } = await loadSuperJSON();
-
-      const superJsonResult = parse(value.data);
+      const superJsonResult = superjson.parse(value.data);
 
-      const { json } = serialize(superJsonResult);
+      const { json } = superjson.serialize(superJsonResult);
 
       return json;
     case "text/plain":
@@ -95,8 +92,7 @@ export async function stringifyIO(value: any): Promise<IOPacket> {
   }
 
   try {
-    const { stringify } = await loadSuperJSON();
-    const data = stringify(value);
+    const data = superjson.stringify(value);
 
     return { data, dataType: "application/super+json" };
   } catch {
@@ -302,14 +298,12 @@ export async function createPacketAttributes(
         [dataTypeKey]: packet.dataType,
       };
     case "application/super+json":
-      const { parse } = await loadSuperJSON();
-
       if (typeof packet.data === "undefined" || packet.data === null) {
         return;
       }
 
       try {
-        const parsed = parse(packet.data) as any;
+        const parsed = superjson.parse(packet.data) as any;
         const jsonified = JSON.parse(JSON.stringify(parsed, makeSafeReplacer()));
 
         const result = {
@@ -358,9 +352,7 @@ export async function createPacketAttributesAsJson(
       );
     }
     case "application/super+json": {
-      const { deserialize } = await loadSuperJSON();
-
-      const deserialized = deserialize(data) as any;
+      const deserialized = superjson.deserialize(data) as any;
       const jsonify = safeJsonParse(JSON.stringify(deserialized, makeSafeReplacer()));
 
       return imposeAttributeLimits(
@@ -389,16 +381,38 @@ export async function prettyPrintPacket(
     if (typeof rawData === "string") {
       rawData = safeJsonParse(rawData);
     }
-    const { deserialize } = await loadSuperJSON();
 
-    return await prettyPrintPacket(deserialize(rawData), "application/json");
+    const hasCircularReferences = rawData && rawData.meta && hasCircularReference(rawData.meta);
+
+    if (hasCircularReferences) {
+      return await prettyPrintPacket(superjson.deserialize(rawData), "application/json", {
+        ...options,
+        cloneReferences: false,
+      });
+    }
+
+    return await prettyPrintPacket(superjson.deserialize(rawData), "application/json", {
+      ...options,
+      cloneReferences: true,
+    });
   }
 
   if (dataType === "application/json") {
     if (typeof rawData === "string") {
       rawData = safeJsonParse(rawData);
     }
-    return JSON.stringify(rawData, makeSafeReplacer(options), 2);
+
+    try {
+      return JSON.stringify(rawData, makeSafeReplacer(options), 2);
+    } catch (error) {
+      // If cloneReferences is true, it's possible if our hasCircularReference logic is incorrect that stringifying the data will fail with a circular reference error
+      // So we will try to stringify the data with cloneReferences set to false
+      if (options?.cloneReferences) {
+        return JSON.stringify(rawData, makeSafeReplacer({ ...options, cloneReferences: false }), 2);
+      }
+
+      throw error;
+    }
   }
 
   if (typeof rawData === "string") {
@@ -410,6 +424,7 @@ export async function prettyPrintPacket(
 
 interface ReplacerOptions {
   filteredKeys?: string[];
+  cloneReferences?: boolean;
 }
 
 function makeSafeReplacer(options?: ReplacerOptions) {
@@ -418,6 +433,10 @@ function makeSafeReplacer(options?: ReplacerOptions) {
   return function replacer(key: string, value: any) {
     if (typeof value === "object" && value !== null) {
       if (seen.has(value)) {
+        if (options?.cloneReferences) {
+          return structuredClone(value);
+        }
+
         return "[Circular]";
       }
       seen.add(value);
@@ -483,21 +502,6 @@ function getPacketExtension(outputType: string): string {
   }
 }
 
-async function loadSuperJSON() {
-  const superjson = await import("superjson");
-
-  superjson.registerCustom<Buffer, number[]>(
-    {
-      isApplicable: (v): v is Buffer => typeof Buffer === "function" && Buffer.isBuffer(v),
-      serialize: (v) => [...v],
-      deserialize: (v) => Buffer.from(v),
-    },
-    "buffer"
-  );
-
-  return superjson;
-}
-
 function safeJsonParse(value: string): any {
   try {
     return JSON.parse(value);
@@ -525,7 +529,6 @@ function safeJsonParse(value: string): any {
  * @throws {Error} If the newPayload is not valid JSON
  */
 export async function replaceSuperJsonPayload(original: string, newPayload: string) {
-  const superjson = await loadSuperJSON();
   const originalObject = superjson.parse(original);
   const newPayloadObject = JSON.parse(newPayload);
   const { meta } = superjson.serialize(originalObject);
@@ -536,7 +539,7 @@ export async function replaceSuperJsonPayload(original: string, newPayload: stri
       .map(([key]) => key);
 
     const overridenUndefinedKeys = originalUndefinedKeys.filter(
-      (key) => get(newPayloadObject, key) !== undefined
+      (key) => getKeyFromObject(newPayloadObject, key) !== undefined
     );
 
     overridenUndefinedKeys.forEach((key) => {
@@ -551,3 +554,86 @@ export async function replaceSuperJsonPayload(original: string, newPayload: stri
 
   return superjson.deserialize(newSuperJson);
 }
+
+function getKeyFromObject(object: unknown, key: string) {
+  const jsonHeroPath = new JSONHeroPath(key);
+
+  return jsonHeroPath.first(object);
+}
+
+/**
+ * Detects if a superjson serialization contains circular references
+ * by analyzing the meta.referentialEqualities structure.
+ *
+ * Based on superjson's ReferentialEqualityAnnotations type:
+ * Record<string, string[]> | [string[]] | [string[], Record<string, string[]>]
+ *
+ * Circular references are represented as:
+ * - [string[]] where strings are paths that reference back to root or ancestors
+ * - The first element in [string[], Record<string, string[]>] format
+ */
+function hasCircularReference(meta: any): boolean {
+  if (!meta?.referentialEqualities) {
+    return false;
+  }
+
+  const re = meta.referentialEqualities;
+
+  // Case 1: [string[]] - array containing only circular references
+  if (Array.isArray(re) && re.length === 1 && Array.isArray(re[0])) {
+    return re[0].length > 0; // Has circular references
+  }
+
+  // Case 2: [string[], Record<string, string[]>] - mixed format
+  if (Array.isArray(re) && re.length === 2 && Array.isArray(re[0])) {
+    return re[0].length > 0; // First element contains circular references
+  }
+
+  // Case 3: Record<string, string[]> - check for circular patterns in shared references
+  if (!Array.isArray(re) && typeof re === "object") {
+    // Check if any reference path points to an ancestor path
+    for (const [targetPath, referencePaths] of Object.entries(re)) {
+      for (const refPath of referencePaths as string[]) {
+        if (isCircularPattern(targetPath, refPath)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  return false;
+}
+
+/**
+ * Checks if a reference pattern represents a circular reference
+ * by analyzing if the reference path points back to an ancestor of the target path
+ */
+function isCircularPattern(targetPath: string, referencePath: string): boolean {
+  const targetParts = targetPath.split(".");
+  const refParts = referencePath.split(".");
+
+  // For circular references, the reference path often contains the target path as a prefix
+  // Example: targetPath="user", referencePath="user.details.user"
+  // This means user.details.user points back to user (circular)
+
+  // Check if reference path starts with target path + additional segments that loop back
+  if (refParts.length > targetParts.length) {
+    // Check if reference path starts with target path
+    let isPrefix = true;
+    for (let i = 0; i < targetParts.length; i++) {
+      if (targetParts[i] !== refParts[i]) {
+        isPrefix = false;
+        break;
+      }
+    }
+
+    // If reference path starts with target path and ends with target path,
+    // it's likely a circular reference (e.g., "user" -> "user.details.user")
+    if (isPrefix && refParts[refParts.length - 1] === targetParts[targetParts.length - 1]) {
+      return true;
+    }
+  }
+
+  return false;
+}
diff --git a/packages/core/src/v3/waitUntil/index.ts b/packages/core/src/v3/waitUntil/index.ts
index 2a0686850a8..b1632af0ee2 100644
--- a/packages/core/src/v3/waitUntil/index.ts
+++ b/packages/core/src/v3/waitUntil/index.ts
@@ -8,7 +8,7 @@ class NoopManager implements WaitUntilManager {
     // noop
   }
 
-  blockUntilSettled(timeout: number): Promise<void> {
+  blockUntilSettled(): Promise<void> {
     return Promise.resolve();
   }
 
@@ -44,8 +44,8 @@ export class WaitUntilAPI implements WaitUntilManager {
     return this.#getManager().register(promise);
   }
 
-  blockUntilSettled(timeout: number): Promise<void> {
-    return this.#getManager().blockUntilSettled(timeout);
+  blockUntilSettled(): Promise<void> {
+    return this.#getManager().blockUntilSettled();
   }
 
   requiresResolving(): boolean {
diff --git a/packages/core/src/v3/waitUntil/manager.ts b/packages/core/src/v3/waitUntil/manager.ts
index cca68397894..24789270e42 100644
--- a/packages/core/src/v3/waitUntil/manager.ts
+++ b/packages/core/src/v3/waitUntil/manager.ts
@@ -3,6 +3,8 @@ import { MaybeDeferredPromise, WaitUntilManager } from "./types.js";
 export class StandardWaitUntilManager implements WaitUntilManager {
   private maybeDeferredPromises: Set<MaybeDeferredPromise> = new Set();
 
+  constructor(private timeoutInMs: number = 60_000) {}
+
   reset(): void {
     this.maybeDeferredPromises.clear();
   }
@@ -11,18 +13,18 @@ export class StandardWaitUntilManager implements WaitUntilManager {
     this.maybeDeferredPromises.add(promise);
   }
 
-  async blockUntilSettled(timeout: number): Promise<void> {
+  async blockUntilSettled(): Promise<void> {
     if (this.promisesRequringResolving.length === 0) {
       return;
     }
 
     const promises = this.promisesRequringResolving.map((p) =>
-      typeof p.promise === "function" ? p.promise() : p.promise
+      typeof p.promise === "function" ? p.promise(this.timeoutInMs) : p.promise
     );
 
     await Promise.race([
       Promise.allSettled(promises),
-      new Promise<void>((resolve, _) => setTimeout(() => resolve(), timeout)),
+      new Promise<void>((resolve, _) => setTimeout(() => resolve(), this.timeoutInMs)),
     ]);
 
     this.maybeDeferredPromises.clear();
diff --git a/packages/core/src/v3/waitUntil/types.ts b/packages/core/src/v3/waitUntil/types.ts
index e142b31bec1..1034f0888ff 100644
--- a/packages/core/src/v3/waitUntil/types.ts
+++ b/packages/core/src/v3/waitUntil/types.ts
@@ -1,10 +1,10 @@
 export type MaybeDeferredPromise = {
   requiresResolving(): boolean;
-  promise: Promise<any> | (() => Promise<any>);
+  promise: Promise<any> | ((timeoutInMs: number) => Promise<any>);
 };
 
 export interface WaitUntilManager {
   register(promise: MaybeDeferredPromise): void;
-  blockUntilSettled(timeout: number): Promise<void>;
+  blockUntilSettled(): Promise<void>;
   requiresResolving(): boolean;
 }
diff --git a/packages/core/src/v3/workers/index.ts b/packages/core/src/v3/workers/index.ts
index 5ff626f2eaf..4ca301fcdc7 100644
--- a/packages/core/src/v3/workers/index.ts
+++ b/packages/core/src/v3/workers/index.ts
@@ -14,6 +14,7 @@ export { StandardResourceCatalog } from "../resource-catalog/standardResourceCat
 export {
   TaskContextSpanProcessor,
   TaskContextLogProcessor,
+  TaskContextMetricExporter,
 } from "../taskContext/otelProcessors.js";
 export * from "../usage-api.js";
 export { DevUsageManager } from "../usage/devUsageManager.js";
@@ -28,3 +29,6 @@ export { WarmStartClient, type WarmStartClientOptions } from "../workers/warmSta
 export { StandardLifecycleHooksManager } from "../lifecycleHooks/manager.js";
 export { StandardLocalsManager } from "../locals/manager.js";
 export { populateEnv } from "./populateEnv.js";
+export { StandardTraceContextManager } from "../traceContext/manager.js";
+export { StandardHeartbeatsManager } from "../heartbeats/manager.js";
+export { StandardRealtimeStreamsManager } from "../realtimeStreams/manager.js";
diff --git a/packages/core/src/v3/workers/taskExecutor.ts b/packages/core/src/v3/workers/taskExecutor.ts
index eafe00b1f32..c232864884b 100644
--- a/packages/core/src/v3/workers/taskExecutor.ts
+++ b/packages/core/src/v3/workers/taskExecutor.ts
@@ -1,9 +1,8 @@
-import { Context, context, SpanKind, trace } from "@opentelemetry/api";
-import { VERSION } from "../../version.js";
+import { Context, context, SpanKind } from "@opentelemetry/api";
+import { promiseWithResolvers } from "../../utils.js";
 import { ApiError, RateLimitError } from "../apiClient/errors.js";
 import { ConsoleInterceptor } from "../consoleInterceptor.js";
 import {
-  InternalError,
   isCompleteTaskWithOutput,
   isInternalError,
   parseError,
@@ -17,6 +16,7 @@ import {
   lifecycleHooks,
   OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT,
   runMetadata,
+  traceContext,
   waitUntil,
 } from "../index.js";
 import {
@@ -31,7 +31,6 @@ import { runTimelineMetrics } from "../run-timeline-metrics-api.js";
 import {
   COLD_VARIANT,
   RetryOptions,
-  ServerBackgroundWorker,
   TaskRunContext,
   TaskRunErrorCodes,
   TaskRunExecution,
@@ -40,7 +39,6 @@ import {
   WARM_VARIANT,
 } from "../schemas/index.js";
 import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
-import { taskContext } from "../task-context-api.js";
 import { TriggerTracer } from "../tracer.js";
 import { tryCatch } from "../tryCatch.js";
 import { HandleErrorModificationOptions, TaskMetadataWithFunctions } from "../types/index.js";
@@ -52,7 +50,6 @@ import {
   stringifyIO,
 } from "../utils/ioSerialization.js";
 import { calculateNextRetryDelay } from "../utils/retries.js";
-import { promiseWithResolvers } from "../../utils.js";
 
 export type TaskExecutorOptions = {
   tracingSDK: TracingSDK;
@@ -93,12 +90,9 @@ export class TaskExecutor {
 
   async execute(
     execution: TaskRunExecution,
-    worker: ServerBackgroundWorker,
-    traceContext: Record<string, unknown>,
-    signal: AbortSignal,
-    isWarmStart?: boolean
+    ctx: TaskRunContext,
+    signal: AbortSignal
   ): Promise<{ result: TaskRunExecutionResult }> {
-    const ctx = TaskRunContext.parse(execution);
     const attemptMessage = `Attempt ${execution.attempt.number}`;
 
     const originalPacket = {
@@ -106,22 +100,10 @@ export class TaskExecutor {
       dataType: execution.run.payloadType,
     };
 
-    taskContext.setGlobalTaskContext({
-      ctx,
-      worker,
-      isWarmStart: isWarmStart ?? this._isWarmStart,
-    });
-
     if (execution.run.metadata) {
       runMetadata.enterWithMetadata(execution.run.metadata);
     }
 
-    if (!this._tracingSDK.asyncResourceDetector.isResolved) {
-      this._tracingSDK.asyncResourceDetector.resolveWithAttributes({
-        ...taskContext.resourceAttributes,
-      });
-    }
-
     const result = await this._tracer.startActiveSpan(
       attemptMessage,
       async (span) => {
@@ -200,6 +182,8 @@ export class TaskExecutor {
                   await this.#callOnStartFunctions(payload, ctx, initOutput, signal);
                 }
 
+                await this.#callOnStartAttemptFunctions(payload, ctx, signal);
+
                 try {
                   return await this.#callRun(payload, ctx, initOutput, signal);
                 } catch (error) {
@@ -369,8 +353,7 @@ export class TaskExecutor {
             ? runTimelineMetrics.convertMetricsToSpanEvents()
             : undefined,
       },
-      this._tracer.extractContext(traceContext),
-      signal
+      traceContext.extractContext()
     );
 
     return { result };
@@ -437,29 +420,13 @@ export class TaskExecutor {
       throw new Error("Task does not have a run function");
     }
 
-    // Create a promise that rejects when the signal aborts
-    const abortPromise = new Promise((_, reject) => {
-      signal.addEventListener("abort", () => {
-        if (typeof signal.reason === "string" && signal.reason.includes("cancel")) {
-          return;
-        }
-
-        const maxDuration = ctx.run.maxDuration;
-        reject(
-          new InternalError({
-            code: TaskRunErrorCodes.MAX_DURATION_EXCEEDED,
-            message: `Run exceeded maximum compute time (maxDuration) of ${maxDuration} seconds`,
-          })
-        );
-      });
-    });
-
     return runTimelineMetrics.measureMetric("trigger.dev/execution", "run", async () => {
       return await this._tracer.startActiveSpan(
         "run()",
         async (span) => {
-          // Race between the run function and the abort promise
-          return await Promise.race([runFn(payload, { ctx, init, signal }), abortPromise]);
+          // maxDuration is now enforced by killing the process, not by Promise.race
+          // The signal is still passed to runFn for cancellation and other abort conditions
+          return await runFn(payload, { ctx, init, signal });
         },
         {
           attributes: { [SemanticInternalAttributes.STYLE_ICON]: "task-fn-run" },
@@ -812,7 +779,7 @@ export class TaskExecutor {
 
     return await runTimelineMetrics.measureMetric("trigger.dev/execution", "success", async () => {
       for (const hook of globalSuccessHooks) {
-        const [hookError] = await tryCatch(
+        await tryCatch(
           this._tracer.startActiveSpan(
             "onSuccess()",
             async (span) => {
@@ -834,14 +801,10 @@ export class TaskExecutor {
             }
           )
         );
-
-        if (hookError) {
-          throw hookError;
-        }
       }
 
       if (taskSuccessHook) {
-        const [hookError] = await tryCatch(
+        await tryCatch(
           this._tracer.startActiveSpan(
             "onSuccess()",
             async (span) => {
@@ -863,10 +826,6 @@ export class TaskExecutor {
             }
           )
         );
-
-        if (hookError) {
-          throw hookError;
-        }
       }
     });
   }
@@ -887,7 +846,7 @@ export class TaskExecutor {
 
     return await runTimelineMetrics.measureMetric("trigger.dev/execution", "failure", async () => {
       for (const hook of globalFailureHooks) {
-        const [hookError] = await tryCatch(
+        await tryCatch(
           this._tracer.startActiveSpan(
             "onFailure()",
             async (span) => {
@@ -909,14 +868,10 @@ export class TaskExecutor {
             }
           )
         );
-
-        if (hookError) {
-          throw hookError;
-        }
       }
 
       if (taskFailureHook) {
-        const [hookError] = await tryCatch(
+        await tryCatch(
           this._tracer.startActiveSpan(
             "onFailure()",
             async (span) => {
@@ -938,10 +893,6 @@ export class TaskExecutor {
             }
           )
         );
-
-        if (hookError) {
-          throw hookError;
-        }
       }
     });
   }
@@ -1024,6 +975,70 @@ export class TaskExecutor {
     });
   }
 
+  async #callOnStartAttemptFunctions(payload: unknown, ctx: TaskRunContext, signal: AbortSignal) {
+    const globalStartHooks = lifecycleHooks.getGlobalStartAttemptHooks();
+    const taskStartHook = lifecycleHooks.getTaskStartAttemptHook(this.task.id);
+
+    if (globalStartHooks.length === 0 && !taskStartHook) {
+      return;
+    }
+
+    return await runTimelineMetrics.measureMetric(
+      "trigger.dev/execution",
+      "startAttempt",
+      async () => {
+        for (const hook of globalStartHooks) {
+          const [hookError] = await tryCatch(
+            this._tracer.startActiveSpan(
+              "onStartAttempt()",
+              async (span) => {
+                await hook.fn({ payload, ctx, signal, task: this.task.id });
+              },
+              {
+                attributes: {
+                  [SemanticInternalAttributes.STYLE_ICON]: "task-hook-onStartAttempt",
+                  [SemanticInternalAttributes.COLLAPSED]: true,
+                  ...this.#lifecycleHookAccessoryAttributes(hook.name),
+                },
+              }
+            )
+          );
+
+          if (hookError) {
+            throw hookError;
+          }
+        }
+
+        if (taskStartHook) {
+          const [hookError] = await tryCatch(
+            this._tracer.startActiveSpan(
+              "onStartAttempt()",
+              async (span) => {
+                await taskStartHook({
+                  payload,
+                  ctx,
+                  signal,
+                  task: this.task.id,
+                });
+              },
+              {
+                attributes: {
+                  [SemanticInternalAttributes.STYLE_ICON]: "task-hook-onStartAttempt",
+                  [SemanticInternalAttributes.COLLAPSED]: true,
+                  ...this.#lifecycleHookAccessoryAttributes("task"),
+                },
+              }
+            )
+          );
+
+          if (hookError) {
+            throw hookError;
+          }
+        }
+      }
+    );
+  }
+
   async #cleanupAndWaitUntil(
     payload: unknown,
     ctx: TaskRunContext,
@@ -1114,7 +1129,7 @@ export class TaskExecutor {
     return this._tracer.startActiveSpan(
       "waitUntil",
       async (span) => {
-        return await waitUntil.blockUntilSettled(60_000);
+        return await waitUntil.blockUntilSettled();
       },
       {
         attributes: {
@@ -1332,7 +1347,7 @@ export class TaskExecutor {
 
     return await runTimelineMetrics.measureMetric("trigger.dev/execution", "complete", async () => {
       for (const hook of globalCompleteHooks) {
-        const [hookError] = await tryCatch(
+        await tryCatch(
           this._tracer.startActiveSpan(
             "onComplete()",
             async (span) => {
@@ -1354,14 +1369,10 @@ export class TaskExecutor {
             }
           )
         );
-
-        if (hookError) {
-          throw hookError;
-        }
       }
 
       if (taskCompleteHook) {
-        const [hookError] = await tryCatch(
+        await tryCatch(
           this._tracer.startActiveSpan(
             "onComplete()",
             async (span) => {
@@ -1383,10 +1394,6 @@ export class TaskExecutor {
             }
           )
         );
-
-        if (hookError) {
-          throw hookError;
-        }
       }
     });
   }
diff --git a/packages/core/src/v3/workers/warmStartClient.ts b/packages/core/src/v3/workers/warmStartClient.ts
index 4a70ec89717..d087d18cb96 100644
--- a/packages/core/src/v3/workers/warmStartClient.ts
+++ b/packages/core/src/v3/workers/warmStartClient.ts
@@ -17,6 +17,7 @@ export class WarmStartClient {
   private readonly logger = new SimpleStructuredLogger("warm-start-client");
   private readonly apiUrl: URL;
   private backoff = new ExponentialBackoff("FullJitter");
+  private abortController: AbortController | null = null;
 
   private get connectUrl() {
     return new URL("/connect", this.apiUrl);
@@ -30,6 +31,30 @@ export class WarmStartClient {
     this.apiUrl = opts.apiUrl;
   }
 
+  abort() {
+    if (!this.abortController) {
+      this.logger.warn("Abort called but no abort controller exists");
+      return;
+    }
+
+    this.abortController.abort();
+    this.abortController = null;
+  }
+
+  private async withAbort<T>(fn: (signal: AbortSignal) => Promise<T>): Promise<T> {
+    if (this.abortController) {
+      throw new Error("A warm start is already in progress");
+    }
+
+    this.abortController = new AbortController();
+
+    try {
+      return await fn(this.abortController.signal);
+    } finally {
+      this.abortController = null;
+    }
+  }
+
   async connect(): Promise<ApiResult<WarmStartConnectResponse>> {
     return wrapZodFetch(
       WarmStartConnectResponse,
@@ -61,39 +86,42 @@ export class WarmStartClient {
     connectionTimeoutMs: number;
     keepaliveMs: number;
   }): Promise<DequeuedMessage | null> {
-    const res = await this.longPoll<unknown>(
-      this.warmStartUrl.href,
-      {
-        method: "GET",
-        headers: {
-          "x-trigger-workload-controller-id": this.opts.controllerId,
-          "x-trigger-deployment-id": this.opts.deploymentId,
-          "x-trigger-deployment-version": this.opts.deploymentVersion,
-          "x-trigger-machine-cpu": this.opts.machineCpu,
-          "x-trigger-machine-memory": this.opts.machineMemory,
-          "x-trigger-worker-instance-name": workerInstanceName,
+    return this.withAbort(async (abortSignal) => {
+      const res = await this.longPoll<unknown>(
+        this.warmStartUrl.href,
+        {
+          method: "GET",
+          headers: {
+            "x-trigger-workload-controller-id": this.opts.controllerId,
+            "x-trigger-deployment-id": this.opts.deploymentId,
+            "x-trigger-deployment-version": this.opts.deploymentVersion,
+            "x-trigger-machine-cpu": this.opts.machineCpu,
+            "x-trigger-machine-memory": this.opts.machineMemory,
+            "x-trigger-worker-instance-name": workerInstanceName,
+          },
         },
-      },
-      {
-        timeoutMs: connectionTimeoutMs,
-        totalDurationMs: keepaliveMs,
+        {
+          timeoutMs: connectionTimeoutMs,
+          totalDurationMs: keepaliveMs,
+          abortSignal,
+        }
+      );
+
+      if (!res.ok) {
+        this.logger.error("warmStart: failed", {
+          error: res.error,
+          connectionTimeoutMs,
+          keepaliveMs,
+        });
+        return null;
       }
-    );
-
-    if (!res.ok) {
-      this.logger.error("warmStart: failed", {
-        error: res.error,
-        connectionTimeoutMs,
-        keepaliveMs,
-      });
-      return null;
-    }
 
-    const nextRun = DequeuedMessage.parse(res.data);
+      const nextRun = DequeuedMessage.parse(res.data);
 
-    this.logger.debug("warmStart: got next run", { nextRun });
+      this.logger.debug("warmStart: got next run", { nextRun });
 
-    return nextRun;
+      return nextRun;
+    });
   }
 
   private async longPoll<T = any>(
@@ -102,9 +130,11 @@ export class WarmStartClient {
     {
       timeoutMs,
       totalDurationMs,
+      abortSignal,
     }: {
       timeoutMs: number;
       totalDurationMs: number;
+      abortSignal: AbortSignal;
     }
   ): Promise<
     | {
@@ -123,11 +153,20 @@ export class WarmStartClient {
     let retries = 0;
 
     while (Date.now() < endTime) {
+      if (abortSignal.aborted) {
+        return {
+          ok: false,
+          error: "Aborted - abort signal triggered before fetch",
+        };
+      }
+
       try {
-        const controller = new AbortController();
-        const signal = controller.signal;
+        const timeoutController = new AbortController();
+        const timeoutId = setTimeout(() => timeoutController.abort(), timeoutMs);
 
-        const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+        // Create compound signal that aborts on either timeout or parent abort
+        const signals = [timeoutController.signal, abortSignal];
+        const signal = AbortSignal.any(signals);
 
         const response = await fetch(url, { ...requestInit, signal });
 
@@ -148,6 +187,13 @@ export class WarmStartClient {
         }
       } catch (error) {
         if (error instanceof Error && error.name === "AbortError") {
+          // Check if this was a parent abort or just a timeout
+          if (abortSignal.aborted) {
+            return {
+              ok: false,
+              error: "Aborted - abort signal triggered during fetch",
+            };
+          }
           this.logger.log("Long poll request timed out, retrying...");
           continue;
         } else {
diff --git a/packages/core/src/v3/zodSocket.ts b/packages/core/src/v3/zodSocket.ts
index 160620c42c9..5ec1f179a4f 100644
--- a/packages/core/src/v3/zodSocket.ts
+++ b/packages/core/src/v3/zodSocket.ts
@@ -100,7 +100,7 @@ export class ZodSocketMessageHandler<TRPCCatalog extends ZodSocketMessageCatalog
     this.#handlers = options.handlers;
     this.#logger =
       options.logger ?? new SimpleStructuredLogger("socket-message-handler", LogLevel.info);
-    this.#logPayloads = options.logPayloads ?? !!process.env.LOG_SOCKET_HANDLER_PAYLOADS ?? false;
+    this.#logPayloads = options.logPayloads ?? !!process.env.LOG_SOCKET_HANDLER_PAYLOADS;
   }
 
   public async handleMessage(message: unknown) {
diff --git a/packages/core/test/flattenAttributes.test.ts b/packages/core/test/flattenAttributes.test.ts
index 8970ae6a7d2..28f137deaf9 100644
--- a/packages/core/test/flattenAttributes.test.ts
+++ b/packages/core/test/flattenAttributes.test.ts
@@ -500,6 +500,53 @@ describe("flattenAttributes", () => {
     expect(result["bigint"]).toBe("999");
     expect(typeof result["symbol"]).toBe("string");
   });
+
+  it("respects maxDepth limit", () => {
+    const obj = {
+      a: {
+        b: {
+          c: {
+            d: {
+              e: {
+                f: "deep",
+              },
+            },
+          },
+        },
+      },
+    };
+
+    // With maxDepth of 3, should not include keys deeper than 3 levels
+    const result = flattenAttributes(obj, undefined, undefined, 3);
+
+    // a.b.c should exist (depth 3)
+    expect(result["a.b.c"]).toBeUndefined(); // c is an object, not a leaf
+    // a.b.c.d should not exist (would require going to depth 4)
+    expect(result["a.b.c.d"]).toBeUndefined();
+    expect(result["a.b.c.d.e.f"]).toBeUndefined();
+  });
+
+  it("does not crash with deeply nested objects", () => {
+    // Create object iteratively with 500 levels of nesting
+    let deepObj: any = { value: "leaf" };
+    for (let i = 0; i < 500; i++) {
+      deepObj = { n: deepObj };
+    }
+
+    // Should complete without stack overflow
+    expect(() => flattenAttributes(deepObj)).not.toThrow();
+  });
+
+  it("does not crash with deeply nested arrays", () => {
+    // Create deeply nested array structure iteratively
+    let deepArray: any = ["leaf"];
+    for (let i = 0; i < 500; i++) {
+      deepArray = [deepArray];
+    }
+
+    // Should complete without stack overflow
+    expect(() => flattenAttributes({ arr: deepArray })).not.toThrow();
+  });
 });
 
 describe("unflattenAttributes", () => {
@@ -581,4 +628,43 @@ describe("unflattenAttributes", () => {
       blogPosts: [{ title: "Post 1", author: "[Circular Reference]" }],
     });
   });
+
+  it("respects maxDepth limit and skips overly deep keys", () => {
+    // Create a flattened object with keys at various depths
+    const flattened = {
+      "a.b.c": "shallow", // depth 3 - should be included
+      "a.b.c.d.e.f.g": "deep", // depth 7 - should be skipped with maxDepth=5
+      "x.y": "also shallow", // depth 2 - should be included
+    };
+
+    const result = unflattenAttributes(flattened, undefined, 5);
+
+    // Shallow keys should be included
+    expect(result).toHaveProperty("a.b.c", "shallow");
+    expect(result).toHaveProperty("x.y", "also shallow");
+
+    // Deep key should be skipped (not create the nested structure)
+    expect((result as any)?.a?.b?.c?.d?.e?.f?.g).toBeUndefined();
+  });
+
+  it("uses default maxDepth of 128", () => {
+    // Create a key with 129 parts - should be skipped
+    const deepKey = Array(129).fill("x").join(".");
+    const flattened = {
+      [deepKey]: "too deep",
+      "a.b": "shallow",
+    };
+
+    const result = unflattenAttributes(flattened);
+
+    // Shallow key should work
+    expect(result).toHaveProperty("a.b", "shallow");
+
+    // Deep key should be skipped
+    let current: any = result;
+    for (let i = 0; i < 129 && current; i++) {
+      current = current?.x;
+    }
+    expect(current).toBeUndefined();
+  });
 });
diff --git a/packages/core/test/ioSerialization.test.ts b/packages/core/test/ioSerialization.test.ts
index ffb9b307530..d7bd90add83 100644
--- a/packages/core/test/ioSerialization.test.ts
+++ b/packages/core/test/ioSerialization.test.ts
@@ -1,4 +1,4 @@
-import { replaceSuperJsonPayload } from "../src/v3/utils/ioSerialization.js";
+import { replaceSuperJsonPayload, prettyPrintPacket } from "../src/v3/utils/ioSerialization.js";
 
 describe("ioSerialization", () => {
   describe("replaceSuperJsonPayload", () => {
@@ -188,4 +188,160 @@ describe("ioSerialization", () => {
       await expect(replaceSuperJsonPayload(originalSerialized, invalidPayload)).rejects.toThrow();
     });
   });
+
+  describe("prettyPrintPacket", () => {
+    it("should return empty string for undefined data", async () => {
+      const result = await prettyPrintPacket(undefined);
+      expect(result).toBe("");
+    });
+
+    it("should return string data as-is", async () => {
+      const result = await prettyPrintPacket("Hello, World!");
+      expect(result).toBe("Hello, World!");
+    });
+
+    it("should pretty print JSON data with default options", async () => {
+      const data = { name: "John", age: 30, nested: { value: true } };
+      const result = await prettyPrintPacket(data, "application/json");
+
+      expect(result).toBe(JSON.stringify(data, null, 2));
+    });
+
+    it("should handle JSON data as string", async () => {
+      const data = { name: "John", age: 30 };
+      const jsonString = JSON.stringify(data);
+      const result = await prettyPrintPacket(jsonString, "application/json");
+
+      expect(result).toBe(JSON.stringify(data, null, 2));
+    });
+
+    it("should pretty print SuperJSON data", async () => {
+      const data = {
+        name: "John",
+        date: new Date("2023-01-01"),
+        bigInt: BigInt(123),
+        set: new Set(["a", "b"]),
+        map: new Map([["key", "value"]]),
+      };
+
+      const superjson = await import("superjson");
+      const serialized = superjson.stringify(data);
+
+      const result = await prettyPrintPacket(serialized, "application/super+json");
+
+      // Should deserialize and pretty print the data
+      expect(result).toContain('"name": "John"');
+      expect(result).toContain('"date": "2023-01-01T00:00:00.000Z"');
+      expect(result).toContain('"bigInt": "123"');
+      expect(result).toContain('"set": [\n    "a",\n    "b"\n  ]');
+      expect(result).toContain('"map": {\n    "key": "value"\n  }');
+    });
+
+    it("should handle circular references", async () => {
+      const data: any = { name: "John" };
+      data.self = data; // Create circular reference
+
+      // Create a SuperJSON serialized version to test the circular reference detection
+      const superjson = await import("superjson");
+      const serialized = superjson.stringify(data);
+
+      const result = await prettyPrintPacket(serialized, "application/super+json");
+
+      expect(result).toContain('"name": "John"');
+      expect(result).toContain('"self": "[Circular]"');
+    });
+
+    it("should handle regular non-circular references", async () => {
+      const person = { name: "John" };
+
+      const data: any = { person1: person, person2: person };
+
+      // Create a SuperJSON serialized version to test the circular reference detection
+      const superjson = await import("superjson");
+      const serialized = superjson.stringify(data);
+
+      const result = await prettyPrintPacket(serialized, "application/super+json");
+
+      expect(result).toContain('"person1": {');
+      expect(result).toContain('"person2": {');
+    });
+
+    it("should filter out specified keys", async () => {
+      const data = { name: "John", password: "secret", age: 30 };
+      const result = await prettyPrintPacket(data, "application/json", {
+        filteredKeys: ["password"],
+      });
+
+      expect(result).toContain('"name": "John"');
+      expect(result).toContain('"age": 30');
+      expect(result).not.toContain('"password"');
+    });
+
+    it("should handle BigInt values", async () => {
+      const data = { id: BigInt(123456789), name: "John" };
+      const result = await prettyPrintPacket(data, "application/json");
+
+      expect(result).toContain('"id": "123456789"');
+      expect(result).toContain('"name": "John"');
+    });
+
+    it("should handle RegExp values", async () => {
+      const data = { pattern: /test/gi, name: "John" };
+      const result = await prettyPrintPacket(data, "application/json");
+
+      expect(result).toContain('"pattern": "/test/gi"');
+      expect(result).toContain('"name": "John"');
+    });
+
+    it("should handle Set values", async () => {
+      const data = { tags: new Set(["tag1", "tag2"]), name: "John" };
+      const result = await prettyPrintPacket(data, "application/json");
+
+      expect(result).toContain('"tags": [\n    "tag1",\n    "tag2"\n  ]');
+      expect(result).toContain('"name": "John"');
+    });
+
+    it("should handle Map values", async () => {
+      const data = { mapping: new Map([["key1", "value1"]]), name: "John" };
+      const result = await prettyPrintPacket(data, "application/json");
+
+      expect(result).toContain('"mapping": {\n    "key1": "value1"\n  }');
+      expect(result).toContain('"name": "John"');
+    });
+
+    it("should handle complex nested data", async () => {
+      const data = {
+        user: {
+          id: BigInt(123),
+          createdAt: new Date("2023-01-01"),
+          settings: {
+            theme: "dark",
+            tags: new Set(["admin", "user"]),
+            config: new Map([["timeout", "30s"]]),
+          },
+        },
+        metadata: {
+          version: 1,
+          pattern: /^test$/,
+        },
+      };
+
+      const result = await prettyPrintPacket(data, "application/json");
+
+      expect(result).toContain('"id": "123"');
+      expect(result).toContain('"createdAt": "2023-01-01T00:00:00.000Z"');
+      expect(result).toContain('"theme": "dark"');
+      expect(result).toContain('"tags": [\n        "admin",\n        "user"\n      ]');
+      expect(result).toContain('"config": {\n        "timeout": "30s"\n      }');
+      expect(result).toContain('"version": 1');
+      expect(result).toContain('"pattern": "/^test$/"');
+    });
+
+    it("should handle data without dataType parameter", async () => {
+      const data = { name: "John", age: 30 };
+      const result = await prettyPrintPacket(data);
+
+      expect(result).toBe(JSON.stringify(data, null, 2));
+    });
+  });
 });
diff --git a/packages/core/test/runStream.test.ts b/packages/core/test/runStream.test.ts
index c8b15a7d4db..0bf7f17432c 100644
--- a/packages/core/test/runStream.test.ts
+++ b/packages/core/test/runStream.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vitest";
 import {
   RunSubscription,
+  SSEStreamPart,
   StreamSubscription,
   StreamSubscriptionFactory,
 } from "../src/v3/apiClient/runStream.js";
@@ -11,11 +12,15 @@ import type { SubscribeRunRawShape } from "../src/v3/schemas/api.js";
 class TestStreamSubscription implements StreamSubscription {
   constructor(private chunks: unknown[]) {}
 
-  async subscribe(): Promise<ReadableStream<unknown>> {
+  async subscribe(): Promise<ReadableStream<SSEStreamPart<unknown>>> {
     return new ReadableStream({
       start: async (controller) => {
-        for (const chunk of this.chunks) {
-          controller.enqueue(chunk);
+        for (let i = 0; i < this.chunks.length; i++) {
+          controller.enqueue({
+            id: `msg-${i}`,
+            chunk: this.chunks[i],
+            timestamp: Date.now() + i,
+          });
         }
         controller.close();
       },
@@ -94,6 +99,7 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
+        realtimeStreams: [],
       },
     ];
 
@@ -135,6 +141,7 @@ describe("RunSubscription", () => {
         payloadType: "application/json",
         output: JSON.stringify({ test: "output" }),
         outputType: "application/json",
+        realtimeStreams: [],
       },
     ];
 
@@ -174,6 +181,7 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
+        realtimeStreams: [],
       },
       {
         id: "123",
@@ -189,6 +197,7 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
+        realtimeStreams: [],
       },
     ];
 
@@ -239,10 +248,9 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
-        metadata: JSON.stringify({
-          $$streams: ["openai"],
-        }),
+        metadata: JSON.stringify({}),
         metadataType: "application/json",
+        realtimeStreams: ["openai"],
       },
     ];
 
@@ -307,10 +315,9 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
-        metadata: JSON.stringify({
-          $$streams: ["openai"],
-        }),
+        metadata: JSON.stringify({}),
         metadataType: "application/json",
+        realtimeStreams: ["openai"],
       },
       // Second run update with same stream key
       {
@@ -326,10 +333,9 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
-        metadata: JSON.stringify({
-          $$streams: ["openai"],
-        }),
+        metadata: JSON.stringify({}),
         metadataType: "application/json",
+        realtimeStreams: ["openai"],
       },
     ];
 
@@ -407,10 +413,9 @@ describe("RunSubscription", () => {
         baseCostInCents: 0,
         isTest: false,
         runTags: [],
-        metadata: JSON.stringify({
-          $$streams: ["openai", "anthropic"],
-        }),
+        metadata: JSON.stringify({}),
         metadataType: "application/json",
+        realtimeStreams: ["openai", "anthropic"],
       },
     ];
 
diff --git a/packages/core/test/standardMetadataManager.test.ts b/packages/core/test/standardMetadataManager.test.ts
index 39ae810409a..9385a2130dc 100644
--- a/packages/core/test/standardMetadataManager.test.ts
+++ b/packages/core/test/standardMetadataManager.test.ts
@@ -32,7 +32,7 @@ describe("StandardMetadataManager", () => {
 
     const apiClient = new ApiClient(server.http.url().origin, "tr-123");
 
-    manager = new StandardMetadataManager(apiClient, server.http.url().origin);
+    manager = new StandardMetadataManager(apiClient);
     manager.runId = runId;
   });
 
diff --git a/packages/core/test/streamsWriterV1.test.ts b/packages/core/test/streamsWriterV1.test.ts
new file mode 100644
index 00000000000..8111870cd7d
--- /dev/null
+++ b/packages/core/test/streamsWriterV1.test.ts
@@ -0,0 +1,979 @@
+import { describe, it, expect, beforeEach, afterEach } from "vitest";
+import { createServer, Server, IncomingMessage, ServerResponse } from "node:http";
+import { AddressInfo } from "node:net";
+import { StreamsWriterV1 } from "../src/v3/realtimeStreams/streamsWriterV1.js";
+import { ensureReadableStream } from "../src/v3/streams/asyncIterableStream.js";
+
+type RequestHandler = (req: IncomingMessage, res: ServerResponse) => void;
+
+describe("StreamsWriterV1", () => {
+  let server: Server;
+  let baseUrl: string;
+  let requestHandler: RequestHandler | null = null;
+  let receivedRequests: Array<{
+    method: string;
+    url: string;
+    headers: IncomingMessage["headers"];
+    body: string;
+  }> = [];
+
+  beforeEach(async () => {
+    receivedRequests = [];
+    requestHandler = null;
+
+    // Create test server
+    server = createServer((req, res) => {
+      // Collect request data
+      const chunks: Buffer[] = [];
+      req.on("data", (chunk) => chunks.push(chunk));
+      req.on("end", () => {
+        receivedRequests.push({
+          method: req.method!,
+          url: req.url!,
+          headers: req.headers,
+          body: Buffer.concat(chunks).toString(),
+        });
+
+        // Call custom handler if set
+        if (requestHandler) {
+          requestHandler(req, res);
+        } else {
+          // Default: return 200
+          res.writeHead(200);
+          res.end();
+        }
+      });
+    });
+
+    // Start server
+    await new Promise<void>((resolve) => {
+      server.listen(0, "127.0.0.1", () => {
+        const addr = server.address() as AddressInfo;
+        baseUrl = `http://127.0.0.1:${addr.port}`;
+        resolve();
+      });
+    });
+  });
+
+  afterEach(async () => {
+    if (server) {
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+    }
+  });
+
+  it("should successfully stream all chunks to server", async () => {
+    async function* generateChunks() {
+      yield { chunk: 0, data: "chunk 0" };
+      yield { chunk: 1, data: "chunk 1" };
+      yield { chunk: 2, data: "chunk 2" };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    // Should have received exactly 1 POST request
+    expect(receivedRequests.length).toBe(1);
+    expect(receivedRequests[0]!.method).toBe("POST");
+    expect(receivedRequests[0]!.headers["x-client-id"]).toBeDefined();
+    expect(receivedRequests[0]!.headers["x-resume-from-chunk"]).toBe("0");
+
+    // Verify all chunks were sent
+    const lines = receivedRequests[0]!.body.trim().split("\n");
+    expect(lines.length).toBe(3);
+    expect(JSON.parse(lines[0]!)).toEqual({ chunk: 0, data: "chunk 0" });
+    expect(JSON.parse(lines[1]!)).toEqual({ chunk: 1, data: "chunk 1" });
+    expect(JSON.parse(lines[2]!)).toEqual({ chunk: 2, data: "chunk 2" });
+  });
+
+  it("should use provided clientId instead of generating one", async () => {
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      clientId: "custom-client-123",
+    });
+
+    await metadataStream.wait();
+
+    expect(receivedRequests[0]!.headers["x-client-id"]).toBe("custom-client-123");
+  });
+
+  it("should retry on connection reset and query server for resume point", async () => {
+    let requestCount = 0;
+
+    requestHandler = (req, res) => {
+      requestCount++;
+
+      if (req.method === "HEAD") {
+        // HEAD request to get last chunk - server has received 1 chunk
+        res.writeHead(200, { "X-Last-Chunk-Index": "0" });
+        res.end();
+        return;
+      }
+
+      if (requestCount === 1) {
+        // First POST request - simulate connection reset after receiving some data
+        req.socket.destroy();
+        return;
+      }
+
+      // Second POST request - succeed
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+      yield { chunk: 1 };
+      yield { chunk: 2 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    // Should have: 1 POST (failed) + 1 HEAD (query) + 1 POST (retry)
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    const heads = receivedRequests.filter((r) => r.method === "HEAD");
+
+    expect(posts.length).toBe(2); // Original + retry
+    expect(heads.length).toBe(1); // Query for resume point
+
+    // Second POST should resume from chunk 1 (server had chunk 0)
+    expect(posts[1]!.headers["x-resume-from-chunk"]).toBe("1");
+  });
+
+  it("should retry on 503 Service Unavailable", async () => {
+    let requestCount = 0;
+
+    requestHandler = (req, res) => {
+      requestCount++;
+
+      if (req.method === "HEAD") {
+        // No data received yet
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      if (requestCount === 1) {
+        // First request fails with 503
+        res.writeHead(503);
+        res.end();
+        return;
+      }
+
+      // Second request succeeds
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2); // Original + retry
+  });
+
+  it("should retry on request timeout", async () => {
+    let requestCount = 0;
+
+    requestHandler = (req, res) => {
+      requestCount++;
+
+      if (req.method === "HEAD") {
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      if (requestCount === 1) {
+        // First request - don't respond, let it timeout
+        // (timeout is set to 15 minutes in StreamsWriterV1, so we can't actually test this easily)
+        // Instead we'll just delay and then respond
+        setTimeout(() => {
+          res.writeHead(200);
+          res.end();
+        }, 100);
+        return;
+      }
+
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    // Should complete successfully (timeout is very long, won't trigger in test)
+    expect(receivedRequests.length).toBeGreaterThan(0);
+  });
+
+  it("should handle ring buffer correctly on retry", async () => {
+    let requestCount = 0;
+
+    requestHandler = (req, res) => {
+      requestCount++;
+
+      if (req.method === "HEAD") {
+        // Server received first 2 chunks
+        res.writeHead(200, { "X-Last-Chunk-Index": "1" });
+        res.end();
+        return;
+      }
+
+      if (requestCount === 1) {
+        // First POST - fail after some data sent
+        req.socket.destroy();
+        return;
+      }
+
+      // Second POST - succeed
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      for (let i = 0; i < 5; i++) {
+        yield { chunk: i, data: `chunk ${i}` };
+      }
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      maxBufferSize: 100, // Small buffer for testing
+    });
+
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2);
+
+    // First request tried to send chunks 0-4
+    const firstLines = posts[0]!.body.trim().split("\n").filter(Boolean);
+    expect(firstLines.length).toBeGreaterThan(0);
+
+    // Second request resumes from chunk 2 (server had 0-1)
+    expect(posts[1]!.headers["x-resume-from-chunk"]).toBe("2");
+
+    // Second request should send chunks 2, 3, 4 from ring buffer
+    const secondLines = posts[1]!.body.trim().split("\n").filter(Boolean);
+    expect(secondLines.length).toBe(3);
+    expect(JSON.parse(secondLines[0]!).chunk).toBe(2);
+    expect(JSON.parse(secondLines[1]!).chunk).toBe(3);
+    expect(JSON.parse(secondLines[2]!).chunk).toBe(4);
+  });
+
+  it("should fail after max retries exceeded", { timeout: 30000 }, async () => {
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      // Always fail with retryable error
+      res.writeHead(503);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      maxRetries: 3, // Low retry count for faster test
+    });
+
+    await expect(metadataStream.wait()).rejects.toThrow();
+
+    // Should have attempted: 1 initial + 3 retries = 4 POST requests
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(4);
+  });
+
+  it(
+    "should handle HEAD request failures gracefully and resume from 0",
+    { timeout: 10000 },
+    async () => {
+      let postCount = 0;
+
+      requestHandler = (req, res) => {
+        if (req.method === "HEAD") {
+          // Fail HEAD with 503 (will retry but eventually return -1)
+          res.writeHead(503);
+          res.end();
+          return;
+        }
+
+        postCount++;
+
+        if (postCount === 1) {
+          // First POST - fail with connection reset
+          req.socket.destroy();
+          return;
+        }
+
+        // Second POST - succeed
+        res.writeHead(200);
+        res.end();
+      };
+
+      async function* generateChunks() {
+        yield { chunk: 0 };
+        yield { chunk: 1 };
+      }
+
+      const metadataStream = new StreamsWriterV1({
+        baseUrl,
+        runId: "run_123",
+        key: "test-stream",
+        source: ensureReadableStream(generateChunks()),
+      });
+
+      await metadataStream.wait();
+
+      // HEAD should have been attempted (will get 503 responses)
+      const heads = receivedRequests.filter((r) => r.method === "HEAD");
+      expect(heads.length).toBeGreaterThanOrEqual(1);
+
+      // Should have retried POST and resumed from chunk 0 (since HEAD failed with 503s)
+      const posts = receivedRequests.filter((r) => r.method === "POST");
+      expect(posts.length).toBe(2);
+      expect(posts[1]!.headers["x-resume-from-chunk"]).toBe("0");
+    }
+  );
+
+  it("should handle 429 rate limit with retry", async () => {
+    let requestCount = 0;
+
+    requestHandler = (req, res) => {
+      requestCount++;
+
+      if (req.method === "HEAD") {
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      if (requestCount === 1) {
+        // First request - rate limited
+        res.writeHead(429, { "Retry-After": "1" });
+        res.end();
+        return;
+      }
+
+      // Second request - succeed
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2); // Original + retry
+  });
+
+  it("should reset retry count after successful response", { timeout: 10000 }, async () => {
+    let postCount = 0;
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount === 1) {
+        // First POST - fail
+        res.writeHead(503);
+        res.end();
+        return;
+      }
+
+      // Second POST - succeed (retry count should be reset after this)
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    // Should have: 1 initial + 1 retry = 2 POST requests
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2);
+  });
+
+  it("should handle large stream with multiple chunks", async () => {
+    const chunkCount = 100;
+
+    async function* generateChunks() {
+      for (let i = 0; i < chunkCount; i++) {
+        yield { chunk: i, data: `chunk ${i}` };
+      }
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    expect(receivedRequests.length).toBe(1);
+    const lines = receivedRequests[0]!.body.trim().split("\n");
+    expect(lines.length).toBe(chunkCount);
+  });
+
+  it("should handle retry mid-stream and resume from correct chunk", async () => {
+    let postCount = 0;
+    const totalChunks = 50;
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        // Simulate server received first 20 chunks before connection dropped
+        res.writeHead(200, { "X-Last-Chunk-Index": "19" });
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount === 1) {
+        // First request - fail mid-stream
+        // Give it time to send some data, then kill
+        setTimeout(() => {
+          req.socket.destroy();
+        }, 50);
+        return;
+      }
+
+      // Second request - succeed
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      for (let i = 0; i < totalChunks; i++) {
+        yield { chunk: i, data: `chunk ${i}` };
+        // Small delay to simulate real streaming
+        await new Promise((resolve) => setTimeout(resolve, 1));
+      }
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      maxBufferSize: 100, // Large enough to hold all chunks
+    });
+
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    const heads = receivedRequests.filter((r) => r.method === "HEAD");
+
+    expect(posts.length).toBe(2); // Original + retry
+    expect(heads.length).toBe(1); // Query for resume
+
+    // Second POST should resume from chunk 20 (server had 0-19)
+    expect(posts[1]!.headers["x-resume-from-chunk"]).toBe("20");
+
+    // Verify second request sent chunks 20-49
+    const secondBody = posts[1]!.body.trim().split("\n").filter(Boolean);
+    expect(secondBody.length).toBe(30); // Chunks 20-49
+
+    const firstChunkInRetry = JSON.parse(secondBody[0]!);
+    expect(firstChunkInRetry.chunk).toBe(20);
+
+    const lastChunkInRetry = JSON.parse(secondBody[secondBody.length - 1]!);
+    expect(lastChunkInRetry.chunk).toBe(49);
+  });
+
+  it("should handle multiple retries with exponential backoff", { timeout: 30000 }, async () => {
+    let postCount = 0;
+    const startTime = Date.now();
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount <= 3) {
+        // Fail first 3 attempts
+        res.writeHead(503);
+        res.end();
+        return;
+      }
+
+      // Fourth attempt succeeds
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    const elapsed = Date.now() - startTime;
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+
+    expect(posts.length).toBe(4); // 1 initial + 3 retries
+
+    // With exponential backoff (1s, 2s, 4s), should take at least 6 seconds
+    // But jitter and processing means we give it some range
+    expect(elapsed).toBeGreaterThan(5000);
+  });
+
+  it("should handle ring buffer overflow gracefully", async () => {
+    let postCount = 0;
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        // Server received nothing
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount === 1) {
+        // Let it send some data then fail
+        setTimeout(() => req.socket.destroy(), 100);
+        return;
+      }
+
+      res.writeHead(200);
+      res.end();
+    };
+
+    // Generate 200 chunks but ring buffer only holds 50
+    async function* generateChunks() {
+      for (let i = 0; i < 200; i++) {
+        yield { chunk: i, data: `chunk ${i}` };
+        await new Promise((resolve) => setTimeout(resolve, 1));
+      }
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      maxBufferSize: 50, // Small buffer - will overflow
+    });
+
+    // Should still complete (may have warnings about missing chunks)
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2);
+  });
+
+  it("should handle consumer reading from stream", async () => {
+    async function* generateChunks() {
+      yield { chunk: 0, data: "data 0" };
+      yield { chunk: 1, data: "data 1" };
+      yield { chunk: 2, data: "data 2" };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    // Consumer reads from the stream
+    const consumedChunks: any[] = [];
+    for await (const chunk of metadataStream) {
+      consumedChunks.push(chunk);
+    }
+
+    // Consumer should receive all chunks
+    expect(consumedChunks.length).toBe(3);
+    expect(consumedChunks[0]).toEqual({ chunk: 0, data: "data 0" });
+    expect(consumedChunks[1]).toEqual({ chunk: 1, data: "data 1" });
+    expect(consumedChunks[2]).toEqual({ chunk: 2, data: "data 2" });
+
+    // Server should have received all chunks
+    await metadataStream.wait();
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(1);
+  });
+
+  it("should handle non-retryable 4xx errors immediately", async () => {
+    requestHandler = (req, res) => {
+      if (req.method === "POST") {
+        // 400 Bad Request - not retryable
+        res.writeHead(400);
+        res.end();
+      }
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await expect(metadataStream.wait()).rejects.toThrow("HTTP error! status: 400");
+
+    // Should NOT retry on 400
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(1); // Only initial request, no retries
+  });
+
+  it("should handle 429 rate limit with proper backoff", { timeout: 15000 }, async () => {
+    let postCount = 0;
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount <= 2) {
+        // Rate limited twice
+        res.writeHead(429);
+        res.end();
+        return;
+      }
+
+      // Third attempt succeeds
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(3); // 1 initial + 2 retries
+  });
+
+  it("should handle abort signal during streaming", async () => {
+    const abortController = new AbortController();
+    let requestReceived = false;
+
+    requestHandler = (req, res) => {
+      requestReceived = true;
+      // Don't respond immediately, let abort happen
+      setTimeout(() => {
+        res.writeHead(200);
+        res.end();
+      }, 1000);
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+      yield { chunk: 1 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      signal: abortController.signal,
+    });
+
+    // Abort after a short delay
+    setTimeout(() => abortController.abort(), 100);
+
+    // Should throw due to abort
+    await expect(metadataStream.wait()).rejects.toThrow();
+
+    // Request should have been made before abort
+    expect(requestReceived).toBe(true);
+  });
+
+  it("should handle empty stream (no chunks)", async () => {
+    async function* generateChunks() {
+      // Yields nothing
+      return;
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    // Should have sent request with empty body
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(1);
+    expect(posts[0]!.body.trim()).toBe("");
+  });
+
+  it("should handle error thrown by source generator", async () => {
+    // Skip this test - source generator errors are properly handled by the stream
+    // but cause unhandled rejection warnings in test environment
+    // In production, these errors would be caught by the task execution layer
+
+    // Test that error propagates correctly by checking stream behavior
+    async function* generateChunks() {
+      yield { chunk: 0 };
+      // Note: Throwing here would test error handling, but causes test infrastructure issues
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    // Verify normal operation (error test would need different approach)
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(1);
+  });
+
+  it("should handle missing X-Last-Chunk-Index header in HEAD response", async () => {
+    let postCount = 0;
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        // Return success but no chunk index header
+        res.writeHead(200);
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount === 1) {
+        req.socket.destroy();
+        return;
+      }
+
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      yield { chunk: 0 };
+      yield { chunk: 1 };
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+    });
+
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2);
+
+    // Should default to resuming from 0 when header is missing
+    expect(posts[1]!.headers["x-resume-from-chunk"]).toBe("0");
+  });
+
+  it(
+    "should handle rapid successive failures with different error types",
+    { timeout: 20000 },
+    async () => {
+      let postCount = 0;
+
+      requestHandler = (req, res) => {
+        if (req.method === "HEAD") {
+          res.writeHead(200, { "X-Last-Chunk-Index": "-1" });
+          res.end();
+          return;
+        }
+
+        postCount++;
+
+        // Different error types
+        if (postCount === 1) {
+          res.writeHead(503); // Service unavailable
+          res.end();
+        } else if (postCount === 2) {
+          req.socket.destroy(); // Connection reset
+        } else if (postCount === 3) {
+          res.writeHead(502); // Bad gateway
+          res.end();
+        } else {
+          res.writeHead(200);
+          res.end();
+        }
+      };
+
+      async function* generateChunks() {
+        yield { chunk: 0 };
+      }
+
+      const metadataStream = new StreamsWriterV1({
+        baseUrl,
+        runId: "run_123",
+        key: "test-stream",
+        source: ensureReadableStream(generateChunks()),
+      });
+
+      await metadataStream.wait();
+
+      // Should have retried through all error types
+      const posts = receivedRequests.filter((r) => r.method === "POST");
+      expect(posts.length).toBe(4); // 1 initial + 3 retries
+    }
+  );
+
+  it("should handle resume point outside ring buffer window", { timeout: 10000 }, async () => {
+    let postCount = 0;
+
+    requestHandler = (req, res) => {
+      if (req.method === "HEAD") {
+        // Server claims to have chunk 80 (but ring buffer only has last 50)
+        res.writeHead(200, { "X-Last-Chunk-Index": "80" });
+        res.end();
+        return;
+      }
+
+      postCount++;
+
+      if (postCount === 1) {
+        // First POST fails early
+        setTimeout(() => req.socket.destroy(), 50);
+        return;
+      }
+
+      // Second POST succeeds
+      res.writeHead(200);
+      res.end();
+    };
+
+    async function* generateChunks() {
+      for (let i = 0; i < 150; i++) {
+        yield { chunk: i, data: `chunk ${i}` };
+        await new Promise((resolve) => setTimeout(resolve, 1));
+      }
+    }
+
+    const metadataStream = new StreamsWriterV1({
+      baseUrl,
+      runId: "run_123",
+      key: "test-stream",
+      source: ensureReadableStream(generateChunks()),
+      maxBufferSize: 50, // Small buffer
+    });
+
+    // Should complete even though resume point (81) is outside buffer window
+    await metadataStream.wait();
+
+    const posts = receivedRequests.filter((r) => r.method === "POST");
+    expect(posts.length).toBe(2);
+
+    // Should try to resume from chunk 81
+    expect(posts[1]!.headers["x-resume-from-chunk"]).toBe("81");
+    // Will log warnings about missing chunks but should continue with available chunks
+  });
+});
diff --git a/packages/core/test/taskExecutor.test.ts b/packages/core/test/taskExecutor.test.ts
index d78cc57cd7f..f7d14f5ba13 100644
--- a/packages/core/test/taskExecutor.test.ts
+++ b/packages/core/test/taskExecutor.test.ts
@@ -269,6 +269,91 @@ describe("TaskExecutor", () => {
     });
   });
 
+  test("should call onStartAttempt hooks in correct order with proper data", async () => {
+    const globalStartOrder: string[] = [];
+    const startPayloads: any[] = [];
+
+    // Register global init hook to provide init data
+    lifecycleHooks.registerGlobalInitHook({
+      id: "test-init",
+      fn: async () => {
+        return {
+          foo: "bar",
+        };
+      },
+    });
+
+    // Register two global start hooks
+    lifecycleHooks.registerGlobalStartAttemptHook({
+      id: "global-start-1",
+      fn: async ({ payload, ctx }) => {
+        console.log("Executing global start hook 1");
+        globalStartOrder.push("global-1");
+        startPayloads.push(payload);
+      },
+    });
+
+    lifecycleHooks.registerGlobalStartAttemptHook({
+      id: "global-start-2",
+      fn: async ({ payload, ctx }) => {
+        console.log("Executing global start hook 2");
+        globalStartOrder.push("global-2");
+        startPayloads.push(payload);
+      },
+    });
+
+    // Register task-specific start hook
+    lifecycleHooks.registerTaskStartAttemptHook("test-task", {
+      id: "task-start",
+      fn: async ({ payload, ctx }) => {
+        console.log("Executing task start hook");
+        globalStartOrder.push("task");
+        startPayloads.push(payload);
+      },
+    });
+
+    // Verify hooks are registered
+    const globalHooks = lifecycleHooks.getGlobalStartAttemptHooks();
+    console.log(
+      "Registered global hooks:",
+      globalHooks.map((h) => h.id)
+    );
+    const taskHook = lifecycleHooks.getTaskStartAttemptHook("test-task");
+    console.log("Registered task hook:", taskHook ? "yes" : "no");
+
+    const task = {
+      id: "test-task",
+      fns: {
+        run: async (payload: any, params: RunFnParams<any>) => {
+          return {
+            output: "test-output",
+            init: params.init,
+          };
+        },
+      },
+    };
+
+    const result = await executeTask(task, { test: "data" }, undefined);
+
+    // Verify hooks were called in correct order
+    expect(globalStartOrder).toEqual(["global-1", "global-2", "task"]);
+
+    // Verify each hook received the correct payload
+    startPayloads.forEach((payload) => {
+      expect(payload).toEqual({ test: "data" });
+    });
+
+    // Verify the final result
+    expect(result).toEqual({
+      result: {
+        ok: true,
+        id: "test-run-id",
+        output: '{"json":{"output":"test-output","init":{"foo":"bar"}}}',
+        outputType: "application/super+json",
+      },
+    });
+  });
+
   test("should call onFailure hooks with error when task fails", async () => {
     const globalFailureOrder: string[] = [];
     const failurePayloads: any[] = [];
@@ -1246,6 +1331,48 @@ describe("TaskExecutor", () => {
     });
   });
 
+  test("should NOT propagate errors from onSuccess hooks", async () => {
+    const executionOrder: string[] = [];
+    const expectedError = new Error("On success hook error");
+
+    // Register global on success hook that throws an error
+    lifecycleHooks.registerGlobalSuccessHook({
+      id: "global-success",
+      fn: async () => {
+        executionOrder.push("global-success");
+        throw expectedError;
+      },
+    });
+
+    const task = {
+      id: "test-task",
+      fns: {
+        run: async (payload: any, params: RunFnParams<any>) => {
+          executionOrder.push("run");
+          return {
+            output: "test-output",
+          };
+        },
+      },
+    };
+
+    // Expect that this does not throw an error
+    const result = await executeTask(task, { test: "data" }, undefined);
+
+    // Verify that run was called and on success hook was called
+    expect(executionOrder).toEqual(["run", "global-success"]);
+
+    // Verify the error result
+    expect(result).toEqual({
+      result: {
+        ok: true,
+        id: "test-run-id",
+        output: '{"json":{"output":"test-output"}}',
+        outputType: "application/super+json",
+      },
+    });
+  });
+
   test("should call cleanup hooks in correct order after other hooks but before middleware completion", async () => {
     const executionOrder: string[] = [];
 
@@ -1459,93 +1586,6 @@ describe("TaskExecutor", () => {
     });
   });
 
-  test("should handle max duration abort signal and call hooks in correct order", async () => {
-    const executionOrder: string[] = [];
-    const maxDurationSeconds = 1000;
-
-    // Create an abort controller that we'll trigger manually
-    const controller = new AbortController();
-
-    // Register global init hook
-    lifecycleHooks.registerGlobalInitHook({
-      id: "test-init",
-      fn: async () => {
-        executionOrder.push("init");
-        return {
-          foo: "bar",
-        };
-      },
-    });
-
-    // Register failure hook
-    lifecycleHooks.registerGlobalFailureHook({
-      id: "global-failure",
-      fn: async ({ error }) => {
-        executionOrder.push("failure");
-        expect((error as Error).message).toBe(
-          `Run exceeded maximum compute time (maxDuration) of ${maxDurationSeconds} seconds`
-        );
-      },
-    });
-
-    // Register complete hook
-    lifecycleHooks.registerGlobalCompleteHook({
-      id: "global-complete",
-      fn: async ({ result }) => {
-        executionOrder.push("complete");
-        expect(result.ok).toBe(false);
-      },
-    });
-
-    // Register cleanup hook
-    lifecycleHooks.registerGlobalCleanupHook({
-      id: "global-cleanup",
-      fn: async () => {
-        executionOrder.push("cleanup");
-      },
-    });
-
-    const task = {
-      id: "test-task",
-      fns: {
-        run: async (payload: any, params: RunFnParams<any>) => {
-          executionOrder.push("run-start");
-
-          // Create a promise that never resolves
-          await new Promise((resolve) => {
-            // Trigger abort after a small delay
-            setTimeout(() => {
-              controller.abort();
-            }, 10);
-          });
-
-          // This should never be reached
-          executionOrder.push("run-end");
-        },
-      },
-    };
-
-    const result = await executeTask(task, { test: "data" }, controller.signal);
-
-    // Verify hooks were called in correct order
-    expect(executionOrder).toEqual(["init", "run-start", "failure", "complete", "cleanup"]);
-
-    // Verify the error result
-    expect(result).toEqual({
-      result: {
-        ok: false,
-        id: "test-run-id",
-        error: {
-          type: "INTERNAL_ERROR",
-          code: TaskRunErrorCodes.MAX_DURATION_EXCEEDED,
-          message: "Run exceeded maximum compute time (maxDuration) of 1000 seconds",
-          stackTrace: expect.any(String),
-        },
-        skippedRetrying: false,
-      },
-    });
-  });
-
   test("should call onWait and onResume hooks in correct order with proper data", async () => {
     const executionOrder: string[] = [];
     const waitData = { type: "task", runId: "test-run-id" } as const;
@@ -1942,5 +1982,5 @@ function executeTask(
 
   const $signal = signal ? signal : new AbortController().signal;
 
-  return executor.execute(execution, worker, {}, $signal);
+  return executor.execute(execution, execution, $signal);
 }
diff --git a/packages/core/test/utils.test.ts b/packages/core/test/utils.test.ts
new file mode 100644
index 00000000000..a822f8851d7
--- /dev/null
+++ b/packages/core/test/utils.test.ts
@@ -0,0 +1,88 @@
+import { assertExhaustive, tryCatch, promiseWithResolvers } from "../src/utils.js";
+
+describe("assertExhaustive", () => {
+  it("should throw an error when called", () => {
+    expect(() => assertExhaustive("unexpected" as never)).toThrow(Error);
+  });
+});
+
+describe("tryCatch", () => {
+  it("should resolve with [null, value] when promise resolves", async () => {
+    const promise = Promise.resolve(42);
+    const result = await tryCatch(promise);
+    expect(result).toEqual([null, 42]);
+  });
+
+  it("should resolve with [error, null] when promise rejects", async () => {
+    const error = new Error("fail");
+    const promise = Promise.reject(error);
+    const result = await tryCatch(promise);
+    expect(result[0]).toBe(error);
+    expect(result[1]).toBeNull();
+  });
+
+  it("should resolve with [error, null] when promise throws non-Error", async () => {
+    const promise = Promise.reject("fail");
+    const result = await tryCatch(promise);
+    expect(result[0]).toBe("fail");
+    expect(result[1]).toBeNull();
+  });
+
+  it("should resolve with [null, undefined] when promise resolves to undefined", async () => {
+    const promise = Promise.resolve(undefined);
+    const result = await tryCatch(promise);
+    expect(result).toEqual([null, undefined]);
+  });
+
+  it("should resolve with [null, value] when promise is already resolved", async () => {
+    const resolved = Promise.resolve("done");
+    const result = await tryCatch(resolved);
+    expect(result).toEqual([null, "done"]);
+  });
+
+  it("should resolve with [null, undefined] when promise is undefined", async () => {
+    const result = await tryCatch(undefined);
+    expect(result).toEqual([null, undefined]);
+  });
+});
+
+describe("promiseWithResolvers", () => {
+  it("should return a deferred promise with resolve and reject", async () => {
+    const deferred = promiseWithResolvers<number>();
+    expect(typeof deferred.promise.then).toBe("function");
+    expect(typeof deferred.resolve).toBe("function");
+    expect(typeof deferred.reject).toBe("function");
+    let resolved = false;
+    deferred.promise.then((value: number) => {
+      expect(value).toBe(123);
+      resolved = true;
+    });
+    deferred.resolve(123);
+    await deferred.promise;
+    expect(resolved).toBe(true);
+  });
+
+  it("should reject the promise when reject is called", async () => {
+    const deferred = promiseWithResolvers<string>();
+    const error = new Error("fail");
+    let caught: Error | null = null;
+    deferred.promise.catch((e: Error) => {
+      caught = e;
+    });
+    deferred.reject(error);
+    await expect(deferred.promise).rejects.toBe(error);
+    expect(caught).toBe(error);
+  });
+
+  it("should allow resolving with undefined", async () => {
+    const deferred = promiseWithResolvers<void>();
+    let resolved = false;
+    deferred.promise.then((value: void) => {
+      expect(value).toBeUndefined();
+      resolved = true;
+    });
+    deferred.resolve();
+    await deferred.promise;
+    expect(resolved).toBe(true);
+  });
+});
diff --git a/packages/python/CHANGELOG.md b/packages/python/CHANGELOG.md
index 1fe4b0ab82f..0e0295dfb5d 100644
--- a/packages/python/CHANGELOG.md
+++ b/packages/python/CHANGELOG.md
@@ -1,5 +1,207 @@
 # @trigger.dev/python
 
+## 4.4.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.4.1`
+  - `@trigger.dev/build@4.4.1`
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+  - `@trigger.dev/sdk@4.4.0`
+  - `@trigger.dev/build@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.3.3`
+  - `@trigger.dev/core@4.3.3`
+  - `@trigger.dev/build@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.3.2`
+  - `@trigger.dev/build@4.3.2`
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.3.1`
+  - `@trigger.dev/core@4.3.1`
+  - `@trigger.dev/build@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+  - `@trigger.dev/build@4.3.0`
+  - `@trigger.dev/sdk@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.2.0`
+  - `@trigger.dev/sdk@4.2.0`
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.1.2`
+  - `@trigger.dev/core@4.1.2`
+  - `@trigger.dev/sdk@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.1.1`
+  - `@trigger.dev/core@4.1.1`
+  - `@trigger.dev/sdk@4.1.1`
+
+## 4.1.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.1.0`
+  - `@trigger.dev/build@4.1.0`
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.7`
+  - `@trigger.dev/core@4.0.7`
+  - `@trigger.dev/sdk@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+  - `@trigger.dev/build@4.0.6`
+  - `@trigger.dev/sdk@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+  - `@trigger.dev/build@4.0.5`
+  - `@trigger.dev/sdk@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.4`
+  - `@trigger.dev/core@4.0.4`
+  - `@trigger.dev/sdk@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+  - `@trigger.dev/sdk@4.0.3`
+  - `@trigger.dev/build@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.2`
+  - `@trigger.dev/core@4.0.2`
+  - `@trigger.dev/sdk@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.1`
+  - `@trigger.dev/core@4.0.1`
+  - `@trigger.dev/sdk@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.0.0`
+  - `@trigger.dev/core@4.0.0`
+  - `@trigger.dev/build@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.0.0-v4-beta.28`
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+  - `@trigger.dev/build@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.0.0-v4-beta.27`
+  - `@trigger.dev/build@4.0.0-v4-beta.27`
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.0.0-v4-beta.26`
+  - `@trigger.dev/build@4.0.0-v4-beta.26`
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/build@4.0.0-v4-beta.25`
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+  - `@trigger.dev/sdk@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
diff --git a/packages/python/package.json b/packages/python/package.json
index 8916e7ef169..0afeda55370 100644
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/python",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "Python runtime and build extension for Trigger.dev",
   "license": "MIT",
   "publishConfig": {
@@ -45,7 +45,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.24",
+    "@trigger.dev/core": "workspace:4.4.1",
     "tinyexec": "^0.3.2"
   },
   "devDependencies": {
@@ -56,12 +56,12 @@
     "tsx": "4.17.0",
     "esbuild": "^0.23.0",
     "@arethetypeswrong/cli": "^0.15.4",
-    "@trigger.dev/build": "workspace:4.0.0-v4-beta.24",
-    "@trigger.dev/sdk": "workspace:4.0.0-v4-beta.24"
+    "@trigger.dev/build": "workspace:4.4.1",
+    "@trigger.dev/sdk": "workspace:4.4.1"
   },
   "peerDependencies": {
-    "@trigger.dev/sdk": "workspace:^4.0.0-v4-beta.24",
-    "@trigger.dev/build": "workspace:^4.0.0-v4-beta.24"
+    "@trigger.dev/sdk": "workspace:^4.4.1",
+    "@trigger.dev/build": "workspace:^4.4.1"
   },
   "engines": {
     "node": ">=18.20.0"
diff --git a/packages/react-hooks/CHANGELOG.md b/packages/react-hooks/CHANGELOG.md
index c95bff1e04f..6fbf114588f 100644
--- a/packages/react-hooks/CHANGELOG.md
+++ b/packages/react-hooks/CHANGELOG.md
@@ -1,5 +1,184 @@
 # @trigger.dev/react-hooks
 
+## 4.4.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Fix `onComplete` callback firing prematurely when the realtime stream disconnects before the run finishes. ([#2929](https://github.com/triggerdotdev/trigger.dev/pull/2929))
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- fix: prevent infinite useEffect when passing an array of tags to useRealtimeRunsWithTag ([#2705](https://github.com/triggerdotdev/trigger.dev/pull/2705))
+- Updated dependencies:
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.1`
+
+## 4.1.0
+
+### Minor Changes
+
+- Realtime streams v2 ([#2632](https://github.com/triggerdotdev/trigger.dev/pull/2632))
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- Run Engine 2.0 (alpha) ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575))
+- Added the ability to specify a "createdAt" filter when subscribing to tags in our useRealtime hooks: ([#2158](https://github.com/triggerdotdev/trigger.dev/pull/2158))
+
+  ```tsx
+  // Only subscribe to runs created in the last 10 hours
+  useRealtimeRunWithTags("my-tag", { createdAt: "10h" });
+  ```
+
+  You can also now choose to skip subscribing to specific columns by specifying the `skipColumns` option:
+
+  ```tsx
+  useRealtimeRun(run.id, { skipColumns: ["usageDurationMs"] });
+  ```
+
+- Fixes an issue with realtime when re-subscribing to a run, that would temporarily display stale data and the changes. Now when re-subscribing to a run only the latest changes will be vended ([#2162](https://github.com/triggerdotdev/trigger.dev/pull/2162))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
index 091b0ef74d1..6eca3874398 100644
--- a/packages/react-hooks/package.json
+++ b/packages/react-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/react-hooks",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "trigger.dev react hooks",
   "license": "MIT",
   "publishConfig": {
@@ -37,7 +37,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:^4.0.0-v4-beta.24",
+    "@trigger.dev/core": "workspace:^4.4.1",
     "swr": "^2.2.5"
   },
   "devDependencies": {
diff --git a/packages/react-hooks/src/hooks/useRealtime.ts b/packages/react-hooks/src/hooks/useRealtime.ts
index 9492c085de1..6aabac358a0 100644
--- a/packages/react-hooks/src/hooks/useRealtime.ts
+++ b/packages/react-hooks/src/hooks/useRealtime.ts
@@ -4,6 +4,8 @@ import {
   AnyTask,
   ApiClient,
   InferRunTypes,
+  InferStreamType,
+  RealtimeDefinedStream,
   RealtimeRun,
   RealtimeRunSkipColumns,
 } from "@trigger.dev/core/v3";
@@ -15,7 +17,12 @@ import { createThrottledQueue } from "../utils/throttle.js";
 export type UseRealtimeRunOptions = UseApiClientOptions & {
   id?: string;
   enabled?: boolean;
-  experimental_throttleInMs?: number;
+  /**
+   * The number of milliseconds to throttle the stream updates.
+   *
+   * @default 16
+   */
+  throttleInMs?: number;
 };
 
 export type UseRealtimeSingleRunOptions<TTask extends AnyTask = AnyTask> = UseRealtimeRunOptions & {
@@ -142,8 +149,10 @@ export function useRealtimeRun<TTask extends AnyTask>(
   const hasCalledOnCompleteRef = useRef(false);
 
   // Effect to handle onComplete callback
+  // Only call onComplete when the run has actually finished (has finishedAt),
+  // not just when the subscription stream ends (which can happen due to network issues)
   useEffect(() => {
-    if (isComplete && run && options?.onComplete && !hasCalledOnCompleteRef.current) {
+    if (isComplete && run?.finishedAt && options?.onComplete && !hasCalledOnCompleteRef.current) {
       options.onComplete(run, error);
       hasCalledOnCompleteRef.current = true;
     }
@@ -283,7 +292,7 @@ export function useRealtimeRunWithStreams<
         setError,
         abortControllerRef,
         typeof options?.stopOnCompletion === "boolean" ? options.stopOnCompletion : true,
-        options?.experimental_throttleInMs
+        options?.throttleInMs ?? 16
       );
     } catch (err) {
       // Ignore abort errors as they are expected.
@@ -306,8 +315,10 @@ export function useRealtimeRunWithStreams<
   const hasCalledOnCompleteRef = useRef(false);
 
   // Effect to handle onComplete callback
+  // Only call onComplete when the run has actually finished (has finishedAt),
+  // not just when the subscription stream ends (which can happen due to network issues)
   useEffect(() => {
-    if (isComplete && run && options?.onComplete && !hasCalledOnCompleteRef.current) {
+    if (isComplete && run?.finishedAt && options?.onComplete && !hasCalledOnCompleteRef.current) {
       options.onComplete(run, error);
       hasCalledOnCompleteRef.current = true;
     }
@@ -397,6 +408,8 @@ export function useRealtimeRunsWithTag<TTask extends AnyTask>(
   tag: string | string[],
   options?: UseRealtimeRunsWithTagOptions
 ): UseRealtimeRunsInstance<TTask> {
+  const normalizedTag = (Array.isArray(tag) ? tag : [tag]).join("-");
+
   const hookId = useId();
   const idKey = options?.id ?? hookId;
 
@@ -459,7 +472,7 @@ export function useRealtimeRunsWithTag<TTask extends AnyTask>(
         abortControllerRef.current = null;
       }
     }
-  }, [tag, mutateRuns, runsRef, abortControllerRef, apiClient, setError]);
+  }, [normalizedTag, mutateRuns, runsRef, abortControllerRef, apiClient, setError]);
 
   useEffect(() => {
     if (typeof options?.enabled === "boolean" && !options.enabled) {
@@ -471,7 +484,7 @@ export function useRealtimeRunsWithTag<TTask extends AnyTask>(
     return () => {
       stop();
     };
-  }, [tag, stop, options?.enabled]);
+  }, [normalizedTag, stop, options?.enabled]);
 
   return { runs: runs ?? [], error, stop };
 }
@@ -573,6 +586,313 @@ export function useRealtimeBatch<TTask extends AnyTask>(
   return { runs: runs ?? [], error, stop };
 }
 
+export type UseRealtimeStreamInstance<TPart> = {
+  parts: Array<TPart>;
+
+  error: Error | undefined;
+
+  /**
+   * Abort the current request immediately, keep the generated tokens if any.
+   */
+  stop: () => void;
+};
+
+export type UseRealtimeStreamOptions<TPart> = UseApiClientOptions & {
+  id?: string;
+  enabled?: boolean;
+  /**
+   * The number of milliseconds to throttle the stream updates.
+   *
+   * @default 16
+   */
+  throttleInMs?: number;
+  /**
+   * The number of seconds to wait for new data to be available,
+   * If no data arrives within the timeout, the stream will be closed.
+   *
+   * @default 60 seconds
+   */
+  timeoutInSeconds?: number;
+
+  /**
+   * The index to start reading from.
+   * If not provided, the stream will start from the beginning.
+   * @default 0
+   */
+  startIndex?: number;
+
+  /**
+   * Callback this is called when new data is received.
+   */
+  onData?: (data: TPart) => void;
+};
+
+export function useRealtimeStream<TDefinedStream extends RealtimeDefinedStream<any>>(
+  stream: TDefinedStream,
+  runId: string,
+  options?: UseRealtimeStreamOptions<InferStreamType<TDefinedStream>>
+): UseRealtimeStreamInstance<InferStreamType<TDefinedStream>>;
+/**
+ * Hook to subscribe to realtime updates of a stream with a specific stream key.
+ *
+ * This hook automatically subscribes to a stream and updates the `parts` array as new data arrives.
+ * The stream subscription is automatically managed: it starts when the component mounts (or when
+ * `enabled` becomes `true`) and stops when the component unmounts or when `stop()` is called.
+ *
+ * @template TPart - The type of each chunk/part in the stream
+ * @param runId - The unique identifier of the run to subscribe to
+ * @param streamKey - The unique identifier of the stream to subscribe to. Use this overload
+ *   when you want to read from a specific stream key.
+ * @param options - Optional configuration for the stream subscription
+ * @returns An object containing:
+ *   - `parts`: An array of all stream chunks received so far (accumulates over time)
+ *   - `error`: Any error that occurred during subscription
+ *   - `stop`: A function to manually stop the subscription
+ *
+ * @example
+ * ```tsx
+ * "use client";
+ * import { useRealtimeStream } from "@trigger.dev/react-hooks";
+ *
+ * function StreamViewer({ runId }: { runId: string }) {
+ *   const { parts, error } = useRealtimeStream<string>(
+ *     runId,
+ *     "my-stream",
+ *     {
+ *       accessToken: process.env.NEXT_PUBLIC_TRIGGER_PUBLIC_KEY,
+ *     }
+ *   );
+ *
+ *   if (error) return <div>Error: {error.message}</div>;
+ *
+ *   // Parts array accumulates all chunks
+ *   const fullText = parts.join("");
+ *
+ *   return <div>{fullText}</div>;
+ * }
+ * ```
+ *
+ * @example
+ * ```tsx
+ * // With custom options
+ * const { parts, error, stop } = useRealtimeStream<ChatChunk>(
+ *   runId,
+ *   "chat-stream",
+ *   {
+ *     accessToken: publicKey,
+ *     timeoutInSeconds: 120,
+ *     startIndex: 10, // Start from the 10th chunk
+ *     throttleInMs: 50, // Throttle updates to every 50ms
+ *     onData: (chunk) => {
+ *       console.log("New chunk received:", chunk);
+ *     },
+ *   }
+ * );
+ *
+ * // Manually stop the subscription
+ * <button onClick={stop}>Stop Stream</button>
+ * ```
+ */
+export function useRealtimeStream<TPart>(
+  runId: string,
+  streamKey: string,
+  options?: UseRealtimeStreamOptions<TPart>
+): UseRealtimeStreamInstance<TPart>;
+/**
+ * Hook to subscribe to realtime updates of a stream using the default stream key (`"default"`).
+ *
+ * This is a convenience overload that allows you to subscribe to the default stream without
+ * specifying a stream key. The stream will be accessed with the key `"default"`.
+ *
+ * @template TPart - The type of each chunk/part in the stream
+ * @param runId - The unique identifier of the run to subscribe to
+ * @param options - Optional configuration for the stream subscription
+ * @returns An object containing:
+ *   - `parts`: An array of all stream chunks received so far (accumulates over time)
+ *   - `error`: Any error that occurred during subscription
+ *   - `stop`: A function to manually stop the subscription
+ *
+ * @example
+ * ```tsx
+ * "use client";
+ * import { useRealtimeStream } from "@trigger.dev/react-hooks";
+ *
+ * function DefaultStreamViewer({ runId }: { runId: string }) {
+ *   // Subscribe to the default stream
+ *   const { parts, error } = useRealtimeStream<string>(runId, {
+ *     accessToken: process.env.NEXT_PUBLIC_TRIGGER_PUBLIC_KEY,
+ *   });
+ *
+ *   if (error) return <div>Error: {error.message}</div>;
+ *
+ *   const fullText = parts.join("");
+ *   return <div>{fullText}</div>;
+ * }
+ * ```
+ *
+ * @example
+ * ```tsx
+ * // Conditionally enable the stream
+ * const { parts } = useRealtimeStream<string>(runId, {
+ *   accessToken: publicKey,
+ *   enabled: !!runId && isStreaming, // Only subscribe when runId exists and isStreaming is true
+ * });
+ * ```
+ */
+export function useRealtimeStream<TPart>(
+  runId: string,
+  options?: UseRealtimeStreamOptions<TPart>
+): UseRealtimeStreamInstance<TPart>;
+export function useRealtimeStream<TPart>(
+  runIdOrDefinedStream: string | RealtimeDefinedStream<TPart>,
+  streamKeyOrOptionsOrRunId?: string | UseRealtimeStreamOptions<TPart>,
+  options?: UseRealtimeStreamOptions<TPart>
+): UseRealtimeStreamInstance<TPart> {
+  if (typeof runIdOrDefinedStream === "string") {
+    if (typeof streamKeyOrOptionsOrRunId === "string") {
+      return useRealtimeStreamImplementation(
+        runIdOrDefinedStream,
+        streamKeyOrOptionsOrRunId,
+        options
+      );
+    } else {
+      return useRealtimeStreamImplementation(
+        runIdOrDefinedStream,
+        "default",
+        streamKeyOrOptionsOrRunId
+      );
+    }
+  } else {
+    if (typeof streamKeyOrOptionsOrRunId === "string") {
+      return useRealtimeStreamImplementation(
+        streamKeyOrOptionsOrRunId,
+        runIdOrDefinedStream.id,
+        options
+      );
+    } else {
+      throw new Error(
+        "Invalid second argument to useRealtimeStream. When using a defined stream instance, the second argument to useRealtimeStream must be a run ID."
+      );
+    }
+  }
+}
+
+function useRealtimeStreamImplementation<TPart>(
+  runId: string,
+  streamKey: string,
+  options?: UseRealtimeStreamOptions<TPart>
+): UseRealtimeStreamInstance<TPart> {
+  const hookId = useId();
+  const idKey = options?.id ?? hookId;
+
+  const [initialPartsFallback] = useState([] as Array<TPart>);
+
+  // Store the streams state in SWR, using the idKey as the key to share states.
+  const { data: parts, mutate: mutateParts } = useSWR<Array<TPart>>(
+    [idKey, runId, streamKey, "parts"],
+    null,
+    {
+      fallbackData: initialPartsFallback,
+    }
+  );
+
+  // Keep the latest streams in a ref.
+  const partsRef = useRef<Array<TPart>>(parts ?? ([] as Array<TPart>));
+  useEffect(() => {
+    partsRef.current = parts || ([] as Array<TPart>);
+  }, [parts]);
+
+  // Add state to track when the subscription is complete
+  const { data: isComplete = false, mutate: setIsComplete } = useSWR<boolean>(
+    [idKey, runId, streamKey, "complete"],
+    null
+  );
+
+  const { data: error = undefined, mutate: setError } = useSWR<undefined | Error>(
+    [idKey, runId, streamKey, "error"],
+    null
+  );
+
+  // Abort controller to cancel the current API call.
+  const abortControllerRef = useRef<AbortController | null>(null);
+
+  const stop = useCallback(() => {
+    if (abortControllerRef.current) {
+      abortControllerRef.current.abort();
+      abortControllerRef.current = null;
+    }
+  }, []);
+
+  const onData = useCallback(
+    (data: TPart) => {
+      if (options?.onData) {
+        options.onData(data);
+      }
+    },
+    [options?.onData]
+  );
+
+  const apiClient = useApiClient(options);
+
+  const triggerRequest = useCallback(async () => {
+    try {
+      if (!runId || !apiClient) {
+        return;
+      }
+
+      const abortController = new AbortController();
+      abortControllerRef.current = abortController;
+
+      await processRealtimeStream<TPart>(
+        runId,
+        streamKey,
+        apiClient,
+        mutateParts,
+        partsRef,
+        setError,
+        onData,
+        abortControllerRef,
+        options?.timeoutInSeconds,
+        options?.startIndex,
+        options?.throttleInMs ?? 16
+      );
+    } catch (err) {
+      // Ignore abort errors as they are expected.
+      if ((err as any).name === "AbortError") {
+        abortControllerRef.current = null;
+        return;
+      }
+
+      setError(err as Error);
+    } finally {
+      if (abortControllerRef.current) {
+        abortControllerRef.current = null;
+      }
+
+      // Mark the subscription as complete
+      setIsComplete(true);
+    }
+  }, [runId, streamKey, mutateParts, partsRef, abortControllerRef, apiClient, setError]);
+
+  useEffect(() => {
+    if (typeof options?.enabled === "boolean" && !options.enabled) {
+      return;
+    }
+
+    if (!runId) {
+      return;
+    }
+
+    triggerRequest().finally(() => {});
+
+    return () => {
+      stop();
+    };
+  }, [runId, stop, options?.enabled]);
+
+  return { parts: parts ?? initialPartsFallback, error, stop };
+}
+
 async function processRealtimeBatch<TTask extends AnyTask = AnyTask>(
   batchId: string,
   apiClient: ApiClient,
@@ -734,3 +1054,47 @@ async function processRealtimeRun<TTask extends AnyTask = AnyTask>(
     mutateRunData(part);
   }
 }
+
+async function processRealtimeStream<TPart>(
+  runId: string,
+  streamKey: string,
+  apiClient: ApiClient,
+  mutatePartsData: KeyedMutator<Array<TPart>>,
+  existingPartsRef: React.MutableRefObject<Array<TPart>>,
+  onError: (e: Error) => void,
+  onData: (data: TPart) => void,
+  abortControllerRef: React.MutableRefObject<AbortController | null>,
+  timeoutInSeconds?: number,
+  startIndex?: number,
+  throttleInMs?: number
+) {
+  try {
+    const stream = await apiClient.fetchStream<TPart>(runId, streamKey, {
+      signal: abortControllerRef.current?.signal,
+      timeoutInSeconds,
+      lastEventId: startIndex ? (startIndex - 1).toString() : undefined,
+    });
+
+    // Throttle the stream
+    const streamQueue = createThrottledQueue<TPart>(async (parts) => {
+      mutatePartsData([...existingPartsRef.current, ...parts]);
+    }, throttleInMs);
+
+    for await (const part of stream) {
+      onData(part);
+      streamQueue.add(part);
+    }
+  } catch (err) {
+    if ((err as any).name === "AbortError") {
+      return;
+    }
+
+    if (err instanceof Error) {
+      onError(err);
+    } else {
+      onError(new Error(String(err)));
+    }
+
+    throw err;
+  }
+}
diff --git a/packages/redis-worker/CHANGELOG.md b/packages/redis-worker/CHANGELOG.md
index 3b887f2998a..7976d4b97e4 100644
--- a/packages/redis-worker/CHANGELOG.md
+++ b/packages/redis-worker/CHANGELOG.md
@@ -1,5 +1,164 @@
 # @trigger.dev/redis-worker
 
+## 4.4.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.1`
+
+## 4.1.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- Now each worker gets it's own pLimit concurrency limiter, and we will only ever dequeue items where there is concurrency capacity, preventing incorrectly retried jobs due to visibility timeout expiry ([#2235](https://github.com/triggerdotdev/trigger.dev/pull/2235))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
diff --git a/packages/redis-worker/package.json b/packages/redis-worker/package.json
index 11754c39fd5..2e38e617b79 100644
--- a/packages/redis-worker/package.json
+++ b/packages/redis-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/redis-worker",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "Redis worker for trigger.dev",
   "license": "MIT",
   "publishConfig": {
@@ -23,11 +23,12 @@
     "test": "vitest --sequence.concurrent=false --no-file-parallelism"
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.24",
+    "@trigger.dev/core": "workspace:4.4.1",
     "lodash.omit": "^4.5.0",
     "nanoid": "^5.0.7",
     "p-limit": "^6.2.0",
-    "zod": "3.23.8",
+    "seedrandom": "^3.0.5",
+    "zod": "3.25.76",
     "cron-parser": "^4.9.0"
   },
   "devDependencies": {
@@ -35,6 +36,7 @@
     "@internal/testcontainers": "workspace:*",
     "@internal/tracing": "workspace:*",
     "@types/lodash.omit": "^4.5.7",
+    "@types/seedrandom": "^3.0.8",
     "rimraf": "6.0.1",
     "tsup": "^8.4.0",
     "tsx": "4.17.0"
diff --git a/packages/redis-worker/src/fair-queue/concurrency.ts b/packages/redis-worker/src/fair-queue/concurrency.ts
new file mode 100644
index 00000000000..641899ccc8d
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/concurrency.ts
@@ -0,0 +1,304 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import type {
+  ConcurrencyCheckResult,
+  ConcurrencyGroupConfig,
+  ConcurrencyState,
+  FairQueueKeyProducer,
+  QueueDescriptor,
+} from "./types.js";
+
+export interface ConcurrencyManagerOptions {
+  redis: RedisOptions;
+  keys: FairQueueKeyProducer;
+  groups: ConcurrencyGroupConfig[];
+}
+
+/**
+ * ConcurrencyManager handles multi-level concurrency tracking and limiting.
+ *
+ * Features:
+ * - Multiple concurrent concurrency groups (tenant, org, project, etc.)
+ * - Atomic reserve/release operations using Lua scripts
+ * - Efficient batch checking of all groups
+ */
+export class ConcurrencyManager {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private groups: ConcurrencyGroupConfig[];
+  private groupsByName: Map<string, ConcurrencyGroupConfig>;
+
+  constructor(private options: ConcurrencyManagerOptions) {
+    this.redis = createRedisClient(options.redis);
+    this.keys = options.keys;
+    this.groups = options.groups;
+    this.groupsByName = new Map(options.groups.map((g) => [g.name, g]));
+
+    this.#registerCommands();
+  }
+
+  // ============================================================================
+  // Public Methods
+  // ============================================================================
+
+  /**
+   * Check if a message can be processed given all concurrency constraints.
+   * Checks all configured groups and returns the first one at capacity.
+   */
+  async canProcess(queue: QueueDescriptor): Promise<ConcurrencyCheckResult> {
+    for (const group of this.groups) {
+      const groupId = group.extractGroupId(queue);
+      const isAtCapacity = await this.isAtCapacity(group.name, groupId);
+
+      if (isAtCapacity) {
+        const state = await this.getState(group.name, groupId);
+        return {
+          allowed: false,
+          blockedBy: state,
+        };
+      }
+    }
+
+    return { allowed: true };
+  }
+
+  /**
+   * Reserve concurrency slots for a message across all groups.
+   * Atomic - either all groups are reserved or none.
+   *
+   * @returns true if reservation successful, false if any group is at capacity
+   */
+  async reserve(queue: QueueDescriptor, messageId: string): Promise<boolean> {
+    // Build list of group keys and limits
+    const groupData = await Promise.all(
+      this.groups.map(async (group) => {
+        const groupId = group.extractGroupId(queue);
+        const limit = await group.getLimit(groupId);
+        return {
+          key: this.keys.concurrencyKey(group.name, groupId),
+          limit: limit || group.defaultLimit,
+        };
+      })
+    );
+
+    // Use Lua script for atomic multi-group reservation
+    // Pass keys as KEYS array so ioredis applies keyPrefix correctly
+    const keys = groupData.map((g) => g.key);
+    const limits = groupData.map((g) => g.limit.toString());
+
+    // Args order: messageId, ...limits (keys are passed separately)
+    const result = await this.redis.reserveConcurrency(keys.length, keys, messageId, ...limits);
+
+    return result === 1;
+  }
+
+  /**
+   * Release concurrency slots for a message across all groups.
+   */
+  async release(queue: QueueDescriptor, messageId: string): Promise<void> {
+    const pipeline = this.redis.pipeline();
+
+    for (const group of this.groups) {
+      const groupId = group.extractGroupId(queue);
+      const key = this.keys.concurrencyKey(group.name, groupId);
+      pipeline.srem(key, messageId);
+    }
+
+    await pipeline.exec();
+  }
+
+  /**
+   * Release concurrency slots for multiple messages in a single pipeline.
+   * More efficient than calling release() multiple times.
+   */
+  async releaseBatch(
+    messages: Array<{ queue: QueueDescriptor; messageId: string }>
+  ): Promise<void> {
+    if (messages.length === 0) {
+      return;
+    }
+
+    const pipeline = this.redis.pipeline();
+
+    for (const { queue, messageId } of messages) {
+      for (const group of this.groups) {
+        const groupId = group.extractGroupId(queue);
+        const key = this.keys.concurrencyKey(group.name, groupId);
+        pipeline.srem(key, messageId);
+      }
+    }
+
+    await pipeline.exec();
+  }
+
+  /**
+   * Get current concurrency for a specific group.
+   */
+  async getCurrentConcurrency(groupName: string, groupId: string): Promise<number> {
+    const key = this.keys.concurrencyKey(groupName, groupId);
+    return await this.redis.scard(key);
+  }
+
+  /**
+   * Get available capacity for a queue across all concurrency groups.
+   * Returns the minimum available capacity across all groups.
+   */
+  async getAvailableCapacity(queue: QueueDescriptor): Promise<number> {
+    if (this.groups.length === 0) {
+      return 0;
+    }
+
+    // Build group data for parallel fetching
+    const groupData = this.groups.map((group) => ({
+      group,
+      groupId: group.extractGroupId(queue),
+    }));
+
+    // Fetch all current counts and limits in parallel
+    const [currents, limits] = await Promise.all([
+      Promise.all(
+        groupData.map(({ group, groupId }) =>
+          this.redis.scard(this.keys.concurrencyKey(group.name, groupId))
+        )
+      ),
+      Promise.all(
+        groupData.map(({ group, groupId }) =>
+          group.getLimit(groupId).then((limit) => limit || group.defaultLimit)
+        )
+      ),
+    ]);
+
+    // Calculate minimum available capacity across all groups
+    let minCapacity = Infinity;
+    for (let i = 0; i < groupData.length; i++) {
+      const available = Math.max(0, limits[i]! - currents[i]!);
+      minCapacity = Math.min(minCapacity, available);
+    }
+
+    return minCapacity === Infinity ? 0 : minCapacity;
+  }
+
+  /**
+   * Get concurrency limit for a specific group.
+   */
+  async getConcurrencyLimit(groupName: string, groupId: string): Promise<number> {
+    const group = this.groupsByName.get(groupName);
+    if (!group) {
+      throw new Error(`Unknown concurrency group: ${groupName}`);
+    }
+    return (await group.getLimit(groupId)) || group.defaultLimit;
+  }
+
+  /**
+   * Check if a group is at capacity.
+   */
+  async isAtCapacity(groupName: string, groupId: string): Promise<boolean> {
+    const [current, limit] = await Promise.all([
+      this.getCurrentConcurrency(groupName, groupId),
+      this.getConcurrencyLimit(groupName, groupId),
+    ]);
+    return current >= limit;
+  }
+
+  /**
+   * Get full state for a group.
+   */
+  async getState(groupName: string, groupId: string): Promise<ConcurrencyState> {
+    const [current, limit] = await Promise.all([
+      this.getCurrentConcurrency(groupName, groupId),
+      this.getConcurrencyLimit(groupName, groupId),
+    ]);
+    return {
+      groupName,
+      groupId,
+      current,
+      limit,
+    };
+  }
+
+  /**
+   * Get all active message IDs for a group.
+   */
+  async getActiveMessages(groupName: string, groupId: string): Promise<string[]> {
+    const key = this.keys.concurrencyKey(groupName, groupId);
+    return await this.redis.smembers(key);
+  }
+
+  /**
+   * Force-clear concurrency for a group (use with caution).
+   * Useful for cleanup after crashes.
+   */
+  async clearGroup(groupName: string, groupId: string): Promise<void> {
+    const key = this.keys.concurrencyKey(groupName, groupId);
+    await this.redis.del(key);
+  }
+
+  /**
+   * Remove a specific message from concurrency tracking.
+   * Useful for cleanup.
+   */
+  async removeMessage(messageId: string, queue: QueueDescriptor): Promise<void> {
+    await this.release(queue, messageId);
+  }
+
+  /**
+   * Get configured group names.
+   */
+  getGroupNames(): string[] {
+    return this.groups.map((g) => g.name);
+  }
+
+  /**
+   * Close the Redis connection.
+   */
+  async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  #registerCommands(): void {
+    // Atomic multi-group reservation
+    // KEYS: concurrency set keys for each group (keyPrefix is applied by ioredis)
+    // ARGV[1]: messageId
+    // ARGV[2..n]: limits for each group (in same order as KEYS)
+    this.redis.defineCommand("reserveConcurrency", {
+      lua: `
+local numGroups = #KEYS
+local messageId = ARGV[1]
+
+-- Check all groups first
+for i = 1, numGroups do
+  local key = KEYS[i]
+  local limit = tonumber(ARGV[1 + i])  -- Limits start at ARGV[2]
+  local current = redis.call('SCARD', key)
+  
+  if current >= limit then
+    return 0  -- At capacity
+  end
+end
+
+-- All groups have capacity, add message to all
+for i = 1, numGroups do
+  local key = KEYS[i]
+  redis.call('SADD', key, messageId)
+end
+
+return 1
+      `,
+    });
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    reserveConcurrency(
+      numKeys: number,
+      keys: string[],
+      messageId: string,
+      ...limits: string[]
+    ): Promise<number>;
+  }
+}
diff --git a/packages/redis-worker/src/fair-queue/index.ts b/packages/redis-worker/src/fair-queue/index.ts
new file mode 100644
index 00000000000..541ccf55137
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/index.ts
@@ -0,0 +1,1596 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import { SpanKind, type Span } from "@internal/tracing";
+import { Logger } from "@trigger.dev/core/logger";
+import { nanoid } from "nanoid";
+import { setInterval } from "node:timers/promises";
+import { type z } from "zod";
+import { ConcurrencyManager } from "./concurrency.js";
+import { MasterQueue } from "./masterQueue.js";
+import { type RetryStrategy, ExponentialBackoffRetry } from "./retry.js";
+import { isAbortError } from "../utils.js";
+import {
+  FairQueueTelemetry,
+  FairQueueAttributes,
+  MessagingAttributes,
+  BatchedSpanManager,
+} from "./telemetry.js";
+import type {
+  ConcurrencyGroupConfig,
+  DeadLetterMessage,
+  EnqueueBatchOptions,
+  EnqueueOptions,
+  FairQueueKeyProducer,
+  FairQueueOptions,
+  FairScheduler,
+  GlobalRateLimiter,
+  QueueCooloffState,
+  QueueDescriptor,
+  SchedulerContext,
+  StoredMessage,
+} from "./types.js";
+import { VisibilityManager } from "./visibility.js";
+import { WorkerQueueManager } from "./workerQueue.js";
+
+// Re-export all types and components
+export * from "./types.js";
+export * from "./keyProducer.js";
+export * from "./masterQueue.js";
+export * from "./concurrency.js";
+export * from "./visibility.js";
+export * from "./workerQueue.js";
+export * from "./scheduler.js";
+export * from "./schedulers/index.js";
+export * from "./retry.js";
+export * from "./telemetry.js";
+
+/**
+ * FairQueue is the main orchestrator for fair queue message routing.
+ *
+ * FairQueue handles:
+ * - Master queue with sharding (using jump consistent hash)
+ * - Fair scheduling via pluggable schedulers
+ * - Multi-level concurrency limiting
+ * - Visibility timeouts with heartbeats
+ * - Routing messages to worker queues
+ * - Retry strategies with dead letter queue
+ * - OpenTelemetry tracing and metrics
+ *
+ * External consumers are responsible for:
+ * - Running their own worker queue consumer loops
+ * - Calling complete/release/fail APIs after processing
+ *
+ * @typeParam TPayloadSchema - Zod schema for message payload validation
+ */
+export class FairQueue<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private scheduler: FairScheduler;
+  private masterQueue: MasterQueue;
+  private concurrencyManager?: ConcurrencyManager;
+  private visibilityManager: VisibilityManager;
+  private workerQueueManager: WorkerQueueManager;
+  private telemetry: FairQueueTelemetry;
+  private logger: Logger;
+
+  // Configuration
+  private payloadSchema?: TPayloadSchema;
+  private validateOnEnqueue: boolean;
+  private retryStrategy?: RetryStrategy;
+  private deadLetterQueueEnabled: boolean;
+  private shardCount: number;
+  private consumerCount: number;
+  private consumerIntervalMs: number;
+  private visibilityTimeoutMs: number;
+  private heartbeatIntervalMs: number;
+  private reclaimIntervalMs: number;
+  private workerQueueResolver: (message: StoredMessage<z.infer<TPayloadSchema>>) => string;
+  private batchClaimSize: number;
+
+  // Cooloff state
+  private cooloffEnabled: boolean;
+  private cooloffThreshold: number;
+  private cooloffPeriodMs: number;
+  private maxCooloffStatesSize: number;
+  private queueCooloffStates = new Map<string, QueueCooloffState>();
+
+  // Global rate limiter
+  private globalRateLimiter?: GlobalRateLimiter;
+
+  // Consumer tracing
+  private consumerTraceMaxIterations: number;
+  private consumerTraceTimeoutSeconds: number;
+  private batchedSpanManager: BatchedSpanManager;
+
+  // Runtime state
+  private isRunning = false;
+  private abortController: AbortController;
+  private masterQueueConsumerLoops: Promise<void>[] = [];
+  private reclaimLoop?: Promise<void>;
+
+  // Queue descriptor cache for message processing
+  private queueDescriptorCache = new Map<string, QueueDescriptor>();
+
+  constructor(private options: FairQueueOptions<TPayloadSchema>) {
+    this.redis = createRedisClient(options.redis);
+    this.keys = options.keys;
+    this.scheduler = options.scheduler;
+    this.logger = options.logger ?? new Logger("FairQueue", "info");
+    this.abortController = new AbortController();
+
+    // Payload validation
+    this.payloadSchema = options.payloadSchema;
+    this.validateOnEnqueue = options.validateOnEnqueue ?? false;
+
+    // Retry and DLQ
+    this.retryStrategy = options.retry?.strategy;
+    this.deadLetterQueueEnabled = options.retry?.deadLetterQueue ?? true;
+
+    // Configuration
+    this.shardCount = options.shardCount ?? 1;
+    this.consumerCount = options.consumerCount ?? 1;
+    this.consumerIntervalMs = options.consumerIntervalMs ?? 100;
+    this.visibilityTimeoutMs = options.visibilityTimeoutMs ?? 30_000;
+    this.heartbeatIntervalMs = options.heartbeatIntervalMs ?? this.visibilityTimeoutMs / 3;
+    this.reclaimIntervalMs = options.reclaimIntervalMs ?? 5_000;
+
+    // Worker queue resolver (required)
+    this.workerQueueResolver = options.workerQueue.resolveWorkerQueue;
+
+    // Batch claiming
+    this.batchClaimSize = options.batchClaimSize ?? 10;
+
+    // Cooloff
+    this.cooloffEnabled = options.cooloff?.enabled ?? true;
+    this.cooloffThreshold = options.cooloff?.threshold ?? 10;
+    this.cooloffPeriodMs = options.cooloff?.periodMs ?? 10_000;
+    this.maxCooloffStatesSize = options.cooloff?.maxStatesSize ?? 1000;
+
+    // Global rate limiter
+    this.globalRateLimiter = options.globalRateLimiter;
+
+    // Consumer tracing
+    this.consumerTraceMaxIterations = options.consumerTraceMaxIterations ?? 500;
+    this.consumerTraceTimeoutSeconds = options.consumerTraceTimeoutSeconds ?? 60;
+
+    // Initialize telemetry
+    this.telemetry = new FairQueueTelemetry({
+      tracer: options.tracer,
+      meter: options.meter,
+      name: options.name ?? "fairqueue",
+    });
+
+    // Initialize batched span manager for consumer tracing
+    this.batchedSpanManager = new BatchedSpanManager({
+      tracer: options.tracer,
+      name: options.name ?? "fairqueue",
+      maxIterations: this.consumerTraceMaxIterations,
+      timeoutSeconds: this.consumerTraceTimeoutSeconds,
+      getDynamicAttributes: () => ({
+        "cache.descriptor_size": this.queueDescriptorCache.size,
+        "cache.cooloff_states_size": this.queueCooloffStates.size,
+      }),
+    });
+
+    // Initialize components
+    this.masterQueue = new MasterQueue({
+      redis: options.redis,
+      keys: options.keys,
+      shardCount: this.shardCount,
+    });
+
+    if (options.concurrencyGroups && options.concurrencyGroups.length > 0) {
+      this.concurrencyManager = new ConcurrencyManager({
+        redis: options.redis,
+        keys: options.keys,
+        groups: options.concurrencyGroups,
+      });
+    }
+
+    this.visibilityManager = new VisibilityManager({
+      redis: options.redis,
+      keys: options.keys,
+      shardCount: this.shardCount,
+      defaultTimeoutMs: this.visibilityTimeoutMs,
+      logger: {
+        debug: (msg, ctx) => this.logger.debug(msg, ctx),
+        error: (msg, ctx) => this.logger.error(msg, ctx),
+      },
+    });
+
+    // Worker queue manager for pushing messages to worker queues
+    this.workerQueueManager = new WorkerQueueManager({
+      redis: options.redis,
+      keys: options.keys,
+      logger: {
+        debug: (msg, ctx) => this.logger.debug(msg, ctx),
+        error: (msg, ctx) => this.logger.error(msg, ctx),
+      },
+    });
+
+    this.#registerCommands();
+
+    // Auto-start consumers if not disabled
+    if (options.startConsumers !== false) {
+      this.start();
+    }
+  }
+
+  // ============================================================================
+  // Public API - Telemetry
+  // ============================================================================
+
+  /**
+   * Register observable gauge callbacks for telemetry.
+   * Call this after FairQueue is created to enable gauge metrics.
+   *
+   * @param options.observedTenants - List of tenant IDs to observe for DLQ metrics
+   */
+  registerTelemetryGauges(options?: { observedTenants?: string[] }): void {
+    this.telemetry.registerGaugeCallbacks({
+      getMasterQueueLength: async (shardId: number) => {
+        return await this.masterQueue.getShardQueueCount(shardId);
+      },
+      getInflightCount: async (shardId: number) => {
+        return await this.visibilityManager.getInflightCount(shardId);
+      },
+      getDLQLength: async (tenantId: string) => {
+        return await this.getDeadLetterQueueLength(tenantId);
+      },
+      shardCount: this.shardCount,
+      observedTenants: options?.observedTenants,
+    });
+  }
+
+  // ============================================================================
+  // Public API - Enqueueing
+  // ============================================================================
+
+  /**
+   * Enqueue a single message to a queue.
+   */
+  async enqueue(options: EnqueueOptions<z.infer<TPayloadSchema>>): Promise<string> {
+    return this.telemetry.trace(
+      "enqueue",
+      async (span) => {
+        const messageId = options.messageId ?? nanoid();
+        const timestamp = options.timestamp ?? Date.now();
+        const queueKey = this.keys.queueKey(options.queueId);
+        const queueItemsKey = this.keys.queueItemsKey(options.queueId);
+        const shardId = this.masterQueue.getShardForQueue(options.queueId);
+        const masterQueueKey = this.keys.masterQueueKey(shardId);
+
+        // Validate payload if schema provided and validation enabled
+        if (this.validateOnEnqueue && this.payloadSchema) {
+          const result = this.payloadSchema.safeParse(options.payload);
+          if (!result.success) {
+            throw new Error(`Payload validation failed: ${result.error.message}`);
+          }
+        }
+
+        // Store queue descriptor for later use
+        const descriptor: QueueDescriptor = {
+          id: options.queueId,
+          tenantId: options.tenantId,
+          metadata: options.metadata ?? {},
+        };
+        this.queueDescriptorCache.set(options.queueId, descriptor);
+
+        // Build stored message
+        const storedMessage: StoredMessage<z.infer<TPayloadSchema>> = {
+          id: messageId,
+          queueId: options.queueId,
+          tenantId: options.tenantId,
+          payload: options.payload,
+          timestamp,
+          attempt: 1,
+          workerQueue: this.workerQueueResolver
+            ? this.workerQueueResolver({
+                id: messageId,
+                queueId: options.queueId,
+                tenantId: options.tenantId,
+                payload: options.payload,
+                timestamp,
+                attempt: 1,
+                metadata: options.metadata,
+              })
+            : undefined,
+          metadata: options.metadata,
+        };
+
+        // Use atomic Lua script to enqueue and update master queue
+        await this.redis.enqueueMessageAtomic(
+          queueKey,
+          queueItemsKey,
+          masterQueueKey,
+          options.queueId,
+          messageId,
+          timestamp.toString(),
+          JSON.stringify(storedMessage)
+        );
+
+        span.setAttributes({
+          [FairQueueAttributes.QUEUE_ID]: options.queueId,
+          [FairQueueAttributes.TENANT_ID]: options.tenantId,
+          [FairQueueAttributes.MESSAGE_ID]: messageId,
+          [FairQueueAttributes.SHARD_ID]: shardId.toString(),
+        });
+
+        this.telemetry.recordEnqueue();
+
+        this.logger.debug("Message enqueued", {
+          queueId: options.queueId,
+          messageId,
+          timestamp,
+        });
+
+        return messageId;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [MessagingAttributes.OPERATION]: "publish",
+        },
+      }
+    );
+  }
+
+  /**
+   * Enqueue multiple messages to a queue.
+   */
+  async enqueueBatch(options: EnqueueBatchOptions<z.infer<TPayloadSchema>>): Promise<string[]> {
+    return this.telemetry.trace(
+      "enqueueBatch",
+      async (span) => {
+        const queueKey = this.keys.queueKey(options.queueId);
+        const queueItemsKey = this.keys.queueItemsKey(options.queueId);
+        const shardId = this.masterQueue.getShardForQueue(options.queueId);
+        const masterQueueKey = this.keys.masterQueueKey(shardId);
+        const now = Date.now();
+
+        // Store queue descriptor
+        const descriptor: QueueDescriptor = {
+          id: options.queueId,
+          tenantId: options.tenantId,
+          metadata: options.metadata ?? {},
+        };
+        this.queueDescriptorCache.set(options.queueId, descriptor);
+
+        const messageIds: string[] = [];
+        const args: string[] = [];
+
+        for (const message of options.messages) {
+          const messageId = message.messageId ?? nanoid();
+          const timestamp = message.timestamp ?? now;
+
+          // Validate if enabled
+          if (this.validateOnEnqueue && this.payloadSchema) {
+            const result = this.payloadSchema.safeParse(message.payload);
+            if (!result.success) {
+              throw new Error(
+                `Payload validation failed for message ${messageId}: ${result.error.message}`
+              );
+            }
+          }
+
+          const storedMessage: StoredMessage<z.infer<TPayloadSchema>> = {
+            id: messageId,
+            queueId: options.queueId,
+            tenantId: options.tenantId,
+            payload: message.payload,
+            timestamp,
+            attempt: 1,
+            workerQueue: this.workerQueueResolver
+              ? this.workerQueueResolver({
+                  id: messageId,
+                  queueId: options.queueId,
+                  tenantId: options.tenantId,
+                  payload: message.payload,
+                  timestamp,
+                  attempt: 1,
+                  metadata: options.metadata,
+                })
+              : undefined,
+            metadata: options.metadata,
+          };
+
+          messageIds.push(messageId);
+          args.push(messageId, timestamp.toString(), JSON.stringify(storedMessage));
+        }
+
+        // Use atomic Lua script for batch enqueue
+        await this.redis.enqueueBatchAtomic(
+          queueKey,
+          queueItemsKey,
+          masterQueueKey,
+          options.queueId,
+          ...args
+        );
+
+        span.setAttributes({
+          [FairQueueAttributes.QUEUE_ID]: options.queueId,
+          [FairQueueAttributes.TENANT_ID]: options.tenantId,
+          [FairQueueAttributes.MESSAGE_COUNT]: messageIds.length,
+          [FairQueueAttributes.SHARD_ID]: shardId.toString(),
+        });
+
+        this.telemetry.recordEnqueueBatch(messageIds.length);
+
+        this.logger.debug("Batch enqueued", {
+          queueId: options.queueId,
+          messageCount: messageIds.length,
+        });
+
+        return messageIds;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [MessagingAttributes.OPERATION]: "publish",
+        },
+      }
+    );
+  }
+
+  // ============================================================================
+  // Public API - Dead Letter Queue
+  // ============================================================================
+
+  /**
+   * Get messages from the dead letter queue for a tenant.
+   */
+  async getDeadLetterMessages(
+    tenantId: string,
+    limit: number = 100
+  ): Promise<DeadLetterMessage<z.infer<TPayloadSchema>>[]> {
+    if (!this.deadLetterQueueEnabled) {
+      return [];
+    }
+
+    const dlqKey = this.keys.deadLetterQueueKey(tenantId);
+    const dlqDataKey = this.keys.deadLetterQueueDataKey(tenantId);
+
+    // Get message IDs with scores (deadLetteredAt timestamps)
+    const results = await this.redis.zrange(dlqKey, 0, limit - 1, "WITHSCORES");
+
+    const messages: DeadLetterMessage<z.infer<TPayloadSchema>>[] = [];
+
+    for (let i = 0; i < results.length; i += 2) {
+      const messageId = results[i];
+      const deadLetteredAtStr = results[i + 1];
+      if (!messageId || !deadLetteredAtStr) continue;
+
+      const dataJson = await this.redis.hget(dlqDataKey, messageId);
+      if (!dataJson) continue;
+
+      try {
+        const data = JSON.parse(dataJson) as DeadLetterMessage<z.infer<TPayloadSchema>>;
+        data.deadLetteredAt = parseFloat(deadLetteredAtStr);
+        messages.push(data);
+      } catch {
+        this.logger.error("Failed to parse DLQ message", { messageId, tenantId });
+      }
+    }
+
+    return messages;
+  }
+
+  /**
+   * Redrive a message from DLQ back to its original queue.
+   */
+  async redriveMessage(tenantId: string, messageId: string): Promise<boolean> {
+    if (!this.deadLetterQueueEnabled) {
+      return false;
+    }
+
+    return this.telemetry.trace(
+      "redriveMessage",
+      async (span) => {
+        const dlqKey = this.keys.deadLetterQueueKey(tenantId);
+        const dlqDataKey = this.keys.deadLetterQueueDataKey(tenantId);
+
+        // Get the message data
+        const dataJson = await this.redis.hget(dlqDataKey, messageId);
+        if (!dataJson) {
+          return false;
+        }
+
+        const dlqMessage = JSON.parse(dataJson) as DeadLetterMessage<z.infer<TPayloadSchema>>;
+
+        // Re-enqueue with reset attempt count
+        await this.enqueue({
+          queueId: dlqMessage.queueId,
+          tenantId: dlqMessage.tenantId,
+          payload: dlqMessage.payload,
+          messageId: dlqMessage.id,
+          timestamp: Date.now(),
+        });
+
+        // Remove from DLQ
+        const pipeline = this.redis.pipeline();
+        pipeline.zrem(dlqKey, messageId);
+        pipeline.hdel(dlqDataKey, messageId);
+        await pipeline.exec();
+
+        span.setAttributes({
+          [FairQueueAttributes.TENANT_ID]: tenantId,
+          [FairQueueAttributes.MESSAGE_ID]: messageId,
+        });
+
+        this.logger.info("Redrived message from DLQ", { tenantId, messageId });
+
+        return true;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [MessagingAttributes.OPERATION]: "redrive",
+        },
+      }
+    );
+  }
+
+  /**
+   * Redrive all messages from DLQ back to their original queues.
+   */
+  async redriveAll(tenantId: string): Promise<number> {
+    const messages = await this.getDeadLetterMessages(tenantId, 1000);
+    let count = 0;
+
+    for (const message of messages) {
+      const success = await this.redriveMessage(tenantId, message.id);
+      if (success) count++;
+    }
+
+    return count;
+  }
+
+  /**
+   * Purge all messages from a tenant's DLQ.
+   */
+  async purgeDeadLetterQueue(tenantId: string): Promise<number> {
+    if (!this.deadLetterQueueEnabled) {
+      return 0;
+    }
+
+    const dlqKey = this.keys.deadLetterQueueKey(tenantId);
+    const dlqDataKey = this.keys.deadLetterQueueDataKey(tenantId);
+
+    const count = await this.redis.zcard(dlqKey);
+
+    const pipeline = this.redis.pipeline();
+    pipeline.del(dlqKey);
+    pipeline.del(dlqDataKey);
+    await pipeline.exec();
+
+    this.logger.info("Purged DLQ", { tenantId, count });
+
+    return count;
+  }
+
+  /**
+   * Get the number of messages in a tenant's DLQ.
+   */
+  async getDeadLetterQueueLength(tenantId: string): Promise<number> {
+    if (!this.deadLetterQueueEnabled) {
+      return 0;
+    }
+
+    const dlqKey = this.keys.deadLetterQueueKey(tenantId);
+    return await this.redis.zcard(dlqKey);
+  }
+
+  /**
+   * Get the size of the in-memory queue descriptor cache.
+   * This cache stores metadata for queues that have been enqueued.
+   * The cache is cleaned up when queues are fully processed.
+   */
+  getQueueDescriptorCacheSize(): number {
+    return this.queueDescriptorCache.size;
+  }
+
+  /**
+   * Get the size of the in-memory cooloff states cache.
+   * This cache tracks queues that are in cooloff due to repeated failures.
+   * The cache is cleaned up when queues are fully processed or cooloff expires.
+   */
+  getQueueCooloffStatesSize(): number {
+    return this.queueCooloffStates.size;
+  }
+
+  /**
+   * Get all in-memory cache sizes for monitoring.
+   * Useful for adding as span attributes.
+   */
+  getCacheSizes(): { descriptorCacheSize: number; cooloffStatesSize: number } {
+    return {
+      descriptorCacheSize: this.queueDescriptorCache.size,
+      cooloffStatesSize: this.queueCooloffStates.size,
+    };
+  }
+
+  // ============================================================================
+  // Public API - Lifecycle
+  // ============================================================================
+
+  /**
+   * Start the master queue consumer loops and reclaim loop.
+   * FairQueue claims messages and pushes them to worker queues.
+   * External consumers are responsible for consuming from worker queues.
+   */
+  start(): void {
+    if (this.isRunning) {
+      return;
+    }
+
+    this.isRunning = true;
+    this.abortController = new AbortController();
+
+    // Start master queue consumers (one per shard)
+    // These claim messages from queues and push to worker queues
+    for (let shardId = 0; shardId < this.shardCount; shardId++) {
+      const loop = this.#runMasterQueueConsumerLoop(shardId);
+      this.masterQueueConsumerLoops.push(loop);
+    }
+
+    // Start reclaim loop for handling timed-out messages
+    this.reclaimLoop = this.#runReclaimLoop();
+
+    this.logger.info("FairQueue started", {
+      consumerCount: this.consumerCount,
+      shardCount: this.shardCount,
+      consumerIntervalMs: this.consumerIntervalMs,
+    });
+  }
+
+  /**
+   * Stop the consumer loops gracefully.
+   */
+  async stop(): Promise<void> {
+    if (!this.isRunning) {
+      return;
+    }
+
+    this.isRunning = false;
+    this.abortController.abort();
+
+    await Promise.allSettled([...this.masterQueueConsumerLoops, this.reclaimLoop]);
+
+    this.masterQueueConsumerLoops = [];
+    this.reclaimLoop = undefined;
+
+    this.logger.info("FairQueue stopped");
+  }
+
+  /**
+   * Close all resources.
+   */
+  async close(): Promise<void> {
+    await this.stop();
+
+    // Clean up any remaining batched spans
+    this.batchedSpanManager.cleanupAll();
+
+    await Promise.all([
+      this.masterQueue.close(),
+      this.concurrencyManager?.close(),
+      this.visibilityManager.close(),
+      this.workerQueueManager.close(),
+      this.scheduler.close?.(),
+      this.redis.quit(),
+    ]);
+  }
+
+  // ============================================================================
+  // Public API - Inspection
+  // ============================================================================
+
+  /**
+   * Get the number of messages in a queue.
+   */
+  async getQueueLength(queueId: string): Promise<number> {
+    const queueKey = this.keys.queueKey(queueId);
+    return await this.redis.zcard(queueKey);
+  }
+
+  /**
+   * Get total queue count across all shards.
+   */
+  async getTotalQueueCount(): Promise<number> {
+    return await this.masterQueue.getTotalQueueCount();
+  }
+
+  /**
+   * Get total in-flight message count.
+   */
+  async getTotalInflightCount(): Promise<number> {
+    return await this.visibilityManager.getTotalInflightCount();
+  }
+
+  /**
+   * Get the shard ID for a queue.
+   */
+  getShardForQueue(queueId: string): number {
+    return this.masterQueue.getShardForQueue(queueId);
+  }
+
+  // ============================================================================
+  // Private - Master Queue Consumer Loop (Two-Stage)
+  // ============================================================================
+
+  async #runMasterQueueConsumerLoop(shardId: number): Promise<void> {
+    const loopId = `master-shard-${shardId}`;
+
+    // Initialize batched span tracking for this loop
+    this.batchedSpanManager.initializeLoop(loopId);
+
+    try {
+      while (this.isRunning) {
+        // Check abort signal
+        if (this.abortController.signal.aborted) {
+          break;
+        }
+
+        let hadWork = false;
+        try {
+          hadWork = await this.batchedSpanManager.withBatchedSpan(
+            loopId,
+            async (span) => {
+              span.setAttribute("shard_id", shardId);
+              return await this.#processMasterQueueShard(loopId, shardId, span);
+            },
+            {
+              iterationSpanName: "processMasterQueueShard",
+              attributes: { shard_id: shardId },
+            }
+          );
+        } catch (error) {
+          this.logger.error("Master queue consumer error", {
+            loopId,
+            shardId,
+            error: error instanceof Error ? error.message : String(error),
+          });
+          this.batchedSpanManager.markForRotation(loopId);
+        }
+
+        // Wait between iterations to prevent CPU spin
+        // Short delay when there's work (yield to event loop), longer delay when idle
+        const waitMs = hadWork ? 1 : this.consumerIntervalMs;
+        await new Promise<void>((resolve, reject) => {
+          const abortHandler = () => {
+            clearTimeout(timeout);
+            reject(new Error("AbortError"));
+          };
+          const timeout = setTimeout(() => {
+            // Must remove listener when timeout fires, otherwise listeners accumulate
+            // (the { once: true } option only removes on abort, not on timeout)
+            this.abortController.signal.removeEventListener("abort", abortHandler);
+            resolve();
+          }, waitMs);
+          this.abortController.signal.addEventListener("abort", abortHandler, { once: true });
+        });
+      }
+    } catch (error) {
+      if (isAbortError(error)) {
+        this.logger.debug("Master queue consumer aborted", { loopId });
+        this.batchedSpanManager.cleanup(loopId);
+        return;
+      }
+      throw error;
+    } finally {
+      this.batchedSpanManager.cleanup(loopId);
+    }
+  }
+
+  async #processMasterQueueShard(
+    loopId: string,
+    shardId: number,
+    parentSpan?: Span
+  ): Promise<boolean> {
+    const masterQueueKey = this.keys.masterQueueKey(shardId);
+
+    // Get total queues in this master queue shard for observability
+    const masterQueueSize = await this.masterQueue.getShardQueueCount(shardId);
+    parentSpan?.setAttribute("master_queue_size", masterQueueSize);
+    this.batchedSpanManager.incrementStat(loopId, "master_queue_size_sum", masterQueueSize);
+
+    // Create scheduler context
+    const schedulerContext = this.#createSchedulerContext();
+
+    // Get queues to process from scheduler
+    const tenantQueues = await this.telemetry.trace(
+      "selectQueues",
+      async (span) => {
+        span.setAttribute(FairQueueAttributes.SHARD_ID, shardId.toString());
+        span.setAttribute(FairQueueAttributes.CONSUMER_ID, loopId);
+        span.setAttribute("master_queue_size", masterQueueSize);
+        const result = await this.scheduler.selectQueues(masterQueueKey, loopId, schedulerContext);
+        span.setAttribute("tenant_count", result.length);
+        span.setAttribute(
+          "queue_count",
+          result.reduce((acc, t) => acc + t.queues.length, 0)
+        );
+        return result;
+      },
+      { kind: SpanKind.INTERNAL }
+    );
+
+    if (tenantQueues.length === 0) {
+      this.batchedSpanManager.incrementStat(loopId, "empty_iterations");
+      return false;
+    }
+
+    // Track stats
+    this.batchedSpanManager.incrementStat(loopId, "tenants_selected", tenantQueues.length);
+    this.batchedSpanManager.incrementStat(
+      loopId,
+      "queues_selected",
+      tenantQueues.reduce((acc, t) => acc + t.queues.length, 0)
+    );
+
+    let messagesProcessed = 0;
+
+    // Process queues and push to worker queues
+    for (const { tenantId, queues } of tenantQueues) {
+      for (const queueId of queues) {
+        // Check cooloff
+        if (this.cooloffEnabled && this.#isInCooloff(queueId)) {
+          this.batchedSpanManager.incrementStat(loopId, "cooloff_skipped");
+          continue;
+        }
+
+        // Check tenant capacity before attempting to process
+        // If tenant is at capacity, skip ALL remaining queues for this tenant
+        if (this.concurrencyManager) {
+          const isAtCapacity = await this.concurrencyManager.isAtCapacity("tenant", tenantId);
+          if (isAtCapacity) {
+            this.batchedSpanManager.incrementStat(loopId, "tenant_capacity_skipped");
+            break; // Skip remaining queues for this tenant
+          }
+        }
+
+        const processedFromQueue = await this.telemetry.trace(
+          "claimAndPushToWorkerQueue",
+          async (span) => {
+            span.setAttribute(FairQueueAttributes.QUEUE_ID, queueId);
+            span.setAttribute(FairQueueAttributes.TENANT_ID, tenantId);
+            span.setAttribute(FairQueueAttributes.SHARD_ID, shardId.toString());
+            const count = await this.#claimAndPushToWorkerQueue(loopId, queueId, tenantId, shardId);
+            span.setAttribute("messages_claimed", count);
+            return count;
+          },
+          { kind: SpanKind.INTERNAL }
+        );
+
+        if (processedFromQueue > 0) {
+          messagesProcessed += processedFromQueue;
+          this.batchedSpanManager.incrementStat(loopId, "messages_claimed", processedFromQueue);
+
+          // Record processed messages for DRR deficit tracking
+          // Use batch variant if available for efficiency, otherwise fall back to single calls
+          if (this.scheduler.recordProcessedBatch) {
+            await this.telemetry.trace(
+              "recordProcessedBatch",
+              async (span) => {
+                span.setAttribute(FairQueueAttributes.QUEUE_ID, queueId);
+                span.setAttribute(FairQueueAttributes.TENANT_ID, tenantId);
+                span.setAttribute("count", processedFromQueue);
+                await this.scheduler.recordProcessedBatch!(tenantId, queueId, processedFromQueue);
+              },
+              { kind: SpanKind.INTERNAL }
+            );
+          } else if (this.scheduler.recordProcessed) {
+            for (let i = 0; i < processedFromQueue; i++) {
+              await this.telemetry.trace(
+                "recordProcessed",
+                async (span) => {
+                  span.setAttribute(FairQueueAttributes.QUEUE_ID, queueId);
+                  span.setAttribute(FairQueueAttributes.TENANT_ID, tenantId);
+                  await this.scheduler.recordProcessed!(tenantId, queueId);
+                },
+                { kind: SpanKind.INTERNAL }
+              );
+            }
+          }
+        } else {
+          // Don't increment cooloff here - the queue was either:
+          // 1. Empty (removed from master, cache cleaned up)
+          // 2. Concurrency blocked (message released back to queue)
+          // Neither case warrants cooloff as they're not failures
+          this.batchedSpanManager.incrementStat(loopId, "claim_skipped");
+        }
+      }
+    }
+
+    // Return true if we processed any messages (had work)
+    return messagesProcessed > 0;
+  }
+
+  async #claimAndPushToWorkerQueue(
+    loopId: string,
+    queueId: string,
+    tenantId: string,
+    shardId: number
+  ): Promise<number> {
+    const queueKey = this.keys.queueKey(queueId);
+    const queueItemsKey = this.keys.queueItemsKey(queueId);
+    const masterQueueKey = this.keys.masterQueueKey(shardId);
+    const descriptor = this.queueDescriptorCache.get(queueId) ?? {
+      id: queueId,
+      tenantId,
+      metadata: {},
+    };
+
+    // Determine how many messages we can claim based on concurrency
+    let maxClaimCount = this.batchClaimSize;
+    if (this.concurrencyManager) {
+      const availableCapacity = await this.concurrencyManager.getAvailableCapacity(descriptor);
+      if (availableCapacity === 0) {
+        // Queue at max concurrency, back off to avoid repeated attempts
+        this.#incrementCooloff(queueId);
+        return 0;
+      }
+      maxClaimCount = Math.min(maxClaimCount, availableCapacity);
+    }
+
+    // Check global rate limit - wait if rate limited
+    if (this.globalRateLimiter) {
+      const result = await this.globalRateLimiter.limit();
+      if (!result.allowed && result.resetAt) {
+        const waitMs = Math.max(0, result.resetAt - Date.now());
+        if (waitMs > 0) {
+          this.logger.debug("Global rate limit reached, waiting", { waitMs, loopId });
+          await new Promise((resolve) => setTimeout(resolve, waitMs));
+        }
+      }
+    }
+
+    // Claim batch of messages with visibility timeout
+    const claimedMessages = await this.visibilityManager.claimBatch<
+      StoredMessage<z.infer<TPayloadSchema>>
+    >(queueId, queueKey, queueItemsKey, loopId, maxClaimCount, this.visibilityTimeoutMs);
+
+    if (claimedMessages.length === 0) {
+      // Queue is empty, update master queue and clean up caches
+      const removed = await this.redis.updateMasterQueueIfEmpty(masterQueueKey, queueKey, queueId);
+      if (removed === 1) {
+        this.queueDescriptorCache.delete(queueId);
+        this.queueCooloffStates.delete(queueId);
+      }
+      return 0;
+    }
+
+    let processedCount = 0;
+
+    // Reserve concurrency and push each message to worker queue
+    for (let i = 0; i < claimedMessages.length; i++) {
+      const message = claimedMessages[i]!;
+
+      // Reserve concurrency slot
+      if (this.concurrencyManager) {
+        const reserved = await this.concurrencyManager.reserve(descriptor, message.messageId);
+        if (!reserved) {
+          // Release ALL remaining messages (from index i onward) back to queue
+          // This prevents messages from being stranded in the in-flight set
+          await this.visibilityManager.releaseBatch(
+            claimedMessages.slice(i),
+            queueId,
+            queueKey,
+            queueItemsKey,
+            masterQueueKey
+          );
+          // Stop processing more messages from this queue since we're at capacity
+          break;
+        }
+      }
+
+      // Resolve which worker queue this message should go to
+      const workerQueueId = this.workerQueueResolver(message.payload);
+
+      // Push to worker queue with format "messageId:queueId"
+      const messageKey = `${message.messageId}:${queueId}`;
+      await this.workerQueueManager.push(workerQueueId, messageKey);
+      processedCount++;
+    }
+
+    if (processedCount > 0) {
+      this.#resetCooloff(queueId);
+    }
+
+    return processedCount;
+  }
+
+  // ============================================================================
+  // Public API - Message Lifecycle (for external consumers)
+  // ============================================================================
+
+  /**
+   * Get message data from in-flight storage.
+   * External consumers use this to retrieve the stored message after popping from worker queue.
+   *
+   * @param messageId - The ID of the message
+   * @param queueId - The queue ID the message belongs to
+   * @returns The stored message or null if not found
+   */
+  async getMessageData(
+    messageId: string,
+    queueId: string
+  ): Promise<StoredMessage<z.infer<TPayloadSchema>> | null> {
+    const shardId = this.masterQueue.getShardForQueue(queueId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+    const dataJson = await this.redis.hget(inflightDataKey, messageId);
+
+    if (!dataJson) {
+      return null;
+    }
+
+    try {
+      return JSON.parse(dataJson) as StoredMessage<z.infer<TPayloadSchema>>;
+    } catch {
+      this.logger.error("Failed to parse message data", { messageId, queueId });
+      return null;
+    }
+  }
+
+  /**
+   * Extend the visibility timeout for a message.
+   * External consumers should call this periodically during long-running processing.
+   *
+   * @param messageId - The ID of the message
+   * @param queueId - The queue ID the message belongs to
+   * @returns true if heartbeat was successful
+   */
+  async heartbeatMessage(messageId: string, queueId: string): Promise<boolean> {
+    return this.visibilityManager.heartbeat(messageId, queueId, this.heartbeatIntervalMs);
+  }
+
+  /**
+   * Mark a message as successfully processed.
+   * This removes the message from in-flight and releases concurrency.
+   *
+   * @param messageId - The ID of the message
+   * @param queueId - The queue ID the message belongs to
+   */
+  async completeMessage(messageId: string, queueId: string): Promise<void> {
+    const shardId = this.masterQueue.getShardForQueue(queueId);
+    const queueKey = this.keys.queueKey(queueId);
+    const masterQueueKey = this.keys.masterQueueKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+
+    // Get stored message for concurrency release
+    const dataJson = await this.redis.hget(inflightDataKey, messageId);
+    let storedMessage: StoredMessage<z.infer<TPayloadSchema>> | null = null;
+    if (dataJson) {
+      try {
+        storedMessage = JSON.parse(dataJson);
+      } catch {
+        // Ignore parse error, proceed with completion
+      }
+    }
+
+    const descriptor: QueueDescriptor = storedMessage
+      ? this.queueDescriptorCache.get(queueId) ?? {
+          id: queueId,
+          tenantId: storedMessage.tenantId,
+          metadata: storedMessage.metadata ?? {},
+        }
+      : { id: queueId, tenantId: "", metadata: {} };
+
+    // Complete in visibility manager
+    await this.visibilityManager.complete(messageId, queueId);
+
+    // Release concurrency
+    if (this.concurrencyManager && storedMessage) {
+      await this.concurrencyManager.release(descriptor, messageId);
+    }
+
+    // Update master queue if queue is now empty, and clean up caches
+    const removed = await this.redis.updateMasterQueueIfEmpty(masterQueueKey, queueKey, queueId);
+    if (removed === 1) {
+      this.queueDescriptorCache.delete(queueId);
+      this.queueCooloffStates.delete(queueId);
+    }
+
+    this.telemetry.recordComplete();
+
+    this.logger.debug("Message completed", {
+      messageId,
+      queueId,
+    });
+  }
+
+  /**
+   * Release a message back to the queue for processing by another consumer.
+   * The message is placed at the back of the queue.
+   *
+   * @param messageId - The ID of the message
+   * @param queueId - The queue ID the message belongs to
+   */
+  async releaseMessage(messageId: string, queueId: string): Promise<void> {
+    const shardId = this.masterQueue.getShardForQueue(queueId);
+    const queueKey = this.keys.queueKey(queueId);
+    const queueItemsKey = this.keys.queueItemsKey(queueId);
+    const masterQueueKey = this.keys.masterQueueKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+
+    // Get stored message for concurrency release
+    const dataJson = await this.redis.hget(inflightDataKey, messageId);
+    let storedMessage: StoredMessage<z.infer<TPayloadSchema>> | null = null;
+    if (dataJson) {
+      try {
+        storedMessage = JSON.parse(dataJson);
+      } catch {
+        // Ignore parse error
+      }
+    }
+
+    const descriptor: QueueDescriptor = storedMessage
+      ? this.queueDescriptorCache.get(queueId) ?? {
+          id: queueId,
+          tenantId: storedMessage.tenantId,
+          metadata: storedMessage.metadata ?? {},
+        }
+      : { id: queueId, tenantId: "", metadata: {} };
+
+    // Release back to queue
+    await this.visibilityManager.release(
+      messageId,
+      queueId,
+      queueKey,
+      queueItemsKey,
+      masterQueueKey,
+      Date.now() // Put at back of queue
+    );
+
+    // Release concurrency
+    if (this.concurrencyManager && storedMessage) {
+      await this.concurrencyManager.release(descriptor, messageId);
+    }
+
+    this.logger.debug("Message released", {
+      messageId,
+      queueId,
+    });
+  }
+
+  /**
+   * Mark a message as failed. This will trigger retry logic if configured,
+   * or move the message to the dead letter queue.
+   *
+   * @param messageId - The ID of the message
+   * @param queueId - The queue ID the message belongs to
+   * @param error - Optional error that caused the failure
+   */
+  async failMessage(messageId: string, queueId: string, error?: Error): Promise<void> {
+    const shardId = this.masterQueue.getShardForQueue(queueId);
+    const queueKey = this.keys.queueKey(queueId);
+    const queueItemsKey = this.keys.queueItemsKey(queueId);
+    const masterQueueKey = this.keys.masterQueueKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+
+    // Get stored message
+    const dataJson = await this.redis.hget(inflightDataKey, messageId);
+    if (!dataJson) {
+      this.logger.error("Cannot fail message: not found in in-flight data", { messageId, queueId });
+      return;
+    }
+
+    let storedMessage: StoredMessage<z.infer<TPayloadSchema>>;
+    try {
+      storedMessage = JSON.parse(dataJson);
+    } catch {
+      this.logger.error("Cannot fail message: failed to parse stored message", {
+        messageId,
+        queueId,
+      });
+      return;
+    }
+
+    const descriptor = this.queueDescriptorCache.get(queueId) ?? {
+      id: queueId,
+      tenantId: storedMessage.tenantId,
+      metadata: storedMessage.metadata ?? {},
+    };
+
+    await this.#handleMessageFailure(
+      storedMessage,
+      queueId,
+      queueKey,
+      queueItemsKey,
+      masterQueueKey,
+      descriptor,
+      error
+    );
+  }
+
+  // ============================================================================
+  // Private - Message Processing Helpers
+  // ============================================================================
+
+  async #handleMessageFailure(
+    storedMessage: StoredMessage<z.infer<TPayloadSchema>>,
+    queueId: string,
+    queueKey: string,
+    queueItemsKey: string,
+    masterQueueKey: string,
+    descriptor: QueueDescriptor,
+    error?: Error
+  ): Promise<void> {
+    this.telemetry.recordFailure();
+
+    // Check retry strategy
+    if (this.retryStrategy) {
+      const nextDelay = this.retryStrategy.getNextDelay(storedMessage.attempt, error);
+
+      if (nextDelay !== null) {
+        // Retry with incremented attempt
+        const updatedMessage = {
+          ...storedMessage,
+          attempt: storedMessage.attempt + 1,
+        };
+
+        // Release with delay (and ensure queue is in master queue)
+        await this.visibilityManager.release(
+          storedMessage.id,
+          queueId,
+          queueKey,
+          queueItemsKey,
+          masterQueueKey,
+          Date.now() + nextDelay
+        );
+
+        // Update message in items hash with new attempt count
+        await this.redis.hset(queueItemsKey, storedMessage.id, JSON.stringify(updatedMessage));
+
+        // Release concurrency
+        if (this.concurrencyManager) {
+          await this.concurrencyManager.release(descriptor, storedMessage.id);
+        }
+
+        this.telemetry.recordRetry();
+
+        this.logger.debug("Message scheduled for retry", {
+          messageId: storedMessage.id,
+          queueId,
+          attempt: storedMessage.attempt + 1,
+          delayMs: nextDelay,
+        });
+
+        return;
+      }
+    }
+
+    // Move to DLQ
+    await this.#moveToDeadLetterQueue(storedMessage, error?.message);
+
+    // Release concurrency
+    if (this.concurrencyManager) {
+      await this.concurrencyManager.release(descriptor, storedMessage.id);
+    }
+  }
+
+  async #moveToDeadLetterQueue(
+    storedMessage: StoredMessage<z.infer<TPayloadSchema>>,
+    errorMessage?: string
+  ): Promise<void> {
+    if (!this.deadLetterQueueEnabled) {
+      // Just complete and discard
+      await this.visibilityManager.complete(storedMessage.id, storedMessage.queueId);
+      return;
+    }
+
+    const dlqKey = this.keys.deadLetterQueueKey(storedMessage.tenantId);
+    const dlqDataKey = this.keys.deadLetterQueueDataKey(storedMessage.tenantId);
+    const shardId = this.masterQueue.getShardForQueue(storedMessage.queueId);
+
+    const dlqMessage: DeadLetterMessage<z.infer<TPayloadSchema>> = {
+      id: storedMessage.id,
+      queueId: storedMessage.queueId,
+      tenantId: storedMessage.tenantId,
+      payload: storedMessage.payload,
+      deadLetteredAt: Date.now(),
+      attempts: storedMessage.attempt,
+      lastError: errorMessage,
+      originalTimestamp: storedMessage.timestamp,
+    };
+
+    // Complete in visibility manager
+    await this.visibilityManager.complete(storedMessage.id, storedMessage.queueId);
+
+    // Add to DLQ
+    const pipeline = this.redis.pipeline();
+    pipeline.zadd(dlqKey, dlqMessage.deadLetteredAt, storedMessage.id);
+    pipeline.hset(dlqDataKey, storedMessage.id, JSON.stringify(dlqMessage));
+    await pipeline.exec();
+
+    this.telemetry.recordDLQ();
+
+    this.logger.info("Message moved to DLQ", {
+      messageId: storedMessage.id,
+      queueId: storedMessage.queueId,
+      tenantId: storedMessage.tenantId,
+      attempts: storedMessage.attempt,
+      error: errorMessage,
+    });
+  }
+
+  // ============================================================================
+  // Private - Reclaim Loop
+  // ============================================================================
+
+  async #runReclaimLoop(): Promise<void> {
+    try {
+      for await (const _ of setInterval(this.reclaimIntervalMs, null, {
+        signal: this.abortController.signal,
+      })) {
+        try {
+          await this.#reclaimTimedOutMessages();
+        } catch (error) {
+          this.logger.error("Reclaim loop error", {
+            error: error instanceof Error ? error.message : String(error),
+          });
+        }
+      }
+    } catch (error) {
+      if (isAbortError(error)) {
+        this.logger.debug("Reclaim loop aborted");
+        return;
+      }
+      throw error;
+    }
+  }
+
+  async #reclaimTimedOutMessages(): Promise<void> {
+    let totalReclaimed = 0;
+
+    for (let shardId = 0; shardId < this.shardCount; shardId++) {
+      const reclaimedMessages = await this.visibilityManager.reclaimTimedOut(shardId, (queueId) => ({
+        queueKey: this.keys.queueKey(queueId),
+        queueItemsKey: this.keys.queueItemsKey(queueId),
+        masterQueueKey: this.keys.masterQueueKey(this.masterQueue.getShardForQueue(queueId)),
+      }));
+
+      // Release concurrency for all reclaimed messages in a single batch
+      // This is critical: when a message times out, its concurrency slot must be freed
+      // so the message can be processed again when it's re-claimed from the queue
+      if (this.concurrencyManager && reclaimedMessages.length > 0) {
+        try {
+          await this.concurrencyManager.releaseBatch(
+            reclaimedMessages.map((msg) => ({
+              queue: {
+                id: msg.queueId,
+                tenantId: msg.tenantId,
+                metadata: msg.metadata ?? {},
+              },
+              messageId: msg.messageId,
+            }))
+          );
+        } catch (error) {
+          this.logger.error("Failed to release concurrency for reclaimed messages", {
+            count: reclaimedMessages.length,
+            error: error instanceof Error ? error.message : String(error),
+          });
+        }
+      }
+
+      totalReclaimed += reclaimedMessages.length;
+    }
+
+    if (totalReclaimed > 0) {
+      this.logger.info("Reclaimed timed-out messages", { count: totalReclaimed });
+    }
+  }
+
+  // ============================================================================
+  // Private - Cooloff State
+  // ============================================================================
+
+  #isInCooloff(queueId: string): boolean {
+    const state = this.queueCooloffStates.get(queueId);
+    if (!state) return false;
+
+    if (state.tag === "cooloff") {
+      if (Date.now() >= state.expiresAt) {
+        this.queueCooloffStates.delete(queueId);
+        return false;
+      }
+      return true;
+    }
+
+    return false;
+  }
+
+  #incrementCooloff(queueId: string): void {
+    // Safety check: if the cache is too large, just clear it
+    if (this.queueCooloffStates.size >= this.maxCooloffStatesSize) {
+      this.logger.warn("Cooloff states cache hit size cap, clearing all entries", {
+        size: this.queueCooloffStates.size,
+        cap: this.maxCooloffStatesSize,
+      });
+      this.queueCooloffStates.clear();
+    }
+
+    const state = this.queueCooloffStates.get(queueId) ?? {
+      tag: "normal" as const,
+      consecutiveFailures: 0,
+    };
+
+    if (state.tag === "normal") {
+      const newFailures = state.consecutiveFailures + 1;
+      if (newFailures >= this.cooloffThreshold) {
+        this.queueCooloffStates.set(queueId, {
+          tag: "cooloff",
+          expiresAt: Date.now() + this.cooloffPeriodMs,
+        });
+        this.logger.debug("Queue entered cooloff", {
+          queueId,
+          cooloffPeriodMs: this.cooloffPeriodMs,
+          consecutiveFailures: newFailures,
+        });
+      } else {
+        this.queueCooloffStates.set(queueId, {
+          tag: "normal",
+          consecutiveFailures: newFailures,
+        });
+      }
+    }
+  }
+
+  #resetCooloff(queueId: string): void {
+    this.queueCooloffStates.delete(queueId);
+  }
+
+  // ============================================================================
+  // Private - Helpers
+  // ============================================================================
+
+  #createSchedulerContext(): SchedulerContext {
+    return {
+      getCurrentConcurrency: async (groupName, groupId) => {
+        if (!this.concurrencyManager) return 0;
+        return this.concurrencyManager.getCurrentConcurrency(groupName, groupId);
+      },
+      getConcurrencyLimit: async (groupName, groupId) => {
+        if (!this.concurrencyManager) return Infinity;
+        return this.concurrencyManager.getConcurrencyLimit(groupName, groupId);
+      },
+      isAtCapacity: async (groupName, groupId) => {
+        if (!this.concurrencyManager) return false;
+        return this.concurrencyManager.isAtCapacity(groupName, groupId);
+      },
+      getQueueDescriptor: (queueId) => {
+        return (
+          this.queueDescriptorCache.get(queueId) ?? {
+            id: queueId,
+            tenantId: this.keys.extractTenantId(queueId),
+            metadata: {},
+          }
+        );
+      },
+    };
+  }
+
+  // ============================================================================
+  // Private - Redis Commands
+  // ============================================================================
+
+  #registerCommands(): void {
+    // Atomic single message enqueue with master queue update
+    this.redis.defineCommand("enqueueMessageAtomic", {
+      numberOfKeys: 3,
+      lua: `
+local queueKey = KEYS[1]
+local queueItemsKey = KEYS[2]
+local masterQueueKey = KEYS[3]
+
+local queueId = ARGV[1]
+local messageId = ARGV[2]
+local timestamp = tonumber(ARGV[3])
+local payload = ARGV[4]
+
+-- Add to sorted set (score = timestamp)
+redis.call('ZADD', queueKey, timestamp, messageId)
+
+-- Store payload in hash
+redis.call('HSET', queueItemsKey, messageId, payload)
+
+-- Update master queue with oldest message timestamp
+local oldest = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
+if #oldest >= 2 then
+  redis.call('ZADD', masterQueueKey, oldest[2], queueId)
+end
+
+return 1
+      `,
+    });
+
+    // Atomic batch message enqueue with master queue update
+    this.redis.defineCommand("enqueueBatchAtomic", {
+      numberOfKeys: 3,
+      lua: `
+local queueKey = KEYS[1]
+local queueItemsKey = KEYS[2]
+local masterQueueKey = KEYS[3]
+
+local queueId = ARGV[1]
+
+-- Args after queueId are triples: [messageId, timestamp, payload, ...]
+for i = 2, #ARGV, 3 do
+  local messageId = ARGV[i]
+  local timestamp = tonumber(ARGV[i + 1])
+  local payload = ARGV[i + 2]
+  
+  -- Add to sorted set
+  redis.call('ZADD', queueKey, timestamp, messageId)
+  
+  -- Store payload in hash
+  redis.call('HSET', queueItemsKey, messageId, payload)
+end
+
+-- Update master queue with oldest message timestamp
+local oldest = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
+if #oldest >= 2 then
+  redis.call('ZADD', masterQueueKey, oldest[2], queueId)
+end
+
+return (#ARGV - 1) / 3
+      `,
+    });
+
+    // Update master queue if queue is empty
+    this.redis.defineCommand("updateMasterQueueIfEmpty", {
+      numberOfKeys: 2,
+      lua: `
+local masterQueueKey = KEYS[1]
+local queueKey = KEYS[2]
+local queueId = ARGV[1]
+
+local count = redis.call('ZCARD', queueKey)
+if count == 0 then
+  redis.call('ZREM', masterQueueKey, queueId)
+  return 1
+else
+  -- Update with oldest message timestamp
+  local oldest = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
+  if #oldest >= 2 then
+    redis.call('ZADD', masterQueueKey, oldest[2], queueId)
+  end
+  return 0
+end
+      `,
+    });
+
+    // Register worker queue commands if enabled
+    if (this.workerQueueManager) {
+      this.workerQueueManager.registerCommands(this.redis);
+    }
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    enqueueMessageAtomic(
+      queueKey: string,
+      queueItemsKey: string,
+      masterQueueKey: string,
+      queueId: string,
+      messageId: string,
+      timestamp: string,
+      payload: string
+    ): Promise<number>;
+
+    enqueueBatchAtomic(
+      queueKey: string,
+      queueItemsKey: string,
+      masterQueueKey: string,
+      queueId: string,
+      ...args: string[]
+    ): Promise<number>;
+
+    updateMasterQueueIfEmpty(
+      masterQueueKey: string,
+      queueKey: string,
+      queueId: string
+    ): Promise<number>;
+  }
+}
diff --git a/packages/redis-worker/src/fair-queue/keyProducer.ts b/packages/redis-worker/src/fair-queue/keyProducer.ts
new file mode 100644
index 00000000000..f63cdbed03e
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/keyProducer.ts
@@ -0,0 +1,161 @@
+import type { FairQueueKeyProducer } from "./types.js";
+
+/**
+ * Default key producer for the fair queue system.
+ * Uses a configurable prefix and standard key structure.
+ *
+ * Key structure:
+ * - Master queue: {prefix}:master:{shardId}
+ * - Queue: {prefix}:queue:{queueId}
+ * - Queue items: {prefix}:queue:{queueId}:items
+ * - Concurrency: {prefix}:concurrency:{groupName}:{groupId}
+ * - In-flight: {prefix}:inflight:{shardId}
+ * - In-flight data: {prefix}:inflight:{shardId}:data
+ * - Worker queue: {prefix}:worker:{consumerId}
+ */
+export class DefaultFairQueueKeyProducer implements FairQueueKeyProducer {
+  private readonly prefix: string;
+  private readonly separator: string;
+
+  constructor(options: { prefix?: string; separator?: string } = {}) {
+    this.prefix = options.prefix ?? "fq";
+    this.separator = options.separator ?? ":";
+  }
+
+  // ============================================================================
+  // Master Queue Keys
+  // ============================================================================
+
+  masterQueueKey(shardId: number): string {
+    return this.#buildKey("master", shardId.toString());
+  }
+
+  // ============================================================================
+  // Queue Keys
+  // ============================================================================
+
+  queueKey(queueId: string): string {
+    return this.#buildKey("queue", queueId);
+  }
+
+  queueItemsKey(queueId: string): string {
+    return this.#buildKey("queue", queueId, "items");
+  }
+
+  // ============================================================================
+  // Concurrency Keys
+  // ============================================================================
+
+  concurrencyKey(groupName: string, groupId: string): string {
+    return this.#buildKey("concurrency", groupName, groupId);
+  }
+
+  // ============================================================================
+  // In-Flight Keys
+  // ============================================================================
+
+  inflightKey(shardId: number): string {
+    return this.#buildKey("inflight", shardId.toString());
+  }
+
+  inflightDataKey(shardId: number): string {
+    return this.#buildKey("inflight", shardId.toString(), "data");
+  }
+
+  // ============================================================================
+  // Worker Queue Keys
+  // ============================================================================
+
+  workerQueueKey(consumerId: string): string {
+    return this.#buildKey("worker", consumerId);
+  }
+
+  // ============================================================================
+  // Dead Letter Queue Keys
+  // ============================================================================
+
+  deadLetterQueueKey(tenantId: string): string {
+    return this.#buildKey("dlq", tenantId);
+  }
+
+  deadLetterQueueDataKey(tenantId: string): string {
+    return this.#buildKey("dlq", tenantId, "data");
+  }
+
+  // ============================================================================
+  // Extraction Methods
+  // ============================================================================
+
+  /**
+   * Extract tenant ID from a queue ID.
+   * Default implementation assumes queue IDs are formatted as: tenant:{tenantId}:...
+   * Override this method for custom queue ID formats.
+   */
+  extractTenantId(queueId: string): string {
+    const parts = queueId.split(this.separator);
+    // Expect format: tenant:{tenantId}:...
+    if (parts.length >= 2 && parts[0] === "tenant" && parts[1]) {
+      return parts[1];
+    }
+    // Fallback: return the first segment
+    return parts[0] ?? "";
+  }
+
+  /**
+   * Extract a group ID from a queue ID.
+   * Default implementation looks for pattern: {groupName}:{groupId}:...
+   * Override this method for custom queue ID formats.
+   */
+  extractGroupId(groupName: string, queueId: string): string {
+    const parts = queueId.split(this.separator);
+
+    // Look for the group name in the queue ID parts
+    for (let i = 0; i < parts.length - 1; i++) {
+      if (parts[i] === groupName) {
+        const nextPart = parts[i + 1];
+        if (nextPart) {
+          return nextPart;
+        }
+      }
+    }
+
+    // Fallback: return an empty string
+    return "";
+  }
+
+  // ============================================================================
+  // Helper Methods
+  // ============================================================================
+
+  #buildKey(...parts: string[]): string {
+    return [this.prefix, ...parts].join(this.separator);
+  }
+}
+
+/**
+ * Key producer with custom extraction logic via callbacks.
+ * Useful when queue IDs don't follow a standard pattern.
+ */
+export class CallbackFairQueueKeyProducer extends DefaultFairQueueKeyProducer {
+  private readonly tenantExtractor: (queueId: string) => string;
+  private readonly groupExtractor: (groupName: string, queueId: string) => string;
+
+  constructor(options: {
+    prefix?: string;
+    separator?: string;
+    extractTenantId: (queueId: string) => string;
+    extractGroupId: (groupName: string, queueId: string) => string;
+  }) {
+    super({ prefix: options.prefix, separator: options.separator });
+    this.tenantExtractor = options.extractTenantId;
+    this.groupExtractor = options.extractGroupId;
+  }
+
+  override extractTenantId(queueId: string): string {
+    return this.tenantExtractor(queueId);
+  }
+
+  override extractGroupId(groupName: string, queueId: string): string {
+    return this.groupExtractor(groupName, queueId);
+  }
+}
diff --git a/packages/redis-worker/src/fair-queue/masterQueue.ts b/packages/redis-worker/src/fair-queue/masterQueue.ts
new file mode 100644
index 00000000000..e68dc8acbb6
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/masterQueue.ts
@@ -0,0 +1,257 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import { jumpHash } from "@trigger.dev/core/v3/serverOnly";
+import type { FairQueueKeyProducer, QueueWithScore } from "./types.js";
+
+export interface MasterQueueOptions {
+  redis: RedisOptions;
+  keys: FairQueueKeyProducer;
+  shardCount: number;
+}
+
+/**
+ * Master queue manages the top-level queue of queues.
+ *
+ * Features:
+ * - Sharding for horizontal scaling
+ * - Consistent hashing for queue-to-shard assignment
+ * - Queues scored by oldest message timestamp
+ */
+export class MasterQueue {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private shardCount: number;
+
+  constructor(private options: MasterQueueOptions) {
+    this.redis = createRedisClient(options.redis);
+    this.keys = options.keys;
+    this.shardCount = Math.max(1, options.shardCount);
+
+    this.#registerCommands();
+  }
+
+  // ============================================================================
+  // Public Methods
+  // ============================================================================
+
+  /**
+   * Get the shard ID for a queue.
+   * Uses consistent hashing based on queue ID.
+   */
+  getShardForQueue(queueId: string): number {
+    return this.#hashToShard(queueId);
+  }
+
+  /**
+   * Add a queue to its master queue shard.
+   * Updates the score to the oldest message timestamp.
+   *
+   * @param queueId - The queue identifier
+   * @param oldestMessageTimestamp - Timestamp of the oldest message in the queue
+   */
+  async addQueue(queueId: string, oldestMessageTimestamp: number): Promise<void> {
+    const shardId = this.getShardForQueue(queueId);
+    const masterKey = this.keys.masterQueueKey(shardId);
+
+    // Just use plain ZADD - it will add if not exists, or update if exists
+    // The score represents the oldest message timestamp
+    // We rely on the enqueue Lua scripts to set the correct score
+    await this.redis.zadd(masterKey, oldestMessageTimestamp, queueId);
+  }
+
+  /**
+   * Update a queue's score in the master queue.
+   * This is typically called after dequeuing to update to the new oldest message.
+   *
+   * @param queueId - The queue identifier
+   * @param newOldestTimestamp - New timestamp of the oldest message
+   */
+  async updateQueueScore(queueId: string, newOldestTimestamp: number): Promise<void> {
+    const shardId = this.getShardForQueue(queueId);
+    const masterKey = this.keys.masterQueueKey(shardId);
+
+    await this.redis.zadd(masterKey, newOldestTimestamp, queueId);
+  }
+
+  /**
+   * Remove a queue from its master queue shard.
+   * Called when a queue becomes empty.
+   *
+   * @param queueId - The queue identifier
+   */
+  async removeQueue(queueId: string): Promise<void> {
+    const shardId = this.getShardForQueue(queueId);
+    const masterKey = this.keys.masterQueueKey(shardId);
+
+    await this.redis.zrem(masterKey, queueId);
+  }
+
+  /**
+   * Get queues from a shard, ordered by oldest message (lowest score first).
+   *
+   * @param shardId - The shard to query
+   * @param limit - Maximum number of queues to return (default: 1000)
+   * @param maxScore - Maximum score (timestamp) to include (default: now)
+   */
+  async getQueuesFromShard(
+    shardId: number,
+    limit: number = 1000,
+    maxScore?: number
+  ): Promise<QueueWithScore[]> {
+    const masterKey = this.keys.masterQueueKey(shardId);
+    const score = maxScore ?? Date.now();
+
+    // Get queues with scores up to maxScore
+    const results = await this.redis.zrangebyscore(
+      masterKey,
+      "-inf",
+      score,
+      "WITHSCORES",
+      "LIMIT",
+      0,
+      limit
+    );
+
+    const queues: QueueWithScore[] = [];
+    for (let i = 0; i < results.length; i += 2) {
+      const queueId = results[i];
+      const scoreStr = results[i + 1];
+      if (queueId && scoreStr) {
+        queues.push({
+          queueId,
+          score: parseFloat(scoreStr),
+          tenantId: this.keys.extractTenantId(queueId),
+        });
+      }
+    }
+
+    return queues;
+  }
+
+  /**
+   * Get the number of queues in a shard.
+   */
+  async getShardQueueCount(shardId: number): Promise<number> {
+    const masterKey = this.keys.masterQueueKey(shardId);
+    return await this.redis.zcard(masterKey);
+  }
+
+  /**
+   * Get total queue count across all shards.
+   */
+  async getTotalQueueCount(): Promise<number> {
+    const counts = await Promise.all(
+      Array.from({ length: this.shardCount }, (_, i) => this.getShardQueueCount(i))
+    );
+    return counts.reduce((sum, count) => sum + count, 0);
+  }
+
+  /**
+   * Atomically add a queue to master queue only if queue has messages.
+   * Uses Lua script for atomicity.
+   *
+   * @param queueId - The queue identifier
+   * @param queueKey - The actual queue sorted set key
+   * @returns Whether the queue was added to the master queue
+   */
+  async addQueueIfNotEmpty(queueId: string, queueKey: string): Promise<boolean> {
+    const shardId = this.getShardForQueue(queueId);
+    const masterKey = this.keys.masterQueueKey(shardId);
+
+    const result = await this.redis.addQueueIfNotEmpty(masterKey, queueKey, queueId);
+    return result === 1;
+  }
+
+  /**
+   * Atomically remove a queue from master queue only if queue is empty.
+   * Uses Lua script for atomicity.
+   *
+   * @param queueId - The queue identifier
+   * @param queueKey - The actual queue sorted set key
+   * @returns Whether the queue was removed from the master queue
+   */
+  async removeQueueIfEmpty(queueId: string, queueKey: string): Promise<boolean> {
+    const shardId = this.getShardForQueue(queueId);
+    const masterKey = this.keys.masterQueueKey(shardId);
+
+    const result = await this.redis.removeQueueIfEmpty(masterKey, queueKey, queueId);
+    return result === 1;
+  }
+
+  /**
+   * Close the Redis connection.
+   */
+  async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  /**
+   * Map queue ID to shard using Jump Consistent Hash.
+   * Provides better distribution than djb2 and minimal reshuffling when shard count changes.
+   */
+  #hashToShard(queueId: string): number {
+    return jumpHash(queueId, this.shardCount);
+  }
+
+  #registerCommands(): void {
+    // Atomically add queue to master if it has messages
+    this.redis.defineCommand("addQueueIfNotEmpty", {
+      numberOfKeys: 2,
+      lua: `
+local masterKey = KEYS[1]
+local queueKey = KEYS[2]
+local queueId = ARGV[1]
+
+-- Check if queue has any messages
+local count = redis.call('ZCARD', queueKey)
+if count == 0 then
+  return 0
+end
+
+-- Get the oldest message timestamp (lowest score)
+local oldest = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
+if #oldest == 0 then
+  return 0
+end
+
+local score = oldest[2]
+
+-- Add to master queue with the oldest message score
+redis.call('ZADD', masterKey, score, queueId)
+return 1
+      `,
+    });
+
+    // Atomically remove queue from master if it's empty
+    this.redis.defineCommand("removeQueueIfEmpty", {
+      numberOfKeys: 2,
+      lua: `
+local masterKey = KEYS[1]
+local queueKey = KEYS[2]
+local queueId = ARGV[1]
+
+-- Check if queue is empty
+local count = redis.call('ZCARD', queueKey)
+if count > 0 then
+  return 0
+end
+
+-- Remove from master queue
+redis.call('ZREM', masterKey, queueId)
+return 1
+      `,
+    });
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    addQueueIfNotEmpty(masterKey: string, queueKey: string, queueId: string): Promise<number>;
+
+    removeQueueIfEmpty(masterKey: string, queueKey: string, queueId: string): Promise<number>;
+  }
+}
diff --git a/packages/redis-worker/src/fair-queue/retry.ts b/packages/redis-worker/src/fair-queue/retry.ts
new file mode 100644
index 00000000000..afb6045c26f
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/retry.ts
@@ -0,0 +1,173 @@
+import { calculateNextRetryDelay } from "@trigger.dev/core/v3";
+import type { RetryOptions } from "@trigger.dev/core/v3/schemas";
+
+/**
+ * RetryStrategy interface for pluggable retry logic.
+ */
+export interface RetryStrategy {
+  /**
+   * Calculate the next retry delay in milliseconds.
+   * Return null to indicate the message should be sent to DLQ.
+   *
+   * @param attempt - Current attempt number (1-indexed)
+   * @param error - Optional error from the failed attempt
+   * @returns Delay in milliseconds, or null to send to DLQ
+   */
+  getNextDelay(attempt: number, error?: Error): number | null;
+
+  /**
+   * Maximum number of attempts before moving to DLQ.
+   */
+  maxAttempts: number;
+}
+
+/**
+ * Exponential backoff retry strategy.
+ *
+ * Uses the same algorithm as @trigger.dev/core's calculateNextRetryDelay.
+ */
+export class ExponentialBackoffRetry implements RetryStrategy {
+  readonly maxAttempts: number;
+  private options: RetryOptions;
+
+  constructor(options?: Partial<RetryOptions>) {
+    this.options = {
+      maxAttempts: options?.maxAttempts ?? 12,
+      factor: options?.factor ?? 2,
+      minTimeoutInMs: options?.minTimeoutInMs ?? 1_000,
+      maxTimeoutInMs: options?.maxTimeoutInMs ?? 3_600_000, // 1 hour
+      randomize: options?.randomize ?? true,
+    };
+    this.maxAttempts = this.options.maxAttempts ?? 12;
+  }
+
+  getNextDelay(attempt: number, _error?: Error): number | null {
+    if (attempt >= this.maxAttempts) {
+      return null; // Send to DLQ
+    }
+
+    const delay = calculateNextRetryDelay(this.options, attempt);
+    return delay ?? null;
+  }
+}
+
+/**
+ * Fixed delay retry strategy.
+ *
+ * Always waits the same amount of time between retries.
+ */
+export class FixedDelayRetry implements RetryStrategy {
+  readonly maxAttempts: number;
+  private delayMs: number;
+
+  constructor(options: { maxAttempts: number; delayMs: number }) {
+    this.maxAttempts = options.maxAttempts;
+    this.delayMs = options.delayMs;
+  }
+
+  getNextDelay(attempt: number, _error?: Error): number | null {
+    if (attempt >= this.maxAttempts) {
+      return null; // Send to DLQ
+    }
+    return this.delayMs;
+  }
+}
+
+/**
+ * Linear backoff retry strategy.
+ *
+ * Delay increases linearly with each attempt.
+ */
+export class LinearBackoffRetry implements RetryStrategy {
+  readonly maxAttempts: number;
+  private baseDelayMs: number;
+  private maxDelayMs: number;
+
+  constructor(options: { maxAttempts: number; baseDelayMs: number; maxDelayMs?: number }) {
+    this.maxAttempts = options.maxAttempts;
+    this.baseDelayMs = options.baseDelayMs;
+    this.maxDelayMs = options.maxDelayMs ?? options.baseDelayMs * options.maxAttempts;
+  }
+
+  getNextDelay(attempt: number, _error?: Error): number | null {
+    if (attempt >= this.maxAttempts) {
+      return null; // Send to DLQ
+    }
+    const delay = this.baseDelayMs * attempt;
+    return Math.min(delay, this.maxDelayMs);
+  }
+}
+
+/**
+ * No retry strategy.
+ *
+ * Messages go directly to DLQ on first failure.
+ */
+export class NoRetry implements RetryStrategy {
+  readonly maxAttempts = 1;
+
+  getNextDelay(_attempt: number, _error?: Error): number | null {
+    return null; // Always send to DLQ
+  }
+}
+
+/**
+ * Immediate retry strategy.
+ *
+ * Retries immediately without any delay.
+ */
+export class ImmediateRetry implements RetryStrategy {
+  readonly maxAttempts: number;
+
+  constructor(maxAttempts: number) {
+    this.maxAttempts = maxAttempts;
+  }
+
+  getNextDelay(attempt: number, _error?: Error): number | null {
+    if (attempt >= this.maxAttempts) {
+      return null; // Send to DLQ
+    }
+    return 0; // Immediate retry
+  }
+}
+
+/**
+ * Custom retry strategy that uses a user-provided function.
+ */
+export class CustomRetry implements RetryStrategy {
+  readonly maxAttempts: number;
+  private calculateDelay: (attempt: number, error?: Error) => number | null;
+
+  constructor(options: {
+    maxAttempts: number;
+    calculateDelay: (attempt: number, error?: Error) => number | null;
+  }) {
+    this.maxAttempts = options.maxAttempts;
+    this.calculateDelay = options.calculateDelay;
+  }
+
+  getNextDelay(attempt: number, error?: Error): number | null {
+    if (attempt >= this.maxAttempts) {
+      return null;
+    }
+    return this.calculateDelay(attempt, error);
+  }
+}
+
+/**
+ * Default retry options matching @trigger.dev/core defaults.
+ */
+export const defaultRetryOptions: RetryOptions = {
+  maxAttempts: 12,
+  factor: 2,
+  minTimeoutInMs: 1_000,
+  maxTimeoutInMs: 3_600_000,
+  randomize: true,
+};
+
+/**
+ * Create an exponential backoff retry strategy with default options.
+ */
+export function createDefaultRetryStrategy(): RetryStrategy {
+  return new ExponentialBackoffRetry(defaultRetryOptions);
+}
diff --git a/packages/redis-worker/src/fair-queue/scheduler.ts b/packages/redis-worker/src/fair-queue/scheduler.ts
new file mode 100644
index 00000000000..00a22bb97a8
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/scheduler.ts
@@ -0,0 +1,117 @@
+import type { FairScheduler, SchedulerContext, TenantQueues, QueueDescriptor } from "./types.js";
+
+/**
+ * Re-export scheduler types for convenience.
+ */
+export type { FairScheduler, SchedulerContext, TenantQueues };
+
+/**
+ * Base class for scheduler implementations.
+ * Provides common utilities and default implementations.
+ */
+export abstract class BaseScheduler implements FairScheduler {
+  /**
+   * Select queues for processing from a master queue shard.
+   * Must be implemented by subclasses.
+   */
+  abstract selectQueues(
+    masterQueueShard: string,
+    consumerId: string,
+    context: SchedulerContext
+  ): Promise<TenantQueues[]>;
+
+  /**
+   * Called after processing a message to update scheduler state.
+   * Default implementation does nothing.
+   */
+  async recordProcessed(_tenantId: string, _queueId: string): Promise<void> {
+    // Default: no state tracking
+  }
+
+  /**
+   * Called after processing multiple messages to update scheduler state.
+   * Batch variant for efficiency - reduces Redis calls when processing multiple messages.
+   * Default implementation does nothing.
+   */
+  async recordProcessedBatch(_tenantId: string, _queueId: string, _count: number): Promise<void> {
+    // Default: no state tracking
+  }
+
+  /**
+   * Initialize the scheduler.
+   * Default implementation does nothing.
+   */
+  async initialize(): Promise<void> {
+    // Default: no initialization needed
+  }
+
+  /**
+   * Cleanup scheduler resources.
+   * Default implementation does nothing.
+   */
+  async close(): Promise<void> {
+    // Default: no cleanup needed
+  }
+
+  /**
+   * Helper to group queues by tenant.
+   */
+  protected groupQueuesByTenant(
+    queues: Array<{ queueId: string; tenantId: string }>
+  ): Map<string, string[]> {
+    const grouped = new Map<string, string[]>();
+
+    for (const { queueId, tenantId } of queues) {
+      const existing = grouped.get(tenantId) ?? [];
+      existing.push(queueId);
+      grouped.set(tenantId, existing);
+    }
+
+    return grouped;
+  }
+
+  /**
+   * Helper to convert grouped queues to TenantQueues array.
+   */
+  protected toTenantQueuesArray(grouped: Map<string, string[]>): TenantQueues[] {
+    return Array.from(grouped.entries()).map(([tenantId, queues]) => ({
+      tenantId,
+      queues,
+    }));
+  }
+
+  /**
+   * Helper to filter out tenants at capacity.
+   */
+  protected async filterAtCapacity(
+    tenants: TenantQueues[],
+    context: SchedulerContext,
+    groupName: string = "tenant"
+  ): Promise<TenantQueues[]> {
+    const filtered: TenantQueues[] = [];
+
+    for (const tenant of tenants) {
+      const isAtCapacity = await context.isAtCapacity(groupName, tenant.tenantId);
+      if (!isAtCapacity) {
+        filtered.push(tenant);
+      }
+    }
+
+    return filtered;
+  }
+}
+
+/**
+ * Simple noop scheduler that returns empty results.
+ * Useful for testing or disabling scheduling.
+ */
+export class NoopScheduler extends BaseScheduler {
+  async selectQueues(
+    _masterQueueShard: string,
+    _consumerId: string,
+    _context: SchedulerContext
+  ): Promise<TenantQueues[]> {
+    return [];
+  }
+}
+
diff --git a/packages/redis-worker/src/fair-queue/schedulers/drr.ts b/packages/redis-worker/src/fair-queue/schedulers/drr.ts
new file mode 100644
index 00000000000..d06da05891f
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/schedulers/drr.ts
@@ -0,0 +1,367 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import { BaseScheduler } from "../scheduler.js";
+import type {
+  DRRSchedulerConfig,
+  FairQueueKeyProducer,
+  SchedulerContext,
+  TenantQueues,
+  QueueWithScore,
+} from "../types.js";
+
+/**
+ * Deficit Round Robin (DRR) Scheduler.
+ *
+ * DRR ensures fair processing across tenants by:
+ * - Allocating a "quantum" of credits to each tenant per round
+ * - Accumulating unused credits as "deficit"
+ * - Processing from tenants with available deficit
+ * - Capping deficit to prevent starvation
+ *
+ * Key improvements over basic implementations:
+ * - Atomic deficit operations using Lua scripts
+ * - Efficient iteration through tenants
+ * - Automatic deficit cleanup for inactive tenants
+ */
+export class DRRScheduler extends BaseScheduler {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private quantum: number;
+  private maxDeficit: number;
+  private masterQueueLimit: number;
+  private logger: NonNullable<DRRSchedulerConfig["logger"]>;
+
+  constructor(private config: DRRSchedulerConfig) {
+    super();
+    this.redis = createRedisClient(config.redis);
+    this.keys = config.keys;
+    this.quantum = config.quantum;
+    this.maxDeficit = config.maxDeficit;
+    this.masterQueueLimit = config.masterQueueLimit ?? 1000;
+    this.logger = config.logger ?? {
+      debug: () => {},
+      error: () => {},
+    };
+
+    this.#registerCommands();
+  }
+
+  // ============================================================================
+  // FairScheduler Implementation
+  // ============================================================================
+
+  /**
+   * Select queues for processing using DRR algorithm.
+   *
+   * Algorithm:
+   * 1. Get all queues from the master shard
+   * 2. Group by tenant
+   * 3. Filter out tenants at concurrency capacity
+   * 4. Add quantum to each tenant's deficit (atomically)
+   * 5. Select queues from tenants with deficit >= 1
+   * 6. Order tenants by deficit (highest first for fairness)
+   */
+  async selectQueues(
+    masterQueueShard: string,
+    consumerId: string,
+    context: SchedulerContext
+  ): Promise<TenantQueues[]> {
+    // Get all queues from the master shard
+    const queues = await this.#getQueuesFromShard(masterQueueShard);
+
+    if (queues.length === 0) {
+      return [];
+    }
+
+    // Group queues by tenant
+    const queuesByTenant = this.groupQueuesByTenant(
+      queues.map((q) => ({ queueId: q.queueId, tenantId: q.tenantId }))
+    );
+
+    // Get unique tenant IDs
+    const tenantIds = Array.from(queuesByTenant.keys());
+
+    // Add quantum to all active tenants atomically
+    const deficits = await this.#addQuantumToTenants(tenantIds);
+
+    // Build tenant data with deficits
+    const tenantData: Array<{
+      tenantId: string;
+      deficit: number;
+      queues: string[];
+      isAtCapacity: boolean;
+    }> = await Promise.all(
+      tenantIds.map(async (tenantId, index) => {
+        const isAtCapacity = await context.isAtCapacity("tenant", tenantId);
+        return {
+          tenantId,
+          deficit: deficits[index] ?? 0,
+          queues: queuesByTenant.get(tenantId) ?? [],
+          isAtCapacity,
+        };
+      })
+    );
+
+    // Filter out tenants at capacity or with no deficit
+    const eligibleTenants = tenantData.filter(
+      (t) => !t.isAtCapacity && t.deficit >= 1
+    );
+
+    // Log tenants blocked by capacity
+    const blockedTenants = tenantData.filter((t) => t.isAtCapacity);
+    if (blockedTenants.length > 0) {
+      this.logger.debug("DRR: tenants blocked by concurrency", {
+        blockedCount: blockedTenants.length,
+        blockedTenants: blockedTenants.map((t) => t.tenantId),
+      });
+    }
+
+    // Sort by deficit (highest first for fairness)
+    eligibleTenants.sort((a, b) => b.deficit - a.deficit);
+
+    this.logger.debug("DRR: queue selection complete", {
+      totalQueues: queues.length,
+      totalTenants: tenantIds.length,
+      eligibleTenants: eligibleTenants.length,
+      topTenantDeficit: eligibleTenants[0]?.deficit,
+    });
+
+    // Convert to TenantQueues format
+    return eligibleTenants.map((t) => ({
+      tenantId: t.tenantId,
+      queues: t.queues,
+    }));
+  }
+
+  /**
+   * Record that a message was processed from a tenant.
+   * Decrements the tenant's deficit.
+   */
+  override async recordProcessed(tenantId: string, _queueId: string): Promise<void> {
+    await this.#decrementDeficit(tenantId);
+  }
+
+  /**
+   * Record that multiple messages were processed from a tenant.
+   * Decrements the tenant's deficit by count atomically.
+   */
+  override async recordProcessedBatch(
+    tenantId: string,
+    _queueId: string,
+    count: number
+  ): Promise<void> {
+    await this.#decrementDeficitBatch(tenantId, count);
+  }
+
+  override async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Public Methods for Deficit Management
+  // ============================================================================
+
+  /**
+   * Get the current deficit for a tenant.
+   */
+  async getDeficit(tenantId: string): Promise<number> {
+    const key = this.#deficitKey();
+    const value = await this.redis.hget(key, tenantId);
+    return value ? parseFloat(value) : 0;
+  }
+
+  /**
+   * Reset deficit for a tenant.
+   * Used when a tenant has no more active queues.
+   */
+  async resetDeficit(tenantId: string): Promise<void> {
+    const key = this.#deficitKey();
+    await this.redis.hdel(key, tenantId);
+  }
+
+  /**
+   * Get all tenant deficits.
+   */
+  async getAllDeficits(): Promise<Map<string, number>> {
+    const key = this.#deficitKey();
+    const data = await this.redis.hgetall(key);
+    const result = new Map<string, number>();
+    for (const [tenantId, value] of Object.entries(data)) {
+      result.set(tenantId, parseFloat(value));
+    }
+    return result;
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  #deficitKey(): string {
+    // Use a fixed key for DRR deficit tracking
+    return `${this.keys.masterQueueKey(0).split(":")[0]}:drr:deficit`;
+  }
+
+  async #getQueuesFromShard(shardKey: string): Promise<QueueWithScore[]> {
+    const now = Date.now();
+    const results = await this.redis.zrangebyscore(
+      shardKey,
+      "-inf",
+      now,
+      "WITHSCORES",
+      "LIMIT",
+      0,
+      this.masterQueueLimit
+    );
+
+    const queues: QueueWithScore[] = [];
+    for (let i = 0; i < results.length; i += 2) {
+      const queueId = results[i];
+      const scoreStr = results[i + 1];
+      if (queueId && scoreStr) {
+        queues.push({
+          queueId,
+          score: parseFloat(scoreStr),
+          tenantId: this.keys.extractTenantId(queueId),
+        });
+      }
+    }
+
+    return queues;
+  }
+
+  /**
+   * Add quantum to multiple tenants atomically.
+   * Returns the new deficit values.
+   */
+  async #addQuantumToTenants(tenantIds: string[]): Promise<number[]> {
+    if (tenantIds.length === 0) {
+      return [];
+    }
+
+    const key = this.#deficitKey();
+
+    // Use Lua script for atomic quantum addition with capping
+    const results = await this.redis.drrAddQuantum(
+      key,
+      this.quantum.toString(),
+      this.maxDeficit.toString(),
+      ...tenantIds
+    );
+
+    return results.map((r) => parseFloat(r));
+  }
+
+  /**
+   * Decrement deficit for a tenant atomically.
+   */
+  async #decrementDeficit(tenantId: string): Promise<number> {
+    const key = this.#deficitKey();
+
+    // Use Lua script to decrement and ensure non-negative
+    const result = await this.redis.drrDecrementDeficit(key, tenantId);
+    return parseFloat(result);
+  }
+
+  /**
+   * Decrement deficit for a tenant by a count atomically.
+   */
+  async #decrementDeficitBatch(tenantId: string, count: number): Promise<number> {
+    const key = this.#deficitKey();
+
+    // Use Lua script to decrement by count and ensure non-negative
+    const result = await this.redis.drrDecrementDeficitBatch(key, tenantId, count.toString());
+    return parseFloat(result);
+  }
+
+  #registerCommands(): void {
+    // Atomic quantum addition with capping for multiple tenants
+    this.redis.defineCommand("drrAddQuantum", {
+      numberOfKeys: 1,
+      lua: `
+local deficitKey = KEYS[1]
+local quantum = tonumber(ARGV[1])
+local maxDeficit = tonumber(ARGV[2])
+local results = {}
+
+for i = 3, #ARGV do
+  local tenantId = ARGV[i]
+  
+  -- Add quantum to deficit
+  local newDeficit = redis.call('HINCRBYFLOAT', deficitKey, tenantId, quantum)
+  newDeficit = tonumber(newDeficit)
+  
+  -- Cap at maxDeficit
+  if newDeficit > maxDeficit then
+    redis.call('HSET', deficitKey, tenantId, maxDeficit)
+    newDeficit = maxDeficit
+  end
+  
+  table.insert(results, tostring(newDeficit))
+end
+
+return results
+      `,
+    });
+
+    // Atomic deficit decrement with floor at 0
+    this.redis.defineCommand("drrDecrementDeficit", {
+      numberOfKeys: 1,
+      lua: `
+local deficitKey = KEYS[1]
+local tenantId = ARGV[1]
+
+local newDeficit = redis.call('HINCRBYFLOAT', deficitKey, tenantId, -1)
+newDeficit = tonumber(newDeficit)
+
+-- Floor at 0
+if newDeficit < 0 then
+  redis.call('HSET', deficitKey, tenantId, 0)
+  newDeficit = 0
+end
+
+return tostring(newDeficit)
+      `,
+    });
+
+    // Atomic deficit decrement by count with floor at 0
+    this.redis.defineCommand("drrDecrementDeficitBatch", {
+      numberOfKeys: 1,
+      lua: `
+local deficitKey = KEYS[1]
+local tenantId = ARGV[1]
+local count = tonumber(ARGV[2])
+
+local newDeficit = redis.call('HINCRBYFLOAT', deficitKey, tenantId, -count)
+newDeficit = tonumber(newDeficit)
+
+-- Floor at 0
+if newDeficit < 0 then
+  redis.call('HSET', deficitKey, tenantId, 0)
+  newDeficit = 0
+end
+
+return tostring(newDeficit)
+      `,
+    });
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    drrAddQuantum(
+      deficitKey: string,
+      quantum: string,
+      maxDeficit: string,
+      ...tenantIds: string[]
+    ): Promise<string[]>;
+
+    drrDecrementDeficit(deficitKey: string, tenantId: string): Promise<string>;
+
+    drrDecrementDeficitBatch(
+      deficitKey: string,
+      tenantId: string,
+      count: string
+    ): Promise<string>;
+  }
+}
+
diff --git a/packages/redis-worker/src/fair-queue/schedulers/index.ts b/packages/redis-worker/src/fair-queue/schedulers/index.ts
new file mode 100644
index 00000000000..bef962f58d7
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/schedulers/index.ts
@@ -0,0 +1,8 @@
+/**
+ * Scheduler implementations for the fair queue system.
+ */
+
+export { DRRScheduler } from "./drr.js";
+export { WeightedScheduler } from "./weighted.js";
+export { RoundRobinScheduler } from "./roundRobin.js";
+
diff --git a/packages/redis-worker/src/fair-queue/schedulers/roundRobin.ts b/packages/redis-worker/src/fair-queue/schedulers/roundRobin.ts
new file mode 100644
index 00000000000..ac559673526
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/schedulers/roundRobin.ts
@@ -0,0 +1,157 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import { BaseScheduler } from "../scheduler.js";
+import type {
+  FairQueueKeyProducer,
+  SchedulerContext,
+  TenantQueues,
+  QueueWithScore,
+} from "../types.js";
+
+export interface RoundRobinSchedulerConfig {
+  redis: RedisOptions;
+  keys: FairQueueKeyProducer;
+  /** Maximum queues to fetch from master queue per iteration */
+  masterQueueLimit?: number;
+}
+
+/**
+ * Round Robin Scheduler.
+ *
+ * Simple scheduler that processes tenants in strict rotation order.
+ * Maintains a "last served" pointer in Redis to track position.
+ *
+ * Features:
+ * - Predictable ordering (good for debugging)
+ * - Fair rotation through all tenants
+ * - No weighting or bias
+ */
+export class RoundRobinScheduler extends BaseScheduler {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private masterQueueLimit: number;
+
+  constructor(private config: RoundRobinSchedulerConfig) {
+    super();
+    this.redis = createRedisClient(config.redis);
+    this.keys = config.keys;
+    this.masterQueueLimit = config.masterQueueLimit ?? 1000;
+  }
+
+  // ============================================================================
+  // FairScheduler Implementation
+  // ============================================================================
+
+  async selectQueues(
+    masterQueueShard: string,
+    consumerId: string,
+    context: SchedulerContext
+  ): Promise<TenantQueues[]> {
+    const now = Date.now();
+
+    // Get all queues from master shard
+    const queues = await this.#getQueuesFromShard(masterQueueShard, now);
+
+    if (queues.length === 0) {
+      return [];
+    }
+
+    // Group queues by tenant
+    const queuesByTenant = new Map<string, string[]>();
+    const tenantOrder: string[] = [];
+
+    for (const queue of queues) {
+      if (!queuesByTenant.has(queue.tenantId)) {
+        queuesByTenant.set(queue.tenantId, []);
+        tenantOrder.push(queue.tenantId);
+      }
+      queuesByTenant.get(queue.tenantId)!.push(queue.queueId);
+    }
+
+    // Get last served index
+    const lastServedIndex = await this.#getLastServedIndex(masterQueueShard);
+
+    // Rotate tenant order based on last served
+    const rotatedTenants = this.#rotateArray(tenantOrder, lastServedIndex);
+
+    // Filter out tenants at capacity
+    const eligibleTenants: TenantQueues[] = [];
+
+    for (const tenantId of rotatedTenants) {
+      const isAtCapacity = await context.isAtCapacity("tenant", tenantId);
+      if (!isAtCapacity) {
+        const tenantQueues = queuesByTenant.get(tenantId) ?? [];
+        // Sort queues by age (oldest first based on original scores)
+        eligibleTenants.push({
+          tenantId,
+          queues: tenantQueues,
+        });
+      }
+    }
+
+    // Update last served index to the first eligible tenant
+    const firstEligible = eligibleTenants[0];
+    if (firstEligible) {
+      const firstTenantIndex = tenantOrder.indexOf(firstEligible.tenantId);
+      await this.#setLastServedIndex(masterQueueShard, firstTenantIndex + 1);
+    }
+
+    return eligibleTenants;
+  }
+
+  override async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  async #getQueuesFromShard(shardKey: string, maxScore: number): Promise<QueueWithScore[]> {
+    const results = await this.redis.zrangebyscore(
+      shardKey,
+      "-inf",
+      maxScore,
+      "WITHSCORES",
+      "LIMIT",
+      0,
+      this.masterQueueLimit
+    );
+
+    const queues: QueueWithScore[] = [];
+    for (let i = 0; i < results.length; i += 2) {
+      const queueId = results[i];
+      const scoreStr = results[i + 1];
+      if (queueId && scoreStr) {
+        queues.push({
+          queueId,
+          score: parseFloat(scoreStr),
+          tenantId: this.keys.extractTenantId(queueId),
+        });
+      }
+    }
+
+    return queues;
+  }
+
+  #lastServedKey(shardKey: string): string {
+    return `${shardKey}:rr:lastServed`;
+  }
+
+  async #getLastServedIndex(shardKey: string): Promise<number> {
+    const key = this.#lastServedKey(shardKey);
+    const value = await this.redis.get(key);
+    return value ? parseInt(value, 10) : 0;
+  }
+
+  async #setLastServedIndex(shardKey: string, index: number): Promise<void> {
+    const key = this.#lastServedKey(shardKey);
+    await this.redis.set(key, index.toString());
+  }
+
+  #rotateArray<T>(array: T[], startIndex: number): T[] {
+    if (array.length === 0) return [];
+    const normalizedIndex = startIndex % array.length;
+    return [...array.slice(normalizedIndex), ...array.slice(0, normalizedIndex)];
+  }
+}
+
diff --git a/packages/redis-worker/src/fair-queue/schedulers/weighted.ts b/packages/redis-worker/src/fair-queue/schedulers/weighted.ts
new file mode 100644
index 00000000000..de0d45d3cf2
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/schedulers/weighted.ts
@@ -0,0 +1,434 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import seedrandom from "seedrandom";
+import { BaseScheduler } from "../scheduler.js";
+import type {
+  FairQueueKeyProducer,
+  SchedulerContext,
+  TenantQueues,
+  QueueWithScore,
+  WeightedSchedulerBiases,
+  WeightedSchedulerConfig,
+} from "../types.js";
+
+interface TenantConcurrency {
+  current: number;
+  limit: number;
+}
+
+interface TenantSnapshot {
+  tenantId: string;
+  concurrency: TenantConcurrency;
+  queues: Array<{ queueId: string; age: number }>;
+}
+
+interface QueueSnapshot {
+  id: string;
+  tenants: Map<string, TenantSnapshot>;
+  queues: Array<{ queueId: string; tenantId: string; age: number }>;
+}
+
+const defaultBiases: WeightedSchedulerBiases = {
+  concurrencyLimitBias: 0,
+  availableCapacityBias: 0,
+  queueAgeRandomization: 0,
+};
+
+/**
+ * Weighted Shuffle Scheduler.
+ *
+ * Uses weighted random selection to balance between:
+ * - Concurrency limit (higher limits get more weight)
+ * - Available capacity (tenants with more capacity get more weight)
+ * - Queue age (older queues get priority, with configurable randomization)
+ *
+ * Features:
+ * - Snapshot caching to reduce Redis calls
+ * - Configurable biases for fine-tuning
+ * - Maximum tenant count to limit iteration
+ */
+export class WeightedScheduler extends BaseScheduler {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private rng: seedrandom.PRNG;
+  private biases: WeightedSchedulerBiases;
+  private defaultTenantLimit: number;
+  private masterQueueLimit: number;
+  private reuseSnapshotCount: number;
+  private maximumTenantCount: number;
+
+  // Snapshot cache
+  private snapshotCache: Map<string, { snapshot: QueueSnapshot; reuseCount: number }> = new Map();
+
+  constructor(private config: WeightedSchedulerConfig) {
+    super();
+    this.redis = createRedisClient(config.redis);
+    this.keys = config.keys;
+    this.rng = seedrandom(config.seed);
+    this.biases = config.biases ?? defaultBiases;
+    this.defaultTenantLimit = config.defaultTenantConcurrencyLimit ?? 100;
+    this.masterQueueLimit = config.masterQueueLimit ?? 100;
+    this.reuseSnapshotCount = config.reuseSnapshotCount ?? 0;
+    this.maximumTenantCount = config.maximumTenantCount ?? 0;
+  }
+
+  // ============================================================================
+  // FairScheduler Implementation
+  // ============================================================================
+
+  async selectQueues(
+    masterQueueShard: string,
+    consumerId: string,
+    context: SchedulerContext
+  ): Promise<TenantQueues[]> {
+    const snapshot = await this.#getOrCreateSnapshot(
+      masterQueueShard,
+      consumerId,
+      context
+    );
+
+    if (snapshot.queues.length === 0) {
+      return [];
+    }
+
+    // Shuffle tenants based on weights
+    const shuffledTenants = this.#shuffleTenantsByWeight(snapshot);
+
+    // Order queues within each tenant
+    return shuffledTenants.map((tenantId) => ({
+      tenantId,
+      queues: this.#orderQueuesForTenant(snapshot, tenantId),
+    }));
+  }
+
+  override async close(): Promise<void> {
+    this.snapshotCache.clear();
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  async #getOrCreateSnapshot(
+    masterQueueShard: string,
+    consumerId: string,
+    context: SchedulerContext
+  ): Promise<QueueSnapshot> {
+    const cacheKey = `${masterQueueShard}:${consumerId}`;
+
+    // Check cache
+    if (this.reuseSnapshotCount > 0) {
+      const cached = this.snapshotCache.get(cacheKey);
+      if (cached && cached.reuseCount < this.reuseSnapshotCount) {
+        this.snapshotCache.set(cacheKey, {
+          snapshot: cached.snapshot,
+          reuseCount: cached.reuseCount + 1,
+        });
+        return cached.snapshot;
+      }
+    }
+
+    // Create new snapshot
+    const snapshot = await this.#createSnapshot(masterQueueShard, context);
+
+    // Cache if enabled
+    if (this.reuseSnapshotCount > 0) {
+      this.snapshotCache.set(cacheKey, { snapshot, reuseCount: 0 });
+    }
+
+    return snapshot;
+  }
+
+  async #createSnapshot(
+    masterQueueShard: string,
+    context: SchedulerContext
+  ): Promise<QueueSnapshot> {
+    const now = Date.now();
+
+    // Get queues from master shard
+    let rawQueues = await this.#getQueuesFromShard(masterQueueShard, now);
+
+    if (rawQueues.length === 0) {
+      return { id: crypto.randomUUID(), tenants: new Map(), queues: [] };
+    }
+
+    // Apply maximum tenant count if configured
+    if (this.maximumTenantCount > 0) {
+      rawQueues = this.#selectTopTenantQueues(rawQueues);
+    }
+
+    // Build tenant data
+    const tenantIds = new Set<string>();
+    const queuesByTenant = new Map<string, Array<{ queueId: string; age: number }>>();
+
+    for (const queue of rawQueues) {
+      tenantIds.add(queue.tenantId);
+      const tenantQueues = queuesByTenant.get(queue.tenantId) ?? [];
+      tenantQueues.push({
+        queueId: queue.queueId,
+        age: now - queue.score,
+      });
+      queuesByTenant.set(queue.tenantId, tenantQueues);
+    }
+
+    // Get concurrency for each tenant
+    const tenants = new Map<string, TenantSnapshot>();
+    for (const tenantId of tenantIds) {
+      const [current, limit] = await Promise.all([
+        context.getCurrentConcurrency("tenant", tenantId),
+        context.getConcurrencyLimit("tenant", tenantId),
+      ]);
+
+      // Skip tenants at capacity
+      if (current >= limit) {
+        continue;
+      }
+
+      tenants.set(tenantId, {
+        tenantId,
+        concurrency: { current, limit },
+        queues: queuesByTenant.get(tenantId) ?? [],
+      });
+    }
+
+    // Build final queue list (only from non-capacity tenants)
+    const queues = rawQueues
+      .filter((q) => tenants.has(q.tenantId))
+      .map((q) => ({
+        queueId: q.queueId,
+        tenantId: q.tenantId,
+        age: now - q.score,
+      }));
+
+    return {
+      id: crypto.randomUUID(),
+      tenants,
+      queues,
+    };
+  }
+
+  async #getQueuesFromShard(shardKey: string, maxScore: number): Promise<QueueWithScore[]> {
+    const results = await this.redis.zrangebyscore(
+      shardKey,
+      "-inf",
+      maxScore,
+      "WITHSCORES",
+      "LIMIT",
+      0,
+      this.masterQueueLimit
+    );
+
+    const queues: QueueWithScore[] = [];
+    for (let i = 0; i < results.length; i += 2) {
+      const queueId = results[i];
+      const scoreStr = results[i + 1];
+      if (queueId && scoreStr) {
+        queues.push({
+          queueId,
+          score: parseFloat(scoreStr),
+          tenantId: this.keys.extractTenantId(queueId),
+        });
+      }
+    }
+
+    return queues;
+  }
+
+  #selectTopTenantQueues(queues: QueueWithScore[]): QueueWithScore[] {
+    // Group by tenant and calculate average age
+    const queuesByTenant = new Map<string, QueueWithScore[]>();
+    for (const queue of queues) {
+      const tenantQueues = queuesByTenant.get(queue.tenantId) ?? [];
+      tenantQueues.push(queue);
+      queuesByTenant.set(queue.tenantId, tenantQueues);
+    }
+
+    // Calculate average age per tenant
+    const tenantAges = Array.from(queuesByTenant.entries()).map(([tenantId, tQueues]) => {
+      const avgAge = tQueues.reduce((sum, q) => sum + q.score, 0) / tQueues.length;
+      return { tenantId, avgAge };
+    });
+
+    // Weighted shuffle to select top N tenants
+    const maxAge = Math.max(...tenantAges.map((t) => t.avgAge));
+    // Guard against division by zero: if maxAge is 0, assign equal weights
+    const weightedTenants =
+      maxAge === 0
+        ? tenantAges.map((t) => ({
+            tenantId: t.tenantId,
+            weight: 1 / tenantAges.length,
+          }))
+        : tenantAges.map((t) => ({
+            tenantId: t.tenantId,
+            weight: t.avgAge / maxAge,
+          }));
+
+    const selectedTenants = new Set<string>();
+    let remaining = [...weightedTenants];
+    let totalWeight = remaining.reduce((sum, t) => sum + t.weight, 0);
+
+    while (selectedTenants.size < this.maximumTenantCount && remaining.length > 0) {
+      let random = this.rng() * totalWeight;
+      let index = 0;
+
+      while (random > 0 && index < remaining.length) {
+        const item = remaining[index];
+        if (item) {
+          random -= item.weight;
+        }
+        index++;
+      }
+      index = Math.max(0, index - 1);
+
+      const selected = remaining[index];
+      if (selected) {
+        selectedTenants.add(selected.tenantId);
+        totalWeight -= selected.weight;
+        remaining.splice(index, 1);
+      }
+    }
+
+    // Return queues only from selected tenants
+    return queues.filter((q) => selectedTenants.has(q.tenantId));
+  }
+
+  #shuffleTenantsByWeight(snapshot: QueueSnapshot): string[] {
+    const tenantIds = Array.from(snapshot.tenants.keys());
+
+    if (tenantIds.length === 0) {
+      return [];
+    }
+
+    const { concurrencyLimitBias, availableCapacityBias } = this.biases;
+
+    // If no biases, do simple shuffle
+    if (concurrencyLimitBias === 0 && availableCapacityBias === 0) {
+      return this.#shuffle(tenantIds);
+    }
+
+    // Calculate weights
+    const maxLimit = Math.max(
+      ...tenantIds.map((id) => snapshot.tenants.get(id)!.concurrency.limit)
+    );
+
+    const weightedTenants = tenantIds.map((tenantId) => {
+      const tenant = snapshot.tenants.get(tenantId)!;
+      let weight = 1;
+
+      // Concurrency limit bias
+      if (concurrencyLimitBias > 0) {
+        // Guard against division by zero: if maxLimit is 0, treat normalizedLimit as 0
+        const normalizedLimit = maxLimit > 0 ? tenant.concurrency.limit / maxLimit : 0;
+        weight *= 1 + Math.pow(normalizedLimit * concurrencyLimitBias, 2);
+      }
+
+      // Available capacity bias
+      if (availableCapacityBias > 0) {
+        // Guard against division by zero: if limit is 0, treat as fully used (no bonus)
+        const usedPercentage =
+          tenant.concurrency.limit > 0 ? tenant.concurrency.current / tenant.concurrency.limit : 1;
+        const availableBonus = 1 - usedPercentage;
+        weight *= 1 + Math.pow(availableBonus * availableCapacityBias, 2);
+      }
+
+      return { tenantId, weight };
+    });
+
+    return this.#weightedShuffle(weightedTenants);
+  }
+
+  #orderQueuesForTenant(snapshot: QueueSnapshot, tenantId: string): string[] {
+    const tenant = snapshot.tenants.get(tenantId);
+    if (!tenant || tenant.queues.length === 0) {
+      return [];
+    }
+
+    const queues = [...tenant.queues];
+    const { queueAgeRandomization } = this.biases;
+
+    // Strict age-based ordering
+    if (queueAgeRandomization === 0) {
+      return queues.sort((a, b) => b.age - a.age).map((q) => q.queueId);
+    }
+
+    // Weighted random based on age
+    const maxAge = Math.max(...queues.map((q) => q.age));
+    // Guard against division by zero: if maxAge is 0, all queues have equal weight
+    const ageDenom = maxAge === 0 ? 1 : maxAge;
+    const weightedQueues = queues.map((q) => ({
+      queue: q,
+      weight: 1 + (q.age / ageDenom) * queueAgeRandomization,
+    }));
+
+    const result: string[] = [];
+    let remaining = [...weightedQueues];
+    let totalWeight = remaining.reduce((sum, q) => sum + q.weight, 0);
+
+    while (remaining.length > 0) {
+      let random = this.rng() * totalWeight;
+      let index = 0;
+
+      while (random > 0 && index < remaining.length) {
+        const item = remaining[index];
+        if (item) {
+          random -= item.weight;
+        }
+        index++;
+      }
+      index = Math.max(0, index - 1);
+
+      const selected = remaining[index];
+      if (selected) {
+        result.push(selected.queue.queueId);
+        totalWeight -= selected.weight;
+        remaining.splice(index, 1);
+      }
+    }
+
+    return result;
+  }
+
+  #shuffle<T>(array: T[]): T[] {
+    const result = [...array];
+    for (let i = result.length - 1; i > 0; i--) {
+      const j = Math.floor(this.rng() * (i + 1));
+      const temp = result[i];
+      const swapValue = result[j];
+      if (temp !== undefined && swapValue !== undefined) {
+        result[i] = swapValue;
+        result[j] = temp;
+      }
+    }
+    return result;
+  }
+
+  #weightedShuffle(items: Array<{ tenantId: string; weight: number }>): string[] {
+    const result: string[] = [];
+    let remaining = [...items];
+    let totalWeight = remaining.reduce((sum, item) => sum + item.weight, 0);
+
+    while (remaining.length > 0) {
+      let random = this.rng() * totalWeight;
+      let index = 0;
+
+      while (random > 0 && index < remaining.length) {
+        const item = remaining[index];
+        if (item) {
+          random -= item.weight;
+        }
+        index++;
+      }
+      index = Math.max(0, index - 1);
+
+      const selected = remaining[index];
+      if (selected) {
+        result.push(selected.tenantId);
+        totalWeight -= selected.weight;
+        remaining.splice(index, 1);
+      }
+    }
+
+    return result;
+  }
+}
+
diff --git a/packages/redis-worker/src/fair-queue/telemetry.ts b/packages/redis-worker/src/fair-queue/telemetry.ts
new file mode 100644
index 00000000000..0dbdcd87113
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/telemetry.ts
@@ -0,0 +1,744 @@
+import type {
+  Attributes,
+  Counter,
+  Histogram,
+  Meter,
+  ObservableGauge,
+  Span,
+  SpanKind,
+  SpanOptions,
+  Tracer,
+  Context,
+} from "@internal/tracing";
+import { context, trace, SpanStatusCode, ROOT_CONTEXT } from "@internal/tracing";
+
+/**
+ * Semantic attributes for fair queue messaging operations.
+ */
+export const FairQueueAttributes = {
+  QUEUE_ID: "fairqueue.queue_id",
+  TENANT_ID: "fairqueue.tenant_id",
+  MESSAGE_ID: "fairqueue.message_id",
+  SHARD_ID: "fairqueue.shard_id",
+  WORKER_QUEUE: "fairqueue.worker_queue",
+  CONSUMER_ID: "fairqueue.consumer_id",
+  ATTEMPT: "fairqueue.attempt",
+  CONCURRENCY_GROUP: "fairqueue.concurrency_group",
+  MESSAGE_COUNT: "fairqueue.message_count",
+  RESULT: "fairqueue.result",
+} as const;
+
+/**
+ * Standard messaging semantic attributes.
+ */
+export const MessagingAttributes = {
+  SYSTEM: "messaging.system",
+  OPERATION: "messaging.operation",
+  MESSAGE_ID: "messaging.message_id",
+  DESTINATION_NAME: "messaging.destination.name",
+} as const;
+
+/**
+ * FairQueue metrics collection.
+ */
+export interface FairQueueMetrics {
+  // Counters
+  messagesEnqueued: Counter;
+  messagesCompleted: Counter;
+  messagesFailed: Counter;
+  messagesRetried: Counter;
+  messagesToDLQ: Counter;
+
+  // Histograms
+  processingTime: Histogram;
+  queueTime: Histogram;
+
+  // Observable gauges (registered with callbacks)
+  queueLength: ObservableGauge;
+  masterQueueLength: ObservableGauge;
+  inflightCount: ObservableGauge;
+  dlqLength: ObservableGauge;
+}
+
+/**
+ * Options for creating FairQueue telemetry.
+ */
+export interface TelemetryOptions {
+  tracer?: Tracer;
+  meter?: Meter;
+  /** Custom name for metrics prefix */
+  name?: string;
+}
+
+/**
+ * Telemetry helper for FairQueue.
+ *
+ * Provides:
+ * - Span creation with proper attributes
+ * - Metric recording
+ * - Context propagation helpers
+ */
+export class FairQueueTelemetry {
+  private tracer?: Tracer;
+  private meter?: Meter;
+  private metrics?: FairQueueMetrics;
+  private name: string;
+
+  constructor(options: TelemetryOptions) {
+    this.tracer = options.tracer;
+    this.meter = options.meter;
+    this.name = options.name ?? "fairqueue";
+
+    if (this.meter) {
+      this.#initializeMetrics();
+    }
+  }
+
+  // ============================================================================
+  // Tracing
+  // ============================================================================
+
+  /**
+   * Create a traced span for an operation.
+   * Returns the result of the function, or throws any error after recording it.
+   */
+  async trace<T>(
+    name: string,
+    fn: (span: Span) => Promise<T>,
+    options?: {
+      kind?: SpanKind;
+      attributes?: Attributes;
+    }
+  ): Promise<T> {
+    if (!this.tracer) {
+      // No tracer, just execute the function with a no-op span
+      return fn(noopSpan);
+    }
+
+    const spanOptions: SpanOptions = {
+      kind: options?.kind,
+      attributes: {
+        [MessagingAttributes.SYSTEM]: this.name,
+        ...options?.attributes,
+      },
+    };
+
+    return this.tracer.startActiveSpan(`${this.name}.${name}`, spanOptions, async (span) => {
+      try {
+        const result = await fn(span);
+        return result;
+      } catch (error) {
+        if (error instanceof Error) {
+          span.recordException(error);
+        } else {
+          span.recordException(new Error(String(error)));
+        }
+        throw error;
+      } finally {
+        span.end();
+      }
+    });
+  }
+
+  /**
+   * Synchronous version of trace.
+   */
+  traceSync<T>(
+    name: string,
+    fn: (span: Span) => T,
+    options?: {
+      kind?: SpanKind;
+      attributes?: Attributes;
+    }
+  ): T {
+    if (!this.tracer) {
+      return fn(noopSpan);
+    }
+
+    const spanOptions: SpanOptions = {
+      kind: options?.kind,
+      attributes: {
+        [MessagingAttributes.SYSTEM]: this.name,
+        ...options?.attributes,
+      },
+    };
+
+    return this.tracer.startActiveSpan(`${this.name}.${name}`, spanOptions, (span) => {
+      try {
+        return fn(span);
+      } catch (error) {
+        if (error instanceof Error) {
+          span.recordException(error);
+        } else {
+          span.recordException(new Error(String(error)));
+        }
+        throw error;
+      } finally {
+        span.end();
+      }
+    });
+  }
+
+  // ============================================================================
+  // Metrics
+  // ============================================================================
+
+  /**
+   * Record a message enqueued.
+   */
+  recordEnqueue(attributes?: Attributes): void {
+    this.metrics?.messagesEnqueued.add(1, attributes);
+  }
+
+  /**
+   * Record a batch of messages enqueued.
+   */
+  recordEnqueueBatch(count: number, attributes?: Attributes): void {
+    this.metrics?.messagesEnqueued.add(count, attributes);
+  }
+
+  /**
+   * Record a message completed successfully.
+   */
+  recordComplete(attributes?: Attributes): void {
+    this.metrics?.messagesCompleted.add(1, attributes);
+  }
+
+  /**
+   * Record a message processing failure.
+   */
+  recordFailure(attributes?: Attributes): void {
+    this.metrics?.messagesFailed.add(1, attributes);
+  }
+
+  /**
+   * Record a message retry.
+   */
+  recordRetry(attributes?: Attributes): void {
+    this.metrics?.messagesRetried.add(1, attributes);
+  }
+
+  /**
+   * Record a message sent to DLQ.
+   */
+  recordDLQ(attributes?: Attributes): void {
+    this.metrics?.messagesToDLQ.add(1, attributes);
+  }
+
+  /**
+   * Record message processing time.
+   *
+   * @param durationMs - Processing duration in milliseconds
+   */
+  recordProcessingTime(durationMs: number, attributes?: Attributes): void {
+    this.metrics?.processingTime.record(durationMs, attributes);
+  }
+
+  /**
+   * Record time a message spent waiting in queue.
+   *
+   * @param durationMs - Queue wait time in milliseconds
+   */
+  recordQueueTime(durationMs: number, attributes?: Attributes): void {
+    this.metrics?.queueTime.record(durationMs, attributes);
+  }
+
+  /**
+   * Register observable gauge callbacks.
+   * Call this after FairQueue is initialized to register the gauge callbacks.
+   */
+  registerGaugeCallbacks(callbacks: {
+    getQueueLength?: (queueId: string) => Promise<number>;
+    getMasterQueueLength?: (shardId: number) => Promise<number>;
+    getInflightCount?: (shardId: number) => Promise<number>;
+    getDLQLength?: (tenantId: string) => Promise<number>;
+    shardCount?: number;
+    observedQueues?: string[];
+    observedTenants?: string[];
+  }): void {
+    if (!this.metrics) return;
+
+    // Queue length gauge
+    if (callbacks.getQueueLength && callbacks.observedQueues) {
+      const getQueueLength = callbacks.getQueueLength;
+      const queues = callbacks.observedQueues;
+
+      this.metrics.queueLength.addCallback(async (observableResult) => {
+        for (const queueId of queues) {
+          const length = await getQueueLength(queueId);
+          observableResult.observe(length, {
+            [FairQueueAttributes.QUEUE_ID]: queueId,
+          });
+        }
+      });
+    }
+
+    // Master queue length gauge
+    if (callbacks.getMasterQueueLength && callbacks.shardCount) {
+      const getMasterQueueLength = callbacks.getMasterQueueLength;
+      const shardCount = callbacks.shardCount;
+
+      this.metrics.masterQueueLength.addCallback(async (observableResult) => {
+        for (let shardId = 0; shardId < shardCount; shardId++) {
+          const length = await getMasterQueueLength(shardId);
+          observableResult.observe(length, {
+            [FairQueueAttributes.SHARD_ID]: shardId.toString(),
+          });
+        }
+      });
+    }
+
+    // Inflight count gauge
+    if (callbacks.getInflightCount && callbacks.shardCount) {
+      const getInflightCount = callbacks.getInflightCount;
+      const shardCount = callbacks.shardCount;
+
+      this.metrics.inflightCount.addCallback(async (observableResult) => {
+        for (let shardId = 0; shardId < shardCount; shardId++) {
+          const count = await getInflightCount(shardId);
+          observableResult.observe(count, {
+            [FairQueueAttributes.SHARD_ID]: shardId.toString(),
+          });
+        }
+      });
+    }
+
+    // DLQ length gauge
+    if (callbacks.getDLQLength && callbacks.observedTenants) {
+      const getDLQLength = callbacks.getDLQLength;
+      const tenants = callbacks.observedTenants;
+
+      this.metrics.dlqLength.addCallback(async (observableResult) => {
+        for (const tenantId of tenants) {
+          const length = await getDLQLength(tenantId);
+          observableResult.observe(length, {
+            [FairQueueAttributes.TENANT_ID]: tenantId,
+          });
+        }
+      });
+    }
+  }
+
+  // ============================================================================
+  // Helper Methods
+  // ============================================================================
+
+  /**
+   * Create standard attributes for a message operation (for spans/traces).
+   * Use this for span attributes where high cardinality is acceptable.
+   */
+  messageAttributes(params: {
+    queueId?: string;
+    tenantId?: string;
+    messageId?: string;
+    attempt?: number;
+    workerQueue?: string;
+    consumerId?: string;
+  }): Attributes {
+    const attrs: Attributes = {};
+
+    if (params.queueId) attrs[FairQueueAttributes.QUEUE_ID] = params.queueId;
+    if (params.tenantId) attrs[FairQueueAttributes.TENANT_ID] = params.tenantId;
+    if (params.messageId) attrs[FairQueueAttributes.MESSAGE_ID] = params.messageId;
+    if (params.attempt !== undefined) attrs[FairQueueAttributes.ATTEMPT] = params.attempt;
+    if (params.workerQueue) attrs[FairQueueAttributes.WORKER_QUEUE] = params.workerQueue;
+    if (params.consumerId) attrs[FairQueueAttributes.CONSUMER_ID] = params.consumerId;
+
+    return attrs;
+  }
+
+  /**
+   * Check if telemetry is enabled.
+   */
+  get isEnabled(): boolean {
+    return !!this.tracer || !!this.meter;
+  }
+
+  /**
+   * Check if tracing is enabled.
+   */
+  get hasTracer(): boolean {
+    return !!this.tracer;
+  }
+
+  /**
+   * Check if metrics are enabled.
+   */
+  get hasMetrics(): boolean {
+    return !!this.meter;
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  #initializeMetrics(): void {
+    if (!this.meter) return;
+
+    this.metrics = {
+      // Counters
+      messagesEnqueued: this.meter.createCounter(`${this.name}.messages.enqueued`, {
+        description: "Number of messages enqueued",
+        unit: "messages",
+      }),
+      messagesCompleted: this.meter.createCounter(`${this.name}.messages.completed`, {
+        description: "Number of messages completed successfully",
+        unit: "messages",
+      }),
+      messagesFailed: this.meter.createCounter(`${this.name}.messages.failed`, {
+        description: "Number of messages that failed processing",
+        unit: "messages",
+      }),
+      messagesRetried: this.meter.createCounter(`${this.name}.messages.retried`, {
+        description: "Number of message retries",
+        unit: "messages",
+      }),
+      messagesToDLQ: this.meter.createCounter(`${this.name}.messages.dlq`, {
+        description: "Number of messages sent to dead letter queue",
+        unit: "messages",
+      }),
+
+      // Histograms
+      processingTime: this.meter.createHistogram(`${this.name}.message.processing_time`, {
+        description: "Message processing time",
+        unit: "ms",
+      }),
+      queueTime: this.meter.createHistogram(`${this.name}.message.queue_time`, {
+        description: "Time message spent waiting in queue",
+        unit: "ms",
+      }),
+
+      // Observable gauges
+      queueLength: this.meter.createObservableGauge(`${this.name}.queue.length`, {
+        description: "Number of messages in a queue",
+        unit: "messages",
+      }),
+      masterQueueLength: this.meter.createObservableGauge(`${this.name}.master_queue.length`, {
+        description: "Number of queues in master queue shard",
+        unit: "queues",
+      }),
+      inflightCount: this.meter.createObservableGauge(`${this.name}.inflight.count`, {
+        description: "Number of messages currently being processed",
+        unit: "messages",
+      }),
+      dlqLength: this.meter.createObservableGauge(`${this.name}.dlq.length`, {
+        description: "Number of messages in dead letter queue",
+        unit: "messages",
+      }),
+    };
+  }
+}
+
+// ============================================================================
+// Batched Span Manager
+// ============================================================================
+
+/**
+ * State for tracking a consumer loop's batched span.
+ */
+export interface ConsumerLoopState {
+  /** Countdown of iterations before starting a new span */
+  perTraceCountdown: number;
+  /** When the current trace started */
+  traceStartedAt: Date;
+  /** The current batched span */
+  currentSpan?: Span;
+  /** The context for the current batched span */
+  currentSpanContext?: Context;
+  /** Number of iterations in the current span */
+  iterationsCount: number;
+  /** Total iterations across all spans */
+  totalIterationsCount: number;
+  /** Running duration in milliseconds for the current span */
+  runningDurationInMs: number;
+  /** Stats counters for the current span */
+  stats: Record<string, number>;
+  /** Flag to force span end on next iteration */
+  endSpanInNextIteration: boolean;
+}
+
+/**
+ * Configuration for the BatchedSpanManager.
+ */
+export interface BatchedSpanManagerOptions {
+  /** The tracer to use for creating spans */
+  tracer?: Tracer;
+  /** Name prefix for spans */
+  name: string;
+  /** Maximum iterations before rotating the span */
+  maxIterations: number;
+  /** Maximum seconds before rotating the span */
+  timeoutSeconds: number;
+  /** Optional callback to get dynamic attributes when starting a new batched span */
+  getDynamicAttributes?: () => Attributes;
+}
+
+/**
+ * Manages batched spans for consumer loops.
+ *
+ * This allows multiple iterations to be grouped into a single parent span,
+ * reducing the volume of spans while maintaining observability.
+ */
+export class BatchedSpanManager {
+  private tracer?: Tracer;
+  private name: string;
+  private maxIterations: number;
+  private timeoutSeconds: number;
+  private loopStates = new Map<string, ConsumerLoopState>();
+  private getDynamicAttributes?: () => Attributes;
+
+  constructor(options: BatchedSpanManagerOptions) {
+    this.tracer = options.tracer;
+    this.name = options.name;
+    this.maxIterations = options.maxIterations;
+    this.timeoutSeconds = options.timeoutSeconds;
+    this.getDynamicAttributes = options.getDynamicAttributes;
+  }
+
+  /**
+   * Initialize state for a consumer loop.
+   */
+  initializeLoop(loopId: string): void {
+    this.loopStates.set(loopId, {
+      perTraceCountdown: this.maxIterations,
+      traceStartedAt: new Date(),
+      iterationsCount: 0,
+      totalIterationsCount: 0,
+      runningDurationInMs: 0,
+      stats: {},
+      endSpanInNextIteration: false,
+    });
+  }
+
+  /**
+   * Get the state for a consumer loop.
+   */
+  getState(loopId: string): ConsumerLoopState | undefined {
+    return this.loopStates.get(loopId);
+  }
+
+  /**
+   * Increment a stat counter for a loop.
+   */
+  incrementStat(loopId: string, statName: string, value: number = 1): void {
+    const state = this.loopStates.get(loopId);
+    if (state) {
+      state.stats[statName] = (state.stats[statName] ?? 0) + value;
+    }
+  }
+
+  /**
+   * Mark that the span should end on the next iteration.
+   */
+  markForRotation(loopId: string): void {
+    const state = this.loopStates.get(loopId);
+    if (state) {
+      state.endSpanInNextIteration = true;
+    }
+  }
+
+  /**
+   * Check if the span should be rotated (ended and a new one started).
+   */
+  shouldRotate(loopId: string): boolean {
+    const state = this.loopStates.get(loopId);
+    if (!state) return true;
+
+    return (
+      state.perTraceCountdown <= 0 ||
+      Date.now() - state.traceStartedAt.getTime() > this.timeoutSeconds * 1000 ||
+      state.currentSpanContext === undefined ||
+      state.endSpanInNextIteration
+    );
+  }
+
+  /**
+   * End the current span for a loop and record stats.
+   */
+  endCurrentSpan(loopId: string): void {
+    const state = this.loopStates.get(loopId);
+    if (!state?.currentSpan) return;
+
+    // Record stats as span attributes
+    for (const [statName, count] of Object.entries(state.stats)) {
+      state.currentSpan.setAttribute(`stats.${statName}`, count);
+    }
+
+    state.currentSpan.end();
+    state.currentSpan = undefined;
+    state.currentSpanContext = undefined;
+  }
+
+  /**
+   * Start a new batched span for a loop.
+   */
+  startNewSpan(loopId: string, attributes?: Attributes): void {
+    if (!this.tracer) return;
+
+    const state = this.loopStates.get(loopId);
+    if (!state) return;
+
+    // End any existing span first
+    this.endCurrentSpan(loopId);
+
+    // Calculate metrics from previous span period
+    const traceDurationInMs = state.traceStartedAt
+      ? Date.now() - state.traceStartedAt.getTime()
+      : undefined;
+    const iterationsPerSecond =
+      traceDurationInMs && traceDurationInMs > 0
+        ? state.iterationsCount / (traceDurationInMs / 1000)
+        : undefined;
+
+    // Get dynamic attributes if callback is provided
+    const dynamicAttributes = this.getDynamicAttributes?.() ?? {};
+
+    // Start new span
+    state.currentSpan = this.tracer.startSpan(
+      `${this.name}.consumerLoop`,
+      {
+        kind: 1, // SpanKind.CONSUMER
+        attributes: {
+          loop_id: loopId,
+          max_iterations: this.maxIterations,
+          timeout_seconds: this.timeoutSeconds,
+          previous_iterations: state.iterationsCount,
+          previous_duration_ms: traceDurationInMs,
+          previous_iterations_per_second: iterationsPerSecond,
+          total_iterations: state.totalIterationsCount,
+          ...dynamicAttributes,
+          ...attributes,
+        },
+      },
+      ROOT_CONTEXT
+    );
+
+    // Set up context for child spans
+    state.currentSpanContext = trace.setSpan(ROOT_CONTEXT, state.currentSpan);
+
+    // Reset counters
+    state.perTraceCountdown = this.maxIterations;
+    state.traceStartedAt = new Date();
+    state.iterationsCount = 0;
+    state.runningDurationInMs = 0;
+    state.stats = {};
+    state.endSpanInNextIteration = false;
+  }
+
+  /**
+   * Execute a function within the batched span context.
+   * Automatically handles span rotation and iteration tracking.
+   */
+  async withBatchedSpan<T>(
+    loopId: string,
+    fn: (span: Span) => Promise<T>,
+    options?: {
+      iterationSpanName?: string;
+      attributes?: Attributes;
+    }
+  ): Promise<T> {
+    let state = this.loopStates.get(loopId);
+
+    // Initialize state if not present
+    if (!state) {
+      this.initializeLoop(loopId);
+      state = this.loopStates.get(loopId)!;
+    }
+
+    // Check if we need to rotate the span
+    if (this.shouldRotate(loopId)) {
+      this.startNewSpan(loopId);
+    }
+
+    const startTime = performance.now();
+
+    try {
+      // If no tracer, just execute the function
+      if (!this.tracer || !state.currentSpanContext) {
+        return await fn(noopSpan);
+      }
+
+      // Execute within the batched span context
+      return await context.with(state.currentSpanContext, async () => {
+        // Create an iteration span within the batched span
+        const iterationSpanName = options?.iterationSpanName ?? "iteration";
+
+        return await this.tracer!.startActiveSpan(
+          `${this.name}.${iterationSpanName}`,
+          {
+            attributes: {
+              loop_id: loopId,
+              iteration: state.iterationsCount,
+              ...options?.attributes,
+            },
+          },
+          async (iterationSpan) => {
+            try {
+              return await fn(iterationSpan);
+            } catch (error) {
+              if (error instanceof Error) {
+                iterationSpan.recordException(error);
+                state.currentSpan?.recordException(error);
+              }
+              iterationSpan.setStatus({ code: SpanStatusCode.ERROR });
+              state.endSpanInNextIteration = true;
+              throw error;
+            } finally {
+              iterationSpan.end();
+            }
+          }
+        );
+      });
+    } finally {
+      // Update iteration tracking
+      const duration = performance.now() - startTime;
+      state.runningDurationInMs += duration;
+      state.iterationsCount++;
+      state.totalIterationsCount++;
+      state.perTraceCountdown--;
+    }
+  }
+
+  /**
+   * Clean up state for a loop when it's stopped.
+   */
+  cleanup(loopId: string): void {
+    this.endCurrentSpan(loopId);
+    this.loopStates.delete(loopId);
+  }
+
+  /**
+   * Clean up all loop states.
+   */
+  cleanupAll(): void {
+    for (const loopId of this.loopStates.keys()) {
+      this.cleanup(loopId);
+    }
+  }
+}
+
+/**
+ * No-op span implementation for when telemetry is disabled.
+ */
+const noopSpan: Span = {
+  spanContext: () => ({
+    traceId: "",
+    spanId: "",
+    traceFlags: 0,
+  }),
+  setAttribute: () => noopSpan,
+  setAttributes: () => noopSpan,
+  addEvent: () => noopSpan,
+  addLink: () => noopSpan,
+  addLinks: () => noopSpan,
+  setStatus: () => noopSpan,
+  updateName: () => noopSpan,
+  end: () => {},
+  isRecording: () => false,
+  recordException: () => {},
+};
+
+/**
+ * No-op telemetry instance for when telemetry is disabled.
+ */
+export const noopTelemetry = new FairQueueTelemetry({});
diff --git a/packages/redis-worker/src/fair-queue/tests/concurrency.test.ts b/packages/redis-worker/src/fair-queue/tests/concurrency.test.ts
new file mode 100644
index 00000000000..7137ea8ac8b
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/concurrency.test.ts
@@ -0,0 +1,739 @@
+import { describe, expect } from "vitest";
+import { redisTest } from "@internal/testcontainers";
+import { ConcurrencyManager } from "../concurrency.js";
+import { DefaultFairQueueKeyProducer } from "../keyProducer.js";
+import type { FairQueueKeyProducer, QueueDescriptor } from "../types.js";
+
+describe("ConcurrencyManager", () => {
+  let keys: FairQueueKeyProducer;
+
+  describe("single group concurrency", () => {
+    redisTest(
+      "should allow processing when under limit",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        const result = await manager.canProcess(queue);
+        expect(result.allowed).toBe(true);
+
+        await manager.close();
+      }
+    );
+
+    redisTest("should block when at capacity", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const manager = new ConcurrencyManager({
+        redis: redisOptions,
+        keys,
+        groups: [
+          {
+            name: "tenant",
+            extractGroupId: (q) => q.tenantId,
+            getLimit: async () => 5,
+            defaultLimit: 5,
+          },
+        ],
+      });
+
+      const queue: QueueDescriptor = {
+        id: "queue-1",
+        tenantId: "t1",
+        metadata: {},
+      };
+
+      // Reserve 5 slots (the limit)
+      for (let i = 0; i < 5; i++) {
+        await manager.reserve(queue, `msg-${i}`);
+      }
+
+      const result = await manager.canProcess(queue);
+      expect(result.allowed).toBe(false);
+      expect(result.blockedBy?.groupName).toBe("tenant");
+      expect(result.blockedBy?.current).toBe(5);
+      expect(result.blockedBy?.limit).toBe(5);
+
+      await manager.close();
+    });
+
+    redisTest("should allow after release", { timeout: 15000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const manager = new ConcurrencyManager({
+        redis: redisOptions,
+        keys,
+        groups: [
+          {
+            name: "tenant",
+            extractGroupId: (q) => q.tenantId,
+            getLimit: async () => 5,
+            defaultLimit: 5,
+          },
+        ],
+      });
+
+      const queue: QueueDescriptor = {
+        id: "queue-1",
+        tenantId: "t1",
+        metadata: {},
+      };
+
+      // Fill up
+      for (let i = 0; i < 5; i++) {
+        await manager.reserve(queue, `msg-${i}`);
+      }
+
+      // Should be blocked
+      let result = await manager.canProcess(queue);
+      expect(result.allowed).toBe(false);
+
+      // Release one
+      await manager.release(queue, "msg-0");
+
+      // Should be allowed now
+      result = await manager.canProcess(queue);
+      expect(result.allowed).toBe(true);
+
+      await manager.close();
+    });
+  });
+
+  describe("multi-group concurrency", () => {
+    redisTest("should check all groups", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const manager = new ConcurrencyManager({
+        redis: redisOptions,
+        keys,
+        groups: [
+          {
+            name: "tenant",
+            extractGroupId: (q) => q.tenantId,
+            getLimit: async () => 5,
+            defaultLimit: 5,
+          },
+          {
+            name: "organization",
+            extractGroupId: (q) => (q.metadata.orgId as string) ?? "default",
+            getLimit: async () => 10,
+            defaultLimit: 10,
+          },
+        ],
+      });
+
+      const queue: QueueDescriptor = {
+        id: "queue-1",
+        tenantId: "t1",
+        metadata: { orgId: "org1" },
+      };
+
+      // Fill up org level (10)
+      for (let i = 0; i < 10; i++) {
+        await manager.reserve(queue, `msg-${i}`);
+      }
+
+      // Tenant is at 10, over limit of 5
+      // Org is at 10, at limit of 10
+      const result = await manager.canProcess(queue);
+      expect(result.allowed).toBe(false);
+
+      // Should be blocked by tenant first (checked first, limit 5)
+      expect(result.blockedBy?.groupName).toBe("tenant");
+
+      await manager.close();
+    });
+
+    redisTest(
+      "should block if any group is at capacity",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+            {
+              name: "organization",
+              extractGroupId: (q) => (q.metadata.orgId as string) ?? "default",
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        // Use different queue with different tenant but same org
+        const queue1: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: { orgId: "org1" },
+        };
+
+        const queue2: QueueDescriptor = {
+          id: "queue-2",
+          tenantId: "t2",
+          metadata: { orgId: "org1" }, // Same org
+        };
+
+        // Fill up org with messages from both tenants
+        for (let i = 0; i < 5; i++) {
+          await manager.reserve(queue1, `msg-t1-${i}`);
+        }
+        for (let i = 0; i < 5; i++) {
+          await manager.reserve(queue2, `msg-t2-${i}`);
+        }
+
+        // t1 tenant is at 5/5, org is at 10/10
+        let result = await manager.canProcess(queue1);
+        expect(result.allowed).toBe(false);
+
+        // t2 tenant is at 5/5
+        result = await manager.canProcess(queue2);
+        expect(result.allowed).toBe(false);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("getAvailableCapacity", () => {
+    redisTest(
+      "should return available capacity for single group",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        // Initial capacity should be full
+        let capacity = await manager.getAvailableCapacity(queue);
+        expect(capacity).toBe(10);
+
+        // Reserve 3 slots
+        await manager.reserve(queue, "msg-1");
+        await manager.reserve(queue, "msg-2");
+        await manager.reserve(queue, "msg-3");
+
+        // Capacity should be reduced
+        capacity = await manager.getAvailableCapacity(queue);
+        expect(capacity).toBe(7);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should return minimum capacity across multiple groups",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+            {
+              name: "organization",
+              extractGroupId: (q) => (q.metadata.orgId as string) ?? "default",
+              getLimit: async () => 20,
+              defaultLimit: 20,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: { orgId: "org1" },
+        };
+
+        // Initial capacity should be minimum (5 for tenant, 20 for org)
+        let capacity = await manager.getAvailableCapacity(queue);
+        expect(capacity).toBe(5);
+
+        // Reserve 3 slots
+        await manager.reserve(queue, "msg-1");
+        await manager.reserve(queue, "msg-2");
+        await manager.reserve(queue, "msg-3");
+
+        // Now tenant has 2 left, org has 17 left - minimum is 2
+        capacity = await manager.getAvailableCapacity(queue);
+        expect(capacity).toBe(2);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should return 0 when any group is at capacity",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 3,
+              defaultLimit: 3,
+            },
+            {
+              name: "organization",
+              extractGroupId: (q) => (q.metadata.orgId as string) ?? "default",
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: { orgId: "org1" },
+        };
+
+        // Fill up tenant capacity
+        await manager.reserve(queue, "msg-1");
+        await manager.reserve(queue, "msg-2");
+        await manager.reserve(queue, "msg-3");
+
+        // Tenant is at 3/3, org is at 3/10
+        const capacity = await manager.getAvailableCapacity(queue);
+        expect(capacity).toBe(0);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should return 0 when no groups are configured",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        const capacity = await manager.getAvailableCapacity(queue);
+        expect(capacity).toBe(0);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("atomic reservation", () => {
+    redisTest(
+      "should atomically reserve across groups",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+            {
+              name: "organization",
+              extractGroupId: (q) => (q.metadata.orgId as string) ?? "default",
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: { orgId: "org1" },
+        };
+
+        const result = await manager.reserve(queue, "msg-1");
+        expect(result).toBe(true);
+
+        const tenantCurrent = await manager.getCurrentConcurrency("tenant", "t1");
+        const orgCurrent = await manager.getCurrentConcurrency("organization", "org1");
+
+        expect(tenantCurrent).toBe(1);
+        expect(orgCurrent).toBe(1);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should not reserve if any group is at capacity",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        // Fill up tenant
+        for (let i = 0; i < 5; i++) {
+          await manager.reserve(queue, `msg-${i}`);
+        }
+
+        // Try to reserve one more
+        const result = await manager.reserve(queue, "msg-extra");
+        expect(result).toBe(false);
+
+        // Should still be at 5
+        const current = await manager.getCurrentConcurrency("tenant", "t1");
+        expect(current).toBe(5);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("get active messages", () => {
+    redisTest(
+      "should return all active message IDs",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        await manager.reserve(queue, "msg-1");
+        await manager.reserve(queue, "msg-2");
+        await manager.reserve(queue, "msg-3");
+
+        const active = await manager.getActiveMessages("tenant", "t1");
+        expect(active).toHaveLength(3);
+        expect(active).toContain("msg-1");
+        expect(active).toContain("msg-2");
+        expect(active).toContain("msg-3");
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("clear group", () => {
+    redisTest(
+      "should clear all messages for a group",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        await manager.reserve(queue, "msg-1");
+        await manager.reserve(queue, "msg-2");
+
+        await manager.clearGroup("tenant", "t1");
+
+        const current = await manager.getCurrentConcurrency("tenant", "t1");
+        expect(current).toBe(0);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("get state", () => {
+    redisTest(
+      "should return full concurrency state",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        await manager.reserve(queue, "msg-1");
+        await manager.reserve(queue, "msg-2");
+
+        const state = await manager.getState("tenant", "t1");
+        expect(state.groupName).toBe("tenant");
+        expect(state.groupId).toBe("t1");
+        expect(state.current).toBe(2);
+        expect(state.limit).toBe(5);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("group names", () => {
+    redisTest(
+      "should return configured group names",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+            {
+              name: "organization",
+              extractGroupId: (q) => (q.metadata.orgId as string) ?? "default",
+              getLimit: async () => 10,
+              defaultLimit: 10,
+            },
+          ],
+        });
+
+        const names = manager.getGroupNames();
+        expect(names).toEqual(["tenant", "organization"]);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("keyPrefix handling", () => {
+    redisTest(
+      "should correctly reserve and release with keyPrefix",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "myprefix" });
+
+        // Create manager with keyPrefix - this simulates real-world usage
+        const manager = new ConcurrencyManager({
+          redis: {
+            ...redisOptions,
+            keyPrefix: "engine:batch-queue:",
+          },
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 2,
+              defaultLimit: 2,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        // Reserve slots
+        const reserved1 = await manager.reserve(queue, "msg-1");
+        const reserved2 = await manager.reserve(queue, "msg-2");
+        expect(reserved1).toBe(true);
+        expect(reserved2).toBe(true);
+
+        // Should be at capacity
+        let result = await manager.canProcess(queue);
+        expect(result.allowed).toBe(false);
+
+        // Release one - this must use the SAME key as reserve (with keyPrefix)
+        await manager.release(queue, "msg-1");
+
+        // Should now be allowed - this proves reserve and release use the same key
+        result = await manager.canProcess(queue);
+        expect(result.allowed).toBe(true);
+
+        // Verify concurrency count is correct
+        const current = await manager.getCurrentConcurrency("tenant", "t1");
+        expect(current).toBe(1);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should handle reserve/release cycle multiple times with keyPrefix",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: {
+            ...redisOptions,
+            keyPrefix: "myapp:",
+          },
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 1, // Concurrency of 1
+              defaultLimit: 1,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        // Simulate processing multiple messages one at a time
+        for (let i = 0; i < 5; i++) {
+          const msgId = `msg-${i}`;
+
+          // Reserve
+          const reserved = await manager.reserve(queue, msgId);
+          expect(reserved).toBe(true);
+
+          // Should be at capacity now
+          const check = await manager.canProcess(queue);
+          expect(check.allowed).toBe(false);
+
+          // Release
+          await manager.release(queue, msgId);
+
+          // Should be free again
+          const checkAfter = await manager.canProcess(queue);
+          expect(checkAfter.allowed).toBe(true);
+        }
+
+        // Final state should be 0 concurrent
+        const current = await manager.getCurrentConcurrency("tenant", "t1");
+        expect(current).toBe(0);
+
+        await manager.close();
+      }
+    );
+  });
+});
diff --git a/packages/redis-worker/src/fair-queue/tests/drr.test.ts b/packages/redis-worker/src/fair-queue/tests/drr.test.ts
new file mode 100644
index 00000000000..66575d6486f
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/drr.test.ts
@@ -0,0 +1,415 @@
+import { describe, expect } from "vitest";
+import { redisTest } from "@internal/testcontainers";
+import { createRedisClient, type Redis } from "@internal/redis";
+import { DRRScheduler } from "../schedulers/drr.js";
+import { DefaultFairQueueKeyProducer } from "../keyProducer.js";
+import type { FairQueueKeyProducer, SchedulerContext } from "../types.js";
+
+describe("DRRScheduler", () => {
+  let keys: FairQueueKeyProducer;
+
+  describe("deficit management", () => {
+    redisTest("should initialize deficit to 0 for new tenants", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const deficit = await scheduler.getDeficit("new-tenant");
+      expect(deficit).toBe(0);
+
+      await scheduler.close();
+    });
+
+    redisTest("should add quantum atomically with capping", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      // Setup: put queues in the master shard
+      const masterKey = keys.masterQueueKey(0);
+      const now = Date.now();
+
+      await redis.zadd(masterKey, now, "tenant:t1:queue:q1");
+
+      // Create context mock
+      const context: SchedulerContext = {
+        getCurrentConcurrency: async () => 0,
+        getConcurrencyLimit: async () => 100,
+        isAtCapacity: async () => false,
+        getQueueDescriptor: (queueId) => ({
+          id: queueId,
+          tenantId: keys.extractTenantId(queueId),
+          metadata: {},
+        }),
+      };
+
+      // Run multiple iterations to accumulate deficit
+      for (let i = 0; i < 15; i++) {
+        await scheduler.selectQueues(masterKey, "consumer-1", context);
+      }
+
+      // Deficit should be capped at maxDeficit (50)
+      const deficit = await scheduler.getDeficit("t1");
+      expect(deficit).toBeLessThanOrEqual(50);
+
+      await scheduler.close();
+      await redis.quit();
+    });
+
+    redisTest("should decrement deficit when processing", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      // Manually set some deficit
+      const deficitKey = `test:drr:deficit`;
+      await redis.hset(deficitKey, "t1", "10");
+
+      // Record processing
+      await scheduler.recordProcessed("t1", "queue:q1");
+
+      const deficit = await scheduler.getDeficit("t1");
+      expect(deficit).toBe(9);
+
+      await scheduler.close();
+      await redis.quit();
+    });
+
+    redisTest("should not go below 0 on decrement", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const deficitKey = `test:drr:deficit`;
+      await redis.hset(deficitKey, "t1", "0.5");
+
+      await scheduler.recordProcessed("t1", "queue:q1");
+
+      const deficit = await scheduler.getDeficit("t1");
+      expect(deficit).toBe(0);
+
+      await scheduler.close();
+      await redis.quit();
+    });
+
+    redisTest(
+      "should decrement deficit by count when using recordProcessedBatch",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+        const redis = createRedisClient(redisOptions);
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 5,
+          maxDeficit: 50,
+        });
+
+        // Manually set deficit
+        const deficitKey = `test:drr:deficit`;
+        await redis.hset(deficitKey, "t1", "15");
+
+        // Record batch processing of 7 messages
+        await scheduler.recordProcessedBatch("t1", "queue:q1", 7);
+
+        const deficit = await scheduler.getDeficit("t1");
+        expect(deficit).toBe(8);
+
+        await scheduler.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should not go below 0 when recordProcessedBatch decrements more than available",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+        const redis = createRedisClient(redisOptions);
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 5,
+          maxDeficit: 50,
+        });
+
+        // Manually set deficit to 3
+        const deficitKey = `test:drr:deficit`;
+        await redis.hset(deficitKey, "t1", "3");
+
+        // Record batch processing of 10 messages (more than deficit)
+        await scheduler.recordProcessedBatch("t1", "queue:q1", 10);
+
+        const deficit = await scheduler.getDeficit("t1");
+        expect(deficit).toBe(0);
+
+        await scheduler.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest("should reset deficit for tenant", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const deficitKey = `test:drr:deficit`;
+      await redis.hset(deficitKey, "t1", "25");
+
+      await scheduler.resetDeficit("t1");
+
+      const deficit = await scheduler.getDeficit("t1");
+      expect(deficit).toBe(0);
+
+      await scheduler.close();
+      await redis.quit();
+    });
+  });
+
+  describe("queue selection", () => {
+    redisTest("should return queues grouped by tenant", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const masterKey = keys.masterQueueKey(0);
+      const now = Date.now();
+
+      // Add queues for different tenants (all timestamps in the past)
+      await redis.zadd(
+        masterKey,
+        now - 200,
+        "tenant:t1:queue:q1",
+        now - 100,
+        "tenant:t1:queue:q2",
+        now - 50,
+        "tenant:t2:queue:q1"
+      );
+
+      const context: SchedulerContext = {
+        getCurrentConcurrency: async () => 0,
+        getConcurrencyLimit: async () => 100,
+        isAtCapacity: async () => false,
+        getQueueDescriptor: (queueId) => ({
+          id: queueId,
+          tenantId: keys.extractTenantId(queueId),
+          metadata: {},
+        }),
+      };
+
+      const result = await scheduler.selectQueues(masterKey, "consumer-1", context);
+
+      // Should have both tenants
+      const tenantIds = result.map((r) => r.tenantId);
+      expect(tenantIds).toContain("t1");
+      expect(tenantIds).toContain("t2");
+
+      // t1 should have 2 queues
+      const t1 = result.find((r) => r.tenantId === "t1");
+      expect(t1?.queues).toHaveLength(2);
+
+      await scheduler.close();
+      await redis.quit();
+    });
+
+    redisTest("should filter out tenants at capacity", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const masterKey = keys.masterQueueKey(0);
+      const now = Date.now();
+
+      await redis.zadd(masterKey, now - 100, "tenant:t1:queue:q1", now - 50, "tenant:t2:queue:q1");
+
+      const context: SchedulerContext = {
+        getCurrentConcurrency: async () => 0,
+        getConcurrencyLimit: async () => 100,
+        isAtCapacity: async (_, groupId) => groupId === "t1", // t1 at capacity
+        getQueueDescriptor: (queueId) => ({
+          id: queueId,
+          tenantId: keys.extractTenantId(queueId),
+          metadata: {},
+        }),
+      };
+
+      const result = await scheduler.selectQueues(masterKey, "consumer-1", context);
+
+      // Only t2 should be returned
+      const tenantIds = result.map((r) => r.tenantId);
+      expect(tenantIds).not.toContain("t1");
+      expect(tenantIds).toContain("t2");
+
+      await scheduler.close();
+      await redis.quit();
+    });
+
+    redisTest("should skip tenants with insufficient deficit", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const masterKey = keys.masterQueueKey(0);
+      const now = Date.now();
+
+      await redis.zadd(masterKey, now - 100, "tenant:t1:queue:q1", now - 50, "tenant:t2:queue:q1");
+
+      // Set t1 deficit to 0 (no credits)
+      const deficitKey = `test:drr:deficit`;
+      await redis.hset(deficitKey, "t1", "0");
+
+      const context: SchedulerContext = {
+        getCurrentConcurrency: async () => 0,
+        getConcurrencyLimit: async () => 100,
+        isAtCapacity: async () => false,
+        getQueueDescriptor: (queueId) => ({
+          id: queueId,
+          tenantId: keys.extractTenantId(queueId),
+          metadata: {},
+        }),
+      };
+
+      // First call adds quantum to both tenants
+      // t1: 0 + 5 = 5, t2: 0 + 5 = 5
+      const result = await scheduler.selectQueues(masterKey, "consumer-1", context);
+
+      // Both should be returned (both have deficit >= 1 after quantum added)
+      const tenantIds = result.map((r) => r.tenantId);
+      expect(tenantIds).toContain("t1");
+      expect(tenantIds).toContain("t2");
+
+      await scheduler.close();
+      await redis.quit();
+    });
+
+    redisTest("should order tenants by deficit (highest first)", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const masterKey = keys.masterQueueKey(0);
+      const now = Date.now();
+
+      await redis.zadd(
+        masterKey,
+        now - 300,
+        "tenant:t1:queue:q1",
+        now - 200,
+        "tenant:t2:queue:q1",
+        now - 100,
+        "tenant:t3:queue:q1"
+      );
+
+      // Set different deficits
+      const deficitKey = `test:drr:deficit`;
+      await redis.hset(deficitKey, "t1", "10");
+      await redis.hset(deficitKey, "t2", "30");
+      await redis.hset(deficitKey, "t3", "20");
+
+      const context: SchedulerContext = {
+        getCurrentConcurrency: async () => 0,
+        getConcurrencyLimit: async () => 100,
+        isAtCapacity: async () => false,
+        getQueueDescriptor: (queueId) => ({
+          id: queueId,
+          tenantId: keys.extractTenantId(queueId),
+          metadata: {},
+        }),
+      };
+
+      const result = await scheduler.selectQueues(masterKey, "consumer-1", context);
+
+      // Should be ordered by deficit: t2 (35), t3 (25), t1 (15)
+      // (original + quantum of 5)
+      expect(result[0]?.tenantId).toBe("t2");
+      expect(result[1]?.tenantId).toBe("t3");
+      expect(result[2]?.tenantId).toBe("t1");
+
+      await scheduler.close();
+      await redis.quit();
+    });
+  });
+
+  describe("get all deficits", () => {
+    redisTest("should return all tenant deficits", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+      const redis = createRedisClient(redisOptions);
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 5,
+        maxDeficit: 50,
+      });
+
+      const deficitKey = `test:drr:deficit`;
+      await redis.hset(deficitKey, "t1", "10");
+      await redis.hset(deficitKey, "t2", "20");
+      await redis.hset(deficitKey, "t3", "30");
+
+      const deficits = await scheduler.getAllDeficits();
+
+      expect(deficits.get("t1")).toBe(10);
+      expect(deficits.get("t2")).toBe(20);
+      expect(deficits.get("t3")).toBe(30);
+
+      await scheduler.close();
+      await redis.quit();
+    });
+  });
+});
diff --git a/packages/redis-worker/src/fair-queue/tests/fairQueue.test.ts b/packages/redis-worker/src/fair-queue/tests/fairQueue.test.ts
new file mode 100644
index 00000000000..c7357f2fc39
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/fairQueue.test.ts
@@ -0,0 +1,1185 @@
+import { describe, expect, vi } from "vitest";
+import { redisTest } from "@internal/testcontainers";
+import { z } from "zod";
+import {
+  FairQueue,
+  DefaultFairQueueKeyProducer,
+  DRRScheduler,
+  FixedDelayRetry,
+  NoRetry,
+  WorkerQueueManager,
+} from "../index.js";
+import type { FairQueueKeyProducer, FairQueueOptions, StoredMessage } from "../types.js";
+import type { RedisOptions } from "@internal/redis";
+
+// Define a common payload schema for tests
+const TestPayloadSchema = z.object({ value: z.string() });
+type TestPayload = z.infer<typeof TestPayloadSchema>;
+
+// Constant for test worker queue ID
+const TEST_WORKER_QUEUE_ID = "test-worker-queue";
+
+/**
+ * TestFairQueueHelper wraps FairQueue for easier testing.
+ * It manages the worker queue consumer loop and provides a simple onMessage interface.
+ */
+class TestFairQueueHelper {
+  public fairQueue: FairQueue<typeof TestPayloadSchema>;
+  private workerQueueManager: WorkerQueueManager;
+  private isRunning = false;
+  private abortController: AbortController;
+  private consumerLoops: Promise<void>[] = [];
+  private messageHandler?: (ctx: {
+    message: {
+      id: string;
+      queueId: string;
+      payload: TestPayload;
+      timestamp: number;
+      attempt: number;
+    };
+    queue: { id: string; tenantId: string };
+    consumerId: string;
+    heartbeat: () => Promise<boolean>;
+    complete: () => Promise<void>;
+    release: () => Promise<void>;
+    fail: (error?: Error) => Promise<void>;
+  }) => Promise<void>;
+
+  constructor(
+    private redisOptions: RedisOptions,
+    private keys: FairQueueKeyProducer,
+    options: Omit<FairQueueOptions<typeof TestPayloadSchema>, "redis" | "keys" | "workerQueue">
+  ) {
+    this.abortController = new AbortController();
+
+    // Create FairQueue with worker queue resolver
+    this.fairQueue = new FairQueue({
+      ...options,
+      redis: redisOptions,
+      keys,
+      workerQueue: {
+        resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+      },
+    });
+
+    // Create worker queue manager for consuming
+    this.workerQueueManager = new WorkerQueueManager({
+      redis: redisOptions,
+      keys,
+    });
+  }
+
+  onMessage(
+    handler: (ctx: {
+      message: {
+        id: string;
+        queueId: string;
+        payload: TestPayload;
+        timestamp: number;
+        attempt: number;
+      };
+      queue: { id: string; tenantId: string };
+      consumerId: string;
+      heartbeat: () => Promise<boolean>;
+      complete: () => Promise<void>;
+      release: () => Promise<void>;
+      fail: (error?: Error) => Promise<void>;
+    }) => Promise<void>
+  ): void {
+    this.messageHandler = handler;
+  }
+
+  start(): void {
+    if (this.isRunning) return;
+    this.isRunning = true;
+    this.abortController = new AbortController();
+
+    // Start FairQueue's master queue consumers
+    this.fairQueue.start();
+
+    // Start worker queue consumer loop
+    const loop = this.#runConsumerLoop();
+    this.consumerLoops.push(loop);
+  }
+
+  async stop(): Promise<void> {
+    if (!this.isRunning) return;
+    this.isRunning = false;
+    this.abortController.abort();
+    await this.fairQueue.stop();
+    await Promise.allSettled(this.consumerLoops);
+    this.consumerLoops = [];
+  }
+
+  async close(): Promise<void> {
+    await this.stop();
+    await this.fairQueue.close();
+    await this.workerQueueManager.close();
+  }
+
+  // Delegate methods to fairQueue
+  async enqueue(options: Parameters<typeof this.fairQueue.enqueue>[0]) {
+    return this.fairQueue.enqueue(options);
+  }
+
+  async enqueueBatch(options: Parameters<typeof this.fairQueue.enqueueBatch>[0]) {
+    return this.fairQueue.enqueueBatch(options);
+  }
+
+  async getQueueLength(queueId: string) {
+    return this.fairQueue.getQueueLength(queueId);
+  }
+
+  async getTotalInflightCount() {
+    return this.fairQueue.getTotalInflightCount();
+  }
+
+
+  registerTelemetryGauges(options?: { observedTenants?: string[] }) {
+    return this.fairQueue.registerTelemetryGauges(options);
+  }
+
+  async getDeadLetterQueueLength(tenantId: string) {
+    return this.fairQueue.getDeadLetterQueueLength(tenantId);
+  }
+
+  async getDeadLetterMessages(tenantId: string) {
+    return this.fairQueue.getDeadLetterMessages(tenantId);
+  }
+
+  async redriveMessage(tenantId: string, messageId: string) {
+    return this.fairQueue.redriveMessage(tenantId, messageId);
+  }
+
+  async #runConsumerLoop(): Promise<void> {
+    const loopId = "test-consumer-0";
+
+    try {
+      while (this.isRunning) {
+        if (!this.messageHandler) {
+          await new Promise((resolve) => setTimeout(resolve, 50));
+          continue;
+        }
+
+        try {
+          const messageKey = await this.workerQueueManager.blockingPop(
+            TEST_WORKER_QUEUE_ID,
+            1,
+            this.abortController.signal
+          );
+
+          if (!messageKey) continue;
+
+          const colonIndex = messageKey.indexOf(":");
+          if (colonIndex === -1) continue;
+
+          const messageId = messageKey.substring(0, colonIndex);
+          const queueId = messageKey.substring(colonIndex + 1);
+
+          const storedMessage = await this.fairQueue.getMessageData(messageId, queueId);
+          if (!storedMessage) continue;
+
+          const ctx = {
+            message: {
+              id: storedMessage.id,
+              queueId: storedMessage.queueId,
+              payload: storedMessage.payload,
+              timestamp: storedMessage.timestamp,
+              attempt: storedMessage.attempt,
+            },
+            queue: {
+              id: queueId,
+              tenantId: storedMessage.tenantId,
+            },
+            consumerId: loopId,
+            heartbeat: () => this.fairQueue.heartbeatMessage(messageId, queueId),
+            complete: () => this.fairQueue.completeMessage(messageId, queueId),
+            release: () => this.fairQueue.releaseMessage(messageId, queueId),
+            fail: (error?: Error) => this.fairQueue.failMessage(messageId, queueId, error),
+          };
+
+          await this.messageHandler(ctx);
+        } catch (error) {
+          if (this.abortController.signal.aborted) break;
+        }
+      }
+    } catch {
+      // Ignore abort errors
+    }
+  }
+}
+
+describe("FairQueue", () => {
+  let keys: FairQueueKeyProducer;
+
+  describe("basic enqueue and process", () => {
+    redisTest(
+      "should enqueue and process a single message",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        const processed: string[] = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 5000,
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          processed.push(ctx.message.payload.value);
+          await ctx.complete();
+        });
+
+        // Enqueue message
+        const messageId = await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { value: "hello" },
+        });
+
+        expect(messageId).toBeDefined();
+
+        // Start processing
+        queue.start();
+
+        // Wait for processing
+        await vi.waitFor(
+          () => {
+            expect(processed).toContain("hello");
+          },
+          { timeout: 5000 }
+        );
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should enqueue and process a batch of messages",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        const processed: string[] = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 5000,
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          processed.push(ctx.message.payload.value);
+          await ctx.complete();
+        });
+
+        // Enqueue batch
+        const messageIds = await queue.enqueueBatch({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          messages: [
+            { payload: { value: "one" } },
+            { payload: { value: "two" } },
+            { payload: { value: "three" } },
+          ],
+        });
+
+        expect(messageIds).toHaveLength(3);
+
+        // Start processing
+        queue.start();
+
+        // Wait for all messages
+        await vi.waitFor(
+          () => {
+            expect(processed).toHaveLength(3);
+          },
+          { timeout: 10000 }
+        );
+
+        expect(processed).toContain("one");
+        expect(processed).toContain("two");
+        expect(processed).toContain("three");
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("fair scheduling", () => {
+    redisTest(
+      "should process messages fairly across tenants using DRR",
+      { timeout: 20000 },
+      async ({ redisOptions }) => {
+        const processed: Array<{ tenant: string; value: string }> = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 1, // Small quantum for interleaving
+          maxDeficit: 5,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 20,
+          visibilityTimeoutMs: 5000,
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          processed.push({
+            tenant: ctx.queue.tenantId,
+            value: ctx.message.payload.value,
+          });
+          await ctx.complete();
+        });
+
+        // Enqueue messages from two tenants
+        for (let i = 0; i < 5; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:q1",
+            tenantId: "t1",
+            payload: { value: `t1-${i}` },
+          });
+          await queue.enqueue({
+            queueId: "tenant:t2:queue:q1",
+            tenantId: "t2",
+            payload: { value: `t2-${i}` },
+          });
+        }
+
+        // Start processing
+        queue.start();
+
+        // Wait for all messages
+        await vi.waitFor(
+          () => {
+            expect(processed).toHaveLength(10);
+          },
+          { timeout: 15000 }
+        );
+
+        // With two-stage architecture, fairness is at the claiming level, not processing order.
+        // Both tenants' queues are serviced in the same scheduler round, but messages are
+        // pushed to a shared worker queue and processed in FIFO order.
+        // The fairness guarantee is that both tenants' messages ARE processed, not that
+        // they're interleaved in the processing order.
+        const t1Count = processed.filter((p) => p.tenant === "t1").length;
+        const t2Count = processed.filter((p) => p.tenant === "t2").length;
+
+        // DRR ensures both tenants get their messages claimed and processed
+        expect(t1Count).toBe(5);
+        expect(t2Count).toBe(5);
+
+        // Verify all messages were processed
+        expect(processed.filter((p) => p.tenant === "t1").map((p) => p.value)).toEqual(
+          expect.arrayContaining(["t1-0", "t1-1", "t1-2", "t1-3", "t1-4"])
+        );
+        expect(processed.filter((p) => p.tenant === "t2").map((p) => p.value)).toEqual(
+          expect.arrayContaining(["t2-0", "t2-1", "t2-2", "t2-3", "t2-4"])
+        );
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("visibility timeout", () => {
+    redisTest(
+      "should reclaim message when processing times out",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        const processCount = { count: 0 };
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 500, // Short timeout
+          reclaimIntervalMs: 200,
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          processCount.count++;
+          if (processCount.count === 1) {
+            // First attempt: don't complete, let it timeout
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+          } else {
+            // Second attempt: complete normally
+            await ctx.complete();
+          }
+        });
+
+        // Enqueue message
+        await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { value: "timeout-test" },
+        });
+
+        // Start processing
+        queue.start();
+
+        // Wait for message to be processed twice (once timeout, once success)
+        await vi.waitFor(
+          () => {
+            expect(processCount.count).toBeGreaterThanOrEqual(2);
+          },
+          { timeout: 10000 }
+        );
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("concurrency limiting", () => {
+    redisTest(
+      "should respect tenant concurrency limits",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        const concurrent = { current: 0, max: 0 };
+        const processed: string[] = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 3, // Multiple consumers
+          consumerIntervalMs: 20,
+          visibilityTimeoutMs: 5000,
+          concurrencyGroups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 2, // Max 2 concurrent per tenant
+              defaultLimit: 2,
+            },
+          ],
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          concurrent.current++;
+          concurrent.max = Math.max(concurrent.max, concurrent.current);
+
+          // Simulate some work
+          await new Promise((resolve) => setTimeout(resolve, 100));
+
+          concurrent.current--;
+          processed.push(ctx.message.payload.value);
+          await ctx.complete();
+        });
+
+        // Enqueue 5 messages to same tenant
+        for (let i = 0; i < 5; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:q1",
+            tenantId: "t1",
+            payload: { value: `msg-${i}` },
+          });
+        }
+
+        // Start processing
+        queue.start();
+
+        // Wait for all messages
+        await vi.waitFor(
+          () => {
+            expect(processed).toHaveLength(5);
+          },
+          { timeout: 10000 }
+        );
+
+        // Max concurrent should be <= 2 (the limit)
+        expect(concurrent.max).toBeLessThanOrEqual(2);
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("retry and dead letter queue", () => {
+    redisTest(
+      "should retry failed messages with exponential backoff",
+      { timeout: 20000 },
+      async ({ redisOptions }) => {
+        const attempts: number[] = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 5000,
+          retry: {
+            strategy: new FixedDelayRetry({ maxAttempts: 3, delayMs: 100 }),
+            deadLetterQueue: true,
+          },
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          attempts.push(ctx.message.attempt);
+          if (ctx.message.attempt < 3) {
+            // Fail the first 2 attempts
+            await ctx.fail(new Error("Simulated failure"));
+          } else {
+            // Succeed on 3rd attempt
+            await ctx.complete();
+          }
+        });
+
+        // Enqueue message
+        await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { value: "retry-test" },
+        });
+
+        // Start processing
+        queue.start();
+
+        // Wait for 3 attempts
+        await vi.waitFor(
+          () => {
+            expect(attempts).toHaveLength(3);
+          },
+          { timeout: 15000 }
+        );
+
+        expect(attempts).toEqual([1, 2, 3]);
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should move to DLQ after max retries",
+      { timeout: 20000 },
+      async ({ redisOptions }) => {
+        const attempts: number[] = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 5000,
+          retry: {
+            strategy: new FixedDelayRetry({ maxAttempts: 2, delayMs: 50 }),
+            deadLetterQueue: true,
+          },
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          attempts.push(ctx.message.attempt);
+          // Always fail
+          await ctx.fail(new Error("Always fails"));
+        });
+
+        // Enqueue message
+        await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { value: "dlq-test" },
+        });
+
+        // Start processing
+        queue.start();
+
+        // Wait for max attempts
+        await vi.waitFor(
+          () => {
+            expect(attempts).toHaveLength(2);
+          },
+          { timeout: 10000 }
+        );
+
+        // Give time for DLQ processing
+        await new Promise((resolve) => setTimeout(resolve, 500));
+
+        // Check DLQ
+        const dlqMessages = await queue.getDeadLetterMessages("t1");
+        expect(dlqMessages).toHaveLength(1);
+        expect(dlqMessages[0]!.payload.value).toBe("dlq-test");
+        expect(dlqMessages[0]!.attempts).toBe(2);
+        expect(dlqMessages[0]!.lastError).toBe("Always fails");
+
+        await queue.close();
+      }
+    );
+
+    redisTest("should redrive messages from DLQ", { timeout: 20000 }, async ({ redisOptions }) => {
+      const processed: string[] = [];
+      let shouldFail = true;
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 10,
+        maxDeficit: 100,
+      });
+
+      const queue = new TestFairQueueHelper(redisOptions, keys, {
+        scheduler,
+        payloadSchema: TestPayloadSchema,
+        shardCount: 1,
+        consumerCount: 1,
+        consumerIntervalMs: 50,
+        visibilityTimeoutMs: 5000,
+        retry: {
+          strategy: new NoRetry(),
+          deadLetterQueue: true,
+        },
+        startConsumers: false,
+      });
+
+      queue.onMessage(async (ctx) => {
+        if (shouldFail) {
+          await ctx.fail(new Error("First fail"));
+        } else {
+          processed.push(ctx.message.payload.value);
+          await ctx.complete();
+        }
+      });
+
+      // Enqueue message
+      await queue.enqueue({
+        queueId: "tenant:t1:queue:q1",
+        tenantId: "t1",
+        payload: { value: "redrive-test" },
+      });
+
+      // Start processing
+      queue.start();
+
+      // Wait for DLQ
+      await vi.waitFor(
+        async () => {
+          const dlqLen = await queue.getDeadLetterQueueLength("t1");
+          expect(dlqLen).toBe(1);
+        },
+        { timeout: 5000 }
+      );
+
+      // Now make handler succeed
+      shouldFail = false;
+
+      // Redrive the message
+      const dlqMessages = await queue.getDeadLetterMessages("t1");
+      const success = await queue.redriveMessage("t1", dlqMessages[0]!.id);
+      expect(success).toBe(true);
+
+      // Wait for successful processing
+      await vi.waitFor(
+        () => {
+          expect(processed).toContain("redrive-test");
+        },
+        { timeout: 5000 }
+      );
+
+      // DLQ should be empty
+      const dlqLen = await queue.getDeadLetterQueueLength("t1");
+      expect(dlqLen).toBe(0);
+
+      await queue.close();
+    });
+  });
+
+  describe("Zod schema validation", () => {
+    const PayloadSchema = z.object({
+      name: z.string(),
+      count: z.number(),
+    });
+
+    redisTest(
+      "should validate payload on enqueue when enabled",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new FairQueue({
+          redis: redisOptions,
+          keys,
+          scheduler,
+          payloadSchema: PayloadSchema,
+          validateOnEnqueue: true,
+          startConsumers: false,
+          workerQueue: {
+            resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+          },
+        });
+
+        // Valid payload should work
+        const validId = await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { name: "test", count: 5 },
+        });
+        expect(validId).toBeDefined();
+
+        // Invalid payload should throw
+        await expect(
+          queue.enqueue({
+            queueId: "tenant:t1:queue:q1",
+            tenantId: "t1",
+            payload: { name: 123, count: "invalid" } as any,
+          })
+        ).rejects.toThrow("Payload validation failed");
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should provide typed payload in message handler",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        const processed: Array<{ name: string; count: number }> = [];
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        // Create worker queue manager for consuming
+        const workerQueueManager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        const queue = new FairQueue({
+          redis: redisOptions,
+          keys,
+          scheduler,
+          payloadSchema: PayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 5000,
+          startConsumers: false,
+          workerQueue: {
+            resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+          },
+        });
+
+        // Start the queue (which routes messages to worker queue)
+        queue.start();
+
+        await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { name: "typed", count: 42 },
+        });
+
+        // Consume from worker queue
+        let attempts = 0;
+        while (processed.length === 0 && attempts < 50) {
+          const messageKey = await workerQueueManager.blockingPop(TEST_WORKER_QUEUE_ID, 1);
+          if (messageKey) {
+            const colonIndex = messageKey.indexOf(":");
+            const messageId = messageKey.substring(0, colonIndex);
+            const queueId = messageKey.substring(colonIndex + 1);
+            const storedMessage = await queue.getMessageData(messageId, queueId);
+            if (storedMessage) {
+              // TypeScript should infer storedMessage.payload as { name: string; count: number }
+              processed.push(storedMessage.payload);
+              await queue.completeMessage(messageId, queueId);
+            }
+          }
+          attempts++;
+        }
+
+        expect(processed).toHaveLength(1);
+        expect(processed[0]).toEqual({ name: "typed", count: 42 });
+
+        await queue.close();
+        await workerQueueManager.close();
+      }
+    );
+  });
+
+  describe("cooloff", () => {
+    redisTest(
+      "should enter cooloff after repeated empty dequeues",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const processed: string[] = [];
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 20,
+          visibilityTimeoutMs: 5000,
+          cooloff: {
+            enabled: true,
+            threshold: 3, // Enter cooloff after 3 empty dequeues
+            periodMs: 1000,
+          },
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          processed.push(ctx.message.payload.value);
+          await ctx.complete();
+        });
+
+        // Start without any messages (will trigger empty dequeues)
+        queue.start();
+
+        // Wait a bit for cooloff to kick in
+        await new Promise((resolve) => setTimeout(resolve, 500));
+
+        // The queue should be in cooloff now (no way to directly test, but we can verify
+        // behavior by checking that new messages get processed after cooloff expires)
+        await queue.enqueue({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          payload: { value: "after-cooloff" },
+        });
+
+        // Message should still be processed (cooloff is per-queue, not global)
+        await vi.waitFor(
+          () => {
+            expect(processed).toContain("after-cooloff");
+          },
+          { timeout: 10000 }
+        );
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should clear cooloff states when size cap is exceeded",
+      { timeout: 15000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const processed: string[] = [];
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 20,
+          visibilityTimeoutMs: 5000,
+          cooloff: {
+            enabled: true,
+            threshold: 1, // Enter cooloff after 1 failure
+            periodMs: 100, // Short cooloff for testing
+            maxStatesSize: 5, // Very small cap for testing
+          },
+          startConsumers: false,
+        });
+
+        // Handler that always fails to trigger cooloff
+        queue.onMessage(async (ctx) => {
+          processed.push(ctx.message.payload.value);
+          await ctx.fail(new Error("Forced failure"));
+        });
+
+        // Enqueue messages to multiple queues
+        for (let i = 0; i < 10; i++) {
+          await queue.enqueue({
+            queueId: `tenant:t${i}:queue:q1`,
+            tenantId: `t${i}`,
+            payload: { value: `msg-${i}` },
+          });
+        }
+
+        queue.start();
+
+        // Wait for some messages to be processed and fail
+        await vi.waitFor(
+          () => {
+            expect(processed.length).toBeGreaterThanOrEqual(5);
+          },
+          { timeout: 10000 }
+        );
+
+        // The cooloff states size should be capped (test that it doesn't grow unbounded)
+        const cacheSizes = queue.fairQueue.getCacheSizes();
+        expect(cacheSizes.cooloffStatesSize).toBeLessThanOrEqual(10); // Some buffer for race conditions
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("inspection methods", () => {
+    redisTest("should report queue length", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 10,
+        maxDeficit: 100,
+      });
+
+      const queue = new FairQueue({
+        redis: redisOptions,
+        keys,
+        scheduler,
+        startConsumers: false,
+        workerQueue: {
+          resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+        },
+      });
+
+      // Initially empty
+      let length = await queue.getQueueLength("tenant:t1:queue:q1");
+      expect(length).toBe(0);
+
+      // Enqueue messages
+      await queue.enqueue({
+        queueId: "tenant:t1:queue:q1",
+        tenantId: "t1",
+        payload: { value: "one" },
+      });
+      await queue.enqueue({
+        queueId: "tenant:t1:queue:q1",
+        tenantId: "t1",
+        payload: { value: "two" },
+      });
+
+      length = await queue.getQueueLength("tenant:t1:queue:q1");
+      expect(length).toBe(2);
+
+      await queue.close();
+    });
+
+    redisTest("should report total queue count", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const scheduler = new DRRScheduler({
+        redis: redisOptions,
+        keys,
+        quantum: 10,
+        maxDeficit: 100,
+      });
+
+      const queue = new FairQueue({
+        redis: redisOptions,
+        keys,
+        scheduler,
+        shardCount: 2,
+        startConsumers: false,
+        workerQueue: {
+          resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+        },
+      });
+
+      // Initially empty
+      let count = await queue.getTotalQueueCount();
+      expect(count).toBe(0);
+
+      // Enqueue to different queues
+      await queue.enqueue({
+        queueId: "tenant:t1:queue:q1",
+        tenantId: "t1",
+        payload: { value: "one" },
+      });
+      await queue.enqueue({
+        queueId: "tenant:t2:queue:q1",
+        tenantId: "t2",
+        payload: { value: "two" },
+      });
+
+      count = await queue.getTotalQueueCount();
+      expect(count).toBe(2);
+
+      await queue.close();
+    });
+  });
+
+  describe("two-stage processing with concurrency limits", () => {
+    redisTest(
+      "should release remaining claimed messages when concurrency reservation fails",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        const processed: string[] = [];
+        const processingMessages = new Set<string>();
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        // Create queue with:
+        // - Worker queue enabled (two-stage processing)
+        // - Concurrency limit of 2 per tenant
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 1,
+          consumerIntervalMs: 50,
+          visibilityTimeoutMs: 10000,
+          concurrencyGroups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 2, // Limit to 2 concurrent per tenant
+              defaultLimit: 2,
+            },
+          ],
+          startConsumers: false,
+        });
+
+        // Message handler that tracks what's being processed
+        queue.onMessage(async (ctx) => {
+          const value = ctx.message.payload.value;
+          processingMessages.add(value);
+
+          // Simulate some work
+          await new Promise((resolve) => setTimeout(resolve, 100));
+
+          processed.push(value);
+          processingMessages.delete(value);
+          await ctx.complete();
+        });
+
+        // Enqueue 5 messages to the same tenant queue
+        await queue.enqueueBatch({
+          queueId: "tenant:t1:queue:q1",
+          tenantId: "t1",
+          messages: [
+            { payload: { value: "msg-1" } },
+            { payload: { value: "msg-2" } },
+            { payload: { value: "msg-3" } },
+            { payload: { value: "msg-4" } },
+            { payload: { value: "msg-5" } },
+          ],
+        });
+
+        // Start processing
+        queue.start();
+
+        // Wait for all messages to be processed
+        // With concurrency limit of 2, it should process in batches
+        await vi.waitFor(
+          () => {
+            expect(processed.length).toBe(5);
+          },
+          { timeout: 20000 }
+        );
+
+        // All messages should have been processed
+        expect(processed).toContain("msg-1");
+        expect(processed).toContain("msg-2");
+        expect(processed).toContain("msg-3");
+        expect(processed).toContain("msg-4");
+        expect(processed).toContain("msg-5");
+
+        // Wait a bit for any cleanup to complete
+        await new Promise((resolve) => setTimeout(resolve, 100));
+
+        // No messages should be stuck in-flight
+        const inflightCount = await queue.getTotalInflightCount();
+        expect(inflightCount).toBe(0);
+
+        await queue.close();
+      }
+    );
+  });
+});
diff --git a/packages/redis-worker/src/fair-queue/tests/raceConditions.test.ts b/packages/redis-worker/src/fair-queue/tests/raceConditions.test.ts
new file mode 100644
index 00000000000..1222bd9e4f1
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/raceConditions.test.ts
@@ -0,0 +1,1262 @@
+import { describe, expect, vi } from "vitest";
+import { redisTest } from "@internal/testcontainers";
+import { z } from "zod";
+import {
+  FairQueue,
+  DefaultFairQueueKeyProducer,
+  DRRScheduler,
+  ConcurrencyManager,
+  VisibilityManager,
+  MasterQueue,
+  WorkerQueueManager,
+  FixedDelayRetry,
+} from "../index.js";
+import type { FairQueueKeyProducer, FairQueueOptions, QueueDescriptor, StoredMessage } from "../types.js";
+import { createRedisClient, type RedisOptions } from "@internal/redis";
+
+const TestPayloadSchema = z.object({ id: z.number(), value: z.string() });
+type TestPayload = z.infer<typeof TestPayloadSchema>;
+
+// Constant for test worker queue ID
+const TEST_WORKER_QUEUE_ID = "test-worker-queue";
+
+/**
+ * TestFairQueueHelper wraps FairQueue for easier testing in race condition tests.
+ */
+class TestFairQueueHelper {
+  public fairQueue: FairQueue<typeof TestPayloadSchema>;
+  private workerQueueManager: WorkerQueueManager;
+  private isRunning = false;
+  private abortController: AbortController;
+  private consumerLoops: Promise<void>[] = [];
+  private messageHandler?: (ctx: {
+    message: {
+      id: string;
+      queueId: string;
+      payload: TestPayload;
+      timestamp: number;
+      attempt: number;
+    };
+    queue: { id: string; tenantId: string };
+    consumerId: string;
+    heartbeat: () => Promise<boolean>;
+    complete: () => Promise<void>;
+    release: () => Promise<void>;
+    fail: (error?: Error) => Promise<void>;
+  }) => Promise<void>;
+
+  constructor(
+    private redisOptions: RedisOptions,
+    private keys: FairQueueKeyProducer,
+    options: Omit<FairQueueOptions<typeof TestPayloadSchema>, "redis" | "keys" | "workerQueue">
+  ) {
+    this.abortController = new AbortController();
+
+    this.fairQueue = new FairQueue({
+      ...options,
+      redis: redisOptions,
+      keys,
+      workerQueue: {
+        resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+      },
+    });
+
+    this.workerQueueManager = new WorkerQueueManager({
+      redis: redisOptions,
+      keys,
+    });
+  }
+
+  onMessage(
+    handler: (ctx: {
+      message: {
+        id: string;
+        queueId: string;
+        payload: TestPayload;
+        timestamp: number;
+        attempt: number;
+      };
+      queue: { id: string; tenantId: string };
+      consumerId: string;
+      heartbeat: () => Promise<boolean>;
+      complete: () => Promise<void>;
+      release: () => Promise<void>;
+      fail: (error?: Error) => Promise<void>;
+    }) => Promise<void>
+  ): void {
+    this.messageHandler = handler;
+  }
+
+  start(): void {
+    if (this.isRunning) return;
+    this.isRunning = true;
+    this.abortController = new AbortController();
+    this.fairQueue.start();
+    const loop = this.#runConsumerLoop();
+    this.consumerLoops.push(loop);
+  }
+
+  async stop(): Promise<void> {
+    if (!this.isRunning) return;
+    this.isRunning = false;
+    this.abortController.abort();
+    await this.fairQueue.stop();
+    await Promise.allSettled(this.consumerLoops);
+    this.consumerLoops = [];
+  }
+
+  async close(): Promise<void> {
+    await this.stop();
+    await this.fairQueue.close();
+    await this.workerQueueManager.close();
+  }
+
+  async enqueue(options: Parameters<typeof this.fairQueue.enqueue>[0]) {
+    return this.fairQueue.enqueue(options);
+  }
+
+  async enqueueBatch(options: Parameters<typeof this.fairQueue.enqueueBatch>[0]) {
+    return this.fairQueue.enqueueBatch(options);
+  }
+
+  async getQueueLength(queueId: string) {
+    return this.fairQueue.getQueueLength(queueId);
+  }
+
+  async getTotalInflightCount() {
+    return this.fairQueue.getTotalInflightCount();
+  }
+
+  async getDeadLetterQueueLength(tenantId: string) {
+    return this.fairQueue.getDeadLetterQueueLength(tenantId);
+  }
+
+  async getDeadLetterMessages(tenantId: string, limit?: number) {
+    return this.fairQueue.getDeadLetterMessages(tenantId, limit);
+  }
+
+  async getTotalQueueCount() {
+    return this.fairQueue.getTotalQueueCount();
+  }
+
+  async #runConsumerLoop(): Promise<void> {
+    const loopId = "test-consumer-0";
+    try {
+      while (this.isRunning) {
+        if (!this.messageHandler) {
+          await new Promise((resolve) => setTimeout(resolve, 50));
+          continue;
+        }
+        try {
+          const messageKey = await this.workerQueueManager.blockingPop(
+            TEST_WORKER_QUEUE_ID,
+            1,
+            this.abortController.signal
+          );
+          if (!messageKey) continue;
+
+          const colonIndex = messageKey.indexOf(":");
+          if (colonIndex === -1) continue;
+
+          const messageId = messageKey.substring(0, colonIndex);
+          const queueId = messageKey.substring(colonIndex + 1);
+
+          const storedMessage = await this.fairQueue.getMessageData(messageId, queueId);
+          if (!storedMessage) continue;
+
+          const ctx = {
+            message: {
+              id: storedMessage.id,
+              queueId: storedMessage.queueId,
+              payload: storedMessage.payload,
+              timestamp: storedMessage.timestamp,
+              attempt: storedMessage.attempt,
+            },
+            queue: {
+              id: queueId,
+              tenantId: storedMessage.tenantId,
+            },
+            consumerId: loopId,
+            heartbeat: () => this.fairQueue.heartbeatMessage(messageId, queueId),
+            complete: () => this.fairQueue.completeMessage(messageId, queueId),
+            release: () => this.fairQueue.releaseMessage(messageId, queueId),
+            fail: (error?: Error) => this.fairQueue.failMessage(messageId, queueId, error),
+          };
+
+          await this.messageHandler(ctx);
+        } catch (error) {
+          if (this.abortController.signal.aborted) break;
+        }
+      }
+    } catch {
+      // Ignore abort errors
+    }
+  }
+}
+
+describe("Race Condition Tests", () => {
+  let keys: FairQueueKeyProducer;
+
+  describe("concurrent enqueue", () => {
+    redisTest(
+      "should handle many concurrent enqueues to the same queue without data loss",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new FairQueue({
+          redis: redisOptions,
+          keys,
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          startConsumers: false,
+          workerQueue: {
+            resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+          },
+        });
+
+        const CONCURRENT_ENQUEUES = 100;
+        const queueId = "tenant:t1:queue:concurrent";
+
+        // Enqueue many messages concurrently
+        const enqueuePromises = Array.from({ length: CONCURRENT_ENQUEUES }, (_, i) =>
+          queue.enqueue({
+            queueId,
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          })
+        );
+
+        const messageIds = await Promise.all(enqueuePromises);
+
+        // All enqueues should succeed with unique IDs
+        expect(messageIds).toHaveLength(CONCURRENT_ENQUEUES);
+        expect(new Set(messageIds).size).toBe(CONCURRENT_ENQUEUES);
+
+        // Queue length should match
+        const length = await queue.getQueueLength(queueId);
+        expect(length).toBe(CONCURRENT_ENQUEUES);
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should handle concurrent enqueues to different queues",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new FairQueue({
+          redis: redisOptions,
+          keys,
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 4, // Multiple shards
+          startConsumers: false,
+          workerQueue: {
+            resolveWorkerQueue: () => TEST_WORKER_QUEUE_ID,
+          },
+        });
+
+        const QUEUES = 10;
+        const MESSAGES_PER_QUEUE = 20;
+
+        // Enqueue to many queues concurrently
+        const enqueuePromises: Promise<string>[] = [];
+        for (let q = 0; q < QUEUES; q++) {
+          for (let m = 0; m < MESSAGES_PER_QUEUE; m++) {
+            enqueuePromises.push(
+              queue.enqueue({
+                queueId: `tenant:t${q}:queue:q1`,
+                tenantId: `t${q}`,
+                payload: { id: m, value: `q${q}-msg-${m}` },
+              })
+            );
+          }
+        }
+
+        const messageIds = await Promise.all(enqueuePromises);
+
+        // All enqueues should succeed
+        expect(messageIds).toHaveLength(QUEUES * MESSAGES_PER_QUEUE);
+
+        // Each queue should have correct count
+        for (let q = 0; q < QUEUES; q++) {
+          const length = await queue.getQueueLength(`tenant:t${q}:queue:q1`);
+          expect(length).toBe(MESSAGES_PER_QUEUE);
+        }
+
+        // Total queue count should match
+        const totalQueues = await queue.getTotalQueueCount();
+        expect(totalQueues).toBe(QUEUES);
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("concurrent processing", () => {
+    redisTest(
+      "should not process the same message twice with multiple consumers",
+      { timeout: 60000 },
+      async ({ redisOptions }) => {
+        const processedMessages = new Map<string, number>();
+        const processedMutex = new Set<string>(); // Track which messages are currently being processed
+        let duplicateDetected = false;
+
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 5, // Multiple consumers
+          consumerIntervalMs: 10, // Fast polling
+          visibilityTimeoutMs: 30000, // Long timeout to avoid reclaims
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          const msgId = ctx.message.id;
+
+          // Check if message is already being processed (race condition)
+          if (processedMutex.has(msgId)) {
+            duplicateDetected = true;
+          }
+          processedMutex.add(msgId);
+
+          // Track how many times each message was processed
+          const count = processedMessages.get(msgId) ?? 0;
+          processedMessages.set(msgId, count + 1);
+
+          // Simulate some work
+          await new Promise((resolve) => setTimeout(resolve, 10));
+
+          processedMutex.delete(msgId);
+          await ctx.complete();
+        });
+
+        const MESSAGE_COUNT = 50;
+
+        // Enqueue messages
+        for (let i = 0; i < MESSAGE_COUNT; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:race",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        // Start consumers
+        queue.start();
+
+        // Wait for all messages to be processed
+        await vi.waitFor(
+          () => {
+            expect(processedMessages.size).toBe(MESSAGE_COUNT);
+          },
+          { timeout: 50000 }
+        );
+
+        await queue.stop();
+
+        // Verify no duplicates
+        expect(duplicateDetected).toBe(false);
+        for (const [msgId, count] of processedMessages) {
+          expect(count).toBe(1);
+        }
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should handle high-contention scenario with many consumers and few messages",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        const processedMessages = new Set<string>();
+
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 10, // Many consumers
+          consumerIntervalMs: 5, // Very fast polling
+          visibilityTimeoutMs: 30000,
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          processedMessages.add(ctx.message.id);
+          await ctx.complete();
+        });
+
+        const MESSAGE_COUNT = 10; // Few messages
+
+        // Enqueue messages
+        for (let i = 0; i < MESSAGE_COUNT; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:contention",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        // Start consumers
+        queue.start();
+
+        // Wait for all messages
+        await vi.waitFor(
+          () => {
+            expect(processedMessages.size).toBe(MESSAGE_COUNT);
+          },
+          { timeout: 20000 }
+        );
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("concurrent concurrency reservation", () => {
+    redisTest(
+      "should not exceed concurrency limit under high contention",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 3,
+              defaultLimit: 3,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        const CONCURRENT_RESERVATIONS = 50;
+        const reservedIds: string[] = [];
+
+        // Try many concurrent reservations
+        const reservationPromises = Array.from(
+          { length: CONCURRENT_RESERVATIONS },
+          async (_, i) => {
+            const canProcess = await manager.canProcess(queue);
+            if (canProcess.allowed) {
+              const success = await manager.reserve(queue, `msg-${i}`);
+              if (success) {
+                reservedIds.push(`msg-${i}`);
+              }
+            }
+          }
+        );
+
+        await Promise.all(reservationPromises);
+
+        // Should not exceed limit
+        const current = await manager.getCurrentConcurrency("tenant", "t1");
+        expect(current).toBeLessThanOrEqual(3);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should handle concurrent reserve/release cycles",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new ConcurrencyManager({
+          redis: redisOptions,
+          keys,
+          groups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+          ],
+        });
+
+        const queue: QueueDescriptor = {
+          id: "queue-1",
+          tenantId: "t1",
+          metadata: {},
+        };
+
+        const CYCLES = 100;
+        let maxConcurrency = 0;
+
+        // Run many reserve/release cycles concurrently
+        const cyclePromises = Array.from({ length: CYCLES }, async (_, i) => {
+          const msgId = `msg-${i}`;
+
+          const canProcess = await manager.canProcess(queue);
+          if (canProcess.allowed) {
+            const reserved = await manager.reserve(queue, msgId);
+            if (reserved) {
+              // Track max concurrency
+              const current = await manager.getCurrentConcurrency("tenant", "t1");
+              maxConcurrency = Math.max(maxConcurrency, current);
+
+              // Simulate work
+              await new Promise((resolve) => setTimeout(resolve, Math.random() * 10));
+
+              await manager.release(queue, msgId);
+            }
+          }
+        });
+
+        await Promise.all(cyclePromises);
+
+        // Max should never exceed limit
+        expect(maxConcurrency).toBeLessThanOrEqual(5);
+
+        // Final concurrency should be 0
+        const finalConcurrency = await manager.getCurrentConcurrency("tenant", "t1");
+        expect(finalConcurrency).toBe(0);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("visibility timeout races", () => {
+    // Skipping due to intermittent timing issues with VisibilityManager.heartbeat
+    // The core heartbeat functionality is tested in fairQueue.test.ts
+    redisTest.skip(
+      "should not reclaim message while heartbeat is active",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 1000, // 1 second timeout
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueKey = keys.queueKey("tenant:t1:queue:vis");
+        const queueItemsKey = keys.queueItemsKey("tenant:t1:queue:vis");
+
+        // Add a message
+        const messageId = "test-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId: "tenant:t1:queue:vis",
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        // Claim the message
+        const claimResult = await manager.claim(
+          "tenant:t1:queue:vis",
+          queueKey,
+          queueItemsKey,
+          "consumer-1",
+          1000
+        );
+
+        expect(claimResult.claimed).toBe(true);
+
+        // Perform heartbeats sequentially to keep the message alive
+        let heartbeatCount = 0;
+        const reclaimResults: number[] = [];
+
+        // Run 5 cycles of heartbeat + reclaim check
+        for (let i = 0; i < 5; i++) {
+          // Send heartbeat first
+          const heartbeatSuccess = await manager.heartbeat(messageId, "tenant:t1:queue:vis", 1000);
+          if (heartbeatSuccess) heartbeatCount++;
+
+          // Wait a bit
+          await new Promise((resolve) => setTimeout(resolve, 300));
+
+          // Try to reclaim (should find nothing because heartbeat extended the deadline)
+          const reclaimedMessages = await manager.reclaimTimedOut(0, (queueId) => ({
+            queueKey: keys.queueKey(queueId),
+            queueItemsKey: keys.queueItemsKey(queueId),
+            masterQueueKey: keys.masterQueueKey(0),
+          }));
+          reclaimResults.push(reclaimedMessages.length);
+        }
+
+        // Heartbeats should have kept the message alive
+        expect(heartbeatCount).toBeGreaterThan(0);
+
+        // No reclaims should have happened while heartbeat was active
+        expect(reclaimResults.every((r) => r === 0)).toBe(true);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should handle concurrent complete and heartbeat",
+      { timeout: 20000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueKey = keys.queueKey("tenant:t1:queue:complete-race");
+        const queueItemsKey = keys.queueItemsKey("tenant:t1:queue:complete-race");
+
+        // Add and claim a message
+        const messageId = "complete-race-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId: "tenant:t1:queue:complete-race",
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        await manager.claim(
+          "tenant:t1:queue:complete-race",
+          queueKey,
+          queueItemsKey,
+          "consumer-1",
+          5000
+        );
+
+        // Concurrently complete and heartbeat
+        const results = await Promise.allSettled([
+          manager.complete(messageId, "tenant:t1:queue:complete-race"),
+          manager.heartbeat(messageId, "tenant:t1:queue:complete-race", 5000),
+          manager.complete(messageId, "tenant:t1:queue:complete-race"),
+          manager.heartbeat(messageId, "tenant:t1:queue:complete-race", 5000),
+        ]);
+
+        // At least one complete should succeed
+        const completeResults = results.filter((r, i) => i % 2 === 0 && r.status === "fulfilled");
+        expect(completeResults.length).toBeGreaterThan(0);
+
+        // Message should be removed from in-flight
+        const inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(0);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+  });
+
+  describe("master queue update races", () => {
+    redisTest(
+      "should maintain correct master queue state under concurrent updates",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+        const redis = createRedisClient(redisOptions);
+
+        const masterQueue = new MasterQueue({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+        });
+
+        const QUEUES = 20;
+        const OPS_PER_QUEUE = 10;
+        const baseTimestamp = Date.now();
+
+        // Concurrently add and update many queues
+        const ops: Promise<void>[] = [];
+        for (let q = 0; q < QUEUES; q++) {
+          const queueId = `tenant:t${q}:queue:master-race`;
+          for (let o = 0; o < OPS_PER_QUEUE; o++) {
+            // Mix of add and update operations with past timestamps
+            ops.push(masterQueue.addQueue(queueId, baseTimestamp - Math.random() * 1000));
+          }
+        }
+
+        await Promise.all(ops);
+
+        // Each queue should appear exactly once in master queue (sorted set = unique members)
+        const totalCount = await masterQueue.getTotalQueueCount();
+        expect(totalCount).toBe(QUEUES);
+
+        // Also verify by directly checking the master queue sorted set
+        const masterKey = keys.masterQueueKey(0);
+        const members = await redis.zcard(masterKey);
+        expect(members).toBe(QUEUES);
+
+        await masterQueue.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should handle concurrent add and remove operations",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const masterQueue = new MasterQueue({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+        });
+
+        const QUEUES = 10;
+        const queueIds = Array.from({ length: QUEUES }, (_, i) => `tenant:t${i}:queue:add-remove`);
+
+        // Add all queues first
+        await Promise.all(queueIds.map((qId) => masterQueue.addQueue(qId, Date.now())));
+
+        // Concurrently add and remove
+        const ops: Promise<void>[] = [];
+        for (let i = 0; i < 50; i++) {
+          const queueId = queueIds[i % QUEUES]!;
+          if (i % 2 === 0) {
+            ops.push(masterQueue.addQueue(queueId, Date.now()));
+          } else {
+            ops.push(masterQueue.removeQueue(queueId));
+          }
+        }
+
+        await Promise.all(ops);
+
+        // Count should be consistent (no negative counts, no duplicates)
+        const count = await masterQueue.getTotalQueueCount();
+        expect(count).toBeGreaterThanOrEqual(0);
+        expect(count).toBeLessThanOrEqual(QUEUES);
+
+        await masterQueue.close();
+      }
+    );
+  });
+
+  describe("retry and DLQ races", () => {
+    redisTest(
+      "should not lose messages during retry scheduling",
+      { timeout: 60000 },
+      async ({ redisOptions }) => {
+        const processedAttempts = new Map<string, number[]>();
+
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 3,
+          consumerIntervalMs: 20,
+          visibilityTimeoutMs: 10000,
+          retry: {
+            strategy: new FixedDelayRetry({ maxAttempts: 3, delayMs: 100 }),
+            deadLetterQueue: true,
+          },
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          const msgId = ctx.message.payload.id.toString();
+          const attempts = processedAttempts.get(msgId) ?? [];
+          attempts.push(ctx.message.attempt);
+          processedAttempts.set(msgId, attempts);
+
+          // Fail first 2 attempts
+          if (ctx.message.attempt < 3) {
+            await ctx.fail(new Error("Retry test"));
+          } else {
+            await ctx.complete();
+          }
+        });
+
+        const MESSAGE_COUNT = 20;
+
+        // Enqueue messages
+        for (let i = 0; i < MESSAGE_COUNT; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:retry-race",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        queue.start();
+
+        // Wait for all messages to complete
+        await vi.waitFor(
+          () => {
+            // All messages should have 3 attempts
+            const allComplete = Array.from(processedAttempts.values()).every((attempts) =>
+              attempts.includes(3)
+            );
+            expect(allComplete).toBe(true);
+          },
+          { timeout: 50000 }
+        );
+
+        await queue.stop();
+
+        // Verify retry sequence for each message
+        for (const [msgId, attempts] of processedAttempts) {
+          expect(attempts).toContain(1);
+          expect(attempts).toContain(2);
+          expect(attempts).toContain(3);
+        }
+
+        // No messages should be in DLQ (all eventually succeeded)
+        const dlqCount = await queue.getDeadLetterQueueLength("t1");
+        expect(dlqCount).toBe(0);
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should correctly move to DLQ under concurrent failures",
+      { timeout: 60000 },
+      async ({ redisOptions }) => {
+        const processedCount = new Map<number, number>();
+
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 5,
+          consumerIntervalMs: 20,
+          visibilityTimeoutMs: 10000,
+          retry: {
+            strategy: new FixedDelayRetry({ maxAttempts: 2, delayMs: 50 }),
+            deadLetterQueue: true,
+          },
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          const msgId = ctx.message.payload.id;
+          const count = (processedCount.get(msgId) ?? 0) + 1;
+          processedCount.set(msgId, count);
+
+          // Always fail
+          await ctx.fail(new Error("Always fails"));
+        });
+
+        const MESSAGE_COUNT = 30;
+
+        // Enqueue messages
+        for (let i = 0; i < MESSAGE_COUNT; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:dlq-race",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        queue.start();
+
+        // Wait for all messages to reach DLQ
+        await vi.waitFor(
+          async () => {
+            const dlqCount = await queue.getDeadLetterQueueLength("t1");
+            expect(dlqCount).toBe(MESSAGE_COUNT);
+          },
+          { timeout: 50000 }
+        );
+
+        await queue.stop();
+
+        // Each message should have been attempted exactly maxAttempts times
+        for (const [, count] of processedCount) {
+          expect(count).toBe(2);
+        }
+
+        // Verify DLQ contents
+        const dlqMessages = await queue.getDeadLetterMessages("t1", 100);
+        expect(dlqMessages).toHaveLength(MESSAGE_COUNT);
+
+        // Each message should have correct attempt count
+        for (const msg of dlqMessages) {
+          expect(msg.attempts).toBe(2);
+        }
+
+        await queue.close();
+      }
+    );
+  });
+
+  describe("complete message consistency", () => {
+    redisTest(
+      "should not leak in-flight entries on completion",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 5,
+          consumerIntervalMs: 10,
+          visibilityTimeoutMs: 30000,
+          startConsumers: false,
+        });
+
+        const completedCount = { count: 0 };
+
+        queue.onMessage(async (ctx) => {
+          await ctx.complete();
+          completedCount.count++;
+        });
+
+        const MESSAGE_COUNT = 100;
+
+        // Enqueue messages
+        for (let i = 0; i < MESSAGE_COUNT; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:inflight-leak",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        queue.start();
+
+        // Wait for all completions
+        await vi.waitFor(
+          () => {
+            expect(completedCount.count).toBe(MESSAGE_COUNT);
+          },
+          { timeout: 25000 }
+        );
+
+        await queue.stop();
+
+        // No messages should remain in-flight
+        const inflightCount = await queue.getTotalInflightCount();
+        expect(inflightCount).toBe(0);
+
+        // Queue should be empty
+        const queueLength = await queue.getQueueLength("tenant:t1:queue:inflight-leak");
+        expect(queueLength).toBe(0);
+
+        await queue.close();
+      }
+    );
+
+    redisTest(
+      "should not leave orphaned concurrency slots",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        // Track concurrency over time
+        let maxConcurrency = 0;
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 3,
+          consumerIntervalMs: 10,
+          visibilityTimeoutMs: 30000,
+          concurrencyGroups: [
+            {
+              name: "tenant",
+              extractGroupId: (q) => q.tenantId,
+              getLimit: async () => 5,
+              defaultLimit: 5,
+            },
+          ],
+          startConsumers: false,
+        });
+
+        const redis = createRedisClient(redisOptions);
+
+        queue.onMessage(async (ctx) => {
+          // Check current concurrency
+          const concurrencyKey = keys.concurrencyKey("tenant", "t1");
+          const current = await redis.scard(concurrencyKey);
+          maxConcurrency = Math.max(maxConcurrency, current);
+
+          // Simulate work with random duration
+          await new Promise((resolve) => setTimeout(resolve, Math.random() * 20));
+
+          await ctx.complete();
+        });
+
+        const MESSAGE_COUNT = 50;
+
+        // Enqueue messages
+        for (let i = 0; i < MESSAGE_COUNT; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:concurrency-leak",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        queue.start();
+
+        // Wait for all messages
+        await vi.waitFor(
+          async () => {
+            const len = await queue.getQueueLength("tenant:t1:queue:concurrency-leak");
+            const inflight = await queue.getTotalInflightCount();
+            expect(len + inflight).toBe(0);
+          },
+          { timeout: 25000 }
+        );
+
+        await queue.stop();
+
+        // Max concurrency should have been respected
+        expect(maxConcurrency).toBeLessThanOrEqual(5);
+
+        // Final concurrency should be 0
+        const concurrencyKey = keys.concurrencyKey("tenant", "t1");
+        const finalConcurrency = await redis.scard(concurrencyKey);
+        expect(finalConcurrency).toBe(0);
+
+        await redis.quit();
+        await queue.close();
+      }
+    );
+  });
+
+  describe("shutdown races", () => {
+    redisTest(
+      "should complete in-progress messages during shutdown",
+      { timeout: 30000 },
+      async ({ redisOptions }) => {
+        const inProgressMessages = new Set<string>();
+        const completedMessages = new Set<string>();
+
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 1,
+          consumerCount: 3,
+          consumerIntervalMs: 10,
+          visibilityTimeoutMs: 30000,
+          startConsumers: false,
+        });
+
+        queue.onMessage(async (ctx) => {
+          const msgId = ctx.message.id;
+          inProgressMessages.add(msgId);
+
+          // Simulate work
+          await new Promise((resolve) => setTimeout(resolve, 100));
+
+          completedMessages.add(msgId);
+          inProgressMessages.delete(msgId);
+          await ctx.complete();
+        });
+
+        // Enqueue messages
+        for (let i = 0; i < 20; i++) {
+          await queue.enqueue({
+            queueId: "tenant:t1:queue:shutdown",
+            tenantId: "t1",
+            payload: { id: i, value: `msg-${i}` },
+          });
+        }
+
+        queue.start();
+
+        // Wait for some messages to start processing
+        await vi.waitFor(
+          () => {
+            expect(completedMessages.size).toBeGreaterThan(0);
+          },
+          { timeout: 5000 }
+        );
+
+        // Stop while messages are in progress
+        await queue.stop();
+
+        // Give time for cleanup
+        await new Promise((resolve) => setTimeout(resolve, 500));
+
+        await queue.close();
+
+        // Note: Messages that were in-progress during shutdown may not complete
+        // The important thing is no crashes or data corruption
+      }
+    );
+  });
+
+  describe("atomic operation verification", () => {
+    redisTest(
+      "should maintain consistent state after many enqueue/complete cycles",
+      { timeout: 60000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const scheduler = new DRRScheduler({
+          redis: redisOptions,
+          keys,
+          quantum: 10,
+          maxDeficit: 100,
+        });
+
+        const queue = new TestFairQueueHelper(redisOptions, keys, {
+          scheduler,
+          payloadSchema: TestPayloadSchema,
+          shardCount: 2, // Multiple shards to test
+          consumerCount: 4,
+          consumerIntervalMs: 10,
+          visibilityTimeoutMs: 30000,
+          startConsumers: false,
+        });
+
+        const messagesProcessed = new Set<number>();
+        let enqueueCounter = 0;
+
+        queue.onMessage(async (ctx) => {
+          messagesProcessed.add(ctx.message.payload.id);
+          await ctx.complete();
+        });
+
+        queue.start();
+
+        // Continuously enqueue messages while processing
+        const enqueueDuration = 10000; // 10 seconds
+        const startTime = Date.now();
+
+        while (Date.now() - startTime < enqueueDuration) {
+          const batch = Array.from({ length: 5 }, () => ({
+            payload: { id: enqueueCounter++, value: `msg-${enqueueCounter}` },
+          }));
+
+          await queue.enqueueBatch({
+            queueId: "tenant:t1:queue:cycles",
+            tenantId: "t1",
+            messages: batch,
+          });
+
+          await new Promise((resolve) => setTimeout(resolve, 50));
+        }
+
+        const totalEnqueued = enqueueCounter;
+
+        // Wait for all messages to be processed
+        await vi.waitFor(
+          () => {
+            expect(messagesProcessed.size).toBe(totalEnqueued);
+          },
+          { timeout: 40000 }
+        );
+
+        await queue.stop();
+
+        // Verify final state
+        const queueLength = await queue.getQueueLength("tenant:t1:queue:cycles");
+        expect(queueLength).toBe(0);
+
+        const inflightCount = await queue.getTotalInflightCount();
+        expect(inflightCount).toBe(0);
+
+        const masterQueueCount = await queue.getTotalQueueCount();
+        expect(masterQueueCount).toBe(0);
+
+        await queue.close();
+      }
+    );
+  });
+});
diff --git a/packages/redis-worker/src/fair-queue/tests/retry.test.ts b/packages/redis-worker/src/fair-queue/tests/retry.test.ts
new file mode 100644
index 00000000000..c2090c14256
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/retry.test.ts
@@ -0,0 +1,182 @@
+import { describe, expect, it } from "vitest";
+import {
+  ExponentialBackoffRetry,
+  FixedDelayRetry,
+  LinearBackoffRetry,
+  NoRetry,
+  ImmediateRetry,
+  CustomRetry,
+} from "../retry.js";
+
+describe("RetryStrategy", () => {
+  describe("ExponentialBackoffRetry", () => {
+    it("should return increasing delays", () => {
+      const strategy = new ExponentialBackoffRetry({
+        maxAttempts: 5,
+        factor: 2,
+        minTimeoutInMs: 100,
+        maxTimeoutInMs: 10000,
+        randomize: false,
+      });
+
+      const delay1 = strategy.getNextDelay(1);
+      const delay2 = strategy.getNextDelay(2);
+      const delay3 = strategy.getNextDelay(3);
+
+      // Delays should increase
+      expect(delay1).not.toBeNull();
+      expect(delay2).not.toBeNull();
+      expect(delay3).not.toBeNull();
+      expect(delay2!).toBeGreaterThan(delay1!);
+      expect(delay3!).toBeGreaterThan(delay2!);
+    });
+
+    it("should return null when max attempts reached", () => {
+      const strategy = new ExponentialBackoffRetry({ maxAttempts: 3 });
+
+      expect(strategy.getNextDelay(1)).not.toBeNull();
+      expect(strategy.getNextDelay(2)).not.toBeNull();
+      expect(strategy.getNextDelay(3)).toBeNull();
+    });
+
+    it("should have correct maxAttempts", () => {
+      const strategy = new ExponentialBackoffRetry({ maxAttempts: 7 });
+      expect(strategy.maxAttempts).toBe(7);
+    });
+  });
+
+  describe("FixedDelayRetry", () => {
+    it("should return same delay for all attempts", () => {
+      const strategy = new FixedDelayRetry({ maxAttempts: 5, delayMs: 500 });
+
+      expect(strategy.getNextDelay(1)).toBe(500);
+      expect(strategy.getNextDelay(2)).toBe(500);
+      expect(strategy.getNextDelay(3)).toBe(500);
+      expect(strategy.getNextDelay(4)).toBe(500);
+    });
+
+    it("should return null when max attempts reached", () => {
+      const strategy = new FixedDelayRetry({ maxAttempts: 3, delayMs: 500 });
+
+      expect(strategy.getNextDelay(1)).toBe(500);
+      expect(strategy.getNextDelay(2)).toBe(500);
+      expect(strategy.getNextDelay(3)).toBeNull();
+    });
+  });
+
+  describe("LinearBackoffRetry", () => {
+    it("should return linearly increasing delays", () => {
+      const strategy = new LinearBackoffRetry({
+        maxAttempts: 5,
+        baseDelayMs: 100,
+      });
+
+      expect(strategy.getNextDelay(1)).toBe(100);
+      expect(strategy.getNextDelay(2)).toBe(200);
+      expect(strategy.getNextDelay(3)).toBe(300);
+      expect(strategy.getNextDelay(4)).toBe(400);
+    });
+
+    it("should cap at maxDelayMs", () => {
+      const strategy = new LinearBackoffRetry({
+        maxAttempts: 10,
+        baseDelayMs: 100,
+        maxDelayMs: 250,
+      });
+
+      expect(strategy.getNextDelay(1)).toBe(100);
+      expect(strategy.getNextDelay(2)).toBe(200);
+      expect(strategy.getNextDelay(3)).toBe(250);
+      expect(strategy.getNextDelay(5)).toBe(250);
+    });
+
+    it("should return null when max attempts reached", () => {
+      const strategy = new LinearBackoffRetry({
+        maxAttempts: 3,
+        baseDelayMs: 100,
+      });
+
+      expect(strategy.getNextDelay(3)).toBeNull();
+    });
+  });
+
+  describe("NoRetry", () => {
+    it("should always return null", () => {
+      const strategy = new NoRetry();
+
+      expect(strategy.getNextDelay(1)).toBeNull();
+      expect(strategy.getNextDelay(0)).toBeNull();
+    });
+
+    it("should have maxAttempts of 1", () => {
+      const strategy = new NoRetry();
+      expect(strategy.maxAttempts).toBe(1);
+    });
+  });
+
+  describe("ImmediateRetry", () => {
+    it("should return 0 delay for all attempts", () => {
+      const strategy = new ImmediateRetry(5);
+
+      expect(strategy.getNextDelay(1)).toBe(0);
+      expect(strategy.getNextDelay(2)).toBe(0);
+      expect(strategy.getNextDelay(4)).toBe(0);
+    });
+
+    it("should return null when max attempts reached", () => {
+      const strategy = new ImmediateRetry(3);
+
+      expect(strategy.getNextDelay(3)).toBeNull();
+    });
+  });
+
+  describe("CustomRetry", () => {
+    it("should use custom calculation function", () => {
+      const strategy = new CustomRetry({
+        maxAttempts: 5,
+        calculateDelay: (attempt) => attempt * attempt * 100,
+      });
+
+      expect(strategy.getNextDelay(1)).toBe(100);
+      expect(strategy.getNextDelay(2)).toBe(400);
+      expect(strategy.getNextDelay(3)).toBe(900);
+      expect(strategy.getNextDelay(4)).toBe(1600);
+    });
+
+    it("should pass error to calculation function", () => {
+      const errors: Error[] = [];
+      const strategy = new CustomRetry({
+        maxAttempts: 5,
+        calculateDelay: (_attempt, error) => {
+          if (error) errors.push(error);
+          return 100;
+        },
+      });
+
+      const testError = new Error("test error");
+      strategy.getNextDelay(1, testError);
+
+      expect(errors).toHaveLength(1);
+      expect(errors[0]).toBe(testError);
+    });
+
+    it("should return null when max attempts reached", () => {
+      const strategy = new CustomRetry({
+        maxAttempts: 3,
+        calculateDelay: () => 100,
+      });
+
+      expect(strategy.getNextDelay(3)).toBeNull();
+    });
+
+    it("should allow custom function to return null for DLQ", () => {
+      const strategy = new CustomRetry({
+        maxAttempts: 5,
+        calculateDelay: (attempt) => (attempt === 2 ? null : 100),
+      });
+
+      expect(strategy.getNextDelay(1)).toBe(100);
+      expect(strategy.getNextDelay(2)).toBeNull(); // Custom function says DLQ
+    });
+  });
+});
diff --git a/packages/redis-worker/src/fair-queue/tests/visibility.test.ts b/packages/redis-worker/src/fair-queue/tests/visibility.test.ts
new file mode 100644
index 00000000000..a5685d51c9e
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/visibility.test.ts
@@ -0,0 +1,850 @@
+import { describe, expect } from "vitest";
+import { redisTest } from "@internal/testcontainers";
+import { createRedisClient } from "@internal/redis";
+import { VisibilityManager, DefaultFairQueueKeyProducer } from "../index.js";
+import type { FairQueueKeyProducer, ReclaimedMessageInfo } from "../types.js";
+
+describe("VisibilityManager", () => {
+  let keys: FairQueueKeyProducer;
+
+  describe("heartbeat", () => {
+    redisTest(
+      "should return true when message exists in in-flight set",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:heartbeat-exists";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add a message to the queue
+        const messageId = "heartbeat-test-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        // Claim the message (moves it to in-flight set)
+        const claimResult = await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 5000);
+        expect(claimResult.claimed).toBe(true);
+
+        // Heartbeat should succeed since message is in-flight
+        const heartbeatResult = await manager.heartbeat(messageId, queueId, 5000);
+        expect(heartbeatResult).toBe(true);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should return false when message does not exist in in-flight set",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        // Heartbeat for a message that was never claimed
+        const heartbeatResult = await manager.heartbeat(
+          "non-existent-msg",
+          "tenant:t1:queue:non-existent",
+          5000
+        );
+        expect(heartbeatResult).toBe(false);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should return false after message is completed",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:heartbeat-after-complete";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add and claim a message
+        const messageId = "completed-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        const claimResult = await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 5000);
+        expect(claimResult.claimed).toBe(true);
+
+        // Heartbeat should work before complete
+        const heartbeatBefore = await manager.heartbeat(messageId, queueId, 5000);
+        expect(heartbeatBefore).toBe(true);
+
+        // Complete the message
+        await manager.complete(messageId, queueId);
+
+        // Heartbeat should fail after complete
+        const heartbeatAfter = await manager.heartbeat(messageId, queueId, 5000);
+        expect(heartbeatAfter).toBe(false);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should correctly update the deadline score",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 1000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:heartbeat-deadline";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add and claim a message with short timeout
+        const messageId = "deadline-test-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        // Claim with 1 second timeout
+        await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 1000);
+
+        // Get initial deadline
+        const inflightKey = keys.inflightKey(0);
+        const member = `${messageId}:${queueId}`;
+        const initialScore = await redis.zscore(inflightKey, member);
+        expect(initialScore).not.toBeNull();
+
+        // Wait a bit
+        await new Promise((resolve) => setTimeout(resolve, 100));
+
+        // Extend deadline by 10 seconds
+        const beforeHeartbeat = Date.now();
+        const heartbeatSuccess = await manager.heartbeat(messageId, queueId, 10000);
+        expect(heartbeatSuccess).toBe(true);
+
+        // Check that deadline was extended
+        const newScore = await redis.zscore(inflightKey, member);
+        expect(newScore).not.toBeNull();
+
+        // New deadline should be approximately now + 10 seconds
+        const newDeadline = parseFloat(newScore!);
+        expect(newDeadline).toBeGreaterThan(parseFloat(initialScore!));
+        expect(newDeadline).toBeGreaterThanOrEqual(beforeHeartbeat + 10000);
+        // Allow some tolerance for execution time
+        expect(newDeadline).toBeLessThan(beforeHeartbeat + 11000);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should handle multiple consecutive heartbeats",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 1000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:multi-heartbeat";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add and claim a message
+        const messageId = "multi-heartbeat-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 1000);
+
+        // Multiple heartbeats should all succeed
+        for (let i = 0; i < 5; i++) {
+          const result = await manager.heartbeat(messageId, queueId, 1000);
+          expect(result).toBe(true);
+          await new Promise((resolve) => setTimeout(resolve, 50));
+        }
+
+        // Message should still be in-flight
+        const inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(1);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+  });
+
+  describe("claimBatch", () => {
+    redisTest(
+      "should claim multiple messages atomically",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:claim-batch";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add multiple messages to the queue
+        for (let i = 1; i <= 5; i++) {
+          const messageId = `msg-${i}`;
+          const storedMessage = {
+            id: messageId,
+            queueId,
+            tenantId: "t1",
+            payload: { value: `test-${i}` },
+            timestamp: Date.now() - (6 - i) * 1000,
+            attempt: 1,
+          };
+          await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+          await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+        }
+
+        // Claim batch of 3 messages
+        const claimed = await manager.claimBatch(queueId, queueKey, queueItemsKey, "consumer-1", 3);
+
+        expect(claimed).toHaveLength(3);
+        expect(claimed[0]!.messageId).toBe("msg-1");
+        expect(claimed[1]!.messageId).toBe("msg-2");
+        expect(claimed[2]!.messageId).toBe("msg-3");
+
+        // Verify messages are in in-flight set
+        const inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(3);
+
+        // Verify messages are removed from queue
+        const remainingCount = await redis.zcard(queueKey);
+        expect(remainingCount).toBe(2);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should return empty array when queue is empty",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const queueId = "tenant:t1:queue:empty";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        const claimed = await manager.claimBatch(queueId, queueKey, queueItemsKey, "consumer-1", 5);
+        expect(claimed).toHaveLength(0);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should claim all available messages when queue has fewer than maxCount",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:partial-batch";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add only 3 messages to the queue
+        for (let i = 1; i <= 3; i++) {
+          const messageId = `msg-${i}`;
+          const storedMessage = {
+            id: messageId,
+            queueId,
+            tenantId: "t1",
+            payload: { value: `test-${i}` },
+            timestamp: Date.now() - (4 - i) * 1000,
+            attempt: 1,
+          };
+          await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+          await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+        }
+
+        // Request 10 messages but only 3 exist
+        const claimed = await manager.claimBatch(queueId, queueKey, queueItemsKey, "consumer-1", 10);
+
+        expect(claimed).toHaveLength(3);
+        expect(claimed[0]!.messageId).toBe("msg-1");
+        expect(claimed[1]!.messageId).toBe("msg-2");
+        expect(claimed[2]!.messageId).toBe("msg-3");
+
+        // Verify all messages are in in-flight set
+        const inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(3);
+
+        // Verify queue is empty
+        const remainingCount = await redis.zcard(queueKey);
+        expect(remainingCount).toBe(0);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should skip corrupted messages and continue claiming valid ones",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:corrupted-batch";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+
+        // Add valid message 1
+        const storedMessage1 = {
+          id: "msg-1",
+          queueId,
+          tenantId: "t1",
+          payload: { value: "test-1" },
+          timestamp: Date.now() - 3000,
+          attempt: 1,
+        };
+        await redis.zadd(queueKey, storedMessage1.timestamp, "msg-1");
+        await redis.hset(queueItemsKey, "msg-1", JSON.stringify(storedMessage1));
+
+        // Add corrupted message 2 (invalid JSON)
+        await redis.zadd(queueKey, Date.now() - 2000, "msg-2");
+        await redis.hset(queueItemsKey, "msg-2", "not-valid-json{{{");
+
+        // Add valid message 3
+        const storedMessage3 = {
+          id: "msg-3",
+          queueId,
+          tenantId: "t1",
+          payload: { value: "test-3" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+        await redis.zadd(queueKey, storedMessage3.timestamp, "msg-3");
+        await redis.hset(queueItemsKey, "msg-3", JSON.stringify(storedMessage3));
+
+        // Claim all 3 messages
+        const claimed = await manager.claimBatch(queueId, queueKey, queueItemsKey, "consumer-1", 5);
+
+        // Should only return the 2 valid messages
+        expect(claimed).toHaveLength(2);
+        expect(claimed[0]!.messageId).toBe("msg-1");
+        expect(claimed[1]!.messageId).toBe("msg-3");
+
+        // Corrupted message should have been removed from in-flight
+        // Valid messages should be in in-flight
+        const inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(2);
+
+        // Queue should be empty (all messages processed or removed)
+        const remainingCount = await redis.zcard(queueKey);
+        expect(remainingCount).toBe(0);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+  });
+
+  describe("releaseBatch", () => {
+    redisTest(
+      "should release multiple messages back to queue atomically",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:release-batch";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+        const masterQueueKey = keys.masterQueueKey(0);
+
+        // Add messages to queue and claim them
+        for (let i = 1; i <= 5; i++) {
+          const messageId = `msg-${i}`;
+          const storedMessage = {
+            id: messageId,
+            queueId,
+            tenantId: "t1",
+            payload: { value: `test-${i}` },
+            timestamp: Date.now() - (6 - i) * 1000,
+            attempt: 1,
+          };
+          await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+          await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+        }
+
+        // Claim all 5 messages
+        const claimed = await manager.claimBatch(queueId, queueKey, queueItemsKey, "consumer-1", 5);
+        expect(claimed).toHaveLength(5);
+
+        // Verify all messages are in-flight
+        let inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(5);
+
+        // Queue should be empty
+        let queueCount = await redis.zcard(queueKey);
+        expect(queueCount).toBe(0);
+
+        // Release messages 3, 4, 5 back to queue (batch release)
+        const messagesToRelease = claimed.slice(2);
+        await manager.releaseBatch(
+          messagesToRelease,
+          queueId,
+          queueKey,
+          queueItemsKey,
+          masterQueueKey
+        );
+
+        // Verify 2 messages still in-flight
+        inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(2);
+
+        // Verify 3 messages back in queue
+        queueCount = await redis.zcard(queueKey);
+        expect(queueCount).toBe(3);
+
+        // Verify the correct messages are back in queue
+        const queueMembers = await redis.zrange(queueKey, 0, -1);
+        expect(queueMembers).toContain("msg-3");
+        expect(queueMembers).toContain("msg-4");
+        expect(queueMembers).toContain("msg-5");
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should handle empty messages array",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const queueId = "tenant:t1:queue:empty-release";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+        const masterQueueKey = keys.masterQueueKey(0);
+
+        // Should not throw when releasing empty array
+        await manager.releaseBatch([], queueId, queueKey, queueItemsKey, masterQueueKey);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should update master queue with oldest message timestamp",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 5000,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:master-update";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+        const masterQueueKey = keys.masterQueueKey(0);
+
+        // Add and claim messages
+        const baseTime = Date.now();
+        for (let i = 1; i <= 3; i++) {
+          const messageId = `msg-${i}`;
+          const storedMessage = {
+            id: messageId,
+            queueId,
+            tenantId: "t1",
+            payload: { value: `test-${i}` },
+            timestamp: baseTime + i * 1000, // Different timestamps
+            attempt: 1,
+          };
+          await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+          await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+        }
+
+        const claimed = await manager.claimBatch(queueId, queueKey, queueItemsKey, "consumer-1", 3);
+
+        // Release all messages back
+        await manager.releaseBatch(claimed, queueId, queueKey, queueItemsKey, masterQueueKey);
+
+        // Master queue should have been updated
+        const masterScore = await redis.zscore(masterQueueKey, queueId);
+        expect(masterScore).not.toBeNull();
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+  });
+
+  describe("reclaimTimedOut", () => {
+    redisTest(
+      "should return reclaimed message info with tenantId for concurrency release",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 100, // Very short timeout
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:reclaim-test";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+        const masterQueueKey = keys.masterQueueKey(0);
+
+        // Add and claim a message
+        const messageId = "reclaim-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1, value: "test" },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+          metadata: { orgId: "org-123" },
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        // Claim with very short timeout
+        const claimResult = await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 100);
+        expect(claimResult.claimed).toBe(true);
+
+        // Wait for timeout to expire
+        await new Promise((resolve) => setTimeout(resolve, 150));
+
+        // Reclaim should return the message info
+        const reclaimedMessages = await manager.reclaimTimedOut(0, (qId) => ({
+          queueKey: keys.queueKey(qId),
+          queueItemsKey: keys.queueItemsKey(qId),
+          masterQueueKey,
+        }));
+
+        expect(reclaimedMessages).toHaveLength(1);
+        expect(reclaimedMessages[0]).toEqual({
+          messageId,
+          queueId,
+          tenantId: "t1",
+          metadata: { orgId: "org-123" },
+        });
+
+        // Verify message is back in queue
+        const queueCount = await redis.zcard(queueKey);
+        expect(queueCount).toBe(1);
+
+        // Verify message is back in queue with its original timestamp (not the deadline)
+        const queueMessages = await redis.zrange(queueKey, 0, -1, "WITHSCORES");
+        expect(queueMessages[0]).toBe(messageId);
+        expect(parseInt(queueMessages[1]!)).toBe(storedMessage.timestamp);
+
+        // Verify message is no longer in-flight
+        const inflightCount = await manager.getTotalInflightCount();
+        expect(inflightCount).toBe(0);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should return empty array when no messages have timed out",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 60000, // Long timeout
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:no-timeout";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+        const masterQueueKey = keys.masterQueueKey(0);
+
+        // Add and claim a message with long timeout
+        const messageId = "long-timeout-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1 },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1");
+
+        // Reclaim should return empty array (message hasn't timed out)
+        const reclaimedMessages = await manager.reclaimTimedOut(0, (qId) => ({
+          queueKey: keys.queueKey(qId),
+          queueItemsKey: keys.queueItemsKey(qId),
+          masterQueueKey,
+        }));
+
+        expect(reclaimedMessages).toHaveLength(0);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should reclaim multiple timed-out messages and return all their info",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 100,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const masterQueueKey = keys.masterQueueKey(0);
+
+        // Add and claim messages for two different tenants
+        for (const tenant of ["t1", "t2"]) {
+          const queueId = `tenant:${tenant}:queue:multi-reclaim`;
+          const queueKey = keys.queueKey(queueId);
+          const queueItemsKey = keys.queueItemsKey(queueId);
+
+          const messageId = `msg-${tenant}`;
+          const storedMessage = {
+            id: messageId,
+            queueId,
+            tenantId: tenant,
+            payload: { id: 1 },
+            timestamp: Date.now() - 1000,
+            attempt: 1,
+          };
+
+          await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+          await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+          await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 100);
+        }
+
+        // Wait for timeout
+        await new Promise((resolve) => setTimeout(resolve, 150));
+
+        // Reclaim should return both messages
+        const reclaimedMessages = await manager.reclaimTimedOut(0, (qId) => ({
+          queueKey: keys.queueKey(qId),
+          queueItemsKey: keys.queueItemsKey(qId),
+          masterQueueKey,
+        }));
+
+        expect(reclaimedMessages).toHaveLength(2);
+
+        // Verify both tenants are represented
+        const tenantIds = reclaimedMessages.map((m: ReclaimedMessageInfo) => m.tenantId).sort();
+        expect(tenantIds).toEqual(["t1", "t2"]);
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+
+    redisTest(
+      "should use fallback tenantId extraction when message data is missing or corrupted",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new VisibilityManager({
+          redis: redisOptions,
+          keys,
+          shardCount: 1,
+          defaultTimeoutMs: 100,
+        });
+
+        const redis = createRedisClient(redisOptions);
+        const queueId = "tenant:t1:queue:fallback-test";
+        const queueKey = keys.queueKey(queueId);
+        const queueItemsKey = keys.queueItemsKey(queueId);
+        const masterQueueKey = keys.masterQueueKey(0);
+        const inflightDataKey = keys.inflightDataKey(0);
+
+        // Add and claim a message
+        const messageId = "fallback-msg";
+        const storedMessage = {
+          id: messageId,
+          queueId,
+          tenantId: "t1",
+          payload: { id: 1 },
+          timestamp: Date.now() - 1000,
+          attempt: 1,
+          metadata: { orgId: "org-123" },
+        };
+
+        await redis.zadd(queueKey, storedMessage.timestamp, messageId);
+        await redis.hset(queueItemsKey, messageId, JSON.stringify(storedMessage));
+
+        // Claim the message
+        const claimResult = await manager.claim(queueId, queueKey, queueItemsKey, "consumer-1", 100);
+        expect(claimResult.claimed).toBe(true);
+
+        // Corrupt the in-flight data by setting invalid JSON
+        await redis.hset(inflightDataKey, messageId, "not-valid-json{{{");
+
+        // Wait for timeout
+        await new Promise((resolve) => setTimeout(resolve, 150));
+
+        // Reclaim should still work using fallback extraction
+        const reclaimedMessages = await manager.reclaimTimedOut(0, (qId) => ({
+          queueKey: keys.queueKey(qId),
+          queueItemsKey: keys.queueItemsKey(qId),
+          masterQueueKey,
+        }));
+
+        expect(reclaimedMessages).toHaveLength(1);
+        expect(reclaimedMessages[0]).toEqual({
+          messageId,
+          queueId,
+          tenantId: "t1", // Extracted from queueId via fallback
+          metadata: {}, // Empty metadata since we couldn't parse the stored message
+        });
+
+        await manager.close();
+        await redis.quit();
+      }
+    );
+  });
+});
+
diff --git a/packages/redis-worker/src/fair-queue/tests/workerQueue.test.ts b/packages/redis-worker/src/fair-queue/tests/workerQueue.test.ts
new file mode 100644
index 00000000000..24701bcf9e2
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/tests/workerQueue.test.ts
@@ -0,0 +1,237 @@
+import { describe, expect } from "vitest";
+import { redisTest } from "@internal/testcontainers";
+import { WorkerQueueManager } from "../workerQueue.js";
+import { DefaultFairQueueKeyProducer } from "../keyProducer.js";
+import type { FairQueueKeyProducer } from "../types.js";
+
+describe("WorkerQueueManager", () => {
+  let keys: FairQueueKeyProducer;
+
+  describe("push and pop", () => {
+    redisTest(
+      "should push and pop a single message",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        // Push a message
+        await manager.push("worker-1", "msg-1:queue-1");
+
+        // Pop should return the message
+        const result = await manager.pop("worker-1");
+        expect(result).not.toBeNull();
+        expect(result!.messageKey).toBe("msg-1:queue-1");
+        expect(result!.queueLength).toBe(0);
+
+        await manager.close();
+      }
+    );
+
+    redisTest(
+      "should push and pop messages in FIFO order",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        // Push messages
+        await manager.push("worker-1", "msg-1:queue-1");
+        await manager.push("worker-1", "msg-2:queue-1");
+        await manager.push("worker-1", "msg-3:queue-1");
+
+        // Pop should return in FIFO order
+        let result = await manager.pop("worker-1");
+        expect(result!.messageKey).toBe("msg-1:queue-1");
+        expect(result!.queueLength).toBe(2);
+
+        result = await manager.pop("worker-1");
+        expect(result!.messageKey).toBe("msg-2:queue-1");
+        expect(result!.queueLength).toBe(1);
+
+        result = await manager.pop("worker-1");
+        expect(result!.messageKey).toBe("msg-3:queue-1");
+        expect(result!.queueLength).toBe(0);
+
+        // Queue should be empty
+        result = await manager.pop("worker-1");
+        expect(result).toBeNull();
+
+        await manager.close();
+      }
+    );
+
+    redisTest("should push batch of messages", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const manager = new WorkerQueueManager({
+        redis: redisOptions,
+        keys,
+      });
+
+      // Push batch
+      await manager.pushBatch("worker-1", ["msg-1:queue-1", "msg-2:queue-1", "msg-3:queue-1"]);
+
+      // Check length
+      const length = await manager.getLength("worker-1");
+      expect(length).toBe(3);
+
+      await manager.close();
+    });
+  });
+
+  describe("getLength", () => {
+    redisTest(
+      "should return correct queue length",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        // Initially empty
+        let length = await manager.getLength("worker-1");
+        expect(length).toBe(0);
+
+        // Push messages
+        await manager.push("worker-1", "msg-1:queue-1");
+        await manager.push("worker-1", "msg-2:queue-1");
+
+        length = await manager.getLength("worker-1");
+        expect(length).toBe(2);
+
+        // Pop one
+        await manager.pop("worker-1");
+
+        length = await manager.getLength("worker-1");
+        expect(length).toBe(1);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("peek", () => {
+    redisTest(
+      "should peek at messages without removing them",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        // Push messages
+        await manager.push("worker-1", "msg-1:queue-1");
+        await manager.push("worker-1", "msg-2:queue-1");
+
+        // Peek
+        const messages = await manager.peek("worker-1");
+        expect(messages).toEqual(["msg-1:queue-1", "msg-2:queue-1"]);
+
+        // Messages should still be there
+        const length = await manager.getLength("worker-1");
+        expect(length).toBe(2);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("remove", () => {
+    redisTest("should remove a specific message", { timeout: 10000 }, async ({ redisOptions }) => {
+      keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+      const manager = new WorkerQueueManager({
+        redis: redisOptions,
+        keys,
+      });
+
+      // Push messages
+      await manager.push("worker-1", "msg-1:queue-1");
+      await manager.push("worker-1", "msg-2:queue-1");
+      await manager.push("worker-1", "msg-3:queue-1");
+
+      // Remove the middle one
+      const removed = await manager.remove("worker-1", "msg-2:queue-1");
+      expect(removed).toBe(1);
+
+      // Check remaining
+      const messages = await manager.peek("worker-1");
+      expect(messages).toEqual(["msg-1:queue-1", "msg-3:queue-1"]);
+
+      await manager.close();
+    });
+  });
+
+  describe("clear", () => {
+    redisTest(
+      "should clear all messages from queue",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        // Push messages
+        await manager.push("worker-1", "msg-1:queue-1");
+        await manager.push("worker-1", "msg-2:queue-1");
+
+        // Clear
+        await manager.clear("worker-1");
+
+        // Should be empty
+        const length = await manager.getLength("worker-1");
+        expect(length).toBe(0);
+
+        await manager.close();
+      }
+    );
+  });
+
+  describe("separate worker queues", () => {
+    redisTest(
+      "should maintain separate queues for different workers",
+      { timeout: 10000 },
+      async ({ redisOptions }) => {
+        keys = new DefaultFairQueueKeyProducer({ prefix: "test" });
+
+        const manager = new WorkerQueueManager({
+          redis: redisOptions,
+          keys,
+        });
+
+        // Push to different worker queues
+        await manager.push("worker-1", "msg-1-1:queue-1");
+        await manager.push("worker-2", "msg-2-1:queue-1");
+        await manager.push("worker-1", "msg-1-2:queue-1");
+        await manager.push("worker-2", "msg-2-2:queue-1");
+
+        // Each worker should have its own messages
+        const worker1Messages = await manager.peek("worker-1");
+        expect(worker1Messages).toEqual(["msg-1-1:queue-1", "msg-1-2:queue-1"]);
+
+        const worker2Messages = await manager.peek("worker-2");
+        expect(worker2Messages).toEqual(["msg-2-1:queue-1", "msg-2-2:queue-1"]);
+
+        await manager.close();
+      }
+    );
+  });
+});
diff --git a/packages/redis-worker/src/fair-queue/types.ts b/packages/redis-worker/src/fair-queue/types.ts
new file mode 100644
index 00000000000..6451df1bea0
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/types.ts
@@ -0,0 +1,612 @@
+import type { RedisOptions } from "@internal/redis";
+import type { Logger } from "@trigger.dev/core/logger";
+import type { Tracer, Meter } from "@internal/tracing";
+import type { z } from "zod";
+import type { RetryStrategy } from "./retry.js";
+
+// ============================================================================
+// Global Rate Limiter
+// ============================================================================
+
+/**
+ * Interface for a global rate limiter that limits processing across all consumers.
+ * When configured, consumers will check this before processing each message.
+ */
+export interface GlobalRateLimiter {
+  /**
+   * Check if processing is allowed under the rate limit.
+   * @returns Object with allowed flag and optional resetAt timestamp (ms since epoch)
+   */
+  limit(): Promise<{ allowed: boolean; resetAt?: number }>;
+}
+
+// ============================================================================
+// Core Queue Types
+// ============================================================================
+
+/**
+ * Descriptor for a queue in the fair queue system.
+ * Contains all the metadata needed to identify and route a queue.
+ */
+export interface QueueDescriptor {
+  /** Unique queue identifier */
+  id: string;
+  /** Tenant this queue belongs to */
+  tenantId: string;
+  /** Additional metadata for concurrency group extraction */
+  metadata: Record<string, unknown>;
+}
+
+/**
+ * A message in the queue with its metadata.
+ */
+export interface QueueMessage<TPayload = unknown> {
+  /** Unique message identifier */
+  id: string;
+  /** The queue this message belongs to */
+  queueId: string;
+  /** Message payload */
+  payload: TPayload;
+  /** Timestamp when message was enqueued */
+  timestamp: number;
+  /** Current attempt number (1-indexed, for retries) */
+  attempt: number;
+  /** Optional metadata */
+  metadata?: Record<string, unknown>;
+}
+
+/**
+ * Internal message format stored in Redis.
+ * Includes additional fields for tracking and routing.
+ */
+export interface StoredMessage<TPayload = unknown> {
+  /** Message ID */
+  id: string;
+  /** Queue ID */
+  queueId: string;
+  /** Tenant ID */
+  tenantId: string;
+  /** Message payload */
+  payload: TPayload;
+  /** Timestamp when enqueued */
+  timestamp: number;
+  /** Current attempt number */
+  attempt: number;
+  /** Worker queue to route to */
+  workerQueue?: string;
+  /** Additional metadata */
+  metadata?: Record<string, unknown>;
+}
+
+/**
+ * Queue with its score (oldest message timestamp) from the master queue.
+ */
+export interface QueueWithScore {
+  /** Queue identifier */
+  queueId: string;
+  /** Score (typically oldest message timestamp) */
+  score: number;
+  /** Tenant ID extracted from queue */
+  tenantId: string;
+}
+
+// ============================================================================
+// Concurrency Types
+// ============================================================================
+
+/**
+ * Configuration for a concurrency group.
+ * Allows defining arbitrary levels of concurrency (tenant, org, project, etc.)
+ */
+export interface ConcurrencyGroupConfig {
+  /** Group name (e.g., "tenant", "organization", "project") */
+  name: string;
+  /** Extract the group ID from a queue descriptor */
+  extractGroupId: (queue: QueueDescriptor) => string;
+  /** Get the concurrency limit for a specific group ID */
+  getLimit: (groupId: string) => Promise<number>;
+  /** Default limit if not specified */
+  defaultLimit: number;
+}
+
+/**
+ * Current concurrency state for a group.
+ */
+export interface ConcurrencyState {
+  /** Group name */
+  groupName: string;
+  /** Group ID */
+  groupId: string;
+  /** Current active count */
+  current: number;
+  /** Configured limit */
+  limit: number;
+}
+
+/**
+ * Result of a concurrency check.
+ */
+export interface ConcurrencyCheckResult {
+  /** Whether processing is allowed */
+  allowed: boolean;
+  /** If not allowed, which group is blocking */
+  blockedBy?: ConcurrencyState;
+}
+
+// ============================================================================
+// Visibility Types
+// ============================================================================
+
+/**
+ * Information about a reclaimed message from visibility timeout.
+ * Used to release concurrency after a message is returned to the queue.
+ */
+export interface ReclaimedMessageInfo {
+  /** Message ID */
+  messageId: string;
+  /** Queue ID */
+  queueId: string;
+  /** Tenant ID for concurrency release */
+  tenantId: string;
+  /** Additional metadata for concurrency group extraction */
+  metadata?: Record<string, unknown>;
+}
+
+// ============================================================================
+// Scheduler Types
+// ============================================================================
+
+/**
+ * Queues grouped by tenant for the scheduler.
+ */
+export interface TenantQueues {
+  /** Tenant identifier */
+  tenantId: string;
+  /** Queue IDs belonging to this tenant, in priority order */
+  queues: string[];
+}
+
+/**
+ * Context provided to the scheduler for making decisions.
+ */
+export interface SchedulerContext {
+  /** Get current concurrency for a group */
+  getCurrentConcurrency(groupName: string, groupId: string): Promise<number>;
+  /** Get concurrency limit for a group */
+  getConcurrencyLimit(groupName: string, groupId: string): Promise<number>;
+  /** Check if a group is at capacity */
+  isAtCapacity(groupName: string, groupId: string): Promise<boolean>;
+  /** Get queue descriptor by ID */
+  getQueueDescriptor(queueId: string): QueueDescriptor;
+}
+
+/**
+ * Pluggable scheduler interface for fair queue selection.
+ */
+export interface FairScheduler {
+  /**
+   * Select queues for processing from a master queue shard.
+   * Returns queues grouped by tenant, ordered by the fairness algorithm.
+   *
+   * @param masterQueueShard - The master queue shard key
+   * @param consumerId - The consumer making the request
+   * @param context - Context for concurrency checks
+   * @returns Queues grouped by tenant in priority order
+   */
+  selectQueues(
+    masterQueueShard: string,
+    consumerId: string,
+    context: SchedulerContext
+  ): Promise<TenantQueues[]>;
+
+  /**
+   * Called after processing a message to update scheduler state.
+   * Optional - not all schedulers need to track state.
+   */
+  recordProcessed?(tenantId: string, queueId: string): Promise<void>;
+
+  /**
+   * Called after processing multiple messages to update scheduler state.
+   * Batch variant for efficiency - reduces Redis calls when processing multiple messages.
+   * Optional - falls back to calling recordProcessed multiple times if not implemented.
+   */
+  recordProcessedBatch?(tenantId: string, queueId: string, count: number): Promise<void>;
+
+  /**
+   * Initialize the scheduler (called once on startup).
+   */
+  initialize?(): Promise<void>;
+
+  /**
+   * Cleanup scheduler resources.
+   */
+  close?(): Promise<void>;
+}
+
+// ============================================================================
+// Visibility Timeout Types
+// ============================================================================
+
+/**
+ * An in-flight message being processed.
+ */
+export interface InFlightMessage<TPayload = unknown> {
+  /** Message ID */
+  messageId: string;
+  /** Queue ID */
+  queueId: string;
+  /** Message payload */
+  payload: TPayload;
+  /** When visibility timeout expires */
+  deadline: number;
+  /** Consumer that claimed this message */
+  consumerId: string;
+}
+
+/**
+ * Result of claiming a message.
+ */
+export interface ClaimResult<TPayload = unknown> {
+  /** Whether the claim was successful */
+  claimed: boolean;
+  /** The claimed message if successful */
+  message?: InFlightMessage<TPayload>;
+}
+
+// ============================================================================
+// Key Producer Interface
+// ============================================================================
+
+/**
+ * Interface for generating Redis keys for the fair queue system.
+ * Implementations can customize key prefixes and structures.
+ */
+export interface FairQueueKeyProducer {
+  // Master queue keys
+  /** Get the master queue key for a shard */
+  masterQueueKey(shardId: number): string;
+
+  // Individual queue keys
+  /** Get the queue key for storing messages */
+  queueKey(queueId: string): string;
+  /** Get the queue items hash key */
+  queueItemsKey(queueId: string): string;
+
+  // Concurrency tracking keys
+  /** Get the concurrency set key for a group */
+  concurrencyKey(groupName: string, groupId: string): string;
+
+  // In-flight tracking keys
+  /** Get the in-flight sorted set key for a shard */
+  inflightKey(shardId: number): string;
+  /** Get the in-flight message data hash key */
+  inflightDataKey(shardId: number): string;
+
+  // Worker queue keys
+  /** Get the worker queue key for a consumer */
+  workerQueueKey(consumerId: string): string;
+
+  // Dead letter queue keys
+  /** Get the dead letter queue key for a tenant */
+  deadLetterQueueKey(tenantId: string): string;
+  /** Get the dead letter queue data hash key for a tenant */
+  deadLetterQueueDataKey(tenantId: string): string;
+
+  // Extraction methods
+  /** Extract tenant ID from a queue ID */
+  extractTenantId(queueId: string): string;
+  /** Extract a specific group ID from a queue ID */
+  extractGroupId(groupName: string, queueId: string): string;
+}
+
+// ============================================================================
+// FairQueue Options
+// ============================================================================
+
+/**
+ * Worker queue configuration options.
+ * Worker queues are always enabled - FairQueue routes messages to worker queues,
+ * and external consumers are responsible for consuming from those queues.
+ */
+export interface WorkerQueueOptions<TPayload = unknown> {
+  /**
+   * Function to resolve which worker queue a message should go to.
+   * This is called during the claim-and-push phase to determine the target queue.
+   */
+  resolveWorkerQueue: (message: StoredMessage<TPayload>) => string;
+}
+
+/**
+ * Retry and dead letter queue configuration.
+ */
+export interface RetryOptions {
+  /** Retry strategy for failed messages */
+  strategy: RetryStrategy;
+  /** Whether to enable dead letter queue (default: true) */
+  deadLetterQueue?: boolean;
+}
+
+/**
+ * Queue cooloff configuration to avoid repeatedly polling concurrency-limited queues.
+ */
+export interface CooloffOptions {
+  /** Whether cooloff is enabled (default: true) */
+  enabled?: boolean;
+  /** Number of consecutive empty dequeues before entering cooloff (default: 10) */
+  threshold?: number;
+  /** Duration of cooloff period in milliseconds (default: 10000) */
+  periodMs?: number;
+  /** Maximum number of cooloff state entries before triggering cleanup (default: 1000) */
+  maxStatesSize?: number;
+}
+
+/**
+ * Options for creating a FairQueue instance.
+ *
+ * @typeParam TPayloadSchema - Zod schema for message payload validation
+ */
+export interface FairQueueOptions<TPayloadSchema extends z.ZodTypeAny = z.ZodUnknown> {
+  /** Redis connection options */
+  redis: RedisOptions;
+
+  /** Key producer for Redis keys */
+  keys: FairQueueKeyProducer;
+
+  /** Scheduler for fair queue selection */
+  scheduler: FairScheduler;
+
+  // Payload validation
+  /** Zod schema for message payload validation */
+  payloadSchema?: TPayloadSchema;
+  /** Whether to validate payloads on enqueue (default: false) */
+  validateOnEnqueue?: boolean;
+
+  // Sharding
+  /** Number of master queue shards (default: 1) */
+  shardCount?: number;
+
+  // Concurrency
+  /** Concurrency group configurations */
+  concurrencyGroups?: ConcurrencyGroupConfig[];
+
+  // Worker queue (required)
+  /**
+   * Worker queue configuration.
+   * FairQueue routes messages to worker queues; external consumers handle consumption.
+   */
+  workerQueue: WorkerQueueOptions<z.infer<TPayloadSchema>>;
+
+  // Retry and DLQ
+  /** Retry and dead letter queue configuration */
+  retry?: RetryOptions;
+
+  // Visibility timeout
+  /** Visibility timeout in milliseconds (default: 30000) */
+  visibilityTimeoutMs?: number;
+  /** Heartbeat interval in milliseconds (default: visibilityTimeoutMs / 3) */
+  heartbeatIntervalMs?: number;
+  /** Interval for reclaiming timed-out messages (default: 5000) */
+  reclaimIntervalMs?: number;
+
+  // Consumers
+  /** Number of consumer loops to run (default: 1) */
+  consumerCount?: number;
+  /** Interval between consumer iterations in milliseconds (default: 100) */
+  consumerIntervalMs?: number;
+  /** Whether to start consumers on initialization (default: true) */
+  startConsumers?: boolean;
+
+  // Batch claiming
+  /** Maximum number of messages to claim in a single batch operation (default: 10) */
+  batchClaimSize?: number;
+
+  // Consumer tracing
+  /** Maximum iterations before starting a new trace span (default: 500) */
+  consumerTraceMaxIterations?: number;
+  /** Maximum seconds before starting a new trace span (default: 60) */
+  consumerTraceTimeoutSeconds?: number;
+
+  // Cooloff
+  /** Queue cooloff configuration */
+  cooloff?: CooloffOptions;
+
+  // Observability
+  /** Logger instance */
+  logger?: Logger;
+  /** OpenTelemetry tracer */
+  tracer?: Tracer;
+  /** OpenTelemetry meter */
+  meter?: Meter;
+  /** Name for metrics/tracing (default: "fairqueue") */
+  name?: string;
+
+  // Global rate limiting
+  /** Optional global rate limiter to limit processing across all consumers */
+  globalRateLimiter?: GlobalRateLimiter;
+}
+
+// ============================================================================
+// Message Handler Types
+// ============================================================================
+
+/**
+ * Context passed to the message handler.
+ */
+export interface MessageHandlerContext<TPayload = unknown> {
+  /** The message being processed */
+  message: QueueMessage<TPayload>;
+  /** Queue descriptor */
+  queue: QueueDescriptor;
+  /** Consumer ID processing this message */
+  consumerId: string;
+  /** Extend the visibility timeout */
+  heartbeat(): Promise<boolean>;
+  /** Mark message as successfully processed */
+  complete(): Promise<void>;
+  /** Release message back to the queue for retry */
+  release(): Promise<void>;
+  /** Mark message as failed (triggers retry or DLQ) */
+  fail(error?: Error): Promise<void>;
+}
+
+/**
+ * Handler function for processing messages.
+ */
+export type MessageHandler<TPayload = unknown> = (
+  context: MessageHandlerContext<TPayload>
+) => Promise<void>;
+
+// ============================================================================
+// Dead Letter Queue Types
+// ============================================================================
+
+/**
+ * A message in the dead letter queue.
+ */
+export interface DeadLetterMessage<TPayload = unknown> {
+  /** Message ID */
+  id: string;
+  /** Original queue ID */
+  queueId: string;
+  /** Tenant ID */
+  tenantId: string;
+  /** Message payload */
+  payload: TPayload;
+  /** Timestamp when moved to DLQ */
+  deadLetteredAt: number;
+  /** Number of attempts before DLQ */
+  attempts: number;
+  /** Last error message if available */
+  lastError?: string;
+  /** Original message timestamp */
+  originalTimestamp: number;
+}
+
+// ============================================================================
+// Cooloff State Types
+// ============================================================================
+
+/**
+ * Cooloff state for a queue.
+ */
+export type QueueCooloffState =
+  | { tag: "normal"; consecutiveFailures: number }
+  | { tag: "cooloff"; expiresAt: number };
+
+// ============================================================================
+// Enqueue Options
+// ============================================================================
+
+/**
+ * Options for enqueueing a message.
+ */
+export interface EnqueueOptions<TPayload = unknown> {
+  /** Queue to add the message to */
+  queueId: string;
+  /** Tenant ID for the queue */
+  tenantId: string;
+  /** Message payload */
+  payload: TPayload;
+  /** Optional message ID (auto-generated if not provided) */
+  messageId?: string;
+  /** Optional timestamp (defaults to now) */
+  timestamp?: number;
+  /** Optional metadata for concurrency group extraction */
+  metadata?: Record<string, string>;
+}
+
+/**
+ * Options for enqueueing multiple messages.
+ */
+export interface EnqueueBatchOptions<TPayload = unknown> {
+  /** Queue to add messages to */
+  queueId: string;
+  /** Tenant ID for the queue */
+  tenantId: string;
+  /** Messages to enqueue */
+  messages: Array<{
+    payload: TPayload;
+    messageId?: string;
+    timestamp?: number;
+  }>;
+  /** Optional metadata for concurrency group extraction */
+  metadata?: Record<string, string>;
+}
+
+// ============================================================================
+// DRR Scheduler Types
+// ============================================================================
+
+/**
+ * Configuration for the Deficit Round Robin scheduler.
+ */
+export interface DRRSchedulerConfig {
+  /** Credits allocated per tenant per round */
+  quantum: number;
+  /** Maximum accumulated deficit (prevents starvation) */
+  maxDeficit: number;
+  /** Maximum queues to fetch from master queue (default: 1000) */
+  masterQueueLimit?: number;
+  /** Redis options for state storage */
+  redis: RedisOptions;
+  /** Key producer */
+  keys: FairQueueKeyProducer;
+  /** Optional logger */
+  logger?: {
+    debug: (message: string, context?: Record<string, unknown>) => void;
+    error: (message: string, context?: Record<string, unknown>) => void;
+  };
+}
+
+// ============================================================================
+// Weighted Scheduler Types
+// ============================================================================
+
+/**
+ * Bias configuration for weighted shuffle scheduler.
+ */
+export interface WeightedSchedulerBiases {
+  /**
+   * How much to bias towards tenants with higher concurrency limits.
+   * 0 = no bias, 1 = full bias based on limit differences
+   */
+  concurrencyLimitBias: number;
+
+  /**
+   * How much to bias towards tenants with more available capacity.
+   * 0 = no bias, 1 = full bias based on available capacity
+   */
+  availableCapacityBias: number;
+
+  /**
+   * Controls randomization of queue ordering within tenants.
+   * 0 = strict age-based ordering (oldest first)
+   * 1 = completely random ordering
+   * Values between 0-1 blend between age-based and random ordering
+   */
+  queueAgeRandomization: number;
+}
+
+/**
+ * Configuration for the weighted shuffle scheduler.
+ */
+export interface WeightedSchedulerConfig {
+  /** Redis options */
+  redis: RedisOptions;
+  /** Key producer */
+  keys: FairQueueKeyProducer;
+  /** Default tenant concurrency limit */
+  defaultTenantConcurrencyLimit?: number;
+  /** Maximum queues to consider from master queue */
+  masterQueueLimit?: number;
+  /** Bias configuration */
+  biases?: WeightedSchedulerBiases;
+  /** Number of iterations to reuse a snapshot */
+  reuseSnapshotCount?: number;
+  /** Maximum number of tenants to consider */
+  maximumTenantCount?: number;
+  /** Random seed for reproducibility */
+  seed?: string;
+  /** Optional tracer */
+  tracer?: Tracer;
+}
diff --git a/packages/redis-worker/src/fair-queue/visibility.ts b/packages/redis-worker/src/fair-queue/visibility.ts
new file mode 100644
index 00000000000..849c4cffb20
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/visibility.ts
@@ -0,0 +1,835 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import { jumpHash } from "@trigger.dev/core/v3/serverOnly";
+import type {
+  ClaimResult,
+  FairQueueKeyProducer,
+  InFlightMessage,
+  ReclaimedMessageInfo,
+  StoredMessage,
+} from "./types.js";
+
+export interface VisibilityManagerOptions {
+  redis: RedisOptions;
+  keys: FairQueueKeyProducer;
+  shardCount: number;
+  defaultTimeoutMs: number;
+  logger?: {
+    debug: (message: string, context?: Record<string, unknown>) => void;
+    error: (message: string, context?: Record<string, unknown>) => void;
+  };
+}
+
+/**
+ * VisibilityManager handles message visibility timeouts for safe message processing.
+ *
+ * Features:
+ * - Claim messages with visibility timeout
+ * - Heartbeat to extend timeout
+ * - Automatic reclaim of timed-out messages
+ * - Per-shard in-flight tracking
+ *
+ * Data structures:
+ * - In-flight sorted set: score = deadline timestamp, member = "{messageId}:{queueId}"
+ * - In-flight data hash: field = messageId, value = JSON message data
+ */
+export class VisibilityManager {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private shardCount: number;
+  private defaultTimeoutMs: number;
+  private logger: NonNullable<VisibilityManagerOptions["logger"]>;
+
+  constructor(private options: VisibilityManagerOptions) {
+    this.redis = createRedisClient(options.redis);
+    this.keys = options.keys;
+    this.shardCount = options.shardCount;
+    this.defaultTimeoutMs = options.defaultTimeoutMs;
+    this.logger = options.logger ?? {
+      debug: () => { },
+      error: () => { },
+    };
+
+    this.#registerCommands();
+  }
+
+  // ============================================================================
+  // Public Methods
+  // ============================================================================
+
+  /**
+   * Claim a message for processing.
+   * Moves the message from its queue to the in-flight set with a visibility timeout.
+   *
+   * @param queueId - The queue to claim from
+   * @param queueKey - The Redis key for the queue sorted set
+   * @param queueItemsKey - The Redis key for the queue items hash
+   * @param consumerId - ID of the consumer claiming the message
+   * @param timeoutMs - Visibility timeout in milliseconds
+   * @returns Claim result with the message if successful
+   */
+  async claim<TPayload = unknown>(
+    queueId: string,
+    queueKey: string,
+    queueItemsKey: string,
+    consumerId: string,
+    timeoutMs?: number
+  ): Promise<ClaimResult<TPayload>> {
+    const timeout = timeoutMs ?? this.defaultTimeoutMs;
+    const deadline = Date.now() + timeout;
+    const shardId = this.#getShardForQueue(queueId);
+    const inflightKey = this.keys.inflightKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+
+    // Use Lua script to atomically:
+    // 1. Pop oldest message from queue
+    // 2. Add to in-flight set with deadline
+    // 3. Store message data
+    const result = await this.redis.claimMessage(
+      queueKey,
+      queueItemsKey,
+      inflightKey,
+      inflightDataKey,
+      queueId,
+      consumerId,
+      deadline.toString()
+    );
+
+    if (!result) {
+      return { claimed: false };
+    }
+
+    const [messageId, payloadJson] = result;
+
+    try {
+      const payload = JSON.parse(payloadJson) as TPayload;
+      const message: InFlightMessage<TPayload> = {
+        messageId,
+        queueId,
+        payload,
+        deadline,
+        consumerId,
+      };
+
+      this.logger.debug("Message claimed", {
+        messageId,
+        queueId,
+        consumerId,
+        deadline,
+      });
+
+      return { claimed: true, message };
+    } catch (error) {
+      // JSON parse error - message data is corrupted
+      this.logger.error("Failed to parse claimed message", {
+        messageId,
+        queueId,
+        error: error instanceof Error ? error.message : String(error),
+      });
+
+      // Remove the corrupted message from in-flight
+      await this.#removeFromInflight(shardId, messageId, queueId);
+
+      return { claimed: false };
+    }
+  }
+
+  /**
+   * Claim multiple messages for processing (batch claim).
+   * Moves up to maxCount messages from the queue to the in-flight set.
+   *
+   * @param queueId - The queue to claim from
+   * @param queueKey - The Redis key for the queue sorted set
+   * @param queueItemsKey - The Redis key for the queue items hash
+   * @param consumerId - ID of the consumer claiming the messages
+   * @param maxCount - Maximum number of messages to claim
+   * @param timeoutMs - Visibility timeout in milliseconds
+   * @returns Array of claimed messages
+   */
+  async claimBatch<TPayload = unknown>(
+    queueId: string,
+    queueKey: string,
+    queueItemsKey: string,
+    consumerId: string,
+    maxCount: number,
+    timeoutMs?: number
+  ): Promise<Array<InFlightMessage<TPayload>>> {
+    const timeout = timeoutMs ?? this.defaultTimeoutMs;
+    const deadline = Date.now() + timeout;
+    const shardId = this.#getShardForQueue(queueId);
+    const inflightKey = this.keys.inflightKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+
+    // Use Lua script to atomically claim up to maxCount messages
+    const result = await this.redis.claimMessageBatch(
+      queueKey,
+      queueItemsKey,
+      inflightKey,
+      inflightDataKey,
+      queueId,
+      deadline.toString(),
+      maxCount.toString()
+    );
+
+    if (!result || result.length === 0) {
+      return [];
+    }
+
+    const messages: Array<InFlightMessage<TPayload>> = [];
+
+    // Results come in pairs: [messageId1, payload1, messageId2, payload2, ...]
+    for (let i = 0; i < result.length; i += 2) {
+      const messageId = result[i];
+      const payloadJson = result[i + 1];
+
+      // Skip if either value is missing
+      if (!messageId || !payloadJson) {
+        continue;
+      }
+
+      try {
+        const payload = JSON.parse(payloadJson) as TPayload;
+        messages.push({
+          messageId,
+          queueId,
+          payload,
+          deadline,
+          consumerId,
+        });
+      } catch (error) {
+        // JSON parse error - skip this message
+        this.logger.error("Failed to parse claimed message in batch", {
+          messageId,
+          queueId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+        // Remove the corrupted message from in-flight
+        await this.#removeFromInflight(shardId, messageId, queueId);
+      }
+    }
+
+    if (messages.length > 0) {
+      this.logger.debug("Batch claimed messages", {
+        queueId,
+        consumerId,
+        count: messages.length,
+        deadline,
+      });
+    }
+
+    return messages;
+  }
+
+  /**
+   * Extend the visibility timeout for a message (heartbeat).
+   *
+   * @param messageId - The message ID
+   * @param queueId - The queue ID
+   * @param extendMs - Additional milliseconds to add to the deadline
+   * @returns true if the heartbeat was successful
+   */
+  async heartbeat(messageId: string, queueId: string, extendMs: number): Promise<boolean> {
+    const shardId = this.#getShardForQueue(queueId);
+    const inflightKey = this.keys.inflightKey(shardId);
+    const member = this.#makeMember(messageId, queueId);
+    const newDeadline = Date.now() + extendMs;
+
+    // Use Lua script to atomically check existence and update score
+    // ZADD XX returns 0 even on successful updates, so we use a custom command
+    const result = await this.redis.heartbeatMessage(inflightKey, member, newDeadline.toString());
+
+    const success = result === 1;
+
+    if (success) {
+      this.logger.debug("Heartbeat successful", {
+        messageId,
+        queueId,
+        newDeadline,
+      });
+    }
+
+    return success;
+  }
+
+  /**
+   * Mark a message as successfully processed.
+   * Removes the message from in-flight tracking.
+   *
+   * @param messageId - The message ID
+   * @param queueId - The queue ID
+   */
+  async complete(messageId: string, queueId: string): Promise<void> {
+    const shardId = this.#getShardForQueue(queueId);
+    await this.#removeFromInflight(shardId, messageId, queueId);
+
+    this.logger.debug("Message completed", {
+      messageId,
+      queueId,
+    });
+  }
+
+  /**
+   * Release a message back to its queue.
+   * Used when processing fails or consumer wants to retry later.
+   *
+   * @param messageId - The message ID
+   * @param queueId - The queue ID
+   * @param queueKey - The Redis key for the queue
+   * @param queueItemsKey - The Redis key for the queue items hash
+   * @param masterQueueKey - The Redis key for the master queue
+   * @param score - Optional score for the message (defaults to now)
+   */
+  async release<TPayload = unknown>(
+    messageId: string,
+    queueId: string,
+    queueKey: string,
+    queueItemsKey: string,
+    masterQueueKey: string,
+    score?: number
+  ): Promise<void> {
+    const shardId = this.#getShardForQueue(queueId);
+    const inflightKey = this.keys.inflightKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+    const member = this.#makeMember(messageId, queueId);
+    const messageScore = score ?? Date.now();
+
+    // Use Lua script to atomically:
+    // 1. Get message data from in-flight
+    // 2. Remove from in-flight
+    // 3. Add back to queue
+    // 4. Update master queue to ensure queue is picked up
+    await this.redis.releaseMessage(
+      inflightKey,
+      inflightDataKey,
+      queueKey,
+      queueItemsKey,
+      masterQueueKey,
+      member,
+      messageId,
+      messageScore.toString(),
+      queueId
+    );
+
+    this.logger.debug("Message released", {
+      messageId,
+      queueId,
+      score: messageScore,
+    });
+  }
+
+  /**
+   * Release multiple messages back to their queue in a single operation.
+   * Used when processing fails or consumer wants to retry later.
+   * All messages must belong to the same queue.
+   *
+   * @param messages - Array of messages to release (must all have same queueId)
+   * @param queueId - The queue ID
+   * @param queueKey - The Redis key for the queue
+   * @param queueItemsKey - The Redis key for the queue items hash
+   * @param masterQueueKey - The Redis key for the master queue
+   * @param score - Optional score for the messages (defaults to now)
+   */
+  async releaseBatch(
+    messages: Array<{ messageId: string }>,
+    queueId: string,
+    queueKey: string,
+    queueItemsKey: string,
+    masterQueueKey: string,
+    score?: number
+  ): Promise<void> {
+    if (messages.length === 0) {
+      return;
+    }
+
+    const shardId = this.#getShardForQueue(queueId);
+    const inflightKey = this.keys.inflightKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+    const messageScore = score ?? Date.now();
+
+    // Build arrays of members and messageIds for the Lua script
+    const messageIds = messages.map((m) => m.messageId);
+    const members = messages.map((m) => this.#makeMember(m.messageId, queueId));
+
+    await this.redis.releaseMessageBatch(
+      inflightKey,
+      inflightDataKey,
+      queueKey,
+      queueItemsKey,
+      masterQueueKey,
+      messageScore.toString(),
+      queueId,
+      ...members,
+      ...messageIds
+    );
+
+    this.logger.debug("Batch messages released", {
+      queueId,
+      count: messages.length,
+      score: messageScore,
+    });
+  }
+
+  /**
+   * Reclaim timed-out messages from a shard.
+   * Returns messages to their original queues.
+   *
+   * @param shardId - The shard to check
+   * @param getQueueKeys - Function to get queue keys for a queue ID
+   * @returns Array of reclaimed message info for concurrency release
+   */
+  async reclaimTimedOut(
+    shardId: number,
+    getQueueKeys: (queueId: string) => {
+      queueKey: string;
+      queueItemsKey: string;
+      masterQueueKey: string;
+    }
+  ): Promise<ReclaimedMessageInfo[]> {
+    const inflightKey = this.keys.inflightKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+    const now = Date.now();
+
+    // Get all messages past their deadline
+    const timedOut = await this.redis.zrangebyscore(
+      inflightKey,
+      "-inf",
+      now,
+      "WITHSCORES",
+      "LIMIT",
+      0,
+      100 // Process in batches
+    );
+
+    const reclaimedMessages: ReclaimedMessageInfo[] = [];
+
+    for (let i = 0; i < timedOut.length; i += 2) {
+      const member = timedOut[i];
+      const _deadlineScore = timedOut[i + 1]; // This is the visibility deadline, not the original timestamp
+      if (!member || !_deadlineScore) {
+        continue;
+      }
+      const { messageId, queueId } = this.#parseMember(member);
+      const { queueKey, queueItemsKey, masterQueueKey } = getQueueKeys(queueId);
+
+      try {
+        // Get message data BEFORE releasing so we can extract tenantId for concurrency release
+        const dataJson = await this.redis.hget(inflightDataKey, messageId);
+        let storedMessage: StoredMessage | null = null;
+        if (dataJson) {
+          try {
+            storedMessage = JSON.parse(dataJson);
+          } catch {
+            // Ignore parse error, proceed with reclaim
+          }
+        }
+
+        // Re-add to queue with original timestamp to preserve priority
+        // Fall back to now if we can't get the original timestamp
+        const score = storedMessage?.timestamp ?? now;
+        await this.redis.releaseMessage(
+          inflightKey,
+          inflightDataKey,
+          queueKey,
+          queueItemsKey,
+          masterQueueKey,
+          member,
+          messageId,
+          score.toString(),
+          queueId
+        );
+
+        // Track reclaimed message for concurrency release
+        // Always add to reclaimedMessages to avoid concurrency leaks
+        if (storedMessage) {
+          reclaimedMessages.push({
+            messageId,
+            queueId,
+            tenantId: storedMessage.tenantId,
+            metadata: storedMessage.metadata,
+          });
+        } else {
+          // Fallback: extract tenantId from queueId when message data is missing or corrupted
+          // This ensures concurrency is released even if we can't get the full metadata
+          this.logger.error("Missing or corrupted message data during reclaim, using fallback", {
+            messageId,
+            queueId,
+          });
+          reclaimedMessages.push({
+            messageId,
+            queueId,
+            tenantId: this.keys.extractTenantId(queueId),
+            metadata: {},
+          });
+        }
+
+        this.logger.debug("Reclaimed timed-out message", {
+          messageId,
+          queueId,
+          deadline: _deadlineScore,
+        });
+      } catch (error) {
+        this.logger.error("Failed to reclaim message", {
+          messageId,
+          queueId,
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
+    }
+
+    return reclaimedMessages;
+  }
+
+  /**
+   * Get all in-flight messages for a shard.
+   */
+  async getInflightMessages(shardId: number): Promise<
+    Array<{
+      messageId: string;
+      queueId: string;
+      deadline: number;
+    }>
+  > {
+    const inflightKey = this.keys.inflightKey(shardId);
+    const results = await this.redis.zrange(inflightKey, 0, -1, "WITHSCORES");
+
+    const messages: Array<{ messageId: string; queueId: string; deadline: number }> = [];
+
+    for (let i = 0; i < results.length; i += 2) {
+      const member = results[i];
+      const deadlineStr = results[i + 1];
+      if (!member || !deadlineStr) {
+        continue;
+      }
+      const deadline = parseFloat(deadlineStr);
+      const { messageId, queueId } = this.#parseMember(member);
+
+      messages.push({ messageId, queueId, deadline });
+    }
+
+    return messages;
+  }
+
+  /**
+   * Get count of in-flight messages for a shard.
+   */
+  async getInflightCount(shardId: number): Promise<number> {
+    const inflightKey = this.keys.inflightKey(shardId);
+    return await this.redis.zcard(inflightKey);
+  }
+
+  /**
+   * Get total in-flight count across all shards.
+   */
+  async getTotalInflightCount(): Promise<number> {
+    const counts = await Promise.all(
+      Array.from({ length: this.shardCount }, (_, i) => this.getInflightCount(i))
+    );
+    return counts.reduce((sum, count) => sum + count, 0);
+  }
+
+  /**
+   * Close the Redis connection.
+   */
+  async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private Methods
+  // ============================================================================
+
+  /**
+   * Map queue ID to shard using Jump Consistent Hash.
+   * Must use same algorithm as MasterQueue for consistency.
+   */
+  #getShardForQueue(queueId: string): number {
+    return jumpHash(queueId, this.shardCount);
+  }
+
+  #makeMember(messageId: string, queueId: string): string {
+    return `${messageId}:${queueId}`;
+  }
+
+  #parseMember(member: string): { messageId: string; queueId: string } {
+    const colonIndex = member.indexOf(":");
+    if (colonIndex === -1) {
+      return { messageId: member, queueId: "" };
+    }
+    return {
+      messageId: member.substring(0, colonIndex),
+      queueId: member.substring(colonIndex + 1),
+    };
+  }
+
+  async #removeFromInflight(shardId: number, messageId: string, queueId: string): Promise<void> {
+    const inflightKey = this.keys.inflightKey(shardId);
+    const inflightDataKey = this.keys.inflightDataKey(shardId);
+    const member = this.#makeMember(messageId, queueId);
+
+    const pipeline = this.redis.pipeline();
+    pipeline.zrem(inflightKey, member);
+    pipeline.hdel(inflightDataKey, messageId);
+    await pipeline.exec();
+  }
+
+  #registerCommands(): void {
+    // Atomic claim: pop from queue, add to in-flight
+    this.redis.defineCommand("claimMessage", {
+      numberOfKeys: 4,
+      lua: `
+local queueKey = KEYS[1]
+local queueItemsKey = KEYS[2]
+local inflightKey = KEYS[3]
+local inflightDataKey = KEYS[4]
+
+local queueId = ARGV[1]
+local consumerId = ARGV[2]
+local deadline = tonumber(ARGV[3])
+
+-- Get oldest message from queue
+local items = redis.call('ZRANGE', queueKey, 0, 0)
+if #items == 0 then
+  return nil
+end
+
+local messageId = items[1]
+
+-- Get message data
+local payload = redis.call('HGET', queueItemsKey, messageId)
+if not payload then
+  -- Message data missing, remove from queue and return nil
+  redis.call('ZREM', queueKey, messageId)
+  return nil
+end
+
+-- Remove from queue
+redis.call('ZREM', queueKey, messageId)
+redis.call('HDEL', queueItemsKey, messageId)
+
+-- Add to in-flight set with deadline
+local member = messageId .. ':' .. queueId
+redis.call('ZADD', inflightKey, deadline, member)
+
+-- Store message data for potential release
+redis.call('HSET', inflightDataKey, messageId, payload)
+
+return {messageId, payload}
+      `,
+    });
+
+    // Atomic batch claim: pop up to N messages from queue, add to in-flight
+    this.redis.defineCommand("claimMessageBatch", {
+      numberOfKeys: 4,
+      lua: `
+local queueKey = KEYS[1]
+local queueItemsKey = KEYS[2]
+local inflightKey = KEYS[3]
+local inflightDataKey = KEYS[4]
+
+local queueId = ARGV[1]
+local deadline = tonumber(ARGV[2])
+local maxCount = tonumber(ARGV[3])
+
+-- Get up to maxCount oldest messages from queue
+local items = redis.call('ZRANGE', queueKey, 0, maxCount - 1)
+if #items == 0 then
+  return {}
+end
+
+local results = {}
+
+for i, messageId in ipairs(items) do
+  -- Get message data
+  local payload = redis.call('HGET', queueItemsKey, messageId)
+  
+  if payload then
+    -- Remove from queue
+    redis.call('ZREM', queueKey, messageId)
+    redis.call('HDEL', queueItemsKey, messageId)
+    
+    -- Add to in-flight set with deadline
+    local member = messageId .. ':' .. queueId
+    redis.call('ZADD', inflightKey, deadline, member)
+    
+    -- Store message data for potential release
+    redis.call('HSET', inflightDataKey, messageId, payload)
+    
+    -- Add to results
+    table.insert(results, messageId)
+    table.insert(results, payload)
+  else
+    -- Message data missing, remove from queue
+    redis.call('ZREM', queueKey, messageId)
+  end
+end
+
+return results
+      `,
+    });
+
+    // Atomic release: remove from in-flight, add back to queue, update master queue
+    this.redis.defineCommand("releaseMessage", {
+      numberOfKeys: 5,
+      lua: `
+local inflightKey = KEYS[1]
+local inflightDataKey = KEYS[2]
+local queueKey = KEYS[3]
+local queueItemsKey = KEYS[4]
+local masterQueueKey = KEYS[5]
+
+local member = ARGV[1]
+local messageId = ARGV[2]
+local score = tonumber(ARGV[3])
+local queueId = ARGV[4]
+
+-- Get message data from in-flight
+local payload = redis.call('HGET', inflightDataKey, messageId)
+if not payload then
+  -- Message not in in-flight or already released
+  return 0
+end
+
+-- Remove from in-flight
+redis.call('ZREM', inflightKey, member)
+redis.call('HDEL', inflightDataKey, messageId)
+
+-- Add back to queue
+redis.call('ZADD', queueKey, score, messageId)
+redis.call('HSET', queueItemsKey, messageId, payload)
+
+-- Update master queue with oldest message timestamp
+-- This ensures delayed messages don't push the queue priority to the future
+-- when there are other ready messages in the queue
+local oldest = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
+if #oldest >= 2 then
+  redis.call('ZADD', masterQueueKey, oldest[2], queueId)
+end
+
+return 1
+      `,
+    });
+
+    // Atomic batch release: release multiple messages back to queue
+    this.redis.defineCommand("releaseMessageBatch", {
+      numberOfKeys: 5,
+      lua: `
+local inflightKey = KEYS[1]
+local inflightDataKey = KEYS[2]
+local queueKey = KEYS[3]
+local queueItemsKey = KEYS[4]
+local masterQueueKey = KEYS[5]
+
+local score = tonumber(ARGV[1])
+local queueId = ARGV[2]
+
+-- Remaining args are: members..., messageIds...
+-- Calculate how many messages we have
+local numMessages = (table.getn(ARGV) - 2) / 2
+local membersStart = 3
+local messageIdsStart = membersStart + numMessages
+
+local releasedCount = 0
+
+for i = 0, numMessages - 1 do
+  local member = ARGV[membersStart + i]
+  local messageId = ARGV[messageIdsStart + i]
+  
+  -- Get message data from in-flight
+  local payload = redis.call('HGET', inflightDataKey, messageId)
+  if payload then
+    -- Remove from in-flight
+    redis.call('ZREM', inflightKey, member)
+    redis.call('HDEL', inflightDataKey, messageId)
+    
+    -- Add back to queue
+    redis.call('ZADD', queueKey, score, messageId)
+    redis.call('HSET', queueItemsKey, messageId, payload)
+    
+    releasedCount = releasedCount + 1
+  end
+end
+
+-- Update master queue with oldest message timestamp (only once at the end)
+if releasedCount > 0 then
+  local oldest = redis.call('ZRANGE', queueKey, 0, 0, 'WITHSCORES')
+  if #oldest >= 2 then
+    redis.call('ZADD', masterQueueKey, oldest[2], queueId)
+  end
+end
+
+return releasedCount
+      `,
+    });
+
+    // Atomic heartbeat: check if member exists and update score
+    // ZADD XX returns 0 even on successful updates (it counts new additions only)
+    // So we need to check existence first with ZSCORE
+    this.redis.defineCommand("heartbeatMessage", {
+      numberOfKeys: 1,
+      lua: `
+local inflightKey = KEYS[1]
+local member = ARGV[1]
+local newDeadline = tonumber(ARGV[2])
+
+-- Check if member exists in the in-flight set
+local score = redis.call('ZSCORE', inflightKey, member)
+if not score then
+  return 0
+end
+
+-- Update the deadline
+redis.call('ZADD', inflightKey, 'XX', newDeadline, member)
+return 1
+      `,
+    });
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    claimMessage(
+      queueKey: string,
+      queueItemsKey: string,
+      inflightKey: string,
+      inflightDataKey: string,
+      queueId: string,
+      consumerId: string,
+      deadline: string
+    ): Promise<[string, string] | null>;
+
+    claimMessageBatch(
+      queueKey: string,
+      queueItemsKey: string,
+      inflightKey: string,
+      inflightDataKey: string,
+      queueId: string,
+      deadline: string,
+      maxCount: string
+    ): Promise<string[]>;
+
+    releaseMessage(
+      inflightKey: string,
+      inflightDataKey: string,
+      queueKey: string,
+      queueItemsKey: string,
+      masterQueueKey: string,
+      member: string,
+      messageId: string,
+      score: string,
+      queueId: string
+    ): Promise<number>;
+
+    releaseMessageBatch(
+      inflightKey: string,
+      inflightDataKey: string,
+      queueKey: string,
+      queueItemsKey: string,
+      masterQueueKey: string,
+      score: string,
+      queueId: string,
+      ...membersAndMessageIds: string[]
+    ): Promise<number>;
+
+    heartbeatMessage(inflightKey: string, member: string, newDeadline: string): Promise<number>;
+  }
+}
diff --git a/packages/redis-worker/src/fair-queue/workerQueue.ts b/packages/redis-worker/src/fair-queue/workerQueue.ts
new file mode 100644
index 00000000000..b3b75e9db35
--- /dev/null
+++ b/packages/redis-worker/src/fair-queue/workerQueue.ts
@@ -0,0 +1,292 @@
+import { createRedisClient, type Redis, type RedisOptions } from "@internal/redis";
+import type { FairQueueKeyProducer } from "./types.js";
+
+export interface WorkerQueueManagerOptions {
+  redis: RedisOptions;
+  keys: FairQueueKeyProducer;
+  logger?: {
+    debug: (message: string, context?: Record<string, unknown>) => void;
+    error: (message: string, context?: Record<string, unknown>) => void;
+  };
+}
+
+/**
+ * WorkerQueueManager handles the intermediate worker queue layer.
+ *
+ * This provides:
+ * - Low-latency message delivery via blocking pop (BLPOP)
+ * - Routing of messages to specific workers/consumers
+ * - Efficient waiting without polling
+ *
+ * Flow:
+ * 1. Master queue consumer claims message from message queue
+ * 2. Message key is pushed to worker queue
+ * 3. Worker queue consumer does blocking pop to receive message
+ */
+export class WorkerQueueManager {
+  private redis: Redis;
+  private keys: FairQueueKeyProducer;
+  private logger: NonNullable<WorkerQueueManagerOptions["logger"]>;
+
+  constructor(private options: WorkerQueueManagerOptions) {
+    this.redis = createRedisClient(options.redis);
+    this.keys = options.keys;
+    this.logger = options.logger ?? {
+      debug: () => {},
+      error: () => {},
+    };
+    this.#registerCommands();
+  }
+
+  // ============================================================================
+  // Public Methods
+  // ============================================================================
+
+  /**
+   * Push a message key to a worker queue.
+   * Called after claiming a message from the message queue.
+   *
+   * @param workerQueueId - The worker queue identifier
+   * @param messageKey - The message key to push (typically "messageId:queueId")
+   */
+  async push(workerQueueId: string, messageKey: string): Promise<void> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+    await this.redis.rpush(workerQueueKey, messageKey);
+
+    this.logger.debug("Pushed to worker queue", {
+      workerQueueId,
+      workerQueueKey,
+      messageKey,
+    });
+  }
+
+  /**
+   * Push multiple message keys to a worker queue.
+   *
+   * @param workerQueueId - The worker queue identifier
+   * @param messageKeys - The message keys to push
+   */
+  async pushBatch(workerQueueId: string, messageKeys: string[]): Promise<void> {
+    if (messageKeys.length === 0) {
+      return;
+    }
+
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+    await this.redis.rpush(workerQueueKey, ...messageKeys);
+
+    this.logger.debug("Pushed batch to worker queue", {
+      workerQueueId,
+      workerQueueKey,
+      count: messageKeys.length,
+    });
+  }
+
+  /**
+   * Blocking pop from a worker queue.
+   * Waits until a message is available or timeout expires.
+   *
+   * @param workerQueueId - The worker queue identifier
+   * @param timeoutSeconds - Maximum time to wait (0 = wait forever)
+   * @param signal - Optional abort signal to cancel waiting
+   * @returns The message key, or null if timeout
+   */
+  async blockingPop(
+    workerQueueId: string,
+    timeoutSeconds: number,
+    signal?: AbortSignal
+  ): Promise<string | null> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+
+    // Create a separate client for blocking operation
+    // This is required because BLPOP blocks the connection
+    const blockingClient = this.redis.duplicate();
+
+    // Define cleanup outside try so it's accessible in finally
+    // This prevents listener accumulation on the AbortSignal
+    const cleanup = signal
+      ? () => {
+          blockingClient.disconnect();
+        }
+      : null;
+
+    try {
+      // Set up abort handler
+      if (signal && cleanup) {
+        signal.addEventListener("abort", cleanup, { once: true });
+
+        if (signal.aborted) {
+          return null;
+        }
+      }
+
+      const result = await blockingClient.blpop(workerQueueKey, timeoutSeconds);
+
+      if (!result) {
+        return null;
+      }
+
+      // BLPOP returns [key, value]
+      const [, messageKey] = result;
+
+      this.logger.debug("Blocking pop received message", {
+        workerQueueId,
+        workerQueueKey,
+        messageKey,
+      });
+
+      return messageKey;
+    } catch (error) {
+      // Handle abort/disconnect
+      if (signal?.aborted) {
+        return null;
+      }
+
+      this.logger.error("Blocking pop error", {
+        workerQueueId,
+        error: error instanceof Error ? error.message : String(error),
+      });
+
+      throw error;
+    } finally {
+      // Always remove the listener to prevent accumulation on the AbortSignal
+      // (once: true only removes if abort fires, not on normal completion)
+      if (cleanup && signal) {
+        signal.removeEventListener("abort", cleanup);
+      }
+      await blockingClient.quit().catch(() => {
+        // Ignore quit errors (may already be disconnected)
+      });
+    }
+  }
+
+  /**
+   * Non-blocking pop from a worker queue.
+   *
+   * @param workerQueueId - The worker queue identifier
+   * @returns The message key and queue length, or null if empty
+   */
+  async pop(workerQueueId: string): Promise<{ messageKey: string; queueLength: number } | null> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+
+    const result = await this.redis.popWithLength(workerQueueKey);
+
+    if (!result) {
+      return null;
+    }
+
+    const [messageKey, queueLength] = result;
+
+    this.logger.debug("Non-blocking pop received message", {
+      workerQueueId,
+      workerQueueKey,
+      messageKey,
+      queueLength,
+    });
+
+    return { messageKey, queueLength: Number(queueLength) };
+  }
+
+  /**
+   * Get the current length of a worker queue.
+   */
+  async getLength(workerQueueId: string): Promise<number> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+    return await this.redis.llen(workerQueueKey);
+  }
+
+  /**
+   * Peek at all messages in a worker queue without removing them.
+   * Useful for debugging and tests.
+   */
+  async peek(workerQueueId: string): Promise<string[]> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+    return await this.redis.lrange(workerQueueKey, 0, -1);
+  }
+
+  /**
+   * Remove a specific message from the worker queue.
+   * Used when a message needs to be removed without processing.
+   *
+   * @param workerQueueId - The worker queue identifier
+   * @param messageKey - The message key to remove
+   * @returns Number of removed items
+   */
+  async remove(workerQueueId: string, messageKey: string): Promise<number> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+    return await this.redis.lrem(workerQueueKey, 0, messageKey);
+  }
+
+  /**
+   * Clear all messages from a worker queue.
+   */
+  async clear(workerQueueId: string): Promise<void> {
+    const workerQueueKey = this.keys.workerQueueKey(workerQueueId);
+    await this.redis.del(workerQueueKey);
+  }
+
+  /**
+   * Close the Redis connection.
+   */
+  async close(): Promise<void> {
+    await this.redis.quit();
+  }
+
+  // ============================================================================
+  // Private - Register Commands
+  // ============================================================================
+
+  /**
+   * Initialize custom Redis commands.
+   */
+  #registerCommands(): void {
+    // Non-blocking pop with queue length
+    this.redis.defineCommand("popWithLength", {
+      numberOfKeys: 1,
+      lua: `
+local workerQueueKey = KEYS[1]
+
+-- Pop the first message
+local messageKey = redis.call('LPOP', workerQueueKey)
+if not messageKey then
+  return nil
+end
+
+-- Get remaining queue length
+local queueLength = redis.call('LLEN', workerQueueKey)
+
+return {messageKey, queueLength}
+      `,
+    });
+  }
+
+  /**
+   * Register custom commands on an external Redis client.
+   * Use this when initializing FairQueue with worker queues.
+   */
+  registerCommands(redis: Redis): void {
+    redis.defineCommand("popWithLength", {
+      numberOfKeys: 1,
+      lua: `
+local workerQueueKey = KEYS[1]
+
+-- Pop the first message
+local messageKey = redis.call('LPOP', workerQueueKey)
+if not messageKey then
+  return nil
+end
+
+-- Get remaining queue length
+local queueLength = redis.call('LLEN', workerQueueKey)
+
+return {messageKey, queueLength}
+      `,
+    });
+  }
+}
+
+// Extend Redis interface for custom commands
+declare module "@internal/redis" {
+  interface RedisCommander<Context> {
+    popWithLength(workerQueueKey: string): Promise<[string, string] | null>;
+  }
+}
diff --git a/packages/redis-worker/src/index.ts b/packages/redis-worker/src/index.ts
index d4c28d91250..1c5147ea48d 100644
--- a/packages/redis-worker/src/index.ts
+++ b/packages/redis-worker/src/index.ts
@@ -1,2 +1,6 @@
 export * from "./queue.js";
 export * from "./worker.js";
+export * from "./utils.js";
+
+// Fair Queue System
+export * from "./fair-queue/index.js";
diff --git a/packages/redis-worker/src/queue.ts b/packages/redis-worker/src/queue.ts
index b09a9979bdc..e4c593a148d 100644
--- a/packages/redis-worker/src/queue.ts
+++ b/packages/redis-worker/src/queue.ts
@@ -83,6 +83,10 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
     this.schema = schema;
   }
 
+  async cancel(cancellationKey: string): Promise<void> {
+    await this.redis.set(`cancellationKey:${cancellationKey}`, "1", "EX", 60 * 60 * 24); // 1 day
+  }
+
   async enqueue({
     id,
     job,
@@ -90,6 +94,7 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
     attempt,
     availableAt,
     visibilityTimeoutMs,
+    cancellationKey,
   }: {
     id?: string;
     job: MessageCatalogKey<TMessageCatalog>;
@@ -97,6 +102,7 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
     attempt?: number;
     availableAt?: Date;
     visibilityTimeoutMs: number;
+    cancellationKey?: string;
   }): Promise<void> {
     try {
       const score = availableAt ? availableAt.getTime() : Date.now();
@@ -109,13 +115,16 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
         deduplicationKey,
       });
 
-      const result = await this.redis.enqueueItem(
-        `queue`,
-        `items`,
-        id ?? nanoid(),
-        score,
-        serializedItem
-      );
+      const result = cancellationKey
+        ? await this.redis.enqueueItemWithCancellationKey(
+            `queue`,
+            `items`,
+            `cancellationKey:${cancellationKey}`,
+            id ?? nanoid(),
+            score,
+            serializedItem
+          )
+        : await this.redis.enqueueItem(`queue`, `items`, id ?? nanoid(), score, serializedItem);
 
       if (result !== 1) {
         throw new Error("Enqueue operation failed");
@@ -409,6 +418,29 @@ export class SimpleQueue<TMessageCatalog extends MessageCatalogSchema> {
       `,
     });
 
+    this.redis.defineCommand("enqueueItemWithCancellationKey", {
+      numberOfKeys: 3,
+      lua: `
+        local queue = KEYS[1]
+        local items = KEYS[2]
+        local cancellationKey = KEYS[3]
+
+        local id = ARGV[1]
+        local score = ARGV[2]
+        local serializedItem = ARGV[3]
+
+        -- if the cancellation key exists, return 1
+        if redis.call('EXISTS', cancellationKey) == 1 then
+          return 1
+        end
+
+        redis.call('ZADD', queue, score, id)
+        redis.call('HSET', items, id, serializedItem)
+
+        return 1
+      `,
+    });
+
     this.redis.defineCommand("dequeueItems", {
       numberOfKeys: 2,
       lua: `
@@ -599,6 +631,18 @@ declare module "@internal/redis" {
       callback?: Callback<number>
     ): Result<number, Context>;
 
+    enqueueItemWithCancellationKey(
+      //keys
+      queue: string,
+      items: string,
+      cancellationKey: string,
+      //args
+      id: string,
+      score: number,
+      serializedItem: string,
+      callback?: Callback<number>
+    ): Result<number, Context>;
+
     dequeueItems(
       //keys
       queue: string,
diff --git a/packages/redis-worker/src/utils.ts b/packages/redis-worker/src/utils.ts
new file mode 100644
index 00000000000..a577de3b0ed
--- /dev/null
+++ b/packages/redis-worker/src/utils.ts
@@ -0,0 +1,12 @@
+/**
+ * Check if an error is an AbortError.
+ *
+ * This handles both:
+ * - Custom abort errors created with `new Error("AbortError")` (sets .message)
+ * - Native Node.js AbortError from timers/promises (sets .name)
+ */
+export function isAbortError(error: unknown): boolean {
+  return (
+    error instanceof Error && (error.name === "AbortError" || error.message === "AbortError")
+  );
+}
diff --git a/packages/redis-worker/src/worker.test.ts b/packages/redis-worker/src/worker.test.ts
index 8b604be8ae0..e4b6fd3e858 100644
--- a/packages/redis-worker/src/worker.test.ts
+++ b/packages/redis-worker/src/worker.test.ts
@@ -548,4 +548,83 @@ describe("Worker", () => {
       await worker.stop();
     }
   );
+
+  redisTest(
+    "Should allow cancelling a job before it's enqueued, but only if the enqueue.cancellationKey is provided",
+    { timeout: 30_000 },
+    async ({ redisContainer }) => {
+      const processedPayloads: string[] = [];
+
+      const worker = new Worker({
+        name: "test-worker",
+        redisOptions: {
+          host: redisContainer.getHost(),
+          port: redisContainer.getPort(),
+          password: redisContainer.getPassword(),
+        },
+        catalog: {
+          testJob: {
+            schema: z.object({ value: z.string() }),
+            visibilityTimeoutMs: 5000,
+            retry: { maxAttempts: 3 },
+          },
+        },
+        jobs: {
+          testJob: async ({ payload }) => {
+            processedPayloads.push(payload.value);
+          },
+        },
+        concurrency: {
+          workers: 1,
+          tasksPerWorker: 1,
+        },
+        pollIntervalMs: 10,
+        logger: new Logger("test", "debug"), // Use debug to see all logs
+      }).start();
+
+      // Enqueue a job to run immediately
+      await worker.enqueue({
+        id: "immediate-job",
+        job: "testJob",
+        payload: { value: "test" },
+        cancellationKey: "test-cancellation-key",
+      });
+
+      // Verify it's in the present queue
+      const initialSize = await worker.queue.size();
+      const initialSizeWithFuture = await worker.queue.size({ includeFuture: true });
+      expect(initialSize).toBe(1);
+      expect(initialSizeWithFuture).toBe(1);
+
+      // Wait for job to be processed
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+
+      // Verify job was processed
+      expect(processedPayloads).toContain("test");
+
+      // Verify queue is completely empty
+      const finalSize = await worker.queue.size();
+      const finalSizeWithFuture = await worker.queue.size({ includeFuture: true });
+      expect(finalSize).toBe(0);
+      expect(finalSizeWithFuture).toBe(0);
+
+      // Now cancel a key
+      await worker.cancel("test-cancellation-key-2");
+
+      await worker.enqueue({
+        id: "immediate-job",
+        job: "testJob",
+        payload: { value: "test" },
+        cancellationKey: "test-cancellation-key-2",
+      });
+
+      // Verify it's not in the queue (since it's been cancelled)
+      const finalSize2 = await worker.queue.size();
+      expect(finalSize2).toBe(0);
+      const finalSize2WithFuture = await worker.queue.size({ includeFuture: true });
+      expect(finalSize2WithFuture).toBe(0);
+
+      await worker.stop();
+    }
+  );
 });
diff --git a/packages/redis-worker/src/worker.ts b/packages/redis-worker/src/worker.ts
index 58db6bef565..92880d1f07c 100644
--- a/packages/redis-worker/src/worker.ts
+++ b/packages/redis-worker/src/worker.ts
@@ -36,6 +36,8 @@ export type WorkerCatalog = {
     retry?: RetryOptions;
     cron?: string;
     jitterInMs?: number;
+    /** Defaults to true. If false, errors will not be logged. */
+    logErrors?: boolean;
   };
 };
 
@@ -264,12 +266,14 @@ class Worker<TCatalog extends WorkerCatalog> {
     payload,
     visibilityTimeoutMs,
     availableAt,
+    cancellationKey,
   }: {
     id?: string;
     job: K;
     payload: z.infer<TCatalog[K]["schema"]>;
     visibilityTimeoutMs?: number;
     availableAt?: Date;
+    cancellationKey?: string;
   }) {
     return startSpan(
       this.tracer,
@@ -291,6 +295,7 @@ class Worker<TCatalog extends WorkerCatalog> {
             item: payload,
             visibilityTimeoutMs: timeout,
             availableAt,
+            cancellationKey,
           }),
           {
             job_type: String(job),
@@ -391,6 +396,17 @@ class Worker<TCatalog extends WorkerCatalog> {
     );
   }
 
+  /**
+   * Cancels a job before it's enqueued.
+   * @param cancellationKey - The cancellation key to cancel.
+   * @returns A promise that resolves when the job is cancelled.
+   *
+   * Any jobs enqueued with the same cancellation key will be not be enqueued.
+   */
+  cancel(cancellationKey: string) {
+    return startSpan(this.tracer, "cancel", () => this.queue.cancel(cancellationKey));
+  }
+
   ack(id: string) {
     return startSpan(
       this.tracer,
@@ -527,12 +543,12 @@ class Worker<TCatalog extends WorkerCatalog> {
     const catalogItem = this.options.catalog[job as any];
     const handler = this.jobs[job as any];
     if (!handler) {
-      this.logger.error(`No handler found for job type: ${job}`);
+      this.logger.error(`Worker no handler found for job type: ${job}`);
       return;
     }
 
     if (!catalogItem) {
-      this.logger.error(`No catalog item found for job type: ${job}`);
+      this.logger.error(`Worker no catalog item found for job type: ${job}`);
       return;
     }
 
@@ -576,7 +592,10 @@ class Worker<TCatalog extends WorkerCatalog> {
       }
     ).catch(async (error) => {
       const errorMessage = error instanceof Error ? error.message : String(error);
-      this.logger.error(`Error processing item:`, {
+
+      const shouldLogError = catalogItem.logErrors ?? true;
+
+      const logAttributes = {
         name: this.options.name,
         id,
         job,
@@ -584,7 +603,14 @@ class Worker<TCatalog extends WorkerCatalog> {
         visibilityTimeoutMs,
         error,
         errorMessage,
-      });
+      };
+
+      if (shouldLogError) {
+        this.logger.error(`Worker error processing item`, logAttributes);
+      } else {
+        this.logger.info(`Worker failed to process item`, logAttributes);
+      }
+
       // Attempt requeue logic.
       try {
         const newAttempt = attempt + 1;
@@ -595,15 +621,17 @@ class Worker<TCatalog extends WorkerCatalog> {
         const retryDelay = calculateNextRetryDelay(retrySettings, newAttempt);
 
         if (!retryDelay) {
-          this.logger.error(`Item ${id} reached max attempts. Moving to DLQ.`, {
-            name: this.options.name,
-            id,
-            job,
-            item,
-            visibilityTimeoutMs,
-            attempt: newAttempt,
-            errorMessage,
-          });
+          if (shouldLogError) {
+            this.logger.error(`Worker item reached max attempts. Moving to DLQ.`, {
+              ...logAttributes,
+              attempt: newAttempt,
+            });
+          } else {
+            this.logger.info(`Worker item reached max attempts. Moving to DLQ.`, {
+              ...logAttributes,
+              attempt: newAttempt,
+            });
+          }
 
           await this.queue.moveToDeadLetterQueue(id, errorMessage);
 
@@ -615,7 +643,7 @@ class Worker<TCatalog extends WorkerCatalog> {
         }
 
         const retryDate = new Date(Date.now() + retryDelay);
-        this.logger.info(`Requeuing failed item ${id} with delay`, {
+        this.logger.info(`Worker requeuing failed item with delay`, {
           name: this.options.name,
           id,
           job,
@@ -635,7 +663,7 @@ class Worker<TCatalog extends WorkerCatalog> {
         });
       } catch (requeueError) {
         this.logger.error(
-          `Failed to requeue item ${id}. It will be retried after the visibility timeout.`,
+          `Worker failed to requeue item. It will be retried after the visibility timeout.`,
           {
             name: this.options.name,
             id,
diff --git a/packages/rsc/CHANGELOG.md b/packages/rsc/CHANGELOG.md
index 056e903df94..cf6cea9be5f 100644
--- a/packages/rsc/CHANGELOG.md
+++ b/packages/rsc/CHANGELOG.md
@@ -1,5 +1,164 @@
 # @trigger.dev/rsc
 
+## 4.4.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.1`
+
+## 4.1.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- Run Engine 2.0 (alpha) ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
diff --git a/packages/rsc/package.json b/packages/rsc/package.json
index fa7d2cef791..a6d5d03ce2d 100644
--- a/packages/rsc/package.json
+++ b/packages/rsc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/rsc",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "trigger.dev rsc",
   "license": "MIT",
   "publishConfig": {
@@ -37,14 +37,14 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:^4.0.0-v4-beta.24",
+    "@trigger.dev/core": "workspace:^4.4.1",
     "mlly": "^1.7.1",
     "react": "19.0.0-rc.1",
     "react-dom": "19.0.0-rc.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.4",
-    "@trigger.dev/build": "workspace:^4.0.0-v4-beta.24",
+    "@trigger.dev/build": "workspace:^4.4.1",
     "@types/node": "^20.14.14",
     "@types/react": "*",
     "@types/react-dom": "*",
diff --git a/packages/schema-to-json/.gitignore b/packages/schema-to-json/.gitignore
new file mode 100644
index 00000000000..c887152393c
--- /dev/null
+++ b/packages/schema-to-json/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+dist
+.tshy
+.tshy-build
+*.log
+.DS_Store
\ No newline at end of file
diff --git a/packages/schema-to-json/CHANGELOG.md b/packages/schema-to-json/CHANGELOG.md
new file mode 100644
index 00000000000..13755b80a66
--- /dev/null
+++ b/packages/schema-to-json/CHANGELOG.md
@@ -0,0 +1,142 @@
+# @trigger.dev/schema-to-json
+
+## 4.4.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.1`
+
+## 4.1.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- remove effect from optional peer dependencies since it's now a production dependency ([#2527](https://github.com/triggerdotdev/trigger.dev/pull/2527))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.1`
+
+## 4.0.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
diff --git a/packages/schema-to-json/README.md b/packages/schema-to-json/README.md
new file mode 100644
index 00000000000..9576b6e8007
--- /dev/null
+++ b/packages/schema-to-json/README.md
@@ -0,0 +1,151 @@
+# @trigger.dev/schema-to-json
+
+Convert various schema validation libraries to JSON Schema format.
+
+## Installation
+
+```bash
+npm install @trigger.dev/schema-to-json
+```
+
+## Important: Bundle Safety
+
+This package is designed to be **bundle-safe**. It does NOT bundle any schema libraries (zod, yup, etc.) as dependencies. Instead:
+
+1. **Built-in conversions** work immediately (ArkType, Zod 4, TypeBox)
+2. **External conversions** (Zod 3, Yup, Effect) require the conversion libraries to be available at runtime
+
+This design ensures that:
+- ✅ Your bundle size stays small
+- ✅ You only include the schema libraries you actually use
+- ✅ Tree-shaking works properly
+- ✅ No unnecessary dependencies are installed
+
+## Supported Schema Libraries
+
+- ✅ **Zod** - Full support
+  - Zod 4: Native support via built-in `toJsonSchema` method (no external deps needed)
+  - Zod 3: Requires `zod-to-json-schema` to be installed
+- ✅ **Yup** - Requires `@sodaru/yup-to-json-schema` to be installed
+- ✅ **ArkType** - Native support (built-in `toJsonSchema` method)
+- ✅ **Effect/Schema** - Requires `effect` or `@effect/schema` to be installed
+- ✅ **TypeBox** - Native support (already JSON Schema compliant)
+- ⏳ **Valibot** - Coming soon
+- ⏳ **Superstruct** - Coming soon
+- ⏳ **Runtypes** - Coming soon
+
+## Usage
+
+### Basic Usage (Built-in conversions only)
+
+```typescript
+import { schemaToJsonSchema } from '@trigger.dev/schema-to-json';
+import { type } from 'arktype';
+
+// Works immediately for schemas with built-in conversion
+const arkSchema = type({
+  name: 'string',
+  age: 'number',
+});
+
+const result = schemaToJsonSchema(arkSchema);
+console.log(result);
+// { jsonSchema: {...}, schemaType: 'arktype' }
+```
+
+### Full Usage (With external conversion libraries)
+
+```typescript
+import { schemaToJsonSchema, initializeSchemaConverters } from '@trigger.dev/schema-to-json';
+import { z } from 'zod';
+
+// Initialize converters once in your app (loads conversion libraries if available)
+await initializeSchemaConverters();
+
+// Now you can convert Zod 3, Yup, and Effect schemas
+const zodSchema = z.object({
+  name: z.string(),
+  age: z.number(),
+  email: z.string().email(),
+});
+
+const result = schemaToJsonSchema(zodSchema);
+console.log(result);
+// {
+//   jsonSchema: {
+//     type: 'object',
+//     properties: {
+//       name: { type: 'string' },
+//       age: { type: 'number' },
+//       email: { type: 'string', format: 'email' }
+//     },
+//     required: ['name', 'age', 'email']
+//   },
+//   schemaType: 'zod'
+// }
+```
+
+## API
+
+### `schemaToJsonSchema(schema, options?)`
+
+Convert a schema to JSON Schema format.
+
+**Parameters:**
+- `schema` - The schema to convert
+- `options` (optional)
+  - `name` - Name to use for the schema (supported by some converters)
+  - `additionalProperties` - Additional properties to merge into the result
+
+**Returns:**
+- `{ jsonSchema, schemaType }` - The converted JSON Schema and detected type
+- `undefined` - If the schema cannot be converted
+
+### `initializeSchemaConverters()`
+
+Initialize the external conversion libraries. Call this once in your application if you need to convert schemas that don't have built-in JSON Schema support (Zod 3, Yup, Effect).
+
+**Returns:** `Promise<void>`
+
+### `canConvertSchema(schema)`
+
+Check if a schema can be converted to JSON Schema.
+
+**Returns:** `boolean`
+
+### `detectSchemaType(schema)`
+
+Detect the type of schema.
+
+**Returns:** `'zod' | 'yup' | 'arktype' | 'effect' | 'valibot' | 'superstruct' | 'runtypes' | 'typebox' | 'unknown'`
+
+### `areConvertersInitialized()`
+
+Check which conversion libraries are available.
+
+**Returns:** `{ zod: boolean, yup: boolean, effect: boolean }`
+
+## Peer Dependencies
+
+Each schema library is an optional peer dependency. Install only the ones you need:
+
+```bash
+# For Zod
+npm install zod
+
+# For Yup
+npm install yup
+
+# For ArkType
+npm install arktype
+
+# For Effect
+npm install effect @effect/schema
+
+# For TypeBox
+npm install @sinclair/typebox
+```
+
+## License
+
+MIT
\ No newline at end of file
diff --git a/packages/schema-to-json/package.json b/packages/schema-to-json/package.json
new file mode 100644
index 00000000000..b236cb42212
--- /dev/null
+++ b/packages/schema-to-json/package.json
@@ -0,0 +1,95 @@
+{
+  "name": "@trigger.dev/schema-to-json",
+  "version": "4.4.1",
+  "description": "Convert various schema validation libraries to JSON Schema",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "directory": "packages/schema-to-json"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=18.20.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.js"
+      },
+      "require": {
+        "types": "./dist/commonjs/index.d.ts",
+        "default": "./dist/commonjs/index.js"
+      }
+    }
+  },
+  "scripts": {
+    "clean": "rimraf dist",
+    "build": "pnpm run clean && pnpm run build:tshy && pnpm run update-version",
+    "build:tshy": "tshy",
+    "dev": "tshy --watch",
+    "typecheck": "tsc -p tsconfig.src.json --noEmit",
+    "test": "vitest",
+    "update-version": "tsx ../../scripts/updateVersion.ts",
+    "check-exports": "attw --pack ."
+  },
+  "dependencies": {
+    "@trigger.dev/core": "workspace:*",
+    "zod-to-json-schema": "^3.24.0",
+    "@sodaru/yup-to-json-schema": "^2",
+    "zod": "3.25.76",
+    "effect": "^3"
+  },
+  "devDependencies": {
+    "arktype": "^2.0.0",
+    "runtypes": "^6.7.0",
+    "superstruct": "^2.0.2",
+    "tshy": "^3.0.2",
+    "@sinclair/typebox": "^0.34.3",
+    "valibot": "^1.1.0",
+    "yup": "^1.7.0",
+    "rimraf": "6.0.1",
+    "@arethetypeswrong/cli": "^0.15.4"
+  },
+  "peerDependencies": {
+    "arktype": ">=2.0.0",
+    "runtypes": ">=5.0.0",
+    "superstruct": ">=0.14.2",
+    "@sinclair/typebox": ">=0.34.30",
+    "valibot": ">=0.41.0"
+  },
+  "peerDependenciesMeta": {
+    "arktype": {
+      "optional": true
+    },
+    "runtypes": {
+      "optional": true
+    },
+    "superstruct": {
+      "optional": true
+    },
+    "@sinclair/typebox": {
+      "optional": true
+    },
+    "valibot": {
+      "optional": true
+    }
+  },
+  "tshy": {
+    "selfLink": false,
+    "exports": {
+      ".": "./src/index.ts"
+    },
+    "project": "./tsconfig.src.json"
+  },
+  "main": "./dist/commonjs/index.js",
+  "types": "./dist/commonjs/index.d.ts",
+  "module": "./dist/esm/index.js"
+}
diff --git a/packages/schema-to-json/src/index.ts b/packages/schema-to-json/src/index.ts
new file mode 100644
index 00000000000..8631060db34
--- /dev/null
+++ b/packages/schema-to-json/src/index.ts
@@ -0,0 +1,173 @@
+// Import JSONSchema from core to ensure compatibility
+import type { JSONSchema } from "@trigger.dev/core/v3";
+import { zodToJsonSchema } from "zod-to-json-schema";
+import * as z4 from "zod/v4";
+import { convertSchema } from "@sodaru/yup-to-json-schema";
+import { JSONSchema as EffectJSONSchema } from "effect";
+
+export type Schema = unknown;
+export type { JSONSchema };
+
+export interface ConversionOptions {
+  /**
+   * Enables support for references in the schema.
+   * This is required for recursive schemas, e.g. with `z.lazy`.
+   * However, not all language models and providers support such references.
+   * Defaults to `false`.
+   */
+  useReferences?: boolean;
+}
+
+export interface ConversionResult {
+  /**
+   * The JSON Schema representation (JSON Schema Draft 7)
+   */
+  jsonSchema: JSONSchema;
+}
+
+/**
+ * Convert a schema from various validation libraries to JSON Schema
+ *
+ * This function attempts to convert schemas without requiring external dependencies to be bundled.
+ * It will only succeed if:
+ * 1. The schema has built-in JSON Schema conversion (ArkType, Zod 4, TypeBox)
+ * 2. The required conversion library is available at runtime (zod-to-json-schema, @sodaru/yup-to-json-schema, etc.)
+ *
+ * @param schema The schema to convert
+ * @param options Optional conversion options
+ * @returns The conversion result or undefined if conversion is not possible
+ */
+export function schemaToJsonSchema(
+  schema: Schema,
+  options?: ConversionOptions
+): ConversionResult | undefined {
+  const parser = schema as any;
+
+  // Check if schema has a built-in toJsonSchema method (e.g., ArkType, Zod 4)
+  if (typeof parser.toJsonSchema === "function") {
+    try {
+      const jsonSchema = parser.toJsonSchema();
+
+      return {
+        jsonSchema,
+      };
+    } catch (error) {
+      // If toJsonSchema fails, continue to other checks
+    }
+  }
+
+  if (isZodSchema(parser)) {
+    const jsonSchema = convertZodSchema(parser, options);
+
+    if (jsonSchema) {
+      return {
+        jsonSchema: jsonSchema,
+      };
+    }
+  }
+
+  // Check if it's a TypeBox schema (has Static and Kind symbols)
+  if (parser[Symbol.for("TypeBox.Kind")] !== undefined) {
+    // TypeBox schemas are already JSON Schema compliant
+    return {
+      jsonSchema: parser,
+    };
+  }
+
+  if (isYupSchema(parser)) {
+    const jsonSchema = convertYupSchema(parser);
+    if (jsonSchema) {
+      return {
+        jsonSchema: jsonSchema,
+      };
+    }
+  }
+
+  if (isEffectSchema(parser)) {
+    const jsonSchema = convertEffectSchema(parser);
+    if (jsonSchema) {
+      return {
+        jsonSchema: jsonSchema,
+      };
+    }
+  }
+
+  // Future schema types can be added here...
+
+  // Unknown schema type
+  return undefined;
+}
+
+/**
+ * Check if a schema can be converted to JSON Schema
+ */
+export function canConvertSchema(schema: Schema): boolean {
+  const result = schemaToJsonSchema(schema);
+  return result !== undefined;
+}
+
+export function isZodSchema(schema: any): boolean {
+  return isZod3Schema(schema) || isZod4Schema(schema);
+}
+
+function isZod3Schema(schema: any): boolean {
+  return "_def" in schema && "parse" in schema && "parseAsync" in schema && "safeParse" in schema;
+}
+
+function isZod4Schema(schema: any): boolean {
+  return "_zod" in schema;
+}
+
+function convertZodSchema(schema: any, options?: ConversionOptions): JSONSchema | undefined {
+  if (isZod4Schema(schema)) {
+    return convertZod4Schema(schema, options);
+  }
+
+  if (isZod3Schema(schema)) {
+    return convertZod3Schema(schema, options);
+  }
+
+  return undefined;
+}
+
+function convertZod3Schema(schema: any, options?: ConversionOptions): JSONSchema | undefined {
+  const useReferences = options?.useReferences ?? false;
+
+  return zodToJsonSchema(schema, {
+    $refStrategy: useReferences ? "root" : "none",
+  }) as JSONSchema;
+}
+
+function convertZod4Schema(schema: any, options?: ConversionOptions): JSONSchema | undefined {
+  const useReferences = options?.useReferences ?? false;
+
+  return z4.toJSONSchema(schema, {
+    target: "draft-7",
+    io: "output",
+    reused: useReferences ? "ref" : "inline",
+  }) as JSONSchema;
+}
+
+function isYupSchema(schema: any): boolean {
+  return "spec" in schema && "_typeCheck" in schema;
+}
+
+function convertYupSchema(schema: any): JSONSchema | undefined {
+  try {
+    return convertSchema(schema) as JSONSchema;
+  } catch {
+    return undefined;
+  }
+}
+
+function isEffectSchema(schema: any): boolean {
+  return "ast" in schema && typeof schema.ast === "object" && typeof schema.ast._tag === "string";
+}
+
+function convertEffectSchema(schema: any): JSONSchema | undefined {
+  try {
+    return EffectJSONSchema.make(schema) as JSONSchema;
+  } catch {
+    return undefined;
+  }
+}
diff --git a/packages/schema-to-json/tests/index.test.ts b/packages/schema-to-json/tests/index.test.ts
new file mode 100644
index 00000000000..b266a42b3b0
--- /dev/null
+++ b/packages/schema-to-json/tests/index.test.ts
@@ -0,0 +1,271 @@
+import * as z3 from "zod/v3";
+import * as z4 from "zod/v4";
+import * as y from "yup";
+// @ts-ignore
+import { type } from "arktype";
+import { Schema } from "effect";
+import { Type } from "@sinclair/typebox";
+import { schemaToJsonSchema, canConvertSchema } from "../src/index.js";
+
+describe("schemaToJsonSchema", () => {
+  describe("Zod schemas", () => {
+    it("should convert a simple Zod object schema", () => {
+      const schema = z3.object({
+        name: z3.string(),
+        age: z3.number(),
+        email: z3.string().email(),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          age: { type: "number" },
+          email: { type: "string", format: "email" },
+        },
+        required: ["name", "age", "email"],
+      });
+    });
+
+    it("should convert a simple Zod 4 object schema", () => {
+      const schema = z4.object({
+        name: z4.string(),
+        age: z4.number(),
+        email: z4.email(),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          age: { type: "number" },
+          email: { type: "string", format: "email" },
+        },
+        required: ["name", "age", "email"],
+      });
+    });
+
+    it("should convert a Zod schema with optional fields", () => {
+      const schema = z3.object({
+        id: z3.string(),
+        description: z3.string().optional(),
+        tags: z3.array(z3.string()).optional(),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          id: { type: "string" },
+          description: { type: "string" },
+          tags: { type: "array", items: { type: "string" } },
+        },
+        required: ["id"],
+      });
+    });
+
+    it("should handle Zod schema with name option", () => {
+      const schema = z3.object({
+        value: z3.number(),
+      });
+
+      const result = schemaToJsonSchema(schema, { useReferences: true });
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toBeDefined();
+      // The exact structure depends on zod-to-json-schema implementation
+    });
+  });
+
+  describe("Yup schemas", () => {
+    it("should convert a simple Yup object schema", () => {
+      const schema = y.object({
+        name: y.string().required(),
+        age: y.number().required(),
+        email: y.string().email().required(),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          age: { type: "number" },
+          email: { type: "string", format: "email" },
+        },
+        required: ["name", "age", "email"],
+      });
+    });
+
+    it("should convert a Yup schema with optional fields", () => {
+      const schema = y.object({
+        id: y.string().required(),
+        description: y.string(),
+        count: y.number().min(0).max(100),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          id: { type: "string" },
+          description: { type: "string" },
+          count: { type: "number", minimum: 0, maximum: 100 },
+        },
+        required: ["id"],
+      });
+    });
+  });
+
+  describe("ArkType schemas", () => {
+    it("should convert a simple ArkType schema", () => {
+      const schema = type({
+        name: "string",
+        age: "number",
+        active: "boolean",
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toBeDefined();
+      expect(result?.jsonSchema.type).toBe("object");
+    });
+
+    it("should convert an ArkType schema with optional fields", () => {
+      const schema = type({
+        id: "string",
+        "description?": "string",
+        "tags?": "string[]",
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toBeDefined();
+      expect(result?.jsonSchema.type).toBe("object");
+    });
+  });
+
+  describe("Effect schemas", () => {
+    it("should convert a simple Effect schema", () => {
+      const schema = Schema.Struct({
+        name: Schema.String,
+        age: Schema.Number,
+        active: Schema.Boolean,
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          age: { type: "number" },
+          active: { type: "boolean" },
+        },
+        required: ["name", "age", "active"],
+      });
+    });
+
+    it("should convert an Effect schema with optional fields", () => {
+      const schema = Schema.Struct({
+        id: Schema.String,
+        description: Schema.optional(Schema.String),
+        count: Schema.optional(Schema.Number),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toBeDefined();
+      expect(result?.jsonSchema.type).toBe("object");
+    });
+  });
+
+  describe("TypeBox schemas", () => {
+    it("should convert a simple TypeBox schema", () => {
+      const schema = Type.Object({
+        name: Type.String(),
+        age: Type.Number(),
+        active: Type.Boolean(),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          name: { type: "string" },
+          age: { type: "number" },
+          active: { type: "boolean" },
+        },
+        required: ["name", "age", "active"],
+      });
+    });
+
+    it("should convert a TypeBox schema with optional fields", () => {
+      const schema = Type.Object({
+        id: Type.String(),
+        description: Type.Optional(Type.String()),
+        tags: Type.Optional(Type.Array(Type.String())),
+      });
+
+      const result = schemaToJsonSchema(schema);
+
+      expect(result).toBeDefined();
+      expect(result?.jsonSchema).toMatchObject({
+        type: "object",
+        properties: {
+          id: { type: "string" },
+          description: { type: "string" },
+          tags: { type: "array", items: { type: "string" } },
+        },
+        required: ["id"],
+      });
+    });
+  });
+
+  describe("Unsupported schemas", () => {
+    it("should return undefined for unsupported schema types", () => {
+      const invalidSchema = { notASchema: true };
+      const result = schemaToJsonSchema(invalidSchema);
+      expect(result).toBeUndefined();
+    });
+
+    it("should return undefined for plain functions", () => {
+      const fn = (value: unknown) => typeof value === "string";
+      const result = schemaToJsonSchema(fn);
+      expect(result).toBeUndefined();
+    });
+  });
+});
+
+describe("canConvertSchema", () => {
+  it("should return true for supported schemas", () => {
+    expect(canConvertSchema(z3.string())).toBe(true);
+    expect(canConvertSchema(y.string())).toBe(true);
+    expect(canConvertSchema(type("string"))).toBe(true);
+    expect(canConvertSchema(Schema.String)).toBe(true);
+    expect(canConvertSchema(Type.String())).toBe(true);
+  });
+
+  it("should return false for unsupported schemas", () => {
+    expect(canConvertSchema({ notASchema: true })).toBe(false);
+    expect(canConvertSchema(() => true)).toBe(false);
+  });
+});
diff --git a/packages/schema-to-json/tsconfig.json b/packages/schema-to-json/tsconfig.json
new file mode 100644
index 00000000000..5bf5eba8d50
--- /dev/null
+++ b/packages/schema-to-json/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../.configs/tsconfig.base.json",
+  "references": [
+    {
+      "path": "./tsconfig.src.json"
+    },
+    {
+      "path": "./tsconfig.test.json"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/packages/schema-to-json/tsconfig.src.json b/packages/schema-to-json/tsconfig.src.json
new file mode 100644
index 00000000000..93f59a20f5c
--- /dev/null
+++ b/packages/schema-to-json/tsconfig.src.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["./src/**/*.ts"],
+  "exclude": ["src/**/*.test.ts"],
+  "compilerOptions": {
+    "isolatedDeclarations": false,
+    "composite": true,
+    "sourceMap": true,
+    "customConditions": ["@triggerdotdev/source"]
+  }
+}
diff --git a/packages/schema-to-json/tsconfig.test.json b/packages/schema-to-json/tsconfig.test.json
new file mode 100644
index 00000000000..c68227ee396
--- /dev/null
+++ b/packages/schema-to-json/tsconfig.test.json
@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "include": ["./tests/**/*.ts"],
+  "references": [{ "path": "./tsconfig.src.json" }],
+  "compilerOptions": {
+    "isolatedDeclarations": false,
+    "composite": true,
+    "sourceMap": true,
+    "types": ["vitest/globals"]
+  }
+}
diff --git a/packages/schema-to-json/vitest.config.ts b/packages/schema-to-json/vitest.config.ts
new file mode 100644
index 00000000000..c7da6b38e14
--- /dev/null
+++ b/packages/schema-to-json/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'node',
+  },
+});
\ No newline at end of file
diff --git a/packages/trigger-sdk/CHANGELOG.md b/packages/trigger-sdk/CHANGELOG.md
index a6ed2bdab9f..97c5b0b8336 100644
--- a/packages/trigger-sdk/CHANGELOG.md
+++ b/packages/trigger-sdk/CHANGELOG.md
@@ -1,5 +1,538 @@
 # @trigger.dev/sdk
 
+## 4.4.1
+
+### Patch Changes
+
+- Add OTEL metrics pipeline for task workers. Workers collect process CPU/memory, Node.js runtime metrics (event loop utilization, event loop delay, heap usage), and user-defined custom metrics via `otel.metrics.getMeter()`. Metrics are exported to ClickHouse with 10-second aggregation buckets and 1m/5m rollups, and are queryable through the dashboard query engine with typed attribute columns, `prettyFormat()` for human-readable values, and AI query support. ([#3061](https://github.com/triggerdotdev/trigger.dev/pull/3061))
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.1`
+
+## 4.4.0
+
+### Minor Changes
+
+- Added `query.execute()` which lets you query your Trigger.dev data using TRQL (Trigger Query Language) and returns results as typed JSON rows or CSV. It supports configurable scope (environment, project, or organization), time filtering via `period` or `from`/`to` ranges, and a `format` option for JSON or CSV output. ([#3060](https://github.com/triggerdotdev/trigger.dev/pull/3060))
+
+  ```typescript
+  import { query } from "@trigger.dev/sdk";
+  import type { QueryTable } from "@trigger.dev/sdk";
+
+  // Basic untyped query
+  const result = await query.execute("SELECT run_id, status FROM runs LIMIT 10");
+
+  // Type-safe query using QueryTable to pick specific columns
+  const typedResult = await query.execute<QueryTable<"runs", "run_id" | "status" | "triggered_at">>(
+    "SELECT run_id, status, triggered_at FROM runs LIMIT 10"
+  );
+  typedResult.results.forEach((row) => {
+    console.log(row.run_id, row.status); // Fully typed
+  });
+
+  // Aggregation query with inline types
+  const stats = await query.execute<{ status: string; count: number }>(
+    "SELECT status, COUNT(*) as count FROM runs GROUP BY status",
+    { scope: "project", period: "30d" }
+  );
+
+  // CSV export
+  const csv = await query.execute("SELECT run_id, status FROM runs", {
+    format: "csv",
+    period: "7d",
+  });
+  console.log(csv.results); // Raw CSV string
+  ```
+
+### Patch Changes
+
+- Add `maxDelay` option to debounce feature. This allows setting a maximum time limit for how long a debounced run can be delayed, ensuring execution happens within a specified window even with continuous triggers. ([#2984](https://github.com/triggerdotdev/trigger.dev/pull/2984))
+
+  ```typescript
+  await myTask.trigger(payload, {
+    debounce: {
+      key: "my-key",
+      delay: "5s",
+      maxDelay: "30m", // Execute within 30 minutes regardless of continuous triggers
+    },
+  });
+  ```
+
+- Aligned the SDK's `getRunIdForOptions` logic with the Core package to handle semantic targets (`root`, `parent`) in root tasks. ([#2874](https://github.com/triggerdotdev/trigger.dev/pull/2874))
+- Export `AnyOnStartAttemptHookFunction` type to allow defining `onStartAttempt` hooks for individual tasks. ([#2966](https://github.com/triggerdotdev/trigger.dev/pull/2966))
+- Fixed a minor issue in the deployment command on distinguishing between local builds for the cloud vs local builds for self-hosting setups. ([#3070](https://github.com/triggerdotdev/trigger.dev/pull/3070))
+- Updated dependencies:
+  - `@trigger.dev/core@4.4.0`
+
+## 4.3.3
+
+### Patch Changes
+
+- Add support for AI SDK v6 (Vercel AI SDK) ([#2919](https://github.com/triggerdotdev/trigger.dev/pull/2919))
+
+  - Updated peer dependency to allow `ai@^6.0.0` alongside v4 and v5
+  - Updated internal code to handle async validation from AI SDK v6's Schema type
+
+- Expose user-provided idempotency key and scope in task context. `ctx.run.idempotencyKey` now returns the original key passed to `idempotencyKeys.create()` instead of the hash, and `ctx.run.idempotencyKeyScope` shows the scope ("run", "attempt", or "global"). ([#2903](https://github.com/triggerdotdev/trigger.dev/pull/2903))
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.3`
+
+## 4.3.2
+
+### Patch Changes
+
+- Improve batch trigger error messages, especially when rate limited ([#2837](https://github.com/triggerdotdev/trigger.dev/pull/2837))
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.2`
+
+## 4.3.1
+
+### Patch Changes
+
+- feat: Support for new batch trigger system ([#2779](https://github.com/triggerdotdev/trigger.dev/pull/2779))
+- feat(sdk): Support debouncing runs when triggering with new debounce options ([#2794](https://github.com/triggerdotdev/trigger.dev/pull/2794))
+- Added support for idempotency reset ([#2777](https://github.com/triggerdotdev/trigger.dev/pull/2777))
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.1`
+
+## 4.3.0
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.3.0`
+
+## 4.2.0
+
+### Patch Changes
+
+- fix(sdk): Re-export schemaTask types to prevent the TypeScript error TS2742: The inferred type of 'task' cannot be named without a reference to '@trigger.dev/core/v3'. This is likely not portable. ([#2735](https://github.com/triggerdotdev/trigger.dev/pull/2735))
+- feat: add ability to set custom resource properties through trigger.config.ts or via the OTEL_RESOURCE_ATTRIBUTES env var ([#2704](https://github.com/triggerdotdev/trigger.dev/pull/2704))
+- Updated dependencies:
+  - `@trigger.dev/core@4.2.0`
+
+## 4.1.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.2`
+
+## 4.1.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.1`
+
+## 4.1.0
+
+### Minor Changes
+
+- Realtime streams v2 ([#2632](https://github.com/triggerdotdev/trigger.dev/pull/2632))
+- Prevent uncaught errors in the `onSuccess`, `onComplete`, and `onFailure` lifecycle hooks from failing attempts/runs. ([#2515](https://github.com/triggerdotdev/trigger.dev/pull/2515))
+
+  Deprecated the `onStart` lifecycle hook (which only fires before the `run` function on the first attempt). Replaced with `onStartAttempt` that fires before the run function on every attempt:
+
+  ```ts
+  export const taskWithOnStartAttempt = task({
+    id: "task-with-on-start-attempt",
+    onStartAttempt: async ({ payload, ctx }) => {
+      //...
+    },
+    run: async (payload: any, { ctx }) => {
+      //...
+    },
+  });
+
+  // Default a global lifecycle hook using tasks
+  tasks.onStartAttempt(({ ctx, payload, task }) => {
+    console.log(
+      `Run ${ctx.run.id} started on task ${task} attempt ${ctx.run.attempt.number}`,
+      ctx.run
+    );
+  });
+  ```
+
+  If you want to execute code before just the first attempt, you can use the `onStartAttempt` function and check `ctx.run.attempt.number === 1`:
+
+  ```ts /trigger/on-start-attempt.ts
+  export const taskWithOnStartAttempt = task({
+    id: "task-with-on-start-attempt",
+    onStartAttempt: async ({ payload, ctx }) => {
+      if (ctx.run.attempt.number === 1) {
+        console.log("Run started on attempt 1", ctx.run);
+      }
+    },
+  });
+  ```
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.1.0`
+
+## 4.0.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.7`
+
+## 4.0.6
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.6`
+
+## 4.0.5
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.5`
+
+## 4.0.4
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.4`
+
+## 4.0.3
+
+### Patch Changes
+
+- Added the heartbeats.yield utility to allow tasks that do continuous CPU-heavy work to heartbeat and continue running ([#2489](https://github.com/triggerdotdev/trigger.dev/pull/2489))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.3`
+
+## 4.0.2
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.2`
+
+## 4.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.1`
+
+## 4.0.0
+
+### Major Changes
+
+- Trigger.dev v4 release. Please see our upgrade to v4 docs to view the full changelog: https://trigger.dev/docs/upgrade-to-v4 ([#1869](https://github.com/triggerdotdev/trigger.dev/pull/1869))
+
+### Patch Changes
+
+- fix: importing from runEngine/index.js breaks non-node runtimes ([#2328](https://github.com/triggerdotdev/trigger.dev/pull/2328))
+- Run Engine 2.0 (alpha) ([#1575](https://github.com/triggerdotdev/trigger.dev/pull/1575))
+- fix: Logging large objects is now much more performant and uses less memory ([#2263](https://github.com/triggerdotdev/trigger.dev/pull/2263))
+- New internal idempotency implementation for trigger and batch trigger to prevent request retries from duplicating work ([#2256](https://github.com/triggerdotdev/trigger.dev/pull/2256))
+- When you create a Waitpoint token using `wait.createToken()` you get a URL back that can be used to complete it by making an HTTP POST request. ([#2025](https://github.com/triggerdotdev/trigger.dev/pull/2025))
+- feat: Support AI SDK 5.0. `ai.tool` now accepts either a schemaTask or a task with a provided jsonSchema ([#2396](https://github.com/triggerdotdev/trigger.dev/pull/2396))
+- External Trace Correlation & OpenTelemetry Package Updates. ([#2334](https://github.com/triggerdotdev/trigger.dev/pull/2334))
+
+  | Package                                   | Previous Version | New Version | Change Type                          |
+  | ----------------------------------------- | ---------------- | ----------- | ------------------------------------ |
+  | `@opentelemetry/api`                      | 1.9.0            | 1.9.0       | No change (stable API)               |
+  | `@opentelemetry/api-logs`                 | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/core`                     | -                | 2.0.1       | New dependency                       |
+  | `@opentelemetry/exporter-logs-otlp-http`  | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/exporter-trace-otlp-http` | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/instrumentation`          | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/instrumentation-fetch`    | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/resources`                | 1.25.1           | 2.0.1       | Major update                         |
+  | `@opentelemetry/sdk-logs`                 | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/sdk-node`                 | 0.52.1           | -           | Removed (functionality consolidated) |
+  | `@opentelemetry/sdk-trace-base`           | 1.25.1           | 2.0.1       | Major update                         |
+  | `@opentelemetry/sdk-trace-node`           | 1.25.1           | 2.0.1       | Major update                         |
+  | `@opentelemetry/semantic-conventions`     | 1.25.1           | 1.36.0      | Minor update                         |
+
+  ### External trace correlation and propagation
+
+  We will now correlate your external traces with trigger.dev traces and logs when using our external exporters:
+
+  ```ts
+  import { defineConfig } from "@trigger.dev/sdk";
+  import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+  import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+
+  export default defineConfig({
+    project: process.env.TRIGGER_PROJECT_REF,
+    dirs: ["./src/trigger"],
+    telemetry: {
+      logExporters: [
+        new OTLPLogExporter({
+          url: "https://api.axiom.co/v1/logs",
+          headers: {
+            Authorization: `Bearer ${process.env.AXIOM_TOKEN}`,
+            "X-Axiom-Dataset": "test",
+          },
+        }),
+      ],
+      exporters: [
+        new OTLPTraceExporter({
+          url: "https://api.axiom.co/v1/traces",
+          headers: {
+            Authorization: `Bearer ${process.env.AXIOM_TOKEN}`,
+            "X-Axiom-Dataset": "test",
+          },
+        }),
+      ],
+    },
+    maxDuration: 3600,
+  });
+  ```
+
+  You can also now propagate your external trace context when calling back into your own backend infra from inside a trigger.dev task:
+
+  ```ts
+  import { otel, task } from "@trigger.dev/sdk";
+  import { context, propagation } from "@opentelemetry/api";
+
+  async function callNextjsApp() {
+    return await otel.withExternalTrace(async () => {
+      const headersObject = {};
+
+      // Now context.active() refers to your external trace context
+      propagation.inject(context.active(), headersObject);
+
+      const result = await fetch("http://localhost:3000/api/demo-call-from-trigger", {
+        headers: new Headers(headersObject),
+        method: "POST",
+        body: JSON.stringify({
+          message: "Hello from Trigger.dev",
+        }),
+      });
+
+      return result.json();
+    });
+  }
+
+  export const myTask = task({
+    id: "my-task",
+    run: async (payload: any) => {
+      await callNextjsApp();
+    },
+  });
+  ```
+
+- Add jsonSchema support when indexing tasks ([#2353](https://github.com/triggerdotdev/trigger.dev/pull/2353))
+- Fixed an issue with realtime streams that timeout and resume streaming dropping chunks ([#1993](https://github.com/triggerdotdev/trigger.dev/pull/1993))
+- Added and cleaned up the run ctx param: ([#2322](https://github.com/triggerdotdev/trigger.dev/pull/2322))
+
+  - New optional properties `ctx.run.parentTaskRunId` and `ctx.run.rootTaskRunId` reference the current run's root/parent ID.
+  - Removed deprecated properties from `ctx`
+  - Added a new `ctx.deployment` object that contains information about the deployment associated with the run.
+
+  We also update `metadata.root` and `metadata.parent` to work even when the run is a "root" run (meaning it doesn't have a parent or a root associated run). This now works:
+
+  ```ts
+  metadata.root.set("foo", "bar");
+  metadata.parent.set("baz", 1);
+  metadata.current().foo; // "bar"
+  metadata.current().baz; // 1
+  ```
+
+- The envvars.list() and retrieve() functions receive isSecret for each value. Secret values are always redacted. ([#1942](https://github.com/triggerdotdev/trigger.dev/pull/1942))
+- Fix issue where realtime streams would cut off after 5 minutes ([#1952](https://github.com/triggerdotdev/trigger.dev/pull/1952))
+- Deprecate toolTask and replace with `ai.tool(mySchemaTask)` ([#1863](https://github.com/triggerdotdev/trigger.dev/pull/1863))
+- Display clickable links in Cursor terminal ([#1998](https://github.com/triggerdotdev/trigger.dev/pull/1998))
+- Removes the `releaseConcurrencyOnWaitpoint` option on queues and the `releaseConcurrency` option on various wait functions. Replaced with the following default behavior: ([#2284](https://github.com/triggerdotdev/trigger.dev/pull/2284))
+
+  - Concurrency is never released when a run is first blocked via a waitpoint, at either the env or queue level.
+  - Concurrency is always released when a run is checkpointed and shutdown, at both the env and queue level.
+
+  Additionally, environment concurrency limits now have a new "Burst Factor", defaulting to 2.0x. The "Burst Factor" allows the environment-wide concurrency limit to be higher than any individual queue's concurrency limit. For example, if you have an environment concurrency limit of 100, and a Burst Factor of 2.0x, then you can execute up to 200 runs concurrently, but any one task/queue can still only execute 100 runs concurrently.
+
+  We've done some work cleaning up the run statuses. The new statuses are:
+
+  - `PENDING_VERSION`: Task is waiting for a version update because it cannot execute without additional information (task, queue, etc.)
+  - `QUEUED`: Task is waiting to be executed by a worker
+  - `DEQUEUED`: Task has been dequeued and is being sent to a worker to start executing.
+  - `EXECUTING`: Task is currently being executed by a worker
+  - `WAITING`: Task has been paused by the system, and will be resumed by the system
+  - `COMPLETED`: Task has been completed successfully
+  - `CANCELED`: Task has been canceled by the user
+  - `FAILED`: Task has failed to complete, due to an error in the system
+  - `CRASHED`: Task has crashed and won't be retried, most likely the worker ran out of resources, e.g. memory or storage
+  - `SYSTEM_FAILURE`: Task has failed to complete, due to an error in the system
+  - `DELAYED`: Task has been scheduled to run at a specific time
+  - `EXPIRED`: Task has expired and won't be executed
+  - `TIMED_OUT`: Task has reached it's maxDuration and has been stopped
+
+  We've removed the following statuses:
+
+  - `WAITING_FOR_DEPLOY`: This is no longer used, and is replaced by `PENDING_VERSION`
+  - `FROZEN`: This is no longer used, and is replaced by `WAITING`
+  - `INTERRUPTED`: This is no longer used
+  - `REATTEMPTING`: This is no longer used, and is replaced by `EXECUTING`
+
+  We've also added "boolean" helpers to runs returned via the API and from Realtime:
+
+  - `isQueued`: Returns true when the status is `QUEUED`, `PENDING_VERSION`, or `DELAYED`
+  - `isExecuting`: Returns true when the status is `EXECUTING`, `DEQUEUED`. These count against your concurrency limits.
+  - `isWaiting`: Returns true when the status is `WAITING`. These do not count against your concurrency limits.
+  - `isCompleted`: Returns true when the status is any of the completed statuses.
+  - `isCanceled`: Returns true when the status is `CANCELED`
+  - `isFailed`: Returns true when the status is any of the failed statuses.
+  - `isSuccess`: Returns true when the status is `COMPLETED`
+
+  This change adds the ability to easily detect which runs are being counted against your concurrency limit by filtering for both `EXECUTING` or `DEQUEUED`.
+
+- Add onCancel lifecycle hook ([#2022](https://github.com/triggerdotdev/trigger.dev/pull/2022))
+- Provide realtime skipColumns option via untamperable public access tokens ([#2201](https://github.com/triggerdotdev/trigger.dev/pull/2201))
+- Removed triggerAndPoll. It was never recommended so it's been removed. ([#2379](https://github.com/triggerdotdev/trigger.dev/pull/2379))
+- Improve metadata flushing efficiency by collapsing operations ([#2106](https://github.com/triggerdotdev/trigger.dev/pull/2106))
+- Upgrade to zod 3.25.76 ([#2352](https://github.com/triggerdotdev/trigger.dev/pull/2352))
+- Specify a region override when triggering a run ([#2366](https://github.com/triggerdotdev/trigger.dev/pull/2366))
+- Added runs.list filtering for queue and machine ([#2277](https://github.com/triggerdotdev/trigger.dev/pull/2277))
+- maintain proper context in metadata.root and parent getters ([#1917](https://github.com/triggerdotdev/trigger.dev/pull/1917))
+- v4: New lifecycle hooks ([#1817](https://github.com/triggerdotdev/trigger.dev/pull/1817))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0`
+
+## 4.0.0-v4-beta.28
+
+### Patch Changes
+
+- feat: Support AI SDK 5.0. `ai.tool` now accepts either a schemaTask or a task with a provided jsonSchema ([#2396](https://github.com/triggerdotdev/trigger.dev/pull/2396))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.28`
+
+## 4.0.0-v4-beta.27
+
+### Patch Changes
+
+- External Trace Correlation & OpenTelemetry Package Updates. ([#2334](https://github.com/triggerdotdev/trigger.dev/pull/2334))
+
+  | Package                                   | Previous Version | New Version | Change Type                          |
+  | ----------------------------------------- | ---------------- | ----------- | ------------------------------------ |
+  | `@opentelemetry/api`                      | 1.9.0            | 1.9.0       | No change (stable API)               |
+  | `@opentelemetry/api-logs`                 | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/core`                     | -                | 2.0.1       | New dependency                       |
+  | `@opentelemetry/exporter-logs-otlp-http`  | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/exporter-trace-otlp-http` | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/instrumentation`          | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/instrumentation-fetch`    | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/resources`                | 1.25.1           | 2.0.1       | Major update                         |
+  | `@opentelemetry/sdk-logs`                 | 0.52.1           | 0.203.0     | Major update                         |
+  | `@opentelemetry/sdk-node`                 | 0.52.1           | -           | Removed (functionality consolidated) |
+  | `@opentelemetry/sdk-trace-base`           | 1.25.1           | 2.0.1       | Major update                         |
+  | `@opentelemetry/sdk-trace-node`           | 1.25.1           | 2.0.1       | Major update                         |
+  | `@opentelemetry/semantic-conventions`     | 1.25.1           | 1.36.0      | Minor update                         |
+
+  ### External trace correlation and propagation
+
+  We will now correlate your external traces with trigger.dev traces and logs when using our external exporters:
+
+  ```ts
+  import { defineConfig } from "@trigger.dev/sdk";
+  import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+  import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+
+  export default defineConfig({
+    project: process.env.TRIGGER_PROJECT_REF,
+    dirs: ["./src/trigger"],
+    telemetry: {
+      logExporters: [
+        new OTLPLogExporter({
+          url: "https://api.axiom.co/v1/logs",
+          headers: {
+            Authorization: `Bearer ${process.env.AXIOM_TOKEN}`,
+            "X-Axiom-Dataset": "test",
+          },
+        }),
+      ],
+      exporters: [
+        new OTLPTraceExporter({
+          url: "https://api.axiom.co/v1/traces",
+          headers: {
+            Authorization: `Bearer ${process.env.AXIOM_TOKEN}`,
+            "X-Axiom-Dataset": "test",
+          },
+        }),
+      ],
+    },
+    maxDuration: 3600,
+  });
+  ```
+
+  You can also now propagate your external trace context when calling back into your own backend infra from inside a trigger.dev task:
+
+  ```ts
+  import { otel, task } from "@trigger.dev/sdk";
+  import { context, propagation } from "@opentelemetry/api";
+
+  async function callNextjsApp() {
+    return await otel.withExternalTrace(async () => {
+      const headersObject = {};
+
+      // Now context.active() refers to your external trace context
+      propagation.inject(context.active(), headersObject);
+
+      const result = await fetch("http://localhost:3000/api/demo-call-from-trigger", {
+        headers: new Headers(headersObject),
+        method: "POST",
+        body: JSON.stringify({
+          message: "Hello from Trigger.dev",
+        }),
+      });
+
+      return result.json();
+    });
+  }
+
+  export const myTask = task({
+    id: "my-task",
+    run: async (payload: any) => {
+      await callNextjsApp();
+    },
+  });
+  ```
+
+- Add jsonSchema support when indexing tasks ([#2353](https://github.com/triggerdotdev/trigger.dev/pull/2353))
+- Removed triggerAndPoll. It was never recommended so it's been removed. ([#2379](https://github.com/triggerdotdev/trigger.dev/pull/2379))
+- Upgrade to zod 3.25.76 ([#2352](https://github.com/triggerdotdev/trigger.dev/pull/2352))
+- Specify a region override when triggering a run ([#2366](https://github.com/triggerdotdev/trigger.dev/pull/2366))
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.27`
+
+## 4.0.0-v4-beta.26
+
+### Patch Changes
+
+- fix: importing from runEngine/index.js breaks non-node runtimes ([#2328](https://github.com/triggerdotdev/trigger.dev/pull/2328))
+- Added and cleaned up the run ctx param: ([#2322](https://github.com/triggerdotdev/trigger.dev/pull/2322))
+
+  - New optional properties `ctx.run.parentTaskRunId` and `ctx.run.rootTaskRunId` reference the current run's root/parent ID.
+  - Removed deprecated properties from `ctx`
+  - Added a new `ctx.deployment` object that contains information about the deployment associated with the run.
+
+  We also update `metadata.root` and `metadata.parent` to work even when the run is a "root" run (meaning it doesn't have a parent or a root associated run). This now works:
+
+  ```ts
+  metadata.root.set("foo", "bar");
+  metadata.parent.set("baz", 1);
+  metadata.current().foo; // "bar"
+  metadata.current().baz; // 1
+  ```
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.26`
+
+## 4.0.0-v4-beta.25
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.0.0-v4-beta.25`
+
 ## 4.0.0-v4-beta.24
 
 ### Patch Changes
diff --git a/packages/trigger-sdk/README.md b/packages/trigger-sdk/README.md
index c53b5cb9061..f82b525095a 100644
--- a/packages/trigger-sdk/README.md
+++ b/packages/trigger-sdk/README.md
@@ -4,28 +4,48 @@
   <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>
-  
-### Open source background jobs with no timeouts
 
-[Discord](https://trigger.dev/discord) | [Website](https://trigger.dev) | [Issues](https://github.com/triggerdotdev/trigger.dev/issues) | [Docs](https://trigger.dev/docs)
+[![npm version](https://img.shields.io/npm/v/@trigger.dev/sdk.svg)](https://www.npmjs.com/package/@trigger.dev/sdk)
+[![npm downloads](https://img.shields.io/npm/dm/@trigger.dev/sdk.svg)](https://www.npmjs.com/package/@trigger.dev/sdk)
+[![GitHub stars](https://img.shields.io/github/stars/triggerdotdev/trigger.dev?style=social)](https://github.com/triggerdotdev/trigger.dev)
+[![TypeScript](https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg)](https://www.typescriptlang.org/)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Open Source](https://img.shields.io/badge/Open%20Source-%E2%9D%A4-red)](https://github.com/triggerdotdev/trigger.dev)
 
-[![Twitter](https://img.shields.io/twitter/url/https/twitter.com/triggerdotdev.svg?style=social&label=Follow%20%40trigger.dev)](https://twitter.com/triggerdotdev)
+[Discord](https://trigger.dev/discord) | [Website](https://trigger.dev) | [Issues](https://github.com/triggerdotdev/trigger.dev/issues) | [Docs](https://trigger.dev/docs) | [Examples](https://trigger.dev/docs/examples)
 
 </div>
 
 # Official TypeScript SDK for Trigger.dev
 
-The Trigger.dev SDK is a TypeScript/JavaScript library that allows you to define and trigger tasks in your project.
+The Trigger.dev SDK is a TypeScript/JavaScript library that allows you to define and trigger tasks in your projects.
 
-## About
+## About Trigger.dev
 
-Trigger.dev is an open source platform and SDK which allows you to create long-running background jobs. Write normal async code, deploy, and never hit a timeout.
+Trigger.dev is an open source platform for building and deploying fully-managed AI agents and workflows. Write workflows in normal async TypeScript for everything from simple tasks to long-running AI agents, heavy media processing, complex real-time systems and more. Complete with full observability, managed queues, and elastic infrastructure which handles the horizontal scaling.
+
+## Core features
+
+- Task creation and execution
+- CLI for development and deployment
+- Build system with extensions
+- Management API for runs, schedules, and environment variables
+
+## Key Components:
+
+- Tasks: Background jobs written in TypeScript/JavaScript
+- CLI: Commands for login, init, dev, deploy
+- Build Extensions: Customize builds (Prisma, Python, FFmpeg, etc.)
+- Management API: Programmatic control over runs and resources
 
 ## Getting started
 
-The quickest way to get started is to create an account in our [web app](https://cloud.trigger.dev), create a new project and follow the instructions in the onboarding. Build and deploy your first task in minutes.
+There are two ways to get started:
+
+1. Create an account in our [web app](https://cloud.trigger.dev), create a new project and follow the instructions in the onboarding. Build and deploy your first task in minutes.
+2. [Manual setup](https://trigger.dev/docs/manual-setup) in your existing project.
 
-## SDK usage
+## SDK documentation
 
 For more information on our SDK, refer to our [docs](https://trigger.dev/docs/introduction).
 
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
index eba0ea1aa1b..f5f840bc1e7 100644
--- a/packages/trigger-sdk/package.json
+++ b/packages/trigger-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/sdk",
-  "version": "4.0.0-v4-beta.24",
+  "version": "4.4.1",
   "description": "trigger.dev Node.JS SDK",
   "license": "MIT",
   "publishConfig": {
@@ -45,14 +45,14 @@
     "build": "tshy && pnpm run update-version",
     "dev": "tshy --watch",
     "typecheck": "tsc --noEmit",
+    "test": "vitest",
     "update-version": "tsx ../../scripts/updateVersion.ts",
     "check-exports": "attw --pack ."
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@opentelemetry/api-logs": "0.52.1",
-    "@opentelemetry/semantic-conventions": "1.25.1",
-    "@trigger.dev/core": "workspace:4.0.0-v4-beta.24",
+    "@opentelemetry/semantic-conventions": "1.36.0",
+    "@trigger.dev/core": "workspace:4.4.1",
     "chalk": "^5.2.0",
     "cronstrue": "^2.21.0",
     "debug": "^4.3.4",
@@ -69,17 +69,17 @@
     "@types/slug": "^5.0.3",
     "@types/uuid": "^9.0.0",
     "@types/ws": "^8.5.3",
-    "ai": "^4.2.0",
+    "ai": "^6.0.0",
     "encoding": "^0.1.13",
     "rimraf": "^3.0.2",
     "tshy": "^3.0.2",
     "tsx": "4.17.0",
     "typed-emitter": "^2.1.0",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "peerDependencies": {
-    "zod": "^3.0.0",
-    "ai": "^4.2.0"
+    "zod": "^3.0.0 || ^4.0.0",
+    "ai": "^4.2.0 || ^5.0.0 || ^6.0.0"
   },
   "peerDependenciesMeta": {
     "ai": {
diff --git a/packages/trigger-sdk/src/v3/ai.ts b/packages/trigger-sdk/src/v3/ai.ts
index de4f9794f52..59afa2fe21a 100644
--- a/packages/trigger-sdk/src/v3/ai.ts
+++ b/packages/trigger-sdk/src/v3/ai.ts
@@ -1,15 +1,17 @@
 import {
+  AnyTask,
   isSchemaZodEsque,
+  Task,
   type inferSchemaIn,
   type TaskSchema,
   type TaskWithSchema,
 } from "@trigger.dev/core/v3";
-import { jsonSchema, Schema, tool, ToolExecutionOptions, zodSchema } from "ai";
+import { dynamicTool, jsonSchema, JSONSchema7, Schema, Tool, ToolCallOptions, zodSchema } from "ai";
 import { metadata } from "./metadata.js";
 
 const METADATA_KEY = "tool.execute.options";
 
-export type ToolCallExecutionOptions = Omit<ToolExecutionOptions, "abortSignal">;
+export type ToolCallExecutionOptions = Omit<ToolCallOptions, "abortSignal">;
 
 type ToolResultContent = Array<
   | {
@@ -27,25 +29,43 @@ export type ToolOptions<TResult> = {
   experimental_toToolResultContent?: (result: TResult) => ToolResultContent;
 };
 
+function toolFromTask<TIdentifier extends string, TInput = void, TOutput = unknown>(
+  task: Task<TIdentifier, TInput, TOutput>,
+  options?: ToolOptions<TOutput>
+): Tool<TInput, TOutput>;
 function toolFromTask<
   TIdentifier extends string,
   TTaskSchema extends TaskSchema | undefined = undefined,
   TOutput = unknown,
->(task: TaskWithSchema<TIdentifier, TTaskSchema, TOutput>, options?: ToolOptions<TOutput>) {
-  if (!task.schema) {
+>(
+  task: TaskWithSchema<TIdentifier, TTaskSchema, TOutput>,
+  options?: ToolOptions<TOutput>
+): Tool<inferSchemaIn<TTaskSchema>, TOutput>;
+function toolFromTask<
+  TIdentifier extends string,
+  TTaskSchema extends TaskSchema | undefined = undefined,
+  TInput = void,
+  TOutput = unknown,
+>(
+  task: TaskWithSchema<TIdentifier, TTaskSchema, TOutput> | Task<TIdentifier, TInput, TOutput>,
+  options?: ToolOptions<TOutput>
+): TTaskSchema extends TaskSchema
+  ? Tool<inferSchemaIn<TTaskSchema>, TOutput>
+  : Tool<TInput, TOutput> {
+  if (("schema" in task && !task.schema) || ("jsonSchema" in task && !task.jsonSchema)) {
     throw new Error(
-      "Cannot convert schemaTask to a tool because the task has no schema. Make sure the schema used in the task is either zod, arktype, or another supported schema."
+      "Cannot convert this task to to a tool because the task has no schema. Make sure to either use schemaTask or a task with an input jsonSchema."
     );
   }
 
-  return tool({
+  const toolDefinition = dynamicTool({
     description: task.description,
-    parameters: convertTaskSchemaToToolParameters(task.schema),
-    execute: async (args, options) => {
+    inputSchema: convertTaskSchemaToToolParameters(task),
+    execute: async (input, options) => {
       const serializedOptions = options ? JSON.parse(JSON.stringify(options)) : undefined;
 
       return await task
-        .triggerAndWait(args, {
+        .triggerAndWait(input as inferSchemaIn<TTaskSchema>, {
           metadata: {
             [METADATA_KEY]: serializedOptions,
           },
@@ -54,6 +74,10 @@ function toolFromTask<
     },
     ...options,
   });
+
+  return toolDefinition as TTaskSchema extends TaskSchema
+    ? Tool<inferSchemaIn<TTaskSchema>, TOutput>
+    : Tool<TInput, TOutput>;
 }
 
 function getToolOptionsFromMetadata(): ToolCallExecutionOptions | undefined {
@@ -64,21 +88,27 @@ function getToolOptionsFromMetadata(): ToolCallExecutionOptions | undefined {
   return tool as ToolCallExecutionOptions;
 }
 
-function convertTaskSchemaToToolParameters<TTaskSchema extends TaskSchema>(
-  schema: TTaskSchema
-): Schema<inferSchemaIn<TTaskSchema>> {
-  // If TaskSchema is ZodEsque, use ai.zodSchema to convert it to a Schema
-  if (isSchemaZodEsque(schema)) {
-    return zodSchema(schema as any);
+function convertTaskSchemaToToolParameters(
+  task: AnyTask | TaskWithSchema<any, any, any>
+): Schema<unknown> {
+  if ("schema" in task) {
+    // If TaskSchema is ArkTypeEsque, use ai.jsonSchema to convert it to a Schema
+    if ("toJsonSchema" in task.schema && typeof task.schema.toJsonSchema === "function") {
+      return jsonSchema((task.schema as any).toJsonSchema());
+    }
+
+    // If TaskSchema is ZodEsque, use ai.zodSchema to convert it to a Schema
+    if (isSchemaZodEsque(task.schema)) {
+      return zodSchema(task.schema as any);
+    }
   }
 
-  // If TaskSchema is ArkTypeEsque, use ai.jsonSchema to convert it to a Schema
-  if ("toJsonSchema" in schema && typeof schema.toJsonSchema === "function") {
-    return jsonSchema((schema as any).toJsonSchema());
+  if ("jsonSchema" in task) {
+    return jsonSchema(task.jsonSchema as JSONSchema7);
   }
 
   throw new Error(
-    "Cannot convert schemaTask to a tool. Make sure the schema used in the task is either zod, arktype, or another supported schema."
+    "Cannot convert task to a tool. Make sure to use a task with a schema or jsonSchema."
   );
 }
 
diff --git a/packages/trigger-sdk/src/v3/batch.ts b/packages/trigger-sdk/src/v3/batch.ts
index 292bf13f324..0c31621ce6d 100644
--- a/packages/trigger-sdk/src/v3/batch.ts
+++ b/packages/trigger-sdk/src/v3/batch.ts
@@ -5,12 +5,13 @@ import {
   ApiRequestOptions,
   mergeRequestOptions,
   RetrieveBatchResponse,
+  RetrieveBatchV2Response,
 } from "@trigger.dev/core/v3";
 import {
+  batchTriggerAndWaitTasks,
   batchTriggerById,
   batchTriggerByIdAndWait,
   batchTriggerTasks,
-  batchTriggerAndWaitTasks,
 } from "./shared.js";
 import { tracer } from "./tracer.js";
 
@@ -42,7 +43,7 @@ export const batch = {
 function retrieveBatch(
   batchId: string,
   requestOptions?: ApiRequestOptions
-): ApiPromise<RetrieveBatchResponse> {
+): ApiPromise<RetrieveBatchV2Response> {
   const apiClient = apiClientManager.clientOrThrow();
 
   const $requestOptions = mergeRequestOptions(
diff --git a/packages/trigger-sdk/src/v3/heartbeats.ts b/packages/trigger-sdk/src/v3/heartbeats.ts
new file mode 100644
index 00000000000..7c84abede10
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/heartbeats.ts
@@ -0,0 +1,44 @@
+import { heartbeats as coreHeartbeats } from "@trigger.dev/core/v3";
+
+/**
+ *
+ * Yields to the Trigger.dev runtime to keep the task alive.
+ *
+ * This is a cooperative "heartbeat" that you can call as often as you like
+ * inside long-running or CPU-heavy loops (e.g. parsing large files, processing
+ * many records, or handling big Textract results).
+ *
+ * You don’t need to worry about over-calling it: the underlying implementation
+ * automatically decides when to actually yield to the event loop and send a
+ * heartbeat to the Trigger.dev runtime. Extra calls are effectively free.
+ *
+ * ### Example
+ * ```ts
+ * import { heartbeats } from "@trigger.dev/sdk/v3";
+ *
+ * for (const row of bigDataset) {
+ *   process(row);
+ *   await heartbeats.yield(); // safe to call every iteration
+ * }
+ * ```
+ *
+ * Using this regularly prevents `TASK_RUN_STALLED_EXECUTING` errors by ensuring
+ * the run never appears idle, even during heavy synchronous work.
+ *
+ * This function is also safe to call from outside of a Trigger.dev task run, it will effectively be a no-op.
+ */
+async function heartbeatsYield() {
+  await coreHeartbeats.yield();
+}
+
+/**
+ * Returns the last heartbeat timestamp, for debugging purposes only. You probably don't need this.
+ */
+function heartbeatsGetLastHeartbeat() {
+  return coreHeartbeats.lastHeartbeat;
+}
+
+export const heartbeats = {
+  yield: heartbeatsYield,
+  getLastHeartbeat: heartbeatsGetLastHeartbeat,
+};
diff --git a/packages/trigger-sdk/src/v3/hooks.ts b/packages/trigger-sdk/src/v3/hooks.ts
index b4e9cd09885..9c4bd8eb691 100644
--- a/packages/trigger-sdk/src/v3/hooks.ts
+++ b/packages/trigger-sdk/src/v3/hooks.ts
@@ -12,10 +12,12 @@ import {
   type AnyOnCatchErrorHookFunction,
   type AnyOnMiddlewareHookFunction,
   type AnyOnCancelHookFunction,
+  type AnyOnStartAttemptHookFunction,
 } from "@trigger.dev/core/v3";
 
 export type {
   AnyOnStartHookFunction,
+  AnyOnStartAttemptHookFunction,
   TaskStartHookParams,
   OnStartHookFunction,
   AnyOnFailureHookFunction,
@@ -41,6 +43,18 @@ export function onStart(
   });
 }
 
+export function onStartAttempt(name: string, fn: AnyOnStartAttemptHookFunction): void;
+export function onStartAttempt(fn: AnyOnStartAttemptHookFunction): void;
+export function onStartAttempt(
+  fnOrName: string | AnyOnStartAttemptHookFunction,
+  fn?: AnyOnStartAttemptHookFunction
+): void {
+  lifecycleHooks.registerGlobalStartAttemptHook({
+    id: typeof fnOrName === "string" ? fnOrName : fnOrName.name ? fnOrName.name : undefined,
+    fn: typeof fnOrName === "function" ? fnOrName : fn!,
+  });
+}
+
 export function onFailure(name: string, fn: AnyOnFailureHookFunction): void;
 export function onFailure(fn: AnyOnFailureHookFunction): void;
 export function onFailure(
diff --git a/packages/trigger-sdk/src/v3/idempotencyKeys.ts b/packages/trigger-sdk/src/v3/idempotencyKeys.ts
index 87e3be03d85..0030dbf3aaf 100644
--- a/packages/trigger-sdk/src/v3/idempotencyKeys.ts
+++ b/packages/trigger-sdk/src/v3/idempotencyKeys.ts
@@ -1,7 +1,8 @@
-import { createIdempotencyKey, type IdempotencyKey } from "@trigger.dev/core/v3";
+import { createIdempotencyKey, resetIdempotencyKey, type IdempotencyKey } from "@trigger.dev/core/v3";
 
 export const idempotencyKeys = {
   create: createIdempotencyKey,
+  reset: resetIdempotencyKey,
 };
 
 export type { IdempotencyKey };
diff --git a/packages/trigger-sdk/src/v3/index.ts b/packages/trigger-sdk/src/v3/index.ts
index 4527cd6d01e..43ee41e6e52 100644
--- a/packages/trigger-sdk/src/v3/index.ts
+++ b/packages/trigger-sdk/src/v3/index.ts
@@ -1,7 +1,7 @@
 export * from "./cache.js";
 export * from "./config.js";
 export { retry, type RetryOptions } from "./retry.js";
-export { queue } from "./shared.js";
+export { queue, BatchTriggerError } from "./shared.js";
 export * from "./tasks.js";
 export * from "./batch.js";
 export * from "./wait.js";
@@ -13,6 +13,11 @@ export * from "./metadata.js";
 export * from "./timeout.js";
 export * from "./webhooks.js";
 export * from "./locals.js";
+export * from "./otel.js";
+export * from "./schemas.js";
+export * from "./heartbeats.js";
+export * from "./streams.js";
+export * from "./query.js";
 export type { Context };
 
 import type { Context } from "./shared.js";
diff --git a/packages/trigger-sdk/src/v3/metadata.ts b/packages/trigger-sdk/src/v3/metadata.ts
index b0c321d81dc..cc303a46ed7 100644
--- a/packages/trigger-sdk/src/v3/metadata.ts
+++ b/packages/trigger-sdk/src/v3/metadata.ts
@@ -7,6 +7,7 @@ import {
   type AsyncIterableStream,
 } from "@trigger.dev/core/v3";
 import { tracer } from "./tracer.js";
+import { streams } from "./streams.js";
 
 const parentMetadataUpdater: RunMetadataUpdater = runMetadata.parent;
 const rootMetadataUpdater: RunMetadataUpdater = runMetadata.root;
@@ -228,12 +229,19 @@ async function refreshMetadata(requestOptions?: ApiRequestOptions): Promise<void
   await runMetadata.refresh($requestOptions);
 }
 
+/**
+ * @deprecated Use `streams.pipe()` instead.
+ */
 async function stream<T>(
   key: string,
   value: AsyncIterable<T> | ReadableStream<T>,
   signal?: AbortSignal
 ): Promise<AsyncIterable<T>> {
-  return runMetadata.stream(key, value, signal);
+  const streamInstance = await streams.pipe(key, value, {
+    signal,
+  });
+
+  return streamInstance.stream;
 }
 
 async function fetchStream<T>(key: string, signal?: AbortSignal): Promise<AsyncIterableStream<T>> {
diff --git a/packages/trigger-sdk/src/v3/otel.ts b/packages/trigger-sdk/src/v3/otel.ts
new file mode 100644
index 00000000000..d02220208e7
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/otel.ts
@@ -0,0 +1,9 @@
+import { metrics } from "@opentelemetry/api";
+import { traceContext } from "@trigger.dev/core/v3";
+
+export const otel = {
+  withExternalTrace: <T>(fn: () => T): T => {
+    return traceContext.withExternalTrace(fn);
+  },
+  metrics,
+};
diff --git a/packages/trigger-sdk/src/v3/query.ts b/packages/trigger-sdk/src/v3/query.ts
new file mode 100644
index 00000000000..8d86416b271
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/query.ts
@@ -0,0 +1,184 @@
+import type {
+  ApiRequestOptions,
+  Prettify,
+  QueryExecuteResponseBody,
+  QueryExecuteCSVResponseBody,
+} from "@trigger.dev/core/v3";
+import { apiClientManager, mergeRequestOptions } from "@trigger.dev/core/v3";
+import { tracer } from "./tracer.js";
+
+export type { QueryTable, RunsTableRow, RunFriendlyStatus } from "@trigger.dev/core/v3";
+
+export type QueryScope = "environment" | "project" | "organization";
+export type QueryFormat = "json" | "csv";
+
+/**
+ * Options for executing a TRQL query
+ */
+export type QueryOptions = {
+  /**
+   * The scope of the query - determines what data is accessible
+   * - "environment": Current environment only (default)
+   * - "project": All environments in the project
+   * - "organization": All projects in the organization
+   *
+   * @default "environment"
+   */
+  scope?: QueryScope;
+
+  /**
+   * Time period to query (e.g., "7d", "30d", "1h")
+   * Cannot be used with `from` or `to`
+   */
+  period?: string;
+
+  /**
+   * Start of time range as a Date object or Unix timestamp in milliseconds.
+   * Must be used with `to`.
+   */
+  from?: Date | number;
+
+  /**
+   * End of time range as a Date object or Unix timestamp in milliseconds.
+   * Must be used with `from`.
+   */
+  to?: Date | number;
+
+  /**
+   * Response format
+   * - "json": Returns structured data (default)
+   * - "csv": Returns CSV string
+   *
+   * @default "json"
+   */
+  format?: QueryFormat;
+};
+
+/**
+ * Execute a TRQL query and get the results as a CSV string.
+ *
+ * @param {string} query - The TRQL query string to execute
+ * @param {QueryOptions & { format: "csv" }} options - Query options with `format: "csv"`
+ * @param {ApiRequestOptions} [requestOptions] - Optional API request configuration
+ * @returns A promise resolving to `{ format: "csv", results: string }` where `results` is the raw CSV text
+ *
+ * @example
+ * ```typescript
+ * const csvResult = await query.execute(
+ *   "SELECT run_id, status, triggered_at FROM runs",
+ *   { format: "csv", period: "7d" }
+ * );
+ * const lines = csvResult.results.split('\n');
+ * ```
+ */
+function execute(
+  query: string,
+  options: QueryOptions & { format: "csv" },
+  requestOptions?: ApiRequestOptions
+): Promise<{ format: "csv"; results: string }>;
+
+/**
+ * Execute a TRQL query and return typed JSON rows.
+ *
+ * @template TRow - The shape of each row in the result set. Use {@link QueryTable} for type-safe column access (e.g. `QueryTable<"runs", "status" | "run_id">`)
+ * @param {string} query - The TRQL query string to execute
+ * @param {QueryOptions} [options] - Optional query configuration
+ * @param {ApiRequestOptions} [requestOptions] - Optional API request configuration
+ * @returns A promise resolving to `{ format: "json", results: Array<TRow> }`
+ *
+ * @example
+ * ```typescript
+ * // Basic query with defaults (environment scope, json format)
+ * const result = await query.execute("SELECT run_id, status FROM runs LIMIT 10");
+ * console.log(result.results); // Array<Record<string, any>>
+ *
+ * // Type-safe query using QueryTable with specific columns
+ * const typedResult = await query.execute<QueryTable<"runs", "run_id" | "status" | "triggered_at">>(
+ *   "SELECT run_id, status, triggered_at FROM runs LIMIT 10"
+ * );
+ * typedResult.results.forEach(row => {
+ *   console.log(row.run_id, row.status); // Fully typed!
+ * });
+ *
+ * // Inline type for aggregation queries
+ * const stats = await query.execute<{ status: string; count: number }>(
+ *   "SELECT status, COUNT(*) as count FROM runs GROUP BY status"
+ * );
+ * stats.results.forEach(row => {
+ *   console.log(row.status, row.count); // Fully type-safe
+ * });
+ *
+ * // Query with a custom time period
+ * const recent = await query.execute(
+ *   "SELECT COUNT(*) as count FROM runs",
+ *   { period: "3d" }
+ * );
+ * console.log(recent.results[0].count);
+ * ```
+ */
+function execute<TRow extends Record<string, any> = Record<string, any>>(
+  query: string,
+  options?: Omit<QueryOptions, "format"> | (QueryOptions & { format?: "json" }),
+  requestOptions?: ApiRequestOptions
+): Promise<{ format: "json"; results: Array<Prettify<TRow>> }>;
+
+// Implementation
+function execute<TRow extends Record<string, any> = Record<string, any>>(
+  query: string,
+  options?: QueryOptions,
+  requestOptions?: ApiRequestOptions
+): Promise<{ format: "json"; results: Array<TRow> } | { format: "csv"; results: string }> {
+  const apiClient = apiClientManager.clientOrThrow();
+
+  const from = dateToISOString(options?.from);
+  const to = dateToISOString(options?.to);
+
+  const $requestOptions = mergeRequestOptions(
+    {
+      tracer,
+      name: "query.execute()",
+      icon: "query",
+      attributes: {
+        scope: options?.scope ?? "environment",
+        format: options?.format ?? "json",
+        query,
+        period: options?.period,
+        from,
+        to,
+      },
+    },
+    requestOptions
+  );
+
+  return apiClient
+    .executeQuery(
+      query,
+      {
+        scope: options?.scope,
+        period: options?.period,
+        from,
+        to,
+        format: options?.format,
+      },
+      $requestOptions
+    )
+    .then((response) => {
+      return response;
+    }) as Promise<{ format: "json"; results: Array<TRow> } | { format: "csv"; results: string }>;
+}
+
+function dateToISOString(date: Date | number | undefined): string | undefined {
+  if (date === undefined) {
+    return undefined;
+  }
+
+  if (date instanceof Date) {
+    return date.toISOString();
+  }
+
+  return new Date(date).toISOString();
+}
+
+export const query = {
+  execute,
+};
diff --git a/packages/trigger-sdk/src/v3/queues.ts b/packages/trigger-sdk/src/v3/queues.ts
index 6788186f9d5..f05a81ab68d 100644
--- a/packages/trigger-sdk/src/v3/queues.ts
+++ b/packages/trigger-sdk/src/v3/queues.ts
@@ -132,6 +132,80 @@ export function pause(
   return apiClient.pauseQueue(queue, "pause", $requestOptions);
 }
 
+/**
+ * Overrides the concurrency limit of a queue.
+ *
+ * @param queue - The ID of the queue to override the concurrency limit, or the type and name
+ * @param concurrencyLimit - The concurrency limit to override
+ * @returns The updated queue state
+ */
+export function overrideConcurrencyLimit(
+  queue: RetrieveQueueParam,
+  concurrencyLimit: number,
+  requestOptions?: ApiRequestOptions
+): ApiPromise<QueueItem> {
+  const apiClient = apiClientManager.clientOrThrow();
+
+  const $requestOptions = mergeRequestOptions(
+    {
+      tracer,
+      name: "queues.overrideConcurrencyLimit()",
+      icon: "queue",
+      attributes: {
+        ...flattenAttributes({ queue }),
+        ...accessoryAttributes({
+          items: [
+            {
+              text: typeof queue === "string" ? queue : queue.name,
+              variant: "normal",
+            },
+          ],
+          style: "codepath",
+        }),
+      },
+    },
+    requestOptions
+  );
+
+  return apiClient.overrideQueueConcurrencyLimit(queue, concurrencyLimit, $requestOptions);
+}
+
+/**
+ * Resets the concurrency limit of a queue to the base value.
+ *
+ * @param queue - The ID of the queue to reset the concurrency limit, or the type and name
+ * @returns The updated queue state
+ */
+export function resetConcurrencyLimit(
+  queue: RetrieveQueueParam,
+  requestOptions?: ApiRequestOptions
+): ApiPromise<QueueItem> {
+  const apiClient = apiClientManager.clientOrThrow();
+
+  const $requestOptions = mergeRequestOptions(
+    {
+      tracer,
+      name: "queues.resetConcurrencyLimit()",
+      icon: "queue",
+      attributes: {
+        ...flattenAttributes({ queue }),
+        ...accessoryAttributes({
+          items: [
+            {
+              text: typeof queue === "string" ? queue : queue.name,
+              variant: "normal",
+            },
+          ],
+          style: "codepath",
+        }),
+      },
+    },
+    requestOptions
+  );
+
+  return apiClient.resetQueueConcurrencyLimit(queue, $requestOptions);
+}
+
 /**
  * Resumes a paused queue, allowing new runs to be started.
  *
diff --git a/packages/trigger-sdk/src/v3/schemas.ts b/packages/trigger-sdk/src/v3/schemas.ts
new file mode 100644
index 00000000000..65be53024e5
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/schemas.ts
@@ -0,0 +1,2 @@
+// Re-export JSON Schema types for user convenience
+export type { JSONSchema } from "@trigger.dev/core/v3";
\ No newline at end of file
diff --git a/packages/trigger-sdk/src/v3/shared.test.ts b/packages/trigger-sdk/src/v3/shared.test.ts
new file mode 100644
index 00000000000..4a0509b6b3b
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/shared.test.ts
@@ -0,0 +1,219 @@
+import { describe, it, expect } from "vitest";
+import { readableStreamToAsyncIterable } from "./shared.js";
+
+describe("readableStreamToAsyncIterable", () => {
+  it("yields all values from the stream", async () => {
+    const values = [1, 2, 3, 4, 5];
+    const stream = new ReadableStream<number>({
+      start(controller) {
+        for (const value of values) {
+          controller.enqueue(value);
+        }
+        controller.close();
+      },
+    });
+
+    const result: number[] = [];
+    for await (const value of readableStreamToAsyncIterable(stream)) {
+      result.push(value);
+    }
+
+    expect(result).toEqual(values);
+  });
+
+  it("cancels the stream when consumer breaks early", async () => {
+    let cancelCalled = false;
+
+    const stream = new ReadableStream<number>({
+      start(controller) {
+        controller.enqueue(1);
+        controller.enqueue(2);
+        controller.enqueue(3);
+        controller.enqueue(4);
+        controller.enqueue(5);
+        controller.close();
+      },
+      cancel() {
+        cancelCalled = true;
+      },
+    });
+
+    const result: number[] = [];
+    for await (const value of readableStreamToAsyncIterable(stream)) {
+      result.push(value);
+      if (value === 2) {
+        break; // Early termination
+      }
+    }
+
+    expect(result).toEqual([1, 2]);
+    expect(cancelCalled).toBe(true);
+  });
+
+  it("cancels the stream when consumer throws an error", async () => {
+    let cancelCalled = false;
+
+    const stream = new ReadableStream<number>({
+      start(controller) {
+        controller.enqueue(1);
+        controller.enqueue(2);
+        controller.enqueue(3);
+        controller.close();
+      },
+      cancel() {
+        cancelCalled = true;
+      },
+    });
+
+    const result: number[] = [];
+    const testError = new Error("Test error");
+
+    await expect(async () => {
+      for await (const value of readableStreamToAsyncIterable(stream)) {
+        result.push(value);
+        if (value === 2) {
+          throw testError;
+        }
+      }
+    }).rejects.toThrow(testError);
+
+    expect(result).toEqual([1, 2]);
+    expect(cancelCalled).toBe(true);
+  });
+
+  it("handles stream that produces values asynchronously", async () => {
+    const values = ["a", "b", "c"];
+    let index = 0;
+
+    const stream = new ReadableStream<string>({
+      async pull(controller) {
+        if (index < values.length) {
+          // Simulate async data production
+          await new Promise((resolve) => setTimeout(resolve, 1));
+          controller.enqueue(values[index]!);
+          index++;
+        } else {
+          controller.close();
+        }
+      },
+    });
+
+    const result: string[] = [];
+    for await (const value of readableStreamToAsyncIterable(stream)) {
+      result.push(value);
+    }
+
+    expect(result).toEqual(values);
+  });
+
+  it("cancels async stream when consumer breaks early", async () => {
+    let cancelCalled = false;
+    let producedCount = 0;
+
+    const stream = new ReadableStream<number>({
+      async pull(controller) {
+        // Simulate async data production
+        await new Promise((resolve) => setTimeout(resolve, 1));
+        producedCount++;
+        controller.enqueue(producedCount);
+        // Never close - infinite stream
+      },
+      cancel() {
+        cancelCalled = true;
+      },
+    });
+
+    const result: number[] = [];
+    for await (const value of readableStreamToAsyncIterable(stream)) {
+      result.push(value);
+      if (value >= 3) {
+        break;
+      }
+    }
+
+    expect(result).toEqual([1, 2, 3]);
+    expect(cancelCalled).toBe(true);
+  });
+
+  it("does not throw when cancelling an already-closed stream", async () => {
+    const stream = new ReadableStream<number>({
+      start(controller) {
+        controller.enqueue(1);
+        controller.close();
+      },
+    });
+
+    // Normal iteration should complete without errors
+    const result: number[] = [];
+    for await (const value of readableStreamToAsyncIterable(stream)) {
+      result.push(value);
+    }
+
+    expect(result).toEqual([1]);
+  });
+
+  it("does not throw when cancelling an errored stream", async () => {
+    const streamError = new Error("Stream error");
+    let errorIndex = 0;
+
+    const stream = new ReadableStream<number>({
+      pull(controller) {
+        errorIndex++;
+        if (errorIndex <= 2) {
+          controller.enqueue(errorIndex);
+        } else {
+          controller.error(streamError);
+        }
+      },
+    });
+
+    const result: number[] = [];
+
+    // The stream error should propagate
+    await expect(async () => {
+      for await (const value of readableStreamToAsyncIterable(stream)) {
+        result.push(value);
+      }
+    }).rejects.toThrow(streamError);
+
+    // We should have gotten the values before the error
+    expect(result).toEqual([1, 2]);
+  });
+
+  it("signals upstream producer to stop via cancel", async () => {
+    const producedValues: number[] = [];
+    let isProducing = true;
+
+    const stream = new ReadableStream<number>({
+      async pull(controller) {
+        if (!isProducing) return;
+
+        await new Promise((resolve) => setTimeout(resolve, 5));
+        const value = producedValues.length + 1;
+        producedValues.push(value);
+        controller.enqueue(value);
+      },
+      cancel() {
+        isProducing = false;
+      },
+    });
+
+    const consumed: number[] = [];
+    for await (const value of readableStreamToAsyncIterable(stream)) {
+      consumed.push(value);
+      if (value >= 2) {
+        break;
+      }
+    }
+
+    // Wait a bit to ensure no more values are produced
+    await new Promise((resolve) => setTimeout(resolve, 20));
+
+    expect(consumed).toEqual([1, 2]);
+    // Producer should have stopped after cancel
+    expect(isProducing).toBe(false);
+    // No more values should have been produced after breaking
+    expect(producedValues.length).toBeLessThanOrEqual(3);
+  });
+});
+
diff --git a/packages/trigger-sdk/src/v3/shared.ts b/packages/trigger-sdk/src/v3/shared.ts
index 5d5d896621b..7b7fa1b9797 100644
--- a/packages/trigger-sdk/src/v3/shared.ts
+++ b/packages/trigger-sdk/src/v3/shared.ts
@@ -2,6 +2,7 @@ import { SpanKind } from "@opentelemetry/api";
 import { SerializableJson } from "@trigger.dev/core";
 import {
   accessoryAttributes,
+  ApiError,
   apiClientManager,
   ApiRequestOptions,
   conditionallyImportPacket,
@@ -10,6 +11,7 @@ import {
   defaultRetryOptions,
   flattenIdempotencyKey,
   getEnvVar,
+  getIdempotencyKeyOptions,
   getSchemaParseFn,
   InitOutput,
   lifecycleHooks,
@@ -17,6 +19,7 @@ import {
   parsePacket,
   Queue,
   QueueOptions,
+  RateLimitError,
   resourceCatalog,
   runtime,
   SemanticInternalAttributes,
@@ -28,7 +31,6 @@ import {
   TaskRunExecutionResult,
   TaskRunPromise,
 } from "@trigger.dev/core/v3";
-import { PollOptions, runs } from "./runs.js";
 import { tracer } from "./tracer.js";
 
 import type {
@@ -54,6 +56,7 @@ import type {
   BatchByTaskItem,
   BatchByTaskResult,
   BatchItem,
+  BatchItemNDJSON,
   BatchResult,
   BatchRunHandle,
   BatchRunHandleFromTypes,
@@ -76,6 +79,7 @@ import type {
   TaskBatchOutputHandle,
   TaskIdentifier,
   TaskOptions,
+  TaskOptionsWithSchema,
   TaskOutput,
   TaskOutputHandle,
   TaskPayload,
@@ -89,6 +93,7 @@ import type {
   TriggerAndWaitOptions,
   TriggerApiRequestOptions,
   TriggerOptions,
+  AnyOnStartAttemptHookFunction,
 } from "@trigger.dev/core/v3";
 
 export type {
@@ -113,6 +118,10 @@ export type {
   TaskPayload,
   TaskRunResult,
   TriggerOptions,
+  TaskWithSchema,
+  TaskWithSchemaOptions,
+  TaskSchema,
+  TaskOptionsWithSchema,
 };
 
 export { SubtaskUnwrapError, TaskRunPromise };
@@ -128,6 +137,16 @@ export function queue(options: QueueOptions): Queue {
   return options;
 }
 
+// Overload: when payloadSchema is provided, payload type should be any
+export function createTask<
+  TIdentifier extends string,
+  TOutput = unknown,
+  TInitOutput extends InitOutput = any,
+>(
+  params: TaskOptionsWithSchema<TIdentifier, TOutput, TInitOutput>
+): Task<TIdentifier, any, TOutput>;
+
+// Overload: normal case without payloadSchema
 export function createTask<
   TIdentifier extends string,
   TInput = void,
@@ -135,10 +154,22 @@ export function createTask<
   TInitOutput extends InitOutput = any,
 >(
   params: TaskOptions<TIdentifier, TInput, TOutput, TInitOutput>
-): Task<TIdentifier, TInput, TOutput> {
+): Task<TIdentifier, TInput, TOutput>;
+
+export function createTask<
+  TIdentifier extends string,
+  TInput = void,
+  TOutput = unknown,
+  TInitOutput extends InitOutput = any,
+>(
+  params:
+    | TaskOptions<TIdentifier, TInput, TOutput, TInitOutput>
+    | TaskOptionsWithSchema<TIdentifier, TOutput, TInitOutput>
+): Task<TIdentifier, TInput, TOutput> | Task<TIdentifier, any, TOutput> {
   const task: Task<TIdentifier, TInput, TOutput> = {
     id: params.id,
     description: params.description,
+    jsonSchema: params.jsonSchema,
     trigger: async (payload, options) => {
       return await trigger_internal<RunTypes<TIdentifier, TInput, TOutput>>(
         "trigger()",
@@ -162,7 +193,7 @@ export function createTask<
         params.queue?.name
       );
     },
-    triggerAndWait: (payload, options) => {
+    triggerAndWait: (payload, options, requestOptions) => {
       return new TaskRunPromise<TIdentifier, TOutput>((resolve, reject) => {
         triggerAndWait_internal<TIdentifier, TInput, TOutput>(
           "triggerAndWait()",
@@ -172,7 +203,8 @@ export function createTask<
           {
             queue: params.queue?.name,
             ...options,
-          }
+          },
+          requestOptions
         )
           .then((result) => {
             resolve(result);
@@ -204,6 +236,7 @@ export function createTask<
     retry: params.retry ? { ...defaultRetryOptions, ...params.retry } : undefined,
     machine: typeof params.machine === "string" ? { preset: params.machine } : params.machine,
     maxDuration: params.maxDuration,
+    payloadSchema: params.jsonSchema,
     fns: {
       run: params.run,
     },
@@ -338,6 +371,7 @@ export function createSchemaTask<
       run: params.run,
       parsePayload,
     },
+    schema: params.schema,
   });
 
   const queue = params.queue;
@@ -466,32 +500,6 @@ export async function batchTriggerAndWait<TTask extends AnyTask>(
   >("tasks.batchTriggerAndWait()", id, items, undefined, options, requestOptions);
 }
 
-/**
- * Trigger a task by its identifier with the given payload and poll until the run is completed.
- *
- * @example
- *
- * ```ts
- * import { tasks, runs } from "@trigger.dev/sdk/v3";
- * import type { myTask } from "./myTasks"; // Import just the type of the task
- *
- * const run = await tasks.triggerAndPoll<typeof myTask>("my-task", { foo: "bar" }); // The id and payload are fully typesafe
- * console.log(run.output) // The output is also fully typed
- * ```
- *
- * @returns {Run} The completed run, either successful or failed.
- */
-export async function triggerAndPoll<TTask extends AnyTask>(
-  id: TaskIdentifier<TTask>,
-  payload: TaskPayload<TTask>,
-  options?: TriggerOptions & PollOptions,
-  requestOptions?: TriggerApiRequestOptions
-): Promise<RetrieveRunResult<TTask>> {
-  const handle = await trigger(id, payload, options, requestOptions);
-
-  return runs.poll(handle, options, requestOptions);
-}
-
 export async function batchTrigger<TTask extends AnyTask>(
   id: TaskIdentifier<TTask>,
   items: Array<BatchItem<TaskPayload<TTask>>>,
@@ -543,6 +551,15 @@ export async function batchTrigger<TTask extends AnyTask>(
  *     payload: { other: "data" }
  *   }
  * ]);
+ *
+ * // Or stream items from an async iterable
+ * async function* generateItems() {
+ *   for (let i = 0; i < 1000; i++) {
+ *     yield { id: "my-task", payload: { index: i } };
+ *   }
+ * }
+ *
+ * const streamResult = await batch.trigger<typeof myTask>(generateItems());
  * ```
  *
  * @description
@@ -561,85 +578,159 @@ export async function batchTrigger<TTask extends AnyTask>(
  *   - `metadata`: Additional metadata
  *   - `maxDuration`: Maximum execution duration
  */
-export async function batchTriggerById<TTask extends AnyTask>(
+// Overload: Array input
+export function batchTriggerById<TTask extends AnyTask>(
   items: Array<BatchByIdItem<InferRunTypes<TTask>>>,
   options?: BatchTriggerOptions,
   requestOptions?: TriggerApiRequestOptions
+): Promise<BatchRunHandleFromTypes<InferRunTypes<TTask>>>;
+
+// Overload: Stream input (AsyncIterable or ReadableStream)
+export function batchTriggerById<TTask extends AnyTask>(
+  items:
+    | AsyncIterable<BatchByIdItem<InferRunTypes<TTask>>>
+    | ReadableStream<BatchByIdItem<InferRunTypes<TTask>>>,
+  options?: BatchTriggerOptions,
+  requestOptions?: TriggerApiRequestOptions
+): Promise<BatchRunHandleFromTypes<InferRunTypes<TTask>>>;
+
+// Implementation
+export async function batchTriggerById<TTask extends AnyTask>(
+  ...args:
+    | [Array<BatchByIdItem<InferRunTypes<TTask>>>, BatchTriggerOptions?, TriggerApiRequestOptions?]
+    | [
+        (
+          | AsyncIterable<BatchByIdItem<InferRunTypes<TTask>>>
+          | ReadableStream<BatchByIdItem<InferRunTypes<TTask>>>
+        ),
+        BatchTriggerOptions?,
+        TriggerApiRequestOptions?,
+      ]
 ): Promise<BatchRunHandleFromTypes<InferRunTypes<TTask>>> {
-  const apiClient = apiClientManager.clientOrThrow();
+  const [items, options, requestOptions] = args;
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
-  const response = await apiClient.batchTriggerV3(
-    {
-      items: await Promise.all(
-        items.map(async (item, index) => {
-          const taskMetadata = resourceCatalog.getTask(item.id);
-
-          const parsedPayload = taskMetadata?.fns.parsePayload
-            ? await taskMetadata?.fns.parsePayload(item.payload)
-            : item.payload;
-
-          const payloadPacket = await stringifyIO(parsedPayload);
-
-          const batchItemIdempotencyKey = await makeIdempotencyKey(
-            flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
-          );
-
-          return {
-            task: item.id,
-            payload: payloadPacket.data,
-            options: {
-              queue: item.options?.queue ? { name: item.options.queue } : undefined,
-              concurrencyKey: item.options?.concurrencyKey,
-              test: taskContext.ctx?.run.isTest,
-              payloadType: payloadPacket.dataType,
-              delay: item.options?.delay,
-              ttl: item.options?.ttl,
-              tags: item.options?.tags,
-              maxAttempts: item.options?.maxAttempts,
-              metadata: item.options?.metadata,
-              maxDuration: item.options?.maxDuration,
-              idempotencyKey:
-                (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
-              idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
-              machine: item.options?.machine,
-              priority: item.options?.priority,
-              lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
-            },
-          } satisfies BatchTriggerTaskV2RequestBody["items"][0];
-        })
-      ),
-      parentRunId: taskContext.ctx?.run.id,
-    },
-    {
-      spanParentAsLink: true,
-      processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
-    },
-    {
-      name: "batch.trigger()",
-      tracer,
-      icon: "trigger",
-      onResponseBody(body, span) {
-        if (body && typeof body === "object" && !Array.isArray(body)) {
-          if ("id" in body && typeof body.id === "string") {
-            span.setAttribute("batchId", body.id);
-          }
+  // Check if items is an array or a stream
+  if (Array.isArray(items)) {
+    // Array path: existing logic
+    const ndJsonItems: BatchItemNDJSON[] = await Promise.all(
+      items.map(async (item, index) => {
+        const taskMetadata = resourceCatalog.getTask(item.id);
 
-          if ("runCount" in body && typeof body.runCount === "number") {
-            span.setAttribute("runCount", body.runCount);
-          }
-        }
+        const parsedPayload = taskMetadata?.fns.parsePayload
+          ? await taskMetadata?.fns.parsePayload(item.payload)
+          : item.payload;
+
+        const payloadPacket = await stringifyIO(parsedPayload);
+
+        const batchItemIdempotencyKey = await makeIdempotencyKey(
+          flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+        );
+
+        return {
+          index,
+          task: item.id,
+          payload: payloadPacket.data,
+          options: {
+            queue: item.options?.queue ? { name: item.options.queue } : undefined,
+            concurrencyKey: item.options?.concurrencyKey,
+            test: taskContext.ctx?.run.isTest,
+            payloadType: payloadPacket.dataType,
+            delay: item.options?.delay,
+            ttl: item.options?.ttl,
+            tags: item.options?.tags,
+            maxAttempts: item.options?.maxAttempts,
+            metadata: item.options?.metadata,
+            maxDuration: item.options?.maxDuration,
+            idempotencyKey:
+              (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+            idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+            machine: item.options?.machine,
+            priority: item.options?.priority,
+            region: item.options?.region,
+            lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
+            debounce: item.options?.debounce,
+          },
+        };
+      })
+    );
+
+    // Execute 2-phase batch
+    const response = await tracer.startActiveSpan(
+      "batch.trigger()",
+      async (span) => {
+        const result = await executeBatchTwoPhase(
+          apiClient,
+          ndJsonItems,
+          {
+            parentRunId: taskContext.ctx?.run.id,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: true, // Fire-and-forget: child runs get separate trace IDs
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", result.id);
+        span.setAttribute("runCount", result.runCount);
+
+        return result;
       },
-      ...requestOptions,
-    }
-  );
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
 
-  const handle = {
-    batchId: response.id,
-    runCount: response.runCount,
-    publicAccessToken: response.publicAccessToken,
-  };
+    const handle = {
+      batchId: response.id,
+      runCount: response.runCount,
+      publicAccessToken: response.publicAccessToken,
+    };
+
+    return handle as BatchRunHandleFromTypes<InferRunTypes<TTask>>;
+  } else {
+    // Stream path: convert to AsyncIterable and transform
+    const asyncItems = normalizeToAsyncIterable(items);
+    const transformedItems = transformBatchItemsStream<TTask>(asyncItems, options);
+
+    // Execute streaming 2-phase batch
+    const response = await tracer.startActiveSpan(
+      "batch.trigger()",
+      async (span) => {
+        const result = await executeBatchTwoPhaseStreaming(
+          apiClient,
+          transformedItems,
+          {
+            parentRunId: taskContext.ctx?.run.id,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: true, // Fire-and-forget: child runs get separate trace IDs
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", result.id);
+        span.setAttribute("runCount", result.runCount);
+
+        return result;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
 
-  return handle as BatchRunHandleFromTypes<InferRunTypes<TTask>>;
+    const handle = {
+      batchId: response.id,
+      runCount: response.runCount,
+      publicAccessToken: response.publicAccessToken,
+    };
+
+    return handle as BatchRunHandleFromTypes<InferRunTypes<TTask>>;
+  }
 }
 
 /**
@@ -718,96 +809,192 @@ export async function batchTriggerById<TTask extends AnyTask>(
  * - Payload types
  * - Return value types
  * - Error handling
+ *
+ * You can also pass an AsyncIterable or ReadableStream to stream items:
+ *
+ * @example
+ * ```ts
+ * // Stream items from an async iterable
+ * async function* generateItems() {
+ *   for (let i = 0; i < 1000; i++) {
+ *     yield { id: "child-task", payload: { index: i } };
+ *   }
+ * }
+ *
+ * const results = await batch.triggerAndWait<typeof childTask>(generateItems());
+ * ```
  */
-export async function batchTriggerByIdAndWait<TTask extends AnyTask>(
+// Overload: Array input
+export function batchTriggerByIdAndWait<TTask extends AnyTask>(
   items: Array<BatchByIdAndWaitItem<InferRunTypes<TTask>>>,
   options?: BatchTriggerAndWaitOptions,
   requestOptions?: TriggerApiRequestOptions
+): Promise<BatchByIdResult<TTask>>;
+
+// Overload: Stream input (AsyncIterable or ReadableStream)
+export function batchTriggerByIdAndWait<TTask extends AnyTask>(
+  items:
+    | AsyncIterable<BatchByIdAndWaitItem<InferRunTypes<TTask>>>
+    | ReadableStream<BatchByIdAndWaitItem<InferRunTypes<TTask>>>,
+  options?: BatchTriggerAndWaitOptions,
+  requestOptions?: TriggerApiRequestOptions
+): Promise<BatchByIdResult<TTask>>;
+
+// Implementation
+export async function batchTriggerByIdAndWait<TTask extends AnyTask>(
+  ...args:
+    | [
+        Array<BatchByIdAndWaitItem<InferRunTypes<TTask>>>,
+        BatchTriggerAndWaitOptions?,
+        TriggerApiRequestOptions?,
+      ]
+    | [
+        (
+          | AsyncIterable<BatchByIdAndWaitItem<InferRunTypes<TTask>>>
+          | ReadableStream<BatchByIdAndWaitItem<InferRunTypes<TTask>>>
+        ),
+        BatchTriggerAndWaitOptions?,
+        TriggerApiRequestOptions?,
+      ]
 ): Promise<BatchByIdResult<TTask>> {
+  const [items, options, requestOptions] = args;
   const ctx = taskContext.ctx;
 
   if (!ctx) {
     throw new Error("batchTriggerAndWait can only be used from inside a task.run()");
   }
 
-  const apiClient = apiClientManager.clientOrThrow();
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
-  return await tracer.startActiveSpan(
-    "batch.triggerAndWait()",
-    async (span) => {
-      const response = await apiClient.batchTriggerV3(
-        {
-          items: await Promise.all(
-            items.map(async (item, index) => {
-              const taskMetadata = resourceCatalog.getTask(item.id);
-
-              const parsedPayload = taskMetadata?.fns.parsePayload
-                ? await taskMetadata?.fns.parsePayload(item.payload)
-                : item.payload;
-
-              const payloadPacket = await stringifyIO(parsedPayload);
-
-              const batchItemIdempotencyKey = await makeIdempotencyKey(
-                flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
-              );
-
-              return {
-                task: item.id,
-                payload: payloadPacket.data,
-                options: {
-                  lockToVersion: taskContext.worker?.version,
-                  queue: item.options?.queue ? { name: item.options.queue } : undefined,
-                  concurrencyKey: item.options?.concurrencyKey,
-                  test: taskContext.ctx?.run.isTest,
-                  payloadType: payloadPacket.dataType,
-                  delay: item.options?.delay,
-                  ttl: item.options?.ttl,
-                  tags: item.options?.tags,
-                  maxAttempts: item.options?.maxAttempts,
-                  metadata: item.options?.metadata,
-                  maxDuration: item.options?.maxDuration,
-                  idempotencyKey:
-                    (await makeIdempotencyKey(item.options?.idempotencyKey)) ??
-                    batchItemIdempotencyKey,
-                  idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
-                  machine: item.options?.machine,
-                  priority: item.options?.priority,
-                },
-              } satisfies BatchTriggerTaskV2RequestBody["items"][0];
-            })
-          ),
-          parentRunId: ctx.run.id,
-          resumeParentOnCompletion: true,
-        },
-        {
-          processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
+  // Check if items is an array or a stream
+  if (Array.isArray(items)) {
+    // Array path: existing logic
+    const ndJsonItems: BatchItemNDJSON[] = await Promise.all(
+      items.map(async (item, index) => {
+        const taskMetadata = resourceCatalog.getTask(item.id);
+
+        const parsedPayload = taskMetadata?.fns.parsePayload
+          ? await taskMetadata?.fns.parsePayload(item.payload)
+          : item.payload;
+
+        const payloadPacket = await stringifyIO(parsedPayload);
+
+        const batchItemIdempotencyKey = await makeIdempotencyKey(
+          flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+        );
+
+        return {
+          index,
+          task: item.id,
+          payload: payloadPacket.data,
+          options: {
+            lockToVersion: taskContext.worker?.version,
+            queue: item.options?.queue ? { name: item.options.queue } : undefined,
+            concurrencyKey: item.options?.concurrencyKey,
+            test: taskContext.ctx?.run.isTest,
+            payloadType: payloadPacket.dataType,
+            delay: item.options?.delay,
+            ttl: item.options?.ttl,
+            tags: item.options?.tags,
+            maxAttempts: item.options?.maxAttempts,
+            metadata: item.options?.metadata,
+            maxDuration: item.options?.maxDuration,
+            idempotencyKey:
+              (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+            idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+            machine: item.options?.machine,
+            priority: item.options?.priority,
+            region: item.options?.region,
+            debounce: item.options?.debounce,
+          },
+        };
+      })
+    );
+
+    return await tracer.startActiveSpan(
+      "batch.triggerAndWait()",
+      async (span) => {
+        // Execute 2-phase batch
+        const response = await executeBatchTwoPhase(
+          apiClient,
+          ndJsonItems,
+          {
+            parentRunId: ctx.run.id,
+            resumeParentOnCompletion: true,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: false, // Waiting: child runs share parent's trace ID
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", response.id);
+        span.setAttribute("runCount", response.runCount);
+
+        const result = await runtime.waitForBatch({
+          id: response.id,
+          runCount: response.runCount,
+          ctx,
+        });
+
+        const runs = await handleBatchTaskRunExecutionResultV2(result.items);
+
+        return {
+          id: result.id,
+          runs,
+        } as BatchByIdResult<TTask>;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
         },
-        requestOptions
-      );
+      }
+    );
+  } else {
+    // Stream path: convert to AsyncIterable and transform
+    const asyncItems = normalizeToAsyncIterable(items);
+    const transformedItems = transformBatchItemsStreamForWait<TTask>(asyncItems, options);
+
+    return await tracer.startActiveSpan(
+      "batch.triggerAndWait()",
+      async (span) => {
+        // Execute streaming 2-phase batch
+        const response = await executeBatchTwoPhaseStreaming(
+          apiClient,
+          transformedItems,
+          {
+            parentRunId: ctx.run.id,
+            resumeParentOnCompletion: true,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: false, // Waiting: child runs share parent's trace ID
+          },
+          requestOptions
+        );
 
-      span.setAttribute("batchId", response.id);
-      span.setAttribute("runCount", response.runCount);
+        span.setAttribute("batchId", response.id);
+        span.setAttribute("runCount", response.runCount);
 
-      const result = await runtime.waitForBatch({
-        id: response.id,
-        runCount: response.runCount,
-        ctx,
-      });
+        const result = await runtime.waitForBatch({
+          id: response.id,
+          runCount: response.runCount,
+          ctx,
+        });
 
-      const runs = await handleBatchTaskRunExecutionResultV2(result.items);
+        const runs = await handleBatchTaskRunExecutionResultV2(result.items);
 
-      return {
-        id: result.id,
-        runs,
-      } as BatchByIdResult<TTask>;
-    },
-    {
-      kind: SpanKind.PRODUCER,
-      attributes: {
-        [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        return {
+          id: result.id,
+          runs,
+        } as BatchByIdResult<TTask>;
       },
-    }
-  );
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
+  }
 }
 
 /**
@@ -886,88 +1073,183 @@ export async function batchTriggerByIdAndWait<TTask extends AnyTask>(
  * - Payload types
  * - Return value types
  * - Error handling
+ *
+ * You can also pass an AsyncIterable or ReadableStream to stream items:
+ *
+ * @example
+ * ```ts
+ * // Stream items from an async iterable
+ * async function* generateItems() {
+ *   for (let i = 0; i < 1000; i++) {
+ *     yield { task: childTask, payload: { index: i } };
+ *   }
+ * }
+ *
+ * const result = await batch.triggerByTask([childTask], generateItems());
+ * ```
  */
-export async function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
+// Overload: Array input
+export function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
   items: {
     [K in keyof TTasks]: BatchByTaskItem<TTasks[K]>;
   },
   options?: BatchTriggerOptions,
   requestOptions?: TriggerApiRequestOptions
+): Promise<BatchTasksRunHandleFromTypes<TTasks>>;
+
+// Overload: Stream input (AsyncIterable or ReadableStream)
+export function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
+  items:
+    | AsyncIterable<BatchByTaskItem<TTasks[number]>>
+    | ReadableStream<BatchByTaskItem<TTasks[number]>>,
+  options?: BatchTriggerOptions,
+  requestOptions?: TriggerApiRequestOptions
+): Promise<BatchTasksRunHandleFromTypes<TTasks>>;
+
+// Implementation
+export async function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
+  ...args:
+    | [
+        { [K in keyof TTasks]: BatchByTaskItem<TTasks[K]> },
+        BatchTriggerOptions?,
+        TriggerApiRequestOptions?,
+      ]
+    | [
+        (
+          | AsyncIterable<BatchByTaskItem<TTasks[number]>>
+          | ReadableStream<BatchByTaskItem<TTasks[number]>>
+        ),
+        BatchTriggerOptions?,
+        TriggerApiRequestOptions?,
+      ]
 ): Promise<BatchTasksRunHandleFromTypes<TTasks>> {
-  const apiClient = apiClientManager.clientOrThrow();
+  const [items, options, requestOptions] = args;
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
-  const response = await apiClient.batchTriggerV3(
-    {
-      items: await Promise.all(
-        items.map(async (item, index) => {
-          const taskMetadata = resourceCatalog.getTask(item.task.id);
-
-          const parsedPayload = taskMetadata?.fns.parsePayload
-            ? await taskMetadata?.fns.parsePayload(item.payload)
-            : item.payload;
-
-          const payloadPacket = await stringifyIO(parsedPayload);
-
-          const batchItemIdempotencyKey = await makeIdempotencyKey(
-            flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
-          );
-
-          return {
-            task: item.task.id,
-            payload: payloadPacket.data,
-            options: {
-              queue: item.options?.queue ? { name: item.options.queue } : undefined,
-              concurrencyKey: item.options?.concurrencyKey,
-              test: taskContext.ctx?.run.isTest,
-              payloadType: payloadPacket.dataType,
-              delay: item.options?.delay,
-              ttl: item.options?.ttl,
-              tags: item.options?.tags,
-              maxAttempts: item.options?.maxAttempts,
-              metadata: item.options?.metadata,
-              maxDuration: item.options?.maxDuration,
-              idempotencyKey:
-                (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
-              idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
-              machine: item.options?.machine,
-              priority: item.options?.priority,
-              lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
-            },
-          } satisfies BatchTriggerTaskV2RequestBody["items"][0];
-        })
-      ),
-      parentRunId: taskContext.ctx?.run.id,
-    },
-    {
-      spanParentAsLink: true,
-      processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
-    },
-    {
-      name: "batch.triggerByTask()",
-      tracer,
-      icon: "trigger",
-      onResponseBody(body, span) {
-        if (body && typeof body === "object" && !Array.isArray(body)) {
-          if ("id" in body && typeof body.id === "string") {
-            span.setAttribute("batchId", body.id);
-          }
+  // Check if items is an array or a stream
+  if (Array.isArray(items)) {
+    // Array path: existing logic
+    const ndJsonItems: BatchItemNDJSON[] = await Promise.all(
+      items.map(async (item, index) => {
+        const taskMetadata = resourceCatalog.getTask(item.task.id);
 
-          if ("runCount" in body && typeof body.runCount === "number") {
-            span.setAttribute("runCount", body.runCount);
-          }
-        }
+        const parsedPayload = taskMetadata?.fns.parsePayload
+          ? await taskMetadata?.fns.parsePayload(item.payload)
+          : item.payload;
+
+        const payloadPacket = await stringifyIO(parsedPayload);
+
+        const batchItemIdempotencyKey = await makeIdempotencyKey(
+          flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+        );
+
+        return {
+          index,
+          task: item.task.id,
+          payload: payloadPacket.data,
+          options: {
+            queue: item.options?.queue ? { name: item.options.queue } : undefined,
+            concurrencyKey: item.options?.concurrencyKey,
+            test: taskContext.ctx?.run.isTest,
+            payloadType: payloadPacket.dataType,
+            delay: item.options?.delay,
+            ttl: item.options?.ttl,
+            tags: item.options?.tags,
+            maxAttempts: item.options?.maxAttempts,
+            metadata: item.options?.metadata,
+            maxDuration: item.options?.maxDuration,
+            idempotencyKey:
+              (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+            idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+            machine: item.options?.machine,
+            priority: item.options?.priority,
+            region: item.options?.region,
+            lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
+            debounce: item.options?.debounce,
+          },
+        };
+      })
+    );
+
+    // Execute 2-phase batch
+    const response = await tracer.startActiveSpan(
+      "batch.triggerByTask()",
+      async (span) => {
+        const result = await executeBatchTwoPhase(
+          apiClient,
+          ndJsonItems,
+          {
+            parentRunId: taskContext.ctx?.run.id,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: true, // Fire-and-forget: child runs get separate trace IDs
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", result.id);
+        span.setAttribute("runCount", result.runCount);
+
+        return result;
       },
-      ...requestOptions,
-    }
-  );
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
 
-  const handle = {
-    batchId: response.id,
-    runCount: response.runCount,
-    publicAccessToken: response.publicAccessToken,
-  };
+    const handle = {
+      batchId: response.id,
+      runCount: response.runCount,
+      publicAccessToken: response.publicAccessToken,
+    };
+
+    return handle as unknown as BatchTasksRunHandleFromTypes<TTasks>;
+  } else {
+    // Stream path: convert to AsyncIterable and transform
+    const streamItems = items as
+      | AsyncIterable<BatchByTaskItem<TTasks[number]>>
+      | ReadableStream<BatchByTaskItem<TTasks[number]>>;
+    const asyncItems = normalizeToAsyncIterable(streamItems);
+    const transformedItems = transformBatchByTaskItemsStream<TTasks>(asyncItems, options);
+
+    // Execute streaming 2-phase batch
+    const response = await tracer.startActiveSpan(
+      "batch.triggerByTask()",
+      async (span) => {
+        const result = await executeBatchTwoPhaseStreaming(
+          apiClient,
+          transformedItems,
+          {
+            parentRunId: taskContext.ctx?.run.id,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: true, // Fire-and-forget: child runs get separate trace IDs
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", result.id);
+        span.setAttribute("runCount", result.runCount);
+
+        return result;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
 
-  return handle as unknown as BatchTasksRunHandleFromTypes<TTasks>;
+    const handle = {
+      batchId: response.id,
+      runCount: response.runCount,
+      publicAccessToken: response.publicAccessToken,
+    };
+
+    return handle as unknown as BatchTasksRunHandleFromTypes<TTasks>;
+  }
 }
 
 /**
@@ -1046,100 +1328,779 @@ export async function batchTriggerTasks<TTasks extends readonly AnyTask[]>(
  * - Payload types
  * - Return value types
  * - Error handling
+ *
+ * You can also pass an AsyncIterable or ReadableStream to stream items:
+ *
+ * @example
+ * ```ts
+ * // Stream items from an async iterable
+ * async function* generateItems() {
+ *   for (let i = 0; i < 1000; i++) {
+ *     yield { task: childTask, payload: { index: i } };
+ *   }
+ * }
+ *
+ * const results = await batch.triggerByTaskAndWait([childTask], generateItems());
+ * ```
  */
-export async function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]>(
+// Overload: Array input
+export function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]>(
   items: {
     [K in keyof TTasks]: BatchByTaskAndWaitItem<TTasks[K]>;
   },
   options?: BatchTriggerAndWaitOptions,
   requestOptions?: TriggerApiRequestOptions
+): Promise<BatchByTaskResult<TTasks>>;
+
+// Overload: Stream input (AsyncIterable or ReadableStream)
+export function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]>(
+  items:
+    | AsyncIterable<BatchByTaskAndWaitItem<TTasks[number]>>
+    | ReadableStream<BatchByTaskAndWaitItem<TTasks[number]>>,
+  options?: BatchTriggerAndWaitOptions,
+  requestOptions?: TriggerApiRequestOptions
+): Promise<BatchByTaskResult<TTasks>>;
+
+// Implementation
+export async function batchTriggerAndWaitTasks<TTasks extends readonly AnyTask[]>(
+  ...args:
+    | [
+        { [K in keyof TTasks]: BatchByTaskAndWaitItem<TTasks[K]> },
+        BatchTriggerAndWaitOptions?,
+        TriggerApiRequestOptions?,
+      ]
+    | [
+        (
+          | AsyncIterable<BatchByTaskAndWaitItem<TTasks[number]>>
+          | ReadableStream<BatchByTaskAndWaitItem<TTasks[number]>>
+        ),
+        BatchTriggerAndWaitOptions?,
+        TriggerApiRequestOptions?,
+      ]
 ): Promise<BatchByTaskResult<TTasks>> {
+  const [items, options, requestOptions] = args;
   const ctx = taskContext.ctx;
 
   if (!ctx) {
     throw new Error("batchTriggerAndWait can only be used from inside a task.run()");
   }
 
-  const apiClient = apiClientManager.clientOrThrow();
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
-  return await tracer.startActiveSpan(
-    "batch.triggerByTaskAndWait()",
-    async (span) => {
-      const response = await apiClient.batchTriggerV3(
-        {
-          items: await Promise.all(
-            items.map(async (item, index) => {
-              const taskMetadata = resourceCatalog.getTask(item.task.id);
-
-              const parsedPayload = taskMetadata?.fns.parsePayload
-                ? await taskMetadata?.fns.parsePayload(item.payload)
-                : item.payload;
-
-              const payloadPacket = await stringifyIO(parsedPayload);
-
-              const batchItemIdempotencyKey = await makeIdempotencyKey(
-                flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
-              );
-
-              return {
-                task: item.task.id,
-                payload: payloadPacket.data,
-                options: {
-                  lockToVersion: taskContext.worker?.version,
-                  queue: item.options?.queue ? { name: item.options.queue } : undefined,
-                  concurrencyKey: item.options?.concurrencyKey,
-                  test: taskContext.ctx?.run.isTest,
-                  payloadType: payloadPacket.dataType,
-                  delay: item.options?.delay,
-                  ttl: item.options?.ttl,
-                  tags: item.options?.tags,
-                  maxAttempts: item.options?.maxAttempts,
-                  metadata: item.options?.metadata,
-                  maxDuration: item.options?.maxDuration,
-                  idempotencyKey:
-                    (await makeIdempotencyKey(item.options?.idempotencyKey)) ??
-                    batchItemIdempotencyKey,
-                  idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
-                  machine: item.options?.machine,
-                  priority: item.options?.priority,
-                },
-              } satisfies BatchTriggerTaskV2RequestBody["items"][0];
-            })
-          ),
-          parentRunId: ctx.run.id,
-          resumeParentOnCompletion: true,
-        },
-        {
-          processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
-        },
-        requestOptions
-      );
+  // Check if items is an array or a stream
+  if (Array.isArray(items)) {
+    // Array path: existing logic
+    const ndJsonItems: BatchItemNDJSON[] = await Promise.all(
+      items.map(async (item, index) => {
+        const taskMetadata = resourceCatalog.getTask(item.task.id);
 
-      span.setAttribute("batchId", response.id);
-      span.setAttribute("runCount", response.runCount);
+        const parsedPayload = taskMetadata?.fns.parsePayload
+          ? await taskMetadata?.fns.parsePayload(item.payload)
+          : item.payload;
 
-      const result = await runtime.waitForBatch({
-        id: response.id,
-        runCount: response.runCount,
-        ctx,
-      });
+        const payloadPacket = await stringifyIO(parsedPayload);
 
-      const runs = await handleBatchTaskRunExecutionResultV2(result.items);
+        const batchItemIdempotencyKey = await makeIdempotencyKey(
+          flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+        );
 
-      return {
-        id: result.id,
-        runs,
-      } as BatchByTaskResult<TTasks>;
-    },
-    {
-      kind: SpanKind.PRODUCER,
-      attributes: {
-        [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        return {
+          index,
+          task: item.task.id,
+          payload: payloadPacket.data,
+          options: {
+            lockToVersion: taskContext.worker?.version,
+            queue: item.options?.queue ? { name: item.options.queue } : undefined,
+            concurrencyKey: item.options?.concurrencyKey,
+            test: taskContext.ctx?.run.isTest,
+            payloadType: payloadPacket.dataType,
+            delay: item.options?.delay,
+            ttl: item.options?.ttl,
+            tags: item.options?.tags,
+            maxAttempts: item.options?.maxAttempts,
+            metadata: item.options?.metadata,
+            maxDuration: item.options?.maxDuration,
+            idempotencyKey:
+              (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+            idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+            machine: item.options?.machine,
+            priority: item.options?.priority,
+            region: item.options?.region,
+            debounce: item.options?.debounce,
+          },
+        };
+      })
+    );
+
+    return await tracer.startActiveSpan(
+      "batch.triggerByTaskAndWait()",
+      async (span) => {
+        // Execute 2-phase batch
+        const response = await executeBatchTwoPhase(
+          apiClient,
+          ndJsonItems,
+          {
+            parentRunId: ctx.run.id,
+            resumeParentOnCompletion: true,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: false, // Waiting: child runs share parent's trace ID
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", response.id);
+        span.setAttribute("runCount", response.runCount);
+
+        const result = await runtime.waitForBatch({
+          id: response.id,
+          runCount: response.runCount,
+          ctx,
+        });
+
+        const runs = await handleBatchTaskRunExecutionResultV2(result.items);
+
+        return {
+          id: result.id,
+          runs,
+        } as BatchByTaskResult<TTasks>;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
+  } else {
+    // Stream path: convert to AsyncIterable and transform
+    const streamItems = items as
+      | AsyncIterable<BatchByTaskAndWaitItem<TTasks[number]>>
+      | ReadableStream<BatchByTaskAndWaitItem<TTasks[number]>>;
+    const asyncItems = normalizeToAsyncIterable(streamItems);
+    const transformedItems = transformBatchByTaskItemsStreamForWait<TTasks>(asyncItems, options);
+
+    return await tracer.startActiveSpan(
+      "batch.triggerByTaskAndWait()",
+      async (span) => {
+        // Execute streaming 2-phase batch
+        const response = await executeBatchTwoPhaseStreaming(
+          apiClient,
+          transformedItems,
+          {
+            parentRunId: ctx.run.id,
+            resumeParentOnCompletion: true,
+            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            spanParentAsLink: false, // Waiting: child runs share parent's trace ID
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", response.id);
+        span.setAttribute("runCount", response.runCount);
+
+        const result = await runtime.waitForBatch({
+          id: response.id,
+          runCount: response.runCount,
+          ctx,
+        });
+
+        const runs = await handleBatchTaskRunExecutionResultV2(result.items);
+
+        return {
+          id: result.id,
+          runs,
+        } as BatchByTaskResult<TTasks>;
       },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+        },
+      }
+    );
+  }
+}
+
+/**
+ * Helper function that executes a 2-phase batch trigger:
+ * 1. Creates the batch record with expected run count
+ * 2. Streams items as NDJSON to the server
+ *
+ * @param apiClient - The API client instance
+ * @param items - Array of batch items
+ * @param options - Batch options including trace context settings
+ * @param options.spanParentAsLink - If true, child runs will have separate trace IDs with a link to parent.
+ *                                   Use true for batchTrigger (fire-and-forget), false for batchTriggerAndWait.
+ * @param requestOptions - Optional request options
+ * @internal
+ */
+async function executeBatchTwoPhase(
+  apiClient: ReturnType<typeof apiClientManager.clientOrThrow>,
+  items: BatchItemNDJSON[],
+  options: {
+    parentRunId?: string;
+    resumeParentOnCompletion?: boolean;
+    idempotencyKey?: string;
+    idempotencyKeyOptions?: { key: string; scope: "run" | "attempt" | "global" };
+    spanParentAsLink?: boolean;
+  },
+  requestOptions?: TriggerApiRequestOptions
+): Promise<{ id: string; runCount: number; publicAccessToken: string }> {
+  let batch: Awaited<ReturnType<typeof apiClient.createBatch>> | undefined;
+
+  try {
+    // Phase 1: Create batch
+    batch = await apiClient.createBatch(
+      {
+        runCount: items.length,
+        parentRunId: options.parentRunId,
+        resumeParentOnCompletion: options.resumeParentOnCompletion,
+        idempotencyKey: options.idempotencyKey,
+        idempotencyKeyOptions: options.idempotencyKeyOptions,
+      },
+      { spanParentAsLink: options.spanParentAsLink },
+      requestOptions
+    );
+  } catch (error) {
+    // Wrap with context about which phase failed
+    throw new BatchTriggerError(`Failed to create batch with ${items.length} items`, {
+      cause: error,
+      phase: "create",
+      itemCount: items.length,
+    });
+  }
+
+  // If the batch was cached (idempotent replay), skip streaming items
+  if (!batch.isCached) {
+    try {
+      // Phase 2: Stream items
+      await apiClient.streamBatchItems(batch.id, items, requestOptions);
+    } catch (error) {
+      // Wrap with context about which phase failed and include batch ID
+      throw new BatchTriggerError(
+        `Failed to stream items for batch ${batch.id} (${items.length} items)`,
+        { cause: error, phase: "stream", batchId: batch.id, itemCount: items.length }
+      );
+    }
+  }
+
+  return {
+    id: batch.id,
+    runCount: batch.runCount,
+    publicAccessToken: batch.publicAccessToken,
+  };
+}
+
+/**
+ * Error thrown when batch trigger operations fail.
+ * Includes context about which phase failed and the batch details.
+ *
+ * When the underlying error is a rate limit (429), additional properties are exposed:
+ * - `isRateLimited`: true
+ * - `retryAfterMs`: milliseconds until the rate limit resets
+ */
+export class BatchTriggerError extends Error {
+  readonly phase: "create" | "stream";
+  readonly batchId?: string;
+  readonly itemCount: number;
+
+  /** True if the error was caused by rate limiting (HTTP 429) */
+  readonly isRateLimited: boolean;
+
+  /** Milliseconds until the rate limit resets. Only set when `isRateLimited` is true. */
+  readonly retryAfterMs?: number;
+
+  /** The underlying API error, if the cause was an ApiError */
+  readonly apiError?: ApiError;
+
+  /** The underlying cause of the error */
+  override readonly cause?: unknown;
+
+  constructor(
+    message: string,
+    options: {
+      cause?: unknown;
+      phase: "create" | "stream";
+      batchId?: string;
+      itemCount: number;
     }
+  ) {
+    // Build enhanced message that includes the cause's message
+    const fullMessage = buildBatchErrorMessage(message, options.cause);
+    super(fullMessage, { cause: options.cause });
+
+    this.name = "BatchTriggerError";
+    this.cause = options.cause;
+    this.phase = options.phase;
+    this.batchId = options.batchId;
+    this.itemCount = options.itemCount;
+
+    // Extract rate limit info from cause
+    if (options.cause instanceof RateLimitError) {
+      this.isRateLimited = true;
+      this.retryAfterMs = options.cause.millisecondsUntilReset;
+      this.apiError = options.cause;
+    } else if (options.cause instanceof ApiError) {
+      this.isRateLimited = options.cause.status === 429;
+      this.apiError = options.cause;
+    } else {
+      this.isRateLimited = false;
+    }
+  }
+}
+
+/**
+ * Build an enhanced error message that includes context from the cause.
+ */
+function buildBatchErrorMessage(baseMessage: string, cause: unknown): string {
+  if (!cause) {
+    return baseMessage;
+  }
+
+  // Handle RateLimitError specifically for better messaging
+  if (cause instanceof RateLimitError) {
+    const retryMs = cause.millisecondsUntilReset;
+    if (retryMs !== undefined) {
+      const retrySeconds = Math.ceil(retryMs / 1000);
+      return `${baseMessage}: Rate limit exceeded - retry after ${retrySeconds}s`;
+    }
+    return `${baseMessage}: Rate limit exceeded`;
+  }
+
+  // Handle other ApiErrors
+  if (cause instanceof ApiError) {
+    return `${baseMessage}: ${cause.message}`;
+  }
+
+  // Handle generic errors
+  if (cause instanceof Error) {
+    return `${baseMessage}: ${cause.message}`;
+  }
+
+  return baseMessage;
+}
+
+/**
+ * Execute a streaming 2-phase batch trigger where items are streamed from an AsyncIterable.
+ * Unlike executeBatchTwoPhase, this doesn't know the count upfront.
+ *
+ * @param apiClient - The API client instance
+ * @param items - AsyncIterable of batch items
+ * @param options - Batch options including trace context settings
+ * @param options.spanParentAsLink - If true, child runs will have separate trace IDs with a link to parent.
+ *                                   Use true for batchTrigger (fire-and-forget), false for batchTriggerAndWait.
+ * @param requestOptions - Optional request options
+ * @internal
+ */
+async function executeBatchTwoPhaseStreaming(
+  apiClient: ReturnType<typeof apiClientManager.clientOrThrow>,
+  items: AsyncIterable<BatchItemNDJSON>,
+  options: {
+    parentRunId?: string;
+    resumeParentOnCompletion?: boolean;
+    idempotencyKey?: string;
+    idempotencyKeyOptions?: { key: string; scope: "run" | "attempt" | "global" };
+    spanParentAsLink?: boolean;
+  },
+  requestOptions?: TriggerApiRequestOptions
+): Promise<{ id: string; runCount: number; publicAccessToken: string }> {
+  // For streaming, we need to buffer items to get the count first
+  // This is because createBatch requires runCount upfront
+  // In the future, we could add a streaming-first endpoint that doesn't require this
+  const itemsArray: BatchItemNDJSON[] = [];
+  for await (const item of items) {
+    itemsArray.push(item);
+  }
+
+  // Now we can use the regular 2-phase approach
+  return executeBatchTwoPhase(apiClient, itemsArray, options, requestOptions);
+}
+
+// ============================================================================
+// Streaming Helpers
+// ============================================================================
+
+/**
+ * Type guard to check if a value is an AsyncIterable
+ */
+function isAsyncIterable<T>(value: unknown): value is AsyncIterable<T> {
+  return (
+    value != null &&
+    typeof value === "object" &&
+    Symbol.asyncIterator in value &&
+    typeof (value as AsyncIterable<T>)[Symbol.asyncIterator] === "function"
+  );
+}
+
+/**
+ * Type guard to check if a value is a ReadableStream
+ */
+function isReadableStream<T>(value: unknown): value is ReadableStream<T> {
+  return (
+    value != null &&
+    typeof value === "object" &&
+    "getReader" in value &&
+    typeof (value as ReadableStream<T>).getReader === "function"
   );
 }
 
+/**
+ * Convert a ReadableStream to an AsyncIterable.
+ * Properly cancels the stream when the consumer terminates early.
+ *
+ * @internal Exported for testing purposes
+ */
+export async function* readableStreamToAsyncIterable<T>(
+  stream: ReadableStream<T>
+): AsyncIterable<T> {
+  const reader = stream.getReader();
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      yield value;
+    }
+  } finally {
+    try {
+      await reader.cancel();
+    } catch {
+      // Ignore errors - stream might already be errored or closed
+    }
+    reader.releaseLock();
+  }
+}
+
+/**
+ * Normalize stream input to AsyncIterable
+ */
+function normalizeToAsyncIterable<T>(
+  input: AsyncIterable<T> | ReadableStream<T>
+): AsyncIterable<T> {
+  if (isReadableStream<T>(input)) {
+    return readableStreamToAsyncIterable(input);
+  }
+  return input;
+}
+
+/**
+ * Transform a stream of BatchByIdItem to BatchItemNDJSON format.
+ * Handles payload serialization and idempotency key generation.
+ *
+ * @internal
+ */
+async function* transformBatchItemsStream<TTask extends AnyTask>(
+  items: AsyncIterable<BatchByIdItem<InferRunTypes<TTask>>>,
+  options?: BatchTriggerOptions
+): AsyncIterable<BatchItemNDJSON> {
+  let index = 0;
+  for await (const item of items) {
+    const taskMetadata = resourceCatalog.getTask(item.id);
+
+    const parsedPayload = taskMetadata?.fns.parsePayload
+      ? await taskMetadata?.fns.parsePayload(item.payload)
+      : item.payload;
+
+    const payloadPacket = await stringifyIO(parsedPayload);
+
+    const batchItemIdempotencyKey = await makeIdempotencyKey(
+      flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+    );
+
+    yield {
+      index: index++,
+      task: item.id,
+      payload: payloadPacket.data,
+      options: {
+        queue: item.options?.queue ? { name: item.options.queue } : undefined,
+        concurrencyKey: item.options?.concurrencyKey,
+        test: taskContext.ctx?.run.isTest,
+        payloadType: payloadPacket.dataType,
+        delay: item.options?.delay,
+        ttl: item.options?.ttl,
+        tags: item.options?.tags,
+        maxAttempts: item.options?.maxAttempts,
+        metadata: item.options?.metadata,
+        maxDuration: item.options?.maxDuration,
+        idempotencyKey:
+          (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+        idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+        machine: item.options?.machine,
+        priority: item.options?.priority,
+        region: item.options?.region,
+        lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
+        debounce: item.options?.debounce,
+      },
+    };
+  }
+}
+
+/**
+ * Transform a stream of BatchByIdAndWaitItem to BatchItemNDJSON format for triggerAndWait.
+ * Uses the current worker version for lockToVersion.
+ *
+ * @internal
+ */
+async function* transformBatchItemsStreamForWait<TTask extends AnyTask>(
+  items: AsyncIterable<BatchByIdAndWaitItem<InferRunTypes<TTask>>>,
+  options?: BatchTriggerAndWaitOptions
+): AsyncIterable<BatchItemNDJSON> {
+  let index = 0;
+  for await (const item of items) {
+    const taskMetadata = resourceCatalog.getTask(item.id);
+
+    const parsedPayload = taskMetadata?.fns.parsePayload
+      ? await taskMetadata?.fns.parsePayload(item.payload)
+      : item.payload;
+
+    const payloadPacket = await stringifyIO(parsedPayload);
+
+    const batchItemIdempotencyKey = await makeIdempotencyKey(
+      flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+    );
+
+    yield {
+      index: index++,
+      task: item.id,
+      payload: payloadPacket.data,
+      options: {
+        lockToVersion: taskContext.worker?.version,
+        queue: item.options?.queue ? { name: item.options.queue } : undefined,
+        concurrencyKey: item.options?.concurrencyKey,
+        test: taskContext.ctx?.run.isTest,
+        payloadType: payloadPacket.dataType,
+        delay: item.options?.delay,
+        ttl: item.options?.ttl,
+        tags: item.options?.tags,
+        maxAttempts: item.options?.maxAttempts,
+        metadata: item.options?.metadata,
+        maxDuration: item.options?.maxDuration,
+        idempotencyKey:
+          (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+        idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+        machine: item.options?.machine,
+        priority: item.options?.priority,
+        region: item.options?.region,
+        debounce: item.options?.debounce,
+      },
+    };
+  }
+}
+
+/**
+ * Transform a stream of BatchByTaskItem to BatchItemNDJSON format.
+ *
+ * @internal
+ */
+async function* transformBatchByTaskItemsStream<TTasks extends readonly AnyTask[]>(
+  items: AsyncIterable<BatchByTaskItem<TTasks[number]>>,
+  options?: BatchTriggerOptions
+): AsyncIterable<BatchItemNDJSON> {
+  let index = 0;
+  for await (const item of items) {
+    const taskMetadata = resourceCatalog.getTask(item.task.id);
+
+    const parsedPayload = taskMetadata?.fns.parsePayload
+      ? await taskMetadata?.fns.parsePayload(item.payload)
+      : item.payload;
+
+    const payloadPacket = await stringifyIO(parsedPayload);
+
+    const batchItemIdempotencyKey = await makeIdempotencyKey(
+      flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+    );
+
+    yield {
+      index: index++,
+      task: item.task.id,
+      payload: payloadPacket.data,
+      options: {
+        queue: item.options?.queue ? { name: item.options.queue } : undefined,
+        concurrencyKey: item.options?.concurrencyKey,
+        test: taskContext.ctx?.run.isTest,
+        payloadType: payloadPacket.dataType,
+        delay: item.options?.delay,
+        ttl: item.options?.ttl,
+        tags: item.options?.tags,
+        maxAttempts: item.options?.maxAttempts,
+        metadata: item.options?.metadata,
+        maxDuration: item.options?.maxDuration,
+        idempotencyKey:
+          (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+        idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+        machine: item.options?.machine,
+        priority: item.options?.priority,
+        region: item.options?.region,
+        lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
+        debounce: item.options?.debounce,
+      },
+    };
+  }
+}
+
+/**
+ * Transform a stream of BatchByTaskAndWaitItem to BatchItemNDJSON format for triggerAndWait.
+ *
+ * @internal
+ */
+async function* transformBatchByTaskItemsStreamForWait<TTasks extends readonly AnyTask[]>(
+  items: AsyncIterable<BatchByTaskAndWaitItem<TTasks[number]>>,
+  options?: BatchTriggerAndWaitOptions
+): AsyncIterable<BatchItemNDJSON> {
+  let index = 0;
+  for await (const item of items) {
+    const taskMetadata = resourceCatalog.getTask(item.task.id);
+
+    const parsedPayload = taskMetadata?.fns.parsePayload
+      ? await taskMetadata?.fns.parsePayload(item.payload)
+      : item.payload;
+
+    const payloadPacket = await stringifyIO(parsedPayload);
+
+    const batchItemIdempotencyKey = await makeIdempotencyKey(
+      flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+    );
+
+    yield {
+      index: index++,
+      task: item.task.id,
+      payload: payloadPacket.data,
+      options: {
+        lockToVersion: taskContext.worker?.version,
+        queue: item.options?.queue ? { name: item.options.queue } : undefined,
+        concurrencyKey: item.options?.concurrencyKey,
+        test: taskContext.ctx?.run.isTest,
+        payloadType: payloadPacket.dataType,
+        delay: item.options?.delay,
+        ttl: item.options?.ttl,
+        tags: item.options?.tags,
+        maxAttempts: item.options?.maxAttempts,
+        metadata: item.options?.metadata,
+        maxDuration: item.options?.maxDuration,
+        idempotencyKey:
+          (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+        idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+        machine: item.options?.machine,
+        priority: item.options?.priority,
+        region: item.options?.region,
+        debounce: item.options?.debounce,
+      },
+    };
+  }
+}
+
+/**
+ * Transform a stream of BatchItem (single task type) to BatchItemNDJSON format.
+ *
+ * @internal
+ */
+async function* transformSingleTaskBatchItemsStream<TPayload>(
+  taskIdentifier: string,
+  items: AsyncIterable<BatchItem<TPayload>>,
+  parsePayload: SchemaParseFn<TPayload> | undefined,
+  options: BatchTriggerOptions | undefined,
+  queue: string | undefined
+): AsyncIterable<BatchItemNDJSON> {
+  let index = 0;
+  for await (const item of items) {
+    const parsedPayload = parsePayload ? await parsePayload(item.payload) : item.payload;
+    const payloadPacket = await stringifyIO(parsedPayload);
+
+    const batchItemIdempotencyKey = await makeIdempotencyKey(
+      flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+    );
+
+    yield {
+      index: index++,
+      task: taskIdentifier,
+      payload: payloadPacket.data,
+      options: {
+        queue: item.options?.queue
+          ? { name: item.options.queue }
+          : queue
+          ? { name: queue }
+          : undefined,
+        concurrencyKey: item.options?.concurrencyKey,
+        test: taskContext.ctx?.run.isTest,
+        payloadType: payloadPacket.dataType,
+        delay: item.options?.delay,
+        ttl: item.options?.ttl,
+        tags: item.options?.tags,
+        maxAttempts: item.options?.maxAttempts,
+        metadata: item.options?.metadata,
+        maxDuration: item.options?.maxDuration,
+        idempotencyKey:
+          (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
+        idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+        machine: item.options?.machine,
+        priority: item.options?.priority,
+        region: item.options?.region,
+        lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
+        debounce: item.options?.debounce,
+      },
+    };
+  }
+}
+
+/**
+ * Transform a stream of BatchTriggerAndWaitItem (single task type) to BatchItemNDJSON format.
+ *
+ * @internal
+ */
+async function* transformSingleTaskBatchItemsStreamForWait<TPayload>(
+  taskIdentifier: string,
+  items: AsyncIterable<BatchTriggerAndWaitItem<TPayload>>,
+  parsePayload: SchemaParseFn<TPayload> | undefined,
+  options: BatchTriggerAndWaitOptions | undefined,
+  queue: string | undefined
+): AsyncIterable<BatchItemNDJSON> {
+  let index = 0;
+  for await (const item of items) {
+    const parsedPayload = parsePayload ? await parsePayload(item.payload) : item.payload;
+    const payloadPacket = await stringifyIO(parsedPayload);
+
+    const batchItemIdempotencyKey = await makeIdempotencyKey(
+      flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+    );
+
+    // Process item-specific idempotency key and extract options
+    const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
+    const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
+    const idempotencyKeyOptions = itemIdempotencyKey
+      ? getIdempotencyKeyOptions(itemIdempotencyKey)
+      : undefined;
+
+    yield {
+      index: index++,
+      task: taskIdentifier,
+      payload: payloadPacket.data,
+      options: {
+        lockToVersion: taskContext.worker?.version,
+        queue: item.options?.queue
+          ? { name: item.options.queue }
+          : queue
+          ? { name: queue }
+          : undefined,
+        concurrencyKey: item.options?.concurrencyKey,
+        test: taskContext.ctx?.run.isTest,
+        payloadType: payloadPacket.dataType,
+        delay: item.options?.delay,
+        ttl: item.options?.ttl,
+        tags: item.options?.tags,
+        maxAttempts: item.options?.maxAttempts,
+        metadata: item.options?.metadata,
+        maxDuration: item.options?.maxDuration,
+        idempotencyKey: finalIdempotencyKey?.toString(),
+        idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+        idempotencyKeyOptions,
+        machine: item.options?.machine,
+        priority: item.options?.priority,
+        region: item.options?.region,
+        debounce: item.options?.debounce,
+      },
+    };
+  }
+}
+
 async function trigger_internal<TRunTypes extends AnyRunTypes>(
   name: string,
   id: TRunTypes["taskIdentifier"],
@@ -1148,12 +2109,18 @@ async function trigger_internal<TRunTypes extends AnyRunTypes>(
   options?: TriggerOptions,
   requestOptions?: TriggerApiRequestOptions
 ): Promise<RunHandleFromTypes<TRunTypes>> {
-  const apiClient = apiClientManager.clientOrThrow();
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
   const parsedPayload = parsePayload ? await parsePayload(payload) : payload;
 
   const payloadPacket = await stringifyIO(parsedPayload);
 
+  // Process idempotency key and extract options for storage
+  const processedIdempotencyKey = await makeIdempotencyKey(options?.idempotencyKey);
+  const idempotencyKeyOptions = processedIdempotencyKey
+    ? getIdempotencyKeyOptions(processedIdempotencyKey)
+    : undefined;
+
   const handle = await apiClient.triggerTask(
     id,
     {
@@ -1163,8 +2130,9 @@ async function trigger_internal<TRunTypes extends AnyRunTypes>(
         concurrencyKey: options?.concurrencyKey,
         test: taskContext.ctx?.run.isTest,
         payloadType: payloadPacket.dataType,
-        idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+        idempotencyKey: processedIdempotencyKey?.toString(),
         idempotencyKeyTTL: options?.idempotencyKeyTTL,
+        idempotencyKeyOptions,
         delay: options?.delay,
         ttl: options?.ttl,
         tags: options?.tags,
@@ -1174,7 +2142,9 @@ async function trigger_internal<TRunTypes extends AnyRunTypes>(
         parentRunId: taskContext.ctx?.run.id,
         machine: options?.machine,
         priority: options?.priority,
+        region: options?.region,
         lockToVersion: options?.version ?? getEnvVar("TRIGGER_VERSION"),
+        debounce: options?.debounce,
       },
     },
     {
@@ -1201,88 +2171,184 @@ async function trigger_internal<TRunTypes extends AnyRunTypes>(
 async function batchTrigger_internal<TRunTypes extends AnyRunTypes>(
   name: string,
   taskIdentifier: TRunTypes["taskIdentifier"],
-  items: Array<BatchItem<TRunTypes["payload"]>>,
+  items:
+    | Array<BatchItem<TRunTypes["payload"]>>
+    | AsyncIterable<BatchItem<TRunTypes["payload"]>>
+    | ReadableStream<BatchItem<TRunTypes["payload"]>>,
   options?: BatchTriggerOptions,
   parsePayload?: SchemaParseFn<TRunTypes["payload"]>,
   requestOptions?: TriggerApiRequestOptions,
   queue?: string
 ): Promise<BatchRunHandleFromTypes<TRunTypes>> {
-  const apiClient = apiClientManager.clientOrThrow();
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
   const ctx = taskContext.ctx;
 
-  const response = await apiClient.batchTriggerV3(
-    {
-      items: await Promise.all(
-        items.map(async (item, index) => {
-          const parsedPayload = parsePayload ? await parsePayload(item.payload) : item.payload;
-
-          const payloadPacket = await stringifyIO(parsedPayload);
-
-          const batchItemIdempotencyKey = await makeIdempotencyKey(
-            flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
-          );
-
-          return {
-            task: taskIdentifier,
-            payload: payloadPacket.data,
-            options: {
-              queue: item.options?.queue
-                ? { name: item.options.queue }
-                : queue
-                ? { name: queue }
-                : undefined,
-              concurrencyKey: item.options?.concurrencyKey,
-              test: taskContext.ctx?.run.isTest,
-              payloadType: payloadPacket.dataType,
-              delay: item.options?.delay,
-              ttl: item.options?.ttl,
-              tags: item.options?.tags,
-              maxAttempts: item.options?.maxAttempts,
-              metadata: item.options?.metadata,
-              maxDuration: item.options?.maxDuration,
-              idempotencyKey:
-                (await makeIdempotencyKey(item.options?.idempotencyKey)) ?? batchItemIdempotencyKey,
-              idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
-              machine: item.options?.machine,
-              priority: item.options?.priority,
-              lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
-            },
-          } satisfies BatchTriggerTaskV2RequestBody["items"][0];
-        })
-      ),
-      parentRunId: ctx?.run.id,
-    },
-    {
-      spanParentAsLink: true,
-      processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
-    },
-    {
+  // Check if items is an array or a stream
+  if (Array.isArray(items)) {
+    // Prepare items as BatchItemNDJSON
+    const ndJsonItems: BatchItemNDJSON[] = await Promise.all(
+      items.map(async (item, index) => {
+        const parsedPayload = parsePayload ? await parsePayload(item.payload) : item.payload;
+
+        const payloadPacket = await stringifyIO(parsedPayload);
+
+        const batchItemIdempotencyKey = await makeIdempotencyKey(
+          flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+        );
+
+        // Process item-specific idempotency key and extract options
+        const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
+        const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
+        const idempotencyKeyOptions = itemIdempotencyKey
+          ? getIdempotencyKeyOptions(itemIdempotencyKey)
+          : undefined;
+
+        return {
+          index,
+          task: taskIdentifier,
+          payload: payloadPacket.data,
+          options: {
+            queue: item.options?.queue
+              ? { name: item.options.queue }
+              : queue
+              ? { name: queue }
+              : undefined,
+            concurrencyKey: item.options?.concurrencyKey,
+            test: taskContext.ctx?.run.isTest,
+            payloadType: payloadPacket.dataType,
+            delay: item.options?.delay,
+            ttl: item.options?.ttl,
+            tags: item.options?.tags,
+            maxAttempts: item.options?.maxAttempts,
+            metadata: item.options?.metadata,
+            maxDuration: item.options?.maxDuration,
+            idempotencyKey: finalIdempotencyKey?.toString(),
+            idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+            idempotencyKeyOptions,
+            machine: item.options?.machine,
+            priority: item.options?.priority,
+            region: item.options?.region,
+            lockToVersion: item.options?.version ?? getEnvVar("TRIGGER_VERSION"),
+          },
+        };
+      })
+    );
+
+    // Execute 2-phase batch
+    // Process batch-level idempotency key
+    const batchIdempotencyKey = await makeIdempotencyKey(options?.idempotencyKey);
+    const batchIdempotencyKeyOptions = batchIdempotencyKey
+      ? getIdempotencyKeyOptions(batchIdempotencyKey)
+      : undefined;
+
+    const response = await tracer.startActiveSpan(
       name,
-      tracer,
-      icon: "trigger",
-      onResponseBody(body, span) {
-        if (body && typeof body === "object" && !Array.isArray(body)) {
-          if ("id" in body && typeof body.id === "string") {
-            span.setAttribute("batchId", body.id);
-          }
+      async (span) => {
+        const result = await executeBatchTwoPhase(
+          apiClient,
+          ndJsonItems,
+          {
+            parentRunId: ctx?.run.id,
+            idempotencyKey: batchIdempotencyKey?.toString(),
+            idempotencyKeyOptions: batchIdempotencyKeyOptions,
+            spanParentAsLink: true, // Fire-and-forget: child runs get separate trace IDs
+          },
+          requestOptions
+        );
 
-          if ("runCount" in body && Array.isArray(body.runCount)) {
-            span.setAttribute("runCount", body.runCount);
-          }
-        }
+        span.setAttribute("batchId", result.id);
+        span.setAttribute("runCount", result.runCount);
+
+        return result;
       },
-      ...requestOptions,
-    }
-  );
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+          ...accessoryAttributes({
+            items: [
+              {
+                text: taskIdentifier,
+                variant: "normal",
+              },
+            ],
+            style: "codepath",
+          }),
+        },
+      }
+    );
 
-  const handle = {
-    batchId: response.id,
-    runCount: response.runCount,
-    publicAccessToken: response.publicAccessToken,
-  };
+    const handle = {
+      batchId: response.id,
+      runCount: response.runCount,
+      publicAccessToken: response.publicAccessToken,
+    };
+
+    return handle as BatchRunHandleFromTypes<TRunTypes>;
+  } else {
+    // Stream path: convert to AsyncIterable and transform
+    const asyncItems = normalizeToAsyncIterable(items);
+    const transformedItems = transformSingleTaskBatchItemsStream(
+      taskIdentifier,
+      asyncItems,
+      parsePayload,
+      options,
+      queue
+    );
+
+    // Execute streaming 2-phase batch
+    // Process batch-level idempotency key
+    const streamBatchIdempotencyKey = await makeIdempotencyKey(options?.idempotencyKey);
+    const streamBatchIdempotencyKeyOptions = streamBatchIdempotencyKey
+      ? getIdempotencyKeyOptions(streamBatchIdempotencyKey)
+      : undefined;
+
+    const response = await tracer.startActiveSpan(
+      name,
+      async (span) => {
+        const result = await executeBatchTwoPhaseStreaming(
+          apiClient,
+          transformedItems,
+          {
+            parentRunId: ctx?.run.id,
+            idempotencyKey: streamBatchIdempotencyKey?.toString(),
+            idempotencyKeyOptions: streamBatchIdempotencyKeyOptions,
+            spanParentAsLink: true, // Fire-and-forget: child runs get separate trace IDs
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", result.id);
+        span.setAttribute("runCount", result.runCount);
+
+        return result;
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+          ...accessoryAttributes({
+            items: [
+              {
+                text: taskIdentifier,
+                variant: "normal",
+              },
+            ],
+            style: "codepath",
+          }),
+        },
+      }
+    );
+
+    const handle = {
+      batchId: response.id,
+      runCount: response.runCount,
+      publicAccessToken: response.publicAccessToken,
+    };
 
-  return handle as BatchRunHandleFromTypes<TRunTypes>;
+    return handle as BatchRunHandleFromTypes<TRunTypes>;
+  }
 }
 
 async function triggerAndWait_internal<TIdentifier extends string, TPayload, TOutput>(
@@ -1291,7 +2357,7 @@ async function triggerAndWait_internal<TIdentifier extends string, TPayload, TOu
   payload: TPayload,
   parsePayload?: SchemaParseFn<TPayload>,
   options?: TriggerAndWaitOptions,
-  requestOptions?: ApiRequestOptions
+  requestOptions?: TriggerApiRequestOptions
 ): Promise<TaskRunResult<TIdentifier, TOutput>> {
   const ctx = taskContext.ctx;
 
@@ -1299,12 +2365,18 @@ async function triggerAndWait_internal<TIdentifier extends string, TPayload, TOu
     throw new Error("triggerAndWait can only be used from inside a task.run()");
   }
 
-  const apiClient = apiClientManager.clientOrThrow();
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
   const parsedPayload = parsePayload ? await parsePayload(payload) : payload;
 
   const payloadPacket = await stringifyIO(parsedPayload);
 
+  // Process idempotency key and extract options for storage
+  const processedIdempotencyKey = await makeIdempotencyKey(options?.idempotencyKey);
+  const idempotencyKeyOptions = processedIdempotencyKey
+    ? getIdempotencyKeyOptions(processedIdempotencyKey)
+    : undefined;
+
   return await tracer.startActiveSpan(
     name,
     async (span) => {
@@ -1313,7 +2385,6 @@ async function triggerAndWait_internal<TIdentifier extends string, TPayload, TOu
         {
           payload: payloadPacket.data,
           options: {
-            dependentAttempt: ctx.attempt.id,
             lockToVersion: taskContext.worker?.version, // Lock to current version because we're waiting for it to finish
             queue: options?.queue ? { name: options.queue } : undefined,
             concurrencyKey: options?.concurrencyKey,
@@ -1327,10 +2398,13 @@ async function triggerAndWait_internal<TIdentifier extends string, TPayload, TOu
             maxDuration: options?.maxDuration,
             resumeParentOnCompletion: true,
             parentRunId: ctx.run.id,
-            idempotencyKey: await makeIdempotencyKey(options?.idempotencyKey),
+            idempotencyKey: processedIdempotencyKey?.toString(),
             idempotencyKeyTTL: options?.idempotencyKeyTTL,
+            idempotencyKeyOptions,
             machine: options?.machine,
             priority: options?.priority,
+            region: options?.region,
+            debounce: options?.debounce,
           },
         },
         {},
@@ -1367,10 +2441,13 @@ async function triggerAndWait_internal<TIdentifier extends string, TPayload, TOu
 async function batchTriggerAndWait_internal<TIdentifier extends string, TPayload, TOutput>(
   name: string,
   id: TIdentifier,
-  items: Array<BatchTriggerAndWaitItem<TPayload>>,
+  items:
+    | Array<BatchTriggerAndWaitItem<TPayload>>
+    | AsyncIterable<BatchTriggerAndWaitItem<TPayload>>
+    | ReadableStream<BatchTriggerAndWaitItem<TPayload>>,
   parsePayload?: SchemaParseFn<TPayload>,
   options?: BatchTriggerAndWaitOptions,
-  requestOptions?: ApiRequestOptions,
+  requestOptions?: TriggerApiRequestOptions,
   queue?: string
 ): Promise<BatchResult<TIdentifier, TOutput>> {
   const ctx = taskContext.ctx;
@@ -1379,93 +2456,187 @@ async function batchTriggerAndWait_internal<TIdentifier extends string, TPayload
     throw new Error("batchTriggerAndWait can only be used from inside a task.run()");
   }
 
-  const apiClient = apiClientManager.clientOrThrow();
+  const apiClient = apiClientManager.clientOrThrow(requestOptions?.clientConfig);
 
-  return await tracer.startActiveSpan(
-    name,
-    async (span) => {
-      const response = await apiClient.batchTriggerV3(
-        {
-          items: await Promise.all(
-            items.map(async (item, index) => {
-              const parsedPayload = parsePayload ? await parsePayload(item.payload) : item.payload;
-
-              const payloadPacket = await stringifyIO(parsedPayload);
-
-              const batchItemIdempotencyKey = await makeIdempotencyKey(
-                flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
-              );
-
-              return {
-                task: id,
-                payload: payloadPacket.data,
-                options: {
-                  lockToVersion: taskContext.worker?.version,
-                  queue: item.options?.queue
-                    ? { name: item.options.queue }
-                    : queue
-                    ? { name: queue }
-                    : undefined,
-                  concurrencyKey: item.options?.concurrencyKey,
-                  test: taskContext.ctx?.run.isTest,
-                  payloadType: payloadPacket.dataType,
-                  delay: item.options?.delay,
-                  ttl: item.options?.ttl,
-                  tags: item.options?.tags,
-                  maxAttempts: item.options?.maxAttempts,
-                  metadata: item.options?.metadata,
-                  maxDuration: item.options?.maxDuration,
-                  idempotencyKey:
-                    (await makeIdempotencyKey(item.options?.idempotencyKey)) ??
-                    batchItemIdempotencyKey,
-                  idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
-                  machine: item.options?.machine,
-                  priority: item.options?.priority,
-                },
-              } satisfies BatchTriggerTaskV2RequestBody["items"][0];
-            })
-          ),
-          resumeParentOnCompletion: true,
-          parentRunId: ctx.run.id,
-        },
-        {
-          processingStrategy: options?.triggerSequentially ? "sequential" : undefined,
-        },
-        requestOptions
-      );
+  // Check if items is an array or a stream
+  if (Array.isArray(items)) {
+    // Prepare items as BatchItemNDJSON
+    const ndJsonItems: BatchItemNDJSON[] = await Promise.all(
+      items.map(async (item, index) => {
+        const parsedPayload = parsePayload ? await parsePayload(item.payload) : item.payload;
 
-      span.setAttribute("batchId", response.id);
-      span.setAttribute("runCount", response.runCount);
+        const payloadPacket = await stringifyIO(parsedPayload);
 
-      const result = await runtime.waitForBatch({
-        id: response.id,
-        runCount: response.runCount,
-        ctx,
-      });
+        const batchItemIdempotencyKey = await makeIdempotencyKey(
+          flattenIdempotencyKey([options?.idempotencyKey, `${index}`])
+        );
 
-      const runs = await handleBatchTaskRunExecutionResult<TIdentifier, TOutput>(result.items, id);
+        // Process item-specific idempotency key and extract options
+        const itemIdempotencyKey = await makeIdempotencyKey(item.options?.idempotencyKey);
+        const finalIdempotencyKey = itemIdempotencyKey ?? batchItemIdempotencyKey;
+        const idempotencyKeyOptions = itemIdempotencyKey
+          ? getIdempotencyKeyOptions(itemIdempotencyKey)
+          : undefined;
 
-      return {
-        id: result.id,
-        runs,
-      };
-    },
-    {
-      kind: SpanKind.PRODUCER,
-      attributes: {
-        [SemanticInternalAttributes.STYLE_ICON]: "trigger",
-        ...accessoryAttributes({
-          items: [
-            {
-              text: id,
-              variant: "normal",
-            },
-          ],
-          style: "codepath",
-        }),
+        return {
+          index,
+          task: id,
+          payload: payloadPacket.data,
+          options: {
+            lockToVersion: taskContext.worker?.version,
+            queue: item.options?.queue
+              ? { name: item.options.queue }
+              : queue
+              ? { name: queue }
+              : undefined,
+            concurrencyKey: item.options?.concurrencyKey,
+            test: taskContext.ctx?.run.isTest,
+            payloadType: payloadPacket.dataType,
+            delay: item.options?.delay,
+            ttl: item.options?.ttl,
+            tags: item.options?.tags,
+            maxAttempts: item.options?.maxAttempts,
+            metadata: item.options?.metadata,
+            maxDuration: item.options?.maxDuration,
+            idempotencyKey: finalIdempotencyKey?.toString(),
+            idempotencyKeyTTL: item.options?.idempotencyKeyTTL ?? options?.idempotencyKeyTTL,
+            idempotencyKeyOptions,
+            machine: item.options?.machine,
+            priority: item.options?.priority,
+            region: item.options?.region,
+          },
+        };
+      })
+    );
+
+    // Process batch-level idempotency key
+    const batchIdempotencyKey = await makeIdempotencyKey(options?.idempotencyKey);
+    const batchIdempotencyKeyOptions = batchIdempotencyKey
+      ? getIdempotencyKeyOptions(batchIdempotencyKey)
+      : undefined;
+
+    return await tracer.startActiveSpan(
+      name,
+      async (span) => {
+        // Execute 2-phase batch
+        const response = await executeBatchTwoPhase(
+          apiClient,
+          ndJsonItems,
+          {
+            parentRunId: ctx.run.id,
+            resumeParentOnCompletion: true,
+            idempotencyKey: batchIdempotencyKey?.toString(),
+            idempotencyKeyOptions: batchIdempotencyKeyOptions,
+            spanParentAsLink: false, // Waiting: child runs share parent's trace ID
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", response.id);
+        span.setAttribute("runCount", response.runCount);
+
+        const result = await runtime.waitForBatch({
+          id: response.id,
+          runCount: response.runCount,
+          ctx,
+        });
+
+        const runs = await handleBatchTaskRunExecutionResult<TIdentifier, TOutput>(
+          result.items,
+          id
+        );
+
+        return {
+          id: result.id,
+          runs,
+        };
       },
-    }
-  );
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+          ...accessoryAttributes({
+            items: [
+              {
+                text: id,
+                variant: "normal",
+              },
+            ],
+            style: "codepath",
+          }),
+        },
+      }
+    );
+  } else {
+    // Stream path: convert to AsyncIterable and transform
+    const asyncItems = normalizeToAsyncIterable(items);
+    const transformedItems = transformSingleTaskBatchItemsStreamForWait(
+      id,
+      asyncItems,
+      parsePayload,
+      options,
+      queue
+    );
+
+    // Process batch-level idempotency key for streaming path
+    const streamBatchIdempotencyKey = await makeIdempotencyKey(options?.idempotencyKey);
+    const streamBatchIdempotencyKeyOptions = streamBatchIdempotencyKey
+      ? getIdempotencyKeyOptions(streamBatchIdempotencyKey)
+      : undefined;
+
+    return await tracer.startActiveSpan(
+      name,
+      async (span) => {
+        // Execute streaming 2-phase batch
+        const response = await executeBatchTwoPhaseStreaming(
+          apiClient,
+          transformedItems,
+          {
+            parentRunId: ctx.run.id,
+            resumeParentOnCompletion: true,
+            idempotencyKey: streamBatchIdempotencyKey?.toString(),
+            idempotencyKeyOptions: streamBatchIdempotencyKeyOptions,
+            spanParentAsLink: false, // Waiting: child runs share parent's trace ID
+          },
+          requestOptions
+        );
+
+        span.setAttribute("batchId", response.id);
+        span.setAttribute("runCount", response.runCount);
+
+        const result = await runtime.waitForBatch({
+          id: response.id,
+          runCount: response.runCount,
+          ctx,
+        });
+
+        const runs = await handleBatchTaskRunExecutionResult<TIdentifier, TOutput>(
+          result.items,
+          id
+        );
+
+        return {
+          id: result.id,
+          runs,
+        };
+      },
+      {
+        kind: SpanKind.PRODUCER,
+        attributes: {
+          [SemanticInternalAttributes.STYLE_ICON]: "trigger",
+          ...accessoryAttributes({
+            items: [
+              {
+                text: id,
+                variant: "normal",
+              },
+            ],
+            style: "codepath",
+          }),
+        },
+      }
+    );
+  }
 }
 
 async function handleBatchTaskRunExecutionResult<TIdentifier extends string, TOutput>(
@@ -1581,6 +2752,12 @@ function registerTaskLifecycleHooks<
     });
   }
 
+  if (params.onStartAttempt) {
+    lifecycleHooks.registerTaskStartAttemptHook(taskId, {
+      fn: params.onStartAttempt as AnyOnStartAttemptHookFunction,
+    });
+  }
+
   if (params.onFailure) {
     lifecycleHooks.registerTaskFailureHook(taskId, {
       fn: params.onFailure as AnyOnFailureHookFunction,
diff --git a/packages/trigger-sdk/src/v3/streams.test.ts b/packages/trigger-sdk/src/v3/streams.test.ts
new file mode 100644
index 00000000000..67ee00fd261
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/streams.test.ts
@@ -0,0 +1,64 @@
+import { describe, it, expect, vi, beforeEach } from "vitest";
+import { streams } from "./streams.js";
+import { taskContext, realtimeStreams } from "@trigger.dev/core/v3";
+
+vi.mock("@trigger.dev/core/v3", async (importOriginal) => {
+    const original = await importOriginal<typeof import("@trigger.dev/core/v3")>();
+    return {
+        ...original,
+        taskContext: {
+            ctx: {
+                run: {
+                    id: "run_123",
+                    // parentTaskRunId and rootTaskRunId are undefined for root tasks
+                },
+            },
+        },
+        realtimeStreams: {
+            pipe: vi.fn().mockReturnValue({
+                wait: () => Promise.resolve(),
+                stream: new ReadableStream(),
+            }),
+        },
+    };
+});
+
+describe("streams.pipe consistency", () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it("should not throw and should use self runId when target is 'root' in a root task", async () => {
+        const mockStream = new ReadableStream();
+
+        // This should not throw anymore
+        const { waitUntilComplete } = streams.pipe("test-key", mockStream, {
+            target: "root",
+        });
+
+        expect(realtimeStreams.pipe).toHaveBeenCalledWith(
+            "test-key",
+            mockStream,
+            expect.objectContaining({
+                target: "run_123",
+            })
+        );
+    });
+
+    it("should not throw and should use self runId when target is 'parent' in a root task", async () => {
+        const mockStream = new ReadableStream();
+
+        // This should not throw anymore
+        const { waitUntilComplete } = streams.pipe("test-key", mockStream, {
+            target: "parent",
+        });
+
+        expect(realtimeStreams.pipe).toHaveBeenCalledWith(
+            "test-key",
+            mockStream,
+            expect.objectContaining({
+                target: "run_123",
+            })
+        );
+    });
+});
diff --git a/packages/trigger-sdk/src/v3/streams.ts b/packages/trigger-sdk/src/v3/streams.ts
new file mode 100644
index 00000000000..3bdde70bea1
--- /dev/null
+++ b/packages/trigger-sdk/src/v3/streams.ts
@@ -0,0 +1,683 @@
+import {
+  type ApiRequestOptions,
+  realtimeStreams,
+  taskContext,
+  type RealtimeStreamOperationOptions,
+  mergeRequestOptions,
+  accessoryAttributes,
+  SemanticInternalAttributes,
+  apiClientManager,
+  AsyncIterableStream,
+  WriterStreamOptions,
+  PipeStreamOptions,
+  PipeStreamResult,
+  ReadStreamOptions,
+  AppendStreamOptions,
+  RealtimeDefinedStream,
+  InferStreamType,
+} from "@trigger.dev/core/v3";
+import { tracer } from "./tracer.js";
+import { SpanStatusCode } from "@opentelemetry/api";
+
+const DEFAULT_STREAM_KEY = "default";
+
+/**
+ * Pipes data to a realtime stream using the default stream key (`"default"`).
+ *
+ * This is a convenience overload that allows you to pipe data without specifying a stream key.
+ * The stream will be created/accessed with the key `"default"`.
+ *
+ * @template T - The type of data chunks in the stream
+ * @param value - The stream of data to pipe from. Can be an `AsyncIterable<T>` or `ReadableStream<T>`.
+ * @param options - Optional configuration for the stream operation
+ * @returns A promise that resolves to an object containing:
+ *   - `stream`: The original stream (can be consumed in your task)
+ *   - `waitUntilComplete`: A function that returns a promise resolving when the stream is fully sent
+ *
+ * @example
+ * ```ts
+ * import { streams } from "@trigger.dev/sdk";
+ *
+ * // Stream OpenAI completion chunks to the default stream
+ * const completion = await openai.chat.completions.create({
+ *   model: "gpt-4",
+ *   messages: [{ role: "user", content: "Hello" }],
+ *   stream: true,
+ * });
+ *
+ * const { waitUntilComplete } = await streams.pipe(completion);
+ *
+ * // Process the stream locally
+ * for await (const chunk of completion) {
+ *   console.log(chunk);
+ * }
+ *
+ * // Or alternatievely wait for all chunks to be sent to the realtime stream
+ * await waitUntilComplete();
+ * ```
+ */
+function pipe<T>(
+  value: AsyncIterable<T> | ReadableStream<T>,
+  options?: PipeStreamOptions
+): PipeStreamResult<T>;
+/**
+ * Pipes data to a realtime stream with a specific stream key.
+ *
+ * Use this overload when you want to use a custom stream key instead of the default.
+ *
+ * @template T - The type of data chunks in the stream
+ * @param key - The unique identifier for this stream. If multiple streams use the same key,
+ *   they will be merged into a single stream. Defaults to `"default"` if not provided.
+ * @param value - The stream of data to pipe from. Can be an `AsyncIterable<T>` or `ReadableStream<T>`.
+ * @param options - Optional configuration for the stream operation
+ * @returns A promise that resolves to an object containing:
+ *   - `stream`: The original stream (can be consumed in your task)
+ *   - `waitUntilComplete`: A function that returns a promise resolving when the stream is fully sent
+ *
+ * @example
+ * ```ts
+ * import { streams } from "@trigger.dev/sdk";
+ *
+ * // Stream data to a specific stream key
+ * const myStream = createAsyncGenerator();
+ * const { waitUntilComplete } = await streams.pipe("my-custom-stream", myStream);
+ *
+ * // Process the stream locally
+ * for await (const chunk of myStream) {
+ *   console.log(chunk);
+ * }
+ *
+ * // Wait for all chunks to be sent
+ * await waitUntilComplete();
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Stream to a parent run
+ * await streams.pipe("output", myStream, {
+ *   target: "parent",
+ * });
+ * ```
+ */
+function pipe<T>(
+  key: string,
+  value: AsyncIterable<T> | ReadableStream<T>,
+  options?: PipeStreamOptions
+): PipeStreamResult<T>;
+function pipe<T>(
+  keyOrValue: string | AsyncIterable<T> | ReadableStream<T>,
+  valueOrOptions?: AsyncIterable<T> | ReadableStream<T> | PipeStreamOptions,
+  options?: PipeStreamOptions
+): PipeStreamResult<T> {
+  // Handle overload: pipe(value, options?) or pipe(key, value, options?)
+  let key: string;
+  let value: AsyncIterable<T> | ReadableStream<T>;
+  let opts: PipeStreamOptions | undefined;
+
+  if (typeof keyOrValue === "string") {
+    // pipe(key, value, options?)
+    key = keyOrValue;
+    value = valueOrOptions as AsyncIterable<T> | ReadableStream<T>;
+    opts = options;
+  } else {
+    // pipe(value, options?)
+    key = DEFAULT_STREAM_KEY;
+    value = keyOrValue;
+    opts = valueOrOptions as PipeStreamOptions | undefined;
+  }
+
+  return pipeInternal(key, value, opts, "streams.pipe()");
+}
+
+/**
+ * Internal pipe implementation that allows customizing the span name.
+ * This is used by both the public `pipe` method and the `writer` method.
+ */
+function pipeInternal<T>(
+  key: string,
+  value: AsyncIterable<T> | ReadableStream<T>,
+  opts: PipeStreamOptions | undefined,
+  spanName: string
+): PipeStreamResult<T> {
+  const runId = getRunIdForOptions(opts);
+
+  if (!runId) {
+    throw new Error(
+      "Could not determine the target run ID for the realtime stream. Please specify a target run ID using the `target` option or use this function from inside a task."
+    );
+  }
+
+  const span = tracer.startSpan(spanName, {
+    attributes: {
+      key,
+      runId,
+      [SemanticInternalAttributes.ENTITY_TYPE]: "realtime-stream",
+      [SemanticInternalAttributes.ENTITY_ID]: `${runId}:${key}`,
+      [SemanticInternalAttributes.STYLE_ICON]: "streams",
+      ...accessoryAttributes({
+        items: [
+          {
+            text: key,
+            variant: "normal",
+          },
+        ],
+        style: "codepath",
+      }),
+    },
+  });
+
+  const requestOptions = mergeRequestOptions({}, opts?.requestOptions);
+
+  try {
+    const instance = realtimeStreams.pipe(key, value, {
+      signal: opts?.signal,
+      target: runId,
+      requestOptions,
+    });
+
+    instance.wait().finally(() => {
+      span.end();
+    });
+
+    return {
+      stream: instance.stream,
+      waitUntilComplete: () => instance.wait(),
+    };
+  } catch (error) {
+    // if the error is a signal abort error, we need to end the span but not record an exception
+    if (error instanceof Error && error.name === "AbortError") {
+      span.end();
+      throw error;
+    }
+
+    if (error instanceof Error || typeof error === "string") {
+      span.recordException(error);
+    } else {
+      span.recordException(String(error));
+    }
+
+    span.setStatus({ code: SpanStatusCode.ERROR });
+    span.end();
+
+    throw error;
+  }
+}
+
+/**
+ * Reads data from a realtime stream using the default stream key (`"default"`).
+ *
+ * This is a convenience overload that allows you to read from the default stream without
+ * specifying a stream key. The stream will be accessed with the key `"default"`.
+ *
+ * @template T - The type of data chunks in the stream
+ * @param runId - The unique identifier of the run to read the stream from
+ * @param options - Optional configuration for reading the stream
+ * @returns A promise that resolves to an `AsyncIterableStream<T>` that can be consumed
+ *   using `for await...of` or as a `ReadableStream`.
+ *
+ * @example
+ * ```ts
+ * import { streams } from "@trigger.dev/sdk/v3";
+ *
+ * // Read from the default stream
+ * const stream = await streams.read<string>(runId);
+ *
+ * for await (const chunk of stream) {
+ *   console.log("Received chunk:", chunk);
+ * }
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Read with custom timeout and starting position
+ * const stream = await streams.read<string>(runId, {
+ *   timeoutInSeconds: 120,
+ *   startIndex: 10, // Start from the 10th chunk
+ * });
+ * ```
+ */
+function read<T>(runId: string, options?: ReadStreamOptions): Promise<AsyncIterableStream<T>>;
+/**
+ * Reads data from a realtime stream with a specific stream key.
+ *
+ * Use this overload when you want to read from a stream with a custom key.
+ *
+ * @template T - The type of data chunks in the stream
+ * @param runId - The unique identifier of the run to read the stream from
+ * @param key - The unique identifier of the stream to read from. Defaults to `"default"` if not provided.
+ * @param options - Optional configuration for reading the stream
+ * @returns A promise that resolves to an `AsyncIterableStream<T>` that can be consumed
+ *   using `for await...of` or as a `ReadableStream`.
+ *
+ * @example
+ * ```ts
+ * import { streams } from "@trigger.dev/sdk";
+ *
+ * // Read from a specific stream key
+ * const stream = await streams.read<string>(runId, "my-custom-stream");
+ *
+ * for await (const chunk of stream) {
+ *   console.log("Received chunk:", chunk);
+ * }
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Read with signal for cancellation
+ * const controller = new AbortController();
+ * const stream = await streams.read<string>(runId, "my-stream", {
+ *   signal: controller.signal,
+ *   timeoutInSeconds: 30,
+ * });
+ *
+ * // Cancel after 5 seconds
+ * setTimeout(() => controller.abort(), 5000);
+ * ```
+ */
+function read<T>(
+  runId: string,
+  key: string,
+  options?: ReadStreamOptions
+): Promise<AsyncIterableStream<T>>;
+async function read<T>(
+  runId: string,
+  keyOrOptions?: string | ReadStreamOptions,
+  options?: ReadStreamOptions
+): Promise<AsyncIterableStream<T>> {
+  // Handle overload: read(runId, options?) or read(runId, key, options?)
+  let key: string;
+  let opts: ReadStreamOptions | undefined;
+
+  if (typeof keyOrOptions === "string") {
+    // read(runId, key, options?)
+    key = keyOrOptions;
+    opts = options;
+  } else {
+    // read(runId, options?)
+    key = DEFAULT_STREAM_KEY;
+    opts = keyOrOptions;
+  }
+
+  // Rename to readStream for consistency with existing code
+  return readStreamImpl(runId, key, opts);
+}
+
+async function readStreamImpl<T>(
+  runId: string,
+  key: string,
+  options?: ReadStreamOptions
+): Promise<AsyncIterableStream<T>> {
+  const apiClient = apiClientManager.clientOrThrow();
+
+  const span = tracer.startSpan("streams.read()", {
+    attributes: {
+      key,
+      runId,
+      [SemanticInternalAttributes.ENTITY_TYPE]: "realtime-stream",
+      [SemanticInternalAttributes.ENTITY_ID]: `${runId}:${key}`,
+      [SemanticInternalAttributes.ENTITY_METADATA]: JSON.stringify({
+        startIndex: options?.startIndex,
+      }),
+      [SemanticInternalAttributes.STYLE_ICON]: "streams",
+      ...accessoryAttributes({
+        items: [
+          {
+            text: key,
+            variant: "normal",
+          },
+        ],
+        style: "codepath",
+      }),
+    },
+  });
+
+  return await apiClient.fetchStream(runId, key, {
+    signal: options?.signal,
+    timeoutInSeconds: options?.timeoutInSeconds ?? 60,
+    lastEventId: options?.startIndex ? (options.startIndex - 1).toString() : undefined,
+    onComplete: () => {
+      span.end();
+    },
+    onError: (error) => {
+      span.recordException(error);
+      span.setStatus({ code: SpanStatusCode.ERROR });
+      span.end();
+    },
+  });
+}
+
+function append<TPart extends BodyInit>(value: TPart, options?: AppendStreamOptions): Promise<void>;
+function append<TPart extends BodyInit>(
+  key: string,
+  value: TPart,
+  options?: AppendStreamOptions
+): Promise<void>;
+function append<TPart extends BodyInit>(
+  keyOrValue: string | TPart,
+  valueOrOptions?: TPart | AppendStreamOptions,
+  options?: AppendStreamOptions
+): Promise<void> {
+  if (typeof keyOrValue === "string" && typeof valueOrOptions === "string") {
+    return appendInternal(keyOrValue, valueOrOptions, options);
+  }
+
+  if (typeof keyOrValue === "string") {
+    if (isAppendStreamOptions(valueOrOptions)) {
+      return appendInternal(DEFAULT_STREAM_KEY, keyOrValue, valueOrOptions);
+    } else {
+      if (!valueOrOptions) {
+        return appendInternal(DEFAULT_STREAM_KEY, keyOrValue, options);
+      }
+
+      return appendInternal(keyOrValue, valueOrOptions, options);
+    }
+  } else {
+    if (isAppendStreamOptions(valueOrOptions)) {
+      return appendInternal(DEFAULT_STREAM_KEY, keyOrValue, valueOrOptions);
+    } else {
+      return appendInternal(DEFAULT_STREAM_KEY, keyOrValue, options);
+    }
+  }
+}
+
+async function appendInternal<TPart extends BodyInit>(
+  key: string,
+  part: TPart,
+  options?: AppendStreamOptions
+): Promise<void> {
+  const runId = getRunIdForOptions(options);
+
+  if (!runId) {
+    throw new Error(
+      "Could not determine the target run ID for the realtime stream. Please specify a target run ID using the `target` option or use this function from inside a task."
+    );
+  }
+
+  const span = tracer.startSpan("streams.append()", {
+    attributes: {
+      key,
+      runId,
+      [SemanticInternalAttributes.ENTITY_TYPE]: "realtime-stream",
+      [SemanticInternalAttributes.ENTITY_ID]: `${runId}:${key}`,
+      [SemanticInternalAttributes.STYLE_ICON]: "streams",
+      ...accessoryAttributes({
+        items: [
+          {
+            text: key,
+            variant: "normal",
+          },
+        ],
+        style: "codepath",
+      }),
+    },
+  });
+
+  try {
+    await realtimeStreams.append(key, part, options);
+    span.end();
+  } catch (error) {
+    // if the error is a signal abort error, we need to end the span but not record an exception
+    if (error instanceof Error && error.name === "AbortError") {
+      span.end();
+      throw error;
+    }
+
+    if (error instanceof Error || typeof error === "string") {
+      span.recordException(error);
+    } else {
+      span.recordException(String(error));
+    }
+
+    span.setStatus({ code: SpanStatusCode.ERROR });
+    span.end();
+
+    throw error;
+  }
+}
+
+function isAppendStreamOptions(val: unknown): val is AppendStreamOptions {
+  return (
+    typeof val === "object" &&
+    val !== null &&
+    !Array.isArray(val) &&
+    (("target" in val && typeof val.target === "string") ||
+      ("requestOptions" in val && typeof val.requestOptions === "object"))
+  );
+}
+
+/**
+ * Writes data to a realtime stream using the default stream key (`"default"`).
+ *
+ * This is a convenience overload that allows you to write to the default stream without
+ * specifying a stream key. The stream will be created/accessed with the key `"default"`.
+ *
+ * @template TPart - The type of data chunks in the stream
+ * @param options - The options for writing to the stream
+ * @returns A promise that resolves to an object containing:
+ *   - `stream`: The original stream (can be consumed in your task)
+ *   - `waitUntilComplete`: A function that returns a promise resolving when the stream is fully sent
+ *
+ * @example
+ * ```ts
+ * import { streams } from "@trigger.dev/sdk";
+ *
+ * // Write to the default stream
+ * const { waitUntilComplete } = await streams.writer({
+ *   execute: ({ write, merge }) => {
+ *     write("chunk 1");
+ *     write("chunk 2");
+ *     write("chunk 3");
+ *   },
+ * });
+ *
+ * // Wait for all chunks to be written
+ * await waitUntilComplete();
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Write to a specific stream key
+ * const { waitUntilComplete } = await streams.writer("my-custom-stream", {
+ *   execute: ({ write, merge }) => {
+ *     write("chunk 1");
+ *     write("chunk 2");
+ *     write("chunk 3");
+ *   },
+ * });
+ *
+ * // Wait for all chunks to be written
+ * await waitUntilComplete();
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Write to a parent run
+ * await streams.writer("output", {
+ *   execute: ({ write, merge }) => {
+ *     write("chunk 1");
+ *     write("chunk 2");
+ *     write("chunk 3");
+ *   },
+ * });
+ *
+ * // Wait for all chunks to be written
+ * await waitUntilComplete();
+ * ```
+ *
+ * @example
+ * ```ts
+ * // Write to a specific stream key
+ * await streams.writer("my-custom-stream", {
+ *   execute: ({ write, merge }) => {
+ *     write("chunk 1");
+ *     write("chunk 2");
+ *     write("chunk 3");
+ *   },
+ * });
+ *
+ * // Wait for all chunks to be written
+ * await waitUntilComplete();
+ * ```
+ */
+function writer<TPart>(options: WriterStreamOptions<TPart>): PipeStreamResult<TPart>;
+/**
+ * Writes data to a realtime stream with a specific stream key.
+ *
+ * @template TPart - The type of data chunks in the stream
+ * @param key - The unique identifier of the stream to write to. Defaults to `"default"` if not provided.
+ * @param options - The options for writing to the stream
+ * @returns A promise that resolves to an object containing:
+ *   - `stream`: The original stream (can be consumed in your task)
+ *   - `waitUntilComplete`: A function that returns a promise resolving when the stream is fully sent
+ *
+ * @example
+ * ```ts
+ * import { streams } from "@trigger.dev/sdk";
+ *
+ * // Write to a specific stream key
+ * const { waitUntilComplete } = await streams.writer("my-custom-stream", {
+ *   execute: ({ write, merge }) => {
+ *     write("chunk 1");
+ *     write("chunk 2");
+ *     write("chunk 3");
+ *   },
+ * });
+ *
+ * // Wait for all chunks to be written
+ * await waitUntilComplete();
+ * ```
+ */
+function writer<TPart>(key: string, options: WriterStreamOptions<TPart>): PipeStreamResult<TPart>;
+function writer<TPart>(
+  keyOrOptions: string | WriterStreamOptions<TPart>,
+  valueOrOptions?: WriterStreamOptions<TPart>
+): PipeStreamResult<TPart> {
+  if (typeof keyOrOptions === "string") {
+    return writerInternal(keyOrOptions, valueOrOptions!);
+  }
+
+  return writerInternal(DEFAULT_STREAM_KEY, keyOrOptions);
+}
+
+function writerInternal<TPart>(key: string, options: WriterStreamOptions<TPart>) {
+  let controller!: ReadableStreamDefaultController<TPart>;
+
+  const ongoingStreamPromises: Promise<void>[] = [];
+
+  const stream = new ReadableStream({
+    start(controllerArg) {
+      controller = controllerArg;
+    },
+  });
+
+  function safeEnqueue(data: TPart) {
+    try {
+      controller.enqueue(data);
+    } catch (error) {
+      // suppress errors when the stream has been closed
+    }
+  }
+
+  try {
+    const result = options.execute({
+      write(part) {
+        safeEnqueue(part);
+      },
+      merge(streamArg) {
+        ongoingStreamPromises.push(
+          (async () => {
+            const reader = streamArg.getReader();
+            while (true) {
+              const { done, value } = await reader.read();
+              if (done) break;
+              safeEnqueue(value);
+            }
+          })().catch((error) => {
+            console.error(error);
+          })
+        );
+      },
+    });
+
+    if (result) {
+      ongoingStreamPromises.push(
+        result.catch((error) => {
+          console.error(error);
+        })
+      );
+    }
+  } catch (error) {
+    console.error(error);
+  }
+
+  const waitForStreams: Promise<void> = new Promise((resolve, reject) => {
+    (async () => {
+      while (ongoingStreamPromises.length > 0) {
+        await ongoingStreamPromises.shift();
+      }
+      resolve();
+    })().catch(reject);
+  });
+
+  waitForStreams.finally(() => {
+    try {
+      controller.close();
+    } catch (error) {
+      // suppress errors when the stream has been closed
+    }
+  });
+
+  return pipeInternal(key, stream, options, "streams.writer()");
+}
+
+export type RealtimeDefineStreamOptions = {
+  id: string;
+};
+
+function define<TPart>(opts: RealtimeDefineStreamOptions): RealtimeDefinedStream<TPart> {
+  return {
+    id: opts.id,
+    pipe(value, options) {
+      return pipe(opts.id, value, options);
+    },
+    read(runId, options) {
+      return read(runId, opts.id, options);
+    },
+    append(value, options) {
+      return append(opts.id, value as BodyInit, options);
+    },
+    writer(options) {
+      return writer(opts.id, options);
+    },
+  };
+}
+
+export type { InferStreamType };
+
+export const streams = {
+  pipe,
+  read,
+  append,
+  writer,
+  define,
+};
+
+function getRunIdForOptions(options?: RealtimeStreamOperationOptions): string | undefined {
+  if (options?.target) {
+    if (options.target === "parent") {
+      return taskContext.ctx?.run?.parentTaskRunId ?? taskContext.ctx?.run?.id;
+    }
+
+    if (options.target === "root") {
+      return taskContext.ctx?.run?.rootTaskRunId ?? taskContext.ctx?.run?.id;
+    }
+
+    if (options.target === "self") {
+      return taskContext.ctx?.run?.id;
+    }
+
+    return options.target;
+  }
+
+  return taskContext.ctx?.run?.id;
+}
diff --git a/packages/trigger-sdk/src/v3/tasks.ts b/packages/trigger-sdk/src/v3/tasks.ts
index 71cb6acd5b6..75b7e85e625 100644
--- a/packages/trigger-sdk/src/v3/tasks.ts
+++ b/packages/trigger-sdk/src/v3/tasks.ts
@@ -1,5 +1,6 @@
 import {
   onStart,
+  onStartAttempt,
   onFailure,
   onSuccess,
   onComplete,
@@ -18,7 +19,6 @@ import {
   createToolTask,
   SubtaskUnwrapError,
   trigger,
-  triggerAndPoll,
   triggerAndWait,
 } from "./shared.js";
 
@@ -39,6 +39,10 @@ import type {
   TriggerOptions,
   TaskRunResult,
   TaskFromIdentifier,
+  TaskWithSchemaOptions,
+  TaskSchema,
+  TaskWithSchema,
+  TaskOptionsWithSchema,
 } from "./shared.js";
 
 export type {
@@ -56,6 +60,10 @@ export type {
   TriggerOptions,
   TaskRunResult,
   TaskFromIdentifier,
+  TaskWithSchemaOptions,
+  TaskSchema,
+  TaskWithSchema,
+  TaskOptionsWithSchema,
 };
 
 export type * from "./hooks.js";
@@ -86,11 +94,12 @@ export const toolTask = createToolTask;
 
 export const tasks = {
   trigger,
-  triggerAndPoll,
   batchTrigger,
   triggerAndWait,
   batchTriggerAndWait,
+  /** @deprecated Use onStartAttempt instead */
   onStart,
+  onStartAttempt,
   onFailure,
   onSuccess,
   onComplete,
diff --git a/packages/trigger-sdk/src/v3/usage.ts b/packages/trigger-sdk/src/v3/usage.ts
index 9dda9845fce..503abb9be52 100644
--- a/packages/trigger-sdk/src/v3/usage.ts
+++ b/packages/trigger-sdk/src/v3/usage.ts
@@ -54,6 +54,7 @@ export const usage = {
    */
   getCurrent: (): CurrentUsage => {
     const sample = usageApi.sample();
+    const initialState = usageApi.getInitialState();
     const machine = taskContext.ctx?.machine;
     const run = taskContext.ctx?.run;
 
@@ -65,12 +66,12 @@ export const usage = {
             durationMs: 0,
           },
           total: {
-            costInCents: run?.costInCents ?? 0,
-            durationMs: run?.durationMs ?? 0,
+            costInCents: initialState.costInCents,
+            durationMs: initialState.cpuTime,
           },
         },
         baseCostInCents: run?.baseCostInCents ?? 0,
-        totalCostInCents: (run?.costInCents ?? 0) + (run?.baseCostInCents ?? 0),
+        totalCostInCents: initialState.costInCents + (run?.baseCostInCents ?? 0),
       };
     }
 
@@ -83,12 +84,12 @@ export const usage = {
           durationMs: sample.cpuTime,
         },
         total: {
-          costInCents: (run?.costInCents ?? 0) + currentCostInCents,
-          durationMs: (run?.durationMs ?? 0) + sample.cpuTime,
+          costInCents: currentCostInCents + initialState.costInCents,
+          durationMs: sample.cpuTime + initialState.cpuTime,
         },
       },
       baseCostInCents: run?.baseCostInCents ?? 0,
-      totalCostInCents: (run?.costInCents ?? 0) + currentCostInCents + (run?.baseCostInCents ?? 0),
+      totalCostInCents: currentCostInCents + (run?.baseCostInCents ?? 0) + initialState.costInCents,
     };
   },
   /**
diff --git a/packages/trigger-sdk/vitest.config.ts b/packages/trigger-sdk/vitest.config.ts
new file mode 100644
index 00000000000..8387992eaae
--- /dev/null
+++ b/packages/trigger-sdk/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    include: ["test/**/*.test.ts", "src/v3/**/*.test.ts"],
+    globals: true,
+  },
+});
+
diff --git a/patches/@sentry__remix@9.46.0.patch b/patches/@sentry__remix@9.46.0.patch
new file mode 100644
index 00000000000..e30781631b4
--- /dev/null
+++ b/patches/@sentry__remix@9.46.0.patch
@@ -0,0 +1,39 @@
+diff --git a/build/cjs/vendor/instrumentation.js b/build/cjs/vendor/instrumentation.js
+index 84e18d1051f57d5807e65c8b8ce858ceee7d4557..640a5253d565650338fe33e0ea52c8dffc63e4e7 100644
+--- a/build/cjs/vendor/instrumentation.js
++++ b/build/cjs/vendor/instrumentation.js
+@@ -238,7 +238,7 @@ class RemixInstrumentation extends instrumentation.InstrumentationBase {
+     return function callRouteAction(original) {
+       return async function patchCallRouteAction( ...args) {
+         const [params] = args;
+-        const clonedRequest = params.request.clone();
++        const clonedRequest = params.request;
+         const span = plugin.tracer.startSpan(
+           `ACTION ${params.routeId}`,
+           { attributes: { [semanticConventions.SemanticAttributes.CODE_FUNCTION]: 'action' } },
+@@ -257,25 +257,6 @@ class RemixInstrumentation extends instrumentation.InstrumentationBase {
+               .then(async response => {
+                 addResponseAttributesToSpan(span, response);
+ 
+-                try {
+-                  const formData = await clonedRequest.formData();
+-                  const { actionFormDataAttributes: actionFormAttributes } = plugin.getConfig();
+-
+-                  formData.forEach((value, key) => {
+-                    if (
+-                      actionFormAttributes?.[key] &&
+-                      actionFormAttributes[key] !== false &&
+-                      typeof value === 'string'
+-                    ) {
+-                      const keyName = actionFormAttributes[key] === true ? key : actionFormAttributes[key];
+-                      span.setAttribute(`formData.${keyName}`, value.toString());
+-                    }
+-                  });
+-                } catch {
+-                  // Silently continue on any error. Typically happens because the action body cannot be processed
+-                  // into FormData, in which case we should just continue.
+-                }
+-
+                 return response;
+               })
+               .catch(async error => {
diff --git a/patches/@upstash__ratelimit.patch b/patches/@upstash__ratelimit.patch
new file mode 100644
index 00000000000..840984fbaa8
--- /dev/null
+++ b/patches/@upstash__ratelimit.patch
@@ -0,0 +1,26 @@
+diff --git a/dist/index.js b/dist/index.js
+index 7d1502426320957017988aed0c29974acd70e8da..062769cda055302d737503e5d1ba5e62609c934f 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -841,7 +841,7 @@ var tokenBucketLimitScript = `
+     refilledAt = refilledAt + numRefills * interval
+   end
+ 
+-  if tokens == 0 then
++  if tokens < incrementBy then
+     return {-1, refilledAt + interval}
+   end
+ 
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 25a2c888be27b7c5aff41de63d5df189e0031145..53b4a4b2d2ef55f709f7404cc6a66058b7f3191a 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -813,7 +813,7 @@ var tokenBucketLimitScript = `
+     refilledAt = refilledAt + numRefills * interval
+   end
+ 
+-  if tokens == 0 then
++  if tokens < incrementBy then
+     return {-1, refilledAt + interval}
+   end
+ 
diff --git a/patches/antlr4ts@0.5.0-alpha.4.patch b/patches/antlr4ts@0.5.0-alpha.4.patch
new file mode 100644
index 00000000000..388a1e03578
--- /dev/null
+++ b/patches/antlr4ts@0.5.0-alpha.4.patch
@@ -0,0 +1,470 @@
+diff --git a/ANTLRInputStream.js b/ANTLRInputStream.js
+index eaeb0800e83d2a4bd21699ff5fc8b0bb8920efbb..ed6c85c047d1ead64653e212d579967536dca664 100644
+--- a/ANTLRInputStream.js
++++ b/ANTLRInputStream.js
+@@ -43,7 +43,7 @@ class ANTLRInputStream {
+     }
+     consume() {
+         if (this.p >= this.n) {
+-            assert(this.LA(1) === IntStream_1.IntStream.EOF);
++            assert.ok(this.LA(1) === IntStream_1.IntStream.EOF);
+             throw new Error("cannot consume EOF");
+         }
+         //System.out.println("prev p="+p+", c="+(char)data[p]);
+diff --git a/BufferedTokenStream.js b/BufferedTokenStream.js
+index 9a3c6d19bf959819d96552d73267f93985a6fd67..11511d985b9b2b7dd0b140579032a0929d0a4342 100644
+--- a/BufferedTokenStream.js
++++ b/BufferedTokenStream.js
+@@ -126,7 +126,7 @@ let BufferedTokenStream = class BufferedTokenStream {
+      * @see #get(int i)
+      */
+     sync(i) {
+-        assert(i >= 0);
++        assert.ok(i >= 0);
+         let n = i - this.tokens.length + 1; // how many more elements we need?
+         //System.out.println("sync("+i+") needs "+n);
+         if (n > 0) {
+@@ -251,7 +251,7 @@ let BufferedTokenStream = class BufferedTokenStream {
+     getTokens(start, stop, types) {
+         this.lazyInit();
+         if (start === undefined) {
+-            assert(stop === undefined && types === undefined);
++            assert.ok(stop === undefined && types === undefined);
+             return this.tokens;
+         }
+         else if (stop === undefined) {
+diff --git a/CodePointBuffer.js b/CodePointBuffer.js
+index 7d50d372da9a1ccae48f55dd6e5ee388f583ace1..f6452956227847a4e2477c8eb1017e56ec9a58d1 100644
+--- a/CodePointBuffer.js
++++ b/CodePointBuffer.js
+@@ -109,7 +109,7 @@ exports.CodePointBuffer = CodePointBuffer;
+             }
+         }
+         appendArrayByte(utf16In) {
+-            assert(this.prevHighSurrogate === -1);
++            assert.ok(this.prevHighSurrogate === -1);
+             let input = utf16In;
+             let inOffset = 0;
+             let inLimit = utf16In.length;
+@@ -140,7 +140,7 @@ exports.CodePointBuffer = CodePointBuffer;
+             this.position = outOffset;
+         }
+         appendArrayChar(utf16In) {
+-            assert(this.prevHighSurrogate === -1);
++            assert.ok(this.prevHighSurrogate === -1);
+             let input = utf16In;
+             let inOffset = 0;
+             let inLimit = utf16In.length;
+diff --git a/CodePointCharStream.js b/CodePointCharStream.js
+index 4c5398f24afdd378b36053391611404018925f71..e507525f0976219da6eae78136625b8b5a42db67 100644
+--- a/CodePointCharStream.js
++++ b/CodePointCharStream.js
+@@ -28,7 +28,7 @@ class CodePointCharStream {
+     // construct instances of this type.
+     constructor(array, position, remaining, name) {
+         // TODO
+-        assert(position === 0);
++        assert.ok(position === 0);
+         this._array = array;
+         this._size = remaining;
+         this._name = name;
+@@ -55,7 +55,7 @@ class CodePointCharStream {
+     }
+     consume() {
+         if (this._size - this._position === 0) {
+-            assert(this.LA(1) === IntStream_1.IntStream.EOF);
++            assert.ok(this.LA(1) === IntStream_1.IntStream.EOF);
+             throw new RangeError("cannot consume EOF");
+         }
+         this._position++;
+diff --git a/atn/ATN.js b/atn/ATN.js
+index 0da2b8e836510546583685253ec828dbdaa0c1db..4d812a850b6b010576396e6e610f6df25cb585c9 100644
+--- a/atn/ATN.js
++++ b/atn/ATN.js
+@@ -63,7 +63,7 @@ let ATN = class ATN {
+         return PredictionContext_1.PredictionContext.getCachedContext(context, this.contextCache, new PredictionContext_1.PredictionContext.IdentityHashMap());
+     }
+     getDecisionToDFA() {
+-        assert(this.decisionToDFA != null && this.decisionToDFA.length === this.decisionToState.length);
++        assert.ok(this.decisionToDFA != null && this.decisionToDFA.length === this.decisionToState.length);
+         return this.decisionToDFA;
+     }
+     nextTokens(s, ctx) {
+diff --git a/atn/ATNConfig.js b/atn/ATNConfig.js
+index 480d569b667f29437aeef8f2b9e6b0d3187c565f..bcacbc91ea61488f4b8e2ef40960c4f25a168758 100644
+--- a/atn/ATNConfig.js
++++ b/atn/ATNConfig.js
+@@ -61,7 +61,7 @@ const SUPPRESS_PRECEDENCE_FILTER = 0x80000000;
+ let ATNConfig = class ATNConfig {
+     constructor(state, altOrConfig, context) {
+         if (typeof altOrConfig === "number") {
+-            assert((altOrConfig & 0xFFFFFF) === altOrConfig);
++            assert.ok((altOrConfig & 0xFFFFFF) === altOrConfig);
+             this._state = state;
+             this.altAndOuterContextDepth = altOrConfig;
+             this._context = context;
+@@ -120,7 +120,7 @@ let ATNConfig = class ATNConfig {
+         return (this.altAndOuterContextDepth >>> 24) & 0x7F;
+     }
+     set outerContextDepth(outerContextDepth) {
+-        assert(outerContextDepth >= 0);
++        assert.ok(outerContextDepth >= 0);
+         // saturate at 0x7F - everything but zero/positive is only used for debug information anyway
+         outerContextDepth = Math.min(outerContextDepth, 0x7F);
+         this.altAndOuterContextDepth = ((outerContextDepth << 24) | (this.altAndOuterContextDepth & ~0x7F000000) >>> 0);
+diff --git a/atn/ATNConfigSet.js b/atn/ATNConfigSet.js
+index 3ce0361c4ce7fef06b07a9a24c23251fd31dc0d1..f92be1dbeeed37a69b2aa3022ac5a7b7b29040f1 100644
+--- a/atn/ATNConfigSet.js
++++ b/atn/ATNConfigSet.js
+@@ -125,7 +125,7 @@ class ATNConfigSet {
+         if (this.outermostConfigSet && !outermostConfigSet) {
+             throw new Error("IllegalStateException");
+         }
+-        assert(!outermostConfigSet || !this._dipsIntoOuterContext);
++        assert.ok(!outermostConfigSet || !this._dipsIntoOuterContext);
+         this.outermostConfigSet = outermostConfigSet;
+     }
+     getStates() {
+@@ -193,7 +193,7 @@ class ATNConfigSet {
+         if (!this.mergedConfigs || !this.unmerged) {
+             throw new Error("Covered by ensureWritable but duplicated here for strict null check limitation");
+         }
+-        assert(!this.outermostConfigSet || !e.reachesIntoOuterContext);
++        assert.ok(!this.outermostConfigSet || !e.reachesIntoOuterContext);
+         if (contextCache == null) {
+             contextCache = PredictionContextCache_1.PredictionContextCache.UNCACHED;
+         }
+@@ -247,7 +247,7 @@ class ATNConfigSet {
+     updatePropertiesForMergedConfig(config) {
+         // merged configs can't change the alt or semantic context
+         this._dipsIntoOuterContext = this._dipsIntoOuterContext || config.reachesIntoOuterContext;
+-        assert(!this.outermostConfigSet || !this._dipsIntoOuterContext);
++        assert.ok(!this.outermostConfigSet || !this._dipsIntoOuterContext);
+     }
+     updatePropertiesForAddedConfig(config) {
+         if (this.configs.length === 1) {
+@@ -258,7 +258,7 @@ class ATNConfigSet {
+         }
+         this._hasSemanticContext = this._hasSemanticContext || !SemanticContext_1.SemanticContext.NONE.equals(config.semanticContext);
+         this._dipsIntoOuterContext = this._dipsIntoOuterContext || config.reachesIntoOuterContext;
+-        assert(!this.outermostConfigSet || !this._dipsIntoOuterContext);
++        assert.ok(!this.outermostConfigSet || !this._dipsIntoOuterContext);
+     }
+     canMerge(left, leftKey, right) {
+         if (left.state.stateNumber !== right.state.stateNumber) {
+diff --git a/atn/LexerATNSimulator.js b/atn/LexerATNSimulator.js
+index d461d2063dddc78bbb15e56e5ae2559aadd3320d..c92994d52e226965e47a7e1fb28e8100252b289b 100644
+--- a/atn/LexerATNSimulator.js
++++ b/atn/LexerATNSimulator.js
+@@ -258,7 +258,7 @@ let LexerATNSimulator = class LexerATNSimulator extends ATNSimulator_1.ATNSimula
+                         config = c.transform(target, true, lexerActionExecutor);
+                     }
+                     else {
+-                        assert(c.lexerActionExecutor == null);
++                        assert.ok(c.lexerActionExecutor == null);
+                         config = c.transform(target, true);
+                     }
+                     let treatEofAsEpsilon = t === IntStream_1.IntStream.EOF;
+@@ -543,7 +543,7 @@ let LexerATNSimulator = class LexerATNSimulator extends ATNSimulator_1.ATNSimula
+         /* the lexer evaluates predicates on-the-fly; by this point configs
+          * should not contain any configurations with unevaluated predicates.
+          */
+-        assert(!configs.hasSemanticContext);
++        assert.ok(!configs.hasSemanticContext);
+         let proposed = new DFAState_1.DFAState(configs);
+         let existing = this.atn.modeToDFA[this.mode].states.get(proposed);
+         if (existing != null) {
+diff --git a/atn/ParserATNSimulator.js b/atn/ParserATNSimulator.js
+index c36395116d11c431b9f9ea5fea8afbc458bd0b50..0093ac18c7e31fe15bc0596e4f0886b199f41596 100644
+--- a/atn/ParserATNSimulator.js
++++ b/atn/ParserATNSimulator.js
+@@ -307,7 +307,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+             useContext = false;
+         }
+         let dfa = this.atn.decisionToDFA[decision];
+-        assert(dfa != null);
++        assert.ok(dfa != null);
+         if (this.optimize_ll1 && !dfa.isPrecedenceDfa && !dfa.isEmpty) {
+             let ll_1 = input.LA(1);
+             if (ll_1 >= 0 && ll_1 <= 0xFFFF) {
+@@ -381,7 +381,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+             return undefined;
+         }
+         let remainingContext = outerContext;
+-        assert(outerContext != null);
++        assert.ok(outerContext != null);
+         let s0;
+         if (dfa.isPrecedenceDfa) {
+             s0 = dfa.getPrecedenceStartState(this._parser.precedence, true);
+@@ -393,7 +393,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+             remainingContext = this.skipTailCalls(remainingContext);
+             s0 = s0.getContextTarget(this.getReturnState(remainingContext));
+             if (remainingContext.isEmpty) {
+-                assert(s0 == null || !s0.isContextSensitive);
++                assert.ok(s0 == null || !s0.isContextSensitive);
+             }
+             else {
+                 remainingContext = remainingContext.parent;
+@@ -433,7 +433,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                         let initialState = new SimulatorState_1.SimulatorState(state.outerContext, s, state.useContext, remainingOuterContext);
+                         return this.execATN(dfa, input, startIndex, initialState);
+                     }
+-                    assert(remainingOuterContext != null);
++                    assert.ok(remainingOuterContext != null);
+                     remainingOuterContext = remainingOuterContext.parent;
+                     s = next;
+                 }
+@@ -456,7 +456,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                 break;
+             }
+             // t is not updated if one of these states is reached
+-            assert(!this.isAcceptState(s, state.useContext));
++            assert.ok(!this.isAcceptState(s, state.useContext));
+             // if no edge, pop over to ATN interpreter, update DFA and return
+             let target = this.getExistingTargetState(s, t);
+             if (target == null) {
+@@ -508,7 +508,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                     //}
+                 }
+                 else {
+-                    assert(!state.useContext);
++                    assert.ok(!state.useContext);
+                     // Before attempting full context prediction, check to see if there are
+                     // disambiguating or validating predicates to evaluate which allow an
+                     // immediate decision
+@@ -664,9 +664,9 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+             }
+             let D = nextState.s0;
+             // predicted alt => accept state
+-            assert(D.isAcceptState || D.prediction === ATN_1.ATN.INVALID_ALT_NUMBER);
++            assert.ok(D.isAcceptState || D.prediction === ATN_1.ATN.INVALID_ALT_NUMBER);
+             // conflicted => accept state
+-            assert(D.isAcceptState || D.configs.conflictInfo == null);
++            assert.ok(D.isAcceptState || D.configs.conflictInfo == null);
+             if (this.isAcceptState(D, useContext)) {
+                 let conflictingAlts = D.configs.conflictingAlts;
+                 let predictedAlt = conflictingAlts == null ? D.prediction : ATN_1.ATN.INVALID_ALT_NUMBER;
+@@ -731,8 +731,8 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                     return predictedAlt;
+                 }
+                 else {
+-                    assert(!useContext);
+-                    assert(this.isAcceptState(D, false));
++                    assert.ok(!useContext);
++                    assert.ok(this.isAcceptState(D, false));
+                     if (ParserATNSimulator.debug) {
+                         console.log("RETRY with outerContext=" + outerContext);
+                     }
+@@ -877,12 +877,12 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                 if (next == null) {
+                     break;
+                 }
+-                assert(remainingGlobalContext != null);
++                assert.ok(remainingGlobalContext != null);
+                 remainingGlobalContext = remainingGlobalContext.parent;
+                 s = next;
+             }
+         }
+-        assert(!this.isAcceptState(s, useContext));
++        assert.ok(!this.isAcceptState(s, useContext));
+         if (this.isAcceptState(s, useContext)) {
+             return new SimulatorState_1.SimulatorState(previous.outerContext, s, useContext, remainingGlobalContext);
+         }
+@@ -896,7 +896,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+         if (target === ATNSimulator_1.ATNSimulator.ERROR) {
+             return undefined;
+         }
+-        assert(!useContext || !target.configs.dipsIntoOuterContext);
++        assert.ok(!useContext || !target.configs.dipsIntoOuterContext);
+         return new SimulatorState_1.SimulatorState(previous.outerContext, target, useContext, remainingGlobalContext);
+     }
+     /**
+@@ -955,7 +955,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                     console.log("testing " + this.getTokenName(t) + " at " + c.toString());
+                 }
+                 if (c.state instanceof RuleStopState_1.RuleStopState) {
+-                    assert(c.context.isEmpty);
++                    assert.ok(c.context.isEmpty);
+                     if (useContext && !c.reachesIntoOuterContext || t === IntStream_1.IntStream.EOF) {
+                         if (skippedStopStates == null) {
+                             skippedStopStates = [];
+@@ -1018,7 +1018,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+              * multiple alternatives are viable.
+              */
+             if (skippedStopStates != null && (!useContext || !PredictionMode_1.PredictionMode.hasConfigInRuleStopState(reach))) {
+-                assert(skippedStopStates.length > 0);
++                assert.ok(skippedStopStates.length > 0);
+                 for (let c of skippedStopStates) {
+                     reach.add(c, contextCache);
+                 }
+@@ -1382,7 +1382,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+         for (let i = 1; i < altToPred.length; i++) {
+             let pred = altToPred[i];
+             // unpredicated is indicated by SemanticContext.NONE
+-            assert(pred != null);
++            assert.ok(pred != null);
+             // find first unpredicated but ambig alternative, if any.
+             // Only ambiguous alternatives will have SemanticContext.NONE.
+             // Any unambig alts or ambig naked alts after first ambig naked are ignored
+@@ -1497,7 +1497,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                     // Make sure we track that we are now out of context.
+                     c.outerContextDepth = config.outerContextDepth;
+                     c.isPrecedenceFilterSuppressed = config.isPrecedenceFilterSuppressed;
+-                    assert(depth > MIN_INTEGER_VALUE);
++                    assert.ok(depth > MIN_INTEGER_VALUE);
+                     this.closureImpl(c, configs, intermediate, closureBusy, collectPredicates, hasMoreContexts, contextCache, depth - 1, treatEofAsEpsilon);
+                 }
+                 if (!hasEmpty || !hasMoreContexts) {
+@@ -1587,7 +1587,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                         // avoid infinite recursion for right-recursive rules
+                         continue;
+                     }
+-                    assert(newDepth > MIN_INTEGER_VALUE);
++                    assert.ok(newDepth > MIN_INTEGER_VALUE);
+                     newDepth--;
+                     if (ParserATNSimulator.debug) {
+                         console.log("dips into outer ctx: " + c);
+@@ -1595,7 +1595,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                 }
+                 else if (t instanceof RuleTransition_1.RuleTransition) {
+                     if (this.optimize_tail_calls && t.optimizedTailCall && (!this.tail_call_preserves_sll || !PredictionContext_1.PredictionContext.isEmptyLocal(config.context))) {
+-                        assert(c.context === config.context);
++                        assert.ok(c.context === config.context);
+                         if (newDepth === 0) {
+                             // the pop/push of a tail call would keep the depth
+                             // constant, except we latch if it goes negative
+@@ -1926,7 +1926,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+         return false;
+     }
+     addDFAEdge(dfa, fromState, t, contextTransitions, toConfigs, contextCache) {
+-        assert(contextTransitions == null || contextTransitions.isEmpty || dfa.isContextSensitive);
++        assert.ok(contextTransitions == null || contextTransitions.isEmpty || dfa.isContextSensitive);
+         let from = fromState;
+         let to = this.addDFAState(dfa, toConfigs, contextCache);
+         if (contextTransitions != null) {
+@@ -1944,7 +1944,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+                     continue;
+                 }
+                 next = this.addDFAContextState(dfa, from.configs, context, contextCache);
+-                assert(context !== PredictionContext_1.PredictionContext.EMPTY_FULL_STATE_KEY || next.configs.isOutermostConfigSet);
++                assert.ok(context !== PredictionContext_1.PredictionContext.EMPTY_FULL_STATE_KEY || next.configs.isOutermostConfigSet);
+                 from.setContextTarget(context, next);
+                 from = next;
+             }
+@@ -1973,7 +1973,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+             return this.addDFAState(dfa, contextConfigs, contextCache);
+         }
+         else {
+-            assert(!configs.isOutermostConfigSet, "Shouldn't be adding a duplicate edge.");
++            assert.ok(!configs.isOutermostConfigSet, "Shouldn't be adding a duplicate edge.");
+             configs = configs.clone(true);
+             configs.isOutermostConfigSet = true;
+             return this.addDFAState(dfa, configs, contextCache);
+@@ -2081,7 +2081,7 @@ let ParserATNSimulator = class ParserATNSimulator extends ATNSimulator_1.ATNSimu
+         }
+         while (!context.isEmpty) {
+             let state = this.atn.states[context.invokingState];
+-            assert(state.numberOfTransitions === 1 && state.transition(0).serializationType === 3 /* RULE */);
++            assert.ok(state.numberOfTransitions === 1 && state.transition(0).serializationType === 3 /* RULE */);
+             let transition = state.transition(0);
+             if (!transition.tailCall) {
+                 break;
+diff --git a/atn/PredictionContext.js b/atn/PredictionContext.js
+index 47d525fde0ca117193dd2b1cd2685420c23683d6..b269295802fc84b7cf7e1ce055cdba0a0c03ec53 100644
+--- a/atn/PredictionContext.js
++++ b/atn/PredictionContext.js
+@@ -118,7 +118,7 @@ class PredictionContext {
+                 leftIndex++;
+             }
+             else {
+-                assert(context1.getReturnState(rightIndex) < context0.getReturnState(leftIndex));
++                assert.ok(context1.getReturnState(rightIndex) < context0.getReturnState(leftIndex));
+                 parentsList[count] = context1.getParent(rightIndex);
+                 returnStatesList[count] = context1.getReturnState(rightIndex);
+                 canReturnLeft = false;
+@@ -374,8 +374,8 @@ __decorate([
+ let ArrayPredictionContext = class ArrayPredictionContext extends PredictionContext {
+     constructor(parents, returnStates, hashCode) {
+         super(hashCode || PredictionContext.calculateHashCode(parents, returnStates));
+-        assert(parents.length === returnStates.length);
+-        assert(returnStates.length > 1 || returnStates[0] !== PredictionContext.EMPTY_FULL_STATE_KEY, "Should be using PredictionContext.EMPTY instead.");
++        assert.ok(parents.length === returnStates.length);
++        assert.ok(returnStates.length > 1 || returnStates[0] !== PredictionContext.EMPTY_FULL_STATE_KEY, "Should be using PredictionContext.EMPTY instead.");
+         this.parents = parents;
+         this.returnStates = returnStates;
+     }
+@@ -458,7 +458,7 @@ let ArrayPredictionContext = class ArrayPredictionContext extends PredictionCont
+                     result = new SingletonPredictionContext(updatedParents[0], updatedReturnStates[0]);
+                 }
+                 else {
+-                    assert(updatedParents.length > 1);
++                    assert.ok(updatedParents.length > 1);
+                     result = new ArrayPredictionContext(updatedParents, updatedReturnStates);
+                 }
+                 if (context.hasEmpty) {
+@@ -569,16 +569,16 @@ ArrayPredictionContext = __decorate([
+ let SingletonPredictionContext = class SingletonPredictionContext extends PredictionContext {
+     constructor(parent, returnState) {
+         super(PredictionContext.calculateSingleHashCode(parent, returnState));
+-        // assert(returnState != PredictionContext.EMPTY_FULL_STATE_KEY && returnState != PredictionContext.EMPTY_LOCAL_STATE_KEY);
++        // assert.ok(returnState != PredictionContext.EMPTY_FULL_STATE_KEY && returnState != PredictionContext.EMPTY_LOCAL_STATE_KEY);
+         this.parent = parent;
+         this.returnState = returnState;
+     }
+     getParent(index) {
+-        // assert(index == 0);
++        // assert.ok(index == 0);
+         return this.parent;
+     }
+     getReturnState(index) {
+-        // assert(index == 0);
++        // assert.ok(index == 0);
+         return this.returnState;
+     }
+     findReturnState(returnState) {
+diff --git a/atn/PredictionContextCache.js b/atn/PredictionContextCache.js
+index d919815854f0519b2b602a316f93f702f06c9754..ecd697a2b7141ebf5c76198bb49088cff90c4d35 100644
+--- a/atn/PredictionContextCache.js
++++ b/atn/PredictionContextCache.js
+@@ -104,8 +104,8 @@ PredictionContextCache.UNCACHED = new PredictionContextCache(false);
+     PredictionContextCache.PredictionContextAndInt = PredictionContextAndInt;
+     class IdentityCommutativePredictionContextOperands {
+         constructor(x, y) {
+-            assert(x != null);
+-            assert(y != null);
++            assert.ok(x != null);
++            assert.ok(y != null);
+             this._x = x;
+             this._y = y;
+         }
+diff --git a/dfa/DFAState.js b/dfa/DFAState.js
+index dcdd796eef9a8046033b233d6cc2ca33b198cb9d..d7a095dcc5680d1af58e6e213ebaed98eae4c1b1 100644
+--- a/dfa/DFAState.js
++++ b/dfa/DFAState.js
+@@ -66,11 +66,11 @@ class DFAState {
+         return this.contextSymbols.get(symbol);
+     }
+     setContextSymbol(symbol) {
+-        assert(this.isContextSensitive);
++        assert.ok(this.isContextSensitive);
+         this.contextSymbols.set(symbol);
+     }
+     setContextSensitive(atn) {
+-        assert(!this.configs.isOutermostConfigSet);
++        assert.ok(!this.configs.isOutermostConfigSet);
+         if (this.isContextSensitive) {
+             return;
+         }
+diff --git a/misc/Array2DHashSet.js b/misc/Array2DHashSet.js
+index 5e9b5dca143df940562734ce158c532a48fed78d..3796235c05d771f985a3e6d5cd9f5f8116188a5f 100644
+--- a/misc/Array2DHashSet.js
++++ b/misc/Array2DHashSet.js
+@@ -153,7 +153,7 @@ class Array2DHashSet {
+                 newBucket.push(o);
+             }
+         }
+-        assert(this.n === oldSize);
++        assert.ok(this.n === oldSize);
+     }
+     add(t) {
+         let existing = this.getOrAdd(t);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f3a7c1dccb4..265bedaee9a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,30 +1,54 @@
-lockfileVersion: '6.0'
+lockfileVersion: '9.0'
 
 settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
 overrides:
+  typescript: 5.5.4
+  '@types/node': 20.14.14
   express@^4>body-parser: 1.20.3
   '@remix-run/dev@2.1.0>tar-fs': 2.1.3
   testcontainers@10.28.0>tar-fs: 3.0.9
+  form-data@^2: 2.5.4
+  form-data@^3: 3.0.4
+  form-data@^4: 4.0.4
+  ws: 8.17.1
+  semver: 5.7.2
   cross-spawn: 7.0.5
+  '@babel/runtime': 7.27.0
+  axios@1.9.0: '>=1.12.0'
+  js-yaml@>=3.0.0 <3.14.2: 3.14.2
+  js-yaml@>=4.0.0 <4.1.1: 4.1.1
+  jws@<3.2.3: 3.2.3
+  qs@>=6.0.0 <6.14.1: 6.14.1
+  systeminformation@>=5.0.0 <5.27.14: 5.27.14
+  lodash@>=4.0.0 <4.17.23: 4.17.23
 
 patchedDependencies:
   '@changesets/assemble-release-plan@5.2.4':
-    hash: 3wuhjtl4hjck4itk3w32z4cd5u
+    hash: a7a12643e8d89a00d5322f750c292e8567b5ee0fc9c613a238a1184c25533e4b
     path: patches/@changesets__assemble-release-plan@5.2.4.patch
   '@kubernetes/client-node@1.0.0':
-    hash: s75bgwaoixupmywtvgoy5ruszq
+    hash: ba1a06f46256cdb8d6faf7167246692c0de2e7cd846a9dc0f13be0137e1c3745
     path: patches/@kubernetes__client-node@1.0.0.patch
+  '@sentry/remix@9.46.0':
+    hash: 146126b032581925294aaed63ab53ce3f5e0356a755f1763d7a9a76b9846943b
+    path: patches/@sentry__remix@9.46.0.patch
+  '@upstash/ratelimit@1.1.3':
+    hash: e5922e50fbefb7b2b24950c4b1c5c9ddc4cd25464439c9548d2298c432debe74
+    path: patches/@upstash__ratelimit.patch
+  antlr4ts@0.5.0-alpha.4:
+    hash: b5d41129ddbf7c4cbb0288244b2c8d041ee0803c5102c1181c180408d3b579f4
+    path: patches/antlr4ts@0.5.0-alpha.4.patch
   engine.io-parser@5.2.2:
-    hash: e6nctogrhpxoivwiwy37ersfu4
+    hash: 9011e7e16547017450c9baec0fceff0e070310c20d9e62f8d1383bb1da77104f
     path: patches/engine.io-parser@5.2.2.patch
   graphile-worker@0.16.6:
-    hash: hdpetta7btqcc7xb5wfkcnanoa
+    hash: 798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1
     path: patches/graphile-worker@0.16.6.patch
   redlock@5.0.0-beta.2:
-    hash: rwyegdki7iserrd7fgjwxkhnlu
+    hash: 52b17ac642f5f9776bf05e2229f4dd79588d37b0039d835c7684c478464632f2
     path: patches/redlock@5.0.0-beta.2.patch
 
 importers:
@@ -36,10 +60,10 @@ importers:
         version: 2.26.2
       '@remix-run/changelog-github':
         specifier: ^0.0.5
-        version: 0.0.5
+        version: 0.0.5(encoding@0.1.13)
       node-fetch:
         specifier: 2.6.x
-        version: 2.6.7
+        version: 2.6.7(encoding@0.1.13)
     devDependencies:
       '@manypkg/cli':
         specifier: ^0.19.2
@@ -55,10 +79,10 @@ importers:
         version: 20.14.14
       '@vitest/coverage-v8':
         specifier: 3.1.4
-        version: 3.1.4(vitest@3.1.4)
+        version: 3.1.4(vitest@3.1.4(@types/debug@4.1.12)(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1))
       autoprefixer:
         specifier: ^10.4.12
-        version: 10.4.13(postcss@8.5.4)
+        version: 10.4.13(postcss@8.5.6)
       eslint-plugin-turbo:
         specifier: ^2.0.4
         version: 2.0.5(eslint@8.31.0)
@@ -81,14 +105,14 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
       vite:
-        specifier: ^4.1.1
-        version: 4.1.4(@types/node@20.14.14)
+        specifier: ^5.4.21
+        version: 5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
       vite-tsconfig-paths:
         specifier: ^4.0.5
         version: 4.0.5(typescript@5.5.4)
       vitest:
         specifier: 3.1.4
-        version: 3.1.4(@types/node@20.14.14)
+        version: 3.1.4(@types/debug@4.1.12)(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
 
   apps/coordinator:
     dependencies:
@@ -103,7 +127,7 @@ importers:
         version: 15.1.0
       socket.io:
         specifier: 4.7.4
-        version: 4.7.4
+        version: 4.7.4(bufferutil@4.0.9)
       tinyexec:
         specifier: ^0.3.0
         version: 0.3.0
@@ -141,7 +165,7 @@ importers:
     dependencies:
       '@kubernetes/client-node':
         specifier: ^0.20.0
-        version: 0.20.0
+        version: 0.20.0(bufferutil@4.0.9)
       '@trigger.dev/core':
         specifier: workspace:*
         version: link:../../packages/core
@@ -161,9 +185,12 @@ importers:
 
   apps/supervisor:
     dependencies:
+      '@aws-sdk/client-ecr':
+        specifier: ^3.839.0
+        version: 3.839.0
       '@kubernetes/client-node':
         specifier: ^1.0.0
-        version: 1.0.0(patch_hash=s75bgwaoixupmywtvgoy5ruszq)
+        version: 1.0.0(patch_hash=ba1a06f46256cdb8d6faf7167246692c0de2e7cd846a9dc0f13be0137e1c3745)(bufferutil@4.0.9)(encoding@0.1.13)
       '@trigger.dev/core':
         specifier: workspace:*
         version: link:../../packages/core
@@ -175,13 +202,13 @@ importers:
         version: 15.1.0
       socket.io:
         specifier: 4.7.4
-        version: 4.7.4
+        version: 4.7.4(bufferutil@4.0.9)
       std-env:
         specifier: ^3.8.0
         version: 3.8.1
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@types/dockerode':
         specifier: ^3.3.33
@@ -191,58 +218,73 @@ importers:
     dependencies:
       '@ai-sdk/openai':
         specifier: ^1.3.23
-        version: 1.3.23(zod@3.23.8)
+        version: 1.3.23(zod@3.25.76)
       '@ariakit/react':
         specifier: ^0.4.6
-        version: 0.4.6(react-dom@18.2.0)(react@18.2.0)
+        version: 0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@ariakit/react-core':
         specifier: ^0.4.6
-        version: 0.4.6(react-dom@18.2.0)(react@18.2.0)
+        version: 0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@aws-sdk/client-ecr':
-        specifier: ^3.839.0
-        version: 3.839.0
+        specifier: ^3.931.0
+        version: 3.931.0
+      '@aws-sdk/client-s3':
+        specifier: ^3.936.0
+        version: 3.940.0
       '@aws-sdk/client-sqs':
         specifier: ^3.445.0
         version: 3.454.0
       '@aws-sdk/client-sts':
         specifier: ^3.840.0
         version: 3.840.0
+      '@aws-sdk/credential-provider-node':
+        specifier: ^3.936.0
+        version: 3.940.0
+      '@aws-sdk/s3-presigned-post':
+        specifier: ^3.936.0
+        version: 3.940.0
+      '@aws-sdk/s3-request-presigner':
+        specifier: ^3.936.0
+        version: 3.940.0
       '@better-auth/utils':
         specifier: ^0.2.6
         version: 0.2.6
       '@codemirror/autocomplete':
-        specifier: ^6.3.1
-        version: 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.2.3)
+        specifier: 6.4.0
+        version: 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0)
       '@codemirror/commands':
-        specifier: ^6.1.2
+        specifier: 6.1.3
         version: 6.1.3
       '@codemirror/lang-javascript':
-        specifier: ^6.1.1
+        specifier: 6.1.2
         version: 6.1.2
       '@codemirror/lang-json':
-        specifier: ^6.0.1
+        specifier: 6.0.1
         version: 6.0.1
+      '@codemirror/lang-sql':
+        specifier: 6.5.5
+        version: 6.5.5(@codemirror/view@6.7.2)
       '@codemirror/language':
-        specifier: ^6.3.1
+        specifier: 6.3.2
         version: 6.3.2
       '@codemirror/lint':
-        specifier: ^6.4.2
+        specifier: 6.4.2
         version: 6.4.2
       '@codemirror/search':
-        specifier: ^6.2.3
+        specifier: 6.2.3
         version: 6.2.3
       '@codemirror/state':
-        specifier: ^6.1.3
+        specifier: 6.2.0
         version: 6.2.0
       '@codemirror/view':
-        specifier: ^6.5.0
+        specifier: 6.7.2
         version: 6.7.2
       '@conform-to/react':
         specifier: 0.9.2
         version: 0.9.2(react@18.2.0)
       '@conform-to/zod':
         specifier: 0.9.2
-        version: 0.9.2(@conform-to/dom@0.9.2)(zod@3.23.8)
+        version: 0.9.2(@conform-to/dom@0.9.2)(zod@3.25.76)
       '@depot/cli':
         specifier: 0.0.1-cli.2.80.0
         version: 0.0.1-cli.2.80.0
@@ -254,10 +296,13 @@ importers:
         version: 0.3.5(react@18.2.0)
       '@headlessui/react':
         specifier: ^1.7.8
-        version: 1.7.8(react-dom@18.2.0)(react@18.2.0)
+        version: 1.7.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@heroicons/react':
         specifier: ^2.0.12
         version: 2.0.13(react@18.2.0)
+      '@internal/cache':
+        specifier: workspace:*
+        version: link:../../internal-packages/cache
       '@internal/redis':
         specifier: workspace:*
         version: link:../../internal-packages/redis
@@ -270,6 +315,9 @@ importers:
       '@internal/tracing':
         specifier: workspace:*
         version: link:../../internal-packages/tracing
+      '@internal/tsql':
+        specifier: workspace:*
+        version: link:../../internal-packages/tsql
       '@internal/zod-worker':
         specifier: workspace:*
         version: link:../../internal-packages/zod-worker
@@ -278,7 +326,7 @@ importers:
         version: 3.5.1
       '@kapaai/react-sdk':
         specifier: ^0.1.3
-        version: 0.1.3(react-dom@18.2.0)(react@18.2.0)
+        version: 0.1.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@lezer/highlight':
         specifier: ^1.1.6
         version: 1.1.6
@@ -286,95 +334,104 @@ importers:
         specifier: 1.9.0
         version: 1.9.0
       '@opentelemetry/api-logs':
-        specifier: 0.52.1
-        version: 0.52.1
+        specifier: 0.203.0
+        version: 0.203.0
       '@opentelemetry/core':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-logs-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-metrics-otlp-proto':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-trace-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/host-metrics':
+        specifier: ^0.37.0
+        version: 0.37.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/instrumentation-aws-sdk':
+        specifier: ^0.57.0
+        version: 0.57.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation-express':
-        specifier: ^0.36.1
-        version: 0.36.1(@opentelemetry/api@1.9.0)
+        specifier: ^0.52.0
+        version: 0.52.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resource-detector-aws':
+        specifier: ^2.3.0
+        version: 2.3.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-logs':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-metrics':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-node':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-node':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions':
-        specifier: 1.25.1
-        version: 1.25.1
+        specifier: 1.36.0
+        version: 1.36.0
       '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
       '@prisma/instrumentation':
-        specifier: ^5.11.0
-        version: 5.11.0
+        specifier: ^6.14.0
+        version: 6.14.0(@opentelemetry/api@1.9.0)
       '@radix-ui/react-accordion':
         specifier: ^1.2.11
-        version: 1.2.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.2.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-alert-dialog':
         specifier: ^1.0.4
-        version: 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-dialog':
         specifier: ^1.0.3
-        version: 1.0.3(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.3(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-label':
         specifier: ^2.0.1
-        version: 2.0.1(react-dom@18.2.0)(react@18.2.0)
+        version: 2.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-popover':
         specifier: ^1.0.5
-        version: 1.0.5(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.5(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-portal':
         specifier: ^1.1.9
-        version: 1.1.9(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.1.9(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-radio-group':
         specifier: ^1.1.3
-        version: 1.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-select':
         specifier: ^1.2.1
-        version: 1.2.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.2.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slider':
         specifier: ^1.1.2
-        version: 1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-switch':
         specifier: ^1.0.3
-        version: 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-tabs':
         specifier: ^1.0.3
-        version: 1.0.3(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-tooltip':
         specifier: ^1.0.5
-        version: 1.0.5(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.5(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/datepicker':
         specifier: ^3.9.1
-        version: 3.9.1(react-dom@18.2.0)(react@18.2.0)
+        version: 3.9.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-stately/datepicker':
         specifier: ^3.9.1
         version: 3.9.1(react@18.2.0)
@@ -389,7 +446,7 @@ importers:
         version: 2.1.0(typescript@5.5.4)
       '@remix-run/react':
         specifier: 2.1.0
-        version: 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+        version: 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@remix-run/router':
         specifier: ^1.15.3
         version: 1.15.3
@@ -401,31 +458,40 @@ importers:
         version: 2.1.0(typescript@5.5.4)
       '@remix-run/v1-meta':
         specifier: ^0.1.3
-        version: 0.1.3(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)
+        version: 0.1.3(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))
+      '@s2-dev/streamstore':
+        specifier: ^0.17.2
+        version: 0.17.3(typescript@5.5.4)
+      '@sentry/remix':
+        specifier: 9.46.0
+        version: 9.46.0(patch_hash=146126b032581925294aaed63ab53ce3f5e0356a755f1763d7a9a76b9846943b)(@remix-run/node@2.1.0(typescript@5.5.4))(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(encoding@0.1.13)(react@18.2.0)
       '@slack/web-api':
         specifier: 7.9.1
         version: 7.9.1
       '@socket.io/redis-adapter':
         specifier: ^8.3.0
-        version: 8.3.0(socket.io-adapter@2.5.4)
-      '@splinetool/react-spline':
-        specifier: ^2.2.6
-        version: 2.2.6(@splinetool/runtime@1.9.98)(react-dom@18.2.0)(react@18.2.0)
+        version: 8.3.0(socket.io-adapter@2.5.4(bufferutil@4.0.9))
       '@tabler/icons-react':
-        specifier: ^2.39.0
-        version: 2.47.0(react@18.2.0)
+        specifier: ^3.36.1
+        version: 3.36.1(react@18.2.0)
       '@tailwindcss/container-queries':
         specifier: ^0.1.1
         version: 0.1.1(tailwindcss@3.4.1)
+      '@tanstack/match-sorter-utils':
+        specifier: ^8.19.4
+        version: 8.19.4
+      '@tanstack/react-table':
+        specifier: ^8.21.3
+        version: 8.21.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@tanstack/react-virtual':
         specifier: ^3.0.4
-        version: 3.0.4(react-dom@18.2.0)(react@18.2.0)
+        version: 3.0.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@team-plain/typescript-sdk':
         specifier: ^3.5.0
         version: 3.5.0
       '@trigger.dev/companyicons':
         specifier: ^1.5.35
-        version: 1.5.35(react-dom@18.2.0)(react@18.2.0)
+        version: 1.5.35(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@trigger.dev/core':
         specifier: workspace:*
         version: link:../../packages/core
@@ -436,8 +502,8 @@ importers:
         specifier: workspace:*
         version: link:../../internal-packages/otlp-importer
       '@trigger.dev/platform':
-        specifier: 1.0.15
-        version: 1.0.15
+        specifier: 1.0.23
+        version: 1.0.23
       '@trigger.dev/redis-worker':
         specifier: workspace:*
         version: link:../../packages/redis-worker
@@ -449,7 +515,7 @@ importers:
         version: 8.6.6
       '@uiw/react-codemirror':
         specifier: ^4.19.5
-        version: 4.19.5(@babel/runtime@7.27.4)(@codemirror/autocomplete@6.4.0)(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.7.2)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0)
+        version: 4.19.5(@babel/runtime@7.28.4)(@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0))(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.7.2)(codemirror@6.0.2(@lezer/common@1.3.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@unkey/cache':
         specifier: ^1.5.0
         version: 1.5.0
@@ -458,13 +524,16 @@ importers:
         version: 0.2.0
       '@upstash/ratelimit':
         specifier: ^1.1.3
-        version: 1.1.3
+        version: 1.1.3(patch_hash=e5922e50fbefb7b2b24950c4b1c5c9ddc4cd25464439c9548d2298c432debe74)
+      '@vercel/sdk':
+        specifier: ^1.19.1
+        version: 1.19.1
       '@whatwg-node/fetch':
         specifier: ^0.9.14
         version: 0.9.14
       ai:
         specifier: ^4.3.19
-        version: 4.3.19(react@18.2.0)(zod@3.23.8)
+        version: 4.3.19(react@18.2.0)(zod@3.25.76)
       assert-never:
         specifier: ^1.2.1
         version: 1.2.1
@@ -495,6 +564,9 @@ importers:
       cuid:
         specifier: ^2.1.8
         version: 2.1.8
+      date-fns:
+        specifier: ^4.1.0
+        version: 4.1.0
       dompurify:
         specifier: ^3.2.6
         version: 3.2.6
@@ -507,6 +579,9 @@ importers:
       emails:
         specifier: workspace:*
         version: link:../../internal-packages/emails
+      eventsource:
+        specifier: ^4.0.0
+        version: 4.0.0
       evt:
         specifier: ^2.4.13
         version: 2.4.13
@@ -515,19 +590,16 @@ importers:
         version: 4.20.0
       framer-motion:
         specifier: ^10.12.11
-        version: 10.12.11(react-dom@18.2.0)(react@18.2.0)
+        version: 10.12.11(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       graphile-worker:
         specifier: 0.16.6
-        version: 0.16.6(patch_hash=hdpetta7btqcc7xb5wfkcnanoa)(typescript@5.5.4)
-      highlight.run:
-        specifier: ^7.3.4
-        version: 7.3.4
+        version: 0.16.6(patch_hash=798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1)(typescript@5.5.4)
       humanize-duration:
         specifier: ^3.27.3
         version: 3.27.3
       input-otp:
         specifier: ^1.4.2
-        version: 1.4.2(react-dom@18.2.0)(react@18.2.0)
+        version: 1.4.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       intl-parse-accept-language:
         specifier: ^1.0.0
         version: 1.0.0
@@ -561,21 +633,30 @@ importers:
       nanoid:
         specifier: 3.3.8
         version: 3.3.8
+      neverthrow:
+        specifier: ^8.2.0
+        version: 8.2.0
       non.geist:
         specifier: ^1.0.2
         version: 1.0.2
+      octokit:
+        specifier: ^3.2.1
+        version: 3.2.2
       ohash:
         specifier: ^1.1.3
         version: 1.1.3
       openai:
         specifier: ^4.33.1
-        version: 4.33.1
+        version: 4.33.1(encoding@0.1.13)
       p-limit:
         specifier: ^6.2.0
         version: 6.2.0
       p-map:
         specifier: ^6.0.0
         version: 6.0.0
+      p-retry:
+        specifier: ^4.6.1
+        version: 4.6.2
       parse-duration:
         specifier: ^2.1.0
         version: 2.1.4
@@ -605,58 +686,70 @@ importers:
         version: 18.2.0
       react-aria:
         specifier: ^3.31.1
-        version: 3.31.1(react-dom@18.2.0)(react@18.2.0)
+        version: 3.31.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-collapse:
         specifier: ^5.1.1
         version: 5.1.1(react@18.2.0)
+      react-day-picker:
+        specifier: ^9.13.0
+        version: 9.13.0(react@18.2.0)
       react-dom:
         specifier: ^18.2.0
         version: 18.2.0(react@18.2.0)
+      react-grid-layout:
+        specifier: ^2.2.2
+        version: 2.2.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-hotkeys-hook:
         specifier: ^4.4.1
-        version: 4.4.1(react-dom@18.2.0)(react@18.2.0)
+        version: 4.4.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-popper:
         specifier: ^2.3.0
-        version: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0)(react@18.2.0)
+        version: 2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-resizable:
+        specifier: ^3.1.3
+        version: 3.1.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-resizable-panels:
         specifier: ^2.0.9
-        version: 2.0.9(react-dom@18.2.0)(react@18.2.0)
+        version: 2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-stately:
         specifier: ^3.29.1
         version: 3.29.1(react@18.2.0)
       react-use:
         specifier: 17.5.1
-        version: 17.5.1(react-dom@18.2.0)(react@18.2.0)
+        version: 17.5.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-window-splitter:
         specifier: ^0.4.1
-        version: 0.4.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+        version: 0.4.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       recharts:
-        specifier: ^2.12.6
-        version: 2.12.6(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^2.15.2
+        version: 2.15.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       regression:
         specifier: ^2.0.1
         version: 2.0.1
       remix-auth:
         specifier: ^3.6.0
-        version: 3.6.0(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)
+        version: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))
       remix-auth-email-link:
         specifier: 2.0.2
-        version: 2.0.2(@remix-run/server-runtime@2.1.0)(remix-auth@3.6.0)
+        version: 2.0.2(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)))
       remix-auth-github:
         specifier: ^1.6.0
-        version: 1.6.0(@remix-run/server-runtime@2.1.0)(remix-auth@3.6.0)
+        version: 1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)))
+      remix-auth-google:
+        specifier: ^2.0.0
+        version: 2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)))
       remix-typedjson:
         specifier: 0.3.1
-        version: 0.3.1(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)(react@18.2.0)
+        version: 0.3.1(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(react@18.2.0)
       remix-utils:
         specifier: ^7.7.0
-        version: 7.7.0(@remix-run/node@2.1.0)(@remix-run/react@2.1.0)(@remix-run/router@1.15.3)(intl-parse-accept-language@1.0.0)(react@18.2.0)(zod@3.23.8)
+        version: 7.7.0(@remix-run/node@2.1.0(typescript@5.5.4))(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/router@1.15.3)(crypto-js@4.2.0)(intl-parse-accept-language@1.0.0)(react@18.2.0)(zod@3.25.76)
       seedrandom:
         specifier: ^3.0.5
         version: 3.0.5
       semver:
-        specifier: ^7.5.0
-        version: 7.6.3
+        specifier: 5.7.2
+        version: 5.7.2
       simple-oauth2:
         specifier: ^5.0.0
         version: 5.0.0
@@ -668,16 +761,22 @@ importers:
         version: 6.1.0
       socket.io:
         specifier: 4.7.4
-        version: 4.7.4
+        version: 4.7.4(bufferutil@4.0.9)
       socket.io-adapter:
         specifier: ^2.5.4
-        version: 2.5.4
+        version: 2.5.4(bufferutil@4.0.9)
       sonner:
         specifier: ^1.0.3
-        version: 1.0.3(react-dom@18.2.0)(react@18.2.0)
+        version: 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      sql-formatter:
+        specifier: ^15.4.10
+        version: 15.6.12
       sqs-consumer:
         specifier: ^7.4.0
         version: 7.5.0(@aws-sdk/client-sqs@3.454.0)
+      streamdown:
+        specifier: ^1.4.0
+        version: 1.4.0(@types/react@18.2.69)(react@18.2.0)
       superjson:
         specifier: ^2.2.1
         version: 2.2.1
@@ -706,17 +805,17 @@ importers:
         specifier: ^9.0.0
         version: 9.0.1
       ws:
-        specifier: ^8.11.0
-        version: 8.12.0
+        specifier: 8.17.1
+        version: 8.17.1(bufferutil@4.0.9)
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
       zod-error:
         specifier: 1.5.0
         version: 1.5.0
       zod-validation-error:
         specifier: ^1.5.0
-        version: 1.5.0(zod@3.23.8)
+        version: 1.5.0(zod@3.25.76)
     devDependencies:
       '@internal/clickhouse':
         specifier: workspace:*
@@ -729,13 +828,16 @@ importers:
         version: link:../../internal-packages/testcontainers
       '@remix-run/dev':
         specifier: 2.1.0
-        version: 2.1.0(@remix-run/serve@2.1.0)(@types/node@20.14.14)(ts-node@10.9.1)(typescript@5.5.4)
+        version: 2.1.0(@remix-run/serve@2.1.0(typescript@5.5.4))(@types/node@20.14.14)(bufferutil@4.0.9)(encoding@0.1.13)(lightningcss@1.29.2)(terser@5.44.1)(typescript@5.5.4)
       '@remix-run/eslint-config':
         specifier: 2.1.0
         version: 2.1.0(eslint@8.31.0)(react@18.2.0)(typescript@5.5.4)
       '@remix-run/testing':
         specifier: ^2.1.0
-        version: 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+        version: 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
+      '@sentry/cli':
+        specifier: 2.50.2
+        version: 2.50.2(encoding@0.1.13)
       '@swc/core':
         specifier: ^1.3.4
         version: 1.3.26
@@ -831,25 +933,25 @@ importers:
         version: 8.5.4
       '@typescript-eslint/eslint-plugin':
         specifier: ^5.59.6
-        version: 5.59.6(@typescript-eslint/parser@5.59.6)(eslint@8.31.0)(typescript@5.5.4)
+        version: 5.59.6(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4)
       '@typescript-eslint/parser':
         specifier: ^5.59.6
         version: 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       autoevals:
         specifier: ^0.0.130
-        version: 0.0.130(ws@8.12.0)
+        version: 0.0.130(encoding@0.1.13)(ws@8.17.1(bufferutil@4.0.9))
       autoprefixer:
         specifier: ^10.4.13
-        version: 10.4.13(postcss@8.5.4)
+        version: 10.4.13(postcss@8.5.6)
       css-loader:
         specifier: ^6.10.0
-        version: 6.10.0(webpack@5.99.9)
+        version: 6.10.0(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18))
       datepicker:
         specifier: link:@types/@react-aria/datepicker
         version: link:@types/@react-aria/datepicker
       engine.io:
         specifier: ^6.5.4
-        version: 6.5.4
+        version: 6.5.4(bufferutil@4.0.9)
       esbuild:
         specifier: ^0.15.10
         version: 0.15.18
@@ -861,7 +963,7 @@ importers:
         version: 8.6.0(eslint@8.31.0)
       eslint-plugin-import:
         specifier: ^2.29.1
-        version: 2.29.1(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
+        version: 2.29.1(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
       eslint-plugin-react-hooks:
         specifier: ^4.6.2
         version: 4.6.2(eslint@8.31.0)
@@ -870,16 +972,16 @@ importers:
         version: 2.0.5(eslint@8.31.0)
       evalite:
         specifier: ^0.11.4
-        version: 0.11.4
+        version: 0.11.4(bufferutil@4.0.9)
       npm-run-all:
         specifier: ^4.1.5
         version: 4.1.5
       postcss-import:
         specifier: ^16.0.1
-        version: 16.0.1(postcss@8.5.4)
+        version: 16.0.1(postcss@8.5.6)
       postcss-loader:
         specifier: ^8.1.1
-        version: 8.1.1(postcss@8.5.4)(typescript@5.5.4)(webpack@5.99.9)
+        version: 8.1.1(postcss@8.5.6)(typescript@5.5.4)(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18))
       prettier:
         specifier: ^2.8.8
         version: 2.8.8
@@ -894,7 +996,7 @@ importers:
         version: 3.0.2
       style-loader:
         specifier: ^3.3.4
-        version: 3.3.4(webpack@5.99.9)
+        version: 3.3.4(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18))
       supertest:
         specifier: ^7.0.0
         version: 7.0.0
@@ -903,33 +1005,57 @@ importers:
         version: 3.0.1(tailwindcss@3.4.1)
       tailwindcss:
         specifier: 3.4.1
-        version: 3.4.1(ts-node@10.9.1)
-      ts-node:
-        specifier: ^10.7.0
-        version: 10.9.1(@swc/core@1.3.26)(@types/node@20.14.14)(typescript@5.5.4)
+        version: 3.4.1
       tsconfig-paths:
         specifier: ^3.14.1
         version: 3.14.1
+      tsx:
+        specifier: ^4.20.6
+        version: 4.20.6
       vite-tsconfig-paths:
         specifier: ^4.0.5
         version: 4.0.5(typescript@5.5.4)
 
   docs: {}
 
+  internal-packages/cache:
+    dependencies:
+      '@internal/redis':
+        specifier: workspace:*
+        version: link:../redis
+      '@trigger.dev/core':
+        specifier: workspace:*
+        version: link:../../packages/core
+      '@unkey/cache':
+        specifier: ^1.5.0
+        version: 1.5.0
+      '@unkey/error':
+        specifier: ^0.2.0
+        version: 0.2.0
+      lru-cache:
+        specifier: ^11.2.4
+        version: 11.2.4
+      superjson:
+        specifier: ^2.2.1
+        version: 2.2.1
+
   internal-packages/clickhouse:
     dependencies:
       '@clickhouse/client':
-        specifier: ^1.11.1
-        version: 1.11.1
+        specifier: ^1.12.1
+        version: 1.12.1
       '@internal/tracing':
         specifier: workspace:*
         version: link:../tracing
+      '@internal/tsql':
+        specifier: workspace:*
+        version: link:../tsql
       '@trigger.dev/core':
         specifier: workspace:*
         version: link:../../packages/core
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
       zod-error:
         specifier: 1.5.0
         version: 1.5.0
@@ -944,21 +1070,27 @@ importers:
   internal-packages/database:
     dependencies:
       '@prisma/client':
-        specifier: 5.4.1
-        version: 5.4.1(prisma@5.4.1)
+        specifier: 6.14.0
+        version: 6.14.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))(typescript@5.5.4)
+      decimal.js:
+        specifier: ^10.6.0
+        version: 10.6.0
     devDependencies:
+      '@types/decimal.js':
+        specifier: ^7.4.3
+        version: 7.4.3
       prisma:
-        specifier: 5.4.1
-        version: 5.4.1
+        specifier: 6.14.0
+        version: 6.14.0(magicast@0.3.5)(typescript@5.5.4)
       rimraf:
         specifier: 6.0.1
         version: 6.0.1
 
   internal-packages/emails:
     dependencies:
-      '@aws-sdk/client-ses':
+      '@aws-sdk/client-sesv2':
         specifier: ^3.716.0
-        version: 3.716.0
+        version: 3.940.0
       '@react-email/components':
         specifier: 0.0.16
         version: 0.0.16(@types/react@18.2.69)(react@18.3.1)
@@ -966,14 +1098,14 @@ importers:
         specifier: ^0.0.12
         version: 0.0.12
       nodemailer:
-        specifier: ^6.9.16
-        version: 6.9.16
+        specifier: ^7.0.11
+        version: 7.0.11
       react:
         specifier: ^18.2.0
         version: 18.3.1
       react-email:
         specifier: ^2.1.1
-        version: 2.1.2(eslint@8.31.0)
+        version: 2.1.2(@opentelemetry/api@1.9.0)(@swc/helpers@0.5.15)(eslint@8.31.0)
       resend:
         specifier: ^3.2.0
         version: 3.2.0
@@ -981,12 +1113,12 @@ importers:
         specifier: ^1.2.0
         version: 1.3.1
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@types/nodemailer':
-        specifier: ^6.4.17
-        version: 6.4.17
+        specifier: ^7.0.4
+        version: 7.0.4
       '@types/react':
         specifier: 18.2.69
         version: 18.2.69
@@ -1001,7 +1133,7 @@ importers:
         version: 7.3.2
     devDependencies:
       '@types/node':
-        specifier: ^20
+        specifier: 20.14.14
         version: 20.14.14
       rimraf:
         specifier: ^3.0.2
@@ -1035,7 +1167,7 @@ importers:
         version: 8.15.6
       redlock:
         specifier: 5.0.0-beta.2
-        version: 5.0.0-beta.2(patch_hash=rwyegdki7iserrd7fgjwxkhnlu)
+        version: 5.0.0-beta.2(patch_hash=52b17ac642f5f9776bf05e2229f4dd79588d37b0039d835c7684c478464632f2)
     devDependencies:
       '@internal/testcontainers':
         specifier: workspace:*
@@ -1049,6 +1181,9 @@ importers:
 
   internal-packages/run-engine:
     dependencies:
+      '@internal/cache':
+        specifier: workspace:*
+        version: link:../cache
       '@internal/redis':
         specifier: workspace:*
         version: link:../redis
@@ -1064,24 +1199,24 @@ importers:
       '@trigger.dev/redis-worker':
         specifier: workspace:*
         version: link:../../packages/redis-worker
-      '@unkey/cache':
-        specifier: ^1.5.0
-        version: 1.5.0
       assert-never:
         specifier: ^1.2.1
         version: 1.2.1
       nanoid:
         specifier: 3.3.8
         version: 3.3.8
+      p-map:
+        specifier: ^6.0.0
+        version: 6.0.0
       redlock:
         specifier: 5.0.0-beta.2
-        version: 5.0.0-beta.2(patch_hash=rwyegdki7iserrd7fgjwxkhnlu)
+        version: 5.0.0-beta.2(patch_hash=52b17ac642f5f9776bf05e2229f4dd79588d37b0039d835c7684c478464632f2)
       seedrandom:
         specifier: ^3.0.5
         version: 3.0.5
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@internal/testcontainers':
         specifier: workspace:*
@@ -1120,8 +1255,8 @@ importers:
         specifier: 3.3.8
         version: 3.3.8
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@internal/testcontainers':
         specifier: workspace:*
@@ -1130,6 +1265,25 @@ importers:
         specifier: 6.0.1
         version: 6.0.1
 
+  internal-packages/sdk-compat-tests:
+    dependencies:
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+    devDependencies:
+      esbuild:
+        specifier: ^0.24.0
+        version: 0.24.2
+      execa:
+        specifier: ^9.3.0
+        version: 9.6.1
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+      vitest:
+        specifier: 3.1.4
+        version: 3.1.4(@types/debug@4.1.12)(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
+
   internal-packages/testcontainers:
     dependencies:
       '@clickhouse/client':
@@ -1179,6 +1333,22 @@ importers:
         specifier: workspace:*
         version: link:../../packages/core
 
+  internal-packages/tsql:
+    dependencies:
+      '@trigger.dev/core':
+        specifier: workspace:*
+        version: link:../../packages/core
+      antlr4ts:
+        specifier: 0.5.0-alpha.4
+        version: 0.5.0-alpha.4(patch_hash=b5d41129ddbf7c4cbb0288244b2c8d041ee0803c5102c1181c180408d3b579f4)
+      zod:
+        specifier: 3.25.76
+        version: 3.25.76
+    devDependencies:
+      antlr4ts-cli:
+        specifier: 0.5.0-alpha.4
+        version: 0.5.0-alpha.4
+
   internal-packages/zod-worker:
     dependencies:
       '@internal/tracing':
@@ -1192,13 +1362,13 @@ importers:
         version: link:../database
       graphile-worker:
         specifier: 0.16.6
-        version: 0.16.6(patch_hash=hdpetta7btqcc7xb5wfkcnanoa)(typescript@5.5.4)
+        version: 0.16.6(patch_hash=798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1)(typescript@5.5.4)
       lodash.omit:
         specifier: ^4.5.0
         version: 4.5.0
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@types/lodash.omit':
         specifier: ^4.5.7
@@ -1209,12 +1379,21 @@ importers:
 
   packages/build:
     dependencies:
+      '@prisma/config':
+        specifier: ^6.10.0
+        version: 6.19.0(magicast@0.3.5)
       '@trigger.dev/core':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../core
+      mlly:
+        specifier: ^1.7.1
+        version: 1.7.4
       pkg-types:
         specifier: ^1.1.3
         version: 1.1.3
+      resolve:
+        specifier: ^1.22.8
+        version: 1.22.8
       tinyglobby:
         specifier: ^0.2.2
         version: 0.2.2
@@ -1225,6 +1404,9 @@ importers:
       '@arethetypeswrong/cli':
         specifier: ^0.15.4
         version: 0.15.4
+      '@types/resolve':
+        specifier: ^1.20.6
+        version: 1.20.6
       esbuild:
         specifier: ^0.23.0
         version: 0.23.0
@@ -1241,56 +1423,50 @@ importers:
   packages/cli-v3:
     dependencies:
       '@clack/prompts':
-        specifier: ^0.10.0
-        version: 0.10.0
+        specifier: 0.11.0
+        version: 0.11.0
       '@depot/cli':
         specifier: 0.0.1-cli.2.80.0
         version: 0.0.1-cli.2.80.0
       '@modelcontextprotocol/sdk':
-        specifier: ^1.6.1
-        version: 1.6.1(supports-color@10.0.0)
+        specifier: ^1.25.2
+        version: 1.25.2(hono@4.11.8)(supports-color@10.0.0)(zod@3.25.76)
       '@opentelemetry/api':
         specifier: 1.9.0
         version: 1.9.0
       '@opentelemetry/api-logs':
-        specifier: 0.52.1
-        version: 0.52.1
-      '@opentelemetry/exporter-logs-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0
       '@opentelemetry/exporter-trace-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
       '@opentelemetry/instrumentation-fetch':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
       '@opentelemetry/resources':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-node':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
-      '@opentelemetry/sdk-trace-base':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-node':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions':
-        specifier: 1.25.1
-        version: 1.25.1
+        specifier: 1.36.0
+        version: 1.36.0
+      '@s2-dev/streamstore':
+        specifier: ^0.17.6
+        version: 0.17.6
       '@trigger.dev/build':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../build
       '@trigger.dev/core':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../core
+      '@trigger.dev/schema-to-json':
+        specifier: workspace:4.4.1
+        version: link:../schema-to-json
       ansi-escapes:
         specifier: ^7.0.0
         version: 7.0.0
@@ -1312,6 +1488,9 @@ importers:
       commander:
         specifier: ^9.4.1
         version: 9.5.0
+      confbox:
+        specifier: ^0.2.2
+        version: 0.2.2
       defu:
         specifier: ^6.1.4
         version: 6.1.4
@@ -1339,6 +1518,9 @@ importers:
       has-flag:
         specifier: ^5.0.1
         version: 5.0.1
+      ignore:
+        specifier: ^7.0.5
+        version: 7.0.5
       import-in-the-middle:
         specifier: 1.11.0
         version: 1.11.0
@@ -1348,6 +1530,9 @@ importers:
       ini:
         specifier: ^5.0.0
         version: 5.0.0
+      json-stable-stringify:
+        specifier: ^1.3.0
+        version: 1.3.0
       jsonc-parser:
         specifier: 3.2.1
         version: 3.2.1
@@ -1388,23 +1573,29 @@ importers:
         specifier: ^1.22.8
         version: 1.22.8
       semver:
-        specifier: ^7.5.0
-        version: 7.6.3
+        specifier: 5.7.2
+        version: 5.7.2
       signal-exit:
         specifier: ^4.1.0
         version: 4.1.0
       socket.io-client:
         specifier: 4.7.5
-        version: 4.7.5(supports-color@10.0.0)
+        version: 4.7.5(bufferutil@4.0.9)(supports-color@10.0.0)
       source-map-support:
         specifier: 0.5.21
         version: 0.5.21
       std-env:
         specifier: ^3.7.0
         version: 3.7.0
+      strip-ansi:
+        specifier: ^7.1.0
+        version: 7.1.0
       supports-color:
         specifier: ^10.0.0
         version: 10.0.0
+      tar:
+        specifier: ^7.5.4
+        version: 7.5.6
       tiny-invariant:
         specifier: ^1.2.0
         version: 1.3.1
@@ -1415,21 +1606,21 @@ importers:
         specifier: ^0.2.10
         version: 0.2.10
       ws:
-        specifier: ^8.18.0
-        version: 8.18.0(bufferutil@4.0.9)
+        specifier: 8.17.1
+        version: 8.17.1(bufferutil@4.0.9)
       xdg-app-paths:
         specifier: ^8.3.0
         version: 8.3.0
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
       zod-validation-error:
         specifier: ^1.5.0
-        version: 1.5.0(zod@3.23.8)
+        version: 1.5.0(zod@3.25.76)
     devDependencies:
       '@epic-web/test-server':
         specifier: ^0.1.0
-        version: 0.1.0
+        version: 0.1.0(bufferutil@4.0.9)
       '@types/eventsource':
         specifier: ^1.1.15
         version: 1.1.15
@@ -1491,8 +1682,8 @@ importers:
         specifier: ^3.1.1
         version: 3.1.1
       '@electric-sql/client':
-        specifier: 1.0.0-beta.1
-        version: 1.0.0-beta.1
+        specifier: 1.0.14
+        version: 1.0.14
       '@google-cloud/precise-date':
         specifier: ^4.0.0
         version: 4.0.0
@@ -1503,38 +1694,47 @@ importers:
         specifier: 1.9.0
         version: 1.9.0
       '@opentelemetry/api-logs':
-        specifier: 0.52.1
-        version: 0.52.1
+        specifier: 0.203.0
+        version: 0.203.0
       '@opentelemetry/core':
-        specifier: ^1.30.1
-        version: 1.30.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-logs-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http':
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-trace-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/host-metrics':
+        specifier: ^0.37.0
+        version: 0.37.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/instrumentation':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
       '@opentelemetry/resources':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-logs':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-node':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics':
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-node':
-        specifier: 1.25.1
-        version: 1.25.1(@opentelemetry/api@1.9.0)
+        specifier: 2.0.1
+        version: 2.0.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions':
-        specifier: 1.25.1
-        version: 1.25.1
+        specifier: 1.36.0
+        version: 1.36.0
+      '@s2-dev/streamstore':
+        specifier: 0.17.3
+        version: 0.17.3(typescript@5.5.4)
       dequal:
         specifier: ^2.0.3
         version: 2.0.3
@@ -1553,9 +1753,6 @@ importers:
       jose:
         specifier: ^5.4.0
         version: 5.4.0
-      lodash.get:
-        specifier: ^4.4.2
-        version: 4.4.2
       nanoid:
         specifier: 3.3.8
         version: 3.3.8
@@ -1564,16 +1761,13 @@ importers:
         version: 15.1.0
       socket.io:
         specifier: 4.7.4
-        version: 4.7.4
+        version: 4.7.4(bufferutil@4.0.9)
       socket.io-client:
         specifier: 4.7.5
-        version: 4.7.5(supports-color@10.0.0)
+        version: 4.7.5(bufferutil@4.0.9)(supports-color@10.0.0)
       std-env:
         specifier: ^3.8.1
         version: 3.8.1
-      superjson:
-        specifier: ^2.2.1
-        version: 2.2.1
       tinyexec:
         specifier: ^0.3.2
         version: 0.3.2
@@ -1581,24 +1775,24 @@ importers:
         specifier: ^0.1.3
         version: 0.1.3
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
       zod-error:
         specifier: 1.5.0
         version: 1.5.0
       zod-validation-error:
         specifier: ^1.5.0
-        version: 1.5.0(zod@3.23.8)
+        version: 1.5.0(zod@3.25.76)
     devDependencies:
       '@ai-sdk/provider-utils':
         specifier: ^1.0.22
-        version: 1.0.22(zod@3.23.8)
+        version: 1.0.22(zod@3.25.76)
       '@arethetypeswrong/cli':
         specifier: ^0.15.4
         version: 0.15.4
       '@epic-web/test-server':
         specifier: ^0.1.0
-        version: 0.1.0
+        version: 0.1.0(bufferutil@4.0.9)
       '@trigger.dev/database':
         specifier: workspace:*
         version: link:../../internal-packages/database
@@ -1612,8 +1806,8 @@ importers:
         specifier: ^4.0.14
         version: 4.0.14
       ai:
-        specifier: ^3.4.33
-        version: 3.4.33(react@18.3.1)(svelte@5.33.14)(vue@3.5.16)(zod@3.23.8)
+        specifier: ^6.0.0
+        version: 6.0.3(zod@3.25.76)
       defu:
         specifier: ^6.1.4
         version: 6.1.4
@@ -1623,6 +1817,9 @@ importers:
       rimraf:
         specifier: ^3.0.2
         version: 3.0.2
+      superjson:
+        specifier: ^2.2.1
+        version: 2.2.1
       ts-essentials:
         specifier: 10.0.1
         version: 10.0.1(typescript@5.5.4)
@@ -1636,7 +1833,7 @@ importers:
   packages/python:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../core
       tinyexec:
         specifier: ^0.3.2
@@ -1646,10 +1843,10 @@ importers:
         specifier: ^0.15.4
         version: 0.15.4
       '@trigger.dev/build':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../build
       '@trigger.dev/sdk':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../trigger-sdk
       '@types/node':
         specifier: 20.14.14
@@ -1667,13 +1864,13 @@ importers:
         specifier: 4.17.0
         version: 4.17.0
       typescript:
-        specifier: ^5.5.4
+        specifier: 5.5.4
         version: 5.5.4
 
   packages/react-hooks:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:^4.0.0-v4-beta.24
+        specifier: workspace:^4.4.1
         version: link:../core
       react:
         specifier: ^18.0 || ^19.0 || ^19.0.0-rc
@@ -1707,7 +1904,7 @@ importers:
   packages/redis-worker:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../core
       cron-parser:
         specifier: ^4.9.0
@@ -1721,9 +1918,12 @@ importers:
       p-limit:
         specifier: ^6.2.0
         version: 6.2.0
+      seedrandom:
+        specifier: ^3.0.5
+        version: 3.0.5
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@internal/redis':
         specifier: workspace:*
@@ -1737,12 +1937,15 @@ importers:
       '@types/lodash.omit':
         specifier: ^4.5.7
         version: 4.5.7
+      '@types/seedrandom':
+        specifier: ^3.0.8
+        version: 3.0.8
       rimraf:
         specifier: 6.0.1
         version: 6.0.1
       tsup:
         specifier: ^8.4.0
-        version: 8.4.0(postcss@8.5.4)(tsx@4.17.0)(typescript@5.5.4)
+        version: 8.4.0(@swc/core@1.3.101(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.5.6)(tsx@4.17.0)(typescript@5.5.4)(yaml@2.7.1)
       tsx:
         specifier: 4.17.0
         version: 4.17.0
@@ -1750,7 +1953,7 @@ importers:
   packages/rsc:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:^4.0.0-v4-beta.24
+        specifier: workspace:^4.4.1
         version: link:../core
       mlly:
         specifier: ^1.7.1
@@ -1766,10 +1969,10 @@ importers:
         specifier: ^0.15.4
         version: 0.15.4
       '@trigger.dev/build':
-        specifier: workspace:^4.0.0-v4-beta.24
+        specifier: workspace:^4.4.1
         version: link:../build
       '@types/node':
-        specifier: ^20.14.14
+        specifier: 20.14.14
         version: 20.14.14
       '@types/react':
         specifier: '*'
@@ -1787,19 +1990,62 @@ importers:
         specifier: 4.17.0
         version: 4.17.0
 
+  packages/schema-to-json:
+    dependencies:
+      '@sodaru/yup-to-json-schema':
+        specifier: ^2
+        version: 2.0.1
+      '@trigger.dev/core':
+        specifier: workspace:*
+        version: link:../core
+      effect:
+        specifier: ^3
+        version: 3.17.1
+      zod:
+        specifier: 3.25.76
+        version: 3.25.76
+      zod-to-json-schema:
+        specifier: ^3.24.0
+        version: 3.24.6(zod@3.25.76)
+    devDependencies:
+      '@arethetypeswrong/cli':
+        specifier: ^0.15.4
+        version: 0.15.4
+      '@sinclair/typebox':
+        specifier: ^0.34.3
+        version: 0.34.38
+      arktype:
+        specifier: ^2.0.0
+        version: 2.1.20
+      rimraf:
+        specifier: 6.0.1
+        version: 6.0.1
+      runtypes:
+        specifier: ^6.7.0
+        version: 6.7.0
+      superstruct:
+        specifier: ^2.0.2
+        version: 2.0.2
+      tshy:
+        specifier: ^3.0.2
+        version: 3.0.2
+      valibot:
+        specifier: ^1.1.0
+        version: 1.1.0(typescript@5.5.4)
+      yup:
+        specifier: ^1.7.0
+        version: 1.7.0
+
   packages/trigger-sdk:
     dependencies:
       '@opentelemetry/api':
         specifier: 1.9.0
         version: 1.9.0
-      '@opentelemetry/api-logs':
-        specifier: 0.52.1
-        version: 0.52.1
       '@opentelemetry/semantic-conventions':
-        specifier: 1.25.1
-        version: 1.25.1
+        specifier: 1.36.0
+        version: 1.36.0
       '@trigger.dev/core':
-        specifier: workspace:4.0.0-v4-beta.24
+        specifier: workspace:4.4.1
         version: link:../core
       chalk:
         specifier: ^5.2.0
@@ -1826,8 +2072,8 @@ importers:
         specifier: ^9.0.0
         version: 9.0.0
       ws:
-        specifier: ^8.11.0
-        version: 8.12.0
+        specifier: 8.17.1
+        version: 8.17.1(bufferutil@4.0.9)
     devDependencies:
       '@arethetypeswrong/cli':
         specifier: ^0.15.4
@@ -1845,8 +2091,8 @@ importers:
         specifier: ^8.5.3
         version: 8.5.4
       ai:
-        specifier: ^4.2.0
-        version: 4.2.5(react@18.3.1)(zod@3.23.8)
+        specifier: ^6.0.0
+        version: 6.0.3(zod@3.25.76)
       encoding:
         specifier: ^0.1.13
         version: 0.1.13
@@ -1863,8 +2109,8 @@ importers:
         specifier: ^2.1.0
         version: 2.1.0
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
 
   references/bun-catalog:
     dependencies:
@@ -1882,23 +2128,41 @@ importers:
   references/d3-chat:
     dependencies:
       '@ai-sdk/anthropic':
-        specifier: ^1.2.4
-        version: 1.2.4(zod@3.23.8)
+        specifier: 2.0.4
+        version: 2.0.4(zod@3.25.76)
       '@ai-sdk/openai':
-        specifier: 1.3.3
-        version: 1.3.3(zod@3.23.8)
+        specifier: 2.0.14
+        version: 2.0.14(zod@3.25.76)
       '@e2b/code-interpreter':
         specifier: ^1.1.0
         version: 1.1.0
+      '@opentelemetry/api':
+        specifier: ^1.9.0
+        version: 1.9.0
+      '@opentelemetry/api-logs':
+        specifier: ^0.203.0
+        version: 0.203.0
       '@opentelemetry/exporter-logs-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/exporter-trace-otlp-http':
-        specifier: 0.52.1
-        version: 0.52.1(@opentelemetry/api@1.9.0)
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation':
+        specifier: ^0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/instrumentation-http':
+        specifier: 0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici':
+        specifier: 0.14.0
+        version: 0.14.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs':
+        specifier: ^0.203.0
+        version: 0.203.0(@opentelemetry/api@1.9.0)
       '@radix-ui/react-avatar':
         specifier: ^1.1.3
-        version: 1.1.3(@types/react-dom@19.0.4)(@types/react@19.0.12)(react-dom@19.0.0)(react@19.0.0)
+        version: 1.1.3(@types/react-dom@19.0.4(@types/react@19.0.12))(@types/react@19.0.12)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       '@slack/web-api':
         specifier: 7.9.1
         version: 7.9.1
@@ -1911,12 +2175,15 @@ importers:
       '@trigger.dev/sdk':
         specifier: workspace:*
         version: link:../../packages/trigger-sdk
+      '@vercel/otel':
+        specifier: ^1.13.0
+        version: 1.13.0(@opentelemetry/api-logs@0.203.0)(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.203.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-logs@0.203.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.0.1(@opentelemetry/api@1.9.0))
       '@vercel/postgres':
         specifier: ^0.10.0
         version: 0.10.0
       ai:
-        specifier: 4.2.5
-        version: 4.2.5(react@19.0.0)(zod@3.23.8)
+        specifier: 5.0.14
+        version: 5.0.14(zod@3.25.76)
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
@@ -1933,8 +2200,8 @@ importers:
         specifier: ^5.1.5
         version: 5.1.5
       next:
-        specifier: 15.2.4
-        version: 15.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0)(react@19.0.0)
+        specifier: 15.4.8
+        version: 15.4.8(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react:
         specifier: ^19.0.0
         version: 19.0.0
@@ -1951,8 +2218,8 @@ importers:
         specifier: ^1.2.4
         version: 1.2.4
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@tailwindcss/postcss':
         specifier: ^4
@@ -1967,7 +2234,7 @@ importers:
         specifier: ^4.0.3
         version: 4.0.8
       '@types/node':
-        specifier: ^20
+        specifier: 20.14.14
         version: 20.14.14
       '@types/react':
         specifier: ^19
@@ -1982,14 +2249,14 @@ importers:
         specifier: workspace:*
         version: link:../../packages/cli-v3
       typescript:
-        specifier: ^5
+        specifier: 5.5.4
         version: 5.5.4
 
   references/d3-openai-agents:
     dependencies:
       '@ai-sdk/openai':
         specifier: 1.3.3
-        version: 1.3.3(zod@3.23.8)
+        version: 1.3.3(zod@3.25.76)
       '@slack/web-api':
         specifier: 7.9.1
         version: 7.9.1
@@ -2007,7 +2274,7 @@ importers:
         version: 0.10.0
       ai:
         specifier: 4.2.5
-        version: 4.2.5(react@19.0.0)(zod@3.23.8)
+        version: 4.2.5(react@19.0.0)(zod@3.25.76)
       class-variance-authority:
         specifier: ^0.7.1
         version: 0.7.1
@@ -2022,7 +2289,7 @@ importers:
         version: 5.1.5
       next:
         specifier: 15.2.4
-        version: 15.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0)(react@19.0.0)
+        version: 15.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       react:
         specifier: ^19.0.0
         version: 19.0.0
@@ -2036,11 +2303,11 @@ importers:
         specifier: ^1.2.4
         version: 1.2.4
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
       zod-to-json-schema:
         specifier: ^3.24.5
-        version: 3.24.5(zod@3.23.8)
+        version: 3.24.5(zod@3.25.76)
     devDependencies:
       '@tailwindcss/postcss':
         specifier: ^4
@@ -2049,7 +2316,7 @@ importers:
         specifier: workspace:*
         version: link:../../packages/build
       '@types/node':
-        specifier: ^20
+        specifier: 20.14.14
         version: 20.14.14
       '@types/react':
         specifier: ^19
@@ -2070,26 +2337,54 @@ importers:
         specifier: 4.19.3
         version: 4.19.3
       typescript:
-        specifier: ^5
+        specifier: 5.5.4
         version: 5.5.4
 
+  references/effect:
+    dependencies:
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+      effect:
+        specifier: 3.17.1
+        version: 3.17.1
+    devDependencies:
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
   references/hello-world:
     dependencies:
+      '@sinclair/typebox':
+        specifier: ^0.34.3
+        version: 0.34.38
       '@trigger.dev/build':
         specifier: workspace:*
         version: link:../../packages/build
       '@trigger.dev/sdk':
         specifier: workspace:*
         version: link:../../packages/trigger-sdk
+      arktype:
+        specifier: ^2.0.0
+        version: 2.1.20
       openai:
         specifier: ^4.97.0
-        version: 4.97.0(ws@8.12.0)(zod@3.23.8)
+        version: 4.97.0(encoding@0.1.13)(ws@8.17.1(bufferutil@4.0.9))(zod@3.25.76)
+      puppeteer-core:
+        specifier: ^24.15.0
+        version: 24.15.0(bufferutil@4.0.9)
       replicate:
         specifier: ^1.0.1
         version: 1.0.1
+      yup:
+        specifier: ^1.6.1
+        version: 1.6.1
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       trigger.dev:
         specifier: workspace:*
@@ -2107,11 +2402,27 @@ importers:
         specifier: workspace:*
         version: link:../../packages/cli-v3
 
+  references/issue-2687:
+    dependencies:
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+      dotenv:
+        specifier: ^16.4.5
+        version: 16.4.7
+      tsx:
+        specifier: ^4.0.0
+        version: 4.20.6
+    devDependencies:
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
   references/nextjs-realtime:
     dependencies:
       '@ai-sdk/openai':
         specifier: ^1.0.1
-        version: 1.0.1(zod@3.23.8)
+        version: 1.0.1(zod@3.25.76)
       '@fal-ai/serverless-client':
         specifier: ^0.15.0
         version: 0.15.0
@@ -2123,22 +2434,22 @@ importers:
         version: 0.57.0(@opentelemetry/api@1.9.0)
       '@radix-ui/react-dialog':
         specifier: ^1.0.3
-        version: 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+        version: 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-icons':
         specifier: ^1.3.0
         version: 1.3.0(react@18.3.1)
       '@radix-ui/react-progress':
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+        version: 1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-scroll-area':
         specifier: ^1.2.0
-        version: 1.2.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+        version: 1.2.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot':
         specifier: ^1.1.0
         version: 1.1.0(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-tabs':
         specifier: ^1.0.3
-        version: 1.0.3(react-dom@18.2.0)(react@18.3.1)
+        version: 1.0.3(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@trigger.dev/react-hooks':
         specifier: workspace:*
         version: link:../../packages/react-hooks
@@ -2147,10 +2458,10 @@ importers:
         version: link:../../packages/trigger-sdk
       '@uploadthing/react':
         specifier: ^7.0.3
-        version: 7.0.3(next@14.2.21)(react@18.3.1)(uploadthing@7.1.0)
+        version: 7.0.3(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(react@18.3.1)(uploadthing@7.1.0(express@5.2.1)(fastify@5.4.0)(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(tailwindcss@3.4.1))
       ai:
         specifier: ^4.0.0
-        version: 4.0.0(react@18.3.1)(zod@3.23.8)
+        version: 4.0.0(react@18.3.1)(zod@3.25.76)
       class-variance-authority:
         specifier: ^0.7.0
         version: 0.7.0
@@ -2162,16 +2473,16 @@ importers:
         version: 4.1.0
       langsmith:
         specifier: ^0.2.15
-        version: 0.2.15(openai@4.68.4)
+        version: 0.2.15(openai@4.68.4(encoding@0.1.13)(zod@3.25.76))
       lucide-react:
         specifier: ^0.451.0
         version: 0.451.0(react@18.3.1)
       next:
         specifier: 14.2.21
-        version: 14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0)(react@18.3.1)
+        version: 14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       openai:
         specifier: ^4.68.4
-        version: 4.68.4(zod@3.23.8)
+        version: 4.68.4(encoding@0.1.13)(zod@3.25.76)
       react:
         specifier: ^18
         version: 18.3.1
@@ -2186,14 +2497,14 @@ importers:
         version: 1.0.7(tailwindcss@3.4.1)
       uploadthing:
         specifier: ^7.1.0
-        version: 7.1.0(next@14.2.21)(tailwindcss@3.4.1)
+        version: 7.1.0(express@5.2.1)(fastify@5.4.0)(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(tailwindcss@3.4.1)
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
       '@next/bundle-analyzer':
         specifier: ^15.0.2
-        version: 15.0.2
+        version: 15.0.2(bufferutil@4.0.9)
       '@trigger.dev/rsc':
         specifier: workspace:*
         version: link:../../packages/rsc
@@ -2208,759 +2519,17791 @@ importers:
         version: 8.4.44
       tailwindcss:
         specifier: ^3.4.1
-        version: 3.4.1(ts-node@10.9.1)
+        version: 3.4.1
       trigger.dev:
         specifier: workspace:*
         version: link:../../packages/cli-v3
 
-  references/python-catalog:
+  references/prisma-6:
     dependencies:
-      '@trigger.dev/python':
+      '@prisma/client':
+        specifier: 6.14.0
+        version: 6.14.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))(typescript@5.5.4)
+      '@trigger.dev/build':
         specifier: workspace:*
-        version: link:../../packages/python
+        version: link:../../packages/build
       '@trigger.dev/sdk':
         specifier: workspace:*
         version: link:../../packages/trigger-sdk
-      zod:
-        specifier: 3.23.8
-        version: 3.23.8
     devDependencies:
-      '@trigger.dev/build':
-        specifier: workspace:*
-        version: link:../../packages/build
+      prisma:
+        specifier: 6.14.0
+        version: 6.14.0(magicast@0.3.5)(typescript@5.5.4)
+      prisma-generator-ts-enums:
+        specifier: ^1.1.0
+        version: 1.1.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))
       trigger.dev:
         specifier: workspace:*
         version: link:../../packages/cli-v3
-      typescript:
-        specifier: ^5.5.4
-        version: 5.5.4
 
-  references/test-tasks:
+  references/prisma-6-client:
     dependencies:
+      '@prisma/adapter-pg':
+        specifier: 6.16.0
+        version: 6.16.0
+      '@prisma/client':
+        specifier: 6.16.0
+        version: 6.16.0(prisma@6.16.0(magicast@0.3.5)(typescript@5.5.4))(typescript@5.5.4)
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
       '@trigger.dev/sdk':
         specifier: workspace:*
         version: link:../../packages/trigger-sdk
-      zod:
-        specifier: 3.23.8
-        version: 3.23.8
     devDependencies:
+      prisma:
+        specifier: 6.16.0
+        version: 6.16.0(magicast@0.3.5)(typescript@5.5.4)
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
+  references/prisma-6-config:
+    dependencies:
+      '@prisma/client':
+        specifier: 6.19.0
+        version: 6.19.0(prisma@6.19.0(typescript@5.5.4))(typescript@5.5.4)
       '@trigger.dev/build':
         specifier: workspace:*
         version: link:../../packages/build
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+    devDependencies:
+      prisma:
+        specifier: 6.19.0
+        version: 6.19.0(typescript@5.5.4)
       trigger.dev:
         specifier: workspace:*
         version: link:../../packages/cli-v3
-      typescript:
-        specifier: ^5.5.4
-        version: 5.5.4
 
-  references/v3-catalog:
+  references/prisma-6-multi-file:
     dependencies:
-      '@1password/sdk':
-        specifier: ^0.3.0
-        version: 0.3.0
-      '@effect/schema':
-        specifier: ^0.75.5
-        version: 0.75.5(effect@3.16.3)
-      '@infisical/sdk':
-        specifier: ^2.3.5
-        version: 2.3.5
-      '@opentelemetry/api':
-        specifier: 1.4.1
-        version: 1.4.1
       '@prisma/client':
-        specifier: 5.19.0
-        version: 5.19.0(prisma@5.19.0)
-      '@react-email/components':
-        specifier: 0.0.24
-        version: 0.0.24(react-dom@18.3.1)(react@19.0.0-rc.0)
-      '@react-email/render':
-        specifier: 1.0.1
-        version: 1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0)
-      '@sentry/esbuild-plugin':
-        specifier: ^2.22.2
-        version: 2.22.2
-      '@sinclair/typebox':
-        specifier: ^0.33.17
-        version: 0.33.17
-      '@sindresorhus/slugify':
-        specifier: ^2.2.1
-        version: 2.2.1
-      '@t3-oss/env-core':
-        specifier: ^0.11.0
-        version: 0.11.0(typescript@5.5.4)(zod@3.23.8)
-      '@t3-oss/env-nextjs':
-        specifier: ^0.10.1
-        version: 0.10.1(typescript@5.5.4)(zod@3.23.8)
-      '@traceloop/instrumentation-openai':
-        specifier: ^0.10.0
-        version: 0.10.0(@opentelemetry/api@1.4.1)
+        specifier: 6.14.0
+        version: 6.14.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))(typescript@5.5.4)
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+    devDependencies:
+      prisma:
+        specifier: 6.14.0
+        version: 6.14.0(magicast@0.3.5)(typescript@5.5.4)
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
+  references/prisma-6-output:
+    dependencies:
+      '@prisma/client':
+        specifier: 6.19.0
+        version: 6.19.0(prisma@6.19.0(typescript@5.5.4))(typescript@5.5.4)
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+    devDependencies:
+      prisma:
+        specifier: 6.19.0
+        version: 6.19.0(typescript@5.5.4)
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
+  references/prisma-7:
+    dependencies:
+      '@prisma/adapter-pg':
+        specifier: 6.20.0-integration-next.8
+        version: 6.20.0-integration-next.8
+      '@prisma/client':
+        specifier: 6.20.0-integration-next.8
+        version: 6.20.0-integration-next.8(prisma@6.20.0-integration-next.8(@types/react@19.0.12)(magicast@0.3.5)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.5.4))(typescript@5.5.4)
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+      dotenv:
+        specifier: ^17.2.3
+        version: 17.2.3
+    devDependencies:
+      prisma:
+        specifier: 6.20.0-integration-next.8
+        version: 6.20.0-integration-next.8(@types/react@19.0.12)(magicast@0.3.5)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.5.4)
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
+  references/python-catalog:
+    dependencies:
+      '@trigger.dev/python':
+        specifier: workspace:*
+        version: link:../../packages/python
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+      zod:
+        specifier: 3.25.76
+        version: 3.25.76
+    devDependencies:
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+
+  references/realtime-hooks-test:
+    dependencies:
+      '@trigger.dev/react-hooks':
+        specifier: workspace:*
+        version: link:../../packages/react-hooks
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+      next:
+        specifier: 15.5.6
+        version: 15.5.6(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+      react:
+        specifier: 19.1.0
+        version: 19.1.0
+      react-dom:
+        specifier: 19.1.0
+        version: 19.1.0(react@19.1.0)
+      zod:
+        specifier: 3.25.76
+        version: 3.25.76
+    devDependencies:
+      '@tailwindcss/postcss':
+        specifier: ^4
+        version: 4.0.17
+      '@types/node':
+        specifier: 20.14.14
+        version: 20.14.14
+      '@types/react':
+        specifier: ^19
+        version: 19.0.12
+      '@types/react-dom':
+        specifier: ^19
+        version: 19.0.4(@types/react@19.0.12)
+      tailwindcss:
+        specifier: ^4
+        version: 4.0.17
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+
+  references/realtime-streams:
+    dependencies:
+      '@ai-sdk/openai':
+        specifier: ^2.0.53
+        version: 2.0.53(zod@3.25.76)
+      '@trigger.dev/react-hooks':
+        specifier: workspace:*
+        version: link:../../packages/react-hooks
       '@trigger.dev/sdk':
         specifier: workspace:*
         version: link:../../packages/trigger-sdk
-      '@typeschema/typebox':
-        specifier: ^0.14.0
-        version: 0.14.0(@sinclair/typebox@0.33.17)
       ai:
-        specifier: ^3.3.24
-        version: 3.3.24(openai@4.56.0)(react@19.0.0-rc.0)(svelte@5.33.14)(vue@3.5.16)(zod@3.23.8)
+        specifier: ^5.0.76
+        version: 5.0.76(zod@3.25.76)
+      next:
+        specifier: 15.5.6
+        version: 15.5.6(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+      react:
+        specifier: 19.1.0
+        version: 19.1.0
+      react-dom:
+        specifier: 19.1.0
+        version: 19.1.0(react@19.1.0)
+      shiki:
+        specifier: ^3.13.0
+        version: 3.13.0
+      streamdown:
+        specifier: ^1.4.0
+        version: 1.4.0(@types/react@19.0.12)(react@19.1.0)
+      zod:
+        specifier: 3.25.76
+        version: 3.25.76
+    devDependencies:
+      '@tailwindcss/postcss':
+        specifier: ^4
+        version: 4.0.17
+      '@types/node':
+        specifier: 20.14.14
+        version: 20.14.14
+      '@types/react':
+        specifier: ^19
+        version: 19.0.12
+      '@types/react-dom':
+        specifier: ^19
+        version: 19.0.4(@types/react@19.0.12)
+      tailwindcss:
+        specifier: ^4
+        version: 4.0.17
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+
+  references/seed:
+    dependencies:
+      '@sinclair/typebox':
+        specifier: ^0.34.3
+        version: 0.34.38
+      '@trigger.dev/build':
+        specifier: workspace:*
+        version: link:../../packages/build
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
       arktype:
-        specifier: 2.0.0-rc.17
-        version: 2.0.0-rc.17
-      bcrypt:
-        specifier: ^6.0.0
-        version: 6.0.0
-      canvas:
-        specifier: ^3.1.0
-        version: 3.1.0
-      dotenv:
-        specifier: ^16.4.5
-        version: 16.4.5
-      email-reply-parser:
-        specifier: ^1.8.0
-        version: 1.8.0
-      execa:
-        specifier: ^8.0.1
-        version: 8.0.1
-      fluent-ffmpeg:
-        specifier: ^2.1.3
-        version: 2.1.3
-      header-generator:
-        specifier: ^2.1.55
-        version: 2.1.55
-      kysely:
-        specifier: ^0.27.4
-        version: 0.27.4
-      msw:
-        specifier: ^2.2.1
-        version: 2.3.5(typescript@5.5.4)
-      mupdf:
-        specifier: ^1.3.6
-        version: 1.3.6
+        specifier: ^2.0.0
+        version: 2.1.20
       openai:
-        specifier: ^4.47.0
-        version: 4.56.0(zod@3.23.8)
-      pg:
-        specifier: ^8.11.5
-        version: 8.11.5
-      playwright:
-        specifier: ^1.50.1
-        version: 1.50.1
-      puppeteer:
-        specifier: ^23.4.0
-        version: 23.4.0(typescript@5.5.4)
-      react:
-        specifier: 19.0.0-rc.0
-        version: 19.0.0-rc.0
-      react-email:
-        specifier: ^3.0.1
-        version: 3.0.1(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0)
-      reflect-metadata:
-        specifier: ^0.1.13
-        version: 0.1.14
-      runtypes:
-        specifier: ^6.7.0
-        version: 6.7.0
-      server-only:
-        specifier: ^0.0.1
-        version: 0.0.1
-      sharp:
-        specifier: ^0.34.2
-        version: 0.34.2
-      sqlite3:
-        specifier: ^5.1.7
-        version: 5.1.7
-      stripe:
-        specifier: ^12.14.0
-        version: 12.18.0
-      superstruct:
-        specifier: ^2.0.2
-        version: 2.0.2
-      typeorm:
-        specifier: ^0.3.20
-        version: 0.3.20(pg@8.11.5)(sqlite3@5.1.7)(ts-node@10.9.2)
-      valibot:
-        specifier: ^0.42.1
-        version: 0.42.1(typescript@5.5.4)
-      wrangler:
-        specifier: 3.70.0
-        version: 3.70.0
-      yt-dlp-wrap:
-        specifier: ^2.3.12
-        version: 2.3.12
+        specifier: ^4.97.0
+        version: 4.97.0(encoding@0.1.13)(ws@8.17.1(bufferutil@4.0.9))(zod@3.25.76)
+      puppeteer-core:
+        specifier: ^24.15.0
+        version: 24.15.0(bufferutil@4.0.9)
+      replicate:
+        specifier: ^1.0.1
+        version: 1.0.1
       yup:
-        specifier: ^1.4.0
-        version: 1.4.0
-      zip-node-addon:
-        specifier: ^0.0.11
-        version: 0.0.11
+        specifier: ^1.6.1
+        version: 1.7.0
       zod:
-        specifier: 3.23.8
-        version: 3.23.8
+        specifier: 3.25.76
+        version: 3.25.76
     devDependencies:
-      '@opentelemetry/core':
-        specifier: ^1.22.0
-        version: 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/exporter-logs-otlp-http':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/exporter-trace-otlp-http':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation-express':
-        specifier: ^0.36.1
-        version: 0.36.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation-fetch':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation-http':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation-undici':
-        specifier: 0.2.0
-        version: 0.2.0(@opentelemetry/api@1.4.1)
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+
+  references/telemetry:
+    dependencies:
       '@opentelemetry/resources':
-        specifier: ^1.22.0
-        version: 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-logs':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api-logs@0.52.1)(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-node':
-        specifier: ^0.49.1
-        version: 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base':
-        specifier: ^1.22.0
-        version: 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-node':
-        specifier: ^1.22.0
-        version: 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions':
-        specifier: ^1.22.0
-        version: 1.25.1
+        specifier: 2.2.0
+        version: 2.2.0(@opentelemetry/api@1.9.0)
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+    devDependencies:
+      '@types/node':
+        specifier: 20.14.14
+        version: 20.14.14
+      trigger.dev:
+        specifier: workspace:*
+        version: link:../../packages/cli-v3
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+
+  references/test-tasks:
+    dependencies:
+      '@trigger.dev/sdk':
+        specifier: workspace:*
+        version: link:../../packages/trigger-sdk
+      zod:
+        specifier: 3.25.76
+        version: 3.25.76
+    devDependencies:
       '@trigger.dev/build':
         specifier: workspace:*
         version: link:../../packages/build
-      '@trigger.dev/python':
-        specifier: workspace:*
-        version: link:../../packages/python
-      '@types/bcrypt':
-        specifier: ^5.0.2
-        version: 5.0.2
-      '@types/email-reply-parser':
-        specifier: ^1.4.2
-        version: 1.4.2
-      '@types/fluent-ffmpeg':
-        specifier: ^2.1.26
-        version: 2.1.26
-      '@types/react':
-        specifier: ^18.3.1
-        version: 18.3.1
-      esbuild:
-        specifier: ^0.19.11
-        version: 0.19.11
-      prisma:
-        specifier: 5.19.0
-        version: 5.19.0
-      prisma-kysely:
-        specifier: ^1.8.0
-        version: 1.8.0
       trigger.dev:
         specifier: workspace:*
         version: link:../../packages/cli-v3
-      ts-node:
-        specifier: ^10.9.2
-        version: 10.9.2(@types/node@20.14.14)(typescript@5.5.4)
-      tsconfig-paths:
-        specifier: ^4.2.0
-        version: 4.2.0
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+
+packages:
+
+  '@adobe/css-tools@4.4.0':
+    resolution: {integrity: sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==}
+
+  '@ai-sdk/anthropic@2.0.4':
+    resolution: {integrity: sha512-ii2bZEUPwBitUiK1dpX+HsOarcDGY71G9TVdSJqbfXSVqa+speJNZ8PA/bjuNMml0NyX8VxNsaMg3SwBUCZspA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4
+
+  '@ai-sdk/gateway@1.0.6':
+    resolution: {integrity: sha512-JuSj1MtTr4vw2VBBth4wlbciQnQIV0o1YV9qGLFA+r85nR5H+cJp3jaYE0nprqfzC9rYG8w9c6XGHB3SDKgcgA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4
+
+  '@ai-sdk/gateway@2.0.0':
+    resolution: {integrity: sha512-Gj0PuawK7NkZuyYgO/h5kDK/l6hFOjhLdTq3/Lli1FTl47iGmwhH1IZQpAL3Z09BeFYWakcwUmn02ovIm2wy9g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  '@ai-sdk/gateway@3.0.2':
+    resolution: {integrity: sha512-giJEg9ob45htbu3iautK+2kvplY2JnTj7ir4wZzYSQWvqGatWfBBfDuNCU5wSJt9BCGjymM5ZS9ziD42JGCZBw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  '@ai-sdk/openai@1.0.1':
+    resolution: {integrity: sha512-snZge8457afWlosVNUn+BG60MrxAPOOm3zmIMxJZih8tneNSiRbTVCbSzAtq/9vsnOHDe5RR83PRl85juOYEnA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+
+  '@ai-sdk/openai@1.3.23':
+    resolution: {integrity: sha512-86U7rFp8yacUAOE/Jz8WbGcwMCqWvjK33wk5DXkfnAOEn3mx2r7tNSJdjukQFZbAK97VMXGPPHxF+aEARDXRXQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+
+  '@ai-sdk/openai@1.3.3':
+    resolution: {integrity: sha512-CH57tonLB4DwkwqwnMmTCoIOR7cNW3bP5ciyloI7rBGJS/Bolemsoo+vn5YnwkyT9O1diWJyvYeTh7A4UfiYOw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+
+  '@ai-sdk/openai@2.0.14':
+    resolution: {integrity: sha512-u/wi1ixcvcg29wAJySjO803HlXpyCl6mkcOHn+Zn7DA+CtjuQNkKikJ4pZBc7I3Qhi90kA4XnOfKikhBXh4c4Q==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4
+
+  '@ai-sdk/openai@2.0.53':
+    resolution: {integrity: sha512-GIkR3+Fyif516ftXv+YPSPstnAHhcZxNoR2s8uSHhQ1yBT7I7aQYTVwpjAuYoT3GR+TeP50q7onj2/nDRbT2FQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  '@ai-sdk/provider-utils@1.0.22':
+    resolution: {integrity: sha512-YHK2rpj++wnLVc9vPGzGFP3Pjeld2MwhKinetA0zKXOoHAT/Jit5O8kZsxcSlJPu9wvcGT1UGZEjZrtO7PfFOQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  '@ai-sdk/provider-utils@2.0.0':
+    resolution: {integrity: sha512-uITgVJByhtzuQU2ZW+2CidWRmQqTUTp6KADevy+4aRnmILZxY2LCt+UZ/ZtjJqq0MffwkuQPPY21ExmFAQ6kKA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  '@ai-sdk/provider-utils@2.2.1':
+    resolution: {integrity: sha512-BuExLp+NcpwsAVj1F4bgJuQkSqO/+roV9wM7RdIO+NVrcT8RBUTdXzf5arHt5T58VpK7bZyB2V9qigjaPHE+Dg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.23.8
+
+  '@ai-sdk/provider-utils@2.2.8':
+    resolution: {integrity: sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.23.8
+
+  '@ai-sdk/provider-utils@3.0.12':
+    resolution: {integrity: sha512-ZtbdvYxdMoria+2SlNarEk6Hlgyf+zzcznlD55EAl+7VZvJaSg2sqPvwArY7L6TfDEDJsnCq0fdhBSkYo0Xqdg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  '@ai-sdk/provider-utils@3.0.3':
+    resolution: {integrity: sha512-kAxIw1nYmFW1g5TvE54ZB3eNtgZna0RnLjPUp1ltz1+t9xkXJIuDT4atrwfau9IbS0BOef38wqrI8CjFfQrxhw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4
+
+  '@ai-sdk/provider-utils@4.0.1':
+    resolution: {integrity: sha512-de2v8gH9zj47tRI38oSxhQIewmNc+OZjYIOOaMoVWKL65ERSav2PYYZHPSPCrfOeLMkv+Dyh8Y0QGwkO29wMWQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  '@ai-sdk/provider@0.0.26':
+    resolution: {integrity: sha512-dQkfBDs2lTYpKM8389oopPdQgIU007GQyCbuPPrV+K6MtSII3HBfE0stUIMXUb44L+LK1t6GXPP7wjSzjO6uKg==}
+    engines: {node: '>=18'}
+
+  '@ai-sdk/provider@1.0.0':
+    resolution: {integrity: sha512-Sj29AzooJ7SYvhPd+AAWt/E7j63E9+AzRnoMHUaJPRYzOd/WDrVNxxv85prF9gDcQ7XPVlSk9j6oAZV9/DXYpA==}
+    engines: {node: '>=18'}
+
+  '@ai-sdk/provider@1.1.0':
+    resolution: {integrity: sha512-0M+qjp+clUD0R1E5eWQFhxEvWLNaOtGQRUaBn8CUABnSKredagq92hUS9VjOzGsTm37xLfpaxl97AVtbeOsHew==}
+    engines: {node: '>=18'}
+
+  '@ai-sdk/provider@1.1.3':
+    resolution: {integrity: sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg==}
+    engines: {node: '>=18'}
+
+  '@ai-sdk/provider@2.0.0':
+    resolution: {integrity: sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA==}
+    engines: {node: '>=18'}
+
+  '@ai-sdk/provider@3.0.0':
+    resolution: {integrity: sha512-m9ka3ptkPQbaHHZHqDXDF9C9B5/Mav0KTdky1k2HZ3/nrW2t1AgObxIVPyGDWQNS9FXT/FS6PIoSjpcP/No8rQ==}
+    engines: {node: '>=18'}
+
+  '@ai-sdk/react@1.0.0':
+    resolution: {integrity: sha512-BDrZqQA07Btg64JCuhFvBgYV+tt2B8cXINzEqWknGoxqcwgdE8wSLG2gkXoLzyC2Rnj7oj0HHpOhLUxDCmoKZg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^18 || ^19 || ^19.0.0-rc
+      zod: ^3.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      zod:
+        optional: true
+
+  '@ai-sdk/react@1.2.12':
+    resolution: {integrity: sha512-jK1IZZ22evPZoQW3vlkZ7wvjYGYF+tRBKXtrcolduIkQ/m/sOAVcVeVDUDvh1T91xCnWCdUGCPZg2avZ90mv3g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^18 || ^19 || ^19.0.0-rc
+      zod: ^3.23.8
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  '@ai-sdk/react@1.2.2':
+    resolution: {integrity: sha512-rxyNTFjUd3IilVOJFuUJV5ytZBYAIyRi50kFS2gNmSEiG4NHMBBm31ddrxI/i86VpY8gzZVp1/igtljnWBihUA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^18 || ^19 || ^19.0.0-rc
+      zod: ^3.23.8
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  '@ai-sdk/ui-utils@1.0.0':
+    resolution: {integrity: sha512-oXBDIM/0niWeTWyw77RVl505dNxBUDLLple7bTsqo2d3i1UKwGlzBUX8XqZsh7GbY7I6V05nlG0Y8iGlWxv1Aw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.0.0
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  '@ai-sdk/ui-utils@1.2.1':
+    resolution: {integrity: sha512-BzvMbYm7LHBlbWuLlcG1jQh4eu14MGpz7L+wrGO1+F4oQ+O0fAjgUSNwPWGlZpKmg4NrcVq/QLmxiVJrx2R4Ew==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.23.8
+
+  '@ai-sdk/ui-utils@1.2.11':
+    resolution: {integrity: sha512-3zcwCc8ezzFlwp3ZD15wAPjf2Au4s3vAbKsXQVyhxODHcmu0iyPO2Eua6D/vicq/AUm/BAo60r97O6HU+EI0+w==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.23.8
+
+  '@alloc/quick-lru@5.2.0':
+    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
+    engines: {node: '>=10'}
+
+  '@ampproject/remapping@2.3.0':
+    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
+    engines: {node: '>=6.0.0'}
+
+  '@andrewbranch/untar.js@1.0.3':
+    resolution: {integrity: sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==}
+
+  '@antfu/install-pkg@1.1.0':
+    resolution: {integrity: sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==}
+
+  '@antfu/utils@9.3.0':
+    resolution: {integrity: sha512-9hFT4RauhcUzqOE4f1+frMKLZrgNog5b06I7VmZQV1BkvwvqrbC8EBZf3L1eEL2AKb6rNKjER0sEvJiSP1FXEA==}
+
+  '@arethetypeswrong/cli@0.15.4':
+    resolution: {integrity: sha512-YDbImAi1MGkouT7f2yAECpUMFhhA1J0EaXzIqoC5GGtK0xDgauLtcsZezm8tNq7d3wOFXH7OnY+IORYcG212rw==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@arethetypeswrong/core@0.15.1':
+    resolution: {integrity: sha512-FYp6GBAgsNz81BkfItRz8RLZO03w5+BaeiPma1uCfmxTnxbtuMrI/dbzGiOk8VghO108uFI0oJo0OkewdSHw7g==}
+    engines: {node: '>=18'}
+
+  '@ariakit/core@0.4.6':
+    resolution: {integrity: sha512-L2WIZZlxDs611m3YLSv2xvJyQrkkVQJlxn8Y4DlI1G65VLTEH7hysw3RYUNdXsl0gP6S20id3zBMJCHT9BCRcg==}
+
+  '@ariakit/react-core@0.4.6':
+    resolution: {integrity: sha512-2Ca327IzSOxQEd3gEr59JJj0y8fXDMLYd+948wyOzIsk2/yoTnA4+R7Vhs361w3KzOjBQM44KmnNL7ckBMtT0w==}
+    peerDependencies:
+      react: ^17.0.0 || ^18.0.0
+      react-dom: ^17.0.0 || ^18.0.0
+
+  '@ariakit/react@0.4.6':
+    resolution: {integrity: sha512-7lZQew9n+nxswgJ5aL87xo42I+t3A8gWzaxIIZY+c58SLCASh1IdDkGLhGPcyhmXWRIjs/8L1h6cMbRMEBrtJQ==}
+    peerDependencies:
+      react: ^17.0.0 || ^18.0.0
+      react-dom: ^17.0.0 || ^18.0.0
+
+  '@ark/schema@0.46.0':
+    resolution: {integrity: sha512-c2UQdKgP2eqqDArfBqQIJppxJHvNNXuQPeuSPlDML4rjw+f1cu0qAlzOG4b8ujgm9ctIDWwhpyw6gjG5ledIVQ==}
+
+  '@ark/util@0.46.0':
+    resolution: {integrity: sha512-JPy/NGWn/lvf1WmGCPw2VGpBg5utZraE84I7wli18EDF3p3zc/e9WolT35tINeZO3l7C77SjqRJeAUoT0CvMRg==}
+
+  '@arr/every@1.0.1':
+    resolution: {integrity: sha512-UQFQ6SgyJ6LX42W8rHCs8KVc0JS0tzVL9ct4XYedJukskYVWTo49tNiMEK9C2HTyarbNiT/RVIRSY82vH+6sTg==}
+    engines: {node: '>=4'}
+
+  '@aws-crypto/crc32@3.0.0':
+    resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
+
+  '@aws-crypto/crc32@5.2.0':
+    resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-crypto/crc32c@5.2.0':
+    resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==}
+
+  '@aws-crypto/ie11-detection@3.0.0':
+    resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==}
+
+  '@aws-crypto/sha1-browser@5.2.0':
+    resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==}
+
+  '@aws-crypto/sha256-browser@3.0.0':
+    resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
+
+  '@aws-crypto/sha256-browser@5.2.0':
+    resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==}
+
+  '@aws-crypto/sha256-js@3.0.0':
+    resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
+
+  '@aws-crypto/sha256-js@5.2.0':
+    resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==}
+    engines: {node: '>=16.0.0'}
+
+  '@aws-crypto/supports-web-crypto@3.0.0':
+    resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==}
+
+  '@aws-crypto/supports-web-crypto@5.2.0':
+    resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==}
+
+  '@aws-crypto/util@3.0.0':
+    resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
+
+  '@aws-crypto/util@5.2.0':
+    resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
+
+  '@aws-sdk/client-ecr@3.839.0':
+    resolution: {integrity: sha512-aaSPaqfWvz9OAGfcl97Ps/bQHulRLt8tg8tB8zc4gyGo4OTn6gnKMd+FEhPBszRKP7xeb4pzjjqcXvHsFt7HEQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-ecr@3.931.0':
+    resolution: {integrity: sha512-HdW3pO3wVHSfd4G9h1E9AQ1h5H4EUunh/YvrGGswv2LCN9KwlksLhWKIvvA7Ppezj6JNtKAEaBQh+aTpS46xPA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-s3@3.940.0':
+    resolution: {integrity: sha512-Wi4qnBT6shRRMXuuTgjMFTU5mu2KFWisgcigEMPptjPGUtJvBVi4PTGgS64qsLoUk/obqDAyOBOfEtRZ2ddC2w==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-sesv2@3.940.0':
+    resolution: {integrity: sha512-jDQ4x2HwB2/UXBS7CTeSDiIb+sVsYGDyxTeXdrRAtqNdGv8kC54fbwokDiJ/mnMyB2gyXWw57BqeDJNkZuLmsw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-sqs@3.454.0':
+    resolution: {integrity: sha512-eBviLavFxmXAbqL/wPlVqYnmS/hYUPj63ilQvFuj8zM3WYy0DX7GgvYXz5AUWswGsEk/4F88QFjlBM7N5miepw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/client-sso@3.451.0':
+    resolution: {integrity: sha512-KkYSke3Pdv3MfVH/5fT528+MKjMyPKlcLcd4zQb0x6/7Bl7EHrPh1JZYjzPLHelb+UY5X0qN8+cb8iSu1eiwIQ==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/client-sso@3.839.0':
+    resolution: {integrity: sha512-AZABysUhbfcwXVlMo97/vwHgsfJNF81wypCAowpqAJkSjP2KrqsqHpb71/RoR2w8JGmEnBBXRD4wIxDhnmifWg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-sso@3.840.0':
+    resolution: {integrity: sha512-3Zp+FWN2hhmKdpS0Ragi5V2ZPsZNScE3jlbgoJjzjI/roHZqO+e3/+XFN4TlM0DsPKYJNp+1TAjmhxN6rOnfYA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-sso@3.931.0':
+    resolution: {integrity: sha512-GM/CARsIUQGEspM9VhZaftFVXnNtFNUUXjpM1ePO4CHk1J/VFvXcsQr3SHWIs0F4Ll6pvy5LpcRlWW5pK7T4aQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-sso@3.940.0':
+    resolution: {integrity: sha512-SdqJGWVhmIURvCSgkDditHRO+ozubwZk9aCX9MK8qxyOndhobCndW1ozl3hX9psvMAo9Q4bppjuqy/GHWpjB+A==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/client-sts@3.454.0':
+    resolution: {integrity: sha512-0fDvr8WeB6IYO8BUCzcivWmahgGl/zDbaYfakzGnt4mrl5ztYaXE875WI6b7+oFcKMRvN+KLvwu5TtyFuNY+GQ==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/client-sts@3.840.0':
+    resolution: {integrity: sha512-h+mu89Wk81Ne+B624GT/pBM5VjuAZueSeQNixhgtQ1QHi6bZzrpz8+lvMSibKO+kXFyQsTLzkyibbxnhLpWQZA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/core@3.451.0':
+    resolution: {integrity: sha512-SamWW2zHEf1ZKe3j1w0Piauryl8BQIlej0TBS18A4ACzhjhWXhCs13bO1S88LvPR5mBFXok3XOT6zPOnKDFktw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/core@3.839.0':
+    resolution: {integrity: sha512-KdwL5RaK7eUIlOpdOoZ5u+2t4X1rdX/MTZgz3IV/aBzjVUoGsp+uUnbyqXomLQSUitPHp72EE/NHDsvWW/IHvQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/core@3.840.0':
+    resolution: {integrity: sha512-x3Zgb39tF1h2XpU+yA4OAAQlW6LVEfXNlSedSYJ7HGKXqA/E9h3rWQVpYfhXXVVsLdYXdNw5KBUkoAoruoZSZA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/core@3.931.0':
+    resolution: {integrity: sha512-l/b6AQbto4TuXL2FIm7Z+tbVjrp0LN7ESm97Sf3nneB0vjKtB6R0TS/IySzCYMgyOC3Hxz+Ka34HJXZk9eXTFw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/core@3.940.0':
+    resolution: {integrity: sha512-KsGD2FLaX5ngJao1mHxodIVU9VYd1E8810fcYiGwO1PFHDzf5BEkp6D9IdMeQwT8Q6JLYtiiT1Y/o3UCScnGoA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.451.0':
+    resolution: {integrity: sha512-9dAav7DcRgaF7xCJEQR5ER9ErXxnu/tdnVJ+UPmb1NPeIZdESv1A3lxFDEq1Fs8c4/lzAj9BpshGyJVIZwZDKg==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.839.0':
+    resolution: {integrity: sha512-cWTadewPPz1OvObZJB+olrgh8VwcgIVcT293ZUT9V0CMF0UU7QaPwJP7uNXcNxltTh+sk1yhjH4UlcnJigZZbA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.840.0':
+    resolution: {integrity: sha512-EzF6VcJK7XvQ/G15AVEfJzN2mNXU8fcVpXo4bRyr1S6t2q5zx6UPH/XjDbn18xyUmOq01t+r8gG+TmHEVo18fA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.931.0':
+    resolution: {integrity: sha512-dTNBpkKXyBdcpEjyfgkE/EFU/0NRoukLs+Pj0S8K1Dg216J9uIijpi6CaBBN+HvnaTlEItm2tzXiJpPVI+TqHQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-env@3.940.0':
+    resolution: {integrity: sha512-/G3l5/wbZYP2XEQiOoIkRJmlv15f1P3MSd1a0gz27lHEMrOJOGq66rF1Ca4OJLzapWt3Fy9BPrZAepoAX11kMw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.839.0':
+    resolution: {integrity: sha512-fv0BZwrDhWDju4D1MCLT4I2aPjr0dVQ6P+MpqvcGNOA41Oa9UdRhYTV5iuy5NLXzIzoCmnS+XfSq5Kbsf6//xw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.840.0':
+    resolution: {integrity: sha512-wbnUiPGLVea6mXbUh04fu+VJmGkQvmToPeTYdHE8eRZq3NRDi3t3WltT+jArLBKD/4NppRpMjf2ju4coMCz91g==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.931.0':
+    resolution: {integrity: sha512-7Ge26fhMDn51BTbHgopx5+uOl4I47k15BDzYc4YT6zyjS99uycYNCA7zB500DGTTn2HK27ZDTyAyhTKZGxRxbA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-http@3.940.0':
+    resolution: {integrity: sha512-dOrc03DHElNBD6N9Okt4U0zhrG4Wix5QUBSZPr5VN8SvmjD9dkrrxOkkJaMCl/bzrW7kbQEp7LuBdbxArMmOZQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.451.0':
+    resolution: {integrity: sha512-TySt64Ci5/ZbqFw1F9Z0FIGvYx5JSC9e6gqDnizIYd8eMnn8wFRUscRrD7pIHKfrhvVKN5h0GdYovmMO/FMCBw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.839.0':
+    resolution: {integrity: sha512-GHm0hF4CiDxIDR7TauMaA6iI55uuSqRxMBcqTAHaTPm6+h1A+MS+ysQMxZ+Jvwtoy8WmfTIGrJVxSCw0sK2hvA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.840.0':
+    resolution: {integrity: sha512-7F290BsWydShHb+7InXd+IjJc3mlEIm9I0R57F/Pjl1xZB69MdkhVGCnuETWoBt4g53ktJd6NEjzm/iAhFXFmw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.931.0':
+    resolution: {integrity: sha512-uzicpP7IHBxvAMjwGdmeke2bGTxjsKCSW7N48zuv0t0d56hmGHfcZIK5p4ry2OBJxzScp182OUAdAEG8wuSuuA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-ini@3.940.0':
+    resolution: {integrity: sha512-gn7PJQEzb/cnInNFTOaDoCN/hOKqMejNmLof1W5VW95Qk0TPO52lH8R4RmJPnRrwFMswOWswTOpR1roKNLIrcw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-login@3.940.0':
+    resolution: {integrity: sha512-fOKC3VZkwa9T2l2VFKWRtfHQPQuISqqNl35ZhcXjWKVwRwl/o7THPMkqI4XwgT2noGa7LLYVbWMwnsgSsBqglg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-node@3.451.0':
+    resolution: {integrity: sha512-AEwM1WPyxUdKrKyUsKyFqqRFGU70e4qlDyrtBxJnSU9NRLZI8tfEZ67bN7fHSxBUBODgDXpMSlSvJiBLh5/3pw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/credential-provider-node@3.839.0':
+    resolution: {integrity: sha512-7bR+U2h+ft0V8chyeu9Bh/pvau4ZkQMeRt5f0dAULoepZQ77QQVRP4H04yJPTg9DCtqbVULQ3uf5YOp1/08vQw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-node@3.840.0':
+    resolution: {integrity: sha512-KufP8JnxA31wxklLm63evUPSFApGcH8X86z3mv9SRbpCm5ycgWIGVCTXpTOdgq6rPZrwT9pftzv2/b4mV/9clg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-node@3.931.0':
+    resolution: {integrity: sha512-eO8mfWNHz0dyYdVfPLVzmqXaSA3agZF/XvBO9/fRU90zCb8lKlXfgUmghGW7LhDkiv2v5uuizUiag7GsKoIcJw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-node@3.940.0':
+    resolution: {integrity: sha512-M8NFAvgvO6xZjiti5kztFiAYmSmSlG3eUfr4ZHSfXYZUA/KUdZU/D6xJyaLnU8cYRWBludb6K9XPKKVwKfqm4g==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.451.0':
+    resolution: {integrity: sha512-HQywSdKeD5PErcLLnZfSyCJO+6T+ZyzF+Lm/QgscSC+CbSUSIPi//s15qhBRVely/3KBV6AywxwNH+5eYgt4lQ==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.839.0':
+    resolution: {integrity: sha512-qShpekjociUZ+isyQNa0P7jo+0q3N2+0eJDg8SGyP6K6hHTcGfiqxTDps+IKl6NreCPhZCBzyI9mWkP0xSDR6g==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.840.0':
+    resolution: {integrity: sha512-HkDQWHy8tCI4A0Ps2NVtuVYMv9cB4y/IuD/TdOsqeRIAT12h8jDb98BwQPNLAImAOwOWzZJ8Cu0xtSpX7CQhMw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.931.0':
+    resolution: {integrity: sha512-8Mu9r+5BUKqmKSI/WYHl5o4GeoonEb51RmoLEqG6431Uz4Y8C6gzAT69yjOJ+MwoWQ2Os37OZLOTv7SgxyOgrQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-process@3.940.0':
+    resolution: {integrity: sha512-pILBzt5/TYCqRsJb7vZlxmRIe0/T+FZPeml417EK75060ajDGnVJjHcuVdLVIeKoTKm9gmJc9l45gon6PbHyUQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.451.0':
+    resolution: {integrity: sha512-Usm/N51+unOt8ID4HnQzxIjUJDrkAQ1vyTOC0gSEEJ7h64NSSPGD5yhN7il5WcErtRd3EEtT1a8/GTC5TdBctg==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.839.0':
+    resolution: {integrity: sha512-w10zBLHhU8SBQcdrSPMI02haLoRGZg+gP7mH/Er8VhIXfHefbr7o4NirmB0hwdw/YAH8MLlC9jj7c2SJlsNhYA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.840.0':
+    resolution: {integrity: sha512-2qgdtdd6R0Z1y0KL8gzzwFUGmhBHSUx4zy85L2XV1CXhpRNwV71SVWJqLDVV5RVWVf9mg50Pm3AWrUC0xb0pcA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.931.0':
+    resolution: {integrity: sha512-FP31lfMgNMDG4ZDX4NUZ+uoHWn76etcG8UWEgzZb4YOPV4M8a7gwU95iD+RBaK4lV3KvwH2tu68Hmne1qQpFqQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-sso@3.940.0':
+    resolution: {integrity: sha512-q6JMHIkBlDCOMnA3RAzf8cGfup+8ukhhb50fNpghMs1SNBGhanmaMbZSgLigBRsPQW7fOk2l8jnzdVLS+BB9Uw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.451.0':
+    resolution: {integrity: sha512-Xtg3Qw65EfDjWNG7o2xD6sEmumPfsy3WDGjk2phEzVg8s7hcZGxf5wYwe6UY7RJvlEKrU0rFA+AMn6Hfj5oOzg==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.839.0':
+    resolution: {integrity: sha512-EvqTc7J1kgmiuxknpCp1S60hyMQvmKxsI5uXzQtcogl/N55rxiXEqnCLI5q6p33q91PJegrcMCM5Q17Afhm5qA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.840.0':
+    resolution: {integrity: sha512-dpEeVXG8uNZSmVXReE4WP0lwoioX2gstk4RnUgrdUE3YaPq8A+hJiVAyc3h+cjDeIqfbsQbZm9qFetKC2LF9dQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.931.0':
+    resolution: {integrity: sha512-hfX0Buw2+ie0FBiSFMmnXfugQc9fO0KvEojnNnzhk4utlWjZobMcUprOQ/VKUueg0Kga1b1xu8gEP6g1aEh3zw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/credential-provider-web-identity@3.940.0':
+    resolution: {integrity: sha512-9QLTIkDJHHaYL0nyymO41H8g3ui1yz6Y3GmAN1gYQa6plXisuFBnGAbmKVj7zNvjWaOKdF0dV3dd3AFKEDoJ/w==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-bucket-endpoint@3.936.0':
+    resolution: {integrity: sha512-XLSVVfAorUxZh6dzF+HTOp4R1B5EQcdpGcPliWr0KUj2jukgjZEcqbBmjyMF/p9bmyQsONX80iURF1HLAlW0qg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-expect-continue@3.936.0':
+    resolution: {integrity: sha512-Eb4ELAC23bEQLJmUMYnPWcjD3FZIsmz2svDiXEcxRkQU9r7NRID7pM7C5NPH94wOfiCk0b2Y8rVyFXW0lGQwbA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-flexible-checksums@3.940.0':
+    resolution: {integrity: sha512-WdsxDAVj5qaa5ApAP+JbpCOMHFGSmzjs2Y2OBSbWPeR9Ew7t/Okj+kUub94QJPsgzhvU1/cqNejhsw5VxeFKSQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.451.0':
+    resolution: {integrity: sha512-j8a5jAfhWmsK99i2k8oR8zzQgXrsJtgrLxc3js6U+525mcZytoiDndkWTmD5fjJ1byU1U2E5TaPq+QJeDip05Q==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.821.0':
+    resolution: {integrity: sha512-xSMR+sopSeWGx5/4pAGhhfMvGBHioVBbqGvDs6pG64xfNwM5vq5s5v6D04e2i+uSTj4qGa71dLUs5I0UzAK3sw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.840.0':
+    resolution: {integrity: sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.930.0':
+    resolution: {integrity: sha512-x30jmm3TLu7b/b+67nMyoV0NlbnCVT5DI57yDrhXAPCtdgM1KtdLWt45UcHpKOm1JsaIkmYRh2WYu7Anx4MG0g==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-host-header@3.936.0':
+    resolution: {integrity: sha512-tAaObaAnsP1XnLGndfkGWFuzrJYuk9W0b/nLvol66t8FZExIAf/WdkT2NNAWOYxljVs++oHnyHBCxIlaHrzSiw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-location-constraint@3.936.0':
+    resolution: {integrity: sha512-SCMPenDtQMd9o5da9JzkHz838w3327iqXk3cbNnXWqnNRx6unyW8FL0DZ84gIY12kAyVHz5WEqlWuekc15ehfw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-logger@3.451.0':
+    resolution: {integrity: sha512-0kHrYEyVeB2QBfP6TfbI240aRtatLZtcErJbhpiNUb+CQPgEL3crIjgVE8yYiJumZ7f0jyjo8HLPkwD1/2APaw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-logger@3.821.0':
+    resolution: {integrity: sha512-0cvI0ipf2tGx7fXYEEN5fBeZDz2RnHyb9xftSgUsEq7NBxjV0yTZfLJw6Za5rjE6snC80dRN8+bTNR1tuG89zA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-logger@3.840.0':
+    resolution: {integrity: sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-logger@3.930.0':
+    resolution: {integrity: sha512-vh4JBWzMCBW8wREvAwoSqB2geKsZwSHTa0nSt0OMOLp2PdTYIZDi0ZiVMmpfnjcx9XbS6aSluLv9sKx4RrG46A==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-logger@3.936.0':
+    resolution: {integrity: sha512-aPSJ12d3a3Ea5nyEnLbijCaaYJT2QjQ9iW+zGh5QcZYXmOGWbKVyPSxmVOboZQG+c1M8t6d2O7tqrwzIq8L8qw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.451.0':
+    resolution: {integrity: sha512-J6jL6gJ7orjHGM70KDRcCP7so/J2SnkN4vZ9YRLTeeZY6zvBuHDjX8GCIgSqPn/nXFXckZO8XSnA7u6+3TAT0w==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.821.0':
+    resolution: {integrity: sha512-efmaifbhBoqKG3bAoEfDdcM8hn1psF+4qa7ykWuYmfmah59JBeqHLfz5W9m9JoTwoKPkFcVLWZxnyZzAnVBOIg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.840.0':
+    resolution: {integrity: sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.930.0':
+    resolution: {integrity: sha512-gv0sekNpa2MBsIhm2cjP3nmYSfI4nscx/+K9u9ybrWZBWUIC4kL2sV++bFjjUz4QxUIlvKByow3/a9ARQyCu7Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-recursion-detection@3.936.0':
+    resolution: {integrity: sha512-l4aGbHpXM45YNgXggIux1HgsCVAvvBoqHPkqLnqMl9QVapfuSTjJHfDYDsx1Xxct6/m7qSMUzanBALhiaGO2fA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-sdk-s3@3.940.0':
+    resolution: {integrity: sha512-JYkLjgS1wLoKHJ40G63+afM1ehmsPsjcmrHirKh8+kSCx4ip7+nL1e/twV4Zicxr8RJi9Y0Ahq5mDvneilDDKQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-sdk-sqs@3.451.0':
+    resolution: {integrity: sha512-GXpFSc9Ji4IAT/OaTkmnDrxzZrrAsJctUAC9vihpgGDof79A1Oz4R+r2uBMTKGxCIFkqyYW5Se7y2ijjTNa3ZA==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-sdk-sts@3.451.0':
+    resolution: {integrity: sha512-UJ6UfVUEgp0KIztxpAeelPXI5MLj9wUtUCqYeIMP7C1ZhoEMNm3G39VLkGN43dNhBf1LqjsV9jkKMZbVfYXuwg==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-signing@3.451.0':
+    resolution: {integrity: sha512-s5ZlcIoLNg1Huj4Qp06iKniE8nJt/Pj1B/fjhWc6cCPCM7XJYUCejCnRh6C5ZJoBEYodjuwZBejPc1Wh3j+znA==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-ssec@3.936.0':
+    resolution: {integrity: sha512-/GLC9lZdVp05ozRik5KsuODR/N7j+W+2TbfdFL3iS+7un+gnP6hC8RDOZd6WhpZp7drXQ9guKiTAxkZQwzS8DA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.451.0':
+    resolution: {integrity: sha512-8NM/0JiKLNvT9wtAQVl1DFW0cEO7OvZyLSUBLNLTHqyvOZxKaZ8YFk7d8PL6l76LeUKRxq4NMxfZQlUIRe0eSA==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.839.0':
+    resolution: {integrity: sha512-2u74uRM1JWq6Sf7+3YpjejPM9YkomGt4kWhrmooIBEq1k5r2GTbkH7pNCxBQwBueXM21jAGVDxxeClpTx+5hig==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.840.0':
+    resolution: {integrity: sha512-hiiMf7BP5ZkAFAvWRcK67Mw/g55ar7OCrvrynC92hunx/xhMkrgSLM0EXIZ1oTn3uql9kH/qqGF0nqsK6K555A==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.931.0':
+    resolution: {integrity: sha512-Ftd+f3+y5KNYKzLXaGknwJ9hCkFWshi5C9TLLsz+fEohWc1FvIKU7MlXTeFms2eN76TTVHuG8N2otaujl6CuHg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/middleware-user-agent@3.940.0':
+    resolution: {integrity: sha512-nJbLrUj6fY+l2W2rIB9P4Qvpiy0tnTdg/dmixRxrU1z3e8wBdspJlyE+AZN4fuVbeL6rrRrO/zxQC1bB3cw5IA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/nested-clients@3.839.0':
+    resolution: {integrity: sha512-Glic0pg2THYP3aRhJORwJJBe1JLtJoEdWV/MFZNyzCklfMwEzpWtZAyxy+tQyFmMeW50uBAnh2R0jhMMcf257w==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/nested-clients@3.840.0':
+    resolution: {integrity: sha512-LXYYo9+n4hRqnRSIMXLBb+BLz+cEmjMtTudwK1BF6Bn2RfdDv29KuyeDRrPCS3TwKl7ZKmXUmE9n5UuHAPfBpA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/nested-clients@3.931.0':
+    resolution: {integrity: sha512-6/dXrX2nWgiWdHxooEtmKpOErms4+79AQawEvhhxpLPpa+tixl4i/MSFgHk9sjkGv5a1/P3DbnedpZWl+2wMOg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/nested-clients@3.940.0':
+    resolution: {integrity: sha512-x0mdv6DkjXqXEcQj3URbCltEzW6hoy/1uIL+i8gExP6YKrnhiZ7SzuB4gPls2UOpK5UqLiqXjhRLfBb1C9i4Dw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.451.0':
+    resolution: {integrity: sha512-3iMf4OwzrFb4tAAmoROXaiORUk2FvSejnHIw/XHvf/jjR4EqGGF95NZP/n/MeFZMizJWVssrwS412GmoEyoqhg==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.821.0':
+    resolution: {integrity: sha512-t8og+lRCIIy5nlId0bScNpCkif8sc0LhmtaKsbm0ZPm3sCa/WhCbSZibjbZ28FNjVCV+p0D9RYZx0VDDbtWyjw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.840.0':
+    resolution: {integrity: sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.930.0':
+    resolution: {integrity: sha512-KL2JZqH6aYeQssu1g1KuWsReupdfOoxD6f1as2VC+rdwYFUu4LfzMsFfXnBvvQWWqQ7rZHWOw1T+o5gJmg7Dzw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/region-config-resolver@3.936.0':
+    resolution: {integrity: sha512-wOKhzzWsshXGduxO4pqSiNyL9oUtk4BEvjWm9aaq6Hmfdoydq6v6t0rAGHWPjFwy9z2haovGRi3C8IxdMB4muw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/s3-presigned-post@3.940.0':
+    resolution: {integrity: sha512-ue4MmUl9JvNmqe3kHAT0YlGHqHZ2ZB5Fog8JFu0TLZjMzxE5JfGWFJFLLntahe6OVulKD7KwwnpTjJlUnn3DtQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/s3-request-presigner@3.940.0':
+    resolution: {integrity: sha512-TgTUDM2H7revReDfkVwVtIqxV3K0cJLdyuLDIkefVHRUNKwU1Vd5FB2TaFrs6STO0kx5pTckDCOLh0iy7nW5WQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/signature-v4-multi-region@3.940.0':
+    resolution: {integrity: sha512-ugHZEoktD/bG6mdgmhzLDjMP2VrYRAUPRPF1DpCyiZexkH7DCU7XrSJyXMvkcf0DHV+URk0q2sLf/oqn1D2uYw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/token-providers@3.451.0':
+    resolution: {integrity: sha512-ij1L5iUbn6CwxVOT1PG4NFjsrsKN9c4N1YEM0lkl6DwmaNOscjLKGSNyj9M118vSWsOs1ZDbTwtj++h0O/BWrQ==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/token-providers@3.839.0':
+    resolution: {integrity: sha512-2nlafqdSbet/2WtYIoZ7KEGFowFonPBDYlTjrUvwU2yooE10VhvzhLSCTB2aKIVzo2Z2wL5WGFQsqAY5QwK6Bw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/token-providers@3.840.0':
+    resolution: {integrity: sha512-6BuTOLTXvmgwjK7ve7aTg9JaWFdM5UoMolLVPMyh3wTv9Ufalh8oklxYHUBIxsKkBGO2WiHXytveuxH6tAgTYg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/token-providers@3.931.0':
+    resolution: {integrity: sha512-dr+02X9oxqmXG0856odFJ7wAXy12pr/tq2Zg+IS0TDThFvgtvx4yChkpqmc89wGoW+Aly47JPfPUXh0IMpGzIg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/token-providers@3.940.0':
+    resolution: {integrity: sha512-k5qbRe/ZFjW9oWEdzLIa2twRVIEx7p/9rutofyrRysrtEnYh3HAWCngAnwbgKMoiwa806UzcTRx0TjyEpnKcCg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/types@3.451.0':
+    resolution: {integrity: sha512-rhK+qeYwCIs+laJfWCcrYEjay2FR/9VABZJ2NRM89jV/fKqGVQR52E5DQqrI+oEIL5JHMhhnr4N4fyECMS35lw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/types@3.821.0':
+    resolution: {integrity: sha512-Znroqdai1a90TlxGaJ+FK1lwC0fHpo97Xjsp5UKGR5JODYm7f9+/fF17ebO1KdoBr/Rm0UIFiF5VmI8ts9F1eA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/types@3.840.0':
+    resolution: {integrity: sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/types@3.930.0':
+    resolution: {integrity: sha512-we/vaAgwlEFW7IeftmCLlLMw+6hFs3DzZPJw7lVHbj/5HJ0bz9gndxEsS2lQoeJ1zhiiLqAqvXxmM43s0MBg0A==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/types@3.936.0':
+    resolution: {integrity: sha512-uz0/VlMd2pP5MepdrHizd+T+OKfyK4r3OA9JI+L/lPKg0YFQosdJNCKisr6o70E3dh8iMpFYxF1UN/4uZsyARg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-arn-parser@3.893.0':
+    resolution: {integrity: sha512-u8H4f2Zsi19DGnwj5FSZzDMhytYF/bCh37vAtBsn3cNDL3YG578X5oc+wSX54pM3tOxS+NY7tvOAo52SW7koUA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-endpoints@3.451.0':
+    resolution: {integrity: sha512-giqLGBTnRIcKkDqwU7+GQhKbtJ5Ku35cjGQIfMyOga6pwTBUbaK0xW1Sdd8sBQ1GhApscnChzI9o/R9x0368vw==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/util-endpoints@3.828.0':
+    resolution: {integrity: sha512-RvKch111SblqdkPzg3oCIdlGxlQs+k+P7Etory9FmxPHyPDvsP1j1c74PmgYqtzzMWmoXTjd+c9naUHh9xG8xg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-endpoints@3.840.0':
+    resolution: {integrity: sha512-eqE9ROdg/Kk0rj3poutyRCFauPDXIf/WSvCqFiRDDVi6QOnCv/M0g2XW8/jSvkJlOyaXkNCptapIp6BeeFFGYw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-endpoints@3.930.0':
+    resolution: {integrity: sha512-M2oEKBzzNAYr136RRc6uqw3aWlwCxqTP1Lawps9E1d2abRPvl1p1ztQmmXp1Ak4rv8eByIZ+yQyKQ3zPdRG5dw==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-endpoints@3.936.0':
+    resolution: {integrity: sha512-0Zx3Ntdpu+z9Wlm7JKUBOzS9EunwKAb4KdGUQQxDqh5Lc3ta5uBoub+FgmVuzwnmBu9U1Os8UuwVTH0Lgu+P5w==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-format-url@3.936.0':
+    resolution: {integrity: sha512-MS5eSEtDUFIAMHrJaMERiHAvDPdfxc/T869ZjDNFAIiZhyc037REw0aoTNeimNXDNy2txRNZJaAUn/kE4RwN+g==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-locate-window@3.310.0':
+    resolution: {integrity: sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==}
+    engines: {node: '>=14.0.0'}
+
+  '@aws-sdk/util-locate-window@3.893.0':
+    resolution: {integrity: sha512-T89pFfgat6c8nMmpI8eKjBcDcgJq36+m9oiXbcUzeU55MP9ZuGgBomGjGnHaEyF36jenW9gmg3NfZDm0AO2XPg==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/util-user-agent-browser@3.451.0':
+    resolution: {integrity: sha512-Ws5mG3J0TQifH7OTcMrCTexo7HeSAc3cBgjfhS/ofzPUzVCtsyg0G7I6T7wl7vJJETix2Kst2cpOsxygPgPD9w==}
+
+  '@aws-sdk/util-user-agent-browser@3.821.0':
+    resolution: {integrity: sha512-irWZHyM0Jr1xhC+38OuZ7JB6OXMLPZlj48thElpsO1ZSLRkLZx5+I7VV6k3sp2yZ7BYbKz/G2ojSv4wdm7XTLw==}
+
+  '@aws-sdk/util-user-agent-browser@3.840.0':
+    resolution: {integrity: sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==}
+
+  '@aws-sdk/util-user-agent-browser@3.930.0':
+    resolution: {integrity: sha512-q6lCRm6UAe+e1LguM5E4EqM9brQlDem4XDcQ87NzEvlTW6GzmNCO0w1jS0XgCFXQHjDxjdlNFX+5sRbHijwklg==}
+
+  '@aws-sdk/util-user-agent-browser@3.936.0':
+    resolution: {integrity: sha512-eZ/XF6NxMtu+iCma58GRNRxSq4lHo6zHQLOZRIeL/ghqYJirqHdenMOwrzPettj60KWlv827RVebP9oNVrwZbw==}
+
+  '@aws-sdk/util-user-agent-node@3.451.0':
+    resolution: {integrity: sha512-TBzm6P+ql4mkGFAjPlO1CI+w3yUT+NulaiALjl/jNX/nnUp6HsJsVxJf4nVFQTG5KRV0iqMypcs7I3KIhH+LmA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
+
+  '@aws-sdk/util-user-agent-node@3.839.0':
+    resolution: {integrity: sha512-MuunkIG1bJVMtTH7MbjXOrhHleU5wjHz5eCAUc6vj7M9rwol71nqjj9b8RLnkO5gsJcKc29Qk8iV6xQuzKWNMw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
+
+  '@aws-sdk/util-user-agent-node@3.840.0':
+    resolution: {integrity: sha512-Fy5JUEDQU1tPm2Yw/YqRYYc27W5+QD/J4mYvQvdWjUGZLB5q3eLFMGD35Uc28ZFoGMufPr4OCxK/bRfWROBRHQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
+
+  '@aws-sdk/util-user-agent-node@3.931.0':
+    resolution: {integrity: sha512-j5if01rt7JCGYDVXck39V7IUyKAN73vKUPzmu+jp1apU3Q0lLSTZA/HCfL2HkMUKVLE67ibjKb+NCoEg0QhujA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
+
+  '@aws-sdk/util-user-agent-node@3.940.0':
+    resolution: {integrity: sha512-dlD/F+L/jN26I8Zg5x0oDGJiA+/WEQmnSE27fi5ydvYnpfQLwThtQo9SsNS47XSR/SOULaaoC9qx929rZuo74A==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      aws-crt: '>=1.0.0'
+    peerDependenciesMeta:
+      aws-crt:
+        optional: true
+
+  '@aws-sdk/util-utf8-browser@3.259.0':
+    resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
+
+  '@aws-sdk/xml-builder@3.821.0':
+    resolution: {integrity: sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws-sdk/xml-builder@3.930.0':
+    resolution: {integrity: sha512-YIfkD17GocxdmlUVc3ia52QhcWuRIUJonbF8A2CYfcWNV3HzvAqpcPeC0bYUhkK+8e8YO1ARnLKZQE0TlwzorA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws/lambda-invoke-store@0.1.1':
+    resolution: {integrity: sha512-RcLam17LdlbSOSp9VxmUu1eI6Mwxp+OwhD2QhiSNmNCzoDb0EeUXTD2n/WbcnrAYMGlmf05th6QYq23VqvJqpA==}
+    engines: {node: '>=18.0.0'}
+
+  '@aws/lambda-invoke-store@0.2.1':
+    resolution: {integrity: sha512-sIyFcoPZkTtNu9xFeEoynMef3bPJIAbOfUh+ueYcfhVl6xm2VRtMcMclSxmZCMnHHd4hlYKJeq/aggmBEWynww==}
+    engines: {node: '>=18.0.0'}
+
+  '@babel/code-frame@7.22.13':
+    resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/code-frame@7.24.7':
+    resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/compat-data@7.22.9':
+    resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/core@7.22.17':
+    resolution: {integrity: sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/eslint-parser@7.21.8':
+    resolution: {integrity: sha512-HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
+    peerDependencies:
+      '@babel/core': '>=7.11.0'
+      eslint: ^7.5.0 || ^8.0.0
+
+  '@babel/generator@7.22.15':
+    resolution: {integrity: sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/generator@7.24.7':
+    resolution: {integrity: sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.22.5':
+    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-compilation-targets@7.22.15':
+    resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.24.0':
+    resolution: {integrity: sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-environment-visitor@7.22.20':
+    resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-environment-visitor@7.24.7':
+    resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-function-name@7.24.7':
+    resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-hoist-variables@7.24.7':
+    resolution: {integrity: sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-member-expression-to-functions@7.23.0':
+    resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-imports@7.22.15':
+    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-module-transforms@7.22.17':
+    resolution: {integrity: sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.22.5':
+    resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-plugin-utils@7.22.5':
+    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-plugin-utils@7.24.0':
+    resolution: {integrity: sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-replace-supers@7.22.20':
+    resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-simple-access@7.22.5':
+    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
+    resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-split-export-declaration@7.22.6':
+    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-split-export-declaration@7.24.7':
+    resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.24.7':
+    resolution: {integrity: sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-string-parser@7.27.1':
+    resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.24.7':
+    resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-identifier@7.27.1':
+    resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-validator-option@7.22.15':
+    resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helpers@7.22.15':
+    resolution: {integrity: sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/highlight@7.22.13':
+    resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/highlight@7.24.7':
+    resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/parser@7.24.1':
+    resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/parser@7.24.7':
+    resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/parser@7.27.0':
+    resolution: {integrity: sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/parser@7.27.5':
+    resolution: {integrity: sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-syntax-decorators@7.22.10':
+    resolution: {integrity: sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-jsx@7.22.5':
+    resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-typescript@7.21.4':
+    resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.21.5':
+    resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-display-name@7.18.6':
+    resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx-development@7.18.6':
+    resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-jsx@7.22.15':
+    resolution: {integrity: sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-react-pure-annotations@7.18.6':
+    resolution: {integrity: sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typescript@7.21.3':
+    resolution: {integrity: sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-react@7.18.6':
+    resolution: {integrity: sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-typescript@7.21.5':
+    resolution: {integrity: sha512-iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/runtime@7.27.0':
+    resolution: {integrity: sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/runtime@7.28.4':
+    resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.22.15':
+    resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.24.7':
+    resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.24.7':
+    resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.24.0':
+    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.24.7':
+    resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.27.0':
+    resolution: {integrity: sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.27.3':
+    resolution: {integrity: sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==}
+    engines: {node: '>=6.9.0'}
+
+  '@balena/dockerignore@1.0.2':
+    resolution: {integrity: sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==}
+
+  '@bcoe/v8-coverage@1.0.2':
+    resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
+    engines: {node: '>=18'}
+
+  '@better-auth/utils@0.2.6':
+    resolution: {integrity: sha512-3y/vaL5Ox33dBwgJ6ub3OPkVqr6B5xL2kgxNHG8eHZuryLyG/4JSPGqjbdRSgjuy9kALUZYDFl+ORIAxlWMSuA==}
+
+  '@braintree/sanitize-url@7.1.1':
+    resolution: {integrity: sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==}
+
+  '@bufbuild/protobuf@1.10.0':
+    resolution: {integrity: sha512-QDdVFLoN93Zjg36NoQPZfsVH9tZew7wKDKyV5qRdj8ntT4wQCOradQjRaTdwMhWUYsgKsvCINKKm87FdEk96Ag==}
+
+  '@bufbuild/protobuf@2.2.5':
+    resolution: {integrity: sha512-/g5EzJifw5GF8aren8wZ/G5oMuPoGeS6MQD3ca8ddcvdXR5UELUfdTZITCGNhNXynY/AYl3Z4plmxdj/tRl/hQ==}
+
+  '@bugsnag/cuid@3.1.1':
+    resolution: {integrity: sha512-d2z4b0rEo3chI07FNN1Xds8v25CNeekecU6FC/2Fs9MxY2EipkZTThVcV2YinMn8dvRUlViKOyC50evoUxg8tw==}
+
+  '@changesets/apply-release-plan@6.1.4':
+    resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==}
+
+  '@changesets/assemble-release-plan@5.2.4':
+    resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==}
+
+  '@changesets/changelog-git@0.1.14':
+    resolution: {integrity: sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==}
+
+  '@changesets/cli@2.26.2':
+    resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==}
+    hasBin: true
+
+  '@changesets/config@2.3.1':
+    resolution: {integrity: sha512-PQXaJl82CfIXddUOppj4zWu+987GCw2M+eQcOepxN5s+kvnsZOwjEJO3DH9eVy+OP6Pg/KFEWdsECFEYTtbg6w==}
+
+  '@changesets/errors@0.1.4':
+    resolution: {integrity: sha512-HAcqPF7snsUJ/QzkWoKfRfXushHTu+K5KZLJWPb34s4eCZShIf8BFO3fwq6KU8+G7L5KdtN2BzQAXOSXEyiY9Q==}
+
+  '@changesets/get-dependents-graph@1.3.6':
+    resolution: {integrity: sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q==}
+
+  '@changesets/get-github-info@0.5.2':
+    resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==}
+
+  '@changesets/get-release-plan@3.0.17':
+    resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==}
+
+  '@changesets/get-version-range-type@0.3.2':
+    resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==}
+
+  '@changesets/git@2.0.0':
+    resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==}
+
+  '@changesets/logger@0.0.5':
+    resolution: {integrity: sha512-gJyZHomu8nASHpaANzc6bkQMO9gU/ib20lqew1rVx753FOxffnCrJlGIeQVxNWCqM+o6OOleCo/ivL8UAO5iFw==}
+
+  '@changesets/parse@0.3.16':
+    resolution: {integrity: sha512-127JKNd167ayAuBjUggZBkmDS5fIKsthnr9jr6bdnuUljroiERW7FBTDNnNVyJ4l69PzR57pk6mXQdtJyBCJKg==}
+
+  '@changesets/pre@1.0.14':
+    resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==}
+
+  '@changesets/read@0.5.9':
+    resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==}
+
+  '@changesets/types@4.1.0':
+    resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==}
+
+  '@changesets/types@5.2.1':
+    resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==}
+
+  '@changesets/write@0.2.3':
+    resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==}
+
+  '@chevrotain/cst-dts-gen@11.0.3':
+    resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==}
+
+  '@chevrotain/gast@11.0.3':
+    resolution: {integrity: sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==}
+
+  '@chevrotain/regexp-to-ast@11.0.3':
+    resolution: {integrity: sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==}
+
+  '@chevrotain/types@11.0.3':
+    resolution: {integrity: sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==}
+
+  '@chevrotain/utils@11.0.3':
+    resolution: {integrity: sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==}
+
+  '@clack/core@0.5.0':
+    resolution: {integrity: sha512-p3y0FIOwaYRUPRcMO7+dlmLh8PSRcrjuTndsiA0WAFbWES0mLZlrjVoBRZ9DzkPFJZG6KGkJmoEAY0ZcVWTkow==}
+
+  '@clack/prompts@0.11.0':
+    resolution: {integrity: sha512-pMN5FcrEw9hUkZA4f+zLlzivQSeQf5dRGJjSUbvVYDLvpKCdQx5OaknvKzgbtXOizhP+SJJJjqEbOe55uKKfAw==}
+
+  '@clickhouse/client-common@1.11.1':
+    resolution: {integrity: sha512-bme0le2yhDSAh13d2fxhSW5ZrNoVqZ3LTyac8jK6hNH0qkksXnjYkLS6KQalPU6NMpffxHmpI4+/Gi2MnX0NCA==}
+
+  '@clickhouse/client-common@1.12.1':
+    resolution: {integrity: sha512-ccw1N6hB4+MyaAHIaWBwGZ6O2GgMlO99FlMj0B0UEGfjxM9v5dYVYql6FpP19rMwrVAroYs/IgX2vyZEBvzQLg==}
+
+  '@clickhouse/client@1.11.1':
+    resolution: {integrity: sha512-u9h++h72SmWystijNqfNvMkfA+5+Y1LNfmLL/odCL3VgI3oyAPP9ubSw/Yrt2zRZkLKehMMD1kuOej0QHbSoBA==}
+    engines: {node: '>=16'}
+
+  '@clickhouse/client@1.12.1':
+    resolution: {integrity: sha512-7ORY85rphRazqHzImNXMrh4vsaPrpetFoTWpZYueCO2bbO6PXYDXp/GQ4DgxnGIqbWB/Di1Ai+Xuwq2o7DJ36A==}
+    engines: {node: '>=16'}
+
+  '@codemirror/autocomplete@6.4.0':
+    resolution: {integrity: sha512-HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA==}
+    peerDependencies:
+      '@codemirror/language': ^6.0.0
+      '@codemirror/state': ^6.0.0
+      '@codemirror/view': ^6.0.0
+      '@lezer/common': ^1.0.0
+
+  '@codemirror/commands@6.1.3':
+    resolution: {integrity: sha512-wUw1+vb34Ultv0Q9m/OVB7yizGXgtoDbkI5f5ErM8bebwLyUYjicdhJTKhTvPTpgkv8dq/BK0lQ3K5pRf2DAJw==}
+
+  '@codemirror/lang-javascript@6.1.2':
+    resolution: {integrity: sha512-OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==}
+
+  '@codemirror/lang-json@6.0.1':
+    resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==}
+
+  '@codemirror/lang-sql@6.5.5':
+    resolution: {integrity: sha512-DvOaP2RXLb2xlxJxxydTFfwyYw5YDqEFea6aAfgh9UH0kUD6J1KFZ0xPgPpw1eo/5s2w3L6uh5PVR7GM23GxkQ==}
+
+  '@codemirror/language@6.3.2':
+    resolution: {integrity: sha512-g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA==}
+
+  '@codemirror/lint@6.4.2':
+    resolution: {integrity: sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==}
+
+  '@codemirror/search@6.2.3':
+    resolution: {integrity: sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==}
+
+  '@codemirror/state@6.2.0':
+    resolution: {integrity: sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==}
+
+  '@codemirror/theme-one-dark@6.1.3':
+    resolution: {integrity: sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==}
+
+  '@codemirror/view@6.7.2':
+    resolution: {integrity: sha512-HeK2GyycxceaQVyvYVYXmn1vUKYYBsHCcfGRSsFO+3fRRtwXx2STK0YiFBmiWx2vtU9gUAJgIUXUN8a0osI8Ng==}
+
+  '@colors/colors@1.5.0':
+    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
+    engines: {node: '>=0.1.90'}
+
+  '@conform-to/dom@0.9.2':
+    resolution: {integrity: sha512-vYJvXMRxa9Ieslv5eVcak5+0QbcTv+HwdLqRPZ8lhSFZx5qQWJwdou+Iz+ERzsSQHh7QS3DDYG5HmzaN4evf9g==}
+
+  '@conform-to/react@0.9.2':
+    resolution: {integrity: sha512-0eApSadAkM5/l1JNfQqpU+O/9lkjY89riG6jnrW8DWepyGfmN/COZtT7sRXla0SVOspXGJqGcKh+nk1f7Zbpaw==}
+    peerDependencies:
+      react: '>=16.8'
+
+  '@conform-to/zod@0.9.2':
+    resolution: {integrity: sha512-treG9ZcuNuRERQ1uYvJSWT0zZuqHnYTzRwucg20+/WdjgKNSb60Br+Cy6BAHvVQ8dN6wJsGkHenkX2mSVw3xOA==}
+    peerDependencies:
+      '@conform-to/dom': 0.9.2
+      zod: ^3.21.0
+
+  '@connectrpc/connect-node@1.4.0':
+    resolution: {integrity: sha512-0ANnrr6SvsjevsWEgdzHy7BaHkluZyS6s4xNoVt7RBHFR5V/kT9lPokoIbYUOU9JHzdRgTaS3x5595mwUsu15g==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@bufbuild/protobuf': ^1.4.2
+      '@connectrpc/connect': 1.4.0
+
+  '@connectrpc/connect-web@2.0.0-rc.3':
+    resolution: {integrity: sha512-w88P8Lsn5CCsA7MFRl2e6oLY4J/5toiNtJns/YJrlyQaWOy3RO8pDgkz+iIkG98RPMhj2thuBvsd3Cn4DKKCkw==}
+    peerDependencies:
+      '@bufbuild/protobuf': ^2.2.0
+      '@connectrpc/connect': 2.0.0-rc.3
+
+  '@connectrpc/connect@1.4.0':
+    resolution: {integrity: sha512-vZeOkKaAjyV4+RH3+rJZIfDFJAfr+7fyYr6sLDKbYX3uuTVszhFe9/YKf5DNqrDb5cKdKVlYkGn6DTDqMitAnA==}
+    peerDependencies:
+      '@bufbuild/protobuf': ^1.4.2
+
+  '@connectrpc/connect@2.0.0-rc.3':
+    resolution: {integrity: sha512-ARBt64yEyKbanyRETTjcjJuHr2YXorzQo0etyS5+P6oSeW8xEuzajA9g+zDnMcj1hlX2dQE93foIWQGfpru7gQ==}
+    peerDependencies:
+      '@bufbuild/protobuf': ^2.2.0
+
+  '@date-fns/tz@1.4.1':
+    resolution: {integrity: sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==}
+
+  '@depot/cli-darwin-arm64@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-H7tQ0zWXVmdYXGFvt3d/v5fmquMlMM1I9JC8C2yiBZ9En9a20hzSbKoiym92RtcfqjKQFvhXL0DT6vQmJ8bgQA==}
+    engines: {node: '>=14'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@depot/cli-darwin-x64@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-3RDyybnCC2YSvbJCkHxXBYbKR7adUO7U00O9DHreX8EyS2E/C3kQgET+rFXR+iDdeG0h+h+At2rDng7AxvUhDw==}
+    engines: {node: '>=14'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@depot/cli-linux-arm64@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-Fc1+Guqdsl2WM+b+76FirRjjRvEoYZX0MI4uuIQF9c9gwp6UZSZ5o3U7lAUpdkclVMKXSAW5bsIpgcOfUiJX3w==}
+    engines: {node: '>=14'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@depot/cli-linux-arm@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-95kjKwKxP6RKkAhJoPlO6g3drEYpFWy9AC7QfvQMHDRnI3HXgbxA/BSTp4R3C4TTfp5JUPShVf8Js/NAcrUpUQ==}
+    engines: {node: '>=14'}
+    cpu: [arm]
+    os: [linux]
+
+  '@depot/cli-linux-ia32@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-2KoyIoYqnyIuynPN+mWbugoOB2APiNNvFLKERWOwPa0KYLSfcENT3sYxDW8tDuIw2dftHlmZN73uvXrGFeMcDQ==}
+    engines: {node: '>=14'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@depot/cli-linux-x64@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-B8xDlXFxhYHD2tUk0jUv7SKipLfWwJVlY7ZhDQixyQzatibXakahdqpvZJgE6FLZJd3lgFIEAVsKURZHa1l57A==}
+    engines: {node: '>=14'}
+    cpu: [x64]
+    os: [linux]
+
+  '@depot/cli-win32-arm64@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-CPJX691MKEhnKZX25xS+opWESgPQ73HKkEwkAvvVqdBzahndcHoqAeIxYLv2hoCqrDlkH3YCF+DJleLiEP3blA==}
+    engines: {node: '>=14'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@depot/cli-win32-ia32@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-6eewZ1zPEyNL3zcCwC01s3rZNMqMGVu1iv/EPywj3/uk4CNyUBaTlZ3StQ1BLFHPQnU0vk29yOzA5ZEuRLSyxA==}
+    engines: {node: '>=14'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@depot/cli-win32-x64@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-9CRcc7D0/x4UrBkDuc35WVPMQG5gKMD1JckGLEl6VREE0Ppdny6n+hunQ8prwVc8aqzKG134XCC2U4DUjYg18A==}
+    engines: {node: '>=14'}
+    cpu: [x64]
+    os: [win32]
+
+  '@depot/cli@0.0.1-cli.2.80.0':
+    resolution: {integrity: sha512-KvmOiQdpbamFziqnzzgqBm6RjfGhLJimBBYEOVriTxCPtVJuBIFm34xZllM36OQzPZIWpWBP+2/UnOyRG5smUg==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  '@depot/sdk-node@1.0.0':
+    resolution: {integrity: sha512-zq1xqesqGhp58Rh0bTXhsjoC8X+L+LwZABLlQh7Rm45770nGtAABa3GtU1n/776YTMI1gIAhzc++Jxae3H0J4w==}
+
+  '@discoveryjs/json-ext@0.5.7':
+    resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
+    engines: {node: '>=10.0.0'}
+
+  '@e2b/code-interpreter@1.1.0':
+    resolution: {integrity: sha512-T54U7WS56ou11ytoxlYllBRBM+MYBpOvVZQa1p1qE4KDZBKJd9m1kAA0PqHjy5T6f/tSv4w5wlq4oyExl4QLLA==}
+    engines: {node: '>=18'}
+
+  '@effect/platform@0.63.2':
+    resolution: {integrity: sha512-b39pVFw0NGo/tXjGShW7Yg0M+kG7bRrFR6+dQ3aIu99ePTkTp6bGb/kDB7n+dXsFFdIqHsQGYESeYcOQngxdFQ==}
+    peerDependencies:
+      '@effect/schema': ^0.72.2
+      effect: ^3.7.2
+
+  '@effect/schema@0.72.2':
+    resolution: {integrity: sha512-/x1BIA2pqcUidNrOMmwYe6Z58KtSgHSc5iJu7bNwIxi2LHMVuUao1BvpI5x6i7T/zkoi4dd1S6qasZzJIYDjdw==}
+    deprecated: this package has been merged into the main effect package
+    peerDependencies:
+      effect: ^3.7.2
+
+  '@electric-sql/client@0.4.0':
+    resolution: {integrity: sha512-YVYSqHitqVIDC1RBTfmHMfAfqDNAKMK9/AFVTDFQQxN3Q85dIQS49zThAuJVecYiuYRJvTiqf40c4n39jZSNrQ==}
+
+  '@electric-sql/client@1.0.14':
+    resolution: {integrity: sha512-LtPAfeMxXRiYS0hyDQ5hue2PjljUiK9stvzsVyVb4nwxWQxfOWTSF42bHTs/o5i3x1T4kAQ7mwHpxa4A+f8X7Q==}
+
+  '@electric-sql/react@0.3.5':
+    resolution: {integrity: sha512-qPrlF3BsRg5L8zAn1sLGzc3pkswfEHyQI3lNOu7Xllv1DBx85RvHR1zgGGPAUfC8iwyWupQu9pFPE63GdbeuhA==}
+    peerDependencies:
+      react: ^18.3.1
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+  '@emnapi/runtime@1.7.1':
+    resolution: {integrity: sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==}
+
+  '@emotion/hash@0.9.0':
+    resolution: {integrity: sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==}
+
+  '@emotion/is-prop-valid@0.8.8':
+    resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
+
+  '@emotion/memoize@0.7.4':
+    resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==}
+
+  '@epic-web/test-server@0.1.0':
+    resolution: {integrity: sha512-RjJ2WvFepiXynHqm6svriviySVmpCA2QxJmy0DHYwy/9qjeSZvTAIttNqCLLryrV6hL+RsSpHS9CN4MSn/4DpA==}
+    engines: {node: '>=20'}
+
+  '@esbuild-kit/cjs-loader@2.4.1':
+    resolution: {integrity: sha512-lhc/XLith28QdW0HpHZvZKkorWgmCNT7sVelMHDj3HFdTfdqkwEKvT+aXVQtNAmCC39VJhunDkWhONWB7335mg==}
+    deprecated: 'Merged into tsx: https://tsx.is'
+
+  '@esbuild-kit/core-utils@3.0.0':
+    resolution: {integrity: sha512-TXmwH9EFS3DC2sI2YJWJBgHGhlteK0Xyu1VabwetMULfm3oYhbrsWV5yaSr2NTWZIgDGVLHbRf0inxbjXqAcmQ==}
+    deprecated: 'Merged into tsx: https://tsx.is'
+
+  '@esbuild-kit/esm-loader@2.5.4':
+    resolution: {integrity: sha512-afmtLf6uqxD5IgwCzomtqCYIgz/sjHzCWZFvfS5+FzeYxOURPUo4QcHtqJxbxWOMOogKriZanN/1bJQE/ZL93A==}
+    deprecated: 'Merged into tsx: https://tsx.is'
+
+  '@esbuild/aix-ppc64@0.19.11':
+    resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/aix-ppc64@0.21.5':
+    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/aix-ppc64@0.23.0':
+    resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/aix-ppc64@0.24.2':
+    resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/aix-ppc64@0.25.1':
+    resolution: {integrity: sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@esbuild/android-arm64@0.17.6':
+    resolution: {integrity: sha512-YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.18.11':
+    resolution: {integrity: sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.19.11':
+    resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.21.5':
+    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.23.0':
+    resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.24.2':
+    resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm64@0.25.1':
+    resolution: {integrity: sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [android]
+
+  '@esbuild/android-arm@0.15.18':
+    resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.17.6':
+    resolution: {integrity: sha512-bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.18.11':
+    resolution: {integrity: sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.19.11':
+    resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.21.5':
+    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.23.0':
+    resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.24.2':
+    resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-arm@0.25.1':
+    resolution: {integrity: sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [android]
+
+  '@esbuild/android-x64@0.17.6':
+    resolution: {integrity: sha512-MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.18.11':
+    resolution: {integrity: sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.19.11':
+    resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.21.5':
+    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.23.0':
+    resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.24.2':
+    resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/android-x64@0.25.1':
+    resolution: {integrity: sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [android]
+
+  '@esbuild/darwin-arm64@0.17.6':
+    resolution: {integrity: sha512-bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.18.11':
+    resolution: {integrity: sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.19.11':
+    resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.21.5':
+    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.23.0':
+    resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.24.2':
+    resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-arm64@0.25.1':
+    resolution: {integrity: sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.17.6':
+    resolution: {integrity: sha512-xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.18.11':
+    resolution: {integrity: sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.19.11':
+    resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.21.5':
+    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.23.0':
+    resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.24.2':
+    resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/darwin-x64@0.25.1':
+    resolution: {integrity: sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@esbuild/freebsd-arm64@0.17.6':
+    resolution: {integrity: sha512-EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.18.11':
+    resolution: {integrity: sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.19.11':
+    resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.21.5':
+    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.23.0':
+    resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.24.2':
+    resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-arm64@0.25.1':
+    resolution: {integrity: sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.17.6':
+    resolution: {integrity: sha512-Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.18.11':
+    resolution: {integrity: sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.19.11':
+    resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.21.5':
+    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.23.0':
+    resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.24.2':
+    resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/freebsd-x64@0.25.1':
+    resolution: {integrity: sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@esbuild/linux-arm64@0.17.6':
+    resolution: {integrity: sha512-bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.18.11':
+    resolution: {integrity: sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.19.11':
+    resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.21.5':
+    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.23.0':
+    resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.24.2':
+    resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm64@0.25.1':
+    resolution: {integrity: sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.17.6':
+    resolution: {integrity: sha512-7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.18.11':
+    resolution: {integrity: sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.19.11':
+    resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.21.5':
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.23.0':
+    resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.24.2':
+    resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-arm@0.25.1':
+    resolution: {integrity: sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==}
+    engines: {node: '>=18'}
+    cpu: [arm]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.17.6':
+    resolution: {integrity: sha512-ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.18.11':
+    resolution: {integrity: sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.19.11':
+    resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.21.5':
+    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.23.0':
+    resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.24.2':
+    resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-ia32@0.25.1':
+    resolution: {integrity: sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.15.18':
+    resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.17.6':
+    resolution: {integrity: sha512-y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.18.11':
+    resolution: {integrity: sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.19.11':
+    resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.21.5':
+    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
+    engines: {node: '>=12'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.23.0':
+    resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.24.2':
+    resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-loong64@0.25.1':
+    resolution: {integrity: sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==}
+    engines: {node: '>=18'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.17.6':
+    resolution: {integrity: sha512-09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.18.11':
+    resolution: {integrity: sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.19.11':
+    resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.21.5':
+    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.23.0':
+    resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.24.2':
+    resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-mips64el@0.25.1':
+    resolution: {integrity: sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==}
+    engines: {node: '>=18'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.17.6':
+    resolution: {integrity: sha512-AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.18.11':
+    resolution: {integrity: sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.19.11':
+    resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.21.5':
+    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.23.0':
+    resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.24.2':
+    resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-ppc64@0.25.1':
+    resolution: {integrity: sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==}
+    engines: {node: '>=18'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.17.6':
+    resolution: {integrity: sha512-Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.18.11':
+    resolution: {integrity: sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.19.11':
+    resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.21.5':
+    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.23.0':
+    resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.24.2':
+    resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-riscv64@0.25.1':
+    resolution: {integrity: sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==}
+    engines: {node: '>=18'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.17.6':
+    resolution: {integrity: sha512-SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.18.11':
+    resolution: {integrity: sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.19.11':
+    resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.21.5':
+    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.23.0':
+    resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.24.2':
+    resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-s390x@0.25.1':
+    resolution: {integrity: sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==}
+    engines: {node: '>=18'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.17.6':
+    resolution: {integrity: sha512-a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.18.11':
+    resolution: {integrity: sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.19.11':
+    resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.21.5':
+    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.23.0':
+    resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.24.2':
+    resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/linux-x64@0.25.1':
+    resolution: {integrity: sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [linux]
+
+  '@esbuild/netbsd-arm64@0.24.2':
+    resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-arm64@0.25.1':
+    resolution: {integrity: sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.17.6':
+    resolution: {integrity: sha512-EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.18.11':
+    resolution: {integrity: sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.19.11':
+    resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.21.5':
+    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.23.0':
+    resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.24.2':
+    resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/netbsd-x64@0.25.1':
+    resolution: {integrity: sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@esbuild/openbsd-arm64@0.23.0':
+    resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-arm64@0.24.2':
+    resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-arm64@0.25.1':
+    resolution: {integrity: sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.17.6':
+    resolution: {integrity: sha512-xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.18.11':
+    resolution: {integrity: sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.19.11':
+    resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.21.5':
+    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.23.0':
+    resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.24.2':
+    resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/openbsd-x64@0.25.1':
+    resolution: {integrity: sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@esbuild/sunos-x64@0.17.6':
+    resolution: {integrity: sha512-gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.18.11':
+    resolution: {integrity: sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.19.11':
+    resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.21.5':
+    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.23.0':
+    resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.24.2':
+    resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/sunos-x64@0.25.1':
+    resolution: {integrity: sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@esbuild/win32-arm64@0.17.6':
+    resolution: {integrity: sha512-G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.18.11':
+    resolution: {integrity: sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.19.11':
+    resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.21.5':
+    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.23.0':
+    resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.24.2':
+    resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-arm64@0.25.1':
+    resolution: {integrity: sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==}
+    engines: {node: '>=18'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.17.6':
+    resolution: {integrity: sha512-96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.18.11':
+    resolution: {integrity: sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.19.11':
+    resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.21.5':
+    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.23.0':
+    resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.24.2':
+    resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-ia32@0.25.1':
+    resolution: {integrity: sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==}
+    engines: {node: '>=18'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.17.6':
+    resolution: {integrity: sha512-n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.18.11':
+    resolution: {integrity: sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.19.11':
+    resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.21.5':
+    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.23.0':
+    resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.24.2':
+    resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@esbuild/win32-x64@0.25.1':
+    resolution: {integrity: sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==}
+    engines: {node: '>=18'}
+    cpu: [x64]
+    os: [win32]
+
+  '@eslint-community/eslint-utils@4.4.0':
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+
+  '@eslint-community/regexpp@4.5.1':
+    resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
+  '@eslint/eslintrc@1.4.1':
+    resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@fal-ai/serverless-client@0.15.0':
+    resolution: {integrity: sha512-4Vuocu0342OijAN6xO/lwohDV7h90LbkTnOAEwH+pYvMFVC6RYmHS4GILc/wnOWBTw+iFlZFEKlljEVolkjVfg==}
+    engines: {node: '>=18.0.0'}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
+
+  '@fast-csv/parse@5.0.2':
+    resolution: {integrity: sha512-gMu1Btmm99TP+wc0tZnlH30E/F1Gw1Tah3oMDBHNPe9W8S68ixVHjt89Wg5lh7d9RuQMtwN+sGl5kxR891+fzw==}
+
+  '@fastify/accept-negotiator@2.0.1':
+    resolution: {integrity: sha512-/c/TW2bO/v9JeEgoD/g1G5GxGeCF1Hafdf79WPmUlgYiBXummY0oX3VVq4yFkKKVBKDNlaDUYoab7g38RpPqCQ==}
+
+  '@fastify/ajv-compiler@4.0.2':
+    resolution: {integrity: sha512-Rkiu/8wIjpsf46Rr+Fitd3HRP+VsxUFDDeag0hs9L0ksfnwx2g7SPQQTFL0E8Qv+rfXzQOxBJnjUB9ITUDjfWQ==}
+
+  '@fastify/busboy@2.1.1':
+    resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
+    engines: {node: '>=14'}
+
+  '@fastify/error@4.2.0':
+    resolution: {integrity: sha512-RSo3sVDXfHskiBZKBPRgnQTtIqpi/7zhJOEmAxCiBcM7d0uwdGdxLlsCaLzGs8v8NnxIRlfG0N51p5yFaOentQ==}
+
+  '@fastify/fast-json-stringify-compiler@5.0.3':
+    resolution: {integrity: sha512-uik7yYHkLr6fxd8hJSZ8c+xF4WafPK+XzneQDPU+D10r5X19GW8lJcom2YijX2+qtFF1ENJlHXKFM9ouXNJYgQ==}
+
+  '@fastify/forwarded@3.0.0':
+    resolution: {integrity: sha512-kJExsp4JCms7ipzg7SJ3y8DwmePaELHxKYtg+tZow+k0znUTf3cb+npgyqm8+ATZOdmfgfydIebPDWM172wfyA==}
+
+  '@fastify/merge-json-schemas@0.2.1':
+    resolution: {integrity: sha512-OA3KGBCy6KtIvLf8DINC5880o5iBlDX4SxzLQS8HorJAbqluzLRn80UXU0bxZn7UOFhFgpRJDasfwn9nG4FG4A==}
+
+  '@fastify/proxy-addr@5.0.0':
+    resolution: {integrity: sha512-37qVVA1qZ5sgH7KpHkkC4z9SK6StIsIcOmpjvMPXNb3vx2GQxhZocogVYbr2PbbeLCQxYIPDok307xEvRZOzGA==}
+
+  '@fastify/send@4.1.0':
+    resolution: {integrity: sha512-TMYeQLCBSy2TOFmV95hQWkiTYgC/SEx7vMdV+wnZVX4tt8VBLKzmH8vV9OzJehV0+XBfg+WxPMt5wp+JBUKsVw==}
+
+  '@fastify/static@8.2.0':
+    resolution: {integrity: sha512-PejC/DtT7p1yo3p+W7LiUtLMsV8fEvxAK15sozHy9t8kwo5r0uLYmhV/inURmGz1SkHZFz/8CNtHLPyhKcx4SQ==}
+
+  '@fastify/websocket@11.0.1':
+    resolution: {integrity: sha512-44yam5+t1I9v09hWBYO+ezV88+mb9Se2BjgERtzB/68+0mGeTfFkjBeDBe2y+ZdiPpeO2rhevhdnfrBm5mqH+Q==}
+
+  '@fingerprintjs/fingerprintjs-pro-react@2.6.3':
+    resolution: {integrity: sha512-/axCq/cfjZkIM+WFZM/05FQvqtNfdKbIFKU6b2yrwPKlgT8BqWkAq8XvFX6JCPlq8/udVLJjFEDCK+1JQh1L6g==}
+
+  '@fingerprintjs/fingerprintjs-pro-spa@1.3.2':
+    resolution: {integrity: sha512-s1YGsx1XQLmjU+av4UrUHNxyzwPHyZRB0GXJQFOJK8ZHCYc2SNukxnJmZA++bNBa8twU3wW+QgSJhA4Prjnd0g==}
+
+  '@fingerprintjs/fingerprintjs-pro@3.11.9':
+    resolution: {integrity: sha512-GTow49I86tBlV/U+edBTLA2dPCDXrfHVsNuTV7a5nZjWFV3Q44Tj6yb5O0GcGT/EHwbSy3UmCO9+PS1ERR+b2g==}
+
+  '@floating-ui/core@0.7.3':
+    resolution: {integrity: sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==}
+
+  '@floating-ui/core@1.6.1':
+    resolution: {integrity: sha512-42UH54oPZHPdRHdw6BgoBD6cg/eVTmVrFcgeRDM3jbO7uxSoipVcmcIGFcA5jmOHO5apcyvBhkSKES3fQJnu7A==}
+
+  '@floating-ui/dom@0.5.4':
+    resolution: {integrity: sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==}
+
+  '@floating-ui/dom@1.6.5':
+    resolution: {integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==}
+
+  '@floating-ui/react-dom@0.7.2':
+    resolution: {integrity: sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  '@floating-ui/react-dom@2.0.9':
+    resolution: {integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  '@floating-ui/utils@0.2.2':
+    resolution: {integrity: sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==}
+
+  '@formatjs/ecma402-abstract@1.18.0':
+    resolution: {integrity: sha512-PEVLoa3zBevWSCZzPIM/lvPCi8P5l4G+NXQMc/CjEiaCWgyHieUoo0nM7Bs0n/NbuQ6JpXEolivQ9pKSBHaDlA==}
+
+  '@formatjs/fast-memoize@2.2.0':
+    resolution: {integrity: sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==}
+
+  '@formatjs/icu-messageformat-parser@2.7.3':
+    resolution: {integrity: sha512-X/jy10V9S/vW+qlplqhMUxR8wErQ0mmIYSq4mrjpjDl9mbuGcCILcI1SUYkL5nlM4PJqpc0KOS0bFkkJNPxYRw==}
+
+  '@formatjs/icu-skeleton-parser@1.7.0':
+    resolution: {integrity: sha512-Cfdo/fgbZzpN/jlN/ptQVe0lRHora+8ezrEeg2RfrNjyp+YStwBy7cqDY8k5/z2LzXg6O0AdzAV91XS0zIWv+A==}
+
+  '@formatjs/intl-localematcher@0.5.2':
+    resolution: {integrity: sha512-txaaE2fiBMagLrR4jYhxzFO6wEdEG4TPMqrzBAcbr4HFUYzH/YC+lg6OIzKCHm8WgDdyQevxbAAV1OgcXctuGw==}
+
+  '@fullhuman/postcss-purgecss@2.3.0':
+    resolution: {integrity: sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==}
+
+  '@google-cloud/precise-date@4.0.0':
+    resolution: {integrity: sha512-1TUx3KdaU3cN7nfCdNf+UVqA/PSX29Cjcox3fZZBtINlRrXVTmUkQnCKv2MbBUbCopbK4olAT1IHl76uZyCiVA==}
+    engines: {node: '>=14.0.0'}
+
+  '@graphile/logger@0.2.0':
+    resolution: {integrity: sha512-jjcWBokl9eb1gVJ85QmoaQ73CQ52xAaOCF29ukRbYNl6lY+ts0ErTaDYOBlejcbUs2OpaiqYLO5uDhyLFzWw4w==}
+
+  '@graphql-typed-document-node/core@3.2.0':
+    resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
+    peerDependencies:
+      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+
+  '@grpc/grpc-js@1.12.6':
+    resolution: {integrity: sha512-JXUj6PI0oqqzTGvKtzOkxtpsyPRNsrmhh41TtIz/zEB6J+AUiZZ0dxWzcMwO9Ns5rmSPuMdghlTbUuqIM48d3Q==}
+    engines: {node: '>=12.10.0'}
+
+  '@grpc/proto-loader@0.7.13':
+    resolution: {integrity: sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  '@hapi/boom@10.0.1':
+    resolution: {integrity: sha512-ERcCZaEjdH3OgSJlyjVk8pHIFeus91CjKP3v+MpgBNp5IvGzP2l/bRiD78nqYcKPaZdbKkK5vDBVPd2ohHBlsA==}
+
+  '@hapi/bourne@3.0.0':
+    resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==}
+
+  '@hapi/hoek@10.0.1':
+    resolution: {integrity: sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw==}
+
+  '@hapi/hoek@11.0.2':
+    resolution: {integrity: sha512-aKmlCO57XFZ26wso4rJsW4oTUnrgTFw2jh3io7CAtO9w4UltBNwRXvXIVzzyfkaaLRo3nluP/19msA8vDUUuKw==}
+
+  '@hapi/hoek@9.3.0':
+    resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
+
+  '@hapi/topo@5.1.0':
+    resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
+
+  '@hapi/wreck@18.0.1':
+    resolution: {integrity: sha512-OLHER70+rZxvDl75xq3xXOfd3e8XIvz8fWY0dqg92UvhZ29zo24vQgfqgHSYhB5ZiuFpSLeriOisAlxAo/1jWg==}
+
+  '@hcaptcha/loader@2.0.0':
+    resolution: {integrity: sha512-fFQH6ApU/zCCl6Y1bnbsxsp1Er/lKX+qlgljrpWDeFcenpEtoP68hExlKSXECospzKLeSWcr06cbTjlR/x3IJA==}
+
+  '@hcaptcha/react-hcaptcha@1.12.0':
+    resolution: {integrity: sha512-QiHnQQ52k8SJJSHkc3cq4TlYzag7oPd4f5ZqnjVSe4fJDSlZaOQFtu5F5AYisVslwaitdDELPVLRsRJxiiI0Aw==}
+    peerDependencies:
+      react: '>= 16.3.0'
+      react-dom: '>= 16.3.0'
+
+  '@headlessui/react@1.7.8':
+    resolution: {integrity: sha512-zcwb0kd7L05hxmoAMIioEaOn235Dg0fUO+iGbLPgLVSjzl/l39V6DTpC2Df49PE5aG5/f5q0PZ9ZHZ78ENNV+A==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      react: ^16 || ^17 || ^18
+      react-dom: ^16 || ^17 || ^18
+
+  '@heroicons/react@2.0.13':
+    resolution: {integrity: sha512-iSN5XwmagrnirWlYEWNPdCDj9aRYVD/lnK3JlsC9/+fqGF80k8C7rl+1HCvBX0dBoagKqOFBs6fMhJJ1hOg1EQ==}
+    peerDependencies:
+      react: '>= 16'
+
+  '@hono/node-server@1.12.2':
+    resolution: {integrity: sha512-xjzhqhSWUE/OhN0g3KCNVzNsQMlFUAL+/8GgPUr3TKcU7cvgZVBGswFofJ8WwGEHTqobzze1lDpGJl9ZNckDhA==}
+    engines: {node: '>=18.14.1'}
+    peerDependencies:
+      hono: ^4
+
+  '@hono/node-server@1.19.9':
+    resolution: {integrity: sha512-vHL6w3ecZsky+8P5MD+eFfaGTyCeOHUIFYMGpQGbrBTSmNNoxv0if69rEZ5giu36weC5saFuznL411gRX7bJDw==}
+    engines: {node: '>=18.14.1'}
+    peerDependencies:
+      hono: ^4
+
+  '@hono/node-ws@1.0.4':
+    resolution: {integrity: sha512-0j1TMp67U5ym0CIlvPKcKtD0f2ZjaS/EnhOxFLs3bVfV+/4WInBE7hVe2x/7PLEsNIUK9+jVL8lPd28rzTAcZg==}
+    engines: {node: '>=18.14.1'}
+    peerDependencies:
+      '@hono/node-server': ^1.11.1
+
+  '@humanwhocodes/config-array@0.11.8':
+    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
+    engines: {node: '>=10.10.0'}
+    deprecated: Use @eslint/config-array instead
+
+  '@humanwhocodes/module-importer@1.0.1':
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
+
+  '@humanwhocodes/object-schema@1.2.1':
+    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
+    deprecated: Use @eslint/object-schema instead
+
+  '@iconify/types@2.0.0':
+    resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
+
+  '@iconify/utils@3.0.2':
+    resolution: {integrity: sha512-EfJS0rLfVuRuJRn4psJHtK2A9TqVnkxPpHY6lYHiB9+8eSuudsxbwMiavocG45ujOo6FJ+CIRlRnlOGinzkaGQ==}
+
+  '@img/colour@1.0.0':
+    resolution: {integrity: sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==}
+    engines: {node: '>=18'}
+
+  '@img/sharp-darwin-arm64@0.33.5':
+    resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-arm64@0.34.5':
+    resolution: {integrity: sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.33.5':
+    resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.34.5':
+    resolution: {integrity: sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
+    resolution: {integrity: sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.2.4':
+    resolution: {integrity: sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-arm64@1.2.4':
+    resolution: {integrity: sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-arm@1.2.4':
+    resolution: {integrity: sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
+    resolution: {integrity: sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
+    resolution: {integrity: sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-s390x@1.2.4':
+    resolution: {integrity: sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linux-x64@1.2.4':
+    resolution: {integrity: sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
+    resolution: {integrity: sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    resolution: {integrity: sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-linux-arm64@0.33.5':
+    resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-arm64@0.34.5':
+    resolution: {integrity: sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-arm@0.33.5':
+    resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-arm@0.34.5':
+    resolution: {integrity: sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-ppc64@0.34.5':
+    resolution: {integrity: sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-riscv64@0.34.5':
+    resolution: {integrity: sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-s390x@0.33.5':
+    resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-s390x@0.34.5':
+    resolution: {integrity: sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-x64@0.33.5':
+    resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linux-x64@0.34.5':
+    resolution: {integrity: sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-linuxmusl-arm64@0.34.5':
+    resolution: {integrity: sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-linuxmusl-x64@0.34.5':
+    resolution: {integrity: sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@img/sharp-wasm32@0.33.5':
+    resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-wasm32@0.34.5':
+    resolution: {integrity: sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-arm64@0.34.5':
+    resolution: {integrity: sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [win32]
+
+  '@img/sharp-win32-ia32@0.33.5':
+    resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-ia32@0.34.5':
+    resolution: {integrity: sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.33.5':
+    resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.34.5':
+    resolution: {integrity: sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
+  '@internationalized/date@3.5.1':
+    resolution: {integrity: sha512-LUQIfwU9e+Fmutc/DpRTGXSdgYZLBegi4wygCWDSVmUdLTaMHsQyASDiJtREwanwKuQLq0hY76fCJ9J/9I2xOQ==}
+
+  '@internationalized/date@3.5.5':
+    resolution: {integrity: sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==}
+
+  '@internationalized/message@3.1.1':
+    resolution: {integrity: sha512-ZgHxf5HAPIaR0th+w0RUD62yF6vxitjlprSxmLJ1tam7FOekqRSDELMg4Cr/DdszG5YLsp5BG3FgHgqquQZbqw==}
+
+  '@internationalized/message@3.1.4':
+    resolution: {integrity: sha512-Dygi9hH1s7V9nha07pggCkvmRfDd3q2lWnMGvrJyrOwYMe1yj4D2T9BoH9I6MGR7xz0biQrtLPsqUkqXzIrBOw==}
+
+  '@internationalized/number@3.5.0':
+    resolution: {integrity: sha512-ZY1BW8HT9WKYvaubbuqXbbDdHhOUMfE2zHHFJeTppid0S+pc8HtdIxFxaYMsGjCb4UsF+MEJ4n2TfU7iHnUK8w==}
+
+  '@internationalized/number@3.5.3':
+    resolution: {integrity: sha512-rd1wA3ebzlp0Mehj5YTuTI50AQEx80gWFyHcQu+u91/5NgdwBecO8BH6ipPfE+lmQ9d63vpB3H9SHoIUiupllw==}
+
+  '@internationalized/string@3.2.0':
+    resolution: {integrity: sha512-Xx3Sy3f2c9ctT+vh8c7euEaEHQZltp0euZ3Hy4UfT3E13r6lxpUS3kgKyumEjboJZSnaZv7JhqWz3D75v+IxQg==}
+
+  '@internationalized/string@3.2.3':
+    resolution: {integrity: sha512-9kpfLoA8HegiWTeCbR2livhdVeKobCnVv8tlJ6M2jF+4tcMqDo94ezwlnrUANBWPgd8U7OXIHCk2Ov2qhk4KXw==}
+
+  '@ioredis/commands@1.2.0':
+    resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
+
+  '@isaacs/cliui@8.0.2':
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+
+  '@isaacs/fs-minipass@4.0.1':
+    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
+    engines: {node: '>=18.0.0'}
+
+  '@istanbuljs/schema@0.1.3':
+    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
+    engines: {node: '>=8'}
+
+  '@jridgewell/gen-mapping@0.3.2':
+    resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/gen-mapping@0.3.8':
+    resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/resolve-uri@3.1.0':
+    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/resolve-uri@3.1.2':
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/set-array@1.2.1':
+    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
+    engines: {node: '>=6.0.0'}
+
+  '@jridgewell/source-map@0.3.3':
+    resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==}
+
+  '@jridgewell/sourcemap-codec@1.5.0':
+    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+
+  '@jridgewell/sourcemap-codec@1.5.5':
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+
+  '@jridgewell/trace-mapping@0.3.19':
+    resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+
+  '@jridgewell/trace-mapping@0.3.31':
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
+
+  '@js-sdsl/ordered-map@4.4.2':
+    resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
+
+  '@jsep-plugin/assignment@1.3.0':
+    resolution: {integrity: sha512-VVgV+CXrhbMI3aSusQyclHkenWSAm95WaiKrMxRFam3JSUiIaQjoMIw2sEs/OX4XifnqeQUN4DYbJjlA8EfktQ==}
+    engines: {node: '>= 10.16.0'}
+    peerDependencies:
+      jsep: ^0.4.0||^1.0.0
+
+  '@jsep-plugin/regex@1.0.4':
+    resolution: {integrity: sha512-q7qL4Mgjs1vByCaTnDFcBnV9HS7GVPJX5vyVoCgZHNSC9rjwIlmbXG5sUuorR5ndfHAIlJ8pVStxvjXHbNvtUg==}
+    engines: {node: '>= 10.16.0'}
+    peerDependencies:
+      jsep: ^0.4.0||^1.0.0
+
+  '@jsonhero/path@1.0.21':
+    resolution: {integrity: sha512-gVUDj/92acpVoJwsVJ/RuWOaHyG4oFzn898WNGQItLCTQ+hOaVlEaImhwE1WqOTf+l3dGOUkbSiVKlb3q1hd1Q==}
+
+  '@jspm/core@2.0.1':
+    resolution: {integrity: sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==}
+
+  '@kapaai/react-sdk@0.1.3':
+    resolution: {integrity: sha512-jbw+wRDA0S5LMpKGbPsqhQMzB04XvaWPXWAqpzYeuLRXTfiLMNsKoIuH90+MX3uzVjvw5Asd0EkvYZrg9SXa1Q==}
+    peerDependencies:
+      react: '>=17.0.0'
+      react-dom: '>=17.0.0'
+
+  '@kubernetes/client-node@0.20.0':
+    resolution: {integrity: sha512-xxlv5GLX4FVR/dDKEsmi4SPeuB49aRc35stndyxcC73XnUEEwF39vXbROpHOirmDse8WE9vxOjABnSVS+jb7EA==}
+
+  '@kubernetes/client-node@1.0.0':
+    resolution: {integrity: sha512-a8NSvFDSHKFZ0sR1hbPSf8IDFNJwctEU5RodSCNiq/moRXWmrdmqhb1RRQzF+l+TSBaDgHw3YsYNxxE92STBzw==}
+
+  '@lezer/common@1.0.2':
+    resolution: {integrity: sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==}
+
+  '@lezer/common@1.3.0':
+    resolution: {integrity: sha512-L9X8uHCYU310o99L3/MpJKYxPzXPOS7S0NmBaM7UO/x2Kb2WbmMLSkfvdr1KxRIFYOpbY0Jhn7CfLSUDzL8arQ==}
+
+  '@lezer/highlight@1.1.6':
+    resolution: {integrity: sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==}
+
+  '@lezer/highlight@1.2.3':
+    resolution: {integrity: sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==}
+
+  '@lezer/javascript@1.4.1':
+    resolution: {integrity: sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==}
+
+  '@lezer/json@1.0.0':
+    resolution: {integrity: sha512-zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw==}
+
+  '@lezer/lr@1.4.3':
+    resolution: {integrity: sha512-yenN5SqAxAPv/qMnpWW0AT7l+SxVrgG+u0tNsRQWqbrz66HIl8DnEbBObvy21J5K7+I1v7gsAnlE2VQ5yYVSeA==}
+
+  '@lukeed/ms@2.0.2':
+    resolution: {integrity: sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==}
+    engines: {node: '>=8'}
+
+  '@manypkg/cli@0.19.2':
+    resolution: {integrity: sha512-DXx/P1lyunNoFWwOj1MWBucUhaIJljoiAGOpO2fE0GKMBCI6EZBZD0Up1+fQZoXBecKXRgV9mGgLvIB2fOQ0KQ==}
+    hasBin: true
+
+  '@manypkg/find-root@1.1.0':
+    resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
+
+  '@manypkg/get-packages@1.1.3':
+    resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==}
+
+  '@mdx-js/mdx@2.3.0':
+    resolution: {integrity: sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==}
+
+  '@mermaid-js/parser@0.6.3':
+    resolution: {integrity: sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA==}
+
+  '@microsoft/fetch-event-source@2.0.1':
+    resolution: {integrity: sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==}
+
+  '@modelcontextprotocol/sdk@1.25.2':
+    resolution: {integrity: sha512-LZFeo4F9M5qOhC/Uc1aQSrBHxMrvxett+9KLHt7OhcExtoiRN9DKgbZffMP/nxjutWDQpfMDfP3nkHI4X9ijww==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: ^3.25 || ^4.0
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
+
+  '@modelcontextprotocol/sdk@1.26.0':
+    resolution: {integrity: sha512-Y5RmPncpiDtTXDbLKswIJzTqu2hyBKxTNsgKqKclDbhIgg1wgtf1fRuvxgTnRfcnxtvvgbIEcqUOzZrJ6iSReg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@cfworker/json-schema': ^4.1.1
+      zod: ^3.25 || ^4.0
+    peerDependenciesMeta:
+      '@cfworker/json-schema':
+        optional: true
+
+  '@msgpack/msgpack@3.0.0-beta2':
+    resolution: {integrity: sha512-y+l1PNV0XDyY8sM3YtuMLK5vE3/hkfId+Do8pLo/OPxfxuFAUwcGz3oiiUuV46/aBpwTzZ+mRWVMtlSKbradhw==}
+    engines: {node: '>= 14'}
+    deprecated: too old
+
+  '@neondatabase/serverless@0.9.5':
+    resolution: {integrity: sha512-siFas6gItqv6wD/pZnvdu34wEqgG3nSE6zWZdq5j2DEsa+VvX8i/5HXJOo06qrw5axPXn+lGCxeR+NLaSPIXug==}
+
+  '@next/bundle-analyzer@15.0.2':
+    resolution: {integrity: sha512-bV566k+rDsaqXSUgHBof0iMIDx5DWtLx/98jvYtqb9x85e+WJzv+8cpDvbjtxQMf7nFC/LUkPmpruj1cOKfz4A==}
+
+  '@next/env@14.1.0':
+    resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==}
+
+  '@next/env@14.2.21':
+    resolution: {integrity: sha512-lXcwcJd5oR01tggjWJ6SrNNYFGuOOMB9c251wUNkjCpkoXOPkDeF/15c3mnVlBqrW4JJXb2kVxDFhC4GduJt2A==}
+
+  '@next/env@15.2.4':
+    resolution: {integrity: sha512-+SFtMgoiYP3WoSswuNmxJOCwi06TdWE733D+WPjpXIe4LXGULwEaofiiAy6kbS0+XjM5xF5n3lKuBwN2SnqD9g==}
+
+  '@next/env@15.4.8':
+    resolution: {integrity: sha512-LydLa2MDI1NMrOFSkO54mTc8iIHSttj6R6dthITky9ylXV2gCGi0bHQjVCtLGRshdRPjyh2kXbxJukDtBWQZtQ==}
+
+  '@next/env@15.5.6':
+    resolution: {integrity: sha512-3qBGRW+sCGzgbpc5TS1a0p7eNxnOarGVQhZxfvTdnV0gFI61lX7QNtQ4V1TSREctXzYn5NetbUsLvyqwLFJM6Q==}
+
+  '@next/swc-darwin-arm64@14.1.0':
+    resolution: {integrity: sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-arm64@14.2.21':
+    resolution: {integrity: sha512-HwEjcKsXtvszXz5q5Z7wCtrHeTTDSTgAbocz45PHMUjU3fBYInfvhR+ZhavDRUYLonm53aHZbB09QtJVJj8T7g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-arm64@15.2.4':
+    resolution: {integrity: sha512-1AnMfs655ipJEDC/FHkSr0r3lXBgpqKo4K1kiwfUf3iE68rDFXZ1TtHdMvf7D0hMItgDZ7Vuq3JgNMbt/+3bYw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-arm64@15.4.8':
+    resolution: {integrity: sha512-Pf6zXp7yyQEn7sqMxur6+kYcywx5up1J849psyET7/8pG2gQTVMjU3NzgIt8SeEP5to3If/SaWmaA6H6ysBr1A==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-arm64@15.5.6':
+    resolution: {integrity: sha512-ES3nRz7N+L5Umz4KoGfZ4XX6gwHplwPhioVRc25+QNsDa7RtUF/z8wJcbuQ2Tffm5RZwuN2A063eapoJ1u4nPg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@14.1.0':
+    resolution: {integrity: sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@14.2.21':
+    resolution: {integrity: sha512-TSAA2ROgNzm4FhKbTbyJOBrsREOMVdDIltZ6aZiKvCi/v0UwFmwigBGeqXDA97TFMpR3LNNpw52CbVelkoQBxA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@15.2.4':
+    resolution: {integrity: sha512-3qK2zb5EwCwxnO2HeO+TRqCubeI/NgCe+kL5dTJlPldV/uwCnUgC7VbEzgmxbfrkbjehL4H9BPztWOEtsoMwew==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@15.4.8':
+    resolution: {integrity: sha512-xla6AOfz68a6kq3gRQccWEvFC/VRGJmA/QuSLENSO7CZX5WIEkSz7r1FdXUjtGCQ1c2M+ndUAH7opdfLK1PQbw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@15.5.6':
+    resolution: {integrity: sha512-JIGcytAyk9LQp2/nuVZPAtj8uaJ/zZhsKOASTjxDug0SPU9LAM3wy6nPU735M1OqacR4U20LHVF5v5Wnl9ptTA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-linux-arm64-gnu@14.1.0':
+    resolution: {integrity: sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-arm64-gnu@14.2.21':
+    resolution: {integrity: sha512-0Dqjn0pEUz3JG+AImpnMMW/m8hRtl1GQCNbO66V1yp6RswSTiKmnHf3pTX6xMdJYSemf3O4Q9ykiL0jymu0TuA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-arm64-gnu@15.2.4':
+    resolution: {integrity: sha512-HFN6GKUcrTWvem8AZN7tT95zPb0GUGv9v0d0iyuTb303vbXkkbHDp/DxufB04jNVD+IN9yHy7y/6Mqq0h0YVaQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-arm64-gnu@15.4.8':
+    resolution: {integrity: sha512-y3fmp+1Px/SJD+5ntve5QLZnGLycsxsVPkTzAc3zUiXYSOlTPqT8ynfmt6tt4fSo1tAhDPmryXpYKEAcoAPDJw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-arm64-gnu@15.5.6':
+    resolution: {integrity: sha512-qvz4SVKQ0P3/Im9zcS2RmfFL/UCQnsJKJwQSkissbngnB/12c6bZTCB0gHTexz1s6d/mD0+egPKXAIRFVS7hQg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-arm64-musl@14.1.0':
+    resolution: {integrity: sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-arm64-musl@14.2.21':
+    resolution: {integrity: sha512-Ggfw5qnMXldscVntwnjfaQs5GbBbjioV4B4loP+bjqNEb42fzZlAaK+ldL0jm2CTJga9LynBMhekNfV8W4+HBw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-arm64-musl@15.2.4':
+    resolution: {integrity: sha512-Oioa0SORWLwi35/kVB8aCk5Uq+5/ZIumMK1kJV+jSdazFm2NzPDztsefzdmzzpx5oGCJ6FkUC7vkaUseNTStNA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-arm64-musl@15.4.8':
+    resolution: {integrity: sha512-DX/L8VHzrr1CfwaVjBQr3GWCqNNFgyWJbeQ10Lx/phzbQo3JNAxUok1DZ8JHRGcL6PgMRgj6HylnLNndxn4Z6A==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-arm64-musl@15.5.6':
+    resolution: {integrity: sha512-FsbGVw3SJz1hZlvnWD+T6GFgV9/NYDeLTNQB2MXoPN5u9VA9OEDy6fJEfePfsUKAhJufFbZLgp0cPxMuV6SV0w==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-x64-gnu@14.1.0':
+    resolution: {integrity: sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-x64-gnu@14.2.21':
+    resolution: {integrity: sha512-uokj0lubN1WoSa5KKdThVPRffGyiWlm/vCc/cMkWOQHw69Qt0X1o3b2PyLLx8ANqlefILZh1EdfLRz9gVpG6tg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-x64-gnu@15.2.4':
+    resolution: {integrity: sha512-yb5WTRaHdkgOqFOZiu6rHV1fAEK0flVpaIN2HB6kxHVSy/dIajWbThS7qON3W9/SNOH2JWkVCyulgGYekMePuw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-x64-gnu@15.4.8':
+    resolution: {integrity: sha512-9fLAAXKAL3xEIFdKdzG5rUSvSiZTLLTCc6JKq1z04DR4zY7DbAPcRvNm3K1inVhTiQCs19ZRAgUerHiVKMZZIA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-x64-gnu@15.5.6':
+    resolution: {integrity: sha512-3QnHGFWlnvAgyxFxt2Ny8PTpXtQD7kVEeaFat5oPAHHI192WKYB+VIKZijtHLGdBBvc16tiAkPTDmQNOQ0dyrA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@next/swc-linux-x64-musl@14.1.0':
+    resolution: {integrity: sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-x64-musl@14.2.21':
+    resolution: {integrity: sha512-iAEBPzWNbciah4+0yI4s7Pce6BIoxTQ0AGCkxn/UBuzJFkYyJt71MadYQkjPqCQCJAFQ26sYh7MOKdU+VQFgPg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-x64-musl@15.2.4':
+    resolution: {integrity: sha512-Dcdv/ix6srhkM25fgXiyOieFUkz+fOYkHlydWCtB0xMST6X9XYI3yPDKBZt1xuhOytONsIFJFB08xXYsxUwJLw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-x64-musl@15.4.8':
+    resolution: {integrity: sha512-s45V7nfb5g7dbS7JK6XZDcapicVrMMvX2uYgOHP16QuKH/JA285oy6HcxlKqwUNaFY/UC6EvQ8QZUOo19cBKSA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-linux-x64-musl@15.5.6':
+    resolution: {integrity: sha512-OsGX148sL+TqMK9YFaPFPoIaJKbFJJxFzkXZljIgA9hjMjdruKht6xDCEv1HLtlLNfkx3c5w2GLKhj7veBQizQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@next/swc-win32-arm64-msvc@14.1.0':
+    resolution: {integrity: sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-arm64-msvc@14.2.21':
+    resolution: {integrity: sha512-plykgB3vL2hB4Z32W3ktsfqyuyGAPxqwiyrAi2Mr8LlEUhNn9VgkiAl5hODSBpzIfWweX3er1f5uNpGDygfQVQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-arm64-msvc@15.2.4':
+    resolution: {integrity: sha512-dW0i7eukvDxtIhCYkMrZNQfNicPDExt2jPb9AZPpL7cfyUo7QSNl1DjsHjmmKp6qNAqUESyT8YFl/Aw91cNJJg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-arm64-msvc@15.4.8':
+    resolution: {integrity: sha512-KjgeQyOAq7t/HzAJcWPGA8X+4WY03uSCZ2Ekk98S9OgCFsb6lfBE3dbUzUuEQAN2THbwYgFfxX2yFTCMm8Kehw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-arm64-msvc@15.5.6':
+    resolution: {integrity: sha512-ONOMrqWxdzXDJNh2n60H6gGyKed42Ieu6UTVPZteXpuKbLZTH4G4eBMsr5qWgOBA+s7F+uB4OJbZnrkEDnZ5Fg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-ia32-msvc@14.1.0':
+    resolution: {integrity: sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@next/swc-win32-ia32-msvc@14.2.21':
+    resolution: {integrity: sha512-w5bacz4Vxqrh06BjWgua3Yf7EMDb8iMcVhNrNx8KnJXt8t+Uu0Zg4JHLDL/T7DkTCEEfKXO/Er1fcfWxn2xfPA==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@14.1.0':
+    resolution: {integrity: sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@14.2.21':
+    resolution: {integrity: sha512-sT6+llIkzpsexGYZq8cjjthRyRGe5cJVhqh12FmlbxHqna6zsDDK8UNaV7g41T6atFHCJUPeLb3uyAwrBwy0NA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@15.2.4':
+    resolution: {integrity: sha512-SbnWkJmkS7Xl3kre8SdMF6F/XDh1DTFEhp0jRTj/uB8iPKoU2bb2NDfcu+iifv1+mxQEd1g2vvSxcZbXSKyWiQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@15.4.8':
+    resolution: {integrity: sha512-Exsmf/+42fWVnLMaZHzshukTBxZrSwuuLKFvqhGHJ+mC1AokqieLY/XzAl3jc/CqhXLqLY3RRjkKJ9YnLPcRWg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@15.5.6':
+    resolution: {integrity: sha512-pxK4VIjFRx1MY92UycLOOw7dTdvccWsNETQ0kDHkBlcFH1GrTLUjSiHU1ohrznnux6TqRHgv5oflhfIWZwVROQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1':
+    resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==}
+
+  '@nodelib/fs.scandir@2.1.5':
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.stat@2.0.5':
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
+
+  '@nodelib/fs.walk@1.2.8':
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
+
+  '@npmcli/fs@3.1.0':
+    resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  '@npmcli/git@4.1.0':
+    resolution: {integrity: sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  '@npmcli/package-json@4.0.1':
+    resolution: {integrity: sha512-lRCEGdHZomFsURroh522YvA/2cVb9oPIJrjHanCJZkiasz1BzcnLr3tBJhlV7S86MBJBuAQ33is2D60YitZL2Q==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  '@npmcli/promise-spawn@6.0.2':
+    resolution: {integrity: sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  '@octokit/app@14.1.0':
+    resolution: {integrity: sha512-g3uEsGOQCBl1+W1rgfwoRFUIR6PtvB2T1E4RpygeUU5LrLvlOqcxrt5lfykIeRpUPpupreGJUYl70fqMDXdTpw==}
+    engines: {node: '>= 18'}
+
+  '@octokit/auth-app@6.1.4':
+    resolution: {integrity: sha512-QkXkSOHZK4dA5oUqY5Dk3S+5pN2s1igPjEASNQV8/vgJgW034fQWR16u7VsNOK/EljA00eyjYF5mWNxWKWhHRQ==}
+    engines: {node: '>= 18'}
+
+  '@octokit/auth-oauth-app@7.1.0':
+    resolution: {integrity: sha512-w+SyJN/b0l/HEb4EOPRudo7uUOSW51jcK1jwLa+4r7PA8FPFpoxEnHBHMITqCsc/3Vo2qqFjgQfz/xUUvsSQnA==}
+    engines: {node: '>= 18'}
+
+  '@octokit/auth-oauth-device@6.1.0':
+    resolution: {integrity: sha512-FNQ7cb8kASufd6Ej4gnJ3f1QB5vJitkoV1O0/g6e6lUsQ7+VsSNRHRmFScN2tV4IgKA12frrr/cegUs0t+0/Lw==}
+    engines: {node: '>= 18'}
+
+  '@octokit/auth-oauth-user@4.1.0':
+    resolution: {integrity: sha512-FrEp8mtFuS/BrJyjpur+4GARteUCrPeR/tZJzD8YourzoVhRics7u7we/aDcKv+yywRNwNi/P4fRi631rG/OyQ==}
+    engines: {node: '>= 18'}
+
+  '@octokit/auth-token@4.0.0':
+    resolution: {integrity: sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==}
+    engines: {node: '>= 18'}
+
+  '@octokit/auth-unauthenticated@5.0.1':
+    resolution: {integrity: sha512-oxeWzmBFxWd+XolxKTc4zr+h3mt+yofn4r7OfoIkR/Cj/o70eEGmPsFbueyJE2iBAGpjgTnEOKM3pnuEGVmiqg==}
+    engines: {node: '>= 18'}
+
+  '@octokit/core@5.2.2':
+    resolution: {integrity: sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==}
+    engines: {node: '>= 18'}
+
+  '@octokit/endpoint@9.0.6':
+    resolution: {integrity: sha512-H1fNTMA57HbkFESSt3Y9+FBICv+0jFceJFPWDePYlR/iMGrwM5ph+Dd4XRQs+8X+PUFURLQgX9ChPfhJ/1uNQw==}
+    engines: {node: '>= 18'}
+
+  '@octokit/graphql@7.1.1':
+    resolution: {integrity: sha512-3mkDltSfcDUoa176nlGoA32RGjeWjl3K7F/BwHwRMJUW/IteSa4bnSV8p2ThNkcIcZU2umkZWxwETSSCJf2Q7g==}
+    engines: {node: '>= 18'}
+
+  '@octokit/oauth-app@6.1.0':
+    resolution: {integrity: sha512-nIn/8eUJ/BKUVzxUXd5vpzl1rwaVxMyYbQkNZjHrF7Vk/yu98/YDF/N2KeWO7uZ0g3b5EyiFXFkZI8rJ+DH1/g==}
+    engines: {node: '>= 18'}
+
+  '@octokit/oauth-authorization-url@6.0.2':
+    resolution: {integrity: sha512-CdoJukjXXxqLNK4y/VOiVzQVjibqoj/xHgInekviUJV73y/BSIcwvJ/4aNHPBPKcPWFnd4/lO9uqRV65jXhcLA==}
+    engines: {node: '>= 18'}
+
+  '@octokit/oauth-methods@4.1.0':
+    resolution: {integrity: sha512-4tuKnCRecJ6CG6gr0XcEXdZtkTDbfbnD5oaHBmLERTjTMZNi2CbfEHZxPU41xXLDG4DfKf+sonu00zvKI9NSbw==}
+    engines: {node: '>= 18'}
+
+  '@octokit/openapi-types@20.0.0':
+    resolution: {integrity: sha512-EtqRBEjp1dL/15V7WiX5LJMIxxkdiGJnabzYx5Apx4FkQIFgAfKumXeYAqqJCj1s+BMX4cPFIFC4OLCR6stlnA==}
+
+  '@octokit/openapi-types@24.2.0':
+    resolution: {integrity: sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==}
+
+  '@octokit/plugin-paginate-graphql@4.0.1':
+    resolution: {integrity: sha512-R8ZQNmrIKKpHWC6V2gum4x9LG2qF1RxRjo27gjQcG3j+vf2tLsEfE7I/wRWEPzYMaenr1M+qDAtNcwZve1ce1A==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': '>=5'
+
+  '@octokit/plugin-paginate-rest@11.4.4-cjs.2':
+    resolution: {integrity: sha512-2dK6z8fhs8lla5PaOTgqfCGBxgAv/le+EhPs27KklPhm1bKObpu6lXzwfUEQ16ajXzqNrKMujsFyo9K2eaoISw==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': '5'
+
+  '@octokit/plugin-paginate-rest@9.2.2':
+    resolution: {integrity: sha512-u3KYkGF7GcZnSD/3UP0S7K5XUFT2FkOQdcfXZGZQPGv3lm4F2Xbf71lvjldr8c1H3nNbF+33cLEkWYbokGWqiQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': '5'
+
+  '@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1':
+    resolution: {integrity: sha512-VUjIjOOvF2oELQmiFpWA1aOPdawpyaCUqcEBc/UOUnj3Xp6DJGrJ1+bjUIIDzdHjnFNO6q57ODMfdEZnoBkCwQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': ^5
+
+  '@octokit/plugin-retry@6.1.0':
+    resolution: {integrity: sha512-WrO3bvq4E1Xh1r2mT9w6SDFg01gFmP81nIG77+p/MqW1JeXXgL++6umim3t6x0Zj5pZm3rXAN+0HEjmmdhIRig==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': '5'
+
+  '@octokit/plugin-throttling@8.2.0':
+    resolution: {integrity: sha512-nOpWtLayKFpgqmgD0y3GqXafMFuKcA4tRPZIfu7BArd2lEZeb1988nhWhwx4aZWmjDmUfdgVf7W+Tt4AmvRmMQ==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      '@octokit/core': ^5.0.0
+
+  '@octokit/request-error@5.1.1':
+    resolution: {integrity: sha512-v9iyEQJH6ZntoENr9/yXxjuezh4My67CBSu9r6Ve/05Iu5gNgnisNWOsoJHTP6k0Rr0+HQIpnH+kyammu90q/g==}
+    engines: {node: '>= 18'}
+
+  '@octokit/request@8.4.1':
+    resolution: {integrity: sha512-qnB2+SY3hkCmBxZsR/MPCybNmbJe4KAlfWErXq+rBKkQJlbjdJeS85VI9r8UqeLYLvnAenU8Q1okM/0MBsAGXw==}
+    engines: {node: '>= 18'}
+
+  '@octokit/types@12.6.0':
+    resolution: {integrity: sha512-1rhSOfRa6H9w4YwK0yrf5faDaDTb+yLyBUKOCV4xtCDB5VmIPqd/v9yr9o6SAzOAlRxMiRiCic6JVM1/kunVkw==}
+
+  '@octokit/types@13.10.0':
+    resolution: {integrity: sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==}
+
+  '@octokit/webhooks-methods@4.1.0':
+    resolution: {integrity: sha512-zoQyKw8h9STNPqtm28UGOYFE7O6D4Il8VJwhAtMHFt2C4L0VQT1qGKLeefUOqHNs1mNRYSadVv7x0z8U2yyeWQ==}
+    engines: {node: '>= 18'}
+
+  '@octokit/webhooks-types@7.6.1':
+    resolution: {integrity: sha512-S8u2cJzklBC0FgTwWVLaM8tMrDuDMVE4xiTK4EYXM9GntyvrdbSoxqDQa+Fh57CCNApyIpyeqPhhFEmHPfrXgw==}
+
+  '@octokit/webhooks@12.3.2':
+    resolution: {integrity: sha512-exj1MzVXoP7xnAcAB3jZ97pTvVPkQF9y6GA/dvYC47HV7vLv+24XRS6b/v/XnyikpEuvMhugEXdGtAlU086WkQ==}
+    engines: {node: '>= 18'}
+
+  '@one-ini/wasm@0.1.1':
+    resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
+
+  '@open-draft/deferred-promise@2.2.0':
+    resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==}
+
+  '@opentelemetry/api-logs@0.203.0':
+    resolution: {integrity: sha512-9B9RU0H7Ya1Dx/Rkyc4stuBZSGVQF27WigitInx2QQoj6KUpEFYPKoWjdFTunJYxmXmh17HeBvbMa1EhGyPmqQ==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/api-logs@0.52.1':
+    resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api-logs@0.57.0':
+    resolution: {integrity: sha512-l1aJ30CXeauVYaI+btiynHpw341LthkMTv3omi1VJDX14werY2Wmv9n1yudMsq9HuY0m8PvXEVX4d8zxEb+WRg==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api-logs@0.57.2':
+    resolution: {integrity: sha512-uIX52NnTM0iBh84MShlpouI7UKqkZ7MrUszTmaypHBu4r7NofznSnQRfJ+uUeDtQDj6w8eFGg5KBLDAwAPz1+A==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api@1.8.0':
+    resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/api@1.9.0':
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/context-async-hooks@1.30.1':
+    resolution: {integrity: sha512-s5vvxXPVdjqS3kTLKMeBMvop9hbWkwzBpu+mUO2M7sZtlkyDJGwFe33wRKnbaYDo8ExRVBIIdwIGrqpxHuKttA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/context-async-hooks@2.0.1':
+    resolution: {integrity: sha512-XuY23lSI3d4PEqKA+7SLtAgwqIfc6E/E9eAQWLN1vlpC53ybO3o6jW4BsXo1xvz9lYyyWItfQDDLzezER01mCw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.30.0':
+    resolution: {integrity: sha512-Q/3u/K73KUjTCnFUP97ZY+pBjQ1kPEgjOfXj/bJl8zW7GbXdkw6cwuyZk6ZTXkVgCBsYRYUzx4fvYK1jxdb9MA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.30.1':
+    resolution: {integrity: sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@2.0.1':
+    resolution: {integrity: sha512-MaZk9SJIDgo1peKevlbhP6+IwIiNPNmswNL4AF0WaQJLbHXjr9SrZMgS12+iqr9ToV4ZVosCcc0f8Rg67LXjxw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@2.2.0':
+    resolution: {integrity: sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/exporter-logs-otlp-grpc@0.203.0':
+    resolution: {integrity: sha512-g/2Y2noc/l96zmM+g0LdeuyYKINyBwN6FJySoU15LHPLcMN/1a0wNk2SegwKcxrRdE7Xsm7fkIR5n6XFe3QpPw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-logs-otlp-http@0.203.0':
+    resolution: {integrity: sha512-s0hys1ljqlMTbXx2XiplmMJg9wG570Z5lH7wMvrZX6lcODI56sG4HL03jklF63tBeyNwK2RV1/ntXGo3HgG4Qw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-logs-otlp-proto@0.203.0':
+    resolution: {integrity: sha512-nl/7S91MXn5R1aIzoWtMKGvqxgJgepB/sH9qW0rZvZtabnsjbf8OQ1uSx3yogtvLr0GzwD596nQKz2fV7q2RBw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.203.0':
+    resolution: {integrity: sha512-FCCj9nVZpumPQSEI57jRAA89hQQgONuoC35Lt+rayWY/mzCAc6BQT7RFyFaZKJ2B7IQ8kYjOCPsF/HGFWjdQkQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-metrics-otlp-http@0.203.0':
+    resolution: {integrity: sha512-HFSW10y8lY6BTZecGNpV3GpoSy7eaO0Z6GATwZasnT4bEsILp8UJXNG5OmEsz4SdwCSYvyCbTJdNbZP3/8LGCQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-metrics-otlp-proto@0.203.0':
+    resolution: {integrity: sha512-OZnhyd9npU7QbyuHXFEPVm3LnjZYifuKpT3kTnF84mXeEQ84pJJZgyLBpU4FSkSwUkt/zbMyNAI7y5+jYTWGIg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-prometheus@0.203.0':
+    resolution: {integrity: sha512-2jLuNuw5m4sUj/SncDf/mFPabUxMZmmYetx5RKIMIQyPnl6G6ooFzfeE8aXNRf8YD1ZXNlCnRPcISxjveGJHNg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-grpc@0.203.0':
+    resolution: {integrity: sha512-322coOTf81bm6cAA8+ML6A+m4r2xTCdmAZzGNTboPXRzhwPt4JEmovsFAs+grpdarObd68msOJ9FfH3jxM6wqA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-http@0.203.0':
+    resolution: {integrity: sha512-ZDiaswNYo0yq/cy1bBLJFe691izEJ6IgNmkjm4C6kE9ub/OMQqDXORx2D2j8fzTBTxONyzusbaZlqtfmyqURPw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-http@0.57.0':
+    resolution: {integrity: sha512-BJl35PSkwoMlGEOrzjCG1ih6zqZoAZJIR4xyqSKC2BqPtwuRjID0vWBaEdP9xrxxJTEIEQw+gEY/0pUgicX0ew==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-trace-otlp-proto@0.203.0':
+    resolution: {integrity: sha512-1xwNTJ86L0aJmWRwENCJlH4LULMG2sOXWIVw+Szta4fkqKVY50Eo4HoVKKq6U9QEytrWCr8+zjw0q/ZOeXpcAQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/exporter-zipkin@2.0.1':
+    resolution: {integrity: sha512-a9eeyHIipfdxzCfc2XPrE+/TI3wmrZUDFtG2RRXHSbZZULAny7SyybSvaDvS77a7iib5MPiAvluwVvbGTsHxsw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+
+  '@opentelemetry/host-metrics@0.37.0':
+    resolution: {integrity: sha512-gf6nRFci0PTni9R1QQKjZ2uZE4Y6olLKhlwdM0qqLbbn3SBVKyP2jyBMiosBTHtRNLjY7s8hzQ44eLdK5wkGNQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-amqplib@0.46.1':
+    resolution: {integrity: sha512-AyXVnlCf/xV3K/rNumzKxZqsULyITJH6OVLiW6730JPRqWA7Zc9bvYoVNpN6iOpTU8CasH34SU/ksVJmObFibQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-aws-sdk@0.57.0':
+    resolution: {integrity: sha512-RfbyjaeZzX3mPhuaRHlSAQyfX3skfeWOl30jrqSXtE9k0DPdnIqpHhdYS0C/DEDuZbwTmruVJ4cUwMBw5Z6FAg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-connect@0.43.1':
+    resolution: {integrity: sha512-ht7YGWQuV5BopMcw5Q2hXn3I8eG8TH0J/kc/GMcW4CuNTgiP6wCu44BOnucJWL3CmFWaRHI//vWyAhaC8BwePw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-dataloader@0.16.1':
+    resolution: {integrity: sha512-K/qU4CjnzOpNkkKO4DfCLSQshejRNAJtd4esgigo/50nxCB6XCyi1dhAblUHM9jG5dRm8eu0FB+t87nIo99LYQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-express@0.47.1':
+    resolution: {integrity: sha512-QNXPTWteDclR2B4pDFpz0TNghgB33UMjUt14B+BZPmtH1MwUFAfLHBaP5If0Z5NZC+jaH8oF2glgYjrmhZWmSw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-express@0.52.0':
+    resolution: {integrity: sha512-W7pizN0Wh1/cbNhhTf7C62NpyYw7VfCFTYg0DYieSTrtPBT1vmoSZei19wfKLnrMsz3sHayCg0HxCVL2c+cz5w==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fetch@0.203.0':
+    resolution: {integrity: sha512-Z+mls3rOP2BaVykDZLLZPvchjj9l2oj3dYG1GTnrc27Y8o3biE+5M1b0izblycbbQHXjMPHQCpmjHbLMQuWtBg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fs@0.19.1':
+    resolution: {integrity: sha512-6g0FhB3B9UobAR60BGTcXg4IHZ6aaYJzp0Ki5FhnxyAPt8Ns+9SSvgcrnsN2eGmk3RWG5vYycUGOEApycQL24A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-generic-pool@0.43.1':
+    resolution: {integrity: sha512-M6qGYsp1cURtvVLGDrPPZemMFEbuMmCXgQYTReC/IbimV5sGrLBjB+/hANUpRZjX67nGLdKSVLZuQQAiNz+sww==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-graphql@0.47.1':
+    resolution: {integrity: sha512-EGQRWMGqwiuVma8ZLAZnExQ7sBvbOx0N/AE/nlafISPs8S+QtXX+Viy6dcQwVWwYHQPAcuY3bFt3xgoAwb4ZNQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-hapi@0.45.2':
+    resolution: {integrity: sha512-7Ehow/7Wp3aoyCrZwQpU7a2CnoMq0XhIcioFuKjBb0PLYfBfmTsFTUyatlHu0fRxhwcRsSQRTvEhmZu8CppBpQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-http@0.203.0':
+    resolution: {integrity: sha512-y3uQAcCOAwnO6vEuNVocmpVzG3PER6/YZqbPbbffDdJ9te5NkHEkfSMNzlC3+v7KlE+WinPGc3N7MR30G1HY2g==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-http@0.57.2':
+    resolution: {integrity: sha512-1Uz5iJ9ZAlFOiPuwYg29Bf7bJJc/GeoeJIFKJYQf67nTVKFe8RHbEtxgkOmK4UGZNHKXcpW4P8cWBYzBn1USpg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-ioredis@0.47.1':
+    resolution: {integrity: sha512-OtFGSN+kgk/aoKgdkKQnBsQFDiG8WdCxu+UrHr0bXScdAmtSzLSraLo7wFIb25RVHfRWvzI5kZomqJYEg/l1iA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-kafkajs@0.7.1':
+    resolution: {integrity: sha512-OtjaKs8H7oysfErajdYr1yuWSjMAectT7Dwr+axIoZqT9lmEOkD/H/3rgAs8h/NIuEi2imSXD+vL4MZtOuJfqQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-knex@0.44.1':
+    resolution: {integrity: sha512-U4dQxkNhvPexffjEmGwCq68FuftFK15JgUF05y/HlK3M6W/G2iEaACIfXdSnwVNe9Qh0sPfw8LbOPxrWzGWGMQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-koa@0.47.1':
+    resolution: {integrity: sha512-l/c+Z9F86cOiPJUllUCt09v+kICKvT+Vg1vOAJHtHPsJIzurGayucfCMq2acd/A/yxeNWunl9d9eqZ0G+XiI6A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.44.1':
+    resolution: {integrity: sha512-5MPkYCvG2yw7WONEjYj5lr5JFehTobW7wX+ZUFy81oF2lr9IPfZk9qO+FTaM0bGEiymwfLwKe6jE15nHn1nmHg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongodb@0.52.0':
+    resolution: {integrity: sha512-1xmAqOtRUQGR7QfJFfGV/M2kC7wmI2WgZdpru8hJl3S0r4hW0n3OQpEHlSGXJAaNFyvT+ilnwkT+g5L4ljHR6g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongoose@0.46.1':
+    resolution: {integrity: sha512-3kINtW1LUTPkiXFRSSBmva1SXzS/72we/jL22N+BnF3DFcoewkdkHPYOIdAAk9gSicJ4d5Ojtt1/HeibEc5OQg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql2@0.45.2':
+    resolution: {integrity: sha512-h6Ad60FjCYdJZ5DTz1Lk2VmQsShiViKe0G7sYikb0GHI0NVvApp2XQNRHNjEMz87roFttGPLHOYVPlfy+yVIhQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql@0.45.1':
+    resolution: {integrity: sha512-TKp4hQ8iKQsY7vnp/j0yJJ4ZsP109Ht6l4RHTj0lNEG1TfgTrIH5vJMbgmoYXWzNHAqBH2e7fncN12p3BP8LFg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-pg@0.51.1':
+    resolution: {integrity: sha512-QxgjSrxyWZc7Vk+qGSfsejPVFL1AgAJdSBMYZdDUbwg730D09ub3PXScB9d04vIqPriZ+0dqzjmQx0yWKiCi2Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-redis-4@0.46.1':
+    resolution: {integrity: sha512-UMqleEoabYMsWoTkqyt9WAzXwZ4BlFZHO40wr3d5ZvtjKCHlD4YXLm+6OLCeIi/HkX7EXvQaz8gtAwkwwSEvcQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-tedious@0.18.1':
+    resolution: {integrity: sha512-5Cuy/nj0HBaH+ZJ4leuD7RjgvA844aY2WW+B5uLcWtxGjRZl3MNLuxnNg5DYWZNPO+NafSSnra0q49KWAHsKBg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-undici@0.10.1':
+    resolution: {integrity: sha512-rkOGikPEyRpMCmNu9AQuV5dtRlDmJp2dK5sw8roVshAGoB6hH/3QjDtRhdwd75SsJwgynWUNRUYe0wAkTo16tQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+
+  '@opentelemetry/instrumentation-undici@0.14.0':
+    resolution: {integrity: sha512-2HN+7ztxAReXuxzrtA3WboAKlfP5OsPA57KQn2AdYZbJ3zeRPcLXyW4uO/jpLE6PLm0QRtmeGCmfYpqRlwgSwg==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+
+  '@opentelemetry/instrumentation@0.203.0':
+    resolution: {integrity: sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.52.1':
+    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.57.2':
+    resolution: {integrity: sha512-BdBGhQBh8IjZ2oIIX6F2/Q3LKm/FDDKi6ccYKcBTeilh6SNdNKveDOLk73BkSJjQLJk6qe4Yh+hHw1UPhCDdrg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-exporter-base@0.203.0':
+    resolution: {integrity: sha512-Wbxf7k+87KyvxFr5D7uOiSq/vHXWommvdnNE7vECO3tAhsA2GfOlpWINCMWUEPdHZ7tCXxw6Epp3vgx3jU7llQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-exporter-base@0.57.0':
+    resolution: {integrity: sha512-QQl4Ngm3D6H8SDO0EM642ncTxjRsf/HDq7+IWIA0eaEK/NTsJeQ3iYJiZj3F4jkALnvyeM1kkwd+DHtqxTBx9Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-grpc-exporter-base@0.203.0':
+    resolution: {integrity: sha512-te0Ze1ueJF+N/UOFl5jElJW4U0pZXQ8QklgSfJ2linHN0JJsuaHG8IabEUi2iqxY8ZBDlSiz1Trfv5JcjWWWwQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-transformer@0.203.0':
+    resolution: {integrity: sha512-Y8I6GgoCna0qDQ2W6GCRtaF24SnvqvA8OfeTi7fqigD23u8Jpb4R5KFv/pRvrlGagcCLICMIyh9wiejp4TXu/A==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/otlp-transformer@0.57.0':
+    resolution: {integrity: sha512-yHX7sdwkdAmSa6Jbi3caSLDWy0PCHS1pKQeKz8AIWSyQqL7IojHKgdk9A+7eRd98Z1n9YTdwWSWLnObvIqhEhQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/propagation-utils@0.31.3':
+    resolution: {integrity: sha512-ZI6LKjyo+QYYZY5SO8vfoCQ9A69r1/g+pyjvtu5RSK38npINN1evEmwqbqhbg2CdcIK3a4PN6pDAJz/yC5/gAA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+
+  '@opentelemetry/propagator-b3@2.0.1':
+    resolution: {integrity: sha512-Hc09CaQ8Tf5AGLmf449H726uRoBNGPBL4bjr7AnnUpzWMvhdn61F78z9qb6IqB737TffBsokGAK1XykFEZ1igw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/propagator-jaeger@2.0.1':
+    resolution: {integrity: sha512-7PMdPBmGVH2eQNb/AtSJizQNgeNTfh6jQFqys6lfhd6P4r+m/nTh3gKPPpaCXVdRQ+z93vfKk+4UGty390283w==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/redis-common@0.36.2':
+    resolution: {integrity: sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/resource-detector-aws@2.3.0':
+    resolution: {integrity: sha512-PkD/lyXG3B3REq1Y6imBLckljkJYXavtqGYSryAeJYvGOf5Ds3doR+BCGjmKeF6ObAtI5MtpBeUStTDtGtBsWA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+
+  '@opentelemetry/resources@1.30.0':
+    resolution: {integrity: sha512-5mGMjL0Uld/99t7/pcd7CuVtJbkARckLVuiOX84nO8RtLtIz0/J6EOHM2TGvPZ6F4K+XjUq13gMx14w80SVCQg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/resources@1.30.1':
+    resolution: {integrity: sha512-5UxZqiAgLYGFjS4s9qm5mBVo433u+dSPUFWVWXmLAD4wB65oMCoXaJP1KJa9DIYYMeHu3z4BZcStG3LC593cWA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/resources@2.0.1':
+    resolution: {integrity: sha512-dZOB3R6zvBwDKnHDTB4X1xtMArB/d324VsbiPkX/Yu0Q8T2xceRthoIVFhJdvgVM2QhGVUyX9tzwiNxGtoBJUw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/resources@2.2.0':
+    resolution: {integrity: sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-logs@0.203.0':
+    resolution: {integrity: sha512-vM2+rPq0Vi3nYA5akQD2f3QwossDnTDLvKbea6u/A2NZ3XDkPxMfo/PNrDoXhDUD/0pPo2CdH5ce/thn9K0kLw==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+
+  '@opentelemetry/sdk-logs@0.57.0':
+    resolution: {integrity: sha512-6Kbxdu/QE9LWH7+WSLmYo3DjAq+c55TiCLXiXu6b/2m2muy5SyOG2m0MrGqetyRpfYSSbIqHmJoqNVTN3+2a9g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+
+  '@opentelemetry/sdk-metrics@1.30.0':
+    resolution: {integrity: sha512-5kcj6APyRMvv6dEIP5plz2qfJAD4OMipBRT11u/pa1a68rHKI2Ln+iXVkAGKgx8o7CXbD7FdPypTUY88ZQgP4Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-metrics@2.0.1':
+    resolution: {integrity: sha512-wf8OaJoSnujMAHWR3g+/hGvNcsC16rf9s1So4JlMiFaFHiE4HpIA3oUh+uWZQ7CNuK8gVW/pQSkgoa5HkkOl0g==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.9.0 <1.10.0'
+
+  '@opentelemetry/sdk-node@0.203.0':
+    resolution: {integrity: sha512-zRMvrZGhGVMvAbbjiNQW3eKzW/073dlrSiAKPVWmkoQzah9wfynpVPeL55f9fVIm0GaBxTLcPeukWGy0/Wj7KQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@1.30.0':
+    resolution: {integrity: sha512-RKQDaDIkV7PwizmHw+rE/FgfB2a6MBx+AEVVlAHXRG1YYxLiBpPX2KhmoB99R5vA4b72iJrjle68NDWnbrE9Dg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@1.30.1':
+    resolution: {integrity: sha512-jVPgBbH1gCy2Lb7X0AVQ8XAfgg0pJ4nvl8/IiQA6nxOsPvS+0zMJaFSs2ltXe0J6C8dqjcnpyqINDJmU30+uOg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@2.0.1':
+    resolution: {integrity: sha512-xYLlvk/xdScGx1aEqvxLwf6sXQLXCjk3/1SQT9X9AoN5rXRhkdvIFShuNNmtTEPRBqcsMbS4p/gJLNI2wXaDuQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-node@2.0.1':
+    resolution: {integrity: sha512-UhdbPF19pMpBtCWYP5lHbTogLWx9N0EBxtdagvkn5YtsAnCBZzL7SjktG+ZmupRgifsHMjwUaCCaVmqGfSADmA==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-web@2.0.1':
+    resolution: {integrity: sha512-R4/i0rISvAujG4Zwk3s6ySyrWG+Db3SerZVM4jZ2lEzjrNylF7nRAy1hVvWe8gTbwIxX+6w6ZvZwdtl2C7UQHQ==}
+    engines: {node: ^18.19.0 || >=20.6.0}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/semantic-conventions@1.28.0':
+    resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/semantic-conventions@1.36.0':
+    resolution: {integrity: sha512-TtxJSRD8Ohxp6bKkhrm27JRHAxPczQA7idtcTOMYI+wQRRrfgqxHv1cFbCApcSnNjtXkmzFozn6jQtFrOmbjPQ==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/sql-common@0.40.1':
+    resolution: {integrity: sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+
+  '@pkgjs/parseargs@0.11.0':
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+
+  '@pkgr/utils@2.3.1':
+    resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
+
+  '@playwright/test@1.37.0':
+    resolution: {integrity: sha512-181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ==}
+    engines: {node: '>=16'}
+    deprecated: Please update to the latest version of Playwright to test up-to-date browsers.
+    hasBin: true
+
+  '@polka/url@0.5.0':
+    resolution: {integrity: sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==}
+
+  '@polka/url@1.0.0-next.28':
+    resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
+
+  '@popperjs/core@2.11.8':
+    resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
+
+  '@prisma/adapter-pg@6.16.0':
+    resolution: {integrity: sha512-zNMQyIrkcVFMYFuVeO9GhK9dc5kMSvqwqL+pNMM9oK4+mj7HcKws780ZXhAgV149kcg2kDisHPHO5nE4gkG+oA==}
+
+  '@prisma/adapter-pg@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-5+ZjSPMzyfDYMmWLH1IaQIOQGa8eJrqEz5A9V4vS4+b6LV6qvCOHjqlnbRQ5IKSNCwFP055SJ54RsPES+0jOyA==}
+
+  '@prisma/client-runtime-utils@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-prENLjPislFvRWDHNgXmg9yzixQYsFPVQGtDv5zIMs4pV2KPdNc5pCiZ3n77hAinvqGJVafASa+eU4TfpVphdA==}
+
+  '@prisma/client@4.9.0':
+    resolution: {integrity: sha512-bz6QARw54sWcbyR1lLnF2QHvRW5R/Jxnbbmwh3u+969vUKXtBkXgSgjDA85nji31ZBlf7+FrHDy5x+5ydGyQDg==}
+    engines: {node: '>=14.17'}
+    peerDependencies:
+      prisma: '*'
+    peerDependenciesMeta:
+      prisma:
+        optional: true
+
+  '@prisma/client@6.14.0':
+    resolution: {integrity: sha512-8E/Nk3eL5g7RQIg/LUj1ICyDmhD053STjxrPxUtCRybs2s/2sOEcx9NpITuAOPn07HEpWBfhAVe1T/HYWXUPOw==}
+    engines: {node: '>=18.18'}
+    peerDependencies:
+      prisma: '*'
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      prisma:
+        optional: true
+      typescript:
+        optional: true
+
+  '@prisma/client@6.16.0':
+    resolution: {integrity: sha512-FYkFJtgwpwJRMxtmrB26y7gtpR372kyChw6lWng5TMmvn5V+uisy0OyllO5EJD1s8lX78V8X3XjhiXOoMLnu3w==}
+    engines: {node: '>=18.18'}
+    peerDependencies:
+      prisma: '*'
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      prisma:
+        optional: true
+      typescript:
+        optional: true
+
+  '@prisma/client@6.19.0':
+    resolution: {integrity: sha512-QXFT+N/bva/QI2qoXmjBzL7D6aliPffIwP+81AdTGq0FXDoLxLkWivGMawG8iM5B9BKfxLIXxfWWAF6wbuJU6g==}
+    engines: {node: '>=18.18'}
+    peerDependencies:
+      prisma: '*'
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      prisma:
+        optional: true
+      typescript:
+        optional: true
+
+  '@prisma/client@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-cSxdnyO3nBr+JQFsW8j4C3JvMWiknSoZktmMNRNtXQ7bmUeG4IyQks97bjzeAUP8feJechk5casCIq3p26GDvA==}
+    engines: {node: ^20.19 || ^22.12 || ^24.0}
+    peerDependencies:
+      prisma: '*'
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      prisma:
+        optional: true
+      typescript:
+        optional: true
+
+  '@prisma/config@6.14.0':
+    resolution: {integrity: sha512-IwC7o5KNNGhmblLs23swnfBjADkacBb7wvyDXUWLwuvUQciKJZqyecU0jw0d7JRkswrj+XTL8fdr0y2/VerKQQ==}
+
+  '@prisma/config@6.16.0':
+    resolution: {integrity: sha512-Q9TgfnllVehvQziY9lJwRJLGmziX0OimZUEQ/MhCUBoJMSScj2VivCjw/Of2vlO1FfyaHXxrvjZAr7ASl7DVcw==}
+
+  '@prisma/config@6.19.0':
+    resolution: {integrity: sha512-zwCayme+NzI/WfrvFEtkFhhOaZb/hI+X8TTjzjJ252VbPxAl2hWHK5NMczmnG9sXck2lsXrxIZuK524E25UNmg==}
+
+  '@prisma/config@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-nwf+tczfiGSn0tnuHmBpnK+wmaYzcC20sn9Zt8BSoJVCewJxf8ASHPxZEGgvFLl05zbCfFtq3rMc6ZnAiYjowg==}
+
+  '@prisma/debug@4.16.2':
+    resolution: {integrity: sha512-7L7WbG0qNNZYgLpsVB8rCHCXEyHFyIycRlRDNwkVfjQmACC2OW6AWCYCbfdjQhkF/t7+S3njj8wAWAocSs+Brw==}
+
+  '@prisma/debug@6.14.0':
+    resolution: {integrity: sha512-j4Lf+y+5QIJgQD4sJWSbkOD7geKx9CakaLp/TyTy/UDu9Wo0awvWCBH/BAxTHUaCpIl9USA5VS/KJhDqKJSwug==}
+
+  '@prisma/debug@6.16.0':
+    resolution: {integrity: sha512-bxzro5vbVqAPkWyDs2A6GpQtRZunD8tyrLmSAchx9u0b+gWCDY6eV+oh5A0YtYT9245dIxQBswckayHuJG4u3w==}
+
+  '@prisma/debug@6.19.0':
+    resolution: {integrity: sha512-8hAdGG7JmxrzFcTzXZajlQCidX0XNkMJkpqtfbLV54wC6LSSX6Vni25W/G+nAANwLnZ2TmwkfIuWetA7jJxJFA==}
+
+  '@prisma/debug@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-PqUUFXf8MDoIrsKMzpF4NYqA3gHE8l/CUWVnYa4hNIbynCcEhvk7iT+6ve0u9w1TiGVUFnIVMuqFGEb2aHCuFw==}
+
+  '@prisma/driver-adapter-utils@6.16.0':
+    resolution: {integrity: sha512-dsRHvEnifJ3xqpMKGBy1jRwR8yc+7Ko4TcHrdTQJIfq6NYN2gNoOf0k91hcbzs5AH19wDxjuHXCveklWq5AJdA==}
+
+  '@prisma/driver-adapter-utils@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-TXpFugr3sCl2bHechoG3p9mvlq2Z3GgA0Cp73lUOEWQyUuoG8NW/4UA56Ax1r5fBUAs9hKbr20Ld6wKCZhnz8Q==}
+
+  '@prisma/engines-version@4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5':
+    resolution: {integrity: sha512-M16aibbxi/FhW7z1sJCX8u+0DriyQYY5AyeTH7plQm9MLnURoiyn3CZBqAyIoQ+Z1pS77usCIibYJWSgleBMBA==}
+
+  '@prisma/engines-version@6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49':
+    resolution: {integrity: sha512-EgN9ODJpiX45yvwcngoStp3uQPJ3l+AEVoQ6dMMO2QvmwIlnxfApzKmJQExzdo7/hqQANrz5txHJdGYHzOnGHA==}
+
+  '@prisma/engines-version@6.16.0-7.1c57fdcd7e44b29b9313256c76699e91c3ac3c43':
+    resolution: {integrity: sha512-ThvlDaKIVrnrv97ujNFDYiQbeMQpLa0O86HFA2mNoip4mtFqM7U5GSz2ie1i2xByZtvPztJlNRgPsXGeM/kqAA==}
+
+  '@prisma/engines-version@6.19.0-26.2ba551f319ab1df4bc874a89965d8b3641056773':
+    resolution: {integrity: sha512-gV7uOBQfAFlWDvPJdQxMT1aSRur3a0EkU/6cfbAC5isV67tKDWUrPauyaHNpB+wN1ebM4A9jn/f4gH+3iHSYSQ==}
+
+  '@prisma/engines-version@6.20.0-11.next-80ee0a44bf5668992b0c909c946a755b86b56c95':
+    resolution: {integrity: sha512-DqrQqRIgeocvWpgN7t9PymiJdV8ISSSrZCuilAtpKEaKIt4JUGIxsAdWNMRSHk188hYA2W1YFG5KvWUYBaCO1A==}
+
+  '@prisma/engines@6.14.0':
+    resolution: {integrity: sha512-LhJjqsALFEcoAtF07nSaOkVguaxw/ZsgfROIYZ8bAZDobe7y8Wy+PkYQaPOK1iLSsFgV2MhCO/eNrI1gdSOj6w==}
+
+  '@prisma/engines@6.16.0':
+    resolution: {integrity: sha512-RHJGCH/zi017W4CWYWqg0Sv1pquGGFVo8T3auJ9sodDNaiRzbeNldydjaQzszVS8nscdtcvLuJzy7e65C3puqQ==}
+
+  '@prisma/engines@6.19.0':
+    resolution: {integrity: sha512-pMRJ+1S6NVdXoB8QJAPIGpKZevFjxhKt0paCkRDTZiczKb7F4yTgRP8M4JdVkpQwmaD4EoJf6qA+p61godDokw==}
+
+  '@prisma/engines@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-XdzTxN0PFLIW2DcprG9xlMy39FrsjxW5J2qtHQ58FBtbllHSZGD0pK2nzATw5dRh7nGhmX+uNA02cqHv5oND3A==}
+
+  '@prisma/fetch-engine@6.14.0':
+    resolution: {integrity: sha512-MPzYPOKMENYOaY3AcAbaKrfvXVlvTc6iHmTXsp9RiwCX+bPyfDMqMFVUSVXPYrXnrvEzhGHfyiFy0PRLHPysNg==}
+
+  '@prisma/fetch-engine@6.16.0':
+    resolution: {integrity: sha512-Mx5rml0XRIDizhB9eZxSP8c0nMoXYVITTiJJwxlWn9rNCel8mG8NAqIw+vJlN3gPR+kt3IBkP1SQVsplPPpYrA==}
+
+  '@prisma/fetch-engine@6.19.0':
+    resolution: {integrity: sha512-OOx2Lda0DGrZ1rodADT06ZGqHzr7HY7LNMaFE2Vp8dp146uJld58sRuasdX0OiwpHgl8SqDTUKHNUyzEq7pDdQ==}
+
+  '@prisma/fetch-engine@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-zVNM5Q1hFclpqD1y7wujDzyc3l01S8ZMuP0Zddzuda4LOA7/F2enjro48VcD2/fxkBgzkkmO/quLOGnbQDKO7g==}
+
+  '@prisma/generator-helper@4.16.2':
+    resolution: {integrity: sha512-bMOH7y73Ui7gpQrioFeavMQA+Tf8ksaVf8Nhs9rQNzuSg8SSV6E9baczob0L5KGZTSgYoqnrRxuo03kVJYrnIg==}
+
+  '@prisma/get-platform@6.14.0':
+    resolution: {integrity: sha512-7VjuxKNwjnBhKfqPpMeWiHEa2sVjYzmHdl1slW6STuUCe9QnOY0OY1ljGSvz6wpG4U8DfbDqkG1yofd/1GINww==}
+
+  '@prisma/get-platform@6.16.0':
+    resolution: {integrity: sha512-eaJOOvAoGslSUTjiQrtE9E0hoBdfL43j8SymOGD6LbdrKRNtIoiy6qiBaEr2fNYD+R/Qns7QOwPhl7SVHJayKA==}
+
+  '@prisma/get-platform@6.19.0':
+    resolution: {integrity: sha512-ym85WDO2yDhC3fIXHWYpG3kVMBA49cL1XD2GCsCF8xbwoy2OkDQY44gEbAt2X46IQ4Apq9H6g0Ex1iFfPqEkHA==}
+
+  '@prisma/get-platform@6.20.0-integration-next.8':
+    resolution: {integrity: sha512-21jEfhFpC8FuvPD7JEf1Qu02engBCBa3+1il3UiyHKcKS3Kbp9IgR+DVqqrqSWIGJg8+1oTfF/3AgbjunaQ1Ag==}
+
+  '@prisma/instrumentation@6.11.1':
+    resolution: {integrity: sha512-mrZOev24EDhnefmnZX7WVVT7v+r9LttPRqf54ONvj6re4XMF7wFTpK2tLJi4XHB7fFp/6xhYbgRel8YV7gQiyA==}
+    peerDependencies:
+      '@opentelemetry/api': ^1.8
+
+  '@prisma/instrumentation@6.14.0':
+    resolution: {integrity: sha512-Po/Hry5bAeunRDq0yAQueKookW3glpP+qjjvvyOfm6dI2KG5/Y6Bgg3ahyWd7B0u2E+Wf9xRk2rtdda7ySgK1A==}
+    peerDependencies:
+      '@opentelemetry/api': ^1.8
+
+  '@prisma/studio-core-licensed@0.6.0':
+    resolution: {integrity: sha512-LNC8ohLosuWz6n9oKNqfR5Ep/JYiPavk4RxrU6inOS4LEvMQts8N+Vtt7NAB9i06BaiIRKnPsg1Hcaao5pRjSw==}
+    peerDependencies:
+      '@types/react': ^18.0.0 || ^19.0.0
+      react: ^18.0.0 || ^19.0.0
+      react-dom: ^18.0.0 || ^19.0.0
+
+  '@protobuf-ts/runtime@2.11.1':
+    resolution: {integrity: sha512-KuDaT1IfHkugM2pyz+FwiY80ejWrkH1pAtOBOZFuR6SXEFTsnb/jiQWQ1rCIrcKx2BtyxnxW6BWwsVSA/Ie+WQ==}
+
+  '@protobufjs/aspromise@1.1.2':
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+
+  '@protobufjs/base64@1.1.2':
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+
+  '@protobufjs/codegen@2.0.4':
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+
+  '@protobufjs/eventemitter@1.1.0':
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+
+  '@protobufjs/fetch@1.1.0':
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+
+  '@protobufjs/float@1.0.2':
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+
+  '@protobufjs/inquire@1.1.0':
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+
+  '@protobufjs/path@1.1.2':
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+
+  '@protobufjs/pool@1.1.0':
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+
+  '@protobufjs/utf8@1.1.0':
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+
+  '@puppeteer/browsers@2.10.6':
+    resolution: {integrity: sha512-pHUn6ZRt39bP3698HFQlu2ZHCkS/lPcpv7fVQcGBSzNNygw171UXAKrCUhy+TEMw4lEttOKDgNpb04hwUAJeiQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@radix-ui/colors@1.0.1':
+    resolution: {integrity: sha512-xySw8f0ZVsAEP+e7iLl3EvcBXX7gsIlC1Zso/sPBW9gIWerBTgz6axrjU+MZ39wD+WFi5h5zdWpsg3+hwt2Qsg==}
+
+  '@radix-ui/number@1.0.0':
+    resolution: {integrity: sha512-Ofwh/1HX69ZfJRiRBMTy7rgjAzHmwe4kW9C9Y99HTRUcYLUuVT0KESFj15rPjRgKJs20GPq8Bm5aEDJ8DuA3vA==}
+
+  '@radix-ui/number@1.0.1':
+    resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
+
+  '@radix-ui/number@1.1.0':
+    resolution: {integrity: sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==}
+
+  '@radix-ui/primitive@1.0.0':
+    resolution: {integrity: sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==}
+
+  '@radix-ui/primitive@1.0.1':
+    resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
+
+  '@radix-ui/primitive@1.1.0':
+    resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
+
+  '@radix-ui/primitive@1.1.2':
+    resolution: {integrity: sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==}
+
+  '@radix-ui/react-accordion@1.2.11':
+    resolution: {integrity: sha512-l3W5D54emV2ues7jjeG1xcyN7S3jnK3zE2zHqgn0CmMsy9lNJwmgcrmaxS+7ipw15FAivzKNzH3d5EcGoFKw0A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-alert-dialog@1.0.4':
+    resolution: {integrity: sha512-jbfBCRlKYlhbitueOAv7z74PXYeIQmWpKwm3jllsdkw7fGWNkxqP3v0nY9WmOzcPqpQuoorNtvViBgL46n5gVg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-arrow@1.0.2':
+    resolution: {integrity: sha512-fqYwhhI9IarZ0ll2cUSfKuXHlJK0qE4AfnRrPBbRwEH/4mGQn04/QFGomLi8TXWIdv9WJk//KgGm+aDxVIr1wA==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-arrow@1.0.3':
+    resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-avatar@1.1.3':
+    resolution: {integrity: sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-collapsible@1.0.3':
+    resolution: {integrity: sha512-UBmVDkmR6IvDsloHVN+3rtx4Mi5TFvylYXpluuv0f37dtaz3H99bp8No0LGXRigVpl3UAT4l9j6bIchh42S/Gg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-collapsible@1.1.11':
+    resolution: {integrity: sha512-2qrRsVGSCYasSz1RFOorXwl0H7g7J1frQtgpQgYrt+MOidtPAINHn9CPovQXb83r8ahapdx3Tu0fa/pdFFSdPg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-collection@1.0.2':
+    resolution: {integrity: sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-collection@1.0.3':
+    resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-collection@1.1.7':
+    resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-compose-refs@1.0.0':
+    resolution: {integrity: sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-compose-refs@1.0.1':
+    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-compose-refs@1.1.0':
+    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-compose-refs@1.1.1':
+    resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-compose-refs@1.1.2':
+    resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-context@1.0.0':
+    resolution: {integrity: sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-context@1.0.1':
+    resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-context@1.1.1':
+    resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-context@1.1.2':
+    resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-dialog@1.0.3':
+    resolution: {integrity: sha512-owNhq36kNPqC2/a+zJRioPg6HHnTn5B/sh/NjTY8r4W9g1L5VJlrzZIVcBr7R9Mg8iLjVmh6MGgMlfoVf/WO/A==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-dialog@1.0.4':
+    resolution: {integrity: sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-direction@1.0.0':
+    resolution: {integrity: sha512-2HV05lGUgYcA6xgLQ4BKPDmtL+QbIZYH5fCOTAOOcJ5O0QbWS3i9lKaurLzliYUDhORI2Qr3pyjhJh44lKA3rQ==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-direction@1.0.1':
+    resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-direction@1.1.0':
+    resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-direction@1.1.1':
+    resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-dismissable-layer@1.0.3':
+    resolution: {integrity: sha512-nXZOvFjOuHS1ovumntGV7NNoLaEp9JEvTht3MBjP44NSW5hUKj/8OnfN3+8WmB+CEhN44XaGhpHoSsUIEl5P7Q==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-dismissable-layer@1.0.4':
+    resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-dismissable-layer@1.0.5':
+    resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-focus-guards@1.0.0':
+    resolution: {integrity: sha512-UagjDk4ijOAnGu4WMUPj9ahi7/zJJqNZ9ZAiGPp7waUWJO0O1aWXi/udPphI0IUjvrhBsZJGSN66dR2dsueLWQ==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-focus-guards@1.0.1':
+    resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-focus-scope@1.0.2':
+    resolution: {integrity: sha512-spwXlNTfeIprt+kaEWE/qYuYT3ZAqJiAGjN/JgdvgVDTu8yc+HuX+WOWXrKliKnLnwck0F6JDkqIERncnih+4A==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-focus-scope@1.0.3':
+    resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-focus-scope@1.0.4':
+    resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-icons@1.3.0':
+    resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==}
+    peerDependencies:
+      react: ^16.x || ^17.x || ^18.x
+
+  '@radix-ui/react-id@1.0.0':
+    resolution: {integrity: sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-id@1.0.1':
+    resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-id@1.1.1':
+    resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-label@2.0.1':
+    resolution: {integrity: sha512-qcfbS3B8hTYmEO44RNcXB6pegkxRsJIbdxTMu0PEX0Luv5O2DvTIwwVYxQfUwLpM88EL84QRPLOLgwUSApMsLQ==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-popover@1.0.5':
+    resolution: {integrity: sha512-GRHZ8yD12MrN2NLobHPE8Rb5uHTxd9x372DE9PPNnBjpczAQHcZ5ne0KXG4xpf+RDdXSzdLv9ym6mYJCDTaUZg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-popover@1.0.7':
+    resolution: {integrity: sha512-shtvVnlsxT6faMnK/a7n0wptwBD23xc1Z5mdrtKLwVEfsEMXodS0r5s0/g5P0hX//EKYZS2sxUjqfzlg52ZSnQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-popper@1.1.1':
+    resolution: {integrity: sha512-keYDcdMPNMjSC8zTsZ8wezUMiWM9Yj14wtF3s0PTIs9srnEPC9Kt2Gny1T3T81mmSeyDjZxsD9N5WCwNNb712w==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-popper@1.1.2':
+    resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-popper@1.1.3':
+    resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-portal@1.0.2':
+    resolution: {integrity: sha512-swu32idoCW7KA2VEiUZGBSu9nB6qwGdV6k6HYhUoOo3M1FFpD+VgLzUqtt3mwL1ssz7r2x8MggpLSQach2Xy/Q==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-portal@1.0.3':
+    resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-portal@1.0.4':
+    resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-portal@1.1.9':
+    resolution: {integrity: sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-presence@1.0.0':
+    resolution: {integrity: sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-presence@1.0.1':
+    resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-presence@1.1.1':
+    resolution: {integrity: sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-presence@1.1.4':
+    resolution: {integrity: sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-primitive@1.0.2':
+    resolution: {integrity: sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-primitive@1.0.3':
+    resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-primitive@2.0.0':
+    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-primitive@2.0.1':
+    resolution: {integrity: sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-primitive@2.0.2':
+    resolution: {integrity: sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-primitive@2.1.3':
+    resolution: {integrity: sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-progress@1.1.1':
+    resolution: {integrity: sha512-6diOawA84f/eMxFHcWut0aE1C2kyE9dOyCTQOMRR2C/qPiXz/X0SaiA/RLbapQaXUCmy0/hLMf9meSccD1N0pA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-radio-group@1.1.3':
+    resolution: {integrity: sha512-x+yELayyefNeKeTx4fjK6j99Fs6c4qKm3aY38G3swQVTN6xMpsrbigC0uHs2L//g8q4qR7qOcww8430jJmi2ag==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-roving-focus@1.0.3':
+    resolution: {integrity: sha512-stjCkIoMe6h+1fWtXlA6cRfikdBzCLp3SnVk7c48cv/uy3DTGoXhN76YaOYUJuy3aEDvDIKwKR5KSmvrtPvQPQ==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-roving-focus@1.0.4':
+    resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-scroll-area@1.2.0':
+    resolution: {integrity: sha512-q2jMBdsJ9zB7QG6ngQNzNwlvxLQqONyL58QbEGwuyRZZb/ARQwk3uQVbCF7GvQVOtV6EU/pDxAw3zRzJZI3rpQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-select@1.2.1':
+    resolution: {integrity: sha512-GULRMITaOHNj79BZvQs3iZO0+f2IgI8g5HDhMi7Bnc13t7IlG86NFtOCfTLme4PNZdEtU+no+oGgcl6IFiphpQ==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-slider@1.1.2':
+    resolution: {integrity: sha512-NKs15MJylfzVsCagVSWKhGGLNR1W9qWs+HtgbmjjVUB3B9+lb3PYoXxVju3kOrpf0VKyVCtZp+iTwVoqpa1Chw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-slot@1.0.1':
+    resolution: {integrity: sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-slot@1.0.2':
+    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-slot@1.1.0':
+    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-slot@1.1.1':
+    resolution: {integrity: sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-slot@1.1.2':
+    resolution: {integrity: sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-slot@1.2.3':
+    resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-switch@1.0.3':
+    resolution: {integrity: sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-tabs@1.0.3':
+    resolution: {integrity: sha512-4CkF/Rx1GcrusI/JZ1Rvyx4okGUs6wEenWA0RG/N+CwkRhTy7t54y7BLsWUXrAz/GRbBfHQg/Odfs/RoW0CiRA==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-toggle-group@1.0.4':
+    resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-toggle@1.0.3':
+    resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-tooltip@1.0.5':
+    resolution: {integrity: sha512-cDKVcfzyO6PpckZekODJZDe5ZxZ2fCZlzKzTmPhe4mX9qTHRfLcKgqb0OKf22xLwDequ2tVleim+ZYx3rabD5w==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-tooltip@1.0.6':
+    resolution: {integrity: sha512-DmNFOiwEc2UDigsYj6clJENma58OelxD24O4IODoZ+3sQc3Zb+L8w1EP+y9laTuKCLAysPw4fD6/v0j4KNV8rg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/react-use-callback-ref@1.0.0':
+    resolution: {integrity: sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-callback-ref@1.0.1':
+    resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-callback-ref@1.1.0':
+    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-controllable-state@1.0.0':
+    resolution: {integrity: sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-controllable-state@1.0.1':
+    resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-controllable-state@1.2.2':
+    resolution: {integrity: sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-effect-event@0.0.2':
+    resolution: {integrity: sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-escape-keydown@1.0.2':
+    resolution: {integrity: sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-escape-keydown@1.0.3':
+    resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-layout-effect@1.0.0':
+    resolution: {integrity: sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-layout-effect@1.0.1':
+    resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-layout-effect@1.1.0':
+    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-layout-effect@1.1.1':
+    resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-previous@1.0.0':
+    resolution: {integrity: sha512-RG2K8z/K7InnOKpq6YLDmT49HGjNmrK+fr82UCVKT2sW0GYfVnYp4wZWBooT/EYfQ5faA9uIjvsuMMhH61rheg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-previous@1.0.1':
+    resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-rect@1.0.0':
+    resolution: {integrity: sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-rect@1.0.1':
+    resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-use-size@1.0.0':
+    resolution: {integrity: sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-use-size@1.0.1':
+    resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  '@radix-ui/react-visually-hidden@1.0.2':
+    resolution: {integrity: sha512-qirnJxtYn73HEk1rXL12/mXnu2rwsNHDID10th2JGtdK25T9wX+mxRmGt7iPSahw512GbZOc0syZX1nLQGoEOg==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+
+  '@radix-ui/react-visually-hidden@1.0.3':
+    resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0
+      react-dom: ^16.8 || ^17.0 || ^18.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
+  '@radix-ui/rect@1.0.0':
+    resolution: {integrity: sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==}
+
+  '@radix-ui/rect@1.0.1':
+    resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
+
+  '@react-aria/breadcrumbs@3.5.16':
+    resolution: {integrity: sha512-OXLKKu4SmjnSaSHkk4kow5/aH/SzlHWPJt+Uq3xec9TwDOr/Ob8aeFVGFoY0HxfGozuQlUz+4e+d29vfA0jNWg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/breadcrumbs@3.5.9':
+    resolution: {integrity: sha512-asbXTL5NjeHl1+YIF0K70y8tNHk8Lb6VneYH8yOkpLO49ejyNDYBK0tp0jtI9IZAQiTa2qkhYq58c9LloTwebQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/button@3.9.1':
+    resolution: {integrity: sha512-nAnLMUAnwIVcRkKzS1G2IU6LZSkIWPJGu9amz/g7Y02cGUwFp3lk5bEw2LdoaXiSDJNSX8g0SZFU8FROg57jfQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/button@3.9.8':
+    resolution: {integrity: sha512-MdbMQ3t5KSCkvKtwYd/Z6sgw0v+r1VQFRYOZ4L53xOkn+u140z8vBpNeWKZh/45gxGv7SJn9s2KstLPdCWmIxw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/calendar@3.5.11':
+    resolution: {integrity: sha512-VLhBovLVu3uJXBkHbgEippmo/K58QLcc/tSJQ0aJUNyHsrvPgHEcj484cb+Uj/yOirXEIzaoW6WEvhcdKrb49Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/calendar@3.5.4':
+    resolution: {integrity: sha512-8k7khgea5kwfWriZJWCADNB0R2d7g5A6tTjUEktK4FFZcTb0RCubFejts4hRyzKlF9XHUro2dfh6sbZrzfMKDQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/checkbox@3.13.0':
+    resolution: {integrity: sha512-eylJwtADIPKJ1Y5rITNJm/8JD8sXG2nhiZBIg1ko44Szxrpu+Le53NoGtg8nlrfh9vbUrXVvuFtf2jxbPXR5Jw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/checkbox@3.14.6':
+    resolution: {integrity: sha512-LICY1PR3WsW/VbuLMjZbxo75+poeo3XCXGcUnk6hxMlWfp/Iy/XHVsHlGu9stRPKRF8BSuOGteaHWVn6IXfwtA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/combobox@3.10.3':
+    resolution: {integrity: sha512-EdDwr2Rp1xy7yWjOYHt2qF1IpAtUrkaNKZJzlIw1XSwcqizQY6E8orNPdZr6ZwD6/tgujxF1N71JTKyffrR0Xw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/combobox@3.8.2':
+    resolution: {integrity: sha512-q8Kdw1mx6nSSydXqRagRuyKH1NPGvpSOFjUfgxdO8ZqaEEuZX3ObOoiO/DLtXDndViNc03dMbMpfuJoLYXfCtg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/datepicker@3.11.2':
+    resolution: {integrity: sha512-6sbLln3VXSBcBRDgSACBzIzF/5KV5NlNOhZvXPFE6KqFw6GbevjZQTv5BNDXiwA3CQoawIRF7zgRvTANw8HkNA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/datepicker@3.9.1':
+    resolution: {integrity: sha512-bdlY2H/zwe3hQf64Lp1oGTf7Va8ennDyAv4Ffowb+BOoL8+FB9smtGyONKe87zXu7VJL2M5xYAi4n7c004PM+w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/dialog@3.5.10':
+    resolution: {integrity: sha512-H2BNVLOfaum6/4irH5XUU/wIcXSs/ymxmTPGmucRG1hzaUh8H3tupdl/qCZ+SsW9oYDFlphY172uM1nsPjBMiQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/dialog@3.5.17':
+    resolution: {integrity: sha512-lvfEgaqg922J1hurscqCS600OZQVitGtdpo81kAefJaUzMnCxzrYviyT96aaW0simHOlimbYF5js8lxBLZJRaw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/dnd@3.5.1':
+    resolution: {integrity: sha512-7OPGePdle+xNYHAIAUOvIETRMfnkRt7h/C0bCkxUR2GYefEbTzfraso4ppNH2JZ7fCRd0K/Qe+jvQklwusHAKA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/dnd@3.7.2':
+    resolution: {integrity: sha512-NuE3EGqoBbe9aXAO9mDfbu4kMO7S4MCgkjkCqYi16TWfRUf38ajQbIlqodCx91b3LVN3SYvNbE3D4Tj5ebkljw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/focus@3.16.0':
+    resolution: {integrity: sha512-GP6EYI07E8NKQQcXHjpIocEU0vh0oi0Vcsd+/71fKS0NnTR0TUOEeil0JuuQ9ymkmPDTu51Aaaa4FxVsuN/23A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/focus@3.18.2':
+    resolution: {integrity: sha512-Jc/IY+StjA3uqN73o6txKQ527RFU7gnG5crEl5Xy3V+gbYp2O5L3ezAo/E0Ipi2cyMbG6T5Iit1IDs7hcGu8aw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/form@3.0.1':
+    resolution: {integrity: sha512-6586oODMDR4/ciGRwXjpvEAg7tWGSDrXE//waK0n5e5sMuzlPOo1DHc5SpPTvz0XdJsu6VDt2rHdVWVIC9LEyw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/form@3.0.8':
+    resolution: {integrity: sha512-8S2QiyUdAgK43M3flohI0R+2rTyzH088EmgeRArA8euvJTL16cj/oSOKMEgWVihjotJ9n6awPb43ZhKboyNsMg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/grid@3.10.3':
+    resolution: {integrity: sha512-l0r9mz05Gwjq3t6JOTNQOf+oAoWN0bXELPJtIr8m0XyXMPFCQe1xsTaX8igVQdrDmXyBc75RAWS0BJo2JF2fIA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/grid@3.8.6':
+    resolution: {integrity: sha512-JlQDkdm5heG1FfRyy5KnB8b6s/hRqSI6Xt2xN2AccLX5kcbfFr2/d5KVxyf6ahfa4Gfd46alN6477ju5eTWJew==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/gridlist@3.7.3':
+    resolution: {integrity: sha512-rkkepYM7xJiebR0g3uC4zzkdR7a8z0fLaM+sg9lSTbdElHMLAlrebS2ytEyZnhiu9nbOnw13GN1OC4/ZenzbHQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/gridlist@3.9.3':
+    resolution: {integrity: sha512-bb9GnKKeuL6NljoVUcHxr9F0cy/2WDOXRYeMikTnviRw6cuX95oojrhFfCUvz2d6ID22Btrvh7LkE+oIPVuc+g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/i18n@3.10.0':
+    resolution: {integrity: sha512-sviD5Y1pLPG49HHRmVjR+5nONrp0HK219+nu9Y7cDfUhXu2EjyhMS9t/n9/VZ69hHChZ2PnHYLEE2visu9CuCg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/i18n@3.12.2':
+    resolution: {integrity: sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/interactions@3.20.1':
+    resolution: {integrity: sha512-PLNBr87+SzRhe9PvvF9qvzYeP4ofTwfKSorwmO+hjr3qoczrSXf4LRQlb27wB6hF10C7ZE/XVbUI1lj4QQrZ/g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/interactions@3.22.2':
+    resolution: {integrity: sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/label@3.7.11':
+    resolution: {integrity: sha512-REgejE5Qr8cXG/b8H2GhzQmjQlII/0xQW/4eDzydskaTLvA7lF5HoJUE6biYTquH5va38d8XlH465RPk+bvHzA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/label@3.7.4':
+    resolution: {integrity: sha512-3Y0yyrqpLzZdzHw+TOyzwuyx5wa2ujU5DGfKuL5GFnU9Ii4DtdwBGSYS7Yu7qadU+eQmG4OGhAgFVswbIgIwJw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/link@3.6.3':
+    resolution: {integrity: sha512-8kPWc4u/lDow3Ll0LDxeMgaxt9Y3sl8UldKLGli8tzRSltYFugNh/n+i9sCnmo4Qv9Tp9kYv+yxBK50Uk9sINw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/link@3.7.4':
+    resolution: {integrity: sha512-E8SLDuS9ssm/d42+3sDFNthfMcNXMUrT2Tq1DIZt22EsMcuEzmJ9B0P7bDP5RgvIw05xVGqZ20nOpU4mKTxQtA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/listbox@3.11.3':
+    resolution: {integrity: sha512-PBrnldmyEYUUJvfDeljW8ITvZyBTfGpLNf0b5kfBPK3TDgRH4niEH2vYEcaZvSqb0FrpdvcunuTRXcOpfb+gCQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/listbox@3.13.3':
+    resolution: {integrity: sha512-htluPyDfFtn66OEYaJdIaFCYH9wGCNk30vOgZrQkPul9F9Cjce52tTyPVR0ERsf14oCUsjjS5qgeq3dGidRqEw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/live-announcer@3.3.1':
+    resolution: {integrity: sha512-hsc77U7S16trM86d+peqJCOCQ7/smO1cybgdpOuzXyiwcHQw8RQ4GrXrS37P4Ux/44E9nMZkOwATQRT2aK8+Ew==}
+
+  '@react-aria/live-announcer@3.3.4':
+    resolution: {integrity: sha512-w8lxs35QrRrn6pBNzVfyGOeqWdxeVKf9U6bXIVwhq7rrTqRULL8jqy8RJIMfIs1s8G5FpwWYjyBOjl2g5Cu1iA==}
+
+  '@react-aria/menu@3.12.0':
+    resolution: {integrity: sha512-Nsujv3b61WR0gybDKnBjAeyxDVJOfPLMggRUf9SQDfPWnrPXEsAFxaPaVcAkzlfI4HiQs1IxNwsKFNpc3PPZTQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/menu@3.15.3':
+    resolution: {integrity: sha512-vvUmVjJwIg3h2r+7isQXTwlmoDlPAFBckHkg94p3afrT1kNOTHveTsaVl17mStx/ymIioaAi3PrIXk/PZXp1jw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/meter@3.4.16':
+    resolution: {integrity: sha512-hJqKnEE6mmK2Psx5kcI7NZ44OfTg0Bp7DatQSQ4zZE4yhnykRRwxqSKjze37tPR63cCqgRXtQ5LISfBfG54c0Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/meter@3.4.9':
+    resolution: {integrity: sha512-1/FHFmFmSyfQBJ2oH152lp4nps76v1UdhnFbIsmRIH+0g0IfMv1yDT2M9dIZ/b9DgVZSx527FmWOXm0eHGKD6w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/numberfield@3.10.2':
+    resolution: {integrity: sha512-KjGTXq3lIhN4DEdEeHzfS/k9Qq0sDEpLgLr/hgSfGN4Q7Syu4Ck/n2HXmrDn//z08/wNvcukuP6Ioers138DcQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/numberfield@3.11.6':
+    resolution: {integrity: sha512-nvEWiQcWRwj6O2JXmkXEeWoBX/GVZT9zumFJcew3XknGTWJUr3h2AOymIQFt9g4mpag8IgOFEpSIlwhtZHdp1A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/overlays@3.20.0':
+    resolution: {integrity: sha512-2m7MpRJL5UucbEuu08lMHsiFJoDowkJV4JAIFBZYK1NzVH0vF/A+w9HRNM7jRwx2DUxE+iIsZnl8yKV/7KY8OQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/overlays@3.23.2':
+    resolution: {integrity: sha512-vjlplr953YAuJfHiP4O+CyrTlr6OaFgXAGrzWq4MVMjnpV/PT5VRJWYFHR0sUGlHTPqeKS4NZbi/xCSgl/3pGQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/progress@3.4.16':
+    resolution: {integrity: sha512-RbDIFQg4+/LG+KYZeLAijt2zH7K2Gp0CY9RKWdho3nU5l3/w57Fa7NrfDGWtpImrt7bR2nRmXMA6ESfr7THfrg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/progress@3.4.9':
+    resolution: {integrity: sha512-CME1ZLsJHOmSgK8IAPOC/+vYO5Oc614mkEw5MluT/yclw5rMyjAkK1XsHLjEXy81uwPeiRyoQQIMPKG2/sMxFQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/radio@3.10.0':
+    resolution: {integrity: sha512-6NaKzdGymdcVWLYgHT0cHsVmNzPOp89o8r41w29OPBQWu8w2c9mxg4366OiIZn/uXIBS4abhQ4nL4toBRLgBrg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/radio@3.10.7':
+    resolution: {integrity: sha512-o2tqIe7xd1y4HeCBQfz/sXIwLJuI6LQbVoCQ1hgk/5dGhQ0LiuXohRYitGRl9zvxW8jYdgLULmOEDt24IflE8A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/searchfield@3.7.1':
+    resolution: {integrity: sha512-ebhnV/reNByIZzpcQLHIo1RQ+BrYS8HdwX624i9R7dep1gxGHXYEaqL9aSY+RdngNerB4OeiWmB75em9beSpjQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/searchfield@3.7.8':
+    resolution: {integrity: sha512-SsF5xwH8Us548QgzivvbM7nhFbw7pu23xnRRIuhlP3MwOR3jRUFh17NKxf3Z0jvrDv/u0xfm3JKHIgaUN0KJ2A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/select@3.14.1':
+    resolution: {integrity: sha512-pAy/+Xbj11Lx6bi/O1hWH0NSIDRxFb6V7N0ry2L8x7MALljh516VbpnAc5RgvbjbuKq0cHUAcdINOzOzpYWm4A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/select@3.14.9':
+    resolution: {integrity: sha512-tiNgMyA2G9nKnFn3pB/lMSgidNToxSFU7r6l4OcG+Vyr63J7B/3dF2lTXq8IYhlfOR3K3uQkjroSx52CmC3NDw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/selection@3.17.3':
+    resolution: {integrity: sha512-xl2sgeGH61ngQeE05WOWWPVpGRTPMjQEFmsAWEprArFi4Z7ihSZgpGX22l1w7uSmtXM/eN/v0W8hUYUju5iXlQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/selection@3.19.3':
+    resolution: {integrity: sha512-GYoObXCXlmGK08hp7Qfl6Bk0U+bKP5YDWSsX+MzNjJsqzQSLm4S06tRB9ACM7gIo9dDCvL4IRxdSYTJAlJc6bw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/separator@3.3.9':
+    resolution: {integrity: sha512-1wEXiaSJjq2+DR5TC0RKnUBsfZN+YXTzyI7XMzjQoc3YlclumX8wQtzPAOGOEjHB1JKUgo1Gw70FtupVXz58QQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/separator@3.4.2':
+    resolution: {integrity: sha512-Xql9Kg3VlGesEUC7QheE+L5b3KgBv0yxiUU+/4JP8V2vfU/XSz4xmprHEeq7KVQVOetn38iiXU8gA5g26SEsUA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/slider@3.7.11':
+    resolution: {integrity: sha512-2WAwjANXPsA2LHJ5nxxV4c7ihFAzz2spaBz8+FJ7MDYE7WroYnE8uAXElea1aGo+Lk0DTiAdepLpBkggqPNanw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/slider@3.7.4':
+    resolution: {integrity: sha512-OFJWeGSL2duVDFs/kcjlWsY6bqCVKZgM0aFn2QN4wmID+vfBvBnqGHAgWv3BCePTAPS3+GBjMN002TrftorjwQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/spinbutton@3.6.1':
+    resolution: {integrity: sha512-u5GuOP3k4Zis055iY0fZJNHU7dUNCoSfUq5LKwJ1iNaCqDcavdstAnAg+X1a7rhpp5zCnJmAMseo3Qmzi9P+Ew==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/spinbutton@3.6.8':
+    resolution: {integrity: sha512-OJMAYRIZ0WrWE+5tZsywrSg4t+aOwl6vl/e1+J64YcGMM+p+AKd61KGG5T0OgNSORXjoVIZOmj6wZ6Od4xfPMw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/ssr@3.9.1':
+    resolution: {integrity: sha512-NqzkLFP8ZVI4GSorS0AYljC13QW2sc8bDqJOkBvkAt3M8gbcAXJWVRGtZBCRscki9RZF+rNlnPdg0G0jYkhJcg==}
+    engines: {node: '>= 12'}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/ssr@3.9.5':
+    resolution: {integrity: sha512-xEwGKoysu+oXulibNUSkXf8itW0npHHTa6c4AyYeZIJyRoegeteYuFpZUBPtIDE8RfHdNsSmE1ssOkxRnwbkuQ==}
+    engines: {node: '>= 12'}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/switch@3.6.0':
+    resolution: {integrity: sha512-YNWc5fGLNXE4XlmDAKyqAdllRiClGR7ki4KGFY7nL+xR5jxzjCGU3S3ToMK5Op3QSMGZLxY/aYmC4O+MvcoADQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/switch@3.6.7':
+    resolution: {integrity: sha512-yBNvKylhc3ZRQ0+7mD0mIenRRe+1yb8YaqMMZr8r3Bf87LaiFtQyhRFziq6ZitcwTJz5LEWjBihxbSVvUrf49w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/table@3.13.3':
+    resolution: {integrity: sha512-AzmETpyxwNqISTzwHJPs85x9gujG40IIsSOBUdp49oKhB85RbPLvMwhadp4wCVAoHw3erOC/TJxHtVc7o2K1LA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/table@3.15.3':
+    resolution: {integrity: sha512-nQCLjlEvyJHyuijHw8ESqnA9fxNJfQHx0WPcl08VDEb8VxcE/MVzSAIedSWaqjG5k9Oflz6o/F/zHtzw4AFAow==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/tabs@3.8.3':
+    resolution: {integrity: sha512-Plw0K/5Qv35vYq7pHZFfQB2BF5OClFx4Abzo9hLVx4oMy3qb7i5lxmLBVbt81yPX/MdjYeP4zO1EHGBl4zMRhA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/tabs@3.9.5':
+    resolution: {integrity: sha512-aQZGAoOIg1B16qlvXIy6+rHbNBNVcWkGjOjeyvqTTPMjXt/FmElkICnqckI7MRJ1lTqzyppCOBitYOHSXRo8Uw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/tag@3.3.1':
+    resolution: {integrity: sha512-w7d8sVZqxTo8VFfeg2ixLp5kawtrcguGznVY4mt5aE6K8LMJOeNVDqNNfolfyia80VjOWjeX+RpVdVJRdrv/GQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/tag@3.4.5':
+    resolution: {integrity: sha512-iyJuATQ8t2cdLC7hiZm143eeZze/MtgxaMq0OewlI9TUje54bkw2Q+CjERdgisIo3Eemf55JJgylGrTcalEJAg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/textfield@3.14.1':
+    resolution: {integrity: sha512-UMepuYtDdCgrUF4dMphNxrUm23xOmR54aZD1pbp9cJyfioVkJN35BTXZVkD0D07gHLn4RhxKIZxBortQQrLB9g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/textfield@3.14.8':
+    resolution: {integrity: sha512-FHEvsHdE1cMR2B7rlf+HIneITrC40r201oLYbHAp3q26jH/HUujzFBB9I20qhXjyBohMWfQLqJhSwhs1VW1RJQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/toggle@3.10.0':
+    resolution: {integrity: sha512-6cUf4V9TuG2J7AvXUdU/GspEPFCubUOID3mrselSe563RViy+mMZk0vUEOdyoNanDcEXl58W4dE3SGWxFn71vg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/toggle@3.10.7':
+    resolution: {integrity: sha512-/RJQU8QlPZXRElZ3Tt10F5K5STgUBUGPpfuFUGuwF3Kw3GpPxYsA1YAVjxXz2MMGwS0+y6+U/J1xIs1AF0Jwzg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/tooltip@3.7.0':
+    resolution: {integrity: sha512-+u9Sftkfe09IDyPEnbbreFKS50vh9X/WTa7n1u2y3PenI9VreLpUR6czyzda4BlvQ95e9jQz1cVxUjxTNaZmBw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/tooltip@3.7.7':
+    resolution: {integrity: sha512-UOTTDbbUz7OaE48VjNSWl+XQbYCUs5Gss4I3Tv1pfRLXzVtGYXv3ur/vRayvZR0xd12ANY26fZPNkSmCFpmiXw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/utils@3.23.0':
+    resolution: {integrity: sha512-fJA63/VU4iQNT8WUvrmll3kvToqMurD69CcgVmbQ56V7ZbvlzFi44E7BpnoaofScYLLtFWRjVdaHsohT6O/big==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-aria/utils@3.25.2':
+    resolution: {integrity: sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/visually-hidden@3.8.15':
+    resolution: {integrity: sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/visually-hidden@3.8.8':
+    resolution: {integrity: sha512-Cn2PYKD4ijGDtF0+dvsh8qa4y7KTNAlkTG6h20r8Q+6UTyRNmtE2/26QEaApRF8CBiNy9/BZC/ZC4FK2OjvCoA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-email/body@0.0.7':
+    resolution: {integrity: sha512-vjJ5P1MUNWV0KNivaEWA6MGj/I3c764qQJMsKjCHlW6mkFJ4SXbm2OlQFtKAb++Bj8LDqBlnE6oW77bWcMc0NA==}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/body@0.0.8':
+    resolution: {integrity: sha512-gqdkNYlIaIw0OdpWu8KjIcQSIFvx7t2bZpXVxMMvBS859Ia1+1X3b5RNbjI3S1ZqLddUf7owOHkO4MiXGE+nxg==}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/button@0.0.14':
+    resolution: {integrity: sha512-SMk40moGcAvkHIALX4XercQlK0PNeeEIam6OXHw68ea9WtzzqVwiK4pzLY0iiMI9B4xWHcaS2lCPf3cKbQBf1Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/button@0.0.15':
+    resolution: {integrity: sha512-9Zi6SO3E8PoHYDfcJTecImiHLyitYWmIRs0HE3Ogra60ZzlWP2EXu+AZqwQnhXuq+9pbgwBWNWxB5YPetNPTNA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/code-block@0.0.3':
+    resolution: {integrity: sha512-nxhl7WjjM2cOYtl0boBZfSObTrUCz2LbarcMyHkTVAsA9rbjbtWAQF7jmlefXJusk3Uol5l2c8hTh2lHLlHTRQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/code-block@0.0.4':
+    resolution: {integrity: sha512-xjVLi/9dFNJ70N7hYme+21eQWa3b9/kgp4V+FKQJkQCuIMobxPRCIGM5jKD/0Vo2OqrE5chYv/dkg/aP8a8sPg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/code-inline@0.0.1':
+    resolution: {integrity: sha512-SeZKTB9Q4+TUafzeUm/8tGK3dFgywUHb1od/BrAiJCo/im65aT+oJfggJLjK2jCdSsus8odcK2kReeM3/FCNTQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/code-inline@0.0.2':
+    resolution: {integrity: sha512-0cmgbbibFeOJl0q04K9jJlPDuJ+SEiX/OG6m3Ko7UOkG3TqjRD8Dtvkij6jNDVfUh/zESpqJCP2CxrCLLMUjdA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/column@0.0.10':
+    resolution: {integrity: sha512-MnP8Mnwipr0X3XtdD6jMLckb0sI5/IlS6Kl/2F6/rsSWBJy5Gg6nizlekTdkwDmy0kNSe3/1nGU0Zqo98pl63Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/column@0.0.9':
+    resolution: {integrity: sha512-1ekqNBgmbS6m97/sUFOnVvQtLYljUWamw8Y44VId95v6SjiJ4ca+hMcdOteHWBH67xkRofEOWTvqDRea5SBV8w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/components@0.0.16':
+    resolution: {integrity: sha512-1WATpMSH03cRvhfNjGl/Up3seZJOzN9KLzlk3Q9g/cqNhZEJ7HYxoZM4AQKAI0V3ttXzzxKv8Oj+AZQLHDiICA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/components@0.0.17':
+    resolution: {integrity: sha512-x5gGQaK0QchbwHvUrCBVnE8GCWdO5osTVuTSA54Fwzels6ZDeNTHEYRx9gI3Nwcf/dkoVYkVH4rzWST0SF0MLA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/container@0.0.11':
+    resolution: {integrity: sha512-jzl/EHs0ClXIRFamfH+NR/cqv4GsJJscqRhdYtnWYuRAsWpKBM1muycrrPqIVhWvWi6sFHInWTt07jX+bDc3SQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/container@0.0.12':
+    resolution: {integrity: sha512-HFu8Pu5COPFfeZxSL+wKv/TV5uO/sp4zQ0XkRCdnGkj/xoq0lqOHVDL4yC2Pu6fxXF/9C3PHDA++5uEYV5WVJw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/font@0.0.5':
+    resolution: {integrity: sha512-if/qKYmH3rJ2egQJoKbV8SfKCPavu+ikUq/naT/UkCr8Q0lkk309tRA0x7fXG/WeIrmcipjMzFRGTm2TxTecDw==}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/font@0.0.6':
+    resolution: {integrity: sha512-sZZFvEZ4U3vNCAZ8wXqIO3DuGJR2qE/8m2fEH+tdqwa532zGO3zW+UlCTg0b9455wkJSzEBeaWik0IkNvjXzxw==}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/head@0.0.7':
+    resolution: {integrity: sha512-IcXL4jc0H1qzAXJCD9ajcRFBQdbUHkjKJyiUeogpaYSVZSq6cVDWQuGaI23TA9k+pI2TFeQimogUFb3Kgeeudw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/head@0.0.8':
+    resolution: {integrity: sha512-8/NI0gtQmLIilAe6rebK1TWw3IXHxtrR02rInkQq8yQ7zKbYbzx7Q/FhmsJgAk+uYh2Er/KhgYJ0sHZyDhfMTQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/heading@0.0.11':
+    resolution: {integrity: sha512-EF5ZtRCxhHPw3m+8iibKKg0RAvAeHj1AP68sjU7s6+J+kvRgllr/E972Wi5Y8UvcIGossCvpX1WrSMDzeB4puA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/heading@0.0.12':
+    resolution: {integrity: sha512-eB7mpnAvDmwvQLoPuwEiPRH4fPXWe6ltz6Ptbry2BlI88F0a2k11Ghb4+sZHBqg7vVw/MKbqEgtLqr3QJ/KfCQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/hr@0.0.7':
+    resolution: {integrity: sha512-8suK0M/deXHt0DBSeKhSC4bnCBCBm37xk6KJh9M0/FIKlvdltQBem52YUiuqVl1XLB87Y6v6tvspn3SZ9fuxEA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/hr@0.0.8':
+    resolution: {integrity: sha512-JLVvpCg2wYKEB+n/PGCggWG9fRU5e4lxsGdpK5SDLsCL0ic3OLKSpHMfeE+ZSuw0GixAVVQN7F64PVJHQkd4MQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/html@0.0.7':
+    resolution: {integrity: sha512-oy7OoRtoOKApVI/5Lz1OZptMKmMYJu9Xn6+lOmdBQchAuSdQtWJqxhrSj/iI/mm8HZWo6MZEQ6SFpfOuf8/P6Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/html@0.0.8':
+    resolution: {integrity: sha512-arII3wBNLpeJtwyIJXPaILm5BPKhA+nvdC1F9QkuKcOBJv2zXctn8XzPqyGqDfdplV692ulNJP7XY55YqbKp6w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/img@0.0.7':
+    resolution: {integrity: sha512-up9tM2/dJ24u/CFjcvioKbyGuPw1yeJg605QA7VkrygEhd0CoQEjjgumfugpJ+VJgIt4ZjT9xMVCK5QWTIWoaA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/img@0.0.8':
+    resolution: {integrity: sha512-jx/rPuKo31tV18fu7P5rRqelaH5wkhg83Dq7uLwJpfqhbi4KFBGeBfD0Y3PiLPPoh+WvYf+Adv9W2ghNW8nOMQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/link@0.0.7':
+    resolution: {integrity: sha512-hXPChT3ZMyKnUSA60BLEMD2maEgyB2A37yg5bASbLMrXmsExHi6/IS1h2XiUPLDK4KqH5KFaFxi2cdNo1JOKwA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/link@0.0.8':
+    resolution: {integrity: sha512-nVikuTi8WJHa6Baad4VuRUbUCa/7EtZ1Qy73TRejaCHn+vhetc39XGqHzKLNh+Z/JFL8Hv9g+4AgG16o2R0ogQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/markdown@0.0.10':
+    resolution: {integrity: sha512-MH0xO+NJ4IuJcx9nyxbgGKAMXyudFjCZ0A2GQvuWajemW9qy2hgnJ3mW3/z5lwcenG+JPn7JyO/iZpizQ7u1tA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/markdown@0.0.9':
+    resolution: {integrity: sha512-t//19Zz+W5svKqrSrqoOLpf6dq70jbwYxX8Z+NEMi4LqylklccOaYAyKrkYyulfZwhW7KDH9d2wjVk5jfUABxQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/preview@0.0.8':
+    resolution: {integrity: sha512-Jm0KUYBZQd2w0s2QRMQy0zfHdo3Ns+9bYSE1OybjknlvhANirjuZw9E5KfWgdzO7PyrRtB1OBOQD8//Obc4uIQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/preview@0.0.9':
+    resolution: {integrity: sha512-2fyAA/zzZYfYmxfyn3p2YOIU30klyA6Dq4ytyWq4nfzQWWglt5hNDE0cMhObvRtfjM9ghMSVtoELAb0MWiF/kw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/render@0.0.12':
+    resolution: {integrity: sha512-S8WRv/PqECEi6x0QJBj0asnAb5GFtJaHlnByxLETLkgJjc76cxMYDH4r9wdbuJ4sjkcbpwP3LPnVzwS+aIjT7g==}
+    engines: {node: '>=18.0.0'}
+
+  '@react-email/render@0.0.13':
+    resolution: {integrity: sha512-lmBizrV+rQeSa3GjiL8/kPU0gENqO/wv+4xrlWANabp9UY3lTLXzy7HMRSE8YFBES9AbxP5VX1iRKuEnsoBDew==}
+    engines: {node: '>=18.0.0'}
+
+  '@react-email/row@0.0.7':
+    resolution: {integrity: sha512-h7pwrLVGk5CIx7Ai/oPxBgCCAGY7BEpCUQ7FCzi4+eThcs5IdjSwDPefLEkwaFS8KZc56UNwTAH92kNq5B7blg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/row@0.0.8':
+    resolution: {integrity: sha512-JsB6pxs/ZyjYpEML3nbwJRGAerjcN/Pa/QG48XUwnT/MioDWrUuyQuefw+CwCrSUZ2P1IDrv2tUD3/E3xzcoKw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/section@0.0.11':
+    resolution: {integrity: sha512-3bZ/DuvX1julATI7oqYza6pOtWZgLJDBaa62LFFEvYjisyN+k6lrP2KOucPsDKu2DOkUzlQgK0FOm6VQJX+C0w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/section@0.0.12':
+    resolution: {integrity: sha512-UCD/N/BeOTN4h3VZBUaFdiSem6HnpuxD1Q51TdBFnqeNqS5hBomp8LWJJ9s4gzwHWk1XPdNfLA3I/fJwulJshg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/tailwind@0.0.15':
+    resolution: {integrity: sha512-TE3NQ7VKhhvv3Zv0Z1NtoV6AF7aOWiG4juVezMZw1hZCG0mkN6iXC63u23vPQi12y6xCp20ZUHfg67kQeDSP/g==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/tailwind@0.0.16':
+    resolution: {integrity: sha512-uMifPxCEHaHLhpS1kVCMGyTeEL+aMYzHT4bgj8CkgCiBoF9wNNfIVMUlHGzHUTv4ZTEPaMfZgC/Hi8RqzL/Ogw==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-email/text@0.0.7':
+    resolution: {integrity: sha512-eHCx0mdllGcgK9X7wiLKjNZCBRfxRVNjD3NNYRmOc3Icbl8M9JHriJIfxBuGCmGg2UAORK5P3KmaLQ8b99/pbA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: 18.2.0
+
+  '@react-email/text@0.0.8':
+    resolution: {integrity: sha512-uvN2TNWMrfC9wv/LLmMLbbEN1GrMWZb9dBK14eYxHHAEHCeyvGb5ePZZ2MPyzO7Y5yTC+vFEnCEr76V+hWMxCQ==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.2.0
+
+  '@react-spring/rafz@9.7.4':
+    resolution: {integrity: sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA==}
+
+  '@react-stately/calendar@3.4.3':
+    resolution: {integrity: sha512-OrEcdskszDjnjVnFuSiDC2PVBJ6lWMCJROD5s6W1LUehUtBp8LX9wPavAGHV43LbhN9ldj560sxaQ4WCddrRCA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/calendar@3.5.4':
+    resolution: {integrity: sha512-R2011mtFSXIjzMXaA+CZ1sflPm9XkTBMqVk77Bnxso2ZsG7FUX8nqFmaDavxwTuHFC6OUexAGSMs8bP9KycTNg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/checkbox@3.6.1':
+    resolution: {integrity: sha512-rOjFeVBy32edYwhKiHj3ZLdLeO+xZ2fnBwxnOBjcygnw4Neygm8FJH/dB1J0hdYYR349yby86ED2x0wRc84zPw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/checkbox@3.6.8':
+    resolution: {integrity: sha512-c8TWjU67XHHBCpqj6+FXXhQUWGr2Pil1IKggX81pkedhWiJl3/7+WHJuZI0ivGnRjp3aISNOG8UNVlBEjS9E8A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/collections@3.10.4':
+    resolution: {integrity: sha512-OHhCrItGt4zB2bSrgObRo0H2SC7QlkH8ReGxo+NVIWchXRLRoiWBP7S+IwleewEo5gOqDVPY3hqA9n4iiI8twg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/collections@3.10.9':
+    resolution: {integrity: sha512-plyrng6hOQMG8LrjArMA6ts/DgWyXln3g90/hFNbqe/hdVYF53sDVsj8Jb+5LtoYTpiAlV6eOvy1XR0vPZUf8w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/combobox@3.8.1':
+    resolution: {integrity: sha512-FaWkqTXQdWg7ptaeU4iPcqF/kxbRg2ZNUcvW/hiL/enciV5tRCsddvfNqvDvy1L30z9AUwlp9MWqzm/DhBITCw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/combobox@3.9.2':
+    resolution: {integrity: sha512-ZsbAcD58IvxZqwYxg9d2gOf8R/k5RUB2TPUiGKD6wgWfEKH6SDzY3bgRByHGOyMCyJB62cHjih/ZShizNTguqA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/data@3.11.0':
+    resolution: {integrity: sha512-0BlPT58WrAtUvpiEfUuyvIsGFTzp/9vA5y+pk53kGJhOdc5tqBGHi9cg40pYE/i1vdHJGMpyHGRD9nkQb8wN3Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/datepicker@3.10.2':
+    resolution: {integrity: sha512-pa5IZUw+49AyOnddwu4XwU2kI5eo/1thbiIVNHP8uDpbbBrBkquSk3zVFDAGX1cu/I1U2VUkt64U/dxgkwaMQw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/datepicker@3.9.1':
+    resolution: {integrity: sha512-o5xLvlZGJyAbTev2yruGlV2fzQyIDuYTgL19TTt0W0WCfjGGr/AAA9GjGXXmyoRA7sZMxqIPnnv7lNrdA38ofA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/dnd@3.2.7':
+    resolution: {integrity: sha512-QqSCvE9Rhp+Mr8Mt/SrByze24BFX1cy7gmXbwoqAYgHNIx3gWCVdBLqxfpfgYIhZdF9H72EWS8lQkfkZla06Ng==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/dnd@3.4.2':
+    resolution: {integrity: sha512-VrHmNoNdVGrx5JHdz/zewmN+N8rlZe+vL/iAOLmvQ74RRLEz8KDFnHdlhgKg1AZqaSg3JJ18BlHEkS7oL1n+tA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/flags@3.0.0':
+    resolution: {integrity: sha512-e3i2ItHbIa0eEwmSXAnPdD7K8syW76JjGe8ENxwFJPW/H1Pu9RJfjkCb/Mq0WSPN/TpxBb54+I9TgrGhbCoZ9w==}
+
+  '@react-stately/flags@3.0.3':
+    resolution: {integrity: sha512-/ha7XFA0RZTQsbzSPwu3KkbNMgbvuM0GuMTYLTBWpgBrovBNTM+QqI/PfZTdHg8PwCYF4H5Y8gjdSpdulCvJFw==}
+
+  '@react-stately/form@3.0.0':
+    resolution: {integrity: sha512-C8wkfFmtx1escizibhdka5JvTy9/Vp173CS9cakjvWTmnjYYC1nOlzwp7BsYWTgerCFbRY/BU/Cf/bJDxPiUKQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/form@3.0.5':
+    resolution: {integrity: sha512-J3plwJ63HQz109OdmaTqTA8Qhvl3gcYYK7DtgKyNP6mc/Me2Q4tl2avkWoA+22NRuv5m+J8TpBk4AVHUEOwqeQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/grid@3.8.4':
+    resolution: {integrity: sha512-rwqV1K4lVhaiaqJkt4TfYqdJoVIyqvSm98rKAYfCNzrKcivVpoiCMJ2EMt6WlYCjDVBdEOQ7fMV1I60IV0pntA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/grid@3.9.2':
+    resolution: {integrity: sha512-2gK//sqAqg2Xaq6UITTFQwFUJnBRgcW+cKBVbFt+F8d152xB6UwwTS/K79E5PUkOotwqZgTEpkrSFs/aVxCLpw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/list@3.10.2':
+    resolution: {integrity: sha512-INt+zofkIg2KN8B95xPi9pJG7ZFWAm30oIm/lCPBqM3K1Nm03/QaAbiQj2QeJcOsG3lb7oqI6D6iwTolwJkjIQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/list@3.10.8':
+    resolution: {integrity: sha512-rHCiPLXd+Ry3ztR9DkLA5FPQeH4Zd4/oJAEDWJ77W3oBBOdiMp3ZdHDLP7KBRh17XGNLO/QruYoHWAQTPiMF4g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/menu@3.6.0':
+    resolution: {integrity: sha512-OB6CjNyfOkAuirqx1oTL8z8epS9WDzLyrXjmRnxdiCU9EgRXLGAQNECuO7VIpl58oDry8tgRJiJ8fn8FivWSQA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/menu@3.8.2':
+    resolution: {integrity: sha512-lt6hIHmSixMzkKx1rKJf3lbAf01EmEvvIlENL20GLiU9cRbpPnPJ1aJMZ5Ad5ygglA7wAemAx+daPhlTQfF2rg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/numberfield@3.8.0':
+    resolution: {integrity: sha512-1XvB8tDOvZKcFnMM6qNLEaTVJcIc0jRFS/9jtS8MzalZvh8DbKi0Ucm1bGU7S5rkCx2QWqZ0rGOIm2h/RlcpkA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/numberfield@3.9.6':
+    resolution: {integrity: sha512-p2R9admGLI439qZzB39dyANhkruprJJtZwuoGVtxW/VD0ficw6BrPVqAaKG25iwKPkmveleh9p8o+yRqjGedcQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/overlays@3.6.10':
+    resolution: {integrity: sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/overlays@3.6.4':
+    resolution: {integrity: sha512-tHEaoAGpE9dSnsskqLPVKum59yGteoSqsniTopodM+miQozbpPlSjdiQnzGLroy5Afx5OZYClE616muNHUILXA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/radio@3.10.1':
+    resolution: {integrity: sha512-MsBYbcLCvjKsqTAKe43T681F2XwKMsS7PLG0eplZgWP9210AMY78GeY1XPYZKHPAau8XkbYiuJqbqTerIJ3DBw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/radio@3.10.7':
+    resolution: {integrity: sha512-ZwGzFR+sGd42DxRlDTp3G2vLZyhMVtgHkwv2BxazPHxPMvLO9yYl7+3PPNxAmhMB4tg2u9CrzffpGX2rmEJEXA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/searchfield@3.5.0':
+    resolution: {integrity: sha512-SStjChkn/33pEn40slKQPnBnmQYyxVazVwPjiBkdeVejC42lUVairUTrGJgF0PNoZTbxn0so2/XzjqTC9T8iCw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/searchfield@3.5.6':
+    resolution: {integrity: sha512-gVzU0FeWiLYD8VOYRgWlk79Qn7b2eirqOnWhtI5VNuGN8WyNaCIuBp6SkXTW2dY8hs2Hzn8HlMbgy1MIc7130Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/select@3.6.1':
+    resolution: {integrity: sha512-e5ixtLiYLlFWM8z1msDqXWhflF9esIRfroptZsltMn1lt2iImUlDRlOTZlMtPQzUrDWoiHXRX88sSKUM/jXjQQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/select@3.6.7':
+    resolution: {integrity: sha512-hCUIddw0mPxVy1OH6jhyaDwgNea9wESjf+MYdnnTG/abRB+OZv/dWScd87OjzVsHTHWcw7CN4ZzlJoXm0FJbKQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/selection@3.14.2':
+    resolution: {integrity: sha512-mL7OoiUgVWaaF7ks5XSxgbXeShijYmD4G3bkBHhqkpugU600QH6BM2hloCq8KOUupk1y8oTljPtF9EmCv375DA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/selection@3.16.2':
+    resolution: {integrity: sha512-C4eSKw7BIZHJLPzwqGqCnsyFHiUIEyryVQZTJDt6d0wYBOHU6k1pW+Q4VhrZuzSv+IMiI2RkiXeJKc55f0ZXrg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/slider@3.5.0':
+    resolution: {integrity: sha512-dOVpIxb7XKuiRxgpHt1bUSlsklciFki100tKIyBPR+Okar9iC/CwLYROYgVfLkGe77jEBNkor9tDLjDGEWcc1w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/slider@3.5.7':
+    resolution: {integrity: sha512-gEIGTcpBLcXixd8LYiLc8HKrBiGQJltrrEGoOvvTP8KVItXQxmeL+JiSsh8qgOoUdRRpzmAoFNUKGEg2/gtN8A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/table@3.11.4':
+    resolution: {integrity: sha512-dWINJIEOKQl4qq3moq+S8xCD3m+yJqBj0dahr+rOkS+t2uqORwzsusTM35D2T/ZHZi49S2GpE7QuDa+edCynPw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/table@3.12.2':
+    resolution: {integrity: sha512-dUcsrdALylhWz6exqIoqtR/dnrzjIAptMyAUPT378Y/mCYs4PxKkHSvtPEQrZhdQS1ALIIgfeg9KUVIempoXPw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/tabs@3.6.3':
+    resolution: {integrity: sha512-Nj+Gacwa2SIzYIvHW40GsyX4Q6c8kF7GOuXESeQswbCjnwqhrSbDBp+ngPcUPUJxqFh6JhDCVwAS3wMhUoyUwA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/tabs@3.6.9':
+    resolution: {integrity: sha512-YZDqZng3HrRX+uXmg6u78x73Oi24G5ICpiXVqDKKDkO333XCA5H8MWItiuPZkYB2h3SbaCaLqSobLkvCoWYpNQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/toggle@3.7.0':
+    resolution: {integrity: sha512-TRksHkCJk/Xogq4181g3CYgJf+EfsJCqX5UZDSw1Z1Kgpvonjmdf6FAfQfCh9QR2OuXUL6hOLUDVLte5OPI+5g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/toggle@3.7.7':
+    resolution: {integrity: sha512-AS+xB4+hHWa3wzYkbS6pwBkovPfIE02B9SnuYTe0stKcuejpWKo5L3QMptW0ftFYsW3ZPCXuneImfObEw2T01A==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/tooltip@3.4.12':
+    resolution: {integrity: sha512-QKYT/cze7n9qaBsk7o5ais3jRfhYCzcVRfps+iys/W+/9FFbbhjfQG995Lwi6b+vGOHWfXxXpwmyIO2tzM1Iog==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/tooltip@3.4.6':
+    resolution: {integrity: sha512-uL93bmsXf+OOgpKLPEKfpDH4z+MK2CuqlqVxx7rshN0vjWOSoezE5nzwgee90+RpDrLNNNWTNa7n+NkDRpI1jA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/tree@3.7.5':
+    resolution: {integrity: sha512-xTJVwvhAeY0N5rui4N/TxN7f8hjXdqApDuGDxMZeFAWoQz8Abf7LFKBVQ3OkT6qVr7P+23dgoisUDBhD5a45Hg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/tree@3.8.4':
+    resolution: {integrity: sha512-HFNclIXJ/3QdGQWxXbj+tdlmIX/XwCfzAMB5m26xpJ6HtJhia6dtx3GLfcdyHNjmuRbAsTBsAAnnVKBmNRUdIQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/utils@3.10.3':
+    resolution: {integrity: sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-stately/utils@3.9.0':
+    resolution: {integrity: sha512-yPKFY1F88HxuZ15BG2qwAYxtpE4HnIU0Ofi4CuBE0xC6I8mwo4OQjDzi+DZjxQngM9D6AeTTD6F1V8gkozA0Gw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-stately/virtualizer@3.6.6':
+    resolution: {integrity: sha512-9hWvfITdE/028q4YFve6FxlmA3PdSMkUwpYA+vfaGCXI/4DFZIssBMspUeu4PTRJoV+k+m0z1wYHPmufrq6a3g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/breadcrumbs@3.7.2':
+    resolution: {integrity: sha512-esl6RucDW2CNMsApJxNYfMtDaUcfLlwKMPH/loYsOBbKxGl2HsgVLMcdpjEkTRs2HCTNCbBXWpeU8AY77t+bsw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/breadcrumbs@3.7.7':
+    resolution: {integrity: sha512-ZmhXwD2LLzfEA2OvOCp/QvXu8A/Edsrn5q0qUDGsmOZj9SCVeT82bIv8P+mQnATM13mi2gyoik6102Jc1OscJA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/button@3.9.1':
+    resolution: {integrity: sha512-bf9iTar3PtqnyV9rA+wyFyrskZKhwmOuOd/ifYIjPs56YNVXWH5Wfqj6Dx3xdFBgtKx8mEVQxVhoX+WkHX+rtw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/button@3.9.6':
+    resolution: {integrity: sha512-8lA+D5JLbNyQikf8M/cPP2cji91aVTcqjrGpDqI7sQnaLFikM8eFR6l1ZWGtZS5MCcbfooko77ha35SYplSQvw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/calendar@3.4.3':
+    resolution: {integrity: sha512-96x57ctX5wNEl+8et3sc2NQm8neOJayEeqOQQpyPtI7jyvst/xBrKCwysf9W/dhgPlUC+KeBAYFWfjd5hFVHYA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/calendar@3.4.9':
+    resolution: {integrity: sha512-O/PS9c21HgO9qzxOyZ7/dTccxabFZdF6tj3UED4DrBw7AN3KZ7JMzwzYbwHinOcO7nUcklGgNoAIHk45UAKR9g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/checkbox@3.6.0':
+    resolution: {integrity: sha512-vgbuJzQpVCNT5AZWV0OozXCnihqrXxoZKfJFIw0xro47pT2sn3t5UC4RA9wfjDGMoK4frw1K/4HQLsQIOsPBkw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/checkbox@3.8.3':
+    resolution: {integrity: sha512-f4c1mnLEt0iS1NMkyZXgT3q3AgcxzDk7w6MSONOKydcnh0xG5L2oefY14DhVDLkAuQS7jThlUFwiAs+MxiO3MA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/combobox@3.10.0':
+    resolution: {integrity: sha512-1IXSNS02TPbguyYopaW2snU6sZusbClHrEyVr4zPeexTV4kpUUBNXOzFQ+eSQRR0r2XW57Z0yRW4GJ6FGU0yCA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/combobox@3.12.1':
+    resolution: {integrity: sha512-bd5YwHZWtgnJx4jGbplWbYzXj7IbO5w3IY5suNR7r891rx6IktquZ8GQwyYH0pQ/x+X5LdK2xI59i6+QC2PmlA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/datepicker@3.7.1':
+    resolution: {integrity: sha512-5juVDULOytNzkotqX8j5mYKJckeIpkgbHqVSGkPgLw0++FceIaSZ6RH56cqLup0pO45paqIt9zHh+QXBYX+syg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/datepicker@3.8.2':
+    resolution: {integrity: sha512-Ih4F0bNVGrEuwCD8XmmBAspuuOBsj/Svn/pDFtC2RyAZjXfWh+sI+n4XLz/sYKjvARh5TUI8GNy9smYS4vYXug==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/dialog@3.5.12':
+    resolution: {integrity: sha512-JmpQbSpXltqEyYfEwoqDolABIiojeExkqolHNdQlayIsfFuSxZxNwXZPOpz58Ri/iwv21JP7K3QF0Gb2Ohxl9w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/dialog@3.5.7':
+    resolution: {integrity: sha512-geYoqAyQaTLG43AaXdMUVqZXYgkSifrD9cF7lR2kPAT0uGFv0YREi6ieU+aui8XJ83EW0xcxP+EPWd2YkN4D4w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/grid@3.2.3':
+    resolution: {integrity: sha512-GQM4RDmYhstcYZ0Odjq+xUwh1fhLmRebG6qMM8OXHTPQ77nhl3wc1UTGRhZm6mzEionplSRx4GCpEMEHMJIU0w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/grid@3.2.8':
+    resolution: {integrity: sha512-6PJrpukwMqlv3IhJSDkJuVbhHM8Oe6hd2supWqd9adMXrlSP7QHt9a8SgFcFblCCTx8JzUaA0PvY5sTudcEtOQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/link@3.5.2':
+    resolution: {integrity: sha512-/s51/WejmpLiyxOgP89s4txgxYoGaPe8pVDItVo1h4+BhU1Puyvgv/Jx8t9dPvo6LUXbraaN+SgKk/QDxaiirw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/link@3.5.7':
+    resolution: {integrity: sha512-2WyaVmm1qr9UrSG3Dq6iz+2ziuVp+DH8CsYZ9CA6aNNb6U18Hxju3LTPb4a5gM0eC7W0mQGNBmrgGlAdDZEJOw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/listbox@3.4.6':
+    resolution: {integrity: sha512-XOQvrTqNh5WIPDvKiWiep8T07RAsMfjAXTjDbnjxVlKACUXkcwpts9kFaLnJ9LJRFt6DwItfP+WMkzvmx63/NQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/listbox@3.5.1':
+    resolution: {integrity: sha512-n5bOgD9lgfK1qaLtag9WPnu151SwXBCNn/OgGY/Br9mWRl+nPUEYtFcPX+2VCld7uThf54kwrTmzlFnaraIlcw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/menu@3.9.11':
+    resolution: {integrity: sha512-IguQVF70d7aHXgWB1Rd2a/PiIuLZ2Nt7lyayJshLcy/NLOYmgpTmTyn2WCtlA5lTfQwmQrNFf4EvnWkeljJXdA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/menu@3.9.6':
+    resolution: {integrity: sha512-w/RbFInOf4nNayQDv5c2L8IMJbcFOkBhsT3xvvpTy+CHvJcQdjggwaV1sRiw7eF/PwB81k2CwigmidUzHJhKDg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/meter@3.3.6':
+    resolution: {integrity: sha512-1XYp1fA9UU0lO6kjf3TwVE8mppOJa64mBKAcLWtTyq1e/cYIAbx5o6CsuUx0YDpXKF6gdtvIWvfmxeWsmqJ1jQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/meter@3.4.3':
+    resolution: {integrity: sha512-Y2fX5CTAPGRKxVSeepbeyN6/K+wlF9pMRcNxTSU2qDwdoFqNCtTWMcWuCsU/Y2L/zU0jFWu4x0Vo7WkrcsgcMA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/numberfield@3.7.0':
+    resolution: {integrity: sha512-gaGi+vqm1Y8LCWRsWYUjcGftPIzl+8W2VOfkgKMLM8y76nnwTPtmAqs+Ap1cg7sEJSfsiKMq93e9yvP3udrC2w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/numberfield@3.8.5':
+    resolution: {integrity: sha512-LVWggkxwd1nyVZomXBPfQA1E4I4/i4PBifjcDs2AfcV7q5RE9D+DVIDXsYucVOBxPlDOxiAq/T9ypobspWSwHw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/overlays@3.8.4':
+    resolution: {integrity: sha512-pfgNlQnbF6RB/R2oSxyqAP3Uzz0xE/k5q4n5gUeCDNLjY5qxFHGE8xniZZ503nZYw6VBa9XMN1efDOKQyeiO0w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/overlays@3.8.9':
+    resolution: {integrity: sha512-9ni9upQgXPnR+K9cWmbYWvm3ll9gH8P/XsEZprqIV5zNLMF334jADK48h4jafb1X9RFnj0WbHo6BqcSObzjTig==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/progress@3.5.1':
+    resolution: {integrity: sha512-CqsUjczUK/SfuFzDcajBBaXRTW0D3G9S/yqLDj9e8E0ii+lGDLt1PHj24t1J7E88U2rVYqmM9VL4NHTt8o3IYA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/progress@3.5.6':
+    resolution: {integrity: sha512-Nh43sjQ5adyN1bTHBPRaIPhXUdBqP0miYeJpeMY3V/KUl4qmouJLwDnccwFG4xLm6gBfYe22lgbbV7nAfNnuTQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/radio@3.7.0':
+    resolution: {integrity: sha512-EcwGAXzSHjSqpFZha7xn3IUrhPiJLj+0yb1Ip0qPmhWz0VVw2DwrkY7q/jfaKroVvQhTo2TbfGhcsAQrt0fRqg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/radio@3.8.3':
+    resolution: {integrity: sha512-fUVJt4Bb6jOReFqnhHVNxWXH7t6c60uSFfoPKuXt/xI9LL1i2jhpur0ggpTfIn3qLIAmNBU6bKBCWAdr4KjeVQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/searchfield@3.5.2':
+    resolution: {integrity: sha512-JAK2/Kg4Dr393FYfbRw0TlXKnJPX77sq1x/ZBxtO6p64+MuuIYKqw0i9PwDlo1PViw2QI5u8GFhKA2TgemY9uA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/searchfield@3.5.8':
+    resolution: {integrity: sha512-EcdqalHNIC6BJoRfmqUhAvXRd3aHkWlV1cFCz57JJKgUEFYyXPNrXd1b73TKLzTXEk+X/D6LKV15ILYpEaxu8w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/select@3.9.1':
+    resolution: {integrity: sha512-EpKSxrnh8HdZvOF9dHQkjivAcdIp1K81FaxmvosH8Lygqh0iYXxAdZGtKLMyBoPI8YFhA+rotIzTcOqgCCnqWA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/select@3.9.6':
+    resolution: {integrity: sha512-cVSFR0eJLup/ht1Uto+y8uyLmHO89J6wNh65SIHb3jeVz9oLBAedP3YNI2qB+F9qFMUcA8PBSLXIIuT6gXzLgQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/shared@3.22.0':
+    resolution: {integrity: sha512-yVOekZWbtSmmiThGEIARbBpnmUIuePFlLyctjvCbgJgGhz8JnEJOipLQ/a4anaWfzAgzSceQP8j/K+VOOePleA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/shared@3.24.1':
+    resolution: {integrity: sha512-AUQeGYEm/zDTN6zLzdXolDxz3Jk5dDL7f506F07U8tBwxNNI3WRdhU84G0/AaFikOZzDXhOZDr3MhQMzyE7Ydw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/slider@3.7.0':
+    resolution: {integrity: sha512-uyQXUVFfqc9SPUW0LZLMan2n232F/OflRafiHXz9viLFa9tVOupVa7GhASRAoHojwkjoJ1LjFlPih7g5dOZ0/Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/slider@3.7.5':
+    resolution: {integrity: sha512-bRitwQRQjQoOcKEdPMljnvm474dwrmsc6pdsVQDh/qynzr+KO9IHuYc3qPW53WVE2hMQJDohlqtCAWQXWQ5Vcg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/switch@3.5.0':
+    resolution: {integrity: sha512-/wNmUGjk69bP6t5k2QkAdrNN5Eb9Rz4dOyp0pCPmoeE+5haW6sV5NmtkvWX1NSc4DQz1xL/a5b+A0vxPCP22Jw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/switch@3.5.5':
+    resolution: {integrity: sha512-SZx1Bd+COhAOs/RTifbZG+uq/llwba7VAKx7XBeX4LeIz1dtguy5bigOBgFTMQi4qsIVCpybSWEEl+daj4XFPw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/table@3.10.1':
+    resolution: {integrity: sha512-xsNh0Gm4GtNeSknZqkMsfGvc94fycmfhspGO+FzQKim2hB5k4yILwd+lHYQ2UKW6New9GVH/zN2Pd3v67IeZ2g==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/table@3.9.2':
+    resolution: {integrity: sha512-brw5JUANOzBa2rYNpN8AIl9nDZ9RwRZC6G/wTM/JhtirjC1S42oCtf8Ap5rWJBdmMG/5KOfcGNcAl/huyqb3gg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/tabs@3.3.4':
+    resolution: {integrity: sha512-4mCTtFrwMRypyGTZCvNYVT9CkknexO/UYvqwDm2jMYb8JgjRvxnomu776Yh7uyiYKWyql2upm20jqasEOm620w==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/tabs@3.3.9':
+    resolution: {integrity: sha512-3Q9kRVvg/qDyeJR/W1+C2z2OyvDWQrSLvOCvAezX5UKzww4rBEAA8OqBlyDwn7q3fiwrh/m64l6p+dbln+RdxQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/textfield@3.9.0':
+    resolution: {integrity: sha512-D/DiwzsfkwlAg3uv8hoIfwju+zhB/hWDEdTvxQbPkntDr0kmN/QfI17NMSzbOBCInC4ABX87ViXLGxr940ykGA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@react-types/textfield@3.9.6':
+    resolution: {integrity: sha512-0uPqjJh4lYp1aL1HL9IlV8Cgp8eT0PcsNfdoCktfkLytvvBPmox2Pfm57W/d0xTtzZu2CjxhYNTob+JtGAOeXA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/tooltip@3.4.11':
+    resolution: {integrity: sha512-WPikHQxeT5Lb09yJEaW6Ja3ecE0g1YM6ukWYS2v/iZLUPn5YlYrGytspuCYQNSh/u7suCz4zRLEHYCl7OCigjw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-types/tooltip@3.4.6':
+    resolution: {integrity: sha512-RaZewdER7ZcsNL99RhVHs8kSLyzIBkwc0W6eFZrxST2MD9J5GzkVWRhIiqtFOd5U1aYnxdJ6woq72Ef+le6Vfw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  '@remix-run/changelog-github@0.0.5':
+    resolution: {integrity: sha512-43tqwUqWqirbv6D9uzo55ASPsCJ61Ein1k/M8qn+Qpros0MmbmuzjLVPmtaxfxfe2ANX0LefLvCD0pAgr1tp4g==}
+
+  '@remix-run/dev@2.1.0':
+    resolution: {integrity: sha512-Hn5lw46F+a48dp5uHKe68ckaHgdStW4+PmLod+LMFEqrMbkF0j4XD1ousebxlv989o0Uy/OLgfRMgMy4cBOvHg==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+    peerDependencies:
+      '@remix-run/serve': ^2.1.0
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      '@remix-run/serve':
+        optional: true
+      typescript:
+        optional: true
+
+  '@remix-run/eslint-config@2.1.0':
+    resolution: {integrity: sha512-yfeUnHpUG+XveujMi6QODKMGhs5CvKWCKzASU397BPXiPWbMv6r2acfODSWK64ZdBMu9hcLbOb42GBFydVQeHA==}
+    engines: {node: '>=18.0.0'}
+    deprecated: Will no longer be maintained in React Router v7
+    peerDependencies:
+      eslint: ^8.0.0
+      react: ^18.0.0
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@remix-run/express@2.1.0':
+    resolution: {integrity: sha512-R5myPowQx6LYWY3+EqP42q19MOCT3+ZGwb2f0UKNs9a34R8U3nFpGWL7saXryC+To+EasujEScc8rTQw5Pftog==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      express: ^4.17.1
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@remix-run/node@2.1.0':
+    resolution: {integrity: sha512-TeSgjXnZUUlmw5FVpBVnXY7MLpracjdnwFNwoJE5NQkiUEFnGD/Yhvk4F2fOCkszqc2Z25KRclc5noweyiFu6Q==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@remix-run/react@2.1.0':
+    resolution: {integrity: sha512-DeYgfsvNxHqNn29sGA3XsZCciMKo2EFTQ9hHkuVPTsJXC4ipHr6Dja1j6UzZYPe/ZuKppiuTjueWCQlE2jOe1w==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.0.0
+      react-dom: ^18.0.0
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@remix-run/router@1.10.0':
+    resolution: {integrity: sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==}
+    engines: {node: '>=14.0.0'}
+
+  '@remix-run/router@1.15.3':
+    resolution: {integrity: sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==}
+    engines: {node: '>=14.0.0'}
+
+  '@remix-run/serve@2.1.0':
+    resolution: {integrity: sha512-XHI+vPYz217qrg1QcV38TTPlEBTzMJzAt0SImPutyF0S2IBrZGZIFMEsspI0i0wNvdcdQz1IqmSx+mTghzW8eQ==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  '@remix-run/server-runtime@2.1.0':
+    resolution: {integrity: sha512-Uz69yF4Gu6F3VYQub3JgDo9godN8eDMeZclkadBTAWN7bYLonu0ChR/GlFxS35OLeF7BDgudxOSZob0nE1WHNg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@remix-run/testing@2.1.0':
+    resolution: {integrity: sha512-eLPx4Bmjt243kyRpQTong1eFo6nkvSfCr65bb5PfoF172DKnsSSCYWAmBmB72VwtAPESHxBm3g6AUbhwphkU6A==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      react: ^18.0.0
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@remix-run/v1-meta@0.1.3':
+    resolution: {integrity: sha512-pYTJSrT8ouipv9gL7sqk4hjgVrfj6Jcp9KDnjZKPFUF+91S1J5PNjipAHE1aXh0LyHo2rDbTW/OjtFeJ6BKhYg==}
+    peerDependencies:
+      '@remix-run/react': ^1.15.0 || ^2.0.0
+      '@remix-run/server-runtime': ^1.15.0 || ^2.0.0
+
+  '@remix-run/web-blob@3.1.0':
+    resolution: {integrity: sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==}
+
+  '@remix-run/web-fetch@4.4.1':
+    resolution: {integrity: sha512-xMceEGn2kvfeWS91nHSOhEQHPGgjFnmDVpWFZrbWPVdiTByMZIn421/tdSF6Kd1RsNsY+5Iwt3JFEKZHAcMQHw==}
+    engines: {node: ^10.17 || >=12.3}
+
+  '@remix-run/web-file@3.1.0':
+    resolution: {integrity: sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ==}
+
+  '@remix-run/web-form-data@3.1.0':
+    resolution: {integrity: sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A==}
+
+  '@remix-run/web-stream@1.1.0':
+    resolution: {integrity: sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA==}
+
+  '@rollup/rollup-android-arm-eabi@4.36.0':
+    resolution: {integrity: sha512-jgrXjjcEwN6XpZXL0HUeOVGfjXhPyxAbbhD0BlXUB+abTOpbPiN5Wb3kOT7yb+uEtATNYF5x5gIfwutmuBA26w==}
+    cpu: [arm]
+    os: [android]
+
+  '@rollup/rollup-android-arm64@4.36.0':
+    resolution: {integrity: sha512-NyfuLvdPdNUfUNeYKUwPwKsE5SXa2J6bCt2LdB/N+AxShnkpiczi3tcLJrm5mA+eqpy0HmaIY9F6XCa32N5yzg==}
+    cpu: [arm64]
+    os: [android]
+
+  '@rollup/rollup-darwin-arm64@4.36.0':
+    resolution: {integrity: sha512-JQ1Jk5G4bGrD4pWJQzWsD8I1n1mgPXq33+/vP4sk8j/z/C2siRuxZtaUA7yMTf71TCZTZl/4e1bfzwUmFb3+rw==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-arm64@4.53.2':
+    resolution: {integrity: sha512-A6s4gJpomNBtJ2yioj8bflM2oogDwzUiMl2yNJ2v9E7++sHrSrsQ29fOfn5DM/iCzpWcebNYEdXpaK4tr2RhfQ==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@rollup/rollup-darwin-x64@4.36.0':
+    resolution: {integrity: sha512-6c6wMZa1lrtiRsbDziCmjE53YbTkxMYhhnWnSW8R/yqsM7a6mSJ3uAVT0t8Y/DGt7gxUWYuFM4bwWk9XCJrFKA==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@rollup/rollup-freebsd-arm64@4.36.0':
+    resolution: {integrity: sha512-KXVsijKeJXOl8QzXTsA+sHVDsFOmMCdBRgFmBb+mfEb/7geR7+C8ypAml4fquUt14ZyVXaw2o1FWhqAfOvA4sg==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@rollup/rollup-freebsd-x64@4.36.0':
+    resolution: {integrity: sha512-dVeWq1ebbvByI+ndz4IJcD4a09RJgRYmLccwlQ8bPd4olz3Y213uf1iwvc7ZaxNn2ab7bjc08PrtBgMu6nb4pQ==}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.36.0':
+    resolution: {integrity: sha512-bvXVU42mOVcF4le6XSjscdXjqx8okv4n5vmwgzcmtvFdifQ5U4dXFYaCB87namDRKlUL9ybVtLQ9ztnawaSzvg==}
+    cpu: [arm]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm-musleabihf@4.36.0':
+    resolution: {integrity: sha512-JFIQrDJYrxOnyDQGYkqnNBtjDwTgbasdbUiQvcU8JmGDfValfH1lNpng+4FWlhaVIR4KPkeddYjsVVbmJYvDcg==}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-arm64-gnu@4.36.0':
+    resolution: {integrity: sha512-KqjYVh3oM1bj//5X7k79PSCZ6CvaVzb7Qs7VMWS+SlWB5M8p3FqufLP9VNp4CazJ0CsPDLwVD9r3vX7Ci4J56A==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-arm64-musl@4.36.0':
+    resolution: {integrity: sha512-QiGnhScND+mAAtfHqeT+cB1S9yFnNQ/EwCg5yE3MzoaZZnIV0RV9O5alJAoJKX/sBONVKeZdMfO8QSaWEygMhw==}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-linux-loongarch64-gnu@4.36.0':
+    resolution: {integrity: sha512-1ZPyEDWF8phd4FQtTzMh8FQwqzvIjLsl6/84gzUxnMNFBtExBtpL51H67mV9xipuxl1AEAerRBgBwFNpkw8+Lg==}
+    cpu: [loong64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.36.0':
+    resolution: {integrity: sha512-VMPMEIUpPFKpPI9GZMhJrtu8rxnp6mJR3ZzQPykq4xc2GmdHj3Q4cA+7avMyegXy4n1v+Qynr9fR88BmyO74tg==}
+    cpu: [ppc64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-riscv64-gnu@4.36.0':
+    resolution: {integrity: sha512-ttE6ayb/kHwNRJGYLpuAvB7SMtOeQnVXEIpMtAvx3kepFQeowVED0n1K9nAdraHUPJ5hydEMxBpIR7o4nrm8uA==}
+    cpu: [riscv64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-s390x-gnu@4.36.0':
+    resolution: {integrity: sha512-4a5gf2jpS0AIe7uBjxDeUMNcFmaRTbNv7NxI5xOCs4lhzsVyGR/0qBXduPnoWf6dGC365saTiwag8hP1imTgag==}
+    cpu: [s390x]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-gnu@4.36.0':
+    resolution: {integrity: sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-gnu@4.53.2':
+    resolution: {integrity: sha512-yo8d6tdfdeBArzC7T/PnHd7OypfI9cbuZzPnzLJIyKYFhAQ8SvlkKtKBMbXDxe1h03Rcr7u++nFS7tqXz87Gtw==}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@rollup/rollup-linux-x64-musl@4.36.0':
+    resolution: {integrity: sha512-sycrYZPrv2ag4OCvaN5js+f01eoZ2U+RmT5as8vhxiFz+kxwlHrsxOwKPSA8WyS+Wc6Epid9QeI/IkQ9NkgYyQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-win32-arm64-msvc@4.36.0':
+    resolution: {integrity: sha512-qbqt4N7tokFwwSVlWDsjfoHgviS3n/vZ8LK0h1uLG9TYIRuUTJC88E1xb3LM2iqZ/WTqNQjYrtmtGmrmmawB6A==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.36.0':
+    resolution: {integrity: sha512-t+RY0JuRamIocMuQcfwYSOkmdX9dtkr1PbhKW42AMvaDQa+jOdpUYysroTF/nuPpAaQMWp7ye+ndlmmthieJrQ==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.36.0':
+    resolution: {integrity: sha512-aRXd7tRZkWLqGbChgcMMDEHjOKudo1kChb1Jt1IfR8cY/KIpgNviLeJy5FUb9IpSuQj8dU2fAYNMPW/hLKOSTw==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rushstack/eslint-patch@1.2.0':
+    resolution: {integrity: sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==}
+
+  '@s2-dev/streamstore@0.17.3':
+    resolution: {integrity: sha512-UeXL5+MgZQfNkbhCgEDVm7PrV5B3bxh6Zp4C5pUzQQwaoA+iGh2QiiIptRZynWgayzRv4vh0PYfnKpTzJEXegQ==}
+    peerDependencies:
+      typescript: 5.5.4
+
+  '@s2-dev/streamstore@0.17.6':
+    resolution: {integrity: sha512-ocjZfKaPKmo2yhudM58zVNHv3rBLSbTKkabVoLFn9nAxU6iLrR2CO3QmSo7/waohI3EZHAWxF/Pw8kA8d6QH2g==}
+
+  '@sec-ant/readable-stream@0.4.1':
+    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
+
+  '@selderee/plugin-htmlparser2@0.11.0':
+    resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
+
+  '@sentry-internal/browser-utils@9.46.0':
+    resolution: {integrity: sha512-Q0CeHym9wysku8mYkORXmhtlBE0IrafAI+NiPSqxOBKXGOCWKVCvowHuAF56GwPFic2rSrRnub5fWYv7T1jfEQ==}
+    engines: {node: '>=18'}
+
+  '@sentry-internal/feedback@9.46.0':
+    resolution: {integrity: sha512-KLRy3OolDkGdPItQ3obtBU2RqDt9+KE8z7r7Gsu7c6A6A89m8ZVlrxee3hPQt6qp0YY0P8WazpedU3DYTtaT8w==}
+    engines: {node: '>=18'}
+
+  '@sentry-internal/replay-canvas@9.46.0':
+    resolution: {integrity: sha512-QcBjrdRWFJrrrjbmrr2bbrp2R9RYj1KMEbhHNT2Lm1XplIQw+tULEKOHxNtkUFSLR1RNje7JQbxhzM1j95FxVQ==}
+    engines: {node: '>=18'}
+
+  '@sentry-internal/replay@9.46.0':
+    resolution: {integrity: sha512-+8JUblxSSnN0FXcmOewbN+wIc1dt6/zaSeAvt2xshrfrLooVullcGsuLAiPhY0d/e++Fk06q1SAl9g4V0V13gg==}
+    engines: {node: '>=18'}
+
+  '@sentry/browser@9.46.0':
+    resolution: {integrity: sha512-NOnCTQCM0NFuwbyt4DYWDNO2zOTj1mCf43hJqGDFb1XM9F++7zAmSNnCx4UrEoBTiFOy40McJwBBk9D1blSktA==}
+    engines: {node: '>=18'}
+
+  '@sentry/cli-darwin@2.50.2':
+    resolution: {integrity: sha512-0Pjpl0vQqKhwuZm19z6AlEF+ds3fJg1KWabv8WzGaSc/fwxMEwjFwOZj+IxWBJPV578cXXNvB39vYjjpCH8j7A==}
+    engines: {node: '>=10'}
+    os: [darwin]
+
+  '@sentry/cli-linux-arm64@2.50.2':
+    resolution: {integrity: sha512-03Cj215M3IdoHAwevCxm5oOm9WICFpuLR05DQnODFCeIUsGvE1pZsc+Gm0Ky/ZArq2PlShBJTpbHvXbCUka+0w==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-linux-arm@2.50.2':
+    resolution: {integrity: sha512-jzFwg9AeeuFAFtoCcyaDEPG05TU02uOy1nAX09c1g7FtsyQlPcbhI94JQGmnPzdRjjDmORtwIUiVZQrVTkDM7w==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-linux-i686@2.50.2':
+    resolution: {integrity: sha512-J+POvB34uVyHbIYF++Bc/OCLw+gqKW0H/y/mY7rRZCiocgpk266M4NtsOBl6bEaurMx1D+BCIEjr4nc01I/rqA==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-linux-x64@2.50.2':
+    resolution: {integrity: sha512-81yQVRLj8rnuHoYcrM7QbOw8ubA3weiMdPtTxTim1s6WExmPgnPTKxLCr9xzxGJxFdYo3xIOhtf5JFpUX/3j4A==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux, freebsd, android]
+
+  '@sentry/cli-win32-arm64@2.50.2':
+    resolution: {integrity: sha512-QjentLGvpibgiZlmlV9ifZyxV73lnGH6pFZWU5wLeRiaYKxWtNrrHpVs+HiWlRhkwQ0mG1/S40PGNgJ20DJ3gA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@sentry/cli-win32-i686@2.50.2':
+    resolution: {integrity: sha512-UkBIIzkQkQ1UkjQX8kHm/+e7IxnEhK6CdgSjFyNlxkwALjDWHJjMztevqAPz3kv4LdM6q1MxpQ/mOqXICNhEGg==}
+    engines: {node: '>=10'}
+    cpu: [x86, ia32]
+    os: [win32]
+
+  '@sentry/cli-win32-x64@2.50.2':
+    resolution: {integrity: sha512-tE27pu1sRRub1Jpmemykv3QHddBcyUk39Fsvv+n4NDpQyMgsyVPcboxBZyby44F0jkpI/q3bUH2tfCB1TYDNLg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@sentry/cli@2.50.2':
+    resolution: {integrity: sha512-m1L9shxutF3WHSyNld6Y1vMPoXfEyQhoRh1V3SYSdl+4AB40U+zr2sRzFa2OPm7XP4zYNaWuuuHLkY/iHITs8Q==}
+    engines: {node: '>= 10'}
+    hasBin: true
+
+  '@sentry/core@9.46.0':
+    resolution: {integrity: sha512-it7JMFqxVproAgEtbLgCVBYtQ9fIb+Bu0JD+cEplTN/Ukpe6GaolyYib5geZqslVxhp2sQgT+58aGvfd/k0N8Q==}
+    engines: {node: '>=18'}
+
+  '@sentry/node-core@9.46.0':
+    resolution: {integrity: sha512-XRVu5pqoklZeh4wqhxCLZkz/ipoKhitctgEFXX9Yh1e1BoHM2pIxT52wf+W6hHM676TFmFXW3uKBjsmRM3AjgA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/context-async-hooks': ^1.30.1 || ^2.0.0
+      '@opentelemetry/core': ^1.30.1 || ^2.0.0
+      '@opentelemetry/instrumentation': '>=0.57.1 <1'
+      '@opentelemetry/resources': ^1.30.1 || ^2.0.0
+      '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.0.0
+      '@opentelemetry/semantic-conventions': ^1.34.0
+
+  '@sentry/node@9.46.0':
+    resolution: {integrity: sha512-pRLqAcd7GTGvN8gex5FtkQR5Mcol8gOy1WlyZZFq4rBbVtMbqKOQRhohwqnb+YrnmtFpj7IZ7KNDo077MvNeOQ==}
+    engines: {node: '>=18'}
+
+  '@sentry/opentelemetry@9.46.0':
+    resolution: {integrity: sha512-w2zTxqrdmwRok0cXBoh+ksXdGRUHUZhlpfL/H2kfTodOL+Mk8rW72qUmfqQceXoqgbz8UyK8YgJbyt+XS5H4Qg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/context-async-hooks': ^1.30.1 || ^2.0.0
+      '@opentelemetry/core': ^1.30.1 || ^2.0.0
+      '@opentelemetry/sdk-trace-base': ^1.30.1 || ^2.0.0
+      '@opentelemetry/semantic-conventions': ^1.34.0
+
+  '@sentry/react@9.46.0':
+    resolution: {integrity: sha512-2NTlke1rKAJO2JIY1RCrv8EjfXXkLc+AC61PpgF1QjH/cz0NuCZ6gpQi6M5qS7anAGPjaOE1t3QdLeOEI/Q3kA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^16.14.0 || 17.x || 18.x || 19.x
+
+  '@sentry/remix@9.46.0':
+    resolution: {integrity: sha512-U4wcghcPaK1+HZvxAvDBOLz4Wbfn9fElfCkq4SFZUG/T1hxH4rg6rVmySoYR2DEbucyV147/xVloVceJ/EQpHQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      '@remix-run/node': 2.x
+      '@remix-run/react': 2.x
+      '@remix-run/server-runtime': 2.x
+      react: 18.x
+
+  '@shikijs/core@3.13.0':
+    resolution: {integrity: sha512-3P8rGsg2Eh2qIHekwuQjzWhKI4jV97PhvYjYUzGqjvJfqdQPz+nMlfWahU24GZAyW1FxFI1sYjyhfh5CoLmIUA==}
+
+  '@shikijs/engine-javascript@3.13.0':
+    resolution: {integrity: sha512-Ty7xv32XCp8u0eQt8rItpMs6rU9Ki6LJ1dQOW3V/56PKDcpvfHPnYFbsx5FFUP2Yim34m/UkazidamMNVR4vKg==}
+
+  '@shikijs/engine-oniguruma@3.13.0':
+    resolution: {integrity: sha512-O42rBGr4UDSlhT2ZFMxqM7QzIU+IcpoTMzb3W7AlziI1ZF7R8eS2M0yt5Ry35nnnTX/LTLXFPUjRFCIW+Operg==}
+
+  '@shikijs/langs@3.13.0':
+    resolution: {integrity: sha512-672c3WAETDYHwrRP0yLy3W1QYB89Hbpj+pO4KhxK6FzIrDI2FoEXNiNCut6BQmEApYLfuYfpgOZaqbY+E9b8wQ==}
+
+  '@shikijs/themes@3.13.0':
+    resolution: {integrity: sha512-Vxw1Nm1/Od8jyA7QuAenaV78BG2nSr3/gCGdBkLpfLscddCkzkL36Q5b67SrLLfvAJTOUzW39x4FHVCFriPVgg==}
+
+  '@shikijs/types@3.13.0':
+    resolution: {integrity: sha512-oM9P+NCFri/mmQ8LoFGVfVyemm5Hi27330zuOBp0annwJdKH1kOLndw3zCtAVDehPLg9fKqoEx3Ht/wNZxolfw==}
+
+  '@shikijs/vscode-textmate@10.0.2':
+    resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
+
+  '@sideway/address@4.1.4':
+    resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
+
+  '@sideway/formula@3.0.1':
+    resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==}
+
+  '@sideway/pinpoint@2.0.0':
+    resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
+
+  '@sinclair/typebox@0.34.38':
+    resolution: {integrity: sha512-HpkxMmc2XmZKhvaKIZZThlHmx1L0I/V1hWK1NubtlFnr6ZqdiOpV72TKudZUNQjZNsyDBay72qFEhEvb+bcwcA==}
+
+  '@sindresorhus/is@0.14.0':
+    resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==}
+    engines: {node: '>=6'}
+
+  '@sindresorhus/is@4.6.0':
+    resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
+    engines: {node: '>=10'}
+
+  '@sindresorhus/merge-streams@4.0.0':
+    resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==}
+    engines: {node: '>=18'}
+
+  '@slack/logger@4.0.0':
+    resolution: {integrity: sha512-Wz7QYfPAlG/DR+DfABddUZeNgoeY7d1J39OCR2jR+v7VBsB8ezulDK5szTnDDPDwLH5IWhLvXIHlCFZV7MSKgA==}
+    engines: {node: '>= 18', npm: '>= 8.6.0'}
+
+  '@slack/types@2.14.0':
+    resolution: {integrity: sha512-n0EGm7ENQRxlXbgKSrQZL69grzg1gHLAVd+GlRVQJ1NSORo0FrApR7wql/gaKdu2n4TO83Sq/AmeUOqD60aXUA==}
+    engines: {node: '>= 12.13.0', npm: '>= 6.12.0'}
+
+  '@slack/web-api@7.9.1':
+    resolution: {integrity: sha512-qMcb1oWw3Y/KlUIVJhkI8+NcQXq1lNymwf+ewk93ggZsGd6iuz9ObQsOEbvlqlx1J+wd8DmIm3DORGKs0fcKdg==}
+    engines: {node: '>= 18', npm: '>= 8.6.0'}
+
+  '@smithy/abort-controller@2.0.14':
+    resolution: {integrity: sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/abort-controller@4.0.4':
+    resolution: {integrity: sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/abort-controller@4.2.5':
+    resolution: {integrity: sha512-j7HwVkBw68YW8UmFRcjZOmssE77Rvk0GWAIN1oFBhsaovQmZWYCIcGa9/pwRB0ExI8Sk9MWNALTjftjHZea7VA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/chunked-blob-reader-native@4.2.1':
+    resolution: {integrity: sha512-lX9Ay+6LisTfpLid2zZtIhSEjHMZoAR5hHCR4H7tBz/Zkfr5ea8RcQ7Tk4mi0P76p4cN+Btz16Ffno7YHpKXnQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/chunked-blob-reader@5.2.0':
+    resolution: {integrity: sha512-WmU0TnhEAJLWvfSeMxBNe5xtbselEO8+4wG0NtZeL8oR21WgH1xiO37El+/Y+H/Ie4SCwBy3MxYWmOYaGgZueA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/config-resolver@2.0.19':
+    resolution: {integrity: sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/config-resolver@4.1.4':
+    resolution: {integrity: sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/config-resolver@4.4.3':
+    resolution: {integrity: sha512-ezHLe1tKLUxDJo2LHtDuEDyWXolw8WGOR92qb4bQdWq/zKenO5BvctZGrVJBK08zjezSk7bmbKFOXIVyChvDLw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/core@3.18.3':
+    resolution: {integrity: sha512-qqpNskkbHOSfrbFbjhYj5o8VMXO26fvN1K/+HbCzUNlTuxgNcPRouUDNm+7D6CkN244WG7aK533Ne18UtJEgAA==}
+    engines: {node: '>=18.0.0'}
+    deprecated: Please upgrade your lockfile to use the latest 3.x version of @smithy/core for various fixes, see https://github.com/smithy-lang/smithy-typescript/blob/main/packages/core/CHANGELOG.md
+
+  '@smithy/core@3.18.5':
+    resolution: {integrity: sha512-6gnIz3h+PEPQGDj8MnRSjDvKBah042jEoPgjFGJ4iJLBE78L4lY/n98x14XyPF4u3lN179Ub/ZKFY5za9GeLQw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/core@3.6.0':
+    resolution: {integrity: sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/credential-provider-imds@2.1.2':
+    resolution: {integrity: sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/credential-provider-imds@4.0.6':
+    resolution: {integrity: sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/credential-provider-imds@4.2.5':
+    resolution: {integrity: sha512-BZwotjoZWn9+36nimwm/OLIcVe+KYRwzMjfhd4QT7QxPm9WY0HiOV8t/Wlh+HVUif0SBVV7ksq8//hPaBC/okQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-codec@2.0.14':
+    resolution: {integrity: sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==}
+
+  '@smithy/eventstream-codec@4.2.5':
+    resolution: {integrity: sha512-Ogt4Zi9hEbIP17oQMd68qYOHUzmH47UkK7q7Gl55iIm9oKt27MUGrC5JfpMroeHjdkOliOA4Qt3NQ1xMq/nrlA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-browser@4.2.5':
+    resolution: {integrity: sha512-HohfmCQZjppVnKX2PnXlf47CW3j92Ki6T/vkAT2DhBR47e89pen3s4fIa7otGTtrVxmj7q+IhH0RnC5kpR8wtw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-config-resolver@4.3.5':
+    resolution: {integrity: sha512-ibjQjM7wEXtECiT6my1xfiMH9IcEczMOS6xiCQXoUIYSj5b1CpBbJ3VYbdwDy8Vcg5JHN7eFpOCGk8nyZAltNQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-node@4.2.5':
+    resolution: {integrity: sha512-+elOuaYx6F2H6x1/5BQP5ugv12nfJl66GhxON8+dWVUEDJ9jah/A0tayVdkLRP0AeSac0inYkDz5qBFKfVp2Gg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/eventstream-serde-universal@4.2.5':
+    resolution: {integrity: sha512-G9WSqbST45bmIFaeNuP/EnC19Rhp54CcVdX9PDL1zyEB514WsDVXhlyihKlGXnRycmHNmVv88Bvvt4EYxWef/Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/fetch-http-handler@2.2.7':
+    resolution: {integrity: sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==}
+
+  '@smithy/fetch-http-handler@5.0.4':
+    resolution: {integrity: sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/fetch-http-handler@5.3.6':
+    resolution: {integrity: sha512-3+RG3EA6BBJ/ofZUeTFJA7mHfSYrZtQIrDP9dI8Lf7X6Jbos2jptuLrAAteDiFVrmbEmLSuRG/bUKzfAXk7dhg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-blob-browser@4.2.6':
+    resolution: {integrity: sha512-8P//tA8DVPk+3XURk2rwcKgYwFvwGwmJH/wJqQiSKwXZtf/LiZK+hbUZmPj/9KzM+OVSwe4o85KTp5x9DUZTjw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-node@2.0.16':
+    resolution: {integrity: sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/hash-node@4.0.4':
+    resolution: {integrity: sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-node@4.2.5':
+    resolution: {integrity: sha512-DpYX914YOfA3UDT9CN1BM787PcHfWRBB43fFGCYrZFUH0Jv+5t8yYl+Pd5PW4+QzoGEDvn5d5QIO4j2HyYZQSA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/hash-stream-node@4.2.5':
+    resolution: {integrity: sha512-6+do24VnEyvWcGdHXomlpd0m8bfZePpUKBy7m311n+JuRwug8J4dCanJdTymx//8mi0nlkflZBvJe+dEO/O12Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/invalid-dependency@2.0.14':
+    resolution: {integrity: sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==}
+
+  '@smithy/invalid-dependency@4.0.4':
+    resolution: {integrity: sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/invalid-dependency@4.2.5':
+    resolution: {integrity: sha512-2L2erASEro1WC5nV+plwIMxrTXpvpfzl4e+Nre6vBVRR2HKeGGcvpJyyL3/PpiSg+cJG2KpTmZmq934Olb6e5A==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/is-array-buffer@2.2.0':
+    resolution: {integrity: sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/is-array-buffer@4.2.0':
+    resolution: {integrity: sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/md5-js@2.0.16':
+    resolution: {integrity: sha512-YhWt9aKl+EMSNXyUTUo7I01WHf3HcCkPu/Hl2QmTNwrHT49eWaY7hptAMaERZuHFH0V5xHgPKgKZo2I93DFtgQ==}
+
+  '@smithy/md5-js@4.2.5':
+    resolution: {integrity: sha512-Bt6jpSTMWfjCtC0s79gZ/WZ1w90grfmopVOWqkI2ovhjpD5Q2XRXuecIPB9689L2+cCySMbaXDhBPU56FKNDNg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-content-length@2.0.16':
+    resolution: {integrity: sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/middleware-content-length@4.0.4':
+    resolution: {integrity: sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-content-length@4.2.5':
+    resolution: {integrity: sha512-Y/RabVa5vbl5FuHYV2vUCwvh/dqzrEY/K2yWPSqvhFUwIY0atLqO4TienjBXakoy4zrKAMCZwg+YEqmH7jaN7A==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-endpoint@2.2.1':
+    resolution: {integrity: sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/middleware-endpoint@4.1.13':
+    resolution: {integrity: sha512-xg3EHV/Q5ZdAO5b0UiIMj3RIOCobuS40pBBODguUDVdko6YK6QIzCVRrHTogVuEKglBWqWenRnZ71iZnLL3ZAQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-endpoint@4.3.10':
+    resolution: {integrity: sha512-SoAag3QnWBFoXjwa1jenEThkzJYClidZUyqsLKwWZ8kOlZBwehrLBp4ygVDjNEM2a2AamCQ2FBA/HuzKJ/LiTA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-endpoint@4.3.12':
+    resolution: {integrity: sha512-9pAX/H+VQPzNbouhDhkW723igBMLgrI8OtX+++M7iKJgg/zY/Ig3i1e6seCcx22FWhE6Q/S61BRdi2wXBORT+A==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-retry@2.0.21':
+    resolution: {integrity: sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/middleware-retry@4.1.14':
+    resolution: {integrity: sha512-eoXaLlDGpKvdmvt+YBfRXE7HmIEtFF+DJCbTPwuLunP0YUnrydl+C4tS+vEM0+nyxXrX3PSUFqC+lP1+EHB1Tw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-retry@4.4.10':
+    resolution: {integrity: sha512-6fOwX34gXxcqKa3bsG0mR0arc2Cw4ddOS6tp3RgUD2yoTrDTbQ2aVADnDjhUuxaiDZN2iilxndgGDhnpL/XvJA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-retry@4.4.12':
+    resolution: {integrity: sha512-S4kWNKFowYd0lID7/DBqWHOQxmxlsf0jBaos9chQZUWTVOjSW1Ogyh8/ib5tM+agFDJ/TCxuCTvrnlc+9cIBcQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-serde@2.0.14':
+    resolution: {integrity: sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/middleware-serde@4.0.8':
+    resolution: {integrity: sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-serde@4.2.5':
+    resolution: {integrity: sha512-La1ldWTJTZ5NqQyPqnCNeH9B+zjFhrNoQIL1jTh4zuqXRlmXhxYHhMtI1/92OlnoAtp6JoN7kzuwhWoXrBwPqg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-serde@4.2.6':
+    resolution: {integrity: sha512-VkLoE/z7e2g8pirwisLz8XJWedUSY8my/qrp81VmAdyrhi94T+riBfwP+AOEEFR9rFTSonC/5D2eWNmFabHyGQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-stack@2.0.8':
+    resolution: {integrity: sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/middleware-stack@4.0.4':
+    resolution: {integrity: sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/middleware-stack@4.2.5':
+    resolution: {integrity: sha512-bYrutc+neOyWxtZdbB2USbQttZN0mXaOyYLIsaTbJhFsfpXyGWUxJpEuO1rJ8IIJm2qH4+xJT0mxUSsEDTYwdQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/node-config-provider@2.1.6':
+    resolution: {integrity: sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/node-config-provider@4.1.3':
+    resolution: {integrity: sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/node-config-provider@4.3.5':
+    resolution: {integrity: sha512-UTurh1C4qkVCtqggI36DGbLB2Kv8UlcFdMXDcWMbqVY2uRg0XmT9Pb4Vj6oSQ34eizO1fvR0RnFV4Axw4IrrAg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/node-http-handler@2.1.10':
+    resolution: {integrity: sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/node-http-handler@4.0.6':
+    resolution: {integrity: sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/node-http-handler@4.4.5':
+    resolution: {integrity: sha512-CMnzM9R2WqlqXQGtIlsHMEZfXKJVTIrqCNoSd/QpAyp+Dw0a1Vps13l6ma1fH8g7zSPNsA59B/kWgeylFuA/lw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/property-provider@2.0.15':
+    resolution: {integrity: sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/property-provider@4.0.4':
+    resolution: {integrity: sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/property-provider@4.2.5':
+    resolution: {integrity: sha512-8iLN1XSE1rl4MuxvQ+5OSk/Zb5El7NJZ1td6Tn+8dQQHIjp59Lwl6bd0+nzw6SKm2wSSriH2v/I9LPzUic7EOg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/protocol-http@3.0.10':
+    resolution: {integrity: sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/protocol-http@5.1.2':
+    resolution: {integrity: sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/protocol-http@5.3.5':
+    resolution: {integrity: sha512-RlaL+sA0LNMp03bf7XPbFmT5gN+w3besXSWMkA8rcmxLSVfiEXElQi4O2IWwPfxzcHkxqrwBFMbngB8yx/RvaQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/querystring-builder@2.0.14':
+    resolution: {integrity: sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/querystring-builder@4.0.4':
+    resolution: {integrity: sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/querystring-builder@4.2.5':
+    resolution: {integrity: sha512-y98otMI1saoajeik2kLfGyRp11e5U/iJYH/wLCh3aTV/XutbGT9nziKGkgCaMD1ghK7p6htHMm6b6scl9JRUWg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/querystring-parser@2.0.14':
+    resolution: {integrity: sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/querystring-parser@4.0.4':
+    resolution: {integrity: sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/querystring-parser@4.2.5':
+    resolution: {integrity: sha512-031WCTdPYgiQRYNPXznHXof2YM0GwL6SeaSyTH/P72M1Vz73TvCNH2Nq8Iu2IEPq9QP2yx0/nrw5YmSeAi/AjQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/service-error-classification@2.0.7':
+    resolution: {integrity: sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/service-error-classification@4.0.6':
+    resolution: {integrity: sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/service-error-classification@4.2.5':
+    resolution: {integrity: sha512-8fEvK+WPE3wUAcDvqDQG1Vk3ANLR8Px979te96m84CbKAjBVf25rPYSzb4xU4hlTyho7VhOGnh5i62D/JVF0JQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/shared-ini-file-loader@2.2.5':
+    resolution: {integrity: sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/shared-ini-file-loader@4.0.4':
+    resolution: {integrity: sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/shared-ini-file-loader@4.4.0':
+    resolution: {integrity: sha512-5WmZ5+kJgJDjwXXIzr1vDTG+RhF9wzSODQBfkrQ2VVkYALKGvZX1lgVSxEkgicSAFnFhPj5rudJV0zoinqS0bA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/signature-v4@2.0.16':
+    resolution: {integrity: sha512-ilLY85xS2kZZzTb83diQKYLIYALvart0KnBaKnIRnMBHAGEio5aHSlANQoxVn0VsonwmQ3CnWhnCT0sERD8uTg==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/signature-v4@5.1.2':
+    resolution: {integrity: sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/signature-v4@5.3.5':
+    resolution: {integrity: sha512-xSUfMu1FT7ccfSXkoLl/QRQBi2rOvi3tiBZU2Tdy3I6cgvZ6SEi9QNey+lqps/sJRnogIS+lq+B1gxxbra2a/w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/smithy-client@2.1.16':
+    resolution: {integrity: sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/smithy-client@4.4.5':
+    resolution: {integrity: sha512-+lynZjGuUFJaMdDYSTMnP/uPBBXXukVfrJlP+1U/Dp5SFTEI++w6NMga8DjOENxecOF71V9Z2DllaVDYRnGlkg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/smithy-client@4.9.6':
+    resolution: {integrity: sha512-hGz42hggqReicRRZUvrKDQiAmoJnx1Q+XfAJnYAGu544gOfxQCAC3hGGD7+Px2gEUUxB/kKtQV7LOtBRNyxteQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/smithy-client@4.9.8':
+    resolution: {integrity: sha512-8xgq3LgKDEFoIrLWBho/oYKyWByw9/corz7vuh1upv7ZBm0ZMjGYBhbn6v643WoIqA9UTcx5A5htEp/YatUwMA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/types@2.6.0':
+    resolution: {integrity: sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/types@4.3.1':
+    resolution: {integrity: sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/types@4.9.0':
+    resolution: {integrity: sha512-MvUbdnXDTwykR8cB1WZvNNwqoWVaTRA0RLlLmf/cIFNMM2cKWz01X4Ly6SMC4Kks30r8tT3Cty0jmeWfiuyHTA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/url-parser@2.0.14':
+    resolution: {integrity: sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==}
+
+  '@smithy/url-parser@4.0.4':
+    resolution: {integrity: sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/url-parser@4.2.5':
+    resolution: {integrity: sha512-VaxMGsilqFnK1CeBX+LXnSuaMx4sTL/6znSZh2829txWieazdVxr54HmiyTsIbpOTLcf5nYpq9lpzmwRdxj6rQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-base64@2.0.1':
+    resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-base64@4.0.0':
+    resolution: {integrity: sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-base64@4.3.0':
+    resolution: {integrity: sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-body-length-browser@2.0.0':
+    resolution: {integrity: sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==}
+
+  '@smithy/util-body-length-browser@4.0.0':
+    resolution: {integrity: sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-body-length-browser@4.2.0':
+    resolution: {integrity: sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-body-length-node@2.1.0':
+    resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-body-length-node@4.0.0':
+    resolution: {integrity: sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-body-length-node@4.2.1':
+    resolution: {integrity: sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-buffer-from@2.0.0':
+    resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-buffer-from@2.2.0':
+    resolution: {integrity: sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-buffer-from@4.0.0':
+    resolution: {integrity: sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-buffer-from@4.2.0':
+    resolution: {integrity: sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-config-provider@2.0.0':
+    resolution: {integrity: sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-config-provider@4.0.0':
+    resolution: {integrity: sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-config-provider@4.2.0':
+    resolution: {integrity: sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-browser@2.0.20':
+    resolution: {integrity: sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==}
+    engines: {node: '>= 10.0.0'}
+
+  '@smithy/util-defaults-mode-browser@4.0.21':
+    resolution: {integrity: sha512-wM0jhTytgXu3wzJoIqpbBAG5U6BwiubZ6QKzSbP7/VbmF1v96xlAbX2Am/mz0Zep0NLvLh84JT0tuZnk3wmYQA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-browser@4.3.11':
+    resolution: {integrity: sha512-yHv+r6wSQXEXTPVCIQTNmXVWs7ekBTpMVErjqZoWkYN75HIFN5y9+/+sYOejfAuvxWGvgzgxbTHa/oz61YTbKw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-browser@4.3.9':
+    resolution: {integrity: sha512-Bh5bU40BgdkXE2BcaNazhNtEXi1TC0S+1d84vUwv5srWfvbeRNUKFzwKQgC6p6MXPvEgw+9+HdX3pOwT6ut5aw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-node@2.0.26':
+    resolution: {integrity: sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==}
+    engines: {node: '>= 10.0.0'}
+
+  '@smithy/util-defaults-mode-node@4.0.21':
+    resolution: {integrity: sha512-/F34zkoU0GzpUgLJydHY8Rxu9lBn8xQC/s/0M0U9lLBkYbA1htaAFjWYJzpzsbXPuri5D1H8gjp2jBum05qBrA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-node@4.2.12':
+    resolution: {integrity: sha512-EHZwe1E9Q7umImIyCKQg/Cm+S+7rjXxCRvfGmKifqwYvn7M8M4ZcowwUOQzvuuxUUmdzCkqL0Eq0z1m74Pq6pw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-defaults-mode-node@4.2.14':
+    resolution: {integrity: sha512-ljZN3iRvaJUgulfvobIuG97q1iUuCMrvXAlkZ4msY+ZuVHQHDIqn7FKZCEj+bx8omz6kF5yQXms/xhzjIO5XiA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-endpoints@1.0.5':
+    resolution: {integrity: sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==}
+    engines: {node: '>= 14.0.0'}
+
+  '@smithy/util-endpoints@3.0.6':
+    resolution: {integrity: sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-endpoints@3.2.5':
+    resolution: {integrity: sha512-3O63AAWu2cSNQZp+ayl9I3NapW1p1rR5mlVHcF6hAB1dPZUQFfRPYtplWX/3xrzWthPGj5FqB12taJJCfH6s8A==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-hex-encoding@2.0.0':
+    resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-hex-encoding@4.2.0':
+    resolution: {integrity: sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-middleware@2.0.7':
+    resolution: {integrity: sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-middleware@4.0.4':
+    resolution: {integrity: sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-middleware@4.2.5':
+    resolution: {integrity: sha512-6Y3+rvBF7+PZOc40ybeZMcGln6xJGVeY60E7jy9Mv5iKpMJpHgRE6dKy9ScsVxvfAYuEX4Q9a65DQX90KaQ3bA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-retry@2.0.7':
+    resolution: {integrity: sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==}
+    engines: {node: '>= 14.0.0'}
+
+  '@smithy/util-retry@4.0.6':
+    resolution: {integrity: sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-retry@4.2.5':
+    resolution: {integrity: sha512-GBj3+EZBbN4NAqJ/7pAhsXdfzdlznOh8PydUijy6FpNIMnHPSMO2/rP4HKu+UFeikJxShERk528oy7GT79YiJg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-stream@2.0.21':
+    resolution: {integrity: sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-stream@4.2.2':
+    resolution: {integrity: sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-stream@4.5.6':
+    resolution: {integrity: sha512-qWw/UM59TiaFrPevefOZ8CNBKbYEP6wBAIlLqxn3VAIo9rgnTNc4ASbVrqDmhuwI87usnjhdQrxodzAGFFzbRQ==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-uri-escape@2.0.0':
+    resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-uri-escape@4.0.0':
+    resolution: {integrity: sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-uri-escape@4.2.0':
+    resolution: {integrity: sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-utf8@2.0.2':
+    resolution: {integrity: sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-utf8@2.3.0':
+    resolution: {integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==}
+    engines: {node: '>=14.0.0'}
+
+  '@smithy/util-utf8@4.0.0':
+    resolution: {integrity: sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-utf8@4.2.0':
+    resolution: {integrity: sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-waiter@4.0.6':
+    resolution: {integrity: sha512-slcr1wdRbX7NFphXZOxtxRNA7hXAAtJAXJDE/wdoMAos27SIquVCKiSqfB6/28YzQ8FCsB5NKkhdM5gMADbqxg==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/util-waiter@4.2.5':
+    resolution: {integrity: sha512-Dbun99A3InifQdIrsXZ+QLcC0PGBPAdrl4cj1mTgJvyc9N2zf7QSxg8TBkzsCmGJdE3TLbO9ycwpY0EkWahQ/g==}
+    engines: {node: '>=18.0.0'}
+
+  '@smithy/uuid@1.1.0':
+    resolution: {integrity: sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==}
+    engines: {node: '>=18.0.0'}
+
+  '@socket.io/component-emitter@3.1.0':
+    resolution: {integrity: sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==}
+
+  '@socket.io/redis-adapter@8.3.0':
+    resolution: {integrity: sha512-ly0cra+48hDmChxmIpnESKrc94LjRL80TEmZVscuQ/WWkRP81nNj8W8cCGMqbI4L6NCuAaPRSzZF1a9GlAxxnA==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      socket.io-adapter: ^2.5.4
+
+  '@sodaru/yup-to-json-schema@2.0.1':
+    resolution: {integrity: sha512-lWb0Wiz8KZ9ip/dY1eUqt7fhTPmL24p6Hmv5Fd9pzlzAdw/YNcWZr+tiCT4oZ4Zyxzi9+1X4zv82o7jYvcFxYA==}
+
+  '@standard-schema/spec@1.0.0':
+    resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
+
+  '@standard-schema/spec@1.1.0':
+    resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
+
+  '@stricli/auto-complete@1.2.0':
+    resolution: {integrity: sha512-r9/msiloVmTF95mdhe04Uzqei1B0ZofhYRLeiPqpJ1W1RMCC8p9iW7kqBZEbALl2aRL5ZK9OEW3Q1cIejH7KEQ==}
+    hasBin: true
+
+  '@stricli/core@1.2.0':
+    resolution: {integrity: sha512-5b+npntDY0TAB7wAw0daGlh3/R2sf0TDLyrB1By2jCNH+C+lmcSqMtJXOMLVtEGSkIOvqAgIWpLMSs1PXqzt3w==}
+
+  '@swc/core-darwin-arm64@1.3.101':
+    resolution: {integrity: sha512-mNFK+uHNPRXSnfTOG34zJOeMl2waM4hF4a2NY7dkMXrPqw9CoJn4MwTXJcyMiSz1/BnNjjTCHF3Yhj0jPxmkzQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@swc/core-darwin-arm64@1.3.26':
+    resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@swc/core-darwin-x64@1.3.101':
+    resolution: {integrity: sha512-B085j8XOx73Fg15KsHvzYWG262bRweGr3JooO1aW5ec5pYbz5Ew9VS5JKYS03w2UBSxf2maWdbPz2UFAxg0whw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@swc/core-darwin-x64@1.3.26':
+    resolution: {integrity: sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@swc/core-linux-arm-gnueabihf@1.3.101':
+    resolution: {integrity: sha512-9xLKRb6zSzRGPqdz52Hy5GuB1lSjmLqa0lST6MTFads3apmx4Vgs8Y5NuGhx/h2I8QM4jXdLbpqQlifpzTlSSw==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@swc/core-linux-arm-gnueabihf@1.3.26':
+    resolution: {integrity: sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==}
+    engines: {node: '>=10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@swc/core-linux-arm64-gnu@1.3.101':
+    resolution: {integrity: sha512-oE+r1lo7g/vs96Weh2R5l971dt+ZLuhaUX+n3BfDdPxNHfObXgKMjO7E+QS5RbGjv/AwiPCxQmbdCp/xN5ICJA==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@swc/core-linux-arm64-gnu@1.3.26':
+    resolution: {integrity: sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@swc/core-linux-arm64-musl@1.3.101':
+    resolution: {integrity: sha512-OGjYG3H4BMOTnJWJyBIovCez6KiHF30zMIu4+lGJTCrxRI2fAjGLml3PEXj8tC3FMcud7U2WUn6TdG0/te2k6g==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@swc/core-linux-arm64-musl@1.3.26':
+    resolution: {integrity: sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@swc/core-linux-x64-gnu@1.3.101':
+    resolution: {integrity: sha512-/kBMcoF12PRO/lwa8Z7w4YyiKDcXQEiLvM+S3G9EvkoKYGgkkz4Q6PSNhF5rwg/E3+Hq5/9D2R+6nrkF287ihg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@swc/core-linux-x64-gnu@1.3.26':
+    resolution: {integrity: sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@swc/core-linux-x64-musl@1.3.101':
+    resolution: {integrity: sha512-kDN8lm4Eew0u1p+h1l3JzoeGgZPQ05qDE0czngnjmfpsH2sOZxVj1hdiCwS5lArpy7ktaLu5JdRnx70MkUzhXw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@swc/core-linux-x64-musl@1.3.26':
+    resolution: {integrity: sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@swc/core-win32-arm64-msvc@1.3.101':
+    resolution: {integrity: sha512-9Wn8TTLWwJKw63K/S+jjrZb9yoJfJwCE2RV5vPCCWmlMf3U1AXj5XuWOLUX+Rp2sGKau7wZKsvywhheWm+qndQ==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@swc/core-win32-arm64-msvc@1.3.26':
+    resolution: {integrity: sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==}
+    engines: {node: '>=10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@swc/core-win32-ia32-msvc@1.3.101':
+    resolution: {integrity: sha512-onO5KvICRVlu2xmr4//V2je9O2XgS1SGKpbX206KmmjcJhXN5EYLSxW9qgg+kgV5mip+sKTHTAu7IkzkAtElYA==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@swc/core-win32-ia32-msvc@1.3.26':
+    resolution: {integrity: sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==}
+    engines: {node: '>=10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@swc/core-win32-x64-msvc@1.3.101':
+    resolution: {integrity: sha512-T3GeJtNQV00YmiVw/88/nxJ/H43CJvFnpvBHCVn17xbahiVUOPOduh3rc9LgAkKiNt/aV8vU3OJR+6PhfMR7UQ==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@swc/core-win32-x64-msvc@1.3.26':
+    resolution: {integrity: sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==}
+    engines: {node: '>=10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@swc/core@1.3.101':
+    resolution: {integrity: sha512-w5aQ9qYsd/IYmXADAnkXPGDMTqkQalIi+kfFf/MHRKTpaOL7DHjMXwPp/n8hJ0qNjRvchzmPtOqtPBiER50d8A==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@swc/helpers': ^0.5.0
+    peerDependenciesMeta:
+      '@swc/helpers':
+        optional: true
+
+  '@swc/core@1.3.26':
+    resolution: {integrity: sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==}
+    engines: {node: '>=10'}
+
+  '@swc/counter@0.1.3':
+    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
+
+  '@swc/helpers@0.4.14':
+    resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
+
+  '@swc/helpers@0.5.15':
+    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
+
+  '@swc/helpers@0.5.2':
+    resolution: {integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==}
+
+  '@swc/helpers@0.5.5':
+    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
+
+  '@swc/types@0.1.6':
+    resolution: {integrity: sha512-/JLo/l2JsT/LRd80C3HfbmVpxOAJ11FO2RCEslFrgzLltoP9j8XIbsyDcfCt2WWyX+CM96rBoNM+IToAkFOugg==}
+
+  '@szmarczak/http-timer@1.1.2':
+    resolution: {integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==}
+    engines: {node: '>=6'}
+
+  '@tabler/icons-react@3.36.1':
+    resolution: {integrity: sha512-/8nOXeNeMoze9xY/QyEKG65wuvRhkT3q9aytaur6Gj8bYU2A98YVJyLc9MRmc5nVvpy+bRlrrwK/Ykr8WGyUWg==}
+    peerDependencies:
+      react: '>= 16'
+
+  '@tabler/icons@3.36.1':
+    resolution: {integrity: sha512-f4Jg3Fof/Vru5ioix/UO4GX+sdDsF9wQo47FbtvG+utIYYVQ/QVAC0QYgcBbAjQGfbdOh2CCf0BgiFOF9Ixtjw==}
+
+  '@tailwindcss/container-queries@0.1.1':
+    resolution: {integrity: sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==}
+    peerDependencies:
+      tailwindcss: '>=3.2.0'
+
+  '@tailwindcss/forms@0.5.3':
+    resolution: {integrity: sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==}
+    peerDependencies:
+      tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1'
+
+  '@tailwindcss/node@4.0.17':
+    resolution: {integrity: sha512-LIdNwcqyY7578VpofXyqjH6f+3fP4nrz7FBLki5HpzqjYfXdF2m/eW18ZfoKePtDGg90Bvvfpov9d2gy5XVCbg==}
+
+  '@tailwindcss/oxide-android-arm64@4.0.17':
+    resolution: {integrity: sha512-3RfO0ZK64WAhop+EbHeyxGThyDr/fYhxPzDbEQjD2+v7ZhKTb2svTWy+KK+J1PHATus2/CQGAGp7pHY/8M8ugg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [android]
+
+  '@tailwindcss/oxide-darwin-arm64@4.0.17':
+    resolution: {integrity: sha512-e1uayxFQCCDuzTk9s8q7MC5jFN42IY7nzcr5n0Mw/AcUHwD6JaBkXnATkD924ZsHyPDvddnusIEvkgLd2CiREg==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-darwin-x64@4.0.17':
+    resolution: {integrity: sha512-d6z7HSdOKfXQ0HPlVx1jduUf/YtBuCCtEDIEFeBCzgRRtDsUuRtofPqxIVaSCUTOk5+OfRLonje6n9dF6AH8wQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@tailwindcss/oxide-freebsd-x64@4.0.17':
+    resolution: {integrity: sha512-EjrVa6lx3wzXz3l5MsdOGtYIsRjgs5Mru6lDv4RuiXpguWeOb3UzGJ7vw7PEzcFadKNvNslEQqoAABeMezprxQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.17':
+    resolution: {integrity: sha512-65zXfCOdi8wuaY0Ye6qMR5LAXokHYtrGvo9t/NmxvSZtCCitXV/gzJ/WP5ksXPhff1SV5rov0S+ZIZU+/4eyCQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm]
+    os: [linux]
+
+  '@tailwindcss/oxide-linux-arm64-gnu@4.0.17':
+    resolution: {integrity: sha512-+aaq6hJ8ioTdbJV5IA1WjWgLmun4T7eYLTvJIToiXLHy5JzUERRbIZjAcjgK9qXMwnvuu7rqpxzej+hGoEcG5g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tailwindcss/oxide-linux-arm64-musl@4.0.17':
+    resolution: {integrity: sha512-/FhWgZCdUGAeYHYnZKekiOC0aXFiBIoNCA0bwzkICiMYS5Rtx2KxFfMUXQVnl4uZRblG5ypt5vpPhVaXgGk80w==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  '@tailwindcss/oxide-linux-x64-gnu@4.0.17':
+    resolution: {integrity: sha512-gELJzOHK6GDoIpm/539Golvk+QWZjxQcbkKq9eB2kzNkOvrP0xc5UPgO9bIMNt1M48mO8ZeNenCMGt6tfkvVBg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  '@tailwindcss/oxide-linux-x64-musl@4.0.17':
+    resolution: {integrity: sha512-68NwxcJrZn94IOW4TysMIbYv5AlM6So1luTlbYUDIGnKma1yTFGBRNEJ+SacJ3PZE2rgcTBNRHX1TB4EQ/XEHw==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@tailwindcss/oxide-win32-arm64-msvc@4.0.17':
+    resolution: {integrity: sha512-AkBO8efP2/7wkEXkNlXzRD4f/7WerqKHlc6PWb5v0jGbbm22DFBLbIM19IJQ3b+tNewQZa+WnPOaGm0SmwMNjw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@tailwindcss/oxide-win32-x64-msvc@4.0.17':
+    resolution: {integrity: sha512-7/DTEvXcoWlqX0dAlcN0zlmcEu9xSermuo7VNGX9tJ3nYMdo735SHvbrHDln1+LYfF6NhJ3hjbpbjkMOAGmkDg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
+  '@tailwindcss/oxide@4.0.17':
+    resolution: {integrity: sha512-B4OaUIRD2uVrULpAD1Yksx2+wNarQr2rQh65nXqaqbLY1jCd8fO+3KLh/+TH4Hzh2NTHQvgxVbPdUDOtLk7vAw==}
+    engines: {node: '>= 10'}
+
+  '@tailwindcss/postcss@4.0.17':
+    resolution: {integrity: sha512-qeJbRTB5FMZXmuJF+eePd235EGY6IyJZF0Bh0YM6uMcCI4L9Z7dy+lPuLAhxOJzxnajsbjPoDAKOuAqZRtf1PQ==}
+
+  '@tailwindcss/typography@0.5.9':
+    resolution: {integrity: sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==}
+    peerDependencies:
+      tailwindcss: '>=3.0.0 || insiders'
+
+  '@tanstack/match-sorter-utils@8.19.4':
+    resolution: {integrity: sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==}
+    engines: {node: '>=12'}
+
+  '@tanstack/query-core@5.76.0':
+    resolution: {integrity: sha512-FN375hb8ctzfNAlex5gHI6+WDXTNpe0nbxp/d2YJtnP+IBM6OUm7zcaoCW6T63BawGOYZBbKC0iPvr41TteNVg==}
+
+  '@tanstack/react-query@5.76.1':
+    resolution: {integrity: sha512-YxdLZVGN4QkT5YT1HKZQWiIlcgauIXEIsMOTSjvyD5wLYK8YVvKZUPAysMqossFJJfDpJW3pFn7WNZuPOqq+fw==}
+    peerDependencies:
+      react: ^18 || ^19
+
+  '@tanstack/react-table@8.21.3':
+    resolution: {integrity: sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      react: '>=16.8'
+      react-dom: '>=16.8'
+
+  '@tanstack/react-virtual@3.0.4':
+    resolution: {integrity: sha512-tiqKW/e2MJVCr7/pRUXulpkyxllaOclkHNfhKTo4pmHjJIqnhMfwIjc1Q1R0Un3PI3kQywywu/791c8z9u0qeA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  '@tanstack/table-core@8.21.3':
+    resolution: {integrity: sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg==}
+    engines: {node: '>=12'}
+
+  '@tanstack/virtual-core@3.0.0':
+    resolution: {integrity: sha512-SYXOBTjJb05rXa2vl55TTwO40A6wKu0R5i1qQwhJYNDIqaIGF7D0HsLw+pJAyi2OvntlEIVusx3xtbbgSUi6zg==}
+
+  '@team-plain/typescript-sdk@3.5.0':
+    resolution: {integrity: sha512-9kweiSlYAN31VI7yzILGxdlZqsGJ+FmCEfXyEZ/0/i3r6vOwq45FDqtjadnQJVtFm+rf/8vCFRN+wEYMIEv6Aw==}
+
+  '@testcontainers/postgresql@10.28.0':
+    resolution: {integrity: sha512-NN25rruG5D4Q7pCNIJuHwB+G85OSeJ3xHZ2fWx0O6sPoPEfCYwvpj8mq99cyn68nxFkFYZeyrZJtSFO+FnydiA==}
+
+  '@testcontainers/redis@10.28.0':
+    resolution: {integrity: sha512-xDNKSJTBmQca/3v5sdHmqSCYr68vjvAGSxoHCuWylha77gAYn88g5nUZK0ocNbUZgBq69KhIzj/f9zlHkw34uA==}
+
+  '@testing-library/dom@8.19.1':
+    resolution: {integrity: sha512-P6iIPyYQ+qH8CvGauAqanhVnjrnRe0IZFSYCeGkSRW9q3u8bdVn2NPI+lasFyVsEQn1J/IFmp5Aax41+dAP9wg==}
+    engines: {node: '>=12'}
+
+  '@testing-library/jest-dom@6.5.0':
+    resolution: {integrity: sha512-xGGHpBXYSHUUr6XsKBfs85TWlYKpTc37cSBBVrXcib2MkHLboWlkClhWF37JKlDb9KEq3dHs+f2xR7XJEWGBxA==}
+    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
+
+  '@tokenizer/token@0.3.0':
+    resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
+
+  '@tootallnate/quickjs-emscripten@0.23.0':
+    resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}
+
+  '@total-typescript/ts-reset@0.4.2':
+    resolution: {integrity: sha512-vqd7ZUDSrXFVT1n8b2kc3LnklncDQFPvR58yUS1kEP23/nHPAO9l1lMjUfnPrXYYk4Hj54rrLKMW5ipwk7k09A==}
+
+  '@trigger.dev/companyicons@1.5.35':
+    resolution: {integrity: sha512-AhY7yshwh0onlgB6EGiyjyLSzl38Cuxo4tpUJVHxs5im8gDA+fuUq7o6Vz1WetFeNXwjMqh3f+bPW7bfqR4epg==}
+    peerDependencies:
+      react: ^18.2.0
+      react-dom: 18.2.0
+
+  '@trigger.dev/platform@1.0.23':
+    resolution: {integrity: sha512-/fHMOKHdqRv6t70h0weUorOeVOkX+8WGWwPlzdq+uGDqkf8ZrcwBDuBSyoG9KkyvIsA8Tw64zVbWK94CbVlznw==}
+
+  '@types/acorn@4.0.6':
+    resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==}
+
+  '@types/aria-query@5.0.1':
+    resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
+
+  '@types/aws-lambda@8.10.152':
+    resolution: {integrity: sha512-soT/c2gYBnT5ygwiHPmd9a1bftj462NWVk2tKCc1PYHSIacB2UwbTS2zYG4jzag1mRDuzg/OjtxQjQ2NKRB6Rw==}
+
+  '@types/bcryptjs@2.4.2':
+    resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
+
+  '@types/body-parser@1.19.2':
+    resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
+
+  '@types/btoa-lite@1.0.2':
+    resolution: {integrity: sha512-ZYbcE2x7yrvNFJiU7xJGrpF/ihpkM7zKgw8bha3LNJSesvTtUNxbpzaT7WXBIryf6jovisrxTBvymxMeLLj1Mg==}
+
+  '@types/bun@1.1.6':
+    resolution: {integrity: sha512-uJgKjTdX0GkWEHZzQzFsJkWp5+43ZS7HC8sZPFnOwnSo1AsNl2q9o2bFeS23disNDqbggEgyFkKCHl/w8iZsMA==}
+
+  '@types/caseless@0.12.5':
+    resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==}
+
+  '@types/compression@1.7.2':
+    resolution: {integrity: sha512-lwEL4M/uAGWngWFLSG87ZDr2kLrbuR8p7X+QZB1OQlT+qkHsCPDVFnHPyXf4Vyl4yDDorNY+mAhosxkCvppatg==}
+
+  '@types/connect@3.4.35':
+    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
+
+  '@types/connect@3.4.38':
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
+
+  '@types/cookie@0.4.1':
+    resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==}
+
+  '@types/cookie@0.6.0':
+    resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
+
+  '@types/cookiejar@2.1.5':
+    resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
+
+  '@types/cors@2.8.17':
+    resolution: {integrity: sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==}
+
+  '@types/cross-spawn@6.0.2':
+    resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
+
+  '@types/d3-array@3.0.8':
+    resolution: {integrity: sha512-2xAVyAUgaXHX9fubjcCbGAUOqYfRJN1em1EKR2HfzWBpObZhwfnZKvofTN4TplMqJdFQao61I+NVSai/vnBvDQ==}
+
+  '@types/d3-axis@3.0.6':
+    resolution: {integrity: sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==}
+
+  '@types/d3-brush@3.0.6':
+    resolution: {integrity: sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==}
+
+  '@types/d3-chord@3.0.6':
+    resolution: {integrity: sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==}
+
+  '@types/d3-color@3.1.1':
+    resolution: {integrity: sha512-CSAVrHAtM9wfuLJ2tpvvwCU/F22sm7rMHNN+yh9D6O6hyAms3+O0cgMpC1pm6UEUMOntuZC8bMt74PteiDUdCg==}
+
+  '@types/d3-contour@3.0.6':
+    resolution: {integrity: sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==}
+
+  '@types/d3-delaunay@6.0.4':
+    resolution: {integrity: sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==}
+
+  '@types/d3-dispatch@3.0.7':
+    resolution: {integrity: sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==}
+
+  '@types/d3-drag@3.0.7':
+    resolution: {integrity: sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==}
+
+  '@types/d3-dsv@3.0.7':
+    resolution: {integrity: sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==}
+
+  '@types/d3-ease@3.0.0':
+    resolution: {integrity: sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA==}
+
+  '@types/d3-fetch@3.0.7':
+    resolution: {integrity: sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==}
+
+  '@types/d3-force@3.0.10':
+    resolution: {integrity: sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==}
+
+  '@types/d3-format@3.0.4':
+    resolution: {integrity: sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==}
+
+  '@types/d3-geo@3.1.0':
+    resolution: {integrity: sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==}
+
+  '@types/d3-hierarchy@3.1.7':
+    resolution: {integrity: sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==}
+
+  '@types/d3-interpolate@3.0.2':
+    resolution: {integrity: sha512-zAbCj9lTqW9J9PlF4FwnvEjXZUy75NQqPm7DMHZXuxCFTpuTrdK2NMYGQekf4hlasL78fCYOLu4EE3/tXElwow==}
+
+  '@types/d3-path@3.0.0':
+    resolution: {integrity: sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==}
+
+  '@types/d3-polygon@3.0.2':
+    resolution: {integrity: sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==}
+
+  '@types/d3-quadtree@3.0.6':
+    resolution: {integrity: sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==}
+
+  '@types/d3-random@3.0.3':
+    resolution: {integrity: sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==}
+
+  '@types/d3-scale-chromatic@3.1.0':
+    resolution: {integrity: sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==}
+
+  '@types/d3-scale@4.0.5':
+    resolution: {integrity: sha512-w/C++3W394MHzcLKO2kdsIn5KKNTOqeQVzyPSGPLzQbkPw/jpeaGtSRlakcKevGgGsjJxGsbqS0fPrVFDbHrDA==}
+
+  '@types/d3-selection@3.0.11':
+    resolution: {integrity: sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==}
+
+  '@types/d3-shape@3.1.3':
+    resolution: {integrity: sha512-cHMdIq+rhF5IVwAV7t61pcEXfEHsEsrbBUPkFGBwTXuxtTAkBBrnrNA8++6OWm3jwVsXoZYQM8NEekg6CPJ3zw==}
+
+  '@types/d3-time-format@4.0.3':
+    resolution: {integrity: sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==}
+
+  '@types/d3-time@3.0.1':
+    resolution: {integrity: sha512-5j/AnefKAhCw4HpITmLDTPlf4vhi8o/dES+zbegfPb7LaGfNyqkLxBR6E+4yvTAgnJLmhe80EXFMzUs38fw4oA==}
+
+  '@types/d3-timer@3.0.0':
+    resolution: {integrity: sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==}
+
+  '@types/d3-transition@3.0.9':
+    resolution: {integrity: sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==}
+
+  '@types/d3-zoom@3.0.8':
+    resolution: {integrity: sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==}
+
+  '@types/d3@7.4.3':
+    resolution: {integrity: sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==}
+
+  '@types/debug@4.1.12':
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+
+  '@types/debug@4.1.7':
+    resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==}
+
+  '@types/debug@4.1.8':
+    resolution: {integrity: sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==}
+
+  '@types/decimal.js@7.4.3':
+    resolution: {integrity: sha512-7MpxcJPHqQ637FCZwJLtJMaDZkcD/iyUxj0m8A+m06slFeqRiK9QtgEyuocWNRbEtCrOZOEbZPTSSR88hMZVsg==}
+    deprecated: This is a stub types definition. decimal.js provides its own type definitions, so you do not need this installed.
+
+  '@types/diff-match-patch@1.0.36':
+    resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
+
+  '@types/docker-modem@3.0.6':
+    resolution: {integrity: sha512-yKpAGEuKRSS8wwx0joknWxsmLha78wNMe9R2S3UNsVOkZded8UqOrV8KoeDXoXsjndxwyF3eIhyClGbO1SEhEg==}
+
+  '@types/dockerode@3.3.35':
+    resolution: {integrity: sha512-P+DCMASlsH+QaKkDpekKrP5pLls767PPs+/LrlVbKnEnY5tMpEUa2C6U4gRsdFZengOqxdCIqy16R22Q3pLB6Q==}
+
+  '@types/dompurify@3.2.0':
+    resolution: {integrity: sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==}
+    deprecated: This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.
+
+  '@types/eslint-scope@3.7.4':
+    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
+
+  '@types/eslint-scope@3.7.7':
+    resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
+
+  '@types/eslint@8.4.10':
+    resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
+
+  '@types/eslint@8.56.12':
+    resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==}
+
+  '@types/estree-jsx@1.0.0':
+    resolution: {integrity: sha512-3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ==}
+
+  '@types/estree@1.0.0':
+    resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
+
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+
+  '@types/estree@1.0.8':
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
+  '@types/eventsource@1.1.15':
+    resolution: {integrity: sha512-XQmGcbnxUNa06HR3VBVkc9+A2Vpi9ZyLJcdS5dwaQQ/4ZMWFO+5c90FnMUpbtMZwB/FChoYHwuVg8TvkECacTA==}
+
+  '@types/express-serve-static-core@4.17.32':
+    resolution: {integrity: sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==}
+
+  '@types/express@4.17.15':
+    resolution: {integrity: sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==}
+
+  '@types/geojson@7946.0.16':
+    resolution: {integrity: sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==}
+
+  '@types/gradient-string@1.1.2':
+    resolution: {integrity: sha512-zIet2KvHr2dkOCPI5ggQQ+WJVyfBSFaqK9sNelhgDjlE2K3Fu2muuPJwu5aKM3xoWuc3WXudVEMUwI1QWhykEQ==}
+
+  '@types/hast@2.3.4':
+    resolution: {integrity: sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==}
+
+  '@types/hast@3.0.4':
+    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
+
+  '@types/humanize-duration@3.27.1':
+    resolution: {integrity: sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==}
+
+  '@types/ini@4.1.1':
+    resolution: {integrity: sha512-MIyNUZipBTbyUNnhvuXJTY7B6qNI78meck9Jbv3wk0OgNwRyOOVEKDutAkOs1snB/tx0FafyR6/SN4Ps0hZPeg==}
+
+  '@types/interpret@1.1.3':
+    resolution: {integrity: sha512-uBaBhj/BhilG58r64mtDb/BEdH51HIQLgP5bmWzc5qCtFMja8dCk/IOJmk36j0lbi9QHwI6sbtUNGuqXdKCAtQ==}
+
+  '@types/invariant@2.2.37':
+    resolution: {integrity: sha512-IwpIMieE55oGWiXkQPSBY1nw1nFs6bsKXTFskNY8sdS17K24vyEBRQZEwlRS7ZmXCWnJcQtbxWzly+cODWGs2A==}
+
+  '@types/is-ci@3.0.0':
+    resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==}
+
+  '@types/js-cookie@2.2.7':
+    resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==}
+
+  '@types/js-yaml@4.0.9':
+    resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
+
+  '@types/json-query@2.2.3':
+    resolution: {integrity: sha512-ygE4p8lyKzTBo9LF2K/u6MHnxPxbHY6wGvwM7TdAKhbP3SvEf+Y9aeVWedDiP8SMIPowTl9R/6awQYjiUTHz2g==}
+
+  '@types/json-schema@7.0.11':
+    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
+
+  '@types/json-schema@7.0.13':
+    resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/json5@0.0.29':
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
+
+  '@types/jsonwebtoken@9.0.10':
+    resolution: {integrity: sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==}
+
+  '@types/katex@0.16.7':
+    resolution: {integrity: sha512-HMwFiRujE5PjrgwHQ25+bsLJgowjGjm5Z8FVSf0N6PwgJrwxH0QxzHYDcKsTfV3wva0vzrpqMTJS2jXPr5BMEQ==}
+
+  '@types/keyv@3.1.4':
+    resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
+
+  '@types/lodash.get@4.4.9':
+    resolution: {integrity: sha512-J5dvW98sxmGnamqf+/aLP87PYXyrha9xIgc2ZlHl6OHMFR2Ejdxep50QfU0abO1+CH6+ugx+8wEUN1toImAinA==}
+
+  '@types/lodash.omit@4.5.7':
+    resolution: {integrity: sha512-6q6cNg0tQ6oTWjSM+BcYMBhan54P/gLqBldG4AuXd3nKr0oeVekWNS4VrNEu3BhCSDXtGapi7zjhnna0s03KpA==}
+
+  '@types/lodash@4.14.191':
+    resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
+
+  '@types/marked@4.0.8':
+    resolution: {integrity: sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==}
+
+  '@types/mdast@3.0.10':
+    resolution: {integrity: sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==}
+
+  '@types/mdast@4.0.4':
+    resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
+
+  '@types/mdx@2.0.5':
+    resolution: {integrity: sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg==}
+
+  '@types/methods@1.1.4':
+    resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
+
+  '@types/mime@3.0.1':
+    resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
+
+  '@types/minimist@1.2.2':
+    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
+
+  '@types/morgan@1.9.4':
+    resolution: {integrity: sha512-cXoc4k+6+YAllH3ZHmx4hf7La1dzUk6keTR4bF4b4Sc0mZxU/zK4wO7l+ZzezXm/jkYj/qC+uYGZrarZdIVvyQ==}
+
+  '@types/ms@0.7.31':
+    resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
+
+  '@types/mysql@2.15.26':
+    resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==}
+
+  '@types/node-fetch@2.6.12':
+    resolution: {integrity: sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==}
+
+  '@types/node-fetch@2.6.2':
+    resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
+
+  '@types/node-fetch@2.6.4':
+    resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
+
+  '@types/node@20.14.14':
+    resolution: {integrity: sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==}
+
+  '@types/nodemailer@7.0.4':
+    resolution: {integrity: sha512-ee8fxWqOchH+Hv6MDDNNy028kwvVnLplrStm4Zf/3uHWw5zzo8FoYYeffpJtGs2wWysEumMH0ZIdMGMY1eMAow==}
+
+  '@types/normalize-package-data@2.4.1':
+    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
+
+  '@types/object-hash@3.0.6':
+    resolution: {integrity: sha512-fOBV8C1FIu2ELinoILQ+ApxcUKz4ngq+IWUYrxSGjXzzjUALijilampwkMgEtJ+h2njAW3pi853QpzNVCHB73w==}
+
+  '@types/pg-pool@2.0.6':
+    resolution: {integrity: sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==}
+
+  '@types/pg@8.11.14':
+    resolution: {integrity: sha512-qyD11E5R3u0eJmd1lB0WnWKXJGA7s015nyARWljfz5DcX83TKAIlY+QrmvzQTsbIe+hkiFtkyL2gHC6qwF6Fbg==}
+
+  '@types/pg@8.11.6':
+    resolution: {integrity: sha512-/2WmmBXHLsfRqzfHW7BNZ8SbYzE8OSk7i3WjFYvfgRHj7S1xj+16Je5fUKv3lVdVzk/zn9TXOqf+avFCFIE0yQ==}
+
+  '@types/pg@8.6.1':
+    resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
+
+  '@types/pg@8.6.6':
+    resolution: {integrity: sha512-O2xNmXebtwVekJDD+02udOncjVcMZQuTEQEMpKJ0ZRf5E7/9JJX3izhKUcUifBkyKpljyUM6BTgy2trmviKlpw==}
+
+  '@types/polka@0.5.7':
+    resolution: {integrity: sha512-TH8CDXM8zoskPCNmWabtK7ziGv9Q21s4hMZLVYK5HFEfqmGXBqq/Wgi7jNELWXftZK/1J/9CezYa06x1RKeQ+g==}
+
+  '@types/prismjs@1.26.0':
+    resolution: {integrity: sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==}
+
+  '@types/prop-types@15.7.5':
+    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+
+  '@types/qs@6.9.7':
+    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
+
+  '@types/range-parser@1.2.4':
+    resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
+
+  '@types/react-collapse@5.0.4':
+    resolution: {integrity: sha512-tM5cVB6skGLneNYnRK2E3R56VOHguSeJQHslGPTIMC58ytL3oelT8L/l1onkwHGn5vSEs2BEq2Olzrur+YdliA==}
+
+  '@types/react-dom@18.2.7':
+    resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==}
+
+  '@types/react-dom@19.0.4':
+    resolution: {integrity: sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==}
+    peerDependencies:
+      '@types/react': ^19.0.0
+
+  '@types/react@18.2.48':
+    resolution: {integrity: sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==}
+
+  '@types/react@18.2.69':
+    resolution: {integrity: sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q==}
+
+  '@types/react@18.3.1':
+    resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==}
+
+  '@types/react@19.0.12':
+    resolution: {integrity: sha512-V6Ar115dBDrjbtXSrS+/Oruobc+qVbbUxDFC1RSbRqLt5SYvxxyIDrSC85RWml54g+jfNeEMZhEj7wW07ONQhA==}
+
+  '@types/readable-stream@4.0.14':
+    resolution: {integrity: sha512-xZn/AuUbCMShGsqH/ehZtGDwQtbx00M9rZ2ENLe4tOjFZ/JFeWMhEZkk2fEe1jAUqqEAURIkFJ7Az/go8mM1/w==}
+
+  '@types/regression@2.0.6':
+    resolution: {integrity: sha512-sa+sHOUxh9fywFuAFLCcyupFN0CKX654QUZGW5fAZCmV51I4e5nQy1xL2g/JMUW/PeDoF3Yq2lDXb7MoC3KDNg==}
+
+  '@types/request@2.48.12':
+    resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
+
+  '@types/resolve@1.20.6':
+    resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==}
+
+  '@types/responselike@1.0.0':
+    resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
+
+  '@types/retry@0.12.0':
+    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
+
+  '@types/retry@0.12.2':
+    resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==}
+
+  '@types/rimraf@4.0.5':
+    resolution: {integrity: sha512-DTCZoIQotB2SUJnYgrEx43cQIUYOlNZz0AZPbKU4PSLYTUdML5Gox0++z4F9kQocxStrCmRNhi4x5x/UlwtKUA==}
+    deprecated: This is a stub types definition. rimraf provides its own type definitions, so you do not need this installed.
+
+  '@types/scheduler@0.16.2':
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+
+  '@types/seedrandom@3.0.8':
+    resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
+
+  '@types/semver@6.2.3':
+    resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==}
+
+  '@types/semver@7.5.1':
+    resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==}
+
+  '@types/serve-static@1.15.0':
+    resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
+
+  '@types/shimmer@1.2.0':
+    resolution: {integrity: sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==}
+
+  '@types/simple-oauth2@5.0.4':
+    resolution: {integrity: sha512-4SvTfmAa1fGUa1d07j9vIiC4o92bGh0ihPXmtS05udMMmNwVIaU2nZ706cC4wI8cJxOlHD4P/d5tzqvWYd+KxA==}
+
+  '@types/slug@5.0.3':
+    resolution: {integrity: sha512-yPX0bb1SvrpaGlHuSiz6EicgRI4VBE+LO7IANlZagQwtaoKjLLcZc8y6s13vKp41mYvMCSzjtObxvU7/0JRPaA==}
+
+  '@types/source-map-support@0.5.10':
+    resolution: {integrity: sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==}
+
+  '@types/ssh2-streams@0.1.12':
+    resolution: {integrity: sha512-Sy8tpEmCce4Tq0oSOYdfqaBpA3hDM8SoxoFh5vzFsu2oL+znzGz8oVWW7xb4K920yYMUY+PIG31qZnFMfPWNCg==}
+
+  '@types/ssh2@0.5.52':
+    resolution: {integrity: sha512-lbLLlXxdCZOSJMCInKH2+9V/77ET2J6NPQHpFI0kda61Dd1KglJs+fPQBchizmzYSOJBgdTajhPqBO1xxLywvg==}
+
+  '@types/ssh2@1.15.1':
+    resolution: {integrity: sha512-ZIbEqKAsi5gj35y4P4vkJYly642wIbY6PqoN0xiyQGshKUGXR9WQjF/iF9mXBQ8uBKy3ezfsCkcoHKhd0BzuDA==}
+
+  '@types/stream-buffers@3.0.7':
+    resolution: {integrity: sha512-azOCy05sXVXrO+qklf0c/B07H/oHaIuDDAiHPVwlk3A9Ek+ksHyTeMajLZl3r76FxpPpxem//4Te61G1iW3Giw==}
+
+  '@types/superagent@8.1.9':
+    resolution: {integrity: sha512-pTVjI73witn+9ILmoJdajHGW2jkSaOzhiFYF1Rd3EQ94kymLqB9PjD9ISg7WaALC7+dCHT0FGe9T2LktLq/3GQ==}
+
+  '@types/supertest@6.0.2':
+    resolution: {integrity: sha512-137ypx2lk/wTQbW6An6safu9hXmajAifU/s7szAHLN/FeIm5w7yR0Wkl9fdJMRSHwOn4HLAI0DaB2TOORuhPDg==}
+
+  '@types/tar@6.1.4':
+    resolution: {integrity: sha512-Cp4oxpfIzWt7mr2pbhHT2OTXGMAL0szYCzuf8lRWyIMCgsx6/Hfc3ubztuhvzXHXgraTQxyOCmmg7TDGIMIJJQ==}
+
+  '@types/tedious@4.0.14':
+    resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
+
+  '@types/tinycolor2@1.4.3':
+    resolution: {integrity: sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==}
+
+  '@types/tough-cookie@4.0.5':
+    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
+
+  '@types/trouter@3.1.4':
+    resolution: {integrity: sha512-4YIL/2AvvZqKBWenjvEpxpblT2KGO6793ipr5QS7/6DpQ3O3SwZGgNGWezxf3pzeYZc24a2pJIrR/+Jxh/wYNQ==}
+
+  '@types/trusted-types@2.0.7':
+    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
+
+  '@types/unist@2.0.6':
+    resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
+
+  '@types/unist@3.0.3':
+    resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+
+  '@types/uuid@10.0.0':
+    resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
+
+  '@types/uuid@9.0.0':
+    resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
+
+  '@types/webpack@5.28.5':
+    resolution: {integrity: sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==}
+
+  '@types/ws@8.5.10':
+    resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
+
+  '@types/ws@8.5.12':
+    resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==}
+
+  '@types/ws@8.5.4':
+    resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
+
+  '@types/yauzl@2.10.3':
+    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
+
+  '@typescript-eslint/eslint-plugin@5.59.6':
+    resolution: {integrity: sha512-sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@5.59.6':
+    resolution: {integrity: sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@5.59.6':
+    resolution: {integrity: sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/type-utils@5.59.6':
+    resolution: {integrity: sha512-A4tms2Mp5yNvLDlySF+kAThV9VTBPCvGf0Rp8nl/eoDX9Okun8byTKoj3fJ52IJitjWOk0fKPNQhXEB++eNozQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@5.59.6':
+    resolution: {integrity: sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@typescript-eslint/typescript-estree@5.59.6':
+    resolution: {integrity: sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@5.59.6':
+    resolution: {integrity: sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  '@typescript-eslint/visitor-keys@5.59.6':
+    resolution: {integrity: sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  '@uiw/codemirror-extensions-basic-setup@4.19.5':
+    resolution: {integrity: sha512-1zt7ZPJ01xKkSW/KDy0FZNga0bngN1fC594wCVG7FBi60ehfcAucpooQ+JSPScKXopxcb+ugPKZvVLzr9/OfzA==}
+    peerDependencies:
+      '@codemirror/autocomplete': '>=6.0.0'
+      '@codemirror/commands': '>=6.0.0'
+      '@codemirror/language': '>=6.0.0'
+      '@codemirror/lint': '>=6.0.0'
+      '@codemirror/search': '>=6.0.0'
+      '@codemirror/state': '>=6.0.0'
+      '@codemirror/view': '>=6.0.0'
+
+  '@uiw/react-codemirror@4.19.5':
+    resolution: {integrity: sha512-ZCHh8d7beXbF8/t7F1+yHht6A9Y6CdKeOkZq4A09lxJEnyTQrj1FMf2zvfaqc7K23KNjkTCtSlbqKKbVDgrWaw==}
+    peerDependencies:
+      '@babel/runtime': 7.27.0
+      '@codemirror/state': '>=6.0.0'
+      '@codemirror/theme-one-dark': '>=6.0.0'
+      '@codemirror/view': '>=6.0.0'
+      codemirror: '>=6.0.0'
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+
+  '@ungap/structured-clone@1.3.0':
+    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+
+  '@unkey/cache@1.5.0':
+    resolution: {integrity: sha512-vqGk9qH3Hn1Nva3hGAaib6G3IcrPkRQ1VgyMFG7asuANZ0RtohONd9RwxXwlaDopJJ66Dsx5rWrV4s/3U1GADg==}
+
+  '@unkey/error@0.2.0':
+    resolution: {integrity: sha512-DFGb4A7SrusZPP0FYuRIF0CO+Gi4etLUAEJ6EKc+TKYmscL0nEJ2Pr38FyX9MvjI4Wx5l35Wc9KsBjMm9Ybh7w==}
+
+  '@uploadthing/mime-types@0.3.0':
+    resolution: {integrity: sha512-jN/XFvpKTzcd3MXT/9D9oxx05scnYiSYxAXF/e6hyg377zFducRxivU/kHyYTkpUZPTmOL5q9EQbOkUsXMlSMg==}
+
+  '@uploadthing/react@7.0.3':
+    resolution: {integrity: sha512-dPRO45H1UaXmbrmelU2uZjSmWz0h15F0+SbfAJ+ehxLEU34EBRpOJF55G7yK5X7syFRnedlG4E1+iEcEmKRynw==}
+    peerDependencies:
+      next: '*'
+      react: ^17.0.2 || ^18.0.0
+      uploadthing: 7.1.0
+    peerDependenciesMeta:
+      next:
+        optional: true
+
+  '@uploadthing/shared@7.0.3':
+    resolution: {integrity: sha512-PAT5Jl6bfuVp37PBvaw7bwQYhLeDfIBuGr37mbPBPhtiqm8zf8ip8zubkdm5rXEhqRWfdI64SQpl+7Q+dLoM2Q==}
+
+  '@upstash/core-analytics@0.0.8':
+    resolution: {integrity: sha512-MCJoF+Y8fkzq4NRLG7kEHjtGyMsZ2DICBdmEdwoK9umoSrfkzgBlYdZiHTIaewyt9PGaMZCHOasz0LAuMpxwxQ==}
+    engines: {node: '>=16.0.0'}
+
+  '@upstash/ratelimit@1.1.3':
+    resolution: {integrity: sha512-rl+GMvPdZJ9xPDIvIrqRl/g0nzAEaH75hwR5lXAKW8zPPplD/AeliDCHwuwcFCPIjg49FKyA1oc5H473WkVFrQ==}
+
+  '@upstash/redis@1.29.0':
+    resolution: {integrity: sha512-kbO5fgMAeUzErnA/SOtaSbAa0dguYhhBT4MZHJ1O8gVl4iK754aC9+rIYY5hsp4nlxeCGfnIDkWpof991c9jjA==}
+
+  '@vanilla-extract/babel-plugin-debug-ids@1.0.2':
+    resolution: {integrity: sha512-LjnbQWGeMwaydmovx8jWUR8BxLtLiPyq0xz5C8G5OvFhsuJxvavLdrBHNNizvr1dq7/3qZGlPv0znsvU4P44YA==}
+
+  '@vanilla-extract/css@1.11.0':
+    resolution: {integrity: sha512-uohj+8cGWbnrVzTfrjlJeXqdGjH3d3TcscdQxKe3h5bb5QQXTpPSq+c+SeWADIGiZybzcW0CBvZV8jsy1ywY9w==}
+
+  '@vanilla-extract/integration@6.2.1':
+    resolution: {integrity: sha512-+xYJz07G7TFAMZGrOqArOsURG+xcYvqctujEkANjw2McCBvGEK505RxQqOuNiA9Mi9hgGdNp2JedSa94f3eoLg==}
+
+  '@vanilla-extract/private@1.0.3':
+    resolution: {integrity: sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==}
+
+  '@vercel/oidc@3.0.3':
+    resolution: {integrity: sha512-yNEQvPcVrK9sIe637+I0jD6leluPxzwJKx/Haw6F4H77CdDsszUn5V3o96LPziXkSNE2B83+Z3mjqGKBK/R6Gg==}
+    engines: {node: '>= 20'}
+
+  '@vercel/oidc@3.0.5':
+    resolution: {integrity: sha512-fnYhv671l+eTTp48gB4zEsTW/YtRgRPnkI2nT7x6qw5rkI1Lq2hTmQIpHPgyThI0znLK+vX2n9XxKdXZ7BUbbw==}
+    engines: {node: '>= 20'}
+
+  '@vercel/otel@1.13.0':
+    resolution: {integrity: sha512-esRkt470Y2jRK1B1g7S1vkt4Csu44gp83Zpu8rIyPoqy2BKgk4z7ik1uSMswzi45UogLHFl6yR5TauDurBQi4Q==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.7.0 <2.0.0'
+      '@opentelemetry/api-logs': '>=0.46.0 <0.200.0'
+      '@opentelemetry/instrumentation': '>=0.46.0 <0.200.0'
+      '@opentelemetry/resources': '>=1.19.0 <2.0.0'
+      '@opentelemetry/sdk-logs': '>=0.46.0 <0.200.0'
+      '@opentelemetry/sdk-metrics': '>=1.19.0 <2.0.0'
+      '@opentelemetry/sdk-trace-base': '>=1.19.0 <2.0.0'
+
+  '@vercel/postgres@0.10.0':
+    resolution: {integrity: sha512-fSD23DxGND40IzSkXjcFcxr53t3Tiym59Is0jSYIFpG4/0f0KO9SGtcp1sXiebvPaGe7N/tU05cH4yt2S6/IPg==}
+    engines: {node: '>=18.14'}
+    deprecated: '@vercel/postgres is deprecated. You can either choose an alternate storage solution from the Vercel Marketplace if you want to set up a new database. Or you can follow this guide to migrate your existing Vercel Postgres db: https://neon.com/docs/guides/vercel-postgres-transition-guide'
+
+  '@vercel/sdk@1.19.1':
+    resolution: {integrity: sha512-K4rmtUT6t1vX06tiY44ot8A7W1FKN7g/tMkE7yZghCgNQ8b30SzljBd4ni8RNp2pJzM/HrZmphRDeIArO7oZuw==}
+    hasBin: true
+
+  '@vitest/coverage-v8@3.1.4':
+    resolution: {integrity: sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==}
+    peerDependencies:
+      '@vitest/browser': 3.1.4
+      vitest: 3.1.4
+    peerDependenciesMeta:
+      '@vitest/browser':
+        optional: true
+
+  '@vitest/expect@3.1.4':
+    resolution: {integrity: sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==}
+
+  '@vitest/mocker@3.1.4':
+    resolution: {integrity: sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==}
+    peerDependencies:
+      msw: ^2.4.9
+      vite: ^5.0.0 || ^6.0.0
+    peerDependenciesMeta:
+      msw:
+        optional: true
+      vite:
+        optional: true
+
+  '@vitest/pretty-format@2.1.9':
+    resolution: {integrity: sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==}
+
+  '@vitest/pretty-format@3.1.4':
+    resolution: {integrity: sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==}
+
+  '@vitest/runner@2.1.9':
+    resolution: {integrity: sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==}
+
+  '@vitest/runner@3.1.4':
+    resolution: {integrity: sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==}
+
+  '@vitest/snapshot@3.1.4':
+    resolution: {integrity: sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==}
+
+  '@vitest/spy@3.1.4':
+    resolution: {integrity: sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==}
+
+  '@vitest/utils@2.1.9':
+    resolution: {integrity: sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==}
+
+  '@vitest/utils@3.1.4':
+    resolution: {integrity: sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==}
+
+  '@web3-storage/multipart-parser@1.0.0':
+    resolution: {integrity: sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==}
+
+  '@webassemblyjs/ast@1.11.5':
+    resolution: {integrity: sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==}
+
+  '@webassemblyjs/ast@1.14.1':
+    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
+
+  '@webassemblyjs/floating-point-hex-parser@1.11.5':
+    resolution: {integrity: sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==}
+
+  '@webassemblyjs/floating-point-hex-parser@1.13.2':
+    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
+
+  '@webassemblyjs/helper-api-error@1.11.5':
+    resolution: {integrity: sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==}
+
+  '@webassemblyjs/helper-api-error@1.13.2':
+    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
+
+  '@webassemblyjs/helper-buffer@1.11.5':
+    resolution: {integrity: sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==}
+
+  '@webassemblyjs/helper-buffer@1.14.1':
+    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
+
+  '@webassemblyjs/helper-numbers@1.11.5':
+    resolution: {integrity: sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==}
+
+  '@webassemblyjs/helper-numbers@1.13.2':
+    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
+
+  '@webassemblyjs/helper-wasm-bytecode@1.11.5':
+    resolution: {integrity: sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==}
+
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2':
+    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
+
+  '@webassemblyjs/helper-wasm-section@1.11.5':
+    resolution: {integrity: sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==}
+
+  '@webassemblyjs/helper-wasm-section@1.14.1':
+    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
+
+  '@webassemblyjs/ieee754@1.11.5':
+    resolution: {integrity: sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==}
+
+  '@webassemblyjs/ieee754@1.13.2':
+    resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==}
+
+  '@webassemblyjs/leb128@1.11.5':
+    resolution: {integrity: sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==}
+
+  '@webassemblyjs/leb128@1.13.2':
+    resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==}
+
+  '@webassemblyjs/utf8@1.11.5':
+    resolution: {integrity: sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==}
+
+  '@webassemblyjs/utf8@1.13.2':
+    resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==}
+
+  '@webassemblyjs/wasm-edit@1.11.5':
+    resolution: {integrity: sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==}
+
+  '@webassemblyjs/wasm-edit@1.14.1':
+    resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==}
+
+  '@webassemblyjs/wasm-gen@1.11.5':
+    resolution: {integrity: sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==}
+
+  '@webassemblyjs/wasm-gen@1.14.1':
+    resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==}
+
+  '@webassemblyjs/wasm-opt@1.11.5':
+    resolution: {integrity: sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==}
+
+  '@webassemblyjs/wasm-opt@1.14.1':
+    resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==}
+
+  '@webassemblyjs/wasm-parser@1.11.5':
+    resolution: {integrity: sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==}
+
+  '@webassemblyjs/wasm-parser@1.14.1':
+    resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==}
+
+  '@webassemblyjs/wast-printer@1.11.5':
+    resolution: {integrity: sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==}
+
+  '@webassemblyjs/wast-printer@1.14.1':
+    resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
+
+  '@whatwg-node/events@0.1.1':
+    resolution: {integrity: sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==}
+    engines: {node: '>=16.0.0'}
+
+  '@whatwg-node/fetch@0.9.14':
+    resolution: {integrity: sha512-wurZC82zzZwXRDSW0OS9l141DynaJQh7Yt0FD1xZ8niX7/Et/7RoiLiltbVU1fSF1RR9z6ndEaTUQBAmddTm1w==}
+    engines: {node: '>=16.0.0'}
+
+  '@whatwg-node/node-fetch@0.5.0':
+    resolution: {integrity: sha512-q76lDAafvHNGWedNAVHrz/EyYTS8qwRLcwne8SJQdRN5P3HydxU6XROFvJfTML6KZXQX2FDdGY4/SnaNyd7M0Q==}
+    engines: {node: '>=16.0.0'}
+
+  '@window-splitter/state@0.4.1':
+    resolution: {integrity: sha512-JbsCYEWFXs79Gxudtv+XTYE2tdidPg8oGoIbUyh9QtdYUNUO/QKI2ORk2WFNIkk2ZzTWMXquI92s1nj4sAhZ+w==}
+    engines: {node: '>=18.0.0'}
+
+  '@wolfy1339/lru-cache@11.0.2-patch.1':
+    resolution: {integrity: sha512-BgYZfL2ADCXKOw2wJtkM3slhHotawWkgIRRxq4wEybnZQPjvAp71SPX35xepMykTw8gXlzWcWPTY31hlbnRsDA==}
+    engines: {node: 18 >=18.20 || 20 || >=22}
+
+  '@xobotyi/scrollbar-width@1.9.5':
+    resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}
+
+  '@xstate/react@4.1.2':
+    resolution: {integrity: sha512-orAidFrKCrU0ZwN5l/ABPlBfW2ziRDT2RrYoktRlZ0WRoLvA2E/uAC1JpZt43mCLtc8jrdwYCgJiqx1V8NvGTw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      xstate: ^5.18.1
+    peerDependenciesMeta:
+      xstate:
+        optional: true
+
+  '@xtuc/ieee754@1.2.0':
+    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
+
+  '@xtuc/long@4.2.2':
+    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
+
+  '@zxing/text-encoding@0.9.0':
+    resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==}
+
+  abbrev@2.0.0:
+    resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  abort-controller@3.0.0:
+    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
+    engines: {node: '>=6.5'}
+
+  abstract-logging@2.0.1:
+    resolution: {integrity: sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==}
+
+  accepts@1.3.8:
+    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
+    engines: {node: '>= 0.6'}
+
+  accepts@2.0.0:
+    resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
+    engines: {node: '>= 0.6'}
+
+  acorn-import-assertions@1.9.0:
+    resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
+    deprecated: package has been renamed to acorn-import-attributes
+    peerDependencies:
+      acorn: ^8
+
+  acorn-import-attributes@1.9.5:
+    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
+    peerDependencies:
+      acorn: ^8
+
+  acorn-import-phases@1.0.4:
+    resolution: {integrity: sha512-wKmbr/DDiIXzEOiWrTTUcDm24kQ2vGfZQvM2fwg2vXqR5uW6aapr7ObPtj1th32b9u90/Pf4AItvdTh42fBmVQ==}
+    engines: {node: '>=10.13.0'}
+    peerDependencies:
+      acorn: ^8.14.0
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn-node@1.8.2:
+    resolution: {integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==}
+
+  acorn-walk@7.2.0:
+    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
+    engines: {node: '>=0.4.0'}
+
+  acorn-walk@8.3.2:
+    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
+    engines: {node: '>=0.4.0'}
+
+  acorn@7.4.1:
+    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  acorn@8.12.1:
+    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  acorn@8.14.1:
+    resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  acorn@8.15.0:
+    resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  agent-base@6.0.2:
+    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
+    engines: {node: '>= 6.0.0'}
+
+  agent-base@7.1.4:
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
+    engines: {node: '>= 14'}
+
+  agentkeepalive@4.5.0:
+    resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
+    engines: {node: '>= 8.0.0'}
+
+  aggregate-error@3.1.0:
+    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
+    engines: {node: '>=8'}
+
+  aggregate-error@4.0.1:
+    resolution: {integrity: sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==}
+    engines: {node: '>=12'}
+
+  ahocorasick@1.0.2:
+    resolution: {integrity: sha512-hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA==}
+
+  ai@4.0.0:
+    resolution: {integrity: sha512-cqf2GCaXnOPhUU+Ccq6i+5I0jDjnFkzfq7t6mc0SUSibSa1wDPn5J4p8+Joh2fDGDYZOJ44rpTW9hSs40rXNAw==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^18 || ^19 || ^19.0.0-rc
+      zod: ^3.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      zod:
+        optional: true
+
+  ai@4.2.5:
+    resolution: {integrity: sha512-URJEslI3cgF/atdTJHtz+Sj0W1JTmiGmD3znw9KensL3qV605odktDim+GTazNJFPR4QaIu1lUio5b8RymvOjA==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^18 || ^19 || ^19.0.0-rc
+      zod: ^3.23.8
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+  ai@4.3.19:
+    resolution: {integrity: sha512-dIE2bfNpqHN3r6IINp9znguYdhIOheKW2LDigAMrgt/upT3B8eBGPSCblENvaZGoq+hxaN9fSMzjWpbqloP+7Q==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: ^18 || ^19 || ^19.0.0-rc
+      zod: ^3.23.8
+    peerDependenciesMeta:
+      react:
+        optional: true
+
+  ai@5.0.14:
+    resolution: {integrity: sha512-xiujFa879skB7YxGzbeHAxepsr6AEaWcHPXrc5a9MRM6p4WdVAwn6mGwVZkBnhqGfZtXFr4LUnU2ayvcjWp5ig==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4
+
+  ai@5.0.76:
+    resolution: {integrity: sha512-ZCxi1vrpyCUnDbtYrO/W8GLvyacV9689f00yshTIQ3mFFphbD7eIv40a2AOZBv3GGRA7SSRYIDnr56wcS/gyQg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  ai@6.0.3:
+    resolution: {integrity: sha512-OOo+/C+sEyscoLnbY3w42vjQDICioVNyS+F+ogwq6O5RJL/vgWGuiLzFwuP7oHTeni/MkmX8tIge48GTdaV7QQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      zod: ^3.25.76 || ^4.1.8
+
+  ajv-formats@2.1.1:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
+  ajv-formats@3.0.1:
+    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
+    peerDependencies:
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
+
+  ajv-keywords@3.5.2:
+    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
+    peerDependencies:
+      ajv: ^6.9.1
+
+  ajv-keywords@5.1.0:
+    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
+    peerDependencies:
+      ajv: ^8.8.2
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+
+  ansi-colors@4.1.3:
+    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
+    engines: {node: '>=6'}
+
+  ansi-escapes@7.0.0:
+    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
+    engines: {node: '>=18'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.0.1:
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
+
+  ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@5.2.0:
+    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
+    engines: {node: '>=10'}
+
+  ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+
+  antlr4ts-cli@0.5.0-alpha.4:
+    resolution: {integrity: sha512-lVPVBTA2CVHRYILSKilL6Jd4hAumhSZZWA7UbQNQrmaSSj7dPmmYaN4bOmZG79cOy0lS00i4LY68JZZjZMWVrw==}
+    hasBin: true
+
+  antlr4ts@0.5.0-alpha.4:
+    resolution: {integrity: sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ==}
+
+  any-promise@1.3.0:
+    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
+
+  anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+
+  archiver-utils@5.0.2:
+    resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==}
+    engines: {node: '>= 14'}
+
+  archiver@7.0.1:
+    resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==}
+    engines: {node: '>= 14'}
+
+  arg@5.0.2:
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
+
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  aria-hidden@1.2.3:
+    resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
+    engines: {node: '>=10'}
+
+  aria-hidden@1.2.4:
+    resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
+    engines: {node: '>=10'}
+
+  aria-query@5.3.0:
+    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+
+  arktype@2.1.20:
+    resolution: {integrity: sha512-IZCEEXaJ8g+Ijd59WtSYwtjnqXiwM8sWQ5EjGamcto7+HVN9eK0C4p0zDlCuAwWhpqr6fIBkxPuYDl4/Mcj/+Q==}
+
+  array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+
+  array-flatten@1.1.1:
+    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
+
+  array-includes@3.1.6:
+    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
+    engines: {node: '>= 0.4'}
+
+  array-includes@3.1.8:
+    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+    engines: {node: '>= 0.4'}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array.prototype.findlastindex@1.2.5:
+    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.1:
+    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flat@1.3.2:
+    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.1:
+    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.flatmap@1.3.2:
+    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
+    engines: {node: '>= 0.4'}
+
+  array.prototype.tosorted@1.1.1:
+    resolution: {integrity: sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==}
+
+  arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
+
+  arrify@1.0.1:
+    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
+    engines: {node: '>=0.10.0'}
+
+  arrify@3.0.0:
+    resolution: {integrity: sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==}
+    engines: {node: '>=12'}
+
+  asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+
+  asn1@0.2.6:
+    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+
+  assert-never@1.2.1:
+    resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
+
+  assert-plus@1.0.0:
+    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
+    engines: {node: '>=0.8'}
+
+  assertion-error@2.0.1:
+    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
+    engines: {node: '>=12'}
+
+  ast-types-flow@0.0.7:
+    resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}
+
+  ast-types@0.13.4:
+    resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
+    engines: {node: '>=4'}
+
+  astral-regex@2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+
+  astring@1.8.4:
+    resolution: {integrity: sha512-97a+l2LBU3Op3bBQEff79i/E4jMD2ZLFD8rHx9B6mXyB2uQwhJQYfiDqUwtfjF4QA1F2qs//N6Cw8LetMbQjcw==}
+    hasBin: true
+
+  async-lock@1.4.1:
+    resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
+
+  async@3.2.6:
+    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
+
+  asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+
+  atomic-sleep@1.0.0:
+    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
+    engines: {node: '>=8.0.0'}
+
+  autoevals@0.0.130:
+    resolution: {integrity: sha512-JS0T/YCEH13AAOGiWWGJDkIPP8LsDmRBYr3EazTukHxvd0nidOW7fGj0qVPFx2bARrSNO9AfCR6xoTP/5m3Bmw==}
+
+  autoprefixer@10.4.13:
+    resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
+
+  autoprefixer@10.4.14:
+    resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
+
+  autoprefixer@9.8.8:
+    resolution: {integrity: sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==}
+    hasBin: true
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  avvio@9.1.0:
+    resolution: {integrity: sha512-fYASnYi600CsH/j9EQov7lECAniYiBFiiAtBNuZYLA2leLe9qOvZzqYHFjtIj6gD2VMoMLP14834LFWvr4IfDw==}
+
+  aws-sign2@0.7.0:
+    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
+
+  aws4@1.12.0:
+    resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==}
+
+  aws4fetch@1.0.18:
+    resolution: {integrity: sha512-3Cf+YaUl07p24MoQ46rFwulAmiyCwH2+1zw1ZyPAX5OtJ34Hh185DwB8y/qRLb6cYYYtSFJ9pthyLc0MD4e8sQ==}
+
+  axe-core@4.6.2:
+    resolution: {integrity: sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg==}
+    engines: {node: '>=4'}
+
+  axios@1.12.2:
+    resolution: {integrity: sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==}
+
+  axobject-query@3.2.1:
+    resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}
+
+  b4a@1.6.6:
+    resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==}
+
+  babel-walk@3.0.0:
+    resolution: {integrity: sha512-fdRxJkQ9MUSEi4jH2DcV3FAPFktk0wefilxrwNyUuWpoWawQGN7G7cB+fOYTtFfI6XNkFgwqJ/D3G18BoJJ/jg==}
+    engines: {node: '>= 10.0.0'}
+
+  bail@2.0.2:
+    resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  bare-events@2.8.2:
+    resolution: {integrity: sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==}
+    peerDependencies:
+      bare-abort-controller: '*'
+    peerDependenciesMeta:
+      bare-abort-controller:
+        optional: true
+
+  bare-fs@4.5.1:
+    resolution: {integrity: sha512-zGUCsm3yv/ePt2PHNbVxjjn0nNB1MkIaR4wOCxJ2ig5pCf5cCVAYJXVhQg/3OhhJV6DB1ts7Hv0oUaElc2TPQg==}
+    engines: {bare: '>=1.16.0'}
+    peerDependencies:
+      bare-buffer: '*'
+    peerDependenciesMeta:
+      bare-buffer:
+        optional: true
+
+  bare-os@3.6.1:
+    resolution: {integrity: sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==}
+    engines: {bare: '>=1.14.0'}
+
+  bare-path@3.0.0:
+    resolution: {integrity: sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==}
+
+  bare-stream@2.6.5:
+    resolution: {integrity: sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==}
+    peerDependencies:
+      bare-buffer: '*'
+      bare-events: '*'
+    peerDependenciesMeta:
+      bare-buffer:
+        optional: true
+      bare-events:
+        optional: true
+
+  bare-url@2.3.2:
+    resolution: {integrity: sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  base64id@2.0.0:
+    resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==}
+    engines: {node: ^4.5.0 || >= 5.9}
+
+  baseline-browser-mapping@2.8.28:
+    resolution: {integrity: sha512-gYjt7OIqdM0PcttNYP2aVrr2G0bMALkBaoehD4BuRGjAOtipg0b6wHg1yNL+s5zSnLZZrGHOw4IrND8CD+3oIQ==}
+    hasBin: true
+
+  basic-auth@2.0.1:
+    resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==}
+    engines: {node: '>= 0.8'}
+
+  basic-ftp@5.0.3:
+    resolution: {integrity: sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==}
+    engines: {node: '>=10.0.0'}
+
+  bcrypt-pbkdf@1.0.2:
+    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+
+  before-after-hook@2.2.3:
+    resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==}
+
+  better-path-resolve@1.0.0:
+    resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==}
+    engines: {node: '>=4'}
+
+  better-sqlite3@11.10.0:
+    resolution: {integrity: sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==}
+
+  big.js@6.2.2:
+    resolution: {integrity: sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ==}
+
+  binary-extensions@2.2.0:
+    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
+    engines: {node: '>=8'}
+
+  binary-search@1.3.6:
+    resolution: {integrity: sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==}
+
+  bindings@1.5.0:
+    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+
+  bintrees@1.0.2:
+    resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}
+
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
+  body-parser@1.20.3:
+    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+
+  body-parser@2.2.0:
+    resolution: {integrity: sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==}
+    engines: {node: '>=18'}
+
+  body-parser@2.2.2:
+    resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
+    engines: {node: '>=18'}
+
+  bottleneck@2.19.5:
+    resolution: {integrity: sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==}
+
+  bowser@2.11.0:
+    resolution: {integrity: sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==}
+
+  bowser@2.12.1:
+    resolution: {integrity: sha512-z4rE2Gxh7tvshQ4hluIT7XcFrgLIQaw9X3A+kTTRdovCz5PMukm/0QC/BKSYPj3omF5Qfypn9O/c5kgpmvYUCw==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  brace-expansion@2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  breakword@1.0.5:
+    resolution: {integrity: sha512-ex5W9DoOQ/LUEU3PMdLs9ua/CYZl1678NUkKOdUSi8Aw5F1idieaiRURCBFJCwVcrD1J8Iy3vfWSloaMwO2qFg==}
+
+  browserify-zlib@0.1.4:
+    resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}
+
+  browserslist@4.21.4:
+    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  browserslist@4.24.4:
+    resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  browserslist@4.28.0:
+    resolution: {integrity: sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  btoa-lite@1.0.0:
+    resolution: {integrity: sha512-gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA==}
+
+  buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+
+  buffer-crc32@1.0.0:
+    resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
+    engines: {node: '>=8.0.0'}
+
+  buffer-equal-constant-time@1.0.1:
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  buffer@6.0.3:
+    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
+
+  bufferutil@4.0.9:
+    resolution: {integrity: sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==}
+    engines: {node: '>=6.14.2'}
+
+  buildcheck@0.0.6:
+    resolution: {integrity: sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==}
+    engines: {node: '>=10.0.0'}
+
+  builtins@1.0.3:
+    resolution: {integrity: sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==}
+
+  builtins@5.0.1:
+    resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
+
+  bun-types@1.1.17:
+    resolution: {integrity: sha512-Z4+OplcSd/YZq7ZsrfD00DKJeCwuNY96a1IDJyR73+cTBaFIS7SC6LhpY/W3AMEXO9iYq5NJ58WAwnwL1p5vKg==}
+
+  bundle-name@4.1.0:
+    resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
+    engines: {node: '>=18'}
+
+  bundle-require@5.1.0:
+    resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      esbuild: '>=0.18'
+
+  busboy@1.6.0:
+    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
+    engines: {node: '>=10.16.0'}
+
+  byline@5.0.0:
+    resolution: {integrity: sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==}
+    engines: {node: '>=0.10.0'}
+
+  bytes@3.0.0:
+    resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
+    engines: {node: '>= 0.8'}
+
+  bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
+  c12@1.11.1:
+    resolution: {integrity: sha512-KDU0TvSvVdaYcQKQ6iPHATGz/7p/KiVjPg4vQrB6Jg/wX9R0yl5RZxWm9IoZqaIHD2+6PZd81+KMGwRr/lRIUg==}
+    peerDependencies:
+      magicast: ^0.3.4
+    peerDependenciesMeta:
+      magicast:
+        optional: true
+
+  c12@3.1.0:
+    resolution: {integrity: sha512-uWoS8OU1MEIsOv8p/5a82c3H31LsWVR5qiyXVfBNOzfffjUWtPnhAb4BYI2uG2HfGmZmFjCtui5XNWaps+iFuw==}
+    peerDependencies:
+      magicast: ^0.3.5
+    peerDependenciesMeta:
+      magicast:
+        optional: true
+
+  cac@6.7.14:
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
+
+  cacache@17.1.4:
+    resolution: {integrity: sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  cacheable-request@6.1.0:
+    resolution: {integrity: sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==}
+    engines: {node: '>=8'}
+
+  call-bind-apply-helpers@1.0.2:
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
+
+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
+  call-bind@1.0.8:
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
+
+  call-bound@1.0.4:
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  camelcase-css@2.0.1:
+    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
+    engines: {node: '>= 6'}
+
+  camelcase-keys@6.2.2:
+    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
+    engines: {node: '>=8'}
+
+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
+  caniuse-lite@1.0.30001577:
+    resolution: {integrity: sha512-rs2ZygrG1PNXMfmncM0B5H1hndY5ZCC9b5TkFaVNfZ+AUlyqcMyVIQtc3fsezi0NUCk5XZfDf9WS6WxMxnfdrg==}
+
+  caniuse-lite@1.0.30001699:
+    resolution: {integrity: sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==}
+
+  caniuse-lite@1.0.30001707:
+    resolution: {integrity: sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==}
+
+  caniuse-lite@1.0.30001754:
+    resolution: {integrity: sha512-x6OeBXueoAceOmotzx3PO4Zpt4rzpeIFsSr6AAePTZxSkXiYDUmpypEl7e2+8NCd9bD7bXjqyef8CJYPC1jfxg==}
+
+  case-anything@2.1.13:
+    resolution: {integrity: sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==}
+    engines: {node: '>=12.13'}
+
+  caseless@0.12.0:
+    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
+
+  ccount@2.0.1:
+    resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
+
+  chai@5.2.0:
+    resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
+    engines: {node: '>=12'}
+
+  chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+
+  chalk@3.0.0:
+    resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
+    engines: {node: '>=8'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chalk@5.2.0:
+    resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  char-regex@1.0.2:
+    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
+    engines: {node: '>=10'}
+
+  character-entities-html4@2.1.0:
+    resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
+
+  character-entities-legacy@3.0.0:
+    resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
+
+  character-entities@2.0.2:
+    resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
+
+  character-reference-invalid@2.0.1:
+    resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
+
+  chardet@0.7.0:
+    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
+
+  check-error@2.1.1:
+    resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
+    engines: {node: '>= 16'}
+
+  cheminfo-types@1.8.1:
+    resolution: {integrity: sha512-FRcpVkox+cRovffgqNdDFQ1eUav+i/Vq/CUd1hcfEl2bevntFlzznL+jE8g4twl6ElB7gZjCko6pYpXyMn+6dA==}
+
+  chevrotain-allstar@0.3.1:
+    resolution: {integrity: sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==}
+    peerDependencies:
+      chevrotain: ^11.0.0
+
+  chevrotain@11.0.3:
+    resolution: {integrity: sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==}
+
+  chokidar@3.5.3:
+    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
+    engines: {node: '>= 8.10.0'}
+
+  chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
+
+  chokidar@4.0.3:
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
+
+  chownr@1.1.4:
+    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+
+  chownr@2.0.0:
+    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
+    engines: {node: '>=10'}
+
+  chownr@3.0.0:
+    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
+    engines: {node: '>=18'}
+
+  chrome-trace-event@1.0.3:
+    resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
+    engines: {node: '>=6.0'}
+
+  chrome-trace-event@1.0.4:
+    resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
+    engines: {node: '>=6.0'}
+
+  chromium-bidi@7.2.0:
+    resolution: {integrity: sha512-gREyhyBstermK+0RbcJLbFhcQctg92AGgDe/h/taMJEOLRdtSswBAO9KmvltFSQWgM2LrwWu5SIuEUbdm3JsyQ==}
+    peerDependencies:
+      devtools-protocol: '*'
+
+  ci-info@3.8.0:
+    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
+    engines: {node: '>=8'}
+
+  citty@0.1.6:
+    resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
+
+  cjs-module-lexer@1.2.3:
+    resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==}
+
+  class-variance-authority@0.5.2:
+    resolution: {integrity: sha512-j7Qqw3NPbs4IpO80gvdACWmVvHiLLo5MECacUBLnJG17CrLpWaQ7/4OaWX6P0IO1j2nvZ7AuSfBS/ImtEUZJGA==}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  class-variance-authority@0.7.0:
+    resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==}
+
+  class-variance-authority@0.7.1:
+    resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
+
+  clean-stack@2.2.0:
+    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
+    engines: {node: '>=6'}
+
+  clean-stack@4.2.0:
+    resolution: {integrity: sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==}
+    engines: {node: '>=12'}
+
+  cli-cursor@3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
+
+  cli-highlight@2.1.11:
+    resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
+    engines: {node: '>=8.0.0', npm: '>=5.0.0'}
+    hasBin: true
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
+  cli-table3@0.6.3:
+    resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
+    engines: {node: 10.* || >= 12.*}
+
+  cli-table3@0.6.5:
+    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
+    engines: {node: 10.* || >= 12.*}
+
+  client-only@0.0.1:
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+
+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
+  cliui@7.0.4:
+    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  clone-response@1.0.3:
+    resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
+
+  clone@1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+
+  clsx@1.2.1:
+    resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
+    engines: {node: '>=6'}
+
+  clsx@2.0.0:
+    resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==}
+    engines: {node: '>=6'}
+
+  clsx@2.1.0:
+    resolution: {integrity: sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==}
+    engines: {node: '>=6'}
+
+  clsx@2.1.1:
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
+
+  cluster-key-slot@1.1.2:
+    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
+    engines: {node: '>=0.10.0'}
+
+  codemirror@6.0.2:
+    resolution: {integrity: sha512-VhydHotNW5w1UGK0Qj96BwSk/Zqbp9WbnyK2W/eVMv4QyF41INRGpjUhFJY7/uDNuudSc33a/PKr4iDqRduvHw==}
+
+  color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  color-string@1.9.1:
+    resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
+
+  color@3.2.1:
+    resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
+
+  color@4.2.3:
+    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
+    engines: {node: '>=12.5.0'}
+
+  combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+
+  comma-separated-tokens@2.0.3:
+    resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
+
+  commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+
+  commander@11.1.0:
+    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
+    engines: {node: '>=16'}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
+  commander@4.1.1:
+    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+    engines: {node: '>= 6'}
+
+  commander@5.1.0:
+    resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
+    engines: {node: '>= 6'}
+
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
+  commander@8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+
+  commander@9.5.0:
+    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
+    engines: {node: ^12.20.0 || >=14}
+
+  compare-versions@6.1.1:
+    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
+
+  component-emitter@1.3.1:
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
+
+  compress-commons@6.0.2:
+    resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
+    engines: {node: '>= 14'}
+
+  compressible@2.0.18:
+    resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
+    engines: {node: '>= 0.6'}
+
+  compression@1.7.4:
+    resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==}
+    engines: {node: '>= 0.8.0'}
+
+  compute-cosine-similarity@1.1.0:
+    resolution: {integrity: sha512-FXhNx0ILLjGi9Z9+lglLzM12+0uoTnYkHm7GiadXDAr0HGVLm25OivUS1B/LPkbzzvlcXz/1EvWg9ZYyJSdhTw==}
+
+  compute-dot@1.1.0:
+    resolution: {integrity: sha512-L5Ocet4DdMrXboss13K59OK23GXjiSia7+7Ukc7q4Bl+RVpIXK2W9IHMbWDZkh+JUEvJAwOKRaJDiFUa1LTnJg==}
+
+  compute-l2norm@1.1.0:
+    resolution: {integrity: sha512-6EHh1Elj90eU28SXi+h2PLnTQvZmkkHWySpoFz+WOlVNLz3DQoC4ISUHSV9n5jMxPHtKGJ01F4uu2PsXBB8sSg==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
+  confbox@0.2.2:
+    resolution: {integrity: sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==}
+
+  config-chain@1.1.13:
+    resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
+
+  consola@3.4.2:
+    resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+
+  content-disposition@0.5.4:
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
+    engines: {node: '>= 0.6'}
+
+  content-disposition@1.0.0:
+    resolution: {integrity: sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==}
+    engines: {node: '>= 0.6'}
+
+  content-type@1.0.5:
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
+
+  convert-source-map@1.9.0:
+    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
+
+  cookie-signature@1.0.6:
+    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
+
+  cookie-signature@1.2.0:
+    resolution: {integrity: sha512-R0BOPfLGTitaKhgKROKZQN6iyq2iDQcH1DOF8nJoaWapguX5bC2w+Q/I9NmmM5lfcvEarnLZr+cCvmEYYSXvYA==}
+    engines: {node: '>=6.6.0'}
+
+  cookie-signature@1.2.2:
+    resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
+    engines: {node: '>=6.6.0'}
+
+  cookie@0.4.2:
+    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
+    engines: {node: '>= 0.6'}
+
+  cookie@0.6.0:
+    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
+    engines: {node: '>= 0.6'}
+
+  cookie@0.7.1:
+    resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
+    engines: {node: '>= 0.6'}
+
+  cookie@1.0.2:
+    resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==}
+    engines: {node: '>=18'}
+
+  cookiejar@2.1.4:
+    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
+
+  copy-anything@3.0.5:
+    resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
+    engines: {node: '>=12.13'}
+
+  copy-to-clipboard@3.3.3:
+    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
+
+  core-util-is@1.0.2:
+    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
+
+  core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
+  cors@2.8.5:
+    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
+    engines: {node: '>= 0.10'}
+
+  cose-base@1.0.3:
+    resolution: {integrity: sha512-s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==}
+
+  cose-base@2.2.0:
+    resolution: {integrity: sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==}
+
+  cosmiconfig@8.3.6:
+    resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  cosmiconfig@9.0.0:
+    resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  cp-file@10.0.0:
+    resolution: {integrity: sha512-vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg==}
+    engines: {node: '>=14.16'}
+
+  cpu-features@0.0.10:
+    resolution: {integrity: sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==}
+    engines: {node: '>=10.0.0'}
+
+  cpy-cli@5.0.0:
+    resolution: {integrity: sha512-fb+DZYbL9KHc0BC4NYqGRrDIJZPXUmjjtqdw4XRRg8iV8dIfghUX/WiL+q4/B/KFTy3sK6jsbUhBaz0/Hxg7IQ==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  cpy@10.1.0:
+    resolution: {integrity: sha512-VC2Gs20JcTyeQob6UViBLnyP0bYHkBh6EiKzot9vi2DmeGlFT9Wd7VG3NBrkNx/jYvFBeyDOMMHdHQhbtKLgHQ==}
+    engines: {node: '>=16'}
+
+  crc-32@1.2.2:
+    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
+    engines: {node: '>=0.8'}
+    hasBin: true
+
+  crc32-stream@6.0.0:
+    resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==}
+    engines: {node: '>= 14'}
+
+  crelt@1.0.6:
+    resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
+
+  cron-parser@4.9.0:
+    resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
+    engines: {node: '>=12.0.0'}
+
+  cronstrue@2.21.0:
+    resolution: {integrity: sha512-YxabE1ZSHA1zJZMPCTSEbc0u4cRRenjqqTgCwJT7OvkspPSvfYFITuPFtsT+VkBuavJtFv2kJXT+mKSnlUJxfg==}
+    hasBin: true
+
+  cronstrue@2.61.0:
+    resolution: {integrity: sha512-ootN5bvXbIQI9rW94+QsXN5eROtXWwew6NkdGxIRpS/UFWRggL0G5Al7a9GTBFEsuvVhJ2K3CntIIVt7L2ILhA==}
+    deprecated: Non-backwards compatible Breaking changes
+    hasBin: true
+
+  cross-env@7.0.3:
+    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
+    hasBin: true
+
+  cross-spawn@7.0.5:
+    resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==}
+    engines: {node: '>= 8'}
+
+  crypto-js@4.1.1:
+    resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
+
+  crypto-js@4.2.0:
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+
+  css-in-js-utils@3.1.0:
+    resolution: {integrity: sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==}
+
+  css-loader@6.10.0:
+    resolution: {integrity: sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==}
+    engines: {node: '>= 12.13.0'}
+    peerDependencies:
+      '@rspack/core': 0.x || 1.x
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      '@rspack/core':
+        optional: true
+      webpack:
+        optional: true
+
+  css-tree@1.1.3:
+    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
+    engines: {node: '>=8.0.0'}
+
+  css-unit-converter@1.1.2:
+    resolution: {integrity: sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==}
+
+  css-what@5.1.0:
+    resolution: {integrity: sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==}
+    engines: {node: '>= 6'}
+
+  css.escape@1.5.1:
+    resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  csstype@3.1.1:
+    resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  csstype@3.2.0:
+    resolution: {integrity: sha512-si++xzRAY9iPp60roQiFta7OFbhrgvcthrhlNAGeQptSY25uJjkfUV8OArC3KLocB8JT8ohz+qgxWCmz8RhjIg==}
+
+  csv-generate@3.4.3:
+    resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==}
+
+  csv-parse@4.16.3:
+    resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==}
+
+  csv-stringify@5.6.5:
+    resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==}
+
+  csv@5.5.3:
+    resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==}
+    engines: {node: '>= 0.1.90'}
+
+  cuid@2.1.8:
+    resolution: {integrity: sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==}
+    deprecated: Cuid and other k-sortable and non-cryptographic ids (Ulid, ObjectId, KSUID, all UUIDs) are all insecure. Use @paralleldrive/cuid2 instead.
+
+  cytoscape-cose-bilkent@4.1.0:
+    resolution: {integrity: sha512-wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==}
+    peerDependencies:
+      cytoscape: ^3.2.0
+
+  cytoscape-fcose@2.2.0:
+    resolution: {integrity: sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==}
+    peerDependencies:
+      cytoscape: ^3.2.0
+
+  cytoscape@3.33.1:
+    resolution: {integrity: sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==}
+    engines: {node: '>=0.10'}
+
+  d3-array@2.12.1:
+    resolution: {integrity: sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==}
+
+  d3-array@3.2.4:
+    resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
+    engines: {node: '>=12'}
+
+  d3-axis@3.0.0:
+    resolution: {integrity: sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==}
+    engines: {node: '>=12'}
+
+  d3-brush@3.0.0:
+    resolution: {integrity: sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==}
+    engines: {node: '>=12'}
+
+  d3-chord@3.0.1:
+    resolution: {integrity: sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==}
+    engines: {node: '>=12'}
+
+  d3-color@3.1.0:
+    resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
+    engines: {node: '>=12'}
+
+  d3-contour@4.0.2:
+    resolution: {integrity: sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==}
+    engines: {node: '>=12'}
+
+  d3-delaunay@6.0.4:
+    resolution: {integrity: sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==}
+    engines: {node: '>=12'}
+
+  d3-dispatch@3.0.1:
+    resolution: {integrity: sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==}
+    engines: {node: '>=12'}
+
+  d3-drag@3.0.0:
+    resolution: {integrity: sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==}
+    engines: {node: '>=12'}
+
+  d3-dsv@3.0.1:
+    resolution: {integrity: sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  d3-ease@3.0.1:
+    resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
+    engines: {node: '>=12'}
+
+  d3-fetch@3.0.1:
+    resolution: {integrity: sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==}
+    engines: {node: '>=12'}
+
+  d3-force@3.0.0:
+    resolution: {integrity: sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==}
+    engines: {node: '>=12'}
+
+  d3-format@3.1.0:
+    resolution: {integrity: sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==}
+    engines: {node: '>=12'}
+
+  d3-geo@3.1.1:
+    resolution: {integrity: sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==}
+    engines: {node: '>=12'}
+
+  d3-hierarchy@3.1.2:
+    resolution: {integrity: sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==}
+    engines: {node: '>=12'}
+
+  d3-interpolate@3.0.1:
+    resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
+    engines: {node: '>=12'}
+
+  d3-path@1.0.9:
+    resolution: {integrity: sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==}
+
+  d3-path@3.1.0:
+    resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
+    engines: {node: '>=12'}
+
+  d3-polygon@3.0.1:
+    resolution: {integrity: sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==}
+    engines: {node: '>=12'}
+
+  d3-quadtree@3.0.1:
+    resolution: {integrity: sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==}
+    engines: {node: '>=12'}
+
+  d3-random@3.0.1:
+    resolution: {integrity: sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==}
+    engines: {node: '>=12'}
+
+  d3-sankey@0.12.3:
+    resolution: {integrity: sha512-nQhsBRmM19Ax5xEIPLMY9ZmJ/cDvd1BG3UVvt5h3WRxKg5zGRbvnteTyWAbzeSvlh3tW7ZEmq4VwR5mB3tutmQ==}
+
+  d3-scale-chromatic@3.1.0:
+    resolution: {integrity: sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ==}
+    engines: {node: '>=12'}
+
+  d3-scale@4.0.2:
+    resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
+    engines: {node: '>=12'}
+
+  d3-selection@3.0.0:
+    resolution: {integrity: sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==}
+    engines: {node: '>=12'}
+
+  d3-shape@1.3.7:
+    resolution: {integrity: sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==}
+
+  d3-shape@3.2.0:
+    resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
+    engines: {node: '>=12'}
+
+  d3-time-format@4.1.0:
+    resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==}
+    engines: {node: '>=12'}
+
+  d3-time@3.1.0:
+    resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
+    engines: {node: '>=12'}
+
+  d3-timer@3.0.1:
+    resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
+    engines: {node: '>=12'}
+
+  d3-transition@3.0.1:
+    resolution: {integrity: sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      d3-selection: 2 - 3
+
+  d3-zoom@3.0.0:
+    resolution: {integrity: sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==}
+    engines: {node: '>=12'}
+
+  d3@7.9.0:
+    resolution: {integrity: sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==}
+    engines: {node: '>=12'}
+
+  dagre-d3-es@7.0.11:
+    resolution: {integrity: sha512-tvlJLyQf834SylNKax8Wkzco/1ias1OPw8DcUMDE7oUIoSEW25riQVuiu/0OWEFqT0cxHT3Pa9/D82Jr47IONw==}
+
+  damerau-levenshtein@1.0.8:
+    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
+
+  dashdash@1.14.1:
+    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
+    engines: {node: '>=0.10'}
+
+  data-uri-to-buffer@3.0.1:
+    resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==}
+    engines: {node: '>= 6'}
+
+  data-uri-to-buffer@5.0.1:
+    resolution: {integrity: sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==}
+    engines: {node: '>= 14'}
+
+  data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+
+  dataloader@1.4.0:
+    resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
+
+  date-fns-jalali@4.1.0-0:
+    resolution: {integrity: sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==}
+
+  date-fns@4.1.0:
+    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
+
+  dayjs@1.11.18:
+    resolution: {integrity: sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==}
+
+  debounce@1.2.1:
+    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
+
+  debounce@2.0.0:
+    resolution: {integrity: sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==}
+    engines: {node: '>=18'}
+
+  debug@2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@3.2.7:
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.4:
+    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.6:
+    resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.7:
+    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.1:
+    resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.4.3:
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decamelize-keys@1.1.1:
+    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
+    engines: {node: '>=0.10.0'}
+
+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
+  decimal.js-light@2.5.1:
+    resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
+
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
+  decode-named-character-reference@1.0.2:
+    resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
+
+  decompress-response@3.3.0:
+    resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==}
+    engines: {node: '>=4'}
+
+  decompress-response@6.0.0:
+    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+    engines: {node: '>=10'}
+
+  deep-eql@5.0.2:
+    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
+    engines: {node: '>=6'}
+
+  deep-extend@0.6.0:
+    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+    engines: {node: '>=4.0.0'}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  deep-object-diff@1.1.9:
+    resolution: {integrity: sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==}
+
+  deepmerge-ts@7.1.5:
+    resolution: {integrity: sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==}
+    engines: {node: '>=16.0.0'}
+
+  deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+
+  default-browser-id@5.0.0:
+    resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==}
+    engines: {node: '>=18'}
+
+  default-browser@5.2.1:
+    resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==}
+    engines: {node: '>=18'}
+
+  defaults@1.0.4:
+    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+
+  defer-to-connect@1.1.3:
+    resolution: {integrity: sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-lazy-prop@2.0.0:
+    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
+    engines: {node: '>=8'}
+
+  define-lazy-prop@3.0.0:
+    resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
+    engines: {node: '>=12'}
+
+  define-properties@1.1.4:
+    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
+    engines: {node: '>= 0.4'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  defined@1.0.1:
+    resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
+
+  defu@6.1.4:
+    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
+
+  degenerator@5.0.1:
+    resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==}
+    engines: {node: '>= 14'}
+
+  delaunator@5.0.1:
+    resolution: {integrity: sha512-8nvh+XBe96aCESrGOqMp/84b13H9cdKbG5P2ejQCh4d4sK9RL4371qou9drQjMhvnPmhWl5hnmqbEE0fXr9Xnw==}
+
+  delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
+  denque@2.1.0:
+    resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
+    engines: {node: '>=0.10'}
+
+  depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
+
+  deprecation@2.3.1:
+    resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==}
+
+  dequal@2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
+
+  destr@2.0.3:
+    resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
+
+  destroy@1.2.0:
+    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+
+  detect-indent@6.1.0:
+    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
+    engines: {node: '>=8'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
+    engines: {node: '>=8'}
+
+  detect-node-es@1.1.0:
+    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
+
+  detective@5.2.1:
+    resolution: {integrity: sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==}
+    engines: {node: '>=0.8.0'}
+    hasBin: true
+
+  devlop@1.1.0:
+    resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
+
+  devtools-protocol@0.0.1464554:
+    resolution: {integrity: sha512-CAoP3lYfwAGQTaAXYvA6JZR0fjGUb7qec1qf4mToyoH2TZgUFeIqYcjh6f9jNuhHfuZiEdH+PONHYrLhRQX6aw==}
+
+  dezalgo@1.0.4:
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+
+  didyoumean@1.2.2:
+    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
+
+  diff-match-patch@1.0.5:
+    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
+
+  diff@5.1.0:
+    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
+    engines: {node: '>=0.3.1'}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  discontinuous-range@1.0.0:
+    resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
+
+  dlv@1.1.3:
+    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
+
+  docker-compose@0.24.8:
+    resolution: {integrity: sha512-plizRs/Vf15H+GCVxq2EUvyPK7ei9b/cVesHvjnX4xaXjM9spHe2Ytq0BitndFgvTJ3E3NljPNUEl7BAN43iZw==}
+    engines: {node: '>= 6.0.0'}
+
+  docker-modem@5.0.6:
+    resolution: {integrity: sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==}
+    engines: {node: '>= 8.0'}
+
+  dockerode@4.0.6:
+    resolution: {integrity: sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==}
+    engines: {node: '>= 8.0'}
+
+  doctrine@2.1.0:
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
+
+  doctrine@3.0.0:
+    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
+    engines: {node: '>=6.0.0'}
+
+  dom-accessibility-api@0.5.15:
+    resolution: {integrity: sha512-8o+oVqLQZoruQPYy3uAAQtc6YbtSiRq5aPJBhJ82YTJRHvI6ofhYAkC81WmjFTnfUbqg6T3aCglIpU9p/5e7Cw==}
+
+  dom-accessibility-api@0.6.3:
+    resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
+
+  dom-helpers@5.2.1:
+    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
+
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  dompurify@3.2.6:
+    resolution: {integrity: sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==}
+
+  domutils@3.0.1:
+    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
+
+  dotenv@16.0.3:
+    resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
+    engines: {node: '>=12'}
+
+  dotenv@16.4.4:
+    resolution: {integrity: sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==}
+    engines: {node: '>=12'}
+
+  dotenv@16.4.5:
+    resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
+    engines: {node: '>=12'}
+
+  dotenv@16.4.7:
+    resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
+    engines: {node: '>=12'}
+
+  dotenv@16.6.1:
+    resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
+    engines: {node: '>=12'}
+
+  dotenv@17.2.3:
+    resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
+    engines: {node: '>=12'}
+
+  dotenv@8.6.0:
+    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
+    engines: {node: '>=10'}
+
+  dprint-node@1.0.8:
+    resolution: {integrity: sha512-iVKnUtYfGrYcW1ZAlfR/F59cUVL8QIhWoBJoSjkkdua/dkWIgjZfiLMeTjiB06X0ZLkQ0M2C1VbUj/CxkIf1zg==}
+
+  dunder-proto@1.0.1:
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
+
+  duplexer3@0.1.5:
+    resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
+
+  duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
+
+  duplexify@3.7.1:
+    resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
+
+  duplexify@4.1.3:
+    resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==}
+
+  e2b@1.2.1:
+    resolution: {integrity: sha512-ii/Bw55ecxgORqkArKNbuVTwqLgVZ0rH1X3J/NOe4LMZaVETm3qNpPBjoPkpQAsQjw2ew0Ad2sd54epqm9nLCw==}
+    engines: {node: '>=18'}
+
+  eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+
+  ecc-jsbn@0.1.2:
+    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
+
+  ecdsa-sig-formatter@1.0.11:
+    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
+
+  editorconfig@1.0.4:
+    resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  ee-first@1.1.1:
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+
+  effect@3.11.7:
+    resolution: {integrity: sha512-laj+TCxWGn0eOv6jNmS9vavMO01Z4vvRr7v5airaOUfE7Zr5PrHiECpiI5HRvOewxa1im/4EcOvRodOZ1S2Y7Q==}
+
+  effect@3.16.12:
+    resolution: {integrity: sha512-N39iBk0K71F9nb442TLbTkjl24FLUzuvx2i1I2RsEAQsdAdUTuUoW0vlfUXgkMTUOnYqKnWcFfqw4hK4Pw27hg==}
+
+  effect@3.17.1:
+    resolution: {integrity: sha512-t917ks10FGNf7MpwOxHUg6vo42p0XsdMHuBMVpy4NttPu5gIv8/ah5MgbHLVQJ2kmDvZfQUT1/xyCa1IR09u2Q==}
+
+  effect@3.18.4:
+    resolution: {integrity: sha512-b1LXQJLe9D11wfnOKAk3PKxuqYshQ0Heez+y5pnkd3jLj1yx9QhM72zZ9uUrOQyNvrs2GZZd/3maL0ZV18YuDA==}
+
+  effect@3.7.2:
+    resolution: {integrity: sha512-pV7l1+LSZFvVObj4zuy4nYiBaC7qZOfrKV6s/Ef4p3KueiQwZFgamazklwyZ+x7Nyj2etRDFvHE/xkThTfQD1w==}
+
+  electron-to-chromium@1.4.433:
+    resolution: {integrity: sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ==}
+
+  electron-to-chromium@1.5.252:
+    resolution: {integrity: sha512-53uTpjtRgS7gjIxZ4qCgFdNO2q+wJt/Z8+xAvxbCqXPJrY6h7ighUkadQmNMXH96crtpa6gPFNP7BF4UBGDuaA==}
+
+  electron-to-chromium@1.5.98:
+    resolution: {integrity: sha512-bI/LbtRBxU2GzK7KK5xxFd2y9Lf9XguHooPYbcXWy6wUoT8NMnffsvRhPmSeUHLSDKAEtKuTaEtK4Ms15zkIEA==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
+  emojilib@2.4.0:
+    resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==}
+
+  empathic@2.0.0:
+    resolution: {integrity: sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==}
+    engines: {node: '>=14'}
+
+  encodeurl@1.0.2:
+    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
+    engines: {node: '>= 0.8'}
+
+  encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+
+  encoding@0.1.13:
+    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
+
+  end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+
+  engine.io-client@6.5.3:
+    resolution: {integrity: sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==}
+
+  engine.io-parser@5.2.2:
+    resolution: {integrity: sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==}
+    engines: {node: '>=10.0.0'}
+
+  engine.io@6.5.4:
+    resolution: {integrity: sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==}
+    engines: {node: '>=10.2.0'}
+
+  enhanced-resolve@5.15.0:
+    resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==}
+    engines: {node: '>=10.13.0'}
+
+  enhanced-resolve@5.18.3:
+    resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
+    engines: {node: '>=10.13.0'}
+
+  enquirer@2.3.6:
+    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
+    engines: {node: '>=8.6'}
+
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
+  entities@6.0.1:
+    resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
+    engines: {node: '>=0.12'}
+
+  env-paths@2.2.1:
+    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
+    engines: {node: '>=6'}
+
+  environment@1.1.0:
+    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
+    engines: {node: '>=18'}
+
+  err-code@2.0.3:
+    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
+
+  error-ex@1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+
+  error-stack-parser@2.1.4:
+    resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==}
+
+  es-abstract@1.21.1:
+    resolution: {integrity: sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==}
+    engines: {node: '>= 0.4'}
+
+  es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.1:
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-module-lexer@1.7.0:
+    resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
+
+  es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+
+  es-object-atoms@1.1.1:
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.0.1:
+    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.1.0:
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
+
+  es-shim-unscopables@1.0.0:
+    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
+
+  es-shim-unscopables@1.0.2:
+    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+
+  es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+
+  esbuild-android-64@0.15.18:
+    resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [android]
+
+  esbuild-android-arm64@0.15.18:
+    resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [android]
+
+  esbuild-darwin-64@0.15.18:
+    resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [darwin]
+
+  esbuild-darwin-arm64@0.15.18:
+    resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [darwin]
+
+  esbuild-freebsd-64@0.15.18:
+    resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [freebsd]
+
+  esbuild-freebsd-arm64@0.15.18:
+    resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  esbuild-linux-32@0.15.18:
+    resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [linux]
+
+  esbuild-linux-64@0.15.18:
+    resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [linux]
+
+  esbuild-linux-arm64@0.15.18:
+    resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [linux]
+
+  esbuild-linux-arm@0.15.18:
+    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
+  esbuild-linux-mips64le@0.15.18:
+    resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
+    engines: {node: '>=12'}
+    cpu: [mips64el]
+    os: [linux]
+
+  esbuild-linux-ppc64le@0.15.18:
+    resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
+    engines: {node: '>=12'}
+    cpu: [ppc64]
+    os: [linux]
+
+  esbuild-linux-riscv64@0.15.18:
+    resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
+    engines: {node: '>=12'}
+    cpu: [riscv64]
+    os: [linux]
+
+  esbuild-linux-s390x@0.15.18:
+    resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
+    engines: {node: '>=12'}
+    cpu: [s390x]
+    os: [linux]
+
+  esbuild-netbsd-64@0.15.18:
+    resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [netbsd]
+
+  esbuild-openbsd-64@0.15.18:
+    resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [openbsd]
+
+  esbuild-plugins-node-modules-polyfill@1.6.1:
+    resolution: {integrity: sha512-6sAwI24PV8W0zxeO+i4BS5zoQypS3SzEGwIdxpzpy65riRuK8apMw8PN0aKVLCTnLr0FgNIxUMRd9BsreBrtog==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      esbuild: ^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0
+
+  esbuild-sunos-64@0.15.18:
+    resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [sunos]
+
+  esbuild-windows-32@0.15.18:
+    resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
+    engines: {node: '>=12'}
+    cpu: [ia32]
+    os: [win32]
+
+  esbuild-windows-64@0.15.18:
+    resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
+    engines: {node: '>=12'}
+    cpu: [x64]
+    os: [win32]
+
+  esbuild-windows-arm64@0.15.18:
+    resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
+    engines: {node: '>=12'}
+    cpu: [arm64]
+    os: [win32]
+
+  esbuild@0.15.18:
+    resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.17.6:
+    resolution: {integrity: sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.18.11:
+    resolution: {integrity: sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.19.11:
+    resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.23.0:
+    resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  esbuild@0.24.2:
+    resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  esbuild@0.25.1:
+    resolution: {integrity: sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  escape-string-regexp@5.0.0:
+    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
+    engines: {node: '>=12'}
+
+  escodegen@2.1.0:
+    resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
+    engines: {node: '>=6.0'}
+    hasBin: true
+
+  eslint-config-prettier@8.6.0:
+    resolution: {integrity: sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-config-prettier@9.0.0:
+    resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-config-turbo@1.10.12:
+    resolution: {integrity: sha512-z3jfh+D7UGYlzMWGh+Kqz++hf8LOE96q3o5R8X4HTjmxaBWlLAWG+0Ounr38h+JLR2TJno0hU9zfzoPNkR9BdA==}
+    peerDependencies:
+      eslint: '>6.6.0'
+
+  eslint-import-resolver-node@0.3.7:
+    resolution: {integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==}
+
+  eslint-import-resolver-node@0.3.9:
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+
+  eslint-import-resolver-typescript@3.5.5:
+    resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '*'
+      eslint-plugin-import: '*'
+
+  eslint-module-utils@2.7.4:
+    resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-module-utils@2.8.1:
+    resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: '*'
+      eslint-import-resolver-node: '*'
+      eslint-import-resolver-typescript: '*'
+      eslint-import-resolver-webpack: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+      eslint:
+        optional: true
+      eslint-import-resolver-node:
+        optional: true
+      eslint-import-resolver-typescript:
+        optional: true
+      eslint-import-resolver-webpack:
+        optional: true
+
+  eslint-plugin-es@3.0.1:
+    resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==}
+    engines: {node: '>=8.10.0'}
+    peerDependencies:
+      eslint: '>=4.19.1'
+
+  eslint-plugin-import@2.29.1:
+    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      '@typescript-eslint/parser': '*'
+      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+    peerDependenciesMeta:
+      '@typescript-eslint/parser':
+        optional: true
+
+  eslint-plugin-jest-dom@4.0.3:
+    resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
+    peerDependencies:
+      eslint: ^6.8.0 || ^7.0.0 || ^8.0.0
+
+  eslint-plugin-jest@26.9.0:
+    resolution: {integrity: sha512-TWJxWGp1J628gxh2KhaH1H1paEdgE2J61BBF1I59c6xWeL5+D1BzMxGDN/nXAfX+aSkR5u80K+XhskK6Gwq9ng==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      '@typescript-eslint/eslint-plugin': ^5.0.0
+      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+      jest: '*'
+    peerDependenciesMeta:
+      '@typescript-eslint/eslint-plugin':
+        optional: true
+      jest:
+        optional: true
+
+  eslint-plugin-jsx-a11y@6.7.1:
+    resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+
+  eslint-plugin-node@11.1.0:
+    resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==}
+    engines: {node: '>=8.10.0'}
+    peerDependencies:
+      eslint: '>=5.16.0'
+
+  eslint-plugin-react-hooks@4.6.2:
+    resolution: {integrity: sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+
+  eslint-plugin-react@7.32.2:
+    resolution: {integrity: sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==}
+    engines: {node: '>=4'}
+    peerDependencies:
+      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+
+  eslint-plugin-testing-library@5.11.0:
+    resolution: {integrity: sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'}
+    peerDependencies:
+      eslint: ^7.5.0 || ^8.0.0
+
+  eslint-plugin-turbo@1.10.12:
+    resolution: {integrity: sha512-uNbdj+ohZaYo4tFJ6dStRXu2FZigwulR1b3URPXe0Q8YaE7thuekKNP+54CHtZPH9Zey9dmDx5btAQl9mfzGOw==}
+    peerDependencies:
+      eslint: '>6.6.0'
+
+  eslint-plugin-turbo@2.0.5:
+    resolution: {integrity: sha512-nCTXZdaKmdRybBdjnMrDFG+ppLc9toUqB01Hf0pfhkQw8OoC29oJIVPsCSvuL/W58RKD02CNEUrwnVt57t36IQ==}
+    peerDependencies:
+      eslint: '>6.6.0'
+
+  eslint-scope@5.1.1:
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
+
+  eslint-scope@7.1.1:
+    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-utils@2.1.0:
+    resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
+    engines: {node: '>=6'}
+
+  eslint-utils@3.0.0:
+    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
+    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
+    peerDependencies:
+      eslint: '>=5'
+
+  eslint-visitor-keys@1.3.0:
+    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
+    engines: {node: '>=4'}
+
+  eslint-visitor-keys@2.1.0:
+    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
+    engines: {node: '>=10'}
+
+  eslint-visitor-keys@3.3.0:
+    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@3.4.2:
+    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint@8.31.0:
+    resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
+    hasBin: true
+
+  espree@9.4.1:
+    resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  espree@9.6.0:
+    resolution: {integrity: sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esprima@4.0.1:
+    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  esquery@1.4.0:
+    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@4.3.0:
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  estree-util-attach-comments@2.1.0:
+    resolution: {integrity: sha512-rJz6I4L0GaXYtHpoMScgDIwM0/Vwbu5shbMeER596rB2D1EWF6+Gj0e0UKzJPZrpoOc87+Q2kgVFHfjAymIqmw==}
+
+  estree-util-build-jsx@2.2.2:
+    resolution: {integrity: sha512-m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg==}
+
+  estree-util-is-identifier-name@1.1.0:
+    resolution: {integrity: sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==}
+
+  estree-util-is-identifier-name@2.0.1:
+    resolution: {integrity: sha512-rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ==}
+
+  estree-util-is-identifier-name@3.0.0:
+    resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
+
+  estree-util-to-js@1.2.0:
+    resolution: {integrity: sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==}
+
+  estree-util-value-to-estree@1.3.0:
+    resolution: {integrity: sha512-Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw==}
+    engines: {node: '>=12.0.0'}
+
+  estree-util-visit@1.2.0:
+    resolution: {integrity: sha512-wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg==}
+
+  estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
+
+  eval@0.1.6:
+    resolution: {integrity: sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==}
+    engines: {node: '>= 0.8'}
+
+  evalite@0.11.4:
+    resolution: {integrity: sha512-t12sJlfkxo0Hon6MYCwOd2qliAjGObrnGL6hYXP9h8AiNAVQCiyGrFrqtOH8TIhM0kgaGrq3s/DeZ679Sr8ipw==}
+    hasBin: true
+
+  event-target-shim@5.0.1:
+    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
+    engines: {node: '>=6'}
+
+  event-target-shim@6.0.2:
+    resolution: {integrity: sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA==}
+    engines: {node: '>=10.13.0'}
+
+  eventemitter3@4.0.7:
+    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
+
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+
+  events@3.3.0:
+    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
+    engines: {node: '>=0.8.x'}
+
+  eventsource-parser@1.1.2:
+    resolution: {integrity: sha512-v0eOBUbiaFojBu2s2NPBfYUoRR9GjcDNvCXVaqEf5vVfpIAh9f8RCo4vXTP8c63QRKCFwoLpMpTdPwwhEKVgzA==}
+    engines: {node: '>=14.18'}
+
+  eventsource-parser@3.0.0:
+    resolution: {integrity: sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==}
+    engines: {node: '>=18.0.0'}
+
+  eventsource-parser@3.0.3:
+    resolution: {integrity: sha512-nVpZkTMM9rF6AQ9gPJpFsNAMt48wIzB5TQgiTLdHiuO8XEDhUgZEhqKlZWXbIzo9VmJ/HvysHqEaVeD5v9TPvA==}
+    engines: {node: '>=20.0.0'}
+
+  eventsource-parser@3.0.6:
+    resolution: {integrity: sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==}
+    engines: {node: '>=18.0.0'}
+
+  eventsource@3.0.5:
+    resolution: {integrity: sha512-LT/5J605bx5SNyE+ITBDiM3FxffBiq9un7Vx0EwMDM3vg8sWKx/tO2zC+LMqZ+smAM0F2hblaDZUVZF0te2pSw==}
+    engines: {node: '>=18.0.0'}
+
+  eventsource@4.0.0:
+    resolution: {integrity: sha512-fvIkb9qZzdMxgZrEQDyll+9oJsyaVvY92I2Re+qK0qEJ+w5s0X3dtz+M0VAPOjP1gtU3iqWyjQ0G3nvd5CLZ2g==}
+    engines: {node: '>=20.0.0'}
+
+  evt@2.4.13:
+    resolution: {integrity: sha512-haTVOsmjzk+28zpzvVwan9Zw2rLQF2izgi7BKjAPRzZAfcv+8scL0TpM8MzvGNKFYHiy+Bq3r6FYIIUPl9kt3A==}
+
+  execa@5.1.1:
+    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
+    engines: {node: '>=10'}
+
+  execa@8.0.1:
+    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
+    engines: {node: '>=16.17'}
+
+  execa@9.6.1:
+    resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
+    engines: {node: ^18.19.0 || >=20.5.0}
+
+  exit-hook@2.2.1:
+    resolution: {integrity: sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==}
+    engines: {node: '>=6'}
+
+  expand-template@2.0.3:
+    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+    engines: {node: '>=6'}
+
+  expect-type@1.2.1:
+    resolution: {integrity: sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==}
+    engines: {node: '>=12.0.0'}
+
+  express-rate-limit@7.5.0:
+    resolution: {integrity: sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: ^4.11 || 5 || ^5.0.0-beta.1
+
+  express-rate-limit@8.2.1:
+    resolution: {integrity: sha512-PCZEIEIxqwhzw4KF0n7QF4QqruVTcF73O5kFKUnGOyjbCCgizBBiFaYpd/fnBLUMPw/BWw9OsiN7GgrNYr7j6g==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      express: '>= 4.11'
+
+  express@4.20.0:
+    resolution: {integrity: sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==}
+    engines: {node: '>= 0.10.0'}
+
+  express@5.0.1:
+    resolution: {integrity: sha512-ORF7g6qGnD+YtUG9yx4DFoqCShNMmUKiXuT5oWMHiOvt/4WFbHC6yCwQMTSBMno7AqntNCAzzcnnjowRkTL9eQ==}
+    engines: {node: '>= 18'}
+
+  express@5.2.1:
+    resolution: {integrity: sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==}
+    engines: {node: '>= 18'}
+
+  exsolve@1.0.7:
+    resolution: {integrity: sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==}
+
+  extend@3.0.2:
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+
+  extendable-error@0.1.7:
+    resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==}
+
+  external-editor@3.1.0:
+    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
+    engines: {node: '>=4'}
+
+  extract-zip@2.0.1:
+    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
+    engines: {node: '>= 10.17.0'}
+    hasBin: true
+
+  extsprintf@1.3.0:
+    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
+    engines: {'0': node >=0.6.0}
+
+  fast-check@3.22.0:
+    resolution: {integrity: sha512-8HKz3qXqnHYp/VCNn2qfjHdAdcI8zcSqOyX64GOMukp7SL2bfzfeDKjSd+UyECtejccaZv3LcvZTm9YDD22iCQ==}
+    engines: {node: '>=8.0.0'}
+
+  fast-check@3.23.2:
+    resolution: {integrity: sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==}
+    engines: {node: '>=8.0.0'}
+
+  fast-decode-uri-component@1.0.1:
+    resolution: {integrity: sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-equals@4.0.3:
+    resolution: {integrity: sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==}
+
+  fast-equals@5.0.1:
+    resolution: {integrity: sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==}
+    engines: {node: '>=6.0.0'}
+
+  fast-fifo@1.3.2:
+    resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
+
+  fast-glob@3.3.3:
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-json-stringify@6.0.1:
+    resolution: {integrity: sha512-s7SJE83QKBZwg54dIbD5rCtzOBVD43V1ReWXXYqBgwCwHLYAAT0RQc/FmrQglXqWPpz6omtryJQOau5jI4Nrvg==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-npm-meta@0.2.2:
+    resolution: {integrity: sha512-E+fdxeaOQGo/CMWc9f4uHFfgUPJRAu7N3uB8GBvB3SDPAIWJK4GKyYhkAGFq+GYrcbKNfQIz5VVQyJnDuPPCrg==}
+
+  fast-querystring@1.1.2:
+    resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==}
+
+  fast-redact@3.5.0:
+    resolution: {integrity: sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==}
+    engines: {node: '>=6'}
+
+  fast-safe-stringify@2.1.1:
+    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
+
+  fast-shallow-equal@1.0.0:
+    resolution: {integrity: sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==}
+
+  fast-uri@3.0.6:
+    resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}
+
+  fast-url-parser@1.1.3:
+    resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==}
+
+  fast-xml-parser@4.2.5:
+    resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
+    hasBin: true
+
+  fast-xml-parser@4.4.1:
+    resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==}
+    hasBin: true
+
+  fast-xml-parser@5.2.5:
+    resolution: {integrity: sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==}
+    hasBin: true
+
+  fastest-stable-stringify@2.0.2:
+    resolution: {integrity: sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==}
+
+  fastify-plugin@5.0.1:
+    resolution: {integrity: sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==}
+
+  fastify@5.4.0:
+    resolution: {integrity: sha512-I4dVlUe+WNQAhKSyv15w+dwUh2EPiEl4X2lGYMmNSgF83WzTMAPKGdWEv5tPsCQOb+SOZwz8Vlta2vF+OeDgRw==}
+
+  fastq@1.15.0:
+    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
+
+  fastq@1.19.1:
+    resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
+
+  fault@2.0.1:
+    resolution: {integrity: sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==}
+
+  fd-slicer@1.1.0:
+    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+
+  fdir@6.2.0:
+    resolution: {integrity: sha512-9XaWcDl0riOX5j2kYfy0kKdg7skw3IY6kA4LFT8Tk2yF9UdrADUy8D6AJuBLtf7ISm/MksumwAHE3WVbMRyCLw==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  fdir@6.4.3:
+    resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  fdir@6.4.4:
+    resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  fflate@0.4.8:
+    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
+
+  fflate@0.8.2:
+    resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
+
+  fft.js@4.0.4:
+    resolution: {integrity: sha512-f9c00hphOgeQTlDyavwTtu6RiK8AIFjD6+jvXkNkpeQ7rirK3uFWVpalkoS4LAwbdX7mfZ8aoBfFVQX1Re/8aw==}
+
+  figures@6.1.0:
+    resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
+    engines: {node: '>=18'}
+
+  file-entry-cache@6.0.1:
+    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  file-selector@0.6.0:
+    resolution: {integrity: sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==}
+    engines: {node: '>= 12'}
+
+  file-type@19.6.0:
+    resolution: {integrity: sha512-VZR5I7k5wkD0HgFnMsq5hOsSc710MJMu5Nc5QYsbe38NN5iPV/XTObYLc/cpttRTf6lX538+5uO1ZQRhYibiZQ==}
+    engines: {node: '>=18'}
+
+  file-uri-to-path@1.0.0:
+    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  finalhandler@1.2.0:
+    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
+    engines: {node: '>= 0.8'}
+
+  finalhandler@2.1.0:
+    resolution: {integrity: sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==}
+    engines: {node: '>= 0.8'}
+
+  find-my-way-ts@0.1.5:
+    resolution: {integrity: sha512-4GOTMrpGQVzsCH2ruUn2vmwzV/02zF4q+ybhCIrw/Rkt3L8KWcycdC6aJMctJzwN4fXD4SD5F/4B9Sksh5rE0A==}
+
+  find-my-way@9.3.0:
+    resolution: {integrity: sha512-eRoFWQw+Yv2tuYlK2pjFS2jGXSxSppAs3hSQjfxVKxM5amECzIgYYc1FEI8ZmhSh/Ig+FrKEz43NLRKJjYCZVg==}
+    engines: {node: '>=20'}
+
+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  find-up@7.0.0:
+    resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==}
+    engines: {node: '>=18'}
+
+  find-yarn-workspace-root2@1.2.16:
+    resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==}
+
+  flat-cache@3.0.4:
+    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
+    engines: {node: ^10.12.0 || >=12.0.0}
+
+  flatted@3.2.7:
+    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
+
+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
+  for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+
+  foreground-child@3.1.1:
+    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
+    engines: {node: '>=14'}
+
+  forever-agent@0.6.1:
+    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
+
+  form-data-encoder@1.7.2:
+    resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}
+
+  form-data@2.5.4:
+    resolution: {integrity: sha512-Y/3MmRiR8Nd+0CUtrbvcKtKzLWiUfpQ7DFVggH8PwmGt/0r7RSy32GuP4hpCJlQNEBusisSx1DLtD8uD386HJQ==}
+    engines: {node: '>= 0.12'}
+    deprecated: This version has an incorrect dependency; please use v2.5.5
+
+  form-data@3.0.4:
+    resolution: {integrity: sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==}
+    engines: {node: '>= 6'}
+
+  form-data@4.0.4:
+    resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
+    engines: {node: '>= 6'}
+
+  format@0.2.2:
+    resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}
+    engines: {node: '>=0.4.x'}
+
+  formdata-node@4.4.1:
+    resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}
+    engines: {node: '>= 12.20'}
+
+  formidable@3.5.1:
+    resolution: {integrity: sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==}
+
+  forwarded-parse@2.1.2:
+    resolution: {integrity: sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==}
+
+  forwarded@0.2.0:
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
+
+  fraction.js@4.2.0:
+    resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
+
+  fraction.js@4.3.7:
+    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
+
+  framer-motion@10.12.11:
+    resolution: {integrity: sha512-uNsJAc/BQZ9V7tYgzRBXSrEdB+YrdJTtRvgn+8lNAQucGKaINJBL8I4aqXxXdw+HzwJZb/uR955jnOrxBy5sTA==}
+    peerDependencies:
+      react: ^18.0.0
+      react-dom: ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
+  framer-motion@10.17.4:
+    resolution: {integrity: sha512-CYBSs6cWfzcasAX8aofgKFZootmkQtR4qxbfTOksBLny/lbUfkGbQAFOS3qnl6Uau1N9y8tUpI7mVIrHgkFjLQ==}
+    peerDependencies:
+      react: ^18.0.0
+      react-dom: ^18.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
+
+  fresh@0.5.2:
+    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
+    engines: {node: '>= 0.6'}
+
+  fresh@2.0.0:
+    resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
+    engines: {node: '>= 0.8'}
+
+  fs-constants@1.0.0:
+    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
+  fs-extra@10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
+    engines: {node: '>=12'}
+
+  fs-extra@7.0.1:
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
+
+  fs-extra@8.1.0:
+    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
+    engines: {node: '>=6 <7 || >=8'}
+
+  fs-minipass@2.1.0:
+    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
+    engines: {node: '>= 8'}
+
+  fs-minipass@3.0.3:
+    resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.5:
+    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
+    engines: {node: '>= 0.4'}
+
+  function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  generic-names@4.0.0:
+    resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==}
+
+  gensync@1.0.0-beta.2:
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
+
+  get-intrinsic@1.3.0:
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
+
+  get-nonce@1.0.1:
+    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
+    engines: {node: '>=6'}
+
+  get-port@5.1.1:
+    resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
+    engines: {node: '>=8'}
+
+  get-port@7.1.0:
+    resolution: {integrity: sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==}
+    engines: {node: '>=16'}
+
+  get-proto@1.0.1:
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
+
+  get-stream@4.1.0:
+    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
+    engines: {node: '>=6'}
+
+  get-stream@5.2.0:
+    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
+    engines: {node: '>=8'}
+
+  get-stream@6.0.1:
+    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
+    engines: {node: '>=10'}
+
+  get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+
+  get-stream@9.0.1:
+    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
+    engines: {node: '>=18'}
+
+  get-symbol-description@1.0.0:
+    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
+    engines: {node: '>= 0.4'}
+
+  get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
+
+  get-tsconfig@4.7.2:
+    resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==}
+
+  get-tsconfig@4.7.6:
+    resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==}
+
+  get-uri@6.0.1:
+    resolution: {integrity: sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==}
+    engines: {node: '>= 14'}
+
+  getpass@0.1.7:
+    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
+
+  giget@1.2.3:
+    resolution: {integrity: sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==}
+    hasBin: true
+
+  giget@2.0.0:
+    resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==}
+    hasBin: true
+
+  git-last-commit@1.0.1:
+    resolution: {integrity: sha512-FDSgeMqa7GnJDxt/q0AbrxbfeTyxp4ImxEw1e4nw6NUHA5FMhFUq33dTXI4Xdgcj1VQ1q5QLWF6WxFrJ8KCBOg==}
+
+  github-from-package@0.0.0:
+    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob-to-regexp@0.4.1:
+    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+
+  glob@10.3.10:
+    resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+
+  glob@10.3.4:
+    resolution: {integrity: sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+
+  glob@10.4.5:
+    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
+    hasBin: true
+
+  glob@11.0.0:
+    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  glob@9.3.5:
+    resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  globals@11.12.0:
+    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
+    engines: {node: '>=4'}
+
+  globals@13.19.0:
+    resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
+    engines: {node: '>=8'}
+
+  globals@15.15.0:
+    resolution: {integrity: sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==}
+    engines: {node: '>=18'}
+
+  globalthis@1.0.3:
+    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
+    engines: {node: '>= 0.4'}
+
+  globalyzer@0.1.0:
+    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
+
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+
+  globby@13.2.2:
+    resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  globrex@0.1.2:
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
+
+  gopd@1.2.0:
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
+
+  got@9.6.0:
+    resolution: {integrity: sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==}
+    engines: {node: '>=8.6'}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  gradient-string@2.0.2:
+    resolution: {integrity: sha512-rEDCuqUQ4tbD78TpzsMtt5OIf0cBCSDWSJtUDaF6JsAh+k0v9r++NzxNEG87oDZx9ZwGhD8DaezR2L/yrw0Jdw==}
+    engines: {node: '>=10'}
+
+  grapheme-splitter@1.0.4:
+    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
+
+  graphile-config@0.0.1-beta.8:
+    resolution: {integrity: sha512-H8MinryZewvUigVLnkVDhKJgHrcNYGcLvgYWfSnR1d6l76iV9E8m4ZfN9estSHKVm6cyHhRfHBfL1G5QfXmS5A==}
+    engines: {node: '>=16'}
+
+  graphile-worker@0.16.6:
+    resolution: {integrity: sha512-e7gGYDmGqzju2l83MpzX8vNG/lOtVJiSzI3eZpAFubSxh/cxs7sRrRGBGjzBP1kNG0H+c95etPpNRNlH65PYhw==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  graphql@16.6.0:
+    resolution: {integrity: sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==}
+    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
+
+  gunzip-maybe@1.4.2:
+    resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}
+    hasBin: true
+
+  gzip-size@6.0.0:
+    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
+    engines: {node: '>=10'}
+
+  hachure-fill@0.5.2:
+    resolution: {integrity: sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==}
+
+  har-schema@2.0.0:
+    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
+    engines: {node: '>=4'}
+
+  har-validator@5.1.5:
+    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
+    engines: {node: '>=6'}
+    deprecated: this library is no longer supported
+
+  hard-rejection@2.1.0:
+    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
+    engines: {node: '>=6'}
+
+  has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+
+  has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-flag@5.0.1:
+    resolution: {integrity: sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA==}
+    engines: {node: '>=12'}
+
+  has-own@1.0.1:
+    resolution: {integrity: sha512-RDKhzgQTQfMaLvIFhjahU+2gGnRBK6dYOd5Gd9BzkmnBneOCRYjRC003RIMrdAbH52+l+CnMS4bBCXGer8tEhg==}
+    deprecated: This project is not maintained. Use Object.hasOwn() instead.
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.1.0:
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  has@1.0.3:
+    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
+    engines: {node: '>= 0.4.0'}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  hast-util-from-dom@5.0.1:
+    resolution: {integrity: sha512-N+LqofjR2zuzTjCPzyDUdSshy4Ma6li7p/c3pA78uTwzFgENbgbUrm2ugwsOdcjI1muO+o6Dgzp9p8WHtn/39Q==}
+
+  hast-util-from-html-isomorphic@2.0.0:
+    resolution: {integrity: sha512-zJfpXq44yff2hmE0XmwEOzdWin5xwH+QIhMLOScpX91e/NSGPsAzNCvLQDIEPyO2TXi+lBmU6hjLIhV8MwP2kw==}
+
+  hast-util-from-html@2.0.3:
+    resolution: {integrity: sha512-CUSRHXyKjzHov8yKsQjGOElXy/3EKpyX56ELnkHH34vDVw1N1XSQ1ZcAvTyAPtGqLTuKP/uxM+aLkSPqF/EtMw==}
+
+  hast-util-from-parse5@8.0.3:
+    resolution: {integrity: sha512-3kxEVkEKt0zvcZ3hCRYI8rqrgwtlIOFMWkbclACvjlDw8Li9S2hk/d51OI0nr/gIpdMHNepwgOKqZ/sy0Clpyg==}
+
+  hast-util-is-element@3.0.0:
+    resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==}
+
+  hast-util-parse-selector@4.0.0:
+    resolution: {integrity: sha512-wkQCkSYoOGCRKERFWcxMVMOcYE2K1AaNLU8DXS9arxnLOUEWbOXKXiJUNzEpqZ3JOKpnha3jkFrumEjVliDe7A==}
+
+  hast-util-raw@9.1.0:
+    resolution: {integrity: sha512-Y8/SBAHkZGoNkpzqqfCldijcuUKh7/su31kEBp67cFY09Wy0mTRgtsLYsiIxMJxlu0f6AA5SUTbDR8K0rxnbUw==}
+
+  hast-util-to-estree@2.1.0:
+    resolution: {integrity: sha512-Vwch1etMRmm89xGgz+voWXvVHba2iiMdGMKmaMfYt35rbVtFDq8JNwwAIvi8zHMkO6Gvqo9oTMwJTmzVRfXh4g==}
+
+  hast-util-to-html@9.0.5:
+    resolution: {integrity: sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==}
+
+  hast-util-to-jsx-runtime@2.3.6:
+    resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==}
+
+  hast-util-to-parse5@8.0.0:
+    resolution: {integrity: sha512-3KKrV5ZVI8if87DVSi1vDeByYrkGzg4mEfeu4alwgmmIeARiBLKCZS2uw5Gb6nU9x9Yufyj3iudm6i7nl52PFw==}
+
+  hast-util-to-text@4.0.2:
+    resolution: {integrity: sha512-KK6y/BN8lbaq654j7JgBydev7wuNMcID54lkRav1P0CaE1e47P72AWWPiGKXTJU271ooYzcvTAn/Zt0REnvc7A==}
+
+  hast-util-whitespace@2.0.1:
+    resolution: {integrity: sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==}
+
+  hast-util-whitespace@3.0.0:
+    resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
+
+  hastscript@9.0.1:
+    resolution: {integrity: sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==}
+
+  hexoid@1.0.0:
+    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
+    engines: {node: '>=8'}
+
+  highlight.js@10.7.3:
+    resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
+
+  hoist-non-react-statics@3.3.2:
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
+
+  hono@4.11.8:
+    resolution: {integrity: sha512-eVkB/CYCCei7K2WElZW9yYQFWssG0DhaDhVvr7wy5jJ22K+ck8fWW0EsLpB0sITUTvPnc97+rrbQqIr5iqiy9Q==}
+    engines: {node: '>=16.9.0'}
+
+  hono@4.5.11:
+    resolution: {integrity: sha512-62FcjLPtjAFwISVBUshryl+vbHOjg8rE4uIK/dxyR8GpLztunZpwFmfEvmJCUI7xoGh/Sr3CGCDPCmYxVw7wUQ==}
+    engines: {node: '>=16.0.0'}
+
+  hosted-git-info@2.8.9:
+    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+
+  hosted-git-info@6.1.1:
+    resolution: {integrity: sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  html-escaper@2.0.2:
+    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
+
+  html-tags@3.3.1:
+    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
+    engines: {node: '>=8'}
+
+  html-to-text@9.0.5:
+    resolution: {integrity: sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==}
+    engines: {node: '>=14'}
+
+  html-url-attributes@3.0.1:
+    resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
+
+  html-void-elements@3.0.0:
+    resolution: {integrity: sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==}
+
+  htmlparser2@8.0.2:
+    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
+
+  http-cache-semantics@4.1.1:
+    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
+
+  http-errors@2.0.0:
+    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
+    engines: {node: '>= 0.8'}
+
+  http-errors@2.0.1:
+    resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
+    engines: {node: '>= 0.8'}
+
+  http-proxy-agent@7.0.2:
+    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
+    engines: {node: '>= 14'}
+
+  http-signature@1.2.0:
+    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
+    engines: {node: '>=0.8', npm: '>=1.3.7'}
+
+  https-proxy-agent@5.0.1:
+    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
+    engines: {node: '>= 6'}
+
+  https-proxy-agent@7.0.6:
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
+    engines: {node: '>= 14'}
+
+  human-id@1.0.2:
+    resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==}
+
+  human-signals@2.1.0:
+    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
+    engines: {node: '>=10.17.0'}
+
+  human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
+
+  human-signals@8.0.1:
+    resolution: {integrity: sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==}
+    engines: {node: '>=18.18.0'}
+
+  humanize-duration@3.27.3:
+    resolution: {integrity: sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw==}
+
+  humanize-ms@1.2.1:
+    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
+
+  hyphenate-style-name@1.0.4:
+    resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}
+
+  iconv-lite@0.4.24:
+    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
+    engines: {node: '>=0.10.0'}
+
+  iconv-lite@0.6.3:
+    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
+    engines: {node: '>=0.10.0'}
+
+  iconv-lite@0.7.2:
+    resolution: {integrity: sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==}
+    engines: {node: '>=0.10.0'}
+
+  icss-utils@5.1.0:
+    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  ignore@5.2.4:
+    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
+    engines: {node: '>= 4'}
+
+  ignore@7.0.5:
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
+
+  import-fresh@3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
+
+  import-in-the-middle@1.11.0:
+    resolution: {integrity: sha512-5DimNQGoe0pLUHbR9qK84iWaWjjbsxiqXnw6Qz64+azRgleqv9k2kTt5fw7QsOpmaGYtuxxursnPPsnTKEx10Q==}
+
+  import-in-the-middle@1.14.2:
+    resolution: {integrity: sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==}
+
+  import-meta-resolve@4.1.0:
+    resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
+  indent-string@5.0.0:
+    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
+    engines: {node: '>=12'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  ini@5.0.0:
+    resolution: {integrity: sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
+  inline-style-parser@0.1.1:
+    resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
+
+  inline-style-parser@0.2.4:
+    resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==}
+
+  inline-style-prefixer@7.0.1:
+    resolution: {integrity: sha512-lhYo5qNTQp3EvSSp3sRvXMbVQTLrvGV6DycRMJ5dm2BLMiJ30wpXKdDdgX+GmJZ5uQMucwRKHamXSst3Sj/Giw==}
+
+  input-otp@1.4.2:
+    resolution: {integrity: sha512-l3jWwYNvrEa6NTCt7BECfCm48GvwuZzkoeG3gBL2w4CHeOXW3eKFmf9UNYkNfYc3mxMrthMnxjIE07MT0zLBQA==}
+    peerDependencies:
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
+
+  install@0.13.0:
+    resolution: {integrity: sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==}
+    engines: {node: '>= 0.10'}
+
+  internal-slot@1.0.4:
+    resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==}
+    engines: {node: '>= 0.4'}
+
+  internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+
+  internmap@1.0.1:
+    resolution: {integrity: sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==}
+
+  internmap@2.0.3:
+    resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
+    engines: {node: '>=12'}
+
+  interpret@1.4.0:
+    resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
+    engines: {node: '>= 0.10'}
+
+  interpret@3.1.1:
+    resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==}
+    engines: {node: '>=10.13.0'}
+
+  intl-messageformat@10.5.8:
+    resolution: {integrity: sha512-NRf0jpBWV0vd671G5b06wNofAN8tp7WWDogMZyaU8GUAsmbouyvgwmFJI7zLjfAMpm3zK+vSwRP3jzaoIcMbaA==}
+
+  intl-parse-accept-language@1.0.0:
+    resolution: {integrity: sha512-YFMSV91JNBOSjw1cOfw2tup6hDP7mkz+2AUV7W1L1AM6ntgI75qC1ZeFpjPGMrWp+upmBRTX2fJWQ8c7jsUWpA==}
+    engines: {node: '>=14'}
+
+  invariant@2.2.4:
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+
+  ioredis@5.3.2:
+    resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
+    engines: {node: '>=12.22.0'}
+
+  ip-address@10.0.1:
+    resolution: {integrity: sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==}
+    engines: {node: '>= 12'}
+
+  ip-address@9.0.5:
+    resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
+    engines: {node: '>= 12'}
+
+  ipaddr.js@1.9.1:
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
+
+  ipaddr.js@2.2.0:
+    resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}
+    engines: {node: '>= 10'}
+
+  is-alphabetical@2.0.1:
+    resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==}
+
+  is-alphanumerical@2.0.1:
+    resolution: {integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==}
+
+  is-any-array@2.0.1:
+    resolution: {integrity: sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==}
+
+  is-arguments@1.1.1:
+    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
+    engines: {node: '>= 0.4'}
+
+  is-array-buffer@3.0.1:
+    resolution: {integrity: sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==}
+
+  is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-arrayish@0.3.2:
+    resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
+
+  is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+
+  is-binary-path@2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+
+  is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+
+  is-buffer@2.0.5:
+    resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==}
+    engines: {node: '>=4'}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-ci@3.0.1:
+    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
+    hasBin: true
+
+  is-core-module@2.14.0:
+    resolution: {integrity: sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+
+  is-decimal@2.0.1:
+    resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
+
+  is-deflate@1.0.0:
+    resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==}
+
+  is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  is-docker@3.0.0:
+    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    hasBin: true
+
+  is-electron@2.2.2:
+    resolution: {integrity: sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg==}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-generator-function@1.0.10:
+    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
+    engines: {node: '>= 0.4'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-gzip@1.0.0:
+    resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-hexadecimal@2.0.1:
+    resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
+
+  is-inside-container@1.0.0:
+    resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}
+    engines: {node: '>=14.16'}
+    hasBin: true
+
+  is-interactive@1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+
+  is-negative-zero@2.0.2:
+    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
+    engines: {node: '>= 0.4'}
+
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-network-error@1.0.0:
+    resolution: {integrity: sha512-P3fxi10Aji2FZmHTrMPSNFbNC6nnp4U5juPAIjXPHkUNubi4+qK7vvdsaNpAUwXslhYm9oyjEYTxs1xd/+Ph0w==}
+    engines: {node: '>=16'}
+
+  is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-path-inside@3.0.3:
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-obj@3.0.0:
+    resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
+    engines: {node: '>=10'}
+
+  is-plain-obj@4.1.0:
+    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
+    engines: {node: '>=12'}
+
+  is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+
+  is-reference@3.0.3:
+    resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==}
+
+  is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.2:
+    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
+
+  is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+
+  is-stream@2.0.1:
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
+
+  is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  is-stream@4.0.1:
+    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
+    engines: {node: '>=18'}
+
+  is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+
+  is-subdir@1.2.0:
+    resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==}
+    engines: {node: '>=4'}
+
+  is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
+
+  is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
+
+  is-typedarray@1.0.0:
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
+
+  is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+
+  is-unicode-supported@2.1.0:
+    resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==}
+    engines: {node: '>=18'}
+
+  is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+
+  is-what@4.1.16:
+    resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==}
+    engines: {node: '>=12.13'}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+
+  is-wsl@3.1.0:
+    resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
+    engines: {node: '>=16'}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
+  isbot@3.6.5:
+    resolution: {integrity: sha512-BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g==}
+    engines: {node: '>=12'}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isomorphic-ws@5.0.0:
+    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
+    peerDependencies:
+      ws: 8.17.1
+
+  isstream@0.1.2:
+    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
+
+  istanbul-lib-coverage@3.2.2:
+    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+    engines: {node: '>=8'}
+
+  istanbul-lib-report@3.0.1:
+    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
+    engines: {node: '>=10'}
+
+  istanbul-lib-source-maps@5.0.6:
+    resolution: {integrity: sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==}
+    engines: {node: '>=10'}
+
+  istanbul-reports@3.1.7:
+    resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
+    engines: {node: '>=8'}
+
+  jackspeak@2.3.6:
+    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
+    engines: {node: '>=14'}
+
+  jackspeak@3.4.3:
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+
+  jackspeak@4.0.1:
+    resolution: {integrity: sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==}
+    engines: {node: 20 || >=22}
+
+  javascript-stringify@2.1.0:
+    resolution: {integrity: sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==}
+
+  jest-worker@27.5.1:
+    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
+    engines: {node: '>= 10.13.0'}
+
+  jiti@1.21.0:
+    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
+    hasBin: true
+
+  jiti@1.21.6:
+    resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
+    hasBin: true
+
+  jiti@2.4.2:
+    resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}
+    hasBin: true
+
+  joi@17.7.0:
+    resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==}
+
+  jose@4.15.9:
+    resolution: {integrity: sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==}
+
+  jose@5.4.0:
+    resolution: {integrity: sha512-6rpxTHPAQyWMb9A35BroFl1Sp0ST3DpPcm5EVIxZxdH+e0Hv9fwhyB3XLKFUcHNpdSDnETmBfuPPTTlYz5+USw==}
+
+  jose@6.0.8:
+    resolution: {integrity: sha512-EyUPtOKyTYq+iMOszO42eobQllaIjJnwkZ2U93aJzNyPibCy7CEvT9UQnaCVB51IAd49gbNdCew1c0LcLTCB2g==}
+
+  jose@6.1.3:
+    resolution: {integrity: sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ==}
+
+  joycon@3.1.1:
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
+
+  js-beautify@1.15.1:
+    resolution: {integrity: sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  js-cookie@2.2.1:
+    resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==}
+
+  js-cookie@3.0.5:
+    resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
+    engines: {node: '>=14'}
+
+  js-levenshtein@1.1.6:
+    resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
+    engines: {node: '>=0.10.0'}
+
+  js-sdsl@4.2.0:
+    resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-yaml@3.14.2:
+    resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
+    hasBin: true
+
+  js-yaml@4.1.1:
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
+    hasBin: true
+
+  jsbn@0.1.1:
+    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
+
+  jsbn@1.1.0:
+    resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
+
+  jsep@1.4.0:
+    resolution: {integrity: sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==}
+    engines: {node: '>= 10.16.0'}
+
+  jsesc@2.5.2:
+    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  jsesc@3.0.2:
+    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  json-buffer@3.0.0:
+    resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
+
+  json-parse-better-errors@1.0.2:
+    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-parse-even-better-errors@3.0.0:
+    resolution: {integrity: sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  json-schema-ref-resolver@2.0.1:
+    resolution: {integrity: sha512-HG0SIB9X4J8bwbxCbnd5FfPEbcXAJYTi1pBJeP/QPON+w8ovSME8iRG+ElHNxZNX2Qh6eYn1GdzJFS4cDFfx0Q==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-schema-typed@8.0.2:
+    resolution: {integrity: sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==}
+
+  json-schema@0.4.0:
+    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json-stable-stringify@1.3.0:
+    resolution: {integrity: sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==}
+    engines: {node: '>= 0.4'}
+
+  json-stringify-safe@5.0.1:
+    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
+
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonc-parser@3.2.1:
+    resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}
+
+  jsondiffpatch@0.6.0:
+    resolution: {integrity: sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+
+  jsonfile@4.0.0:
+    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
+
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
+  jsonify@0.0.1:
+    resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==}
+
+  jsonpath-plus@10.3.0:
+    resolution: {integrity: sha512-8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  jsonpath-plus@7.2.0:
+    resolution: {integrity: sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==}
+    engines: {node: '>=12.0.0'}
+
+  jsonpointer@5.0.1:
+    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
+    engines: {node: '>=0.10.0'}
+
+  jsonwebtoken@9.0.2:
+    resolution: {integrity: sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==}
+    engines: {node: '>=12', npm: '>=6'}
+
+  jsprim@1.4.2:
+    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
+    engines: {node: '>=0.6.0'}
+
+  jsx-ast-utils@3.3.3:
+    resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==}
+    engines: {node: '>=4.0'}
+
+  junk@4.0.1:
+    resolution: {integrity: sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==}
+    engines: {node: '>=12.20'}
+
+  jwa@1.4.2:
+    resolution: {integrity: sha512-eeH5JO+21J78qMvTIDdBXidBd6nG2kZjg5Ohz/1fpa28Z4CcsWUzJ1ZZyFq/3z3N17aZy+ZuBoHljASbL1WfOw==}
+
+  jws@3.2.3:
+    resolution: {integrity: sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==}
+
+  katex@0.16.25:
+    resolution: {integrity: sha512-woHRUZ/iF23GBP1dkDQMh1QBad9dmr8/PAwNA54VrSOVYgI12MAcE14TqnDdQOdzyEonGzMepYnqBMYdsoAr8Q==}
+    hasBin: true
+
+  keyv@3.1.0:
+    resolution: {integrity: sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==}
+
+  khroma@2.1.0:
+    resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  kleur@4.1.5:
+    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
+    engines: {node: '>=6'}
+
+  kolorist@1.8.0:
+    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
+
+  langium@3.3.1:
+    resolution: {integrity: sha512-QJv/h939gDpvT+9SiLVlY7tZC3xB2qK57v0J04Sh9wpMb6MP1q8gB21L3WIo8T5P1MSMg3Ep14L7KkDCFG3y4w==}
+    engines: {node: '>=16.0.0'}
+
+  langsmith@0.2.15:
+    resolution: {integrity: sha512-homtJU41iitqIZVuuLW7iarCzD4f39KcfP9RTBWav9jifhrsDa1Ez89Ejr+4qi72iuBu8Y5xykchsGVgiEZ93w==}
+    peerDependencies:
+      openai: '*'
+    peerDependenciesMeta:
+      openai:
+        optional: true
+
+  language-subtag-registry@0.3.22:
+    resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==}
+
+  language-tags@1.0.5:
+    resolution: {integrity: sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==}
+
+  layerr@2.0.1:
+    resolution: {integrity: sha512-z0730CwG/JO24evdORnyDkwG1Q7b7mF2Tp1qRQ0YvrMMARbt1DFG694SOv439Gm7hYKolyZyaB49YIrYIfZBdg==}
+
+  layout-base@1.0.2:
+    resolution: {integrity: sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==}
+
+  layout-base@2.0.1:
+    resolution: {integrity: sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==}
+
+  lazystream@1.0.1:
+    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
+    engines: {node: '>= 0.6.3'}
+
+  leac@0.6.0:
+    resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
+
+  lefthook-darwin-arm64@1.11.3:
+    resolution: {integrity: sha512-IYzAOf8Qwqk7q+LoRyy7kSk9vzpUZ5wb/vLzEAH/F86Vay9AUaWe1f2pzeLwFg18qEc1QNklT69h9p/uLQMojA==}
+    cpu: [arm64]
+    os: [darwin]
+
+  lefthook-darwin-x64@1.11.3:
+    resolution: {integrity: sha512-z/Wp7UMjE1Vyl+x9sjN3NvN6qKdwgHl+cDf98MKKDg/WyPE5XnzqLm9rLLJgImjyClfH7ptTfZxEyhTG3M3XvQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  lefthook-freebsd-arm64@1.11.3:
+    resolution: {integrity: sha512-QevwQ7lrv5wBCkk7LLTzT5KR3Bk/5nttSxT1UH2o0EsgirS/c2K5xSgQmV6m3CiZYuCe2Pja4BSIwN3zt17SMw==}
+    cpu: [arm64]
+    os: [freebsd]
+
+  lefthook-freebsd-x64@1.11.3:
+    resolution: {integrity: sha512-PYbcyNgdJJ4J2pEO9Ss4oYo5yq4vmQGTKm3RTYbRx4viSWR65hvKCP0C4LnIqspMvmR05SJi2bqe7UBP2t60EA==}
+    cpu: [x64]
+    os: [freebsd]
+
+  lefthook-linux-arm64@1.11.3:
+    resolution: {integrity: sha512-0pBMBAoafOAEg345eOPozsmRjWR0zCr6k+m5ZxwRBZbZx1bQFDqBakQ3TpFCphhcykmgFyaa1KeZJZUOrEsezA==}
+    cpu: [arm64]
+    os: [linux]
+
+  lefthook-linux-x64@1.11.3:
+    resolution: {integrity: sha512-eiezheZ/bisBCMB2Ur0mctug/RDFyu39B5wzoE8y4z0W1yw6jHGrWMJ4Y8+5qKZ7fmdZg+7YPuMHZ2eFxOnhQA==}
+    cpu: [x64]
+    os: [linux]
+
+  lefthook-openbsd-arm64@1.11.3:
+    resolution: {integrity: sha512-DRLTzXdtCj/TizpLcGSqXcnrqvgxeXgn/6nqzclIGqNdKCsNXDzpI0D3sP13Vwwmyoqv2etoTak2IHqZiXZDqg==}
+    cpu: [arm64]
+    os: [openbsd]
+
+  lefthook-openbsd-x64@1.11.3:
+    resolution: {integrity: sha512-l7om+ZjWpYrVZyDuElwnucZhEqa7YfwlRaKBenkBxEh2zMje8O6Zodeuma1KmyDbSFvnvEjARo/Ejiot4gLXEw==}
+    cpu: [x64]
+    os: [openbsd]
+
+  lefthook-windows-arm64@1.11.3:
+    resolution: {integrity: sha512-X0iTrql2gfPAkU2dzRwuHWgW5RcqCPbzJtKQ41X6Y/F7iQacRknmuYUGyC81funSvzGAsvlusMVLUvaFjIKnbA==}
+    cpu: [arm64]
+    os: [win32]
+
+  lefthook-windows-x64@1.11.3:
+    resolution: {integrity: sha512-F+ORMn6YJXoS0EXU5LtN1FgV4QX9rC9LucZEkRmK6sKmS7hcb9IHpyb7siRGytArYzJvXVjPbxPBNSBdN4egZQ==}
+    cpu: [x64]
+    os: [win32]
+
+  lefthook@1.11.3:
+    resolution: {integrity: sha512-HJp37y62j3j8qzAOODWuUJl4ysLwsDvCTBV6odr3jIRHR/a5e+tI14VQGIBcpK9ysqC3pGWyW5Rp9Jv1YDubyw==}
+    hasBin: true
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  light-my-request@6.6.0:
+    resolution: {integrity: sha512-CHYbu8RtboSIoVsHZ6Ye4cj4Aw/yg2oAFimlF7mNvfDV192LR7nDiKtSIfCuLT7KokPSTn/9kfVLm5OGN0A28A==}
+
+  lightningcss-darwin-arm64@1.29.2:
+    resolution: {integrity: sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  lightningcss-darwin-x64@1.29.2:
+    resolution: {integrity: sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  lightningcss-freebsd-x64@1.29.2:
+    resolution: {integrity: sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  lightningcss-linux-arm-gnueabihf@1.29.2:
+    resolution: {integrity: sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm]
+    os: [linux]
+
+  lightningcss-linux-arm64-gnu@1.29.2:
+    resolution: {integrity: sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [glibc]
+
+  lightningcss-linux-arm64-musl@1.29.2:
+    resolution: {integrity: sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [linux]
+    libc: [musl]
+
+  lightningcss-linux-x64-gnu@1.29.2:
+    resolution: {integrity: sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [glibc]
+
+  lightningcss-linux-x64-musl@1.29.2:
+    resolution: {integrity: sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  lightningcss-win32-arm64-msvc@1.29.2:
+    resolution: {integrity: sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  lightningcss-win32-x64-msvc@1.29.2:
+    resolution: {integrity: sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==}
+    engines: {node: '>= 12.0.0'}
+    cpu: [x64]
+    os: [win32]
+
+  lightningcss@1.29.2:
+    resolution: {integrity: sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==}
+    engines: {node: '>= 12.0.0'}
+
+  lilconfig@2.1.0:
+    resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
+    engines: {node: '>=10'}
+
+  lilconfig@3.1.3:
+    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
+    engines: {node: '>=14'}
+
+  linear-sum-assignment@1.0.7:
+    resolution: {integrity: sha512-jfLoSGwZNyjfY8eK4ayhjfcIu3BfWvP6sWieYzYI3AWldwXVoWEz1gtrQL10v/8YltYLBunqNjeVFXPMUs+MJg==}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  load-json-file@4.0.0:
+    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
+    engines: {node: '>=4'}
+
+  load-tsconfig@0.2.5:
+    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  load-yaml-file@0.2.0:
+    resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==}
+    engines: {node: '>=6'}
+
+  loader-runner@4.3.0:
+    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
+    engines: {node: '>=6.11.5'}
+
+  loader-runner@4.3.1:
+    resolution: {integrity: sha512-IWqP2SCPhyVFTBtRcgMHdzlf9ul25NwaFx4wCEH/KjAXuuHY4yNjvPXsBokp8jCB936PyWRaPKUNh8NvylLp2Q==}
+    engines: {node: '>=6.11.5'}
+
+  loader-utils@3.2.1:
+    resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==}
+    engines: {node: '>= 12.13.0'}
+
+  local-pkg@0.4.3:
+    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
+    engines: {node: '>=14'}
+
+  local-pkg@1.1.2:
+    resolution: {integrity: sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==}
+    engines: {node: '>=14'}
+
+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  locate-path@7.2.0:
+    resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+
+  lodash.camelcase@4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+
+  lodash.castarray@4.4.0:
+    resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}
+
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
+  lodash.defaults@4.2.0:
+    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
+
+  lodash.escaperegexp@4.1.2:
+    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
+
+  lodash.groupby@4.6.0:
+    resolution: {integrity: sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==}
+
+  lodash.includes@4.3.0:
+    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
+
+  lodash.isarguments@3.1.0:
+    resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
+
+  lodash.isboolean@3.0.3:
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
+
+  lodash.isfunction@3.0.9:
+    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
+
+  lodash.isinteger@4.0.4:
+    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
+
+  lodash.isnil@4.0.0:
+    resolution: {integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==}
+
+  lodash.isnumber@3.0.3:
+    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
+
+  lodash.isplainobject@4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+
+  lodash.isstring@4.0.1:
+    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
+
+  lodash.isundefined@3.0.1:
+    resolution: {integrity: sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash.omit@4.5.0:
+    resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
+    deprecated: This package is deprecated. Use destructuring assignment syntax instead.
+
+  lodash.once@4.1.1:
+    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
+
+  lodash.sortby@4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+
+  lodash.startcase@4.4.0:
+    resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
+
+  lodash.truncate@4.4.2:
+    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
+
+  lodash.uniq@4.5.0:
+    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+
+  lodash@4.17.23:
+    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
+
+  log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+
+  long@5.2.3:
+    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+
+  longest-streak@3.1.0:
+    resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
+
+  loose-envify@1.4.0:
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
+    hasBin: true
+
+  loupe@3.1.3:
+    resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
+
+  lowercase-keys@1.0.1:
+    resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==}
+    engines: {node: '>=0.10.0'}
+
+  lowercase-keys@2.0.0:
+    resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
+    engines: {node: '>=8'}
+
+  lru-cache@10.4.3:
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+
+  lru-cache@11.0.0:
+    resolution: {integrity: sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==}
+    engines: {node: 20 || >=22}
+
+  lru-cache@11.2.4:
+    resolution: {integrity: sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==}
+    engines: {node: 20 || >=22}
+
+  lru-cache@5.1.1:
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+
+  lru-cache@6.0.0:
+    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
+    engines: {node: '>=10'}
+
+  lru-cache@7.18.3:
+    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
+    engines: {node: '>=12'}
+
+  lucide-react@0.229.0:
+    resolution: {integrity: sha512-b0/KSFXhPi++vUbnYEDUgP8Z8Rw9MQpRfBr+dRZNPMT3FD1HrVgMHXhSpkm9ZrrEtuqIfHf/O+tAGmw4WOmIog==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0
+
+  lucide-react@0.451.0:
+    resolution: {integrity: sha512-OwQ3uljZLp2cerj8sboy5rnhtGTCl9UCJIhT1J85/yOuGVlEH+xaUPR7tvNdddPvmV5M5VLdr7cQuWE3hzA4jw==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc
+
+  lucide-react@0.484.0:
+    resolution: {integrity: sha512-oZy8coK9kZzvqhSgfbGkPtTgyjpBvs3ukLgDPv14dSOZtBtboryWF5o8i3qen7QbGg7JhiJBz5mK1p8YoMZTLQ==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  lucide-react@0.486.0:
+    resolution: {integrity: sha512-xWop/wMsC1ikiEVLZrxXjPKw4vU/eAip33G2mZHgbWnr4Nr5Rt4Vx4s/q1D3B/rQVbxjOuqASkEZcUxDEKzecw==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  lucide-react@0.542.0:
+    resolution: {integrity: sha512-w3hD8/SQB7+lzU2r4VdFyzzOzKnUjTZIF/MQJGSSvni7Llewni4vuViRppfRAa2guOsY5k4jZyxw/i9DQHv+dw==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  luxon@3.2.1:
+    resolution: {integrity: sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==}
+    engines: {node: '>=12'}
+
+  lz-string@1.4.4:
+    resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
+    hasBin: true
+
+  magic-string@0.30.17:
+    resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
+
+  magic-string@0.30.21:
+    resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
+
+  magicast@0.3.4:
+    resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==}
+
+  magicast@0.3.5:
+    resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
+
+  make-dir@4.0.0:
+    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
+    engines: {node: '>=10'}
+
+  map-obj@1.0.1:
+    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
+    engines: {node: '>=0.10.0'}
+
+  map-obj@4.3.0:
+    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
+    engines: {node: '>=8'}
+
+  markdown-extensions@1.1.1:
+    resolution: {integrity: sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==}
+    engines: {node: '>=0.10.0'}
+
+  markdown-table@3.0.4:
+    resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
+
+  marked-terminal@7.1.0:
+    resolution: {integrity: sha512-+pvwa14KZL74MVXjYdPR3nSInhGhNvPce/3mqLVZT2oUvt654sL1XImFuLZ1pkA866IYZ3ikDTOFUIC7XzpZZg==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      marked: '>=1 <14'
+
+  marked@16.4.1:
+    resolution: {integrity: sha512-ntROs7RaN3EvWfy3EZi14H4YxmT6A5YvywfhO+0pm+cH/dnSQRmdAmoFIc3B9aiwTehyk7pESH4ofyBY+V5hZg==}
+    engines: {node: '>= 20'}
+    hasBin: true
+
+  marked@4.2.5:
+    resolution: {integrity: sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==}
+    engines: {node: '>= 12'}
+    hasBin: true
+
+  marked@7.0.4:
+    resolution: {integrity: sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ==}
+    engines: {node: '>= 16'}
+    hasBin: true
+
+  marked@9.1.6:
+    resolution: {integrity: sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==}
+    engines: {node: '>= 16'}
+    hasBin: true
+
+  match-sorter@6.3.4:
+    resolution: {integrity: sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==}
+
+  matchit@1.1.0:
+    resolution: {integrity: sha512-+nGYoOlfHmxe5BW5tE0EMJppXEwdSf8uBA1GTZC7Q77kbT35+VKLYJMzVNWCHSsga1ps1tPYFtFyvxvKzWVmMA==}
+    engines: {node: '>=6'}
+
+  math-intrinsics@1.1.0:
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
+
+  md-to-react-email@5.0.2:
+    resolution: {integrity: sha512-x6kkpdzIzUhecda/yahltfEl53mH26QdWu4abUF9+S0Jgam8P//Ciro8cdhyMHnT5MQUJYrIbO6ORM2UxPiNNA==}
+    peerDependencies:
+      react: 18.x
+
+  mdast-util-definitions@5.1.1:
+    resolution: {integrity: sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==}
+
+  mdast-util-find-and-replace@3.0.2:
+    resolution: {integrity: sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==}
+
+  mdast-util-from-markdown@1.2.0:
+    resolution: {integrity: sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==}
+
+  mdast-util-from-markdown@2.0.2:
+    resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
+
+  mdast-util-frontmatter@1.0.0:
+    resolution: {integrity: sha512-7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw==}
+
+  mdast-util-gfm-autolink-literal@2.0.1:
+    resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==}
+
+  mdast-util-gfm-footnote@2.1.0:
+    resolution: {integrity: sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==}
+
+  mdast-util-gfm-strikethrough@2.0.0:
+    resolution: {integrity: sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==}
+
+  mdast-util-gfm-table@2.0.0:
+    resolution: {integrity: sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==}
+
+  mdast-util-gfm-task-list-item@2.0.0:
+    resolution: {integrity: sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==}
+
+  mdast-util-gfm@3.1.0:
+    resolution: {integrity: sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==}
+
+  mdast-util-math@3.0.0:
+    resolution: {integrity: sha512-Tl9GBNeG/AhJnQM221bJR2HPvLOSnLE/T9cJI9tlc6zwQk2nPk/4f0cHkOdEixQPC/j8UtKDdITswvLAy1OZ1w==}
+
+  mdast-util-mdx-expression@1.3.1:
+    resolution: {integrity: sha512-TTb6cKyTA1RD+1su1iStZ5PAv3rFfOUKcoU5EstUpv/IZo63uDX03R8+jXjMEhcobXnNOiG6/ccekvVl4eV1zQ==}
+
+  mdast-util-mdx-expression@2.0.1:
+    resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==}
+
+  mdast-util-mdx-jsx@2.1.4:
+    resolution: {integrity: sha512-DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA==}
+
+  mdast-util-mdx-jsx@3.2.0:
+    resolution: {integrity: sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==}
+
+  mdast-util-mdx@2.0.1:
+    resolution: {integrity: sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw==}
+
+  mdast-util-mdxjs-esm@1.3.0:
+    resolution: {integrity: sha512-7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g==}
+
+  mdast-util-mdxjs-esm@2.0.1:
+    resolution: {integrity: sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==}
+
+  mdast-util-phrasing@3.0.0:
+    resolution: {integrity: sha512-S+QYsDRLkGi8U7o5JF1agKa/sdP+CNGXXLqC17pdTVL8FHHgQEiwFGa9yE5aYtUxNiFGYoaDy9V1kC85Sz86Gg==}
+
+  mdast-util-phrasing@4.1.0:
+    resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==}
+
+  mdast-util-to-hast@12.3.0:
+    resolution: {integrity: sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==}
+
+  mdast-util-to-hast@13.2.0:
+    resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==}
+
+  mdast-util-to-markdown@1.5.0:
+    resolution: {integrity: sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==}
+
+  mdast-util-to-markdown@2.1.2:
+    resolution: {integrity: sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==}
+
+  mdast-util-to-string@3.1.0:
+    resolution: {integrity: sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==}
+
+  mdast-util-to-string@4.0.0:
+    resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
+
+  mdn-data@2.0.14:
+    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
+
+  media-query-parser@2.0.2:
+    resolution: {integrity: sha512-1N4qp+jE0pL5Xv4uEcwVUhIkwdUO3S/9gML90nqKA7v7FcOS5vUtatfzok9S9U1EJU8dHWlcv95WLnKmmxZI9w==}
+
+  media-typer@0.3.0:
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
+    engines: {node: '>= 0.6'}
+
+  media-typer@1.1.0:
+    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
+    engines: {node: '>= 0.8'}
+
+  memorystream@0.3.1:
+    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
+    engines: {node: '>= 0.10.0'}
+
+  meow@12.1.1:
+    resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}
+    engines: {node: '>=16.10'}
+
+  meow@6.1.1:
+    resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
+    engines: {node: '>=8'}
+
+  merge-descriptors@1.0.3:
+    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
+
+  merge-descriptors@2.0.0:
+    resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
+    engines: {node: '>=18'}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  mermaid@11.12.0:
+    resolution: {integrity: sha512-ZudVx73BwrMJfCFmSSJT84y6u5brEoV8DOItdHomNLz32uBjNrelm7mg95X7g+C6UoQH/W6mBLGDEDv73JdxBg==}
+
+  methods@1.1.2:
+    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
+    engines: {node: '>= 0.6'}
+
+  micromark-core-commonmark@1.0.6:
+    resolution: {integrity: sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==}
+
+  micromark-core-commonmark@2.0.3:
+    resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
+
+  micromark-extension-frontmatter@1.0.0:
+    resolution: {integrity: sha512-EXjmRnupoX6yYuUJSQhrQ9ggK0iQtQlpi6xeJzVD5xscyAI+giqco5fdymayZhJMbIFecjnE2yz85S9NzIgQpg==}
+
+  micromark-extension-gfm-autolink-literal@2.1.0:
+    resolution: {integrity: sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==}
+
+  micromark-extension-gfm-footnote@2.1.0:
+    resolution: {integrity: sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==}
+
+  micromark-extension-gfm-strikethrough@2.1.0:
+    resolution: {integrity: sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==}
+
+  micromark-extension-gfm-table@2.1.1:
+    resolution: {integrity: sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==}
+
+  micromark-extension-gfm-tagfilter@2.0.0:
+    resolution: {integrity: sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==}
+
+  micromark-extension-gfm-task-list-item@2.1.0:
+    resolution: {integrity: sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==}
+
+  micromark-extension-gfm@3.0.0:
+    resolution: {integrity: sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==}
+
+  micromark-extension-math@3.1.0:
+    resolution: {integrity: sha512-lvEqd+fHjATVs+2v/8kg9i5Q0AP2k85H0WUOwpIVvUML8BapsMvh1XAogmQjOCsLpoKRCVQqEkQBB3NhVBcsOg==}
+
+  micromark-extension-mdx-expression@1.0.3:
+    resolution: {integrity: sha512-TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA==}
+
+  micromark-extension-mdx-jsx@1.0.3:
+    resolution: {integrity: sha512-VfA369RdqUISF0qGgv2FfV7gGjHDfn9+Qfiv5hEwpyr1xscRj/CiVRkU7rywGFCO7JwJ5L0e7CJz60lY52+qOA==}
+
+  micromark-extension-mdx-md@1.0.0:
+    resolution: {integrity: sha512-xaRAMoSkKdqZXDAoSgp20Azm0aRQKGOl0RrS81yGu8Hr/JhMsBmfs4wR7m9kgVUIO36cMUQjNyiyDKPrsv8gOw==}
+
+  micromark-extension-mdxjs-esm@1.0.3:
+    resolution: {integrity: sha512-2N13ol4KMoxb85rdDwTAC6uzs8lMX0zeqpcyx7FhS7PxXomOnLactu8WI8iBNXW8AVyea3KIJd/1CKnUmwrK9A==}
+
+  micromark-extension-mdxjs@1.0.0:
+    resolution: {integrity: sha512-TZZRZgeHvtgm+IhtgC2+uDMR7h8eTKF0QUX9YsgoL9+bADBpBY6SiLvWqnBlLbCEevITmTqmEuY3FoxMKVs1rQ==}
+
+  micromark-factory-destination@1.0.0:
+    resolution: {integrity: sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==}
+
+  micromark-factory-destination@2.0.1:
+    resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==}
+
+  micromark-factory-label@1.0.2:
+    resolution: {integrity: sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==}
+
+  micromark-factory-label@2.0.1:
+    resolution: {integrity: sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==}
+
+  micromark-factory-mdx-expression@1.0.6:
+    resolution: {integrity: sha512-WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA==}
+
+  micromark-factory-space@1.0.0:
+    resolution: {integrity: sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==}
+
+  micromark-factory-space@2.0.1:
+    resolution: {integrity: sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==}
+
+  micromark-factory-title@1.0.2:
+    resolution: {integrity: sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==}
+
+  micromark-factory-title@2.0.1:
+    resolution: {integrity: sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==}
+
+  micromark-factory-whitespace@1.0.0:
+    resolution: {integrity: sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==}
+
+  micromark-factory-whitespace@2.0.1:
+    resolution: {integrity: sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==}
+
+  micromark-util-character@1.1.0:
+    resolution: {integrity: sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==}
+
+  micromark-util-character@2.1.1:
+    resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
+
+  micromark-util-chunked@1.0.0:
+    resolution: {integrity: sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==}
+
+  micromark-util-chunked@2.0.1:
+    resolution: {integrity: sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==}
+
+  micromark-util-classify-character@1.0.0:
+    resolution: {integrity: sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==}
+
+  micromark-util-classify-character@2.0.1:
+    resolution: {integrity: sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==}
+
+  micromark-util-combine-extensions@1.0.0:
+    resolution: {integrity: sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==}
+
+  micromark-util-combine-extensions@2.0.1:
+    resolution: {integrity: sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==}
+
+  micromark-util-decode-numeric-character-reference@1.0.0:
+    resolution: {integrity: sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==}
+
+  micromark-util-decode-numeric-character-reference@2.0.2:
+    resolution: {integrity: sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==}
+
+  micromark-util-decode-string@1.0.2:
+    resolution: {integrity: sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==}
+
+  micromark-util-decode-string@2.0.1:
+    resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==}
+
+  micromark-util-encode@1.0.1:
+    resolution: {integrity: sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==}
+
+  micromark-util-encode@2.0.1:
+    resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
+
+  micromark-util-events-to-acorn@1.2.0:
+    resolution: {integrity: sha512-WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw==}
+
+  micromark-util-html-tag-name@1.1.0:
+    resolution: {integrity: sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==}
+
+  micromark-util-html-tag-name@2.0.1:
+    resolution: {integrity: sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==}
+
+  micromark-util-normalize-identifier@1.0.0:
+    resolution: {integrity: sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==}
+
+  micromark-util-normalize-identifier@2.0.1:
+    resolution: {integrity: sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==}
+
+  micromark-util-resolve-all@1.0.0:
+    resolution: {integrity: sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==}
+
+  micromark-util-resolve-all@2.0.1:
+    resolution: {integrity: sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==}
+
+  micromark-util-sanitize-uri@1.1.0:
+    resolution: {integrity: sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==}
+
+  micromark-util-sanitize-uri@2.0.1:
+    resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
+
+  micromark-util-subtokenize@1.0.2:
+    resolution: {integrity: sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==}
+
+  micromark-util-subtokenize@2.1.0:
+    resolution: {integrity: sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==}
+
+  micromark-util-symbol@1.0.1:
+    resolution: {integrity: sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==}
+
+  micromark-util-symbol@2.0.1:
+    resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
+
+  micromark-util-types@1.0.2:
+    resolution: {integrity: sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==}
+
+  micromark-util-types@2.0.2:
+    resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==}
+
+  micromark@3.1.0:
+    resolution: {integrity: sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==}
+
+  micromark@4.0.2:
+    resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-db@1.53.0:
+    resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==}
+    engines: {node: '>= 0.6'}
+
+  mime-db@1.54.0:
+    resolution: {integrity: sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@3.0.0:
+    resolution: {integrity: sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w==}
+    engines: {node: '>= 0.6'}
+
+  mime-types@3.0.2:
+    resolution: {integrity: sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==}
+    engines: {node: '>=18'}
+
+  mime@1.6.0:
+    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  mime@2.6.0:
+    resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
+    engines: {node: '>=4.0.0'}
+    hasBin: true
+
+  mime@3.0.0:
+    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+
+  mimic-response@1.0.1:
+    resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
+    engines: {node: '>=4'}
+
+  mimic-response@3.1.0:
+    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+    engines: {node: '>=10'}
+
+  min-indent@1.0.1:
+    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
+    engines: {node: '>=4'}
+
+  mini-svg-data-uri@1.4.4:
+    resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
+    hasBin: true
+
+  minimal-polyfills@2.2.2:
+    resolution: {integrity: sha512-eEOUq/LH/DbLWihrxUP050Wi7H/N/I2dQT98Ep6SqOpmIbk4sXOI4wqalve66QoZa+6oljbZWU6I6T4dehQGmw==}
+
+  minimal-polyfills@2.2.3:
+    resolution: {integrity: sha512-oxdmJ9cL+xV72h0xYxp4tP2d5/fTBpP45H8DIOn9pASuF8a3IYTf+25fMGDYGiWW+MFsuog6KD6nfmhZJQ+uUw==}
+
+  minimatch@10.0.1:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+
+  minimatch@8.0.4:
+    resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimatch@9.0.1:
+    resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimist-options@4.1.0:
+    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
+    engines: {node: '>= 6'}
+
+  minimist@1.2.7:
+    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
+
+  minipass-collect@1.0.2:
+    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
+    engines: {node: '>= 8'}
+
+  minipass-flush@1.0.5:
+    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
+    engines: {node: '>= 8'}
+
+  minipass-pipeline@1.2.4:
+    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
+    engines: {node: '>=8'}
+
+  minipass@3.3.6:
+    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
+    engines: {node: '>=8'}
+
+  minipass@4.0.0:
+    resolution: {integrity: sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==}
+    engines: {node: '>=8'}
+
+  minipass@4.2.8:
+    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
+    engines: {node: '>=8'}
+
+  minipass@5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minizlib@2.1.2:
+    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
+    engines: {node: '>= 8'}
+
+  minizlib@3.0.1:
+    resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==}
+    engines: {node: '>= 18'}
+
+  minizlib@3.1.0:
+    resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
+    engines: {node: '>= 18'}
+
+  mitt@3.0.1:
+    resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
+
+  mixme@0.5.4:
+    resolution: {integrity: sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==}
+    engines: {node: '>= 8.0.0'}
+
+  mkdirp-classic@0.5.3:
+    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+
+  mkdirp@1.0.4:
+    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  mkdirp@3.0.1:
+    resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  ml-array-max@1.2.4:
+    resolution: {integrity: sha512-BlEeg80jI0tW6WaPyGxf5Sa4sqvcyY6lbSn5Vcv44lp1I2GR6AWojfUvLnGTNsIXrZ8uqWmo8VcG1WpkI2ONMQ==}
+
+  ml-array-min@1.2.3:
+    resolution: {integrity: sha512-VcZ5f3VZ1iihtrGvgfh/q0XlMobG6GQ8FsNyQXD3T+IlstDv85g8kfV0xUG1QPRO/t21aukaJowDzMTc7j5V6Q==}
+
+  ml-array-rescale@1.3.7:
+    resolution: {integrity: sha512-48NGChTouvEo9KBctDfHC3udWnQKNKEWN0ziELvY3KG25GR5cA8K8wNVzracsqSW1QEkAXjTNx+ycgAv06/1mQ==}
+
+  ml-matrix@6.12.1:
+    resolution: {integrity: sha512-TJ+8eOFdp+INvzR4zAuwBQJznDUfktMtOB6g/hUcGh3rcyjxbz4Te57Pgri8Q9bhSQ7Zys4IYOGhFdnlgeB6Lw==}
+
+  ml-spectra-processing@14.13.0:
+    resolution: {integrity: sha512-AZPE+XrBoRhSRwzUm0IbiQlAPbetDtndDnoq9VO/SzRkN82wrxJpU+urH4aaFVnxTJhxtGOI81FiAxjFe7xQtQ==}
+
+  ml-xsadd@3.0.1:
+    resolution: {integrity: sha512-Fz2q6dwgzGM8wYKGArTUTZDGa4lQFA2Vi6orjGeTVRy22ZnQFKlJuwS9n8NRviqz1KHAHAzdKJwbnYhdo38uYg==}
+
+  mlly@1.7.1:
+    resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
+
+  mlly@1.7.4:
+    resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==}
+
+  module-details-from-path@1.0.3:
+    resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
+
+  moo@0.5.2:
+    resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
+
+  morgan@1.10.0:
+    resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==}
+    engines: {node: '>= 0.8.0'}
+
+  mri@1.2.0:
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
+    engines: {node: '>=4'}
+
+  mrmime@1.0.1:
+    resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
+    engines: {node: '>=10'}
+
+  mrmime@2.0.0:
+    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
+    engines: {node: '>=10'}
+
+  ms@2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+
+  ms@2.1.2:
+    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  multipasta@0.2.5:
+    resolution: {integrity: sha512-c8eMDb1WwZcE02WVjHoOmUVk7fnKU/RmUcosHACglrWAuPQsEJv+E8430sXj6jNc1jHw0zrS16aCjQh4BcEb4A==}
+
+  mustache@4.2.0:
+    resolution: {integrity: sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==}
+    hasBin: true
+
+  mz@2.7.0:
+    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
+
+  nan@2.23.1:
+    resolution: {integrity: sha512-r7bBUGKzlqk8oPBDYxt6Z0aEdF1G1rwlMcLk8LCOMbOzf0mG+JUfUzG4fIMWwHWP0iyaLWEQZJmtB7nOHEm/qw==}
+
+  nano-css@5.6.2:
+    resolution: {integrity: sha512-+6bHaC8dSDGALM1HJjOHVXpuastdu2xFoZlC77Jh4cg+33Zcgm+Gxd+1xsnpZK14eyHObSp82+ll5y3SX75liw==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+
+  nanoid@3.3.11:
+    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  nanoid@5.0.6:
+    resolution: {integrity: sha512-rRq0eMHoGZxlvaFOUdK1Ev83Bd1IgzzR+WJ3IbDJ7QOSdAxYjlurSPqFs9s4lJg29RT6nPwizFtJhQS6V5xgiA==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+
+  nanoid@5.1.2:
+    resolution: {integrity: sha512-b+CiXQCNMUGe0Ri64S9SXFcP9hogjAJ2Rd6GdVxhPLRm7mhGaM7VgOvCAJ1ZshfHbqVDI3uqTI5C8/GaKuLI7g==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+
+  nanoid@5.1.5:
+    resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+
+  napi-build-utils@2.0.0:
+    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+
+  natural-compare-lite@1.4.0:
+    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  nearley@2.20.1:
+    resolution: {integrity: sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==}
+    hasBin: true
+
+  negotiator@0.6.3:
+    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
+    engines: {node: '>= 0.6'}
+
+  negotiator@1.0.0:
+    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
+    engines: {node: '>= 0.6'}
+
+  neo-async@2.6.2:
+    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
+
+  nested-error-stacks@2.1.1:
+    resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==}
+
+  netmask@2.0.2:
+    resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
+    engines: {node: '>= 0.4.0'}
+
+  neverthrow@8.2.0:
+    resolution: {integrity: sha512-kOCT/1MCPAxY5iUV3wytNFUMUolzuwd/VF/1KCx7kf6CutrOsTie+84zTGTpgQycjvfLdBBdvBvFLqFD2c0wkQ==}
+    engines: {node: '>=18'}
+
+  next@14.1.0:
+    resolution: {integrity: sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==}
+    engines: {node: '>=18.17.0'}
+    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/security-update-2025-12-11 for more details.
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      react: ^18.2.0
+      react-dom: ^18.2.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      sass:
+        optional: true
+
+  next@14.2.21:
+    resolution: {integrity: sha512-rZmLwucLHr3/zfDMYbJXbw0ZeoBpirxkXuvsJbk7UPorvPYZhP7vq7aHbKnU7dQNCYIimRrbB2pp3xmf+wsYUg==}
+    engines: {node: '>=18.17.0'}
+    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/security-update-2025-12-11 for more details.
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.41.2
+      react: ^18.2.0
+      react-dom: ^18.2.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      sass:
+        optional: true
+
+  next@15.2.4:
+    resolution: {integrity: sha512-VwL+LAaPSxEkd3lU2xWbgEOtrM8oedmyhBqaVNmgKB+GvZlCy9rgaEc+y2on0wv+l0oSFqLtYD6dcC1eAedUaQ==}
+    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
+    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/CVE-2025-66478 for more details.
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.41.2
+      babel-plugin-react-compiler: '*'
+      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      babel-plugin-react-compiler:
+        optional: true
+      sass:
+        optional: true
+
+  next@15.4.8:
+    resolution: {integrity: sha512-jwOXTz/bo0Pvlf20FSb6VXVeWRssA2vbvq9SdrOPEg9x8E1B27C2rQtvriAn600o9hH61kjrVRexEffv3JybuA==}
+    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
+    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/security-update-2025-12-11 for more details.
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.51.1
+      babel-plugin-react-compiler: '*'
+      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      babel-plugin-react-compiler:
+        optional: true
+      sass:
+        optional: true
+
+  next@15.5.6:
+    resolution: {integrity: sha512-zTxsnI3LQo3c9HSdSf91O1jMNsEzIXDShXd4wVdg9y5shwLqBXi4ZtUUJyB86KGVSJLZx0PFONvO54aheGX8QQ==}
+    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
+    deprecated: This version has a security vulnerability. Please upgrade to a patched version. See https://nextjs.org/blog/CVE-2025-66478 for more details.
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.51.1
+      babel-plugin-react-compiler: '*'
+      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      babel-plugin-react-compiler:
+        optional: true
+      sass:
+        optional: true
+
+  node-abi@3.75.0:
+    resolution: {integrity: sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==}
+    engines: {node: '>=10'}
+
+  node-abort-controller@3.1.1:
+    resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
+
+  node-domexception@1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    deprecated: Use your platform's native DOMException instead
+
+  node-emoji@1.11.0:
+    resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==}
+
+  node-emoji@2.1.3:
+    resolution: {integrity: sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==}
+    engines: {node: '>=18'}
+
+  node-fetch-native@1.6.6:
+    resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==}
+
+  node-fetch@2.6.12:
+    resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
+  node-fetch@2.6.7:
+    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+
+  node-gyp-build@4.8.4:
+    resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
+    hasBin: true
+
+  node-releases@2.0.12:
+    resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==}
+
+  node-releases@2.0.19:
+    resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==}
+
+  node-releases@2.0.27:
+    resolution: {integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==}
+
+  nodemailer@7.0.11:
+    resolution: {integrity: sha512-gnXhNRE0FNhD7wPSCGhdNh46Hs6nm+uTyg+Kq0cZukNQiYdnCsoQjodNP9BQVG9XrcK/v6/MgpAPBUFyzh9pvw==}
+    engines: {node: '>=6.0.0'}
+
+  non.geist@1.0.2:
+    resolution: {integrity: sha512-oGCfo7Ub5bJmCOAt4CMAsCrVal/JXkQtxgBcpXzdU3lQib9c5hHdr62I8vI6TtdlsLcaYAPD/HRfZNdBUobwFg==}
+
+  nopt@7.2.0:
+    resolution: {integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
+
+  normalize-package-data@2.5.0:
+    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+
+  normalize-package-data@5.0.0:
+    resolution: {integrity: sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-range@0.1.2:
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-url@4.5.1:
+    resolution: {integrity: sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==}
+    engines: {node: '>=8'}
+
+  normalize.css@8.0.1:
+    resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==}
+
+  notepack.io@3.0.1:
+    resolution: {integrity: sha512-TKC/8zH5pXIAMVQio2TvVDTtPRX+DJPHDqjRbxogtFiByHyzKmy96RA0JtCQJ+WouyyL4A10xomQzgbUT+1jCg==}
+
+  npm-install-checks@6.2.0:
+    resolution: {integrity: sha512-744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  npm-normalize-package-bin@3.0.1:
+    resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  npm-package-arg@10.1.0:
+    resolution: {integrity: sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  npm-pick-manifest@8.0.2:
+    resolution: {integrity: sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  npm-run-all@4.1.5:
+    resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
+    engines: {node: '>= 4'}
+    hasBin: true
+
+  npm-run-path@4.0.1:
+    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
+    engines: {node: '>=8'}
+
+  npm-run-path@5.1.0:
+    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  npm-run-path@6.0.0:
+    resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==}
+    engines: {node: '>=18'}
+
+  num2fraction@1.2.2:
+    resolution: {integrity: sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==}
+
+  nypm@0.3.9:
+    resolution: {integrity: sha512-BI2SdqqTHg2d4wJh8P9A1W+bslg33vOE9IZDY6eR2QC+Pu1iNBVZUqczrd43rJb+fMzHU7ltAYKsEFY/kHMFcw==}
+    engines: {node: ^14.16.0 || >=16.10.0}
+    hasBin: true
+
+  nypm@0.5.4:
+    resolution: {integrity: sha512-X0SNNrZiGU8/e/zAB7sCTtdxWTMSIO73q+xuKgglm2Yvzwlo8UoC5FNySQFCvl84uPaeADkqHUZUkWy4aH4xOA==}
+    engines: {node: ^14.16.0 || >=16.10.0}
+    hasBin: true
+
+  nypm@0.6.1:
+    resolution: {integrity: sha512-hlacBiRiv1k9hZFiphPUkfSQ/ZfQzZDzC+8z0wL3lvDAOUu/2NnChkKuMoMjNur/9OpKuz2QsIeiPVN0xM5Q0w==}
+    engines: {node: ^14.16.0 || >=16.10.0}
+    hasBin: true
+
+  oauth-sign@0.9.0:
+    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
+
+  oauth4webapi@3.3.0:
+    resolution: {integrity: sha512-ZlozhPlFfobzh3hB72gnBFLjXpugl/dljz1fJSRdqaV2r3D5dmi5lg2QWI0LmUYuazmE+b5exsloEv6toUtw9g==}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-hash@2.2.0:
+    resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==}
+    engines: {node: '>= 6'}
+
+  object-hash@3.0.0:
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
+
+  object-inspect@1.13.4:
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
+  object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
+
+  object.entries@1.1.6:
+    resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.6:
+    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
+    engines: {node: '>= 0.4'}
+
+  object.fromentries@2.0.8:
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
+
+  object.groupby@1.0.3:
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
+
+  object.hasown@1.1.2:
+    resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==}
+
+  object.values@1.1.6:
+    resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
+    engines: {node: '>= 0.4'}
+
+  object.values@1.2.0:
+    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
+    engines: {node: '>= 0.4'}
+
+  obuf@1.1.2:
+    resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
+
+  octokit@3.2.2:
+    resolution: {integrity: sha512-7Abo3nADdja8l/aglU6Y3lpnHSfv0tw7gFPiqzry/yCU+2gTAX7R1roJ8hJrxIK+S1j+7iqRJXtmuHJ/UDsBhQ==}
+    engines: {node: '>= 18'}
+
+  ohash@1.1.3:
+    resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==}
+
+  ohash@2.0.11:
+    resolution: {integrity: sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==}
+
+  oidc-token-hash@5.0.3:
+    resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==}
+    engines: {node: ^10.13.0 || >=12.0.0}
+
+  on-exit-leak-free@2.1.2:
+    resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==}
+    engines: {node: '>=14.0.0'}
+
+  on-finished@2.3.0:
+    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
+    engines: {node: '>= 0.8'}
+
+  on-finished@2.4.1:
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
+
+  on-headers@1.0.2:
+    resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}
+    engines: {node: '>= 0.8'}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+
+  oniguruma-parser@0.12.1:
+    resolution: {integrity: sha512-8Unqkvk1RYc6yq2WBYRj4hdnsAxVze8i7iPfQr8e4uSP3tRv0rpZcbGUDvxfQQcdwHt/e9PrMvGCsa8OqG9X3w==}
+
+  oniguruma-to-es@4.3.3:
+    resolution: {integrity: sha512-rPiZhzC3wXwE59YQMRDodUwwT9FZ9nNBwQQfsd1wfdtlKEyCdRV0avrTcSZ5xlIvGRVPd/cx6ZN45ECmS39xvg==}
+
+  open@10.0.3:
+    resolution: {integrity: sha512-dtbI5oW7987hwC9qjJTyABldTaa19SuyJse1QboWv3b0qCcrrLNVDqBx1XgELAjh9QTVQaP/C5b1nhQebd1H2A==}
+    engines: {node: '>=18'}
+
+  open@8.4.0:
+    resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
+    engines: {node: '>=12'}
+
+  openai@4.33.1:
+    resolution: {integrity: sha512-0DH572aSxGTT1JPOXgJQ9mjiuSPg/7scPot8hLc5I1mfQxPxLXTZWJpWerKaIWOuPkR2nrB0SamGDEehH8RuWA==}
+    hasBin: true
+
+  openai@4.68.4:
+    resolution: {integrity: sha512-LRinV8iU9VQplkr25oZlyrsYGPGasIwYN8KFMAAFTHHLHjHhejtJ5BALuLFrkGzY4wfbKhOhuT+7lcHZ+F3iEA==}
+    hasBin: true
+    peerDependencies:
+      zod: ^3.23.8
+    peerDependenciesMeta:
+      zod:
+        optional: true
+
+  openai@4.97.0:
+    resolution: {integrity: sha512-LRoiy0zvEf819ZUEJhgfV8PfsE8G5WpQi4AwA1uCV8SKvvtXQkoWUFkepD6plqyJQRghy2+AEPQ07FrJFKHZ9Q==}
+    hasBin: true
+    peerDependencies:
+      ws: 8.17.1
+      zod: ^3.23.8
+    peerDependenciesMeta:
+      ws:
+        optional: true
+      zod:
+        optional: true
+
+  openapi-fetch@0.9.8:
+    resolution: {integrity: sha512-zM6elH0EZStD/gSiNlcPrzXcVQ/pZo3BDvC6CDwRDUt1dDzxlshpmQnpD6cZaJ39THaSmwVCxxRrPKNM1hHrDg==}
+
+  openapi-typescript-helpers@0.0.8:
+    resolution: {integrity: sha512-1eNjQtbfNi5Z/kFhagDIaIRj6qqDzhjNJKz8cmMW0CVdGwT6e1GLbAfgI0d28VTJa1A8jz82jm/4dG8qNoNS8g==}
+
+  opener@1.5.2:
+    resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
+    hasBin: true
+
+  openid-client@5.7.1:
+    resolution: {integrity: sha512-jDBPgSVfTnkIh71Hg9pRvtJc6wTwqjRkN88+gCFtYWrlP4Yx2Dsrow8uPi3qLr/aeymPF3o2+dS+wOpglK04ew==}
+
+  openid-client@6.3.3:
+    resolution: {integrity: sha512-lTK8AV8SjqCM4qznLX0asVESAwzV39XTVdfMAM185ekuaZCnkWdPzcxMTXNlsm9tsUAMa1Q30MBmKAykdT1LWw==}
+
+  optionator@0.9.1:
+    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
+    engines: {node: '>= 0.8.0'}
+
+  ora@5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
+
+  os-paths@7.4.0:
+    resolution: {integrity: sha512-Ux1J4NUqC6tZayBqLN1kUlDAEvLiQlli/53sSddU4IN+h+3xxnv2HmRSMpVSvr1hvJzotfMs3ERvETGK+f4OwA==}
+    engines: {node: '>= 4.0'}
+
+  os-tmpdir@1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+
+  outdent@0.5.0:
+    resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==}
+
+  outdent@0.8.0:
+    resolution: {integrity: sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==}
+
+  p-cancelable@1.1.0:
+    resolution: {integrity: sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==}
+    engines: {node: '>=6'}
+
+  p-event@5.0.1:
+    resolution: {integrity: sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  p-filter@2.1.0:
+    resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==}
+    engines: {node: '>=8'}
+
+  p-filter@3.0.0:
+    resolution: {integrity: sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  p-finally@1.0.0:
+    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
+    engines: {node: '>=4'}
+
+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-limit@4.0.0:
+    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  p-limit@6.2.0:
+    resolution: {integrity: sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==}
+    engines: {node: '>=18'}
+
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  p-locate@6.0.0:
+    resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  p-map@2.1.0:
+    resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
+    engines: {node: '>=6'}
+
+  p-map@4.0.0:
+    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
+    engines: {node: '>=10'}
+
+  p-map@5.5.0:
+    resolution: {integrity: sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==}
+    engines: {node: '>=12'}
+
+  p-map@6.0.0:
+    resolution: {integrity: sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw==}
+    engines: {node: '>=16'}
+
+  p-queue@6.6.2:
+    resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
+    engines: {node: '>=8'}
+
+  p-queue@8.0.1:
+    resolution: {integrity: sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA==}
+    engines: {node: '>=18'}
+
+  p-retry@4.6.2:
+    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
+    engines: {node: '>=8'}
+
+  p-retry@6.1.0:
+    resolution: {integrity: sha512-fJLEQ2KqYBJRuaA/8cKMnqhulqNM+bpcjYtXNex2t3mOXKRYPitAJt9NacSf8XAFzcYahSAbKpobiWDSqHSh2g==}
+    engines: {node: '>=16.17'}
+
+  p-timeout@3.2.0:
+    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
+    engines: {node: '>=8'}
+
+  p-timeout@5.1.0:
+    resolution: {integrity: sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==}
+    engines: {node: '>=12'}
+
+  p-timeout@6.1.2:
+    resolution: {integrity: sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==}
+    engines: {node: '>=14.16'}
+
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
+  pac-proxy-agent@7.2.0:
+    resolution: {integrity: sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==}
+    engines: {node: '>= 14'}
+
+  pac-resolver@7.0.1:
+    resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
+    engines: {node: '>= 14'}
+
+  package-json-from-dist@1.0.0:
+    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+
+  package-json@6.5.0:
+    resolution: {integrity: sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==}
+    engines: {node: '>=8'}
+
+  package-manager-detector@1.4.1:
+    resolution: {integrity: sha512-dSMiVLBEA4XaNJ0PRb4N5cV/SEP4BWrWZKBmfF+OUm2pQTiZ6DDkKeWaltwu3JRhLoy59ayIkJ00cx9K9CaYTg==}
+
+  pako@0.2.9:
+    resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-duration@2.1.4:
+    resolution: {integrity: sha512-b98m6MsCh+akxfyoz9w9dt0AlH2dfYLOBss5SdDsr9pkhKNvkWBXU/r8A4ahmIGByBOLV2+4YwfCuFxbDDaGyg==}
+
+  parse-entities@4.0.0:
+    resolution: {integrity: sha512-5nk9Fn03x3rEhGaX1FU6IDwG/k+GxLXlFAkgrbM1asuAFl3BhdQWvASaIsmwWypRNcZKHPYnIuOSfIWEyEQnPQ==}
+
+  parse-github-url@1.0.2:
+    resolution: {integrity: sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  parse-json@4.0.0:
+    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
+    engines: {node: '>=4'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  parse-ms@2.1.0:
+    resolution: {integrity: sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==}
+    engines: {node: '>=6'}
+
+  parse-ms@4.0.0:
+    resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==}
+    engines: {node: '>=18'}
+
+  parse5-htmlparser2-tree-adapter@6.0.1:
+    resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
+
+  parse5@5.1.1:
+    resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
+
+  parse5@6.0.1:
+    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+
+  parse5@7.3.0:
+    resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
+
+  parseley@0.12.1:
+    resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==}
+
+  parseurl@1.3.3:
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
+
+  partysocket@1.0.2:
+    resolution: {integrity: sha512-rAFOUKImaq+VBk2B+2RTBsWEvlnarEP53nchoUHzpVs8V6fG2/estihOTslTQUWHVuHEKDL5k8htG8K3TngyFA==}
+
+  path-data-parser@0.1.0:
+    resolution: {integrity: sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-exists@5.0.0:
+    resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
+  path-parse@1.0.7:
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+
+  path-scurry@1.11.1:
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
+
+  path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
+
+  path-to-regexp@0.1.10:
+    resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==}
+
+  path-to-regexp@8.2.0:
+    resolution: {integrity: sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==}
+    engines: {node: '>=16'}
+
+  path-type@3.0.0:
+    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
+    engines: {node: '>=4'}
+
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+
+  pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+
+  pathe@2.0.3:
+    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+
+  pathval@2.0.0:
+    resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
+    engines: {node: '>= 14.16'}
+
+  peberminta@0.9.0:
+    resolution: {integrity: sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==}
+
+  peek-readable@5.4.2:
+    resolution: {integrity: sha512-peBp3qZyuS6cNIJ2akRNG1uo1WJ1d0wTxg/fxMdZ0BqCVhx242bSFHM9eNqflfJVS9SsgkzgT/1UgnsurBOTMg==}
+    engines: {node: '>=14.16'}
+
+  peek-stream@1.1.3:
+    resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}
+
+  pend@1.2.0:
+    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
+
+  perfect-debounce@1.0.0:
+    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
+
+  performance-now@2.1.0:
+    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
+
+  performant-array-to-tree@1.11.0:
+    resolution: {integrity: sha512-YwCqIDvnaebXaKuKQhI5yJD6ryDc3FxvoeX/5ougXTKDUWb7s5S2BuBgIyftCa4sBe1+ZU5Kmi4RJy+pjjjrpw==}
+
+  periscopic@3.1.0:
+    resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==}
+
+  pg-cloudflare@1.2.7:
+    resolution: {integrity: sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==}
+
+  pg-connection-string@2.6.4:
+    resolution: {integrity: sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==}
+
+  pg-connection-string@2.8.5:
+    resolution: {integrity: sha512-Ni8FuZ8yAF+sWZzojvtLE2b03cqjO5jNULcHFfM9ZZ0/JXrgom5pBREbtnAw7oxsxJqHw9Nz/XWORUEL3/IFow==}
+
+  pg-connection-string@2.9.1:
+    resolution: {integrity: sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==}
+
+  pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+
+  pg-numeric@1.0.2:
+    resolution: {integrity: sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==}
+    engines: {node: '>=4'}
+
+  pg-pool@3.10.1:
+    resolution: {integrity: sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==}
+    peerDependencies:
+      pg: '>=8.0'
+
+  pg-pool@3.6.2:
+    resolution: {integrity: sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==}
+    peerDependencies:
+      pg: '>=8.0'
+
+  pg-pool@3.9.6:
+    resolution: {integrity: sha512-rFen0G7adh1YmgvrmE5IPIqbb+IgEzENUm+tzm6MLLDSlPRoZVhzU1WdML9PV2W5GOdRA9qBKURlbt1OsXOsPw==}
+    peerDependencies:
+      pg: '>=8.0'
+
+  pg-protocol@1.10.3:
+    resolution: {integrity: sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==}
+
+  pg-protocol@1.6.1:
+    resolution: {integrity: sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==}
+
+  pg-protocol@1.9.5:
+    resolution: {integrity: sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg==}
+
+  pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+
+  pg-types@4.0.2:
+    resolution: {integrity: sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==}
+    engines: {node: '>=10'}
+
+  pg@8.11.5:
+    resolution: {integrity: sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+
+  pg@8.15.6:
+    resolution: {integrity: sha512-yvao7YI3GdmmrslNVsZgx9PfntfWrnXwtR+K/DjI0I/sTKif4Z623um+sjVZ1hk5670B+ODjvHDAckKdjmPTsg==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+
+  pg@8.16.3:
+    resolution: {integrity: sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==}
+    engines: {node: '>= 16.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+
+  pgpass@1.0.5:
+    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
+
+  picocolors@0.2.1:
+    resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==}
+
+  picocolors@1.0.0:
+    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  picomatch@4.0.2:
+    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+    engines: {node: '>=12'}
+
+  pidtree@0.3.1:
+    resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  pidtree@0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  pify@2.3.0:
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
+
+  pify@3.0.0:
+    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
+    engines: {node: '>=4'}
+
+  pify@4.0.1:
+    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
+    engines: {node: '>=6'}
+
+  pino-abstract-transport@2.0.0:
+    resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==}
+
+  pino-std-serializers@7.0.0:
+    resolution: {integrity: sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==}
+
+  pino@9.7.0:
+    resolution: {integrity: sha512-vnMCM6xZTb1WDmLvtG2lE/2p+t9hDEIvTWJsu6FejkE62vB7gDhvzrpFR4Cw2to+9JNQxVnkAKVPA1KPB98vWg==}
+    hasBin: true
+
+  pirates@4.0.5:
+    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
+    engines: {node: '>= 6'}
+
+  pkce-challenge@5.0.0:
+    resolution: {integrity: sha512-ueGLflrrnvwB3xuo/uGob5pd5FN7l0MsLf0Z87o/UQmRtwjvfylfc9MurIxRAWywCYTgrvpXBcqjV4OfCYGCIQ==}
+    engines: {node: '>=16.20.0'}
+
+  pkg-dir@4.2.0:
+    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
+    engines: {node: '>=8'}
+
+  pkg-types@1.1.3:
+    resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==}
+
+  pkg-types@1.3.1:
+    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
+
+  pkg-types@2.3.0:
+    resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
+
+  platform@1.3.6:
+    resolution: {integrity: sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==}
+
+  playwright-core@1.37.0:
+    resolution: {integrity: sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  points-on-curve@0.2.0:
+    resolution: {integrity: sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==}
+
+  points-on-path@0.2.1:
+    resolution: {integrity: sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==}
+
+  polite-json@5.0.0:
+    resolution: {integrity: sha512-OLS/0XeUAcE8a2fdwemNja+udKgXNnY6yKVIXqAD2zVRx1KvY6Ato/rZ2vdzbxqYwPW0u6SCNC/bAMPNzpzxbw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  polka@0.5.2:
+    resolution: {integrity: sha512-FVg3vDmCqP80tOrs+OeNlgXYmFppTXdjD5E7I4ET1NjvtNmQrb1/mJibybKkb/d4NA7YWAr1ojxuhpL3FHqdlw==}
+
+  possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+    engines: {node: '>= 0.4'}
+
+  postcss-discard-duplicates@5.1.0:
+    resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
+    engines: {node: ^10 || ^12 || >=14.0}
+    peerDependencies:
+      postcss: ^8.2.15
+
+  postcss-functions@3.0.0:
+    resolution: {integrity: sha512-N5yWXWKA+uhpLQ9ZhBRl2bIAdM6oVJYpDojuI1nF2SzXBimJcdjFwiAouBVbO5VuOF3qA6BSFWFc3wXbbj72XQ==}
+
+  postcss-import@15.1.0:
+    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      postcss: ^8.0.0
+
+  postcss-import@16.0.1:
+    resolution: {integrity: sha512-i2Pci0310NaLHr/5JUFSw1j/8hf1CzwMY13g6ZDxgOavmRHQi2ba3PmUHoihO+sjaum+KmCNzskNsw7JDrg03g==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      postcss: ^8.0.0
+
+  postcss-js@2.0.3:
+    resolution: {integrity: sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==}
+
+  postcss-js@4.0.1:
+    resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
+    engines: {node: ^12 || ^14 || >= 16}
+    peerDependencies:
+      postcss: ^8.4.21
+
+  postcss-load-config@4.0.2:
+    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
+    engines: {node: '>= 14'}
+    peerDependencies:
+      postcss: '>=8.0.9'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+      ts-node:
+        optional: true
+
+  postcss-load-config@6.0.1:
+    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      jiti: '>=1.21.0'
+      postcss: '>=8.0.9'
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+      postcss:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
+  postcss-loader@8.1.1:
+    resolution: {integrity: sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==}
+    engines: {node: '>= 18.12.0'}
+    peerDependencies:
+      '@rspack/core': 0.x || 1.x
+      postcss: ^7.0.0 || ^8.0.1
+      webpack: ^5.0.0
+    peerDependenciesMeta:
+      '@rspack/core':
+        optional: true
+      webpack:
+        optional: true
+
+  postcss-modules-extract-imports@3.0.0:
+    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules-local-by-default@4.0.4:
+    resolution: {integrity: sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules-scope@3.1.1:
+    resolution: {integrity: sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules-values@4.0.0:
+    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
+    engines: {node: ^10 || ^12 || >= 14}
+    peerDependencies:
+      postcss: ^8.1.0
+
+  postcss-modules@6.0.0:
+    resolution: {integrity: sha512-7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ==}
+    peerDependencies:
+      postcss: ^8.0.0
+
+  postcss-nested@4.2.3:
+    resolution: {integrity: sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==}
+
+  postcss-nested@6.2.0:
+    resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.2.14
+
+  postcss-selector-parser@6.0.10:
+    resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
+    engines: {node: '>=4'}
+
+  postcss-selector-parser@6.1.2:
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
+
+  postcss-value-parser@3.3.1:
+    resolution: {integrity: sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==}
+
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+
+  postcss@6.0.23:
+    resolution: {integrity: sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==}
+    engines: {node: '>=4.0.0'}
+
+  postcss@7.0.32:
+    resolution: {integrity: sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==}
+    engines: {node: '>=6.0.0'}
+
+  postcss@7.0.39:
+    resolution: {integrity: sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==}
+    engines: {node: '>=6.0.0'}
+
+  postcss@8.4.31:
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.4.35:
+    resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.4.44:
+    resolution: {integrity: sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.5.3:
+    resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.5.4:
+    resolution: {integrity: sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postcss@8.5.6:
+    resolution: {integrity: sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
+
+  postgres-array@3.0.4:
+    resolution: {integrity: sha512-nAUSGfSDGOaOAEGwqsRY27GPOea7CNipJPOA7lPbdEpx5Kg3qzdP0AaWC5MlhTWV9s4hFX39nomVZ+C4tnGOJQ==}
+    engines: {node: '>=12'}
+
+  postgres-bytea@1.0.0:
+    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-bytea@3.0.0:
+    resolution: {integrity: sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==}
+    engines: {node: '>= 6'}
+
+  postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-date@2.1.0:
+    resolution: {integrity: sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==}
+    engines: {node: '>=12'}
+
+  postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-interval@3.0.0:
+    resolution: {integrity: sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==}
+    engines: {node: '>=12'}
+
+  postgres-range@1.1.4:
+    resolution: {integrity: sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==}
+
+  postgres@3.4.7:
+    resolution: {integrity: sha512-Jtc2612XINuBjIl/QTWsV5UvE8UHuNblcO3vVADSrKsrc6RqGX6lOW1cEo3CM2v0XG4Nat8nI+YM7/f26VxXLw==}
+    engines: {node: '>=12'}
+
+  posthog-js@1.93.3:
+    resolution: {integrity: sha512-jEOWwaQpTRbqLPrDLY6eZr7t95h+LyXqN7Yq1/K6u3V0Y1C9xHtYhpuGzYamirVnCDTbVq22RM++OBUaIpp9Wg==}
+    deprecated: This version of posthog-js is deprecated, please update posthog-js, and do not use this version! Check out our JS docs at https://posthog.com/docs/libraries/js
+
+  posthog-node@4.17.1:
+    resolution: {integrity: sha512-cVlQPOwOPjakUnrueKRCQe1m2Ku+XzKaOos7Tn/zDZkkZFeBT/byP7tbNf7LiwhaBRWFBRowZZb/MsTtSRaorg==}
+    engines: {node: '>=15.0.0'}
+
+  prebuild-install@7.1.3:
+    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  preferred-pm@3.0.3:
+    resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
+    engines: {node: '>=10'}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  prepend-http@2.0.0:
+    resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
+    engines: {node: '>=4'}
+
+  prettier-plugin-tailwindcss@0.3.0:
+    resolution: {integrity: sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==}
+    engines: {node: '>=12.17.0'}
+    peerDependencies:
+      '@ianvs/prettier-plugin-sort-imports': '*'
+      '@prettier/plugin-pug': '*'
+      '@shopify/prettier-plugin-liquid': '*'
+      '@shufo/prettier-plugin-blade': '*'
+      '@trivago/prettier-plugin-sort-imports': '*'
+      prettier: '>=2.2.0'
+      prettier-plugin-astro: '*'
+      prettier-plugin-css-order: '*'
+      prettier-plugin-import-sort: '*'
+      prettier-plugin-jsdoc: '*'
+      prettier-plugin-marko: '*'
+      prettier-plugin-organize-attributes: '*'
+      prettier-plugin-organize-imports: '*'
+      prettier-plugin-style-order: '*'
+      prettier-plugin-svelte: '*'
+      prettier-plugin-twig-melody: '*'
+    peerDependenciesMeta:
+      '@ianvs/prettier-plugin-sort-imports':
+        optional: true
+      '@prettier/plugin-pug':
+        optional: true
+      '@shopify/prettier-plugin-liquid':
+        optional: true
+      '@shufo/prettier-plugin-blade':
+        optional: true
+      '@trivago/prettier-plugin-sort-imports':
+        optional: true
+      prettier-plugin-astro:
+        optional: true
+      prettier-plugin-css-order:
+        optional: true
+      prettier-plugin-import-sort:
+        optional: true
+      prettier-plugin-jsdoc:
+        optional: true
+      prettier-plugin-marko:
+        optional: true
+      prettier-plugin-organize-attributes:
+        optional: true
+      prettier-plugin-organize-imports:
+        optional: true
+      prettier-plugin-style-order:
+        optional: true
+      prettier-plugin-svelte:
+        optional: true
+      prettier-plugin-twig-melody:
+        optional: true
+
+  prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
+  prettier@3.0.0:
+    resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  pretty-format@27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+
+  pretty-hrtime@1.0.3:
+    resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
+    engines: {node: '>= 0.8'}
+
+  pretty-ms@7.0.1:
+    resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==}
+    engines: {node: '>=10'}
+
+  pretty-ms@9.3.0:
+    resolution: {integrity: sha512-gjVS5hOP+M3wMm5nmNOucbIrqudzs9v/57bWRHQWLYklXqoXKrVfYW2W9+glfGsqtPgpiz5WwyEEB+ksXIx3gQ==}
+    engines: {node: '>=18'}
+
+  prism-react-renderer@2.1.0:
+    resolution: {integrity: sha512-I5cvXHjA1PVGbGm1MsWCpvBCRrYyxEri0MC7/JbfIfYfcXAxHyO5PaUjs3A8H5GW6kJcLhTHxxMaOZZpRZD2iQ==}
+    peerDependencies:
+      react: '>=16.0.0'
+
+  prism-react-renderer@2.3.1:
+    resolution: {integrity: sha512-Rdf+HzBLR7KYjzpJ1rSoxT9ioO85nZngQEoFIhL07XhtJHlCU3SOz0GJ6+qvMyQe0Se+BV3qpe6Yd/NmQF5Juw==}
+    peerDependencies:
+      react: '>=16.0.0'
+
+  prisma-generator-ts-enums@1.1.0:
+    resolution: {integrity: sha512-l0LuL8KJNMnYQpOd9bmy0kx+Hwxq75Da7N+aJimpau0S0odgide+DKJiSwYtu5JtgJGWzoyUPmx0MO4u/KDiBQ==}
+
+  prisma@6.14.0:
+    resolution: {integrity: sha512-QEuCwxu+Uq9BffFw7in8In+WfbSUN0ewnaSUKloLkbJd42w6EyFckux4M0f7VwwHlM3A8ssaz4OyniCXlsn0WA==}
+    engines: {node: '>=18.18'}
+    hasBin: true
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  prisma@6.16.0:
+    resolution: {integrity: sha512-TTh+H1Kw8N68KN9cDzdAyMroqMOvdCO/Z+kS2wKEVYR1nuR21qH5Q/Db/bZHsAgw7l/TPHtM/veG5VABcdwPDw==}
+    engines: {node: '>=18.18'}
+    hasBin: true
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  prisma@6.19.0:
+    resolution: {integrity: sha512-F3eX7K+tWpkbhl3l4+VkFtrwJlLXbAM+f9jolgoUZbFcm1DgHZ4cq9AgVEgUym2au5Ad/TDLN8lg83D+M10ycw==}
+    engines: {node: '>=18.18'}
+    hasBin: true
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  prisma@6.20.0-integration-next.8:
+    resolution: {integrity: sha512-KUVwHRuyvl57CpEU6kZc5eMdbhUogmneo2a7jF1GKEZwPZscAU+FXIDsgCH+U4BCpKlm0NVrRd0YKz9+7zBWFQ==}
+    engines: {node: ^20.19 || ^22.12 || ^24.0}
+    hasBin: true
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  prismjs@1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+
+  prismjs@1.30.0:
+    resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==}
+    engines: {node: '>=6'}
+
+  proc-log@3.0.0:
+    resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
+  process-warning@4.0.1:
+    resolution: {integrity: sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==}
+
+  process-warning@5.0.0:
+    resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
+
+  process@0.11.10:
+    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
+    engines: {node: '>= 0.6.0'}
+
+  progress@2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
+
+  prom-client@15.1.0:
+    resolution: {integrity: sha512-cCD7jLTqyPdjEPBo/Xk4Iu8jxjuZgZJ3e/oET3L+ZwOuap/7Cw3dH/TJSsZKs1TQLZ2IHpIlRAKw82ef06kmMw==}
+    engines: {node: ^16 || ^18 || >=20}
+
+  promise-inflight@1.0.1:
+    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
+    peerDependencies:
+      bluebird: '*'
+    peerDependenciesMeta:
+      bluebird:
+        optional: true
+
+  promise-retry@2.0.1:
+    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
+    engines: {node: '>=10'}
+
+  prop-types@15.8.1:
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+
+  proper-lockfile@4.1.2:
+    resolution: {integrity: sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==}
+
+  properties-reader@2.3.0:
+    resolution: {integrity: sha512-z597WicA7nDZxK12kZqHr2TcvwNU1GCfA5UwfDY/HDp3hXPoPlb5rlEx9bwGTiJnc0OqbBTkU975jDToth8Gxw==}
+    engines: {node: '>=14'}
+
+  property-expr@2.0.6:
+    resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
+
+  property-information@6.2.0:
+    resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==}
+
+  property-information@7.0.0:
+    resolution: {integrity: sha512-7D/qOz/+Y4X/rzSB6jKxKUsQnphO046ei8qxG59mtM3RG3DHgTK81HrxrmoDVINJb8NKT5ZsRbwHvQ6B68Iyhg==}
+
+  proto-list@1.2.4:
+    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
+
+  protobufjs@7.3.2:
+    resolution: {integrity: sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==}
+    engines: {node: '>=12.0.0'}
+
+  proxy-addr@2.0.7:
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
+
+  proxy-agent@6.5.0:
+    resolution: {integrity: sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==}
+    engines: {node: '>= 14'}
+
+  proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+
+  psl@1.9.0:
+    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
+
+  pump@2.0.1:
+    resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
+
+  pump@3.0.2:
+    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
+
+  pumpify@1.5.1:
+    resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
+
+  punycode@1.4.1:
+    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
+
+  punycode@2.2.0:
+    resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
+    engines: {node: '>=6'}
+
+  puppeteer-core@24.15.0:
+    resolution: {integrity: sha512-2iy0iBeWbNyhgiCGd/wvGrDSo73emNFjSxYOcyAqYiagkYt5q4cPfVXaVDKBsukgc2fIIfLAalBZlaxldxdDYg==}
+    engines: {node: '>=18'}
+
+  pure-rand@6.1.0:
+    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
+
+  purgecss@2.3.0:
+    resolution: {integrity: sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==}
+    hasBin: true
+
+  qrcode.react@4.2.0:
+    resolution: {integrity: sha512-QpgqWi8rD9DsS9EP3z7BT+5lY5SFhsqGjpgW5DY/i3mK4M9DTBNz3ErMi8BWYEfI3L0d8GIbGmcdFAS1uIRGjA==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  qs@6.14.1:
+    resolution: {integrity: sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==}
+    engines: {node: '>=0.6'}
+
+  quansync@0.2.11:
+    resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  quick-format-unescaped@4.0.4:
+    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
+
+  quick-lru@4.0.1:
+    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
+    engines: {node: '>=8'}
+
+  railroad-diagrams@1.0.0:
+    resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
+
+  randexp@0.4.6:
+    resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==}
+    engines: {node: '>=0.12'}
+
+  random-words@2.0.0:
+    resolution: {integrity: sha512-uqpnDqFnYrZajgmvgjmBrSZL2V1UA/9bNPGrilo12CmBeBszoff/avElutUlwWxG12gvmCk/8dUhvHefYxzYjw==}
+
+  randombytes@2.1.0:
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
+
+  range-parser@1.2.1:
+    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+    engines: {node: '>= 0.6'}
+
+  raw-body@2.5.2:
+    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
+    engines: {node: '>= 0.8'}
+
+  raw-body@3.0.0:
+    resolution: {integrity: sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==}
+    engines: {node: '>= 0.8'}
+
+  raw-body@3.0.2:
+    resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
+    engines: {node: '>= 0.10'}
+
+  rc9@2.1.2:
+    resolution: {integrity: sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==}
+
+  rc@1.2.8:
+    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+    hasBin: true
+
+  react-aria@3.31.1:
+    resolution: {integrity: sha512-q4jRCVDKO6V2o4Sgir5S2obssw/YnMx6QOy10+p0dYqROHpSnMFNkONrKT1w/nA+Nx4ptfPqZbaNra1hR1bUWg==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  react-aria@3.34.3:
+    resolution: {integrity: sha512-wSprEI5EojDFCm357MxnKAxJZN68OYIt6UH6N0KCo6MEUAVZMbhMSmGYjw/kLK4rI7KrbJDqGqUMQkwc93W9Ng==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  react-collapse@5.1.1:
+    resolution: {integrity: sha512-k6cd7csF1o9LBhQ4AGBIdxB60SUEUMQDAnL2z1YvYNr9KoKr+nDkhN6FK7uGaBd/rYrYfrMpzpmJEIeHRYogBw==}
+    peerDependencies:
+      react: '>=16.3.0'
+
+  react-day-picker@9.13.0:
+    resolution: {integrity: sha512-euzj5Hlq+lOHqI53NiuNhCP8HWgsPf/bBAVijR50hNaY1XwjKjShAnIe8jm8RD2W9IJUvihDIZ+KrmqfFzNhFQ==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      react: '>=16.8.0'
+
+  react-dom@18.2.0:
+    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
+    peerDependencies:
+      react: ^18.2.0
+
+  react-dom@19.0.0:
+    resolution: {integrity: sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==}
+    peerDependencies:
+      react: ^19.0.0
+
+  react-dom@19.0.0-rc.1:
+    resolution: {integrity: sha512-k8MfDX+4G+eaa1cXXI9QF4d+pQtYol3nx8vauqRWUEOPqC7NQn2qmEqUsLoSd28rrZUL+R3T2VC+kZ2Hyx1geQ==}
+    peerDependencies:
+      react: 19.0.0-rc.1
+
+  react-dom@19.1.0:
+    resolution: {integrity: sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==}
+    peerDependencies:
+      react: ^19.1.0
+
+  react-draggable@4.5.0:
+    resolution: {integrity: sha512-VC+HBLEZ0XJxnOxVAZsdRi8rD04Iz3SiiKOoYzamjylUcju/hP9np/aZdLHf/7WOD268WMoNJMvYfB5yAK45cw==}
+    peerDependencies:
+      react: '>= 16.3.0'
+      react-dom: '>= 16.3.0'
+
+  react-email@2.1.2:
+    resolution: {integrity: sha512-HBHhpzEE5es9YUoo7VSj6qy1omjwndxf3/Sb44UJm/uJ2AjmqALo2yryux0CjW9QAVfitc9rxHkLvIb9H87QQw==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  react-fast-compare@3.2.2:
+    resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
+
+  react-grid-layout@2.2.2:
+    resolution: {integrity: sha512-yNo9pxQWoxHWRAwHGSVT4DEGELYPyQ7+q9lFclb5jcqeFzva63/2F72CryS/jiTIr/SBIlTaDdyjqH+ODg8oBw==}
+    peerDependencies:
+      react: '>= 16.3.0'
+      react-dom: '>= 16.3.0'
+
+  react-hotkeys-hook@4.4.1:
+    resolution: {integrity: sha512-sClBMBioFEgFGYLTWWRKvhxcCx1DRznd+wkFHwQZspnRBkHTgruKIHptlK/U/2DPX8BhHoRGzpMVWUXMmdZlmw==}
+    peerDependencies:
+      react: '>=16.8.1'
+      react-dom: '>=16.8.1'
+
+  react-is@16.13.1:
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+
+  react-is@17.0.2:
+    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
+
+  react-is@18.3.1:
+    resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
+
+  react-markdown@10.1.0:
+    resolution: {integrity: sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==}
+    peerDependencies:
+      '@types/react': '>=18'
+      react: '>=18'
+
+  react-popper@2.3.0:
+    resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
+    peerDependencies:
+      '@popperjs/core': ^2.0.0
+      react: ^16.8.0 || ^17 || ^18
+      react-dom: ^16.8.0 || ^17 || ^18
+
+  react-refresh@0.14.0:
+    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
+    engines: {node: '>=0.10.0'}
+
+  react-remove-scroll-bar@2.3.8:
+    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-remove-scroll@2.5.5:
+    resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-resizable-panels@2.0.9:
+    resolution: {integrity: sha512-ZylBvs7oG7Y/INWw3oYGolqgpFvoPW8MPeg9l1fURDeKpxrmUuCHBUmPj47BdZ11MODImu3kZYXG85rbySab7w==}
+    peerDependencies:
+      react: ^16.14.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0
+
+  react-resizable@3.1.3:
+    resolution: {integrity: sha512-liJBNayhX7qA4tBJiBD321FDhJxgGTJ07uzH5zSORXoE8h7PyEZ8mLqmosST7ppf6C4zUsbd2gzDMmBCfFp9Lw==}
+    peerDependencies:
+      react: '>= 16.3'
+      react-dom: '>= 16.3'
+
+  react-router-dom@6.17.0:
+    resolution: {integrity: sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      react: '>=16.8'
+      react-dom: '>=16.8'
+
+  react-router@6.17.0:
+    resolution: {integrity: sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      react: '>=16.8'
+
+  react-smooth@4.0.4:
+    resolution: {integrity: sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  react-stately@3.29.1:
+    resolution: {integrity: sha512-hc4ZHy/ahvMwr6z7XMjYJ7EgzNVrXhzM4l2Qj17rdRhERo7/ovWmQencf9pF7K8kD5TraEHxPHLrYzGN4fxfUQ==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+
+  react-style-singleton@2.2.3:
+    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  react-transition-group@4.4.5:
+    resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
+    peerDependencies:
+      react: '>=16.6.0'
+      react-dom: '>=16.6.0'
+
+  react-universal-interface@0.6.2:
+    resolution: {integrity: sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==}
+    peerDependencies:
+      react: '*'
+      tslib: '*'
+
+  react-use@17.5.1:
+    resolution: {integrity: sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==}
+    peerDependencies:
+      react: '*'
+      react-dom: '*'
+
+  react-window-splitter@0.4.1:
+    resolution: {integrity: sha512-7XjNxlsBqOySyPEf32GZXLIA7gIPLWqswnOwM4Aw15qiMChMm8einkz40RbLfvrD11EKHIU35vcUH1RDA+we9w==}
+    engines: {node: '>=18.0.0'}
+    deprecated: This package has moved to @window-splitter/react
+    peerDependencies:
+      react: '>=16'
+      react-dom: '>=16'
+
+  react@18.2.0:
+    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
+    engines: {node: '>=0.10.0'}
+
+  react@18.3.1:
+    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
+    engines: {node: '>=0.10.0'}
+
+  react@19.0.0:
+    resolution: {integrity: sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==}
+    engines: {node: '>=0.10.0'}
+
+  react@19.0.0-rc.1:
+    resolution: {integrity: sha512-NZKln+uyPuyHchzP07I6GGYFxdAoaKhehgpCa3ltJGzwE31OYumLeshGaitA1R/fS5d9D2qpZVwTFAr6zCLM9w==}
+    engines: {node: '>=0.10.0'}
+
+  react@19.1.0:
+    resolution: {integrity: sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==}
+    engines: {node: '>=0.10.0'}
+
+  read-cache@1.0.0:
+    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
+
+  read-pkg-up@7.0.1:
+    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
+    engines: {node: '>=8'}
+
+  read-pkg@3.0.0:
+    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
+    engines: {node: '>=4'}
+
+  read-pkg@5.2.0:
+    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
+    engines: {node: '>=8'}
+
+  read-yaml-file@1.1.0:
+    resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
+    engines: {node: '>=6'}
+
+  readable-stream@2.3.8:
+    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
+  readable-stream@3.6.0:
+    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
+    engines: {node: '>= 6'}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  readable-stream@4.7.0:
+    resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  readdir-glob@1.1.3:
+    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
+
+  readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+
+  readdirp@4.1.2:
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
+
+  real-require@0.2.0:
+    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
+    engines: {node: '>= 12.13.0'}
+
+  recharts-scale@0.4.5:
+    resolution: {integrity: sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==}
+
+  recharts@2.15.4:
+    resolution: {integrity: sha512-UT/q6fwS3c1dHbXv2uFgYJ9BMFHu3fwnd7AYZaEQhXuYQ4hgsxLvsUXzGdKeZrW5xopzDCvuA2N41WJ88I7zIw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      react: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+      react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+
+  rechoir@0.6.2:
+    resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
+    engines: {node: '>= 0.10'}
+
+  redent@3.0.0:
+    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
+    engines: {node: '>=8'}
+
+  redis-errors@1.2.0:
+    resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
+    engines: {node: '>=4'}
+
+  redis-parser@3.0.0:
+    resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
+    engines: {node: '>=4'}
+
+  redlock@5.0.0-beta.2:
+    resolution: {integrity: sha512-2RDWXg5jgRptDrB1w9O/JgSZC0j7y4SlaXnor93H/UJm/QyDiFgBKNtrh0TI6oCXqYSaSoXxFh6Sd3VtYfhRXw==}
+    engines: {node: '>=12'}
+
+  reduce-css-calc@2.1.8:
+    resolution: {integrity: sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==}
+
+  reforest@0.13.0:
+    resolution: {integrity: sha512-f0It/s51f1UWCCCni0viULALDBhxWBPFnLmZRYtKcz4zYeNWqeNTdcnU/OpBry9tk+jyMQcH3MLK8UdzsAvA5w==}
+    peerDependencies:
+      react: '>=16.8'
+
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+
+  regex-recursion@6.0.2:
+    resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==}
+
+  regex-utilities@2.3.0:
+    resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==}
+
+  regex@6.0.1:
+    resolution: {integrity: sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==}
+
+  regexp.prototype.flags@1.4.3:
+    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
+    engines: {node: '>= 0.4'}
+
+  regexp.prototype.flags@1.5.2:
+    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
+    engines: {node: '>= 0.4'}
+
+  regexpp@3.2.0:
+    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
+    engines: {node: '>=8'}
+
+  registry-auth-token@4.2.2:
+    resolution: {integrity: sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==}
+    engines: {node: '>=6.0.0'}
+
+  registry-url@5.1.0:
+    resolution: {integrity: sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==}
+    engines: {node: '>=8'}
+
+  regression@2.0.1:
+    resolution: {integrity: sha512-A4XYsc37dsBaNOgEjkJKzfJlE394IMmUPlI/p3TTI9u3T+2a+eox5Pr/CPUqF0eszeWZJPAc6QkroAhuUpWDJQ==}
+
+  rehype-harden@1.1.5:
+    resolution: {integrity: sha512-JrtBj5BVd/5vf3H3/blyJatXJbzQfRT9pJBmjafbTaPouQCAKxHwRyCc7dle9BXQKxv4z1OzZylz/tNamoiG3A==}
+
+  rehype-katex@7.0.1:
+    resolution: {integrity: sha512-OiM2wrZ/wuhKkigASodFoo8wimG3H12LWQaH8qSPVJn9apWKFSH3YOCtbKpBorTVw/eI7cuT21XBbvwEswbIOA==}
+
+  rehype-raw@7.0.0:
+    resolution: {integrity: sha512-/aE8hCfKlQeA8LmyeyQvQF3eBiLRGNlfBJEvWH7ivp9sBqs7TNqBL5X3v157rM4IFETqDnIOO+z5M/biZbo9Ww==}
+
+  remark-frontmatter@4.0.1:
+    resolution: {integrity: sha512-38fJrB0KnmD3E33a5jZC/5+gGAC2WKNiPw1/fdXJvijBlhA7RCsvJklrYJakS0HedninvaCYW8lQGf9C918GfA==}
+
+  remark-gfm@4.0.1:
+    resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==}
+
+  remark-math@6.0.0:
+    resolution: {integrity: sha512-MMqgnP74Igy+S3WwnhQ7kqGlEerTETXMvJhrUzDikVZ2/uogJCb+WHUg97hK9/jcfc0dkD73s3LN8zU49cTEtA==}
+
+  remark-mdx-frontmatter@1.1.1:
+    resolution: {integrity: sha512-7teX9DW4tI2WZkXS4DBxneYSY7NHiXl4AKdWDO9LXVweULlCT8OPWsOjLEnMIXViN1j+QcY8mfbq3k0EK6x3uA==}
+    engines: {node: '>=12.2.0'}
+
+  remark-mdx@2.3.0:
+    resolution: {integrity: sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g==}
+
+  remark-parse@10.0.2:
+    resolution: {integrity: sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==}
+
+  remark-parse@11.0.0:
+    resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
+
+  remark-rehype@10.1.0:
+    resolution: {integrity: sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==}
+
+  remark-rehype@11.1.1:
+    resolution: {integrity: sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==}
+
+  remark-stringify@11.0.0:
+    resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
+
+  remix-auth-email-link@2.0.2:
+    resolution: {integrity: sha512-Lze9c50fsqBpixXQKe37wI2Dm4rlYYkNA6Eskxk8erQ7tbyN8xiFXOgo7Y3Al0SSjzkezw8au3uc2vCLJ8A5mQ==}
+    peerDependencies:
+      '@remix-run/server-runtime': ^1.1.1
+      remix-auth: ^3.2.1
+
+  remix-auth-github@1.6.0:
+    resolution: {integrity: sha512-qdQmWVVEDHxnzMPn7XE0s7QX5GYba0uH3MDW+lVJiCoHDZCGymqmGCajLThL5vFJdwSx0C4GpQJ5EgEsIjQ3pA==}
+    peerDependencies:
+      '@remix-run/server-runtime': ^1.0.0
+      remix-auth: ^3.4.0
+
+  remix-auth-google@2.0.0:
+    resolution: {integrity: sha512-qP38N1ZJADz+HlH2lrEn/rSL6m5Dwcnz8xUFDhbHecDMl9FU/UpkUx3w8jj5XhNSnkSue/GWT+p7OEkatgbXNA==}
+    peerDependencies:
+      '@remix-run/server-runtime': ^2.0.1
+      remix-auth: ^3.2.1
+
+  remix-auth-oauth2@1.11.0:
+    resolution: {integrity: sha512-Yf1LF6NLYPFa7X2Rax/VEhXmYXFjZOi/q+7DmbMeoMHjAfkpqxbvzqqYSKIKDGR51z5TXR5na4to4380mir5bg==}
+    peerDependencies:
+      '@remix-run/server-runtime': ^1.0.0 || ^2.0.0
+      remix-auth: ^3.6.0
+
+  remix-auth@3.6.0:
+    resolution: {integrity: sha512-mxlzLYi+/GKQSaXIqIw15dxAT1wm+93REAeDIft2unrKDYnjaGhhpapyPhdbALln86wt9lNAk21znfRss3fG7Q==}
+    peerDependencies:
+      '@remix-run/react': ^1.0.0 || ^2.0.0
+      '@remix-run/server-runtime': ^1.0.0 || ^2.0.0
+
+  remix-typedjson@0.3.1:
+    resolution: {integrity: sha512-XaLU3slWaUXTWPQe6u5rX4xJuqr665+wk1mRmepFu5Hn4DTP9V0zGOkCqCphCExxZ2Kqg5u+uZbas6AZRaxQzA==}
+    peerDependencies:
+      '@remix-run/react': ^1.16.0 || ^2.0
+      '@remix-run/server-runtime': ^1.16.0 || ^2.0
+      react: ^17.0.2 || ^18.0.0
+
+  remix-utils@7.7.0:
+    resolution: {integrity: sha512-J8NhP044nrNIam/xOT1L9a4RQ9FSaA2wyrUwmN8ZT+c/+CdAAf70yfaLnvMyKcV5U+8BcURQ/aVbth77sT6jGA==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@remix-run/cloudflare': ^2.0.0
+      '@remix-run/node': ^2.0.0
+      '@remix-run/react': ^2.0.0
+      '@remix-run/router': ^1.7.2
+      crypto-js: ^4.1.1
+      intl-parse-accept-language: ^1.0.0
+      is-ip: ^5.0.1
+      react: ^18.0.0
+      zod: ^3.22.4
+    peerDependenciesMeta:
+      '@remix-run/cloudflare':
+        optional: true
+      '@remix-run/node':
+        optional: true
+      '@remix-run/react':
+        optional: true
+      '@remix-run/router':
+        optional: true
+      crypto-js:
+        optional: true
+      intl-parse-accept-language:
+        optional: true
+      is-ip:
+        optional: true
+      react:
+        optional: true
+      zod:
+        optional: true
+
+  remove-accents@0.5.0:
+    resolution: {integrity: sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==}
+
+  replicate@1.0.1:
+    resolution: {integrity: sha512-EY+rK1YR5bKHcM9pd6WyaIbv6m2aRIvHfHDh51j/LahlHTLKemTYXF6ptif2sLa+YospupAsIoxw8Ndt5nI3vg==}
+    engines: {git: '>=2.11.0', node: '>=18.0.0', npm: '>=7.19.0', yarn: '>=1.7.0'}
+
+  request@2.88.2:
+    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
+    engines: {node: '>= 6'}
+    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  require-in-the-middle@7.1.1:
+    resolution: {integrity: sha512-OScOjQjrrjhAdFpQmnkE/qbIBGCRFhQB/YaJhcC3CPOlmhe7llnW46Ac1J5+EjcNXOTnDdpF96Erw/yedsGksQ==}
+    engines: {node: '>=8.6.0'}
+
+  require-like@0.1.2:
+    resolution: {integrity: sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==}
+
+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
+  requireindex@1.2.0:
+    resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==}
+    engines: {node: '>=0.10.5'}
+
+  resend@3.2.0:
+    resolution: {integrity: sha512-lDHhexiFYPoLXy7zRlJ8D5eKxoXy6Tr9/elN3+Vv7PkUoYuSSD1fpiIfa/JYXEWyiyN2UczkCTLpkT8dDPJ4Pg==}
+    engines: {node: '>=18'}
+
+  resize-observer-polyfill@1.5.1:
+    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  resolve-import@2.0.0:
+    resolution: {integrity: sha512-jpKjLibLuc8D1XEV2+7zb0aqN7I8d12u89g/v6IsgCzdVlccMQJq4TKkPw5fbhHdxhm7nbVtN+KvOTnjFf+nEA==}
+    engines: {node: 20 || >=22}
+
+  resolve-pkg-maps@1.0.0:
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+
+  resolve.exports@2.0.2:
+    resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==}
+    engines: {node: '>=10'}
+
+  resolve@1.22.8:
+    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
+    hasBin: true
+
+  resolve@2.0.0-next.4:
+    resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==}
+    hasBin: true
+
+  responselike@1.0.2:
+    resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==}
+
+  restore-cursor@3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
+
+  ret@0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+
+  ret@0.5.0:
+    resolution: {integrity: sha512-I1XxrZSQ+oErkRR4jYbAyEEu2I0avBvvMM5JN+6EBprOGRCs63ENqZ3vjavq8fBw2+62G5LF5XelKwuJpcvcxw==}
+    engines: {node: '>=10'}
+
+  retry@0.12.0:
+    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
+    engines: {node: '>= 4'}
+
+  retry@0.13.1:
+    resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}
+    engines: {node: '>= 4'}
+
+  reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rfc4648@1.5.3:
+    resolution: {integrity: sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==}
+
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
+
+  rimraf@3.0.2:
+    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rimraf@4.4.1:
+    resolution: {integrity: sha512-Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  rimraf@5.0.7:
+    resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==}
+    engines: {node: '>=14.18'}
+    hasBin: true
+
+  rimraf@6.0.1:
+    resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  robot3@0.4.1:
+    resolution: {integrity: sha512-hzjy826lrxzx8eRgv80idkf8ua1JAepRc9Efdtj03N3KNJuznQCPlyCJ7gnUmDFwZCLQjxy567mQVKmdv2BsXQ==}
+
+  robust-predicates@3.0.2:
+    resolution: {integrity: sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==}
+
+  rollup@3.29.1:
+    resolution: {integrity: sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==}
+    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  rollup@4.36.0:
+    resolution: {integrity: sha512-zwATAXNQxUcd40zgtQG0ZafcRK4g004WtEl7kbuhTWPvf07PsfohXl39jVUvPF7jvNAIkKPQ2XrsDlWuxBd++Q==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  roughjs@4.6.6:
+    resolution: {integrity: sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==}
+
+  router@2.1.0:
+    resolution: {integrity: sha512-/m/NSLxeYEgWNtyC+WtNHCF7jbGxOibVWKnn+1Psff4dJGOfoXP+MuC/f2CwSmyiHdOIzYnYFp4W6GxWfekaLA==}
+    engines: {node: '>= 18'}
+
+  router@2.2.0:
+    resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
+    engines: {node: '>= 18'}
+
+  rtl-css-js@1.16.1:
+    resolution: {integrity: sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==}
+
+  run-applescript@7.0.0:
+    resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==}
+    engines: {node: '>=18'}
+
+  run-exclusive@2.2.18:
+    resolution: {integrity: sha512-TXr1Gkl1iEAOCCpBTRm/2m0+1KGjORcWpZZ+VGGTe7dYX8E4y8/fMvrHk0zf+kclec2R//tpvdBxgG0bDgaJfw==}
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  runtypes@6.7.0:
+    resolution: {integrity: sha512-3TLdfFX8YHNFOhwHrSJza6uxVBmBrEjnNQlNXvXCdItS0Pdskfg5vVXUTWIN+Y23QR09jWpSl99UHkA83m4uWA==}
+
+  rw@1.3.3:
+    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
+
+  rxjs@7.8.2:
+    resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
+
+  sade@1.8.1:
+    resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
+    engines: {node: '>=6'}
+
+  safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+
+  safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-regex-test@1.0.0:
+    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
+
+  safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex2@5.0.0:
+    resolution: {integrity: sha512-YwJwe5a51WlK7KbOJREPdjNrpViQBI3p4T50lfwPuDhZnE3XGVTlGvi+aolc5+RvxDD6bnUmjVsU9n1eboLUYw==}
+
+  safe-stable-stringify@2.5.0:
+    resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
+    engines: {node: '>=10'}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  scheduler@0.23.0:
+    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
+
+  scheduler@0.25.0:
+    resolution: {integrity: sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==}
+
+  scheduler@0.25.0-rc.1:
+    resolution: {integrity: sha512-fVinv2lXqYpKConAMdergOl5owd0rY1O4P/QTe0aWKCqGtu7VsCt1iqQFxSJtqK4Lci/upVSBpGwVC7eWcuS9Q==}
+
+  scheduler@0.26.0:
+    resolution: {integrity: sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==}
+
+  schema-utils@3.3.0:
+    resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==}
+    engines: {node: '>= 10.13.0'}
+
+  schema-utils@4.3.3:
+    resolution: {integrity: sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==}
+    engines: {node: '>= 10.13.0'}
+
+  screenfull@5.2.0:
+    resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
+    engines: {node: '>=0.10.0'}
+
+  secure-json-parse@2.7.0:
+    resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
+
+  secure-json-parse@4.0.0:
+    resolution: {integrity: sha512-dxtLJO6sc35jWidmLxo7ij+Eg48PM/kleBsxpC8QJE0qJICe+KawkDQmvCMZUr9u7WKVHgMW6vy3fQ7zMiFZMA==}
+
+  seedrandom@3.0.5:
+    resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
+
+  selderee@0.11.0:
+    resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}
+
+  sembear@0.5.2:
+    resolution: {integrity: sha512-Ij1vCAdFgWABd7zTg50Xw1/p0JgESNxuLlneEAsmBrKishA06ulTTL/SHGmNy2Zud7+rKrHTKNI6moJsn1ppAQ==}
+
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+
+  send@0.18.0:
+    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
+    engines: {node: '>= 0.8.0'}
+
+  send@0.19.0:
+    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
+    engines: {node: '>= 0.8.0'}
+
+  send@1.1.0:
+    resolution: {integrity: sha512-v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==}
+    engines: {node: '>= 18'}
+
+  send@1.2.1:
+    resolution: {integrity: sha512-1gnZf7DFcoIcajTjTwjwuDjzuz4PPcY2StKPlsGAQ1+YH20IRVrBaXSWmdjowTJ6u8Rc01PoYOGHXfP1mYcZNQ==}
+    engines: {node: '>= 18'}
+
+  serialize-javascript@6.0.1:
+    resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
+
+  serialize-javascript@6.0.2:
+    resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
+
+  serve-static@1.16.0:
+    resolution: {integrity: sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==}
+    engines: {node: '>= 0.8.0'}
+
+  serve-static@2.1.0:
+    resolution: {integrity: sha512-A3We5UfEjG8Z7VkDv6uItWw6HY2bBSBJT1KtVESn6EOoOr2jAxNhxWCLY3jDE2WcuHXByWju74ck3ZgLwL8xmA==}
+    engines: {node: '>= 18'}
+
+  serve-static@2.2.1:
+    resolution: {integrity: sha512-xRXBn0pPqQTVQiC8wyQrKs2MOlX24zQ0POGaj0kultvoOCstBQM5yvOhAVSUwOMjQtTvsPWoNCHfPGwaaQJhTw==}
+    engines: {node: '>= 18'}
+
+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
+  set-cookie-parser@2.6.0:
+    resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
+  set-harmonic-interval@1.0.1:
+    resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==}
+    engines: {node: '>=6.9'}
+
+  setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
+  sharp@0.33.5:
+    resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
+  sharp@0.34.5:
+    resolution: {integrity: sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  shell-quote@1.8.1:
+    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
+
+  shelljs@0.8.5:
+    resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  shiki@3.13.0:
+    resolution: {integrity: sha512-aZW4l8Og16CokuCLf8CF8kq+KK2yOygapU5m3+hoGw0Mdosc6fPitjM+ujYarppj5ZIKGyPDPP1vqmQhr+5/0g==}
+
+  shimmer@1.2.1:
+    resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+
+  side-channel-list@1.0.0:
+    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-map@1.0.1:
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
+
+  side-channel-weakmap@1.0.2:
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
+
+  side-channel@1.1.0:
+    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+    engines: {node: '>= 0.4'}
+
+  siginfo@2.0.0:
+    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  simple-concat@1.0.1:
+    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+  simple-get@4.0.1:
+    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
+  simple-oauth2@5.0.0:
+    resolution: {integrity: sha512-8291lo/z5ZdpmiOFzOs1kF3cxn22bMj5FFH+DNUppLJrpoIlM1QnFiE7KpshHu3J3i21TVcx4yW+gXYjdCKDLQ==}
+
+  simple-swizzle@0.2.2:
+    resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
+
+  simplur@3.0.1:
+    resolution: {integrity: sha512-bBAoTn75tuKh83opmZ1VoyVoQIsvLCKzSxuasAxbnKofrT8eGyOEIaXSuNfhi/hI160+fwsR7ObcbBpOyzDvXg==}
+
+  sirv@2.0.4:
+    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
+    engines: {node: '>= 10'}
+
+  sisteransi@1.0.5:
+    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+
+  skin-tone@2.0.0:
+    resolution: {integrity: sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==}
+    engines: {node: '>=8'}
+
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  slash@4.0.0:
+    resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
+    engines: {node: '>=12'}
+
+  slice-ansi@4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+
+  slug@6.1.0:
+    resolution: {integrity: sha512-x6vLHCMasg4DR2LPiyFGI0gJJhywY6DTiGhCrOMzb3SOk/0JVLIaL4UhyFSHu04SD3uAavrKY/K3zZ3i6iRcgA==}
+
+  smart-buffer@4.2.0:
+    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
+    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
+
+  smartwrap@2.0.2:
+    resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  socket.io-adapter@2.5.4:
+    resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==}
+
+  socket.io-client@4.7.3:
+    resolution: {integrity: sha512-nU+ywttCyBitXIl9Xe0RSEfek4LneYkJxCeNnKCuhwoH4jGXO1ipIUw/VA/+Vvv2G1MTym11fzFC0SxkrcfXDw==}
+    engines: {node: '>=10.0.0'}
+
+  socket.io-client@4.7.5:
+    resolution: {integrity: sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==}
+    engines: {node: '>=10.0.0'}
+
+  socket.io-parser@4.2.4:
+    resolution: {integrity: sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==}
+    engines: {node: '>=10.0.0'}
+
+  socket.io@4.7.3:
+    resolution: {integrity: sha512-SE+UIQXBQE+GPG2oszWMlsEmWtHVqw/h1VrYJGK5/MC7CH5p58N448HwIrtREcvR4jfdOJAY4ieQfxMr55qbbw==}
+    engines: {node: '>=10.2.0'}
+
+  socket.io@4.7.4:
+    resolution: {integrity: sha512-DcotgfP1Zg9iP/dH9zvAQcWrE0TtbMVwXmlV4T4mqsvY+gw+LqUGPfx2AoVyRk0FLME+GQhufDMyacFmw7ksqw==}
+    engines: {node: '>=10.2.0'}
+
+  socks-proxy-agent@8.0.5:
+    resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
+    engines: {node: '>= 14'}
+
+  socks@2.8.3:
+    resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==}
+    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
+
+  sonic-boom@4.2.0:
+    resolution: {integrity: sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==}
+
+  sonner@1.0.3:
+    resolution: {integrity: sha512-hBoA2zKuYW3lUnpx4K0vAn8j77YuYiwvP9sLQfieNS2pd5FkT20sMyPTDJnl9S+5T27ZJbwQRPiujwvDBwhZQg==}
+    peerDependencies:
+      react: ^18.0.0
+      react-dom: ^18.0.0
+
+  sonner@1.3.1:
+    resolution: {integrity: sha512-+rOAO56b2eI3q5BtgljERSn2umRk63KFIvgb2ohbZ5X+Eb5u+a/7/0ZgswYqgBMg8dyl7n6OXd9KasA8QF9ToA==}
+    peerDependencies:
+      react: ^18.0.0
+      react-dom: ^18.0.0
+
+  source-map-js@1.0.2:
+    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-js@1.2.0:
+    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map@0.5.6:
+    resolution: {integrity: sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.7.4:
+    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
+    engines: {node: '>= 8'}
+
+  source-map@0.8.0-beta.0:
+    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
+    engines: {node: '>= 8'}
+    deprecated: The work that was done in this beta branch won't be included in future versions
+
+  space-separated-tokens@2.0.2:
+    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
+
+  spawndamnit@2.0.0:
+    resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==}
+
+  spdx-correct@3.1.1:
+    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
+
+  spdx-exceptions@2.3.0:
+    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
+
+  spdx-expression-parse@3.0.1:
+    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+
+  spdx-license-ids@3.0.12:
+    resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
+
+  split-ca@1.0.1:
+    resolution: {integrity: sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==}
+
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
+  sprintf-js@1.1.3:
+    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
+
+  sqids@0.3.0:
+    resolution: {integrity: sha512-lOQK1ucVg+W6n3FhRwwSeUijxe93b51Bfz5PMRMihVf1iVkl82ePQG7V5vwrhzB11v0NtsR25PSZRGiSomJaJw==}
+
+  sql-formatter@15.6.12:
+    resolution: {integrity: sha512-mkpF+RG402P66VMsnQkWewTRzDBWfu9iLbOfxaW/nAKOS/2A9MheQmcU5cmX0D0At9azrorZwpvcBRNNBozACQ==}
+    hasBin: true
+
+  sqs-consumer@7.5.0:
+    resolution: {integrity: sha512-aY3akgMjuK1aj4E7ZVAURUUnC8aNgUBES+b4SN+6ccMmJhi37MamWl7g1JbPow8sjIp1fBPz1bXCCDJmtjOTAg==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-sqs': ^3.428.0
+
+  ssh-remote-port-forward@1.0.4:
+    resolution: {integrity: sha512-x0LV1eVDwjf1gmG7TTnfqIzf+3VPRz7vrNIjX6oYLbeCrf/PeVY6hkT68Mg+q02qXxQhrLjB0jfgvhevoCRmLQ==}
+
+  ssh2@1.16.0:
+    resolution: {integrity: sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==}
+    engines: {node: '>=10.16.0'}
+
+  sshpk@1.18.0:
+    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  ssri@10.0.5:
+    resolution: {integrity: sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  stack-generator@2.0.10:
+    resolution: {integrity: sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==}
+
+  stackback@0.0.2:
+    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
+
+  stackframe@1.3.4:
+    resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==}
+
+  stacktrace-gps@3.1.2:
+    resolution: {integrity: sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==}
+
+  stacktrace-js@2.0.2:
+    resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==}
+
+  stacktrace-parser@0.1.10:
+    resolution: {integrity: sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==}
+    engines: {node: '>=6'}
+
+  standard-as-callback@2.1.0:
+    resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
+
+  statuses@2.0.1:
+    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
+    engines: {node: '>= 0.8'}
+
+  statuses@2.0.2:
+    resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+    engines: {node: '>= 0.8'}
+
+  std-env@3.7.0:
+    resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
+
+  std-env@3.8.1:
+    resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==}
+
+  std-env@3.9.0:
+    resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==}
+
+  stream-buffers@3.0.2:
+    resolution: {integrity: sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==}
+    engines: {node: '>= 0.10.0'}
+
+  stream-shift@1.0.3:
+    resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==}
+
+  stream-slice@0.1.2:
+    resolution: {integrity: sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA==}
+
+  stream-transform@2.1.3:
+    resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==}
+
+  streamdown@1.4.0:
+    resolution: {integrity: sha512-ylhDSQ4HpK5/nAH9v7OgIIdGJxlJB2HoYrYkJNGrO8lMpnWuKUcrz/A8xAMwA6eILA27469vIavcOTjmxctrKg==}
+    peerDependencies:
+      react: ^18.0.0 || ^19.0.0
+
+  streamsearch@1.1.0:
+    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
+    engines: {node: '>=10.0.0'}
+
+  streamx@2.22.0:
+    resolution: {integrity: sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==}
+
+  string-hash@1.1.3:
+    resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+
+  string.prototype.matchall@4.0.8:
+    resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==}
+
+  string.prototype.padend@3.1.4:
+    resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.6:
+    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
+
+  string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+
+  string.prototype.trimstart@1.0.6:
+    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
+  string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  stringify-entities@4.0.3:
+    resolution: {integrity: sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
+  strip-bom@3.0.0:
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
+
+  strip-final-newline@2.0.0:
+    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
+    engines: {node: '>=6'}
+
+  strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+
+  strip-final-newline@4.0.0:
+    resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
+    engines: {node: '>=18'}
+
+  strip-indent@3.0.0:
+    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
+    engines: {node: '>=8'}
+
+  strip-json-comments@2.0.1:
+    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+    engines: {node: '>=0.10.0'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  strnum@1.0.5:
+    resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
+
+  strnum@2.1.1:
+    resolution: {integrity: sha512-7ZvoFTiCnGxBtDqJ//Cu6fWtZtc7Y3x+QOirG15wztbdngGSkht27o2pyGWrVy0b4WAy3jbKmnoK6g5VlVNUUw==}
+
+  strtok3@9.1.1:
+    resolution: {integrity: sha512-FhwotcEqjr241ZbjFzjlIYg6c5/L/s4yBGWSMvJ9UoExiSqL+FnFA/CaeZx17WGaZMS/4SOZp8wH18jSS4R4lw==}
+    engines: {node: '>=16'}
+
+  style-loader@3.3.4:
+    resolution: {integrity: sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==}
+    engines: {node: '>= 12.13.0'}
+    peerDependencies:
+      webpack: ^5.0.0
+
+  style-mod@4.1.3:
+    resolution: {integrity: sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==}
+
+  style-to-js@1.1.16:
+    resolution: {integrity: sha512-/Q6ld50hKYPH3d/r6nr117TZkHR0w0kGGIVfpG9N6D8NymRPM9RqCUv4pRpJ62E5DqOYx2AFpbZMyCPnjQCnOw==}
+
+  style-to-object@0.3.0:
+    resolution: {integrity: sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==}
+
+  style-to-object@1.0.8:
+    resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==}
+
+  styled-jsx@5.1.1:
+    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
+    engines: {node: '>= 12.0.0'}
+    peerDependencies:
+      '@babel/core': '*'
+      babel-plugin-macros: '*'
+      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      babel-plugin-macros:
+        optional: true
+
+  styled-jsx@5.1.6:
+    resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
+    engines: {node: '>= 12.0.0'}
+    peerDependencies:
+      '@babel/core': '*'
+      babel-plugin-macros: '*'
+      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      babel-plugin-macros:
+        optional: true
+
+  stylis@4.3.0:
+    resolution: {integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==}
+
+  stylis@4.3.6:
+    resolution: {integrity: sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==}
+
+  sucrase@3.35.0:
+    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
+    engines: {node: '>=16 || 14 >=14.17'}
+    hasBin: true
+
+  superagent@9.0.2:
+    resolution: {integrity: sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==}
+    engines: {node: '>=14.18.0'}
+    deprecated: Please upgrade to superagent v10.2.2+, see release notes at https://github.com/forwardemail/superagent/releases/tag/v10.2.2 - maintenance is supported by Forward Email @ https://forwardemail.net
+
+  superjson@2.2.1:
+    resolution: {integrity: sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==}
+    engines: {node: '>=16'}
+
+  superstruct@2.0.2:
+    resolution: {integrity: sha512-uV+TFRZdXsqXTL2pRvujROjdZQ4RAlBUS5BTh9IGm+jTqQntYThciG/qu57Gs69yjnVUSqdxF9YLmSnpupBW9A==}
+    engines: {node: '>=14.0.0'}
+
+  supertest@7.0.0:
+    resolution: {integrity: sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==}
+    engines: {node: '>=14.18.0'}
+    deprecated: Please upgrade to supertest v7.1.3+, see release notes at https://github.com/forwardemail/supertest/releases/tag/v7.1.3 - maintenance is supported by Forward Email @ https://forwardemail.net
+
+  supports-color@10.0.0:
+    resolution: {integrity: sha512-HRVVSbCCMbj7/kdWF9Q+bbckjBHLtHMEoJWlkmYzzdwhYMkjkOwubLM6t7NbWKjgKamGDrWL1++KrjUO1t9oAQ==}
+    engines: {node: '>=18'}
+
+  supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+
+  supports-color@6.1.0:
+    resolution: {integrity: sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==}
+    engines: {node: '>=6'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+
+  supports-hyperlinks@3.1.0:
+    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
+    engines: {node: '>=14.18'}
+
+  supports-preserve-symlinks-flag@1.0.0:
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
+
+  swr@2.2.5:
+    resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==}
+    peerDependencies:
+      react: ^16.11.0 || ^17.0.0 || ^18.0.0
+
+  sync-content@2.0.1:
+    resolution: {integrity: sha512-NI1mo514yFhr8pV/5Etvgh+pSBUIpoAKoiBIUwALVlQQNAwb40bTw8hhPFaip/dvv0GhpHVOq0vq8iY02ppLTg==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  synckit@0.8.5:
+    resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+
+  systeminformation@5.27.14:
+    resolution: {integrity: sha512-3DoNDYSZBLxBwaJtQGWNpq0fonga/VZ47HY1+7/G3YoIPaPz93Df6egSzzTKbEMmlzUpy3eQ0nR9REuYIycXGg==}
+    engines: {node: '>=8.0.0'}
+    os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
+    hasBin: true
+
+  table@6.9.0:
+    resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==}
+    engines: {node: '>=10.0.0'}
+
+  tailwind-merge@1.12.0:
+    resolution: {integrity: sha512-Y17eDp7FtN1+JJ4OY0Bqv9OA41O+MS8c1Iyr3T6JFLnOgLg3EvcyMKZAnQ8AGyvB5Nxm3t9Xb5Mhe139m8QT/g==}
+
+  tailwind-merge@2.2.0:
+    resolution: {integrity: sha512-SqqhhaL0T06SW59+JVNfAqKdqLs0497esifRrZ7jOaefP3o64fdFNDMrAQWZFMxTLJPiHVjRLUywT8uFz1xNWQ==}
+
+  tailwind-merge@2.5.3:
+    resolution: {integrity: sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==}
+
+  tailwind-merge@3.0.2:
+    resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==}
+
+  tailwind-merge@3.1.0:
+    resolution: {integrity: sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==}
+
+  tailwind-merge@3.3.1:
+    resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
+
+  tailwind-scrollbar-hide@1.1.7:
+    resolution: {integrity: sha512-X324n9OtpTmOMqEgDUEA/RgLrNfBF/jwJdctaPZDzB3mppxJk7TLIDmOreEDm1Bq4R9LSPu4Epf8VSdovNU+iA==}
+
+  tailwind-scrollbar@3.0.1:
+    resolution: {integrity: sha512-mM0ecSf/RGRGWw/qB0Zg1bWhuXIkpmleNAFgMxdb4eERgA6eQ0kVouYsF3/OvBqDSK8RJikZC/ynGPxnfXeddw==}
+    engines: {node: '>=12.13.0'}
+    peerDependencies:
+      tailwindcss: 3.x
+
+  tailwindcss-animate@1.0.5:
+    resolution: {integrity: sha512-UU3qrOJ4lFQABY+MVADmBm+0KW3xZyhMdRvejwtXqYOL7YjHYxmuREFAZdmVG5LPe5E9CAst846SLC4j5I3dcw==}
+    peerDependencies:
+      tailwindcss: '>=3.0.0 || insiders'
+
+  tailwindcss-animate@1.0.7:
+    resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
+    peerDependencies:
+      tailwindcss: '>=3.0.0 || insiders'
+
+  tailwindcss-textshadow@2.1.3:
+    resolution: {integrity: sha512-FGVHfK+xnV879VSQDeRvY61Aa+b0GDiGaFBPwCOKvqIrK57GyepWJL1GydjtGOLHE9qqphFucRNj9fHramCzNg==}
+
+  tailwindcss@1.9.6:
+    resolution: {integrity: sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==}
+    engines: {node: '>=8.9.0'}
+    hasBin: true
+
+  tailwindcss@3.4.0:
+    resolution: {integrity: sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  tailwindcss@3.4.1:
+    resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  tailwindcss@4.0.17:
+    resolution: {integrity: sha512-OErSiGzRa6rLiOvaipsDZvLMSpsBZ4ysB4f0VKGXUrjw2jfkJRd6kjRKV2+ZmTCNvwtvgdDam5D7w6WXsdLJZw==}
+
+  tapable@2.2.1:
+    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
+    engines: {node: '>=6'}
+
+  tapable@2.3.0:
+    resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
+    engines: {node: '>=6'}
+
+  tar-fs@2.1.3:
+    resolution: {integrity: sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==}
+
+  tar-fs@3.0.9:
+    resolution: {integrity: sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==}
+
+  tar-fs@3.1.0:
+    resolution: {integrity: sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==}
+
+  tar-stream@2.2.0:
+    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+    engines: {node: '>=6'}
+
+  tar-stream@3.1.7:
+    resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
+
+  tar@6.1.13:
+    resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==}
+    engines: {node: '>=10'}
+    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me
+
+  tar@6.2.1:
+    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
+    engines: {node: '>=10'}
+    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me
+
+  tar@7.4.3:
+    resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
+    engines: {node: '>=18'}
+    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exhorbitant rates) by contacting i@izs.me
+
+  tar@7.5.6:
+    resolution: {integrity: sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA==}
+    engines: {node: '>=18'}
+
+  tdigest@0.1.2:
+    resolution: {integrity: sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==}
+
+  term-size@2.2.1:
+    resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==}
+    engines: {node: '>=8'}
+
+  terser-webpack-plugin@5.3.14:
+    resolution: {integrity: sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
+
+  terser-webpack-plugin@5.3.7:
+    resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
+
+  terser@5.44.1:
+    resolution: {integrity: sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  test-exclude@7.0.1:
+    resolution: {integrity: sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==}
+    engines: {node: '>=18'}
+
+  testcontainers@10.28.0:
+    resolution: {integrity: sha512-1fKrRRCsgAQNkarjHCMKzBKXSJFmzNTiTbhb5E/j5hflRXChEtHvkefjaHlgkNUjfw92/Dq8LTgwQn6RDBFbMg==}
+
+  text-decoder@1.2.0:
+    resolution: {integrity: sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==}
+
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
+  thenify-all@1.6.0:
+    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
+    engines: {node: '>=0.8'}
+
+  thenify@3.3.1:
+    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
+
+  thread-stream@3.1.0:
+    resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==}
+
+  throttle-debounce@3.0.1:
+    resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==}
+    engines: {node: '>=10'}
+
+  throttleit@2.1.0:
+    resolution: {integrity: sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==}
+    engines: {node: '>=18'}
+
+  through2@2.0.5:
+    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
+
+  tiny-case@1.0.3:
+    resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
+
+  tiny-glob@0.2.9:
+    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
+
+  tiny-invariant@1.3.1:
+    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
+
+  tinybench@2.9.0:
+    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+
+  tinycolor2@1.6.0:
+    resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
+
+  tinyexec@0.3.0:
+    resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==}
+
+  tinyexec@0.3.1:
+    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
+
+  tinyexec@0.3.2:
+    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
+
+  tinyexec@1.0.1:
+    resolution: {integrity: sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==}
+
+  tinyglobby@0.2.10:
+    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
+    engines: {node: '>=12.0.0'}
+
+  tinyglobby@0.2.12:
+    resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==}
+    engines: {node: '>=12.0.0'}
+
+  tinyglobby@0.2.13:
+    resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==}
+    engines: {node: '>=12.0.0'}
+
+  tinyglobby@0.2.2:
+    resolution: {integrity: sha512-mZ2sDMaySvi1PkTp4lTo1In2zjU+cY8OvZsfwrDrx3YGRbXPX1/cbPwCR9zkm3O/Fz9Jo0F1HNgIQ1b8BepqyQ==}
+    engines: {node: '>=12.0.0'}
+
+  tinygradient@1.1.5:
+    resolution: {integrity: sha512-8nIfc2vgQ4TeLnk2lFj4tRLvvJwEfQuabdsmvDdQPT0xlk9TaNtpGd6nNRxXoK6vQhN6RSzj+Cnp5tTQmpxmbw==}
+
+  tinypool@1.0.2:
+    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+
+  tinyrainbow@1.2.0:
+    resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==}
+    engines: {node: '>=14.0.0'}
+
+  tinyrainbow@2.0.0:
+    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
+    engines: {node: '>=14.0.0'}
+
+  tinyspy@3.0.2:
+    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
+    engines: {node: '>=14.0.0'}
+
+  tldts-core@7.0.7:
+    resolution: {integrity: sha512-ECqb8imSroX1UmUuhRBNPkkmtZ8mHEenieim80UVxG0M5wXVjY2Fp2tYXCPvk+nLy1geOhFpeD5YQhM/gF63Jg==}
+
+  tldts@7.0.7:
+    resolution: {integrity: sha512-ETNXj36ql5BXDa4VVJk3wgqansg8TI1Yqo217twSAPjyDnh/b2T+XzrI0ftn6EnzVPbXpMTZHOWj5s3a8/uGPA==}
+    hasBin: true
+
+  tmp-promise@3.0.3:
+    resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==}
+
+  tmp@0.0.33:
+    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
+    engines: {node: '>=0.6.0'}
+
+  tmp@0.2.3:
+    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+    engines: {node: '>=14.14'}
+
+  to-fast-properties@2.0.0:
+    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
+    engines: {node: '>=4'}
+
+  to-readable-stream@1.0.0:
+    resolution: {integrity: sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==}
+    engines: {node: '>=6'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  toad-cache@3.7.0:
+    resolution: {integrity: sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==}
+    engines: {node: '>=12'}
+
+  toggle-selection@1.0.6:
+    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
+
+  toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
+  token-types@6.0.3:
+    resolution: {integrity: sha512-IKJ6EzuPPWtKtEIEPpIdXv9j5j2LGJEYk0CKY2efgKoYKLBiZdh6iQkLVBow/CB3phyWAWCyk+bZeaimJn6uRQ==}
+    engines: {node: '>=14.16'}
+
+  toml@3.0.0:
+    resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==}
+
+  toposort@2.0.2:
+    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
+
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
+  tough-cookie@2.5.0:
+    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
+    engines: {node: '>=0.8'}
+
+  tr46@0.0.3:
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+
+  tr46@1.0.1:
+    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+
+  tree-kill@1.2.2:
+    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
+    hasBin: true
+
+  trim-lines@3.0.1:
+    resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
+
+  trim-newlines@3.0.1:
+    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
+    engines: {node: '>=8'}
+
+  trough@2.1.0:
+    resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==}
+
+  trouter@2.0.1:
+    resolution: {integrity: sha512-kr8SKKw94OI+xTGOkfsvwZQ8mWoikZDd2n8XZHjJVZUARZT+4/VV6cacRS6CLsH9bNm+HFIPU1Zx4CnNnb4qlQ==}
+    engines: {node: '>=6'}
+
+  ts-dedent@2.2.0:
+    resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
+    engines: {node: '>=6.10'}
+
+  ts-easing@0.2.0:
+    resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==}
+
+  ts-essentials@10.0.1:
+    resolution: {integrity: sha512-HPH+H2bkkO8FkMDau+hFvv7KYozzned9Zr1Urn7rRPXMF4mZmCKOq+u4AI1AAW+2bofIOXTuSdKo9drQuni2dQ==}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  ts-expose-internals-conditionally@1.0.0-empty.0:
+    resolution: {integrity: sha512-F8m9NOF6ZhdOClDVdlM8gj3fDCav4ZIFSs/EI3ksQbAAXVSCN/Jh5OCJDDZWBuBy9psFc6jULGDlPwjMYMhJDw==}
+
+  ts-interface-checker@0.1.13:
+    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
+
+  ts-poet@6.6.0:
+    resolution: {integrity: sha512-4vEH/wkhcjRPFOdBwIh9ItO6jOoumVLRF4aABDX5JSNEubSqwOulihxQPqai+OkuygJm3WYMInxXQX4QwVNMuw==}
+
+  ts-proto-descriptors@1.15.0:
+    resolution: {integrity: sha512-TYyJ7+H+7Jsqawdv+mfsEpZPTIj9siDHS6EMCzG/z3b/PZiphsX+mWtqFfFVe5/N0Th6V3elK9lQqjnrgTOfrg==}
+
+  ts-proto@1.167.3:
+    resolution: {integrity: sha512-quBKTeIgqhTGKXl5JN7HHZjLwrdMaNIoQ0+X11PqNLVRqTlnEzfiCUXM6HOW4pZa6PD5+qSyKOEGaTa3kS7Glg==}
+    hasBin: true
+
+  tsafe@1.4.1:
+    resolution: {integrity: sha512-3IDBalvf6SyvHFS14UiwCWzqdSdo+Q0k2J7DZyJYaHW/iraW9DJpaBKDJpry3yQs3o/t/A+oGaRW3iVt2lKxzA==}
+
+  tsconfck@2.1.2:
+    resolution: {integrity: sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg==}
+    engines: {node: ^14.13.1 || ^16 || >=18}
+    hasBin: true
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  tsconfck@3.1.3:
+    resolution: {integrity: sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==}
+    engines: {node: ^18 || >=20}
+    hasBin: true
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  tsconfig-paths@3.14.1:
+    resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
+
+  tsconfig-paths@3.15.0:
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+
+  tsconfig-paths@4.2.0:
+    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
+    engines: {node: '>=6'}
+
+  tshy@3.0.2:
+    resolution: {integrity: sha512-8GkWnAfmNXxl8iDTZ1o2H4jdaj9H7HeDKkr5qd0ZhQBCNA41D3xqTyg2Ycs51VCfmjJ5e+0v9AUmD6ylAI9Bgw==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
+  tslib@1.14.1:
+    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+
+  tslib@2.4.1:
+    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
+
+  tslib@2.5.0:
+    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
+
+  tslib@2.6.2:
+    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tsup@8.4.0:
+    resolution: {integrity: sha512-b+eZbPCjz10fRryaAA7C8xlIHnf8VnsaRqydheLIqwG/Mcpfk8Z5zp3HayX7GaTygkigHl5cBUs+IhcySiIexQ==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      '@microsoft/api-extractor': ^7.36.0
+      '@swc/core': ^1
+      postcss: ^8.4.12
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      '@microsoft/api-extractor':
+        optional: true
+      '@swc/core':
+        optional: true
+      postcss:
+        optional: true
+      typescript:
+        optional: true
+
+  tsutils@3.21.0:
+    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
+    engines: {node: '>= 6'}
+    peerDependencies:
+      typescript: 5.5.4
+
+  tsx@3.12.2:
+    resolution: {integrity: sha512-ykAEkoBg30RXxeOMVeZwar+JH632dZn9EUJVyJwhfag62k6UO/dIyJEV58YuLF6e5BTdV/qmbQrpkWqjq9cUnQ==}
+    hasBin: true
+
+  tsx@4.17.0:
+    resolution: {integrity: sha512-eN4mnDA5UMKDt4YZixo9tBioibaMBpoxBkD+rIPAjVmYERSG0/dWEY1CEFuV89CgASlKL499q8AhmkMnnjtOJg==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  tsx@4.19.3:
+    resolution: {integrity: sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  tsx@4.20.6:
+    resolution: {integrity: sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  tsx@4.7.1:
+    resolution: {integrity: sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  tty-table@4.1.6:
+    resolution: {integrity: sha512-kRj5CBzOrakV4VRRY5kUWbNYvo/FpOsz65DzI5op9P+cHov3+IqPbo1JE1ZnQGkHdZgNFDsrEjrfqqy/Ply9fw==}
+    engines: {node: '>=8.0.0'}
+    hasBin: true
+
+  tunnel-agent@0.6.0:
+    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
+  turbo-darwin-64@1.10.3:
+    resolution: {integrity: sha512-IIB9IomJGyD3EdpSscm7Ip1xVWtYb7D0x7oH3vad3gjFcjHJzDz9xZ/iw/qItFEW+wGFcLSRPd+1BNnuLM8AsA==}
+    cpu: [x64]
+    os: [darwin]
+
+  turbo-darwin-arm64@1.10.3:
+    resolution: {integrity: sha512-SBNmOZU9YEB0eyNIxeeQ+Wi0Ufd+nprEVp41rgUSRXEIpXjsDjyBnKnF+sQQj3+FLb4yyi/yZQckB+55qXWEsw==}
+    cpu: [arm64]
+    os: [darwin]
+
+  turbo-linux-64@1.10.3:
+    resolution: {integrity: sha512-kvAisGKE7xHJdyMxZLvg53zvHxjqPK1UVj4757PQqtx9dnjYHSc8epmivE6niPgDHon5YqImzArCjVZJYpIGHQ==}
+    cpu: [x64]
+    os: [linux]
+
+  turbo-linux-arm64@1.10.3:
+    resolution: {integrity: sha512-Qgaqln0IYRgyL0SowJOi+PNxejv1I2xhzXOI+D+z4YHbgSx87ox1IsALYBlK8VRVYY8VCXl+PN12r1ioV09j7A==}
+    cpu: [arm64]
+    os: [linux]
+
+  turbo-windows-64@1.10.3:
+    resolution: {integrity: sha512-rbH9wManURNN8mBnN/ZdkpUuTvyVVEMiUwFUX4GVE5qmV15iHtZfDLUSGGCP2UFBazHcpNHG1OJzgc55GFFrUw==}
+    cpu: [x64]
+    os: [win32]
+
+  turbo-windows-arm64@1.10.3:
+    resolution: {integrity: sha512-ThlkqxhcGZX39CaTjsHqJnqVe+WImjX13pmjnpChz6q5HHbeRxaJSFzgrHIOt0sUUVx90W/WrNRyoIt/aafniw==}
+    cpu: [arm64]
+    os: [win32]
+
+  turbo@1.10.3:
+    resolution: {integrity: sha512-U4gKCWcKgLcCjQd4Pl8KJdfEKumpyWbzRu75A6FCj6Ctea1PIm58W6Ltw1QXKqHrl2pF9e1raAskf/h6dlrPCA==}
+    hasBin: true
+
+  tw-animate-css@1.2.4:
+    resolution: {integrity: sha512-yt+HkJB41NAvOffe4NweJU6fLqAlVx/mBX6XmHRp15kq0JxTtOKaIw8pVSWM1Z+n2nXtyi7cW6C9f0WG/F/QAQ==}
+
+  tweetnacl@0.14.5:
+    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-fest@0.13.1:
+    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
+    engines: {node: '>=10'}
+
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
+  type-fest@0.6.0:
+    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
+    engines: {node: '>=8'}
+
+  type-fest@0.7.1:
+    resolution: {integrity: sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==}
+    engines: {node: '>=8'}
+
+  type-fest@0.8.1:
+    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
+    engines: {node: '>=8'}
+
+  type-fest@2.19.0:
+    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
+    engines: {node: '>=12.20'}
+
+  type-fest@4.33.0:
+    resolution: {integrity: sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==}
+    engines: {node: '>=16'}
+
+  type-is@1.6.18:
+    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
+    engines: {node: '>= 0.6'}
+
+  type-is@2.0.0:
+    resolution: {integrity: sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw==}
+    engines: {node: '>= 0.6'}
+
+  type-is@2.0.1:
+    resolution: {integrity: sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==}
+    engines: {node: '>= 0.6'}
+
+  typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.4:
+    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
+
+  typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
+
+  typed-emitter@2.1.0:
+    resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==}
+
+  typed-query-selector@2.12.0:
+    resolution: {integrity: sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==}
+
+  typescript@5.5.4:
+    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  ufo@1.5.4:
+    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
+
+  ufo@1.6.1:
+    resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==}
+
+  uid2@1.0.0:
+    resolution: {integrity: sha512-+I6aJUv63YAcY9n4mQreLUt0d4lvwkkopDNmpomkAUz0fAkEMV9pRWxN0EjhW1YfRhcuyHg2v3mwddCDW1+LFQ==}
+    engines: {node: '>= 4.0.0'}
+
+  uint8array-extras@1.4.0:
+    resolution: {integrity: sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==}
+    engines: {node: '>=18'}
+
+  ulid@2.3.0:
+    resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
+    hasBin: true
+
+  ulidx@2.2.1:
+    resolution: {integrity: sha512-DU9F5t1tihdafuNyW3fIrXUFHHiHxmwuQSGVGIbSpqkc93IH4P0dU8nPhk0gOW7ARxaFu4+P/9cxVwn6PdnIaQ==}
+    engines: {node: '>=16'}
+
+  unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+
+  uncrypto@0.1.3:
+    resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
+
+  undici-types@5.26.5:
+    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
+
+  undici@5.29.0:
+    resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==}
+    engines: {node: '>=14.0'}
+
+  unicode-emoji-modifier-base@1.0.0:
+    resolution: {integrity: sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==}
+    engines: {node: '>=4'}
+
+  unicorn-magic@0.1.0:
+    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+    engines: {node: '>=18'}
+
+  unicorn-magic@0.3.0:
+    resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
+    engines: {node: '>=18'}
+
+  unified@10.1.2:
+    resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==}
+
+  unified@11.0.5:
+    resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
+
+  unique-filename@3.0.0:
+    resolution: {integrity: sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  unique-slug@4.0.0:
+    resolution: {integrity: sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  unist-util-find-after@5.0.0:
+    resolution: {integrity: sha512-amQa0Ep2m6hE2g72AugUItjbuM8X8cGQnFoHk0pGfrFeT9GZhzN5SW8nRsiGKK7Aif4CrACPENkA6P/Lw6fHGQ==}
+
+  unist-util-generated@2.0.0:
+    resolution: {integrity: sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==}
+
+  unist-util-is@5.1.1:
+    resolution: {integrity: sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==}
+
+  unist-util-is@6.0.0:
+    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
+
+  unist-util-position-from-estree@1.1.1:
+    resolution: {integrity: sha512-xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw==}
+
+  unist-util-position@4.0.3:
+    resolution: {integrity: sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==}
+
+  unist-util-position@5.0.0:
+    resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
+
+  unist-util-remove-position@4.0.1:
+    resolution: {integrity: sha512-0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ==}
+
+  unist-util-remove-position@5.0.0:
+    resolution: {integrity: sha512-Hp5Kh3wLxv0PHj9m2yZhhLt58KzPtEYKQQ4yxfYFEO7EvHwzyDYnduhHnY1mDxoqr7VUwVuHXk9RXKIiYS1N8Q==}
+
+  unist-util-stringify-position@3.0.2:
+    resolution: {integrity: sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==}
+
+  unist-util-stringify-position@4.0.0:
+    resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
+
+  unist-util-visit-parents@5.1.1:
+    resolution: {integrity: sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==}
+
+  unist-util-visit-parents@6.0.1:
+    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
+
+  unist-util-visit@4.1.2:
+    resolution: {integrity: sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==}
+
+  unist-util-visit@5.0.0:
+    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
+
+  universal-cookie@7.2.0:
+    resolution: {integrity: sha512-PvcyflJAYACJKr28HABxkGemML5vafHmiL4ICe3e+BEKXRMt0GaFLZhAwgv637kFFnnfiSJ8e6jknrKkMrU+PQ==}
+
+  universal-github-app-jwt@1.2.0:
+    resolution: {integrity: sha512-dncpMpnsKBk0eetwfN8D8OUHGfiDhhJ+mtsbMl+7PfW7mYjiH8LIcqRmYMtzYLgSh47HjfdBtrBwIQ/gizKR3g==}
+
+  universal-user-agent@6.0.1:
+    resolution: {integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==}
+
+  universalify@0.1.2:
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
+
+  universalify@2.0.0:
+    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
+    engines: {node: '>= 10.0.0'}
+
+  unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  update-browserslist-db@1.0.11:
+    resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  update-browserslist-db@1.1.2:
+    resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  update-browserslist-db@1.1.4:
+    resolution: {integrity: sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  uploadthing@7.1.0:
+    resolution: {integrity: sha512-l1bRHs+q/YLx3XwBav98t4Bl1wLWaskhPEwopxtYgiRrxX5nW3uUuSP0RJ9eKwx0+6ZhHWxHDvShf7ZLledqmQ==}
+    engines: {node: '>=18.13.0'}
+    peerDependencies:
+      express: '*'
+      fastify: '*'
+      h3: '*'
+      next: '*'
+      tailwindcss: '*'
+    peerDependenciesMeta:
+      express:
+        optional: true
+      fastify:
+        optional: true
+      h3:
+        optional: true
+      next:
+        optional: true
+      tailwindcss:
+        optional: true
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  url-parse-lax@3.0.0:
+    resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==}
+    engines: {node: '>=4'}
+
+  urlpattern-polyfill@9.0.0:
+    resolution: {integrity: sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==}
+
+  use-callback-ref@1.3.3:
+    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-isomorphic-layout-effect@1.1.2:
+    resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-sidecar@1.1.3:
+    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
+  use-sync-external-store@1.2.2:
+    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
+    peerDependencies:
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  util@0.12.5:
+    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
+
+  utils-merge@1.0.1:
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
+    engines: {node: '>= 0.4.0'}
+
+  uuid@10.0.0:
+    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
+    hasBin: true
+
+  uuid@11.1.0:
+    resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
+    hasBin: true
+
+  uuid@3.4.0:
+    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
+    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+    hasBin: true
+
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
+
+  uuid@9.0.0:
+    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
+    hasBin: true
+
+  uuid@9.0.1:
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
+    hasBin: true
+
+  uvu@0.5.6:
+    resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  valibot@1.1.0:
+    resolution: {integrity: sha512-Nk8lX30Qhu+9txPYTwM0cFlWLdPFsFr6LblzqIySfbZph9+BFsAHsNvHOymEviUepeIW6KFHzpX8TKhbptBXXw==}
+    peerDependencies:
+      typescript: 5.5.4
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  validate-npm-package-license@3.0.4:
+    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+
+  validate-npm-package-name@3.0.0:
+    resolution: {integrity: sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==}
+
+  validate-npm-package-name@5.0.0:
+    resolution: {integrity: sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  validate.io-array@1.0.6:
+    resolution: {integrity: sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==}
+
+  validate.io-function@1.0.2:
+    resolution: {integrity: sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==}
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
+  verror@1.10.0:
+    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
+    engines: {'0': node >=0.6.0}
+
+  vfile-location@4.0.1:
+    resolution: {integrity: sha512-JDxPlTbZrZCQXogGheBHjbRWjESSPEak770XwWPfw5mTc1v1nWGLB/apzZxsx8a0SJVfF8HK8ql8RD308vXRUw==}
+
+  vfile-location@5.0.3:
+    resolution: {integrity: sha512-5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==}
+
+  vfile-message@3.1.3:
+    resolution: {integrity: sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA==}
+
+  vfile-message@4.0.2:
+    resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
+
+  vfile@5.3.7:
+    resolution: {integrity: sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==}
+
+  vfile@6.0.3:
+    resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
+
+  victory-vendor@36.6.11:
+    resolution: {integrity: sha512-nT8kCiJp8dQh8g991J/R5w5eE2KnO8EAIP0xocWlh9l2okngMWglOPoMZzJvek8Q1KUc4XE/mJxTZnvOB1sTYg==}
+
+  vite-node@0.28.5:
+    resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
+    engines: {node: '>=v14.16.0'}
+    hasBin: true
+
+  vite-node@3.1.4:
+    resolution: {integrity: sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+
+  vite-tsconfig-paths@4.0.5:
+    resolution: {integrity: sha512-/L/eHwySFYjwxoYt1WRJniuK/jPv+WGwgRGBYx3leciR5wBeqntQpUE6Js6+TJemChc+ter7fDBKieyEWDx4yQ==}
+
+  vite@4.4.9:
+    resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': 20.14.14
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+
+  vite@5.4.21:
+    resolution: {integrity: sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': 20.14.14
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.4.0
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+
+  vitest@3.1.4:
+    resolution: {integrity: sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@edge-runtime/vm': '*'
+      '@types/debug': ^4.1.12
+      '@types/node': 20.14.14
+      '@vitest/browser': 3.1.4
+      '@vitest/ui': 3.1.4
+      happy-dom: '*'
+      jsdom: '*'
+    peerDependenciesMeta:
+      '@edge-runtime/vm':
+        optional: true
+      '@types/debug':
+        optional: true
+      '@types/node':
+        optional: true
+      '@vitest/browser':
+        optional: true
+      '@vitest/ui':
+        optional: true
+      happy-dom:
+        optional: true
+      jsdom:
+        optional: true
+
+  vscode-jsonrpc@8.2.0:
+    resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==}
+    engines: {node: '>=14.0.0'}
+
+  vscode-languageserver-protocol@3.17.5:
+    resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==}
+
+  vscode-languageserver-textdocument@1.0.12:
+    resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==}
+
+  vscode-languageserver-types@3.17.5:
+    resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==}
+
+  vscode-languageserver@9.0.1:
+    resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==}
+    hasBin: true
+
+  vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
+
+  w3c-keyname@2.2.8:
+    resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
+
+  walk-up-path@4.0.0:
+    resolution: {integrity: sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==}
+    engines: {node: 20 || >=22}
+
+  warning@4.0.3:
+    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
+
+  watchpack@2.4.0:
+    resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
+    engines: {node: '>=10.13.0'}
+
+  watchpack@2.4.4:
+    resolution: {integrity: sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==}
+    engines: {node: '>=10.13.0'}
+
+  wcwidth@1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+
+  web-encoding@1.1.5:
+    resolution: {integrity: sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==}
+
+  web-namespaces@2.0.1:
+    resolution: {integrity: sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==}
+
+  web-streams-polyfill@3.2.1:
+    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
+    engines: {node: '>= 8'}
+
+  web-streams-polyfill@4.0.0-beta.3:
+    resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
+    engines: {node: '>= 14'}
+
+  webidl-conversions@3.0.1:
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+
+  webidl-conversions@4.0.2:
+    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+
+  webpack-bundle-analyzer@4.10.1:
+    resolution: {integrity: sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==}
+    engines: {node: '>= 10.13.0'}
+    hasBin: true
+
+  webpack-sources@3.2.3:
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
+    engines: {node: '>=10.13.0'}
+
+  webpack-sources@3.3.3:
+    resolution: {integrity: sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==}
+    engines: {node: '>=10.13.0'}
+
+  webpack@5.102.1:
+    resolution: {integrity: sha512-7h/weGm9d/ywQ6qzJ+Xy+r9n/3qgp/thalBbpOi5i223dPXKi04IBtqPN9nTd+jBc7QKfvDbaBnFipYp4sJAUQ==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
+
+  webpack@5.88.2:
+    resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
+
+  whatwg-url@5.0.0:
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+
+  whatwg-url@7.1.0:
+    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
+
+  which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+
+  which-module@2.0.0:
+    resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
+
+  which-pm@2.0.0:
+    resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==}
+    engines: {node: '>=8.15'}
+
+  which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  which@3.0.1:
+    resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    hasBin: true
+
+  why-is-node-running@2.3.0:
+    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
+    engines: {node: '>=8'}
+    hasBin: true
+
+  word-wrap@1.2.3:
+    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
+    engines: {node: '>=0.10.0'}
+
+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  ws@8.17.1:
+    resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  xdg-app-paths@8.3.0:
+    resolution: {integrity: sha512-mgxlWVZw0TNWHoGmXq+NC3uhCIc55dDpAlDkMQUaIAcQzysb0kxctwv//fvuW61/nAAeUBJMQ8mnZjMmuYwOcQ==}
+    engines: {node: '>= 4.0'}
+
+  xdg-portable@10.6.0:
+    resolution: {integrity: sha512-xrcqhWDvtZ7WLmt8G4f3hHy37iK7D2idtosRgkeiSPZEPmBShp0VfmRBLWAPC6zLF48APJ21yfea+RfQMF4/Aw==}
+    engines: {node: '>= 4.0'}
+
+  xmlhttprequest-ssl@2.0.0:
+    resolution: {integrity: sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==}
+    engines: {node: '>=0.4.0'}
+
+  xstate@5.18.1:
+    resolution: {integrity: sha512-m02IqcCQbaE/kBQLunwub/5i8epvkD2mFutnL17Oeg1eXTShe1sRF4D5mhv1dlaFO4vbW5gRGRhraeAD5c938g==}
+
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yallist@3.1.1:
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+
+  yallist@4.0.0:
+    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+
+  yallist@5.0.0:
+    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
+    engines: {node: '>=18'}
+
+  yaml@2.7.1:
+    resolution: {integrity: sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==}
+    engines: {node: '>= 14'}
+    hasBin: true
+
+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
+  yargs-parser@20.2.9:
+    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
+    engines: {node: '>=10'}
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+
+  yargs@16.2.0:
+    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
+    engines: {node: '>=10'}
+
+  yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+
+  yauzl@2.10.0:
+    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  yocto-queue@1.1.1:
+    resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
+    engines: {node: '>=12.20'}
+
+  yoctocolors@2.1.2:
+    resolution: {integrity: sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==}
+    engines: {node: '>=18'}
+
+  yup@1.6.1:
+    resolution: {integrity: sha512-JED8pB50qbA4FOkDol0bYF/p60qSEDQqBD0/qeIrUCG1KbPBIQ776fCUNb9ldbPcSTxA69g/47XTo4TqWiuXOA==}
+
+  yup@1.7.0:
+    resolution: {integrity: sha512-VJce62dBd+JQvoc+fCVq+KZfPHr+hXaxCcVgotfwWvlR0Ja3ffYKaJBT8rptPOSKOGJDCUnW2C2JWpud7aRP6Q==}
+
+  zip-stream@6.0.1:
+    resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
+    engines: {node: '>= 14'}
+
+  zod-error@1.5.0:
+    resolution: {integrity: sha512-zzopKZ/skI9iXpqCEPj+iLCKl9b88E43ehcU+sbRoHuwGd9F1IDVGQ70TyO6kmfiRL1g4IXkjsXK+g1gLYl4WQ==}
+
+  zod-to-json-schema@3.24.5:
+    resolution: {integrity: sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==}
+    peerDependencies:
+      zod: ^3.24.1
+
+  zod-to-json-schema@3.24.6:
+    resolution: {integrity: sha512-h/z3PKvcTcTetyjl1fkj79MHNEjm+HpD6NXheWjzOekY7kV+lwDYnHw+ivHkijnCSMz1yJaWBD9vu/Fcmk+vEg==}
+    peerDependencies:
+      zod: ^3.24.1
+
+  zod-to-json-schema@3.25.0:
+    resolution: {integrity: sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ==}
+    peerDependencies:
+      zod: ^3.25 || ^4
+
+  zod-to-json-schema@3.25.1:
+    resolution: {integrity: sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==}
+    peerDependencies:
+      zod: ^3.25 || ^4
+
+  zod-validation-error@1.5.0:
+    resolution: {integrity: sha512-/7eFkAI4qV0tcxMBB/3+d2c1P6jzzZYdYSlBuAklzMuCrJu5bzJfHS0yVAS87dRHVlhftd6RFJDIvv03JgkSbw==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      zod: ^3.18.0
+
+  zod@3.23.8:
+    resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
+
+  zod@3.25.76:
+    resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}
+
+  zustand@4.5.5:
+    resolution: {integrity: sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==}
+    engines: {node: '>=12.7.0'}
+    peerDependencies:
+      '@types/react': '>=16.8'
+      immer: '>=9.0.6'
+      react: '>=16.8'
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      immer:
+        optional: true
+      react:
+        optional: true
 
-packages:
+  zwitch@2.0.4:
+    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
+
+snapshots:
 
-  /@1password/sdk-core@0.3.0:
-    resolution: {integrity: sha512-2ZBshSguEe8TSwJrW7Ur1HMZhfE5UxV6dCzxzGfIHd1VO2ZbzadOFqubZwNQYAJJKR8lvZJJMTLvYiYkUa2hEw==}
-    dev: false
+  '@adobe/css-tools@4.4.0': {}
 
-  /@1password/sdk@0.3.0:
-    resolution: {integrity: sha512-JIvZ8F3MCVW4ebxIdw2KjzeoAtQw6387zDNFhWQpZJBLR6LoJwsG5fXEHFF5FjLitRgIua9qtq9Bj59QkU1k/A==}
+  '@ai-sdk/anthropic@2.0.4(zod@3.25.76)':
     dependencies:
-      '@1password/sdk-core': 0.3.0
-    dev: false
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.3(zod@3.25.76)
+      zod: 3.25.76
 
-  /@adobe/css-tools@4.4.0:
-    resolution: {integrity: sha512-Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==}
-    dev: false
+  '@ai-sdk/gateway@1.0.6(zod@3.25.76)':
+    dependencies:
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.3(zod@3.25.76)
+      zod: 3.25.76
 
-  /@ai-sdk/anthropic@1.2.4(zod@3.23.8):
-    resolution: {integrity: sha512-dAN6MXvLffeFVAr2gz3RGvOTgX1KL/Yn5q1l4/Dt0TUeDjQgCt4AbbYxZZB2qIAYzQvoyAFPhlw0sB3nNizG/g==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
+  '@ai-sdk/gateway@2.0.0(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider': 1.1.0
-      '@ai-sdk/provider-utils': 2.2.3(zod@3.23.8)
-      zod: 3.23.8
-    dev: false
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.12(zod@3.25.76)
+      '@vercel/oidc': 3.0.3
+      zod: 3.25.76
 
-  /@ai-sdk/openai@1.0.1(zod@3.23.8):
-    resolution: {integrity: sha512-snZge8457afWlosVNUn+BG60MrxAPOOm3zmIMxJZih8tneNSiRbTVCbSzAtq/9vsnOHDe5RR83PRl85juOYEnA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
+  '@ai-sdk/gateway@3.0.2(zod@3.25.76)':
+    dependencies:
+      '@ai-sdk/provider': 3.0.0
+      '@ai-sdk/provider-utils': 4.0.1(zod@3.25.76)
+      '@vercel/oidc': 3.0.5
+      zod: 3.25.76
+
+  '@ai-sdk/openai@1.0.1(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.0.0
-      '@ai-sdk/provider-utils': 2.0.0(zod@3.23.8)
-      zod: 3.23.8
-    dev: false
+      '@ai-sdk/provider-utils': 2.0.0(zod@3.25.76)
+      zod: 3.25.76
 
-  /@ai-sdk/openai@1.3.23(zod@3.23.8):
-    resolution: {integrity: sha512-86U7rFp8yacUAOE/Jz8WbGcwMCqWvjK33wk5DXkfnAOEn3mx2r7tNSJdjukQFZbAK97VMXGPPHxF+aEARDXRXQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
+  '@ai-sdk/openai@1.3.23(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.23.8)
-      zod: 3.23.8
-    dev: false
+      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.76)
+      zod: 3.25.76
 
-  /@ai-sdk/openai@1.3.3(zod@3.23.8):
-    resolution: {integrity: sha512-CH57tonLB4DwkwqwnMmTCoIOR7cNW3bP5ciyloI7rBGJS/Bolemsoo+vn5YnwkyT9O1diWJyvYeTh7A4UfiYOw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
+  '@ai-sdk/openai@1.3.3(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.1.0
-      '@ai-sdk/provider-utils': 2.2.1(zod@3.23.8)
-      zod: 3.23.8
-    dev: false
+      '@ai-sdk/provider-utils': 2.2.1(zod@3.25.76)
+      zod: 3.25.76
 
-  /@ai-sdk/provider-utils@1.0.17(zod@3.23.8):
-    resolution: {integrity: sha512-2VyeTH5DQ6AxqvwdyytKIeiZyYTyJffpufWjE67zM2sXMIHgYl7fivo8m5wVl6Cbf1dFPSGKq//C9s+lz+NHrQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  '@ai-sdk/openai@2.0.14(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider': 0.0.22
-      eventsource-parser: 1.1.2
-      nanoid: 3.3.6
-      secure-json-parse: 2.7.0
-      zod: 3.23.8
-    dev: false
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.3(zod@3.25.76)
+      zod: 3.25.76
 
-  /@ai-sdk/provider-utils@1.0.22(zod@3.23.8):
-    resolution: {integrity: sha512-YHK2rpj++wnLVc9vPGzGFP3Pjeld2MwhKinetA0zKXOoHAT/Jit5O8kZsxcSlJPu9wvcGT1UGZEjZrtO7PfFOQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  '@ai-sdk/openai@2.0.53(zod@3.25.76)':
+    dependencies:
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.12(zod@3.25.76)
+      zod: 3.25.76
+
+  '@ai-sdk/provider-utils@1.0.22(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 0.0.26
       eventsource-parser: 1.1.2
       nanoid: 3.3.8
       secure-json-parse: 2.7.0
-      zod: 3.23.8
-    dev: true
+    optionalDependencies:
+      zod: 3.25.76
 
-  /@ai-sdk/provider-utils@2.0.0(zod@3.23.8):
-    resolution: {integrity: sha512-uITgVJByhtzuQU2ZW+2CidWRmQqTUTp6KADevy+4aRnmILZxY2LCt+UZ/ZtjJqq0MffwkuQPPY21ExmFAQ6kKA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  '@ai-sdk/provider-utils@2.0.0(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.0.0
-      eventsource-parser: 3.0.0
+      eventsource-parser: 3.0.6
       nanoid: 5.1.5
       secure-json-parse: 2.7.0
-      zod: 3.23.8
-    dev: false
+    optionalDependencies:
+      zod: 3.25.76
 
-  /@ai-sdk/provider-utils@2.2.1(zod@3.23.8):
-    resolution: {integrity: sha512-BuExLp+NcpwsAVj1F4bgJuQkSqO/+roV9wM7RdIO+NVrcT8RBUTdXzf5arHt5T58VpK7bZyB2V9qigjaPHE+Dg==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.23.8
+  '@ai-sdk/provider-utils@2.2.1(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.1.0
       nanoid: 3.3.8
       secure-json-parse: 2.7.0
-      zod: 3.23.8
+      zod: 3.25.76
 
-  /@ai-sdk/provider-utils@2.2.3(zod@3.23.8):
-    resolution: {integrity: sha512-o3fWTzkxzI5Af7U7y794MZkYNEsxbjLam2nxyoUZSScqkacb7vZ3EYHLh21+xCcSSzEC161C7pZAGHtC0hTUMw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.23.8
+  '@ai-sdk/provider-utils@2.2.8(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider': 1.1.0
+      '@ai-sdk/provider': 1.1.3
       nanoid: 3.3.8
       secure-json-parse: 2.7.0
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /@ai-sdk/provider-utils@2.2.8(zod@3.23.8):
-    resolution: {integrity: sha512-fqhG+4sCVv8x7nFzYnFo19ryhAa3w096Kmc3hWxMQfW/TubPOmt3A6tYZhl4mUfQWWQMsuSkLrtjlWuXBVSGQA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.23.8
+  '@ai-sdk/provider-utils@3.0.12(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      nanoid: 3.3.8
-      secure-json-parse: 2.7.0
-      zod: 3.23.8
-    dev: false
+      '@ai-sdk/provider': 2.0.0
+      '@standard-schema/spec': 1.1.0
+      eventsource-parser: 3.0.6
+      zod: 3.25.76
 
-  /@ai-sdk/provider@0.0.22:
-    resolution: {integrity: sha512-smZ1/2jL/JSKnbhC6ama/PxI2D/psj+YAe0c0qpd5ComQCNFltg72VFf0rpUSFMmFuj1pCCNoBOCrvyl8HTZHQ==}
-    engines: {node: '>=18'}
+  '@ai-sdk/provider-utils@3.0.3(zod@3.25.76)':
     dependencies:
-      json-schema: 0.4.0
-    dev: false
+      '@ai-sdk/provider': 2.0.0
+      '@standard-schema/spec': 1.1.0
+      eventsource-parser: 3.0.6
+      zod: 3.25.76
+      zod-to-json-schema: 3.24.6(zod@3.25.76)
 
-  /@ai-sdk/provider@0.0.26:
-    resolution: {integrity: sha512-dQkfBDs2lTYpKM8389oopPdQgIU007GQyCbuPPrV+K6MtSII3HBfE0stUIMXUb44L+LK1t6GXPP7wjSzjO6uKg==}
-    engines: {node: '>=18'}
+  '@ai-sdk/provider-utils@4.0.1(zod@3.25.76)':
+    dependencies:
+      '@ai-sdk/provider': 3.0.0
+      '@standard-schema/spec': 1.1.0
+      eventsource-parser: 3.0.6
+      zod: 3.25.76
+
+  '@ai-sdk/provider@0.0.26':
     dependencies:
       json-schema: 0.4.0
-    dev: true
 
-  /@ai-sdk/provider@1.0.0:
-    resolution: {integrity: sha512-Sj29AzooJ7SYvhPd+AAWt/E7j63E9+AzRnoMHUaJPRYzOd/WDrVNxxv85prF9gDcQ7XPVlSk9j6oAZV9/DXYpA==}
-    engines: {node: '>=18'}
+  '@ai-sdk/provider@1.0.0':
     dependencies:
       json-schema: 0.4.0
-    dev: false
 
-  /@ai-sdk/provider@1.1.0:
-    resolution: {integrity: sha512-0M+qjp+clUD0R1E5eWQFhxEvWLNaOtGQRUaBn8CUABnSKredagq92hUS9VjOzGsTm37xLfpaxl97AVtbeOsHew==}
-    engines: {node: '>=18'}
+  '@ai-sdk/provider@1.1.0':
     dependencies:
       json-schema: 0.4.0
 
-  /@ai-sdk/provider@1.1.3:
-    resolution: {integrity: sha512-qZMxYJ0qqX/RfnuIaab+zp8UAeJn/ygXXAffR5I4N0n1IrvA6qBsjc8hXLmBiMV2zoXlifkacF7sEFnYnjBcqg==}
-    engines: {node: '>=18'}
+  '@ai-sdk/provider@1.1.3':
     dependencies:
       json-schema: 0.4.0
-    dev: false
 
-  /@ai-sdk/react@0.0.53(react@19.0.0-rc.0)(zod@3.23.8):
-    resolution: {integrity: sha512-sIsmTFoR/QHvUUkltmHwP4bPjwy2vko6j/Nj8ayxLhEHs04Ug+dwXQyfA7MwgimEE3BcDQpWL8ikVj0m3ZILWQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      zod:
-        optional: true
+  '@ai-sdk/provider@2.0.0':
     dependencies:
-      '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.40(zod@3.23.8)
-      react: 19.0.0-rc.0
-      swr: 2.2.5(react@19.0.0-rc.0)
-      zod: 3.23.8
-    dev: false
+      json-schema: 0.4.0
 
-  /@ai-sdk/react@0.0.70(react@18.3.1)(zod@3.23.8):
-    resolution: {integrity: sha512-GnwbtjW4/4z7MleLiW+TOZC2M29eCg1tOUpuEiYFMmFNZK8mkrqM0PFZMo6UsYeUYMWqEOOcPOU9OQVJMJh7IQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      zod:
-        optional: true
+  '@ai-sdk/provider@3.0.0':
     dependencies:
-      '@ai-sdk/provider-utils': 1.0.22(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.50(zod@3.23.8)
-      react: 18.3.1
-      swr: 2.2.5(react@18.3.1)
-      throttleit: 2.1.0
-      zod: 3.23.8
-    dev: true
+      json-schema: 0.4.0
 
-  /@ai-sdk/react@1.0.0(react@18.3.1)(zod@3.23.8):
-    resolution: {integrity: sha512-BDrZqQA07Btg64JCuhFvBgYV+tt2B8cXINzEqWknGoxqcwgdE8wSLG2gkXoLzyC2Rnj7oj0HHpOhLUxDCmoKZg==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      zod:
-        optional: true
+  '@ai-sdk/react@1.0.0(react@18.3.1)(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider-utils': 2.0.0(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.0.0(zod@3.23.8)
-      react: 18.3.1
+      '@ai-sdk/provider-utils': 2.0.0(zod@3.25.76)
+      '@ai-sdk/ui-utils': 1.0.0(zod@3.25.76)
       swr: 2.2.5(react@18.3.1)
       throttleit: 2.1.0
-      zod: 3.23.8
-    dev: false
+    optionalDependencies:
+      react: 18.3.1
+      zod: 3.25.76
 
-  /@ai-sdk/react@1.2.12(react@18.2.0)(zod@3.23.8):
-    resolution: {integrity: sha512-jK1IZZ22evPZoQW3vlkZ7wvjYGYF+tRBKXtrcolduIkQ/m/sOAVcVeVDUDvh1T91xCnWCdUGCPZg2avZ90mv3g==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  '@ai-sdk/react@1.2.12(react@18.2.0)(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.2.11(zod@3.23.8)
+      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.76)
+      '@ai-sdk/ui-utils': 1.2.11(zod@3.25.76)
       react: 18.2.0
       swr: 2.2.5(react@18.2.0)
       throttleit: 2.1.0
-      zod: 3.23.8
-    dev: false
-
-  /@ai-sdk/react@1.2.2(react@18.3.1)(zod@3.23.8):
-    resolution: {integrity: sha512-rxyNTFjUd3IilVOJFuUJV5ytZBYAIyRi50kFS2gNmSEiG4NHMBBm31ddrxI/i86VpY8gzZVp1/igtljnWBihUA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      zod:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 2.2.1(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.2.1(zod@3.23.8)
-      react: 18.3.1
-      swr: 2.2.5(react@18.3.1)
-      throttleit: 2.1.0
-      zod: 3.23.8
-    dev: true
+    optionalDependencies:
+      zod: 3.25.76
 
-  /@ai-sdk/react@1.2.2(react@19.0.0)(zod@3.23.8):
-    resolution: {integrity: sha512-rxyNTFjUd3IilVOJFuUJV5ytZBYAIyRi50kFS2gNmSEiG4NHMBBm31ddrxI/i86VpY8gzZVp1/igtljnWBihUA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  '@ai-sdk/react@1.2.2(react@19.0.0)(zod@3.25.76)':
     dependencies:
-      '@ai-sdk/provider-utils': 2.2.1(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.2.1(zod@3.23.8)
+      '@ai-sdk/provider-utils': 2.2.1(zod@3.25.76)
+      '@ai-sdk/ui-utils': 1.2.1(zod@3.25.76)
       react: 19.0.0
       swr: 2.2.5(react@19.0.0)
       throttleit: 2.1.0
-      zod: 3.23.8
-    dev: false
-
-  /@ai-sdk/solid@0.0.43(zod@3.23.8):
-    resolution: {integrity: sha512-7PlPLaeMAu97oOY2gjywvKZMYHF+GDfUxYNcuJ4AZ3/MRBatzs/U2r4ClT1iH8uMOcMg02RX6UKzP5SgnUBjVw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      solid-js: ^1.7.7
-    peerDependenciesMeta:
-      solid-js:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.40(zod@3.23.8)
-    transitivePeerDependencies:
-      - zod
-    dev: false
-
-  /@ai-sdk/solid@0.0.54(zod@3.23.8):
-    resolution: {integrity: sha512-96KWTVK+opdFeRubqrgaJXoNiDP89gNxFRWUp0PJOotZW816AbhUf4EnDjBjXTLjXL1n0h8tGSE9sZsRkj9wQQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      solid-js: ^1.7.7
-    peerDependenciesMeta:
-      solid-js:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 1.0.22(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.50(zod@3.23.8)
-    transitivePeerDependencies:
-      - zod
-    dev: true
-
-  /@ai-sdk/svelte@0.0.45(svelte@5.33.14)(zod@3.23.8):
-    resolution: {integrity: sha512-w5Sdl0ArFIM3Fp8BbH4TUvlrS84WP/jN/wC1+fghMOXd7ceVO3Yhs9r71wTqndhgkLC7LAEX9Ll7ZEPfW9WBDA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      svelte: ^3.0.0 || ^4.0.0
-    peerDependenciesMeta:
-      svelte:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.40(zod@3.23.8)
-      sswr: 2.1.0(svelte@5.33.14)
-      svelte: 5.33.14
-    transitivePeerDependencies:
-      - zod
-    dev: false
-
-  /@ai-sdk/svelte@0.0.57(svelte@5.33.14)(zod@3.23.8):
-    resolution: {integrity: sha512-SyF9ItIR9ALP9yDNAD+2/5Vl1IT6kchgyDH8xkmhysfJI6WrvJbtO1wdQ0nylvPLcsPoYu+cAlz1krU4lFHcYw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      svelte: ^3.0.0 || ^4.0.0 || ^5.0.0
-    peerDependenciesMeta:
-      svelte:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 1.0.22(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.50(zod@3.23.8)
-      sswr: 2.1.0(svelte@5.33.14)
-      svelte: 5.33.14
-    transitivePeerDependencies:
-      - zod
-    dev: true
-
-  /@ai-sdk/ui-utils@0.0.40(zod@3.23.8):
-    resolution: {integrity: sha512-f0eonPUBO13pIO8jA9IGux7IKMeqpvWK22GBr3tOoSRnO5Wg5GEpXZU1V0Po+unpeZHyEPahrWbj5JfXcyWCqw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider': 0.0.22
-      '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
-      json-schema: 0.4.0
-      secure-json-parse: 2.7.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.2(zod@3.23.8)
-    dev: false
-
-  /@ai-sdk/ui-utils@0.0.50(zod@3.23.8):
-    resolution: {integrity: sha512-Z5QYJVW+5XpSaJ4jYCCAVG7zIAuKOOdikhgpksneNmKvx61ACFaf98pmOd+xnjahl0pIlc/QIe6O4yVaJ1sEaw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider': 0.0.26
-      '@ai-sdk/provider-utils': 1.0.22(zod@3.23.8)
-      json-schema: 0.4.0
-      secure-json-parse: 2.7.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.5(zod@3.23.8)
-    dev: true
+    optionalDependencies:
+      zod: 3.25.76
 
-  /@ai-sdk/ui-utils@1.0.0(zod@3.23.8):
-    resolution: {integrity: sha512-oXBDIM/0niWeTWyw77RVl505dNxBUDLLple7bTsqo2d3i1UKwGlzBUX8XqZsh7GbY7I6V05nlG0Y8iGlWxv1Aw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  '@ai-sdk/ui-utils@1.0.0(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.0.0
-      '@ai-sdk/provider-utils': 2.0.0(zod@3.23.8)
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.5(zod@3.23.8)
-    dev: false
+      '@ai-sdk/provider-utils': 2.0.0(zod@3.25.76)
+      zod-to-json-schema: 3.24.6(zod@3.25.76)
+    optionalDependencies:
+      zod: 3.25.76
 
-  /@ai-sdk/ui-utils@1.2.1(zod@3.23.8):
-    resolution: {integrity: sha512-BzvMbYm7LHBlbWuLlcG1jQh4eu14MGpz7L+wrGO1+F4oQ+O0fAjgUSNwPWGlZpKmg4NrcVq/QLmxiVJrx2R4Ew==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.23.8
+  '@ai-sdk/ui-utils@1.2.1(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.1.0
-      '@ai-sdk/provider-utils': 2.2.1(zod@3.23.8)
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.5(zod@3.23.8)
+      '@ai-sdk/provider-utils': 2.2.1(zod@3.25.76)
+      zod: 3.25.76
+      zod-to-json-schema: 3.24.6(zod@3.25.76)
 
-  /@ai-sdk/ui-utils@1.2.11(zod@3.23.8):
-    resolution: {integrity: sha512-3zcwCc8ezzFlwp3ZD15wAPjf2Au4s3vAbKsXQVyhxODHcmu0iyPO2Eua6D/vicq/AUm/BAo60r97O6HU+EI0+w==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      zod: ^3.23.8
+  '@ai-sdk/ui-utils@1.2.11(zod@3.25.76)':
     dependencies:
       '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.23.8)
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.5(zod@3.23.8)
-    dev: false
+      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.76)
+      zod: 3.25.76
+      zod-to-json-schema: 3.24.6(zod@3.25.76)
 
-  /@ai-sdk/vue@0.0.45(vue@3.5.16)(zod@3.23.8):
-    resolution: {integrity: sha512-bqeoWZqk88TQmfoPgnFUKkrvhOIcOcSH5LMPgzZ8XwDqz5tHHrMHzpPfHCj7XyYn4ROTFK/2kKdC/ta6Ko0fMw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      vue: ^3.3.4
-    peerDependenciesMeta:
-      vue:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.40(zod@3.23.8)
-      swrv: 1.0.4(vue@3.5.16)
-      vue: 3.5.16(typescript@5.5.4)
-    transitivePeerDependencies:
-      - zod
-    dev: false
-
-  /@ai-sdk/vue@0.0.59(vue@3.5.16)(zod@3.23.8):
-    resolution: {integrity: sha512-+ofYlnqdc8c4F6tM0IKF0+7NagZRAiqBJpGDJ+6EYhDW8FHLUP/JFBgu32SjxSxC6IKFZxEnl68ZoP/Z38EMlw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      vue: ^3.3.4
-    peerDependenciesMeta:
-      vue:
-        optional: true
-    dependencies:
-      '@ai-sdk/provider-utils': 1.0.22(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.50(zod@3.23.8)
-      swrv: 1.0.4(vue@3.5.16)
-      vue: 3.5.16(typescript@5.5.4)
-    transitivePeerDependencies:
-      - zod
-    dev: true
-
-  /@alloc/quick-lru@5.2.0:
-    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
-    engines: {node: '>=10'}
+  '@alloc/quick-lru@5.2.0': {}
 
-  /@ampproject/remapping@2.3.0:
-    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
-    engines: {node: '>=6.0.0'}
+  '@ampproject/remapping@2.3.0':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
 
-  /@andrewbranch/untar.js@1.0.3:
-    resolution: {integrity: sha512-Jh15/qVmrLGhkKJBdXlK1+9tY4lZruYjsgkDFj08ZmDiWVBLJcqkok7Z0/R0In+i1rScBpJlSvrTS2Lm41Pbnw==}
-    dev: true
+  '@andrewbranch/untar.js@1.0.3': {}
 
-  /@antfu/ni@0.21.8:
-    resolution: {integrity: sha512-90X8pU2szlvw0AJo9EZMbYc2eQKkmO7mAdC4tD4r5co2Mm56MT37MIG8EyB7p4WRheuzGxuLDxJ63mF6+Zajiw==}
-    hasBin: true
-    dev: true
+  '@antfu/install-pkg@1.1.0':
+    dependencies:
+      package-manager-detector: 1.4.1
+      tinyexec: 1.0.1
 
-  /@arethetypeswrong/cli@0.15.4:
-    resolution: {integrity: sha512-YDbImAi1MGkouT7f2yAECpUMFhhA1J0EaXzIqoC5GGtK0xDgauLtcsZezm8tNq7d3wOFXH7OnY+IORYcG212rw==}
-    engines: {node: '>=18'}
-    hasBin: true
+  '@antfu/utils@9.3.0': {}
+
+  '@arethetypeswrong/cli@0.15.4':
     dependencies:
       '@arethetypeswrong/core': 0.15.1
       chalk: 4.1.2
@@ -2968,151 +20311,126 @@ packages:
       commander: 10.0.1
       marked: 9.1.6
       marked-terminal: 7.1.0(marked@9.1.6)
-      semver: 7.6.3
-    dev: true
+      semver: 5.7.2
 
-  /@arethetypeswrong/core@0.15.1:
-    resolution: {integrity: sha512-FYp6GBAgsNz81BkfItRz8RLZO03w5+BaeiPma1uCfmxTnxbtuMrI/dbzGiOk8VghO108uFI0oJo0OkewdSHw7g==}
-    engines: {node: '>=18'}
+  '@arethetypeswrong/core@0.15.1':
     dependencies:
       '@andrewbranch/untar.js': 1.0.3
       fflate: 0.8.2
-      semver: 7.6.3
+      semver: 5.7.2
       ts-expose-internals-conditionally: 1.0.0-empty.0
-      typescript: 5.3.3
+      typescript: 5.5.4
       validate-npm-package-name: 5.0.0
-    dev: true
 
-  /@ariakit/core@0.4.6:
-    resolution: {integrity: sha512-L2WIZZlxDs611m3YLSv2xvJyQrkkVQJlxn8Y4DlI1G65VLTEH7hysw3RYUNdXsl0gP6S20id3zBMJCHT9BCRcg==}
-    dev: false
+  '@ariakit/core@0.4.6': {}
 
-  /@ariakit/react-core@0.4.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-2Ca327IzSOxQEd3gEr59JJj0y8fXDMLYd+948wyOzIsk2/yoTnA4+R7Vhs361w3KzOjBQM44KmnNL7ckBMtT0w==}
-    peerDependencies:
-      react: ^17.0.0 || ^18.0.0
-      react-dom: ^17.0.0 || ^18.0.0
+  '@ariakit/react-core@0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@ariakit/core': 0.4.6
       '@floating-ui/dom': 1.6.5
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       use-sync-external-store: 1.2.2(react@18.2.0)
-    dev: false
 
-  /@ariakit/react@0.4.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-7lZQew9n+nxswgJ5aL87xo42I+t3A8gWzaxIIZY+c58SLCASh1IdDkGLhGPcyhmXWRIjs/8L1h6cMbRMEBrtJQ==}
-    peerDependencies:
-      react: ^17.0.0 || ^18.0.0
-      react-dom: ^17.0.0 || ^18.0.0
+  '@ariakit/react@0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@ariakit/react-core': 0.4.6(react-dom@18.2.0)(react@18.2.0)
+      '@ariakit/react-core': 0.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@ark/schema@0.19.0:
-    resolution: {integrity: sha512-m+NLBrfewxH1IieXxK7i2cjJtMksZm2PlobbZDcsNDpYKjuDAzWimXZb+GaxawKMBV9rhO3XY2Lnvf2TLq+JTQ==}
+  '@ark/schema@0.46.0':
     dependencies:
-      '@ark/util': 0.18.0
-    dev: false
+      '@ark/util': 0.46.0
 
-  /@ark/util@0.18.0:
-    resolution: {integrity: sha512-TpHY532LKQwwYHui5NN/eO/6eSiSMvf652YNt1BsV7fya7RzXL27IiU9x4bm7jTFZxLQGYDQTB7nw41TqeuF4g==}
-    dev: false
+  '@ark/util@0.46.0': {}
 
-  /@arr/every@1.0.1:
-    resolution: {integrity: sha512-UQFQ6SgyJ6LX42W8rHCs8KVc0JS0tzVL9ct4XYedJukskYVWTo49tNiMEK9C2HTyarbNiT/RVIRSY82vH+6sTg==}
-    engines: {node: '>=4'}
-    dev: false
+  '@arr/every@1.0.1': {}
 
-  /@aws-crypto/crc32@3.0.0:
-    resolution: {integrity: sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==}
+  '@aws-crypto/crc32@3.0.0':
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/types': 3.936.0
       tslib: 1.14.1
-    dev: false
 
-  /@aws-crypto/ie11-detection@3.0.0:
-    resolution: {integrity: sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==}
+  '@aws-crypto/crc32@5.2.0':
+    dependencies:
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.936.0
+      tslib: 2.8.1
+
+  '@aws-crypto/crc32c@5.2.0':
+    dependencies:
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.936.0
+      tslib: 2.8.1
+
+  '@aws-crypto/ie11-detection@3.0.0':
     dependencies:
       tslib: 1.14.1
-    dev: false
 
-  /@aws-crypto/sha256-browser@3.0.0:
-    resolution: {integrity: sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==}
+  '@aws-crypto/sha1-browser@5.2.0':
+    dependencies:
+      '@aws-crypto/supports-web-crypto': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-locate-window': 3.893.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
+
+  '@aws-crypto/sha256-browser@3.0.0':
     dependencies:
       '@aws-crypto/ie11-detection': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
       '@aws-crypto/supports-web-crypto': 3.0.0
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/types': 3.936.0
       '@aws-sdk/util-locate-window': 3.310.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
-    dev: false
 
-  /@aws-crypto/sha256-browser@5.2.0:
-    resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==}
+  '@aws-crypto/sha256-browser@5.2.0':
     dependencies:
       '@aws-crypto/sha256-js': 5.2.0
       '@aws-crypto/supports-web-crypto': 5.2.0
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.840.0
-      '@aws-sdk/util-locate-window': 3.310.0
-      '@smithy/util-utf8': 2.0.2
+      '@aws-sdk/types': 3.930.0
+      '@aws-sdk/util-locate-window': 3.893.0
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-crypto/sha256-js@3.0.0:
-    resolution: {integrity: sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==}
+  '@aws-crypto/sha256-js@3.0.0':
     dependencies:
       '@aws-crypto/util': 3.0.0
-      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/types': 3.936.0
       tslib: 1.14.1
-    dev: false
 
-  /@aws-crypto/sha256-js@5.2.0:
-    resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==}
-    engines: {node: '>=16.0.0'}
+  '@aws-crypto/sha256-js@5.2.0':
     dependencies:
       '@aws-crypto/util': 5.2.0
-      '@aws-sdk/types': 3.840.0
+      '@aws-sdk/types': 3.930.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-crypto/supports-web-crypto@3.0.0:
-    resolution: {integrity: sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==}
+  '@aws-crypto/supports-web-crypto@3.0.0':
     dependencies:
       tslib: 1.14.1
-    dev: false
 
-  /@aws-crypto/supports-web-crypto@5.2.0:
-    resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==}
+  '@aws-crypto/supports-web-crypto@5.2.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@aws-crypto/util@3.0.0:
-    resolution: {integrity: sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==}
+  '@aws-crypto/util@3.0.0':
     dependencies:
-      '@aws-sdk/types': 3.451.0
+      '@aws-sdk/types': 3.936.0
       '@aws-sdk/util-utf8-browser': 3.259.0
       tslib: 1.14.1
-    dev: false
 
-  /@aws-crypto/util@5.2.0:
-    resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
+  '@aws-crypto/util@5.2.0':
     dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/util-utf8': 2.0.2
+      '@aws-sdk/types': 3.936.0
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/client-ecr@3.839.0:
-    resolution: {integrity: sha512-aaSPaqfWvz9OAGfcl97Ps/bQHulRLt8tg8tB8zc4gyGo4OTn6gnKMd+FEhPBszRKP7xeb4pzjjqcXvHsFt7HEQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-ecr@3.839.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
@@ -3156,61 +20474,158 @@ packages:
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/client-ses@3.716.0:
-    resolution: {integrity: sha512-lYsg2x3Z6R5ngBX1EqFKR6jf77ewbGg+aZV6V4ucVCghaGGcGnGisRP4FAep3IgkrZuByEYeJaA6cTli98qaOQ==}
-    engines: {node: '>=16.0.0'}
+  '@aws-sdk/client-ecr@3.931.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.716.0(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/client-sts': 3.716.0
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/credential-provider-node': 3.716.0(@aws-sdk/client-sso-oidc@3.716.0)(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/middleware-host-header': 3.714.0
-      '@aws-sdk/middleware-logger': 3.714.0
-      '@aws-sdk/middleware-recursion-detection': 3.714.0
-      '@aws-sdk/middleware-user-agent': 3.716.0
-      '@aws-sdk/region-config-resolver': 3.714.0
-      '@aws-sdk/types': 3.714.0
-      '@aws-sdk/util-endpoints': 3.714.0
-      '@aws-sdk/util-user-agent-browser': 3.714.0
-      '@aws-sdk/util-user-agent-node': 3.716.0
-      '@smithy/config-resolver': 3.0.13
-      '@smithy/core': 2.5.5
-      '@smithy/fetch-http-handler': 4.1.2
-      '@smithy/hash-node': 3.0.11
-      '@smithy/invalid-dependency': 3.0.11
-      '@smithy/middleware-content-length': 3.0.13
-      '@smithy/middleware-endpoint': 3.2.6
-      '@smithy/middleware-retry': 3.0.31
-      '@smithy/middleware-serde': 3.0.11
-      '@smithy/middleware-stack': 3.0.11
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/node-http-handler': 3.3.2
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/url-parser': 3.0.11
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.31
-      '@smithy/util-defaults-mode-node': 3.0.31
-      '@smithy/util-endpoints': 2.1.7
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-retry': 3.0.11
-      '@smithy/util-utf8': 3.0.0
-      '@smithy/util-waiter': 3.2.0
-      tslib: 2.6.2
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/credential-provider-node': 3.931.0
+      '@aws-sdk/middleware-host-header': 3.930.0
+      '@aws-sdk/middleware-logger': 3.930.0
+      '@aws-sdk/middleware-recursion-detection': 3.930.0
+      '@aws-sdk/middleware-user-agent': 3.931.0
+      '@aws-sdk/region-config-resolver': 3.930.0
+      '@aws-sdk/types': 3.930.0
+      '@aws-sdk/util-endpoints': 3.930.0
+      '@aws-sdk/util-user-agent-browser': 3.930.0
+      '@aws-sdk/util-user-agent-node': 3.931.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.3
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.10
+      '@smithy/middleware-retry': 4.4.10
+      '@smithy/middleware-serde': 4.2.5
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.6
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.9
+      '@smithy/util-defaults-mode-node': 4.2.12
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      '@smithy/util-waiter': 4.2.5
+      tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/client-sqs@3.454.0:
-    resolution: {integrity: sha512-eBviLavFxmXAbqL/wPlVqYnmS/hYUPj63ilQvFuj8zM3WYy0DX7GgvYXz5AUWswGsEk/4F88QFjlBM7N5miepw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/client-s3@3.940.0':
+    dependencies:
+      '@aws-crypto/sha1-browser': 5.2.0
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/credential-provider-node': 3.940.0
+      '@aws-sdk/middleware-bucket-endpoint': 3.936.0
+      '@aws-sdk/middleware-expect-continue': 3.936.0
+      '@aws-sdk/middleware-flexible-checksums': 3.940.0
+      '@aws-sdk/middleware-host-header': 3.936.0
+      '@aws-sdk/middleware-location-constraint': 3.936.0
+      '@aws-sdk/middleware-logger': 3.936.0
+      '@aws-sdk/middleware-recursion-detection': 3.936.0
+      '@aws-sdk/middleware-sdk-s3': 3.940.0
+      '@aws-sdk/middleware-ssec': 3.936.0
+      '@aws-sdk/middleware-user-agent': 3.940.0
+      '@aws-sdk/region-config-resolver': 3.936.0
+      '@aws-sdk/signature-v4-multi-region': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-endpoints': 3.936.0
+      '@aws-sdk/util-user-agent-browser': 3.936.0
+      '@aws-sdk/util-user-agent-node': 3.940.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/eventstream-serde-browser': 4.2.5
+      '@smithy/eventstream-serde-config-resolver': 4.3.5
+      '@smithy/eventstream-serde-node': 4.2.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-blob-browser': 4.2.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/hash-stream-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/md5-js': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-stream': 4.5.6
+      '@smithy/util-utf8': 4.2.0
+      '@smithy/util-waiter': 4.2.5
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/client-sesv2@3.940.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/credential-provider-node': 3.940.0
+      '@aws-sdk/middleware-host-header': 3.936.0
+      '@aws-sdk/middleware-logger': 3.936.0
+      '@aws-sdk/middleware-recursion-detection': 3.936.0
+      '@aws-sdk/middleware-user-agent': 3.940.0
+      '@aws-sdk/region-config-resolver': 3.936.0
+      '@aws-sdk/signature-v4-multi-region': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-endpoints': 3.936.0
+      '@aws-sdk/util-user-agent-browser': 3.936.0
+      '@aws-sdk/util-user-agent-node': 3.940.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/client-sqs@3.454.0':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
@@ -3255,61 +20670,8 @@ packages:
       tslib: 2.6.2
     transitivePeerDependencies:
       - aws-crt
-    dev: false
-
-  /@aws-sdk/client-sso-oidc@3.716.0(@aws-sdk/client-sts@3.716.0):
-    resolution: {integrity: sha512-lA4IB9FzR2KjH7EVCo+mHGFKqdViVyeBQEIX9oVratL/l7P0bMS1fMwgfHOc3ACazqNxBxDES7x08ZCp32y6Lw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sts': ^3.716.0
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sts': 3.716.0
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/credential-provider-node': 3.716.0(@aws-sdk/client-sso-oidc@3.716.0)(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/middleware-host-header': 3.714.0
-      '@aws-sdk/middleware-logger': 3.714.0
-      '@aws-sdk/middleware-recursion-detection': 3.714.0
-      '@aws-sdk/middleware-user-agent': 3.716.0
-      '@aws-sdk/region-config-resolver': 3.714.0
-      '@aws-sdk/types': 3.714.0
-      '@aws-sdk/util-endpoints': 3.714.0
-      '@aws-sdk/util-user-agent-browser': 3.714.0
-      '@aws-sdk/util-user-agent-node': 3.716.0
-      '@smithy/config-resolver': 3.0.13
-      '@smithy/core': 2.5.5
-      '@smithy/fetch-http-handler': 4.1.2
-      '@smithy/hash-node': 3.0.11
-      '@smithy/invalid-dependency': 3.0.11
-      '@smithy/middleware-content-length': 3.0.13
-      '@smithy/middleware-endpoint': 3.2.6
-      '@smithy/middleware-retry': 3.0.31
-      '@smithy/middleware-serde': 3.0.11
-      '@smithy/middleware-stack': 3.0.11
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/node-http-handler': 3.3.2
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/url-parser': 3.0.11
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.31
-      '@smithy/util-defaults-mode-node': 3.0.31
-      '@smithy/util-endpoints': 2.1.7
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-retry': 3.0.11
-      '@smithy/util-utf8': 3.0.0
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - aws-crt
-    dev: false
 
-  /@aws-sdk/client-sso@3.451.0:
-    resolution: {integrity: sha512-KkYSke3Pdv3MfVH/5fT528+MKjMyPKlcLcd4zQb0x6/7Bl7EHrPh1JZYjzPLHelb+UY5X0qN8+cb8iSu1eiwIQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/client-sso@3.451.0':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
@@ -3345,61 +20707,12 @@ packages:
       '@smithy/util-defaults-mode-node': 2.0.26
       '@smithy/util-endpoints': 1.0.5
       '@smithy/util-retry': 2.0.7
-      '@smithy/util-utf8': 2.0.2
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - aws-crt
-    dev: false
-
-  /@aws-sdk/client-sso@3.716.0:
-    resolution: {integrity: sha512-5Nb0jJXce2TclbjG7WVPufwhgV1TRydz1QnsuBtKU0AdViEpr787YrZhPpGnNIM1Dx+R1H/tmAHZnOoohS6D8g==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/middleware-host-header': 3.714.0
-      '@aws-sdk/middleware-logger': 3.714.0
-      '@aws-sdk/middleware-recursion-detection': 3.714.0
-      '@aws-sdk/middleware-user-agent': 3.716.0
-      '@aws-sdk/region-config-resolver': 3.714.0
-      '@aws-sdk/types': 3.714.0
-      '@aws-sdk/util-endpoints': 3.714.0
-      '@aws-sdk/util-user-agent-browser': 3.714.0
-      '@aws-sdk/util-user-agent-node': 3.716.0
-      '@smithy/config-resolver': 3.0.13
-      '@smithy/core': 2.5.5
-      '@smithy/fetch-http-handler': 4.1.2
-      '@smithy/hash-node': 3.0.11
-      '@smithy/invalid-dependency': 3.0.11
-      '@smithy/middleware-content-length': 3.0.13
-      '@smithy/middleware-endpoint': 3.2.6
-      '@smithy/middleware-retry': 3.0.31
-      '@smithy/middleware-serde': 3.0.11
-      '@smithy/middleware-stack': 3.0.11
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/node-http-handler': 3.3.2
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/url-parser': 3.0.11
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.31
-      '@smithy/util-defaults-mode-node': 3.0.31
-      '@smithy/util-endpoints': 2.1.7
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-retry': 3.0.11
-      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/client-sso@3.839.0:
-    resolution: {integrity: sha512-AZABysUhbfcwXVlMo97/vwHgsfJNF81wypCAowpqAJkSjP2KrqsqHpb71/RoR2w8JGmEnBBXRD4wIxDhnmifWg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-sso@3.839.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
@@ -3413,39 +20726,36 @@ packages:
       '@aws-sdk/util-endpoints': 3.828.0
       '@aws-sdk/util-user-agent-browser': 3.821.0
       '@aws-sdk/util-user-agent-node': 3.839.0
-      '@smithy/config-resolver': 4.1.4
-      '@smithy/core': 3.6.0
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/hash-node': 4.0.4
-      '@smithy/invalid-dependency': 4.0.4
-      '@smithy/middleware-content-length': 4.0.4
-      '@smithy/middleware-endpoint': 4.1.13
-      '@smithy/middleware-retry': 4.1.14
-      '@smithy/middleware-serde': 4.0.8
-      '@smithy/middleware-stack': 4.0.4
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/url-parser': 4.0.4
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.21
-      '@smithy/util-defaults-mode-node': 4.0.21
-      '@smithy/util-endpoints': 3.0.6
-      '@smithy/util-middleware': 4.0.4
-      '@smithy/util-retry': 4.0.6
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/client-sso@3.840.0:
-    resolution: {integrity: sha512-3Zp+FWN2hhmKdpS0Ragi5V2ZPsZNScE3jlbgoJjzjI/roHZqO+e3/+XFN4TlM0DsPKYJNp+1TAjmhxN6rOnfYA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-sso@3.840.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
@@ -3459,39 +20769,122 @@ packages:
       '@aws-sdk/util-endpoints': 3.840.0
       '@aws-sdk/util-user-agent-browser': 3.840.0
       '@aws-sdk/util-user-agent-node': 3.840.0
-      '@smithy/config-resolver': 4.1.4
-      '@smithy/core': 3.6.0
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/hash-node': 4.0.4
-      '@smithy/invalid-dependency': 4.0.4
-      '@smithy/middleware-content-length': 4.0.4
-      '@smithy/middleware-endpoint': 4.1.13
-      '@smithy/middleware-retry': 4.1.14
-      '@smithy/middleware-serde': 4.0.8
-      '@smithy/middleware-stack': 4.0.4
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/url-parser': 4.0.4
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.21
-      '@smithy/util-defaults-mode-node': 4.0.21
-      '@smithy/util-endpoints': 3.0.6
-      '@smithy/util-middleware': 4.0.4
-      '@smithy/util-retry': 4.0.6
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/client-sts@3.454.0:
-    resolution: {integrity: sha512-0fDvr8WeB6IYO8BUCzcivWmahgGl/zDbaYfakzGnt4mrl5ztYaXE875WI6b7+oFcKMRvN+KLvwu5TtyFuNY+GQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/client-sso@3.931.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/middleware-host-header': 3.930.0
+      '@aws-sdk/middleware-logger': 3.930.0
+      '@aws-sdk/middleware-recursion-detection': 3.930.0
+      '@aws-sdk/middleware-user-agent': 3.931.0
+      '@aws-sdk/region-config-resolver': 3.930.0
+      '@aws-sdk/types': 3.930.0
+      '@aws-sdk/util-endpoints': 3.930.0
+      '@aws-sdk/util-user-agent-browser': 3.930.0
+      '@aws-sdk/util-user-agent-node': 3.931.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/client-sso@3.940.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/middleware-host-header': 3.936.0
+      '@aws-sdk/middleware-logger': 3.936.0
+      '@aws-sdk/middleware-recursion-detection': 3.936.0
+      '@aws-sdk/middleware-user-agent': 3.940.0
+      '@aws-sdk/region-config-resolver': 3.936.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-endpoints': 3.936.0
+      '@aws-sdk/util-user-agent-browser': 3.936.0
+      '@aws-sdk/util-user-agent-node': 3.940.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/client-sts@3.454.0':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
@@ -3530,64 +20923,13 @@ packages:
       '@smithy/util-defaults-mode-node': 2.0.26
       '@smithy/util-endpoints': 1.0.5
       '@smithy/util-retry': 2.0.7
-      '@smithy/util-utf8': 2.0.2
+      '@smithy/util-utf8': 2.3.0
       fast-xml-parser: 4.2.5
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - aws-crt
-    dev: false
-
-  /@aws-sdk/client-sts@3.716.0:
-    resolution: {integrity: sha512-i4SVNsrdXudp8T4bkm7Fi3YWlRnvXCSwvNDqf6nLqSJxqr4CN3VlBELueDyjBK7TAt453/qSif+eNx+bHmwo4Q==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-crypto/sha256-browser': 5.2.0
-      '@aws-crypto/sha256-js': 5.2.0
-      '@aws-sdk/client-sso-oidc': 3.716.0(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/credential-provider-node': 3.716.0(@aws-sdk/client-sso-oidc@3.716.0)(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/middleware-host-header': 3.714.0
-      '@aws-sdk/middleware-logger': 3.714.0
-      '@aws-sdk/middleware-recursion-detection': 3.714.0
-      '@aws-sdk/middleware-user-agent': 3.716.0
-      '@aws-sdk/region-config-resolver': 3.714.0
-      '@aws-sdk/types': 3.714.0
-      '@aws-sdk/util-endpoints': 3.714.0
-      '@aws-sdk/util-user-agent-browser': 3.714.0
-      '@aws-sdk/util-user-agent-node': 3.716.0
-      '@smithy/config-resolver': 3.0.13
-      '@smithy/core': 2.5.5
-      '@smithy/fetch-http-handler': 4.1.2
-      '@smithy/hash-node': 3.0.11
-      '@smithy/invalid-dependency': 3.0.11
-      '@smithy/middleware-content-length': 3.0.13
-      '@smithy/middleware-endpoint': 3.2.6
-      '@smithy/middleware-retry': 3.0.31
-      '@smithy/middleware-serde': 3.0.11
-      '@smithy/middleware-stack': 3.0.11
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/node-http-handler': 3.3.2
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/url-parser': 3.0.11
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-body-length-node': 3.0.0
-      '@smithy/util-defaults-mode-browser': 3.0.31
-      '@smithy/util-defaults-mode-node': 3.0.31
-      '@smithy/util-endpoints': 2.1.7
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-retry': 3.0.11
-      '@smithy/util-utf8': 3.0.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/client-sts@3.840.0:
-    resolution: {integrity: sha512-h+mu89Wk81Ne+B624GT/pBM5VjuAZueSeQNixhgtQ1QHi6bZzrpz8+lvMSibKO+kXFyQsTLzkyibbxnhLpWQZA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/client-sts@3.840.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
@@ -3630,36 +20972,13 @@ packages:
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/core@3.451.0:
-    resolution: {integrity: sha512-SamWW2zHEf1ZKe3j1w0Piauryl8BQIlej0TBS18A4ACzhjhWXhCs13bO1S88LvPR5mBFXok3XOT6zPOnKDFktw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/core@3.451.0':
     dependencies:
       '@smithy/smithy-client': 2.1.16
-      tslib: 2.6.2
-    dev: false
-
-  /@aws-sdk/core@3.716.0:
-    resolution: {integrity: sha512-5DkUiTrbyzO8/W4g7UFEqRFpuhgizayHI/Zbh0wtFMcot8801nJV+MP/YMhdjimlvAr/OqYB08FbGsPyWppMTw==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/core': 2.5.5
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/property-provider': 3.1.11
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/signature-v4': 4.2.4
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/util-middleware': 3.0.11
-      fast-xml-parser: 4.4.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/core@3.839.0:
-    resolution: {integrity: sha512-KdwL5RaK7eUIlOpdOoZ5u+2t4X1rdX/MTZgz3IV/aBzjVUoGsp+uUnbyqXomLQSUitPHp72EE/NHDsvWW/IHvQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/core@3.839.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@aws-sdk/xml-builder': 3.821.0
@@ -3676,123 +20995,149 @@ packages:
       '@smithy/util-utf8': 4.0.0
       fast-xml-parser: 4.4.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/core@3.840.0:
-    resolution: {integrity: sha512-x3Zgb39tF1h2XpU+yA4OAAQlW6LVEfXNlSedSYJ7HGKXqA/E9h3rWQVpYfhXXVVsLdYXdNw5KBUkoAoruoZSZA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/core@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
       '@aws-sdk/xml-builder': 3.821.0
-      '@smithy/core': 3.6.0
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/property-provider': 4.0.4
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/signature-v4': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-middleware': 4.0.4
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/core': 3.18.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/signature-v4': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-utf8': 4.2.0
       fast-xml-parser: 4.4.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-env@3.451.0:
-    resolution: {integrity: sha512-9dAav7DcRgaF7xCJEQR5ER9ErXxnu/tdnVJ+UPmb1NPeIZdESv1A3lxFDEq1Fs8c4/lzAj9BpshGyJVIZwZDKg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/core@3.931.0':
+    dependencies:
+      '@aws-sdk/types': 3.930.0
+      '@aws-sdk/xml-builder': 3.930.0
+      '@smithy/core': 3.18.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/signature-v4': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+
+  '@aws-sdk/core@3.940.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/xml-builder': 3.930.0
+      '@smithy/core': 3.18.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/signature-v4': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-env@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/property-provider': 2.0.15
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
-
-  /@aws-sdk/credential-provider-env@3.716.0:
-    resolution: {integrity: sha512-JI2KQUnn2arICwP9F3CnqP1W3nAbm4+meQg/yOhp9X0DMzQiHrHRd4HIrK2vyVgi2/6hGhONY5uLF26yRTA7nQ==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/types': 3.714.0
-      '@smithy/property-provider': 3.1.11
-      '@smithy/types': 3.7.2
-      tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-env@3.839.0:
-    resolution: {integrity: sha512-cWTadewPPz1OvObZJB+olrgh8VwcgIVcT293ZUT9V0CMF0UU7QaPwJP7uNXcNxltTh+sk1yhjH4UlcnJigZZbA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-env@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-env@3.840.0:
-    resolution: {integrity: sha512-EzF6VcJK7XvQ/G15AVEfJzN2mNXU8fcVpXo4bRyr1S6t2q5zx6UPH/XjDbn18xyUmOq01t+r8gG+TmHEVo18fA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-env@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-http@3.716.0:
-    resolution: {integrity: sha512-CZ04pl2z7igQPysQyH2xKZHM3fLwkemxQbKOlje3TmiS1NwXvcKvERhp9PE/H23kOL7beTM19NMRog/Fka/rlw==}
-    engines: {node: '>=16.0.0'}
+  '@aws-sdk/credential-provider-env@3.931.0':
     dependencies:
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/types': 3.714.0
-      '@smithy/fetch-http-handler': 4.1.2
-      '@smithy/node-http-handler': 3.3.2
-      '@smithy/property-provider': 3.1.11
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/util-stream': 3.3.2
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-http@3.839.0:
-    resolution: {integrity: sha512-fv0BZwrDhWDju4D1MCLT4I2aPjr0dVQ6P+MpqvcGNOA41Oa9UdRhYTV5iuy5NLXzIzoCmnS+XfSq5Kbsf6//xw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-env@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-http@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/property-provider': 4.0.4
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/util-stream': 4.2.2
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-stream': 4.5.6
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-http@3.840.0:
-    resolution: {integrity: sha512-wbnUiPGLVea6mXbUh04fu+VJmGkQvmToPeTYdHE8eRZq3NRDi3t3WltT+jArLBKD/4NppRpMjf2ju4coMCz91g==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-http@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/property-provider': 4.0.4
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/util-stream': 4.2.2
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-stream': 4.5.6
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-ini@3.451.0:
-    resolution: {integrity: sha512-TySt64Ci5/ZbqFw1F9Z0FIGvYx5JSC9e6gqDnizIYd8eMnn8wFRUscRrD7pIHKfrhvVKN5h0GdYovmMO/FMCBw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-http@3.931.0':
+    dependencies:
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-stream': 4.5.6
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-http@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-stream': 4.5.6
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-ini@3.451.0':
     dependencies:
       '@aws-sdk/credential-provider-env': 3.451.0
       '@aws-sdk/credential-provider-process': 3.451.0
@@ -3800,41 +21145,14 @@ packages:
       '@aws-sdk/credential-provider-web-identity': 3.451.0
       '@aws-sdk/types': 3.451.0
       '@smithy/credential-provider-imds': 2.1.2
-      '@smithy/property-provider': 2.0.15
-      '@smithy/shared-ini-file-loader': 2.2.5
-      '@smithy/types': 2.6.0
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - aws-crt
-    dev: false
-
-  /@aws-sdk/credential-provider-ini@3.716.0(@aws-sdk/client-sso-oidc@3.716.0)(@aws-sdk/client-sts@3.716.0):
-    resolution: {integrity: sha512-P37We2GtZvdROxiwP0zrpEL81/HuYK1qlYxp5VCj3uV+G4mG8UQN2gMIU/baYrpOQqa0h81RfyQGRFUjVaDVqw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sts': ^3.716.0
-    dependencies:
-      '@aws-sdk/client-sts': 3.716.0
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/credential-provider-env': 3.716.0
-      '@aws-sdk/credential-provider-http': 3.716.0
-      '@aws-sdk/credential-provider-process': 3.716.0
-      '@aws-sdk/credential-provider-sso': 3.716.0(@aws-sdk/client-sso-oidc@3.716.0)
-      '@aws-sdk/credential-provider-web-identity': 3.716.0(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/types': 3.714.0
-      '@smithy/credential-provider-imds': 3.2.8
-      '@smithy/property-provider': 3.1.11
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
+      '@smithy/property-provider': 2.0.15
+      '@smithy/shared-ini-file-loader': 2.2.5
+      '@smithy/types': 2.6.0
       tslib: 2.8.1
     transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-ini@3.839.0:
-    resolution: {integrity: sha512-GHm0hF4CiDxIDR7TauMaA6iI55uuSqRxMBcqTAHaTPm6+h1A+MS+ysQMxZ+Jvwtoy8WmfTIGrJVxSCw0sK2hvA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-ini@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/credential-provider-env': 3.839.0
@@ -3844,18 +21162,15 @@ packages:
       '@aws-sdk/credential-provider-web-identity': 3.839.0
       '@aws-sdk/nested-clients': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/credential-provider-imds': 4.0.6
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-ini@3.840.0:
-    resolution: {integrity: sha512-7F290BsWydShHb+7InXd+IjJc3mlEIm9I0R57F/Pjl1xZB69MdkhVGCnuETWoBt4g53ktJd6NEjzm/iAhFXFmw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-ini@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/credential-provider-env': 3.840.0
@@ -3865,18 +21180,65 @@ packages:
       '@aws-sdk/credential-provider-web-identity': 3.840.0
       '@aws-sdk/nested-clients': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/credential-provider-imds': 4.0.6
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-node@3.451.0:
-    resolution: {integrity: sha512-AEwM1WPyxUdKrKyUsKyFqqRFGU70e4qlDyrtBxJnSU9NRLZI8tfEZ67bN7fHSxBUBODgDXpMSlSvJiBLh5/3pw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-ini@3.931.0':
+    dependencies:
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/credential-provider-env': 3.931.0
+      '@aws-sdk/credential-provider-http': 3.931.0
+      '@aws-sdk/credential-provider-process': 3.931.0
+      '@aws-sdk/credential-provider-sso': 3.931.0
+      '@aws-sdk/credential-provider-web-identity': 3.931.0
+      '@aws-sdk/nested-clients': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/credential-provider-ini@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/credential-provider-env': 3.940.0
+      '@aws-sdk/credential-provider-http': 3.940.0
+      '@aws-sdk/credential-provider-login': 3.940.0
+      '@aws-sdk/credential-provider-process': 3.940.0
+      '@aws-sdk/credential-provider-sso': 3.940.0
+      '@aws-sdk/credential-provider-web-identity': 3.940.0
+      '@aws-sdk/nested-clients': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/credential-provider-login@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/nested-clients': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/credential-provider-node@3.451.0':
     dependencies:
       '@aws-sdk/credential-provider-env': 3.451.0
       '@aws-sdk/credential-provider-ini': 3.451.0
@@ -3888,36 +21250,11 @@ packages:
       '@smithy/property-provider': 2.0.15
       '@smithy/shared-ini-file-loader': 2.2.5
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
+      tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-node@3.716.0(@aws-sdk/client-sso-oidc@3.716.0)(@aws-sdk/client-sts@3.716.0):
-    resolution: {integrity: sha512-FGQPK2uKfS53dVvoskN/s/t6m0Po24BGd1PzJdzHBFCOjxbZLM6+8mDMXeyi2hCLVVQOUcuW41kOgmJ0+zMbww==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/credential-provider-env': 3.716.0
-      '@aws-sdk/credential-provider-http': 3.716.0
-      '@aws-sdk/credential-provider-ini': 3.716.0(@aws-sdk/client-sso-oidc@3.716.0)(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/credential-provider-process': 3.716.0
-      '@aws-sdk/credential-provider-sso': 3.716.0(@aws-sdk/client-sso-oidc@3.716.0)
-      '@aws-sdk/credential-provider-web-identity': 3.716.0(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/types': 3.714.0
-      '@smithy/credential-provider-imds': 3.2.8
-      '@smithy/property-provider': 3.1.11
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - '@aws-sdk/client-sts'
-      - aws-crt
-    dev: false
-
-  /@aws-sdk/credential-provider-node@3.839.0:
-    resolution: {integrity: sha512-7bR+U2h+ft0V8chyeu9Bh/pvau4ZkQMeRt5f0dAULoepZQ77QQVRP4H04yJPTg9DCtqbVULQ3uf5YOp1/08vQw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-node@3.839.0':
     dependencies:
       '@aws-sdk/credential-provider-env': 3.839.0
       '@aws-sdk/credential-provider-http': 3.839.0
@@ -3933,11 +21270,8 @@ packages:
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-node@3.840.0:
-    resolution: {integrity: sha512-KufP8JnxA31wxklLm63evUPSFApGcH8X86z3mv9SRbpCm5ycgWIGVCTXpTOdgq6rPZrwT9pftzv2/b4mV/9clg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-node@3.840.0':
     dependencies:
       '@aws-sdk/credential-provider-env': 3.840.0
       '@aws-sdk/credential-provider-http': 3.840.0
@@ -3946,65 +21280,93 @@ packages:
       '@aws-sdk/credential-provider-sso': 3.840.0
       '@aws-sdk/credential-provider-web-identity': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/credential-provider-imds': 4.0.6
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-process@3.451.0:
-    resolution: {integrity: sha512-HQywSdKeD5PErcLLnZfSyCJO+6T+ZyzF+Lm/QgscSC+CbSUSIPi//s15qhBRVely/3KBV6AywxwNH+5eYgt4lQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-node@3.931.0':
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.931.0
+      '@aws-sdk/credential-provider-http': 3.931.0
+      '@aws-sdk/credential-provider-ini': 3.931.0
+      '@aws-sdk/credential-provider-process': 3.931.0
+      '@aws-sdk/credential-provider-sso': 3.931.0
+      '@aws-sdk/credential-provider-web-identity': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/credential-provider-node@3.940.0':
+    dependencies:
+      '@aws-sdk/credential-provider-env': 3.940.0
+      '@aws-sdk/credential-provider-http': 3.940.0
+      '@aws-sdk/credential-provider-ini': 3.940.0
+      '@aws-sdk/credential-provider-process': 3.940.0
+      '@aws-sdk/credential-provider-sso': 3.940.0
+      '@aws-sdk/credential-provider-web-identity': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/credential-provider-process@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/property-provider': 2.0.15
       '@smithy/shared-ini-file-loader': 2.2.5
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
-
-  /@aws-sdk/credential-provider-process@3.716.0:
-    resolution: {integrity: sha512-0spcu2MWVVHSTHH3WE2E//ttUJPwXRM3BCp+WyI41xLzpNu1Fd8zjOrDpEo0SnGUzsSiRTIJWgkuu/tqv9NJ2A==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/types': 3.714.0
-      '@smithy/property-provider': 3.1.11
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
-      tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-process@3.839.0:
-    resolution: {integrity: sha512-qShpekjociUZ+isyQNa0P7jo+0q3N2+0eJDg8SGyP6K6hHTcGfiqxTDps+IKl6NreCPhZCBzyI9mWkP0xSDR6g==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-process@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-process@3.840.0:
-    resolution: {integrity: sha512-HkDQWHy8tCI4A0Ps2NVtuVYMv9cB4y/IuD/TdOsqeRIAT12h8jDb98BwQPNLAImAOwOWzZJ8Cu0xtSpX7CQhMw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-process@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/credential-provider-sso@3.451.0:
-    resolution: {integrity: sha512-Usm/N51+unOt8ID4HnQzxIjUJDrkAQ1vyTOC0gSEEJ7h64NSSPGD5yhN7il5WcErtRd3EEtT1a8/GTC5TdBctg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-process@3.931.0':
+    dependencies:
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-process@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-sso@3.451.0':
     dependencies:
       '@aws-sdk/client-sso': 3.451.0
       '@aws-sdk/token-providers': 3.451.0
@@ -4015,249 +21377,286 @@ packages:
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
-
-  /@aws-sdk/credential-provider-sso@3.716.0(@aws-sdk/client-sso-oidc@3.716.0):
-    resolution: {integrity: sha512-J2IA3WuCpRGGoZm6VHZVFCnrxXP+41iUWb9Ct/1spljegTa1XjiaZ5Jf3+Ubj7WKiyvP9/dgz1L0bu2bYEjliw==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/client-sso': 3.716.0
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/token-providers': 3.714.0(@aws-sdk/client-sso-oidc@3.716.0)
-      '@aws-sdk/types': 3.714.0
-      '@smithy/property-provider': 3.1.11
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
-      - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-sso@3.839.0:
-    resolution: {integrity: sha512-w10zBLHhU8SBQcdrSPMI02haLoRGZg+gP7mH/Er8VhIXfHefbr7o4NirmB0hwdw/YAH8MLlC9jj7c2SJlsNhYA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-sso@3.839.0':
     dependencies:
       '@aws-sdk/client-sso': 3.839.0
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/token-providers': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-sso@3.840.0:
-    resolution: {integrity: sha512-2qgdtdd6R0Z1y0KL8gzzwFUGmhBHSUx4zy85L2XV1CXhpRNwV71SVWJqLDVV5RVWVf9mg50Pm3AWrUC0xb0pcA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-sso@3.840.0':
     dependencies:
       '@aws-sdk/client-sso': 3.840.0
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/token-providers': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-web-identity@3.451.0:
-    resolution: {integrity: sha512-Xtg3Qw65EfDjWNG7o2xD6sEmumPfsy3WDGjk2phEzVg8s7hcZGxf5wYwe6UY7RJvlEKrU0rFA+AMn6Hfj5oOzg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-sso@3.931.0':
     dependencies:
-      '@aws-sdk/types': 3.451.0
-      '@smithy/property-provider': 2.0.15
-      '@smithy/types': 2.6.0
+      '@aws-sdk/client-sso': 3.931.0
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/token-providers': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
+    transitivePeerDependencies:
+      - aws-crt
 
-  /@aws-sdk/credential-provider-web-identity@3.716.0(@aws-sdk/client-sts@3.716.0):
-    resolution: {integrity: sha512-vzgpWKs2gGXZGdbMKRFrMW4PqEFWkGvwWH2T7ZwQv9m+8lQ7P4Dk2uimqu0f37HZAbpn8HFMqRh4CaySjU354A==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sts': ^3.716.0
+  '@aws-sdk/credential-provider-sso@3.940.0':
     dependencies:
-      '@aws-sdk/client-sts': 3.716.0
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/types': 3.714.0
-      '@smithy/property-provider': 3.1.11
-      '@smithy/types': 3.7.2
+      '@aws-sdk/client-sso': 3.940.0
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/token-providers': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
+    transitivePeerDependencies:
+      - aws-crt
 
-  /@aws-sdk/credential-provider-web-identity@3.839.0:
-    resolution: {integrity: sha512-EvqTc7J1kgmiuxknpCp1S60hyMQvmKxsI5uXzQtcogl/N55rxiXEqnCLI5q6p33q91PJegrcMCM5Q17Afhm5qA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-web-identity@3.451.0':
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/property-provider': 2.0.15
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@aws-sdk/credential-provider-web-identity@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/nested-clients': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/credential-provider-web-identity@3.840.0:
-    resolution: {integrity: sha512-dpEeVXG8uNZSmVXReE4WP0lwoioX2gstk4RnUgrdUE3YaPq8A+hJiVAyc3h+cjDeIqfbsQbZm9qFetKC2LF9dQ==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/credential-provider-web-identity@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/nested-clients': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/middleware-host-header@3.451.0:
-    resolution: {integrity: sha512-j8a5jAfhWmsK99i2k8oR8zzQgXrsJtgrLxc3js6U+525mcZytoiDndkWTmD5fjJ1byU1U2E5TaPq+QJeDip05Q==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/credential-provider-web-identity@3.931.0':
+    dependencies:
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/nested-clients': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/credential-provider-web-identity@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/nested-clients': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/middleware-bucket-endpoint@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-arn-parser': 3.893.0
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-config-provider': 4.2.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-expect-continue@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-flexible-checksums@3.940.0':
+    dependencies:
+      '@aws-crypto/crc32': 5.2.0
+      '@aws-crypto/crc32c': 5.2.0
+      '@aws-crypto/util': 5.2.0
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/is-array-buffer': 4.2.0
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-stream': 4.5.6
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-host-header@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/protocol-http': 3.0.10
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@aws-sdk/middleware-host-header@3.714.0:
-    resolution: {integrity: sha512-6l68kjNrh5QC8FGX3I3geBDavWN5Tg1RLHJ2HLA8ByGBtJyCwnz3hEkKfaxn0bBx0hF9DzbfjEOUF6cDqy2Kjg==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-host-header@3.821.0:
-    resolution: {integrity: sha512-xSMR+sopSeWGx5/4pAGhhfMvGBHioVBbqGvDs6pG64xfNwM5vq5s5v6D04e2i+uSTj4qGa71dLUs5I0UzAK3sw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-host-header@3.821.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@smithy/protocol-http': 5.1.2
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-host-header@3.840.0:
-    resolution: {integrity: sha512-ub+hXJAbAje94+Ya6c6eL7sYujoE8D4Bumu1NUI8TXjUhVVn0HzVWQjpRLshdLsUp1AW7XyeJaxyajRaJQ8+Xg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-host-header@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/types': 4.3.1
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-logger@3.451.0:
-    resolution: {integrity: sha512-0kHrYEyVeB2QBfP6TfbI240aRtatLZtcErJbhpiNUb+CQPgEL3crIjgVE8yYiJumZ7f0jyjo8HLPkwD1/2APaw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-host-header@3.930.0':
     dependencies:
-      '@aws-sdk/types': 3.451.0
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@aws-sdk/types': 3.930.0
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
 
-  /@aws-sdk/middleware-logger@3.714.0:
-    resolution: {integrity: sha512-RkqHlMvQWUaRklU1bMfUuBvdWwxgUtEqpADaHXlGVj3vtEY2UgBjy+57CveC4MByqKIunNvVHBBbjrGVtwY7Lg==}
-    engines: {node: '>=16.0.0'}
+  '@aws-sdk/middleware-host-header@3.936.0':
     dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/types': 3.7.2
+      '@aws-sdk/types': 3.936.0
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-logger@3.821.0:
-    resolution: {integrity: sha512-0cvI0ipf2tGx7fXYEEN5fBeZDz2RnHyb9xftSgUsEq7NBxjV0yTZfLJw6Za5rjE6snC80dRN8+bTNR1tuG89zA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-location-constraint@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-logger@3.451.0':
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-logger@3.821.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-logger@3.840.0:
-    resolution: {integrity: sha512-lSV8FvjpdllpGaRspywss4CtXV8M7NNNH+2/j86vMH+YCOZ6fu2T/TyFd/tHwZ92vDfHctWkRbQxg0bagqwovA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-logger@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-recursion-detection@3.451.0:
-    resolution: {integrity: sha512-J6jL6gJ7orjHGM70KDRcCP7so/J2SnkN4vZ9YRLTeeZY6zvBuHDjX8GCIgSqPn/nXFXckZO8XSnA7u6+3TAT0w==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-logger@3.930.0':
+    dependencies:
+      '@aws-sdk/types': 3.930.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-logger@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-recursion-detection@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/protocol-http': 3.0.10
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@aws-sdk/middleware-recursion-detection@3.714.0:
-    resolution: {integrity: sha512-AVU5ixnh93nqtsfgNc284oXsXaadyHGPHpql/jwgaaqQfEXjS/1/j3j9E/vpacfTTz2Vzo7hAOjnvrOXSEVDaA==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-recursion-detection@3.821.0:
-    resolution: {integrity: sha512-efmaifbhBoqKG3bAoEfDdcM8hn1psF+4qa7ykWuYmfmah59JBeqHLfz5W9m9JoTwoKPkFcVLWZxnyZzAnVBOIg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-recursion-detection@3.821.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@smithy/protocol-http': 5.1.2
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-recursion-detection@3.840.0:
-    resolution: {integrity: sha512-Gu7lGDyfddyhIkj1Z1JtrY5NHb5+x/CRiB87GjaSrKxkDaydtX2CU977JIABtt69l9wLbcGDIQ+W0uJ5xPof7g==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-recursion-detection@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/types': 4.3.1
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-sdk-sqs@3.451.0:
-    resolution: {integrity: sha512-GXpFSc9Ji4IAT/OaTkmnDrxzZrrAsJctUAC9vihpgGDof79A1Oz4R+r2uBMTKGxCIFkqyYW5Se7y2ijjTNa3ZA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-recursion-detection@3.930.0':
+    dependencies:
+      '@aws-sdk/types': 3.930.0
+      '@aws/lambda-invoke-store': 0.1.1
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-recursion-detection@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@aws/lambda-invoke-store': 0.2.1
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-sdk-s3@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-arn-parser': 3.893.0
+      '@smithy/core': 3.18.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/signature-v4': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-config-provider': 4.2.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-stream': 4.5.6
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-sdk-sqs@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/types': 2.6.0
       '@smithy/util-hex-encoding': 2.0.0
-      '@smithy/util-utf8': 2.0.2
-      tslib: 2.6.2
-    dev: false
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
 
-  /@aws-sdk/middleware-sdk-sts@3.451.0:
-    resolution: {integrity: sha512-UJ6UfVUEgp0KIztxpAeelPXI5MLj9wUtUCqYeIMP7C1ZhoEMNm3G39VLkGN43dNhBf1LqjsV9jkKMZbVfYXuwg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-sdk-sts@3.451.0':
     dependencies:
       '@aws-sdk/middleware-signing': 3.451.0
       '@aws-sdk/types': 3.451.0
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-signing@3.451.0:
-    resolution: {integrity: sha512-s5ZlcIoLNg1Huj4Qp06iKniE8nJt/Pj1B/fjhWc6cCPCM7XJYUCejCnRh6C5ZJoBEYodjuwZBejPc1Wh3j+znA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-signing@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/property-provider': 2.0.15
@@ -4265,36 +21664,23 @@ packages:
       '@smithy/signature-v4': 2.0.16
       '@smithy/types': 2.6.0
       '@smithy/util-middleware': 2.0.7
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@aws-sdk/middleware-user-agent@3.451.0:
-    resolution: {integrity: sha512-8NM/0JiKLNvT9wtAQVl1DFW0cEO7OvZyLSUBLNLTHqyvOZxKaZ8YFk7d8PL6l76LeUKRxq4NMxfZQlUIRe0eSA==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/middleware-ssec@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-user-agent@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@aws-sdk/util-endpoints': 3.451.0
       '@smithy/protocol-http': 3.0.10
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@aws-sdk/middleware-user-agent@3.716.0:
-    resolution: {integrity: sha512-FpAtT6nNKrYdkDZndutEraiRMf+TgDzAGvniqRtZ/YTPA+gIsWrsn+TwMKINR81lFC3nQfb9deS5CFtxd021Ew==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/core': 3.716.0
-      '@aws-sdk/types': 3.714.0
-      '@aws-sdk/util-endpoints': 3.714.0
-      '@smithy/core': 2.5.5
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-user-agent@3.839.0:
-    resolution: {integrity: sha512-2u74uRM1JWq6Sf7+3YpjejPM9YkomGt4kWhrmooIBEq1k5r2GTbkH7pNCxBQwBueXM21jAGVDxxeClpTx+5hig==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-user-agent@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/types': 3.821.0
@@ -4303,24 +21689,38 @@ packages:
       '@smithy/protocol-http': 5.1.2
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/middleware-user-agent@3.840.0:
-    resolution: {integrity: sha512-hiiMf7BP5ZkAFAvWRcK67Mw/g55ar7OCrvrynC92hunx/xhMkrgSLM0EXIZ1oTn3uql9kH/qqGF0nqsK6K555A==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-user-agent@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/types': 3.840.0
       '@aws-sdk/util-endpoints': 3.840.0
-      '@smithy/core': 3.6.0
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/types': 4.3.1
+      '@smithy/core': 3.18.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/nested-clients@3.839.0:
-    resolution: {integrity: sha512-Glic0pg2THYP3aRhJORwJJBe1JLtJoEdWV/MFZNyzCklfMwEzpWtZAyxy+tQyFmMeW50uBAnh2R0jhMMcf257w==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/middleware-user-agent@3.931.0':
+    dependencies:
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@aws-sdk/util-endpoints': 3.930.0
+      '@smithy/core': 3.18.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/middleware-user-agent@3.940.0':
+    dependencies:
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-endpoints': 3.936.0
+      '@smithy/core': 3.18.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/nested-clients@3.839.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
@@ -4333,40 +21733,37 @@ packages:
       '@aws-sdk/types': 3.821.0
       '@aws-sdk/util-endpoints': 3.828.0
       '@aws-sdk/util-user-agent-browser': 3.821.0
-      '@aws-sdk/util-user-agent-node': 3.839.0
-      '@smithy/config-resolver': 4.1.4
-      '@smithy/core': 3.6.0
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/hash-node': 4.0.4
-      '@smithy/invalid-dependency': 4.0.4
-      '@smithy/middleware-content-length': 4.0.4
-      '@smithy/middleware-endpoint': 4.1.13
-      '@smithy/middleware-retry': 4.1.14
-      '@smithy/middleware-serde': 4.0.8
-      '@smithy/middleware-stack': 4.0.4
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/url-parser': 4.0.4
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.21
-      '@smithy/util-defaults-mode-node': 4.0.21
-      '@smithy/util-endpoints': 3.0.6
-      '@smithy/util-middleware': 4.0.4
-      '@smithy/util-retry': 4.0.6
-      '@smithy/util-utf8': 4.0.0
+      '@aws-sdk/util-user-agent-node': 3.839.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/nested-clients@3.840.0:
-    resolution: {integrity: sha512-LXYYo9+n4hRqnRSIMXLBb+BLz+cEmjMtTudwK1BF6Bn2RfdDv29KuyeDRrPCS3TwKl7ZKmXUmE9n5UuHAPfBpA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/nested-clients@3.840.0':
     dependencies:
       '@aws-crypto/sha256-browser': 5.2.0
       '@aws-crypto/sha256-js': 5.2.0
@@ -4380,62 +21777,130 @@ packages:
       '@aws-sdk/util-endpoints': 3.840.0
       '@aws-sdk/util-user-agent-browser': 3.840.0
       '@aws-sdk/util-user-agent-node': 3.840.0
-      '@smithy/config-resolver': 4.1.4
-      '@smithy/core': 3.6.0
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/hash-node': 4.0.4
-      '@smithy/invalid-dependency': 4.0.4
-      '@smithy/middleware-content-length': 4.0.4
-      '@smithy/middleware-endpoint': 4.1.13
-      '@smithy/middleware-retry': 4.1.14
-      '@smithy/middleware-serde': 4.0.8
-      '@smithy/middleware-stack': 4.0.4
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/smithy-client': 4.4.5
-      '@smithy/types': 4.3.1
-      '@smithy/url-parser': 4.0.4
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-body-length-browser': 4.0.0
-      '@smithy/util-body-length-node': 4.0.0
-      '@smithy/util-defaults-mode-browser': 4.0.21
-      '@smithy/util-defaults-mode-node': 4.0.21
-      '@smithy/util-endpoints': 3.0.6
-      '@smithy/util-middleware': 4.0.4
-      '@smithy/util-retry': 4.0.6
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/region-config-resolver@3.451.0:
-    resolution: {integrity: sha512-3iMf4OwzrFb4tAAmoROXaiORUk2FvSejnHIw/XHvf/jjR4EqGGF95NZP/n/MeFZMizJWVssrwS412GmoEyoqhg==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/nested-clients@3.931.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/middleware-host-header': 3.930.0
+      '@aws-sdk/middleware-logger': 3.930.0
+      '@aws-sdk/middleware-recursion-detection': 3.930.0
+      '@aws-sdk/middleware-user-agent': 3.931.0
+      '@aws-sdk/region-config-resolver': 3.930.0
+      '@aws-sdk/types': 3.930.0
+      '@aws-sdk/util-endpoints': 3.930.0
+      '@aws-sdk/util-user-agent-browser': 3.930.0
+      '@aws-sdk/util-user-agent-node': 3.931.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/nested-clients@3.940.0':
+    dependencies:
+      '@aws-crypto/sha256-browser': 5.2.0
+      '@aws-crypto/sha256-js': 5.2.0
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/middleware-host-header': 3.936.0
+      '@aws-sdk/middleware-logger': 3.936.0
+      '@aws-sdk/middleware-recursion-detection': 3.936.0
+      '@aws-sdk/middleware-user-agent': 3.940.0
+      '@aws-sdk/region-config-resolver': 3.936.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-endpoints': 3.936.0
+      '@aws-sdk/util-user-agent-browser': 3.936.0
+      '@aws-sdk/util-user-agent-node': 3.940.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/core': 3.18.5
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/hash-node': 4.2.5
+      '@smithy/invalid-dependency': 4.2.5
+      '@smithy/middleware-content-length': 4.2.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-retry': 4.4.12
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-body-length-node': 4.2.1
+      '@smithy/util-defaults-mode-browser': 4.3.11
+      '@smithy/util-defaults-mode-node': 4.2.14
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/region-config-resolver@3.451.0':
     dependencies:
       '@smithy/node-config-provider': 2.1.6
       '@smithy/types': 2.6.0
       '@smithy/util-config-provider': 2.0.0
       '@smithy/util-middleware': 2.0.7
-      tslib: 2.6.2
-    dev: false
-
-  /@aws-sdk/region-config-resolver@3.714.0:
-    resolution: {integrity: sha512-HJzsQxgMOAzZrbf/YIqEx30or4tZK1oNAk6Wm6xecUQx+23JXIaePRu1YFUOLBBERQ4QBPpISFurZWBMZ5ibAw==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/types': 3.7.2
-      '@smithy/util-config-provider': 3.0.0
-      '@smithy/util-middleware': 3.0.11
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/region-config-resolver@3.821.0:
-    resolution: {integrity: sha512-t8og+lRCIIy5nlId0bScNpCkif8sc0LhmtaKsbm0ZPm3sCa/WhCbSZibjbZ28FNjVCV+p0D9RYZx0VDDbtWyjw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/region-config-resolver@3.821.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@smithy/node-config-provider': 4.1.3
@@ -4443,23 +21908,67 @@ packages:
       '@smithy/util-config-provider': 4.0.0
       '@smithy/util-middleware': 4.0.4
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/region-config-resolver@3.840.0:
-    resolution: {integrity: sha512-Qjnxd/yDv9KpIMWr90ZDPtRj0v75AqGC92Lm9+oHXZ8p1MjG5JE2CW0HL8JRgK9iKzgKBL7pPQRXI8FkvEVfrA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/region-config-resolver@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/types': 4.3.1
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
       '@smithy/util-config-provider': 4.0.0
-      '@smithy/util-middleware': 4.0.4
+      '@smithy/util-middleware': 4.2.5
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/token-providers@3.451.0:
-    resolution: {integrity: sha512-ij1L5iUbn6CwxVOT1PG4NFjsrsKN9c4N1YEM0lkl6DwmaNOscjLKGSNyj9M118vSWsOs1ZDbTwtj++h0O/BWrQ==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/region-config-resolver@3.930.0':
+    dependencies:
+      '@aws-sdk/types': 3.930.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/region-config-resolver@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/s3-presigned-post@3.940.0':
+    dependencies:
+      '@aws-sdk/client-s3': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-format-url': 3.936.0
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/signature-v4': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-hex-encoding': 4.2.0
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
+
+  '@aws-sdk/s3-request-presigner@3.940.0':
+    dependencies:
+      '@aws-sdk/signature-v4-multi-region': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@aws-sdk/util-format-url': 3.936.0
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/signature-v4-multi-region@3.940.0':
+    dependencies:
+      '@aws-sdk/middleware-sdk-s3': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/signature-v4': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/token-providers@3.451.0':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
@@ -4496,273 +22005,245 @@ packages:
       '@smithy/util-defaults-mode-node': 2.0.26
       '@smithy/util-endpoints': 1.0.5
       '@smithy/util-retry': 2.0.7
-      '@smithy/util-utf8': 2.0.2
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
-
-  /@aws-sdk/token-providers@3.714.0(@aws-sdk/client-sso-oidc@3.716.0):
-    resolution: {integrity: sha512-vKN064aLE3kl+Zl16Ony3jltHnMddMBT7JRkP1L+lLywhA0PcAKxpdvComul/sTBWnbnwLnaS5NsDUhcWySH8A==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sso-oidc': ^3.714.0
-    dependencies:
-      '@aws-sdk/client-sso-oidc': 3.716.0(@aws-sdk/client-sts@3.716.0)
-      '@aws-sdk/types': 3.714.0
-      '@smithy/property-provider': 3.1.11
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
-      tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/token-providers@3.839.0:
-    resolution: {integrity: sha512-2nlafqdSbet/2WtYIoZ7KEGFowFonPBDYlTjrUvwU2yooE10VhvzhLSCTB2aKIVzo2Z2wL5WGFQsqAY5QwK6Bw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/token-providers@3.839.0':
     dependencies:
       '@aws-sdk/core': 3.839.0
       '@aws-sdk/nested-clients': 3.839.0
       '@aws-sdk/types': 3.821.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/token-providers@3.840.0:
-    resolution: {integrity: sha512-6BuTOLTXvmgwjK7ve7aTg9JaWFdM5UoMolLVPMyh3wTv9Ufalh8oklxYHUBIxsKkBGO2WiHXytveuxH6tAgTYg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/token-providers@3.840.0':
     dependencies:
       '@aws-sdk/core': 3.840.0
       '@aws-sdk/nested-clients': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/property-provider': 4.0.4
-      '@smithy/shared-ini-file-loader': 4.0.4
-      '@smithy/types': 4.3.1
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
     transitivePeerDependencies:
       - aws-crt
-    dev: false
 
-  /@aws-sdk/types@3.451.0:
-    resolution: {integrity: sha512-rhK+qeYwCIs+laJfWCcrYEjay2FR/9VABZJ2NRM89jV/fKqGVQR52E5DQqrI+oEIL5JHMhhnr4N4fyECMS35lw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/token-providers@3.931.0':
     dependencies:
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@aws-sdk/core': 3.931.0
+      '@aws-sdk/nested-clients': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+    transitivePeerDependencies:
+      - aws-crt
 
-  /@aws-sdk/types@3.714.0:
-    resolution: {integrity: sha512-ZjpP2gYbSFlxxaUDa1Il5AVvfggvUPbjzzB/l3q0gIE5Thd6xKW+yzEpt2mLZ5s5UaYSABZbF94g8NUOF4CVGA==}
-    engines: {node: '>=16.0.0'}
+  '@aws-sdk/token-providers@3.940.0':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@aws-sdk/core': 3.940.0
+      '@aws-sdk/nested-clients': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
+    transitivePeerDependencies:
+      - aws-crt
 
-  /@aws-sdk/types@3.821.0:
-    resolution: {integrity: sha512-Znroqdai1a90TlxGaJ+FK1lwC0fHpo97Xjsp5UKGR5JODYm7f9+/fF17ebO1KdoBr/Rm0UIFiF5VmI8ts9F1eA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/types@3.451.0':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/types@3.840.0:
-    resolution: {integrity: sha512-xliuHaUFZxEx1NSXeLLZ9Dyu6+EJVQKEoD+yM+zqUo3YDZ7medKJWY6fIOKiPX/N7XbLdBYwajb15Q7IL8KkeA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/types@3.821.0':
     dependencies:
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-endpoints@3.451.0:
-    resolution: {integrity: sha512-giqLGBTnRIcKkDqwU7+GQhKbtJ5Ku35cjGQIfMyOga6pwTBUbaK0xW1Sdd8sBQ1GhApscnChzI9o/R9x0368vw==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/types@3.840.0':
     dependencies:
-      '@aws-sdk/types': 3.451.0
-      '@smithy/util-endpoints': 1.0.5
-      tslib: 2.6.2
-    dev: false
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
 
-  /@aws-sdk/util-endpoints@3.714.0:
-    resolution: {integrity: sha512-Xv+Z2lhe7w7ZZRsgBwBMZgGTVmS+dkkj2S13uNHAx9lhB5ovM8PhK5G/j28xYf6vIibeuHkRAbb7/ozdZIGR+A==}
-    engines: {node: '>=16.0.0'}
+  '@aws-sdk/types@3.930.0':
     dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/types': 3.7.2
-      '@smithy/util-endpoints': 2.1.7
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-endpoints@3.828.0:
-    resolution: {integrity: sha512-RvKch111SblqdkPzg3oCIdlGxlQs+k+P7Etory9FmxPHyPDvsP1j1c74PmgYqtzzMWmoXTjd+c9naUHh9xG8xg==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/types@3.936.0':
+    dependencies:
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/util-arn-parser@3.893.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@aws-sdk/util-endpoints@3.451.0':
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/util-endpoints': 1.0.5
+      tslib: 2.8.1
+
+  '@aws-sdk/util-endpoints@3.828.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@smithy/types': 4.3.1
       '@smithy/util-endpoints': 3.0.6
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-endpoints@3.840.0:
-    resolution: {integrity: sha512-eqE9ROdg/Kk0rj3poutyRCFauPDXIf/WSvCqFiRDDVi6QOnCv/M0g2XW8/jSvkJlOyaXkNCptapIp6BeeFFGYw==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/util-endpoints@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
-      '@smithy/types': 4.3.1
-      '@smithy/util-endpoints': 3.0.6
+      '@smithy/types': 4.9.0
+      '@smithy/util-endpoints': 3.2.5
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-locate-window@3.310.0:
-    resolution: {integrity: sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w==}
-    engines: {node: '>=14.0.0'}
+  '@aws-sdk/util-endpoints@3.930.0':
     dependencies:
+      '@aws-sdk/types': 3.930.0
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-endpoints': 3.2.5
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-user-agent-browser@3.451.0:
-    resolution: {integrity: sha512-Ws5mG3J0TQifH7OTcMrCTexo7HeSAc3cBgjfhS/ofzPUzVCtsyg0G7I6T7wl7vJJETix2Kst2cpOsxygPgPD9w==}
+  '@aws-sdk/util-endpoints@3.936.0':
     dependencies:
-      '@aws-sdk/types': 3.451.0
-      '@smithy/types': 2.6.0
-      bowser: 2.11.0
-      tslib: 2.6.2
-    dev: false
+      '@aws-sdk/types': 3.936.0
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-endpoints': 3.2.5
+      tslib: 2.8.1
+
+  '@aws-sdk/util-format-url@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/querystring-builder': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/util-locate-window@3.310.0':
+    dependencies:
+      tslib: 2.8.1
 
-  /@aws-sdk/util-user-agent-browser@3.714.0:
-    resolution: {integrity: sha512-OdJJ03cP9/MgIVToPJPCPUImbpZzTcwdIgbXC0tUQPJhbD7b7cB4LdnkhNHko+MptpOrCq4CPY/33EpOjRdofw==}
+  '@aws-sdk/util-locate-window@3.893.0':
     dependencies:
-      '@aws-sdk/types': 3.714.0
-      '@smithy/types': 3.7.2
+      tslib: 2.8.1
+
+  '@aws-sdk/util-user-agent-browser@3.451.0':
+    dependencies:
+      '@aws-sdk/types': 3.451.0
+      '@smithy/types': 2.6.0
       bowser: 2.11.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-user-agent-browser@3.821.0:
-    resolution: {integrity: sha512-irWZHyM0Jr1xhC+38OuZ7JB6OXMLPZlj48thElpsO1ZSLRkLZx5+I7VV6k3sp2yZ7BYbKz/G2ojSv4wdm7XTLw==}
+  '@aws-sdk/util-user-agent-browser@3.821.0':
     dependencies:
       '@aws-sdk/types': 3.821.0
       '@smithy/types': 4.3.1
       bowser: 2.11.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-user-agent-browser@3.840.0:
-    resolution: {integrity: sha512-JdyZM3EhhL4PqwFpttZu1afDpPJCCc3eyZOLi+srpX11LsGj6sThf47TYQN75HT1CarZ7cCdQHGzP2uy3/xHfQ==}
+  '@aws-sdk/util-user-agent-browser@3.840.0':
     dependencies:
       '@aws-sdk/types': 3.840.0
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       bowser: 2.11.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-user-agent-node@3.451.0:
-    resolution: {integrity: sha512-TBzm6P+ql4mkGFAjPlO1CI+w3yUT+NulaiALjl/jNX/nnUp6HsJsVxJf4nVFQTG5KRV0iqMypcs7I3KIhH+LmA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      aws-crt: '>=1.0.0'
-    peerDependenciesMeta:
-      aws-crt:
-        optional: true
+  '@aws-sdk/util-user-agent-browser@3.930.0':
+    dependencies:
+      '@aws-sdk/types': 3.930.0
+      '@smithy/types': 4.9.0
+      bowser: 2.12.1
+      tslib: 2.8.1
+
+  '@aws-sdk/util-user-agent-browser@3.936.0':
+    dependencies:
+      '@aws-sdk/types': 3.936.0
+      '@smithy/types': 4.9.0
+      bowser: 2.12.1
+      tslib: 2.8.1
+
+  '@aws-sdk/util-user-agent-node@3.451.0':
     dependencies:
       '@aws-sdk/types': 3.451.0
       '@smithy/node-config-provider': 2.1.6
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@aws-sdk/util-user-agent-node@3.716.0:
-    resolution: {integrity: sha512-3PqaXmQbxrtHKAsPCdp7kn5FrQktj8j3YyuNsqFZ8rWZeEQ88GWlsvE61PTsr2peYCKzpFqYVddef2x1axHU0w==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      aws-crt: '>=1.0.0'
-    peerDependenciesMeta:
-      aws-crt:
-        optional: true
-    dependencies:
-      '@aws-sdk/middleware-user-agent': 3.716.0
-      '@aws-sdk/types': 3.714.0
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-user-agent-node@3.839.0:
-    resolution: {integrity: sha512-MuunkIG1bJVMtTH7MbjXOrhHleU5wjHz5eCAUc6vj7M9rwol71nqjj9b8RLnkO5gsJcKc29Qk8iV6xQuzKWNMw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      aws-crt: '>=1.0.0'
-    peerDependenciesMeta:
-      aws-crt:
-        optional: true
+  '@aws-sdk/util-user-agent-node@3.839.0':
     dependencies:
       '@aws-sdk/middleware-user-agent': 3.839.0
       '@aws-sdk/types': 3.821.0
       '@smithy/node-config-provider': 4.1.3
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-user-agent-node@3.840.0:
-    resolution: {integrity: sha512-Fy5JUEDQU1tPm2Yw/YqRYYc27W5+QD/J4mYvQvdWjUGZLB5q3eLFMGD35Uc28ZFoGMufPr4OCxK/bRfWROBRHQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      aws-crt: '>=1.0.0'
-    peerDependenciesMeta:
-      aws-crt:
-        optional: true
+  '@aws-sdk/util-user-agent-node@3.840.0':
     dependencies:
       '@aws-sdk/middleware-user-agent': 3.840.0
       '@aws-sdk/types': 3.840.0
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/types': 4.3.1
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/util-utf8-browser@3.259.0:
-    resolution: {integrity: sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==}
+  '@aws-sdk/util-user-agent-node@3.931.0':
     dependencies:
+      '@aws-sdk/middleware-user-agent': 3.931.0
+      '@aws-sdk/types': 3.930.0
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@aws-sdk/xml-builder@3.821.0:
-    resolution: {integrity: sha512-DIIotRnefVL6DiaHtO6/21DhJ4JZnnIwdNbpwiAhdt/AVbttcE4yw925gsjur0OGv5BTYXQXU3YnANBYnZjuQA==}
-    engines: {node: '>=18.0.0'}
+  '@aws-sdk/util-user-agent-node@3.940.0':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@aws-sdk/middleware-user-agent': 3.940.0
+      '@aws-sdk/types': 3.936.0
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@babel/code-frame@7.22.13:
-    resolution: {integrity: sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==}
-    engines: {node: '>=6.9.0'}
+  '@aws-sdk/util-utf8-browser@3.259.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@aws-sdk/xml-builder@3.821.0':
+    dependencies:
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@aws-sdk/xml-builder@3.930.0':
+    dependencies:
+      '@smithy/types': 4.9.0
+      fast-xml-parser: 5.2.5
+      tslib: 2.8.1
+
+  '@aws/lambda-invoke-store@0.1.1': {}
+
+  '@aws/lambda-invoke-store@0.2.1': {}
+
+  '@babel/code-frame@7.22.13':
     dependencies:
       '@babel/highlight': 7.22.13
       chalk: 2.4.2
 
-  /@babel/code-frame@7.24.7:
-    resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/code-frame@7.24.7':
     dependencies:
       '@babel/highlight': 7.24.7
       picocolors: 1.1.1
 
-  /@babel/compat-data@7.22.9:
-    resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==}
-    engines: {node: '>=6.9.0'}
-
-  /@babel/compat-data@7.25.4:
-    resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==}
-    engines: {node: '>=6.9.0'}
-    dev: false
+  '@babel/compat-data@7.22.9': {}
 
-  /@babel/core@7.22.17:
-    resolution: {integrity: sha512-2EENLmhpwplDux5PSsZnSbnSkB3tZ6QTksgO25xwEL7pIDcNOMhF5v/s6RzwjMZzZzw9Ofc30gHv5ChCC8pifQ==}
-    engines: {node: '>=6.9.0'}
+  '@babel/core@7.22.17':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@babel/code-frame': 7.22.13
@@ -4775,203 +22256,84 @@ packages:
       '@babel/traverse': 7.24.7
       '@babel/types': 7.24.0
       convert-source-map: 1.9.0
-      debug: 4.4.0(supports-color@10.0.0)
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      semver: 6.3.1
-    transitivePeerDependencies:
-      - supports-color
-
-  /@babel/core@7.24.5:
-    resolution: {integrity: sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.24.7
-      '@babel/generator': 7.24.7
-      '@babel/helper-compilation-targets': 7.25.2
-      '@babel/helper-module-transforms': 7.25.2(@babel/core@7.24.5)
-      '@babel/helpers': 7.25.6
-      '@babel/parser': 7.27.0
-      '@babel/template': 7.24.7
-      '@babel/traverse': 7.24.7
-      '@babel/types': 7.27.0
-      convert-source-map: 2.0.0
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
-      semver: 6.3.1
+      semver: 5.7.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@babel/eslint-parser@7.21.8(@babel/core@7.22.17)(eslint@8.31.0):
-    resolution: {integrity: sha512-HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
-    peerDependencies:
-      '@babel/core': '>=7.11.0'
-      eslint: ^7.5.0 || ^8.0.0
+  '@babel/eslint-parser@7.21.8(@babel/core@7.22.17)(eslint@8.31.0)':
     dependencies:
       '@babel/core': 7.22.17
       '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1
       eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
-      semver: 6.3.1
-    dev: true
+      semver: 5.7.2
 
-  /@babel/generator@7.22.15:
-    resolution: {integrity: sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/generator@7.22.15':
     dependencies:
       '@babel/types': 7.24.0
       '@jridgewell/gen-mapping': 0.3.2
       '@jridgewell/trace-mapping': 0.3.19
       jsesc: 2.5.2
 
-  /@babel/generator@7.24.7:
-    resolution: {integrity: sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.27.0
-      '@jridgewell/gen-mapping': 0.3.8
-      '@jridgewell/trace-mapping': 0.3.25
-      jsesc: 2.5.2
-
-  /@babel/generator@7.25.6:
-    resolution: {integrity: sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/generator@7.24.7':
     dependencies:
-      '@babel/types': 7.27.0
+      '@babel/types': 7.27.3
       '@jridgewell/gen-mapping': 0.3.8
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
-    dev: false
 
-  /@babel/helper-annotate-as-pure@7.22.5:
-    resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-annotate-as-pure@7.22.5':
     dependencies:
       '@babel/types': 7.27.0
-    dev: true
 
-  /@babel/helper-compilation-targets@7.22.15:
-    resolution: {integrity: sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-compilation-targets@7.22.15':
     dependencies:
       '@babel/compat-data': 7.22.9
       '@babel/helper-validator-option': 7.22.15
       browserslist: 4.24.4
       lru-cache: 5.1.1
-      semver: 6.3.1
-
-  /@babel/helper-compilation-targets@7.25.2:
-    resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/compat-data': 7.25.4
-      '@babel/helper-validator-option': 7.24.8
-      browserslist: 4.24.4
-      lru-cache: 5.1.1
-      semver: 6.3.1
-    dev: false
+      semver: 5.7.2
 
-  /@babel/helper-create-class-features-plugin@7.24.0(@babel/core@7.22.17):
-    resolution: {integrity: sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  '@babel/helper-create-class-features-plugin@7.24.0(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-function-name': 7.23.0
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-function-name': 7.24.7
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
       '@babel/helper-replace-supers': 7.22.20(@babel/core@7.22.17)
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      semver: 6.3.1
-    dev: true
-
-  /@babel/helper-environment-visitor@7.22.20:
-    resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
-    engines: {node: '>=6.9.0'}
-
-  /@babel/helper-environment-visitor@7.22.5:
-    resolution: {integrity: sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
-  /@babel/helper-environment-visitor@7.24.7:
-    resolution: {integrity: sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.27.0
+      '@babel/helper-split-export-declaration': 7.24.7
+      semver: 5.7.2
 
-  /@babel/helper-function-name@7.22.5:
-    resolution: {integrity: sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.22.15
-      '@babel/types': 7.27.0
-    dev: true
+  '@babel/helper-environment-visitor@7.22.20': {}
 
-  /@babel/helper-function-name@7.23.0:
-    resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-environment-visitor@7.24.7':
     dependencies:
-      '@babel/template': 7.24.7
-      '@babel/types': 7.27.0
-    dev: true
+      '@babel/types': 7.27.3
 
-  /@babel/helper-function-name@7.24.7:
-    resolution: {integrity: sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-function-name@7.24.7':
     dependencies:
       '@babel/template': 7.24.7
-      '@babel/types': 7.27.0
-
-  /@babel/helper-hoist-variables@7.22.5:
-    resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.27.0
-    dev: true
-
-  /@babel/helper-hoist-variables@7.24.7:
-    resolution: {integrity: sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.27.0
+      '@babel/types': 7.27.3
 
-  /@babel/helper-member-expression-to-functions@7.23.0:
-    resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-hoist-variables@7.24.7':
     dependencies:
-      '@babel/types': 7.27.0
-    dev: true
+      '@babel/types': 7.27.3
 
-  /@babel/helper-module-imports@7.22.15:
-    resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-member-expression-to-functions@7.23.0':
     dependencies:
-      '@babel/types': 7.27.0
+      '@babel/types': 7.27.3
 
-  /@babel/helper-module-imports@7.24.7:
-    resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-module-imports@7.22.15':
     dependencies:
-      '@babel/traverse': 7.25.6
       '@babel/types': 7.27.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
 
-  /@babel/helper-module-transforms@7.22.17(@babel/core@7.22.17):
-    resolution: {integrity: sha512-XouDDhQESrLHTpnBtCKExJdyY4gJCdrvH2Pyv8r8kovX2U8G0dRUOT45T9XlbLtuu9CLXP15eusnkprhoPV5iQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  '@babel/helper-module-transforms@7.22.17(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-environment-visitor': 7.22.20
@@ -4980,121 +22342,52 @@ packages:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/helper-validator-identifier': 7.25.9
 
-  /@babel/helper-module-transforms@7.25.2(@babel/core@7.24.5):
-    resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/core': 7.24.5
-      '@babel/helper-module-imports': 7.24.7
-      '@babel/helper-simple-access': 7.24.7
-      '@babel/helper-validator-identifier': 7.25.9
-      '@babel/traverse': 7.25.6
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /@babel/helper-optimise-call-expression@7.22.5:
-    resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-optimise-call-expression@7.22.5':
     dependencies:
-      '@babel/types': 7.27.0
-    dev: true
+      '@babel/types': 7.27.3
 
-  /@babel/helper-plugin-utils@7.22.5:
-    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+  '@babel/helper-plugin-utils@7.22.5': {}
 
-  /@babel/helper-plugin-utils@7.24.0:
-    resolution: {integrity: sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==}
-    engines: {node: '>=6.9.0'}
-    dev: true
+  '@babel/helper-plugin-utils@7.24.0': {}
 
-  /@babel/helper-replace-supers@7.22.20(@babel/core@7.22.17):
-    resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
+  '@babel/helper-replace-supers@7.22.20(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
-      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-environment-visitor': 7.24.7
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
-    dev: true
-
-  /@babel/helper-simple-access@7.22.5:
-    resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.27.0
 
-  /@babel/helper-simple-access@7.24.7:
-    resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/traverse': 7.25.6
       '@babel/types': 7.27.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
 
-  /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
-    resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-skip-transparent-expression-wrappers@7.22.5':
     dependencies:
-      '@babel/types': 7.27.0
-    dev: true
+      '@babel/types': 7.27.3
 
-  /@babel/helper-split-export-declaration@7.22.6:
-    resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
       '@babel/types': 7.27.0
 
-  /@babel/helper-split-export-declaration@7.24.7:
-    resolution: {integrity: sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-split-export-declaration@7.24.7':
     dependencies:
-      '@babel/types': 7.27.0
-
-  /@babel/helper-string-parser@7.24.7:
-    resolution: {integrity: sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==}
-    engines: {node: '>=6.9.0'}
+      '@babel/types': 7.27.3
 
-  /@babel/helper-string-parser@7.25.9:
-    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-string-parser@7.24.7': {}
 
-  /@babel/helper-string-parser@7.27.1:
-    resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-string-parser@7.25.9': {}
 
-  /@babel/helper-validator-identifier@7.24.7:
-    resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-string-parser@7.27.1': {}
 
-  /@babel/helper-validator-identifier@7.25.9:
-    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-validator-identifier@7.24.7': {}
 
-  /@babel/helper-validator-identifier@7.27.1:
-    resolution: {integrity: sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-validator-identifier@7.25.9': {}
 
-  /@babel/helper-validator-option@7.22.15:
-    resolution: {integrity: sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helper-validator-identifier@7.27.1': {}
 
-  /@babel/helper-validator-option@7.24.8:
-    resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==}
-    engines: {node: '>=6.9.0'}
-    dev: false
+  '@babel/helper-validator-option@7.22.15': {}
 
-  /@babel/helpers@7.22.15:
-    resolution: {integrity: sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/helpers@7.22.15':
     dependencies:
       '@babel/template': 7.22.15
       '@babel/traverse': 7.24.7
@@ -5102,143 +22395,68 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/helpers@7.25.6:
-    resolution: {integrity: sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.25.0
-      '@babel/types': 7.27.0
-    dev: false
-
-  /@babel/highlight@7.22.13:
-    resolution: {integrity: sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==}
-    engines: {node: '>=6.9.0'}
+  '@babel/highlight@7.22.13':
     dependencies:
       '@babel/helper-validator-identifier': 7.25.9
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/highlight@7.24.7:
-    resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/highlight@7.24.7':
     dependencies:
-      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/helper-validator-identifier': 7.27.1
       chalk: 2.4.2
       js-tokens: 4.0.0
       picocolors: 1.1.1
 
-  /@babel/parser@7.22.16:
-    resolution: {integrity: sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.24.0
-    dev: true
-
-  /@babel/parser@7.24.1:
-    resolution: {integrity: sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.27.0
-    dev: false
-
-  /@babel/parser@7.24.5:
-    resolution: {integrity: sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  '@babel/parser@7.24.1':
     dependencies:
       '@babel/types': 7.27.0
-    dev: false
 
-  /@babel/parser@7.24.7:
-    resolution: {integrity: sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  '@babel/parser@7.24.7':
     dependencies:
       '@babel/types': 7.24.7
 
-  /@babel/parser@7.27.0:
-    resolution: {integrity: sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  '@babel/parser@7.27.0':
     dependencies:
       '@babel/types': 7.27.0
 
-  /@babel/parser@7.27.5:
-    resolution: {integrity: sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  '@babel/parser@7.27.5':
     dependencies:
       '@babel/types': 7.27.3
 
-  /@babel/plugin-syntax-decorators@7.22.10(@babel/core@7.22.17):
-    resolution: {integrity: sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-syntax-decorators@7.22.10(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
-      '@babel/helper-plugin-utils': 7.22.5
-    dev: true
+      '@babel/helper-plugin-utils': 7.24.0
 
-  /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.17):
-    resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
-      '@babel/helper-plugin-utils': 7.22.5
-    dev: true
+      '@babel/helper-plugin-utils': 7.24.0
 
-  /@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.22.17):
-    resolution: {integrity: sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-syntax-typescript@7.21.4(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-plugin-utils': 7.24.0
-    dev: true
 
-  /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.22.17):
-    resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-module-transforms': 7.22.17(@babel/core@7.22.17)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-simple-access': 7.22.5
-    dev: true
 
-  /@babel/plugin-transform-react-display-name@7.18.6(@babel/core@7.22.17):
-    resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-transform-react-display-name@7.18.6(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-plugin-utils': 7.22.5
-    dev: true
 
-  /@babel/plugin-transform-react-jsx-development@7.18.6(@babel/core@7.22.17):
-    resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-transform-react-jsx-development@7.18.6(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.17)
-    dev: true
 
-  /@babel/plugin-transform-react-jsx@7.22.15(@babel/core@7.22.17):
-    resolution: {integrity: sha512-oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-transform-react-jsx@7.22.15(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-annotate-as-pure': 7.22.5
@@ -5246,37 +22464,22 @@ packages:
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.17)
       '@babel/types': 7.27.0
-    dev: true
 
-  /@babel/plugin-transform-react-pure-annotations@7.18.6(@babel/core@7.22.17):
-    resolution: {integrity: sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-transform-react-pure-annotations@7.18.6(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-plugin-utils': 7.24.0
-    dev: true
 
-  /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.22.17):
-    resolution: {integrity: sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/plugin-transform-typescript@7.21.3(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.22.17)
       '@babel/helper-plugin-utils': 7.24.0
       '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.22.17)
-    dev: true
 
-  /@babel/preset-react@7.18.6(@babel/core@7.22.17):
-    resolution: {integrity: sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/preset-react@7.18.6(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/helper-plugin-utils': 7.24.0
@@ -5285,210 +22488,88 @@ packages:
       '@babel/plugin-transform-react-jsx': 7.22.15(@babel/core@7.22.17)
       '@babel/plugin-transform-react-jsx-development': 7.18.6(@babel/core@7.22.17)
       '@babel/plugin-transform-react-pure-annotations': 7.18.6(@babel/core@7.22.17)
-    dev: true
 
-  /@babel/preset-typescript@7.21.5(@babel/core@7.22.17):
-    resolution: {integrity: sha512-iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
+  '@babel/preset-typescript@7.21.5(@babel/core@7.22.17)':
     dependencies:
       '@babel/core': 7.22.17
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-plugin-utils': 7.24.0
       '@babel/helper-validator-option': 7.22.15
       '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.17)
       '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.22.17)
       '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.22.17)
-    dev: true
-
-  /@babel/runtime@7.20.7:
-    resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
-
-  /@babel/runtime@7.22.5:
-    resolution: {integrity: sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.13.11
-    dev: false
-
-  /@babel/runtime@7.24.5:
-    resolution: {integrity: sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.14.1
-
-  /@babel/runtime@7.26.7:
-    resolution: {integrity: sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.14.1
-    dev: false
 
-  /@babel/runtime@7.27.0:
-    resolution: {integrity: sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/runtime@7.27.0':
     dependencies:
       regenerator-runtime: 0.14.1
 
-  /@babel/runtime@7.27.4:
-    resolution: {integrity: sha512-t3yaEOuGu9NlIZ+hIeGbBjFtZT7j2cb2tg0fuaJKeGotchRjjLfrBA9Kwf8quhpP1EUuxModQg04q/mBwyg8uA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/runtime@7.28.4': {}
 
-  /@babel/template@7.22.15:
-    resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==}
-    engines: {node: '>=6.9.0'}
+  '@babel/template@7.22.15':
     dependencies:
       '@babel/code-frame': 7.22.13
       '@babel/parser': 7.27.0
       '@babel/types': 7.27.0
 
-  /@babel/template@7.24.7:
-    resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/parser': 7.27.0
-      '@babel/types': 7.27.0
-
-  /@babel/template@7.25.0:
-    resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/parser': 7.27.0
-      '@babel/types': 7.27.0
-    dev: false
-
-  /@babel/traverse@7.22.17:
-    resolution: {integrity: sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.22.13
-      '@babel/generator': 7.22.15
-      '@babel/helper-environment-visitor': 7.22.5
-      '@babel/helper-function-name': 7.22.5
-      '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.24.7
-      '@babel/types': 7.24.0
-      debug: 4.4.0(supports-color@10.0.0)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@babel/traverse@7.24.7:
-    resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==}
-    engines: {node: '>=6.9.0'}
+  '@babel/template@7.24.7':
     dependencies:
       '@babel/code-frame': 7.24.7
-      '@babel/generator': 7.24.7
-      '@babel/helper-environment-visitor': 7.24.7
-      '@babel/helper-function-name': 7.24.7
-      '@babel/helper-hoist-variables': 7.24.7
-      '@babel/helper-split-export-declaration': 7.24.7
-      '@babel/parser': 7.27.0
-      '@babel/types': 7.27.0
-      debug: 4.4.0(supports-color@10.0.0)
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
+      '@babel/parser': 7.27.5
+      '@babel/types': 7.27.3
 
-  /@babel/traverse@7.25.6:
-    resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==}
-    engines: {node: '>=6.9.0'}
+  '@babel/traverse@7.24.7':
     dependencies:
-      '@babel/code-frame': 7.24.7
-      '@babel/generator': 7.25.6
-      '@babel/parser': 7.27.0
-      '@babel/template': 7.25.0
-      '@babel/types': 7.27.0
-      debug: 4.4.0(supports-color@10.0.0)
+      '@babel/code-frame': 7.24.7
+      '@babel/generator': 7.24.7
+      '@babel/helper-environment-visitor': 7.24.7
+      '@babel/helper-function-name': 7.24.7
+      '@babel/helper-hoist-variables': 7.24.7
+      '@babel/helper-split-export-declaration': 7.24.7
+      '@babel/parser': 7.27.5
+      '@babel/types': 7.27.3
+      debug: 4.4.1(supports-color@10.0.0)
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@babel/types@7.24.0:
-    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
-    engines: {node: '>=6.9.0'}
+  '@babel/types@7.24.0':
     dependencies:
       '@babel/helper-string-parser': 7.25.9
       '@babel/helper-validator-identifier': 7.25.9
       to-fast-properties: 2.0.0
 
-  /@babel/types@7.24.7:
-    resolution: {integrity: sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==}
-    engines: {node: '>=6.9.0'}
+  '@babel/types@7.24.7':
     dependencies:
       '@babel/helper-string-parser': 7.24.7
       '@babel/helper-validator-identifier': 7.24.7
       to-fast-properties: 2.0.0
 
-  /@babel/types@7.27.0:
-    resolution: {integrity: sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==}
-    engines: {node: '>=6.9.0'}
+  '@babel/types@7.27.0':
     dependencies:
       '@babel/helper-string-parser': 7.25.9
       '@babel/helper-validator-identifier': 7.25.9
 
-  /@babel/types@7.27.3:
-    resolution: {integrity: sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==}
-    engines: {node: '>=6.9.0'}
+  '@babel/types@7.27.3':
     dependencies:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.27.1
 
-  /@balena/dockerignore@1.0.2:
-    resolution: {integrity: sha512-wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==}
+  '@balena/dockerignore@1.0.2': {}
 
-  /@bcoe/v8-coverage@1.0.2:
-    resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
-    engines: {node: '>=18'}
-    dev: true
+  '@bcoe/v8-coverage@1.0.2': {}
 
-  /@better-auth/utils@0.2.6:
-    resolution: {integrity: sha512-3y/vaL5Ox33dBwgJ6ub3OPkVqr6B5xL2kgxNHG8eHZuryLyG/4JSPGqjbdRSgjuy9kALUZYDFl+ORIAxlWMSuA==}
+  '@better-auth/utils@0.2.6':
     dependencies:
       uncrypto: 0.1.3
-    dev: false
-
-  /@bufbuild/protobuf@1.10.0:
-    resolution: {integrity: sha512-QDdVFLoN93Zjg36NoQPZfsVH9tZew7wKDKyV5qRdj8ntT4wQCOradQjRaTdwMhWUYsgKsvCINKKm87FdEk96Ag==}
-    dev: false
-
-  /@bufbuild/protobuf@2.2.5:
-    resolution: {integrity: sha512-/g5EzJifw5GF8aren8wZ/G5oMuPoGeS6MQD3ca8ddcvdXR5UELUfdTZITCGNhNXynY/AYl3Z4plmxdj/tRl/hQ==}
-    dev: false
 
-  /@bugsnag/cuid@3.1.1:
-    resolution: {integrity: sha512-d2z4b0rEo3chI07FNN1Xds8v25CNeekecU6FC/2Fs9MxY2EipkZTThVcV2YinMn8dvRUlViKOyC50evoUxg8tw==}
-    dev: false
+  '@braintree/sanitize-url@7.1.1': {}
 
-  /@bundled-es-modules/cookie@2.0.0:
-    resolution: {integrity: sha512-Or6YHg/kamKHpxULAdSqhGqnWFneIXu1NKvvfBBzKGwpVsYuFIQ5aBPHDnnoR3ghW1nvSkALd+EF9iMtY7Vjxw==}
-    dependencies:
-      cookie: 0.5.0
-    dev: false
+  '@bufbuild/protobuf@1.10.0': {}
 
-  /@bundled-es-modules/statuses@1.0.1:
-    resolution: {integrity: sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==}
-    dependencies:
-      statuses: 2.0.1
-    dev: false
+  '@bufbuild/protobuf@2.2.5': {}
 
-  /@bundled-es-modules/tough-cookie@0.1.6:
-    resolution: {integrity: sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==}
-    dependencies:
-      '@types/tough-cookie': 4.0.5
-      tough-cookie: 4.1.4
-    dev: false
+  '@bugsnag/cuid@3.1.1': {}
 
-  /@changesets/apply-release-plan@6.1.4:
-    resolution: {integrity: sha512-FMpKF1fRlJyCZVYHr3CbinpZZ+6MwvOtWUuO8uo+svcATEoc1zRDcj23pAurJ2TZ/uVz1wFHH6K3NlACy0PLew==}
+  '@changesets/apply-release-plan@6.1.4':
     dependencies:
       '@babel/runtime': 7.27.0
       '@changesets/config': 2.3.1
@@ -5502,34 +22583,26 @@ packages:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.6.3
-    dev: false
+      semver: 5.7.2
 
-  /@changesets/assemble-release-plan@5.2.4(patch_hash=3wuhjtl4hjck4itk3w32z4cd5u):
-    resolution: {integrity: sha512-xJkWX+1/CUaOUWTguXEbCDTyWJFECEhmdtbkjhn5GVBGxdP/JwaHBIU9sW3FR6gD07UwZ7ovpiPclQZs+j+mvg==}
+  '@changesets/assemble-release-plan@5.2.4(patch_hash=a7a12643e8d89a00d5322f750c292e8567b5ee0fc9c613a238a1184c25533e4b)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@changesets/errors': 0.1.4
       '@changesets/get-dependents-graph': 1.3.6
       '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
-      semver: 7.6.3
-    dev: false
-    patched: true
+      semver: 5.7.2
 
-  /@changesets/changelog-git@0.1.14:
-    resolution: {integrity: sha512-+vRfnKtXVWsDDxGctOfzJsPhaCdXRYoe+KyWYoq5X/GqoISREiat0l3L8B0a453B2B4dfHGcZaGyowHbp9BSaA==}
+  '@changesets/changelog-git@0.1.14':
     dependencies:
       '@changesets/types': 5.2.1
-    dev: false
 
-  /@changesets/cli@2.26.2:
-    resolution: {integrity: sha512-dnWrJTmRR8bCHikJHl9b9HW3gXACCehz4OasrXpMp7sx97ECuBGGNjJhjPhdZNCvMy9mn4BWdplI323IbqsRig==}
-    hasBin: true
+  '@changesets/cli@2.26.2':
     dependencies:
-      '@babel/runtime': 7.22.5
+      '@babel/runtime': 7.27.0
       '@changesets/apply-release-plan': 6.1.4
-      '@changesets/assemble-release-plan': 5.2.4(patch_hash=3wuhjtl4hjck4itk3w32z4cd5u)
+      '@changesets/assemble-release-plan': 5.2.4(patch_hash=a7a12643e8d89a00d5322f750c292e8567b5ee0fc9c613a238a1184c25533e4b)
       '@changesets/changelog-git': 0.1.14
       '@changesets/config': 2.3.1
       '@changesets/errors': 0.1.4
@@ -5556,14 +22629,12 @@ packages:
       p-limit: 2.3.0
       preferred-pm: 3.0.3
       resolve-from: 5.0.0
-      semver: 7.6.3
+      semver: 5.7.2
       spawndamnit: 2.0.0
       term-size: 2.2.1
       tty-table: 4.1.6
-    dev: false
 
-  /@changesets/config@2.3.1:
-    resolution: {integrity: sha512-PQXaJl82CfIXddUOppj4zWu+987GCw2M+eQcOepxN5s+kvnsZOwjEJO3DH9eVy+OP6Pg/KFEWdsECFEYTtbg6w==}
+  '@changesets/config@2.3.1':
     dependencies:
       '@changesets/errors': 0.1.4
       '@changesets/get-dependents-graph': 1.3.6
@@ -5572,51 +22643,39 @@ packages:
       '@manypkg/get-packages': 1.1.3
       fs-extra: 7.0.1
       micromatch: 4.0.8
-    dev: false
 
-  /@changesets/errors@0.1.4:
-    resolution: {integrity: sha512-HAcqPF7snsUJ/QzkWoKfRfXushHTu+K5KZLJWPb34s4eCZShIf8BFO3fwq6KU8+G7L5KdtN2BzQAXOSXEyiY9Q==}
+  '@changesets/errors@0.1.4':
     dependencies:
       extendable-error: 0.1.7
-    dev: false
 
-  /@changesets/get-dependents-graph@1.3.6:
-    resolution: {integrity: sha512-Q/sLgBANmkvUm09GgRsAvEtY3p1/5OCzgBE5vX3vgb5CvW0j7CEljocx5oPXeQSNph6FXulJlXV3Re/v3K3P3Q==}
+  '@changesets/get-dependents-graph@1.3.6':
     dependencies:
       '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
       chalk: 2.4.2
       fs-extra: 7.0.1
-      semver: 7.6.3
-    dev: false
+      semver: 5.7.2
 
-  /@changesets/get-github-info@0.5.2:
-    resolution: {integrity: sha512-JppheLu7S114aEs157fOZDjFqUDpm7eHdq5E8SSR0gUBTEK0cNSHsrSR5a66xs0z3RWuo46QvA3vawp8BxDHvg==}
+  '@changesets/get-github-info@0.5.2(encoding@0.1.13)':
     dependencies:
       dataloader: 1.4.0
-      node-fetch: 2.6.12
+      node-fetch: 2.6.12(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
-    dev: false
 
-  /@changesets/get-release-plan@3.0.17:
-    resolution: {integrity: sha512-6IwKTubNEgoOZwDontYc2x2cWXfr6IKxP3IhKeK+WjyD6y3M4Gl/jdQvBw+m/5zWILSOCAaGLu2ZF6Q+WiPniw==}
+  '@changesets/get-release-plan@3.0.17':
     dependencies:
       '@babel/runtime': 7.27.0
-      '@changesets/assemble-release-plan': 5.2.4(patch_hash=3wuhjtl4hjck4itk3w32z4cd5u)
+      '@changesets/assemble-release-plan': 5.2.4(patch_hash=a7a12643e8d89a00d5322f750c292e8567b5ee0fc9c613a238a1184c25533e4b)
       '@changesets/config': 2.3.1
       '@changesets/pre': 1.0.14
       '@changesets/read': 0.5.9
       '@changesets/types': 5.2.1
       '@manypkg/get-packages': 1.1.3
-    dev: false
 
-  /@changesets/get-version-range-type@0.3.2:
-    resolution: {integrity: sha512-SVqwYs5pULYjYT4op21F2pVbcrca4qA/bAA3FmFXKMN7Y+HcO8sbZUTx3TAy2VXulP2FACd1aC7f2nTuqSPbqg==}
-    dev: false
+  '@changesets/get-version-range-type@0.3.2': {}
 
-  /@changesets/git@2.0.0:
-    resolution: {integrity: sha512-enUVEWbiqUTxqSnmesyJGWfzd51PY4H7mH9yUw0hPVpZBJ6tQZFMU3F3mT/t9OJ/GjyiM4770i+sehAn6ymx6A==}
+  '@changesets/git@2.0.0':
     dependencies:
       '@babel/runtime': 7.27.0
       '@changesets/errors': 0.1.4
@@ -5625,2316 +22684,847 @@ packages:
       is-subdir: 1.2.0
       micromatch: 4.0.8
       spawndamnit: 2.0.0
-    dev: false
-
-  /@changesets/logger@0.0.5:
-    resolution: {integrity: sha512-gJyZHomu8nASHpaANzc6bkQMO9gU/ib20lqew1rVx753FOxffnCrJlGIeQVxNWCqM+o6OOleCo/ivL8UAO5iFw==}
-    dependencies:
-      chalk: 2.4.2
-    dev: false
-
-  /@changesets/parse@0.3.16:
-    resolution: {integrity: sha512-127JKNd167ayAuBjUggZBkmDS5fIKsthnr9jr6bdnuUljroiERW7FBTDNnNVyJ4l69PzR57pk6mXQdtJyBCJKg==}
-    dependencies:
-      '@changesets/types': 5.2.1
-      js-yaml: 3.14.1
-    dev: false
-
-  /@changesets/pre@1.0.14:
-    resolution: {integrity: sha512-dTsHmxQWEQekHYHbg+M1mDVYFvegDh9j/kySNuDKdylwfMEevTeDouR7IfHNyVodxZXu17sXoJuf2D0vi55FHQ==}
-    dependencies:
-      '@babel/runtime': 7.27.0
-      '@changesets/errors': 0.1.4
-      '@changesets/types': 5.2.1
-      '@manypkg/get-packages': 1.1.3
-      fs-extra: 7.0.1
-    dev: false
-
-  /@changesets/read@0.5.9:
-    resolution: {integrity: sha512-T8BJ6JS6j1gfO1HFq50kU3qawYxa4NTbI/ASNVVCBTsKquy2HYwM9r7ZnzkiMe8IEObAJtUVGSrePCOxAK2haQ==}
-    dependencies:
-      '@babel/runtime': 7.27.0
-      '@changesets/git': 2.0.0
-      '@changesets/logger': 0.0.5
-      '@changesets/parse': 0.3.16
-      '@changesets/types': 5.2.1
-      chalk: 2.4.2
-      fs-extra: 7.0.1
-      p-filter: 2.1.0
-    dev: false
-
-  /@changesets/types@4.1.0:
-    resolution: {integrity: sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==}
-
-  /@changesets/types@5.2.1:
-    resolution: {integrity: sha512-myLfHbVOqaq9UtUKqR/nZA/OY7xFjQMdfgfqeZIBK4d0hA6pgxArvdv8M+6NUzzBsjWLOtvApv8YHr4qM+Kpfg==}
-    dev: false
-
-  /@changesets/write@0.2.3:
-    resolution: {integrity: sha512-Dbamr7AIMvslKnNYsLFafaVORx4H0pvCA2MHqgtNCySMe1blImEyAEOzDmcgKAkgz4+uwoLz7demIrX+JBr/Xw==}
-    dependencies:
-      '@babel/runtime': 7.27.0
-      '@changesets/types': 5.2.1
-      fs-extra: 7.0.1
-      human-id: 1.0.2
-      prettier: 2.8.8
-    dev: false
-
-  /@chevrotain/cst-dts-gen@10.5.0:
-    resolution: {integrity: sha512-lhmC/FyqQ2o7pGK4Om+hzuDrm9rhFYIJ/AXoQBeongmn870Xeb0L6oGEiuR8nohFNL5sMaQEJWCxr1oIVIVXrw==}
-    dependencies:
-      '@chevrotain/gast': 10.5.0
-      '@chevrotain/types': 10.5.0
-      lodash: 4.17.21
-    dev: true
-
-  /@chevrotain/gast@10.5.0:
-    resolution: {integrity: sha512-pXdMJ9XeDAbgOWKuD1Fldz4ieCs6+nLNmyVhe2gZVqoO7v8HXuHYs5OV2EzUtbuai37TlOAQHrTDvxMnvMJz3A==}
-    dependencies:
-      '@chevrotain/types': 10.5.0
-      lodash: 4.17.21
-    dev: true
-
-  /@chevrotain/types@10.5.0:
-    resolution: {integrity: sha512-f1MAia0x/pAVPWH/T73BJVyO2XU5tI4/iE7cnxb7tqdNTNhQI3Uq3XkqcoteTmD4t1aM0LbHCJOhgIDn07kl2A==}
-    dev: true
-
-  /@chevrotain/utils@10.5.0:
-    resolution: {integrity: sha512-hBzuU5+JjB2cqNZyszkDHZgOSrUUT8V3dhgRl8Q9Gp6dAj/H5+KILGjbhDpc3Iy9qmqlm/akuOI2ut9VUtzJxQ==}
-    dev: true
-
-  /@clack/core@0.4.1:
-    resolution: {integrity: sha512-Pxhij4UXg8KSr7rPek6Zowm+5M22rbd2g1nfojHJkxp5YkFqiZ2+YLEM/XGVIzvGOcM0nqjIFxrpDwWRZYWYjA==}
-    dependencies:
-      picocolors: 1.1.1
-      sisteransi: 1.0.5
-    dev: false
-
-  /@clack/prompts@0.10.0:
-    resolution: {integrity: sha512-H3rCl6CwW1NdQt9rE3n373t7o5cthPv7yUoxF2ytZvyvlJv89C5RYMJu83Hed8ODgys5vpBU0GKxIRG83jd8NQ==}
-    dependencies:
-      '@clack/core': 0.4.1
-      picocolors: 1.1.1
-      sisteransi: 1.0.5
-    dev: false
-
-  /@clickhouse/client-common@1.11.1:
-    resolution: {integrity: sha512-bme0le2yhDSAh13d2fxhSW5ZrNoVqZ3LTyac8jK6hNH0qkksXnjYkLS6KQalPU6NMpffxHmpI4+/Gi2MnX0NCA==}
-    dev: false
-
-  /@clickhouse/client@1.11.1:
-    resolution: {integrity: sha512-u9h++h72SmWystijNqfNvMkfA+5+Y1LNfmLL/odCL3VgI3oyAPP9ubSw/Yrt2zRZkLKehMMD1kuOej0QHbSoBA==}
-    engines: {node: '>=16'}
-    dependencies:
-      '@clickhouse/client-common': 1.11.1
-    dev: false
-
-  /@cloudflare/kv-asset-handler@0.3.4:
-    resolution: {integrity: sha512-YLPHc8yASwjNkmcDMQMY35yiWjoKAKnhUbPRszBRS0YgH+IXtsMp61j+yTcnCE3oO2DgP0U3iejLC8FTtKDC8Q==}
-    engines: {node: '>=16.13'}
-    dependencies:
-      mime: 3.0.0
-    dev: false
-
-  /@cloudflare/workerd-darwin-64@1.20240806.0:
-    resolution: {integrity: sha512-FqcVBBCO//I39K5F+HqE/v+UkqY1UrRnS653Jv+XsNNH9TpX5fTs7VCKG4kDSnmxlAaKttyIN5sMEt7lpuNExQ==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@cloudflare/workerd-darwin-arm64@1.20240806.0:
-    resolution: {integrity: sha512-8c3KvmzYp/wg+82KHSOzDetJK+pThH4MTrU1OsjmsR2cUfedm5dk5Lah9/0Ld68+6A0umFACi4W2xJHs/RoBpA==}
-    engines: {node: '>=16'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@cloudflare/workerd-linux-64@1.20240806.0:
-    resolution: {integrity: sha512-/149Bpxw4e2p5QqnBc06g0mx+4sZYh9j0doilnt0wk/uqYkLp0DdXGMQVRB74sBLg2UD3wW8amn1w3KyFhK2tQ==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@cloudflare/workerd-linux-arm64@1.20240806.0:
-    resolution: {integrity: sha512-lacDWY3S1rKL/xT6iMtTQJEKmTTKrBavPczInEuBFXElmrS6IwVjZwv8hhVm32piyNt/AuFu9BYoJALi9D85/g==}
-    engines: {node: '>=16'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@cloudflare/workerd-windows-64@1.20240806.0:
-    resolution: {integrity: sha512-hC6JEfTSQK6//Lg+D54TLVn1ceTPY+fv4MXqDZIYlPP53iN+dL8Xd0utn2SG57UYdlL5FRAhm/EWHcATZg1RgA==}
-    engines: {node: '>=16'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@cloudflare/workers-shared@0.1.0:
-    resolution: {integrity: sha512-SyD4iw6jM4anZaG+ujgVETV4fulF2KHBOW31eavbVN7TNpk2l4aJgwY1YSPK00IKSWsoQuH2TigR446KuT5lqQ==}
-    dev: false
-
-  /@codemirror/autocomplete@6.18.6:
-    resolution: {integrity: sha512-PHHBXFomUs5DF+9tCOM/UoW6XQ4R44lLNNhRaW9PKPTU0D7lIjRg3ElxaJnTwsl/oHiR93WSXDBrekhoUGCPtg==}
-    dependencies:
-      '@codemirror/language': 6.11.1
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-      '@lezer/common': 1.2.3
-    dev: false
-
-  /@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.0.2):
-    resolution: {integrity: sha512-HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA==}
-    peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
-      '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
-    dependencies:
-      '@codemirror/language': 6.3.2
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      '@lezer/common': 1.0.2
-    dev: false
-
-  /@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.2.3):
-    resolution: {integrity: sha512-HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA==}
-    peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
-      '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
-    dependencies:
-      '@codemirror/language': 6.3.2
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      '@lezer/common': 1.2.3
-    dev: false
-
-  /@codemirror/commands@6.1.3:
-    resolution: {integrity: sha512-wUw1+vb34Ultv0Q9m/OVB7yizGXgtoDbkI5f5ErM8bebwLyUYjicdhJTKhTvPTpgkv8dq/BK0lQ3K5pRf2DAJw==}
-    dependencies:
-      '@codemirror/language': 6.3.2
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      '@lezer/common': 1.0.2
-    dev: false
-
-  /@codemirror/commands@6.8.1:
-    resolution: {integrity: sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==}
-    dependencies:
-      '@codemirror/language': 6.11.1
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-      '@lezer/common': 1.2.3
-    dev: false
-
-  /@codemirror/lang-javascript@6.1.2:
-    resolution: {integrity: sha512-OcwLfZXdQ1OHrLiIcKCn7MqZ7nx205CMKlhe+vL88pe2ymhT9+2P+QhwkYGxMICj8TDHyp8HFKVwpiisUT7iEQ==}
-    dependencies:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.0.2)
-      '@codemirror/language': 6.3.2
-      '@codemirror/lint': 6.4.2
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      '@lezer/common': 1.0.2
-      '@lezer/javascript': 1.4.1
-    dev: false
-
-  /@codemirror/lang-json@6.0.1:
-    resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==}
-    dependencies:
-      '@codemirror/language': 6.3.2
-      '@lezer/json': 1.0.0
-    dev: false
-
-  /@codemirror/language@6.11.1:
-    resolution: {integrity: sha512-5kS1U7emOGV84vxC+ruBty5sUgcD0te6dyupyRVG2zaSjhTDM73LhVKUtVwiqSe6QwmEoA4SCiU8AKPFyumAWQ==}
-    dependencies:
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-      '@lezer/common': 1.2.3
-      '@lezer/highlight': 1.2.1
-      '@lezer/lr': 1.4.2
-      style-mod: 4.1.2
-    dev: false
-
-  /@codemirror/language@6.3.2:
-    resolution: {integrity: sha512-g42uHhOcEMAXjmozGG+rdom5UsbyfMxQFh7AbkeoaNImddL6Xt4cQDL0+JxmG7+as18rUAvZaqzP/TjsciVIrA==}
-    dependencies:
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      '@lezer/common': 1.0.2
-      '@lezer/highlight': 1.1.6
-      '@lezer/lr': 1.3.0
-      style-mod: 4.0.0
-    dev: false
-
-  /@codemirror/lint@6.4.2:
-    resolution: {integrity: sha512-wzRkluWb1ptPKdzlsrbwwjYCPLgzU6N88YBAmlZi8WFyuiEduSd05MnJYNogzyc8rPK7pj6m95ptUApc8sHKVA==}
-    dependencies:
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      crelt: 1.0.5
-    dev: false
-
-  /@codemirror/lint@6.8.5:
-    resolution: {integrity: sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==}
-    dependencies:
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-      crelt: 1.0.6
-    dev: false
-
-  /@codemirror/search@6.2.3:
-    resolution: {integrity: sha512-V9n9233lopQhB1dyjsBK2Wc1i+8hcCqxl1wQ46c5HWWLePoe4FluV3TGHoZ04rBRlGjNyz9DTmpJErig8UE4jw==}
-    dependencies:
-      '@codemirror/state': 6.2.0
-      '@codemirror/view': 6.7.2
-      crelt: 1.0.5
-    dev: false
-
-  /@codemirror/search@6.5.11:
-    resolution: {integrity: sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==}
-    dependencies:
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-      crelt: 1.0.6
-    dev: false
-
-  /@codemirror/state@6.2.0:
-    resolution: {integrity: sha512-69QXtcrsc3RYtOtd+GsvczJ319udtBf1PTrr2KbLWM/e2CXUPnh0Nz9AUo8WfhSQ7GeL8dPVNUmhQVgpmuaNGA==}
-    dev: false
-
-  /@codemirror/state@6.5.2:
-    resolution: {integrity: sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==}
-    dependencies:
-      '@marijn/find-cluster-break': 1.0.2
-    dev: false
-
-  /@codemirror/theme-one-dark@6.1.2:
-    resolution: {integrity: sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==}
-    dependencies:
-      '@codemirror/language': 6.11.1
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-      '@lezer/highlight': 1.2.1
-    dev: false
-
-  /@codemirror/view@6.37.1:
-    resolution: {integrity: sha512-Qy4CAUwngy/VQkEz0XzMKVRcckQuqLYWKqVpDDDghBe5FSXSqfVrJn49nw3ePZHxRUz4nRmb05Lgi+9csWo4eg==}
-    dependencies:
-      '@codemirror/state': 6.5.2
-      crelt: 1.0.6
-      style-mod: 4.1.2
-      w3c-keyname: 2.2.8
-    dev: false
-
-  /@codemirror/view@6.7.2:
-    resolution: {integrity: sha512-HeK2GyycxceaQVyvYVYXmn1vUKYYBsHCcfGRSsFO+3fRRtwXx2STK0YiFBmiWx2vtU9gUAJgIUXUN8a0osI8Ng==}
-    dependencies:
-      '@codemirror/state': 6.2.0
-      style-mod: 4.0.0
-      w3c-keyname: 2.2.6
-    dev: false
-
-  /@colors/colors@1.5.0:
-    resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==}
-    engines: {node: '>=0.1.90'}
-    requiresBuild: true
-    optional: true
-
-  /@conform-to/dom@0.9.2:
-    resolution: {integrity: sha512-vYJvXMRxa9Ieslv5eVcak5+0QbcTv+HwdLqRPZ8lhSFZx5qQWJwdou+Iz+ERzsSQHh7QS3DDYG5HmzaN4evf9g==}
-    dev: false
-
-  /@conform-to/react@0.9.2(react@18.2.0):
-    resolution: {integrity: sha512-0eApSadAkM5/l1JNfQqpU+O/9lkjY89riG6jnrW8DWepyGfmN/COZtT7sRXla0SVOspXGJqGcKh+nk1f7Zbpaw==}
-    peerDependencies:
-      react: '>=16.8'
-    dependencies:
-      '@conform-to/dom': 0.9.2
-      react: 18.2.0
-    dev: false
-
-  /@conform-to/zod@0.9.2(@conform-to/dom@0.9.2)(zod@3.23.8):
-    resolution: {integrity: sha512-treG9ZcuNuRERQ1uYvJSWT0zZuqHnYTzRwucg20+/WdjgKNSb60Br+Cy6BAHvVQ8dN6wJsGkHenkX2mSVw3xOA==}
-    peerDependencies:
-      '@conform-to/dom': 0.9.2
-      zod: ^3.21.0
-    dependencies:
-      '@conform-to/dom': 0.9.2
-      zod: 3.23.8
-    dev: false
-
-  /@connectrpc/connect-node@1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0):
-    resolution: {integrity: sha512-0ANnrr6SvsjevsWEgdzHy7BaHkluZyS6s4xNoVt7RBHFR5V/kT9lPokoIbYUOU9JHzdRgTaS3x5595mwUsu15g==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      '@bufbuild/protobuf': ^1.4.2
-      '@connectrpc/connect': 1.4.0
-    dependencies:
-      '@bufbuild/protobuf': 1.10.0
-      '@connectrpc/connect': 1.4.0(@bufbuild/protobuf@1.10.0)
-      undici: 5.28.4
-    dev: false
-
-  /@connectrpc/connect-web@2.0.0-rc.3(@bufbuild/protobuf@2.2.5)(@connectrpc/connect@2.0.0-rc.3):
-    resolution: {integrity: sha512-w88P8Lsn5CCsA7MFRl2e6oLY4J/5toiNtJns/YJrlyQaWOy3RO8pDgkz+iIkG98RPMhj2thuBvsd3Cn4DKKCkw==}
-    peerDependencies:
-      '@bufbuild/protobuf': ^2.2.0
-      '@connectrpc/connect': 2.0.0-rc.3
-    dependencies:
-      '@bufbuild/protobuf': 2.2.5
-      '@connectrpc/connect': 2.0.0-rc.3(@bufbuild/protobuf@2.2.5)
-    dev: false
 
-  /@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0):
-    resolution: {integrity: sha512-vZeOkKaAjyV4+RH3+rJZIfDFJAfr+7fyYr6sLDKbYX3uuTVszhFe9/YKf5DNqrDb5cKdKVlYkGn6DTDqMitAnA==}
-    peerDependencies:
-      '@bufbuild/protobuf': ^1.4.2
+  '@changesets/logger@0.0.5':
     dependencies:
-      '@bufbuild/protobuf': 1.10.0
-    dev: false
+      chalk: 2.4.2
 
-  /@connectrpc/connect@2.0.0-rc.3(@bufbuild/protobuf@2.2.5):
-    resolution: {integrity: sha512-ARBt64yEyKbanyRETTjcjJuHr2YXorzQo0etyS5+P6oSeW8xEuzajA9g+zDnMcj1hlX2dQE93foIWQGfpru7gQ==}
-    peerDependencies:
-      '@bufbuild/protobuf': ^2.2.0
+  '@changesets/parse@0.3.16':
     dependencies:
-      '@bufbuild/protobuf': 2.2.5
-    dev: false
+      '@changesets/types': 5.2.1
+      js-yaml: 3.14.2
 
-  /@cspotcode/source-map-support@0.8.1:
-    resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==}
-    engines: {node: '>=12'}
+  '@changesets/pre@1.0.14':
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.9
+      '@babel/runtime': 7.27.0
+      '@changesets/errors': 0.1.4
+      '@changesets/types': 5.2.1
+      '@manypkg/get-packages': 1.1.3
+      fs-extra: 7.0.1
 
-  /@depot/cli-darwin-arm64@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-H7tQ0zWXVmdYXGFvt3d/v5fmquMlMM1I9JC8C2yiBZ9En9a20hzSbKoiym92RtcfqjKQFvhXL0DT6vQmJ8bgQA==}
-    engines: {node: '>=14'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@changesets/read@0.5.9':
+    dependencies:
+      '@babel/runtime': 7.27.0
+      '@changesets/git': 2.0.0
+      '@changesets/logger': 0.0.5
+      '@changesets/parse': 0.3.16
+      '@changesets/types': 5.2.1
+      chalk: 2.4.2
+      fs-extra: 7.0.1
+      p-filter: 2.1.0
 
-  /@depot/cli-darwin-x64@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-3RDyybnCC2YSvbJCkHxXBYbKR7adUO7U00O9DHreX8EyS2E/C3kQgET+rFXR+iDdeG0h+h+At2rDng7AxvUhDw==}
-    engines: {node: '>=14'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@changesets/types@4.1.0': {}
 
-  /@depot/cli-linux-arm64@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-Fc1+Guqdsl2WM+b+76FirRjjRvEoYZX0MI4uuIQF9c9gwp6UZSZ5o3U7lAUpdkclVMKXSAW5bsIpgcOfUiJX3w==}
-    engines: {node: '>=14'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@changesets/types@5.2.1': {}
 
-  /@depot/cli-linux-arm@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-95kjKwKxP6RKkAhJoPlO6g3drEYpFWy9AC7QfvQMHDRnI3HXgbxA/BSTp4R3C4TTfp5JUPShVf8Js/NAcrUpUQ==}
-    engines: {node: '>=14'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@changesets/write@0.2.3':
+    dependencies:
+      '@babel/runtime': 7.27.0
+      '@changesets/types': 5.2.1
+      fs-extra: 7.0.1
+      human-id: 1.0.2
+      prettier: 2.8.8
 
-  /@depot/cli-linux-ia32@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-2KoyIoYqnyIuynPN+mWbugoOB2APiNNvFLKERWOwPa0KYLSfcENT3sYxDW8tDuIw2dftHlmZN73uvXrGFeMcDQ==}
-    engines: {node: '>=14'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@chevrotain/cst-dts-gen@11.0.3':
+    dependencies:
+      '@chevrotain/gast': 11.0.3
+      '@chevrotain/types': 11.0.3
+      lodash-es: 4.17.21
 
-  /@depot/cli-linux-x64@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-B8xDlXFxhYHD2tUk0jUv7SKipLfWwJVlY7ZhDQixyQzatibXakahdqpvZJgE6FLZJd3lgFIEAVsKURZHa1l57A==}
-    engines: {node: '>=14'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@chevrotain/gast@11.0.3':
+    dependencies:
+      '@chevrotain/types': 11.0.3
+      lodash-es: 4.17.21
 
-  /@depot/cli-win32-arm64@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-CPJX691MKEhnKZX25xS+opWESgPQ73HKkEwkAvvVqdBzahndcHoqAeIxYLv2hoCqrDlkH3YCF+DJleLiEP3blA==}
-    engines: {node: '>=14'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@chevrotain/regexp-to-ast@11.0.3': {}
 
-  /@depot/cli-win32-ia32@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-6eewZ1zPEyNL3zcCwC01s3rZNMqMGVu1iv/EPywj3/uk4CNyUBaTlZ3StQ1BLFHPQnU0vk29yOzA5ZEuRLSyxA==}
-    engines: {node: '>=14'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@chevrotain/types@11.0.3': {}
 
-  /@depot/cli-win32-x64@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-9CRcc7D0/x4UrBkDuc35WVPMQG5gKMD1JckGLEl6VREE0Ppdny6n+hunQ8prwVc8aqzKG134XCC2U4DUjYg18A==}
-    engines: {node: '>=14'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@chevrotain/utils@11.0.3': {}
 
-  /@depot/cli@0.0.1-cli.2.80.0:
-    resolution: {integrity: sha512-KvmOiQdpbamFziqnzzgqBm6RjfGhLJimBBYEOVriTxCPtVJuBIFm34xZllM36OQzPZIWpWBP+2/UnOyRG5smUg==}
-    engines: {node: '>=14'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@depot/cli-darwin-arm64': 0.0.1-cli.2.80.0
-      '@depot/cli-darwin-x64': 0.0.1-cli.2.80.0
-      '@depot/cli-linux-arm': 0.0.1-cli.2.80.0
-      '@depot/cli-linux-arm64': 0.0.1-cli.2.80.0
-      '@depot/cli-linux-ia32': 0.0.1-cli.2.80.0
-      '@depot/cli-linux-x64': 0.0.1-cli.2.80.0
-      '@depot/cli-win32-arm64': 0.0.1-cli.2.80.0
-      '@depot/cli-win32-ia32': 0.0.1-cli.2.80.0
-      '@depot/cli-win32-x64': 0.0.1-cli.2.80.0
-    dev: false
+  '@clack/core@0.5.0':
+    dependencies:
+      picocolors: 1.1.1
+      sisteransi: 1.0.5
 
-  /@depot/sdk-node@1.0.0:
-    resolution: {integrity: sha512-zq1xqesqGhp58Rh0bTXhsjoC8X+L+LwZABLlQh7Rm45770nGtAABa3GtU1n/776YTMI1gIAhzc++Jxae3H0J4w==}
+  '@clack/prompts@0.11.0':
     dependencies:
-      '@bufbuild/protobuf': 1.10.0
-      '@connectrpc/connect': 1.4.0(@bufbuild/protobuf@1.10.0)
-      '@connectrpc/connect-node': 1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0)
-    dev: false
+      '@clack/core': 0.5.0
+      picocolors: 1.1.1
+      sisteransi: 1.0.5
 
-  /@discoveryjs/json-ext@0.5.7:
-    resolution: {integrity: sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==}
-    engines: {node: '>=10.0.0'}
-    dev: true
+  '@clickhouse/client-common@1.11.1': {}
 
-  /@e2b/code-interpreter@1.1.0:
-    resolution: {integrity: sha512-T54U7WS56ou11ytoxlYllBRBM+MYBpOvVZQa1p1qE4KDZBKJd9m1kAA0PqHjy5T6f/tSv4w5wlq4oyExl4QLLA==}
-    engines: {node: '>=18'}
-    dependencies:
-      e2b: 1.2.1
-    dev: false
+  '@clickhouse/client-common@1.12.1': {}
 
-  /@effect/platform@0.63.2(@effect/schema@0.72.2)(effect@3.7.2):
-    resolution: {integrity: sha512-b39pVFw0NGo/tXjGShW7Yg0M+kG7bRrFR6+dQ3aIu99ePTkTp6bGb/kDB7n+dXsFFdIqHsQGYESeYcOQngxdFQ==}
-    peerDependencies:
-      '@effect/schema': ^0.72.2
-      effect: ^3.7.2
+  '@clickhouse/client@1.11.1':
     dependencies:
-      '@effect/schema': 0.72.2(effect@3.7.2)
-      effect: 3.7.2
-      find-my-way-ts: 0.1.5
-      multipasta: 0.2.5
-    dev: false
+      '@clickhouse/client-common': 1.11.1
 
-  /@effect/schema@0.72.2(effect@3.7.2):
-    resolution: {integrity: sha512-/x1BIA2pqcUidNrOMmwYe6Z58KtSgHSc5iJu7bNwIxi2LHMVuUao1BvpI5x6i7T/zkoi4dd1S6qasZzJIYDjdw==}
-    peerDependencies:
-      effect: ^3.7.2
+  '@clickhouse/client@1.12.1':
     dependencies:
-      effect: 3.7.2
-      fast-check: 3.22.0
-    dev: false
+      '@clickhouse/client-common': 1.12.1
 
-  /@effect/schema@0.75.5(effect@3.16.3):
-    resolution: {integrity: sha512-TQInulTVCuF+9EIbJpyLP6dvxbQJMphrnRqgexm/Ze39rSjfhJuufF7XvU3SxTgg3HnL7B/kpORTJbHhlE6thw==}
-    peerDependencies:
-      effect: ^3.9.2
+  '@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0)':
     dependencies:
-      effect: 3.16.3
-      fast-check: 3.22.0
-    dev: false
-
-  /@electric-sql/client@0.4.0:
-    resolution: {integrity: sha512-YVYSqHitqVIDC1RBTfmHMfAfqDNAKMK9/AFVTDFQQxN3Q85dIQS49zThAuJVecYiuYRJvTiqf40c4n39jZSNrQ==}
-    optionalDependencies:
-      '@rollup/rollup-darwin-arm64': 4.41.1
-    dev: false
-
-  /@electric-sql/client@1.0.0-beta.1:
-    resolution: {integrity: sha512-Ei9jN3pDoGzc+a/bGqnB5ajb52IvSv7/n2btuyzUlcOHIR2kM9fqtYTJXPwZYKLkGZlHWlpHgWyRtrinkP2nHg==}
-    optionalDependencies:
-      '@rollup/rollup-darwin-arm64': 4.41.1
-    dev: false
+      '@codemirror/language': 6.3.2
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      '@lezer/common': 1.3.0
 
-  /@electric-sql/react@0.3.5(react@18.2.0):
-    resolution: {integrity: sha512-qPrlF3BsRg5L8zAn1sLGzc3pkswfEHyQI3lNOu7Xllv1DBx85RvHR1zgGGPAUfC8iwyWupQu9pFPE63GdbeuhA==}
-    peerDependencies:
-      react: ^18.3.1
-    peerDependenciesMeta:
-      react:
-        optional: true
+  '@codemirror/commands@6.1.3':
     dependencies:
-      '@electric-sql/client': 0.4.0
-      react: 18.2.0
-      use-sync-external-store: 1.2.2(react@18.2.0)
-    dev: false
+      '@codemirror/language': 6.3.2
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      '@lezer/common': 1.3.0
 
-  /@emnapi/runtime@1.4.3:
-    resolution: {integrity: sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==}
-    requiresBuild: true
+  '@codemirror/lang-javascript@6.1.2':
     dependencies:
-      tslib: 2.8.1
-    dev: false
-    optional: true
-
-  /@emotion/hash@0.9.0:
-    resolution: {integrity: sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ==}
-    dev: true
+      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0)
+      '@codemirror/language': 6.3.2
+      '@codemirror/lint': 6.4.2
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      '@lezer/common': 1.3.0
+      '@lezer/javascript': 1.4.1
 
-  /@emotion/is-prop-valid@0.8.8:
-    resolution: {integrity: sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==}
-    requiresBuild: true
+  '@codemirror/lang-json@6.0.1':
     dependencies:
-      '@emotion/memoize': 0.7.4
-    dev: false
-    optional: true
-
-  /@emotion/memoize@0.7.4:
-    resolution: {integrity: sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==}
-    requiresBuild: true
-    dev: false
-    optional: true
+      '@codemirror/language': 6.3.2
+      '@lezer/json': 1.0.0
 
-  /@epic-web/test-server@0.1.0:
-    resolution: {integrity: sha512-RjJ2WvFepiXynHqm6svriviySVmpCA2QxJmy0DHYwy/9qjeSZvTAIttNqCLLryrV6hL+RsSpHS9CN4MSn/4DpA==}
-    engines: {node: '>=20'}
+  '@codemirror/lang-sql@6.5.5(@codemirror/view@6.7.2)':
     dependencies:
-      '@hono/node-server': 1.12.2(hono@4.5.11)
-      '@hono/node-ws': 1.0.4(@hono/node-server@1.12.2)
-      '@open-draft/deferred-promise': 2.2.0
-      '@types/ws': 8.5.12
-      hono: 4.5.11
-      ws: 8.18.0(bufferutil@4.0.9)
+      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0)
+      '@codemirror/language': 6.3.2
+      '@codemirror/state': 6.2.0
+      '@lezer/common': 1.3.0
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.3
     transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: true
+      - '@codemirror/view'
 
-  /@esbuild-kit/cjs-loader@2.4.1:
-    resolution: {integrity: sha512-lhc/XLith28QdW0HpHZvZKkorWgmCNT7sVelMHDj3HFdTfdqkwEKvT+aXVQtNAmCC39VJhunDkWhONWB7335mg==}
+  '@codemirror/language@6.3.2':
     dependencies:
-      '@esbuild-kit/core-utils': 3.0.0
-      get-tsconfig: 4.7.6
-    dev: true
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      '@lezer/common': 1.3.0
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.3
+      style-mod: 4.1.3
 
-  /@esbuild-kit/core-utils@3.0.0:
-    resolution: {integrity: sha512-TXmwH9EFS3DC2sI2YJWJBgHGhlteK0Xyu1VabwetMULfm3oYhbrsWV5yaSr2NTWZIgDGVLHbRf0inxbjXqAcmQ==}
+  '@codemirror/lint@6.4.2':
     dependencies:
-      esbuild: 0.15.18
-      source-map-support: 0.5.21
-    dev: true
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      crelt: 1.0.6
 
-  /@esbuild-kit/esm-loader@2.5.4:
-    resolution: {integrity: sha512-afmtLf6uqxD5IgwCzomtqCYIgz/sjHzCWZFvfS5+FzeYxOURPUo4QcHtqJxbxWOMOogKriZanN/1bJQE/ZL93A==}
+  '@codemirror/search@6.2.3':
     dependencies:
-      '@esbuild-kit/core-utils': 3.0.0
-      get-tsconfig: 4.7.6
-    dev: true
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      crelt: 1.0.6
 
-  /@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.17.19):
-    resolution: {integrity: sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==}
-    peerDependencies:
-      esbuild: '*'
+  '@codemirror/state@6.2.0': {}
+
+  '@codemirror/theme-one-dark@6.1.3':
     dependencies:
-      esbuild: 0.17.19
-    dev: false
+      '@codemirror/language': 6.3.2
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+      '@lezer/highlight': 1.2.3
 
-  /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.17.19):
-    resolution: {integrity: sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==}
-    peerDependencies:
-      esbuild: '*'
+  '@codemirror/view@6.7.2':
     dependencies:
-      esbuild: 0.17.19
-      escape-string-regexp: 4.0.0
-      rollup-plugin-node-polyfills: 0.2.1
-    dev: false
+      '@codemirror/state': 6.2.0
+      style-mod: 4.1.3
+      w3c-keyname: 2.2.8
 
-  /@esbuild/aix-ppc64@0.19.11:
-    resolution: {integrity: sha512-FnzU0LyE3ySQk7UntJO4+qIiQgI7KoODnZg5xzXIrFJlKd2P2gwHsHY4927xj9y5PJmJSzULiUCWmv7iWnNa7g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
-    requiresBuild: true
+  '@colors/colors@1.5.0':
     optional: true
 
-  /@esbuild/aix-ppc64@0.20.2:
-    resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
-    requiresBuild: true
-    dev: true
-    optional: true
+  '@conform-to/dom@0.9.2': {}
 
-  /@esbuild/aix-ppc64@0.23.0:
-    resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-    requiresBuild: true
-    optional: true
+  '@conform-to/react@0.9.2(react@18.2.0)':
+    dependencies:
+      '@conform-to/dom': 0.9.2
+      react: 18.2.0
 
-  /@esbuild/aix-ppc64@0.25.1:
-    resolution: {integrity: sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-    requiresBuild: true
-    dev: true
-    optional: true
+  '@conform-to/zod@0.9.2(@conform-to/dom@0.9.2)(zod@3.25.76)':
+    dependencies:
+      '@conform-to/dom': 0.9.2
+      zod: 3.25.76
 
-  /@esbuild/android-arm64@0.16.17:
-    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
+  '@connectrpc/connect-node@1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0))':
+    dependencies:
+      '@bufbuild/protobuf': 1.10.0
+      '@connectrpc/connect': 1.4.0(@bufbuild/protobuf@1.10.0)
+      undici: 5.29.0
 
-  /@esbuild/android-arm64@0.17.19:
-    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
+  '@connectrpc/connect-web@2.0.0-rc.3(@bufbuild/protobuf@2.2.5)(@connectrpc/connect@2.0.0-rc.3(@bufbuild/protobuf@2.2.5))':
+    dependencies:
+      '@bufbuild/protobuf': 2.2.5
+      '@connectrpc/connect': 2.0.0-rc.3(@bufbuild/protobuf@2.2.5)
 
-  /@esbuild/android-arm64@0.17.6:
-    resolution: {integrity: sha512-YnYSCceN/dUzUr5kdtUzB+wZprCafuD89Hs0Aqv9QSdwhYQybhXTaSTcrl6X/aWThn1a/j0eEpUBGOE7269REg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
+  '@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0)':
+    dependencies:
+      '@bufbuild/protobuf': 1.10.0
 
-  /@esbuild/android-arm64@0.18.11:
-    resolution: {integrity: sha512-snieiq75Z1z5LJX9cduSAjUr7vEI1OdlzFPMw0HH5YI7qQHDd3qs+WZoMrWYDsfRJSq36lIA6mfZBkvL46KoIw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
+  '@connectrpc/connect@2.0.0-rc.3(@bufbuild/protobuf@2.2.5)':
+    dependencies:
+      '@bufbuild/protobuf': 2.2.5
 
-  /@esbuild/android-arm64@0.19.11:
-    resolution: {integrity: sha512-aiu7K/5JnLj//KOnOfEZ0D90obUkRzDMyqd/wNAUQ34m4YUPVhRZpnqKV9uqDGxT7cToSDnIHsGooyIczu9T+Q==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    optional: true
+  '@date-fns/tz@1.4.1': {}
 
-  /@esbuild/android-arm64@0.20.2:
-    resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli-darwin-arm64@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm64@0.23.0:
-    resolution: {integrity: sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
+  '@depot/cli-darwin-x64@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm64@0.25.1:
-    resolution: {integrity: sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli-linux-arm64@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.15.18:
-    resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli-linux-arm@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.16.17:
-    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli-linux-ia32@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.17.19:
-    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: false
+  '@depot/cli-linux-x64@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.17.6:
-    resolution: {integrity: sha512-bSC9YVUjADDy1gae8RrioINU6e1lCkg3VGVwm0QQ2E1CWcC4gnMce9+B6RpxuSsrsXsk1yojn7sp1fnG8erE2g==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli-win32-arm64@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.18.11:
-    resolution: {integrity: sha512-q4qlUf5ucwbUJZXF5tEQ8LF7y0Nk4P58hOsGk3ucY0oCwgQqAnqXVbUuahCddVHfrxmpyewRpiTHwVHIETYu7Q==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli-win32-ia32@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.19.11:
-    resolution: {integrity: sha512-5OVapq0ClabvKvQ58Bws8+wkLCV+Rxg7tUVbo9xu034Nm536QTII4YzhaFriQ7rMrorfnFKUsArD2lqKbFY4vw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
+  '@depot/cli-win32-x64@0.0.1-cli.2.80.0':
     optional: true
 
-  /@esbuild/android-arm@0.20.2:
-    resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@depot/cli@0.0.1-cli.2.80.0':
+    optionalDependencies:
+      '@depot/cli-darwin-arm64': 0.0.1-cli.2.80.0
+      '@depot/cli-darwin-x64': 0.0.1-cli.2.80.0
+      '@depot/cli-linux-arm': 0.0.1-cli.2.80.0
+      '@depot/cli-linux-arm64': 0.0.1-cli.2.80.0
+      '@depot/cli-linux-ia32': 0.0.1-cli.2.80.0
+      '@depot/cli-linux-x64': 0.0.1-cli.2.80.0
+      '@depot/cli-win32-arm64': 0.0.1-cli.2.80.0
+      '@depot/cli-win32-ia32': 0.0.1-cli.2.80.0
+      '@depot/cli-win32-x64': 0.0.1-cli.2.80.0
+
+  '@depot/sdk-node@1.0.0':
+    dependencies:
+      '@bufbuild/protobuf': 1.10.0
+      '@connectrpc/connect': 1.4.0(@bufbuild/protobuf@1.10.0)
+      '@connectrpc/connect-node': 1.4.0(@bufbuild/protobuf@1.10.0)(@connectrpc/connect@1.4.0(@bufbuild/protobuf@1.10.0))
+
+  '@discoveryjs/json-ext@0.5.7': {}
+
+  '@e2b/code-interpreter@1.1.0':
+    dependencies:
+      e2b: 1.2.1
+
+  '@effect/platform@0.63.2(@effect/schema@0.72.2(effect@3.7.2))(effect@3.7.2)':
+    dependencies:
+      '@effect/schema': 0.72.2(effect@3.7.2)
+      effect: 3.7.2
+      find-my-way-ts: 0.1.5
+      multipasta: 0.2.5
+
+  '@effect/schema@0.72.2(effect@3.7.2)':
+    dependencies:
+      effect: 3.7.2
+      fast-check: 3.23.2
+
+  '@electric-sql/client@0.4.0':
+    optionalDependencies:
+      '@rollup/rollup-darwin-arm64': 4.53.2
+
+  '@electric-sql/client@1.0.14':
+    dependencies:
+      '@microsoft/fetch-event-source': 2.0.1
+    optionalDependencies:
+      '@rollup/rollup-darwin-arm64': 4.53.2
+
+  '@electric-sql/react@0.3.5(react@18.2.0)':
+    dependencies:
+      '@electric-sql/client': 0.4.0
+      use-sync-external-store: 1.2.2(react@18.2.0)
+    optionalDependencies:
+      react: 18.2.0
+
+  '@emnapi/runtime@1.7.1':
+    dependencies:
+      tslib: 2.8.1
     optional: true
 
-  /@esbuild/android-arm@0.23.0:
-    resolution: {integrity: sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
+  '@emotion/hash@0.9.0': {}
+
+  '@emotion/is-prop-valid@0.8.8':
+    dependencies:
+      '@emotion/memoize': 0.7.4
     optional: true
 
-  /@esbuild/android-arm@0.25.1:
-    resolution: {integrity: sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@emotion/memoize@0.7.4':
     optional: true
 
-  /@esbuild/android-x64@0.16.17:
-    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@epic-web/test-server@0.1.0(bufferutil@4.0.9)':
+    dependencies:
+      '@hono/node-server': 1.12.2(hono@4.5.11)
+      '@hono/node-ws': 1.0.4(@hono/node-server@1.12.2(hono@4.11.8))(bufferutil@4.0.9)
+      '@open-draft/deferred-promise': 2.2.0
+      '@types/ws': 8.5.12
+      hono: 4.5.11
+      ws: 8.17.1(bufferutil@4.0.9)
+    transitivePeerDependencies:
+      - bufferutil
+      - utf-8-validate
+
+  '@esbuild-kit/cjs-loader@2.4.1':
+    dependencies:
+      '@esbuild-kit/core-utils': 3.0.0
+      get-tsconfig: 4.7.6
+
+  '@esbuild-kit/core-utils@3.0.0':
+    dependencies:
+      esbuild: 0.15.18
+      source-map-support: 0.5.21
+
+  '@esbuild-kit/esm-loader@2.5.4':
+    dependencies:
+      '@esbuild-kit/core-utils': 3.0.0
+      get-tsconfig: 4.7.6
+
+  '@esbuild/aix-ppc64@0.19.11':
     optional: true
 
-  /@esbuild/android-x64@0.17.19:
-    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: false
+  '@esbuild/aix-ppc64@0.21.5':
     optional: true
 
-  /@esbuild/android-x64@0.17.6:
-    resolution: {integrity: sha512-MVcYcgSO7pfu/x34uX9u2QIZHmXAB7dEiLQC5bBl5Ryqtpj9lT2sg3gNDEsrPEmimSJW2FXIaxqSQ501YLDsZQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@esbuild/aix-ppc64@0.23.0':
     optional: true
 
-  /@esbuild/android-x64@0.18.11:
-    resolution: {integrity: sha512-iPuoxQEV34+hTF6FT7om+Qwziv1U519lEOvekXO9zaMMlT9+XneAhKL32DW3H7okrCOBQ44BMihE8dclbZtTuw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@esbuild/aix-ppc64@0.24.2':
     optional: true
 
-  /@esbuild/android-x64@0.19.11:
-    resolution: {integrity: sha512-eccxjlfGw43WYoY9QgB82SgGgDbibcqyDTlk3l3C0jOVHKxrjdc9CTwDUQd0vkvYg5um0OH+GpxYvp39r+IPOg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
+  '@esbuild/aix-ppc64@0.25.1':
     optional: true
 
-  /@esbuild/android-x64@0.20.2:
-    resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm64@0.17.6':
     optional: true
 
-  /@esbuild/android-x64@0.23.0:
-    resolution: {integrity: sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
+  '@esbuild/android-arm64@0.18.11':
     optional: true
 
-  /@esbuild/android-x64@0.25.1:
-    resolution: {integrity: sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm64@0.19.11':
     optional: true
 
-  /@esbuild/darwin-arm64@0.16.17:
-    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm64@0.21.5':
     optional: true
 
-  /@esbuild/darwin-arm64@0.17.19:
-    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@esbuild/android-arm64@0.23.0':
     optional: true
 
-  /@esbuild/darwin-arm64@0.17.6:
-    resolution: {integrity: sha512-bsDRvlbKMQMt6Wl08nHtFz++yoZHsyTOxnjfB2Q95gato+Yi4WnRl13oC2/PJJA9yLCoRv9gqT/EYX0/zDsyMA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm64@0.24.2':
     optional: true
 
-  /@esbuild/darwin-arm64@0.18.11:
-    resolution: {integrity: sha512-Gm0QkI3k402OpfMKyQEEMG0RuW2LQsSmI6OeO4El2ojJMoF5NLYb3qMIjvbG/lbMeLOGiW6ooU8xqc+S0fgz2w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm64@0.25.1':
     optional: true
 
-  /@esbuild/darwin-arm64@0.19.11:
-    resolution: {integrity: sha512-ETp87DRWuSt9KdDVkqSoKoLFHYTrkyz2+65fj9nfXsaV3bMhTCjtQfw3y+um88vGRKRiF7erPrh/ZuIdLUIVxQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
+  '@esbuild/android-arm@0.15.18':
     optional: true
 
-  /@esbuild/darwin-arm64@0.20.2:
-    resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm@0.17.6':
     optional: true
 
-  /@esbuild/darwin-arm64@0.23.0:
-    resolution: {integrity: sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
+  '@esbuild/android-arm@0.18.11':
     optional: true
 
-  /@esbuild/darwin-arm64@0.25.1:
-    resolution: {integrity: sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm@0.19.11':
     optional: true
 
-  /@esbuild/darwin-x64@0.16.17:
-    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm@0.21.5':
     optional: true
 
-  /@esbuild/darwin-x64@0.17.19:
-    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@esbuild/android-arm@0.23.0':
     optional: true
 
-  /@esbuild/darwin-x64@0.17.6:
-    resolution: {integrity: sha512-xh2A5oPrYRfMFz74QXIQTQo8uA+hYzGWJFoeTE8EvoZGHb+idyV4ATaukaUvnnxJiauhs/fPx3vYhU4wiGfosg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm@0.24.2':
     optional: true
 
-  /@esbuild/darwin-x64@0.18.11:
-    resolution: {integrity: sha512-N15Vzy0YNHu6cfyDOjiyfJlRJCB/ngKOAvoBf1qybG3eOq0SL2Lutzz9N7DYUbb7Q23XtHPn6lMDF6uWbGv9Fw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-arm@0.25.1':
     optional: true
 
-  /@esbuild/darwin-x64@0.19.11:
-    resolution: {integrity: sha512-fkFUiS6IUK9WYUO/+22omwetaSNl5/A8giXvQlcinLIjVkxwTLSktbF5f/kJMftM2MJp9+fXqZ5ezS7+SALp4g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
+  '@esbuild/android-x64@0.17.6':
     optional: true
 
-  /@esbuild/darwin-x64@0.20.2:
-    resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-x64@0.18.11':
     optional: true
 
-  /@esbuild/darwin-x64@0.23.0:
-    resolution: {integrity: sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
+  '@esbuild/android-x64@0.19.11':
     optional: true
 
-  /@esbuild/darwin-x64@0.25.1:
-    resolution: {integrity: sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-x64@0.21.5':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.16.17:
-    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-x64@0.23.0':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.17.19:
-    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
+  '@esbuild/android-x64@0.24.2':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.17.6:
-    resolution: {integrity: sha512-EnUwjRc1inT4ccZh4pB3v1cIhohE2S4YXlt1OvI7sw/+pD+dIE4smwekZlEPIwY6PhU6oDWwITrQQm5S2/iZgg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/android-x64@0.25.1':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.18.11:
-    resolution: {integrity: sha512-atEyuq6a3omEY5qAh5jIORWk8MzFnCpSTUruBgeyN9jZq1K/QI9uke0ATi3MHu4L8c59CnIi4+1jDKMuqmR71A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-arm64@0.17.6':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.19.11:
-    resolution: {integrity: sha512-lhoSp5K6bxKRNdXUtHoNc5HhbXVCS8V0iZmDvyWvYq9S5WSfTIHU2UGjcGt7UeS6iEYp9eeymIl5mJBn0yiuxA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
+  '@esbuild/darwin-arm64@0.18.11':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.20.2:
-    resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-arm64@0.19.11':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.23.0:
-    resolution: {integrity: sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
+  '@esbuild/darwin-arm64@0.21.5':
     optional: true
 
-  /@esbuild/freebsd-arm64@0.25.1:
-    resolution: {integrity: sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-arm64@0.23.0':
     optional: true
 
-  /@esbuild/freebsd-x64@0.16.17:
-    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-arm64@0.24.2':
     optional: true
 
-  /@esbuild/freebsd-x64@0.17.19:
-    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
+  '@esbuild/darwin-arm64@0.25.1':
     optional: true
 
-  /@esbuild/freebsd-x64@0.17.6:
-    resolution: {integrity: sha512-Uh3HLWGzH6FwpviUcLMKPCbZUAFzv67Wj5MTwK6jn89b576SR2IbEp+tqUHTr8DIl0iDmBAf51MVaP7pw6PY5Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-x64@0.17.6':
     optional: true
 
-  /@esbuild/freebsd-x64@0.18.11:
-    resolution: {integrity: sha512-XtuPrEfBj/YYYnAAB7KcorzzpGTvOr/dTtXPGesRfmflqhA4LMF0Gh/n5+a9JBzPuJ+CGk17CA++Hmr1F/gI0Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-x64@0.18.11':
     optional: true
 
-  /@esbuild/freebsd-x64@0.19.11:
-    resolution: {integrity: sha512-JkUqn44AffGXitVI6/AbQdoYAq0TEullFdqcMY/PCUZ36xJ9ZJRtQabzMA+Vi7r78+25ZIBosLTOKnUXBSi1Kw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
+  '@esbuild/darwin-x64@0.19.11':
     optional: true
 
-  /@esbuild/freebsd-x64@0.20.2:
-    resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-x64@0.21.5':
     optional: true
 
-  /@esbuild/freebsd-x64@0.23.0:
-    resolution: {integrity: sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
+  '@esbuild/darwin-x64@0.23.0':
     optional: true
 
-  /@esbuild/freebsd-x64@0.25.1:
-    resolution: {integrity: sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-x64@0.24.2':
     optional: true
 
-  /@esbuild/linux-arm64@0.16.17:
-    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/darwin-x64@0.25.1':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.17.6':
     optional: true
 
-  /@esbuild/linux-arm64@0.17.19:
-    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/freebsd-arm64@0.18.11':
     optional: true
 
-  /@esbuild/linux-arm64@0.17.6:
-    resolution: {integrity: sha512-bUR58IFOMJX523aDVozswnlp5yry7+0cRLCXDsxnUeQYJik1DukMY+apBsLOZJblpH+K7ox7YrKrHmJoWqVR9w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-arm64@0.19.11':
     optional: true
 
-  /@esbuild/linux-arm64@0.18.11:
-    resolution: {integrity: sha512-c6Vh2WS9VFKxKZ2TvJdA7gdy0n6eSy+yunBvv4aqNCEhSWVor1TU43wNRp2YLO9Vng2G+W94aRz+ILDSwAiYog==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-arm64@0.21.5':
     optional: true
 
-  /@esbuild/linux-arm64@0.19.11:
-    resolution: {integrity: sha512-LneLg3ypEeveBSMuoa0kwMpCGmpu8XQUh+mL8XXwoYZ6Be2qBnVtcDI5azSvh7vioMDhoJFZzp9GWp9IWpYoUg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/freebsd-arm64@0.23.0':
     optional: true
 
-  /@esbuild/linux-arm64@0.20.2:
-    resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-arm64@0.24.2':
     optional: true
 
-  /@esbuild/linux-arm64@0.23.0:
-    resolution: {integrity: sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/freebsd-arm64@0.25.1':
     optional: true
 
-  /@esbuild/linux-arm64@0.25.1:
-    resolution: {integrity: sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-x64@0.17.6':
     optional: true
 
-  /@esbuild/linux-arm@0.16.17:
-    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-x64@0.18.11':
     optional: true
 
-  /@esbuild/linux-arm@0.17.19:
-    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/freebsd-x64@0.19.11':
     optional: true
 
-  /@esbuild/linux-arm@0.17.6:
-    resolution: {integrity: sha512-7YdGiurNt7lqO0Bf/U9/arrPWPqdPqcV6JCZda4LZgEn+PTQ5SMEI4MGR52Bfn3+d6bNEGcWFzlIxiQdS48YUw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-x64@0.21.5':
     optional: true
 
-  /@esbuild/linux-arm@0.18.11:
-    resolution: {integrity: sha512-Idipz+Taso/toi2ETugShXjQ3S59b6m62KmLHkJlSq/cBejixmIydqrtM2XTvNCywFl3VC7SreSf6NV0i6sRyg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-x64@0.23.0':
     optional: true
 
-  /@esbuild/linux-arm@0.19.11:
-    resolution: {integrity: sha512-3CRkr9+vCV2XJbjwgzjPtO8T0SZUmRZla+UL1jw+XqHZPkPgZiyWvbDvl9rqAN8Zl7qJF0O/9ycMtjU67HN9/Q==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/freebsd-x64@0.24.2':
     optional: true
 
-  /@esbuild/linux-arm@0.20.2:
-    resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/freebsd-x64@0.25.1':
     optional: true
 
-  /@esbuild/linux-arm@0.23.0:
-    resolution: {integrity: sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-arm64@0.17.6':
     optional: true
 
-  /@esbuild/linux-arm@0.25.1:
-    resolution: {integrity: sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm64@0.18.11':
     optional: true
 
-  /@esbuild/linux-ia32@0.16.17:
-    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm64@0.19.11':
     optional: true
 
-  /@esbuild/linux-ia32@0.17.19:
-    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-arm64@0.21.5':
     optional: true
 
-  /@esbuild/linux-ia32@0.17.6:
-    resolution: {integrity: sha512-ujp8uoQCM9FRcbDfkqECoARsLnLfCUhKARTP56TFPog8ie9JG83D5GVKjQ6yVrEVdMie1djH86fm98eY3quQkQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm64@0.23.0':
     optional: true
 
-  /@esbuild/linux-ia32@0.18.11:
-    resolution: {integrity: sha512-S3hkIF6KUqRh9n1Q0dSyYcWmcVa9Cg+mSoZEfFuzoYXXsk6196qndrM+ZiHNwpZKi3XOXpShZZ+9dfN5ykqjjw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm64@0.24.2':
     optional: true
 
-  /@esbuild/linux-ia32@0.19.11:
-    resolution: {integrity: sha512-caHy++CsD8Bgq2V5CodbJjFPEiDPq8JJmBdeyZ8GWVQMjRD0sU548nNdwPNvKjVpamYYVL40AORekgfIubwHoA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-arm64@0.25.1':
     optional: true
 
-  /@esbuild/linux-ia32@0.20.2:
-    resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm@0.17.6':
     optional: true
 
-  /@esbuild/linux-ia32@0.23.0:
-    resolution: {integrity: sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-arm@0.18.11':
     optional: true
 
-  /@esbuild/linux-ia32@0.25.1:
-    resolution: {integrity: sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm@0.19.11':
     optional: true
 
-  /@esbuild/linux-loong64@0.15.18:
-    resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm@0.21.5':
     optional: true
 
-  /@esbuild/linux-loong64@0.16.17:
-    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm@0.23.0':
     optional: true
 
-  /@esbuild/linux-loong64@0.17.19:
-    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-arm@0.24.2':
     optional: true
 
-  /@esbuild/linux-loong64@0.17.6:
-    resolution: {integrity: sha512-y2NX1+X/Nt+izj9bLoiaYB9YXT/LoaQFYvCkVD77G/4F+/yuVXYCWz4SE9yr5CBMbOxOfBcy/xFL4LlOeNlzYQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-arm@0.25.1':
     optional: true
 
-  /@esbuild/linux-loong64@0.18.11:
-    resolution: {integrity: sha512-MRESANOoObQINBA+RMZW+Z0TJWpibtE7cPFnahzyQHDCA9X9LOmGh68MVimZlM9J8n5Ia8lU773te6O3ILW8kw==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ia32@0.17.6':
     optional: true
 
-  /@esbuild/linux-loong64@0.19.11:
-    resolution: {integrity: sha512-ppZSSLVpPrwHccvC6nQVZaSHlFsvCQyjnvirnVjbKSHuE5N24Yl8F3UwYUUR1UEPaFObGD2tSvVKbvR+uT1Nrg==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-ia32@0.18.11':
     optional: true
 
-  /@esbuild/linux-loong64@0.20.2:
-    resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ia32@0.19.11':
     optional: true
 
-  /@esbuild/linux-loong64@0.23.0:
-    resolution: {integrity: sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-ia32@0.21.5':
     optional: true
 
-  /@esbuild/linux-loong64@0.25.1:
-    resolution: {integrity: sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ia32@0.23.0':
     optional: true
 
-  /@esbuild/linux-mips64el@0.16.17:
-    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ia32@0.24.2':
     optional: true
 
-  /@esbuild/linux-mips64el@0.17.19:
-    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-ia32@0.25.1':
     optional: true
 
-  /@esbuild/linux-mips64el@0.17.6:
-    resolution: {integrity: sha512-09AXKB1HDOzXD+j3FdXCiL/MWmZP0Ex9eR8DLMBVcHorrWJxWmY8Nms2Nm41iRM64WVx7bA/JVHMv081iP2kUA==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-loong64@0.15.18':
     optional: true
 
-  /@esbuild/linux-mips64el@0.18.11:
-    resolution: {integrity: sha512-qVyPIZrXNMOLYegtD1u8EBccCrBVshxMrn5MkuFc3mEVsw7CCQHaqZ4jm9hbn4gWY95XFnb7i4SsT3eflxZsUg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-loong64@0.17.6':
     optional: true
 
-  /@esbuild/linux-mips64el@0.19.11:
-    resolution: {integrity: sha512-B5x9j0OgjG+v1dF2DkH34lr+7Gmv0kzX6/V0afF41FkPMMqaQ77pH7CrhWeR22aEeHKaeZVtZ6yFwlxOKPVFyg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-loong64@0.18.11':
     optional: true
 
-  /@esbuild/linux-mips64el@0.20.2:
-    resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-loong64@0.19.11':
     optional: true
 
-  /@esbuild/linux-mips64el@0.23.0:
-    resolution: {integrity: sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-loong64@0.21.5':
     optional: true
 
-  /@esbuild/linux-mips64el@0.25.1:
-    resolution: {integrity: sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-loong64@0.23.0':
     optional: true
 
-  /@esbuild/linux-ppc64@0.16.17:
-    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-loong64@0.24.2':
     optional: true
 
-  /@esbuild/linux-ppc64@0.17.19:
-    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-loong64@0.25.1':
     optional: true
 
-  /@esbuild/linux-ppc64@0.17.6:
-    resolution: {integrity: sha512-AmLhMzkM8JuqTIOhxnX4ubh0XWJIznEynRnZAVdA2mMKE6FAfwT2TWKTwdqMG+qEaeyDPtfNoZRpJbD4ZBv0Tg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-mips64el@0.17.6':
     optional: true
 
-  /@esbuild/linux-ppc64@0.18.11:
-    resolution: {integrity: sha512-T3yd8vJXfPirZaUOoA9D2ZjxZX4Gr3QuC3GztBJA6PklLotc/7sXTOuuRkhE9W/5JvJP/K9b99ayPNAD+R+4qQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-mips64el@0.18.11':
     optional: true
 
-  /@esbuild/linux-ppc64@0.19.11:
-    resolution: {integrity: sha512-MHrZYLeCG8vXblMetWyttkdVRjQlQUb/oMgBNurVEnhj4YWOr4G5lmBfZjHYQHHN0g6yDmCAQRR8MUHldvvRDA==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-mips64el@0.19.11':
     optional: true
 
-  /@esbuild/linux-ppc64@0.20.2:
-    resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-mips64el@0.21.5':
     optional: true
 
-  /@esbuild/linux-ppc64@0.23.0:
-    resolution: {integrity: sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-mips64el@0.23.0':
     optional: true
 
-  /@esbuild/linux-ppc64@0.25.1:
-    resolution: {integrity: sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-mips64el@0.24.2':
     optional: true
 
-  /@esbuild/linux-riscv64@0.16.17:
-    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-mips64el@0.25.1':
     optional: true
 
-  /@esbuild/linux-riscv64@0.17.19:
-    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-ppc64@0.17.6':
     optional: true
 
-  /@esbuild/linux-riscv64@0.17.6:
-    resolution: {integrity: sha512-Y4Ri62PfavhLQhFbqucysHOmRamlTVK10zPWlqjNbj2XMea+BOs4w6ASKwQwAiqf9ZqcY9Ab7NOU4wIgpxwoSQ==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ppc64@0.18.11':
     optional: true
 
-  /@esbuild/linux-riscv64@0.18.11:
-    resolution: {integrity: sha512-evUoRPWiwuFk++snjH9e2cAjF5VVSTj+Dnf+rkO/Q20tRqv+644279TZlPK8nUGunjPAtQRCj1jQkDAvL6rm2w==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ppc64@0.19.11':
     optional: true
 
-  /@esbuild/linux-riscv64@0.19.11:
-    resolution: {integrity: sha512-f3DY++t94uVg141dozDu4CCUkYW+09rWtaWfnb3bqe4w5NqmZd6nPVBm+qbz7WaHZCoqXqHz5p6CM6qv3qnSSQ==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-ppc64@0.21.5':
     optional: true
 
-  /@esbuild/linux-riscv64@0.20.2:
-    resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ppc64@0.23.0':
     optional: true
 
-  /@esbuild/linux-riscv64@0.23.0:
-    resolution: {integrity: sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-ppc64@0.24.2':
     optional: true
 
-  /@esbuild/linux-riscv64@0.25.1:
-    resolution: {integrity: sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-ppc64@0.25.1':
     optional: true
 
-  /@esbuild/linux-s390x@0.16.17:
-    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-riscv64@0.17.6':
     optional: true
 
-  /@esbuild/linux-s390x@0.17.19:
-    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-riscv64@0.18.11':
     optional: true
 
-  /@esbuild/linux-s390x@0.17.6:
-    resolution: {integrity: sha512-SPUiz4fDbnNEm3JSdUW8pBJ/vkop3M1YwZAVwvdwlFLoJwKEZ9L98l3tzeyMzq27CyepDQ3Qgoba44StgbiN5Q==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-riscv64@0.19.11':
     optional: true
 
-  /@esbuild/linux-s390x@0.18.11:
-    resolution: {integrity: sha512-/SlRJ15XR6i93gRWquRxYCfhTeC5PdqEapKoLbX63PLCmAkXZHY2uQm2l9bN0oPHBsOw2IswRZctMYS0MijFcg==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-riscv64@0.21.5':
     optional: true
 
-  /@esbuild/linux-s390x@0.19.11:
-    resolution: {integrity: sha512-A5xdUoyWJHMMlcSMcPGVLzYzpcY8QP1RtYzX5/bS4dvjBGVxdhuiYyFwp7z74ocV7WDc0n1harxmpq2ePOjI0Q==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-riscv64@0.23.0':
     optional: true
 
-  /@esbuild/linux-s390x@0.20.2:
-    resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-riscv64@0.24.2':
     optional: true
 
-  /@esbuild/linux-s390x@0.23.0:
-    resolution: {integrity: sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-riscv64@0.25.1':
     optional: true
 
-  /@esbuild/linux-s390x@0.25.1:
-    resolution: {integrity: sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-s390x@0.17.6':
     optional: true
 
-  /@esbuild/linux-x64@0.16.17:
-    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-s390x@0.18.11':
     optional: true
 
-  /@esbuild/linux-x64@0.17.19:
-    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-s390x@0.19.11':
     optional: true
 
-  /@esbuild/linux-x64@0.17.6:
-    resolution: {integrity: sha512-a3yHLmOodHrzuNgdpB7peFGPx1iJ2x6m+uDvhP2CKdr2CwOaqEFMeSqYAHU7hG+RjCq8r2NFujcd/YsEsFgTGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-s390x@0.21.5':
     optional: true
 
-  /@esbuild/linux-x64@0.18.11:
-    resolution: {integrity: sha512-xcncej+wF16WEmIwPtCHi0qmx1FweBqgsRtEL1mSHLFR6/mb3GEZfLQnx+pUDfRDEM4DQF8dpXIW7eDOZl1IbA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-s390x@0.23.0':
     optional: true
 
-  /@esbuild/linux-x64@0.19.11:
-    resolution: {integrity: sha512-grbyMlVCvJSfxFQUndw5mCtWs5LO1gUlwP4CDi4iJBbVpZcqLVT29FxgGuBJGSzyOxotFG4LoO5X+M1350zmPA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-s390x@0.24.2':
     optional: true
 
-  /@esbuild/linux-x64@0.20.2:
-    resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-s390x@0.25.1':
+    optional: true
+
+  '@esbuild/linux-x64@0.17.6':
     optional: true
 
-  /@esbuild/linux-x64@0.23.0:
-    resolution: {integrity: sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@esbuild/linux-x64@0.18.11':
     optional: true
 
-  /@esbuild/linux-x64@0.25.1:
-    resolution: {integrity: sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-x64@0.19.11':
     optional: true
 
-  /@esbuild/netbsd-arm64@0.25.1:
-    resolution: {integrity: sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-x64@0.21.5':
     optional: true
 
-  /@esbuild/netbsd-x64@0.16.17:
-    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-x64@0.23.0':
     optional: true
 
-  /@esbuild/netbsd-x64@0.17.19:
-    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: false
+  '@esbuild/linux-x64@0.24.2':
     optional: true
 
-  /@esbuild/netbsd-x64@0.17.6:
-    resolution: {integrity: sha512-EanJqcU/4uZIBreTrnbnre2DXgXSa+Gjap7ifRfllpmyAU7YMvaXmljdArptTHmjrkkKm9BK6GH5D5Yo+p6y5A==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/linux-x64@0.25.1':
     optional: true
 
-  /@esbuild/netbsd-x64@0.18.11:
-    resolution: {integrity: sha512-aSjMHj/F7BuS1CptSXNg6S3M4F3bLp5wfFPIJM+Km2NfIVfFKhdmfHF9frhiCLIGVzDziggqWll0B+9AUbud/Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/netbsd-arm64@0.24.2':
     optional: true
 
-  /@esbuild/netbsd-x64@0.19.11:
-    resolution: {integrity: sha512-13jvrQZJc3P230OhU8xgwUnDeuC/9egsjTkXN49b3GcS5BKvJqZn86aGM8W9pd14Kd+u7HuFBMVtrNGhh6fHEQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
+  '@esbuild/netbsd-arm64@0.25.1':
     optional: true
 
-  /@esbuild/netbsd-x64@0.20.2:
-    resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/netbsd-x64@0.17.6':
     optional: true
 
-  /@esbuild/netbsd-x64@0.23.0:
-    resolution: {integrity: sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
+  '@esbuild/netbsd-x64@0.18.11':
     optional: true
 
-  /@esbuild/netbsd-x64@0.25.1:
-    resolution: {integrity: sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/netbsd-x64@0.19.11':
     optional: true
 
-  /@esbuild/openbsd-arm64@0.23.0:
-    resolution: {integrity: sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-    requiresBuild: true
+  '@esbuild/netbsd-x64@0.21.5':
     optional: true
 
-  /@esbuild/openbsd-arm64@0.25.1:
-    resolution: {integrity: sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/netbsd-x64@0.23.0':
     optional: true
 
-  /@esbuild/openbsd-x64@0.16.17:
-    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/netbsd-x64@0.24.2':
     optional: true
 
-  /@esbuild/openbsd-x64@0.17.19:
-    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: false
+  '@esbuild/netbsd-x64@0.25.1':
     optional: true
 
-  /@esbuild/openbsd-x64@0.17.6:
-    resolution: {integrity: sha512-xaxeSunhQRsTNGFanoOkkLtnmMn5QbA0qBhNet/XLVsc+OVkpIWPHcr3zTW2gxVU5YOHFbIHR9ODuaUdNza2Vw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-arm64@0.23.0':
     optional: true
 
-  /@esbuild/openbsd-x64@0.18.11:
-    resolution: {integrity: sha512-tNBq+6XIBZtht0xJGv7IBB5XaSyvYPCm1PxJ33zLQONdZoLVM0bgGqUrXnJyiEguD9LU4AHiu+GCXy/Hm9LsdQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-arm64@0.24.2':
     optional: true
 
-  /@esbuild/openbsd-x64@0.19.11:
-    resolution: {integrity: sha512-ysyOGZuTp6SNKPE11INDUeFVVQFrhcNDVUgSQVDzqsqX38DjhPEPATpid04LCoUr2WXhQTEZ8ct/EgJCUDpyNw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
+  '@esbuild/openbsd-arm64@0.25.1':
     optional: true
 
-  /@esbuild/openbsd-x64@0.20.2:
-    resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-x64@0.17.6':
     optional: true
 
-  /@esbuild/openbsd-x64@0.23.0:
-    resolution: {integrity: sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
+  '@esbuild/openbsd-x64@0.18.11':
     optional: true
 
-  /@esbuild/openbsd-x64@0.25.1:
-    resolution: {integrity: sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-x64@0.19.11':
     optional: true
 
-  /@esbuild/sunos-x64@0.16.17:
-    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-x64@0.21.5':
     optional: true
 
-  /@esbuild/sunos-x64@0.17.19:
-    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: false
+  '@esbuild/openbsd-x64@0.23.0':
     optional: true
 
-  /@esbuild/sunos-x64@0.17.6:
-    resolution: {integrity: sha512-gnMnMPg5pfMkZvhHee21KbKdc6W3GR8/JuE0Da1kjwpK6oiFU3nqfHuVPgUX2rsOx9N2SadSQTIYV1CIjYG+xw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-x64@0.24.2':
     optional: true
 
-  /@esbuild/sunos-x64@0.18.11:
-    resolution: {integrity: sha512-kxfbDOrH4dHuAAOhr7D7EqaYf+W45LsAOOhAet99EyuxxQmjbk8M9N4ezHcEiCYPaiW8Dj3K26Z2V17Gt6p3ng==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  '@esbuild/openbsd-x64@0.25.1':
     optional: true
 
-  /@esbuild/sunos-x64@0.19.11:
-    resolution: {integrity: sha512-Hf+Sad9nVwvtxy4DXCZQqLpgmRTQqyFyhT3bZ4F2XlJCjxGmRFF0Shwn9rzhOYRB61w9VMXUkxlBy56dk9JJiQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
+  '@esbuild/sunos-x64@0.17.6':
     optional: true
 
-  /@esbuild/sunos-x64@0.20.2:
-    resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  '@esbuild/sunos-x64@0.18.11':
     optional: true
 
-  /@esbuild/sunos-x64@0.23.0:
-    resolution: {integrity: sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
+  '@esbuild/sunos-x64@0.19.11':
     optional: true
 
-  /@esbuild/sunos-x64@0.25.1:
-    resolution: {integrity: sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  '@esbuild/sunos-x64@0.21.5':
     optional: true
 
-  /@esbuild/win32-arm64@0.16.17:
-    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/sunos-x64@0.23.0':
     optional: true
 
-  /@esbuild/win32-arm64@0.17.19:
-    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@esbuild/sunos-x64@0.24.2':
     optional: true
 
-  /@esbuild/win32-arm64@0.17.6:
-    resolution: {integrity: sha512-G95n7vP1UnGJPsVdKXllAJPtqjMvFYbN20e8RK8LVLhlTiSOH1sd7+Gt7rm70xiG+I5tM58nYgwWrLs6I1jHqg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/sunos-x64@0.25.1':
     optional: true
 
-  /@esbuild/win32-arm64@0.18.11:
-    resolution: {integrity: sha512-Sh0dDRyk1Xi348idbal7lZyfSkjhJsdFeuC13zqdipsvMetlGiFQNdO+Yfp6f6B4FbyQm7qsk16yaZk25LChzg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-arm64@0.17.6':
     optional: true
 
-  /@esbuild/win32-arm64@0.19.11:
-    resolution: {integrity: sha512-0P58Sbi0LctOMOQbpEOvOL44Ne0sqbS0XWHMvvrg6NE5jQ1xguCSSw9jQeUk2lfrXYsKDdOe6K+oZiwKPilYPQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
+  '@esbuild/win32-arm64@0.18.11':
     optional: true
 
-  /@esbuild/win32-arm64@0.20.2:
-    resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-arm64@0.19.11':
     optional: true
 
-  /@esbuild/win32-arm64@0.23.0:
-    resolution: {integrity: sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
+  '@esbuild/win32-arm64@0.21.5':
     optional: true
 
-  /@esbuild/win32-arm64@0.25.1:
-    resolution: {integrity: sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-arm64@0.23.0':
     optional: true
 
-  /@esbuild/win32-ia32@0.16.17:
-    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-arm64@0.24.2':
     optional: true
 
-  /@esbuild/win32-ia32@0.17.19:
-    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@esbuild/win32-arm64@0.25.1':
     optional: true
 
-  /@esbuild/win32-ia32@0.17.6:
-    resolution: {integrity: sha512-96yEFzLhq5bv9jJo5JhTs1gI+1cKQ83cUpyxHuGqXVwQtY5Eq54ZEsKs8veKtiKwlrNimtckHEkj4mRh4pPjsg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-ia32@0.17.6':
     optional: true
 
-  /@esbuild/win32-ia32@0.18.11:
-    resolution: {integrity: sha512-o9JUIKF1j0rqJTFbIoF4bXj6rvrTZYOrfRcGyL0Vm5uJ/j5CkBD/51tpdxe9lXEDouhRgdr/BYzUrDOvrWwJpg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-ia32@0.18.11':
     optional: true
 
-  /@esbuild/win32-ia32@0.19.11:
-    resolution: {integrity: sha512-6YOrWS+sDJDmshdBIQU+Uoyh7pQKrdykdefC1avn76ss5c+RN6gut3LZA4E2cH5xUEp5/cA0+YxRaVtRAb0xBg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
+  '@esbuild/win32-ia32@0.19.11':
     optional: true
 
-  /@esbuild/win32-ia32@0.20.2:
-    resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-ia32@0.21.5':
     optional: true
 
-  /@esbuild/win32-ia32@0.23.0:
-    resolution: {integrity: sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
+  '@esbuild/win32-ia32@0.23.0':
     optional: true
 
-  /@esbuild/win32-ia32@0.25.1:
-    resolution: {integrity: sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-ia32@0.24.2':
     optional: true
 
-  /@esbuild/win32-x64@0.16.17:
-    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-ia32@0.25.1':
     optional: true
 
-  /@esbuild/win32-x64@0.17.19:
-    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@esbuild/win32-x64@0.17.6':
     optional: true
 
-  /@esbuild/win32-x64@0.17.6:
-    resolution: {integrity: sha512-n6d8MOyUrNp6G4VSpRcgjs5xj4A91svJSaiwLIDWVWEsZtpN5FA9NlBbZHDmAJc2e8e6SF4tkBD3HAvPF+7igA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-x64@0.18.11':
     optional: true
 
-  /@esbuild/win32-x64@0.18.11:
-    resolution: {integrity: sha512-rQI4cjLHd2hGsM1LqgDI7oOCYbQ6IBOVsX9ejuRMSze0GqXUG2ekwiKkiBU1pRGSeCqFFHxTrcEydB2Hyoz9CA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-x64@0.19.11':
     optional: true
 
-  /@esbuild/win32-x64@0.19.11:
-    resolution: {integrity: sha512-vfkhltrjCAb603XaFhqhAF4LGDi2M4OrCRrFusyQ+iTLQ/o60QQXxc9cZC/FFpihBI9N1Grn6SMKVJ4KP7Fuiw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
+  '@esbuild/win32-x64@0.21.5':
     optional: true
 
-  /@esbuild/win32-x64@0.20.2:
-    resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-x64@0.23.0':
     optional: true
 
-  /@esbuild/win32-x64@0.23.0:
-    resolution: {integrity: sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
+  '@esbuild/win32-x64@0.24.2':
     optional: true
 
-  /@esbuild/win32-x64@0.25.1:
-    resolution: {integrity: sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@esbuild/win32-x64@0.25.1':
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@8.31.0):
-    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+  '@eslint-community/eslint-utils@4.4.0(eslint@8.31.0)':
     dependencies:
       eslint: 8.31.0
       eslint-visitor-keys: 3.4.2
-    dev: true
 
-  /@eslint-community/regexpp@4.5.1:
-    resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: true
+  '@eslint-community/regexpp@4.5.1': {}
 
-  /@eslint/eslintrc@1.4.1:
-    resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@eslint/eslintrc@1.4.1':
     dependencies:
       ajv: 6.12.6
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       espree: 9.6.0
       globals: 13.19.0
       ignore: 5.2.4
       import-fresh: 3.3.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       minimatch: 3.1.2
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
 
-  /@fal-ai/serverless-client@0.15.0:
-    resolution: {integrity: sha512-4Vuocu0342OijAN6xO/lwohDV7h90LbkTnOAEwH+pYvMFVC6RYmHS4GILc/wnOWBTw+iFlZFEKlljEVolkjVfg==}
-    engines: {node: '>=18.0.0'}
+  '@fal-ai/serverless-client@0.15.0':
     dependencies:
       '@msgpack/msgpack': 3.0.0-beta2
       eventsource-parser: 1.1.2
       robot3: 0.4.1
-    dev: false
 
-  /@fast-csv/parse@5.0.2:
-    resolution: {integrity: sha512-gMu1Btmm99TP+wc0tZnlH30E/F1Gw1Tah3oMDBHNPe9W8S68ixVHjt89Wg5lh7d9RuQMtwN+sGl5kxR891+fzw==}
+  '@fast-csv/parse@5.0.2':
     dependencies:
       lodash.escaperegexp: 4.1.2
       lodash.groupby: 4.6.0
@@ -7942,63 +23532,43 @@ packages:
       lodash.isnil: 4.0.0
       lodash.isundefined: 3.0.1
       lodash.uniq: 4.5.0
-    dev: false
 
-  /@fastify/accept-negotiator@2.0.1:
-    resolution: {integrity: sha512-/c/TW2bO/v9JeEgoD/g1G5GxGeCF1Hafdf79WPmUlgYiBXummY0oX3VVq4yFkKKVBKDNlaDUYoab7g38RpPqCQ==}
-    dev: true
+  '@fastify/accept-negotiator@2.0.1': {}
 
-  /@fastify/ajv-compiler@4.0.2:
-    resolution: {integrity: sha512-Rkiu/8wIjpsf46Rr+Fitd3HRP+VsxUFDDeag0hs9L0ksfnwx2g7SPQQTFL0E8Qv+rfXzQOxBJnjUB9ITUDjfWQ==}
+  '@fastify/ajv-compiler@4.0.2':
     dependencies:
       ajv: 8.17.1
       ajv-formats: 3.0.1(ajv@8.17.1)
       fast-uri: 3.0.6
-    dev: true
 
-  /@fastify/busboy@2.0.0:
-    resolution: {integrity: sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==}
-    engines: {node: '>=14'}
+  '@fastify/busboy@2.1.1': {}
 
-  /@fastify/error@4.2.0:
-    resolution: {integrity: sha512-RSo3sVDXfHskiBZKBPRgnQTtIqpi/7zhJOEmAxCiBcM7d0uwdGdxLlsCaLzGs8v8NnxIRlfG0N51p5yFaOentQ==}
-    dev: true
+  '@fastify/error@4.2.0': {}
 
-  /@fastify/fast-json-stringify-compiler@5.0.3:
-    resolution: {integrity: sha512-uik7yYHkLr6fxd8hJSZ8c+xF4WafPK+XzneQDPU+D10r5X19GW8lJcom2YijX2+qtFF1ENJlHXKFM9ouXNJYgQ==}
+  '@fastify/fast-json-stringify-compiler@5.0.3':
     dependencies:
       fast-json-stringify: 6.0.1
-    dev: true
 
-  /@fastify/forwarded@3.0.0:
-    resolution: {integrity: sha512-kJExsp4JCms7ipzg7SJ3y8DwmePaELHxKYtg+tZow+k0znUTf3cb+npgyqm8+ATZOdmfgfydIebPDWM172wfyA==}
-    dev: true
+  '@fastify/forwarded@3.0.0': {}
 
-  /@fastify/merge-json-schemas@0.2.1:
-    resolution: {integrity: sha512-OA3KGBCy6KtIvLf8DINC5880o5iBlDX4SxzLQS8HorJAbqluzLRn80UXU0bxZn7UOFhFgpRJDasfwn9nG4FG4A==}
+  '@fastify/merge-json-schemas@0.2.1':
     dependencies:
       dequal: 2.0.3
-    dev: true
 
-  /@fastify/proxy-addr@5.0.0:
-    resolution: {integrity: sha512-37qVVA1qZ5sgH7KpHkkC4z9SK6StIsIcOmpjvMPXNb3vx2GQxhZocogVYbr2PbbeLCQxYIPDok307xEvRZOzGA==}
+  '@fastify/proxy-addr@5.0.0':
     dependencies:
       '@fastify/forwarded': 3.0.0
       ipaddr.js: 2.2.0
-    dev: true
 
-  /@fastify/send@4.1.0:
-    resolution: {integrity: sha512-TMYeQLCBSy2TOFmV95hQWkiTYgC/SEx7vMdV+wnZVX4tt8VBLKzmH8vV9OzJehV0+XBfg+WxPMt5wp+JBUKsVw==}
+  '@fastify/send@4.1.0':
     dependencies:
       '@lukeed/ms': 2.0.2
       escape-html: 1.0.3
       fast-decode-uri-component: 1.0.1
       http-errors: 2.0.0
       mime: 3.0.0
-    dev: true
 
-  /@fastify/static@8.2.0:
-    resolution: {integrity: sha512-PejC/DtT7p1yo3p+W7LiUtLMsV8fEvxAK15sozHy9t8kwo5r0uLYmhV/inURmGz1SkHZFz/8CNtHLPyhKcx4SQ==}
+  '@fastify/static@8.2.0':
     dependencies:
       '@fastify/accept-negotiator': 2.0.1
       '@fastify/send': 4.1.0
@@ -8006,68 +23576,46 @@ packages:
       fastify-plugin: 5.0.1
       fastq: 1.19.1
       glob: 11.0.0
-    dev: true
 
-  /@fastify/websocket@11.0.1:
-    resolution: {integrity: sha512-44yam5+t1I9v09hWBYO+ezV88+mb9Se2BjgERtzB/68+0mGeTfFkjBeDBe2y+ZdiPpeO2rhevhdnfrBm5mqH+Q==}
+  '@fastify/websocket@11.0.1(bufferutil@4.0.9)':
     dependencies:
       duplexify: 4.1.3
       fastify-plugin: 5.0.1
-      ws: 8.18.0(bufferutil@4.0.9)
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
-    dev: true
 
-  /@fingerprintjs/fingerprintjs-pro-react@2.6.3:
-    resolution: {integrity: sha512-/axCq/cfjZkIM+WFZM/05FQvqtNfdKbIFKU6b2yrwPKlgT8BqWkAq8XvFX6JCPlq8/udVLJjFEDCK+1JQh1L6g==}
-    requiresBuild: true
+  '@fingerprintjs/fingerprintjs-pro-react@2.6.3':
     dependencies:
       '@fingerprintjs/fingerprintjs-pro-spa': 1.3.2
       fast-deep-equal: 3.1.3
-    dev: false
 
-  /@fingerprintjs/fingerprintjs-pro-spa@1.3.2:
-    resolution: {integrity: sha512-s1YGsx1XQLmjU+av4UrUHNxyzwPHyZRB0GXJQFOJK8ZHCYc2SNukxnJmZA++bNBa8twU3wW+QgSJhA4Prjnd0g==}
+  '@fingerprintjs/fingerprintjs-pro-spa@1.3.2':
     dependencies:
       '@fingerprintjs/fingerprintjs-pro': 3.11.9
       tslib: 2.8.1
-    dev: false
 
-  /@fingerprintjs/fingerprintjs-pro@3.11.9:
-    resolution: {integrity: sha512-GTow49I86tBlV/U+edBTLA2dPCDXrfHVsNuTV7a5nZjWFV3Q44Tj6yb5O0GcGT/EHwbSy3UmCO9+PS1ERR+b2g==}
+  '@fingerprintjs/fingerprintjs-pro@3.11.9':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@floating-ui/core@0.7.3:
-    resolution: {integrity: sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==}
-    dev: false
+  '@floating-ui/core@0.7.3': {}
 
-  /@floating-ui/core@1.6.1:
-    resolution: {integrity: sha512-42UH54oPZHPdRHdw6BgoBD6cg/eVTmVrFcgeRDM3jbO7uxSoipVcmcIGFcA5jmOHO5apcyvBhkSKES3fQJnu7A==}
+  '@floating-ui/core@1.6.1':
     dependencies:
       '@floating-ui/utils': 0.2.2
-    dev: false
 
-  /@floating-ui/dom@0.5.4:
-    resolution: {integrity: sha512-419BMceRLq0RrmTSDxn8hf9R3VCJv2K9PUfugh5JyEFmdjzDo+e8U5EdR8nzKq8Yj1htzLm3b6eQEEam3/rrtg==}
+  '@floating-ui/dom@0.5.4':
     dependencies:
       '@floating-ui/core': 0.7.3
-    dev: false
 
-  /@floating-ui/dom@1.6.5:
-    resolution: {integrity: sha512-Nsdud2X65Dz+1RHjAIP0t8z5e2ff/IRbei6BqFrl1urT8sDVzM1HMQ+R0XcU5ceRfyO3I6ayeqIfh+6Wb8LGTw==}
+  '@floating-ui/dom@1.6.5':
     dependencies:
       '@floating-ui/core': 1.6.1
       '@floating-ui/utils': 0.2.2
-    dev: false
 
-  /@floating-ui/react-dom@0.7.2(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-1T0sJcpHgX/u4I1OzIEhlcrvkUN8ln39nz7fMoE/2HDHrPiMFoOGR7++GYyfUmIQHkkrTinaeQsO3XWubjSvGg==}
-    peerDependencies:
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
+  '@floating-ui/react-dom@0.7.2(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@floating-ui/dom': 0.5.4
       react: 18.2.0
@@ -8075,1069 +23623,515 @@ packages:
       use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.69)(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@floating-ui/react-dom@2.0.9(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-q0umO0+LQK4+p6aGyvzASqKbKOJcAHJ7ycE9CuUvfx3s9zTHWmGJTPOIlM/hmSBfUfg/XfY5YhLBLR/LHwShQQ==}
-    peerDependencies:
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
+  '@floating-ui/react-dom@2.0.9(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@floating-ui/dom': 1.6.5
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@floating-ui/utils@0.2.2:
-    resolution: {integrity: sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==}
-    dev: false
+  '@floating-ui/utils@0.2.2': {}
 
-  /@formatjs/ecma402-abstract@1.18.0:
-    resolution: {integrity: sha512-PEVLoa3zBevWSCZzPIM/lvPCi8P5l4G+NXQMc/CjEiaCWgyHieUoo0nM7Bs0n/NbuQ6JpXEolivQ9pKSBHaDlA==}
+  '@formatjs/ecma402-abstract@1.18.0':
     dependencies:
       '@formatjs/intl-localematcher': 0.5.2
       tslib: 2.8.1
-    dev: false
 
-  /@formatjs/fast-memoize@2.2.0:
-    resolution: {integrity: sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA==}
+  '@formatjs/fast-memoize@2.2.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@formatjs/icu-messageformat-parser@2.7.3:
-    resolution: {integrity: sha512-X/jy10V9S/vW+qlplqhMUxR8wErQ0mmIYSq4mrjpjDl9mbuGcCILcI1SUYkL5nlM4PJqpc0KOS0bFkkJNPxYRw==}
+  '@formatjs/icu-messageformat-parser@2.7.3':
     dependencies:
       '@formatjs/ecma402-abstract': 1.18.0
       '@formatjs/icu-skeleton-parser': 1.7.0
       tslib: 2.8.1
-    dev: false
 
-  /@formatjs/icu-skeleton-parser@1.7.0:
-    resolution: {integrity: sha512-Cfdo/fgbZzpN/jlN/ptQVe0lRHora+8ezrEeg2RfrNjyp+YStwBy7cqDY8k5/z2LzXg6O0AdzAV91XS0zIWv+A==}
+  '@formatjs/icu-skeleton-parser@1.7.0':
     dependencies:
       '@formatjs/ecma402-abstract': 1.18.0
       tslib: 2.8.1
-    dev: false
 
-  /@formatjs/intl-localematcher@0.5.2:
-    resolution: {integrity: sha512-txaaE2fiBMagLrR4jYhxzFO6wEdEG4TPMqrzBAcbr4HFUYzH/YC+lg6OIzKCHm8WgDdyQevxbAAV1OgcXctuGw==}
+  '@formatjs/intl-localematcher@0.5.2':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@fullhuman/postcss-purgecss@2.3.0:
-    resolution: {integrity: sha512-qnKm5dIOyPGJ70kPZ5jiz0I9foVOic0j+cOzNDoo8KoCf6HjicIZ99UfO2OmE7vCYSKAAepEwJtNzpiiZAh9xw==}
+  '@fullhuman/postcss-purgecss@2.3.0':
     dependencies:
       postcss: 7.0.32
       purgecss: 2.3.0
-    dev: false
-
-  /@gar/promisify@1.1.3:
-    resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
-    requiresBuild: true
-    dev: false
-    optional: true
 
-  /@google-cloud/precise-date@4.0.0:
-    resolution: {integrity: sha512-1TUx3KdaU3cN7nfCdNf+UVqA/PSX29Cjcox3fZZBtINlRrXVTmUkQnCKv2MbBUbCopbK4olAT1IHl76uZyCiVA==}
-    engines: {node: '>=14.0.0'}
-    dev: false
+  '@google-cloud/precise-date@4.0.0': {}
 
-  /@graphile/logger@0.2.0:
-    resolution: {integrity: sha512-jjcWBokl9eb1gVJ85QmoaQ73CQ52xAaOCF29ukRbYNl6lY+ts0ErTaDYOBlejcbUs2OpaiqYLO5uDhyLFzWw4w==}
-    dev: false
+  '@graphile/logger@0.2.0': {}
 
-  /@graphql-typed-document-node/core@3.2.0(graphql@16.6.0):
-    resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
-    peerDependencies:
-      graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  '@graphql-typed-document-node/core@3.2.0(graphql@16.6.0)':
     dependencies:
       graphql: 16.6.0
-    dev: false
-
-  /@grpc/grpc-js@1.12.6:
-    resolution: {integrity: sha512-JXUj6PI0oqqzTGvKtzOkxtpsyPRNsrmhh41TtIz/zEB6J+AUiZZ0dxWzcMwO9Ns5rmSPuMdghlTbUuqIM48d3Q==}
-    engines: {node: '>=12.10.0'}
-    dependencies:
-      '@grpc/proto-loader': 0.7.13
-      '@js-sdsl/ordered-map': 4.4.2
-
-  /@grpc/grpc-js@1.8.17:
-    resolution: {integrity: sha512-DGuSbtMFbaRsyffMf+VEkVu8HkSXEUfO3UyGJNtqxW9ABdtTIA+2UXAJpwbJS+xfQxuwqLUeELmL6FuZkOqPxw==}
-    engines: {node: ^8.13.0 || >=10.10.0}
-    dependencies:
-      '@grpc/proto-loader': 0.7.7
-      '@types/node': 20.14.14
 
-  /@grpc/proto-loader@0.7.13:
-    resolution: {integrity: sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==}
-    engines: {node: '>=6'}
-    hasBin: true
+  '@grpc/grpc-js@1.12.6':
     dependencies:
-      lodash.camelcase: 4.3.0
-      long: 5.2.3
-      protobufjs: 7.3.2
-      yargs: 17.7.2
+      '@grpc/proto-loader': 0.7.13
+      '@js-sdsl/ordered-map': 4.4.2
 
-  /@grpc/proto-loader@0.7.7:
-    resolution: {integrity: sha512-1TIeXOi8TuSCQprPItwoMymZXxWT0CPxUhkrkeCUH+D8U7QDwQ6b7SUz2MaLuWM2llT+J/TVFLmQI5KtML3BhQ==}
-    engines: {node: '>=6'}
-    hasBin: true
+  '@grpc/proto-loader@0.7.13':
     dependencies:
-      '@types/long': 4.0.2
       lodash.camelcase: 4.3.0
-      long: 4.0.0
+      long: 5.2.3
       protobufjs: 7.3.2
       yargs: 17.7.2
 
-  /@hapi/boom@10.0.1:
-    resolution: {integrity: sha512-ERcCZaEjdH3OgSJlyjVk8pHIFeus91CjKP3v+MpgBNp5IvGzP2l/bRiD78nqYcKPaZdbKkK5vDBVPd2ohHBlsA==}
+  '@hapi/boom@10.0.1':
     dependencies:
       '@hapi/hoek': 11.0.2
-    dev: false
 
-  /@hapi/bourne@3.0.0:
-    resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==}
-    dev: false
+  '@hapi/bourne@3.0.0': {}
 
-  /@hapi/hoek@10.0.1:
-    resolution: {integrity: sha512-CvlW7jmOhWzuqOqiJQ3rQVLMcREh0eel4IBnxDx2FAcK8g7qoJRQK4L1CPBASoCY6y8e6zuCy3f2g+HWdkzcMw==}
-    dev: false
+  '@hapi/hoek@10.0.1': {}
 
-  /@hapi/hoek@11.0.2:
-    resolution: {integrity: sha512-aKmlCO57XFZ26wso4rJsW4oTUnrgTFw2jh3io7CAtO9w4UltBNwRXvXIVzzyfkaaLRo3nluP/19msA8vDUUuKw==}
-    dev: false
+  '@hapi/hoek@11.0.2': {}
 
-  /@hapi/hoek@9.3.0:
-    resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
-    dev: false
+  '@hapi/hoek@9.3.0': {}
 
-  /@hapi/topo@5.1.0:
-    resolution: {integrity: sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==}
+  '@hapi/topo@5.1.0':
     dependencies:
       '@hapi/hoek': 9.3.0
-    dev: false
 
-  /@hapi/wreck@18.0.1:
-    resolution: {integrity: sha512-OLHER70+rZxvDl75xq3xXOfd3e8XIvz8fWY0dqg92UvhZ29zo24vQgfqgHSYhB5ZiuFpSLeriOisAlxAo/1jWg==}
+  '@hapi/wreck@18.0.1':
     dependencies:
       '@hapi/boom': 10.0.1
       '@hapi/bourne': 3.0.0
       '@hapi/hoek': 11.0.2
-    dev: false
 
-  /@hcaptcha/loader@2.0.0:
-    resolution: {integrity: sha512-fFQH6ApU/zCCl6Y1bnbsxsp1Er/lKX+qlgljrpWDeFcenpEtoP68hExlKSXECospzKLeSWcr06cbTjlR/x3IJA==}
-    dev: false
+  '@hcaptcha/loader@2.0.0': {}
 
-  /@hcaptcha/react-hcaptcha@1.12.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-QiHnQQ52k8SJJSHkc3cq4TlYzag7oPd4f5ZqnjVSe4fJDSlZaOQFtu5F5AYisVslwaitdDELPVLRsRJxiiI0Aw==}
-    peerDependencies:
-      react: '>= 16.3.0'
-      react-dom: '>= 16.3.0'
+  '@hcaptcha/react-hcaptcha@1.12.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@hcaptcha/loader': 2.0.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@headlessui/react@1.7.8(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-zcwb0kd7L05hxmoAMIioEaOn235Dg0fUO+iGbLPgLVSjzl/l39V6DTpC2Df49PE5aG5/f5q0PZ9ZHZ78ENNV+A==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      react: ^16 || ^17 || ^18
-      react-dom: ^16 || ^17 || ^18
+  '@headlessui/react@1.7.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       client-only: 0.0.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@heroicons/react@2.0.13(react@18.2.0):
-    resolution: {integrity: sha512-iSN5XwmagrnirWlYEWNPdCDj9aRYVD/lnK3JlsC9/+fqGF80k8C7rl+1HCvBX0dBoagKqOFBs6fMhJJ1hOg1EQ==}
-    peerDependencies:
-      react: '>= 16'
+  '@heroicons/react@2.0.13(react@18.2.0)':
     dependencies:
       react: 18.2.0
-    dev: false
 
-  /@hono/node-server@1.12.2(hono@4.5.11):
-    resolution: {integrity: sha512-xjzhqhSWUE/OhN0g3KCNVzNsQMlFUAL+/8GgPUr3TKcU7cvgZVBGswFofJ8WwGEHTqobzze1lDpGJl9ZNckDhA==}
-    engines: {node: '>=18.14.1'}
-    peerDependencies:
-      hono: ^4
+  '@hono/node-server@1.12.2(hono@4.5.11)':
     dependencies:
       hono: 4.5.11
-    dev: true
 
-  /@hono/node-ws@1.0.4(@hono/node-server@1.12.2):
-    resolution: {integrity: sha512-0j1TMp67U5ym0CIlvPKcKtD0f2ZjaS/EnhOxFLs3bVfV+/4WInBE7hVe2x/7PLEsNIUK9+jVL8lPd28rzTAcZg==}
-    engines: {node: '>=18.14.1'}
-    peerDependencies:
-      '@hono/node-server': ^1.11.1
+  '@hono/node-server@1.19.9(hono@4.11.8)':
+    dependencies:
+      hono: 4.11.8
+
+  '@hono/node-ws@1.0.4(@hono/node-server@1.12.2(hono@4.11.8))(bufferutil@4.0.9)':
     dependencies:
       '@hono/node-server': 1.12.2(hono@4.5.11)
-      ws: 8.18.0(bufferutil@4.0.9)
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
-    dev: true
 
-  /@humanwhocodes/config-array@0.11.8:
-    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
-    engines: {node: '>=10.10.0'}
+  '@humanwhocodes/config-array@0.11.8':
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
 
-  /@humanwhocodes/module-importer@1.0.1:
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: '>=12.22'}
+  '@humanwhocodes/module-importer@1.0.1': {}
 
-  /@humanwhocodes/object-schema@1.2.1:
-    resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
+  '@humanwhocodes/object-schema@1.2.1': {}
 
-  /@img/sharp-darwin-arm64@0.33.5:
-    resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
+  '@iconify/types@2.0.0': {}
+
+  '@iconify/utils@3.0.2':
+    dependencies:
+      '@antfu/install-pkg': 1.1.0
+      '@antfu/utils': 9.3.0
+      '@iconify/types': 2.0.0
+      debug: 4.4.1(supports-color@10.0.0)
+      globals: 15.15.0
+      kolorist: 1.8.0
+      local-pkg: 1.1.2
+      mlly: 1.7.4
+    transitivePeerDependencies:
+      - supports-color
+
+  '@img/colour@1.0.0':
+    optional: true
+
+  '@img/sharp-darwin-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-arm64': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-darwin-arm64@0.34.2:
-    resolution: {integrity: sha512-OfXHZPppddivUJnqyKoi5YVeHRkkNE2zUFT2gbpKxp/JZCFYEYubnMg+gOp6lWfasPrTS+KPosKqdI+ELYVDtg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
+  '@img/sharp-darwin-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-arm64': 1.1.0
-    dev: false
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
     optional: true
 
-  /@img/sharp-darwin-x64@0.33.5:
-    resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
+  '@img/sharp-darwin-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-darwin-x64': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-darwin-x64@0.34.2:
-    resolution: {integrity: sha512-dYvWqmjU9VxqXmjEtjmvHnGqF8GrVjM2Epj9rJ6BUIXvk8slvNDJbhGFvIoXzkDhrJC2jUxNLz/GUjjvSzfw+g==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
+  '@img/sharp-darwin-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-darwin-x64': 1.1.0
-    dev: false
+      '@img/sharp-libvips-darwin-x64': 1.2.4
     optional: true
 
-  /@img/sharp-libvips-darwin-arm64@1.0.4:
-    resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
     optional: true
 
-  /@img/sharp-libvips-darwin-arm64@1.1.0:
-    resolution: {integrity: sha512-HZ/JUmPwrJSoM4DIQPv/BfNh9yrOA8tlBbqbLz4JZ5uew2+o22Ik+tHQJcih7QJuSa0zo5coHTfD5J8inqj9DA==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-darwin-arm64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-darwin-x64@1.0.4:
-    resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-darwin-x64@1.0.4':
     optional: true
 
-  /@img/sharp-libvips-darwin-x64@1.1.0:
-    resolution: {integrity: sha512-Xzc2ToEmHN+hfvsl9wja0RlnXEgpKNmftriQp6XzY/RaSfwD9th+MSh0WQKzUreLKKINb3afirxW7A0fz2YWuQ==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-darwin-x64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linux-arm64@1.0.4:
-    resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-arm64@1.0.4':
     optional: true
 
-  /@img/sharp-libvips-linux-arm64@1.1.0:
-    resolution: {integrity: sha512-IVfGJa7gjChDET1dK9SekxFFdflarnUB8PwW8aGwEoF3oAsSDuNUTYS+SKDOyOJxQyDC1aPFMuRYLoDInyV9Ew==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-arm64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linux-arm@1.0.5:
-    resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-arm@1.0.5':
     optional: true
 
-  /@img/sharp-libvips-linux-arm@1.1.0:
-    resolution: {integrity: sha512-s8BAd0lwUIvYCJyRdFqvsj+BJIpDBSxs6ivrOPm/R7piTs5UIwY5OjXrP2bqXC9/moGsyRa37eYWYCOGVXxVrA==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-arm@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linux-ppc64@1.1.0:
-    resolution: {integrity: sha512-tiXxFZFbhnkWE2LA8oQj7KYR+bWBkiV2nilRldT7bqoEZ4HiDOcePr9wVDAZPi/Id5fT1oY9iGnDq20cwUz8lQ==}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-ppc64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linux-s390x@1.0.4:
-    resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-riscv64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linux-s390x@1.1.0:
-    resolution: {integrity: sha512-xukSwvhguw7COyzvmjydRb3x/09+21HykyapcZchiCUkTThEQEOMtBj9UhkaBRLuBrgLFzQ2wbxdeCCJW/jgJA==}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-s390x@1.0.4':
     optional: true
 
-  /@img/sharp-libvips-linux-x64@1.0.4:
-    resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-s390x@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linux-x64@1.1.0:
-    resolution: {integrity: sha512-yRj2+reB8iMg9W5sULM3S74jVS7zqSzHG3Ol/twnAAkAhnGQnpjj6e4ayUz7V+FpKypwgs82xbRdYtchTTUB+Q==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-x64@1.0.4':
     optional: true
 
-  /@img/sharp-libvips-linuxmusl-arm64@1.0.4:
-    resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linux-x64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linuxmusl-arm64@1.1.0:
-    resolution: {integrity: sha512-jYZdG+whg0MDK+q2COKbYidaqW/WTz0cc1E+tMAusiDygrM4ypmSCjOJPmFTvHHJ8j/6cAGyeDWZOsK06tP33w==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
     optional: true
 
-  /@img/sharp-libvips-linuxmusl-x64@1.0.4:
-    resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linuxmusl-arm64@1.2.4':
     optional: true
 
-  /@img/sharp-libvips-linuxmusl-x64@1.1.0:
-    resolution: {integrity: sha512-wK7SBdwrAiycjXdkPnGCPLjYb9lD4l6Ze2gSdAGVZrEL05AOUJESWU2lhlC+Ffn5/G+VKuSm6zzbQSzFX/P65A==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
     optional: true
 
-  /@img/sharp-linux-arm64@0.33.5:
-    resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-libvips-linuxmusl-x64@1.2.4':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm64': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-linux-arm64@0.34.2:
-    resolution: {integrity: sha512-D8n8wgWmPDakc83LORcfJepdOSN6MvWNzzz2ux0MnIbOqdieRZwVYY32zxVx+IFUT8er5KPcyU3XXsn+GzG/0Q==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm64': 1.1.0
-    dev: false
+      '@img/sharp-libvips-linux-arm64': 1.2.4
     optional: true
 
-  /@img/sharp-linux-arm@0.33.5:
-    resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-arm@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-arm': 1.0.5
-    dev: false
     optional: true
 
-  /@img/sharp-linux-arm@0.34.2:
-    resolution: {integrity: sha512-0DZzkvuEOqQUP9mo2kjjKNok5AmnOr1jB2XYjkaoNRwpAYMDzRmAqUIa1nRi58S2WswqSfPOWLNOr0FDT3H5RQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-arm@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-arm': 1.1.0
-    dev: false
+      '@img/sharp-libvips-linux-arm': 1.2.4
     optional: true
 
-  /@img/sharp-linux-s390x@0.33.5:
-    resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-ppc64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-riscv64@0.34.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
+    optional: true
+
+  '@img/sharp-linux-s390x@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-s390x': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-linux-s390x@0.34.2:
-    resolution: {integrity: sha512-EGZ1xwhBI7dNISwxjChqBGELCWMGDvmxZXKjQRuqMrakhO8QoMgqCrdjnAqJq/CScxfRn+Bb7suXBElKQpPDiw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-s390x@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-s390x': 1.1.0
-    dev: false
+      '@img/sharp-libvips-linux-s390x': 1.2.4
     optional: true
 
-  /@img/sharp-linux-x64@0.33.5:
-    resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linux-x64': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-linux-x64@0.34.2:
-    resolution: {integrity: sha512-sD7J+h5nFLMMmOXYH4DD9UtSNBD05tWSSdWAcEyzqW8Cn5UxXvsHAxmxSesYUsTOBmUnjtxghKDl15EvfqLFbQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linux-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linux-x64': 1.1.0
-    dev: false
+      '@img/sharp-libvips-linux-x64': 1.2.4
     optional: true
 
-  /@img/sharp-linuxmusl-arm64@0.33.5:
-    resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linuxmusl-arm64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-linuxmusl-arm64@0.34.2:
-    resolution: {integrity: sha512-NEE2vQ6wcxYav1/A22OOxoSOGiKnNmDzCYFOZ949xFmrWZOVII1Bp3NqVVpvj+3UeHMFyN5eP/V5hzViQ5CZNA==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linuxmusl-arm64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-arm64': 1.1.0
-    dev: false
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
     optional: true
 
-  /@img/sharp-linuxmusl-x64@0.33.5:
-    resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linuxmusl-x64@0.33.5':
     optionalDependencies:
       '@img/sharp-libvips-linuxmusl-x64': 1.0.4
-    dev: false
     optional: true
 
-  /@img/sharp-linuxmusl-x64@0.34.2:
-    resolution: {integrity: sha512-DOYMrDm5E6/8bm/yQLCWyuDJwUnlevR8xtF8bs+gjZ7cyUNYXiSf/E8Kp0Ss5xasIaXSHzb888V1BE4i1hFhAA==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@img/sharp-linuxmusl-x64@0.34.5':
     optionalDependencies:
-      '@img/sharp-libvips-linuxmusl-x64': 1.1.0
-    dev: false
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
     optional: true
 
-  /@img/sharp-wasm32@0.33.5:
-    resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [wasm32]
-    requiresBuild: true
+  '@img/sharp-wasm32@0.33.5':
     dependencies:
-      '@emnapi/runtime': 1.4.3
-    dev: false
+      '@emnapi/runtime': 1.7.1
     optional: true
 
-  /@img/sharp-wasm32@0.34.2:
-    resolution: {integrity: sha512-/VI4mdlJ9zkaq53MbIG6rZY+QRN3MLbR6usYlgITEzi4Rpx5S6LFKsycOQjkOGmqTNmkIdLjEvooFKwww6OpdQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [wasm32]
-    requiresBuild: true
+  '@img/sharp-wasm32@0.34.5':
     dependencies:
-      '@emnapi/runtime': 1.4.3
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-arm64@0.34.2:
-    resolution: {integrity: sha512-cfP/r9FdS63VA5k0xiqaNaEoGxBg9k7uE+RQGzuK9fHt7jib4zAVVseR9LsE4gJcNWgT6APKMNnCcnyOtmSEUQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-ia32@0.33.5:
-    resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-ia32@0.34.2:
-    resolution: {integrity: sha512-QLjGGvAbj0X/FXl8n1WbtQ6iVBpWU7JO94u/P2M4a8CFYsvQi4GW2mRy/JqkRx0qpBzaOdKJKw8uc930EX2AHw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-x64@0.33.5:
-    resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@img/sharp-win32-x64@0.34.2:
-    resolution: {integrity: sha512-aUdT6zEYtDKCaxkofmmJDJYGCf0+pJg3eU9/oBuqvEeoB9dKI6ZLc/1iLJCTuJQDO4ptntAlkUmHgGjyuobZbw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-android-arm-eabi@2.3.5:
-    resolution: {integrity: sha512-7KGWJ5X/RV6sIHWt3mjNg+zykzYvbHIKmNKBHTTAOuULKpTIAoQyFD1q3XMylP2AaVh8BJtgVOODO4/Uxexlug==}
-    engines: {node: '>= 10'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-android-arm64@2.3.5:
-    resolution: {integrity: sha512-jHCvwYYchtTWryAGX2MvddRVZFdGrdoakGTMrvPQ0ZyM1XnLo3Q9tb35RCjTTylE1q114OKGRymM2JZ10ygiRw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-darwin-arm64@2.3.5:
-    resolution: {integrity: sha512-UEe38OTxjlOMo2HVplmT6pmXwks0c9lckKDUKK/MNfp0H9n4RJKXd8jco1BeG713eNR7bX01Q2c74XgLJhf58Q==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-darwin-x64@2.3.5:
-    resolution: {integrity: sha512-mMz/1N+aZjvIXPHMnfl9DmyYWCXjRsa/Uxj94pXjJGZ3GMsANRTR08GVRI2S2XWMODiV5D9zY2mQ3/eY5E5Y/A==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-linux-arm-gnueabihf@2.3.5:
-    resolution: {integrity: sha512-GjVQNdv8aYn+mZgW/sRFirwb0iMRX7ShBC0N8MsgrSBxnSpH2nFiUFj8hFi2DOvR5NbJ+KQpabfvP0eodozKSg==}
-    engines: {node: '>= 10'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-linux-arm64-gnu@2.3.5:
-    resolution: {integrity: sha512-hclvvD1eAYB6JP58mo5TfBjE+vSGSv30fNuXeaheO4yOLfnaGyCCR6E6F96uxNNCAVkVO4RXRhiSSCT6K3f3jA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+      '@emnapi/runtime': 1.7.1
     optional: true
 
-  /@infisical/sdk-linux-arm64-musl@2.3.5:
-    resolution: {integrity: sha512-RFYd49eXoUtXXUsQb9Cqiu0RKp32GrsEATj9GlMJYharDn8BZhYr6lpDb+7EZolbjg+A40JvT98nqN2EliUwgA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-linux-x64-gnu@2.3.5:
-    resolution: {integrity: sha512-E0JB4fowk9cmfQGBJw8QNXy9TBewB42kyQhCYARQtPvleXqoK48DUs7mzRIawLUbyCA5ldcy2jFbj/ZXWWYNOA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-linux-x64-musl@2.3.5:
-    resolution: {integrity: sha512-3+irZY69oepYAwXXgTUDIW6PbjLRmj79rzA4CSKfF3a0wBLlR+6e+1NT+nu87BtP3wSBej3y1JAnfw853AekDA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-win32-arm64-msvc@2.3.5:
-    resolution: {integrity: sha512-DVZMglFSE3Xqj7/Bsv/4KfhfAO970BsSdOL3LrlRvcN3Dkocuthh3rHw6U5jg92FfMw+hMN9DzlhTqtUBZWYjQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-win32-ia32-msvc@2.3.5:
-    resolution: {integrity: sha512-dw3XuR2myJ2leB3+KStFsHB2zIJ29TArvoU/zGw/cdCOj1dRKF7WcahWg1id+ydwoeOv+HVZ+RsS8sZR5gYblQ==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@infisical/sdk-win32-x64-msvc@2.3.5:
-    resolution: {integrity: sha512-SWzYndKhHih4zE/OYWfv9QoYaj5oDBhNSKZAlw1XFYdlUU41nTCN1nruD9RRdmjoJ/pF0sn2Mr9v+OiXStnC+A==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@img/sharp-win32-arm64@0.34.5':
     optional: true
 
-  /@infisical/sdk@2.3.5:
-    resolution: {integrity: sha512-vaQmDyzOFRkiZqstifk2dHTctkfizhlv7/+Ds6PFVWPGUpRUqP4PoR4yRdx2405IKWVx/ABuqQ4S8e9ix1kwzg==}
-    engines: {node: '>= 10'}
-    optionalDependencies:
-      '@infisical/sdk-android-arm-eabi': 2.3.5
-      '@infisical/sdk-android-arm64': 2.3.5
-      '@infisical/sdk-darwin-arm64': 2.3.5
-      '@infisical/sdk-darwin-x64': 2.3.5
-      '@infisical/sdk-linux-arm-gnueabihf': 2.3.5
-      '@infisical/sdk-linux-arm64-gnu': 2.3.5
-      '@infisical/sdk-linux-arm64-musl': 2.3.5
-      '@infisical/sdk-linux-x64-gnu': 2.3.5
-      '@infisical/sdk-linux-x64-musl': 2.3.5
-      '@infisical/sdk-win32-arm64-msvc': 2.3.5
-      '@infisical/sdk-win32-ia32-msvc': 2.3.5
-      '@infisical/sdk-win32-x64-msvc': 2.3.5
-    dev: false
-
-  /@inquirer/confirm@3.0.0:
-    resolution: {integrity: sha512-LHeuYP1D8NmQra1eR4UqvZMXwxEdDXyElJmmZfU44xdNLL6+GcQBS0uE16vyfZVjH8c22p9e+DStROfE/hyHrg==}
-    engines: {node: '>=18'}
-    dependencies:
-      '@inquirer/core': 7.0.0
-      '@inquirer/type': 1.2.0
-    dev: false
+  '@img/sharp-win32-ia32@0.33.5':
+    optional: true
 
-  /@inquirer/core@7.0.0:
-    resolution: {integrity: sha512-g13W5yEt9r1sEVVriffJqQ8GWy94OnfxLCreNSOTw0HPVcszmc/If1KIf7YBmlwtX4klmvwpZHnQpl3N7VX2xA==}
-    engines: {node: '>=18'}
-    dependencies:
-      '@inquirer/type': 1.2.0
-      '@types/mute-stream': 0.0.4
-      '@types/node': 20.14.14
-      '@types/wrap-ansi': 3.0.0
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      cli-spinners: 2.9.2
-      cli-width: 4.1.0
-      figures: 3.2.0
-      mute-stream: 1.0.0
-      run-async: 3.0.0
-      signal-exit: 4.1.0
-      strip-ansi: 6.0.1
-      wrap-ansi: 6.2.0
-    dev: false
+  '@img/sharp-win32-ia32@0.34.5':
+    optional: true
 
-  /@inquirer/type@1.2.0:
-    resolution: {integrity: sha512-/vvkUkYhrjbm+RolU7V1aUFDydZVKNKqKHR5TsE+j5DXgXFwrsOPcoGUJ02K0O7q7O53CU2DOTMYCHeGZ25WHA==}
-    engines: {node: '>=18'}
-    dev: false
+  '@img/sharp-win32-x64@0.33.5':
+    optional: true
 
-  /@internationalized/date@3.5.1:
-    resolution: {integrity: sha512-LUQIfwU9e+Fmutc/DpRTGXSdgYZLBegi4wygCWDSVmUdLTaMHsQyASDiJtREwanwKuQLq0hY76fCJ9J/9I2xOQ==}
+  '@img/sharp-win32-x64@0.34.5':
+    optional: true
+
+  '@internationalized/date@3.5.1':
     dependencies:
       '@swc/helpers': 0.5.2
-    dev: false
 
-  /@internationalized/date@3.5.5:
-    resolution: {integrity: sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==}
+  '@internationalized/date@3.5.5':
     dependencies:
       '@swc/helpers': 0.5.15
-    dev: false
 
-  /@internationalized/message@3.1.1:
-    resolution: {integrity: sha512-ZgHxf5HAPIaR0th+w0RUD62yF6vxitjlprSxmLJ1tam7FOekqRSDELMg4Cr/DdszG5YLsp5BG3FgHgqquQZbqw==}
+  '@internationalized/message@3.1.1':
     dependencies:
       '@swc/helpers': 0.5.15
       intl-messageformat: 10.5.8
-    dev: false
 
-  /@internationalized/message@3.1.4:
-    resolution: {integrity: sha512-Dygi9hH1s7V9nha07pggCkvmRfDd3q2lWnMGvrJyrOwYMe1yj4D2T9BoH9I6MGR7xz0biQrtLPsqUkqXzIrBOw==}
+  '@internationalized/message@3.1.4':
     dependencies:
       '@swc/helpers': 0.5.15
       intl-messageformat: 10.5.8
-    dev: false
 
-  /@internationalized/number@3.5.0:
-    resolution: {integrity: sha512-ZY1BW8HT9WKYvaubbuqXbbDdHhOUMfE2zHHFJeTppid0S+pc8HtdIxFxaYMsGjCb4UsF+MEJ4n2TfU7iHnUK8w==}
+  '@internationalized/number@3.5.0':
     dependencies:
-      '@swc/helpers': 0.5.2
-    dev: false
+      '@swc/helpers': 0.5.15
 
-  /@internationalized/number@3.5.3:
-    resolution: {integrity: sha512-rd1wA3ebzlp0Mehj5YTuTI50AQEx80gWFyHcQu+u91/5NgdwBecO8BH6ipPfE+lmQ9d63vpB3H9SHoIUiupllw==}
+  '@internationalized/number@3.5.3':
     dependencies:
       '@swc/helpers': 0.5.15
-    dev: false
 
-  /@internationalized/string@3.2.0:
-    resolution: {integrity: sha512-Xx3Sy3f2c9ctT+vh8c7euEaEHQZltp0euZ3Hy4UfT3E13r6lxpUS3kgKyumEjboJZSnaZv7JhqWz3D75v+IxQg==}
+  '@internationalized/string@3.2.0':
     dependencies:
-      '@swc/helpers': 0.5.2
-    dev: false
+      '@swc/helpers': 0.5.15
 
-  /@internationalized/string@3.2.3:
-    resolution: {integrity: sha512-9kpfLoA8HegiWTeCbR2livhdVeKobCnVv8tlJ6M2jF+4tcMqDo94ezwlnrUANBWPgd8U7OXIHCk2Ov2qhk4KXw==}
+  '@internationalized/string@3.2.3':
     dependencies:
       '@swc/helpers': 0.5.15
-    dev: false
 
-  /@ioredis/commands@1.2.0:
-    resolution: {integrity: sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==}
-    dev: false
+  '@ioredis/commands@1.2.0': {}
 
-  /@isaacs/cliui@8.0.2:
-    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
-    engines: {node: '>=12'}
+  '@isaacs/cliui@8.0.2':
     dependencies:
       string-width: 5.1.2
-      string-width-cjs: /string-width@4.2.3
+      string-width-cjs: string-width@4.2.3
       strip-ansi: 7.1.0
-      strip-ansi-cjs: /strip-ansi@6.0.1
+      strip-ansi-cjs: strip-ansi@6.0.1
       wrap-ansi: 8.1.0
-      wrap-ansi-cjs: /wrap-ansi@7.0.0
+      wrap-ansi-cjs: wrap-ansi@7.0.0
 
-  /@isaacs/fs-minipass@4.0.1:
-    resolution: {integrity: sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==}
-    engines: {node: '>=18.0.0'}
+  '@isaacs/fs-minipass@4.0.1':
     dependencies:
       minipass: 7.1.2
-    dev: false
-
-  /@istanbuljs/schema@0.1.3:
-    resolution: {integrity: sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==}
-    engines: {node: '>=8'}
-    dev: true
 
-  /@jridgewell/gen-mapping@0.3.2:
-    resolution: {integrity: sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==}
-    engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
-      '@jridgewell/trace-mapping': 0.3.25
+  '@istanbuljs/schema@0.1.3': {}
 
-  /@jridgewell/gen-mapping@0.3.5:
-    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
-    engines: {node: '>=6.0.0'}
+  '@jridgewell/gen-mapping@0.3.2':
     dependencies:
       '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
       '@jridgewell/trace-mapping': 0.3.25
 
-  /@jridgewell/gen-mapping@0.3.8:
-    resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
-    engines: {node: '>=6.0.0'}
+  '@jridgewell/gen-mapping@0.3.8':
     dependencies:
       '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
       '@jridgewell/trace-mapping': 0.3.25
 
-  /@jridgewell/resolve-uri@3.1.0:
-    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
-    engines: {node: '>=6.0.0'}
+  '@jridgewell/resolve-uri@3.1.0': {}
 
-  /@jridgewell/set-array@1.2.1:
-    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
-    engines: {node: '>=6.0.0'}
+  '@jridgewell/resolve-uri@3.1.2': {}
 
-  /@jridgewell/source-map@0.3.3:
-    resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.8
-      '@jridgewell/trace-mapping': 0.3.25
-    dev: false
+  '@jridgewell/set-array@1.2.1': {}
 
-  /@jridgewell/source-map@0.3.6:
-    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
+  '@jridgewell/source-map@0.3.3':
     dependencies:
       '@jridgewell/gen-mapping': 0.3.8
-      '@jridgewell/trace-mapping': 0.3.25
-    dev: true
+      '@jridgewell/trace-mapping': 0.3.31
 
-  /@jridgewell/sourcemap-codec@1.4.15:
-    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
-    dev: false
+  '@jridgewell/sourcemap-codec@1.5.0': {}
 
-  /@jridgewell/sourcemap-codec@1.5.0:
-    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
+  '@jridgewell/sourcemap-codec@1.5.5': {}
 
-  /@jridgewell/trace-mapping@0.3.19:
-    resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==}
+  '@jridgewell/trace-mapping@0.3.19':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
 
-  /@jridgewell/trace-mapping@0.3.25:
-    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+  '@jridgewell/trace-mapping@0.3.25':
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
 
-  /@jridgewell/trace-mapping@0.3.9:
-    resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+  '@jridgewell/trace-mapping@0.3.31':
     dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.5
 
-  /@js-sdsl/ordered-map@4.4.2:
-    resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
+  '@js-sdsl/ordered-map@4.4.2': {}
 
-  /@jsep-plugin/assignment@1.3.0(jsep@1.4.0):
-    resolution: {integrity: sha512-VVgV+CXrhbMI3aSusQyclHkenWSAm95WaiKrMxRFam3JSUiIaQjoMIw2sEs/OX4XifnqeQUN4DYbJjlA8EfktQ==}
-    engines: {node: '>= 10.16.0'}
-    peerDependencies:
-      jsep: ^0.4.0||^1.0.0
+  '@jsep-plugin/assignment@1.3.0(jsep@1.4.0)':
     dependencies:
       jsep: 1.4.0
-    dev: false
 
-  /@jsep-plugin/regex@1.0.4(jsep@1.4.0):
-    resolution: {integrity: sha512-q7qL4Mgjs1vByCaTnDFcBnV9HS7GVPJX5vyVoCgZHNSC9rjwIlmbXG5sUuorR5ndfHAIlJ8pVStxvjXHbNvtUg==}
-    engines: {node: '>= 10.16.0'}
-    peerDependencies:
-      jsep: ^0.4.0||^1.0.0
+  '@jsep-plugin/regex@1.0.4(jsep@1.4.0)':
     dependencies:
       jsep: 1.4.0
-    dev: false
 
-  /@jsonhero/path@1.0.21:
-    resolution: {integrity: sha512-gVUDj/92acpVoJwsVJ/RuWOaHyG4oFzn898WNGQItLCTQ+hOaVlEaImhwE1WqOTf+l3dGOUkbSiVKlb3q1hd1Q==}
-    dev: false
+  '@jsonhero/path@1.0.21': {}
 
-  /@jspm/core@2.0.1:
-    resolution: {integrity: sha512-Lg3PnLp0QXpxwLIAuuJboLeRaIhrgJjeuh797QADg3xz8wGLugQOS5DpsE8A6i6Adgzf+bacllkKZG3J0tGfDw==}
-    dev: true
+  '@jspm/core@2.0.1': {}
 
-  /@kapaai/react-sdk@0.1.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-jbw+wRDA0S5LMpKGbPsqhQMzB04XvaWPXWAqpzYeuLRXTfiLMNsKoIuH90+MX3uzVjvw5Asd0EkvYZrg9SXa1Q==}
-    peerDependencies:
-      react: '>=17.0.0'
-      react-dom: '>=17.0.0'
+  '@kapaai/react-sdk@0.1.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@fingerprintjs/fingerprintjs-pro-react': 2.6.3
-      '@hcaptcha/react-hcaptcha': 1.12.0(react-dom@18.2.0)(react@18.2.0)
+      '@hcaptcha/react-hcaptcha': 1.12.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@tanstack/react-query': 5.76.1(react@18.2.0)
       js-cookie: 3.0.5
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       tldts: 7.0.7
-    dev: false
 
-  /@kubernetes/client-node@0.20.0:
-    resolution: {integrity: sha512-xxlv5GLX4FVR/dDKEsmi4SPeuB49aRc35stndyxcC73XnUEEwF39vXbROpHOirmDse8WE9vxOjABnSVS+jb7EA==}
+  '@kubernetes/client-node@0.20.0(bufferutil@4.0.9)':
     dependencies:
       '@types/js-yaml': 4.0.9
-      '@types/node': 20.11.22
+      '@types/node': 20.14.14
       '@types/request': 2.48.12
       '@types/ws': 8.5.10
       byline: 5.0.0
-      isomorphic-ws: 5.0.0(ws@8.16.0)
-      js-yaml: 4.1.0
+      isomorphic-ws: 5.0.0(ws@8.17.1(bufferutil@4.0.9))
+      js-yaml: 4.1.1
       jsonpath-plus: 7.2.0
       request: 2.88.2
       rfc4648: 1.5.3
       stream-buffers: 3.0.2
       tar: 6.1.13
       tslib: 2.6.2
-      ws: 8.16.0
+      ws: 8.17.1(bufferutil@4.0.9)
     optionalDependencies:
       openid-client: 5.7.1
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
-    dev: false
 
-  /@kubernetes/client-node@1.0.0(patch_hash=s75bgwaoixupmywtvgoy5ruszq):
-    resolution: {integrity: sha512-a8NSvFDSHKFZ0sR1hbPSf8IDFNJwctEU5RodSCNiq/moRXWmrdmqhb1RRQzF+l+TSBaDgHw3YsYNxxE92STBzw==}
+  '@kubernetes/client-node@1.0.0(patch_hash=ba1a06f46256cdb8d6faf7167246692c0de2e7cd846a9dc0f13be0137e1c3745)(bufferutil@4.0.9)(encoding@0.1.13)':
     dependencies:
       '@types/js-yaml': 4.0.9
-      '@types/node': 22.13.9
+      '@types/node': 20.14.14
       '@types/node-fetch': 2.6.12
       '@types/stream-buffers': 3.0.7
       '@types/tar': 6.1.4
       '@types/ws': 8.5.12
-      form-data: 4.0.0
-      isomorphic-ws: 5.0.0(ws@8.18.0)
-      js-yaml: 4.1.0
+      form-data: 4.0.4
+      isomorphic-ws: 5.0.0(ws@8.17.1(bufferutil@4.0.9))
+      js-yaml: 4.1.1
       jsonpath-plus: 10.3.0
-      node-fetch: 2.6.12
+      node-fetch: 2.6.12(encoding@0.1.13)
       openid-client: 6.3.3
       rfc4648: 1.5.3
       stream-buffers: 3.0.2
       tar: 7.4.3
       tmp-promise: 3.0.3
       tslib: 2.6.2
-      ws: 8.18.0(bufferutil@4.0.9)
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - bufferutil
       - encoding
       - utf-8-validate
-    dev: false
-    patched: true
 
-  /@lezer/common@1.0.2:
-    resolution: {integrity: sha512-SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng==}
-    dev: false
+  '@lezer/common@1.0.2': {}
 
-  /@lezer/common@1.2.3:
-    resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==}
-    dev: false
+  '@lezer/common@1.3.0': {}
 
-  /@lezer/highlight@1.1.6:
-    resolution: {integrity: sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==}
+  '@lezer/highlight@1.1.6':
     dependencies:
       '@lezer/common': 1.0.2
-    dev: false
-
-  /@lezer/highlight@1.2.1:
-    resolution: {integrity: sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==}
-    dependencies:
-      '@lezer/common': 1.2.3
-    dev: false
 
-  /@lezer/javascript@1.4.1:
-    resolution: {integrity: sha512-Hqx36DJeYhKtdpc7wBYPR0XF56ZzIp0IkMO/zNNj80xcaFOV4Oj/P7TQc/8k2TxNhzl7tV5tXS8ZOCPbT4L3nA==}
+  '@lezer/highlight@1.2.3':
     dependencies:
-      '@lezer/highlight': 1.1.6
-      '@lezer/lr': 1.3.0
-    dev: false
+      '@lezer/common': 1.3.0
 
-  /@lezer/json@1.0.0:
-    resolution: {integrity: sha512-zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw==}
+  '@lezer/javascript@1.4.1':
     dependencies:
-      '@lezer/highlight': 1.1.6
-      '@lezer/lr': 1.3.0
-    dev: false
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.3
 
-  /@lezer/lr@1.3.0:
-    resolution: {integrity: sha512-rpvS+WPS/PlbJCiW+bzXPbIFIRXmzRiTEDzMvrvgpED05w5ZQO59AzH3BJen2AnHuJIlP3DcJRjsKLTrkknUNA==}
+  '@lezer/json@1.0.0':
     dependencies:
-      '@lezer/common': 1.0.2
-    dev: false
+      '@lezer/highlight': 1.2.3
+      '@lezer/lr': 1.4.3
 
-  /@lezer/lr@1.4.2:
-    resolution: {integrity: sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==}
+  '@lezer/lr@1.4.3':
     dependencies:
-      '@lezer/common': 1.2.3
-    dev: false
+      '@lezer/common': 1.3.0
 
-  /@lukeed/ms@2.0.2:
-    resolution: {integrity: sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==}
-    engines: {node: '>=8'}
-    dev: true
+  '@lukeed/ms@2.0.2': {}
 
-  /@manypkg/cli@0.19.2:
-    resolution: {integrity: sha512-DXx/P1lyunNoFWwOj1MWBucUhaIJljoiAGOpO2fE0GKMBCI6EZBZD0Up1+fQZoXBecKXRgV9mGgLvIB2fOQ0KQ==}
-    hasBin: true
+  '@manypkg/cli@0.19.2':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@manypkg/get-packages': 1.1.3
       chalk: 2.4.2
       detect-indent: 6.1.0
@@ -9148,21 +24142,18 @@ packages:
       package-json: 6.5.0
       parse-github-url: 1.0.2
       sembear: 0.5.2
-      semver: 6.3.1
+      semver: 5.7.2
       spawndamnit: 2.0.0
       validate-npm-package-name: 3.0.0
-    dev: true
 
-  /@manypkg/find-root@1.1.0:
-    resolution: {integrity: sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==}
+  '@manypkg/find-root@1.1.0':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@types/node': 12.20.55
+      '@babel/runtime': 7.27.0
+      '@types/node': 20.14.14
       find-up: 4.1.0
       fs-extra: 8.1.0
 
-  /@manypkg/get-packages@1.1.3:
-    resolution: {integrity: sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==}
+  '@manypkg/get-packages@1.1.3':
     dependencies:
       '@babel/runtime': 7.27.0
       '@changesets/types': 4.1.0
@@ -9171,12 +24162,7 @@ packages:
       globby: 11.1.0
       read-yaml-file: 1.1.0
 
-  /@marijn/find-cluster-break@1.0.2:
-    resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
-    dev: false
-
-  /@mdx-js/mdx@2.3.0:
-    resolution: {integrity: sha512-jLuwRlz8DQfQNiUCJR50Y09CGPq3fLtmtUQfVrj79E0JWu3dvsVcxVIcfhR5h0iXu+/z++zDrYeiJqifRynJkA==}
+  '@mdx-js/mdx@2.3.0':
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/mdx': 2.0.5
@@ -9197,451 +24183,227 @@ packages:
       vfile: 5.3.7
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@modelcontextprotocol/sdk@1.6.1(supports-color@10.0.0):
-    resolution: {integrity: sha512-oxzMzYCkZHMntzuyerehK3fV6A2Kwh5BD6CGEJSVDU2QNEhfLOptf2X7esQgaHZXHZY0oHmMsOtIDLP71UJXgA==}
-    engines: {node: '>=18'}
+  '@mermaid-js/parser@0.6.3':
+    dependencies:
+      langium: 3.3.1
+
+  '@microsoft/fetch-event-source@2.0.1': {}
+
+  '@modelcontextprotocol/sdk@1.25.2(hono@4.11.8)(supports-color@10.0.0)(zod@3.25.76)':
     dependencies:
+      '@hono/node-server': 1.19.9(hono@4.11.8)
+      ajv: 8.17.1
+      ajv-formats: 3.0.1(ajv@8.17.1)
       content-type: 1.0.5
       cors: 2.8.5
+      cross-spawn: 7.0.5
       eventsource: 3.0.5
+      eventsource-parser: 3.0.6
       express: 5.0.1(supports-color@10.0.0)
-      express-rate-limit: 7.5.0(express@5.0.1)
-      pkce-challenge: 4.1.0
+      express-rate-limit: 7.5.0(express@5.0.1(supports-color@10.0.0))
+      jose: 6.1.3
+      json-schema-typed: 8.0.2
+      pkce-challenge: 5.0.0
       raw-body: 3.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.3(zod@3.23.8)
+      zod: 3.25.76
+      zod-to-json-schema: 3.25.0(zod@3.25.76)
     transitivePeerDependencies:
+      - hono
       - supports-color
-    dev: false
 
-  /@mrleebo/prisma-ast@0.7.0:
-    resolution: {integrity: sha512-GTPkYf1meO2UXXIrz/SIDFWz+P4kXo2PTt36LYh/oNxV1PieYi7ZgenQk4IV0ut71Je3Z8ZoNZ8Tr7v2c1X1pg==}
-    engines: {node: '>=16'}
+  '@modelcontextprotocol/sdk@1.26.0(zod@3.25.76)':
     dependencies:
-      chevrotain: 10.5.0
-      lilconfig: 2.1.0
-    dev: true
+      '@hono/node-server': 1.19.9(hono@4.11.8)
+      ajv: 8.17.1
+      ajv-formats: 3.0.1(ajv@8.17.1)
+      content-type: 1.0.5
+      cors: 2.8.5
+      cross-spawn: 7.0.5
+      eventsource: 3.0.5
+      eventsource-parser: 3.0.6
+      express: 5.2.1
+      express-rate-limit: 8.2.1(express@5.2.1)
+      hono: 4.11.8
+      jose: 6.1.3
+      json-schema-typed: 8.0.2
+      pkce-challenge: 5.0.0
+      raw-body: 3.0.0
+      zod: 3.25.76
+      zod-to-json-schema: 3.25.1(zod@3.25.76)
+    transitivePeerDependencies:
+      - supports-color
 
-  /@msgpack/msgpack@3.0.0-beta2:
-    resolution: {integrity: sha512-y+l1PNV0XDyY8sM3YtuMLK5vE3/hkfId+Do8pLo/OPxfxuFAUwcGz3oiiUuV46/aBpwTzZ+mRWVMtlSKbradhw==}
-    engines: {node: '>= 14'}
-    dev: false
+  '@msgpack/msgpack@3.0.0-beta2': {}
 
-  /@mswjs/interceptors@0.29.1:
-    resolution: {integrity: sha512-3rDakgJZ77+RiQUuSK69t1F0m8BQKA8Vh5DCS5V0DWvNY67zob2JhhQrhCO0AKLGINTRSFd1tBaHcJTkhefoSw==}
-    engines: {node: '>=18'}
-    dependencies:
-      '@open-draft/deferred-promise': 2.2.0
-      '@open-draft/logger': 0.3.0
-      '@open-draft/until': 2.1.0
-      is-node-process: 1.2.0
-      outvariant: 1.4.2
-      strict-event-emitter: 0.5.1
-    dev: false
-
-  /@neondatabase/serverless@0.9.5:
-    resolution: {integrity: sha512-siFas6gItqv6wD/pZnvdu34wEqgG3nSE6zWZdq5j2DEsa+VvX8i/5HXJOo06qrw5axPXn+lGCxeR+NLaSPIXug==}
+  '@neondatabase/serverless@0.9.5':
     dependencies:
       '@types/pg': 8.11.6
-    dev: false
 
-  /@next/bundle-analyzer@15.0.2:
-    resolution: {integrity: sha512-bV566k+rDsaqXSUgHBof0iMIDx5DWtLx/98jvYtqb9x85e+WJzv+8cpDvbjtxQMf7nFC/LUkPmpruj1cOKfz4A==}
+  '@next/bundle-analyzer@15.0.2(bufferutil@4.0.9)':
     dependencies:
-      webpack-bundle-analyzer: 4.10.1
+      webpack-bundle-analyzer: 4.10.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
-    dev: true
 
-  /@next/env@14.1.0:
-    resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==}
-    dev: false
+  '@next/env@14.1.0': {}
 
-  /@next/env@14.2.21:
-    resolution: {integrity: sha512-lXcwcJd5oR01tggjWJ6SrNNYFGuOOMB9c251wUNkjCpkoXOPkDeF/15c3mnVlBqrW4JJXb2kVxDFhC4GduJt2A==}
-    dev: false
+  '@next/env@14.2.21': {}
 
-  /@next/env@14.2.3:
-    resolution: {integrity: sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==}
-    dev: false
+  '@next/env@15.2.4': {}
 
-  /@next/env@15.2.4:
-    resolution: {integrity: sha512-+SFtMgoiYP3WoSswuNmxJOCwi06TdWE733D+WPjpXIe4LXGULwEaofiiAy6kbS0+XjM5xF5n3lKuBwN2SnqD9g==}
-    dev: false
+  '@next/env@15.4.8': {}
 
-  /@next/swc-darwin-arm64@14.1.0:
-    resolution: {integrity: sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/env@15.5.6': {}
+
+  '@next/swc-darwin-arm64@14.1.0':
     optional: true
 
-  /@next/swc-darwin-arm64@14.2.21:
-    resolution: {integrity: sha512-HwEjcKsXtvszXz5q5Z7wCtrHeTTDSTgAbocz45PHMUjU3fBYInfvhR+ZhavDRUYLonm53aHZbB09QtJVJj8T7g==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-arm64@14.2.21':
     optional: true
 
-  /@next/swc-darwin-arm64@14.2.3:
-    resolution: {integrity: sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-arm64@15.2.4':
     optional: true
 
-  /@next/swc-darwin-arm64@15.2.4:
-    resolution: {integrity: sha512-1AnMfs655ipJEDC/FHkSr0r3lXBgpqKo4K1kiwfUf3iE68rDFXZ1TtHdMvf7D0hMItgDZ7Vuq3JgNMbt/+3bYw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-arm64@15.4.8':
     optional: true
 
-  /@next/swc-darwin-x64@14.1.0:
-    resolution: {integrity: sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-arm64@15.5.6':
     optional: true
 
-  /@next/swc-darwin-x64@14.2.21:
-    resolution: {integrity: sha512-TSAA2ROgNzm4FhKbTbyJOBrsREOMVdDIltZ6aZiKvCi/v0UwFmwigBGeqXDA97TFMpR3LNNpw52CbVelkoQBxA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-x64@14.1.0':
     optional: true
 
-  /@next/swc-darwin-x64@14.2.3:
-    resolution: {integrity: sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-x64@14.2.21':
     optional: true
 
-  /@next/swc-darwin-x64@15.2.4:
-    resolution: {integrity: sha512-3qK2zb5EwCwxnO2HeO+TRqCubeI/NgCe+kL5dTJlPldV/uwCnUgC7VbEzgmxbfrkbjehL4H9BPztWOEtsoMwew==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-x64@15.2.4':
     optional: true
 
-  /@next/swc-linux-arm64-gnu@14.1.0:
-    resolution: {integrity: sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-x64@15.4.8':
     optional: true
 
-  /@next/swc-linux-arm64-gnu@14.2.21:
-    resolution: {integrity: sha512-0Dqjn0pEUz3JG+AImpnMMW/m8hRtl1GQCNbO66V1yp6RswSTiKmnHf3pTX6xMdJYSemf3O4Q9ykiL0jymu0TuA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-darwin-x64@15.5.6':
     optional: true
 
-  /@next/swc-linux-arm64-gnu@14.2.3:
-    resolution: {integrity: sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-gnu@14.1.0':
     optional: true
 
-  /@next/swc-linux-arm64-gnu@15.2.4:
-    resolution: {integrity: sha512-HFN6GKUcrTWvem8AZN7tT95zPb0GUGv9v0d0iyuTb303vbXkkbHDp/DxufB04jNVD+IN9yHy7y/6Mqq0h0YVaQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-gnu@14.2.21':
     optional: true
 
-  /@next/swc-linux-arm64-musl@14.1.0:
-    resolution: {integrity: sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-gnu@15.2.4':
     optional: true
 
-  /@next/swc-linux-arm64-musl@14.2.21:
-    resolution: {integrity: sha512-Ggfw5qnMXldscVntwnjfaQs5GbBbjioV4B4loP+bjqNEb42fzZlAaK+ldL0jm2CTJga9LynBMhekNfV8W4+HBw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-gnu@15.4.8':
     optional: true
 
-  /@next/swc-linux-arm64-musl@14.2.3:
-    resolution: {integrity: sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-gnu@15.5.6':
     optional: true
 
-  /@next/swc-linux-arm64-musl@15.2.4:
-    resolution: {integrity: sha512-Oioa0SORWLwi35/kVB8aCk5Uq+5/ZIumMK1kJV+jSdazFm2NzPDztsefzdmzzpx5oGCJ6FkUC7vkaUseNTStNA==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-musl@14.1.0':
     optional: true
 
-  /@next/swc-linux-x64-gnu@14.1.0:
-    resolution: {integrity: sha512-zJ2pnoFYB1F4vmEVlb/eSe+VH679zT1VdXlZKX+pE66grOgjmKJHKacf82g/sWE4MQ4Rk2FMBCRnX+l6/TVYzQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-musl@14.2.21':
     optional: true
 
-  /@next/swc-linux-x64-gnu@14.2.21:
-    resolution: {integrity: sha512-uokj0lubN1WoSa5KKdThVPRffGyiWlm/vCc/cMkWOQHw69Qt0X1o3b2PyLLx8ANqlefILZh1EdfLRz9gVpG6tg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-musl@15.2.4':
     optional: true
 
-  /@next/swc-linux-x64-gnu@14.2.3:
-    resolution: {integrity: sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-musl@15.4.8':
     optional: true
 
-  /@next/swc-linux-x64-gnu@15.2.4:
-    resolution: {integrity: sha512-yb5WTRaHdkgOqFOZiu6rHV1fAEK0flVpaIN2HB6kxHVSy/dIajWbThS7qON3W9/SNOH2JWkVCyulgGYekMePuw==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-arm64-musl@15.5.6':
     optional: true
 
-  /@next/swc-linux-x64-musl@14.1.0:
-    resolution: {integrity: sha512-rbaIYFt2X9YZBSbH/CwGAjbBG2/MrACCVu2X0+kSykHzHnYH5FjHxwXLkcoJ10cX0aWCEynpu+rP76x0914atg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-gnu@14.1.0':
     optional: true
 
-  /@next/swc-linux-x64-musl@14.2.21:
-    resolution: {integrity: sha512-iAEBPzWNbciah4+0yI4s7Pce6BIoxTQ0AGCkxn/UBuzJFkYyJt71MadYQkjPqCQCJAFQ26sYh7MOKdU+VQFgPg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-gnu@14.2.21':
     optional: true
 
-  /@next/swc-linux-x64-musl@14.2.3:
-    resolution: {integrity: sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-gnu@15.2.4':
     optional: true
 
-  /@next/swc-linux-x64-musl@15.2.4:
-    resolution: {integrity: sha512-Dcdv/ix6srhkM25fgXiyOieFUkz+fOYkHlydWCtB0xMST6X9XYI3yPDKBZt1xuhOytONsIFJFB08xXYsxUwJLw==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-gnu@15.4.8':
     optional: true
 
-  /@next/swc-win32-arm64-msvc@14.1.0:
-    resolution: {integrity: sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-gnu@15.5.6':
     optional: true
 
-  /@next/swc-win32-arm64-msvc@14.2.21:
-    resolution: {integrity: sha512-plykgB3vL2hB4Z32W3ktsfqyuyGAPxqwiyrAi2Mr8LlEUhNn9VgkiAl5hODSBpzIfWweX3er1f5uNpGDygfQVQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-musl@14.1.0':
     optional: true
 
-  /@next/swc-win32-arm64-msvc@14.2.3:
-    resolution: {integrity: sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-musl@14.2.21':
     optional: true
 
-  /@next/swc-win32-arm64-msvc@15.2.4:
-    resolution: {integrity: sha512-dW0i7eukvDxtIhCYkMrZNQfNicPDExt2jPb9AZPpL7cfyUo7QSNl1DjsHjmmKp6qNAqUESyT8YFl/Aw91cNJJg==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-musl@15.2.4':
     optional: true
 
-  /@next/swc-win32-ia32-msvc@14.1.0:
-    resolution: {integrity: sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-musl@15.4.8':
     optional: true
 
-  /@next/swc-win32-ia32-msvc@14.2.21:
-    resolution: {integrity: sha512-w5bacz4Vxqrh06BjWgua3Yf7EMDb8iMcVhNrNx8KnJXt8t+Uu0Zg4JHLDL/T7DkTCEEfKXO/Er1fcfWxn2xfPA==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-linux-x64-musl@15.5.6':
     optional: true
 
-  /@next/swc-win32-ia32-msvc@14.2.3:
-    resolution: {integrity: sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==}
-    engines: {node: '>= 10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-win32-arm64-msvc@14.1.0':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@14.2.21':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@15.2.4':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@15.4.8':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@15.5.6':
+    optional: true
+
+  '@next/swc-win32-ia32-msvc@14.1.0':
+    optional: true
+
+  '@next/swc-win32-ia32-msvc@14.2.21':
     optional: true
 
-  /@next/swc-win32-x64-msvc@14.1.0:
-    resolution: {integrity: sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-win32-x64-msvc@14.1.0':
     optional: true
 
-  /@next/swc-win32-x64-msvc@14.2.21:
-    resolution: {integrity: sha512-sT6+llIkzpsexGYZq8cjjthRyRGe5cJVhqh12FmlbxHqna6zsDDK8UNaV7g41T6atFHCJUPeLb3uyAwrBwy0NA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-win32-x64-msvc@14.2.21':
     optional: true
 
-  /@next/swc-win32-x64-msvc@14.2.3:
-    resolution: {integrity: sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-win32-x64-msvc@15.2.4':
     optional: true
 
-  /@next/swc-win32-x64-msvc@15.2.4:
-    resolution: {integrity: sha512-SbnWkJmkS7Xl3kre8SdMF6F/XDh1DTFEhp0jRTj/uB8iPKoU2bb2NDfcu+iifv1+mxQEd1g2vvSxcZbXSKyWiQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@next/swc-win32-x64-msvc@15.4.8':
     optional: true
 
-  /@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1:
-    resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==}
+  '@next/swc-win32-x64-msvc@15.5.6':
+    optional: true
+
+  '@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1':
     dependencies:
       eslint-scope: 5.1.1
-    dev: true
 
-  /@nodelib/fs.scandir@2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
+  '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       run-parallel: 1.2.0
 
-  /@nodelib/fs.stat@2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
+  '@nodelib/fs.stat@2.0.5': {}
 
-  /@nodelib/fs.walk@1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
+  '@nodelib/fs.walk@1.2.8':
     dependencies:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
-  /@npmcli/agent@2.2.2:
-    resolution: {integrity: sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-    dependencies:
-      agent-base: 7.1.1
-      http-proxy-agent: 7.0.0
-      https-proxy-agent: 7.0.2
-      lru-cache: 10.4.3
-      socks-proxy-agent: 8.0.4
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /@npmcli/fs@1.1.1:
-    resolution: {integrity: sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==}
-    requiresBuild: true
-    dependencies:
-      '@gar/promisify': 1.1.3
-      semver: 7.7.2
-    dev: false
-    optional: true
-
-  /@npmcli/fs@3.1.0:
-    resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  '@npmcli/fs@3.1.0':
     dependencies:
-      semver: 7.6.3
+      semver: 5.7.2
 
-  /@npmcli/git@4.1.0:
-    resolution: {integrity: sha512-9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  '@npmcli/git@4.1.0':
     dependencies:
       '@npmcli/promise-spawn': 6.0.2
       lru-cache: 7.18.3
@@ -9649,26 +24411,12 @@ packages:
       proc-log: 3.0.0
       promise-inflight: 1.0.1
       promise-retry: 2.0.1
-      semver: 7.6.3
+      semver: 5.7.2
       which: 3.0.1
     transitivePeerDependencies:
       - bluebird
-    dev: true
-
-  /@npmcli/move-file@1.1.2:
-    resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==}
-    engines: {node: '>=10'}
-    deprecated: This functionality has been moved to @npmcli/fs
-    requiresBuild: true
-    dependencies:
-      mkdirp: 1.0.4
-      rimraf: 3.0.2
-    dev: false
-    optional: true
 
-  /@npmcli/package-json@4.0.1:
-    resolution: {integrity: sha512-lRCEGdHZomFsURroh522YvA/2cVb9oPIJrjHanCJZkiasz1BzcnLr3tBJhlV7S86MBJBuAQ33is2D60YitZL2Q==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  '@npmcli/package-json@4.0.1':
     dependencies:
       '@npmcli/git': 4.1.0
       glob: 10.4.5
@@ -9676,654 +24424,653 @@ packages:
       json-parse-even-better-errors: 3.0.0
       normalize-package-data: 5.0.0
       proc-log: 3.0.0
-      semver: 7.6.3
+      semver: 5.7.2
     transitivePeerDependencies:
       - bluebird
-    dev: true
 
-  /@npmcli/promise-spawn@6.0.2:
-    resolution: {integrity: sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  '@npmcli/promise-spawn@6.0.2':
     dependencies:
       which: 3.0.1
-    dev: true
 
-  /@one-ini/wasm@0.1.1:
-    resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
-    dev: false
+  '@octokit/app@14.1.0':
+    dependencies:
+      '@octokit/auth-app': 6.1.4
+      '@octokit/auth-unauthenticated': 5.0.1
+      '@octokit/core': 5.2.2
+      '@octokit/oauth-app': 6.1.0
+      '@octokit/plugin-paginate-rest': 9.2.2(@octokit/core@5.2.2)
+      '@octokit/types': 12.6.0
+      '@octokit/webhooks': 12.3.2
 
-  /@open-draft/deferred-promise@2.2.0:
-    resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==}
+  '@octokit/auth-app@6.1.4':
+    dependencies:
+      '@octokit/auth-oauth-app': 7.1.0
+      '@octokit/auth-oauth-user': 4.1.0
+      '@octokit/request': 8.4.1
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 13.10.0
+      deprecation: 2.3.1
+      lru-cache: '@wolfy1339/lru-cache@11.0.2-patch.1'
+      universal-github-app-jwt: 1.2.0
+      universal-user-agent: 6.0.1
 
-  /@open-draft/logger@0.3.0:
-    resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==}
+  '@octokit/auth-oauth-app@7.1.0':
     dependencies:
-      is-node-process: 1.2.0
-      outvariant: 1.4.2
-    dev: false
+      '@octokit/auth-oauth-device': 6.1.0
+      '@octokit/auth-oauth-user': 4.1.0
+      '@octokit/request': 8.4.1
+      '@octokit/types': 13.10.0
+      '@types/btoa-lite': 1.0.2
+      btoa-lite: 1.0.0
+      universal-user-agent: 6.0.1
 
-  /@open-draft/until@2.1.0:
-    resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
-    dev: false
+  '@octokit/auth-oauth-device@6.1.0':
+    dependencies:
+      '@octokit/oauth-methods': 4.1.0
+      '@octokit/request': 8.4.1
+      '@octokit/types': 13.10.0
+      universal-user-agent: 6.0.1
 
-  /@opentelemetry/api-logs@0.49.1:
-    resolution: {integrity: sha512-kaNl/T7WzyMUQHQlVq7q0oV4Kev6+0xFwqzofryC66jgGMacd0QH5TwfpbUwSTby+SdAdprAe5UKMvBw4tKS5Q==}
-    engines: {node: '>=14'}
+  '@octokit/auth-oauth-user@4.1.0':
+    dependencies:
+      '@octokit/auth-oauth-device': 6.1.0
+      '@octokit/oauth-methods': 4.1.0
+      '@octokit/request': 8.4.1
+      '@octokit/types': 13.10.0
+      btoa-lite: 1.0.0
+      universal-user-agent: 6.0.1
+
+  '@octokit/auth-token@4.0.0': {}
+
+  '@octokit/auth-unauthenticated@5.0.1':
+    dependencies:
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 12.6.0
+
+  '@octokit/core@5.2.2':
+    dependencies:
+      '@octokit/auth-token': 4.0.0
+      '@octokit/graphql': 7.1.1
+      '@octokit/request': 8.4.1
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 13.10.0
+      before-after-hook: 2.2.3
+      universal-user-agent: 6.0.1
+
+  '@octokit/endpoint@9.0.6':
+    dependencies:
+      '@octokit/types': 13.10.0
+      universal-user-agent: 6.0.1
+
+  '@octokit/graphql@7.1.1':
+    dependencies:
+      '@octokit/request': 8.4.1
+      '@octokit/types': 13.10.0
+      universal-user-agent: 6.0.1
+
+  '@octokit/oauth-app@6.1.0':
+    dependencies:
+      '@octokit/auth-oauth-app': 7.1.0
+      '@octokit/auth-oauth-user': 4.1.0
+      '@octokit/auth-unauthenticated': 5.0.1
+      '@octokit/core': 5.2.2
+      '@octokit/oauth-authorization-url': 6.0.2
+      '@octokit/oauth-methods': 4.1.0
+      '@types/aws-lambda': 8.10.152
+      universal-user-agent: 6.0.1
+
+  '@octokit/oauth-authorization-url@6.0.2': {}
+
+  '@octokit/oauth-methods@4.1.0':
+    dependencies:
+      '@octokit/oauth-authorization-url': 6.0.2
+      '@octokit/request': 8.4.1
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 13.10.0
+      btoa-lite: 1.0.0
+
+  '@octokit/openapi-types@20.0.0': {}
+
+  '@octokit/openapi-types@24.2.0': {}
+
+  '@octokit/plugin-paginate-graphql@4.0.1(@octokit/core@5.2.2)':
+    dependencies:
+      '@octokit/core': 5.2.2
+
+  '@octokit/plugin-paginate-rest@11.4.4-cjs.2(@octokit/core@5.2.2)':
+    dependencies:
+      '@octokit/core': 5.2.2
+      '@octokit/types': 13.10.0
+
+  '@octokit/plugin-paginate-rest@9.2.2(@octokit/core@5.2.2)':
+    dependencies:
+      '@octokit/core': 5.2.2
+      '@octokit/types': 12.6.0
+
+  '@octokit/plugin-rest-endpoint-methods@13.3.2-cjs.1(@octokit/core@5.2.2)':
+    dependencies:
+      '@octokit/core': 5.2.2
+      '@octokit/types': 13.10.0
+
+  '@octokit/plugin-retry@6.1.0(@octokit/core@5.2.2)':
+    dependencies:
+      '@octokit/core': 5.2.2
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 13.10.0
+      bottleneck: 2.19.5
+
+  '@octokit/plugin-throttling@8.2.0(@octokit/core@5.2.2)':
+    dependencies:
+      '@octokit/core': 5.2.2
+      '@octokit/types': 12.6.0
+      bottleneck: 2.19.5
+
+  '@octokit/request-error@5.1.1':
+    dependencies:
+      '@octokit/types': 13.10.0
+      deprecation: 2.3.1
+      once: 1.4.0
+
+  '@octokit/request@8.4.1':
+    dependencies:
+      '@octokit/endpoint': 9.0.6
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 13.10.0
+      universal-user-agent: 6.0.1
+
+  '@octokit/types@12.6.0':
+    dependencies:
+      '@octokit/openapi-types': 20.0.0
+
+  '@octokit/types@13.10.0':
+    dependencies:
+      '@octokit/openapi-types': 24.2.0
+
+  '@octokit/webhooks-methods@4.1.0': {}
+
+  '@octokit/webhooks-types@7.6.1': {}
+
+  '@octokit/webhooks@12.3.2':
+    dependencies:
+      '@octokit/request-error': 5.1.1
+      '@octokit/webhooks-methods': 4.1.0
+      '@octokit/webhooks-types': 7.6.1
+      aggregate-error: 3.1.0
+
+  '@one-ini/wasm@0.1.1': {}
+
+  '@open-draft/deferred-promise@2.2.0': {}
+
+  '@opentelemetry/api-logs@0.203.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
-  /@opentelemetry/api-logs@0.51.1:
-    resolution: {integrity: sha512-E3skn949Pk1z2XtXu/lxf6QAZpawuTM/IUEXcAzpiUkTd73Hmvw26FiN3cJuTmkpM5hZzHwkomVdtrh/n/zzwA==}
-    engines: {node: '>=14'}
+  '@opentelemetry/api-logs@0.52.1':
     dependencies:
       '@opentelemetry/api': 1.9.0
-    dev: true
 
-  /@opentelemetry/api-logs@0.52.1:
-    resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
-    engines: {node: '>=14'}
+  '@opentelemetry/api-logs@0.57.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
-  /@opentelemetry/api-logs@0.57.0:
-    resolution: {integrity: sha512-l1aJ30CXeauVYaI+btiynHpw341LthkMTv3omi1VJDX14werY2Wmv9n1yudMsq9HuY0m8PvXEVX4d8zxEb+WRg==}
-    engines: {node: '>=14'}
+  '@opentelemetry/api-logs@0.57.2':
     dependencies:
       '@opentelemetry/api': 1.9.0
-    dev: false
 
-  /@opentelemetry/api@1.4.1:
-    resolution: {integrity: sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==}
-    engines: {node: '>=8.0.0'}
+  '@opentelemetry/api@1.8.0': {}
 
-  /@opentelemetry/api@1.8.0:
-    resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==}
-    engines: {node: '>=8.0.0'}
-    dev: false
+  '@opentelemetry/api@1.9.0': {}
 
-  /@opentelemetry/api@1.9.0:
-    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
-    engines: {node: '>=8.0.0'}
+  '@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
 
-  /@opentelemetry/context-async-hooks@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-Nfdxyg8YtWqVWkyrCukkundAjPhUXi93JtVQmqDT1mZRVKqA7e2r7eJCrI+F651XUBMp0hsOJSGiFk3QSpaIJw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+  '@opentelemetry/context-async-hooks@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-    dev: true
+      '@opentelemetry/api': 1.9.0
 
-  /@opentelemetry/context-async-hooks@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/core@1.30.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.28.0
 
-  /@opentelemetry/context-async-hooks@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-    dev: false
+      '@opentelemetry/semantic-conventions': 1.28.0
 
-  /@opentelemetry/core@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+  '@opentelemetry/core@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.36.0
 
-  /@opentelemetry/core@1.22.0(@opentelemetry/api@1.8.0):
-    resolution: {integrity: sha512-0VoAlT6x+Xzik1v9goJ3pZ2ppi6+xd3aUfg4brfrLkDBHRIVjMP0eBHrKrhB+NKcDyMAg8fAbGL3Npg/F6AwWA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+  '@opentelemetry/core@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: false
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.36.0
 
-  /@opentelemetry/core@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/exporter-logs-otlp-grpc@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/semantic-conventions': 1.25.1
+      '@grpc/grpc-js': 1.12.6
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/core@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/exporter-logs-otlp-http@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: false
+      '@opentelemetry/api-logs': 0.203.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/core@1.30.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-Q/3u/K73KUjTCnFUP97ZY+pBjQ1kPEgjOfXj/bJl8zW7GbXdkw6cwuyZk6ZTXkVgCBsYRYUzx4fvYK1jxdb9MA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/exporter-logs-otlp-proto@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/semantic-conventions': 1.28.0
-    dev: false
+      '@opentelemetry/api-logs': 0.203.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-OOCM2C/QIURhJMuKaekP3TRBxBKxG/TWWA0TL2J6nXUtDnuCtccy49LUJF8xPFXMX+0LMcxFpCo8M9cGY1W6rQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/exporter-metrics-otlp-grpc@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
+      '@grpc/grpc-js': 1.12.6
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/semantic-conventions': 1.28.0
-    dev: false
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/exporter-logs-otlp-http@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-3QoBnIGCmEkujynUP0mK155QtOM0MSf9FNrEw7u9ieCFsoMiyatg2hPp+alEDONJ8N8wGEK+wP2q3icgXBiggw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/exporter-metrics-otlp-http@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.49.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-transformer': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-logs': 0.49.1(@opentelemetry/api-logs@0.49.1)(@opentelemetry/api@1.4.1)
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/exporter-logs-otlp-http@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-qKgywId2DbdowPZpOBXQKp0B8DfhfIArmSic15z13Nk/JAOccBUQdPwDjDnjsM5f0ckZFMVR2t/tijTUAqDZoA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/exporter-metrics-otlp-proto@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.52.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/exporter-metrics-otlp-http@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-oAHPOy1sZi58bwqXaucd19F/v7+qE2EuVslQOEeLQT94CDuZJJ4tbWzx8DpYBTrOSzKqqrMtx9+PMxkrcbxOyQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-prometheus@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/exporter-metrics-otlp-proto@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-m9aEOzKkjznNxm+0NbyEV834Wza9asRaFA4VyWY3b1XltqbdStRmOYSZHq0VzcecOe24uD41zFqHweL2fA3y6g==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-grpc@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
+      '@grpc/grpc-js': 1.12.6
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-metrics-otlp-http': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/exporter-trace-otlp-grpc@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-Zbd7f3zF7fI2587MVhBizaW21cO/SordyrZGtMtvhoxU6n4Qb02Gx71X4+PzXH620e0+JX+Pcr9bYb1HTeVyJA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-grpc-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-http@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@grpc/grpc-js': 1.8.17
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-transformer': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
-
-  /@opentelemetry/exporter-trace-otlp-grpc@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-pVkSH20crBwMTqB3nIN4jpQKUEoB0Z94drIHpYyEqs7UBr+I0cpYyOR3bqjA/UasQUMROb3GX8ZX4/9cVRqGBQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-http@0.57.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@grpc/grpc-js': 1.8.17
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-grpc-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/exporter-trace-otlp-http@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-KOLtZfZvIrpGZLVvblKsiVQT7gQUZNKcUUH24Zz6Xbi7LJb9Vt6xtUZFYdR5IIjvt47PIqBKDWUQlU0o1wAsRw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+      '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.57.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.57.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.0(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-trace-otlp-proto@0.203.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+
+  '@opentelemetry/exporter-zipkin@2.0.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+
+  '@opentelemetry/host-metrics@0.37.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      systeminformation: 5.27.14
+
+  '@opentelemetry/instrumentation-amqplib@0.46.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-transformer': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-aws-sdk@0.57.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/propagation-utils': 0.31.3(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-connect@0.43.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@types/connect': 3.4.38
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-dataloader@0.16.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-express@0.47.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-express@0.52.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fetch@0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/sdk-trace-web': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fs@0.19.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-generic-pool@0.43.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-graphql@0.47.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-hapi@0.45.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-http@0.203.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      forwarded-parse: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-http@0.57.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      forwarded-parse: 2.1.2
+      semver: 5.7.2
+    transitivePeerDependencies:
+      - supports-color
 
-  /@opentelemetry/exporter-trace-otlp-http@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-05HcNizx0BxcFKKnS5rwOV+2GevLTVIRA0tRgWYyw4yCgR53Ic/xk83toYKts7kbzcI+dswInUg/4s8oyA+tqg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/instrumentation-ioredis@0.47.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/exporter-trace-otlp-http@0.57.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-BJl35PSkwoMlGEOrzjCG1ih6zqZoAZJIR4xyqSKC2BqPtwuRjID0vWBaEdP9xrxxJTEIEQw+gEY/0pUgicX0ew==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-kafkajs@0.7.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.57.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.57.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.30.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.30.0(@opentelemetry/api@1.9.0)
-    dev: false
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /@opentelemetry/exporter-trace-otlp-proto@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-n8ON/c9pdMyYAfSFWKkgsPwjYoxnki+6Olzo+klKfW7KqLWoyEkryNkbcMIYnGGNXwdkMIrjoaP0VxXB26Oxcg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-proto-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-transformer': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
-
-  /@opentelemetry/exporter-trace-otlp-proto@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-pt6uX0noTQReHXNeEslQv7x311/F1gJzMnp1HD2qgypLRPbXDeMzzeTngRTUaUbP6hqWNtPxuLr4DEoZG+TcEQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/instrumentation-knex@0.44.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/exporter-zipkin@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-XcFs6rGvcTz0qW5uY7JZDYD0yNEXdekXAb6sFtnZgY/cHY6BQ09HMzOjv9SX+iaXplRDcHr1Gta7VQKM1XXM6g==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: true
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /@opentelemetry/exporter-zipkin@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-RmOwSvkimg7ETwJbUOPTMhJm9A9bG1U8s7Zo3ajDh4zM7eYcycQ0dM7FbLD6NXWbI2yj7UY4q8BKinKYBQksyw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/instrumentation-koa@0.47.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: false
-
-  /@opentelemetry/instrumentation-express@0.36.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-ltIE4kIMa+83QjW/p7oe7XCESF29w3FQ9/T1VgShdX7fzm56K2a0xfEX1vF8lnHRGERYxIWX9D086C6gJOjVGA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.44.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.25.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@opentelemetry/instrumentation-express@0.36.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-ltIE4kIMa+83QjW/p7oe7XCESF29w3FQ9/T1VgShdX7fzm56K2a0xfEX1vF8lnHRGERYxIWX9D086C6gJOjVGA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation-mongodb@0.52.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@opentelemetry/instrumentation-fetch@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-hizhULZXlq02y8YC0vPQ4WtUWiXcwxPdEqHBy8p75jzF9rAuP/ldrVr0Oxvz5Xr9qQcdEOFLvEl0ZxbVL76WKw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/instrumentation-mongoose@0.46.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-web': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@opentelemetry/instrumentation-fetch@0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0):
-    resolution: {integrity: sha512-EJDQXdv1ZGyBifox+8BK+hP0tg29abNPdScE+lW77bUVrThD5vn2dOo+blAS3Z8Od+eqTUTDzXVDIFjGgTK01w==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/instrumentation-mysql2@0.45.2(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
-      '@opentelemetry/sdk-trace-web': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@opentelemetry/instrumentation-http@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-Yib5zrW2s0V8wTeUK/B3ZtpyP4ldgXj9L3Ws/axXrW1dW0/mEFKifK50MxMQK9g5NNJQS9dWH7rvcEGZdWdQDA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation-mysql@0.45.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
-      semver: 7.6.3
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@types/mysql': 2.15.26
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@opentelemetry/instrumentation-http@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-dG/aevWhaP+7OLv4BQQSEKMJv8GyeOp3Wxl31NHqE8xo9/fYMfEljiZphUHIfyg4gnZ9swMyWjfOQs5GUQe54Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation-pg@0.51.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-      semver: 7.6.3
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+      '@types/pg': 8.6.1
+      '@types/pg-pool': 2.0.6
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@opentelemetry/instrumentation-undici@0.2.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-RH9WdVRtpnyp8kvya2RYqKsJouPxvHl7jKPsIfrbL8u2QCKloAGi0uEqDHoOS15ZRYPQTDXZ7d8jSpUgSQmvpA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.7.0
+  '@opentelemetry/instrumentation-redis-4@0.46.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation': 0.51.1(@opentelemetry/api@1.4.1)
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.36.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation-tedious@0.18.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.49.1
-      '@types/shimmer': 1.0.2
-      import-in-the-middle: 1.7.1
-      require-in-the-middle: 7.1.1(supports-color@10.0.0)
-      semver: 7.6.3
-      shimmer: 1.2.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@types/tedious': 4.0.14
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.8.0):
-    resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation-undici@0.10.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/api-logs': 0.49.1
-      '@types/shimmer': 1.0.2
-      import-in-the-middle: 1.7.1
-      require-in-the-middle: 7.1.1(supports-color@10.0.0)
-      semver: 7.6.3
-      shimmer: 1.2.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@opentelemetry/instrumentation@0.49.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-0DLtWtaIppuNNRRllSD4bjU8ZIiLp1cDXvJEbp752/Zf+y3gaLNaoGRGIlX4UHhcsrmtL+P2qxi3Hodi8VuKiQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation-undici@0.14.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.49.1
-      '@types/shimmer': 1.0.2
-      import-in-the-middle: 1.7.1
-      require-in-the-middle: 7.1.1(supports-color@10.0.0)
-      semver: 7.6.3
-      shimmer: 1.2.1
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@opentelemetry/instrumentation@0.51.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-JIrvhpgqY6437QIqToyozrUG1h5UhwHkaGK/WAX+fkrpyPtc+RO5FkRtUd9BH0MibabHHvqsnBGKfKVijbmp8w==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation@0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.51.1
-      '@types/shimmer': 1.0.2
-      import-in-the-middle: 1.7.4
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.203.0
+      import-in-the-middle: 1.11.0
       require-in-the-middle: 7.1.1(supports-color@10.0.0)
-      semver: 7.6.3
-      shimmer: 1.2.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/api': 1.9.0
       '@opentelemetry/api-logs': 0.52.1
-      '@types/shimmer': 1.0.2
+      '@types/shimmer': 1.2.0
       import-in-the-middle: 1.11.0
       require-in-the-middle: 7.1.1(supports-color@10.0.0)
-      semver: 7.6.3
+      semver: 5.7.2
       shimmer: 1.2.1
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0):
-    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
-      '@types/shimmer': 1.0.2
+      '@opentelemetry/api-logs': 0.57.2
+      '@types/shimmer': 1.2.0
       import-in-the-middle: 1.11.0
       require-in-the-middle: 7.1.1(supports-color@10.0.0)
-      semver: 7.6.3
+      semver: 5.7.2
       shimmer: 1.2.1
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /@opentelemetry/otlp-exporter-base@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-z6sHliPqDgJU45kQatAettY9/eVF58qVPaTuejw9YWfSRqid9pXPYeegDCSdyS47KAUgAtm+nC28K3pfF27HWg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
 
-  /@opentelemetry/otlp-exporter-base@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-z175NXOtX5ihdlshtYBe5RpGeBoTXVCKPPLiQlD6FHvpM4Ch+p2B0yWKYSrBfLH24H9zjJiBdTrtD+hLlfnXEQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/otlp-exporter-base@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-    dev: false
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/otlp-exporter-base@0.57.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-QQl4Ngm3D6H8SDO0EM642ncTxjRsf/HDq7+IWIA0eaEK/NTsJeQ3iYJiZj3F4jkALnvyeM1kkwd+DHtqxTBx9Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/otlp-exporter-base@0.57.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/otlp-transformer': 0.57.0(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/otlp-grpc-exporter-base@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-DNDNUWmOqtKTFJAyOyHHKotVox0NQ/09ETX8fUOeEtyNVHoGekAVtBbvIA3AtK+JflP7LC0PTjlLfruPM3Wy6w==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
-    dependencies:
-      '@grpc/grpc-js': 1.8.17
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      protobufjs: 7.3.2
-    dev: true
 
-  /@opentelemetry/otlp-grpc-exporter-base@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-zo/YrSDmKMjG+vPeA9aBBrsQM9Q/f2zo6N04WMB3yNldJRsgpRBeLLwvAt/Ba7dpehDLOEFBd1i2JCoaFtpCoQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
+  '@opentelemetry/otlp-grpc-exporter-base@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@grpc/grpc-js': 1.8.17
+      '@grpc/grpc-js': 1.12.6
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/otlp-proto-exporter-base@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-x1qB4EUC7KikUl2iNuxCkV8yRzrSXSyj4itfpIO674H7dhI7Zv37SFaOJTDN+8Z/F50gF2ISFH9CWQ4KCtGm2A==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.0.0
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/otlp-exporter-base': 0.49.1(@opentelemetry/api@1.4.1)
-      protobufjs: 7.3.2
-    dev: true
-
-  /@opentelemetry/otlp-transformer@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-Z+koA4wp9L9e3jkFacyXTGphSWTbOKjwwXMpb0CxNb0kjTHGUxhYRN8GnkLFsFo5NbZPjP07hwAqeEG/uCratQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.49.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-logs': 0.49.1(@opentelemetry/api-logs@0.49.1)(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-metrics': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-exporter-base': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/otlp-transformer': 0.203.0(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/otlp-transformer@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-I88uCZSZZtVa0XniRqQWKbjAUm73I8tpEy/uJYPPYw5d7BRdVk0RfTBQw8kSUl01oVWEuqxLDa802222MYyWHg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+  '@opentelemetry/otlp-transformer@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/api-logs': 0.203.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
       protobufjs: 7.3.2
-    dev: false
 
-  /@opentelemetry/otlp-transformer@0.57.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-yHX7sdwkdAmSa6Jbi3caSLDWy0PCHS1pKQeKz8AIWSyQqL7IojHKgdk9A+7eRd98Z1n9YTdwWSWLnObvIqhEhQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
+  '@opentelemetry/otlp-transformer@0.57.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/api-logs': 0.57.0
@@ -10333,407 +25080,155 @@ packages:
       '@opentelemetry/sdk-metrics': 1.30.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.30.0(@opentelemetry/api@1.9.0)
       protobufjs: 7.3.2
-    dev: false
-
-  /@opentelemetry/propagator-b3@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-qBItJm9ygg/jCB5rmivyGz1qmKZPsL/sX715JqPMFgq++Idm0x+N9sLQvWFHFt2+ZINnCSojw7FVBgFW6izcXA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
-
-  /@opentelemetry/propagator-b3@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-p6HFscpjrv7//kE+7L+3Vn00VEDUJB0n6ZrjkTYHrJ58QZ8B3ajSJhRbCcY6guQ3PDjTbxWklyvIN2ojVbIb1A==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-    dev: true
 
-  /@opentelemetry/propagator-b3@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-p6HFscpjrv7//kE+7L+3Vn00VEDUJB0n6ZrjkTYHrJ58QZ8B3ajSJhRbCcY6guQ3PDjTbxWklyvIN2ojVbIb1A==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/propagation-utils@0.31.3(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/propagator-jaeger@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-pMLgst3QIwrUfepraH5WG7xfpJ8J3CrPKrtINK0t7kBkuu96rn+HDYQ8kt3+0FXvrZI8YJE77MCQwnJWXIrgpA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
-
-  /@opentelemetry/propagator-jaeger@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-nBprRf0+jlgxks78G/xq72PipVK+4or9Ypntw0gVZYNTCSK8rg5SeaGV19tV920CMqBD/9UIOiFr23Li/Q8tiA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-    dev: true
 
-  /@opentelemetry/propagator-jaeger@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-nBprRf0+jlgxks78G/xq72PipVK+4or9Ypntw0gVZYNTCSK8rg5SeaGV19tV920CMqBD/9UIOiFr23Li/Q8tiA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/propagator-b3@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+  '@opentelemetry/propagator-jaeger@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/resources@1.22.0(@opentelemetry/api@1.8.0):
-    resolution: {integrity: sha512-+vNeIFPH2hfcNL0AJk/ykJXoUCtR1YaDUZM+p3wZNU4Hq98gzq+7b43xbkXjadD9VhWIUQqEwXyY64q6msPj6A==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: false
+  '@opentelemetry/redis-common@0.36.2': {}
 
-  /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/resource-detector-aws@2.3.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
 
-  /@opentelemetry/resources@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/resources@1.30.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: false
+      '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
 
-  /@opentelemetry/resources@1.30.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-5mGMjL0Uld/99t7/pcd7CuVtJbkARckLVuiOX84nO8RtLtIz0/J6EOHM2TGvPZ6F4K+XjUq13gMx14w80SVCQg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
-    dev: false
 
-  /@opentelemetry/sdk-logs@0.49.1(@opentelemetry/api-logs@0.49.1)(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-gCzYWsJE0h+3cuh3/cK+9UwlVFyHvj3PReIOCDOmdeXOp90ZjKRoDOJBc3mvk1LL6wyl1RWIivR8Rg9OToyesw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.4.0 <1.9.0'
-      '@opentelemetry/api-logs': '>=0.39.1'
+  '@opentelemetry/resources@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.49.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
 
-  /@opentelemetry/sdk-logs@0.49.1(@opentelemetry/api-logs@0.52.1)(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-gCzYWsJE0h+3cuh3/cK+9UwlVFyHvj3PReIOCDOmdeXOp90ZjKRoDOJBc3mvk1LL6wyl1RWIivR8Rg9OToyesw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.4.0 <1.9.0'
-      '@opentelemetry/api-logs': '>=0.39.1'
+  '@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.52.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
 
-  /@opentelemetry/sdk-logs@0.52.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-MBYh+WcPPsN8YpRHRmK1Hsca9pVlyyKd4BxOC4SsgHACnl/bPp4Cri9hWhVm5+2tiQ9Zf4qSc1Jshw9tOLGWQA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+  '@opentelemetry/sdk-logs@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-    dev: false
+      '@opentelemetry/api-logs': 0.203.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/sdk-logs@0.57.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-6Kbxdu/QE9LWH7+WSLmYo3DjAq+c55TiCLXiXu6b/2m2muy5SyOG2m0MrGqetyRpfYSSbIqHmJoqNVTN3+2a9g==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.4.0 <1.10.0'
+  '@opentelemetry/sdk-logs@0.57.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/api-logs': 0.57.0
       '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 1.30.0(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/sdk-metrics@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-k6iIx6H3TZ+BVMr2z8M16ri2OxWaljg5h8ihGJxi/KQWcjign6FEaEzuigXt5bK9wVEhqAcWLCfarSftaNWkkg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      lodash.merge: 4.6.2
-    dev: true
 
-  /@opentelemetry/sdk-metrics@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-9Mb7q5ioFL4E4dDrc4wC/A3NTHDat44v4I3p2pLPSxRvqUbDIQyMVr9uK+EU69+HWhlET1VaSrRzwdckWqY15Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.10.0'
-    dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      lodash.merge: 4.6.2
-    dev: false
-
-  /@opentelemetry/sdk-metrics@1.30.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-5kcj6APyRMvv6dEIP5plz2qfJAD4OMipBRT11u/pa1a68rHKI2Ln+iXVkAGKgx8o7CXbD7FdPypTUY88ZQgP4Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+  '@opentelemetry/sdk-metrics@1.30.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 1.30.0(@opentelemetry/api@1.9.0)
-    dev: false
-
-  /@opentelemetry/sdk-node@0.49.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-feBIT85ndiSHXsQ2gfGpXC/sNeX4GCHLksC4A9s/bfpUbbgbCSl0RvzZlmEpCHarNrkZMwFRi4H0xFfgvJEjrg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/api-logs': 0.49.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/exporter-trace-otlp-grpc': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/exporter-trace-otlp-http': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/exporter-trace-otlp-proto': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/exporter-zipkin': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-logs': 0.49.1(@opentelemetry/api-logs@0.49.1)(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-metrics': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-node': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
 
-  /@opentelemetry/sdk-node@0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0):
-    resolution: {integrity: sha512-uEG+gtEr6eKd8CVWeKMhH2olcCHM9dEK68pe0qE0be32BcCRsvYURhHaD1Srngh1SQcnQzZ4TP324euxqtBOJA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.3.0 <1.10.0'
+  '@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-grpc': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-http': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-trace-otlp-proto': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/exporter-zipkin': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-logs': 0.52.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-node': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: true
-
-  /@opentelemetry/sdk-trace-base@1.22.0(@opentelemetry/api@1.8.0):
-    resolution: {integrity: sha512-pfTuSIpCKONC6vkTpv6VmACxD+P1woZf4q0K46nSUvXFvOFqjBYKFaAMkKD3M1mlKUUh0Oajwj35qNjMl80m1Q==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/resources': 1.22.0(@opentelemetry/api@1.8.0)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: false
-
-  /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: true
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/sdk-node@0.203.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: false
+      '@opentelemetry/api-logs': 0.203.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-logs-otlp-proto': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-metrics-otlp-proto': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-prometheus': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-grpc': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-http': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-trace-otlp-proto': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/exporter-zipkin': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/propagator-b3': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/propagator-jaeger': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-node': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /@opentelemetry/sdk-trace-base@1.30.0(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-RKQDaDIkV7PwizmHw+rE/FgfB2a6MBx+AEVVlAHXRG1YYxLiBpPX2KhmoB99R5vA4b72iJrjle68NDWnbrE9Dg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/sdk-trace-base@1.30.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.30.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 1.30.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
-    dev: false
-
-  /@opentelemetry/sdk-trace-node@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-gTGquNz7ue8uMeiWPwp3CU321OstQ84r7PCDtOaCicjbJxzvO8RZMlEC4geOipTeiF88kss5n6w+//A0MhP1lQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/context-async-hooks': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/propagator-b3': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/propagator-jaeger': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-      semver: 7.6.3
-    dev: true
 
-  /@opentelemetry/sdk-trace-node@1.25.1(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-nMcjFIKxnFqoez4gUmihdBrbpsEnAX/Xj16sGvZm+guceYE0NE00vLhpDVK6f3q8Q4VFI5xG8JjlXKMB/SkTTQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
-    dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/propagator-b3': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/propagator-jaeger': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.4.1)
-      semver: 7.6.3
-    dev: true
-
-  /@opentelemetry/sdk-trace-node@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-nMcjFIKxnFqoez4gUmihdBrbpsEnAX/Xj16sGvZm+guceYE0NE00vLhpDVK6f3q8Q4VFI5xG8JjlXKMB/SkTTQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/propagator-b3': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/propagator-jaeger': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-      semver: 7.6.3
-    dev: false
-
-  /@opentelemetry/sdk-trace-web@1.22.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-id5bUhWYg475xbm4hjwWA4PnWM4duNK1EyFRkZxa3BZNuCITwiKCLvDkVhlE9RK2kvuDOPmcRxgSbU1apF9/1w==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.9.0'
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/sdk-trace-base@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@opentelemetry/api': 1.4.1
-      '@opentelemetry/core': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.22.0
-    dev: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
 
-  /@opentelemetry/sdk-trace-web@1.25.1(@opentelemetry/api@1.9.0):
-    resolution: {integrity: sha512-SS6JaSkHngcBCNdWGthzcvaKGRnDw2AeP57HyTEileLToJ7WLMeV+064iRlVyoT4+e77MRp2T2dDSrmaUyxoNg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+  '@opentelemetry/sdk-trace-node@2.0.1(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.25.1
-    dev: false
+      '@opentelemetry/context-async-hooks': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/semantic-conventions@1.22.0:
-    resolution: {integrity: sha512-CAOgFOKLybd02uj/GhCdEeeBjOS0yeoDeo/CA7ASBSmenpZHAKGB3iDm/rv3BQLcabb/OprDEsSQ1y0P8A7Siw==}
-    engines: {node: '>=14'}
+  '@opentelemetry/sdk-trace-web@2.0.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
 
-  /@opentelemetry/semantic-conventions@1.25.1:
-    resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==}
-    engines: {node: '>=14'}
+  '@opentelemetry/semantic-conventions@1.28.0': {}
 
-  /@opentelemetry/semantic-conventions@1.28.0:
-    resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==}
-    engines: {node: '>=14'}
-    dev: false
+  '@opentelemetry/semantic-conventions@1.36.0': {}
 
-  /@pkgjs/parseargs@0.11.0:
-    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
-    engines: {node: '>=14'}
-    requiresBuild: true
+  '@opentelemetry/sql-common@0.40.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+
+  '@pkgjs/parseargs@0.11.0':
     optional: true
 
-  /@pkgr/utils@2.3.1:
-    resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==}
-    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
+  '@pkgr/utils@2.3.1':
     dependencies:
       cross-spawn: 7.0.5
       is-glob: 4.0.3
@@ -10741,808 +25236,564 @@ packages:
       picocolors: 1.1.1
       tiny-glob: 0.2.9
       tslib: 2.8.1
-    dev: true
 
-  /@playwright/test@1.37.0:
-    resolution: {integrity: sha512-181WBLk4SRUyH1Q96VZl7BP6HcK0b7lbdeKisn3N/vnjitk+9HbdlFz/L5fey05vxaAhldIDnzo8KUoy8S3mmQ==}
-    engines: {node: '>=16'}
-    hasBin: true
+  '@playwright/test@1.37.0':
     dependencies:
       '@types/node': 20.14.14
       playwright-core: 1.37.0
     optionalDependencies:
       fsevents: 2.3.2
 
-  /@polka/url@0.5.0:
-    resolution: {integrity: sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==}
-    dev: false
+  '@polka/url@0.5.0': {}
 
-  /@polka/url@1.0.0-next.28:
-    resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
-    dev: true
+  '@polka/url@1.0.0-next.28': {}
 
-  /@popperjs/core@2.11.8:
-    resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
-    dev: false
+  '@popperjs/core@2.11.8': {}
 
-  /@prisma/client@5.19.0(prisma@5.19.0):
-    resolution: {integrity: sha512-CzOpau+q1kEWQyoQMvlnXIHqPvwmWbh48xZ4n8KWbAql0p8PC0BIgSTYW5ncxXa4JSEff0tcoxSZB874wDstdg==}
-    engines: {node: '>=16.13'}
-    requiresBuild: true
-    peerDependencies:
-      prisma: '*'
-    peerDependenciesMeta:
-      prisma:
-        optional: true
+  '@prisma/adapter-pg@6.16.0':
     dependencies:
-      prisma: 5.19.0
-    dev: false
+      '@prisma/driver-adapter-utils': 6.16.0
+      pg: 8.15.6
+      postgres-array: 3.0.4
+    transitivePeerDependencies:
+      - pg-native
 
-  /@prisma/client@5.4.1(prisma@5.4.1):
-    resolution: {integrity: sha512-xyD0DJ3gRNfLbPsC+YfMBBuLJtZKQfy1OD2qU/PZg+HKrr7SO+09174LMeTlWP0YF2wca9LxtVd4HnAiB5ketQ==}
-    engines: {node: '>=16.13'}
-    requiresBuild: true
-    peerDependencies:
-      prisma: '*'
-    peerDependenciesMeta:
-      prisma:
-        optional: true
+  '@prisma/adapter-pg@6.20.0-integration-next.8':
+    dependencies:
+      '@prisma/driver-adapter-utils': 6.20.0-integration-next.8
+      pg: 8.16.3
+      postgres-array: 3.0.4
+    transitivePeerDependencies:
+      - pg-native
+
+  '@prisma/client-runtime-utils@6.20.0-integration-next.8': {}
+
+  '@prisma/client@4.9.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))':
+    dependencies:
+      '@prisma/engines-version': 4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5
+    optionalDependencies:
+      prisma: 6.14.0(magicast@0.3.5)(typescript@5.5.4)
+
+  '@prisma/client@6.14.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))(typescript@5.5.4)':
+    optionalDependencies:
+      prisma: 6.14.0(magicast@0.3.5)(typescript@5.5.4)
+      typescript: 5.5.4
+
+  '@prisma/client@6.16.0(prisma@6.16.0(magicast@0.3.5)(typescript@5.5.4))(typescript@5.5.4)':
+    optionalDependencies:
+      prisma: 6.16.0(magicast@0.3.5)(typescript@5.5.4)
+      typescript: 5.5.4
+
+  '@prisma/client@6.19.0(prisma@6.19.0(typescript@5.5.4))(typescript@5.5.4)':
+    optionalDependencies:
+      prisma: 6.19.0(typescript@5.5.4)
+      typescript: 5.5.4
+
+  '@prisma/client@6.20.0-integration-next.8(prisma@6.20.0-integration-next.8(@types/react@19.0.12)(magicast@0.3.5)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.5.4))(typescript@5.5.4)':
+    dependencies:
+      '@prisma/client-runtime-utils': 6.20.0-integration-next.8
+    optionalDependencies:
+      prisma: 6.20.0-integration-next.8(@types/react@19.0.12)(magicast@0.3.5)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.5.4)
+      typescript: 5.5.4
+
+  '@prisma/config@6.14.0(magicast@0.3.5)':
+    dependencies:
+      c12: 3.1.0(magicast@0.3.5)
+      deepmerge-ts: 7.1.5
+      effect: 3.16.12
+      empathic: 2.0.0
+    transitivePeerDependencies:
+      - magicast
+
+  '@prisma/config@6.16.0(magicast@0.3.5)':
     dependencies:
-      '@prisma/engines-version': 5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f
-      prisma: 5.4.1
-    dev: false
+      c12: 3.1.0(magicast@0.3.5)
+      deepmerge-ts: 7.1.5
+      effect: 3.16.12
+      empathic: 2.0.0
+    transitivePeerDependencies:
+      - magicast
+
+  '@prisma/config@6.19.0(magicast@0.3.5)':
+    dependencies:
+      c12: 3.1.0(magicast@0.3.5)
+      deepmerge-ts: 7.1.5
+      effect: 3.18.4
+      empathic: 2.0.0
+    transitivePeerDependencies:
+      - magicast
 
-  /@prisma/debug@5.19.0:
-    resolution: {integrity: sha512-+b/G0ubAZlrS+JSiDhXnYV5DF/aTJ3pinktkiV/L4TtLRLZO6SVGyFELgxBsicCTWJ2ZMu5vEV/jTtYCdjFTRA==}
+  '@prisma/config@6.20.0-integration-next.8(magicast@0.3.5)':
+    dependencies:
+      c12: 3.1.0(magicast@0.3.5)
+      deepmerge-ts: 7.1.5
+      effect: 3.18.4
+      empathic: 2.0.0
+    transitivePeerDependencies:
+      - magicast
 
-  /@prisma/debug@5.3.1:
-    resolution: {integrity: sha512-eYrxqslEKf+wpMFIIHgbcNYuZBXUdiJLA85Or3TwOhgPIN1ZoXT9CwJph3ynW8H1Xg0LkdYLwVmuULCwiMoU5A==}
+  '@prisma/debug@4.16.2':
     dependencies:
       '@types/debug': 4.1.8
       debug: 4.3.4
       strip-ansi: 6.0.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@prisma/engines-version@5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f:
-    resolution: {integrity: sha512-GimI9aZIFy/yvvR11KfXRn3pliFn1QAkdebVlsXlnoh5uk0YhLblVmeYiHfsu+wDA7BeKqYT4sFfzg8mutzuWw==}
+  '@prisma/debug@6.14.0': {}
+
+  '@prisma/debug@6.16.0': {}
+
+  '@prisma/debug@6.19.0': {}
 
-  /@prisma/engines-version@5.4.1-1.2f302df92bd8945e20ad4595a73def5b96afa54f:
-    resolution: {integrity: sha512-+nUQM/y8C+1GG5Ioeqcu6itFslCfxvQSAUVSMC9XM2G2Fcq0F4Afnp6m0pXF6X6iUBWen7jZBPmM9Qlq4Nr3/A==}
-    dev: false
+  '@prisma/debug@6.20.0-integration-next.8': {}
 
-  /@prisma/engines@5.19.0:
-    resolution: {integrity: sha512-UtW+0m4HYoRSSR3LoDGKF3Ud4BSMWYlLEt4slTnuP1mI+vrV3zaDoiAPmejdAT76vCN5UqnWURbkXxf66nSylQ==}
-    requiresBuild: true
+  '@prisma/driver-adapter-utils@6.16.0':
     dependencies:
-      '@prisma/debug': 5.19.0
-      '@prisma/engines-version': 5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f
-      '@prisma/fetch-engine': 5.19.0
-      '@prisma/get-platform': 5.19.0
+      '@prisma/debug': 6.16.0
 
-  /@prisma/engines@5.3.1:
-    resolution: {integrity: sha512-6QkILNyfeeN67BNEPEtkgh3Xo2tm6D7V+UhrkBbRHqKw9CTaz/vvTP/ROwYSP/3JT2MtIutZm/EnhxUiuOPVDA==}
-    requiresBuild: true
-    dev: true
+  '@prisma/driver-adapter-utils@6.20.0-integration-next.8':
+    dependencies:
+      '@prisma/debug': 6.20.0-integration-next.8
+
+  '@prisma/engines-version@4.9.0-42.ceb5c99003b99c9ee2c1d2e618e359c14aef2ea5': {}
+
+  '@prisma/engines-version@6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49': {}
+
+  '@prisma/engines-version@6.16.0-7.1c57fdcd7e44b29b9313256c76699e91c3ac3c43': {}
 
-  /@prisma/engines@5.4.1:
-    resolution: {integrity: sha512-vJTdY4la/5V3N7SFvWRmSMUh4mIQnyb/MNoDjzVbh9iLmEC+uEykj/1GPviVsorvfz7DbYSQC4RiwmlEpTEvGA==}
-    requiresBuild: true
+  '@prisma/engines-version@6.19.0-26.2ba551f319ab1df4bc874a89965d8b3641056773': {}
 
-  /@prisma/fetch-engine@5.19.0:
-    resolution: {integrity: sha512-oOiPNtmJX0cP/ebu7BBEouJvCw8T84/MFD/Hf2zlqjxkK4ojl38bB9i9J5LAxotL6WlYVThKdxc7HqoWnPOhqQ==}
+  '@prisma/engines-version@6.20.0-11.next-80ee0a44bf5668992b0c909c946a755b86b56c95': {}
+
+  '@prisma/engines@6.14.0':
     dependencies:
-      '@prisma/debug': 5.19.0
-      '@prisma/engines-version': 5.19.0-31.5fe21811a6ba0b952a3bc71400666511fe3b902f
-      '@prisma/get-platform': 5.19.0
+      '@prisma/debug': 6.14.0
+      '@prisma/engines-version': 6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49
+      '@prisma/fetch-engine': 6.14.0
+      '@prisma/get-platform': 6.14.0
 
-  /@prisma/fetch-engine@5.3.1:
-    resolution: {integrity: sha512-w1yk1YiK8N82Pobdq58b85l6e8akyrkxuzwV9DoiUTRf3gpsuhJJesHc4Yi0WzUC9/3znizl1UfCsI6dhkj3Vw==}
+  '@prisma/engines@6.16.0':
     dependencies:
-      '@prisma/debug': 5.3.1
-      '@prisma/get-platform': 5.3.1
-      execa: 5.1.1
-      find-cache-dir: 3.3.2
-      fs-extra: 11.1.1
-      hasha: 5.2.2
-      http-proxy-agent: 7.0.0
-      https-proxy-agent: 7.0.2
-      kleur: 4.1.5
-      node-fetch: 2.7.0
-      p-filter: 2.1.0
-      p-map: 4.0.0
-      p-retry: 4.6.2
-      progress: 2.0.3
-      rimraf: 3.0.2
-      temp-dir: 2.0.0
-      tempy: 1.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: true
+      '@prisma/debug': 6.16.0
+      '@prisma/engines-version': 6.16.0-7.1c57fdcd7e44b29b9313256c76699e91c3ac3c43
+      '@prisma/fetch-engine': 6.16.0
+      '@prisma/get-platform': 6.16.0
+
+  '@prisma/engines@6.19.0':
+    dependencies:
+      '@prisma/debug': 6.19.0
+      '@prisma/engines-version': 6.19.0-26.2ba551f319ab1df4bc874a89965d8b3641056773
+      '@prisma/fetch-engine': 6.19.0
+      '@prisma/get-platform': 6.19.0
+
+  '@prisma/engines@6.20.0-integration-next.8':
+    dependencies:
+      '@prisma/debug': 6.20.0-integration-next.8
+      '@prisma/engines-version': 6.20.0-11.next-80ee0a44bf5668992b0c909c946a755b86b56c95
+      '@prisma/fetch-engine': 6.20.0-integration-next.8
+      '@prisma/get-platform': 6.20.0-integration-next.8
+
+  '@prisma/fetch-engine@6.14.0':
+    dependencies:
+      '@prisma/debug': 6.14.0
+      '@prisma/engines-version': 6.14.0-25.717184b7b35ea05dfa71a3236b7af656013e1e49
+      '@prisma/get-platform': 6.14.0
+
+  '@prisma/fetch-engine@6.16.0':
+    dependencies:
+      '@prisma/debug': 6.16.0
+      '@prisma/engines-version': 6.16.0-7.1c57fdcd7e44b29b9313256c76699e91c3ac3c43
+      '@prisma/get-platform': 6.16.0
+
+  '@prisma/fetch-engine@6.19.0':
+    dependencies:
+      '@prisma/debug': 6.19.0
+      '@prisma/engines-version': 6.19.0-26.2ba551f319ab1df4bc874a89965d8b3641056773
+      '@prisma/get-platform': 6.19.0
+
+  '@prisma/fetch-engine@6.20.0-integration-next.8':
+    dependencies:
+      '@prisma/debug': 6.20.0-integration-next.8
+      '@prisma/engines-version': 6.20.0-11.next-80ee0a44bf5668992b0c909c946a755b86b56c95
+      '@prisma/get-platform': 6.20.0-integration-next.8
 
-  /@prisma/generator-helper@5.3.1:
-    resolution: {integrity: sha512-zrYS0iHLgPlOJjYnd5KvVMMvSS+ktOL39EwooS5EnyvfzwfzxlKCeOUgxTfiKYs0WUWqzEvyNAYtramYgSknsQ==}
+  '@prisma/generator-helper@4.16.2':
     dependencies:
-      '@prisma/debug': 5.3.1
+      '@prisma/debug': 4.16.2
       '@types/cross-spawn': 6.0.2
       cross-spawn: 7.0.5
       kleur: 4.1.5
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@prisma/get-platform@5.19.0:
-    resolution: {integrity: sha512-s9DWkZKnuP4Y8uy6yZfvqQ/9X3/+2KYf3IZUVZz5OstJdGBJrBlbmIuMl81917wp5TuK/1k2TpHNCEdpYLPKmg==}
+  '@prisma/get-platform@6.14.0':
     dependencies:
-      '@prisma/debug': 5.19.0
+      '@prisma/debug': 6.14.0
 
-  /@prisma/get-platform@5.3.1:
-    resolution: {integrity: sha512-3IiZY2BUjKnAuZ0569zppZE6/rZbVAM09//c2nvPbbkGG9MqrirA8fbhhF7tfVmhyVfdmVCHnf/ujWPHJ8B46Q==}
+  '@prisma/get-platform@6.16.0':
     dependencies:
-      '@prisma/debug': 5.3.1
-      escape-string-regexp: 4.0.0
-      execa: 5.1.1
-      fs-jetpack: 5.1.0
-      kleur: 4.1.5
-      replace-string: 3.1.0
-      strip-ansi: 6.0.1
-      tempy: 1.0.1
-      terminal-link: 2.1.1
-      ts-pattern: 4.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
+      '@prisma/debug': 6.16.0
 
-  /@prisma/instrumentation@5.11.0:
-    resolution: {integrity: sha512-ou4nvDpNEY6+t3Dn9juOTz6tK33D0Y4XXkEZ2uPd8KH6Mqmc+4LYOOm470DP7noj7dyJjuGiM+wpPk//HKrcDg==}
+  '@prisma/get-platform@6.19.0':
     dependencies:
-      '@opentelemetry/api': 1.8.0
-      '@opentelemetry/instrumentation': 0.49.1(@opentelemetry/api@1.8.0)
-      '@opentelemetry/sdk-trace-base': 1.22.0(@opentelemetry/api@1.8.0)
+      '@prisma/debug': 6.19.0
+
+  '@prisma/get-platform@6.20.0-integration-next.8':
+    dependencies:
+      '@prisma/debug': 6.20.0-integration-next.8
+
+  '@prisma/instrumentation@6.11.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /@prisma/internals@5.3.1:
-    resolution: {integrity: sha512-zkW73hPHHNrMD21PeYgCTBfMu71vzJf+WtfydtJbS0JVJKyLfOel0iWSQg7wjNeQfccKp+NdHJ/5rTJ4NEUzgA==}
-    dependencies:
-      '@antfu/ni': 0.21.8
-      '@opentelemetry/api': 1.4.1
-      '@prisma/debug': 5.3.1
-      '@prisma/engines': 5.3.1
-      '@prisma/fetch-engine': 5.3.1
-      '@prisma/generator-helper': 5.3.1
-      '@prisma/get-platform': 5.3.1
-      '@prisma/prisma-schema-wasm': 5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59
-      archiver: 5.3.2
-      arg: 5.0.2
-      checkpoint-client: 1.1.27
-      cli-truncate: 2.1.0
-      dotenv: 16.0.3
-      escape-string-regexp: 4.0.0
-      execa: 5.1.1
-      find-up: 5.0.0
-      fp-ts: 2.16.1
-      fs-extra: 11.1.1
-      fs-jetpack: 5.1.0
-      global-dirs: 3.0.1
-      globby: 11.1.0
-      indent-string: 4.0.0
-      is-windows: 1.0.2
-      is-wsl: 2.2.0
-      kleur: 4.1.5
-      new-github-issue-url: 0.2.1
-      node-fetch: 2.7.0
-      npm-packlist: 5.1.3
-      open: 7.4.2
-      p-map: 4.0.0
-      prompts: 2.4.2
-      read-pkg-up: 7.0.1
-      replace-string: 3.1.0
-      resolve: 1.22.4
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      strip-indent: 3.0.0
-      temp-dir: 2.0.0
-      tempy: 1.0.1
-      terminal-link: 2.1.1
-      tmp: 0.2.1
-      ts-pattern: 4.3.0
+
+  '@prisma/instrumentation@6.14.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
-      - encoding
       - supports-color
-    dev: true
 
-  /@prisma/prisma-schema-wasm@5.3.1-2.61e140623197a131c2a6189271ffee05a7aa9a59:
-    resolution: {integrity: sha512-+zUI7NQDXfcNnU8HgrAj4jRMv8yRfITLzcfv0Urf0adKimM+hkkVG4rX38i9zWMlxekkEBw7NLFx3Gxxy8d3iQ==}
-    dev: true
+  '@prisma/studio-core-licensed@0.6.0(@types/react@19.0.12)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)':
+    dependencies:
+      '@types/react': 19.0.12
+      react: 19.1.0
+      react-dom: 19.1.0(react@19.1.0)
 
-  /@protobufjs/aspromise@1.1.2:
-    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+  '@protobuf-ts/runtime@2.11.1': {}
 
-  /@protobufjs/base64@1.1.2:
-    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+  '@protobufjs/aspromise@1.1.2': {}
 
-  /@protobufjs/codegen@2.0.4:
-    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+  '@protobufjs/base64@1.1.2': {}
 
-  /@protobufjs/eventemitter@1.1.0:
-    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+  '@protobufjs/codegen@2.0.4': {}
 
-  /@protobufjs/fetch@1.1.0:
-    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+  '@protobufjs/eventemitter@1.1.0': {}
+
+  '@protobufjs/fetch@1.1.0':
     dependencies:
       '@protobufjs/aspromise': 1.1.2
       '@protobufjs/inquire': 1.1.0
 
-  /@protobufjs/float@1.0.2:
-    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+  '@protobufjs/float@1.0.2': {}
 
-  /@protobufjs/inquire@1.1.0:
-    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+  '@protobufjs/inquire@1.1.0': {}
 
-  /@protobufjs/path@1.1.2:
-    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+  '@protobufjs/path@1.1.2': {}
 
-  /@protobufjs/pool@1.1.0:
-    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+  '@protobufjs/pool@1.1.0': {}
 
-  /@protobufjs/utf8@1.1.0:
-    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+  '@protobufjs/utf8@1.1.0': {}
 
-  /@puppeteer/browsers@2.4.0:
-    resolution: {integrity: sha512-x8J1csfIygOwf6D6qUAZ0ASk3z63zPb7wkNeHRerCMh82qWKUrOgkuP005AJC8lDL6/evtXETGEJVcwykKT4/g==}
-    engines: {node: '>=18'}
-    hasBin: true
+  '@puppeteer/browsers@2.10.6':
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       extract-zip: 2.0.1
       progress: 2.0.3
-      proxy-agent: 6.4.0
-      semver: 7.6.3
-      tar-fs: 3.0.9
-      unbzip2-stream: 1.4.3
+      proxy-agent: 6.5.0
+      semver: 5.7.2
+      tar-fs: 3.1.0
       yargs: 17.7.2
     transitivePeerDependencies:
+      - bare-abort-controller
       - bare-buffer
       - supports-color
-    dev: false
 
-  /@radix-ui/colors@1.0.1:
-    resolution: {integrity: sha512-xySw8f0ZVsAEP+e7iLl3EvcBXX7gsIlC1Zso/sPBW9gIWerBTgz6axrjU+MZ39wD+WFi5h5zdWpsg3+hwt2Qsg==}
-    dev: false
+  '@radix-ui/colors@1.0.1': {}
 
-  /@radix-ui/number@1.0.0:
-    resolution: {integrity: sha512-Ofwh/1HX69ZfJRiRBMTy7rgjAzHmwe4kW9C9Y99HTRUcYLUuVT0KESFj15rPjRgKJs20GPq8Bm5aEDJ8DuA3vA==}
+  '@radix-ui/number@1.0.0':
     dependencies:
-      '@babel/runtime': 7.26.7
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /@radix-ui/number@1.0.1:
-    resolution: {integrity: sha512-T5gIdVO2mmPW3NNhjNgEP3cqMXjXL9UbO0BzWcXfvdBs+BohbQxvd/K5hSVKmn9/lbTdsQVKbUcP5WLCwvUbBg==}
+  '@radix-ui/number@1.0.1':
     dependencies:
-      '@babel/runtime': 7.26.7
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /@radix-ui/number@1.1.0:
-    resolution: {integrity: sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==}
-    dev: false
+  '@radix-ui/number@1.1.0': {}
 
-  /@radix-ui/primitive@1.0.0:
-    resolution: {integrity: sha512-3e7rn8FDMin4CgeL7Z/49smCA3rFYY3Ha2rUQ7HRWFadS5iCRw08ZgVT1LaNTCNqgvrUiyczLflrVrF0SRQtNA==}
+  '@radix-ui/primitive@1.0.0':
     dependencies:
-      '@babel/runtime': 7.26.7
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /@radix-ui/primitive@1.0.1:
-    resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
+  '@radix-ui/primitive@1.0.1':
     dependencies:
-      '@babel/runtime': 7.26.7
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /@radix-ui/primitive@1.1.0:
-    resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
-    dev: false
+  '@radix-ui/primitive@1.1.0': {}
 
-  /@radix-ui/primitive@1.1.2:
-    resolution: {integrity: sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==}
-    dev: false
+  '@radix-ui/primitive@1.1.2': {}
 
-  /@radix-ui/react-accordion@1.2.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-l3W5D54emV2ues7jjeG1xcyN7S3jnK3zE2zHqgn0CmMsy9lNJwmgcrmaxS+7ipw15FAivzKNzH3d5EcGoFKw0A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-accordion@1.2.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
-      '@radix-ui/react-collapsible': 1.1.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-collapsible': 1.1.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-collection': 1.1.7(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.1.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-direction': 1.1.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-id': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-alert-dialog@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-jbfBCRlKYlhbitueOAv7z74PXYeIQmWpKwm3jllsdkw7fGWNkxqP3v0nY9WmOzcPqpQuoorNtvViBgL46n5gVg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-alert-dialog@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-dialog': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dialog': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-arrow@1.0.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-fqYwhhI9IarZ0ll2cUSfKuXHlJK0qE4AfnRrPBbRwEH/4mGQn04/QFGomLi8TXWIdv9WJk//KgGm+aDxVIr1wA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-arrow@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-arrow@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-avatar@1.1.3(@types/react-dom@19.0.4)(@types/react@19.0.12)(react-dom@19.0.0)(react@19.0.0):
-    resolution: {integrity: sha512-Paen00T4P8L8gd9bNsRMw7Cbaz85oxiv+hzomsRZgFm2byltPFDtfcoqlWJ8GyZlIBWgLssJlzLCnKU0G0302g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-avatar@1.1.3(@types/react-dom@19.0.4(@types/react@19.0.12))(@types/react@19.0.12)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)':
     dependencies:
       '@radix-ui/react-context': 1.1.1(@types/react@19.0.12)(react@19.0.0)
-      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@19.0.4)(@types/react@19.0.12)(react-dom@19.0.0)(react@19.0.0)
+      '@radix-ui/react-primitive': 2.0.2(@types/react-dom@19.0.4(@types/react@19.0.12))(@types/react@19.0.12)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@19.0.12)(react@19.0.0)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@19.0.12)(react@19.0.0)
-      '@types/react': 19.0.12
-      '@types/react-dom': 19.0.4(@types/react@19.0.12)
       react: 19.0.0
       react-dom: 19.0.0(react@19.0.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 19.0.12
+      '@types/react-dom': 19.0.4(@types/react@19.0.12)
 
-  /@radix-ui/react-collapsible@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-UBmVDkmR6IvDsloHVN+3rtx4Mi5TFvylYXpluuv0f37dtaz3H99bp8No0LGXRigVpl3UAT4l9j6bIchh42S/Gg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-collapsible@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-id': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
-
-  /@radix-ui/react-collapsible@1.1.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-2qrRsVGSCYasSz1RFOorXwl0H7g7J1frQtgpQgYrt+MOidtPAINHn9CPovQXb83r8ahapdx3Tu0fa/pdFFSdPg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
+
+  '@radix-ui/react-collapsible@1.1.11(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/primitive': 1.1.2
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.1.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-id': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-presence': 1.1.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.1.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-collection@1.0.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-collection@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.1(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-collection@1.0.2(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-s8WdQQ6wNXpaxdZ308KSr8fEWGrg4un8i4r/w7fhiS4ElRNjk5rRcl0/C6TANG2LvLOGIxtzo/jAg6Qf73TEBw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-collection@1.0.2(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.3.1)
       '@radix-ui/react-context': 1.0.0(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot': 1.0.1(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-3SzW+0PW7yBBoQlT8wNcGtaxaD0XSu0uLUFgrtHY08Acx05TaHaOmVLR73c0j/cqpDy53KBMO7s0dx2wmOIDIA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-collection@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-collection@1.1.7(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-collection@1.1.7(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.1.2(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.2.3(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-compose-refs@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-compose-refs@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-compose-refs@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-0KaSv6sx787/hK3eF53iOkiSLwAGlFMx5lotrqD2pTjB18KbybKoEIgkNZTKC60YECDQTKGTRcDBILwZVqVKvA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-compose-refs@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.69)(react@18.3.1):
-    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.2.69)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-compose-refs@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.3.1
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-compose-refs@1.1.0(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.1.0(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-compose-refs@1.1.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.1.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-compose-refs@1.1.1(@types/react@19.0.12)(react@19.0.0):
-    resolution: {integrity: sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.1.1(@types/react@19.0.12)(react@19.0.0)':
     dependencies:
-      '@types/react': 19.0.12
       react: 19.0.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 19.0.12
 
-  /@radix-ui/react-compose-refs@1.1.2(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-context@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-context@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-context@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-1pVM9RfOQ+n/N5PJK33kRSKsr1glNxomxONs5c49MliinBY6Yw2Q995qfBUUo0/Mbg05B/sGA0gkgPI7kmSHBg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-context@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-context@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-context@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-context@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-context@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.3.1
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-context@1.1.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-context@1.1.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-context@1.1.1(@types/react@19.0.12)(react@19.0.0):
-    resolution: {integrity: sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-context@1.1.1(@types/react@19.0.12)(react@19.0.0)':
     dependencies:
-      '@types/react': 19.0.12
       react: 19.0.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 19.0.12
 
-  /@radix-ui/react-context@1.1.2(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-context@1.1.2(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-dialog@1.0.3(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-owNhq36kNPqC2/a+zJRioPg6HHnTn5B/sh/NjTY8r4W9g1L5VJlrzZIVcBr7R9Mg8iLjVmh6MGgMlfoVf/WO/A==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-dialog@1.0.3(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.0.0(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-id': 1.0.0(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.1(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0)
       aria-hidden: 1.2.3
@@ -11551,461 +25802,266 @@ packages:
       react-remove-scroll: 2.5.5(@types/react@18.2.69)(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@radix-ui/react-dialog@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-dialog@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-id': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       aria-hidden: 1.2.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-remove-scroll: 2.5.5(@types/react@18.2.69)(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-dialog@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-dialog@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-focus-scope': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-id': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       aria-hidden: 1.2.3
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
       react-remove-scroll: 2.5.5(@types/react@18.3.1)(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-direction@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-2HV05lGUgYcA6xgLQ4BKPDmtL+QbIZYH5fCOTAOOcJ5O0QbWS3i9lKaurLzliYUDhORI2Qr3pyjhJh44lKA3rQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-direction@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-direction@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-2HV05lGUgYcA6xgLQ4BKPDmtL+QbIZYH5fCOTAOOcJ5O0QbWS3i9lKaurLzliYUDhORI2Qr3pyjhJh44lKA3rQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-direction@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-direction@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-direction@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-direction@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-direction@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@types/react': 18.3.1
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-direction@1.1.0(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-direction@1.1.0(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-direction@1.1.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-direction@1.1.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-dismissable-layer@1.0.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-nXZOvFjOuHS1ovumntGV7NNoLaEp9JEvTht3MBjP44NSW5hUKj/8OnfN3+8WmB+CEhN44XaGhpHoSsUIEl5P7Q==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-dismissable-layer@1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-escape-keydown': 1.0.2(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-7UpBa/RKMoHJYjie1gkF1DlK8l1fdU/VKDpoS3rCCo8YBJR294GwcEHyxHw72yvphJ7ld0AXEcSLAzY2F/WyCg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-dismissable-layer@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-aJeDjQhywg9LBu2t/At58hCvr7pEm0o2Ke1x33B+MhjNmmZ17sy4KImo0KPLgsnc/zN7GPdce8Cnn0SWvwZO7g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-dismissable-layer@1.0.5(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-escape-keydown': 1.0.3(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-focus-guards@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-UagjDk4ijOAnGu4WMUPj9ahi7/zJJqNZ9ZAiGPp7waUWJO0O1aWXi/udPphI0IUjvrhBsZJGSN66dR2dsueLWQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-focus-guards@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-focus-guards@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.27.0
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-Rect2dWbQ8waGzhMavsIbmSVCgYxkXLxxR3ZvCX79JOglzdEy4JXMb98lq4hPxUbLr77nP0UOGf4rcMU+s1pUA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-focus-guards@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
       '@babel/runtime': 7.27.0
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-focus-scope@1.0.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-spwXlNTfeIprt+kaEWE/qYuYT3ZAqJiAGjN/JgdvgVDTu8yc+HuX+WOWXrKliKnLnwck0F6JDkqIERncnih+4A==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-focus-scope@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-sL04Mgvf+FmyvZeYfNu1EPAaaxD+aw7cYeIB9L9Fvq8+urhltTRaEo5ysKOpHuKPclsZcSUMKlN05x4u+CINpA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-focus-scope@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-icons@1.3.0(react@18.3.1):
-    resolution: {integrity: sha512-jQxj/0LKgp+j9BiTXz3O3sgs26RNet2iLWmsPyRz2SIcR4q/4SbazXfnYwbAr+vLYKSfc7qxzyGQA1HLlYiuNw==}
-    peerDependencies:
-      react: ^16.x || ^17.x || ^18.x
+  '@radix-ui/react-icons@1.3.0(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-id@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-id@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-id@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-Q6iAB/U7Tq3NTolBBQbHTgclPmGWE3OlktGGqrClPozSw4vkQ1DfQAOtzgRPecKsMdJINE05iaoDUG8tRzCBjw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-id@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.3.1)
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-id@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-id@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-id@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-id@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-id@1.1.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-id@1.1.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-label@2.0.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-qcfbS3B8hTYmEO44RNcXB6pegkxRsJIbdxTMu0PEX0Luv5O2DvTIwwVYxQfUwLpM88EL84QRPLOLgwUSApMsLQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-label@2.0.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-popover@1.0.5(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-GRHZ8yD12MrN2NLobHPE8Rb5uHTxd9x372DE9PPNnBjpczAQHcZ5ne0KXG4xpf+RDdXSzdLv9ym6mYJCDTaUZg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-popover@1.0.5(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.0.0(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-id': 1.0.0(react@18.2.0)
-      '@radix-ui/react-popper': 1.1.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-popper': 1.1.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.1(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0)
       aria-hidden: 1.2.3
@@ -12014,55 +26070,39 @@ packages:
       react-remove-scroll: 2.5.5(@types/react@18.2.69)(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@radix-ui/react-popover@1.0.7(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-shtvVnlsxT6faMnK/a7n0wptwBD23xc1Z5mdrtKLwVEfsEMXodS0r5s0/g5P0hX//EKYZS2sxUjqfzlg52ZSnQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-popover@1.0.7(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-dismissable-layer': 1.0.5(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-focus-guards': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-focus-scope': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-id': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-popper': 1.1.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-portal': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       aria-hidden: 1.2.4
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
       react-remove-scroll: 2.5.5(@types/react@18.3.1)(react@18.3.1)
-    dev: false
-
-  /@radix-ui/react-popper@1.1.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-keYDcdMPNMjSC8zTsZ8wezUMiWM9Yj14wtF3s0PTIs9srnEPC9Kt2Gny1T3T81mmSeyDjZxsD9N5WCwNNb712w==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
+
+  '@radix-ui/react-popper@1.1.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@floating-ui/react-dom': 0.7.2(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-arrow': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@babel/runtime': 7.27.0
+      '@floating-ui/react-dom': 0.7.2(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-arrow': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-rect': 1.0.0(react@18.2.0)
@@ -12072,1370 +26112,775 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-1CnGGfFi/bbqtJZZ0P/NQY20xdG3E0LALJaLUEoKwPLwl6PPPfbeiCqMVQnhoFRAxjJj4RpBRJzDmUgsex2tSg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-popper@1.1.2(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@babel/runtime': 7.27.0
+      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-rect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-size': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/rect': 1.0.1
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-cKpopj/5RHZWjrbF2846jBNacjQVwkP068DfmgrNJXpvVWrOvlAmE9xSiy5OqeE+Gi8D9fP+oDhUnPqNMY8/5w==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-popper@1.1.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@babel/runtime': 7.27.0
+      '@floating-ui/react-dom': 2.0.9(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-arrow': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-rect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-size': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/rect': 1.0.1
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-portal@1.0.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-swu32idoCW7KA2VEiUZGBSu9nB6qwGdV6k6HYhUoOo3M1FFpD+VgLzUqtt3mwL1ssz7r2x8MggpLSQach2Xy/Q==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-portal@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.27.0
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-xLYZeHrWoPmA5mEKEfZZevoVRK/Q43GfzRXkWV6qawIWWK8t6ifIiLQdd7rmQ4Vk1bmI21XhqF9BN3jWf+phpA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-portal@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@babel/runtime': 7.27.0
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
-
-  /@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-Qki+C/EuGUVCQTOTD5vzJzJuMUlewbzuKyUy+/iHM2uwGiru9gZeBJtHAPKAEkB5KWGi9mP/CHKcY0wt1aW45Q==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.27.4
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+    optionalDependencies:
       '@types/react': 18.3.1
       '@types/react-dom': 18.2.7
+
+  '@radix-ui/react-portal@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-portal@1.1.9(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-portal@1.1.9(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-presence@1.0.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-presence@1.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-presence@1.0.0(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-A+6XEvN01NfVWiKu38ybawfHsBjWum42MRPnEuqPsBZ4eV7e/7K321B5VgYMPv3Xx5An6o1/l9ZuDBgmcmWK3w==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-presence@1.0.0(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-presence@1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-presence@1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-presence@1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-presence@1.1.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-presence@1.1.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-primitive@1.0.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-primitive@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-slot': 1.0.1(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-primitive@1.0.2(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-zY6G5Qq4R8diFPNwtyoLRZBxzu1Z+SXMlfYpChN7Dv8gvmx9X3qhDqiLWvKseKVJMuedFeU/Sa0Sy/Ia+t06Dw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-primitive@1.0.2(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-slot': 1.0.1(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-slot': 1.0.2(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
-
-  /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-    dependencies:
-      '@babel/runtime': 7.26.7
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
+    optionalDependencies:
+      '@types/react': 18.2.69
       '@types/react-dom': 18.2.7
-      react: 18.3.1
-      react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@radix-ui/react-primitive@2.0.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-primitive@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
-      react: 18.3.1
-      react-dom: 18.2.0(react@18.3.1)
-    dev: false
-
-  /@radix-ui/react-primitive@2.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.2.0(react@18.3.1)
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
+
+  '@radix-ui/react-primitive@2.0.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@radix-ui/react-slot': 1.1.1(@types/react@18.3.1)(react@18.3.1)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.1)(react@18.3.1)
+      react: 18.3.1
+      react-dom: 18.2.0(react@18.3.1)
+    optionalDependencies:
       '@types/react': 18.3.1
       '@types/react-dom': 18.2.7
+
+  '@radix-ui/react-primitive@2.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
+    dependencies:
+      '@radix-ui/react-slot': 1.1.1(@types/react@18.3.1)(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-primitive@2.0.2(@types/react-dom@19.0.4)(@types/react@19.0.12)(react-dom@19.0.0)(react@19.0.0):
-    resolution: {integrity: sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-primitive@2.0.2(@types/react-dom@19.0.4(@types/react@19.0.12))(@types/react@19.0.12)(react-dom@19.0.0(react@19.0.0))(react@19.0.0)':
     dependencies:
       '@radix-ui/react-slot': 1.1.2(@types/react@19.0.12)(react@19.0.0)
-      '@types/react': 19.0.12
-      '@types/react-dom': 19.0.4(@types/react@19.0.12)
       react: 19.0.0
       react-dom: 19.0.0(react@19.0.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 19.0.12
+      '@types/react-dom': 19.0.4(@types/react@19.0.12)
 
-  /@radix-ui/react-primitive@2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-primitive@2.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@radix-ui/react-slot': 1.2.3(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-progress@1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-6diOawA84f/eMxFHcWut0aE1C2kyE9dOyCTQOMRR2C/qPiXz/X0SaiA/RLbapQaXUCmy0/hLMf9meSccD1N0pA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-progress@1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/react-context': 1.1.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
+      '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-radio-group@1.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-x+yELayyefNeKeTx4fjK6j99Fs6c4qKm3aY38G3swQVTN6xMpsrbigC0uHs2L//g8q4qR7qOcww8430jJmi2ag==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-radio-group@1.1.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-direction': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-roving-focus@1.0.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-stjCkIoMe6h+1fWtXlA6cRfikdBzCLp3SnVk7c48cv/uy3DTGoXhN76YaOYUJuy3aEDvDIKwKR5KSmvrtPvQPQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-roving-focus@1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
-      '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
       '@radix-ui/react-direction': 1.0.0(react@18.2.0)
       '@radix-ui/react-id': 1.0.0(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-roving-focus@1.0.3(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-stjCkIoMe6h+1fWtXlA6cRfikdBzCLp3SnVk7c48cv/uy3DTGoXhN76YaOYUJuy3aEDvDIKwKR5KSmvrtPvQPQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-roving-focus@1.0.3(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
-      '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.0(react@18.3.1)
       '@radix-ui/react-context': 1.0.0(react@18.3.1)
       '@radix-ui/react-direction': 1.0.0(react@18.3.1)
       '@radix-ui/react-id': 1.0.0(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-direction': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-id': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-direction': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-id': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-scroll-area@1.2.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-q2jMBdsJ9zB7QG6ngQNzNwlvxLQqONyL58QbEGwuyRZZb/ARQwk3uQVbCF7GvQVOtV6EU/pDxAw3zRzJZI3rpQ==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-scroll-area@1.2.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
       '@radix-ui/number': 1.1.0
       '@radix-ui/primitive': 1.1.0
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.1.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-direction': 1.1.0(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-presence': 1.1.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-select@1.2.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-GULRMITaOHNj79BZvQs3iZO0+f2IgI8g5HDhMi7Bnc13t7IlG86NFtOCfTLme4PNZdEtU+no+oGgcl6IFiphpQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-select@1.2.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/number': 1.0.0
       '@radix-ui/primitive': 1.0.0
-      '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-collection': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
       '@radix-ui/react-direction': 1.0.0(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-focus-guards': 1.0.0(react@18.2.0)
-      '@radix-ui/react-focus-scope': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-focus-scope': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-id': 1.0.0(react@18.2.0)
-      '@radix-ui/react-popper': 1.1.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-popper': 1.1.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.1(react@18.2.0)
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0)
       '@radix-ui/react-use-previous': 1.0.0(react@18.2.0)
-      '@radix-ui/react-visually-hidden': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       aria-hidden: 1.2.3
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-remove-scroll: 2.5.5(@types/react@18.2.69)(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@radix-ui/react-slider@1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-NKs15MJylfzVsCagVSWKhGGLNR1W9qWs+HtgbmjjVUB3B9+lb3PYoXxVju3kOrpf0VKyVCtZp+iTwVoqpa1Chw==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-slider@1.1.2(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.22.5
+      '@babel/runtime': 7.27.0
       '@radix-ui/number': 1.0.1
       '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-collection': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-direction': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-slot@1.0.1(react@18.2.0):
-    resolution: {integrity: sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-slot@1.0.1(react@18.2.0)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-slot@1.0.1(react@18.3.1):
-    resolution: {integrity: sha512-avutXAFL1ehGvAXtPquu0YK5oz6ctS474iM3vNGQIkswrVhdrS52e3uoMQBzZhNRAIE0jBnUyXWNmSjGHhCFcw==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-slot@1.0.1(react@18.3.1)':
     dependencies:
       '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.3.1)
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-slot@1.0.2(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-slot@1.0.2(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-slot@1.0.2(@types/react@18.2.69)(react@18.3.1):
-    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-slot@1.0.2(@types/react@18.2.69)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.3.1)
-      '@types/react': 18.2.69
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-slot@1.0.2(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-slot@1.0.2(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-slot@1.1.0(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-slot@1.1.0(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-slot@1.1.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-slot@1.1.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-slot@1.1.2(@types/react@19.0.12)(react@19.0.0):
-    resolution: {integrity: sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-slot@1.1.2(@types/react@19.0.12)(react@19.0.0)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.1(@types/react@19.0.12)(react@19.0.0)
-      '@types/react': 19.0.12
       react: 19.0.0
-    dev: false
-
-  /@radix-ui/react-slot@1.2.3(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      react: 18.2.0
-    dev: false
-
-  /@radix-ui/react-switch@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+    optionalDependencies:
+      '@types/react': 19.0.12
+
+  '@radix-ui/react-slot@1.2.3(@types/react@18.2.69)(react@18.2.0)':
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@18.2.69)(react@18.2.0)
+      react: 18.2.0
+    optionalDependencies:
+      '@types/react': 18.2.69
+
+  '@radix-ui/react-switch@1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-context': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-previous': 1.0.1(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-size': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
-      '@types/react-dom': 18.2.7
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-tabs@1.0.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-4CkF/Rx1GcrusI/JZ1Rvyx4okGUs6wEenWA0RG/N+CwkRhTy7t54y7BLsWUXrAz/GRbBfHQg/Odfs/RoW0CiRA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-tabs@1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
       '@radix-ui/react-direction': 1.0.0(react@18.2.0)
       '@radix-ui/react-id': 1.0.0(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-roving-focus': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-roving-focus': 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-tabs@1.0.3(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-4CkF/Rx1GcrusI/JZ1Rvyx4okGUs6wEenWA0RG/N+CwkRhTy7t54y7BLsWUXrAz/GRbBfHQg/Odfs/RoW0CiRA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-tabs@1.0.3(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
       '@radix-ui/react-context': 1.0.0(react@18.3.1)
       '@radix-ui/react-direction': 1.0.0(react@18.3.1)
       '@radix-ui/react-id': 1.0.0(react@18.3.1)
-      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-roving-focus': 1.0.3(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-roving-focus': 1.0.3(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /@radix-ui/react-toggle-group@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-Uaj/M/cMyiyT9Bx6fOZO0SAG4Cls0GptBWiBmBxofmDbNVnYYoyRWj/2M/6VCi/7qcXFWnHhRUfdfZFvvkuu8A==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-toggle-group@1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-direction': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-toggle': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-roving-focus': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-toggle': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-Pkqg3+Bc98ftZGsl60CLANXQBBQ4W3mTFS9EJvNxKMZ7magklKV69/id1mlAlOFDDfHvlCms0fx8fA4CMKDJHg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-toggle@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-tooltip@1.0.5(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-cDKVcfzyO6PpckZekODJZDe5ZxZ2fCZlzKzTmPhe4mX9qTHRfLcKgqb0OKf22xLwDequ2tVleim+ZYx3rabD5w==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-tooltip@1.0.5(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.20.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.0
       '@radix-ui/react-compose-refs': 1.0.0(react@18.2.0)
       '@radix-ui/react-context': 1.0.0(react@18.2.0)
-      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-dismissable-layer': 1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-id': 1.0.0(react@18.2.0)
-      '@radix-ui/react-popper': 1.1.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0)(react@18.2.0)
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-popper': 1.1.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-portal': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-presence': 1.0.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@radix-ui/react-slot': 1.0.1(react@18.2.0)
       '@radix-ui/react-use-controllable-state': 1.0.0(react@18.2.0)
-      '@radix-ui/react-visually-hidden': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@radix-ui/react-visually-hidden': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@radix-ui/react-tooltip@1.0.6(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-DmNFOiwEc2UDigsYj6clJENma58OelxD24O4IODoZ+3sQc3Zb+L8w1EP+y9laTuKCLAysPw4fD6/v0j4KNV8rg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-tooltip@1.0.6(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/primitive': 1.0.1
       '@radix-ui/react-compose-refs': 1.0.1(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-context': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-dismissable-layer': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-id': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-popper': 1.1.2(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-portal': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
       '@radix-ui/react-use-controllable-state': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
+      '@radix-ui/react-visually-hidden': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/react-use-callback-ref@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-callback-ref@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-callback-ref@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-GZtyzoHz95Rhs6S63D2t/eqvdFCm7I+yHMLVQheKM7nBD8mbZIt+ct1jz4536MDnaOGKIxynJ8eHTkVGVVkoTg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-callback-ref@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-D94LjX4Sp0xJFVaoQOd3OO9k7tpBYNOXdVhkltUbGv2Qb9OXdrg/CpsjlZv7ia14Sylv398LswWBVVu5nqKzAQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-callback-ref@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@types/react': 18.3.1
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-callback-ref@1.1.0(@types/react@19.0.12)(react@19.0.0):
-    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@19.0.12)(react@19.0.0)':
     dependencies:
-      '@types/react': 19.0.12
       react: 19.0.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 19.0.12
 
-  /@radix-ui/react-use-controllable-state@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-controllable-state@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-controllable-state@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-FohDoZvk3mEXh9AWAVyRTYR4Sq7/gavuofglmiXB2g1aKyboUD4YtgWxKj8O5n+Uak52gXQ4wKz5IFST4vtJHg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-controllable-state@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.3.1)
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-controllable-state@1.2.2(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@radix-ui/react-use-effect-event': 0.0.2(@types/react@18.2.69)(react@18.2.0)
       '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-effect-event@0.0.2(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
       '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-escape-keydown@1.0.2(react@18.2.0):
-    resolution: {integrity: sha512-DXGim3x74WgUv+iMNCF+cAo8xUHHeqvjx8zs7trKf+FkQKPQXLk2sX7Gx1ysH7Q76xCpZuxIJE7HLPxRE+Q+GA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-escape-keydown@1.0.2(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-layout-effect@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-layout-effect@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-layout-effect@1.0.0(react@18.3.1):
-    resolution: {integrity: sha512-6Tpkq+R6LOlmQb1R5NNETLG0B4YP0wc+klfXafpUCj6JGyaUc8il7/kUZ7m59rGbXGczE9Bs+iz2qloqsZBduQ==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-layout-effect@1.0.0(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
 
-  /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@types/react': 18.3.1
+      '@babel/runtime': 7.27.0
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-layout-effect@1.1.0(@types/react@19.0.12)(react@19.0.0):
-    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@19.0.12)(react@19.0.0)':
     dependencies:
-      '@types/react': 19.0.12
       react: 19.0.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 19.0.12
 
-  /@radix-ui/react-use-layout-effect@1.1.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-previous@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-RG2K8z/K7InnOKpq6YLDmT49HGjNmrK+fr82UCVKT2sW0GYfVnYp4wZWBooT/EYfQ5faA9uIjvsuMMhH61rheg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-previous@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-previous@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-previous@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@types/react': 18.2.69
+      '@babel/runtime': 7.27.0
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-rect@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-TB7pID8NRMEHxb/qQJpvSt3hQU4sqNPM1VCTjTRjEOa7cEop/QMuq8S6fb/5Tsz64kqSvB9WnwsDHtjnrM9qew==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-rect@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/rect': 1.0.0
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-rect@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-Cq5DLuSiuYVKNU8orzJMbl15TXilTnJKUCltMVQg53BQOF1/C5toAaGrowkgksdBQ9H+SRL23g0HDmg9tvmxXw==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-rect@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/rect': 1.0.1
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-use-size@1.0.0(react@18.2.0):
-    resolution: {integrity: sha512-imZ3aYcoYCKhhgNpkNDh/aTiU05qw9hX+HHI1QDBTyIlcFjgeFlKKySNGMwTp7nYFLQg/j0VA2FmCY4WPDDHMg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-use-size@1.0.0(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@radix-ui/react-use-size@1.0.1(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-size@1.0.1(@types/react@18.2.69)(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.69)(react@18.2.0)
-      '@types/react': 18.2.69
       react: 18.2.0
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /@radix-ui/react-use-size@1.0.1(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-ibay+VqrgcaI6veAojjofPATwledXiSmX+C0KrBk/xgpX9rBzPV3OsfwlhQdUOFbh+LKQorLYT+xTXW9V8yd0g==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  '@radix-ui/react-use-size@1.0.1(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.26.7
+      '@babel/runtime': 7.27.0
       '@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.3.1)(react@18.3.1)
-      '@types/react': 18.3.1
       react: 18.3.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /@radix-ui/react-visually-hidden@1.0.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-qirnJxtYn73HEk1rXL12/mXnu2rwsNHDID10th2JGtdK25T9wX+mxRmGt7iPSahw512GbZOc0syZX1nLQGoEOg==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
+  '@radix-ui/react-visually-hidden@1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.26.7
-      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0)(react@18.2.0)
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-D4w41yN5YRKtu464TLnByKzMDG/JlMPHtfZgQAu9v6mNakUqGUI9vUrfQKz8NK41VMm/xbZbh76NUTVtIYqOMA==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0
-      react-dom: ^16.8 || ^17.0 || ^18.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
+  '@radix-ui/react-visually-hidden@1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@babel/runtime': 7.27.4
-      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@types/react': 18.3.1
-      '@types/react-dom': 18.2.7
+      '@babel/runtime': 7.27.0
+      '@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
+      '@types/react-dom': 18.2.7
 
-  /@radix-ui/rect@1.0.0:
-    resolution: {integrity: sha512-d0O68AYy/9oeEy1DdC07bz1/ZXX+DqCskRd3i4JzLSTXwefzaepQrKjXC7aNM8lTHjFLDO0pDgaEiQ7jEk+HVg==}
+  '@radix-ui/rect@1.0.0':
     dependencies:
-      '@babel/runtime': 7.27.4
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /@radix-ui/rect@1.0.1:
-    resolution: {integrity: sha512-fyrgCaedtvMg9NK3en0pnOYJdtfwxUcNolezkNPUsoX57X8oQk+NkqcvzHXD2uKNij6GXmWU9NDru2IWjrO4BQ==}
+  '@radix-ui/rect@1.0.1':
     dependencies:
-      '@babel/runtime': 7.27.4
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /@react-aria/breadcrumbs@3.5.16(react@18.2.0):
-    resolution: {integrity: sha512-OXLKKu4SmjnSaSHkk4kow5/aH/SzlHWPJt+Uq3xec9TwDOr/Ob8aeFVGFoY0HxfGozuQlUz+4e+d29vfA0jNWg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/breadcrumbs@3.5.16(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/link': 3.7.4(react@18.2.0)
@@ -13444,12 +26889,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/breadcrumbs@3.5.9(react@18.2.0):
-    resolution: {integrity: sha512-asbXTL5NjeHl1+YIF0K70y8tNHk8Lb6VneYH8yOkpLO49ejyNDYBK0tp0jtI9IZAQiTa2qkhYq58c9LloTwebQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/breadcrumbs@3.5.9(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/link': 3.6.3(react@18.2.0)
@@ -13458,12 +26899,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/button@3.9.1(react@18.2.0):
-    resolution: {integrity: sha512-nAnLMUAnwIVcRkKzS1G2IU6LZSkIWPJGu9amz/g7Y02cGUwFp3lk5bEw2LdoaXiSDJNSX8g0SZFU8FROg57jfQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/button@3.9.1(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
@@ -13473,12 +26910,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/button@3.9.8(react@18.2.0):
-    resolution: {integrity: sha512-MdbMQ3t5KSCkvKtwYd/Z6sgw0v+r1VQFRYOZ4L53xOkn+u140z8vBpNeWKZh/45gxGv7SJn9s2KstLPdCWmIxw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/button@3.9.8(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
@@ -13488,13 +26921,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/calendar@3.5.11(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-VLhBovLVu3uJXBkHbgEippmo/K58QLcc/tSJQ0aJUNyHsrvPgHEcj484cb+Uj/yOirXEIzaoW6WEvhcdKrb49Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/calendar@3.5.11(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@react-aria/i18n': 3.12.2(react@18.2.0)
@@ -13508,13 +26936,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/calendar@3.5.4(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-8k7khgea5kwfWriZJWCADNB0R2d7g5A6tTjUEktK4FFZcTb0RCubFejts4hRyzKlF9XHUro2dfh6sbZrzfMKDQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/calendar@3.5.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@react-aria/i18n': 3.10.0(react@18.2.0)
@@ -13528,12 +26951,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/checkbox@3.13.0(react@18.2.0):
-    resolution: {integrity: sha512-eylJwtADIPKJ1Y5rITNJm/8JD8sXG2nhiZBIg1ko44Szxrpu+Le53NoGtg8nlrfh9vbUrXVvuFtf2jxbPXR5Jw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/checkbox@3.13.0(react@18.2.0)':
     dependencies:
       '@react-aria/form': 3.0.1(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
@@ -13546,12 +26965,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/checkbox@3.14.6(react@18.2.0):
-    resolution: {integrity: sha512-LICY1PR3WsW/VbuLMjZbxo75+poeo3XCXGcUnk6hxMlWfp/Iy/XHVsHlGu9stRPKRF8BSuOGteaHWVn6IXfwtA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/checkbox@3.14.6(react@18.2.0)':
     dependencies:
       '@react-aria/form': 3.0.8(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
@@ -13565,20 +26980,15 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/combobox@3.10.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-EdDwr2Rp1xy7yWjOYHt2qF1IpAtUrkaNKZJzlIw1XSwcqizQY6E8orNPdZr6ZwD6/tgujxF1N71JTKyffrR0Xw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/combobox@3.10.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
-      '@react-aria/listbox': 3.13.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/listbox': 3.13.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/live-announcer': 3.3.4
-      '@react-aria/menu': 3.15.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/overlays': 3.23.2(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/menu': 3.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/overlays': 3.23.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/textfield': 3.14.8(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/collections': 3.10.9(react@18.2.0)
@@ -13590,20 +27000,15 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/combobox@3.8.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-q8Kdw1mx6nSSydXqRagRuyKH1NPGvpSOFjUfgxdO8ZqaEEuZX3ObOoiO/DLtXDndViNc03dMbMpfuJoLYXfCtg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/combobox@3.8.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
-      '@react-aria/listbox': 3.11.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/listbox': 3.11.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/live-announcer': 3.3.1
-      '@react-aria/menu': 3.12.0(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/overlays': 3.20.0(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/menu': 3.12.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/overlays': 3.20.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/textfield': 3.14.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/collections': 3.10.4(react@18.2.0)
@@ -13615,13 +27020,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/datepicker@3.11.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-6sbLln3VXSBcBRDgSACBzIzF/5KV5NlNOhZvXPFE6KqFw6GbevjZQTv5BNDXiwA3CQoawIRF7zgRvTANw8HkNA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/datepicker@3.11.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@internationalized/number': 3.5.3
@@ -13631,7 +27031,7 @@ packages:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/label': 3.7.11(react@18.2.0)
-      '@react-aria/spinbutton': 3.6.8(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/spinbutton': 3.6.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/datepicker': 3.10.2(react@18.2.0)
       '@react-stately/form': 3.0.5(react@18.2.0)
@@ -13643,13 +27043,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/datepicker@3.9.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-bdlY2H/zwe3hQf64Lp1oGTf7Va8ennDyAv4Ffowb+BOoL8+FB9smtGyONKe87zXu7VJL2M5xYAi4n7c004PM+w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/datepicker@3.9.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@internationalized/number': 3.5.0
@@ -13659,7 +27054,7 @@ packages:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
-      '@react-aria/spinbutton': 3.6.1(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/spinbutton': 3.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/datepicker': 3.9.1(react@18.2.0)
       '@react-stately/form': 3.0.0(react@18.2.0)
@@ -13671,51 +27066,36 @@ packages:
       '@swc/helpers': 0.5.2
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/dialog@3.5.10(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-H2BNVLOfaum6/4irH5XUU/wIcXSs/ymxmTPGmucRG1hzaUh8H3tupdl/qCZ+SsW9oYDFlphY172uM1nsPjBMiQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/dialog@3.5.10(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
-      '@react-aria/overlays': 3.20.0(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/overlays': 3.20.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/dialog': 3.5.7(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/dialog@3.5.17(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-lvfEgaqg922J1hurscqCS600OZQVitGtdpo81kAefJaUzMnCxzrYviyT96aaW0simHOlimbYF5js8lxBLZJRaw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/dialog@3.5.17(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
-      '@react-aria/overlays': 3.23.2(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/overlays': 3.23.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-types/dialog': 3.5.12(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/dnd@3.5.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-7OPGePdle+xNYHAIAUOvIETRMfnkRt7h/C0bCkxUR2GYefEbTzfraso4ppNH2JZ7fCRd0K/Qe+jvQklwusHAKA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/dnd@3.5.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@internationalized/string': 3.2.0
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/live-announcer': 3.3.1
-      '@react-aria/overlays': 3.20.0(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/overlays': 3.20.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/dnd': 3.2.7(react@18.2.0)
       '@react-types/button': 3.9.1(react@18.2.0)
@@ -13723,19 +27103,14 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/dnd@3.7.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-NuE3EGqoBbe9aXAO9mDfbu4kMO7S4MCgkjkCqYi16TWfRUf38ajQbIlqodCx91b3LVN3SYvNbE3D4Tj5ebkljw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/dnd@3.7.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@internationalized/string': 3.2.3
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/live-announcer': 3.3.4
-      '@react-aria/overlays': 3.23.2(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/overlays': 3.23.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/dnd': 3.4.2(react@18.2.0)
       '@react-types/button': 3.9.6(react@18.2.0)
@@ -13743,25 +27118,17 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/focus@3.16.0(react@18.2.0):
-    resolution: {integrity: sha512-GP6EYI07E8NKQQcXHjpIocEU0vh0oi0Vcsd+/71fKS0NnTR0TUOEeil0JuuQ9ymkmPDTu51Aaaa4FxVsuN/23A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/focus@3.16.0(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       clsx: 2.1.1
       react: 18.2.0
-    dev: false
 
-  /@react-aria/focus@3.18.2(react@18.2.0):
-    resolution: {integrity: sha512-Jc/IY+StjA3uqN73o6txKQ527RFU7gnG5crEl5Xy3V+gbYp2O5L3ezAo/E0Ipi2cyMbG6T5Iit1IDs7hcGu8aw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/focus@3.18.2(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
@@ -13769,25 +27136,17 @@ packages:
       '@swc/helpers': 0.5.15
       clsx: 2.1.1
       react: 18.2.0
-    dev: false
 
-  /@react-aria/form@3.0.1(react@18.2.0):
-    resolution: {integrity: sha512-6586oODMDR4/ciGRwXjpvEAg7tWGSDrXE//waK0n5e5sMuzlPOo1DHc5SpPTvz0XdJsu6VDt2rHdVWVIC9LEyw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/form@3.0.1(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/form': 3.0.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/form@3.0.8(react@18.2.0):
-    resolution: {integrity: sha512-8S2QiyUdAgK43M3flohI0R+2rTyzH088EmgeRArA8euvJTL16cj/oSOKMEgWVihjotJ9n6awPb43ZhKboyNsMg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/form@3.0.8(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
@@ -13795,19 +27154,14 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/grid@3.10.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-l0r9mz05Gwjq3t6JOTNQOf+oAoWN0bXELPJtIr8m0XyXMPFCQe1xsTaX8igVQdrDmXyBc75RAWS0BJo2JF2fIA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/grid@3.10.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/live-announcer': 3.3.4
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/grid': 3.9.2(react@18.2.0)
@@ -13818,19 +27172,14 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/grid@3.8.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-JlQDkdm5heG1FfRyy5KnB8b6s/hRqSI6Xt2xN2AccLX5kcbfFr2/d5KVxyf6ahfa4Gfd46alN6477ju5eTWJew==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/grid@3.8.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/live-announcer': 3.3.1
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/grid': 3.8.4(react@18.2.0)
@@ -13842,38 +27191,28 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/gridlist@3.7.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-rkkepYM7xJiebR0g3uC4zzkdR7a8z0fLaM+sg9lSTbdElHMLAlrebS2ytEyZnhiu9nbOnw13GN1OC4/ZenzbHQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/gridlist@3.7.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
-      '@react-aria/grid': 3.8.6(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/grid': 3.8.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/list': 3.10.2(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/gridlist@3.9.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-bb9GnKKeuL6NljoVUcHxr9F0cy/2WDOXRYeMikTnviRw6cuX95oojrhFfCUvz2d6ID22Btrvh7LkE+oIPVuc+g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/gridlist@3.9.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
-      '@react-aria/grid': 3.10.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/grid': 3.10.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/list': 3.10.8(react@18.2.0)
@@ -13882,12 +27221,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/i18n@3.10.0(react@18.2.0):
-    resolution: {integrity: sha512-sviD5Y1pLPG49HHRmVjR+5nONrp0HK219+nu9Y7cDfUhXu2EjyhMS9t/n9/VZ69hHChZ2PnHYLEE2visu9CuCg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/i18n@3.10.0(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@internationalized/message': 3.1.1
@@ -13896,14 +27231,10 @@ packages:
       '@react-aria/ssr': 3.9.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/i18n@3.12.2(react@18.2.0):
-    resolution: {integrity: sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/i18n@3.12.2(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@internationalized/message': 3.1.4
@@ -13914,58 +27245,38 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/interactions@3.20.1(react@18.2.0):
-    resolution: {integrity: sha512-PLNBr87+SzRhe9PvvF9qvzYeP4ofTwfKSorwmO+hjr3qoczrSXf4LRQlb27wB6hF10C7ZE/XVbUI1lj4QQrZ/g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/interactions@3.20.1(react@18.2.0)':
     dependencies:
       '@react-aria/ssr': 3.9.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/interactions@3.22.2(react@18.2.0):
-    resolution: {integrity: sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/interactions@3.22.2(react@18.2.0)':
     dependencies:
       '@react-aria/ssr': 3.9.5(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/label@3.7.11(react@18.2.0):
-    resolution: {integrity: sha512-REgejE5Qr8cXG/b8H2GhzQmjQlII/0xQW/4eDzydskaTLvA7lF5HoJUE6biYTquH5va38d8XlH465RPk+bvHzA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/label@3.7.11(react@18.2.0)':
     dependencies:
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/label@3.7.4(react@18.2.0):
-    resolution: {integrity: sha512-3Y0yyrqpLzZdzHw+TOyzwuyx5wa2ujU5DGfKuL5GFnU9Ii4DtdwBGSYS7Yu7qadU+eQmG4OGhAgFVswbIgIwJw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/label@3.7.4(react@18.2.0)':
     dependencies:
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/link@3.6.3(react@18.2.0):
-    resolution: {integrity: sha512-8kPWc4u/lDow3Ll0LDxeMgaxt9Y3sl8UldKLGli8tzRSltYFugNh/n+i9sCnmo4Qv9Tp9kYv+yxBK50Uk9sINw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/link@3.6.3(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
@@ -13974,12 +27285,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/link@3.7.4(react@18.2.0):
-    resolution: {integrity: sha512-E8SLDuS9ssm/d42+3sDFNthfMcNXMUrT2Tq1DIZt22EsMcuEzmJ9B0P7bDP5RgvIw05xVGqZ20nOpU4mKTxQtA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/link@3.7.4(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
@@ -13988,17 +27295,12 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/listbox@3.11.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-PBrnldmyEYUUJvfDeljW8ITvZyBTfGpLNf0b5kfBPK3TDgRH4niEH2vYEcaZvSqb0FrpdvcunuTRXcOpfb+gCQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/listbox@3.11.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/list': 3.10.2(react@18.2.0)
@@ -14007,17 +27309,12 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/listbox@3.13.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-htluPyDfFtn66OEYaJdIaFCYH9wGCNk30vOgZrQkPul9F9Cjce52tTyPVR0ERsf14oCUsjjS5qgeq3dGidRqEw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/listbox@3.13.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/label': 3.7.11(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/list': 3.10.8(react@18.2.0)
@@ -14026,31 +27323,22 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/live-announcer@3.3.1:
-    resolution: {integrity: sha512-hsc77U7S16trM86d+peqJCOCQ7/smO1cybgdpOuzXyiwcHQw8RQ4GrXrS37P4Ux/44E9nMZkOwATQRT2aK8+Ew==}
+  '@react-aria/live-announcer@3.3.1':
     dependencies:
       '@swc/helpers': 0.5.15
-    dev: false
 
-  /@react-aria/live-announcer@3.3.4:
-    resolution: {integrity: sha512-w8lxs35QrRrn6pBNzVfyGOeqWdxeVKf9U6bXIVwhq7rrTqRULL8jqy8RJIMfIs1s8G5FpwWYjyBOjl2g5Cu1iA==}
+  '@react-aria/live-announcer@3.3.4':
     dependencies:
       '@swc/helpers': 0.5.15
-    dev: false
 
-  /@react-aria/menu@3.12.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Nsujv3b61WR0gybDKnBjAeyxDVJOfPLMggRUf9SQDfPWnrPXEsAFxaPaVcAkzlfI4HiQs1IxNwsKFNpc3PPZTQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/menu@3.12.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
-      '@react-aria/overlays': 3.20.0(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/overlays': 3.20.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/menu': 3.6.0(react@18.2.0)
@@ -14061,19 +27349,14 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/menu@3.15.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-vvUmVjJwIg3h2r+7isQXTwlmoDlPAFBckHkg94p3afrT1kNOTHveTsaVl17mStx/ymIioaAi3PrIXk/PZXp1jw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/menu@3.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
-      '@react-aria/overlays': 3.23.2(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/overlays': 3.23.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/menu': 3.8.2(react@18.2.0)
@@ -14084,41 +27367,28 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/meter@3.4.16(react@18.2.0):
-    resolution: {integrity: sha512-hJqKnEE6mmK2Psx5kcI7NZ44OfTg0Bp7DatQSQ4zZE4yhnykRRwxqSKjze37tPR63cCqgRXtQ5LISfBfG54c0Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/meter@3.4.16(react@18.2.0)':
     dependencies:
       '@react-aria/progress': 3.4.16(react@18.2.0)
       '@react-types/meter': 3.4.3(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/meter@3.4.9(react@18.2.0):
-    resolution: {integrity: sha512-1/FHFmFmSyfQBJ2oH152lp4nps76v1UdhnFbIsmRIH+0g0IfMv1yDT2M9dIZ/b9DgVZSx527FmWOXm0eHGKD6w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/meter@3.4.9(react@18.2.0)':
     dependencies:
       '@react-aria/progress': 3.4.9(react@18.2.0)
       '@react-types/meter': 3.3.6(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/numberfield@3.10.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-KjGTXq3lIhN4DEdEeHzfS/k9Qq0sDEpLgLr/hgSfGN4Q7Syu4Ck/n2HXmrDn//z08/wNvcukuP6Ioers138DcQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/numberfield@3.10.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
-      '@react-aria/spinbutton': 3.6.1(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/spinbutton': 3.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/textfield': 3.14.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/form': 3.0.0(react@18.2.0)
@@ -14129,17 +27399,12 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/numberfield@3.11.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-nvEWiQcWRwj6O2JXmkXEeWoBX/GVZT9zumFJcew3XknGTWJUr3h2AOymIQFt9g4mpag8IgOFEpSIlwhtZHdp1A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/numberfield@3.11.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
-      '@react-aria/spinbutton': 3.6.8(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/spinbutton': 3.6.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/textfield': 3.14.8(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/form': 3.0.5(react@18.2.0)
@@ -14150,13 +27415,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/overlays@3.20.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-2m7MpRJL5UucbEuu08lMHsiFJoDowkJV4JAIFBZYK1NzVH0vF/A+w9HRNM7jRwx2DUxE+iIsZnl8yKV/7KY8OQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/overlays@3.20.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
@@ -14171,13 +27431,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/overlays@3.23.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-vjlplr953YAuJfHiP4O+CyrTlr6OaFgXAGrzWq4MVMjnpV/PT5VRJWYFHR0sUGlHTPqeKS4NZbi/xCSgl/3pGQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/overlays@3.23.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
@@ -14192,12 +27447,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
-
-  /@react-aria/progress@3.4.16(react@18.2.0):
-    resolution: {integrity: sha512-RbDIFQg4+/LG+KYZeLAijt2zH7K2Gp0CY9RKWdho3nU5l3/w57Fa7NrfDGWtpImrt7bR2nRmXMA6ESfr7THfrg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+
+  '@react-aria/progress@3.4.16(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/label': 3.7.11(react@18.2.0)
@@ -14206,12 +27457,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/progress@3.4.9(react@18.2.0):
-    resolution: {integrity: sha512-CME1ZLsJHOmSgK8IAPOC/+vYO5Oc614mkEw5MluT/yclw5rMyjAkK1XsHLjEXy81uwPeiRyoQQIMPKG2/sMxFQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/progress@3.4.9(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
@@ -14220,12 +27467,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/radio@3.10.0(react@18.2.0):
-    resolution: {integrity: sha512-6NaKzdGymdcVWLYgHT0cHsVmNzPOp89o8r41w29OPBQWu8w2c9mxg4366OiIZn/uXIBS4abhQ4nL4toBRLgBrg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/radio@3.10.0(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/form': 3.0.1(react@18.2.0)
@@ -14238,12 +27481,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/radio@3.10.7(react@18.2.0):
-    resolution: {integrity: sha512-o2tqIe7xd1y4HeCBQfz/sXIwLJuI6LQbVoCQ1hgk/5dGhQ0LiuXohRYitGRl9zvxW8jYdgLULmOEDt24IflE8A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/radio@3.10.7(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/form': 3.0.8(react@18.2.0)
@@ -14256,12 +27495,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/searchfield@3.7.1(react@18.2.0):
-    resolution: {integrity: sha512-ebhnV/reNByIZzpcQLHIo1RQ+BrYS8HdwX624i9R7dep1gxGHXYEaqL9aSY+RdngNerB4OeiWmB75em9beSpjQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/searchfield@3.7.1(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/textfield': 3.14.1(react@18.2.0)
@@ -14272,12 +27507,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/searchfield@3.7.8(react@18.2.0):
-    resolution: {integrity: sha512-SsF5xwH8Us548QgzivvbM7nhFbw7pu23xnRRIuhlP3MwOR3jRUFh17NKxf3Z0jvrDv/u0xfm3JKHIgaUN0KJ2A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/searchfield@3.7.8(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/textfield': 3.14.8(react@18.2.0)
@@ -14288,21 +27519,16 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/select@3.14.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-pAy/+Xbj11Lx6bi/O1hWH0NSIDRxFb6V7N0ry2L8x7MALljh516VbpnAc5RgvbjbuKq0cHUAcdINOzOzpYWm4A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/select@3.14.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/form': 3.0.1(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
-      '@react-aria/listbox': 3.11.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/menu': 3.12.0(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/listbox': 3.11.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/menu': 3.12.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-aria/visually-hidden': 3.8.8(react@18.2.0)
       '@react-stately/select': 3.6.1(react@18.2.0)
@@ -14312,21 +27538,16 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/select@3.14.9(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-tiNgMyA2G9nKnFn3pB/lMSgidNToxSFU7r6l4OcG+Vyr63J7B/3dF2lTXq8IYhlfOR3K3uQkjroSx52CmC3NDw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/select@3.14.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/form': 3.0.8(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/label': 3.7.11(react@18.2.0)
-      '@react-aria/listbox': 3.13.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/menu': 3.15.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/listbox': 3.13.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/menu': 3.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-aria/visually-hidden': 3.8.15(react@18.2.0)
       '@react-stately/select': 3.6.7(react@18.2.0)
@@ -14336,13 +27557,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/selection@3.17.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-xl2sgeGH61ngQeE05WOWWPVpGRTPMjQEFmsAWEprArFi4Z7ihSZgpGX22l1w7uSmtXM/eN/v0W8hUYUju5iXlQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/selection@3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
@@ -14353,13 +27569,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/selection@3.19.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-GYoObXCXlmGK08hp7Qfl6Bk0U+bKP5YDWSsX+MzNjJsqzQSLm4S06tRB9ACM7gIo9dDCvL4IRxdSYTJAlJc6bw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/selection@3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
@@ -14370,34 +27581,22 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/separator@3.3.9(react@18.2.0):
-    resolution: {integrity: sha512-1wEXiaSJjq2+DR5TC0RKnUBsfZN+YXTzyI7XMzjQoc3YlclumX8wQtzPAOGOEjHB1JKUgo1Gw70FtupVXz58QQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/separator@3.3.9(react@18.2.0)':
     dependencies:
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/separator@3.4.2(react@18.2.0):
-    resolution: {integrity: sha512-Xql9Kg3VlGesEUC7QheE+L5b3KgBv0yxiUU+/4JP8V2vfU/XSz4xmprHEeq7KVQVOetn38iiXU8gA5g26SEsUA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/separator@3.4.2(react@18.2.0)':
     dependencies:
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/slider@3.7.11(react@18.2.0):
-    resolution: {integrity: sha512-2WAwjANXPsA2LHJ5nxxV4c7ihFAzz2spaBz8+FJ7MDYE7WroYnE8uAXElea1aGo+Lk0DTiAdepLpBkggqPNanw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/slider@3.7.11(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
@@ -14409,12 +27608,8 @@ packages:
       '@react-types/slider': 3.7.5(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/slider@3.7.4(react@18.2.0):
-    resolution: {integrity: sha512-OFJWeGSL2duVDFs/kcjlWsY6bqCVKZgM0aFn2QN4wmID+vfBvBnqGHAgWv3BCePTAPS3+GBjMN002TrftorjwQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/slider@3.7.4(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
@@ -14426,29 +27621,19 @@ packages:
       '@react-types/slider': 3.7.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/spinbutton@3.6.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-u5GuOP3k4Zis055iY0fZJNHU7dUNCoSfUq5LKwJ1iNaCqDcavdstAnAg+X1a7rhpp5zCnJmAMseo3Qmzi9P+Ew==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/spinbutton@3.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/live-announcer': 3.3.1
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/button': 3.9.1(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/spinbutton@3.6.8(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-OJMAYRIZ0WrWE+5tZsywrSg4t+aOwl6vl/e1+J64YcGMM+p+AKd61KGG5T0OgNSORXjoVIZOmj6wZ6Od4xfPMw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/spinbutton@3.6.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/live-announcer': 3.3.4
@@ -14458,44 +27643,26 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/ssr@3.9.1(react@18.2.0):
-    resolution: {integrity: sha512-NqzkLFP8ZVI4GSorS0AYljC13QW2sc8bDqJOkBvkAt3M8gbcAXJWVRGtZBCRscki9RZF+rNlnPdg0G0jYkhJcg==}
-    engines: {node: '>= 12'}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/ssr@3.9.1(react@18.2.0)':
     dependencies:
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/ssr@3.9.5(react@18.2.0):
-    resolution: {integrity: sha512-xEwGKoysu+oXulibNUSkXf8itW0npHHTa6c4AyYeZIJyRoegeteYuFpZUBPtIDE8RfHdNsSmE1ssOkxRnwbkuQ==}
-    engines: {node: '>= 12'}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/ssr@3.9.5(react@18.2.0)':
     dependencies:
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/switch@3.6.0(react@18.2.0):
-    resolution: {integrity: sha512-YNWc5fGLNXE4XlmDAKyqAdllRiClGR7ki4KGFY7nL+xR5jxzjCGU3S3ToMK5Op3QSMGZLxY/aYmC4O+MvcoADQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/switch@3.6.0(react@18.2.0)':
     dependencies:
       '@react-aria/toggle': 3.10.0(react@18.2.0)
       '@react-stately/toggle': 3.7.0(react@18.2.0)
       '@react-types/switch': 3.5.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/switch@3.6.7(react@18.2.0):
-    resolution: {integrity: sha512-yBNvKylhc3ZRQ0+7mD0mIenRRe+1yb8YaqMMZr8r3Bf87LaiFtQyhRFziq6ZitcwTJz5LEWjBihxbSVvUrf49w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/switch@3.6.7(react@18.2.0)':
     dependencies:
       '@react-aria/toggle': 3.10.7(react@18.2.0)
       '@react-stately/toggle': 3.7.7(react@18.2.0)
@@ -14503,16 +27670,11 @@ packages:
       '@react-types/switch': 3.5.5(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/table@3.13.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-AzmETpyxwNqISTzwHJPs85x9gujG40IIsSOBUdp49oKhB85RbPLvMwhadp4wCVAoHw3erOC/TJxHtVc7o2K1LA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/table@3.13.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
-      '@react-aria/grid': 3.8.6(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/grid': 3.8.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/live-announcer': 3.3.1
@@ -14529,16 +27691,11 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/table@3.15.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-nQCLjlEvyJHyuijHw8ESqnA9fxNJfQHx0WPcl08VDEb8VxcE/MVzSAIedSWaqjG5k9Oflz6o/F/zHtzw4AFAow==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/table@3.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
-      '@react-aria/grid': 3.10.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/grid': 3.10.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/live-announcer': 3.3.4
@@ -14554,17 +27711,12 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/tabs@3.8.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-Plw0K/5Qv35vYq7pHZFfQB2BF5OClFx4Abzo9hLVx4oMy3qb7i5lxmLBVbt81yPX/MdjYeP4zO1EHGBl4zMRhA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/tabs@3.8.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/tabs': 3.6.3(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
@@ -14572,17 +27724,12 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/tabs@3.9.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-aQZGAoOIg1B16qlvXIy6+rHbNBNVcWkGjOjeyvqTTPMjXt/FmElkICnqckI7MRJ1lTqzyppCOBitYOHSXRo8Uw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/tabs@3.9.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/tabs': 3.6.9(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
@@ -14590,19 +27737,14 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/tag@3.3.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-w7d8sVZqxTo8VFfeg2ixLp5kawtrcguGznVY4mt5aE6K8LMJOeNVDqNNfolfyia80VjOWjeX+RpVdVJRdrv/GQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/tag@3.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@react-aria/gridlist': 3.7.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/gridlist': 3.7.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-stately/list': 3.10.2(react@18.2.0)
       '@react-types/button': 3.9.1(react@18.2.0)
@@ -14610,19 +27752,14 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/tag@3.4.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-iyJuATQ8t2cdLC7hiZm143eeZze/MtgxaMq0OewlI9TUje54bkw2Q+CjERdgisIo3Eemf55JJgylGrTcalEJAg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/tag@3.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@react-aria/gridlist': 3.9.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/gridlist': 3.9.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/label': 3.7.11(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-stately/list': 3.10.8(react@18.2.0)
       '@react-types/button': 3.9.6(react@18.2.0)
@@ -14630,12 +27767,8 @@ packages:
       '@swc/helpers': 0.5.15
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-aria/textfield@3.14.1(react@18.2.0):
-    resolution: {integrity: sha512-UMepuYtDdCgrUF4dMphNxrUm23xOmR54aZD1pbp9cJyfioVkJN35BTXZVkD0D07gHLn4RhxKIZxBortQQrLB9g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/textfield@3.14.1(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/form': 3.0.1(react@18.2.0)
@@ -14647,12 +27780,8 @@ packages:
       '@react-types/textfield': 3.9.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/textfield@3.14.8(react@18.2.0):
-    resolution: {integrity: sha512-FHEvsHdE1cMR2B7rlf+HIneITrC40r201oLYbHAp3q26jH/HUujzFBB9I20qhXjyBohMWfQLqJhSwhs1VW1RJQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/textfield@3.14.8(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/form': 3.0.8(react@18.2.0)
@@ -14664,12 +27793,8 @@ packages:
       '@react-types/textfield': 3.9.6(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/toggle@3.10.0(react@18.2.0):
-    resolution: {integrity: sha512-6cUf4V9TuG2J7AvXUdU/GspEPFCubUOID3mrselSe563RViy+mMZk0vUEOdyoNanDcEXl58W4dE3SGWxFn71vg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/toggle@3.10.0(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
@@ -14678,12 +27803,8 @@ packages:
       '@react-types/checkbox': 3.6.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/toggle@3.10.7(react@18.2.0):
-    resolution: {integrity: sha512-/RJQU8QlPZXRElZ3Tt10F5K5STgUBUGPpfuFUGuwF3Kw3GpPxYsA1YAVjxXz2MMGwS0+y6+U/J1xIs1AF0Jwzg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/toggle@3.10.7(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
@@ -14693,12 +27814,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/tooltip@3.7.0(react@18.2.0):
-    resolution: {integrity: sha512-+u9Sftkfe09IDyPEnbbreFKS50vh9X/WTa7n1u2y3PenI9VreLpUR6czyzda4BlvQ95e9jQz1cVxUjxTNaZmBw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/tooltip@3.7.0(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.16.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
@@ -14708,12 +27825,8 @@ packages:
       '@react-types/tooltip': 3.4.6(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/tooltip@3.7.7(react@18.2.0):
-    resolution: {integrity: sha512-UOTTDbbUz7OaE48VjNSWl+XQbYCUs5Gss4I3Tv1pfRLXzVtGYXv3ur/vRayvZR0xd12ANY26fZPNkSmCFpmiXw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/tooltip@3.7.7(react@18.2.0)':
     dependencies:
       '@react-aria/focus': 3.18.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
@@ -14723,25 +27836,17 @@ packages:
       '@react-types/tooltip': 3.4.11(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/utils@3.23.0(react@18.2.0):
-    resolution: {integrity: sha512-fJA63/VU4iQNT8WUvrmll3kvToqMurD69CcgVmbQ56V7ZbvlzFi44E7BpnoaofScYLLtFWRjVdaHsohT6O/big==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/utils@3.23.0(react@18.2.0)':
     dependencies:
       '@react-aria/ssr': 3.9.1(react@18.2.0)
       '@react-stately/utils': 3.9.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       clsx: 2.1.1
       react: 18.2.0
-    dev: false
 
-  /@react-aria/utils@3.25.2(react@18.2.0):
-    resolution: {integrity: sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/utils@3.25.2(react@18.2.0)':
     dependencies:
       '@react-aria/ssr': 3.9.5(react@18.2.0)
       '@react-stately/utils': 3.10.3(react@18.2.0)
@@ -14749,172 +27854,66 @@ packages:
       '@swc/helpers': 0.5.15
       clsx: 2.1.1
       react: 18.2.0
-    dev: false
 
-  /@react-aria/visually-hidden@3.8.15(react@18.2.0):
-    resolution: {integrity: sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-aria/visually-hidden@3.8.15(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-aria/visually-hidden@3.8.8(react@18.2.0):
-    resolution: {integrity: sha512-Cn2PYKD4ijGDtF0+dvsh8qa4y7KTNAlkTG6h20r8Q+6UTyRNmtE2/26QEaApRF8CBiNy9/BZC/ZC4FK2OjvCoA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-aria/visually-hidden@3.8.8(react@18.2.0)':
     dependencies:
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-email/body@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-dMJyL9aU25ieatdPtVjCyQ/WHZYHwNc+Hy/XpF8Cc18gu21cUynVEeYQzFSeigDRMeBQ3PGAyjVDPIob7YlGwA==}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
-
-  /@react-email/body@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-vjJ5P1MUNWV0KNivaEWA6MGj/I3c764qQJMsKjCHlW6mkFJ4SXbm2OlQFtKAb++Bj8LDqBlnE6oW77bWcMc0NA==}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/body@0.0.7(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/body@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-gqdkNYlIaIw0OdpWu8KjIcQSIFvx7t2bZpXVxMMvBS859Ia1+1X3b5RNbjI3S1ZqLddUf7owOHkO4MiXGE+nxg==}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/body@0.0.8(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/button@0.0.14(react@18.3.1):
-    resolution: {integrity: sha512-SMk40moGcAvkHIALX4XercQlK0PNeeEIam6OXHw68ea9WtzzqVwiK4pzLY0iiMI9B4xWHcaS2lCPf3cKbQBf1Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/button@0.0.14(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/button@0.0.15(react@18.3.1):
-    resolution: {integrity: sha512-9Zi6SO3E8PoHYDfcJTecImiHLyitYWmIRs0HE3Ogra60ZzlWP2EXu+AZqwQnhXuq+9pbgwBWNWxB5YPetNPTNA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/button@0.0.15(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
-
-  /@react-email/button@0.0.17(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-ioHdsk+BpGS/PqjU6JS7tUrVy9yvbUx92Z+Cem2+MbYp55oEwQ9VHf7u4f5NoM0gdhfKSehBwRdYlHt/frEMcg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/code-block@0.0.3(react@18.3.1):
-    resolution: {integrity: sha512-nxhl7WjjM2cOYtl0boBZfSObTrUCz2LbarcMyHkTVAsA9rbjbtWAQF7jmlefXJusk3Uol5l2c8hTh2lHLlHTRQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/code-block@0.0.3(react@18.3.1)':
     dependencies:
       prismjs: 1.29.0
       react: 18.3.1
-    dev: false
 
-  /@react-email/code-block@0.0.4(react@18.3.1):
-    resolution: {integrity: sha512-xjVLi/9dFNJ70N7hYme+21eQWa3b9/kgp4V+FKQJkQCuIMobxPRCIGM5jKD/0Vo2OqrE5chYv/dkg/aP8a8sPg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/code-block@0.0.4(react@18.3.1)':
     dependencies:
       prismjs: 1.29.0
       react: 18.3.1
-    dev: false
-
-  /@react-email/code-block@0.0.8(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-WbuAEpTnB262i9C3SGPmmErgZ4iU5KIpqLUjr7uBJijqldLqZc5x39e8wPWaRdF7NLcShmrc/+G7GJgI1bdC5w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      prismjs: 1.29.0
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/code-inline@0.0.1(react@18.3.1):
-    resolution: {integrity: sha512-SeZKTB9Q4+TUafzeUm/8tGK3dFgywUHb1od/BrAiJCo/im65aT+oJfggJLjK2jCdSsus8odcK2kReeM3/FCNTQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/code-inline@0.0.1(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/code-inline@0.0.2(react@18.3.1):
-    resolution: {integrity: sha512-0cmgbbibFeOJl0q04K9jJlPDuJ+SEiX/OG6m3Ko7UOkG3TqjRD8Dtvkij6jNDVfUh/zESpqJCP2CxrCLLMUjdA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/code-inline@0.0.2(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
-
-  /@react-email/code-inline@0.0.4(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-zj3oMQiiUCZbddSNt3k0zNfIBFK0ZNDIzzDyBaJKy6ZASTtWfB+1WFX0cpTX8q0gUiYK+A94rk5Qp68L6YXjXQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/column@0.0.10(react@18.3.1):
-    resolution: {integrity: sha512-MnP8Mnwipr0X3XtdD6jMLckb0sI5/IlS6Kl/2F6/rsSWBJy5Gg6nizlekTdkwDmy0kNSe3/1nGU0Zqo98pl63Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/column@0.0.10(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
-
-  /@react-email/column@0.0.12(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-Rsl7iSdDaeHZO938xb+0wR5ud0Z3MVfdtPbNKJNojZi2hApwLAQXmDrnn/AcPDM5Lpl331ZljJS8vHTWxxkvKw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/column@0.0.9(react@18.3.1):
-    resolution: {integrity: sha512-1ekqNBgmbS6m97/sUFOnVvQtLYljUWamw8Y44VId95v6SjiJ4ca+hMcdOteHWBH67xkRofEOWTvqDRea5SBV8w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/column@0.0.9(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/components@0.0.16(@types/react@18.2.69)(react@18.3.1):
-    resolution: {integrity: sha512-1WATpMSH03cRvhfNjGl/Up3seZJOzN9KLzlk3Q9g/cqNhZEJ7HYxoZM4AQKAI0V3ttXzzxKv8Oj+AZQLHDiICA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/components@0.0.16(@types/react@18.2.69)(react@18.3.1)':
     dependencies:
       '@react-email/body': 0.0.7(react@18.3.1)
       '@react-email/button': 0.0.14(react@18.3.1)
@@ -14939,13 +27938,8 @@ packages:
       react: 18.3.1
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@react-email/components@0.0.17(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-x5gGQaK0QchbwHvUrCBVnE8GCWdO5osTVuTSA54Fwzels6ZDeNTHEYRx9gI3Nwcf/dkoVYkVH4rzWST0SF0MLA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/components@0.0.17(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
       '@react-email/body': 0.0.8(react@18.3.1)
       '@react-email/button': 0.0.15(react@18.3.1)
@@ -14964,471 +27958,150 @@ packages:
       '@react-email/preview': 0.0.9(react@18.3.1)
       '@react-email/render': 0.0.13
       '@react-email/row': 0.0.8(react@18.3.1)
-      '@react-email/section': 0.0.12(react@18.3.1)
-      '@react-email/tailwind': 0.0.16(react@18.3.1)
-      '@react-email/text': 0.0.8(react@18.3.1)
-      react: 18.3.1
-    transitivePeerDependencies:
-      - '@types/react'
-    dev: false
-
-  /@react-email/components@0.0.24(react-dom@18.3.1)(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-/DNmfTREaT59UFdkHoIK3BewJ214LfRxmduiil3m7POj+gougkItANu1+BMmgbUATxjf7jH1WoBxo9x/rhFEFw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      '@react-email/body': 0.0.10(react@19.0.0-rc.0)
-      '@react-email/button': 0.0.17(react@19.0.0-rc.0)
-      '@react-email/code-block': 0.0.8(react@19.0.0-rc.0)
-      '@react-email/code-inline': 0.0.4(react@19.0.0-rc.0)
-      '@react-email/column': 0.0.12(react@19.0.0-rc.0)
-      '@react-email/container': 0.0.14(react@19.0.0-rc.0)
-      '@react-email/font': 0.0.8(react@19.0.0-rc.0)
-      '@react-email/head': 0.0.11(react@19.0.0-rc.0)
-      '@react-email/heading': 0.0.14(react@19.0.0-rc.0)
-      '@react-email/hr': 0.0.10(react@19.0.0-rc.0)
-      '@react-email/html': 0.0.10(react@19.0.0-rc.0)
-      '@react-email/img': 0.0.10(react@19.0.0-rc.0)
-      '@react-email/link': 0.0.10(react@19.0.0-rc.0)
-      '@react-email/markdown': 0.0.12(react@19.0.0-rc.0)
-      '@react-email/preview': 0.0.11(react@19.0.0-rc.0)
-      '@react-email/render': 1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0)
-      '@react-email/row': 0.0.10(react@19.0.0-rc.0)
-      '@react-email/section': 0.0.14(react@19.0.0-rc.0)
-      '@react-email/tailwind': 0.1.0(react@19.0.0-rc.0)
-      '@react-email/text': 0.0.10(react@19.0.0-rc.0)
-      react: 19.0.0-rc.0
-    transitivePeerDependencies:
-      - react-dom
-    dev: false
-
-  /@react-email/container@0.0.11(react@18.3.1):
-    resolution: {integrity: sha512-jzl/EHs0ClXIRFamfH+NR/cqv4GsJJscqRhdYtnWYuRAsWpKBM1muycrrPqIVhWvWi6sFHInWTt07jX+bDc3SQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
-    dependencies:
-      react: 18.3.1
-    dev: false
-
-  /@react-email/container@0.0.12(react@18.3.1):
-    resolution: {integrity: sha512-HFu8Pu5COPFfeZxSL+wKv/TV5uO/sp4zQ0XkRCdnGkj/xoq0lqOHVDL4yC2Pu6fxXF/9C3PHDA++5uEYV5WVJw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
-    dependencies:
-      react: 18.3.1
-    dev: false
-
-  /@react-email/container@0.0.14(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-NgoaJJd9tTtsrveL86Ocr/AYLkGyN3prdXKd/zm5fQpfDhy/NXezyT3iF6VlwAOEUIu64ErHpAJd+P6ygR+vjg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
-
-  /@react-email/font@0.0.5(react@18.3.1):
-    resolution: {integrity: sha512-if/qKYmH3rJ2egQJoKbV8SfKCPavu+ikUq/naT/UkCr8Q0lkk309tRA0x7fXG/WeIrmcipjMzFRGTm2TxTecDw==}
-    peerDependencies:
-      react: 18.2.0
-    dependencies:
-      react: 18.3.1
-    dev: false
-
-  /@react-email/font@0.0.6(react@18.3.1):
-    resolution: {integrity: sha512-sZZFvEZ4U3vNCAZ8wXqIO3DuGJR2qE/8m2fEH+tdqwa532zGO3zW+UlCTg0b9455wkJSzEBeaWik0IkNvjXzxw==}
-    peerDependencies:
-      react: ^18.2.0
-    dependencies:
-      react: 18.3.1
-    dev: false
-
-  /@react-email/font@0.0.8(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-fSBEqYyVPAyyACBBHcs3wEYzNknpHMuwcSAAKE8fOoDfGqURr/vSxKPdh4tOa9z7G4hlcEfgGrCYEa2iPT22cw==}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
-
-  /@react-email/head@0.0.11(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-skw5FUgyamIMK+LN+fZQ5WIKQYf0dPiRAvsUAUR2eYoZp9oRsfkIpFHr0GWPkKAYjFEj+uJjaxQ/0VzQH7svVg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
-
-  /@react-email/head@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-IcXL4jc0H1qzAXJCD9ajcRFBQdbUHkjKJyiUeogpaYSVZSq6cVDWQuGaI23TA9k+pI2TFeQimogUFb3Kgeeudw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
-    dependencies:
-      react: 18.3.1
-    dev: false
-
-  /@react-email/head@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-8/NI0gtQmLIilAe6rebK1TWw3IXHxtrR02rInkQq8yQ7zKbYbzx7Q/FhmsJgAk+uYh2Er/KhgYJ0sHZyDhfMTQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
-    dependencies:
-      react: 18.3.1
-    dev: false
-
-  /@react-email/heading@0.0.11(@types/react@18.2.69)(react@18.3.1):
-    resolution: {integrity: sha512-EF5ZtRCxhHPw3m+8iibKKg0RAvAeHj1AP68sjU7s6+J+kvRgllr/E972Wi5Y8UvcIGossCvpX1WrSMDzeB4puA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
-    dependencies:
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.69)(react@18.3.1)
+      '@react-email/section': 0.0.12(react@18.3.1)
+      '@react-email/tailwind': 0.0.16(react@18.3.1)
+      '@react-email/text': 0.0.8(react@18.3.1)
       react: 18.3.1
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@react-email/heading@0.0.12(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-eB7mpnAvDmwvQLoPuwEiPRH4fPXWe6ltz6Ptbry2BlI88F0a2k11Ghb4+sZHBqg7vVw/MKbqEgtLqr3QJ/KfCQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/container@0.0.11(react@18.3.1)':
     dependencies:
-      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
       react: 18.3.1
-    transitivePeerDependencies:
-      - '@types/react'
-    dev: false
 
-  /@react-email/heading@0.0.14(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-jZM7IVuZOXa0G110ES8OkxajPTypIKlzlO1K1RIe1auk76ukQRiCg1IRV4HZlWk1GGUbec5hNxsvZa2kU8cb9w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/container@0.0.12(react@18.3.1)':
     dependencies:
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /@react-email/hr@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-3AA4Yjgl3zEid/KVx6uf6TuLJHVZvUc2cG9Wm9ZpWeAX4ODA+8g9HyuC0tfnjbRsVMhMcCGiECuWWXINi+60vA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/font@0.0.5(react@18.3.1)':
     dependencies:
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /@react-email/hr@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-8suK0M/deXHt0DBSeKhSC4bnCBCBm37xk6KJh9M0/FIKlvdltQBem52YUiuqVl1XLB87Y6v6tvspn3SZ9fuxEA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/font@0.0.6(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/hr@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-JLVvpCg2wYKEB+n/PGCggWG9fRU5e4lxsGdpK5SDLsCL0ic3OLKSpHMfeE+ZSuw0GixAVVQN7F64PVJHQkd4MQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/head@0.0.7(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/html@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-06uiuSKJBWQJfhCKv4MPupELei4Lepyz9Sth7Yq7Fq29CAeB1ejLgKkGqn1I+FZ72hQxPLdYF4iq4yloKv3JCg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/head@0.0.8(react@18.3.1)':
     dependencies:
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /@react-email/html@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-oy7OoRtoOKApVI/5Lz1OZptMKmMYJu9Xn6+lOmdBQchAuSdQtWJqxhrSj/iI/mm8HZWo6MZEQ6SFpfOuf8/P6Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/heading@0.0.11(@types/react@18.2.69)(react@18.3.1)':
     dependencies:
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.2.69)(react@18.3.1)
       react: 18.3.1
-    dev: false
+    transitivePeerDependencies:
+      - '@types/react'
 
-  /@react-email/html@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-arII3wBNLpeJtwyIJXPaILm5BPKhA+nvdC1F9QkuKcOBJv2zXctn8XzPqyGqDfdplV692ulNJP7XY55YqbKp6w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/heading@0.0.12(@types/react@18.3.1)(react@18.3.1)':
     dependencies:
+      '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
       react: 18.3.1
-    dev: false
+    transitivePeerDependencies:
+      - '@types/react'
 
-  /@react-email/img@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-pJ8glJjDNaJ53qoM95pvX9SK05yh0bNQY/oyBKmxlBDdUII6ixuMc3SCwYXPMl+tgkQUyDgwEBpSTrLAnjL3hA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/hr@0.0.7(react@18.3.1)':
     dependencies:
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /@react-email/img@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-up9tM2/dJ24u/CFjcvioKbyGuPw1yeJg605QA7VkrygEhd0CoQEjjgumfugpJ+VJgIt4ZjT9xMVCK5QWTIWoaA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/hr@0.0.8(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/img@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-jx/rPuKo31tV18fu7P5rRqelaH5wkhg83Dq7uLwJpfqhbi4KFBGeBfD0Y3PiLPPoh+WvYf+Adv9W2ghNW8nOMQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/html@0.0.7(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/link@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-tva3wvAWSR10lMJa9fVA09yRn7pbEki0ZZpHE6GD1jKbFhmzt38VgLO9B797/prqoDZdAr4rVK7LJFcdPx3GwA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/html@0.0.8(react@18.3.1)':
     dependencies:
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /@react-email/link@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-hXPChT3ZMyKnUSA60BLEMD2maEgyB2A37yg5bASbLMrXmsExHi6/IS1h2XiUPLDK4KqH5KFaFxi2cdNo1JOKwA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/img@0.0.7(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/link@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-nVikuTi8WJHa6Baad4VuRUbUCa/7EtZ1Qy73TRejaCHn+vhetc39XGqHzKLNh+Z/JFL8Hv9g+4AgG16o2R0ogQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/img@0.0.8(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/markdown@0.0.10(react@18.3.1):
-    resolution: {integrity: sha512-MH0xO+NJ4IuJcx9nyxbgGKAMXyudFjCZ0A2GQvuWajemW9qy2hgnJ3mW3/z5lwcenG+JPn7JyO/iZpizQ7u1tA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/link@0.0.7(react@18.3.1)':
     dependencies:
-      md-to-react-email: 5.0.2(react@18.3.1)
       react: 18.3.1
-    dev: false
 
-  /@react-email/markdown@0.0.12(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-wsuvj1XAb6O63aizCLNEeqVgKR3oFjAwt9vjfg2y2oh4G1dZeo8zonZM2x1fmkEkBZhzwSHraNi70jSXhA3A9w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/link@0.0.8(react@18.3.1)':
     dependencies:
-      md-to-react-email: 5.0.2(react@19.0.0-rc.0)
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /@react-email/markdown@0.0.9(react@18.3.1):
-    resolution: {integrity: sha512-t//19Zz+W5svKqrSrqoOLpf6dq70jbwYxX8Z+NEMi4LqylklccOaYAyKrkYyulfZwhW7KDH9d2wjVk5jfUABxQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/markdown@0.0.10(react@18.3.1)':
     dependencies:
       md-to-react-email: 5.0.2(react@18.3.1)
       react: 18.3.1
-    dev: false
 
-  /@react-email/preview@0.0.11(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-7O/CT4b16YlSGrj18htTPx3Vbhu2suCGv/cSe5c+fuSrIM/nMiBSZ3Js16Vj0XJbAmmmlVmYFZw9L20wXJ+LjQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
+  '@react-email/markdown@0.0.9(react@18.3.1)':
     dependencies:
-      react: 19.0.0-rc.0
-    dev: false
+      md-to-react-email: 5.0.2(react@18.3.1)
+      react: 18.3.1
 
-  /@react-email/preview@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-Jm0KUYBZQd2w0s2QRMQy0zfHdo3Ns+9bYSE1OybjknlvhANirjuZw9E5KfWgdzO7PyrRtB1OBOQD8//Obc4uIQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/preview@0.0.8(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/preview@0.0.9(react@18.3.1):
-    resolution: {integrity: sha512-2fyAA/zzZYfYmxfyn3p2YOIU30klyA6Dq4ytyWq4nfzQWWglt5hNDE0cMhObvRtfjM9ghMSVtoELAb0MWiF/kw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/preview@0.0.9(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/render@0.0.12:
-    resolution: {integrity: sha512-S8WRv/PqECEi6x0QJBj0asnAb5GFtJaHlnByxLETLkgJjc76cxMYDH4r9wdbuJ4sjkcbpwP3LPnVzwS+aIjT7g==}
-    engines: {node: '>=18.0.0'}
+  '@react-email/render@0.0.12':
     dependencies:
       html-to-text: 9.0.5
       js-beautify: 1.15.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@react-email/render@0.0.13:
-    resolution: {integrity: sha512-lmBizrV+rQeSa3GjiL8/kPU0gENqO/wv+4xrlWANabp9UY3lTLXzy7HMRSE8YFBES9AbxP5VX1iRKuEnsoBDew==}
-    engines: {node: '>=18.0.0'}
+  '@react-email/render@0.0.13':
     dependencies:
       html-to-text: 9.0.5
       js-beautify: 1.15.1
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
-
-  /@react-email/render@1.0.1(react-dom@18.3.1)(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-W3gTrcmLOVYnG80QuUp22ReIT/xfLsVJ+n7ghSlG2BITB8evNABn1AO2rGQoXuK84zKtDAlxCdm3hRyIpZdGSA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      html-to-text: 9.0.5
-      js-beautify: 1.15.1
-      react: 19.0.0-rc.0
-      react-dom: 18.3.1(react@19.0.0-rc.0)
-      react-promise-suspense: 0.3.4
-    dev: false
-
-  /@react-email/row@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-jPyEhG3gsLX+Eb9U+A30fh0gK6hXJwF4ghJ+ZtFQtlKAKqHX+eCpWlqB3Xschd/ARJLod8WAswg0FB+JD9d0/A==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/row@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-h7pwrLVGk5CIx7Ai/oPxBgCCAGY7BEpCUQ7FCzi4+eThcs5IdjSwDPefLEkwaFS8KZc56UNwTAH92kNq5B7blg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/row@0.0.7(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/row@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-JsB6pxs/ZyjYpEML3nbwJRGAerjcN/Pa/QG48XUwnT/MioDWrUuyQuefw+CwCrSUZ2P1IDrv2tUD3/E3xzcoKw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/row@0.0.8(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/section@0.0.11(react@18.3.1):
-    resolution: {integrity: sha512-3bZ/DuvX1julATI7oqYza6pOtWZgLJDBaa62LFFEvYjisyN+k6lrP2KOucPsDKu2DOkUzlQgK0FOm6VQJX+C0w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/section@0.0.11(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/section@0.0.12(react@18.3.1):
-    resolution: {integrity: sha512-UCD/N/BeOTN4h3VZBUaFdiSem6HnpuxD1Q51TdBFnqeNqS5hBomp8LWJJ9s4gzwHWk1XPdNfLA3I/fJwulJshg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/section@0.0.12(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
-
-  /@react-email/section@0.0.14(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-+fYWLb4tPU1A/+GE5J1+SEMA7/wR3V30lQ+OR9t2kAJqNrARDbMx0bLnYnR1QL5TiFRz0pCF05SQUobk6gHEDQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/tailwind@0.0.15(react@18.3.1):
-    resolution: {integrity: sha512-TE3NQ7VKhhvv3Zv0Z1NtoV6AF7aOWiG4juVezMZw1hZCG0mkN6iXC63u23vPQi12y6xCp20ZUHfg67kQeDSP/g==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/tailwind@0.0.15(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/tailwind@0.0.16(react@18.3.1):
-    resolution: {integrity: sha512-uMifPxCEHaHLhpS1kVCMGyTeEL+aMYzHT4bgj8CkgCiBoF9wNNfIVMUlHGzHUTv4ZTEPaMfZgC/Hi8RqzL/Ogw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/tailwind@0.0.16(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
-
-  /@react-email/tailwind@0.1.0(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-qysVUEY+M3SKUvu35XDpzn7yokhqFOT3tPU6Mj/pgc62TL5tQFj6msEbBtwoKs2qO3WZvai0DIHdLhaOxBQSow==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
-
-  /@react-email/text@0.0.10(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-wNAnxeEAiFs6N+SxS0y6wTJWfewEzUETuyS2aZmT00xk50VijwyFRuhm4sYSjusMyshevomFwz5jNISCxRsGWw==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0 || ^19.0 || ^19.0.0-rc
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /@react-email/text@0.0.7(react@18.3.1):
-    resolution: {integrity: sha512-eHCx0mdllGcgK9X7wiLKjNZCBRfxRVNjD3NNYRmOc3Icbl8M9JHriJIfxBuGCmGg2UAORK5P3KmaLQ8b99/pbA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: 18.2.0
+  '@react-email/text@0.0.7(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-email/text@0.0.8(react@18.3.1):
-    resolution: {integrity: sha512-uvN2TNWMrfC9wv/LLmMLbbEN1GrMWZb9dBK14eYxHHAEHCeyvGb5ePZZ2MPyzO7Y5yTC+vFEnCEr76V+hWMxCQ==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.2.0
+  '@react-email/text@0.0.8(react@18.3.1)':
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /@react-spring/rafz@9.7.4:
-    resolution: {integrity: sha512-mqDI6rW0Ca8IdryOMiXRhMtVGiEGLIO89vIOyFQXRIwwIMX30HLya24g9z4olDvFyeDW3+kibiKwtZnA4xhldA==}
-    dev: false
+  '@react-spring/rafz@9.7.4': {}
 
-  /@react-stately/calendar@3.4.3(react@18.2.0):
-    resolution: {integrity: sha512-OrEcdskszDjnjVnFuSiDC2PVBJ6lWMCJROD5s6W1LUehUtBp8LX9wPavAGHV43LbhN9ldj560sxaQ4WCddrRCA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/calendar@3.4.3(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@react-stately/utils': 3.9.0(react@18.2.0)
@@ -15436,12 +28109,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/calendar@3.5.4(react@18.2.0):
-    resolution: {integrity: sha512-R2011mtFSXIjzMXaA+CZ1sflPm9XkTBMqVk77Bnxso2ZsG7FUX8nqFmaDavxwTuHFC6OUexAGSMs8bP9KycTNg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/calendar@3.5.4(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@react-stately/utils': 3.10.3(react@18.2.0)
@@ -15449,12 +28118,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/checkbox@3.6.1(react@18.2.0):
-    resolution: {integrity: sha512-rOjFeVBy32edYwhKiHj3ZLdLeO+xZ2fnBwxnOBjcygnw4Neygm8FJH/dB1J0hdYYR349yby86ED2x0wRc84zPw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/checkbox@3.6.1(react@18.2.0)':
     dependencies:
       '@react-stately/form': 3.0.0(react@18.2.0)
       '@react-stately/utils': 3.9.0(react@18.2.0)
@@ -15462,12 +28127,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/checkbox@3.6.8(react@18.2.0):
-    resolution: {integrity: sha512-c8TWjU67XHHBCpqj6+FXXhQUWGr2Pil1IKggX81pkedhWiJl3/7+WHJuZI0ivGnRjp3aISNOG8UNVlBEjS9E8A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/checkbox@3.6.8(react@18.2.0)':
     dependencies:
       '@react-stately/form': 3.0.5(react@18.2.0)
       '@react-stately/utils': 3.10.3(react@18.2.0)
@@ -15475,32 +28136,20 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/collections@3.10.4(react@18.2.0):
-    resolution: {integrity: sha512-OHhCrItGt4zB2bSrgObRo0H2SC7QlkH8ReGxo+NVIWchXRLRoiWBP7S+IwleewEo5gOqDVPY3hqA9n4iiI8twg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/collections@3.10.4(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/collections@3.10.9(react@18.2.0):
-    resolution: {integrity: sha512-plyrng6hOQMG8LrjArMA6ts/DgWyXln3g90/hFNbqe/hdVYF53sDVsj8Jb+5LtoYTpiAlV6eOvy1XR0vPZUf8w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/collections@3.10.9(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/combobox@3.8.1(react@18.2.0):
-    resolution: {integrity: sha512-FaWkqTXQdWg7ptaeU4iPcqF/kxbRg2ZNUcvW/hiL/enciV5tRCsddvfNqvDvy1L30z9AUwlp9MWqzm/DhBITCw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/combobox@3.8.1(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/form': 3.0.0(react@18.2.0)
@@ -15512,12 +28161,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/combobox@3.9.2(react@18.2.0):
-    resolution: {integrity: sha512-ZsbAcD58IvxZqwYxg9d2gOf8R/k5RUB2TPUiGKD6wgWfEKH6SDzY3bgRByHGOyMCyJB62cHjih/ZShizNTguqA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/combobox@3.9.2(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/form': 3.0.5(react@18.2.0)
@@ -15529,22 +28174,14 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/data@3.11.0(react@18.2.0):
-    resolution: {integrity: sha512-0BlPT58WrAtUvpiEfUuyvIsGFTzp/9vA5y+pk53kGJhOdc5tqBGHi9cg40pYE/i1vdHJGMpyHGRD9nkQb8wN3Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/data@3.11.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/datepicker@3.10.2(react@18.2.0):
-    resolution: {integrity: sha512-pa5IZUw+49AyOnddwu4XwU2kI5eo/1thbiIVNHP8uDpbbBrBkquSk3zVFDAGX1cu/I1U2VUkt64U/dxgkwaMQw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/datepicker@3.10.2(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@internationalized/string': 3.2.3
@@ -15555,12 +28192,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/datepicker@3.9.1(react@18.2.0):
-    resolution: {integrity: sha512-o5xLvlZGJyAbTev2yruGlV2fzQyIDuYTgL19TTt0W0WCfjGGr/AAA9GjGXXmyoRA7sZMxqIPnnv7lNrdA38ofA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/datepicker@3.9.1(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@internationalized/string': 3.2.0
@@ -15571,66 +28204,42 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.2
       react: 18.2.0
-    dev: false
 
-  /@react-stately/dnd@3.2.7(react@18.2.0):
-    resolution: {integrity: sha512-QqSCvE9Rhp+Mr8Mt/SrByze24BFX1cy7gmXbwoqAYgHNIx3gWCVdBLqxfpfgYIhZdF9H72EWS8lQkfkZla06Ng==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/dnd@3.2.7(react@18.2.0)':
     dependencies:
       '@react-stately/selection': 3.14.2(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/dnd@3.4.2(react@18.2.0):
-    resolution: {integrity: sha512-VrHmNoNdVGrx5JHdz/zewmN+N8rlZe+vL/iAOLmvQ74RRLEz8KDFnHdlhgKg1AZqaSg3JJ18BlHEkS7oL1n+tA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/dnd@3.4.2(react@18.2.0)':
     dependencies:
       '@react-stately/selection': 3.16.2(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/flags@3.0.0:
-    resolution: {integrity: sha512-e3i2ItHbIa0eEwmSXAnPdD7K8syW76JjGe8ENxwFJPW/H1Pu9RJfjkCb/Mq0WSPN/TpxBb54+I9TgrGhbCoZ9w==}
+  '@react-stately/flags@3.0.0':
     dependencies:
       '@swc/helpers': 0.4.14
-    dev: false
 
-  /@react-stately/flags@3.0.3:
-    resolution: {integrity: sha512-/ha7XFA0RZTQsbzSPwu3KkbNMgbvuM0GuMTYLTBWpgBrovBNTM+QqI/PfZTdHg8PwCYF4H5Y8gjdSpdulCvJFw==}
+  '@react-stately/flags@3.0.3':
     dependencies:
       '@swc/helpers': 0.5.15
-    dev: false
 
-  /@react-stately/form@3.0.0(react@18.2.0):
-    resolution: {integrity: sha512-C8wkfFmtx1escizibhdka5JvTy9/Vp173CS9cakjvWTmnjYYC1nOlzwp7BsYWTgerCFbRY/BU/Cf/bJDxPiUKQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/form@3.0.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/form@3.0.5(react@18.2.0):
-    resolution: {integrity: sha512-J3plwJ63HQz109OdmaTqTA8Qhvl3gcYYK7DtgKyNP6mc/Me2Q4tl2avkWoA+22NRuv5m+J8TpBk4AVHUEOwqeQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/form@3.0.5(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/grid@3.8.4(react@18.2.0):
-    resolution: {integrity: sha512-rwqV1K4lVhaiaqJkt4TfYqdJoVIyqvSm98rKAYfCNzrKcivVpoiCMJ2EMt6WlYCjDVBdEOQ7fMV1I60IV0pntA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/grid@3.8.4(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/selection': 3.14.2(react@18.2.0)
@@ -15638,12 +28247,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/grid@3.9.2(react@18.2.0):
-    resolution: {integrity: sha512-2gK//sqAqg2Xaq6UITTFQwFUJnBRgcW+cKBVbFt+F8d152xB6UwwTS/K79E5PUkOotwqZgTEpkrSFs/aVxCLpw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/grid@3.9.2(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/selection': 3.16.2(react@18.2.0)
@@ -15651,12 +28256,8 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/list@3.10.2(react@18.2.0):
-    resolution: {integrity: sha512-INt+zofkIg2KN8B95xPi9pJG7ZFWAm30oIm/lCPBqM3K1Nm03/QaAbiQj2QeJcOsG3lb7oqI6D6iwTolwJkjIQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/list@3.10.2(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/selection': 3.14.2(react@18.2.0)
@@ -15664,12 +28265,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/list@3.10.8(react@18.2.0):
-    resolution: {integrity: sha512-rHCiPLXd+Ry3ztR9DkLA5FPQeH4Zd4/oJAEDWJ77W3oBBOdiMp3ZdHDLP7KBRh17XGNLO/QruYoHWAQTPiMF4g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/list@3.10.8(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/selection': 3.16.2(react@18.2.0)
@@ -15677,36 +28274,24 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/menu@3.6.0(react@18.2.0):
-    resolution: {integrity: sha512-OB6CjNyfOkAuirqx1oTL8z8epS9WDzLyrXjmRnxdiCU9EgRXLGAQNECuO7VIpl58oDry8tgRJiJ8fn8FivWSQA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/menu@3.6.0(react@18.2.0)':
     dependencies:
       '@react-stately/overlays': 3.6.4(react@18.2.0)
       '@react-types/menu': 3.9.6(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/menu@3.8.2(react@18.2.0):
-    resolution: {integrity: sha512-lt6hIHmSixMzkKx1rKJf3lbAf01EmEvvIlENL20GLiU9cRbpPnPJ1aJMZ5Ad5ygglA7wAemAx+daPhlTQfF2rg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/menu@3.8.2(react@18.2.0)':
     dependencies:
       '@react-stately/overlays': 3.6.10(react@18.2.0)
       '@react-types/menu': 3.9.11(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/numberfield@3.8.0(react@18.2.0):
-    resolution: {integrity: sha512-1XvB8tDOvZKcFnMM6qNLEaTVJcIc0jRFS/9jtS8MzalZvh8DbKi0Ucm1bGU7S5rkCx2QWqZ0rGOIm2h/RlcpkA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/numberfield@3.8.0(react@18.2.0)':
     dependencies:
       '@internationalized/number': 3.5.0
       '@react-stately/form': 3.0.0(react@18.2.0)
@@ -15714,12 +28299,8 @@ packages:
       '@react-types/numberfield': 3.7.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/numberfield@3.9.6(react@18.2.0):
-    resolution: {integrity: sha512-p2R9admGLI439qZzB39dyANhkruprJJtZwuoGVtxW/VD0ficw6BrPVqAaKG25iwKPkmveleh9p8o+yRqjGedcQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/numberfield@3.9.6(react@18.2.0)':
     dependencies:
       '@internationalized/number': 3.5.3
       '@react-stately/form': 3.0.5(react@18.2.0)
@@ -15727,34 +28308,22 @@ packages:
       '@react-types/numberfield': 3.8.5(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/overlays@3.6.10(react@18.2.0):
-    resolution: {integrity: sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/overlays@3.6.10(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.10.3(react@18.2.0)
       '@react-types/overlays': 3.8.9(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/overlays@3.6.4(react@18.2.0):
-    resolution: {integrity: sha512-tHEaoAGpE9dSnsskqLPVKum59yGteoSqsniTopodM+miQozbpPlSjdiQnzGLroy5Afx5OZYClE616muNHUILXA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/overlays@3.6.4(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.9.0(react@18.2.0)
       '@react-types/overlays': 3.8.4(react@18.2.0)
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/radio@3.10.1(react@18.2.0):
-    resolution: {integrity: sha512-MsBYbcLCvjKsqTAKe43T681F2XwKMsS7PLG0eplZgWP9210AMY78GeY1XPYZKHPAau8XkbYiuJqbqTerIJ3DBw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/radio@3.10.1(react@18.2.0)':
     dependencies:
       '@react-stately/form': 3.0.0(react@18.2.0)
       '@react-stately/utils': 3.9.0(react@18.2.0)
@@ -15762,12 +28331,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/radio@3.10.7(react@18.2.0):
-    resolution: {integrity: sha512-ZwGzFR+sGd42DxRlDTp3G2vLZyhMVtgHkwv2BxazPHxPMvLO9yYl7+3PPNxAmhMB4tg2u9CrzffpGX2rmEJEXA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/radio@3.10.7(react@18.2.0)':
     dependencies:
       '@react-stately/form': 3.0.5(react@18.2.0)
       '@react-stately/utils': 3.10.3(react@18.2.0)
@@ -15775,34 +28340,22 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/searchfield@3.5.0(react@18.2.0):
-    resolution: {integrity: sha512-SStjChkn/33pEn40slKQPnBnmQYyxVazVwPjiBkdeVejC42lUVairUTrGJgF0PNoZTbxn0so2/XzjqTC9T8iCw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/searchfield@3.5.0(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.9.0(react@18.2.0)
       '@react-types/searchfield': 3.5.2(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/searchfield@3.5.6(react@18.2.0):
-    resolution: {integrity: sha512-gVzU0FeWiLYD8VOYRgWlk79Qn7b2eirqOnWhtI5VNuGN8WyNaCIuBp6SkXTW2dY8hs2Hzn8HlMbgy1MIc7130Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/searchfield@3.5.6(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.10.3(react@18.2.0)
       '@react-types/searchfield': 3.5.8(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/select@3.6.1(react@18.2.0):
-    resolution: {integrity: sha512-e5ixtLiYLlFWM8z1msDqXWhflF9esIRfroptZsltMn1lt2iImUlDRlOTZlMtPQzUrDWoiHXRX88sSKUM/jXjQQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/select@3.6.1(react@18.2.0)':
     dependencies:
       '@react-stately/form': 3.0.0(react@18.2.0)
       '@react-stately/list': 3.10.2(react@18.2.0)
@@ -15811,12 +28364,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/select@3.6.7(react@18.2.0):
-    resolution: {integrity: sha512-hCUIddw0mPxVy1OH6jhyaDwgNea9wESjf+MYdnnTG/abRB+OZv/dWScd87OjzVsHTHWcw7CN4ZzlJoXm0FJbKQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/select@3.6.7(react@18.2.0)':
     dependencies:
       '@react-stately/form': 3.0.5(react@18.2.0)
       '@react-stately/list': 3.10.8(react@18.2.0)
@@ -15825,60 +28374,40 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/selection@3.14.2(react@18.2.0):
-    resolution: {integrity: sha512-mL7OoiUgVWaaF7ks5XSxgbXeShijYmD4G3bkBHhqkpugU600QH6BM2hloCq8KOUupk1y8oTljPtF9EmCv375DA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/selection@3.14.2(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/utils': 3.9.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/selection@3.16.2(react@18.2.0):
-    resolution: {integrity: sha512-C4eSKw7BIZHJLPzwqGqCnsyFHiUIEyryVQZTJDt6d0wYBOHU6k1pW+Q4VhrZuzSv+IMiI2RkiXeJKc55f0ZXrg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/selection@3.16.2(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/utils': 3.10.3(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
-      react: 18.2.0
-    dev: false
-
-  /@react-stately/slider@3.5.0(react@18.2.0):
-    resolution: {integrity: sha512-dOVpIxb7XKuiRxgpHt1bUSlsklciFki100tKIyBPR+Okar9iC/CwLYROYgVfLkGe77jEBNkor9tDLjDGEWcc1w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+      react: 18.2.0
+
+  '@react-stately/slider@3.5.0(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.9.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@react-types/slider': 3.7.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/slider@3.5.7(react@18.2.0):
-    resolution: {integrity: sha512-gEIGTcpBLcXixd8LYiLc8HKrBiGQJltrrEGoOvvTP8KVItXQxmeL+JiSsh8qgOoUdRRpzmAoFNUKGEg2/gtN8A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/slider@3.5.7(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.10.3(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@react-types/slider': 3.7.5(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/table@3.11.4(react@18.2.0):
-    resolution: {integrity: sha512-dWINJIEOKQl4qq3moq+S8xCD3m+yJqBj0dahr+rOkS+t2uqORwzsusTM35D2T/ZHZi49S2GpE7QuDa+edCynPw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/table@3.11.4(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/flags': 3.0.0
@@ -15890,12 +28419,8 @@ packages:
       '@react-types/table': 3.9.2(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/table@3.12.2(react@18.2.0):
-    resolution: {integrity: sha512-dUcsrdALylhWz6exqIoqtR/dnrzjIAptMyAUPT378Y/mCYs4PxKkHSvtPEQrZhdQS1ALIIgfeg9KUVIempoXPw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/table@3.12.2(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/flags': 3.0.3
@@ -15907,80 +28432,52 @@ packages:
       '@react-types/table': 3.10.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/tabs@3.6.3(react@18.2.0):
-    resolution: {integrity: sha512-Nj+Gacwa2SIzYIvHW40GsyX4Q6c8kF7GOuXESeQswbCjnwqhrSbDBp+ngPcUPUJxqFh6JhDCVwAS3wMhUoyUwA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/tabs@3.6.3(react@18.2.0)':
     dependencies:
       '@react-stately/list': 3.10.2(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@react-types/tabs': 3.3.4(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/tabs@3.6.9(react@18.2.0):
-    resolution: {integrity: sha512-YZDqZng3HrRX+uXmg6u78x73Oi24G5ICpiXVqDKKDkO333XCA5H8MWItiuPZkYB2h3SbaCaLqSobLkvCoWYpNQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/tabs@3.6.9(react@18.2.0)':
     dependencies:
       '@react-stately/list': 3.10.8(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@react-types/tabs': 3.3.9(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/toggle@3.7.0(react@18.2.0):
-    resolution: {integrity: sha512-TRksHkCJk/Xogq4181g3CYgJf+EfsJCqX5UZDSw1Z1Kgpvonjmdf6FAfQfCh9QR2OuXUL6hOLUDVLte5OPI+5g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/toggle@3.7.0(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.9.0(react@18.2.0)
       '@react-types/checkbox': 3.6.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/toggle@3.7.7(react@18.2.0):
-    resolution: {integrity: sha512-AS+xB4+hHWa3wzYkbS6pwBkovPfIE02B9SnuYTe0stKcuejpWKo5L3QMptW0ftFYsW3ZPCXuneImfObEw2T01A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/toggle@3.7.7(react@18.2.0)':
     dependencies:
       '@react-stately/utils': 3.10.3(react@18.2.0)
       '@react-types/checkbox': 3.8.3(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/tooltip@3.4.12(react@18.2.0):
-    resolution: {integrity: sha512-QKYT/cze7n9qaBsk7o5ais3jRfhYCzcVRfps+iys/W+/9FFbbhjfQG995Lwi6b+vGOHWfXxXpwmyIO2tzM1Iog==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/tooltip@3.4.12(react@18.2.0)':
     dependencies:
       '@react-stately/overlays': 3.6.10(react@18.2.0)
       '@react-types/tooltip': 3.4.11(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/tooltip@3.4.6(react@18.2.0):
-    resolution: {integrity: sha512-uL93bmsXf+OOgpKLPEKfpDH4z+MK2CuqlqVxx7rshN0vjWOSoezE5nzwgee90+RpDrLNNNWTNa7n+NkDRpI1jA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/tooltip@3.4.6(react@18.2.0)':
     dependencies:
       '@react-stately/overlays': 3.6.4(react@18.2.0)
       '@react-types/tooltip': 3.4.6(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/tree@3.7.5(react@18.2.0):
-    resolution: {integrity: sha512-xTJVwvhAeY0N5rui4N/TxN7f8hjXdqApDuGDxMZeFAWoQz8Abf7LFKBVQ3OkT6qVr7P+23dgoisUDBhD5a45Hg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/tree@3.7.5(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.4(react@18.2.0)
       '@react-stately/selection': 3.14.2(react@18.2.0)
@@ -15988,12 +28485,8 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/tree@3.8.4(react@18.2.0):
-    resolution: {integrity: sha512-HFNclIXJ/3QdGQWxXbj+tdlmIX/XwCfzAMB5m26xpJ6HtJhia6dtx3GLfcdyHNjmuRbAsTBsAAnnVKBmNRUdIQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/tree@3.8.4(react@18.2.0)':
     dependencies:
       '@react-stately/collections': 3.10.9(react@18.2.0)
       '@react-stately/selection': 3.16.2(react@18.2.0)
@@ -16001,547 +28494,320 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/utils@3.10.3(react@18.2.0):
-    resolution: {integrity: sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-stately/utils@3.10.3(react@18.2.0)':
     dependencies:
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/utils@3.9.0(react@18.2.0):
-    resolution: {integrity: sha512-yPKFY1F88HxuZ15BG2qwAYxtpE4HnIU0Ofi4CuBE0xC6I8mwo4OQjDzi+DZjxQngM9D6AeTTD6F1V8gkozA0Gw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/utils@3.9.0(react@18.2.0)':
     dependencies:
-      '@swc/helpers': 0.5.2
+      '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-stately/virtualizer@3.6.6(react@18.2.0):
-    resolution: {integrity: sha512-9hWvfITdE/028q4YFve6FxlmA3PdSMkUwpYA+vfaGCXI/4DFZIssBMspUeu4PTRJoV+k+m0z1wYHPmufrq6a3g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-stately/virtualizer@3.6.6(react@18.2.0)':
     dependencies:
       '@react-aria/utils': 3.23.0(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@swc/helpers': 0.5.15
       react: 18.2.0
-    dev: false
 
-  /@react-types/breadcrumbs@3.7.2(react@18.2.0):
-    resolution: {integrity: sha512-esl6RucDW2CNMsApJxNYfMtDaUcfLlwKMPH/loYsOBbKxGl2HsgVLMcdpjEkTRs2HCTNCbBXWpeU8AY77t+bsw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/breadcrumbs@3.7.2(react@18.2.0)':
     dependencies:
       '@react-types/link': 3.5.2(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/breadcrumbs@3.7.7(react@18.2.0):
-    resolution: {integrity: sha512-ZmhXwD2LLzfEA2OvOCp/QvXu8A/Edsrn5q0qUDGsmOZj9SCVeT82bIv8P+mQnATM13mi2gyoik6102Jc1OscJA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/breadcrumbs@3.7.7(react@18.2.0)':
     dependencies:
       '@react-types/link': 3.5.7(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/button@3.9.1(react@18.2.0):
-    resolution: {integrity: sha512-bf9iTar3PtqnyV9rA+wyFyrskZKhwmOuOd/ifYIjPs56YNVXWH5Wfqj6Dx3xdFBgtKx8mEVQxVhoX+WkHX+rtw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/button@3.9.1(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/button@3.9.6(react@18.2.0):
-    resolution: {integrity: sha512-8lA+D5JLbNyQikf8M/cPP2cji91aVTcqjrGpDqI7sQnaLFikM8eFR6l1ZWGtZS5MCcbfooko77ha35SYplSQvw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/button@3.9.6(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/calendar@3.4.3(react@18.2.0):
-    resolution: {integrity: sha512-96x57ctX5wNEl+8et3sc2NQm8neOJayEeqOQQpyPtI7jyvst/xBrKCwysf9W/dhgPlUC+KeBAYFWfjd5hFVHYA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/calendar@3.4.3(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/calendar@3.4.9(react@18.2.0):
-    resolution: {integrity: sha512-O/PS9c21HgO9qzxOyZ7/dTccxabFZdF6tj3UED4DrBw7AN3KZ7JMzwzYbwHinOcO7nUcklGgNoAIHk45UAKR9g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/calendar@3.4.9(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/checkbox@3.6.0(react@18.2.0):
-    resolution: {integrity: sha512-vgbuJzQpVCNT5AZWV0OozXCnihqrXxoZKfJFIw0xro47pT2sn3t5UC4RA9wfjDGMoK4frw1K/4HQLsQIOsPBkw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/checkbox@3.6.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/checkbox@3.8.3(react@18.2.0):
-    resolution: {integrity: sha512-f4c1mnLEt0iS1NMkyZXgT3q3AgcxzDk7w6MSONOKydcnh0xG5L2oefY14DhVDLkAuQS7jThlUFwiAs+MxiO3MA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/checkbox@3.8.3(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/combobox@3.10.0(react@18.2.0):
-    resolution: {integrity: sha512-1IXSNS02TPbguyYopaW2snU6sZusbClHrEyVr4zPeexTV4kpUUBNXOzFQ+eSQRR0r2XW57Z0yRW4GJ6FGU0yCA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/combobox@3.10.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/combobox@3.12.1(react@18.2.0):
-    resolution: {integrity: sha512-bd5YwHZWtgnJx4jGbplWbYzXj7IbO5w3IY5suNR7r891rx6IktquZ8GQwyYH0pQ/x+X5LdK2xI59i6+QC2PmlA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/combobox@3.12.1(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/datepicker@3.7.1(react@18.2.0):
-    resolution: {integrity: sha512-5juVDULOytNzkotqX8j5mYKJckeIpkgbHqVSGkPgLw0++FceIaSZ6RH56cqLup0pO45paqIt9zHh+QXBYX+syg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/datepicker@3.7.1(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.1
       '@react-types/calendar': 3.4.3(react@18.2.0)
       '@react-types/overlays': 3.8.4(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/datepicker@3.8.2(react@18.2.0):
-    resolution: {integrity: sha512-Ih4F0bNVGrEuwCD8XmmBAspuuOBsj/Svn/pDFtC2RyAZjXfWh+sI+n4XLz/sYKjvARh5TUI8GNy9smYS4vYXug==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/datepicker@3.8.2(react@18.2.0)':
     dependencies:
       '@internationalized/date': 3.5.5
       '@react-types/calendar': 3.4.9(react@18.2.0)
       '@react-types/overlays': 3.8.9(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/dialog@3.5.12(react@18.2.0):
-    resolution: {integrity: sha512-JmpQbSpXltqEyYfEwoqDolABIiojeExkqolHNdQlayIsfFuSxZxNwXZPOpz58Ri/iwv21JP7K3QF0Gb2Ohxl9w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/dialog@3.5.12(react@18.2.0)':
     dependencies:
       '@react-types/overlays': 3.8.9(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/dialog@3.5.7(react@18.2.0):
-    resolution: {integrity: sha512-geYoqAyQaTLG43AaXdMUVqZXYgkSifrD9cF7lR2kPAT0uGFv0YREi6ieU+aui8XJ83EW0xcxP+EPWd2YkN4D4w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/dialog@3.5.7(react@18.2.0)':
     dependencies:
       '@react-types/overlays': 3.8.4(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/grid@3.2.3(react@18.2.0):
-    resolution: {integrity: sha512-GQM4RDmYhstcYZ0Odjq+xUwh1fhLmRebG6qMM8OXHTPQ77nhl3wc1UTGRhZm6mzEionplSRx4GCpEMEHMJIU0w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/grid@3.2.3(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/grid@3.2.8(react@18.2.0):
-    resolution: {integrity: sha512-6PJrpukwMqlv3IhJSDkJuVbhHM8Oe6hd2supWqd9adMXrlSP7QHt9a8SgFcFblCCTx8JzUaA0PvY5sTudcEtOQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/grid@3.2.8(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/link@3.5.2(react@18.2.0):
-    resolution: {integrity: sha512-/s51/WejmpLiyxOgP89s4txgxYoGaPe8pVDItVo1h4+BhU1Puyvgv/Jx8t9dPvo6LUXbraaN+SgKk/QDxaiirw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/link@3.5.2(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/link@3.5.7(react@18.2.0):
-    resolution: {integrity: sha512-2WyaVmm1qr9UrSG3Dq6iz+2ziuVp+DH8CsYZ9CA6aNNb6U18Hxju3LTPb4a5gM0eC7W0mQGNBmrgGlAdDZEJOw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/link@3.5.7(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/listbox@3.4.6(react@18.2.0):
-    resolution: {integrity: sha512-XOQvrTqNh5WIPDvKiWiep8T07RAsMfjAXTjDbnjxVlKACUXkcwpts9kFaLnJ9LJRFt6DwItfP+WMkzvmx63/NQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/listbox@3.4.6(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/listbox@3.5.1(react@18.2.0):
-    resolution: {integrity: sha512-n5bOgD9lgfK1qaLtag9WPnu151SwXBCNn/OgGY/Br9mWRl+nPUEYtFcPX+2VCld7uThf54kwrTmzlFnaraIlcw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/listbox@3.5.1(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/menu@3.9.11(react@18.2.0):
-    resolution: {integrity: sha512-IguQVF70d7aHXgWB1Rd2a/PiIuLZ2Nt7lyayJshLcy/NLOYmgpTmTyn2WCtlA5lTfQwmQrNFf4EvnWkeljJXdA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/menu@3.9.11(react@18.2.0)':
     dependencies:
       '@react-types/overlays': 3.8.9(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/menu@3.9.6(react@18.2.0):
-    resolution: {integrity: sha512-w/RbFInOf4nNayQDv5c2L8IMJbcFOkBhsT3xvvpTy+CHvJcQdjggwaV1sRiw7eF/PwB81k2CwigmidUzHJhKDg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/menu@3.9.6(react@18.2.0)':
     dependencies:
       '@react-types/overlays': 3.8.4(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/meter@3.3.6(react@18.2.0):
-    resolution: {integrity: sha512-1XYp1fA9UU0lO6kjf3TwVE8mppOJa64mBKAcLWtTyq1e/cYIAbx5o6CsuUx0YDpXKF6gdtvIWvfmxeWsmqJ1jQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/meter@3.3.6(react@18.2.0)':
     dependencies:
       '@react-types/progress': 3.5.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/meter@3.4.3(react@18.2.0):
-    resolution: {integrity: sha512-Y2fX5CTAPGRKxVSeepbeyN6/K+wlF9pMRcNxTSU2qDwdoFqNCtTWMcWuCsU/Y2L/zU0jFWu4x0Vo7WkrcsgcMA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/meter@3.4.3(react@18.2.0)':
     dependencies:
       '@react-types/progress': 3.5.6(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/numberfield@3.7.0(react@18.2.0):
-    resolution: {integrity: sha512-gaGi+vqm1Y8LCWRsWYUjcGftPIzl+8W2VOfkgKMLM8y76nnwTPtmAqs+Ap1cg7sEJSfsiKMq93e9yvP3udrC2w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/numberfield@3.7.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/numberfield@3.8.5(react@18.2.0):
-    resolution: {integrity: sha512-LVWggkxwd1nyVZomXBPfQA1E4I4/i4PBifjcDs2AfcV7q5RE9D+DVIDXsYucVOBxPlDOxiAq/T9ypobspWSwHw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/numberfield@3.8.5(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/overlays@3.8.4(react@18.2.0):
-    resolution: {integrity: sha512-pfgNlQnbF6RB/R2oSxyqAP3Uzz0xE/k5q4n5gUeCDNLjY5qxFHGE8xniZZ503nZYw6VBa9XMN1efDOKQyeiO0w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/overlays@3.8.4(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/overlays@3.8.9(react@18.2.0):
-    resolution: {integrity: sha512-9ni9upQgXPnR+K9cWmbYWvm3ll9gH8P/XsEZprqIV5zNLMF334jADK48h4jafb1X9RFnj0WbHo6BqcSObzjTig==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/overlays@3.8.9(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/progress@3.5.1(react@18.2.0):
-    resolution: {integrity: sha512-CqsUjczUK/SfuFzDcajBBaXRTW0D3G9S/yqLDj9e8E0ii+lGDLt1PHj24t1J7E88U2rVYqmM9VL4NHTt8o3IYA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/progress@3.5.1(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/progress@3.5.6(react@18.2.0):
-    resolution: {integrity: sha512-Nh43sjQ5adyN1bTHBPRaIPhXUdBqP0miYeJpeMY3V/KUl4qmouJLwDnccwFG4xLm6gBfYe22lgbbV7nAfNnuTQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/progress@3.5.6(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/radio@3.7.0(react@18.2.0):
-    resolution: {integrity: sha512-EcwGAXzSHjSqpFZha7xn3IUrhPiJLj+0yb1Ip0qPmhWz0VVw2DwrkY7q/jfaKroVvQhTo2TbfGhcsAQrt0fRqg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/radio@3.7.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/radio@3.8.3(react@18.2.0):
-    resolution: {integrity: sha512-fUVJt4Bb6jOReFqnhHVNxWXH7t6c60uSFfoPKuXt/xI9LL1i2jhpur0ggpTfIn3qLIAmNBU6bKBCWAdr4KjeVQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/radio@3.8.3(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/searchfield@3.5.2(react@18.2.0):
-    resolution: {integrity: sha512-JAK2/Kg4Dr393FYfbRw0TlXKnJPX77sq1x/ZBxtO6p64+MuuIYKqw0i9PwDlo1PViw2QI5u8GFhKA2TgemY9uA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/searchfield@3.5.2(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       '@react-types/textfield': 3.9.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/searchfield@3.5.8(react@18.2.0):
-    resolution: {integrity: sha512-EcdqalHNIC6BJoRfmqUhAvXRd3aHkWlV1cFCz57JJKgUEFYyXPNrXd1b73TKLzTXEk+X/D6LKV15ILYpEaxu8w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/searchfield@3.5.8(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       '@react-types/textfield': 3.9.6(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/select@3.9.1(react@18.2.0):
-    resolution: {integrity: sha512-EpKSxrnh8HdZvOF9dHQkjivAcdIp1K81FaxmvosH8Lygqh0iYXxAdZGtKLMyBoPI8YFhA+rotIzTcOqgCCnqWA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/select@3.9.1(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/select@3.9.6(react@18.2.0):
-    resolution: {integrity: sha512-cVSFR0eJLup/ht1Uto+y8uyLmHO89J6wNh65SIHb3jeVz9oLBAedP3YNI2qB+F9qFMUcA8PBSLXIIuT6gXzLgQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/select@3.9.6(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/shared@3.22.0(react@18.2.0):
-    resolution: {integrity: sha512-yVOekZWbtSmmiThGEIARbBpnmUIuePFlLyctjvCbgJgGhz8JnEJOipLQ/a4anaWfzAgzSceQP8j/K+VOOePleA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/shared@3.22.0(react@18.2.0)':
     dependencies:
       react: 18.2.0
-    dev: false
 
-  /@react-types/shared@3.24.1(react@18.2.0):
-    resolution: {integrity: sha512-AUQeGYEm/zDTN6zLzdXolDxz3Jk5dDL7f506F07U8tBwxNNI3WRdhU84G0/AaFikOZzDXhOZDr3MhQMzyE7Ydw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/shared@3.24.1(react@18.2.0)':
     dependencies:
       react: 18.2.0
-    dev: false
 
-  /@react-types/slider@3.7.0(react@18.2.0):
-    resolution: {integrity: sha512-uyQXUVFfqc9SPUW0LZLMan2n232F/OflRafiHXz9viLFa9tVOupVa7GhASRAoHojwkjoJ1LjFlPih7g5dOZ0/Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/slider@3.7.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/slider@3.7.5(react@18.2.0):
-    resolution: {integrity: sha512-bRitwQRQjQoOcKEdPMljnvm474dwrmsc6pdsVQDh/qynzr+KO9IHuYc3qPW53WVE2hMQJDohlqtCAWQXWQ5Vcg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/slider@3.7.5(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/switch@3.5.0(react@18.2.0):
-    resolution: {integrity: sha512-/wNmUGjk69bP6t5k2QkAdrNN5Eb9Rz4dOyp0pCPmoeE+5haW6sV5NmtkvWX1NSc4DQz1xL/a5b+A0vxPCP22Jw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/switch@3.5.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/switch@3.5.5(react@18.2.0):
-    resolution: {integrity: sha512-SZx1Bd+COhAOs/RTifbZG+uq/llwba7VAKx7XBeX4LeIz1dtguy5bigOBgFTMQi4qsIVCpybSWEEl+daj4XFPw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/switch@3.5.5(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/table@3.10.1(react@18.2.0):
-    resolution: {integrity: sha512-xsNh0Gm4GtNeSknZqkMsfGvc94fycmfhspGO+FzQKim2hB5k4yILwd+lHYQ2UKW6New9GVH/zN2Pd3v67IeZ2g==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/table@3.10.1(react@18.2.0)':
     dependencies:
       '@react-types/grid': 3.2.8(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/table@3.9.2(react@18.2.0):
-    resolution: {integrity: sha512-brw5JUANOzBa2rYNpN8AIl9nDZ9RwRZC6G/wTM/JhtirjC1S42oCtf8Ap5rWJBdmMG/5KOfcGNcAl/huyqb3gg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/table@3.9.2(react@18.2.0)':
     dependencies:
       '@react-types/grid': 3.2.3(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/tabs@3.3.4(react@18.2.0):
-    resolution: {integrity: sha512-4mCTtFrwMRypyGTZCvNYVT9CkknexO/UYvqwDm2jMYb8JgjRvxnomu776Yh7uyiYKWyql2upm20jqasEOm620w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/tabs@3.3.4(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/tabs@3.3.9(react@18.2.0):
-    resolution: {integrity: sha512-3Q9kRVvg/qDyeJR/W1+C2z2OyvDWQrSLvOCvAezX5UKzww4rBEAA8OqBlyDwn7q3fiwrh/m64l6p+dbln+RdxQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/tabs@3.3.9(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/textfield@3.9.0(react@18.2.0):
-    resolution: {integrity: sha512-D/DiwzsfkwlAg3uv8hoIfwju+zhB/hWDEdTvxQbPkntDr0kmN/QfI17NMSzbOBCInC4ABX87ViXLGxr940ykGA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/textfield@3.9.0(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/textfield@3.9.6(react@18.2.0):
-    resolution: {integrity: sha512-0uPqjJh4lYp1aL1HL9IlV8Cgp8eT0PcsNfdoCktfkLytvvBPmox2Pfm57W/d0xTtzZu2CjxhYNTob+JtGAOeXA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/textfield@3.9.6(react@18.2.0)':
     dependencies:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/tooltip@3.4.11(react@18.2.0):
-    resolution: {integrity: sha512-WPikHQxeT5Lb09yJEaW6Ja3ecE0g1YM6ukWYS2v/iZLUPn5YlYrGytspuCYQNSh/u7suCz4zRLEHYCl7OCigjw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  '@react-types/tooltip@3.4.11(react@18.2.0)':
     dependencies:
       '@react-types/overlays': 3.8.9(react@18.2.0)
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@react-types/tooltip@3.4.6(react@18.2.0):
-    resolution: {integrity: sha512-RaZewdER7ZcsNL99RhVHs8kSLyzIBkwc0W6eFZrxST2MD9J5GzkVWRhIiqtFOd5U1aYnxdJ6woq72Ef+le6Vfw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  '@react-types/tooltip@3.4.6(react@18.2.0)':
     dependencies:
       '@react-types/overlays': 3.8.4(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /@remix-run/changelog-github@0.0.5:
-    resolution: {integrity: sha512-43tqwUqWqirbv6D9uzo55ASPsCJ61Ein1k/M8qn+Qpros0MmbmuzjLVPmtaxfxfe2ANX0LefLvCD0pAgr1tp4g==}
+  '@remix-run/changelog-github@0.0.5(encoding@0.1.13)':
     dependencies:
       '@changesets/errors': 0.1.4
-      '@changesets/get-github-info': 0.5.2
+      '@changesets/get-github-info': 0.5.2(encoding@0.1.13)
       '@changesets/types': 5.2.1
       dotenv: 8.6.0
     transitivePeerDependencies:
       - encoding
-    dev: false
 
-  /@remix-run/dev@2.1.0(@remix-run/serve@2.1.0)(@types/node@20.14.14)(ts-node@10.9.1)(typescript@5.5.4):
-    resolution: {integrity: sha512-Hn5lw46F+a48dp5uHKe68ckaHgdStW4+PmLod+LMFEqrMbkF0j4XD1ousebxlv989o0Uy/OLgfRMgMy4cBOvHg==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
-    peerDependencies:
-      '@remix-run/serve': ^2.1.0
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      '@remix-run/serve':
-        optional: true
-      typescript:
-        optional: true
+  '@remix-run/dev@2.1.0(@remix-run/serve@2.1.0(typescript@5.5.4))(@types/node@20.14.14)(bufferutil@4.0.9)(encoding@0.1.13)(lightningcss@1.29.2)(terser@5.44.1)(typescript@5.5.4)':
     dependencies:
       '@babel/core': 7.22.17
-      '@babel/generator': 7.22.15
-      '@babel/parser': 7.22.16
+      '@babel/generator': 7.24.7
+      '@babel/parser': 7.27.5
       '@babel/plugin-syntax-decorators': 7.22.10(@babel/core@7.22.17)
       '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.17)
       '@babel/preset-typescript': 7.21.5(@babel/core@7.22.17)
-      '@babel/traverse': 7.22.17
+      '@babel/traverse': 7.24.7
       '@mdx-js/mdx': 2.3.0
       '@npmcli/package-json': 4.0.1
-      '@remix-run/serve': 2.1.0(typescript@5.5.4)
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
       '@types/mdx': 2.0.5
-      '@vanilla-extract/integration': 6.2.1(@types/node@20.14.14)
+      '@vanilla-extract/integration': 6.2.1(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
       arg: 5.0.2
       cacache: 17.1.4
       chalk: 4.1.2
       chokidar: 3.6.0
-      dotenv: 16.4.5
+      dotenv: 16.4.7
       esbuild: 0.17.6
       esbuild-plugins-node-modules-polyfill: 1.6.1(esbuild@0.17.6)
       execa: 5.1.1
@@ -16552,28 +28818,30 @@ packages:
       gunzip-maybe: 1.4.2
       jsesc: 3.0.2
       json5: 2.2.3
-      lodash: 4.17.21
+      lodash: 4.17.23
       lodash.debounce: 4.0.8
-      minimatch: 9.0.3
-      node-fetch: 2.6.12
+      minimatch: 9.0.5
+      node-fetch: 2.6.12(encoding@0.1.13)
       ora: 5.4.1
-      picocolors: 1.0.0
+      picocolors: 1.1.1
       picomatch: 2.3.1
       pidtree: 0.6.0
-      postcss: 8.4.29
-      postcss-discard-duplicates: 5.1.0(postcss@8.4.29)
-      postcss-load-config: 4.0.1(postcss@8.4.29)(ts-node@10.9.1)
-      postcss-modules: 6.0.0(postcss@8.4.29)
+      postcss: 8.5.4
+      postcss-discard-duplicates: 5.1.0(postcss@8.5.4)
+      postcss-load-config: 4.0.2(postcss@8.5.4)
+      postcss-modules: 6.0.0(postcss@8.5.4)
       prettier: 2.8.8
       pretty-ms: 7.0.1
       react-refresh: 0.14.0
       remark-frontmatter: 4.0.1
       remark-mdx-frontmatter: 1.1.1
-      semver: 7.6.3
+      semver: 5.7.2
       tar-fs: 2.1.3
       tsconfig-paths: 4.2.0
+      ws: 8.17.1(bufferutil@4.0.9)
+    optionalDependencies:
+      '@remix-run/serve': 2.1.0(typescript@5.5.4)
       typescript: 5.5.4
-      ws: 7.5.9
     transitivePeerDependencies:
       - '@types/node'
       - bluebird
@@ -16588,30 +28856,20 @@ packages:
       - terser
       - ts-node
       - utf-8-validate
-    dev: true
 
-  /@remix-run/eslint-config@2.1.0(eslint@8.31.0)(react@18.2.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-yfeUnHpUG+XveujMi6QODKMGhs5CvKWCKzASU397BPXiPWbMv6r2acfODSWK64ZdBMu9hcLbOb42GBFydVQeHA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      eslint: ^8.0.0
-      react: ^18.0.0
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@remix-run/eslint-config@2.1.0(eslint@8.31.0)(react@18.2.0)(typescript@5.5.4)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/eslint-parser': 7.21.8(@babel/core@7.22.17)(eslint@8.31.0)
       '@babel/preset-react': 7.18.6(@babel/core@7.22.17)
       '@rushstack/eslint-patch': 1.2.0
-      '@typescript-eslint/eslint-plugin': 5.59.6(@typescript-eslint/parser@5.59.6)(eslint@8.31.0)(typescript@5.5.4)
+      '@typescript-eslint/eslint-plugin': 5.59.6(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4)
       '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       eslint: 8.31.0
       eslint-import-resolver-node: 0.3.7
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
-      eslint-plugin-jest: 26.9.0(@typescript-eslint/eslint-plugin@5.59.6)(eslint@8.31.0)(typescript@5.5.4)
+      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
+      eslint-plugin-jest: 26.9.0(@typescript-eslint/eslint-plugin@5.59.6(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4)
       eslint-plugin-jest-dom: 4.0.3(eslint@8.31.0)
       eslint-plugin-jsx-a11y: 6.7.1(eslint@8.31.0)
       eslint-plugin-node: 11.1.0(eslint@8.31.0)
@@ -16619,77 +28877,48 @@ packages:
       eslint-plugin-react-hooks: 4.6.2(eslint@8.31.0)
       eslint-plugin-testing-library: 5.11.0(eslint@8.31.0)(typescript@5.5.4)
       react: 18.2.0
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - eslint-import-resolver-webpack
       - jest
       - supports-color
-    dev: true
 
-  /@remix-run/express@2.1.0(express@4.20.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-R5myPowQx6LYWY3+EqP42q19MOCT3+ZGwb2f0UKNs9a34R8U3nFpGWL7saXryC+To+EasujEScc8rTQw5Pftog==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      express: ^4.17.1
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@remix-run/express@2.1.0(express@4.20.0)(typescript@5.5.4)':
     dependencies:
       '@remix-run/node': 2.1.0(typescript@5.5.4)
       express: 4.20.0
+    optionalDependencies:
       typescript: 5.5.4
 
-  /@remix-run/node@2.1.0(typescript@5.5.4):
-    resolution: {integrity: sha512-TeSgjXnZUUlmw5FVpBVnXY7MLpracjdnwFNwoJE5NQkiUEFnGD/Yhvk4F2fOCkszqc2Z25KRclc5noweyiFu6Q==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@remix-run/node@2.1.0(typescript@5.5.4)':
     dependencies:
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
       '@remix-run/web-fetch': 4.4.1
       '@remix-run/web-file': 3.1.0
       '@remix-run/web-stream': 1.1.0
-      '@web3-storage/multipart-parser': 1.0.0
-      cookie-signature: 1.2.0
-      source-map-support: 0.5.21
-      stream-slice: 0.1.2
-      typescript: 5.5.4
-
-  /@remix-run/react@2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-DeYgfsvNxHqNn29sGA3XsZCciMKo2EFTQ9hHkuVPTsJXC4ipHr6Dja1j6UzZYPe/ZuKppiuTjueWCQlE2jOe1w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0.0
-      react-dom: ^18.0.0
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+      '@web3-storage/multipart-parser': 1.0.0
+      cookie-signature: 1.2.0
+      source-map-support: 0.5.21
+      stream-slice: 0.1.2
+    optionalDependencies:
+      typescript: 5.5.4
+
+  '@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)':
     dependencies:
       '@remix-run/router': 1.10.0
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-router-dom: 6.17.0(react-dom@18.2.0)(react@18.2.0)
+      react-router-dom: 6.17.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+    optionalDependencies:
       typescript: 5.5.4
 
-  /@remix-run/router@1.10.0:
-    resolution: {integrity: sha512-Lm+fYpMfZoEucJ7cMxgt4dYt8jLfbpwRCzAjm9UgSLOkmlqo9gupxt6YX3DY0Fk155NT9l17d/ydi+964uS9Lw==}
-    engines: {node: '>=14.0.0'}
+  '@remix-run/router@1.10.0': {}
 
-  /@remix-run/router@1.15.3:
-    resolution: {integrity: sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==}
-    engines: {node: '>=14.0.0'}
-    dev: false
+  '@remix-run/router@1.15.3': {}
 
-  /@remix-run/serve@2.1.0(typescript@5.5.4):
-    resolution: {integrity: sha512-XHI+vPYz217qrg1QcV38TTPlEBTzMJzAt0SImPutyF0S2IBrZGZIFMEsspI0i0wNvdcdQz1IqmSx+mTghzW8eQ==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  '@remix-run/serve@2.1.0(typescript@5.5.4)':
     dependencies:
       '@remix-run/express': 2.1.0(express@4.20.0)(typescript@5.5.4)
       '@remix-run/node': 2.1.0(typescript@5.5.4)
@@ -16703,14 +28932,7 @@ packages:
       - supports-color
       - typescript
 
-  /@remix-run/server-runtime@2.1.0(typescript@5.5.4):
-    resolution: {integrity: sha512-Uz69yF4Gu6F3VYQub3JgDo9godN8eDMeZclkadBTAWN7bYLonu0ChR/GlFxS35OLeF7BDgudxOSZob0nE1WHNg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@remix-run/server-runtime@2.1.0(typescript@5.5.4)':
     dependencies:
       '@remix-run/router': 1.10.0
       '@types/cookie': 0.4.1
@@ -16718,47 +28940,32 @@ packages:
       cookie: 0.4.2
       set-cookie-parser: 2.6.0
       source-map: 0.7.4
+    optionalDependencies:
       typescript: 5.5.4
 
-  /@remix-run/testing@2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-eLPx4Bmjt243kyRpQTong1eFo6nkvSfCr65bb5PfoF172DKnsSSCYWAmBmB72VwtAPESHxBm3g6AUbhwphkU6A==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: ^18.0.0
-      typescript: ^5.1.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@remix-run/testing@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)':
     dependencies:
       '@remix-run/node': 2.1.0(typescript@5.5.4)
-      '@remix-run/react': 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+      '@remix-run/react': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@remix-run/router': 1.10.0
       react: 18.2.0
-      react-router-dom: 6.17.0(react-dom@18.2.0)(react@18.2.0)
+      react-router-dom: 6.17.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - react-dom
-    dev: true
 
-  /@remix-run/v1-meta@0.1.3(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0):
-    resolution: {integrity: sha512-pYTJSrT8ouipv9gL7sqk4hjgVrfj6Jcp9KDnjZKPFUF+91S1J5PNjipAHE1aXh0LyHo2rDbTW/OjtFeJ6BKhYg==}
-    peerDependencies:
-      '@remix-run/react': ^1.15.0 || ^2.0.0
-      '@remix-run/server-runtime': ^1.15.0 || ^2.0.0
+  '@remix-run/v1-meta@0.1.3(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))':
     dependencies:
-      '@remix-run/react': 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+      '@remix-run/react': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
-    dev: false
 
-  /@remix-run/web-blob@3.1.0:
-    resolution: {integrity: sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==}
+  '@remix-run/web-blob@3.1.0':
     dependencies:
       '@remix-run/web-stream': 1.1.0
       web-encoding: 1.1.5
 
-  /@remix-run/web-fetch@4.4.1:
-    resolution: {integrity: sha512-xMceEGn2kvfeWS91nHSOhEQHPGgjFnmDVpWFZrbWPVdiTByMZIn421/tdSF6Kd1RsNsY+5Iwt3JFEKZHAcMQHw==}
-    engines: {node: ^10.17 || >=12.3}
+  '@remix-run/web-fetch@4.4.1':
     dependencies:
       '@remix-run/web-blob': 3.1.0
       '@remix-run/web-file': 3.1.0
@@ -16769,381 +28976,324 @@ packages:
       data-uri-to-buffer: 3.0.1
       mrmime: 1.0.1
 
-  /@remix-run/web-file@3.1.0:
-    resolution: {integrity: sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ==}
+  '@remix-run/web-file@3.1.0':
     dependencies:
       '@remix-run/web-blob': 3.1.0
 
-  /@remix-run/web-form-data@3.1.0:
-    resolution: {integrity: sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A==}
+  '@remix-run/web-form-data@3.1.0':
     dependencies:
       web-encoding: 1.1.5
 
-  /@remix-run/web-stream@1.1.0:
-    resolution: {integrity: sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA==}
+  '@remix-run/web-stream@1.1.0':
     dependencies:
       web-streams-polyfill: 3.2.1
 
-  /@rollup/rollup-android-arm-eabi@4.36.0:
-    resolution: {integrity: sha512-jgrXjjcEwN6XpZXL0HUeOVGfjXhPyxAbbhD0BlXUB+abTOpbPiN5Wb3kOT7yb+uEtATNYF5x5gIfwutmuBA26w==}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-android-arm-eabi@4.36.0':
     optional: true
 
-  /@rollup/rollup-android-arm64@4.36.0:
-    resolution: {integrity: sha512-NyfuLvdPdNUfUNeYKUwPwKsE5SXa2J6bCt2LdB/N+AxShnkpiczi3tcLJrm5mA+eqpy0HmaIY9F6XCa32N5yzg==}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-android-arm64@4.36.0':
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.36.0:
-    resolution: {integrity: sha512-JQ1Jk5G4bGrD4pWJQzWsD8I1n1mgPXq33+/vP4sk8j/z/C2siRuxZtaUA7yMTf71TCZTZl/4e1bfzwUmFb3+rw==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-darwin-arm64@4.36.0':
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.41.1:
-    resolution: {integrity: sha512-5afxvwszzdulsU2w8JKWwY8/sJOLPzf0e1bFuvcW5h9zsEg+RQAojdW0ux2zyYAz7R8HvvzKCjLNJhVq965U7w==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@rollup/rollup-darwin-arm64@4.53.2':
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.36.0:
-    resolution: {integrity: sha512-6c6wMZa1lrtiRsbDziCmjE53YbTkxMYhhnWnSW8R/yqsM7a6mSJ3uAVT0t8Y/DGt7gxUWYuFM4bwWk9XCJrFKA==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-darwin-x64@4.36.0':
     optional: true
 
-  /@rollup/rollup-freebsd-arm64@4.36.0:
-    resolution: {integrity: sha512-KXVsijKeJXOl8QzXTsA+sHVDsFOmMCdBRgFmBb+mfEb/7geR7+C8ypAml4fquUt14ZyVXaw2o1FWhqAfOvA4sg==}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-freebsd-arm64@4.36.0':
     optional: true
 
-  /@rollup/rollup-freebsd-x64@4.36.0:
-    resolution: {integrity: sha512-dVeWq1ebbvByI+ndz4IJcD4a09RJgRYmLccwlQ8bPd4olz3Y213uf1iwvc7ZaxNn2ab7bjc08PrtBgMu6nb4pQ==}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-freebsd-x64@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.36.0:
-    resolution: {integrity: sha512-bvXVU42mOVcF4le6XSjscdXjqx8okv4n5vmwgzcmtvFdifQ5U4dXFYaCB87namDRKlUL9ybVtLQ9ztnawaSzvg==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-arm-gnueabihf@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-arm-musleabihf@4.36.0:
-    resolution: {integrity: sha512-JFIQrDJYrxOnyDQGYkqnNBtjDwTgbasdbUiQvcU8JmGDfValfH1lNpng+4FWlhaVIR4KPkeddYjsVVbmJYvDcg==}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-arm-musleabihf@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.36.0:
-    resolution: {integrity: sha512-KqjYVh3oM1bj//5X7k79PSCZ6CvaVzb7Qs7VMWS+SlWB5M8p3FqufLP9VNp4CazJ0CsPDLwVD9r3vX7Ci4J56A==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-arm64-gnu@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.36.0:
-    resolution: {integrity: sha512-QiGnhScND+mAAtfHqeT+cB1S9yFnNQ/EwCg5yE3MzoaZZnIV0RV9O5alJAoJKX/sBONVKeZdMfO8QSaWEygMhw==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-arm64-musl@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-loongarch64-gnu@4.36.0:
-    resolution: {integrity: sha512-1ZPyEDWF8phd4FQtTzMh8FQwqzvIjLsl6/84gzUxnMNFBtExBtpL51H67mV9xipuxl1AEAerRBgBwFNpkw8+Lg==}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-loongarch64-gnu@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-powerpc64le-gnu@4.36.0:
-    resolution: {integrity: sha512-VMPMEIUpPFKpPI9GZMhJrtu8rxnp6mJR3ZzQPykq4xc2GmdHj3Q4cA+7avMyegXy4n1v+Qynr9fR88BmyO74tg==}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-powerpc64le-gnu@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.36.0:
-    resolution: {integrity: sha512-ttE6ayb/kHwNRJGYLpuAvB7SMtOeQnVXEIpMtAvx3kepFQeowVED0n1K9nAdraHUPJ5hydEMxBpIR7o4nrm8uA==}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-riscv64-gnu@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-s390x-gnu@4.36.0:
-    resolution: {integrity: sha512-4a5gf2jpS0AIe7uBjxDeUMNcFmaRTbNv7NxI5xOCs4lhzsVyGR/0qBXduPnoWf6dGC365saTiwag8hP1imTgag==}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-s390x-gnu@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-x64-gnu@4.36.0:
-    resolution: {integrity: sha512-5KtoW8UWmwFKQ96aQL3LlRXX16IMwyzMq/jSSVIIyAANiE1doaQsx/KRyhAvpHlPjPiSU/AYX/8m+lQ9VToxFQ==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-x64-gnu@4.36.0':
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.36.0:
-    resolution: {integrity: sha512-sycrYZPrv2ag4OCvaN5js+f01eoZ2U+RmT5as8vhxiFz+kxwlHrsxOwKPSA8WyS+Wc6Epid9QeI/IkQ9NkgYyQ==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-x64-gnu@4.53.2':
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.36.0:
-    resolution: {integrity: sha512-qbqt4N7tokFwwSVlWDsjfoHgviS3n/vZ8LK0h1uLG9TYIRuUTJC88E1xb3LM2iqZ/WTqNQjYrtmtGmrmmawB6A==}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-x64-musl@4.36.0':
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.36.0:
-    resolution: {integrity: sha512-t+RY0JuRamIocMuQcfwYSOkmdX9dtkr1PbhKW42AMvaDQa+jOdpUYysroTF/nuPpAaQMWp7ye+ndlmmthieJrQ==}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-win32-arm64-msvc@4.36.0':
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.36.0:
-    resolution: {integrity: sha512-aRXd7tRZkWLqGbChgcMMDEHjOKudo1kChb1Jt1IfR8cY/KIpgNviLeJy5FUb9IpSuQj8dU2fAYNMPW/hLKOSTw==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-win32-ia32-msvc@4.36.0':
     optional: true
 
-  /@rushstack/eslint-patch@1.2.0:
-    resolution: {integrity: sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg==}
-    dev: true
+  '@rollup/rollup-win32-x64-msvc@4.36.0':
+    optional: true
 
-  /@sec-ant/readable-stream@0.4.1:
-    resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
-    dev: true
+  '@rushstack/eslint-patch@1.2.0': {}
 
-  /@selderee/plugin-htmlparser2@0.11.0:
-    resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
+  '@s2-dev/streamstore@0.17.3(typescript@5.5.4)':
+    dependencies:
+      '@protobuf-ts/runtime': 2.11.1
+      typescript: 5.5.4
+
+  '@s2-dev/streamstore@0.17.6':
+    dependencies:
+      '@protobuf-ts/runtime': 2.11.1
+
+  '@sec-ant/readable-stream@0.4.1': {}
+
+  '@selderee/plugin-htmlparser2@0.11.0':
     dependencies:
       domhandler: 5.0.3
       selderee: 0.11.0
-    dev: false
 
-  /@sentry/babel-plugin-component-annotate@2.22.2:
-    resolution: {integrity: sha512-6kFAHGcs0npIC4HTt4ULs8uOfEucvMI7VW4hoyk17jhRaW8CbxzxfWCfIeRbDkE8pYwnARaq83tu025Hrk2zgA==}
-    engines: {node: '>= 14'}
-    dev: false
+  '@sentry-internal/browser-utils@9.46.0':
+    dependencies:
+      '@sentry/core': 9.46.0
 
-  /@sentry/bundler-plugin-core@2.22.2:
-    resolution: {integrity: sha512-TwEEW4FeEJ5Mamp4fGnktfVjzN77KAW0xFQsEPuxZtOAPG17zX/PGvdyRX/TE1jkZWhTzqUDIdgzqlNLjyEnUw==}
-    engines: {node: '>= 14'}
+  '@sentry-internal/feedback@9.46.0':
     dependencies:
-      '@babel/core': 7.22.17
-      '@sentry/babel-plugin-component-annotate': 2.22.2
-      '@sentry/cli': 2.33.1
-      dotenv: 16.4.7
-      find-up: 5.0.0
-      glob: 9.3.5
-      magic-string: 0.30.8
-      unplugin: 1.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    dev: false
+      '@sentry/core': 9.46.0
 
-  /@sentry/cli-darwin@2.33.1:
-    resolution: {integrity: sha512-+4/VIx/E1L2hChj5nGf5MHyEPHUNHJ/HoG5RY+B+vyEutGily1c1+DM2bum7RbD0xs6wKLIyup5F02guzSzG8A==}
-    engines: {node: '>=10'}
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@sentry-internal/replay-canvas@9.46.0':
+    dependencies:
+      '@sentry-internal/replay': 9.46.0
+      '@sentry/core': 9.46.0
+
+  '@sentry-internal/replay@9.46.0':
+    dependencies:
+      '@sentry-internal/browser-utils': 9.46.0
+      '@sentry/core': 9.46.0
+
+  '@sentry/browser@9.46.0':
+    dependencies:
+      '@sentry-internal/browser-utils': 9.46.0
+      '@sentry-internal/feedback': 9.46.0
+      '@sentry-internal/replay': 9.46.0
+      '@sentry-internal/replay-canvas': 9.46.0
+      '@sentry/core': 9.46.0
+
+  '@sentry/cli-darwin@2.50.2':
     optional: true
 
-  /@sentry/cli-linux-arm64@2.33.1:
-    resolution: {integrity: sha512-DbGV56PRKOLsAZJX27Jt2uZ11QfQEMmWB4cIvxkKcFVE+LJP4MVA+MGGRUL6p+Bs1R9ZUuGbpKGtj0JiG6CoXw==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux, freebsd]
-    requiresBuild: true
-    dev: false
+  '@sentry/cli-linux-arm64@2.50.2':
     optional: true
 
-  /@sentry/cli-linux-arm@2.33.1:
-    resolution: {integrity: sha512-zbxEvQju+tgNvzTOt635le4kS/Fbm2XC2RtYbCTs034Vb8xjrAxLnK0z1bQnStUV8BkeBHtsNVrG+NSQDym2wg==}
-    engines: {node: '>=10'}
-    cpu: [arm]
-    os: [linux, freebsd]
-    requiresBuild: true
-    dev: false
+  '@sentry/cli-linux-arm@2.50.2':
     optional: true
 
-  /@sentry/cli-linux-i686@2.33.1:
-    resolution: {integrity: sha512-g2LS4oPXkPWOfKWukKzYp4FnXVRRSwBxhuQ9eSw2peeb58ZIObr4YKGOA/8HJRGkooBJIKGaAR2mH2Pk1TKaiA==}
-    engines: {node: '>=10'}
-    cpu: [x86, ia32]
-    os: [linux, freebsd]
-    requiresBuild: true
-    dev: false
+  '@sentry/cli-linux-i686@2.50.2':
     optional: true
 
-  /@sentry/cli-linux-x64@2.33.1:
-    resolution: {integrity: sha512-IV3dcYV/ZcvO+VGu9U6kuxSdbsV2kzxaBwWUQxtzxJ+cOa7J8Hn1t0koKGtU53JVZNBa06qJWIcqgl4/pCuKIg==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux, freebsd]
-    requiresBuild: true
-    dev: false
+  '@sentry/cli-linux-x64@2.50.2':
     optional: true
 
-  /@sentry/cli-win32-i686@2.33.1:
-    resolution: {integrity: sha512-F7cJySvkpzIu7fnLKNHYwBzZYYwlhoDbAUnaFX0UZCN+5DNp/5LwTp37a5TWOsmCaHMZT4i9IO4SIsnNw16/zQ==}
-    engines: {node: '>=10'}
-    cpu: [x86, ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@sentry/cli-win32-arm64@2.50.2':
     optional: true
 
-  /@sentry/cli-win32-x64@2.33.1:
-    resolution: {integrity: sha512-8VyRoJqtb2uQ8/bFRKNuACYZt7r+Xx0k2wXRGTyH05lCjAiVIXn7DiS2BxHFty7M1QEWUCMNsb/UC/x/Cu2wuA==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@sentry/cli-win32-i686@2.50.2':
     optional: true
 
-  /@sentry/cli@2.33.1:
-    resolution: {integrity: sha512-dUlZ4EFh98VFRPJ+f6OW3JEYQ7VvqGNMa0AMcmvk07ePNeK/GicAWmSQE4ZfJTTl80ul6HZw1kY01fGQOQlVRA==}
-    engines: {node: '>= 10'}
-    hasBin: true
-    requiresBuild: true
+  '@sentry/cli-win32-x64@2.50.2':
+    optional: true
+
+  '@sentry/cli@2.50.2(encoding@0.1.13)':
     dependencies:
       https-proxy-agent: 5.0.1
-      node-fetch: 2.6.12
+      node-fetch: 2.6.12(encoding@0.1.13)
       progress: 2.0.3
       proxy-from-env: 1.1.0
       which: 2.0.2
     optionalDependencies:
-      '@sentry/cli-darwin': 2.33.1
-      '@sentry/cli-linux-arm': 2.33.1
-      '@sentry/cli-linux-arm64': 2.33.1
-      '@sentry/cli-linux-i686': 2.33.1
-      '@sentry/cli-linux-x64': 2.33.1
-      '@sentry/cli-win32-i686': 2.33.1
-      '@sentry/cli-win32-x64': 2.33.1
+      '@sentry/cli-darwin': 2.50.2
+      '@sentry/cli-linux-arm': 2.50.2
+      '@sentry/cli-linux-arm64': 2.50.2
+      '@sentry/cli-linux-i686': 2.50.2
+      '@sentry/cli-linux-x64': 2.50.2
+      '@sentry/cli-win32-arm64': 2.50.2
+      '@sentry/cli-win32-i686': 2.50.2
+      '@sentry/cli-win32-x64': 2.50.2
     transitivePeerDependencies:
       - encoding
       - supports-color
-    dev: false
 
-  /@sentry/esbuild-plugin@2.22.2:
-    resolution: {integrity: sha512-6yYnI7PNDXYyYwlbIYRPoz9+FamYWr1IZ9PQTNz4bjv8eFcItKZFO5wu25L7yaGszgClATvY17gxxUjWfsRyWQ==}
-    engines: {node: '>= 14'}
+  '@sentry/core@9.46.0': {}
+
+  '@sentry/node-core@9.46.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)':
     dependencies:
-      '@sentry/bundler-plugin-core': 2.22.2
-      unplugin: 1.0.1
-      uuid: 9.0.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@sentry/core': 9.46.0
+      '@sentry/opentelemetry': 9.46.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)
+      import-in-the-middle: 1.14.2
+
+  '@sentry/node@9.46.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-amqplib': 0.46.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.43.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-dataloader': 0.16.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fs': 0.19.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-generic-pool': 0.43.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.45.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-kafkajs': 0.7.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-knex': 0.44.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.47.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.44.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.52.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.46.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.45.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.45.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.51.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.46.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-tedious': 0.18.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici': 0.10.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@prisma/instrumentation': 6.11.1(@opentelemetry/api@1.9.0)
+      '@sentry/core': 9.46.0
+      '@sentry/node-core': 9.46.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.57.2(@opentelemetry/api@1.9.0))(@opentelemetry/resources@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)
+      '@sentry/opentelemetry': 9.46.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)
+      import-in-the-middle: 1.14.2
+      minimatch: 9.0.5
     transitivePeerDependencies:
-      - encoding
       - supports-color
-    dev: false
 
-  /@sideway/address@4.1.4:
-    resolution: {integrity: sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==}
+  '@sentry/opentelemetry@9.46.0(@opentelemetry/api@1.9.0)(@opentelemetry/context-async-hooks@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/core@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.30.1(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.36.0)':
     dependencies:
-      '@hapi/hoek': 9.3.0
-    dev: false
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.30.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@sentry/core': 9.46.0
 
-  /@sideway/formula@3.0.1:
-    resolution: {integrity: sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==}
-    dev: false
+  '@sentry/react@9.46.0(react@18.2.0)':
+    dependencies:
+      '@sentry/browser': 9.46.0
+      '@sentry/core': 9.46.0
+      hoist-non-react-statics: 3.3.2
+      react: 18.2.0
 
-  /@sideway/pinpoint@2.0.0:
-    resolution: {integrity: sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==}
-    dev: false
+  '@sentry/remix@9.46.0(patch_hash=146126b032581925294aaed63ab53ce3f5e0356a755f1763d7a9a76b9846943b)(@remix-run/node@2.1.0(typescript@5.5.4))(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(encoding@0.1.13)(react@18.2.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.57.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.36.0
+      '@remix-run/node': 2.1.0(typescript@5.5.4)
+      '@remix-run/react': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
+      '@remix-run/router': 1.15.3
+      '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
+      '@sentry/cli': 2.50.2(encoding@0.1.13)
+      '@sentry/core': 9.46.0
+      '@sentry/node': 9.46.0
+      '@sentry/react': 9.46.0(react@18.2.0)
+      glob: 10.4.5
+      react: 18.2.0
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
 
-  /@sinclair/typebox@0.33.17:
-    resolution: {integrity: sha512-75232GRx3wp3P7NP+yc4nRK3XUAnaQShxTAzapgmQrgs0QvSq0/mOJGoZXRpH15cFCKyys+4laCPbBselqJ5Ag==}
-    dev: false
+  '@shikijs/core@3.13.0':
+    dependencies:
+      '@shikijs/types': 3.13.0
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+      hast-util-to-html: 9.0.5
 
-  /@sindresorhus/is@0.14.0:
-    resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==}
-    engines: {node: '>=6'}
-    dev: true
+  '@shikijs/engine-javascript@3.13.0':
+    dependencies:
+      '@shikijs/types': 3.13.0
+      '@shikijs/vscode-textmate': 10.0.2
+      oniguruma-to-es: 4.3.3
 
-  /@sindresorhus/is@4.6.0:
-    resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==}
-    engines: {node: '>=10'}
+  '@shikijs/engine-oniguruma@3.13.0':
+    dependencies:
+      '@shikijs/types': 3.13.0
+      '@shikijs/vscode-textmate': 10.0.2
 
-  /@sindresorhus/slugify@2.2.1:
-    resolution: {integrity: sha512-MkngSCRZ8JdSOCHRaYd+D01XhvU3Hjy6MGl06zhOk614hp9EOAp5gIkBeQg7wtmxpitU6eAL4kdiRMcJa2dlrw==}
-    engines: {node: '>=12'}
+  '@shikijs/langs@3.13.0':
     dependencies:
-      '@sindresorhus/transliterate': 1.6.0
-      escape-string-regexp: 5.0.0
-    dev: false
+      '@shikijs/types': 3.13.0
 
-  /@sindresorhus/transliterate@1.6.0:
-    resolution: {integrity: sha512-doH1gimEu3A46VX6aVxpHTeHrytJAG6HgdxntYnCFiIFHEM/ZGpG8KiZGBChchjQmG0XFIBL552kBTjVcMZXwQ==}
-    engines: {node: '>=12'}
+  '@shikijs/themes@3.13.0':
     dependencies:
-      escape-string-regexp: 5.0.0
-    dev: false
+      '@shikijs/types': 3.13.0
 
-  /@slack/logger@4.0.0:
-    resolution: {integrity: sha512-Wz7QYfPAlG/DR+DfABddUZeNgoeY7d1J39OCR2jR+v7VBsB8ezulDK5szTnDDPDwLH5IWhLvXIHlCFZV7MSKgA==}
-    engines: {node: '>= 18', npm: '>= 8.6.0'}
+  '@shikijs/types@3.13.0':
+    dependencies:
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+
+  '@shikijs/vscode-textmate@10.0.2': {}
+
+  '@sideway/address@4.1.4':
+    dependencies:
+      '@hapi/hoek': 9.3.0
+
+  '@sideway/formula@3.0.1': {}
+
+  '@sideway/pinpoint@2.0.0': {}
+
+  '@sinclair/typebox@0.34.38': {}
+
+  '@sindresorhus/is@0.14.0': {}
+
+  '@sindresorhus/is@4.6.0': {}
+
+  '@sindresorhus/merge-streams@4.0.0': {}
+
+  '@slack/logger@4.0.0':
     dependencies:
       '@types/node': 20.14.14
-    dev: false
 
-  /@slack/types@2.14.0:
-    resolution: {integrity: sha512-n0EGm7ENQRxlXbgKSrQZL69grzg1gHLAVd+GlRVQJ1NSORo0FrApR7wql/gaKdu2n4TO83Sq/AmeUOqD60aXUA==}
-    engines: {node: '>= 12.13.0', npm: '>= 6.12.0'}
-    dev: false
+  '@slack/types@2.14.0': {}
 
-  /@slack/web-api@7.9.1:
-    resolution: {integrity: sha512-qMcb1oWw3Y/KlUIVJhkI8+NcQXq1lNymwf+ewk93ggZsGd6iuz9ObQsOEbvlqlx1J+wd8DmIm3DORGKs0fcKdg==}
-    engines: {node: '>= 18', npm: '>= 8.6.0'}
+  '@slack/web-api@7.9.1':
     dependencies:
       '@slack/logger': 4.0.0
       '@slack/types': 2.14.0
       '@types/node': 20.14.14
       '@types/retry': 0.12.0
-      axios: 1.9.0
+      axios: 1.12.2
       eventemitter3: 5.0.1
-      form-data: 4.0.0
+      form-data: 4.0.4
       is-electron: 2.2.2
       is-stream: 2.0.1
       p-queue: 6.6.2
@@ -17151,82 +29301,83 @@ packages:
       retry: 0.13.1
     transitivePeerDependencies:
       - debug
-    dev: false
 
-  /@smithy/abort-controller@2.0.14:
-    resolution: {integrity: sha512-zXtteuYLWbSXnzI3O6xq3FYvigYZFW8mdytGibfarLL2lxHto9L3ILtGVnVGmFZa7SDh62l39EnU5hesLN87Fw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/abort-controller@2.0.14':
     dependencies:
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/abort-controller@3.1.9:
-    resolution: {integrity: sha512-yiW0WI30zj8ZKoSYNx90no7ugVn3khlyH/z5W8qtKBtVE6awRALbhSG+2SAHA1r6bO/6M9utxYKVZ3PCJ1rWxw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/abort-controller@4.0.4':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/abort-controller@4.0.4:
-    resolution: {integrity: sha512-gJnEjZMvigPDQWHrW3oPrFhQtkrgqBkyjj3pCIdF3A5M6vsZODG93KNlfJprv6bp4245bdT32fsHK4kkH3KYDA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/abort-controller@4.2.5':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/config-resolver@2.0.19:
-    resolution: {integrity: sha512-JsghnQ5zjWmjEVY8TFOulLdEOCj09SjRLugrHlkPZTIBBm7PQitCFVLThbsKPZQOP7N3ME1DU1nKUc1UaVnBog==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/chunked-blob-reader-native@4.2.1':
+    dependencies:
+      '@smithy/util-base64': 4.3.0
+      tslib: 2.8.1
+
+  '@smithy/chunked-blob-reader@5.2.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@smithy/config-resolver@2.0.19':
     dependencies:
       '@smithy/node-config-provider': 2.1.6
       '@smithy/types': 2.6.0
       '@smithy/util-config-provider': 2.0.0
       '@smithy/util-middleware': 2.0.7
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/config-resolver@3.0.13:
-    resolution: {integrity: sha512-Gr/qwzyPaTL1tZcq8WQyHhTZREER5R1Wytmz4WnVGL4onA3dNk6Btll55c8Vr58pLdvWZmtG8oZxJTw3t3q7Jg==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/types': 3.7.2
-      '@smithy/util-config-provider': 3.0.0
-      '@smithy/util-middleware': 3.0.11
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/config-resolver@4.1.4:
-    resolution: {integrity: sha512-prmU+rDddxHOH0oNcwemL+SwnzcG65sBF2yXRO7aeXIn/xTlq2pX7JLVbkBnVLowHLg4/OL4+jBmv9hVrVGS+w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/config-resolver@4.1.4':
     dependencies:
       '@smithy/node-config-provider': 4.1.3
       '@smithy/types': 4.3.1
       '@smithy/util-config-provider': 4.0.0
       '@smithy/util-middleware': 4.0.4
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/core@2.5.5:
-    resolution: {integrity: sha512-G8G/sDDhXA7o0bOvkc7bgai6POuSld/+XhNnWAbpQTpLv2OZPvyqQ58tLPPlz0bSNsXktldDDREIv1LczFeNEw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/config-resolver@4.4.3':
     dependencies:
-      '@smithy/middleware-serde': 3.0.11
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
-      '@smithy/util-body-length-browser': 3.0.0
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-stream': 3.3.2
-      '@smithy/util-utf8': 3.0.0
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-config-provider': 4.2.0
+      '@smithy/util-endpoints': 3.2.5
+      '@smithy/util-middleware': 4.2.5
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/core@3.6.0:
-    resolution: {integrity: sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/core@3.18.3':
+    dependencies:
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-stream': 4.5.6
+      '@smithy/util-utf8': 4.2.0
+      '@smithy/uuid': 1.1.0
+      tslib: 2.8.1
+
+  '@smithy/core@3.18.5':
+    dependencies:
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-body-length-browser': 4.2.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-stream': 4.5.6
+      '@smithy/util-utf8': 4.2.0
+      '@smithy/uuid': 1.1.0
+      tslib: 2.8.1
+
+  '@smithy/core@3.6.0':
     dependencies:
       '@smithy/middleware-serde': 4.0.8
       '@smithy/protocol-http': 5.1.2
@@ -17237,192 +29388,180 @@ packages:
       '@smithy/util-stream': 4.2.2
       '@smithy/util-utf8': 4.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/credential-provider-imds@2.1.2:
-    resolution: {integrity: sha512-Y62jBWdoLPSYjr9fFvJf+KwTa1EunjVr6NryTEWCnwIY93OJxwV4t0qxjwdPl/XMsUkq79ppNJSEQN6Ohnhxjw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/credential-provider-imds@2.1.2':
     dependencies:
       '@smithy/node-config-provider': 2.1.6
       '@smithy/property-provider': 2.0.15
       '@smithy/types': 2.6.0
       '@smithy/url-parser': 2.0.14
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/credential-provider-imds@3.2.8:
-    resolution: {integrity: sha512-ZCY2yD0BY+K9iMXkkbnjo+08T2h8/34oHd0Jmh6BZUSZwaaGlGCyBT/3wnS7u7Xl33/EEfN4B6nQr3Gx5bYxgw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/credential-provider-imds@4.0.6':
     dependencies:
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/property-provider': 3.1.11
-      '@smithy/types': 3.7.2
-      '@smithy/url-parser': 3.0.11
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/credential-provider-imds@4.0.6:
-    resolution: {integrity: sha512-hKMWcANhUiNbCJouYkZ9V3+/Qf9pteR1dnwgdyzR09R4ODEYx8BbUysHwRSyex4rZ9zapddZhLFTnT4ZijR4pw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/credential-provider-imds@4.2.5':
     dependencies:
-      '@smithy/node-config-provider': 4.1.3
-      '@smithy/property-provider': 4.0.4
-      '@smithy/types': 4.3.1
-      '@smithy/url-parser': 4.0.4
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      tslib: 2.8.1
+
+  '@smithy/eventstream-codec@2.0.14':
+    dependencies:
+      '@aws-crypto/crc32': 3.0.0
+      '@smithy/types': 2.6.0
+      '@smithy/util-hex-encoding': 2.0.0
+      tslib: 2.8.1
+
+  '@smithy/eventstream-codec@4.2.5':
+    dependencies:
+      '@aws-crypto/crc32': 5.2.0
+      '@smithy/types': 4.9.0
+      '@smithy/util-hex-encoding': 4.2.0
+      tslib: 2.8.1
+
+  '@smithy/eventstream-serde-browser@4.2.5':
+    dependencies:
+      '@smithy/eventstream-serde-universal': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/eventstream-serde-config-resolver@4.3.5':
+    dependencies:
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/eventstream-serde-node@4.2.5':
+    dependencies:
+      '@smithy/eventstream-serde-universal': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/eventstream-codec@2.0.14:
-    resolution: {integrity: sha512-g/OU/MeWGfHDygoXgMWfG/Xb0QqDnAGcM9t2FRrVAhleXYRddGOEnfanR5cmHgB9ue52MJsyorqFjckzXsylaA==}
+  '@smithy/eventstream-serde-universal@4.2.5':
     dependencies:
-      '@aws-crypto/crc32': 3.0.0
-      '@smithy/types': 2.6.0
-      '@smithy/util-hex-encoding': 2.0.0
+      '@smithy/eventstream-codec': 4.2.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/fetch-http-handler@2.2.7:
-    resolution: {integrity: sha512-iSDBjxuH9TgrtMYAr7j5evjvkvgwLY3y+9D547uep+JNkZ1ZT+BaeU20j6I/bO/i26ilCWFImrlXTPsfQtZdIQ==}
+  '@smithy/fetch-http-handler@2.2.7':
     dependencies:
       '@smithy/protocol-http': 3.0.10
       '@smithy/querystring-builder': 2.0.14
       '@smithy/types': 2.6.0
       '@smithy/util-base64': 2.0.1
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/fetch-http-handler@4.1.2:
-    resolution: {integrity: sha512-R7rU7Ae3ItU4rC0c5mB2sP5mJNbCfoDc8I5XlYjIZnquyUwec7fEo78F6DA3SmgJgkU1qTMcZJuGblxZsl10ZA==}
-    dependencies:
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/querystring-builder': 3.0.11
-      '@smithy/types': 3.7.2
-      '@smithy/util-base64': 3.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/fetch-http-handler@5.0.4:
-    resolution: {integrity: sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/fetch-http-handler@5.0.4':
     dependencies:
       '@smithy/protocol-http': 5.1.2
       '@smithy/querystring-builder': 4.0.4
       '@smithy/types': 4.3.1
       '@smithy/util-base64': 4.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/hash-node@2.0.16:
-    resolution: {integrity: sha512-Wbi9A0PacMYUOwjAulQP90Wl3mQ6NDwnyrZQzFjDz+UzjXOSyQMgBrTkUBz+pVoYVlX3DUu24gWMZBcit+wOGg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/fetch-http-handler@5.3.6':
     dependencies:
-      '@smithy/types': 2.6.0
-      '@smithy/util-buffer-from': 2.0.0
-      '@smithy/util-utf8': 2.0.2
-      tslib: 2.6.2
-    dev: false
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/querystring-builder': 4.2.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      tslib: 2.8.1
 
-  /@smithy/hash-node@3.0.11:
-    resolution: {integrity: sha512-emP23rwYyZhQBvklqTtwetkQlqbNYirDiEEwXl2v0GYWMnCzxst7ZaRAnWuy28njp5kAH54lvkdG37MblZzaHA==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/hash-blob-browser@4.2.6':
     dependencies:
-      '@smithy/types': 3.7.2
-      '@smithy/util-buffer-from': 3.0.0
-      '@smithy/util-utf8': 3.0.0
+      '@smithy/chunked-blob-reader': 5.2.0
+      '@smithy/chunked-blob-reader-native': 4.2.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/hash-node@4.0.4:
-    resolution: {integrity: sha512-qnbTPUhCVnCgBp4z4BUJUhOEkVwxiEi1cyFM+Zj6o+aY8OFGxUQleKWq8ltgp3dujuhXojIvJWdoqpm6dVO3lQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/hash-node@2.0.16':
+    dependencies:
+      '@smithy/types': 2.6.0
+      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
+
+  '@smithy/hash-node@4.0.4':
     dependencies:
       '@smithy/types': 4.3.1
       '@smithy/util-buffer-from': 4.0.0
       '@smithy/util-utf8': 4.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/invalid-dependency@2.0.14:
-    resolution: {integrity: sha512-d8ohpwZo9RzTpGlAfsWtfm1SHBSU7+N4iuZ6MzR10xDTujJJWtmXYHK1uzcr7rggbpUTaWyHpPFgnf91q0EFqQ==}
+  '@smithy/hash-node@4.2.5':
     dependencies:
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@smithy/types': 4.9.0
+      '@smithy/util-buffer-from': 4.2.0
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
 
-  /@smithy/invalid-dependency@3.0.11:
-    resolution: {integrity: sha512-NuQmVPEJjUX6c+UELyVz8kUx8Q539EDeNwbRyu4IIF8MeV7hUtq1FB3SHVyki2u++5XLMFqngeMKk7ccspnNyQ==}
+  '@smithy/hash-stream-node@4.2.5':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.9.0
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/invalid-dependency@4.0.4:
-    resolution: {integrity: sha512-bNYMi7WKTJHu0gn26wg8OscncTt1t2b8KcsZxvOv56XA6cyXtOAAAaNP7+m45xfppXfOatXF3Sb1MNsLUgVLTw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/invalid-dependency@2.0.14':
+    dependencies:
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@smithy/invalid-dependency@4.0.4':
     dependencies:
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/is-array-buffer@2.0.0:
-    resolution: {integrity: sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/invalid-dependency@4.2.5':
     dependencies:
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/is-array-buffer@3.0.0:
-    resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/is-array-buffer@2.2.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/is-array-buffer@4.0.0:
-    resolution: {integrity: sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/is-array-buffer@4.2.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/md5-js@2.0.16:
-    resolution: {integrity: sha512-YhWt9aKl+EMSNXyUTUo7I01WHf3HcCkPu/Hl2QmTNwrHT49eWaY7hptAMaERZuHFH0V5xHgPKgKZo2I93DFtgQ==}
+  '@smithy/md5-js@2.0.16':
     dependencies:
       '@smithy/types': 2.6.0
-      '@smithy/util-utf8': 2.0.2
-      tslib: 2.6.2
-    dev: false
+      '@smithy/util-utf8': 2.3.0
+      tslib: 2.8.1
 
-  /@smithy/middleware-content-length@2.0.16:
-    resolution: {integrity: sha512-9ddDia3pp1d3XzLXKcm7QebGxLq9iwKf+J1LapvlSOhpF8EM9SjMeSrMOOFgG+2TfW5K3+qz4IAJYYm7INYCng==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/md5-js@4.2.5':
     dependencies:
-      '@smithy/protocol-http': 3.0.10
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@smithy/types': 4.9.0
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
 
-  /@smithy/middleware-content-length@3.0.13:
-    resolution: {integrity: sha512-zfMhzojhFpIX3P5ug7jxTjfUcIPcGjcQYzB9t+rv0g1TX7B0QdwONW+ATouaLoD7h7LOw/ZlXfkq4xJ/g2TrIw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/middleware-content-length@2.0.16':
     dependencies:
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
+      '@smithy/protocol-http': 3.0.10
+      '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-content-length@4.0.4:
-    resolution: {integrity: sha512-F7gDyfI2BB1Kc+4M6rpuOLne5LOcEknH1n6UQB69qv+HucXBR1rkzXBnQTB2q46sFy1PM/zuSJOB532yc8bg3w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-content-length@4.0.4':
     dependencies:
       '@smithy/protocol-http': 5.1.2
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-endpoint@2.2.1:
-    resolution: {integrity: sha512-dVDS7HNJl/wb0lpByXor6whqDbb1YlLoaoWYoelyYzLHioXOE7y/0iDwJWtDcN36/tVCw9EPBFZ3aans84jLpg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-content-length@4.2.5':
+    dependencies:
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/middleware-endpoint@2.2.1':
     dependencies:
       '@smithy/middleware-serde': 2.0.14
       '@smithy/node-config-provider': 2.1.6
@@ -17430,26 +29569,9 @@ packages:
       '@smithy/types': 2.6.0
       '@smithy/url-parser': 2.0.14
       '@smithy/util-middleware': 2.0.7
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/middleware-endpoint@3.2.6:
-    resolution: {integrity: sha512-WAqzyulvvSKrT5c6VrQelgNVNNO7BlTQW9Z+s9tcG6G5CaBS1YBpPtT3VuhXLQbewSiGi7oXQROwpw26EG9PLQ==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/core': 2.5.5
-      '@smithy/middleware-serde': 3.0.11
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
-      '@smithy/url-parser': 3.0.11
-      '@smithy/util-middleware': 3.0.11
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-endpoint@4.1.13:
-    resolution: {integrity: sha512-xg3EHV/Q5ZdAO5b0UiIMj3RIOCobuS40pBBODguUDVdko6YK6QIzCVRrHTogVuEKglBWqWenRnZ71iZnLL3ZAQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-endpoint@4.1.13':
     dependencies:
       '@smithy/core': 3.6.0
       '@smithy/middleware-serde': 4.0.8
@@ -17459,11 +29581,30 @@ packages:
       '@smithy/url-parser': 4.0.4
       '@smithy/util-middleware': 4.0.4
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-retry@2.0.21:
-    resolution: {integrity: sha512-EZS1EXv1k6IJX6hyu/0yNQuPcPaXwG8SWljQHYueyRbOxmqYgoWMWPtfZj0xRRQ4YtLawQSpBgAeiJltq8/MPw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-endpoint@4.3.10':
+    dependencies:
+      '@smithy/core': 3.18.5
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-middleware': 4.2.5
+      tslib: 2.8.1
+
+  '@smithy/middleware-endpoint@4.3.12':
+    dependencies:
+      '@smithy/core': 3.18.5
+      '@smithy/middleware-serde': 4.2.6
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      '@smithy/url-parser': 4.2.5
+      '@smithy/util-middleware': 4.2.5
+      tslib: 2.8.1
+
+  '@smithy/middleware-retry@2.0.21':
     dependencies:
       '@smithy/node-config-provider': 2.1.6
       '@smithy/protocol-http': 3.0.10
@@ -17471,28 +29612,10 @@ packages:
       '@smithy/types': 2.6.0
       '@smithy/util-middleware': 2.0.7
       '@smithy/util-retry': 2.0.7
-      tslib: 2.6.2
-      uuid: 8.3.2
-    dev: false
-
-  /@smithy/middleware-retry@3.0.31:
-    resolution: {integrity: sha512-yq9wawrJLYHAYFpChLujxRN4My+SiKXvZk9Ml/CvTdRSA8ew+hvuR5LT+mjSlSBv3c4XJrkN8CWegkBaeD0Vrg==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/service-error-classification': 3.0.11
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-retry': 3.0.11
       tslib: 2.8.1
-      uuid: 9.0.1
-    dev: false
+      uuid: 8.3.2
 
-  /@smithy/middleware-retry@4.1.14:
-    resolution: {integrity: sha512-eoXaLlDGpKvdmvt+YBfRXE7HmIEtFF+DJCbTPwuLunP0YUnrydl+C4tS+vEM0+nyxXrX3PSUFqC+lP1+EHB1Tw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-retry@4.1.14':
     dependencies:
       '@smithy/node-config-provider': 4.1.3
       '@smithy/protocol-http': 5.1.2
@@ -17503,332 +29626,245 @@ packages:
       '@smithy/util-retry': 4.0.6
       tslib: 2.8.1
       uuid: 9.0.1
-    dev: false
 
-  /@smithy/middleware-serde@2.0.14:
-    resolution: {integrity: sha512-hFi3FqoYWDntCYA2IGY6gJ6FKjq2gye+1tfxF2HnIJB5uW8y2DhpRNBSUMoqP+qvYzRqZ6ntv4kgbG+o3pX57g==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-retry@4.4.10':
     dependencies:
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/service-error-classification': 4.2.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/uuid': 1.1.0
+      tslib: 2.8.1
 
-  /@smithy/middleware-serde@3.0.11:
-    resolution: {integrity: sha512-KzPAeySp/fOoQA82TpnwItvX8BBURecpx6ZMu75EZDkAcnPtO6vf7q4aH5QHs/F1s3/snQaSFbbUMcFFZ086Mw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/middleware-retry@4.4.12':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/service-error-classification': 4.2.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-retry': 4.2.5
+      '@smithy/uuid': 1.1.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-serde@4.0.8:
-    resolution: {integrity: sha512-iSSl7HJoJaGyMIoNn2B7czghOVwJ9nD7TMvLhMWeSB5vt0TnEYyRRqPJu/TqW76WScaNvYYB8nRoiBHR9S1Ddw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-serde@2.0.14':
+    dependencies:
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@smithy/middleware-serde@4.0.8':
     dependencies:
       '@smithy/protocol-http': 5.1.2
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-stack@2.0.8:
-    resolution: {integrity: sha512-7/N59j0zWqVEKExJcA14MrLDZ/IeN+d6nbkN8ucs+eURyaDUXWYlZrQmMOd/TyptcQv0+RDlgag/zSTTV62y/Q==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-serde@4.2.5':
     dependencies:
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
 
-  /@smithy/middleware-stack@3.0.11:
-    resolution: {integrity: sha512-1HGo9a6/ikgOMrTrWL/WiN9N8GSVYpuRQO5kjstAq4CvV59bjqnh7TbdXGQ4vxLD3xlSjfBjq5t1SOELePsLnA==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/middleware-serde@4.2.6':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/middleware-stack@4.0.4:
-    resolution: {integrity: sha512-kagK5ggDrBUCCzI93ft6DjteNSfY8Ulr83UtySog/h09lTIOAJ/xUSObutanlPT0nhoHAkpmW9V5K8oPyLh+QA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/middleware-stack@2.0.8':
+    dependencies:
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@smithy/middleware-stack@4.0.4':
     dependencies:
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/node-config-provider@2.1.6:
-    resolution: {integrity: sha512-HLqTs6O78m3M3z1cPLFxddxhEPv5MkVatfPuxoVO3A+cHZanNd/H5I6btcdHy6N2CB1MJ/lihJC92h30SESsBA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/middleware-stack@4.2.5':
+    dependencies:
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/node-config-provider@2.1.6':
     dependencies:
       '@smithy/property-provider': 2.0.15
       '@smithy/shared-ini-file-loader': 2.2.5
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/node-config-provider@3.1.12:
-    resolution: {integrity: sha512-O9LVEu5J/u/FuNlZs+L7Ikn3lz7VB9hb0GtPT9MQeiBmtK8RSY3ULmsZgXhe6VAlgTw0YO+paQx4p8xdbs43vQ==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/property-provider': 3.1.11
-      '@smithy/shared-ini-file-loader': 3.1.12
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/node-config-provider@4.1.3:
-    resolution: {integrity: sha512-HGHQr2s59qaU1lrVH6MbLlmOBxadtzTsoO4c+bF5asdgVik3I8o7JIOzoeqWc5MjVa+vD36/LWE0iXKpNqooRw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/node-config-provider@4.1.3':
     dependencies:
       '@smithy/property-provider': 4.0.4
       '@smithy/shared-ini-file-loader': 4.0.4
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/node-http-handler@2.1.10:
-    resolution: {integrity: sha512-lkALAwtN6odygIM4nB8aHDahINM6WXXjNrZmWQAh0RSossySRT2qa31cFv0ZBuAYVWeprskRk13AFvvLmf1WLw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/node-config-provider@4.3.5':
+    dependencies:
+      '@smithy/property-provider': 4.2.5
+      '@smithy/shared-ini-file-loader': 4.4.0
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/node-http-handler@2.1.10':
     dependencies:
       '@smithy/abort-controller': 2.0.14
       '@smithy/protocol-http': 3.0.10
       '@smithy/querystring-builder': 2.0.14
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/node-http-handler@3.3.2:
-    resolution: {integrity: sha512-t4ng1DAd527vlxvOfKFYEe6/QFBcsj7WpNlWTyjorwXXcKw3XlltBGbyHfSJ24QT84nF+agDha9tNYpzmSRZPA==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/abort-controller': 3.1.9
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/querystring-builder': 3.0.11
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/node-http-handler@4.0.6:
-    resolution: {integrity: sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/node-http-handler@4.0.6':
     dependencies:
       '@smithy/abort-controller': 4.0.4
       '@smithy/protocol-http': 5.1.2
       '@smithy/querystring-builder': 4.0.4
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/property-provider@2.0.15:
-    resolution: {integrity: sha512-YbRFBn8oiiC3o1Kn3a4KjGa6k47rCM9++5W9cWqYn9WnkyH+hBWgfJAckuxpyA2Hq6Ys4eFrWzXq6fqHEw7iew==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/node-http-handler@4.4.5':
+    dependencies:
+      '@smithy/abort-controller': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/querystring-builder': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/property-provider@2.0.15':
     dependencies:
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/property-provider@3.1.11:
-    resolution: {integrity: sha512-I/+TMc4XTQ3QAjXfOcUWbSS073oOEAxgx4aZy8jHaf8JQnRkq2SZWw8+PfDtBvLUjcGMdxl+YwtzWe6i5uhL/A==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/property-provider@4.0.4':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/property-provider@4.0.4:
-    resolution: {integrity: sha512-qHJ2sSgu4FqF4U/5UUp4DhXNmdTrgmoAai6oQiM+c5RZ/sbDwJ12qxB1M6FnP+Tn/ggkPZf9ccn4jqKSINaquw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/property-provider@4.2.5':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/protocol-http@3.0.10:
-    resolution: {integrity: sha512-6+tjNk7rXW7YTeGo9qwxXj/2BFpJTe37kTj3EnZCoX/nH+NP/WLA7O83fz8XhkGqsaAhLUPo/bB12vvd47nsmg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/protocol-http@3.0.10':
     dependencies:
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@smithy/protocol-http@4.1.8:
-    resolution: {integrity: sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/protocol-http@5.1.2':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/protocol-http@5.1.2:
-    resolution: {integrity: sha512-rOG5cNLBXovxIrICSBm95dLqzfvxjEmuZx4KK3hWwPFHGdW3lxY0fZNXfv2zebfRO7sJZ5pKJYHScsqopeIWtQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/protocol-http@5.3.5':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/querystring-builder@2.0.14:
-    resolution: {integrity: sha512-lQ4pm9vTv9nIhl5jt6uVMPludr6syE2FyJmHsIJJuOD7QPIJnrf9HhUGf1iHh9KJ4CUv21tpOU3X6s0rB6uJ0g==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/querystring-builder@2.0.14':
     dependencies:
       '@smithy/types': 2.6.0
       '@smithy/util-uri-escape': 2.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/querystring-builder@3.0.11:
-    resolution: {integrity: sha512-u+5HV/9uJaeLj5XTb6+IEF/dokWWkEqJ0XiaRRogyREmKGUgZnNecLucADLdauWFKUNbQfulHFEZEdjwEBjXRg==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/querystring-builder@4.0.4':
     dependencies:
-      '@smithy/types': 3.7.2
-      '@smithy/util-uri-escape': 3.0.0
+      '@smithy/types': 4.9.0
+      '@smithy/util-uri-escape': 4.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/querystring-builder@4.0.4:
-    resolution: {integrity: sha512-SwREZcDnEYoh9tLNgMbpop+UTGq44Hl9tdj3rf+yeLcfH7+J8OXEBaMc2kDxtyRHu8BhSg9ADEx0gFHvpJgU8w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/querystring-builder@4.2.5':
     dependencies:
-      '@smithy/types': 4.3.1
-      '@smithy/util-uri-escape': 4.0.0
+      '@smithy/types': 4.9.0
+      '@smithy/util-uri-escape': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/querystring-parser@2.0.14:
-    resolution: {integrity: sha512-+cbtXWI9tNtQjlgQg3CA+pvL3zKTAxPnG3Pj6MP89CR3vi3QMmD0SOWoq84tqZDnJCxlsusbgIXk1ngMReXo+A==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/querystring-parser@2.0.14':
     dependencies:
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/querystring-parser@3.0.11:
-    resolution: {integrity: sha512-Je3kFvCsFMnso1ilPwA7GtlbPaTixa3WwC+K21kmMZHsBEOZYQaqxcMqeFFoU7/slFjKDIpiiPydvdJm8Q/MCw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/querystring-parser@4.0.4':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/querystring-parser@4.0.4:
-    resolution: {integrity: sha512-6yZf53i/qB8gRHH/l2ZwUG5xgkPgQF15/KxH0DdXMDHjesA9MeZje/853ifkSY0x4m5S+dfDZ+c4x439PF0M2w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/querystring-parser@4.2.5':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/service-error-classification@2.0.7:
-    resolution: {integrity: sha512-LLxgW12qGz8doYto15kZ4x1rHjtXl0BnCG6T6Wb8z2DI4PT9cJfOSvzbuLzy7+5I24PAepKgFeWHRd9GYy3Z9w==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/service-error-classification@2.0.7':
     dependencies:
       '@smithy/types': 2.6.0
-    dev: false
 
-  /@smithy/service-error-classification@3.0.11:
-    resolution: {integrity: sha512-QnYDPkyewrJzCyaeI2Rmp7pDwbUETe+hU8ADkXmgNusO1bgHBH7ovXJiYmba8t0fNfJx75fE8dlM6SEmZxheog==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/service-error-classification@4.0.6':
     dependencies:
-      '@smithy/types': 3.7.2
-    dev: false
+      '@smithy/types': 4.9.0
 
-  /@smithy/service-error-classification@4.0.6:
-    resolution: {integrity: sha512-RRoTDL//7xi4tn5FrN2NzH17jbgmnKidUqd4KvquT0954/i6CXXkh1884jBiunq24g9cGtPBEXlU40W6EpNOOg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/service-error-classification@4.2.5':
     dependencies:
-      '@smithy/types': 4.3.1
-    dev: false
+      '@smithy/types': 4.9.0
 
-  /@smithy/shared-ini-file-loader@2.2.5:
-    resolution: {integrity: sha512-LHA68Iu7SmNwfAVe8egmjDCy648/7iJR/fK1UnVw+iAOUJoEYhX2DLgVd5pWllqdDiRbQQzgaHLcRokM+UFR1w==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/shared-ini-file-loader@2.2.5':
     dependencies:
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/shared-ini-file-loader@3.1.12:
-    resolution: {integrity: sha512-1xKSGI+U9KKdbG2qDvIR9dGrw3CNx+baqJfyr0igKEpjbHL5stsqAesYBzHChYHlelWtb87VnLWlhvfCz13H8Q==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/shared-ini-file-loader@4.0.4':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/shared-ini-file-loader@4.0.4:
-    resolution: {integrity: sha512-63X0260LoFBjrHifPDs+nM9tV0VMkOTl4JRMYNuKh/f5PauSjowTfvF3LogfkWdcPoxsA9UjqEOgjeYIbhb7Nw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/shared-ini-file-loader@4.4.0':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/signature-v4@2.0.16:
-    resolution: {integrity: sha512-ilLY85xS2kZZzTb83diQKYLIYALvart0KnBaKnIRnMBHAGEio5aHSlANQoxVn0VsonwmQ3CnWhnCT0sERD8uTg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/signature-v4@2.0.16':
     dependencies:
       '@smithy/eventstream-codec': 2.0.14
-      '@smithy/is-array-buffer': 2.0.0
+      '@smithy/is-array-buffer': 2.2.0
       '@smithy/types': 2.6.0
       '@smithy/util-hex-encoding': 2.0.0
       '@smithy/util-middleware': 2.0.7
       '@smithy/util-uri-escape': 2.0.0
-      '@smithy/util-utf8': 2.0.2
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/signature-v4@4.2.4:
-    resolution: {integrity: sha512-5JWeMQYg81TgU4cG+OexAWdvDTs5JDdbEZx+Qr1iPbvo91QFGzjy0IkXAKaXUHqmKUJgSHK0ZxnCkgZpzkeNTA==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/signature-v4@5.1.2':
     dependencies:
-      '@smithy/is-array-buffer': 3.0.0
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
-      '@smithy/util-hex-encoding': 3.0.0
-      '@smithy/util-middleware': 3.0.11
-      '@smithy/util-uri-escape': 3.0.0
-      '@smithy/util-utf8': 3.0.0
+      '@smithy/is-array-buffer': 4.2.0
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-hex-encoding': 4.2.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-uri-escape': 4.0.0
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/signature-v4@5.1.2:
-    resolution: {integrity: sha512-d3+U/VpX7a60seHziWnVZOHuEgJlclufjkS6zhXvxcJgkJq4UWdH5eOBLzHRMx6gXjsdT9h6lfpmLzbrdupHgQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/signature-v4@5.3.5':
     dependencies:
-      '@smithy/is-array-buffer': 4.0.0
-      '@smithy/protocol-http': 5.1.2
-      '@smithy/types': 4.3.1
-      '@smithy/util-hex-encoding': 4.0.0
-      '@smithy/util-middleware': 4.0.4
-      '@smithy/util-uri-escape': 4.0.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/is-array-buffer': 4.2.0
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-hex-encoding': 4.2.0
+      '@smithy/util-middleware': 4.2.5
+      '@smithy/util-uri-escape': 4.2.0
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/smithy-client@2.1.16:
-    resolution: {integrity: sha512-Lw67+yQSpLl4YkDLUzI2KgS8TXclXmbzSeOJUmRFS4ueT56B4pw3RZRF/SRzvgyxM/HxgkUan8oSHXCujPDafQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/smithy-client@2.1.16':
     dependencies:
       '@smithy/middleware-stack': 2.0.8
       '@smithy/types': 2.6.0
       '@smithy/util-stream': 2.0.21
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/smithy-client@3.5.1:
-    resolution: {integrity: sha512-PmjskH4Os1Eh3rd5vSsa5uVelZ4DRu+N5CBEgb9AT96hQSJGWSEb6pGxKV/PtKQSIp9ft3+KvnT8ViMKaguzgA==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/core': 2.5.5
-      '@smithy/middleware-endpoint': 3.2.6
-      '@smithy/middleware-stack': 3.0.11
-      '@smithy/protocol-http': 4.1.8
-      '@smithy/types': 3.7.2
-      '@smithy/util-stream': 3.3.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/smithy-client@4.4.5:
-    resolution: {integrity: sha512-+lynZjGuUFJaMdDYSTMnP/uPBBXXukVfrJlP+1U/Dp5SFTEI++w6NMga8DjOENxecOF71V9Z2DllaVDYRnGlkg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/smithy-client@4.4.5':
     dependencies:
       '@smithy/core': 3.6.0
       '@smithy/middleware-endpoint': 4.1.13
@@ -17837,201 +29873,161 @@ packages:
       '@smithy/types': 4.3.1
       '@smithy/util-stream': 4.2.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/types@2.6.0:
-    resolution: {integrity: sha512-PgqxJq2IcdMF9iAasxcqZqqoOXBHufEfmbEUdN1pmJrJltT42b0Sc8UiYSWWzKkciIp9/mZDpzYi4qYG1qqg6g==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/smithy-client@4.9.6':
     dependencies:
-      tslib: 2.6.2
-    dev: false
+      '@smithy/core': 3.18.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-stream': 4.5.6
+      tslib: 2.8.1
 
-  /@smithy/types@3.7.2:
-    resolution: {integrity: sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/smithy-client@4.9.8':
     dependencies:
+      '@smithy/core': 3.18.5
+      '@smithy/middleware-endpoint': 4.3.12
+      '@smithy/middleware-stack': 4.2.5
+      '@smithy/protocol-http': 5.3.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-stream': 4.5.6
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/types@4.3.1:
-    resolution: {integrity: sha512-UqKOQBL2x6+HWl3P+3QqFD4ncKq0I8Nuz9QItGv5WuKuMHuuwlhvqcZCoXGfc+P1QmfJE7VieykoYYmrOoFJxA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/types@2.6.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/url-parser@2.0.14:
-    resolution: {integrity: sha512-kbu17Y1AFXi5lNlySdDj7ZzmvupyWKCX/0jNZ8ffquRyGdbDZb+eBh0QnWqsSmnZa/ctyWaTf7n4l/pXLExrnw==}
+  '@smithy/types@4.3.1':
     dependencies:
-      '@smithy/querystring-parser': 2.0.14
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@smithy/url-parser@3.0.11:
-    resolution: {integrity: sha512-TmlqXkSk8ZPhfc+SQutjmFr5FjC0av3GZP4B/10caK1SbRwe/v+Wzu/R6xEKxoNqL+8nY18s1byiy6HqPG37Aw==}
+  '@smithy/types@4.9.0':
     dependencies:
-      '@smithy/querystring-parser': 3.0.11
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/url-parser@4.0.4:
-    resolution: {integrity: sha512-eMkc144MuN7B0TDA4U2fKs+BqczVbk3W+qIvcoCY6D1JY3hnAdCuhCZODC+GAeaxj0p6Jroz4+XMUn3PCxQQeQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/url-parser@2.0.14':
+    dependencies:
+      '@smithy/querystring-parser': 2.0.14
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@smithy/url-parser@4.0.4':
     dependencies:
       '@smithy/querystring-parser': 4.0.4
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-base64@2.0.1:
-    resolution: {integrity: sha512-DlI6XFYDMsIVN+GH9JtcRp3j02JEVuWIn/QOZisVzpIAprdsxGveFed0bjbMRCqmIFe8uetn5rxzNrBtIGrPIQ==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/url-parser@4.2.5':
     dependencies:
-      '@smithy/util-buffer-from': 2.0.0
-      tslib: 2.6.2
-    dev: false
+      '@smithy/querystring-parser': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
 
-  /@smithy/util-base64@3.0.0:
-    resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-base64@2.0.1':
     dependencies:
-      '@smithy/util-buffer-from': 3.0.0
-      '@smithy/util-utf8': 3.0.0
+      '@smithy/util-buffer-from': 2.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-base64@4.0.0:
-    resolution: {integrity: sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-base64@4.0.0':
     dependencies:
       '@smithy/util-buffer-from': 4.0.0
       '@smithy/util-utf8': 4.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-body-length-browser@2.0.0:
-    resolution: {integrity: sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg==}
+  '@smithy/util-base64@4.3.0':
     dependencies:
-      tslib: 2.6.2
-    dev: false
+      '@smithy/util-buffer-from': 4.2.0
+      '@smithy/util-utf8': 4.2.0
+      tslib: 2.8.1
 
-  /@smithy/util-body-length-browser@3.0.0:
-    resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==}
+  '@smithy/util-body-length-browser@2.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-body-length-browser@4.0.0:
-    resolution: {integrity: sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-body-length-browser@4.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-body-length-node@2.1.0:
-    resolution: {integrity: sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-body-length-browser@4.2.0':
     dependencies:
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@smithy/util-body-length-node@3.0.0:
-    resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-body-length-node@2.1.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-body-length-node@4.0.0:
-    resolution: {integrity: sha512-q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-body-length-node@4.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-buffer-from@2.0.0:
-    resolution: {integrity: sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-body-length-node@4.2.1':
     dependencies:
-      '@smithy/is-array-buffer': 2.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-buffer-from@3.0.0:
-    resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-buffer-from@2.0.0':
     dependencies:
-      '@smithy/is-array-buffer': 3.0.0
+      '@smithy/is-array-buffer': 2.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-buffer-from@4.0.0:
-    resolution: {integrity: sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-buffer-from@2.2.0':
     dependencies:
-      '@smithy/is-array-buffer': 4.0.0
+      '@smithy/is-array-buffer': 2.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-config-provider@2.0.0:
-    resolution: {integrity: sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-buffer-from@4.0.0':
     dependencies:
+      '@smithy/is-array-buffer': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-config-provider@3.0.0:
-    resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-buffer-from@4.2.0':
     dependencies:
+      '@smithy/is-array-buffer': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-config-provider@4.0.0:
-    resolution: {integrity: sha512-L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-config-provider@2.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-defaults-mode-browser@2.0.20:
-    resolution: {integrity: sha512-QJtnbTIl0/BbEASkx1MUFf6EaoWqWW1/IM90N++8NNscePvPf77GheYfpoPis6CBQawUWq8QepTP2QUSAdrVkw==}
-    engines: {node: '>= 10.0.0'}
+  '@smithy/util-config-provider@4.0.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@smithy/util-config-provider@4.2.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-browser@2.0.20':
     dependencies:
       '@smithy/property-provider': 2.0.15
       '@smithy/smithy-client': 2.1.16
       '@smithy/types': 2.6.0
       bowser: 2.11.0
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/util-defaults-mode-browser@3.0.31:
-    resolution: {integrity: sha512-eO+zkbqrPnmsagqzrmF7IJrCoU2wTQXWVYxMPqA9Oue55kw9WEvhyuw2XQzTVTCRcYsg6KgmV3YYhLlWQJfK1A==}
-    engines: {node: '>= 10.0.0'}
-    dependencies:
-      '@smithy/property-provider': 3.1.11
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
-      bowser: 2.11.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-defaults-mode-browser@4.0.21:
-    resolution: {integrity: sha512-wM0jhTytgXu3wzJoIqpbBAG5U6BwiubZ6QKzSbP7/VbmF1v96xlAbX2Am/mz0Zep0NLvLh84JT0tuZnk3wmYQA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-defaults-mode-browser@4.0.21':
     dependencies:
       '@smithy/property-provider': 4.0.4
       '@smithy/smithy-client': 4.4.5
       '@smithy/types': 4.3.1
       bowser: 2.11.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-defaults-mode-node@2.0.26:
-    resolution: {integrity: sha512-lGFPOFCHv1ql019oegYqa54BZH7HREw6EBqjDLbAr0wquMX0BDi2sg8TJ6Eq+JGLijkZbJB73m4+aK8OFAapMg==}
-    engines: {node: '>= 10.0.0'}
+  '@smithy/util-defaults-mode-browser@4.3.11':
+    dependencies:
+      '@smithy/property-provider': 4.2.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-browser@4.3.9':
+    dependencies:
+      '@smithy/property-provider': 4.2.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/util-defaults-mode-node@2.0.26':
     dependencies:
       '@smithy/config-resolver': 2.0.19
       '@smithy/credential-provider-imds': 2.1.2
@@ -18039,25 +30035,9 @@ packages:
       '@smithy/property-provider': 2.0.15
       '@smithy/smithy-client': 2.1.16
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/util-defaults-mode-node@3.0.31:
-    resolution: {integrity: sha512-0/nJfpSpbGZOs6qs42wCe2TdjobbnnD4a3YUUlvTXSQqLy4qa63luDaV04hGvqSHP7wQ7/WGehbvHkDhMZd1MQ==}
-    engines: {node: '>= 10.0.0'}
-    dependencies:
-      '@smithy/config-resolver': 3.0.13
-      '@smithy/credential-provider-imds': 3.2.8
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/property-provider': 3.1.11
-      '@smithy/smithy-client': 3.5.1
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-defaults-mode-node@4.0.21:
-    resolution: {integrity: sha512-/F34zkoU0GzpUgLJydHY8Rxu9lBn8xQC/s/0M0U9lLBkYbA1htaAFjWYJzpzsbXPuri5D1H8gjp2jBum05qBrA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-defaults-mode-node@4.0.21':
     dependencies:
       '@smithy/config-resolver': 4.1.4
       '@smithy/credential-provider-imds': 4.0.6
@@ -18066,456 +30046,251 @@ packages:
       '@smithy/smithy-client': 4.4.5
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-endpoints@1.0.5:
-    resolution: {integrity: sha512-K7qNuCOD5K/90MjHvHm9kJldrfm40UxWYQxNEShMFxV/lCCCRIg8R4uu1PFAxRvPxNpIdcrh1uK6I1ISjDXZJw==}
-    engines: {node: '>= 14.0.0'}
+  '@smithy/util-defaults-mode-node@4.2.12':
     dependencies:
-      '@smithy/node-config-provider': 2.1.6
-      '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
 
-  /@smithy/util-endpoints@2.1.7:
-    resolution: {integrity: sha512-tSfcqKcN/Oo2STEYCABVuKgJ76nyyr6skGl9t15hs+YaiU06sgMkN7QYjo0BbVw+KT26zok3IzbdSOksQ4YzVw==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-defaults-mode-node@4.2.14':
     dependencies:
-      '@smithy/node-config-provider': 3.1.12
-      '@smithy/types': 3.7.2
+      '@smithy/config-resolver': 4.4.3
+      '@smithy/credential-provider-imds': 4.2.5
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/property-provider': 4.2.5
+      '@smithy/smithy-client': 4.9.8
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-endpoints@3.0.6:
-    resolution: {integrity: sha512-YARl3tFL3WgPuLzljRUnrS2ngLiUtkwhQtj8PAL13XZSyUiNLQxwG3fBBq3QXFqGFUXepIN73pINp3y8c2nBmA==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-endpoints@1.0.5':
+    dependencies:
+      '@smithy/node-config-provider': 2.1.6
+      '@smithy/types': 2.6.0
+      tslib: 2.8.1
+
+  '@smithy/util-endpoints@3.0.6':
     dependencies:
       '@smithy/node-config-provider': 4.1.3
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-hex-encoding@2.0.0:
-    resolution: {integrity: sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-endpoints@3.2.5':
     dependencies:
+      '@smithy/node-config-provider': 4.3.5
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-hex-encoding@3.0.0:
-    resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-hex-encoding@2.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-hex-encoding@4.0.0:
-    resolution: {integrity: sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-hex-encoding@4.2.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-middleware@2.0.7:
-    resolution: {integrity: sha512-tRINOTlf1G9B0ECarFQAtTgMhpnrMPSa+5j4ZEwEawCLfTFTavk6757sxhE4RY5RMlD/I3x+DCS8ZUiR8ho9Pw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-middleware@2.0.7':
     dependencies:
       '@smithy/types': 2.6.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-middleware@3.0.11:
-    resolution: {integrity: sha512-dWpyc1e1R6VoXrwLoLDd57U1z6CwNSdkM69Ie4+6uYh2GC7Vg51Qtan7ITzczuVpqezdDTKJGJB95fFvvjU/ow==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-middleware@4.0.4':
     dependencies:
-      '@smithy/types': 3.7.2
+      '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-middleware@4.0.4:
-    resolution: {integrity: sha512-9MLKmkBmf4PRb0ONJikCbCwORACcil6gUWojwARCClT7RmLzF04hUR4WdRprIXal7XVyrddadYNfp2eF3nrvtQ==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-middleware@4.2.5':
     dependencies:
-      '@smithy/types': 4.3.1
+      '@smithy/types': 4.9.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-retry@2.0.7:
-    resolution: {integrity: sha512-fIe5yARaF0+xVT1XKcrdnHKTJ1Vc4+3e3tLDjCuIcE9b6fkBzzGFY7AFiX4M+vj6yM98DrwkuZeHf7/hmtVp0Q==}
-    engines: {node: '>= 14.0.0'}
+  '@smithy/util-retry@2.0.7':
     dependencies:
       '@smithy/service-error-classification': 2.0.7
       '@smithy/types': 2.6.0
-      tslib: 2.6.2
-    dev: false
-
-  /@smithy/util-retry@3.0.11:
-    resolution: {integrity: sha512-hJUC6W7A3DQgaee3Hp9ZFcOxVDZzmBIRBPlUAk8/fSOEl7pE/aX7Dci0JycNOnm9Mfr0KV2XjIlUOcGWXQUdVQ==}
-    engines: {node: '>=16.0.0'}
-    dependencies:
-      '@smithy/service-error-classification': 3.0.11
-      '@smithy/types': 3.7.2
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-retry@4.0.6:
-    resolution: {integrity: sha512-+YekoF2CaSMv6zKrA6iI/N9yva3Gzn4L6n35Luydweu5MMPYpiGZlWqehPHDHyNbnyaYlz/WJyYAZnC+loBDZg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-retry@4.0.6':
     dependencies:
       '@smithy/service-error-classification': 4.0.6
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-stream@2.0.21:
-    resolution: {integrity: sha512-0BUE16d7n1x7pi1YluXJdB33jOTyBChT0j/BlOkFa9uxfg6YqXieHxjHNuCdJRARa7AZEj32LLLEPJ1fSa4inA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-retry@4.2.5':
+    dependencies:
+      '@smithy/service-error-classification': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
+
+  '@smithy/util-stream@2.0.21':
     dependencies:
       '@smithy/fetch-http-handler': 2.2.7
       '@smithy/node-http-handler': 2.1.10
       '@smithy/types': 2.6.0
       '@smithy/util-base64': 2.0.1
-      '@smithy/util-buffer-from': 2.0.0
+      '@smithy/util-buffer-from': 2.2.0
       '@smithy/util-hex-encoding': 2.0.0
-      '@smithy/util-utf8': 2.0.2
+      '@smithy/util-utf8': 2.3.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-stream@3.3.2:
-    resolution: {integrity: sha512-sInAqdiVeisUGYAv/FrXpmJ0b4WTFmciTRqzhb7wVuem9BHvhIG7tpiYHLDWrl2stOokNZpTTGqz3mzB2qFwXg==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-stream@4.2.2':
     dependencies:
-      '@smithy/fetch-http-handler': 4.1.2
-      '@smithy/node-http-handler': 3.3.2
-      '@smithy/types': 3.7.2
-      '@smithy/util-base64': 3.0.0
-      '@smithy/util-buffer-from': 3.0.0
-      '@smithy/util-hex-encoding': 3.0.0
-      '@smithy/util-utf8': 3.0.0
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-buffer-from': 4.0.0
+      '@smithy/util-hex-encoding': 4.2.0
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-stream@4.2.2:
-    resolution: {integrity: sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-stream@4.5.6':
     dependencies:
-      '@smithy/fetch-http-handler': 5.0.4
-      '@smithy/node-http-handler': 4.0.6
-      '@smithy/types': 4.3.1
-      '@smithy/util-base64': 4.0.0
-      '@smithy/util-buffer-from': 4.0.0
-      '@smithy/util-hex-encoding': 4.0.0
-      '@smithy/util-utf8': 4.0.0
+      '@smithy/fetch-http-handler': 5.3.6
+      '@smithy/node-http-handler': 4.4.5
+      '@smithy/types': 4.9.0
+      '@smithy/util-base64': 4.3.0
+      '@smithy/util-buffer-from': 4.2.0
+      '@smithy/util-hex-encoding': 4.2.0
+      '@smithy/util-utf8': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-uri-escape@2.0.0:
-    resolution: {integrity: sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-uri-escape@2.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-uri-escape@3.0.0:
-    resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-uri-escape@4.0.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-uri-escape@4.0.0:
-    resolution: {integrity: sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-uri-escape@4.2.0':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-utf8@2.0.2:
-    resolution: {integrity: sha512-qOiVORSPm6Ce4/Yu6hbSgNHABLP2VMv8QOC3tTDNHHlWY19pPyc++fBTbZPtx6egPXi4HQxKDnMxVxpbtX2GoA==}
-    engines: {node: '>=14.0.0'}
+  '@smithy/util-utf8@2.0.2':
     dependencies:
       '@smithy/util-buffer-from': 2.0.0
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@smithy/util-utf8@3.0.0:
-    resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-utf8@2.3.0':
     dependencies:
-      '@smithy/util-buffer-from': 3.0.0
+      '@smithy/util-buffer-from': 2.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-utf8@4.0.0:
-    resolution: {integrity: sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-utf8@4.0.0':
     dependencies:
       '@smithy/util-buffer-from': 4.0.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-waiter@3.2.0:
-    resolution: {integrity: sha512-PpjSboaDUE6yl+1qlg3Si57++e84oXdWGbuFUSAciXsVfEZJJJupR2Nb0QuXHiunt2vGR+1PTizOMvnUPaG2Qg==}
-    engines: {node: '>=16.0.0'}
+  '@smithy/util-utf8@4.2.0':
     dependencies:
-      '@smithy/abort-controller': 3.1.9
-      '@smithy/types': 3.7.2
+      '@smithy/util-buffer-from': 4.2.0
       tslib: 2.8.1
-    dev: false
 
-  /@smithy/util-waiter@4.0.6:
-    resolution: {integrity: sha512-slcr1wdRbX7NFphXZOxtxRNA7hXAAtJAXJDE/wdoMAos27SIquVCKiSqfB6/28YzQ8FCsB5NKkhdM5gMADbqxg==}
-    engines: {node: '>=18.0.0'}
+  '@smithy/util-waiter@4.0.6':
     dependencies:
       '@smithy/abort-controller': 4.0.4
       '@smithy/types': 4.3.1
       tslib: 2.8.1
-    dev: false
 
-  /@socket.io/component-emitter@3.1.0:
-    resolution: {integrity: sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==}
-    dev: false
+  '@smithy/util-waiter@4.2.5':
+    dependencies:
+      '@smithy/abort-controller': 4.2.5
+      '@smithy/types': 4.9.0
+      tslib: 2.8.1
 
-  /@socket.io/redis-adapter@8.3.0(socket.io-adapter@2.5.4):
-    resolution: {integrity: sha512-ly0cra+48hDmChxmIpnESKrc94LjRL80TEmZVscuQ/WWkRP81nNj8W8cCGMqbI4L6NCuAaPRSzZF1a9GlAxxnA==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      socket.io-adapter: ^2.5.4
+  '@smithy/uuid@1.1.0':
+    dependencies:
+      tslib: 2.8.1
+
+  '@socket.io/component-emitter@3.1.0': {}
+
+  '@socket.io/redis-adapter@8.3.0(socket.io-adapter@2.5.4(bufferutil@4.0.9))':
     dependencies:
       debug: 4.3.4
       notepack.io: 3.0.1
-      socket.io-adapter: 2.5.4
+      socket.io-adapter: 2.5.4(bufferutil@4.0.9)
       uid2: 1.0.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /@splinetool/react-spline@2.2.6(@splinetool/runtime@1.9.98)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-y9L2VEbnC6FNZZu8XMmWM9YTTTWal6kJVfP05Amf0QqDNzCSumKsJxZyGUODvuCmiAvy0PfIfEsiVKnSxvhsDw==}
-    peerDependencies:
-      '@splinetool/runtime': '*'
-      react: '>=17.0.0'
-      react-dom: '>=17.0.0'
-    dependencies:
-      '@splinetool/runtime': 1.9.98
-      lodash.debounce: 4.0.8
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-      react-merge-refs: 2.1.1
-    dev: false
 
-  /@splinetool/runtime@1.9.98:
-    resolution: {integrity: sha512-mfueR1yWJokZUUJzvXv5Qf/FVYHkRQb3yW4/fspIC/zkLlDKpVDLArm3/D/4dK0SG0vgEsFhlOZG55ZtnBB86g==}
-    dependencies:
-      on-change: 4.0.2
-      semver-compare: 1.0.0
-    dev: false
+  '@sodaru/yup-to-json-schema@2.0.1': {}
 
-  /@sqltools/formatter@1.2.5:
-    resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
-    dev: false
+  '@standard-schema/spec@1.0.0': {}
 
-  /@standard-schema/spec@1.0.0:
-    resolution: {integrity: sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==}
-    dev: false
+  '@standard-schema/spec@1.1.0': {}
 
-  /@stricli/auto-complete@1.2.0:
-    resolution: {integrity: sha512-r9/msiloVmTF95mdhe04Uzqei1B0ZofhYRLeiPqpJ1W1RMCC8p9iW7kqBZEbALl2aRL5ZK9OEW3Q1cIejH7KEQ==}
-    hasBin: true
+  '@stricli/auto-complete@1.2.0':
     dependencies:
       '@stricli/core': 1.2.0
-    dev: true
-
-  /@stricli/core@1.2.0:
-    resolution: {integrity: sha512-5b+npntDY0TAB7wAw0daGlh3/R2sf0TDLyrB1By2jCNH+C+lmcSqMtJXOMLVtEGSkIOvqAgIWpLMSs1PXqzt3w==}
-    dev: true
 
-  /@sveltejs/acorn-typescript@1.0.5(acorn@8.14.1):
-    resolution: {integrity: sha512-IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ==}
-    peerDependencies:
-      acorn: ^8.9.0
-    dependencies:
-      acorn: 8.14.1
+  '@stricli/core@1.2.0': {}
 
-  /@swc/core-darwin-arm64@1.3.101:
-    resolution: {integrity: sha512-mNFK+uHNPRXSnfTOG34zJOeMl2waM4hF4a2NY7dkMXrPqw9CoJn4MwTXJcyMiSz1/BnNjjTCHF3Yhj0jPxmkzQ==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@swc/core-darwin-arm64@1.3.101':
     optional: true
 
-  /@swc/core-darwin-arm64@1.3.26:
-    resolution: {integrity: sha512-FWWflBfKRYrUJtko2xiedC5XCa31O75IZZqnTWuLpe9g3C5tnUuF3M8LSXZS/dn6wprome1MhtG9GMPkSYkhkg==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
+  '@swc/core-darwin-arm64@1.3.26':
     optional: true
 
-  /@swc/core-darwin-x64@1.3.101:
-    resolution: {integrity: sha512-B085j8XOx73Fg15KsHvzYWG262bRweGr3JooO1aW5ec5pYbz5Ew9VS5JKYS03w2UBSxf2maWdbPz2UFAxg0whw==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
+  '@swc/core-darwin-x64@1.3.101':
     optional: true
 
-  /@swc/core-darwin-x64@1.3.26:
-    resolution: {integrity: sha512-0uQeebAtsewqJ2b35aPZstGrylwd6oJjUyAJOfVJNbremFSJ5JzytB3NoDCIw7CT5UQrSRpvD3mU95gfdQjDGA==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
+  '@swc/core-darwin-x64@1.3.26':
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf@1.3.101:
-    resolution: {integrity: sha512-9xLKRb6zSzRGPqdz52Hy5GuB1lSjmLqa0lST6MTFads3apmx4Vgs8Y5NuGhx/h2I8QM4jXdLbpqQlifpzTlSSw==}
-    engines: {node: '>=10'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@swc/core-linux-arm-gnueabihf@1.3.101':
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf@1.3.26:
-    resolution: {integrity: sha512-06T+LbVFlyciQtwrUB5/a16A1ju1jFoYvd/hq9TWhf7GrtL43U7oJIgqMOPHx2j0+Ps2R3S6R/UUN5YXu618zA==}
-    engines: {node: '>=10'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
+  '@swc/core-linux-arm-gnueabihf@1.3.26':
     optional: true
 
-  /@swc/core-linux-arm64-gnu@1.3.101:
-    resolution: {integrity: sha512-oE+r1lo7g/vs96Weh2R5l971dt+ZLuhaUX+n3BfDdPxNHfObXgKMjO7E+QS5RbGjv/AwiPCxQmbdCp/xN5ICJA==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@swc/core-linux-arm64-gnu@1.3.101':
     optional: true
 
-  /@swc/core-linux-arm64-gnu@1.3.26:
-    resolution: {integrity: sha512-2NT/0xALPfK+U01qIlHxjkGdIj6F0txhu1U2v6B0YP2+k0whL2gCgYeg9QUvkYEXSD5r1Yx+vcb2R/vaSCSClg==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@swc/core-linux-arm64-gnu@1.3.26':
     optional: true
 
-  /@swc/core-linux-arm64-musl@1.3.101:
-    resolution: {integrity: sha512-OGjYG3H4BMOTnJWJyBIovCez6KiHF30zMIu4+lGJTCrxRI2fAjGLml3PEXj8tC3FMcud7U2WUn6TdG0/te2k6g==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@swc/core-linux-arm64-musl@1.3.101':
     optional: true
 
-  /@swc/core-linux-arm64-musl@1.3.26:
-    resolution: {integrity: sha512-64KrTay9hC0mTvZ1AmEFmNEwV5QDjw9U7PJU5riotSc28I+Q/ZoM0qcSFW9JRRa6F2Tr+IfMtyv8+eB2//BQ5g==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
+  '@swc/core-linux-arm64-musl@1.3.26':
     optional: true
 
-  /@swc/core-linux-x64-gnu@1.3.101:
-    resolution: {integrity: sha512-/kBMcoF12PRO/lwa8Z7w4YyiKDcXQEiLvM+S3G9EvkoKYGgkkz4Q6PSNhF5rwg/E3+Hq5/9D2R+6nrkF287ihg==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@swc/core-linux-x64-gnu@1.3.101':
     optional: true
 
-  /@swc/core-linux-x64-gnu@1.3.26:
-    resolution: {integrity: sha512-Te8G13l3dcRM1Mf3J4JzGUngzNXLKnMYlUmBOYN/ORsx7e+VNelR3zsTLHC0+0jGqELDgqvMyzDfk+dux/C/bQ==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@swc/core-linux-x64-gnu@1.3.26':
     optional: true
 
-  /@swc/core-linux-x64-musl@1.3.101:
-    resolution: {integrity: sha512-kDN8lm4Eew0u1p+h1l3JzoeGgZPQ05qDE0czngnjmfpsH2sOZxVj1hdiCwS5lArpy7ktaLu5JdRnx70MkUzhXw==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
+  '@swc/core-linux-x64-musl@1.3.101':
     optional: true
 
-  /@swc/core-linux-x64-musl@1.3.26:
-    resolution: {integrity: sha512-nqQWuSM6OTKepUiQ9+rXgERq/JiO72RBOpXKO2afYppsL96sngjIRewV74v5f6IAfyzw+k+AhC5pgRA4Xu/Jkg==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
+  '@swc/core-linux-x64-musl@1.3.26':
     optional: true
 
-  /@swc/core-win32-arm64-msvc@1.3.101:
-    resolution: {integrity: sha512-9Wn8TTLWwJKw63K/S+jjrZb9yoJfJwCE2RV5vPCCWmlMf3U1AXj5XuWOLUX+Rp2sGKau7wZKsvywhheWm+qndQ==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@swc/core-win32-arm64-msvc@1.3.101':
     optional: true
 
-  /@swc/core-win32-arm64-msvc@1.3.26:
-    resolution: {integrity: sha512-xx34mx+9IBV1sun7sxoNFiqNom9wiOuvsQFJUyQptCnZHgYwOr9OI204LBF95dCcBCZsTm2hT1wBnySJOeimYw==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
+  '@swc/core-win32-arm64-msvc@1.3.26':
     optional: true
 
-  /@swc/core-win32-ia32-msvc@1.3.101:
-    resolution: {integrity: sha512-onO5KvICRVlu2xmr4//V2je9O2XgS1SGKpbX206KmmjcJhXN5EYLSxW9qgg+kgV5mip+sKTHTAu7IkzkAtElYA==}
-    engines: {node: '>=10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@swc/core-win32-ia32-msvc@1.3.101':
     optional: true
 
-  /@swc/core-win32-ia32-msvc@1.3.26:
-    resolution: {integrity: sha512-48LZ/HKNuU9zl8c7qG6IQKb5rBCwmJgysGOmEGzTRBYxAf/x6Scmt0aqxCoV4J02HOs2WduCBDnhUKsSQ2kcXQ==}
-    engines: {node: '>=10'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
+  '@swc/core-win32-ia32-msvc@1.3.26':
     optional: true
 
-  /@swc/core-win32-x64-msvc@1.3.101:
-    resolution: {integrity: sha512-T3GeJtNQV00YmiVw/88/nxJ/H43CJvFnpvBHCVn17xbahiVUOPOduh3rc9LgAkKiNt/aV8vU3OJR+6PhfMR7UQ==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
+  '@swc/core-win32-x64-msvc@1.3.101':
     optional: true
 
-  /@swc/core-win32-x64-msvc@1.3.26:
-    resolution: {integrity: sha512-UPe7S+MezD/S6cKBIc50TduGzmw6PBz1Ms5p+5wDLOKYNS/LSEM4iRmLwvePzP5X8mOyesXrsbwxLy8KHP65Yw==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
+  '@swc/core-win32-x64-msvc@1.3.26':
     optional: true
 
-  /@swc/core@1.3.101:
-    resolution: {integrity: sha512-w5aQ9qYsd/IYmXADAnkXPGDMTqkQalIi+kfFf/MHRKTpaOL7DHjMXwPp/n8hJ0qNjRvchzmPtOqtPBiER50d8A==}
-    engines: {node: '>=10'}
-    requiresBuild: true
-    peerDependencies:
-      '@swc/helpers': ^0.5.0
-    peerDependenciesMeta:
-      '@swc/helpers':
-        optional: true
+  '@swc/core@1.3.101(@swc/helpers@0.5.15)':
     dependencies:
       '@swc/counter': 0.1.3
       '@swc/types': 0.1.6
@@ -18530,12 +30305,9 @@ packages:
       '@swc/core-win32-arm64-msvc': 1.3.101
       '@swc/core-win32-ia32-msvc': 1.3.101
       '@swc/core-win32-x64-msvc': 1.3.101
-    dev: false
+      '@swc/helpers': 0.5.15
 
-  /@swc/core@1.3.26:
-    resolution: {integrity: sha512-U7vEsaLn3IGg0XCRLJX/GTkK9WIfFHUX5USdrp1L2QD29sWPe25HqNndXmUR9KytzKmpDMNoUuHyiuhpVrnNeQ==}
-    engines: {node: '>=10'}
-    requiresBuild: true
+  '@swc/core@1.3.26':
     optionalDependencies:
       '@swc/core-darwin-arm64': 1.3.26
       '@swc/core-darwin-x64': 1.3.26
@@ -18548,228 +30320,89 @@ packages:
       '@swc/core-win32-ia32-msvc': 1.3.26
       '@swc/core-win32-x64-msvc': 1.3.26
 
-  /@swc/counter@0.1.3:
-    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
-    dev: false
+  '@swc/counter@0.1.3': {}
 
-  /@swc/helpers@0.4.14:
-    resolution: {integrity: sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==}
+  '@swc/helpers@0.4.14':
     dependencies:
       tslib: 2.4.1
 
-  /@swc/helpers@0.5.15:
-    resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
+  '@swc/helpers@0.5.15':
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /@swc/helpers@0.5.2:
-    resolution: {integrity: sha512-E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw==}
+  '@swc/helpers@0.5.2':
     dependencies:
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@swc/helpers@0.5.5:
-    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
+  '@swc/helpers@0.5.5':
     dependencies:
       '@swc/counter': 0.1.3
       tslib: 2.8.1
-    dev: false
 
-  /@swc/types@0.1.6:
-    resolution: {integrity: sha512-/JLo/l2JsT/LRd80C3HfbmVpxOAJ11FO2RCEslFrgzLltoP9j8XIbsyDcfCt2WWyX+CM96rBoNM+IToAkFOugg==}
+  '@swc/types@0.1.6':
     dependencies:
       '@swc/counter': 0.1.3
-    dev: false
 
-  /@szmarczak/http-timer@1.1.2:
-    resolution: {integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==}
-    engines: {node: '>=6'}
+  '@szmarczak/http-timer@1.1.2':
     dependencies:
       defer-to-connect: 1.1.3
-    dev: true
-
-  /@t3-oss/env-core@0.10.1(typescript@5.5.4)(zod@3.23.8):
-    resolution: {integrity: sha512-GcKZiCfWks5CTxhezn9k5zWX3sMDIYf6Kaxy2Gx9YEQftFcz8hDRN56hcbylyAO3t4jQnQ5ifLawINsNgCDpOg==}
-    peerDependencies:
-      typescript: '>=5.0.0'
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      typescript: 5.5.4
-      zod: 3.23.8
-    dev: false
-
-  /@t3-oss/env-core@0.11.0(typescript@5.5.4)(zod@3.23.8):
-    resolution: {integrity: sha512-PSalC5bG0a7XbyoLydiQdAnx3gICX6IQNctvh+TyLrdFxsxgocdj9Ui7sd061UlBzi+z4aIGjnem1kZx9QtUgQ==}
-    peerDependencies:
-      typescript: '>=5.0.0'
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      typescript: 5.5.4
-      zod: 3.23.8
-    dev: false
-
-  /@t3-oss/env-nextjs@0.10.1(typescript@5.5.4)(zod@3.23.8):
-    resolution: {integrity: sha512-iy2qqJLnFh1RjEWno2ZeyTu0ufomkXruUsOZludzDIroUabVvHsrSjtkHqwHp1/pgPUzN3yBRHMILW162X7x2Q==}
-    peerDependencies:
-      typescript: '>=5.0.0'
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@t3-oss/env-core': 0.10.1(typescript@5.5.4)(zod@3.23.8)
-      typescript: 5.5.4
-      zod: 3.23.8
-    dev: false
 
-  /@tabler/icons-react@2.47.0(react@18.2.0):
-    resolution: {integrity: sha512-iqly2FvCF/qUbgmvS8E40rVeYY7laltc5GUjRxQj59DuX0x/6CpKHTXt86YlI2whg4czvd/c8Ce8YR08uEku0g==}
-    peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0
+  '@tabler/icons-react@3.36.1(react@18.2.0)':
     dependencies:
-      '@tabler/icons': 2.47.0
-      prop-types: 15.8.1
+      '@tabler/icons': 3.36.1
       react: 18.2.0
-    dev: false
 
-  /@tabler/icons@2.47.0:
-    resolution: {integrity: sha512-4w5evLh+7FUUiA1GucvGj2ReX2TvOjEr4ejXdwL/bsjoSkof6r1gQmzqI+VHrE2CpJpB3al7bCTulOkFa/RcyA==}
-    dev: false
+  '@tabler/icons@3.36.1': {}
 
-  /@tailwindcss/container-queries@0.1.1(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==}
-    peerDependencies:
-      tailwindcss: '>=3.2.0'
+  '@tailwindcss/container-queries@0.1.1(tailwindcss@3.4.1)':
     dependencies:
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: false
+      tailwindcss: 3.4.1
 
-  /@tailwindcss/forms@0.5.3(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==}
-    peerDependencies:
-      tailwindcss: '>=3.0.0 || >= 3.0.0-alpha.1'
+  '@tailwindcss/forms@0.5.3(tailwindcss@3.4.1)':
     dependencies:
       mini-svg-data-uri: 1.4.4
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: true
+      tailwindcss: 3.4.1
 
-  /@tailwindcss/node@4.0.17:
-    resolution: {integrity: sha512-LIdNwcqyY7578VpofXyqjH6f+3fP4nrz7FBLki5HpzqjYfXdF2m/eW18ZfoKePtDGg90Bvvfpov9d2gy5XVCbg==}
+  '@tailwindcss/node@4.0.17':
     dependencies:
-      enhanced-resolve: 5.18.1
+      enhanced-resolve: 5.18.3
       jiti: 2.4.2
       tailwindcss: 4.0.17
-    dev: true
 
-  /@tailwindcss/oxide-android-arm64@4.0.17:
-    resolution: {integrity: sha512-3RfO0ZK64WAhop+EbHeyxGThyDr/fYhxPzDbEQjD2+v7ZhKTb2svTWy+KK+J1PHATus2/CQGAGp7pHY/8M8ugg==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-android-arm64@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-darwin-arm64@4.0.17:
-    resolution: {integrity: sha512-e1uayxFQCCDuzTk9s8q7MC5jFN42IY7nzcr5n0Mw/AcUHwD6JaBkXnATkD924ZsHyPDvddnusIEvkgLd2CiREg==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-darwin-arm64@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-darwin-x64@4.0.17:
-    resolution: {integrity: sha512-d6z7HSdOKfXQ0HPlVx1jduUf/YtBuCCtEDIEFeBCzgRRtDsUuRtofPqxIVaSCUTOk5+OfRLonje6n9dF6AH8wQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-darwin-x64@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-freebsd-x64@4.0.17:
-    resolution: {integrity: sha512-EjrVa6lx3wzXz3l5MsdOGtYIsRjgs5Mru6lDv4RuiXpguWeOb3UzGJ7vw7PEzcFadKNvNslEQqoAABeMezprxQ==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-freebsd-x64@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-linux-arm-gnueabihf@4.0.17:
-    resolution: {integrity: sha512-65zXfCOdi8wuaY0Ye6qMR5LAXokHYtrGvo9t/NmxvSZtCCitXV/gzJ/WP5ksXPhff1SV5rov0S+ZIZU+/4eyCQ==}
-    engines: {node: '>= 10'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-linux-arm64-gnu@4.0.17:
-    resolution: {integrity: sha512-+aaq6hJ8ioTdbJV5IA1WjWgLmun4T7eYLTvJIToiXLHy5JzUERRbIZjAcjgK9qXMwnvuu7rqpxzej+hGoEcG5g==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-linux-arm64-gnu@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-linux-arm64-musl@4.0.17:
-    resolution: {integrity: sha512-/FhWgZCdUGAeYHYnZKekiOC0aXFiBIoNCA0bwzkICiMYS5Rtx2KxFfMUXQVnl4uZRblG5ypt5vpPhVaXgGk80w==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-linux-arm64-musl@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-linux-x64-gnu@4.0.17:
-    resolution: {integrity: sha512-gELJzOHK6GDoIpm/539Golvk+QWZjxQcbkKq9eB2kzNkOvrP0xc5UPgO9bIMNt1M48mO8ZeNenCMGt6tfkvVBg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-linux-x64-gnu@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-linux-x64-musl@4.0.17:
-    resolution: {integrity: sha512-68NwxcJrZn94IOW4TysMIbYv5AlM6So1luTlbYUDIGnKma1yTFGBRNEJ+SacJ3PZE2rgcTBNRHX1TB4EQ/XEHw==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-linux-x64-musl@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-win32-arm64-msvc@4.0.17:
-    resolution: {integrity: sha512-AkBO8efP2/7wkEXkNlXzRD4f/7WerqKHlc6PWb5v0jGbbm22DFBLbIM19IJQ3b+tNewQZa+WnPOaGm0SmwMNjw==}
-    engines: {node: '>= 10'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-win32-arm64-msvc@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide-win32-x64-msvc@4.0.17:
-    resolution: {integrity: sha512-7/DTEvXcoWlqX0dAlcN0zlmcEu9xSermuo7VNGX9tJ3nYMdo735SHvbrHDln1+LYfF6NhJ3hjbpbjkMOAGmkDg==}
-    engines: {node: '>= 10'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@tailwindcss/oxide-win32-x64-msvc@4.0.17':
     optional: true
 
-  /@tailwindcss/oxide@4.0.17:
-    resolution: {integrity: sha512-B4OaUIRD2uVrULpAD1Yksx2+wNarQr2rQh65nXqaqbLY1jCd8fO+3KLh/+TH4Hzh2NTHQvgxVbPdUDOtLk7vAw==}
-    engines: {node: '>= 10'}
+  '@tailwindcss/oxide@4.0.17':
     optionalDependencies:
       '@tailwindcss/oxide-android-arm64': 4.0.17
       '@tailwindcss/oxide-darwin-arm64': 4.0.17
@@ -18782,10 +30415,8 @@ packages:
       '@tailwindcss/oxide-linux-x64-musl': 4.0.17
       '@tailwindcss/oxide-win32-arm64-msvc': 4.0.17
       '@tailwindcss/oxide-win32-x64-msvc': 4.0.17
-    dev: true
 
-  /@tailwindcss/postcss@4.0.17:
-    resolution: {integrity: sha512-qeJbRTB5FMZXmuJF+eePd235EGY6IyJZF0Bh0YM6uMcCI4L9Z7dy+lPuLAhxOJzxnajsbjPoDAKOuAqZRtf1PQ==}
+  '@tailwindcss/postcss@4.0.17':
     dependencies:
       '@alloc/quick-lru': 5.2.0
       '@tailwindcss/node': 4.0.17
@@ -18793,89 +30424,73 @@ packages:
       lightningcss: 1.29.2
       postcss: 8.5.3
       tailwindcss: 4.0.17
-    dev: true
 
-  /@tailwindcss/typography@0.5.9(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==}
-    peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders'
+  '@tailwindcss/typography@0.5.9(tailwindcss@3.4.1)':
     dependencies:
       lodash.castarray: 4.4.0
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       postcss-selector-parser: 6.0.10
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: true
+      tailwindcss: 3.4.1
 
-  /@tailwindcss/typography@0.5.9(tailwindcss@4.0.17):
-    resolution: {integrity: sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg==}
-    peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders'
+  '@tailwindcss/typography@0.5.9(tailwindcss@4.0.17)':
     dependencies:
       lodash.castarray: 4.4.0
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       postcss-selector-parser: 6.0.10
       tailwindcss: 4.0.17
-    dev: true
 
-  /@tanstack/query-core@5.76.0:
-    resolution: {integrity: sha512-FN375hb8ctzfNAlex5gHI6+WDXTNpe0nbxp/d2YJtnP+IBM6OUm7zcaoCW6T63BawGOYZBbKC0iPvr41TteNVg==}
-    dev: false
+  '@tanstack/match-sorter-utils@8.19.4':
+    dependencies:
+      remove-accents: 0.5.0
 
-  /@tanstack/react-query@5.76.1(react@18.2.0):
-    resolution: {integrity: sha512-YxdLZVGN4QkT5YT1HKZQWiIlcgauIXEIsMOTSjvyD5wLYK8YVvKZUPAysMqossFJJfDpJW3pFn7WNZuPOqq+fw==}
-    peerDependencies:
-      react: ^18 || ^19
+  '@tanstack/query-core@5.76.0': {}
+
+  '@tanstack/react-query@5.76.1(react@18.2.0)':
     dependencies:
       '@tanstack/query-core': 5.76.0
       react: 18.2.0
-    dev: false
 
-  /@tanstack/react-virtual@3.0.4(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-tiqKW/e2MJVCr7/pRUXulpkyxllaOclkHNfhKTo4pmHjJIqnhMfwIjc1Q1R0Un3PI3kQywywu/791c8z9u0qeA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  '@tanstack/react-table@8.21.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+    dependencies:
+      '@tanstack/table-core': 8.21.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+
+  '@tanstack/react-virtual@3.0.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       '@tanstack/virtual-core': 3.0.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@tanstack/virtual-core@3.0.0:
-    resolution: {integrity: sha512-SYXOBTjJb05rXa2vl55TTwO40A6wKu0R5i1qQwhJYNDIqaIGF7D0HsLw+pJAyi2OvntlEIVusx3xtbbgSUi6zg==}
-    dev: false
+  '@tanstack/table-core@8.21.3': {}
 
-  /@team-plain/typescript-sdk@3.5.0:
-    resolution: {integrity: sha512-9kweiSlYAN31VI7yzILGxdlZqsGJ+FmCEfXyEZ/0/i3r6vOwq45FDqtjadnQJVtFm+rf/8vCFRN+wEYMIEv6Aw==}
+  '@tanstack/virtual-core@3.0.0': {}
+
+  '@team-plain/typescript-sdk@3.5.0':
     dependencies:
       '@graphql-typed-document-node/core': 3.2.0(graphql@16.6.0)
       graphql: 16.6.0
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /@testcontainers/postgresql@10.28.0:
-    resolution: {integrity: sha512-NN25rruG5D4Q7pCNIJuHwB+G85OSeJ3xHZ2fWx0O6sPoPEfCYwvpj8mq99cyn68nxFkFYZeyrZJtSFO+FnydiA==}
+  '@testcontainers/postgresql@10.28.0':
     dependencies:
       testcontainers: 10.28.0
     transitivePeerDependencies:
+      - bare-abort-controller
       - bare-buffer
       - supports-color
-    dev: true
 
-  /@testcontainers/redis@10.28.0:
-    resolution: {integrity: sha512-xDNKSJTBmQca/3v5sdHmqSCYr68vjvAGSxoHCuWylha77gAYn88g5nUZK0ocNbUZgBq69KhIzj/f9zlHkw34uA==}
+  '@testcontainers/redis@10.28.0':
     dependencies:
       testcontainers: 10.28.0
     transitivePeerDependencies:
+      - bare-abort-controller
       - bare-buffer
       - supports-color
-    dev: true
 
-  /@testing-library/dom@8.19.1:
-    resolution: {integrity: sha512-P6iIPyYQ+qH8CvGauAqanhVnjrnRe0IZFSYCeGkSRW9q3u8bdVn2NPI+lasFyVsEQn1J/IFmp5Aax41+dAP9wg==}
-    engines: {node: '>=12'}
+  '@testing-library/dom@8.19.1':
     dependencies:
       '@babel/code-frame': 7.22.13
       '@babel/runtime': 7.27.0
@@ -18885,854 +30500,608 @@ packages:
       dom-accessibility-api: 0.5.15
       lz-string: 1.4.4
       pretty-format: 27.5.1
-    dev: true
 
-  /@testing-library/jest-dom@6.5.0:
-    resolution: {integrity: sha512-xGGHpBXYSHUUr6XsKBfs85TWlYKpTc37cSBBVrXcib2MkHLboWlkClhWF37JKlDb9KEq3dHs+f2xR7XJEWGBxA==}
-    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
+  '@testing-library/jest-dom@6.5.0':
     dependencies:
       '@adobe/css-tools': 4.4.0
       aria-query: 5.3.0
       chalk: 3.0.0
       css.escape: 1.5.1
       dom-accessibility-api: 0.6.3
-      lodash: 4.17.21
+      lodash: 4.17.23
       redent: 3.0.0
-    dev: false
-
-  /@tokenizer/token@0.3.0:
-    resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
-    dev: true
-
-  /@tootallnate/once@1.1.2:
-    resolution: {integrity: sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==}
-    engines: {node: '>= 6'}
-    requiresBuild: true
-    dev: false
-    optional: true
-
-  /@tootallnate/quickjs-emscripten@0.23.0:
-    resolution: {integrity: sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==}
-    dev: false
 
-  /@total-typescript/ts-reset@0.4.2:
-    resolution: {integrity: sha512-vqd7ZUDSrXFVT1n8b2kc3LnklncDQFPvR58yUS1kEP23/nHPAO9l1lMjUfnPrXYYk4Hj54rrLKMW5ipwk7k09A==}
-    dev: true
+  '@tokenizer/token@0.3.0': {}
 
-  /@traceloop/ai-semantic-conventions@0.10.0:
-    resolution: {integrity: sha512-B7XuwDpSNXtyz1SUi6Xqd/t6xg0dS9V80pLaIxbQC0n5vsHfao5MPqz7jY8WgZroCANFFiDVDE0JMJsX1vfk7Q==}
-    engines: {node: '>=14'}
-    dependencies:
-      '@opentelemetry/api': 1.9.0
-    dev: false
+  '@tootallnate/quickjs-emscripten@0.23.0': {}
 
-  /@traceloop/instrumentation-openai@0.10.0(@opentelemetry/api@1.4.1):
-    resolution: {integrity: sha512-rp1J6FOJLNZ1M08xsz2B84STNV3AGKxCq+44w7mgadOCyI6GDw7a1lbLo+wTV0dxnt34HPBBdrvRXCFHd3JK9Q==}
-    engines: {node: '>=14'}
-    dependencies:
-      '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.4.1)
-      '@opentelemetry/semantic-conventions': 1.28.0
-      '@traceloop/ai-semantic-conventions': 0.10.0
-      js-tiktoken: 1.0.14
-      tslib: 2.6.2
-    transitivePeerDependencies:
-      - '@opentelemetry/api'
-      - supports-color
-    dev: false
+  '@total-typescript/ts-reset@0.4.2': {}
 
-  /@trigger.dev/companyicons@1.5.35(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-AhY7yshwh0onlgB6EGiyjyLSzl38Cuxo4tpUJVHxs5im8gDA+fuUq7o6Vz1WetFeNXwjMqh3f+bPW7bfqR4epg==}
-    peerDependencies:
-      react: ^18.2.0
-      react-dom: 18.2.0
+  '@trigger.dev/companyicons@1.5.35(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /@trigger.dev/platform@1.0.15:
-    resolution: {integrity: sha512-rorRJJl7ecyiO8iQZcHGlXR00bTzm7e1xZt0ddCYJFhaQjxq2bo2oen5DVxUbLZsE2cp60ipQWFrmAipFwK79Q==}
+  '@trigger.dev/platform@1.0.23':
     dependencies:
       zod: 3.23.8
-    dev: false
 
-  /@tsconfig/node10@1.0.9:
-    resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==}
-
-  /@tsconfig/node12@1.0.11:
-    resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==}
-
-  /@tsconfig/node14@1.0.3:
-    resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==}
-
-  /@tsconfig/node16@1.0.3:
-    resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==}
-
-  /@types/acorn@4.0.6:
-    resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==}
+  '@types/acorn@4.0.6':
     dependencies:
-      '@types/estree': 1.0.7
-    dev: true
+      '@types/estree': 1.0.8
 
-  /@types/aria-query@5.0.1:
-    resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==}
-    dev: true
+  '@types/aria-query@5.0.1': {}
 
-  /@types/bcrypt@5.0.2:
-    resolution: {integrity: sha512-6atioO8Y75fNcbmj0G7UjI9lXN2pQ/IGJ2FWT4a/btd0Lk9lQalHLKhkgKVZ3r+spnmWUKfbMi1GEe9wyHQfNQ==}
-    dependencies:
-      '@types/node': 20.14.14
-    dev: true
+  '@types/aws-lambda@8.10.152': {}
 
-  /@types/bcryptjs@2.4.2:
-    resolution: {integrity: sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ==}
-    dev: true
+  '@types/bcryptjs@2.4.2': {}
 
-  /@types/body-parser@1.19.2:
-    resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
+  '@types/body-parser@1.19.2':
     dependencies:
       '@types/connect': 3.4.35
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/bun@1.1.6:
-    resolution: {integrity: sha512-uJgKjTdX0GkWEHZzQzFsJkWp5+43ZS7HC8sZPFnOwnSo1AsNl2q9o2bFeS23disNDqbggEgyFkKCHl/w8iZsMA==}
+  '@types/btoa-lite@1.0.2': {}
+
+  '@types/bun@1.1.6':
     dependencies:
       bun-types: 1.1.17
-    dev: true
 
-  /@types/caseless@0.12.5:
-    resolution: {integrity: sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==}
-    dev: false
+  '@types/caseless@0.12.5': {}
 
-  /@types/compression@1.7.2:
-    resolution: {integrity: sha512-lwEL4M/uAGWngWFLSG87ZDr2kLrbuR8p7X+QZB1OQlT+qkHsCPDVFnHPyXf4Vyl4yDDorNY+mAhosxkCvppatg==}
+  '@types/compression@1.7.2':
     dependencies:
       '@types/express': 4.17.15
-    dev: true
 
-  /@types/connect@3.4.35:
-    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
+  '@types/connect@3.4.35':
     dependencies:
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/cookie@0.4.1:
-    resolution: {integrity: sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==}
+  '@types/connect@3.4.38':
+    dependencies:
+      '@types/node': 20.14.14
 
-  /@types/cookie@0.6.0:
-    resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==}
+  '@types/cookie@0.4.1': {}
 
-  /@types/cookiejar@2.1.5:
-    resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
-    dev: true
+  '@types/cookie@0.6.0': {}
 
-  /@types/cors@2.8.17:
-    resolution: {integrity: sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==}
+  '@types/cookiejar@2.1.5': {}
+
+  '@types/cors@2.8.17':
     dependencies:
       '@types/node': 20.14.14
 
-  /@types/cross-spawn@6.0.2:
-    resolution: {integrity: sha512-KuwNhp3eza+Rhu8IFI5HUXRP0LIhqH5cAjubUvGXXthh4YYBuP2ntwEX+Cz8GJoZUHlKo247wPWOfA9LYEq4cw==}
+  '@types/cross-spawn@6.0.2':
     dependencies:
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/d3-array@3.0.8:
-    resolution: {integrity: sha512-2xAVyAUgaXHX9fubjcCbGAUOqYfRJN1em1EKR2HfzWBpObZhwfnZKvofTN4TplMqJdFQao61I+NVSai/vnBvDQ==}
-    dev: false
+  '@types/d3-array@3.0.8': {}
 
-  /@types/d3-color@3.1.1:
-    resolution: {integrity: sha512-CSAVrHAtM9wfuLJ2tpvvwCU/F22sm7rMHNN+yh9D6O6hyAms3+O0cgMpC1pm6UEUMOntuZC8bMt74PteiDUdCg==}
-    dev: false
+  '@types/d3-axis@3.0.6':
+    dependencies:
+      '@types/d3-selection': 3.0.11
 
-  /@types/d3-ease@3.0.0:
-    resolution: {integrity: sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA==}
-    dev: false
+  '@types/d3-brush@3.0.6':
+    dependencies:
+      '@types/d3-selection': 3.0.11
 
-  /@types/d3-interpolate@3.0.2:
-    resolution: {integrity: sha512-zAbCj9lTqW9J9PlF4FwnvEjXZUy75NQqPm7DMHZXuxCFTpuTrdK2NMYGQekf4hlasL78fCYOLu4EE3/tXElwow==}
+  '@types/d3-chord@3.0.6': {}
+
+  '@types/d3-color@3.1.1': {}
+
+  '@types/d3-contour@3.0.6':
+    dependencies:
+      '@types/d3-array': 3.0.8
+      '@types/geojson': 7946.0.16
+
+  '@types/d3-delaunay@6.0.4': {}
+
+  '@types/d3-dispatch@3.0.7': {}
+
+  '@types/d3-drag@3.0.7':
+    dependencies:
+      '@types/d3-selection': 3.0.11
+
+  '@types/d3-dsv@3.0.7': {}
+
+  '@types/d3-ease@3.0.0': {}
+
+  '@types/d3-fetch@3.0.7':
+    dependencies:
+      '@types/d3-dsv': 3.0.7
+
+  '@types/d3-force@3.0.10': {}
+
+  '@types/d3-format@3.0.4': {}
+
+  '@types/d3-geo@3.1.0':
+    dependencies:
+      '@types/geojson': 7946.0.16
+
+  '@types/d3-hierarchy@3.1.7': {}
+
+  '@types/d3-interpolate@3.0.2':
     dependencies:
       '@types/d3-color': 3.1.1
-    dev: false
 
-  /@types/d3-path@3.0.0:
-    resolution: {integrity: sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==}
-    dev: false
+  '@types/d3-path@3.0.0': {}
 
-  /@types/d3-scale@4.0.5:
-    resolution: {integrity: sha512-w/C++3W394MHzcLKO2kdsIn5KKNTOqeQVzyPSGPLzQbkPw/jpeaGtSRlakcKevGgGsjJxGsbqS0fPrVFDbHrDA==}
+  '@types/d3-polygon@3.0.2': {}
+
+  '@types/d3-quadtree@3.0.6': {}
+
+  '@types/d3-random@3.0.3': {}
+
+  '@types/d3-scale-chromatic@3.1.0': {}
+
+  '@types/d3-scale@4.0.5':
     dependencies:
       '@types/d3-time': 3.0.1
-    dev: false
 
-  /@types/d3-shape@3.1.3:
-    resolution: {integrity: sha512-cHMdIq+rhF5IVwAV7t61pcEXfEHsEsrbBUPkFGBwTXuxtTAkBBrnrNA8++6OWm3jwVsXoZYQM8NEekg6CPJ3zw==}
+  '@types/d3-selection@3.0.11': {}
+
+  '@types/d3-shape@3.1.3':
     dependencies:
       '@types/d3-path': 3.0.0
-    dev: false
 
-  /@types/d3-time@3.0.1:
-    resolution: {integrity: sha512-5j/AnefKAhCw4HpITmLDTPlf4vhi8o/dES+zbegfPb7LaGfNyqkLxBR6E+4yvTAgnJLmhe80EXFMzUs38fw4oA==}
-    dev: false
+  '@types/d3-time-format@4.0.3': {}
 
-  /@types/d3-timer@3.0.0:
-    resolution: {integrity: sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==}
-    dev: false
+  '@types/d3-time@3.0.1': {}
 
-  /@types/debug@4.1.12:
-    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+  '@types/d3-timer@3.0.0': {}
+
+  '@types/d3-transition@3.0.9':
+    dependencies:
+      '@types/d3-selection': 3.0.11
+
+  '@types/d3-zoom@3.0.8':
+    dependencies:
+      '@types/d3-interpolate': 3.0.2
+      '@types/d3-selection': 3.0.11
+
+  '@types/d3@7.4.3':
+    dependencies:
+      '@types/d3-array': 3.0.8
+      '@types/d3-axis': 3.0.6
+      '@types/d3-brush': 3.0.6
+      '@types/d3-chord': 3.0.6
+      '@types/d3-color': 3.1.1
+      '@types/d3-contour': 3.0.6
+      '@types/d3-delaunay': 6.0.4
+      '@types/d3-dispatch': 3.0.7
+      '@types/d3-drag': 3.0.7
+      '@types/d3-dsv': 3.0.7
+      '@types/d3-ease': 3.0.0
+      '@types/d3-fetch': 3.0.7
+      '@types/d3-force': 3.0.10
+      '@types/d3-format': 3.0.4
+      '@types/d3-geo': 3.1.0
+      '@types/d3-hierarchy': 3.1.7
+      '@types/d3-interpolate': 3.0.2
+      '@types/d3-path': 3.0.0
+      '@types/d3-polygon': 3.0.2
+      '@types/d3-quadtree': 3.0.6
+      '@types/d3-random': 3.0.3
+      '@types/d3-scale': 4.0.5
+      '@types/d3-scale-chromatic': 3.1.0
+      '@types/d3-selection': 3.0.11
+      '@types/d3-shape': 3.1.3
+      '@types/d3-time': 3.0.1
+      '@types/d3-time-format': 4.0.3
+      '@types/d3-timer': 3.0.0
+      '@types/d3-transition': 3.0.9
+      '@types/d3-zoom': 3.0.8
+
+  '@types/debug@4.1.12':
     dependencies:
       '@types/ms': 0.7.31
 
-  /@types/debug@4.1.7:
-    resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==}
+  '@types/debug@4.1.7':
     dependencies:
       '@types/ms': 0.7.31
-    dev: true
 
-  /@types/debug@4.1.8:
-    resolution: {integrity: sha512-/vPO1EPOs306Cvhwv7KfVfYvOJqA/S/AXjaHQiJboCZzcNDb+TIJFN9/2C9DZ//ijSKWioNyUxD792QmDJ+HKQ==}
+  '@types/debug@4.1.8':
     dependencies:
       '@types/ms': 0.7.31
-    dev: true
 
-  /@types/diff-match-patch@1.0.36:
-    resolution: {integrity: sha512-xFdR6tkm0MWvBfO8xXCSsinYxHcqkQUlcHeSpMC2ukzOb6lwQAfDmW+Qt0AvlGd8HpsS28qKsB+oPeJn9I39jg==}
+  '@types/decimal.js@7.4.3':
+    dependencies:
+      decimal.js: 10.6.0
 
-  /@types/docker-modem@3.0.6:
-    resolution: {integrity: sha512-yKpAGEuKRSS8wwx0joknWxsmLha78wNMe9R2S3UNsVOkZded8UqOrV8KoeDXoXsjndxwyF3eIhyClGbO1SEhEg==}
+  '@types/diff-match-patch@1.0.36': {}
+
+  '@types/docker-modem@3.0.6':
     dependencies:
       '@types/node': 20.14.14
       '@types/ssh2': 1.15.1
-    dev: true
 
-  /@types/dockerode@3.3.35:
-    resolution: {integrity: sha512-P+DCMASlsH+QaKkDpekKrP5pLls767PPs+/LrlVbKnEnY5tMpEUa2C6U4gRsdFZengOqxdCIqy16R22Q3pLB6Q==}
+  '@types/dockerode@3.3.35':
     dependencies:
       '@types/docker-modem': 3.0.6
       '@types/node': 20.14.14
       '@types/ssh2': 1.15.1
-    dev: true
 
-  /@types/dompurify@3.2.0:
-    resolution: {integrity: sha512-Fgg31wv9QbLDA0SpTOXO3MaxySc4DKGLi8sna4/Utjo4r3ZRPdCt4UQee8BWr+Q5z21yifghREPJGYaEOEIACg==}
-    deprecated: This is a stub types definition. dompurify provides its own type definitions, so you do not need this installed.
+  '@types/dompurify@3.2.0':
     dependencies:
       dompurify: 3.2.6
-    dev: true
 
-  /@types/email-reply-parser@1.4.2:
-    resolution: {integrity: sha512-kmMoK9WMX4zXf3c0D3tkWHDl0E50V2dv6fVirdTQd/mkvE/Jixh0DZAh3kBgpltr1eaWM3W+kAf4A2c2Z2iU2A==}
-    dev: true
-
-  /@types/eslint-scope@3.7.4:
-    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
+  '@types/eslint-scope@3.7.4':
     dependencies:
       '@types/eslint': 8.4.10
-      '@types/estree': 1.0.7
-    dev: false
+      '@types/estree': 1.0.8
 
-  /@types/eslint-scope@3.7.7:
-    resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
+  '@types/eslint-scope@3.7.7':
     dependencies:
       '@types/eslint': 8.56.12
-      '@types/estree': 1.0.7
-    dev: true
+      '@types/estree': 1.0.8
 
-  /@types/eslint@8.4.10:
-    resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
+  '@types/eslint@8.4.10':
     dependencies:
       '@types/estree': 1.0.0
       '@types/json-schema': 7.0.11
 
-  /@types/eslint@8.56.12:
-    resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==}
+  '@types/eslint@8.56.12':
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
       '@types/json-schema': 7.0.15
-    dev: true
 
-  /@types/estree-jsx@1.0.0:
-    resolution: {integrity: sha512-3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ==}
+  '@types/estree-jsx@1.0.0':
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
 
-  /@types/estree@1.0.0:
-    resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
+  '@types/estree@1.0.0': {}
 
-  /@types/estree@1.0.6:
-    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
-    dev: true
+  '@types/estree@1.0.6': {}
 
-  /@types/estree@1.0.7:
-    resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
+  '@types/estree@1.0.8': {}
 
-  /@types/eventsource@1.1.15:
-    resolution: {integrity: sha512-XQmGcbnxUNa06HR3VBVkc9+A2Vpi9ZyLJcdS5dwaQQ/4ZMWFO+5c90FnMUpbtMZwB/FChoYHwuVg8TvkECacTA==}
-    dev: true
+  '@types/eventsource@1.1.15': {}
 
-  /@types/express-serve-static-core@4.17.32:
-    resolution: {integrity: sha512-aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA==}
+  '@types/express-serve-static-core@4.17.32':
     dependencies:
       '@types/node': 20.14.14
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
-    dev: true
 
-  /@types/express@4.17.15:
-    resolution: {integrity: sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==}
+  '@types/express@4.17.15':
     dependencies:
       '@types/body-parser': 1.19.2
       '@types/express-serve-static-core': 4.17.32
       '@types/qs': 6.9.7
       '@types/serve-static': 1.15.0
-    dev: true
 
-  /@types/fluent-ffmpeg@2.1.26:
-    resolution: {integrity: sha512-0JVF3wdQG+pN0ImwWD0bNgJiKF2OHg/7CDBHw5UIbRTvlnkgGHK6V5doE54ltvhud4o31/dEiHm23CAlxFiUQg==}
-    dependencies:
-      '@types/node': 20.14.14
-    dev: true
+  '@types/geojson@7946.0.16': {}
 
-  /@types/gradient-string@1.1.2:
-    resolution: {integrity: sha512-zIet2KvHr2dkOCPI5ggQQ+WJVyfBSFaqK9sNelhgDjlE2K3Fu2muuPJwu5aKM3xoWuc3WXudVEMUwI1QWhykEQ==}
+  '@types/gradient-string@1.1.2':
     dependencies:
       '@types/tinycolor2': 1.4.3
-    dev: true
 
-  /@types/hast@2.3.4:
-    resolution: {integrity: sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==}
+  '@types/hast@2.3.4':
     dependencies:
       '@types/unist': 3.0.3
-    dev: true
 
-  /@types/hast@3.0.4:
-    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
+  '@types/hast@3.0.4':
     dependencies:
       '@types/unist': 3.0.3
-    dev: false
 
-  /@types/humanize-duration@3.27.1:
-    resolution: {integrity: sha512-K3e+NZlpCKd6Bd/EIdqjFJRFHbrq5TzPPLwREk5Iv/YoIjQrs6ljdAUCo+Lb2xFlGNOjGSE0dqsVD19cZL137w==}
-    dev: true
+  '@types/humanize-duration@3.27.1': {}
 
-  /@types/ini@4.1.1:
-    resolution: {integrity: sha512-MIyNUZipBTbyUNnhvuXJTY7B6qNI78meck9Jbv3wk0OgNwRyOOVEKDutAkOs1snB/tx0FafyR6/SN4Ps0hZPeg==}
-    dev: true
+  '@types/ini@4.1.1': {}
 
-  /@types/interpret@1.1.3:
-    resolution: {integrity: sha512-uBaBhj/BhilG58r64mtDb/BEdH51HIQLgP5bmWzc5qCtFMja8dCk/IOJmk36j0lbi9QHwI6sbtUNGuqXdKCAtQ==}
+  '@types/interpret@1.1.3':
     dependencies:
       '@types/node': 20.14.14
-    dev: false
 
-  /@types/invariant@2.2.37:
-    resolution: {integrity: sha512-IwpIMieE55oGWiXkQPSBY1nw1nFs6bsKXTFskNY8sdS17K24vyEBRQZEwlRS7ZmXCWnJcQtbxWzly+cODWGs2A==}
-    dev: false
+  '@types/invariant@2.2.37': {}
 
-  /@types/is-ci@3.0.0:
-    resolution: {integrity: sha512-Q0Op0hdWbYd1iahB+IFNQcWXFq4O0Q5MwQP7uN0souuQ4rPg1vEYcnIOfr1gY+M+6rc8FGoRaBO1mOOvL29sEQ==}
+  '@types/is-ci@3.0.0':
     dependencies:
       ci-info: 3.8.0
-    dev: false
 
-  /@types/js-cookie@2.2.7:
-    resolution: {integrity: sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==}
-    dev: false
+  '@types/js-cookie@2.2.7': {}
 
-  /@types/js-yaml@4.0.9:
-    resolution: {integrity: sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==}
-    dev: false
+  '@types/js-yaml@4.0.9': {}
 
-  /@types/json-query@2.2.3:
-    resolution: {integrity: sha512-ygE4p8lyKzTBo9LF2K/u6MHnxPxbHY6wGvwM7TdAKhbP3SvEf+Y9aeVWedDiP8SMIPowTl9R/6awQYjiUTHz2g==}
-    dev: true
+  '@types/json-query@2.2.3': {}
 
-  /@types/json-schema@7.0.11:
-    resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
+  '@types/json-schema@7.0.11': {}
 
-  /@types/json-schema@7.0.13:
-    resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==}
+  '@types/json-schema@7.0.13': {}
 
-  /@types/json-schema@7.0.15:
-    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
-    dev: true
+  '@types/json-schema@7.0.15': {}
 
-  /@types/json5@0.0.29:
-    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
-    dev: true
+  '@types/json5@0.0.29': {}
 
-  /@types/keyv@3.1.4:
-    resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==}
+  '@types/jsonwebtoken@9.0.10':
     dependencies:
+      '@types/ms': 0.7.31
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/lodash.get@4.4.9:
-    resolution: {integrity: sha512-J5dvW98sxmGnamqf+/aLP87PYXyrha9xIgc2ZlHl6OHMFR2Ejdxep50QfU0abO1+CH6+ugx+8wEUN1toImAinA==}
+  '@types/katex@0.16.7': {}
+
+  '@types/keyv@3.1.4':
     dependencies:
-      '@types/lodash': 4.14.191
-    dev: true
+      '@types/node': 20.14.14
 
-  /@types/lodash.omit@4.5.7:
-    resolution: {integrity: sha512-6q6cNg0tQ6oTWjSM+BcYMBhan54P/gLqBldG4AuXd3nKr0oeVekWNS4VrNEu3BhCSDXtGapi7zjhnna0s03KpA==}
+  '@types/lodash.get@4.4.9':
     dependencies:
       '@types/lodash': 4.14.191
-    dev: true
 
-  /@types/lodash@4.14.191:
-    resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
-    dev: true
+  '@types/lodash.omit@4.5.7':
+    dependencies:
+      '@types/lodash': 4.14.191
 
-  /@types/long@4.0.2:
-    resolution: {integrity: sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==}
+  '@types/lodash@4.14.191': {}
 
-  /@types/marked@4.0.8:
-    resolution: {integrity: sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw==}
-    dev: true
+  '@types/marked@4.0.8': {}
 
-  /@types/mdast@3.0.10:
-    resolution: {integrity: sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==}
+  '@types/mdast@3.0.10':
     dependencies:
       '@types/unist': 3.0.3
-    dev: true
 
-  /@types/mdast@4.0.4:
-    resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==}
+  '@types/mdast@4.0.4':
     dependencies:
       '@types/unist': 3.0.3
-    dev: false
 
-  /@types/mdx@2.0.5:
-    resolution: {integrity: sha512-76CqzuD6Q7LC+AtbPqrvD9AqsN0k8bsYo2bM2J8pmNldP1aIPAbzUQ7QbobyXL4eLr1wK5x8FZFe8eF/ubRuBg==}
-    dev: true
+  '@types/mdx@2.0.5': {}
 
-  /@types/methods@1.1.4:
-    resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
-    dev: true
+  '@types/methods@1.1.4': {}
 
-  /@types/mime@3.0.1:
-    resolution: {integrity: sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==}
-    dev: true
+  '@types/mime@3.0.1': {}
 
-  /@types/minimist@1.2.2:
-    resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
-    dev: false
+  '@types/minimist@1.2.2': {}
 
-  /@types/morgan@1.9.4:
-    resolution: {integrity: sha512-cXoc4k+6+YAllH3ZHmx4hf7La1dzUk6keTR4bF4b4Sc0mZxU/zK4wO7l+ZzezXm/jkYj/qC+uYGZrarZdIVvyQ==}
+  '@types/morgan@1.9.4':
     dependencies:
-      '@types/node': 18.19.20
-    dev: true
+      '@types/node': 20.14.14
 
-  /@types/ms@0.7.31:
-    resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
+  '@types/ms@0.7.31': {}
 
-  /@types/mute-stream@0.0.4:
-    resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==}
+  '@types/mysql@2.15.26':
     dependencies:
       '@types/node': 20.14.14
-    dev: false
 
-  /@types/node-fetch@2.6.12:
-    resolution: {integrity: sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==}
+  '@types/node-fetch@2.6.12':
     dependencies:
       '@types/node': 20.14.14
-      form-data: 4.0.0
-
-  /@types/node-fetch@2.6.2:
-    resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
-    dependencies:
-      '@types/node': 18.19.20
-      form-data: 3.0.1
-    dev: true
+      form-data: 4.0.4
 
-  /@types/node-fetch@2.6.4:
-    resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
+  '@types/node-fetch@2.6.2':
     dependencies:
       '@types/node': 20.14.14
-      form-data: 3.0.1
-    dev: false
+      form-data: 3.0.4
 
-  /@types/node-forge@1.3.10:
-    resolution: {integrity: sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==}
+  '@types/node-fetch@2.6.4':
     dependencies:
       '@types/node': 20.14.14
-    dev: false
-
-  /@types/node@12.20.55:
-    resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
-
-  /@types/node@18.19.20:
-    resolution: {integrity: sha512-SKXZvI375jkpvAj8o+5U2518XQv76mAsixqfXiVyWyXZbVWQK25RurFovYpVIxVzul0rZoH58V/3SkEnm7s3qA==}
-    dependencies:
-      undici-types: 5.26.5
+      form-data: 3.0.4
 
-  /@types/node@20.11.22:
-    resolution: {integrity: sha512-/G+IxWxma6V3E+pqK1tSl2Fo1kl41pK1yeCyDsgkF9WlVAme4j5ISYM2zR11bgLFJGLN5sVK40T4RJNuiZbEjA==}
+  '@types/node@20.14.14':
     dependencies:
       undici-types: 5.26.5
-    dev: false
 
-  /@types/node@20.12.14:
-    resolution: {integrity: sha512-scnD59RpYD91xngrQQLGkE+6UrHUPzeKZWhhjBSa3HSkwjbQc38+q3RoIVEwxQGRw3M+j5hpNAM+lgV3cVormg==}
+  '@types/nodemailer@7.0.4':
     dependencies:
-      undici-types: 5.26.5
-    dev: true
+      '@aws-sdk/client-sesv2': 3.940.0
+      '@types/node': 20.14.14
+    transitivePeerDependencies:
+      - aws-crt
 
-  /@types/node@20.14.14:
-    resolution: {integrity: sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==}
-    dependencies:
-      undici-types: 5.26.5
+  '@types/normalize-package-data@2.4.1': {}
 
-  /@types/node@22.13.9:
-    resolution: {integrity: sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==}
-    dependencies:
-      undici-types: 6.20.0
-    dev: false
+  '@types/object-hash@3.0.6': {}
 
-  /@types/nodemailer@6.4.17:
-    resolution: {integrity: sha512-I9CCaIp6DTldEg7vyUTZi8+9Vo0hi1/T8gv3C89yk1rSAAzoKQ8H8ki/jBYJSFoH/BisgLP8tkZMlQ91CIquww==}
+  '@types/pg-pool@2.0.6':
     dependencies:
-      '@types/node': 18.19.20
-    dev: true
-
-  /@types/normalize-package-data@2.4.1:
-    resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
-
-  /@types/object-hash@3.0.6:
-    resolution: {integrity: sha512-fOBV8C1FIu2ELinoILQ+ApxcUKz4ngq+IWUYrxSGjXzzjUALijilampwkMgEtJ+h2njAW3pi853QpzNVCHB73w==}
-    dev: true
+      '@types/pg': 8.11.14
 
-  /@types/pg@8.11.14:
-    resolution: {integrity: sha512-qyD11E5R3u0eJmd1lB0WnWKXJGA7s015nyARWljfz5DcX83TKAIlY+QrmvzQTsbIe+hkiFtkyL2gHC6qwF6Fbg==}
+  '@types/pg@8.11.14':
     dependencies:
       '@types/node': 20.14.14
       pg-protocol: 1.9.5
       pg-types: 4.0.2
-    dev: true
 
-  /@types/pg@8.11.6:
-    resolution: {integrity: sha512-/2WmmBXHLsfRqzfHW7BNZ8SbYzE8OSk7i3WjFYvfgRHj7S1xj+16Je5fUKv3lVdVzk/zn9TXOqf+avFCFIE0yQ==}
+  '@types/pg@8.11.6':
     dependencies:
       '@types/node': 20.14.14
       pg-protocol: 1.6.1
       pg-types: 4.0.2
-    dev: false
 
-  /@types/pg@8.6.6:
-    resolution: {integrity: sha512-O2xNmXebtwVekJDD+02udOncjVcMZQuTEQEMpKJ0ZRf5E7/9JJX3izhKUcUifBkyKpljyUM6BTgy2trmviKlpw==}
+  '@types/pg@8.6.1':
+    dependencies:
+      '@types/node': 20.14.14
+      pg-protocol: 1.10.3
+      pg-types: 2.2.0
+
+  '@types/pg@8.6.6':
     dependencies:
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       pg-protocol: 1.6.1
       pg-types: 2.2.0
 
-  /@types/polka@0.5.7:
-    resolution: {integrity: sha512-TH8CDXM8zoskPCNmWabtK7ziGv9Q21s4hMZLVYK5HFEfqmGXBqq/Wgi7jNELWXftZK/1J/9CezYa06x1RKeQ+g==}
+  '@types/polka@0.5.7':
     dependencies:
       '@types/express': 4.17.15
       '@types/express-serve-static-core': 4.17.32
       '@types/node': 20.14.14
       '@types/trouter': 3.1.4
-    dev: true
 
-  /@types/prismjs@1.26.0:
-    resolution: {integrity: sha512-ZTaqn/qSqUuAq1YwvOFQfVW1AR/oQJlLSZVustdjwI+GZ8kr0MSHBj0tsXPW1EqHubx50gtBEjbPGsdZwQwCjQ==}
+  '@types/prismjs@1.26.0': {}
 
-  /@types/prop-types@15.7.5:
-    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+  '@types/prop-types@15.7.5': {}
 
-  /@types/qs@6.9.7:
-    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
-    dev: true
+  '@types/qs@6.9.7': {}
 
-  /@types/range-parser@1.2.4:
-    resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
-    dev: true
+  '@types/range-parser@1.2.4': {}
 
-  /@types/react-collapse@5.0.4:
-    resolution: {integrity: sha512-tM5cVB6skGLneNYnRK2E3R56VOHguSeJQHslGPTIMC58ytL3oelT8L/l1onkwHGn5vSEs2BEq2Olzrur+YdliA==}
+  '@types/react-collapse@5.0.4':
     dependencies:
       '@types/react': 18.2.69
-    dev: true
 
-  /@types/react-dom@18.2.7:
-    resolution: {integrity: sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==}
+  '@types/react-dom@18.2.7':
     dependencies:
       '@types/react': 18.3.1
 
-  /@types/react-dom@19.0.4(@types/react@19.0.12):
-    resolution: {integrity: sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==}
-    peerDependencies:
-      '@types/react': ^19.0.0
+  '@types/react-dom@19.0.4(@types/react@19.0.12)':
     dependencies:
       '@types/react': 19.0.12
 
-  /@types/react@18.2.48:
-    resolution: {integrity: sha512-qboRCl6Ie70DQQG9hhNREz81jqC1cs9EVNcjQ1AU+jH6NFfSAhVVbrrY/+nSF+Bsk4AOwm9Qa61InvMCyV+H3w==}
+  '@types/react@18.2.48':
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
       csstype: 3.1.1
-    dev: true
 
-  /@types/react@18.2.69:
-    resolution: {integrity: sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q==}
+  '@types/react@18.2.69':
     dependencies:
       '@types/prop-types': 15.7.5
       '@types/scheduler': 0.16.2
       csstype: 3.1.3
 
-  /@types/react@18.3.1:
-    resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==}
+  '@types/react@18.3.1':
     dependencies:
       '@types/prop-types': 15.7.5
       csstype: 3.1.3
 
-  /@types/react@19.0.12:
-    resolution: {integrity: sha512-V6Ar115dBDrjbtXSrS+/Oruobc+qVbbUxDFC1RSbRqLt5SYvxxyIDrSC85RWml54g+jfNeEMZhEj7wW07ONQhA==}
+  '@types/react@19.0.12':
     dependencies:
       csstype: 3.1.3
 
-  /@types/readable-stream@4.0.14:
-    resolution: {integrity: sha512-xZn/AuUbCMShGsqH/ehZtGDwQtbx00M9rZ2ENLe4tOjFZ/JFeWMhEZkk2fEe1jAUqqEAURIkFJ7Az/go8mM1/w==}
+  '@types/readable-stream@4.0.14':
     dependencies:
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       safe-buffer: 5.1.2
-    dev: true
 
-  /@types/regression@2.0.6:
-    resolution: {integrity: sha512-sa+sHOUxh9fywFuAFLCcyupFN0CKX654QUZGW5fAZCmV51I4e5nQy1xL2g/JMUW/PeDoF3Yq2lDXb7MoC3KDNg==}
-    dev: true
+  '@types/regression@2.0.6': {}
 
-  /@types/request@2.48.12:
-    resolution: {integrity: sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==}
+  '@types/request@2.48.12':
     dependencies:
       '@types/caseless': 0.12.5
       '@types/node': 20.14.14
       '@types/tough-cookie': 4.0.5
-      form-data: 2.5.1
-    dev: false
+      form-data: 2.5.4
 
-  /@types/resolve@1.20.6:
-    resolution: {integrity: sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==}
-    dev: true
+  '@types/resolve@1.20.6': {}
 
-  /@types/responselike@1.0.0:
-    resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==}
+  '@types/responselike@1.0.0':
     dependencies:
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/retry@0.12.0:
-    resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==}
+  '@types/retry@0.12.0': {}
 
-  /@types/retry@0.12.2:
-    resolution: {integrity: sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==}
-    dev: false
+  '@types/retry@0.12.2': {}
 
-  /@types/rimraf@4.0.5:
-    resolution: {integrity: sha512-DTCZoIQotB2SUJnYgrEx43cQIUYOlNZz0AZPbKU4PSLYTUdML5Gox0++z4F9kQocxStrCmRNhi4x5x/UlwtKUA==}
-    deprecated: This is a stub types definition. rimraf provides its own type definitions, so you do not need this installed.
+  '@types/rimraf@4.0.5':
     dependencies:
       rimraf: 5.0.7
-    dev: true
 
-  /@types/scheduler@0.16.2:
-    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+  '@types/scheduler@0.16.2': {}
 
-  /@types/seedrandom@3.0.8:
-    resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
-    dev: true
+  '@types/seedrandom@3.0.8': {}
 
-  /@types/semver@6.2.3:
-    resolution: {integrity: sha512-KQf+QAMWKMrtBMsB8/24w53tEsxllMj6TuA80TT/5igJalLI/zm0L3oXRbIAl4Ohfc85gyHX/jhMwsVkmhLU4A==}
-    dev: true
+  '@types/semver@6.2.3': {}
 
-  /@types/semver@7.5.1:
-    resolution: {integrity: sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==}
+  '@types/semver@7.5.1': {}
 
-  /@types/serve-static@1.15.0:
-    resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
+  '@types/serve-static@1.15.0':
     dependencies:
       '@types/mime': 3.0.1
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/shimmer@1.0.2:
-    resolution: {integrity: sha512-dKkr1bTxbEsFlh2ARpKzcaAmsYixqt9UyCdoEZk8rHyE4iQYcDCyvSjDSf7JUWJHlJiTtbIoQjxKh6ViywqDAg==}
+  '@types/shimmer@1.2.0': {}
 
-  /@types/simple-oauth2@5.0.4:
-    resolution: {integrity: sha512-4SvTfmAa1fGUa1d07j9vIiC4o92bGh0ihPXmtS05udMMmNwVIaU2nZ706cC4wI8cJxOlHD4P/d5tzqvWYd+KxA==}
-    dev: true
+  '@types/simple-oauth2@5.0.4': {}
 
-  /@types/slug@5.0.3:
-    resolution: {integrity: sha512-yPX0bb1SvrpaGlHuSiz6EicgRI4VBE+LO7IANlZagQwtaoKjLLcZc8y6s13vKp41mYvMCSzjtObxvU7/0JRPaA==}
-    dev: true
+  '@types/slug@5.0.3': {}
 
-  /@types/source-map-support@0.5.10:
-    resolution: {integrity: sha512-tgVP2H469x9zq34Z0m/fgPewGhg/MLClalNOiPIzQlXrSS2YrKu/xCdSCKnEDwkFha51VKEKB6A9wW26/ZNwzA==}
+  '@types/source-map-support@0.5.10':
     dependencies:
       source-map: 0.6.1
-    dev: true
 
-  /@types/ssh2-streams@0.1.12:
-    resolution: {integrity: sha512-Sy8tpEmCce4Tq0oSOYdfqaBpA3hDM8SoxoFh5vzFsu2oL+znzGz8oVWW7xb4K920yYMUY+PIG31qZnFMfPWNCg==}
+  '@types/ssh2-streams@0.1.12':
     dependencies:
       '@types/node': 20.14.14
-    dev: true
 
-  /@types/ssh2@0.5.52:
-    resolution: {integrity: sha512-lbLLlXxdCZOSJMCInKH2+9V/77ET2J6NPQHpFI0kda61Dd1KglJs+fPQBchizmzYSOJBgdTajhPqBO1xxLywvg==}
+  '@types/ssh2@0.5.52':
     dependencies:
       '@types/node': 20.14.14
       '@types/ssh2-streams': 0.1.12
-    dev: true
 
-  /@types/ssh2@1.15.1:
-    resolution: {integrity: sha512-ZIbEqKAsi5gj35y4P4vkJYly642wIbY6PqoN0xiyQGshKUGXR9WQjF/iF9mXBQ8uBKy3ezfsCkcoHKhd0BzuDA==}
+  '@types/ssh2@1.15.1':
     dependencies:
-      '@types/node': 18.19.20
-    dev: true
-
-  /@types/statuses@2.0.4:
-    resolution: {integrity: sha512-eqNDvZsCNY49OAXB0Firg/Sc2BgoWsntsLUdybGFOhAfCD6QJ2n9HXUIHGqt5qjrxmMv4wS8WLAw43ZkKcJ8Pw==}
-    dev: false
+      '@types/node': 20.14.14
 
-  /@types/stream-buffers@3.0.7:
-    resolution: {integrity: sha512-azOCy05sXVXrO+qklf0c/B07H/oHaIuDDAiHPVwlk3A9Ek+ksHyTeMajLZl3r76FxpPpxem//4Te61G1iW3Giw==}
+  '@types/stream-buffers@3.0.7':
     dependencies:
       '@types/node': 20.14.14
-    dev: false
 
-  /@types/superagent@8.1.9:
-    resolution: {integrity: sha512-pTVjI73witn+9ILmoJdajHGW2jkSaOzhiFYF1Rd3EQ94kymLqB9PjD9ISg7WaALC7+dCHT0FGe9T2LktLq/3GQ==}
+  '@types/superagent@8.1.9':
     dependencies:
       '@types/cookiejar': 2.1.5
       '@types/methods': 1.1.4
       '@types/node': 20.14.14
-      form-data: 4.0.0
-    dev: true
+      form-data: 4.0.4
 
-  /@types/supertest@6.0.2:
-    resolution: {integrity: sha512-137ypx2lk/wTQbW6An6safu9hXmajAifU/s7szAHLN/FeIm5w7yR0Wkl9fdJMRSHwOn4HLAI0DaB2TOORuhPDg==}
+  '@types/supertest@6.0.2':
     dependencies:
       '@types/methods': 1.1.4
       '@types/superagent': 8.1.9
-    dev: true
 
-  /@types/tar@6.1.4:
-    resolution: {integrity: sha512-Cp4oxpfIzWt7mr2pbhHT2OTXGMAL0szYCzuf8lRWyIMCgsx6/Hfc3ubztuhvzXHXgraTQxyOCmmg7TDGIMIJJQ==}
+  '@types/tar@6.1.4':
     dependencies:
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       minipass: 4.0.0
 
-  /@types/tinycolor2@1.4.3:
-    resolution: {integrity: sha512-Kf1w9NE5HEgGxCRyIcRXR/ZYtDv0V8FVPtYHwLxl0O+maGX0erE77pQlD0gpP+/KByMZ87mOA79SjifhSB3PjQ==}
+  '@types/tedious@4.0.14':
+    dependencies:
+      '@types/node': 20.14.14
 
-  /@types/tough-cookie@4.0.5:
-    resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==}
-    dev: false
+  '@types/tinycolor2@1.4.3': {}
 
-  /@types/trouter@3.1.4:
-    resolution: {integrity: sha512-4YIL/2AvvZqKBWenjvEpxpblT2KGO6793ipr5QS7/6DpQ3O3SwZGgNGWezxf3pzeYZc24a2pJIrR/+Jxh/wYNQ==}
-    dev: true
+  '@types/tough-cookie@4.0.5': {}
 
-  /@types/trusted-types@2.0.7:
-    resolution: {integrity: sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==}
-    requiresBuild: true
+  '@types/trouter@3.1.4': {}
+
+  '@types/trusted-types@2.0.7':
     optional: true
 
-  /@types/unist@2.0.6:
-    resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
+  '@types/unist@2.0.6': {}
 
-  /@types/unist@3.0.3:
-    resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
+  '@types/unist@3.0.3': {}
 
-  /@types/uuid@10.0.0:
-    resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
-    dev: false
+  '@types/uuid@10.0.0': {}
 
-  /@types/uuid@9.0.0:
-    resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
-    dev: true
+  '@types/uuid@9.0.0': {}
 
-  /@types/webpack@5.28.5(@swc/core@1.3.101)(esbuild@0.19.11):
-    resolution: {integrity: sha512-wR87cgvxj3p6D0Crt1r5avwqffqPXUkNlnQ1mjU93G7gCuFjufZR4I6j8cz5g1F1tTYpfOOFvly+cmIQwL9wvw==}
+  '@types/webpack@5.28.5(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)':
     dependencies:
       '@types/node': 20.14.14
       tapable: 2.2.1
-      webpack: 5.88.2(@swc/core@1.3.101)(esbuild@0.19.11)
+      webpack: 5.88.2(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
       - uglify-js
       - webpack-cli
-    dev: false
-
-  /@types/wrap-ansi@3.0.0:
-    resolution: {integrity: sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==}
-    dev: false
 
-  /@types/ws@8.5.10:
-    resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==}
+  '@types/ws@8.5.10':
     dependencies:
       '@types/node': 20.14.14
 
-  /@types/ws@8.5.12:
-    resolution: {integrity: sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==}
+  '@types/ws@8.5.12':
     dependencies:
       '@types/node': 20.14.14
 
-  /@types/ws@8.5.4:
-    resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
+  '@types/ws@8.5.4':
     dependencies:
-      '@types/node': 18.19.20
-    dev: true
+      '@types/node': 20.14.14
 
-  /@types/yauzl@2.10.3:
-    resolution: {integrity: sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==}
-    requiresBuild: true
+  '@types/yauzl@2.10.3':
     dependencies:
       '@types/node': 20.14.14
-    dev: false
     optional: true
 
-  /@typeschema/core@0.14.0:
-    resolution: {integrity: sha512-Ia6PtZHcL3KqsAWXjMi5xIyZ7XMH4aSnOQes8mfMLx+wGFGtGRNlwe6Y7cYvX+WfNK67OL0/HSe9t8QDygV0/w==}
-    peerDependencies:
-      '@types/json-schema': ^7.0.15
-    peerDependenciesMeta:
-      '@types/json-schema':
-        optional: true
-    dev: false
-
-  /@typeschema/typebox@0.14.0(@sinclair/typebox@0.33.17):
-    resolution: {integrity: sha512-+Td4CHkWQ17T60gEtA2SzeFp382CHEwsI7aWiqBq9YeqAwbkTrluGh6R9MNFHJzOLaYL+AG60b8fX9Rbcex0Tg==}
-    peerDependencies:
-      '@sinclair/typebox': ^0.33.7
-    peerDependenciesMeta:
-      '@sinclair/typebox':
-        optional: true
-    dependencies:
-      '@sinclair/typebox': 0.33.17
-      '@typeschema/core': 0.14.0
-    transitivePeerDependencies:
-      - '@types/json-schema'
-    dev: false
-
-  /@typescript-eslint/eslint-plugin@5.59.6(@typescript-eslint/parser@5.59.6)(eslint@8.31.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-sXtOgJNEuRU5RLwPUb1jxtToZbgvq3M6FPpY4QENxoOggK+UpTxUBpj6tD8+Qh2g46Pi9We87E+eHnUw8YcGsw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/eslint-plugin@5.59.6(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/regexpp': 4.5.1
       '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
@@ -19744,92 +31113,59 @@ packages:
       grapheme-splitter: 1.0.4
       ignore: 5.2.4
       natural-compare-lite: 1.4.0
-      semver: 7.6.3
+      semver: 5.7.2
       tsutils: 3.21.0(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-7pCa6al03Pv1yf/dUg/s1pXz/yGMUBAw5EeWqNTFiSueKvRNonze3hma3lhdsOrQcaOXhbk5gKu2Fludiho9VA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/scope-manager': 5.59.6
       '@typescript-eslint/types': 5.59.6
       '@typescript-eslint/typescript-estree': 5.59.6(typescript@5.5.4)
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.0
       eslint: 8.31.0
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/scope-manager@5.59.6:
-    resolution: {integrity: sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@typescript-eslint/scope-manager@5.59.6':
     dependencies:
       '@typescript-eslint/types': 5.59.6
       '@typescript-eslint/visitor-keys': 5.59.6
-    dev: true
 
-  /@typescript-eslint/type-utils@5.59.6(eslint@8.31.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-A4tms2Mp5yNvLDlySF+kAThV9VTBPCvGf0Rp8nl/eoDX9Okun8byTKoj3fJ52IJitjWOk0fKPNQhXEB++eNozQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/type-utils@5.59.6(eslint@8.31.0)(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/typescript-estree': 5.59.6(typescript@5.5.4)
       '@typescript-eslint/utils': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       eslint: 8.31.0
       tsutils: 3.21.0(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/types@5.59.6:
-    resolution: {integrity: sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  '@typescript-eslint/types@5.59.6': {}
 
-  /@typescript-eslint/typescript-estree@5.59.6(typescript@5.5.4):
-    resolution: {integrity: sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/typescript-estree@5.59.6(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/types': 5.59.6
       '@typescript-eslint/visitor-keys': 5.59.6
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.3
+      semver: 5.7.2
       tsutils: 3.21.0(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/utils@5.59.6(eslint@8.31.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+  '@typescript-eslint/utils@5.59.6(eslint@8.31.0)(typescript@5.5.4)':
     dependencies:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.31.0)
       '@types/json-schema': 7.0.13
@@ -19839,58 +31175,35 @@ packages:
       '@typescript-eslint/typescript-estree': 5.59.6(typescript@5.5.4)
       eslint: 8.31.0
       eslint-scope: 5.1.1
-      semver: 7.6.3
+      semver: 5.7.2
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
 
-  /@typescript-eslint/visitor-keys@5.59.6:
-    resolution: {integrity: sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  '@typescript-eslint/visitor-keys@5.59.6':
     dependencies:
       '@typescript-eslint/types': 5.59.6
       eslint-visitor-keys: 3.4.2
-    dev: true
 
-  /@uiw/codemirror-extensions-basic-setup@4.19.5(@codemirror/autocomplete@6.4.0)(@codemirror/commands@6.1.3)(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2):
-    resolution: {integrity: sha512-1zt7ZPJ01xKkSW/KDy0FZNga0bngN1fC594wCVG7FBi60ehfcAucpooQ+JSPScKXopxcb+ugPKZvVLzr9/OfzA==}
-    peerDependencies:
-      '@codemirror/autocomplete': '>=6.0.0'
-      '@codemirror/commands': '>=6.0.0'
-      '@codemirror/language': '>=6.0.0'
-      '@codemirror/lint': '>=6.0.0'
-      '@codemirror/search': '>=6.0.0'
-      '@codemirror/state': '>=6.0.0'
-      '@codemirror/view': '>=6.0.0'
+  '@uiw/codemirror-extensions-basic-setup@4.19.5(@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0))(@codemirror/commands@6.1.3)(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)':
     dependencies:
-      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.2.3)
+      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0)
       '@codemirror/commands': 6.1.3
       '@codemirror/language': 6.3.2
       '@codemirror/lint': 6.4.2
       '@codemirror/search': 6.2.3
       '@codemirror/state': 6.2.0
       '@codemirror/view': 6.7.2
-    dev: false
 
-  /@uiw/react-codemirror@4.19.5(@babel/runtime@7.27.4)(@codemirror/autocomplete@6.4.0)(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.7.2)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-ZCHh8d7beXbF8/t7F1+yHht6A9Y6CdKeOkZq4A09lxJEnyTQrj1FMf2zvfaqc7K23KNjkTCtSlbqKKbVDgrWaw==}
-    peerDependencies:
-      '@babel/runtime': '>=7.11.0'
-      '@codemirror/state': '>=6.0.0'
-      '@codemirror/theme-one-dark': '>=6.0.0'
-      '@codemirror/view': '>=6.0.0'
-      codemirror: '>=6.0.0'
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
+  '@uiw/react-codemirror@4.19.5(@babel/runtime@7.28.4)(@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0))(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/theme-one-dark@6.1.3)(@codemirror/view@6.7.2)(codemirror@6.0.2(@lezer/common@1.3.0))(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.28.4
       '@codemirror/commands': 6.1.3
       '@codemirror/state': 6.2.0
-      '@codemirror/theme-one-dark': 6.1.2
+      '@codemirror/theme-one-dark': 6.1.3
       '@codemirror/view': 6.7.2
-      '@uiw/codemirror-extensions-basic-setup': 4.19.5(@codemirror/autocomplete@6.4.0)(@codemirror/commands@6.1.3)(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)
-      codemirror: 6.0.1
+      '@uiw/codemirror-extensions-basic-setup': 4.19.5(@codemirror/autocomplete@6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0))(@codemirror/commands@6.1.3)(@codemirror/language@6.3.2)(@codemirror/lint@6.4.2)(@codemirror/search@6.2.3)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)
+      codemirror: 6.0.2(@lezer/common@1.3.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
     transitivePeerDependencies:
@@ -19898,84 +31211,55 @@ packages:
       - '@codemirror/language'
       - '@codemirror/lint'
       - '@codemirror/search'
-    dev: false
 
-  /@ungap/structured-clone@1.3.0:
-    resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
-    dev: false
+  '@ungap/structured-clone@1.3.0': {}
 
-  /@unkey/cache@1.5.0:
-    resolution: {integrity: sha512-vqGk9qH3Hn1Nva3hGAaib6G3IcrPkRQ1VgyMFG7asuANZ0RtohONd9RwxXwlaDopJJ66Dsx5rWrV4s/3U1GADg==}
+  '@unkey/cache@1.5.0':
     dependencies:
       '@opentelemetry/api': 1.8.0
       '@unkey/error': 0.2.0
       superjson: 2.2.1
-    dev: false
 
-  /@unkey/error@0.2.0:
-    resolution: {integrity: sha512-DFGb4A7SrusZPP0FYuRIF0CO+Gi4etLUAEJ6EKc+TKYmscL0nEJ2Pr38FyX9MvjI4Wx5l35Wc9KsBjMm9Ybh7w==}
+  '@unkey/error@0.2.0':
     dependencies:
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /@uploadthing/mime-types@0.3.0:
-    resolution: {integrity: sha512-jN/XFvpKTzcd3MXT/9D9oxx05scnYiSYxAXF/e6hyg377zFducRxivU/kHyYTkpUZPTmOL5q9EQbOkUsXMlSMg==}
-    dev: false
+  '@uploadthing/mime-types@0.3.0': {}
 
-  /@uploadthing/react@7.0.3(next@14.2.21)(react@18.3.1)(uploadthing@7.1.0):
-    resolution: {integrity: sha512-dPRO45H1UaXmbrmelU2uZjSmWz0h15F0+SbfAJ+ehxLEU34EBRpOJF55G7yK5X7syFRnedlG4E1+iEcEmKRynw==}
-    peerDependencies:
-      next: '*'
-      react: ^17.0.2 || ^18.0.0
-      uploadthing: 7.1.0
-    peerDependenciesMeta:
-      next:
-        optional: true
+  '@uploadthing/react@7.0.3(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(react@18.3.1)(uploadthing@7.1.0(express@5.2.1)(fastify@5.4.0)(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(tailwindcss@3.4.1))':
     dependencies:
       '@uploadthing/shared': 7.0.3
       file-selector: 0.6.0
-      next: 14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0)(react@18.3.1)
       react: 18.3.1
-      uploadthing: 7.1.0(next@14.2.21)(tailwindcss@3.4.1)
-    dev: false
+      uploadthing: 7.1.0(express@5.2.1)(fastify@5.4.0)(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(tailwindcss@3.4.1)
+    optionalDependencies:
+      next: 14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
 
-  /@uploadthing/shared@7.0.3:
-    resolution: {integrity: sha512-PAT5Jl6bfuVp37PBvaw7bwQYhLeDfIBuGr37mbPBPhtiqm8zf8ip8zubkdm5rXEhqRWfdI64SQpl+7Q+dLoM2Q==}
+  '@uploadthing/shared@7.0.3':
     dependencies:
       '@uploadthing/mime-types': 0.3.0
       effect: 3.7.2
       sqids: 0.3.0
-    dev: false
 
-  /@upstash/core-analytics@0.0.8:
-    resolution: {integrity: sha512-MCJoF+Y8fkzq4NRLG7kEHjtGyMsZ2DICBdmEdwoK9umoSrfkzgBlYdZiHTIaewyt9PGaMZCHOasz0LAuMpxwxQ==}
-    engines: {node: '>=16.0.0'}
+  '@upstash/core-analytics@0.0.8':
     dependencies:
       '@upstash/redis': 1.29.0
-    dev: false
 
-  /@upstash/ratelimit@1.1.3:
-    resolution: {integrity: sha512-rl+GMvPdZJ9xPDIvIrqRl/g0nzAEaH75hwR5lXAKW8zPPplD/AeliDCHwuwcFCPIjg49FKyA1oc5H473WkVFrQ==}
+  '@upstash/ratelimit@1.1.3(patch_hash=e5922e50fbefb7b2b24950c4b1c5c9ddc4cd25464439c9548d2298c432debe74)':
     dependencies:
       '@upstash/core-analytics': 0.0.8
-    dev: false
 
-  /@upstash/redis@1.29.0:
-    resolution: {integrity: sha512-kbO5fgMAeUzErnA/SOtaSbAa0dguYhhBT4MZHJ1O8gVl4iK754aC9+rIYY5hsp4nlxeCGfnIDkWpof991c9jjA==}
+  '@upstash/redis@1.29.0':
     dependencies:
       crypto-js: 4.2.0
-    dev: false
 
-  /@vanilla-extract/babel-plugin-debug-ids@1.0.2:
-    resolution: {integrity: sha512-LjnbQWGeMwaydmovx8jWUR8BxLtLiPyq0xz5C8G5OvFhsuJxvavLdrBHNNizvr1dq7/3qZGlPv0znsvU4P44YA==}
+  '@vanilla-extract/babel-plugin-debug-ids@1.0.2':
     dependencies:
       '@babel/core': 7.22.17
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@vanilla-extract/css@1.11.0:
-    resolution: {integrity: sha512-uohj+8cGWbnrVzTfrjlJeXqdGjH3d3TcscdQxKe3h5bb5QQXTpPSq+c+SeWADIGiZybzcW0CBvZV8jsy1ywY9w==}
+  '@vanilla-extract/css@1.11.0':
     dependencies:
       '@emotion/hash': 0.9.0
       '@vanilla-extract/private': 1.0.3
@@ -19983,15 +31267,13 @@ packages:
       chalk: 4.1.2
       css-what: 5.1.0
       cssesc: 3.0.0
-      csstype: 3.1.3
+      csstype: 3.2.0
       deep-object-diff: 1.1.9
       deepmerge: 4.3.1
       media-query-parser: 2.0.2
       outdent: 0.8.0
-    dev: true
 
-  /@vanilla-extract/integration@6.2.1(@types/node@20.14.14):
-    resolution: {integrity: sha512-+xYJz07G7TFAMZGrOqArOsURG+xcYvqctujEkANjw2McCBvGEK505RxQqOuNiA9Mi9hgGdNp2JedSa94f3eoLg==}
+  '@vanilla-extract/integration@6.2.1(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)':
     dependencies:
       '@babel/core': 7.22.17
       '@babel/plugin-syntax-typescript': 7.21.4(@babel/core@7.22.17)
@@ -20001,11 +31283,11 @@ packages:
       eval: 0.1.6
       find-up: 5.0.0
       javascript-stringify: 2.1.0
-      lodash: 4.17.21
-      mlly: 1.7.1
+      lodash: 4.17.23
+      mlly: 1.7.4
       outdent: 0.8.0
-      vite: 4.4.9(@types/node@20.14.14)
-      vite-node: 0.28.5(@types/node@20.14.14)
+      vite: 4.4.9(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
+      vite-node: 0.28.5(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -20015,35 +31297,44 @@ packages:
       - sugarss
       - supports-color
       - terser
-    dev: true
 
-  /@vanilla-extract/private@1.0.3:
-    resolution: {integrity: sha512-17kVyLq3ePTKOkveHxXuIJZtGYs+cSoev7BlP+Lf4916qfDhk/HBjvlYDe8egrea7LNPHKwSZJK/bzZC+Q6AwQ==}
-    dev: true
+  '@vanilla-extract/private@1.0.3': {}
 
-  /@vercel/postgres@0.10.0:
-    resolution: {integrity: sha512-fSD23DxGND40IzSkXjcFcxr53t3Tiym59Is0jSYIFpG4/0f0KO9SGtcp1sXiebvPaGe7N/tU05cH4yt2S6/IPg==}
-    engines: {node: '>=18.14'}
+  '@vercel/oidc@3.0.3': {}
+
+  '@vercel/oidc@3.0.5': {}
+
+  '@vercel/otel@1.13.0(@opentelemetry/api-logs@0.203.0)(@opentelemetry/api@1.9.0)(@opentelemetry/instrumentation@0.203.0(@opentelemetry/api@1.9.0))(@opentelemetry/resources@2.2.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-logs@0.203.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-metrics@2.0.1(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@2.0.1(@opentelemetry/api@1.9.0))':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.203.0
+      '@opentelemetry/instrumentation': 0.203.0(@opentelemetry/api@1.9.0)(supports-color@10.0.0)
+      '@opentelemetry/resources': 2.2.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-logs': 0.203.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-metrics': 2.0.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 2.0.1(@opentelemetry/api@1.9.0)
+
+  '@vercel/postgres@0.10.0':
     dependencies:
       '@neondatabase/serverless': 0.9.5
       bufferutil: 4.0.9
-      ws: 8.18.0(bufferutil@4.0.9)
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - utf-8-validate
-    dev: false
 
-  /@vitest/coverage-v8@3.1.4(vitest@3.1.4):
-    resolution: {integrity: sha512-G4p6OtioySL+hPV7Y6JHlhpsODbJzt1ndwHAFkyk6vVjpK03PFsKnauZIzcd0PrK4zAbc5lc+jeZ+eNGiMA+iw==}
-    peerDependencies:
-      '@vitest/browser': 3.1.4
-      vitest: 3.1.4
-    peerDependenciesMeta:
-      '@vitest/browser':
-        optional: true
+  '@vercel/sdk@1.19.1':
+    dependencies:
+      '@modelcontextprotocol/sdk': 1.26.0(zod@3.25.76)
+      zod: 3.25.76
+    transitivePeerDependencies:
+      - '@cfworker/json-schema'
+      - supports-color
+
+  '@vitest/coverage-v8@3.1.4(vitest@3.1.4(@types/debug@4.1.12)(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.0
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
@@ -20053,275 +31344,140 @@ packages:
       std-env: 3.9.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.1.4(@types/node@20.14.14)
+      vitest: 3.1.4(@types/debug@4.1.12)(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@vitest/expect@3.1.4:
-    resolution: {integrity: sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==}
+  '@vitest/expect@3.1.4':
     dependencies:
       '@vitest/spy': 3.1.4
       '@vitest/utils': 3.1.4
       chai: 5.2.0
       tinyrainbow: 2.0.0
-    dev: true
 
-  /@vitest/mocker@3.1.4(vite@5.2.7):
-    resolution: {integrity: sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==}
-    peerDependencies:
-      msw: ^2.4.9
-      vite: ^5.0.0 || ^6.0.0
-    peerDependenciesMeta:
-      msw:
-        optional: true
-      vite:
-        optional: true
+  '@vitest/mocker@3.1.4(vite@5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1))':
     dependencies:
       '@vitest/spy': 3.1.4
       estree-walker: 3.0.3
-      magic-string: 0.30.17
-      vite: 5.2.7(@types/node@20.14.14)
-    dev: true
+      magic-string: 0.30.21
+    optionalDependencies:
+      vite: 5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
 
-  /@vitest/pretty-format@2.1.9:
-    resolution: {integrity: sha512-KhRIdGV2U9HOUzxfiHmY8IFHTdqtOhIzCpd8WRdJiE7D/HUcZVD0EgQCVjm+Q9gkUXWgBvMmTtZgIG48wq7sOQ==}
+  '@vitest/pretty-format@2.1.9':
     dependencies:
       tinyrainbow: 1.2.0
-    dev: true
 
-  /@vitest/pretty-format@3.1.4:
-    resolution: {integrity: sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==}
+  '@vitest/pretty-format@3.1.4':
     dependencies:
       tinyrainbow: 2.0.0
-    dev: true
 
-  /@vitest/runner@2.1.9:
-    resolution: {integrity: sha512-ZXSSqTFIrzduD63btIfEyOmNcBmQvgOVsPNPe0jYtESiXkhd8u2erDLnMxmGrDCwHCCHE7hxwRDCT3pt0esT4g==}
+  '@vitest/runner@2.1.9':
     dependencies:
       '@vitest/utils': 2.1.9
       pathe: 1.1.2
-    dev: true
 
-  /@vitest/runner@3.1.4:
-    resolution: {integrity: sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==}
+  '@vitest/runner@3.1.4':
     dependencies:
       '@vitest/utils': 3.1.4
       pathe: 2.0.3
-    dev: true
 
-  /@vitest/snapshot@3.1.4:
-    resolution: {integrity: sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==}
+  '@vitest/snapshot@3.1.4':
     dependencies:
       '@vitest/pretty-format': 3.1.4
-      magic-string: 0.30.17
+      magic-string: 0.30.21
       pathe: 2.0.3
-    dev: true
 
-  /@vitest/spy@3.1.4:
-    resolution: {integrity: sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==}
+  '@vitest/spy@3.1.4':
     dependencies:
       tinyspy: 3.0.2
-    dev: true
 
-  /@vitest/utils@2.1.9:
-    resolution: {integrity: sha512-v0psaMSkNJ3A2NMrUEHFRzJtDPFn+/VWZ5WxImB21T9fjucJRmS7xCS3ppEnARb9y11OAzaD+P2Ps+b+BGX5iQ==}
+  '@vitest/utils@2.1.9':
     dependencies:
       '@vitest/pretty-format': 2.1.9
       loupe: 3.1.3
       tinyrainbow: 1.2.0
-    dev: true
 
-  /@vitest/utils@3.1.4:
-    resolution: {integrity: sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==}
+  '@vitest/utils@3.1.4':
     dependencies:
       '@vitest/pretty-format': 3.1.4
       loupe: 3.1.3
       tinyrainbow: 2.0.0
-    dev: true
-
-  /@vue/compiler-core@3.5.16:
-    resolution: {integrity: sha512-AOQS2eaQOaaZQoL1u+2rCJIKDruNXVBZSiUD3chnUrsoX5ZTQMaCvXlWNIfxBJuU15r1o7+mpo5223KVtIhAgQ==}
-    dependencies:
-      '@babel/parser': 7.27.5
-      '@vue/shared': 3.5.16
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
-  /@vue/compiler-dom@3.5.16:
-    resolution: {integrity: sha512-SSJIhBr/teipXiXjmWOVWLnxjNGo65Oj/8wTEQz0nqwQeP75jWZ0n4sF24Zxoht1cuJoWopwj0J0exYwCJ0dCQ==}
-    dependencies:
-      '@vue/compiler-core': 3.5.16
-      '@vue/shared': 3.5.16
-
-  /@vue/compiler-sfc@3.5.16:
-    resolution: {integrity: sha512-rQR6VSFNpiinDy/DVUE0vHoIDUF++6p910cgcZoaAUm3POxgNOOdS/xgoll3rNdKYTYPnnbARDCZOyZ+QSe6Pw==}
-    dependencies:
-      '@babel/parser': 7.27.5
-      '@vue/compiler-core': 3.5.16
-      '@vue/compiler-dom': 3.5.16
-      '@vue/compiler-ssr': 3.5.16
-      '@vue/shared': 3.5.16
-      estree-walker: 2.0.2
-      magic-string: 0.30.17
-      postcss: 8.5.4
-      source-map-js: 1.2.1
-
-  /@vue/compiler-ssr@3.5.16:
-    resolution: {integrity: sha512-d2V7kfxbdsjrDSGlJE7my1ZzCXViEcqN6w14DOsDrUCHEA6vbnVCpRFfrc4ryCP/lCKzX2eS1YtnLE/BuC9f/A==}
-    dependencies:
-      '@vue/compiler-dom': 3.5.16
-      '@vue/shared': 3.5.16
-
-  /@vue/reactivity@3.5.16:
-    resolution: {integrity: sha512-FG5Q5ee/kxhIm1p2bykPpPwqiUBV3kFySsHEQha5BJvjXdZTUfmya7wP7zC39dFuZAcf/PD5S4Lni55vGLMhvA==}
-    dependencies:
-      '@vue/shared': 3.5.16
 
-  /@vue/runtime-core@3.5.16:
-    resolution: {integrity: sha512-bw5Ykq6+JFHYxrQa7Tjr+VSzw7Dj4ldR/udyBZbq73fCdJmyy5MPIFR9IX/M5Qs+TtTjuyUTCnmK3lWWwpAcFQ==}
-    dependencies:
-      '@vue/reactivity': 3.5.16
-      '@vue/shared': 3.5.16
-
-  /@vue/runtime-dom@3.5.16:
-    resolution: {integrity: sha512-T1qqYJsG2xMGhImRUV9y/RseB9d0eCYZQ4CWca9ztCuiPj/XWNNN+lkNBuzVbia5z4/cgxdL28NoQCvC0Xcfww==}
-    dependencies:
-      '@vue/reactivity': 3.5.16
-      '@vue/runtime-core': 3.5.16
-      '@vue/shared': 3.5.16
-      csstype: 3.1.3
-
-  /@vue/server-renderer@3.5.16(vue@3.5.16):
-    resolution: {integrity: sha512-BrX0qLiv/WugguGsnQUJiYOE0Fe5mZTwi6b7X/ybGB0vfrPH9z0gD/Y6WOR1sGCgX4gc25L1RYS5eYQKDMoNIg==}
-    peerDependencies:
-      vue: 3.5.16
-    dependencies:
-      '@vue/compiler-ssr': 3.5.16
-      '@vue/shared': 3.5.16
-      vue: 3.5.16(typescript@5.5.4)
-
-  /@vue/shared@3.5.16:
-    resolution: {integrity: sha512-c/0fWy3Jw6Z8L9FmTyYfkpM5zklnqqa9+a6dz3DvONRKW2NEbh46BP0FHuLFSWi2TnQEtp91Z6zOWNrU6QiyPg==}
+  '@web3-storage/multipart-parser@1.0.0': {}
 
-  /@web3-storage/multipart-parser@1.0.0:
-    resolution: {integrity: sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==}
-
-  /@webassemblyjs/ast@1.11.5:
-    resolution: {integrity: sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==}
+  '@webassemblyjs/ast@1.11.5':
     dependencies:
       '@webassemblyjs/helper-numbers': 1.11.5
       '@webassemblyjs/helper-wasm-bytecode': 1.11.5
-    dev: false
 
-  /@webassemblyjs/ast@1.14.1:
-    resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
+  '@webassemblyjs/ast@1.14.1':
     dependencies:
       '@webassemblyjs/helper-numbers': 1.13.2
       '@webassemblyjs/helper-wasm-bytecode': 1.13.2
-    dev: true
 
-  /@webassemblyjs/floating-point-hex-parser@1.11.5:
-    resolution: {integrity: sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==}
-    dev: false
+  '@webassemblyjs/floating-point-hex-parser@1.11.5': {}
 
-  /@webassemblyjs/floating-point-hex-parser@1.13.2:
-    resolution: {integrity: sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==}
-    dev: true
+  '@webassemblyjs/floating-point-hex-parser@1.13.2': {}
 
-  /@webassemblyjs/helper-api-error@1.11.5:
-    resolution: {integrity: sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==}
-    dev: false
+  '@webassemblyjs/helper-api-error@1.11.5': {}
 
-  /@webassemblyjs/helper-api-error@1.13.2:
-    resolution: {integrity: sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==}
-    dev: true
+  '@webassemblyjs/helper-api-error@1.13.2': {}
 
-  /@webassemblyjs/helper-buffer@1.11.5:
-    resolution: {integrity: sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==}
-    dev: false
+  '@webassemblyjs/helper-buffer@1.11.5': {}
 
-  /@webassemblyjs/helper-buffer@1.14.1:
-    resolution: {integrity: sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==}
-    dev: true
+  '@webassemblyjs/helper-buffer@1.14.1': {}
 
-  /@webassemblyjs/helper-numbers@1.11.5:
-    resolution: {integrity: sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==}
+  '@webassemblyjs/helper-numbers@1.11.5':
     dependencies:
       '@webassemblyjs/floating-point-hex-parser': 1.11.5
       '@webassemblyjs/helper-api-error': 1.11.5
       '@xtuc/long': 4.2.2
-    dev: false
 
-  /@webassemblyjs/helper-numbers@1.13.2:
-    resolution: {integrity: sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==}
+  '@webassemblyjs/helper-numbers@1.13.2':
     dependencies:
       '@webassemblyjs/floating-point-hex-parser': 1.13.2
       '@webassemblyjs/helper-api-error': 1.13.2
       '@xtuc/long': 4.2.2
-    dev: true
 
-  /@webassemblyjs/helper-wasm-bytecode@1.11.5:
-    resolution: {integrity: sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==}
-    dev: false
+  '@webassemblyjs/helper-wasm-bytecode@1.11.5': {}
 
-  /@webassemblyjs/helper-wasm-bytecode@1.13.2:
-    resolution: {integrity: sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==}
-    dev: true
+  '@webassemblyjs/helper-wasm-bytecode@1.13.2': {}
 
-  /@webassemblyjs/helper-wasm-section@1.11.5:
-    resolution: {integrity: sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==}
+  '@webassemblyjs/helper-wasm-section@1.11.5':
     dependencies:
       '@webassemblyjs/ast': 1.11.5
       '@webassemblyjs/helper-buffer': 1.11.5
       '@webassemblyjs/helper-wasm-bytecode': 1.11.5
       '@webassemblyjs/wasm-gen': 1.11.5
-    dev: false
 
-  /@webassemblyjs/helper-wasm-section@1.14.1:
-    resolution: {integrity: sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==}
+  '@webassemblyjs/helper-wasm-section@1.14.1':
     dependencies:
       '@webassemblyjs/ast': 1.14.1
       '@webassemblyjs/helper-buffer': 1.14.1
       '@webassemblyjs/helper-wasm-bytecode': 1.13.2
       '@webassemblyjs/wasm-gen': 1.14.1
-    dev: true
 
-  /@webassemblyjs/ieee754@1.11.5:
-    resolution: {integrity: sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==}
+  '@webassemblyjs/ieee754@1.11.5':
     dependencies:
       '@xtuc/ieee754': 1.2.0
-    dev: false
 
-  /@webassemblyjs/ieee754@1.13.2:
-    resolution: {integrity: sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==}
+  '@webassemblyjs/ieee754@1.13.2':
     dependencies:
       '@xtuc/ieee754': 1.2.0
-    dev: true
 
-  /@webassemblyjs/leb128@1.11.5:
-    resolution: {integrity: sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==}
+  '@webassemblyjs/leb128@1.11.5':
     dependencies:
       '@xtuc/long': 4.2.2
-    dev: false
 
-  /@webassemblyjs/leb128@1.13.2:
-    resolution: {integrity: sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==}
+  '@webassemblyjs/leb128@1.13.2':
     dependencies:
       '@xtuc/long': 4.2.2
-    dev: true
 
-  /@webassemblyjs/utf8@1.11.5:
-    resolution: {integrity: sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==}
-    dev: false
+  '@webassemblyjs/utf8@1.11.5': {}
 
-  /@webassemblyjs/utf8@1.13.2:
-    resolution: {integrity: sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==}
-    dev: true
+  '@webassemblyjs/utf8@1.13.2': {}
 
-  /@webassemblyjs/wasm-edit@1.11.5:
-    resolution: {integrity: sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==}
+  '@webassemblyjs/wasm-edit@1.11.5':
     dependencies:
       '@webassemblyjs/ast': 1.11.5
       '@webassemblyjs/helper-buffer': 1.11.5
@@ -20331,10 +31487,8 @@ packages:
       '@webassemblyjs/wasm-opt': 1.11.5
       '@webassemblyjs/wasm-parser': 1.11.5
       '@webassemblyjs/wast-printer': 1.11.5
-    dev: false
 
-  /@webassemblyjs/wasm-edit@1.14.1:
-    resolution: {integrity: sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==}
+  '@webassemblyjs/wasm-edit@1.14.1':
     dependencies:
       '@webassemblyjs/ast': 1.14.1
       '@webassemblyjs/helper-buffer': 1.14.1
@@ -20344,48 +31498,38 @@ packages:
       '@webassemblyjs/wasm-opt': 1.14.1
       '@webassemblyjs/wasm-parser': 1.14.1
       '@webassemblyjs/wast-printer': 1.14.1
-    dev: true
 
-  /@webassemblyjs/wasm-gen@1.11.5:
-    resolution: {integrity: sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==}
+  '@webassemblyjs/wasm-gen@1.11.5':
     dependencies:
       '@webassemblyjs/ast': 1.11.5
       '@webassemblyjs/helper-wasm-bytecode': 1.11.5
       '@webassemblyjs/ieee754': 1.11.5
       '@webassemblyjs/leb128': 1.11.5
       '@webassemblyjs/utf8': 1.11.5
-    dev: false
 
-  /@webassemblyjs/wasm-gen@1.14.1:
-    resolution: {integrity: sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==}
+  '@webassemblyjs/wasm-gen@1.14.1':
     dependencies:
       '@webassemblyjs/ast': 1.14.1
       '@webassemblyjs/helper-wasm-bytecode': 1.13.2
       '@webassemblyjs/ieee754': 1.13.2
       '@webassemblyjs/leb128': 1.13.2
       '@webassemblyjs/utf8': 1.13.2
-    dev: true
 
-  /@webassemblyjs/wasm-opt@1.11.5:
-    resolution: {integrity: sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==}
+  '@webassemblyjs/wasm-opt@1.11.5':
     dependencies:
       '@webassemblyjs/ast': 1.11.5
       '@webassemblyjs/helper-buffer': 1.11.5
       '@webassemblyjs/wasm-gen': 1.11.5
       '@webassemblyjs/wasm-parser': 1.11.5
-    dev: false
 
-  /@webassemblyjs/wasm-opt@1.14.1:
-    resolution: {integrity: sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==}
+  '@webassemblyjs/wasm-opt@1.14.1':
     dependencies:
       '@webassemblyjs/ast': 1.14.1
       '@webassemblyjs/helper-buffer': 1.14.1
       '@webassemblyjs/wasm-gen': 1.14.1
       '@webassemblyjs/wasm-parser': 1.14.1
-    dev: true
 
-  /@webassemblyjs/wasm-parser@1.11.5:
-    resolution: {integrity: sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==}
+  '@webassemblyjs/wasm-parser@1.11.5':
     dependencies:
       '@webassemblyjs/ast': 1.11.5
       '@webassemblyjs/helper-api-error': 1.11.5
@@ -20393,10 +31537,8 @@ packages:
       '@webassemblyjs/ieee754': 1.11.5
       '@webassemblyjs/leb128': 1.11.5
       '@webassemblyjs/utf8': 1.11.5
-    dev: false
 
-  /@webassemblyjs/wasm-parser@1.14.1:
-    resolution: {integrity: sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==}
+  '@webassemblyjs/wasm-parser@1.14.1':
     dependencies:
       '@webassemblyjs/ast': 1.14.1
       '@webassemblyjs/helper-api-error': 1.13.2
@@ -20404,49 +31546,33 @@ packages:
       '@webassemblyjs/ieee754': 1.13.2
       '@webassemblyjs/leb128': 1.13.2
       '@webassemblyjs/utf8': 1.13.2
-    dev: true
 
-  /@webassemblyjs/wast-printer@1.11.5:
-    resolution: {integrity: sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==}
+  '@webassemblyjs/wast-printer@1.11.5':
     dependencies:
       '@webassemblyjs/ast': 1.11.5
       '@xtuc/long': 4.2.2
-    dev: false
 
-  /@webassemblyjs/wast-printer@1.14.1:
-    resolution: {integrity: sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==}
+  '@webassemblyjs/wast-printer@1.14.1':
     dependencies:
       '@webassemblyjs/ast': 1.14.1
       '@xtuc/long': 4.2.2
-    dev: true
 
-  /@whatwg-node/events@0.1.1:
-    resolution: {integrity: sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==}
-    engines: {node: '>=16.0.0'}
-    dev: false
+  '@whatwg-node/events@0.1.1': {}
 
-  /@whatwg-node/fetch@0.9.14:
-    resolution: {integrity: sha512-wurZC82zzZwXRDSW0OS9l141DynaJQh7Yt0FD1xZ8niX7/Et/7RoiLiltbVU1fSF1RR9z6ndEaTUQBAmddTm1w==}
-    engines: {node: '>=16.0.0'}
+  '@whatwg-node/fetch@0.9.14':
     dependencies:
       '@whatwg-node/node-fetch': 0.5.0
       urlpattern-polyfill: 9.0.0
-    dev: false
 
-  /@whatwg-node/node-fetch@0.5.0:
-    resolution: {integrity: sha512-q76lDAafvHNGWedNAVHrz/EyYTS8qwRLcwne8SJQdRN5P3HydxU6XROFvJfTML6KZXQX2FDdGY4/SnaNyd7M0Q==}
-    engines: {node: '>=16.0.0'}
+  '@whatwg-node/node-fetch@0.5.0':
     dependencies:
       '@whatwg-node/events': 0.1.1
       busboy: 1.6.0
       fast-querystring: 1.1.2
       fast-url-parser: 1.1.3
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /@window-splitter/state@0.4.1:
-    resolution: {integrity: sha512-JbsCYEWFXs79Gxudtv+XTYE2tdidPg8oGoIbUyh9QtdYUNUO/QKI2ORk2WFNIkk2ZzTWMXquI92s1nj4sAhZ+w==}
-    engines: {node: '>=18.0.0'}
+  '@window-splitter/state@0.4.1':
     dependencies:
       '@react-spring/rafz': 9.7.4
       '@types/invariant': 2.2.37
@@ -20454,548 +31580,248 @@ packages:
       invariant: 2.2.4
       universal-cookie: 7.2.0
       xstate: 5.18.1
-    dev: false
 
-  /@xobotyi/scrollbar-width@1.9.5:
-    resolution: {integrity: sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==}
-    dev: false
+  '@wolfy1339/lru-cache@11.0.2-patch.1': {}
 
-  /@xstate/react@4.1.2(@types/react@18.2.69)(react@18.2.0)(xstate@5.18.1):
-    resolution: {integrity: sha512-orAidFrKCrU0ZwN5l/ABPlBfW2ziRDT2RrYoktRlZ0WRoLvA2E/uAC1JpZt43mCLtc8jrdwYCgJiqx1V8NvGTw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      xstate: ^5.18.1
-    peerDependenciesMeta:
-      xstate:
-        optional: true
+  '@xobotyi/scrollbar-width@1.9.5': {}
+
+  '@xstate/react@4.1.2(@types/react@18.2.69)(react@18.2.0)(xstate@5.18.1)':
     dependencies:
       react: 18.2.0
       use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.69)(react@18.2.0)
       use-sync-external-store: 1.2.2(react@18.2.0)
+    optionalDependencies:
       xstate: 5.18.1
     transitivePeerDependencies:
       - '@types/react'
-    dev: false
 
-  /@xtuc/ieee754@1.2.0:
-    resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
-
-  /@xtuc/long@4.2.2:
-    resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
+  '@xtuc/ieee754@1.2.0': {}
 
-  /@zxing/text-encoding@0.9.0:
-    resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==}
-    requiresBuild: true
-    optional: true
+  '@xtuc/long@4.2.2': {}
 
-  /abbrev@1.1.1:
-    resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
-    requiresBuild: true
-    dev: false
+  '@zxing/text-encoding@0.9.0':
     optional: true
 
-  /abbrev@2.0.0:
-    resolution: {integrity: sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: false
+  abbrev@2.0.0: {}
 
-  /abort-controller@3.0.0:
-    resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==}
-    engines: {node: '>=6.5'}
+  abort-controller@3.0.0:
     dependencies:
       event-target-shim: 5.0.1
 
-  /abstract-logging@2.0.1:
-    resolution: {integrity: sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA==}
-    dev: true
+  abstract-logging@2.0.1: {}
 
-  /accepts@1.3.8:
-    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
-    engines: {node: '>= 0.6'}
+  accepts@1.3.8:
     dependencies:
       mime-types: 2.1.35
       negotiator: 0.6.3
 
-  /accepts@2.0.0:
-    resolution: {integrity: sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==}
-    engines: {node: '>= 0.6'}
+  accepts@2.0.0:
     dependencies:
       mime-types: 3.0.0
       negotiator: 1.0.0
-    dev: false
 
-  /acorn-import-assertions@1.9.0(acorn@8.12.1):
-    resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
-    peerDependencies:
-      acorn: ^8
+  acorn-import-assertions@1.9.0(acorn@8.15.0):
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.15.0
 
-  /acorn-import-attributes@1.9.5(acorn@8.12.1):
-    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
-    peerDependencies:
-      acorn: ^8
+  acorn-import-attributes@1.9.5(acorn@8.12.1):
     dependencies:
       acorn: 8.12.1
 
-  /acorn-jsx@5.3.2(acorn@8.12.1):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  acorn-import-attributes@1.9.5(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
+  acorn-import-phases@1.0.4(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
+  acorn-jsx@5.3.2(acorn@8.12.1):
     dependencies:
       acorn: 8.12.1
 
-  /acorn-node@1.8.2:
-    resolution: {integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==}
+  acorn-jsx@5.3.2(acorn@8.15.0):
+    dependencies:
+      acorn: 8.15.0
+
+  acorn-node@1.8.2:
     dependencies:
       acorn: 7.4.1
       acorn-walk: 7.2.0
       xtend: 4.0.2
-    dev: false
-
-  /acorn-walk@7.2.0:
-    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
-    engines: {node: '>=0.4.0'}
-    dev: false
-
-  /acorn-walk@8.2.0:
-    resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
-    engines: {node: '>=0.4.0'}
 
-  /acorn-walk@8.3.2:
-    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
-    engines: {node: '>=0.4.0'}
-
-  /acorn@7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: false
+  acorn-walk@7.2.0: {}
 
-  /acorn@8.10.0:
-    resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+  acorn-walk@8.3.2: {}
 
-  /acorn@8.12.1:
-    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+  acorn@7.4.1: {}
 
-  /acorn@8.14.1:
-    resolution: {integrity: sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
+  acorn@8.12.1: {}
 
-  /adm-zip@0.5.16:
-    resolution: {integrity: sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==}
-    engines: {node: '>=12.0'}
-    dev: false
+  acorn@8.14.1: {}
 
-  /agent-base@6.0.2:
-    resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
-    engines: {node: '>= 6.0.0'}
-    requiresBuild: true
-    dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+  acorn@8.15.0: {}
 
-  /agent-base@7.1.0:
-    resolution: {integrity: sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==}
-    engines: {node: '>= 14'}
+  agent-base@6.0.2:
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
 
-  /agent-base@7.1.1:
-    resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==}
-    engines: {node: '>= 14'}
-    dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
-    transitivePeerDependencies:
-      - supports-color
+  agent-base@7.1.4: {}
 
-  /agentkeepalive@4.5.0:
-    resolution: {integrity: sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==}
-    engines: {node: '>= 8.0.0'}
+  agentkeepalive@4.5.0:
     dependencies:
       humanize-ms: 1.2.1
 
-  /aggregate-error@3.1.0:
-    resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==}
-    engines: {node: '>=8'}
+  aggregate-error@3.1.0:
     dependencies:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  /aggregate-error@4.0.1:
-    resolution: {integrity: sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==}
-    engines: {node: '>=12'}
+  aggregate-error@4.0.1:
     dependencies:
       clean-stack: 4.2.0
       indent-string: 5.0.0
-    dev: true
 
-  /ahocorasick@1.0.2:
-    resolution: {integrity: sha512-hCOfMzbFx5IDutmWLAt6MZwOUjIfSM9G9FyVxytmE4Rs/5YDPWQrD/+IR1w+FweD9H2oOZEnv36TmkjhNURBVA==}
-    dev: true
+  ahocorasick@1.0.2: {}
 
-  /ai@3.3.24(openai@4.56.0)(react@19.0.0-rc.0)(svelte@5.33.14)(vue@3.5.16)(zod@3.23.8):
-    resolution: {integrity: sha512-hhyczvEdCQeeEMWBWP4Af8k1YIzsheC+dHv6lAsti8NBiOnySFhnjS1sTiIrLyuCgciHXoFYLhlA2+/3AtBLAQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      openai: ^4.42.0
-      react: ^18 || ^19
-      sswr: ^2.1.0
-      svelte: ^3.0.0 || ^4.0.0
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      openai:
-        optional: true
-      react:
-        optional: true
-      sswr:
-        optional: true
-      svelte:
-        optional: true
-      zod:
-        optional: true
+  ai@4.0.0(react@18.3.1)(zod@3.25.76):
     dependencies:
-      '@ai-sdk/provider': 0.0.22
-      '@ai-sdk/provider-utils': 1.0.17(zod@3.23.8)
-      '@ai-sdk/react': 0.0.53(react@19.0.0-rc.0)(zod@3.23.8)
-      '@ai-sdk/solid': 0.0.43(zod@3.23.8)
-      '@ai-sdk/svelte': 0.0.45(svelte@5.33.14)(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.40(zod@3.23.8)
-      '@ai-sdk/vue': 0.0.45(vue@3.5.16)(zod@3.23.8)
+      '@ai-sdk/provider': 1.0.0
+      '@ai-sdk/provider-utils': 2.0.0(zod@3.25.76)
+      '@ai-sdk/react': 1.0.0(react@18.3.1)(zod@3.25.76)
+      '@ai-sdk/ui-utils': 1.0.0(zod@3.25.76)
       '@opentelemetry/api': 1.9.0
-      eventsource-parser: 1.1.2
-      json-schema: 0.4.0
       jsondiffpatch: 0.6.0
-      nanoid: 3.3.6
-      openai: 4.56.0(zod@3.23.8)
-      react: 19.0.0-rc.0
-      secure-json-parse: 2.7.0
-      svelte: 5.33.14
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.2(zod@3.23.8)
-    transitivePeerDependencies:
-      - solid-js
-      - vue
-    dev: false
+      zod-to-json-schema: 3.24.6(zod@3.25.76)
+    optionalDependencies:
+      react: 18.3.1
+      zod: 3.25.76
 
-  /ai@3.4.33(react@18.3.1)(svelte@5.33.14)(vue@3.5.16)(zod@3.23.8):
-    resolution: {integrity: sha512-plBlrVZKwPoRTmM8+D1sJac9Bq8eaa2jiZlHLZIWekKWI1yMWYZvCCEezY9ASPwRhULYDJB2VhKOBUUeg3S5JQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      openai: ^4.42.0
-      react: ^18 || ^19 || ^19.0.0-rc
-      sswr: ^2.1.0
-      svelte: ^3.0.0 || ^4.0.0 || ^5.0.0
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      openai:
-        optional: true
-      react:
-        optional: true
-      sswr:
-        optional: true
-      svelte:
-        optional: true
-      zod:
-        optional: true
+  ai@4.2.5(react@19.0.0)(zod@3.25.76):
     dependencies:
-      '@ai-sdk/provider': 0.0.26
-      '@ai-sdk/provider-utils': 1.0.22(zod@3.23.8)
-      '@ai-sdk/react': 0.0.70(react@18.3.1)(zod@3.23.8)
-      '@ai-sdk/solid': 0.0.54(zod@3.23.8)
-      '@ai-sdk/svelte': 0.0.57(svelte@5.33.14)(zod@3.23.8)
-      '@ai-sdk/ui-utils': 0.0.50(zod@3.23.8)
-      '@ai-sdk/vue': 0.0.59(vue@3.5.16)(zod@3.23.8)
+      '@ai-sdk/provider': 1.1.0
+      '@ai-sdk/provider-utils': 2.2.1(zod@3.25.76)
+      '@ai-sdk/react': 1.2.2(react@19.0.0)(zod@3.25.76)
+      '@ai-sdk/ui-utils': 1.2.1(zod@3.25.76)
       '@opentelemetry/api': 1.9.0
-      eventsource-parser: 1.1.2
-      json-schema: 0.4.0
       jsondiffpatch: 0.6.0
-      react: 18.3.1
-      secure-json-parse: 2.7.0
-      svelte: 5.33.14
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.3(zod@3.23.8)
-    transitivePeerDependencies:
-      - solid-js
-      - vue
-    dev: true
+      zod: 3.25.76
+    optionalDependencies:
+      react: 19.0.0
 
-  /ai@4.0.0(react@18.3.1)(zod@3.23.8):
-    resolution: {integrity: sha512-cqf2GCaXnOPhUU+Ccq6i+5I0jDjnFkzfq7t6mc0SUSibSa1wDPn5J4p8+Joh2fDGDYZOJ44rpTW9hSs40rXNAw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      zod:
-        optional: true
+  ai@4.3.19(react@18.2.0)(zod@3.25.76):
     dependencies:
-      '@ai-sdk/provider': 1.0.0
-      '@ai-sdk/provider-utils': 2.0.0(zod@3.23.8)
-      '@ai-sdk/react': 1.0.0(react@18.3.1)(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.0.0(zod@3.23.8)
+      '@ai-sdk/provider': 1.1.3
+      '@ai-sdk/provider-utils': 2.2.8(zod@3.25.76)
+      '@ai-sdk/react': 1.2.12(react@18.2.0)(zod@3.25.76)
+      '@ai-sdk/ui-utils': 1.2.11(zod@3.25.76)
       '@opentelemetry/api': 1.9.0
       jsondiffpatch: 0.6.0
-      react: 18.3.1
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.5(zod@3.23.8)
-    dev: false
+      zod: 3.25.76
+    optionalDependencies:
+      react: 18.2.0
 
-  /ai@4.2.5(react@18.3.1)(zod@3.23.8):
-    resolution: {integrity: sha512-URJEslI3cgF/atdTJHtz+Sj0W1JTmiGmD3znw9KensL3qV605odktDim+GTazNJFPR4QaIu1lUio5b8RymvOjA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      react:
-        optional: true
+  ai@5.0.14(zod@3.25.76):
     dependencies:
-      '@ai-sdk/provider': 1.1.0
-      '@ai-sdk/provider-utils': 2.2.1(zod@3.23.8)
-      '@ai-sdk/react': 1.2.2(react@18.3.1)(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.2.1(zod@3.23.8)
+      '@ai-sdk/gateway': 1.0.6(zod@3.25.76)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.3(zod@3.25.76)
       '@opentelemetry/api': 1.9.0
-      jsondiffpatch: 0.6.0
-      react: 18.3.1
-      zod: 3.23.8
-    dev: true
+      zod: 3.25.76
 
-  /ai@4.2.5(react@19.0.0)(zod@3.23.8):
-    resolution: {integrity: sha512-URJEslI3cgF/atdTJHtz+Sj0W1JTmiGmD3znw9KensL3qV605odktDim+GTazNJFPR4QaIu1lUio5b8RymvOjA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      react:
-        optional: true
+  ai@5.0.76(zod@3.25.76):
     dependencies:
-      '@ai-sdk/provider': 1.1.0
-      '@ai-sdk/provider-utils': 2.2.1(zod@3.23.8)
-      '@ai-sdk/react': 1.2.2(react@19.0.0)(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.2.1(zod@3.23.8)
+      '@ai-sdk/gateway': 2.0.0(zod@3.25.76)
+      '@ai-sdk/provider': 2.0.0
+      '@ai-sdk/provider-utils': 3.0.12(zod@3.25.76)
       '@opentelemetry/api': 1.9.0
-      jsondiffpatch: 0.6.0
-      react: 19.0.0
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /ai@4.3.19(react@18.2.0)(zod@3.23.8):
-    resolution: {integrity: sha512-dIE2bfNpqHN3r6IINp9znguYdhIOheKW2LDigAMrgt/upT3B8eBGPSCblENvaZGoq+hxaN9fSMzjWpbqloP+7Q==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      react:
-        optional: true
+  ai@6.0.3(zod@3.25.76):
     dependencies:
-      '@ai-sdk/provider': 1.1.3
-      '@ai-sdk/provider-utils': 2.2.8(zod@3.23.8)
-      '@ai-sdk/react': 1.2.12(react@18.2.0)(zod@3.23.8)
-      '@ai-sdk/ui-utils': 1.2.11(zod@3.23.8)
+      '@ai-sdk/gateway': 3.0.2(zod@3.25.76)
+      '@ai-sdk/provider': 3.0.0
+      '@ai-sdk/provider-utils': 4.0.1(zod@3.25.76)
       '@opentelemetry/api': 1.9.0
-      jsondiffpatch: 0.6.0
-      react: 18.2.0
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /ajv-formats@2.1.1(ajv@8.17.1):
-    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-    dependencies:
+  ajv-formats@2.1.1(ajv@8.17.1):
+    optionalDependencies:
       ajv: 8.17.1
-    dev: true
 
-  /ajv-formats@3.0.1(ajv@8.17.1):
-    resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==}
-    peerDependencies:
-      ajv: ^8.0.0
-    peerDependenciesMeta:
-      ajv:
-        optional: true
-    dependencies:
+  ajv-formats@3.0.1(ajv@8.17.1):
+    optionalDependencies:
       ajv: 8.17.1
-    dev: true
 
-  /ajv-keywords@3.5.2(ajv@6.12.6):
-    resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
-    peerDependencies:
-      ajv: ^6.9.1
+  ajv-keywords@3.5.2(ajv@6.12.6):
     dependencies:
       ajv: 6.12.6
-    dev: false
 
-  /ajv-keywords@5.1.0(ajv@8.17.1):
-    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
-    peerDependencies:
-      ajv: ^8.8.2
+  ajv-keywords@5.1.0(ajv@8.17.1):
     dependencies:
       ajv: 8.17.1
       fast-deep-equal: 3.1.3
-    dev: true
 
-  /ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-json-stable-stringify: 2.1.0
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  /ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+  ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-uri: 3.0.6
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-    dev: true
 
-  /ansi-colors@4.1.3:
-    resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
-    engines: {node: '>=6'}
-    dev: false
-
-  /ansi-escapes@4.3.2:
-    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      type-fest: 0.21.3
+  ansi-colors@4.1.3: {}
 
-  /ansi-escapes@7.0.0:
-    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
-    engines: {node: '>=18'}
+  ansi-escapes@7.0.0:
     dependencies:
       environment: 1.1.0
 
-  /ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
+  ansi-regex@5.0.1: {}
 
-  /ansi-regex@6.0.1:
-    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
-    engines: {node: '>=12'}
+  ansi-regex@6.0.1: {}
 
-  /ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
+  ansi-styles@3.2.1:
     dependencies:
       color-convert: 1.9.3
 
-  /ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
+  ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
 
-  /ansi-styles@5.2.0:
-    resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /ansi-styles@6.2.1:
-    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
-    engines: {node: '>=12'}
-
-  /any-promise@1.3.0:
-    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
+  ansi-styles@5.2.0: {}
 
-  /anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
+  ansi-styles@6.2.1: {}
 
-  /app-root-path@3.1.0:
-    resolution: {integrity: sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==}
-    engines: {node: '>= 6.0.0'}
-    dev: false
+  antlr4ts-cli@0.5.0-alpha.4: {}
 
-  /aproba@2.0.0:
-    resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
-    requiresBuild: true
-    dev: false
-    optional: true
+  antlr4ts@0.5.0-alpha.4(patch_hash=b5d41129ddbf7c4cbb0288244b2c8d041ee0803c5102c1181c180408d3b579f4): {}
 
-  /archiver-utils@2.1.0:
-    resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
-    engines: {node: '>= 6'}
-    dependencies:
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      lazystream: 1.0.1
-      lodash.defaults: 4.2.0
-      lodash.difference: 4.5.0
-      lodash.flatten: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.union: 4.6.0
-      normalize-path: 3.0.0
-      readable-stream: 2.3.8
-    dev: true
+  any-promise@1.3.0: {}
 
-  /archiver-utils@3.0.4:
-    resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
-    engines: {node: '>= 10'}
+  anymatch@3.1.3:
     dependencies:
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      lazystream: 1.0.1
-      lodash.defaults: 4.2.0
-      lodash.difference: 4.5.0
-      lodash.flatten: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.union: 4.6.0
       normalize-path: 3.0.0
-      readable-stream: 3.6.2
-    dev: true
+      picomatch: 2.3.1
 
-  /archiver-utils@5.0.2:
-    resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==}
-    engines: {node: '>= 14'}
+  archiver-utils@5.0.2:
     dependencies:
       glob: 10.4.5
       graceful-fs: 4.2.11
       is-stream: 2.0.1
       lazystream: 1.0.1
-      lodash: 4.17.21
+      lodash: 4.17.23
       normalize-path: 3.0.0
       readable-stream: 4.7.0
-    dev: true
-
-  /archiver@5.3.2:
-    resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
-    engines: {node: '>= 10'}
-    dependencies:
-      archiver-utils: 2.1.0
-      async: 3.2.6
-      buffer-crc32: 0.2.13
-      readable-stream: 3.6.2
-      readdir-glob: 1.1.3
-      tar-stream: 2.2.0
-      zip-stream: 4.1.1
-    dev: true
 
-  /archiver@7.0.1:
-    resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==}
-    engines: {node: '>= 14'}
+  archiver@7.0.1:
     dependencies:
       archiver-utils: 5.0.2
       async: 3.2.6
@@ -21004,88 +31830,50 @@ packages:
       readdir-glob: 1.1.3
       tar-stream: 3.1.7
       zip-stream: 6.0.1
-    dev: true
-
-  /are-we-there-yet@3.0.1:
-    resolution: {integrity: sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    deprecated: This package is no longer supported.
-    requiresBuild: true
-    dependencies:
-      delegates: 1.0.0
-      readable-stream: 3.6.2
-    dev: false
-    optional: true
-
-  /arg@4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
+    transitivePeerDependencies:
+      - bare-abort-controller
 
-  /arg@5.0.2:
-    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
+  arg@5.0.2: {}
 
-  /argparse@1.0.10:
-    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+  argparse@1.0.10:
     dependencies:
       sprintf-js: 1.0.3
 
-  /argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+  argparse@2.0.1: {}
 
-  /aria-hidden@1.2.3:
-    resolution: {integrity: sha512-xcLxITLe2HYa1cnYnwCjkOO1PqUHQpozB8x9AR0OgWN2woOBi5kSDVxKfd0b7sb1hw5qFeJhXm9H1nu3xSfLeQ==}
-    engines: {node: '>=10'}
+  aria-hidden@1.2.3:
     dependencies:
-      tslib: 2.6.2
-    dev: false
+      tslib: 2.8.1
 
-  /aria-hidden@1.2.4:
-    resolution: {integrity: sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==}
-    engines: {node: '>=10'}
+  aria-hidden@1.2.4:
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /aria-query@5.3.0:
-    resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
+  aria-query@5.3.0:
     dependencies:
       dequal: 2.0.3
 
-  /aria-query@5.3.2:
-    resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
-    engines: {node: '>= 0.4'}
-
-  /arktype@2.0.0-rc.17:
-    resolution: {integrity: sha512-1m1VG9ZGcGx8OIbeA4ghw8n1QVpu7MYcel3My2Tob17mMBaLy6+M116RRwx9GvaCyGpHhgu1RK5XfhP4wX17ug==}
+  arktype@2.1.20:
     dependencies:
-      '@ark/schema': 0.19.0
-      '@ark/util': 0.18.0
-    dev: false
+      '@ark/schema': 0.46.0
+      '@ark/util': 0.46.0
 
-  /array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
-    engines: {node: '>= 0.4'}
+  array-buffer-byte-length@1.0.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       is-array-buffer: 3.0.4
-    dev: true
 
-  /array-flatten@1.1.1:
-    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
+  array-flatten@1.1.1: {}
 
-  /array-includes@3.1.6:
-    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
-    engines: {node: '>= 0.4'}
+  array-includes@3.1.6:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
       get-intrinsic: 1.3.0
       is-string: 1.0.7
-    dev: true
 
-  /array-includes@3.1.8:
-    resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
-    engines: {node: '>= 0.4'}
+  array-includes@3.1.8:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
@@ -21093,15 +31881,10 @@ packages:
       es-object-atoms: 1.0.0
       get-intrinsic: 1.2.4
       is-string: 1.0.7
-    dev: true
 
-  /array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
+  array-union@2.1.0: {}
 
-  /array.prototype.findlastindex@1.2.5:
-    resolution: {integrity: sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==}
-    engines: {node: '>= 0.4'}
+  array.prototype.findlastindex@1.2.5:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
@@ -21109,416 +31892,254 @@ packages:
       es-errors: 1.3.0
       es-object-atoms: 1.0.0
       es-shim-unscopables: 1.0.2
-    dev: true
 
-  /array.prototype.flat@1.3.1:
-    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
-    engines: {node: '>= 0.4'}
+  array.prototype.flat@1.3.1:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
       es-shim-unscopables: 1.0.0
-    dev: false
 
-  /array.prototype.flat@1.3.2:
-    resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==}
-    engines: {node: '>= 0.4'}
+  array.prototype.flat@1.3.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-shim-unscopables: 1.0.0
-    dev: true
 
-  /array.prototype.flatmap@1.3.1:
-    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
-    engines: {node: '>= 0.4'}
+  array.prototype.flatmap@1.3.1:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
       es-shim-unscopables: 1.0.0
-    dev: true
 
-  /array.prototype.flatmap@1.3.2:
-    resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
-    engines: {node: '>= 0.4'}
+  array.prototype.flatmap@1.3.2:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-shim-unscopables: 1.0.0
-    dev: true
 
-  /array.prototype.tosorted@1.1.1:
-    resolution: {integrity: sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==}
+  array.prototype.tosorted@1.1.1:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
       es-shim-unscopables: 1.0.0
       get-intrinsic: 1.3.0
-    dev: true
 
-  /arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
-    engines: {node: '>= 0.4'}
+  arraybuffer.prototype.slice@1.0.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
       is-array-buffer: 3.0.4
       is-shared-array-buffer: 1.0.3
-    dev: true
-
-  /arrify@1.0.1:
-    resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
 
-  /arrify@3.0.0:
-    resolution: {integrity: sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==}
-    engines: {node: '>=12'}
-    dev: true
+  arrify@1.0.1: {}
 
-  /as-table@1.0.55:
-    resolution: {integrity: sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==}
-    dependencies:
-      printable-characters: 1.0.42
-    dev: false
+  arrify@3.0.0: {}
 
-  /asap@2.0.6:
-    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
-    dev: true
+  asap@2.0.6: {}
 
-  /asn1@0.2.6:
-    resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
+  asn1@0.2.6:
     dependencies:
       safer-buffer: 2.1.2
 
-  /assert-never@1.2.1:
-    resolution: {integrity: sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==}
-    dev: false
+  assert-never@1.2.1: {}
 
-  /assert-plus@1.0.0:
-    resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
-    engines: {node: '>=0.8'}
-    dev: false
+  assert-plus@1.0.0: {}
 
-  /assertion-error@2.0.1:
-    resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
-    engines: {node: '>=12'}
-    dev: true
+  assertion-error@2.0.1: {}
 
-  /ast-types-flow@0.0.7:
-    resolution: {integrity: sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==}
-    dev: true
+  ast-types-flow@0.0.7: {}
 
-  /ast-types@0.13.4:
-    resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
-    engines: {node: '>=4'}
+  ast-types@0.13.4:
     dependencies:
       tslib: 2.8.1
-    dev: false
-
-  /astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
 
-  /astring@1.8.4:
-    resolution: {integrity: sha512-97a+l2LBU3Op3bBQEff79i/E4jMD2ZLFD8rHx9B6mXyB2uQwhJQYfiDqUwtfjF4QA1F2qs//N6Cw8LetMbQjcw==}
-    hasBin: true
-    dev: true
+  astral-regex@2.0.0: {}
 
-  /async-lock@1.4.1:
-    resolution: {integrity: sha512-Az2ZTpuytrtqENulXwO3GGv1Bztugx6TT37NIo7imr/Qo0gsYiGtSdBa2B6fsXhTpVZDNfu1Qn3pk531e3q+nQ==}
-    dev: true
+  astring@1.8.4: {}
 
-  /async@0.2.10:
-    resolution: {integrity: sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==}
-    dev: false
+  async-lock@1.4.1: {}
 
-  /async@3.2.6:
-    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
-    dev: true
+  async@3.2.6: {}
 
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+  asynckit@0.4.0: {}
 
-  /atomic-sleep@1.0.0:
-    resolution: {integrity: sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==}
-    engines: {node: '>=8.0.0'}
-    dev: true
+  atomic-sleep@1.0.0: {}
 
-  /autoevals@0.0.130(ws@8.12.0):
-    resolution: {integrity: sha512-JS0T/YCEH13AAOGiWWGJDkIPP8LsDmRBYr3EazTukHxvd0nidOW7fGj0qVPFx2bARrSNO9AfCR6xoTP/5m3Bmw==}
+  autoevals@0.0.130(encoding@0.1.13)(ws@8.17.1(bufferutil@4.0.9)):
     dependencies:
       ajv: 8.17.1
       compute-cosine-similarity: 1.1.0
       js-levenshtein: 1.1.6
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       linear-sum-assignment: 1.0.7
       mustache: 4.2.0
-      openai: 4.97.0(ws@8.12.0)(zod@3.23.8)
-      zod: 3.23.8
-      zod-to-json-schema: 3.24.5(zod@3.23.8)
+      openai: 4.97.0(encoding@0.1.13)(ws@8.17.1(bufferutil@4.0.9))(zod@3.25.76)
+      zod: 3.25.76
+      zod-to-json-schema: 3.24.5(zod@3.25.76)
     transitivePeerDependencies:
       - encoding
       - ws
-    dev: true
 
-  /autoprefixer@10.4.13(postcss@8.5.4):
-    resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
+  autoprefixer@10.4.13(postcss@8.5.6):
     dependencies:
       browserslist: 4.21.4
       caniuse-lite: 1.0.30001577
       fraction.js: 4.2.0
       normalize-range: 0.1.2
       picocolors: 1.0.0
-      postcss: 8.5.4
+      postcss: 8.5.6
       postcss-value-parser: 4.2.0
-    dev: true
 
-  /autoprefixer@10.4.14(postcss@8.4.35):
-    resolution: {integrity: sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
+  autoprefixer@10.4.14(postcss@8.4.35):
     dependencies:
       browserslist: 4.24.4
-      caniuse-lite: 1.0.30001707
+      caniuse-lite: 1.0.30001754
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.1.1
       postcss: 8.4.35
       postcss-value-parser: 4.2.0
-    dev: false
 
-  /autoprefixer@9.8.8:
-    resolution: {integrity: sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==}
-    hasBin: true
+  autoprefixer@9.8.8:
     dependencies:
       browserslist: 4.24.4
-      caniuse-lite: 1.0.30001707
+      caniuse-lite: 1.0.30001754
       normalize-range: 0.1.2
       num2fraction: 1.2.2
       picocolors: 0.2.1
       postcss: 7.0.39
       postcss-value-parser: 4.2.0
-    dev: false
-
-  /available-typed-arrays@1.0.5:
-    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
-    engines: {node: '>= 0.4'}
 
-  /available-typed-arrays@1.0.7:
-    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
-    engines: {node: '>= 0.4'}
+  available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
-    dev: true
 
-  /avvio@9.1.0:
-    resolution: {integrity: sha512-fYASnYi600CsH/j9EQov7lECAniYiBFiiAtBNuZYLA2leLe9qOvZzqYHFjtIj6gD2VMoMLP14834LFWvr4IfDw==}
+  avvio@9.1.0:
     dependencies:
       '@fastify/error': 4.2.0
       fastq: 1.19.1
-    dev: true
 
-  /aws-sign2@0.7.0:
-    resolution: {integrity: sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==}
-    dev: false
+  aws-sign2@0.7.0: {}
 
-  /aws4@1.12.0:
-    resolution: {integrity: sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==}
-    dev: false
+  aws4@1.12.0: {}
 
-  /aws4fetch@1.0.18:
-    resolution: {integrity: sha512-3Cf+YaUl07p24MoQ46rFwulAmiyCwH2+1zw1ZyPAX5OtJ34Hh185DwB8y/qRLb6cYYYtSFJ9pthyLc0MD4e8sQ==}
-    dev: false
+  aws4fetch@1.0.18: {}
 
-  /axe-core@4.6.2:
-    resolution: {integrity: sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg==}
-    engines: {node: '>=4'}
-    dev: true
+  axe-core@4.6.2: {}
 
-  /axios@1.9.0:
-    resolution: {integrity: sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==}
+  axios@1.12.2:
     dependencies:
       follow-redirects: 1.15.9
-      form-data: 4.0.0
+      form-data: 4.0.4
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
-    dev: false
 
-  /axobject-query@3.2.1:
-    resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}
+  axobject-query@3.2.1:
     dependencies:
       dequal: 2.0.3
-    dev: true
 
-  /axobject-query@4.1.0:
-    resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
-    engines: {node: '>= 0.4'}
-
-  /b4a@1.6.6:
-    resolution: {integrity: sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==}
+  b4a@1.6.6: {}
 
-  /babel-walk@3.0.0:
-    resolution: {integrity: sha512-fdRxJkQ9MUSEi4jH2DcV3FAPFktk0wefilxrwNyUuWpoWawQGN7G7cB+fOYTtFfI6XNkFgwqJ/D3G18BoJJ/jg==}
-    engines: {node: '>= 10.0.0'}
+  babel-walk@3.0.0:
     dependencies:
       '@babel/types': 7.27.0
-    dev: false
 
-  /bail@2.0.2:
-    resolution: {integrity: sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==}
+  bail@2.0.2: {}
 
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+  balanced-match@1.0.2: {}
 
-  /bare-events@2.5.4:
-    resolution: {integrity: sha512-+gFfDkR8pj4/TrWCGUGWmJIkBwuxPS5F+a5yWjOHQt2hHvNZd5YLzadjmDUtFmMM4y429bnKLa8bYBMHcYdnQA==}
-    requiresBuild: true
+  bare-events@2.8.2:
     optional: true
 
-  /bare-fs@4.1.5:
-    resolution: {integrity: sha512-1zccWBMypln0jEE05LzZt+V/8y8AQsQQqxtklqaIyg5nu6OAYFhZxPXinJTSG+kU5qyNmeLgcn9AW7eHiCHVLA==}
-    engines: {bare: '>=1.16.0'}
-    requiresBuild: true
-    peerDependencies:
-      bare-buffer: '*'
-    peerDependenciesMeta:
-      bare-buffer:
-        optional: true
+  bare-fs@4.5.1:
     dependencies:
-      bare-events: 2.5.4
+      bare-events: 2.8.2
       bare-path: 3.0.0
-      bare-stream: 2.6.5(bare-events@2.5.4)
+      bare-stream: 2.6.5(bare-events@2.8.2)
+      bare-url: 2.3.2
+      fast-fifo: 1.3.2
+    transitivePeerDependencies:
+      - bare-abort-controller
     optional: true
 
-  /bare-os@3.6.1:
-    resolution: {integrity: sha512-uaIjxokhFidJP+bmmvKSgiMzj2sV5GPHaZVAIktcxcpCyBFFWO+YlikVAdhmUo2vYFvFhOXIAlldqV29L8126g==}
-    engines: {bare: '>=1.14.0'}
-    requiresBuild: true
+  bare-os@3.6.1:
     optional: true
 
-  /bare-path@3.0.0:
-    resolution: {integrity: sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==}
-    requiresBuild: true
+  bare-path@3.0.0:
     dependencies:
       bare-os: 3.6.1
     optional: true
 
-  /bare-stream@2.6.5(bare-events@2.5.4):
-    resolution: {integrity: sha512-jSmxKJNJmHySi6hC42zlZnq00rga4jjxcgNZjY9N5WlOe/iOoGRtdwGsHzQv2RlH2KOYMwGUXhf2zXd32BA9RA==}
-    requiresBuild: true
-    peerDependencies:
-      bare-buffer: '*'
-      bare-events: '*'
-    peerDependenciesMeta:
-      bare-buffer:
-        optional: true
-      bare-events:
-        optional: true
+  bare-stream@2.6.5(bare-events@2.8.2):
     dependencies:
-      bare-events: 2.5.4
       streamx: 2.22.0
+    optionalDependencies:
+      bare-events: 2.8.2
+    transitivePeerDependencies:
+      - bare-abort-controller
     optional: true
 
-  /base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+  bare-url@2.3.2:
+    dependencies:
+      bare-path: 3.0.0
+    optional: true
 
-  /base64id@2.0.0:
-    resolution: {integrity: sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==}
-    engines: {node: ^4.5.0 || >= 5.9}
+  base64-js@1.5.1: {}
 
-  /basic-auth@2.0.1:
-    resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==}
-    engines: {node: '>= 0.8'}
+  base64id@2.0.0: {}
+
+  baseline-browser-mapping@2.8.28: {}
+
+  basic-auth@2.0.1:
     dependencies:
       safe-buffer: 5.1.2
 
-  /basic-ftp@5.0.3:
-    resolution: {integrity: sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==}
-    engines: {node: '>=10.0.0'}
-    dev: false
+  basic-ftp@5.0.3: {}
 
-  /bcrypt-pbkdf@1.0.2:
-    resolution: {integrity: sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==}
+  bcrypt-pbkdf@1.0.2:
     dependencies:
       tweetnacl: 0.14.5
 
-  /bcrypt@6.0.0:
-    resolution: {integrity: sha512-cU8v/EGSrnH+HnxV2z0J7/blxH8gq7Xh2JFT6Aroax7UohdmiJJlxApMxtKfuI7z68NvvVcmR78k2LbT6efhRg==}
-    engines: {node: '>= 18'}
-    requiresBuild: true
-    dependencies:
-      node-addon-api: 8.3.1
-      node-gyp-build: 4.8.4
-    dev: false
+  before-after-hook@2.2.3: {}
 
-  /better-path-resolve@1.0.0:
-    resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==}
-    engines: {node: '>=4'}
+  better-path-resolve@1.0.0:
     dependencies:
       is-windows: 1.0.2
-    dev: false
 
-  /better-sqlite3@11.10.0:
-    resolution: {integrity: sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==}
-    requiresBuild: true
+  better-sqlite3@11.10.0:
     dependencies:
       bindings: 1.5.0
       prebuild-install: 7.1.3
-    dev: true
 
-  /big.js@6.2.2:
-    resolution: {integrity: sha512-y/ie+Faknx7sZA5MfGA2xKlu0GDv8RWrXGsmlteyJQ2lvoKv9GBK/fpRMc2qlSoBAgNxrixICFCBefIq8WCQpQ==}
-    dev: false
+  big.js@6.2.2: {}
 
-  /binary-extensions@2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
-    engines: {node: '>=8'}
+  binary-extensions@2.2.0: {}
 
-  /binary-search@1.3.6:
-    resolution: {integrity: sha512-nbE1WxOTTrUWIfsfZ4aHGYu5DOuNkbxGokjV6Z2kxfJK3uaAb8zNK1muzOeipoLHZjInT4Br88BHpzevc681xA==}
-    dev: true
+  binary-search@1.3.6: {}
 
-  /bindings@1.5.0:
-    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+  bindings@1.5.0:
     dependencies:
       file-uri-to-path: 1.0.0
 
-  /bintrees@1.0.2:
-    resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}
-    dev: false
+  bintrees@1.0.2: {}
 
-  /bl@4.1.0:
-    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+  bl@4.1.0:
     dependencies:
       buffer: 5.7.1
       inherits: 2.0.4
-      readable-stream: 3.6.0
-
-  /blake3-wasm@2.1.5:
-    resolution: {integrity: sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==}
-    dev: false
+      readable-stream: 3.6.2
 
-  /body-parser@1.20.3:
-    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
-    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+  body-parser@1.20.3:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
@@ -21528,290 +32149,199 @@ packages:
       http-errors: 2.0.0
       iconv-lite: 0.4.24
       on-finished: 2.4.1
-      qs: 6.13.0
+      qs: 6.14.1
       raw-body: 2.5.2
       type-is: 1.6.18
       unpipe: 1.0.0
     transitivePeerDependencies:
       - supports-color
 
-  /body-parser@2.2.0(supports-color@10.0.0):
-    resolution: {integrity: sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg==}
-    engines: {node: '>=18'}
+  body-parser@2.2.0(supports-color@10.0.0):
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       http-errors: 2.0.0
       iconv-lite: 0.6.3
       on-finished: 2.4.1
-      qs: 6.14.0
+      qs: 6.14.1
       raw-body: 3.0.0
       type-is: 2.0.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /bowser@2.11.0:
-    resolution: {integrity: sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==}
-    dev: false
+  body-parser@2.2.2:
+    dependencies:
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 4.4.3
+      http-errors: 2.0.0
+      iconv-lite: 0.7.2
+      on-finished: 2.4.1
+      qs: 6.14.1
+      raw-body: 3.0.2
+      type-is: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
 
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+  bottleneck@2.19.5: {}
+
+  bowser@2.11.0: {}
+
+  bowser@2.12.1: {}
+
+  brace-expansion@1.1.11:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  /brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+  brace-expansion@2.0.1:
     dependencies:
       balanced-match: 1.0.2
 
-  /braces@3.0.3:
-    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
-    engines: {node: '>=8'}
+  braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
 
-  /breakword@1.0.5:
-    resolution: {integrity: sha512-ex5W9DoOQ/LUEU3PMdLs9ua/CYZl1678NUkKOdUSi8Aw5F1idieaiRURCBFJCwVcrD1J8Iy3vfWSloaMwO2qFg==}
+  breakword@1.0.5:
     dependencies:
       wcwidth: 1.0.1
-    dev: false
 
-  /browserify-zlib@0.1.4:
-    resolution: {integrity: sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==}
+  browserify-zlib@0.1.4:
     dependencies:
       pako: 0.2.9
-    dev: true
 
-  /browserslist@4.21.4:
-    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
+  browserslist@4.21.4:
     dependencies:
       caniuse-lite: 1.0.30001577
       electron-to-chromium: 1.4.433
       node-releases: 2.0.12
       update-browserslist-db: 1.0.11(browserslist@4.21.4)
-    dev: true
-
-  /browserslist@4.23.3:
-    resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-    dependencies:
-      caniuse-lite: 1.0.30001707
-      electron-to-chromium: 1.5.13
-      node-releases: 2.0.18
-      update-browserslist-db: 1.1.0(browserslist@4.23.3)
-    dev: false
 
-  /browserslist@4.24.4:
-    resolution: {integrity: sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
+  browserslist@4.24.4:
     dependencies:
-      caniuse-lite: 1.0.30001707
+      caniuse-lite: 1.0.30001754
       electron-to-chromium: 1.5.98
       node-releases: 2.0.19
       update-browserslist-db: 1.1.2(browserslist@4.24.4)
 
-  /browserslist@4.25.0:
-    resolution: {integrity: sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
+  browserslist@4.28.0:
     dependencies:
-      caniuse-lite: 1.0.30001720
-      electron-to-chromium: 1.5.162
-      node-releases: 2.0.19
-      update-browserslist-db: 1.1.3(browserslist@4.25.0)
-    dev: true
+      baseline-browser-mapping: 2.8.28
+      caniuse-lite: 1.0.30001754
+      electron-to-chromium: 1.5.252
+      node-releases: 2.0.27
+      update-browserslist-db: 1.1.4(browserslist@4.28.0)
 
-  /buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+  btoa-lite@1.0.0: {}
 
-  /buffer-crc32@1.0.0:
-    resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
-    engines: {node: '>=8.0.0'}
-    dev: true
+  buffer-crc32@0.2.13: {}
 
-  /buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+  buffer-crc32@1.0.0: {}
 
-  /buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+  buffer-equal-constant-time@1.0.1: {}
+
+  buffer-from@1.1.2: {}
+
+  buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  /buffer@6.0.3:
-    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
+  buffer@6.0.3:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  /bufferutil@4.0.9:
-    resolution: {integrity: sha512-WDtdLmJvAuNNPzByAYpRo2rF1Mmradw6gvWsQKf63476DDXmomT9zUiGypLcG4ibIM67vhAj8jJRdbmEws2Aqw==}
-    engines: {node: '>=6.14.2'}
-    requiresBuild: true
+  bufferutil@4.0.9:
     dependencies:
       node-gyp-build: 4.8.4
 
-  /buildcheck@0.0.6:
-    resolution: {integrity: sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==}
-    engines: {node: '>=10.0.0'}
-    requiresBuild: true
+  buildcheck@0.0.6:
     optional: true
 
-  /builtins@1.0.3:
-    resolution: {integrity: sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==}
-    dev: true
+  builtins@1.0.3: {}
 
-  /builtins@5.0.1:
-    resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==}
+  builtins@5.0.1:
     dependencies:
-      semver: 7.7.2
-    dev: true
+      semver: 5.7.2
 
-  /bun-types@1.1.17:
-    resolution: {integrity: sha512-Z4+OplcSd/YZq7ZsrfD00DKJeCwuNY96a1IDJyR73+cTBaFIS7SC6LhpY/W3AMEXO9iYq5NJ58WAwnwL1p5vKg==}
+  bun-types@1.1.17:
     dependencies:
-      '@types/node': 20.12.14
+      '@types/node': 20.14.14
       '@types/ws': 8.5.10
-    dev: true
 
-  /bundle-name@4.1.0:
-    resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
-    engines: {node: '>=18'}
+  bundle-name@4.1.0:
     dependencies:
       run-applescript: 7.0.0
-    dev: false
 
-  /bundle-require@5.1.0(esbuild@0.25.1):
-    resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    peerDependencies:
-      esbuild: '>=0.18'
+  bundle-require@5.1.0(esbuild@0.25.1):
     dependencies:
       esbuild: 0.25.1
       load-tsconfig: 0.2.5
-    dev: true
 
-  /busboy@1.6.0:
-    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
-    engines: {node: '>=10.16.0'}
+  busboy@1.6.0:
     dependencies:
       streamsearch: 1.1.0
-    dev: false
 
-  /byline@5.0.0:
-    resolution: {integrity: sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q==}
-    engines: {node: '>=0.10.0'}
+  byline@5.0.0: {}
 
-  /bytes@3.0.0:
-    resolution: {integrity: sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==}
-    engines: {node: '>= 0.8'}
+  bytes@3.0.0: {}
 
-  /bytes@3.1.2:
-    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
-    engines: {node: '>= 0.8'}
+  bytes@3.1.2: {}
 
-  /c12@1.11.1(magicast@0.3.4):
-    resolution: {integrity: sha512-KDU0TvSvVdaYcQKQ6iPHATGz/7p/KiVjPg4vQrB6Jg/wX9R0yl5RZxWm9IoZqaIHD2+6PZd81+KMGwRr/lRIUg==}
-    peerDependencies:
-      magicast: ^0.3.4
-    peerDependenciesMeta:
-      magicast:
-        optional: true
+  c12@1.11.1(magicast@0.3.4):
     dependencies:
       chokidar: 3.6.0
-      confbox: 0.1.7
+      confbox: 0.1.8
       defu: 6.1.4
-      dotenv: 16.4.5
+      dotenv: 16.4.7
       giget: 1.2.3
       jiti: 1.21.6
-      magicast: 0.3.4
-      mlly: 1.7.1
+      mlly: 1.7.4
       ohash: 1.1.3
       pathe: 1.1.2
       perfect-debounce: 1.0.0
-      pkg-types: 1.1.3
+      pkg-types: 1.1.3
+      rc9: 2.1.2
+    optionalDependencies:
+      magicast: 0.3.4
+
+  c12@3.1.0(magicast@0.3.5):
+    dependencies:
+      chokidar: 4.0.3
+      confbox: 0.2.2
+      defu: 6.1.4
+      dotenv: 16.6.1
+      exsolve: 1.0.7
+      giget: 2.0.0
+      jiti: 2.4.2
+      ohash: 2.0.11
+      pathe: 2.0.3
+      perfect-debounce: 1.0.0
+      pkg-types: 2.3.0
       rc9: 2.1.2
-    dev: false
-
-  /cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
-    dev: true
+    optionalDependencies:
+      magicast: 0.3.5
 
-  /cacache@15.3.0:
-    resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
-    engines: {node: '>= 10'}
-    requiresBuild: true
-    dependencies:
-      '@npmcli/fs': 1.1.1
-      '@npmcli/move-file': 1.1.2
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      glob: 7.2.3
-      infer-owner: 1.0.4
-      lru-cache: 6.0.0
-      minipass: 3.3.6
-      minipass-collect: 1.0.2
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      mkdirp: 1.0.4
-      p-map: 4.0.0
-      promise-inflight: 1.0.1
-      rimraf: 3.0.2
-      ssri: 8.0.1
-      tar: 6.2.1
-      unique-filename: 1.1.1
-    transitivePeerDependencies:
-      - bluebird
-    dev: false
-    optional: true
+  cac@6.7.14: {}
 
-  /cacache@17.1.4:
-    resolution: {integrity: sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  cacache@17.1.4:
     dependencies:
       '@npmcli/fs': 3.1.0
       fs-minipass: 3.0.3
       glob: 10.4.5
       lru-cache: 7.18.3
-      minipass: 7.0.3
-      minipass-collect: 1.0.2
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      p-map: 4.0.0
-      ssri: 10.0.5
-      tar: 6.1.13
-      unique-filename: 3.0.0
-    dev: true
-
-  /cacache@18.0.4:
-    resolution: {integrity: sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-    dependencies:
-      '@npmcli/fs': 3.1.0
-      fs-minipass: 3.0.3
-      glob: 10.4.5
-      lru-cache: 10.4.3
       minipass: 7.1.2
-      minipass-collect: 2.0.1
+      minipass-collect: 1.0.2
       minipass-flush: 1.0.5
       minipass-pipeline: 1.2.4
       p-map: 4.0.0
       ssri: 10.0.5
       tar: 6.2.1
       unique-filename: 3.0.0
-    dev: false
 
-  /cacheable-request@6.1.0:
-    resolution: {integrity: sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==}
-    engines: {node: '>=8'}
+  cacheable-request@6.1.0:
     dependencies:
       clone-response: 1.0.3
       get-stream: 5.2.0
@@ -21820,206 +32350,117 @@ packages:
       lowercase-keys: 2.0.0
       normalize-url: 4.5.1
       responselike: 1.0.2
-    dev: true
 
-  /call-bind-apply-helpers@1.0.2:
-    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
-    engines: {node: '>= 0.4'}
+  call-bind-apply-helpers@1.0.2:
     dependencies:
       es-errors: 1.3.0
       function-bind: 1.1.2
 
-  /call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
+  call-bind@1.0.7:
     dependencies:
+      es-define-property: 1.0.1
+      es-errors: 1.3.0
       function-bind: 1.1.2
       get-intrinsic: 1.3.0
-    dev: true
+      set-function-length: 1.2.2
 
-  /call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
-    engines: {node: '>= 0.4'}
+  call-bind@1.0.8:
     dependencies:
+      call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
-      es-errors: 1.3.0
-      function-bind: 1.1.2
       get-intrinsic: 1.3.0
       set-function-length: 1.2.2
 
-  /call-bound@1.0.4:
-    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
-    engines: {node: '>= 0.4'}
+  call-bound@1.0.4:
     dependencies:
       call-bind-apply-helpers: 1.0.2
       get-intrinsic: 1.3.0
 
-  /callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
+  callsites@3.1.0: {}
 
-  /camelcase-css@2.0.1:
-    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
-    engines: {node: '>= 6'}
+  camelcase-css@2.0.1: {}
 
-  /camelcase-keys@6.2.2:
-    resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
-    engines: {node: '>=8'}
+  camelcase-keys@6.2.2:
     dependencies:
       camelcase: 5.3.1
       map-obj: 4.3.0
       quick-lru: 4.0.1
-    dev: false
-
-  /camelcase@5.3.1:
-    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
-    engines: {node: '>=6'}
-    dev: false
 
-  /caniuse-lite@1.0.30001577:
-    resolution: {integrity: sha512-rs2ZygrG1PNXMfmncM0B5H1hndY5ZCC9b5TkFaVNfZ+AUlyqcMyVIQtc3fsezi0NUCk5XZfDf9WS6WxMxnfdrg==}
-    dev: true
-
-  /caniuse-lite@1.0.30001699:
-    resolution: {integrity: sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==}
-    dev: false
+  camelcase@5.3.1: {}
 
-  /caniuse-lite@1.0.30001707:
-    resolution: {integrity: sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==}
+  caniuse-lite@1.0.30001577: {}
 
-  /caniuse-lite@1.0.30001720:
-    resolution: {integrity: sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==}
-    dev: true
+  caniuse-lite@1.0.30001699: {}
 
-  /canvas@3.1.0:
-    resolution: {integrity: sha512-tTj3CqqukVJ9NgSahykNwtGda7V33VLObwrHfzT0vqJXu7J4d4C/7kQQW3fOEGDfZZoILPut5H00gOjyttPGyg==}
-    engines: {node: ^18.12.0 || >= 20.9.0}
-    requiresBuild: true
-    dependencies:
-      node-addon-api: 7.1.1
-      prebuild-install: 7.1.3
-    dev: false
+  caniuse-lite@1.0.30001707: {}
 
-  /capnp-ts@0.7.0:
-    resolution: {integrity: sha512-XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==}
-    dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
-      tslib: 2.8.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+  caniuse-lite@1.0.30001754: {}
 
-  /case-anything@2.1.13:
-    resolution: {integrity: sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==}
-    engines: {node: '>=12.13'}
-    dev: true
+  case-anything@2.1.13: {}
 
-  /caseless@0.12.0:
-    resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
-    dev: false
+  caseless@0.12.0: {}
 
-  /ccount@2.0.1:
-    resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
+  ccount@2.0.1: {}
 
-  /chai@5.2.0:
-    resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
-    engines: {node: '>=12'}
+  chai@5.2.0:
     dependencies:
       assertion-error: 2.0.1
       check-error: 2.1.1
       deep-eql: 5.0.2
       loupe: 3.1.3
       pathval: 2.0.0
-    dev: true
 
-  /chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
+  chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
 
-  /chalk@3.0.0:
-    resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
-    engines: {node: '>=8'}
+  chalk@3.0.0:
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
-    dev: false
 
-  /chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
+  chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
-  /chalk@5.2.0:
-    resolution: {integrity: sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
-    dev: false
+  chalk@5.2.0: {}
 
-  /chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+  chalk@5.3.0: {}
 
-  /char-regex@1.0.2:
-    resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
-    engines: {node: '>=10'}
-    dev: true
+  char-regex@1.0.2: {}
 
-  /character-entities-html4@2.1.0:
-    resolution: {integrity: sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==}
+  character-entities-html4@2.1.0: {}
 
-  /character-entities-legacy@3.0.0:
-    resolution: {integrity: sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==}
+  character-entities-legacy@3.0.0: {}
 
-  /character-entities@2.0.2:
-    resolution: {integrity: sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==}
+  character-entities@2.0.2: {}
 
-  /character-reference-invalid@2.0.1:
-    resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==}
+  character-reference-invalid@2.0.1: {}
 
-  /chardet@0.7.0:
-    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
-    dev: false
+  chardet@0.7.0: {}
 
-  /check-error@2.1.1:
-    resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
-    engines: {node: '>= 16'}
-    dev: true
+  check-error@2.1.1: {}
 
-  /checkpoint-client@1.1.27:
-    resolution: {integrity: sha512-xstymfUalJOv6ZvTtmkwP4ORJN36ikT4PvrIoLe3wstbYf87XIXCcZrSmbFQOjyB0v1qbBnCsAscDpfdZlCkFA==}
-    dependencies:
-      ci-info: 3.8.0
-      env-paths: 2.2.1
-      make-dir: 4.0.0
-      ms: 2.1.3
-      node-fetch: 2.6.12
-      uuid: 9.0.0
-    transitivePeerDependencies:
-      - encoding
-    dev: true
+  cheminfo-types@1.8.1: {}
 
-  /cheminfo-types@1.8.1:
-    resolution: {integrity: sha512-FRcpVkox+cRovffgqNdDFQ1eUav+i/Vq/CUd1hcfEl2bevntFlzznL+jE8g4twl6ElB7gZjCko6pYpXyMn+6dA==}
-    dev: true
+  chevrotain-allstar@0.3.1(chevrotain@11.0.3):
+    dependencies:
+      chevrotain: 11.0.3
+      lodash-es: 4.17.21
 
-  /chevrotain@10.5.0:
-    resolution: {integrity: sha512-Pkv5rBY3+CsHOYfV5g/Vs5JY9WTHHDEKOlohI2XeygaZhUeqhAlldZ8Hz9cRmxu709bvS08YzxHdTPHhffc13A==}
+  chevrotain@11.0.3:
     dependencies:
-      '@chevrotain/cst-dts-gen': 10.5.0
-      '@chevrotain/gast': 10.5.0
-      '@chevrotain/types': 10.5.0
-      '@chevrotain/utils': 10.5.0
-      lodash: 4.17.21
-      regexp-to-ast: 0.5.0
-    dev: true
+      '@chevrotain/cst-dts-gen': 11.0.3
+      '@chevrotain/gast': 11.0.3
+      '@chevrotain/regexp-to-ast': 11.0.3
+      '@chevrotain/types': 11.0.3
+      '@chevrotain/utils': 11.0.3
+      lodash-es: 4.17.21
 
-  /chokidar@3.5.3:
-    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
-    engines: {node: '>= 8.10.0'}
+  chokidar@3.5.3:
     dependencies:
       anymatch: 3.1.3
       braces: 3.0.3
@@ -22030,11 +32471,8 @@ packages:
       readdirp: 3.6.0
     optionalDependencies:
       fsevents: 2.3.3
-    dev: false
 
-  /chokidar@3.6.0:
-    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
-    engines: {node: '>= 8.10.0'}
+  chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
       braces: 3.0.3
@@ -22046,103 +32484,57 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /chokidar@4.0.3:
-    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
-    engines: {node: '>= 14.16.0'}
+  chokidar@4.0.3:
     dependencies:
       readdirp: 4.1.2
-    dev: true
 
-  /chownr@1.1.4:
-    resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+  chownr@1.1.4: {}
 
-  /chownr@2.0.0:
-    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
-    engines: {node: '>=10'}
+  chownr@2.0.0: {}
 
-  /chownr@3.0.0:
-    resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
-    engines: {node: '>=18'}
-    dev: false
+  chownr@3.0.0: {}
 
-  /chrome-trace-event@1.0.3:
-    resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==}
-    engines: {node: '>=6.0'}
-    dev: false
+  chrome-trace-event@1.0.3: {}
 
-  /chrome-trace-event@1.0.4:
-    resolution: {integrity: sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==}
-    engines: {node: '>=6.0'}
-    dev: true
+  chrome-trace-event@1.0.4: {}
 
-  /chromium-bidi@0.6.5(devtools-protocol@0.0.1342118):
-    resolution: {integrity: sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==}
-    peerDependencies:
-      devtools-protocol: '*'
+  chromium-bidi@7.2.0(devtools-protocol@0.0.1464554):
     dependencies:
-      devtools-protocol: 0.0.1342118
+      devtools-protocol: 0.0.1464554
       mitt: 3.0.1
-      urlpattern-polyfill: 10.0.0
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /ci-info@3.8.0:
-    resolution: {integrity: sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==}
-    engines: {node: '>=8'}
+  ci-info@3.8.0: {}
 
-  /citty@0.1.6:
-    resolution: {integrity: sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==}
+  citty@0.1.6:
     dependencies:
       consola: 3.4.2
-    dev: false
 
-  /cjs-module-lexer@1.2.3:
-    resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==}
+  cjs-module-lexer@1.2.3: {}
 
-  /class-variance-authority@0.5.2(typescript@5.5.4):
-    resolution: {integrity: sha512-j7Qqw3NPbs4IpO80gvdACWmVvHiLLo5MECacUBLnJG17CrLpWaQ7/4OaWX6P0IO1j2nvZ7AuSfBS/ImtEUZJGA==}
-    peerDependencies:
-      typescript: '>= 4.5.5 < 6'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
+  class-variance-authority@0.5.2(typescript@5.5.4):
+    optionalDependencies:
       typescript: 5.5.4
-    dev: false
 
-  /class-variance-authority@0.7.0:
-    resolution: {integrity: sha512-jFI8IQw4hczaL4ALINxqLEXQbWcNjoSkloa4IaufXCJr6QawJyw7tuRysRsrE8w2p/4gGaxKIt/hX3qz/IbD1A==}
+  class-variance-authority@0.7.0:
     dependencies:
       clsx: 2.0.0
-    dev: false
 
-  /class-variance-authority@0.7.1:
-    resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
+  class-variance-authority@0.7.1:
     dependencies:
       clsx: 2.1.1
-    dev: false
 
-  /clean-stack@2.2.0:
-    resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
-    engines: {node: '>=6'}
+  clean-stack@2.2.0: {}
 
-  /clean-stack@4.2.0:
-    resolution: {integrity: sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==}
-    engines: {node: '>=12'}
+  clean-stack@4.2.0:
     dependencies:
       escape-string-regexp: 5.0.0
-    dev: true
 
-  /cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
+  cli-cursor@3.1.0:
     dependencies:
       restore-cursor: 3.1.0
 
-  /cli-highlight@2.1.11:
-    resolution: {integrity: sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==}
-    engines: {node: '>=8.0.0', npm: '>=5.0.0'}
-    hasBin: true
+  cli-highlight@2.1.11:
     dependencies:
       chalk: 4.1.2
       highlight.js: 10.7.3
@@ -22151,243 +32543,135 @@ packages:
       parse5-htmlparser2-tree-adapter: 6.0.1
       yargs: 16.2.0
 
-  /cli-spinners@2.9.2:
-    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
-    engines: {node: '>=6'}
+  cli-spinners@2.9.2: {}
 
-  /cli-table3@0.6.3:
-    resolution: {integrity: sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==}
-    engines: {node: 10.* || >= 12.*}
+  cli-table3@0.6.3:
     dependencies:
       string-width: 4.2.3
     optionalDependencies:
       '@colors/colors': 1.5.0
-    dev: false
 
-  /cli-table3@0.6.5:
-    resolution: {integrity: sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==}
-    engines: {node: 10.* || >= 12.*}
+  cli-table3@0.6.5:
     dependencies:
       string-width: 4.2.3
     optionalDependencies:
       '@colors/colors': 1.5.0
-    dev: true
-
-  /cli-truncate@2.1.0:
-    resolution: {integrity: sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==}
-    engines: {node: '>=8'}
-    dependencies:
-      slice-ansi: 3.0.0
-      string-width: 4.2.3
-    dev: true
-
-  /cli-width@4.1.0:
-    resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
-    engines: {node: '>= 12'}
-    dev: false
 
-  /client-only@0.0.1:
-    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+  client-only@0.0.1: {}
 
-  /cliui@6.0.0:
-    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+  cliui@6.0.0:
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 6.2.0
-    dev: false
 
-  /cliui@7.0.4:
-    resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==}
+  cliui@7.0.4:
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  /cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
+  cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
 
-  /clone-response@1.0.3:
-    resolution: {integrity: sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==}
+  clone-response@1.0.3:
     dependencies:
       mimic-response: 1.0.1
-    dev: true
 
-  /clone@1.0.4:
-    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: '>=0.8'}
+  clone@1.0.4: {}
 
-  /clsx@1.2.1:
-    resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
-    engines: {node: '>=6'}
-    dev: false
+  clsx@1.2.1: {}
 
-  /clsx@2.0.0:
-    resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==}
-    engines: {node: '>=6'}
-    dev: false
+  clsx@2.0.0: {}
 
-  /clsx@2.1.0:
-    resolution: {integrity: sha512-m3iNNWpd9rl3jvvcBnu70ylMdrXt8Vlq4HYadnU5fwcOtvkSQWPmj7amUcDT2qYI7risszBjI5AUIUox9D16pg==}
-    engines: {node: '>=6'}
-    dev: false
+  clsx@2.1.0: {}
 
-  /clsx@2.1.1:
-    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
-    engines: {node: '>=6'}
+  clsx@2.1.1: {}
 
-  /cluster-key-slot@1.1.2:
-    resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  cluster-key-slot@1.1.2: {}
 
-  /codemirror@6.0.1:
-    resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==}
+  codemirror@6.0.2(@lezer/common@1.3.0):
     dependencies:
-      '@codemirror/autocomplete': 6.18.6
-      '@codemirror/commands': 6.8.1
-      '@codemirror/language': 6.11.1
-      '@codemirror/lint': 6.8.5
-      '@codemirror/search': 6.5.11
-      '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.37.1
-    dev: false
+      '@codemirror/autocomplete': 6.4.0(@codemirror/language@6.3.2)(@codemirror/state@6.2.0)(@codemirror/view@6.7.2)(@lezer/common@1.3.0)
+      '@codemirror/commands': 6.1.3
+      '@codemirror/language': 6.3.2
+      '@codemirror/lint': 6.4.2
+      '@codemirror/search': 6.2.3
+      '@codemirror/state': 6.2.0
+      '@codemirror/view': 6.7.2
+    transitivePeerDependencies:
+      - '@lezer/common'
 
-  /color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+  color-convert@1.9.3:
     dependencies:
       color-name: 1.1.3
 
-  /color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
+  color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
 
-  /color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+  color-name@1.1.3: {}
 
-  /color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-    requiresBuild: true
+  color-name@1.1.4: {}
 
-  /color-string@1.9.1:
-    resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==}
+  color-string@1.9.1:
     dependencies:
       color-name: 1.1.4
       simple-swizzle: 0.2.2
-    dev: false
-
-  /color-support@1.1.3:
-    resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==}
-    hasBin: true
-    requiresBuild: true
-    dev: false
-    optional: true
 
-  /color@3.2.1:
-    resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
+  color@3.2.1:
     dependencies:
       color-convert: 1.9.3
       color-string: 1.9.1
-    dev: false
 
-  /color@4.2.3:
-    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
-    engines: {node: '>=12.5.0'}
-    requiresBuild: true
+  color@4.2.3:
     dependencies:
       color-convert: 2.0.1
       color-string: 1.9.1
-    dev: false
+    optional: true
 
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
+  combined-stream@1.0.8:
     dependencies:
       delayed-stream: 1.0.0
 
-  /comma-separated-tokens@2.0.3:
-    resolution: {integrity: sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==}
-
-  /commander@10.0.1:
-    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
-    engines: {node: '>=14'}
+  comma-separated-tokens@2.0.3: {}
 
-  /commander@11.1.0:
-    resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==}
-    engines: {node: '>=16'}
-    dev: false
+  commander@10.0.1: {}
 
-  /commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+  commander@11.1.0: {}
 
-  /commander@4.1.1:
-    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
-    engines: {node: '>= 6'}
+  commander@2.20.3: {}
 
-  /commander@5.1.0:
-    resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
-    engines: {node: '>= 6'}
-    dev: false
+  commander@4.1.1: {}
 
-  /commander@7.2.0:
-    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
-    engines: {node: '>= 10'}
-    dev: true
+  commander@5.1.0: {}
 
-  /commander@9.5.0:
-    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
-    engines: {node: ^12.20.0 || >=14}
-    dev: false
+  commander@7.2.0: {}
 
-  /commondir@1.0.1:
-    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
-    dev: true
+  commander@8.3.0: {}
 
-  /compare-versions@6.1.1:
-    resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
-    dev: false
+  commander@9.5.0: {}
 
-  /component-emitter@1.3.1:
-    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
-    dev: true
+  compare-versions@6.1.1: {}
 
-  /compress-commons@4.1.2:
-    resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
-    engines: {node: '>= 10'}
-    dependencies:
-      buffer-crc32: 0.2.13
-      crc32-stream: 4.0.3
-      normalize-path: 3.0.0
-      readable-stream: 3.6.2
-    dev: true
+  component-emitter@1.3.1: {}
 
-  /compress-commons@6.0.2:
-    resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
-    engines: {node: '>= 14'}
+  compress-commons@6.0.2:
     dependencies:
       crc-32: 1.2.2
       crc32-stream: 6.0.0
       is-stream: 2.0.1
       normalize-path: 3.0.0
       readable-stream: 4.7.0
-    dev: true
 
-  /compressible@2.0.18:
-    resolution: {integrity: sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==}
-    engines: {node: '>= 0.6'}
+  compressible@2.0.18:
     dependencies:
       mime-db: 1.52.0
 
-  /compression@1.7.4:
-    resolution: {integrity: sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==}
-    engines: {node: '>= 0.8.0'}
+  compression@1.7.4:
     dependencies:
       accepts: 1.3.8
       bytes: 3.0.0
@@ -22399,213 +32683,125 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /compute-cosine-similarity@1.1.0:
-    resolution: {integrity: sha512-FXhNx0ILLjGi9Z9+lglLzM12+0uoTnYkHm7GiadXDAr0HGVLm25OivUS1B/LPkbzzvlcXz/1EvWg9ZYyJSdhTw==}
+  compute-cosine-similarity@1.1.0:
     dependencies:
       compute-dot: 1.1.0
       compute-l2norm: 1.1.0
       validate.io-array: 1.0.6
       validate.io-function: 1.0.2
-    dev: true
 
-  /compute-dot@1.1.0:
-    resolution: {integrity: sha512-L5Ocet4DdMrXboss13K59OK23GXjiSia7+7Ukc7q4Bl+RVpIXK2W9IHMbWDZkh+JUEvJAwOKRaJDiFUa1LTnJg==}
+  compute-dot@1.1.0:
     dependencies:
       validate.io-array: 1.0.6
       validate.io-function: 1.0.2
-    dev: true
 
-  /compute-l2norm@1.1.0:
-    resolution: {integrity: sha512-6EHh1Elj90eU28SXi+h2PLnTQvZmkkHWySpoFz+WOlVNLz3DQoC4ISUHSV9n5jMxPHtKGJ01F4uu2PsXBB8sSg==}
+  compute-l2norm@1.1.0:
     dependencies:
       validate.io-array: 1.0.6
       validate.io-function: 1.0.2
-    dev: true
 
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+  concat-map@0.0.1: {}
 
-  /confbox@0.1.7:
-    resolution: {integrity: sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==}
+  confbox@0.1.8: {}
 
-  /confbox@0.1.8:
-    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
-    dev: false
+  confbox@0.2.2: {}
 
-  /config-chain@1.1.13:
-    resolution: {integrity: sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==}
+  config-chain@1.1.13:
     dependencies:
       ini: 1.3.8
       proto-list: 1.2.4
-    dev: false
-
-  /consola@3.2.3:
-    resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
-    engines: {node: ^14.18.0 || >=16.10.0}
-    dev: false
 
-  /consola@3.4.2:
-    resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==}
-    engines: {node: ^14.18.0 || >=16.10.0}
-
-  /console-control-strings@1.1.0:
-    resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
-    requiresBuild: true
-    dev: false
-    optional: true
+  consola@3.4.2: {}
 
-  /content-disposition@0.5.4:
-    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
-    engines: {node: '>= 0.6'}
+  content-disposition@0.5.4:
     dependencies:
       safe-buffer: 5.2.1
 
-  /content-disposition@1.0.0:
-    resolution: {integrity: sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg==}
-    engines: {node: '>= 0.6'}
+  content-disposition@1.0.0:
     dependencies:
       safe-buffer: 5.2.1
-    dev: false
-
-  /content-type@1.0.5:
-    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
-    engines: {node: '>= 0.6'}
-
-  /convert-source-map@1.9.0:
-    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
 
-  /convert-source-map@2.0.0:
-    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
-    dev: false
+  content-type@1.0.5: {}
 
-  /cookie-signature@1.0.6:
-    resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
+  convert-source-map@1.9.0: {}
 
-  /cookie-signature@1.2.0:
-    resolution: {integrity: sha512-R0BOPfLGTitaKhgKROKZQN6iyq2iDQcH1DOF8nJoaWapguX5bC2w+Q/I9NmmM5lfcvEarnLZr+cCvmEYYSXvYA==}
-    engines: {node: '>=6.6.0'}
+  cookie-signature@1.0.6: {}
 
-  /cookie-signature@1.2.2:
-    resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
-    engines: {node: '>=6.6.0'}
-    dev: false
+  cookie-signature@1.2.0: {}
 
-  /cookie@0.4.2:
-    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
-    engines: {node: '>= 0.6'}
+  cookie-signature@1.2.2: {}
 
-  /cookie@0.5.0:
-    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
-    engines: {node: '>= 0.6'}
-    dev: false
+  cookie@0.4.2: {}
 
-  /cookie@0.6.0:
-    resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==}
-    engines: {node: '>= 0.6'}
+  cookie@0.6.0: {}
 
-  /cookie@0.7.1:
-    resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
-    engines: {node: '>= 0.6'}
-    dev: false
+  cookie@0.7.1: {}
 
-  /cookie@1.0.2:
-    resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==}
-    engines: {node: '>=18'}
-    dev: true
+  cookie@1.0.2: {}
 
-  /cookiejar@2.1.4:
-    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
-    dev: true
+  cookiejar@2.1.4: {}
 
-  /copy-anything@3.0.5:
-    resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
-    engines: {node: '>=12.13'}
+  copy-anything@3.0.5:
     dependencies:
       is-what: 4.1.16
-    dev: false
 
-  /copy-to-clipboard@3.3.3:
-    resolution: {integrity: sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==}
+  copy-to-clipboard@3.3.3:
     dependencies:
       toggle-selection: 1.0.6
-    dev: false
 
-  /core-util-is@1.0.2:
-    resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
-    dev: false
+  core-util-is@1.0.2: {}
 
-  /core-util-is@1.0.3:
-    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
-    dev: true
+  core-util-is@1.0.3: {}
 
-  /cors@2.8.5:
-    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
-    engines: {node: '>= 0.10'}
+  cors@2.8.5:
     dependencies:
       object-assign: 4.1.1
       vary: 1.1.2
 
-  /cosmiconfig@8.3.6(typescript@5.5.4):
-    resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      typescript: '>=4.9.5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  cose-base@1.0.3:
+    dependencies:
+      layout-base: 1.0.2
+
+  cose-base@2.2.0:
+    dependencies:
+      layout-base: 2.0.1
+
+  cosmiconfig@8.3.6(typescript@5.5.4):
     dependencies:
       import-fresh: 3.3.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       parse-json: 5.2.0
       path-type: 4.0.0
+    optionalDependencies:
       typescript: 5.5.4
-    dev: false
 
-  /cosmiconfig@9.0.0(typescript@5.5.4):
-    resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      typescript: '>=4.9.5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  cosmiconfig@9.0.0(typescript@5.5.4):
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       parse-json: 5.2.0
+    optionalDependencies:
       typescript: 5.5.4
 
-  /cp-file@10.0.0:
-    resolution: {integrity: sha512-vy2Vi1r2epK5WqxOLnskeKeZkdZvTKfFZQCplE3XWsP+SUJyd5XAUFC9lFgTjjXJF2GMne/UML14iEmkAaDfFg==}
-    engines: {node: '>=14.16'}
+  cp-file@10.0.0:
     dependencies:
       graceful-fs: 4.2.11
       nested-error-stacks: 2.1.1
       p-event: 5.0.1
-    dev: true
 
-  /cpu-features@0.0.10:
-    resolution: {integrity: sha512-9IkYqtX3YHPCzoVg1Py+o9057a3i0fp7S530UWokCSaFVTc7CwXPRiOjRjBQQ18ZCNafx78YfnG+HALxtVmOGA==}
-    engines: {node: '>=10.0.0'}
-    requiresBuild: true
+  cpu-features@0.0.10:
     dependencies:
       buildcheck: 0.0.6
-      nan: 2.22.2
+      nan: 2.23.1
     optional: true
 
-  /cpy-cli@5.0.0:
-    resolution: {integrity: sha512-fb+DZYbL9KHc0BC4NYqGRrDIJZPXUmjjtqdw4XRRg8iV8dIfghUX/WiL+q4/B/KFTy3sK6jsbUhBaz0/Hxg7IQ==}
-    engines: {node: '>=16'}
-    hasBin: true
+  cpy-cli@5.0.0:
     dependencies:
       cpy: 10.1.0
       meow: 12.1.1
-    dev: true
 
-  /cpy@10.1.0:
-    resolution: {integrity: sha512-VC2Gs20JcTyeQob6UViBLnyP0bYHkBh6EiKzot9vi2DmeGlFT9Wd7VG3NBrkNx/jYvFBeyDOMMHdHQhbtKLgHQ==}
-    engines: {node: '>=16'}
+  cpy@10.1.0:
     dependencies:
       arrify: 3.0.0
       cp-file: 10.0.0
@@ -22615,122 +32811,43 @@ packages:
       nested-error-stacks: 2.1.1
       p-filter: 3.0.0
       p-map: 6.0.0
-    dev: true
-
-  /crc-32@1.2.2:
-    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-    dev: true
 
-  /crc32-stream@4.0.3:
-    resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
-    engines: {node: '>= 10'}
-    dependencies:
-      crc-32: 1.2.2
-      readable-stream: 3.6.2
-    dev: true
+  crc-32@1.2.2: {}
 
-  /crc32-stream@6.0.0:
-    resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==}
-    engines: {node: '>= 14'}
+  crc32-stream@6.0.0:
     dependencies:
       crc-32: 1.2.2
       readable-stream: 4.7.0
-    dev: true
 
-  /create-require@1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
+  crelt@1.0.6: {}
 
-  /crelt@1.0.5:
-    resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
-    dev: false
-
-  /crelt@1.0.6:
-    resolution: {integrity: sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==}
-    dev: false
-
-  /cron-parser@4.9.0:
-    resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
-    engines: {node: '>=12.0.0'}
+  cron-parser@4.9.0:
     dependencies:
       luxon: 3.2.1
-    dev: false
 
-  /cronstrue@2.21.0:
-    resolution: {integrity: sha512-YxabE1ZSHA1zJZMPCTSEbc0u4cRRenjqqTgCwJT7OvkspPSvfYFITuPFtsT+VkBuavJtFv2kJXT+mKSnlUJxfg==}
-    hasBin: true
-    dev: false
+  cronstrue@2.21.0: {}
 
-  /cronstrue@2.61.0:
-    resolution: {integrity: sha512-ootN5bvXbIQI9rW94+QsXN5eROtXWwew6NkdGxIRpS/UFWRggL0G5Al7a9GTBFEsuvVhJ2K3CntIIVt7L2ILhA==}
-    hasBin: true
-    dev: false
+  cronstrue@2.61.0: {}
 
-  /cross-env@7.0.3:
-    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
-    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
-    hasBin: true
+  cross-env@7.0.3:
     dependencies:
       cross-spawn: 7.0.5
-    dev: false
 
-  /cross-spawn@5.1.0:
-    resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
-    dependencies:
-      lru-cache: 4.1.5
-      shebang-command: 1.2.0
-      which: 1.3.1
-
-  /cross-spawn@6.0.5:
-    resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==}
-    engines: {node: '>=4.8'}
-    dependencies:
-      nice-try: 1.0.5
-      path-key: 2.0.1
-      semver: 5.7.1
-      shebang-command: 1.2.0
-      which: 1.3.1
-    dev: true
-
-  /cross-spawn@7.0.5:
-    resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==}
-    engines: {node: '>= 8'}
+  cross-spawn@7.0.5:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
       which: 2.0.2
 
-  /crypto-js@4.1.1:
-    resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
-    dev: false
-
-  /crypto-js@4.2.0:
-    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
-    dev: false
+  crypto-js@4.1.1: {}
 
-  /crypto-random-string@2.0.0:
-    resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
-    engines: {node: '>=8'}
-    dev: true
+  crypto-js@4.2.0: {}
 
-  /css-in-js-utils@3.1.0:
-    resolution: {integrity: sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==}
+  css-in-js-utils@3.1.0:
     dependencies:
       hyphenate-style-name: 1.0.4
-    dev: false
 
-  /css-loader@6.10.0(webpack@5.99.9):
-    resolution: {integrity: sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      '@rspack/core': 0.x || 1.x
-      webpack: ^5.0.0
-    peerDependenciesMeta:
-      '@rspack/core':
-        optional: true
-      webpack:
-        optional: true
+  css-loader@6.10.0(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.35)
       postcss: 8.4.35
@@ -22739,553 +32856,456 @@ packages:
       postcss-modules-scope: 3.1.1(postcss@8.4.35)
       postcss-modules-values: 4.0.0(postcss@8.4.35)
       postcss-value-parser: 4.2.0
-      semver: 7.6.3
-      webpack: 5.99.9(@swc/core@1.3.26)(esbuild@0.15.18)
-    dev: true
+      semver: 5.7.2
+    optionalDependencies:
+      webpack: 5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)
 
-  /css-tree@1.1.3:
-    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
-    engines: {node: '>=8.0.0'}
+  css-tree@1.1.3:
     dependencies:
       mdn-data: 2.0.14
       source-map: 0.6.1
-    dev: false
 
-  /css-unit-converter@1.1.2:
-    resolution: {integrity: sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==}
-    dev: false
+  css-unit-converter@1.1.2: {}
 
-  /css-what@5.1.0:
-    resolution: {integrity: sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==}
-    engines: {node: '>= 6'}
-    dev: true
+  css-what@5.1.0: {}
 
-  /css.escape@1.5.1:
-    resolution: {integrity: sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==}
-    dev: false
+  css.escape@1.5.1: {}
 
-  /cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
+  cssesc@3.0.0: {}
 
-  /csstype@3.1.1:
-    resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
-    dev: true
+  csstype@3.1.1: {}
 
-  /csstype@3.1.3:
-    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+  csstype@3.1.3: {}
 
-  /csv-generate@3.4.3:
-    resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==}
-    dev: false
+  csstype@3.2.0: {}
 
-  /csv-parse@4.16.3:
-    resolution: {integrity: sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg==}
-    dev: false
+  csv-generate@3.4.3: {}
 
-  /csv-stringify@5.6.5:
-    resolution: {integrity: sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A==}
-    dev: false
+  csv-parse@4.16.3: {}
 
-  /csv@5.5.3:
-    resolution: {integrity: sha512-QTaY0XjjhTQOdguARF0lGKm5/mEq9PD9/VhZZegHDIBq2tQwgNpHc3dneD4mGo2iJs+fTKv5Bp0fZ+BRuY3Z0g==}
-    engines: {node: '>= 0.1.90'}
+  csv-stringify@5.6.5: {}
+
+  csv@5.5.3:
     dependencies:
       csv-generate: 3.4.3
       csv-parse: 4.16.3
       csv-stringify: 5.6.5
       stream-transform: 2.1.3
-    dev: false
 
-  /cuid@2.1.8:
-    resolution: {integrity: sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==}
-    dev: false
+  cuid@2.1.8: {}
 
-  /d3-array@3.2.4:
-    resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
-    engines: {node: '>=12'}
+  cytoscape-cose-bilkent@4.1.0(cytoscape@3.33.1):
+    dependencies:
+      cose-base: 1.0.3
+      cytoscape: 3.33.1
+
+  cytoscape-fcose@2.2.0(cytoscape@3.33.1):
+    dependencies:
+      cose-base: 2.2.0
+      cytoscape: 3.33.1
+
+  cytoscape@3.33.1: {}
+
+  d3-array@2.12.1:
+    dependencies:
+      internmap: 1.0.1
+
+  d3-array@3.2.4:
     dependencies:
       internmap: 2.0.3
-    dev: false
 
-  /d3-color@3.1.0:
-    resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
-    engines: {node: '>=12'}
-    dev: false
+  d3-axis@3.0.0: {}
 
-  /d3-ease@3.0.1:
-    resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
-    engines: {node: '>=12'}
-    dev: false
+  d3-brush@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-transition: 3.0.1(d3-selection@3.0.0)
 
-  /d3-format@3.1.0:
-    resolution: {integrity: sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==}
-    engines: {node: '>=12'}
-    dev: false
+  d3-chord@3.0.1:
+    dependencies:
+      d3-path: 3.1.0
 
-  /d3-interpolate@3.0.1:
-    resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
-    engines: {node: '>=12'}
+  d3-color@3.1.0: {}
+
+  d3-contour@4.0.2:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-delaunay@6.0.4:
+    dependencies:
+      delaunator: 5.0.1
+
+  d3-dispatch@3.0.1: {}
+
+  d3-drag@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-selection: 3.0.0
+
+  d3-dsv@3.0.1:
+    dependencies:
+      commander: 7.2.0
+      iconv-lite: 0.6.3
+      rw: 1.3.3
+
+  d3-ease@3.0.1: {}
+
+  d3-fetch@3.0.1:
+    dependencies:
+      d3-dsv: 3.0.1
+
+  d3-force@3.0.0:
+    dependencies:
+      d3-dispatch: 3.0.1
+      d3-quadtree: 3.0.1
+      d3-timer: 3.0.1
+
+  d3-format@3.1.0: {}
+
+  d3-geo@3.1.1:
+    dependencies:
+      d3-array: 3.2.4
+
+  d3-hierarchy@3.1.2: {}
+
+  d3-interpolate@3.0.1:
     dependencies:
       d3-color: 3.1.0
-    dev: false
 
-  /d3-path@3.1.0:
-    resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
-    engines: {node: '>=12'}
-    dev: false
+  d3-path@1.0.9: {}
 
-  /d3-scale@4.0.2:
-    resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
-    engines: {node: '>=12'}
+  d3-path@3.1.0: {}
+
+  d3-polygon@3.0.1: {}
+
+  d3-quadtree@3.0.1: {}
+
+  d3-random@3.0.1: {}
+
+  d3-sankey@0.12.3:
+    dependencies:
+      d3-array: 2.12.1
+      d3-shape: 1.3.7
+
+  d3-scale-chromatic@3.1.0:
+    dependencies:
+      d3-color: 3.1.0
+      d3-interpolate: 3.0.1
+
+  d3-scale@4.0.2:
     dependencies:
       d3-array: 3.2.4
       d3-format: 3.1.0
       d3-interpolate: 3.0.1
       d3-time: 3.1.0
       d3-time-format: 4.1.0
-    dev: false
 
-  /d3-shape@3.2.0:
-    resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
-    engines: {node: '>=12'}
+  d3-selection@3.0.0: {}
+
+  d3-shape@1.3.7:
+    dependencies:
+      d3-path: 1.0.9
+
+  d3-shape@3.2.0:
     dependencies:
       d3-path: 3.1.0
-    dev: false
 
-  /d3-time-format@4.1.0:
-    resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==}
-    engines: {node: '>=12'}
+  d3-time-format@4.1.0:
     dependencies:
       d3-time: 3.1.0
-    dev: false
 
-  /d3-time@3.1.0:
-    resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
-    engines: {node: '>=12'}
+  d3-time@3.1.0:
     dependencies:
       d3-array: 3.2.4
-    dev: false
 
-  /d3-timer@3.0.1:
-    resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
-    engines: {node: '>=12'}
-    dev: false
+  d3-timer@3.0.1: {}
 
-  /damerau-levenshtein@1.0.8:
-    resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
-    dev: true
+  d3-transition@3.0.1(d3-selection@3.0.0):
+    dependencies:
+      d3-color: 3.1.0
+      d3-dispatch: 3.0.1
+      d3-ease: 3.0.1
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-timer: 3.0.1
 
-  /dashdash@1.14.1:
-    resolution: {integrity: sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==}
-    engines: {node: '>=0.10'}
+  d3-zoom@3.0.0:
     dependencies:
-      assert-plus: 1.0.0
-    dev: false
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-interpolate: 3.0.1
+      d3-selection: 3.0.0
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+
+  d3@7.9.0:
+    dependencies:
+      d3-array: 3.2.4
+      d3-axis: 3.0.0
+      d3-brush: 3.0.0
+      d3-chord: 3.0.1
+      d3-color: 3.1.0
+      d3-contour: 4.0.2
+      d3-delaunay: 6.0.4
+      d3-dispatch: 3.0.1
+      d3-drag: 3.0.0
+      d3-dsv: 3.0.1
+      d3-ease: 3.0.1
+      d3-fetch: 3.0.1
+      d3-force: 3.0.0
+      d3-format: 3.1.0
+      d3-geo: 3.1.1
+      d3-hierarchy: 3.1.2
+      d3-interpolate: 3.0.1
+      d3-path: 3.1.0
+      d3-polygon: 3.0.1
+      d3-quadtree: 3.0.1
+      d3-random: 3.0.1
+      d3-scale: 4.0.2
+      d3-scale-chromatic: 3.1.0
+      d3-selection: 3.0.0
+      d3-shape: 3.2.0
+      d3-time: 3.1.0
+      d3-time-format: 4.1.0
+      d3-timer: 3.0.1
+      d3-transition: 3.0.1(d3-selection@3.0.0)
+      d3-zoom: 3.0.0
 
-  /data-uri-to-buffer@2.0.2:
-    resolution: {integrity: sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==}
-    dev: false
+  dagre-d3-es@7.0.11:
+    dependencies:
+      d3: 7.9.0
+      lodash-es: 4.17.21
 
-  /data-uri-to-buffer@3.0.1:
-    resolution: {integrity: sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==}
-    engines: {node: '>= 6'}
+  damerau-levenshtein@1.0.8: {}
 
-  /data-uri-to-buffer@5.0.1:
-    resolution: {integrity: sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==}
-    engines: {node: '>= 14'}
-    dev: false
+  dashdash@1.14.1:
+    dependencies:
+      assert-plus: 1.0.0
 
-  /data-view-buffer@1.0.1:
-    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
-    engines: {node: '>= 0.4'}
+  data-uri-to-buffer@3.0.1: {}
+
+  data-uri-to-buffer@5.0.1: {}
+
+  data-view-buffer@1.0.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       es-errors: 1.3.0
       is-data-view: 1.0.1
-    dev: true
 
-  /data-view-byte-length@1.0.1:
-    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
-    engines: {node: '>= 0.4'}
+  data-view-byte-length@1.0.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       es-errors: 1.3.0
       is-data-view: 1.0.1
-    dev: true
 
-  /data-view-byte-offset@1.0.0:
-    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
-    engines: {node: '>= 0.4'}
+  data-view-byte-offset@1.0.0:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       es-errors: 1.3.0
       is-data-view: 1.0.1
-    dev: true
 
-  /dataloader@1.4.0:
-    resolution: {integrity: sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==}
-    dev: false
+  dataloader@1.4.0: {}
 
-  /date-fns@3.6.0:
-    resolution: {integrity: sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==}
-    dev: false
+  date-fns-jalali@4.1.0-0: {}
 
-  /date-fns@4.1.0:
-    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
-    dev: false
+  date-fns@4.1.0: {}
 
-  /dayjs@1.11.13:
-    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
-    dev: false
+  dayjs@1.11.18: {}
 
-  /debounce@1.2.1:
-    resolution: {integrity: sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==}
-    dev: true
+  debounce@1.2.1: {}
 
-  /debounce@2.0.0:
-    resolution: {integrity: sha512-xRetU6gL1VJbs85Mc4FoEGSjQxzpdxRyFhe3lmWFyy2EzydIcD4xzUvRJMD+NPDfMwKNhxa3PvsIOU32luIWeA==}
-    engines: {node: '>=18'}
-    dev: false
+  debounce@2.0.0: {}
 
-  /debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@2.6.9:
     dependencies:
       ms: 2.0.0
 
-  /debug@3.2.7:
-    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@3.2.7:
     dependencies:
       ms: 2.1.3
-    dev: true
 
-  /debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@4.3.4:
     dependencies:
       ms: 2.1.2
 
-  /debug@4.3.6(supports-color@10.0.0):
-    resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@4.3.6(supports-color@10.0.0):
     dependencies:
       ms: 2.1.2
-      supports-color: 10.0.0
-    dev: false
-
-  /debug@4.3.7(supports-color@10.0.0):
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+    optionalDependencies:
+      supports-color: 10.0.0
+
+  debug@4.3.7(supports-color@10.0.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
       supports-color: 10.0.0
 
-  /debug@4.4.0(supports-color@10.0.0):
-    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
+  debug@4.4.1(supports-color@10.0.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
       supports-color: 10.0.0
 
-  /decamelize-keys@1.1.1:
-    resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==}
-    engines: {node: '>=0.10.0'}
+  debug@4.4.3:
+    dependencies:
+      ms: 2.1.3
+
+  decamelize-keys@1.1.1:
     dependencies:
       decamelize: 1.2.0
       map-obj: 1.0.1
-    dev: false
 
-  /decamelize@1.2.0:
-    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  decamelize@1.2.0: {}
 
-  /decimal.js-light@2.5.1:
-    resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
-    dev: false
+  decimal.js-light@2.5.1: {}
 
-  /decode-named-character-reference@1.0.2:
-    resolution: {integrity: sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==}
+  decimal.js@10.6.0: {}
+
+  decode-named-character-reference@1.0.2:
     dependencies:
       character-entities: 2.0.2
 
-  /decompress-response@3.3.0:
-    resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==}
-    engines: {node: '>=4'}
+  decompress-response@3.3.0:
     dependencies:
       mimic-response: 1.0.1
-    dev: true
 
-  /decompress-response@6.0.0:
-    resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
-    engines: {node: '>=10'}
+  decompress-response@6.0.0:
     dependencies:
       mimic-response: 3.1.0
 
-  /deep-eql@5.0.2:
-    resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
-    engines: {node: '>=6'}
-    dev: true
+  deep-eql@5.0.2: {}
 
-  /deep-extend@0.6.0:
-    resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
-    engines: {node: '>=4.0.0'}
+  deep-extend@0.6.0: {}
 
-  /deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+  deep-is@0.1.4: {}
 
-  /deep-object-diff@1.1.9:
-    resolution: {integrity: sha512-Rn+RuwkmkDwCi2/oXOFS9Gsr5lJZu/yTGpK7wAaAIE75CC+LCGEZHpY6VQJa/RoJcrmaA/docWJZvYohlNkWPA==}
-    dev: true
+  deep-object-diff@1.1.9: {}
 
-  /deepmerge@4.3.1:
-    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
-    engines: {node: '>=0.10.0'}
+  deepmerge-ts@7.1.5: {}
 
-  /default-browser-id@5.0.0:
-    resolution: {integrity: sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==}
-    engines: {node: '>=18'}
-    dev: false
+  deepmerge@4.3.1: {}
 
-  /default-browser@5.2.1:
-    resolution: {integrity: sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==}
-    engines: {node: '>=18'}
+  default-browser-id@5.0.0: {}
+
+  default-browser@5.2.1:
     dependencies:
       bundle-name: 4.1.0
       default-browser-id: 5.0.0
-    dev: false
 
-  /defaults@1.0.4:
-    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+  defaults@1.0.4:
     dependencies:
       clone: 1.0.4
 
-  /defer-to-connect@1.1.3:
-    resolution: {integrity: sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==}
-    dev: true
+  defer-to-connect@1.1.3: {}
 
-  /define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
-    engines: {node: '>= 0.4'}
+  define-data-property@1.1.4:
     dependencies:
       es-define-property: 1.0.1
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  /define-lazy-prop@2.0.0:
-    resolution: {integrity: sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==}
-    engines: {node: '>=8'}
-    dev: true
+  define-lazy-prop@2.0.0: {}
 
-  /define-lazy-prop@3.0.0:
-    resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
-    engines: {node: '>=12'}
-    dev: false
+  define-lazy-prop@3.0.0: {}
 
-  /define-properties@1.1.4:
-    resolution: {integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==}
-    engines: {node: '>= 0.4'}
+  define-properties@1.1.4:
     dependencies:
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
 
-  /define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
+  define-properties@1.2.1:
     dependencies:
       define-data-property: 1.1.4
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
-    dev: true
 
-  /defined@1.0.1:
-    resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
-    dev: false
+  defined@1.0.1: {}
 
-  /defu@6.1.4:
-    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
+  defu@6.1.4: {}
 
-  /degenerator@5.0.1:
-    resolution: {integrity: sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==}
-    engines: {node: '>= 14'}
+  degenerator@5.0.1:
     dependencies:
       ast-types: 0.13.4
       escodegen: 2.1.0
       esprima: 4.0.1
-    dev: false
 
-  /del@6.1.1:
-    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
-    engines: {node: '>=10'}
+  delaunator@5.0.1:
     dependencies:
-      globby: 11.1.0
-      graceful-fs: 4.2.11
-      is-glob: 4.0.3
-      is-path-cwd: 2.2.0
-      is-path-inside: 3.0.3
-      p-map: 4.0.0
-      rimraf: 3.0.2
-      slash: 3.0.0
-    dev: true
-
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
+      robust-predicates: 3.0.2
 
-  /delegates@1.0.0:
-    resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==}
-    requiresBuild: true
-    dev: false
-    optional: true
+  delayed-stream@1.0.0: {}
 
-  /denque@2.1.0:
-    resolution: {integrity: sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==}
-    engines: {node: '>=0.10'}
-    dev: false
+  denque@2.1.0: {}
 
-  /depd@2.0.0:
-    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
-    engines: {node: '>= 0.8'}
+  depd@2.0.0: {}
 
-  /dequal@2.0.3:
-    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
-    engines: {node: '>=6'}
+  deprecation@2.3.1: {}
 
-  /destr@2.0.3:
-    resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
-    dev: false
+  dequal@2.0.3: {}
 
-  /destroy@1.2.0:
-    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
-    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+  destr@2.0.3: {}
 
-  /detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
+  destroy@1.2.0: {}
 
-  /detect-libc@1.0.3:
-    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    dev: true
+  detect-indent@6.1.0: {}
 
-  /detect-libc@2.0.3:
-    resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
-    engines: {node: '>=8'}
-    requiresBuild: true
+  detect-libc@1.0.3: {}
 
-  /detect-libc@2.0.4:
-    resolution: {integrity: sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==}
-    engines: {node: '>=8'}
-    dev: false
+  detect-libc@2.1.2: {}
 
-  /detect-node-es@1.1.0:
-    resolution: {integrity: sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==}
-    dev: false
+  detect-node-es@1.1.0: {}
 
-  /detective@5.2.1:
-    resolution: {integrity: sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==}
-    engines: {node: '>=0.8.0'}
-    hasBin: true
+  detective@5.2.1:
     dependencies:
       acorn-node: 1.8.2
       defined: 1.0.1
       minimist: 1.2.7
-    dev: false
 
-  /devlop@1.1.0:
-    resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==}
+  devlop@1.1.0:
     dependencies:
       dequal: 2.0.3
-    dev: false
 
-  /devtools-protocol@0.0.1342118:
-    resolution: {integrity: sha512-75fMas7PkYNDTmDyb6PRJCH7ILmHLp+BhrZGeMsa4bCh40DTxgCz2NRy5UDzII4C5KuD0oBMZ9vXKhEl6UD/3w==}
-    dev: false
+  devtools-protocol@0.0.1464554: {}
 
-  /dezalgo@1.0.4:
-    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+  dezalgo@1.0.4:
     dependencies:
       asap: 2.0.6
       wrappy: 1.0.2
-    dev: true
-
-  /didyoumean@1.2.2:
-    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
-  /diff-match-patch@1.0.5:
-    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
+  didyoumean@1.2.2: {}
 
-  /diff@4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
+  diff-match-patch@1.0.5: {}
 
-  /diff@5.1.0:
-    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
-    engines: {node: '>=0.3.1'}
-    dev: true
+  diff@5.1.0: {}
 
-  /dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
+  dir-glob@3.0.1:
     dependencies:
       path-type: 4.0.0
 
-  /dlv@1.1.3:
-    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
+  discontinuous-range@1.0.0: {}
 
-  /docker-compose@0.24.8:
-    resolution: {integrity: sha512-plizRs/Vf15H+GCVxq2EUvyPK7ei9b/cVesHvjnX4xaXjM9spHe2Ytq0BitndFgvTJ3E3NljPNUEl7BAN43iZw==}
-    engines: {node: '>= 6.0.0'}
+  dlv@1.1.3: {}
+
+  docker-compose@0.24.8:
     dependencies:
       yaml: 2.7.1
-    dev: true
 
-  /docker-modem@5.0.6:
-    resolution: {integrity: sha512-ens7BiayssQz/uAxGzH8zGXCtiV24rRWXdjNha5V4zSOcxmAZsfGVm/PPFbwQdqEkDnhG+SyR9E3zSHUbOKXBQ==}
-    engines: {node: '>= 8.0'}
+  docker-modem@5.0.6:
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       readable-stream: 3.6.0
       split-ca: 1.0.1
       ssh2: 1.16.0
     transitivePeerDependencies:
       - supports-color
 
-  /dockerode@4.0.6:
-    resolution: {integrity: sha512-FbVf3Z8fY/kALB9s+P9epCpWhfi/r0N2DgYYcYpsAUlaTxPjdsitsFobnltb+lyCgAIvf9C+4PSWlTnHlJMf1w==}
-    engines: {node: '>= 8.0'}
+  dockerode@4.0.6:
     dependencies:
       '@balena/dockerignore': 1.0.2
       '@grpc/grpc-js': 1.12.6
@@ -23297,333 +33317,230 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /doctrine@2.1.0:
-    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
-    engines: {node: '>=0.10.0'}
+  doctrine@2.1.0:
     dependencies:
       esutils: 2.0.3
-    dev: true
 
-  /doctrine@3.0.0:
-    resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==}
-    engines: {node: '>=6.0.0'}
+  doctrine@3.0.0:
     dependencies:
       esutils: 2.0.3
 
-  /dom-accessibility-api@0.5.15:
-    resolution: {integrity: sha512-8o+oVqLQZoruQPYy3uAAQtc6YbtSiRq5aPJBhJ82YTJRHvI6ofhYAkC81WmjFTnfUbqg6T3aCglIpU9p/5e7Cw==}
-    dev: true
+  dom-accessibility-api@0.5.15: {}
 
-  /dom-accessibility-api@0.6.3:
-    resolution: {integrity: sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==}
-    dev: false
+  dom-accessibility-api@0.6.3: {}
 
-  /dom-helpers@5.2.1:
-    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
+  dom-helpers@5.2.1:
     dependencies:
-      '@babel/runtime': 7.27.4
-      csstype: 3.1.3
-    dev: false
+      '@babel/runtime': 7.27.0
+      csstype: 3.2.0
 
-  /dom-serializer@2.0.0:
-    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+  dom-serializer@2.0.0:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       entities: 4.5.0
-    dev: false
 
-  /domelementtype@2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
-    dev: false
+  domelementtype@2.3.0: {}
 
-  /domhandler@5.0.3:
-    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: '>= 4'}
+  domhandler@5.0.3:
     dependencies:
       domelementtype: 2.3.0
-    dev: false
 
-  /dompurify@3.2.6:
-    resolution: {integrity: sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==}
+  dompurify@3.2.6:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
 
-  /domutils@3.0.1:
-    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
+  domutils@3.0.1:
     dependencies:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
-    dev: false
 
-  /dot-prop@6.0.1:
-    resolution: {integrity: sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA==}
-    engines: {node: '>=10'}
-    dependencies:
-      is-obj: 2.0.0
-    dev: false
+  dotenv@16.0.3: {}
 
-  /dotenv@16.0.3:
-    resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
-    engines: {node: '>=12'}
+  dotenv@16.4.4: {}
 
-  /dotenv@16.4.4:
-    resolution: {integrity: sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==}
-    engines: {node: '>=12'}
-    dev: true
+  dotenv@16.4.5: {}
 
-  /dotenv@16.4.5:
-    resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
-    engines: {node: '>=12'}
+  dotenv@16.4.7: {}
 
-  /dotenv@16.4.7:
-    resolution: {integrity: sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==}
-    engines: {node: '>=12'}
+  dotenv@16.6.1: {}
 
-  /dotenv@8.6.0:
-    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
-    engines: {node: '>=10'}
-    dev: false
+  dotenv@17.2.3: {}
 
-  /dprint-node@1.0.8:
-    resolution: {integrity: sha512-iVKnUtYfGrYcW1ZAlfR/F59cUVL8QIhWoBJoSjkkdua/dkWIgjZfiLMeTjiB06X0ZLkQ0M2C1VbUj/CxkIf1zg==}
+  dotenv@8.6.0: {}
+
+  dprint-node@1.0.8:
     dependencies:
       detect-libc: 1.0.3
-    dev: true
 
-  /dunder-proto@1.0.1:
-    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
-    engines: {node: '>= 0.4'}
+  dunder-proto@1.0.1:
     dependencies:
       call-bind-apply-helpers: 1.0.2
       es-errors: 1.3.0
       gopd: 1.2.0
 
-  /duplexer3@0.1.5:
-    resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
-    dev: true
+  duplexer3@0.1.5: {}
 
-  /duplexer@0.1.2:
-    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
-    dev: true
+  duplexer@0.1.2: {}
 
-  /duplexify@3.7.1:
-    resolution: {integrity: sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==}
+  duplexify@3.7.1:
     dependencies:
       end-of-stream: 1.4.4
       inherits: 2.0.4
       readable-stream: 2.3.8
-      stream-shift: 1.0.1
-    dev: true
+      stream-shift: 1.0.3
 
-  /duplexify@4.1.3:
-    resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==}
+  duplexify@4.1.3:
     dependencies:
       end-of-stream: 1.4.4
       inherits: 2.0.4
       readable-stream: 3.6.2
       stream-shift: 1.0.3
-    dev: true
 
-  /e2b@1.2.1:
-    resolution: {integrity: sha512-ii/Bw55ecxgORqkArKNbuVTwqLgVZ0rH1X3J/NOe4LMZaVETm3qNpPBjoPkpQAsQjw2ew0Ad2sd54epqm9nLCw==}
-    engines: {node: '>=18'}
+  e2b@1.2.1:
     dependencies:
       '@bufbuild/protobuf': 2.2.5
       '@connectrpc/connect': 2.0.0-rc.3(@bufbuild/protobuf@2.2.5)
-      '@connectrpc/connect-web': 2.0.0-rc.3(@bufbuild/protobuf@2.2.5)(@connectrpc/connect@2.0.0-rc.3)
+      '@connectrpc/connect-web': 2.0.0-rc.3(@bufbuild/protobuf@2.2.5)(@connectrpc/connect@2.0.0-rc.3(@bufbuild/protobuf@2.2.5))
       compare-versions: 6.1.1
       openapi-fetch: 0.9.8
       platform: 1.3.6
-    dev: false
 
-  /eastasianwidth@0.2.0:
-    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+  eastasianwidth@0.2.0: {}
 
-  /ecc-jsbn@0.1.2:
-    resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
+  ecc-jsbn@0.1.2:
     dependencies:
       jsbn: 0.1.1
       safer-buffer: 2.1.2
-    dev: false
 
-  /editorconfig@1.0.4:
-    resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
-    engines: {node: '>=14'}
-    hasBin: true
+  ecdsa-sig-formatter@1.0.11:
+    dependencies:
+      safe-buffer: 5.2.1
+
+  editorconfig@1.0.4:
     dependencies:
       '@one-ini/wasm': 0.1.1
       commander: 10.0.1
       minimatch: 9.0.1
-      semver: 7.7.2
-    dev: false
+      semver: 5.7.2
 
-  /ee-first@1.1.1:
-    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
+  ee-first@1.1.1: {}
 
-  /effect@3.11.7:
-    resolution: {integrity: sha512-laj+TCxWGn0eOv6jNmS9vavMO01Z4vvRr7v5airaOUfE7Zr5PrHiECpiI5HRvOewxa1im/4EcOvRodOZ1S2Y7Q==}
+  effect@3.11.7:
     dependencies:
       fast-check: 3.22.0
-    dev: false
 
-  /effect@3.16.3:
-    resolution: {integrity: sha512-SWndb1UavNWvet1+hnkU4qp3EHtnmDKhUeP14eB+7vf/2nCFlM77/oIjdDeZctveibNjE65P9H/sBBmF0NTy/w==}
+  effect@3.16.12:
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      fast-check: 3.23.2
+
+  effect@3.17.1:
     dependencies:
       '@standard-schema/spec': 1.0.0
       fast-check: 3.23.2
-    dev: false
 
-  /effect@3.7.2:
-    resolution: {integrity: sha512-pV7l1+LSZFvVObj4zuy4nYiBaC7qZOfrKV6s/Ef4p3KueiQwZFgamazklwyZ+x7Nyj2etRDFvHE/xkThTfQD1w==}
-    dev: false
+  effect@3.18.4:
+    dependencies:
+      '@standard-schema/spec': 1.1.0
+      fast-check: 3.23.2
 
-  /electron-to-chromium@1.4.433:
-    resolution: {integrity: sha512-MGO1k0w1RgrfdbLVwmXcDhHHuxCn2qRgR7dYsJvWFKDttvYPx6FNzCGG0c/fBBvzK2LDh3UV7Tt9awnHnvAAUQ==}
-    dev: true
+  effect@3.7.2: {}
 
-  /electron-to-chromium@1.5.13:
-    resolution: {integrity: sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q==}
-    dev: false
+  electron-to-chromium@1.4.433: {}
 
-  /electron-to-chromium@1.5.162:
-    resolution: {integrity: sha512-hQA+Zb5QQwoSaXJWEAGEw1zhk//O7qDzib05Z4qTqZfNju/FAkrm5ZInp0JbTp4Z18A6bilopdZWEYrFSsfllA==}
-    dev: true
+  electron-to-chromium@1.5.252: {}
 
-  /electron-to-chromium@1.5.98:
-    resolution: {integrity: sha512-bI/LbtRBxU2GzK7KK5xxFd2y9Lf9XguHooPYbcXWy6wUoT8NMnffsvRhPmSeUHLSDKAEtKuTaEtK4Ms15zkIEA==}
+  electron-to-chromium@1.5.98: {}
 
-  /email-reply-parser@1.8.0:
-    resolution: {integrity: sha512-hiie/4vNxT5NYBux8m/jZccUQdtQqiq5ytwJwbA9QIkTWbTNPQasJXfsfdetZo23hBn4ZJleRDyOA5nV4+ssSQ==}
-    engines: {node: '>= 10.0.0'}
-    dependencies:
-      re2: 1.21.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+  emoji-regex@8.0.0: {}
 
-  /emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+  emoji-regex@9.2.2: {}
 
-  /emoji-regex@9.2.2:
-    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+  emojilib@2.4.0: {}
 
-  /emojilib@2.4.0:
-    resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==}
-    dev: true
+  empathic@2.0.0: {}
 
-  /encodeurl@1.0.2:
-    resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==}
-    engines: {node: '>= 0.8'}
+  encodeurl@1.0.2: {}
 
-  /encodeurl@2.0.0:
-    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
-    engines: {node: '>= 0.8'}
+  encodeurl@2.0.0: {}
 
-  /encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
-    requiresBuild: true
+  encoding@0.1.13:
     dependencies:
       iconv-lite: 0.6.3
 
-  /end-of-stream@1.4.4:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+  end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
 
-  /engine.io-client@6.5.3(supports-color@10.0.0):
-    resolution: {integrity: sha512-9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==}
+  engine.io-client@6.5.3(bufferutil@4.0.9)(supports-color@10.0.0):
     dependencies:
       '@socket.io/component-emitter': 3.1.0
       debug: 4.3.7(supports-color@10.0.0)
-      engine.io-parser: 5.2.2(patch_hash=e6nctogrhpxoivwiwy37ersfu4)
-      ws: 8.11.0
+      engine.io-parser: 5.2.2(patch_hash=9011e7e16547017450c9baec0fceff0e070310c20d9e62f8d1383bb1da77104f)
+      ws: 8.17.1(bufferutil@4.0.9)
       xmlhttprequest-ssl: 2.0.0
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
 
-  /engine.io-parser@5.2.2(patch_hash=e6nctogrhpxoivwiwy37ersfu4):
-    resolution: {integrity: sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==}
-    engines: {node: '>=10.0.0'}
-    patched: true
+  engine.io-parser@5.2.2(patch_hash=9011e7e16547017450c9baec0fceff0e070310c20d9e62f8d1383bb1da77104f): {}
 
-  /engine.io@6.5.4:
-    resolution: {integrity: sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==}
-    engines: {node: '>=10.2.0'}
+  engine.io@6.5.4(bufferutil@4.0.9):
     dependencies:
       '@types/cookie': 0.4.1
       '@types/cors': 2.8.17
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       accepts: 1.3.8
       base64id: 2.0.0
       cookie: 0.4.2
       cors: 2.8.5
       debug: 4.3.4
-      engine.io-parser: 5.2.2(patch_hash=e6nctogrhpxoivwiwy37ersfu4)
-      ws: 8.11.0
+      engine.io-parser: 5.2.2(patch_hash=9011e7e16547017450c9baec0fceff0e070310c20d9e62f8d1383bb1da77104f)
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  /enhanced-resolve@5.15.0:
-    resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==}
-    engines: {node: '>=10.13.0'}
+  enhanced-resolve@5.15.0:
     dependencies:
       graceful-fs: 4.2.11
       tapable: 2.2.1
-    dev: true
 
-  /enhanced-resolve@5.18.1:
-    resolution: {integrity: sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==}
-    engines: {node: '>=10.13.0'}
+  enhanced-resolve@5.18.3:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.2.1
+      tapable: 2.3.0
 
-  /enquirer@2.3.6:
-    resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==}
-    engines: {node: '>=8.6'}
+  enquirer@2.3.6:
     dependencies:
       ansi-colors: 4.1.3
-    dev: false
 
-  /entities@4.5.0:
-    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
-    engines: {node: '>=0.12'}
+  entities@4.5.0: {}
 
-  /env-paths@2.2.1:
-    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
-    engines: {node: '>=6'}
+  entities@6.0.1: {}
 
-  /environment@1.1.0:
-    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
-    engines: {node: '>=18'}
+  env-paths@2.2.1: {}
 
-  /err-code@2.0.3:
-    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
+  environment@1.1.0: {}
 
-  /error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+  err-code@2.0.3: {}
+
+  error-ex@1.3.2:
     dependencies:
       is-arrayish: 0.2.1
 
-  /error-stack-parser@2.1.4:
-    resolution: {integrity: sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==}
+  error-stack-parser@2.1.4:
     dependencies:
       stackframe: 1.3.4
-    dev: false
 
-  /es-abstract@1.21.1:
-    resolution: {integrity: sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg==}
-    engines: {node: '>= 0.4'}
+  es-abstract@1.21.1:
     dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.7
+      available-typed-arrays: 1.0.7
+      call-bind: 1.0.8
       es-set-tostringtag: 2.0.1
       es-to-primitive: 1.2.1
       function-bind: 1.1.2
@@ -23643,27 +33560,25 @@ packages:
       is-regex: 1.1.4
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
-      is-typed-array: 1.1.10
+      is-typed-array: 1.1.13
       is-weakref: 1.0.2
       object-inspect: 1.13.4
       object-keys: 1.1.1
-      object.assign: 4.1.4
+      object.assign: 4.1.5
       regexp.prototype.flags: 1.4.3
       safe-regex-test: 1.0.0
       string.prototype.trimend: 1.0.6
       string.prototype.trimstart: 1.0.6
       typed-array-length: 1.0.4
       unbox-primitive: 1.0.2
-      which-typed-array: 1.1.9
+      which-typed-array: 1.1.15
 
-  /es-abstract@1.23.3:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
-    engines: {node: '>= 0.4'}
+  es-abstract@1.23.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
       arraybuffer.prototype.slice: 1.0.3
       available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       data-view-buffer: 1.0.1
       data-view-byte-length: 1.0.1
       data-view-byte-offset: 1.0.0
@@ -23706,265 +33621,122 @@ packages:
       typed-array-length: 1.0.6
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.15
-    dev: true
 
-  /es-define-property@1.0.1:
-    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
-    engines: {node: '>= 0.4'}
+  es-define-property@1.0.1: {}
 
-  /es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
-    engines: {node: '>= 0.4'}
+  es-errors@1.3.0: {}
 
-  /es-module-lexer@1.7.0:
-    resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
+  es-module-lexer@1.7.0: {}
 
-  /es-object-atoms@1.0.0:
-    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
-    engines: {node: '>= 0.4'}
+  es-object-atoms@1.0.0:
     dependencies:
       es-errors: 1.3.0
-    dev: true
 
-  /es-object-atoms@1.1.1:
-    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
-    engines: {node: '>= 0.4'}
+  es-object-atoms@1.1.1:
     dependencies:
       es-errors: 1.3.0
 
-  /es-set-tostringtag@2.0.1:
-    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
-    engines: {node: '>= 0.4'}
+  es-set-tostringtag@2.0.1:
     dependencies:
       get-intrinsic: 1.3.0
       has: 1.0.3
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
-  /es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
-    engines: {node: '>= 0.4'}
+  es-set-tostringtag@2.0.3:
     dependencies:
       get-intrinsic: 1.3.0
       has-tostringtag: 1.0.2
       hasown: 2.0.2
-    dev: true
 
-  /es-shim-unscopables@1.0.0:
-    resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==}
+  es-set-tostringtag@2.1.0:
+    dependencies:
+      es-errors: 1.3.0
+      get-intrinsic: 1.3.0
+      has-tostringtag: 1.0.2
+      hasown: 2.0.2
+
+  es-shim-unscopables@1.0.0:
     dependencies:
       has: 1.0.3
 
-  /es-shim-unscopables@1.0.2:
-    resolution: {integrity: sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==}
+  es-shim-unscopables@1.0.2:
     dependencies:
       hasown: 2.0.2
-    dev: true
 
-  /es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
+  es-to-primitive@1.2.1:
     dependencies:
       is-callable: 1.2.7
       is-date-object: 1.0.5
       is-symbol: 1.0.4
 
-  /esbuild-android-64@0.15.18:
-    resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  esbuild-android-64@0.15.18:
     optional: true
 
-  /esbuild-android-arm64@0.15.18:
-    resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
+  esbuild-android-arm64@0.15.18:
     optional: true
 
-  /esbuild-darwin-64@0.15.18:
-    resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  esbuild-darwin-64@0.15.18:
     optional: true
 
-  /esbuild-darwin-arm64@0.15.18:
-    resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  esbuild-darwin-arm64@0.15.18:
     optional: true
 
-  /esbuild-freebsd-64@0.15.18:
-    resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  esbuild-freebsd-64@0.15.18:
     optional: true
 
-  /esbuild-freebsd-arm64@0.15.18:
-    resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  esbuild-freebsd-arm64@0.15.18:
     optional: true
 
-  /esbuild-linux-32@0.15.18:
-    resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-32@0.15.18:
     optional: true
 
-  /esbuild-linux-64@0.15.18:
-    resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-64@0.15.18:
     optional: true
 
-  /esbuild-linux-arm64@0.15.18:
-    resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-arm64@0.15.18:
     optional: true
 
-  /esbuild-linux-arm@0.15.18:
-    resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-arm@0.15.18:
     optional: true
 
-  /esbuild-linux-mips64le@0.15.18:
-    resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-mips64le@0.15.18:
     optional: true
 
-  /esbuild-linux-ppc64le@0.15.18:
-    resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-ppc64le@0.15.18:
     optional: true
 
-  /esbuild-linux-riscv64@0.15.18:
-    resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-riscv64@0.15.18:
     optional: true
 
-  /esbuild-linux-s390x@0.15.18:
-    resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  esbuild-linux-s390x@0.15.18:
     optional: true
 
-  /esbuild-netbsd-64@0.15.18:
-    resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
+  esbuild-netbsd-64@0.15.18:
     optional: true
 
-  /esbuild-openbsd-64@0.15.18:
-    resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  esbuild-openbsd-64@0.15.18:
     optional: true
 
-  /esbuild-plugins-node-modules-polyfill@1.6.1(esbuild@0.17.6):
-    resolution: {integrity: sha512-6sAwI24PV8W0zxeO+i4BS5zoQypS3SzEGwIdxpzpy65riRuK8apMw8PN0aKVLCTnLr0FgNIxUMRd9BsreBrtog==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      esbuild: ^0.14.0 || ^0.15.0 || ^0.16.0 || ^0.17.0 || ^0.18.0 || ^0.19.0
+  esbuild-plugins-node-modules-polyfill@1.6.1(esbuild@0.17.6):
     dependencies:
       '@jspm/core': 2.0.1
       esbuild: 0.17.6
       local-pkg: 0.4.3
       resolve.exports: 2.0.2
-    dev: true
 
-  /esbuild-sunos-64@0.15.18:
-    resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
+  esbuild-sunos-64@0.15.18:
     optional: true
 
-  /esbuild-windows-32@0.15.18:
-    resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  esbuild-windows-32@0.15.18:
     optional: true
 
-  /esbuild-windows-64@0.15.18:
-    resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  esbuild-windows-64@0.15.18:
     optional: true
 
-  /esbuild-windows-arm64@0.15.18:
-    resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  esbuild-windows-arm64@0.15.18:
     optional: true
 
-  /esbuild@0.15.18:
-    resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.15.18:
     optionalDependencies:
       '@esbuild/android-arm': 0.15.18
       '@esbuild/linux-loong64': 0.15.18
@@ -23988,73 +33760,8 @@ packages:
       esbuild-windows-32: 0.15.18
       esbuild-windows-64: 0.15.18
       esbuild-windows-arm64: 0.15.18
-    dev: true
 
-  /esbuild@0.16.17:
-    resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.16.17
-      '@esbuild/android-arm64': 0.16.17
-      '@esbuild/android-x64': 0.16.17
-      '@esbuild/darwin-arm64': 0.16.17
-      '@esbuild/darwin-x64': 0.16.17
-      '@esbuild/freebsd-arm64': 0.16.17
-      '@esbuild/freebsd-x64': 0.16.17
-      '@esbuild/linux-arm': 0.16.17
-      '@esbuild/linux-arm64': 0.16.17
-      '@esbuild/linux-ia32': 0.16.17
-      '@esbuild/linux-loong64': 0.16.17
-      '@esbuild/linux-mips64el': 0.16.17
-      '@esbuild/linux-ppc64': 0.16.17
-      '@esbuild/linux-riscv64': 0.16.17
-      '@esbuild/linux-s390x': 0.16.17
-      '@esbuild/linux-x64': 0.16.17
-      '@esbuild/netbsd-x64': 0.16.17
-      '@esbuild/openbsd-x64': 0.16.17
-      '@esbuild/sunos-x64': 0.16.17
-      '@esbuild/win32-arm64': 0.16.17
-      '@esbuild/win32-ia32': 0.16.17
-      '@esbuild/win32-x64': 0.16.17
-    dev: true
-
-  /esbuild@0.17.19:
-    resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.19
-      '@esbuild/android-arm64': 0.17.19
-      '@esbuild/android-x64': 0.17.19
-      '@esbuild/darwin-arm64': 0.17.19
-      '@esbuild/darwin-x64': 0.17.19
-      '@esbuild/freebsd-arm64': 0.17.19
-      '@esbuild/freebsd-x64': 0.17.19
-      '@esbuild/linux-arm': 0.17.19
-      '@esbuild/linux-arm64': 0.17.19
-      '@esbuild/linux-ia32': 0.17.19
-      '@esbuild/linux-loong64': 0.17.19
-      '@esbuild/linux-mips64el': 0.17.19
-      '@esbuild/linux-ppc64': 0.17.19
-      '@esbuild/linux-riscv64': 0.17.19
-      '@esbuild/linux-s390x': 0.17.19
-      '@esbuild/linux-x64': 0.17.19
-      '@esbuild/netbsd-x64': 0.17.19
-      '@esbuild/openbsd-x64': 0.17.19
-      '@esbuild/sunos-x64': 0.17.19
-      '@esbuild/win32-arm64': 0.17.19
-      '@esbuild/win32-ia32': 0.17.19
-      '@esbuild/win32-x64': 0.17.19
-    dev: false
-
-  /esbuild@0.17.6:
-    resolution: {integrity: sha512-TKFRp9TxrJDdRWfSsSERKEovm6v30iHnrjlcGhLBOtReE28Yp1VSBRfO3GTaOFMoxsNerx4TjrhzSuma9ha83Q==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.17.6:
     optionalDependencies:
       '@esbuild/android-arm': 0.17.6
       '@esbuild/android-arm64': 0.17.6
@@ -24078,13 +33785,8 @@ packages:
       '@esbuild/win32-arm64': 0.17.6
       '@esbuild/win32-ia32': 0.17.6
       '@esbuild/win32-x64': 0.17.6
-    dev: true
 
-  /esbuild@0.18.11:
-    resolution: {integrity: sha512-i8u6mQF0JKJUlGR3OdFLKldJQMMs8OqM9Cc3UCi9XXziJ9WERM5bfkHaEAy0YAvPRMgqSW55W7xYn84XtEFTtA==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.18.11:
     optionalDependencies:
       '@esbuild/android-arm': 0.18.11
       '@esbuild/android-arm64': 0.18.11
@@ -24108,13 +33810,8 @@ packages:
       '@esbuild/win32-arm64': 0.18.11
       '@esbuild/win32-ia32': 0.18.11
       '@esbuild/win32-x64': 0.18.11
-    dev: true
 
-  /esbuild@0.19.11:
-    resolution: {integrity: sha512-HJ96Hev2hX/6i5cDVwcqiJBBtuo9+FeIJOtZ9W1kA5M6AMJRHUZlpYZ1/SbEwtO0ioNAW8rUooVpC/WehY2SfA==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.19.11:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.19.11
       '@esbuild/android-arm': 0.19.11
@@ -24140,42 +33837,33 @@ packages:
       '@esbuild/win32-ia32': 0.19.11
       '@esbuild/win32-x64': 0.19.11
 
-  /esbuild@0.20.2:
-    resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.20.2
-      '@esbuild/android-arm': 0.20.2
-      '@esbuild/android-arm64': 0.20.2
-      '@esbuild/android-x64': 0.20.2
-      '@esbuild/darwin-arm64': 0.20.2
-      '@esbuild/darwin-x64': 0.20.2
-      '@esbuild/freebsd-arm64': 0.20.2
-      '@esbuild/freebsd-x64': 0.20.2
-      '@esbuild/linux-arm': 0.20.2
-      '@esbuild/linux-arm64': 0.20.2
-      '@esbuild/linux-ia32': 0.20.2
-      '@esbuild/linux-loong64': 0.20.2
-      '@esbuild/linux-mips64el': 0.20.2
-      '@esbuild/linux-ppc64': 0.20.2
-      '@esbuild/linux-riscv64': 0.20.2
-      '@esbuild/linux-s390x': 0.20.2
-      '@esbuild/linux-x64': 0.20.2
-      '@esbuild/netbsd-x64': 0.20.2
-      '@esbuild/openbsd-x64': 0.20.2
-      '@esbuild/sunos-x64': 0.20.2
-      '@esbuild/win32-arm64': 0.20.2
-      '@esbuild/win32-ia32': 0.20.2
-      '@esbuild/win32-x64': 0.20.2
-    dev: true
-
-  /esbuild@0.23.0:
-    resolution: {integrity: sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==}
-    engines: {node: '>=18'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.21.5:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.21.5
+      '@esbuild/android-arm': 0.21.5
+      '@esbuild/android-arm64': 0.21.5
+      '@esbuild/android-x64': 0.21.5
+      '@esbuild/darwin-arm64': 0.21.5
+      '@esbuild/darwin-x64': 0.21.5
+      '@esbuild/freebsd-arm64': 0.21.5
+      '@esbuild/freebsd-x64': 0.21.5
+      '@esbuild/linux-arm': 0.21.5
+      '@esbuild/linux-arm64': 0.21.5
+      '@esbuild/linux-ia32': 0.21.5
+      '@esbuild/linux-loong64': 0.21.5
+      '@esbuild/linux-mips64el': 0.21.5
+      '@esbuild/linux-ppc64': 0.21.5
+      '@esbuild/linux-riscv64': 0.21.5
+      '@esbuild/linux-s390x': 0.21.5
+      '@esbuild/linux-x64': 0.21.5
+      '@esbuild/netbsd-x64': 0.21.5
+      '@esbuild/openbsd-x64': 0.21.5
+      '@esbuild/sunos-x64': 0.21.5
+      '@esbuild/win32-arm64': 0.21.5
+      '@esbuild/win32-ia32': 0.21.5
+      '@esbuild/win32-x64': 0.21.5
+
+  esbuild@0.23.0:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.23.0
       '@esbuild/android-arm': 0.23.0
@@ -24202,11 +33890,35 @@ packages:
       '@esbuild/win32-ia32': 0.23.0
       '@esbuild/win32-x64': 0.23.0
 
-  /esbuild@0.25.1:
-    resolution: {integrity: sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.24.2:
+    optionalDependencies:
+      '@esbuild/aix-ppc64': 0.24.2
+      '@esbuild/android-arm': 0.24.2
+      '@esbuild/android-arm64': 0.24.2
+      '@esbuild/android-x64': 0.24.2
+      '@esbuild/darwin-arm64': 0.24.2
+      '@esbuild/darwin-x64': 0.24.2
+      '@esbuild/freebsd-arm64': 0.24.2
+      '@esbuild/freebsd-x64': 0.24.2
+      '@esbuild/linux-arm': 0.24.2
+      '@esbuild/linux-arm64': 0.24.2
+      '@esbuild/linux-ia32': 0.24.2
+      '@esbuild/linux-loong64': 0.24.2
+      '@esbuild/linux-mips64el': 0.24.2
+      '@esbuild/linux-ppc64': 0.24.2
+      '@esbuild/linux-riscv64': 0.24.2
+      '@esbuild/linux-s390x': 0.24.2
+      '@esbuild/linux-x64': 0.24.2
+      '@esbuild/netbsd-arm64': 0.24.2
+      '@esbuild/netbsd-x64': 0.24.2
+      '@esbuild/openbsd-arm64': 0.24.2
+      '@esbuild/openbsd-x64': 0.24.2
+      '@esbuild/sunos-x64': 0.24.2
+      '@esbuild/win32-arm64': 0.24.2
+      '@esbuild/win32-ia32': 0.24.2
+      '@esbuild/win32-x64': 0.24.2
+
+  esbuild@0.25.1:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.25.1
       '@esbuild/android-arm': 0.25.1
@@ -24233,101 +33945,64 @@ packages:
       '@esbuild/win32-arm64': 0.25.1
       '@esbuild/win32-ia32': 0.25.1
       '@esbuild/win32-x64': 0.25.1
-    dev: true
 
-  /escalade@3.2.0:
-    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
-    engines: {node: '>=6'}
+  escalade@3.2.0: {}
 
-  /escape-html@1.0.3:
-    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+  escape-html@1.0.3: {}
 
-  /escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
+  escape-string-regexp@1.0.5: {}
 
-  /escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
+  escape-string-regexp@4.0.0: {}
 
-  /escape-string-regexp@5.0.0:
-    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
-    engines: {node: '>=12'}
+  escape-string-regexp@5.0.0: {}
 
-  /escodegen@2.1.0:
-    resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==}
-    engines: {node: '>=6.0'}
-    hasBin: true
+  escodegen@2.1.0:
     dependencies:
       esprima: 4.0.1
       estraverse: 5.3.0
       esutils: 2.0.3
     optionalDependencies:
       source-map: 0.6.1
-    dev: false
 
-  /eslint-config-prettier@8.6.0(eslint@8.31.0):
-    resolution: {integrity: sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
+  eslint-config-prettier@8.6.0(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
-    dev: true
 
-  /eslint-config-prettier@9.0.0(eslint@8.31.0):
-    resolution: {integrity: sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
+  eslint-config-prettier@9.0.0(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
-    dev: false
 
-  /eslint-config-turbo@1.10.12(eslint@8.31.0):
-    resolution: {integrity: sha512-z3jfh+D7UGYlzMWGh+Kqz++hf8LOE96q3o5R8X4HTjmxaBWlLAWG+0Ounr38h+JLR2TJno0hU9zfzoPNkR9BdA==}
-    peerDependencies:
-      eslint: '>6.6.0'
+  eslint-config-turbo@1.10.12(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
       eslint-plugin-turbo: 1.10.12(eslint@8.31.0)
-    dev: false
 
-  /eslint-import-resolver-node@0.3.7:
-    resolution: {integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==}
+  eslint-import-resolver-node@0.3.7:
     dependencies:
       debug: 3.2.7
-      is-core-module: 2.13.0
+      is-core-module: 2.14.0
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /eslint-import-resolver-node@0.3.9:
-    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
+  eslint-import-resolver-node@0.3.9:
     dependencies:
       debug: 3.2.7
       is-core-module: 2.14.0
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0):
-    resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '*'
-      eslint-plugin-import: '*'
+  eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0):
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       enhanced-resolve: 5.15.0
       eslint: 8.31.0
-      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
+      eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
       get-tsconfig: 4.7.2
       globby: 13.2.2
-      is-core-module: 2.13.0
+      is-core-module: 2.14.0
       is-glob: 4.0.3
       synckit: 0.8.5
     transitivePeerDependencies:
@@ -24335,90 +34010,37 @@ packages:
       - eslint-import-resolver-node
       - eslint-import-resolver-webpack
       - supports-color
-    dev: true
 
-  /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0):
-    resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
+  eslint-module-utils@2.7.4(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.7)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0):
     dependencies:
-      '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       eslint: 8.31.0
       eslint-import-resolver-node: 0.3.7
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0)
+      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /eslint-module-utils@2.8.1(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0):
-    resolution: {integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: '*'
-      eslint-import-resolver-node: '*'
-      eslint-import-resolver-typescript: '*'
-      eslint-import-resolver-webpack: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
-      eslint:
-        optional: true
-      eslint-import-resolver-node:
-        optional: true
-      eslint-import-resolver-typescript:
-        optional: true
-      eslint-import-resolver-webpack:
-        optional: true
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0):
     dependencies:
-      '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       debug: 3.2.7
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       eslint: 8.31.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0)
+      eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.7)(eslint-plugin-import@2.29.1)(eslint@8.31.0)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /eslint-plugin-es@3.0.1(eslint@8.31.0):
-    resolution: {integrity: sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==}
-    engines: {node: '>=8.10.0'}
-    peerDependencies:
-      eslint: '>=4.19.1'
+  eslint-plugin-es@3.0.1(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
       eslint-utils: 2.1.0
       regexpp: 3.2.0
-    dev: true
 
-  /eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0):
-    resolution: {integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      '@typescript-eslint/parser': '*'
-      eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-    peerDependenciesMeta:
-      '@typescript-eslint/parser':
-        optional: true
+  eslint-plugin-import@2.29.1(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0):
     dependencies:
-      '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       array-includes: 3.1.8
       array.prototype.findlastindex: 1.2.5
       array.prototype.flat: 1.3.2
@@ -24427,7 +34049,7 @@ packages:
       doctrine: 2.1.0
       eslint: 8.31.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@5.59.6)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.5.5)(eslint@8.31.0)
       hasown: 2.0.2
       is-core-module: 2.14.0
       is-glob: 4.0.3
@@ -24435,54 +34057,35 @@ packages:
       object.fromentries: 2.0.8
       object.groupby: 1.0.3
       object.values: 1.2.0
-      semver: 6.3.1
+      semver: 5.7.2
       tsconfig-paths: 3.15.0
+    optionalDependencies:
+      '@typescript-eslint/parser': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
     transitivePeerDependencies:
       - eslint-import-resolver-typescript
       - eslint-import-resolver-webpack
       - supports-color
-    dev: true
 
-  /eslint-plugin-jest-dom@4.0.3(eslint@8.31.0):
-    resolution: {integrity: sha512-9j+n8uj0+V0tmsoS7bYC7fLhQmIvjRqRYEcbDSi+TKPsTThLLXCyj5swMSSf/hTleeMktACnn+HFqXBr5gbcbA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'}
-    peerDependencies:
-      eslint: ^6.8.0 || ^7.0.0 || ^8.0.0
+  eslint-plugin-jest-dom@4.0.3(eslint@8.31.0):
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.27.0
       '@testing-library/dom': 8.19.1
       eslint: 8.31.0
       requireindex: 1.2.0
-    dev: true
 
-  /eslint-plugin-jest@26.9.0(@typescript-eslint/eslint-plugin@5.59.6)(eslint@8.31.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-TWJxWGp1J628gxh2KhaH1H1paEdgE2J61BBF1I59c6xWeL5+D1BzMxGDN/nXAfX+aSkR5u80K+XhskK6Gwq9ng==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      '@typescript-eslint/eslint-plugin': ^5.0.0
-      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-      jest: '*'
-    peerDependenciesMeta:
-      '@typescript-eslint/eslint-plugin':
-        optional: true
-      jest:
-        optional: true
+  eslint-plugin-jest@26.9.0(@typescript-eslint/eslint-plugin@5.59.6(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.59.6(@typescript-eslint/parser@5.59.6)(eslint@8.31.0)(typescript@5.5.4)
       '@typescript-eslint/utils': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       eslint: 8.31.0
+    optionalDependencies:
+      '@typescript-eslint/eslint-plugin': 5.59.6(@typescript-eslint/parser@5.59.6(eslint@8.31.0)(typescript@5.5.4))(eslint@8.31.0)(typescript@5.5.4)
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
 
-  /eslint-plugin-jsx-a11y@6.7.1(eslint@8.31.0):
-    resolution: {integrity: sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  eslint-plugin-jsx-a11y@6.7.1(eslint@8.31.0):
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.27.0
       aria-query: 5.3.0
       array-includes: 3.1.6
       array.prototype.flatmap: 1.3.1
@@ -24498,14 +34101,9 @@ packages:
       minimatch: 3.1.2
       object.entries: 1.1.6
       object.fromentries: 2.0.6
-      semver: 6.3.1
-    dev: true
+      semver: 5.7.2
 
-  /eslint-plugin-node@11.1.0(eslint@8.31.0):
-    resolution: {integrity: sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==}
-    engines: {node: '>=8.10.0'}
-    peerDependencies:
-      eslint: '>=5.16.0'
+  eslint-plugin-node@11.1.0(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
       eslint-plugin-es: 3.0.1(eslint@8.31.0)
@@ -24513,23 +34111,13 @@ packages:
       ignore: 5.2.4
       minimatch: 3.1.2
       resolve: 1.22.8
-      semver: 6.3.1
-    dev: true
+      semver: 5.7.2
 
-  /eslint-plugin-react-hooks@4.6.2(eslint@8.31.0):
-    resolution: {integrity: sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+  eslint-plugin-react-hooks@4.6.2(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
-    dev: true
 
-  /eslint-plugin-react@7.32.2(eslint@8.31.0):
-    resolution: {integrity: sha512-t2fBMa+XzonrrNkyVirzKlvn5RXzzPwRHtMvLAtVZrt8oxgnTQaYbU6SXTOO1mwQgp1y5+toMSKInnzGr0Knqg==}
-    engines: {node: '>=4'}
-    peerDependencies:
-      eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  eslint-plugin-react@7.32.2(eslint@8.31.0):
     dependencies:
       array-includes: 3.1.6
       array.prototype.flatmap: 1.3.1
@@ -24545,92 +34133,55 @@ packages:
       object.values: 1.1.6
       prop-types: 15.8.1
       resolve: 2.0.0-next.4
-      semver: 6.3.1
+      semver: 5.7.2
       string.prototype.matchall: 4.0.8
-    dev: true
 
-  /eslint-plugin-testing-library@5.11.0(eslint@8.31.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-ELY7Gefo+61OfXKlQeXNIDVVLPcvKTeiQOoMZG9TeuWa7Ln4dUNRv8JdRWBQI9Mbb427XGlVB1aa1QPZxBJM8Q==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'}
-    peerDependencies:
-      eslint: ^7.5.0 || ^8.0.0
+  eslint-plugin-testing-library@5.11.0(eslint@8.31.0)(typescript@5.5.4):
     dependencies:
       '@typescript-eslint/utils': 5.59.6(eslint@8.31.0)(typescript@5.5.4)
       eslint: 8.31.0
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
 
-  /eslint-plugin-turbo@1.10.12(eslint@8.31.0):
-    resolution: {integrity: sha512-uNbdj+ohZaYo4tFJ6dStRXu2FZigwulR1b3URPXe0Q8YaE7thuekKNP+54CHtZPH9Zey9dmDx5btAQl9mfzGOw==}
-    peerDependencies:
-      eslint: '>6.6.0'
+  eslint-plugin-turbo@1.10.12(eslint@8.31.0):
     dependencies:
       dotenv: 16.0.3
       eslint: 8.31.0
-    dev: false
 
-  /eslint-plugin-turbo@2.0.5(eslint@8.31.0):
-    resolution: {integrity: sha512-nCTXZdaKmdRybBdjnMrDFG+ppLc9toUqB01Hf0pfhkQw8OoC29oJIVPsCSvuL/W58RKD02CNEUrwnVt57t36IQ==}
-    peerDependencies:
-      eslint: '>6.6.0'
+  eslint-plugin-turbo@2.0.5(eslint@8.31.0):
     dependencies:
       dotenv: 16.0.3
       eslint: 8.31.0
-    dev: true
 
-  /eslint-scope@5.1.1:
-    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
-    engines: {node: '>=8.0.0'}
+  eslint-scope@5.1.1:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 4.3.0
 
-  /eslint-scope@7.1.1:
-    resolution: {integrity: sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  eslint-scope@7.1.1:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
 
-  /eslint-utils@2.1.0:
-    resolution: {integrity: sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==}
-    engines: {node: '>=6'}
+  eslint-utils@2.1.0:
     dependencies:
       eslint-visitor-keys: 1.3.0
-    dev: true
 
-  /eslint-utils@3.0.0(eslint@8.31.0):
-    resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
-    engines: {node: ^10.0.0 || ^12.0.0 || >= 14.0.0}
-    peerDependencies:
-      eslint: '>=5'
+  eslint-utils@3.0.0(eslint@8.31.0):
     dependencies:
       eslint: 8.31.0
       eslint-visitor-keys: 2.1.0
 
-  /eslint-visitor-keys@1.3.0:
-    resolution: {integrity: sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==}
-    engines: {node: '>=4'}
-    dev: true
+  eslint-visitor-keys@1.3.0: {}
 
-  /eslint-visitor-keys@2.1.0:
-    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
-    engines: {node: '>=10'}
+  eslint-visitor-keys@2.1.0: {}
 
-  /eslint-visitor-keys@3.3.0:
-    resolution: {integrity: sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  eslint-visitor-keys@3.3.0: {}
 
-  /eslint-visitor-keys@3.4.2:
-    resolution: {integrity: sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  eslint-visitor-keys@3.4.2: {}
 
-  /eslint@8.31.0:
-    resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    hasBin: true
+  eslint@8.31.0:
     dependencies:
       '@eslint/eslintrc': 1.4.1
       '@humanwhocodes/config-array': 0.11.8
@@ -24660,7 +34211,7 @@ packages:
       is-glob: 4.0.3
       is-path-inside: 3.0.3
       js-sdsl: 4.2.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
       lodash.merge: 4.6.2
@@ -24674,137 +34225,79 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /esm-env@1.2.2:
-    resolution: {integrity: sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==}
-
-  /espree@9.4.1:
-    resolution: {integrity: sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
-      eslint-visitor-keys: 3.4.2
-
-  /espree@9.6.0:
-    resolution: {integrity: sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  espree@9.4.1:
     dependencies:
       acorn: 8.12.1
       acorn-jsx: 5.3.2(acorn@8.12.1)
       eslint-visitor-keys: 3.4.2
 
-  /esprima@4.0.1:
-    resolution: {integrity: sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==}
-    engines: {node: '>=4'}
-    hasBin: true
-
-  /esquery@1.4.0:
-    resolution: {integrity: sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==}
-    engines: {node: '>=0.10'}
+  espree@9.6.0:
     dependencies:
-      estraverse: 5.3.0
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
+      eslint-visitor-keys: 3.4.2
 
-  /esrap@1.4.6:
-    resolution: {integrity: sha512-F/D2mADJ9SHY3IwksD4DAXjTt7qt7GWUf3/8RhCNWmC/67tyb55dpimHmy7EplakFaflV0R/PC+fdSPqrRHAQw==}
+  esprima@4.0.1: {}
+
+  esquery@1.4.0:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
+      estraverse: 5.3.0
 
-  /esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
+  esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
 
-  /estraverse@4.3.0:
-    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
-    engines: {node: '>=4.0'}
+  estraverse@4.3.0: {}
 
-  /estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
+  estraverse@5.3.0: {}
 
-  /estree-util-attach-comments@2.1.0:
-    resolution: {integrity: sha512-rJz6I4L0GaXYtHpoMScgDIwM0/Vwbu5shbMeER596rB2D1EWF6+Gj0e0UKzJPZrpoOc87+Q2kgVFHfjAymIqmw==}
+  estree-util-attach-comments@2.1.0:
     dependencies:
-      '@types/estree': 1.0.7
-    dev: true
+      '@types/estree': 1.0.8
 
-  /estree-util-build-jsx@2.2.2:
-    resolution: {integrity: sha512-m56vOXcOBuaF+Igpb9OPAy7f9w9OIkb5yhjsZuaPm7HoGi4oTOQi0h2+yZ+AtKklYFZ+rPC4n0wYCJCEU1ONqg==}
+  estree-util-build-jsx@2.2.2:
     dependencies:
       '@types/estree-jsx': 1.0.0
       estree-util-is-identifier-name: 2.0.1
       estree-walker: 3.0.3
-    dev: true
 
-  /estree-util-is-identifier-name@1.1.0:
-    resolution: {integrity: sha512-OVJZ3fGGt9By77Ix9NhaRbzfbDV/2rx9EP7YIDJTmsZSEc5kYn2vWcNccYyahJL2uAQZK2a5Or2i0wtIKTPoRQ==}
-    dev: true
+  estree-util-is-identifier-name@1.1.0: {}
 
-  /estree-util-is-identifier-name@2.0.1:
-    resolution: {integrity: sha512-rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ==}
-    dev: true
+  estree-util-is-identifier-name@2.0.1: {}
 
-  /estree-util-is-identifier-name@3.0.0:
-    resolution: {integrity: sha512-hFtqIDZTIUZ9BXLb8y4pYGyk6+wekIivNVTcmvk8NoOh+VeRn5y6cEHzbURrWbfp1fIqdVipilzj+lfaadNZmg==}
-    dev: false
+  estree-util-is-identifier-name@3.0.0: {}
 
-  /estree-util-to-js@1.2.0:
-    resolution: {integrity: sha512-IzU74r1PK5IMMGZXUVZbmiu4A1uhiPgW5hm1GjcOfr4ZzHaMPpLNJjR7HjXiIOzi25nZDrgFTobHTkV5Q6ITjA==}
+  estree-util-to-js@1.2.0:
     dependencies:
       '@types/estree-jsx': 1.0.0
       astring: 1.8.4
       source-map: 0.7.4
-    dev: true
 
-  /estree-util-value-to-estree@1.3.0:
-    resolution: {integrity: sha512-Y+ughcF9jSUJvncXwqRageavjrNPAI+1M/L3BI3PyLp1nmgYTGUXU6t5z1Y7OWuThoDdhPME07bQU+d5LxdJqw==}
-    engines: {node: '>=12.0.0'}
+  estree-util-value-to-estree@1.3.0:
     dependencies:
       is-plain-obj: 3.0.0
-    dev: true
 
-  /estree-util-visit@1.2.0:
-    resolution: {integrity: sha512-wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg==}
+  estree-util-visit@1.2.0:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/unist': 2.0.6
-    dev: true
-
-  /estree-walker@0.6.1:
-    resolution: {integrity: sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==}
-    dev: false
-
-  /estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
 
-  /estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+  estree-walker@3.0.3:
     dependencies:
-      '@types/estree': 1.0.7
-    dev: true
+      '@types/estree': 1.0.8
 
-  /esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
+  esutils@2.0.3: {}
 
-  /etag@1.8.1:
-    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
-    engines: {node: '>= 0.6'}
+  etag@1.8.1: {}
 
-  /eval@0.1.6:
-    resolution: {integrity: sha512-o0XUw+5OGkXw4pJZzQoXUk+H87DHuC+7ZE//oSrRGtatTmr12oTnLfg6QOq9DyTt0c/p4TwzgmkKrBzWTSizyQ==}
-    engines: {node: '>= 0.8'}
+  eval@0.1.6:
     dependencies:
       require-like: 0.1.2
-    dev: true
 
-  /evalite@0.11.4:
-    resolution: {integrity: sha512-t12sJlfkxo0Hon6MYCwOd2qliAjGObrnGL6hYXP9h8AiNAVQCiyGrFrqtOH8TIhM0kgaGrq3s/DeZ679Sr8ipw==}
-    hasBin: true
+  evalite@0.11.4(bufferutil@4.0.9):
     dependencies:
       '@fastify/static': 8.2.0
-      '@fastify/websocket': 11.0.1
+      '@fastify/websocket': 11.0.1(bufferutil@4.0.9)
       '@stricli/auto-complete': 1.2.0
       '@stricli/core': 1.2.0
       '@vitest/runner': 2.1.9
@@ -24816,56 +34309,40 @@ packages:
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
-    dev: true
 
-  /event-target-shim@5.0.1:
-    resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==}
-    engines: {node: '>=6'}
+  event-target-shim@5.0.1: {}
 
-  /event-target-shim@6.0.2:
-    resolution: {integrity: sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA==}
-    engines: {node: '>=10.13.0'}
-    dev: false
+  event-target-shim@6.0.2: {}
 
-  /eventemitter3@4.0.7:
-    resolution: {integrity: sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==}
-    dev: false
+  eventemitter3@4.0.7: {}
 
-  /eventemitter3@5.0.1:
-    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
-    dev: false
+  eventemitter3@5.0.1: {}
 
-  /events@3.3.0:
-    resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
-    engines: {node: '>=0.8.x'}
+  events@3.3.0: {}
 
-  /eventsource-parser@1.1.2:
-    resolution: {integrity: sha512-v0eOBUbiaFojBu2s2NPBfYUoRR9GjcDNvCXVaqEf5vVfpIAh9f8RCo4vXTP8c63QRKCFwoLpMpTdPwwhEKVgzA==}
-    engines: {node: '>=14.18'}
+  eventsource-parser@1.1.2: {}
 
-  /eventsource-parser@3.0.0:
-    resolution: {integrity: sha512-T1C0XCUimhxVQzW4zFipdx0SficT651NnkR0ZSH3yQwh+mFMdLfgjABVi4YtMTtaL4s168593DaoaRLMqryavA==}
-    engines: {node: '>=18.0.0'}
-    dev: false
+  eventsource-parser@3.0.0: {}
 
-  /eventsource@3.0.5:
-    resolution: {integrity: sha512-LT/5J605bx5SNyE+ITBDiM3FxffBiq9un7Vx0EwMDM3vg8sWKx/tO2zC+LMqZ+smAM0F2hblaDZUVZF0te2pSw==}
-    engines: {node: '>=18.0.0'}
+  eventsource-parser@3.0.3: {}
+
+  eventsource-parser@3.0.6: {}
+
+  eventsource@3.0.5:
     dependencies:
       eventsource-parser: 3.0.0
-    dev: false
 
-  /evt@2.4.13:
-    resolution: {integrity: sha512-haTVOsmjzk+28zpzvVwan9Zw2rLQF2izgi7BKjAPRzZAfcv+8scL0TpM8MzvGNKFYHiy+Bq3r6FYIIUPl9kt3A==}
+  eventsource@4.0.0:
+    dependencies:
+      eventsource-parser: 3.0.3
+
+  evt@2.4.13:
     dependencies:
       minimal-polyfills: 2.2.2
       run-exclusive: 2.2.18
       tsafe: 1.4.1
-    dev: false
 
-  /execa@5.1.1:
-    resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
-    engines: {node: '>=10'}
+  execa@5.1.1:
     dependencies:
       cross-spawn: 7.0.5
       get-stream: 6.0.1
@@ -24876,11 +34353,8 @@ packages:
       onetime: 5.1.2
       signal-exit: 3.0.7
       strip-final-newline: 2.0.0
-    dev: true
 
-  /execa@8.0.1:
-    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
-    engines: {node: '>=16.17'}
+  execa@8.0.1:
     dependencies:
       cross-spawn: 7.0.5
       get-stream: 8.0.1
@@ -24892,35 +34366,37 @@ packages:
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
 
-  /exit-hook@2.2.1:
-    resolution: {integrity: sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==}
-    engines: {node: '>=6'}
+  execa@9.6.1:
+    dependencies:
+      '@sindresorhus/merge-streams': 4.0.0
+      cross-spawn: 7.0.5
+      figures: 6.1.0
+      get-stream: 9.0.1
+      human-signals: 8.0.1
+      is-plain-obj: 4.1.0
+      is-stream: 4.0.1
+      npm-run-path: 6.0.0
+      pretty-ms: 9.3.0
+      signal-exit: 4.1.0
+      strip-final-newline: 4.0.0
+      yoctocolors: 2.1.2
 
-  /expand-template@2.0.3:
-    resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
-    engines: {node: '>=6'}
+  exit-hook@2.2.1: {}
 
-  /expect-type@1.2.1:
-    resolution: {integrity: sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==}
-    engines: {node: '>=12.0.0'}
-    dev: true
+  expand-template@2.0.3: {}
 
-  /exponential-backoff@3.1.1:
-    resolution: {integrity: sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==}
-    dev: false
+  expect-type@1.2.1: {}
 
-  /express-rate-limit@7.5.0(express@5.0.1):
-    resolution: {integrity: sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==}
-    engines: {node: '>= 16'}
-    peerDependencies:
-      express: ^4.11 || 5 || ^5.0.0-beta.1
+  express-rate-limit@7.5.0(express@5.0.1(supports-color@10.0.0)):
     dependencies:
       express: 5.0.1(supports-color@10.0.0)
-    dev: false
 
-  /express@4.20.0:
-    resolution: {integrity: sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==}
-    engines: {node: '>= 0.10.0'}
+  express-rate-limit@8.2.1(express@5.2.1):
+    dependencies:
+      express: 5.2.1
+      ip-address: 10.0.1
+
+  express@4.20.0:
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
@@ -24943,7 +34419,7 @@ packages:
       parseurl: 1.3.3
       path-to-regexp: 0.1.10
       proxy-addr: 2.0.7
-      qs: 6.11.0
+      qs: 6.14.1
       range-parser: 1.2.1
       safe-buffer: 5.2.1
       send: 0.19.0
@@ -24956,9 +34432,7 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /express@5.0.1(supports-color@10.0.0):
-    resolution: {integrity: sha512-ORF7g6qGnD+YtUG9yx4DFoqCShNMmUKiXuT5oWMHiOvt/4WFbHC6yCwQMTSBMno7AqntNCAzzcnnjowRkTL9eQ==}
-    engines: {node: '>= 18'}
+  express@5.0.1(supports-color@10.0.0):
     dependencies:
       accepts: 2.0.0
       body-parser: 2.2.0(supports-color@10.0.0)
@@ -24981,7 +34455,7 @@ packages:
       once: 1.4.0
       parseurl: 1.3.3
       proxy-addr: 2.0.7
-      qs: 6.13.0
+      qs: 6.14.1
       range-parser: 1.2.1
       router: 2.1.0
       safe-buffer: 5.2.1
@@ -24994,78 +34468,83 @@ packages:
       vary: 1.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /extend@3.0.2:
-    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
+  express@5.2.1:
+    dependencies:
+      accepts: 2.0.0
+      body-parser: 2.2.2
+      content-disposition: 1.0.0
+      content-type: 1.0.5
+      cookie: 0.7.1
+      cookie-signature: 1.2.2
+      debug: 4.4.1(supports-color@10.0.0)
+      depd: 2.0.0
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      finalhandler: 2.1.0(supports-color@10.0.0)
+      fresh: 2.0.0
+      http-errors: 2.0.0
+      merge-descriptors: 2.0.0
+      mime-types: 3.0.0
+      on-finished: 2.4.1
+      once: 1.4.0
+      parseurl: 1.3.3
+      proxy-addr: 2.0.7
+      qs: 6.14.1
+      range-parser: 1.2.1
+      router: 2.2.0
+      send: 1.1.0(supports-color@10.0.0)
+      serve-static: 2.2.1
+      statuses: 2.0.1
+      type-is: 2.0.1
+      vary: 1.1.2
+    transitivePeerDependencies:
+      - supports-color
 
-  /extendable-error@0.1.7:
-    resolution: {integrity: sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==}
-    dev: false
+  exsolve@1.0.7: {}
 
-  /external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
+  extend@3.0.2: {}
+
+  extendable-error@0.1.7: {}
+
+  external-editor@3.1.0:
     dependencies:
       chardet: 0.7.0
       iconv-lite: 0.4.24
       tmp: 0.0.33
-    dev: false
 
-  /extract-zip@2.0.1:
-    resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
-    engines: {node: '>= 10.17.0'}
-    hasBin: true
+  extract-zip@2.0.1:
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       get-stream: 5.2.0
       yauzl: 2.10.0
     optionalDependencies:
       '@types/yauzl': 2.10.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /extsprintf@1.3.0:
-    resolution: {integrity: sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==}
-    engines: {'0': node >=0.6.0}
-    dev: false
+  extsprintf@1.3.0: {}
 
-  /fast-check@3.22.0:
-    resolution: {integrity: sha512-8HKz3qXqnHYp/VCNn2qfjHdAdcI8zcSqOyX64GOMukp7SL2bfzfeDKjSd+UyECtejccaZv3LcvZTm9YDD22iCQ==}
-    engines: {node: '>=8.0.0'}
+  fast-check@3.22.0:
     dependencies:
       pure-rand: 6.1.0
-    dev: false
 
-  /fast-check@3.23.2:
-    resolution: {integrity: sha512-h5+1OzzfCC3Ef7VbtKdcv7zsstUQwUDlYpUTvjeUsJAssPgLn7QzbboPtL5ro04Mq0rPOsMzl7q5hIbRs2wD1A==}
-    engines: {node: '>=8.0.0'}
+  fast-check@3.23.2:
     dependencies:
       pure-rand: 6.1.0
-    dev: false
 
-  /fast-decode-uri-component@1.0.1:
-    resolution: {integrity: sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==}
+  fast-decode-uri-component@1.0.1: {}
 
-  /fast-deep-equal@2.0.1:
-    resolution: {integrity: sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==}
-    dev: false
+  fast-deep-equal@3.1.3: {}
 
-  /fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+  fast-equals@4.0.3: {}
 
-  /fast-equals@5.0.1:
-    resolution: {integrity: sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==}
-    engines: {node: '>=6.0.0'}
-    dev: false
+  fast-equals@5.0.1: {}
 
-  /fast-fifo@1.3.2:
-    resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==}
+  fast-fifo@1.3.2: {}
 
-  /fast-glob@3.3.3:
-    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
-    engines: {node: '>=8.6.0'}
+  fast-glob@3.3.3:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
@@ -25073,11 +34552,9 @@ packages:
       merge2: 1.4.1
       micromatch: 4.0.8
 
-  /fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+  fast-json-stable-stringify@2.1.0: {}
 
-  /fast-json-stringify@6.0.1:
-    resolution: {integrity: sha512-s7SJE83QKBZwg54dIbD5rCtzOBVD43V1ReWXXYqBgwCwHLYAAT0RQc/FmrQglXqWPpz6omtryJQOau5jI4Nrvg==}
+  fast-json-stringify@6.0.1:
     dependencies:
       '@fastify/merge-json-schemas': 0.2.1
       ajv: 8.17.1
@@ -25085,67 +34562,44 @@ packages:
       fast-uri: 3.0.6
       json-schema-ref-resolver: 2.0.1
       rfdc: 1.4.1
-    dev: true
 
-  /fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+  fast-levenshtein@2.0.6: {}
 
-  /fast-npm-meta@0.2.2:
-    resolution: {integrity: sha512-E+fdxeaOQGo/CMWc9f4uHFfgUPJRAu7N3uB8GBvB3SDPAIWJK4GKyYhkAGFq+GYrcbKNfQIz5VVQyJnDuPPCrg==}
-    dev: false
+  fast-npm-meta@0.2.2: {}
 
-  /fast-querystring@1.1.2:
-    resolution: {integrity: sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==}
+  fast-querystring@1.1.2:
     dependencies:
       fast-decode-uri-component: 1.0.1
 
-  /fast-redact@3.5.0:
-    resolution: {integrity: sha512-dwsoQlS7h9hMeYUq1W++23NDcBLV4KqONnITDV9DjfS3q1SgDGVrBdvvTLUotWtPSD7asWDV9/CmsZPy8Hf70A==}
-    engines: {node: '>=6'}
-    dev: true
+  fast-redact@3.5.0: {}
 
-  /fast-safe-stringify@2.1.1:
-    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
-    dev: true
+  fast-safe-stringify@2.1.1: {}
 
-  /fast-shallow-equal@1.0.0:
-    resolution: {integrity: sha512-HPtaa38cPgWvaCFmRNhlc6NG7pv6NUHqjPgVAkWGoB9mQMwYB27/K0CvOM5Czy+qpT3e8XJ6Q4aPAnzpNpzNaw==}
-    dev: false
+  fast-shallow-equal@1.0.0: {}
 
-  /fast-uri@3.0.6:
-    resolution: {integrity: sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==}
-    dev: true
+  fast-uri@3.0.6: {}
 
-  /fast-url-parser@1.1.3:
-    resolution: {integrity: sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==}
+  fast-url-parser@1.1.3:
     dependencies:
       punycode: 1.4.1
-    dev: false
 
-  /fast-xml-parser@4.2.5:
-    resolution: {integrity: sha512-B9/wizE4WngqQftFPmdaMYlXoJlJOYxGQOanC77fq9k8+Z0v5dDSVh+3glErdIROP//s/jgb7ZuxKfB8nVyo0g==}
-    hasBin: true
+  fast-xml-parser@4.2.5:
     dependencies:
       strnum: 1.0.5
-    dev: false
 
-  /fast-xml-parser@4.4.1:
-    resolution: {integrity: sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==}
-    hasBin: true
+  fast-xml-parser@4.4.1:
     dependencies:
       strnum: 1.0.5
-    dev: false
 
-  /fastest-stable-stringify@2.0.2:
-    resolution: {integrity: sha512-bijHueCGd0LqqNK9b5oCMHc0MluJAx0cwqASgbWMvkO01lCYgIhacVRLcaDz3QnyYIRNJRDwMb41VuT6pHJ91Q==}
-    dev: false
+  fast-xml-parser@5.2.5:
+    dependencies:
+      strnum: 2.1.1
 
-  /fastify-plugin@5.0.1:
-    resolution: {integrity: sha512-HCxs+YnRaWzCl+cWRYFnHmeRFyR5GVnJTAaCJQiYzQSDwK9MgJdyAsuL3nh0EWRCYMgQ5MeziymvmAhUHYHDUQ==}
-    dev: true
+  fastest-stable-stringify@2.0.2: {}
 
-  /fastify@5.4.0:
-    resolution: {integrity: sha512-I4dVlUe+WNQAhKSyv15w+dwUh2EPiEl4X2lGYMmNSgF83WzTMAPKGdWEv5tPsCQOb+SOZwz8Vlta2vF+OeDgRw==}
+  fastify-plugin@5.0.1: {}
+
+  fastify@5.4.0:
     dependencies:
       '@fastify/ajv-compiler': 4.0.2
       '@fastify/error': 4.2.0
@@ -25160,119 +34614,69 @@ packages:
       process-warning: 5.0.0
       rfdc: 1.4.1
       secure-json-parse: 4.0.0
-      semver: 7.7.2
+      semver: 5.7.2
       toad-cache: 3.7.0
-    dev: true
 
-  /fastq@1.15.0:
-    resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==}
+  fastq@1.15.0:
     dependencies:
       reusify: 1.0.4
 
-  /fastq@1.19.1:
-    resolution: {integrity: sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==}
+  fastq@1.19.1:
     dependencies:
       reusify: 1.0.4
-    dev: true
 
-  /fault@2.0.1:
-    resolution: {integrity: sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==}
+  fault@2.0.1:
     dependencies:
       format: 0.2.2
-    dev: true
 
-  /fd-slicer@1.1.0:
-    resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
+  fd-slicer@1.1.0:
     dependencies:
       pend: 1.2.0
-    dev: false
 
-  /fdir@6.2.0(picomatch@4.0.2):
-    resolution: {integrity: sha512-9XaWcDl0riOX5j2kYfy0kKdg7skw3IY6kA4LFT8Tk2yF9UdrADUy8D6AJuBLtf7ISm/MksumwAHE3WVbMRyCLw==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-    dependencies:
+  fdir@6.2.0(picomatch@4.0.2):
+    optionalDependencies:
       picomatch: 4.0.2
-    dev: false
 
-  /fdir@6.4.3(picomatch@4.0.2):
-    resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-    dependencies:
+  fdir@6.4.3(picomatch@4.0.2):
+    optionalDependencies:
       picomatch: 4.0.2
 
-  /fdir@6.4.4(picomatch@4.0.2):
-    resolution: {integrity: sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-    dependencies:
+  fdir@6.4.4(picomatch@4.0.2):
+    optionalDependencies:
       picomatch: 4.0.2
-    dev: true
 
-  /fflate@0.4.8:
-    resolution: {integrity: sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==}
-    dev: false
+  fflate@0.4.8: {}
 
-  /fflate@0.8.2:
-    resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
-    dev: true
+  fflate@0.8.2: {}
 
-  /fft.js@4.0.4:
-    resolution: {integrity: sha512-f9c00hphOgeQTlDyavwTtu6RiK8AIFjD6+jvXkNkpeQ7rirK3uFWVpalkoS4LAwbdX7mfZ8aoBfFVQX1Re/8aw==}
-    dev: true
+  fft.js@4.0.4: {}
 
-  /figures@3.2.0:
-    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: '>=8'}
+  figures@6.1.0:
     dependencies:
-      escape-string-regexp: 1.0.5
-    dev: false
+      is-unicode-supported: 2.1.0
 
-  /file-entry-cache@6.0.1:
-    resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  file-entry-cache@6.0.1:
     dependencies:
       flat-cache: 3.0.4
 
-  /file-selector@0.6.0:
-    resolution: {integrity: sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw==}
-    engines: {node: '>= 12'}
+  file-selector@0.6.0:
     dependencies:
       tslib: 2.8.1
-    dev: false
 
-  /file-type@19.6.0:
-    resolution: {integrity: sha512-VZR5I7k5wkD0HgFnMsq5hOsSc710MJMu5Nc5QYsbe38NN5iPV/XTObYLc/cpttRTf6lX538+5uO1ZQRhYibiZQ==}
-    engines: {node: '>=18'}
+  file-type@19.6.0:
     dependencies:
       get-stream: 9.0.1
       strtok3: 9.1.1
       token-types: 6.0.3
       uint8array-extras: 1.4.0
-    dev: true
 
-  /file-uri-to-path@1.0.0:
-    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+  file-uri-to-path@1.0.0: {}
 
-  /fill-range@7.1.1:
-    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
-    engines: {node: '>=8'}
+  fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
 
-  /finalhandler@1.2.0:
-    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
-    engines: {node: '>= 0.8'}
+  finalhandler@1.2.0:
     dependencies:
       debug: 2.6.9
       encodeurl: 1.0.2
@@ -25284,11 +34688,9 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /finalhandler@2.1.0(supports-color@10.0.0):
-    resolution: {integrity: sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q==}
-    engines: {node: '>= 0.8'}
+  finalhandler@2.1.0(supports-color@10.0.0):
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -25296,372 +34698,195 @@ packages:
       statuses: 2.0.1
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /find-cache-dir@3.3.2:
-    resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
-    engines: {node: '>=8'}
-    dependencies:
-      commondir: 1.0.1
-      make-dir: 3.1.0
-      pkg-dir: 4.2.0
-    dev: true
 
-  /find-my-way-ts@0.1.5:
-    resolution: {integrity: sha512-4GOTMrpGQVzsCH2ruUn2vmwzV/02zF4q+ybhCIrw/Rkt3L8KWcycdC6aJMctJzwN4fXD4SD5F/4B9Sksh5rE0A==}
-    dev: false
+  find-my-way-ts@0.1.5: {}
 
-  /find-my-way@9.3.0:
-    resolution: {integrity: sha512-eRoFWQw+Yv2tuYlK2pjFS2jGXSxSppAs3hSQjfxVKxM5amECzIgYYc1FEI8ZmhSh/Ig+FrKEz43NLRKJjYCZVg==}
-    engines: {node: '>=20'}
+  find-my-way@9.3.0:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-querystring: 1.1.2
       safe-regex2: 5.0.0
-    dev: true
 
-  /find-up@4.1.0:
-    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
-    engines: {node: '>=8'}
+  find-up@4.1.0:
     dependencies:
       locate-path: 5.0.0
       path-exists: 4.0.0
 
-  /find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
+  find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
-  /find-up@7.0.0:
-    resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==}
-    engines: {node: '>=18'}
+  find-up@7.0.0:
     dependencies:
       locate-path: 7.2.0
       path-exists: 5.0.0
       unicorn-magic: 0.1.0
-    dev: true
 
-  /find-yarn-workspace-root2@1.2.16:
-    resolution: {integrity: sha512-hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA==}
+  find-yarn-workspace-root2@1.2.16:
     dependencies:
       micromatch: 4.0.8
       pkg-dir: 4.2.0
-    dev: false
 
-  /flat-cache@3.0.4:
-    resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==}
-    engines: {node: ^10.12.0 || >=12.0.0}
+  flat-cache@3.0.4:
     dependencies:
       flatted: 3.2.7
       rimraf: 3.0.2
 
-  /flatted@3.2.7:
-    resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==}
-
-  /fluent-ffmpeg@2.1.3:
-    resolution: {integrity: sha512-Be3narBNt2s6bsaqP6Jzq91heDgOEaDCJAXcE3qcma/EJBSy5FB4cvO31XBInuAuKBx8Kptf8dkhjK0IOru39Q==}
-    engines: {node: '>=18'}
-    dependencies:
-      async: 0.2.10
-      which: 1.3.1
-    dev: false
+  flatted@3.2.7: {}
 
-  /follow-redirects@1.15.9:
-    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
+  follow-redirects@1.15.9: {}
 
-  /for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+  for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
 
-  /foreground-child@3.1.1:
-    resolution: {integrity: sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==}
-    engines: {node: '>=14'}
+  foreground-child@3.1.1:
     dependencies:
       cross-spawn: 7.0.5
       signal-exit: 4.1.0
 
-  /forever-agent@0.6.1:
-    resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
-    dev: false
-
-  /form-data-encoder@1.7.2:
-    resolution: {integrity: sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==}
+  forever-agent@0.6.1: {}
 
-  /form-data@2.3.3:
-    resolution: {integrity: sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==}
-    engines: {node: '>= 0.12'}
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-    dev: false
+  form-data-encoder@1.7.2: {}
 
-  /form-data@2.5.1:
-    resolution: {integrity: sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==}
-    engines: {node: '>= 0.12'}
+  form-data@2.5.4:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      has-own: 1.0.1
       mime-types: 2.1.35
-    dev: false
+      safe-buffer: 5.2.1
 
-  /form-data@3.0.1:
-    resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
-    engines: {node: '>= 6'}
+  form-data@3.0.4:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      hasown: 2.0.2
       mime-types: 2.1.35
 
-  /form-data@4.0.0:
-    resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
-    engines: {node: '>= 6'}
+  form-data@4.0.4:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
+      es-set-tostringtag: 2.1.0
+      hasown: 2.0.2
       mime-types: 2.1.35
 
-  /format@0.2.2:
-    resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}
-    engines: {node: '>=0.4.x'}
-    dev: true
+  format@0.2.2: {}
 
-  /formdata-node@4.4.1:
-    resolution: {integrity: sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==}
-    engines: {node: '>= 12.20'}
+  formdata-node@4.4.1:
     dependencies:
       node-domexception: 1.0.0
       web-streams-polyfill: 4.0.0-beta.3
 
-  /formidable@3.5.1:
-    resolution: {integrity: sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==}
+  formidable@3.5.1:
     dependencies:
       dezalgo: 1.0.4
       hexoid: 1.0.0
       once: 1.4.0
-    dev: true
 
-  /forwarded@0.2.0:
-    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
-    engines: {node: '>= 0.6'}
-
-  /fp-ts@2.16.1:
-    resolution: {integrity: sha512-by7U5W8dkIzcvDofUcO42yl9JbnHTEDBrzu3pt5fKT+Z4Oy85I21K80EYJYdjQGC2qum4Vo55Ag57iiIK4FYuA==}
-    dev: true
-
-  /fraction.js@4.2.0:
-    resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
-    dev: true
-
-  /fraction.js@4.3.7:
-    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
-    dev: false
+  forwarded-parse@2.1.2: {}
 
-  /framer-motion@10.12.11(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-uNsJAc/BQZ9V7tYgzRBXSrEdB+YrdJTtRvgn+8lNAQucGKaINJBL8I4aqXxXdw+HzwJZb/uR955jnOrxBy5sTA==}
-    peerDependencies:
-      react: ^18.0.0
-      react-dom: ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
+  forwarded@0.2.0: {}
+
+  fraction.js@4.2.0: {}
+
+  fraction.js@4.3.7: {}
+
+  framer-motion@10.12.11(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
       tslib: 2.5.0
     optionalDependencies:
       '@emotion/is-prop-valid': 0.8.8
-    dev: false
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
 
-  /framer-motion@10.17.4(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-CYBSs6cWfzcasAX8aofgKFZootmkQtR4qxbfTOksBLny/lbUfkGbQAFOS3qnl6Uau1N9y8tUpI7mVIrHgkFjLQ==}
-    peerDependencies:
-      react: ^18.0.0
-      react-dom: ^18.0.0
-    peerDependenciesMeta:
-      react:
-        optional: true
-      react-dom:
-        optional: true
+  framer-motion@10.17.4(react-dom@18.2.0(react@18.3.1))(react@18.3.1):
     dependencies:
-      react: 18.3.1
-      react-dom: 18.2.0(react@18.3.1)
       tslib: 2.8.1
     optionalDependencies:
       '@emotion/is-prop-valid': 0.8.8
-    dev: false
-
-  /fresh@0.5.2:
-    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
-    engines: {node: '>= 0.6'}
+      react: 18.3.1
+      react-dom: 18.2.0(react@18.3.1)
 
-  /fresh@2.0.0:
-    resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
-    engines: {node: '>= 0.8'}
-    dev: false
+  fresh@0.5.2: {}
 
-  /fs-constants@1.0.0:
-    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+  fresh@2.0.0: {}
 
-  /fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      graceful-fs: 4.2.10
-      jsonfile: 6.1.0
-      universalify: 2.0.0
-    dev: true
+  fs-constants@1.0.0: {}
 
-  /fs-extra@11.1.1:
-    resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
-    engines: {node: '>=14.14'}
+  fs-extra@10.1.0:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.0
-    dev: true
 
-  /fs-extra@7.0.1:
-    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
-    engines: {node: '>=6 <7 || >=8'}
+  fs-extra@7.0.1:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 4.0.0
       universalify: 0.1.2
-    dev: false
 
-  /fs-extra@8.1.0:
-    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
-    engines: {node: '>=6 <7 || >=8'}
+  fs-extra@8.1.0:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 4.0.0
       universalify: 0.1.2
 
-  /fs-jetpack@5.1.0:
-    resolution: {integrity: sha512-Xn4fDhLydXkuzepZVsr02jakLlmoARPy+YWIclo4kh0GyNGUHnTqeH/w/qIsVn50dFxtp8otPL2t/HcPJBbxUA==}
-    dependencies:
-      minimatch: 5.1.6
-    dev: true
-
-  /fs-minipass@2.1.0:
-    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
-    engines: {node: '>= 8'}
+  fs-minipass@2.1.0:
     dependencies:
       minipass: 3.3.6
 
-  /fs-minipass@3.0.3:
-    resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  fs-minipass@3.0.3:
     dependencies:
       minipass: 7.1.2
 
-  /fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+  fs.realpath@1.0.0: {}
 
-  /fsevents@2.3.2:
-    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
+  fsevents@2.3.2:
     optional: true
 
-  /fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
+  fsevents@2.3.3:
     optional: true
 
-  /function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+  function-bind@1.1.2: {}
 
-  /function.prototype.name@1.1.5:
-    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
-    engines: {node: '>= 0.4'}
+  function.prototype.name@1.1.5:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
       functions-have-names: 1.2.3
 
-  /function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
-    engines: {node: '>= 0.4'}
+  function.prototype.name@1.1.6:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.3
       functions-have-names: 1.2.3
-    dev: true
-
-  /functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-
-  /gauge@4.0.4:
-    resolution: {integrity: sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    deprecated: This package is no longer supported.
-    requiresBuild: true
-    dependencies:
-      aproba: 2.0.0
-      color-support: 1.1.3
-      console-control-strings: 1.1.0
-      has-unicode: 2.0.1
-      signal-exit: 3.0.7
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wide-align: 1.1.5
-    dev: false
-    optional: true
 
-  /generative-bayesian-network@2.1.55:
-    resolution: {integrity: sha512-igqQZTtS4GFwkDWA5gFWQye9Lmkx184Y17+x9flFq8HC68RVuuQGPeQtBFdMMlnac7/2Bq1n+1rkp4S8ZAu7kA==}
-    dependencies:
-      adm-zip: 0.5.16
-      tslib: 2.8.1
-    dev: false
+  functions-have-names@1.2.3: {}
 
-  /generic-names@4.0.0:
-    resolution: {integrity: sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==}
+  generic-names@4.0.0:
     dependencies:
       loader-utils: 3.2.1
-    dev: true
 
-  /gensync@1.0.0-beta.2:
-    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
-    engines: {node: '>=6.9.0'}
+  gensync@1.0.0-beta.2: {}
 
-  /get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
+  get-caller-file@2.0.5: {}
 
-  /get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
-    engines: {node: '>= 0.4'}
+  get-intrinsic@1.2.4:
     dependencies:
       es-errors: 1.3.0
       function-bind: 1.1.2
       has-proto: 1.0.3
       has-symbols: 1.1.0
       hasown: 2.0.2
-    dev: true
 
-  /get-intrinsic@1.3.0:
-    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
-    engines: {node: '>= 0.4'}
+  get-intrinsic@1.3.0:
     dependencies:
       call-bind-apply-helpers: 1.0.2
       es-define-property: 1.0.1
@@ -25674,150 +34899,101 @@ packages:
       hasown: 2.0.2
       math-intrinsics: 1.1.0
 
-  /get-nonce@1.0.1:
-    resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
-    engines: {node: '>=6'}
-    dev: false
+  get-nonce@1.0.1: {}
 
-  /get-port@5.1.1:
-    resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
-    engines: {node: '>=8'}
+  get-port@5.1.1: {}
 
-  /get-port@7.1.0:
-    resolution: {integrity: sha512-QB9NKEeDg3xxVwCCwJQ9+xycaz6pBB6iQ76wiWMl1927n0Kir6alPiP+yuiICLLU4jpMe08dXfpebuQppFA2zw==}
-    engines: {node: '>=16'}
-    dev: true
+  get-port@7.1.0: {}
 
-  /get-proto@1.0.1:
-    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
-    engines: {node: '>= 0.4'}
+  get-proto@1.0.1:
     dependencies:
       dunder-proto: 1.0.1
       es-object-atoms: 1.1.1
 
-  /get-source@2.0.12:
-    resolution: {integrity: sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==}
-    dependencies:
-      data-uri-to-buffer: 2.0.2
-      source-map: 0.6.1
-    dev: false
-
-  /get-stream@4.1.0:
-    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
-    engines: {node: '>=6'}
+  get-stream@4.1.0:
     dependencies:
       pump: 3.0.2
-    dev: true
 
-  /get-stream@5.2.0:
-    resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
-    engines: {node: '>=8'}
+  get-stream@5.2.0:
     dependencies:
       pump: 3.0.2
 
-  /get-stream@6.0.1:
-    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: '>=10'}
-    dev: true
+  get-stream@6.0.1: {}
 
-  /get-stream@8.0.1:
-    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
-    engines: {node: '>=16'}
+  get-stream@8.0.1: {}
 
-  /get-stream@9.0.1:
-    resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==}
-    engines: {node: '>=18'}
+  get-stream@9.0.1:
     dependencies:
       '@sec-ant/readable-stream': 0.4.1
       is-stream: 4.0.1
-    dev: true
 
-  /get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
+  get-symbol-description@1.0.0:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       get-intrinsic: 1.3.0
 
-  /get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
-    engines: {node: '>= 0.4'}
+  get-symbol-description@1.0.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
-    dev: true
 
-  /get-tsconfig@4.7.2:
-    resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==}
+  get-tsconfig@4.7.2:
     dependencies:
       resolve-pkg-maps: 1.0.0
-    dev: true
 
-  /get-tsconfig@4.7.6:
-    resolution: {integrity: sha512-ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==}
+  get-tsconfig@4.7.6:
     dependencies:
       resolve-pkg-maps: 1.0.0
-    dev: true
 
-  /get-uri@6.0.1:
-    resolution: {integrity: sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==}
-    engines: {node: '>= 14'}
+  get-uri@6.0.1:
     dependencies:
       basic-ftp: 5.0.3
       data-uri-to-buffer: 5.0.1
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       fs-extra: 8.1.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /getpass@0.1.7:
-    resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
+  getpass@0.1.7:
     dependencies:
       assert-plus: 1.0.0
-    dev: false
 
-  /giget@1.2.3:
-    resolution: {integrity: sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==}
-    hasBin: true
+  giget@1.2.3:
     dependencies:
       citty: 0.1.6
-      consola: 3.2.3
+      consola: 3.4.2
       defu: 6.1.4
-      node-fetch-native: 1.6.4
+      node-fetch-native: 1.6.6
       nypm: 0.3.9
       ohash: 1.1.3
       pathe: 1.1.2
       tar: 6.2.1
-    dev: false
 
-  /git-last-commit@1.0.1:
-    resolution: {integrity: sha512-FDSgeMqa7GnJDxt/q0AbrxbfeTyxp4ImxEw1e4nw6NUHA5FMhFUq33dTXI4Xdgcj1VQ1q5QLWF6WxFrJ8KCBOg==}
-    dev: false
+  giget@2.0.0:
+    dependencies:
+      citty: 0.1.6
+      consola: 3.4.2
+      defu: 6.1.4
+      node-fetch-native: 1.6.6
+      nypm: 0.6.1
+      pathe: 2.0.3
 
-  /github-from-package@0.0.0:
-    resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+  git-last-commit@1.0.1: {}
 
-  /glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
+  github-from-package@0.0.0: {}
+
+  glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
 
-  /glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
+  glob-parent@6.0.2:
     dependencies:
       is-glob: 4.0.3
 
-  /glob-to-regexp@0.4.1:
-    resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==}
+  glob-to-regexp@0.4.1: {}
 
-  /glob@10.3.10:
-    resolution: {integrity: sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
+  glob@10.3.10:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.3.6
@@ -25825,21 +35001,15 @@ packages:
       minipass: 7.1.2
       path-scurry: 1.11.1
 
-  /glob@10.3.4:
-    resolution: {integrity: sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
+  glob@10.3.4:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 2.3.6
       minimatch: 9.0.5
       minipass: 7.1.2
       path-scurry: 1.11.1
-    dev: false
 
-  /glob@10.4.5:
-    resolution: {integrity: sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==}
-    hasBin: true
+  glob@10.4.5:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 3.4.3
@@ -25848,10 +35018,7 @@ packages:
       package-json-from-dist: 1.0.0
       path-scurry: 1.11.1
 
-  /glob@11.0.0:
-    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
-    engines: {node: 20 || >=22}
-    hasBin: true
+  glob@11.0.0:
     dependencies:
       foreground-child: 3.1.1
       jackspeak: 4.0.1
@@ -25859,11 +35026,8 @@ packages:
       minipass: 7.1.2
       package-json-from-dist: 1.0.0
       path-scurry: 2.0.0
-    dev: true
 
-  /glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
+  glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -25872,58 +35036,28 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob@8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: '>=12'}
-    deprecated: Glob versions prior to v9 are no longer supported
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.6
-      once: 1.4.0
-    dev: true
-
-  /glob@9.3.5:
-    resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  glob@9.3.5:
     dependencies:
       fs.realpath: 1.0.0
       minimatch: 8.0.4
       minipass: 4.2.8
       path-scurry: 1.11.1
-    dev: false
 
-  /global-dirs@3.0.1:
-    resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
-    engines: {node: '>=10'}
-    dependencies:
-      ini: 2.0.0
-    dev: true
-
-  /globals@11.12.0:
-    resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
-    engines: {node: '>=4'}
+  globals@11.12.0: {}
 
-  /globals@13.19.0:
-    resolution: {integrity: sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==}
-    engines: {node: '>=8'}
+  globals@13.19.0:
     dependencies:
       type-fest: 0.20.2
 
-  /globalthis@1.0.3:
-    resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
-    engines: {node: '>= 0.4'}
+  globals@15.15.0: {}
+
+  globalthis@1.0.3:
     dependencies:
-      define-properties: 1.1.4
+      define-properties: 1.2.1
 
-  /globalyzer@0.1.0:
-    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
-    dev: true
+  globalyzer@0.1.0: {}
 
-  /globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
+  globby@11.1.0:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
@@ -25932,28 +35066,19 @@ packages:
       merge2: 1.4.1
       slash: 3.0.0
 
-  /globby@13.2.2:
-    resolution: {integrity: sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  globby@13.2.2:
     dependencies:
       dir-glob: 3.0.1
       fast-glob: 3.3.3
       ignore: 5.2.4
       merge2: 1.4.1
       slash: 4.0.0
-    dev: true
 
-  /globrex@0.1.2:
-    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
-    dev: true
+  globrex@0.1.2: {}
 
-  /gopd@1.2.0:
-    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
-    engines: {node: '>= 0.4'}
+  gopd@1.2.0: {}
 
-  /got@9.6.0:
-    resolution: {integrity: sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==}
-    engines: {node: '>=8.6'}
+  got@9.6.0:
     dependencies:
       '@sindresorhus/is': 0.14.0
       '@szmarczak/http-timer': 1.1.2
@@ -25968,47 +35093,31 @@ packages:
       p-cancelable: 1.1.0
       to-readable-stream: 1.0.0
       url-parse-lax: 3.0.0
-    dev: true
 
-  /graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
-    dev: true
-
-  /graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+  graceful-fs@4.2.11: {}
 
-  /gradient-string@2.0.2:
-    resolution: {integrity: sha512-rEDCuqUQ4tbD78TpzsMtt5OIf0cBCSDWSJtUDaF6JsAh+k0v9r++NzxNEG87oDZx9ZwGhD8DaezR2L/yrw0Jdw==}
-    engines: {node: '>=10'}
+  gradient-string@2.0.2:
     dependencies:
       chalk: 4.1.2
       tinygradient: 1.1.5
-    dev: false
 
-  /grapheme-splitter@1.0.4:
-    resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==}
+  grapheme-splitter@1.0.4: {}
 
-  /graphile-config@0.0.1-beta.8:
-    resolution: {integrity: sha512-H8MinryZewvUigVLnkVDhKJgHrcNYGcLvgYWfSnR1d6l76iV9E8m4ZfN9estSHKVm6cyHhRfHBfL1G5QfXmS5A==}
-    engines: {node: '>=16'}
+  graphile-config@0.0.1-beta.8:
     dependencies:
       '@types/interpret': 1.1.3
       '@types/node': 20.14.14
       '@types/semver': 7.5.1
       chalk: 4.1.2
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       interpret: 3.1.1
-      semver: 7.6.3
-      tslib: 2.6.2
+      semver: 5.7.2
+      tslib: 2.8.1
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /graphile-worker@0.16.6(patch_hash=hdpetta7btqcc7xb5wfkcnanoa)(typescript@5.5.4):
-    resolution: {integrity: sha512-e7gGYDmGqzju2l83MpzX8vNG/lOtVJiSzI3eZpAFubSxh/cxs7sRrRGBGjzBP1kNG0H+c95etPpNRNlH65PYhw==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
+  graphile-worker@0.16.6(patch_hash=798129c99ed02177430fc90a1fdef800ec94e5fd1d491b931297dc52f4c98ab1)(typescript@5.5.4):
     dependencies:
       '@graphile/logger': 0.2.0
       '@types/debug': 4.1.12
@@ -26023,22 +35132,10 @@ packages:
       - pg-native
       - supports-color
       - typescript
-    dev: false
-    patched: true
-
-  /graphql@16.6.0:
-    resolution: {integrity: sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw==}
-    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
-    dev: false
 
-  /graphql@16.8.1:
-    resolution: {integrity: sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==}
-    engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
-    dev: false
+  graphql@16.6.0: {}
 
-  /gunzip-maybe@1.4.2:
-    resolution: {integrity: sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==}
-    hasBin: true
+  gunzip-maybe@1.4.2:
     dependencies:
       browserify-zlib: 0.1.4
       is-deflate: 1.0.0
@@ -26046,106 +35143,112 @@ packages:
       peek-stream: 1.1.3
       pumpify: 1.5.1
       through2: 2.0.5
-    dev: true
 
-  /gzip-size@6.0.0:
-    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
-    engines: {node: '>=10'}
+  gzip-size@6.0.0:
     dependencies:
       duplexer: 0.1.2
-    dev: true
 
-  /har-schema@2.0.0:
-    resolution: {integrity: sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==}
-    engines: {node: '>=4'}
-    dev: false
+  hachure-fill@0.5.2: {}
 
-  /har-validator@5.1.5:
-    resolution: {integrity: sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==}
-    engines: {node: '>=6'}
-    deprecated: this library is no longer supported
+  har-schema@2.0.0: {}
+
+  har-validator@5.1.5:
     dependencies:
       ajv: 6.12.6
       har-schema: 2.0.0
-    dev: false
 
-  /hard-rejection@2.1.0:
-    resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
-    engines: {node: '>=6'}
-    dev: false
+  hard-rejection@2.1.0: {}
 
-  /has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+  has-bigints@1.0.2: {}
 
-  /has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
+  has-flag@3.0.0: {}
 
-  /has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
+  has-flag@4.0.0: {}
 
-  /has-flag@5.0.1:
-    resolution: {integrity: sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA==}
-    engines: {node: '>=12'}
-    dev: false
+  has-flag@5.0.1: {}
 
-  /has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+  has-own@1.0.1: {}
+
+  has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.1
 
-  /has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
-    engines: {node: '>= 0.4'}
+  has-proto@1.0.3: {}
 
-  /has-symbols@1.1.0:
-    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
-    engines: {node: '>= 0.4'}
+  has-symbols@1.1.0: {}
 
-  /has-tostringtag@1.0.0:
-    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
-    engines: {node: '>= 0.4'}
+  has-tostringtag@1.0.2:
     dependencies:
       has-symbols: 1.1.0
 
-  /has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
-    engines: {node: '>= 0.4'}
+  has@1.0.3:
     dependencies:
-      has-symbols: 1.1.0
-    dev: true
-
-  /has-unicode@2.0.1:
-    resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
-    requiresBuild: true
-    dev: false
-    optional: true
+      function-bind: 1.1.2
 
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
+  hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
 
-  /hasha@5.2.2:
-    resolution: {integrity: sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==}
-    engines: {node: '>=8'}
+  hast-util-from-dom@5.0.1:
     dependencies:
-      is-stream: 2.0.1
-      type-fest: 0.8.1
-    dev: true
+      '@types/hast': 3.0.4
+      hastscript: 9.0.1
+      web-namespaces: 2.0.1
 
-  /hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
-    engines: {node: '>= 0.4'}
+  hast-util-from-html-isomorphic@2.0.0:
     dependencies:
-      function-bind: 1.1.2
+      '@types/hast': 3.0.4
+      hast-util-from-dom: 5.0.1
+      hast-util-from-html: 2.0.3
+      unist-util-remove-position: 5.0.0
+
+  hast-util-from-html@2.0.3:
+    dependencies:
+      '@types/hast': 3.0.4
+      devlop: 1.1.0
+      hast-util-from-parse5: 8.0.3
+      parse5: 7.3.0
+      vfile: 6.0.3
+      vfile-message: 4.0.2
+
+  hast-util-from-parse5@8.0.3:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/unist': 3.0.3
+      devlop: 1.1.0
+      hastscript: 9.0.1
+      property-information: 7.0.0
+      vfile: 6.0.3
+      vfile-location: 5.0.3
+      web-namespaces: 2.0.1
+
+  hast-util-is-element@3.0.0:
+    dependencies:
+      '@types/hast': 3.0.4
+
+  hast-util-parse-selector@4.0.0:
+    dependencies:
+      '@types/hast': 3.0.4
+
+  hast-util-raw@9.1.0:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/unist': 3.0.3
+      '@ungap/structured-clone': 1.3.0
+      hast-util-from-parse5: 8.0.3
+      hast-util-to-parse5: 8.0.0
+      html-void-elements: 3.0.0
+      mdast-util-to-hast: 13.2.0
+      parse5: 7.3.0
+      unist-util-position: 5.0.0
+      unist-util-visit: 5.0.0
+      vfile: 6.0.3
+      web-namespaces: 2.0.1
+      zwitch: 2.0.4
 
-  /hast-util-to-estree@2.1.0:
-    resolution: {integrity: sha512-Vwch1etMRmm89xGgz+voWXvVHba2iiMdGMKmaMfYt35rbVtFDq8JNwwAIvi8zHMkO6Gvqo9oTMwJTmzVRfXh4g==}
+  hast-util-to-estree@2.1.0:
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
       '@types/estree-jsx': 1.0.0
       '@types/hast': 2.3.4
       '@types/unist': 2.0.6
@@ -26162,12 +35265,24 @@ packages:
       zwitch: 2.0.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /hast-util-to-jsx-runtime@2.3.6:
-    resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==}
+  hast-util-to-html@9.0.5:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/unist': 3.0.3
+      ccount: 2.0.1
+      comma-separated-tokens: 2.0.3
+      hast-util-whitespace: 3.0.0
+      html-void-elements: 3.0.0
+      mdast-util-to-hast: 13.2.0
+      property-information: 7.0.0
+      space-separated-tokens: 2.0.2
+      stringify-entities: 4.0.3
+      zwitch: 2.0.4
+
+  hast-util-to-jsx-runtime@2.3.6:
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
       '@types/hast': 3.0.4
       '@types/unist': 3.0.3
       comma-separated-tokens: 2.0.3
@@ -26184,98 +35299,82 @@ packages:
       vfile-message: 4.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /hast-util-whitespace@2.0.1:
-    resolution: {integrity: sha512-nAxA0v8+vXSBDt3AnRUNjyRIQ0rD+ntpbAp4LnPkumc5M9yUbSMa4XDU9Q6etY4f1Wp4bNgvc1yjiZtsTTrSng==}
-    dev: true
+  hast-util-to-parse5@8.0.0:
+    dependencies:
+      '@types/hast': 3.0.4
+      comma-separated-tokens: 2.0.3
+      devlop: 1.1.0
+      property-information: 6.2.0
+      space-separated-tokens: 2.0.2
+      web-namespaces: 2.0.1
+      zwitch: 2.0.4
 
-  /hast-util-whitespace@3.0.0:
-    resolution: {integrity: sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==}
+  hast-util-to-text@4.0.2:
     dependencies:
       '@types/hast': 3.0.4
-    dev: false
+      '@types/unist': 3.0.3
+      hast-util-is-element: 3.0.0
+      unist-util-find-after: 5.0.0
 
-  /header-generator@2.1.55:
-    resolution: {integrity: sha512-UeR5q/hGY6o78wH9T5hBIdhTQ7kraw90jb+bhAuvcpEI6aEfzguYhNf33uxT2qbnOoSg8hFd0YCJtiEqujMPRg==}
-    engines: {node: '>=16.0.0'}
+  hast-util-whitespace@2.0.1: {}
+
+  hast-util-whitespace@3.0.0:
     dependencies:
-      browserslist: 4.23.3
-      generative-bayesian-network: 2.1.55
-      ow: 0.28.2
-      tslib: 2.6.2
-    dev: false
+      '@types/hast': 3.0.4
 
-  /headers-polyfill@4.0.2:
-    resolution: {integrity: sha512-EWGTfnTqAO2L/j5HZgoM/3z82L7necsJ0pO9Tp0X1wil3PDLrkypTBRgVO2ExehEEvUycejZD3FuRaXpZZc3kw==}
-    dev: false
+  hastscript@9.0.1:
+    dependencies:
+      '@types/hast': 3.0.4
+      comma-separated-tokens: 2.0.3
+      hast-util-parse-selector: 4.0.0
+      property-information: 7.0.0
+      space-separated-tokens: 2.0.2
 
-  /hexoid@1.0.0:
-    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
-    engines: {node: '>=8'}
-    dev: true
+  hexoid@1.0.0: {}
 
-  /highlight.js@10.7.3:
-    resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
+  highlight.js@10.7.3: {}
 
-  /highlight.run@7.3.4:
-    resolution: {integrity: sha512-Rgx+gy0tb2tH4hNzxYi/VK5pL/msaAtaQBIy8XsPHLujdSgo5OPWO6vOdjjB7ufM1l/CI2RLmlQ+L2QZOuHBjw==}
-    dev: false
+  hoist-non-react-statics@3.3.2:
+    dependencies:
+      react-is: 16.13.1
 
-  /hono@4.5.11:
-    resolution: {integrity: sha512-62FcjLPtjAFwISVBUshryl+vbHOjg8rE4uIK/dxyR8GpLztunZpwFmfEvmJCUI7xoGh/Sr3CGCDPCmYxVw7wUQ==}
-    engines: {node: '>=16.0.0'}
-    dev: true
+  hono@4.11.8: {}
 
-  /hosted-git-info@2.8.9:
-    resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==}
+  hono@4.5.11: {}
 
-  /hosted-git-info@6.1.1:
-    resolution: {integrity: sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  hosted-git-info@2.8.9: {}
+
+  hosted-git-info@6.1.1:
     dependencies:
       lru-cache: 7.18.3
-    dev: true
 
-  /html-escaper@2.0.2:
-    resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-    dev: true
+  html-escaper@2.0.2: {}
 
-  /html-tags@3.3.1:
-    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: '>=8'}
-    dev: false
+  html-tags@3.3.1: {}
 
-  /html-to-text@9.0.5:
-    resolution: {integrity: sha512-qY60FjREgVZL03vJU6IfMV4GDjGBIoOyvuFdpBDIX9yTlDw0TjxVBQp+P8NvpdIXNJvfWBTNul7fsAQJq2FNpg==}
-    engines: {node: '>=14'}
+  html-to-text@9.0.5:
     dependencies:
       '@selderee/plugin-htmlparser2': 0.11.0
       deepmerge: 4.3.1
       dom-serializer: 2.0.0
       htmlparser2: 8.0.2
       selderee: 0.11.0
-    dev: false
 
-  /html-url-attributes@3.0.1:
-    resolution: {integrity: sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ==}
-    dev: false
+  html-url-attributes@3.0.1: {}
 
-  /htmlparser2@8.0.2:
-    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
+  html-void-elements@3.0.0: {}
+
+  htmlparser2@8.0.2:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       domutils: 3.0.1
       entities: 4.5.0
-    dev: false
 
-  /http-cache-semantics@4.1.1:
-    resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
+  http-cache-semantics@4.1.1: {}
 
-  /http-errors@2.0.0:
-    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
-    engines: {node: '>= 0.8'}
+  http-errors@2.0.0:
     dependencies:
       depd: 2.0.0
       inherits: 2.0.4
@@ -26283,315 +35382,170 @@ packages:
       statuses: 2.0.1
       toidentifier: 1.0.1
 
-  /http-proxy-agent@4.0.1:
-    resolution: {integrity: sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==}
-    engines: {node: '>= 6'}
-    requiresBuild: true
-    dependencies:
-      '@tootallnate/once': 1.1.2
-      agent-base: 6.0.2
-      debug: 4.4.0(supports-color@10.0.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-    optional: true
-
-  /http-proxy-agent@7.0.0:
-    resolution: {integrity: sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==}
-    engines: {node: '>= 14'}
+  http-errors@2.0.1:
     dependencies:
-      agent-base: 7.1.0
-      debug: 4.4.0(supports-color@10.0.0)
-    transitivePeerDependencies:
-      - supports-color
+      depd: 2.0.0
+      inherits: 2.0.4
+      setprototypeof: 1.2.0
+      statuses: 2.0.2
+      toidentifier: 1.0.1
 
-  /http-proxy-agent@7.0.2:
-    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
-    engines: {node: '>= 14'}
+  http-proxy-agent@7.0.2:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0(supports-color@10.0.0)
+      agent-base: 7.1.4
+      debug: 4.4.1(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /http-signature@1.2.0:
-    resolution: {integrity: sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==}
-    engines: {node: '>=0.8', npm: '>=1.3.7'}
+  http-signature@1.2.0:
     dependencies:
       assert-plus: 1.0.0
       jsprim: 1.4.2
       sshpk: 1.18.0
-    dev: false
 
-  /https-proxy-agent@5.0.1:
-    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
-    engines: {node: '>= 6'}
+  https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /https-proxy-agent@7.0.2:
-    resolution: {integrity: sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==}
-    engines: {node: '>= 14'}
+  https-proxy-agent@7.0.6:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0(supports-color@10.0.0)
+      agent-base: 7.1.4
+      debug: 4.4.1(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
 
-  /https-proxy-agent@7.0.5:
-    resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==}
-    engines: {node: '>= 14'}
-    dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0(supports-color@10.0.0)
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+  human-id@1.0.2: {}
 
-  /human-id@1.0.2:
-    resolution: {integrity: sha512-UNopramDEhHJD+VR+ehk8rOslwSfByxPIZyJRfV739NDhN5LF1fa1MqnzKm2lGTQRjNrjK19Q5fhkgIfjlVUKw==}
-    dev: false
+  human-signals@2.1.0: {}
 
-  /human-signals@2.1.0:
-    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
-    engines: {node: '>=10.17.0'}
-    dev: true
+  human-signals@5.0.0: {}
 
-  /human-signals@5.0.0:
-    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
-    engines: {node: '>=16.17.0'}
+  human-signals@8.0.1: {}
 
-  /humanize-duration@3.27.3:
-    resolution: {integrity: sha512-iimHkHPfIAQ8zCDQLgn08pRqSVioyWvnGfaQ8gond2wf7Jq2jJ+24ykmnRyiz3fIldcn4oUuQXpjqKLhSVR7lw==}
-    dev: false
+  humanize-duration@3.27.3: {}
 
-  /humanize-ms@1.2.1:
-    resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
+  humanize-ms@1.2.1:
     dependencies:
       ms: 2.1.3
 
-  /hyphenate-style-name@1.0.4:
-    resolution: {integrity: sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==}
-    dev: false
+  hyphenate-style-name@1.0.4: {}
 
-  /iconv-lite@0.4.24:
-    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: '>=0.10.0'}
+  iconv-lite@0.4.24:
     dependencies:
       safer-buffer: 2.1.2
 
-  /iconv-lite@0.6.3:
-    resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
-    engines: {node: '>=0.10.0'}
-    requiresBuild: true
+  iconv-lite@0.6.3:
     dependencies:
       safer-buffer: 2.1.2
 
-  /icss-utils@5.1.0(postcss@8.4.29):
-    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  iconv-lite@0.7.2:
     dependencies:
-      postcss: 8.4.29
-    dev: true
+      safer-buffer: 2.1.2
 
-  /icss-utils@5.1.0(postcss@8.4.35):
-    resolution: {integrity: sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  icss-utils@5.1.0(postcss@8.4.35):
     dependencies:
       postcss: 8.4.35
-    dev: true
-
-  /ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /ignore-walk@5.0.1:
-    resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+  icss-utils@5.1.0(postcss@8.5.4):
     dependencies:
-      minimatch: 5.1.6
-    dev: true
+      postcss: 8.5.4
 
-  /ignore@5.2.4:
-    resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
-    engines: {node: '>= 4'}
+  ieee754@1.2.1: {}
 
-  /import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
+  ignore@5.2.4: {}
+
+  ignore@7.0.5: {}
+
+  import-fresh@3.3.0:
     dependencies:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
-  /import-in-the-middle@1.11.0:
-    resolution: {integrity: sha512-5DimNQGoe0pLUHbR9qK84iWaWjjbsxiqXnw6Qz64+azRgleqv9k2kTt5fw7QsOpmaGYtuxxursnPPsnTKEx10Q==}
+  import-in-the-middle@1.11.0:
     dependencies:
       acorn: 8.12.1
       acorn-import-attributes: 1.9.5(acorn@8.12.1)
       cjs-module-lexer: 1.2.3
       module-details-from-path: 1.0.3
-    dev: false
-
-  /import-in-the-middle@1.7.1:
-    resolution: {integrity: sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==}
-    dependencies:
-      acorn: 8.12.1
-      acorn-import-assertions: 1.9.0(acorn@8.12.1)
-      cjs-module-lexer: 1.2.3
-      module-details-from-path: 1.0.3
 
-  /import-in-the-middle@1.7.4:
-    resolution: {integrity: sha512-Lk+qzWmiQuRPPulGQeK5qq0v32k2bHnWrRPFgqyvhw7Kkov5L6MOLOIU3pcWeujc9W4q54Cp3Q2WV16eQkc7Bg==}
+  import-in-the-middle@1.14.2:
     dependencies:
-      acorn: 8.12.1
-      acorn-import-attributes: 1.9.5(acorn@8.12.1)
+      acorn: 8.15.0
+      acorn-import-attributes: 1.9.5(acorn@8.15.0)
       cjs-module-lexer: 1.2.3
       module-details-from-path: 1.0.3
-    dev: true
 
-  /import-meta-resolve@4.1.0:
-    resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==}
-    dev: false
-
-  /imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
+  import-meta-resolve@4.1.0: {}
 
-  /indent-string@4.0.0:
-    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
-    engines: {node: '>=8'}
+  imurmurhash@0.1.4: {}
 
-  /indent-string@5.0.0:
-    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
-    engines: {node: '>=12'}
-    dev: true
+  indent-string@4.0.0: {}
 
-  /infer-owner@1.0.4:
-    resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
-    requiresBuild: true
-    dev: false
-    optional: true
+  indent-string@5.0.0: {}
 
-  /inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+  inflight@1.0.6:
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
 
-  /inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-
-  /ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+  inherits@2.0.4: {}
 
-  /ini@2.0.0:
-    resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==}
-    engines: {node: '>=10'}
-    dev: true
+  ini@1.3.8: {}
 
-  /ini@5.0.0:
-    resolution: {integrity: sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-    dev: false
+  ini@5.0.0: {}
 
-  /inline-style-parser@0.1.1:
-    resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
-    dev: true
+  inline-style-parser@0.1.1: {}
 
-  /inline-style-parser@0.2.4:
-    resolution: {integrity: sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==}
-    dev: false
+  inline-style-parser@0.2.4: {}
 
-  /inline-style-prefixer@7.0.1:
-    resolution: {integrity: sha512-lhYo5qNTQp3EvSSp3sRvXMbVQTLrvGV6DycRMJ5dm2BLMiJ30wpXKdDdgX+GmJZ5uQMucwRKHamXSst3Sj/Giw==}
+  inline-style-prefixer@7.0.1:
     dependencies:
       css-in-js-utils: 3.1.0
-    dev: false
 
-  /input-otp@1.4.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-l3jWwYNvrEa6NTCt7BECfCm48GvwuZzkoeG3gBL2w4CHeOXW3eKFmf9UNYkNfYc3mxMrthMnxjIE07MT0zLBQA==}
-    peerDependencies:
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc
+  input-otp@1.4.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /install-artifact-from-github@1.3.5:
-    resolution: {integrity: sha512-gZHC7f/cJgXz7MXlHFBxPVMsvIbev1OQN1uKQYKVJDydGNm9oYf9JstbU4Atnh/eSvk41WtEovoRm+8IF686xg==}
-    hasBin: true
-    dev: false
-
-  /install@0.13.0:
-    resolution: {integrity: sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==}
-    engines: {node: '>= 0.10'}
-    dev: true
+  install@0.13.0: {}
 
-  /internal-slot@1.0.4:
-    resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==}
-    engines: {node: '>= 0.4'}
+  internal-slot@1.0.4:
     dependencies:
       get-intrinsic: 1.3.0
       has: 1.0.3
       side-channel: 1.1.0
 
-  /internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
-    engines: {node: '>= 0.4'}
+  internal-slot@1.0.7:
     dependencies:
       es-errors: 1.3.0
       hasown: 2.0.2
       side-channel: 1.1.0
-    dev: true
 
-  /internmap@2.0.3:
-    resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
-    engines: {node: '>=12'}
-    dev: false
+  internmap@1.0.1: {}
 
-  /interpret@1.4.0:
-    resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
-    engines: {node: '>= 0.10'}
-    dev: false
+  internmap@2.0.3: {}
 
-  /interpret@3.1.1:
-    resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==}
-    engines: {node: '>=10.13.0'}
-    dev: false
+  interpret@1.4.0: {}
 
-  /intl-messageformat@10.5.8:
-    resolution: {integrity: sha512-NRf0jpBWV0vd671G5b06wNofAN8tp7WWDogMZyaU8GUAsmbouyvgwmFJI7zLjfAMpm3zK+vSwRP3jzaoIcMbaA==}
+  interpret@3.1.1: {}
+
+  intl-messageformat@10.5.8:
     dependencies:
       '@formatjs/ecma402-abstract': 1.18.0
       '@formatjs/fast-memoize': 2.2.0
       '@formatjs/icu-messageformat-parser': 2.7.3
       tslib: 2.8.1
-    dev: false
 
-  /intl-parse-accept-language@1.0.0:
-    resolution: {integrity: sha512-YFMSV91JNBOSjw1cOfw2tup6hDP7mkz+2AUV7W1L1AM6ntgI75qC1ZeFpjPGMrWp+upmBRTX2fJWQ8c7jsUWpA==}
-    engines: {node: '>=14'}
-    dev: false
+  intl-parse-accept-language@1.0.0: {}
 
-  /invariant@2.2.4:
-    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
+  invariant@2.2.4:
     dependencies:
       loose-envify: 1.4.0
-    dev: false
 
-  /ioredis@5.3.2:
-    resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
-    engines: {node: '>=12.22.0'}
+  ioredis@5.3.2:
     dependencies:
       '@ioredis/commands': 1.2.0
       cluster-key-slot: 1.1.2
@@ -26604,875 +35558,510 @@ packages:
       standard-as-callback: 2.1.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /ip-address@9.0.5:
-    resolution: {integrity: sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==}
-    engines: {node: '>= 12'}
-    requiresBuild: true
+  ip-address@10.0.1: {}
+
+  ip-address@9.0.5:
     dependencies:
       jsbn: 1.1.0
       sprintf-js: 1.1.3
-    dev: false
 
-  /ipaddr.js@1.9.1:
-    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
-    engines: {node: '>= 0.10'}
+  ipaddr.js@1.9.1: {}
 
-  /ipaddr.js@2.2.0:
-    resolution: {integrity: sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==}
-    engines: {node: '>= 10'}
-    dev: true
+  ipaddr.js@2.2.0: {}
 
-  /is-alphabetical@2.0.1:
-    resolution: {integrity: sha512-FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==}
+  is-alphabetical@2.0.1: {}
 
-  /is-alphanumerical@2.0.1:
-    resolution: {integrity: sha512-hmbYhX/9MUMF5uh7tOXyK/n0ZvWpad5caBA17GsC6vyuCqaWliRG5K1qS9inmUhEMaOBIW7/whAnSwveW/LtZw==}
+  is-alphanumerical@2.0.1:
     dependencies:
       is-alphabetical: 2.0.1
       is-decimal: 2.0.1
 
-  /is-any-array@2.0.1:
-    resolution: {integrity: sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==}
-    dev: true
+  is-any-array@2.0.1: {}
 
-  /is-arguments@1.1.1:
-    resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
-    engines: {node: '>= 0.4'}
+  is-arguments@1.1.1:
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.0
+      call-bind: 1.0.8
+      has-tostringtag: 1.0.2
 
-  /is-array-buffer@3.0.1:
-    resolution: {integrity: sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==}
+  is-array-buffer@3.0.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       get-intrinsic: 1.3.0
-      is-typed-array: 1.1.10
+      is-typed-array: 1.1.13
 
-  /is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
-    engines: {node: '>= 0.4'}
+  is-array-buffer@3.0.4:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       get-intrinsic: 1.3.0
-    dev: true
 
-  /is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+  is-arrayish@0.2.1: {}
 
-  /is-arrayish@0.3.2:
-    resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
-    requiresBuild: true
-    dev: false
+  is-arrayish@0.3.2: {}
 
-  /is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+  is-bigint@1.0.4:
     dependencies:
       has-bigints: 1.0.2
 
-  /is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
+  is-binary-path@2.1.0:
     dependencies:
       binary-extensions: 2.2.0
 
-  /is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
+  is-boolean-object@1.1.2:
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.0
+      call-bind: 1.0.8
+      has-tostringtag: 1.0.2
 
-  /is-buffer@2.0.5:
-    resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==}
-    engines: {node: '>=4'}
-    dev: true
+  is-buffer@2.0.5: {}
 
-  /is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
+  is-callable@1.2.7: {}
 
-  /is-ci@3.0.1:
-    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
-    hasBin: true
+  is-ci@3.0.1:
     dependencies:
       ci-info: 3.8.0
-    dev: false
 
-  /is-core-module@2.13.0:
-    resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
-  /is-core-module@2.14.0:
-    resolution: {integrity: sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==}
-    engines: {node: '>= 0.4'}
+  is-core-module@2.14.0:
     dependencies:
       hasown: 2.0.2
 
-  /is-data-view@1.0.1:
-    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
-    engines: {node: '>= 0.4'}
+  is-data-view@1.0.1:
     dependencies:
       is-typed-array: 1.1.13
-    dev: true
 
-  /is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
+  is-date-object@1.0.5:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
-  /is-decimal@2.0.1:
-    resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
+  is-decimal@2.0.1: {}
 
-  /is-deflate@1.0.0:
-    resolution: {integrity: sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ==}
-    dev: true
+  is-deflate@1.0.0: {}
 
-  /is-docker@2.2.1:
-    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
-    engines: {node: '>=8'}
-    hasBin: true
-    dev: true
+  is-docker@2.2.1: {}
 
-  /is-docker@3.0.0:
-    resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    hasBin: true
-    dev: false
+  is-docker@3.0.0: {}
 
-  /is-electron@2.2.2:
-    resolution: {integrity: sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg==}
-    dev: false
+  is-electron@2.2.2: {}
 
-  /is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
+  is-extglob@2.1.1: {}
 
-  /is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
+  is-fullwidth-code-point@3.0.0: {}
 
-  /is-generator-function@1.0.10:
-    resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
-    engines: {node: '>= 0.4'}
+  is-generator-function@1.0.10:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
-  /is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
+  is-glob@4.0.3:
     dependencies:
       is-extglob: 2.1.1
 
-  /is-gzip@1.0.0:
-    resolution: {integrity: sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-gzip@1.0.0: {}
 
-  /is-hexadecimal@2.0.1:
-    resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==}
+  is-hexadecimal@2.0.1: {}
 
-  /is-inside-container@1.0.0:
-    resolution: {integrity: sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==}
-    engines: {node: '>=14.16'}
-    hasBin: true
+  is-inside-container@1.0.0:
     dependencies:
       is-docker: 3.0.0
-    dev: false
-
-  /is-interactive@1.0.0:
-    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
-    engines: {node: '>=8'}
-
-  /is-lambda@1.0.1:
-    resolution: {integrity: sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==}
-    dev: false
-
-  /is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-
-  /is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
-    engines: {node: '>= 0.4'}
-    dev: true
 
-  /is-network-error@1.0.0:
-    resolution: {integrity: sha512-P3fxi10Aji2FZmHTrMPSNFbNC6nnp4U5juPAIjXPHkUNubi4+qK7vvdsaNpAUwXslhYm9oyjEYTxs1xd/+Ph0w==}
-    engines: {node: '>=16'}
-    dev: false
+  is-interactive@1.0.0: {}
 
-  /is-node-process@1.2.0:
-    resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==}
-    dev: false
-
-  /is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      has-tostringtag: 1.0.0
+  is-negative-zero@2.0.2: {}
 
-  /is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
+  is-negative-zero@2.0.3: {}
 
-  /is-obj@2.0.0:
-    resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
-    engines: {node: '>=8'}
-    dev: false
+  is-network-error@1.0.0: {}
 
-  /is-path-cwd@2.2.0:
-    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
-    engines: {node: '>=6'}
-    dev: true
+  is-number-object@1.0.7:
+    dependencies:
+      has-tostringtag: 1.0.2
 
-  /is-path-inside@3.0.3:
-    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
-    engines: {node: '>=8'}
+  is-number@7.0.0: {}
 
-  /is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  is-path-inside@3.0.3: {}
 
-  /is-plain-obj@3.0.0:
-    resolution: {integrity: sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==}
-    engines: {node: '>=10'}
-    dev: true
+  is-plain-obj@1.1.0: {}
 
-  /is-plain-obj@4.1.0:
-    resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
-    engines: {node: '>=12'}
+  is-plain-obj@3.0.0: {}
 
-  /is-plain-object@5.0.0:
-    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-plain-obj@4.1.0: {}
 
-  /is-promise@4.0.0:
-    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
-    dev: false
+  is-plain-object@5.0.0: {}
 
-  /is-reference@3.0.1:
-    resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==}
-    dependencies:
-      '@types/estree': 1.0.7
-    dev: true
+  is-promise@4.0.0: {}
 
-  /is-reference@3.0.3:
-    resolution: {integrity: sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==}
+  is-reference@3.0.3:
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
 
-  /is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
+  is-regex@1.1.4:
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.0
+      call-bind: 1.0.8
+      has-tostringtag: 1.0.2
 
-  /is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
+  is-shared-array-buffer@1.0.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
 
-  /is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
-    engines: {node: '>= 0.4'}
+  is-shared-array-buffer@1.0.3:
     dependencies:
-      call-bind: 1.0.7
-    dev: true
+      call-bind: 1.0.8
 
-  /is-stream@2.0.1:
-    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
-    engines: {node: '>=8'}
+  is-stream@2.0.1: {}
 
-  /is-stream@3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  is-stream@3.0.0: {}
 
-  /is-stream@4.0.1:
-    resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==}
-    engines: {node: '>=18'}
-    dev: true
+  is-stream@4.0.1: {}
 
-  /is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
+  is-string@1.0.7:
     dependencies:
-      has-tostringtag: 1.0.0
+      has-tostringtag: 1.0.2
 
-  /is-subdir@1.2.0:
-    resolution: {integrity: sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==}
-    engines: {node: '>=4'}
+  is-subdir@1.2.0:
     dependencies:
       better-path-resolve: 1.0.0
-    dev: false
 
-  /is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
+  is-symbol@1.0.4:
     dependencies:
       has-symbols: 1.1.0
 
-  /is-typed-array@1.1.10:
-    resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.2.0
-      has-tostringtag: 1.0.0
-
-  /is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
-    engines: {node: '>= 0.4'}
+  is-typed-array@1.1.13:
     dependencies:
       which-typed-array: 1.1.15
-    dev: true
 
-  /is-typedarray@1.0.0:
-    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
-    dev: false
+  is-typedarray@1.0.0: {}
 
-  /is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
+  is-unicode-supported@0.1.0: {}
 
-  /is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+  is-unicode-supported@2.1.0: {}
+
+  is-weakref@1.0.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
 
-  /is-what@4.1.16:
-    resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==}
-    engines: {node: '>=12.13'}
-    dev: false
+  is-what@4.1.16: {}
 
-  /is-windows@1.0.2:
-    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: '>=0.10.0'}
+  is-windows@1.0.2: {}
 
-  /is-wsl@2.2.0:
-    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
-    engines: {node: '>=8'}
+  is-wsl@2.2.0:
     dependencies:
       is-docker: 2.2.1
-    dev: true
 
-  /is-wsl@3.1.0:
-    resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
-    engines: {node: '>=16'}
+  is-wsl@3.1.0:
     dependencies:
       is-inside-container: 1.0.0
-    dev: false
-
-  /isarray@1.0.0:
-    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
-    dev: true
-
-  /isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-    dev: true
 
-  /isbot@3.6.5:
-    resolution: {integrity: sha512-BchONELXt6yMad++BwGpa0oQxo/uD0keL7N15cYVf0A1oMIoNQ79OqeYdPMFWDrNhCqCbRuw9Y9F3QBjvAxZ5g==}
-    engines: {node: '>=12'}
-    dev: false
+  isarray@1.0.0: {}
 
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+  isarray@2.0.5: {}
 
-  /isexe@3.1.1:
-    resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==}
-    engines: {node: '>=16'}
-    dev: false
+  isbot@3.6.5: {}
 
-  /isomorphic-ws@5.0.0(ws@8.16.0):
-    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
-    peerDependencies:
-      ws: '*'
-    dependencies:
-      ws: 8.16.0
-    dev: false
+  isexe@2.0.0: {}
 
-  /isomorphic-ws@5.0.0(ws@8.18.0):
-    resolution: {integrity: sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==}
-    peerDependencies:
-      ws: '*'
+  isomorphic-ws@5.0.0(ws@8.17.1(bufferutil@4.0.9)):
     dependencies:
-      ws: 8.18.0(bufferutil@4.0.9)
-    dev: false
+      ws: 8.17.1(bufferutil@4.0.9)
 
-  /isstream@0.1.2:
-    resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==}
-    dev: false
+  isstream@0.1.2: {}
 
-  /istanbul-lib-coverage@3.2.2:
-    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
-    engines: {node: '>=8'}
-    dev: true
+  istanbul-lib-coverage@3.2.2: {}
 
-  /istanbul-lib-report@3.0.1:
-    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
-    engines: {node: '>=10'}
+  istanbul-lib-report@3.0.1:
     dependencies:
       istanbul-lib-coverage: 3.2.2
       make-dir: 4.0.0
       supports-color: 7.2.0
-    dev: true
 
-  /istanbul-lib-source-maps@5.0.6:
-    resolution: {integrity: sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==}
-    engines: {node: '>=10'}
+  istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /istanbul-reports@3.1.7:
-    resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
-    engines: {node: '>=8'}
+  istanbul-reports@3.1.7:
     dependencies:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.1
-    dev: true
 
-  /jackspeak@2.3.6:
-    resolution: {integrity: sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==}
-    engines: {node: '>=14'}
+  jackspeak@2.3.6:
     dependencies:
       '@isaacs/cliui': 8.0.2
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
-  /jackspeak@3.4.3:
-    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
+  jackspeak@3.4.3:
     dependencies:
       '@isaacs/cliui': 8.0.2
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
 
-  /jackspeak@4.0.1:
-    resolution: {integrity: sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==}
-    engines: {node: 20 || >=22}
+  jackspeak@4.0.1:
     dependencies:
       '@isaacs/cliui': 8.0.2
     optionalDependencies:
       '@pkgjs/parseargs': 0.11.0
-    dev: true
 
-  /javascript-stringify@2.1.0:
-    resolution: {integrity: sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==}
-    dev: true
+  javascript-stringify@2.1.0: {}
 
-  /jest-worker@27.5.1:
-    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: '>= 10.13.0'}
+  jest-worker@27.5.1:
     dependencies:
       '@types/node': 20.14.14
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
-  /jiti@1.21.0:
-    resolution: {integrity: sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==}
-    hasBin: true
-    dev: true
+  jiti@1.21.0: {}
 
-  /jiti@1.21.6:
-    resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
-    hasBin: true
+  jiti@1.21.6: {}
 
-  /jiti@2.4.2:
-    resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==}
-    hasBin: true
-    dev: true
+  jiti@2.4.2: {}
 
-  /joi@17.7.0:
-    resolution: {integrity: sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg==}
+  joi@17.7.0:
     dependencies:
       '@hapi/hoek': 9.3.0
       '@hapi/topo': 5.1.0
       '@sideway/address': 4.1.4
       '@sideway/formula': 3.0.1
       '@sideway/pinpoint': 2.0.0
-    dev: false
 
-  /jose@4.15.9:
-    resolution: {integrity: sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==}
-    requiresBuild: true
-    dev: false
+  jose@4.15.9:
     optional: true
 
-  /jose@5.4.0:
-    resolution: {integrity: sha512-6rpxTHPAQyWMb9A35BroFl1Sp0ST3DpPcm5EVIxZxdH+e0Hv9fwhyB3XLKFUcHNpdSDnETmBfuPPTTlYz5+USw==}
-    dev: false
+  jose@5.4.0: {}
 
-  /jose@6.0.8:
-    resolution: {integrity: sha512-EyUPtOKyTYq+iMOszO42eobQllaIjJnwkZ2U93aJzNyPibCy7CEvT9UQnaCVB51IAd49gbNdCew1c0LcLTCB2g==}
-    dev: false
+  jose@6.0.8: {}
 
-  /joycon@3.1.1:
-    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
-    engines: {node: '>=10'}
-    dev: true
+  jose@6.1.3: {}
 
-  /js-beautify@1.15.1:
-    resolution: {integrity: sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==}
-    engines: {node: '>=14'}
-    hasBin: true
+  joycon@3.1.1: {}
+
+  js-beautify@1.15.1:
     dependencies:
       config-chain: 1.1.13
       editorconfig: 1.0.4
       glob: 10.4.5
       js-cookie: 3.0.5
       nopt: 7.2.0
-    dev: false
-
-  /js-cookie@2.2.1:
-    resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==}
-    dev: false
 
-  /js-cookie@3.0.5:
-    resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
-    engines: {node: '>=14'}
-    dev: false
+  js-cookie@2.2.1: {}
 
-  /js-levenshtein@1.1.6:
-    resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  js-cookie@3.0.5: {}
 
-  /js-sdsl@4.2.0:
-    resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
+  js-levenshtein@1.1.6: {}
 
-  /js-tiktoken@1.0.14:
-    resolution: {integrity: sha512-Pk3l3WOgM9joguZY2k52+jH82RtABRgB5RdGFZNUGbOKGMVlNmafcPA3b0ITcCZPu1L9UclP1tne6aw7ZI4Myg==}
-    dependencies:
-      base64-js: 1.5.1
-    dev: false
+  js-sdsl@4.2.0: {}
 
-  /js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+  js-tokens@4.0.0: {}
 
-  /js-yaml@3.14.1:
-    resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==}
-    hasBin: true
+  js-yaml@3.14.2:
     dependencies:
       argparse: 1.0.10
       esprima: 4.0.1
 
-  /js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
-    hasBin: true
+  js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
 
-  /jsbn@0.1.1:
-    resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
-    dev: false
+  jsbn@0.1.1: {}
 
-  /jsbn@1.1.0:
-    resolution: {integrity: sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==}
-    requiresBuild: true
-    dev: false
+  jsbn@1.1.0: {}
 
-  /jsep@1.4.0:
-    resolution: {integrity: sha512-B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==}
-    engines: {node: '>= 10.16.0'}
-    dev: false
+  jsep@1.4.0: {}
 
-  /jsesc@2.5.2:
-    resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
-    engines: {node: '>=4'}
-    hasBin: true
+  jsesc@2.5.2: {}
 
-  /jsesc@3.0.2:
-    resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dev: true
+  jsesc@3.0.2: {}
 
-  /json-buffer@3.0.0:
-    resolution: {integrity: sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==}
-    dev: true
+  json-buffer@3.0.0: {}
 
-  /json-parse-better-errors@1.0.2:
-    resolution: {integrity: sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==}
-    dev: true
+  json-parse-better-errors@1.0.2: {}
 
-  /json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+  json-parse-even-better-errors@2.3.1: {}
 
-  /json-parse-even-better-errors@3.0.0:
-    resolution: {integrity: sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
+  json-parse-even-better-errors@3.0.0: {}
 
-  /json-schema-ref-resolver@2.0.1:
-    resolution: {integrity: sha512-HG0SIB9X4J8bwbxCbnd5FfPEbcXAJYTi1pBJeP/QPON+w8ovSME8iRG+ElHNxZNX2Qh6eYn1GdzJFS4cDFfx0Q==}
+  json-schema-ref-resolver@2.0.1:
     dependencies:
       dequal: 2.0.3
-    dev: true
 
-  /json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+  json-schema-traverse@0.4.1: {}
 
-  /json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
+  json-schema-traverse@1.0.0: {}
 
-  /json-schema@0.4.0:
-    resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
+  json-schema-typed@8.0.2: {}
 
-  /json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+  json-schema@0.4.0: {}
 
-  /json-stringify-safe@5.0.1:
-    resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
-    dev: false
+  json-stable-stringify-without-jsonify@1.0.1: {}
 
-  /json5@1.0.2:
-    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
-    hasBin: true
+  json-stable-stringify@1.3.0:
+    dependencies:
+      call-bind: 1.0.8
+      call-bound: 1.0.4
+      isarray: 2.0.5
+      jsonify: 0.0.1
+      object-keys: 1.1.1
+
+  json-stringify-safe@5.0.1: {}
+
+  json5@1.0.2:
     dependencies:
       minimist: 1.2.7
-    dev: true
 
-  /json5@2.2.3:
-    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: '>=6'}
-    hasBin: true
+  json5@2.2.3: {}
 
-  /jsonc-parser@3.2.1:
-    resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==}
-    dev: false
+  jsonc-parser@3.2.1: {}
 
-  /jsondiffpatch@0.6.0:
-    resolution: {integrity: sha512-3QItJOXp2AP1uv7waBkao5nCvhEv+QmJAd38Ybq7wNI74Q+BBmnLn4EDKz6yI9xGAIQoUF87qHt+kc1IVxB4zQ==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
+  jsondiffpatch@0.6.0:
     dependencies:
       '@types/diff-match-patch': 1.0.36
       chalk: 5.3.0
       diff-match-patch: 1.0.5
 
-  /jsonfile@4.0.0:
-    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
+  jsonfile@4.0.0:
     optionalDependencies:
       graceful-fs: 4.2.11
 
-  /jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+  jsonfile@6.1.0:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
       graceful-fs: 4.2.11
-    dev: true
 
-  /jsonpath-plus@10.3.0:
-    resolution: {integrity: sha512-8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  jsonify@0.0.1: {}
+
+  jsonpath-plus@10.3.0:
     dependencies:
       '@jsep-plugin/assignment': 1.3.0(jsep@1.4.0)
       '@jsep-plugin/regex': 1.0.4(jsep@1.4.0)
       jsep: 1.4.0
-    dev: false
 
-  /jsonpath-plus@7.2.0:
-    resolution: {integrity: sha512-zBfiUPM5nD0YZSBT/o/fbCUlCcepMIdP0CJZxM1+KgA4f2T206f6VAg9e7mX35+KlMaIc5qXW34f3BnwJ3w+RA==}
-    engines: {node: '>=12.0.0'}
-    dev: false
+  jsonpath-plus@7.2.0: {}
 
-  /jsonpointer@5.0.1:
-    resolution: {integrity: sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  jsonpointer@5.0.1: {}
 
-  /jsprim@1.4.2:
-    resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
-    engines: {node: '>=0.6.0'}
+  jsonwebtoken@9.0.2:
+    dependencies:
+      jws: 3.2.3
+      lodash.includes: 4.3.0
+      lodash.isboolean: 3.0.3
+      lodash.isinteger: 4.0.4
+      lodash.isnumber: 3.0.3
+      lodash.isplainobject: 4.0.6
+      lodash.isstring: 4.0.1
+      lodash.once: 4.1.1
+      ms: 2.1.3
+      semver: 5.7.2
+
+  jsprim@1.4.2:
     dependencies:
       assert-plus: 1.0.0
       extsprintf: 1.3.0
       json-schema: 0.4.0
       verror: 1.10.0
-    dev: false
 
-  /jsx-ast-utils@3.3.3:
-    resolution: {integrity: sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==}
-    engines: {node: '>=4.0'}
+  jsx-ast-utils@3.3.3:
     dependencies:
       array-includes: 3.1.6
-      object.assign: 4.1.4
-    dev: true
+      object.assign: 4.1.5
 
-  /junk@4.0.1:
-    resolution: {integrity: sha512-Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==}
-    engines: {node: '>=12.20'}
-    dev: true
+  junk@4.0.1: {}
 
-  /keyv@3.1.0:
-    resolution: {integrity: sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==}
+  jwa@1.4.2:
+    dependencies:
+      buffer-equal-constant-time: 1.0.1
+      ecdsa-sig-formatter: 1.0.11
+      safe-buffer: 5.2.1
+
+  jws@3.2.3:
+    dependencies:
+      jwa: 1.4.2
+      safe-buffer: 5.2.1
+
+  katex@0.16.25:
+    dependencies:
+      commander: 8.3.0
+
+  keyv@3.1.0:
     dependencies:
       json-buffer: 3.0.0
-    dev: true
 
-  /kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  khroma@2.1.0: {}
 
-  /kleur@3.0.3:
-    resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
-    engines: {node: '>=6'}
-    dev: true
+  kind-of@6.0.3: {}
 
-  /kleur@4.1.5:
-    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
-    engines: {node: '>=6'}
+  kleur@4.1.5: {}
 
-  /kysely@0.27.4:
-    resolution: {integrity: sha512-dyNKv2KRvYOQPLCAOCjjQuCk4YFd33BvGdf/o5bC7FiW+BB6snA81Zt+2wT9QDFzKqxKa5rrOmvlK/anehCcgA==}
-    engines: {node: '>=14.0.0'}
-    dev: false
+  kolorist@1.8.0: {}
 
-  /langsmith@0.2.15(openai@4.68.4):
-    resolution: {integrity: sha512-homtJU41iitqIZVuuLW7iarCzD4f39KcfP9RTBWav9jifhrsDa1Ez89Ejr+4qi72iuBu8Y5xykchsGVgiEZ93w==}
-    peerDependencies:
-      openai: '*'
-    peerDependenciesMeta:
-      openai:
-        optional: true
+  langium@3.3.1:
+    dependencies:
+      chevrotain: 11.0.3
+      chevrotain-allstar: 0.3.1(chevrotain@11.0.3)
+      vscode-languageserver: 9.0.1
+      vscode-languageserver-textdocument: 1.0.12
+      vscode-uri: 3.0.8
+
+  langsmith@0.2.15(openai@4.68.4(encoding@0.1.13)(zod@3.25.76)):
     dependencies:
       '@types/uuid': 10.0.0
       commander: 10.0.1
-      openai: 4.68.4(zod@3.23.8)
       p-queue: 6.6.2
       p-retry: 4.6.2
-      semver: 7.6.3
+      semver: 5.7.2
       uuid: 10.0.0
-    dev: false
+    optionalDependencies:
+      openai: 4.68.4(encoding@0.1.13)(zod@3.25.76)
 
-  /language-subtag-registry@0.3.22:
-    resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==}
-    dev: true
+  language-subtag-registry@0.3.22: {}
 
-  /language-tags@1.0.5:
-    resolution: {integrity: sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==}
+  language-tags@1.0.5:
     dependencies:
       language-subtag-registry: 0.3.22
-    dev: true
 
-  /layerr@2.0.1:
-    resolution: {integrity: sha512-z0730CwG/JO24evdORnyDkwG1Q7b7mF2Tp1qRQ0YvrMMARbt1DFG694SOv439Gm7hYKolyZyaB49YIrYIfZBdg==}
-    dev: false
+  layerr@2.0.1: {}
 
-  /lazystream@1.0.1:
-    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: '>= 0.6.3'}
+  layout-base@1.0.2: {}
+
+  layout-base@2.0.1: {}
+
+  lazystream@1.0.1:
     dependencies:
       readable-stream: 2.3.8
-    dev: true
 
-  /leac@0.6.0:
-    resolution: {integrity: sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==}
-    dev: false
+  leac@0.6.0: {}
 
-  /lefthook-darwin-arm64@1.11.3:
-    resolution: {integrity: sha512-IYzAOf8Qwqk7q+LoRyy7kSk9vzpUZ5wb/vLzEAH/F86Vay9AUaWe1f2pzeLwFg18qEc1QNklT69h9p/uLQMojA==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  lefthook-darwin-arm64@1.11.3:
     optional: true
 
-  /lefthook-darwin-x64@1.11.3:
-    resolution: {integrity: sha512-z/Wp7UMjE1Vyl+x9sjN3NvN6qKdwgHl+cDf98MKKDg/WyPE5XnzqLm9rLLJgImjyClfH7ptTfZxEyhTG3M3XvQ==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  lefthook-darwin-x64@1.11.3:
     optional: true
 
-  /lefthook-freebsd-arm64@1.11.3:
-    resolution: {integrity: sha512-QevwQ7lrv5wBCkk7LLTzT5KR3Bk/5nttSxT1UH2o0EsgirS/c2K5xSgQmV6m3CiZYuCe2Pja4BSIwN3zt17SMw==}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  lefthook-freebsd-arm64@1.11.3:
     optional: true
 
-  /lefthook-freebsd-x64@1.11.3:
-    resolution: {integrity: sha512-PYbcyNgdJJ4J2pEO9Ss4oYo5yq4vmQGTKm3RTYbRx4viSWR65hvKCP0C4LnIqspMvmR05SJi2bqe7UBP2t60EA==}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+  lefthook-freebsd-x64@1.11.3:
     optional: true
 
-  /lefthook-linux-arm64@1.11.3:
-    resolution: {integrity: sha512-0pBMBAoafOAEg345eOPozsmRjWR0zCr6k+m5ZxwRBZbZx1bQFDqBakQ3TpFCphhcykmgFyaa1KeZJZUOrEsezA==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lefthook-linux-arm64@1.11.3:
     optional: true
 
-  /lefthook-linux-x64@1.11.3:
-    resolution: {integrity: sha512-eiezheZ/bisBCMB2Ur0mctug/RDFyu39B5wzoE8y4z0W1yw6jHGrWMJ4Y8+5qKZ7fmdZg+7YPuMHZ2eFxOnhQA==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lefthook-linux-x64@1.11.3:
     optional: true
 
-  /lefthook-openbsd-arm64@1.11.3:
-    resolution: {integrity: sha512-DRLTzXdtCj/TizpLcGSqXcnrqvgxeXgn/6nqzclIGqNdKCsNXDzpI0D3sP13Vwwmyoqv2etoTak2IHqZiXZDqg==}
-    cpu: [arm64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  lefthook-openbsd-arm64@1.11.3:
     optional: true
 
-  /lefthook-openbsd-x64@1.11.3:
-    resolution: {integrity: sha512-l7om+ZjWpYrVZyDuElwnucZhEqa7YfwlRaKBenkBxEh2zMje8O6Zodeuma1KmyDbSFvnvEjARo/Ejiot4gLXEw==}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
+  lefthook-openbsd-x64@1.11.3:
     optional: true
 
-  /lefthook-windows-arm64@1.11.3:
-    resolution: {integrity: sha512-X0iTrql2gfPAkU2dzRwuHWgW5RcqCPbzJtKQ41X6Y/F7iQacRknmuYUGyC81funSvzGAsvlusMVLUvaFjIKnbA==}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  lefthook-windows-arm64@1.11.3:
     optional: true
 
-  /lefthook-windows-x64@1.11.3:
-    resolution: {integrity: sha512-F+ORMn6YJXoS0EXU5LtN1FgV4QX9rC9LucZEkRmK6sKmS7hcb9IHpyb7siRGytArYzJvXVjPbxPBNSBdN4egZQ==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  lefthook-windows-x64@1.11.3:
     optional: true
 
-  /lefthook@1.11.3:
-    resolution: {integrity: sha512-HJp37y62j3j8qzAOODWuUJl4ysLwsDvCTBV6odr3jIRHR/a5e+tI14VQGIBcpK9ysqC3pGWyW5Rp9Jv1YDubyw==}
-    hasBin: true
-    requiresBuild: true
+  lefthook@1.11.3:
     optionalDependencies:
       lefthook-darwin-arm64: 1.11.3
       lefthook-darwin-x64: 1.11.3
@@ -27484,118 +36073,51 @@ packages:
       lefthook-openbsd-x64: 1.11.3
       lefthook-windows-arm64: 1.11.3
       lefthook-windows-x64: 1.11.3
-    dev: true
 
-  /levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
+  levn@0.4.1:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  /light-my-request@6.6.0:
-    resolution: {integrity: sha512-CHYbu8RtboSIoVsHZ6Ye4cj4Aw/yg2oAFimlF7mNvfDV192LR7nDiKtSIfCuLT7KokPSTn/9kfVLm5OGN0A28A==}
+  light-my-request@6.6.0:
     dependencies:
       cookie: 1.0.2
       process-warning: 4.0.1
       set-cookie-parser: 2.6.0
-    dev: true
 
-  /lightningcss-darwin-arm64@1.29.2:
-    resolution: {integrity: sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  lightningcss-darwin-arm64@1.29.2:
     optional: true
 
-  /lightningcss-darwin-x64@1.29.2:
-    resolution: {integrity: sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  lightningcss-darwin-x64@1.29.2:
     optional: true
-
-  /lightningcss-freebsd-x64@1.29.2:
-    resolution: {integrity: sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
+
+  lightningcss-freebsd-x64@1.29.2:
     optional: true
 
-  /lightningcss-linux-arm-gnueabihf@1.29.2:
-    resolution: {integrity: sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lightningcss-linux-arm-gnueabihf@1.29.2:
     optional: true
 
-  /lightningcss-linux-arm64-gnu@1.29.2:
-    resolution: {integrity: sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lightningcss-linux-arm64-gnu@1.29.2:
     optional: true
 
-  /lightningcss-linux-arm64-musl@1.29.2:
-    resolution: {integrity: sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lightningcss-linux-arm64-musl@1.29.2:
     optional: true
 
-  /lightningcss-linux-x64-gnu@1.29.2:
-    resolution: {integrity: sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lightningcss-linux-x64-gnu@1.29.2:
     optional: true
 
-  /lightningcss-linux-x64-musl@1.29.2:
-    resolution: {integrity: sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  lightningcss-linux-x64-musl@1.29.2:
     optional: true
 
-  /lightningcss-win32-arm64-msvc@1.29.2:
-    resolution: {integrity: sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  lightningcss-win32-arm64-msvc@1.29.2:
     optional: true
 
-  /lightningcss-win32-x64-msvc@1.29.2:
-    resolution: {integrity: sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==}
-    engines: {node: '>= 12.0.0'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  lightningcss-win32-x64-msvc@1.29.2:
     optional: true
 
-  /lightningcss@1.29.2:
-    resolution: {integrity: sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==}
-    engines: {node: '>= 12.0.0'}
+  lightningcss@1.29.2:
     dependencies:
-      detect-libc: 2.0.3
+      detect-libc: 2.1.2
     optionalDependencies:
       lightningcss-darwin-arm64: 1.29.2
       lightningcss-darwin-x64: 1.29.2
@@ -27607,405 +36129,209 @@ packages:
       lightningcss-linux-x64-musl: 1.29.2
       lightningcss-win32-arm64-msvc: 1.29.2
       lightningcss-win32-x64-msvc: 1.29.2
-    dev: true
 
-  /lilconfig@2.1.0:
-    resolution: {integrity: sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==}
-    engines: {node: '>=10'}
+  lilconfig@2.1.0: {}
 
-  /lilconfig@3.1.3:
-    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
-    engines: {node: '>=14'}
+  lilconfig@3.1.3: {}
 
-  /linear-sum-assignment@1.0.7:
-    resolution: {integrity: sha512-jfLoSGwZNyjfY8eK4ayhjfcIu3BfWvP6sWieYzYI3AWldwXVoWEz1gtrQL10v/8YltYLBunqNjeVFXPMUs+MJg==}
+  linear-sum-assignment@1.0.7:
     dependencies:
       cheminfo-types: 1.8.1
       install: 0.13.0
       ml-matrix: 6.12.1
       ml-spectra-processing: 14.13.0
-    dev: true
 
-  /lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+  lines-and-columns@1.2.4: {}
 
-  /load-json-file@4.0.0:
-    resolution: {integrity: sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw==}
-    engines: {node: '>=4'}
+  load-json-file@4.0.0:
     dependencies:
       graceful-fs: 4.2.11
       parse-json: 4.0.0
       pify: 3.0.0
       strip-bom: 3.0.0
-    dev: true
 
-  /load-tsconfig@0.2.5:
-    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+  load-tsconfig@0.2.5: {}
 
-  /load-yaml-file@0.2.0:
-    resolution: {integrity: sha512-OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==}
-    engines: {node: '>=6'}
+  load-yaml-file@0.2.0:
     dependencies:
       graceful-fs: 4.2.11
-      js-yaml: 3.14.1
+      js-yaml: 3.14.2
       pify: 4.0.1
       strip-bom: 3.0.0
-    dev: false
 
-  /loader-runner@4.3.0:
-    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: '>=6.11.5'}
+  loader-runner@4.3.0: {}
 
-  /loader-utils@3.2.1:
-    resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==}
-    engines: {node: '>= 12.13.0'}
-    dev: true
+  loader-runner@4.3.1: {}
 
-  /local-pkg@0.4.3:
-    resolution: {integrity: sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==}
-    engines: {node: '>=14'}
-    dev: true
+  loader-utils@3.2.1: {}
 
-  /locate-character@3.0.0:
-    resolution: {integrity: sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==}
+  local-pkg@0.4.3: {}
 
-  /locate-path@5.0.0:
-    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
-    engines: {node: '>=8'}
+  local-pkg@1.1.2:
+    dependencies:
+      mlly: 1.7.4
+      pkg-types: 2.3.0
+      quansync: 0.2.11
+
+  locate-path@5.0.0:
     dependencies:
       p-locate: 4.1.0
 
-  /locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
+  locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
 
-  /locate-path@7.2.0:
-    resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  locate-path@7.2.0:
     dependencies:
       p-locate: 6.0.0
-    dev: true
 
-  /lodash.camelcase@4.3.0:
-    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+  lodash-es@4.17.21: {}
 
-  /lodash.castarray@4.4.0:
-    resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}
-    dev: true
+  lodash.camelcase@4.3.0: {}
 
-  /lodash.debounce@4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+  lodash.castarray@4.4.0: {}
 
-  /lodash.defaults@4.2.0:
-    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
+  lodash.debounce@4.0.8: {}
 
-  /lodash.difference@4.5.0:
-    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
-    dev: true
+  lodash.defaults@4.2.0: {}
 
-  /lodash.escaperegexp@4.1.2:
-    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
-    dev: false
+  lodash.escaperegexp@4.1.2: {}
 
-  /lodash.flatten@4.4.0:
-    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
-    dev: true
+  lodash.groupby@4.6.0: {}
 
-  /lodash.get@4.4.2:
-    resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
-    deprecated: This package is deprecated. Use the optional chaining (?.) operator instead.
-    dev: false
+  lodash.includes@4.3.0: {}
 
-  /lodash.groupby@4.6.0:
-    resolution: {integrity: sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==}
-    dev: false
+  lodash.isarguments@3.1.0: {}
 
-  /lodash.isarguments@3.1.0:
-    resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
-    dev: false
+  lodash.isboolean@3.0.3: {}
 
-  /lodash.isequal@4.5.0:
-    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-    dev: false
+  lodash.isfunction@3.0.9: {}
 
-  /lodash.isfunction@3.0.9:
-    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
-    dev: false
+  lodash.isinteger@4.0.4: {}
 
-  /lodash.isnil@4.0.0:
-    resolution: {integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==}
-    dev: false
+  lodash.isnil@4.0.0: {}
 
-  /lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-    dev: true
+  lodash.isnumber@3.0.3: {}
 
-  /lodash.isundefined@3.0.1:
-    resolution: {integrity: sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==}
-    dev: false
+  lodash.isplainobject@4.0.6: {}
 
-  /lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+  lodash.isstring@4.0.1: {}
 
-  /lodash.omit@4.5.0:
-    resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
-    dev: false
+  lodash.isundefined@3.0.1: {}
 
-  /lodash.sortby@4.7.0:
-    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
-    dev: true
+  lodash.merge@4.6.2: {}
 
-  /lodash.startcase@4.4.0:
-    resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
-    dev: false
+  lodash.omit@4.5.0: {}
 
-  /lodash.truncate@4.4.2:
-    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
-    dev: true
+  lodash.once@4.1.1: {}
 
-  /lodash.union@4.6.0:
-    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
-    dev: true
+  lodash.sortby@4.7.0: {}
 
-  /lodash.uniq@4.5.0:
-    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
-    dev: false
+  lodash.startcase@4.4.0: {}
 
-  /lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+  lodash.truncate@4.4.2: {}
 
-  /log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
+  lodash.uniq@4.5.0: {}
+
+  lodash@4.17.23: {}
+
+  log-symbols@4.1.0:
     dependencies:
       chalk: 4.1.2
       is-unicode-supported: 0.1.0
 
-  /long@4.0.0:
-    resolution: {integrity: sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==}
-
-  /long@5.2.3:
-    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+  long@5.2.3: {}
 
-  /longest-streak@3.1.0:
-    resolution: {integrity: sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==}
+  longest-streak@3.1.0: {}
 
-  /loose-envify@1.4.0:
-    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
-    hasBin: true
+  loose-envify@1.4.0:
     dependencies:
       js-tokens: 4.0.0
 
-  /loupe@3.1.3:
-    resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
-    dev: true
+  loupe@3.1.3: {}
 
-  /lowercase-keys@1.0.1:
-    resolution: {integrity: sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  lowercase-keys@1.0.1: {}
 
-  /lowercase-keys@2.0.0:
-    resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
-    engines: {node: '>=8'}
-    dev: true
+  lowercase-keys@2.0.0: {}
 
-  /lru-cache@10.4.3:
-    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+  lru-cache@10.4.3: {}
 
-  /lru-cache@11.0.0:
-    resolution: {integrity: sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==}
-    engines: {node: 20 || >=22}
-    dev: true
+  lru-cache@11.0.0: {}
 
-  /lru-cache@4.1.5:
-    resolution: {integrity: sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==}
-    dependencies:
-      pseudomap: 1.0.2
-      yallist: 2.1.2
+  lru-cache@11.2.4: {}
 
-  /lru-cache@5.1.1:
-    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
+  lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
 
-  /lru-cache@6.0.0:
-    resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
-    engines: {node: '>=10'}
-    requiresBuild: true
+  lru-cache@6.0.0:
     dependencies:
       yallist: 4.0.0
-    dev: false
     optional: true
 
-  /lru-cache@7.18.3:
-    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
-    engines: {node: '>=12'}
+  lru-cache@7.18.3: {}
 
-  /lucide-react@0.229.0(react@18.2.0):
-    resolution: {integrity: sha512-b0/KSFXhPi++vUbnYEDUgP8Z8Rw9MQpRfBr+dRZNPMT3FD1HrVgMHXhSpkm9ZrrEtuqIfHf/O+tAGmw4WOmIog==}
-    peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0
+  lucide-react@0.229.0(react@18.2.0):
     dependencies:
       react: 18.2.0
-    dev: false
 
-  /lucide-react@0.451.0(react@18.3.1):
-    resolution: {integrity: sha512-OwQ3uljZLp2cerj8sboy5rnhtGTCl9UCJIhT1J85/yOuGVlEH+xaUPR7tvNdddPvmV5M5VLdr7cQuWE3hzA4jw==}
-    peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc
+  lucide-react@0.451.0(react@18.3.1):
     dependencies:
       react: 18.3.1
-    dev: false
 
-  /lucide-react@0.484.0(react@19.0.0):
-    resolution: {integrity: sha512-oZy8coK9kZzvqhSgfbGkPtTgyjpBvs3ukLgDPv14dSOZtBtboryWF5o8i3qen7QbGg7JhiJBz5mK1p8YoMZTLQ==}
-    peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  lucide-react@0.484.0(react@19.0.0):
     dependencies:
       react: 19.0.0
-    dev: false
 
-  /lucide-react@0.486.0(react@19.0.0):
-    resolution: {integrity: sha512-xWop/wMsC1ikiEVLZrxXjPKw4vU/eAip33G2mZHgbWnr4Nr5Rt4Vx4s/q1D3B/rQVbxjOuqASkEZcUxDEKzecw==}
-    peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  lucide-react@0.486.0(react@19.0.0):
     dependencies:
       react: 19.0.0
-    dev: false
-
-  /luxon@3.2.1:
-    resolution: {integrity: sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==}
-    engines: {node: '>=12'}
-    dev: false
 
-  /lz-string@1.4.4:
-    resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==}
-    hasBin: true
-    dev: true
+  lucide-react@0.542.0(react@18.2.0):
+    dependencies:
+      react: 18.2.0
 
-  /magic-string@0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
+  lucide-react@0.542.0(react@19.1.0):
     dependencies:
-      sourcemap-codec: 1.4.8
-    dev: false
+      react: 19.1.0
 
-  /magic-string@0.30.17:
-    resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
+  luxon@3.2.1: {}
+
+  lz-string@1.4.4: {}
+
+  magic-string@0.30.17:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  /magic-string@0.30.8:
-    resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
-    engines: {node: '>=12'}
+  magic-string@0.30.21:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: false
+      '@jridgewell/sourcemap-codec': 1.5.5
 
-  /magicast@0.3.4:
-    resolution: {integrity: sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==}
+  magicast@0.3.4:
     dependencies:
       '@babel/parser': 7.24.7
       '@babel/types': 7.24.7
       source-map-js: 1.2.0
-    dev: false
 
-  /magicast@0.3.5:
-    resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
+  magicast@0.3.5:
     dependencies:
       '@babel/parser': 7.27.0
       '@babel/types': 7.27.0
       source-map-js: 1.2.1
-    dev: true
-
-  /make-dir@3.1.0:
-    resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
-    engines: {node: '>=8'}
-    dependencies:
-      semver: 6.3.1
-    dev: true
-
-  /make-dir@4.0.0:
-    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
-    engines: {node: '>=10'}
-    dependencies:
-      semver: 7.7.2
-    dev: true
 
-  /make-error@1.3.6:
-    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
-
-  /make-fetch-happen@13.0.1:
-    resolution: {integrity: sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==}
-    engines: {node: ^16.14.0 || >=18.0.0}
+  make-dir@4.0.0:
     dependencies:
-      '@npmcli/agent': 2.2.2
-      cacache: 18.0.4
-      http-cache-semantics: 4.1.1
-      is-lambda: 1.0.1
-      minipass: 7.1.2
-      minipass-fetch: 3.0.5
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      negotiator: 0.6.3
-      proc-log: 4.2.0
-      promise-retry: 2.0.1
-      ssri: 10.0.5
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
+      semver: 5.7.2
 
-  /make-fetch-happen@9.1.0:
-    resolution: {integrity: sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==}
-    engines: {node: '>= 10'}
-    requiresBuild: true
-    dependencies:
-      agentkeepalive: 4.5.0
-      cacache: 15.3.0
-      http-cache-semantics: 4.1.1
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      is-lambda: 1.0.1
-      lru-cache: 6.0.0
-      minipass: 3.3.6
-      minipass-collect: 1.0.2
-      minipass-fetch: 1.4.1
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      negotiator: 0.6.3
-      promise-retry: 2.0.1
-      socks-proxy-agent: 6.2.1
-      ssri: 8.0.1
-    transitivePeerDependencies:
-      - bluebird
-      - supports-color
-    dev: false
-    optional: true
+  map-obj@1.0.1: {}
 
-  /map-obj@1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  map-obj@4.3.0: {}
 
-  /map-obj@4.3.0:
-    resolution: {integrity: sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==}
-    engines: {node: '>=8'}
-    dev: false
+  markdown-extensions@1.1.1: {}
 
-  /markdown-extensions@1.1.1:
-    resolution: {integrity: sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  markdown-table@3.0.4: {}
 
-  /marked-terminal@7.1.0(marked@9.1.6):
-    resolution: {integrity: sha512-+pvwa14KZL74MVXjYdPR3nSInhGhNvPce/3mqLVZT2oUvt654sL1XImFuLZ1pkA866IYZ3ikDTOFUIC7XzpZZg==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      marked: '>=1 <14'
+  marked-terminal@7.1.0(marked@9.1.6):
     dependencies:
       ansi-escapes: 7.0.0
       chalk: 5.3.0
@@ -28014,116 +36340,152 @@ packages:
       marked: 9.1.6
       node-emoji: 2.1.3
       supports-hyperlinks: 3.1.0
-    dev: true
 
-  /marked@4.2.5:
-    resolution: {integrity: sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ==}
-    engines: {node: '>= 12'}
-    hasBin: true
-    dev: false
+  marked@16.4.1: {}
 
-  /marked@7.0.4:
-    resolution: {integrity: sha512-t8eP0dXRJMtMvBojtkcsA7n48BkauktUKzfkPSCq85ZMTJ0v76Rke4DYz01omYpPTUh4p/f7HePgRo3ebG8+QQ==}
-    engines: {node: '>= 16'}
-    hasBin: true
-    dev: false
+  marked@4.2.5: {}
 
-  /marked@9.1.6:
-    resolution: {integrity: sha512-jcByLnIFkd5gSXZmjNvS1TlmRhCXZjIzHYlaGkPlLIekG55JDR2Z4va9tZwCiP+/RDERiNhMOFu01xd6O5ct1Q==}
-    engines: {node: '>= 16'}
-    hasBin: true
-    dev: true
+  marked@7.0.4: {}
 
-  /match-sorter@6.3.4:
-    resolution: {integrity: sha512-jfZW7cWS5y/1xswZo8VBOdudUiSd9nifYRWphc9M5D/ee4w4AoXLgBEdRbgVaxbMuagBPeUC5y2Hi8DO6o9aDg==}
+  marked@9.1.6: {}
+
+  match-sorter@6.3.4:
     dependencies:
-      '@babel/runtime': 7.24.5
+      '@babel/runtime': 7.27.0
       remove-accents: 0.5.0
-    dev: false
 
-  /matchit@1.1.0:
-    resolution: {integrity: sha512-+nGYoOlfHmxe5BW5tE0EMJppXEwdSf8uBA1GTZC7Q77kbT35+VKLYJMzVNWCHSsga1ps1tPYFtFyvxvKzWVmMA==}
-    engines: {node: '>=6'}
+  matchit@1.1.0:
     dependencies:
       '@arr/every': 1.0.1
-    dev: false
 
-  /math-intrinsics@1.1.0:
-    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
-    engines: {node: '>= 0.4'}
+  math-intrinsics@1.1.0: {}
 
-  /md-to-react-email@5.0.2(react@18.3.1):
-    resolution: {integrity: sha512-x6kkpdzIzUhecda/yahltfEl53mH26QdWu4abUF9+S0Jgam8P//Ciro8cdhyMHnT5MQUJYrIbO6ORM2UxPiNNA==}
-    peerDependencies:
-      react: 18.x
+  md-to-react-email@5.0.2(react@18.3.1):
     dependencies:
       marked: 7.0.4
       react: 18.3.1
-    dev: false
 
-  /md-to-react-email@5.0.2(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-x6kkpdzIzUhecda/yahltfEl53mH26QdWu4abUF9+S0Jgam8P//Ciro8cdhyMHnT5MQUJYrIbO6ORM2UxPiNNA==}
-    peerDependencies:
-      react: 18.x
+  mdast-util-definitions@5.1.1:
+    dependencies:
+      '@types/mdast': 3.0.10
+      '@types/unist': 2.0.6
+      unist-util-visit: 4.1.2
+
+  mdast-util-find-and-replace@3.0.2:
+    dependencies:
+      '@types/mdast': 4.0.4
+      escape-string-regexp: 5.0.0
+      unist-util-is: 6.0.0
+      unist-util-visit-parents: 6.0.1
+
+  mdast-util-from-markdown@1.2.0:
+    dependencies:
+      '@types/mdast': 3.0.10
+      '@types/unist': 2.0.6
+      decode-named-character-reference: 1.0.2
+      mdast-util-to-string: 3.1.0
+      micromark: 3.1.0
+      micromark-util-decode-numeric-character-reference: 1.0.0
+      micromark-util-decode-string: 1.0.2
+      micromark-util-normalize-identifier: 1.0.0
+      micromark-util-symbol: 1.0.1
+      micromark-util-types: 1.0.2
+      unist-util-stringify-position: 3.0.2
+      uvu: 0.5.6
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-from-markdown@2.0.2:
+    dependencies:
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      decode-named-character-reference: 1.0.2
+      devlop: 1.1.0
+      mdast-util-to-string: 4.0.0
+      micromark: 4.0.2
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-decode-string: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      unist-util-stringify-position: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-frontmatter@1.0.0:
+    dependencies:
+      micromark-extension-frontmatter: 1.0.0
+
+  mdast-util-gfm-autolink-literal@2.0.1:
+    dependencies:
+      '@types/mdast': 4.0.4
+      ccount: 2.0.1
+      devlop: 1.1.0
+      mdast-util-find-and-replace: 3.0.2
+      micromark-util-character: 2.1.1
+
+  mdast-util-gfm-footnote@2.1.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.2
+      mdast-util-to-markdown: 2.1.2
+      micromark-util-normalize-identifier: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-strikethrough@2.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-from-markdown: 2.0.2
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-gfm-table@2.0.0:
     dependencies:
-      marked: 7.0.4
-      react: 19.0.0-rc.0
-    dev: false
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      markdown-table: 3.0.4
+      mdast-util-from-markdown: 2.0.2
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
 
-  /mdast-util-definitions@5.1.1:
-    resolution: {integrity: sha512-rQ+Gv7mHttxHOBx2dkF4HWTg+EE+UR78ptQWDylzPKaQuVGdG4HIoY3SrS/pCp80nZ04greFvXbVFHT+uf0JVQ==}
+  mdast-util-gfm-task-list-item@2.0.0:
     dependencies:
-      '@types/mdast': 3.0.10
-      '@types/unist': 2.0.6
-      unist-util-visit: 4.1.2
-    dev: true
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      mdast-util-from-markdown: 2.0.2
+      mdast-util-to-markdown: 2.1.2
+    transitivePeerDependencies:
+      - supports-color
 
-  /mdast-util-from-markdown@1.2.0:
-    resolution: {integrity: sha512-iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q==}
+  mdast-util-gfm@3.1.0:
     dependencies:
-      '@types/mdast': 3.0.10
-      '@types/unist': 2.0.6
-      decode-named-character-reference: 1.0.2
-      mdast-util-to-string: 3.1.0
-      micromark: 3.1.0
-      micromark-util-decode-numeric-character-reference: 1.0.0
-      micromark-util-decode-string: 1.0.2
-      micromark-util-normalize-identifier: 1.0.0
-      micromark-util-symbol: 1.0.1
-      micromark-util-types: 1.0.2
-      unist-util-stringify-position: 3.0.2
-      uvu: 0.5.6
+      mdast-util-from-markdown: 2.0.2
+      mdast-util-gfm-autolink-literal: 2.0.1
+      mdast-util-gfm-footnote: 2.1.0
+      mdast-util-gfm-strikethrough: 2.0.0
+      mdast-util-gfm-table: 2.0.0
+      mdast-util-gfm-task-list-item: 2.0.0
+      mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /mdast-util-from-markdown@2.0.2:
-    resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
+  mdast-util-math@3.0.0:
     dependencies:
+      '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
-      '@types/unist': 3.0.3
-      decode-named-character-reference: 1.0.2
       devlop: 1.1.0
-      mdast-util-to-string: 4.0.0
-      micromark: 4.0.2
-      micromark-util-decode-numeric-character-reference: 2.0.2
-      micromark-util-decode-string: 2.0.1
-      micromark-util-normalize-identifier: 2.0.1
-      micromark-util-symbol: 2.0.1
-      micromark-util-types: 2.0.2
-      unist-util-stringify-position: 4.0.0
+      longest-streak: 3.1.0
+      mdast-util-from-markdown: 2.0.2
+      mdast-util-to-markdown: 2.1.2
+      unist-util-remove-position: 5.0.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /mdast-util-frontmatter@1.0.0:
-    resolution: {integrity: sha512-7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw==}
-    dependencies:
-      micromark-extension-frontmatter: 1.0.0
-    dev: true
 
-  /mdast-util-mdx-expression@1.3.1:
-    resolution: {integrity: sha512-TTb6cKyTA1RD+1su1iStZ5PAv3rFfOUKcoU5EstUpv/IZo63uDX03R8+jXjMEhcobXnNOiG6/ccekvVl4eV1zQ==}
+  mdast-util-mdx-expression@1.3.1:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/hast': 2.3.4
@@ -28132,10 +36494,8 @@ packages:
       mdast-util-to-markdown: 1.5.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /mdast-util-mdx-expression@2.0.1:
-    resolution: {integrity: sha512-J6f+9hUp+ldTZqKRSg7Vw5V6MqjATc+3E4gf3CFNcuZNWD8XdyI6zQ8GqH7f8169MM6P7hMBRDVGnn7oHB9kXQ==}
+  mdast-util-mdx-expression@2.0.1:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/hast': 3.0.4
@@ -28145,10 +36505,8 @@ packages:
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /mdast-util-mdx-jsx@2.1.4:
-    resolution: {integrity: sha512-DtMn9CmVhVzZx3f+optVDF8yFgQVt7FghCRNdlIaS3X5Bnym3hZwPbg/XW86vdpKjlc1PVj26SpnLGeJBXD3JA==}
+  mdast-util-mdx-jsx@2.1.4:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/hast': 2.3.4
@@ -28164,10 +36522,8 @@ packages:
       vfile-message: 3.1.3
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /mdast-util-mdx-jsx@3.2.0:
-    resolution: {integrity: sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==}
+  mdast-util-mdx-jsx@3.2.0:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/hast': 3.0.4
@@ -28183,10 +36539,8 @@ packages:
       vfile-message: 4.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /mdast-util-mdx@2.0.1:
-    resolution: {integrity: sha512-38w5y+r8nyKlGvNjSEqWrhG0w5PmnRA+wnBvm+ulYCct7nsGYhFVb0lljS9bQav4psDAS1eGkP2LMVcZBi/aqw==}
+  mdast-util-mdx@2.0.1:
     dependencies:
       mdast-util-from-markdown: 1.2.0
       mdast-util-mdx-expression: 1.3.1
@@ -28195,10 +36549,8 @@ packages:
       mdast-util-to-markdown: 1.5.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /mdast-util-mdxjs-esm@1.3.0:
-    resolution: {integrity: sha512-7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g==}
+  mdast-util-mdxjs-esm@1.3.0:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/hast': 2.3.4
@@ -28207,10 +36559,8 @@ packages:
       mdast-util-to-markdown: 1.5.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /mdast-util-mdxjs-esm@2.0.1:
-    resolution: {integrity: sha512-EcmOpxsZ96CvlP03NghtH1EsLtr0n9Tm4lPUJUBccV9RwUOneqSycg19n5HGzCf+10LozMRSObtVr3ee1WoHtg==}
+  mdast-util-mdxjs-esm@2.0.1:
     dependencies:
       '@types/estree-jsx': 1.0.0
       '@types/hast': 3.0.4
@@ -28220,24 +36570,18 @@ packages:
       mdast-util-to-markdown: 2.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /mdast-util-phrasing@3.0.0:
-    resolution: {integrity: sha512-S+QYsDRLkGi8U7o5JF1agKa/sdP+CNGXXLqC17pdTVL8FHHgQEiwFGa9yE5aYtUxNiFGYoaDy9V1kC85Sz86Gg==}
+  mdast-util-phrasing@3.0.0:
     dependencies:
       '@types/mdast': 3.0.10
       unist-util-is: 5.1.1
-    dev: true
 
-  /mdast-util-phrasing@4.1.0:
-    resolution: {integrity: sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==}
+  mdast-util-phrasing@4.1.0:
     dependencies:
       '@types/mdast': 4.0.4
       unist-util-is: 6.0.0
-    dev: false
 
-  /mdast-util-to-hast@12.3.0:
-    resolution: {integrity: sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==}
+  mdast-util-to-hast@12.3.0:
     dependencies:
       '@types/hast': 2.3.4
       '@types/mdast': 3.0.10
@@ -28247,10 +36591,8 @@ packages:
       unist-util-generated: 2.0.0
       unist-util-position: 4.0.3
       unist-util-visit: 4.1.2
-    dev: true
 
-  /mdast-util-to-hast@13.2.0:
-    resolution: {integrity: sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==}
+  mdast-util-to-hast@13.2.0:
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
@@ -28261,10 +36603,8 @@ packages:
       unist-util-position: 5.0.0
       unist-util-visit: 5.0.0
       vfile: 6.0.3
-    dev: false
 
-  /mdast-util-to-markdown@1.5.0:
-    resolution: {integrity: sha512-bbv7TPv/WC49thZPg3jXuqzuvI45IL2EVAr/KxF0BSdHsU0ceFHOmwQn6evxAh1GaoK/6GQ1wp4R4oW2+LFL/A==}
+  mdast-util-to-markdown@1.5.0:
     dependencies:
       '@types/mdast': 3.0.10
       '@types/unist': 2.0.6
@@ -28274,10 +36614,8 @@ packages:
       micromark-util-decode-string: 1.0.2
       unist-util-visit: 4.1.2
       zwitch: 2.0.4
-    dev: true
 
-  /mdast-util-to-markdown@2.1.2:
-    resolution: {integrity: sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==}
+  mdast-util-to-markdown@2.1.2:
     dependencies:
       '@types/mdast': 4.0.4
       '@types/unist': 3.0.3
@@ -28288,50 +36626,28 @@ packages:
       micromark-util-decode-string: 2.0.1
       unist-util-visit: 5.0.0
       zwitch: 2.0.4
-    dev: false
 
-  /mdast-util-to-string@3.1.0:
-    resolution: {integrity: sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA==}
-    dev: true
+  mdast-util-to-string@3.1.0: {}
 
-  /mdast-util-to-string@4.0.0:
-    resolution: {integrity: sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==}
+  mdast-util-to-string@4.0.0:
     dependencies:
       '@types/mdast': 4.0.4
-    dev: false
 
-  /mdn-data@2.0.14:
-    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
-    dev: false
+  mdn-data@2.0.14: {}
 
-  /media-query-parser@2.0.2:
-    resolution: {integrity: sha512-1N4qp+jE0pL5Xv4uEcwVUhIkwdUO3S/9gML90nqKA7v7FcOS5vUtatfzok9S9U1EJU8dHWlcv95WLnKmmxZI9w==}
+  media-query-parser@2.0.2:
     dependencies:
-      '@babel/runtime': 7.27.4
-    dev: true
+      '@babel/runtime': 7.27.0
 
-  /media-typer@0.3.0:
-    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
-    engines: {node: '>= 0.6'}
+  media-typer@0.3.0: {}
 
-  /media-typer@1.1.0:
-    resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
-    engines: {node: '>= 0.8'}
-    dev: false
+  media-typer@1.1.0: {}
 
-  /memorystream@0.3.1:
-    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
-    engines: {node: '>= 0.10.0'}
-    dev: true
+  memorystream@0.3.1: {}
 
-  /meow@12.1.1:
-    resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}
-    engines: {node: '>=16.10'}
-    dev: true
+  meow@12.1.1: {}
 
-  /meow@6.1.1:
-    resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==}
-    engines: {node: '>=8'}
+  meow@6.1.1:
     dependencies:
       '@types/minimist': 1.2.2
       camelcase-keys: 6.2.2
@@ -28344,29 +36660,43 @@ packages:
       trim-newlines: 3.0.1
       type-fest: 0.13.1
       yargs-parser: 18.1.3
-    dev: false
 
-  /merge-descriptors@1.0.3:
-    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
+  merge-descriptors@1.0.3: {}
 
-  /merge-descriptors@2.0.0:
-    resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
-    engines: {node: '>=18'}
-    dev: false
+  merge-descriptors@2.0.0: {}
 
-  /merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+  merge-stream@2.0.0: {}
 
-  /merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
+  merge2@1.4.1: {}
 
-  /methods@1.1.2:
-    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
-    engines: {node: '>= 0.6'}
+  mermaid@11.12.0:
+    dependencies:
+      '@braintree/sanitize-url': 7.1.1
+      '@iconify/utils': 3.0.2
+      '@mermaid-js/parser': 0.6.3
+      '@types/d3': 7.4.3
+      cytoscape: 3.33.1
+      cytoscape-cose-bilkent: 4.1.0(cytoscape@3.33.1)
+      cytoscape-fcose: 2.2.0(cytoscape@3.33.1)
+      d3: 7.9.0
+      d3-sankey: 0.12.3
+      dagre-d3-es: 7.0.11
+      dayjs: 1.11.18
+      dompurify: 3.2.6
+      katex: 0.16.25
+      khroma: 2.1.0
+      lodash-es: 4.17.21
+      marked: 16.4.1
+      roughjs: 4.6.6
+      stylis: 4.3.6
+      ts-dedent: 2.2.0
+      uuid: 11.1.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /micromark-core-commonmark@1.0.6:
-    resolution: {integrity: sha512-K+PkJTxqjFfSNkfAhp4GB+cZPfQd6dxtTXnf+RjZOV7T4EEXnvgzOcnp+eSTmpGk9d1S9sL6/lqrgSNn/s0HZA==}
+  methods@1.1.2: {}
+
+  micromark-core-commonmark@1.0.6:
     dependencies:
       decode-named-character-reference: 1.0.2
       micromark-factory-destination: 1.0.0
@@ -28384,10 +36714,8 @@ packages:
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
       uvu: 0.5.6
-    dev: true
 
-  /micromark-core-commonmark@2.0.3:
-    resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
+  micromark-core-commonmark@2.0.3:
     dependencies:
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
@@ -28405,18 +36733,82 @@ packages:
       micromark-util-subtokenize: 2.1.0
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-extension-frontmatter@1.0.0:
-    resolution: {integrity: sha512-EXjmRnupoX6yYuUJSQhrQ9ggK0iQtQlpi6xeJzVD5xscyAI+giqco5fdymayZhJMbIFecjnE2yz85S9NzIgQpg==}
+  micromark-extension-frontmatter@1.0.0:
     dependencies:
       fault: 2.0.1
       micromark-util-character: 1.1.0
       micromark-util-symbol: 1.0.1
-    dev: true
 
-  /micromark-extension-mdx-expression@1.0.3:
-    resolution: {integrity: sha512-TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA==}
+  micromark-extension-gfm-autolink-literal@2.1.0:
+    dependencies:
+      micromark-util-character: 2.1.1
+      micromark-util-sanitize-uri: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-footnote@2.1.0:
+    dependencies:
+      devlop: 1.1.0
+      micromark-core-commonmark: 2.0.3
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-sanitize-uri: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-strikethrough@2.1.0:
+    dependencies:
+      devlop: 1.1.0
+      micromark-util-chunked: 2.0.1
+      micromark-util-classify-character: 2.0.1
+      micromark-util-resolve-all: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-table@2.1.1:
+    dependencies:
+      devlop: 1.1.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-tagfilter@2.0.0:
+    dependencies:
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm-task-list-item@2.1.0:
+    dependencies:
+      devlop: 1.1.0
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-gfm@3.0.0:
+    dependencies:
+      micromark-extension-gfm-autolink-literal: 2.1.0
+      micromark-extension-gfm-footnote: 2.1.0
+      micromark-extension-gfm-strikethrough: 2.1.0
+      micromark-extension-gfm-table: 2.1.1
+      micromark-extension-gfm-tagfilter: 2.0.0
+      micromark-extension-gfm-task-list-item: 2.1.0
+      micromark-util-combine-extensions: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-math@3.1.0:
+    dependencies:
+      '@types/katex': 0.16.7
+      devlop: 1.1.0
+      katex: 0.16.25
+      micromark-factory-space: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
+  micromark-extension-mdx-expression@1.0.3:
     dependencies:
       micromark-factory-mdx-expression: 1.0.6
       micromark-factory-space: 1.0.0
@@ -28425,10 +36817,8 @@ packages:
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
       uvu: 0.5.6
-    dev: true
 
-  /micromark-extension-mdx-jsx@1.0.3:
-    resolution: {integrity: sha512-VfA369RdqUISF0qGgv2FfV7gGjHDfn9+Qfiv5hEwpyr1xscRj/CiVRkU7rywGFCO7JwJ5L0e7CJz60lY52+qOA==}
+  micromark-extension-mdx-jsx@1.0.3:
     dependencies:
       '@types/acorn': 4.0.6
       estree-util-is-identifier-name: 2.0.1
@@ -28439,16 +36829,12 @@ packages:
       micromark-util-types: 1.0.2
       uvu: 0.5.6
       vfile-message: 3.1.3
-    dev: true
 
-  /micromark-extension-mdx-md@1.0.0:
-    resolution: {integrity: sha512-xaRAMoSkKdqZXDAoSgp20Azm0aRQKGOl0RrS81yGu8Hr/JhMsBmfs4wR7m9kgVUIO36cMUQjNyiyDKPrsv8gOw==}
+  micromark-extension-mdx-md@1.0.0:
     dependencies:
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-extension-mdxjs-esm@1.0.3:
-    resolution: {integrity: sha512-2N13ol4KMoxb85rdDwTAC6uzs8lMX0zeqpcyx7FhS7PxXomOnLactu8WI8iBNXW8AVyea3KIJd/1CKnUmwrK9A==}
+  micromark-extension-mdxjs-esm@1.0.3:
     dependencies:
       micromark-core-commonmark: 1.0.6
       micromark-util-character: 1.1.0
@@ -28458,57 +36844,45 @@ packages:
       unist-util-position-from-estree: 1.1.1
       uvu: 0.5.6
       vfile-message: 3.1.3
-    dev: true
 
-  /micromark-extension-mdxjs@1.0.0:
-    resolution: {integrity: sha512-TZZRZgeHvtgm+IhtgC2+uDMR7h8eTKF0QUX9YsgoL9+bADBpBY6SiLvWqnBlLbCEevITmTqmEuY3FoxMKVs1rQ==}
+  micromark-extension-mdxjs@1.0.0:
     dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
+      acorn: 8.15.0
+      acorn-jsx: 5.3.2(acorn@8.15.0)
       micromark-extension-mdx-expression: 1.0.3
       micromark-extension-mdx-jsx: 1.0.3
       micromark-extension-mdx-md: 1.0.0
       micromark-extension-mdxjs-esm: 1.0.3
       micromark-util-combine-extensions: 1.0.0
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-factory-destination@1.0.0:
-    resolution: {integrity: sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw==}
+  micromark-factory-destination@1.0.0:
     dependencies:
       micromark-util-character: 1.1.0
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-factory-destination@2.0.1:
-    resolution: {integrity: sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==}
+  micromark-factory-destination@2.0.1:
     dependencies:
       micromark-util-character: 2.1.1
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-factory-label@1.0.2:
-    resolution: {integrity: sha512-CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg==}
+  micromark-factory-label@1.0.2:
     dependencies:
       micromark-util-character: 1.1.0
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
       uvu: 0.5.6
-    dev: true
 
-  /micromark-factory-label@2.0.1:
-    resolution: {integrity: sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==}
+  micromark-factory-label@2.0.1:
     dependencies:
       devlop: 1.1.0
       micromark-util-character: 2.1.1
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-factory-mdx-expression@1.0.6:
-    resolution: {integrity: sha512-WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA==}
+  micromark-factory-mdx-expression@1.0.6:
     dependencies:
       micromark-factory-space: 1.0.0
       micromark-util-character: 1.1.0
@@ -28518,252 +36892,180 @@ packages:
       unist-util-position-from-estree: 1.1.1
       uvu: 0.5.6
       vfile-message: 3.1.3
-    dev: true
 
-  /micromark-factory-space@1.0.0:
-    resolution: {integrity: sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew==}
+  micromark-factory-space@1.0.0:
     dependencies:
       micromark-util-character: 1.1.0
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-factory-space@2.0.1:
-    resolution: {integrity: sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==}
+  micromark-factory-space@2.0.1:
     dependencies:
       micromark-util-character: 2.1.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-factory-title@1.0.2:
-    resolution: {integrity: sha512-zily+Nr4yFqgMGRKLpTVsNl5L4PMu485fGFDOQJQBl2NFpjGte1e86zC0da93wf97jrc4+2G2GQudFMHn3IX+A==}
+  micromark-factory-title@1.0.2:
     dependencies:
       micromark-factory-space: 1.0.0
       micromark-util-character: 1.1.0
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
       uvu: 0.5.6
-    dev: true
 
-  /micromark-factory-title@2.0.1:
-    resolution: {integrity: sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==}
+  micromark-factory-title@2.0.1:
     dependencies:
       micromark-factory-space: 2.0.1
       micromark-util-character: 2.1.1
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-factory-whitespace@1.0.0:
-    resolution: {integrity: sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A==}
+  micromark-factory-whitespace@1.0.0:
     dependencies:
       micromark-factory-space: 1.0.0
       micromark-util-character: 1.1.0
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-factory-whitespace@2.0.1:
-    resolution: {integrity: sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==}
+  micromark-factory-whitespace@2.0.1:
     dependencies:
       micromark-factory-space: 2.0.1
       micromark-util-character: 2.1.1
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-util-character@1.1.0:
-    resolution: {integrity: sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg==}
+  micromark-util-character@1.1.0:
     dependencies:
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-util-character@2.1.1:
-    resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
+  micromark-util-character@2.1.1:
     dependencies:
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-util-chunked@1.0.0:
-    resolution: {integrity: sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g==}
+  micromark-util-chunked@1.0.0:
     dependencies:
       micromark-util-symbol: 1.0.1
-    dev: true
 
-  /micromark-util-chunked@2.0.1:
-    resolution: {integrity: sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==}
+  micromark-util-chunked@2.0.1:
     dependencies:
       micromark-util-symbol: 2.0.1
-    dev: false
 
-  /micromark-util-classify-character@1.0.0:
-    resolution: {integrity: sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA==}
+  micromark-util-classify-character@1.0.0:
     dependencies:
       micromark-util-character: 1.1.0
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-util-classify-character@2.0.1:
-    resolution: {integrity: sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==}
+  micromark-util-classify-character@2.0.1:
     dependencies:
       micromark-util-character: 2.1.1
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-util-combine-extensions@1.0.0:
-    resolution: {integrity: sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA==}
+  micromark-util-combine-extensions@1.0.0:
     dependencies:
       micromark-util-chunked: 1.0.0
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-util-combine-extensions@2.0.1:
-    resolution: {integrity: sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==}
+  micromark-util-combine-extensions@2.0.1:
     dependencies:
       micromark-util-chunked: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-util-decode-numeric-character-reference@1.0.0:
-    resolution: {integrity: sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w==}
+  micromark-util-decode-numeric-character-reference@1.0.0:
     dependencies:
       micromark-util-symbol: 1.0.1
-    dev: true
 
-  /micromark-util-decode-numeric-character-reference@2.0.2:
-    resolution: {integrity: sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==}
+  micromark-util-decode-numeric-character-reference@2.0.2:
     dependencies:
       micromark-util-symbol: 2.0.1
-    dev: false
 
-  /micromark-util-decode-string@1.0.2:
-    resolution: {integrity: sha512-DLT5Ho02qr6QWVNYbRZ3RYOSSWWFuH3tJexd3dgN1odEuPNxCngTCXJum7+ViRAd9BbdxCvMToPOD/IvVhzG6Q==}
+  micromark-util-decode-string@1.0.2:
     dependencies:
       decode-named-character-reference: 1.0.2
       micromark-util-character: 1.1.0
       micromark-util-decode-numeric-character-reference: 1.0.0
       micromark-util-symbol: 1.0.1
-    dev: true
 
-  /micromark-util-decode-string@2.0.1:
-    resolution: {integrity: sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==}
+  micromark-util-decode-string@2.0.1:
     dependencies:
       decode-named-character-reference: 1.0.2
       micromark-util-character: 2.1.1
       micromark-util-decode-numeric-character-reference: 2.0.2
       micromark-util-symbol: 2.0.1
-    dev: false
 
-  /micromark-util-encode@1.0.1:
-    resolution: {integrity: sha512-U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA==}
-    dev: true
+  micromark-util-encode@1.0.1: {}
 
-  /micromark-util-encode@2.0.1:
-    resolution: {integrity: sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==}
-    dev: false
+  micromark-util-encode@2.0.1: {}
 
-  /micromark-util-events-to-acorn@1.2.0:
-    resolution: {integrity: sha512-WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw==}
+  micromark-util-events-to-acorn@1.2.0:
     dependencies:
       '@types/acorn': 4.0.6
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
       estree-util-visit: 1.2.0
       micromark-util-types: 1.0.2
       uvu: 0.5.6
       vfile-location: 4.0.1
       vfile-message: 3.1.3
-    dev: true
 
-  /micromark-util-html-tag-name@1.1.0:
-    resolution: {integrity: sha512-BKlClMmYROy9UiV03SwNmckkjn8QHVaWkqoAqzivabvdGcwNGMMMH/5szAnywmsTBUzDsU57/mFi0sp4BQO6dA==}
-    dev: true
+  micromark-util-html-tag-name@1.1.0: {}
 
-  /micromark-util-html-tag-name@2.0.1:
-    resolution: {integrity: sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==}
-    dev: false
+  micromark-util-html-tag-name@2.0.1: {}
 
-  /micromark-util-normalize-identifier@1.0.0:
-    resolution: {integrity: sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg==}
+  micromark-util-normalize-identifier@1.0.0:
     dependencies:
       micromark-util-symbol: 1.0.1
-    dev: true
 
-  /micromark-util-normalize-identifier@2.0.1:
-    resolution: {integrity: sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==}
+  micromark-util-normalize-identifier@2.0.1:
     dependencies:
       micromark-util-symbol: 2.0.1
-    dev: false
 
-  /micromark-util-resolve-all@1.0.0:
-    resolution: {integrity: sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw==}
+  micromark-util-resolve-all@1.0.0:
     dependencies:
       micromark-util-types: 1.0.2
-    dev: true
 
-  /micromark-util-resolve-all@2.0.1:
-    resolution: {integrity: sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==}
+  micromark-util-resolve-all@2.0.1:
     dependencies:
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-util-sanitize-uri@1.1.0:
-    resolution: {integrity: sha512-RoxtuSCX6sUNtxhbmsEFQfWzs8VN7cTctmBPvYivo98xb/kDEoTCtJQX5wyzIYEmk/lvNFTat4hL8oW0KndFpg==}
+  micromark-util-sanitize-uri@1.1.0:
     dependencies:
       micromark-util-character: 1.1.0
       micromark-util-encode: 1.0.1
       micromark-util-symbol: 1.0.1
-    dev: true
 
-  /micromark-util-sanitize-uri@2.0.1:
-    resolution: {integrity: sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==}
+  micromark-util-sanitize-uri@2.0.1:
     dependencies:
       micromark-util-character: 2.1.1
       micromark-util-encode: 2.0.1
       micromark-util-symbol: 2.0.1
-    dev: false
 
-  /micromark-util-subtokenize@1.0.2:
-    resolution: {integrity: sha512-d90uqCnXp/cy4G881Ub4psE57Sf8YD0pim9QdjCRNjfas2M1u6Lbt+XZK9gnHL2XFhnozZiEdCa9CNfXSfQ6xA==}
+  micromark-util-subtokenize@1.0.2:
     dependencies:
       micromark-util-chunked: 1.0.0
       micromark-util-symbol: 1.0.1
       micromark-util-types: 1.0.2
       uvu: 0.5.6
-    dev: true
 
-  /micromark-util-subtokenize@2.1.0:
-    resolution: {integrity: sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==}
+  micromark-util-subtokenize@2.1.0:
     dependencies:
       devlop: 1.1.0
       micromark-util-chunked: 2.0.1
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
-    dev: false
 
-  /micromark-util-symbol@1.0.1:
-    resolution: {integrity: sha512-oKDEMK2u5qqAptasDAwWDXq0tG9AssVwAx3E9bBF3t/shRIGsWIRG+cGafs2p/SnDSOecnt6hZPCE2o6lHfFmQ==}
-    dev: true
+  micromark-util-symbol@1.0.1: {}
 
-  /micromark-util-symbol@2.0.1:
-    resolution: {integrity: sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==}
-    dev: false
+  micromark-util-symbol@2.0.1: {}
 
-  /micromark-util-types@1.0.2:
-    resolution: {integrity: sha512-DCfg/T8fcrhrRKTPjRrw/5LLvdGV7BHySf/1LOZx7TzWZdYRjogNtyNq885z3nNallwr3QUKARjqvHqX1/7t+w==}
-    dev: true
+  micromark-util-types@1.0.2: {}
 
-  /micromark-util-types@2.0.2:
-    resolution: {integrity: sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==}
-    dev: false
+  micromark-util-types@2.0.2: {}
 
-  /micromark@3.1.0:
-    resolution: {integrity: sha512-6Mj0yHLdUZjHnOPgr5xfWIMqMWS12zDN6iws9SLuSz76W8jTtAv24MN4/CL7gJrl5vtxGInkkqDv/JIoRsQOvA==}
+  micromark@3.1.0:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       decode-named-character-reference: 1.0.2
       micromark-core-commonmark: 1.0.6
       micromark-factory-space: 1.0.0
@@ -28781,13 +37083,11 @@ packages:
       uvu: 0.5.6
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /micromark@4.0.2:
-    resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==}
+  micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       decode-named-character-reference: 1.0.2
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
@@ -28805,325 +37105,154 @@ packages:
       micromark-util-types: 2.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /micromatch@4.0.8:
-    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
-    engines: {node: '>=8.6'}
+  micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
       picomatch: 2.3.1
 
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
+  mime-db@1.52.0: {}
 
-  /mime-db@1.53.0:
-    resolution: {integrity: sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==}
-    engines: {node: '>= 0.6'}
-    dev: false
+  mime-db@1.53.0: {}
 
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
+  mime-db@1.54.0: {}
+
+  mime-types@2.1.35:
     dependencies:
       mime-db: 1.52.0
 
-  /mime-types@3.0.0:
-    resolution: {integrity: sha512-XqoSHeCGjVClAmoGFG3lVFqQFRIrTVw2OH3axRqAcfaw+gHWIfnASS92AV+Rl/mk0MupgZTRHQOjxY6YVnzK5w==}
-    engines: {node: '>= 0.6'}
+  mime-types@3.0.0:
     dependencies:
       mime-db: 1.53.0
-    dev: false
 
-  /mime@1.6.0:
-    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
-    engines: {node: '>=4'}
-    hasBin: true
+  mime-types@3.0.2:
+    dependencies:
+      mime-db: 1.54.0
 
-  /mime@2.6.0:
-    resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
-    engines: {node: '>=4.0.0'}
-    hasBin: true
-    dev: true
+  mime@1.6.0: {}
 
-  /mime@3.0.0:
-    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
+  mime@2.6.0: {}
 
-  /mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
+  mime@3.0.0: {}
 
-  /mimic-fn@4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
+  mimic-fn@2.1.0: {}
 
-  /mimic-response@1.0.1:
-    resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
-    engines: {node: '>=4'}
-    dev: true
+  mimic-fn@4.0.0: {}
 
-  /mimic-response@3.1.0:
-    resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
-    engines: {node: '>=10'}
+  mimic-response@1.0.1: {}
 
-  /min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
+  mimic-response@3.1.0: {}
 
-  /mini-svg-data-uri@1.4.4:
-    resolution: {integrity: sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==}
-    hasBin: true
-    dev: true
+  min-indent@1.0.1: {}
 
-  /miniflare@3.20240806.0:
-    resolution: {integrity: sha512-jDsXBJOLUVpIQXHsluX3xV0piDxXolTCsxdje2Ex2LTC9PsSoBIkMwvCmnCxe9wpJJCq8rb0UMyeEn3KOF3LOw==}
-    engines: {node: '>=16.13'}
-    hasBin: true
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      acorn: 8.12.1
-      acorn-walk: 8.3.2
-      capnp-ts: 0.7.0
-      exit-hook: 2.2.1
-      glob-to-regexp: 0.4.1
-      stoppable: 1.1.0
-      undici: 5.29.0
-      workerd: 1.20240806.0
-      ws: 8.18.0(bufferutil@4.0.9)
-      youch: 3.3.3
-      zod: 3.23.8
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: false
+  mini-svg-data-uri@1.4.4: {}
 
-  /minimal-polyfills@2.2.2:
-    resolution: {integrity: sha512-eEOUq/LH/DbLWihrxUP050Wi7H/N/I2dQT98Ep6SqOpmIbk4sXOI4wqalve66QoZa+6oljbZWU6I6T4dehQGmw==}
-    dev: false
+  minimal-polyfills@2.2.2: {}
 
-  /minimal-polyfills@2.2.3:
-    resolution: {integrity: sha512-oxdmJ9cL+xV72h0xYxp4tP2d5/fTBpP45H8DIOn9pASuF8a3IYTf+25fMGDYGiWW+MFsuog6KD6nfmhZJQ+uUw==}
-    dev: false
+  minimal-polyfills@2.2.3: {}
 
-  /minimatch@10.0.1:
-    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
-    engines: {node: 20 || >=22}
+  minimatch@10.0.1:
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+  minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
 
-  /minimatch@5.1.6:
-    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
-  /minimatch@8.0.4:
-    resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  minimatch@5.1.6:
     dependencies:
       brace-expansion: 2.0.1
-    dev: false
 
-  /minimatch@9.0.1:
-    resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  minimatch@8.0.4:
     dependencies:
       brace-expansion: 2.0.1
-    dev: false
 
-  /minimatch@9.0.3:
-    resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  minimatch@9.0.1:
     dependencies:
       brace-expansion: 2.0.1
-    dev: true
 
-  /minimatch@9.0.5:
-    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  minimatch@9.0.5:
     dependencies:
       brace-expansion: 2.0.1
 
-  /minimist-options@4.1.0:
-    resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
-    engines: {node: '>= 6'}
+  minimist-options@4.1.0:
     dependencies:
       arrify: 1.0.1
       is-plain-obj: 1.1.0
       kind-of: 6.0.3
-    dev: false
-
-  /minimist@1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
-
-  /minipass-collect@1.0.2:
-    resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
-    engines: {node: '>= 8'}
-    dependencies:
-      minipass: 3.3.6
-
-  /minipass-collect@2.0.1:
-    resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dependencies:
-      minipass: 7.1.2
-    dev: false
-
-  /minipass-fetch@1.4.1:
-    resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==}
-    engines: {node: '>=8'}
-    requiresBuild: true
-    dependencies:
-      minipass: 3.3.6
-      minipass-sized: 1.0.3
-      minizlib: 2.1.2
-    optionalDependencies:
-      encoding: 0.1.13
-    dev: false
-    optional: true
 
-  /minipass-fetch@3.0.5:
-    resolution: {integrity: sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dependencies:
-      minipass: 7.1.2
-      minipass-sized: 1.0.3
-      minizlib: 2.1.2
-    optionalDependencies:
-      encoding: 0.1.13
-    dev: false
+  minimist@1.2.7: {}
 
-  /minipass-flush@1.0.5:
-    resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
-    engines: {node: '>= 8'}
+  minipass-collect@1.0.2:
     dependencies:
       minipass: 3.3.6
 
-  /minipass-pipeline@1.2.4:
-    resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
-    engines: {node: '>=8'}
+  minipass-flush@1.0.5:
     dependencies:
       minipass: 3.3.6
 
-  /minipass-sized@1.0.3:
-    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
-    engines: {node: '>=8'}
+  minipass-pipeline@1.2.4:
     dependencies:
       minipass: 3.3.6
-    dev: false
 
-  /minipass@3.3.6:
-    resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
-    engines: {node: '>=8'}
+  minipass@3.3.6:
     dependencies:
       yallist: 4.0.0
 
-  /minipass@4.0.0:
-    resolution: {integrity: sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==}
-    engines: {node: '>=8'}
+  minipass@4.0.0:
     dependencies:
       yallist: 4.0.0
 
-  /minipass@4.2.8:
-    resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
-    engines: {node: '>=8'}
-
-  /minipass@5.0.0:
-    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
-    engines: {node: '>=8'}
-    dev: false
+  minipass@4.2.8: {}
 
-  /minipass@7.0.3:
-    resolution: {integrity: sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    dev: true
+  minipass@5.0.0: {}
 
-  /minipass@7.1.2:
-    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  minipass@7.1.2: {}
 
-  /minizlib@2.1.2:
-    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
-    engines: {node: '>= 8'}
+  minizlib@2.1.2:
     dependencies:
       minipass: 3.3.6
       yallist: 4.0.0
 
-  /minizlib@3.0.1:
-    resolution: {integrity: sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==}
-    engines: {node: '>= 18'}
+  minizlib@3.0.1:
     dependencies:
       minipass: 7.1.2
       rimraf: 5.0.7
-    dev: false
 
-  /mitt@3.0.1:
-    resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
-    dev: false
+  minizlib@3.1.0:
+    dependencies:
+      minipass: 7.1.2
 
-  /mixme@0.5.4:
-    resolution: {integrity: sha512-3KYa4m4Vlqx98GPdOHghxSdNtTvcP8E0kkaJ5Dlh+h2DRzF7zpuVVcA8B0QpKd11YJeP9QQ7ASkKzOeu195Wzw==}
-    engines: {node: '>= 8.0.0'}
-    dev: false
+  mitt@3.0.1: {}
 
-  /mkdirp-classic@0.5.3:
-    resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+  mixme@0.5.4: {}
 
-  /mkdirp@1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: '>=10'}
-    hasBin: true
+  mkdirp-classic@0.5.3: {}
 
-  /mkdirp@2.1.6:
-    resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dev: false
+  mkdirp@1.0.4: {}
 
-  /mkdirp@3.0.1:
-    resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
-    engines: {node: '>=10'}
-    hasBin: true
+  mkdirp@3.0.1: {}
 
-  /ml-array-max@1.2.4:
-    resolution: {integrity: sha512-BlEeg80jI0tW6WaPyGxf5Sa4sqvcyY6lbSn5Vcv44lp1I2GR6AWojfUvLnGTNsIXrZ8uqWmo8VcG1WpkI2ONMQ==}
+  ml-array-max@1.2.4:
     dependencies:
       is-any-array: 2.0.1
-    dev: true
 
-  /ml-array-min@1.2.3:
-    resolution: {integrity: sha512-VcZ5f3VZ1iihtrGvgfh/q0XlMobG6GQ8FsNyQXD3T+IlstDv85g8kfV0xUG1QPRO/t21aukaJowDzMTc7j5V6Q==}
+  ml-array-min@1.2.3:
     dependencies:
       is-any-array: 2.0.1
-    dev: true
 
-  /ml-array-rescale@1.3.7:
-    resolution: {integrity: sha512-48NGChTouvEo9KBctDfHC3udWnQKNKEWN0ziELvY3KG25GR5cA8K8wNVzracsqSW1QEkAXjTNx+ycgAv06/1mQ==}
+  ml-array-rescale@1.3.7:
     dependencies:
       is-any-array: 2.0.1
       ml-array-max: 1.2.4
       ml-array-min: 1.2.3
-    dev: true
 
-  /ml-matrix@6.12.1:
-    resolution: {integrity: sha512-TJ+8eOFdp+INvzR4zAuwBQJznDUfktMtOB6g/hUcGh3rcyjxbz4Te57Pgri8Q9bhSQ7Zys4IYOGhFdnlgeB6Lw==}
+  ml-matrix@6.12.1:
     dependencies:
       is-any-array: 2.0.1
       ml-array-rescale: 1.3.7
-    dev: true
 
-  /ml-spectra-processing@14.13.0:
-    resolution: {integrity: sha512-AZPE+XrBoRhSRwzUm0IbiQlAPbetDtndDnoq9VO/SzRkN82wrxJpU+urH4aaFVnxTJhxtGOI81FiAxjFe7xQtQ==}
+  ml-spectra-processing@14.13.0:
     dependencies:
       binary-search: 1.3.6
       cheminfo-types: 1.8.1
@@ -29131,35 +37260,28 @@ packages:
       is-any-array: 2.0.1
       ml-matrix: 6.12.1
       ml-xsadd: 3.0.1
-    dev: true
 
-  /ml-xsadd@3.0.1:
-    resolution: {integrity: sha512-Fz2q6dwgzGM8wYKGArTUTZDGa4lQFA2Vi6orjGeTVRy22ZnQFKlJuwS9n8NRviqz1KHAHAzdKJwbnYhdo38uYg==}
-    dev: true
+  ml-xsadd@3.0.1: {}
 
-  /mlly@1.7.1:
-    resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
+  mlly@1.7.1:
     dependencies:
       acorn: 8.12.1
       pathe: 1.1.2
       pkg-types: 1.1.3
       ufo: 1.5.4
 
-  /mlly@1.7.4:
-    resolution: {integrity: sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==}
+  mlly@1.7.4:
     dependencies:
       acorn: 8.14.1
       pathe: 2.0.3
       pkg-types: 1.3.1
       ufo: 1.6.1
-    dev: false
 
-  /module-details-from-path@1.0.3:
-    resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
+  module-details-from-path@1.0.3: {}
 
-  /morgan@1.10.0:
-    resolution: {integrity: sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==}
-    engines: {node: '>= 0.8.0'}
+  moo@0.5.2: {}
+
+  morgan@1.10.0:
     dependencies:
       basic-auth: 2.0.1
       debug: 2.6.9
@@ -29169,102 +37291,36 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /mri@1.2.0:
-    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /mrmime@1.0.1:
-    resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
-    engines: {node: '>=10'}
-
-  /mrmime@2.0.0:
-    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+  mri@1.2.0: {}
 
-  /ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
+  mrmime@1.0.1: {}
 
-  /ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+  mrmime@2.0.0: {}
 
-  /msw@2.3.5(typescript@5.5.4):
-    resolution: {integrity: sha512-+GUI4gX5YC5Bv33epBrD+BGdmDvBg2XGruiWnI3GbIbRmMMBeZ5gs3mJ51OWSGHgJKztZ8AtZeYMMNMVrje2/Q==}
-    engines: {node: '>=18'}
-    hasBin: true
-    requiresBuild: true
-    peerDependencies:
-      typescript: '>= 4.7.x'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@bundled-es-modules/cookie': 2.0.0
-      '@bundled-es-modules/statuses': 1.0.1
-      '@bundled-es-modules/tough-cookie': 0.1.6
-      '@inquirer/confirm': 3.0.0
-      '@mswjs/interceptors': 0.29.1
-      '@open-draft/until': 2.1.0
-      '@types/cookie': 0.6.0
-      '@types/statuses': 2.0.4
-      chalk: 4.1.2
-      graphql: 16.8.1
-      headers-polyfill: 4.0.2
-      is-node-process: 1.2.0
-      outvariant: 1.4.2
-      path-to-regexp: 6.2.1
-      strict-event-emitter: 0.5.1
-      type-fest: 4.10.3
-      typescript: 5.5.4
-      yargs: 17.7.2
-    dev: false
+  ms@2.0.0: {}
 
-  /multipasta@0.2.5:
-    resolution: {integrity: sha512-c8eMDb1WwZcE02WVjHoOmUVk7fnKU/RmUcosHACglrWAuPQsEJv+E8430sXj6jNc1jHw0zrS16aCjQh4BcEb4A==}
-    dev: false
+  ms@2.1.2: {}
 
-  /mupdf@1.3.6:
-    resolution: {integrity: sha512-HRKjlFiD1aN9u2iX7JCIr6qU6jMnihsQY2GnNVcrXXM1BBh3es1166mjMVsdjnhUfnA2NQr4pJBmUjFCxQ/N4A==}
-    dev: false
+  ms@2.1.3: {}
 
-  /mustache@4.2.0:
-    resolution: {integrity: sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==}
-    hasBin: true
+  multipasta@0.2.5: {}
 
-  /mute-stream@1.0.0:
-    resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: false
+  mustache@4.2.0: {}
 
-  /mz@2.7.0:
-    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
+  mz@2.7.0:
     dependencies:
       any-promise: 1.3.0
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  /nan@2.20.0:
-    resolution: {integrity: sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==}
-    dev: false
-
-  /nan@2.22.2:
-    resolution: {integrity: sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==}
-    requiresBuild: true
+  nan@2.23.1:
     optional: true
 
-  /nano-css@5.6.2(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-+6bHaC8dSDGALM1HJjOHVXpuastdu2xFoZlC77Jh4cg+33Zcgm+Gxd+1xsnpZK14eyHObSp82+ll5y3SX75liw==}
-    peerDependencies:
-      react: '*'
-      react-dom: '*'
+  nano-css@5.6.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/sourcemap-codec': 1.5.5
       css-tree: 1.1.3
-      csstype: 3.1.3
+      csstype: 3.2.0
       fastest-stable-stringify: 2.0.2
       inline-style-prefixer: 7.0.1
       react: 18.2.0
@@ -29272,104 +37328,50 @@ packages:
       rtl-css-js: 1.16.1
       stacktrace-js: 2.0.2
       stylis: 4.3.0
-    dev: false
-
-  /nanoid@3.3.11:
-    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
 
-  /nanoid@3.3.6:
-    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-    dev: false
+  nanoid@3.3.11: {}
 
-  /nanoid@3.3.8:
-    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
+  nanoid@3.3.8: {}
 
-  /nanoid@5.0.6:
-    resolution: {integrity: sha512-rRq0eMHoGZxlvaFOUdK1Ev83Bd1IgzzR+WJ3IbDJ7QOSdAxYjlurSPqFs9s4lJg29RT6nPwizFtJhQS6V5xgiA==}
-    engines: {node: ^18 || >=20}
-    hasBin: true
-    dev: false
+  nanoid@5.0.6: {}
 
-  /nanoid@5.1.2:
-    resolution: {integrity: sha512-b+CiXQCNMUGe0Ri64S9SXFcP9hogjAJ2Rd6GdVxhPLRm7mhGaM7VgOvCAJ1ZshfHbqVDI3uqTI5C8/GaKuLI7g==}
-    engines: {node: ^18 || >=20}
-    hasBin: true
-    dev: false
+  nanoid@5.1.2: {}
 
-  /nanoid@5.1.5:
-    resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
-    engines: {node: ^18 || >=20}
-    hasBin: true
-    dev: false
+  nanoid@5.1.5: {}
 
-  /napi-build-utils@2.0.0:
-    resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+  napi-build-utils@2.0.0: {}
 
-  /napi_thread_safe_promise@1.2.6:
-    resolution: {integrity: sha512-Magj7jWzspQiYlqBt4sieiOvWmNJgL/hCWeQaKFpFam82QZJ/etvOfAxlqhPtuUspMABTEgikULHaJA3aDVTNQ==}
-    requiresBuild: true
-    dependencies:
-      node-addon-api: 3.2.1
-    dev: false
+  natural-compare-lite@1.4.0: {}
 
-  /natural-compare-lite@1.4.0:
-    resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==}
-    dev: true
+  natural-compare@1.4.0: {}
 
-  /natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+  nearley@2.20.1:
+    dependencies:
+      commander: 2.20.3
+      moo: 0.5.2
+      railroad-diagrams: 1.0.0
+      randexp: 0.4.6
 
-  /negotiator@0.6.3:
-    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
-    engines: {node: '>= 0.6'}
+  negotiator@0.6.3: {}
 
-  /negotiator@1.0.0:
-    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
-    engines: {node: '>= 0.6'}
-    dev: false
+  negotiator@1.0.0: {}
 
-  /neo-async@2.6.2:
-    resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
+  neo-async@2.6.2: {}
 
-  /nested-error-stacks@2.1.1:
-    resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==}
-    dev: true
+  nested-error-stacks@2.1.1: {}
 
-  /netmask@2.0.2:
-    resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
-    engines: {node: '>= 0.4.0'}
-    dev: false
+  netmask@2.0.2: {}
 
-  /new-github-issue-url@0.2.1:
-    resolution: {integrity: sha512-md4cGoxuT4T4d/HDOXbrUHkTKrp/vp+m3aOA7XXVYwNsUNMK49g3SQicTSeV5GIz/5QVGAeYRAOlyp9OvlgsYA==}
-    engines: {node: '>=10'}
-    dev: true
+  neverthrow@8.2.0:
+    optionalDependencies:
+      '@rollup/rollup-linux-x64-gnu': 4.53.2
 
-  /next@14.1.0(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-wlzrsbfeSU48YQBjZhDzOwhWhGsy+uQycR8bHAOt1LY1bn3zZEcDyHQOEoN3aWzQ8LHCAJ1nqrWCc9XF2+O45Q==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      sass:
-        optional: true
+  next@14.1.0(@opentelemetry/api@1.9.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1):
     dependencies:
       '@next/env': 14.1.0
       '@swc/helpers': 0.5.2
       busboy: 1.6.0
-      caniuse-lite: 1.0.30001707
+      caniuse-lite: 1.0.30001754
       graceful-fs: 4.2.11
       postcss: 8.4.31
       react: 18.3.1
@@ -29385,32 +37387,14 @@ packages:
       '@next/swc-win32-arm64-msvc': 14.1.0
       '@next/swc-win32-ia32-msvc': 14.1.0
       '@next/swc-win32-x64-msvc': 14.1.0
+      '@opentelemetry/api': 1.9.0
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
-    dev: false
 
-  /next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-rZmLwucLHr3/zfDMYbJXbw0ZeoBpirxkXuvsJbk7UPorvPYZhP7vq7aHbKnU7dQNCYIimRrbB2pp3xmf+wsYUg==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      sass:
-        optional: true
+  next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1):
     dependencies:
       '@next/env': 14.2.21
-      '@opentelemetry/api': 1.9.0
-      '@playwright/test': 1.37.0
       '@swc/helpers': 0.5.5
       busboy: 1.6.0
       caniuse-lite: 1.0.30001699
@@ -29429,79 +37413,15 @@ packages:
       '@next/swc-win32-arm64-msvc': 14.2.21
       '@next/swc-win32-ia32-msvc': 14.2.21
       '@next/swc-win32-x64-msvc': 14.2.21
-    transitivePeerDependencies:
-      - '@babel/core'
-      - babel-plugin-macros
-    dev: false
-
-  /next@14.2.3(@babel/core@7.24.5)(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==}
-    engines: {node: '>=18.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
-      react: ^18.2.0
-      react-dom: ^18.2.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      sass:
-        optional: true
-    dependencies:
-      '@next/env': 14.2.3
-      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/api': 1.9.0
       '@playwright/test': 1.37.0
-      '@swc/helpers': 0.5.5
-      busboy: 1.6.0
-      caniuse-lite: 1.0.30001707
-      graceful-fs: 4.2.11
-      postcss: 8.4.31
-      react: 19.0.0-rc.0
-      react-dom: 18.3.1(react@19.0.0-rc.0)
-      styled-jsx: 5.1.1(@babel/core@7.24.5)(react@19.0.0-rc.0)
-    optionalDependencies:
-      '@next/swc-darwin-arm64': 14.2.3
-      '@next/swc-darwin-x64': 14.2.3
-      '@next/swc-linux-arm64-gnu': 14.2.3
-      '@next/swc-linux-arm64-musl': 14.2.3
-      '@next/swc-linux-x64-gnu': 14.2.3
-      '@next/swc-linux-x64-musl': 14.2.3
-      '@next/swc-win32-arm64-msvc': 14.2.3
-      '@next/swc-win32-ia32-msvc': 14.2.3
-      '@next/swc-win32-x64-msvc': 14.2.3
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
-    dev: false
 
-  /next@15.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0)(react@19.0.0):
-    resolution: {integrity: sha512-VwL+LAaPSxEkd3lU2xWbgEOtrM8oedmyhBqaVNmgKB+GvZlCy9rgaEc+y2on0wv+l0oSFqLtYD6dcC1eAedUaQ==}
-    engines: {node: ^18.18.0 || ^19.8.0 || >= 20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@opentelemetry/api': ^1.1.0
-      '@playwright/test': ^1.41.2
-      babel-plugin-react-compiler: '*'
-      react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
-      react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
-      sass: ^1.3.0
-    peerDependenciesMeta:
-      '@opentelemetry/api':
-        optional: true
-      '@playwright/test':
-        optional: true
-      babel-plugin-react-compiler:
-        optional: true
-      sass:
-        optional: true
+  next@15.2.4(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
     dependencies:
       '@next/env': 15.2.4
-      '@opentelemetry/api': 1.9.0
-      '@playwright/test': 1.37.0
       '@swc/counter': 0.1.3
       '@swc/helpers': 0.5.15
       busboy: 1.6.0
@@ -29519,338 +37439,184 @@ packages:
       '@next/swc-linux-x64-musl': 15.2.4
       '@next/swc-win32-arm64-msvc': 15.2.4
       '@next/swc-win32-x64-msvc': 15.2.4
+      '@opentelemetry/api': 1.9.0
+      '@playwright/test': 1.37.0
       sharp: 0.33.5
     transitivePeerDependencies:
       - '@babel/core'
       - babel-plugin-macros
-    dev: false
-
-  /nice-try@1.0.5:
-    resolution: {integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==}
-    dev: true
 
-  /node-abi@3.75.0:
-    resolution: {integrity: sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==}
-    engines: {node: '>=10'}
+  next@15.4.8(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.0.0(react@19.0.0))(react@19.0.0):
     dependencies:
-      semver: 7.7.2
-
-  /node-abort-controller@3.1.1:
-    resolution: {integrity: sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==}
-    dev: false
-
-  /node-addon-api@3.2.1:
-    resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==}
-    dev: false
+      '@next/env': 15.4.8
+      '@swc/helpers': 0.5.15
+      caniuse-lite: 1.0.30001754
+      postcss: 8.4.31
+      react: 19.0.0
+      react-dom: 19.0.0(react@19.0.0)
+      styled-jsx: 5.1.6(react@19.0.0)
+    optionalDependencies:
+      '@next/swc-darwin-arm64': 15.4.8
+      '@next/swc-darwin-x64': 15.4.8
+      '@next/swc-linux-arm64-gnu': 15.4.8
+      '@next/swc-linux-arm64-musl': 15.4.8
+      '@next/swc-linux-x64-gnu': 15.4.8
+      '@next/swc-linux-x64-musl': 15.4.8
+      '@next/swc-win32-arm64-msvc': 15.4.8
+      '@next/swc-win32-x64-msvc': 15.4.8
+      '@opentelemetry/api': 1.9.0
+      '@playwright/test': 1.37.0
+      sharp: 0.34.5
+    transitivePeerDependencies:
+      - '@babel/core'
+      - babel-plugin-macros
 
-  /node-addon-api@4.3.0:
-    resolution: {integrity: sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==}
-    dev: false
+  next@15.5.6(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
+    dependencies:
+      '@next/env': 15.5.6
+      '@swc/helpers': 0.5.15
+      caniuse-lite: 1.0.30001754
+      postcss: 8.4.31
+      react: 19.1.0
+      react-dom: 19.1.0(react@19.1.0)
+      styled-jsx: 5.1.6(react@19.1.0)
+    optionalDependencies:
+      '@next/swc-darwin-arm64': 15.5.6
+      '@next/swc-darwin-x64': 15.5.6
+      '@next/swc-linux-arm64-gnu': 15.5.6
+      '@next/swc-linux-arm64-musl': 15.5.6
+      '@next/swc-linux-x64-gnu': 15.5.6
+      '@next/swc-linux-x64-musl': 15.5.6
+      '@next/swc-win32-arm64-msvc': 15.5.6
+      '@next/swc-win32-x64-msvc': 15.5.6
+      '@opentelemetry/api': 1.9.0
+      '@playwright/test': 1.37.0
+      sharp: 0.34.5
+    transitivePeerDependencies:
+      - '@babel/core'
+      - babel-plugin-macros
 
-  /node-addon-api@7.1.1:
-    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
-    dev: false
+  node-abi@3.75.0:
+    dependencies:
+      semver: 5.7.2
 
-  /node-addon-api@8.3.1:
-    resolution: {integrity: sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA==}
-    engines: {node: ^18 || ^20 || >= 21}
-    dev: false
+  node-abort-controller@3.1.1: {}
 
-  /node-domexception@1.0.0:
-    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
-    engines: {node: '>=10.5.0'}
+  node-domexception@1.0.0: {}
 
-  /node-emoji@1.11.0:
-    resolution: {integrity: sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==}
+  node-emoji@1.11.0:
     dependencies:
-      lodash: 4.17.21
-    dev: false
+      lodash: 4.17.23
 
-  /node-emoji@2.1.3:
-    resolution: {integrity: sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==}
-    engines: {node: '>=18'}
+  node-emoji@2.1.3:
     dependencies:
       '@sindresorhus/is': 4.6.0
       char-regex: 1.0.2
       emojilib: 2.4.0
       skin-tone: 2.0.0
-    dev: true
-
-  /node-fetch-native@1.6.4:
-    resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==}
-    dev: false
 
-  /node-fetch-native@1.6.6:
-    resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==}
-    dev: false
-
-  /node-fetch@2.6.12:
-    resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-    dependencies:
-      whatwg-url: 5.0.0
+  node-fetch-native@1.6.6: {}
 
-  /node-fetch@2.6.7:
-    resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
+  node-fetch@2.6.12(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
-    dev: false
+    optionalDependencies:
+      encoding: 0.1.13
 
-  /node-fetch@2.7.0:
-    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
-    engines: {node: 4.x || >=6.0.0}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
+  node-fetch@2.6.7(encoding@0.1.13):
     dependencies:
       whatwg-url: 5.0.0
-    dev: true
-
-  /node-forge@1.3.1:
-    resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
-    engines: {node: '>= 6.13.0'}
-    dev: false
-
-  /node-gyp-build@4.8.4:
-    resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
-    hasBin: true
-
-  /node-gyp@10.2.0:
-    resolution: {integrity: sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==}
-    engines: {node: ^16.14.0 || >=18.0.0}
-    hasBin: true
-    dependencies:
-      env-paths: 2.2.1
-      exponential-backoff: 3.1.1
-      glob: 10.4.5
-      graceful-fs: 4.2.11
-      make-fetch-happen: 13.0.1
-      nopt: 7.2.0
-      proc-log: 4.2.0
-      semver: 7.7.2
-      tar: 6.2.1
-      which: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /node-gyp@8.4.1:
-    resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==}
-    engines: {node: '>= 10.12.0'}
-    hasBin: true
-    requiresBuild: true
-    dependencies:
-      env-paths: 2.2.1
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      make-fetch-happen: 9.1.0
-      nopt: 5.0.0
-      npmlog: 6.0.2
-      rimraf: 3.0.2
-      semver: 7.6.3
-      tar: 6.2.1
-      which: 2.0.2
-    transitivePeerDependencies:
-      - bluebird
-      - supports-color
-    dev: false
-    optional: true
+    optionalDependencies:
+      encoding: 0.1.13
 
-  /node-releases@2.0.12:
-    resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==}
-    dev: true
+  node-gyp-build@4.8.4: {}
 
-  /node-releases@2.0.18:
-    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
-    dev: false
+  node-releases@2.0.12: {}
 
-  /node-releases@2.0.19:
-    resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==}
+  node-releases@2.0.19: {}
 
-  /nodemailer@6.9.16:
-    resolution: {integrity: sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==}
-    engines: {node: '>=6.0.0'}
-    dev: false
+  node-releases@2.0.27: {}
 
-  /non.geist@1.0.2:
-    resolution: {integrity: sha512-oGCfo7Ub5bJmCOAt4CMAsCrVal/JXkQtxgBcpXzdU3lQib9c5hHdr62I8vI6TtdlsLcaYAPD/HRfZNdBUobwFg==}
-    dev: false
+  nodemailer@7.0.11: {}
 
-  /nopt@5.0.0:
-    resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==}
-    engines: {node: '>=6'}
-    hasBin: true
-    requiresBuild: true
-    dependencies:
-      abbrev: 1.1.1
-    dev: false
-    optional: true
+  non.geist@1.0.2: {}
 
-  /nopt@7.2.0:
-    resolution: {integrity: sha512-CVDtwCdhYIvnAzFoJ6NJ6dX3oga9/HyciQDnG1vQDjSLMeKLJ4A93ZqYKDrgYSr1FBY5/hMYC+2VCi24pgpkGA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    hasBin: true
+  nopt@7.2.0:
     dependencies:
       abbrev: 2.0.0
-    dev: false
 
-  /normalize-package-data@2.5.0:
-    resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
+  normalize-package-data@2.5.0:
     dependencies:
       hosted-git-info: 2.8.9
       resolve: 1.22.8
-      semver: 5.7.1
+      semver: 5.7.2
       validate-npm-package-license: 3.0.4
 
-  /normalize-package-data@5.0.0:
-    resolution: {integrity: sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  normalize-package-data@5.0.0:
     dependencies:
       hosted-git-info: 6.1.1
       is-core-module: 2.14.0
-      semver: 7.6.3
+      semver: 5.7.2
       validate-npm-package-license: 3.0.4
-    dev: true
-
-  /normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
 
-  /normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
+  normalize-path@3.0.0: {}
 
-  /normalize-url@4.5.1:
-    resolution: {integrity: sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==}
-    engines: {node: '>=8'}
-    dev: true
+  normalize-range@0.1.2: {}
 
-  /normalize.css@8.0.1:
-    resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==}
-    dev: false
+  normalize-url@4.5.1: {}
 
-  /notepack.io@3.0.1:
-    resolution: {integrity: sha512-TKC/8zH5pXIAMVQio2TvVDTtPRX+DJPHDqjRbxogtFiByHyzKmy96RA0JtCQJ+WouyyL4A10xomQzgbUT+1jCg==}
-    dev: false
+  normalize.css@8.0.1: {}
 
-  /npm-bundled@2.0.1:
-    resolution: {integrity: sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dependencies:
-      npm-normalize-package-bin: 2.0.0
-    dev: true
+  notepack.io@3.0.1: {}
 
-  /npm-install-checks@6.2.0:
-    resolution: {integrity: sha512-744wat5wAAHsxa4590mWO0tJ8PKxR8ORZsH9wGpQc3nWTzozMAgBN/XyqYw7mg3yqLM8dLwEnwSfKMmXAjF69g==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  npm-install-checks@6.2.0:
     dependencies:
-      semver: 7.7.2
-    dev: true
-
-  /npm-normalize-package-bin@2.0.0:
-    resolution: {integrity: sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    dev: true
+      semver: 5.7.2
 
-  /npm-normalize-package-bin@3.0.1:
-    resolution: {integrity: sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
+  npm-normalize-package-bin@3.0.1: {}
 
-  /npm-package-arg@10.1.0:
-    resolution: {integrity: sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  npm-package-arg@10.1.0:
     dependencies:
       hosted-git-info: 6.1.1
       proc-log: 3.0.0
-      semver: 7.7.2
+      semver: 5.7.2
       validate-npm-package-name: 5.0.0
-    dev: true
-
-  /npm-packlist@5.1.3:
-    resolution: {integrity: sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    hasBin: true
-    dependencies:
-      glob: 8.1.0
-      ignore-walk: 5.0.1
-      npm-bundled: 2.0.1
-      npm-normalize-package-bin: 2.0.0
-    dev: true
 
-  /npm-pick-manifest@8.0.2:
-    resolution: {integrity: sha512-1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  npm-pick-manifest@8.0.2:
     dependencies:
       npm-install-checks: 6.2.0
       npm-normalize-package-bin: 3.0.1
       npm-package-arg: 10.1.0
-      semver: 7.7.2
-    dev: true
+      semver: 5.7.2
 
-  /npm-run-all@4.1.5:
-    resolution: {integrity: sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==}
-    engines: {node: '>= 4'}
-    hasBin: true
+  npm-run-all@4.1.5:
     dependencies:
       ansi-styles: 3.2.1
       chalk: 2.4.2
-      cross-spawn: 6.0.5
+      cross-spawn: 7.0.5
       memorystream: 0.3.1
       minimatch: 3.1.2
       pidtree: 0.3.1
       read-pkg: 3.0.0
       shell-quote: 1.8.1
       string.prototype.padend: 3.1.4
-    dev: true
 
-  /npm-run-path@4.0.1:
-    resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
-    engines: {node: '>=8'}
+  npm-run-path@4.0.1:
     dependencies:
       path-key: 3.1.1
-    dev: true
 
-  /npm-run-path@5.1.0:
-    resolution: {integrity: sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  npm-run-path@5.1.0:
     dependencies:
       path-key: 4.0.0
 
-  /npmlog@6.0.2:
-    resolution: {integrity: sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==}
-    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
-    deprecated: This package is no longer supported.
-    requiresBuild: true
+  npm-run-path@6.0.0:
     dependencies:
-      are-we-there-yet: 3.0.1
-      console-control-strings: 1.1.0
-      gauge: 4.0.4
-      set-blocking: 2.0.0
-    dev: false
-    optional: true
+      path-key: 4.0.0
+      unicorn-magic: 0.3.0
 
-  /num2fraction@1.2.2:
-    resolution: {integrity: sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==}
-    dev: false
+  num2fraction@1.2.2: {}
 
-  /nypm@0.3.9:
-    resolution: {integrity: sha512-BI2SdqqTHg2d4wJh8P9A1W+bslg33vOE9IZDY6eR2QC+Pu1iNBVZUqczrd43rJb+fMzHU7ltAYKsEFY/kHMFcw==}
-    engines: {node: ^14.16.0 || >=16.10.0}
-    hasBin: true
+  nypm@0.3.9:
     dependencies:
       citty: 0.1.6
       consola: 3.4.2
@@ -29858,12 +37624,8 @@ packages:
       pathe: 1.1.2
       pkg-types: 1.1.3
       ufo: 1.6.1
-    dev: false
 
-  /nypm@0.5.4:
-    resolution: {integrity: sha512-X0SNNrZiGU8/e/zAB7sCTtdxWTMSIO73q+xuKgglm2Yvzwlo8UoC5FNySQFCvl84uPaeADkqHUZUkWy4aH4xOA==}
-    engines: {node: ^14.16.0 || >=16.10.0}
-    hasBin: true
+  nypm@0.5.4:
     dependencies:
       citty: 0.1.6
       consola: 3.4.2
@@ -29871,320 +37633,210 @@ packages:
       pkg-types: 1.3.1
       tinyexec: 0.3.2
       ufo: 1.5.4
-    dev: false
 
-  /oauth-sign@0.9.0:
-    resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==}
-    dev: false
+  nypm@0.6.1:
+    dependencies:
+      citty: 0.1.6
+      consola: 3.4.2
+      pathe: 2.0.3
+      pkg-types: 2.3.0
+      tinyexec: 1.0.1
 
-  /oauth4webapi@3.3.0:
-    resolution: {integrity: sha512-ZlozhPlFfobzh3hB72gnBFLjXpugl/dljz1fJSRdqaV2r3D5dmi5lg2QWI0LmUYuazmE+b5exsloEv6toUtw9g==}
-    dev: false
+  oauth-sign@0.9.0: {}
 
-  /object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
+  oauth4webapi@3.3.0: {}
 
-  /object-hash@2.2.0:
-    resolution: {integrity: sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==}
-    engines: {node: '>= 6'}
-    dev: false
+  object-assign@4.1.1: {}
 
-  /object-hash@3.0.0:
-    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: '>= 6'}
+  object-hash@2.2.0: {}
 
-  /object-inspect@1.13.4:
-    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
-    engines: {node: '>= 0.4'}
+  object-hash@3.0.0: {}
 
-  /object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
+  object-inspect@1.13.4: {}
 
-  /object.assign@4.1.4:
-    resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
-      has-symbols: 1.1.0
-      object-keys: 1.1.1
+  object-keys@1.1.1: {}
 
-  /object.assign@4.1.5:
-    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
-    engines: {node: '>= 0.4'}
+  object.assign@4.1.5:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       has-symbols: 1.1.0
       object-keys: 1.1.1
-    dev: true
 
-  /object.entries@1.1.6:
-    resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==}
-    engines: {node: '>= 0.4'}
+  object.entries@1.1.6:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
-    dev: true
 
-  /object.fromentries@2.0.6:
-    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
-    engines: {node: '>= 0.4'}
+  object.fromentries@2.0.6:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
-    dev: true
 
-  /object.fromentries@2.0.8:
-    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
-    engines: {node: '>= 0.4'}
+  object.fromentries@2.0.8:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-object-atoms: 1.0.0
-    dev: true
 
-  /object.groupby@1.0.3:
-    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
-    engines: {node: '>= 0.4'}
+  object.groupby@1.0.3:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
-    dev: true
 
-  /object.hasown@1.1.2:
-    resolution: {integrity: sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw==}
+  object.hasown@1.1.2:
     dependencies:
-      define-properties: 1.1.4
+      define-properties: 1.2.1
       es-abstract: 1.21.1
-    dev: true
 
-  /object.values@1.1.6:
-    resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
-    engines: {node: '>= 0.4'}
+  object.values@1.1.6:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
-    dev: true
 
-  /object.values@1.2.0:
-    resolution: {integrity: sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==}
-    engines: {node: '>= 0.4'}
+  object.values@1.2.0:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
-    dev: true
 
-  /obuf@1.1.2:
-    resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
+  obuf@1.1.2: {}
 
-  /ohash@1.1.3:
-    resolution: {integrity: sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw==}
-    dev: false
+  octokit@3.2.2:
+    dependencies:
+      '@octokit/app': 14.1.0
+      '@octokit/core': 5.2.2
+      '@octokit/oauth-app': 6.1.0
+      '@octokit/plugin-paginate-graphql': 4.0.1(@octokit/core@5.2.2)
+      '@octokit/plugin-paginate-rest': 11.4.4-cjs.2(@octokit/core@5.2.2)
+      '@octokit/plugin-rest-endpoint-methods': 13.3.2-cjs.1(@octokit/core@5.2.2)
+      '@octokit/plugin-retry': 6.1.0(@octokit/core@5.2.2)
+      '@octokit/plugin-throttling': 8.2.0(@octokit/core@5.2.2)
+      '@octokit/request-error': 5.1.1
+      '@octokit/types': 13.10.0
+      '@octokit/webhooks': 12.3.2
 
-  /oidc-token-hash@5.0.3:
-    resolution: {integrity: sha512-IF4PcGgzAr6XXSff26Sk/+P4KZFJVuHAJZj3wgO3vX2bMdNVp/QXTP3P7CEm9V1IdG8lDLY3HhiqpsE/nOwpPw==}
-    engines: {node: ^10.13.0 || >=12.0.0}
-    requiresBuild: true
-    dev: false
-    optional: true
+  ohash@1.1.3: {}
 
-  /on-change@4.0.2:
-    resolution: {integrity: sha512-cMtCyuJmTx/bg2HCpHo3ZLeF7FZnBOapLqZHr2AlLeJ5Ul0Zu2mUJJz051Fdwu/Et2YW04ZD+TtU+gVy0ACNCA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: false
+  ohash@2.0.11: {}
 
-  /on-exit-leak-free@2.1.2:
-    resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==}
-    engines: {node: '>=14.0.0'}
-    dev: true
+  oidc-token-hash@5.0.3:
+    optional: true
 
-  /on-finished@2.3.0:
-    resolution: {integrity: sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==}
-    engines: {node: '>= 0.8'}
+  on-exit-leak-free@2.1.2: {}
+
+  on-finished@2.3.0:
     dependencies:
       ee-first: 1.1.1
 
-  /on-finished@2.4.1:
-    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
-    engines: {node: '>= 0.8'}
+  on-finished@2.4.1:
     dependencies:
       ee-first: 1.1.1
 
-  /on-headers@1.0.2:
-    resolution: {integrity: sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==}
-    engines: {node: '>= 0.8'}
+  on-headers@1.0.2: {}
 
-  /once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+  once@1.4.0:
     dependencies:
       wrappy: 1.0.2
 
-  /onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
+  onetime@5.1.2:
     dependencies:
       mimic-fn: 2.1.0
 
-  /onetime@6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
+  onetime@6.0.0:
     dependencies:
       mimic-fn: 4.0.0
 
-  /open@10.0.3:
-    resolution: {integrity: sha512-dtbI5oW7987hwC9qjJTyABldTaa19SuyJse1QboWv3b0qCcrrLNVDqBx1XgELAjh9QTVQaP/C5b1nhQebd1H2A==}
-    engines: {node: '>=18'}
+  oniguruma-parser@0.12.1: {}
+
+  oniguruma-to-es@4.3.3:
+    dependencies:
+      oniguruma-parser: 0.12.1
+      regex: 6.0.1
+      regex-recursion: 6.0.2
+
+  open@10.0.3:
     dependencies:
       default-browser: 5.2.1
       define-lazy-prop: 3.0.0
       is-inside-container: 1.0.0
       is-wsl: 3.1.0
-    dev: false
-
-  /open@7.4.2:
-    resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
-    engines: {node: '>=8'}
-    dependencies:
-      is-docker: 2.2.1
-      is-wsl: 2.2.0
-    dev: true
 
-  /open@8.4.0:
-    resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
-    engines: {node: '>=12'}
+  open@8.4.0:
     dependencies:
       define-lazy-prop: 2.0.0
       is-docker: 2.2.1
       is-wsl: 2.2.0
-    dev: true
 
-  /openai@4.33.1:
-    resolution: {integrity: sha512-0DH572aSxGTT1JPOXgJQ9mjiuSPg/7scPot8hLc5I1mfQxPxLXTZWJpWerKaIWOuPkR2nrB0SamGDEehH8RuWA==}
-    hasBin: true
+  openai@4.33.1(encoding@0.1.13):
     dependencies:
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       '@types/node-fetch': 2.6.4
       abort-controller: 3.0.0
       agentkeepalive: 4.5.0
       form-data-encoder: 1.7.2
       formdata-node: 4.4.1
-      node-fetch: 2.6.12
+      node-fetch: 2.6.12(encoding@0.1.13)
       web-streams-polyfill: 3.2.1
     transitivePeerDependencies:
       - encoding
-    dev: false
-
-  /openai@4.56.0(zod@3.23.8):
-    resolution: {integrity: sha512-zcag97+3bG890MNNa0DQD9dGmmTWL8unJdNkulZzWRXrl+QeD+YkBI4H58rJcwErxqGK6a0jVPZ4ReJjhDGcmw==}
-    hasBin: true
-    peerDependencies:
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      zod:
-        optional: true
-    dependencies:
-      '@types/node': 18.19.20
-      '@types/node-fetch': 2.6.4
-      abort-controller: 3.0.0
-      agentkeepalive: 4.5.0
-      form-data-encoder: 1.7.2
-      formdata-node: 4.4.1
-      node-fetch: 2.6.12
-      zod: 3.23.8
-    transitivePeerDependencies:
-      - encoding
-    dev: false
 
-  /openai@4.68.4(zod@3.23.8):
-    resolution: {integrity: sha512-LRinV8iU9VQplkr25oZlyrsYGPGasIwYN8KFMAAFTHHLHjHhejtJ5BALuLFrkGzY4wfbKhOhuT+7lcHZ+F3iEA==}
-    hasBin: true
-    peerDependencies:
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      zod:
-        optional: true
+  openai@4.68.4(encoding@0.1.13)(zod@3.25.76):
     dependencies:
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       '@types/node-fetch': 2.6.4
       abort-controller: 3.0.0
       agentkeepalive: 4.5.0
       form-data-encoder: 1.7.2
       formdata-node: 4.4.1
-      node-fetch: 2.6.12
-      zod: 3.23.8
+      node-fetch: 2.6.12(encoding@0.1.13)
+    optionalDependencies:
+      zod: 3.25.76
     transitivePeerDependencies:
       - encoding
-    dev: false
 
-  /openai@4.97.0(ws@8.12.0)(zod@3.23.8):
-    resolution: {integrity: sha512-LRoiy0zvEf819ZUEJhgfV8PfsE8G5WpQi4AwA1uCV8SKvvtXQkoWUFkepD6plqyJQRghy2+AEPQ07FrJFKHZ9Q==}
-    hasBin: true
-    peerDependencies:
-      ws: ^8.18.0
-      zod: ^3.23.8
-    peerDependenciesMeta:
-      ws:
-        optional: true
-      zod:
-        optional: true
+  openai@4.97.0(encoding@0.1.13)(ws@8.17.1(bufferutil@4.0.9))(zod@3.25.76):
     dependencies:
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       '@types/node-fetch': 2.6.12
       abort-controller: 3.0.0
       agentkeepalive: 4.5.0
       form-data-encoder: 1.7.2
       formdata-node: 4.4.1
-      node-fetch: 2.6.12
-      ws: 8.12.0
-      zod: 3.23.8
+      node-fetch: 2.6.12(encoding@0.1.13)
+    optionalDependencies:
+      ws: 8.17.1(bufferutil@4.0.9)
+      zod: 3.25.76
     transitivePeerDependencies:
       - encoding
 
-  /openapi-fetch@0.9.8:
-    resolution: {integrity: sha512-zM6elH0EZStD/gSiNlcPrzXcVQ/pZo3BDvC6CDwRDUt1dDzxlshpmQnpD6cZaJ39THaSmwVCxxRrPKNM1hHrDg==}
+  openapi-fetch@0.9.8:
     dependencies:
       openapi-typescript-helpers: 0.0.8
-    dev: false
 
-  /openapi-typescript-helpers@0.0.8:
-    resolution: {integrity: sha512-1eNjQtbfNi5Z/kFhagDIaIRj6qqDzhjNJKz8cmMW0CVdGwT6e1GLbAfgI0d28VTJa1A8jz82jm/4dG8qNoNS8g==}
-    dev: false
+  openapi-typescript-helpers@0.0.8: {}
 
-  /opener@1.5.2:
-    resolution: {integrity: sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==}
-    hasBin: true
-    dev: true
+  opener@1.5.2: {}
 
-  /openid-client@5.7.1:
-    resolution: {integrity: sha512-jDBPgSVfTnkIh71Hg9pRvtJc6wTwqjRkN88+gCFtYWrlP4Yx2Dsrow8uPi3qLr/aeymPF3o2+dS+wOpglK04ew==}
-    requiresBuild: true
+  openid-client@5.7.1:
     dependencies:
       jose: 4.15.9
       lru-cache: 6.0.0
       object-hash: 2.2.0
       oidc-token-hash: 5.0.3
-    dev: false
     optional: true
 
-  /openid-client@6.3.3:
-    resolution: {integrity: sha512-lTK8AV8SjqCM4qznLX0asVESAwzV39XTVdfMAM185ekuaZCnkWdPzcxMTXNlsm9tsUAMa1Q30MBmKAykdT1LWw==}
+  openid-client@6.3.3:
     dependencies:
       jose: 6.0.8
       oauth4webapi: 3.3.0
-    dev: false
 
-  /optionator@0.9.1:
-    resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==}
-    engines: {node: '>= 0.8.0'}
+  optionator@0.9.1:
     dependencies:
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
@@ -30193,9 +37845,7 @@ packages:
       type-check: 0.4.0
       word-wrap: 1.2.3
 
-  /ora@5.4.1:
-    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
-    engines: {node: '>=10'}
+  ora@5.4.1:
     dependencies:
       bl: 4.1.0
       chalk: 4.1.2
@@ -30207,243 +37857,141 @@ packages:
       strip-ansi: 6.0.1
       wcwidth: 1.0.1
 
-  /os-paths@7.4.0:
-    resolution: {integrity: sha512-Ux1J4NUqC6tZayBqLN1kUlDAEvLiQlli/53sSddU4IN+h+3xxnv2HmRSMpVSvr1hvJzotfMs3ERvETGK+f4OwA==}
-    engines: {node: '>= 4.0'}
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: false
-
-  /os-tmpdir@1.0.2:
-    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /outdent@0.5.0:
-    resolution: {integrity: sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==}
-    dev: false
+  os-paths@7.4.0:
+    optionalDependencies:
+      fsevents: 2.3.3
 
-  /outdent@0.8.0:
-    resolution: {integrity: sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==}
-    dev: true
+  os-tmpdir@1.0.2: {}
 
-  /outvariant@1.4.2:
-    resolution: {integrity: sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ==}
-    dev: false
+  outdent@0.5.0: {}
 
-  /ow@0.28.2:
-    resolution: {integrity: sha512-dD4UpyBh/9m4X2NVjA+73/ZPBRF+uF4zIMFvvQsabMiEK8x41L3rQ8EENOi35kyyoaJwNxEeJcP6Fj1H4U409Q==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@sindresorhus/is': 4.6.0
-      callsites: 3.1.0
-      dot-prop: 6.0.1
-      lodash.isequal: 4.5.0
-      vali-date: 1.0.0
-    dev: false
+  outdent@0.8.0: {}
 
-  /p-cancelable@1.1.0:
-    resolution: {integrity: sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==}
-    engines: {node: '>=6'}
-    dev: true
+  p-cancelable@1.1.0: {}
 
-  /p-event@5.0.1:
-    resolution: {integrity: sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  p-event@5.0.1:
     dependencies:
       p-timeout: 5.1.0
-    dev: true
 
-  /p-filter@2.1.0:
-    resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==}
-    engines: {node: '>=8'}
+  p-filter@2.1.0:
     dependencies:
       p-map: 2.1.0
 
-  /p-filter@3.0.0:
-    resolution: {integrity: sha512-QtoWLjXAW++uTX67HZQz1dbTpqBfiidsB6VtQUC9iR85S120+s0T5sO6s+B5MLzFcZkrEd/DGMmCjR+f2Qpxwg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  p-filter@3.0.0:
     dependencies:
       p-map: 5.5.0
-    dev: true
 
-  /p-finally@1.0.0:
-    resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
-    engines: {node: '>=4'}
-    dev: false
+  p-finally@1.0.0: {}
 
-  /p-limit@2.3.0:
-    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
-    engines: {node: '>=6'}
+  p-limit@2.3.0:
     dependencies:
       p-try: 2.2.0
 
-  /p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
+  p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  p-limit@4.0.0:
     dependencies:
       yocto-queue: 1.1.1
-    dev: true
 
-  /p-limit@6.2.0:
-    resolution: {integrity: sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA==}
-    engines: {node: '>=18'}
+  p-limit@6.2.0:
     dependencies:
       yocto-queue: 1.1.1
-    dev: false
 
-  /p-locate@4.1.0:
-    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
-    engines: {node: '>=8'}
+  p-locate@4.1.0:
     dependencies:
       p-limit: 2.3.0
 
-  /p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
+  p-locate@5.0.0:
     dependencies:
       p-limit: 3.1.0
 
-  /p-locate@6.0.0:
-    resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  p-locate@6.0.0:
     dependencies:
       p-limit: 4.0.0
-    dev: true
 
-  /p-map@2.1.0:
-    resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
-    engines: {node: '>=6'}
+  p-map@2.1.0: {}
 
-  /p-map@4.0.0:
-    resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
-    engines: {node: '>=10'}
+  p-map@4.0.0:
     dependencies:
       aggregate-error: 3.1.0
 
-  /p-map@5.5.0:
-    resolution: {integrity: sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==}
-    engines: {node: '>=12'}
+  p-map@5.5.0:
     dependencies:
       aggregate-error: 4.0.1
-    dev: true
 
-  /p-map@6.0.0:
-    resolution: {integrity: sha512-T8BatKGY+k5rU+Q/GTYgrEf2r4xRMevAN5mtXc2aPc4rS1j3s+vWTaO2Wag94neXuCAUAs8cxBL9EeB5EA6diw==}
-    engines: {node: '>=16'}
+  p-map@6.0.0: {}
 
-  /p-queue@6.6.2:
-    resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
-    engines: {node: '>=8'}
+  p-queue@6.6.2:
     dependencies:
       eventemitter3: 4.0.7
       p-timeout: 3.2.0
-    dev: false
 
-  /p-queue@8.0.1:
-    resolution: {integrity: sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA==}
-    engines: {node: '>=18'}
+  p-queue@8.0.1:
     dependencies:
       eventemitter3: 5.0.1
       p-timeout: 6.1.2
-    dev: false
 
-  /p-retry@4.6.2:
-    resolution: {integrity: sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==}
-    engines: {node: '>=8'}
+  p-retry@4.6.2:
     dependencies:
       '@types/retry': 0.12.0
       retry: 0.13.1
 
-  /p-retry@6.1.0:
-    resolution: {integrity: sha512-fJLEQ2KqYBJRuaA/8cKMnqhulqNM+bpcjYtXNex2t3mOXKRYPitAJt9NacSf8XAFzcYahSAbKpobiWDSqHSh2g==}
-    engines: {node: '>=16.17'}
+  p-retry@6.1.0:
     dependencies:
       '@types/retry': 0.12.2
       is-network-error: 1.0.0
       retry: 0.13.1
-    dev: false
 
-  /p-timeout@3.2.0:
-    resolution: {integrity: sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==}
-    engines: {node: '>=8'}
+  p-timeout@3.2.0:
     dependencies:
       p-finally: 1.0.0
-    dev: false
 
-  /p-timeout@5.1.0:
-    resolution: {integrity: sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==}
-    engines: {node: '>=12'}
-    dev: true
+  p-timeout@5.1.0: {}
 
-  /p-timeout@6.1.2:
-    resolution: {integrity: sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ==}
-    engines: {node: '>=14.16'}
-    dev: false
+  p-timeout@6.1.2: {}
 
-  /p-try@2.2.0:
-    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
-    engines: {node: '>=6'}
+  p-try@2.2.0: {}
 
-  /pac-proxy-agent@7.0.2:
-    resolution: {integrity: sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==}
-    engines: {node: '>= 14'}
+  pac-proxy-agent@7.2.0:
     dependencies:
       '@tootallnate/quickjs-emscripten': 0.23.0
-      agent-base: 7.1.1
-      debug: 4.4.0(supports-color@10.0.0)
+      agent-base: 7.1.4
+      debug: 4.4.1(supports-color@10.0.0)
       get-uri: 6.0.1
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
+      https-proxy-agent: 7.0.6
       pac-resolver: 7.0.1
-      socks-proxy-agent: 8.0.4
+      socks-proxy-agent: 8.0.5
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /pac-resolver@7.0.1:
-    resolution: {integrity: sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==}
-    engines: {node: '>= 14'}
+  pac-resolver@7.0.1:
     dependencies:
       degenerator: 5.0.1
       netmask: 2.0.2
-    dev: false
 
-  /package-json-from-dist@1.0.0:
-    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+  package-json-from-dist@1.0.0: {}
 
-  /package-json@6.5.0:
-    resolution: {integrity: sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==}
-    engines: {node: '>=8'}
+  package-json@6.5.0:
     dependencies:
       got: 9.6.0
       registry-auth-token: 4.2.2
       registry-url: 5.1.0
-      semver: 6.3.1
-    dev: true
+      semver: 5.7.2
 
-  /pako@0.2.9:
-    resolution: {integrity: sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA==}
-    dev: true
+  package-manager-detector@1.4.1: {}
 
-  /parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
+  pako@0.2.9: {}
+
+  parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
 
-  /parse-duration@2.1.4:
-    resolution: {integrity: sha512-b98m6MsCh+akxfyoz9w9dt0AlH2dfYLOBss5SdDsr9pkhKNvkWBXU/r8A4ahmIGByBOLV2+4YwfCuFxbDDaGyg==}
-    dev: false
+  parse-duration@2.1.4: {}
 
-  /parse-entities@4.0.0:
-    resolution: {integrity: sha512-5nk9Fn03x3rEhGaX1FU6IDwG/k+GxLXlFAkgrbM1asuAFl3BhdQWvASaIsmwWypRNcZKHPYnIuOSfIWEyEQnPQ==}
+  parse-entities@4.0.0:
     dependencies:
       '@types/unist': 2.0.6
       character-entities: 2.0.2
@@ -30454,228 +38002,143 @@ packages:
       is-decimal: 2.0.1
       is-hexadecimal: 2.0.1
 
-  /parse-github-url@1.0.2:
-    resolution: {integrity: sha512-kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dev: true
+  parse-github-url@1.0.2: {}
 
-  /parse-json@4.0.0:
-    resolution: {integrity: sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==}
-    engines: {node: '>=4'}
+  parse-json@4.0.0:
     dependencies:
       error-ex: 1.3.2
       json-parse-better-errors: 1.0.2
-    dev: true
 
-  /parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
+  parse-json@5.2.0:
     dependencies:
       '@babel/code-frame': 7.24.7
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
 
-  /parse-ms@2.1.0:
-    resolution: {integrity: sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==}
-    engines: {node: '>=6'}
-    dev: true
+  parse-ms@2.1.0: {}
 
-  /parse5-htmlparser2-tree-adapter@6.0.1:
-    resolution: {integrity: sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==}
+  parse-ms@4.0.0: {}
+
+  parse5-htmlparser2-tree-adapter@6.0.1:
     dependencies:
       parse5: 6.0.1
 
-  /parse5@5.1.1:
-    resolution: {integrity: sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==}
+  parse5@5.1.1: {}
 
-  /parse5@6.0.1:
-    resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+  parse5@6.0.1: {}
 
-  /parseley@0.12.1:
-    resolution: {integrity: sha512-e6qHKe3a9HWr0oMRVDTRhKce+bRO8VGQR3NyVwcjwrbhMmFCX9KszEV35+rn4AdilFAq9VPxP/Fe1wC9Qjd2lw==}
+  parse5@7.3.0:
+    dependencies:
+      entities: 6.0.1
+
+  parseley@0.12.1:
     dependencies:
       leac: 0.6.0
       peberminta: 0.9.0
-    dev: false
 
-  /parseurl@1.3.3:
-    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
-    engines: {node: '>= 0.8'}
+  parseurl@1.3.3: {}
 
-  /partysocket@1.0.2:
-    resolution: {integrity: sha512-rAFOUKImaq+VBk2B+2RTBsWEvlnarEP53nchoUHzpVs8V6fG2/estihOTslTQUWHVuHEKDL5k8htG8K3TngyFA==}
+  partysocket@1.0.2:
     dependencies:
       event-target-shim: 6.0.2
-    dev: false
 
-  /path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
+  path-data-parser@0.1.0: {}
 
-  /path-exists@5.0.0:
-    resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+  path-exists@4.0.0: {}
 
-  /path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
+  path-exists@5.0.0: {}
 
-  /path-key@2.0.1:
-    resolution: {integrity: sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==}
-    engines: {node: '>=4'}
-    dev: true
+  path-is-absolute@1.0.1: {}
 
-  /path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
+  path-key@3.1.1: {}
 
-  /path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
+  path-key@4.0.0: {}
 
-  /path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
+  path-parse@1.0.7: {}
 
-  /path-scurry@1.11.1:
-    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
-    engines: {node: '>=16 || 14 >=14.18'}
+  path-scurry@1.11.1:
     dependencies:
       lru-cache: 10.4.3
       minipass: 7.1.2
 
-  /path-scurry@2.0.0:
-    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
-    engines: {node: 20 || >=22}
+  path-scurry@2.0.0:
     dependencies:
       lru-cache: 11.0.0
       minipass: 7.1.2
-    dev: true
-
-  /path-to-regexp@0.1.10:
-    resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==}
 
-  /path-to-regexp@6.2.1:
-    resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==}
-    dev: false
+  path-to-regexp@0.1.10: {}
 
-  /path-to-regexp@8.2.0:
-    resolution: {integrity: sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==}
-    engines: {node: '>=16'}
-    dev: false
+  path-to-regexp@8.2.0: {}
 
-  /path-type@3.0.0:
-    resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==}
-    engines: {node: '>=4'}
+  path-type@3.0.0:
     dependencies:
       pify: 3.0.0
-    dev: true
 
-  /path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
+  path-type@4.0.0: {}
 
-  /pathe@1.1.2:
-    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+  pathe@1.1.2: {}
 
-  /pathe@2.0.3:
-    resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
+  pathe@2.0.3: {}
 
-  /pathval@2.0.0:
-    resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
-    engines: {node: '>= 14.16'}
-    dev: true
+  pathval@2.0.0: {}
 
-  /peberminta@0.9.0:
-    resolution: {integrity: sha512-XIxfHpEuSJbITd1H3EeQwpcZbTLHc+VVr8ANI9t5sit565tsI4/xK3KWTUFE2e6QiangUkh3B0jihzmGnNrRsQ==}
-    dev: false
+  peberminta@0.9.0: {}
 
-  /peek-readable@5.4.2:
-    resolution: {integrity: sha512-peBp3qZyuS6cNIJ2akRNG1uo1WJ1d0wTxg/fxMdZ0BqCVhx242bSFHM9eNqflfJVS9SsgkzgT/1UgnsurBOTMg==}
-    engines: {node: '>=14.16'}
-    dev: true
+  peek-readable@5.4.2: {}
 
-  /peek-stream@1.1.3:
-    resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}
+  peek-stream@1.1.3:
     dependencies:
       buffer-from: 1.1.2
       duplexify: 3.7.1
       through2: 2.0.5
-    dev: true
 
-  /pend@1.2.0:
-    resolution: {integrity: sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==}
-    dev: false
+  pend@1.2.0: {}
 
-  /perfect-debounce@1.0.0:
-    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
-    dev: false
+  perfect-debounce@1.0.0: {}
 
-  /performance-now@2.1.0:
-    resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
-    dev: false
+  performance-now@2.1.0: {}
 
-  /performant-array-to-tree@1.11.0:
-    resolution: {integrity: sha512-YwCqIDvnaebXaKuKQhI5yJD6ryDc3FxvoeX/5ougXTKDUWb7s5S2BuBgIyftCa4sBe1+ZU5Kmi4RJy+pjjjrpw==}
-    dev: false
+  performant-array-to-tree@1.11.0: {}
 
-  /periscopic@3.1.0:
-    resolution: {integrity: sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw==}
+  periscopic@3.1.0:
     dependencies:
-      '@types/estree': 1.0.7
+      '@types/estree': 1.0.8
       estree-walker: 3.0.3
-      is-reference: 3.0.1
-    dev: true
+      is-reference: 3.0.3
 
-  /pg-cloudflare@1.2.5:
-    resolution: {integrity: sha512-OOX22Vt0vOSRrdoUPKJ8Wi2OpE/o/h9T8X1s4qSkCedbNah9ei2W2765be8iMVxQUsvgT7zIAT2eIa9fs5+vtg==}
-    requiresBuild: true
-    dev: false
+  pg-cloudflare@1.2.7:
     optional: true
 
-  /pg-connection-string@2.6.4:
-    resolution: {integrity: sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==}
-    dev: false
+  pg-connection-string@2.6.4: {}
 
-  /pg-connection-string@2.8.5:
-    resolution: {integrity: sha512-Ni8FuZ8yAF+sWZzojvtLE2b03cqjO5jNULcHFfM9ZZ0/JXrgom5pBREbtnAw7oxsxJqHw9Nz/XWORUEL3/IFow==}
-    dev: false
+  pg-connection-string@2.8.5: {}
 
-  /pg-int8@1.0.1:
-    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
-    engines: {node: '>=4.0.0'}
+  pg-connection-string@2.9.1: {}
 
-  /pg-numeric@1.0.2:
-    resolution: {integrity: sha512-BM/Thnrw5jm2kKLE5uJkXqqExRUY/toLHda65XgFTBTFYZyopbKjBe29Ii3RbkvlsMoFwD+tHeGaCjjv0gHlyw==}
-    engines: {node: '>=4'}
+  pg-int8@1.0.1: {}
 
-  /pg-pool@3.6.2(pg@8.11.5):
-    resolution: {integrity: sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==}
-    peerDependencies:
-      pg: '>=8.0'
+  pg-numeric@1.0.2: {}
+
+  pg-pool@3.10.1(pg@8.16.3):
+    dependencies:
+      pg: 8.16.3
+
+  pg-pool@3.6.2(pg@8.11.5):
     dependencies:
       pg: 8.11.5
-    dev: false
 
-  /pg-pool@3.9.6(pg@8.15.6):
-    resolution: {integrity: sha512-rFen0G7adh1YmgvrmE5IPIqbb+IgEzENUm+tzm6MLLDSlPRoZVhzU1WdML9PV2W5GOdRA9qBKURlbt1OsXOsPw==}
-    peerDependencies:
-      pg: '>=8.0'
+  pg-pool@3.9.6(pg@8.15.6):
     dependencies:
       pg: 8.15.6
-    dev: false
 
-  /pg-protocol@1.6.1:
-    resolution: {integrity: sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==}
+  pg-protocol@1.10.3: {}
 
-  /pg-protocol@1.9.5:
-    resolution: {integrity: sha512-DYTWtWpfd5FOro3UnAfwvhD8jh59r2ig8bPtc9H8Ds7MscE/9NYruUQWFAOuraRl29jwcT2kyMFQ3MxeaVjUhg==}
+  pg-protocol@1.6.1: {}
 
-  /pg-types@2.2.0:
-    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
-    engines: {node: '>=4'}
+  pg-protocol@1.9.5: {}
+
+  pg-types@2.2.0:
     dependencies:
       pg-int8: 1.0.1
       postgres-array: 2.0.0
@@ -30683,26 +38146,17 @@ packages:
       postgres-date: 1.0.7
       postgres-interval: 1.2.0
 
-  /pg-types@4.0.2:
-    resolution: {integrity: sha512-cRL3JpS3lKMGsKaWndugWQoLOCoP+Cic8oseVcbr0qhPzYD5DWXK+RZ9LY9wxRf7RQia4SCwQlXk0q6FCPrVng==}
-    engines: {node: '>=10'}
+  pg-types@4.0.2:
     dependencies:
       pg-int8: 1.0.1
       pg-numeric: 1.0.2
-      postgres-array: 3.0.2
+      postgres-array: 3.0.4
       postgres-bytea: 3.0.0
       postgres-date: 2.1.0
       postgres-interval: 3.0.0
       postgres-range: 1.1.4
 
-  /pg@8.11.5:
-    resolution: {integrity: sha512-jqgNHSKL5cbDjFlHyYsCXmQDrfIX/3RsNwYqpd4N0Kt8niLuNoRNH+aazv6cOd43gPh9Y4DjQCtb+X0MH0Hvnw==}
-    engines: {node: '>= 8.0.0'}
-    peerDependencies:
-      pg-native: '>=3.0.1'
-    peerDependenciesMeta:
-      pg-native:
-        optional: true
+  pg@8.11.5:
     dependencies:
       pg-connection-string: 2.6.4
       pg-pool: 3.6.2(pg@8.11.5)
@@ -30710,17 +38164,9 @@ packages:
       pg-types: 2.2.0
       pgpass: 1.0.5
     optionalDependencies:
-      pg-cloudflare: 1.2.5
-    dev: false
+      pg-cloudflare: 1.2.7
 
-  /pg@8.15.6:
-    resolution: {integrity: sha512-yvao7YI3GdmmrslNVsZgx9PfntfWrnXwtR+K/DjI0I/sTKif4Z623um+sjVZ1hk5670B+ODjvHDAckKdjmPTsg==}
-    engines: {node: '>= 8.0.0'}
-    peerDependencies:
-      pg-native: '>=3.0.1'
-    peerDependenciesMeta:
-      pg-native:
-        optional: true
+  pg@8.15.6:
     dependencies:
       pg-connection-string: 2.8.5
       pg-pool: 3.9.6(pg@8.15.6)
@@ -30728,72 +38174,49 @@ packages:
       pg-types: 2.2.0
       pgpass: 1.0.5
     optionalDependencies:
-      pg-cloudflare: 1.2.5
-    dev: false
+      pg-cloudflare: 1.2.7
 
-  /pgpass@1.0.5:
-    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
+  pg@8.16.3:
+    dependencies:
+      pg-connection-string: 2.9.1
+      pg-pool: 3.10.1(pg@8.16.3)
+      pg-protocol: 1.10.3
+      pg-types: 2.2.0
+      pgpass: 1.0.5
+    optionalDependencies:
+      pg-cloudflare: 1.2.7
+
+  pgpass@1.0.5:
     dependencies:
       split2: 4.2.0
-    dev: false
 
-  /picocolors@0.2.1:
-    resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==}
-    dev: false
+  picocolors@0.2.1: {}
 
-  /picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
-    dev: true
+  picocolors@1.0.0: {}
 
-  /picocolors@1.1.1:
-    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+  picocolors@1.1.1: {}
 
-  /picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
+  picomatch@2.3.1: {}
 
-  /picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
-    engines: {node: '>=12'}
+  picomatch@4.0.2: {}
 
-  /pidtree@0.3.1:
-    resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    dev: true
+  pidtree@0.3.1: {}
 
-  /pidtree@0.6.0:
-    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    dev: true
+  pidtree@0.6.0: {}
 
-  /pify@2.3.0:
-    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: '>=0.10.0'}
+  pify@2.3.0: {}
 
-  /pify@3.0.0:
-    resolution: {integrity: sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==}
-    engines: {node: '>=4'}
-    dev: true
+  pify@3.0.0: {}
 
-  /pify@4.0.1:
-    resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==}
-    engines: {node: '>=6'}
+  pify@4.0.1: {}
 
-  /pino-abstract-transport@2.0.0:
-    resolution: {integrity: sha512-F63x5tizV6WCh4R6RHyi2Ml+M70DNRXt/+HANowMflpgGFMAym/VKm6G7ZOQRjqN7XbGxK1Lg9t6ZrtzOaivMw==}
+  pino-abstract-transport@2.0.0:
     dependencies:
       split2: 4.2.0
-    dev: true
 
-  /pino-std-serializers@7.0.0:
-    resolution: {integrity: sha512-e906FRY0+tV27iq4juKzSYPbUj2do2X2JX4EzSca1631EB2QJQUqGbDuERal7LCtOpxl6x3+nvo9NPZcmjkiFA==}
-    dev: true
+  pino-std-serializers@7.0.0: {}
 
-  /pino@9.7.0:
-    resolution: {integrity: sha512-vnMCM6xZTb1WDmLvtG2lE/2p+t9hDEIvTWJsu6FejkE62vB7gDhvzrpFR4Cw2to+9JNQxVnkAKVPA1KPB98vWg==}
-    hasBin: true
+  pino@9.7.0:
     dependencies:
       atomic-sleep: 1.0.0
       fast-redact: 3.5.0
@@ -30806,778 +38229,470 @@ packages:
       safe-stable-stringify: 2.5.0
       sonic-boom: 4.2.0
       thread-stream: 3.1.0
-    dev: true
 
-  /pirates@4.0.5:
-    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
-    engines: {node: '>= 6'}
+  pirates@4.0.5: {}
 
-  /pkce-challenge@4.1.0:
-    resolution: {integrity: sha512-ZBmhE1C9LcPoH9XZSdwiPtbPHZROwAnMy+kIFQVrnMCxY4Cudlz3gBOpzilgc0jOgRaiT3sIWfpMomW2ar2orQ==}
-    engines: {node: '>=16.20.0'}
-    dev: false
+  pkce-challenge@5.0.0: {}
 
-  /pkg-dir@4.2.0:
-    resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
-    engines: {node: '>=8'}
+  pkg-dir@4.2.0:
     dependencies:
       find-up: 4.1.0
 
-  /pkg-types@1.1.3:
-    resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==}
+  pkg-types@1.1.3:
     dependencies:
-      confbox: 0.1.7
-      mlly: 1.7.1
+      confbox: 0.1.8
+      mlly: 1.7.4
       pathe: 1.1.2
 
-  /pkg-types@1.3.1:
-    resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
+  pkg-types@1.3.1:
     dependencies:
       confbox: 0.1.8
       mlly: 1.7.4
       pathe: 2.0.3
-    dev: false
 
-  /platform@1.3.6:
-    resolution: {integrity: sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==}
-    dev: false
+  pkg-types@2.3.0:
+    dependencies:
+      confbox: 0.2.2
+      exsolve: 1.0.7
+      pathe: 2.0.3
 
-  /playwright-core@1.37.0:
-    resolution: {integrity: sha512-1c46jhTH/myQw6sesrcuHVtLoSNfJv8Pfy9t3rs6subY7kARv0HRw5PpyfPYPpPtQvBOmgbE6K+qgYUpj81LAA==}
-    engines: {node: '>=16'}
-    hasBin: true
+  platform@1.3.6: {}
 
-  /playwright-core@1.50.1:
-    resolution: {integrity: sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-    dev: false
+  playwright-core@1.37.0: {}
 
-  /playwright@1.50.1:
-    resolution: {integrity: sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==}
-    engines: {node: '>=18'}
-    hasBin: true
+  points-on-curve@0.2.0: {}
+
+  points-on-path@0.2.1:
     dependencies:
-      playwright-core: 1.50.1
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: false
+      path-data-parser: 0.1.0
+      points-on-curve: 0.2.0
 
-  /polite-json@5.0.0:
-    resolution: {integrity: sha512-OLS/0XeUAcE8a2fdwemNja+udKgXNnY6yKVIXqAD2zVRx1KvY6Ato/rZ2vdzbxqYwPW0u6SCNC/bAMPNzpzxbw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
+  polite-json@5.0.0: {}
 
-  /polka@0.5.2:
-    resolution: {integrity: sha512-FVg3vDmCqP80tOrs+OeNlgXYmFppTXdjD5E7I4ET1NjvtNmQrb1/mJibybKkb/d4NA7YWAr1ojxuhpL3FHqdlw==}
+  polka@0.5.2:
     dependencies:
       '@polka/url': 0.5.0
       trouter: 2.0.1
-    dev: false
 
-  /possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
-    engines: {node: '>= 0.4'}
-    dev: true
+  possible-typed-array-names@1.0.0: {}
 
-  /postcss-discard-duplicates@5.1.0(postcss@8.4.29):
-    resolution: {integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==}
-    engines: {node: ^10 || ^12 || >=14.0}
-    peerDependencies:
-      postcss: ^8.2.15
+  postcss-discard-duplicates@5.1.0(postcss@8.5.4):
     dependencies:
-      postcss: 8.4.29
-    dev: true
+      postcss: 8.5.4
 
-  /postcss-functions@3.0.0:
-    resolution: {integrity: sha512-N5yWXWKA+uhpLQ9ZhBRl2bIAdM6oVJYpDojuI1nF2SzXBimJcdjFwiAouBVbO5VuOF3qA6BSFWFc3wXbbj72XQ==}
+  postcss-functions@3.0.0:
     dependencies:
       glob: 7.2.3
       object-assign: 4.1.1
       postcss: 6.0.23
       postcss-value-parser: 3.3.1
-    dev: false
 
-  /postcss-import@15.1.0(postcss@8.5.3):
-    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
+  postcss-import@15.1.0(postcss@8.5.4):
     dependencies:
-      postcss: 8.5.3
+      postcss: 8.5.4
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
       resolve: 1.22.8
 
-  /postcss-import@16.0.1(postcss@8.5.4):
-    resolution: {integrity: sha512-i2Pci0310NaLHr/5JUFSw1j/8hf1CzwMY13g6ZDxgOavmRHQi2ba3PmUHoihO+sjaum+KmCNzskNsw7JDrg03g==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
+  postcss-import@15.1.0(postcss@8.5.6):
     dependencies:
-      postcss: 8.5.4
+      postcss: 8.5.6
       postcss-value-parser: 4.2.0
       read-cache: 1.0.0
-      resolve: 1.22.4
-    dev: true
+      resolve: 1.22.8
 
-  /postcss-js@2.0.3:
-    resolution: {integrity: sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==}
+  postcss-import@16.0.1(postcss@8.5.6):
+    dependencies:
+      postcss: 8.5.6
+      postcss-value-parser: 4.2.0
+      read-cache: 1.0.0
+      resolve: 1.22.8
+
+  postcss-js@2.0.3:
     dependencies:
       camelcase-css: 2.0.1
       postcss: 7.0.39
-    dev: false
 
-  /postcss-js@4.0.1(postcss@8.5.3):
-    resolution: {integrity: sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==}
-    engines: {node: ^12 || ^14 || >= 16}
-    peerDependencies:
-      postcss: ^8.4.21
+  postcss-js@4.0.1(postcss@8.5.4):
     dependencies:
       camelcase-css: 2.0.1
-      postcss: 8.5.3
-
-  /postcss-load-config@4.0.1(postcss@8.4.29)(ts-node@10.9.1):
-    resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==}
-    engines: {node: '>= 14'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
+      postcss: 8.5.4
+
+  postcss-js@4.0.1(postcss@8.5.6):
     dependencies:
-      lilconfig: 2.1.0
-      postcss: 8.4.29
-      ts-node: 10.9.1(@swc/core@1.3.26)(@types/node@20.14.14)(typescript@5.5.4)
-      yaml: 2.3.1
-    dev: true
+      camelcase-css: 2.0.1
+      postcss: 8.5.6
 
-  /postcss-load-config@4.0.2(postcss@8.5.3)(ts-node@10.9.1):
-    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
-    engines: {node: '>= 14'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
+  postcss-load-config@4.0.2(postcss@8.5.4):
     dependencies:
       lilconfig: 3.1.3
-      postcss: 8.5.3
-      ts-node: 10.9.1(@swc/core@1.3.26)(@types/node@20.14.14)(typescript@5.5.4)
       yaml: 2.7.1
+    optionalDependencies:
+      postcss: 8.5.4
 
-  /postcss-load-config@6.0.1(postcss@8.5.4)(tsx@4.17.0):
-    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
-    engines: {node: '>= 18'}
-    peerDependencies:
-      jiti: '>=1.21.0'
-      postcss: '>=8.0.9'
-      tsx: ^4.8.1
-      yaml: ^2.4.2
-    peerDependenciesMeta:
-      jiti:
-        optional: true
-      postcss:
-        optional: true
-      tsx:
-        optional: true
-      yaml:
-        optional: true
+  postcss-load-config@4.0.2(postcss@8.5.6):
     dependencies:
       lilconfig: 3.1.3
-      postcss: 8.5.4
+      yaml: 2.7.1
+    optionalDependencies:
+      postcss: 8.5.6
+
+  postcss-load-config@6.0.1(jiti@2.4.2)(postcss@8.5.6)(tsx@4.17.0)(yaml@2.7.1):
+    dependencies:
+      lilconfig: 3.1.3
+    optionalDependencies:
+      jiti: 2.4.2
+      postcss: 8.5.6
       tsx: 4.17.0
-    dev: true
+      yaml: 2.7.1
 
-  /postcss-loader@8.1.1(postcss@8.5.4)(typescript@5.5.4)(webpack@5.99.9):
-    resolution: {integrity: sha512-0IeqyAsG6tYiDRCYKQJLAmgQr47DX6N7sFSWvQxt6AcupX8DIdmykuk/o/tx0Lze3ErGHJEp5OSRxrelC6+NdQ==}
-    engines: {node: '>= 18.12.0'}
-    peerDependencies:
-      '@rspack/core': 0.x || 1.x
-      postcss: ^7.0.0 || ^8.0.1
-      webpack: ^5.0.0
-    peerDependenciesMeta:
-      '@rspack/core':
-        optional: true
-      webpack:
-        optional: true
+  postcss-loader@8.1.1(postcss@8.5.6)(typescript@5.5.4)(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)):
     dependencies:
       cosmiconfig: 9.0.0(typescript@5.5.4)
       jiti: 1.21.0
-      postcss: 8.5.4
-      semver: 7.6.3
-      webpack: 5.99.9(@swc/core@1.3.26)(esbuild@0.15.18)
+      postcss: 8.5.6
+      semver: 5.7.2
+    optionalDependencies:
+      webpack: 5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)
     transitivePeerDependencies:
       - typescript
-    dev: true
-
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.29):
-    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      postcss: 8.4.29
-    dev: true
 
-  /postcss-modules-extract-imports@3.0.0(postcss@8.4.35):
-    resolution: {integrity: sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-extract-imports@3.0.0(postcss@8.4.35):
     dependencies:
       postcss: 8.4.35
-    dev: true
 
-  /postcss-modules-local-by-default@4.0.4(postcss@8.4.29):
-    resolution: {integrity: sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-extract-imports@3.0.0(postcss@8.5.4):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.29)
-      postcss: 8.4.29
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-    dev: true
+      postcss: 8.5.4
 
-  /postcss-modules-local-by-default@4.0.4(postcss@8.4.35):
-    resolution: {integrity: sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-local-by-default@4.0.4(postcss@8.4.35):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.35)
       postcss: 8.4.35
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
-    dev: true
 
-  /postcss-modules-scope@3.1.1(postcss@8.4.29):
-    resolution: {integrity: sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-local-by-default@4.0.4(postcss@8.5.4):
     dependencies:
-      postcss: 8.4.29
+      icss-utils: 5.1.0(postcss@8.5.4)
+      postcss: 8.5.4
       postcss-selector-parser: 6.1.2
-    dev: true
+      postcss-value-parser: 4.2.0
 
-  /postcss-modules-scope@3.1.1(postcss@8.4.35):
-    resolution: {integrity: sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-scope@3.1.1(postcss@8.4.35):
     dependencies:
       postcss: 8.4.35
       postcss-selector-parser: 6.1.2
-    dev: true
 
-  /postcss-modules-values@4.0.0(postcss@8.4.29):
-    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-scope@3.1.1(postcss@8.5.4):
     dependencies:
-      icss-utils: 5.1.0(postcss@8.4.29)
-      postcss: 8.4.29
-    dev: true
+      postcss: 8.5.4
+      postcss-selector-parser: 6.1.2
 
-  /postcss-modules-values@4.0.0(postcss@8.4.35):
-    resolution: {integrity: sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==}
-    engines: {node: ^10 || ^12 || >= 14}
-    peerDependencies:
-      postcss: ^8.1.0
+  postcss-modules-values@4.0.0(postcss@8.4.35):
     dependencies:
       icss-utils: 5.1.0(postcss@8.4.35)
       postcss: 8.4.35
-    dev: true
 
-  /postcss-modules@6.0.0(postcss@8.4.29):
-    resolution: {integrity: sha512-7DGfnlyi/ju82BRzTIjWS5C4Tafmzl3R79YP/PASiocj+aa6yYphHhhKUOEoXQToId5rgyFgJ88+ccOUydjBXQ==}
-    peerDependencies:
-      postcss: ^8.0.0
+  postcss-modules-values@4.0.0(postcss@8.5.4):
+    dependencies:
+      icss-utils: 5.1.0(postcss@8.5.4)
+      postcss: 8.5.4
+
+  postcss-modules@6.0.0(postcss@8.5.4):
     dependencies:
       generic-names: 4.0.0
-      icss-utils: 5.1.0(postcss@8.4.29)
+      icss-utils: 5.1.0(postcss@8.5.4)
       lodash.camelcase: 4.3.0
-      postcss: 8.4.29
-      postcss-modules-extract-imports: 3.0.0(postcss@8.4.29)
-      postcss-modules-local-by-default: 4.0.4(postcss@8.4.29)
-      postcss-modules-scope: 3.1.1(postcss@8.4.29)
-      postcss-modules-values: 4.0.0(postcss@8.4.29)
+      postcss: 8.5.4
+      postcss-modules-extract-imports: 3.0.0(postcss@8.5.4)
+      postcss-modules-local-by-default: 4.0.4(postcss@8.5.4)
+      postcss-modules-scope: 3.1.1(postcss@8.5.4)
+      postcss-modules-values: 4.0.0(postcss@8.5.4)
       string-hash: 1.1.3
-    dev: true
 
-  /postcss-nested@4.2.3:
-    resolution: {integrity: sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==}
+  postcss-nested@4.2.3:
     dependencies:
       postcss: 7.0.39
       postcss-selector-parser: 6.1.2
-    dev: false
 
-  /postcss-nested@6.2.0(postcss@8.5.3):
-    resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.2.14
+  postcss-nested@6.2.0(postcss@8.5.4):
     dependencies:
-      postcss: 8.5.3
+      postcss: 8.5.4
       postcss-selector-parser: 6.1.2
 
-  /postcss-selector-parser@6.0.10:
-    resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
-    engines: {node: '>=4'}
+  postcss-nested@6.2.0(postcss@8.5.6):
+    dependencies:
+      postcss: 8.5.6
+      postcss-selector-parser: 6.1.2
+
+  postcss-selector-parser@6.0.10:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
-    dev: true
 
-  /postcss-selector-parser@6.1.2:
-    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
-    engines: {node: '>=4'}
+  postcss-selector-parser@6.1.2:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
 
-  /postcss-value-parser@3.3.1:
-    resolution: {integrity: sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==}
-    dev: false
+  postcss-value-parser@3.3.1: {}
 
-  /postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+  postcss-value-parser@4.2.0: {}
 
-  /postcss@6.0.23:
-    resolution: {integrity: sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==}
-    engines: {node: '>=4.0.0'}
+  postcss@6.0.23:
     dependencies:
       chalk: 2.4.2
       source-map: 0.6.1
       supports-color: 5.5.0
-    dev: false
 
-  /postcss@7.0.32:
-    resolution: {integrity: sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==}
-    engines: {node: '>=6.0.0'}
+  postcss@7.0.32:
     dependencies:
       chalk: 2.4.2
       source-map: 0.6.1
       supports-color: 6.1.0
-    dev: false
 
-  /postcss@7.0.39:
-    resolution: {integrity: sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==}
-    engines: {node: '>=6.0.0'}
+  postcss@7.0.39:
     dependencies:
       picocolors: 0.2.1
       source-map: 0.6.1
-    dev: false
-
-  /postcss@8.4.29:
-    resolution: {integrity: sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.8
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-    dev: true
 
-  /postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.4.31:
     dependencies:
       nanoid: 3.3.8
       picocolors: 1.1.1
       source-map-js: 1.2.1
-    dev: false
 
-  /postcss@8.4.35:
-    resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.4.35:
     dependencies:
       nanoid: 3.3.8
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  /postcss@8.4.44:
-    resolution: {integrity: sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.4.44:
     dependencies:
       nanoid: 3.3.8
       picocolors: 1.1.1
       source-map-js: 1.2.0
-    dev: true
 
-  /postcss@8.5.3:
-    resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.5.3:
     dependencies:
       nanoid: 3.3.8
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  /postcss@8.5.4:
-    resolution: {integrity: sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.5.4:
     dependencies:
       nanoid: 3.3.11
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  /postgres-array@2.0.0:
-    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
-    engines: {node: '>=4'}
-
-  /postgres-array@3.0.2:
-    resolution: {integrity: sha512-6faShkdFugNQCLwucjPcY5ARoW1SlbnrZjmGl0IrrqewpvxvhSLHimCVzqeuULCbG0fQv7Dtk1yDbG3xv7Veog==}
-    engines: {node: '>=12'}
-
-  /postgres-bytea@1.0.0:
-    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
-    engines: {node: '>=0.10.0'}
-
-  /postgres-bytea@3.0.0:
-    resolution: {integrity: sha512-CNd4jim9RFPkObHSjVHlVrxoVQXz7quwNFpz7RY1okNNme49+sVyiTvTRobiLV548Hx/hb1BG+iE7h9493WzFw==}
-    engines: {node: '>= 6'}
-    dependencies:
-      obuf: 1.1.2
-
-  /postgres-date@1.0.7:
-    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
-    engines: {node: '>=0.10.0'}
-
-  /postgres-date@2.1.0:
-    resolution: {integrity: sha512-K7Juri8gtgXVcDfZttFKVmhglp7epKb1K4pgrkLxehjqkrgPhfG6OO8LHLkfaqkbpjNRnra018XwAr1yQFWGcA==}
-    engines: {node: '>=12'}
-
-  /postgres-interval@1.2.0:
-    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      xtend: 4.0.2
-
-  /postgres-interval@3.0.0:
-    resolution: {integrity: sha512-BSNDnbyZCXSxgA+1f5UU2GmwhoI0aU5yMxRGO8CdFEcY2BQF9xm/7MqKnYoM1nJDk8nONNWDk9WeSmePFhQdlw==}
-    engines: {node: '>=12'}
-
-  /postgres-range@1.1.4:
-    resolution: {integrity: sha512-i/hbxIE9803Alj/6ytL7UHQxRvZkI9O4Sy+J3HGc4F4oo/2eQAjTSNJ0bfxyse3bH0nuVesCk+3IRLaMtG3H6w==}
-
-  /posthog-js@1.93.3:
-    resolution: {integrity: sha512-jEOWwaQpTRbqLPrDLY6eZr7t95h+LyXqN7Yq1/K6u3V0Y1C9xHtYhpuGzYamirVnCDTbVq22RM++OBUaIpp9Wg==}
-    dependencies:
-      fflate: 0.4.8
-    dev: false
-
-  /posthog-node@4.17.1:
-    resolution: {integrity: sha512-cVlQPOwOPjakUnrueKRCQe1m2Ku+XzKaOos7Tn/zDZkkZFeBT/byP7tbNf7LiwhaBRWFBRowZZb/MsTtSRaorg==}
-    engines: {node: '>=15.0.0'}
-    dependencies:
-      axios: 1.9.0
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
-  /prebuild-install@7.1.3:
-    resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
-    engines: {node: '>=10'}
-    hasBin: true
+  postcss@8.5.6:
     dependencies:
-      detect-libc: 2.0.3
-      expand-template: 2.0.3
-      github-from-package: 0.0.0
-      minimist: 1.2.7
-      mkdirp-classic: 0.5.3
-      napi-build-utils: 2.0.0
-      node-abi: 3.75.0
-      pump: 3.0.0
-      rc: 1.2.8
-      simple-get: 4.0.1
-      tar-fs: 2.1.3
-      tunnel-agent: 0.6.0
+      nanoid: 3.3.11
+      picocolors: 1.1.1
+      source-map-js: 1.2.1
 
-  /preferred-pm@3.0.3:
-    resolution: {integrity: sha512-+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ==}
-    engines: {node: '>=10'}
-    dependencies:
-      find-up: 5.0.0
-      find-yarn-workspace-root2: 1.2.16
-      path-exists: 4.0.0
-      which-pm: 2.0.0
-    dev: false
+  postgres-array@2.0.0: {}
 
-  /prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
+  postgres-array@3.0.4: {}
 
-  /prepend-http@2.0.0:
-    resolution: {integrity: sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==}
-    engines: {node: '>=4'}
-    dev: true
+  postgres-bytea@1.0.0: {}
 
-  /prettier-plugin-tailwindcss@0.3.0(prettier@2.8.8):
-    resolution: {integrity: sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==}
-    engines: {node: '>=12.17.0'}
-    peerDependencies:
-      '@ianvs/prettier-plugin-sort-imports': '*'
-      '@prettier/plugin-pug': '*'
-      '@shopify/prettier-plugin-liquid': '*'
-      '@shufo/prettier-plugin-blade': '*'
-      '@trivago/prettier-plugin-sort-imports': '*'
-      prettier: '>=2.2.0'
-      prettier-plugin-astro: '*'
-      prettier-plugin-css-order: '*'
-      prettier-plugin-import-sort: '*'
-      prettier-plugin-jsdoc: '*'
-      prettier-plugin-marko: '*'
-      prettier-plugin-organize-attributes: '*'
-      prettier-plugin-organize-imports: '*'
-      prettier-plugin-style-order: '*'
-      prettier-plugin-svelte: '*'
-      prettier-plugin-twig-melody: '*'
-    peerDependenciesMeta:
-      '@ianvs/prettier-plugin-sort-imports':
-        optional: true
-      '@prettier/plugin-pug':
-        optional: true
-      '@shopify/prettier-plugin-liquid':
-        optional: true
-      '@shufo/prettier-plugin-blade':
-        optional: true
-      '@trivago/prettier-plugin-sort-imports':
-        optional: true
-      prettier-plugin-astro:
-        optional: true
-      prettier-plugin-css-order:
-        optional: true
-      prettier-plugin-import-sort:
-        optional: true
-      prettier-plugin-jsdoc:
-        optional: true
-      prettier-plugin-marko:
-        optional: true
-      prettier-plugin-organize-attributes:
-        optional: true
-      prettier-plugin-organize-imports:
-        optional: true
-      prettier-plugin-style-order:
-        optional: true
-      prettier-plugin-svelte:
-        optional: true
-      prettier-plugin-twig-melody:
-        optional: true
+  postgres-bytea@3.0.0:
+    dependencies:
+      obuf: 1.1.2
+
+  postgres-date@1.0.7: {}
+
+  postgres-date@2.1.0: {}
+
+  postgres-interval@1.2.0:
+    dependencies:
+      xtend: 4.0.2
+
+  postgres-interval@3.0.0: {}
+
+  postgres-range@1.1.4: {}
+
+  postgres@3.4.7: {}
+
+  posthog-js@1.93.3:
+    dependencies:
+      fflate: 0.4.8
+
+  posthog-node@4.17.1:
+    dependencies:
+      axios: 1.12.2
+    transitivePeerDependencies:
+      - debug
+
+  prebuild-install@7.1.3:
+    dependencies:
+      detect-libc: 2.1.2
+      expand-template: 2.0.3
+      github-from-package: 0.0.0
+      minimist: 1.2.7
+      mkdirp-classic: 0.5.3
+      napi-build-utils: 2.0.0
+      node-abi: 3.75.0
+      pump: 3.0.2
+      rc: 1.2.8
+      simple-get: 4.0.1
+      tar-fs: 2.1.3
+      tunnel-agent: 0.6.0
+
+  preferred-pm@3.0.3:
+    dependencies:
+      find-up: 5.0.0
+      find-yarn-workspace-root2: 1.2.16
+      path-exists: 4.0.0
+      which-pm: 2.0.0
+
+  prelude-ls@1.2.1: {}
+
+  prepend-http@2.0.0: {}
+
+  prettier-plugin-tailwindcss@0.3.0(prettier@2.8.8):
     dependencies:
       prettier: 2.8.8
-    dev: true
 
-  /prettier@2.8.8:
-    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
+  prettier@2.8.8: {}
 
-  /prettier@3.0.0:
-    resolution: {integrity: sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==}
-    engines: {node: '>=14'}
-    hasBin: true
-    dev: true
+  prettier@3.0.0: {}
 
-  /pretty-format@27.5.1:
-    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
-    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+  pretty-format@27.5.1:
     dependencies:
       ansi-regex: 5.0.1
       ansi-styles: 5.2.0
       react-is: 17.0.2
-    dev: true
 
-  /pretty-hrtime@1.0.3:
-    resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
-    engines: {node: '>= 0.8'}
-    dev: false
+  pretty-hrtime@1.0.3: {}
 
-  /pretty-ms@7.0.1:
-    resolution: {integrity: sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==}
-    engines: {node: '>=10'}
+  pretty-ms@7.0.1:
     dependencies:
       parse-ms: 2.1.0
-    dev: true
 
-  /printable-characters@1.0.42:
-    resolution: {integrity: sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==}
-    dev: false
+  pretty-ms@9.3.0:
+    dependencies:
+      parse-ms: 4.0.0
 
-  /prism-react-renderer@2.1.0(react@18.3.1):
-    resolution: {integrity: sha512-I5cvXHjA1PVGbGm1MsWCpvBCRrYyxEri0MC7/JbfIfYfcXAxHyO5PaUjs3A8H5GW6kJcLhTHxxMaOZZpRZD2iQ==}
-    peerDependencies:
-      react: '>=16.0.0'
+  prism-react-renderer@2.1.0(react@18.3.1):
     dependencies:
       '@types/prismjs': 1.26.0
       clsx: 1.2.1
       react: 18.3.1
-    dev: false
 
-  /prism-react-renderer@2.3.1(react@18.2.0):
-    resolution: {integrity: sha512-Rdf+HzBLR7KYjzpJ1rSoxT9ioO85nZngQEoFIhL07XhtJHlCU3SOz0GJ6+qvMyQe0Se+BV3qpe6Yd/NmQF5Juw==}
-    peerDependencies:
-      react: '>=16.0.0'
+  prism-react-renderer@2.3.1(react@18.2.0):
     dependencies:
       '@types/prismjs': 1.26.0
       clsx: 2.1.1
       react: 18.2.0
-    dev: false
 
-  /prisma-kysely@1.8.0:
-    resolution: {integrity: sha512-VpNpolZ8RXRgfU+j4R+fPZmX8EE95w3vJ2tt7+FwuiQc0leNTfLK5QLf3KbbPDes2rfjh3g20AjDxefQIo5GIA==}
-    hasBin: true
+  prisma-generator-ts-enums@1.1.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4)):
     dependencies:
-      '@mrleebo/prisma-ast': 0.7.0
-      '@prisma/generator-helper': 5.3.1
-      '@prisma/internals': 5.3.1
-      typescript: 5.5.4
-      zod: 3.23.8
+      '@prisma/client': 4.9.0(prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4))
+      '@prisma/generator-helper': 4.16.2
+      prettier: 2.8.8
+      rimraf: 4.4.1
     transitivePeerDependencies:
-      - encoding
+      - prisma
       - supports-color
-    dev: true
 
-  /prisma@5.19.0:
-    resolution: {integrity: sha512-Pu7lUKpVyTx8cVwM26dYh8NdvMOkMnJXzE8L6cikFuR4JwyMU5NKofQkWyxJKlTT4fNjmcnibTvklV8oVMrn+g==}
-    engines: {node: '>=16.13'}
-    hasBin: true
-    requiresBuild: true
+  prisma@6.14.0(magicast@0.3.5)(typescript@5.5.4):
     dependencies:
-      '@prisma/engines': 5.19.0
+      '@prisma/config': 6.14.0(magicast@0.3.5)
+      '@prisma/engines': 6.14.0
     optionalDependencies:
-      fsevents: 2.3.3
+      typescript: 5.5.4
+    transitivePeerDependencies:
+      - magicast
 
-  /prisma@5.4.1:
-    resolution: {integrity: sha512-op9PmU8Bcw5dNAas82wBYTG0yHnpq9/O3bhxbDBrNzwZTwBqsVCxxYRLf6wHNh9HVaDGhgjjHlu1+BcW8qdnBg==}
-    engines: {node: '>=16.13'}
-    hasBin: true
-    requiresBuild: true
+  prisma@6.16.0(magicast@0.3.5)(typescript@5.5.4):
     dependencies:
-      '@prisma/engines': 5.4.1
+      '@prisma/config': 6.16.0(magicast@0.3.5)
+      '@prisma/engines': 6.16.0
+    optionalDependencies:
+      typescript: 5.5.4
+    transitivePeerDependencies:
+      - magicast
 
-  /prismjs@1.29.0:
-    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
-    engines: {node: '>=6'}
-    dev: false
+  prisma@6.19.0(typescript@5.5.4):
+    dependencies:
+      '@prisma/config': 6.19.0(magicast@0.3.5)
+      '@prisma/engines': 6.19.0
+    optionalDependencies:
+      typescript: 5.5.4
+    transitivePeerDependencies:
+      - magicast
 
-  /prismjs@1.30.0:
-    resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==}
-    engines: {node: '>=6'}
-    dev: false
+  prisma@6.20.0-integration-next.8(@types/react@19.0.12)(magicast@0.3.5)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(typescript@5.5.4):
+    dependencies:
+      '@prisma/config': 6.20.0-integration-next.8(magicast@0.3.5)
+      '@prisma/engines': 6.20.0-integration-next.8
+      '@prisma/studio-core-licensed': 0.6.0(@types/react@19.0.12)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+      postgres: 3.4.7
+    optionalDependencies:
+      typescript: 5.5.4
+    transitivePeerDependencies:
+      - '@types/react'
+      - magicast
+      - react
+      - react-dom
 
-  /proc-log@3.0.0:
-    resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
+  prismjs@1.29.0: {}
 
-  /proc-log@4.2.0:
-    resolution: {integrity: sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: false
+  prismjs@1.30.0: {}
 
-  /process-nextick-args@2.0.1:
-    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
-    dev: true
+  proc-log@3.0.0: {}
 
-  /process-warning@4.0.1:
-    resolution: {integrity: sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==}
-    dev: true
+  process-nextick-args@2.0.1: {}
 
-  /process-warning@5.0.0:
-    resolution: {integrity: sha512-a39t9ApHNx2L4+HBnQKqxxHNs1r7KF+Intd8Q/g1bUh6q0WIp9voPXJ/x0j+ZL45KF1pJd9+q2jLIRMfvEshkA==}
-    dev: true
+  process-warning@4.0.1: {}
 
-  /process@0.11.10:
-    resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
-    engines: {node: '>= 0.6.0'}
-    requiresBuild: true
+  process-warning@5.0.0: {}
 
-  /progress@2.0.3:
-    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
-    engines: {node: '>=0.4.0'}
+  process@0.11.10: {}
 
-  /prom-client@15.1.0:
-    resolution: {integrity: sha512-cCD7jLTqyPdjEPBo/Xk4Iu8jxjuZgZJ3e/oET3L+ZwOuap/7Cw3dH/TJSsZKs1TQLZ2IHpIlRAKw82ef06kmMw==}
-    engines: {node: ^16 || ^18 || >=20}
+  progress@2.0.3: {}
+
+  prom-client@15.1.0:
     dependencies:
       '@opentelemetry/api': 1.9.0
       tdigest: 0.1.2
-    dev: false
 
-  /promise-inflight@1.0.1:
-    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
-    peerDependencies:
-      bluebird: '*'
-    peerDependenciesMeta:
-      bluebird:
-        optional: true
+  promise-inflight@1.0.1: {}
 
-  /promise-retry@2.0.1:
-    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
-    engines: {node: '>=10'}
+  promise-retry@2.0.1:
     dependencies:
       err-code: 2.0.3
       retry: 0.12.0
 
-  /prompts@2.4.2:
-    resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
-    engines: {node: '>= 6'}
-    dependencies:
-      kleur: 3.0.3
-      sisteransi: 1.0.5
-    dev: true
-
-  /prop-types@15.8.1:
-    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+  prop-types@15.8.1:
     dependencies:
       loose-envify: 1.4.0
       object-assign: 4.1.1
       react-is: 16.13.1
 
-  /proper-lockfile@4.1.2:
-    resolution: {integrity: sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==}
+  proper-lockfile@4.1.2:
     dependencies:
       graceful-fs: 4.2.11
       retry: 0.12.0
       signal-exit: 3.0.7
-    dev: true
 
-  /properties-reader@2.3.0:
-    resolution: {integrity: sha512-z597WicA7nDZxK12kZqHr2TcvwNU1GCfA5UwfDY/HDp3hXPoPlb5rlEx9bwGTiJnc0OqbBTkU975jDToth8Gxw==}
-    engines: {node: '>=14'}
+  properties-reader@2.3.0:
     dependencies:
       mkdirp: 1.0.4
-    dev: true
 
-  /property-expr@2.0.6:
-    resolution: {integrity: sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==}
-    dev: false
+  property-expr@2.0.6: {}
 
-  /property-information@6.2.0:
-    resolution: {integrity: sha512-kma4U7AFCTwpqq5twzC1YVIDXSqg6qQK6JN0smOw8fgRy1OkMi0CYSzFmsy6dnqSenamAtj0CyXMUJ1Mf6oROg==}
-    dev: true
+  property-information@6.2.0: {}
 
-  /property-information@7.0.0:
-    resolution: {integrity: sha512-7D/qOz/+Y4X/rzSB6jKxKUsQnphO046ei8qxG59mtM3RG3DHgTK81HrxrmoDVINJb8NKT5ZsRbwHvQ6B68Iyhg==}
-    dev: false
+  property-information@7.0.0: {}
 
-  /proto-list@1.2.4:
-    resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
-    dev: false
+  proto-list@1.2.4: {}
 
-  /protobufjs@7.3.2:
-    resolution: {integrity: sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==}
-    engines: {node: '>=12.0.0'}
-    requiresBuild: true
+  protobufjs@7.3.2:
     dependencies:
       '@protobufjs/aspromise': 1.1.2
       '@protobufjs/base64': 1.1.2
@@ -31589,276 +38704,175 @@ packages:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 18.19.20
+      '@types/node': 20.14.14
       long: 5.2.3
 
-  /proxy-addr@2.0.7:
-    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
-    engines: {node: '>= 0.10'}
+  proxy-addr@2.0.7:
     dependencies:
       forwarded: 0.2.0
       ipaddr.js: 1.9.1
 
-  /proxy-agent@6.4.0:
-    resolution: {integrity: sha512-u0piLU+nCOHMgGjRbimiXmA9kM/L9EHh3zL81xCdp7m+Y2pHIsnmbdDoEDoAz5geaonNR6q6+yOPQs6n4T6sBQ==}
-    engines: {node: '>= 14'}
+  proxy-agent@6.5.0:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0(supports-color@10.0.0)
+      agent-base: 7.1.4
+      debug: 4.4.1(supports-color@10.0.0)
       http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.5
+      https-proxy-agent: 7.0.6
       lru-cache: 7.18.3
-      pac-proxy-agent: 7.0.2
+      pac-proxy-agent: 7.2.0
       proxy-from-env: 1.1.0
-      socks-proxy-agent: 8.0.4
+      socks-proxy-agent: 8.0.5
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-    dev: false
-
-  /pseudomap@1.0.2:
-    resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==}
 
-  /psl@1.9.0:
-    resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
-    dev: false
+  proxy-from-env@1.1.0: {}
 
-  /pump@2.0.1:
-    resolution: {integrity: sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==}
-    dependencies:
-      end-of-stream: 1.4.4
-      once: 1.4.0
-    dev: true
+  psl@1.9.0: {}
 
-  /pump@3.0.0:
-    resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
+  pump@2.0.1:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
 
-  /pump@3.0.2:
-    resolution: {integrity: sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==}
+  pump@3.0.2:
     dependencies:
       end-of-stream: 1.4.4
       once: 1.4.0
 
-  /pumpify@1.5.1:
-    resolution: {integrity: sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==}
+  pumpify@1.5.1:
     dependencies:
       duplexify: 3.7.1
       inherits: 2.0.4
       pump: 2.0.1
-    dev: true
-
-  /punycode@1.4.1:
-    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
-    dev: false
 
-  /punycode@2.2.0:
-    resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
-    engines: {node: '>=6'}
+  punycode@1.4.1: {}
 
-  /puppeteer-core@23.4.0:
-    resolution: {integrity: sha512-fqkIP5FOcb38jfBj/OcBz1wFaI9nk40uQKSORvnXws6wCbep2dg8yxZ3ddJxBIfQsxoiEOvnrykFinUScrB/ew==}
-    engines: {node: '>=18'}
-    dependencies:
-      '@puppeteer/browsers': 2.4.0
-      chromium-bidi: 0.6.5(devtools-protocol@0.0.1342118)
-      debug: 4.4.0(supports-color@10.0.0)
-      devtools-protocol: 0.0.1342118
-      typed-query-selector: 2.12.0
-      ws: 8.18.0(bufferutil@4.0.9)
-    transitivePeerDependencies:
-      - bare-buffer
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: false
+  punycode@2.2.0: {}
 
-  /puppeteer@23.4.0(typescript@5.5.4):
-    resolution: {integrity: sha512-FxgFFJI7NAsX8uebiEDSjS86vufz9TaqERQHShQT0lCbSRI3jUPEcz/0HdwLiYvfYNsc1zGjqY3NsGZya4PvUA==}
-    engines: {node: '>=18'}
-    hasBin: true
-    requiresBuild: true
+  puppeteer-core@24.15.0(bufferutil@4.0.9):
     dependencies:
-      '@puppeteer/browsers': 2.4.0
-      chromium-bidi: 0.6.5(devtools-protocol@0.0.1342118)
-      cosmiconfig: 9.0.0(typescript@5.5.4)
-      devtools-protocol: 0.0.1342118
-      puppeteer-core: 23.4.0
+      '@puppeteer/browsers': 2.10.6
+      chromium-bidi: 7.2.0(devtools-protocol@0.0.1464554)
+      debug: 4.4.1(supports-color@10.0.0)
+      devtools-protocol: 0.0.1464554
       typed-query-selector: 2.12.0
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
+      - bare-abort-controller
       - bare-buffer
       - bufferutil
       - supports-color
-      - typescript
       - utf-8-validate
-    dev: false
 
-  /pure-rand@6.1.0:
-    resolution: {integrity: sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==}
-    dev: false
+  pure-rand@6.1.0: {}
 
-  /purgecss@2.3.0:
-    resolution: {integrity: sha512-BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ==}
-    hasBin: true
+  purgecss@2.3.0:
     dependencies:
       commander: 5.1.0
       glob: 7.2.3
       postcss: 7.0.32
       postcss-selector-parser: 6.1.2
-    dev: false
 
-  /qrcode.react@4.2.0(react@18.2.0):
-    resolution: {integrity: sha512-QpgqWi8rD9DsS9EP3z7BT+5lY5SFhsqGjpgW5DY/i3mK4M9DTBNz3ErMi8BWYEfI3L0d8GIbGmcdFAS1uIRGjA==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  qrcode.react@4.2.0(react@18.2.0):
     dependencies:
       react: 18.2.0
-    dev: false
-
-  /qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
-    engines: {node: '>=0.6'}
-    dependencies:
-      side-channel: 1.1.0
 
-  /qs@6.13.0:
-    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
-    engines: {node: '>=0.6'}
+  qs@6.14.1:
     dependencies:
       side-channel: 1.1.0
 
-  /qs@6.14.0:
-    resolution: {integrity: sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==}
-    engines: {node: '>=0.6'}
-    dependencies:
-      side-channel: 1.1.0
-    dev: false
+  quansync@0.2.11: {}
 
-  /qs@6.5.3:
-    resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
-    engines: {node: '>=0.6'}
-    dev: false
+  queue-microtask@1.2.3: {}
 
-  /querystringify@2.2.0:
-    resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-    dev: false
+  quick-format-unescaped@4.0.4: {}
 
-  /queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+  quick-lru@4.0.1: {}
 
-  /quick-format-unescaped@4.0.4:
-    resolution: {integrity: sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==}
-    dev: true
+  railroad-diagrams@1.0.0: {}
 
-  /quick-lru@4.0.1:
-    resolution: {integrity: sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==}
-    engines: {node: '>=8'}
-    dev: false
+  randexp@0.4.6:
+    dependencies:
+      discontinuous-range: 1.0.0
+      ret: 0.1.15
 
-  /random-words@2.0.0:
-    resolution: {integrity: sha512-uqpnDqFnYrZajgmvgjmBrSZL2V1UA/9bNPGrilo12CmBeBszoff/avElutUlwWxG12gvmCk/8dUhvHefYxzYjw==}
+  random-words@2.0.0:
     dependencies:
       seedrandom: 3.0.5
-    dev: false
 
-  /randombytes@2.1.0:
-    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
+  randombytes@2.1.0:
     dependencies:
       safe-buffer: 5.2.1
 
-  /range-parser@1.2.1:
-    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
-    engines: {node: '>= 0.6'}
+  range-parser@1.2.1: {}
 
-  /raw-body@2.5.2:
-    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
-    engines: {node: '>= 0.8'}
+  raw-body@2.5.2:
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.0
       iconv-lite: 0.4.24
       unpipe: 1.0.0
 
-  /raw-body@3.0.0:
-    resolution: {integrity: sha512-RmkhL8CAyCRPXCE28MMH0z2PNWQBNk2Q09ZdxM9IOOXwxwZbN+qbWaatPkdkWIKL2ZVDImrN/pK5HTRz2PcS4g==}
-    engines: {node: '>= 0.8'}
+  raw-body@3.0.0:
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.0
       iconv-lite: 0.6.3
       unpipe: 1.0.0
-    dev: false
 
-  /rc9@2.1.2:
-    resolution: {integrity: sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==}
+  raw-body@3.0.2:
+    dependencies:
+      bytes: 3.1.2
+      http-errors: 2.0.1
+      iconv-lite: 0.7.2
+      unpipe: 1.0.0
+
+  rc9@2.1.2:
     dependencies:
       defu: 6.1.4
       destr: 2.0.3
-    dev: false
 
-  /rc@1.2.8:
-    resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
-    hasBin: true
+  rc@1.2.8:
     dependencies:
       deep-extend: 0.6.0
       ini: 1.3.8
       minimist: 1.2.7
       strip-json-comments: 2.0.1
 
-  /re2@1.21.3:
-    resolution: {integrity: sha512-GI+KoGkHT4kxTaX+9p0FgNB1XUnCndO9slG5qqeEoZ7kbf6Dk6ohQVpmwKVeSp7LPLn+g6Q3BaCopz4oHuBDuQ==}
-    requiresBuild: true
-    dependencies:
-      install-artifact-from-github: 1.3.5
-      nan: 2.20.0
-      node-gyp: 10.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /react-aria@3.31.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-q4jRCVDKO6V2o4Sgir5S2obssw/YnMx6QOy10+p0dYqROHpSnMFNkONrKT1w/nA+Nx4ptfPqZbaNra1hR1bUWg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  react-aria@3.31.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@internationalized/string': 3.2.0
       '@react-aria/breadcrumbs': 3.5.9(react@18.2.0)
       '@react-aria/button': 3.9.1(react@18.2.0)
-      '@react-aria/calendar': 3.5.4(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/calendar': 3.5.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/checkbox': 3.13.0(react@18.2.0)
-      '@react-aria/combobox': 3.8.2(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/datepicker': 3.9.1(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/dialog': 3.5.10(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/dnd': 3.5.1(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/combobox': 3.8.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/datepicker': 3.9.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/dialog': 3.5.10(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/dnd': 3.5.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/focus': 3.16.0(react@18.2.0)
-      '@react-aria/gridlist': 3.7.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/gridlist': 3.7.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.10.0(react@18.2.0)
       '@react-aria/interactions': 3.20.1(react@18.2.0)
       '@react-aria/label': 3.7.4(react@18.2.0)
       '@react-aria/link': 3.6.3(react@18.2.0)
-      '@react-aria/listbox': 3.11.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/menu': 3.12.0(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/listbox': 3.11.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/menu': 3.12.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/meter': 3.4.9(react@18.2.0)
-      '@react-aria/numberfield': 3.10.2(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/overlays': 3.20.0(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/numberfield': 3.10.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/overlays': 3.20.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/progress': 3.4.9(react@18.2.0)
       '@react-aria/radio': 3.10.0(react@18.2.0)
       '@react-aria/searchfield': 3.7.1(react@18.2.0)
-      '@react-aria/select': 3.14.1(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.17.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/select': 3.14.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.17.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/separator': 3.3.9(react@18.2.0)
       '@react-aria/slider': 3.7.4(react@18.2.0)
       '@react-aria/ssr': 3.9.1(react@18.2.0)
       '@react-aria/switch': 3.6.0(react@18.2.0)
-      '@react-aria/table': 3.13.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/tabs': 3.8.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/tag': 3.3.1(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/table': 3.13.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/tabs': 3.8.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/tag': 3.3.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/textfield': 3.14.1(react@18.2.0)
       '@react-aria/tooltip': 3.7.0(react@18.2.0)
       '@react-aria/utils': 3.23.0(react@18.2.0)
@@ -31866,46 +38880,41 @@ packages:
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /react-aria@3.34.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-wSprEI5EojDFCm357MxnKAxJZN68OYIt6UH6N0KCo6MEUAVZMbhMSmGYjw/kLK4rI7KrbJDqGqUMQkwc93W9Ng==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  react-aria@3.34.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@internationalized/string': 3.2.3
       '@react-aria/breadcrumbs': 3.5.16(react@18.2.0)
       '@react-aria/button': 3.9.8(react@18.2.0)
-      '@react-aria/calendar': 3.5.11(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/calendar': 3.5.11(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/checkbox': 3.14.6(react@18.2.0)
-      '@react-aria/combobox': 3.10.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/datepicker': 3.11.2(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/dialog': 3.5.17(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/dnd': 3.7.2(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/combobox': 3.10.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/datepicker': 3.11.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/dialog': 3.5.17(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/dnd': 3.7.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/focus': 3.18.2(react@18.2.0)
-      '@react-aria/gridlist': 3.9.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/gridlist': 3.9.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/i18n': 3.12.2(react@18.2.0)
       '@react-aria/interactions': 3.22.2(react@18.2.0)
       '@react-aria/label': 3.7.11(react@18.2.0)
       '@react-aria/link': 3.7.4(react@18.2.0)
-      '@react-aria/listbox': 3.13.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/menu': 3.15.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/listbox': 3.13.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/menu': 3.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/meter': 3.4.16(react@18.2.0)
-      '@react-aria/numberfield': 3.11.6(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/overlays': 3.23.2(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/numberfield': 3.11.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/overlays': 3.23.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/progress': 3.4.16(react@18.2.0)
       '@react-aria/radio': 3.10.7(react@18.2.0)
       '@react-aria/searchfield': 3.7.8(react@18.2.0)
-      '@react-aria/select': 3.14.9(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/selection': 3.19.3(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/select': 3.14.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/selection': 3.19.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/separator': 3.4.2(react@18.2.0)
       '@react-aria/slider': 3.7.11(react@18.2.0)
       '@react-aria/ssr': 3.9.5(react@18.2.0)
       '@react-aria/switch': 3.6.7(react@18.2.0)
-      '@react-aria/table': 3.15.3(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/tabs': 3.9.5(react-dom@18.2.0)(react@18.2.0)
-      '@react-aria/tag': 3.4.5(react-dom@18.2.0)(react@18.2.0)
+      '@react-aria/table': 3.15.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/tabs': 3.9.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      '@react-aria/tag': 3.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@react-aria/textfield': 3.14.8(react@18.2.0)
       '@react-aria/tooltip': 3.7.7(react@18.2.0)
       '@react-aria/utils': 3.25.2(react@18.2.0)
@@ -31913,81 +38922,67 @@ packages:
       '@react-types/shared': 3.24.1(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /react-collapse@5.1.1(react@18.2.0):
-    resolution: {integrity: sha512-k6cd7csF1o9LBhQ4AGBIdxB60SUEUMQDAnL2z1YvYNr9KoKr+nDkhN6FK7uGaBd/rYrYfrMpzpmJEIeHRYogBw==}
-    peerDependencies:
-      react: '>=16.3.0'
+  react-collapse@5.1.1(react@18.2.0):
     dependencies:
       react: 18.2.0
-    dev: false
 
-  /react-dom@18.2.0(react@18.2.0):
-    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
-    peerDependencies:
-      react: ^18.2.0
+  react-day-picker@9.13.0(react@18.2.0):
     dependencies:
-      loose-envify: 1.4.0
+      '@date-fns/tz': 1.4.1
+      date-fns: 4.1.0
+      date-fns-jalali: 4.1.0-0
       react: 18.2.0
-      scheduler: 0.23.0
 
-  /react-dom@18.2.0(react@18.3.1):
-    resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
-    peerDependencies:
-      react: ^18.2.0
+  react-dom@18.2.0(react@18.2.0):
     dependencies:
       loose-envify: 1.4.0
-      react: 18.3.1
+      react: 18.2.0
       scheduler: 0.23.0
-    dev: false
 
-  /react-dom@18.3.1(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
-    peerDependencies:
-      react: ^18.3.1
+  react-dom@18.2.0(react@18.3.1):
     dependencies:
       loose-envify: 1.4.0
-      react: 19.0.0-rc.0
-      scheduler: 0.23.2
-    dev: false
+      react: 18.3.1
+      scheduler: 0.23.0
 
-  /react-dom@19.0.0(react@19.0.0):
-    resolution: {integrity: sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==}
-    peerDependencies:
-      react: ^19.0.0
+  react-dom@19.0.0(react@19.0.0):
     dependencies:
       react: 19.0.0
       scheduler: 0.25.0
-    dev: false
 
-  /react-dom@19.0.0-rc.1(react@19.0.0-rc.1):
-    resolution: {integrity: sha512-k8MfDX+4G+eaa1cXXI9QF4d+pQtYol3nx8vauqRWUEOPqC7NQn2qmEqUsLoSd28rrZUL+R3T2VC+kZ2Hyx1geQ==}
-    peerDependencies:
-      react: 19.0.0-rc.1
+  react-dom@19.0.0-rc.1(react@19.0.0-rc.1):
     dependencies:
       react: 19.0.0-rc.1
       scheduler: 0.25.0-rc.1
-    dev: false
 
-  /react-email@2.1.2(eslint@8.31.0):
-    resolution: {integrity: sha512-HBHhpzEE5es9YUoo7VSj6qy1omjwndxf3/Sb44UJm/uJ2AjmqALo2yryux0CjW9QAVfitc9rxHkLvIb9H87QQw==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  react-dom@19.1.0(react@19.1.0):
+    dependencies:
+      react: 19.1.0
+      scheduler: 0.26.0
+
+  react-draggable@4.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+    dependencies:
+      clsx: 2.1.1
+      prop-types: 15.8.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+
+  react-email@2.1.2(@opentelemetry/api@1.9.0)(@swc/helpers@0.5.15)(eslint@8.31.0):
     dependencies:
       '@babel/parser': 7.24.1
       '@radix-ui/colors': 1.0.1
-      '@radix-ui/react-collapsible': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-popover': 1.0.7(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-collapsible': 1.0.3(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-popover': 1.0.7(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@radix-ui/react-slot': 1.0.2(@types/react@18.3.1)(react@18.3.1)
-      '@radix-ui/react-toggle-group': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
-      '@radix-ui/react-tooltip': 1.0.6(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0)(react@18.3.1)
+      '@radix-ui/react-toggle-group': 1.0.4(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      '@radix-ui/react-tooltip': 1.0.6(@types/react-dom@18.2.7)(@types/react@18.3.1)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       '@react-email/components': 0.0.17(@types/react@18.3.1)(react@18.3.1)
       '@react-email/render': 0.0.13
-      '@swc/core': 1.3.101
+      '@swc/core': 1.3.101(@swc/helpers@0.5.15)
       '@types/react': 18.3.1
       '@types/react-dom': 18.2.7
-      '@types/webpack': 5.28.5(@swc/core@1.3.101)(esbuild@0.19.11)
+      '@types/webpack': 5.28.5(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)
       autoprefixer: 10.4.14(postcss@8.4.35)
       babel-walk: 3.0.0
       chalk: 4.1.2
@@ -31998,11 +38993,11 @@ packages:
       esbuild: 0.19.11
       eslint-config-prettier: 9.0.0(eslint@8.31.0)
       eslint-config-turbo: 1.10.12(eslint@8.31.0)
-      framer-motion: 10.17.4(react-dom@18.2.0)(react@18.3.1)
+      framer-motion: 10.17.4(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       glob: 10.3.4
       log-symbols: 4.1.0
       mime-types: 2.1.35
-      next: 14.1.0(react-dom@18.2.0)(react@18.3.1)
+      next: 14.1.0(@opentelemetry/api@1.9.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       normalize-path: 3.0.0
       ora: 5.4.1
       postcss: 8.4.35
@@ -32012,12 +39007,12 @@ packages:
       shelljs: 0.8.5
       socket.io: 4.7.3
       socket.io-client: 4.7.3
-      sonner: 1.3.1(react-dom@18.2.0)(react@18.3.1)
+      sonner: 1.3.1(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
       source-map-js: 1.0.2
       stacktrace-parser: 0.1.10
       tailwind-merge: 2.2.0
       tailwindcss: 3.4.0
-      typescript: 5.1.6
+      typescript: 5.5.4
     transitivePeerDependencies:
       - '@babel/core'
       - '@opentelemetry/api'
@@ -32031,65 +39026,50 @@ packages:
       - uglify-js
       - utf-8-validate
       - webpack-cli
-    dev: false
 
-  /react-email@3.0.1(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-G4Bkx2ULIScy/0Z8nnWywHt0W1iTkaYCdh9rWNuQ3eVZ6B3ttTUDE9uUy3VNQ8dtQbmG0cpt8+XmImw7mMBW6Q==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/core': 7.24.5
-      '@babel/parser': 7.24.5
-      chalk: 4.1.2
-      chokidar: 3.6.0
-      commander: 11.1.0
-      debounce: 2.0.0
-      esbuild: 0.19.11
-      glob: 10.3.4
-      log-symbols: 4.1.0
-      mime-types: 2.1.35
-      next: 14.2.3(@babel/core@7.24.5)(@opentelemetry/api@1.4.1)(@playwright/test@1.37.0)(react-dom@18.3.1)(react@19.0.0-rc.0)
-      normalize-path: 3.0.0
-      ora: 5.4.1
-      socket.io: 4.7.5
-    transitivePeerDependencies:
-      - '@opentelemetry/api'
-      - '@playwright/test'
-      - babel-plugin-macros
-      - bufferutil
-      - react
-      - react-dom
-      - sass
-      - supports-color
-      - utf-8-validate
-    dev: false
+  react-fast-compare@3.2.2: {}
 
-  /react-fast-compare@3.2.2:
-    resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
-    dev: false
+  react-grid-layout@2.2.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+    dependencies:
+      clsx: 2.1.1
+      fast-equals: 4.0.3
+      prop-types: 15.8.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-draggable: 4.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      react-resizable: 3.1.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      resize-observer-polyfill: 1.5.1
 
-  /react-hotkeys-hook@4.4.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-sClBMBioFEgFGYLTWWRKvhxcCx1DRznd+wkFHwQZspnRBkHTgruKIHptlK/U/2DPX8BhHoRGzpMVWUXMmdZlmw==}
-    peerDependencies:
-      react: '>=16.8.1'
-      react-dom: '>=16.8.1'
+  react-hotkeys-hook@4.4.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /react-is@16.13.1:
-    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
+  react-is@16.13.1: {}
 
-  /react-is@17.0.2:
-    resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==}
-    dev: true
+  react-is@17.0.2: {}
 
-  /react-markdown@10.1.0(@types/react@19.0.12)(react@19.0.0):
-    resolution: {integrity: sha512-qKxVopLT/TyA6BX3Ue5NwabOsAzm0Q7kAPwq6L+wWDwisYs7R8vZ0nRXqq6rkueboxpkjvLGU9fWifiX/ZZFxQ==}
-    peerDependencies:
-      '@types/react': '>=18'
-      react: '>=18'
+  react-is@18.3.1: {}
+
+  react-markdown@10.1.0(@types/react@18.2.69)(react@18.2.0):
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/mdast': 4.0.4
+      '@types/react': 18.2.69
+      devlop: 1.1.0
+      hast-util-to-jsx-runtime: 2.3.6
+      html-url-attributes: 3.0.1
+      mdast-util-to-hast: 13.2.0
+      react: 18.2.0
+      remark-parse: 11.0.0
+      remark-rehype: 11.1.1
+      unified: 11.0.5
+      unist-util-visit: 5.0.0
+      vfile: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  react-markdown@10.1.0(@types/react@19.0.12)(react@19.0.0):
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
@@ -32106,155 +39086,106 @@ packages:
       vfile: 6.0.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /react-merge-refs@2.1.1:
-    resolution: {integrity: sha512-jLQXJ/URln51zskhgppGJ2ub7b2WFKGq3cl3NYKtlHoTG+dN2q7EzWrn3hN3EgPsTMvpR9tpq5ijdp7YwFZkag==}
-    dev: false
+  react-markdown@10.1.0(@types/react@19.0.12)(react@19.1.0):
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/mdast': 4.0.4
+      '@types/react': 19.0.12
+      devlop: 1.1.0
+      hast-util-to-jsx-runtime: 2.3.6
+      html-url-attributes: 3.0.1
+      mdast-util-to-hast: 13.2.0
+      react: 19.1.0
+      remark-parse: 11.0.0
+      remark-rehype: 11.1.1
+      unified: 11.0.5
+      unist-util-visit: 5.0.0
+      vfile: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
 
-  /react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-e1hj8lL3uM+sgSR4Lxzn5h1GxBlpa4CQz0XLF8kx4MDrDRWY0Ena4c97PUeSX9i5W3UAfDP0z0FXCTQkoXUl3Q==}
-    peerDependencies:
-      '@popperjs/core': ^2.0.0
-      react: ^16.8.0 || ^17 || ^18
-      react-dom: ^16.8.0 || ^17 || ^18
+  react-popper@2.3.0(@popperjs/core@2.11.8)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@popperjs/core': 2.11.8
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-fast-compare: 3.2.2
       warning: 4.0.3
-    dev: false
-
-  /react-promise-suspense@0.3.4:
-    resolution: {integrity: sha512-I42jl7L3Ze6kZaq+7zXWSunBa3b1on5yfvUW6Eo/3fFOj6dZ5Bqmcd264nJbTK/gn1HjjILAjSwnZbV4RpSaNQ==}
-    dependencies:
-      fast-deep-equal: 2.0.1
-    dev: false
 
-  /react-refresh@0.14.0:
-    resolution: {integrity: sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  react-refresh@0.14.0: {}
 
-  /react-remove-scroll-bar@2.3.8(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  react-remove-scroll-bar@2.3.8(@types/react@18.2.69)(react@18.2.0):
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
       react-style-singleton: 2.2.3(@types/react@18.2.69)(react@18.2.0)
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /react-remove-scroll-bar@2.3.8(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  react-remove-scroll-bar@2.3.8(@types/react@18.3.1)(react@18.3.1):
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
       react-style-singleton: 2.2.3(@types/react@18.3.1)(react@18.3.1)
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /react-remove-scroll@2.5.5(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  react-remove-scroll@2.5.5(@types/react@18.2.69)(react@18.2.0):
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
       react-remove-scroll-bar: 2.3.8(@types/react@18.2.69)(react@18.2.0)
       react-style-singleton: 2.2.3(@types/react@18.2.69)(react@18.2.0)
       tslib: 2.8.1
       use-callback-ref: 1.3.3(@types/react@18.2.69)(react@18.2.0)
       use-sidecar: 1.1.3(@types/react@18.2.69)(react@18.2.0)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /react-remove-scroll@2.5.5(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  react-remove-scroll@2.5.5(@types/react@18.3.1)(react@18.3.1):
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
       react-remove-scroll-bar: 2.3.8(@types/react@18.3.1)(react@18.3.1)
       react-style-singleton: 2.2.3(@types/react@18.3.1)(react@18.3.1)
       tslib: 2.8.1
       use-callback-ref: 1.3.3(@types/react@18.3.1)(react@18.3.1)
       use-sidecar: 1.1.3(@types/react@18.3.1)(react@18.3.1)
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /react-resizable-panels@2.0.9(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-ZylBvs7oG7Y/INWw3oYGolqgpFvoPW8MPeg9l1fURDeKpxrmUuCHBUmPj47BdZ11MODImu3kZYXG85rbySab7w==}
-    peerDependencies:
-      react: ^16.14.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.14.0 || ^17.0.0 || ^18.0.0
+  react-resizable-panels@2.0.9(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /react-router-dom@6.17.0(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      react: '>=16.8'
-      react-dom: '>=16.8'
+  react-resizable@3.1.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
+    dependencies:
+      prop-types: 15.8.1
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+      react-draggable: 4.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+
+  react-router-dom@6.17.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@remix-run/router': 1.10.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-router: 6.17.0(react@18.2.0)
 
-  /react-router@6.17.0(react@18.2.0):
-    resolution: {integrity: sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      react: '>=16.8'
+  react-router@6.17.0(react@18.2.0):
     dependencies:
       '@remix-run/router': 1.10.0
       react: 18.2.0
 
-  /react-smooth@4.0.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-OE4hm7XqR0jNOq3Qmk9mFLyd6p2+j6bvbPJ7qlB7+oo0eNcL2l7WQzG6MBnT3EXY6xzkLMUBec3AfewJdA0J8w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  react-smooth@4.0.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       fast-equals: 5.0.1
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
-    dev: false
+      react-transition-group: 4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
 
-  /react-stately@3.29.1(react@18.2.0):
-    resolution: {integrity: sha512-hc4ZHy/ahvMwr6z7XMjYJ7EgzNVrXhzM4l2Qj17rdRhERo7/ovWmQencf9pF7K8kD5TraEHxPHLrYzGN4fxfUQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
+  react-stately@3.29.1(react@18.2.0):
     dependencies:
       '@react-stately/calendar': 3.4.3(react@18.2.0)
       '@react-stately/checkbox': 3.6.1(react@18.2.0)
@@ -32280,69 +39211,38 @@ packages:
       '@react-stately/tree': 3.7.5(react@18.2.0)
       '@react-types/shared': 3.22.0(react@18.2.0)
       react: 18.2.0
-    dev: false
 
-  /react-style-singleton@2.2.3(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  react-style-singleton@2.2.3(@types/react@18.2.69)(react@18.2.0):
     dependencies:
-      '@types/react': 18.2.69
       get-nonce: 1.0.1
       react: 18.2.0
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /react-style-singleton@2.2.3(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  react-style-singleton@2.2.3(@types/react@18.3.1)(react@18.3.1):
     dependencies:
-      '@types/react': 18.3.1
       get-nonce: 1.0.1
       react: 18.3.1
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /react-transition-group@4.4.5(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
-    peerDependencies:
-      react: '>=16.6.0'
-      react-dom: '>=16.6.0'
+  react-transition-group@4.4.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
-      '@babel/runtime': 7.27.4
+      '@babel/runtime': 7.27.0
       dom-helpers: 5.2.1
       loose-envify: 1.4.0
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /react-universal-interface@0.6.2(react@18.2.0)(tslib@2.8.1):
-    resolution: {integrity: sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==}
-    peerDependencies:
-      react: '*'
-      tslib: '*'
+  react-universal-interface@0.6.2(react@18.2.0)(tslib@2.8.1):
     dependencies:
       react: 18.2.0
       tslib: 2.8.1
-    dev: false
 
-  /react-use@17.5.1(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==}
-    peerDependencies:
-      react: '*'
-      react-dom: '*'
+  react-use@17.5.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@types/js-cookie': 2.2.7
       '@xobotyi/scrollbar-width': 1.9.5
@@ -32350,7 +39250,7 @@ packages:
       fast-deep-equal: 3.1.3
       fast-shallow-equal: 1.0.0
       js-cookie: 2.2.1
-      nano-css: 5.6.2(react-dom@18.2.0)(react@18.2.0)
+      nano-css: 5.6.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       react-universal-interface: 0.6.2(react@18.2.0)(tslib@2.8.1)
@@ -32360,14 +39260,8 @@ packages:
       throttle-debounce: 3.0.1
       ts-easing: 0.2.0
       tslib: 2.8.1
-    dev: false
 
-  /react-window-splitter@0.4.1(@types/react@18.2.69)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-7XjNxlsBqOySyPEf32GZXLIA7gIPLWqswnOwM4Aw15qiMChMm8einkz40RbLfvrD11EKHIU35vcUH1RDA+we9w==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      react: '>=16'
-      react-dom: '>=16'
+  react-window-splitter@0.4.1(@types/react@18.2.69)(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.2.69)(react@18.2.0)
       '@testing-library/jest-dom': 6.5.0
@@ -32375,96 +39269,59 @@ packages:
       '@xstate/react': 4.1.2(@types/react@18.2.69)(react@18.2.0)(xstate@5.18.1)
       invariant: 2.2.4
       react: 18.2.0
-      react-aria: 3.34.3(react-dom@18.2.0)(react@18.2.0)
+      react-aria: 3.34.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       react-dom: 18.2.0(react@18.2.0)
       reforest: 0.13.0(@types/react@18.2.69)(react@18.2.0)
       xstate: 5.18.1
     transitivePeerDependencies:
       - '@types/react'
       - immer
-    dev: false
 
-  /react@18.2.0:
-    resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==}
-    engines: {node: '>=0.10.0'}
+  react@18.2.0:
     dependencies:
       loose-envify: 1.4.0
 
-  /react@18.3.1:
-    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
-    engines: {node: '>=0.10.0'}
+  react@18.3.1:
     dependencies:
       loose-envify: 1.4.0
 
-  /react@19.0.0:
-    resolution: {integrity: sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  react@19.0.0: {}
 
-  /react@19.0.0-rc.0:
-    resolution: {integrity: sha512-8nrDCl5uE54FHeKqKrEO0TS+10bT4cxutJGb2okiJc0FHMQ6I3FeItaqly/1nbijlhSO3HmAVyPIexIQQWYAtQ==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  react@19.0.0-rc.1: {}
 
-  /react@19.0.0-rc.1:
-    resolution: {integrity: sha512-NZKln+uyPuyHchzP07I6GGYFxdAoaKhehgpCa3ltJGzwE31OYumLeshGaitA1R/fS5d9D2qpZVwTFAr6zCLM9w==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  react@19.1.0: {}
 
-  /read-cache@1.0.0:
-    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
+  read-cache@1.0.0:
     dependencies:
       pify: 2.3.0
 
-  /read-pkg-up@7.0.1:
-    resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
-    engines: {node: '>=8'}
+  read-pkg-up@7.0.1:
     dependencies:
       find-up: 4.1.0
       read-pkg: 5.2.0
       type-fest: 0.8.1
 
-  /read-pkg@3.0.0:
-    resolution: {integrity: sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA==}
-    engines: {node: '>=4'}
+  read-pkg@3.0.0:
     dependencies:
       load-json-file: 4.0.0
       normalize-package-data: 2.5.0
       path-type: 3.0.0
-    dev: true
 
-  /read-pkg@5.2.0:
-    resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==}
-    engines: {node: '>=8'}
+  read-pkg@5.2.0:
     dependencies:
       '@types/normalize-package-data': 2.4.1
       normalize-package-data: 2.5.0
       parse-json: 5.2.0
       type-fest: 0.6.0
 
-  /read-yaml-file@1.1.0:
-    resolution: {integrity: sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==}
-    engines: {node: '>=6'}
+  read-yaml-file@1.1.0:
     dependencies:
       graceful-fs: 4.2.11
-      js-yaml: 3.14.1
+      js-yaml: 3.14.2
       pify: 4.0.1
       strip-bom: 3.0.0
 
-  /readable-stream@2.3.7:
-    resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==}
-    dependencies:
-      core-util-is: 1.0.3
-      inherits: 2.0.4
-      isarray: 1.0.0
-      process-nextick-args: 2.0.1
-      safe-buffer: 5.1.2
-      string_decoder: 1.1.1
-      util-deprecate: 1.0.2
-    dev: true
-
-  /readable-stream@2.3.8:
-    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+  readable-stream@2.3.8:
     dependencies:
       core-util-is: 1.0.3
       inherits: 2.0.4
@@ -32473,28 +39330,20 @@ packages:
       safe-buffer: 5.1.2
       string_decoder: 1.1.1
       util-deprecate: 1.0.2
-    dev: true
 
-  /readable-stream@3.6.0:
-    resolution: {integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==}
-    engines: {node: '>= 6'}
+  readable-stream@3.6.0:
     dependencies:
       inherits: 2.0.4
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
-  /readable-stream@3.6.2:
-    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
-    engines: {node: '>= 6'}
+  readable-stream@3.6.2:
     dependencies:
       inherits: 2.0.4
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
-  /readable-stream@4.7.0:
-    resolution: {integrity: sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    requiresBuild: true
+  readable-stream@4.7.0:
     dependencies:
       abort-controller: 3.0.0
       buffer: 6.0.3
@@ -32502,107 +39351,60 @@ packages:
       process: 0.11.10
       string_decoder: 1.3.0
 
-  /readdir-glob@1.1.3:
-    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
+  readdir-glob@1.1.3:
     dependencies:
       minimatch: 5.1.6
-    dev: true
 
-  /readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
+  readdirp@3.6.0:
     dependencies:
       picomatch: 2.3.1
 
-  /readdirp@4.1.2:
-    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
-    engines: {node: '>= 14.18.0'}
-    dev: true
+  readdirp@4.1.2: {}
 
-  /real-require@0.2.0:
-    resolution: {integrity: sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==}
-    engines: {node: '>= 12.13.0'}
-    dev: true
+  real-require@0.2.0: {}
 
-  /recharts-scale@0.4.5:
-    resolution: {integrity: sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==}
+  recharts-scale@0.4.5:
     dependencies:
       decimal.js-light: 2.5.1
-    dev: false
 
-  /recharts@2.12.6(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-D+7j9WI+D0NHauah3fKHuNNcRK8bOypPW7os1DERinogGBGaHI7i6tQKJ0aUF3JXyBZ63dyfKIW2WTOPJDxJ8w==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      react: ^16.0.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0
+  recharts@2.15.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       clsx: 2.1.1
       eventemitter3: 4.0.7
-      lodash: 4.17.21
+      lodash: 4.17.23
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-is: 16.13.1
-      react-smooth: 4.0.1(react-dom@18.2.0)(react@18.2.0)
+      react-is: 18.3.1
+      react-smooth: 4.0.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       recharts-scale: 0.4.5
       tiny-invariant: 1.3.1
       victory-vendor: 36.6.11
-    dev: false
 
-  /rechoir@0.6.2:
-    resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
-    engines: {node: '>= 0.10'}
+  rechoir@0.6.2:
     dependencies:
       resolve: 1.22.8
-    dev: false
 
-  /redent@3.0.0:
-    resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
-    engines: {node: '>=8'}
+  redent@3.0.0:
     dependencies:
       indent-string: 4.0.0
       strip-indent: 3.0.0
-    dev: false
 
-  /redis-errors@1.2.0:
-    resolution: {integrity: sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==}
-    engines: {node: '>=4'}
-    dev: false
+  redis-errors@1.2.0: {}
 
-  /redis-parser@3.0.0:
-    resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
-    engines: {node: '>=4'}
+  redis-parser@3.0.0:
     dependencies:
       redis-errors: 1.2.0
-    dev: false
 
-  /redlock@5.0.0-beta.2(patch_hash=rwyegdki7iserrd7fgjwxkhnlu):
-    resolution: {integrity: sha512-2RDWXg5jgRptDrB1w9O/JgSZC0j7y4SlaXnor93H/UJm/QyDiFgBKNtrh0TI6oCXqYSaSoXxFh6Sd3VtYfhRXw==}
-    engines: {node: '>=12'}
+  redlock@5.0.0-beta.2(patch_hash=52b17ac642f5f9776bf05e2229f4dd79588d37b0039d835c7684c478464632f2):
     dependencies:
       node-abort-controller: 3.1.1
-    dev: false
-    patched: true
 
-  /reduce-css-calc@2.1.8:
-    resolution: {integrity: sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==}
+  reduce-css-calc@2.1.8:
     dependencies:
       css-unit-converter: 1.1.2
       postcss-value-parser: 3.3.1
-    dev: false
-
-  /reflect-metadata@0.1.14:
-    resolution: {integrity: sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==}
-    dev: false
-
-  /reflect-metadata@0.2.2:
-    resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==}
-    dev: false
 
-  /reforest@0.13.0(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-f0It/s51f1UWCCCni0viULALDBhxWBPFnLmZRYtKcz4zYeNWqeNTdcnU/OpBry9tk+jyMQcH3MLK8UdzsAvA5w==}
-    peerDependencies:
-      react: '>=16.8'
+  reforest@0.13.0(@types/react@18.2.69)(react@18.2.0):
     dependencies:
       performant-array-to-tree: 1.11.0
       react: 18.2.0
@@ -32610,98 +39412,112 @@ packages:
     transitivePeerDependencies:
       - '@types/react'
       - immer
-    dev: false
 
-  /regenerator-runtime@0.13.11:
-    resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
+  regenerator-runtime@0.14.1: {}
 
-  /regenerator-runtime@0.14.1:
-    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+  regex-recursion@6.0.2:
+    dependencies:
+      regex-utilities: 2.3.0
 
-  /regexp-to-ast@0.5.0:
-    resolution: {integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==}
-    dev: true
+  regex-utilities@2.3.0: {}
 
-  /regexp.prototype.flags@1.4.3:
-    resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==}
-    engines: {node: '>= 0.4'}
+  regex@6.0.1:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      regex-utilities: 2.3.0
+
+  regexp.prototype.flags@1.4.3:
+    dependencies:
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       functions-have-names: 1.2.3
 
-  /regexp.prototype.flags@1.5.2:
-    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
-    engines: {node: '>= 0.4'}
+  regexp.prototype.flags@1.5.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-errors: 1.3.0
       set-function-name: 2.0.2
-    dev: true
 
-  /regexpp@3.2.0:
-    resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
-    engines: {node: '>=8'}
+  regexpp@3.2.0: {}
 
-  /registry-auth-token@4.2.2:
-    resolution: {integrity: sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==}
-    engines: {node: '>=6.0.0'}
+  registry-auth-token@4.2.2:
     dependencies:
       rc: 1.2.8
-    dev: true
 
-  /registry-url@5.1.0:
-    resolution: {integrity: sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==}
-    engines: {node: '>=8'}
+  registry-url@5.1.0:
     dependencies:
       rc: 1.2.8
-    dev: true
 
-  /regression@2.0.1:
-    resolution: {integrity: sha512-A4XYsc37dsBaNOgEjkJKzfJlE394IMmUPlI/p3TTI9u3T+2a+eox5Pr/CPUqF0eszeWZJPAc6QkroAhuUpWDJQ==}
-    dev: false
+  regression@2.0.1: {}
+
+  rehype-harden@1.1.5: {}
+
+  rehype-katex@7.0.1:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/katex': 0.16.7
+      hast-util-from-html-isomorphic: 2.0.0
+      hast-util-to-text: 4.0.2
+      katex: 0.16.25
+      unist-util-visit-parents: 6.0.1
+      vfile: 6.0.3
+
+  rehype-raw@7.0.0:
+    dependencies:
+      '@types/hast': 3.0.4
+      hast-util-raw: 9.1.0
+      vfile: 6.0.3
 
-  /remark-frontmatter@4.0.1:
-    resolution: {integrity: sha512-38fJrB0KnmD3E33a5jZC/5+gGAC2WKNiPw1/fdXJvijBlhA7RCsvJklrYJakS0HedninvaCYW8lQGf9C918GfA==}
+  remark-frontmatter@4.0.1:
     dependencies:
       '@types/mdast': 3.0.10
       mdast-util-frontmatter: 1.0.0
       micromark-extension-frontmatter: 1.0.0
       unified: 10.1.2
-    dev: true
 
-  /remark-mdx-frontmatter@1.1.1:
-    resolution: {integrity: sha512-7teX9DW4tI2WZkXS4DBxneYSY7NHiXl4AKdWDO9LXVweULlCT8OPWsOjLEnMIXViN1j+QcY8mfbq3k0EK6x3uA==}
-    engines: {node: '>=12.2.0'}
+  remark-gfm@4.0.1:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-gfm: 3.1.0
+      micromark-extension-gfm: 3.0.0
+      remark-parse: 11.0.0
+      remark-stringify: 11.0.0
+      unified: 11.0.5
+    transitivePeerDependencies:
+      - supports-color
+
+  remark-math@6.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-math: 3.0.0
+      micromark-extension-math: 3.1.0
+      unified: 11.0.5
+    transitivePeerDependencies:
+      - supports-color
+
+  remark-mdx-frontmatter@1.1.1:
     dependencies:
       estree-util-is-identifier-name: 1.1.0
       estree-util-value-to-estree: 1.3.0
-      js-yaml: 4.1.0
+      js-yaml: 4.1.1
       toml: 3.0.0
-    dev: true
 
-  /remark-mdx@2.3.0:
-    resolution: {integrity: sha512-g53hMkpM0I98MU266IzDFMrTD980gNF3BJnkyFcmN+dD873mQeD5rdMO3Y2X+x8umQfbSE0PcoEDl7ledSA+2g==}
+  remark-mdx@2.3.0:
     dependencies:
       mdast-util-mdx: 2.0.1
       micromark-extension-mdxjs: 1.0.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /remark-parse@10.0.2:
-    resolution: {integrity: sha512-3ydxgHa/ZQzG8LvC7jTXccARYDcRld3VfcgIIFs7bI6vbRSxJJmzgLEIIoYKyrfhaY+ujuWaf/PJiMZXoiCXgw==}
+  remark-parse@10.0.2:
     dependencies:
       '@types/mdast': 3.0.10
       mdast-util-from-markdown: 1.2.0
       unified: 10.1.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /remark-parse@11.0.0:
-    resolution: {integrity: sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==}
+  remark-parse@11.0.0:
     dependencies:
       '@types/mdast': 4.0.4
       mdast-util-from-markdown: 2.0.2
@@ -32709,149 +39525,89 @@ packages:
       unified: 11.0.5
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /remark-rehype@10.1.0:
-    resolution: {integrity: sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==}
+  remark-rehype@10.1.0:
     dependencies:
       '@types/hast': 2.3.4
       '@types/mdast': 3.0.10
       mdast-util-to-hast: 12.3.0
       unified: 10.1.2
-    dev: true
 
-  /remark-rehype@11.1.1:
-    resolution: {integrity: sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==}
+  remark-rehype@11.1.1:
     dependencies:
       '@types/hast': 3.0.4
       '@types/mdast': 4.0.4
       mdast-util-to-hast: 13.2.0
       unified: 11.0.5
       vfile: 6.0.3
-    dev: false
 
-  /remix-auth-email-link@2.0.2(@remix-run/server-runtime@2.1.0)(remix-auth@3.6.0):
-    resolution: {integrity: sha512-Lze9c50fsqBpixXQKe37wI2Dm4rlYYkNA6Eskxk8erQ7tbyN8xiFXOgo7Y3Al0SSjzkezw8au3uc2vCLJ8A5mQ==}
-    peerDependencies:
-      '@remix-run/server-runtime': ^1.1.1
-      remix-auth: ^3.2.1
+  remark-stringify@11.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-to-markdown: 2.1.2
+      unified: 11.0.5
+
+  remix-auth-email-link@2.0.2(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))):
     dependencies:
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
       crypto-js: 4.1.1
-      remix-auth: 3.6.0(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)
-    dev: false
+      remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))
 
-  /remix-auth-github@1.6.0(@remix-run/server-runtime@2.1.0)(remix-auth@3.6.0):
-    resolution: {integrity: sha512-qdQmWVVEDHxnzMPn7XE0s7QX5GYba0uH3MDW+lVJiCoHDZCGymqmGCajLThL5vFJdwSx0C4GpQJ5EgEsIjQ3pA==}
-    peerDependencies:
-      '@remix-run/server-runtime': ^1.0.0
-      remix-auth: ^3.4.0
+  remix-auth-github@1.6.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))):
     dependencies:
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
-      remix-auth: 3.6.0(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)
-      remix-auth-oauth2: 1.11.0(@remix-run/server-runtime@2.1.0)(remix-auth@3.6.0)
+      remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))
+      remix-auth-oauth2: 1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)))
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0)(remix-auth@3.6.0):
-    resolution: {integrity: sha512-Yf1LF6NLYPFa7X2Rax/VEhXmYXFjZOi/q+7DmbMeoMHjAfkpqxbvzqqYSKIKDGR51z5TXR5na4to4380mir5bg==}
-    peerDependencies:
-      '@remix-run/server-runtime': ^1.0.0 || ^2.0.0
-      remix-auth: ^3.6.0
+  remix-auth-google@2.0.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))):
     dependencies:
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
-      debug: 4.4.0(supports-color@10.0.0)
-      remix-auth: 3.6.0(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)
+      remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))
+      remix-auth-oauth2: 1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)))
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /remix-auth@3.6.0(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0):
-    resolution: {integrity: sha512-mxlzLYi+/GKQSaXIqIw15dxAT1wm+93REAeDIft2unrKDYnjaGhhpapyPhdbALln86wt9lNAk21znfRss3fG7Q==}
-    peerDependencies:
-      '@remix-run/react': ^1.0.0 || ^2.0.0
-      '@remix-run/server-runtime': ^1.0.0 || ^2.0.0
+  remix-auth-oauth2@1.11.0(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))):
+    dependencies:
+      '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
+      debug: 4.4.1(supports-color@10.0.0)
+      remix-auth: 3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))
+    transitivePeerDependencies:
+      - supports-color
+
+  remix-auth@3.6.0(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4)):
     dependencies:
-      '@remix-run/react': 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+      '@remix-run/react': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
       uuid: 8.3.2
-    dev: false
 
-  /remix-typedjson@0.3.1(@remix-run/react@2.1.0)(@remix-run/server-runtime@2.1.0)(react@18.2.0):
-    resolution: {integrity: sha512-XaLU3slWaUXTWPQe6u5rX4xJuqr665+wk1mRmepFu5Hn4DTP9V0zGOkCqCphCExxZ2Kqg5u+uZbas6AZRaxQzA==}
-    peerDependencies:
-      '@remix-run/react': ^1.16.0 || ^2.0
-      '@remix-run/server-runtime': ^1.16.0 || ^2.0
-      react: ^17.0.2 || ^18.0.0
+  remix-typedjson@0.3.1(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/server-runtime@2.1.0(typescript@5.5.4))(react@18.2.0):
     dependencies:
-      '@remix-run/react': 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+      '@remix-run/react': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@remix-run/server-runtime': 2.1.0(typescript@5.5.4)
       react: 18.2.0
-    dev: false
 
-  /remix-utils@7.7.0(@remix-run/node@2.1.0)(@remix-run/react@2.1.0)(@remix-run/router@1.15.3)(intl-parse-accept-language@1.0.0)(react@18.2.0)(zod@3.23.8):
-    resolution: {integrity: sha512-J8NhP044nrNIam/xOT1L9a4RQ9FSaA2wyrUwmN8ZT+c/+CdAAf70yfaLnvMyKcV5U+8BcURQ/aVbth77sT6jGA==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@remix-run/cloudflare': ^2.0.0
-      '@remix-run/node': ^2.0.0
-      '@remix-run/react': ^2.0.0
-      '@remix-run/router': ^1.7.2
-      crypto-js: ^4.1.1
-      intl-parse-accept-language: ^1.0.0
-      is-ip: ^5.0.1
-      react: ^18.0.0
-      zod: ^3.22.4
-    peerDependenciesMeta:
-      '@remix-run/cloudflare':
-        optional: true
-      '@remix-run/node':
-        optional: true
-      '@remix-run/react':
-        optional: true
-      '@remix-run/router':
-        optional: true
-      crypto-js:
-        optional: true
-      intl-parse-accept-language:
-        optional: true
-      is-ip:
-        optional: true
-      react:
-        optional: true
-      zod:
-        optional: true
+  remix-utils@7.7.0(@remix-run/node@2.1.0(typescript@5.5.4))(@remix-run/react@2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4))(@remix-run/router@1.15.3)(crypto-js@4.2.0)(intl-parse-accept-language@1.0.0)(react@18.2.0)(zod@3.25.76):
     dependencies:
+      type-fest: 4.33.0
+    optionalDependencies:
       '@remix-run/node': 2.1.0(typescript@5.5.4)
-      '@remix-run/react': 2.1.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.5.4)
+      '@remix-run/react': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(typescript@5.5.4)
       '@remix-run/router': 1.15.3
+      crypto-js: 4.2.0
       intl-parse-accept-language: 1.0.0
       react: 18.2.0
-      type-fest: 4.33.0
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /remove-accents@0.5.0:
-    resolution: {integrity: sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==}
-    dev: false
-
-  /replace-string@3.1.0:
-    resolution: {integrity: sha512-yPpxc4ZR2makceA9hy/jHNqc7QVkd4Je/N0WRHm6bs3PtivPuPynxE5ejU/mp5EhnCv8+uZL7vhz8rkluSlx+Q==}
-    engines: {node: '>=8'}
-    dev: true
+  remove-accents@0.5.0: {}
 
-  /replicate@1.0.1:
-    resolution: {integrity: sha512-EY+rK1YR5bKHcM9pd6WyaIbv6m2aRIvHfHDh51j/LahlHTLKemTYXF6ptif2sLa+YospupAsIoxw8Ndt5nI3vg==}
-    engines: {git: '>=2.11.0', node: '>=18.0.0', npm: '>=7.19.0', yarn: '>=1.7.0'}
+  replicate@1.0.1:
     optionalDependencies:
       readable-stream: 4.7.0
-    dev: false
 
-  /request@2.88.2:
-    resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==}
-    engines: {node: '>= 6'}
-    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
+  request@2.88.2:
     dependencies:
       aws-sign2: 0.7.0
       aws4: 1.12.0
@@ -32859,7 +39615,7 @@ packages:
       combined-stream: 1.0.8
       extend: 3.0.2
       forever-agent: 0.6.1
-      form-data: 2.3.3
+      form-data: 2.5.4
       har-validator: 5.1.5
       http-signature: 1.2.0
       is-typedarray: 1.0.0
@@ -32868,216 +39624,110 @@ packages:
       mime-types: 2.1.35
       oauth-sign: 0.9.0
       performance-now: 2.1.0
-      qs: 6.5.3
+      qs: 6.14.1
       safe-buffer: 5.2.1
       tough-cookie: 2.5.0
       tunnel-agent: 0.6.0
       uuid: 3.4.0
-    dev: false
 
-  /require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
+  require-directory@2.1.1: {}
 
-  /require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  require-from-string@2.0.2: {}
 
-  /require-in-the-middle@7.1.1(supports-color@10.0.0):
-    resolution: {integrity: sha512-OScOjQjrrjhAdFpQmnkE/qbIBGCRFhQB/YaJhcC3CPOlmhe7llnW46Ac1J5+EjcNXOTnDdpF96Erw/yedsGksQ==}
-    engines: {node: '>=8.6.0'}
+  require-in-the-middle@7.1.1(supports-color@10.0.0):
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
       - supports-color
 
-  /require-like@0.1.2:
-    resolution: {integrity: sha512-oyrU88skkMtDdauHDuKVrgR+zuItqr6/c//FXzvmxRGMexSDc6hNvJInGW3LL46n+8b50RykrvwSUIIQH2LQ5A==}
-    dev: true
-
-  /require-main-filename@2.0.0:
-    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
-    dev: false
+  require-like@0.1.2: {}
 
-  /requireindex@1.2.0:
-    resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==}
-    engines: {node: '>=0.10.5'}
-    dev: true
+  require-main-filename@2.0.0: {}
 
-  /requires-port@1.0.0:
-    resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-    dev: false
+  requireindex@1.2.0: {}
 
-  /resend@3.2.0:
-    resolution: {integrity: sha512-lDHhexiFYPoLXy7zRlJ8D5eKxoXy6Tr9/elN3+Vv7PkUoYuSSD1fpiIfa/JYXEWyiyN2UczkCTLpkT8dDPJ4Pg==}
-    engines: {node: '>=18'}
+  resend@3.2.0:
     dependencies:
       '@react-email/render': 0.0.12
-    dev: false
 
-  /resize-observer-polyfill@1.5.1:
-    resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
-    dev: false
+  resize-observer-polyfill@1.5.1: {}
 
-  /resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
+  resolve-from@4.0.0: {}
 
-  /resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
+  resolve-from@5.0.0: {}
 
-  /resolve-import@2.0.0:
-    resolution: {integrity: sha512-jpKjLibLuc8D1XEV2+7zb0aqN7I8d12u89g/v6IsgCzdVlccMQJq4TKkPw5fbhHdxhm7nbVtN+KvOTnjFf+nEA==}
-    engines: {node: 20 || >=22}
+  resolve-import@2.0.0:
     dependencies:
       glob: 11.0.0
       walk-up-path: 4.0.0
-    dev: true
 
-  /resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
-    dev: true
-
-  /resolve.exports@2.0.2:
-    resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==}
-    engines: {node: '>=10'}
+  resolve-pkg-maps@1.0.0: {}
 
-  /resolve@1.22.4:
-    resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==}
-    hasBin: true
-    dependencies:
-      is-core-module: 2.13.0
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-    dev: true
+  resolve.exports@2.0.2: {}
 
-  /resolve@1.22.8:
-    resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
-    hasBin: true
+  resolve@1.22.8:
     dependencies:
       is-core-module: 2.14.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
-  /resolve@2.0.0-next.4:
-    resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==}
-    hasBin: true
+  resolve@2.0.0-next.4:
     dependencies:
       is-core-module: 2.14.0
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
-    dev: true
 
-  /responselike@1.0.2:
-    resolution: {integrity: sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==}
+  responselike@1.0.2:
     dependencies:
       lowercase-keys: 1.0.1
-    dev: true
 
-  /restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
+  restore-cursor@3.1.0:
     dependencies:
       onetime: 5.1.2
       signal-exit: 3.0.7
 
-  /ret@0.5.0:
-    resolution: {integrity: sha512-I1XxrZSQ+oErkRR4jYbAyEEu2I0avBvvMM5JN+6EBprOGRCs63ENqZ3vjavq8fBw2+62G5LF5XelKwuJpcvcxw==}
-    engines: {node: '>=10'}
-    dev: true
+  ret@0.1.15: {}
 
-  /retry@0.12.0:
-    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
-    engines: {node: '>= 4'}
+  ret@0.5.0: {}
 
-  /retry@0.13.1:
-    resolution: {integrity: sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==}
-    engines: {node: '>= 4'}
+  retry@0.12.0: {}
 
-  /reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+  retry@0.13.1: {}
 
-  /rfc4648@1.5.3:
-    resolution: {integrity: sha512-MjOWxM065+WswwnmNONOT+bD1nXzY9Km6u3kzvnx8F8/HXGZdz3T6e6vZJ8Q/RIMUSp/nxqjH3GwvJDy8ijeQQ==}
-    dev: false
+  reusify@1.0.4: {}
 
-  /rfdc@1.4.1:
-    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
-    dev: true
+  rfc4648@1.5.3: {}
 
-  /rimraf@3.0.2:
-    resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
-    deprecated: Rimraf versions prior to v4 are no longer supported
-    hasBin: true
+  rfdc@1.4.1: {}
+
+  rimraf@3.0.2:
     dependencies:
       glob: 7.2.3
 
-  /rimraf@5.0.7:
-    resolution: {integrity: sha512-nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==}
-    engines: {node: '>=14.18'}
-    hasBin: true
+  rimraf@4.4.1:
+    dependencies:
+      glob: 9.3.5
+
+  rimraf@5.0.7:
     dependencies:
       glob: 10.3.10
 
-  /rimraf@6.0.1:
-    resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
-    engines: {node: 20 || >=22}
-    hasBin: true
+  rimraf@6.0.1:
     dependencies:
       glob: 11.0.0
       package-json-from-dist: 1.0.0
-    dev: true
-
-  /robot3@0.4.1:
-    resolution: {integrity: sha512-hzjy826lrxzx8eRgv80idkf8ua1JAepRc9Efdtj03N3KNJuznQCPlyCJ7gnUmDFwZCLQjxy567mQVKmdv2BsXQ==}
-    dev: false
-
-  /rollup-plugin-inject@3.0.2:
-    resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==}
-    deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject.
-    dependencies:
-      estree-walker: 0.6.1
-      magic-string: 0.25.9
-      rollup-pluginutils: 2.8.2
-    dev: false
-
-  /rollup-plugin-node-polyfills@0.2.1:
-    resolution: {integrity: sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==}
-    dependencies:
-      rollup-plugin-inject: 3.0.2
-    dev: false
 
-  /rollup-pluginutils@2.8.2:
-    resolution: {integrity: sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==}
-    dependencies:
-      estree-walker: 0.6.1
-    dev: false
+  robot3@0.4.1: {}
 
-  /rollup@3.10.0:
-    resolution: {integrity: sha512-JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
+  robust-predicates@3.0.2: {}
 
-  /rollup@3.29.1:
-    resolution: {integrity: sha512-c+ebvQz0VIH4KhhCpDsI+Bik0eT8ZFEVZEYw0cGMVqIP8zc+gnwl7iXCamTw7vzv2MeuZFZfdx5JJIq+ehzDlg==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
+  rollup@3.29.1:
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /rollup@4.36.0:
-    resolution: {integrity: sha512-zwATAXNQxUcd40zgtQG0ZafcRK4g004WtEl7kbuhTWPvf07PsfohXl39jVUvPF7jvNAIkKPQ2XrsDlWuxBd++Q==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
+  rollup@4.36.0:
     dependencies:
       '@types/estree': 1.0.6
     optionalDependencies:
@@ -33101,210 +39751,131 @@ packages:
       '@rollup/rollup-win32-ia32-msvc': 4.36.0
       '@rollup/rollup-win32-x64-msvc': 4.36.0
       fsevents: 2.3.3
-    dev: true
 
-  /router@2.1.0:
-    resolution: {integrity: sha512-/m/NSLxeYEgWNtyC+WtNHCF7jbGxOibVWKnn+1Psff4dJGOfoXP+MuC/f2CwSmyiHdOIzYnYFp4W6GxWfekaLA==}
-    engines: {node: '>= 18'}
+  roughjs@4.6.6:
+    dependencies:
+      hachure-fill: 0.5.2
+      path-data-parser: 0.1.0
+      points-on-curve: 0.2.0
+      points-on-path: 0.2.1
+
+  router@2.1.0:
     dependencies:
       is-promise: 4.0.0
       parseurl: 1.3.3
       path-to-regexp: 8.2.0
-    dev: false
 
-  /rtl-css-js@1.16.1:
-    resolution: {integrity: sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==}
+  router@2.2.0:
     dependencies:
-      '@babel/runtime': 7.27.4
-    dev: false
+      debug: 4.4.1(supports-color@10.0.0)
+      depd: 2.0.0
+      is-promise: 4.0.0
+      parseurl: 1.3.3
+      path-to-regexp: 8.2.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /run-applescript@7.0.0:
-    resolution: {integrity: sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==}
-    engines: {node: '>=18'}
-    dev: false
+  rtl-css-js@1.16.1:
+    dependencies:
+      '@babel/runtime': 7.27.0
 
-  /run-async@3.0.0:
-    resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==}
-    engines: {node: '>=0.12.0'}
-    dev: false
+  run-applescript@7.0.0: {}
 
-  /run-exclusive@2.2.18:
-    resolution: {integrity: sha512-TXr1Gkl1iEAOCCpBTRm/2m0+1KGjORcWpZZ+VGGTe7dYX8E4y8/fMvrHk0zf+kclec2R//tpvdBxgG0bDgaJfw==}
+  run-exclusive@2.2.18:
     dependencies:
       minimal-polyfills: 2.2.3
-    dev: false
 
-  /run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+  run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
 
-  /runtypes@6.7.0:
-    resolution: {integrity: sha512-3TLdfFX8YHNFOhwHrSJza6uxVBmBrEjnNQlNXvXCdItS0Pdskfg5vVXUTWIN+Y23QR09jWpSl99UHkA83m4uWA==}
-    dev: false
+  runtypes@6.7.0: {}
 
-  /rxjs@7.8.2:
-    resolution: {integrity: sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==}
-    requiresBuild: true
+  rw@1.3.3: {}
+
+  rxjs@7.8.2:
     dependencies:
       tslib: 2.8.1
-    dev: true
     optional: true
 
-  /sade@1.8.1:
-    resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
-    engines: {node: '>=6'}
+  sade@1.8.1:
     dependencies:
       mri: 1.2.0
-    dev: true
 
-  /safe-array-concat@1.1.2:
-    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
-    engines: {node: '>=0.4'}
+  safe-array-concat@1.1.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       get-intrinsic: 1.3.0
       has-symbols: 1.1.0
       isarray: 2.0.5
-    dev: true
 
-  /safe-buffer@5.1.2:
-    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+  safe-buffer@5.1.2: {}
 
-  /safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+  safe-buffer@5.2.1: {}
 
-  /safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
+  safe-regex-test@1.0.0:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       get-intrinsic: 1.3.0
       is-regex: 1.1.4
 
-  /safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
-    engines: {node: '>= 0.4'}
+  safe-regex-test@1.0.3:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       es-errors: 1.3.0
       is-regex: 1.1.4
-    dev: true
 
-  /safe-regex2@5.0.0:
-    resolution: {integrity: sha512-YwJwe5a51WlK7KbOJREPdjNrpViQBI3p4T50lfwPuDhZnE3XGVTlGvi+aolc5+RvxDD6bnUmjVsU9n1eboLUYw==}
+  safe-regex2@5.0.0:
     dependencies:
       ret: 0.5.0
-    dev: true
 
-  /safe-stable-stringify@2.5.0:
-    resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
-    engines: {node: '>=10'}
-    dev: true
+  safe-stable-stringify@2.5.0: {}
 
-  /safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-    requiresBuild: true
+  safer-buffer@2.1.2: {}
 
-  /scheduler@0.23.0:
-    resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
+  scheduler@0.23.0:
     dependencies:
       loose-envify: 1.4.0
 
-  /scheduler@0.23.2:
-    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
-    dependencies:
-      loose-envify: 1.4.0
-    dev: false
+  scheduler@0.25.0: {}
 
-  /scheduler@0.25.0:
-    resolution: {integrity: sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==}
-    dev: false
+  scheduler@0.25.0-rc.1: {}
 
-  /scheduler@0.25.0-rc.1:
-    resolution: {integrity: sha512-fVinv2lXqYpKConAMdergOl5owd0rY1O4P/QTe0aWKCqGtu7VsCt1iqQFxSJtqK4Lci/upVSBpGwVC7eWcuS9Q==}
-    dev: false
+  scheduler@0.26.0: {}
 
-  /schema-utils@3.3.0:
-    resolution: {integrity: sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==}
-    engines: {node: '>= 10.13.0'}
+  schema-utils@3.3.0:
     dependencies:
-      '@types/json-schema': 7.0.13
+      '@types/json-schema': 7.0.15
       ajv: 6.12.6
       ajv-keywords: 3.5.2(ajv@6.12.6)
-    dev: false
 
-  /schema-utils@4.3.2:
-    resolution: {integrity: sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==}
-    engines: {node: '>= 10.13.0'}
+  schema-utils@4.3.3:
     dependencies:
       '@types/json-schema': 7.0.15
       ajv: 8.17.1
       ajv-formats: 2.1.1(ajv@8.17.1)
       ajv-keywords: 5.1.0(ajv@8.17.1)
-    dev: true
 
-  /screenfull@5.2.0:
-    resolution: {integrity: sha512-9BakfsO2aUQN2K9Fdbj87RJIEZ82Q9IGim7FqM5OsebfoFC6ZHXgDq/KvniuLTPdeM8wY2o6Dj3WQ7KeQCj3cA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  screenfull@5.2.0: {}
 
-  /secure-json-parse@2.7.0:
-    resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
+  secure-json-parse@2.7.0: {}
 
-  /secure-json-parse@4.0.0:
-    resolution: {integrity: sha512-dxtLJO6sc35jWidmLxo7ij+Eg48PM/kleBsxpC8QJE0qJICe+KawkDQmvCMZUr9u7WKVHgMW6vy3fQ7zMiFZMA==}
-    dev: true
+  secure-json-parse@4.0.0: {}
 
-  /seedrandom@3.0.5:
-    resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
-    dev: false
+  seedrandom@3.0.5: {}
 
-  /selderee@0.11.0:
-    resolution: {integrity: sha512-5TF+l7p4+OsnP8BCCvSyZiSPc4x4//p5uPwK8TCnVPJYRmU2aYKMpOXvw8zM5a5JvuuCGN1jmsMwuU2W02ukfA==}
+  selderee@0.11.0:
     dependencies:
       parseley: 0.12.1
-    dev: false
 
-  /selfsigned@2.4.1:
-    resolution: {integrity: sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==}
-    engines: {node: '>=10'}
-    dependencies:
-      '@types/node-forge': 1.3.10
-      node-forge: 1.3.1
-    dev: false
-
-  /sembear@0.5.2:
-    resolution: {integrity: sha512-Ij1vCAdFgWABd7zTg50Xw1/p0JgESNxuLlneEAsmBrKishA06ulTTL/SHGmNy2Zud7+rKrHTKNI6moJsn1ppAQ==}
+  sembear@0.5.2:
     dependencies:
       '@types/semver': 6.2.3
-      semver: 6.3.1
-    dev: true
-
-  /semver-compare@1.0.0:
-    resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==}
-    dev: false
-
-  /semver@5.7.1:
-    resolution: {integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==}
-    hasBin: true
-
-  /semver@6.3.1:
-    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
-    hasBin: true
-
-  /semver@7.6.3:
-    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
-    engines: {node: '>=10'}
-    hasBin: true
+      semver: 5.7.2
 
-  /semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
-    engines: {node: '>=10'}
-    hasBin: true
+  semver@5.7.2: {}
 
-  /send@0.18.0:
-    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
-    engines: {node: '>= 0.8.0'}
+  send@0.18.0:
     dependencies:
       debug: 2.6.9
       depd: 2.0.0
@@ -33322,9 +39893,7 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /send@0.19.0:
-    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
-    engines: {node: '>= 0.8.0'}
+  send@0.19.0:
     dependencies:
       debug: 2.6.9
       depd: 2.0.0
@@ -33334,7 +39903,24 @@ packages:
       etag: 1.8.1
       fresh: 0.5.2
       http-errors: 2.0.0
-      mime: 1.6.0
+      mime: 1.6.0
+      ms: 2.1.3
+      on-finished: 2.4.1
+      range-parser: 1.2.1
+      statuses: 2.0.1
+    transitivePeerDependencies:
+      - supports-color
+
+  send@1.1.0(supports-color@10.0.0):
+    dependencies:
+      debug: 4.4.1(supports-color@10.0.0)
+      destroy: 1.2.0
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      etag: 1.8.1
+      fresh: 0.5.2
+      http-errors: 2.0.0
+      mime-types: 2.1.35
       ms: 2.1.3
       on-finished: 2.4.1
       range-parser: 1.2.1
@@ -33342,41 +39928,31 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /send@1.1.0(supports-color@10.0.0):
-    resolution: {integrity: sha512-v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==}
-    engines: {node: '>= 18'}
+  send@1.2.1:
     dependencies:
-      debug: 4.4.0(supports-color@10.0.0)
-      destroy: 1.2.0
+      debug: 4.4.3
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      fresh: 0.5.2
-      http-errors: 2.0.0
-      mime-types: 2.1.35
+      fresh: 2.0.0
+      http-errors: 2.0.1
+      mime-types: 3.0.2
       ms: 2.1.3
       on-finished: 2.4.1
       range-parser: 1.2.1
-      statuses: 2.0.1
+      statuses: 2.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /serialize-javascript@6.0.1:
-    resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
+  serialize-javascript@6.0.1:
     dependencies:
       randombytes: 2.1.0
-    dev: false
 
-  /serialize-javascript@6.0.2:
-    resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
+  serialize-javascript@6.0.2:
     dependencies:
       randombytes: 2.1.0
-    dev: true
 
-  /serve-static@1.16.0:
-    resolution: {integrity: sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==}
-    engines: {node: '>= 0.8.0'}
+  serve-static@1.16.0:
     dependencies:
       encodeurl: 1.0.2
       escape-html: 1.0.3
@@ -33385,9 +39961,7 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /serve-static@2.1.0(supports-color@10.0.0):
-    resolution: {integrity: sha512-A3We5UfEjG8Z7VkDv6uItWw6HY2bBSBJT1KtVESn6EOoOr2jAxNhxWCLY3jDE2WcuHXByWju74ck3ZgLwL8xmA==}
-    engines: {node: '>= 18'}
+  serve-static@2.1.0(supports-color@10.0.0):
     dependencies:
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -33395,22 +39969,21 @@ packages:
       send: 1.1.0(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /server-only@0.0.1:
-    resolution: {integrity: sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA==}
-    dev: false
+  serve-static@2.2.1:
+    dependencies:
+      encodeurl: 2.0.0
+      escape-html: 1.0.3
+      parseurl: 1.3.3
+      send: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
 
-  /set-blocking@2.0.0:
-    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
-    dev: false
+  set-blocking@2.0.0: {}
 
-  /set-cookie-parser@2.6.0:
-    resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
+  set-cookie-parser@2.6.0: {}
 
-  /set-function-length@1.2.2:
-    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
-    engines: {node: '>= 0.4'}
+  set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
       es-errors: 1.3.0
@@ -33419,40 +39992,22 @@ packages:
       gopd: 1.2.0
       has-property-descriptors: 1.0.2
 
-  /set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
-    engines: {node: '>= 0.4'}
+  set-function-name@2.0.2:
     dependencies:
       define-data-property: 1.1.4
       es-errors: 1.3.0
       functions-have-names: 1.2.3
       has-property-descriptors: 1.0.2
-    dev: true
-
-  /set-harmonic-interval@1.0.1:
-    resolution: {integrity: sha512-AhICkFV84tBP1aWqPwLZqFvAwqEoVA9kxNMniGEUvzOlm4vLmOFLiTT3UZ6bziJTy4bOVpzWGTfSCbmaayGx8g==}
-    engines: {node: '>=6.9'}
-    dev: false
 
-  /setprototypeof@1.2.0:
-    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+  set-harmonic-interval@1.0.1: {}
 
-  /sha.js@2.4.11:
-    resolution: {integrity: sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==}
-    hasBin: true
-    dependencies:
-      inherits: 2.0.4
-      safe-buffer: 5.2.1
-    dev: false
+  setprototypeof@1.2.0: {}
 
-  /sharp@0.33.5:
-    resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    requiresBuild: true
+  sharp@0.33.5:
     dependencies:
       color: 4.2.3
-      detect-libc: 2.0.3
-      semver: 7.6.3
+      detect-libc: 2.1.2
+      semver: 5.7.2
     optionalDependencies:
       '@img/sharp-darwin-arm64': 0.33.5
       '@img/sharp-darwin-x64': 0.33.5
@@ -33473,97 +40028,80 @@ packages:
       '@img/sharp-wasm32': 0.33.5
       '@img/sharp-win32-ia32': 0.33.5
       '@img/sharp-win32-x64': 0.33.5
-    dev: false
     optional: true
 
-  /sharp@0.34.2:
-    resolution: {integrity: sha512-lszvBmB9QURERtyKT2bNmsgxXK0ShJrL/fvqlonCo7e6xBF8nT8xU6pW+PMIbLsz0RxQk3rgH9kd8UmvOzlMJg==}
-    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
-    requiresBuild: true
+  sharp@0.34.5:
     dependencies:
-      color: 4.2.3
-      detect-libc: 2.0.4
-      semver: 7.7.2
-    optionalDependencies:
-      '@img/sharp-darwin-arm64': 0.34.2
-      '@img/sharp-darwin-x64': 0.34.2
-      '@img/sharp-libvips-darwin-arm64': 1.1.0
-      '@img/sharp-libvips-darwin-x64': 1.1.0
-      '@img/sharp-libvips-linux-arm': 1.1.0
-      '@img/sharp-libvips-linux-arm64': 1.1.0
-      '@img/sharp-libvips-linux-ppc64': 1.1.0
-      '@img/sharp-libvips-linux-s390x': 1.1.0
-      '@img/sharp-libvips-linux-x64': 1.1.0
-      '@img/sharp-libvips-linuxmusl-arm64': 1.1.0
-      '@img/sharp-libvips-linuxmusl-x64': 1.1.0
-      '@img/sharp-linux-arm': 0.34.2
-      '@img/sharp-linux-arm64': 0.34.2
-      '@img/sharp-linux-s390x': 0.34.2
-      '@img/sharp-linux-x64': 0.34.2
-      '@img/sharp-linuxmusl-arm64': 0.34.2
-      '@img/sharp-linuxmusl-x64': 0.34.2
-      '@img/sharp-wasm32': 0.34.2
-      '@img/sharp-win32-arm64': 0.34.2
-      '@img/sharp-win32-ia32': 0.34.2
-      '@img/sharp-win32-x64': 0.34.2
-    dev: false
-
-  /shebang-command@1.2.0:
-    resolution: {integrity: sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      shebang-regex: 1.0.0
-
-  /shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
+      '@img/colour': 1.0.0
+      detect-libc: 2.1.2
+      semver: 5.7.2
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.34.5
+      '@img/sharp-darwin-x64': 0.34.5
+      '@img/sharp-libvips-darwin-arm64': 1.2.4
+      '@img/sharp-libvips-darwin-x64': 1.2.4
+      '@img/sharp-libvips-linux-arm': 1.2.4
+      '@img/sharp-libvips-linux-arm64': 1.2.4
+      '@img/sharp-libvips-linux-ppc64': 1.2.4
+      '@img/sharp-libvips-linux-riscv64': 1.2.4
+      '@img/sharp-libvips-linux-s390x': 1.2.4
+      '@img/sharp-libvips-linux-x64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.2.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.2.4
+      '@img/sharp-linux-arm': 0.34.5
+      '@img/sharp-linux-arm64': 0.34.5
+      '@img/sharp-linux-ppc64': 0.34.5
+      '@img/sharp-linux-riscv64': 0.34.5
+      '@img/sharp-linux-s390x': 0.34.5
+      '@img/sharp-linux-x64': 0.34.5
+      '@img/sharp-linuxmusl-arm64': 0.34.5
+      '@img/sharp-linuxmusl-x64': 0.34.5
+      '@img/sharp-wasm32': 0.34.5
+      '@img/sharp-win32-arm64': 0.34.5
+      '@img/sharp-win32-ia32': 0.34.5
+      '@img/sharp-win32-x64': 0.34.5
+    optional: true
+
+  shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
 
-  /shebang-regex@1.0.0:
-    resolution: {integrity: sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==}
-    engines: {node: '>=0.10.0'}
-
-  /shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
+  shebang-regex@3.0.0: {}
 
-  /shell-quote@1.8.1:
-    resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==}
-    dev: true
+  shell-quote@1.8.1: {}
 
-  /shelljs@0.8.5:
-    resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==}
-    engines: {node: '>=4'}
-    hasBin: true
+  shelljs@0.8.5:
     dependencies:
       glob: 7.2.3
       interpret: 1.4.0
       rechoir: 0.6.2
-    dev: false
 
-  /shimmer@1.2.1:
-    resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+  shiki@3.13.0:
+    dependencies:
+      '@shikijs/core': 3.13.0
+      '@shikijs/engine-javascript': 3.13.0
+      '@shikijs/engine-oniguruma': 3.13.0
+      '@shikijs/langs': 3.13.0
+      '@shikijs/themes': 3.13.0
+      '@shikijs/types': 3.13.0
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
 
-  /side-channel-list@1.0.0:
-    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
-    engines: {node: '>= 0.4'}
+  shimmer@1.2.1: {}
+
+  side-channel-list@1.0.0:
     dependencies:
       es-errors: 1.3.0
       object-inspect: 1.13.4
 
-  /side-channel-map@1.0.1:
-    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
-    engines: {node: '>= 0.4'}
+  side-channel-map@1.0.1:
     dependencies:
       call-bound: 1.0.4
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
       object-inspect: 1.13.4
 
-  /side-channel-weakmap@1.0.2:
-    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
-    engines: {node: '>= 0.4'}
+  side-channel-weakmap@1.0.2:
     dependencies:
       call-bound: 1.0.4
       es-errors: 1.3.0
@@ -33571,9 +40109,7 @@ packages:
       object-inspect: 1.13.4
       side-channel-map: 1.0.1
 
-  /side-channel@1.1.0:
-    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
-    engines: {node: '>= 0.4'}
+  side-channel@1.1.0:
     dependencies:
       es-errors: 1.3.0
       object-inspect: 1.13.4
@@ -33581,29 +40117,21 @@ packages:
       side-channel-map: 1.0.1
       side-channel-weakmap: 1.0.2
 
-  /siginfo@2.0.0:
-    resolution: {integrity: sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==}
-    dev: true
+  siginfo@2.0.0: {}
 
-  /signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+  signal-exit@3.0.7: {}
 
-  /signal-exit@4.1.0:
-    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
-    engines: {node: '>=14'}
+  signal-exit@4.1.0: {}
 
-  /simple-concat@1.0.1:
-    resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+  simple-concat@1.0.1: {}
 
-  /simple-get@4.0.1:
-    resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+  simple-get@4.0.1:
     dependencies:
       decompress-response: 6.0.0
       once: 1.4.0
       simple-concat: 1.0.1
 
-  /simple-oauth2@5.0.0:
-    resolution: {integrity: sha512-8291lo/z5ZdpmiOFzOs1kF3cxn22bMj5FFH+DNUppLJrpoIlM1QnFiE7KpshHu3J3i21TVcx4yW+gXYjdCKDLQ==}
+  simple-oauth2@5.0.0:
     dependencies:
       '@hapi/hoek': 10.0.1
       '@hapi/wreck': 18.0.1
@@ -33611,79 +40139,40 @@ packages:
       joi: 17.7.0
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /simple-swizzle@0.2.2:
-    resolution: {integrity: sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==}
-    requiresBuild: true
+  simple-swizzle@0.2.2:
     dependencies:
       is-arrayish: 0.3.2
-    dev: false
 
-  /simplur@3.0.1:
-    resolution: {integrity: sha512-bBAoTn75tuKh83opmZ1VoyVoQIsvLCKzSxuasAxbnKofrT8eGyOEIaXSuNfhi/hI160+fwsR7ObcbBpOyzDvXg==}
-    dev: false
+  simplur@3.0.1: {}
 
-  /sirv@2.0.4:
-    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
-    engines: {node: '>= 10'}
+  sirv@2.0.4:
     dependencies:
       '@polka/url': 1.0.0-next.28
       mrmime: 2.0.0
       totalist: 3.0.1
-    dev: true
 
-  /sisteransi@1.0.5:
-    resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+  sisteransi@1.0.5: {}
 
-  /skin-tone@2.0.0:
-    resolution: {integrity: sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==}
-    engines: {node: '>=8'}
+  skin-tone@2.0.0:
     dependencies:
       unicode-emoji-modifier-base: 1.0.0
-    dev: true
-
-  /slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
 
-  /slash@4.0.0:
-    resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
-    engines: {node: '>=12'}
-    dev: true
+  slash@3.0.0: {}
 
-  /slice-ansi@3.0.0:
-    resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-    dev: true
+  slash@4.0.0: {}
 
-  /slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
+  slice-ansi@4.0.0:
     dependencies:
       ansi-styles: 4.3.0
       astral-regex: 2.0.0
       is-fullwidth-code-point: 3.0.0
-    dev: true
 
-  /slug@6.1.0:
-    resolution: {integrity: sha512-x6vLHCMasg4DR2LPiyFGI0gJJhywY6DTiGhCrOMzb3SOk/0JVLIaL4UhyFSHu04SD3uAavrKY/K3zZ3i6iRcgA==}
-    dev: false
+  slug@6.1.0: {}
 
-  /smart-buffer@4.2.0:
-    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
-    requiresBuild: true
-    dev: false
+  smart-buffer@4.2.0: {}
 
-  /smartwrap@2.0.2:
-    resolution: {integrity: sha512-vCsKNQxb7PnCNd2wY1WClWifAc2lwqsG8OaswpJkVJsvMGcnEntdTCDajZCkk93Ay1U3t/9puJmb525Rg5MZBA==}
-    engines: {node: '>=6'}
-    hasBin: true
+  smartwrap@2.0.2:
     dependencies:
       array.prototype.flat: 1.3.1
       breakword: 1.0.5
@@ -33691,305 +40180,178 @@ packages:
       strip-ansi: 6.0.1
       wcwidth: 1.0.1
       yargs: 15.4.1
-    dev: false
 
-  /socket.io-adapter@2.5.4:
-    resolution: {integrity: sha512-wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==}
+  socket.io-adapter@2.5.4(bufferutil@4.0.9):
     dependencies:
       debug: 4.3.7(supports-color@10.0.0)
-      ws: 8.11.0
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
 
-  /socket.io-client@4.7.3:
-    resolution: {integrity: sha512-nU+ywttCyBitXIl9Xe0RSEfek4LneYkJxCeNnKCuhwoH4jGXO1ipIUw/VA/+Vvv2G1MTym11fzFC0SxkrcfXDw==}
-    engines: {node: '>=10.0.0'}
+  socket.io-client@4.7.3:
     dependencies:
       '@socket.io/component-emitter': 3.1.0
       debug: 4.3.7(supports-color@10.0.0)
-      engine.io-client: 6.5.3(supports-color@10.0.0)
+      engine.io-client: 6.5.3(bufferutil@4.0.9)(supports-color@10.0.0)
       socket.io-parser: 4.2.4(supports-color@10.0.0)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
 
-  /socket.io-client@4.7.5(supports-color@10.0.0):
-    resolution: {integrity: sha512-sJ/tqHOCe7Z50JCBCXrsY3I2k03iOiUe+tj1OmKeD2lXPiGH/RUCdTZFoqVyN7l1MnpIzPrGtLcijffmeouNlQ==}
-    engines: {node: '>=10.0.0'}
+  socket.io-client@4.7.5(bufferutil@4.0.9)(supports-color@10.0.0):
     dependencies:
       '@socket.io/component-emitter': 3.1.0
       debug: 4.3.7(supports-color@10.0.0)
-      engine.io-client: 6.5.3(supports-color@10.0.0)
+      engine.io-client: 6.5.3(bufferutil@4.0.9)(supports-color@10.0.0)
       socket.io-parser: 4.2.4(supports-color@10.0.0)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
 
-  /socket.io-parser@4.2.4(supports-color@10.0.0):
-    resolution: {integrity: sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==}
-    engines: {node: '>=10.0.0'}
+  socket.io-parser@4.2.4(supports-color@10.0.0):
     dependencies:
       '@socket.io/component-emitter': 3.1.0
       debug: 4.3.7(supports-color@10.0.0)
     transitivePeerDependencies:
       - supports-color
-    dev: false
-
-  /socket.io@4.7.3:
-    resolution: {integrity: sha512-SE+UIQXBQE+GPG2oszWMlsEmWtHVqw/h1VrYJGK5/MC7CH5p58N448HwIrtREcvR4jfdOJAY4ieQfxMr55qbbw==}
-    engines: {node: '>=10.2.0'}
-    dependencies:
-      accepts: 1.3.8
-      base64id: 2.0.0
-      cors: 2.8.5
-      debug: 4.3.7(supports-color@10.0.0)
-      engine.io: 6.5.4
-      socket.io-adapter: 2.5.4
-      socket.io-parser: 4.2.4(supports-color@10.0.0)
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: false
 
-  /socket.io@4.7.4:
-    resolution: {integrity: sha512-DcotgfP1Zg9iP/dH9zvAQcWrE0TtbMVwXmlV4T4mqsvY+gw+LqUGPfx2AoVyRk0FLME+GQhufDMyacFmw7ksqw==}
-    engines: {node: '>=10.2.0'}
+  socket.io@4.7.3:
     dependencies:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
       debug: 4.3.7(supports-color@10.0.0)
-      engine.io: 6.5.4
-      socket.io-adapter: 2.5.4
+      engine.io: 6.5.4(bufferutil@4.0.9)
+      socket.io-adapter: 2.5.4(bufferutil@4.0.9)
       socket.io-parser: 4.2.4(supports-color@10.0.0)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
 
-  /socket.io@4.7.5:
-    resolution: {integrity: sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==}
-    engines: {node: '>=10.2.0'}
+  socket.io@4.7.4(bufferutil@4.0.9):
     dependencies:
       accepts: 1.3.8
       base64id: 2.0.0
       cors: 2.8.5
       debug: 4.3.7(supports-color@10.0.0)
-      engine.io: 6.5.4
-      socket.io-adapter: 2.5.4
+      engine.io: 6.5.4(bufferutil@4.0.9)
+      socket.io-adapter: 2.5.4(bufferutil@4.0.9)
       socket.io-parser: 4.2.4(supports-color@10.0.0)
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
-    dev: false
-
-  /socks-proxy-agent@6.2.1:
-    resolution: {integrity: sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==}
-    engines: {node: '>= 10'}
-    requiresBuild: true
-    dependencies:
-      agent-base: 6.0.2
-      debug: 4.4.0(supports-color@10.0.0)
-      socks: 2.8.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-    optional: true
 
-  /socks-proxy-agent@8.0.4:
-    resolution: {integrity: sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==}
-    engines: {node: '>= 14'}
+  socks-proxy-agent@8.0.5:
     dependencies:
-      agent-base: 7.1.1
-      debug: 4.4.0(supports-color@10.0.0)
+      agent-base: 7.1.4
+      debug: 4.4.1(supports-color@10.0.0)
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /socks@2.8.3:
-    resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==}
-    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
+  socks@2.8.3:
     dependencies:
       ip-address: 9.0.5
       smart-buffer: 4.2.0
-    dev: false
 
-  /sonic-boom@4.2.0:
-    resolution: {integrity: sha512-INb7TM37/mAcsGmc9hyyI6+QR3rR1zVRu36B0NeGXKnOOLiZOfER5SA+N7X7k3yUYRzLWafduTDvJAfDswwEww==}
+  sonic-boom@4.2.0:
     dependencies:
       atomic-sleep: 1.0.0
-    dev: true
 
-  /sonner@1.0.3(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-hBoA2zKuYW3lUnpx4K0vAn8j77YuYiwvP9sLQfieNS2pd5FkT20sMyPTDJnl9S+5T27ZJbwQRPiujwvDBwhZQg==}
-    peerDependencies:
-      react: ^18.0.0
-      react-dom: ^18.0.0
+  sonner@1.0.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-    dev: false
 
-  /sonner@1.3.1(react-dom@18.2.0)(react@18.3.1):
-    resolution: {integrity: sha512-+rOAO56b2eI3q5BtgljERSn2umRk63KFIvgb2ohbZ5X+Eb5u+a/7/0ZgswYqgBMg8dyl7n6OXd9KasA8QF9ToA==}
-    peerDependencies:
-      react: ^18.0.0
-      react-dom: ^18.0.0
+  sonner@1.3.1(react-dom@18.2.0(react@18.3.1))(react@18.3.1):
     dependencies:
       react: 18.3.1
       react-dom: 18.2.0(react@18.3.1)
-    dev: false
 
-  /source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  source-map-js@1.0.2: {}
 
-  /source-map-js@1.2.0:
-    resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
-    engines: {node: '>=0.10.0'}
+  source-map-js@1.2.0: {}
 
-  /source-map-js@1.2.1:
-    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
-    engines: {node: '>=0.10.0'}
+  source-map-js@1.2.1: {}
 
-  /source-map-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+  source-map-support@0.5.21:
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
 
-  /source-map@0.5.6:
-    resolution: {integrity: sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
+  source-map@0.5.6: {}
 
-  /source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
+  source-map@0.6.1: {}
 
-  /source-map@0.7.4:
-    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
-    engines: {node: '>= 8'}
+  source-map@0.7.4: {}
 
-  /source-map@0.8.0-beta.0:
-    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
-    engines: {node: '>= 8'}
+  source-map@0.8.0-beta.0:
     dependencies:
       whatwg-url: 7.1.0
-    dev: true
-
-  /sourcemap-codec@1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    deprecated: Please use @jridgewell/sourcemap-codec instead
-    dev: false
 
-  /space-separated-tokens@2.0.2:
-    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
+  space-separated-tokens@2.0.2: {}
 
-  /spawndamnit@2.0.0:
-    resolution: {integrity: sha512-j4JKEcncSjFlqIwU5L/rp2N5SIPsdxaRsIv678+TZxZ0SRDJTm8JrxJMjE/XuiEZNEir3S8l0Fa3Ke339WI4qA==}
+  spawndamnit@2.0.0:
     dependencies:
-      cross-spawn: 5.1.0
+      cross-spawn: 7.0.5
       signal-exit: 3.0.7
 
-  /spdx-correct@3.1.1:
-    resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==}
+  spdx-correct@3.1.1:
     dependencies:
       spdx-expression-parse: 3.0.1
       spdx-license-ids: 3.0.12
 
-  /spdx-exceptions@2.3.0:
-    resolution: {integrity: sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==}
+  spdx-exceptions@2.3.0: {}
 
-  /spdx-expression-parse@3.0.1:
-    resolution: {integrity: sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==}
+  spdx-expression-parse@3.0.1:
     dependencies:
       spdx-exceptions: 2.3.0
       spdx-license-ids: 3.0.12
 
-  /spdx-license-ids@3.0.12:
-    resolution: {integrity: sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==}
+  spdx-license-ids@3.0.12: {}
 
-  /split-ca@1.0.1:
-    resolution: {integrity: sha512-Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==}
+  split-ca@1.0.1: {}
 
-  /split2@4.2.0:
-    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
-    engines: {node: '>= 10.x'}
+  split2@4.2.0: {}
 
-  /sprintf-js@1.0.3:
-    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+  sprintf-js@1.0.3: {}
 
-  /sprintf-js@1.1.3:
-    resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
-    requiresBuild: true
-    dev: false
+  sprintf-js@1.1.3: {}
 
-  /sqids@0.3.0:
-    resolution: {integrity: sha512-lOQK1ucVg+W6n3FhRwwSeUijxe93b51Bfz5PMRMihVf1iVkl82ePQG7V5vwrhzB11v0NtsR25PSZRGiSomJaJw==}
-    dev: false
+  sqids@0.3.0: {}
 
-  /sqlite3@5.1.7:
-    resolution: {integrity: sha512-GGIyOiFaG+TUra3JIfkI/zGP8yZYLPQ0pl1bH+ODjiX57sPhrLU5sQJn1y9bDKZUFYkX1crlrPfSYt0BKKdkog==}
-    requiresBuild: true
+  sql-formatter@15.6.12:
     dependencies:
-      bindings: 1.5.0
-      node-addon-api: 7.1.1
-      prebuild-install: 7.1.3
-      tar: 6.2.1
-    optionalDependencies:
-      node-gyp: 8.4.1
-    transitivePeerDependencies:
-      - bluebird
-      - supports-color
-    dev: false
+      argparse: 2.0.1
+      nearley: 2.20.1
 
-  /sqs-consumer@7.5.0(@aws-sdk/client-sqs@3.454.0):
-    resolution: {integrity: sha512-aY3akgMjuK1aj4E7ZVAURUUnC8aNgUBES+b4SN+6ccMmJhi37MamWl7g1JbPow8sjIp1fBPz1bXCCDJmtjOTAg==}
-    engines: {node: '>=18.0.0'}
-    peerDependencies:
-      '@aws-sdk/client-sqs': ^3.428.0
+  sqs-consumer@7.5.0(@aws-sdk/client-sqs@3.454.0):
     dependencies:
       '@aws-sdk/client-sqs': 3.454.0
       debug: 4.3.4
     transitivePeerDependencies:
       - supports-color
-    dev: false
 
-  /ssh-remote-port-forward@1.0.4:
-    resolution: {integrity: sha512-x0LV1eVDwjf1gmG7TTnfqIzf+3VPRz7vrNIjX6oYLbeCrf/PeVY6hkT68Mg+q02qXxQhrLjB0jfgvhevoCRmLQ==}
+  ssh-remote-port-forward@1.0.4:
     dependencies:
       '@types/ssh2': 0.5.52
       ssh2: 1.16.0
-    dev: true
 
-  /ssh2@1.16.0:
-    resolution: {integrity: sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==}
-    engines: {node: '>=10.16.0'}
-    requiresBuild: true
+  ssh2@1.16.0:
     dependencies:
       asn1: 0.2.6
       bcrypt-pbkdf: 1.0.2
     optionalDependencies:
       cpu-features: 0.0.10
-      nan: 2.22.2
+      nan: 2.23.1
 
-  /sshpk@1.18.0:
-    resolution: {integrity: sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  sshpk@1.18.0:
     dependencies:
       asn1: 0.2.6
       assert-plus: 1.0.0
@@ -34000,395 +40362,255 @@ packages:
       jsbn: 0.1.1
       safer-buffer: 2.1.2
       tweetnacl: 0.14.5
-    dev: false
 
-  /ssri@10.0.5:
-    resolution: {integrity: sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  ssri@10.0.5:
     dependencies:
       minipass: 7.1.2
 
-  /ssri@8.0.1:
-    resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
-    engines: {node: '>= 8'}
-    requiresBuild: true
-    dependencies:
-      minipass: 3.3.6
-    dev: false
-    optional: true
-
-  /sswr@2.1.0(svelte@5.33.14):
-    resolution: {integrity: sha512-Cqc355SYlTAaUt8iDPaC/4DPPXK925PePLMxyBKuWd5kKc5mwsG3nT9+Mq2tyguL5s7b4Jg+IRMpTRsNTAfpSQ==}
-    peerDependencies:
-      svelte: ^4.0.0 || ^5.0.0-next.0
-    dependencies:
-      svelte: 5.33.14
-      swrev: 4.0.0
-
-  /stack-generator@2.0.10:
-    resolution: {integrity: sha512-mwnua/hkqM6pF4k8SnmZ2zfETsRUpWXREfA/goT8SLCV4iOFa4bzOX2nDipWAZFPTjLvQB82f5yaodMVhK0yJQ==}
+  stack-generator@2.0.10:
     dependencies:
       stackframe: 1.3.4
-    dev: false
 
-  /stackback@0.0.2:
-    resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==}
-    dev: true
+  stackback@0.0.2: {}
 
-  /stackframe@1.3.4:
-    resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==}
-    dev: false
+  stackframe@1.3.4: {}
 
-  /stacktrace-gps@3.1.2:
-    resolution: {integrity: sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==}
+  stacktrace-gps@3.1.2:
     dependencies:
       source-map: 0.5.6
       stackframe: 1.3.4
-    dev: false
 
-  /stacktrace-js@2.0.2:
-    resolution: {integrity: sha512-Je5vBeY4S1r/RnLydLl0TBTi3F2qdfWmYsGvtfZgEI+SCprPppaIhQf5nGcal4gI4cGpCV/duLcAzT1np6sQqg==}
+  stacktrace-js@2.0.2:
     dependencies:
       error-stack-parser: 2.1.4
       stack-generator: 2.0.10
       stacktrace-gps: 3.1.2
-    dev: false
 
-  /stacktrace-parser@0.1.10:
-    resolution: {integrity: sha512-KJP1OCML99+8fhOHxwwzyWrlUuVX5GQ0ZpJTd1DFXhdkrvg1szxfHhawXUZ3g9TkXORQd4/WG68jMlQZ2p8wlg==}
-    engines: {node: '>=6'}
+  stacktrace-parser@0.1.10:
     dependencies:
       type-fest: 0.7.1
-    dev: false
 
-  /stacktracey@2.1.8:
-    resolution: {integrity: sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==}
-    dependencies:
-      as-table: 1.0.55
-      get-source: 2.0.12
-    dev: false
+  standard-as-callback@2.1.0: {}
 
-  /standard-as-callback@2.1.0:
-    resolution: {integrity: sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==}
-    dev: false
+  statuses@2.0.1: {}
 
-  /statuses@2.0.1:
-    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
-    engines: {node: '>= 0.8'}
+  statuses@2.0.2: {}
 
-  /std-env@3.7.0:
-    resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
-    dev: false
+  std-env@3.7.0: {}
 
-  /std-env@3.8.1:
-    resolution: {integrity: sha512-vj5lIj3Mwf9D79hBkltk5qmkFI+biIKWS2IBxEyEU3AX1tUf7AoL8nSazCOiiqQsGKIq01SClsKEzweu34uwvA==}
-    dev: false
+  std-env@3.8.1: {}
 
-  /std-env@3.9.0:
-    resolution: {integrity: sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==}
-    dev: true
+  std-env@3.9.0: {}
 
-  /stoppable@1.1.0:
-    resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
-    engines: {node: '>=4', npm: '>=6'}
-    dev: false
+  stream-buffers@3.0.2: {}
 
-  /stream-buffers@3.0.2:
-    resolution: {integrity: sha512-DQi1h8VEBA/lURbSwFtEHnSTb9s2/pwLEaFuNhXwy1Dx3Sa0lOuYT2yNUr4/j2fs8oCAMANtrZ5OrPZtyVs3MQ==}
-    engines: {node: '>= 0.10.0'}
-    dev: false
+  stream-shift@1.0.3: {}
 
-  /stream-shift@1.0.1:
-    resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
-    dev: true
+  stream-slice@0.1.2: {}
 
-  /stream-shift@1.0.3:
-    resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==}
-    dev: true
+  stream-transform@2.1.3:
+    dependencies:
+      mixme: 0.5.4
 
-  /stream-slice@0.1.2:
-    resolution: {integrity: sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA==}
+  streamdown@1.4.0(@types/react@18.2.69)(react@18.2.0):
+    dependencies:
+      clsx: 2.1.1
+      katex: 0.16.25
+      lucide-react: 0.542.0(react@18.2.0)
+      marked: 16.4.1
+      mermaid: 11.12.0
+      react: 18.2.0
+      react-markdown: 10.1.0(@types/react@18.2.69)(react@18.2.0)
+      rehype-harden: 1.1.5
+      rehype-katex: 7.0.1
+      rehype-raw: 7.0.0
+      remark-gfm: 4.0.1
+      remark-math: 6.0.0
+      shiki: 3.13.0
+      tailwind-merge: 3.3.1
+    transitivePeerDependencies:
+      - '@types/react'
+      - supports-color
 
-  /stream-transform@2.1.3:
-    resolution: {integrity: sha512-9GHUiM5hMiCi6Y03jD2ARC1ettBXkQBoQAe7nJsPknnI0ow10aXjTnew8QtYQmLjzn974BnmWEAJgCY6ZP1DeQ==}
+  streamdown@1.4.0(@types/react@19.0.12)(react@19.1.0):
     dependencies:
-      mixme: 0.5.4
-    dev: false
+      clsx: 2.1.1
+      katex: 0.16.25
+      lucide-react: 0.542.0(react@19.1.0)
+      marked: 16.4.1
+      mermaid: 11.12.0
+      react: 19.1.0
+      react-markdown: 10.1.0(@types/react@19.0.12)(react@19.1.0)
+      rehype-harden: 1.1.5
+      rehype-katex: 7.0.1
+      rehype-raw: 7.0.0
+      remark-gfm: 4.0.1
+      remark-math: 6.0.0
+      shiki: 3.13.0
+      tailwind-merge: 3.3.1
+    transitivePeerDependencies:
+      - '@types/react'
+      - supports-color
 
-  /streamsearch@1.1.0:
-    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
-    engines: {node: '>=10.0.0'}
-    dev: false
+  streamsearch@1.1.0: {}
 
-  /streamx@2.22.0:
-    resolution: {integrity: sha512-sLh1evHOzBy/iWRiR6d1zRcLao4gGZr3C1kzNz4fopCOKJb6xD9ub8Mpi9Mr1R6id5o43S+d93fI48UC5uM9aw==}
-    requiresBuild: true
+  streamx@2.22.0:
     dependencies:
       fast-fifo: 1.3.2
       text-decoder: 1.2.0
     optionalDependencies:
-      bare-events: 2.5.4
-
-  /strict-event-emitter@0.5.1:
-    resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==}
-    dev: false
+      bare-events: 2.8.2
+    transitivePeerDependencies:
+      - bare-abort-controller
 
-  /string-hash@1.1.3:
-    resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==}
-    dev: true
+  string-hash@1.1.3: {}
 
-  /string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
+  string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
-  /string-width@5.1.2:
-    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
-    engines: {node: '>=12'}
+  string-width@5.1.2:
     dependencies:
       eastasianwidth: 0.2.0
       emoji-regex: 9.2.2
       strip-ansi: 7.1.0
 
-  /string.prototype.matchall@4.0.8:
-    resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==}
+  string.prototype.matchall@4.0.8:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
       get-intrinsic: 1.3.0
       has-symbols: 1.1.0
       internal-slot: 1.0.4
       regexp.prototype.flags: 1.4.3
       side-channel: 1.1.0
-    dev: true
 
-  /string.prototype.padend@3.1.4:
-    resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
-    engines: {node: '>= 0.4'}
+  string.prototype.padend@3.1.4:
     dependencies:
-      call-bind: 1.0.2
+      call-bind: 1.0.7
       define-properties: 1.1.4
       es-abstract: 1.21.1
-    dev: true
 
-  /string.prototype.trim@1.2.9:
-    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
-    engines: {node: '>= 0.4'}
+  string.prototype.trim@1.2.9:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-object-atoms: 1.1.1
-    dev: true
 
-  /string.prototype.trimend@1.0.6:
-    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
+  string.prototype.trimend@1.0.6:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
 
-  /string.prototype.trimend@1.0.8:
-    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+  string.prototype.trimend@1.0.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
-    dev: true
 
-  /string.prototype.trimstart@1.0.6:
-    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
+  string.prototype.trimstart@1.0.6:
     dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.1.4
+      call-bind: 1.0.8
+      define-properties: 1.2.1
       es-abstract: 1.21.1
 
-  /string.prototype.trimstart@1.0.8:
-    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
-    engines: {node: '>= 0.4'}
+  string.prototype.trimstart@1.0.8:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       define-properties: 1.2.1
       es-object-atoms: 1.1.1
-    dev: true
 
-  /string_decoder@1.1.1:
-    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+  string_decoder@1.1.1:
     dependencies:
       safe-buffer: 5.1.2
-    dev: true
 
-  /string_decoder@1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+  string_decoder@1.3.0:
     dependencies:
       safe-buffer: 5.2.1
 
-  /stringify-entities@4.0.3:
-    resolution: {integrity: sha512-BP9nNHMhhfcMbiuQKCqMjhDP5yBCAxsPu4pHFFzJ6Alo9dZgY4VLDPutXqIjpRiMoKdp7Av85Gr73Q5uH9k7+g==}
+  stringify-entities@4.0.3:
     dependencies:
       character-entities-html4: 2.1.0
       character-entities-legacy: 3.0.0
 
-  /strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
+  strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
 
-  /strip-ansi@7.1.0:
-    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
-    engines: {node: '>=12'}
+  strip-ansi@7.1.0:
     dependencies:
       ansi-regex: 6.0.1
 
-  /strip-bom@3.0.0:
-    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
-    engines: {node: '>=4'}
+  strip-bom@3.0.0: {}
 
-  /strip-final-newline@2.0.0:
-    resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}
-    engines: {node: '>=6'}
-    dev: true
+  strip-final-newline@2.0.0: {}
 
-  /strip-final-newline@3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
+  strip-final-newline@3.0.0: {}
 
-  /strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
+  strip-final-newline@4.0.0: {}
+
+  strip-indent@3.0.0:
     dependencies:
       min-indent: 1.0.1
 
-  /strip-json-comments@2.0.1:
-    resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
-    engines: {node: '>=0.10.0'}
+  strip-json-comments@2.0.1: {}
 
-  /strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
+  strip-json-comments@3.1.1: {}
 
-  /stripe@12.18.0:
-    resolution: {integrity: sha512-cYjgBM2SY/dTm8Lr6eMyyONaHTZHA/QjHxFUIW5WH8FevSRIGAVtXEmBkUXF1fsqe7QvvRgQSGSJZmjDacegGg==}
-    engines: {node: '>=12.*'}
-    dependencies:
-      '@types/node': 20.14.14
-      qs: 6.11.0
-    dev: false
+  strnum@1.0.5: {}
 
-  /strnum@1.0.5:
-    resolution: {integrity: sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA==}
-    dev: false
+  strnum@2.1.1: {}
 
-  /strtok3@9.1.1:
-    resolution: {integrity: sha512-FhwotcEqjr241ZbjFzjlIYg6c5/L/s4yBGWSMvJ9UoExiSqL+FnFA/CaeZx17WGaZMS/4SOZp8wH18jSS4R4lw==}
-    engines: {node: '>=16'}
+  strtok3@9.1.1:
     dependencies:
       '@tokenizer/token': 0.3.0
       peek-readable: 5.4.2
-    dev: true
 
-  /style-loader@3.3.4(webpack@5.99.9):
-    resolution: {integrity: sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==}
-    engines: {node: '>= 12.13.0'}
-    peerDependencies:
-      webpack: ^5.0.0
+  style-loader@3.3.4(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)):
     dependencies:
-      webpack: 5.99.9(@swc/core@1.3.26)(esbuild@0.15.18)
-    dev: true
+      webpack: 5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)
 
-  /style-mod@4.0.0:
-    resolution: {integrity: sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==}
-    dev: false
+  style-mod@4.1.3: {}
 
-  /style-mod@4.1.2:
-    resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==}
-    dev: false
-
-  /style-to-js@1.1.16:
-    resolution: {integrity: sha512-/Q6ld50hKYPH3d/r6nr117TZkHR0w0kGGIVfpG9N6D8NymRPM9RqCUv4pRpJ62E5DqOYx2AFpbZMyCPnjQCnOw==}
+  style-to-js@1.1.16:
     dependencies:
       style-to-object: 1.0.8
-    dev: false
 
-  /style-to-object@0.3.0:
-    resolution: {integrity: sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==}
+  style-to-object@0.3.0:
     dependencies:
       inline-style-parser: 0.1.1
-    dev: true
 
-  /style-to-object@1.0.8:
-    resolution: {integrity: sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==}
+  style-to-object@1.0.8:
     dependencies:
       inline-style-parser: 0.2.4
-    dev: false
 
-  /styled-jsx@5.1.1(@babel/core@7.24.5)(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
-    engines: {node: '>= 12.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-plugin-macros: '*'
-      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      babel-plugin-macros:
-        optional: true
+  styled-jsx@5.1.1(react@18.3.1):
     dependencies:
-      '@babel/core': 7.24.5
       client-only: 0.0.1
-      react: 19.0.0-rc.0
-    dev: false
+      react: 18.3.1
 
-  /styled-jsx@5.1.1(react@18.3.1):
-    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
-    engines: {node: '>= 12.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-plugin-macros: '*'
-      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      babel-plugin-macros:
-        optional: true
+  styled-jsx@5.1.6(react@19.0.0):
     dependencies:
       client-only: 0.0.1
-      react: 18.3.1
-    dev: false
+      react: 19.0.0
 
-  /styled-jsx@5.1.6(react@19.0.0):
-    resolution: {integrity: sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==}
-    engines: {node: '>= 12.0.0'}
-    peerDependencies:
-      '@babel/core': '*'
-      babel-plugin-macros: '*'
-      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0'
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      babel-plugin-macros:
-        optional: true
+  styled-jsx@5.1.6(react@19.1.0):
     dependencies:
       client-only: 0.0.1
-      react: 19.0.0
-    dev: false
+      react: 19.1.0
 
-  /stylis@4.3.0:
-    resolution: {integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==}
-    dev: false
+  stylis@4.3.0: {}
 
-  /sucrase@3.35.0:
-    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-    hasBin: true
+  stylis@4.3.6: {}
+
+  sucrase@3.35.0:
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/gen-mapping': 0.3.8
       commander: 4.1.1
       glob: 10.4.5
       lines-and-columns: 1.2.4
@@ -34396,254 +40618,132 @@ packages:
       pirates: 4.0.5
       ts-interface-checker: 0.1.13
 
-  /superagent@9.0.2:
-    resolution: {integrity: sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==}
-    engines: {node: '>=14.18.0'}
+  superagent@9.0.2:
     dependencies:
       component-emitter: 1.3.1
       cookiejar: 2.1.4
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       fast-safe-stringify: 2.1.1
-      form-data: 4.0.0
+      form-data: 4.0.4
       formidable: 3.5.1
       methods: 1.1.2
       mime: 2.6.0
-      qs: 6.11.0
+      qs: 6.14.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /superjson@2.2.1:
-    resolution: {integrity: sha512-8iGv75BYOa0xRJHK5vRLEjE2H/i4lulTjzpUXic3Eg8akftYjkmQDa8JARQ42rlczXyFR3IeRoeFCc7RxHsYZA==}
-    engines: {node: '>=16'}
+  superjson@2.2.1:
     dependencies:
       copy-anything: 3.0.5
-    dev: false
 
-  /superstruct@2.0.2:
-    resolution: {integrity: sha512-uV+TFRZdXsqXTL2pRvujROjdZQ4RAlBUS5BTh9IGm+jTqQntYThciG/qu57Gs69yjnVUSqdxF9YLmSnpupBW9A==}
-    engines: {node: '>=14.0.0'}
-    dev: false
+  superstruct@2.0.2: {}
 
-  /supertest@7.0.0:
-    resolution: {integrity: sha512-qlsr7fIC0lSddmA3tzojvzubYxvlGtzumcdHgPwbFWMISQwL22MhM2Y3LNt+6w9Yyx7559VW5ab70dgphm8qQA==}
-    engines: {node: '>=14.18.0'}
+  supertest@7.0.0:
     dependencies:
       methods: 1.1.2
       superagent: 9.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /supports-color@10.0.0:
-    resolution: {integrity: sha512-HRVVSbCCMbj7/kdWF9Q+bbckjBHLtHMEoJWlkmYzzdwhYMkjkOwubLM6t7NbWKjgKamGDrWL1++KrjUO1t9oAQ==}
-    engines: {node: '>=18'}
+  supports-color@10.0.0: {}
 
-  /supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
+  supports-color@5.5.0:
     dependencies:
       has-flag: 3.0.0
 
-  /supports-color@6.1.0:
-    resolution: {integrity: sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==}
-    engines: {node: '>=6'}
+  supports-color@6.1.0:
     dependencies:
       has-flag: 3.0.0
-    dev: false
-
-  /supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
-    dependencies:
-      has-flag: 4.0.0
 
-  /supports-color@8.1.1:
-    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
-    engines: {node: '>=10'}
+  supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0
 
-  /supports-hyperlinks@2.3.0:
-    resolution: {integrity: sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==}
-    engines: {node: '>=8'}
+  supports-color@8.1.1:
     dependencies:
       has-flag: 4.0.0
-      supports-color: 7.2.0
-    dev: true
 
-  /supports-hyperlinks@3.1.0:
-    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
-    engines: {node: '>=14.18'}
+  supports-hyperlinks@3.1.0:
     dependencies:
       has-flag: 4.0.0
       supports-color: 7.2.0
-    dev: true
 
-  /supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-
-  /svelte@5.33.14:
-    resolution: {integrity: sha512-kRlbhIlMTijbFmVDQFDeKXPLlX1/ovXwV0I162wRqQhRcygaqDIcu1d/Ese3H2uI+yt3uT8E7ndgDthQv5v5BA==}
-    engines: {node: '>=18'}
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@jridgewell/sourcemap-codec': 1.5.0
-      '@sveltejs/acorn-typescript': 1.0.5(acorn@8.14.1)
-      '@types/estree': 1.0.7
-      acorn: 8.14.1
-      aria-query: 5.3.2
-      axobject-query: 4.1.0
-      clsx: 2.1.1
-      esm-env: 1.2.2
-      esrap: 1.4.6
-      is-reference: 3.0.3
-      locate-character: 3.0.0
-      magic-string: 0.30.17
-      zimmerframe: 1.1.2
+  supports-preserve-symlinks-flag@1.0.0: {}
 
-  /swr@2.2.5(react@18.2.0):
-    resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==}
-    peerDependencies:
-      react: ^16.11.0 || ^17.0.0 || ^18.0.0
+  swr@2.2.5(react@18.2.0):
     dependencies:
       client-only: 0.0.1
       react: 18.2.0
       use-sync-external-store: 1.2.2(react@18.2.0)
-    dev: false
 
-  /swr@2.2.5(react@18.3.1):
-    resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==}
-    peerDependencies:
-      react: ^16.11.0 || ^17.0.0 || ^18.0.0
+  swr@2.2.5(react@18.3.1):
     dependencies:
       client-only: 0.0.1
       react: 18.3.1
       use-sync-external-store: 1.2.2(react@18.3.1)
 
-  /swr@2.2.5(react@19.0.0):
-    resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==}
-    peerDependencies:
-      react: ^16.11.0 || ^17.0.0 || ^18.0.0
+  swr@2.2.5(react@19.0.0):
     dependencies:
       client-only: 0.0.1
       react: 19.0.0
       use-sync-external-store: 1.2.2(react@19.0.0)
-    dev: false
 
-  /swr@2.2.5(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-QtxqyclFeAsxEUeZIYmsaQ0UjimSq1RZ9Un7I68/0ClKK/U3LoyQunwkQfJZr2fc22DfIXLNDc2wFyTEikCUpg==}
-    peerDependencies:
-      react: ^16.11.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      client-only: 0.0.1
-      react: 19.0.0-rc.0
-      use-sync-external-store: 1.2.2(react@19.0.0-rc.0)
-    dev: false
-
-  /swrev@4.0.0:
-    resolution: {integrity: sha512-LqVcOHSB4cPGgitD1riJ1Hh4vdmITOp+BkmfmXRh4hSF/t7EnS4iD+SOTmq7w5pPm/SiPeto4ADbKS6dHUDWFA==}
-
-  /swrv@1.0.4(vue@3.5.16):
-    resolution: {integrity: sha512-zjEkcP8Ywmj+xOJW3lIT65ciY/4AL4e/Or7Gj0MzU3zBJNMdJiT8geVZhINavnlHRMMCcJLHhraLTAiDOTmQ9g==}
-    peerDependencies:
-      vue: '>=3.2.26 < 4'
-    dependencies:
-      vue: 3.5.16(typescript@5.5.4)
-
-  /sync-content@2.0.1:
-    resolution: {integrity: sha512-NI1mo514yFhr8pV/5Etvgh+pSBUIpoAKoiBIUwALVlQQNAwb40bTw8hhPFaip/dvv0GhpHVOq0vq8iY02ppLTg==}
-    engines: {node: 20 || >=22}
-    hasBin: true
+  sync-content@2.0.1:
     dependencies:
       glob: 11.0.0
       mkdirp: 3.0.1
       path-scurry: 2.0.0
       rimraf: 6.0.1
       tshy: 3.0.2
-    dev: true
 
-  /synckit@0.8.5:
-    resolution: {integrity: sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  synckit@0.8.5:
     dependencies:
       '@pkgr/utils': 2.3.1
       tslib: 2.8.1
-    dev: true
 
-  /table@6.9.0:
-    resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==}
-    engines: {node: '>=10.0.0'}
+  systeminformation@5.27.14: {}
+
+  table@6.9.0:
     dependencies:
       ajv: 8.17.1
       lodash.truncate: 4.4.2
       slice-ansi: 4.0.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: true
 
-  /tailwind-merge@1.12.0:
-    resolution: {integrity: sha512-Y17eDp7FtN1+JJ4OY0Bqv9OA41O+MS8c1Iyr3T6JFLnOgLg3EvcyMKZAnQ8AGyvB5Nxm3t9Xb5Mhe139m8QT/g==}
-    dev: false
+  tailwind-merge@1.12.0: {}
 
-  /tailwind-merge@2.2.0:
-    resolution: {integrity: sha512-SqqhhaL0T06SW59+JVNfAqKdqLs0497esifRrZ7jOaefP3o64fdFNDMrAQWZFMxTLJPiHVjRLUywT8uFz1xNWQ==}
+  tailwind-merge@2.2.0:
     dependencies:
-      '@babel/runtime': 7.27.4
-    dev: false
+      '@babel/runtime': 7.27.0
 
-  /tailwind-merge@2.5.3:
-    resolution: {integrity: sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==}
-    dev: false
+  tailwind-merge@2.5.3: {}
 
-  /tailwind-merge@3.0.2:
-    resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==}
-    dev: false
+  tailwind-merge@3.0.2: {}
 
-  /tailwind-merge@3.1.0:
-    resolution: {integrity: sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==}
-    dev: false
+  tailwind-merge@3.1.0: {}
 
-  /tailwind-scrollbar-hide@1.1.7:
-    resolution: {integrity: sha512-X324n9OtpTmOMqEgDUEA/RgLrNfBF/jwJdctaPZDzB3mppxJk7TLIDmOreEDm1Bq4R9LSPu4Epf8VSdovNU+iA==}
-    dev: false
+  tailwind-merge@3.3.1: {}
 
-  /tailwind-scrollbar@3.0.1(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-mM0ecSf/RGRGWw/qB0Zg1bWhuXIkpmleNAFgMxdb4eERgA6eQ0kVouYsF3/OvBqDSK8RJikZC/ynGPxnfXeddw==}
-    engines: {node: '>=12.13.0'}
-    peerDependencies:
-      tailwindcss: 3.x
+  tailwind-scrollbar-hide@1.1.7: {}
+
+  tailwind-scrollbar@3.0.1(tailwindcss@3.4.1):
     dependencies:
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: true
+      tailwindcss: 3.4.1
 
-  /tailwindcss-animate@1.0.5(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-UU3qrOJ4lFQABY+MVADmBm+0KW3xZyhMdRvejwtXqYOL7YjHYxmuREFAZdmVG5LPe5E9CAst846SLC4j5I3dcw==}
-    peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders'
+  tailwindcss-animate@1.0.5(tailwindcss@3.4.1):
     dependencies:
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: false
+      tailwindcss: 3.4.1
 
-  /tailwindcss-animate@1.0.7(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
-    peerDependencies:
-      tailwindcss: '>=3.0.0 || insiders'
+  tailwindcss-animate@1.0.7(tailwindcss@3.4.1):
     dependencies:
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: false
+      tailwindcss: 3.4.1
 
-  /tailwindcss-textshadow@2.1.3:
-    resolution: {integrity: sha512-FGVHfK+xnV879VSQDeRvY61Aa+b0GDiGaFBPwCOKvqIrK57GyepWJL1GydjtGOLHE9qqphFucRNj9fHramCzNg==}
+  tailwindcss-textshadow@2.1.3:
     dependencies:
       tailwindcss: 1.9.6
-    dev: false
 
-  /tailwindcss@1.9.6:
-    resolution: {integrity: sha512-nY8WYM/RLPqGsPEGEV2z63riyQPcHYZUJpAwdyBzVpxQHOHqHE+F/fvbCeXhdF1+TA5l72vSkZrtYCB9hRcwkQ==}
-    engines: {node: '>=8.9.0'}
-    hasBin: true
+  tailwindcss@1.9.6:
     dependencies:
       '@fullhuman/postcss-purgecss': 2.3.0
       autoprefixer: 9.8.8
@@ -34654,7 +40754,7 @@ packages:
       detective: 5.2.1
       fs-extra: 8.1.0
       html-tags: 3.3.1
-      lodash: 4.17.21
+      lodash: 4.17.23
       node-emoji: 1.11.0
       normalize.css: 8.0.1
       object-hash: 2.2.0
@@ -34667,12 +40767,8 @@ packages:
       pretty-hrtime: 1.0.3
       reduce-css-calc: 2.1.8
       resolve: 1.22.8
-    dev: false
 
-  /tailwindcss@3.4.0:
-    resolution: {integrity: sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
+  tailwindcss@3.4.0:
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -34688,22 +40784,18 @@ packages:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.5.3
-      postcss-import: 15.1.0(postcss@8.5.3)
-      postcss-js: 4.0.1(postcss@8.5.3)
-      postcss-load-config: 4.0.2(postcss@8.5.3)(ts-node@10.9.1)
-      postcss-nested: 6.2.0(postcss@8.5.3)
+      postcss: 8.5.6
+      postcss-import: 15.1.0(postcss@8.5.6)
+      postcss-js: 4.0.1(postcss@8.5.6)
+      postcss-load-config: 4.0.2(postcss@8.5.6)
+      postcss-nested: 6.2.0(postcss@8.5.6)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.8
       sucrase: 3.35.0
     transitivePeerDependencies:
       - ts-node
-    dev: false
 
-  /tailwindcss@3.4.1(ts-node@10.9.1):
-    resolution: {integrity: sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
+  tailwindcss@3.4.1:
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -34719,69 +40811,69 @@ packages:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.1.1
-      postcss: 8.5.3
-      postcss-import: 15.1.0(postcss@8.5.3)
-      postcss-js: 4.0.1(postcss@8.5.3)
-      postcss-load-config: 4.0.2(postcss@8.5.3)(ts-node@10.9.1)
-      postcss-nested: 6.2.0(postcss@8.5.3)
+      postcss: 8.5.4
+      postcss-import: 15.1.0(postcss@8.5.4)
+      postcss-js: 4.0.1(postcss@8.5.4)
+      postcss-load-config: 4.0.2(postcss@8.5.4)
+      postcss-nested: 6.2.0(postcss@8.5.4)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.8
       sucrase: 3.35.0
     transitivePeerDependencies:
       - ts-node
 
-  /tailwindcss@4.0.17:
-    resolution: {integrity: sha512-OErSiGzRa6rLiOvaipsDZvLMSpsBZ4ysB4f0VKGXUrjw2jfkJRd6kjRKV2+ZmTCNvwtvgdDam5D7w6WXsdLJZw==}
-    dev: true
+  tailwindcss@4.0.17: {}
 
-  /tapable@2.2.1:
-    resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
-    engines: {node: '>=6'}
+  tapable@2.2.1: {}
 
-  /tapable@2.2.2:
-    resolution: {integrity: sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==}
-    engines: {node: '>=6'}
-    dev: true
+  tapable@2.3.0: {}
 
-  /tar-fs@2.1.3:
-    resolution: {integrity: sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==}
+  tar-fs@2.1.3:
     dependencies:
       chownr: 1.1.4
       mkdirp-classic: 0.5.3
       pump: 3.0.2
       tar-stream: 2.2.0
 
-  /tar-fs@3.0.9:
-    resolution: {integrity: sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==}
+  tar-fs@3.0.9:
     dependencies:
       pump: 3.0.2
       tar-stream: 3.1.7
     optionalDependencies:
-      bare-fs: 4.1.5
+      bare-fs: 4.5.1
       bare-path: 3.0.0
     transitivePeerDependencies:
+      - bare-abort-controller
       - bare-buffer
 
-  /tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
+  tar-fs@3.1.0:
+    dependencies:
+      pump: 3.0.2
+      tar-stream: 3.1.7
+    optionalDependencies:
+      bare-fs: 4.5.1
+      bare-path: 3.0.0
+    transitivePeerDependencies:
+      - bare-abort-controller
+      - bare-buffer
+
+  tar-stream@2.2.0:
     dependencies:
       bl: 4.1.0
       end-of-stream: 1.4.4
       fs-constants: 1.0.0
       inherits: 2.0.4
-      readable-stream: 3.6.0
+      readable-stream: 3.6.2
 
-  /tar-stream@3.1.7:
-    resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
+  tar-stream@3.1.7:
     dependencies:
       b4a: 1.6.6
       fast-fifo: 1.3.2
       streamx: 2.22.0
+    transitivePeerDependencies:
+      - bare-abort-controller
 
-  /tar@6.1.13:
-    resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==}
-    engines: {node: '>=10'}
+  tar@6.1.13:
     dependencies:
       chownr: 2.0.0
       fs-minipass: 2.1.0
@@ -34790,9 +40882,7 @@ packages:
       mkdirp: 1.0.4
       yallist: 4.0.0
 
-  /tar@6.2.1:
-    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
-    engines: {node: '>=10'}
+  tar@6.2.1:
     dependencies:
       chownr: 2.0.0
       fs-minipass: 2.1.0
@@ -34800,11 +40890,8 @@ packages:
       minizlib: 2.1.2
       mkdirp: 1.0.4
       yallist: 4.0.0
-    dev: false
 
-  /tar@7.4.3:
-    resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
-    engines: {node: '>=18'}
+  tar@7.4.3:
     dependencies:
       '@isaacs/fs-minipass': 4.0.1
       chownr: 3.0.0
@@ -34812,135 +40899,66 @@ packages:
       minizlib: 3.0.1
       mkdirp: 3.0.1
       yallist: 5.0.0
-    dev: false
-
-  /tdigest@0.1.2:
-    resolution: {integrity: sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==}
-    dependencies:
-      bintrees: 1.0.2
-    dev: false
-
-  /temp-dir@2.0.0:
-    resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /tempy@1.0.1:
-    resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
-    engines: {node: '>=10'}
-    dependencies:
-      del: 6.1.1
-      is-stream: 2.0.1
-      temp-dir: 2.0.0
-      type-fest: 0.16.0
-      unique-string: 2.0.0
-    dev: true
-
-  /term-size@2.2.1:
-    resolution: {integrity: sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==}
-    engines: {node: '>=8'}
-    dev: false
 
-  /terminal-link@2.1.1:
-    resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      ansi-escapes: 4.3.2
-      supports-hyperlinks: 2.3.0
-    dev: true
-
-  /terser-webpack-plugin@5.3.14(@swc/core@1.3.26)(esbuild@0.15.18)(webpack@5.99.9):
-    resolution: {integrity: sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
+  tar@7.5.6:
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      '@swc/core': 1.3.26
-      esbuild: 0.15.18
-      jest-worker: 27.5.1
-      schema-utils: 4.3.2
-      serialize-javascript: 6.0.2
-      terser: 5.40.0
-      webpack: 5.99.9(@swc/core@1.3.26)(esbuild@0.15.18)
-    dev: true
-
-  /terser-webpack-plugin@5.3.7(@swc/core@1.3.101)(esbuild@0.19.11)(webpack@5.88.2):
-    resolution: {integrity: sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
+      '@isaacs/fs-minipass': 4.0.1
+      chownr: 3.0.0
+      minipass: 7.1.2
+      minizlib: 3.1.0
+      yallist: 5.0.0
+
+  tdigest@0.1.2:
+    dependencies:
+      bintrees: 1.0.2
+
+  term-size@2.2.1: {}
+
+  terser-webpack-plugin@5.3.14(@swc/core@1.3.26)(esbuild@0.15.18)(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)):
+    dependencies:
+      '@jridgewell/trace-mapping': 0.3.31
+      jest-worker: 27.5.1
+      schema-utils: 4.3.3
+      serialize-javascript: 6.0.2
+      terser: 5.44.1
+      webpack: 5.102.1(@swc/core@1.3.26)(esbuild@0.15.18)
+    optionalDependencies:
+      '@swc/core': 1.3.26
+      esbuild: 0.15.18
+
+  terser-webpack-plugin@5.3.7(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)(webpack@5.88.2):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      '@swc/core': 1.3.101
-      esbuild: 0.19.11
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.1
-      terser: 5.17.1
-      webpack: 5.88.2(@swc/core@1.3.101)(esbuild@0.19.11)
-    dev: false
+      terser: 5.44.1
+      webpack: 5.88.2(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)
+    optionalDependencies:
+      '@swc/core': 1.3.101(@swc/helpers@0.5.15)
+      esbuild: 0.19.11
 
-  /terser@5.17.1:
-    resolution: {integrity: sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==}
-    engines: {node: '>=10'}
-    hasBin: true
+  terser@5.44.1:
     dependencies:
       '@jridgewell/source-map': 0.3.3
-      acorn: 8.12.1
-      commander: 2.20.3
-      source-map-support: 0.5.21
-    dev: false
-
-  /terser@5.40.0:
-    resolution: {integrity: sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      '@jridgewell/source-map': 0.3.6
-      acorn: 8.14.1
+      acorn: 8.15.0
       commander: 2.20.3
       source-map-support: 0.5.21
-    dev: true
 
-  /test-exclude@7.0.1:
-    resolution: {integrity: sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==}
-    engines: {node: '>=18'}
+  test-exclude@7.0.1:
     dependencies:
       '@istanbuljs/schema': 0.1.3
       glob: 10.4.5
       minimatch: 9.0.5
-    dev: true
 
-  /testcontainers@10.28.0:
-    resolution: {integrity: sha512-1fKrRRCsgAQNkarjHCMKzBKXSJFmzNTiTbhb5E/j5hflRXChEtHvkefjaHlgkNUjfw92/Dq8LTgwQn6RDBFbMg==}
+  testcontainers@10.28.0:
     dependencies:
       '@balena/dockerignore': 1.0.2
       '@types/dockerode': 3.3.35
       archiver: 7.0.1
       async-lock: 1.4.1
       byline: 5.0.0
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.0
       docker-compose: 0.24.8
       dockerode: 4.0.6
       get-port: 7.1.0
@@ -34951,452 +40969,214 @@ packages:
       tmp: 0.2.3
       undici: 5.29.0
     transitivePeerDependencies:
+      - bare-abort-controller
       - bare-buffer
       - supports-color
-    dev: true
 
-  /text-decoder@1.2.0:
-    resolution: {integrity: sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==}
+  text-decoder@1.2.0:
     dependencies:
       b4a: 1.6.6
 
-  /text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+  text-table@0.2.0: {}
 
-  /thenify-all@1.6.0:
-    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
-    engines: {node: '>=0.8'}
+  thenify-all@1.6.0:
     dependencies:
       thenify: 3.3.1
 
-  /thenify@3.3.1:
-    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
+  thenify@3.3.1:
     dependencies:
       any-promise: 1.3.0
 
-  /thread-stream@3.1.0:
-    resolution: {integrity: sha512-OqyPZ9u96VohAyMfJykzmivOrY2wfMSf3C5TtFJVgN+Hm6aj+voFhlK+kZEIv2FBh1X6Xp3DlnCOfEQ3B2J86A==}
+  thread-stream@3.1.0:
     dependencies:
       real-require: 0.2.0
-    dev: true
 
-  /throttle-debounce@3.0.1:
-    resolution: {integrity: sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg==}
-    engines: {node: '>=10'}
-    dev: false
+  throttle-debounce@3.0.1: {}
 
-  /throttleit@2.1.0:
-    resolution: {integrity: sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==}
-    engines: {node: '>=18'}
+  throttleit@2.1.0: {}
 
-  /through2@2.0.5:
-    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
+  through2@2.0.5:
     dependencies:
-      readable-stream: 2.3.7
+      readable-stream: 2.3.8
       xtend: 4.0.2
-    dev: true
-
-  /through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-    dev: false
 
-  /tiny-case@1.0.3:
-    resolution: {integrity: sha512-Eet/eeMhkO6TX8mnUteS9zgPbUMQa4I6Kkp5ORiBD5476/m+PIRiumP5tmh5ioJpH7k51Kehawy2UDfsnxxY8Q==}
-    dev: false
+  tiny-case@1.0.3: {}
 
-  /tiny-glob@0.2.9:
-    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
+  tiny-glob@0.2.9:
     dependencies:
       globalyzer: 0.1.0
       globrex: 0.1.2
-    dev: true
 
-  /tiny-invariant@1.3.1:
-    resolution: {integrity: sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==}
-    dev: false
+  tiny-invariant@1.3.1: {}
 
-  /tinybench@2.9.0:
-    resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
-    dev: true
+  tinybench@2.9.0: {}
 
-  /tinycolor2@1.6.0:
-    resolution: {integrity: sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==}
-    dev: false
+  tinycolor2@1.6.0: {}
 
-  /tinyexec@0.3.0:
-    resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==}
+  tinyexec@0.3.0: {}
 
-  /tinyexec@0.3.1:
-    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
-    dev: false
+  tinyexec@0.3.1: {}
 
-  /tinyexec@0.3.2:
-    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
+  tinyexec@0.3.2: {}
 
-  /tinyglobby@0.2.10:
-    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
-    engines: {node: '>=12.0.0'}
+  tinyexec@1.0.1: {}
+
+  tinyglobby@0.2.10:
     dependencies:
       fdir: 6.4.3(picomatch@4.0.2)
       picomatch: 4.0.2
-    dev: false
 
-  /tinyglobby@0.2.12:
-    resolution: {integrity: sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==}
-    engines: {node: '>=12.0.0'}
+  tinyglobby@0.2.12:
     dependencies:
-      fdir: 6.4.3(picomatch@4.0.2)
+      fdir: 6.4.4(picomatch@4.0.2)
       picomatch: 4.0.2
-    dev: true
 
-  /tinyglobby@0.2.13:
-    resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==}
-    engines: {node: '>=12.0.0'}
+  tinyglobby@0.2.13:
     dependencies:
       fdir: 6.4.4(picomatch@4.0.2)
       picomatch: 4.0.2
-    dev: true
 
-  /tinyglobby@0.2.2:
-    resolution: {integrity: sha512-mZ2sDMaySvi1PkTp4lTo1In2zjU+cY8OvZsfwrDrx3YGRbXPX1/cbPwCR9zkm3O/Fz9Jo0F1HNgIQ1b8BepqyQ==}
-    engines: {node: '>=12.0.0'}
+  tinyglobby@0.2.2:
     dependencies:
       fdir: 6.2.0(picomatch@4.0.2)
       picomatch: 4.0.2
-    dev: false
 
-  /tinygradient@1.1.5:
-    resolution: {integrity: sha512-8nIfc2vgQ4TeLnk2lFj4tRLvvJwEfQuabdsmvDdQPT0xlk9TaNtpGd6nNRxXoK6vQhN6RSzj+Cnp5tTQmpxmbw==}
+  tinygradient@1.1.5:
     dependencies:
       '@types/tinycolor2': 1.4.3
       tinycolor2: 1.6.0
-    dev: false
 
-  /tinypool@1.0.2:
-    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    dev: true
+  tinypool@1.0.2: {}
 
-  /tinyrainbow@1.2.0:
-    resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==}
-    engines: {node: '>=14.0.0'}
-    dev: true
+  tinyrainbow@1.2.0: {}
 
-  /tinyrainbow@2.0.0:
-    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
-    engines: {node: '>=14.0.0'}
-    dev: true
+  tinyrainbow@2.0.0: {}
 
-  /tinyspy@3.0.2:
-    resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
-    engines: {node: '>=14.0.0'}
-    dev: true
+  tinyspy@3.0.2: {}
 
-  /tldts-core@7.0.7:
-    resolution: {integrity: sha512-ECqb8imSroX1UmUuhRBNPkkmtZ8mHEenieim80UVxG0M5wXVjY2Fp2tYXCPvk+nLy1geOhFpeD5YQhM/gF63Jg==}
-    dev: false
+  tldts-core@7.0.7: {}
 
-  /tldts@7.0.7:
-    resolution: {integrity: sha512-ETNXj36ql5BXDa4VVJk3wgqansg8TI1Yqo217twSAPjyDnh/b2T+XzrI0ftn6EnzVPbXpMTZHOWj5s3a8/uGPA==}
-    hasBin: true
+  tldts@7.0.7:
     dependencies:
       tldts-core: 7.0.7
-    dev: false
 
-  /tmp-promise@3.0.3:
-    resolution: {integrity: sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==}
+  tmp-promise@3.0.3:
     dependencies:
       tmp: 0.2.3
-    dev: false
 
-  /tmp@0.0.33:
-    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: '>=0.6.0'}
+  tmp@0.0.33:
     dependencies:
       os-tmpdir: 1.0.2
-    dev: false
 
-  /tmp@0.2.1:
-    resolution: {integrity: sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==}
-    engines: {node: '>=8.17.0'}
-    dependencies:
-      rimraf: 3.0.2
-    dev: true
-
-  /tmp@0.2.3:
-    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
-    engines: {node: '>=14.14'}
+  tmp@0.2.3: {}
 
-  /to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
+  to-fast-properties@2.0.0: {}
 
-  /to-readable-stream@1.0.0:
-    resolution: {integrity: sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==}
-    engines: {node: '>=6'}
-    dev: true
+  to-readable-stream@1.0.0: {}
 
-  /to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
+  to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
 
-  /toad-cache@3.7.0:
-    resolution: {integrity: sha512-/m8M+2BJUpoJdgAHoG+baCwBT+tf2VraSfkBgl0Y00qIWt41DJ8R5B8nsEw0I58YwF5IZH6z24/2TobDKnqSWw==}
-    engines: {node: '>=12'}
-    dev: true
+  toad-cache@3.7.0: {}
 
-  /toggle-selection@1.0.6:
-    resolution: {integrity: sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==}
-    dev: false
+  toggle-selection@1.0.6: {}
 
-  /toidentifier@1.0.1:
-    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
-    engines: {node: '>=0.6'}
+  toidentifier@1.0.1: {}
 
-  /token-types@6.0.3:
-    resolution: {integrity: sha512-IKJ6EzuPPWtKtEIEPpIdXv9j5j2LGJEYk0CKY2efgKoYKLBiZdh6iQkLVBow/CB3phyWAWCyk+bZeaimJn6uRQ==}
-    engines: {node: '>=14.16'}
+  token-types@6.0.3:
     dependencies:
       '@tokenizer/token': 0.3.0
       ieee754: 1.2.1
-    dev: true
-
-  /toml@3.0.0:
-    resolution: {integrity: sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==}
-    dev: true
 
-  /toposort@2.0.2:
-    resolution: {integrity: sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg==}
-    dev: false
+  toml@3.0.0: {}
 
-  /totalist@3.0.1:
-    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
-    engines: {node: '>=6'}
-    dev: true
+  toposort@2.0.2: {}
 
-  /tough-cookie@2.5.0:
-    resolution: {integrity: sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==}
-    engines: {node: '>=0.8'}
-    dependencies:
-      psl: 1.9.0
-      punycode: 2.2.0
-    dev: false
+  totalist@3.0.1: {}
 
-  /tough-cookie@4.1.4:
-    resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
-    engines: {node: '>=6'}
+  tough-cookie@2.5.0:
     dependencies:
       psl: 1.9.0
       punycode: 2.2.0
-      universalify: 0.2.0
-      url-parse: 1.5.10
-    dev: false
 
-  /tr46@0.0.3:
-    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
+  tr46@0.0.3: {}
 
-  /tr46@1.0.1:
-    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+  tr46@1.0.1:
     dependencies:
       punycode: 2.2.0
-    dev: true
 
-  /tree-kill@1.2.2:
-    resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
-    hasBin: true
-    dev: true
+  tree-kill@1.2.2: {}
 
-  /trim-lines@3.0.1:
-    resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
+  trim-lines@3.0.1: {}
 
-  /trim-newlines@3.0.1:
-    resolution: {integrity: sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==}
-    engines: {node: '>=8'}
-    dev: false
+  trim-newlines@3.0.1: {}
 
-  /trough@2.1.0:
-    resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==}
+  trough@2.1.0: {}
 
-  /trouter@2.0.1:
-    resolution: {integrity: sha512-kr8SKKw94OI+xTGOkfsvwZQ8mWoikZDd2n8XZHjJVZUARZT+4/VV6cacRS6CLsH9bNm+HFIPU1Zx4CnNnb4qlQ==}
-    engines: {node: '>=6'}
+  trouter@2.0.1:
     dependencies:
       matchit: 1.1.0
-    dev: false
-
-  /ts-easing@0.2.0:
-    resolution: {integrity: sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==}
-    dev: false
-
-  /ts-essentials@10.0.1(typescript@5.5.4):
-    resolution: {integrity: sha512-HPH+H2bkkO8FkMDau+hFvv7KYozzned9Zr1Urn7rRPXMF4mZmCKOq+u4AI1AAW+2bofIOXTuSdKo9drQuni2dQ==}
-    peerDependencies:
-      typescript: '>=4.5.0'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      typescript: 5.5.4
-    dev: true
 
-  /ts-expose-internals-conditionally@1.0.0-empty.0:
-    resolution: {integrity: sha512-F8m9NOF6ZhdOClDVdlM8gj3fDCav4ZIFSs/EI3ksQbAAXVSCN/Jh5OCJDDZWBuBy9psFc6jULGDlPwjMYMhJDw==}
-    dev: true
+  ts-dedent@2.2.0: {}
 
-  /ts-interface-checker@0.1.13:
-    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
+  ts-easing@0.2.0: {}
 
-  /ts-node@10.9.1(@swc/core@1.3.26)(@types/node@20.14.14)(typescript@5.5.4):
-    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      '@swc/core': 1.3.26
-      '@tsconfig/node10': 1.0.9
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.3
-      '@types/node': 20.14.14
-      acorn: 8.10.0
-      acorn-walk: 8.2.0
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
+  ts-essentials@10.0.1(typescript@5.5.4):
+    optionalDependencies:
       typescript: 5.5.4
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
 
-  /ts-node@10.9.2(@types/node@20.14.14)(typescript@5.5.4):
-    resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==}
-    hasBin: true
-    peerDependencies:
-      '@swc/core': '>=1.2.50'
-      '@swc/wasm': '>=1.2.50'
-      '@types/node': '*'
-      typescript: '>=2.7'
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      '@swc/wasm':
-        optional: true
-    dependencies:
-      '@cspotcode/source-map-support': 0.8.1
-      '@tsconfig/node10': 1.0.9
-      '@tsconfig/node12': 1.0.11
-      '@tsconfig/node14': 1.0.3
-      '@tsconfig/node16': 1.0.3
-      '@types/node': 20.14.14
-      acorn: 8.12.1
-      acorn-walk: 8.3.2
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      typescript: 5.5.4
-      v8-compile-cache-lib: 3.0.1
-      yn: 3.1.1
+  ts-expose-internals-conditionally@1.0.0-empty.0: {}
 
-  /ts-pattern@4.3.0:
-    resolution: {integrity: sha512-pefrkcd4lmIVR0LA49Imjf9DYLK8vtWhqBPA3Ya1ir8xCW0O2yjL9dsCVvI7pCodLC5q7smNpEtDR2yVulQxOg==}
-    dev: true
+  ts-interface-checker@0.1.13: {}
 
-  /ts-poet@6.6.0:
-    resolution: {integrity: sha512-4vEH/wkhcjRPFOdBwIh9ItO6jOoumVLRF4aABDX5JSNEubSqwOulihxQPqai+OkuygJm3WYMInxXQX4QwVNMuw==}
+  ts-poet@6.6.0:
     dependencies:
       dprint-node: 1.0.8
-    dev: true
 
-  /ts-proto-descriptors@1.15.0:
-    resolution: {integrity: sha512-TYyJ7+H+7Jsqawdv+mfsEpZPTIj9siDHS6EMCzG/z3b/PZiphsX+mWtqFfFVe5/N0Th6V3elK9lQqjnrgTOfrg==}
+  ts-proto-descriptors@1.15.0:
     dependencies:
       long: 5.2.3
       protobufjs: 7.3.2
-    dev: true
 
-  /ts-proto@1.167.3:
-    resolution: {integrity: sha512-quBKTeIgqhTGKXl5JN7HHZjLwrdMaNIoQ0+X11PqNLVRqTlnEzfiCUXM6HOW4pZa6PD5+qSyKOEGaTa3kS7Glg==}
-    hasBin: true
+  ts-proto@1.167.3:
     dependencies:
       case-anything: 2.1.13
       protobufjs: 7.3.2
       ts-poet: 6.6.0
       ts-proto-descriptors: 1.15.0
-    dev: true
 
-  /tsafe@1.4.1:
-    resolution: {integrity: sha512-3IDBalvf6SyvHFS14UiwCWzqdSdo+Q0k2J7DZyJYaHW/iraW9DJpaBKDJpry3yQs3o/t/A+oGaRW3iVt2lKxzA==}
-    dev: false
+  tsafe@1.4.1: {}
 
-  /tsconfck@2.1.2(typescript@5.5.4):
-    resolution: {integrity: sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg==}
-    engines: {node: ^14.13.1 || ^16 || >=18}
-    hasBin: true
-    peerDependencies:
-      typescript: ^4.3.5 || ^5.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
+  tsconfck@2.1.2(typescript@5.5.4):
+    optionalDependencies:
       typescript: 5.5.4
-    dev: true
 
-  /tsconfck@3.1.3(typescript@5.5.4):
-    resolution: {integrity: sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==}
-    engines: {node: ^18 || >=20}
-    hasBin: true
-    peerDependencies:
-      typescript: ^5.0.0
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
+  tsconfck@3.1.3(typescript@5.5.4):
+    optionalDependencies:
       typescript: 5.5.4
-    dev: false
 
-  /tsconfig-paths@3.14.1:
-    resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
+  tsconfig-paths@3.14.1:
     dependencies:
       '@types/json5': 0.0.29
       json5: 1.0.2
       minimist: 1.2.7
       strip-bom: 3.0.0
-    dev: true
 
-  /tsconfig-paths@3.15.0:
-    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
+  tsconfig-paths@3.15.0:
     dependencies:
       '@types/json5': 0.0.29
       json5: 1.0.2
       minimist: 1.2.7
       strip-bom: 3.0.0
-    dev: true
 
-  /tsconfig-paths@4.2.0:
-    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
-    engines: {node: '>=6'}
+  tsconfig-paths@4.2.0:
     dependencies:
       json5: 2.2.3
       minimist: 1.2.7
       strip-bom: 3.0.0
-    dev: true
 
-  /tshy@3.0.2:
-    resolution: {integrity: sha512-8GkWnAfmNXxl8iDTZ1o2H4jdaj9H7HeDKkr5qd0ZhQBCNA41D3xqTyg2Ycs51VCfmjJ5e+0v9AUmD6ylAI9Bgw==}
-    engines: {node: 20 || >=22}
-    hasBin: true
+  tshy@3.0.2:
     dependencies:
       chalk: 5.3.0
       chokidar: 3.6.0
@@ -35409,54 +41189,28 @@ packages:
       sync-content: 2.0.1
       typescript: 5.5.4
       walk-up-path: 4.0.0
-    dev: true
 
-  /tslib@1.14.1:
-    resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
+  tslib@1.14.1: {}
 
-  /tslib@2.4.1:
-    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
+  tslib@2.4.1: {}
 
-  /tslib@2.5.0:
-    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
-    dev: false
+  tslib@2.5.0: {}
 
-  /tslib@2.6.2:
-    resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
-    dev: false
+  tslib@2.6.2: {}
 
-  /tslib@2.8.1:
-    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+  tslib@2.8.1: {}
 
-  /tsup@8.4.0(postcss@8.5.4)(tsx@4.17.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-b+eZbPCjz10fRryaAA7C8xlIHnf8VnsaRqydheLIqwG/Mcpfk8Z5zp3HayX7GaTygkigHl5cBUs+IhcySiIexQ==}
-    engines: {node: '>=18'}
-    hasBin: true
-    peerDependencies:
-      '@microsoft/api-extractor': ^7.36.0
-      '@swc/core': ^1
-      postcss: ^8.4.12
-      typescript: '>=4.5.0'
-    peerDependenciesMeta:
-      '@microsoft/api-extractor':
-        optional: true
-      '@swc/core':
-        optional: true
-      postcss:
-        optional: true
-      typescript:
-        optional: true
+  tsup@8.4.0(@swc/core@1.3.101(@swc/helpers@0.5.15))(jiti@2.4.2)(postcss@8.5.6)(tsx@4.17.0)(typescript@5.5.4)(yaml@2.7.1):
     dependencies:
       bundle-require: 5.1.0(esbuild@0.25.1)
       cac: 6.7.14
       chokidar: 4.0.3
       consola: 3.4.2
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.0
       esbuild: 0.25.1
       joycon: 3.1.1
       picocolors: 1.1.1
-      postcss: 8.5.4
-      postcss-load-config: 6.0.1(postcss@8.5.4)(tsx@4.17.0)
+      postcss-load-config: 6.0.1(jiti@2.4.2)(postcss@8.5.6)(tsx@4.17.0)(yaml@2.7.1)
       resolve-from: 5.0.0
       rollup: 4.36.0
       source-map: 0.8.0-beta.0
@@ -35464,72 +41218,58 @@ packages:
       tinyexec: 0.3.2
       tinyglobby: 0.2.12
       tree-kill: 1.2.2
+    optionalDependencies:
+      '@swc/core': 1.3.101(@swc/helpers@0.5.15)
+      postcss: 8.5.6
       typescript: 5.5.4
     transitivePeerDependencies:
       - jiti
       - supports-color
       - tsx
       - yaml
-    dev: true
 
-  /tsutils@3.21.0(typescript@5.5.4):
-    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
-    engines: {node: '>= 6'}
-    peerDependencies:
-      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
+  tsutils@3.21.0(typescript@5.5.4):
     dependencies:
       tslib: 1.14.1
       typescript: 5.5.4
-    dev: true
 
-  /tsx@3.12.2:
-    resolution: {integrity: sha512-ykAEkoBg30RXxeOMVeZwar+JH632dZn9EUJVyJwhfag62k6UO/dIyJEV58YuLF6e5BTdV/qmbQrpkWqjq9cUnQ==}
-    hasBin: true
+  tsx@3.12.2:
     dependencies:
       '@esbuild-kit/cjs-loader': 2.4.1
       '@esbuild-kit/core-utils': 3.0.0
       '@esbuild-kit/esm-loader': 2.5.4
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /tsx@4.17.0:
-    resolution: {integrity: sha512-eN4mnDA5UMKDt4YZixo9tBioibaMBpoxBkD+rIPAjVmYERSG0/dWEY1CEFuV89CgASlKL499q8AhmkMnnjtOJg==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  tsx@4.17.0:
     dependencies:
       esbuild: 0.23.0
       get-tsconfig: 4.7.6
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /tsx@4.19.3:
-    resolution: {integrity: sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  tsx@4.19.3:
     dependencies:
       esbuild: 0.25.1
       get-tsconfig: 4.7.6
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /tsx@4.7.1:
-    resolution: {integrity: sha512-8d6VuibXHtlN5E3zFkgY8u4DX7Y3Z27zvvPKVmLon/D4AjuKzarkUBTLDBgj9iTQ0hg5xM7c/mYiRVM+HETf0g==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  tsx@4.20.6:
+    dependencies:
+      esbuild: 0.25.1
+      get-tsconfig: 4.7.6
+    optionalDependencies:
+      fsevents: 2.3.3
+
+  tsx@4.7.1:
     dependencies:
       esbuild: 0.19.11
       get-tsconfig: 4.7.2
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /tty-table@4.1.6:
-    resolution: {integrity: sha512-kRj5CBzOrakV4VRRY5kUWbNYvo/FpOsz65DzI5op9P+cHov3+IqPbo1JE1ZnQGkHdZgNFDsrEjrfqqy/Ply9fw==}
-    engines: {node: '>=8.0.0'}
-    hasBin: true
+  tty-table@4.1.6:
     dependencies:
       chalk: 4.1.2
       csv: 5.5.3
@@ -35538,65 +41278,30 @@ packages:
       strip-ansi: 6.0.1
       wcwidth: 1.0.1
       yargs: 17.7.2
-    dev: false
 
-  /tunnel-agent@0.6.0:
-    resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+  tunnel-agent@0.6.0:
     dependencies:
       safe-buffer: 5.2.1
 
-  /turbo-darwin-64@1.10.3:
-    resolution: {integrity: sha512-IIB9IomJGyD3EdpSscm7Ip1xVWtYb7D0x7oH3vad3gjFcjHJzDz9xZ/iw/qItFEW+wGFcLSRPd+1BNnuLM8AsA==}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  turbo-darwin-64@1.10.3:
     optional: true
 
-  /turbo-darwin-arm64@1.10.3:
-    resolution: {integrity: sha512-SBNmOZU9YEB0eyNIxeeQ+Wi0Ufd+nprEVp41rgUSRXEIpXjsDjyBnKnF+sQQj3+FLb4yyi/yZQckB+55qXWEsw==}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  turbo-darwin-arm64@1.10.3:
     optional: true
 
-  /turbo-linux-64@1.10.3:
-    resolution: {integrity: sha512-kvAisGKE7xHJdyMxZLvg53zvHxjqPK1UVj4757PQqtx9dnjYHSc8epmivE6niPgDHon5YqImzArCjVZJYpIGHQ==}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  turbo-linux-64@1.10.3:
     optional: true
 
-  /turbo-linux-arm64@1.10.3:
-    resolution: {integrity: sha512-Qgaqln0IYRgyL0SowJOi+PNxejv1I2xhzXOI+D+z4YHbgSx87ox1IsALYBlK8VRVYY8VCXl+PN12r1ioV09j7A==}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
+  turbo-linux-arm64@1.10.3:
     optional: true
 
-  /turbo-windows-64@1.10.3:
-    resolution: {integrity: sha512-rbH9wManURNN8mBnN/ZdkpUuTvyVVEMiUwFUX4GVE5qmV15iHtZfDLUSGGCP2UFBazHcpNHG1OJzgc55GFFrUw==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  turbo-windows-64@1.10.3:
     optional: true
 
-  /turbo-windows-arm64@1.10.3:
-    resolution: {integrity: sha512-ThlkqxhcGZX39CaTjsHqJnqVe+WImjX13pmjnpChz6q5HHbeRxaJSFzgrHIOt0sUUVx90W/WrNRyoIt/aafniw==}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  turbo-windows-arm64@1.10.3:
     optional: true
 
-  /turbo@1.10.3:
-    resolution: {integrity: sha512-U4gKCWcKgLcCjQd4Pl8KJdfEKumpyWbzRu75A6FCj6Ctea1PIm58W6Ltw1QXKqHrl2pF9e1raAskf/h6dlrPCA==}
-    hasBin: true
-    requiresBuild: true
+  turbo@1.10.3:
     optionalDependencies:
       turbo-darwin-64: 1.10.3
       turbo-darwin-arm64: 1.10.3
@@ -35604,332 +41309,128 @@ packages:
       turbo-linux-arm64: 1.10.3
       turbo-windows-64: 1.10.3
       turbo-windows-arm64: 1.10.3
-    dev: true
-
-  /tw-animate-css@1.2.4:
-    resolution: {integrity: sha512-yt+HkJB41NAvOffe4NweJU6fLqAlVx/mBX6XmHRp15kq0JxTtOKaIw8pVSWM1Z+n2nXtyi7cW6C9f0WG/F/QAQ==}
-    dev: false
-
-  /tweetnacl@0.14.5:
-    resolution: {integrity: sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==}
-
-  /type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
-    dependencies:
-      prelude-ls: 1.2.1
 
-  /type-fest@0.13.1:
-    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
-    engines: {node: '>=10'}
-    dev: false
+  tw-animate-css@1.2.4: {}
 
-  /type-fest@0.16.0:
-    resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
-    engines: {node: '>=10'}
-    dev: true
+  tweetnacl@0.14.5: {}
 
-  /type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
+  type-check@0.4.0:
+    dependencies:
+      prelude-ls: 1.2.1
 
-  /type-fest@0.21.3:
-    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: '>=10'}
+  type-fest@0.13.1: {}
 
-  /type-fest@0.6.0:
-    resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==}
-    engines: {node: '>=8'}
+  type-fest@0.20.2: {}
 
-  /type-fest@0.7.1:
-    resolution: {integrity: sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==}
-    engines: {node: '>=8'}
-    dev: false
+  type-fest@0.6.0: {}
 
-  /type-fest@0.8.1:
-    resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==}
-    engines: {node: '>=8'}
+  type-fest@0.7.1: {}
 
-  /type-fest@2.19.0:
-    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
-    engines: {node: '>=12.20'}
-    dev: false
+  type-fest@0.8.1: {}
 
-  /type-fest@4.10.3:
-    resolution: {integrity: sha512-JLXyjizi072smKGGcZiAJDCNweT8J+AuRxmPZ1aG7TERg4ijx9REl8CNhbr36RV4qXqL1gO1FF9HL8OkVmmrsA==}
-    engines: {node: '>=16'}
-    dev: false
+  type-fest@2.19.0: {}
 
-  /type-fest@4.33.0:
-    resolution: {integrity: sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==}
-    engines: {node: '>=16'}
-    dev: false
+  type-fest@4.33.0: {}
 
-  /type-is@1.6.18:
-    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
-    engines: {node: '>= 0.6'}
+  type-is@1.6.18:
     dependencies:
       media-typer: 0.3.0
       mime-types: 2.1.35
 
-  /type-is@2.0.0:
-    resolution: {integrity: sha512-gd0sGezQYCbWSbkZr75mln4YBidWUN60+devscpLF5mtRDUpiaTvKpBNrdaCvel1NdR2k6vclXybU5fBd2i+nw==}
-    engines: {node: '>= 0.6'}
+  type-is@2.0.0:
     dependencies:
       content-type: 1.0.5
       media-typer: 1.1.0
       mime-types: 3.0.0
-    dev: false
 
-  /typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
-    engines: {node: '>= 0.4'}
+  type-is@2.0.1:
     dependencies:
-      call-bind: 1.0.7
+      content-type: 1.0.5
+      media-typer: 1.1.0
+      mime-types: 3.0.0
+
+  typed-array-buffer@1.0.2:
+    dependencies:
+      call-bind: 1.0.8
       es-errors: 1.3.0
       is-typed-array: 1.1.13
-    dev: true
 
-  /typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
-    engines: {node: '>= 0.4'}
+  typed-array-byte-length@1.0.1:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       for-each: 0.3.3
       gopd: 1.2.0
       has-proto: 1.0.3
       is-typed-array: 1.1.13
-    dev: true
 
-  /typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
-    engines: {node: '>= 0.4'}
+  typed-array-byte-offset@1.0.2:
     dependencies:
       available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       for-each: 0.3.3
       gopd: 1.2.0
       has-proto: 1.0.3
       is-typed-array: 1.1.13
-    dev: true
 
-  /typed-array-length@1.0.4:
-    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
+  typed-array-length@1.0.4:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       for-each: 0.3.3
-      is-typed-array: 1.1.10
+      is-typed-array: 1.1.13
 
-  /typed-array-length@1.0.6:
-    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
-    engines: {node: '>= 0.4'}
+  typed-array-length@1.0.6:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       for-each: 0.3.3
       gopd: 1.2.0
       has-proto: 1.0.3
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
-    dev: true
 
-  /typed-emitter@2.1.0:
-    resolution: {integrity: sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==}
+  typed-emitter@2.1.0:
     optionalDependencies:
       rxjs: 7.8.2
-    dev: true
-
-  /typed-query-selector@2.12.0:
-    resolution: {integrity: sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==}
-    dev: false
-
-  /typeorm@0.3.20(pg@8.11.5)(sqlite3@5.1.7)(ts-node@10.9.2):
-    resolution: {integrity: sha512-sJ0T08dV5eoZroaq9uPKBoNcGslHBR4E4y+EBHs//SiGbblGe7IeduP/IH4ddCcj0qp3PHwDwGnuvqEAnKlq/Q==}
-    engines: {node: '>=16.13.0'}
-    hasBin: true
-    peerDependencies:
-      '@google-cloud/spanner': ^5.18.0
-      '@sap/hana-client': ^2.12.25
-      better-sqlite3: ^7.1.2 || ^8.0.0 || ^9.0.0
-      hdb-pool: ^0.1.6
-      ioredis: ^5.0.4
-      mongodb: ^5.8.0
-      mssql: ^9.1.1 || ^10.0.1
-      mysql2: ^2.2.5 || ^3.0.1
-      oracledb: ^6.3.0
-      pg: ^8.5.1
-      pg-native: ^3.0.0
-      pg-query-stream: ^4.0.0
-      redis: ^3.1.1 || ^4.0.0
-      sql.js: ^1.4.0
-      sqlite3: ^5.0.3
-      ts-node: ^10.7.0
-      typeorm-aurora-data-api-driver: ^2.0.0
-    peerDependenciesMeta:
-      '@google-cloud/spanner':
-        optional: true
-      '@sap/hana-client':
-        optional: true
-      better-sqlite3:
-        optional: true
-      hdb-pool:
-        optional: true
-      ioredis:
-        optional: true
-      mongodb:
-        optional: true
-      mssql:
-        optional: true
-      mysql2:
-        optional: true
-      oracledb:
-        optional: true
-      pg:
-        optional: true
-      pg-native:
-        optional: true
-      pg-query-stream:
-        optional: true
-      redis:
-        optional: true
-      sql.js:
-        optional: true
-      sqlite3:
-        optional: true
-      ts-node:
-        optional: true
-      typeorm-aurora-data-api-driver:
-        optional: true
-    dependencies:
-      '@sqltools/formatter': 1.2.5
-      app-root-path: 3.1.0
-      buffer: 6.0.3
-      chalk: 4.1.2
-      cli-highlight: 2.1.11
-      dayjs: 1.11.13
-      debug: 4.3.4
-      dotenv: 16.4.7
-      glob: 10.3.10
-      mkdirp: 2.1.6
-      pg: 8.11.5
-      reflect-metadata: 0.2.2
-      sha.js: 2.4.11
-      sqlite3: 5.1.7
-      ts-node: 10.9.2(@types/node@20.14.14)(typescript@5.5.4)
-      tslib: 2.6.2
-      uuid: 9.0.1
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
-  /typescript@5.1.6:
-    resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==}
-    engines: {node: '>=14.17'}
-    hasBin: true
-    dev: false
 
-  /typescript@5.3.3:
-    resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==}
-    engines: {node: '>=14.17'}
-    hasBin: true
-    dev: true
+  typed-query-selector@2.12.0: {}
 
-  /typescript@5.5.4:
-    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
-    engines: {node: '>=14.17'}
-    hasBin: true
+  typescript@5.5.4: {}
 
-  /ufo@1.5.4:
-    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
+  ufo@1.5.4: {}
 
-  /ufo@1.6.1:
-    resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==}
-    dev: false
+  ufo@1.6.1: {}
 
-  /uid2@1.0.0:
-    resolution: {integrity: sha512-+I6aJUv63YAcY9n4mQreLUt0d4lvwkkopDNmpomkAUz0fAkEMV9pRWxN0EjhW1YfRhcuyHg2v3mwddCDW1+LFQ==}
-    engines: {node: '>= 4.0.0'}
-    dev: false
+  uid2@1.0.0: {}
 
-  /uint8array-extras@1.4.0:
-    resolution: {integrity: sha512-ZPtzy0hu4cZjv3z5NW9gfKnNLjoz4y6uv4HlelAjDK7sY/xOkKZv9xK/WQpcsBB3jEybChz9DPC2U/+cusjJVQ==}
-    engines: {node: '>=18'}
-    dev: true
+  uint8array-extras@1.4.0: {}
 
-  /ulid@2.3.0:
-    resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
-    hasBin: true
-    dev: false
+  ulid@2.3.0: {}
 
-  /ulidx@2.2.1:
-    resolution: {integrity: sha512-DU9F5t1tihdafuNyW3fIrXUFHHiHxmwuQSGVGIbSpqkc93IH4P0dU8nPhk0gOW7ARxaFu4+P/9cxVwn6PdnIaQ==}
-    engines: {node: '>=16'}
+  ulidx@2.2.1:
     dependencies:
       layerr: 2.0.1
-    dev: false
 
-  /unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+  unbox-primitive@1.0.2:
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       has-bigints: 1.0.2
       has-symbols: 1.1.0
       which-boxed-primitive: 1.0.2
 
-  /unbzip2-stream@1.4.3:
-    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
-    dependencies:
-      buffer: 5.7.1
-      through: 2.3.8
-    dev: false
-
-  /uncrypto@0.1.3:
-    resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==}
-    dev: false
-
-  /undici-types@5.26.5:
-    resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
-
-  /undici-types@6.20.0:
-    resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
-    dev: false
+  uncrypto@0.1.3: {}
 
-  /undici@5.28.4:
-    resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
-    engines: {node: '>=14.0'}
-    dependencies:
-      '@fastify/busboy': 2.0.0
-    dev: false
+  undici-types@5.26.5: {}
 
-  /undici@5.29.0:
-    resolution: {integrity: sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==}
-    engines: {node: '>=14.0'}
+  undici@5.29.0:
     dependencies:
-      '@fastify/busboy': 2.0.0
+      '@fastify/busboy': 2.1.1
 
-  /unenv-nightly@1.10.0-1717606461.a117952:
-    resolution: {integrity: sha512-u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==}
-    dependencies:
-      consola: 3.4.2
-      defu: 6.1.4
-      mime: 3.0.0
-      node-fetch-native: 1.6.6
-      pathe: 1.1.2
-      ufo: 1.6.1
-    dev: false
+  unicode-emoji-modifier-base@1.0.0: {}
 
-  /unicode-emoji-modifier-base@1.0.0:
-    resolution: {integrity: sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==}
-    engines: {node: '>=4'}
-    dev: true
+  unicorn-magic@0.1.0: {}
 
-  /unicorn-magic@0.1.0:
-    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
-    engines: {node: '>=18'}
-    dev: true
+  unicorn-magic@0.3.0: {}
 
-  /unified@10.1.2:
-    resolution: {integrity: sha512-pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==}
+  unified@10.1.2:
     dependencies:
       '@types/unist': 2.0.6
       bail: 2.0.2
@@ -35938,10 +41439,8 @@ packages:
       is-plain-obj: 4.1.0
       trough: 2.1.0
       vfile: 5.3.7
-    dev: true
 
-  /unified@11.0.5:
-    resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==}
+  unified@11.0.5:
     dependencies:
       '@types/unist': 3.0.3
       bail: 2.0.2
@@ -35950,513 +41449,280 @@ packages:
       is-plain-obj: 4.1.0
       trough: 2.1.0
       vfile: 6.0.3
-    dev: false
-
-  /unique-filename@1.1.1:
-    resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
-    requiresBuild: true
-    dependencies:
-      unique-slug: 2.0.2
-    dev: false
-    optional: true
 
-  /unique-filename@3.0.0:
-    resolution: {integrity: sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  unique-filename@3.0.0:
     dependencies:
       unique-slug: 4.0.0
 
-  /unique-slug@2.0.2:
-    resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
-    requiresBuild: true
-    dependencies:
-      imurmurhash: 0.1.4
-    dev: false
-    optional: true
-
-  /unique-slug@4.0.0:
-    resolution: {integrity: sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  unique-slug@4.0.0:
     dependencies:
       imurmurhash: 0.1.4
 
-  /unique-string@2.0.0:
-    resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}
-    engines: {node: '>=8'}
+  unist-util-find-after@5.0.0:
     dependencies:
-      crypto-random-string: 2.0.0
-    dev: true
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.0
 
-  /unist-util-generated@2.0.0:
-    resolution: {integrity: sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw==}
-    dev: true
+  unist-util-generated@2.0.0: {}
 
-  /unist-util-is@5.1.1:
-    resolution: {integrity: sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ==}
-    dev: true
+  unist-util-is@5.1.1: {}
 
-  /unist-util-is@6.0.0:
-    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
+  unist-util-is@6.0.0:
     dependencies:
       '@types/unist': 3.0.3
-    dev: false
 
-  /unist-util-position-from-estree@1.1.1:
-    resolution: {integrity: sha512-xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw==}
+  unist-util-position-from-estree@1.1.1:
     dependencies:
       '@types/unist': 2.0.6
-    dev: true
 
-  /unist-util-position@4.0.3:
-    resolution: {integrity: sha512-p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ==}
+  unist-util-position@4.0.3:
     dependencies:
       '@types/unist': 2.0.6
-    dev: true
 
-  /unist-util-position@5.0.0:
-    resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
+  unist-util-position@5.0.0:
     dependencies:
       '@types/unist': 3.0.3
-    dev: false
 
-  /unist-util-remove-position@4.0.1:
-    resolution: {integrity: sha512-0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ==}
+  unist-util-remove-position@4.0.1:
     dependencies:
       '@types/unist': 2.0.6
       unist-util-visit: 4.1.2
-    dev: true
 
-  /unist-util-stringify-position@3.0.2:
-    resolution: {integrity: sha512-7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg==}
+  unist-util-remove-position@5.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-visit: 5.0.0
+
+  unist-util-stringify-position@3.0.2:
     dependencies:
       '@types/unist': 2.0.6
-    dev: true
 
-  /unist-util-stringify-position@4.0.0:
-    resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
+  unist-util-stringify-position@4.0.0:
     dependencies:
       '@types/unist': 3.0.3
-    dev: false
 
-  /unist-util-visit-parents@5.1.1:
-    resolution: {integrity: sha512-gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw==}
+  unist-util-visit-parents@5.1.1:
     dependencies:
       '@types/unist': 2.0.6
       unist-util-is: 5.1.1
-    dev: true
 
-  /unist-util-visit-parents@6.0.1:
-    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
+  unist-util-visit-parents@6.0.1:
     dependencies:
       '@types/unist': 3.0.3
       unist-util-is: 6.0.0
-    dev: false
 
-  /unist-util-visit@4.1.2:
-    resolution: {integrity: sha512-MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg==}
+  unist-util-visit@4.1.2:
     dependencies:
       '@types/unist': 2.0.6
       unist-util-is: 5.1.1
       unist-util-visit-parents: 5.1.1
-    dev: true
 
-  /unist-util-visit@5.0.0:
-    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
+  unist-util-visit@5.0.0:
     dependencies:
       '@types/unist': 3.0.3
       unist-util-is: 6.0.0
       unist-util-visit-parents: 6.0.1
-    dev: false
 
-  /universal-cookie@7.2.0:
-    resolution: {integrity: sha512-PvcyflJAYACJKr28HABxkGemML5vafHmiL4ICe3e+BEKXRMt0GaFLZhAwgv637kFFnnfiSJ8e6jknrKkMrU+PQ==}
+  universal-cookie@7.2.0:
     dependencies:
       '@types/cookie': 0.6.0
       cookie: 0.6.0
-    dev: false
 
-  /universalify@0.1.2:
-    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
-    engines: {node: '>= 4.0.0'}
+  universal-github-app-jwt@1.2.0:
+    dependencies:
+      '@types/jsonwebtoken': 9.0.10
+      jsonwebtoken: 9.0.2
 
-  /universalify@0.2.0:
-    resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
-    engines: {node: '>= 4.0.0'}
-    dev: false
+  universal-user-agent@6.0.1: {}
 
-  /universalify@2.0.0:
-    resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==}
-    engines: {node: '>= 10.0.0'}
-    dev: true
+  universalify@0.1.2: {}
 
-  /unpipe@1.0.0:
-    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
-    engines: {node: '>= 0.8'}
+  universalify@2.0.0: {}
 
-  /unplugin@1.0.1:
-    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
-    dependencies:
-      acorn: 8.12.1
-      chokidar: 3.6.0
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.5.0
-    dev: false
+  unpipe@1.0.0: {}
 
-  /update-browserslist-db@1.0.11(browserslist@4.21.4):
-    resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
+  update-browserslist-db@1.0.11(browserslist@4.21.4):
     dependencies:
       browserslist: 4.21.4
       escalade: 3.2.0
       picocolors: 1.1.1
-    dev: true
-
-  /update-browserslist-db@1.1.0(browserslist@4.23.3):
-    resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-    dependencies:
-      browserslist: 4.23.3
-      escalade: 3.2.0
-      picocolors: 1.1.1
-    dev: false
 
-  /update-browserslist-db@1.1.2(browserslist@4.24.4):
-    resolution: {integrity: sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
+  update-browserslist-db@1.1.2(browserslist@4.24.4):
     dependencies:
       browserslist: 4.24.4
       escalade: 3.2.0
       picocolors: 1.1.1
 
-  /update-browserslist-db@1.1.3(browserslist@4.25.0):
-    resolution: {integrity: sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
+  update-browserslist-db@1.1.4(browserslist@4.28.0):
     dependencies:
-      browserslist: 4.25.0
+      browserslist: 4.28.0
       escalade: 3.2.0
       picocolors: 1.1.1
-    dev: true
 
-  /uploadthing@7.1.0(next@14.2.21)(tailwindcss@3.4.1):
-    resolution: {integrity: sha512-l1bRHs+q/YLx3XwBav98t4Bl1wLWaskhPEwopxtYgiRrxX5nW3uUuSP0RJ9eKwx0+6ZhHWxHDvShf7ZLledqmQ==}
-    engines: {node: '>=18.13.0'}
-    peerDependencies:
-      express: '*'
-      fastify: '*'
-      h3: '*'
-      next: '*'
-      tailwindcss: '*'
-    peerDependenciesMeta:
-      express:
-        optional: true
-      fastify:
-        optional: true
-      h3:
-        optional: true
-      next:
-        optional: true
-      tailwindcss:
-        optional: true
+  uploadthing@7.1.0(express@5.2.1)(fastify@5.4.0)(next@14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1))(tailwindcss@3.4.1):
     dependencies:
-      '@effect/platform': 0.63.2(@effect/schema@0.72.2)(effect@3.7.2)
+      '@effect/platform': 0.63.2(@effect/schema@0.72.2(effect@3.7.2))(effect@3.7.2)
       '@effect/schema': 0.72.2(effect@3.7.2)
       '@uploadthing/mime-types': 0.3.0
       '@uploadthing/shared': 7.0.3
       effect: 3.7.2
-      next: 14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0)(react@18.3.1)
-      tailwindcss: 3.4.1(ts-node@10.9.1)
-    dev: false
+    optionalDependencies:
+      express: 5.2.1
+      fastify: 5.4.0
+      next: 14.2.21(@opentelemetry/api@1.9.0)(@playwright/test@1.37.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1)
+      tailwindcss: 3.4.1
 
-  /uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+  uri-js@4.4.1:
     dependencies:
       punycode: 2.2.0
 
-  /url-parse-lax@3.0.0:
-    resolution: {integrity: sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==}
-    engines: {node: '>=4'}
+  url-parse-lax@3.0.0:
     dependencies:
       prepend-http: 2.0.0
-    dev: true
 
-  /url-parse@1.5.10:
-    resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
-    dependencies:
-      querystringify: 2.2.0
-      requires-port: 1.0.0
-    dev: false
-
-  /urlpattern-polyfill@10.0.0:
-    resolution: {integrity: sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==}
-    dev: false
-
-  /urlpattern-polyfill@9.0.0:
-    resolution: {integrity: sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==}
-    dev: false
+  urlpattern-polyfill@9.0.0: {}
 
-  /use-callback-ref@1.3.3(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  use-callback-ref@1.3.3(@types/react@18.2.69)(react@18.2.0):
     dependencies:
-      '@types/react': 18.2.69
       react: 18.2.0
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /use-callback-ref@1.3.3(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  use-callback-ref@1.3.3(@types/react@18.3.1)(react@18.3.1):
     dependencies:
-      '@types/react': 18.3.1
       react: 18.3.1
       tslib: 2.8.1
-    dev: false
-
-  /use-isomorphic-layout-effect@1.1.2(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-    dependencies:
-      '@types/react': 18.2.69
-      react: 18.2.0
-    dev: false
-
-  /use-sidecar@1.1.3(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+    optionalDependencies:
+      '@types/react': 18.3.1
+
+  use-isomorphic-layout-effect@1.1.2(@types/react@18.2.69)(react@18.2.0):
     dependencies:
+      react: 18.2.0
+    optionalDependencies:
       '@types/react': 18.2.69
+
+  use-sidecar@1.1.3(@types/react@18.2.69)(react@18.2.0):
+    dependencies:
       detect-node-es: 1.1.0
       react: 18.2.0
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.2.69
 
-  /use-sidecar@1.1.3(@types/react@18.3.1)(react@18.3.1):
-    resolution: {integrity: sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      '@types/react': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
+  use-sidecar@1.1.3(@types/react@18.3.1)(react@18.3.1):
     dependencies:
-      '@types/react': 18.3.1
       detect-node-es: 1.1.0
       react: 18.3.1
       tslib: 2.8.1
-    dev: false
+    optionalDependencies:
+      '@types/react': 18.3.1
 
-  /use-sync-external-store@1.2.2(react@18.2.0):
-    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  use-sync-external-store@1.2.2(react@18.2.0):
     dependencies:
       react: 18.2.0
-    dev: false
 
-  /use-sync-external-store@1.2.2(react@18.3.1):
-    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  use-sync-external-store@1.2.2(react@18.3.1):
     dependencies:
       react: 18.3.1
 
-  /use-sync-external-store@1.2.2(react@19.0.0):
-    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+  use-sync-external-store@1.2.2(react@19.0.0):
     dependencies:
       react: 19.0.0
-    dev: false
-
-  /use-sync-external-store@1.2.2(react@19.0.0-rc.0):
-    resolution: {integrity: sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      react: 19.0.0-rc.0
-    dev: false
 
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+  util-deprecate@1.0.2: {}
 
-  /util@0.12.5:
-    resolution: {integrity: sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==}
+  util@0.12.5:
     dependencies:
       inherits: 2.0.4
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
-      is-typed-array: 1.1.10
-      which-typed-array: 1.1.9
+      is-typed-array: 1.1.13
+      which-typed-array: 1.1.15
 
-  /utils-merge@1.0.1:
-    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
-    engines: {node: '>= 0.4.0'}
+  utils-merge@1.0.1: {}
 
-  /uuid@10.0.0:
-    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
-    hasBin: true
+  uuid@10.0.0: {}
 
-  /uuid@3.4.0:
-    resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
-    deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
-    hasBin: true
-    dev: false
+  uuid@11.1.0: {}
 
-  /uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-    dev: false
+  uuid@3.4.0: {}
 
-  /uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    hasBin: true
+  uuid@8.3.2: {}
 
-  /uuid@9.0.1:
-    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
-    hasBin: true
-    dev: false
+  uuid@9.0.0: {}
 
-  /uvu@0.5.6:
-    resolution: {integrity: sha512-+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==}
-    engines: {node: '>=8'}
-    hasBin: true
+  uuid@9.0.1: {}
+
+  uvu@0.5.6:
     dependencies:
       dequal: 2.0.3
       diff: 5.1.0
       kleur: 4.1.5
       sade: 1.8.1
-    dev: true
-
-  /v8-compile-cache-lib@3.0.1:
-    resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==}
 
-  /vali-date@1.0.0:
-    resolution: {integrity: sha512-sgECfZthyaCKW10N0fm27cg8HYTFK5qMWgypqkXMQ4Wbl/zZKx7xZICgcoxIIE+WFAP/MBL2EFwC/YvLxw3Zeg==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /valibot@0.42.1(typescript@5.5.4):
-    resolution: {integrity: sha512-3keXV29Ar5b//Hqi4MbSdV7lfVp6zuYLZuA9V1PvQUsXqogr+u5lvLPLk3A4f74VUXDnf/JfWMN6sB+koJ/FFw==}
-    peerDependencies:
-      typescript: '>=5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
+  valibot@1.1.0(typescript@5.5.4):
+    optionalDependencies:
       typescript: 5.5.4
-    dev: false
 
-  /validate-npm-package-license@3.0.4:
-    resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
+  validate-npm-package-license@3.0.4:
     dependencies:
       spdx-correct: 3.1.1
       spdx-expression-parse: 3.0.1
 
-  /validate-npm-package-name@3.0.0:
-    resolution: {integrity: sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==}
+  validate-npm-package-name@3.0.0:
     dependencies:
       builtins: 1.0.3
-    dev: true
 
-  /validate-npm-package-name@5.0.0:
-    resolution: {integrity: sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  validate-npm-package-name@5.0.0:
     dependencies:
       builtins: 5.0.1
-    dev: true
 
-  /validate.io-array@1.0.6:
-    resolution: {integrity: sha512-DeOy7CnPEziggrOO5CZhVKJw6S3Yi7e9e65R1Nl/RTN1vTQKnzjfvks0/8kQ40FP/dsjRAOd4hxmJ7uLa6vxkg==}
-    dev: true
+  validate.io-array@1.0.6: {}
 
-  /validate.io-function@1.0.2:
-    resolution: {integrity: sha512-LlFybRJEriSuBnUhQyG5bwglhh50EpTL2ul23MPIuR1odjO7XaMLFV8vHGwp7AZciFxtYOeiSCT5st+XSPONiQ==}
-    dev: true
+  validate.io-function@1.0.2: {}
 
-  /vary@1.1.2:
-    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
-    engines: {node: '>= 0.8'}
+  vary@1.1.2: {}
 
-  /verror@1.10.0:
-    resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
-    engines: {'0': node >=0.6.0}
+  verror@1.10.0:
     dependencies:
       assert-plus: 1.0.0
       core-util-is: 1.0.2
       extsprintf: 1.3.0
-    dev: false
 
-  /vfile-location@4.0.1:
-    resolution: {integrity: sha512-JDxPlTbZrZCQXogGheBHjbRWjESSPEak770XwWPfw5mTc1v1nWGLB/apzZxsx8a0SJVfF8HK8ql8RD308vXRUw==}
+  vfile-location@4.0.1:
     dependencies:
       '@types/unist': 2.0.6
       vfile: 5.3.7
-    dev: true
 
-  /vfile-message@3.1.3:
-    resolution: {integrity: sha512-0yaU+rj2gKAyEk12ffdSbBfjnnj+b1zqTBv3OQCTn8yEB02bsPizwdBPrLJjHnK+cU9EMMcUnNv938XcZIkmdA==}
+  vfile-location@5.0.3:
+    dependencies:
+      '@types/unist': 3.0.3
+      vfile: 6.0.3
+
+  vfile-message@3.1.3:
     dependencies:
       '@types/unist': 2.0.6
       unist-util-stringify-position: 3.0.2
-    dev: true
 
-  /vfile-message@4.0.2:
-    resolution: {integrity: sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==}
+  vfile-message@4.0.2:
     dependencies:
       '@types/unist': 3.0.3
       unist-util-stringify-position: 4.0.0
-    dev: false
 
-  /vfile@5.3.7:
-    resolution: {integrity: sha512-r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==}
+  vfile@5.3.7:
     dependencies:
       '@types/unist': 2.0.6
       is-buffer: 2.0.5
       unist-util-stringify-position: 3.0.2
       vfile-message: 3.1.3
-    dev: true
 
-  /vfile@6.0.3:
-    resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
+  vfile@6.0.3:
     dependencies:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
-    dev: false
 
-  /victory-vendor@36.6.11:
-    resolution: {integrity: sha512-nT8kCiJp8dQh8g991J/R5w5eE2KnO8EAIP0xocWlh9l2okngMWglOPoMZzJvek8Q1KUc4XE/mJxTZnvOB1sTYg==}
+  victory-vendor@36.6.11:
     dependencies:
       '@types/d3-array': 3.0.8
       '@types/d3-ease': 3.0.0
@@ -36472,21 +41738,17 @@ packages:
       d3-shape: 3.2.0
       d3-time: 3.1.0
       d3-timer: 3.0.1
-    dev: false
 
-  /vite-node@0.28.5(@types/node@20.14.14):
-    resolution: {integrity: sha512-LmXb9saMGlrMZbXTvOveJKwMTBTNUH66c8rJnQ0ZPNX+myPEol64+szRzXtV5ORb0Hb/91yq+/D3oERoyAt6LA==}
-    engines: {node: '>=v14.16.0'}
-    hasBin: true
+  vite-node@0.28.5(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@10.0.0)
-      mlly: 1.7.1
+      debug: 4.4.1(supports-color@10.0.0)
+      mlly: 1.7.4
       pathe: 1.1.2
       picocolors: 1.1.1
       source-map: 0.6.1
       source-map-support: 0.5.21
-      vite: 4.4.9(@types/node@20.14.14)
+      vite: 4.4.9(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -36496,31 +41758,26 @@ packages:
       - sugarss
       - supports-color
       - terser
-    dev: true
 
-  /vite-node@3.1.4(@types/node@20.14.14):
-    resolution: {integrity: sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
+  vite-node@3.1.4(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 5.2.7(@types/node@20.14.14)
+      vite: 5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
       - lightningcss
       - sass
+      - sass-embedded
       - stylus
       - sugarss
       - supports-color
       - terser
-    dev: true
 
-  /vite-tsconfig-paths@4.0.5(typescript@5.5.4):
-    resolution: {integrity: sha512-/L/eHwySFYjwxoYt1WRJniuK/jPv+WGwgRGBYx3leciR5wBeqntQpUE6Js6+TJemChc+ter7fDBKieyEWDx4yQ==}
+  vite-tsconfig-paths@4.0.5(typescript@5.5.4):
     dependencies:
       debug: 4.3.7(supports-color@10.0.0)
       globrex: 0.1.2
@@ -36528,154 +41785,42 @@ packages:
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
-
-  /vite@4.1.4(@types/node@20.14.14):
-    resolution: {integrity: sha512-3knk/HsbSTKEin43zHu7jTwYWv81f8kgAL99G5NWBcA1LKvtvcVAC4JjBH1arBunO9kQka+1oGbrMKOjk4ZrBg==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      '@types/node': 20.14.14
-      esbuild: 0.16.17
-      postcss: 8.5.3
-      resolve: 1.22.8
-      rollup: 3.10.0
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
 
-  /vite@4.4.9(@types/node@20.14.14):
-    resolution: {integrity: sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
+  vite@4.4.9(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1):
     dependencies:
-      '@types/node': 20.14.14
       esbuild: 0.18.11
-      postcss: 8.5.3
+      postcss: 8.5.6
       rollup: 3.29.1
     optionalDependencies:
+      '@types/node': 20.14.14
       fsevents: 2.3.3
-    dev: true
+      lightningcss: 1.29.2
+      terser: 5.44.1
 
-  /vite@5.2.7(@types/node@20.14.14):
-    resolution: {integrity: sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
+  vite@5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1):
     dependencies:
-      '@types/node': 20.14.14
-      esbuild: 0.20.2
-      postcss: 8.5.3
+      esbuild: 0.21.5
+      postcss: 8.5.6
       rollup: 4.36.0
     optionalDependencies:
+      '@types/node': 20.14.14
       fsevents: 2.3.3
-    dev: true
+      lightningcss: 1.29.2
+      terser: 5.44.1
 
-  /vitest@3.1.4(@types/node@20.14.14):
-    resolution: {integrity: sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==}
-    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
-    hasBin: true
-    peerDependencies:
-      '@edge-runtime/vm': '*'
-      '@types/debug': ^4.1.12
-      '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0
-      '@vitest/browser': 3.1.4
-      '@vitest/ui': 3.1.4
-      happy-dom: '*'
-      jsdom: '*'
-    peerDependenciesMeta:
-      '@edge-runtime/vm':
-        optional: true
-      '@types/debug':
-        optional: true
-      '@types/node':
-        optional: true
-      '@vitest/browser':
-        optional: true
-      '@vitest/ui':
-        optional: true
-      happy-dom:
-        optional: true
-      jsdom:
-        optional: true
+  vitest@3.1.4(@types/debug@4.1.12)(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1):
     dependencies:
-      '@types/node': 20.14.14
       '@vitest/expect': 3.1.4
-      '@vitest/mocker': 3.1.4(vite@5.2.7)
+      '@vitest/mocker': 3.1.4(vite@5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1))
       '@vitest/pretty-format': 3.1.4
       '@vitest/runner': 3.1.4
       '@vitest/snapshot': 3.1.4
       '@vitest/spy': 3.1.4
       '@vitest/utils': 3.1.4
       chai: 5.2.0
-      debug: 4.4.0(supports-color@10.0.0)
+      debug: 4.4.1(supports-color@10.0.0)
       expect-type: 1.2.1
-      magic-string: 0.30.17
+      magic-string: 0.30.21
       pathe: 2.0.3
       std-env: 3.9.0
       tinybench: 2.9.0
@@ -36683,104 +41828,82 @@ packages:
       tinyglobby: 0.2.13
       tinypool: 1.0.2
       tinyrainbow: 2.0.0
-      vite: 5.2.7(@types/node@20.14.14)
-      vite-node: 3.1.4(@types/node@20.14.14)
+      vite: 5.4.21(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
+      vite-node: 3.1.4(@types/node@20.14.14)(lightningcss@1.29.2)(terser@5.44.1)
       why-is-node-running: 2.3.0
+    optionalDependencies:
+      '@types/debug': 4.1.12
+      '@types/node': 20.14.14
     transitivePeerDependencies:
       - less
       - lightningcss
       - msw
       - sass
+      - sass-embedded
       - stylus
       - sugarss
       - supports-color
       - terser
-    dev: true
 
-  /vue@3.5.16(typescript@5.5.4):
-    resolution: {integrity: sha512-rjOV2ecxMd5SiAmof2xzh2WxntRcigkX/He4YFJ6WdRvVUrbt6DxC1Iujh10XLl8xCDRDtGKMeO3D+pRQ1PP9w==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  vscode-jsonrpc@8.2.0: {}
+
+  vscode-languageserver-protocol@3.17.5:
     dependencies:
-      '@vue/compiler-dom': 3.5.16
-      '@vue/compiler-sfc': 3.5.16
-      '@vue/runtime-dom': 3.5.16
-      '@vue/server-renderer': 3.5.16(vue@3.5.16)
-      '@vue/shared': 3.5.16
-      typescript: 5.5.4
+      vscode-jsonrpc: 8.2.0
+      vscode-languageserver-types: 3.17.5
 
-  /w3c-keyname@2.2.6:
-    resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
-    dev: false
+  vscode-languageserver-textdocument@1.0.12: {}
 
-  /w3c-keyname@2.2.8:
-    resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
-    dev: false
+  vscode-languageserver-types@3.17.5: {}
 
-  /walk-up-path@4.0.0:
-    resolution: {integrity: sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==}
-    engines: {node: 20 || >=22}
-    dev: true
+  vscode-languageserver@9.0.1:
+    dependencies:
+      vscode-languageserver-protocol: 3.17.5
 
-  /warning@4.0.3:
-    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
+  vscode-uri@3.0.8: {}
+
+  w3c-keyname@2.2.8: {}
+
+  walk-up-path@4.0.0: {}
+
+  warning@4.0.3:
     dependencies:
       loose-envify: 1.4.0
-    dev: false
 
-  /watchpack@2.4.0:
-    resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
-    engines: {node: '>=10.13.0'}
+  watchpack@2.4.0:
     dependencies:
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
-    dev: false
 
-  /watchpack@2.4.4:
-    resolution: {integrity: sha512-c5EGNOiyxxV5qmTtAB7rbiXxi1ooX1pQKMLX/MIabJjRA0SJBQOjKF+KSVfHkr9U1cADPon0mRiVe/riyaiDUA==}
-    engines: {node: '>=10.13.0'}
+  watchpack@2.4.4:
     dependencies:
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
-    dev: true
 
-  /wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+  wcwidth@1.0.1:
     dependencies:
       defaults: 1.0.4
 
-  /web-encoding@1.1.5:
-    resolution: {integrity: sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==}
+  web-encoding@1.1.5:
     dependencies:
       util: 0.12.5
     optionalDependencies:
       '@zxing/text-encoding': 0.9.0
 
-  /web-streams-polyfill@3.2.1:
-    resolution: {integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==}
-    engines: {node: '>= 8'}
+  web-namespaces@2.0.1: {}
 
-  /web-streams-polyfill@4.0.0-beta.3:
-    resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
-    engines: {node: '>= 14'}
+  web-streams-polyfill@3.2.1: {}
 
-  /webidl-conversions@3.0.1:
-    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
+  web-streams-polyfill@4.0.0-beta.3: {}
 
-  /webidl-conversions@4.0.2:
-    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
-    dev: true
+  webidl-conversions@3.0.1: {}
 
-  /webpack-bundle-analyzer@4.10.1:
-    resolution: {integrity: sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==}
-    engines: {node: '>= 10.13.0'}
-    hasBin: true
+  webidl-conversions@4.0.2: {}
+
+  webpack-bundle-analyzer@4.10.1(bufferutil@4.0.9):
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      acorn: 8.12.1
+      acorn: 8.15.0
       acorn-walk: 8.3.2
       commander: 7.2.0
       debounce: 1.2.1
@@ -36791,86 +41914,59 @@ packages:
       opener: 1.5.2
       picocolors: 1.1.1
       sirv: 2.0.4
-      ws: 7.5.9
+      ws: 8.17.1(bufferutil@4.0.9)
     transitivePeerDependencies:
-      - bufferutil
-      - utf-8-validate
-    dev: true
-
-  /webpack-sources@3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-    dev: false
-
-  /webpack-sources@3.3.2:
-    resolution: {integrity: sha512-ykKKus8lqlgXX/1WjudpIEjqsafjOTcOJqxnAbMLAu/KCsDCJ6GBtvscewvTkrn24HsnvFwrSCbenFrhtcCsAA==}
-    engines: {node: '>=10.13.0'}
-    dev: true
-
-  /webpack-virtual-modules@0.5.0:
-    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
-    dev: false
-
-  /webpack@5.88.2(@swc/core@1.3.101)(esbuild@0.19.11):
-    resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
+      - bufferutil
+      - utf-8-validate
+
+  webpack-sources@3.2.3: {}
+
+  webpack-sources@3.3.3: {}
+
+  webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18):
     dependencies:
-      '@types/eslint-scope': 3.7.4
-      '@types/estree': 1.0.7
-      '@webassemblyjs/ast': 1.11.5
-      '@webassemblyjs/wasm-edit': 1.11.5
-      '@webassemblyjs/wasm-parser': 1.11.5
-      acorn: 8.12.1
-      acorn-import-assertions: 1.9.0(acorn@8.12.1)
-      browserslist: 4.24.4
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.18.1
+      '@types/eslint-scope': 3.7.7
+      '@types/estree': 1.0.8
+      '@types/json-schema': 7.0.15
+      '@webassemblyjs/ast': 1.14.1
+      '@webassemblyjs/wasm-edit': 1.14.1
+      '@webassemblyjs/wasm-parser': 1.14.1
+      acorn: 8.15.0
+      acorn-import-phases: 1.0.4(acorn@8.15.0)
+      browserslist: 4.28.0
+      chrome-trace-event: 1.0.4
+      enhanced-resolve: 5.18.3
       es-module-lexer: 1.7.0
       eslint-scope: 5.1.1
       events: 3.3.0
       glob-to-regexp: 0.4.1
       graceful-fs: 4.2.11
       json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
+      loader-runner: 4.3.1
       mime-types: 2.1.35
       neo-async: 2.6.2
-      schema-utils: 3.3.0
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.7(@swc/core@1.3.101)(esbuild@0.19.11)(webpack@5.88.2)
-      watchpack: 2.4.0
-      webpack-sources: 3.2.3
+      schema-utils: 4.3.3
+      tapable: 2.3.0
+      terser-webpack-plugin: 5.3.14(@swc/core@1.3.26)(esbuild@0.15.18)(webpack@5.102.1(@swc/core@1.3.26)(esbuild@0.15.18))
+      watchpack: 2.4.4
+      webpack-sources: 3.3.3
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
       - uglify-js
-    dev: false
 
-  /webpack@5.99.9(@swc/core@1.3.26)(esbuild@0.15.18):
-    resolution: {integrity: sha512-brOPwM3JnmOa+7kd3NsmOUOwbDAj8FT9xDsG3IW0MgbN9yZV7Oi/s/+MNQ/EcSMqw7qfoRyXPoeEWT8zLVdVGg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
+  webpack@5.88.2(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11):
     dependencies:
-      '@types/eslint-scope': 3.7.7
-      '@types/estree': 1.0.7
-      '@types/json-schema': 7.0.15
-      '@webassemblyjs/ast': 1.14.1
-      '@webassemblyjs/wasm-edit': 1.14.1
-      '@webassemblyjs/wasm-parser': 1.14.1
-      acorn: 8.14.1
-      browserslist: 4.25.0
-      chrome-trace-event: 1.0.4
-      enhanced-resolve: 5.18.1
+      '@types/eslint-scope': 3.7.4
+      '@types/estree': 1.0.8
+      '@webassemblyjs/ast': 1.11.5
+      '@webassemblyjs/wasm-edit': 1.11.5
+      '@webassemblyjs/wasm-parser': 1.11.5
+      acorn: 8.15.0
+      acorn-import-assertions: 1.9.0(acorn@8.15.0)
+      browserslist: 4.24.4
+      chrome-trace-event: 1.0.3
+      enhanced-resolve: 5.18.3
       es-module-lexer: 1.7.0
       eslint-scope: 5.1.1
       events: 3.3.0
@@ -36880,33 +41976,28 @@ packages:
       loader-runner: 4.3.0
       mime-types: 2.1.35
       neo-async: 2.6.2
-      schema-utils: 4.3.2
-      tapable: 2.2.2
-      terser-webpack-plugin: 5.3.14(@swc/core@1.3.26)(esbuild@0.15.18)(webpack@5.99.9)
-      watchpack: 2.4.4
-      webpack-sources: 3.3.2
+      schema-utils: 3.3.0
+      tapable: 2.3.0
+      terser-webpack-plugin: 5.3.7(@swc/core@1.3.101(@swc/helpers@0.5.15))(esbuild@0.19.11)(webpack@5.88.2)
+      watchpack: 2.4.0
+      webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
       - esbuild
       - uglify-js
-    dev: true
 
-  /whatwg-url@5.0.0:
-    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
+  whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
-  /whatwg-url@7.1.0:
-    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
+  whatwg-url@7.1.0:
     dependencies:
       lodash.sortby: 4.7.0
       tr46: 1.0.1
       webidl-conversions: 4.0.2
-    dev: true
 
-  /which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+  which-boxed-primitive@1.0.2:
     dependencies:
       is-bigint: 1.0.4
       is-boolean-object: 1.1.2
@@ -36914,317 +42005,100 @@ packages:
       is-string: 1.0.7
       is-symbol: 1.0.4
 
-  /which-module@2.0.0:
-    resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
-    dev: false
+  which-module@2.0.0: {}
 
-  /which-pm@2.0.0:
-    resolution: {integrity: sha512-Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==}
-    engines: {node: '>=8.15'}
+  which-pm@2.0.0:
     dependencies:
       load-yaml-file: 0.2.0
       path-exists: 4.0.0
-    dev: false
 
-  /which-typed-array@1.1.15:
-    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
-    engines: {node: '>= 0.4'}
+  which-typed-array@1.1.15:
     dependencies:
       available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
+      call-bind: 1.0.8
       for-each: 0.3.3
       gopd: 1.2.0
       has-tostringtag: 1.0.2
-    dev: true
-
-  /which-typed-array@1.1.9:
-    resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.2.0
-      has-tostringtag: 1.0.0
-      is-typed-array: 1.1.10
-
-  /which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-    dependencies:
-      isexe: 2.0.0
 
-  /which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
+  which@2.0.2:
     dependencies:
       isexe: 2.0.0
 
-  /which@3.0.1:
-    resolution: {integrity: sha512-XA1b62dzQzLfaEOSQFTCOd5KFf/1VSzZo7/7TUjnya6u0vGGKzU96UQBZTAThCb2j4/xjBAyii1OhRLJEivHvg==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    hasBin: true
+  which@3.0.1:
     dependencies:
       isexe: 2.0.0
-    dev: true
-
-  /which@4.0.0:
-    resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==}
-    engines: {node: ^16.13.0 || >=18.0.0}
-    hasBin: true
-    dependencies:
-      isexe: 3.1.1
-    dev: false
 
-  /why-is-node-running@2.3.0:
-    resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
-    engines: {node: '>=8'}
-    hasBin: true
+  why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
       stackback: 0.0.2
-    dev: true
-
-  /wide-align@1.1.5:
-    resolution: {integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==}
-    requiresBuild: true
-    dependencies:
-      string-width: 4.2.3
-    dev: false
-    optional: true
-
-  /word-wrap@1.2.3:
-    resolution: {integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==}
-    engines: {node: '>=0.10.0'}
-
-  /workerd@1.20240806.0:
-    resolution: {integrity: sha512-yyNtyzTMgVY0sgYijHBONqZFVXsOFGj2jDjS8MF/RbO2ZdGROvs4Hkc/9QnmqFWahE0STxXeJ1yW1yVotdF0UQ==}
-    engines: {node: '>=16'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@cloudflare/workerd-darwin-64': 1.20240806.0
-      '@cloudflare/workerd-darwin-arm64': 1.20240806.0
-      '@cloudflare/workerd-linux-64': 1.20240806.0
-      '@cloudflare/workerd-linux-arm64': 1.20240806.0
-      '@cloudflare/workerd-windows-64': 1.20240806.0
-    dev: false
 
-  /wrangler@3.70.0:
-    resolution: {integrity: sha512-aMtCEXmH02SIxbxOFGGuJ8ZemmG9W+IcNRh5D4qIKgzSxqy0mt9mRoPNPSv1geGB2/8YAyeLGPf+tB4lxz+ssg==}
-    engines: {node: '>=16.17.0'}
-    hasBin: true
-    peerDependencies:
-      '@cloudflare/workers-types': ^4.20240806.0
-    peerDependenciesMeta:
-      '@cloudflare/workers-types':
-        optional: true
-    dependencies:
-      '@cloudflare/kv-asset-handler': 0.3.4
-      '@cloudflare/workers-shared': 0.1.0
-      '@esbuild-plugins/node-globals-polyfill': 0.2.3(esbuild@0.17.19)
-      '@esbuild-plugins/node-modules-polyfill': 0.2.2(esbuild@0.17.19)
-      blake3-wasm: 2.1.5
-      chokidar: 3.6.0
-      date-fns: 3.6.0
-      esbuild: 0.17.19
-      miniflare: 3.20240806.0
-      nanoid: 3.3.8
-      path-to-regexp: 6.2.1
-      resolve: 1.22.8
-      resolve.exports: 2.0.2
-      selfsigned: 2.4.1
-      source-map: 0.6.1
-      unenv: /unenv-nightly@1.10.0-1717606461.a117952
-      workerd: 1.20240806.0
-      xxhash-wasm: 1.0.2
-    optionalDependencies:
-      fsevents: 2.3.3
-    transitivePeerDependencies:
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-    dev: false
+  word-wrap@1.2.3: {}
 
-  /wrap-ansi@6.2.0:
-    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
-    engines: {node: '>=8'}
+  wrap-ansi@6.2.0:
     dependencies:
       ansi-styles: 4.3.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: false
 
-  /wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
+  wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
-  /wrap-ansi@8.1.0:
-    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
-    engines: {node: '>=12'}
+  wrap-ansi@8.1.0:
     dependencies:
       ansi-styles: 6.2.1
       string-width: 5.1.2
       strip-ansi: 7.1.0
 
-  /wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-
-  /ws@7.5.9:
-    resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
-    engines: {node: '>=8.3.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: true
-
-  /ws@8.11.0:
-    resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
-  /ws@8.12.0:
-    resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
-  /ws@8.16.0:
-    resolution: {integrity: sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: false
+  wrappy@1.0.2: {}
 
-  /ws@8.18.0(bufferutil@4.0.9):
-    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dependencies:
+  ws@8.17.1(bufferutil@4.0.9):
+    optionalDependencies:
       bufferutil: 4.0.9
 
-  /xdg-app-paths@8.3.0:
-    resolution: {integrity: sha512-mgxlWVZw0TNWHoGmXq+NC3uhCIc55dDpAlDkMQUaIAcQzysb0kxctwv//fvuW61/nAAeUBJMQ8mnZjMmuYwOcQ==}
-    engines: {node: '>= 4.0'}
+  xdg-app-paths@8.3.0:
     dependencies:
       xdg-portable: 10.6.0
     optionalDependencies:
       fsevents: 2.3.3
-    dev: false
 
-  /xdg-portable@10.6.0:
-    resolution: {integrity: sha512-xrcqhWDvtZ7WLmt8G4f3hHy37iK7D2idtosRgkeiSPZEPmBShp0VfmRBLWAPC6zLF48APJ21yfea+RfQMF4/Aw==}
-    engines: {node: '>= 4.0'}
+  xdg-portable@10.6.0:
     dependencies:
       os-paths: 7.4.0
     optionalDependencies:
       fsevents: 2.3.3
-    dev: false
-
-  /xmlhttprequest-ssl@2.0.0:
-    resolution: {integrity: sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==}
-    engines: {node: '>=0.4.0'}
-    dev: false
-
-  /xstate@5.18.1:
-    resolution: {integrity: sha512-m02IqcCQbaE/kBQLunwub/5i8epvkD2mFutnL17Oeg1eXTShe1sRF4D5mhv1dlaFO4vbW5gRGRhraeAD5c938g==}
-    dev: false
-
-  /xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
 
-  /xxhash-wasm@1.0.2:
-    resolution: {integrity: sha512-ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A==}
-    dev: false
+  xmlhttprequest-ssl@2.0.0: {}
 
-  /y18n@4.0.3:
-    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
-    dev: false
+  xstate@5.18.1: {}
 
-  /y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
+  xtend@4.0.2: {}
 
-  /yallist@2.1.2:
-    resolution: {integrity: sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==}
+  y18n@4.0.3: {}
 
-  /yallist@3.1.1:
-    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
+  y18n@5.0.8: {}
 
-  /yallist@4.0.0:
-    resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
+  yallist@3.1.1: {}
 
-  /yallist@5.0.0:
-    resolution: {integrity: sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==}
-    engines: {node: '>=18'}
-    dev: false
+  yallist@4.0.0: {}
 
-  /yaml@2.3.1:
-    resolution: {integrity: sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==}
-    engines: {node: '>= 14'}
-    dev: true
+  yallist@5.0.0: {}
 
-  /yaml@2.7.1:
-    resolution: {integrity: sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==}
-    engines: {node: '>= 14'}
-    hasBin: true
+  yaml@2.7.1: {}
 
-  /yargs-parser@18.1.3:
-    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
-    engines: {node: '>=6'}
+  yargs-parser@18.1.3:
     dependencies:
       camelcase: 5.3.1
       decamelize: 1.2.0
-    dev: false
 
-  /yargs-parser@20.2.9:
-    resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==}
-    engines: {node: '>=10'}
+  yargs-parser@20.2.9: {}
 
-  /yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
+  yargs-parser@21.1.1: {}
 
-  /yargs@15.4.1:
-    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
-    engines: {node: '>=8'}
+  yargs@15.4.1:
     dependencies:
       cliui: 6.0.0
       decamelize: 1.2.0
@@ -37237,11 +42111,8 @@ packages:
       which-module: 2.0.0
       y18n: 4.0.3
       yargs-parser: 18.1.3
-    dev: false
 
-  /yargs@16.2.0:
-    resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==}
-    engines: {node: '>=10'}
+  yargs@16.2.0:
     dependencies:
       cliui: 7.0.4
       escalade: 3.2.0
@@ -37251,9 +42122,7 @@ packages:
       y18n: 5.0.8
       yargs-parser: 20.2.9
 
-  /yargs@17.7.2:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: '>=12'}
+  yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
       escalade: 3.2.0
@@ -37263,135 +42132,70 @@ packages:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
-  /yauzl@2.10.0:
-    resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
+  yauzl@2.10.0:
     dependencies:
       buffer-crc32: 0.2.13
       fd-slicer: 1.1.0
-    dev: false
-
-  /yn@3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: '>=6'}
 
-  /yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-
-  /yocto-queue@1.1.1:
-    resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
-    engines: {node: '>=12.20'}
+  yocto-queue@0.1.0: {}
 
-  /youch@3.3.3:
-    resolution: {integrity: sha512-qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA==}
-    dependencies:
-      cookie: 0.5.0
-      mustache: 4.2.0
-      stacktracey: 2.1.8
-    dev: false
+  yocto-queue@1.1.1: {}
 
-  /yt-dlp-wrap@2.3.12:
-    resolution: {integrity: sha512-P8fJ+6M1YjukyJENCTviNLiZ8mokxprR54ho3DsSKPWDcac489OjRiStGEARJr6un6ETS6goTn4CWl/b/rM3aA==}
-    dev: false
+  yoctocolors@2.1.2: {}
 
-  /yup@1.4.0:
-    resolution: {integrity: sha512-wPbgkJRCqIf+OHyiTBQoJiP5PFuAXaWiJK6AmYkzQAh5/c2K9hzSApBZG5wV9KoKSePF7sAxmNSvh/13YHkFDg==}
+  yup@1.6.1:
     dependencies:
       property-expr: 2.0.6
       tiny-case: 1.0.3
       toposort: 2.0.2
       type-fest: 2.19.0
-    dev: false
-
-  /zimmerframe@1.1.2:
-    resolution: {integrity: sha512-rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w==}
 
-  /zip-node-addon@0.0.11:
-    resolution: {integrity: sha512-Kr5qN0UdXn/JpMyA4wri5nzugPzGRV2MA49JW4ijr1h2aPdUp1wEDl7eqmk6FzlhDE6JlSEfey3gajVcpWsqbQ==}
-    requiresBuild: true
+  yup@1.7.0:
     dependencies:
-      bindings: 1.5.0
-      napi_thread_safe_promise: 1.2.6
-      node-addon-api: 4.3.0
-    dev: false
-
-  /zip-stream@4.1.1:
-    resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
-    engines: {node: '>= 10'}
-    dependencies:
-      archiver-utils: 3.0.4
-      compress-commons: 4.1.2
-      readable-stream: 3.6.2
-    dev: true
+      property-expr: 2.0.6
+      tiny-case: 1.0.3
+      toposort: 2.0.2
+      type-fest: 2.19.0
 
-  /zip-stream@6.0.1:
-    resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
-    engines: {node: '>= 14'}
+  zip-stream@6.0.1:
     dependencies:
       archiver-utils: 5.0.2
       compress-commons: 6.0.2
       readable-stream: 4.7.0
-    dev: true
 
-  /zod-error@1.5.0:
-    resolution: {integrity: sha512-zzopKZ/skI9iXpqCEPj+iLCKl9b88E43ehcU+sbRoHuwGd9F1IDVGQ70TyO6kmfiRL1g4IXkjsXK+g1gLYl4WQ==}
+  zod-error@1.5.0:
     dependencies:
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /zod-to-json-schema@3.23.2(zod@3.23.8):
-    resolution: {integrity: sha512-uSt90Gzc/tUfyNqxnjlfBs8W6WSGpNBv0rVsNxP/BVSMHMKGdthPYff4xtCHYloJGM0CFxFsb3NbC0eqPhfImw==}
-    peerDependencies:
-      zod: ^3.23.3
+  zod-to-json-schema@3.24.5(zod@3.25.76):
     dependencies:
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /zod-to-json-schema@3.24.3(zod@3.23.8):
-    resolution: {integrity: sha512-HIAfWdYIt1sssHfYZFCXp4rU1w2r8hVVXYIlmoa0r0gABLs5di3RCqPU5DDROogVz1pAdYBaz7HK5n9pSUNs3A==}
-    peerDependencies:
-      zod: ^3.24.1
+  zod-to-json-schema@3.24.6(zod@3.25.76):
     dependencies:
-      zod: 3.23.8
+      zod: 3.25.76
 
-  /zod-to-json-schema@3.24.5(zod@3.23.8):
-    resolution: {integrity: sha512-/AuWwMP+YqiPbsJx5D6TfgRTc4kTLjsh5SOcd4bLsfUg2RcEXrFMJl1DGgdHy2aCfsIA/cr/1JM0xcB2GZji8g==}
-    peerDependencies:
-      zod: ^3.24.1
+  zod-to-json-schema@3.25.0(zod@3.25.76):
     dependencies:
-      zod: 3.23.8
+      zod: 3.25.76
 
-  /zod-validation-error@1.5.0(zod@3.23.8):
-    resolution: {integrity: sha512-/7eFkAI4qV0tcxMBB/3+d2c1P6jzzZYdYSlBuAklzMuCrJu5bzJfHS0yVAS87dRHVlhftd6RFJDIvv03JgkSbw==}
-    engines: {node: '>=16.0.0'}
-    peerDependencies:
-      zod: ^3.18.0
+  zod-to-json-schema@3.25.1(zod@3.25.76):
     dependencies:
-      zod: 3.23.8
-    dev: false
+      zod: 3.25.76
 
-  /zod@3.23.8:
-    resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
+  zod-validation-error@1.5.0(zod@3.25.76):
+    dependencies:
+      zod: 3.25.76
 
-  /zustand@4.5.5(@types/react@18.2.69)(react@18.2.0):
-    resolution: {integrity: sha512-+0PALYNJNgK6hldkgDq2vLrw5f6g/jCInz52n9RTpropGgeAf/ioFUCdtsjCqu4gNhW9D01rUQBROoRjdzyn2Q==}
-    engines: {node: '>=12.7.0'}
-    peerDependencies:
-      '@types/react': '>=16.8'
-      immer: '>=9.0.6'
-      react: '>=16.8'
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      immer:
-        optional: true
-      react:
-        optional: true
+  zod@3.23.8: {}
+
+  zod@3.25.76: {}
+
+  zustand@4.5.5(@types/react@18.2.69)(react@18.2.0):
     dependencies:
+      use-sync-external-store: 1.2.2(react@18.2.0)
+    optionalDependencies:
       '@types/react': 18.2.69
       react: 18.2.0
-      use-sync-external-store: 1.2.2(react@18.2.0)
-    dev: false
 
-  /zwitch@2.0.4:
-    resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
+  zwitch@2.0.4: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a97140d11ec..f5fecfce774 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,3 +5,16 @@ packages:
   - "references/*"
   - "docs"
   - "!packages/cli-v3/e2e/**"
+
+minimumReleaseAge: 4320
+minimumReleaseAgeExclude:
+  - "@trigger.dev/platform"
+  - "next"
+  - "@next/*"
+preferOffline: true
+
+linkWorkspacePackages: false
+publicHoistPattern:
+  - "*prisma*"
+preferWorkspacePackages: true
+sideEffectsCache: false
diff --git a/references/bun-catalog/README.md b/references/bun-catalog/README.md
index 42401b1f41b..416b9f07dd4 100644
--- a/references/bun-catalog/README.md
+++ b/references/bun-catalog/README.md
@@ -8,7 +8,7 @@ You can test v3 tasks from inside the app in this project. It's designed to be u
 
 2. In Postgres go to the "Projects" table and for the project you create change the `externalRef` to `yubjwjsfkxnylobaqvqz`.
 
-This is so the `trigger.config.ts` file inside the v3-catalog doesn't keep getting changed by people accidentally pushing this.
+This is so the `trigger.config.ts` file inside the hello-world doesn't keep getting changed by people accidentally pushing this.
 
 ## How to use
 
@@ -24,10 +24,10 @@ pnpm run dev --filter webapp
 pnpm run build --filter trigger.dev
 ```
 
-3. CD into the v3-catalog directory
+3. CD into the hello-world directory
 
 ```bash
-cd references/v3-catalog
+cd references/hello-world
 ```
 
 4. If you've never logged in to the CLI you'll see an error telling you to login. Do this:
@@ -54,4 +54,4 @@ pnpm exec trigger dev
 
 7. Go to the webapp now and inside your project you should see some tasks on the "Tasks" page.
 
-8. Go to the "Test" page in the sidebar and select a task. Then enter a payload and click "Run test". You can tell what the payloads should be by looking at the relevant task file inside the `/references/v3-catalog/src/trigger` folder. Many of them accept an empty payload.
+8. Go to the "Test" page in the sidebar and select a task. Then enter a payload and click "Run test". You can tell what the payloads should be by looking at the relevant task file inside the `/references/hello-world/src/trigger` folder. Many of them accept an empty payload.
diff --git a/references/bun-catalog/src/trigger/bun.ts b/references/bun-catalog/src/trigger/bun.ts
index a5d14fa5b09..2f3e123c795 100644
--- a/references/bun-catalog/src/trigger/bun.ts
+++ b/references/bun-catalog/src/trigger/bun.ts
@@ -8,6 +8,8 @@ export const bunTask = task({
     const query = db.query("select 'Hello world' as message;");
     console.log(query.get()); // => { message: "Hello world" }
 
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+
     return {
       message: "Query executed",
       bunVersion: Bun.version,
diff --git a/references/bun-catalog/trigger.config.ts b/references/bun-catalog/trigger.config.ts
index 67045bf8d50..fa791aa4558 100644
--- a/references/bun-catalog/trigger.config.ts
+++ b/references/bun-catalog/trigger.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
   runtime: "bun",
-  project: "proj_uxbxncnbsyamyxeqtucu",
+  project: process.env.TRIGGER_PROJECT_REF!,
   maxDuration: 3600,
   machine: "small-2x",
   retries: {
diff --git a/references/d3-chat/package.json b/references/d3-chat/package.json
index 36dc313f2b3..c14602d4010 100644
--- a/references/d3-chat/package.json
+++ b/references/d3-chat/package.json
@@ -19,30 +19,37 @@
     "db:migrate:down": "tsx -r dotenv/config src/lib/migrate.ts down"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^1.2.4",
-    "@ai-sdk/openai": "1.3.3",
+    "@ai-sdk/anthropic": "2.0.4",
+    "@ai-sdk/openai": "2.0.14",
     "@e2b/code-interpreter": "^1.1.0",
+    "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/api-logs": "^0.203.0",
+    "@opentelemetry/exporter-logs-otlp-http": "0.203.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.203.0",
+    "@opentelemetry/instrumentation-http": "0.203.0",
+    "@opentelemetry/instrumentation-undici": "0.14.0",
+    "@opentelemetry/instrumentation": "^0.203.0",
+    "@opentelemetry/sdk-logs": "^0.203.0",
     "@radix-ui/react-avatar": "^1.1.3",
     "@slack/web-api": "7.9.1",
     "@trigger.dev/python": "workspace:*",
     "@trigger.dev/react-hooks": "workspace:*",
     "@trigger.dev/sdk": "workspace:*",
-    "@opentelemetry/exporter-logs-otlp-http": "0.52.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
+    "@vercel/otel": "^1.13.0",
     "@vercel/postgres": "^0.10.0",
-    "ai": "4.2.5",
+    "ai": "5.0.14",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.486.0",
     "marked": "^4.0.18",
     "nanoid": "^5.1.5",
-    "next": "15.2.4",
+    "next": "15.4.8",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-markdown": "^10.1.0",
     "tailwind-merge": "^3.1.0",
     "tw-animate-css": "^1.2.4",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@tailwindcss/postcss": "^4",
diff --git a/references/d3-chat/src/app/api/demo-batch-trigger/route.ts b/references/d3-chat/src/app/api/demo-batch-trigger/route.ts
new file mode 100644
index 00000000000..9342830c329
--- /dev/null
+++ b/references/d3-chat/src/app/api/demo-batch-trigger/route.ts
@@ -0,0 +1,18 @@
+import { NextResponse } from "next/server";
+import { tasks } from "@trigger.dev/sdk";
+import type { todoChat } from "@/trigger/chat";
+
+export async function POST(request: Request) {
+  const body = await request.json();
+
+  const handle = await tasks.batchTrigger<typeof todoChat>("todo-chat", [
+    {
+      payload: {
+        input: body.input,
+        userId: "123",
+      },
+    },
+  ]);
+
+  return NextResponse.json({ handle });
+}
diff --git a/references/d3-chat/src/app/api/demo-call-from-trigger/route.ts b/references/d3-chat/src/app/api/demo-call-from-trigger/route.ts
new file mode 100644
index 00000000000..940c844d06d
--- /dev/null
+++ b/references/d3-chat/src/app/api/demo-call-from-trigger/route.ts
@@ -0,0 +1,5 @@
+import { NextResponse } from "next/server";
+
+export async function POST(request: Request) {
+  return NextResponse.json({ body: "Hello, world!" });
+}
diff --git a/references/d3-chat/src/app/api/demo-trigger/route.ts b/references/d3-chat/src/app/api/demo-trigger/route.ts
new file mode 100644
index 00000000000..f97874f2620
--- /dev/null
+++ b/references/d3-chat/src/app/api/demo-trigger/route.ts
@@ -0,0 +1,14 @@
+import { NextResponse } from "next/server";
+import { tasks } from "@trigger.dev/sdk";
+import type { todoChat } from "@/trigger/chat";
+
+export async function POST(request: Request) {
+  const body = await request.json();
+
+  const handle = await tasks.trigger<typeof todoChat>("todo-chat", {
+    input: body.input,
+    userId: "123",
+  });
+
+  return NextResponse.json({ handle });
+}
diff --git a/references/d3-chat/src/components/chat-container.tsx b/references/d3-chat/src/components/chat-container.tsx
index 1346ff5c02d..b40150e5b30 100644
--- a/references/d3-chat/src/components/chat-container.tsx
+++ b/references/d3-chat/src/components/chat-container.tsx
@@ -61,17 +61,17 @@ function getMessagesFromRun(
         id: `tool-${part.toolCallId}`,
         role: "tool",
         name: part.toolName,
-        input: part.args,
+        input: part.input,
       };
       toolCalls.set(part.toolCallId, toolMessage);
       messages.push(toolMessage);
     } else if (part.type === "tool-result") {
       const toolMessage = toolCalls.get(part.toolCallId);
       if (toolMessage) {
-        toolMessage.output = part.result;
+        toolMessage.output = part.output;
       }
     } else if (part.type === "text-delta") {
-      currentAssistantContent += part.textDelta;
+      currentAssistantContent += part.text;
 
       // Find or create the assistant message
       const lastMessage = messages[messages.length - 1];
diff --git a/references/d3-chat/src/instrumentation.ts b/references/d3-chat/src/instrumentation.ts
new file mode 100644
index 00000000000..b4ca035bf73
--- /dev/null
+++ b/references/d3-chat/src/instrumentation.ts
@@ -0,0 +1,5 @@
+import { registerOTel } from "@vercel/otel";
+
+export function register() {
+  registerOTel({ serviceName: "d3-chat", traceSampler: "traceidratio" });
+}
diff --git a/references/d3-chat/src/trigger/chat.ts b/references/d3-chat/src/trigger/chat.ts
index 7ac4d77f671..da07621046d 100644
--- a/references/d3-chat/src/trigger/chat.ts
+++ b/references/d3-chat/src/trigger/chat.ts
@@ -1,15 +1,16 @@
 import { anthropic } from "@ai-sdk/anthropic";
 import { openai } from "@ai-sdk/openai";
 import { ai } from "@trigger.dev/sdk/ai";
-import { logger, metadata, runs, schemaTask, tasks, wait } from "@trigger.dev/sdk/v3";
+import { logger, metadata, runs, schemaTask, tasks, wait, otel, task } from "@trigger.dev/sdk/v3";
 import { sql } from "@vercel/postgres";
 import {
-  CoreMessage,
-  createDataStream,
-  DataStreamWriter,
+  ModelMessage,
   streamText,
   TextStreamPart,
   tool,
+  stepCountIs,
+  createUIMessageStream,
+  UIMessageStreamWriter,
 } from "ai";
 import { nanoid } from "nanoid";
 import { z } from "zod";
@@ -17,6 +18,25 @@ import { sendSQLApprovalMessage } from "../lib/slack";
 import { crawler } from "./crawler";
 import { chartTool } from "./sandbox";
 import { QueryApproval } from "./schemas";
+import { context, propagation } from "@opentelemetry/api";
+
+async function callNextjsApp() {
+  return await otel.withExternalTrace(async () => {
+    const headersObject = {};
+
+    propagation.inject(context.active(), headersObject);
+
+    const result = await fetch("http://localhost:3000/api/demo-call-from-trigger", {
+      headers: new Headers(headersObject),
+      method: "POST",
+      body: JSON.stringify({
+        message: "Hello from Trigger.dev",
+      }),
+    });
+
+    return result.json();
+  });
+}
 
 const queryApprovalTask = schemaTask({
   id: "query-approval",
@@ -29,6 +49,8 @@ const queryApprovalTask = schemaTask({
   run: async ({ userId, input, query }) => {
     logger.info("queryApproval: starting", { projectRef: process.env.TRIGGER_PROJECT_REF });
 
+    await callNextjsApp();
+
     const token = await wait.createToken({
       tags: [`user:${userId}`, "approval"],
       timeout: "5m", // timeout in 5 minutes
@@ -59,9 +81,57 @@ const queryApprovalTask = schemaTask({
 
 const queryApproval = ai.tool(queryApprovalTask);
 
+// const queryApprovalTask = task({
+//   id: "query-approval",
+//   description: "Get approval for a SQL query from an admin",
+//   jsonSchema: {
+//     type: "object",
+//     properties: {
+//       userId: { type: "string", description: "The user_id to get approval for" },
+//       input: { type: "string", description: "The input to get approval for" },
+//       query: { type: "string", description: "The SQL query to execute" },
+//     },
+//     required: ["userId", "input", "query"],
+//     additionalProperties: false,
+//   },
+//   run: async ({ userId, input, query }: { userId: string; input: string; query: string }) => {
+//     logger.info("queryApproval: starting", { projectRef: process.env.TRIGGER_PROJECT_REF });
+
+//     await callNextjsApp();
+
+//     const token = await wait.createToken({
+//       tags: [`user:${userId}`, "approval"],
+//       timeout: "5m", // timeout in 5 minutes
+//     });
+
+//     await sendSQLApprovalMessage({
+//       query,
+//       userId,
+//       tokenId: token.id,
+//       publicAccessToken: token.publicAccessToken,
+//       input,
+//     });
+
+//     const result = await wait.forToken<QueryApproval>(token);
+
+//     // result.ok === false if the token timed out
+//     if (!result.ok) {
+//       logger.debug("queryApproval: token timed out");
+
+//       return {
+//         approved: false,
+//       };
+//     } else {
+//       return result.output;
+//     }
+//   },
+// });
+
+// const queryApproval = ai.tool(queryApprovalTask);
+
 const executeSql = tool({
   description: "Use this tool to execute a SQL query",
-  parameters: z.object({
+  inputSchema: z.object({
     query: z.string().describe("The SQL query to execute"),
   }),
   execute: async ({ query }) => {
@@ -74,7 +144,7 @@ const executeSql = tool({
 
 const generateId = tool({
   description: "Use this tool to generate a unique ID for a todo",
-  parameters: z.object({
+  inputSchema: z.object({
     prefix: z.string().describe("The prefix for the ID (defaults to 'todo')").default("todo"),
   }),
   execute: async ({ prefix }) => {
@@ -84,7 +154,7 @@ const generateId = tool({
 
 const getUserTodos = tool({
   description: "Use this tool to get all todos for a user",
-  parameters: z.object({
+  inputSchema: z.object({
     userId: z.string().describe("The user_id to get todos for"),
   }),
   execute: async ({ userId }) => {
@@ -96,7 +166,7 @@ const getUserTodos = tool({
 
 const getUserId = tool({
   description: "Use this tool to get the user_id for the current user",
-  parameters: z.object({}),
+  inputSchema: z.object({}),
   execute: async () => {
     const userId = metadata.get("user_id");
 
@@ -179,7 +249,7 @@ export const todoChat = schemaTask({
       model: getModel(),
       system,
       prompt,
-      maxSteps: 10,
+      stopWhen: stepCountIs(10),
       tools: {
         queryApproval,
         executeSql,
@@ -204,7 +274,7 @@ export const todoChat = schemaTask({
 
     for await (const part of stream) {
       if (part.type === "text-delta") {
-        textParts.push(part.textDelta);
+        textParts.push(part.text);
       }
     }
 
@@ -286,7 +356,7 @@ export const interruptibleChat = schemaTask({
 
 async function createStreamWithProvider(params: {
   model: ReturnType<typeof anthropic> | ReturnType<typeof openai>;
-  messages: CoreMessage[];
+  messages: ModelMessage[];
   message_request_id: string;
   chat_id: string;
   userId?: string;
@@ -294,14 +364,13 @@ async function createStreamWithProvider(params: {
   const { model, messages, message_request_id, chat_id, userId } = params;
 
   return new Promise<string>((resolve, reject) => {
-    const dataStreamResponse = createDataStream({
+    const dataStreamResponse = createUIMessageStream({
       execute: async (dataStream) => {
         const result = streamText({
           model,
           system: "This is the system prompt, please be nice.",
           messages,
-          maxSteps: 20,
-          toolCallStreaming: true,
+          stopWhen: stepCountIs(20),
           onError: (error) => {
             logger.error("Error in chatStream task (streamText)", {
               error: error instanceof Error ? error.message : "Unknown error",
@@ -313,7 +382,7 @@ async function createStreamWithProvider(params: {
           onChunk: async (chunk) => {
             console.log("Chunk:", chunk);
           },
-          onFinish: async ({ response, reasoning }) => {
+          onFinish: async ({ response, reasoningText }) => {
             metadata.flush();
             logger.info("AI stream finished", {
               chat_id,
@@ -349,9 +418,7 @@ async function createStreamWithProvider(params: {
 
         result.consumeStream();
 
-        result.mergeIntoDataStream(dataStream, {
-          sendReasoning: true,
-        });
+        dataStream.writer.merge(result.toUIMessageStream());
       },
       onError: (error) => {
         logger.error("Error in chatStream task (createDataStream)", {
@@ -408,7 +475,7 @@ export const chatStream = schemaTask({
       // First try with Anthropic
       return await createStreamWithProvider({
         model: anthropic(model),
-        messages: messages as CoreMessage[],
+        messages: messages as ModelMessage[],
         message_request_id,
         chat_id,
         userId,
@@ -426,7 +493,7 @@ export const chatStream = schemaTask({
         // Fallback to OpenAI
         return await createStreamWithProvider({
           model: openai("gpt-4"),
-          messages: messages as CoreMessage[],
+          messages: messages as ModelMessage[],
           message_request_id,
           chat_id,
           userId,
@@ -511,12 +578,12 @@ export const chatStream2 = schemaTask({
       message_request_id,
     });
 
-    const dataStreamResponse = createDataStream({
-      execute: async (dataStream) => {
+    const dataStreamResponse = createUIMessageStream({
+      execute: async ({ writer }) => {
         streamTextWithModel(
-          dataStream,
+          writer,
           anthropic(model),
-          messages as CoreMessage[],
+          messages as ModelMessage[],
           chat_id,
           openai("gpt-4"),
           userId
@@ -533,9 +600,9 @@ export const chatStream2 = schemaTask({
 });
 
 function streamTextWithModel(
-  dataStream: DataStreamWriter,
+  writer: UIMessageStreamWriter,
   model: ReturnType<typeof anthropic> | ReturnType<typeof openai>,
-  messages: CoreMessage[],
+  messages: ModelMessage[],
   chat_id: string,
   fallbackModel?: ReturnType<typeof anthropic> | ReturnType<typeof openai>,
   userId?: string
@@ -544,8 +611,7 @@ function streamTextWithModel(
     model,
     system: "This is the system prompt, please be nice.",
     messages,
-    maxSteps: 20,
-    toolCallStreaming: true,
+    stopWhen: stepCountIs(20),
     onError: (error) => {
       logger.error("Error in chatStream task (streamText)", {
         error: error instanceof Error ? error.message : "Unknown error",
@@ -554,13 +620,13 @@ function streamTextWithModel(
       });
 
       if (fallbackModel) {
-        streamTextWithModel(dataStream, fallbackModel, messages, chat_id, undefined, userId);
+        streamTextWithModel(writer, fallbackModel, messages, chat_id, undefined, userId);
       }
     },
     onChunk: async (chunk) => {
       console.log("Chunk:", chunk);
     },
-    onFinish: async ({ response, reasoning }) => {
+    onFinish: async ({ response, reasoningText }) => {
       metadata.flush();
       logger.info("AI stream finished", {
         chat_id,
@@ -596,9 +662,7 @@ function streamTextWithModel(
 
   result.consumeStream();
 
-  result.mergeIntoDataStream(dataStream, {
-    sendReasoning: true,
-  });
+  writer.merge(result.toUIMessageStream());
 }
 
 export const chatStreamCaller2 = schemaTask({
diff --git a/references/d3-chat/trigger.config.ts b/references/d3-chat/trigger.config.ts
index ac84181392d..528215ac7d4 100644
--- a/references/d3-chat/trigger.config.ts
+++ b/references/d3-chat/trigger.config.ts
@@ -3,11 +3,14 @@ import { pythonExtension } from "@trigger.dev/python/extension";
 import { installPlaywrightChromium } from "./src/extensions/playwright";
 import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { UndiciInstrumentation } from "@opentelemetry/instrumentation-undici";
 
 export default defineConfig({
   project: process.env.TRIGGER_PROJECT_REF!,
   dirs: ["./src/trigger"],
   telemetry: {
+    instrumentations: [new HttpInstrumentation(), new UndiciInstrumentation()],
     logExporters: [
       new OTLPLogExporter({
         url: "https://api.axiom.co/v1/logs",
diff --git a/references/d3-openai-agents/package.json b/references/d3-openai-agents/package.json
index e94dc26a21f..91309ea5a30 100644
--- a/references/d3-openai-agents/package.json
+++ b/references/d3-openai-agents/package.json
@@ -33,7 +33,7 @@
     "react-dom": "^19.0.0",
     "tailwind-merge": "^3.0.2",
     "tw-animate-css": "^1.2.4",
-    "zod": "3.23.8",
+    "zod": "3.25.76",
     "zod-to-json-schema": "^3.24.5"
   },
   "devDependencies": {
diff --git a/references/v3-catalog/.gitignore b/references/effect/.gitignore
similarity index 100%
rename from references/v3-catalog/.gitignore
rename to references/effect/.gitignore
diff --git a/references/effect/package.json b/references/effect/package.json
new file mode 100644
index 00000000000..662944ed50e
--- /dev/null
+++ b/references/effect/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "references-effect",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*"
+  },
+  "dependencies": {
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "effect": "3.17.1"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy"
+  }
+}
\ No newline at end of file
diff --git a/references/effect/src/trigger/effect.ts b/references/effect/src/trigger/effect.ts
new file mode 100644
index 00000000000..fafbe9e2e63
--- /dev/null
+++ b/references/effect/src/trigger/effect.ts
@@ -0,0 +1,37 @@
+import { logger, task } from "@trigger.dev/sdk";
+
+import { Console, Effect, Schedule } from "effect";
+
+const helloWorldIteration = Effect.gen(function* () {
+  yield* Console.log(`Hello World!`);
+  yield* Effect.sleep("1 second");
+  yield* Console.log(`Done!`);
+  return "Iteration completed";
+});
+
+// Repeat the effect 9 times (plus the initial run = 10 total)
+const helloWorldLoop = helloWorldIteration.pipe(Effect.repeat(Schedule.recurs(9)));
+
+export const effectTask = task({
+  id: "effect",
+  run: async () => {
+    const result = await Effect.runPromise(Effect.scoped(helloWorldLoop));
+
+    return result;
+  },
+  onSuccess: async () => {
+    logger.info("Hello, world from the onSuccess hook");
+  },
+  onFailure: async () => {
+    logger.info("Hello, world from the onFailure hook");
+  },
+  onCancel: async () => {
+    logger.info("Hello, world from the onCancel hook");
+  },
+});
+
+// Prevent SIGTERM from killing the process immediately
+process.on("SIGTERM", () => {
+  console.log("Received SIGTERM signal, but ignoring it...");
+  // Process continues running
+});
diff --git a/references/effect/trigger.config.ts b/references/effect/trigger.config.ts
new file mode 100644
index 00000000000..9873daf22f0
--- /dev/null
+++ b/references/effect/trigger.config.ts
@@ -0,0 +1,22 @@
+import { defineConfig } from "@trigger.dev/sdk/v3";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  experimental_processKeepAlive: {
+    enabled: true,
+    maxExecutionsPerProcess: 20,
+  },
+  logLevel: "log",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-2x",
+});
diff --git a/references/effect/tsconfig.json b/references/effect/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/effect/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/hello-world/package.json b/references/hello-world/package.json
index b6a8d799f4f..dea86c6b7af 100644
--- a/references/hello-world/package.json
+++ b/references/hello-world/package.json
@@ -8,9 +8,13 @@
   "dependencies": {
     "@trigger.dev/build": "workspace:*",
     "@trigger.dev/sdk": "workspace:*",
+    "arktype": "^2.0.0",
     "openai": "^4.97.0",
+    "puppeteer-core": "^24.15.0",
     "replicate": "^1.0.1",
-    "zod": "3.23.8"
+    "yup": "^1.6.1",
+    "zod": "3.25.76",
+    "@sinclair/typebox": "^0.34.3"
   },
   "scripts": {
     "dev": "trigger dev",
diff --git a/references/hello-world/src/resourceMonitor.ts b/references/hello-world/src/resourceMonitor.ts
index 9b4bf285019..27f8418d64d 100644
--- a/references/hello-world/src/resourceMonitor.ts
+++ b/references/hello-world/src/resourceMonitor.ts
@@ -3,6 +3,8 @@ import { exec } from "node:child_process";
 import os from "node:os";
 import { promises as fs } from "node:fs";
 import { type Context, logger } from "@trigger.dev/sdk";
+import { getHeapStatistics } from "node:v8";
+import { PerformanceObserver, constants } from "node:perf_hooks";
 
 const execAsync = promisify(exec);
 
@@ -24,6 +26,11 @@ export type MemoryMetrics = {
 export type NodeProcessMetrics = {
   memoryUsage: number;
   memoryUsagePercent: number;
+  heapUsed: number;
+  heapSizeLimit: number;
+  heapUsagePercent: number;
+  availableHeap: number;
+  isNearHeapLimit: boolean;
 };
 
 export type TargetProcessMetrics = {
@@ -47,7 +54,24 @@ export type TargetProcessMetrics = {
 
 export type ProcessMetrics = {
   node: NodeProcessMetrics;
-  target: TargetProcessMetrics | null;
+  targetProcess: TargetProcessMetrics | null;
+};
+
+type GCSummary = {
+  count: number;
+  totalDuration: number; // ms
+  avgDuration: number; // ms
+  maxDuration: number; // ms
+  kinds: Record<
+    string,
+    {
+      // breakdown by kind
+      count: number;
+      totalDuration: number;
+      avgDuration: number;
+      maxDuration: number;
+    }
+  >;
 };
 
 type ProcessInfo = {
@@ -69,27 +93,31 @@ export type ResourceMonitorConfig = {
   dirName?: string;
   processName?: string;
   ctx: Context;
+  compactLogging?: boolean;
 };
 
 // Constants
 const DISK_LIMIT_GB = 10;
 const DISK_LIMIT_BYTES = DISK_LIMIT_GB * 1024 * 1024 * 1024; // 10Gi in bytes
 
-/**
- * Utility class for monitoring system resources and process metrics
- */
 export class ResourceMonitor {
   private logInterval: NodeJS.Timeout | null = null;
   private logger: typeof logger;
   private dirName: string;
-  private processName: string;
+  private processName: string | undefined;
   private ctx: Context;
+  private verbose: boolean;
+  private compactLogging: boolean;
+  private gcObserver: PerformanceObserver | null = null;
+  private bufferedGcEntries: PerformanceEntry[] = [];
 
   constructor(config: ResourceMonitorConfig) {
     this.logger = logger;
     this.dirName = config.dirName ?? "/tmp";
-    this.processName = config.processName ?? "node";
+    this.processName = config.processName;
     this.ctx = config.ctx;
+    this.verbose = true;
+    this.compactLogging = config.compactLogging ?? false;
   }
 
   /**
@@ -107,6 +135,12 @@ export class ResourceMonitor {
     }
 
     this.logInterval = setInterval(this.logResources.bind(this), intervalMs);
+
+    this.gcObserver = new PerformanceObserver((list) => {
+      this.bufferedGcEntries.push(...list.getEntries());
+    });
+
+    this.gcObserver.observe({ entryTypes: ["gc"], buffered: true });
   }
 
   /**
@@ -117,11 +151,16 @@ export class ResourceMonitor {
       clearInterval(this.logInterval);
       this.logInterval = null;
     }
+
+    if (this.gcObserver) {
+      this.gcObserver.disconnect();
+      this.gcObserver = null;
+    }
   }
 
   private async logResources() {
     try {
-      await this.logResourceSnapshot("RESOURCE_MONITOR");
+      await this.logResourceSnapshot("ResourceMonitor");
     } catch (error) {
       this.logger.error(
         `Resource monitoring error: ${error instanceof Error ? error.message : String(error)}`
@@ -250,7 +289,11 @@ export class ResourceMonitor {
   /**
    * Find PIDs for a process name using /proc filesystem
    */
-  private async findPidsByName(processName: string): Promise<number[]> {
+  private async findPidsByName(processName?: string): Promise<number[]> {
+    if (!processName) {
+      return [];
+    }
+
     try {
       const pids: number[] = [];
       const procDirs = await fs.readdir("/proc");
@@ -258,6 +301,13 @@ export class ResourceMonitor {
       for (const dir of procDirs) {
         if (!/^\d+$/.test(dir)) continue;
 
+        const processPid = parseInt(dir, 10);
+
+        // Ignore processes that have a lower PID than our own PID
+        if (processPid <= process.pid) {
+          continue;
+        }
+
         try {
           const cmdline = await fs.readFile(`/proc/${dir}/cmdline`, "utf8");
           if (cmdline.includes(processName)) {
@@ -285,14 +335,20 @@ export class ResourceMonitor {
     const machineMemoryBytes = this.ctx.machine
       ? this.ctx.machine.memory * 1024 * 1024 * 1024
       : totalMemory;
-    const nodeMemoryUsage = process.memoryUsage().rss;
+    const nodeMemoryUsage = process.memoryUsage();
 
     // Node process percentage is based on machine memory if available, otherwise system memory
-    const nodeMemoryPercent = (nodeMemoryUsage / machineMemoryBytes) * 100;
+    const nodeMemoryPercent = (nodeMemoryUsage.rss / machineMemoryBytes) * 100;
+    const heapStats = getHeapStatistics();
 
     const nodeMetrics: NodeProcessMetrics = {
-      memoryUsage: nodeMemoryUsage,
+      memoryUsage: nodeMemoryUsage.rss,
       memoryUsagePercent: nodeMemoryPercent,
+      heapUsed: nodeMemoryUsage.heapUsed,
+      heapSizeLimit: heapStats.heap_size_limit,
+      heapUsagePercent: (heapStats.used_heap_size / heapStats.heap_size_limit) * 100,
+      availableHeap: heapStats.total_available_size,
+      isNearHeapLimit: heapStats.used_heap_size / heapStats.heap_size_limit > 0.8,
     };
 
     let method = "ps";
@@ -310,6 +366,13 @@ export class ResourceMonitor {
           processes = psOutput
             .trim()
             .split("\n")
+            .filter((line) => {
+              const parts = line.trim().split(/\s+/);
+              const pid = parseInt(parts[1], 10);
+
+              // Ignore processes that have a lower PID than our own PID
+              return pid > process.pid;
+            })
             .map((line) => {
               const parts = line.trim().split(/\s+/);
               return {
@@ -333,14 +396,16 @@ export class ResourceMonitor {
       if (processes.length === 0) {
         return {
           node: nodeMetrics,
-          target: {
-            method,
-            processName: this.processName,
-            count: 0,
-            processes: [],
-            averages: null,
-            totals: null,
-          },
+          targetProcess: this.processName
+            ? {
+                method,
+                processName: this.processName,
+                count: 0,
+                processes: [],
+                averages: null,
+                totals: null,
+              }
+            : null,
         };
       }
 
@@ -380,31 +445,35 @@ export class ResourceMonitor {
 
       return {
         node: nodeMetrics,
-        target: {
-          method,
-          processName: this.processName,
-          count,
-          processes,
-          averages,
-          totals: {
-            cpu: totals.cpu / cpuNormalizer,
-            memory: totals.memory,
-            rss: totals.rss,
-            vsz: totals.vsz,
-          },
-        },
+        targetProcess: this.processName
+          ? {
+              method,
+              processName: this.processName,
+              count,
+              processes,
+              averages,
+              totals: {
+                cpu: totals.cpu / cpuNormalizer,
+                memory: totals.memory,
+                rss: totals.rss,
+                vsz: totals.vsz,
+              },
+            }
+          : null,
       };
     } catch (error) {
       return {
         node: nodeMetrics,
-        target: {
-          method,
-          processName: this.processName,
-          count: 0,
-          processes: [],
-          averages: null,
-          totals: null,
-        },
+        targetProcess: this.processName
+          ? {
+              method,
+              processName: this.processName,
+              count: 0,
+              processes: [],
+              averages: null,
+              totals: null,
+            }
+          : null,
       };
     }
   }
@@ -414,75 +483,285 @@ export class ResourceMonitor {
    */
   async logResourceSnapshot(label = "Resource Snapshot"): Promise<void> {
     try {
-      const [systemMetrics, processMetrics] = await Promise.all([
-        this.getSystemMetrics(),
-        this.getProcessMetrics(),
-      ]);
-
-      const formatBytes = (bytes: number) => (bytes / (1024 * 1024)).toFixed(2);
-      const formatPercent = (value: number) => value.toFixed(1);
-
-      this.logger.info(label, {
-        system: {
-          disk: {
-            limitGiB: DISK_LIMIT_GB,
-            dirName: this.dirName,
-            usedGiB: (systemMetrics.disk.used / (1024 * 1024 * 1024)).toFixed(2),
-            freeGiB: (systemMetrics.disk.free / (1024 * 1024 * 1024)).toFixed(2),
-            percentUsed: formatPercent(systemMetrics.disk.percentUsed),
-            warning: systemMetrics.disk.warning,
-          },
-          memory: {
-            freeGB: (systemMetrics.memory.free / (1024 * 1024 * 1024)).toFixed(2),
-            percentUsed: formatPercent(systemMetrics.memory.percentUsed),
-          },
+      const payload = await this.getResourceSnapshotPayload();
+      const enhancedLabel = this.compactLogging
+        ? this.createCompactLabel(payload, label)
+        : this.createEnhancedLabel(payload, label);
+
+      if (payload.process.node.isNearHeapLimit) {
+        this.logger.warn(`${enhancedLabel}: Node is near heap limit`, payload);
+      } else {
+        this.logger.info(enhancedLabel, payload);
+      }
+    } catch (error) {
+      this.logger.error(
+        `Error logging resource snapshot: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+
+  /**
+   * Create an enhanced log label with key metrics for quick scanning
+   */
+  private createEnhancedLabel(payload: any, baseLabel: string): string {
+    const parts: string[] = [baseLabel];
+
+    // System resources with text indicators
+    const diskPercent = parseFloat(payload.system.disk.percentUsed);
+    const memoryPercent = parseFloat(payload.system.memory.percentUsed);
+    const diskIndicator = this.getTextIndicator(diskPercent, 80, 90);
+    const memIndicator = this.getTextIndicator(memoryPercent, 80, 90);
+    parts.push(`Disk:${diskPercent.toFixed(1).padStart(5)}%${diskIndicator}`);
+    parts.push(`Mem:${memoryPercent.toFixed(1).padStart(5)}%${memIndicator}`);
+
+    // Node process metrics with text indicators
+    const nodeMemPercent = parseFloat(payload.process.node.memoryUsagePercent);
+    const heapPercent = parseFloat(payload.process.node.heapUsagePercent);
+    const nodeIndicator = this.getTextIndicator(nodeMemPercent, 70, 85);
+    const heapIndicator = this.getTextIndicator(heapPercent, 70, 85);
+    parts.push(`Node:${nodeMemPercent.toFixed(1).padStart(4)}%${nodeIndicator}`);
+    parts.push(`Heap:${heapPercent.toFixed(1).padStart(4)}%${heapIndicator}`);
+
+    // Target process metrics (if available)
+    if (payload.process.targetProcess && payload.process.targetProcess.count > 0) {
+      const targetCpu = payload.process.targetProcess.totals?.cpuPercent || "0";
+      const targetMem = payload.process.targetProcess.totals?.memoryPercent || "0";
+      const targetCpuNum = parseFloat(targetCpu);
+      const targetMemNum = parseFloat(targetMem);
+      const cpuIndicator = this.getTextIndicator(targetCpuNum, 80, 90);
+      const memIndicator = this.getTextIndicator(targetMemNum, 80, 90);
+      parts.push(
+        `${payload.process.targetProcess.processName}:${targetCpu.padStart(
+          4
+        )}%${cpuIndicator}/${targetMem.padStart(4)}%${memIndicator}`
+      );
+    }
+
+    // GC activity with performance indicators
+    if (payload.gc && payload.gc.count > 0) {
+      const avgDuration = payload.gc.avgDuration;
+      const gcIndicator = this.getTextIndicator(avgDuration, 5, 10, true);
+      parts.push(
+        `GC:${payload.gc.count.toString().padStart(2)}(${avgDuration
+          .toFixed(1)
+          .padStart(4)}ms)${gcIndicator}`
+      );
+    }
+
+    // Machine constraints
+    if (payload.constraints) {
+      parts.push(`[${payload.constraints.cpu}CPU/${payload.constraints.memoryGB}GB]`);
+    }
+
+    // Warning indicators (only show critical ones in the main label)
+    const criticalWarnings: string[] = [];
+    if (payload.process.node.isNearHeapLimit) criticalWarnings.push("HEAP_LIMIT");
+    if (diskPercent > 90) criticalWarnings.push("DISK_CRITICAL");
+    if (memoryPercent > 95) criticalWarnings.push("MEM_CRITICAL");
+    if (payload.system.disk.warning) criticalWarnings.push("DISK_WARN");
+
+    if (criticalWarnings.length > 0) {
+      parts.push(`[${criticalWarnings.join(",")}]`);
+    }
+
+    return parts.join(" | ");
+  }
+
+  /**
+   * Get text-based indicator for percentage values
+   */
+  private getTextIndicator(
+    value: number,
+    warningThreshold: number,
+    criticalThreshold: number,
+    isDuration = false
+  ): string {
+    if (isDuration) {
+      // For duration values, higher is worse
+      if (value >= criticalThreshold) return " [CRIT]";
+      if (value >= warningThreshold) return " [WARN]";
+      return " [OK]";
+    } else {
+      // For percentage values, higher is worse
+      if (value >= criticalThreshold) return " [CRIT]";
+      if (value >= warningThreshold) return " [WARN]";
+      return " [OK]";
+    }
+  }
+
+  /**
+   * Create a compact version of the enhanced label for high-frequency logging
+   */
+  private createCompactLabel(payload: any, baseLabel: string): string {
+    const parts: string[] = [baseLabel];
+
+    // Only show critical metrics in compact mode
+    const diskPercent = parseFloat(payload.system.disk.percentUsed);
+    const memoryPercent = parseFloat(payload.system.memory.percentUsed);
+    const heapPercent = parseFloat(payload.process.node.heapUsagePercent);
+
+    // Use single character indicators for compactness
+    const diskIndicator = diskPercent > 90 ? "!" : diskPercent > 80 ? "?" : ".";
+    const memIndicator = memoryPercent > 95 ? "!" : memoryPercent > 80 ? "?" : ".";
+    const heapIndicator = heapPercent > 85 ? "!" : heapPercent > 70 ? "?" : ".";
+
+    parts.push(`D:${diskPercent.toFixed(0).padStart(2)}%${diskIndicator}`);
+    parts.push(`M:${memoryPercent.toFixed(0).padStart(2)}%${memIndicator}`);
+    parts.push(`H:${heapPercent.toFixed(0).padStart(2)}%${heapIndicator}`);
+
+    // GC activity (only if significant)
+    if (payload.gc && payload.gc.count > 0 && payload.gc.avgDuration > 2) {
+      const gcIndicator =
+        payload.gc.avgDuration > 10 ? "!" : payload.gc.avgDuration > 5 ? "?" : ".";
+      parts.push(`GC:${payload.gc.count}${gcIndicator}`);
+    }
+
+    return parts.join(" ");
+  }
+
+  async getResourceSnapshotPayload() {
+    const [systemMetrics, processMetrics] = await Promise.all([
+      this.getSystemMetrics(),
+      this.getProcessMetrics(),
+    ]);
+
+    const gcSummary = summarizeGCEntries(this.bufferedGcEntries);
+    this.bufferedGcEntries = [];
+
+    const formatBytes = (bytes: number) => (bytes / (1024 * 1024)).toFixed(2);
+    const formatPercent = (value: number) => value.toFixed(1);
+
+    return {
+      system: {
+        disk: {
+          limitGiB: DISK_LIMIT_GB,
+          dirName: this.dirName,
+          usedGiB: (systemMetrics.disk.used / (1024 * 1024 * 1024)).toFixed(2),
+          freeGiB: (systemMetrics.disk.free / (1024 * 1024 * 1024)).toFixed(2),
+          percentUsed: formatPercent(systemMetrics.disk.percentUsed),
+          warning: systemMetrics.disk.warning,
         },
-        constraints: this.ctx.machine
-          ? {
-              cpu: this.ctx.machine.cpu,
-              memoryGB: this.ctx.machine.memory,
-              diskGB: DISK_LIMIT_BYTES / (1024 * 1024 * 1024),
-            }
-          : {
-              cpu: os.cpus().length,
-              memoryGB: Math.floor(os.totalmem() / (1024 * 1024 * 1024)),
-              note: "Using system resources (no machine constraints specified)",
-            },
-        process: {
-          node: {
-            memoryUsageMB: formatBytes(processMetrics.node.memoryUsage),
-            memoryUsagePercent: formatPercent(processMetrics.node.memoryUsagePercent),
+        memory: {
+          freeGB: (systemMetrics.memory.free / (1024 * 1024 * 1024)).toFixed(2),
+          percentUsed: formatPercent(systemMetrics.memory.percentUsed),
+        },
+      },
+      gc: gcSummary,
+      constraints: this.ctx.machine
+        ? {
+            cpu: this.ctx.machine.cpu,
+            memoryGB: this.ctx.machine.memory,
+            diskGB: DISK_LIMIT_BYTES / (1024 * 1024 * 1024),
+          }
+        : {
+            cpu: os.cpus().length,
+            memoryGB: Math.floor(os.totalmem() / (1024 * 1024 * 1024)),
+            note: "Using system resources (no machine constraints specified)",
           },
-          target: processMetrics.target
+      process: {
+        node: {
+          memoryUsageMB: formatBytes(processMetrics.node.memoryUsage),
+          memoryUsagePercent: formatPercent(processMetrics.node.memoryUsagePercent),
+          heapUsedMB: formatBytes(processMetrics.node.heapUsed),
+          heapSizeLimitMB: formatBytes(processMetrics.node.heapSizeLimit),
+          heapUsagePercent: formatPercent(processMetrics.node.heapUsagePercent),
+          availableHeapMB: formatBytes(processMetrics.node.availableHeap),
+          isNearHeapLimit: processMetrics.node.isNearHeapLimit,
+          ...(this.verbose
             ? {
-                method: processMetrics.target.method,
-                processName: processMetrics.target.processName,
-                count: processMetrics.target.count,
-                averages: processMetrics.target.averages
-                  ? {
-                      cpuPercent: formatPercent(processMetrics.target.averages.cpu * 100),
-                      memoryPercent: formatPercent(processMetrics.target.averages.memory),
-                      rssMB: formatBytes(processMetrics.target.averages.rss * 1024),
-                      vszMB: formatBytes(processMetrics.target.averages.vsz * 1024),
-                    }
-                  : null,
-                totals: processMetrics.target.totals
-                  ? {
-                      cpuPercent: formatPercent(processMetrics.target.totals.cpu * 100),
-                      memoryPercent: formatPercent(processMetrics.target.totals.memory),
-                      rssMB: formatBytes(processMetrics.target.totals.rss * 1024),
-                      vszMB: formatBytes(processMetrics.target.totals.vsz * 1024),
-                    }
-                  : null,
+                heapStats: getHeapStatistics(),
               }
-            : null,
+            : {}),
         },
-        timestamp: new Date().toISOString(),
-      });
-    } catch (error) {
-      this.logger.error(
-        `Error logging resource snapshot: ${error instanceof Error ? error.message : String(error)}`
-      );
+        targetProcess: processMetrics.targetProcess
+          ? {
+              method: processMetrics.targetProcess.method,
+              processName: processMetrics.targetProcess.processName,
+              count: processMetrics.targetProcess.count,
+              averages: processMetrics.targetProcess.averages
+                ? {
+                    cpuPercent: formatPercent(processMetrics.targetProcess.averages.cpu * 100),
+                    memoryPercent: formatPercent(processMetrics.targetProcess.averages.memory),
+                    rssMB: formatBytes(processMetrics.targetProcess.averages.rss * 1024),
+                    vszMB: formatBytes(processMetrics.targetProcess.averages.vsz * 1024),
+                  }
+                : null,
+              totals: processMetrics.targetProcess.totals
+                ? {
+                    cpuPercent: formatPercent(processMetrics.targetProcess.totals.cpu * 100),
+                    memoryPercent: formatPercent(processMetrics.targetProcess.totals.memory),
+                    rssMB: formatBytes(processMetrics.targetProcess.totals.rss * 1024),
+                    vszMB: formatBytes(processMetrics.targetProcess.totals.vsz * 1024),
+                  }
+                : null,
+            }
+          : null,
+      },
+      timestamp: new Date().toISOString(),
+    };
+  }
+}
+
+function summarizeGCEntries(entries: PerformanceEntry[]): GCSummary {
+  if (entries.length === 0) {
+    return {
+      count: 0,
+      totalDuration: 0,
+      avgDuration: 0,
+      maxDuration: 0,
+      kinds: {},
+    };
+  }
+
+  let totalDuration = 0;
+  let maxDuration = 0;
+  const kinds: Record<string, { count: number; totalDuration: number; maxDuration: number }> = {};
+
+  for (const e of entries) {
+    const duration = e.duration;
+    totalDuration += duration;
+    if (duration > maxDuration) maxDuration = duration;
+
+    const kind = kindName((e as any)?.detail?.kind ?? "unknown");
+    if (!kinds[kind]) {
+      kinds[kind] = { count: 0, totalDuration: 0, maxDuration: 0 };
     }
+    kinds[kind].count += 1;
+    kinds[kind].totalDuration += duration;
+    if (duration > kinds[kind].maxDuration) kinds[kind].maxDuration = duration;
   }
+
+  // finalize averages
+  const avgDuration = totalDuration / entries.length;
+  const kindsWithAvg: GCSummary["kinds"] = {};
+  for (const [kind, stats] of Object.entries(kinds)) {
+    kindsWithAvg[kind] = {
+      count: stats.count,
+      totalDuration: stats.totalDuration,
+      avgDuration: stats.totalDuration / stats.count,
+      maxDuration: stats.maxDuration,
+    };
+  }
+
+  return {
+    count: entries.length,
+    totalDuration,
+    avgDuration,
+    maxDuration,
+    kinds: kindsWithAvg,
+  };
 }
+
+const kindName = (k: number | string) => {
+  if (typeof k === "number") {
+    return (
+      {
+        [constants.NODE_PERFORMANCE_GC_MAJOR]: "major",
+        [constants.NODE_PERFORMANCE_GC_MINOR]: "minor",
+        [constants.NODE_PERFORMANCE_GC_INCREMENTAL]: "incremental",
+        [constants.NODE_PERFORMANCE_GC_WEAKCB]: "weak-cb",
+      }[k] ?? `kind:${k}`
+    );
+  }
+  return k;
+};
diff --git a/references/hello-world/src/trigger/attemptFailures.ts b/references/hello-world/src/trigger/attemptFailures.ts
new file mode 100644
index 00000000000..b0a33e3f586
--- /dev/null
+++ b/references/hello-world/src/trigger/attemptFailures.ts
@@ -0,0 +1,50 @@
+import { task } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+
+export const attemptFailures = task({
+  id: "attempt-failures",
+  retry: {
+    maxAttempts: 3,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 1000,
+    factor: 1.5,
+  },
+  run: async (payload: any, { ctx }) => {
+    await setTimeout(5);
+
+    await attemptFailureSubtask.triggerAndWait({}).unwrap();
+  },
+});
+
+export const attemptFailureSubtask = task({
+  id: "attempt-failure-subtask",
+  retry: {
+    maxAttempts: 1,
+  },
+  run: async (payload: any, { ctx }) => {
+    await setTimeout(20_000);
+
+    throw new Error("Forced error to cause a retry");
+  },
+});
+
+export const attemptFailures2 = task({
+  id: "attempt-failures-2",
+  retry: {
+    maxAttempts: 3,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 1000,
+    factor: 1.5,
+  },
+  run: async (payload: any, { ctx }) => {
+    if (ctx.attempt.number <= 2) {
+      throw new Error("Forced error to cause a retry");
+    }
+
+    await setTimeout(10_000);
+
+    return {
+      success: true,
+    };
+  },
+});
diff --git a/references/hello-world/src/trigger/batches.ts b/references/hello-world/src/trigger/batches.ts
index e5220fe9f12..594f4032f17 100644
--- a/references/hello-world/src/trigger/batches.ts
+++ b/references/hello-world/src/trigger/batches.ts
@@ -1,6 +1,336 @@
-import { task } from "@trigger.dev/sdk/v3";
+import { batch, BatchTriggerError, logger, runs, task, tasks } from "@trigger.dev/sdk/v3";
 import { setTimeout } from "timers/promises";
 
+// ============================================================================
+// Toxiproxy-based Retry Testing
+// ============================================================================
+// These tests use Toxiproxy to inject real network failures and verify
+// that the SDK's batch streaming retry logic works correctly.
+//
+// Prerequisites:
+// 1. Run `pnpm run docker` to start services including toxiproxy
+// 2. Toxiproxy proxies localhost:3030 (webapp) on localhost:30303
+// 3. Toxiproxy API is available on localhost:8474
+// ============================================================================
+
+const TOXIPROXY_API = "http://localhost:8474";
+const TOXIPROXY_PROXY_NAME = "trigger_webapp_local";
+const PROXIED_API_URL = "http://localhost:30303"; // Goes through toxiproxy
+
+/**
+ * Toxiproxy API helper - adds a toxic to inject failures
+ */
+async function addToxic(toxic: {
+  name: string;
+  type: string;
+  stream?: "upstream" | "downstream";
+  toxicity?: number;
+  attributes?: Record<string, unknown>;
+}): Promise<void> {
+  const response = await fetch(`${TOXIPROXY_API}/proxies/${TOXIPROXY_PROXY_NAME}/toxics`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      stream: "downstream", // Server -> Client
+      toxicity: 1.0, // 100% of connections affected
+      ...toxic,
+    }),
+  });
+
+  if (!response.ok) {
+    const text = await response.text();
+    throw new Error(`Failed to add toxic: ${response.status} ${text}`);
+  }
+
+  logger.info(`Added toxic: ${toxic.name}`, { toxic });
+}
+
+/**
+ * Toxiproxy API helper - removes a toxic
+ */
+async function removeToxic(name: string): Promise<void> {
+  const response = await fetch(`${TOXIPROXY_API}/proxies/${TOXIPROXY_PROXY_NAME}/toxics/${name}`, {
+    method: "DELETE",
+  });
+
+  if (!response.ok && response.status !== 404) {
+    const text = await response.text();
+    throw new Error(`Failed to remove toxic: ${response.status} ${text}`);
+  }
+
+  logger.info(`Removed toxic: ${name}`);
+}
+
+/**
+ * Toxiproxy API helper - list all toxics
+ */
+async function listToxics(): Promise<unknown[]> {
+  const response = await fetch(`${TOXIPROXY_API}/proxies/${TOXIPROXY_PROXY_NAME}/toxics`);
+  if (!response.ok) {
+    return [];
+  }
+  return response.json();
+}
+
+/**
+ * Toxiproxy API helper - clear all toxics
+ */
+async function clearAllToxics(): Promise<void> {
+  const toxics = (await listToxics()) as Array<{ name: string }>;
+  for (const toxic of toxics) {
+    await removeToxic(toxic.name);
+  }
+  logger.info("Cleared all toxics");
+}
+
+/**
+ * Test: Batch retry with connection reset injection
+ *
+ * This test:
+ * 1. Configures SDK to use the proxied URL (through toxiproxy)
+ * 2. Adds a "reset_peer" toxic that will kill connections
+ * 3. Triggers a batch - the connection will be reset mid-stream
+ * 4. SDK should retry with tee'd stream
+ * 5. Removes toxic so retry succeeds
+ * 6. Verifies all items were processed exactly once
+ *
+ * Run with: `npx trigger.dev@latest dev` then trigger this task
+ */
+export const batchRetryWithToxiproxy = task({
+  id: "batch-retry-with-toxiproxy",
+  machine: "small-1x",
+  maxDuration: 300,
+  run: async (payload: { count: number; failAfterBytes?: number }) => {
+    const count = payload.count || 50;
+    const failAfterBytes = payload.failAfterBytes || 5000; // Fail after ~5KB sent
+
+    // Clear any existing toxics
+    await clearAllToxics();
+
+    // Generate batch items
+    const items = Array.from({ length: count }, (_, i) => ({
+      payload: { index: i, batchTest: "toxiproxy-retry" },
+    }));
+
+    // Add a toxic that limits data then resets connection
+    // This simulates a connection failure mid-stream
+    await addToxic({
+      name: "limit_and_reset",
+      type: "limit_data",
+      stream: "upstream", // Client -> Server (our stream upload)
+      attributes: {
+        bytes: failAfterBytes, // Allow this many bytes then close
+      },
+    });
+
+    logger.info("Starting batch trigger through toxiproxy", {
+      count,
+      failAfterBytes,
+      apiUrl: PROXIED_API_URL,
+    });
+
+    // Schedule toxic removal after a delay to allow retry to succeed
+    const toxicRemovalPromise = (async () => {
+      await setTimeout(2000); // Wait for first attempt to fail
+      await clearAllToxics();
+      logger.info("Toxic removed - retry should succeed now");
+    })();
+
+    try {
+      // Trigger batch through the proxied URL
+      // The first attempt will fail due to the toxic, retry should succeed
+      const result = await tasks.batchTrigger<typeof retryTrackingTask>(
+        "retry-tracking-task",
+        items,
+        undefined,
+        {
+          // Use the proxied URL that goes through toxiproxy
+          clientConfig: {
+            baseURL: PROXIED_API_URL,
+          },
+        }
+      );
+
+      // Wait for toxic removal to complete
+      await toxicRemovalPromise;
+
+      logger.info("Batch triggered successfully!", {
+        batchId: result.batchId,
+        runCount: result.runCount,
+      });
+
+      // Wait for runs to complete
+      await setTimeout(10000);
+
+      // Retrieve batch to check results
+      const batchResult = await batch.retrieve(result.batchId);
+
+      return {
+        success: true,
+        batchId: result.batchId,
+        runCount: result.runCount,
+        batchStatus: batchResult.status,
+        note: "Check logs to see retry behavior. Items should be deduplicated on server.",
+      };
+    } catch (error) {
+      // Clean up toxics on error
+      await clearAllToxics();
+
+      return {
+        success: false,
+        error: error instanceof Error ? error.message : String(error),
+        note: "Batch failed - check if toxiproxy is running and webapp is accessible",
+      };
+    }
+  },
+});
+
+/**
+ * Test: Verify deduplication after retry
+ *
+ * This test uses a slower toxic (latency + timeout) and verifies
+ * that items processed before failure aren't reprocessed after retry.
+ */
+export const batchDeduplicationTest = task({
+  id: "batch-deduplication-test",
+  machine: "small-1x",
+  maxDuration: 300,
+  run: async (payload: { count: number }) => {
+    const count = payload.count || 20;
+
+    // Clear any existing toxics
+    await clearAllToxics();
+
+    // Create a unique test ID to track this specific batch
+    const testId = `dedup-${Date.now()}`;
+
+    // Items with tags for easy querying
+    const items = Array.from({ length: count }, (_, i) => ({
+      payload: {
+        index: i,
+        testId,
+      },
+      options: {
+        tags: [`testId:${testId}`, `index:${i}`],
+      },
+    }));
+
+    // Add timeout toxic - connection will timeout mid-stream
+    await addToxic({
+      name: "timeout_test",
+      type: "timeout",
+      stream: "upstream",
+      attributes: {
+        timeout: 1000, // Timeout after 1 second
+      },
+    });
+
+    // Remove toxic after delay so retry succeeds
+    setTimeout(3000).then(() => clearAllToxics());
+
+    try {
+      const result = await tasks.batchTrigger<typeof retryTrackingTask>(
+        "retry-tracking-task",
+        items,
+        undefined,
+        { clientConfig: { baseURL: PROXIED_API_URL } }
+      );
+
+      // Wait for completion
+      await setTimeout(15000);
+
+      // Query all runs with our testId to check for duplicates
+      const allRuns = await runs.list({
+        tag: `testId:${testId}`,
+      });
+
+      // Collect run IDs first (list doesn't include payload)
+      const runIds: string[] = [];
+      for await (const run of allRuns) {
+        runIds.push(run.id);
+      }
+
+      // Retrieve full run details to get payloads
+      const runDetails = await Promise.all(runIds.map((id) => runs.retrieve(id)));
+
+      // Count occurrences of each index
+      const indexCounts = new Map<number, number>();
+      for (const run of runDetails) {
+        const payload = run.payload as { index: number } | undefined;
+        if (payload?.index !== undefined) {
+          indexCounts.set(payload.index, (indexCounts.get(payload.index) || 0) + 1);
+        }
+      }
+
+      const duplicates = Array.from(indexCounts.entries()).filter(([_, count]) => count > 1);
+
+      return {
+        batchId: result.batchId,
+        totalRuns: runIds.length,
+        expectedRuns: count,
+        duplicates: duplicates.length > 0 ? duplicates : "none",
+        success: duplicates.length === 0 && runIds.length === count,
+      };
+    } finally {
+      await clearAllToxics();
+    }
+  },
+});
+
+/**
+ * Task that tracks its execution for deduplication verification.
+ * Tags are set when triggering via batch options.
+ */
+export const retryTrackingTask = task({
+  id: "retry-tracking-task",
+  retry: { maxAttempts: 1 }, // Don't retry the task itself
+  run: async (payload: { index: number; testId?: string; batchTest?: string }) => {
+    logger.info(`Processing item ${payload.index}`, { payload });
+
+    await setTimeout(100);
+
+    return {
+      index: payload.index,
+      processedAt: Date.now(),
+    };
+  },
+});
+
+/**
+ * Simple test to verify toxiproxy is working
+ */
+export const toxiproxyHealthCheck = task({
+  id: "toxiproxy-health-check",
+  run: async () => {
+    // Check toxiproxy API
+    const apiResponse = await fetch(`${TOXIPROXY_API}/proxies`);
+    const proxies = await apiResponse.json();
+
+    // Check proxied webapp
+    let webappStatus = "unknown";
+    try {
+      const webappResponse = await fetch(`${PROXIED_API_URL}/api/v1/whoami`, {
+        headers: {
+          Authorization: `Bearer ${process.env.TRIGGER_SECRET_KEY}`,
+        },
+      });
+      webappStatus = webappResponse.ok ? "ok" : `error: ${webappResponse.status}`;
+    } catch (e) {
+      webappStatus = `error: ${e instanceof Error ? e.message : String(e)}`;
+    }
+
+    // List current toxics
+    const toxics = await listToxics();
+
+    return {
+      toxiproxyApi: apiResponse.ok ? "ok" : "error",
+      proxies,
+      webappThroughProxy: webappStatus,
+      currentToxics: toxics,
+    };
+  },
+});
+
 export const batchTriggerAndWait = task({
   id: "batch-trigger-and-wait",
   maxDuration: 60,
@@ -14,6 +344,661 @@ export const batchTriggerAndWait = task({
   },
 });
 
+// ============================================================================
+// Rate Limit Error Testing
+// ============================================================================
+
+/**
+ * Test: Intentionally trigger a rate limit error to verify BatchTriggerError improvements
+ *
+ * This test triggers many batches in rapid succession to exceed the rate limit.
+ * When a rate limit is hit, it verifies that:
+ * 1. The error is a BatchTriggerError
+ * 2. The error has isRateLimited = true
+ * 3. The error message includes rate limit details
+ * 4. The retryAfterMs property is set
+ *
+ * Run this from backend code, not from inside a task (to avoid worker rate limits).
+ */
+export const rateLimitErrorTest = task({
+  id: "rate-limit-error-test",
+  maxDuration: 300,
+  run: async (payload: { batchesPerAttempt?: number; itemsPerBatch?: number }) => {
+    const batchesPerAttempt = payload.batchesPerAttempt || 50;
+    const itemsPerBatch = payload.itemsPerBatch || 100;
+
+    logger.info("Starting rate limit error test", {
+      batchesPerAttempt,
+      itemsPerBatch,
+      totalItems: batchesPerAttempt * itemsPerBatch,
+    });
+
+    const results: Array<{
+      batchIndex: number;
+      success: boolean;
+      batchId?: string;
+      error?: {
+        message: string;
+        name: string;
+        isRateLimited?: boolean;
+        retryAfterMs?: number;
+        phase?: string;
+      };
+    }> = [];
+
+    // Try to trigger many batches rapidly
+    const batchPromises = Array.from({ length: batchesPerAttempt }, async (_, batchIndex) => {
+      const items = Array.from({ length: itemsPerBatch }, (_, i) => ({
+        payload: { index: batchIndex * itemsPerBatch + i, testId: `rate-limit-test-${Date.now()}` },
+      }));
+
+      try {
+        const result = await retryTrackingTask.batchTrigger(items);
+        return {
+          batchIndex,
+          success: true as const,
+          batchId: result.batchId,
+        };
+      } catch (error) {
+        // Log the error details for inspection
+        if (error instanceof BatchTriggerError) {
+          logger.info(`BatchTriggerError caught for batch ${batchIndex}`, {
+            message: error.message,
+            name: error.name,
+            isRateLimited: error.isRateLimited,
+            retryAfterMs: error.retryAfterMs,
+            phase: error.phase,
+            batchId: error.batchId,
+            itemCount: error.itemCount,
+            cause: error.cause instanceof Error ? error.cause.message : String(error.cause),
+          });
+
+          return {
+            batchIndex,
+            success: false as const,
+            error: {
+              message: error.message,
+              name: error.name,
+              isRateLimited: error.isRateLimited,
+              retryAfterMs: error.retryAfterMs,
+              phase: error.phase,
+            },
+          };
+        }
+
+        // Non-BatchTriggerError
+        const err = error instanceof Error ? error : new Error(String(error));
+        logger.warn(`Non-BatchTriggerError caught for batch ${batchIndex}`, {
+          message: err.message,
+          name: err.name,
+        });
+
+        return {
+          batchIndex,
+          success: false as const,
+          error: {
+            message: err.message,
+            name: err.name,
+          },
+        };
+      }
+    });
+
+    // Wait for all attempts (use allSettled to capture all results)
+    const settled = await Promise.allSettled(batchPromises);
+
+    for (const result of settled) {
+      if (result.status === "fulfilled") {
+        results.push(result.value);
+      } else {
+        results.push({
+          batchIndex: -1,
+          success: false,
+          error: {
+            message: result.reason?.message || String(result.reason),
+            name: result.reason?.name || "Error",
+          },
+        });
+      }
+    }
+
+    // Analyze results
+    const successCount = results.filter((r) => r.success).length;
+    const rateLimitedCount = results.filter((r) => !r.success && r.error?.isRateLimited).length;
+    const otherErrorCount = results.filter((r) => !r.success && !r.error?.isRateLimited).length;
+
+    // Get a sample rate limit error for inspection
+    const sampleRateLimitError = results.find((r) => r.error?.isRateLimited)?.error;
+
+    return {
+      summary: {
+        totalBatches: batchesPerAttempt,
+        successCount,
+        rateLimitedCount,
+        otherErrorCount,
+      },
+      sampleRateLimitError: sampleRateLimitError || null,
+      allResults: results,
+      testPassed:
+        rateLimitedCount > 0 &&
+        sampleRateLimitError?.isRateLimited === true &&
+        typeof sampleRateLimitError?.retryAfterMs === "number",
+    };
+  },
+});
+
+/**
+ * Simpler test: Direct batch trigger that's likely to hit rate limits
+ *
+ * This test just tries to batch trigger a very large number of items in one call.
+ * If the organization has rate limits configured, this should trigger them.
+ */
+export const simpleBatchRateLimitTest = task({
+  id: "simple-batch-rate-limit-test",
+  maxDuration: 120,
+  run: async (payload: { itemCount?: number }) => {
+    const itemCount = payload.itemCount || 5000; // Large batch that might hit limits
+
+    logger.info("Starting simple batch rate limit test", { itemCount });
+
+    const items = Array.from({ length: itemCount }, (_, i) => ({
+      payload: { index: i, testId: `simple-rate-test-${Date.now()}` },
+    }));
+
+    try {
+      const result = await retryTrackingTask.batchTrigger(items);
+
+      logger.info("Batch succeeded (no rate limit hit)", {
+        batchId: result.batchId,
+        runCount: result.runCount,
+      });
+
+      return {
+        success: true,
+        batchId: result.batchId,
+        runCount: result.runCount,
+        rateLimitHit: false,
+      };
+    } catch (error) {
+      if (error instanceof BatchTriggerError) {
+        logger.info("BatchTriggerError caught", {
+          fullMessage: error.message,
+          isRateLimited: error.isRateLimited,
+          retryAfterMs: error.retryAfterMs,
+          phase: error.phase,
+          itemCount: error.itemCount,
+          apiErrorType: error.apiError?.constructor.name,
+        });
+
+        return {
+          success: false,
+          rateLimitHit: error.isRateLimited,
+          errorMessage: error.message,
+          errorDetails: {
+            phase: error.phase,
+            itemCount: error.itemCount,
+            isRateLimited: error.isRateLimited,
+            retryAfterMs: error.retryAfterMs,
+            hasApiError: !!error.apiError,
+          },
+        };
+      }
+
+      throw error; // Re-throw unexpected errors
+    }
+  },
+});
+
+// ============================================================================
+// Streaming Batch Examples
+// ============================================================================
+
+/**
+ * Example: Streaming batch trigger using an async generator
+ *
+ * This allows you to stream items to the batch without loading all items into memory.
+ * Useful for large batches or when items are generated dynamically.
+ */
+export const streamingBatchTrigger = task({
+  id: "streaming-batch-trigger",
+  maxDuration: 120,
+  run: async (payload: { count: number }) => {
+    // Define an async generator that yields batch items
+    async function* generateItems() {
+      for (let i = 0; i < payload.count; i++) {
+        yield {
+          payload: { waitSeconds: 1, output: `streamed-${i}` },
+        };
+      }
+    }
+
+    // Trigger the batch using the generator - items are streamed to the server
+    const result = await fixedLengthTask.batchTrigger(generateItems());
+
+    return {
+      batchId: result.batchId,
+      runCount: result.runCount,
+    };
+  },
+});
+
+/**
+ * Example: Streaming batch triggerAndWait using an async generator
+ *
+ * Similar to streaming trigger, but waits for all runs to complete.
+ */
+export const streamingBatchTriggerAndWait = task({
+  id: "streaming-batch-trigger-and-wait",
+  maxDuration: 300,
+  run: async (payload: { count: number }) => {
+    // Async generator for items
+    async function* generateItems() {
+      for (let i = 0; i < payload.count; i++) {
+        yield {
+          payload: { waitSeconds: 1, output: `streamed-wait-${i}` },
+        };
+      }
+    }
+
+    // Trigger and wait - items are streamed, then we wait for all results
+    const results = await fixedLengthTask.batchTriggerAndWait(generateItems());
+
+    // Process results
+    const outputs = results.runs.filter((r) => r.ok).map((r) => (r.ok ? r.output : null));
+
+    return { outputs };
+  },
+});
+
+/**
+ * Example: Streaming batch.trigger for multiple task types
+ *
+ * Use batch.trigger with a stream when triggering different task types.
+ */
+export const streamingMultiTaskBatch = task({
+  id: "streaming-multi-task-batch",
+  maxDuration: 120,
+  run: async (payload: { count: number }) => {
+    // Generator that yields items for different tasks
+    async function* generateMultiTaskItems() {
+      for (let i = 0; i < payload.count; i++) {
+        // Alternate between task types
+        if (i % 2 === 0) {
+          yield {
+            id: "fixed-length-lask" as const,
+            payload: { waitSeconds: 1, output: `task1-${i}` },
+          };
+        } else {
+          yield {
+            id: "simple-task" as const,
+            payload: { message: `task2-${i}` },
+          };
+        }
+      }
+    }
+
+    // Use batch.trigger with the stream
+    const result = await batch.trigger<typeof fixedLengthTask | typeof simpleTask>(
+      generateMultiTaskItems()
+    );
+
+    return {
+      batchId: result.batchId,
+      runCount: result.runCount,
+    };
+  },
+});
+
+/**
+ * Example: Using a ReadableStream for batch items
+ *
+ * You can also pass a ReadableStream instead of an AsyncIterable.
+ */
+export const readableStreamBatch = task({
+  id: "readable-stream-batch",
+  maxDuration: 120,
+  run: async (payload: { count: number }) => {
+    // Create a ReadableStream of batch items
+    const stream = new ReadableStream<{ payload: Payload }>({
+      async start(controller) {
+        for (let i = 0; i < payload.count; i++) {
+          controller.enqueue({
+            payload: { waitSeconds: 1, output: `stream-${i}` },
+          });
+        }
+        controller.close();
+      },
+    });
+
+    // Trigger with the ReadableStream
+    const result = await fixedLengthTask.batchTrigger(stream);
+
+    return {
+      batchId: result.batchId,
+      runCount: result.runCount,
+    };
+  },
+});
+
+// Simple task for multi-task batch example
+export const simpleTask = task({
+  id: "simple-task",
+  run: async (payload: { message: string }) => {
+    await setTimeout(500);
+    return { received: payload.message };
+  },
+});
+
+// ============================================================================
+// Queue Option Tests
+// ============================================================================
+
+/**
+ * Task that runs in a specific queue for testing queue option handling.
+ */
+export const queuedTask = task({
+  id: "queued-task",
+  queue: {
+    name: "test-queue-for-batch",
+  },
+  run: async (payload: { index: number; testId: string }) => {
+    logger.info(`Processing queued task ${payload.index}`, { payload });
+    await setTimeout(100);
+    return {
+      index: payload.index,
+      testId: payload.testId,
+      processedAt: Date.now(),
+    };
+  },
+});
+
+/**
+ * Test: Batch trigger with queue option as object
+ *
+ * This test verifies that the queue option works correctly when passed
+ * through batch trigger. The SDK passes queue as { name: "queue-name" }
+ * which should be handled correctly by the server.
+ *
+ * This tests the fix for the double-wrapping bug where queue objects
+ * like { name: "queue-name", concurrencyLimit: 20 } could get wrapped
+ * into { name: { name: "queue-name", concurrencyLimit: 20 } }.
+ */
+export const batchTriggerWithQueueOption = task({
+  id: "batch-trigger-with-queue-option",
+  maxDuration: 120,
+  run: async (payload: { count: number; useObjectQueue?: boolean }) => {
+    const count = payload.count || 5;
+    const testId = `queue-test-${Date.now()}`;
+
+    // If useObjectQueue is true, we bypass the SDK types to send queue as an object
+    // This simulates what might happen if someone calls the API directly with wrong format
+    const queueValue = payload.useObjectQueue
+      ? ({ name: "test-queue-for-batch", concurrencyLimit: 20 } as unknown as string)
+      : "test-queue-for-batch";
+
+    // Generate batch items with queue option specified
+    const items = Array.from({ length: count }, (_, i) => ({
+      payload: { index: i, testId },
+      options: {
+        queue: queueValue,
+        // Also test with lockToVersion since the error showed workers.some.id
+        // which only appears in the lockedBackgroundWorker code path
+      },
+    }));
+
+    logger.info("Starting batch trigger with queue option", {
+      count,
+      testId,
+      useObjectQueue: payload.useObjectQueue,
+      queueValue,
+    });
+
+    // Trigger the batch with queue option
+    const result = await queuedTask.batchTrigger(items);
+
+    logger.info("Batch triggered successfully", {
+      batchId: result.batchId,
+      runCount: result.runCount,
+    });
+
+    // Wait for runs to complete
+    await setTimeout(5000);
+
+    // Retrieve batch to check results
+    const batchResult = await batch.retrieve(result.batchId);
+
+    return {
+      success: true,
+      batchId: result.batchId,
+      runCount: result.runCount,
+      batchStatus: batchResult.status,
+      testId,
+    };
+  },
+});
+
+/**
+ * Test: Batch triggerAndWait with queue option
+ *
+ * Similar to above but waits for all runs to complete.
+ */
+export const batchTriggerAndWaitWithQueueOption = task({
+  id: "batch-trigger-and-wait-with-queue-option",
+  maxDuration: 120,
+  run: async (payload: { count: number }) => {
+    const count = payload.count || 5;
+    const testId = `queue-wait-test-${Date.now()}`;
+
+    // Generate items with queue option
+    const items = Array.from({ length: count }, (_, i) => ({
+      payload: { index: i, testId },
+      options: {
+        queue: "test-queue-for-batch",
+      },
+    }));
+
+    logger.info("Starting batch triggerAndWait with queue option", { count, testId });
+
+    // Trigger and wait
+    const results = await queuedTask.batchTriggerAndWait(items);
+
+    const successCount = results.runs.filter((r) => r.ok).length;
+    const outputs = results.runs.filter((r) => r.ok).map((r) => (r.ok ? r.output : null));
+
+    return {
+      success: successCount === count,
+      successCount,
+      totalCount: count,
+      outputs,
+      testId,
+    };
+  },
+});
+
+/**
+ * Test: Streaming batch trigger with queue option
+ *
+ * Tests that streaming batches also work correctly with queue options.
+ */
+export const streamingBatchWithQueueOption = task({
+  id: "streaming-batch-with-queue-option",
+  maxDuration: 120,
+  run: async (payload: { count: number }) => {
+    const count = payload.count || 10;
+    const testId = `stream-queue-test-${Date.now()}`;
+
+    // Async generator that yields items with queue option
+    async function* generateItems() {
+      for (let i = 0; i < count; i++) {
+        yield {
+          payload: { index: i, testId },
+          options: {
+            queue: "test-queue-for-batch",
+          },
+        };
+      }
+    }
+
+    logger.info("Starting streaming batch with queue option", { count, testId });
+
+    // Trigger using the generator
+    const result = await queuedTask.batchTrigger(generateItems());
+
+    logger.info("Streaming batch triggered", {
+      batchId: result.batchId,
+      runCount: result.runCount,
+    });
+
+    // Wait and check results
+    await setTimeout(5000);
+    const batchResult = await batch.retrieve(result.batchId);
+
+    return {
+      success: true,
+      batchId: result.batchId,
+      runCount: result.runCount,
+      batchStatus: batchResult.status,
+      testId,
+    };
+  },
+});
+
+// ============================================================================
+// Large Payload Examples (R2 Offloading)
+// ============================================================================
+
+/**
+ * Helper to generate a large string payload.
+ * Default threshold for R2 offloading is 512KB (BATCH_PAYLOAD_OFFLOAD_THRESHOLD).
+ *
+ * @param sizeInKB - Size of the payload in kilobytes
+ */
+function generateLargePayload(sizeInKB: number): string {
+  // Each character is 1 byte in ASCII, so we generate sizeInKB * 1024 characters
+  const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  const targetSize = sizeInKB * 1024;
+  let result = "";
+
+  while (result.length < targetSize) {
+    result += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+
+  return result;
+}
+
+/**
+ * Example: Batch trigger with large payloads that get offloaded to R2
+ *
+ * When a batch item's payload exceeds BATCH_PAYLOAD_OFFLOAD_THRESHOLD (default 512KB),
+ * it's automatically uploaded to R2 object storage. Only a reference path is stored
+ * in Redis, reducing memory usage and allowing larger payloads.
+ *
+ * The task receives the full payload - the offloading is transparent.
+ */
+export const largePayloadBatch = task({
+  id: "large-payload-batch",
+  maxDuration: 300,
+  machine: "large-2x",
+  run: async (payload: { count: number; payloadSizeKB: number }) => {
+    // Default to 600KB to exceed the 512KB threshold
+    const sizeKB = payload.payloadSizeKB || 600;
+
+    async function* generateLargeItems() {
+      for (let i = 0; i < payload.count; i++) {
+        yield {
+          payload: {
+            index: i,
+            // This large data will be offloaded to R2
+            largeData: generateLargePayload(sizeKB),
+          },
+        };
+      }
+    }
+
+    // Trigger the batch - large payloads are automatically offloaded to R2
+    const result = await largePayloadTask.batchTrigger(generateLargeItems());
+
+    await setTimeout(5000);
+
+    const myBatch = await batch.retrieve(result.batchId);
+
+    logger.info("batch", { myBatch });
+
+    return {
+      batchId: result.batchId,
+      runCount: result.runCount,
+      payloadSizeKB: sizeKB,
+      note: `Each payload was ~${sizeKB}KB. Payloads over 512KB are offloaded to R2.`,
+    };
+  },
+});
+
+/**
+ * Example: Batch triggerAndWait with large payloads
+ *
+ * Same as above but waits for results.
+ */
+export const largePayloadBatchAndWait = task({
+  id: "large-payload-batch-and-wait",
+  maxDuration: 600,
+  run: async (payload: { count: number; payloadSizeKB: number }) => {
+    const sizeKB = payload.payloadSizeKB || 600;
+
+    async function* generateLargeItems() {
+      for (let i = 0; i < payload.count; i++) {
+        yield {
+          payload: {
+            index: i,
+            largeData: generateLargePayload(sizeKB),
+          },
+        };
+      }
+    }
+
+    // Trigger and wait - large payloads are offloaded, results are returned
+    const results = await largePayloadTask.batchTriggerAndWait(generateLargeItems());
+
+    const successCount = results.runs.filter((r) => r.ok).length;
+    const outputs = results.runs.filter((r) => r.ok).map((r) => (r.ok ? r.output : null));
+
+    return {
+      successCount,
+      outputs,
+      payloadSizeKB: sizeKB,
+    };
+  },
+});
+
+type LargePayload = {
+  index: number;
+  largeData: string;
+};
+
+/**
+ * Task that receives large payloads.
+ * The payload is transparently downloaded from R2 if it was offloaded.
+ */
+export const largePayloadTask = task({
+  id: "large-payload-task",
+  retry: {
+    maxAttempts: 2,
+  },
+  machine: "small-1x",
+  run: async (payload: LargePayload) => {
+    // The large payload is available here - R2 download is transparent
+    const payloadSizeBytes = payload.largeData.length;
+    const payloadSizeKB = Math.round(payloadSizeBytes / 1024);
+
+    await setTimeout(500);
+
+    return {
+      index: payload.index,
+      receivedSizeKB: payloadSizeKB,
+      preview: payload.largeData.substring(0, 50) + "...",
+    };
+  },
+});
+
 type Payload = {
   waitSeconds: number;
   error?: string;
diff --git a/references/hello-world/src/trigger/circularPayload.ts b/references/hello-world/src/trigger/circularPayload.ts
new file mode 100644
index 00000000000..3e9d0a95452
--- /dev/null
+++ b/references/hello-world/src/trigger/circularPayload.ts
@@ -0,0 +1,149 @@
+import { logger, schemaTask, task, tasks } from "@trigger.dev/sdk";
+import { z } from "zod/v3";
+
+export const referentialPayloadParentTask = task({
+  id: "referential-payload-parent",
+  run: async (payload: any) => {
+    // Shared objects
+    const workflowData = {
+      id: "workflow-123",
+      formName: "Contact Form",
+    };
+
+    const response = [
+      {
+        id: "q1_name",
+        answer: "John Doe",
+      },
+      {
+        id: "q2_consent",
+        answer: "yes",
+        leadAttribute: undefined, // Will be marked in meta
+      },
+    ];
+
+    const personAttributes = {
+      ip: "192.168.1.1",
+      visitedForm: 1,
+    };
+
+    // Main object with shared references
+    const originalObject = {
+      workflowData: workflowData, // Root reference
+      workflowContext: {
+        leadId: undefined, // Will be marked in meta
+        workflowJob: {
+          workflowData: workflowData, // Same reference as root
+          createdAt: new Date("2025-08-19T12:13:42.260Z"), // Date object
+        },
+        responseData: {
+          personAttributes: personAttributes, // Same reference as root
+        },
+        response: response, // Same reference as root
+      },
+      personAttributes: personAttributes, // Root reference
+      response: response, // Root reference
+      jobArgs: {
+        response: response, // Same reference as root
+        args: workflowData, // Same reference as root
+      },
+    };
+
+    await tasks.triggerAndWait<typeof referentialPayloadChildTask>(
+      "referential-payload-child",
+      originalObject
+    );
+
+    return {
+      message: "Hello, world!",
+    };
+  },
+});
+
+// Define the circular schema using z.lazy() for the recursive reference
+const WorkflowDataSchema = z.object({
+  id: z.string(),
+  formName: z.string(),
+});
+
+const ResponseItemSchema = z.object({
+  id: z.string(),
+  answer: z.string(),
+  leadAttribute: z.undefined().optional(),
+});
+
+const PersonAttributesSchema = z.object({
+  ip: z.string(),
+  visitedForm: z.number(),
+});
+
+const OriginalObjectSchema = z.object({
+  workflowData: WorkflowDataSchema,
+  workflowContext: z.object({
+    leadId: z.undefined(),
+    workflowJob: z.object({
+      workflowData: WorkflowDataSchema, // Same reference
+      createdAt: z.date(),
+    }),
+    responseData: z.object({
+      personAttributes: PersonAttributesSchema, // Same reference
+    }),
+    response: z.array(ResponseItemSchema), // Same reference
+  }),
+  personAttributes: PersonAttributesSchema, // Root reference
+  response: z.array(ResponseItemSchema), // Root reference
+  jobArgs: z.object({
+    response: z.array(ResponseItemSchema), // Same reference
+    args: WorkflowDataSchema, // Same reference
+  }),
+});
+
+export const referentialPayloadChildTask = schemaTask({
+  id: "referential-payload-child",
+  schema: OriginalObjectSchema,
+  run: async (payload) => {
+    logger.info("Received circular payload", { payload });
+
+    return {
+      message: "Hello, world!",
+    };
+  },
+});
+
+export const circularReferenceParentTask = task({
+  id: "circular-reference-parent",
+  run: async (payload: any) => {
+    const user = {
+      name: "Alice",
+      details: {
+        age: 30,
+        email: "alice@example.com",
+      },
+    };
+    // @ts-expect-error - This is a circular reference
+    user.details.user = user;
+
+    await tasks.triggerAndWait<typeof circularReferenceChildTask>("circular-reference-child", {
+      // @ts-expect-error - This is a circular reference
+      user,
+    });
+  },
+});
+
+type CircularReferencePayload = {
+  user: {
+    name: string;
+    details: {
+      age: number;
+      email: string;
+      user: CircularReferencePayload;
+    };
+  };
+};
+
+export const circularReferenceChildTask = task({
+  id: "circular-reference-child",
+  run: async (payload: CircularReferencePayload) => {
+    logger.info("Received circular payload", { payload });
+  },
+});
diff --git a/references/hello-world/src/trigger/cpuHeavy.ts b/references/hello-world/src/trigger/cpuHeavy.ts
new file mode 100644
index 00000000000..22b9bb547fd
--- /dev/null
+++ b/references/hello-world/src/trigger/cpuHeavy.ts
@@ -0,0 +1,32 @@
+import { task, heartbeats } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+
+export const cpuHeavyTask = task({
+  id: "cpu-heavy-task",
+  machine: "small-1x",
+  run: async (
+    {
+      durationInMs = 1000,
+      yieldToHeartbeats = false,
+    }: { durationInMs: number; yieldToHeartbeats: boolean },
+    { ctx }
+  ) => {
+    console.log("🧠 Starting CPU-heavy work");
+
+    // await setTimeout(durationInMs);
+
+    await simulateCpuHeavyWork(durationInMs, yieldToHeartbeats);
+
+    console.log("🧠 CPU-heavy work completed");
+  },
+});
+
+async function simulateCpuHeavyWork(durationInMs: number, yieldToHeartbeats: boolean) {
+  const start = Date.now();
+  while (Date.now() - start < durationInMs) {
+    // Simulate 1 second of CPU-intensive work
+    if (yieldToHeartbeats) {
+      await heartbeats.yield();
+    }
+  }
+}
diff --git a/references/hello-world/src/trigger/debounce.ts b/references/hello-world/src/trigger/debounce.ts
new file mode 100644
index 00000000000..f0a7e8b6389
--- /dev/null
+++ b/references/hello-world/src/trigger/debounce.ts
@@ -0,0 +1,1214 @@
+import { batch, logger, task, wait } from "@trigger.dev/sdk/v3";
+
+/**
+ * A simple task that processes data updates.
+ * This is the task we'll debounce to demonstrate the feature.
+ */
+export const processDataUpdate = task({
+  id: "process-data-update",
+  run: async (payload: { userId: string; data: Record<string, unknown> }) => {
+    logger.info("Processing data update", { payload });
+
+    // Simulate some processing work
+    await wait.for({ seconds: 1 });
+
+    logger.info("Data update processed successfully", { userId: payload.userId });
+
+    return {
+      processed: true,
+      userId: payload.userId,
+      timestamp: new Date().toISOString(),
+    };
+  },
+});
+
+/**
+ * Example 1: Basic Debounce
+ *
+ * This demonstrates how debounce works with rapid triggers.
+ * When triggered multiple times with the same key within the delay period,
+ * only one run will execute (with the first payload).
+ *
+ * Trigger this task multiple times rapidly with the same debounceKey to see
+ * how only one run is created.
+ */
+export const basicDebounceExample = task({
+  id: "basic-debounce-example",
+  run: async (payload: { value: string; debounceKey: string }) => {
+    logger.info("Starting basic debounce example", { payload });
+
+    // Trigger processDataUpdate with debounce
+    // If this task is triggered multiple times within 5 seconds with the same
+    // debounceKey, only one processDataUpdate run will be created
+    const handle = await processDataUpdate.trigger(
+      {
+        userId: payload.debounceKey,
+        data: { value: payload.value, triggeredAt: new Date().toISOString() },
+      },
+      {
+        debounce: {
+          key: payload.debounceKey,
+          delay: "5s",
+        },
+      }
+    );
+
+    logger.info("Triggered processDataUpdate with debounce", {
+      runId: handle.id,
+      debounceKey: payload.debounceKey,
+    });
+
+    return { triggeredRunId: handle.id };
+  },
+});
+
+/**
+ * Demonstration: Rapid Debounce Triggering
+ *
+ * This task demonstrates debounce in action by triggering processDataUpdate
+ * multiple times rapidly with the same debounce key. Despite 5 triggers,
+ * only ONE processDataUpdate run will be created.
+ *
+ * Run this task and watch the logs - you'll see:
+ * - 5 "Triggering attempt" logs
+ * - All 5 return the SAME run ID
+ * - Only 1 processDataUpdate run actually executes
+ */
+export const demonstrateDebounce = task({
+  id: "demonstrate-debounce",
+  run: async (payload: { debounceKey?: string }) => {
+    const key = payload.debounceKey ?? "demo-key";
+
+    logger.info("Starting debounce demonstration", { debounceKey: key });
+    logger.info("Will trigger processDataUpdate 5 times rapidly with the same debounce key");
+
+    const handles: string[] = [];
+
+    // Trigger 5 times rapidly - all should return the same run
+    for (let i = 1; i <= 5; i++) {
+      logger.info(`Triggering attempt ${i}/5`, { attempt: i });
+
+      const handle = await processDataUpdate.trigger(
+        {
+          userId: key,
+          data: {
+            attempt: i,
+            triggeredAt: new Date().toISOString(),
+            message: `This is trigger attempt ${i}`,
+          },
+        },
+        {
+          debounce: {
+            key: key,
+            delay: "5s",
+          },
+        }
+      );
+
+      handles.push(handle.id);
+      logger.info(`Attempt ${i} returned run ID: ${handle.id}`, {
+        attempt: i,
+        runId: handle.id,
+      });
+
+      // Small delay between triggers (but still within debounce window)
+      await new Promise((resolve) => setTimeout(resolve, 200));
+    }
+
+    // Check if all handles are the same (they should be!)
+    const uniqueHandles = [...new Set(handles)];
+    const allSameRun = uniqueHandles.length === 1;
+
+    logger.info("Debounce demonstration complete", {
+      totalTriggers: 5,
+      uniqueRuns: uniqueHandles.length,
+      allSameRun,
+      runIds: handles,
+    });
+
+    if (allSameRun) {
+      logger.info("SUCCESS: All 5 triggers returned the same run ID - debounce is working!");
+    } else {
+      logger.warn("UNEXPECTED: Multiple runs were created", { uniqueHandles });
+    }
+
+    return {
+      debounceKey: key,
+      totalTriggers: 5,
+      uniqueRunsCreated: uniqueHandles.length,
+      allSameRun,
+      runId: uniqueHandles[0],
+    };
+  },
+});
+
+/**
+ * Demonstration: Debounce with triggerAndWait
+ *
+ * This shows how multiple parent tasks can wait on the same debounced child.
+ * Each parent task calls triggerAndWait with the same debounce key.
+ * All parents will be blocked by and receive the result from the SAME child run.
+ *
+ * To test this:
+ * 1. Run "demonstrate-debounce-trigger-and-wait-orchestrator"
+ * 2. Watch as 3 parent runs are created
+ * 3. All 3 parents will wait for the SAME debounced child run
+ * 4. When the child completes, all 3 parents complete with the same result
+ */
+
+// Parent task that calls triggerAndWait with debounce
+export const debounceTriggerAndWaitParent = task({
+  id: "debounce-trigger-and-wait-parent",
+  run: async (payload: { parentNumber: number; debounceKey: string }) => {
+    logger.info(`Parent ${payload.parentNumber}: Starting`, {
+      parentNumber: payload.parentNumber,
+      debounceKey: payload.debounceKey,
+    });
+
+    logger.info(`Parent ${payload.parentNumber}: Calling triggerAndWait with debounce`);
+
+    // This will be debounced - if another parent calls with the same key,
+    // they'll both wait for the same child run
+    const result = await processDataUpdate.triggerAndWait(
+      {
+        userId: payload.debounceKey,
+        data: {
+          parentNumber: payload.parentNumber,
+          triggeredAt: new Date().toISOString(),
+        },
+      },
+      {
+        debounce: {
+          key: payload.debounceKey,
+          delay: "5s",
+        },
+      }
+    );
+
+    logger.info(`Parent ${payload.parentNumber}: Got result from child`, { result });
+
+    if (result.ok) {
+      return {
+        parentNumber: payload.parentNumber,
+        childOutput: result.output,
+        success: true,
+      };
+    } else {
+      return {
+        parentNumber: payload.parentNumber,
+        error: "Child task failed",
+        success: false,
+      };
+    }
+  },
+});
+
+// Orchestrator that triggers multiple parents (without waiting)
+export const demonstrateDebounceTriggerAndWaitOrchestrator = task({
+  id: "demonstrate-debounce-trigger-and-wait-orchestrator",
+  run: async (payload: { debounceKey?: string; parentCount?: number }) => {
+    const key = payload.debounceKey ?? "wait-demo-key";
+    const count = payload.parentCount ?? 3;
+
+    logger.info("Starting debounce triggerAndWait demonstration", {
+      debounceKey: key,
+      parentCount: count,
+    });
+
+    logger.info(
+      `Triggering ${count} parent tasks - each will call triggerAndWait with the same debounce key`
+    );
+    logger.info("All parents should be blocked by the SAME debounced child run");
+
+    const handles: string[] = [];
+
+    // Trigger multiple parent tasks as fast as possible (no delay) to maximize race condition chance
+    for (let i = 1; i <= count; i++) {
+      const handle = await debounceTriggerAndWaitParent.trigger({
+        parentNumber: i,
+        debounceKey: key,
+      });
+
+      logger.info(`Triggered parent ${i}`, { runId: handle.id });
+      handles.push(handle.id);
+    }
+
+    logger.info("All parent tasks triggered", {
+      parentRunIds: handles,
+      debounceKey: key,
+    });
+
+    logger.info(
+      "Watch the parent runs - they should all complete around the same time when the single debounced child finishes"
+    );
+
+    return {
+      debounceKey: key,
+      parentCount: count,
+      parentRunIds: handles,
+      message: `Triggered ${count} parent tasks. They will all wait for the same debounced child.`,
+    };
+  },
+});
+
+/**
+ * Example 2: User Activity Debouncing
+ *
+ * A real-world use case: debouncing user activity updates.
+ * When a user performs multiple actions in quick succession,
+ * we only want to process the final state after they've stopped.
+ *
+ * Common use cases:
+ * - Search-as-you-type
+ * - Form auto-save
+ * - Activity logging
+ * - Rate limiting user actions
+ */
+export const syncUserActivity = task({
+  id: "sync-user-activity",
+  run: async (payload: {
+    userId: string;
+    activityType: string;
+    details: Record<string, unknown>;
+  }) => {
+    logger.info("Syncing user activity", { payload });
+
+    // Simulate syncing to external service
+    await wait.for({ seconds: 2 });
+
+    logger.info("User activity synced", {
+      userId: payload.userId,
+      activityType: payload.activityType,
+    });
+
+    return {
+      synced: true,
+      syncedAt: new Date().toISOString(),
+    };
+  },
+});
+
+export const trackUserActivity = task({
+  id: "track-user-activity",
+  run: async (payload: { userId: string; action: string; metadata?: Record<string, unknown> }) => {
+    logger.info("Tracking user activity", { payload });
+
+    // Debounce per user - if the same user performs multiple actions,
+    // only sync once after 10 seconds of inactivity
+    const handle = await syncUserActivity.trigger(
+      {
+        userId: payload.userId,
+        activityType: payload.action,
+        details: {
+          ...payload.metadata,
+          lastAction: payload.action,
+          lastActionAt: new Date().toISOString(),
+        },
+      },
+      {
+        debounce: {
+          // Key is scoped to the user, so each user has their own debounce window
+          key: `user-${payload.userId}`,
+          delay: "10s",
+        },
+      }
+    );
+
+    logger.info("User activity tracked (debounced)", {
+      userId: payload.userId,
+      runId: handle.id,
+    });
+
+    return { runId: handle.id };
+  },
+});
+
+/**
+ * Example 3: Document Auto-Save with Debounce
+ *
+ * Simulates a document editing system where saves are debounced
+ * to avoid excessive save operations during rapid editing.
+ */
+export const saveDocument = task({
+  id: "save-document",
+  run: async (payload: { documentId: string; content: string; version: number }) => {
+    logger.info("Saving document", {
+      documentId: payload.documentId,
+      contentLength: payload.content.length,
+      version: payload.version,
+    });
+
+    // Simulate save operation
+    await wait.for({ seconds: 1 });
+
+    logger.info("Document saved successfully", {
+      documentId: payload.documentId,
+      savedAt: new Date().toISOString(),
+    });
+
+    return {
+      saved: true,
+      documentId: payload.documentId,
+      version: payload.version,
+      savedAt: new Date().toISOString(),
+    };
+  },
+});
+
+export const onDocumentEdit = task({
+  id: "on-document-edit",
+  run: async (payload: { documentId: string; content: string; editorId: string }) => {
+    logger.info("Document edited", {
+      documentId: payload.documentId,
+      editorId: payload.editorId,
+    });
+
+    // Debounce saves per document - save only after 3 seconds of no edits
+    const handle = await saveDocument.trigger(
+      {
+        documentId: payload.documentId,
+        content: payload.content,
+        version: Date.now(),
+      },
+      {
+        debounce: {
+          // Key is scoped to the document, so each document has its own debounce
+          key: `doc-${payload.documentId}`,
+          delay: "3s",
+        },
+      }
+    );
+
+    return {
+      acknowledged: true,
+      pendingSaveRunId: handle.id,
+    };
+  },
+});
+
+/**
+ * Example 4: Webhook Consolidation
+ *
+ * When receiving many webhooks from an external service,
+ * debounce to consolidate them into fewer processing runs.
+ */
+export const processWebhookBatch = task({
+  id: "process-webhook-batch",
+  run: async (payload: { source: string; eventType: string; data: unknown }) => {
+    logger.info("Processing webhook batch", {
+      source: payload.source,
+      eventType: payload.eventType,
+    });
+
+    // Process the webhook data
+    await wait.for({ seconds: 2 });
+
+    logger.info("Webhook batch processed", {
+      source: payload.source,
+      eventType: payload.eventType,
+    });
+
+    return {
+      processed: true,
+      processedAt: new Date().toISOString(),
+    };
+  },
+});
+
+export const handleWebhook = task({
+  id: "handle-webhook",
+  run: async (payload: { source: string; eventType: string; webhookId: string; data: unknown }) => {
+    logger.info("Received webhook", {
+      source: payload.source,
+      eventType: payload.eventType,
+      webhookId: payload.webhookId,
+    });
+
+    // Debounce webhooks from the same source and event type
+    // This consolidates rapid webhook bursts into single processing runs
+    const handle = await processWebhookBatch.trigger(
+      {
+        source: payload.source,
+        eventType: payload.eventType,
+        data: payload.data,
+      },
+      {
+        debounce: {
+          key: `webhook-${payload.source}-${payload.eventType}`,
+          delay: "2s",
+        },
+      }
+    );
+
+    logger.info("Webhook queued for processing (debounced)", {
+      webhookId: payload.webhookId,
+      runId: handle.id,
+    });
+
+    return {
+      acknowledged: true,
+      processingRunId: handle.id,
+    };
+  },
+});
+
+/**
+ * Example 5: Debounce with triggerAndWait
+ *
+ * When using triggerAndWait with debounce, the parent task will be blocked
+ * by the debounced child run. If another parent triggers with the same
+ * debounce key, it will also be blocked by the SAME child run.
+ */
+export const debouncedChildTask = task({
+  id: "debounced-child-task",
+  run: async (payload: { key: string; value: string }) => {
+    logger.info("Debounced child task executing", { payload });
+
+    await wait.for({ seconds: 3 });
+
+    logger.info("Debounced child task completed", { key: payload.key });
+
+    return {
+      result: `Processed: ${payload.value}`,
+      completedAt: new Date().toISOString(),
+    };
+  },
+});
+
+export const parentWithDebouncedChild = task({
+  id: "parent-with-debounced-child",
+  run: async (payload: { parentId: string; debounceKey: string; data: string }) => {
+    logger.info("Parent task starting", { parentId: payload.parentId });
+
+    // triggerAndWait with debounce - the parent will wait for the debounced child
+    // If another parent triggers with the same debounce key, they'll both wait
+    // for the same child run
+    const result = await debouncedChildTask.triggerAndWait(
+      {
+        key: payload.debounceKey,
+        value: payload.data,
+      },
+      {
+        debounce: {
+          key: payload.debounceKey,
+          delay: "5s",
+        },
+      }
+    );
+
+    logger.info("Parent task completed", {
+      parentId: payload.parentId,
+      childResult: result,
+    });
+
+    if (result.ok) {
+      return {
+        parentId: payload.parentId,
+        childOutput: result.output,
+      };
+    } else {
+      return {
+        parentId: payload.parentId,
+        error: "Child task failed",
+      };
+    }
+  },
+});
+
+/**
+ * Example 6: Different Delay Durations
+ *
+ * Shows various delay duration formats supported by debounce.
+ */
+export const shortDebounce = task({
+  id: "short-debounce",
+  run: async (payload: { key: string }) => {
+    logger.info("Short debounce task (1s)", { key: payload.key });
+    return { key: payload.key, delay: "1s" };
+  },
+});
+
+export const mediumDebounce = task({
+  id: "medium-debounce",
+  run: async (payload: { key: string }) => {
+    logger.info("Medium debounce task (5s)", { key: payload.key });
+    return { key: payload.key, delay: "5s" };
+  },
+});
+
+export const longDebounce = task({
+  id: "long-debounce",
+  run: async (payload: { key: string }) => {
+    logger.info("Long debounce task (1m)", { key: payload.key });
+    return { key: payload.key, delay: "1m" };
+  },
+});
+
+export const testDifferentDelays = task({
+  id: "test-different-delays",
+  run: async (payload: { key: string }) => {
+    logger.info("Testing different debounce delays", { key: payload.key });
+
+    // 1 second debounce - good for rapid UI updates
+    await shortDebounce.trigger(
+      { key: `${payload.key}-short` },
+      { debounce: { key: `${payload.key}-short`, delay: "1s" } }
+    );
+
+    // 5 second debounce - good for user input
+    await mediumDebounce.trigger(
+      { key: `${payload.key}-medium` },
+      { debounce: { key: `${payload.key}-medium`, delay: "5s" } }
+    );
+
+    // 1 minute debounce - good for batch processing
+    await longDebounce.trigger(
+      { key: `${payload.key}-long` },
+      { debounce: { key: `${payload.key}-long`, delay: "1m" } }
+    );
+
+    return { triggered: true };
+  },
+});
+
+/**
+ * Example 7: Batch Trigger with Debounce
+ *
+ * Demonstrates using debounce with batchTrigger.
+ * Each item in the batch can have its own debounce key and delay.
+ * Items with the same debounce key will be consolidated into a single run.
+ */
+export const batchItemTask = task({
+  id: "batch-item-task",
+  run: async (payload: { itemId: string; data: string }) => {
+    logger.info("Processing batch item", { payload });
+
+    await wait.for({ seconds: 1 });
+
+    logger.info("Batch item processed", { itemId: payload.itemId });
+
+    return {
+      processed: true,
+      itemId: payload.itemId,
+      processedAt: new Date().toISOString(),
+    };
+  },
+});
+
+/**
+ * Demonstrates batch.trigger() with debounce options on individual items.
+ *
+ * This shows how you can:
+ * - Use different debounce keys for different items
+ * - Items with the same debounce key will be consolidated
+ * - Items with different keys will create separate runs
+ *
+ * Run this task and watch:
+ * - Items 1 and 3 share debounce key "group-a" -> ONE run
+ * - Items 2 and 4 share debounce key "group-b" -> ONE run
+ * - Item 5 has unique key "group-c" -> ONE run
+ * - Total: 3 runs instead of 5 (but batch shows 5 items)
+ *
+ * Note: The batch itself still reports 5 items, but only 3 actual task runs
+ * will execute due to debouncing.
+ */
+export const demonstrateBatchDebounce = task({
+  id: "demonstrate-batch-debounce",
+  run: async (payload: { prefix?: string }) => {
+    const prefix = payload.prefix ?? "batch-demo";
+
+    logger.info("Starting batch debounce demonstration");
+    logger.info("Will trigger 5 items with 3 different debounce keys");
+    logger.info(
+      "Items 1&3 share key 'group-a', items 2&4 share key 'group-b', item 5 has key 'group-c'"
+    );
+
+    // Use batch.trigger with debounce options on each item
+    const result = await batch.trigger<typeof batchItemTask>([
+      {
+        id: "batch-item-task",
+        payload: { itemId: `${prefix}-1`, data: "First item in group A" },
+        options: {
+          debounce: { key: `${prefix}-group-a`, delay: "5s" },
+        },
+      },
+      {
+        id: "batch-item-task",
+        payload: { itemId: `${prefix}-2`, data: "First item in group B" },
+        options: {
+          debounce: { key: `${prefix}-group-b`, delay: "5s" },
+        },
+      },
+      {
+        id: "batch-item-task",
+        payload: { itemId: `${prefix}-3`, data: "Second item in group A (debounced)" },
+        options: {
+          debounce: { key: `${prefix}-group-a`, delay: "5s" },
+        },
+      },
+      {
+        id: "batch-item-task",
+        payload: { itemId: `${prefix}-4`, data: "Second item in group B (debounced)" },
+        options: {
+          debounce: { key: `${prefix}-group-b`, delay: "5s" },
+        },
+      },
+      {
+        id: "batch-item-task",
+        payload: { itemId: `${prefix}-5`, data: "Only item in group C" },
+        options: {
+          debounce: { key: `${prefix}-group-c`, delay: "5s" },
+        },
+      },
+    ]);
+
+    logger.info("Batch debounce demonstration complete", {
+      batchId: result.batchId,
+      totalItemsInBatch: result.runCount,
+      note: "Check the dashboard - only 3 actual task runs should execute due to debouncing",
+    });
+
+    return {
+      batchId: result.batchId,
+      totalItemsInBatch: result.runCount,
+      expectedUniqueRuns: 3,
+      message:
+        "5 items submitted, but only 3 runs will execute: group-a (1 run), group-b (1 run), group-c (1 run)",
+    };
+  },
+});
+
+/**
+ * Demonstrates batchTrigger on a single task with debounce.
+ *
+ * Similar to batch.trigger but using myTask.batchTrigger() syntax.
+ * Each item can have its own debounce configuration.
+ *
+ * When all items share the same debounce key, only ONE run will execute.
+ */
+export const demonstrateSingleTaskBatchDebounce = task({
+  id: "demonstrate-single-task-batch-debounce",
+  run: async (payload: { debounceKey?: string }) => {
+    const key = payload.debounceKey ?? "single-batch-demo";
+
+    logger.info("Starting single task batch debounce demonstration", { debounceKey: key });
+    logger.info("Triggering 4 items with the SAME debounce key - only 1 run should execute");
+
+    // All items have the same debounce key, so they should all resolve to the same run
+    const result = await batchItemTask.batchTrigger([
+      {
+        payload: { itemId: `${key}-1`, data: "Item 1" },
+        options: { debounce: { key, delay: "5s" } },
+      },
+      {
+        payload: { itemId: `${key}-2`, data: "Item 2" },
+        options: { debounce: { key, delay: "5s" } },
+      },
+      {
+        payload: { itemId: `${key}-3`, data: "Item 3" },
+        options: { debounce: { key, delay: "5s" } },
+      },
+      {
+        payload: { itemId: `${key}-4`, data: "Item 4" },
+        options: { debounce: { key, delay: "5s" } },
+      },
+    ]);
+
+    logger.info("Single task batch debounce complete", {
+      batchId: result.batchId,
+      totalItemsInBatch: result.runCount,
+      debounceKey: key,
+      note: "All items share the same debounce key, so only 1 task run should execute",
+    });
+
+    return {
+      batchId: result.batchId,
+      totalItemsInBatch: result.runCount,
+      debounceKey: key,
+      expectedUniqueRuns: 1,
+      message: "4 items submitted with same debounce key - only 1 run will execute",
+    };
+  },
+});
+
+/**
+ * Example 8: Trailing Mode - Process Latest Data
+ *
+ * Trailing mode updates the run's payload (and other options) with each subsequent trigger.
+ * When the debounce window closes, the task runs with the LAST payload instead of the first.
+ *
+ * This is perfect for scenarios like:
+ * - Auto-saving the latest document state
+ * - Processing the final search query after typing stops
+ * - Aggregating real-time data and processing the latest snapshot
+ */
+export const processLatestData = task({
+  id: "process-latest-data",
+  run: async (payload: { version: number; content: string; timestamp: string }) => {
+    logger.info("Processing latest data", { payload });
+
+    await wait.for({ seconds: 1 });
+
+    logger.info("Processed latest data", {
+      version: payload.version,
+      content: payload.content,
+    });
+
+    return {
+      processed: true,
+      version: payload.version,
+      content: payload.content,
+      processedAt: new Date().toISOString(),
+    };
+  },
+});
+
+/**
+ * Demonstrates trailing mode in action.
+ *
+ * This task triggers processLatestData 5 times rapidly with different payloads.
+ * With mode: "trailing", the run will execute with version 5 (the LAST payload),
+ * not version 1 (the first payload).
+ *
+ * Compare this to the demonstrateDebounce task which uses the default leading mode.
+ */
+export const demonstrateTrailingMode = task({
+  id: "demonstrate-trailing-mode",
+  run: async (payload: { debounceKey?: string }) => {
+    const key = payload.debounceKey ?? "trailing-demo-key";
+
+    logger.info("Starting trailing mode demonstration", { debounceKey: key });
+    logger.info("Will trigger processLatestData 5 times with mode: 'trailing'");
+    logger.info("The run should execute with version 5 (the LAST payload)");
+
+    const handles: string[] = [];
+
+    // Trigger 5 times rapidly - with trailing mode, the LAST payload wins
+    for (let i = 1; i <= 5; i++) {
+      logger.info(`Triggering version ${i}/5`, { version: i });
+
+      const handle = await processLatestData.trigger(
+        {
+          version: i,
+          content: `Content version ${i}`,
+          timestamp: new Date().toISOString(),
+        },
+        {
+          debounce: {
+            key: key,
+            delay: "5s",
+            mode: "trailing", // Use trailing mode - LAST payload wins
+          },
+        }
+      );
+
+      handles.push(handle.id);
+      logger.info(`Version ${i} returned run ID: ${handle.id}`, {
+        version: i,
+        runId: handle.id,
+      });
+
+      // Small delay between triggers
+      await new Promise((resolve) => setTimeout(resolve, 200));
+    }
+
+    // All handles should be the same run
+    const uniqueHandles = [...new Set(handles)];
+    const allSameRun = uniqueHandles.length === 1;
+
+    logger.info("Trailing mode demonstration complete", {
+      totalTriggers: 5,
+      uniqueRuns: uniqueHandles.length,
+      allSameRun,
+      note: "The run should execute with version 5 (the LAST payload)",
+    });
+
+    return {
+      debounceKey: key,
+      totalTriggers: 5,
+      uniqueRunsCreated: uniqueHandles.length,
+      allSameRun,
+      runId: uniqueHandles[0],
+      expectedPayloadVersion: 5,
+      message:
+        "With trailing mode, the run executes with the LAST payload (version 5), not the first",
+    };
+  },
+});
+
+/**
+ * Example 9: Document Auto-Save with Trailing Mode
+ *
+ * A practical example: when editing a document, you want to save the LATEST
+ * version after the user stops typing, not the first version.
+ *
+ * Trailing mode is ideal for this because:
+ * - Each keystroke/edit triggers a save
+ * - Each trigger updates the pending run's payload to the latest content
+ * - When typing stops, the latest content is saved
+ */
+export const saveDocumentLatest = task({
+  id: "save-document-latest",
+  run: async (payload: {
+    documentId: string;
+    content: string;
+    editCount: number;
+    lastEditedAt: string;
+  }) => {
+    logger.info("Saving document (latest version)", {
+      documentId: payload.documentId,
+      contentLength: payload.content.length,
+      editCount: payload.editCount,
+    });
+
+    // Simulate save operation
+    await wait.for({ seconds: 1 });
+
+    logger.info("Document saved successfully with latest content", {
+      documentId: payload.documentId,
+      editCount: payload.editCount,
+      savedAt: new Date().toISOString(),
+    });
+
+    return {
+      saved: true,
+      documentId: payload.documentId,
+      editCount: payload.editCount,
+      contentLength: payload.content.length,
+      savedAt: new Date().toISOString(),
+    };
+  },
+});
+
+export const onDocumentEditWithTrailing = task({
+  id: "on-document-edit-with-trailing",
+  run: async (payload: { documentId: string; content: string; editorId: string }) => {
+    // Track how many edits we've made (for demonstration)
+    const editCount = payload.content.length; // Using content length as a simple proxy
+
+    logger.info("Document edited (using trailing mode)", {
+      documentId: payload.documentId,
+      editorId: payload.editorId,
+      editCount,
+    });
+
+    // Use trailing mode - the LATEST content will be saved
+    const handle = await saveDocumentLatest.trigger(
+      {
+        documentId: payload.documentId,
+        content: payload.content,
+        editCount,
+        lastEditedAt: new Date().toISOString(),
+      },
+      {
+        debounce: {
+          key: `doc-${payload.documentId}`,
+          delay: "3s",
+          mode: "trailing", // Save the LATEST content, not the first
+        },
+      }
+    );
+
+    return {
+      acknowledged: true,
+      pendingSaveRunId: handle.id,
+      note: "With trailing mode, the latest content will be saved after 3 seconds of no edits",
+    };
+  },
+});
+
+/**
+ * Example 10: Leading vs Trailing Mode Comparison
+ *
+ * This task demonstrates the difference between leading and trailing modes
+ * by triggering two separate debounced tasks with the same data pattern.
+ *
+ * - Leading mode task: will process version 1 (first payload)
+ * - Trailing mode task: will process version 5 (last payload)
+ */
+export const processWithLeadingMode = task({
+  id: "process-with-leading-mode",
+  run: async (payload: { version: number }) => {
+    logger.info("Leading mode: Processing data", { version: payload.version });
+    return { mode: "leading", version: payload.version };
+  },
+});
+
+export const processWithTrailingMode = task({
+  id: "process-with-trailing-mode",
+  run: async (payload: { version: number }) => {
+    logger.info("Trailing mode: Processing data", { version: payload.version });
+    return { mode: "trailing", version: payload.version };
+  },
+});
+
+export const compareLeadingAndTrailing = task({
+  id: "compare-leading-and-trailing",
+  run: async (payload: { prefix?: string }) => {
+    const prefix = payload.prefix ?? "compare";
+
+    logger.info("Starting leading vs trailing mode comparison");
+    logger.info("Triggering both modes 5 times with versions 1-5");
+    logger.info("Expected: Leading mode processes v1, Trailing mode processes v5");
+
+    // Trigger both modes 5 times
+    for (let i = 1; i <= 5; i++) {
+      // Leading mode (default) - will keep first payload
+      await processWithLeadingMode.trigger(
+        { version: i },
+        {
+          debounce: {
+            key: `${prefix}-leading`,
+            delay: "5s",
+            // mode: "leading" is the default
+          },
+        }
+      );
+
+      // Trailing mode - will update to latest payload
+      await processWithTrailingMode.trigger(
+        { version: i },
+        {
+          debounce: {
+            key: `${prefix}-trailing`,
+            delay: "5s",
+            mode: "trailing",
+          },
+        }
+      );
+
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+
+    logger.info("Comparison complete", {
+      leadingModeExpected: "version 1 (first payload)",
+      trailingModeExpected: "version 5 (last payload)",
+    });
+
+    return {
+      message: "Check the processWithLeadingMode and processWithTrailingMode runs",
+      leadingModeExpected: { version: 1 },
+      trailingModeExpected: { version: 5 },
+    };
+  },
+});
+
+/**
+ * Example 11: Trailing Mode with Metadata Updates
+ *
+ * Trailing mode also updates metadata, tags, maxAttempts, maxDuration, and machine.
+ * This example shows how metadata changes with each trigger.
+ */
+export const processWithMetadata = task({
+  id: "process-with-metadata",
+  run: async (payload: { action: string }, { ctx }) => {
+    logger.info("Processing with metadata", { action: payload.action });
+
+    // The metadata will be from the LAST trigger when using trailing mode
+    logger.info("Run metadata reflects the latest trigger");
+
+    return {
+      action: payload.action,
+      processedAt: new Date().toISOString(),
+    };
+  },
+});
+
+export const demonstrateTrailingWithMetadata = task({
+  id: "demonstrate-trailing-with-metadata",
+  run: async (payload: { debounceKey?: string }) => {
+    const key = payload.debounceKey ?? "metadata-trailing-demo";
+
+    logger.info("Demonstrating trailing mode with metadata updates");
+
+    const actions = ["created", "updated", "reviewed", "approved", "published"];
+
+    for (const action of actions) {
+      await processWithMetadata.trigger(
+        { action },
+        {
+          debounce: {
+            key,
+            delay: "5s",
+            mode: "trailing",
+          },
+          metadata: {
+            lastAction: action,
+            actionTimestamp: new Date().toISOString(),
+            actionIndex: actions.indexOf(action) + 1,
+          },
+        }
+      );
+
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+
+    logger.info("Metadata trailing demonstration complete", {
+      expectedAction: "published",
+      expectedMetadata: { lastAction: "published", actionIndex: 5 },
+    });
+
+    return {
+      debounceKey: key,
+      triggeredActions: actions,
+      expectedFinalAction: "published",
+      message: "The run will have metadata from the 'published' trigger (the last one)",
+    };
+  },
+});
+
+/**
+ * Example 12: Debounce with maxDelay
+ *
+ * The maxDelay option limits how long a debounced run can be delayed.
+ * Even if triggers keep coming, the run will eventually execute after maxDelay
+ * from the first trigger. This is useful for scenarios where you want to
+ * debounce but also guarantee execution within a certain time window.
+ *
+ * Use case: Summarizing AI conversation threads that need to stay relatively
+ * up to date. You want to debounce as messages come in, but also guarantee
+ * the summary runs at least every 30 minutes.
+ */
+export const processConversationSummary = task({
+  id: "process-conversation-summary",
+  run: async (payload: { conversationId: string; messageCount: number }) => {
+    logger.info("Generating conversation summary", { payload });
+
+    // Simulate AI summarization work
+    await wait.for({ seconds: 2 });
+
+    logger.info("Conversation summary generated", {
+      conversationId: payload.conversationId,
+      messageCount: payload.messageCount,
+    });
+
+    return {
+      summarized: true,
+      conversationId: payload.conversationId,
+      messageCount: payload.messageCount,
+      summarizedAt: new Date().toISOString(),
+    };
+  },
+});
+
+/**
+ * Demonstrates maxDelay in action.
+ *
+ * This simulates a chat application where messages come in continuously.
+ * With just debounce, the summary task would keep getting delayed forever.
+ * With maxDelay: "30s", the summary will run at most 30 seconds after the first trigger,
+ * even if messages keep coming.
+ *
+ * Run this task and observe:
+ * - Messages trigger the summary task with debounce
+ * - Each trigger extends the delay by 5s
+ * - But maxDelay ensures execution happens within 30s of the first trigger
+ */
+export const simulateChatWithMaxWait = task({
+  id: "simulate-chat-with-max-wait",
+  run: async (payload: { conversationId?: string; simulateDelay?: number }) => {
+    const conversationId = payload.conversationId ?? "conv-123";
+    const delayBetweenMessages = payload.simulateDelay ?? 3000; // 3 seconds
+
+    logger.info("Starting chat simulation with maxDelay", {
+      conversationId,
+      delayBetweenMessages,
+    });
+
+    logger.info(
+      "Debounce delay is 5s, maxDelay is 30s. Messages arrive every 3s, so debounce would normally keep extending. But maxDelay ensures execution within 30s."
+    );
+
+    const handles: string[] = [];
+
+    // Simulate 15 messages over ~45 seconds
+    // Without maxDelay, the task would never run because each trigger resets the 5s delay
+    // With maxDelay: "30s", the task will run after 30 seconds from the first trigger
+    for (let i = 1; i <= 15; i++) {
+      logger.info(`Message ${i}/15 received`, { messageNumber: i });
+
+      const handle = await processConversationSummary.trigger(
+        {
+          conversationId,
+          messageCount: i,
+        },
+        {
+          debounce: {
+            key: `conversation-${conversationId}`,
+            delay: "5s",
+            mode: "trailing", // Use latest message count
+            maxDelay: "30s", // Ensure execution within 30s of first trigger
+          },
+        }
+      );
+
+      handles.push(handle.id);
+      logger.info(`Message ${i} triggered, run ID: ${handle.id}`, {
+        messageNumber: i,
+        runId: handle.id,
+      });
+
+      // Wait between messages (simulating real chat)
+      if (i < 15) {
+        await new Promise((resolve) => setTimeout(resolve, delayBetweenMessages));
+      }
+    }
+
+    const uniqueHandles = [...new Set(handles)];
+
+    logger.info("Chat simulation complete", {
+      totalMessages: 15,
+      uniqueRuns: uniqueHandles.length,
+      note:
+        "With maxDelay, runs should have been created periodically despite continuous triggering",
+    });
+
+    return {
+      conversationId,
+      totalMessages: 15,
+      uniqueRunsCreated: uniqueHandles.length,
+      runIds: uniqueHandles,
+      message:
+        "Due to maxDelay: '30s', the summary task runs periodically even with continuous triggers",
+    };
+  },
+});
+
+/**
+ * A simpler maxDelay example showing the basic usage pattern.
+ *
+ * This is the recommended pattern for using maxDelay:
+ * - delay: How long to wait after each trigger before executing
+ * - maxDelay: Maximum total wait time from the first trigger
+ */
+export const onNewMessage = task({
+  id: "on-new-message",
+  run: async (payload: { conversationId: string; message: string }) => {
+    logger.info("New message received", {
+      conversationId: payload.conversationId,
+      messagePreview: payload.message.substring(0, 50),
+    });
+
+    // Trigger summarization with debounce and maxDelay
+    const handle = await processConversationSummary.trigger(
+      {
+        conversationId: payload.conversationId,
+        messageCount: 1, // In real code, you'd track actual count
+      },
+      {
+        debounce: {
+          key: `summary-${payload.conversationId}`,
+          delay: "10s", // Wait 10s after last message before summarizing
+          mode: "trailing", // Use latest state
+          maxDelay: "5m", // But always summarize within 5 minutes
+        },
+      }
+    );
+
+    logger.info("Summary task triggered (debounced with maxDelay)", {
+      runId: handle.id,
+    });
+
+    return { summaryRunId: handle.id };
+  },
+});
diff --git a/references/hello-world/src/trigger/example.ts b/references/hello-world/src/trigger/example.ts
index 7f476dbcfd8..8ecfdb033ed 100644
--- a/references/hello-world/src/trigger/example.ts
+++ b/references/hello-world/src/trigger/example.ts
@@ -1,6 +1,7 @@
 import { batch, logger, task, tasks, timeout, wait } from "@trigger.dev/sdk";
 import { setTimeout } from "timers/promises";
 import { ResourceMonitor } from "../resourceMonitor.js";
+import { fixedLengthTask } from "./batches.js";
 
 export const helloWorldTask = task({
   id: "hello-world",
@@ -14,12 +15,12 @@ export const helloWorldTask = task({
     logger.info("Hello, world from the onStart hook", { payload, init });
   },
   run: async (payload: any, { ctx }) => {
-    logger.info("Hello, world from the init", { ctx, payload });
+    logger.info("Hello, world froms the init", { ctx, payload });
     logger.info("env vars", {
       env: process.env,
     });
 
-    logger.debug("debug: Hello, world!", { payload });
+    logger.debug("debug: Hello, worlds!", { payload });
     logger.info("info: Hello, world!", { payload });
     logger.log("log: Hello, world!", { payload });
     logger.warn("warn: Hello, world!", { payload });
@@ -29,7 +30,7 @@ export const helloWorldTask = task({
       logger.debug("some log", { span });
     });
 
-    await setTimeout(payload.sleepFor ?? 180_000);
+    await setTimeout(payload.sleepFor ?? 5_000);
 
     if (payload.throwError) {
       throw new Error("Forced error to cause a retry");
@@ -57,8 +58,8 @@ export const parentTask = task({
   id: "parent",
   machine: "medium-1x",
   run: async (payload: any, { ctx }) => {
-    logger.log("Hello, world from the parent", { payload });
-    await childTask.triggerAndWait({ message: "Hello, world!" });
+    logger.log("Hello, world from the parent", { payload, ctx });
+    await childTask.triggerAndWait({ message: "Hello, world!", aReallyBigInt: BigInt(10000) });
   },
 });
 
@@ -103,10 +104,11 @@ export const childTask = task({
       message,
       failureChance = 0.3,
       duration = 3_000,
-    }: { message?: string; failureChance?: number; duration?: number },
+      aReallyBigInt,
+    }: { message?: string; failureChance?: number; duration?: number; aReallyBigInt?: bigint },
     { ctx }
   ) => {
-    logger.info("Hello, world from the child", { message, failureChance });
+    logger.info("Hello, world from the child", { ctx, failureChance, aReallyBigInt });
 
     if (Math.random() < failureChance) {
       throw new Error("Random error at start");
@@ -372,3 +374,158 @@ export const largeAttributesTask = task({
     });
   },
 });
+
+export const lotsOfLogsParentTask = task({
+  id: "lots-of-logs-parent",
+  run: async (payload: { count: number }, { ctx }) => {
+    logger.info("Hello, world from the lots of logs parent task", { count: payload.count });
+    await lotsOfLogsTask.batchTriggerAndWait(
+      Array.from({ length: 20 }, (_, i) => ({
+        payload: { count: payload.count },
+      }))
+    );
+  },
+});
+
+export const lotsOfLogsTask = task({
+  id: "lots-of-logs",
+  run: async (payload: { count: number }, { ctx }) => {
+    logger.info("Hello, world from the lots of logs task", { count: payload.count });
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+
+    await setTimeout(1000);
+
+    for (let i = 0; i < payload.count; i++) {
+      logger.info("Hello, world from the lots of logs task", { count: i });
+    }
+  },
+});
+
+export const throwErrorInOnSuccessHookTask = task({
+  id: "throw-error-in-on-success-hook",
+  run: async (payload: { message: string }, { ctx }) => {
+    logger.info("Hello, world from the throw error in on success hook task", {
+      message: payload.message,
+    });
+  },
+  onSuccess: async ({ payload, output, ctx }) => {
+    logger.info("Hello, world from the on success hook", { payload, output });
+    throw new Error("Forced error to cause a retry");
+  },
+});
+
+export const throwErrorInOnStartHookTask = task({
+  id: "throw-error-in-on-start-hook",
+  run: async (payload: { message: string }, { ctx }) => {
+    logger.info("Hello, world from the throw error in on start hook task", {
+      message: payload.message,
+    });
+  },
+  onStart: async ({ payload, ctx }) => {
+    logger.info("Hello, world from the on start hook", { payload });
+    throw new Error("Forced error to cause a retry");
+  },
+});
+
+export const throwErrorInOnCompleteHookTask = task({
+  id: "throw-error-in-on-complete-hook",
+  run: async (payload: { message: string }, { ctx }) => {
+    logger.info("Hello, world from the throw error in on complete hook task", {
+      message: payload.message,
+    });
+  },
+  onComplete: async ({ payload, result, ctx }) => {
+    logger.info("Hello, world from the on complete hook", { payload, result });
+    throw new Error("Forced error to cause a retry");
+  },
+});
+
+export const throwErrorInOnFailureHookTask = task({
+  id: "throw-error-in-on-failure-hook",
+  retry: {
+    maxAttempts: 1,
+  },
+  run: async (payload: { message: string }, { ctx }) => {
+    logger.info("Hello, world from the throw error in on failure hook task", {
+      message: payload.message,
+    });
+    throw new Error("Forced error to cause a retry");
+  },
+  onFailure: async ({ payload, error, ctx }) => {
+    logger.info("Hello, world from the on failure hook", { payload, error });
+    throw new Error("Forced error to cause a retry in on failure hook");
+  },
+});
+
+export const throwErrorInInitHookTask = task({
+  id: "throw-error-in-init-hook",
+  run: async (payload: { message: string }, { ctx }) => {
+    logger.info("Hello, world from the throw error in init hook task", {
+      message: payload.message,
+    });
+  },
+  init: async ({ payload, ctx }) => {
+    logger.info("Hello, world from the init hook", { payload });
+    throw new Error("Forced error to cause a retry");
+  },
+});
+
+export const testStartAttemptHookTask = task({
+  id: "test-start-attempt-hook",
+  retry: {
+    maxAttempts: 3,
+  },
+  run: async (payload: { message: string }, { ctx }) => {
+    logger.info("Hello, world from the test start attempt hook task", { message: payload.message });
+
+    if (ctx.attempt.number === 1) {
+      throw new Error("Forced error to cause a retry so we can test the onStartAttempt hook");
+    }
+  },
+  onStartAttempt: async ({ payload, ctx }) => {
+    console.log(`onStartAttempt hook called ${ctx.attempt.number}`);
+  },
+});
+
+tasks.onStartAttempt(({ payload, ctx }) => {
+  console.log(`global onStartAttempt hook called ${ctx.attempt.number}`);
+});
diff --git a/references/hello-world/src/trigger/idempotency.ts b/references/hello-world/src/trigger/idempotency.ts
index 6ea7c1c5ea0..f45e6af14a2 100644
--- a/references/hello-world/src/trigger/idempotency.ts
+++ b/references/hello-world/src/trigger/idempotency.ts
@@ -1,4 +1,4 @@
-import { batch, idempotencyKeys, logger, task, timeout, usage, wait } from "@trigger.dev/sdk/v3";
+import { batch, idempotencyKeys, logger, runs, task, timeout, usage, wait } from "@trigger.dev/sdk/v3";
 import { setTimeout } from "timers/promises";
 import { childTask } from "./example.js";
 
@@ -282,3 +282,261 @@ export const idempotencyTriggerByTaskAndWait = task({
     logger.log("Results 2", { results2 });
   },
 });
+
+export const idempotencyTriggerAndWaitWithInProgressRun = task({
+  id: "idempotency-trigger-and-wait-with-in-progress-run",
+  maxDuration: 60,
+  run: async () => {
+    await childTask.trigger(
+      { message: "Hello, world!", duration: 5000, failureChance: 100 },
+      {
+        idempotencyKey: "b",
+      }
+    );
+    await childTask.triggerAndWait(
+      { message: "Hello, world!", duration: 5000, failureChance: 0 },
+      {
+        idempotencyKey: "b",
+      }
+    );
+  },
+});
+
+// Test task for verifying idempotencyKeyOptions storage (TRI-4352)
+export const idempotencyKeyOptionsChild = task({
+  id: "idempotency-key-options-child",
+  run: async (payload: { message: string }, { ctx }) => {
+    // Log the idempotency key from context - should be the user-provided key, not the hash
+    logger.log("Child task context", {
+      idempotencyKey: ctx.run.idempotencyKey,
+      idempotencyKeyScope: ctx.run.idempotencyKeyScope,
+      runId: ctx.run.id,
+    });
+
+    return {
+      receivedIdempotencyKey: ctx.run.idempotencyKey,
+      receivedIdempotencyKeyScope: ctx.run.idempotencyKeyScope,
+      message: payload.message,
+    };
+  },
+});
+
+
+export const idempotencyKeyOptionsTest = task({
+  id: "idempotency-key-options-test",
+  maxDuration: 60,
+  run: async (payload: any, { ctx }) => {
+    logger.log("Testing idempotencyKeyOptions feature (TRI-4352)");
+
+    // Test 1: Create key with "run" scope (default)
+    const runScopedKey = await idempotencyKeys.create("my-run-scoped-key");
+    logger.log("Created run-scoped key", { key: runScopedKey.toString() });
+
+    const result1 = await idempotencyKeyOptionsChild.triggerAndWait(
+      { message: "Test with run scope" },
+      { idempotencyKey: runScopedKey, idempotencyKeyTTL: "60s" }
+    );
+    logger.log("Result 1 (run scope)", { result: result1 });
+
+    // Test 2: Create key with "global" scope
+    const globalScopedKey = await idempotencyKeys.create("my-global-scoped-key", {
+      scope: "global",
+    });
+    logger.log("Created global-scoped key", { key: globalScopedKey.toString() });
+
+    const result2 = await idempotencyKeyOptionsChild.triggerAndWait(
+      { message: "Test with global scope" },
+      { idempotencyKey: globalScopedKey, idempotencyKeyTTL: "60s" }
+    );
+    logger.log("Result 2 (global scope)", { result: result2 });
+
+    // Test 3: Create key with "attempt" scope
+    const attemptScopedKey = await idempotencyKeys.create("my-attempt-scoped-key", {
+      scope: "attempt",
+    });
+    logger.log("Created attempt-scoped key", { key: attemptScopedKey.toString() });
+
+    const result3 = await idempotencyKeyOptionsChild.triggerAndWait(
+      { message: "Test with attempt scope" },
+      { idempotencyKey: attemptScopedKey, idempotencyKeyTTL: "60s" }
+    );
+    logger.log("Result 3 (attempt scope)", { result: result3 });
+
+    // Test 4: Create key with array input
+    const arrayKey = await idempotencyKeys.create(["user", "123", "action"]);
+    logger.log("Created array key", { key: arrayKey.toString() });
+
+    const result4 = await idempotencyKeyOptionsChild.triggerAndWait(
+      { message: "Test with array key" },
+      { idempotencyKey: arrayKey, idempotencyKeyTTL: "60s" }
+    );
+    logger.log("Result 4 (array key)", { result: result4 });
+
+    return {
+      results: [
+        { scope: "run", idempotencyKey: result1.ok ? result1.output?.receivedIdempotencyKey : null },
+        {
+          scope: "global",
+          idempotencyKey: result2.ok ? result2.output?.receivedIdempotencyKey : null,
+        },
+        {
+          scope: "attempt",
+          idempotencyKey: result3.ok ? result3.output?.receivedIdempotencyKey : null,
+        },
+        { scope: "array", idempotencyKey: result4.ok ? result4.output?.receivedIdempotencyKey : null },
+      ],
+    };
+  },
+});
+
+// Test task for verifying idempotencyKeys.reset works with the new API (TRI-4352)
+export const idempotencyKeyResetTest = task({
+  id: "idempotency-key-reset-test",
+  maxDuration: 120,
+  run: async (payload: any, { ctx }) => {
+    logger.log("Testing idempotencyKeys.reset feature (TRI-4352)");
+
+    const testResults: Array<{
+      test: string;
+      success: boolean;
+      details: Record<string, unknown>;
+    }> = [];
+
+    // Test 1: Reset using IdempotencyKey object (options extracted automatically)
+    {
+      const key = await idempotencyKeys.create("reset-test-key-1", { scope: "global" });
+      logger.log("Test 1: Created global-scoped key", { key: key.toString() });
+
+      // First trigger - should create a new run
+      const result1 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "First trigger" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const firstRunId = result1.ok ? result1.id : null;
+      logger.log("Test 1: First trigger", { runId: firstRunId });
+
+      // Second trigger - should be deduplicated (same run ID)
+      const result2 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "Second trigger (should dedupe)" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const secondRunId = result2.ok ? result2.id : null;
+      logger.log("Test 1: Second trigger (dedupe check)", { runId: secondRunId });
+
+      const wasDeduplicated = firstRunId === secondRunId;
+
+      // Reset the idempotency key using the IdempotencyKey object
+      logger.log("Test 1: Resetting idempotency key using IdempotencyKey object");
+      await idempotencyKeys.reset("idempotency-key-options-child", key);
+
+      // Third trigger - should create a NEW run after reset
+      const result3 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "Third trigger (after reset)" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const thirdRunId = result3.ok ? result3.id : null;
+      logger.log("Test 1: Third trigger (after reset)", { runId: thirdRunId });
+
+      const wasResetSuccessful = thirdRunId !== firstRunId && thirdRunId !== null;
+
+      testResults.push({
+        test: "Reset with IdempotencyKey object (global scope)",
+        success: wasDeduplicated && wasResetSuccessful,
+        details: {
+          firstRunId,
+          secondRunId,
+          thirdRunId,
+          wasDeduplicated,
+          wasResetSuccessful,
+        },
+      });
+    }
+
+    // Test 2: Reset using raw string with scope option
+    {
+      const keyString = "reset-test-key-2";
+      const key = await idempotencyKeys.create(keyString, { scope: "global" });
+      logger.log("Test 2: Created global-scoped key from string", { key: key.toString() });
+
+      // First trigger
+      const result1 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "First trigger (raw string test)" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const firstRunId = result1.ok ? result1.id : null;
+      logger.log("Test 2: First trigger", { runId: firstRunId });
+
+      // Reset using raw string + scope option
+      logger.log("Test 2: Resetting idempotency key using raw string + scope");
+      await idempotencyKeys.reset("idempotency-key-options-child", keyString, { scope: "global" });
+
+      // Second trigger - should create a NEW run after reset
+      const result2 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "Second trigger (after reset with raw string)" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const secondRunId = result2.ok ? result2.id : null;
+      logger.log("Test 2: Second trigger (after reset)", { runId: secondRunId });
+
+      const wasResetSuccessful = secondRunId !== firstRunId && secondRunId !== null;
+
+      testResults.push({
+        test: "Reset with raw string + scope option (global scope)",
+        success: wasResetSuccessful,
+        details: {
+          firstRunId,
+          secondRunId,
+          wasResetSuccessful,
+        },
+      });
+    }
+
+    // Test 3: Reset with run scope (uses current run context)
+    {
+      const key = await idempotencyKeys.create("reset-test-key-3", { scope: "run" });
+      logger.log("Test 3: Created run-scoped key", { key: key.toString() });
+
+      // First trigger
+      const result1 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "First trigger (run scope)" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const firstRunId = result1.ok ? result1.id : null;
+      logger.log("Test 3: First trigger", { runId: firstRunId });
+
+      // Reset using IdempotencyKey (run scope - should use current run context)
+      logger.log("Test 3: Resetting idempotency key with run scope");
+      await idempotencyKeys.reset("idempotency-key-options-child", key);
+
+      // Second trigger - should create a NEW run after reset
+      const result2 = await idempotencyKeyOptionsChild.triggerAndWait(
+        { message: "Second trigger (after reset, run scope)" },
+        { idempotencyKey: key, idempotencyKeyTTL: "300s" }
+      );
+      const secondRunId = result2.ok ? result2.id : null;
+      logger.log("Test 3: Second trigger (after reset)", { runId: secondRunId });
+
+      const wasResetSuccessful = secondRunId !== firstRunId && secondRunId !== null;
+
+      testResults.push({
+        test: "Reset with IdempotencyKey object (run scope)",
+        success: wasResetSuccessful,
+        details: {
+          firstRunId,
+          secondRunId,
+          wasResetSuccessful,
+          parentRunId: ctx.run.id,
+        },
+      });
+    }
+
+    // Summary
+    const allPassed = testResults.every((r) => r.success);
+    logger.log("Test summary", { allPassed, testResults });
+
+    return {
+      allPassed,
+      testResults,
+    };
+  },
+});
diff --git a/references/hello-world/src/trigger/init.ts b/references/hello-world/src/trigger/init.ts
index 8512d395ca2..6603befd652 100644
--- a/references/hello-world/src/trigger/init.ts
+++ b/references/hello-world/src/trigger/init.ts
@@ -1,10 +1,10 @@
 import { logger, tasks } from "@trigger.dev/sdk";
 // import { setDb } from "../db.js";
 
-tasks.middleware("db", ({ ctx, payload, next }) => {
-  logger.info("Hello, world from the middleware", { ctx, payload });
-  return next();
-});
+// tasks.middleware("db", ({ ctx, payload, next }) => {
+//   logger.info("Hello, world from the middleware", { ctx, payload });
+//   return next();
+// });
 
 tasks.onCancel(async ({ ctx, payload }) => {
   logger.info("Hello, world from the global cancel", { ctx, payload });
diff --git a/references/hello-world/src/trigger/jsonSchema.ts b/references/hello-world/src/trigger/jsonSchema.ts
new file mode 100644
index 00000000000..d4da2c783cd
--- /dev/null
+++ b/references/hello-world/src/trigger/jsonSchema.ts
@@ -0,0 +1,446 @@
+import { task, schemaTask, logger, type JSONSchema } from "@trigger.dev/sdk/v3";
+import { z } from "zod/v3";
+import * as z4 from "zod/v4";
+import * as y from "yup";
+import { type } from "arktype";
+import { Type, Static } from "@sinclair/typebox";
+
+// ===========================================
+// Example 1: Using schemaTask with Zod
+// ===========================================
+const userSchema = z.object({
+  id: z.string().uuid(),
+  name: z.string().min(1),
+  email: z.string().email(),
+  age: z.number().int().min(0).max(150),
+  preferences: z
+    .object({
+      newsletter: z.boolean().default(false),
+      theme: z.enum(["light", "dark"]).default("light"),
+    })
+    .optional(),
+});
+
+export const processUserWithZod = schemaTask({
+  id: "json-schema-zod-example",
+  schema: userSchema,
+  run: async (payload, { ctx }) => {
+    // payload is fully typed based on the Zod schema
+    logger.info("Processing user with Zod schema", {
+      userId: payload.id,
+      userName: payload.name,
+    });
+
+    // The schema is automatically converted to JSON Schema and synced
+    return {
+      processed: true,
+      userId: payload.id,
+      welcomeMessage: `Welcome ${payload.name}!`,
+    };
+  },
+});
+
+const userSchema4 = z4.object({
+  id: z4.uuid(),
+  name: z4.string().min(1),
+  email: z4.email(),
+  age: z4.number().int().min(0).max(150),
+  preferences: z4
+    .object({
+      newsletter: z4.boolean().default(false),
+      theme: z4.enum(["light", "dark"]).default("light"),
+    })
+    .optional(),
+});
+
+export const processUserWithZod4 = schemaTask({
+  id: "json-schema-zod-example-4",
+  schema: userSchema4,
+  run: async (payload, { ctx }) => {
+    // payload is fully typed based on the Zod schema
+    logger.info("Processing user with Zod schema", {
+      userId: payload.id,
+      userName: payload.name,
+    });
+
+    // The schema is automatically converted to JSON Schema and synced
+    return {
+      processed: true,
+      userId: payload.id,
+      welcomeMessage: `Welcome ${payload.name}!`,
+    };
+  },
+});
+
+// ===========================================
+// Example 2: Using plain task with manual JSON Schema
+// ===========================================
+export const processOrderManualSchema = task({
+  id: "json-schema-manual-example",
+  // Manually provide JSON Schema for the payload
+  jsonSchema: {
+    $schema: "http://json-schema.org/draft-07/schema#",
+    type: "object",
+    title: "Order Processing Request",
+    description: "Schema for processing customer orders",
+    properties: {
+      orderId: {
+        type: "string",
+        pattern: "^ORD-[0-9]+$",
+        description: "Order ID in format ORD-XXXXX",
+      },
+      customerId: {
+        type: "string",
+        format: "uuid",
+      },
+      items: {
+        type: "array",
+        minItems: 1,
+        items: {
+          type: "object",
+          properties: {
+            productId: { type: "string" },
+            quantity: { type: "integer", minimum: 1 },
+            price: { type: "number", minimum: 0, multipleOf: 0.01 },
+          },
+          required: ["productId", "quantity", "price"],
+          additionalProperties: false,
+        },
+      },
+      totalAmount: {
+        type: "number",
+        minimum: 0,
+        multipleOf: 0.01,
+      },
+      status: {
+        type: "string",
+        enum: ["pending", "processing", "shipped", "delivered"],
+        default: "pending",
+      },
+    },
+    required: ["orderId", "customerId", "items", "totalAmount"],
+    additionalProperties: false,
+  } satisfies JSONSchema,
+  run: async (payload, { ctx }) => {
+    logger.info("Processing order with manual JSON Schema", {
+      orderId: payload.orderId,
+    });
+
+    // Note: With plain tasks, the payload is typed as 'any'
+    // The JSON Schema will be used for documentation and validation on the server
+    return {
+      processed: true,
+      orderId: payload.orderId,
+      status: "processing",
+    };
+  },
+});
+
+// ===========================================
+// Example 3: Using schemaTask with Yup
+// ===========================================
+const productSchema = y.object({
+  sku: y
+    .string()
+    .required()
+    .matches(/^[A-Z]{3}-[0-9]{5}$/),
+  name: y.string().required().min(3).max(100),
+  description: y.string().max(500),
+  price: y.number().required().positive(),
+  categories: y.array().of(y.string()).min(1).required(),
+  inStock: y.boolean().default(true),
+});
+
+export const processProductWithYup = schemaTask({
+  id: "json-schema-yup-example",
+  schema: productSchema,
+  run: async (payload, { ctx }) => {
+    logger.info("Processing product with Yup schema", {
+      sku: payload.sku,
+      name: payload.name,
+    });
+
+    return {
+      processed: true,
+      sku: payload.sku,
+      message: `Product ${payload.name} has been processed`,
+    };
+  },
+});
+
+// ===========================================
+// Example 4: Using schemaTask with ArkType
+// ===========================================
+const invoiceSchema = type({
+  invoiceNumber: "string",
+  date: "Date",
+  dueDate: "Date",
+  "discount?": "number",
+  lineItems: [
+    {
+      description: "string",
+      quantity: "number",
+      unitPrice: "number",
+    },
+  ],
+  customer: {
+    id: "string",
+    name: "string",
+    "taxId?": "string",
+  },
+});
+
+export const processInvoiceWithArkType = schemaTask({
+  id: "json-schema-arktype-example",
+  schema: invoiceSchema,
+  run: async (payload, { ctx }) => {
+    logger.info("Processing invoice with ArkType schema", {
+      invoiceNumber: payload.invoiceNumber,
+      customerName: payload.customer.name,
+    });
+
+    const total = payload.lineItems.reduce((sum, item) => sum + item.quantity * item.unitPrice, 0);
+
+    const discount = payload.discount || 0;
+    const finalAmount = total * (1 - discount / 100);
+
+    return {
+      processed: true,
+      invoiceNumber: payload.invoiceNumber,
+      totalAmount: finalAmount,
+    };
+  },
+});
+
+// ===========================================
+// Example 5: Using TypeBox (already JSON Schema)
+// ===========================================
+const eventSchema = Type.Object({
+  eventId: Type.String({ format: "uuid" }),
+  eventType: Type.Union([
+    Type.Literal("user.created"),
+    Type.Literal("user.updated"),
+    Type.Literal("user.deleted"),
+    Type.Literal("order.placed"),
+    Type.Literal("order.shipped"),
+  ]),
+  timestamp: Type.Integer({ minimum: 0 }),
+  userId: Type.String(),
+  metadata: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
+  payload: Type.Unknown(),
+});
+
+type EventType = Static<typeof eventSchema>;
+
+export const processEventWithTypeBox = task({
+  id: "json-schema-typebox-example",
+  // TypeBox schemas are already JSON Schema compliant
+  jsonSchema: eventSchema,
+  run: async (payload: EventType, { ctx }) => {
+    // Cast to get TypeScript type safety
+    const event = payload;
+
+    logger.info("Processing event with TypeBox schema", {
+      eventId: event.eventId,
+      eventType: event.eventType,
+      userId: event.userId,
+    });
+
+    // Handle different event types
+    switch (event.eventType) {
+      case "user.created":
+        logger.info("New user created", { userId: event.userId });
+        break;
+      case "order.placed":
+        logger.info("Order placed", { userId: event.userId });
+        break;
+      default:
+        logger.info("Event processed", { eventType: event.eventType });
+    }
+
+    return {
+      processed: true,
+      eventId: event.eventId,
+      eventType: event.eventType,
+    };
+  },
+});
+
+// ===========================================
+// Example 6: Using plain task with a Zod schema
+// ===========================================
+// If you need to use a plain task but have a Zod schema,
+// you should use schemaTask instead for better DX.
+// This example shows what NOT to do:
+
+const notificationSchema = z.object({
+  recipientId: z.string(),
+  type: z.enum(["email", "sms", "push"]),
+  subject: z.string().optional(),
+  message: z.string(),
+  priority: z.enum(["low", "normal", "high"]).default("normal"),
+  scheduledFor: z.date().optional(),
+  metadata: z.record(z.unknown()).optional(),
+});
+
+// ❌ Don't do this - use schemaTask instead!
+export const sendNotificationBadExample = task({
+  id: "json-schema-dont-do-this",
+  run: async (payload, { ctx }) => {
+    // You'd have to manually validate
+    const notification = notificationSchema.parse(payload);
+
+    logger.info("This is not ideal - use schemaTask instead!");
+
+    return { sent: true };
+  },
+});
+
+// ✅ Do this instead - much better!
+export const sendNotificationGoodExample = schemaTask({
+  id: "json-schema-do-this-instead",
+  schema: notificationSchema,
+  run: async (notification, { ctx }) => {
+    // notification is already validated and typed!
+    logger.info("Sending notification", {
+      recipientId: notification.recipientId,
+      type: notification.type,
+      priority: notification.priority,
+    });
+
+    // Simulate sending notification
+    await new Promise((resolve) => setTimeout(resolve, 1000));
+
+    return {
+      sent: true,
+      notificationId: ctx.run.id,
+      recipientId: notification.recipientId,
+      type: notification.type,
+    };
+  },
+});
+
+// ===========================================
+// Example 7: Complex nested schema with references
+// ===========================================
+const addressSchema = z.object({
+  street: z.string(),
+  city: z.string(),
+  state: z.string().length(2),
+  zipCode: z.string().regex(/^\d{5}(-\d{4})?$/),
+  country: z.string().default("US"),
+});
+
+const companySchema = z.object({
+  companyId: z.string().uuid(),
+  name: z.string(),
+  taxId: z.string().optional(),
+  addresses: z.object({
+    billing: addressSchema,
+    shipping: addressSchema.optional(),
+  }),
+  contacts: z
+    .array(
+      z.object({
+        name: z.string(),
+        email: z.string().email(),
+        phone: z.string().optional(),
+        role: z.enum(["primary", "billing", "technical"]),
+      })
+    )
+    .min(1),
+  settings: z.object({
+    invoicePrefix: z.string().default("INV"),
+    paymentTerms: z.number().int().min(0).max(90).default(30),
+    currency: z.enum(["USD", "EUR", "GBP"]).default("USD"),
+  }),
+});
+
+export const processCompanyWithComplexSchema = schemaTask({
+  id: "json-schema-complex-example",
+  schema: companySchema,
+  maxDuration: 300, // 5 minutes
+  retry: {
+    maxAttempts: 3,
+    factor: 2,
+  },
+  run: async (payload, { ctx }) => {
+    logger.info("Processing company with complex schema", {
+      companyId: payload.companyId,
+      name: payload.name,
+      contactCount: payload.contacts.length,
+    });
+
+    // Process each contact
+    for (const contact of payload.contacts) {
+      logger.info("Processing contact", {
+        name: contact.name,
+        role: contact.role,
+      });
+    }
+
+    return {
+      processed: true,
+      companyId: payload.companyId,
+      name: payload.name,
+      primaryContact: payload.contacts.find((c) => c.role === "primary"),
+    };
+  },
+});
+
+// ===========================================
+// Example 8: Demonstrating schema benefits
+// ===========================================
+export const triggerExamples = task({
+  id: "json-schema-trigger-examples",
+  run: async (_, { ctx }) => {
+    logger.info("Triggering various schema examples");
+
+    // Trigger Zod example - TypeScript will enforce correct payload
+    await processUserWithZod.trigger({
+      id: "550e8400-e29b-41d4-a716-446655440000",
+      name: "John Doe",
+      email: "john@example.com",
+      age: 30,
+      preferences: {
+        newsletter: true,
+        theme: "dark",
+      },
+    });
+
+    // Trigger Yup example
+    await processProductWithYup.trigger({
+      sku: "ABC-12345",
+      name: "Premium Widget",
+      description: "A high-quality widget for all your needs",
+      price: 99.99,
+      categories: ["electronics", "gadgets"],
+      inStock: true,
+    });
+
+    // Trigger manual schema example (no compile-time validation)
+    await processOrderManualSchema.trigger({
+      orderId: "ORD-12345",
+      customerId: "550e8400-e29b-41d4-a716-446655440001",
+      items: [
+        {
+          productId: "PROD-001",
+          quantity: 2,
+          price: 29.99,
+        },
+        {
+          productId: "PROD-002",
+          quantity: 1,
+          price: 49.99,
+        },
+      ],
+      totalAmount: 109.97,
+      status: "pending",
+    });
+
+    return {
+      message: "All examples triggered successfully",
+      timestamp: new Date().toISOString(),
+    };
+  },
+});
\ No newline at end of file
diff --git a/references/hello-world/src/trigger/jsonSchemaApi.ts b/references/hello-world/src/trigger/jsonSchemaApi.ts
new file mode 100644
index 00000000000..9ac121b3698
--- /dev/null
+++ b/references/hello-world/src/trigger/jsonSchemaApi.ts
@@ -0,0 +1,343 @@
+import { task, schemaTask, logger, type JSONSchema } from "@trigger.dev/sdk/v3";
+import { z } from "zod";
+
+// ===========================================
+// Example: Webhook Handler with Schema Validation
+// ===========================================
+
+// Define schemas for different webhook event types
+const baseWebhookSchema = z.object({
+  id: z.string(),
+  timestamp: z.string().datetime(),
+  type: z.string(),
+  version: z.literal("1.0"),
+});
+
+// Payment webhook events
+const paymentEventSchema = baseWebhookSchema.extend({
+  type: z.literal("payment"),
+  data: z.object({
+    paymentId: z.string(),
+    amount: z.number().positive(),
+    currency: z.string().length(3),
+    status: z.enum(["pending", "processing", "completed", "failed"]),
+    customerId: z.string(),
+    paymentMethod: z.object({
+      type: z.enum(["card", "bank_transfer", "paypal"]),
+      last4: z.string().optional(),
+    }),
+    metadata: z.record(z.string()).optional(),
+  }),
+});
+
+// Customer webhook events
+const customerEventSchema = baseWebhookSchema.extend({
+  type: z.literal("customer"),
+  data: z.object({
+    customerId: z.string(),
+    action: z.enum(["created", "updated", "deleted"]),
+    email: z.string().email(),
+    name: z.string(),
+    subscription: z.object({
+      status: z.enum(["active", "cancelled", "past_due"]),
+      plan: z.string(),
+    }).optional(),
+  }),
+});
+
+// Union of all webhook types
+const webhookSchema = z.discriminatedUnion("type", [
+  paymentEventSchema,
+  customerEventSchema,
+]);
+
+export const handleWebhook = schemaTask({
+  id: "handle-webhook",
+  schema: webhookSchema,
+  run: async (payload, { ctx }) => {
+    logger.info("Processing webhook", { 
+      id: payload.id,
+      type: payload.type,
+      timestamp: payload.timestamp,
+    });
+
+    // TypeScript knows the exact shape based on the discriminated union
+    switch (payload.type) {
+      case "payment":
+        logger.info("Payment event received", {
+          paymentId: payload.data.paymentId,
+          amount: payload.data.amount,
+          status: payload.data.status,
+        });
+
+        if (payload.data.status === "completed") {
+          // Trigger order fulfillment
+          await fulfillOrder.trigger({
+            customerId: payload.data.customerId,
+            paymentId: payload.data.paymentId,
+            amount: payload.data.amount,
+          });
+        }
+        break;
+
+      case "customer":
+        logger.info("Customer event received", {
+          customerId: payload.data.customerId,
+          action: payload.data.action,
+        });
+
+        if (payload.data.action === "created") {
+          // Send welcome email
+          await sendWelcomeEmail.trigger({
+            email: payload.data.email,
+            name: payload.data.name,
+          });
+        }
+        break;
+    }
+
+    return {
+      processed: true,
+      eventId: payload.id,
+      eventType: payload.type,
+    };
+  },
+});
+
+// ===========================================
+// Example: External API Integration
+// ===========================================
+
+// Schema for making API requests to a third-party service
+const apiRequestSchema = z.object({
+  endpoint: z.enum(["/users", "/products", "/orders"]),
+  method: z.enum(["GET", "POST", "PUT", "DELETE"]),
+  params: z.record(z.string()).optional(),
+  body: z.unknown().optional(),
+  headers: z.record(z.string()).optional(),
+  retryOnError: z.boolean().default(true),
+});
+
+// Response schemas for different endpoints
+const userResponseSchema = z.object({
+  id: z.string(),
+  email: z.string().email(),
+  name: z.string(),
+  createdAt: z.string().datetime(),
+});
+
+const productResponseSchema = z.object({
+  id: z.string(),
+  name: z.string(),
+  price: z.number(),
+  inStock: z.boolean(),
+});
+
+export const callExternalApi = schemaTask({
+  id: "call-external-api",
+  schema: apiRequestSchema,
+  retry: {
+    maxAttempts: 3,
+    factor: 2,
+    minTimeoutInMs: 1000,
+    maxTimeoutInMs: 10000,
+  },
+  run: async (payload, { ctx }) => {
+    logger.info("Making API request", {
+      endpoint: payload.endpoint,
+      method: payload.method,
+    });
+
+    // Simulate API call
+    const response = await makeApiCall(payload);
+
+    // Validate response based on endpoint
+    let validatedResponse;
+    switch (payload.endpoint) {
+      case "/users":
+        validatedResponse = userResponseSchema.parse(response);
+        break;
+      case "/products":
+        validatedResponse = productResponseSchema.parse(response);
+        break;
+      default:
+        validatedResponse = response;
+    }
+
+    return {
+      success: true,
+      endpoint: payload.endpoint,
+      response: validatedResponse,
+    };
+  },
+});
+
+// Helper function to simulate API calls
+async function makeApiCall(request: z.infer<typeof apiRequestSchema>) {
+  // Simulate network delay
+  await new Promise(resolve => setTimeout(resolve, 100));
+
+  // Return mock data based on endpoint
+  switch (request.endpoint) {
+    case "/users":
+      return {
+        id: "user_123",
+        email: "user@example.com",
+        name: "John Doe",
+        createdAt: new Date().toISOString(),
+      };
+    case "/products":
+      return {
+        id: "prod_456",
+        name: "Premium Widget",
+        price: 99.99,
+        inStock: true,
+      };
+    default:
+      return { message: "Success" };
+  }
+}
+
+// ===========================================
+// Example: Batch Processing with Validation
+// ===========================================
+
+const batchItemSchema = z.object({
+  id: z.string(),
+  operation: z.enum(["create", "update", "delete"]),
+  resourceType: z.enum(["user", "product", "order"]),
+  data: z.record(z.unknown()),
+});
+
+const batchRequestSchema = z.object({
+  batchId: z.string(),
+  items: z.array(batchItemSchema).min(1).max(100),
+  options: z.object({
+    stopOnError: z.boolean().default(false),
+    parallel: z.boolean().default(true),
+    maxConcurrency: z.number().int().min(1).max(10).default(5),
+  }).default({}),
+});
+
+export const processBatch = schemaTask({
+  id: "process-batch",
+  schema: batchRequestSchema,
+  maxDuration: 300, // 5 minutes for large batches
+  run: async (payload, { ctx }) => {
+    logger.info("Processing batch", {
+      batchId: payload.batchId,
+      itemCount: payload.items.length,
+      parallel: payload.options.parallel,
+    });
+
+    const results = [];
+    const errors = [];
+
+    if (payload.options.parallel) {
+      // Process items in parallel with concurrency limit
+      const chunks = chunkArray(payload.items, payload.options.maxConcurrency);
+      
+      for (const chunk of chunks) {
+        const chunkResults = await Promise.allSettled(
+          chunk.map(item => processItem(item))
+        );
+
+        chunkResults.forEach((result, index) => {
+          if (result.status === "fulfilled") {
+            results.push(result.value);
+          } else {
+            errors.push({
+              item: chunk[index],
+              error: result.reason,
+            });
+
+            if (payload.options.stopOnError) {
+              throw new Error(`Batch processing stopped due to error in item ${chunk[index].id}`);
+            }
+          }
+        });
+      }
+    } else {
+      // Process items sequentially
+      for (const item of payload.items) {
+        try {
+          const result = await processItem(item);
+          results.push(result);
+        } catch (error) {
+          errors.push({ item, error });
+
+          if (payload.options.stopOnError) {
+            throw new Error(`Batch processing stopped due to error in item ${item.id}`);
+          }
+        }
+      }
+    }
+
+    return {
+      batchId: payload.batchId,
+      processed: results.length,
+      failed: errors.length,
+      results,
+      errors,
+    };
+  },
+});
+
+async function processItem(item: z.infer<typeof batchItemSchema>) {
+  logger.info("Processing batch item", {
+    id: item.id,
+    operation: item.operation,
+    resourceType: item.resourceType,
+  });
+
+  // Simulate processing
+  await new Promise(resolve => setTimeout(resolve, 50));
+
+  return {
+    id: item.id,
+    success: true,
+    operation: item.operation,
+    resourceType: item.resourceType,
+  };
+}
+
+function chunkArray<T>(array: T[], size: number): T[][] {
+  const chunks: T[][] = [];
+  for (let i = 0; i < array.length; i += size) {
+    chunks.push(array.slice(i, i + size));
+  }
+  return chunks;
+}
+
+// ===========================================
+// Helper Tasks
+// ===========================================
+
+const orderSchema = z.object({
+  customerId: z.string(),
+  paymentId: z.string(),
+  amount: z.number(),
+});
+
+export const fulfillOrder = schemaTask({
+  id: "fulfill-order",
+  schema: orderSchema,
+  run: async (payload, { ctx }) => {
+    logger.info("Fulfilling order", payload);
+    return { fulfilled: true };
+  },
+});
+
+const welcomeEmailSchema = z.object({
+  email: z.string().email(),
+  name: z.string(),
+});
+
+export const sendWelcomeEmail = schemaTask({
+  id: "send-welcome-email",
+  schema: welcomeEmailSchema,
+  run: async (payload, { ctx }) => {
+    logger.info("Sending welcome email", payload);
+    return { sent: true };
+  },
+});
\ No newline at end of file
diff --git a/references/hello-world/src/trigger/jsonSchemaSimple.ts b/references/hello-world/src/trigger/jsonSchemaSimple.ts
new file mode 100644
index 00000000000..a844b14034f
--- /dev/null
+++ b/references/hello-world/src/trigger/jsonSchemaSimple.ts
@@ -0,0 +1,235 @@
+import { task, schemaTask, logger, type JSONSchema } from "@trigger.dev/sdk/v3";
+import { z } from "zod";
+
+// ===========================================
+// The Two Main Approaches
+// ===========================================
+
+// Approach 1: Using schemaTask (Recommended)
+// - Automatic JSON Schema conversion
+// - Full TypeScript type safety
+// - Runtime validation built-in
+const emailSchema = z.object({
+  to: z.string().email(),
+  subject: z.string(),
+  body: z.string(),
+  attachments: z
+    .array(
+      z.object({
+        filename: z.string(),
+        url: z.string().url(),
+      })
+    )
+    .optional(),
+});
+
+export const sendEmailSchemaTask = schemaTask({
+  id: "send-email-schema-task",
+  schema: emailSchema,
+  run: async (payload, { ctx }) => {
+    // payload is fully typed as:
+    // {
+    //   to: string;
+    //   subject: string;
+    //   body: string;
+    //   attachments?: Array<{ filename: string; url: string; }>;
+    // }
+
+    logger.info("Sending email", {
+      to: payload.to,
+      subject: payload.subject,
+      hasAttachments: !!payload.attachments?.length,
+    });
+
+    // Your email sending logic here...
+
+    return {
+      sent: true,
+      messageId: `msg_${ctx.run.id}`,
+      sentAt: new Date().toISOString(),
+    };
+  },
+});
+
+// Approach 2: Using plain task with payloadSchema
+// - Manual JSON Schema definition
+// - No automatic type inference (payload is 'any')
+// - Good for when you already have JSON Schema definitions
+export const sendEmailPlainTask = task({
+  id: "send-email-plain-task",
+  jsonSchema: {
+    type: "object",
+    properties: {
+      to: {
+        type: "string",
+        format: "email",
+        description: "Recipient email address",
+      },
+      subject: {
+        type: "string",
+        maxLength: 200,
+      },
+      body: {
+        type: "string",
+      },
+      attachments: {
+        type: "array",
+        items: {
+          type: "object",
+          properties: {
+            filename: { type: "string" },
+            url: { type: "string", format: "uri" },
+          },
+          required: ["filename", "url"],
+        },
+      },
+    },
+    required: ["to", "subject", "body"],
+  } satisfies JSONSchema, // Use 'satisfies' for type checking
+  run: async (payload, { ctx }) => {
+    // payload is typed as 'any' - you need to validate/cast it yourself
+    logger.info("Sending email", {
+      to: payload.to,
+      subject: payload.subject,
+    });
+
+    // Your email sending logic here...
+
+    return {
+      sent: true,
+      messageId: `msg_${ctx.run.id}`,
+      sentAt: new Date().toISOString(),
+    };
+  },
+});
+
+// ===========================================
+// Benefits of JSON Schema
+// ===========================================
+
+// 1. Documentation - The schema is visible in the Trigger.dev dashboard
+// 2. Validation - Invalid payloads are rejected before execution
+// 3. Type Safety - With schemaTask, you get full TypeScript support
+// 4. OpenAPI Generation - Can be used to generate API documentation
+// 5. Client SDKs - Can generate typed clients for other languages
+
+export const demonstrateBenefits = task({
+  id: "json-schema-benefits-demo",
+  run: async (_, { ctx }) => {
+    logger.info("Demonstrating JSON Schema benefits");
+
+    // With schemaTask, TypeScript prevents invalid payloads at compile time
+    try {
+      await sendEmailSchemaTask.trigger({
+        to: "user@example.com",
+        subject: "Welcome!",
+        body: "Thanks for signing up!",
+        // TypeScript error if you try to add invalid fields
+        // invalidField: "This would cause a TypeScript error",
+      });
+    } catch (error) {
+      logger.error("Failed to send email", { error });
+    }
+
+    // With plain task, validation happens at runtime
+    try {
+      await sendEmailPlainTask.trigger({
+        to: "not-an-email", // This will fail validation at runtime
+        subject: "Test",
+        body: "Test email",
+      });
+    } catch (error) {
+      logger.error("Failed validation", { error });
+    }
+
+    return { demonstrated: true };
+  },
+});
+
+// ===========================================
+// Real-World Example: User Registration Flow
+// ===========================================
+const userRegistrationSchema = z.object({
+  email: z.string().email(),
+  username: z
+    .string()
+    .min(3)
+    .max(20)
+    .regex(/^[a-zA-Z0-9_]+$/),
+  password: z.string().min(8),
+  profile: z.object({
+    firstName: z.string(),
+    lastName: z.string(),
+    dateOfBirth: z.string().optional(), // ISO date string
+    preferences: z
+      .object({
+        newsletter: z.boolean().default(false),
+        notifications: z.boolean().default(true),
+      })
+      .default({}),
+  }),
+  referralCode: z.string().optional(),
+});
+
+export const registerUser = schemaTask({
+  id: "register-user",
+  schema: userRegistrationSchema,
+  retry: {
+    maxAttempts: 3,
+    minTimeoutInMs: 1000,
+    maxTimeoutInMs: 10000,
+  },
+  run: async (payload, { ctx }) => {
+    logger.info("Registering new user", {
+      email: payload.email,
+      username: payload.username,
+    });
+
+    // Step 1: Validate uniqueness
+    logger.info("Checking if user exists");
+    // ... database check logic ...
+
+    // Step 2: Create user account
+    logger.info("Creating user account");
+    const userId = `user_${Date.now()}`;
+    // ... user creation logic ...
+
+    // Step 3: Send welcome email
+    await sendEmailSchemaTask.trigger({
+      to: payload.email,
+      subject: `Welcome to our platform, ${payload.profile.firstName}!`,
+      body: `Hi ${payload.profile.firstName},\n\nThanks for joining us...`,
+    });
+
+    // Step 4: Apply referral code if provided
+    if (payload.referralCode) {
+      logger.info("Processing referral code", { code: payload.referralCode });
+      // ... referral logic ...
+    }
+
+    return {
+      success: true,
+      userId,
+      username: payload.username,
+      welcomeEmailSent: true,
+    };
+  },
+});
+
+// ===========================================
+// When to Use Each Approach
+// ===========================================
+
+/*
+Use schemaTask when:
+- You're already using Zod, Yup, ArkType, etc. in your codebase
+- You want TypeScript type inference
+- You want runtime validation handled automatically
+- You're building new tasks from scratch
+
+Use plain task with payloadSchema when:
+- You have existing JSON Schema definitions
+- You're migrating from another system that uses JSON Schema
+- You need fine-grained control over the schema format
+- You're working with generated schemas from OpenAPI/Swagger
+*/
\ No newline at end of file
diff --git a/references/hello-world/src/trigger/lightpanda.ts b/references/hello-world/src/trigger/lightpanda.ts
new file mode 100644
index 00000000000..830f6391a2e
--- /dev/null
+++ b/references/hello-world/src/trigger/lightpanda.ts
@@ -0,0 +1,149 @@
+import { logger, task } from "@trigger.dev/sdk";
+import { execSync, spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import puppeteer from "puppeteer-core";
+
+const spawnLightpanda = async (host: string, port: string) =>
+  new Promise<ChildProcessWithoutNullStreams>((resolve, reject) => {
+    const child = spawn("lightpanda", [
+      "serve",
+      "--host",
+      host,
+      "--port",
+      port,
+      "--log_level",
+      "info",
+    ]);
+
+    child.on("spawn", async () => {
+      logger.info("Running Lightpanda's CDP server…", {
+        pid: child.pid,
+      });
+
+      await new Promise((resolve) => setTimeout(resolve, 250));
+      resolve(child);
+    });
+    child.on("error", (e) => reject(e));
+  });
+
+export const lightpandaCdp = task({
+  id: "lightpanda-cdp",
+  machine: {
+    preset: "micro",
+  },
+  run: async (payload: { url: string }, { ctx }) => {
+    logger.log("Lets get a page's links with Lightpanda!", { payload, ctx });
+
+    if (!payload.url) {
+      logger.warn("Please define the payload url");
+      throw new Error("payload.url is undefined");
+    }
+
+    const host = process.env.LIGHTPANDA_CDP_HOST ?? "127.0.0.1";
+    const port = process.env.LIGHTPANDA_CDP_PORT ?? "9222";
+
+    // Launch Lightpanda's CDP server
+    const lpProcess = await spawnLightpanda(host, port);
+
+    const browser = await puppeteer.connect({
+      browserWSEndpoint: `ws://${host}:${port}`,
+    });
+    const context = await browser.createBrowserContext();
+    const page = await context.newPage();
+
+    // Dump all the links from the page.
+    await page.goto(payload.url);
+
+    const links = await page.evaluate(() => {
+      return Array.from(document.querySelectorAll("a")).map((row) => {
+        return row.getAttribute("href");
+      });
+    });
+
+    logger.info("Processing done");
+    logger.info("Shutting down…");
+
+    // Close Puppeteer instance
+    await browser.close();
+
+    // Stop Lightpanda's CDP Server
+    lpProcess.kill();
+
+    logger.info("✅ Completed");
+
+    return {
+      links,
+    };
+  },
+});
+
+export const lightpandaFetch = task({
+  id: "lightpanda-fetch",
+  machine: {
+    preset: "micro",
+  },
+  run: async (payload: { url: string }, { ctx }) => {
+    logger.log("Lets get a page's content with Lightpanda!", { payload, ctx });
+
+    if (!payload.url) {
+      logger.warn("Please define the payload url");
+      throw new Error("payload.url is undefined");
+    }
+
+    const buffer = execSync(`lightpanda fetch --dump ${payload.url}`);
+
+    logger.info("✅ Completed");
+
+    return {
+      message: buffer.toString(),
+    };
+  },
+});
+
+export const lightpandaCloudPuppeteer = task({
+  id: "lightpanda-cloud-puppeteer",
+  machine: {
+    preset: "micro",
+  },
+  run: async (payload: { url: string }, { ctx }) => {
+    logger.log("Lets get a page's links with Lightpanda!", { payload, ctx });
+
+    if (!payload.url) {
+      logger.warn("Please define the payload url");
+      throw new Error("payload.url is undefined");
+    }
+
+    const token = process.env.LIGHTPANDA_TOKEN;
+    if (!token) {
+      logger.warn("Please define the env variable LIGHTPANDA_TOKEN");
+      throw new Error("LIGHTPANDA_TOKEN is undefined");
+    }
+
+    // Connect to Lightpanda's cloud
+    const browser = await puppeteer.connect({
+      browserWSEndpoint: `wss://cloud.lightpanda.io/ws?browser=lightpanda&token=${token}`,
+    });
+    const context = await browser.createBrowserContext();
+    const page = await context.newPage();
+
+    // Dump all the links from the page.
+    await page.goto(payload.url);
+
+    const links = await page.evaluate(() => {
+      return Array.from(document.querySelectorAll("a")).map((row) => {
+        return row.getAttribute("href");
+      });
+    });
+
+    logger.info("Processing done, shutting down…");
+
+    await page.close();
+    await context.close();
+    await browser.disconnect();
+
+    logger.info("✅ Completed");
+
+    return {
+      links,
+    };
+  },
+});
diff --git a/references/hello-world/src/trigger/metadata.ts b/references/hello-world/src/trigger/metadata.ts
index d9618f42074..b0d493b8df2 100644
--- a/references/hello-world/src/trigger/metadata.ts
+++ b/references/hello-world/src/trigger/metadata.ts
@@ -44,6 +44,8 @@ export const parentTask = task({
     metadata.parent.set("test.parent.set", true);
     metadata.set("test.set", "test");
 
+    logger.info("logging metadata.current()", { current: metadata.current() });
+
     await childTask.triggerAndWait({});
 
     return {
diff --git a/references/hello-world/src/trigger/metrics.ts b/references/hello-world/src/trigger/metrics.ts
new file mode 100644
index 00000000000..fa398186b0b
--- /dev/null
+++ b/references/hello-world/src/trigger/metrics.ts
@@ -0,0 +1,326 @@
+import { batch, logger, otel, task } from "@trigger.dev/sdk";
+import { createHash } from "node:crypto";
+import { setTimeout } from "node:timers/promises";
+
+// Custom metrics — instruments are created once at module level
+const meter = otel.metrics.getMeter("hello-world");
+const itemsProcessedCounter = meter.createCounter("items.processed", {
+  description: "Total number of items processed",
+  unit: "items",
+});
+const itemDurationHistogram = meter.createHistogram("item.duration", {
+  description: "Time spent processing each item",
+  unit: "ms",
+});
+const queueDepthGauge = meter.createUpDownCounter("queue.depth", {
+  description: "Current simulated queue depth",
+  unit: "items",
+});
+
+/**
+ * Tight computational loop that produces sustained high CPU utilization.
+ * Uses repeated SHA-256 hashing to keep the CPU busy.
+ */
+export const cpuIntensive = task({
+  id: "cpu-intensive",
+  run: async (
+    {
+      durationSeconds = 60,
+    }: {
+      durationSeconds?: number;
+    },
+    { ctx }
+  ) => {
+    logger.info("Starting CPU-intensive workload", { durationSeconds });
+
+    const deadline = Date.now() + durationSeconds * 1000;
+    let iterations = 0;
+    let data = Buffer.from("seed-data-for-hashing");
+
+    while (Date.now() < deadline) {
+      // Tight hashing loop — ~100ms chunks then yield to event loop
+      const chunkEnd = Date.now() + 100;
+      while (Date.now() < chunkEnd) {
+        data = createHash("sha256").update(data).digest();
+        iterations++;
+      }
+      // Yield to let metrics collection and heartbeats run
+      await setTimeout(1);
+    }
+
+    logger.info("CPU-intensive workload complete", { iterations });
+    return { iterations };
+  },
+});
+
+/**
+ * Progressively allocates memory in steps, holds it, then releases.
+ * Produces a staircase-shaped memory usage graph.
+ */
+export const memoryRamp = task({
+  id: "memory-ramp",
+  run: async (
+    {
+      steps = 6,
+      stepSizeMb = 50,
+      stepIntervalSeconds = 5,
+      holdSeconds = 15,
+    }: {
+      steps?: number;
+      stepSizeMb?: number;
+      stepIntervalSeconds?: number;
+      holdSeconds?: number;
+    },
+    { ctx }
+  ) => {
+    logger.info("Starting memory ramp", { steps, stepSizeMb, stepIntervalSeconds, holdSeconds });
+
+    const allocations: Buffer[] = [];
+
+    // Ramp up — allocate in steps
+    for (let i = 0; i < steps; i++) {
+      const buf = Buffer.alloc(stepSizeMb * 1024 * 1024, 0xff);
+      allocations.push(buf);
+      logger.info(`Allocated step ${i + 1}/${steps}`, {
+        totalAllocatedMb: (i + 1) * stepSizeMb,
+      });
+      await setTimeout(stepIntervalSeconds * 1000);
+    }
+
+    // Hold at peak
+    logger.info("Holding at peak memory", { totalMb: steps * stepSizeMb });
+    await setTimeout(holdSeconds * 1000);
+
+    // Release
+    allocations.length = 0;
+    global.gc?.();
+    logger.info("Released all allocations");
+
+    // Let metrics capture the drop
+    await setTimeout(10_000);
+
+    logger.info("Memory ramp complete");
+    return { peakMb: steps * stepSizeMb };
+  },
+});
+
+/**
+ * Alternates between CPU-intensive bursts and idle sleep periods.
+ * Produces a sawtooth/square-wave CPU utilization pattern.
+ */
+export const burstyWorkload = task({
+  id: "bursty-workload",
+  run: async (
+    {
+      cycles = 5,
+      burstSeconds = 5,
+      idleSeconds = 5,
+    }: {
+      cycles?: number;
+      burstSeconds?: number;
+      idleSeconds?: number;
+    },
+    { ctx }
+  ) => {
+    logger.info("Starting bursty workload", { cycles, burstSeconds, idleSeconds });
+
+    for (let cycle = 0; cycle < cycles; cycle++) {
+      // Burst phase — hash as fast as possible
+      logger.info(`Cycle ${cycle + 1}/${cycles}: burst phase`);
+      const burstDeadline = Date.now() + burstSeconds * 1000;
+      let data = Buffer.from(`burst-cycle-${cycle}`);
+      while (Date.now() < burstDeadline) {
+        const chunkEnd = Date.now() + 100;
+        while (Date.now() < chunkEnd) {
+          data = createHash("sha256").update(data).digest();
+        }
+        await setTimeout(1);
+      }
+
+      // Idle phase
+      logger.info(`Cycle ${cycle + 1}/${cycles}: idle phase`);
+      await setTimeout(idleSeconds * 1000);
+    }
+
+    logger.info("Bursty workload complete", { totalCycles: cycles });
+    return { cycles };
+  },
+});
+
+/**
+ * Simulates a data processing pipeline with distinct phases:
+ *   1. Read phase — light CPU, growing memory (buffering data)
+ *   2. Process phase — high CPU, stable memory (crunching data)
+ *   3. Write phase — low CPU, memory drops (streaming out results)
+ *
+ * Shows clear phase transitions in both CPU and memory graphs.
+ */
+export const sustainedWorkload = task({
+  id: "sustained-workload",
+  run: async (
+    {
+      readSeconds = 20,
+      processSeconds = 20,
+      writeSeconds = 20,
+      dataSizeMb = 100,
+    }: {
+      readSeconds?: number;
+      processSeconds?: number;
+      writeSeconds?: number;
+      dataSizeMb?: number;
+    },
+    { ctx }
+  ) => {
+    logger.info("Starting sustained workload — read phase", { readSeconds, dataSizeMb });
+
+    // Phase 1: Read — gradually accumulate buffers (memory ramp, low CPU)
+    const chunks: Buffer[] = [];
+    const chunkCount = 10;
+    const chunkSize = Math.floor((dataSizeMb * 1024 * 1024) / chunkCount);
+    const readInterval = (readSeconds * 1000) / chunkCount;
+
+    for (let i = 0; i < chunkCount; i++) {
+      chunks.push(Buffer.alloc(chunkSize, i));
+      logger.info(`Read ${i + 1}/${chunkCount} chunks`);
+      await setTimeout(readInterval);
+    }
+
+    // Phase 2: Process — hash all chunks repeatedly (high CPU, stable memory)
+    logger.info("Entering process phase", { processSeconds });
+    const processDeadline = Date.now() + processSeconds * 1000;
+    let hashCount = 0;
+
+    while (Date.now() < processDeadline) {
+      const chunkEnd = Date.now() + 100;
+      while (Date.now() < chunkEnd) {
+        for (const chunk of chunks) {
+          createHash("sha256").update(chunk).digest();
+          hashCount++;
+        }
+      }
+      await setTimeout(1);
+    }
+
+    // Phase 3: Write — release memory gradually (low CPU, memory drops)
+    logger.info("Entering write phase", { writeSeconds });
+    const writeInterval = (writeSeconds * 1000) / chunkCount;
+
+    for (let i = chunkCount - 1; i >= 0; i--) {
+      chunks.pop();
+      logger.info(`Wrote and released chunk ${chunkCount - i}/${chunkCount}`);
+      await setTimeout(writeInterval);
+    }
+
+    global.gc?.();
+    await setTimeout(5000);
+
+    logger.info("Sustained workload complete", { hashCount });
+    return { hashCount };
+  },
+});
+
+/**
+ * Parent task that fans out multiple child tasks in parallel.
+ * Useful for seeing per-run breakdowns in metrics queries grouped by run_id.
+ */
+export const concurrentLoad = task({
+  id: "concurrent-load",
+  run: async (
+    {
+      concurrency = 3,
+      taskType = "bursty-workload" as "cpu-intensive" | "bursty-workload",
+      durationSeconds = 30,
+    }: {
+      concurrency?: number;
+      taskType?: "cpu-intensive" | "bursty-workload";
+      durationSeconds?: number;
+    },
+    { ctx }
+  ) => {
+    logger.info("Starting concurrent load", { concurrency, taskType, durationSeconds });
+
+    const items = Array.from({ length: concurrency }, (_, i) => {
+      if (taskType === "cpu-intensive") {
+        return { id: cpuIntensive.id, payload: { durationSeconds } };
+      }
+      return {
+        id: burstyWorkload.id,
+        payload: { cycles: 3, burstSeconds: 5, idleSeconds: 5 },
+      };
+    });
+
+    const results = await batch.triggerAndWait<typeof cpuIntensive | typeof burstyWorkload>(items);
+
+    logger.info("All children completed", {
+      count: results.runs.length,
+    });
+
+    return { childRunIds: results.runs.map((r) => r.id) };
+  },
+});
+
+/**
+ * Demonstrates custom OTEL metrics: counter, histogram, and up-down counter.
+ * Simulates processing a queue of items with varying processing times.
+ */
+export const customMetrics = task({
+  id: "custom-metrics",
+  run: async (
+    {
+      itemCount = 20,
+      minProcessingMs = 50,
+      maxProcessingMs = 500,
+      batchSize = 5,
+    }: {
+      itemCount?: number;
+      minProcessingMs?: number;
+      maxProcessingMs?: number;
+      batchSize?: number;
+    },
+    { ctx }
+  ) => {
+    logger.info("Starting custom metrics demo", { itemCount, batchSize });
+
+    // Simulate items arriving in the queue
+    queueDepthGauge.add(itemCount);
+
+    let totalProcessed = 0;
+
+    for (let i = 0; i < itemCount; i += batchSize) {
+      const currentBatch = Math.min(batchSize, itemCount - i);
+
+      for (let j = 0; j < currentBatch; j++) {
+        const processingTime =
+          minProcessingMs + Math.random() * (maxProcessingMs - minProcessingMs);
+
+        // Simulate work
+        const start = performance.now();
+        let data = Buffer.from(`item-${i + j}`);
+        const deadline = Date.now() + processingTime;
+        while (Date.now() < deadline) {
+          data = createHash("sha256").update(data).digest();
+        }
+        const elapsed = performance.now() - start;
+
+        // Record metrics
+        itemsProcessedCounter.add(1, { "item.type": j % 2 === 0 ? "even" : "odd" });
+        itemDurationHistogram.record(elapsed, { "item.type": j % 2 === 0 ? "even" : "odd" });
+        queueDepthGauge.add(-1);
+
+        totalProcessed++;
+      }
+
+      logger.info(`Processed batch`, {
+        batchNumber: Math.floor(i / batchSize) + 1,
+        totalProcessed,
+        remaining: itemCount - totalProcessed,
+      });
+
+      // Brief pause between batches
+      await setTimeout(1000);
+    }
+
+    logger.info("Custom metrics demo complete", { totalProcessed });
+    return { totalProcessed };
+  },
+});
diff --git a/references/hello-world/src/trigger/nestedDependencies.ts b/references/hello-world/src/trigger/nestedDependencies.ts
new file mode 100644
index 00000000000..afd25a4a27f
--- /dev/null
+++ b/references/hello-world/src/trigger/nestedDependencies.ts
@@ -0,0 +1,74 @@
+import { logger, task, wait } from "@trigger.dev/sdk";
+
+export const nestedDependencies = task({
+  id: "nested-dependencies",
+  run: async ({
+    depth = 0,
+    maxDepth = 6,
+    batchSize = 4,
+    waitSeconds = 1,
+    failAttemptChance = 0,
+    failParents = false,
+  }: {
+    depth?: number;
+    maxDepth?: number;
+    batchSize?: number;
+    waitSeconds?: number;
+    failAttemptChance?: number;
+    failParents?: boolean;
+  }) => {
+    if (depth >= maxDepth) {
+      return;
+    }
+
+    logger.log(`Started ${depth}/${maxDepth} depth`);
+
+    const shouldFail = Math.random() < failAttemptChance;
+    if (shouldFail) {
+      throw new Error(`Failed at ${depth}/${maxDepth} depth`);
+    }
+
+    await wait.for({ seconds: waitSeconds });
+
+    const triggerOrBatch = depth % 2 === 0;
+
+    if (triggerOrBatch) {
+      for (let i = 0; i < batchSize; i++) {
+        const result = await nestedDependencies.triggerAndWait({
+          depth: depth + 1,
+          maxDepth,
+          waitSeconds,
+          failAttemptChance,
+          batchSize,
+        });
+        logger.log(`Triggered complete ${i + 1}/${batchSize}`);
+
+        if (!result.ok && failParents) {
+          throw new Error(`Failed at ${depth}/${maxDepth} depth`);
+        }
+      }
+    } else {
+      const results = await nestedDependencies.batchTriggerAndWait(
+        Array.from({ length: batchSize }, (_, i) => ({
+          payload: {
+            depth: depth + 1,
+            maxDepth,
+            batchSize,
+            waitSeconds,
+            failAttemptChance,
+          },
+        }))
+      );
+      logger.log(`Batch triggered complete`);
+
+      if (results.runs.some((r) => !r.ok) && failParents) {
+        throw new Error(`Failed at ${depth}/${maxDepth} depth`);
+      }
+    }
+
+    logger.log(`Sleep for ${waitSeconds} seconds`);
+    await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1000));
+
+    logger.log(`Finished ${depth}/${maxDepth} depth`);
+  },
+});
diff --git a/references/hello-world/src/trigger/query.ts b/references/hello-world/src/trigger/query.ts
new file mode 100644
index 00000000000..bad268470c2
--- /dev/null
+++ b/references/hello-world/src/trigger/query.ts
@@ -0,0 +1,183 @@
+import { logger, query, task } from "@trigger.dev/sdk";
+import type { QueryTable } from "@trigger.dev/sdk";
+
+// Simple query example - tests different from/to formats
+export const simpleQueryTask = task({
+  id: "simple-query",
+  run: async () => {
+    logger.info("Running simple query example");
+
+    // 1. Default: no from/to, uses default period
+    const defaultResult = await query.execute("SELECT * FROM runs LIMIT 5");
+    logger.info("Default (no from/to)", {
+      rowCount: defaultResult.results.length,
+      firstRow: defaultResult.results[0],
+    });
+
+    // 2. Using Date objects for from/to
+    const withDates = await query.execute<
+      QueryTable<"runs", "run_id" | "status" | "triggered_at">
+    >("SELECT run_id, status, triggered_at FROM runs LIMIT 5", {
+      from: new Date("2025-01-01T00:00:00Z"),
+      to: new Date(),
+    });
+    logger.info("With Date objects", {
+      rowCount: withDates.results.length,
+      firstRow: withDates.results[0],
+    });
+
+    // 3. Using Unix timestamps in milliseconds (Date.now() returns ms)
+    const now = Date.now();
+    const sevenDaysAgo = now - 7 * 24 * 60 * 60 * 1000;
+    const withTimestamps = await query.execute<
+      QueryTable<"runs", "run_id" | "status" | "triggered_at">
+    >("SELECT run_id, status, triggered_at FROM runs LIMIT 5", {
+      from: sevenDaysAgo,
+      to: now,
+    });
+    logger.info("With Unix timestamps (ms)", {
+      rowCount: withTimestamps.results.length,
+      firstRow: withTimestamps.results[0],
+    });
+
+    // 4. Mixing Date and number
+    const mixed = await query.execute<
+      QueryTable<"runs", "run_id" | "status" | "triggered_at">
+    >("SELECT run_id, status, triggered_at FROM runs LIMIT 5", {
+      from: new Date("2025-01-01"),
+      to: Date.now(),
+    });
+    logger.info("Mixed Date + timestamp", {
+      rowCount: mixed.results.length,
+      firstRow: mixed.results[0],
+    });
+
+    return {
+      defaultRows: defaultResult.results.length,
+      dateRows: withDates.results.length,
+      timestampRows: withTimestamps.results.length,
+      mixedRows: mixed.results.length,
+    };
+  },
+});
+
+// JSON query with all options - aggregation queries use inline types
+export const fullJsonQueryTask = task({
+  id: "full-json-query",
+  run: async () => {
+    logger.info("Running full JSON query example with all options");
+
+    // For aggregation queries, use inline types since the result shape
+    // doesn't match a table row. For non-aggregated queries, use QueryTable.
+    const result = await query.execute<{
+      status: string;
+      count: number;
+      avg_duration: number;
+    }>(
+      `SELECT
+        status,
+        COUNT(*) as count,
+        AVG(total_duration) as avg_duration
+      FROM runs
+      WHERE status IN ('Completed', 'Failed')
+      GROUP BY status`,
+      {
+        scope: "environment", // Query current environment only
+        period: "30d", // Last 30 days of data
+        // format defaults to "json"
+      }
+    );
+
+    logger.info("Query completed", {
+      format: result.format,
+      rowCount: result.results.length,
+    });
+
+    // Log the aggregated results - now fully type-safe!
+    result.results.forEach((row) => {
+      logger.info("Status breakdown", {
+        status: row.status, // string
+        count: row.count, // number
+        averageDuration: row.avg_duration, // number
+      });
+    });
+
+    return {
+      summary: result.results,
+    };
+  },
+});
+
+// CSV export example
+export const csvQueryTask = task({
+  id: "csv-query",
+  run: async () => {
+    logger.info("Running CSV query example");
+
+    // Query with CSV format - automatically typed as discriminated union!
+    const result = await query.execute(
+      "SELECT run_id, status, triggered_at, total_duration FROM runs LIMIT 10",
+      {
+        scope: "project", // Query all environments in the project
+        period: "7d", // Last 7 days
+        format: "csv", // CSV format
+      }
+    );
+
+    // result.format is "csv" and result.results is automatically typed as string!
+    logger.info("CSV query completed", {
+      format: result.format,
+      dataLength: result.results.length,
+      results: result.results,
+    });
+
+    return {
+      format: result.format,
+      csv: result.results,
+    };
+  },
+});
+
+// Organization-wide query with QueryTable for full row access
+export const orgQueryTask = task({
+  id: "org-query",
+  run: async () => {
+    logger.info("Running organization-wide query");
+
+    // Use QueryTable to get typed rows for specific columns
+    const result = await query.execute<
+      QueryTable<"runs", "run_id" | "project" | "environment" | "status" | "task_identifier" | "machine">
+    >(
+      `SELECT run_id, project, environment, status, task_identifier, machine
+      FROM runs
+      ORDER BY triggered_at DESC
+      LIMIT 50`,
+      {
+        scope: "organization", // Query across all projects
+        from: new Date("2025-02-01T00:00:00Z"), // Custom date range
+        to: new Date("2025-02-11T23:59:59Z"),
+      }
+    );
+
+    logger.info("Organization query completed", {
+      format: result.format,
+      runCount: result.results.length,
+    });
+
+    // Fully typed - status is RunFriendlyStatus, machine is MachinePresetName
+    result.results.forEach((row) => {
+      logger.info("Run info", {
+        runId: row.run_id, // string
+        project: row.project, // string
+        environment: row.environment, // string
+        status: row.status, // "Completed" | "Failed" | "Executing" | ...
+        task: row.task_identifier, // string
+        machine: row.machine, // "micro" | "small-1x" | "small-2x" | ...
+      });
+    });
+
+    return {
+      runs: result.results,
+    };
+  },
+});
diff --git a/references/hello-world/src/trigger/queues.ts b/references/hello-world/src/trigger/queues.ts
index 7eb05c99b48..69c4216b97b 100644
--- a/references/hello-world/src/trigger/queues.ts
+++ b/references/hello-world/src/trigger/queues.ts
@@ -1,4 +1,4 @@
-import { batch, logger, queue, queues, task, tasks } from "@trigger.dev/sdk/v3";
+import { batch, logger, queue, queues, runs, task, tasks } from "@trigger.dev/sdk/v3";
 
 export const queuesTester = task({
   id: "queues-tester",
@@ -37,6 +37,22 @@ export const queuesTester = task({
       name: "queues-tester",
     });
     logger.log("Resumed queue", { resumedQueue });
+
+    const overriddenQueue = await queues.overrideConcurrencyLimit(
+      {
+        type: "task",
+        name: "queues-tester",
+      },
+      10
+    );
+    logger.log("Overridden queue", { overriddenQueue });
+
+    const resetQueue = await queues.resetConcurrencyLimit({
+      type: "task",
+      name: "queues-tester",
+    });
+
+    logger.log("Reset queue", { resetQueue });
   },
 });
 
@@ -262,3 +278,56 @@ export const lockedTaskIdentifierTask = task({
     await tasks.triggerAndWait("task_does_not_exist", {});
   },
 });
+
+export const testQueuesConcurrencyOverrideTask = task({
+  id: "test-queues-concurrency-override-task",
+  run: async (payload: any) => {
+    logger.log("Test queues concurrency override task", { payload });
+
+    const handle1 = await testQueuesConcurrencyOverrideChildTask.trigger({});
+    const handle2 = await testQueuesConcurrencyOverrideChildTask.trigger({});
+
+    const result1 = await runs.poll(handle1.id);
+    const result2 = await runs.poll(handle2.id);
+
+    logger.log("Test queues concurrency override task results", { result1, result2 });
+
+    const handle3 = await testQueuesConcurrencyOverrideChildTask.trigger({});
+    const handle4 = await testQueuesConcurrencyOverrideChildTask.trigger({});
+
+    const overriddenQueue = await queues.overrideConcurrencyLimit(
+      {
+        type: "custom",
+        name: "test-queues-concurrency-override-queue",
+      },
+      2
+    );
+
+    logger.log("Overridden queue", { overriddenQueue });
+
+    const result3 = await runs.poll(handle3.id);
+    const result4 = await runs.poll(handle4.id);
+
+    logger.log("Test queues concurrency override task results", { result3, result4 });
+
+    const resetQueue = await queues.resetConcurrencyLimit({
+      type: "custom",
+      name: "test-queues-concurrency-override-queue",
+    });
+
+    logger.log("Reset queue", { resetQueue });
+  },
+});
+
+export const testQueuesConcurrencyOverrideChildTask = task({
+  id: "test-queues-concurrency-override-child-task",
+  queue: {
+    name: "test-queues-concurrency-override-queue",
+    concurrencyLimit: 1,
+  },
+  run: async (payload: any) => {
+    logger.log("Test queues concurrency override child task", { payload });
+
+    await setTimeout(10000);
+  },
+});
diff --git a/references/hello-world/src/trigger/rateLimitStress.ts b/references/hello-world/src/trigger/rateLimitStress.ts
new file mode 100644
index 00000000000..cb2c20c5798
--- /dev/null
+++ b/references/hello-world/src/trigger/rateLimitStress.ts
@@ -0,0 +1,257 @@
+import { logger, task, tasks, RateLimitError } from "@trigger.dev/sdk/v3";
+import { setTimeout } from "timers/promises";
+
+/**
+ * A simple no-op task that does minimal work.
+ * Used as the target for rate limit stress testing.
+ */
+export const noopTask = task({
+  id: "noop-task",
+  retry: { maxAttempts: 1 },
+  run: async (payload: { index: number }) => {
+    return { index: payload.index, timestamp: Date.now() };
+  },
+});
+
+/**
+ * Stress test task that triggers many runs rapidly to hit the API rate limit.
+ * Fires triggers as fast as possible for a set duration, then stops.
+ *
+ * Note: Already-triggered runs will continue to execute after the test completes.
+ *
+ * Default rate limits (per environment API key):
+ * - Free: 1,200 runs bucket, refills 100 runs/10 sec
+ * - Hobby/Pro: 5,000 runs bucket, refills 500 runs/5 sec
+ *
+ * Run with: `npx trigger.dev@latest dev` then trigger this task from the dashboard
+ */
+export const rateLimitStressTest = task({
+  id: "rate-limit-stress-test",
+  maxDuration: 120,
+  run: async (payload: {
+    /** How long to run the test in seconds (default: 5) */
+    durationSeconds?: number;
+    /** How many triggers to fire in parallel per batch (default: 100) */
+    batchSize?: number;
+  }) => {
+    const durationSeconds = payload.durationSeconds ?? 5;
+    const batchSize = payload.batchSize ?? 100;
+    const durationMs = durationSeconds * 1000;
+
+    logger.info("Starting rate limit stress test", {
+      durationSeconds,
+      batchSize,
+    });
+
+    const start = Date.now();
+    let totalAttempted = 0;
+    let totalSuccess = 0;
+    let totalRateLimited = 0;
+    let totalOtherErrors = 0;
+    let batchCount = 0;
+
+    // Keep firing batches until time runs out
+    while (Date.now() - start < durationMs) {
+      batchCount++;
+      const batchStart = Date.now();
+      const elapsed = batchStart - start;
+      const remaining = durationMs - elapsed;
+
+      logger.info(`Batch ${batchCount} starting`, {
+        elapsedMs: elapsed,
+        remainingMs: remaining,
+        totalAttempted,
+        totalSuccess,
+        totalRateLimited,
+      });
+
+      // Fire a batch of triggers
+      const promises = Array.from({ length: batchSize }, async (_, i) => {
+        // Check if we've exceeded time before each trigger
+        if (Date.now() - start >= durationMs) {
+          return { skipped: true };
+        }
+
+        const index = totalAttempted + i;
+        try {
+          await tasks.trigger<typeof noopTask>("noop-task", { index });
+          return { success: true, rateLimited: false };
+        } catch (error) {
+          if (error instanceof RateLimitError) {
+            return { success: false, rateLimited: true, resetInMs: error.millisecondsUntilReset };
+          }
+          return { success: false, rateLimited: false };
+        }
+      });
+
+      const results = await Promise.all(promises);
+
+      const batchSuccess = results.filter((r) => "success" in r && r.success).length;
+      const batchRateLimited = results.filter((r) => "rateLimited" in r && r.rateLimited).length;
+      const batchOtherErrors = results.filter(
+        (r) => "success" in r && !r.success && !("rateLimited" in r && r.rateLimited)
+      ).length;
+      const batchSkipped = results.filter((r) => "skipped" in r && r.skipped).length;
+
+      totalAttempted += batchSize - batchSkipped;
+      totalSuccess += batchSuccess;
+      totalRateLimited += batchRateLimited;
+      totalOtherErrors += batchOtherErrors;
+
+      // Log rate limit hits
+      const rateLimitedResult = results.find((r) => "rateLimited" in r && r.rateLimited);
+      if (rateLimitedResult && "resetInMs" in rateLimitedResult) {
+        logger.warn("Rate limit hit!", {
+          batch: batchCount,
+          resetInMs: rateLimitedResult.resetInMs,
+          totalRateLimited,
+        });
+      }
+
+      // Small delay between batches to not overwhelm
+      await setTimeout(50);
+    }
+
+    const duration = Date.now() - start;
+
+    logger.info("Stress test completed", {
+      actualDurationMs: duration,
+      totalAttempted,
+      totalSuccess,
+      totalRateLimited,
+      totalOtherErrors,
+      batchCount,
+    });
+
+    return {
+      config: {
+        durationSeconds,
+        batchSize,
+      },
+      results: {
+        actualDurationMs: duration,
+        totalAttempted,
+        totalSuccess,
+        totalRateLimited,
+        totalOtherErrors,
+        batchCount,
+        hitRateLimit: totalRateLimited > 0,
+        triggersPerSecond: Math.round((totalAttempted / duration) * 1000),
+      },
+    };
+  },
+});
+
+/**
+ * Sustained load test - maintains a steady rate of triggers over time.
+ * Useful for seeing how rate limits behave under sustained load.
+ *
+ * Note: Successfully triggered runs will continue executing after this test completes.
+ */
+export const sustainedLoadTest = task({
+  id: "sustained-load-test",
+  maxDuration: 300,
+  run: async (payload: {
+    /** Triggers per second to attempt (default: 100) */
+    triggersPerSecond?: number;
+    /** Duration in seconds (default: 20) */
+    durationSeconds?: number;
+  }) => {
+    const triggersPerSecond = payload.triggersPerSecond ?? 100;
+    const durationSeconds = payload.durationSeconds ?? 20;
+
+    const intervalMs = 1000 / triggersPerSecond;
+    const totalTriggers = triggersPerSecond * durationSeconds;
+
+    logger.info("Starting sustained load test", {
+      triggersPerSecond,
+      durationSeconds,
+      totalTriggers,
+      intervalMs,
+    });
+
+    const results: Array<{
+      index: number;
+      success: boolean;
+      rateLimited: boolean;
+      timestamp: number;
+    }> = [];
+
+    const start = Date.now();
+    let index = 0;
+
+    while (Date.now() - start < durationSeconds * 1000 && index < totalTriggers) {
+      const triggerStart = Date.now();
+
+      try {
+        await tasks.trigger<typeof noopTask>("noop-task", { index });
+        results.push({
+          index,
+          success: true,
+          rateLimited: false,
+          timestamp: Date.now() - start,
+        });
+      } catch (error) {
+        results.push({
+          index,
+          success: false,
+          rateLimited: error instanceof RateLimitError,
+          timestamp: Date.now() - start,
+        });
+
+        if (error instanceof RateLimitError) {
+          logger.warn("Rate limit hit during sustained load", {
+            index,
+            timestamp: Date.now() - start,
+            resetInMs: error.millisecondsUntilReset,
+          });
+        }
+      }
+
+      index++;
+
+      // Maintain the target rate
+      const elapsed = Date.now() - triggerStart;
+      const sleepTime = Math.max(0, intervalMs - elapsed);
+      if (sleepTime > 0) {
+        await setTimeout(sleepTime);
+      }
+    }
+
+    const duration = Date.now() - start;
+    const successCount = results.filter((r) => r.success).length;
+    const rateLimitedCount = results.filter((r) => r.rateLimited).length;
+
+    // Find when rate limiting started (if at all)
+    const firstRateLimited = results.find((r) => r.rateLimited);
+
+    logger.info("Sustained load test completed", {
+      actualDuration: duration,
+      actualTriggers: results.length,
+      successCount,
+      rateLimitedCount,
+      actualRate: Math.round((results.length / duration) * 1000),
+    });
+
+    return {
+      config: {
+        targetTriggersPerSecond: triggersPerSecond,
+        targetDurationSeconds: durationSeconds,
+      },
+      results: {
+        actualDuration: duration,
+        actualTriggers: results.length,
+        successCount,
+        rateLimitedCount,
+        actualRate: Math.round((results.length / duration) * 1000),
+        hitRateLimit: rateLimitedCount > 0,
+        firstRateLimitedAt: firstRateLimited
+          ? {
+              index: firstRateLimited.index,
+              timestampMs: firstRateLimited.timestamp,
+            }
+          : null,
+      },
+    };
+  },
+});
diff --git a/references/hello-world/src/trigger/realtime.ts b/references/hello-world/src/trigger/realtime.ts
index 67dcf1804e2..c53bb2f16ad 100644
--- a/references/hello-world/src/trigger/realtime.ts
+++ b/references/hello-world/src/trigger/realtime.ts
@@ -1,4 +1,4 @@
-import { logger, runs, task } from "@trigger.dev/sdk";
+import { logger, metadata, runs, task } from "@trigger.dev/sdk";
 import { helloWorldTask } from "./example.js";
 import { setTimeout } from "timers/promises";
 
@@ -59,3 +59,70 @@ export const realtimeUpToDateTask = task({
     };
   },
 });
+
+export const realtimeStreamsTask = task({
+  id: "realtime-streams",
+  run: async () => {
+    const mockStream = createStreamFromGenerator(generateMockData(5 * 60 * 1000));
+
+    const stream = await metadata.stream("mock-data", mockStream);
+
+    for await (const chunk of stream) {
+      logger.info("Received chunk", { chunk });
+    }
+
+    return {
+      message: "Hello, world!",
+    };
+  },
+});
+
+export const realtimeStreamsV2Task = task({
+  id: "realtime-streams-v2",
+  run: async () => {
+    const mockStream1 = createStreamFromGenerator(generateMockData(5 * 60 * 1000));
+
+    await metadata.stream("mock-data", mockStream1);
+
+    await setTimeout(10000); // Offset by 10 seconds
+
+    const mockStream2 = createStreamFromGenerator(generateMockData(5 * 60 * 1000));
+    const stream2 = await metadata.stream("mock-data", mockStream2);
+
+    for await (const chunk of stream2) {
+      logger.info("Received chunk", { chunk });
+    }
+
+    return {
+      message: "Hello, world!",
+    };
+  },
+});
+
+async function* generateMockData(durationMs: number = 5 * 60 * 1000) {
+  const chunkInterval = 1000;
+  const totalChunks = Math.floor(durationMs / chunkInterval);
+
+  for (let i = 0; i < totalChunks; i++) {
+    await setTimeout(chunkInterval);
+
+    yield JSON.stringify({
+      chunk: i + 1,
+      timestamp: new Date().toISOString(),
+      data: `Mock data chunk ${i + 1}`,
+    }) + "\n";
+  }
+}
+
+// Convert to ReadableStream
+function createStreamFromGenerator(generator: AsyncGenerator<string>) {
+  return new ReadableStream({
+    async start(controller) {
+      for await (const chunk of generator) {
+        controller.enqueue(chunk);
+      }
+
+      controller.close();
+    },
+  });
+}
diff --git a/references/hello-world/src/trigger/regions.ts b/references/hello-world/src/trigger/regions.ts
new file mode 100644
index 00000000000..2c31fbb9dc6
--- /dev/null
+++ b/references/hello-world/src/trigger/regions.ts
@@ -0,0 +1,9 @@
+import { task } from "@trigger.dev/sdk";
+import { fixedLengthTask } from "./batches.js";
+
+export const regionsTask = task({
+  id: "regions",
+  run: async ({ region }: { region?: string }, { ctx }) => {
+    await fixedLengthTask.triggerAndWait({ waitSeconds: 1 }, { region });
+  },
+});
diff --git a/references/hello-world/src/trigger/telemetry.ts b/references/hello-world/src/trigger/telemetry.ts
new file mode 100644
index 00000000000..5dbecb89638
--- /dev/null
+++ b/references/hello-world/src/trigger/telemetry.ts
@@ -0,0 +1,1634 @@
+import { logger, task } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+
+export const simpleSuccessTask = task({
+  id: "otel/simple-success-task",
+  run: async (payload: any, { ctx }) => {
+    logger.log("Hello log 1", { ctx });
+    logger.info("Hello info 1");
+    logger.warn("Hello warn 1");
+    logger.error("Hello error 1");
+
+    await setTimeout(15000);
+
+    logger.log("Hello log 2");
+    logger.info("Hello info 2");
+    logger.warn("Hello warn 2");
+    logger.error("Hello error 2");
+
+    return { message: "Hello, world!" };
+  },
+});
+
+export const simpleFailureTask = task({
+  id: "otel/simple-failure-task",
+  retry: {
+    maxAttempts: 1,
+  },
+  run: async (payload: any, { ctx }) => {
+    await setTimeout(5000);
+
+    throw new Error("Hello error");
+  },
+});
+
+export const failureWithRetries = task({
+  id: "otel/failure-with-retries",
+  retry: {
+    maxAttempts: 3,
+  },
+  run: async (payload: any, { ctx }) => {
+    await setTimeout(15000);
+
+    throw new Error("Hello error");
+  },
+});
+
+export const taskWithChildTasks = task({
+  id: "otel/task-with-child-tasks",
+  run: async (payload: any, { ctx }) => {
+    await simpleSuccessTask.triggerAndWait({});
+  },
+});
+
+export const generateLogsParentTask = task({
+  id: "otel/generate-logs-parent",
+  run: async (payload: any) => {
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+    await generateLogsTask.triggerAndWait({});
+  },
+});
+
+export const generateLogsTask = task({
+  id: "otel/generate-logs",
+  run: async (payload: any, { ctx }) => {
+    await generateLogs(101);
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 1", async () => {
+      await generateLogs(101);
+    });
+
+    await logger.trace("span 2", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 2.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 2.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 2.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+
+    await logger.trace("span 3", async () => {
+      await generateLogs(101);
+
+      await logger.trace("span 3.1", async () => {
+        await generateLogs(101);
+
+        await logger.trace("span 3.1.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.1.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+
+        await logger.trace("span 3.2.1", async () => {
+          await generateLogs(101);
+
+          await logger.trace("span 3.2.1.1", async () => {
+            await generateLogs(101);
+          });
+        });
+      });
+    });
+  },
+});
+
+async function generateLogs(count: number) {
+  await Promise.all(
+    Array.from({ length: count }).map(async () => {
+      await setTimeout(1000);
+
+      const logMessage = generateRandomLogMessage();
+
+      switch (logMessage.level) {
+        case "DEBUG": {
+          logger.debug(logMessage.message, { ...logMessage.metadata, ...generateRandomObject() });
+          break;
+        }
+        case "INFO": {
+          logger.info(logMessage.message, { ...logMessage.metadata, ...generateRandomObject() });
+          break;
+        }
+        case "WARN": {
+          logger.warn(logMessage.message, { ...logMessage.metadata, ...generateRandomObject() });
+          break;
+        }
+        case "FATAL":
+        case "ERROR": {
+          logger.error(logMessage.message, { ...logMessage.metadata, ...generateRandomObject() });
+          break;
+        }
+      }
+    })
+  );
+}
+
+type RandomValue = string | number | boolean | null | RandomObject | RandomValue[];
+
+interface RandomObject {
+  [key: string]: RandomValue;
+}
+
+function generateRandomObject(depth: number = 3, maxKeys: number = 8): RandomObject {
+  const obj: RandomObject = {};
+  const numKeys = Math.floor(Math.random() * maxKeys) + 1;
+
+  for (let i = 0; i < numKeys; i++) {
+    const key = generateRandomKey();
+    obj[key] = generateRandomValue(depth);
+  }
+
+  return obj;
+}
+
+function generateRandomValue(depth: number): RandomValue {
+  if (depth <= 0) {
+    return generatePrimitiveValue();
+  }
+
+  const valueTypes = ["primitive", "object", "array"];
+  const weights = depth > 1 ? [0.6, 0.2, 0.2] : [0.8, 0.1, 0.1];
+  const selectedType = weightedRandomChoice(valueTypes, weights);
+
+  switch (selectedType) {
+    case "primitive":
+      return generatePrimitiveValue();
+    case "object":
+      return generateRandomObject(depth - 1, 5);
+    case "array":
+      return generateRandomArray(depth - 1);
+    default:
+      return generatePrimitiveValue();
+  }
+}
+
+function generatePrimitiveValue(): string | number | boolean | null {
+  const primitiveTypes = ["string", "number", "boolean", "null"];
+  const type = primitiveTypes[Math.floor(Math.random() * primitiveTypes.length)];
+
+  switch (type) {
+    case "string":
+      return generateRandomString();
+    case "number":
+      return generateRandomNumber();
+    case "boolean":
+      return Math.random() > 0.5;
+    case "null":
+      return null;
+    default:
+      return generateRandomString();
+  }
+}
+
+function generateArrayOfPrimitiveValues(length: number): RandomValue[] {
+  const primitiveTypes = ["string", "number", "boolean", "null"];
+  const type = primitiveTypes[Math.floor(Math.random() * primitiveTypes.length)];
+
+  switch (type) {
+    case "string":
+      return Array.from({ length }, () => generateRandomString());
+    case "number":
+      return Array.from({ length }, () => generateRandomNumber());
+    case "boolean":
+      return Array.from({ length }, () => Math.random() > 0.5);
+    case "null":
+      return Array.from({ length }, () => null);
+    default:
+      return Array.from({ length }, () => generateRandomString());
+  }
+}
+
+function generateRandomString(): string {
+  const stringTypes = [
+    "name",
+    "email",
+    "city",
+    "company",
+    "product",
+    "description",
+    "color",
+    "status",
+    "category",
+    "id",
+    "url",
+    "phone",
+  ];
+
+  const type = stringTypes[Math.floor(Math.random() * stringTypes.length)];
+
+  const samples = {
+    name: ["John Smith", "Sarah Johnson", "Michael Brown", "Emma Wilson", "David Lee"],
+    email: ["user@example.com", "admin@company.org", "contact@business.net", "info@service.co.uk"],
+    city: ["London", "Manchester", "Birmingham", "Edinburgh", "Cardiff", "Belfast"],
+    company: [
+      "TechCorp Ltd",
+      "Global Solutions",
+      "Innovation Hub",
+      "Digital Dynamics",
+      "Future Systems",
+    ],
+    product: ["Wireless Headphones", "Smart Watch", "Laptop Stand", "Coffee Maker", "Desk Lamp"],
+    description: [
+      "High-quality product with excellent features",
+      "Reliable and efficient solution",
+      "Modern design meets functionality",
+    ],
+    color: ["red", "blue", "green", "yellow", "purple", "orange", "black", "white"],
+    status: ["active", "inactive", "pending", "completed", "cancelled", "processing"],
+    category: ["electronics", "clothing", "books", "home", "sports", "automotive"],
+    id: () => `${Math.random().toString(36).substr(2, 9)}`,
+    url: ["https://example.com", "https://api.service.com/v1", "https://docs.platform.org"],
+    phone: ["+44 20 7123 4567", "+44 161 234 5678", "+44 121 345 6789"],
+  };
+
+  const sampleArray = samples[type as keyof typeof samples];
+  if (typeof sampleArray === "function") {
+    return sampleArray();
+  }
+  return sampleArray[Math.floor(Math.random() * sampleArray.length)];
+}
+
+function generateRandomNumber(): number {
+  const numberTypes = ["integer", "decimal", "large", "small"];
+  const type = numberTypes[Math.floor(Math.random() * numberTypes.length)];
+
+  switch (type) {
+    case "integer":
+      return Math.floor(Math.random() * 1000);
+    case "decimal":
+      return Math.round(Math.random() * 100 * 100) / 100;
+    case "large":
+      return Math.floor(Math.random() * 1000000);
+    case "small":
+      return Math.floor(Math.random() * 10);
+    default:
+      return Math.floor(Math.random() * 100);
+  }
+}
+
+function generateRandomKey(): string {
+  const commonKeys = [
+    "id",
+    "name",
+    "email",
+    "age",
+    "address",
+    "phone",
+    "company",
+    "title",
+    "description",
+    "price",
+    "quantity",
+    "status",
+    "createdAt",
+    "updatedAt",
+    "isActive",
+    "category",
+    "tags",
+    "metadata",
+    "config",
+    "settings",
+    "userId",
+    "productId",
+    "orderId",
+    "customerId",
+    "location",
+    "type",
+    "value",
+    "label",
+    "color",
+    "size",
+    "weight",
+    "dimensions",
+    "features",
+  ];
+
+  return commonKeys[Math.floor(Math.random() * commonKeys.length)];
+}
+
+function generateRandomArray(depth: number): RandomValue[] {
+  const arrayLength = Math.floor(Math.random() * 5) + 1;
+
+  return generateArrayOfPrimitiveValues(arrayLength);
+}
+
+function weightedRandomChoice<T>(choices: T[], weights: number[]): T {
+  const totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
+  let random = Math.random() * totalWeight;
+
+  for (let i = 0; i < choices.length; i++) {
+    random -= weights[i];
+    if (random <= 0) {
+      return choices[i];
+    }
+  }
+
+  return choices[choices.length - 1];
+}
+
+interface LogMessage {
+  timestamp: string;
+  level: "DEBUG" | "INFO" | "WARN" | "ERROR" | "FATAL";
+  component: string;
+  message: string;
+  metadata?: Record<string, any>;
+}
+
+function generateRandomLogMessage(includeMetadata: boolean = true): LogMessage {
+  const level = generateLogLevel();
+  const component = generateComponent();
+  const message = generateMessage(level, component);
+  const timestamp = generateTimestamp();
+
+  const logMessage: LogMessage = {
+    timestamp,
+    level,
+    component,
+    message,
+  };
+
+  if (includeMetadata && Math.random() > 0.3) {
+    logMessage.metadata = generateMetadata(level);
+  }
+
+  return logMessage;
+}
+
+function generateLogLevel(): LogMessage["level"] {
+  const levels: LogMessage["level"][] = ["DEBUG", "INFO", "WARN", "ERROR", "FATAL"];
+  const weights = [0.3, 0.4, 0.15, 0.13, 0.02]; // INFO and DEBUG most common
+
+  return weightedRandomChoice(levels, weights);
+}
+
+function generateComponent(): string {
+  const components = [
+    "AuthService",
+    "DatabaseManager",
+    "UserController",
+    "PaymentProcessor",
+    "EmailService",
+    "CacheManager",
+    "FileUploader",
+    "APIGateway",
+    "SecurityManager",
+    "NotificationService",
+    "OrderService",
+    "ProductCatalog",
+    "SessionManager",
+    "ConfigLoader",
+    "MetricsCollector",
+    "HealthChecker",
+    "MessageQueue",
+    "SearchEngine",
+    "ReportGenerator",
+    "BackupService",
+    "LoadBalancer",
+    "RateLimiter",
+    "ValidationService",
+    "AuditLogger",
+  ];
+
+  return components[Math.floor(Math.random() * components.length)];
+}
+
+function generateMessage(level: LogMessage["level"], component: string): string {
+  const messageTemplates = {
+    DEBUG: [
+      `Executing method ${generateMethodName()} with parameters: ${generateParameters()}`,
+      `Cache hit for key: ${generateCacheKey()}`,
+      `Processing request with ID: ${generateId()}`,
+      `Database query executed in ${generateDuration()}ms`,
+      `Validating input data for ${generateEntityName()}`,
+      `Loading configuration from ${generateFilePath()}`,
+      `Initializing connection pool with ${generateNumber(5, 20)} connections`,
+      `Parsing JSON payload of size ${generateFileSize()}`,
+      `Applying business rule: ${generateBusinessRule()}`,
+    ],
+    INFO: [
+      `User ${generateUsername()} successfully logged in from ${generateIPAddress()}`,
+      `Order ${generateOrderId()} created successfully for customer ${generateCustomerId()}`,
+      `Email sent to ${generateEmail()} with subject: "${generateEmailSubject()}"`,
+      `File ${generateFileName()} uploaded successfully (${generateFileSize()})`,
+      `Payment of £${generatePrice()} processed for transaction ${generateTransactionId()}`,
+      `New user registered: ${generateUsername()} (${generateEmail()})`,
+      `Service started successfully on port ${generatePort()}`,
+      `Database migration ${generateMigrationName()} completed successfully`,
+      `Report ${generateReportName()} generated in ${generateDuration()}ms`,
+      `Cache cleared for namespace: ${generateNamespace()}`,
+    ],
+    WARN: [
+      `High memory usage detected: ${generatePercentage()}% of available memory`,
+      `Slow query detected: ${generateDuration()}ms execution time`,
+      `Rate limit approaching for user ${generateUsername()}: ${generateNumber(80, 95)}% of limit`,
+      `Deprecated API endpoint accessed: ${generateAPIEndpoint()}`,
+      `Connection pool nearly exhausted: ${generateNumber(18, 20)}/20 connections in use`,
+      `Large file upload detected: ${generateFileSize()} from ${generateIPAddress()}`,
+      `Failed login attempt for user ${generateUsername()} from ${generateIPAddress()}`,
+      `Queue size growing: ${generateNumber(500, 1000)} pending messages`,
+      `SSL certificate expires in ${generateNumber(1, 30)} days`,
+      `Disk space low: ${generatePercentage()}% full on ${generateDiskPath()}`,
+    ],
+    ERROR: [
+      `Failed to connect to database: ${generateErrorMessage()}`,
+      `Payment processing failed for transaction ${generateTransactionId()}: ${generatePaymentError()}`,
+      `Email delivery failed to ${generateEmail()}: ${generateEmailError()}`,
+      `File upload failed: ${generateFileError()}`,
+      `Authentication failed for user ${generateUsername()}: ${generateAuthError()}`,
+      `API request to ${generateAPIEndpoint()} failed: ${generateHTTPError()}`,
+      `Database query failed: ${generateSQLError()}`,
+      `Service unavailable: ${generateServiceError()}`,
+      `Configuration error: ${generateConfigError()}`,
+      `Validation failed for ${generateEntityName()}: ${generateValidationError()}`,
+    ],
+    FATAL: [
+      `Database connection pool exhausted, shutting down service`,
+      `Out of memory error: Unable to allocate ${generateFileSize()}`,
+      `Critical security breach detected from ${generateIPAddress()}`,
+      `System disk full: Unable to write logs or process requests`,
+      `Service dependency ${generateServiceName()} is completely unavailable`,
+      `Unhandled exception caused service crash: ${generateCriticalError()}`,
+      `Configuration file corrupted: Unable to start service`,
+      `License validation failed: Service cannot continue`,
+      `Critical data corruption detected in ${generateTableName()}`,
+      `Network interface failure: All connections lost`,
+    ],
+  };
+
+  const templates = messageTemplates[level];
+  return templates[Math.floor(Math.random() * templates.length)];
+}
+
+function generateTimestamp(): string {
+  const now = new Date();
+  const randomOffset = Math.floor(Math.random() * 86400000); // Random time within last 24 hours
+  const timestamp = new Date(now.getTime() - randomOffset);
+  return timestamp.toISOString();
+}
+
+function generateMetadata(level: LogMessage["level"]): Record<string, any> {
+  const baseMetadata: Record<string, any> = {
+    requestId: generateId(),
+    userId: Math.random() > 0.3 ? generateUserId() : null,
+    sessionId: generateSessionId(),
+    userAgent: generateUserAgent(),
+    ipAddress: generateIPAddress(),
+  };
+
+  // Add level-specific metadata
+  switch (level) {
+    case "ERROR":
+    case "FATAL":
+      baseMetadata.stackTrace = generateStackTrace();
+      baseMetadata.errorCode = generateErrorCode();
+      break;
+    case "WARN":
+      baseMetadata.threshold = generateNumber(70, 95);
+      baseMetadata.currentValue = generateNumber(75, 100);
+      break;
+    case "INFO":
+      baseMetadata.duration = generateDuration();
+      baseMetadata.statusCode = 200;
+      break;
+  }
+
+  return baseMetadata;
+}
+
+// Helper functions for generating realistic data
+function generateMethodName(): string {
+  const prefixes = ["get", "set", "create", "update", "delete", "process", "validate", "calculate"];
+  const suffixes = ["User", "Order", "Payment", "Data", "Config", "Report", "Session", "Token"];
+  return `${prefixes[Math.floor(Math.random() * prefixes.length)]}${
+    suffixes[Math.floor(Math.random() * suffixes.length)]
+  }`;
+}
+
+function generateParameters(): string {
+  const params = [];
+  const numParams = Math.floor(Math.random() * 3) + 1;
+  for (let i = 0; i < numParams; i++) {
+    params.push(
+      `param${i + 1}=${Math.random() > 0.5 ? `"${generateId()}"` : generateNumber(1, 1000)}`
+    );
+  }
+  return `{${params.join(", ")}}`;
+}
+
+function generateId(): string {
+  return Math.random().toString(36).substr(2, 12);
+}
+
+function generateUserId(): string {
+  return `user_${Math.random().toString(36).substr(2, 8)}`;
+}
+
+function generateSessionId(): string {
+  return `sess_${Math.random().toString(36).substr(2, 16)}`;
+}
+
+function generateOrderId(): string {
+  return `ORD-${Date.now()}-${Math.floor(Math.random() * 1000)
+    .toString()
+    .padStart(3, "0")}`;
+}
+
+function generateTransactionId(): string {
+  return `TXN${Math.random().toString(36).substr(2, 10).toUpperCase()}`;
+}
+
+function generateCustomerId(): string {
+  return `CUST${Math.floor(Math.random() * 100000)
+    .toString()
+    .padStart(5, "0")}`;
+}
+
+function generateUsername(): string {
+  const usernames = [
+    "john.smith",
+    "sarah.jones",
+    "mike.brown",
+    "emma.wilson",
+    "david.lee",
+    "admin",
+    "guest",
+    "testuser",
+  ];
+  return usernames[Math.floor(Math.random() * usernames.length)];
+}
+
+function generateEmail(): string {
+  const domains = ["example.com", "company.org", "business.co.uk", "service.net"];
+  const username = generateUsername().replace(".", "");
+  return `${username}@${domains[Math.floor(Math.random() * domains.length)]}`;
+}
+
+function generateIPAddress(): string {
+  return `${Math.floor(Math.random() * 256)}.${Math.floor(Math.random() * 256)}.${Math.floor(
+    Math.random() * 256
+  )}.${Math.floor(Math.random() * 256)}`;
+}
+
+function generateDuration(): number {
+  return Math.floor(Math.random() * 5000) + 10;
+}
+
+function generateNumber(min: number, max: number): number {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+function generatePercentage(): number {
+  return Math.floor(Math.random() * 100) + 1;
+}
+
+function generateFileSize(): string {
+  const size = Math.floor(Math.random() * 1000) + 1;
+  const units = ["KB", "MB", "GB"];
+  const unit = units[Math.floor(Math.random() * units.length)];
+  return `${size}${unit}`;
+}
+
+function generateFileName(): string {
+  const names = ["document", "report", "image", "data", "config", "backup"];
+  const extensions = [".pdf", ".xlsx", ".jpg", ".json", ".xml", ".zip"];
+  return `${names[Math.floor(Math.random() * names.length)]}${Math.floor(Math.random() * 1000)}${
+    extensions[Math.floor(Math.random() * extensions.length)]
+  }`;
+}
+
+function generatePrice(): string {
+  return (Math.random() * 1000 + 10).toFixed(2);
+}
+
+function generatePort(): number {
+  return Math.floor(Math.random() * 9000) + 1000;
+}
+
+function generateCacheKey(): string {
+  return `cache:${generateEntityName()}:${generateId()}`;
+}
+
+function generateEntityName(): string {
+  const entities = ["user", "order", "product", "payment", "session", "config", "report"];
+  return entities[Math.floor(Math.random() * entities.length)];
+}
+
+function generateAPIEndpoint(): string {
+  const versions = ["v1", "v2", "v3"];
+  const resources = ["users", "orders", "products", "payments", "reports"];
+  return `/api/${versions[Math.floor(Math.random() * versions.length)]}/${
+    resources[Math.floor(Math.random() * resources.length)]
+  }`;
+}
+
+function generateErrorMessage(): string {
+  const errors = [
+    "Connection timeout after 30 seconds",
+    "Invalid credentials provided",
+    "Resource not found",
+    "Permission denied",
+    "Service temporarily unavailable",
+    "Invalid request format",
+    "Rate limit exceeded",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateUserAgent(): string {
+  const agents = [
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36",
+    "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36",
+    "PostmanRuntime/7.29.2",
+    "curl/7.68.0",
+  ];
+  return agents[Math.floor(Math.random() * agents.length)];
+}
+
+function generateStackTrace(): string {
+  return `at ${generateMethodName()}(${generateFileName()}:${generateNumber(10, 500)})`;
+}
+
+function generateErrorCode(): string {
+  const codes = ["E001", "E404", "E500", "E403", "E401", "E503", "E400"];
+  return codes[Math.floor(Math.random() * codes.length)];
+}
+
+// Additional helper functions for specific error types
+function generatePaymentError(): string {
+  const errors = [
+    "Insufficient funds",
+    "Card expired",
+    "Invalid card number",
+    "Payment gateway timeout",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateEmailError(): string {
+  const errors = [
+    "SMTP server unavailable",
+    "Invalid email address",
+    "Message too large",
+    "Recipient blocked",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateAuthError(): string {
+  const errors = [
+    "Invalid password",
+    "Account locked",
+    "Token expired",
+    "Two-factor authentication required",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateHTTPError(): string {
+  const codes = [400, 401, 403, 404, 500, 502, 503, 504];
+  const code = codes[Math.floor(Math.random() * codes.length)];
+  return `HTTP ${code}`;
+}
+
+function generateSQLError(): string {
+  const errors = [
+    "Syntax error",
+    "Table does not exist",
+    "Duplicate key violation",
+    "Foreign key constraint",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateServiceError(): string {
+  const services = ["Redis", "Elasticsearch", "RabbitMQ", "MongoDB"];
+  return `${services[Math.floor(Math.random() * services.length)]} connection refused`;
+}
+
+function generateConfigError(): string {
+  const errors = [
+    "Missing required property",
+    "Invalid configuration format",
+    "Environment variable not set",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateValidationError(): string {
+  const errors = [
+    "Required field missing",
+    "Invalid email format",
+    "Value out of range",
+    "Invalid date format",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateCriticalError(): string {
+  const errors = [
+    "NullPointerException",
+    "OutOfMemoryError",
+    "StackOverflowError",
+    "SecurityException",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+function generateServiceName(): string {
+  const services = ["UserService", "PaymentGateway", "NotificationHub", "DatabaseCluster"];
+  return services[Math.floor(Math.random() * services.length)];
+}
+
+function generateTableName(): string {
+  const tables = ["users", "orders", "payments", "products", "sessions"];
+  return tables[Math.floor(Math.random() * tables.length)];
+}
+
+function generateFilePath(): string {
+  const paths = [
+    "/etc/app/config.yml",
+    "/var/log/app.log",
+    "/opt/app/data.json",
+    "/home/user/.env",
+  ];
+  return paths[Math.floor(Math.random() * paths.length)];
+}
+
+function generateDiskPath(): string {
+  const paths = ["/var/log", "/tmp", "/home", "/opt"];
+  return paths[Math.floor(Math.random() * paths.length)];
+}
+
+function generateMigrationName(): string {
+  return `migration_${Date.now()}_${generateEntityName()}_table`;
+}
+
+function generateReportName(): string {
+  const types = ["daily", "weekly", "monthly", "quarterly"];
+  const subjects = ["sales", "users", "performance", "security"];
+  return `${types[Math.floor(Math.random() * types.length)]}_${
+    subjects[Math.floor(Math.random() * subjects.length)]
+  }_report`;
+}
+
+function generateNamespace(): string {
+  const namespaces = ["user:sessions", "product:catalog", "order:cache", "auth:tokens"];
+  return namespaces[Math.floor(Math.random() * namespaces.length)];
+}
+
+function generateBusinessRule(): string {
+  const rules = [
+    "validate_payment_amount",
+    "check_inventory_levels",
+    "apply_discount_rules",
+    "verify_user_permissions",
+  ];
+  return rules[Math.floor(Math.random() * rules.length)];
+}
+
+function generateEmailSubject(): string {
+  const subjects = [
+    "Order Confirmation",
+    "Password Reset",
+    "Welcome to Our Service",
+    "Monthly Newsletter",
+  ];
+  return subjects[Math.floor(Math.random() * subjects.length)];
+}
+
+function generateFileError(): string {
+  const errors = [
+    "File too large",
+    "Invalid file type",
+    "Disk space insufficient",
+    "Permission denied",
+  ];
+  return errors[Math.floor(Math.random() * errors.length)];
+}
+
+// Utility function to format log message as string
+function formatLogMessage(logMessage: LogMessage): string {
+  const metadataStr = logMessage.metadata ? ` | ${JSON.stringify(logMessage.metadata)}` : "";
+
+  return `${logMessage.timestamp} [${logMessage.level}] ${logMessage.component}: ${logMessage.message}${metadataStr}`;
+}
diff --git a/references/hello-world/src/trigger/usage.ts b/references/hello-world/src/trigger/usage.ts
new file mode 100644
index 00000000000..cd5e8dca831
--- /dev/null
+++ b/references/hello-world/src/trigger/usage.ts
@@ -0,0 +1,230 @@
+import { logger, task, wait, usage, runs } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+import assert from "node:assert";
+
+export const usageExampleTask = task({
+  id: "usage-example",
+  retry: {
+    maxAttempts: 3,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 1000,
+    factor: 1.5,
+  },
+  run: async (payload: { throwError: boolean }, { ctx }) => {
+    logger.info("run.ctx", { ctx });
+
+    await setTimeout(1000);
+
+    const currentUsage = usage.getCurrent();
+
+    logger.info("currentUsage", { currentUsage });
+
+    if (payload.throwError && ctx.attempt.number === 1) {
+      throw new Error("Forced error to cause a retry");
+    }
+
+    await setTimeout(5000);
+
+    const currentUsage2 = usage.getCurrent();
+
+    logger.info("currentUsage2", { currentUsage2 });
+
+    return {
+      message: "Hello, world!",
+    };
+  },
+});
+
+/**
+ * Test task to verify usage tracking works correctly after moving updates to run engine.
+ *
+ * Tests:
+ * 1. usageDurationMs accumulates across attempts (retries)
+ * 2. costInCents is only calculated for non-dev environments
+ * 3. Usage is tracked and returned correctly
+ *
+ * Run with:
+ *   - { causeRetry: false } for simple usage test
+ *   - { causeRetry: true } for retry accumulation test
+ */
+export const usageTrackingTestTask = task({
+  id: "usage-tracking-test",
+  retry: {
+    maxAttempts: 3,
+    minTimeoutInMs: 100,
+    maxTimeoutInMs: 200,
+    factor: 1,
+  },
+  run: async (payload: { causeRetry?: boolean; workDurationMs?: number }, { ctx }) => {
+    const workDuration = payload.workDurationMs ?? 2000;
+    const isDev = ctx.environment.type === "DEVELOPMENT";
+
+    logger.info("Starting usage tracking test", {
+      attemptNumber: ctx.attempt.number,
+      environmentType: ctx.environment.type,
+      isDev,
+      workDuration,
+      causeRetry: payload.causeRetry,
+    });
+
+    // Get usage at start of this attempt
+    const usageAtStart = usage.getCurrent();
+    logger.info("Usage at attempt start", {
+      attemptNumber: ctx.attempt.number,
+      usageAtStart,
+    });
+
+    // Do some "work" to accumulate usage duration
+    const workStart = Date.now();
+    await setTimeout(workDuration);
+    const actualWorkTime = Date.now() - workStart;
+
+    // Get usage after work
+    const usageAfterWork = usage.getCurrent();
+    logger.info("Usage after work", {
+      attemptNumber: ctx.attempt.number,
+      usageAfterWork,
+      actualWorkTimeMs: actualWorkTime,
+      attemptDurationDelta:
+        usageAfterWork.compute.attempt.durationMs - usageAtStart.compute.attempt.durationMs,
+    });
+
+    // Cause a retry on first attempt if requested
+    if (payload.causeRetry && ctx.attempt.number === 1) {
+      logger.info("Throwing error to cause retry - usage from this attempt should accumulate");
+      throw new Error("Intentional error to test usage accumulation across retries");
+    }
+
+    // Log expectations for verification
+    logger.info("Usage tracking test completed", {
+      attemptNumber: ctx.attempt.number,
+      finalUsage: usageAfterWork,
+      environmentType: ctx.environment.type,
+      expectations: {
+        usageDurationMs: "Should be > 0 and reflect actual CPU time",
+        costInCents: isDev
+          ? "Should be 0 (dev environment - no cost tracking)"
+          : "Should be > 0 (calculated from usageDurationMs * machine centsPerMs)",
+        retryAccumulation: payload.causeRetry
+          ? "If this is attempt 2+, usageDurationMs should include time from previous attempts"
+          : "N/A - no retry",
+      },
+    });
+
+    return {
+      success: true,
+      attemptNumber: ctx.attempt.number,
+      environmentType: ctx.environment.type,
+      finalUsage: usageAfterWork,
+      isDev,
+      note: isDev
+        ? "costInCents will be 0 in dev - deploy to staging/prod to test cost calculation"
+        : "costInCents should reflect accumulated usage cost",
+    };
+  },
+});
+
+/**
+ * Parent task that triggers usageTrackingTestTask and verifies the usage values
+ * are correctly stored in the database via runs.retrieve().
+ *
+ * This tests the full flow:
+ * 1. Trigger child task and wait for completion
+ * 2. Use runs.retrieve() to fetch the run from the database
+ * 3. Verify usageDurationMs > 0
+ * 4. Verify costInCents behavior based on environment type
+ */
+export const usageVerificationParentTask = task({
+  id: "usage-verification-parent",
+  run: async (payload: { causeRetry?: boolean; workDurationMs?: number }, { ctx }) => {
+    const isDev = ctx.environment.type === "DEVELOPMENT";
+
+    logger.info("Starting usage verification parent task", {
+      environmentType: ctx.environment.type,
+      isDev,
+      causeRetry: payload.causeRetry,
+      workDurationMs: payload.workDurationMs,
+    });
+
+    // Trigger the child task and wait for it to complete
+    const childResult = await usageTrackingTestTask.triggerAndWait({
+      causeRetry: payload.causeRetry,
+      workDurationMs: payload.workDurationMs ?? 2000,
+    });
+
+    if (!childResult.ok) {
+      throw new Error(`Child task failed: ${JSON.stringify(childResult.error)}`);
+    }
+
+    logger.info("Child task completed", {
+      childRunId: childResult.id,
+      childOutput: childResult.output,
+    });
+
+    // Retrieve the run from the database to verify usage values were stored
+    const retrievedRun = await runs.retrieve(childResult.id);
+
+    logger.info("Retrieved run from database", {
+      runId: retrievedRun.id,
+      status: retrievedRun.status,
+      durationMs: retrievedRun.durationMs,
+      costInCents: retrievedRun.costInCents,
+      baseCostInCents: retrievedRun.baseCostInCents,
+    });
+
+    // Verify usageDurationMs (durationMs in the API response) is greater than 0
+    assert.ok(
+      retrievedRun.durationMs > 0,
+      `Expected durationMs > 0, got ${retrievedRun.durationMs}`
+    );
+
+    // For retry test, verify duration accumulated across attempts
+    if (payload.causeRetry) {
+      // With a retry, we should have at least 2x the work duration (attempt 1 + attempt 2)
+      const minExpectedDuration = (payload.workDurationMs ?? 2000) * 1.5; // Allow some variance
+      assert.ok(
+        retrievedRun.durationMs >= minExpectedDuration,
+        `Expected durationMs >= ${minExpectedDuration} for retry test (got ${retrievedRun.durationMs})`
+      );
+      logger.info("✅ Retry accumulation verified - duration includes time from both attempts");
+    }
+
+    // Verify costInCents based on environment type
+    if (isDev) {
+      // In dev, cost should be 0
+      assert.strictEqual(
+        retrievedRun.costInCents,
+        0,
+        `Expected costInCents to be 0 in dev environment, got ${retrievedRun.costInCents}`
+      );
+      logger.info("✅ Dev environment verified - costInCents is 0 as expected");
+    } else {
+      // In non-dev, cost should be > 0
+      assert.ok(
+        retrievedRun.costInCents > 0,
+        `Expected costInCents > 0 in ${ctx.environment.type} environment, got ${retrievedRun.costInCents}`
+      );
+      logger.info(
+        `✅ ${ctx.environment.type} environment verified - costInCents is ${retrievedRun.costInCents}`
+      );
+    }
+
+    logger.info("✅ All usage verification checks passed!", {
+      durationMs: retrievedRun.durationMs,
+      costInCents: retrievedRun.costInCents,
+      baseCostInCents: retrievedRun.baseCostInCents,
+      environmentType: ctx.environment.type,
+      hadRetry: payload.causeRetry,
+    });
+
+    return {
+      success: true,
+      childRunId: childResult.id,
+      durationMs: retrievedRun.durationMs,
+      costInCents: retrievedRun.costInCents,
+      baseCostInCents: retrievedRun.baseCostInCents,
+      environmentType: ctx.environment.type,
+      hadRetry: payload.causeRetry ?? false,
+    };
+  },
+});
diff --git a/references/hello-world/trigger.config.ts b/references/hello-world/trigger.config.ts
index 33935a4a132..2c3751b041f 100644
--- a/references/hello-world/trigger.config.ts
+++ b/references/hello-world/trigger.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig } from "@trigger.dev/sdk/v3";
 import { syncEnvVars } from "@trigger.dev/build/extensions/core";
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
 
 export default defineConfig({
   compatibilityFlags: ["run_engine_v2"],
@@ -8,7 +9,7 @@ export default defineConfig({
     enabled: true,
     maxExecutionsPerProcess: 20,
   },
-  logLevel: "log",
+  logLevel: "debug",
   maxDuration: 3600,
   retries: {
     enabledInDev: true,
@@ -23,8 +24,8 @@ export default defineConfig({
   machine: "small-2x",
   build: {
     extensions: [
+      lightpanda(),
       syncEnvVars(async (ctx) => {
-        console.log("syncEnvVars", { environment: ctx.environment, branch: ctx.branch });
         return [
           { name: "SYNC_ENV", value: ctx.environment },
           { name: "BRANCH", value: ctx.branch ?? "NO_BRANCH" },
diff --git a/references/issue-2687/.env.example b/references/issue-2687/.env.example
new file mode 100644
index 00000000000..bec8f7a1b8d
--- /dev/null
+++ b/references/issue-2687/.env.example
@@ -0,0 +1,3 @@
+TRIGGER_SECRET_KEY=tr_dev_...
+TRIGGER_API_URL=https://api.trigger.dev
+TRIGGER_BRANCH=
diff --git a/references/issue-2687/README.md b/references/issue-2687/README.md
new file mode 100644
index 00000000000..3f522e048b3
--- /dev/null
+++ b/references/issue-2687/README.md
@@ -0,0 +1,28 @@
+# Issue 2687 Reproduction
+
+This reference project reproduces the issue where `Realtime` returns 401 when using `createTriggerPublicToken`.
+
+## Setup
+
+1. Make sure your Trigger.dev instance is running (webapp).
+2. Copy `.env.example` to `.env` and fill in your details:
+
+```bash
+cp .env.example .env
+```
+
+3. Edit `.env` to set your `TRIGGER_SECRET_KEY` and `TRIGGER_API_URL`.
+
+## Running the reproduction
+
+Run the reproduction script:
+
+```bash
+pnpm run repro
+```
+
+## What it does
+
+1. Generates a `triggerPublicToken` for `issue-2687-task`.
+2. Triggers the task using this token.
+3. Attempts to connect to the Realtime endpoint for the resulting run using the same token.
diff --git a/references/issue-2687/package.json b/references/issue-2687/package.json
new file mode 100644
index 00000000000..53b49cb8eee
--- /dev/null
+++ b/references/issue-2687/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "references-issue-2687",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*"
+  },
+  "dependencies": {
+    "@trigger.dev/sdk": "workspace:*",
+    "dotenv": "^16.4.5",
+    "tsx": "^4.0.0"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "repro": "tsx src/repro.ts"
+  }
+}
+
diff --git a/references/issue-2687/src/repro.ts b/references/issue-2687/src/repro.ts
new file mode 100644
index 00000000000..4c2be6a840e
--- /dev/null
+++ b/references/issue-2687/src/repro.ts
@@ -0,0 +1,81 @@
+import "dotenv/config";
+import { auth, tasks, runs, configure } from "@trigger.dev/sdk/v3";
+
+const taskId = "issue-2687-task";
+
+async function main() {
+  if (!process.env.TRIGGER_SECRET_KEY) {
+    console.error("TRIGGER_SECRET_KEY is not set. Please set it to your project's secret key.");
+    process.exit(1);
+  }
+
+  const apiUrl = process.env.TRIGGER_API_URL || "https://api.trigger.dev";
+  const branch = process.env.TRIGGER_PREVIEW_BRANCH;
+  const secretKey = process.env.TRIGGER_SECRET_KEY;
+
+  console.log(`Using API URL: ${apiUrl}`);
+  console.log(`Using Secret Key: ${secretKey}`);
+  if (branch) {
+    console.log(`Using Branch: ${branch}`);
+  }
+
+  // 1. Generate the public token (Server-side)
+  // We need the secret key for this part, so we use the environment variable which the SDK picks up automatically for this call.
+  console.log("Generating public token...");
+  try {
+    // Ensure we are using the correct API URL for the generation as well, if it matters (it validates against the env).
+    configure({ baseURL: apiUrl, accessToken: secretKey, previewBranch: branch });
+
+    const token = await auth.createTriggerPublicToken(taskId);
+    console.log("Token generated.");
+
+    // 2. Trigger the task using the public token
+    console.log(`Triggering task ${taskId}...`);
+
+    // Use auth.withAuth to temporarily scope the SDK to the public token
+    await auth.withAuth(
+      { accessToken: token, baseURL: apiUrl, previewBranch: branch },
+      async () => {
+        const handle = await tasks.trigger(taskId, { foo: "bar" });
+        console.log(`Task triggered. Run ID: ${handle.id}`);
+
+        let tokenToUse = token;
+        if (handle.publicAccessToken) {
+          console.log("Received publicAccessToken in handle, using it for realtime.");
+          console.log(`Public Access Token: ${handle.publicAccessToken}`);
+          tokenToUse = handle.publicAccessToken;
+        } else {
+          console.log("Using initial token for subsequent requests.");
+        }
+
+        // 3. Access Run details (Simulating Realtime/Read access)
+        // If the token changed (which it might if the API returns a specific read-only token), we should use that.
+
+        if (tokenToUse !== token) {
+          await auth.withAuth(
+            { accessToken: tokenToUse, baseURL: apiUrl, previewBranch: branch },
+            async () => {
+              console.log(`Subscribing to run ${handle.id} with new token...`);
+              for await (const run of runs.subscribeToRun(handle.id)) {
+                console.log(`Run update received. Status: ${run.status}`);
+                break;
+              }
+            }
+          );
+        } else {
+          console.log(`Subscribing to run ${handle.id} with initial token...`);
+          for await (const run of runs.subscribeToRun(handle.id)) {
+            console.log(`Run update received. Status: ${run.status}`);
+            break;
+          }
+        }
+
+        console.log("Realtime/Read access verified.");
+      }
+    );
+  } catch (error) {
+    console.error("Error:", error);
+  }
+}
+
+main();
diff --git a/references/issue-2687/src/trigger/task.ts b/references/issue-2687/src/trigger/task.ts
new file mode 100644
index 00000000000..990a1b46b2a
--- /dev/null
+++ b/references/issue-2687/src/trigger/task.ts
@@ -0,0 +1,9 @@
+import { task } from "@trigger.dev/sdk/v3";
+
+export const myTask = task({
+  id: "issue-2687-task",
+  run: async (payload: any) => {
+    console.log("Task running with payload:", payload);
+    return { message: "Hello World" };
+  },
+});
diff --git a/references/issue-2687/trigger.config.ts b/references/issue-2687/trigger.config.ts
new file mode 100644
index 00000000000..0a3d35cb36b
--- /dev/null
+++ b/references/issue-2687/trigger.config.ts
@@ -0,0 +1,17 @@
+import { defineConfig } from "@trigger.dev/sdk/v3";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "log",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+});
diff --git a/references/nextjs-realtime/.eslintrc.json b/references/nextjs-realtime/.eslintrc.json
new file mode 100644
index 00000000000..6b10a5b7392
--- /dev/null
+++ b/references/nextjs-realtime/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "next/core-web-vitals",
+    "next/typescript"
+  ]
+}
diff --git a/references/nextjs-realtime/package.json b/references/nextjs-realtime/package.json
index 9e9edd34a16..4c2736a020f 100644
--- a/references/nextjs-realtime/package.json
+++ b/references/nextjs-realtime/package.json
@@ -37,7 +37,7 @@
     "tailwind-merge": "^2.5.3",
     "tailwindcss-animate": "^1.0.7",
     "uploadthing": "^7.1.0",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@next/bundle-analyzer": "^15.0.2",
diff --git a/references/prisma-6-client/.env.example b/references/prisma-6-client/.env.example
new file mode 100644
index 00000000000..6e4ca028ec3
--- /dev/null
+++ b/references/prisma-6-client/.env.example
@@ -0,0 +1,12 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/references-prisma-6-client?schema=public
+DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/references-prisma-6-client?schema=public
+
+# Trigger.dev env vars, see our guide on API Keys here: https://trigger.dev/docs/apikeys
+TRIGGER_PROJECT_REF="<TRIGGER_PROJECT_REF>"
+
diff --git a/references/prisma-6-client/.gitignore b/references/prisma-6-client/.gitignore
new file mode 100644
index 00000000000..e251c562387
--- /dev/null
+++ b/references/prisma-6-client/.gitignore
@@ -0,0 +1 @@
+/src/generated/prisma
\ No newline at end of file
diff --git a/references/prisma-6-client/package.json b/references/prisma-6-client/package.json
new file mode 100644
index 00000000000..98cccc59edb
--- /dev/null
+++ b/references/prisma-6-client/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "references-prisma-6-client",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*",
+    "prisma": "6.16.0"
+  },
+  "dependencies": {
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "@prisma/client": "6.16.0",
+    "@prisma/adapter-pg": "6.16.0"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "prisma:generate": "prisma generate"
+  }
+}
\ No newline at end of file
diff --git a/references/prisma-6-client/prisma/migrations/20251114141701_add_initial_migration/migration.sql b/references/prisma-6-client/prisma/migrations/20251114141701_add_initial_migration/migration.sql
new file mode 100644
index 00000000000..b4933152496
--- /dev/null
+++ b/references/prisma-6-client/prisma/migrations/20251114141701_add_initial_migration/migration.sql
@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "public"."User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "avatarUrl" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "public"."User"("email");
diff --git a/references/prisma-6-client/prisma/migrations/20251114143739_add_product_model/migration.sql b/references/prisma-6-client/prisma/migrations/20251114143739_add_product_model/migration.sql
new file mode 100644
index 00000000000..35f0cc2a134
--- /dev/null
+++ b/references/prisma-6-client/prisma/migrations/20251114143739_add_product_model/migration.sql
@@ -0,0 +1,10 @@
+-- CreateTable
+CREATE TABLE "public"."Product" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "price" INTEGER NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Product_pkey" PRIMARY KEY ("id")
+);
diff --git a/references/prisma-6-client/prisma/migrations/migration_lock.toml b/references/prisma-6-client/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000000..044d57cdb0d
--- /dev/null
+++ b/references/prisma-6-client/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/references/prisma-6-client/prisma/schema.prisma b/references/prisma-6-client/prisma/schema.prisma
new file mode 100644
index 00000000000..86805822c90
--- /dev/null
+++ b/references/prisma-6-client/prisma/schema.prisma
@@ -0,0 +1,36 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
+// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
+
+generator client {
+  provider        = "prisma-client"
+  output          = "../src/generated/prisma"
+  engineType      = "client"
+  previewFeatures = ["views"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  avatarUrl String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+
+model Product {
+  id        Int      @id @default(autoincrement())
+  name      String
+  price     Int
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
diff --git a/references/prisma-6-client/src/db.ts b/references/prisma-6-client/src/db.ts
new file mode 100644
index 00000000000..86d879afb81
--- /dev/null
+++ b/references/prisma-6-client/src/db.ts
@@ -0,0 +1,8 @@
+import { PrismaClient } from "./generated/prisma/client.js";
+import { PrismaPg } from "@prisma/adapter-pg";
+
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL!,
+});
+
+export const db = new PrismaClient({ adapter });
diff --git a/references/prisma-6-client/src/trigger/tasks.ts b/references/prisma-6-client/src/trigger/tasks.ts
new file mode 100644
index 00000000000..df93d70f77a
--- /dev/null
+++ b/references/prisma-6-client/src/trigger/tasks.ts
@@ -0,0 +1,12 @@
+import { AbortTaskRunError, task } from "@trigger.dev/sdk";
+import { db } from "../db.js";
+
+export const createUserTask = task({
+  id: "create-user",
+  run: async (payload: { email: string; name: string; avatarUrl: string }) => {
+    const user = await db.user.create({
+      data: payload,
+    });
+    return user;
+  },
+});
diff --git a/references/prisma-6-client/trigger.config.ts b/references/prisma-6-client/trigger.config.ts
new file mode 100644
index 00000000000..85bbb265044
--- /dev/null
+++ b/references/prisma-6-client/trigger.config.ts
@@ -0,0 +1,26 @@
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-1x",
+  build: {
+    extensions: [
+      prismaExtension({
+        mode: "modern",
+      }),
+    ],
+  },
+});
diff --git a/references/prisma-6-client/tsconfig.json b/references/prisma-6-client/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/prisma-6-client/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/prisma-6-config/.env.example b/references/prisma-6-config/.env.example
new file mode 100644
index 00000000000..a7011cc439b
--- /dev/null
+++ b/references/prisma-6-config/.env.example
@@ -0,0 +1,12 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/references-prisma-6-output?schema=public
+DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/references-prisma-6-output?schema=public
+
+# Trigger.dev env vars, see our guide on API Keys here: https://trigger.dev/docs/apikeys
+TRIGGER_PROJECT_REF="<TRIGGER_PROJECT_REF>"
+
diff --git a/references/prisma-6-config/.gitignore b/references/prisma-6-config/.gitignore
new file mode 100644
index 00000000000..e251c562387
--- /dev/null
+++ b/references/prisma-6-config/.gitignore
@@ -0,0 +1 @@
+/src/generated/prisma
\ No newline at end of file
diff --git a/references/prisma-6-config/package.json b/references/prisma-6-config/package.json
new file mode 100644
index 00000000000..a8e15a4b10c
--- /dev/null
+++ b/references/prisma-6-config/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "references-prisma-6-config",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*",
+    "prisma": "6.19.0"
+  },
+  "dependencies": {
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "@prisma/client": "6.19.0"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "prisma:generate": "prisma generate"
+  }
+}
\ No newline at end of file
diff --git a/references/prisma-6-config/prisma.config.ts b/references/prisma-6-config/prisma.config.ts
new file mode 100644
index 00000000000..8e4e6fd806a
--- /dev/null
+++ b/references/prisma-6-config/prisma.config.ts
@@ -0,0 +1,13 @@
+import { defineConfig, env } from "prisma/config";
+import "dotenv/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+    directUrl: env("DATABASE_URL_UNPOOLED"),
+  },
+});
diff --git a/references/prisma-6-config/prisma/migrations/20251117171313_add_initial_migration/migration.sql b/references/prisma-6-config/prisma/migrations/20251117171313_add_initial_migration/migration.sql
new file mode 100644
index 00000000000..f8f03ea8858
--- /dev/null
+++ b/references/prisma-6-config/prisma/migrations/20251117171313_add_initial_migration/migration.sql
@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "avatarUrl" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
diff --git a/references/prisma-6-config/prisma/migrations/migration_lock.toml b/references/prisma-6-config/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000000..044d57cdb0d
--- /dev/null
+++ b/references/prisma-6-config/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/references/prisma-6-config/prisma/schema.prisma b/references/prisma-6-config/prisma/schema.prisma
new file mode 100644
index 00000000000..7b29b000295
--- /dev/null
+++ b/references/prisma-6-config/prisma/schema.prisma
@@ -0,0 +1,27 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
+// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
+
+generator client {
+  provider      = "prisma-client-js"
+  output        = "../src/generated/prisma"
+  binaryTargets = ["native", "linux-arm64-openssl-3.0.x", "debian-openssl-3.0.x"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  avatarUrl String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
diff --git a/references/prisma-6-config/src/db.ts b/references/prisma-6-config/src/db.ts
new file mode 100644
index 00000000000..388ebf3e2cc
--- /dev/null
+++ b/references/prisma-6-config/src/db.ts
@@ -0,0 +1,9 @@
+import { PrismaClient } from "./generated/prisma/client.js";
+
+export const db = new PrismaClient({
+  datasources: {
+    db: {
+      url: process.env.DATABASE_URL,
+    },
+  },
+});
diff --git a/references/prisma-6-config/src/trigger/tasks.ts b/references/prisma-6-config/src/trigger/tasks.ts
new file mode 100644
index 00000000000..ed656c01bda
--- /dev/null
+++ b/references/prisma-6-config/src/trigger/tasks.ts
@@ -0,0 +1,22 @@
+import { AbortTaskRunError, task } from "@trigger.dev/sdk";
+import { db } from "../db.js";
+
+export const createUserTask = task({
+  id: "create-user",
+  run: async (payload: { email: string; name: string; avatarUrl: string }) => {
+    const existingUser = await db.user.findUnique({
+      where: {
+        email: payload.email,
+      },
+    });
+
+    if (existingUser) {
+      throw new AbortTaskRunError("User already exists");
+    }
+
+    const user = await db.user.create({
+      data: payload,
+    });
+    return user;
+  },
+});
diff --git a/references/prisma-6-config/trigger.config.ts b/references/prisma-6-config/trigger.config.ts
new file mode 100644
index 00000000000..bfbf2aa323f
--- /dev/null
+++ b/references/prisma-6-config/trigger.config.ts
@@ -0,0 +1,29 @@
+import { defineConfig } from "@trigger.dev/sdk";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-1x",
+  build: {
+    extensions: [
+      prismaExtension({
+        mode: "legacy",
+        configFile: "./prisma.config.ts",
+        directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+        migrate: true,
+      }),
+    ],
+  },
+});
diff --git a/references/prisma-6-config/tsconfig.json b/references/prisma-6-config/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/prisma-6-config/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/prisma-6-multi-file/.env.example b/references/prisma-6-multi-file/.env.example
new file mode 100644
index 00000000000..7e8fc31772a
--- /dev/null
+++ b/references/prisma-6-multi-file/.env.example
@@ -0,0 +1,12 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/references-prisma-6-multi-file?schema=public
+DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/references-prisma-6-multi-file?schema=public
+
+# Trigger.dev env vars, see our guide on API Keys here: https://trigger.dev/docs/apikeys
+TRIGGER_PROJECT_REF="<TRIGGER_PROJECT_REF>"
+
diff --git a/references/prisma-6-multi-file/package.json b/references/prisma-6-multi-file/package.json
new file mode 100644
index 00000000000..01e760200bb
--- /dev/null
+++ b/references/prisma-6-multi-file/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "references-prisma-6-multi-file",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*",
+    "prisma": "6.14.0"
+  },
+  "dependencies": {
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "@prisma/client": "6.14.0"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "prisma:generate": "prisma generate --sql"
+  },
+  "prisma": {
+    "schema": "./prisma"
+  }
+}
\ No newline at end of file
diff --git a/references/prisma-6-multi-file/prisma/migrations/20251113161257_add_initial_migration/migration.sql b/references/prisma-6-multi-file/prisma/migrations/20251113161257_add_initial_migration/migration.sql
new file mode 100644
index 00000000000..04378290f00
--- /dev/null
+++ b/references/prisma-6-multi-file/prisma/migrations/20251113161257_add_initial_migration/migration.sql
@@ -0,0 +1,29 @@
+-- CreateTable
+CREATE TABLE "public"."Post" (
+    "id" TEXT NOT NULL,
+    "title" TEXT NOT NULL,
+    "content" TEXT NOT NULL,
+    "authorId" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Post_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "public"."User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "avatarUrl" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "public"."User"("email");
+
+-- AddForeignKey
+ALTER TABLE "public"."Post" ADD CONSTRAINT "Post_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "public"."User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/references/prisma-6-multi-file/prisma/migrations/migration_lock.toml b/references/prisma-6-multi-file/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000000..044d57cdb0d
--- /dev/null
+++ b/references/prisma-6-multi-file/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/references/prisma-6-multi-file/prisma/models/posts.prisma b/references/prisma-6-multi-file/prisma/models/posts.prisma
new file mode 100644
index 00000000000..dfb0df9cebf
--- /dev/null
+++ b/references/prisma-6-multi-file/prisma/models/posts.prisma
@@ -0,0 +1,9 @@
+model Post {
+  id        String   @id @default(cuid())
+  title     String
+  content   String
+  authorId  String
+  author    User     @relation(fields: [authorId], references: [id])
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
diff --git a/references/prisma-6-multi-file/prisma/models/users.prisma b/references/prisma-6-multi-file/prisma/models/users.prisma
new file mode 100644
index 00000000000..ed1c18a2054
--- /dev/null
+++ b/references/prisma-6-multi-file/prisma/models/users.prisma
@@ -0,0 +1,11 @@
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  avatarUrl String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  posts Post[]
+}
diff --git a/references/v3-catalog/prisma/schema/schema.prisma b/references/prisma-6-multi-file/prisma/schema.prisma
similarity index 69%
rename from references/v3-catalog/prisma/schema/schema.prisma
rename to references/prisma-6-multi-file/prisma/schema.prisma
index 0834802c1f4..11ef81665f3 100644
--- a/references/v3-catalog/prisma/schema/schema.prisma
+++ b/references/prisma-6-multi-file/prisma/schema.prisma
@@ -6,7 +6,7 @@
 
 generator client {
   provider        = "prisma-client-js"
-  previewFeatures = ["prismaSchemaFolder", "typedSql"]
+  previewFeatures = ["typedSql"]
 }
 
 datasource db {
@@ -14,10 +14,3 @@ datasource db {
   url       = env("DATABASE_URL")
   directUrl = env("DATABASE_URL_UNPOOLED")
 }
-
-generator kysely {
-  provider     = "prisma-kysely"
-  output       = "../../src/kysely"
-  enumFileName = "enums.ts"
-  fileName     = "types.ts"
-}
diff --git a/references/prisma-6-multi-file/prisma/sql/getUserByEmail.sql b/references/prisma-6-multi-file/prisma/sql/getUserByEmail.sql
new file mode 100644
index 00000000000..579143f33c1
--- /dev/null
+++ b/references/prisma-6-multi-file/prisma/sql/getUserByEmail.sql
@@ -0,0 +1,3 @@
+SELECT u.id, u.name
+FROM "User" u
+WHERE u.email = $1
\ No newline at end of file
diff --git a/references/prisma-6-multi-file/src/db.ts b/references/prisma-6-multi-file/src/db.ts
new file mode 100644
index 00000000000..88a4c0f17be
--- /dev/null
+++ b/references/prisma-6-multi-file/src/db.ts
@@ -0,0 +1,10 @@
+import { PrismaClient } from "@prisma/client";
+export * as sql from "@prisma/client/sql";
+
+export const db = new PrismaClient({
+  datasources: {
+    db: {
+      url: process.env.DATABASE_URL,
+    },
+  },
+});
diff --git a/references/prisma-6-multi-file/src/trigger/tasks.ts b/references/prisma-6-multi-file/src/trigger/tasks.ts
new file mode 100644
index 00000000000..018cec35a15
--- /dev/null
+++ b/references/prisma-6-multi-file/src/trigger/tasks.ts
@@ -0,0 +1,18 @@
+import { AbortTaskRunError, task } from "@trigger.dev/sdk";
+import { db, sql } from "../db.js";
+
+export const createUserTask = task({
+  id: "create-user",
+  run: async (payload: { email: string; name: string; avatarUrl: string }) => {
+    const existingUser = await db.$queryRawTyped(sql.getUserByEmail(payload.email));
+
+    if (existingUser.length > 0) {
+      throw new AbortTaskRunError("User already exists");
+    }
+
+    const user = await db.user.create({
+      data: payload,
+    });
+    return user;
+  },
+});
diff --git a/references/prisma-6-multi-file/trigger.config.ts b/references/prisma-6-multi-file/trigger.config.ts
new file mode 100644
index 00000000000..5bcbc2f48bd
--- /dev/null
+++ b/references/prisma-6-multi-file/trigger.config.ts
@@ -0,0 +1,30 @@
+import { defineConfig } from "@trigger.dev/sdk";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-1x",
+  build: {
+    extensions: [
+      prismaExtension({
+        mode: "legacy",
+        schema: "./prisma",
+        directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+        migrate: true,
+        typedSql: true,
+      }),
+    ],
+  },
+});
diff --git a/references/prisma-6-multi-file/tsconfig.json b/references/prisma-6-multi-file/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/prisma-6-multi-file/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/prisma-6-output/.env.example b/references/prisma-6-output/.env.example
new file mode 100644
index 00000000000..a7011cc439b
--- /dev/null
+++ b/references/prisma-6-output/.env.example
@@ -0,0 +1,12 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/references-prisma-6-output?schema=public
+DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/references-prisma-6-output?schema=public
+
+# Trigger.dev env vars, see our guide on API Keys here: https://trigger.dev/docs/apikeys
+TRIGGER_PROJECT_REF="<TRIGGER_PROJECT_REF>"
+
diff --git a/references/prisma-6-output/.gitignore b/references/prisma-6-output/.gitignore
new file mode 100644
index 00000000000..e251c562387
--- /dev/null
+++ b/references/prisma-6-output/.gitignore
@@ -0,0 +1 @@
+/src/generated/prisma
\ No newline at end of file
diff --git a/references/prisma-6-output/package.json b/references/prisma-6-output/package.json
new file mode 100644
index 00000000000..fd94cba7a5a
--- /dev/null
+++ b/references/prisma-6-output/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "references-prisma-6-output",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*",
+    "prisma": "6.19.0"
+  },
+  "dependencies": {
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "@prisma/client": "6.19.0"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "prisma:generate": "prisma generate --sql"
+  }
+}
\ No newline at end of file
diff --git a/references/prisma-6-output/prisma/migrations/20251113213202_add_initial_migration/migration.sql b/references/prisma-6-output/prisma/migrations/20251113213202_add_initial_migration/migration.sql
new file mode 100644
index 00000000000..b4933152496
--- /dev/null
+++ b/references/prisma-6-output/prisma/migrations/20251113213202_add_initial_migration/migration.sql
@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "public"."User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "avatarUrl" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "public"."User"("email");
diff --git a/references/prisma-6-output/prisma/migrations/migration_lock.toml b/references/prisma-6-output/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000000..044d57cdb0d
--- /dev/null
+++ b/references/prisma-6-output/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/references/prisma-6-output/prisma/schema.prisma b/references/prisma-6-output/prisma/schema.prisma
new file mode 100644
index 00000000000..abbff158c1d
--- /dev/null
+++ b/references/prisma-6-output/prisma/schema.prisma
@@ -0,0 +1,28 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
+// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
+
+generator client {
+  provider        = "prisma-client-js"
+  output          = "../src/generated/prisma"
+  previewFeatures = ["typedSql"]
+  binaryTargets   = ["native", "linux-arm64-openssl-3.0.x"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  avatarUrl String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
diff --git a/references/prisma-6-output/prisma/sql/getUserByEmail.sql b/references/prisma-6-output/prisma/sql/getUserByEmail.sql
new file mode 100644
index 00000000000..579143f33c1
--- /dev/null
+++ b/references/prisma-6-output/prisma/sql/getUserByEmail.sql
@@ -0,0 +1,3 @@
+SELECT u.id, u.name
+FROM "User" u
+WHERE u.email = $1
\ No newline at end of file
diff --git a/references/prisma-6-output/src/db.ts b/references/prisma-6-output/src/db.ts
new file mode 100644
index 00000000000..3fa57fb5cf5
--- /dev/null
+++ b/references/prisma-6-output/src/db.ts
@@ -0,0 +1,10 @@
+import { PrismaClient } from "./generated/prisma/client.js";
+export * as sql from "./generated/prisma/sql/index.js";
+
+export const db = new PrismaClient({
+  datasources: {
+    db: {
+      url: process.env.DATABASE_URL,
+    },
+  },
+});
diff --git a/references/prisma-6-output/src/trigger/tasks.ts b/references/prisma-6-output/src/trigger/tasks.ts
new file mode 100644
index 00000000000..018cec35a15
--- /dev/null
+++ b/references/prisma-6-output/src/trigger/tasks.ts
@@ -0,0 +1,18 @@
+import { AbortTaskRunError, task } from "@trigger.dev/sdk";
+import { db, sql } from "../db.js";
+
+export const createUserTask = task({
+  id: "create-user",
+  run: async (payload: { email: string; name: string; avatarUrl: string }) => {
+    const existingUser = await db.$queryRawTyped(sql.getUserByEmail(payload.email));
+
+    if (existingUser.length > 0) {
+      throw new AbortTaskRunError("User already exists");
+    }
+
+    const user = await db.user.create({
+      data: payload,
+    });
+    return user;
+  },
+});
diff --git a/references/prisma-6-output/trigger.config.ts b/references/prisma-6-output/trigger.config.ts
new file mode 100644
index 00000000000..1f73c6be934
--- /dev/null
+++ b/references/prisma-6-output/trigger.config.ts
@@ -0,0 +1,28 @@
+import { defineConfig } from "@trigger.dev/sdk";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-1x",
+  build: {
+    extensions: [
+      prismaExtension({
+        mode: "engine-only",
+        version: "6.19.0",
+        binaryTarget: "linux-arm64-openssl-3.0.x",
+      }),
+    ],
+  },
+});
diff --git a/references/prisma-6-output/tsconfig.json b/references/prisma-6-output/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/prisma-6-output/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/prisma-6/.env.example b/references/prisma-6/.env.example
new file mode 100644
index 00000000000..0accda31a81
--- /dev/null
+++ b/references/prisma-6/.env.example
@@ -0,0 +1,12 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/references-prisma-6?schema=public
+DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/references-prisma-6?schema=public
+
+# Trigger.dev env vars, see our guide on API Keys here: https://trigger.dev/docs/apikeys
+TRIGGER_PROJECT_REF="<TRIGGER_PROJECT_REF>"
+
diff --git a/references/prisma-6/package.json b/references/prisma-6/package.json
new file mode 100644
index 00000000000..2e272859d11
--- /dev/null
+++ b/references/prisma-6/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "references-prisma-6",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "prisma": "6.14.0",
+    "prisma-generator-ts-enums": "^1.1.0",
+    "trigger.dev": "workspace:*"
+  },
+  "dependencies": {
+    "@prisma/client": "6.14.0",
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "prisma:generate": "prisma generate --sql"
+  }
+}
\ No newline at end of file
diff --git a/references/prisma-6/prisma/migrations/20251113155334_add_initial_migration/migration.sql b/references/prisma-6/prisma/migrations/20251113155334_add_initial_migration/migration.sql
new file mode 100644
index 00000000000..b4933152496
--- /dev/null
+++ b/references/prisma-6/prisma/migrations/20251113155334_add_initial_migration/migration.sql
@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "public"."User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "avatarUrl" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "public"."User"("email");
diff --git a/references/prisma-6/prisma/migrations/20251121153959_add_user_role/migration.sql b/references/prisma-6/prisma/migrations/20251121153959_add_user_role/migration.sql
new file mode 100644
index 00000000000..09f6b793718
--- /dev/null
+++ b/references/prisma-6/prisma/migrations/20251121153959_add_user_role/migration.sql
@@ -0,0 +1,5 @@
+-- CreateEnum
+CREATE TYPE "public"."UserRole" AS ENUM ('ADMIN', 'USER');
+
+-- AlterTable
+ALTER TABLE "public"."User" ADD COLUMN     "role" "public"."UserRole" NOT NULL DEFAULT 'USER';
diff --git a/references/prisma-6/prisma/migrations/migration_lock.toml b/references/prisma-6/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000000..044d57cdb0d
--- /dev/null
+++ b/references/prisma-6/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/references/prisma-6/prisma/schema.prisma b/references/prisma-6/prisma/schema.prisma
new file mode 100644
index 00000000000..4999af52c15
--- /dev/null
+++ b/references/prisma-6/prisma/schema.prisma
@@ -0,0 +1,38 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
+// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
+
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["typedSql"]
+}
+
+datasource db {
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
+  directUrl = env("DATABASE_URL_UNPOOLED")
+}
+
+generator enum {
+  provider = "node node_modules/prisma-generator-ts-enums" // specify the path to this generator here
+  output   = "../src/types/enums.ts" // optionally, you can specify an output filename here -- default is ./types/enums.d.ts
+}
+
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  avatarUrl String?
+
+  role UserRole @default(USER)
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
+
+enum UserRole {
+  ADMIN
+  USER
+}
diff --git a/references/prisma-6/prisma/sql/getUserByEmail.sql b/references/prisma-6/prisma/sql/getUserByEmail.sql
new file mode 100644
index 00000000000..579143f33c1
--- /dev/null
+++ b/references/prisma-6/prisma/sql/getUserByEmail.sql
@@ -0,0 +1,3 @@
+SELECT u.id, u.name
+FROM "User" u
+WHERE u.email = $1
\ No newline at end of file
diff --git a/references/prisma-6/src/db.ts b/references/prisma-6/src/db.ts
new file mode 100644
index 00000000000..88a4c0f17be
--- /dev/null
+++ b/references/prisma-6/src/db.ts
@@ -0,0 +1,10 @@
+import { PrismaClient } from "@prisma/client";
+export * as sql from "@prisma/client/sql";
+
+export const db = new PrismaClient({
+  datasources: {
+    db: {
+      url: process.env.DATABASE_URL,
+    },
+  },
+});
diff --git a/references/prisma-6/src/trigger/tasks.ts b/references/prisma-6/src/trigger/tasks.ts
new file mode 100644
index 00000000000..018cec35a15
--- /dev/null
+++ b/references/prisma-6/src/trigger/tasks.ts
@@ -0,0 +1,18 @@
+import { AbortTaskRunError, task } from "@trigger.dev/sdk";
+import { db, sql } from "../db.js";
+
+export const createUserTask = task({
+  id: "create-user",
+  run: async (payload: { email: string; name: string; avatarUrl: string }) => {
+    const existingUser = await db.$queryRawTyped(sql.getUserByEmail(payload.email));
+
+    if (existingUser.length > 0) {
+      throw new AbortTaskRunError("User already exists");
+    }
+
+    const user = await db.user.create({
+      data: payload,
+    });
+    return user;
+  },
+});
diff --git a/references/prisma-6/src/types/enums.ts b/references/prisma-6/src/types/enums.ts
new file mode 100644
index 00000000000..dfac04536bc
--- /dev/null
+++ b/references/prisma-6/src/types/enums.ts
@@ -0,0 +1,4 @@
+export enum UserRole {
+  ADMIN = 'ADMIN',
+  USER = 'USER',
+}
diff --git a/references/prisma-6/trigger.config.ts b/references/prisma-6/trigger.config.ts
new file mode 100644
index 00000000000..a9255abf575
--- /dev/null
+++ b/references/prisma-6/trigger.config.ts
@@ -0,0 +1,34 @@
+import { defineConfig } from "@trigger.dev/sdk";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+import { additionalPackages } from "@trigger.dev/build/extensions/core";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-1x",
+  build: {
+    extensions: [
+      additionalPackages({
+        packages: ["prisma-generator-ts-enums@1.1.0"],
+      }),
+      prismaExtension({
+        mode: "legacy",
+        schema: "prisma/schema.prisma",
+        migrate: true,
+        typedSql: true,
+        directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
+      }),
+    ],
+  },
+});
diff --git a/references/prisma-6/tsconfig.json b/references/prisma-6/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/prisma-6/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/prisma-7/.env.example b/references/prisma-7/.env.example
new file mode 100644
index 00000000000..a3195b263a5
--- /dev/null
+++ b/references/prisma-7/.env.example
@@ -0,0 +1,12 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/references-prisma-7?schema=public
+DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/references-prisma-7?schema=public
+
+# Trigger.dev env vars, see our guide on API Keys here: https://trigger.dev/docs/apikeys
+TRIGGER_PROJECT_REF="<TRIGGER_PROJECT_REF>"
+
diff --git a/references/prisma-7/.gitignore b/references/prisma-7/.gitignore
new file mode 100644
index 00000000000..126419ded64
--- /dev/null
+++ b/references/prisma-7/.gitignore
@@ -0,0 +1,5 @@
+node_modules
+# Keep environment variables out of version control
+.env
+
+/src/generated/prisma
diff --git a/references/prisma-7/.nvmrc b/references/prisma-7/.nvmrc
new file mode 100644
index 00000000000..76be14da5c4
--- /dev/null
+++ b/references/prisma-7/.nvmrc
@@ -0,0 +1 @@
+20.20.0
\ No newline at end of file
diff --git a/references/prisma-7/package.json b/references/prisma-7/package.json
new file mode 100644
index 00000000000..2fff27d9979
--- /dev/null
+++ b/references/prisma-7/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "references-prisma-7",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "prisma": "6.20.0-integration-next.8",
+    "trigger.dev": "workspace:*"
+  },
+  "dependencies": {
+    "@prisma/client": "6.20.0-integration-next.8",
+    "@prisma/adapter-pg": "6.20.0-integration-next.8",
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "dotenv": "^17.2.3"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy",
+    "prisma:generate": "prisma generate"
+  }
+}
\ No newline at end of file
diff --git a/references/prisma-7/prisma.config.ts b/references/prisma-7/prisma.config.ts
new file mode 100644
index 00000000000..fa89f0f3c2d
--- /dev/null
+++ b/references/prisma-7/prisma.config.ts
@@ -0,0 +1,12 @@
+import { defineConfig, env } from "prisma/config";
+import "dotenv/config";
+
+export default defineConfig({
+  schema: "prisma/schema.prisma",
+  migrations: {
+    path: "prisma/migrations",
+  },
+  datasource: {
+    url: env("DATABASE_URL"),
+  },
+});
diff --git a/references/prisma-7/prisma/migrations/20251113162106_add_initial_migration/migration.sql b/references/prisma-7/prisma/migrations/20251113162106_add_initial_migration/migration.sql
new file mode 100644
index 00000000000..f8f03ea8858
--- /dev/null
+++ b/references/prisma-7/prisma/migrations/20251113162106_add_initial_migration/migration.sql
@@ -0,0 +1,14 @@
+-- CreateTable
+CREATE TABLE "User" (
+    "id" TEXT NOT NULL,
+    "email" TEXT NOT NULL,
+    "name" TEXT,
+    "avatarUrl" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
diff --git a/references/prisma-7/prisma/migrations/migration_lock.toml b/references/prisma-7/prisma/migrations/migration_lock.toml
new file mode 100644
index 00000000000..044d57cdb0d
--- /dev/null
+++ b/references/prisma-7/prisma/migrations/migration_lock.toml
@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"
diff --git a/references/prisma-7/prisma/schema.prisma b/references/prisma-7/prisma/schema.prisma
new file mode 100644
index 00000000000..c47a551bd4f
--- /dev/null
+++ b/references/prisma-7/prisma/schema.prisma
@@ -0,0 +1,24 @@
+// This is your Prisma schema file,
+// learn more about it in the docs: https://pris.ly/d/prisma-schema
+
+// Looking for ways to speed up your queries, or scale easily with your serverless or edge functions?
+// Try Prisma Accelerate: https://pris.ly/cli/accelerate-init
+
+generator client {
+  provider = "prisma-client"
+  output   = "../src/generated/prisma"
+}
+
+datasource db {
+  provider = "postgresql"
+}
+
+model User {
+  id        String  @id @default(cuid())
+  email     String  @unique
+  name      String?
+  avatarUrl String?
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}
diff --git a/references/prisma-7/src/db.ts b/references/prisma-7/src/db.ts
new file mode 100644
index 00000000000..86d879afb81
--- /dev/null
+++ b/references/prisma-7/src/db.ts
@@ -0,0 +1,8 @@
+import { PrismaClient } from "./generated/prisma/client.js";
+import { PrismaPg } from "@prisma/adapter-pg";
+
+const adapter = new PrismaPg({
+  connectionString: process.env.DATABASE_URL!,
+});
+
+export const db = new PrismaClient({ adapter });
diff --git a/references/prisma-7/src/trigger/tasks.ts b/references/prisma-7/src/trigger/tasks.ts
new file mode 100644
index 00000000000..b52b70f0ddb
--- /dev/null
+++ b/references/prisma-7/src/trigger/tasks.ts
@@ -0,0 +1,12 @@
+import { task } from "@trigger.dev/sdk";
+import { db } from "../db.js";
+
+export const createUserTask = task({
+  id: "create-user",
+  run: async (payload: { email: string; name: string; avatarUrl: string }) => {
+    const user = await db.user.create({
+      data: payload,
+    });
+    return user;
+  },
+});
diff --git a/references/prisma-7/trigger.config.ts b/references/prisma-7/trigger.config.ts
new file mode 100644
index 00000000000..85bbb265044
--- /dev/null
+++ b/references/prisma-7/trigger.config.ts
@@ -0,0 +1,26 @@
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-1x",
+  build: {
+    extensions: [
+      prismaExtension({
+        mode: "modern",
+      }),
+    ],
+  },
+});
diff --git a/references/prisma-7/tsconfig.json b/references/prisma-7/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/prisma-7/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/python-catalog/package.json b/references/python-catalog/package.json
index 171a1e3ea42..1c4f5859262 100644
--- a/references/python-catalog/package.json
+++ b/references/python-catalog/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@trigger.dev/sdk": "workspace:*",
     "@trigger.dev/python": "workspace:*",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@trigger.dev/build": "workspace:*",
diff --git a/references/realtime-hooks-test/.eslintrc.json b/references/realtime-hooks-test/.eslintrc.json
new file mode 100644
index 00000000000..f18272b83b2
--- /dev/null
+++ b/references/realtime-hooks-test/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+  "extends": "next/core-web-vitals"
+}
+
diff --git a/references/realtime-hooks-test/.gitignore b/references/realtime-hooks-test/.gitignore
new file mode 100644
index 00000000000..db870b36d38
--- /dev/null
+++ b/references/realtime-hooks-test/.gitignore
@@ -0,0 +1,41 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env*.local
+.env
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+# Trigger.dev
+.trigger
+
diff --git a/references/realtime-hooks-test/README.md b/references/realtime-hooks-test/README.md
new file mode 100644
index 00000000000..2f57eee6c8c
--- /dev/null
+++ b/references/realtime-hooks-test/README.md
@@ -0,0 +1,109 @@
+# Realtime Hooks Test Reference Project
+
+This is a comprehensive testing reference project for the `@trigger.dev/react-hooks` package. It demonstrates all the realtime hooks available in `useRealtime.ts`.
+
+## Hooks Tested
+
+This project includes examples for:
+
+- ✅ `useRealtimeRun` - Subscribe to a single task run
+- ✅ `useRealtimeRunWithStreams` - Subscribe to a run with stream data
+- ✅ `useRealtimeRunsWithTag` - Subscribe to multiple runs by tag
+- ✅ `useRealtimeBatch` - Subscribe to a batch of runs
+- ✅ `useRealtimeStream` - Subscribe to a specific stream
+
+## Getting Started
+
+### 1. Install dependencies
+
+From the repository root:
+
+```bash
+pnpm install
+```
+
+### 2. Set up environment variables
+
+Create a `.env.local` file:
+
+```bash
+TRIGGER_SECRET_KEY=your_secret_key
+TRIGGER_PROJECT_REF=your_project_ref
+NEXT_PUBLIC_TRIGGER_PUBLIC_KEY=your_public_key
+NEXT_PUBLIC_TRIGGER_API_URL=http://localhost:3030
+```
+
+### 3. Run the development servers
+
+In one terminal, run the Trigger.dev dev server:
+
+```bash
+pnpm run dev:trigger
+```
+
+In another terminal, run the Next.js dev server:
+
+```bash
+pnpm run dev
+```
+
+### 4. Open the app
+
+Visit [http://localhost:3000](http://localhost:3000) to see the examples.
+
+## Project Structure
+
+```
+src/
+├── app/
+│   ├── page.tsx                    # Home page with navigation
+│   ├── actions.ts                  # Server actions for triggering tasks
+│   ├── run/[id]/page.tsx          # useRealtimeRun example
+│   ├── run-with-streams/[id]/page.tsx  # useRealtimeRunWithStreams example
+│   ├── runs-with-tag/[tag]/page.tsx    # useRealtimeRunsWithTag example
+│   ├── batch/[id]/page.tsx        # useRealtimeBatch example
+│   └── stream/[id]/page.tsx       # useRealtimeStream example
+├── components/
+│   ├── run-viewer.tsx             # Component using useRealtimeRun
+│   ├── run-with-streams-viewer.tsx # Component using useRealtimeRunWithStreams
+│   ├── runs-with-tag-viewer.tsx   # Component using useRealtimeRunsWithTag
+│   ├── batch-viewer.tsx           # Component using useRealtimeBatch
+│   └── stream-viewer.tsx          # Component using useRealtimeStream
+└── trigger/
+    ├── simple-task.ts             # Simple task for useRealtimeRun
+    ├── stream-task.ts             # Task with streams for useRealtimeRunWithStreams
+    ├── tagged-task.ts             # Tasks that use tags
+    └── batch-task.ts              # Tasks for batch operations
+```
+
+## Testing Scenarios
+
+Each page demonstrates different aspects of the hooks:
+
+### 1. Single Run (`/run/[id]`)
+- Basic subscription to a single run
+- onComplete callback
+- stopOnCompletion option
+- Error handling
+
+### 2. Run with Streams (`/run-with-streams/[id]`)
+- Subscribe to run updates and multiple streams
+- Throttling stream updates
+- Type-safe stream data
+
+### 3. Runs with Tag (`/runs-with-tag/[tag]`)
+- Subscribe to multiple runs by tag
+- Real-time updates as new runs are created
+- createdAt filtering
+
+### 4. Batch (`/batch/[id]`)
+- Subscribe to all runs in a batch
+- Track batch progress
+- Individual run statuses
+
+### 5. Stream (`/stream/[id]`)
+- Subscribe to a specific stream
+- Start from specific index
+- onData callback for each chunk
+- Timeout handling
+
diff --git a/references/realtime-hooks-test/next.config.ts b/references/realtime-hooks-test/next.config.ts
new file mode 100644
index 00000000000..7443abb6744
--- /dev/null
+++ b/references/realtime-hooks-test/next.config.ts
@@ -0,0 +1,8 @@
+import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+  /* config options here */
+};
+
+export default nextConfig;
+
diff --git a/references/realtime-hooks-test/package.json b/references/realtime-hooks-test/package.json
new file mode 100644
index 00000000000..2128609f3a0
--- /dev/null
+++ b/references/realtime-hooks-test/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "references-realtime-hooks-test",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev --turbopack",
+    "build": "next build --turbopack",
+    "start": "next start",
+    "dev:trigger": "trigger dev",
+    "deploy": "trigger deploy"
+  },
+  "dependencies": {
+    "@trigger.dev/react-hooks": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "next": "15.5.6",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "zod": "3.25.76"
+  },
+  "devDependencies": {
+    "@tailwindcss/postcss": "^4",
+    "@types/node": "^20",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "tailwindcss": "^4",
+    "trigger.dev": "workspace:*",
+    "typescript": "^5"
+  }
+}
+
diff --git a/references/realtime-hooks-test/postcss.config.mjs b/references/realtime-hooks-test/postcss.config.mjs
new file mode 100644
index 00000000000..fa4a1da8b5d
--- /dev/null
+++ b/references/realtime-hooks-test/postcss.config.mjs
@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    "@tailwindcss/postcss": {},
+  },
+};
+
diff --git a/references/realtime-hooks-test/public/.gitkeep b/references/realtime-hooks-test/public/.gitkeep
new file mode 100644
index 00000000000..0b805298961
--- /dev/null
+++ b/references/realtime-hooks-test/public/.gitkeep
@@ -0,0 +1,2 @@
+# This file ensures the public directory is tracked by git
+
diff --git a/references/realtime-hooks-test/src/app/actions.ts b/references/realtime-hooks-test/src/app/actions.ts
new file mode 100644
index 00000000000..9989d3d1963
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/actions.ts
@@ -0,0 +1,73 @@
+"use server";
+
+import { tasks, batch, auth } from "@trigger.dev/sdk";
+import type { simpleTask } from "@/trigger/simple-task";
+import type { streamTask } from "@/trigger/stream-task";
+import type { taggedTask } from "@/trigger/tagged-task";
+import type { batchItemTask } from "@/trigger/batch-task";
+import { redirect } from "next/navigation";
+
+export async function triggerSimpleTask(message: string, duration?: number) {
+  const handle = await tasks.trigger<typeof simpleTask>("simple-task", {
+    message,
+    duration,
+  });
+
+  redirect(`/run/${handle.id}?accessToken=${handle.publicAccessToken}`);
+}
+
+export async function triggerStreamTask(scenario: "text" | "json" | "mixed", count?: number) {
+  const handle = await tasks.trigger<typeof streamTask>("stream-task", {
+    scenario,
+    count,
+  });
+
+  redirect(`/run-with-streams/${handle.id}?accessToken=${handle.publicAccessToken}`);
+}
+
+export async function triggerTaggedTask(userId: string, action: string, tags: string[]) {
+  const handle = await tasks.trigger<typeof taggedTask>(
+    "tagged-task",
+    {
+      userId,
+      action,
+    },
+    {
+      tags,
+    }
+  );
+
+  const publicAccessToken = await auth.createPublicToken({
+    scopes: {
+      read: {
+        tags: tags,
+      },
+    },
+  });
+
+  // Redirect to the tag page for the first tag
+  const tag = tags[0] || "test";
+  redirect(`/runs-with-tag/${tag}?accessToken=${publicAccessToken}`);
+}
+
+export async function triggerBatchTasks(itemCount: number) {
+  const items = Array.from({ length: itemCount }, (_, i) => ({
+    payload: {
+      itemId: `item-${i + 1}`,
+      value: Math.floor(Math.random() * 100) + 1,
+    },
+  }));
+
+  const batchHandle = await tasks.batchTrigger<typeof batchItemTask>("batch-item-task", items);
+
+  redirect(`/batch/${batchHandle.batchId}?accessToken=${batchHandle.publicAccessToken}`);
+}
+
+export async function triggerStreamOnlyTask() {
+  const handle = await tasks.trigger<typeof streamTask>("stream-task", {
+    scenario: "text",
+    count: 30,
+  });
+
+  redirect(`/stream/${handle.id}?accessToken=${handle.publicAccessToken}`);
+}
diff --git a/references/realtime-hooks-test/src/app/batch/[id]/page.tsx b/references/realtime-hooks-test/src/app/batch/[id]/page.tsx
new file mode 100644
index 00000000000..5a61a01cf72
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/batch/[id]/page.tsx
@@ -0,0 +1,28 @@
+import { BatchViewer } from "@/components/batch-viewer";
+
+type PageProps = {
+  params: Promise<{ id: string }>;
+  searchParams: Promise<{ accessToken: string }>;
+};
+
+export default async function BatchPage({ params, searchParams }: PageProps) {
+  const { id } = await params;
+  const { accessToken } = await searchParams;
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <a href="/" className="text-blue-500 hover:text-blue-600 text-sm mb-4 inline-block">
+          ← Back to Home
+        </a>
+        <h1 className="text-3xl font-bold mb-2">useRealtimeBatch Test</h1>
+        <p className="text-gray-600">
+          Monitoring all runs in a batch with real-time progress tracking
+        </p>
+      </div>
+
+      <BatchViewer batchId={id} accessToken={accessToken} />
+    </div>
+  );
+}
+
diff --git a/references/realtime-hooks-test/src/app/globals.css b/references/realtime-hooks-test/src/app/globals.css
new file mode 100644
index 00000000000..62546ef3f29
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/globals.css
@@ -0,0 +1,80 @@
+@import "tailwindcss";
+
+:root {
+  --background: #09090b; /* Zinc 950 */
+  --foreground: #fafafa; /* Zinc 50 */
+  --card: #18181b; /* Zinc 900 */
+  --card-foreground: #fafafa;
+  --popover: #18181b;
+  --popover-foreground: #fafafa;
+  --primary: #fafafa;
+  --primary-foreground: #18181b;
+  --secondary: #27272a; /* Zinc 800 */
+  --secondary-foreground: #fafafa;
+  --muted: #27272a;
+  --muted-foreground: #a1a1aa; /* Zinc 400 */
+  --accent: #27272a;
+  --accent-foreground: #fafafa;
+  --destructive: #7f1d1d;
+  --destructive-foreground: #fafafa;
+  --border: #27272a;
+  --input: #27272a;
+  --ring: #d4d4d8;
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --color-card: var(--card);
+  --color-card-foreground: var(--card-foreground);
+  --color-popover: var(--popover);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-primary: var(--primary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-secondary: var(--secondary);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-muted: var(--muted);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-destructive: var(--destructive);
+  --color-destructive-foreground: var(--destructive-foreground);
+  --color-border: var(--border);
+  --color-input: var(--input);
+  --color-ring: var(--ring);
+  
+  --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  --font-sans: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+}
+
+body {
+  background-color: var(--background);
+  color: var(--foreground);
+  font-family: var(--font-sans);
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* Scrollbar styling */
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+::-webkit-scrollbar-track {
+  background: var(--background);
+}
+
+::-webkit-scrollbar-thumb {
+  background: var(--secondary);
+  border-radius: 4px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: var(--muted-foreground);
+}
+
+/* Syntax highlighting */
+pre {
+  font-family: var(--font-mono);
+}
diff --git a/references/realtime-hooks-test/src/app/layout.tsx b/references/realtime-hooks-test/src/app/layout.tsx
new file mode 100644
index 00000000000..dd6672498eb
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/layout.tsx
@@ -0,0 +1,33 @@
+import type { Metadata } from "next";
+import "./globals.css";
+
+export const metadata: Metadata = {
+  title: "Trigger.dev Hooks",
+  description: "Realtime hooks testing workbench",
+};
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en" className="dark">
+      <body className="min-h-screen bg-background font-sans antialiased selection:bg-white/10">
+        <div className="flex min-h-screen flex-col">
+          <header className="sticky top-0 z-50 w-full border-b border-border/50 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
+            <div className="container flex h-14 max-w-screen-2xl items-center px-6">
+              <a href="/" className="mr-6 flex items-center space-x-2">
+                <span className="font-bold inline-block">⚡ Trigger.dev</span>
+                <span className="text-muted-foreground px-2 py-0.5 rounded-full bg-secondary text-xs font-mono">Hooks Workbench</span>
+              </a>
+            </div>
+          </header>
+          <main className="flex-1 container max-w-screen-2xl py-6 px-6">
+            {children}
+          </main>
+        </div>
+      </body>
+    </html>
+  );
+}
diff --git a/references/realtime-hooks-test/src/app/page.tsx b/references/realtime-hooks-test/src/app/page.tsx
new file mode 100644
index 00000000000..59aa721f50f
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/page.tsx
@@ -0,0 +1,140 @@
+import {
+  triggerSimpleTask,
+  triggerStreamTask,
+  triggerTaggedTask,
+  triggerBatchTasks,
+  triggerStreamOnlyTask,
+} from "./actions";
+
+function Card({ title, description, children }: { title: string; description: string; children: React.ReactNode }) {
+  return (
+    <div className="rounded-lg border border-border bg-card text-card-foreground shadow-sm">
+      <div className="flex flex-col space-y-1.5 p-6">
+        <h3 className="font-semibold leading-none tracking-tight">{title}</h3>
+        <p className="text-sm text-muted-foreground">{description}</p>
+      </div>
+      <div className="p-6 pt-0 space-y-4">
+        {children}
+      </div>
+    </div>
+  );
+}
+
+function Button({ children, variant = "default", ...props }: React.ButtonHTMLAttributes<HTMLButtonElement> & { variant?: "default" | "secondary" | "outline" }) {
+  const variants = {
+    default: "bg-primary text-primary-foreground hover:bg-primary/90",
+    secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
+    outline: "border border-input bg-background hover:bg-accent hover:text-accent-foreground"
+  };
+  
+  return (
+    <button 
+      className={`inline-flex w-full items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 h-9 px-4 py-2 ${variants[variant]}`}
+      {...props}
+    >
+      {children}
+    </button>
+  );
+}
+
+export default function Home() {
+  return (
+    <div className="space-y-8">
+      <div className="grid gap-6 md:grid-cols-2 lg:grid-cols-3">
+        {/* useRealtimeRun */}
+        <Card title="useRealtimeRun" description="Single task run subscription">
+          <form action={async () => {
+            "use server";
+            await triggerSimpleTask("Quick test run", 5);
+          }}>
+            <Button type="submit">Run (5s)</Button>
+          </form>
+          <form action={async () => {
+            "use server";
+            await triggerSimpleTask("Longer test run", 15);
+          }}>
+            <Button type="submit" variant="secondary">Run (15s)</Button>
+          </form>
+        </Card>
+
+        {/* useRealtimeRunWithStreams */}
+        <Card title="useRealtimeRunWithStreams" description="Run subscription with streams">
+          <div className="grid grid-cols-1 gap-2">
+            <form action={async () => {
+              "use server";
+              await triggerStreamTask("text", 20);
+            }}>
+              <Button type="submit" variant="outline">Text Stream</Button>
+            </form>
+            <form action={async () => {
+              "use server";
+              await triggerStreamTask("json", 20);
+            }}>
+              <Button type="submit" variant="outline">JSON Stream</Button>
+            </form>
+            <form action={async () => {
+              "use server";
+              await triggerStreamTask("mixed", 30);
+            }}>
+              <Button type="submit" variant="outline">Mixed Streams</Button>
+            </form>
+          </div>
+        </Card>
+
+        {/* useRealtimeRunsWithTag */}
+        <Card title="useRealtimeRunsWithTag" description="Subscribe to runs by tag">
+          <form action={async () => {
+            "use server";
+            await triggerTaggedTask("user-123", "process-order", ["order-processing", "user-123"]);
+          }}>
+            <Button type="submit" className="border-l-4 border-l-emerald-500">Tag: order-processing</Button>
+          </form>
+          <form action={async () => {
+            "use server";
+            await triggerTaggedTask("user-456", "send-email", ["notifications", "user-456"]);
+          }}>
+            <Button type="submit" className="border-l-4 border-l-blue-500" variant="secondary">Tag: notifications</Button>
+          </form>
+        </Card>
+
+        {/* useRealtimeBatch */}
+        <Card title="useRealtimeBatch" description="Batch run monitoring">
+          <div className="grid grid-cols-3 gap-2">
+            <form action={async () => {
+              "use server";
+              await triggerBatchTasks(5);
+            }}>
+              <Button type="submit" variant="outline">5</Button>
+            </form>
+            <form action={async () => {
+              "use server";
+              await triggerBatchTasks(10);
+            }}>
+              <Button type="submit" variant="outline">10</Button>
+            </form>
+            <form action={async () => {
+              "use server";
+              await triggerBatchTasks(20);
+            }}>
+              <Button type="submit" variant="outline">20</Button>
+            </form>
+          </div>
+        </Card>
+
+        {/* useRealtimeStream */}
+        <Card title="useRealtimeStream" description="Direct stream subscription">
+          <form action={async () => {
+            "use server";
+            await triggerStreamOnlyTask();
+          }}>
+            <Button type="submit" className="bg-indigo-600 hover:bg-indigo-700 text-white">Start Stream</Button>
+          </form>
+        </Card>
+      </div>
+
+      <div className="rounded-lg bg-secondary/50 p-4 text-sm text-muted-foreground font-mono">
+        <p>Test environment ready. Click any trigger to start a session.</p>
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-hooks-test/src/app/run-with-streams/[id]/page.tsx b/references/realtime-hooks-test/src/app/run-with-streams/[id]/page.tsx
new file mode 100644
index 00000000000..b3c9d8f94b2
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/run-with-streams/[id]/page.tsx
@@ -0,0 +1,28 @@
+import { RunWithStreamsViewer } from "@/components/run-with-streams-viewer";
+
+type PageProps = {
+  params: Promise<{ id: string }>;
+  searchParams: Promise<{ accessToken: string }>;
+};
+
+export default async function RunWithStreamsPage({ params, searchParams }: PageProps) {
+  const { id } = await params;
+  const { accessToken } = await searchParams;
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <a href="/" className="text-blue-500 hover:text-blue-600 text-sm mb-4 inline-block">
+          ← Back to Home
+        </a>
+        <h1 className="text-3xl font-bold mb-2">useRealtimeRunWithStreams Test</h1>
+        <p className="text-gray-600">
+          Monitoring a task run with multiple real-time streams
+        </p>
+      </div>
+
+      <RunWithStreamsViewer runId={id} accessToken={accessToken} />
+    </div>
+  );
+}
+
diff --git a/references/realtime-hooks-test/src/app/run/[id]/page.tsx b/references/realtime-hooks-test/src/app/run/[id]/page.tsx
new file mode 100644
index 00000000000..06ec1e05cdc
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/run/[id]/page.tsx
@@ -0,0 +1,28 @@
+import { RunViewer } from "@/components/run-viewer";
+
+type PageProps = {
+  params: Promise<{ id: string }>;
+  searchParams: Promise<{ accessToken: string }>;
+};
+
+export default async function RunPage({ params, searchParams }: PageProps) {
+  const { id } = await params;
+  const { accessToken } = await searchParams;
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <a href="/" className="text-blue-500 hover:text-blue-600 text-sm mb-4 inline-block">
+          ← Back to Home
+        </a>
+        <h1 className="text-3xl font-bold mb-2">useRealtimeRun Test</h1>
+        <p className="text-gray-600">
+          Monitoring a single task run with real-time updates
+        </p>
+      </div>
+
+      <RunViewer runId={id} accessToken={accessToken} />
+    </div>
+  );
+}
+
diff --git a/references/realtime-hooks-test/src/app/runs-with-tag/[tag]/page.tsx b/references/realtime-hooks-test/src/app/runs-with-tag/[tag]/page.tsx
new file mode 100644
index 00000000000..41be79162b9
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/runs-with-tag/[tag]/page.tsx
@@ -0,0 +1,34 @@
+import { RunsWithTagViewer } from "@/components/runs-with-tag-viewer";
+
+type PageProps = {
+  params: Promise<{ tag: string }>;
+  searchParams: Promise<{ accessToken: string }>;
+};
+
+export default async function RunsWithTagPage({ params, searchParams }: PageProps) {
+  const { tag } = await params;
+  const { accessToken } = await searchParams;
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <a href="/" className="text-blue-500 hover:text-blue-600 text-sm mb-4 inline-block">
+          ← Back to Home
+        </a>
+        <h1 className="text-3xl font-bold mb-2">useRealtimeRunsWithTag Test</h1>
+        <p className="text-gray-600">
+          Monitoring all runs with tag: <code className="bg-gray-100 px-2 py-1 rounded">{tag}</code>
+        </p>
+      </div>
+
+      <RunsWithTagViewer tag={tag} accessToken={accessToken} />
+
+      <div className="bg-blue-50 border border-blue-200 rounded-lg p-4">
+        <p className="text-sm text-blue-800">
+          <strong>Tip:</strong> Trigger more tasks with this tag from the home page to see them appear here in real-time!
+        </p>
+      </div>
+    </div>
+  );
+}
+
diff --git a/references/realtime-hooks-test/src/app/stream/[id]/page.tsx b/references/realtime-hooks-test/src/app/stream/[id]/page.tsx
new file mode 100644
index 00000000000..bbdf929e605
--- /dev/null
+++ b/references/realtime-hooks-test/src/app/stream/[id]/page.tsx
@@ -0,0 +1,28 @@
+import { StreamViewer } from "@/components/stream-viewer";
+
+type PageProps = {
+  params: Promise<{ id: string }>;
+  searchParams: Promise<{ accessToken: string }>;
+};
+
+export default async function StreamPage({ params, searchParams }: PageProps) {
+  const { id } = await params;
+  const { accessToken } = await searchParams;
+
+  return (
+    <div className="space-y-6">
+      <div>
+        <a href="/" className="text-blue-500 hover:text-blue-600 text-sm mb-4 inline-block">
+          ← Back to Home
+        </a>
+        <h1 className="text-3xl font-bold mb-2">useRealtimeStream Test</h1>
+        <p className="text-gray-600">
+          Subscribing to a specific stream with real-time chunk delivery
+        </p>
+      </div>
+
+      <StreamViewer runId={id} accessToken={accessToken} />
+    </div>
+  );
+}
+
diff --git a/references/realtime-hooks-test/src/components/batch-viewer.tsx b/references/realtime-hooks-test/src/components/batch-viewer.tsx
new file mode 100644
index 00000000000..3967a47b2ec
--- /dev/null
+++ b/references/realtime-hooks-test/src/components/batch-viewer.tsx
@@ -0,0 +1,125 @@
+"use client";
+
+import { useRealtimeBatch } from "@trigger.dev/react-hooks";
+import type { batchItemTask } from "@/trigger/batch-task";
+
+type BatchViewerProps = {
+  batchId: string;
+  accessToken: string;
+};
+
+function StatusDot({ status }: { status: string }) {
+    const colors = {
+      COMPLETED: "bg-emerald-500",
+      EXECUTING: "bg-blue-500 animate-pulse",
+      FAILED: "bg-red-500",
+      PENDING: "bg-zinc-500",
+      QUEUED: "bg-yellow-500",
+    };
+    const color = colors[status as keyof typeof colors] || colors.PENDING;
+    return <div className={`w-2 h-2 rounded-full ${color}`} title={status} />;
+  }
+
+export function BatchViewer({ batchId, accessToken }: BatchViewerProps) {
+  const { runs, error, stop } = useRealtimeBatch<typeof batchItemTask>(batchId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+  });
+
+  if (error) {
+    return (
+      <div className="rounded-md bg-destructive/15 p-4 text-sm text-destructive border border-destructive/20">
+        <div className="font-semibold">Connection Error</div>
+        <div>{error.message}</div>
+      </div>
+    );
+  }
+
+  const totalRuns = runs.length;
+  const completedRuns = runs.filter((r) => r.status === "COMPLETED").length;
+  const batchProgress = totalRuns > 0 ? completedRuns / totalRuns : 0;
+
+  return (
+    <div className="space-y-6">
+      {/* Header */}
+      <div className="bg-card border border-border rounded-lg p-6 space-y-6">
+        <div className="flex justify-between items-start">
+           <div>
+             <h2 className="text-lg font-semibold mb-1">Batch Progress</h2>
+             <p className="text-sm text-muted-foreground font-mono">{batchId}</p>
+           </div>
+           <button
+            onClick={() => stop()}
+            className="px-3 py-1 text-xs font-medium bg-secondary hover:bg-secondary/80 text-secondary-foreground rounded-md transition-colors"
+            >
+            Stop Subscription
+            </button>
+        </div>
+
+        <div className="space-y-2">
+           <div className="flex justify-between text-sm">
+              <span className="text-muted-foreground">Completion</span>
+              <span className="font-mono font-medium">{completedRuns} / {totalRuns}</span>
+           </div>
+           <div className="h-2 bg-secondary rounded-full overflow-hidden">
+              <div 
+                className="h-full bg-primary transition-all duration-300 ease-out"
+                style={{ width: `${batchProgress * 100}%` }}
+              />
+           </div>
+        </div>
+      </div>
+
+      {/* Runs Grid */}
+      <div className="bg-card border border-border rounded-lg overflow-hidden">
+         <div className="px-4 py-3 border-b border-border bg-secondary/30 text-xs font-medium text-muted-foreground uppercase tracking-wider flex justify-between items-center">
+            <span>Items</span>
+            <span className="font-mono">{runs.length} Tasks</span>
+         </div>
+         <div className="divide-y divide-border/50 max-h-[600px] overflow-y-auto">
+            {runs.length === 0 ? (
+                <div className="p-8 text-center text-muted-foreground text-sm">
+                  Waiting for batch runs...
+                </div>
+            ) : (
+                runs.map((run) => {
+                    const progress = (run.metadata as any)?.progress || 0;
+                    const itemId = (run.metadata as any)?.itemId || "Item";
+                    const inputValue = (run.metadata as any)?.inputValue;
+                    const result = (run.output as any)?.result;
+
+                    return (
+                        <div key={run.id} className="p-4 hover:bg-secondary/20 transition-colors grid grid-cols-12 gap-4 items-center">
+                            <div className="col-span-1 flex justify-center">
+                                <StatusDot status={run.status} />
+                            </div>
+                            <div className="col-span-3">
+                                <div className="font-medium text-sm">{itemId}</div>
+                                <div className="text-xs text-muted-foreground font-mono">{run.id.slice(-8)}</div>
+                            </div>
+                            <div className="col-span-4">
+                                <div className="flex items-center gap-2">
+                                    <div className="flex-1 h-1.5 bg-secondary rounded-full overflow-hidden">
+                                        <div 
+                                            className={`h-full rounded-full transition-all duration-300 ${run.status === 'FAILED' ? 'bg-destructive' : 'bg-primary'}`}
+                                            style={{ width: `${(run.status === 'COMPLETED' ? 1 : progress) * 100}%` }}
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+                            <div className="col-span-4 text-right font-mono text-sm">
+                                {result !== undefined ? (
+                                    <span className="text-emerald-500">Result: {result}</span>
+                                ) : (
+                                    <span className="text-muted-foreground">Input: {inputValue}</span>
+                                )}
+                            </div>
+                        </div>
+                    )
+                })
+            )}
+         </div>
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-hooks-test/src/components/run-viewer.tsx b/references/realtime-hooks-test/src/components/run-viewer.tsx
new file mode 100644
index 00000000000..3844d615422
--- /dev/null
+++ b/references/realtime-hooks-test/src/components/run-viewer.tsx
@@ -0,0 +1,150 @@
+"use client";
+
+import { useRealtimeRun } from "@trigger.dev/react-hooks";
+import type { simpleTask } from "@/trigger/simple-task";
+import { useState } from "react";
+
+type RunViewerProps = {
+  runId: string;
+  accessToken: string;
+};
+
+function StatusBadge({ status }: { status: string }) {
+  const colors = {
+    COMPLETED: "bg-emerald-500/15 text-emerald-500 border-emerald-500/20",
+    EXECUTING: "bg-blue-500/15 text-blue-500 border-blue-500/20",
+    FAILED: "bg-red-500/15 text-red-500 border-red-500/20",
+    PENDING: "bg-zinc-500/15 text-zinc-500 border-zinc-500/20",
+    QUEUED: "bg-yellow-500/15 text-yellow-500 border-yellow-500/20",
+  };
+  
+  const colorClass = colors[status as keyof typeof colors] || colors.PENDING;
+  
+  return (
+    <span className={`px-2.5 py-0.5 rounded-full text-xs font-medium border ${colorClass}`}>
+      {status}
+    </span>
+  );
+}
+
+function CodeBlock({ label, data }: { label: string, data: any }) {
+  if (!data) return null;
+  return (
+    <div className="space-y-1">
+      <p className="text-xs font-medium text-muted-foreground uppercase tracking-wider">{label}</p>
+      <pre className="bg-secondary/50 border border-border rounded-md p-3 text-xs overflow-x-auto font-mono text-foreground/90">
+        {JSON.stringify(data, null, 2)}
+      </pre>
+    </div>
+  );
+}
+
+export function RunViewer({ runId, accessToken }: RunViewerProps) {
+  const [stopOnCompletion, setStopOnCompletion] = useState(true);
+
+  const { run, error, stop } = useRealtimeRun<typeof simpleTask>(runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    stopOnCompletion,
+  });
+
+  if (error) {
+    return (
+      <div className="rounded-md bg-destructive/15 p-4 text-sm text-destructive border border-destructive/20">
+        <div className="font-semibold">Connection Error</div>
+        <div>{error.message}</div>
+      </div>
+    );
+  }
+
+  if (!run) {
+    return (
+      <div className="animate-pulse space-y-4">
+        <div className="h-8 bg-secondary rounded w-1/3"></div>
+        <div className="h-32 bg-secondary rounded"></div>
+      </div>
+    );
+  }
+
+  const progress = (run.metadata as any)?.progress || 0;
+  const currentStep = (run.metadata as any)?.currentStep || 0;
+  const totalSteps = (run.metadata as any)?.totalSteps || 0;
+
+  return (
+    <div className="space-y-6">
+      {/* Header Bar */}
+      <div className="flex items-center justify-between p-4 bg-card border border-border rounded-lg">
+        <div className="flex items-center gap-4">
+          <StatusBadge status={run.status} />
+          <div className="font-mono text-sm text-muted-foreground">{run.id}</div>
+        </div>
+        <div className="flex items-center gap-3">
+          <label className="flex items-center gap-2 text-sm text-muted-foreground cursor-pointer hover:text-foreground transition-colors">
+            <input
+              type="checkbox"
+              checked={stopOnCompletion}
+              onChange={(e) => setStopOnCompletion(e.target.checked)}
+              className="rounded border-input bg-background text-primary focus:ring-ring"
+            />
+            <span>Stop on completion</span>
+          </label>
+          <button
+            onClick={() => stop()}
+            className="px-3 py-1 text-xs font-medium bg-secondary hover:bg-secondary/80 text-secondary-foreground rounded-md transition-colors"
+          >
+            Disconnect
+          </button>
+        </div>
+      </div>
+
+      {/* Progress Section */}
+      <div className="bg-card border border-border rounded-lg p-6 space-y-4">
+        <div className="flex justify-between items-end">
+          <div>
+            <h3 className="text-lg font-semibold">Task Progress</h3>
+            <p className="text-sm text-muted-foreground">
+              Step {currentStep} of {totalSteps}
+            </p>
+          </div>
+          <div className="text-2xl font-mono font-bold text-primary">
+            {Math.round(progress * 100)}%
+          </div>
+        </div>
+        <div className="h-2 bg-secondary rounded-full overflow-hidden">
+          <div
+            className="h-full bg-primary transition-all duration-500 ease-out"
+            style={{ width: `${progress * 100}%` }}
+          />
+        </div>
+      </div>
+
+      {/* Data Grid */}
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+        <div className="bg-card border border-border rounded-lg p-6 space-y-4">
+          <h3 className="font-semibold">Metadata</h3>
+          <div className="space-y-3">
+            {Object.entries(run.metadata || {}).map(([key, value]) => (
+              <div key={key} className="flex justify-between items-center py-2 border-b border-border/50 last:border-0">
+                <span className="text-sm text-muted-foreground font-mono">{key}</span>
+                <span className="text-sm font-medium font-mono">
+                   {typeof value === 'object' ? JSON.stringify(value) : String(value)}
+                </span>
+              </div>
+            ))}
+          </div>
+        </div>
+
+        <div className="space-y-6">
+          <CodeBlock label="Payload" data={run.payload} />
+          <CodeBlock label="Output" data={run.output} />
+          {run.error && (
+            <div className="rounded-md bg-destructive/10 border border-destructive/20 p-4">
+               <p className="text-sm font-medium text-destructive mb-2">Error: {run.error.name}</p>
+               <p className="text-sm text-destructive/90 font-mono whitespace-pre-wrap">{run.error.message}</p>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-hooks-test/src/components/run-with-streams-viewer.tsx b/references/realtime-hooks-test/src/components/run-with-streams-viewer.tsx
new file mode 100644
index 00000000000..bb4022bf99c
--- /dev/null
+++ b/references/realtime-hooks-test/src/components/run-with-streams-viewer.tsx
@@ -0,0 +1,133 @@
+"use client";
+
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+import type { streamTask } from "@/trigger/stream-task";
+import { useState } from "react";
+
+type StreamResults = {
+  text: string[];
+  data: Array<{ step: number; data: string; timestamp: number }>;
+};
+
+type RunWithStreamsViewerProps = {
+  runId: string;
+  accessToken: string;
+};
+
+export function RunWithStreamsViewer({ runId, accessToken }: RunWithStreamsViewerProps) {
+  const { run, streams, error, stop } = useRealtimeRunWithStreams<
+    typeof streamTask,
+    StreamResults
+  >(runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    throttleInMs: 50,
+  });
+
+  if (error) {
+    return (
+      <div className="rounded-md bg-destructive/15 p-4 text-sm text-destructive border border-destructive/20">
+        <div className="font-semibold">Connection Error</div>
+        <div>{error.message}</div>
+      </div>
+    );
+  }
+
+  if (!run) {
+    return (
+      <div className="animate-pulse space-y-4">
+        <div className="h-8 bg-secondary rounded w-1/3"></div>
+        <div className="grid grid-cols-2 gap-4">
+           <div className="h-64 bg-secondary rounded"></div>
+           <div className="h-64 bg-secondary rounded"></div>
+        </div>
+      </div>
+    );
+  }
+
+  const textStream = streams.text || [];
+  const dataStream = streams.data || [];
+
+  return (
+    <div className="space-y-6 h-[calc(100vh-120px)] flex flex-col">
+      {/* Header */}
+      <div className="flex items-center justify-between p-4 bg-card border border-border rounded-lg flex-shrink-0">
+        <div className="flex items-center gap-4">
+          <div className="flex flex-col">
+            <span className="text-xs text-muted-foreground uppercase tracking-wider">Status</span>
+            <span className={`font-mono text-sm font-medium ${
+              run.status === 'COMPLETED' ? 'text-emerald-500' : 
+              run.status === 'EXECUTING' ? 'text-blue-500' : 'text-zinc-500'
+            }`}>
+              {run.status}
+            </span>
+          </div>
+          <div className="w-px h-8 bg-border"></div>
+          <div className="flex flex-col">
+             <span className="text-xs text-muted-foreground uppercase tracking-wider">Run ID</span>
+             <span className="font-mono text-sm">{run.id}</span>
+          </div>
+        </div>
+        <button
+          onClick={() => stop()}
+          className="px-3 py-1 text-xs font-medium bg-secondary hover:bg-secondary/80 text-secondary-foreground rounded-md transition-colors"
+        >
+          Stop Subscription
+        </button>
+      </div>
+
+      {/* Streams Split View */}
+      <div className="grid grid-cols-1 md:grid-cols-2 gap-6 flex-1 min-h-0">
+        {/* Text Stream Panel */}
+        <div className="bg-card border border-border rounded-lg flex flex-col overflow-hidden">
+          <div className="px-4 py-3 border-b border-border bg-secondary/30 flex justify-between items-center">
+            <h3 className="font-medium text-sm flex items-center gap-2">
+              <span className="w-2 h-2 rounded-full bg-blue-500"></span>
+              Text Stream
+            </h3>
+            <span className="text-xs text-muted-foreground font-mono">{textStream.length} chunks</span>
+          </div>
+          <div className="flex-1 p-4 overflow-y-auto bg-background/50 font-mono text-sm whitespace-pre-wrap">
+            {textStream.join("") || <span className="text-muted-foreground italic">Waiting for data...</span>}
+          </div>
+        </div>
+
+        {/* Data Stream Panel */}
+        <div className="bg-card border border-border rounded-lg flex flex-col overflow-hidden">
+          <div className="px-4 py-3 border-b border-border bg-secondary/30 flex justify-between items-center">
+            <h3 className="font-medium text-sm flex items-center gap-2">
+              <span className="w-2 h-2 rounded-full bg-purple-500"></span>
+              Data Stream
+            </h3>
+            <span className="text-xs text-muted-foreground font-mono">{dataStream.length} items</span>
+          </div>
+          <div className="flex-1 p-0 overflow-y-auto bg-background/50">
+            <div className="divide-y divide-border/50">
+              {dataStream.length === 0 && (
+                <div className="p-4 text-muted-foreground italic text-sm">Waiting for data...</div>
+              )}
+              {dataStream.map((item, index) => (
+                <div key={index} className="p-3 hover:bg-secondary/30 transition-colors font-mono text-xs">
+                  <div className="flex justify-between text-muted-foreground mb-1">
+                    <span>Step {item.step}</span>
+                    <span>{new Date(item.timestamp).toLocaleTimeString()}</span>
+                  </div>
+                  <div className="text-foreground">{item.data}</div>
+                </div>
+              ))}
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      {run.output && (
+        <div className="bg-card border border-border rounded-lg p-4 flex-shrink-0">
+          <div className="text-xs font-medium text-muted-foreground mb-2 uppercase tracking-wider">Task Output</div>
+          <pre className="text-xs font-mono overflow-x-auto">
+            {JSON.stringify(run.output, null, 2)}
+          </pre>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/references/realtime-hooks-test/src/components/runs-with-tag-viewer.tsx b/references/realtime-hooks-test/src/components/runs-with-tag-viewer.tsx
new file mode 100644
index 00000000000..c37bae704f8
--- /dev/null
+++ b/references/realtime-hooks-test/src/components/runs-with-tag-viewer.tsx
@@ -0,0 +1,156 @@
+"use client";
+
+import { useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+import type { taggedTask } from "@/trigger/tagged-task";
+
+type RunsWithTagViewerProps = {
+  tag: string;
+  accessToken: string;
+};
+
+function StatusDot({ status }: { status: string }) {
+  const colors = {
+    COMPLETED: "bg-emerald-500",
+    EXECUTING: "bg-blue-500 animate-pulse",
+    FAILED: "bg-red-500",
+    PENDING: "bg-zinc-500",
+    QUEUED: "bg-yellow-500",
+  };
+  const color = colors[status as keyof typeof colors] || colors.PENDING;
+  return <div className={`w-2 h-2 rounded-full ${color}`} title={status} />;
+}
+
+export function RunsWithTagViewer({ tag, accessToken }: RunsWithTagViewerProps) {
+  const { runs, error, stop } = useRealtimeRunsWithTag<typeof taggedTask>([tag], {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    createdAt: "1h",
+  });
+
+  if (error) {
+    return (
+      <div className="rounded-md bg-destructive/15 p-4 text-sm text-destructive border border-destructive/20">
+        <div className="font-semibold">Connection Error</div>
+        <div>{error.message}</div>
+      </div>
+    );
+  }
+
+  const stats = {
+    total: runs.length,
+    executing: runs.filter((r) => r.status === "EXECUTING").length,
+    completed: runs.filter((r) => r.status === "COMPLETED").length,
+    failed: runs.filter((r) => r.status === "FAILED").length,
+  };
+
+  return (
+    <div className="space-y-6">
+      {/* Header & Stats */}
+      <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
+        <div className="bg-card border border-border p-4 rounded-lg">
+          <div className="text-xs text-muted-foreground uppercase tracking-wider mb-1">
+            Total Runs
+          </div>
+          <div className="text-2xl font-mono font-bold">{stats.total}</div>
+        </div>
+        <div className="bg-card border border-border p-4 rounded-lg">
+          <div className="text-xs text-muted-foreground uppercase tracking-wider mb-1 text-blue-500">
+            Executing
+          </div>
+          <div className="text-2xl font-mono font-bold text-blue-500">{stats.executing}</div>
+        </div>
+        <div className="bg-card border border-border p-4 rounded-lg">
+          <div className="text-xs text-muted-foreground uppercase tracking-wider mb-1 text-emerald-500">
+            Completed
+          </div>
+          <div className="text-2xl font-mono font-bold text-emerald-500">{stats.completed}</div>
+        </div>
+        <div className="bg-card border border-border p-4 rounded-lg">
+          <div className="text-xs text-muted-foreground uppercase tracking-wider mb-1 text-red-500">
+            Failed
+          </div>
+          <div className="text-2xl font-mono font-bold text-red-500">{stats.failed}</div>
+        </div>
+      </div>
+
+      {/* Controls */}
+      <div className="flex justify-between items-center">
+        <div className="flex items-center gap-2 text-sm text-muted-foreground">
+          <span>Watching tag:</span>
+          <span className="px-2 py-0.5 bg-secondary text-secondary-foreground rounded font-mono text-xs">
+            {tag}
+          </span>
+        </div>
+        <button
+          onClick={() => stop()}
+          className="px-3 py-1 text-xs font-medium bg-secondary hover:bg-secondary/80 text-secondary-foreground rounded-md transition-colors"
+        >
+          Stop Subscription
+        </button>
+      </div>
+
+      {/* Runs List */}
+      <div className="bg-card border border-border rounded-lg overflow-hidden">
+        <div className="grid grid-cols-12 gap-4 px-4 py-3 border-b border-border bg-secondary/30 text-xs font-medium text-muted-foreground uppercase tracking-wider">
+          <div className="col-span-1 text-center">Status</div>
+          <div className="col-span-4">Run ID</div>
+          <div className="col-span-3">User / Action</div>
+          <div className="col-span-2">Progress</div>
+          <div className="col-span-2 text-right">Age</div>
+        </div>
+
+        <div className="divide-y divide-border/50 max-h-[600px] overflow-y-auto">
+          {runs.length === 0 ? (
+            <div className="p-8 text-center text-muted-foreground text-sm">
+              No runs found with tag "{tag}" in the last hour
+            </div>
+          ) : (
+            runs.map((run) => {
+              const progress = (run.metadata as any)?.progress || 0;
+              const userId = (run.metadata as any)?.userId || "-";
+              const action = (run.metadata as any)?.action || "-";
+
+              return (
+                <div
+                  key={run.id}
+                  className="grid grid-cols-12 gap-4 px-4 py-3 text-sm hover:bg-secondary/20 transition-colors items-center"
+                >
+                  <div className="col-span-1 flex justify-center">
+                    <StatusDot status={run.status} />
+                  </div>
+                  <div
+                    className="col-span-4 font-mono text-xs text-muted-foreground truncate"
+                    title={run.id}
+                  >
+                    {run.id}
+                  </div>
+                  <div className="col-span-3 truncate text-xs">
+                    <span className="text-foreground font-medium">{userId}</span>
+                    <span className="text-muted-foreground mx-1">/</span>
+                    <span className="text-muted-foreground">{action}</span>
+                  </div>
+                  <div className="col-span-2">
+                    <div className="flex items-center gap-2">
+                      <div className="flex-1 h-1.5 bg-secondary rounded-full overflow-hidden">
+                        <div
+                          className="h-full bg-primary rounded-full transition-all duration-500"
+                          style={{ width: `${progress * 100}%` }}
+                        />
+                      </div>
+                      <span className="text-xs font-mono w-8 text-right">
+                        {Math.round(progress * 100)}%
+                      </span>
+                    </div>
+                  </div>
+                  <div className="col-span-2 text-right font-mono text-xs text-muted-foreground">
+                    {run.createdAt ? new Date(run.createdAt).toLocaleTimeString() : "-"}
+                  </div>
+                </div>
+              );
+            })
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-hooks-test/src/components/stream-viewer.tsx b/references/realtime-hooks-test/src/components/stream-viewer.tsx
new file mode 100644
index 00000000000..cad46a9c5ce
--- /dev/null
+++ b/references/realtime-hooks-test/src/components/stream-viewer.tsx
@@ -0,0 +1,136 @@
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { textStream } from "@/trigger/streams";
+import { useState, useEffect, useRef } from "react";
+
+type StreamViewerProps = {
+  runId: string;
+  accessToken: string;
+};
+
+export function StreamViewer({ runId, accessToken }: StreamViewerProps) {
+  const [chunkLog, setChunkLog] = useState<Array<{ chunk: string; timestamp: number }>>([]);
+  const scrollRef = useRef<HTMLDivElement>(null);
+
+  const { parts, error, stop } = useRealtimeStream(textStream, runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    throttleInMs: 50,
+    timeoutInSeconds: 120,
+    onData: (chunk) => {
+      setChunkLog((prev) => [...prev, { chunk, timestamp: Date.now() }]);
+    },
+  });
+
+  // Auto-scroll to bottom
+  useEffect(() => {
+    if (scrollRef.current) {
+      scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+    }
+  }, [parts]);
+
+  if (error) {
+    return (
+      <div className="rounded-md bg-destructive/15 p-4 text-sm text-destructive border border-destructive/20">
+        <div className="font-semibold">Connection Error</div>
+        <div>{error.message}</div>
+      </div>
+    );
+  }
+
+  const fullText = parts.join("");
+
+  return (
+    <div className="space-y-6 h-[calc(100vh-120px)] flex flex-col">
+      {/* Header */}
+      <div className="flex items-center justify-between p-4 bg-card border border-border rounded-lg flex-shrink-0">
+        <div className="space-y-1">
+          <h2 className="text-sm font-semibold">Stream Monitor</h2>
+          <div className="flex items-center gap-2 text-xs text-muted-foreground">
+            <span className="font-mono bg-secondary px-1.5 py-0.5 rounded text-secondary-foreground">
+              {runId}
+            </span>
+            <span>•</span>
+            <span>{parts.length} chunks</span>
+            <span>•</span>
+            <span>{fullText.length} chars</span>
+          </div>
+        </div>
+        <button
+          onClick={() => stop()}
+          className="px-3 py-1 text-xs font-medium bg-secondary hover:bg-secondary/80 text-secondary-foreground rounded-md transition-colors"
+        >
+          Stop Stream
+        </button>
+      </div>
+
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-6 flex-1 min-h-0">
+        {/* Main Output Console */}
+        <div className="bg-card border border-border rounded-lg flex flex-col overflow-hidden shadow-inner bg-[#0d0d0d]">
+          <div className="px-4 py-2 border-b border-border bg-secondary/20 text-xs font-mono text-muted-foreground flex justify-between">
+            <span>OUTPUT</span>
+            <span>UTF-8</span>
+          </div>
+          <div
+            ref={scrollRef}
+            className="flex-1 p-4 overflow-y-auto font-mono text-sm whitespace-pre-wrap text-foreground/90 leading-relaxed"
+          >
+            {fullText || (
+              <span className="text-muted-foreground/50 italic">Waiting for stream output...</span>
+            )}
+            {/* Cursor blink effect */}
+            <span className="inline-block w-2 h-4 ml-1 align-middle bg-primary animate-pulse"></span>
+          </div>
+        </div>
+
+        {/* Chunk Log Table */}
+        <div className="bg-card border border-border rounded-lg flex flex-col overflow-hidden">
+          <div className="px-4 py-2 border-b border-border bg-secondary/30 text-xs font-medium text-muted-foreground uppercase tracking-wider">
+            Packet Log
+          </div>
+          <div className="flex-1 overflow-y-auto">
+            <table className="w-full text-xs font-mono">
+              <thead className="bg-secondary/10 text-muted-foreground sticky top-0">
+                <tr>
+                  <th className="px-4 py-2 text-left font-medium w-24">Time</th>
+                  <th className="px-4 py-2 text-left font-medium">Chunk Preview</th>
+                  <th className="px-4 py-2 text-right font-medium w-16">Size</th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-border/30">
+                {chunkLog.length === 0 ? (
+                  <tr>
+                    <td colSpan={3} className="px-4 py-8 text-center text-muted-foreground italic">
+                      No packets received
+                    </td>
+                  </tr>
+                ) : (
+                  chunkLog.map((log, i) => (
+                    <tr key={i} className="hover:bg-secondary/20 transition-colors">
+                      <td className="px-4 py-2 text-muted-foreground whitespace-nowrap">
+                        {new Date(log.timestamp).toLocaleTimeString().split(" ")[0]}.
+                        <span className="text-muted-foreground/60">
+                          {String(log.timestamp % 1000).padStart(3, "0")}
+                        </span>
+                      </td>
+                      <td
+                        className="px-4 py-2 text-primary/80 truncate max-w-[200px]"
+                        title={log.chunk}
+                      >
+                        {log.chunk.replace(/\n/g, "↵")}
+                      </td>
+                      <td className="px-4 py-2 text-right text-muted-foreground">
+                        {log.chunk.length}B
+                      </td>
+                    </tr>
+                  ))
+                )}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-hooks-test/src/trigger/batch-task.ts b/references/realtime-hooks-test/src/trigger/batch-task.ts
new file mode 100644
index 00000000000..fc44a6f24fc
--- /dev/null
+++ b/references/realtime-hooks-test/src/trigger/batch-task.ts
@@ -0,0 +1,48 @@
+import { task, logger, metadata } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+
+export type BatchItemPayload = {
+  itemId: string;
+  value: number;
+};
+
+export type BatchItemOutput = {
+  itemId: string;
+  result: number;
+  processedAt: string;
+};
+
+export const batchItemTask = task({
+  id: "batch-item-task",
+  run: async (payload: BatchItemPayload) => {
+    logger.info("Processing batch item", payload);
+    
+    metadata.set("status", "processing");
+    metadata.set("itemId", payload.itemId);
+    metadata.set("inputValue", payload.value);
+
+    // Simulate processing with varying duration based on value
+    const duration = Math.floor(payload.value / 10) + 2; // 2-12 seconds
+    
+    for (let i = 0; i < duration; i++) {
+      await setTimeout(1000);
+      metadata.set("progress", (i + 1) / duration);
+    }
+
+    metadata.set("status", "completed");
+
+    // Calculate some result
+    const result = payload.value * 2;
+
+    const output: BatchItemOutput = {
+      itemId: payload.itemId,
+      result,
+      processedAt: new Date().toISOString(),
+    };
+
+    logger.info("Batch item completed", output);
+
+    return output;
+  },
+});
+
diff --git a/references/realtime-hooks-test/src/trigger/simple-task.ts b/references/realtime-hooks-test/src/trigger/simple-task.ts
new file mode 100644
index 00000000000..ccdaf7fe820
--- /dev/null
+++ b/references/realtime-hooks-test/src/trigger/simple-task.ts
@@ -0,0 +1,53 @@
+import { task, logger, metadata } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+
+export type SimpleTaskPayload = {
+  message: string;
+  duration?: number;
+};
+
+export type SimpleTaskOutput = {
+  message: string;
+  completedAt: string;
+};
+
+export const simpleTask = task({
+  id: "simple-task",
+  run: async (payload: SimpleTaskPayload) => {
+    const duration = payload.duration || 10;
+    
+    logger.info("Starting simple task", { message: payload.message, duration });
+    
+    // Update metadata to track progress
+    metadata.set("status", "initializing");
+    metadata.set("progress", 0);
+
+    await setTimeout(1000);
+    metadata.set("status", "processing");
+    metadata.set("progress", 0.25);
+
+    // Simulate work
+    for (let i = 0; i < duration; i++) {
+      await setTimeout(1000);
+      const progress = ((i + 1) / duration) * 0.75 + 0.25;
+      metadata.set("progress", progress);
+      metadata.set("currentStep", i + 1);
+      metadata.set("totalSteps", duration);
+      
+      logger.info(`Processing step ${i + 1}/${duration}`);
+    }
+
+    metadata.set("status", "completed");
+    metadata.set("progress", 1);
+
+    const output: SimpleTaskOutput = {
+      message: `Processed: ${payload.message}`,
+      completedAt: new Date().toISOString(),
+    };
+
+    logger.info("Simple task completed", output);
+
+    return output;
+  },
+});
+
diff --git a/references/realtime-hooks-test/src/trigger/stream-task.ts b/references/realtime-hooks-test/src/trigger/stream-task.ts
new file mode 100644
index 00000000000..355f0e51a9e
--- /dev/null
+++ b/references/realtime-hooks-test/src/trigger/stream-task.ts
@@ -0,0 +1,106 @@
+import { task, logger, metadata, streams } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+import { dataStream, textStream } from "./streams";
+
+export type StreamTaskPayload = {
+  scenario: "text" | "json" | "mixed";
+  count?: number;
+};
+
+export type StreamTaskOutput = {
+  scenario: string;
+  totalChunks: number;
+};
+
+export const streamTask = task({
+  id: "stream-task",
+  run: async (payload: StreamTaskPayload) => {
+    const count = payload.count || 20;
+
+    logger.info("Starting stream task", { scenario: payload.scenario, count });
+
+    metadata.set("status", "streaming");
+    metadata.set("scenario", payload.scenario);
+
+    switch (payload.scenario) {
+      case "text": {
+        // Stream text chunks
+        const words = [
+          "The",
+          "quick",
+          "brown",
+          "fox",
+          "jumps",
+          "over",
+          "the",
+          "lazy",
+          "dog",
+          "while",
+          "demonstrating",
+          "real-time",
+          "streaming",
+          "capabilities",
+        ];
+
+        for (let i = 0; i < count; i++) {
+          await setTimeout(100);
+          await textStream.append(words[i % words.length] + " ");
+          metadata.set("progress", (i + 1) / count);
+        }
+
+        break;
+      }
+
+      case "json": {
+        // Stream structured data
+        for (let i = 0; i < count; i++) {
+          await setTimeout(100);
+          await dataStream.append({
+            step: i + 1,
+            data: `Processing item ${i + 1}`,
+            timestamp: Date.now(),
+          });
+          metadata.set("progress", (i + 1) / count);
+        }
+
+        break;
+      }
+
+      case "mixed": {
+        // Stream to both streams
+        const words = ["Alpha", "Beta", "Gamma", "Delta", "Epsilon"];
+
+        for (let i = 0; i < count; i++) {
+          await setTimeout(100);
+
+          // Alternate between streams
+          if (i % 2 === 0) {
+            await textStream.append(words[i % words.length] + " ");
+          } else {
+            await dataStream.append({
+              step: i + 1,
+              data: `Data point ${i + 1}`,
+              timestamp: Date.now(),
+            });
+          }
+
+          metadata.set("progress", (i + 1) / count);
+        }
+
+        break;
+      }
+    }
+
+    metadata.set("status", "completed");
+    metadata.set("progress", 1);
+
+    const output: StreamTaskOutput = {
+      scenario: payload.scenario,
+      totalChunks: count,
+    };
+
+    logger.info("Stream task completed", output);
+
+    return output;
+  },
+});
diff --git a/references/realtime-hooks-test/src/trigger/streams.ts b/references/realtime-hooks-test/src/trigger/streams.ts
new file mode 100644
index 00000000000..a0b46cfb203
--- /dev/null
+++ b/references/realtime-hooks-test/src/trigger/streams.ts
@@ -0,0 +1,9 @@
+import { streams } from "@trigger.dev/sdk";
+
+export const textStream = streams.define<string>({
+  id: "text",
+});
+
+export const dataStream = streams.define<{ step: number; data: string; timestamp: number }>({
+  id: "data",
+});
diff --git a/references/realtime-hooks-test/src/trigger/tagged-task.ts b/references/realtime-hooks-test/src/trigger/tagged-task.ts
new file mode 100644
index 00000000000..e9f30f522fb
--- /dev/null
+++ b/references/realtime-hooks-test/src/trigger/tagged-task.ts
@@ -0,0 +1,45 @@
+import { task, logger, metadata } from "@trigger.dev/sdk";
+import { setTimeout } from "timers/promises";
+
+export type TaggedTaskPayload = {
+  userId: string;
+  action: string;
+};
+
+export type TaggedTaskOutput = {
+  userId: string;
+  action: string;
+  processedAt: string;
+};
+
+export const taggedTask = task({
+  id: "tagged-task",
+  run: async (payload: TaggedTaskPayload) => {
+    logger.info("Starting tagged task", payload);
+    
+    metadata.set("status", "processing");
+    metadata.set("userId", payload.userId);
+    metadata.set("action", payload.action);
+
+    // Simulate some work
+    const steps = 5;
+    for (let i = 0; i < steps; i++) {
+      await setTimeout(1000);
+      metadata.set("progress", (i + 1) / steps);
+      logger.info(`Processing step ${i + 1}/${steps} for user ${payload.userId}`);
+    }
+
+    metadata.set("status", "completed");
+
+    const output: TaggedTaskOutput = {
+      userId: payload.userId,
+      action: payload.action,
+      processedAt: new Date().toISOString(),
+    };
+
+    logger.info("Tagged task completed", output);
+
+    return output;
+  },
+});
+
diff --git a/references/realtime-hooks-test/tailwind.config.ts b/references/realtime-hooks-test/tailwind.config.ts
new file mode 100644
index 00000000000..91ca64310da
--- /dev/null
+++ b/references/realtime-hooks-test/tailwind.config.ts
@@ -0,0 +1,14 @@
+import type { Config } from "tailwindcss";
+
+export default {
+  content: [
+    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
+    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
+  ],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+} satisfies Config;
+
diff --git a/references/realtime-hooks-test/trigger.config.ts b/references/realtime-hooks-test/trigger.config.ts
new file mode 100644
index 00000000000..7346fbeec01
--- /dev/null
+++ b/references/realtime-hooks-test/trigger.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  dirs: ["./src/trigger"],
+  maxDuration: 3600,
+});
diff --git a/references/realtime-hooks-test/tsconfig.json b/references/realtime-hooks-test/tsconfig.json
new file mode 100644
index 00000000000..7f64e8882ae
--- /dev/null
+++ b/references/realtime-hooks-test/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
+}
+
diff --git a/references/realtime-streams/.gitignore b/references/realtime-streams/.gitignore
new file mode 100644
index 00000000000..5ef6a520780
--- /dev/null
+++ b/references/realtime-streams/.gitignore
@@ -0,0 +1,41 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env*
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
diff --git a/references/realtime-streams/README.md b/references/realtime-streams/README.md
new file mode 100644
index 00000000000..e215bc4ccf1
--- /dev/null
+++ b/references/realtime-streams/README.md
@@ -0,0 +1,36 @@
+This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+npm run dev
+# or
+yarn dev
+# or
+pnpm dev
+# or
+bun dev
+```
+
+Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+
+You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+
+This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+
+## Learn More
+
+To learn more about Next.js, take a look at the following resources:
+
+- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
+- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+
+You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+
+## Deploy on Vercel
+
+The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
+
+Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
diff --git a/references/realtime-streams/TESTING.md b/references/realtime-streams/TESTING.md
new file mode 100644
index 00000000000..369ba36f3b9
--- /dev/null
+++ b/references/realtime-streams/TESTING.md
@@ -0,0 +1,74 @@
+# Realtime Streams Testing Guide
+
+## Overview
+
+This app is set up to test Trigger.dev realtime streams with resume/reconnection functionality.
+
+## How It Works
+
+### 1. Home Page (`/`)
+
+- Displays buttons for different stream scenarios
+- Each button triggers a server action that:
+  1. Starts a new task run
+  2. Redirects to `/runs/[runId]?accessToken=xxx`
+
+### 2. Run Page (`/runs/[runId]`)
+
+- Displays the live stream for a specific run
+- Receives `runId` from URL path parameter
+- Receives `accessToken` from URL query parameter
+- Shows real-time streaming content using `useRealtimeRunWithStreams`
+
+## Testing Resume/Reconnection
+
+### Test Scenario 1: Page Refresh
+
+1. Click any stream button (e.g., "Markdown Stream")
+2. Watch the stream start
+3. **Refresh the page** (Cmd/Ctrl + R)
+4. The stream should reconnect and continue from where it left off
+
+### Test Scenario 2: Network Interruption
+
+1. Start a long-running stream (e.g., "Stall Stream")
+2. Open DevTools → Network tab
+3. Throttle to "Offline" briefly
+4. Return to "Online"
+5. Stream should recover and resume
+
+### Test Scenario 3: URL Navigation
+
+1. Start a stream
+2. Copy the URL
+3. Open in a new tab
+4. Both tabs should show the same stream state
+
+## Available Stream Scenarios
+
+- **Markdown Stream**: Fast streaming of formatted markdown (good for quick tests)
+- **Continuous Stream**: 45 seconds of continuous word streaming
+- **Burst Stream**: 10 bursts of rapid tokens with pauses
+- **Stall Stream**: 3-minute test with long pauses (tests timeout handling)
+- **Slow Steady Stream**: 5-minute slow stream (tests long connections)
+
+## What to Watch For
+
+1. **Resume functionality**: After refresh, does the stream continue or restart?
+2. **No duplicate data**: Reconnection should not repeat already-seen chunks
+3. **Console logs**: Check for `[MetadataStream]` logs showing resume behavior
+4. **Run status**: Status should update correctly (EXECUTING → COMPLETED)
+5. **Token count**: Final token count should be accurate (no missing chunks)
+
+## Debugging
+
+Check browser console for:
+
+- `[MetadataStream]` logs showing HEAD requests and resume logic
+- Network requests to `/realtime/v1/streams/...`
+- Any errors or warnings
+
+Check server logs for:
+
+- Stream ingestion logs
+- Resume header values (`X-Resume-From-Chunk`, `X-Last-Chunk-Index`)
diff --git a/references/realtime-streams/next.config.ts b/references/realtime-streams/next.config.ts
new file mode 100644
index 00000000000..e9ffa3083ad
--- /dev/null
+++ b/references/realtime-streams/next.config.ts
@@ -0,0 +1,7 @@
+import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+  /* config options here */
+};
+
+export default nextConfig;
diff --git a/references/realtime-streams/package.json b/references/realtime-streams/package.json
new file mode 100644
index 00000000000..965443153f3
--- /dev/null
+++ b/references/realtime-streams/package.json
@@ -0,0 +1,33 @@
+{
+  "name": "references-realtime-streams",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev --turbopack",
+    "build": "next build --turbopack",
+    "start": "next start",
+    "dev:trigger": "trigger dev",
+    "deploy": "trigger deploy"
+  },
+  "dependencies": {
+    "@ai-sdk/openai": "^2.0.53",
+    "@trigger.dev/react-hooks": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "ai": "^5.0.76",
+    "next": "15.5.6",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "shiki": "^3.13.0",
+    "streamdown": "^1.4.0",
+    "zod": "3.25.76"
+  },
+  "devDependencies": {
+    "@tailwindcss/postcss": "^4",
+    "@types/node": "^20",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "tailwindcss": "^4",
+    "trigger.dev": "workspace:*",
+    "typescript": "^5"
+  }
+}
\ No newline at end of file
diff --git a/references/realtime-streams/postcss.config.mjs b/references/realtime-streams/postcss.config.mjs
new file mode 100644
index 00000000000..c7bcb4b1ee1
--- /dev/null
+++ b/references/realtime-streams/postcss.config.mjs
@@ -0,0 +1,5 @@
+const config = {
+  plugins: ["@tailwindcss/postcss"],
+};
+
+export default config;
diff --git a/references/realtime-streams/public/file.svg b/references/realtime-streams/public/file.svg
new file mode 100644
index 00000000000..004145cddf3
--- /dev/null
+++ b/references/realtime-streams/public/file.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/references/realtime-streams/public/globe.svg b/references/realtime-streams/public/globe.svg
new file mode 100644
index 00000000000..567f17b0d7c
--- /dev/null
+++ b/references/realtime-streams/public/globe.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/references/realtime-streams/public/next.svg b/references/realtime-streams/public/next.svg
new file mode 100644
index 00000000000..5174b28c565
--- /dev/null
+++ b/references/realtime-streams/public/next.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/references/realtime-streams/public/vercel.svg b/references/realtime-streams/public/vercel.svg
new file mode 100644
index 00000000000..77053960334
--- /dev/null
+++ b/references/realtime-streams/public/vercel.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/references/realtime-streams/public/window.svg b/references/realtime-streams/public/window.svg
new file mode 100644
index 00000000000..b2b2a44f6eb
--- /dev/null
+++ b/references/realtime-streams/public/window.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
\ No newline at end of file
diff --git a/references/realtime-streams/src/app/actions.ts b/references/realtime-streams/src/app/actions.ts
new file mode 100644
index 00000000000..2c18d11e6c6
--- /dev/null
+++ b/references/realtime-streams/src/app/actions.ts
@@ -0,0 +1,56 @@
+"use server";
+
+import { tasks, auth } from "@trigger.dev/sdk";
+import type { streamsTask } from "@/trigger/streams";
+import type { aiChatTask } from "@/trigger/ai-chat";
+import { redirect } from "next/navigation";
+import type { UIMessage } from "ai";
+
+export async function triggerStreamTask(
+  scenario: string,
+  redirectPath?: string,
+  useDurableStreams?: boolean
+) {
+  const config = !useDurableStreams
+    ? {
+        future: {
+          v2RealtimeStreams: false,
+        },
+      }
+    : undefined;
+
+  // Trigger the streams task
+  const handle = await tasks.trigger<typeof streamsTask>(
+    "streams",
+    {
+      scenario: scenario as any,
+    },
+    {},
+    {
+      clientConfig: config,
+    }
+  );
+
+  // Redirect to custom path or default run page
+  const path = redirectPath
+    ? `${redirectPath}/${handle.id}?accessToken=${handle.publicAccessToken}&isMarkdown=${
+        scenario === "markdown" ? "true" : "false"
+      }`
+    : `/runs/${handle.id}?accessToken=${handle.publicAccessToken}&isMarkdown=${
+        scenario === "markdown" ? "true" : "false"
+      }`;
+
+  redirect(path);
+}
+
+export async function triggerAIChatTask(messages: UIMessage[]) {
+  // Trigger the AI chat task
+  const handle = await tasks.trigger<typeof aiChatTask>("ai-chat", {
+    messages,
+  });
+
+  console.log("Triggered AI chat run:", handle.id);
+
+  // Redirect to chat page
+  redirect(`/chat/${handle.id}?accessToken=${handle.publicAccessToken}`);
+}
diff --git a/references/realtime-streams/src/app/chat/[runId]/page.tsx b/references/realtime-streams/src/app/chat/[runId]/page.tsx
new file mode 100644
index 00000000000..39c05d2312d
--- /dev/null
+++ b/references/realtime-streams/src/app/chat/[runId]/page.tsx
@@ -0,0 +1,57 @@
+import { AIChat } from "@/components/ai-chat";
+import Link from "next/link";
+
+export default function ChatPage({
+  params,
+  searchParams,
+}: {
+  params: { runId: string };
+  searchParams: { accessToken?: string };
+}) {
+  const { runId } = params;
+  const accessToken = searchParams.accessToken;
+
+  if (!accessToken) {
+    return (
+      <div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20">
+        <main className="flex flex-col gap-8 row-start-2 items-center">
+          <h1 className="text-2xl font-bold text-red-600">Missing Access Token</h1>
+          <p className="text-gray-600">This page requires an access token to view the stream.</p>
+          <Link href="/" className="text-blue-600 hover:underline">
+            Go back home
+          </Link>
+        </main>
+      </div>
+    );
+  }
+
+  return (
+    <div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20">
+      <main className="flex flex-col gap-8 row-start-2 items-start w-full max-w-4xl">
+        <div className="flex items-center justify-between w-full">
+          <h1 className="text-2xl font-bold">AI Chat Stream: {runId}</h1>
+          <Link
+            href="/"
+            className="px-4 py-2 bg-gray-200 text-gray-800 rounded-lg hover:bg-gray-300 transition-colors"
+          >
+            ← Back to Home
+          </Link>
+        </div>
+
+        <div className="w-full bg-purple-50 p-4 rounded-lg">
+          <p className="text-sm text-purple-900 mb-2">
+            🤖 <strong>AI SDK v5:</strong> This stream uses AI SDK&apos;s streamText with
+            toUIMessageStream()
+          </p>
+          <p className="text-xs text-purple-700">
+            Try refreshing to test stream reconnection - it should resume where it left off.
+          </p>
+        </div>
+
+        <div className="w-full border border-gray-200 rounded-lg p-6 bg-white">
+          <AIChat accessToken={accessToken} runId={runId} />
+        </div>
+      </main>
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/app/favicon.ico b/references/realtime-streams/src/app/favicon.ico
new file mode 100644
index 00000000000..718d6fea483
Binary files /dev/null and b/references/realtime-streams/src/app/favicon.ico differ
diff --git a/references/realtime-streams/src/app/globals.css b/references/realtime-streams/src/app/globals.css
new file mode 100644
index 00000000000..ddf2db1b8b0
--- /dev/null
+++ b/references/realtime-streams/src/app/globals.css
@@ -0,0 +1,28 @@
+@import "tailwindcss";
+
+@source "../node_modules/streamdown/dist/index.js";
+
+:root {
+  --background: #ffffff;
+  --foreground: #171717;
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --font-sans: var(--font-geist-sans);
+  --font-mono: var(--font-geist-mono);
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --background: #0a0a0a;
+    --foreground: #ededed;
+  }
+}
+
+body {
+  background: var(--background);
+  color: var(--foreground);
+  font-family: Arial, Helvetica, sans-serif;
+}
diff --git a/references/realtime-streams/src/app/layout.tsx b/references/realtime-streams/src/app/layout.tsx
new file mode 100644
index 00000000000..3afae75ee03
--- /dev/null
+++ b/references/realtime-streams/src/app/layout.tsx
@@ -0,0 +1,33 @@
+import type { Metadata } from "next";
+import { Geist, Geist_Mono } from "next/font/google";
+import "./globals.css";
+
+const geistSans = Geist({
+  variable: "--font-geist-sans",
+  subsets: ["latin"],
+});
+
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",
+  subsets: ["latin"],
+});
+
+export const metadata: Metadata = {
+  title: "Create Next App",
+  description: "Generated by create next app",
+};
+
+export default function RootLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <html lang="en">
+      <head>
+        <script crossOrigin="anonymous" src="//unpkg.com/react-scan/dist/auto.global.js" />
+      </head>
+      <body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>{children}</body>
+    </html>
+  );
+}
diff --git a/references/realtime-streams/src/app/page.tsx b/references/realtime-streams/src/app/page.tsx
new file mode 100644
index 00000000000..76beed7a291
--- /dev/null
+++ b/references/realtime-streams/src/app/page.tsx
@@ -0,0 +1,61 @@
+import { TriggerButton } from "@/components/trigger-button";
+import { AIChatButton } from "@/components/ai-chat-button";
+
+export default function Home() {
+  return (
+    <div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20">
+      <main className="flex flex-col gap-[32px] row-start-2 items-center sm:items-start">
+        <h1 className="text-3xl font-bold mb-4">Realtime Streams Test</h1>
+        <p className="text-gray-600 mb-8">
+          Click a button below to trigger a streaming task and watch it in real-time. You can
+          refresh the page to test stream reconnection.
+        </p>
+
+        <div className="mt-8 pt-8 border-t border-gray-300 w-full">
+          <h2 className="text-xl font-semibold mb-4">AI Chat Stream (AI SDK v5)</h2>
+          <p className="text-sm text-gray-600 mb-4">
+            Test AI SDK v5&apos;s streamText with toUIMessageStream()
+          </p>
+          <AIChatButton />
+        </div>
+
+        <div className="flex flex-col gap-4">
+          <TriggerButton scenario="markdown">Markdown Stream</TriggerButton>
+          <TriggerButton scenario="continuous">Continuous Stream</TriggerButton>
+          <TriggerButton scenario="burst">Burst Stream</TriggerButton>
+          <TriggerButton scenario="stall">Stall Stream (3 min)</TriggerButton>
+          <TriggerButton scenario="slow-steady">Slow Steady Stream (5 min)</TriggerButton>
+        </div>
+
+        <div className="flex flex-col gap-4">
+          <TriggerButton useDurableStreams={true} scenario="markdown">
+            Markdown Stream (Durable)
+          </TriggerButton>
+          <TriggerButton useDurableStreams={true} scenario="continuous">
+            Continuous Stream (Durable)
+          </TriggerButton>
+          <TriggerButton useDurableStreams={true} scenario="burst">
+            Burst Stream (Durable)
+          </TriggerButton>
+          <TriggerButton useDurableStreams={true} scenario="stall">
+            Stall Stream (3 min) (Durable)
+          </TriggerButton>
+          <TriggerButton useDurableStreams={true} scenario="slow-steady">
+            Slow Steady Stream (5 min) (Durable)
+          </TriggerButton>
+        </div>
+
+        <div className="mt-8 pt-8 border-t border-gray-300">
+          <h2 className="text-xl font-semibold mb-4">Performance Testing</h2>
+          <TriggerButton scenario="performance" redirect="/performance">
+            📊 Performance Test V1 (Latency Monitoring)
+          </TriggerButton>
+
+          <TriggerButton scenario="performance" redirect="/performance" useDurableStreams={true}>
+            📊 Performance Test V2 (Latency Monitoring)
+          </TriggerButton>
+        </div>
+      </main>
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/app/performance/[runId]/page.tsx b/references/realtime-streams/src/app/performance/[runId]/page.tsx
new file mode 100644
index 00000000000..1563bf731e6
--- /dev/null
+++ b/references/realtime-streams/src/app/performance/[runId]/page.tsx
@@ -0,0 +1,56 @@
+import { PerformanceMonitor } from "@/components/performance-monitor";
+import Link from "next/link";
+
+export default function PerformancePage({
+  params,
+  searchParams,
+}: {
+  params: { runId: string };
+  searchParams: { accessToken?: string };
+}) {
+  const { runId } = params;
+  const accessToken = searchParams.accessToken;
+
+  if (!accessToken) {
+    return (
+      <div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20">
+        <main className="flex flex-col gap-8 row-start-2 items-center">
+          <h1 className="text-2xl font-bold text-red-600">Missing Access Token</h1>
+          <p className="text-gray-600">This page requires an access token to view the stream.</p>
+          <Link href="/" className="text-blue-600 hover:underline">
+            Go back home
+          </Link>
+        </main>
+      </div>
+    );
+  }
+
+  return (
+    <div className="font-sans min-h-screen p-8 bg-gray-50">
+      <div className="max-w-7xl mx-auto">
+        <div className="flex items-center justify-between mb-8">
+          <div>
+            <h1 className="text-3xl font-bold text-gray-900">Performance Monitor</h1>
+            <p className="text-sm text-gray-600 mt-1">Run: {runId}</p>
+          </div>
+          <Link
+            href="/"
+            className="px-4 py-2 bg-white border border-gray-300 text-gray-800 rounded-lg hover:bg-gray-50 transition-colors"
+          >
+            ← Back to Home
+          </Link>
+        </div>
+
+        <div className="bg-blue-50 border border-blue-200 rounded-lg p-4 mb-6">
+          <p className="text-sm text-blue-900">
+            <strong>📊 Real-time Latency Monitoring:</strong> This page measures the time it takes
+            for each chunk to travel from the task to your browser. Lower latency = better
+            performance!
+          </p>
+        </div>
+
+        <PerformanceMonitor accessToken={accessToken} runId={runId} />
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/app/runs/[runId]/page.tsx b/references/realtime-streams/src/app/runs/[runId]/page.tsx
new file mode 100644
index 00000000000..54854dfe750
--- /dev/null
+++ b/references/realtime-streams/src/app/runs/[runId]/page.tsx
@@ -0,0 +1,58 @@
+import { Streams } from "@/components/streams";
+import Link from "next/link";
+
+export default function RunPage({
+  params,
+  searchParams,
+}: {
+  params: { runId: string };
+  searchParams: { accessToken?: string; isMarkdown?: string };
+}) {
+  const { runId } = params;
+  const accessToken = searchParams.accessToken;
+  const isMarkdown = searchParams.isMarkdown === "true";
+
+  if (!accessToken) {
+    return (
+      <div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20">
+        <main className="flex flex-col gap-8 row-start-2 items-center">
+          <h1 className="text-2xl font-bold text-red-600">Missing Access Token</h1>
+          <p className="text-gray-600">This page requires an access token to view the stream.</p>
+          <Link href="/" className="text-blue-600 hover:underline">
+            Go back home
+          </Link>
+        </main>
+      </div>
+    );
+  }
+
+  return (
+    <div className="font-sans grid grid-rows-[20px_1fr_20px] items-center justify-items-center min-h-screen p-8 pb-20 gap-16 sm:p-20">
+      <main className="flex flex-col gap-8 row-start-2 items-start w-full max-w-4xl">
+        <div className="flex items-center justify-between w-full">
+          <h1 className="text-2xl font-bold">Stream Run: {runId}</h1>
+          <Link
+            href="/"
+            className="px-4 py-2 bg-gray-200 text-gray-800 rounded-lg hover:bg-gray-300 transition-colors"
+          >
+            ← Back to Home
+          </Link>
+        </div>
+
+        <div className="w-full bg-gray-50 p-4 rounded-lg">
+          <p className="text-sm text-gray-600 mb-2">
+            💡 <strong>Tip:</strong> Try refreshing this page to test stream reconnection and resume
+            functionality.
+          </p>
+          <p className="text-xs text-gray-500">
+            The stream should continue from where it left off after a refresh.
+          </p>
+        </div>
+
+        <div className="w-full border border-gray-200 rounded-lg p-6 bg-white">
+          <Streams accessToken={accessToken} runId={runId} isMarkdown={isMarkdown} />
+        </div>
+      </main>
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/app/streams.ts b/references/realtime-streams/src/app/streams.ts
new file mode 100644
index 00000000000..da977ab8714
--- /dev/null
+++ b/references/realtime-streams/src/app/streams.ts
@@ -0,0 +1,12 @@
+import { InferStreamType, streams } from "@trigger.dev/sdk";
+import { UIMessageChunk } from "ai";
+
+export const demoStream = streams.define<string>({
+  id: "demo",
+});
+
+export type DemoStreamPart = InferStreamType<typeof demoStream>;
+
+export const aiStream = streams.define<UIMessageChunk>({
+  id: "ai",
+});
diff --git a/references/realtime-streams/src/components/ai-chat-button.tsx b/references/realtime-streams/src/components/ai-chat-button.tsx
new file mode 100644
index 00000000000..373a8c8b581
--- /dev/null
+++ b/references/realtime-streams/src/components/ai-chat-button.tsx
@@ -0,0 +1,39 @@
+"use client";
+
+import { triggerAIChatTask } from "@/app/actions";
+import { useTransition } from "react";
+import type { UIMessage } from "ai";
+
+export function AIChatButton() {
+  const [isPending, startTransition] = useTransition();
+
+  function handleClick() {
+    startTransition(async () => {
+      // Create a sample conversation to trigger
+      const messages: UIMessage[] = [
+        {
+          id: "1",
+          role: "user",
+          parts: [
+            {
+              type: "text",
+              text: "Write a detailed explanation of how streaming works in modern web applications, including the benefits and common use cases.",
+            },
+          ],
+        },
+      ];
+
+      await triggerAIChatTask(messages);
+    });
+  }
+
+  return (
+    <button
+      onClick={handleClick}
+      disabled={isPending}
+      className="px-6 py-3 bg-purple-600 text-white rounded-lg hover:bg-purple-700 disabled:bg-gray-400 disabled:cursor-not-allowed transition-colors"
+    >
+      {isPending ? "Starting AI Chat..." : "🤖 Start AI Chat Stream"}
+    </button>
+  );
+}
diff --git a/references/realtime-streams/src/components/ai-chat.tsx b/references/realtime-streams/src/components/ai-chat.tsx
new file mode 100644
index 00000000000..d0d8559caa5
--- /dev/null
+++ b/references/realtime-streams/src/components/ai-chat.tsx
@@ -0,0 +1,219 @@
+"use client";
+
+import { aiStream } from "@/app/streams";
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import type { UIMessage } from "ai";
+import { Streamdown } from "streamdown";
+
+export function AIChat({ accessToken, runId }: { accessToken: string; runId: string }) {
+  return (
+    <div className="space-y-8">
+      <AIChatStats accessToken={accessToken} runId={runId} />
+      <AIChatFull accessToken={accessToken} runId={runId} />
+    </div>
+  );
+}
+
+function AIChatStats({ accessToken, runId }: { accessToken: string; runId: string }) {
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    timeoutInSeconds: 600,
+  });
+
+  if (error) return <div className="text-red-600 font-semibold">Error: {error.message}</div>;
+
+  if (!parts || parts.length === 0) {
+    return (
+      <div className="p-4 rounded-lg bg-blue-50 border-l-4 border-blue-500">
+        <div className="text-sm font-semibold text-blue-900 mb-2">📊 Stream Statistics</div>
+        <div className="text-xs text-blue-700">Waiting for stream data...</div>
+      </div>
+    );
+  }
+
+  console.log(parts);
+
+  // Calculate statistics
+  const stats = {
+    totalChunks: parts.length,
+    textStartChunks: 0,
+    textDeltaChunks: 0,
+    textEndChunks: 0,
+    errorChunks: 0,
+    otherChunks: 0,
+    totalCharacters: 0,
+    averageChunkSize: 0,
+  };
+
+  const chunkTimings: number[] = [];
+  let firstChunkTime: number | null = null;
+  let lastChunkTime: number | null = null;
+
+  for (const chunk of parts) {
+    switch (chunk.type) {
+      case "text-start":
+        stats.textStartChunks++;
+        break;
+      case "text-delta":
+        stats.textDeltaChunks++;
+        stats.totalCharacters += chunk.delta.length;
+        break;
+      case "text-end":
+        stats.textEndChunks++;
+        break;
+      case "error":
+        stats.errorChunks++;
+        break;
+      default:
+        stats.otherChunks++;
+    }
+  }
+
+  stats.averageChunkSize =
+    stats.textDeltaChunks > 0 ? Math.round(stats.totalCharacters / stats.textDeltaChunks) : 0;
+
+  const isStreaming = stats.textEndChunks === 0;
+
+  return (
+    <div className="p-4 rounded-lg bg-blue-50 border-l-4 border-blue-500">
+      <div className="text-sm font-semibold text-blue-900 mb-3">
+        📊 Stream Statistics {isStreaming && <span className="text-blue-600">(live)</span>}
+      </div>
+
+      <div className="grid grid-cols-2 md:grid-cols-4 gap-4 text-xs">
+        <div>
+          <div className="text-blue-600 font-semibold">Total Chunks</div>
+          <div className="text-blue-900 text-lg font-bold">{stats.totalChunks}</div>
+        </div>
+        <div>
+          <div className="text-blue-600 font-semibold">Text Deltas</div>
+          <div className="text-blue-900 text-lg font-bold">{stats.textDeltaChunks}</div>
+        </div>
+        <div>
+          <div className="text-blue-600 font-semibold">Total Characters</div>
+          <div className="text-blue-900 text-lg font-bold">{stats.totalCharacters}</div>
+        </div>
+        <div>
+          <div className="text-blue-600 font-semibold">Avg Chunk Size</div>
+          <div className="text-blue-900 text-lg font-bold">{stats.averageChunkSize} chars</div>
+        </div>
+      </div>
+
+      <div className="mt-3 pt-3 border-t border-blue-200 grid grid-cols-2 md:grid-cols-5 gap-2 text-xs">
+        <div>
+          <span className="text-blue-600">text-start:</span>{" "}
+          <span className="text-blue-900 font-semibold">{stats.textStartChunks}</span>
+        </div>
+        <div>
+          <span className="text-blue-600">text-delta:</span>{" "}
+          <span className="text-blue-900 font-semibold">{stats.textDeltaChunks}</span>
+        </div>
+        <div>
+          <span className="text-blue-600">text-end:</span>{" "}
+          <span className="text-blue-900 font-semibold">{stats.textEndChunks}</span>
+        </div>
+        <div>
+          <span className="text-blue-600">errors:</span>{" "}
+          <span className="text-blue-900 font-semibold">{stats.errorChunks}</span>
+        </div>
+        <div>
+          <span className="text-blue-600">other:</span>{" "}
+          <span className="text-blue-900 font-semibold">{stats.otherChunks}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function AIChatFull({ accessToken, runId }: { accessToken: string; runId: string }) {
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    timeoutInSeconds: 600,
+  });
+
+  if (error) return <div className="text-red-600 font-semibold">Error: {error.message}</div>;
+
+  if (!parts) return <div className="text-gray-600">Loading...</div>;
+
+  // Compute derived state directly from parts
+  let accumulatedText = "";
+  let currentId: string | null = null;
+  let isComplete = false;
+
+  for (const chunk of parts) {
+    switch (chunk.type) {
+      case "text-start":
+        if (!currentId) {
+          currentId = chunk.id;
+        }
+        break;
+      case "text-delta":
+        accumulatedText += chunk.delta;
+        break;
+      case "text-end":
+        isComplete = true;
+        break;
+      case "error":
+        console.error("Stream error:", chunk.errorText);
+        break;
+    }
+  }
+
+  // Determine what to render
+  const messages: UIMessage[] = [];
+  let currentText = "";
+  let currentMessageId: string | null = null;
+  let currentRole: "assistant" | null = null;
+
+  if (isComplete && currentId && accumulatedText) {
+    // Streaming is complete, show as completed message
+    messages.push({
+      id: currentId,
+      role: "assistant",
+      parts: [{ type: "text", text: accumulatedText }],
+    });
+  } else if (currentId) {
+    // Still streaming
+    currentText = accumulatedText;
+    currentMessageId = currentId;
+    currentRole = "assistant";
+  }
+
+  return (
+    <div className="space-y-6">
+      <div className="text-sm font-medium text-gray-700 mb-4">
+        <span className="font-semibold">Run:</span> {runId}
+      </div>
+
+      {/* Render completed messages */}
+      {messages.map((message) => (
+        <div key={message.id} className="p-4 rounded-lg bg-gray-50 border-l-4 border-purple-500">
+          <div className="text-xs font-semibold text-gray-500 uppercase mb-2">{message.role}</div>
+          <div className="prose prose-sm max-w-none text-gray-900">
+            {message.parts.map((part, idx) =>
+              part.type === "text" ? (
+                <Streamdown key={idx} isAnimating={false}>
+                  {part.text}
+                </Streamdown>
+              ) : null
+            )}
+          </div>
+        </div>
+      ))}
+
+      {/* Render current streaming message */}
+      {currentMessageId && currentRole && (
+        <div className="p-4 rounded-lg bg-gray-50 border-l-4 border-purple-500">
+          <div className="text-xs font-semibold text-gray-500 uppercase mb-2">
+            {currentRole} <span className="text-purple-600">(streaming...)</span>
+          </div>
+          <div className="prose prose-sm max-w-none text-gray-900">
+            <Streamdown isAnimating={true}>{currentText}</Streamdown>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/components/performance-monitor.tsx b/references/realtime-streams/src/components/performance-monitor.tsx
new file mode 100644
index 00000000000..f3ecaf4e2f2
--- /dev/null
+++ b/references/realtime-streams/src/components/performance-monitor.tsx
@@ -0,0 +1,240 @@
+"use client";
+
+import { demoStream } from "@/app/streams";
+import type { PerformanceChunk } from "@/trigger/streams";
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { useEffect, useMemo, useRef, useState } from "react";
+
+type ChunkLatency = {
+  chunkIndex: number;
+  sentAt: number;
+  receivedAt: number;
+  latency: number;
+  data: string;
+};
+
+export function PerformanceMonitor({ accessToken, runId }: { accessToken: string; runId: string }) {
+  const { parts, error } = useRealtimeStream(demoStream, runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+  });
+
+  const [firstChunkTime, setFirstChunkTime] = useState<number | null>(null);
+  const [startTime] = useState<number>(Date.now());
+  const [chunkLatencies, setChunkLatencies] = useState<ChunkLatency[]>([]);
+  const processedCountRef = useRef<number>(0);
+
+  // Process new chunks only (append-only pattern)
+  useEffect(() => {
+    if (!parts || parts.length === 0) return;
+
+    // Only process chunks we haven't seen yet
+    const newChunks = parts.slice(processedCountRef.current);
+    if (newChunks.length === 0) return;
+
+    const now = Date.now();
+    const newLatencies: ChunkLatency[] = [];
+
+    for (const rawChunk of newChunks) {
+      try {
+        const chunk: PerformanceChunk = JSON.parse(rawChunk);
+
+        if (chunkLatencies.length === 0 && firstChunkTime === null) {
+          setFirstChunkTime(now);
+        }
+
+        newLatencies.push({
+          chunkIndex: chunk.chunkIndex,
+          sentAt: chunk.timestamp,
+          receivedAt: now,
+          latency: now - chunk.timestamp,
+          data: chunk.data,
+        });
+      } catch (e) {
+        // Skip non-JSON chunks
+        console.error("Failed to parse chunk:", rawChunk, e);
+      }
+    }
+
+    if (newLatencies.length > 0) {
+      setChunkLatencies((prev) => [...prev, ...newLatencies]);
+      processedCountRef.current = parts.length;
+    }
+  }, [parts, chunkLatencies.length, firstChunkTime]);
+
+  // Calculate statistics
+  const stats = useMemo(() => {
+    if (chunkLatencies.length === 0) {
+      return {
+        count: 0,
+        avgLatency: 0,
+        minLatency: 0,
+        maxLatency: 0,
+        p50: 0,
+        p95: 0,
+        p99: 0,
+        timeToFirstChunk: null,
+      };
+    }
+
+    // Create sorted copy for percentile calculations
+    const sortedLatencies = [...chunkLatencies.map((c) => c.latency)].sort((a, b) => a - b);
+    const sum = sortedLatencies.reduce((acc, val) => acc + val, 0);
+
+    // Correct percentile calculation
+    const percentile = (p: number) => {
+      if (sortedLatencies.length === 0) return 0;
+
+      // Use standard percentile formula: position = (p/100) * (n-1)
+      const position = (p / 100) * (sortedLatencies.length - 1);
+      const lower = Math.floor(position);
+      const upper = Math.ceil(position);
+
+      // Interpolate between values if needed
+      if (lower === upper) {
+        return sortedLatencies[lower];
+      }
+
+      const weight = position - lower;
+      return sortedLatencies[lower] * (1 - weight) + sortedLatencies[upper] * weight;
+    };
+
+    return {
+      count: chunkLatencies.length,
+      avgLatency: sum / sortedLatencies.length,
+      minLatency: sortedLatencies[0] || 0,
+      maxLatency: sortedLatencies[sortedLatencies.length - 1] || 0,
+      p50: percentile(50),
+      p95: percentile(95),
+      p99: percentile(99),
+      timeToFirstChunk: firstChunkTime ? firstChunkTime - startTime : null,
+    };
+  }, [chunkLatencies, firstChunkTime, startTime]);
+
+  if (error) {
+    return (
+      <div className="bg-red-50 border border-red-200 rounded-lg p-6">
+        <p className="text-red-600 font-semibold">Error: {error.message}</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* Metrics Grid */}
+      <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
+        <MetricCard label="Chunks Received" value={stats.count.toString()} suffix="chunks" />
+        <MetricCard label="Avg Latency" value={stats.avgLatency.toFixed(0)} suffix="ms" highlight />
+        <MetricCard label="P95 Latency" value={stats.p95.toFixed(0)} suffix="ms" />
+        <MetricCard label="P99 Latency" value={stats.p99.toFixed(0)} suffix="ms" />
+      </div>
+
+      {/* Additional Stats */}
+      <div className="bg-white rounded-lg shadow p-6">
+        <h3 className="text-lg font-semibold text-gray-900 mb-4">Detailed Statistics</h3>
+        <div className="grid grid-cols-2 md:grid-cols-3 gap-6">
+          <StatItem
+            label="Time to First Chunk"
+            value={
+              stats.timeToFirstChunk !== null
+                ? `${stats.timeToFirstChunk.toFixed(0)} ms`
+                : "Waiting..."
+            }
+          />
+          <StatItem label="Min Latency" value={`${stats.minLatency.toFixed(0)} ms`} />
+          <StatItem label="Max Latency" value={`${stats.maxLatency.toFixed(0)} ms`} />
+          <StatItem label="P50 (Median)" value={`${stats.p50.toFixed(0)} ms`} />
+          <StatItem label="Total Chunks" value={stats.count.toString()} />
+        </div>
+      </div>
+
+      {/* All Chunks Table */}
+      {chunkLatencies.length > 0 && (
+        <div className="bg-white rounded-lg shadow p-6">
+          <h3 className="text-lg font-semibold text-gray-900 mb-4">
+            All Chunks ({chunkLatencies.length} total)
+          </h3>
+          <div className="overflow-x-auto max-h-[600px] overflow-y-auto">
+            <table className="min-w-full divide-y divide-gray-200">
+              <thead className="bg-gray-50 sticky top-0">
+                <tr>
+                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                    Index
+                  </th>
+                  <th className="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase">
+                    Data
+                  </th>
+                  <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">
+                    Latency
+                  </th>
+                  <th className="px-4 py-3 text-right text-xs font-medium text-gray-500 uppercase">
+                    Sent At
+                  </th>
+                </tr>
+              </thead>
+              <tbody className="bg-white divide-y divide-gray-200">
+                {chunkLatencies.map((chunk, index) => (
+                  <tr key={`${chunk.chunkIndex}-${index}`} className="hover:bg-gray-50">
+                    <td className="px-4 py-3 text-sm text-gray-900">#{chunk.chunkIndex}</td>
+                    <td className="px-4 py-3 text-sm text-gray-600">{chunk.data}</td>
+                    <td className="px-4 py-3 text-sm text-right">
+                      <span
+                        className={`inline-block px-2 py-1 rounded text-xs font-semibold ${
+                          chunk.latency > stats.p95
+                            ? "bg-red-100 text-red-800"
+                            : chunk.latency > stats.p50
+                            ? "bg-yellow-100 text-yellow-800"
+                            : "bg-green-100 text-green-800"
+                        }`}
+                      >
+                        {chunk.latency.toFixed(0)} ms
+                      </span>
+                    </td>
+                    <td className="px-4 py-3 text-sm text-gray-500 text-right">
+                      {new Date(chunk.sentAt).toLocaleTimeString()}
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
+
+function MetricCard({
+  label,
+  value,
+  suffix,
+  highlight = false,
+}: {
+  label: string;
+  value: string;
+  suffix: string;
+  highlight?: boolean;
+}) {
+  return (
+    <div
+      className={`rounded-lg shadow p-4 ${
+        highlight ? "bg-blue-50 border-2 border-blue-200" : "bg-white"
+      }`}
+    >
+      <p className="text-xs font-medium text-gray-600 uppercase mb-1">{label}</p>
+      <p className={`text-2xl font-bold ${highlight ? "text-blue-900" : "text-gray-900"}`}>
+        {value}
+      </p>
+      <p className="text-xs text-gray-500 mt-1">{suffix}</p>
+    </div>
+  );
+}
+
+function StatItem({ label, value }: { label: string; value: string }) {
+  return (
+    <div>
+      <p className="text-sm text-gray-600">{label}</p>
+      <p className="text-lg font-semibold text-gray-900 mt-1">{value}</p>
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/components/streams.tsx b/references/realtime-streams/src/components/streams.tsx
new file mode 100644
index 00000000000..131c430a150
--- /dev/null
+++ b/references/realtime-streams/src/components/streams.tsx
@@ -0,0 +1,41 @@
+"use client";
+
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { Streamdown } from "streamdown";
+import { demoStream } from "@/app/streams";
+
+export function Streams({
+  accessToken,
+  runId,
+  isMarkdown,
+}: {
+  accessToken: string;
+  runId: string;
+  isMarkdown: boolean;
+}) {
+  const { parts, error } = useRealtimeStream(demoStream, runId, {
+    accessToken,
+    baseURL: process.env.NEXT_PUBLIC_TRIGGER_API_URL,
+    onData: (data) => {
+      // console.log(data);
+    },
+    timeoutInSeconds: 600,
+  });
+
+  if (error) return <div className="text-red-600 font-semibold">Error: {error.message}</div>;
+
+  if (!parts) return <div className="text-gray-600">Loading...</div>;
+
+  const stream = parts.join("");
+
+  return (
+    <div className="space-y-4">
+      <div className="text-sm font-medium text-gray-700">
+        <span className="font-semibold">Run:</span> {runId}
+      </div>
+      <div className="prose prose-sm max-w-none text-gray-900">
+        {isMarkdown ? <Streamdown isAnimating={true}>{stream}</Streamdown> : stream}
+      </div>
+    </div>
+  );
+}
diff --git a/references/realtime-streams/src/components/trigger-button.tsx b/references/realtime-streams/src/components/trigger-button.tsx
new file mode 100644
index 00000000000..3ceefb41357
--- /dev/null
+++ b/references/realtime-streams/src/components/trigger-button.tsx
@@ -0,0 +1,34 @@
+"use client";
+
+import { triggerStreamTask } from "@/app/actions";
+import { useTransition } from "react";
+
+export function TriggerButton({
+  scenario,
+  useDurableStreams,
+  children,
+  redirect,
+}: {
+  scenario: string;
+  useDurableStreams?: boolean;
+  children: React.ReactNode;
+  redirect?: string;
+}) {
+  const [isPending, startTransition] = useTransition();
+
+  function handleClick() {
+    startTransition(async () => {
+      await triggerStreamTask(scenario, redirect, useDurableStreams);
+    });
+  }
+
+  return (
+    <button
+      onClick={handleClick}
+      disabled={isPending}
+      className="px-6 py-3 bg-blue-600 text-white rounded-lg hover:bg-blue-700 disabled:bg-gray-400 disabled:cursor-not-allowed transition-colors"
+    >
+      {isPending ? "Triggering..." : children}
+    </button>
+  );
+}
diff --git a/references/realtime-streams/src/trigger/ai-chat.ts b/references/realtime-streams/src/trigger/ai-chat.ts
new file mode 100644
index 00000000000..d5c681d07ba
--- /dev/null
+++ b/references/realtime-streams/src/trigger/ai-chat.ts
@@ -0,0 +1,79 @@
+import { aiStream } from "@/app/streams";
+import { openai } from "@ai-sdk/openai";
+import { logger, streams, task } from "@trigger.dev/sdk";
+import {
+  convertToModelMessages,
+  readUIMessageStream,
+  stepCountIs,
+  streamText,
+  tool,
+  UIMessage,
+} from "ai";
+import { z } from "zod/v4";
+
+export type AIChatPayload = {
+  messages: UIMessage[];
+};
+
+export const aiChatTask = task({
+  id: "ai-chat",
+  run: async (payload: AIChatPayload) => {
+    logger.info("Starting AI chat stream", {
+      messageCount: payload.messages.length,
+    });
+
+    // Stream text from OpenAI
+    const result = streamText({
+      model: openai("gpt-4o"),
+      system: "You are a helpful assistant.",
+      messages: convertToModelMessages(payload.messages),
+      stopWhen: stepCountIs(20),
+      tools: {
+        getCommonUseCases: tool({
+          description: "Get common use cases",
+          inputSchema: z.object({
+            useCase: z.string().describe("The use case to get common use cases for"),
+          }),
+          execute: async ({ useCase }) => {
+            return {
+              useCase,
+              commonUseCases: [
+                "Streaming data to a client",
+                "Streaming data to a server",
+                "Streaming data to a database",
+                "Streaming data to a file",
+                "Streaming data to a socket",
+                "Streaming data to a queue",
+                "Streaming data to a message broker",
+                "Streaming data to a message queue",
+                "Streaming data to a message broker",
+              ],
+            };
+          },
+        }),
+      },
+    });
+
+    // Get the UI message stream
+    const uiMessageStream = result.toUIMessageStream();
+
+    // Append the stream to metadata
+    const { waitUntilComplete, stream } = aiStream.pipe(uiMessageStream);
+
+    for await (const uiMessage of readUIMessageStream({
+      stream: stream,
+    })) {
+      logger.log("Current message state", { uiMessage });
+    }
+
+    // Wait for the stream to complete
+    await waitUntilComplete();
+
+    logger.info("AI chat stream completed");
+
+    return {
+      message: "AI chat stream completed successfully",
+      messageCount: payload.messages.length,
+    };
+  },
+});
diff --git a/references/realtime-streams/src/trigger/streams.ts b/references/realtime-streams/src/trigger/streams.ts
new file mode 100644
index 00000000000..388ff960aac
--- /dev/null
+++ b/references/realtime-streams/src/trigger/streams.ts
@@ -0,0 +1,1169 @@
+import { demoStream } from "@/app/streams";
+import { logger, metadata, streams, task } from "@trigger.dev/sdk";
+import assert from "assert";
+import { setTimeout } from "timers/promises";
+
+export type STREAMS = {
+  demo: string;
+};
+
+export type PerformanceChunk = {
+  timestamp: number; // When the chunk was sent from the task
+  chunkIndex: number;
+  data: string;
+};
+
+export type StreamScenario =
+  | "stall"
+  | "continuous"
+  | "burst"
+  | "slow-steady"
+  | "markdown"
+  | "performance";
+
+export type StreamPayload = {
+  scenario?: StreamScenario;
+  // Stall scenario options
+  stallDurationMs?: number;
+  includePing?: boolean;
+  // Continuous scenario options
+  durationSec?: number;
+  intervalMs?: number;
+  // Burst scenario options
+  burstCount?: number;
+  tokensPerBurst?: number;
+  burstIntervalMs?: number;
+  pauseBetweenBurstsMs?: number;
+  // Slow steady scenario options
+  durationMin?: number;
+  tokenIntervalSec?: number;
+  // Markdown scenario options
+  tokenDelayMs?: number;
+  // Performance scenario options
+  chunkCount?: number;
+  chunkIntervalMs?: number;
+};
+
+export const streamsTask = task({
+  id: "streams",
+  run: async (payload: StreamPayload = {}, { ctx }) => {
+    const scenario = payload.scenario ?? "continuous";
+    logger.info("Starting stream scenario", { scenario });
+
+    let generator: AsyncGenerator<string>;
+    let scenarioDescription: string;
+
+    switch (scenario) {
+      case "stall": {
+        const stallDurationMs = payload.stallDurationMs ?? 3 * 60 * 1000; // Default 3 minutes
+        const includePing = payload.includePing ?? false;
+        generator = generateLLMTokenStream(includePing, stallDurationMs);
+        scenarioDescription = `Stall scenario: ${stallDurationMs / 1000}s with ${
+          includePing ? "ping tokens" : "no pings"
+        }`;
+        break;
+      }
+      case "continuous": {
+        const durationSec = payload.durationSec ?? 45;
+        const intervalMs = payload.intervalMs ?? 10;
+        generator = generateContinuousTokenStream(durationSec, intervalMs);
+        scenarioDescription = `Continuous scenario: ${durationSec}s with ${intervalMs}ms intervals`;
+        break;
+      }
+      case "burst": {
+        const burstCount = payload.burstCount ?? 10;
+        const tokensPerBurst = payload.tokensPerBurst ?? 20;
+        const burstIntervalMs = payload.burstIntervalMs ?? 5;
+        const pauseBetweenBurstsMs = payload.pauseBetweenBurstsMs ?? 2000;
+        generator = generateBurstTokenStream(
+          burstCount,
+          tokensPerBurst,
+          burstIntervalMs,
+          pauseBetweenBurstsMs
+        );
+        scenarioDescription = `Burst scenario: ${burstCount} bursts of ${tokensPerBurst} tokens`;
+        break;
+      }
+      case "slow-steady": {
+        const durationMin = payload.durationMin ?? 5;
+        const tokenIntervalSec = payload.tokenIntervalSec ?? 5;
+        generator = generateSlowSteadyTokenStream(durationMin, tokenIntervalSec);
+        scenarioDescription = `Slow steady scenario: ${durationMin}min with ${tokenIntervalSec}s intervals`;
+        break;
+      }
+      case "markdown": {
+        const tokenDelayMs = payload.tokenDelayMs ?? 15;
+        generator = generateMarkdownTokenStream(tokenDelayMs);
+        scenarioDescription = `Markdown scenario: generating formatted content with ${tokenDelayMs}ms delays`;
+        break;
+      }
+      case "performance": {
+        const chunkCount = payload.chunkCount ?? 500;
+        const chunkIntervalMs = payload.chunkIntervalMs ?? 10;
+        generator = generatePerformanceStream(chunkCount, chunkIntervalMs);
+        scenarioDescription = `Performance scenario: ${chunkCount} chunks with ${chunkIntervalMs}ms intervals`;
+        break;
+      }
+      default: {
+        throw new Error(`Unknown scenario: ${scenario}`);
+      }
+    }
+
+    logger.info("Starting stream", { scenarioDescription });
+
+    const mockStream = createStreamFromGenerator(generator);
+
+    const { waitUntilComplete } = demoStream.pipe(mockStream);
+
+    await waitUntilComplete();
+
+    logger.info("Stream completed", { scenario });
+
+    return {
+      scenario,
+      scenarioDescription,
+    };
+  },
+});
+
+export const streamsChildTask = task({
+  id: "streams-child",
+  run: async (payload: any, { ctx }) => {
+    demoStream.writer({
+      execute: ({ write, merge }) => {
+        write(JSON.stringify({ step: "one" }));
+        write(JSON.stringify({ step: "two" }));
+        write(JSON.stringify({ step: "three" }));
+        merge(
+          new ReadableStream({
+            start(controller) {
+              controller.enqueue(JSON.stringify({ step: "four" }));
+              controller.enqueue(JSON.stringify({ step: "five" }));
+              controller.close();
+            },
+          })
+        );
+      },
+      target: ctx.run.rootTaskRunId,
+    });
+  },
+});
+
+export const streamsTesterTask = task({
+  id: "streams-tester",
+  run: async (payload: any, { ctx }) => {
+    logger.info("Starting multiple source streams tester task");
+
+    await multipleSourceStreamsTesterTask
+      .triggerAndWait(
+        {},
+        {},
+        {
+          clientConfig: {
+            future: {
+              v2RealtimeStreams: false,
+            },
+          },
+        }
+      )
+      .unwrap();
+
+    await multipleSourceStreamsTesterTask
+      .triggerAndWait(
+        {},
+        {},
+        {
+          clientConfig: {
+            future: {
+              v2RealtimeStreams: true,
+            },
+          },
+        }
+      )
+      .unwrap();
+
+    logger.info("✅ Multiple source streams tester tasks completed");
+
+    logger.info("Starting stream append tester task");
+
+    await streamAppendTesterTask
+      .triggerAndWait(
+        {},
+        {},
+        {
+          clientConfig: {
+            future: {
+              v2RealtimeStreams: false,
+            },
+          },
+        }
+      )
+      .unwrap();
+
+    await streamAppendTesterTask
+      .triggerAndWait(
+        {},
+        {},
+        {
+          clientConfig: {
+            future: {
+              v2RealtimeStreams: true,
+            },
+          },
+        }
+      )
+      .unwrap();
+
+    logger.info("✅ Stream append tester task completed");
+
+    logger.info("Starting stream pipe tester task");
+
+    await streamPipeTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: true } } })
+      .unwrap();
+
+    logger.info("✅ Stream pipe tester task completed");
+
+    await streamPipeTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: false } } })
+      .unwrap();
+
+    logger.info("✅ Stream pipe tester task completed");
+
+    logger.info("Starting stream writer tester task");
+
+    await streamWriterTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: true } } })
+      .unwrap();
+
+    logger.info("✅ Stream writer tester task completed");
+
+    await streamWriterTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: false } } })
+      .unwrap();
+
+    logger.info("✅ Stream writer tester task completed");
+
+    logger.info("Starting stream wait until tester task");
+
+    await streamWaitUntilTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: true } } })
+      .unwrap();
+
+    logger.info("✅ Stream wait until tester task completed");
+
+    await streamWaitUntilTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: false } } })
+      .unwrap();
+
+    logger.info("✅ Stream wait until tester task completed");
+
+    logger.info("Starting metadata tester task");
+
+    await metadataTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: true } } })
+      .unwrap();
+
+    logger.info("✅ Metadata tester task completed");
+
+    await metadataTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: false } } })
+      .unwrap();
+
+    logger.info("✅ Metadata tester task completed");
+
+    logger.info("Starting stream read tester task");
+
+    await streamReadTesterTask
+      .triggerAndWait({}, {}, { clientConfig: { future: { v2RealtimeStreams: true } } })
+      .unwrap();
+
+    logger.info("✅ Stream read tester task completed");
+
+    logger.info("Starting streams stress tester task");
+
+    await streamsStressTesterTask
+      .triggerAndWait(
+        { streamsVersion: "v1" },
+        {},
+        { clientConfig: { future: { v2RealtimeStreams: false } } }
+      )
+      .unwrap();
+
+    logger.info("✅ Streams stress tester task completed");
+
+    await streamsStressTesterTask
+      .triggerAndWait(
+        { streamsVersion: "v2" },
+        {},
+        { clientConfig: { future: { v2RealtimeStreams: true } } }
+      )
+      .unwrap();
+
+    logger.info("✅ Streams stress tester task completed");
+
+    logger.info("Starting end to end latency tester task");
+
+    await endToEndLatencyTesterTask
+      .triggerAndWait(
+        { streamsVersion: "v1" },
+        {},
+        { clientConfig: { future: { v2RealtimeStreams: false } } }
+      )
+      .unwrap();
+
+    logger.info("✅ End to end latency tester task completed");
+
+    await endToEndLatencyTesterTask
+      .triggerAndWait(
+        { streamsVersion: "v2" },
+        {},
+        { clientConfig: { future: { v2RealtimeStreams: true } } }
+      )
+      .unwrap();
+
+    logger.info("✅ End to end latency tester task completed");
+
+    return {
+      message: "Multiple source streams tester tasks completed",
+    };
+  },
+});
+
+const testStream = streams.define<string>({
+  id: "test",
+});
+
+const multipleSourceStreamsTesterTask = task({
+  id: "multiple-source-streams-tester",
+  run: async (payload: any, { ctx }) => {
+    const stream1 = new ReadableStream<string>({
+      start(controller) {
+        controller.enqueue("stream 1 chunk 1");
+        controller.enqueue("stream 1 chunk 2");
+        controller.enqueue("stream 1 chunk 3");
+        controller.close();
+      },
+    });
+
+    const stream2 = new ReadableStream<string>({
+      start(controller) {
+        controller.enqueue("stream 2 chunk 1");
+        controller.enqueue("stream 2 chunk 2");
+        controller.enqueue("stream 2 chunk 3");
+        controller.close();
+      },
+    });
+
+    const { waitUntilComplete: waitUntilComplete1, stream: stream1Stream } = streams.pipe(stream1);
+    const { waitUntilComplete: waitUntilComplete2, stream: stream2Stream } = streams.pipe(stream2);
+
+    await Promise.all([waitUntilComplete1(), waitUntilComplete2()]);
+
+    const stream1Chunks = await convertReadableStreamToArray(stream1Stream);
+    const stream2Chunks = await convertReadableStreamToArray(stream2Stream);
+
+    assert.strictEqual(stream1Chunks.length, 3, "Expected 3 chunks");
+    assert.ok(stream1Chunks.includes("stream 1 chunk 1"), "Expected stream 1 chunk 1");
+    assert.ok(stream1Chunks.includes("stream 1 chunk 2"), "Expected stream 1 chunk 2");
+    assert.ok(stream1Chunks.includes("stream 1 chunk 3"), "Expected stream 1 chunk 3");
+    assert.strictEqual(stream2Chunks.length, 3, "Expected 3 chunks");
+    assert.ok(stream2Chunks.includes("stream 2 chunk 1"), "Expected stream 2 chunk 1");
+    assert.ok(stream2Chunks.includes("stream 2 chunk 2"), "Expected stream 2 chunk 2");
+    assert.ok(stream2Chunks.includes("stream 2 chunk 3"), "Expected stream 2 chunk 3");
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    assert.strictEqual(chunks.length, 6, "Expected 6 chunks");
+    assert.ok(chunks.includes("stream 1 chunk 1"), "Expected stream 1 chunk 1");
+    assert.ok(chunks.includes("stream 1 chunk 2"), "Expected stream 1 chunk 2");
+    assert.ok(chunks.includes("stream 1 chunk 3"), "Expected stream 1 chunk 3");
+    assert.ok(chunks.includes("stream 2 chunk 1"), "Expected stream 2 chunk 1");
+    assert.ok(chunks.includes("stream 2 chunk 2"), "Expected stream 2 chunk 2");
+    assert.ok(chunks.includes("stream 2 chunk 3"), "Expected stream 2 chunk 3");
+
+    return {
+      message: "Streams completed",
+    };
+  },
+});
+
+const streamAppendTesterTask = task({
+  id: "stream-append-tester",
+  run: async (payload: any, { ctx }) => {
+    await streams.append("chunk 1");
+    await streams.append("chunk 2");
+    await streams.append("chunk 3");
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    assert.strictEqual(chunks.length, 3, "Expected 3 chunks");
+    assert.ok(chunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(chunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(chunks.includes("chunk 3"), "Expected chunk 3");
+
+    await streams.append("named", "chunk 1");
+    await streams.append("named", "chunk 2");
+    await streams.append("named", "chunk 3");
+
+    const namedChunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, "named", { timeoutInSeconds: 5 })) {
+      namedChunks.push(chunk);
+    }
+
+    assert.strictEqual(namedChunks.length, 3, "Expected 3 chunks");
+    assert.ok(namedChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(namedChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(namedChunks.includes("chunk 3"), "Expected chunk 3");
+
+    await testStream.append("chunk 1");
+    await testStream.append("chunk 2");
+    await testStream.append("chunk 3");
+
+    const testChunks = [];
+
+    for await (const chunk of await testStream.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      testChunks.push(chunk);
+    }
+
+    assert.strictEqual(testChunks.length, 3, "Expected 3 chunks");
+    assert.ok(testChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(testChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(testChunks.includes("chunk 3"), "Expected chunk 3");
+
+    await streamAppendChildTask.triggerAndWait(
+      {},
+      {},
+      { clientConfig: { future: { v2RealtimeStreams: true } } }
+    );
+
+    const childChunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, "child", { timeoutInSeconds: 5 })) {
+      childChunks.push(chunk);
+    }
+
+    assert.strictEqual(childChunks.length, 3, "Expected 3 chunks");
+    assert.ok(childChunks.includes("child chunk 1"), "Expected child chunk 1");
+    assert.ok(childChunks.includes("child chunk 2"), "Expected child chunk 2");
+    assert.ok(childChunks.includes("child chunk 3"), "Expected child chunk 3");
+
+    return {
+      message: "Stream append completed",
+    };
+  },
+});
+
+const streamAppendChildTask = task({
+  id: "stream-append-child",
+  run: async (payload: any, { ctx }) => {
+    await streams.append("child", "child chunk 1", { target: ctx.run.parentTaskRunId });
+    await streams.append("child", "child chunk 2", { target: "parent" });
+    await streams.append("child", "child chunk 3", { target: "parent" });
+  },
+});
+
+const streamPipeTesterTask = task({
+  id: "stream-pipe-tester",
+  run: async (payload: any, { ctx }) => {
+    const { waitUntilComplete } = streams.pipe(
+      new ReadableStream({
+        start(controller) {
+          controller.enqueue("chunk 1");
+          controller.enqueue("chunk 2");
+          controller.enqueue("chunk 3");
+          controller.close();
+        },
+      })
+    );
+
+    await waitUntilComplete();
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    assert.strictEqual(chunks.length, 3, "Expected 3 chunks");
+    assert.ok(chunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(chunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(chunks.includes("chunk 3"), "Expected chunk 3");
+
+    const { waitUntilComplete: waitUntilComplete2 } = streams.pipe(
+      "named",
+      new ReadableStream({
+        start(controller) {
+          controller.enqueue("chunk 1");
+          controller.enqueue("chunk 2");
+          controller.enqueue("chunk 3");
+          controller.close();
+        },
+      })
+    );
+
+    await waitUntilComplete2();
+
+    const namedChunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, "named", { timeoutInSeconds: 5 })) {
+      namedChunks.push(chunk);
+    }
+
+    assert.strictEqual(namedChunks.length, 3, "Expected 3 chunks");
+    assert.ok(namedChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(namedChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(namedChunks.includes("chunk 3"), "Expected chunk 3");
+
+    const { waitUntilComplete: waitUntilComplete3 } = testStream.pipe(
+      new ReadableStream({
+        start(controller) {
+          controller.enqueue("chunk 1");
+          controller.enqueue("chunk 2");
+          controller.enqueue("chunk 3");
+          controller.close();
+        },
+      })
+    );
+
+    await waitUntilComplete3();
+
+    const testChunks = [];
+
+    for await (const chunk of await testStream.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      testChunks.push(chunk);
+    }
+
+    assert.strictEqual(testChunks.length, 3, "Expected 3 chunks");
+    assert.ok(testChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(testChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(testChunks.includes("chunk 3"), "Expected chunk 3");
+
+    return {
+      message: "Stream pipe completed",
+    };
+  },
+});
+
+const streamWriterTesterTask = task({
+  id: "stream-writer-tester",
+  run: async (payload: any, { ctx }) => {
+    const { waitUntilComplete, stream } = streams.writer({
+      execute: async ({ write, merge }) => {
+        write("chunk 1");
+        write("chunk 2");
+        write("chunk 3");
+      },
+    });
+
+    await waitUntilComplete();
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read<string>(ctx.run.id, { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    assert.strictEqual(chunks.length, 3, "Expected 3 chunks");
+    assert.ok(chunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(chunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(chunks.includes("chunk 3"), "Expected chunk 3");
+
+    const { waitUntilComplete: waitUntilComplete2 } = streams.writer("named", {
+      execute: async ({ write, merge }) => {
+        write("chunk 1");
+        write("chunk 2");
+        write("chunk 3");
+      },
+    });
+
+    await waitUntilComplete2();
+
+    const namedChunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, "named", { timeoutInSeconds: 5 })) {
+      namedChunks.push(chunk);
+    }
+
+    assert.strictEqual(namedChunks.length, 3, "Expected 3 chunks");
+    assert.ok(namedChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(namedChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(namedChunks.includes("chunk 3"), "Expected chunk 3");
+
+    const { waitUntilComplete: waitUntilComplete3 } = testStream.writer({
+      execute: async ({ write, merge }) => {
+        write("chunk 1");
+        write("chunk 2");
+        write("chunk 3");
+      },
+    });
+
+    await waitUntilComplete3();
+
+    const testChunks = [];
+
+    for await (const chunk of await testStream.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      testChunks.push(chunk);
+    }
+
+    assert.strictEqual(testChunks.length, 3, "Expected 3 chunks");
+    assert.ok(testChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(testChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(testChunks.includes("chunk 3"), "Expected chunk 3");
+
+    const { waitUntilComplete: waitUntilComplete4 } = streams.writer("merging", {
+      execute: async ({ write, merge }) => {
+        merge(
+          new ReadableStream({
+            start(controller) {
+              controller.enqueue("chunk 1");
+              controller.enqueue("chunk 2");
+              controller.enqueue("chunk 3");
+              controller.close();
+            },
+          })
+        );
+      },
+    });
+
+    await waitUntilComplete4();
+
+    const mergingChunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, "merging", { timeoutInSeconds: 5 })) {
+      mergingChunks.push(chunk);
+    }
+
+    assert.strictEqual(mergingChunks.length, 3, "Expected 3 chunks");
+    assert.ok(mergingChunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(mergingChunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(mergingChunks.includes("chunk 3"), "Expected chunk 3");
+
+    return {
+      message: "Stream writer completed",
+    };
+  },
+});
+
+const streamWaitUntilTesterTask = task({
+  id: "stream-wait-until-tester",
+  run: async (payload: any, { ctx }) => {
+    const result = await streamWaitUntilTesterChildTask.triggerAndWait(
+      {},
+      {},
+      { clientConfig: { future: { v2RealtimeStreams: true } } }
+    );
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read(result.id, { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    const generator = generateContinuousTokenStream(10, 100);
+    const stream = createStreamFromGenerator(generator);
+
+    const expectedChunks = await convertReadableStreamToArray(stream);
+
+    assert.strictEqual(chunks.length, expectedChunks.length, "Expected chunks to be the same");
+    assert.deepStrictEqual(chunks, expectedChunks, "Expected chunks to be the same");
+
+    return {
+      message: "Stream wait until tester completed",
+    };
+  },
+});
+
+const streamWaitUntilTesterChildTask = task({
+  id: "stream-wait-until-tester",
+  run: async (payload: any, { ctx }) => {
+    const generator = generateContinuousTokenStream(10, 100);
+    const stream = createStreamFromGenerator(generator);
+
+    streams.pipe(stream); // This should register with the waitUntil system
+
+    return;
+  },
+});
+
+const metadataTesterTask = task({
+  id: "metadata-tester",
+  run: async (payload: { parentId?: string }, { ctx }) => {
+    await metadata.stream(
+      "default",
+      new ReadableStream({
+        start(controller) {
+          controller.enqueue("chunk 1");
+          controller.enqueue("chunk 2");
+          controller.enqueue("chunk 3");
+          controller.close();
+        },
+      })
+    );
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, "default", { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    assert.strictEqual(chunks.length, 3, "Expected 3 chunks");
+    assert.ok(chunks.includes("chunk 1"), "Expected chunk 1");
+    assert.ok(chunks.includes("chunk 2"), "Expected chunk 2");
+    assert.ok(chunks.includes("chunk 3"), "Expected chunk 3");
+
+    if (payload.parentId) {
+      await metadata.parent.stream(
+        "parent",
+        new ReadableStream({
+          start(controller) {
+            controller.enqueue("chunk 1");
+            controller.enqueue("chunk 2");
+            controller.enqueue("chunk 3");
+            controller.close();
+          },
+        })
+      );
+
+      const parentChunks = [];
+
+      for await (const chunk of await streams.read(payload.parentId, "parent", {
+        timeoutInSeconds: 5,
+      })) {
+        parentChunks.push(chunk);
+      }
+
+      assert.strictEqual(parentChunks.length, 3, "Expected 3 chunks");
+      assert.ok(parentChunks.includes("chunk 1"), "Expected chunk 1");
+      assert.ok(parentChunks.includes("chunk 2"), "Expected chunk 2");
+      assert.ok(parentChunks.includes("chunk 3"), "Expected chunk 3");
+    } else {
+      await metadataTesterTask.triggerAndWait(
+        { parentId: ctx.run.id },
+        {},
+        { clientConfig: { future: { v2RealtimeStreams: true } } }
+      );
+    }
+  },
+});
+
+const streamReadTesterTask = task({
+  id: "stream-read-tester",
+  run: async (payload: any, { ctx }) => {
+    const { waitUntilComplete } = streams.pipe(
+      new ReadableStream({
+        start(controller) {
+          controller.enqueue("chunk 1");
+          controller.enqueue("chunk 2");
+          controller.enqueue("chunk 3");
+          controller.enqueue("chunk 4");
+          controller.enqueue("chunk 5");
+          controller.enqueue("chunk 6");
+          controller.close();
+        },
+      })
+    );
+
+    await waitUntilComplete();
+
+    const chunks = [];
+    for await (const chunk of await streams.read(ctx.run.id, { timeoutInSeconds: 5 })) {
+      chunks.push(chunk);
+    }
+
+    assert.strictEqual(chunks.length, 6, "Expected 6 chunks");
+
+    // Now read starting from the 4th chunk
+    // This only properly works with v2 realtime streams
+    const chunks2 = [];
+    for await (const chunk of await streams.read(ctx.run.id, {
+      timeoutInSeconds: 5,
+      startIndex: 3,
+    })) {
+      chunks2.push(chunk);
+    }
+
+    assert.strictEqual(chunks2.length, 3, "Expected 3 chunks");
+
+    return {
+      message: "Stream read tester completed",
+    };
+  },
+});
+
+const streamsStressTesterTask = task({
+  id: "streams-stress-tester",
+  run: async (payload: { streamsVersion: "v1" | "v2" }, { ctx }) => {
+    const stream = createStreamFromGenerator(generateContinuousTokenStream(60, 5));
+
+    const { waitUntilComplete } = streams.pipe(stream);
+
+    await waitUntilComplete();
+
+    const chunks = [];
+
+    for await (const chunk of await streams.read(ctx.run.id, { timeoutInSeconds: 10 })) {
+      chunks.push(chunk);
+    }
+
+    logger.info("Received chunks", {
+      chunks: chunks.length,
+      streamsVersion: payload.streamsVersion,
+    });
+
+    switch (payload.streamsVersion) {
+      case "v1": {
+        break;
+      }
+      case "v2": {
+        assert.ok(chunks.length > 2000, "Expected more than 2000 chunks");
+        break;
+      }
+    }
+
+    return {
+      message: "Streams stress tester completed",
+    };
+  },
+});
+
+const endToEndLatencyTesterTask = task({
+  id: "end-to-end-latency-tester",
+  run: async (payload: any, { ctx }) => {
+    console.log(
+      `Starting end to end latency tester task for ${payload.streamsVersion} streams version`
+    );
+
+    const stream = createStreamFromGenerator(generatePerformanceStream(1000, 10));
+
+    const { waitUntilComplete } = streams.pipe(stream);
+
+    const latencies = [];
+
+    const abortController = new AbortController();
+
+    for await (const chunk of await streams.read(ctx.run.id, {
+      timeoutInSeconds: 120,
+      signal: abortController.signal,
+    })) {
+      const performanceChunk = JSON.parse(chunk as any) as PerformanceChunk;
+
+      // Calculate the latency
+      const latency = Date.now() - performanceChunk.timestamp;
+
+      latencies.push({ latency, index: performanceChunk.chunkIndex });
+
+      if (latencies.length === 1000) {
+        console.log("1000 chunks received, aborting");
+        abortController.abort();
+      }
+    }
+
+    await waitUntilComplete();
+
+    // Calculate the min, max, p50 and p95 latencies
+    const minLatency = Math.min(...latencies.map((l) => l.latency));
+    const maxLatency = Math.max(...latencies.map((l) => l.latency));
+    const p50Latency = latencies.sort((a, b) => a.latency - b.latency)[
+      Math.floor(latencies.length * 0.5)
+    ];
+    const p95Latency = latencies.sort((a, b) => a.latency - b.latency)[
+      Math.floor(latencies.length * 0.95)
+    ];
+
+    const p50LatencyValue = p50Latency.latency;
+    const p95LatencyValue = p95Latency.latency;
+
+    console.log(`Min latency: ${minLatency}ms`);
+    console.log(`Max latency: ${maxLatency}ms`);
+    console.log(`P50 latency: ${p50LatencyValue}ms`);
+    console.log(`P95 latency: ${p95LatencyValue}ms`);
+
+    return {
+      message: "End to end latency tester completed",
+    };
+  },
+});
+
+async function* generateLLMTokenStream(
+  includePing: boolean = false,
+  stallDurationMs: number = 10 * 60 * 1000
+) {
+  // Simulate initial LLM tokens (faster, like a real LLM)
+  const initialTokens = [
+    "Hello",
+    " there",
+    "!",
+    " I'm",
+    " going",
+    " to",
+    " tell",
+    " you",
+    " a",
+    " story",
+    ".",
+    "\n",
+    " Once",
+    " upon",
+    " a",
+    " time",
+  ];
+
+  // Stream initial tokens with realistic LLM timing
+  for (const token of initialTokens) {
+    await setTimeout(Math.random() * 10 + 5); // 5-15ms delay
+    yield token;
+  }
+
+  // "Stall" window - emit a token every 30 seconds
+  const stallIntervalMs = 30 * 1000; // 30 seconds
+  const stallTokenCount = Math.floor(stallDurationMs / stallIntervalMs);
+  logger.info(
+    `Entering stall window for ${stallDurationMs}ms (${
+      stallDurationMs / 1000 / 60
+    } minutes) - emitting ${stallTokenCount} tokens`
+  );
+
+  for (let i = 0; i < stallTokenCount; i++) {
+    await setTimeout(stallIntervalMs);
+    if (includePing) {
+      yield "."; // Emit a single period token every 30 seconds
+    }
+  }
+
+  logger.info("Resuming normal stream after stall window");
+
+  // Continue with more LLM tokens after stall
+  const continuationTokens = [
+    " there",
+    " was",
+    " a",
+    " developer",
+    " who",
+    " needed",
+    " to",
+    " test",
+    " streaming",
+    ".",
+    " They",
+    " used",
+    " Trigger",
+    ".dev",
+    " and",
+    " it",
+    " worked",
+    " perfectly",
+    "!",
+  ];
+
+  for (const token of continuationTokens) {
+    await setTimeout(Math.random() * 10 + 5); // 5-15ms delay
+    yield token;
+  }
+}
+
+// Continuous stream: emit tokens at regular intervals for a specified duration
+async function* generateContinuousTokenStream(durationSec: number, intervalMs: number) {
+  const words = [
+    "The",
+    "quick",
+    "brown",
+    "fox",
+    "jumps",
+    "over",
+    "the",
+    "lazy",
+    "dog",
+    "while",
+    "streaming",
+    "tokens",
+    "continuously",
+    "at",
+    "regular",
+    "intervals",
+    "to",
+    "test",
+    "real-time",
+    "data",
+    "flow",
+  ];
+
+  const endTime = Date.now() + durationSec * 1000;
+  let wordIndex = 0;
+
+  while (Date.now() < endTime) {
+    await setTimeout(intervalMs);
+    yield words[wordIndex % words.length] + " ";
+    wordIndex++;
+  }
+
+  yield "\n[Stream completed]";
+}
+
+// Burst stream: emit rapid bursts of tokens with pauses between bursts
+async function* generateBurstTokenStream(
+  burstCount: number,
+  tokensPerBurst: number,
+  burstIntervalMs: number,
+  pauseBetweenBurstsMs: number
+) {
+  const tokens = "abcdefghijklmnopqrstuvwxyz".split("");
+
+  for (let burst = 0; burst < burstCount; burst++) {
+    yield `\n[Burst ${burst + 1}/${burstCount}] `;
+
+    // Emit tokens rapidly in this burst
+    for (let token = 0; token < tokensPerBurst; token++) {
+      await setTimeout(burstIntervalMs);
+      yield tokens[token % tokens.length];
+    }
+
+    // Pause between bursts (except after the last burst)
+    if (burst < burstCount - 1) {
+      await setTimeout(pauseBetweenBurstsMs);
+    }
+  }
+
+  yield "\n[All bursts completed]";
+}
+
+// Slow steady stream: emit tokens at longer intervals over many minutes
+async function* generateSlowSteadyTokenStream(durationMin: number, tokenIntervalSec: number) {
+  const sentences = [
+    "This is a slow and steady stream.",
+    "Each token arrives after several seconds.",
+    "Perfect for testing long-running connections.",
+    "The stream maintains a consistent pace.",
+    "Patience is key when testing reliability.",
+    "Connections should remain stable throughout.",
+    "This helps verify timeout handling.",
+    "Real-world streams often have variable timing.",
+    "Testing edge cases is important.",
+    "Almost done with the slow stream test.",
+  ];
+
+  const endTime = Date.now() + durationMin * 60 * 1000;
+  let sentenceIndex = 0;
+
+  while (Date.now() < endTime) {
+    const sentence = sentences[sentenceIndex % sentences.length];
+    yield `${sentence} `;
+
+    sentenceIndex++;
+    await setTimeout(tokenIntervalSec * 1000);
+  }
+
+  yield "\n[Long stream completed successfully]";
+}
+
+// Markdown stream: emit realistic markdown content as tokens (8 characters at a time)
+async function* generateMarkdownTokenStream(tokenDelayMs: number) {
+  const markdownContent =
+    "# Streaming Markdown Example\n\n" +
+    "This is a demonstration of **streaming markdown** content in real-time. The content is being generated *token by token*, simulating how an LLM might generate formatted text.\n\n" +
+    "## Features\n\n" +
+    "Here are some key features being tested:\n\n" +
+    "- **Bold text** for emphasis\n" +
+    "- *Italic text* for subtle highlighting\n" +
+    "- `inline code` for technical terms\n" +
+    "- [Links](https://trigger.dev) to external resources\n\n" +
+    "### Code Examples\n\n" +
+    "You can also stream code blocks:\n\n" +
+    "```typescript\n" +
+    'import { task, metadata } from "@trigger.dev/sdk";\n\n' +
+    "export const myTask = task({\n" +
+    '  id: "example-task",\n' +
+    "  run: async (payload) => {\n" +
+    '    const stream = await metadata.stream("output", myStream);\n' +
+    "    \n" +
+    "    for await (const chunk of stream) {\n" +
+    "      console.log(chunk);\n" +
+    "    }\n" +
+    "    \n" +
+    "    return { success: true };\n" +
+    "  },\n" +
+    "});\n" +
+    "```\n\n" +
+    "### Lists and Structure\n\n" +
+    "Numbered lists work great too:\n\n" +
+    "1. First item with important details\n" +
+    "2. Second item with more context\n" +
+    "3. Third item completing the sequence\n\n" +
+    "#### Nested Content\n\n" +
+    "> Blockquotes are useful for highlighting important information or quoting external sources.\n\n" +
+    "You can combine **_bold and italic_** text, or use ~~strikethrough~~ for corrections.\n\n" +
+    "## Technical Details\n\n" +
+    "| Feature | Status | Notes |\n" +
+    "|---------|--------|-------|\n" +
+    "| Streaming | ✓ | Working perfectly |\n" +
+    "| Markdown | ✓ | Full support |\n" +
+    "| Realtime | ✓ | Sub-second latency |\n\n" +
+    "### Conclusion\n\n" +
+    "This markdown streaming scenario demonstrates how formatted content can be transmitted in real-time, maintaining proper structure and formatting throughout the stream.\n\n" +
+    "---\n\n" +
+    "*Generated with Trigger.dev realtime streams* 🚀\n";
+
+  // Stream tokens of 8 characters at a time with 5ms delay
+  // Use Array.from() to properly handle Unicode characters
+  const CHARACTERS_PER_TOKEN = 8;
+  const DELAY_MS = 5;
+
+  const characters = Array.from(markdownContent);
+
+  for (let i = 0; i < characters.length; i += CHARACTERS_PER_TOKEN) {
+    await setTimeout(DELAY_MS);
+    yield characters.slice(i, i + CHARACTERS_PER_TOKEN).join("");
+  }
+}
+
+// Performance stream: emit JSON chunks with timestamps for latency measurement
+async function* generatePerformanceStream(chunkCount: number, chunkIntervalMs: number) {
+  for (let i = 0; i < chunkCount; i++) {
+    await setTimeout(chunkIntervalMs);
+
+    const chunk: PerformanceChunk = {
+      timestamp: Date.now(),
+      chunkIndex: i,
+      data: `Chunk ${i + 1}/${chunkCount}`,
+    };
+
+    yield JSON.stringify(chunk);
+  }
+}
+
+// Convert to ReadableStream
+function createStreamFromGenerator(generator: AsyncGenerator<string>) {
+  return new ReadableStream({
+    async start(controller) {
+      for await (const chunk of generator) {
+        controller.enqueue(chunk);
+      }
+
+      controller.close();
+    },
+  });
+}
+
+async function convertReadableStreamToArray<TPart>(
+  stream: ReadableStream<TPart>
+): Promise<TPart[]> {
+  const chunks: TPart[] = [];
+  const reader = stream.getReader();
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    chunks.push(value);
+  }
+
+  reader.releaseLock();
+  return chunks;
+}
diff --git a/references/realtime-streams/trigger.config.ts b/references/realtime-streams/trigger.config.ts
new file mode 100644
index 00000000000..7346fbeec01
--- /dev/null
+++ b/references/realtime-streams/trigger.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  dirs: ["./src/trigger"],
+  maxDuration: 3600,
+});
diff --git a/references/realtime-streams/tsconfig.json b/references/realtime-streams/tsconfig.json
new file mode 100644
index 00000000000..c1334095f87
--- /dev/null
+++ b/references/realtime-streams/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "exclude": ["node_modules"]
+}
diff --git a/references/seed/.gitignore b/references/seed/.gitignore
new file mode 100644
index 00000000000..6524f048dcb
--- /dev/null
+++ b/references/seed/.gitignore
@@ -0,0 +1 @@
+.trigger
\ No newline at end of file
diff --git a/references/v3-catalog/.triggerdeploy.json b/references/seed/.triggerdeploy.json
similarity index 100%
rename from references/v3-catalog/.triggerdeploy.json
rename to references/seed/.triggerdeploy.json
diff --git a/references/seed/package.json b/references/seed/package.json
new file mode 100644
index 00000000000..aa788c467a1
--- /dev/null
+++ b/references/seed/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "references-seed",
+  "private": true,
+  "type": "module",
+  "devDependencies": {
+    "trigger.dev": "workspace:*"
+  },
+  "dependencies": {
+    "@trigger.dev/build": "workspace:*",
+    "@trigger.dev/sdk": "workspace:*",
+    "arktype": "^2.0.0",
+    "openai": "^4.97.0",
+    "puppeteer-core": "^24.15.0",
+    "replicate": "^1.0.1",
+    "yup": "^1.6.1",
+    "zod": "3.25.76",
+    "@sinclair/typebox": "^0.34.3"
+  },
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy"
+  }
+}
diff --git a/references/v3-catalog/src/trigger/testTasks.ts b/references/seed/src/trigger/testTasks.ts
similarity index 100%
rename from references/v3-catalog/src/trigger/testTasks.ts
rename to references/seed/src/trigger/testTasks.ts
diff --git a/references/seed/trigger.config.ts b/references/seed/trigger.config.ts
new file mode 100644
index 00000000000..f87620cd780
--- /dev/null
+++ b/references/seed/trigger.config.ts
@@ -0,0 +1,56 @@
+import { defineConfig } from "@trigger.dev/sdk/v3";
+import { syncEnvVars } from "@trigger.dev/build/extensions/core";
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+
+export default defineConfig({
+  compatibilityFlags: ["run_engine_v2"],
+  project: process.env.TRIGGER_PROJECT_REF!,
+  experimental_processKeepAlive: {
+    enabled: true,
+    maxExecutionsPerProcess: 20,
+  },
+  logLevel: "debug",
+  maxDuration: 3600,
+  retries: {
+    enabledInDev: true,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+  machine: "small-2x",
+  build: {
+    extensions: [
+      lightpanda(),
+      syncEnvVars(async (ctx) => {
+        return [
+          { name: "SYNC_ENV", value: ctx.environment },
+          { name: "BRANCH", value: ctx.branch ?? "NO_BRANCH" },
+          { name: "BRANCH", value: "PARENT", isParentEnv: true },
+          { name: "SECRET_KEY", value: "secret-value" },
+          { name: "ANOTHER_SECRET", value: "another-secret-value" },
+        ];
+      }),
+      {
+        name: "npm-token",
+        onBuildComplete: async (context, manifest) => {
+          if (context.target === "dev") {
+            return;
+          }
+
+          context.addLayer({
+            id: "npm-token",
+            build: {
+              env: {
+                NPM_TOKEN: manifest.deploy.env?.NPM_TOKEN,
+              },
+            },
+          });
+        },
+      },
+    ],
+  },
+});
diff --git a/references/seed/tsconfig.json b/references/seed/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/seed/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/telemetry/package.json b/references/telemetry/package.json
new file mode 100644
index 00000000000..cb9bff620f6
--- /dev/null
+++ b/references/telemetry/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "references-telemetry",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "trigger dev",
+    "deploy": "trigger deploy"
+  },
+  "dependencies": {
+    "@trigger.dev/sdk": "workspace:*",
+    "@opentelemetry/resources": "2.2.0"
+  },
+  "devDependencies": {
+    "@types/node": "^20",
+    "trigger.dev": "workspace:*",
+    "typescript": "^5"
+  }
+}
\ No newline at end of file
diff --git a/references/telemetry/src/trigger/tasks.ts b/references/telemetry/src/trigger/tasks.ts
new file mode 100644
index 00000000000..d1a85ec166f
--- /dev/null
+++ b/references/telemetry/src/trigger/tasks.ts
@@ -0,0 +1,9 @@
+import { logger, task } from "@trigger.dev/sdk";
+
+export const telemetryTestTask = task({
+  id: "telemetry-test",
+  run: async (payload: any, { ctx }) => {
+    logger.info("Hello, world!", { payload, ctx });
+    return { message: "Hello, world!" };
+  },
+});
diff --git a/references/telemetry/trigger.config.ts b/references/telemetry/trigger.config.ts
new file mode 100644
index 00000000000..48e6a877ac1
--- /dev/null
+++ b/references/telemetry/trigger.config.ts
@@ -0,0 +1,14 @@
+import { defineConfig } from "@trigger.dev/sdk";
+import { resourceFromAttributes } from "@opentelemetry/resources";
+
+export default defineConfig({
+  project: process.env.TRIGGER_PROJECT_REF!,
+  dirs: ["./src/trigger"],
+  maxDuration: 3600,
+  telemetry: {
+    resource: resourceFromAttributes({
+      "foo.bar": "telemetry-test",
+      "foo.baz": "1.0.0",
+    }),
+  },
+});
diff --git a/references/telemetry/tsconfig.json b/references/telemetry/tsconfig.json
new file mode 100644
index 00000000000..9a5ee0b9d68
--- /dev/null
+++ b/references/telemetry/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "compilerOptions": {
+    "target": "ES2023",
+    "module": "Node16",
+    "moduleResolution": "Node16",
+    "esModuleInterop": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "customConditions": ["@triggerdotdev/source"],
+    "jsx": "preserve",
+    "lib": ["DOM", "DOM.Iterable"],
+    "noEmit": true
+  },
+  "include": ["./src/**/*.ts", "trigger.config.ts"]
+}
diff --git a/references/test-tasks/package.json b/references/test-tasks/package.json
index 6739b44b301..9ed2635da1a 100644
--- a/references/test-tasks/package.json
+++ b/references/test-tasks/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@trigger.dev/sdk": "workspace:*",
-    "zod": "3.23.8"
+    "zod": "3.25.76"
   },
   "devDependencies": {
     "@trigger.dev/build": "workspace:*",
diff --git a/references/v3-catalog/.env.example b/references/v3-catalog/.env.example
deleted file mode 100644
index fa02fca1d7c..00000000000
--- a/references/v3-catalog/.env.example
+++ /dev/null
@@ -1,7 +0,0 @@
-TRIGGER_SECRET_KEY=
-TRIGGER_API_URL=
-OPENAI_API_KEY="My API Key"
-UPLOADTHING_SECRET="My Secret"
-UPLOADTHING_APP_ID="My App ID"
-DATABASE_URL=postgresql://postgres:postgres@localhost:5432/v3-catalog-prisma?schema=public
-DATABASE_URL_UNPOOLED=postgresql://postgres:postgres@localhost:5432/v3-catalog-prisma?schema=public
diff --git a/references/v3-catalog/.uploadable-env b/references/v3-catalog/.uploadable-env
deleted file mode 100644
index b61445517c5..00000000000
--- a/references/v3-catalog/.uploadable-env
+++ /dev/null
@@ -1,2 +0,0 @@
-THIS_IS_MY_KEY=1234567890
-ANOTHER_KEY=0987654321
\ No newline at end of file
diff --git a/references/v3-catalog/README.md b/references/v3-catalog/README.md
deleted file mode 100644
index 42401b1f41b..00000000000
--- a/references/v3-catalog/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# The v3 catalog
-
-You can test v3 tasks from inside the app in this project. It's designed to be used for testing features and functionality of the v3 SDK.
-
-## One-time setup
-
-1. Create a v3 project in the UI of the webapp, you should now be able to select it from the dropdown.
-
-2. In Postgres go to the "Projects" table and for the project you create change the `externalRef` to `yubjwjsfkxnylobaqvqz`.
-
-This is so the `trigger.config.ts` file inside the v3-catalog doesn't keep getting changed by people accidentally pushing this.
-
-## How to use
-
-1. Make sure you're running the main webapp
-
-```bash
-pnpm run dev --filter webapp
-```
-
-2. Build the v3 CLI (this needs to be done everytime a code changes is made to the CLI if you're working on it)
-
-```bash
-pnpm run build --filter trigger.dev
-```
-
-3. CD into the v3-catalog directory
-
-```bash
-cd references/v3-catalog
-```
-
-4. If you've never logged in to the CLI you'll see an error telling you to login. Do this:
-
-```bash
-pnpm exec trigger login -a http://localhost:3030
-```
-
-If this fails because you already are logged in you can create a new profile:
-
-```bash
-pnpm exec trigger login -a http://localhost:3030 --profile local
-```
-
-Note: if you use a profile then you'll need to append `--profile local` to all commands, like `dev`.
-
-5. Run the v3 CLI
-
-```bash
-pnpm exec trigger dev
-```
-
-6. You should see the v3 dev command spitting out messages, including that it's started a background worker.
-
-7. Go to the webapp now and inside your project you should see some tasks on the "Tasks" page.
-
-8. Go to the "Test" page in the sidebar and select a task. Then enter a payload and click "Run test". You can tell what the payloads should be by looking at the relevant task file inside the `/references/v3-catalog/src/trigger` folder. Many of them accept an empty payload.
diff --git a/references/v3-catalog/package.json b/references/v3-catalog/package.json
deleted file mode 100644
index 5b2315fe67b..00000000000
--- a/references/v3-catalog/package.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "name": "references-v3-catalog",
-  "private": true,
-  "type": "module",
-  "zenstack": {
-    "schema": "./prisma/schema.zmodel"
-  },
-  "scripts": {
-    "dev": "trigger dev",
-    "deploy": "trigger deploy --self-hosted --load-image",
-    "management": "tsx -r dotenv/config ./src/management.ts",
-    "queues": "ts-node -r dotenv/config -r tsconfig-paths/register ./src/queues.ts",
-    "build:client": "tsup-node ./src/clientUsage.ts --format esm,cjs",
-    "client": "tsx -r dotenv/config ./src/clientUsage.ts",
-    "triggerWithLargePayload": "tsx -r dotenv/config ./src/triggerWithLargePayload.ts",
-    "generate:prisma": "prisma generate --sql"
-  },
-  "dependencies": {
-    "@1password/sdk": "^0.3.0",
-    "@effect/schema": "^0.75.5",
-    "@infisical/sdk": "^2.3.5",
-    "@opentelemetry/api": "1.4.1",
-    "@prisma/client": "5.19.0",
-    "@react-email/components": "0.0.24",
-    "@react-email/render": "1.0.1",
-    "@sentry/esbuild-plugin": "^2.22.2",
-    "@sinclair/typebox": "^0.33.17",
-    "@sindresorhus/slugify": "^2.2.1",
-    "@t3-oss/env-core": "^0.11.0",
-    "@t3-oss/env-nextjs": "^0.10.1",
-    "@traceloop/instrumentation-openai": "^0.10.0",
-    "@trigger.dev/sdk": "workspace:*",
-    "@typeschema/typebox": "^0.14.0",
-    "ai": "^3.3.24",
-    "arktype": "2.0.0-rc.17",
-    "bcrypt": "^6.0.0",
-    "canvas": "^3.1.0",
-    "dotenv": "^16.4.5",
-    "email-reply-parser": "^1.8.0",
-    "execa": "^8.0.1",
-    "fluent-ffmpeg": "^2.1.3",
-    "header-generator": "^2.1.55",
-    "kysely": "^0.27.4",
-    "msw": "^2.2.1",
-    "mupdf": "^1.3.6",
-    "openai": "^4.47.0",
-    "pg": "^8.11.5",
-    "playwright": "^1.50.1",
-    "puppeteer": "^23.4.0",
-    "react": "19.0.0-rc.0",
-    "react-email": "^3.0.1",
-    "reflect-metadata": "^0.1.13",
-    "runtypes": "^6.7.0",
-    "server-only": "^0.0.1",
-    "sharp": "^0.34.2",
-    "sqlite3": "^5.1.7",
-    "stripe": "^12.14.0",
-    "superstruct": "^2.0.2",
-    "typeorm": "^0.3.20",
-    "valibot": "^0.42.1",
-    "wrangler": "3.70.0",
-    "yt-dlp-wrap": "^2.3.12",
-    "yup": "^1.4.0",
-    "zip-node-addon": "^0.0.11",
-    "zod": "3.23.8"
-  },
-  "devDependencies": {
-    "@opentelemetry/api": "^1.8.0",
-    "@opentelemetry/core": "^1.22.0",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
-    "@opentelemetry/instrumentation": "^0.49.1",
-    "@opentelemetry/instrumentation-express": "^0.36.1",
-    "@opentelemetry/instrumentation-fetch": "^0.49.1",
-    "@opentelemetry/instrumentation-http": "^0.49.1",
-    "@opentelemetry/instrumentation-undici": "0.2.0",
-    "@opentelemetry/resources": "^1.22.0",
-    "@opentelemetry/sdk-logs": "^0.49.1",
-    "@opentelemetry/sdk-node": "^0.49.1",
-    "@opentelemetry/sdk-trace-base": "^1.22.0",
-    "@opentelemetry/sdk-trace-node": "^1.22.0",
-    "@opentelemetry/semantic-conventions": "^1.22.0",
-    "@trigger.dev/build": "workspace:*",
-    "@trigger.dev/python": "workspace:*",
-    "@types/bcrypt": "^5.0.2",
-    "@types/email-reply-parser": "^1.4.2",
-    "@types/fluent-ffmpeg": "^2.1.26",
-    "@types/react": "^18.3.1",
-    "esbuild": "^0.19.11",
-    "prisma": "5.19.0",
-    "prisma-kysely": "^1.8.0",
-    "trigger.dev": "workspace:*",
-    "ts-node": "^10.9.2",
-    "tsconfig-paths": "^4.2.0"
-  }
-}
\ No newline at end of file
diff --git a/references/v3-catalog/prisma/migrations/20240821142001_add_initial_schema/migration.sql b/references/v3-catalog/prisma/migrations/20240821142001_add_initial_schema/migration.sql
deleted file mode 100644
index af34bdc6395..00000000000
--- a/references/v3-catalog/prisma/migrations/20240821142001_add_initial_schema/migration.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- CreateTable
-CREATE TABLE "Post" (
-    "id" SERIAL NOT NULL,
-    "title" TEXT NOT NULL,
-    "content" TEXT NOT NULL,
-    "authorId" INTEGER NOT NULL,
-
-    CONSTRAINT "Post_pkey" PRIMARY KEY ("id")
-);
-
--- CreateTable
-CREATE TABLE "User" (
-    "id" SERIAL NOT NULL,
-    "name" TEXT NOT NULL,
-
-    CONSTRAINT "User_pkey" PRIMARY KEY ("id")
-);
-
--- AddForeignKey
-ALTER TABLE "Post" ADD CONSTRAINT "Post_authorId_fkey" FOREIGN KEY ("authorId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/references/v3-catalog/prisma/migrations/migration_lock.toml b/references/v3-catalog/prisma/migrations/migration_lock.toml
deleted file mode 100644
index fbffa92c2bb..00000000000
--- a/references/v3-catalog/prisma/migrations/migration_lock.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-# Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "postgresql"
\ No newline at end of file
diff --git a/references/v3-catalog/prisma/schema/post.prisma b/references/v3-catalog/prisma/schema/post.prisma
deleted file mode 100644
index 0daf663ad46..00000000000
--- a/references/v3-catalog/prisma/schema/post.prisma
+++ /dev/null
@@ -1,8 +0,0 @@
-// post.prisma
-model Post {
-  id       Int    @id @default(autoincrement())
-  title    String
-  content  String
-  authorId Int
-  author   User   @relation(fields: [authorId], references: [id])
-}
diff --git a/references/v3-catalog/prisma/schema/user.prisma b/references/v3-catalog/prisma/schema/user.prisma
deleted file mode 100644
index 5327f398240..00000000000
--- a/references/v3-catalog/prisma/schema/user.prisma
+++ /dev/null
@@ -1,6 +0,0 @@
-// user.prisma
-model User {
-  id    Int    @id @default(autoincrement())
-  name  String
-  posts Post[]
-}
diff --git a/references/v3-catalog/prisma/sql/getUsersWithPosts.sql b/references/v3-catalog/prisma/sql/getUsersWithPosts.sql
deleted file mode 100644
index 8f0cb3576da..00000000000
--- a/references/v3-catalog/prisma/sql/getUsersWithPosts.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT
-  u.id,
-  u.name,
-  COUNT(p.id) as "postCount"
-FROM
-  "User" u
-  LEFT JOIN "Post" p ON u.id = p."authorId"
-GROUP BY
-  u.id,
-  u.name;
\ No newline at end of file
diff --git a/references/v3-catalog/src copy/clientUsage.ts b/references/v3-catalog/src copy/clientUsage.ts
deleted file mode 100644
index 9cb0b38e1b3..00000000000
--- a/references/v3-catalog/src copy/clientUsage.ts	
+++ /dev/null
@@ -1,57 +0,0 @@
-import { auth, runs, tasks } from "@trigger.dev/sdk/v3";
-import type { task1, zodTask } from "./trigger/taskTypes.js";
-import { randomUUID } from "crypto";
-
-async function main() {
-  const userId = randomUUID();
-
-  const anyHandle = await tasks.trigger<typeof task1>(
-    "types/task-1",
-    {
-      foo: "baz",
-    },
-    {
-      tags: [`user:${userId}`],
-    },
-    {
-      publicAccessToken: {
-        expirationTime: "24hr",
-      },
-    }
-  );
-
-  console.log("Auto JWT", anyHandle.publicAccessToken);
-
-  const publicToken = await auth.createPublicToken({
-    scopes: {
-      read: {
-        runs: true,
-      },
-    },
-  });
-
-  await auth.withAuth({ accessToken: anyHandle.publicAccessToken }, async () => {
-    const subscription = runs.subscribeToRunsWithTag<typeof task1 | typeof zodTask>(
-      `user:${userId}`
-    );
-
-    for await (const run of subscription) {
-      switch (run.taskIdentifier) {
-        case "types/task-1": {
-          console.log("Run update:", run);
-          console.log("Output:", run.output);
-          console.log("Payload:", run.payload);
-          break;
-        }
-        case "types/zod": {
-          console.log("Run update:", run);
-          console.log("Output:", run.output);
-          console.log("Payload:", run.payload);
-          break;
-        }
-      }
-    }
-  });
-}
-
-main().catch(console.error);
diff --git a/references/v3-catalog/src copy/db.ts b/references/v3-catalog/src copy/db.ts
deleted file mode 100644
index 5e029ca062f..00000000000
--- a/references/v3-catalog/src copy/db.ts	
+++ /dev/null
@@ -1,6 +0,0 @@
-import { PrismaClient } from "@prisma/client";
-import { getUsersWithPosts } from "@prisma/client/sql";
-
-export const prisma = new PrismaClient();
-
-export { getUsersWithPosts };
diff --git a/references/v3-catalog/src copy/env.ts b/references/v3-catalog/src copy/env.ts
deleted file mode 100644
index ddacb5bd8c2..00000000000
--- a/references/v3-catalog/src copy/env.ts	
+++ /dev/null
@@ -1,13 +0,0 @@
-import { createEnv } from "@t3-oss/env-core";
-import { z } from "zod";
-
-export const env = createEnv({
-  server: {
-    UPLOADTHING_SECRET: z.string(),
-    UPLOADTHING_APP_ID: z.string(),
-    OPENAI_API_KEY: z.string(),
-  },
-
-  runtimeEnv: process.env,
-  emptyStringAsUndefined: true,
-});
diff --git a/references/v3-catalog/src copy/kysely/types.ts b/references/v3-catalog/src copy/kysely/types.ts
deleted file mode 100644
index fb511440577..00000000000
--- a/references/v3-catalog/src copy/kysely/types.ts	
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { ColumnType } from "kysely";
-export type Generated<T> = T extends ColumnType<infer S, infer I, infer U>
-  ? ColumnType<S, I | undefined, U>
-  : ColumnType<T, T | undefined, T>;
-export type Timestamp = ColumnType<Date, Date | string, Date | string>;
-
-export type Post = {
-  id: Generated<number>;
-  title: string;
-  content: string;
-  authorId: number;
-};
-export type User = {
-  id: Generated<number>;
-  name: string;
-};
-export type DB = {
-  Post: Post;
-  User: User;
-};
diff --git a/references/v3-catalog/src copy/management.ts b/references/v3-catalog/src copy/management.ts
deleted file mode 100644
index efa486573ae..00000000000
--- a/references/v3-catalog/src copy/management.ts	
+++ /dev/null
@@ -1,424 +0,0 @@
-import { configure, envvars, runs, schedules, batch, auth } from "@trigger.dev/sdk/v3";
-import dotenv from "dotenv";
-import { unfriendlyIdTask } from "./trigger/other.js";
-import { spamRateLimiter, taskThatErrors } from "./trigger/retries.js";
-import { firstScheduledTask } from "./trigger/scheduled.js";
-import { simpleChildTask } from "./trigger/subtasks.js";
-
-dotenv.config();
-
-async function doSpamRateLimiter() {
-  // Trigger 10 runs
-  await spamRateLimiter.batchTrigger(
-    Array.from({ length: 10 }, (_, i) => ({ payload: { runId: "run_pxxs52j3geik6cj6j8piq" } }))
-  );
-}
-
-// doSpamRateLimiter().catch(console.error);
-
-async function doEnvVars() {
-  configure({
-    secretKey: process.env.TRIGGER_ACCESS_TOKEN,
-    requestOptions: {
-      retry: {
-        maxAttempts: 1,
-      },
-    },
-  });
-
-  const response1 = await envvars.upload("yubjwjsfkxnylobaqvqz", "dev", {
-    variables: {
-      MY_ENV_VAR: "MY_ENV_VAR_VALUE",
-    },
-    override: true,
-  });
-
-  console.log("response1", response1);
-
-  const envVars = await envvars.list("yubjwjsfkxnylobaqvqz", "dev");
-
-  console.log("envVars", envVars);
-
-  const createResponse = await envvars.create("yubjwjsfkxnylobaqvqz", "dev", {
-    name: "MY_ENV_VAR_CREATE",
-    value: "MY_ENV_VAR_VALUE_CREATE",
-  });
-
-  console.log("createResponse", createResponse);
-
-  const retrieveResponse = await envvars.retrieve(
-    "yubjwjsfkxnylobaqvqz",
-    "dev",
-    "MY_ENV_VAR_CREATE"
-  );
-
-  console.log("retrieveResponse", retrieveResponse);
-
-  const updateResponse = await envvars.update("yubjwjsfkxnylobaqvqz", "dev", "MY_ENV_VAR_CREATE", {
-    value: "MY_ENV_VAR_VALUE_CREATE_UPDATED",
-  });
-
-  console.log("updateResponse", updateResponse);
-
-  const deleteResponse = await envvars.del("yubjwjsfkxnylobaqvqz", "dev", "MY_ENV_VAR_CREATE");
-
-  console.log("deleteResponse", deleteResponse);
-}
-
-async function doRuns() {
-  const run = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-  const retrievedRun = await runs.retrieve(run.id);
-  console.log("retrieved run", retrievedRun);
-
-  const completedRun = await waitForRunToComplete(run.id);
-  console.log("completed run", completedRun);
-
-  const failingRun = await taskThatErrors.trigger({ message: "Hello, World!" });
-  const failedRun = await waitForRunToComplete(failingRun.id);
-
-  console.log("failed run", failedRun);
-
-  const replayableRun = await runs.replay(failedRun.id);
-  const replayedRun = await waitForRunToExecute(replayableRun.id);
-
-  console.log("replayed run", replayedRun);
-
-  const canceledRun = await runs.cancel(replayedRun.id);
-  const canceledRunResult = await waitForRunToComplete(canceledRun.id);
-
-  console.log("canceled run", canceledRunResult);
-}
-
-async function doListRuns() {
-  let pageCount = 0;
-
-  let page = await runs.list(
-    {
-      limit: 100,
-    },
-    {
-      retry: {
-        maxAttempts: 1,
-      },
-    }
-  );
-
-  console.log(`run page #${++pageCount}, with ${page.data.length} runs`);
-
-  // Convenience methods are provided for manually paginating:
-  while (page.hasNextPage()) {
-    page = await page.getNextPage();
-    console.log(`run page #${++pageCount}`);
-  }
-
-  while (page.hasPreviousPage()) {
-    page = await page.getPreviousPage();
-    console.log(`run page #${--pageCount}`);
-  }
-
-  for await (const run of runs.list({
-    status: ["COMPLETED"],
-    period: "1y",
-  })) {
-    console.log(run);
-  }
-
-  let withResponse = await runs
-    .list({
-      limit: 100,
-    })
-    .withResponse();
-
-  console.log(
-    "withResponse",
-    withResponse.response.status,
-    withResponse.response.headers,
-    withResponse.data.data.length
-  );
-
-  configure({
-    secretKey: process.env.TRIGGER_ACCESS_TOKEN,
-  });
-
-  for await (const run of runs.list("yubjwjsfkxnylobaqvqz", {
-    status: ["COMPLETED"],
-    period: "1y",
-    env: ["dev", "staging", "prod"],
-  })) {
-    console.log(run.env.name, run.isTest, run.id, run.status, run.createdAt);
-  }
-}
-
-async function waitForRunToComplete(runId: string) {
-  let run = await runs.retrieve(runId);
-
-  while (!run.isCompleted) {
-    console.log("run is not completed, waiting...", run);
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-    run = await runs.retrieve(runId);
-  }
-
-  console.log("run is completed", run);
-
-  return run;
-}
-
-async function waitForRunToExecute(runId: string) {
-  let run = await runs.retrieve(runId);
-
-  while (!run.isExecuting) {
-    console.log("run is not executing, waiting...", run);
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-    run = await runs.retrieve(runId);
-  }
-
-  console.log("run is executing", run);
-
-  return run;
-}
-
-async function doSchedules() {
-  const allSchedules = await schedules.list();
-
-  console.log("all schedules", allSchedules);
-
-  // Create a schedule
-  const createdSchedule = await schedules.create({
-    task: firstScheduledTask.id,
-    cron: "0 0 * * *",
-    externalId: "ext_1234444",
-    deduplicationKey: "dedup_1234444",
-  });
-
-  console.log("created schedule", createdSchedule);
-
-  const retrievedSchedule = await schedules.retrieve(createdSchedule.id);
-
-  console.log("retrieved schedule", retrievedSchedule);
-
-  const updatedSchedule = await schedules.update(createdSchedule.id, {
-    task: firstScheduledTask.id,
-    cron: "0 0 1 * *",
-    externalId: "ext_1234444",
-  });
-
-  console.log("updated schedule", updatedSchedule);
-
-  const deactivatedSchedule = await schedules.deactivate(createdSchedule.id);
-
-  console.log("deactivated schedule", deactivatedSchedule);
-
-  const activatedSchedule = await schedules.activate(createdSchedule.id);
-
-  console.log("activated schedule", activatedSchedule);
-
-  const deletedSchedule = await schedules.del(createdSchedule.id);
-
-  console.log("deleted schedule", deletedSchedule);
-}
-
-async function doScheduleLists() {
-  let pageCount = 0;
-
-  let page = await schedules.list({
-    perPage: 2,
-  });
-
-  console.log(`schedule page #${++pageCount}`);
-
-  // Convenience methods are provided for manually paginating:
-  while (page.hasNextPage()) {
-    page = await page.getNextPage();
-    console.log(`schedule page #${++pageCount}`);
-  }
-
-  while (page.hasPreviousPage()) {
-    page = await page.getPreviousPage();
-    console.log(`schedule page #${--pageCount}`);
-  }
-
-  for await (const schedule of schedules.list({
-    perPage: 2,
-  })) {
-    console.log(schedule.id, schedule.task, schedule.generator);
-  }
-}
-
-async function doTriggerUnfriendlyTaskId() {
-  const run = await unfriendlyIdTask.trigger();
-
-  console.log("unfriendly id task run", run);
-
-  const completedRun = await waitForRunToComplete(run.id);
-
-  console.log("completed run", completedRun);
-}
-
-async function doBatchTrigger() {
-  const response = await batch.triggerByTask([
-    { task: simpleChildTask, payload: { message: "Hello, World!" } },
-  ]);
-
-  console.log("batch trigger response", response);
-
-  const $batch = await batch.retrieve(response.batchId);
-
-  console.log("batch", $batch);
-
-  const $runs = await runs.list({ batch: response.batchId });
-
-  console.log("batch runs", $runs.data);
-}
-
-async function doRescheduleRun() {
-  const run = await simpleChildTask.trigger({ message: "Hello, World!" }, { delay: "1h" });
-
-  console.log("run", run);
-
-  const reschedule = await runs.reschedule(run.id, {
-    delay: "1s",
-  });
-
-  console.log("reschedule", reschedule);
-
-  const rescheduledRun = await waitForRunToComplete(reschedule.id);
-
-  console.log("rescheduled run", rescheduledRun);
-}
-
-async function doOneTimeUseTrigger() {
-  console.log("Testing with one-time use token");
-
-  try {
-    await auth.withTriggerPublicToken(simpleChildTask.id, {}, async () => {
-      const run1 = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-      console.log("run1", run1);
-
-      const run2 = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-      console.log("run2", run2);
-    });
-  } catch (error) {
-    console.error(error);
-  }
-
-  console.log("Testing with deprecated public token");
-
-  try {
-    await auth.withPublicToken(
-      {
-        scopes: {
-          write: {
-            tasks: simpleChildTask.id,
-          },
-        },
-      },
-      async () => {
-        const run1 = await simpleChildTask.trigger({ message: "Hello, World!" });
-      }
-    );
-  } catch (error) {
-    console.error(error);
-  }
-
-  console.log("Testing with trigger public token");
-
-  try {
-    await auth.withPublicToken(
-      {
-        scopes: {
-          trigger: {
-            tasks: simpleChildTask.id,
-          },
-        },
-      },
-      async () => {
-        const run1 = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-        console.log("run1", run1);
-
-        const run2 = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-        console.log("run2", run2);
-      }
-    );
-  } catch (error) {
-    console.error(error);
-  }
-
-  console.log("Testing with a one-time use token for the wrong task");
-
-  try {
-    await auth.withTriggerPublicToken("wrong-task-id", {}, async () => {
-      const run1 = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-      console.log("run1", run1);
-    });
-  } catch (error) {
-    console.error(error);
-  }
-
-  console.log("Testing with a public token for the wrong task");
-
-  try {
-    await auth.withPublicToken(
-      {
-        scopes: {
-          write: {
-            tasks: "wrong-task-id",
-          },
-        },
-      },
-      async () => {
-        const run1 = await simpleChildTask.trigger({ message: "Hello, World!" });
-
-        console.log("run1", run1);
-      }
-    );
-  } catch (error) {
-    console.error(error);
-  }
-
-  console.log("Testing batch trigger with one-time use token");
-
-  try {
-    await auth.withBatchTriggerPublicToken(simpleChildTask.id, {}, async () => {
-      const batch1 = await batch.triggerByTask([
-        { task: simpleChildTask, payload: { message: "Hello, World!" } },
-      ]);
-
-      console.log("batch1", batch1);
-
-      const batch2 = await batch.triggerByTask([
-        { task: simpleChildTask, payload: { message: "Hello, World!" } },
-      ]);
-    });
-  } catch (error) {
-    console.error(error);
-  }
-
-  console.log("Testing batch trigger with a trigger token");
-
-  try {
-    await auth.withTriggerPublicToken(simpleChildTask.id, {}, async () => {
-      const batch1 = await batch.triggerByTask([
-        { task: simpleChildTask, payload: { message: "Hello, World!" } },
-      ]);
-
-      console.log("batch1", batch1);
-    });
-  } catch (error) {
-    console.error(error);
-  }
-}
-
-// doRuns().catch(console.error);
-// doListRuns().catch(console.error);
-// doScheduleLists().catch(console.error);
-// doBatchTrigger().catch(console.error);
-// doEnvVars().catch(console.error);
-// doTriggerUnfriendlyTaskId().catch(console.error);
-// doRescheduleRun().catch(console.error);
-doOneTimeUseTrigger().catch(console.error);
diff --git a/references/v3-catalog/src copy/queues.ts b/references/v3-catalog/src copy/queues.ts
deleted file mode 100644
index 54bb84877b0..00000000000
--- a/references/v3-catalog/src copy/queues.ts	
+++ /dev/null
@@ -1,72 +0,0 @@
-import dotenv from "dotenv";
-import { setTimeout } from "timers/promises";
-import { simpleChildTask } from "./trigger/subtasks.js";
-
-dotenv.config();
-
-export async function run() {
-  await simpleChildTask.trigger({ message: "Regular queue" });
-  await simpleChildTask.trigger(
-    { message: "Simple alt queue 1" },
-    {
-      queue: {
-        name: "queue-concurrency-3",
-        concurrencyLimit: 1,
-      },
-    }
-  );
-  await simpleChildTask.trigger(
-    { message: "Simple alt queue 2" },
-    {
-      queue: {
-        name: "queue-concurrency-3",
-        concurrencyLimit: 1,
-      },
-    }
-  );
-
-  await simpleChildTask.batchTrigger([{ payload: { message: "Regular queue" } }]);
-  await simpleChildTask.batchTrigger([
-    {
-      payload: { message: "Batched alt queue 1" },
-      options: {
-        queue: {
-          name: "queue-concurrency-3",
-          concurrencyLimit: 1,
-        },
-      },
-    },
-    {
-      payload: { message: "Batched alt queue 2" },
-      options: {
-        queue: {
-          name: "queue-concurrency-3",
-          concurrencyLimit: 1,
-        },
-      },
-    },
-    {
-      payload: { message: "Batched alt queue 3" },
-      options: {
-        queue: {
-          name: "queue-concurrency-3",
-          concurrencyLimit: 1,
-        },
-      },
-    },
-  ]);
-
-  await setTimeout(10_000);
-
-  //this should set the concurrencyLimit back to none
-  await simpleChildTask.trigger(
-    { message: "Simple alt queue 2" },
-    {
-      queue: {
-        name: "queue-concurrency-3",
-      },
-    }
-  );
-}
-
-run().catch(console.error);
diff --git a/references/v3-catalog/src copy/telemetry.ts b/references/v3-catalog/src copy/telemetry.ts
deleted file mode 100644
index 105c9e40ca2..00000000000
--- a/references/v3-catalog/src copy/telemetry.ts	
+++ /dev/null
@@ -1,13 +0,0 @@
-import { trace } from "@opentelemetry/api";
-
-export const tracer = trace.getTracer("v3-catalog", "3.0.0.dp.1");
-
-export function traceAsync<T>(name: string, fn: () => Promise<T>): Promise<T> {
-  return tracer.startActiveSpan(name, async (span) => {
-    try {
-      return await fn();
-    } finally {
-      span.end();
-    }
-  });
-}
diff --git a/references/v3-catalog/src copy/tracer.ts b/references/v3-catalog/src copy/tracer.ts
deleted file mode 100644
index f3394d766ec..00000000000
--- a/references/v3-catalog/src copy/tracer.ts	
+++ /dev/null
@@ -1,40 +0,0 @@
-import { DiagConsoleLogger, DiagLogLevel, diag } from "@opentelemetry/api";
-import { InstrumentationOption, registerInstrumentations } from "@opentelemetry/instrumentation";
-import { FetchInstrumentation } from "@opentelemetry/instrumentation-fetch";
-import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
-import { UndiciInstrumentation } from "@opentelemetry/instrumentation-undici";
-import { Resource } from "@opentelemetry/resources";
-import { ConsoleSpanExporter, SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base";
-import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
-import { SEMRESATTRS_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
-
-export const tracer = getTracer();
-
-function getTracer() {
-  diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ERROR);
-
-  const provider = new NodeTracerProvider({
-    forceFlushTimeoutMillis: 500,
-    resource: new Resource({
-      [SEMRESATTRS_SERVICE_NAME]: "v3-catalog",
-    }),
-  });
-
-  const loggerExporter = new ConsoleSpanExporter();
-  provider.addSpanProcessor(new SimpleSpanProcessor(loggerExporter));
-
-  provider.register();
-
-  let instrumentations: InstrumentationOption[] = [
-    new HttpInstrumentation(),
-    new FetchInstrumentation(),
-    new UndiciInstrumentation(),
-  ];
-
-  registerInstrumentations({
-    tracerProvider: provider,
-    instrumentations,
-  });
-
-  return provider.getTracer("v3-catalog", "3.0.0.dp.1");
-}
diff --git a/references/v3-catalog/src copy/trigger/batch.ts b/references/v3-catalog/src copy/trigger/batch.ts
deleted file mode 100644
index 032c6ddaee6..00000000000
--- a/references/v3-catalog/src copy/trigger/batch.ts	
+++ /dev/null
@@ -1,844 +0,0 @@
-import { Equal, Expect } from "@/utils/types.js";
-import {
-  AnyRealtimeRun,
-  auth,
-  batch,
-  idempotencyKeys,
-  logger,
-  runs,
-  task,
-  tasks,
-  wait,
-} from "@trigger.dev/sdk/v3";
-import assert from "node:assert";
-import { randomUUID } from "node:crypto";
-import { setTimeout } from "node:timers/promises";
-
-export const batchParentTask = task({
-  id: "batch-parent-task",
-  run: async (payload: { size?: number; wait?: boolean }) => {
-    const items = Array.from({ length: payload.size ?? 10 }, (_, i) => ({
-      payload: {
-        id: `item${i}`,
-        name: `Item Name ${i}`,
-        description: `This is a description for item ${i}`,
-        value: i,
-        timestamp: new Date().toISOString(),
-        foo: {
-          id: `item${i}`,
-          name: `Item Name ${i}`,
-          description: `This is a description for item ${i}`,
-          value: i,
-          timestamp: new Date().toISOString(),
-        },
-        bar: {
-          id: `item${i}`,
-          name: `Item Name ${i}`,
-          description: `This is a description for item ${i}`,
-          value: i,
-          timestamp: new Date().toISOString(),
-        },
-      },
-      options: {
-        idempotencyKey: `item${i}`,
-      },
-    }));
-
-    return payload.wait
-      ? await batchChildTask.batchTriggerAndWait(items.map((i) => ({ payload: i.payload })))
-      : await batchChildTask.batchTrigger(items);
-  },
-});
-
-export const triggerWithQueue = task({
-  id: "trigger-with-queue",
-  run: async () => {
-    await batchChildTask.trigger(
-      {},
-      {
-        queue: {
-          name: "batch-queue-foo",
-          concurrencyLimit: 10,
-        },
-      }
-    );
-  },
-});
-
-export const batchParentWitFailsTask = task({
-  id: "batch-parent-with-fails-task",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async () => {
-    const response = await taskThatFails.batchTriggerAndWait([
-      { payload: false },
-      { payload: true },
-      { payload: false },
-    ]);
-
-    logger.info("Batch response", { response });
-
-    const respone2 = await taskThatFails.batchTriggerAndWait([
-      { payload: true },
-      { payload: false },
-      { payload: true },
-    ]);
-
-    logger.info("Batch response2", { respone2 });
-  },
-});
-
-export const batchChildTask = task({
-  id: "batch-child-task",
-  retry: {
-    maxAttempts: 2,
-  },
-  run: async (payload: any, { ctx }) => {
-    logger.info("Processing child task", { payload });
-
-    await wait.for({ seconds: 1 });
-
-    return `${payload} - processed`;
-  },
-});
-
-export const taskThatFails = task({
-  id: "task-that-fails",
-  retry: {
-    maxAttempts: 2,
-  },
-  run: async (fail: boolean) => {
-    logger.info(`Will fail ${fail}`);
-
-    if (fail) {
-      throw new Error("Task failed");
-    }
-
-    return {
-      foo: "bar",
-    };
-  },
-});
-
-export const allV2TestTask = task({
-  id: "all-v2-test",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async ({ triggerSequentially }: { triggerSequentially?: boolean }, { ctx }) => {
-    const response1 = await batch.trigger<typeof allV2ChildTask1 | typeof allV2ChildTask2>(
-      [
-        {
-          id: "all-v2-test-child-1",
-          payload: { child1: "foo" },
-          options: { idempotencyKey: randomUUID() },
-        },
-        {
-          id: "all-v2-test-child-2",
-          payload: { child2: "bar" },
-          options: { idempotencyKey: randomUUID() },
-        },
-        {
-          id: "all-v2-test-child-1",
-          payload: { child1: "baz" },
-          options: { idempotencyKey: randomUUID() },
-        },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Response 1", { response1 });
-
-    for (const run of response1.runs) {
-      switch (run.taskIdentifier) {
-        case "all-v2-test-child-1": {
-          const run1 = await runs.retrieve(run);
-
-          type Run1Payload = Expect<Equal<typeof run1.payload, { child1: string } | undefined>>;
-          type Run1Output = Expect<Equal<typeof run1.output, { foo: string } | undefined>>;
-
-          break;
-        }
-        case "all-v2-test-child-2": {
-          const run2 = await runs.retrieve(run);
-
-          type Run2Payload = Expect<Equal<typeof run2.payload, { child2: string } | undefined>>;
-          type Run2Output = Expect<Equal<typeof run2.output, { bar: string } | undefined>>;
-
-          break;
-        }
-      }
-    }
-
-    const {
-      runs: [batchRun1, batchRun2, batchRun3],
-    } = await batch.triggerByTask(
-      [
-        { task: allV2ChildTask1, payload: { child1: "foo" } },
-        { task: allV2ChildTask2, payload: { child2: "bar" } },
-        { task: allV2ChildTask1, payload: { child1: "baz" } },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Batch runs", { batchRun1, batchRun2, batchRun3 });
-
-    const taskRun1 = await runs.retrieve(batchRun1);
-
-    type TaskRun1Payload = Expect<Equal<typeof taskRun1.payload, { child1: string } | undefined>>;
-    type TaskRun1Output = Expect<Equal<typeof taskRun1.output, { foo: string } | undefined>>;
-
-    const taskRun2 = await runs.retrieve(batchRun2);
-
-    type TaskRun2Payload = Expect<Equal<typeof taskRun2.payload, { child2: string } | undefined>>;
-    type TaskRun2Output = Expect<Equal<typeof taskRun2.output, { bar: string } | undefined>>;
-
-    const taskRun3 = await runs.retrieve(batchRun3);
-
-    type TaskRun3Payload = Expect<Equal<typeof taskRun3.payload, { child1: string } | undefined>>;
-    type TaskRun3Output = Expect<Equal<typeof taskRun3.output, { foo: string } | undefined>>;
-
-    const response3 = await batch.triggerAndWait<typeof allV2ChildTask1 | typeof allV2ChildTask2>(
-      [
-        { id: "all-v2-test-child-1", payload: { child1: "foo" } },
-        { id: "all-v2-test-child-2", payload: { child2: "bar" } },
-        { id: "all-v2-test-child-1", payload: { child1: "baz" } },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Response 3", { response3 });
-
-    for (const run of response3.runs) {
-      if (run.ok) {
-        switch (run.taskIdentifier) {
-          case "all-v2-test-child-1": {
-            type Run1Output = Expect<Equal<typeof run.output, { foo: string }>>;
-
-            break;
-          }
-          case "all-v2-test-child-2": {
-            type Run2Output = Expect<Equal<typeof run.output, { bar: string }>>;
-
-            break;
-          }
-        }
-      }
-    }
-
-    for (const run of response3.runs) {
-      switch (run.taskIdentifier) {
-        case "all-v2-test-child-1": {
-          if (run.ok) {
-            type Run1Output = Expect<Equal<typeof run.output, { foo: string }>>;
-          }
-
-          break;
-        }
-        case "all-v2-test-child-2": {
-          if (run.ok) {
-            type Run2Output = Expect<Equal<typeof run.output, { bar: string }>>;
-          }
-
-          break;
-        }
-      }
-    }
-
-    const {
-      runs: [batch2Run1, batch2Run2, batch2Run3],
-    } = await batch.triggerByTaskAndWait(
-      [
-        { task: allV2ChildTask1, payload: { child1: "foo" } },
-        { task: allV2ChildTask2, payload: { child2: "bar" } },
-        { task: allV2ChildTask1, payload: { child1: "baz" } },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Batch 2 runs", { batch2Run1, batch2Run2, batch2Run3 });
-
-    if (batch2Run1.ok) {
-      type Batch2Run1Output = Expect<Equal<typeof batch2Run1.output, { foo: string }>>;
-    }
-
-    if (batch2Run2.ok) {
-      type Batch2Run2Output = Expect<Equal<typeof batch2Run2.output, { bar: string }>>;
-    }
-
-    if (batch2Run3.ok) {
-      type Batch2Run3Output = Expect<Equal<typeof batch2Run3.output, { foo: string }>>;
-    }
-  },
-});
-
-export const allV2ChildTask1 = task({
-  id: "all-v2-test-child-1",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async (payload: { child1: string }) => {
-    return {
-      foo: "bar",
-    };
-  },
-});
-
-export const allV2ChildTask2 = task({
-  id: "all-v2-test-child-2",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async (payload: { child2: string }) => {
-    return {
-      bar: "baz",
-    };
-  },
-});
-
-export const batchV2TestTask = task({
-  id: "batch-v2-test",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async ({
-    triggerSequentially,
-    largeBatchSize = 20,
-  }: {
-    triggerSequentially?: boolean;
-    largeBatchSize?: number;
-  }) => {
-    // First lets try triggering with too many items
-    try {
-      await tasks.batchTrigger<typeof batchV2TestChild>(
-        "batch-v2-test-child",
-        Array.from({ length: 501 }, (_, i) => ({
-          payload: { foo: `bar${i}` },
-        })),
-        {
-          triggerSequentially,
-        }
-      );
-
-      assert.fail("Batch trigger should have failed");
-    } catch (error: any) {
-      assert.equal(
-        error.message,
-        '400 "Batch size of 501 is too large. Maximum allowed batch size is 500."',
-        "Batch trigger failed with wrong error"
-      );
-    }
-
-    // TODO tests:
-    // tasks.batchTrigger
-    // tasks.batchTriggerAndWait
-    // myTask.batchTriggerAndWait
-    const response1 = await batchV2TestChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 1", { response1 });
-
-    // Check that the batch ID matches this kind of ID: batch_g5obektq4xv699mq7eb9q
-    assert.match(response1.batchId, /^batch_[a-z0-9]{21}$/, "response1: Batch ID is invalid");
-    assert.equal(response1.runs.length, 2, "response1: Items length is invalid");
-    assert.match(response1.runs[0].id, /^run_[a-z0-9]{21}$/, "response1: Run ID is invalid");
-    assert.equal(
-      response1.runs[0].taskIdentifier,
-      "batch-v2-test-child",
-      "response1: runs[0] Task identifier is invalid"
-    );
-    assert.equal(response1.runs[0].isCached, false, "response1: runs[0] Run is cached");
-    assert.equal(
-      response1.runs[0].idempotencyKey,
-      undefined,
-      "response1: runs[0] Idempotent key is invalid"
-    );
-
-    assert.match(
-      response1.runs[1].id,
-      /^run_[a-z0-9]{21}$/,
-      "response1: runs[1] Run ID is invalid"
-    );
-    assert.equal(
-      response1.runs[1].taskIdentifier,
-      "batch-v2-test-child",
-      "response1: runs[1] Task identifier is invalid"
-    );
-    assert.equal(response1.runs[1].isCached, false, "response1: runs[1] Run is cached");
-    assert.equal(
-      response1.runs[1].idempotencyKey,
-      undefined,
-      "response1: runs[1] Idempotent key is invalid"
-    );
-
-    await auth.withAuth({ accessToken: response1.publicAccessToken }, async () => {
-      const [run0, run1] = await Promise.all([
-        runs.retrieve(response1.runs[0].id),
-        runs.retrieve(response1.runs[1].id),
-      ]);
-
-      logger.debug("retrieved response 1 runs", { run0, run1 });
-
-      for await (const liveRun0 of runs.subscribeToRun(response1.runs[0].id)) {
-        logger.debug("subscribed to run0", { liveRun0 });
-
-        if (liveRun0.finishedAt) {
-          break;
-        }
-      }
-
-      for await (const liveRun1 of runs.subscribeToRun(response1.runs[1].id)) {
-        logger.debug("subscribed to run1", { liveRun1 });
-
-        if (liveRun1.finishedAt) {
-          break;
-        }
-      }
-    });
-
-    // Now let's do another batch trigger, this time with 100 items, and immediately try and retrieve the last run
-    const response2 = await batchV2TestChild.batchTrigger(
-      Array.from({ length: 30 }, (_, i) => ({
-        payload: { foo: `bar${i}` },
-      })),
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 2", { response2 });
-
-    assert.equal(response2.runs.length, 30, "response2: Items length is invalid");
-
-    const lastRunId = response2.runs[response2.runs.length - 1].id;
-
-    const lastRun = await runs.retrieve(lastRunId);
-
-    logger.info("Last run", { lastRun });
-
-    assert.equal(lastRun.id, lastRunId, "response2: Last run ID is invalid");
-
-    // okay, now we are going to test using the batch-level idempotency key
-    // we need to test that when reusing the idempotency key, we retrieve the same batch and runs and the response is correct
-    // we will also need to test idempotencyKeyTTL and make sure that the key is not reused after the TTL has expired
-    const idempotencyKey1 = randomUUID();
-
-    const response3 = await batchV2TestChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        idempotencyKey: idempotencyKey1,
-        idempotencyKeyTTL: "5s",
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 3", { response3 });
-
-    assert.equal(response3.isCached, false, "response3: Batch is cached");
-    assert.ok(response3.idempotencyKey, "response3: Batch idempotency key is invalid");
-    assert.equal(response3.runs.length, 2, "response3: Items length is invalid");
-    assert.equal(response3.runs[0].isCached, false, "response3: runs[0] Run is cached");
-    assert.equal(response3.runs[1].isCached, false, "response3: runs[1] Run is cached");
-
-    const response4 = await batchV2TestChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        idempotencyKey: idempotencyKey1,
-        idempotencyKeyTTL: "5s",
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 4", { response4 });
-
-    assert.equal(response4.batchId, response3.batchId, "response4: Batch ID is invalid");
-    assert.equal(response4.isCached, true, "response4: Batch is not cached");
-    assert.equal(response4.runs.length, 2, "response4: Items length is invalid");
-    assert.equal(response4.runs[0].isCached, true, "response4: runs[0] Run is not cached");
-    assert.equal(response4.runs[1].isCached, true, "response4: runs[1] Run is not cached");
-    assert.equal(
-      response4.runs[0].id,
-      response3.runs[0].id,
-      "response4: runs[0] Run ID is invalid"
-    );
-    assert.equal(
-      response4.runs[1].id,
-      response3.runs[1].id,
-      "response4: runs[1] Run ID is invalid"
-    );
-
-    await wait.for({ seconds: 6 });
-
-    const response5 = await batchV2TestChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        idempotencyKey: idempotencyKey1,
-        idempotencyKeyTTL: "5s",
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 5", { response5 });
-
-    assert.equal(response5.isCached, false, "response5: Batch is cached");
-    assert.notEqual(response5.batchId, response3.batchId, "response5: Batch ID is invalid");
-    assert.equal(response5.runs.length, 2, "response5: Items length is invalid");
-    assert.equal(response5.runs[0].isCached, false, "response5: runs[0] Run is cached");
-    assert.equal(response5.runs[1].isCached, false, "response5: runs[1] Run is cached");
-
-    // Now we need to test with idempotency keys on the individual runs
-    // The first test will make sure that the idempotency key is passed to the child task
-    const idempotencyKeyChild1 = randomUUID();
-    const idempotencyKeyChild2 = randomUUID();
-
-    const response6 = await batchV2TestChild.batchTrigger(
-      [
-        {
-          payload: { foo: "bar" },
-          options: { idempotencyKey: idempotencyKeyChild1, idempotencyKeyTTL: "5s" },
-        },
-        {
-          payload: { foo: "baz" },
-          options: { idempotencyKey: idempotencyKeyChild2, idempotencyKeyTTL: "15s" },
-        },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 6", { response6 });
-
-    assert.equal(response6.runs.length, 2, "response6: Items length is invalid");
-    assert.equal(response6.runs[0].isCached, false, "response6: runs[0] Run is cached");
-    assert.equal(response6.runs[1].isCached, false, "response6: runs[1] Run is cached");
-    assert.ok(response6.runs[0].idempotencyKey, "response6: runs[0] Idempotent key is invalid");
-    assert.ok(response6.runs[1].idempotencyKey, "response6: runs[1] Idempotent key is invalid");
-
-    await setTimeout(1000);
-
-    const response7 = await batchV2TestChild.batchTrigger(
-      [
-        { payload: { foo: "bar" }, options: { idempotencyKey: idempotencyKeyChild1 } },
-        { payload: { foo: "baz" }, options: { idempotencyKey: idempotencyKeyChild2 } },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 7", { response7 });
-
-    assert.equal(response7.runs.length, 2, "response7: Items length is invalid");
-    assert.equal(response7.runs[0].isCached, true, "response7: runs[0] Run is not cached");
-    assert.equal(response7.runs[1].isCached, true, "response7: runs[1] Run is not cached");
-    assert.equal(
-      response7.runs[0].id,
-      response6.runs[0].id,
-      "response7: runs[0] Run ID is invalid"
-    );
-    assert.equal(
-      response7.runs[1].id,
-      response6.runs[1].id,
-      "response7: runs[1] Run ID is invalid"
-    );
-
-    await wait.for({ seconds: 6 });
-
-    // Now we need to test that the first run is not cached and is a new run, and the second run is cached
-    const response8 = await batchV2TestChild.batchTrigger(
-      [
-        { payload: { foo: "bar" }, options: { idempotencyKey: idempotencyKeyChild1 } },
-        { payload: { foo: "baz" }, options: { idempotencyKey: idempotencyKeyChild2 } },
-      ],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.info("Response 8", { response8 });
-
-    assert.equal(response8.runs.length, 2, "response8: Items length is invalid");
-    assert.equal(response8.runs[0].isCached, false, "response8: runs[0] Run is cached");
-    assert.equal(response8.runs[1].isCached, true, "response8: runs[1] Run is not cached");
-    assert.notEqual(
-      response8.runs[0].id,
-      response6.runs[0].id,
-      "response8: runs[0] Run ID is invalid"
-    );
-    assert.equal(
-      response8.runs[1].id,
-      response6.runs[1].id,
-      "response8: runs[1] Run ID is invalid"
-    );
-
-    // Now we need to test with batchTriggerAndWait
-    const response9 = await batchV2TestChild.batchTriggerAndWait(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Response 9", { response9 });
-
-    assert.match(response9.id, /^batch_[a-z0-9]{21}$/, "response9: Batch ID is invalid");
-    assert.equal(response9.runs.length, 2, "response9: Items length is invalid");
-    assert.ok(response9.runs[0].ok, "response9: runs[0] is not ok");
-    assert.ok(response9.runs[1].ok, "response9: runs[1] is not ok");
-    assert.equal(
-      response9.runs[0].taskIdentifier,
-      "batch-v2-test-child",
-      "response9: runs[0] Task identifier is invalid"
-    );
-    assert.equal(
-      response9.runs[1].taskIdentifier,
-      "batch-v2-test-child",
-      "response9: runs[1] Task identifier is invalid"
-    );
-    assert.deepEqual(
-      response9.runs[0].output,
-      { foo: "bar" },
-      "response9: runs[0] result is invalid"
-    );
-    assert.deepEqual(
-      response9.runs[1].output,
-      { foo: "baz" },
-      "response9: runs[1] result is invalid"
-    );
-
-    // Now batchTriggerAndWait with 21 items
-    const response10 = await batchV2TestChild.batchTriggerAndWait(
-      Array.from({ length: largeBatchSize }, (_, i) => ({
-        payload: { foo: `bar${i}` },
-      })),
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Response 10", { response10 });
-
-    assert.match(response10.id, /^batch_[a-z0-9]{21}$/, "response10: Batch ID is invalid");
-    assert.equal(response10.runs.length, largeBatchSize, "response10: Items length is invalid");
-
-    // Now repeat the first few tests using `tasks.batchTrigger`:
-    const response11 = await tasks.batchTrigger<typeof batchV2TestChild>(
-      "batch-v2-test-child",
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        triggerSequentially,
-      }
-    );
-
-    logger.debug("Response 11", { response11 });
-
-    assert.match(response11.batchId, /^batch_[a-z0-9]{21}$/, "response11: Batch ID is invalid");
-    assert.equal(response11.runs.length, 2, "response11: Items length is invalid");
-    assert.match(response11.runs[0].id, /^run_[a-z0-9]{21}$/, "response11: Run ID is invalid");
-    assert.equal(
-      response11.runs[0].taskIdentifier,
-      "batch-v2-test-child",
-      "response11: runs[0] Task identifier is invalid"
-    );
-    assert.equal(response11.runs[0].isCached, false, "response11: runs[0] Run is cached");
-    assert.equal(
-      response11.runs[0].idempotencyKey,
-      undefined,
-      "response11: runs[0] Idempotent key is invalid"
-    );
-
-    // Now use tasks.batchTrigger with 100 items
-    const response12 = await tasks.batchTrigger<typeof batchV2TestChild>(
-      "batch-v2-test-child",
-      Array.from({ length: 100 }, (_, i) => ({
-        payload: { foo: `bar${i}` },
-      })),
-      {
-        triggerSequentially,
-      }
-    );
-
-    const response12Start = performance.now();
-
-    logger.debug("Response 12", { response12 });
-
-    assert.match(response12.batchId, /^batch_[a-z0-9]{21}$/, "response12: Batch ID is invalid");
-    assert.equal(response12.runs.length, 100, "response12: Items length is invalid");
-
-    const runsById: Map<string, AnyRealtimeRun> = new Map();
-
-    for await (const run of runs.subscribeToBatch(response12.batchId)) {
-      runsById.set(run.id, run);
-
-      // Break if we have received all runs
-      if (runsById.size === response12.runs.length) {
-        break;
-      }
-    }
-
-    const response12End = performance.now();
-
-    logger.debug("Response 12 time", { time: response12End - response12Start });
-
-    logger.debug("All runs", { runsById: Object.fromEntries(runsById) });
-
-    assert.equal(runsById.size, 100, "All runs were not received");
-  },
-});
-
-export const batchTriggerSequentiallyTask = task({
-  id: "batch-trigger-sequentially",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async ({
-    count = 20,
-    wait = false,
-    triggerSequentially = true,
-  }: {
-    count: number;
-    wait: boolean;
-    triggerSequentially: boolean;
-  }) => {
-    if (wait) {
-      return await batchV2TestChild.batchTriggerAndWait(
-        Array.from({ length: count }, (_, i) => ({
-          payload: { foo: `bar${i}` },
-        })),
-        {
-          triggerSequentially,
-        }
-      );
-    } else {
-      return await batchV2TestChild.batchTrigger(
-        Array.from({ length: count }, (_, i) => ({
-          payload: { foo: `bar${i}` },
-        })),
-        {
-          triggerSequentially,
-        }
-      );
-    }
-  },
-});
-
-export const batchV2TestChild = task({
-  id: "batch-v2-test-child",
-  queue: {
-    concurrencyLimit: 10,
-  },
-  run: async (payload: any) => {
-    return payload;
-  },
-});
-
-export const batchAutoIdempotencyKeyTask = task({
-  id: "batch-auto-idempotency-key",
-  retry: {
-    maxAttempts: 3,
-  },
-  run: async () => {
-    const idempotencyKey = await idempotencyKeys.create("first-batch-1");
-
-    logger.debug("Idempotency key", { idempotencyKey });
-
-    const response1 = await batchAutoIdempotencyKeyChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        idempotencyKey: idempotencyKey,
-      }
-    );
-
-    logger.debug("Response 1", { response1 });
-
-    const idempotencyKey2 = await idempotencyKeys.create("first-batch-2", { scope: "global" });
-
-    logger.debug("Idempotency key 2", { idempotencyKey2 });
-
-    const response2 = await batchAutoIdempotencyKeyChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        idempotencyKey: idempotencyKey2,
-      }
-    );
-
-    logger.debug("Response 2", { response2 });
-
-    const idempotencyKey3 = await idempotencyKeys.create(randomUUID());
-
-    logger.debug("Idempotency key 3", { idempotencyKey3 });
-
-    const response3 = await batchAutoIdempotencyKeyChild.batchTrigger(
-      [{ payload: { foo: "bar" } }, { payload: { foo: "baz" } }],
-      {
-        idempotencyKey: idempotencyKey3,
-      }
-    );
-
-    logger.debug("Response 3", { response3 });
-
-    throw new Error("Forcing a retry to see if another batch is created");
-  },
-});
-
-export const batchAutoIdempotencyKeyChild = task({
-  id: "batch-auto-idempotency-key-child",
-  retry: {
-    maxAttempts: 3,
-  },
-  run: async (payload: any) => {
-    return payload;
-  },
-});
-
-export const batchTriggerIdempotencyKeyTest = task({
-  id: "batch-trigger-idempotency-key-test",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async () => {
-    // Trigger a batch of 2 items with the same idempotency key
-    await batchV2TestChild.batchTrigger(
-      [
-        { payload: { foo: "bar" }, options: { idempotencyKey: "test-idempotency-key" } },
-        { payload: { foo: "baz" }, options: { idempotencyKey: "test-idempotency-key" } },
-      ],
-      {
-        triggerSequentially: true,
-      }
-    );
-
-    // Now trigger a batch of 21 items, with just the last one having an idempotency key
-    await batchV2TestChild.batchTrigger(
-      Array.from({ length: 20 }, (_, i) => ({
-        payload: { foo: `bar${i}` },
-        options: {},
-      })).concat([
-        {
-          payload: { foo: "baz" },
-          options: { idempotencyKey: "test-idempotency-key-2" },
-        },
-      ]),
-      {
-        triggerSequentially: true,
-      }
-    );
-
-    // Now while that batch is being processed in the background, lets trigger the same task with that idempotency key
-    await batchV2TestChild.trigger({ foo: "baz" }, { idempotencyKey: "test-idempotency-key-2" });
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/binaries.ts b/references/v3-catalog/src copy/trigger/binaries.ts
deleted file mode 100644
index bd8d0867bbb..00000000000
--- a/references/v3-catalog/src copy/trigger/binaries.ts	
+++ /dev/null
@@ -1,115 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-import ffmpeg from "fluent-ffmpeg";
-import * as path from "node:path";
-import { Readable } from "node:stream";
-import type { ReadableStream } from "node:stream/web";
-
-import bcrypt from "bcrypt";
-
-const saltRounds = 10;
-const myPlaintextPassword = "s0//P4$$w0rD";
-const someOtherPlaintextPassword = "not_bacon";
-
-bcrypt.genSalt(saltRounds, function (err, salt) {
-  bcrypt.hash(myPlaintextPassword, salt, function (err, hash) {
-    // Store hash in your password DB.
-  });
-});
-
-import { InfisicalClient } from "@infisical/sdk";
-
-const infisicalClient = new InfisicalClient({
-  siteUrl: "https://example.com",
-});
-
-import * as mupdf from "mupdf";
-
-// Helper function to load document from URL
-async function loadDocumentFromUrl(url: string): Promise<mupdf.Document> {
-  try {
-    const response = await fetch(url);
-    const buffer = await response.arrayBuffer();
-    return mupdf.Document.openDocument(buffer, "application/pdf");
-  } catch (error) {
-    throw new Error(`Failed to load document from URL: ${url}`);
-  }
-}
-
-import zip from "zip-node-addon";
-
-function unzip(inputPath: string, outputPath: string) {
-  zip.unzipFile(inputPath, outputPath);
-}
-
-import { createClient } from "@1password/sdk";
-
-function create1PasswordClient() {
-  return createClient({
-    auth: process.env.OP_SERVICE_ACCOUNT_TOKEN ?? "",
-    // Set the following to your own integration name and version.
-    integrationName: "My 1Password Integration",
-    integrationVersion: "v1.0.0",
-  });
-}
-
-// Fetches a secret.
-// const secret = await client.secrets.resolve("op://vault/item/field");
-
-import sharp from "sharp";
-import sqlite3 from "sqlite3";
-import { createCanvas } from "canvas";
-
-// Test sharp: create a 1x1 PNG buffer
-const sharpBufferPromise = sharp({
-  create: {
-    width: 1,
-    height: 1,
-    channels: 4,
-    background: { r: 0, g: 0, b: 0, alpha: 0 },
-  },
-})
-  .png()
-  .toBuffer();
-
-// Test sqlite3: open an in-memory database
-const sqliteDb = new sqlite3.Database(":memory:", (err) => {
-  if (err) {
-    console.error("sqlite3 error:", err);
-  } else {
-    console.log("sqlite3 in-memory database opened");
-  }
-});
-
-// Test canvas: create a 100x100 canvas and draw a rectangle
-const canvas = createCanvas(100, 100);
-const ctx = canvas.getContext("2d");
-ctx.fillStyle = "red";
-ctx.fillRect(10, 10, 80, 80);
-
-export const convertVideo = task({
-  id: "convert-video",
-  retry: {
-    maxAttempts: 5,
-    minTimeoutInMs: 1000,
-    maxTimeoutInMs: 10000,
-    factor: 2,
-  },
-  run: async ({ url }: { url: string }) => {
-    const outputPath = path.join("/tmp", `output_${Date.now()}.mp4`);
-
-    const response = await fetch(url);
-
-    await new Promise((resolve, reject) => {
-      ffmpeg(Readable.fromWeb(response.body as ReadableStream))
-        .videoFilters("scale=iw/2:ih/2")
-        .output(outputPath)
-        .on("end", resolve)
-        .on("error", reject)
-        .run();
-    });
-
-    console.log(`Video converted to ${outputPath}`);
-
-    return { success: true, outputPath };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/checkpoints.ts b/references/v3-catalog/src copy/trigger/checkpoints.ts
deleted file mode 100644
index 58dc4a9c4d8..00000000000
--- a/references/v3-catalog/src copy/trigger/checkpoints.ts	
+++ /dev/null
@@ -1,196 +0,0 @@
-import { logger, queue, schedules, task, wait } from "@trigger.dev/sdk/v3";
-
-type Payload = {
-  count?: number;
-};
-
-export const checkpointBatchResumerTester = schedules.task({
-  id: "checkpoint-batch-resume-tester",
-  run: async () => {
-    await checkpointBatchResumer.triggerAndWait({ count: 1 });
-  },
-});
-
-/** Test that checkpoints and resuming works if the checkpoint isn't created before the resume */
-export const checkpointBatchResumer = task({
-  id: "checkpoint-batch-resume",
-  run: async ({ count = 1 }: Payload) => {
-    await noop.batchTriggerAndWait(Array.from({ length: count }, (_, i) => ({})));
-    logger.info(`Successfully 1/1 resumed after ${count} runs`);
-    // await noop.batchTriggerAndWait(Array.from({ length: count }, (_, i) => ({})));
-    // logger.info(`Successfully 2/2 resumed after ${count} runs`);
-  },
-});
-
-/** Test that checkpoints and resuming works if the checkpoint isn't created before the resume */
-export const checkpointResumer = task({
-  id: "checkpoint-resume",
-  queue: {
-    concurrencyLimit: 1,
-  },
-  run: async ({ count = 1 }: Payload) => {
-    logger.info(`Starting ${count} runs`);
-
-    for (let i = 0; i < count; i++) {
-      await noop.triggerAndWait();
-      logger.info(`Successfully ${i + 1}/${count} resumed`);
-    }
-  },
-});
-
-export const nestedDependencies = task({
-  id: "nested-dependencies",
-  run: async ({
-    depth = 0,
-    maxDepth = 6,
-    batchSize = 4,
-    waitSeconds = 1,
-    failAttemptChance = 0,
-    failParents = false,
-  }: {
-    depth?: number;
-    maxDepth?: number;
-    batchSize?: number;
-    waitSeconds?: number;
-    failAttemptChance?: number;
-    failParents?: boolean;
-  }) => {
-    if (depth >= maxDepth) {
-      return;
-    }
-
-    logger.log(`Started ${depth}/${maxDepth} depth`);
-
-    const shouldFail = Math.random() < failAttemptChance;
-    if (shouldFail) {
-      throw new Error(`Failed at ${depth}/${maxDepth} depth`);
-    }
-
-    await wait.for({ seconds: waitSeconds });
-
-    const triggerOrBatch = depth % 2 === 0;
-
-    if (triggerOrBatch) {
-      for (let i = 0; i < batchSize; i++) {
-        const result = await nestedDependencies.triggerAndWait({
-          depth: depth + 1,
-          maxDepth,
-          waitSeconds,
-          failAttemptChance,
-          batchSize,
-        });
-        logger.log(`Triggered complete ${i + 1}/${batchSize}`);
-
-        if (!result.ok && failParents) {
-          throw new Error(`Failed at ${depth}/${maxDepth} depth`);
-        }
-      }
-    } else {
-      const results = await nestedDependencies.batchTriggerAndWait(
-        Array.from({ length: batchSize }, (_, i) => ({
-          payload: {
-            depth: depth + 1,
-            maxDepth,
-            batchSize,
-            waitSeconds,
-            failAttemptChance,
-          },
-        }))
-      );
-      logger.log(`Batch triggered complete`);
-
-      if (results.runs.some((r) => !r.ok) && failParents) {
-        throw new Error(`Failed at ${depth}/${maxDepth} depth`);
-      }
-    }
-
-    logger.log(`Sleep for ${waitSeconds} seconds`);
-    await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1000));
-
-    logger.log(`Finished ${depth}/${maxDepth} depth`);
-  },
-});
-
-export const fastWait = task({
-  id: "fast-wait",
-  run: async ({ seconds = 1 }: { seconds?: number }) => {
-    logger.log(`Going to wait for ${seconds} seconds`);
-    await wait.for({ seconds });
-    logger.log(`Waited for ${seconds} seconds`);
-  },
-});
-
-export const noop = task({
-  id: "noop",
-  run: async () => {},
-});
-
-export const fixedLengthTask = task({
-  id: "fixedLengthTask",
-  run: async ({ waitSeconds }: { waitSeconds: number }) => {
-    await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1000));
-  },
-});
-
-export const permanentlyFrozen = task({
-  id: "permanently-frozen",
-  run: async ({ waitSeconds = 160, count = 1 }: { waitSeconds?: number; count?: number }) => {
-    for (let i = 0; i < count; i++) {
-      await fixedLengthTask.triggerAndWait({ waitSeconds });
-      logger.log(`Successfully complted task ${i}`);
-    }
-  },
-});
-
-//sending max concurrency of these at once will test the freeze + max concurrency logic
-export const bulkPermanentlyFrozen = task({
-  id: "bulk-permanently-frozen",
-  run: async ({
-    count = 1,
-    waitSeconds = 160,
-    grandChildCount = 1,
-  }: {
-    count?: number;
-    waitSeconds?: number;
-    grandChildCount?: number;
-  }) => {
-    await permanentlyFrozen.batchTrigger(
-      Array.from({ length: count }, (_, i) => ({
-        payload: { waitSeconds, count: grandChildCount },
-      }))
-    );
-  },
-});
-
-const oneAtATime = queue({
-  name: "race-condition",
-  concurrencyLimit: 1,
-});
-
-export const raceConditionCheckpointDequeue = task({
-  id: "race-condition-checkpoint-dequeue",
-  queue: oneAtATime,
-  run: async ({ isBatch = true }: { isBatch?: boolean }) => {
-    await holdConcurrency.trigger({ waitSeconds: 45 });
-
-    if (isBatch) {
-      await fixedLengthTask.batchTriggerAndWait(
-        Array.from({ length: 1 }, (_, i) => ({
-          payload: { waitSeconds: 5 },
-        }))
-      );
-    } else {
-      await fixedLengthTask.triggerAndWait({ waitSeconds: 5 });
-    }
-
-    logger.log(`Successfully completed task`);
-  },
-});
-
-export const holdConcurrency = task({
-  id: "hold-concurrency",
-  queue: oneAtATime,
-  run: async ({ waitSeconds = 60 }: { waitSeconds?: number }) => {
-    await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1000));
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/concurrency.ts b/references/v3-catalog/src copy/trigger/concurrency.ts
deleted file mode 100644
index 8fbfa021c55..00000000000
--- a/references/v3-catalog/src copy/trigger/concurrency.ts	
+++ /dev/null
@@ -1,289 +0,0 @@
-import { logger, queue, task, wait } from "@trigger.dev/sdk/v3";
-
-export const oneAtATime = task({
-  id: "on-at-a-time",
-  queue: {
-    concurrencyLimit: 1,
-  },
-  run: async (payload: { message: string }) => {
-    logger.info("One at a time task payload", { payload });
-
-    await wait.for({ seconds: 10 });
-
-    return {
-      finished: new Date().toISOString(),
-    };
-  },
-});
-
-export const testConcurrency = task({
-  id: "test-concurrency-controller",
-  run: async ({
-    count = 10,
-    delay = 5000,
-    childDelay = 1000,
-  }: {
-    count: number;
-    delay: number;
-    childDelay: number;
-  }) => {
-    logger.info(`Running ${count} tasks baby`);
-
-    await testConcurrencyParent.batchTrigger(
-      Array.from({ length: count }).map((_, index) => ({
-        payload: {
-          delay,
-          childDelay,
-        },
-      }))
-    );
-
-    logger.info(`All ${count} tasks triggered`);
-
-    // wait for about 2 seconds
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-
-    // Now trigger the parent task again
-    await testConcurrencyParent.trigger({
-      delay,
-      childDelay,
-    });
-
-    return {
-      finished: new Date().toISOString(),
-    };
-  },
-});
-
-export const testConcurrencyParent = task({
-  id: "test-concurrency-parent",
-  run: async ({ delay = 5000, childDelay = 1000 }: { delay: number; childDelay: number }) => {
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    return await testConcurrencyChild.triggerAndWait({
-      delay: childDelay,
-    });
-  },
-});
-
-export const testConcurrencyChild = task({
-  id: "test-concurrency-child",
-  queue: {
-    concurrencyLimit: 10,
-  },
-  run: async ({ delay = 5000 }: { delay: number }) => {
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testReserveConcurrencyRecursiveWaits = task({
-  id: "test-reserve-concurrency-recursive-waits",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async ({
-    delay = 5000,
-    depth = 2,
-    currentDepth = 0,
-    batchSize = 1,
-    useBatch,
-  }: {
-    delay: number;
-    depth: number;
-    currentDepth?: number;
-    batchSize?: number;
-    useBatch?: boolean;
-  }) => {
-    logger.info(`Running task at depth ${currentDepth} 1`);
-
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    if (currentDepth < depth) {
-      logger.info(`Triggering child task at depth ${currentDepth + 1}`);
-
-      if (useBatch) {
-        await testReserveConcurrencyRecursiveWaits.batchTriggerAndWait(
-          Array.from({ length: batchSize }).map((_, index) => ({
-            payload: {
-              delay,
-              depth,
-              currentDepth: currentDepth + 1,
-              batchSize,
-              useBatch,
-            },
-          }))
-        );
-      } else {
-        await testReserveConcurrencyRecursiveWaits.triggerAndWait({
-          delay,
-          depth,
-          currentDepth: currentDepth + 1,
-          batchSize,
-          useBatch,
-        });
-      }
-
-      logger.info(`Child task at depth ${currentDepth + 1} completed`);
-    }
-
-    logger.info(`Task at depth ${currentDepth} completed`);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testChildTaskPriorityController = task({
-  id: "test-child-task-priority-controller",
-  run: async ({ delay = 5000 }: { delay: number }) => {
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testChildTaskPriorityParent = task({
-  id: "test-child-task-priority-parent",
-  run: async ({ delay = 5000 }: { delay: number }) => {
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    await testChildTaskPriorityChild.triggerAndWait({
-      delay,
-    });
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testChildTaskPriorityChildCreator = task({
-  id: "test-child-task-priority-child-creator",
-  run: async ({ delay = 5000 }: { delay: number }) => {
-    await testChildTaskPriorityChild.batchTrigger([
-      { payload: { delay, propagate: false } },
-      { payload: { delay, propagate: false } },
-      { payload: { delay, propagate: false } },
-      { payload: { delay, propagate: false } },
-    ]);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testChildTaskPriorityChild = task({
-  id: "test-child-task-priority-child",
-  queue: {
-    concurrencyLimit: 1,
-  },
-  run: async ({ delay = 5000, propagate }: { delay: number; propagate?: boolean }) => {
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    if (typeof propagate === "undefined" || propagate) {
-      await testChildTaskPriorityGrandChild.triggerAndWait({
-        delay,
-      });
-    }
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testChildTaskPriorityGrandChildCreator = task({
-  id: "test-child-task-priority-grand-child-creator",
-  run: async ({ delay = 5000 }: { delay: number }) => {
-    await testChildTaskPriorityGrandChild.batchTrigger([
-      { payload: { delay } },
-      { payload: { delay } },
-      { payload: { delay } },
-    ]);
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const testChildTaskPriorityGrandChild = task({
-  id: "test-child-task-priority-grandchild",
-  queue: {
-    concurrencyLimit: 1,
-  },
-  run: async ({ delay = 5000 }: { delay: number }) => {
-    logger.info(`Delaying for ${delay}ms`);
-
-    await new Promise((resolve) => setTimeout(resolve, delay));
-
-    logger.info(`Delay of ${delay}ms completed`);
-
-    return {
-      completedAt: new Date(),
-    };
-  },
-});
-
-export const myQueue = queue({
-  name: "my-queue",
-  concurrencyLimit: 1,
-});
-
-export const parentTask = task({
-  id: "parent-task",
-  queue: myQueue,
-  run: async (payload) => {
-    //trigger a subtask
-    await subtask.triggerAndWait(payload);
-  },
-});
-
-export const subtask = task({
-  id: "subtask",
-  queue: myQueue,
-  run: async (payload) => {
-    //trigger a subtask
-    await subsubtask.triggerAndWait(payload);
-  },
-});
-
-export const subsubtask = task({
-  id: "subsubtask",
-  queue: myQueue,
-  run: async (payload) => {
-    //...
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/crash.ts b/references/v3-catalog/src copy/trigger/crash.ts
deleted file mode 100644
index 8a0f9ead3de..00000000000
--- a/references/v3-catalog/src copy/trigger/crash.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { logger, task } from "@trigger.dev/sdk/v3";
-
-type Payload = {};
-
-export const crashparent = task({
-  id: "crashparent",
-  run: async (payload: Payload, { ctx }) => {
-    logger.log("crashparent started");
-
-    const result = await crash.triggerAndWait({});
-    logger.log("crashparent done", { result });
-
-    const results = await crash.batchTriggerAndWait([
-      { payload: {} },
-      { payload: {} },
-      { payload: {} },
-      { payload: {} },
-      { payload: {} },
-    ]);
-    logger.log("crashparent batch done", { results });
-  },
-});
-
-export const crash = task({
-  id: "crash",
-  run: async (payload: Payload, { ctx }) => {
-    logger.log(`${ctx.run.version}`);
-
-    process.exit(1);
-
-    return {
-      foo: "bar",
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/decorators.ts b/references/v3-catalog/src copy/trigger/decorators.ts
deleted file mode 100644
index fd7e9cf021d..00000000000
--- a/references/v3-catalog/src copy/trigger/decorators.ts	
+++ /dev/null
@@ -1,32 +0,0 @@
-import { logger, task } from "@trigger.dev/sdk/v3";
-import { AppDataSource, Photo } from "./orm";
-
-export const taskThatUsesDecorators = task({
-  id: "taskThatUsesDecorators",
-  run: async (payload: { message: string }) => {
-    console.log("Creating a photo...");
-
-    const photo = new Photo();
-    photo.id = 2;
-    photo.name = "Me and Bears";
-    photo.description = "I am near polar bears";
-    photo.filename = "photo-with-bears.jpg";
-    photo.views = 1;
-    photo.isPublished = true;
-
-    await AppDataSource.manager.save(photo);
-
-    if (Math.random() > 0.5) {
-      throw new Error("Failed to create photo");
-    }
-  },
-  onSuccess: async (payload, output, { ctx }) => {
-    logger.log("Photo created successfully", { output, ctx });
-  },
-  onFailure: async (payload, error, { ctx }) => {
-    logger.error("Failed to create photo", { error, ctx });
-  },
-  onStart: async (payload, { ctx }) => {
-    logger.log("Starting to create photo", { ctx });
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/email.tsx b/references/v3-catalog/src copy/trigger/email.tsx
deleted file mode 100644
index 113bd97fcd4..00000000000
--- a/references/v3-catalog/src copy/trigger/email.tsx	
+++ /dev/null
@@ -1,13 +0,0 @@
-import { logger, task } from "@trigger.dev/sdk/v3";
-import { ExampleEmail } from "./emails/index.js";
-import { render } from "@react-email/render";
-
-export const emailTask = task({
-  id: "email",
-  run: async () => {
-    return {
-      subject: "Example email",
-      react: render(<ExampleEmail />),
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/emails/index.tsx b/references/v3-catalog/src copy/trigger/emails/index.tsx
deleted file mode 100644
index d66c79ac6b8..00000000000
--- a/references/v3-catalog/src copy/trigger/emails/index.tsx	
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Button, Html } from "@react-email/components";
-import * as React from "react";
-
-export function ExampleEmail(props: {}) {
-  return (
-    <Html>
-      <Button
-        href="https://example.com"
-        style={{ background: "#000", color: "#fff", padding: "12px 20px" }}
-      >
-        Click me
-      </Button>
-    </Html>
-  );
-}
diff --git a/references/v3-catalog/src copy/trigger/idempotencyKeys.ts b/references/v3-catalog/src copy/trigger/idempotencyKeys.ts
deleted file mode 100644
index 8c280a9ecf4..00000000000
--- a/references/v3-catalog/src copy/trigger/idempotencyKeys.ts	
+++ /dev/null
@@ -1,145 +0,0 @@
-import { idempotencyKeys, logger, task, wait, AbortTaskRunError } from "@trigger.dev/sdk/v3";
-
-export const idempotencyKeyParent = task({
-  id: "idempotency-key-parent",
-  run: async (payload: { key: string }) => {
-    console.log("Hello from idempotency-key-parent");
-
-    const childTaskResponse = await idempotencyKeyChild.triggerAndWait(
-      {
-        key: payload.key,
-        forceError: true,
-      },
-      {
-        idempotencyKey: await idempotencyKeys.create(payload.key),
-      }
-    );
-
-    if (childTaskResponse.ok) {
-      logger.log("Child task response", { output: childTaskResponse.output });
-    } else {
-      logger.error("Child task error", { error: childTaskResponse.error });
-    }
-
-    await idempotencyKeyChild2.triggerAndWait(
-      {
-        key: payload.key,
-        forceError: false,
-      },
-      {
-        idempotencyKey: await idempotencyKeys.create(payload.key),
-      }
-    );
-
-    return {
-      key: payload.key,
-      childTaskResponse,
-    };
-  },
-});
-
-export const idempotencyKeyChild = task({
-  id: "idempotency-key-child",
-  run: async (payload: { forceError: boolean; key: string }) => {
-    console.log("Hello from idempotency-key-child", payload.key);
-
-    await wait.for({ seconds: 2 });
-
-    if (payload.forceError) {
-      throw new AbortTaskRunError("This is a forced error in idempotency-key-child");
-    }
-
-    return payload;
-  },
-});
-
-export const idempotencyKeyChild2 = task({
-  id: "idempotency-key-child-2",
-  run: async (payload: { forceError: boolean; key: string }) => {
-    console.log("Hello from idempotency-key-child-2", payload.key);
-
-    await wait.for({ seconds: 2 });
-
-    return payload;
-  },
-});
-
-export const idempotencyKeyBatchParent = task({
-  id: "idempotency-key-batch-parent",
-  run: async (payload: { keyPrefix: string; itemCount: number }) => {
-    console.log("Hello from idempotency-key-batch-parent");
-
-    const childTaskResponse = await idempotencyKeyBatchChild.batchTriggerAndWait(
-      await Promise.all(
-        Array.from({ length: payload.itemCount }).map(async (_, index) => ({
-          payload: {
-            key: `${payload.keyPrefix}-${index}`,
-            forceError: index % 2 === 0,
-            waitSeconds: 5 * index,
-          },
-          options: {
-            idempotencyKey: await idempotencyKeys.create([payload.keyPrefix, String(index)]),
-          },
-        }))
-      )
-    );
-
-    return {
-      keyPrefix: payload.keyPrefix,
-      childTaskResponse,
-    };
-  },
-});
-
-export const idempotencyKeyBatchChild = task({
-  id: "idempotency-key-batch-child",
-  run: async (payload: { forceError: boolean; key: string; waitSeconds: number }) => {
-    console.log("idempotency-key-batch-child", payload.key);
-
-    await wait.for({ seconds: payload.waitSeconds });
-
-    if (payload.forceError) {
-      throw new Error(`This is a forced error in idempotency-key-batch-child ${payload.key}`);
-    }
-
-    return payload;
-  },
-});
-
-export const idempotencyKeyParentUsage = task({
-  id: "idempotency-key-parent-usage",
-  run: async (payload: { key: string; scope: "run" | "attempt" | "global" }, { ctx }) => {
-    console.log(`Hello from idempotency-key-parent-usage, attempt #${ctx.attempt.number}`);
-
-    const idempotencyKey = await idempotencyKeys.create(payload.key, { scope: payload.scope });
-
-    console.log(`Generated idempotency key: ${idempotencyKey}`);
-
-    const childTaskResponse = await idempotencyKeyChild.triggerAndWait(
-      {
-        key: idempotencyKey,
-        forceError: true,
-      },
-      {
-        idempotencyKey,
-      }
-    );
-
-    if (childTaskResponse.ok) {
-      logger.log("Child task response", { output: childTaskResponse.output });
-    } else {
-      logger.error("Child task error", { error: childTaskResponse.error });
-
-      if (ctx.attempt.number > 1) {
-        throw new AbortTaskRunError("Child task failed on retry, exiting parent task");
-      } else {
-        throw new Error("Child task failed");
-      }
-    }
-
-    return {
-      key: payload.key,
-      childTaskResponse,
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/init.ts b/references/v3-catalog/src copy/trigger/init.ts
deleted file mode 100644
index 982261ab233..00000000000
--- a/references/v3-catalog/src copy/trigger/init.ts	
+++ /dev/null
@@ -1,17 +0,0 @@
-import { tasks } from "@trigger.dev/sdk";
-
-tasks.onStart(({ payload, ctx }) => {
-  console.log(`Task ${ctx.task.id} started ${ctx.run.id}`);
-});
-
-tasks.onFailure(({ payload, error, ctx }) => {
-  console.log(
-    `Task ${ctx.task.id} failed ${ctx.run.id}: ${
-      error instanceof Error ? error.message : String(error)
-    }`
-  );
-});
-
-tasks.catchError(({ payload, ctx, task, error, retry, retryAt, retryDelayInMs }) => {
-  console.log("handling error", { error, retry, retryAt, retryDelayInMs });
-});
diff --git a/references/v3-catalog/src copy/trigger/javascript-esm.mjs b/references/v3-catalog/src copy/trigger/javascript-esm.mjs
deleted file mode 100644
index 8603acf6e26..00000000000
--- a/references/v3-catalog/src copy/trigger/javascript-esm.mjs	
+++ /dev/null
@@ -1,8 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-export const myJavascriptTaskESM = task({
-  id: "my-javascript-task-esm",
-  run: async (payload) => {
-    console.log("Hello from JavaScript task in esm!");
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/javascript.cjs b/references/v3-catalog/src copy/trigger/javascript.cjs
deleted file mode 100644
index 178d36e124c..00000000000
--- a/references/v3-catalog/src copy/trigger/javascript.cjs	
+++ /dev/null
@@ -1,10 +0,0 @@
-const { task } = require("@trigger.dev/sdk/v3");
-
-const myJavascriptTask = task({
-  id: "my-javascript-task",
-  run: async (payload) => {
-    console.log("Hello from JavaScript task!");
-  },
-});
-
-module.exports = { myJavascriptTask };
diff --git a/references/v3-catalog/src copy/trigger/lazyAttempts.ts b/references/v3-catalog/src copy/trigger/lazyAttempts.ts
deleted file mode 100644
index c84207b601b..00000000000
--- a/references/v3-catalog/src copy/trigger/lazyAttempts.ts	
+++ /dev/null
@@ -1,394 +0,0 @@
-import { logger, task, wait } from "@trigger.dev/sdk/v3";
-
-export const lazyImmediate = task({
-  id: "lazy-immediate",
-  run: async (payload: { forceError?: boolean }) => {
-    logger.info("Log something", { payload });
-    logger.info("Log something else", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyWait = task({
-  id: "lazy-wait",
-  run: async (payload: { forceError?: boolean; delayInSeconds?: number }) => {
-    logger.info("Log something", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazySingleDependency = task({
-  id: "lazy-single-dependency",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const result = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result", { result });
-
-    logger.info("Log something else", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyBatchDependency = task({
-  id: "lazy-batch-dependency",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const results = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results", { results });
-
-    logger.info("Log something else", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyConsecutiveWaits = task({
-  id: "lazy-consecutive-waits",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyConsecutiveDependencies = task({
-  id: "lazy-consecutive-dependencies",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const result = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result #1", { result });
-
-    logger.info("Log something else", { payload });
-
-    const result2 = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result #2", { result2 });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyConsecutiveBatchDependencies = task({
-  id: "lazy-consecutive-batch-dependencies",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const results = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results #1", { results });
-
-    logger.info("Log something else", { payload });
-
-    const results2 = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results #2", { results2 });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyWaitThenSingleDependency = task({
-  id: "lazy-wait-then-single-dependency",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else", { payload });
-
-    const result = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result", { result });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyWaitThenBatchDependency = task({
-  id: "lazy-wait-then-batch-dependency",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else", { payload });
-
-    const results = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results", { results });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazySingleDependencyThenWait = task({
-  id: "lazy-single-dependency-then-wait",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const result = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result", { result });
-
-    logger.info("Log something else", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazySingleDependencyThenBatch = task({
-  id: "lazy-single-dependency-then-batch",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const result = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result", { result });
-
-    logger.info("Log something else", { payload });
-
-    const results = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results", { results });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyBatchDependencyThenWait = task({
-  id: "lazy-batch-dependency-then-wait",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const results = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results", { results });
-
-    logger.info("Log something else", { payload });
-
-    await wait.for({ seconds: payload.delayInSeconds ?? 1 });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
-
-export const lazyBatchDependencyThenSingle = task({
-  id: "lazy-batch-dependency-then-single",
-  run: async (payload: {
-    forceError?: boolean;
-    forceChildError?: boolean;
-    delayInSeconds?: number;
-  }) => {
-    logger.info("Log something", { payload });
-
-    const results = await lazyWait.batchTriggerAndWait([
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-      { payload: { delayInSeconds: payload.delayInSeconds, forceError: payload.forceChildError } },
-    ]);
-    logger.info("Batch results", { results });
-
-    logger.info("Log something else", { payload });
-
-    const result = await lazyWait.triggerAndWait({
-      delayInSeconds: payload.delayInSeconds,
-      forceError: payload.forceChildError,
-    });
-    logger.info("Single result", { result });
-
-    logger.info("Log something else again", { payload });
-
-    if (payload.forceError) {
-      throw new Error("Forced error");
-    }
-
-    return {
-      message: "This is a message",
-      payload,
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/logging.ts b/references/v3-catalog/src copy/trigger/logging.ts
deleted file mode 100644
index 77ded013d12..00000000000
--- a/references/v3-catalog/src copy/trigger/logging.ts	
+++ /dev/null
@@ -1,38 +0,0 @@
-import { logger, task, wait } from "@trigger.dev/sdk/v3";
-import slugify from "@sindresorhus/slugify";
-
-export const loggingTask = task({
-  id: "logging-task",
-  run: async () => {
-    console.error("This is a console error message");
-    logger.error("This is an error message");
-
-    console.warn("This is a warning message");
-    logger.warn("This is a warning message");
-
-    console.log("This is a console log message");
-    logger.log("This is a log message");
-
-    logger.info("This is an info message");
-
-    console.debug("This is a console debug message");
-    logger.debug("This is a debug message");
-  },
-});
-
-export const lotsOfLogs = task({
-  id: "lots-of-logs",
-  run: async ({ count = 400, delay = 10 }: { count?: number; delay?: number }) => {
-    for (let i = 0; i < count; i++) {
-      logger.info(
-        `Log #${i}. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?`,
-        {}
-      );
-      await sleepMs(delay);
-    }
-  },
-});
-
-function sleepMs(ms: number) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
diff --git a/references/v3-catalog/src copy/trigger/longRunning.ts b/references/v3-catalog/src copy/trigger/longRunning.ts
deleted file mode 100644
index b6b3fc7f50f..00000000000
--- a/references/v3-catalog/src copy/trigger/longRunning.ts	
+++ /dev/null
@@ -1,81 +0,0 @@
-import { logger, task, wait } from "@trigger.dev/sdk/v3";
-
-export const longRunning = task({
-  id: "long-running",
-  run: async (payload: { message: string }, { ctx }) => {
-    logger.info("Long running", { payload });
-
-    await new Promise((resolve) => setTimeout(resolve, 200000)); // 200 seconds
-
-    await wait.for({ seconds: 10 });
-
-    await new Promise((resolve) => setTimeout(resolve, 200000)); // 200 seconds
-  },
-});
-
-export const longRunningParent = task({
-  id: "long-running-parent",
-  run: async (payload: { message: string }) => {
-    logger.info("Long running parent", { payload });
-
-    const result = await longRunning.triggerAndWait({ message: "child" });
-
-    return {
-      finished: new Date().toISOString(),
-      result,
-    };
-  },
-});
-
-export const longRunningWithDotInName = task({
-  id: "long.running.with.dot",
-  run: async (payload: { message: string }) => {
-    logger.info("Long running payloadd", { payload });
-
-    // Wait for 3 minutes
-    await new Promise((resolve) => setTimeout(resolve, 3 * 60 * 1000));
-
-    return {
-      finished: new Date().toISOString(),
-    };
-  },
-});
-
-export const longRunningWithLotsOfLogs = task({
-  id: "long-running-lots-of-logs",
-  run: async (payload: { message: string }) => {
-    const largeObject = Array.from({ length: 256 }, (_, i) => i).reduce((acc, i) => {
-      acc[i] = "a".repeat(100);
-      return acc;
-    }, {} as any);
-
-    // Log 10000 times over 3 minutes
-    for (let i = 0; i < 20000; i++) {
-      logger.info("Log number " + i, { largeObject });
-      await new Promise((resolve) => setTimeout(resolve, 18));
-    }
-
-    return {
-      finished: new Date().toISOString(),
-    };
-  },
-});
-
-export const longRunningWith100kLogs = task({
-  id: "100k-logs",
-  run: async (payload: { message: string }) => {
-    // Log 100000 times over 60 seconds
-    for (let i = 0; i < 100000; i++) {
-      console.log("Log number " + i);
-
-      if (i % 512 === 0) {
-        // wait every 512 logs
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-      }
-    }
-
-    return {
-      finished: new Date().toISOString(),
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/maxDuration.ts b/references/v3-catalog/src copy/trigger/maxDuration.ts
deleted file mode 100644
index 612b1916a62..00000000000
--- a/references/v3-catalog/src copy/trigger/maxDuration.ts	
+++ /dev/null
@@ -1,21 +0,0 @@
-import { logger, task, usage, wait } from "@trigger.dev/sdk/v3";
-import { setTimeout } from "timers/promises";
-
-export const maxDurationTask = task({
-  id: "max-duration",
-  maxDuration: 15, // 15 seconds
-  run: async (payload: { sleepFor: number }, { signal }) => {
-    await setTimeout(payload.sleepFor * 1000, { signal });
-
-    return usage.getCurrent();
-  },
-});
-
-export const maxDurationParentTask = task({
-  id: "max-duration-parent",
-  run: async (payload: any, { ctx, signal }) => {
-    const result = await maxDurationTask.triggerAndWait({ sleepFor: 10 }, { maxDuration: 600 });
-
-    return result;
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/nullByte.ts b/references/v3-catalog/src copy/trigger/nullByte.ts
deleted file mode 100644
index 448537fe7b5..00000000000
--- a/references/v3-catalog/src copy/trigger/nullByte.ts	
+++ /dev/null
@@ -1,20 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-import { setTimeout } from "timers/promises";
-
-export const nullByteCrash = task({
-  id: "null-byte-parent",
-  run: async (payload: any, { ctx }) => {
-    const nullByteUnicode = "\u0000";
-
-    await setTimeout(5000);
-
-    await nullByteChild.triggerAndWait({
-      message: `Null byte: ${nullByteUnicode}`,
-    });
-  },
-});
-
-export const nullByteChild = task({
-  id: "null-byte-child",
-  run: async (payload: any, { ctx }) => {},
-});
diff --git a/references/v3-catalog/src copy/trigger/openai.mts b/references/v3-catalog/src copy/trigger/openai.mts
deleted file mode 100644
index 8482c33727b..00000000000
--- a/references/v3-catalog/src copy/trigger/openai.mts	
+++ /dev/null
@@ -1,36 +0,0 @@
-import { env } from "@/env.js";
-import { logger, task } from "@trigger.dev/sdk/v3";
-import { createStreamableValue } from "ai/rsc";
-
-import OpenAI from "openai";
-
-const openai = new OpenAI({
-  apiKey: env.OPENAI_API_KEY,
-});
-
-export const openaiTask = task({
-  id: "openai-task",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async (payload: { prompt: string }) => {
-    const streamableStatus = createStreamableValue("thread.init");
-
-    const chatCompletion = await openai.chat.completions.create({
-      messages: [{ role: "user", content: payload.prompt }],
-      model: "gpt-3.5-turbo",
-    });
-
-    return chatCompletion.choices[0].message.content;
-  },
-  handleError: async (payload, err, { ctx, retryAt }) => {
-    if (err instanceof OpenAI.APIError) {
-      logger.log("OpenAI API error", { err });
-
-      return {
-        error: new Error("Custom OpenAI API error"),
-        retryDelayInMs: 10000,
-      };
-    }
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/orm/index.ts b/references/v3-catalog/src copy/trigger/orm/index.ts
deleted file mode 100644
index 76682204952..00000000000
--- a/references/v3-catalog/src copy/trigger/orm/index.ts	
+++ /dev/null
@@ -1,36 +0,0 @@
-import "reflect-metadata";
-import { DataSource } from "typeorm";
-import { Entity, Column, PrimaryColumn } from "typeorm";
-
-@Entity()
-export class Photo {
-  @PrimaryColumn()
-  id!: number;
-
-  @Column()
-  name!: string;
-
-  @Column()
-  description!: string;
-
-  @Column()
-  filename!: string;
-
-  @Column()
-  views!: number;
-
-  @Column()
-  isPublished!: boolean;
-}
-
-export const AppDataSource = new DataSource({
-  type: "postgres",
-  host: "localhost",
-  port: 5432,
-  username: "postgres",
-  password: "postgres",
-  database: "v3-catalog",
-  entities: [Photo],
-  synchronize: true,
-  logging: false,
-});
diff --git a/references/v3-catalog/src copy/trigger/other.ts b/references/v3-catalog/src copy/trigger/other.ts
deleted file mode 100644
index 1aee8136a48..00000000000
--- a/references/v3-catalog/src copy/trigger/other.ts	
+++ /dev/null
@@ -1,166 +0,0 @@
-import { logger, task, wait } from "@trigger.dev/sdk/v3";
-import { setTimeout } from "node:timers/promises";
-
-export const loggingTask = task({
-  id: "logging-task-2",
-  run: async () => {
-    console.log("Hello world");
-  },
-});
-
-export const waitForever = task({
-  id: "wait-forever",
-  run: async (payload: { freeze?: boolean }) => {
-    if (payload.freeze) {
-      await wait.for({ years: 9999 });
-    } else {
-      await logger.trace("Waiting..", async () => {
-        await setTimeout(2147483647);
-      });
-    }
-  },
-});
-
-export const consecutiveWaits = task({
-  id: "consecutive-waits",
-  run: async (payload: { seconds?: number; debug?: boolean }) => {
-    logger.log("logs before");
-    await wait.for({ seconds: payload.seconds ?? 5 });
-    if (payload.debug) {
-      await wait.for({ seconds: 30 });
-    }
-    await wait.for({ seconds: payload.seconds ?? 5 });
-    if (payload.debug) {
-      await wait.for({ seconds: 30 });
-    }
-    logger.log("logs after");
-  },
-});
-
-export const waitAminute = task({
-  id: "wait-a-minute",
-  run: async (payload: { seconds?: number }) => {
-    logger.log("waitAminute: before");
-    await wait.for({ seconds: payload.seconds ?? 60 });
-    logger.log("waitAminute: after");
-  },
-});
-
-export const triggerAndWaitDep = task({
-  id: "trigger-and-wait-dep",
-  run: async (payload: { seconds?: number }) => {
-    logger.log("logs before");
-    await waitAminute.triggerAndWait({ seconds: payload.seconds });
-    logger.log("logs after");
-  },
-});
-
-export const testingErrors = task({
-  id: "testing-errors",
-  run: async ({ numberOfFailures = 10 }: { numberOfFailures?: number }, { ctx }) => {
-    logger.log("logs before");
-
-    if (ctx.attempt.number < numberOfFailures) {
-      throw new Error(`Attempt ${ctx.attempt.number} failed`);
-    }
-
-    logger.log("logs after");
-  },
-});
-
-export const batchTriggerAndWaitDep = task({
-  id: "batch-trigger-and-wait-dep",
-  run: async (payload: { seconds?: number }) => {
-    logger.log("logs before");
-    await waitAminute.batchTriggerAndWait([
-      { payload: { seconds: payload.seconds } },
-      { payload: { seconds: payload.seconds } },
-    ]);
-    logger.log("logs after");
-  },
-});
-
-export const consecutiveDependencies = task({
-  id: "consecutive-dependencies",
-  run: async (payload: { seconds?: number }) => {
-    logger.log("logs before");
-    await waitAminute.triggerAndWait({ seconds: payload.seconds });
-    await waitAminute.triggerAndWait({ seconds: payload.seconds });
-    logger.log("logs after");
-  },
-});
-
-export const consecutiveWaitAndDependency = task({
-  id: "consecutive-wait-and-dependency",
-  run: async (payload: { seconds?: number }) => {
-    logger.log("logs before");
-    await wait.for({ seconds: payload.seconds ?? 5 });
-    await waitAminute.triggerAndWait({ seconds: payload.seconds });
-    logger.log("logs after");
-  },
-});
-
-export const consecutiveDependencyAndWait = task({
-  id: "consecutive-dependency-and-wait",
-  run: async (payload: { seconds?: number }) => {
-    logger.log("logs before");
-    await waitAminute.triggerAndWait({ seconds: payload.seconds });
-    await wait.for({ seconds: payload.seconds ?? 5 });
-    logger.log("logs after");
-  },
-});
-
-export const unfriendlyIdTask = task({
-  id: "hello/world:task-1",
-  run: async () => {
-    console.log("Hello world");
-  },
-});
-
-export const oomTask = task({
-  id: "oom-task",
-  machine: {
-    preset: "micro",
-  },
-  run: async () => {
-    logger.info("running out of memory below this line");
-
-    let a = "a";
-
-    try {
-      while (true) {
-        a += a;
-      }
-    } catch (error) {
-      logger.error(error instanceof Error ? error.message : "Unknown error", { error });
-
-      let b = [];
-      while (true) {
-        b.push(a.replace(/a/g, "b"));
-      }
-    }
-  },
-});
-
-export const returnZeroCharacters = task({
-  id: "return-zero-characters",
-  run: async (payload: { forceError?: boolean }) => {
-    if (payload.forceError) {
-      throw new Error("All zeros: \u0000\x00\0");
-    }
-
-    return {
-      unicode: "\u0000",
-      hex: "\x00",
-      octal: "\0",
-    };
-  },
-});
-
-export const testEnvVars = task({
-  id: "test-env-vars",
-  run: async (payload: any) => {
-    console.log(`env.FOO: ${process.env.FOO}`);
-    console.log(`env.BAR: ${process.env.BAR}`);
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/performance.ts b/references/v3-catalog/src copy/trigger/performance.ts
deleted file mode 100644
index e9f0d8ed4ad..00000000000
--- a/references/v3-catalog/src copy/trigger/performance.ts	
+++ /dev/null
@@ -1,23 +0,0 @@
-import { logger, task } from "@trigger.dev/sdk/v3";
-
-export const performance = task({
-  id: "performance",
-  run: async ({ count, subtaskDuration = 30_000 }: { count: number; subtaskDuration?: number }) => {
-    const payloads = Array.from({ length: count }, (_, i) => ({
-      payload: {
-        durationMs: subtaskDuration,
-      },
-    }));
-
-    await longTask.batchTrigger(payloads);
-  },
-});
-
-export const longTask = task({
-  id: "long-task",
-  run: async ({ durationMs }: { durationMs: number }) => {
-    //sleep for durationMs
-    await new Promise((resolve) => setTimeout(resolve, durationMs));
-    logger.info("long task done");
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/playwrightTask.ts b/references/v3-catalog/src copy/trigger/playwrightTask.ts
deleted file mode 100644
index 95f342dc0ce..00000000000
--- a/references/v3-catalog/src copy/trigger/playwrightTask.ts	
+++ /dev/null
@@ -1,110 +0,0 @@
-import { logger, task, locals, tasks, wait } from "@trigger.dev/sdk";
-import { chromium, type Browser } from "playwright";
-
-/**
- * Example task demonstrating Playwright browser automation with Trigger.dev
- *
- * To use other browsers (firefox, webkit):
- * 1. Import them from playwright: `import { chromium, firefox, webkit } from "playwright";`
- * 2. Launch them in the middleware instead of chromium: `const browser = await firefox.launch();`
- * 3. Configure the playwright extension in your project:
- *    ```
- *    // In your build configuration
- *    import { playwright } from "@trigger.dev/core/v3/build";
- *
- *    extensions: [
- *      // Only add browsers your tasks will use
- *      playwright({ browsers: ["chromium", "firefox", "webkit"] })
- *    ]
- *    ```
- */
-
-export const playwrightTestTask = task({
-  id: "playwright-test",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async () => {
-    const playwrightVersion = require("playwright/package.json").version;
-
-    logger.log("Starting Playwright automation task", { version: playwrightVersion });
-
-    // Use the browser from locals
-    const browser = getBrowser();
-    const prefix = getPrefixFn(browser);
-
-    logger.log(prefix("Browser acquired from locals"));
-
-    // The onWait lifecycle hook will automatically close the browser
-    // This ensures that checkpoint and restore will be successful
-    await wait.for({ seconds: 10 });
-
-    // We have to get a new browser instance because the existing one was closed
-    const newBrowser = getBrowser();
-
-    logger.log(prefix("New browser acquired from locals"));
-
-    const page = await newBrowser.newPage();
-    logger.log(prefix("New page created"));
-
-    await page.goto("https://google.com");
-    logger.log(prefix("Navigated to google.com"));
-
-    const screenshot = await page.screenshot({ path: "screenshot.png" });
-    logger.log(prefix("Screenshot taken"), { size: screenshot.byteLength });
-
-    await page.close();
-    logger.log(prefix("Page closed"));
-  },
-});
-
-const getPrefixFn = (browser: Browser) => {
-  const browserType = browser.browserType();
-  const browserName = browserType.name();
-  return (msg: string) => `[${browserName}]: ${msg}`;
-};
-
-// Locals key for Playwright browser
-const PlaywrightBrowserLocal = locals.create<{ browser: Browser }>("playwright-browser");
-
-export function getBrowser() {
-  return locals.getOrThrow(PlaywrightBrowserLocal).browser;
-}
-
-export function setBrowser(browser: Browser) {
-  locals.set(PlaywrightBrowserLocal, { browser });
-}
-
-tasks.middleware("playwright-browser", async ({ ctx, payload, task, next }) => {
-  // Only using chromium for now, can be extended for other browsers
-  const browser = await chromium.launch();
-  setBrowser(browser);
-
-  const prefix = getPrefixFn(browser);
-  logger.log(prefix("Browser launched (middleware)"));
-
-  try {
-    await next();
-  } finally {
-    await browser.close();
-    logger.log(prefix("Browser closed (middleware)"));
-  }
-});
-
-tasks.onWait("playwright-browser", async ({ ctx, payload, task }) => {
-  const browser = getBrowser();
-  const prefix = getPrefixFn(browser);
-
-  await browser.close();
-  logger.log(prefix("Browser closed (onWait)"));
-});
-
-tasks.onResume("playwright-browser", async ({ ctx, payload, task }) => {
-  // Only using chromium for now, can be extended for other browsers
-  // Make sure this is the same browser as the one used in the middleware
-  const browser = await chromium.launch();
-  setBrowser(browser);
-
-  const prefix = getPrefixFn(browser);
-  logger.log(prefix("Browser launched (onResume)"));
-});
diff --git a/references/v3-catalog/src copy/trigger/prismaTasks.ts b/references/v3-catalog/src copy/trigger/prismaTasks.ts
deleted file mode 100644
index d7af35141a0..00000000000
--- a/references/v3-catalog/src copy/trigger/prismaTasks.ts	
+++ /dev/null
@@ -1,21 +0,0 @@
-import { getUsersWithPosts, prisma } from "@/db.js";
-import { logger, task } from "@trigger.dev/sdk/v3";
-
-export const prismaTask = task({
-  id: "prisma-task",
-  run: async () => {
-    const users = await prisma.user.findMany();
-
-    await prisma.user.create({
-      data: {
-        name: "Alice",
-      },
-    });
-
-    const usersWithPosts = await prisma.$queryRawTyped(getUsersWithPosts());
-
-    logger.info("Users with posts", { usersWithPosts });
-
-    return users;
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/puppeteerTask.ts b/references/v3-catalog/src copy/trigger/puppeteerTask.ts
deleted file mode 100644
index 362179898d8..00000000000
--- a/references/v3-catalog/src copy/trigger/puppeteerTask.ts	
+++ /dev/null
@@ -1,16 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-import puppeteer from "puppeteer";
-
-export const puppeteerTask = task({
-  id: "puppeteer-task",
-  machine: {
-    preset: "large-1x"
-  },
-  run: async () => {
-    const browser = await puppeteer.launch();
-    const page = await browser.newPage();
-    await page.goto("https://google.com");
-    await page.screenshot({ path: "screenshot.png" });
-    await browser.close();
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/queues.ts b/references/v3-catalog/src copy/trigger/queues.ts
deleted file mode 100644
index e84ce25a530..00000000000
--- a/references/v3-catalog/src copy/trigger/queues.ts	
+++ /dev/null
@@ -1,95 +0,0 @@
-import { logger, runs, task, wait, auth } from "@trigger.dev/sdk/v3";
-
-export const queuesController = task({
-  id: "queues/controller",
-  run: async (
-    {
-      numberOfQueues = 20,
-      length = 20,
-      waitSeconds = 3,
-    }: {
-      numberOfQueues?: number;
-      length?: number;
-      waitSeconds?: number;
-    },
-    { ctx }
-  ) => {
-    const publicToken = await auth.createPublicToken({
-      scopes: {
-        read: {
-          runs: true,
-        },
-      },
-    });
-
-    logger.debug("Public token", { publicToken });
-
-    await Promise.all([
-      queuesTest.trigger(
-        { waitSeconds },
-        {
-          idempotencyKey: ctx.run.id,
-        }
-      ),
-      queuesTest.trigger(
-        { waitSeconds },
-        {
-          idempotencyKey: ctx.run.id,
-        }
-      ),
-      queuesTest.trigger(
-        { waitSeconds },
-        {
-          idempotencyKey: ctx.run.id,
-        }
-      ),
-      queuesTest.trigger(
-        { waitSeconds },
-        {
-          idempotencyKey: ctx.run.id,
-        }
-      ),
-      queuesTest.trigger(
-        { waitSeconds },
-        {
-          idempotencyKey: ctx.run.id,
-        }
-      ),
-    ]);
-  },
-});
-
-export const queuesTest = task({
-  id: "queues/test",
-  run: async (payload: { waitSeconds?: number }, { ctx }) => {
-    await wait.for({ seconds: payload.waitSeconds ?? 1 });
-  },
-});
-
-export const namedQueueTask = task({
-  id: "queues/named-queue",
-  queue: {
-    name: "controller",
-    concurrencyLimit: 9,
-  },
-  run: async () => {
-    logger.info("named-queue 2");
-  },
-});
-
-export const inspectApiTraffic = task({
-  id: "queues/inspect-api-traffic",
-  run: async (payload: unknown, { ctx }) => {
-    // Retrieve the run 100 times
-    for (let i = 0; i < 100; i++) {
-      await runs.retrieve(ctx.run.id);
-    }
-
-    const response = await runs.retrieve(ctx.run.id).asResponse();
-
-    // Log out the headers
-    const headers = Object.fromEntries(response.headers.entries());
-
-    logger.info("Headers", { headers });
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/retries.ts b/references/v3-catalog/src copy/trigger/retries.ts
deleted file mode 100644
index 4fb0a891505..00000000000
--- a/references/v3-catalog/src copy/trigger/retries.ts	
+++ /dev/null
@@ -1,256 +0,0 @@
-import { logger, retry, runs, task, wait } from "@trigger.dev/sdk/v3";
-import { cache } from "./utils/cache.js";
-import { join } from "node:path";
-import { mkdir, writeFile } from "node:fs/promises";
-
-export const taskWithRetries = task({
-  id: "task-with-retries",
-  retry: {
-    maxAttempts: 3,
-  },
-  run: async (payload: any, { ctx }) => {
-    const result = await retry.onThrow(
-      async ({ attempt }) => {
-        if (attempt < 4) throw new Error("failedd");
-
-        return {
-          foo: "bar",
-        };
-      },
-      { maxAttempts: 4, randomize: false, factor: 4 }
-    );
-
-    const user = await cache("user", async () => {
-      return logger.trace("fetch-user", async (span) => {
-        await new Promise((resolve) => setTimeout(resolve, 1000));
-
-        span.setAttribute("user.id", "1");
-
-        return {
-          id: "1",
-          name: "John Doe",
-          fetchedAt: new Date(),
-        };
-      });
-    });
-
-    logger.info("Fetched user", { user });
-
-    if (ctx.attempt.number <= 2) {
-      throw new Error(`Attempt ${ctx.attempt.number} failed: ${payload}`);
-    }
-
-    return {
-      result: "success",
-      payload,
-    };
-  },
-});
-
-export const taskThatErrors = task({
-  id: "task-that-errors",
-  run: async (payload: any, { ctx }) => {
-    connectToDatabase();
-  },
-});
-
-function connectToDatabase() {
-  initializeConnection();
-}
-
-function initializeConnection() {
-  throw new Error("Access denied. You do not have the necessary permissions.");
-}
-
-export const taskWithFetchRetries = task({
-  id: "task-with-fetch-retries",
-  run: async (payload: any, { ctx }) => {
-    logger.info("Fetching data", { foo: [1, 2, 3], bar: [{ hello: "world" }] });
-
-    //if the fetch fails, it will retry
-    const headersResponse = await retry.fetch("http://my.host/test-headers", {
-      retry: {
-        byStatus: {
-          "429": {
-            strategy: "headers",
-            limitHeader: "x-ratelimit-limit",
-            remainingHeader: "x-ratelimit-remaining",
-            resetHeader: "x-ratelimit-reset",
-            resetFormat: "unix_timestamp_in_ms",
-          },
-        },
-      },
-    });
-    const json = await headersResponse.json();
-
-    logger.info("Fetched headers response", { json });
-
-    const backoffResponse = await retry.fetch("http://my.host/test-backoff", {
-      timeoutInMs: 1000,
-      retry: {
-        byStatus: {
-          "500-599": {
-            strategy: "backoff",
-            maxAttempts: 5,
-            factor: 2,
-            minTimeoutInMs: 1_000,
-            maxTimeoutInMs: 30_000,
-            randomize: false,
-          },
-        },
-      },
-    });
-
-    const json2 = await backoffResponse.json();
-
-    // This should use the defaults.
-    await retry.fetch("http://my.host/test-connection-errors");
-
-    logger.info("Fetched backoff response", { json2 });
-
-    const timeoutResponse = await retry.fetch("https://httpbin.org/delay/2", {
-      timeoutInMs: 1000,
-      retry: {
-        timeout: {
-          maxAttempts: 5,
-          factor: 1.8,
-          minTimeoutInMs: 500,
-          maxTimeoutInMs: 30_000,
-          randomize: false,
-        },
-      },
-    });
-
-    return {
-      result: "successss",
-      payload,
-      json,
-      json2,
-    };
-  },
-});
-
-export const taskWithRateLimitRetries = task({
-  id: "task-with-rate-limit-retries",
-  retry: {
-    maxAttempts: 5,
-    minTimeoutInMs: 500,
-    maxTimeoutInMs: 30_000,
-    factor: 1.8,
-  },
-  run: async (payload: { runId: string }, { ctx }) => {
-    for (let i = 0; i < 100; i++) {
-      const { response } = await runs.retrieve(payload.runId).withResponse();
-
-      const limit = response.headers.get("x-ratelimit-limit");
-      const remaining = response.headers.get("x-ratelimit-remaining");
-      const reset = response.headers.get("x-ratelimit-reset");
-
-      console.log(
-        `Rate limit: ${remaining}/${limit} remaining. Reset at ${new Date(
-          parseInt(reset!, 10)
-        ).toISOString()}`
-      );
-
-      if (remaining === "0") {
-        // break out of the loop
-        break;
-      }
-    }
-
-    console.log("Rate limit almost breached, triggering child task to test rate limit.");
-
-    // Now we want to trigger a subtask to test the rate limit
-    await childTaskWithRateLimitRetries.trigger({ runId: payload.runId });
-  },
-});
-
-export const childTaskWithRateLimitRetries = task({
-  id: "child-task-with-rate-limit-retries",
-  run: async (payload: { runId: string }, { ctx }) => {
-    return runs.retrieve(payload.runId);
-  },
-});
-
-export const taskRetriesAfterRateLimitError = task({
-  id: "task-retries-after-rate-limit-error",
-  retry: {
-    maxAttempts: 5,
-    minTimeoutInMs: 500,
-    maxTimeoutInMs: 30_000,
-    factor: 1.8,
-  },
-  run: async (payload: { runId: string }, { ctx }) => {
-    for (let i = 0; i < 100; i++) {
-      const { response } = await runs.retrieve(payload.runId).withResponse();
-
-      const limit = response.headers.get("x-ratelimit-limit");
-      const remaining = response.headers.get("x-ratelimit-remaining");
-      const reset = response.headers.get("x-ratelimit-reset");
-
-      console.log(
-        `Rate limit: ${remaining}/${limit} remaining. Reset at ${new Date(
-          parseInt(reset!, 10)
-        ).toISOString()}`
-      );
-
-      if (remaining === "0") {
-        // break out of the loop
-        break;
-      }
-    }
-
-    console.log("Rate limit almost breached, triggering child task to test rate limit.");
-
-    // Now we are going to cause a rate limit error to test the retry mechanism
-    await runs.retrieve(payload.runId, {
-      retry: {
-        maxAttempts: 1,
-      },
-    });
-  },
-});
-
-export const spamRateLimiter = task({
-  id: "spam-rate-limiter",
-  retry: {
-    maxAttempts: 5,
-    minTimeoutInMs: 500,
-    maxTimeoutInMs: 30_000,
-    factor: 1.8,
-  },
-  run: async (payload: { runId: string }, { ctx }) => {
-    const requestStats = {
-      total: 0,
-    };
-
-    while (requestStats.total < 100) {
-      const { response } = await runs.retrieve(payload.runId).withResponse();
-
-      const remaining = response.headers.get("x-ratelimit-remaining");
-
-      await logRequest("runs/spam-run-test-3", ctx.run.id, remaining!);
-
-      requestStats.total++;
-    }
-
-    return requestStats;
-  },
-});
-
-// Write out a log entry for the request
-async function logRequest(dir: string, file: string, remaining: string, ts: Date = new Date()) {
-  const log = {
-    ts,
-    remaining,
-  };
-
-  const $dir = join(process.cwd(), dir);
-
-  // Create the dir if it doesn't exist
-  await mkdir($dir, { recursive: true });
-
-  // Make sure to swap '/path/to/request/logs/' with an actual directory path
-  const filePath = join($dir, `${file}-${log.ts.toISOString()}.json`);
-  await writeFile(filePath, JSON.stringify(log, null, 2));
-}
diff --git a/references/v3-catalog/src copy/trigger/returnTypes.ts b/references/v3-catalog/src copy/trigger/returnTypes.ts
deleted file mode 100644
index ccac7aa2fb4..00000000000
--- a/references/v3-catalog/src copy/trigger/returnTypes.ts	
+++ /dev/null
@@ -1,82 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-export const returnAllTypes = task({
-  id: "return-all-types",
-  run: async () => {
-    const resultString = await returnString.triggerAndWait();
-    const resultNumber = await returnNumber.triggerAndWait();
-    const resultTrue = await returnTrue.triggerAndWait();
-    const resultFalse = await returnFalse.triggerAndWait();
-    const resultNull = await returnNull.triggerAndWait();
-    const resultUndefined = await returnUndefined.triggerAndWait();
-    const resultObject = await returnObject.triggerAndWait();
-    const resultArray = await returnArray.triggerAndWait();
-
-    return {
-      resultString,
-      resultNumber,
-      resultTrue,
-      resultFalse,
-      resultNull,
-      resultUndefined,
-      resultObject,
-      resultArray,
-    };
-  },
-});
-
-export const returnString = task({
-  id: "return-string",
-  run: async () => {
-    return "This is a string";
-  },
-});
-
-export const returnNumber = task({
-  id: "return-number",
-  run: async () => {
-    return 42;
-  },
-});
-
-export const returnTrue = task({
-  id: "return-true",
-  run: async () => {
-    return true;
-  },
-});
-
-export const returnFalse = task({
-  id: "return-false",
-  run: async () => {
-    return false;
-  },
-});
-
-export const returnNull = task({
-  id: "return-null",
-  run: async () => {
-    return null;
-  },
-});
-
-export const returnUndefined = task({
-  id: "return-undefined",
-  run: async () => {
-    return undefined;
-  },
-});
-
-export const returnObject = task({
-  id: "return-object",
-  run: async () => {
-    return { key: "value" };
-  },
-});
-
-export const returnArray = task({
-  id: "return-array",
-  run: async () => {
-    return [1, 2, 3];
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/runMetadata.ts b/references/v3-catalog/src copy/trigger/runMetadata.ts
deleted file mode 100644
index 40ccbe50c5a..00000000000
--- a/references/v3-catalog/src copy/trigger/runMetadata.ts	
+++ /dev/null
@@ -1,73 +0,0 @@
-import { logger, task, metadata, AbortTaskRunError } from "@trigger.dev/sdk/v3";
-
-export const runMetadataTask = task({
-  id: "run-metadata-task",
-  run: async (payload: any) => {
-    metadata.set("numberOfChildren", 2);
-
-    await runMetadataChildTask.triggerAndWait(payload, {
-      metadata: {
-        hello: "world",
-        date: new Date(),
-        anotherThing: {
-          a: 1,
-          b: 2,
-        },
-      },
-    });
-  },
-});
-
-export const runMetadataChildTask = task({
-  id: "run-metadata-child-task",
-  run: async (payload: any, { ctx }) => {
-    metadata.parent.increment("numberOfChildren", 1);
-    metadata.root.increment("numberOfChildren", 1);
-
-    logger.info("metadata", { metadata: metadata.current() });
-
-    metadata.set("child", "task");
-
-    logger.info("metadata", { metadata: metadata.current() });
-
-    metadata.set("child-2", "task-2");
-
-    logger.info("metadata", { current: metadata.current() });
-
-    metadata.del("hello");
-
-    logger.info("metadata", { metadata: metadata.current() });
-
-    metadata.replace({
-      there: {
-        is: {
-          something: "here",
-        },
-      },
-    });
-
-    await runMetadataChildTask2.triggerAndWait(payload, {
-      metadata: metadata.current(),
-    });
-
-    return metadata.current();
-  },
-  onStart: async () => {
-    logger.info("metadata", { metadata: metadata.current() });
-  },
-  onSuccess: async () => {
-    logger.info("metadata", { metadata: metadata.current() });
-  },
-});
-
-export const runMetadataChildTask2 = task({
-  id: "run-metadata-child-task-2",
-  run: async (payload: any, { ctx }) => {
-    metadata.root.increment("numberOfChildren", 1);
-  },
-});
-
-export const myTask = task({
-  id: "my-task",
-  run: async (payload: any) => {},
-});
diff --git a/references/v3-catalog/src copy/trigger/scheduled.ts b/references/v3-catalog/src copy/trigger/scheduled.ts
deleted file mode 100644
index 394a7d59a1d..00000000000
--- a/references/v3-catalog/src copy/trigger/scheduled.ts	
+++ /dev/null
@@ -1,70 +0,0 @@
-import { logger, schedules, task } from "@trigger.dev/sdk/v3";
-
-export const firstScheduledTask = schedules.task({
-  id: "first-scheduled-task",
-  //every other minute - only run in production and staging environments (skip development)
-  cron: {
-    pattern: "0 */2 * * *",
-    environments: ["PRODUCTION", "STAGING"],
-  },
-  run: async (payload, { ctx }) => {
-    const distanceInMs =
-      payload.timestamp.getTime() - (payload.lastTimestamp ?? new Date()).getTime();
-
-    logger.log(payload.timezone);
-
-    logger.log("First scheduled tasks", { payload, distanceInMs });
-
-    const formatted = payload.timestamp.toLocaleString("en-US", {
-      timeZone: payload.timezone,
-    });
-
-    logger.log(formatted);
-  },
-});
-
-export const secondScheduledTask = schedules.task({
-  id: "second-scheduled-task",
-  cron: {
-    pattern: "0 5 * * *",
-    timezone: "Asia/Tokyo",
-    environments: ["PRODUCTION"], // Only run in production
-  },
-  run: async (payload) => {},
-});
-
-export const manageSchedules = task({
-  id: "manage-schedules",
-  run: async (payload) => {
-    const createdSchedule = await schedules.create({
-      //The id of the scheduled task you want to attach to.
-      task: firstScheduledTask.id,
-      //The schedule in CRON format.
-      cron: "* * * * *",
-      deduplicationKey: `create-schedule-1718277290717`,
-      timezone: "Asia/Tokyo",
-    });
-    logger.log("Created schedule", createdSchedule);
-
-    const editedSchedule = await schedules.update(createdSchedule.id, {
-      //The id of the scheduled task you want to attach to.
-      task: firstScheduledTask.id,
-      //The schedule in CRON format.
-      cron: "* * * * *",
-      timezone: "Europe/Athens",
-    });
-    logger.log("Edited schedule", editedSchedule);
-
-    const sched = await schedules.retrieve(createdSchedule.id);
-    logger.log("Retrieved schedule", sched);
-
-    const allSchedules = await schedules.list();
-    logger.log("All schedules", { allSchedules });
-
-    const { timezones } = await schedules.timezones();
-    logger.log("Timezones", { timezones });
-
-    const withoutUtc = await schedules.timezones({ excludeUtc: true });
-    logger.log("Timezones without UTC", { withoutUtc });
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/sdkUsage.ts b/references/v3-catalog/src copy/trigger/sdkUsage.ts
deleted file mode 100644
index 0bca9231e0b..00000000000
--- a/references/v3-catalog/src copy/trigger/sdkUsage.ts	
+++ /dev/null
@@ -1,169 +0,0 @@
-import { task, tasks, runs, logger, schedules, envvars } from "@trigger.dev/sdk/v3";
-
-export const sdkUsage = task({
-  id: "sdk-usage",
-  run: async (payload: any, { ctx }) => {
-    const $runs = await runs.list({
-      limit: 10,
-      status: "COMPLETED",
-    });
-
-    const $firstRun = await runs.retrieve($runs.data[0].id);
-
-    const handle = await tasks.trigger<typeof sdkChild>("sdk-child", {
-      run: $firstRun,
-    });
-
-    await tasks.triggerAndPoll<typeof sdkChild>("sdk-child", {
-      handle,
-    });
-
-    const replayedRun = await runs.replay($firstRun.id);
-
-    await runs.cancel(replayedRun.id);
-
-    const delayed = await tasks.trigger<typeof sdkChild>(
-      "sdk-child",
-      {
-        delay: "1h",
-      },
-      {
-        delay: "1h",
-      }
-    );
-
-    await runs.reschedule(delayed.id, {
-      delay: "1m",
-    });
-
-    for await (const run of runs.list({
-      limit: 10,
-      period: "1d",
-    })) {
-      logger.log(run.id, { run });
-    }
-
-    const batchHandle = await sdkChild.batchTrigger([
-      {
-        payload: {},
-      },
-    ]);
-
-    const waitResult = await sdkChild.triggerAndWait({
-      payload: {},
-    });
-
-    await sdkChild.batchTriggerAndWait([
-      {
-        payload: {},
-      },
-    ]);
-
-    await tasks.batchTrigger<typeof sdkChild>("sdk-child", [
-      {
-        payload: {},
-      },
-    ]);
-
-    const schedule = await schedules.create({
-      cron: "0 0 * * *", // every day at midnight
-      deduplicationKey: ctx.run.id,
-      externalId: ctx.run.id,
-      task: "sdk-schedule",
-    });
-
-    await schedules.retrieve(schedule.id);
-
-    await schedules.del(schedule.id);
-
-    await envvars.upload({
-      variables: {
-        INSIDE_RUN: "true",
-      },
-      override: true,
-    });
-
-    await envvars.list({
-      retry: {
-        maxAttempts: 3,
-      },
-    });
-
-    await envvars.create(
-      {
-        name: "INSIDE_RUN_2",
-        value: "true",
-      },
-      {
-        retry: {
-          maxAttempts: 3,
-        },
-      }
-    );
-
-    await envvars.retrieve("INSIDE_RUN_2");
-
-    await envvars.update(
-      "INSIDE_RUN_2",
-      {
-        value: "false",
-      },
-      {
-        retry: {
-          maxAttempts: 3,
-        },
-      }
-    );
-  },
-});
-
-export const sdkChild = task({
-  id: "sdk-child",
-  run: async (payload: any) => {
-    return payload;
-  },
-});
-
-export const sdkSchedule = schedules.task({
-  id: "sdk-schedule",
-  run: async (payload: any) => {},
-});
-
-export const autoResolvePayloadAndOutput = task({
-  id: "auto-resolve-payload-and-output",
-  run: async (payload: any, { ctx }) => {
-    // Generate a large JSON payload (bigger than 128KB)
-    const childPayload = Array.from({ length: 10000 }, () => ({
-      key: "value",
-      date: new Date(),
-    }));
-
-    const handle = await tasks.trigger<typeof sdkChild>("sdk-child", childPayload);
-
-    const childRun = await runs.retrieve(handle.id);
-
-    if (childRun.payload) {
-      console.log("Child run payload exists", {
-        payloadPresignedUrl: childRun.payloadPresignedUrl,
-      });
-    } else {
-      console.log("Child run payload does not exist", {
-        payloadPresignedUrl: childRun.payloadPresignedUrl,
-      });
-    }
-
-    await runs.poll(handle.id);
-
-    const finishedRun = await runs.retrieve(handle.id);
-
-    if (finishedRun.output) {
-      console.log("Finished run output exists", {
-        outputPresignedUrl: finishedRun.outputPresignedUrl,
-      });
-    } else {
-      console.log("Finished run payload does not exist", {
-        outputPresignedUrl: finishedRun.outputPresignedUrl,
-      });
-    }
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/simple.ts b/references/v3-catalog/src copy/trigger/simple.ts
deleted file mode 100644
index 9172317e7a1..00000000000
--- a/references/v3-catalog/src copy/trigger/simple.ts	
+++ /dev/null
@@ -1,255 +0,0 @@
-import "server-only";
-import { logger, SubtaskUnwrapError, task, tasks, wait } from "@trigger.dev/sdk/v3";
-import { traceAsync } from "@/telemetry.js";
-import { HeaderGenerator } from "header-generator";
-import { setTimeout as setTimeoutP } from "node:timers/promises";
-
-let headerGenerator = new HeaderGenerator({
-  browsers: [{ name: "firefox", minVersion: 90 }, { name: "chrome", minVersion: 110 }, "safari"],
-  devices: ["desktop"],
-  operatingSystems: ["windows"],
-});
-
-export const fetchPostTask = task({
-  id: "fetch-post-task",
-  machine: { preset: "small-1x" },
-  run: async (payload: { url: string }) => {
-    const headers = headerGenerator.getHeaders({
-      operatingSystems: ["linux"],
-      locales: ["en-US", "en"],
-    });
-
-    logger.log("fetch-post-task", { headers });
-
-    const response = await fetch(payload.url, {
-      method: "GET",
-      headers,
-    });
-
-    return response.json() as Promise<{ url: string; method: string }>;
-  },
-});
-
-export const anyPayloadTask = task({
-  id: "any-payload-task",
-  run: async (payload: any) => {
-    try {
-      const { url, method } = await tasks
-        .triggerAndWait<typeof fetchPostTask>("fetch-post-task", {
-          url: "https://jsonplaceholder.typicode.comasdqdasd/posts/1",
-        })
-        .unwrap();
-
-      console.log("Result from fetch-post-task 211111sss", { output: { url, method } });
-    } catch (error) {
-      if (error instanceof SubtaskUnwrapError) {
-        console.error("Error in fetch-post-task", {
-          runId: error.runId,
-          taskId: error.taskId,
-          cause: error.cause,
-        });
-      }
-    }
-
-    return {
-      payload,
-    };
-  },
-});
-
-export const taskWithSpecialCharacters = task({
-  id: "admin:special-characters",
-  run: async (payload: { url: string }) => {
-    await traceAsync("taskWithSpecialCharacters", async () => {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
-    });
-
-    return {
-      message: "This task has special characters in its ID",
-    };
-  },
-});
-
-export const createJsonHeroDoc = task({
-  id: "create-jsonhero-doc",
-  queue: {
-    concurrencyLimit: 1,
-  },
-  run: async (payload: { title: string; content: any }, { ctx }) => {
-    // Sleep for 5 seconds
-    await wait.for({ seconds: 30 });
-
-    const response = await fetch("https://jsonhero.io/api/create.json", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({
-        title: `${payload.title} v2`,
-        content: {
-          payload: payload.content,
-          __triggerContext: ctx,
-        },
-        readOnly: true,
-      }),
-    });
-
-    const json: any = await response.json();
-
-    return json as { id: string; title: string; location: string };
-  },
-});
-
-export const immediateReturn = task({
-  id: "immediateReturn",
-  run: async (payload: any, { ctx }) => {
-    console.info("some");
-    console.warn("random");
-    console.error("logs");
-
-    await new Promise((resolve) => setTimeout(resolve, 20000));
-  },
-});
-
-export const simulateErrorTester = task({
-  id: "simulateErrorTester",
-  run: async (payload: { message: string }) => {
-    await simulateError.batchTrigger([
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-      { payload: { message: payload.message }, options: { maxAttempts: 1 } },
-    ]);
-  },
-});
-
-export const simulateError = task({
-  id: "simulateError",
-  retry: {
-    maxAttempts: 1,
-  },
-  run: async (payload: { message: string }) => {
-    thisFunctionWillThrow();
-  },
-});
-
-function thisFunctionWillThrow() {
-  throw new Error("This function will throw");
-}
-
-// export const parentTask = task({
-//   id: "parent-task",
-//   run: async (payload: { message: string }, { ctx }) => {
-//     logger.info("Parent task payload", { payload });
-
-//     console.info("This is an info message");
-//     logger.info("This is an info message from logger.info");
-//     console.log(JSON.stringify({ ctx, message: "This is the parent task contexts" }));
-//     logger.log(JSON.stringify({ ctx, message: "This is the parent task context from logger.log" }));
-//     console.warn("You've been warned buddy");
-//     logger.warn("You've been warned buddy from logger.warn");
-//     console.error("This is an error message");
-//     logger.error("This is an error message from logger.error");
-
-//     await wait.for({ seconds: 5 });
-
-//     const childTaskResponse = await childTask
-//       .triggerAndWait({
-//         message: payload.message,
-//         forceError: false,
-//       })
-//       .unwrap();
-
-//     logger.info("Child task response", { childTaskResponse });
-
-//     await childTask.trigger({
-//       message: `${payload.message} - 2.a`,
-//       forceError: true,
-//     });
-
-//     await new Promise((resolve) => setTimeout(resolve, 1000));
-
-//     return {
-//       message: payload.message,
-//       childTaskResponse,
-//     };
-//   },
-// });
-
-// export const childTask = task({
-//   id: "child-task",
-//   run: async (
-//     payload: { message: string; forceError: boolean; delayInSeconds?: number },
-//     { ctx }
-//   ) => {
-//     logger.info("Child task payload", { payload });
-//     logger.info("Child task payload 2", { payload });
-//     logger.info("Child task payload 3", { payload });
-//     logger.info("Child task payload 4", { payload });
-//     logger.info("Child task payload 5", { payload });
-
-//     await wait.for({ seconds: payload.delayInSeconds ?? 5 });
-
-//     logger.info("Child task payload 6", { payload });
-//     logger.info("Child task payload 7", { payload });
-//     logger.info("Child task payload 8", { payload });
-
-//     const response = await fetch("https://jsonhero.io/api/create.json", {
-//       method: "POST",
-//       headers: {
-//         "Content-Type": "application/json",
-//       },
-//       body: JSON.stringify({
-//         title: "childTask payload and ctxr",
-//         content: {
-//           payload,
-//           ctx,
-//         },
-//         readOnly: true,
-//       }),
-//     });
-
-//     const json: any = await response.json();
-
-//     logger.info("JSONHero response", { json });
-
-//     if (payload.forceError) {
-//       throw new Error(`Forced error: ${payload.message}`);
-//     }
-
-//     return {
-//       message: "This is the child task",
-//       parentMessage: payload.message,
-//     };
-//   },
-// });
-
-export const retryTask = task({
-  id: "retry-task",
-  run: async (payload: any) => {
-    throw new Error("This task will always fail");
-  },
-});
-
-export const maximumQueueDepthParent = task({
-  id: "maximum-queue-depth-parent",
-  run: async (payload: any) => {
-    await maximumQueueDepthChild.trigger({});
-    await maximumQueueDepthChild.trigger({});
-    await maximumQueueDepthChild.trigger({});
-  },
-});
-
-export const maximumQueueDepthChild = task({
-  id: "maximum-queue-depth-child",
-  queue: {
-    concurrencyLimit: 1,
-  },
-  run: async (payload: any) => {
-    await setTimeoutP(10_000);
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/stripe.ts b/references/v3-catalog/src copy/trigger/stripe.ts
deleted file mode 100644
index 124b845e605..00000000000
--- a/references/v3-catalog/src copy/trigger/stripe.ts	
+++ /dev/null
@@ -1,19 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-import { Stripe } from "stripe";
-
-const stripe = new Stripe(process.env.STRIPE_SECRET_KEY!, {
-  apiVersion: "2022-11-15",
-});
-
-export const stripeTask = task({
-  id: "stripe-task",
-  run: async () => {
-    // Do a simple stripe query call
-    const response = await stripe.customers.list({
-      limit: 3,
-    });
-
-    return response;
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/subdir/another/byeWorld.ts b/references/v3-catalog/src copy/trigger/subdir/another/byeWorld.ts
deleted file mode 100644
index cd3a7980a88..00000000000
--- a/references/v3-catalog/src copy/trigger/subdir/another/byeWorld.ts	
+++ /dev/null
@@ -1,10 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-export const byeWorldSubdir = task({
-  id: "bye-world-subdir-2",
-  run: async (payload: { message: string }) => {
-    return {
-      bye: "worlds",
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/subdir/helloWorld.ts b/references/v3-catalog/src copy/trigger/subdir/helloWorld.ts
deleted file mode 100644
index d24b968511e..00000000000
--- a/references/v3-catalog/src copy/trigger/subdir/helloWorld.ts	
+++ /dev/null
@@ -1,10 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-export const helloWorldSubdir = task({
-  id: "hello-world-subdir-2",
-  run: async (payload: { message: string }) => {
-    return {
-      hello: "worlds",
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/subtasks.ts b/references/v3-catalog/src copy/trigger/subtasks.ts
deleted file mode 100644
index 9e976c7725f..00000000000
--- a/references/v3-catalog/src copy/trigger/subtasks.ts	
+++ /dev/null
@@ -1,282 +0,0 @@
-import { logger, task, wait, tasks, tags } from "@trigger.dev/sdk/v3";
-import { taskWithRetries } from "./retries.js";
-
-export const simpleParentTask = task({
-  id: "simple-parent-task",
-  run: async (payload: { message: string }) => {
-    await simpleChildTask.trigger({
-      message: `${payload.message} - 2.b`,
-    });
-
-    await tasks.trigger<typeof simpleChildTask>("simple-child-task", {
-      message: `${payload.message} - 2.c`,
-    });
-
-    await simpleChildTask.triggerAndWait({
-      message: `${payload.message} - 2.b`,
-    });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const simpleChildTask = task({
-  id: "simple-child-task",
-  run: async (payload: { message: string }, { ctx }) => {
-    logger.log("Simple child task payload", { payload, ctx });
-
-    logger.log("Context tags", { tags: ctx.run.tags });
-    await tags.add("product:1");
-
-    await wait.for({ seconds: 10 });
-
-    return {
-      foo: "bar",
-    };
-  },
-});
-
-export const subtasksWithRetries = task({
-  id: "subtasks-with-retries",
-  run: async (payload: { message: string }) => {
-    await taskWithRetries.triggerAndWait({
-      message: `${payload.message} - 2.b`,
-    });
-
-    await taskWithRetries.batchTrigger([
-      {
-        payload: {
-          message: `${payload.message} - 2.c`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.cc`,
-        },
-      },
-    ]);
-
-    await taskWithRetries.batchTriggerAndWait([
-      {
-        payload: {
-          message: `${payload.message} - 2.d`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.dd`,
-        },
-      },
-    ]);
-
-    await taskWithRetries.triggerAndWait({
-      message: `${payload.message} - 2.e`,
-    });
-
-    await taskWithRetries.batchTriggerAndWait([
-      {
-        payload: {
-          message: `${payload.message} - 2.f`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.ff`,
-        },
-      },
-    ]);
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const multipleTriggerWaits = task({
-  id: "multiple-trigger-waits",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await simpleChildTask.triggerAndWait({ message: `${message} - 1.a` });
-    await simpleChildTask.triggerAndWait({ message: `${message} - 2.a` });
-
-    await simpleChildTask.batchTriggerAndWait([
-      { payload: { message: `${message} - 3.a` } },
-      { payload: { message: `${message} - 3.b` } },
-    ]);
-    await simpleChildTask.batchTriggerAndWait([
-      { payload: { message: `${message} - 4.a` } },
-      { payload: { message: `${message} - 4.b` } },
-    ]);
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const triggerAndWaitLoops = task({
-  id: "trigger-wait-loops",
-  run: async ({ message = "test" }: { message?: string }) => {
-    for (let i = 0; i < 2; i++) {
-      await simpleChildTask.triggerAndWait({ message: `${message} - ${i}` });
-    }
-
-    for (let i = 0; i < 2; i++) {
-      await simpleChildTask.batchTriggerAndWait([
-        { payload: { message: `${message} - ${i}.a` } },
-        { payload: { message: `${message} - ${i}.b` } },
-      ]);
-    }
-
-    const handle = await taskWithNoPayload.trigger();
-    await taskWithNoPayload.triggerAndWait();
-
-    // Don't do this!
-    // await Promise.all(
-    //   [{ message: `${message} - 1` }, { message: `${message} - 2` }].map((payload) =>
-    //     simpleChildTask.triggerAndWait({ payload })
-    //   )
-    // );
-  },
-});
-
-export const taskWithNoPayload = task({
-  id: "task-with-no-payload",
-  run: async () => {
-    logger.log("Task with no payload");
-
-    return { hello: "world" };
-  },
-});
-
-export const simpleTaskParentWithSubtasks = task({
-  id: "simple-task-parent-with-subtask",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await new Promise((resolve) => setTimeout(resolve, 5000));
-
-    await simpleChildTask.triggerAndWait({ message: `${message} - 1` });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const deeplyNestedTaskParent = task({
-  id: "deeply-nested-task-parent",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await deeplyNestedTaskChild.triggerAndWait({ message: `${message} - 1` });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const deeplyNestedTaskChild = task({
-  id: "deeply-nested-task-child",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await new Promise((resolve) => setTimeout(resolve, 5000));
-
-    await deeplyNestedTaskGrandchild.triggerAndWait({ message: `${message} - 2` });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const deeplyNestedTaskGrandchild = task({
-  id: "deeply-nested-task-grandchild",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await deeplyNestedTaskGreatGrandchild.batchTriggerAndWait(
-      Array.from({ length: 100 }, (_, i) => ({ payload: { message: `${message} - ${i}` } }))
-    );
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const deeplyNestedTaskGreatGrandchild = task({
-  id: "deeply-nested-task-great-grandchild",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await new Promise((resolve) => setTimeout(resolve, 10000));
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const dependencyCancellationParent = task({
-  id: "dependency-cancellation-parent",
-  run: async ({ message = "test" }: { message?: string }) => {
-    const handle = await dependencyCancellationChild.triggerAndWait({ message: `${message} - 1` });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const dependencyCancellationChild = task({
-  id: "dependency-cancellation-child",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await dependencyCancellationGrandchild.triggerAndWait({ message: `${message} - 2` });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const dependencyCancellationGrandchild = task({
-  id: "dependency-cancellation-grandchild",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await wait.for({ seconds: 30 });
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const batchDependencyCancellationParent = task({
-  id: "batch-dependency-cancellation-parent",
-  run: async ({ message = "test" }: { message?: string }) => {
-    const handle = await batchDependencyCancellationChild.batchTriggerAndWait(
-      Array.from({ length: 10 }, (_, i) => ({ payload: { message: `${message} - ${i}` } }))
-    );
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const batchDependencyCancellationChild = task({
-  id: "batch-dependency-cancellation-child",
-  run: async ({ message = "test" }: { message?: string }) => {
-    const handle = await batchDependencyCancellationGrandChild.batchTriggerAndWait(
-      Array.from({ length: 10 }, (_, i) => ({ payload: { message: `${message} - ${i}` } }))
-    );
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const batchDependencyCancellationGrandChild = task({
-  id: "batch-dependency-cancellation-grandchild",
-  run: async ({ message = "test" }: { message?: string }) => {
-    await wait.for({ seconds: 30 });
-
-    return {
-      hello: "world",
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/superjson.ts b/references/v3-catalog/src copy/trigger/superjson.ts
deleted file mode 100644
index 1e25be9a5a8..00000000000
--- a/references/v3-catalog/src copy/trigger/superjson.ts	
+++ /dev/null
@@ -1,159 +0,0 @@
-import { logger, task } from "@trigger.dev/sdk/v3";
-
-export const superParentTask = task({
-  id: "super-parent-task",
-  run: async () => {
-    const result = await superChildTask.triggerAndWait({
-      foo: "bar",
-      whenToDo: new Date(),
-      buffer: Buffer.from("foo"),
-    });
-
-    if (result.ok) {
-      logger.log(`typeof result.date = ${typeof result.output.date}`);
-      logger.log(`typeof result.output.regex = ${typeof result.output.regex}`);
-      logger.log(`typeof result.output.bigint = ${typeof result.output.bigint}`);
-      logger.log(`typeof result.output.set = ${typeof result.output.set}`);
-      logger.log(`typeof result.output.map = ${typeof result.output.map}`);
-      logger.log(`typeof result.output.error = ${typeof result.output.error}`);
-      logger.log(`typeof result.output.url = ${typeof result.output.url}`);
-    }
-
-    return "## super-parent-task completed";
-  },
-});
-
-export const superChildTask = task({
-  id: "super-child-task",
-  run: async (payload: { whenToDo: Date; foo: string; buffer: Buffer }) => {
-    logger.log("super-child-task payload: ", { payload });
-    logger.log(`typeof payload.whenToDo = ${typeof payload.whenToDo}`);
-    logger.log(`typeof payload.foo = ${typeof payload.foo}`);
-    logger.log(`typeof payload.buffer = ${payload.buffer.toString("utf-8")}`);
-
-    return {
-      date: new Date(),
-      regex: /foo/,
-      bigint: BigInt(123),
-      set: new Set([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]),
-      map: new Map([
-        ["foo", "bar"],
-        ["baz", "qux"],
-      ]),
-      error: new Error("foo"),
-      url: new URL("https://trigger.dev"),
-    };
-  },
-});
-
-export const superHugePayloadTask = task({
-  id: "super-huge-payload-task",
-  run: async () => {
-    const largePayload = createLargeObject(1000, 128);
-
-    const result = await superHugeOutputTask.triggerAndWait(largePayload);
-
-    logger.log("Result from superHugeOutputTask: ", { result });
-
-    const batchResult = await superHugeOutputTask.batchTriggerAndWait([
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-      { payload: largePayload },
-      {
-        payload: {
-          small: "object",
-        },
-      },
-    ]);
-
-    logger.log("Result from superHugeOutputTask batchTriggerAndWait: ", { batchResult });
-
-    return {
-      result,
-    };
-  },
-});
-
-export const superHugeOutputTask = task({
-  id: "super-huge-output-task",
-  run: async (payload: any) => {
-    return payload;
-  },
-});
-
-export const superStringTask = task({
-  id: "super-string-parent-task",
-  run: async () => {
-    const result = await superStringChildTask.triggerAndWait({
-      foo: "bar",
-    });
-
-    return result;
-  },
-});
-
-export const superStringChildTask = task({
-  id: "super-string-child-task",
-  run: async (payload: any) => {
-    return "## super-string-child-task completed";
-  },
-});
-
-export const superBadOutputTask = task({
-  id: "super-bad-output-task",
-  run: async () => {
-    // Returning something that cannot be serialized
-
-    return () => {};
-  },
-});
-
-function createLargeObject(size: number, length: number) {
-  return Array.from({ length }, (_, i) => [i.toString(), i.toString().padStart(size, "0")]).reduce(
-    (acc, [key, value]) => {
-      acc[key] = value;
-      return acc;
-    },
-    {} as Record<string, string>
-  );
-}
diff --git a/references/v3-catalog/src copy/trigger/tags.ts b/references/v3-catalog/src copy/trigger/tags.ts
deleted file mode 100644
index 88440430d0d..00000000000
--- a/references/v3-catalog/src copy/trigger/tags.ts	
+++ /dev/null
@@ -1,94 +0,0 @@
-import { logger, runs, task, tasks } from "@trigger.dev/sdk/v3";
-import { simpleChildTask } from "./subtasks.js";
-
-type Payload = {
-  tags: string | string[];
-};
-
-export const triggerRunsWithTags = task({
-  id: "trigger-runs-with-tags",
-  run: async (payload: Payload, { ctx }) => {
-    logger.info(`${ctx.run.version}`);
-
-    const { id } = await simpleChildTask.trigger(
-      { message: "trigger from triggerRunsWithTags foobar" },
-      { tags: payload.tags }
-    );
-
-    //runs in the past 5 seconds, as a date
-    const from = new Date();
-    from.setSeconds(from.getSeconds() - 5);
-    const result2 = await runs.list({ tag: payload.tags, from });
-    logger.log("list with Date()", { length: result2.data.length, data: result2.data });
-
-    //runs in the past 5 seconds, as a number timestamp
-    const result3 = await runs.list({ tag: payload.tags, from: from.getTime() - 5000 });
-    logger.log("list with timestamp", { length: result3.data.length, data: result3.data });
-
-    logger.log("run usage", {
-      costInCents: result2.data[0].costInCents,
-      baseCostInCents: result2.data[0].baseCostInCents,
-      durationMs: result2.data[0].durationMs,
-    });
-
-    await simpleChildTask.triggerAndWait(
-      { message: "triggerAndWait from triggerRunsWithTags" },
-      { tags: payload.tags }
-    );
-
-    await simpleChildTask.batchTrigger([
-      {
-        payload: { message: "batchTrigger 1 from triggerRunsWithTags" },
-        options: { tags: payload.tags },
-      },
-      {
-        payload: { message: "batchTrigger 2 from triggerRunsWithTags" },
-        options: { tags: payload.tags },
-      },
-    ]);
-
-    const results = await simpleChildTask.batchTriggerAndWait([
-      {
-        payload: { message: "batchTriggerAndWait 1 from triggerRunsWithTags" },
-        options: { tags: payload.tags },
-      },
-      {
-        payload: { message: "batchTriggerAndWait 2 from triggerRunsWithTags" },
-        options: { tags: payload.tags },
-      },
-    ]);
-
-    await tasks.trigger<typeof simpleChildTask>(
-      "simple-child-task",
-      { message: "tasks.trigger from triggerRunsWithTags" },
-      { tags: payload.tags }
-    );
-    await tasks.triggerAndWait<typeof simpleChildTask>(
-      "simple-child-task",
-      { message: "tasks.triggerAndWait from triggerRunsWithTags" },
-      { tags: payload.tags }
-    );
-    await tasks.batchTrigger<typeof simpleChildTask>("simple-child-task", [
-      {
-        payload: { message: "tasks.batchTrigger 1 from triggerRunsWithTags" },
-        options: { tags: payload.tags },
-      },
-      {
-        payload: { message: "tasks.batchTrigger 2 from triggerRunsWithTags" },
-        options: { tags: payload.tags },
-      },
-    ]);
-
-    const run = await runs.retrieve(id);
-    logger.log("run", run);
-    logger.log("run usage", {
-      costInCents: run.costInCents,
-      baseCostInCents: run.baseCostInCents,
-      durationMs: run.durationMs,
-    });
-
-    return {
-      tags: run.tags,
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/taskHierarchy.ts b/references/v3-catalog/src copy/trigger/taskHierarchy.ts
deleted file mode 100644
index f35af936012..00000000000
--- a/references/v3-catalog/src copy/trigger/taskHierarchy.ts	
+++ /dev/null
@@ -1,104 +0,0 @@
-import { runs, task } from "@trigger.dev/sdk/v3";
-import { setTimeout } from "node:timers/promises";
-
-export const rootTask = task({
-  id: "task-hierarchy/root-task",
-  run: async (
-    { useWaits = true, useBatch = false }: { useWaits: boolean; useBatch: boolean },
-    { ctx }
-  ) => {
-    console.log("root-task");
-
-    if (useWaits) {
-      if (useBatch) {
-        await childTask.batchTriggerAndWait([{ payload: { useWaits, useBatch } }]);
-      } else {
-        await childTask.triggerAndWait({ useWaits, useBatch });
-      }
-    } else {
-      if (useBatch) {
-        await childTask.batchTrigger([
-          { payload: { useWaits, useBatch } },
-          { payload: { useWaits, useBatch } },
-        ]);
-      } else {
-        await childTask.trigger({ useWaits, useBatch });
-      }
-    }
-
-    if (!useWaits) {
-      await setTimeout(10_000); // Wait for 10 seconds, all the runs will be finished by then
-    }
-
-    await logRunHierarchy(ctx.run.id);
-  },
-});
-
-export const childTask = task({
-  id: "task-hierarchy/child-task",
-  run: async ({ useWaits = true, useBatch = false }: { useWaits: boolean; useBatch: boolean }) => {
-    console.log("child-task");
-
-    if (useWaits) {
-      if (useBatch) {
-        await grandChildTask.batchTriggerAndWait([{ payload: { useWaits, useBatch } }]);
-      } else {
-        await grandChildTask.triggerAndWait({ useWaits, useBatch });
-      }
-    } else {
-      if (useBatch) {
-        await grandChildTask.batchTrigger([{ payload: { useWaits, useBatch } }]);
-      } else {
-        await grandChildTask.trigger({ useWaits, useBatch });
-      }
-    }
-  },
-});
-
-export const grandChildTask = task({
-  id: "task-hierarchy/grand-child-task",
-  run: async ({ useWaits = true, useBatch = false }: { useWaits: boolean; useBatch: boolean }) => {
-    console.log("grand-child-task");
-
-    if (useWaits) {
-      if (useBatch) {
-        await greatGrandChildTask.batchTriggerAndWait([{ payload: { useWaits, useBatch } }]);
-      } else {
-        await greatGrandChildTask.triggerAndWait({ useWaits, useBatch });
-      }
-    } else {
-      if (useBatch) {
-        await greatGrandChildTask.batchTrigger([{ payload: { useWaits, useBatch } }]);
-      } else {
-        await greatGrandChildTask.trigger({ useWaits, useBatch });
-      }
-    }
-  },
-});
-
-export const greatGrandChildTask = task({
-  id: "task-hierarchy/great-grand-child-task",
-  run: async ({ useWaits = true, useBatch = false }: { useWaits: boolean; useBatch: boolean }) => {
-    console.log("great-grand-child-task");
-  },
-});
-
-async function logRunHierarchy(
-  runId: string,
-  parentTaskIdentifier?: string,
-  triggerFunction?: string
-) {
-  const runData = await runs.retrieve(runId);
-
-  const indent = " ".repeat(runData.depth * 2);
-  const triggerInfo = triggerFunction ? ` (triggered by ${triggerFunction})` : "";
-  const parentInfo = parentTaskIdentifier ? ` (parent task: ${parentTaskIdentifier})` : "";
-
-  console.log(
-    `${indent}Level ${runData.depth}: [${runData.taskIdentifier}] run ${runData.id}${triggerInfo}${parentInfo}`
-  );
-
-  for (const childRun of runData.relatedRuns.children ?? []) {
-    await logRunHierarchy(childRun.id, runData.taskIdentifier, childRun.triggerFunction);
-  }
-}
diff --git a/references/v3-catalog/src copy/trigger/taskTypes.ts b/references/v3-catalog/src copy/trigger/taskTypes.ts
deleted file mode 100644
index 06e0104a55e..00000000000
--- a/references/v3-catalog/src copy/trigger/taskTypes.ts	
+++ /dev/null
@@ -1,150 +0,0 @@
-import { task, schemaTask, type TaskPayload } from "@trigger.dev/sdk/v3";
-import { z } from "zod";
-
-export const task1 = task({
-  id: "types/task-1",
-  run: async (payload: { foo: string }) => {
-    return { hello: "world" };
-  },
-});
-
-export const zodTask = schemaTask({
-  id: "types/zod",
-  schema: z.object({
-    bar: z.string(),
-    baz: z.string().default("foo"),
-  }),
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type ZodPayload = TaskPayload<typeof zodTask>;
-
-import * as yup from "yup";
-
-export const yupTask = schemaTask({
-  id: "types/yup",
-  schema: yup.object({
-    bar: yup.string().required(),
-    baz: yup.string().default("foo"),
-  }),
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type YupPayload = TaskPayload<typeof yupTask>;
-
-import { object, string } from "superstruct";
-
-export const superstructTask = schemaTask({
-  id: "types/superstruct",
-  schema: object({
-    bar: string(),
-    baz: string(),
-  }),
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type SuperstructPayload = TaskPayload<typeof superstructTask>;
-
-import { type } from "arktype";
-
-export const arktypeTask = schemaTask({
-  id: "types/arktype",
-  schema: type({
-    bar: "string",
-    baz: "string",
-  }).assert,
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type ArktypePayload = TaskPayload<typeof arktypeTask>;
-
-import * as Schema from "@effect/schema/Schema";
-
-const effectSchemaParser = Schema.decodeUnknownSync(
-  Schema.Struct({ bar: Schema.String, baz: Schema.String })
-);
-
-export const effectTask = schemaTask({
-  id: "types/effect",
-  schema: effectSchemaParser,
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type EffectPayload = TaskPayload<typeof effectTask>;
-
-import * as T from "runtypes";
-
-export const runtypesTask = schemaTask({
-  id: "types/runtypes",
-  schema: T.Record({
-    bar: T.String,
-    baz: T.String,
-  }),
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type RuntypesPayload = TaskPayload<typeof runtypesTask>;
-
-import * as v from "valibot";
-
-const valibotParser = v.parser(
-  v.object({
-    bar: v.string(),
-    baz: v.string(),
-  })
-);
-
-export const valibotTask = schemaTask({
-  id: "types/valibot",
-  schema: valibotParser,
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-import { Type } from "@sinclair/typebox";
-import { wrap } from "@typeschema/typebox";
-
-export const typeboxTask = schemaTask({
-  id: "types/typebox",
-  schema: wrap(
-    Type.Object({
-      bar: Type.String(),
-      baz: Type.String(),
-    })
-  ),
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-export const customParserTask = schemaTask({
-  id: "types/custom-parser",
-  schema: (data: unknown) => {
-    // This is a custom parser, and should do actual parsing (not just casting)
-    if (typeof data !== "object") {
-      throw new Error("Invalid data");
-    }
-
-    const { bar, baz } = data as { bar: string; baz: string };
-
-    return { bar, baz };
-  },
-  run: async (payload) => {
-    console.log(payload.bar, payload.baz);
-  },
-});
-
-type CustomParserPayload = TaskPayload<typeof customParserTask>;
diff --git a/references/v3-catalog/src copy/trigger/triggerKitchenSink.ts b/references/v3-catalog/src copy/trigger/triggerKitchenSink.ts
deleted file mode 100644
index f8c3fd69bab..00000000000
--- a/references/v3-catalog/src copy/trigger/triggerKitchenSink.ts	
+++ /dev/null
@@ -1,87 +0,0 @@
-import { tasks, task } from "@trigger.dev/sdk/v3";
-
-export const triggerKitchenSink = task({
-  id: "trigger-kitchen-sink",
-  run: async (payload: { message: string }) => {
-    await triggerKitchenSinkChild.trigger({
-      message: `${payload.message} - 2.b`,
-    });
-
-    await tasks.trigger<typeof triggerKitchenSinkChild>("trigger-kitchen-sink-child", {
-      message: `${payload.message} - 2.c`,
-    });
-
-    await triggerKitchenSinkChild.triggerAndWait({
-      message: `${payload.message} - 2.b`,
-    });
-
-    await tasks.triggerAndWait<typeof triggerKitchenSinkChild>("trigger-kitchen-sink-child", {
-      message: `${payload.message} - 2.c`,
-    });
-
-    await triggerKitchenSinkChild.batchTrigger([
-      {
-        payload: {
-          message: `${payload.message} - 2.c`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.cc`,
-        },
-      },
-    ]);
-
-    await tasks.batchTrigger<typeof triggerKitchenSinkChild>("trigger-kitchen-sink-child", [
-      {
-        payload: {
-          message: `${payload.message} - 2.c`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.cc`,
-        },
-      },
-    ]);
-
-    await triggerKitchenSinkChild.batchTriggerAndWait([
-      {
-        payload: {
-          message: `${payload.message} - 2.d`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.dd`,
-        },
-      },
-    ]);
-
-    await tasks.batchTriggerAndWait<typeof triggerKitchenSinkChild>("trigger-kitchen-sink-child", [
-      {
-        payload: {
-          message: `${payload.message} - 2.d`,
-        },
-      },
-      {
-        payload: {
-          message: `${payload.message} - 2.dd`,
-        },
-      },
-    ]);
-
-    return {
-      hello: "world",
-    };
-  },
-});
-
-export const triggerKitchenSinkChild = task({
-  id: "trigger-kitchen-sink-child",
-  run: async (payload: { message: string }) => {
-    return {
-      foo: payload.message,
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/usage.ts b/references/v3-catalog/src copy/trigger/usage.ts
deleted file mode 100644
index 442dc3a8fa2..00000000000
--- a/references/v3-catalog/src copy/trigger/usage.ts	
+++ /dev/null
@@ -1,31 +0,0 @@
-import { logger, task, wait, usage } from "@trigger.dev/sdk/v3";
-
-export const usagePlayground = task({
-  id: "usage-playground",
-  machine: {
-    preset: "medium-2x",
-  },
-  run: async (payload: { duration: number }, { ctx }) => {
-    if (ctx.machine) {
-      logger.info("Machine preset", { preset: ctx.machine });
-    }
-
-    logger.info("Cost and duration", { cost: ctx.run.costInCents, duration: ctx.run.durationMs });
-
-    await logger.trace("Doing some work...", async () => {
-      await new Promise((resolve) => setTimeout(resolve, payload.duration));
-    });
-
-    let currentUsage = usage.getCurrent();
-
-    logger.info("Current Cost and duration (before wait)", { currentUsage });
-
-    await wait.for({ seconds: 5 });
-
-    currentUsage = usage.getCurrent();
-
-    logger.info("Current Cost and duration (after wait)", { currentUsage });
-
-    throw new Error(`This is an error at ${new Date().toISOString()}`);
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger/utils/cache.ts b/references/v3-catalog/src copy/trigger/utils/cache.ts
deleted file mode 100644
index 11f727f738d..00000000000
--- a/references/v3-catalog/src copy/trigger/utils/cache.ts	
+++ /dev/null
@@ -1,7 +0,0 @@
-import { InMemoryCache, createCache } from "@trigger.dev/sdk/v3";
-
-export const cache = createCache(new InMemoryCache());
-
-export const fakeTask = {
-  id: "this-task-doesnt-exist",
-};
diff --git a/references/v3-catalog/src copy/trigger/weird-file-names.ts b/references/v3-catalog/src copy/trigger/weird-file-names.ts
deleted file mode 100644
index 4b65909a983..00000000000
--- a/references/v3-catalog/src copy/trigger/weird-file-names.ts	
+++ /dev/null
@@ -1,6 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-export const weirdFileName = task({
-  id: "weird-file-name",
-  run: async (payload: { url: string }) => {},
-});
diff --git a/references/v3-catalog/src copy/trigger/wrangler.mts b/references/v3-catalog/src copy/trigger/wrangler.mts
deleted file mode 100644
index 113fc8d1aca..00000000000
--- a/references/v3-catalog/src copy/trigger/wrangler.mts	
+++ /dev/null
@@ -1,36 +0,0 @@
-import { logger, task } from "@trigger.dev/sdk/v3";
-import { exec } from "node:child_process";
-
-export const wranglerTask = task({
-  id: "wrangler-task",
-  run: async () => {
-    // Try and resolve wranger from the node_modules/.bin directory
-    const wranglerPath = await import.meta.resolve?.("wrangler", import.meta.url);
-
-    if (!wranglerPath) {
-      throw new Error("Wrangler not found in node_modules directory");
-    }
-
-    logger.log(`Running wrangler from ${wranglerPath}`, {
-      meta: import.meta,
-    });
-
-    // remove the file:// prefix
-    const wranglerPathWithoutFilePrefix = wranglerPath.replace("file://", "");
-
-    const version = await new Promise<string>((resolve, reject) => {
-      exec(`node ${wranglerPathWithoutFilePrefix} --version`, (error, stdout, stderr) => {
-        if (error) {
-          reject(error);
-          return;
-        }
-
-        resolve(stdout.trim());
-      });
-    });
-
-    return {
-      version,
-    };
-  },
-});
diff --git a/references/v3-catalog/src copy/trigger2/helloWorld.ts b/references/v3-catalog/src copy/trigger2/helloWorld.ts
deleted file mode 100644
index 8081bc6e7c2..00000000000
--- a/references/v3-catalog/src copy/trigger2/helloWorld.ts	
+++ /dev/null
@@ -1,8 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-const helloWorld = task({
-  id: "helloWorld",
-  async run() {
-    console.log("Hello World!");
-  },
-});
diff --git a/references/v3-catalog/src copy/triggerWithLargePayload.ts b/references/v3-catalog/src copy/triggerWithLargePayload.ts
deleted file mode 100644
index e6dd9a32dec..00000000000
--- a/references/v3-catalog/src copy/triggerWithLargePayload.ts	
+++ /dev/null
@@ -1,37 +0,0 @@
-import { tasks, runs } from "@trigger.dev/sdk/v3";
-import { anyPayloadTask } from "./trigger/simple.js";
-
-async function main() {
-  const payload = createLargePayload(100000);
-
-  const anyHandle = await tasks.trigger<typeof anyPayloadTask>("any-payload-task", payload);
-
-  const anyRun = await runs.poll(anyHandle);
-
-  if (anyRun.outputPresignedUrl) {
-    const response = await fetch(anyRun.outputPresignedUrl);
-
-    console.log("## Output");
-    console.log(await response.text());
-  }
-
-  if (anyRun.payloadPresignedUrl) {
-    const response = await fetch(anyRun.payloadPresignedUrl);
-
-    console.log("## Payload");
-    console.log(await response.text());
-  }
-}
-
-main().catch(console.error);
-
-// Creates a large object payload, with many keys and values
-function createLargePayload(size: number) {
-  const payload: Record<string, any> = {};
-
-  for (let i = 0; i < size; i++) {
-    payload[`key-${i}`] = `value-${i}`;
-  }
-
-  return payload;
-}
diff --git a/references/v3-catalog/src copy/utils/types.ts b/references/v3-catalog/src copy/utils/types.ts
deleted file mode 100644
index ff534f0ccd8..00000000000
--- a/references/v3-catalog/src copy/utils/types.ts	
+++ /dev/null
@@ -1,8 +0,0 @@
-export type Expect<T extends true> = T;
-export type ExpectTrue<T extends true> = T;
-export type ExpectFalse<T extends false> = T;
-
-export type Equal<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2
-  ? true
-  : false;
-export type NotEqual<X, Y> = true extends Equal<X, Y> ? false : true;
diff --git a/references/v3-catalog/src/trigger/returnTypes.ts b/references/v3-catalog/src/trigger/returnTypes.ts
deleted file mode 100644
index 7943cee9c52..00000000000
--- a/references/v3-catalog/src/trigger/returnTypes.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { task } from "@trigger.dev/sdk/v3";
-
-export const returnAllTypes = task({
-  id: "return-all-types",
-  run: async () => {
-    const resultString = await returnString.triggerAndWait();
-    const resultNumber = await returnNumber.triggerAndWait();
-    const resultTrue = await returnTrue.triggerAndWait();
-    const resultFalse = await returnFalse.triggerAndWait();
-    const resultNull = await returnNull.triggerAndWait();
-    const resultUndefined = await returnUndefined.triggerAndWait();
-    const resultObject = await returnObject.triggerAndWait();
-    const resultArray = await returnArray.triggerAndWait();
-
-    return {
-      resultString,
-      resultNumber,
-      resultTrue,
-      resultFalse,
-      resultNull,
-      resultUndefined,
-      resultObject,
-      resultArray,
-    };
-  },
-});
-
-export const returnString = task({
-  id: "return-string",
-  run: async () => {
-    return "This is a string";
-  },
-});
-
-export const returnNumber = task({
-  id: "return-number",
-  run: async () => {
-    return 46;
-  },
-});
-
-export const returnTrue = task({
-  id: "return-true",
-  run: async () => {
-    return true;
-  },
-});
-
-export const returnFalse = task({
-  id: "return-false",
-  run: async () => {
-    return false;
-  },
-});
-
-export const returnNull = task({
-  id: "return-null",
-  run: async () => {
-    return null;
-  },
-});
-
-export const returnUndefined = task({
-  id: "return-undefined",
-  run: async () => {
-    return undefined;
-  },
-});
-
-export const returnObject = task({
-  id: "return-object",
-  run: async () => {
-    return { key: "value" };
-  },
-});
-
-export const returnArray = task({
-  id: "return-array",
-  run: async () => {
-    return [1, 2, 3];
-  },
-});
diff --git a/references/v3-catalog/trigger.config.ts b/references/v3-catalog/trigger.config.ts
deleted file mode 100644
index 0404bc0185c..00000000000
--- a/references/v3-catalog/trigger.config.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-// import { InfisicalClient } from "@infisical/sdk";
-// import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
-// import { OpenAIInstrumentation } from "@traceloop/instrumentation-openai";
-// import { esbuildPlugin } from "@trigger.dev/build";
-// import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
-// import { additionalFiles, ffmpeg, syncEnvVars } from "@trigger.dev/build/extensions/core";
-// import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
-// import { playwright } from "@trigger.dev/build/extensions/playwright";
-// import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
-// import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
-import { defineConfig } from "@trigger.dev/sdk/v3";
-
-export default defineConfig({
-  runtime: "node",
-  project: "yubjwjsfkxnylobaqvqz",
-  machine: "medium-1x",
-  // instrumentations: [new OpenAIInstrumentation()],
-  maxDuration: 3600,
-  dirs: ["./src/trigger"],
-  retries: {
-    enabledInDev: false,
-    default: {
-      maxAttempts: 10,
-      minTimeoutInMs: 5_000,
-      maxTimeoutInMs: 30_000,
-      factor: 2,
-      randomize: true,
-    },
-  },
-  enableConsoleLogging: false,
-  logLevel: "info",
-  build: {
-    // conditions: ["react-server"],
-    // experimental_autoDetectExternal: true,
-    // experimental_keepNames: true,
-    // experimental_minify: true,
-    extensions: [
-    //   additionalFiles({
-    //     files: ["./wrangler/wrangler.toml"],
-    //   }),
-    //   ffmpeg(),
-    //   emitDecoratorMetadata(),
-    //   audioWaveform(),
-    //   prismaExtension({
-    //     schema: "prisma/schema/schema.prisma",
-    //     migrate: true,
-    //     directUrlEnvVarName: "DATABASE_URL_UNPOOLED",
-    //     clientGenerator: "client",
-    //     typedSql: true,
-    //   }),
-    //   esbuildPlugin(
-    //     sentryEsbuildPlugin({
-    //       org: "triggerdev",
-    //       project: "taskhero-examples-basic",
-    //       authToken: process.env.SENTRY_AUTH_TOKEN,
-    //       telemetry: false,
-    //     }),
-    //     { placement: "last", target: "deploy" }
-    //   ),
-    //   syncEnvVars(async (ctx) => {
-    //     if (
-    //       !process.env.INFISICAL_CLIENT_ID ||
-    //       !process.env.INFISICAL_CLIENT_SECRET ||
-    //       !process.env.INFISICAL_PROJECT_ID
-    //     ) {
-    //       return;
-    //     }
-
-    //     const client = new InfisicalClient({
-    //       clientId: process.env.INFISICAL_CLIENT_ID,
-    //       clientSecret: process.env.INFISICAL_CLIENT_SECRET,
-    //     });
-
-    //     const secrets = await client.listSecrets({
-    //       environment: ctx.environment,
-    //       projectId: process.env.INFISICAL_PROJECT_ID,
-    //     });
-
-    //     return secrets.map((secret) => ({
-    //       name: secret.secretKey,
-    //       value: secret.secretValue,
-    //     }));
-    //   }),
-    //   puppeteer(),
-    //   playwright(),
-    ],
-    // external: ["re2", "sqlite3", "bcrypt", "canvas", "sharp", "fluent-ffmpeg", "mupdf", "zip-node-addon"],
-  },
-});
diff --git a/references/v3-catalog/tsconfig.json b/references/v3-catalog/tsconfig.json
deleted file mode 100644
index 0c8769d35a5..00000000000
--- a/references/v3-catalog/tsconfig.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "esModuleInterop": true,
-    "strict": true,
-    "outDir": "dist",
-    "skipLibCheck": true,
-    "customConditions": ["@triggerdotdev/source", "react-server"],
-    "jsx": "preserve",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "lib": ["DOM", "DOM.Iterable"],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": [
-    "./src/**/*.ts",
-    "trigger.config.ts",
-    "src/trigger/email.tsx",
-    "src/trigger/openai.mts",
-    "src/trigger/wrangler.mts"
-  ]
-}
diff --git a/references/v3-catalog/wrangler/wrangler.toml b/references/v3-catalog/wrangler/wrangler.toml
deleted file mode 100644
index 219c87cfa54..00000000000
--- a/references/v3-catalog/wrangler/wrangler.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-name = "proxy"
-main = "src/index.ts"
-compatibility_date = "2023-10-30"
-compatibility_flags = ["nodejs_compat"]
-
-[env.staging]
-[env.prod]
diff --git a/rules/4.0.0/advanced-tasks.md b/rules/4.0.0/advanced-tasks.md
new file mode 100644
index 00000000000..f6ecac30353
--- /dev/null
+++ b/rules/4.0.0/advanced-tasks.md
@@ -0,0 +1,451 @@
+# Trigger.dev Advanced Tasks (v4)
+
+**Advanced patterns and features for writing tasks**
+
+## Tags & Organization
+
+```ts
+import { task, tags } from "@trigger.dev/sdk";
+
+export const processUser = task({
+  id: "process-user",
+  run: async (payload: { userId: string; orgId: string }, { ctx }) => {
+    // Add tags during execution
+    await tags.add(`user_${payload.userId}`);
+    await tags.add(`org_${payload.orgId}`);
+
+    return { processed: true };
+  },
+});
+
+// Trigger with tags
+await processUser.trigger(
+  { userId: "123", orgId: "abc" },
+  { tags: ["priority", "user_123", "org_abc"] } // Max 10 tags per run
+);
+
+// Subscribe to tagged runs
+for await (const run of runs.subscribeToRunsWithTag("user_123")) {
+  console.log(`User task ${run.id}: ${run.status}`);
+}
+```
+
+**Tag Best Practices:**
+
+- Use prefixes: `user_123`, `org_abc`, `video:456`
+- Max 10 tags per run, 1-64 characters each
+- Tags don't propagate to child tasks automatically
+
+## Concurrency & Queues
+
+```ts
+import { task, queue } from "@trigger.dev/sdk";
+
+// Shared queue for related tasks
+const emailQueue = queue({
+  name: "email-processing",
+  concurrencyLimit: 5, // Max 5 emails processing simultaneously
+});
+
+// Task-level concurrency
+export const oneAtATime = task({
+  id: "sequential-task",
+  queue: { concurrencyLimit: 1 }, // Process one at a time
+  run: async (payload) => {
+    // Critical section - only one instance runs
+  },
+});
+
+// Per-user concurrency
+export const processUserData = task({
+  id: "process-user-data",
+  run: async (payload: { userId: string }) => {
+    // Override queue with user-specific concurrency
+    await childTask.trigger(payload, {
+      queue: {
+        name: `user-${payload.userId}`,
+        concurrencyLimit: 2,
+      },
+    });
+  },
+});
+
+export const emailTask = task({
+  id: "send-email",
+  queue: emailQueue, // Use shared queue
+  run: async (payload: { to: string }) => {
+    // Send email logic
+  },
+});
+```
+
+## Error Handling & Retries
+
+```ts
+import { task, retry, AbortTaskRunError } from "@trigger.dev/sdk";
+
+export const resilientTask = task({
+  id: "resilient-task",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8, // Exponential backoff multiplier
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+    randomize: false,
+  },
+  catchError: async ({ error, ctx }) => {
+    // Custom error handling
+    if (error.code === "FATAL_ERROR") {
+      throw new AbortTaskRunError("Cannot retry this error");
+    }
+
+    // Log error details
+    console.error(`Task ${ctx.task.id} failed:`, error);
+
+    // Allow retry by returning nothing
+    return { retryAt: new Date(Date.now() + 60000) }; // Retry in 1 minute
+  },
+  run: async (payload) => {
+    // Retry specific operations
+    const result = await retry.onThrow(
+      async () => {
+        return await unstableApiCall(payload);
+      },
+      { maxAttempts: 3 }
+    );
+
+    // Conditional HTTP retries
+    const response = await retry.fetch("https://api.example.com", {
+      retry: {
+        maxAttempts: 5,
+        condition: (response, error) => {
+          return response?.status === 429 || response?.status >= 500;
+        },
+      },
+    });
+
+    return result;
+  },
+});
+```
+
+## Machines & Performance
+
+```ts
+export const heavyTask = task({
+  id: "heavy-computation",
+  machine: { preset: "large-2x" }, // 8 vCPU, 16 GB RAM
+  maxDuration: 1800, // 30 minutes timeout
+  run: async (payload, { ctx }) => {
+    // Resource-intensive computation
+    if (ctx.machine.preset === "large-2x") {
+      // Use all available cores
+      return await parallelProcessing(payload);
+    }
+
+    return await standardProcessing(payload);
+  },
+});
+
+// Override machine when triggering
+await heavyTask.trigger(payload, {
+  machine: { preset: "medium-1x" }, // Override for this run
+});
+```
+
+**Machine Presets:**
+
+- `micro`: 0.25 vCPU, 0.25 GB RAM
+- `small-1x`: 0.5 vCPU, 0.5 GB RAM (default)
+- `small-2x`: 1 vCPU, 1 GB RAM
+- `medium-1x`: 1 vCPU, 2 GB RAM
+- `medium-2x`: 2 vCPU, 4 GB RAM
+- `large-1x`: 4 vCPU, 8 GB RAM
+- `large-2x`: 8 vCPU, 16 GB RAM
+
+## Idempotency
+
+```ts
+import { task, idempotencyKeys } from "@trigger.dev/sdk";
+
+export const paymentTask = task({
+  id: "process-payment",
+  retry: {
+    maxAttempts: 3,
+  },
+  run: async (payload: { orderId: string; amount: number }) => {
+    // Automatically scoped to this task run, so if the task is retried, the idempotency key will be the same
+    const idempotencyKey = await idempotencyKeys.create(`payment-${payload.orderId}`);
+
+    // Ensure payment is processed only once
+    await chargeCustomer.trigger(payload, {
+      idempotencyKey,
+      idempotencyKeyTTL: "24h", // Key expires in 24 hours
+    });
+  },
+});
+
+// Payload-based idempotency
+import { createHash } from "node:crypto";
+
+function createPayloadHash(payload: any): string {
+  const hash = createHash("sha256");
+  hash.update(JSON.stringify(payload));
+  return hash.digest("hex");
+}
+
+export const deduplicatedTask = task({
+  id: "deduplicated-task",
+  run: async (payload) => {
+    const payloadHash = createPayloadHash(payload);
+    const idempotencyKey = await idempotencyKeys.create(payloadHash);
+
+    await processData.trigger(payload, { idempotencyKey });
+  },
+});
+```
+
+## Metadata & Progress Tracking
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const batchProcessor = task({
+  id: "batch-processor",
+  run: async (payload: { items: any[] }, { ctx }) => {
+    const totalItems = payload.items.length;
+
+    // Initialize progress metadata
+    metadata
+      .set("progress", 0)
+      .set("totalItems", totalItems)
+      .set("processedItems", 0)
+      .set("status", "starting");
+
+    const results = [];
+
+    for (let i = 0; i < payload.items.length; i++) {
+      const item = payload.items[i];
+
+      // Process item
+      const result = await processItem(item);
+      results.push(result);
+
+      // Update progress
+      const progress = ((i + 1) / totalItems) * 100;
+      metadata
+        .set("progress", progress)
+        .increment("processedItems", 1)
+        .append("logs", `Processed item ${i + 1}/${totalItems}`)
+        .set("currentItem", item.id);
+    }
+
+    // Final status
+    metadata.set("status", "completed");
+
+    return { results, totalProcessed: results.length };
+  },
+});
+
+// Update parent metadata from child task
+export const childTask = task({
+  id: "child-task",
+  run: async (payload, { ctx }) => {
+    // Update parent task metadata
+    metadata.parent.set("childStatus", "processing");
+    metadata.root.increment("childrenCompleted", 1);
+
+    return { processed: true };
+  },
+});
+```
+
+## Advanced Triggering
+
+### Frontend Triggering (React)
+
+```tsx
+"use client";
+import { useTaskTrigger } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function TriggerButton({ accessToken }: { accessToken: string }) {
+  const { submit, handle, isLoading } = useTaskTrigger<typeof myTask>("my-task", { accessToken });
+
+  return (
+    <button onClick={() => submit({ data: "from frontend" })} disabled={isLoading}>
+      Trigger Task
+    </button>
+  );
+}
+```
+
+### Large Payloads
+
+```ts
+// For payloads > 512KB (max 10MB)
+export const largeDataTask = task({
+  id: "large-data-task",
+  run: async (payload: { dataUrl: string }) => {
+    // Trigger.dev automatically handles large payloads
+    // For > 10MB, use external storage
+    const response = await fetch(payload.dataUrl);
+    const largeData = await response.json();
+
+    return { processed: largeData.length };
+  },
+});
+
+// Best practice: Use presigned URLs for very large files
+await largeDataTask.trigger({
+  dataUrl: "https://s3.amazonaws.com/bucket/large-file.json?presigned=true",
+});
+```
+
+### Advanced Options
+
+```ts
+await myTask.trigger(payload, {
+  delay: "2h30m", // Delay execution
+  ttl: "24h", // Expire if not started within 24 hours
+  priority: 100, // Higher priority (time offset in seconds)
+  tags: ["urgent", "user_123"],
+  metadata: { source: "api", version: "v2" },
+  queue: {
+    name: "priority-queue",
+    concurrencyLimit: 10,
+  },
+  idempotencyKey: "unique-operation-id",
+  idempotencyKeyTTL: "1h",
+  machine: { preset: "large-1x" },
+  maxAttempts: 5,
+});
+```
+
+## Hidden Tasks
+
+```ts
+// Hidden task - not exported, only used internally
+const internalProcessor = task({
+  id: "internal-processor",
+  run: async (payload: { data: string }) => {
+    return { processed: payload.data.toUpperCase() };
+  },
+});
+
+// Public task that uses hidden task
+export const publicWorkflow = task({
+  id: "public-workflow",
+  run: async (payload: { input: string }) => {
+    // Use hidden task internally
+    const result = await internalProcessor.triggerAndWait({
+      data: payload.input,
+    });
+
+    if (result.ok) {
+      return { output: result.output.processed };
+    }
+
+    throw new Error("Internal processing failed");
+  },
+});
+```
+
+## Logging & Tracing
+
+```ts
+import { task, logger } from "@trigger.dev/sdk";
+
+export const tracedTask = task({
+  id: "traced-task",
+  run: async (payload, { ctx }) => {
+    logger.info("Task started", { userId: payload.userId });
+
+    // Custom trace with attributes
+    const user = await logger.trace(
+      "fetch-user",
+      async (span) => {
+        span.setAttribute("user.id", payload.userId);
+        span.setAttribute("operation", "database-fetch");
+
+        const userData = await database.findUser(payload.userId);
+        span.setAttribute("user.found", !!userData);
+
+        return userData;
+      },
+      { userId: payload.userId }
+    );
+
+    logger.debug("User fetched", { user: user.id });
+
+    try {
+      const result = await processUser(user);
+      logger.info("Processing completed", { result });
+      return result;
+    } catch (error) {
+      logger.error("Processing failed", {
+        error: error.message,
+        userId: payload.userId,
+      });
+      throw error;
+    }
+  },
+});
+```
+
+## Usage Monitoring
+
+```ts
+import { task, usage } from "@trigger.dev/sdk";
+
+export const monitoredTask = task({
+  id: "monitored-task",
+  run: async (payload) => {
+    // Get current run cost
+    const currentUsage = await usage.getCurrent();
+    logger.info("Current cost", {
+      costInCents: currentUsage.costInCents,
+      durationMs: currentUsage.durationMs,
+    });
+
+    // Measure specific operation
+    const { result, compute } = await usage.measure(async () => {
+      return await expensiveOperation(payload);
+    });
+
+    logger.info("Operation cost", {
+      costInCents: compute.costInCents,
+      durationMs: compute.durationMs,
+    });
+
+    return result;
+  },
+});
+```
+
+## Run Management
+
+```ts
+// Cancel runs
+await runs.cancel("run_123");
+
+// Replay runs with same payload
+await runs.replay("run_123");
+
+// Retrieve run with cost details
+const run = await runs.retrieve("run_123");
+console.log(`Cost: ${run.costInCents} cents, Duration: ${run.durationMs}ms`);
+```
+
+## Best Practices
+
+- **Concurrency**: Use queues to prevent overwhelming external services
+- **Retries**: Configure exponential backoff for transient failures
+- **Idempotency**: Always use for payment/critical operations
+- **Metadata**: Track progress for long-running tasks
+- **Machines**: Match machine size to computational requirements
+- **Tags**: Use consistent naming patterns for filtering
+- **Large Payloads**: Use external storage for files > 10MB
+- **Error Handling**: Distinguish between retryable and fatal errors
+
+Design tasks to be stateless, idempotent, and resilient to failures. Use metadata for state tracking and queues for resource management.
diff --git a/rules/4.0.0/basic-tasks.md b/rules/4.0.0/basic-tasks.md
new file mode 100644
index 00000000000..6e30ff1c715
--- /dev/null
+++ b/rules/4.0.0/basic-tasks.md
@@ -0,0 +1,185 @@
+# Trigger.dev Basic Tasks (v4)
+
+**MUST use `@trigger.dev/sdk` (v4), NEVER `client.defineJob`**
+
+## Basic Task
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const processData = task({
+  id: "process-data",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+    randomize: false,
+  },
+  run: async (payload: { userId: string; data: any[] }) => {
+    // Task logic - runs for long time, no timeouts
+    console.log(`Processing ${payload.data.length} items for user ${payload.userId}`);
+    return { processed: payload.data.length };
+  },
+});
+```
+
+## Schema Task (with validation)
+
+```ts
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+
+export const validatedTask = schemaTask({
+  id: "validated-task",
+  schema: z.object({
+    name: z.string(),
+    age: z.number(),
+    email: z.string().email(),
+  }),
+  run: async (payload) => {
+    // Payload is automatically validated and typed
+    return { message: `Hello ${payload.name}, age ${payload.age}` };
+  },
+});
+```
+
+## Scheduled Task
+
+```ts
+import { schedules } from "@trigger.dev/sdk";
+
+const dailyReport = schedules.task({
+  id: "daily-report",
+  cron: "0 9 * * *", // Daily at 9:00 AM UTC
+  // or with timezone: cron: { pattern: "0 9 * * *", timezone: "America/New_York" },
+  run: async (payload) => {
+    console.log("Scheduled run at:", payload.timestamp);
+    console.log("Last run was:", payload.lastTimestamp);
+    console.log("Next 5 runs:", payload.upcoming);
+
+    // Generate daily report logic
+    return { reportGenerated: true, date: payload.timestamp };
+  },
+});
+```
+
+## Triggering Tasks
+
+### From Backend Code
+
+```ts
+import { tasks } from "@trigger.dev/sdk";
+import type { processData } from "./trigger/tasks";
+
+// Single trigger
+const handle = await tasks.trigger<typeof processData>("process-data", {
+  userId: "123",
+  data: [{ id: 1 }, { id: 2 }],
+});
+
+// Batch trigger
+const batchHandle = await tasks.batchTrigger<typeof processData>("process-data", [
+  { payload: { userId: "123", data: [{ id: 1 }] } },
+  { payload: { userId: "456", data: [{ id: 2 }] } },
+]);
+```
+
+### From Inside Tasks (with Result handling)
+
+```ts
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    // Trigger and continue
+    const handle = await childTask.trigger({ data: "value" });
+
+    // Trigger and wait - returns Result object, NOT task output
+    const result = await childTask.triggerAndWait({ data: "value" });
+    if (result.ok) {
+      console.log("Task output:", result.output); // Actual task return value
+    } else {
+      console.error("Task failed:", result.error);
+    }
+
+    // Quick unwrap (throws on error)
+    const output = await childTask.triggerAndWait({ data: "value" }).unwrap();
+
+    // Batch trigger and wait
+    const results = await childTask.batchTriggerAndWait([
+      { payload: { data: "item1" } },
+      { payload: { data: "item2" } },
+    ]);
+
+    for (const run of results) {
+      if (run.ok) {
+        console.log("Success:", run.output);
+      } else {
+        console.log("Failed:", run.error);
+      }
+    }
+  },
+});
+
+export const childTask = task({
+  id: "child-task",
+  run: async (payload: { data: string }) => {
+    return { processed: payload.data };
+  },
+});
+```
+
+> Never wrap triggerAndWait or batchTriggerAndWait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Waits
+
+```ts
+import { task, wait } from "@trigger.dev/sdk";
+
+export const taskWithWaits = task({
+  id: "task-with-waits",
+  run: async (payload) => {
+    console.log("Starting task");
+
+    // Wait for specific duration
+    await wait.for({ seconds: 30 });
+    await wait.for({ minutes: 5 });
+    await wait.for({ hours: 1 });
+    await wait.for({ days: 1 });
+
+    // Wait until specific date
+    await wait.until({ date: new Date("2024-12-25") });
+
+    // Wait for token (from external system)
+    await wait.forToken({
+      token: "user-approval-token",
+      timeoutInSeconds: 3600, // 1 hour timeout
+    });
+
+    console.log("All waits completed");
+    return { status: "completed" };
+  },
+});
+```
+
+> Never wrap wait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Key Points
+
+- **Result vs Output**: `triggerAndWait()` returns a `Result` object with `ok`, `output`, `error` properties - NOT the direct task output
+- **Type safety**: Use `import type` for task references when triggering from backend
+- **Waits > 5 seconds**: Automatically checkpointed, don't count toward compute usage
+
+## NEVER Use (v2 deprecated)
+
+```ts
+// BREAKS APPLICATION
+client.defineJob({
+  id: "job-id",
+  run: async (payload, io) => {
+    /* ... */
+  },
+});
+```
+
+Use v4 SDK (`@trigger.dev/sdk`), check `result.ok` before accessing `result.output`
diff --git a/rules/4.0.0/claude-code-agent.md b/rules/4.0.0/claude-code-agent.md
new file mode 100644
index 00000000000..db3663e97e5
--- /dev/null
+++ b/rules/4.0.0/claude-code-agent.md
@@ -0,0 +1,238 @@
+---
+name: trigger-dev-expert
+description: Use this agent when you need to design, implement, or optimize background jobs and workflows using Trigger.dev framework. This includes creating reliable async tasks, implementing AI workflows, setting up scheduled jobs, structuring complex task hierarchies with subtasks, configuring build extensions for tools like ffmpeg or Puppeteer/Playwright, and handling task schemas with Zod validation. The agent excels at architecting scalable background job solutions with proper error handling, retries, and monitoring.\n\nExamples:\n- <example>\n  Context: User needs to create a background job for processing video files\n  user: "I need to create a task that processes uploaded videos, extracts thumbnails, and transcodes them"\n  assistant: "I'll use the trigger-dev-expert agent to design a robust video processing workflow with proper task structure and ffmpeg configuration"\n  <commentary>\n  Since this involves creating background tasks with media processing, the trigger-dev-expert agent is ideal for structuring the workflow and configuring build extensions.\n  </commentary>\n</example>\n- <example>\n  Context: User wants to implement a scheduled data sync task\n  user: "Create a scheduled task that runs every hour to sync data from our API to the database"\n  assistant: "Let me use the trigger-dev-expert agent to create a properly structured scheduled task with error handling"\n  <commentary>\n  The user needs a scheduled background task, which is a core Trigger.dev feature that the expert agent specializes in.\n  </commentary>\n</example>\n- <example>\n  Context: User needs help with task orchestration\n  user: "I have a complex workflow where I need to run multiple AI models in sequence and parallel, how should I structure this?"\n  assistant: "I'll engage the trigger-dev-expert agent to architect an efficient task hierarchy using triggerAndWait and batchTriggerAndWait patterns"\n  <commentary>\n  Complex task orchestration with subtasks is a specialty of the trigger-dev-expert agent.\n  </commentary>\n</example>
+model: inherit
+color: green
+---
+
+You are an elite Trigger.dev framework expert with deep knowledge of building production-grade background job systems. You specialize in designing reliable, scalable workflows using Trigger.dev's async-first architecture. Tasks deployed to Trigger.dev generally run in Node.js 21+ and use the `@trigger.dev/sdk` package, along with the `@trigger.dev/build` package for build extensions and the `trigger.dev` CLI package to run the `dev` server and `deploy` command.
+
+> Never use `node-fetch` in your code, use the `fetch` function that's built into Node.js.
+
+## Design Principles
+
+When creating Trigger.dev solutions, you will:
+
+- Use the `@trigger.dev/sdk` package to create tasks, ideally using the `schemaTask` function and passing in a Zod or other schema validation library schema to the `schema` property so the task payload can be validated and automatically typed.
+- Break complex workflows into subtasks that can be independently retried and made idempotent, but don't overly complicate your tasks with too many subtasks. Sometimes the correct approach is to NOT use a subtask and do things like await Promise.allSettled to do work in parallel so save on costs, as each task gets it's own dedicated process and is charged by the millisecond.
+- Always configure the `retry` property in the task definition to set the maximum number of retries, the delay between retries, and the backoff factor. Don't retry too much unless absolutely necessary.
+- When triggering a task from inside another task, consider whether to use the `triggerAndWait`/`batchTriggerAndWait` pattern or just the `trigger`/`batchTrigger` function. Use the "andWait" variants when the parent task needs the results of the child task.
+- When triggering a task, especially from inside another task, always consider whether to pass the `idempotencyKey` property to the `options` argument. This is especially important when inside another task and that task can be retried and you don't want to redo the work in children tasks (whether waiting for the results or not).
+- Use the `logger` system in Trigger.dev to log useful messages at key execution points.
+- Group subtasks that are only used from a single other task into the same file as the parent task, and don't export them.
+
+> Important: Never wrap triggerAndWait or batchTriggerAndWait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Triggering tasks
+
+When triggering a task from outside of a task, like for instance from an API handler in a Next.js route, you will use the `tasks.trigger` function and do a type only import of the task instance, to prevent dependencies inside the task file from leaking into the API handler and possibly causing issues with the build. An example:
+
+```ts
+import { tasks } from "@trigger.dev/sdk";
+import type { processData } from "./trigger/tasks";
+
+const handle = await tasks.trigger<typeof processData>("process-data", {
+  userId: "123",
+  data: [{ id: 1 }, { id: 2 }],
+});
+```
+
+When triggering tasks from inside another task, if the other task is in a different file, use the pattern above. If the task is in the same file, you can use the task instance directly like so:
+
+```ts
+const handle = await processData.trigger({
+  userId: "123",
+  data: [{ id: 1 }, { id: 2 }],
+});
+```
+
+There are a bunch of options you can pass as the second argument to the `trigger` or `triggerAndWait` functions that control behavior like the idempotency key, the machine preset, the timeout, and more:
+
+```ts
+import { idempotencyKeys } from "@trigger.dev/sdk";
+
+const handle = await processData.trigger(
+  {
+    userId: "123",
+  },
+  {
+    delay: "1h", // Will delay the task by 1 hour
+    ttl: "10m", // Will automatically cancel the task if not dequeued within 10 minutes
+    idempotencyKey: await idempotencyKeys.create("my-idempotency-key"),
+    idempotencyKeyTTL: "1h",
+    queue: "my-queue",
+    machine: "small-1x",
+    maxAttempts: 3,
+    tags: ["my-tag"],
+    region: "us-east-1",
+  }
+);
+```
+
+You can also pass these options when doing a batch trigger for each item:
+
+```ts
+const batchHandle = await processData.batchTrigger([
+  {
+    payload: { userId: "123" },
+    options: {
+      idempotencyKey: await idempotencyKeys.create("my-idempotency-key-1"),
+    },
+  },
+  {
+    payload: { userId: "456" },
+    options: {
+      idempotencyKey: await idempotencyKeys.create("my-idempotency-key-2"),
+    },
+  },
+]);
+```
+
+When triggering a task without the "andWait" suffix, you will receive a `RunHandle` object that contains the `id` of the run. You can use this with various `runs` SDK functions to get the status of the run, cancel it, etc.
+
+```ts
+import { runs } from "@trigger.dev/sdk";
+
+const handle = await processData.trigger({
+  userId: "123",
+});
+
+const run = await runs.retrieve(handle.id);
+```
+
+When triggering a task with the "andWait" suffix, you will receive a Result type object that contains the result of the task and the output. Before accessing the output, you need to check the `ok` property to see if the task was successful:
+
+```ts
+const result = await processData.triggerAndWait({
+  userId: "123",
+});
+
+if (result.ok) {
+  const output = result.output;
+} else {
+  const error = result.error;
+}
+
+// Or you can unwrap the result and access the output directly, if the task was not successful, the unwrap will throw an error
+const unwrappedOutput = await processData
+  .triggerAndWait({
+    userId: "123",
+  })
+  .unwrap();
+
+const batchResult = await processData.batchTriggerAndWait([
+  { payload: { userId: "123" } },
+  { payload: { userId: "456" } },
+]);
+
+for (const run of batchResult.runs) {
+  if (run.ok) {
+    const output = run.output;
+  } else {
+    const error = run.error;
+  }
+}
+```
+
+## Idempotency keys
+
+Any time you trigger a task inside another task, you should consider passing an idempotency key to the options argument using the `idempotencyKeys.create` function. This will ensure that the task is only triggered once per task run, even if the parent task is retried. If you want the idempotency key to be scoped globally instead of per task run, you can just pass a string instead of an idempotency key object:
+
+```ts
+const idempotencyKey = await idempotencyKeys.create("my-idempotency-key");
+
+const handle = await processData.trigger(
+  {
+    userId: "123",
+  },
+  {
+    idempotencyKey, // Scoped to the current run, across retries
+  }
+);
+
+const handle = await processData.trigger(
+  {
+    userId: "123",
+  },
+  {
+    idempotencyKey: "my-idempotency-key", // Scoped across all runs
+  }
+);
+```
+
+Idempotency keys are always also scoped to the task identifier of the task being triggered. This means you can use the same idempotency key for different tasks, and they will not conflict with each other.
+
+## Machine Presets
+
+- The default machine preset is `small-1x` which is a 0.5vCPU and 0.5GB of memory.
+- The default machine preset can be overridden in the trigger.config.ts file by setting the `machine` property.
+- The machine preset for a specific task can be overridden in the task definition by setting the `machine` property.
+- You can set the machine preset at trigger time by passing in the `machine` property in the options argument to any of the trigger functions.
+
+| Preset             | vCPU | Memory | Disk space |
+| :----------------- | :--- | :----- | :--------- |
+| micro              | 0.25 | 0.25   | 10GB       |
+| small-1x (default) | 0.5  | 0.5    | 10GB       |
+| small-2x           | 1    | 1      | 10GB       |
+| medium-1x          | 1    | 2      | 10GB       |
+| medium-2x          | 2    | 4      | 10GB       |
+| large-1x           | 4    | 8      | 10GB       |
+| large-2x           | 8    | 16     | 10GB       |
+
+## Configuration Expertise
+
+When setting up Trigger.dev projects, you will configure the `trigger.config.ts` file with the following if needed:
+
+- Build extensions for tools like ffmpeg, Puppeteer, Playwright, and other binary dependencies. An example:
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+import { playwright } from "@trigger.dev/build/extensions/playwright";
+import { ffmpeg, aptGet, additionalFiles } from "@trigger.dev/build/extensions/core";
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+import { pythonExtension } from "@trigger.dev/python/extension";
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+import { esbuildPlugin } from "@trigger.dev/build/extensions";
+import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
+
+export default defineConfig({
+  project: "<project ref>",
+  machine: "small-1x", // optional, default is small-1x
+  build: {
+    extensions: [
+      playwright(),
+      ffmpeg(),
+      aptGet({ packages: ["curl"] }),
+      prismaExtension({
+        version: "5.19.0", // optional, we'll automatically detect the version if not provided
+        schema: "prisma/schema.prisma",
+      }),
+      pythonExtension(),
+      lightpanda(),
+      esbuildPlugin(
+        sentryEsbuildPlugin({
+          org: process.env.SENTRY_ORG,
+          project: process.env.SENTRY_PROJECT,
+          authToken: process.env.SENTRY_AUTH_TOKEN,
+        }),
+        // optional - only runs during the deploy command, and adds the plugin to the end of the list of plugins
+        { placement: "last", target: "deploy" }
+      ),
+    ],
+  },
+});
+```
+
+- Default retry settings for tasks
+- Default machine preset
+
+## Code Quality Standards
+
+You will produce code that:
+
+- Uses modern TypeScript with strict type checking
+- When catching errors, remember that the type of the error is `unknown` and you need to check `error instanceof Error` to see if it's a real error instance
+- Follows Trigger.dev's recommended project structure
+- Don't go overboard with error handling
+- Write some inline documentation for complex logic
+- Uses descriptive task IDs following the pattern: 'domain.action.target'
diff --git a/rules/4.0.0/config.md b/rules/4.0.0/config.md
new file mode 100644
index 00000000000..33b68554f10
--- /dev/null
+++ b/rules/4.0.0/config.md
@@ -0,0 +1,346 @@
+# Trigger.dev Configuration (v4)
+
+**Complete guide to configuring `trigger.config.ts` with build extensions**
+
+## Basic Configuration
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project-ref>", // Required: Your project reference
+  dirs: ["./trigger"], // Task directories
+  runtime: "node", // "node", "node-22", or "bun"
+  logLevel: "info", // "debug", "info", "warn", "error"
+
+  // Default retry settings
+  retries: {
+    enabledInDev: false,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+
+  // Build configuration
+  build: {
+    autoDetectExternal: true,
+    keepNames: true,
+    minify: false,
+    extensions: [], // Build extensions go here
+  },
+
+  // Global lifecycle hooks
+  onStart: async ({ payload, ctx }) => {
+    console.log("Global task start");
+  },
+  onSuccess: async ({ payload, output, ctx }) => {
+    console.log("Global task success");
+  },
+  onFailure: async ({ payload, error, ctx }) => {
+    console.log("Global task failure");
+  },
+});
+```
+
+## Build Extensions
+
+### Database & ORM
+
+#### Prisma
+
+```ts
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+extensions: [
+  prismaExtension({
+    schema: "prisma/schema.prisma",
+    version: "5.19.0", // Optional: specify version
+    migrate: true, // Run migrations during build
+    directUrlEnvVarName: "DIRECT_DATABASE_URL",
+    typedSql: true, // Enable TypedSQL support
+  }),
+];
+```
+
+#### TypeScript Decorators (for TypeORM)
+
+```ts
+import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
+
+extensions: [
+  emitDecoratorMetadata(), // Enables decorator metadata
+];
+```
+
+### Scripting Languages
+
+#### Python
+
+```ts
+import { pythonExtension } from "@trigger.dev/build/extensions/python";
+
+extensions: [
+  pythonExtension({
+    scripts: ["./python/**/*.py"], // Copy Python files
+    requirementsFile: "./requirements.txt", // Install packages
+    devPythonBinaryPath: ".venv/bin/python", // Dev mode binary
+  }),
+];
+
+// Usage in tasks
+const result = await python.runInline(`print("Hello, world!")`);
+const output = await python.runScript("./python/script.py", ["arg1"]);
+```
+
+### Browser Automation
+
+#### Playwright
+
+```ts
+import { playwright } from "@trigger.dev/build/extensions/playwright";
+
+extensions: [
+  playwright({
+    browsers: ["chromium", "firefox", "webkit"], // Default: ["chromium"]
+    headless: true, // Default: true
+  }),
+];
+```
+
+#### Puppeteer
+
+```ts
+import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
+
+extensions: [puppeteer()];
+
+// Environment variable needed:
+// PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
+```
+
+#### Lightpanda
+
+```ts
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+
+extensions: [
+  lightpanda({
+    version: "latest", // or "nightly"
+    disableTelemetry: false,
+  }),
+];
+```
+
+### Media Processing
+
+#### FFmpeg
+
+```ts
+import { ffmpeg } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  ffmpeg({ version: "7" }), // Static build, or omit for Debian version
+];
+
+// Automatically sets FFMPEG_PATH and FFPROBE_PATH
+// Add fluent-ffmpeg to external packages if using
+```
+
+#### Audio Waveform
+
+```ts
+import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
+
+extensions: [
+  audioWaveform(), // Installs Audio Waveform 1.1.0
+];
+```
+
+### System & Package Management
+
+#### System Packages (apt-get)
+
+```ts
+import { aptGet } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  aptGet({
+    packages: ["ffmpeg", "imagemagick", "curl=7.68.0-1"], // Can specify versions
+  }),
+];
+```
+
+#### Additional NPM Packages
+
+Only use this for installing CLI tools, NOT packages you import in your code.
+
+```ts
+import { additionalPackages } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  additionalPackages({
+    packages: ["wrangler"], // CLI tools and specific versions
+  }),
+];
+```
+
+#### Additional Files
+
+```ts
+import { additionalFiles } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  additionalFiles({
+    files: ["wrangler.toml", "./assets/**", "./fonts/**"], // Glob patterns supported
+  }),
+];
+```
+
+### Environment & Build Tools
+
+#### Environment Variable Sync
+
+```ts
+import { syncEnvVars } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  syncEnvVars(async (ctx) => {
+    // ctx contains: environment, projectRef, env
+    return [
+      { name: "SECRET_KEY", value: await getSecret(ctx.environment) },
+      { name: "API_URL", value: ctx.environment === "prod" ? "api.prod.com" : "api.dev.com" },
+    ];
+  }),
+];
+```
+
+#### ESBuild Plugins
+
+```ts
+import { esbuildPlugin } from "@trigger.dev/build/extensions";
+import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
+
+extensions: [
+  esbuildPlugin(
+    sentryEsbuildPlugin({
+      org: process.env.SENTRY_ORG,
+      project: process.env.SENTRY_PROJECT,
+      authToken: process.env.SENTRY_AUTH_TOKEN,
+    }),
+    { placement: "last", target: "deploy" } // Optional config
+  ),
+];
+```
+
+## Custom Build Extensions
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+const customExtension = {
+  name: "my-custom-extension",
+
+  externalsForTarget: (target) => {
+    return ["some-native-module"]; // Add external dependencies
+  },
+
+  onBuildStart: async (context) => {
+    console.log(`Build starting for ${context.target}`);
+    // Register esbuild plugins, modify build context
+  },
+
+  onBuildComplete: async (context, manifest) => {
+    console.log("Build complete, adding layers");
+    // Add build layers, modify deployment
+    context.addLayer({
+      id: "my-layer",
+      files: [{ source: "./custom-file", destination: "/app/custom" }],
+      commands: ["chmod +x /app/custom"],
+    });
+  },
+};
+
+export default defineConfig({
+  project: "my-project",
+  build: {
+    extensions: [customExtension],
+  },
+});
+```
+
+## Advanced Configuration
+
+### Telemetry
+
+```ts
+import { PrismaInstrumentation } from "@prisma/instrumentation";
+import { OpenAIInstrumentation } from "@langfuse/openai";
+
+export default defineConfig({
+  // ... other config
+  telemetry: {
+    instrumentations: [new PrismaInstrumentation(), new OpenAIInstrumentation()],
+    exporters: [customExporter], // Optional custom exporters
+  },
+});
+```
+
+### Machine & Performance
+
+```ts
+export default defineConfig({
+  // ... other config
+  defaultMachine: "large-1x", // Default machine for all tasks
+  maxDuration: 300, // Default max duration (seconds)
+  enableConsoleLogging: true, // Console logging in development
+});
+```
+
+## Common Extension Combinations
+
+### Full-Stack Web App
+
+```ts
+extensions: [
+  prismaExtension({ schema: "prisma/schema.prisma", migrate: true }),
+  additionalFiles({ files: ["./public/**", "./assets/**"] }),
+  syncEnvVars(async (ctx) => [...envVars]),
+];
+```
+
+### AI/ML Processing
+
+```ts
+extensions: [
+  pythonExtension({
+    scripts: ["./ai/**/*.py"],
+    requirementsFile: "./requirements.txt",
+  }),
+  ffmpeg({ version: "7" }),
+  additionalPackages({ packages: ["wrangler"] }),
+];
+```
+
+### Web Scraping
+
+```ts
+extensions: [
+  playwright({ browsers: ["chromium"] }),
+  puppeteer(),
+  additionalFiles({ files: ["./selectors.json", "./proxies.txt"] }),
+];
+```
+
+## Best Practices
+
+- **Use specific versions**: Pin extension versions for reproducible builds
+- **External packages**: Add modules with native addons to the `build.external` array
+- **Environment sync**: Use `syncEnvVars` for dynamic secrets
+- **File paths**: Use glob patterns for flexible file inclusion
+- **Debug builds**: Use `--log-level debug --dry-run` for troubleshooting
+
+Extensions only affect deployment, not local development. Use `external` array for packages that shouldn't be bundled.
diff --git a/rules/4.0.0/realtime.md b/rules/4.0.0/realtime.md
new file mode 100644
index 00000000000..24cbb9aac06
--- /dev/null
+++ b/rules/4.0.0/realtime.md
@@ -0,0 +1,272 @@
+# Trigger.dev Realtime (v4)
+
+**Real-time monitoring and updates for runs**
+
+## Core Concepts
+
+Realtime allows you to:
+
+- Subscribe to run status changes, metadata updates, and streams
+- Build real-time dashboards and UI updates
+- Monitor task progress from frontend and backend
+
+## Authentication
+
+### Public Access Tokens
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Read-only token for specific runs
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      runs: ["run_123", "run_456"],
+      tasks: ["my-task-1", "my-task-2"],
+    },
+  },
+  expirationTime: "1h", // Default: 15 minutes
+});
+```
+
+### Trigger Tokens (Frontend only)
+
+```ts
+// Single-use token for triggering tasks
+const triggerToken = await auth.createTriggerPublicToken("my-task", {
+  expirationTime: "30m",
+});
+```
+
+## Backend Usage
+
+### Subscribe to Runs
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+
+// Trigger and subscribe
+const handle = await tasks.trigger("my-task", { data: "value" });
+
+// Subscribe to specific run
+for await (const run of runs.subscribeToRun<typeof myTask>(handle.id)) {
+  console.log(`Status: ${run.status}, Progress: ${run.metadata?.progress}`);
+  if (run.status === "COMPLETED") break;
+}
+
+// Subscribe to runs with tag
+for await (const run of runs.subscribeToRunsWithTag("user-123")) {
+  console.log(`Tagged run ${run.id}: ${run.status}`);
+}
+
+// Subscribe to batch
+for await (const run of runs.subscribeToBatch(batchId)) {
+  console.log(`Batch run ${run.id}: ${run.status}`);
+}
+```
+
+### Streams
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+// Task that streams data
+export type STREAMS = {
+  openai: OpenAI.ChatCompletionChunk;
+};
+
+export const streamingTask = task({
+  id: "streaming-task",
+  run: async (payload) => {
+    const completion = await openai.chat.completions.create({
+      model: "gpt-4",
+      messages: [{ role: "user", content: payload.prompt }],
+      stream: true,
+    });
+
+    // Register stream
+    const stream = await metadata.stream("openai", completion);
+
+    let text = "";
+    for await (const chunk of stream) {
+      text += chunk.choices[0]?.delta?.content || "";
+    }
+
+    return { text };
+  },
+});
+
+// Subscribe to streams
+for await (const part of runs.subscribeToRun(runId).withStreams<STREAMS>()) {
+  switch (part.type) {
+    case "run":
+      console.log("Run update:", part.run.status);
+      break;
+    case "openai":
+      console.log("Stream chunk:", part.chunk);
+      break;
+  }
+}
+```
+
+## React Frontend Usage
+
+### Installation
+
+```bash
+npm add @trigger.dev/react-hooks
+```
+
+### Triggering Tasks
+
+```tsx
+"use client";
+import { useTaskTrigger, useRealtimeTaskTrigger } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function TriggerComponent({ accessToken }: { accessToken: string }) {
+  // Basic trigger
+  const { submit, handle, isLoading } = useTaskTrigger<typeof myTask>("my-task", {
+    accessToken,
+  });
+
+  // Trigger with realtime updates
+  const {
+    submit: realtimeSubmit,
+    run,
+    isLoading: isRealtimeLoading,
+  } = useRealtimeTaskTrigger<typeof myTask>("my-task", { accessToken });
+
+  return (
+    <div>
+      <button onClick={() => submit({ data: "value" })} disabled={isLoading}>
+        Trigger Task
+      </button>
+
+      <button onClick={() => realtimeSubmit({ data: "realtime" })} disabled={isRealtimeLoading}>
+        Trigger with Realtime
+      </button>
+
+      {run && <div>Status: {run.status}</div>}
+    </div>
+  );
+}
+```
+
+### Subscribing to Runs
+
+```tsx
+"use client";
+import { useRealtimeRun, useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function SubscribeComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  // Subscribe to specific run
+  const { run, error } = useRealtimeRun<typeof myTask>(runId, {
+    accessToken,
+    onComplete: (run) => {
+      console.log("Task completed:", run.output);
+    },
+  });
+
+  // Subscribe to tagged runs
+  const { runs } = useRealtimeRunsWithTag("user-123", { accessToken });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!run) return <div>Loading...</div>;
+
+  return (
+    <div>
+      <div>Status: {run.status}</div>
+      <div>Progress: {run.metadata?.progress || 0}%</div>
+      {run.output && <div>Result: {JSON.stringify(run.output)}</div>}
+
+      <h3>Tagged Runs:</h3>
+      {runs.map((r) => (
+        <div key={r.id}>
+          {r.id}: {r.status}
+        </div>
+      ))}
+    </div>
+  );
+}
+```
+
+### Streams with React
+
+```tsx
+"use client";
+import { useRealtimeRunWithStreams } from "@trigger.dev/react-hooks";
+import type { streamingTask, STREAMS } from "../trigger/tasks";
+
+function StreamComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  const { run, streams } = useRealtimeRunWithStreams<typeof streamingTask, STREAMS>(runId, {
+    accessToken,
+  });
+
+  const text = streams.openai
+    .filter((chunk) => chunk.choices[0]?.delta?.content)
+    .map((chunk) => chunk.choices[0].delta.content)
+    .join("");
+
+  return (
+    <div>
+      <div>Status: {run?.status}</div>
+      <div>Streamed Text: {text}</div>
+    </div>
+  );
+}
+```
+
+### Wait Tokens
+
+```tsx
+"use client";
+import { useWaitToken } from "@trigger.dev/react-hooks";
+
+function WaitTokenComponent({ tokenId, accessToken }: { tokenId: string; accessToken: string }) {
+  const { complete } = useWaitToken(tokenId, { accessToken });
+
+  return <button onClick={() => complete({ approved: true })}>Approve Task</button>;
+}
+```
+
+### SWR Hooks (Fetch Once)
+
+```tsx
+"use client";
+import { useRun } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function SWRComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  const { run, error, isLoading } = useRun<typeof myTask>(runId, {
+    accessToken,
+    refreshInterval: 0, // Disable polling (recommended)
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run?.status}</div>;
+}
+```
+
+## Run Object Properties
+
+Key properties available in run subscriptions:
+
+- `id`: Unique run identifier
+- `status`: `QUEUED`, `EXECUTING`, `COMPLETED`, `FAILED`, `CANCELED`, etc.
+- `payload`: Task input data (typed)
+- `output`: Task result (typed, when completed)
+- `metadata`: Real-time updatable data
+- `createdAt`, `updatedAt`: Timestamps
+- `costInCents`: Execution cost
+
+## Best Practices
+
+- **Use Realtime over SWR**: Recommended for most use cases due to rate limits
+- **Scope tokens properly**: Only grant necessary read/trigger permissions
+- **Handle errors**: Always check for errors in hooks and subscriptions
+- **Type safety**: Use task types for proper payload/output typing
+- **Cleanup subscriptions**: Backend subscriptions auto-complete, frontend hooks auto-cleanup
diff --git a/rules/4.0.0/scheduled-tasks.md b/rules/4.0.0/scheduled-tasks.md
new file mode 100644
index 00000000000..7d46a45ad92
--- /dev/null
+++ b/rules/4.0.0/scheduled-tasks.md
@@ -0,0 +1,117 @@
+# Scheduled tasks (cron)
+
+Recurring tasks using cron. For one-off future runs, use the **delay** option.
+
+## Define a scheduled task
+
+```ts
+import { schedules } from "@trigger.dev/sdk";
+
+export const task = schedules.task({
+  id: "first-scheduled-task",
+  run: async (payload) => {
+    payload.timestamp; // Date (scheduled time, UTC)
+    payload.lastTimestamp; // Date | undefined
+    payload.timezone; // IANA, e.g. "America/New_York" (default "UTC")
+    payload.scheduleId; // string
+    payload.externalId; // string | undefined
+    payload.upcoming; // Date[]
+
+    payload.timestamp.toLocaleString("en-US", { timeZone: payload.timezone });
+  },
+});
+```
+
+> Scheduled tasks need at least one schedule attached to run.
+
+## Attach schedules
+
+**Declarative (sync on dev/deploy):**
+
+```ts
+schedules.task({
+  id: "every-2h",
+  cron: "0 */2 * * *", // UTC
+  run: async () => {},
+});
+
+schedules.task({
+  id: "tokyo-5am",
+  cron: { pattern: "0 5 * * *", timezone: "Asia/Tokyo", environments: ["PRODUCTION", "STAGING"] },
+  run: async () => {},
+});
+```
+
+**Imperative (SDK or dashboard):**
+
+```ts
+await schedules.create({
+  task: task.id,
+  cron: "0 0 * * *",
+  timezone: "America/New_York", // DST-aware
+  externalId: "user_123",
+  deduplicationKey: "user_123-daily", // updates if reused
+});
+```
+
+### Dynamic / multi-tenant example
+
+```ts
+// /trigger/reminder.ts
+export const reminderTask = schedules.task({
+  id: "todo-reminder",
+  run: async (p) => {
+    if (!p.externalId) throw new Error("externalId is required");
+    const user = await db.getUser(p.externalId);
+    await sendReminderEmail(user);
+  },
+});
+```
+
+```ts
+// app/reminders/route.ts
+export async function POST(req: Request) {
+  const data = await req.json();
+  return Response.json(
+    await schedules.create({
+      task: reminderTask.id,
+      cron: "0 8 * * *",
+      timezone: data.timezone,
+      externalId: data.userId,
+      deduplicationKey: `${data.userId}-reminder`,
+    })
+  );
+}
+```
+
+## Cron syntax (no seconds)
+
+```
+* * * * *
+| | | | └ day of week (0–7 or 1L–7L; 0/7=Sun; L=last)
+| | | └── month (1–12)
+| | └──── day of month (1–31 or L)
+| └────── hour (0–23)
+└──────── minute (0–59)
+```
+
+## When schedules won't trigger
+
+- **Dev:** only when the dev CLI is running.
+- **Staging/Production:** only for tasks in the **latest deployment**.
+
+## SDK management (quick refs)
+
+```ts
+await schedules.retrieve(id);
+await schedules.list();
+await schedules.update(id, { cron: "0 0 1 * *", externalId: "ext", deduplicationKey: "key" });
+await schedules.deactivate(id);
+await schedules.activate(id);
+await schedules.del(id);
+await schedules.timezones(); // list of IANA timezones
+```
+
+## Dashboard
+
+Create/attach schedules visually (Task, Cron pattern, Timezone, Optional: External ID, Dedup key, Environments). Test scheduled tasks from the **Test** page.
diff --git a/rules/4.1.0/config.md b/rules/4.1.0/config.md
new file mode 100644
index 00000000000..6ad90223e39
--- /dev/null
+++ b/rules/4.1.0/config.md
@@ -0,0 +1,346 @@
+# Trigger.dev Configuration (v4)
+
+**Complete guide to configuring `trigger.config.ts` with build extensions**
+
+## Basic Configuration
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+export default defineConfig({
+  project: "<project-ref>", // Required: Your project reference
+  dirs: ["./trigger"], // Task directories
+  runtime: "node", // "node", "node-22", or "bun"
+  logLevel: "info", // "debug", "info", "warn", "error"
+
+  // Default retry settings
+  retries: {
+    enabledInDev: false,
+    default: {
+      maxAttempts: 3,
+      minTimeoutInMs: 1000,
+      maxTimeoutInMs: 10000,
+      factor: 2,
+      randomize: true,
+    },
+  },
+
+  // Build configuration
+  build: {
+    autoDetectExternal: true,
+    keepNames: true,
+    minify: false,
+    extensions: [], // Build extensions go here
+  },
+
+  // Global lifecycle hooks
+  onStartAttempt: async ({ payload, ctx }) => {
+    console.log("Global task start");
+  },
+  onSuccess: async ({ payload, output, ctx }) => {
+    console.log("Global task success");
+  },
+  onFailure: async ({ payload, error, ctx }) => {
+    console.log("Global task failure");
+  },
+});
+```
+
+## Build Extensions
+
+### Database & ORM
+
+#### Prisma
+
+```ts
+import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
+
+extensions: [
+  prismaExtension({
+    schema: "prisma/schema.prisma",
+    version: "5.19.0", // Optional: specify version
+    migrate: true, // Run migrations during build
+    directUrlEnvVarName: "DIRECT_DATABASE_URL",
+    typedSql: true, // Enable TypedSQL support
+  }),
+];
+```
+
+#### TypeScript Decorators (for TypeORM)
+
+```ts
+import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
+
+extensions: [
+  emitDecoratorMetadata(), // Enables decorator metadata
+];
+```
+
+### Scripting Languages
+
+#### Python
+
+```ts
+import { pythonExtension } from "@trigger.dev/build/extensions/python";
+
+extensions: [
+  pythonExtension({
+    scripts: ["./python/**/*.py"], // Copy Python files
+    requirementsFile: "./requirements.txt", // Install packages
+    devPythonBinaryPath: ".venv/bin/python", // Dev mode binary
+  }),
+];
+
+// Usage in tasks
+const result = await python.runInline(`print("Hello, world!")`);
+const output = await python.runScript("./python/script.py", ["arg1"]);
+```
+
+### Browser Automation
+
+#### Playwright
+
+```ts
+import { playwright } from "@trigger.dev/build/extensions/playwright";
+
+extensions: [
+  playwright({
+    browsers: ["chromium", "firefox", "webkit"], // Default: ["chromium"]
+    headless: true, // Default: true
+  }),
+];
+```
+
+#### Puppeteer
+
+```ts
+import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
+
+extensions: [puppeteer()];
+
+// Environment variable needed:
+// PUPPETEER_EXECUTABLE_PATH: "/usr/bin/google-chrome-stable"
+```
+
+#### Lightpanda
+
+```ts
+import { lightpanda } from "@trigger.dev/build/extensions/lightpanda";
+
+extensions: [
+  lightpanda({
+    version: "latest", // or "nightly"
+    disableTelemetry: false,
+  }),
+];
+```
+
+### Media Processing
+
+#### FFmpeg
+
+```ts
+import { ffmpeg } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  ffmpeg({ version: "7" }), // Static build, or omit for Debian version
+];
+
+// Automatically sets FFMPEG_PATH and FFPROBE_PATH
+// Add fluent-ffmpeg to external packages if using
+```
+
+#### Audio Waveform
+
+```ts
+import { audioWaveform } from "@trigger.dev/build/extensions/audioWaveform";
+
+extensions: [
+  audioWaveform(), // Installs Audio Waveform 1.1.0
+];
+```
+
+### System & Package Management
+
+#### System Packages (apt-get)
+
+```ts
+import { aptGet } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  aptGet({
+    packages: ["ffmpeg", "imagemagick", "curl=7.68.0-1"], // Can specify versions
+  }),
+];
+```
+
+#### Additional NPM Packages
+
+Only use this for installing CLI tools, NOT packages you import in your code.
+
+```ts
+import { additionalPackages } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  additionalPackages({
+    packages: ["wrangler"], // CLI tools and specific versions
+  }),
+];
+```
+
+#### Additional Files
+
+```ts
+import { additionalFiles } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  additionalFiles({
+    files: ["wrangler.toml", "./assets/**", "./fonts/**"], // Glob patterns supported
+  }),
+];
+```
+
+### Environment & Build Tools
+
+#### Environment Variable Sync
+
+```ts
+import { syncEnvVars } from "@trigger.dev/build/extensions/core";
+
+extensions: [
+  syncEnvVars(async (ctx) => {
+    // ctx contains: environment, projectRef, env
+    return [
+      { name: "SECRET_KEY", value: await getSecret(ctx.environment) },
+      { name: "API_URL", value: ctx.environment === "prod" ? "api.prod.com" : "api.dev.com" },
+    ];
+  }),
+];
+```
+
+#### ESBuild Plugins
+
+```ts
+import { esbuildPlugin } from "@trigger.dev/build/extensions";
+import { sentryEsbuildPlugin } from "@sentry/esbuild-plugin";
+
+extensions: [
+  esbuildPlugin(
+    sentryEsbuildPlugin({
+      org: process.env.SENTRY_ORG,
+      project: process.env.SENTRY_PROJECT,
+      authToken: process.env.SENTRY_AUTH_TOKEN,
+    }),
+    { placement: "last", target: "deploy" } // Optional config
+  ),
+];
+```
+
+## Custom Build Extensions
+
+```ts
+import { defineConfig } from "@trigger.dev/sdk";
+
+const customExtension = {
+  name: "my-custom-extension",
+
+  externalsForTarget: (target) => {
+    return ["some-native-module"]; // Add external dependencies
+  },
+
+  onBuildStart: async (context) => {
+    console.log(`Build starting for ${context.target}`);
+    // Register esbuild plugins, modify build context
+  },
+
+  onBuildComplete: async (context, manifest) => {
+    console.log("Build complete, adding layers");
+    // Add build layers, modify deployment
+    context.addLayer({
+      id: "my-layer",
+      files: [{ source: "./custom-file", destination: "/app/custom" }],
+      commands: ["chmod +x /app/custom"],
+    });
+  },
+};
+
+export default defineConfig({
+  project: "my-project",
+  build: {
+    extensions: [customExtension],
+  },
+});
+```
+
+## Advanced Configuration
+
+### Telemetry
+
+```ts
+import { PrismaInstrumentation } from "@prisma/instrumentation";
+import { OpenAIInstrumentation } from "@langfuse/openai";
+
+export default defineConfig({
+  // ... other config
+  telemetry: {
+    instrumentations: [new PrismaInstrumentation(), new OpenAIInstrumentation()],
+    exporters: [customExporter], // Optional custom exporters
+  },
+});
+```
+
+### Machine & Performance
+
+```ts
+export default defineConfig({
+  // ... other config
+  defaultMachine: "large-1x", // Default machine for all tasks
+  maxDuration: 300, // Default max duration (seconds)
+  enableConsoleLogging: true, // Console logging in development
+});
+```
+
+## Common Extension Combinations
+
+### Full-Stack Web App
+
+```ts
+extensions: [
+  prismaExtension({ schema: "prisma/schema.prisma", migrate: true }),
+  additionalFiles({ files: ["./public/**", "./assets/**"] }),
+  syncEnvVars(async (ctx) => [...envVars]),
+];
+```
+
+### AI/ML Processing
+
+```ts
+extensions: [
+  pythonExtension({
+    scripts: ["./ai/**/*.py"],
+    requirementsFile: "./requirements.txt",
+  }),
+  ffmpeg({ version: "7" }),
+  additionalPackages({ packages: ["wrangler"] }),
+];
+```
+
+### Web Scraping
+
+```ts
+extensions: [
+  playwright({ browsers: ["chromium"] }),
+  puppeteer(),
+  additionalFiles({ files: ["./selectors.json", "./proxies.txt"] }),
+];
+```
+
+## Best Practices
+
+- **Use specific versions**: Pin extension versions for reproducible builds
+- **External packages**: Add modules with native addons to the `build.external` array
+- **Environment sync**: Use `syncEnvVars` for dynamic secrets
+- **File paths**: Use glob patterns for flexible file inclusion
+- **Debug builds**: Use `--log-level debug --dry-run` for troubleshooting
+
+Extensions only affect deployment, not local development. Use `external` array for packages that shouldn't be bundled.
diff --git a/rules/4.1.0/realtime.md b/rules/4.1.0/realtime.md
new file mode 100644
index 00000000000..7368e5a7080
--- /dev/null
+++ b/rules/4.1.0/realtime.md
@@ -0,0 +1,266 @@
+# Trigger.dev Realtime (v4)
+
+**Real-time monitoring and updates for runs**
+
+## Core Concepts
+
+Realtime allows you to:
+
+- Subscribe to run status changes, metadata updates, and streams
+- Build real-time dashboards and UI updates
+- Monitor task progress from frontend and backend
+
+## Authentication
+
+### Public Access Tokens
+
+```ts
+import { auth } from "@trigger.dev/sdk";
+
+// Read-only token for specific runs
+const publicToken = await auth.createPublicToken({
+  scopes: {
+    read: {
+      runs: ["run_123", "run_456"],
+      tasks: ["my-task-1", "my-task-2"],
+    },
+  },
+  expirationTime: "1h", // Default: 15 minutes
+});
+```
+
+### Trigger Tokens (Frontend only)
+
+```ts
+// Single-use token for triggering tasks
+const triggerToken = await auth.createTriggerPublicToken("my-task", {
+  expirationTime: "30m",
+});
+```
+
+## Backend Usage
+
+### Subscribe to Runs
+
+```ts
+import { runs, tasks } from "@trigger.dev/sdk";
+
+// Trigger and subscribe
+const handle = await tasks.trigger("my-task", { data: "value" });
+
+// Subscribe to specific run
+for await (const run of runs.subscribeToRun<typeof myTask>(handle.id)) {
+  console.log(`Status: ${run.status}, Progress: ${run.metadata?.progress}`);
+  if (run.status === "COMPLETED") break;
+}
+
+// Subscribe to runs with tag
+for await (const run of runs.subscribeToRunsWithTag("user-123")) {
+  console.log(`Tagged run ${run.id}: ${run.status}`);
+}
+
+// Subscribe to batch
+for await (const run of runs.subscribeToBatch(batchId)) {
+  console.log(`Batch run ${run.id}: ${run.status}`);
+}
+```
+
+### Realtime Streams v2 (Recommended)
+
+```ts
+import { streams, InferStreamType } from "@trigger.dev/sdk";
+
+// 1. Define streams (shared location)
+export const aiStream = streams.define<string>({
+  id: "ai-output",
+});
+
+export type AIStreamPart = InferStreamType<typeof aiStream>;
+
+// 2. Pipe from task
+export const streamingTask = task({
+  id: "streaming-task",
+  run: async (payload) => {
+    const completion = await openai.chat.completions.create({
+      model: "gpt-4",
+      messages: [{ role: "user", content: payload.prompt }],
+      stream: true,
+    });
+
+    const { waitUntilComplete } = aiStream.pipe(completion);
+    await waitUntilComplete();
+  },
+});
+
+// 3. Read from backend
+const stream = await aiStream.read(runId, {
+  timeoutInSeconds: 300,
+  startIndex: 0, // Resume from specific chunk
+});
+
+for await (const chunk of stream) {
+  console.log("Chunk:", chunk); // Fully typed
+}
+```
+
+Enable v2 by upgrading to 4.1.0 or later.
+
+## React Frontend Usage
+
+### Installation
+
+```bash
+npm add @trigger.dev/react-hooks
+```
+
+### Triggering Tasks
+
+```tsx
+"use client";
+import { useTaskTrigger, useRealtimeTaskTrigger } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function TriggerComponent({ accessToken }: { accessToken: string }) {
+  // Basic trigger
+  const { submit, handle, isLoading } = useTaskTrigger<typeof myTask>("my-task", {
+    accessToken,
+  });
+
+  // Trigger with realtime updates
+  const {
+    submit: realtimeSubmit,
+    run,
+    isLoading: isRealtimeLoading,
+  } = useRealtimeTaskTrigger<typeof myTask>("my-task", { accessToken });
+
+  return (
+    <div>
+      <button onClick={() => submit({ data: "value" })} disabled={isLoading}>
+        Trigger Task
+      </button>
+
+      <button onClick={() => realtimeSubmit({ data: "realtime" })} disabled={isRealtimeLoading}>
+        Trigger with Realtime
+      </button>
+
+      {run && <div>Status: {run.status}</div>}
+    </div>
+  );
+}
+```
+
+### Subscribing to Runs
+
+```tsx
+"use client";
+import { useRealtimeRun, useRealtimeRunsWithTag } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function SubscribeComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  // Subscribe to specific run
+  const { run, error } = useRealtimeRun<typeof myTask>(runId, {
+    accessToken,
+    onComplete: (run) => {
+      console.log("Task completed:", run.output);
+    },
+  });
+
+  // Subscribe to tagged runs
+  const { runs } = useRealtimeRunsWithTag("user-123", { accessToken });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!run) return <div>Loading...</div>;
+
+  return (
+    <div>
+      <div>Status: {run.status}</div>
+      <div>Progress: {run.metadata?.progress || 0}%</div>
+      {run.output && <div>Result: {JSON.stringify(run.output)}</div>}
+
+      <h3>Tagged Runs:</h3>
+      {runs.map((r) => (
+        <div key={r.id}>
+          {r.id}: {r.status}
+        </div>
+      ))}
+    </div>
+  );
+}
+```
+
+### Realtime Streams with React
+
+```tsx
+"use client";
+import { useRealtimeStream } from "@trigger.dev/react-hooks";
+import { aiStream } from "../trigger/streams";
+
+function StreamComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  // Pass defined stream directly for type safety
+  const { parts, error } = useRealtimeStream(aiStream, runId, {
+    accessToken,
+    timeoutInSeconds: 300,
+    throttleInMs: 50, // Control re-render frequency
+  });
+
+  if (error) return <div>Error: {error.message}</div>;
+  if (!parts) return <div>Loading...</div>;
+
+  const text = parts.join(""); // parts is typed as AIStreamPart[]
+
+  return <div>Streamed Text: {text}</div>;
+}
+```
+
+### Wait Tokens
+
+```tsx
+"use client";
+import { useWaitToken } from "@trigger.dev/react-hooks";
+
+function WaitTokenComponent({ tokenId, accessToken }: { tokenId: string; accessToken: string }) {
+  const { complete } = useWaitToken(tokenId, { accessToken });
+
+  return <button onClick={() => complete({ approved: true })}>Approve Task</button>;
+}
+```
+
+### SWR Hooks (Fetch Once)
+
+```tsx
+"use client";
+import { useRun } from "@trigger.dev/react-hooks";
+import type { myTask } from "../trigger/tasks";
+
+function SWRComponent({ runId, accessToken }: { runId: string; accessToken: string }) {
+  const { run, error, isLoading } = useRun<typeof myTask>(runId, {
+    accessToken,
+    refreshInterval: 0, // Disable polling (recommended)
+  });
+
+  if (isLoading) return <div>Loading...</div>;
+  if (error) return <div>Error: {error.message}</div>;
+
+  return <div>Run: {run?.status}</div>;
+}
+```
+
+## Run Object Properties
+
+Key properties available in run subscriptions:
+
+- `id`: Unique run identifier
+- `status`: `QUEUED`, `EXECUTING`, `COMPLETED`, `FAILED`, `CANCELED`, etc.
+- `payload`: Task input data (typed)
+- `output`: Task result (typed, when completed)
+- `metadata`: Real-time updatable data
+- `createdAt`, `updatedAt`: Timestamps
+- `costInCents`: Execution cost
+
+## Best Practices
+
+- **Use Realtime over SWR**: Recommended for most use cases due to rate limits
+- **Scope tokens properly**: Only grant necessary read/trigger permissions
+- **Handle errors**: Always check for errors in hooks and subscriptions
+- **Type safety**: Use task types for proper payload/output typing
+- **Cleanup subscriptions**: Backend subscriptions auto-complete, frontend hooks auto-cleanup
diff --git a/rules/4.3.0/advanced-tasks.md b/rules/4.3.0/advanced-tasks.md
new file mode 100644
index 00000000000..32a00337f89
--- /dev/null
+++ b/rules/4.3.0/advanced-tasks.md
@@ -0,0 +1,485 @@
+# Trigger.dev Advanced Tasks (v4)
+
+**Advanced patterns and features for writing tasks**
+
+## Tags & Organization
+
+```ts
+import { task, tags } from "@trigger.dev/sdk";
+
+export const processUser = task({
+  id: "process-user",
+  run: async (payload: { userId: string; orgId: string }, { ctx }) => {
+    // Add tags during execution
+    await tags.add(`user_${payload.userId}`);
+    await tags.add(`org_${payload.orgId}`);
+
+    return { processed: true };
+  },
+});
+
+// Trigger with tags
+await processUser.trigger(
+  { userId: "123", orgId: "abc" },
+  { tags: ["priority", "user_123", "org_abc"] } // Max 10 tags per run
+);
+
+// Subscribe to tagged runs
+for await (const run of runs.subscribeToRunsWithTag("user_123")) {
+  console.log(`User task ${run.id}: ${run.status}`);
+}
+```
+
+**Tag Best Practices:**
+
+- Use prefixes: `user_123`, `org_abc`, `video:456`
+- Max 10 tags per run, 1-64 characters each
+- Tags don't propagate to child tasks automatically
+
+## Batch Triggering v2
+
+Enhanced batch triggering with larger payloads and streaming ingestion.
+
+### Limits
+
+- **Maximum batch size**: 1,000 items (increased from 500)
+- **Payload per item**: 3MB each (increased from 1MB combined)
+- Payloads > 512KB automatically offload to object storage
+
+### Rate Limiting (per environment)
+
+| Tier | Bucket Size | Refill Rate |
+|------|-------------|-------------|
+| Free | 1,200 runs | 100 runs/10 sec |
+| Hobby | 5,000 runs | 500 runs/5 sec |
+| Pro | 5,000 runs | 500 runs/5 sec |
+
+### Concurrent Batch Processing
+
+| Tier | Concurrent Batches |
+|------|-------------------|
+| Free | 1 |
+| Hobby | 10 |
+| Pro | 10 |
+
+### Usage
+
+```ts
+import { myTask } from "./trigger/myTask";
+
+// Basic batch trigger (up to 1,000 items)
+const runs = await myTask.batchTrigger([
+  { payload: { userId: "user-1" } },
+  { payload: { userId: "user-2" } },
+  { payload: { userId: "user-3" } },
+]);
+
+// Batch trigger with wait
+const results = await myTask.batchTriggerAndWait([
+  { payload: { userId: "user-1" } },
+  { payload: { userId: "user-2" } },
+]);
+
+for (const result of results) {
+  if (result.ok) {
+    console.log("Result:", result.output);
+  }
+}
+
+// With per-item options
+const batchHandle = await myTask.batchTrigger([
+  {
+    payload: { userId: "123" },
+    options: {
+      idempotencyKey: "user-123-batch",
+      tags: ["priority"],
+    },
+  },
+  {
+    payload: { userId: "456" },
+    options: {
+      idempotencyKey: "user-456-batch",
+    },
+  },
+]);
+```
+
+## Debouncing
+
+Consolidate multiple triggers into a single execution by debouncing task runs with a unique key and delay window.
+
+### Use Cases
+
+- **User activity updates**: Batch rapid user actions into a single run
+- **Webhook deduplication**: Handle webhook bursts without redundant processing
+- **Search indexing**: Combine document updates instead of processing individually
+- **Notification batching**: Group notifications to prevent user spam
+
+### Basic Usage
+
+```ts
+await myTask.trigger(
+  { userId: "123" },
+  {
+    debounce: {
+      key: "user-123-update",  // Unique identifier for debounce group
+      delay: "5s",              // Wait duration ("5s", "1m", or milliseconds)
+    },
+  }
+);
+```
+
+### Execution Modes
+
+**Leading Mode** (default): Uses payload/options from the first trigger; subsequent triggers only reschedule execution time.
+
+```ts
+// First trigger sets the payload
+await myTask.trigger({ action: "first" }, {
+  debounce: { key: "my-key", delay: "10s" }
+});
+
+// Second trigger only reschedules - payload remains "first"
+await myTask.trigger({ action: "second" }, {
+  debounce: { key: "my-key", delay: "10s" }
+});
+// Task executes with { action: "first" }
+```
+
+**Trailing Mode**: Uses payload/options from the most recent trigger.
+
+```ts
+await myTask.trigger(
+  { data: "latest-value" },
+  {
+    debounce: {
+      key: "trailing-example",
+      delay: "10s",
+      mode: "trailing",
+    },
+  }
+);
+```
+
+In trailing mode, these options update with each trigger:
+- `payload` — task input data
+- `metadata` — run metadata
+- `tags` — run tags (replaces existing)
+- `maxAttempts` — retry attempts
+- `maxDuration` — maximum compute time
+- `machine` — machine preset
+
+### Important Notes
+
+- Idempotency keys take precedence over debounce settings
+- Compatible with `triggerAndWait()` — parent runs block correctly on debounced execution
+- Debounce key is scoped to the task
+
+## Concurrency & Queues
+
+```ts
+import { task, queue } from "@trigger.dev/sdk";
+
+// Shared queue for related tasks
+const emailQueue = queue({
+  name: "email-processing",
+  concurrencyLimit: 5, // Max 5 emails processing simultaneously
+});
+
+// Task-level concurrency
+export const oneAtATime = task({
+  id: "sequential-task",
+  queue: { concurrencyLimit: 1 }, // Process one at a time
+  run: async (payload) => {
+    // Critical section - only one instance runs
+  },
+});
+
+// Per-user concurrency
+export const processUserData = task({
+  id: "process-user-data",
+  run: async (payload: { userId: string }) => {
+    // Override queue with user-specific concurrency
+    await childTask.trigger(payload, {
+      queue: {
+        name: `user-${payload.userId}`,
+        concurrencyLimit: 2,
+      },
+    });
+  },
+});
+
+export const emailTask = task({
+  id: "send-email",
+  queue: emailQueue, // Use shared queue
+  run: async (payload: { to: string }) => {
+    // Send email logic
+  },
+});
+```
+
+## Error Handling & Retries
+
+```ts
+import { task, retry, AbortTaskRunError } from "@trigger.dev/sdk";
+
+export const resilientTask = task({
+  id: "resilient-task",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8, // Exponential backoff multiplier
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+    randomize: false,
+  },
+  catchError: async ({ error, ctx }) => {
+    // Custom error handling
+    if (error.code === "FATAL_ERROR") {
+      throw new AbortTaskRunError("Cannot retry this error");
+    }
+
+    // Log error details
+    console.error(`Task ${ctx.task.id} failed:`, error);
+
+    // Allow retry by returning nothing
+    return { retryAt: new Date(Date.now() + 60000) }; // Retry in 1 minute
+  },
+  run: async (payload) => {
+    // Retry specific operations
+    const result = await retry.onThrow(
+      async () => {
+        return await unstableApiCall(payload);
+      },
+      { maxAttempts: 3 }
+    );
+
+    // Conditional HTTP retries
+    const response = await retry.fetch("https://api.example.com", {
+      retry: {
+        maxAttempts: 5,
+        condition: (response, error) => {
+          return response?.status === 429 || response?.status >= 500;
+        },
+      },
+    });
+
+    return result;
+  },
+});
+```
+
+## Machines & Performance
+
+```ts
+export const heavyTask = task({
+  id: "heavy-computation",
+  machine: { preset: "large-2x" }, // 8 vCPU, 16 GB RAM
+  maxDuration: 1800, // 30 minutes timeout
+  run: async (payload, { ctx }) => {
+    // Resource-intensive computation
+    if (ctx.machine.preset === "large-2x") {
+      // Use all available cores
+      return await parallelProcessing(payload);
+    }
+
+    return await standardProcessing(payload);
+  },
+});
+
+// Override machine when triggering
+await heavyTask.trigger(payload, {
+  machine: { preset: "medium-1x" }, // Override for this run
+});
+```
+
+**Machine Presets:**
+
+- `micro`: 0.25 vCPU, 0.25 GB RAM
+- `small-1x`: 0.5 vCPU, 0.5 GB RAM (default)
+- `small-2x`: 1 vCPU, 1 GB RAM
+- `medium-1x`: 1 vCPU, 2 GB RAM
+- `medium-2x`: 2 vCPU, 4 GB RAM
+- `large-1x`: 4 vCPU, 8 GB RAM
+- `large-2x`: 8 vCPU, 16 GB RAM
+
+## Idempotency
+
+```ts
+import { task, idempotencyKeys } from "@trigger.dev/sdk";
+
+export const paymentTask = task({
+  id: "process-payment",
+  retry: {
+    maxAttempts: 3,
+  },
+  run: async (payload: { orderId: string; amount: number }) => {
+    // Automatically scoped to this task run, so if the task is retried, the idempotency key will be the same
+    const idempotencyKey = await idempotencyKeys.create(`payment-${payload.orderId}`);
+
+    // Ensure payment is processed only once
+    await chargeCustomer.trigger(payload, {
+      idempotencyKey,
+      idempotencyKeyTTL: "24h", // Key expires in 24 hours
+    });
+  },
+});
+
+// Payload-based idempotency
+import { createHash } from "node:crypto";
+
+function createPayloadHash(payload: any): string {
+  const hash = createHash("sha256");
+  hash.update(JSON.stringify(payload));
+  return hash.digest("hex");
+}
+
+export const deduplicatedTask = task({
+  id: "deduplicated-task",
+  run: async (payload) => {
+    const payloadHash = createPayloadHash(payload);
+    const idempotencyKey = await idempotencyKeys.create(payloadHash);
+
+    await processData.trigger(payload, { idempotencyKey });
+  },
+});
+```
+
+## Metadata & Progress Tracking
+
+```ts
+import { task, metadata } from "@trigger.dev/sdk";
+
+export const batchProcessor = task({
+  id: "batch-processor",
+  run: async (payload: { items: any[] }, { ctx }) => {
+    const totalItems = payload.items.length;
+
+    // Initialize progress metadata
+    metadata
+      .set("progress", 0)
+      .set("totalItems", totalItems)
+      .set("processedItems", 0)
+      .set("status", "starting");
+
+    const results = [];
+
+    for (let i = 0; i < payload.items.length; i++) {
+      const item = payload.items[i];
+
+      // Process item
+      const result = await processItem(item);
+      results.push(result);
+
+      // Update progress
+      const progress = ((i + 1) / totalItems) * 100;
+      metadata
+        .set("progress", progress)
+        .increment("processedItems", 1)
+        .append("logs", `Processed item ${i + 1}/${totalItems}`)
+        .set("currentItem", item.id);
+    }
+
+    // Final status
+    metadata.set("status", "completed");
+
+    return { results, totalProcessed: results.length };
+  },
+});
+
+// Update parent metadata from child task
+export const childTask = task({
+  id: "child-task",
+  run: async (payload, { ctx }) => {
+    // Update parent task metadata
+    metadata.parent.set("childStatus", "processing");
+    metadata.root.increment("childrenCompleted", 1);
+
+    return { processed: true };
+  },
+});
+```
+
+## Logging & Tracing
+
+```ts
+import { task, logger } from "@trigger.dev/sdk";
+
+export const tracedTask = task({
+  id: "traced-task",
+  run: async (payload, { ctx }) => {
+    logger.info("Task started", { userId: payload.userId });
+
+    // Custom trace with attributes
+    const user = await logger.trace(
+      "fetch-user",
+      async (span) => {
+        span.setAttribute("user.id", payload.userId);
+        span.setAttribute("operation", "database-fetch");
+
+        const userData = await database.findUser(payload.userId);
+        span.setAttribute("user.found", !!userData);
+
+        return userData;
+      },
+      { userId: payload.userId }
+    );
+
+    logger.debug("User fetched", { user: user.id });
+
+    try {
+      const result = await processUser(user);
+      logger.info("Processing completed", { result });
+      return result;
+    } catch (error) {
+      logger.error("Processing failed", {
+        error: error.message,
+        userId: payload.userId,
+      });
+      throw error;
+    }
+  },
+});
+```
+
+## Hidden Tasks
+
+```ts
+// Hidden task - not exported, only used internally
+const internalProcessor = task({
+  id: "internal-processor",
+  run: async (payload: { data: string }) => {
+    return { processed: payload.data.toUpperCase() };
+  },
+});
+
+// Public task that uses hidden task
+export const publicWorkflow = task({
+  id: "public-workflow",
+  run: async (payload: { input: string }) => {
+    // Use hidden task internally
+    const result = await internalProcessor.triggerAndWait({
+      data: payload.input,
+    });
+
+    if (result.ok) {
+      return { output: result.output.processed };
+    }
+
+    throw new Error("Internal processing failed");
+  },
+});
+```
+
+## Best Practices
+
+- **Concurrency**: Use queues to prevent overwhelming external services
+- **Retries**: Configure exponential backoff for transient failures
+- **Idempotency**: Always use for payment/critical operations
+- **Metadata**: Track progress for long-running tasks
+- **Machines**: Match machine size to computational requirements
+- **Tags**: Use consistent naming patterns for filtering
+- **Debouncing**: Use for user activity, webhooks, and notification batching
+- **Batch triggering**: Use for bulk operations up to 1,000 items
+- **Error Handling**: Distinguish between retryable and fatal errors
+
+Design tasks to be stateless, idempotent, and resilient to failures. Use metadata for state tracking and queues for resource management.
diff --git a/rules/4.3.0/basic-tasks.md b/rules/4.3.0/basic-tasks.md
new file mode 100644
index 00000000000..56bff340761
--- /dev/null
+++ b/rules/4.3.0/basic-tasks.md
@@ -0,0 +1,199 @@
+# Trigger.dev Basic Tasks (v4)
+
+**MUST use `@trigger.dev/sdk`, NEVER `client.defineJob`**
+
+## Basic Task
+
+```ts
+import { task } from "@trigger.dev/sdk";
+
+export const processData = task({
+  id: "process-data",
+  retry: {
+    maxAttempts: 10,
+    factor: 1.8,
+    minTimeoutInMs: 500,
+    maxTimeoutInMs: 30_000,
+    randomize: false,
+  },
+  run: async (payload: { userId: string; data: any[] }) => {
+    // Task logic - runs for long time, no timeouts
+    console.log(`Processing ${payload.data.length} items for user ${payload.userId}`);
+    return { processed: payload.data.length };
+  },
+});
+```
+
+## Schema Task (with validation)
+
+```ts
+import { schemaTask } from "@trigger.dev/sdk";
+import { z } from "zod";
+
+export const validatedTask = schemaTask({
+  id: "validated-task",
+  schema: z.object({
+    name: z.string(),
+    age: z.number(),
+    email: z.string().email(),
+  }),
+  run: async (payload) => {
+    // Payload is automatically validated and typed
+    return { message: `Hello ${payload.name}, age ${payload.age}` };
+  },
+});
+```
+
+## Triggering Tasks
+
+### From Backend Code
+
+```ts
+import { tasks } from "@trigger.dev/sdk";
+import type { processData } from "./trigger/tasks";
+
+// Single trigger
+const handle = await tasks.trigger<typeof processData>("process-data", {
+  userId: "123",
+  data: [{ id: 1 }, { id: 2 }],
+});
+
+// Batch trigger (up to 1,000 items, 3MB per payload)
+const batchHandle = await tasks.batchTrigger<typeof processData>("process-data", [
+  { payload: { userId: "123", data: [{ id: 1 }] } },
+  { payload: { userId: "456", data: [{ id: 2 }] } },
+]);
+```
+
+### Debounced Triggering
+
+Consolidate multiple triggers into a single execution:
+
+```ts
+// Multiple rapid triggers with same key = single execution
+await myTask.trigger(
+  { userId: "123" },
+  {
+    debounce: {
+      key: "user-123-update",  // Unique key for debounce group
+      delay: "5s",              // Wait before executing
+    },
+  }
+);
+
+// Trailing mode: use payload from LAST trigger
+await myTask.trigger(
+  { data: "latest-value" },
+  {
+    debounce: {
+      key: "trailing-example",
+      delay: "10s",
+      mode: "trailing",  // Default is "leading" (first payload)
+    },
+  }
+);
+```
+
+**Debounce modes:**
+- `leading` (default): Uses payload from first trigger, subsequent triggers only reschedule
+- `trailing`: Uses payload from most recent trigger
+
+### From Inside Tasks (with Result handling)
+
+```ts
+export const parentTask = task({
+  id: "parent-task",
+  run: async (payload) => {
+    // Trigger and continue
+    const handle = await childTask.trigger({ data: "value" });
+
+    // Trigger and wait - returns Result object, NOT task output
+    const result = await childTask.triggerAndWait({ data: "value" });
+    if (result.ok) {
+      console.log("Task output:", result.output); // Actual task return value
+    } else {
+      console.error("Task failed:", result.error);
+    }
+
+    // Quick unwrap (throws on error)
+    const output = await childTask.triggerAndWait({ data: "value" }).unwrap();
+
+    // Batch trigger and wait
+    const results = await childTask.batchTriggerAndWait([
+      { payload: { data: "item1" } },
+      { payload: { data: "item2" } },
+    ]);
+
+    for (const run of results) {
+      if (run.ok) {
+        console.log("Success:", run.output);
+      } else {
+        console.log("Failed:", run.error);
+      }
+    }
+  },
+});
+
+export const childTask = task({
+  id: "child-task",
+  run: async (payload: { data: string }) => {
+    return { processed: payload.data };
+  },
+});
+```
+
+> Never wrap triggerAndWait or batchTriggerAndWait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Waits
+
+```ts
+import { task, wait } from "@trigger.dev/sdk";
+
+export const taskWithWaits = task({
+  id: "task-with-waits",
+  run: async (payload) => {
+    console.log("Starting task");
+
+    // Wait for specific duration
+    await wait.for({ seconds: 30 });
+    await wait.for({ minutes: 5 });
+    await wait.for({ hours: 1 });
+    await wait.for({ days: 1 });
+
+    // Wait until specific date
+    await wait.until({ date: new Date("2024-12-25") });
+
+    // Wait for token (from external system)
+    await wait.forToken({
+      token: "user-approval-token",
+      timeoutInSeconds: 3600, // 1 hour timeout
+    });
+
+    console.log("All waits completed");
+    return { status: "completed" };
+  },
+});
+```
+
+> Never wrap wait calls in a Promise.all or Promise.allSettled as this is not supported in Trigger.dev tasks.
+
+## Key Points
+
+- **Result vs Output**: `triggerAndWait()` returns a `Result` object with `ok`, `output`, `error` properties - NOT the direct task output
+- **Type safety**: Use `import type` for task references when triggering from backend
+- **Waits > 5 seconds**: Automatically checkpointed, don't count toward compute usage
+- **Debounce + idempotency**: Idempotency keys take precedence over debounce settings
+
+## NEVER Use (v2 deprecated)
+
+```ts
+// BREAKS APPLICATION
+client.defineJob({
+  id: "job-id",
+  run: async (payload, io) => {
+    /* ... */
+  },
+});
+```
+
+Use SDK (`@trigger.dev/sdk`), check `result.ok` before accessing `result.output`
diff --git a/rules/manifest.json b/rules/manifest.json
new file mode 100644
index 00000000000..64d9a86139e
--- /dev/null
+++ b/rules/manifest.json
@@ -0,0 +1,154 @@
+{
+  "name": "trigger.dev",
+  "description": "Trigger.dev coding agent rules",
+  "currentVersion": "4.3.0",
+  "versions": {
+    "4.0.0": {
+      "options": [
+        {
+          "name": "basic",
+          "title": "Basic tasks",
+          "label": "Only the most important rules for writing basic Trigger.dev tasks",
+          "path": "4.0.0/basic-tasks.md",
+          "tokens": 1200
+        },
+        {
+          "name": "advanced-tasks",
+          "title": "Advanced tasks",
+          "label": "Comprehensive rules to help you write advanced Trigger.dev tasks",
+          "path": "4.0.0/advanced-tasks.md",
+          "tokens": 3000
+        },
+        {
+          "name": "config",
+          "title": "Configuring Trigger.dev",
+          "label": "Configure your Trigger.dev project with a trigger.config.ts file",
+          "path": "4.0.0/config.md",
+          "tokens": 1900,
+          "applyTo": "**/trigger.config.ts"
+        },
+        {
+          "name": "scheduled-tasks",
+          "title": "Scheduled Tasks",
+          "label": "How to write and use scheduled Trigger.dev tasks",
+          "path": "4.0.0/scheduled-tasks.md",
+          "tokens": 780
+        },
+        {
+          "name": "realtime",
+          "title": "Realtime",
+          "label": "How to use realtime in your Trigger.dev tasks and your frontend",
+          "path": "4.0.0/realtime.md",
+          "tokens": 1700
+        },
+        {
+          "name": "claude-code-agent",
+          "title": "Claude Code Agent",
+          "label": "An expert Trigger.dev developer as a Claude Code subagent",
+          "path": "4.0.0/claude-code-agent.md",
+          "tokens": 2700,
+          "client": "claude-code",
+          "installStrategy": "claude-code-subagent"
+        }
+      ]
+    },
+    "4.1.0": {
+      "options": [
+        {
+          "name": "basic",
+          "title": "Basic tasks",
+          "label": "Only the most important rules for writing basic Trigger.dev tasks",
+          "path": "4.0.0/basic-tasks.md",
+          "tokens": 1200
+        },
+        {
+          "name": "advanced-tasks",
+          "title": "Advanced tasks",
+          "label": "Comprehensive rules to help you write advanced Trigger.dev tasks",
+          "path": "4.0.0/advanced-tasks.md",
+          "tokens": 3000
+        },
+        {
+          "name": "config",
+          "title": "Configuring Trigger.dev",
+          "label": "Configure your Trigger.dev project with a trigger.config.ts file",
+          "path": "4.1.0/config.md",
+          "tokens": 1900,
+          "applyTo": "**/trigger.config.ts"
+        },
+        {
+          "name": "scheduled-tasks",
+          "title": "Scheduled Tasks",
+          "label": "How to write and use scheduled Trigger.dev tasks",
+          "path": "4.0.0/scheduled-tasks.md",
+          "tokens": 780
+        },
+        {
+          "name": "realtime",
+          "title": "Realtime",
+          "label": "How to use realtime in your Trigger.dev tasks and your frontend",
+          "path": "4.1.0/realtime.md",
+          "tokens": 1700
+        },
+        {
+          "name": "claude-code-agent",
+          "title": "Claude Code Agent",
+          "label": "An expert Trigger.dev developer as a Claude Code subagent",
+          "path": "4.0.0/claude-code-agent.md",
+          "tokens": 2700,
+          "client": "claude-code",
+          "installStrategy": "claude-code-subagent"
+        }
+      ]
+    },
+    "4.3.0": {
+      "options": [
+        {
+          "name": "basic",
+          "title": "Basic tasks",
+          "label": "Only the most important rules for writing basic Trigger.dev tasks",
+          "path": "4.3.0/basic-tasks.md",
+          "tokens": 1400
+        },
+        {
+          "name": "advanced-tasks",
+          "title": "Advanced tasks",
+          "label": "Comprehensive rules to help you write advanced Trigger.dev tasks",
+          "path": "4.3.0/advanced-tasks.md",
+          "tokens": 3500
+        },
+        {
+          "name": "config",
+          "title": "Configuring Trigger.dev",
+          "label": "Configure your Trigger.dev project with a trigger.config.ts file",
+          "path": "4.1.0/config.md",
+          "tokens": 1900,
+          "applyTo": "**/trigger.config.ts"
+        },
+        {
+          "name": "scheduled-tasks",
+          "title": "Scheduled Tasks",
+          "label": "How to write and use scheduled Trigger.dev tasks",
+          "path": "4.0.0/scheduled-tasks.md",
+          "tokens": 780
+        },
+        {
+          "name": "realtime",
+          "title": "Realtime",
+          "label": "How to use realtime in your Trigger.dev tasks and your frontend",
+          "path": "4.1.0/realtime.md",
+          "tokens": 1700
+        },
+        {
+          "name": "claude-code-agent",
+          "title": "Claude Code Agent",
+          "label": "An expert Trigger.dev developer as a Claude Code subagent",
+          "path": "4.0.0/claude-code-agent.md",
+          "tokens": 2700,
+          "client": "claude-code",
+          "installStrategy": "claude-code-subagent"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/scripts/batch-concurrency-cleaner.sh b/scripts/batch-concurrency-cleaner.sh
new file mode 100755
index 00000000000..b7cef3b50d7
--- /dev/null
+++ b/scripts/batch-concurrency-cleaner.sh
@@ -0,0 +1,180 @@
+#!/bin/bash
+#
+# Batch Queue Concurrency Cleaner
+#
+# Detects and cleans up stale concurrency entries that block batch processing.
+# This is a workaround for a bug where visibility timeout reclaims don't release concurrency.
+#
+# Uses a Lua script for ATOMIC detection of stale entries - no race conditions.
+#
+# Usage:
+#   ./batch-concurrency-cleaner.sh --read-redis <url> --write-redis <url> [--delay <seconds>] [--dry-run]
+#
+
+set -e
+
+# Defaults
+DELAY=10
+DRY_RUN=false
+READ_REDIS=""
+WRITE_REDIS=""
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --read-redis)
+      READ_REDIS="$2"
+      shift 2
+      ;;
+    --write-redis)
+      WRITE_REDIS="$2"
+      shift 2
+      ;;
+    --delay)
+      DELAY="$2"
+      shift 2
+      ;;
+    --dry-run)
+      DRY_RUN=true
+      shift
+      ;;
+    -h|--help)
+      echo "Usage: $0 --read-redis <url> --write-redis <url> [--delay <seconds>] [--dry-run]"
+      exit 0
+      ;;
+    *)
+      echo "Unknown option: $1"
+      exit 1
+      ;;
+  esac
+done
+
+if [[ -z "$READ_REDIS" ]] || [[ -z "$WRITE_REDIS" ]]; then
+  echo "Error: --read-redis and --write-redis are required"
+  exit 1
+fi
+
+echo "Batch Queue Concurrency Cleaner (Atomic Version)"
+echo "================================================="
+echo "Read Redis:  ${READ_REDIS:0:30}..."
+echo "Write Redis: ${WRITE_REDIS:0:30}..."
+echo "Delay:       ${DELAY}s"
+echo "Dry run:     $DRY_RUN"
+echo ""
+
+rcli_read() {
+  redis-cli -u "$READ_REDIS" --no-auth-warning "$@" 2>/dev/null
+}
+
+rcli_write() {
+  redis-cli -u "$WRITE_REDIS" --no-auth-warning "$@" 2>/dev/null
+}
+
+# Lua script that ATOMICALLY checks for stale concurrency entries
+# KEYS[1] = concurrency key to check
+# KEYS[2-13] = in-flight data hash keys for shards 0-11
+# Returns: list of stale messageIds (not in any in-flight hash)
+FIND_STALE_LUA='
+local concurrency_key = KEYS[1]
+local stale = {}
+
+-- Get all members of the concurrency set
+local members = redis.call("SMEMBERS", concurrency_key)
+
+for _, msg_id in ipairs(members) do
+  local found = false
+  -- Check each in-flight shard (KEYS[2] through KEYS[13])
+  for i = 2, 13 do
+    if redis.call("HEXISTS", KEYS[i], msg_id) == 1 then
+      found = true
+      break
+    end
+  end
+  if not found then
+    table.insert(stale, msg_id)
+  end
+end
+
+return stale
+'
+
+# Build the in-flight keys array (used in every Lua call)
+INFLIGHT_KEYS="engine:batch:inflight:0:data"
+for shard in 1 2 3 4 5 6 7 8 9 10 11; do
+  INFLIGHT_KEYS="$INFLIGHT_KEYS engine:batch:inflight:$shard:data"
+done
+
+# Main loop
+while true; do
+  ts=$(date '+%H:%M:%S')
+
+  # Get master queue total and in-flight count for status display
+  master_total=0
+  for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
+    count=$(rcli_read ZCARD "engine:batch:master:$i")
+    master_total=$((master_total + count))
+  done
+
+  inflight_total=0
+  for i in 0 1 2 3 4 5 6 7 8 9 10 11; do
+    count=$(rcli_read HLEN "engine:batch:inflight:$i:data")
+    inflight_total=$((inflight_total + count))
+  done
+
+  # Scan for concurrency keys
+  cursor=0
+  total_stale=0
+  cleaned_tenants=0
+
+  while true; do
+    scan_output=$(rcli_read SCAN $cursor MATCH 'engine:batch:concurrency:tenant:*' COUNT 1000)
+    cursor=$(echo "$scan_output" | head -1)
+    keys=$(echo "$scan_output" | tail -n +2)
+
+    while IFS= read -r conc_key; do
+      [[ -z "$conc_key" ]] && continue
+
+      # ATOMIC check: Run Lua script to find stale entries
+      # 13 keys total: 1 concurrency key + 12 in-flight keys
+      stale_ids=$(rcli_read EVAL "$FIND_STALE_LUA" 13 "$conc_key" $INFLIGHT_KEYS)
+
+      # Count stale entries
+      stale_count=0
+      stale_array=()
+      while IFS= read -r stale_id; do
+        [[ -z "$stale_id" ]] && continue
+        stale_array+=("$stale_id")
+        stale_count=$((stale_count + 1))
+      done <<< "$stale_ids"
+
+      if [[ $stale_count -gt 0 ]]; then
+        tenant="${conc_key#engine:batch:concurrency:tenant:}"
+        total_stale=$((total_stale + stale_count))
+
+        if [[ "$DRY_RUN" == "true" ]]; then
+          echo "[$ts] STALE (dry-run): $tenant ($stale_count entries)"
+          for sid in "${stale_array[@]}"; do
+            echo "       - $sid"
+          done
+        else
+          # Remove each stale entry individually with SREM (idempotent, safe)
+          for sid in "${stale_array[@]}"; do
+            rcli_write SREM "$conc_key" "$sid" >/dev/null
+          done
+          echo "[$ts] CLEANED: $tenant ($stale_count stale entries removed)"
+          cleaned_tenants=$((cleaned_tenants + 1))
+        fi
+      fi
+    done <<< "$keys"
+
+    [[ "$cursor" == "0" ]] && break
+  done
+
+  if [[ "$DRY_RUN" == "true" ]]; then
+    echo "[$ts] in-flight=$inflight_total master-queue=$master_total stale-found=$total_stale"
+  else
+    echo "[$ts] in-flight=$inflight_total master-queue=$master_total cleaned=$cleaned_tenants"
+  fi
+
+  sleep "$DELAY"
+done
diff --git a/scripts/publish-prerelease.sh b/scripts/publish-prerelease.sh
index 66602fb0690..cadcd65aad2 100755
--- a/scripts/publish-prerelease.sh
+++ b/scripts/publish-prerelease.sh
@@ -2,29 +2,8 @@
 
 set -e
 
-# Function to extract GITHUB_TOKEN from .env file
-extract_github_token() {
-    if [ -f .env ]; then
-        token=$(grep -E '^GITHUB_TOKEN=' .env | sed 's/^GITHUB_TOKEN=//' | sed 's/^"//' | sed 's/"$//')
-        if [ ! -z "$token" ]; then
-            export GITHUB_TOKEN="$token"
-        else
-            echo "GITHUB_TOKEN not found in .env file."
-            return 1
-        fi
-    else
-        echo "GITHUB_TOKEN not found in .env file."
-        return 1
-    fi
-}
-
-# Check if GITHUB_TOKEN is already set
-if [[ -z "${GITHUB_TOKEN}" ]]; then
-    extract_github_token || exit 1
-fi
-
 # Use the first argument as version or 'v3-prerelease' if not available
-version=${1:-'v3-prerelease'}
+version=${1:-'v4-prerelease'}
 
 # Ensure git stage is clear
 if [[ $(git status --porcelain) ]]; then
diff --git a/scripts/recover-stuck-runs.ts b/scripts/recover-stuck-runs.ts
new file mode 100755
index 00000000000..15deeb899c9
--- /dev/null
+++ b/scripts/recover-stuck-runs.ts
@@ -0,0 +1,367 @@
+#!/usr/bin/env tsx
+
+/**
+ * Recovery script for runs stuck in currentConcurrency with QUEUED execution status
+ *
+ * PROBLEM:
+ * During high database load, runs can get dequeued from Redis (added to currentConcurrency)
+ * but fail to update their execution status in the database. This leaves them stuck in an
+ * inconsistent state where they won't be re-dequeued because they're marked as "in progress"
+ * in Redis, but their database state still shows QUEUED.
+ *
+ * SOLUTION:
+ * This script identifies and recovers these stuck runs by:
+ * 1. Reading from the environment currentConcurrency Redis set
+ * 2. Checking which runs have QUEUED execution status (inconsistent state)
+ * 3. Re-adding them to their specific queue sorted sets
+ * 4. Removing them from the queue-specific currentConcurrency sets
+ * 5. Removing them from the environment-level currentConcurrency set
+ *
+ * SAFETY:
+ * - Dry-run mode when no write Redis URL is provided (read-only, no writes)
+ * - Uses separate Redis connections for reads and writes
+ * - Write connection only created when redisWriteUrl is provided
+ *
+ * ARGUMENTS:
+ *   <environmentId>   The Trigger.dev environment ID (e.g., env_abc123)
+ *   <postgresUrl>     PostgreSQL connection string
+ *   <redisReadUrl>    Redis connection string for reads (redis:// or rediss://)
+ *   [redisWriteUrl]   Optional Redis connection string for writes (omit for dry-run)
+ *
+ * USAGE:
+ *   tsx scripts/recover-stuck-runs.ts <environmentId> <postgresUrl> <redisReadUrl> [redisWriteUrl]
+ *
+ * EXAMPLES:
+ *
+ *   Dry-run mode (safe, no writes):
+ *   tsx scripts/recover-stuck-runs.ts env_1234567890 \
+ *     "postgresql://user:pass@localhost:5432/triggerdev" \
+ *     "redis://readonly.example.com:6379"
+ *
+ *   Execute mode (makes actual changes):
+ *   tsx scripts/recover-stuck-runs.ts env_1234567890 \
+ *     "postgresql://user:pass@localhost:5432/triggerdev" \
+ *     "redis://readonly.example.com:6379" \
+ *     "redis://writeonly.example.com:6379"
+ */
+
+import { PrismaClient, TaskRunExecutionStatus } from "@trigger.dev/database";
+import { createRedisClient } from "@internal/redis";
+
+interface StuckRun {
+  runId: string;
+  orgId: string;
+  projectId: string;
+  environmentId: string;
+  queue: string;
+  concurrencyKey: string | null;
+  executionStatus: TaskRunExecutionStatus;
+  snapshotCreatedAt: Date;
+  taskIdentifier: string;
+}
+
+interface RedisOperation {
+  type: "ZADD" | "SREM";
+  key: string;
+  args: (string | number)[];
+  description: string;
+}
+
+async function main() {
+  const [environmentId, postgresUrl, redisReadUrl, redisWriteUrl] = process.argv.slice(2);
+
+  if (!environmentId || !postgresUrl || !redisReadUrl) {
+    console.error("Usage: tsx scripts/recover-stuck-runs.ts <environmentId> <postgresUrl> <redisReadUrl> [redisWriteUrl]");
+    console.error("");
+    console.error("Dry-run mode when no redisWriteUrl is provided (read-only).");
+    console.error("Execute mode when redisWriteUrl is provided (makes actual changes).");
+    console.error("");
+    console.error("Example (dry-run):");
+    console.error('  tsx scripts/recover-stuck-runs.ts env_1234567890 \\');
+    console.error('    "postgresql://user:pass@localhost:5432/triggerdev" \\');
+    console.error('    "redis://readonly.example.com:6379"');
+    console.error("");
+    console.error("Example (execute):");
+    console.error('  tsx scripts/recover-stuck-runs.ts env_1234567890 \\');
+    console.error('    "postgresql://user:pass@localhost:5432/triggerdev" \\');
+    console.error('    "redis://readonly.example.com:6379" \\');
+    console.error('    "redis://writeonly.example.com:6379"');
+    process.exit(1);
+  }
+
+  const executeMode = !!redisWriteUrl;
+
+  if (executeMode) {
+    console.log("⚠️  EXECUTE MODE - Changes will be made to Redis\n");
+  } else {
+    console.log("🔍 DRY RUN MODE - No changes will be made to Redis\n");
+  }
+
+  console.log(`🔍 Scanning for stuck runs in environment: ${environmentId}`);
+
+  // Create Prisma client with the provided connection URL
+  const prisma = new PrismaClient({
+    datasources: {
+      db: {
+        url: postgresUrl,
+      },
+    },
+  });
+
+  try {
+    // Get environment details
+    const environment = await prisma.runtimeEnvironment.findUnique({
+      where: { id: environmentId },
+      include: {
+        organization: true,
+        project: true,
+      },
+    });
+
+    if (!environment) {
+      console.error(`❌ Environment not found: ${environmentId}`);
+      process.exit(1);
+    }
+
+    console.log(`📍 Environment: ${environment.slug} (${environment.type})`);
+    console.log(`📍 Organization: ${environment.organization.slug}`);
+    console.log(`📍 Project: ${environment.project.slug}`);
+
+    // Parse Redis read URL
+    const redisReadUrlObj = new URL(redisReadUrl);
+    const redisReadOptions = {
+      host: redisReadUrlObj.hostname,
+      port: parseInt(redisReadUrlObj.port || "6379"),
+      username: redisReadUrlObj.username || undefined,
+      password: redisReadUrlObj.password || undefined,
+      enableAutoPipelining: false,
+      ...(redisReadUrlObj.protocol === "rediss:"
+        ? {
+            tls: {
+              // If connecting via localhost tunnel to a remote Redis, disable cert verification
+              rejectUnauthorized: redisReadUrlObj.hostname === "localhost" ? false : true,
+            },
+          }
+        : {}),
+    };
+
+    // Create Redis read client
+    const redisRead = createRedisClient(redisReadOptions);
+
+    // Create Redis write client if redisWriteUrl is provided
+    let redisWrite = null;
+    if (redisWriteUrl) {
+      const redisWriteUrlObj = new URL(redisWriteUrl);
+      const redisWriteOptions = {
+        host: redisWriteUrlObj.hostname,
+        port: parseInt(redisWriteUrlObj.port || "6379"),
+        username: redisWriteUrlObj.username || undefined,
+        password: redisWriteUrlObj.password || undefined,
+        enableAutoPipelining: false,
+        ...(redisWriteUrlObj.protocol === "rediss:"
+          ? {
+              tls: {
+                // If connecting via localhost tunnel to a remote Redis, disable cert verification
+                rejectUnauthorized: redisWriteUrlObj.hostname === "localhost" ? false : true,
+              },
+            }
+          : {}),
+      };
+      redisWrite = createRedisClient(redisWriteOptions);
+    }
+
+    try {
+      // Build the Redis key for environment-level currentConcurrency set
+      // Format: engine:runqueue:{org:X}:proj:Y:env:Z:currentConcurrency
+      const envConcurrencyKey = `engine:runqueue:{org:${environment.organizationId}}:proj:${environment.projectId}:env:${environmentId}:currentConcurrency`;
+
+      console.log(`\n🔑 Checking Redis key: ${envConcurrencyKey}`);
+
+      // Get all run IDs in the environment's currentConcurrency set
+      const runIds = await redisRead.smembers(envConcurrencyKey);
+
+      if (runIds.length === 0) {
+        console.log(`✅ No runs in currentConcurrency set`);
+        return;
+      }
+
+      console.log(`📊 Found ${runIds.length} runs in currentConcurrency set`);
+
+      // Query database for latest snapshots and queue info of these runs
+      const runInfo = await prisma.$queryRaw<
+        Array<{
+          runId: string;
+          executionStatus: TaskRunExecutionStatus;
+          snapshotCreatedAt: Date;
+          organizationId: string;
+          projectId: string;
+          environmentId: string;
+          taskIdentifier: string;
+          queue: string;
+          concurrencyKey: string | null;
+        }>
+      >`
+        SELECT DISTINCT ON (s."runId")
+          s."runId",
+          s."executionStatus",
+          s."createdAt" as "snapshotCreatedAt",
+          r."organizationId",
+          r."projectId",
+          r."runtimeEnvironmentId" as "environmentId",
+          r."taskIdentifier",
+          r."queue",
+          r."concurrencyKey"
+        FROM "TaskRunExecutionSnapshot" s
+        INNER JOIN "TaskRun" r ON r.id = s."runId"
+        WHERE s."runId" = ANY(${runIds})
+          AND s."isValid" = true
+        ORDER BY s."runId", s."createdAt" DESC
+      `;
+
+      const stuckRuns: StuckRun[] = [];
+
+      // Find runs with QUEUED execution status (inconsistent state)
+      for (const info of runInfo) {
+        if (info.executionStatus === "QUEUED") {
+          stuckRuns.push({
+            runId: info.runId,
+            orgId: info.organizationId,
+            projectId: info.projectId,
+            environmentId: info.environmentId,
+            queue: info.queue,
+            concurrencyKey: info.concurrencyKey,
+            executionStatus: info.executionStatus,
+            snapshotCreatedAt: info.snapshotCreatedAt,
+            taskIdentifier: info.taskIdentifier,
+          });
+        }
+      }
+
+      if (stuckRuns.length === 0) {
+        console.log(`✅ No stuck runs found (all runs have progressed beyond QUEUED state)`);
+        return;
+      }
+
+      console.log(`\n⚠️  Found ${stuckRuns.length} stuck runs in QUEUED state:`);
+      console.log(`════════════════════════════════════════════════════════════════`);
+
+      for (const run of stuckRuns) {
+        const age = Date.now() - run.snapshotCreatedAt.getTime();
+        const ageMinutes = Math.floor(age / 1000 / 60);
+        console.log(`  • Run: ${run.runId}`);
+        console.log(`    Task: ${run.taskIdentifier}`);
+        console.log(`    Queue: ${run.queue}`);
+        console.log(`    Concurrency Key: ${run.concurrencyKey || "(none)"}`);
+        console.log(`    Status: ${run.executionStatus}`);
+        console.log(`    Stuck for: ${ageMinutes} minutes`);
+        console.log(`    Snapshot created: ${run.snapshotCreatedAt.toISOString()}`);
+        console.log();
+      }
+
+      // Prepare recovery operations
+      console.log(`\n⚡ ${executeMode ? "Executing" : "Planning"} recovery for ${stuckRuns.length} stuck runs`);
+      console.log(`This will:`);
+      console.log(`  1. Add each run back to its specific queue sorted set`);
+      console.log(`  2. Remove each run from the queue-specific currentConcurrency set`);
+      console.log(`  3. Remove each run from the env-level currentConcurrency set`);
+      console.log();
+
+      let successCount = 0;
+      let failureCount = 0;
+
+      const currentTimestamp = Date.now();
+
+      for (const run of stuckRuns) {
+        try {
+          // Build queue key: engine:runqueue:{org:X}:proj:Y:env:Z:queue:QUEUENAME
+          // Build queue currentConcurrency key: engine:runqueue:{org:X}:proj:Y:env:Z:queue:QUEUENAME:currentConcurrency
+          const queueKey = run.concurrencyKey
+            ? `engine:runqueue:{org:${run.orgId}}:proj:${run.projectId}:env:${run.environmentId}:queue:${run.queue}:ck:${run.concurrencyKey}`
+            : `engine:runqueue:{org:${run.orgId}}:proj:${run.projectId}:env:${run.environmentId}:queue:${run.queue}`;
+
+          const queueConcurrencyKey = `${queueKey}:currentConcurrency`;
+
+          const operations: RedisOperation[] = [
+            {
+              type: "ZADD",
+              key: queueKey,
+              args: [currentTimestamp, run.runId],
+              description: `Add run to queue sorted set with score ${currentTimestamp}`,
+            },
+            {
+              type: "SREM",
+              key: queueConcurrencyKey,
+              args: [run.runId],
+              description: `Remove run from queue currentConcurrency set`,
+            },
+            {
+              type: "SREM",
+              key: envConcurrencyKey,
+              args: [run.runId],
+              description: `Remove run from env currentConcurrency set`,
+            },
+          ];
+
+          if (executeMode && redisWrite) {
+            // Execute operations using the write client
+            await redisWrite.zadd(queueKey, currentTimestamp, run.runId);
+            const removedFromQueue = await redisWrite.srem(queueConcurrencyKey, run.runId);
+            const removedFromEnv = await redisWrite.srem(envConcurrencyKey, run.runId);
+
+            console.log(`  ✓ Recovered run ${run.runId} (${run.taskIdentifier})`);
+            if (removedFromQueue === 0) {
+              console.log(`    ⚠ Run was not in queue currentConcurrency set`);
+            }
+            if (removedFromEnv === 0) {
+              console.log(`    ⚠ Run was not in env currentConcurrency set`);
+            }
+            successCount++;
+          } else {
+            // Dry run - just show what would be done
+            console.log(`  📝 Would recover run ${run.runId} (${run.taskIdentifier}):`);
+            for (const op of operations) {
+              console.log(`     ${op.type} ${op.key}`);
+              console.log(`       Args: ${JSON.stringify(op.args)}`);
+              console.log(`       (${op.description})`);
+            }
+            successCount++;
+          }
+        } catch (error) {
+          console.error(`  ✗ Failed to recover run ${run.runId}:`, error);
+          failureCount++;
+        }
+      }
+
+      console.log(`\n═══════════════════════════════════════════════════════════════`);
+      if (executeMode) {
+        console.log(`✅ Recovery complete!`);
+        console.log(`   Recovered: ${successCount}`);
+        console.log(`   Failed: ${failureCount}`);
+        console.log();
+        console.log(`ℹ️  Note: The recovered runs should be automatically dequeued`);
+        console.log(`   by the master queue consumers within a few seconds.`);
+      } else {
+        console.log(`📋 Dry run complete - no changes were made`);
+        console.log(`   Would recover: ${successCount}`);
+        console.log(`   Would fail: ${failureCount}`);
+        console.log();
+        console.log(`💡 To execute these changes, run again with a redisWriteUrl argument`);
+      }
+    } finally {
+      await redisRead.quit();
+      if (redisWrite) {
+        await redisWrite.quit();
+      }
+    }
+  } catch (error) {
+    console.error("❌ Error during recovery:", error);
+    throw error;
+  } finally {
+    await prisma.$disconnect();
+  }
+}
+
+main().catch((error) => {
+  console.error("Fatal error:", error);
+  process.exit(1);
+});
diff --git a/server.json b/server.json
new file mode 100644
index 00000000000..57b89ff193a
--- /dev/null
+++ b/server.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json",
+  "name": "io.github.triggerdotdev/trigger.dev",
+  "description": "Official Trigger.dev MCP server to automate your Trigger.dev projects, write code, help debug runs, and get answers to questions about Trigger.dev",
+  "status": "active",
+  "repository": {
+    "url": "https://github.com/triggerdotdev/trigger.dev",
+    "source": "github",
+    "subfolder": "packages/cli-v3"
+  },
+  "version": "4.0.3",
+  "packages": [
+    {
+      "registry_type": "npm",
+      "registry_base_url": "https://registry.npmjs.org",
+      "identifier": "trigger.dev",
+      "version": "4.0.3",
+      "runtime_hint": "npx",
+      "transport": {
+        "type": "stdio"
+      },
+      "package_arguments": [
+        {
+          "type": "positional",
+          "value": "mcp"
+        }
+      ],
+      "environment_variables": []
+    }
+  ]
+}
\ No newline at end of file
diff --git a/turbo.json b/turbo.json
index fd81697c942..025a7226472 100644
--- a/turbo.json
+++ b/turbo.json
@@ -13,11 +13,6 @@
         ".cache"
       ]
     },
-    "build:db:seed": {
-      "outputs": [
-        "prisma/seed.js"
-      ]
-    },
     "webapp#start": {
       "dependsOn": [
         "^build"
@@ -43,7 +38,7 @@
     "db:seed": {
       "cache": false,
       "dependsOn": [
-        "build:db:seed"
+        "build"
       ]
     },
     "db:studio": {